diff --git a/.chronus/changes/UseLinkedVersionsOfMapAndSet-2026-1-19-23-31-45.md b/.chronus/changes/UseLinkedVersionsOfMapAndSet-2026-1-19-23-31-45.md new file mode 100644 index 00000000000..1aad3d6b0c7 --- /dev/null +++ b/.chronus/changes/UseLinkedVersionsOfMapAndSet-2026-1-19-23-31-45.md @@ -0,0 +1,8 @@ +--- +# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking +changeKind: fix +packages: + - "@typespec/http-client-java" +--- + +Use `LinkedHashMap` and `LinkedHashSet` to ensure consistent iterating order. diff --git a/.chronus/changes/add-e2e-test-alternate-initial-verb-2026-3-30.md b/.chronus/changes/add-e2e-test-alternate-initial-verb-2026-3-30.md new file mode 100644 index 00000000000..ab8752390ad --- /dev/null +++ b/.chronus/changes/add-e2e-test-alternate-initial-verb-2026-3-30.md @@ -0,0 +1,7 @@ +--- +changeKind: internal +packages: + - "@typespec/http-client-java" +--- + +Add e2e test for ServerDrivenPagination alternate initial verb (POST) scenario in clientcore tests diff --git a/.chronus/changes/add-e2e-tests-azure-resourcemanager-2026-03-10.md b/.chronus/changes/add-e2e-tests-azure-resourcemanager-2026-03-10.md new file mode 100644 index 00000000000..9fcc2107f30 --- /dev/null +++ b/.chronus/changes/add-e2e-tests-azure-resourcemanager-2026-03-10.md @@ -0,0 +1,7 @@ +--- +changeKind: internal +packages: + - "@typespec/http-client-java" +--- + +add e2e tests for azure.resourcemanager.methodsubscriptionid.operations and azure.resourcemanager.nonresource.nonresourceoperations.create diff --git a/.chronus/changes/add-missing-encode-duration-tests-2026-3-9-4-45-0.md b/.chronus/changes/add-missing-encode-duration-tests-2026-3-9-4-45-0.md new file mode 100644 index 00000000000..abb8c451acf --- /dev/null +++ b/.chronus/changes/add-missing-encode-duration-tests-2026-3-9-4-45-0.md @@ -0,0 +1,7 @@ +--- +changeKind: internal +packages: + - "@typespec/http-client-java" +--- + +Add missing tests for `int32SecondsLargerUnit` and `floatSecondsLargerUnit` encode/duration scenarios (query, header, and property). diff --git a/.chronus/changes/copilot-add-enum-array-test-2026-0-15-14-32-1.md b/.chronus/changes/copilot-add-enum-array-test-2026-0-15-14-32-1.md deleted file mode 100644 index 7c90fe8ad55..00000000000 --- a/.chronus/changes/copilot-add-enum-array-test-2026-0-15-14-32-1.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -changeKind: feature -packages: - - "@typespec/http-specs" ---- - -Add array encoding test for enum and extensible enum arrays. \ No newline at end of file diff --git a/.chronus/changes/copilot-add-withlist-test-2026-0-23-7-9-22.md b/.chronus/changes/copilot-add-withlist-test-2026-0-23-7-9-22.md deleted file mode 100644 index 095bc8bf4d7..00000000000 --- a/.chronus/changes/copilot-add-withlist-test-2026-0-23-7-9-22.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -changeKind: internal -packages: - - "@typespec/http-client-java" ---- - -Add end-to-end test for withList operation in specialwords ModelPropertiesClient. \ No newline at end of file diff --git a/.chronus/changes/copilot-support-duration-milliseconds-2026-03-05-06-35-00.md b/.chronus/changes/copilot-support-duration-milliseconds-2026-03-05-06-35-00.md new file mode 100644 index 00000000000..d38afaaa52e --- /dev/null +++ b/.chronus/changes/copilot-support-duration-milliseconds-2026-03-05-06-35-00.md @@ -0,0 +1,7 @@ +--- +changeKind: feature +packages: + - "@typespec/http-client-java" +--- + +Support `DurationKnownEncoding.milliseconds` in http-client-java. Duration properties encoded as milliseconds now use `Duration` as the client type, with proper conversion to/from integer or float milliseconds on the wire. diff --git a/.chronus/changes/copilot-update-node-js-dependencies-2026-03-12-12-36-02.md b/.chronus/changes/copilot-update-node-js-dependencies-2026-03-12-12-36-02.md new file mode 100644 index 00000000000..0c30456dba3 --- /dev/null +++ b/.chronus/changes/copilot-update-node-js-dependencies-2026-03-12-12-36-02.md @@ -0,0 +1,7 @@ +--- +changeKind: dependencies +packages: + - "@typespec/http-client-java" +--- + +Update dependencies: `@azure-tools/typespec-client-generator-core` 0.66.1→0.66.2, `@azure-tools/typespec-azure-rulesets` 0.65.1→0.66.0, `@typespec/http-specs` 0.1.0-alpha.33→0.1.0-alpha.34 diff --git a/.chronus/changes/copilot-update-nodejs-dependencies-2026-0-23-11-26-21.md b/.chronus/changes/copilot-update-nodejs-dependencies-2026-0-23-11-26-21.md deleted file mode 100644 index e47cfd8d840..00000000000 --- a/.chronus/changes/copilot-update-nodejs-dependencies-2026-0-23-11-26-21.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -changeKind: dependencies -packages: - - "@typespec/http-client-java" ---- - -Upgrade TCGC \ No newline at end of file diff --git a/.chronus/changes/copilot-update-nodejs-dependencies-again-2026-3-2-4-54-25.md b/.chronus/changes/copilot-update-nodejs-dependencies-again-2026-3-2-4-54-25.md new file mode 100644 index 00000000000..776b12f8f03 --- /dev/null +++ b/.chronus/changes/copilot-update-nodejs-dependencies-again-2026-3-2-4-54-25.md @@ -0,0 +1,7 @@ +--- +changeKind: dependencies +packages: + - "@typespec/http-client-java" +--- + +Update Node.js dependencies \ No newline at end of file diff --git a/.chronus/changes/copilot-update-nodejs-dependencies-again-2026-3-8-1-53-53.md b/.chronus/changes/copilot-update-nodejs-dependencies-again-2026-3-8-1-53-53.md new file mode 100644 index 00000000000..776b12f8f03 --- /dev/null +++ b/.chronus/changes/copilot-update-nodejs-dependencies-again-2026-3-8-1-53-53.md @@ -0,0 +1,7 @@ +--- +changeKind: dependencies +packages: + - "@typespec/http-client-java" +--- + +Update Node.js dependencies \ No newline at end of file diff --git a/.chronus/changes/copilot-update-nodejs-dependencies-again-2026-3-9-0-55-31.md b/.chronus/changes/copilot-update-nodejs-dependencies-again-2026-3-9-0-55-31.md new file mode 100644 index 00000000000..fdd0fd3277c --- /dev/null +++ b/.chronus/changes/copilot-update-nodejs-dependencies-again-2026-3-9-0-55-31.md @@ -0,0 +1,7 @@ +--- +changeKind: dependencies +packages: + - "@typespec/http-client-java" +--- + +Update @azure-tools/typespec-client-generator-core to 0.67.1 and other dev dependencies to latest \ No newline at end of file diff --git a/.chronus/changes/enable-skipped-python-tests-2026-4-8-8-47-0.md b/.chronus/changes/enable-skipped-python-tests-2026-4-8-8-47-0.md new file mode 100644 index 00000000000..61bc1bc01c1 --- /dev/null +++ b/.chronus/changes/enable-skipped-python-tests-2026-4-8-8-47-0.md @@ -0,0 +1,7 @@ +--- +changeKind: internal +packages: + - "@typespec/http-client-python" +--- + +Enable previously skipped client structure and client operation group mock API tests after TCGC 0.67.0 upgrade; remove obsolete `test_spread_record_discriminated_union` tests whose Spector scenario was removed. diff --git a/.chronus/changes/fionabronwen-type-utils-2026-0-12-16-12-5.md b/.chronus/changes/fionabronwen-type-utils-2026-0-12-16-12-5.md deleted file mode 100644 index 5794d04d58f..00000000000 --- a/.chronus/changes/fionabronwen-type-utils-2026-0-12-16-12-5.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -changeKind: deprecation -packages: - - "@typespec/compiler" - - "@typespec/http" - - "@typespec/openapi3" - - "@typespec/tspd" - - "@typespec/http-server-js" - - "@typespec/http-server-csharp" ---- - -Deprecate `program` parameter in `isArrayModelType` and `isRecordModelType` functions. Use the new single-argument overload instead: `isArrayModelType(type)` and `isRecordModelType(type)`. diff --git a/.chronus/changes/fix-NRE-generate-model-2026-0-19-9-51-29.md b/.chronus/changes/fix-NRE-generate-model-2026-0-19-9-51-29.md deleted file mode 100644 index 6def08dc384..00000000000 --- a/.chronus/changes/fix-NRE-generate-model-2026-0-19-9-51-29.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -changeKind: fix -packages: - - "@typespec/openapi3" ---- - -importer - null reference exception if member schema cannot be resolved \ No newline at end of file diff --git a/.chronus/changes/fix-import-generation-subdir-2026-3-8-12-7-49.md b/.chronus/changes/fix-import-generation-subdir-2026-3-8-12-7-49.md new file mode 100644 index 00000000000..98bf7d7c52a --- /dev/null +++ b/.chronus/changes/fix-import-generation-subdir-2026-3-8-12-7-49.md @@ -0,0 +1,7 @@ +--- +changeKind: fix +packages: + - "@typespec/http-client-python" +--- + +fix import for _validation.py/_types.py when "generation-subdir" is configured \ No newline at end of file diff --git a/.chronus/changes/fix-model-expr-validation-2026-0-22-15-5-36.md b/.chronus/changes/fix-model-expr-validation-2026-0-22-15-5-36.md deleted file mode 100644 index 39972991844..00000000000 --- a/.chronus/changes/fix-model-expr-validation-2026-0-22-15-5-36.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking -changeKind: fix -packages: - - "@typespec/versioning" ---- - -Fix incorrect incompatible versioning error in model expressions diff --git a/.chronus/changes/fix-openapi-duration-properties-2026-01-19-19-29-03.md b/.chronus/changes/fix-openapi-duration-properties-2026-01-19-19-29-03.md deleted file mode 100644 index ff2a6900875..00000000000 --- a/.chronus/changes/fix-openapi-duration-properties-2026-01-19-19-29-03.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -changeKind: feature -packages: - - "@typespec/openapi3" ---- - -importer - OpenAPI number type with duration format now converts to TypeSpec duration type with @encode("seconds", float32) decorator diff --git a/.chronus/changes/fix-skip-e2e-broken-vscode-again-2026-0-13-20-43-32.md b/.chronus/changes/fix-skip-e2e-broken-vscode-again-2026-0-13-20-43-32.md deleted file mode 100644 index 7799c60a7f3..00000000000 --- a/.chronus/changes/fix-skip-e2e-broken-vscode-again-2026-0-13-20-43-32.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking -changeKind: internal -packages: - - typespec-vscode ---- - -Skip vscode e2e test failing in release pr diff --git a/.chronus/changes/fix-unknown-scalar-constructors-2026-0-27-17-36-5-2.md b/.chronus/changes/fix-unknown-scalar-constructors-2026-0-27-17-36-5-2.md deleted file mode 100644 index 7df3599b6d4..00000000000 --- a/.chronus/changes/fix-unknown-scalar-constructors-2026-0-27-17-36-5-2.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking -changeKind: fix -packages: - - "@typespec/openapi3" ---- - -Handle use of `.now()` constructor on date time types in examples and default. diff --git a/.chronus/changes/fix-unknown-scalar-constructors-2026-0-27-17-36-5.md b/.chronus/changes/fix-unknown-scalar-constructors-2026-0-27-17-36-5.md deleted file mode 100644 index 04e171903e8..00000000000 --- a/.chronus/changes/fix-unknown-scalar-constructors-2026-0-27-17-36-5.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking -changeKind: feature -packages: - - "@typespec/compiler" ---- - -[API] `serializeValueAsJson` throws a `UnsupportedScalarConstructorError` for unsupported scalar constructor instead of crashing diff --git a/.chronus/changes/fix-versioning-validation-regression-2026-0-23-18-52-52.md b/.chronus/changes/fix-versioning-validation-regression-2026-0-23-18-52-52.md deleted file mode 100644 index ed758a2a0a4..00000000000 --- a/.chronus/changes/fix-versioning-validation-regression-2026-0-23-18-52-52.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking -changeKind: internal -packages: - - "@typespec/versioning" ---- - -Fix versioning validation regression diff --git a/.chronus/changes/fix-windows-sensitive-word-test-2026-4-8.md b/.chronus/changes/fix-windows-sensitive-word-test-2026-4-8.md new file mode 100644 index 00000000000..6c18a8db46e --- /dev/null +++ b/.chronus/changes/fix-windows-sensitive-word-test-2026-4-8.md @@ -0,0 +1,6 @@ +--- +changeKind: internal +packages: + - "@typespec/http-client-python" +--- +Fix `test_sensitive_word` failing on Windows by replacing shell-based search with pure Python `pathlib` implementation. diff --git a/.chronus/changes/fixed-singature-help-test-slow-2026-0-19-7-43-30.md b/.chronus/changes/fixed-singature-help-test-slow-2026-0-19-7-43-30.md deleted file mode 100644 index 8f9aac31600..00000000000 --- a/.chronus/changes/fixed-singature-help-test-slow-2026-0-19-7-43-30.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking -changeKind: internal -packages: - - "@typespec/compiler" ---- - -Fixed signature help test slow diff --git a/.chronus/changes/glecaros-ignore-deprecated-2026-0-13-6-14-22.md b/.chronus/changes/glecaros-ignore-deprecated-2026-0-13-6-14-22.md deleted file mode 100644 index 6d6316ccb11..00000000000 --- a/.chronus/changes/glecaros-ignore-deprecated-2026-0-13-6-14-22.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -changeKind: fix -packages: - - "@typespec/compiler" ---- - -Ensuring ignore-deprecated gets resolved. \ No newline at end of file diff --git a/.chronus/changes/http-client-java_bug-fix-example-value-for-binary-data-2026-0-30-15-36-58.md b/.chronus/changes/http-client-java_bug-fix-example-value-for-binary-data-2026-0-30-15-36-58.md deleted file mode 100644 index 49f90ce015e..00000000000 --- a/.chronus/changes/http-client-java_bug-fix-example-value-for-binary-data-2026-0-30-15-36-58.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -changeKind: fix -packages: - - "@typespec/http-client-java" ---- - -Missing example value for BinaryData type in mock test. \ No newline at end of file diff --git a/.chronus/changes/http-client-java_bug-fix-external-type-for-enum-2026-1-24-13-57-22.md b/.chronus/changes/http-client-java_bug-fix-external-type-for-enum-2026-1-24-13-57-22.md new file mode 100644 index 00000000000..cd74ea2f6c7 --- /dev/null +++ b/.chronus/changes/http-client-java_bug-fix-external-type-for-enum-2026-1-24-13-57-22.md @@ -0,0 +1,7 @@ +--- +changeKind: fix +packages: + - "@typespec/http-client-java" +--- + +Fix bug on alternateType apply to enum/union. \ No newline at end of file diff --git a/.chronus/changes/http-client-java_bug-fix-paged-model-2026-2-24-16-23-15.md b/.chronus/changes/http-client-java_bug-fix-paged-model-2026-2-24-16-23-15.md new file mode 100644 index 00000000000..f341bf07409 --- /dev/null +++ b/.chronus/changes/http-client-java_bug-fix-paged-model-2026-2-24-16-23-15.md @@ -0,0 +1,7 @@ +--- +changeKind: dependencies +packages: + - "@typespec/http-client-java" +--- + +Update Node dependencies \ No newline at end of file diff --git a/.chronus/changes/http-client-java_bug-fix-paged-model-2026-2-25-16-16-24.md b/.chronus/changes/http-client-java_bug-fix-paged-model-2026-2-25-16-16-24.md new file mode 100644 index 00000000000..9ba257825cc --- /dev/null +++ b/.chronus/changes/http-client-java_bug-fix-paged-model-2026-2-25-16-16-24.md @@ -0,0 +1,7 @@ +--- +changeKind: fix +packages: + - "@typespec/http-client-java" +--- + +access=public should override Paged \ No newline at end of file diff --git a/.chronus/changes/http-client-java_e2e-clientinitialization-tests-2026-3-11-6-15-0.md b/.chronus/changes/http-client-java_e2e-clientinitialization-tests-2026-3-11-6-15-0.md new file mode 100644 index 00000000000..c329c6b3974 --- /dev/null +++ b/.chronus/changes/http-client-java_e2e-clientinitialization-tests-2026-3-11-6-15-0.md @@ -0,0 +1,7 @@ +--- +changeKind: internal +packages: + - "@typespec/http-client-java" +--- + +Add e2e tests for client-initialization scenarios diff --git a/.chronus/changes/http-client-java_fix-property-in-parent-2026-2-13-15-41-25.md b/.chronus/changes/http-client-java_fix-property-in-parent-2026-2-13-15-41-25.md new file mode 100644 index 00000000000..b3858ae042e --- /dev/null +++ b/.chronus/changes/http-client-java_fix-property-in-parent-2026-2-13-15-41-25.md @@ -0,0 +1,7 @@ +--- +changeKind: fix +packages: + - "@typespec/http-client-java" +--- + +Fix result segments like "value" not found if defined in parent model. \ No newline at end of file diff --git a/.chronus/changes/http-client-java_ignore-error-on-invalid-date-time-value-2026-3-3-12-15-51.md b/.chronus/changes/http-client-java_ignore-error-on-invalid-date-time-value-2026-3-3-12-15-51.md new file mode 100644 index 00000000000..deb83533887 --- /dev/null +++ b/.chronus/changes/http-client-java_ignore-error-on-invalid-date-time-value-2026-3-3-12-15-51.md @@ -0,0 +1,7 @@ +--- +changeKind: fix +packages: + - "@typespec/http-client-java" +--- + +Ignore error in JSON example, if the format is incorrect. \ No newline at end of file diff --git a/.chronus/changes/http-client-java_improve-singluar-2026-2-9-10-40-4.md b/.chronus/changes/http-client-java_improve-singluar-2026-2-9-10-40-4.md new file mode 100644 index 00000000000..d790174567f --- /dev/null +++ b/.chronus/changes/http-client-java_improve-singluar-2026-2-9-10-40-4.md @@ -0,0 +1,7 @@ +--- +changeKind: fix +packages: + - "@typespec/http-client-java" +--- + +Improve handling of plural to singular convert. \ No newline at end of file diff --git a/.chronus/changes/http-client-java_improve-singluar-2026-2-9-12-51-49.md b/.chronus/changes/http-client-java_improve-singluar-2026-2-9-12-51-49.md new file mode 100644 index 00000000000..5495856ee80 --- /dev/null +++ b/.chronus/changes/http-client-java_improve-singluar-2026-2-9-12-51-49.md @@ -0,0 +1,7 @@ +--- +changeKind: dependencies +packages: + - "@typespec/http-client-java" +--- + +Update dependencies: @azure-tools/typespec-client-generator-core 0.65.4, @typespec/http 1.9.1, @microsoft/api-extractor ^7.57.6, @microsoft/api-extractor-model ^7.33.4, @types/node ~25.3.5, c8 ~11.0.0 \ No newline at end of file diff --git a/.chronus/changes/http-client-java_support-File-2026-0-30-17-23-53.md b/.chronus/changes/http-client-java_support-File-2026-0-30-17-23-53.md deleted file mode 100644 index bc274803327..00000000000 --- a/.chronus/changes/http-client-java_support-File-2026-0-30-17-23-53.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -changeKind: feature -packages: - - "@typespec/http-client-java" ---- - -Support File from TypeSpec. \ No newline at end of file diff --git a/.chronus/changes/http-client-java_update-metadata-file-2026-1-14-14-41-22.md b/.chronus/changes/http-client-java_update-metadata-file-2026-1-14-14-41-22.md new file mode 100644 index 00000000000..01acf50ebcf --- /dev/null +++ b/.chronus/changes/http-client-java_update-metadata-file-2026-1-14-14-41-22.md @@ -0,0 +1,7 @@ +--- +changeKind: feature +packages: + - "@typespec/http-client-java" +--- + +Support apiVersions in metadata.json file. \ No newline at end of file diff --git a/.chronus/changes/http-client-java_upgrade-compiler-2026-2-11-13-45-53.md b/.chronus/changes/http-client-java_upgrade-compiler-2026-2-11-13-45-53.md new file mode 100644 index 00000000000..4cf980d47df --- /dev/null +++ b/.chronus/changes/http-client-java_upgrade-compiler-2026-2-11-13-45-53.md @@ -0,0 +1,7 @@ +--- +changeKind: dependencies +packages: + - "@typespec/http-client-java" +--- + +Update compiler to 1.10.0 \ No newline at end of file diff --git a/.chronus/changes/http-client-java_upgrade-compiler-2026-2-11-13-46-20.md b/.chronus/changes/http-client-java_upgrade-compiler-2026-2-11-13-46-20.md new file mode 100644 index 00000000000..1b8ece40357 --- /dev/null +++ b/.chronus/changes/http-client-java_upgrade-compiler-2026-2-11-13-46-20.md @@ -0,0 +1,7 @@ +--- +changeKind: fix +packages: + - "@typespec/http-client-java" +--- + +Allow text/plain content-type on Enum \ No newline at end of file diff --git a/.chronus/changes/http-client-java_warning-on-not-spread-json-merge-patch-payload-2026-1-28-11-33-56.md b/.chronus/changes/http-client-java_warning-on-not-spread-json-merge-patch-payload-2026-1-28-11-33-56.md new file mode 100644 index 00000000000..549b6dbdc4b --- /dev/null +++ b/.chronus/changes/http-client-java_warning-on-not-spread-json-merge-patch-payload-2026-1-28-11-33-56.md @@ -0,0 +1,7 @@ +--- +changeKind: feature +packages: + - "@typespec/http-client-java" +--- + +Add a warning when emitter does not spread for json-merge-patch payload. \ No newline at end of file diff --git a/.chronus/changes/http-client-java_xml-namespace-2026-2-31-16-1-0.md b/.chronus/changes/http-client-java_xml-namespace-2026-2-31-16-1-0.md new file mode 100644 index 00000000000..b0b936cc4fb --- /dev/null +++ b/.chronus/changes/http-client-java_xml-namespace-2026-2-31-16-1-0.md @@ -0,0 +1,7 @@ +--- +changeKind: fix +packages: + - "@typespec/http-client-java" +--- + +Fix bug on XML array with isXmlWrapper=true \ No newline at end of file diff --git a/.chronus/changes/java_fix_discriminator_no_subtypes-2026-2-18-19-29-57.md b/.chronus/changes/java_fix_discriminator_no_subtypes-2026-2-18-19-29-57.md new file mode 100644 index 00000000000..4315f4697d3 --- /dev/null +++ b/.chronus/changes/java_fix_discriminator_no_subtypes-2026-2-18-19-29-57.md @@ -0,0 +1,7 @@ +--- +changeKind: fix +packages: + - "@typespec/http-client-java" +--- + +Fix discriminator property not generated when model has @discriminator but no known subtypes \ No newline at end of file diff --git a/.chronus/changes/java_mgmt_use_individual_entry_for_premium-2026-1-28-9-31-24.md b/.chronus/changes/java_mgmt_use_individual_entry_for_premium-2026-1-28-9-31-24.md new file mode 100644 index 00000000000..a98b8ca5b89 --- /dev/null +++ b/.chronus/changes/java_mgmt_use_individual_entry_for_premium-2026-1-28-9-31-24.md @@ -0,0 +1,8 @@ +--- +# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking +changeKind: fix +packages: + - "@typespec/http-client-java" +--- + +mgmt, use separate entry points for premium samples diff --git a/.chronus/changes/jolov-publish-always-internal-2026-2-19-10-49-50.md b/.chronus/changes/jolov-publish-always-internal-2026-2-19-10-49-50.md new file mode 100644 index 00000000000..a25b49c1b0d --- /dev/null +++ b/.chronus/changes/jolov-publish-always-internal-2026-2-19-10-49-50.md @@ -0,0 +1,7 @@ +--- +changeKind: internal +packages: + - "@typespec/http-client-java" +--- + +Update internal npm feed from azure-sdk-for-js-test-autorest to azure-sdk-for-js \ No newline at end of file diff --git a/.chronus/changes/minify-bundled-code-2026-0-30-17-53-27.md b/.chronus/changes/minify-bundled-code-2026-0-30-17-53-27.md deleted file mode 100644 index 45bda7e3d87..00000000000 --- a/.chronus/changes/minify-bundled-code-2026-0-30-17-53-27.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking -changeKind: feature -packages: - - "@typespec/bundler" ---- - -Minify bundler output diff --git a/.chronus/changes/node-22-min-2026-3-8-12-27-17.md b/.chronus/changes/node-22-min-2026-3-8-12-27-17.md new file mode 100644 index 00000000000..f96233deba5 --- /dev/null +++ b/.chronus/changes/node-22-min-2026-3-8-12-27-17.md @@ -0,0 +1,34 @@ +--- +# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking +changeKind: internal +packages: + - "@typespec/asset-emitter" + - "@typespec/bundler" + - "@typespec/compiler" + - "@typespec/eslint-plugin" + - "@typespec/events" + - "@typespec/html-program-viewer" + - "@typespec/http-server-csharp" + - "@typespec/http-specs" + - "@typespec/http" + - "@typespec/internal-build-utils" + - "@typespec/json-schema" + - "@typespec/library-linter" + - "@typespec/openapi" + - "@typespec/openapi3" + - "@typespec/playground" + - "@typespec/rest" + - "@typespec/spec-api" + - "@typespec/spec-coverage-sdk" + - "@typespec/spector" + - "@typespec/sse" + - "@typespec/streams" + - tmlanguage-generator + - "@typespec/tspd" + - typespec-vs + - typespec-vscode + - "@typespec/versioning" + - "@typespec/xml" +--- + +Upgrade minimum node version to 22 diff --git a/.chronus/changes/playground-upload-python-2026-3-1-16-58-54.md b/.chronus/changes/playground-upload-python-2026-3-1-16-58-54.md new file mode 100644 index 00000000000..cfe1f167bca --- /dev/null +++ b/.chronus/changes/playground-upload-python-2026-3-1-16-58-54.md @@ -0,0 +1,8 @@ +--- +changeKind: internal +packages: + - "@typespec/http-client-python" + - "@typespec/bundle-uploader" +--- + +Extend publish pipeline to upload emitter bundles to Playground storage account. Update Python emitter to be browser-compatible for use in the TypeSpec playground. diff --git a/.chronus/changes/python-add-test-service-multiple-services-2026-4-2-22-40-0.md b/.chronus/changes/python-add-test-service-multiple-services-2026-4-2-22-40-0.md new file mode 100644 index 00000000000..c44dbc0cbb4 --- /dev/null +++ b/.chronus/changes/python-add-test-service-multiple-services-2026-4-2-22-40-0.md @@ -0,0 +1,7 @@ +--- +changeKind: internal +packages: + - "@typespec/http-client-python" +--- + +Add mock API tests for `service/multiple-services` scenario (multiple services without explicit `@client`). diff --git a/.chronus/changes/python-incorrectWireNamePadding-2026-3-9-13-17-1.md b/.chronus/changes/python-incorrectWireNamePadding-2026-3-9-13-17-1.md new file mode 100644 index 00000000000..ea5c536308f --- /dev/null +++ b/.chronus/changes/python-incorrectWireNamePadding-2026-3-9-13-17-1.md @@ -0,0 +1,7 @@ +--- +changeKind: fix +packages: + - "@typespec/http-client-python" +--- + +Fix padding of keys in splatted body parameter method signature \ No newline at end of file diff --git a/.chronus/changes/reneable-vscode-e2e-2026-0-21-17-54-15.md b/.chronus/changes/reneable-vscode-e2e-2026-0-21-17-54-15.md deleted file mode 100644 index 1c86f89982f..00000000000 --- a/.chronus/changes/reneable-vscode-e2e-2026-0-21-17-54-15.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking -changeKind: internal -packages: - - typespec-vscode ---- - -Reenable and improve vscode e2e tests diff --git a/.chronus/changes/spec-dashboard-overview-2026-03-03-23-31-23.md b/.chronus/changes/spec-dashboard-overview-2026-03-03-23-31-23.md new file mode 100644 index 00000000000..a1d056382ee --- /dev/null +++ b/.chronus/changes/spec-dashboard-overview-2026-03-03-23-31-23.md @@ -0,0 +1,7 @@ +--- +changeKind: internal +packages: + - "@typespec/spec-dashboard" +--- + +Add coverage overview component and emitter display name support diff --git a/.chronus/changes/specs-xmlErrorTest-2026-0-28-16-22-19.md b/.chronus/changes/specs-xmlErrorTest-2026-0-28-16-22-19.md deleted file mode 100644 index aca0a251e4f..00000000000 --- a/.chronus/changes/specs-xmlErrorTest-2026-0-28-16-22-19.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -changeKind: feature -packages: - - "@typespec/http-specs" ---- - -Add test for xml error deserialization \ No newline at end of file diff --git a/.chronus/changes/specs-xmlNextLinkPaging-2026-1-23-16-47-56.md b/.chronus/changes/specs-xmlNextLinkPaging-2026-1-23-16-47-56.md deleted file mode 100644 index 00a0b7262f1..00000000000 --- a/.chronus/changes/specs-xmlNextLinkPaging-2026-1-23-16-47-56.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -changeKind: feature -packages: - - "@typespec/http-specs" ---- - -Add test for xml pagination with next link diff --git a/.chronus/changes/specs-xmlPaging-2026-0-23-15-43-39.md b/.chronus/changes/specs-xmlPaging-2026-0-23-15-43-39.md deleted file mode 100644 index d318db5c1ef..00000000000 --- a/.chronus/changes/specs-xmlPaging-2026-0-23-15-43-39.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -changeKind: feature -packages: - - "@typespec/http-specs" ---- - -Add test for xml paging \ No newline at end of file diff --git a/.chronus/changes/update-node-packages-2026-01-27-02-35-08.md b/.chronus/changes/update-node-packages-2026-01-27-02-35-08.md deleted file mode 100644 index d7a34ec1cb3..00000000000 --- a/.chronus/changes/update-node-packages-2026-01-27-02-35-08.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -changeKind: dependencies -packages: - - "@typespec/http-client-java" ---- - -Update @azure-tools/typespec-client-generator-core to 0.64.4 diff --git a/.chronus/changes/upgrade-deps-feb-2026-2026-2-2-19-28-39.md b/.chronus/changes/upgrade-deps-feb-2026-2026-2-2-19-28-39.md new file mode 100644 index 00000000000..051de73c605 --- /dev/null +++ b/.chronus/changes/upgrade-deps-feb-2026-2026-2-2-19-28-39.md @@ -0,0 +1,7 @@ +--- +changeKind: internal +packages: + - "@typespec/http-client-java" +--- + +Upgrade to eslint 10 \ No newline at end of file diff --git a/.chronus/changes/upgrade-deps-jan-2026-2026-0-22-15-16-21.md b/.chronus/changes/upgrade-deps-jan-2026-2026-0-22-15-16-21.md deleted file mode 100644 index 413afa9249e..00000000000 --- a/.chronus/changes/upgrade-deps-jan-2026-2026-0-22-15-16-21.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking -changeKind: dependencies -packages: - - "@typespec/compiler" - - "@typespec/emitter-framework" - - "@typespec/html-program-viewer" - - "@typespec/http-canonicalization" - - "@typespec/http-client-js" - - "@typespec/http-client" - - "@typespec/http-server-csharp" - - "@typespec/http-server-js" - - "@typespec/mutator-framework" - - "@typespec/openapi3" - - "@typespec/playground" - - "@typespec/prettier-plugin-typespec" - - "@typespec/spec-coverage-sdk" - - "@typespec/spector" - - "@typespec/tspd" - - typespec-vscode ---- - -Upgrade dependencies diff --git a/.chronus/config.yaml b/.chronus/config.yaml index 88efb045be2..44569e0d422 100644 --- a/.chronus/config.yaml +++ b/.chronus/config.yaml @@ -12,7 +12,7 @@ changeKinds: description: Fixes to existing features dependencies: - versionType: patch + versionType: none title: Bump dependencies description: Bumps dependencies @@ -77,4 +77,5 @@ additionalPackages: changedFiles: - "!**/*.md" - "!**/*.test.ts" + - "!**/packages/*/test/**/*" - "!**/*.e2e.ts" diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 69102e836a3..1c8f016beba 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -3,6 +3,7 @@ # Those files/folders can be modified by anyone .chronus/changes/ +.github/skills/ cspell.yaml ###################### @@ -28,8 +29,8 @@ cspell.yaml ###################### # Python ###################### -/packages/http-client-python/ @iscai-msft @tadelesh @msyyc @timotheeguerin @lmazuel @swathipil @catalinaperalta @mccoyp -/website/src/content/docs/docs/emitters/clients/http-client-python/ @iscai-msft @tadelesh @msyyc @timotheeguerin @lmazuel @swathipil @catalinaperalta @mccoyp +/packages/http-client-python/ @iscai-msft @tadelesh @msyyc @timotheeguerin @lmazuel @swathipil @catalinaperalta @mccoyp @ChenxiJiang333 +/website/src/content/docs/docs/emitters/clients/http-client-python/ @iscai-msft @tadelesh @msyyc @timotheeguerin @lmazuel @swathipil @catalinaperalta @mccoyp @ChenxiJiang333 ###################### # JavaScript diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 914d8b9cc35..70185d3180b 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -4,7 +4,7 @@ inputs: node-version: required: false description: Node version for setup-node - default: 20.x + default: 24.x runs: using: composite diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 7d485389328..6c393aedfa5 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -4,11 +4,14 @@ TypeSpec is a language for defining cloud service APIs and shapes. This monorepo contains the TypeSpec compiler, standard library packages, tools, documentation, and various language client emitters. +> [!IMPORTANT] +> **These instructions do NOT apply to the language emitter packages** (`http-client-csharp`, `http-client-java`, `http-client-python`). Those packages are excluded from the pnpm workspace and do not require using pnpm. + ## Essential Setup and Build Commands ### Prerequisites and Installation -- Install Node.js 20 LTS: `curl -fsSL https://nodejs.org/dist/v20.19.4/node-v20.19.4-linux-x64.tar.xz | tar -xJ --strip-components=1 -C /usr/local` +- Install Node.js LTS: - Install pnpm globally: `npm install -g pnpm` - Install dependencies: `pnpm install` (takes ~1.5 minutes) - Install Playwright browsers (optional for UI testing): `npx playwright install` @@ -106,7 +109,7 @@ TypeSpec is a language for defining cloud service APIs and shapes. This monorepo - Generate external signatures: `pnpm gen-compiler-extern-signature` - Regenerate samples: `pnpm regen-samples` - Regenerate docs: `pnpm regen-docs` -- Sync dependency versions: `pnpm fix-version-mismatch` +- Check catalog usage: `pnpm check-catalog` ## Troubleshooting @@ -115,6 +118,40 @@ TypeSpec is a language for defining cloud service APIs and shapes. This monorepo - If TypeScript compilation fails, check that compiler built first: `pnpm -r --filter "@typespec/compiler" build` - For VS Code extension development, ensure you have the workspace open at the repository root +## Commit instructions + +- Always run the linting and the formatting commands before any commit. +- Follow conventional commits. + +## Pull Request instructions + +### Changelog entries + +When the work is done, run `pnpm chronus add` to add a changelog entry. The valid change kinds are defined in [`.chronus/config.yaml`](../.chronus/config.yaml). Do **NOT** use `feat`, `docs`, `patch`, `minor`, or `major` — these are not valid change kinds. + +**If a PR affects multiple packages with different types of changes, create a separate changelog entry for each.** For example, if the PR adds a feature to `@typespec/http` and fixes a bug in `@typespec/openapi3`, run `pnpm chronus add` twice to create two separate changelog entries — one with `feature` for `@typespec/http` and one with `fix` for `@typespec/openapi3`. Do NOT bundle different change types into a single entry. + +### Changelog message guidelines + +- Provide a clear description based on the initial issue description. +- Only add an area tag when the package has multiple areas and the change targets a secondary area; use bracket format like `[converter]` or `[formatter]` (for example, a secondary openapi3 converter change should start with `[converter]`). Avoid generic area prefixes like `core -` and do not add any area tag for single-area packages. +- For new features, include a short code block in the changelog entry that showcases the new functionality; skip code blocks for simple bug fixes. + +### TDD approach + +- Always start by defining additional unit tests/updating existing unit tests to fulfill the requirements first. Then make changes to the code accordingly. If you are following the TDD (Test Driven Development) approach, make sure to run the tests and see them fail before implementing the code changes. + +## Branch Naming Conventions + +### Out-of-sync / hotfix releases + +Out-of-sync releases and hotfix releases follow the same flow using a `publish/` branch: + +- **Pattern:** `publish/-release-` (e.g., `publish/python-release-03-26`) +- These branches skip certain CI checks (consistency, external-integration) and auto-publish on merge +- For **out-of-sync releases**, the PR targets `main` +- For **hotfix releases**, the PR targets the corresponding `release/*` branch (e.g., `release/v0.60`) instead of `main` + ## Available Task Instructions - [Testserver Generation](./prompts/testserver-generation.md): Instructions for generating TypeSpec HTTP spec test servers diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a1830645fec..44caf314cd3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,5 +1,6 @@ version: 2 updates: + # Python dependencies for http-client-python - package-ecosystem: "pip" directories: - "/packages/http-client-python/eng/" @@ -14,13 +15,120 @@ updates: include: "scope" labels: - "emitter:client:python" + + # Main pnpm workspace (npm dependencies via catalog) - package-ecosystem: "npm" directory: "/" schedule: - interval: "daily" + interval: "weekly" + exclude-paths: + - "packages/http-client-csharp" + - "packages/http-client-java" + - "packages/http-client-python" + labels: [] # conflict with our labels in labels.ts groups: alloy: patterns: - "@alloy-js/*" - allow: - - dependency-name: "@alloy-js/*" + types: + patterns: + - "@types/*" + testing: + patterns: + - "vitest" + - "@vitest/*" + - "@playwright/test" + - "playwright" + - "@testing-library/*" + - "mocha" + - "happy-dom" + - "c8" + linting: + patterns: + - "eslint" + - "@eslint/*" + - "eslint-plugin-*" + - "@typescript-eslint/*" + - "typescript-eslint" + - "cspell" + build-tools: + patterns: + - "esbuild" + - "esbuild-*" + - "vite" + - "vite-*" + - "@vitejs/*" + - "typescript" + - "tsx" + - "rollup-*" + website: + patterns: + - "astro" + - "astro-*" + - "@astrojs/*" + - "@expressive-code/*" + - "@docsearch/*" + - "rehype-*" + - "remark-*" + - "typedoc" + - "typedoc-*" + - "sharp" + ui: + patterns: + - "react" + - "react-*" + - "@fluentui/*" + - "storybook" + - "@storybook/*" + - "prism-react-renderer" + - "clsx" + vscode: + patterns: + - "@vscode/*" + - "vscode-*" + formatting: + patterns: + - "prettier" + - "prettier-plugin-*" + microsoft: + patterns: + - "@microsoft/*" + chronus: + patterns: + - "@chronus/*" + tree-sitter: + patterns: + - "tree-sitter-*" + - "web-tree-sitter" + octokit: + patterns: + - "@octokit/*" + azure: + patterns: + - "@azure/*" + yarnpkg: + patterns: + - "@yarnpkg/*" + babel: + patterns: + - "@babel/*" + scalar: + patterns: + - "@scalar/*" + monaco: + patterns: + - "monaco-editor" + - "monaco-editor-core" + + # GitHub Actions + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + exclude-paths: + - ".github/workflows/*.lock.{yaml,yml}" + labels: [] # conflict with our labels in labels.ts + groups: + actions: + patterns: + - "*" diff --git a/.github/instructions/http-client-java.instructions.md b/.github/instructions/http-client-java.instructions.md index cca60557489..7cfa6385443 100644 --- a/.github/instructions/http-client-java.instructions.md +++ b/.github/instructions/http-client-java.instructions.md @@ -16,14 +16,17 @@ Steps: 5. Commit the changes to `package.json` and `package-lock.json`. 6. If there is an update to the `http-specs` or `azure-http-specs` libraries, run `Generate.ps1` in `generator/http-client-generator-test` and commit the generated changes in that folder. 7. If there is an update to the `http-specs` library, run `Generate.ps1` in `generator/http-client-generator-clientcore-test` and commit the generated changes in that folder. -8. Call `pnpm change add @typespec/http-client-java`, select "Bump dependencies" in terminal, then input a summary in terminal. Commit the new md file in ".chronus" folder of repository root. +8. Call `pnpm change add @typespec/http-client-java --kind=dependencies --message=""`. Commit the new md file in ".chronus" folder of repository root. # Prepare for minor/patch release Steps: -1. Bump the minor or patch version of `@typespec/http-client-java` in the three `package.json` files. -2. Save the files and run `npm install` in the root so that `package-lock.json` is updated. +1. Checkout "main" branch, pull the latest changes. +2. Create a new branch. The name must follow the pattern "publish/http-client-java-". Remind user that this branch must be pushed to remote upstream. +3. Invoke `pnpm prepare-publish --only @typespec/http-client-java` in repository root. Commit the changes. +4. Invoke `npm install` in the root to update `package-lock.json`. Commit the changes. +5. Update the two `package.json` files in `generator/http-client-generator-clientcore-test` and `generator/http-client-generator-test` to match the new version in the root `package.json`. Commit the changes. The publish workflow (to NPM) will be automatically triggered after the PR is merged: https://dev.azure.com/azure-sdk/internal/_build?definitionId=7294 @@ -46,4 +49,8 @@ Typical task: `add e2e test case for , scenario is `. 9. Start Spector server by `npm run spector-start`. 10. Run the tests (`mvn test`). Make sure all tests pass. 11. Stop Spector server by `npm run spector-stop`. -12. Call `pnpm change add @typespec/http-client-java`, select "Internal" in terminal, then input a summary in terminal. Commit the new md file in ".chronus" folder of repository root. +12. Call `pnpm change add @typespec/http-client-java --kind=internal --message=""`. Commit the new md file in ".chronus" folder of repository root. + +# Add feature or fix bug + +- Run `npm run format` and commit the formatted code, before finalizing. Do not include any other changes in the commit. diff --git a/.github/matchers/actionlint.json b/.github/matchers/actionlint.json new file mode 100644 index 00000000000..4613e1617bf --- /dev/null +++ b/.github/matchers/actionlint.json @@ -0,0 +1,17 @@ +{ + "problemMatcher": [ + { + "owner": "actionlint", + "pattern": [ + { + "regexp": "^(?:\\x1b\\[\\d+m)?(.+?)(?:\\x1b\\[\\d+m)*:(?:\\x1b\\[\\d+m)*(\\d+)(?:\\x1b\\[\\d+m)*:(?:\\x1b\\[\\d+m)*(\\d+)(?:\\x1b\\[\\d+m)*: (?:\\x1b\\[\\d+m)*(.+?)(?:\\x1b\\[\\d+m)* \\[(.+?)\\]$", + "file": 1, + "line": 2, + "column": 3, + "message": 4, + "code": 5 + } + ] + } + ] +} diff --git a/.github/skills/csharp-spector-coverage-gaps/SKILL.md b/.github/skills/csharp-spector-coverage-gaps/SKILL.md new file mode 100644 index 00000000000..c95fb1a5a7b --- /dev/null +++ b/.github/skills/csharp-spector-coverage-gaps/SKILL.md @@ -0,0 +1,486 @@ +--- +name: csharp-spector-coverage-gaps +description: Discovers and implements gaps in Spector test coverage for the C# HTTP client emitter. Use when asked to find missing Spector scenarios, add Spector test coverage, or implement a specific Spector spec for the C# emitter. +--- + +# Discovering and implementing Spector coverage gaps for http-client-csharp + +## Overview + +This skill discovers which Spector scenarios the C# emitter (`@typespec/http-client-csharp`) does **not** yet cover, then implements the missing test(s). Spector scenarios are defined in `@typespec/http-specs` and `@azure-tools/azure-http-specs`. The coverage dashboard is at . + +> **Note:** `{PKG}` refers to `/packages/http-client-csharp` throughout this document. + +## Inputs + +You may receive one of: + +- **"Find coverage gaps"** — discover all missing scenarios and present them. +- **Spector spec link** — a link to a specific spec under `packages/http-specs/specs/...` or `packages/azure-http-specs/specs/...`. +- **Spec name** — e.g., `http/encode/duration`, `http/type/model/flatten`, `http/type/union/discriminated`. + +## Output + +- A report of coverage gaps (when discovering). +- New or updated C# NUnit test file(s) under `{PKG}/generator/TestProjects/Spector.Tests/Http/`. +- Updated `{PKG}/generator/TestProjects/Spector.Tests/TestProjects.Spector.Tests.csproj` if a new project reference is needed. +- Regenerated client code (via `Generate.ps1`). + +## Workflow + +- [ ] Ensure prerequisites are met (npm ci, npm run build) +- [ ] Discover coverage gaps or identify the target spec +- [ ] Verify the spec is not in the failing specs list +- [ ] Generate the C# client for the target spec (unstubbed with `-Stubbed $false`, or use Test-Spector.ps1) +- [ ] Read the generated client to understand the API surface +- [ ] Read the TypeSpec scenario file to understand expected behavior +- [ ] Find or create the test file +- [ ] Implement the test(s) following existing conventions +- [ ] Run the tests using `Test-Spector.ps1 -filter ""` +- [ ] Validate all tests pass + +--- + +## Prerequisites — Environment setup + +Before starting, ensure the build environment is ready. These instructions **supersede** the repo-root `pnpm` instructions. + +1. **Install dependencies** (from `{PKG}`): + ```powershell + cd {PKG} + npm ci + ``` +2. **Build the package**: + ```powershell + npm run build + ``` + +> ⚠️ Do NOT run `pnpm install` or `pnpm build` at the repo root — only the http-client-csharp package build is needed. + +--- + +## Step 1 — Discover coverage gaps + +### How specs are filtered + +The file `{PKG}/eng/scripts/Spector-Helper.psm1` defines which specs are included/excluded: + +**Failing specs** are defined in `{PKG}/eng/scripts/Spector-Helper.psm1` in the `$failingSpecs` array. Always check that file for the current list — do not hardcode specs here. + +**Azure allow-list** (only these Azure specs are tested): + +- `http/client/structure/client-operation-group` +- `http/client/structure/default` +- `http/client/structure/multi-client` +- `http/client/structure/renamed-operation` +- `http/client/structure/two-operation-group` +- `http/resiliency/srv-driven` + +All other specs from `@typespec/http-specs` are included by default. + +### Discovering gaps programmatically + +Compare available specs against existing tests. Run this from `{PKG}`: + +```powershell +Import-Module "{PKG}/eng/scripts/Spector-Helper.psm1" -DisableNameChecking -Force + +# Get all valid specs +$specs = Get-Sorted-Specs | ForEach-Object { Get-SubPath $_ } + +# Get all test files +$testFiles = Get-ChildItem -Path "{PKG}/generator/TestProjects/Spector.Tests/Http" -Recurse -Filter "*Tests.cs" | + ForEach-Object { $_.FullName } + +# For each spec, check if a corresponding test directory/file exists +foreach ($spec in $specs) { + $specParts = $spec -replace '/', '\' -split '\\' + # Convert to expected test path segments + $testPath = "{PKG}/generator/TestProjects/Spector.Tests/Http" + # ... check if test exists +} +``` + +Alternatively, **manually compare** the list of specs against existing test files: + +**Existing test coverage** (test directories under `Spector.Tests/Http/`): + +``` +Authentication/ApiKey, Authentication/Http/Custom, Authentication/OAuth2, Authentication/Union +Client/Naming, Client/Structure/{ClientOperationGroup,Default,MultiClient,RenamedOperation,TwoOperationGroup} +Documentation +Encode/{Array,Bytes,DateTime,Numeric} +Parameters/{Basic,BodyOptionality,CollectionFormat,Path,Query,Spread} +Payload/{ContentNegotiation,JsonMergePatch,MediaType,Multipart,Pageable,Xml} +Resiliency/SrvDriven/{V1,V2} +Response/StatusCodeRange +Routes +Serialization/EncodedName/Json +Server/{Endpoint/NotDefined,Path/Multiple,Path/Single,Versions/NotVersioned,Versions/Versioned} +SpecialHeaders/{ConditionalRequest,Repeatability} +Versioning/{Added,MadeOptional,Removed,RenamedFrom,ReturnTypeChangedFrom,TypeChangedFrom} +_Type/{Dictionary,Model/Empty,Model/Inheritance/*,Model/Usage,Model/Visibility,Property/*,Scalar,Union,_Array,_Enum/*} +``` + +### Accurate gap detection + +The naive approach of matching spec paths to test directory names can produce false positives because: + +- C# reserved words get underscore-prefixed in test dirs (e.g., `type/` → `_Type/`, `array` → `_Array`, `enum` → `_Enum`) +- kebab-case gets converted to PascalCase (e.g., `content-negotiation` → `ContentNegotiation`) +- Some test files cover a parent spec but not sub-specs (e.g., `UnionTests.cs` covers `type/union` but NOT `type/union/discriminated`) + +**To find real gaps**, verify each candidate by checking whether a test _directory_ exists for the spec's exact path, including sub-paths. A test file at a parent level does NOT cover child specs. + +**Known failing specs** are tracked in `$failingSpecs` in `{PKG}/eng/scripts/Spector-Helper.psm1`. Always read that file for the current list. + +> **Important:** The gap list evolves over time. Always re-run the comparison to get current gaps. All committed Spector libraries are stubbed — `[SpectorTest]` will auto-skip tests unless you regenerate with `-Stubbed $false` or use `Test-Spector.ps1`. + +### Understanding stubbed vs unstubbed generation + +All Spector libraries **committed to the repository are stubbed**. `Generate.ps1` defaults to `$Stubbed = $true`, which passes `--option @typespec/http-client-csharp.generator-name=StubLibraryGenerator` to the emitter. Stubbed clients use expression-bodied constructors (`=>`) instead of block bodies (`{ }`), and the `[SpectorTest]` attribute automatically skips tests for stubbed clients. + +To generate **unstubbed** code (for local testing), pass `-Stubbed $false`: + +```powershell +pwsh eng/scripts/Generate.ps1 -filter "" -Stubbed $false +``` + +However, the recommended way to test is via `Test-Spector.ps1` (see Step 7), which handles the unstubbed regeneration, test execution, and directory restoration automatically. + +--- + +## Step 2 — Read the spec to understand expected behavior + +Spec files live in `{PKG}/node_modules/@typespec/http-specs/specs/` (or `@azure-tools/azure-http-specs/specs/` for Azure specs). + +If node_modules is not installed, read from the source at `/packages/http-specs/specs/`. + +Each spec contains: + +- **`main.tsp`** — the TypeSpec definition with `@scenario` and `@scenarioDoc` decorators +- **`client.tsp`** (optional) — client-level customizations; takes priority over `main.tsp` during generation +- **`tspconfig.yaml`** (optional in the Spector test project) — C#-specific generation options + +Read the `@scenarioDoc` decorators to understand: + +- The HTTP method, path, and expected parameters +- The expected request body shape +- The expected response status code and body +- Any special behavior (e.g., "should return 204", "should send header X") + +--- + +## Step 3 — Generate the C# client for the target spec + +Use `Generate.ps1` with a filter to generate only the specific spec. By default, `Generate.ps1` generates **stubbed** code (same as what is committed to the repo). To generate **unstubbed** code for local testing, pass `-Stubbed $false`: + +```powershell +cd {PKG} +# Generate unstubbed (for local testing/development) +pwsh eng/scripts/Generate.ps1 -filter "" -Stubbed $false + +# Generate stubbed (default, matches what is committed to repo) +pwsh eng/scripts/Generate.ps1 -filter "" +``` + +Examples: + +```powershell +# Single spec (unstubbed for testing) +pwsh eng/scripts/Generate.ps1 -filter "http/encode/duration" -Stubbed $false + +# Versioning spec (generates v1 + v2 automatically) +pwsh eng/scripts/Generate.ps1 -filter "http/versioning/added" -Stubbed $false +``` + +The generated code lands in `{PKG}/generator/TestProjects/Spector//src/Generated/`. + +### Verify generation succeeded + +```powershell +# Check that client code was generated +Get-ChildItem "{PKG}/generator/TestProjects/Spector//src/Generated/" -Filter "*Client.cs" +``` + +> **Note:** All committed Spector libraries are stubbed. The `[SpectorTest]` attribute automatically skips tests for stubbed clients. Use `Test-Spector.ps1` (Step 7) to regenerate unstubbed, run tests, and restore automatically. + +--- + +## Step 4 — Read the generated client API surface + +Browse the generated code to understand: + +1. **Client class(es)**: `*Client.cs` — the entry point(s) +2. **Sub-clients**: accessed via `Get*Client()` methods +3. **Operations**: async methods like `GetAsync()`, `PutAsync(body)`, `SendAsync()` +4. **Models**: under `Models/` — request/response shapes +5. **Constructor signature**: `new XClient(Uri endpoint, XClientOptions options)` or `new XClient(Uri endpoint, KeyCredential credential, XClientOptions options)` + +Pay attention to: + +- Method names (they map to TypeSpec operation names) +- Parameter types (models, primitives, BinaryData) +- Return types (`ClientResult`, `ClientResult`, `AsyncPageable`) + +--- + +## Step 5 — Create or extend the test file + +### Directory and namespace conventions + +The test directory structure mirrors the spec path with these transformations: + +- `http/` → `Http/` +- kebab-case → PascalCase (e.g., `content-negotiation` → `ContentNegotiation`) +- `type/` → `_Type/` (leading underscore because `Type` is a C# keyword) +- `array` → `_Array` (same reason) +- `enum` → `_Enum` (same reason) + +**Namespace pattern**: `TestProjects.Spector.Tests.Http.` + +Example mappings: +| Spec path | Test directory | Namespace | +|-----------|---------------|-----------| +| `http/encode/duration` | `Http/Encode/Duration/` | `TestProjects.Spector.Tests.Http.Encode.Duration` | +| `http/type/union/discriminated` | `Http/_Type/Union/Discriminated/` | `TestProjects.Spector.Tests.Http._Type.Union.Discriminated` | +| `http/special-words` | `Http/SpecialWords/` | `TestProjects.Spector.Tests.Http.SpecialWords` | + +### Test file template + +```csharp +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Threading.Tasks; +using ; +using NUnit.Framework; + +namespace TestProjects.Spector.Tests.Http.. +{ + public class Tests : SpectorTestBase + { + [SpectorTest] + public Task () => Test(async (host) => + { + var response = await new (host, null).Async(); + Assert.AreEqual(, response.GetRawResponse().Status); + }); + } +} +``` + +### Common test patterns + +**Simple void operation (204 response):** + +```csharp +[SpectorTest] +public Task SimpleOp() => Test(async (host) => +{ + var response = await new MyClient(host, null).DoThingAsync(); + Assert.AreEqual(204, response.GetRawResponse().Status); +}); +``` + +**GET with typed response:** + +```csharp +[SpectorTest] +public Task GetValue() => Test(async (host) => +{ + var response = await new MyClient(host, null).GetValueAsync(); + Assert.AreEqual("expected", response.Value); +}); +``` + +**GET with model response:** + +```csharp +[SpectorTest] +public Task GetModel() => Test(async (host) => +{ + var response = await new MyClient(host, null).GetModelAsync(); + Assert.AreEqual("name", response.Value.Name); + Assert.AreEqual(42, response.Value.Age); +}); +``` + +**PUT/POST with body:** + +```csharp +[SpectorTest] +public Task SendModel() => Test(async (host) => +{ + var body = new MyModel("name", 42); + var response = await new MyClient(host, null).SendAsync(body); + Assert.AreEqual(204, response.GetRawResponse().Status); +}); +``` + +**Round-trip (GET then PUT):** + +```csharp +[SpectorTest] +public Task RoundTrip() => Test(async (host) => +{ + var client = new MyClient(host, null); + var getResult = await client.GetAsync(); + var response = await client.PutAsync(getResult.Value); + Assert.AreEqual(204, response.GetRawResponse().Status); +}); +``` + +**Error assertion:** + +```csharp +[SpectorTest] +public Task InvalidKey() => Test((host) => +{ + var exception = Assert.ThrowsAsync( + () => new MyClient(host, new ApiKeyCredential("invalid"), null).CallAsync()); + Assert.AreEqual(403, exception!.Status); + return Task.CompletedTask; +}); +``` + +**Sub-client access:** + +```csharp +[SpectorTest] +public Task SubClientOp() => Test(async (host) => +{ + var response = await new MyClient(host, null) + .GetSubClient() + .DoThingAsync(); + Assert.AreEqual(204, response.GetRawResponse().Status); +}); +``` + +**Pagination:** + +```csharp +[SpectorTest] +public Task ListItems() => Test(async (host) => +{ + var items = new MyClient(host, null).GetItemsAsync(); + int count = 0; + await foreach (var item in items) + { + count++; + } + Assert.Greater(count, 0); +}); +``` + +### Additional imports commonly needed + +```csharp +using System; +using System.ClientModel; // ClientResult, ClientResultException, ApiKeyCredential +using System.IO; // For file/stream scenarios +using NUnit.Framework; // Test framework +``` + +--- + +## Step 6 — Update the .csproj if needed + +If a new Spector test project directory was created (new spec), a project reference may be needed in `TestProjects.Spector.Tests.csproj`: + +```xml + +``` + +Check existing references to match the pattern. The project name typically matches the `package-name` from `tspconfig.yaml` or is derived from the namespace. + +> Only add a project reference if one doesn't already exist for the spec. + +--- + +## Step 7 — Build and run the tests + +### Recommended: Use Test-Spector.ps1 + +The `Test-Spector.ps1` script is the recommended way to test Spector specs. It automatically: + +1. Regenerates the spec as **unstubbed** (so tests are not auto-skipped) +2. Runs the tests for that spec +3. Restores the directory to its original stubbed state + +```powershell +cd {PKG} +# Test a specific spec +pwsh eng/scripts/Test-Spector.ps1 -filter "" +``` + +Example: + +```powershell +pwsh eng/scripts/Test-Spector.ps1 -filter "http/encode/duration" +``` + +### Run full Spector test suite + +```powershell +pwsh eng/scripts/Get-Spector-Coverage.ps1 +``` + +### Manual approach (if needed) + +If you need more control, you can manually generate unstubbed, build, and run tests: + +```powershell +cd {PKG} + +# Generate unstubbed +pwsh eng/scripts/Generate.ps1 -filter "" -Stubbed $false + +# Build +dotnet build generator + +# Run only your new tests +dotnet test generator/TestProjects/Spector.Tests/TestProjects.Spector.Tests.csproj ` + --filter "FullyQualifiedName~TestProjects.Spector.Tests.Http." + +# Restore the directory to stubbed state when done +git clean -xfd generator/TestProjects/Spector/ +git restore generator/TestProjects/Spector/ +``` + +--- + +## Step 8 — Handle special cases + +### Versioning specs + +Versioning specs generate **two clients** (v1 and v2). Tests go in separate subdirectories: + +``` +Http/Versioning//V1/V1Tests.cs +Http/Versioning//V2/V2Tests.cs +``` + +Generation is handled automatically by `Generate.ps1` when the path contains `versioning`. + +### Srv-driven (resiliency) specs + +Similar to versioning — generates v1 and v2 clients from `old.tsp` and `main.tsp`. + +### Specs with tspconfig.yaml + +Some specs have a `tspconfig.yaml` in the Spector test project that overrides the `package-name`. Check `{PKG}/generator/TestProjects/Spector//tspconfig.yaml` before importing the generated namespace. + +--- + +## Notes + +- **Do not modify `Spector-Helper.psm1`** to remove items from the failing list unless you're sure the generator now supports them. +- **All committed Spector libraries are stubbed** — `Generate.ps1` defaults to `$Stubbed = $true`. Use `Test-Spector.ps1` to temporarily regenerate unstubbed and run tests. +- **Tests auto-skip** when the generated client is stubbed — it's safe to write tests for stubbed specs. They'll activate when `Test-Spector.ps1` regenerates them unstubbed. +- Only commit: test files (`.cs`), `.csproj` changes, and `tspconfig.yaml` if needed. +- Follow existing test naming conventions: `Tests.cs` in the matching directory. +- Use `[SpectorTest]` attribute (not `[Test]`) for all Spector tests — it enables auto-skip for stubbed implementations. +- All test classes must inherit from `SpectorTestBase`. +- Do not add change logs — the http-client-csharp instructions say they are not needed. +- Do not comment out or delete existing tests. diff --git a/.github/skills/emitter-prep-for-pr/SKILL.md b/.github/skills/emitter-prep-for-pr/SKILL.md new file mode 100644 index 00000000000..42a5e1d6339 --- /dev/null +++ b/.github/skills/emitter-prep-for-pr/SKILL.md @@ -0,0 +1,299 @@ +--- +name: emitter-prep-for-pr +description: > + Prepare language emitter changes for PR: validate (build, format, lint), add + a changeset, and push. This skill is specifically for the language emitter + packages (http-client-python, http-client-csharp, http-client-java) - NOT for + core TypeSpec packages like compiler, http, openapi3, etc. Use when the user + wants to finalize emitter changes, says things like "prep for pr", "prepare + for PR", "validate and push", "add changeset", or "finalize changes". +--- + +# Emitter Prep for PR + +Prepares language emitter changes for pull request by running build/format/lint, +creating a changeset with an appropriate message, and pushing to the remote branch. + +**This skill is for language emitter packages only:** + +- `http-client-python` +- `http-client-csharp` +- `http-client-java` + +Do NOT use this skill for core TypeSpec packages (compiler, http, openapi3, etc.). + +## Workflow + +### Step 1: Identify changed language emitter packages + +Determine which language emitter packages have changes: + +```bash +cd ~/Desktop/github/typespec + +# Compare against upstream/main (microsoft/typespec) if available, otherwise main +BASE_BRANCH=$(git rev-parse --verify upstream/main 2> /dev/null && echo "upstream/main" || echo "main") + +# Filter for language emitter packages only +git diff "$BASE_BRANCH" --name-only | grep "^packages/http-client-" | cut -d'/' -f2 | sort -u +``` + +This filters for `http-client-python`, `http-client-csharp`, `http-client-java`, etc. + +### Step 2: Validate each changed emitter package + +For each changed emitter package (e.g., `http-client-python`, `http-client-csharp`, `http-client-java`): + +```bash +cd ~/Desktop/github/typespec/packages/PACKAGE_NAME + +# Build +npm run build +if [ $? -ne 0 ]; then + echo "Build failed for PACKAGE_NAME" + exit 1 +fi + +# Format +npm run format +if [ $? -ne 0 ]; then + echo "Format failed for PACKAGE_NAME" + exit 1 +fi + +# Lint (if available) +npm run lint 2> /dev/null || echo "No lint script for PACKAGE_NAME" +``` + +If any step fails, report the error and stop. Do not proceed to changeset. + +### Step 3: Run format and spell check at repo root + +After validating individual packages, run format and spell check at the repo root: + +```bash +cd ~/Desktop/github/typespec + +# Format all files +pnpm format + +# Spell check +pnpm cspell +``` + +If spell check fails, either fix the typos or add words to the cspell dictionary. + +### Step 4: Analyze changes for changeset message + +Examine the changes to determine an appropriate changeset message: + +```bash +cd ~/Desktop/github/typespec + +# Determine base branch +BASE_BRANCH=$(git rev-parse --verify upstream/main 2> /dev/null && echo "upstream/main" || echo "main") + +# Get commit messages on this branch +git log "$BASE_BRANCH"..HEAD --oneline + +# Get changed files +git diff "$BASE_BRANCH" --name-only + +# Get the actual code changes (for understanding intent) +git diff "$BASE_BRANCH" --stat +``` + +### Step 5: Determine changeset parameters + +Based on the changes, determine: + +1. **changeKind** - one of: + - `internal` - Internal changes not user-facing (tests, docs, refactoring) + - `fix` - Bug fixes (patch version bump) + - `feature` - New features (minor version bump) + - `deprecation` - Deprecating existing features (minor version bump) + - `breaking` - Breaking changes (major version bump) + - `dependencies` - Dependency bumps (patch version bump) + +2. **packages** - affected packages, e.g.: + - `@typespec/http-client-python` + - `@typespec/http-client-csharp` + - `@typespec/http-client-java` + +3. **message** - concise description of the change + +### Step 6: Create changeset file + +Create a changeset file in `.chronus/changes/`: + +```bash +cd ~/Desktop/github/typespec + +# Generate filename with timestamp +TIMESTAMP=$(date +"%Y-%m-%d-%H-%M-%S") +FILENAME=".chronus/changes/BRANCH_NAME-${TIMESTAMP}.md" + +cat > "$FILENAME" << 'EOF' +--- +changeKind: +packages: + - "" +--- + + +EOF +``` + +### Step 7: Show changes and prompt user + +Display all changes to the user: + +```bash +cd ~/Desktop/github/typespec +git status +git diff --stat +``` + +Then use AskUserQuestion to confirm: + +- Show the changeset that will be added +- Show the files that will be committed +- Show which remote will be used: "Will push to `origin`" +- Ask: "Do these changes look good to push to origin?" + +Options: + +- "Yes, push to origin" - proceed with commit and push to origin +- "Push to different remote" - ask which remote to use instead +- "Edit changeset" - let user modify the changeset message/kind +- "Cancel" - abort without pushing + +If user selects "Push to different remote", ask which remote name to use and push to that instead of origin. + +### Step 8: Commit and push (if approved) + +If user approves, commit the changes: + +```bash +cd ~/Desktop/github/typespec + +# Stage all changes +git add -A + +# Commit with descriptive message +git commit -m "$( + cat << 'EOF' + + +Co-Authored-By: Claude Opus 4.5 +EOF +)" +``` + +Then push to the user's fork. **Default to `origin`**, but if the user specified a different remote, use that instead: + +```bash +# Get current branch name +BRANCH=$(git rev-parse --abbrev-ref HEAD) + +# Push to origin by default (or user-specified remote) +git push -u origin "$BRANCH" +``` + +### Asking about remote + +When prompting the user in Step 7, include the remote that will be used: + +- Show: "Will push to `origin` (your fork)" +- If the user says to use a different remote (e.g., "push to `my_fork`"), use that instead + +**Important:** Never push directly to the `microsoft/typespec` remote (usually named `upstream`). + +## Changeset Message Guidelines + +Write changeset messages that are: + +1. **User-focused** - Describe the impact on users, not implementation details +2. **Concise** - One sentence, starting with a verb (Add, Fix, Update, Remove) +3. **Specific** - Mention the feature/fix clearly + +### Examples by changeKind: + +**internal:** + +- "Refactor namespace resolution logic for clarity" +- "Add mock API tests for paging scenarios" +- "Update development tooling and skills" + +**fix:** + +- "Fix incorrect deserialization of nullable enum properties" +- "Fix client initialization when using custom endpoints" + +**feature:** + +- "Add support for XML serialization in request bodies" +- "Add `@clientOption` decorator for customizing client behavior" + +**deprecation:** + +- "Deprecate `legacyMode` option in favor of `compatibilityMode`" + +**breaking:** + +- "Remove deprecated `v1` client generation mode" +- "Change default serialization format from XML to JSON" + +## Language Emitter Package Names + +| Folder | Package Name | +| -------------------- | ------------------------------ | +| `http-client-python` | `@typespec/http-client-python` | +| `http-client-csharp` | `@typespec/http-client-csharp` | +| `http-client-java` | `@typespec/http-client-java` | + +## Notes + +### When to use each changeKind + +- **internal**: Tests, documentation, refactoring, CI/CD changes, skill updates +- **fix**: Bug fixes that users would notice +- **feature**: New capabilities users can use +- **deprecation**: Marking something as deprecated (still works, but discouraged) +- **breaking**: Removing or changing behavior in incompatible ways + +### Multiple packages + +If changes affect multiple packages **with the same change kind**, list all of them in a single changeset: + +```yaml +packages: + - "@typespec/http-client-python" + - "@typespec/http-client-csharp" +``` + +**If packages have different change kinds, create separate changeset files for each.** For example, if the PR adds a feature to `@typespec/http-client-python` and fixes a bug in `@typespec/http-client-csharp`, create two files: + +```yaml +# File 1: feature for python +changeKind: feature +packages: + - "@typespec/http-client-python" +``` + +```yaml +# File 2: fix for csharp +changeKind: fix +packages: + - "@typespec/http-client-csharp" +``` + +### Skipping changeset + +Some changes don't need a changeset: + +- Changes only to `.github/skills/` (CI will allow this) +- Changes only to test files (if marked in `changedFiles` config) +- Changes only to markdown files (if marked in `changedFiles` config) + +Check `.chronus/config.yaml` for `changedFiles` patterns that are excluded. diff --git a/.github/skills/http-client-python-bump-and-release/SKILL.md b/.github/skills/http-client-python-bump-and-release/SKILL.md new file mode 100644 index 00000000000..d380839446b --- /dev/null +++ b/.github/skills/http-client-python-bump-and-release/SKILL.md @@ -0,0 +1,86 @@ +--- +name: http-client-python-bump-and-release +description: Create a PR to bump TypeSpec/Azure Tools dependencies, update peer dependencies, or release a new version of the http-client-python package. +--- + +# HTTP Client Python Bump and Release + +Create a PR to bump dependencies and release a new version of the http-client-python package. + +> **Note:** `{REPO}` refers to the root folder of the `microsoft/typespec` repository. + +## Prerequisites + +Before starting, verify that `npm-check-updates` is available: + +```bash +npx npm-check-updates --version +``` + +If the command fails or prompts for installation, install it globally: + +```bash +npm install -g npm-check-updates +``` + +## Workflow + +1. Navigate to the package directory: + + ```bash + cd {REPO}/packages/http-client-python + ``` + +2. Reset and sync with main: + + ```bash + git reset HEAD && git checkout . && git checkout origin/main && git pull origin main + ``` + +3. Create release branch (use current date in MM-DD format): + + ```bash + git checkout -b publish/python-release-{MM-DD} + ``` + +4. Update dependencies: + + ```bash + npx npm-check-updates -u --filter @typespec/*,@azure-tools/* --packageFile package.json + ``` + +5. Update `peerDependencies` in package.json: + - If format is `">=0.a.b <1.0.0"`: Update only the `0.a.b` portion, keep the range format unchanged + - If format is `"^1.a.b"`: Update to the latest version + +6. Verify `devDependencies` versions for specs: + - Check `@typespec/http-specs` and `@azure-tools/azure-http-specs` + - If the original version in `package.json` is newer than the updated value, keep the original version + - Dev versions are typically in the form `x.y.z-alpha.N-dev.M` (e.g., `0.1.0-alpha.37-dev.3`). + + Example: + - Original: `@typespec/http-specs: 0.1.0-alpha.12-dev.5`, updated by step 4 to `0.1.0-alpha.11` → keep `0.1.0-alpha.12-dev.5`. + - Original: `@typespec/http-specs: 0.1.0-alpha.12-dev.5`, updated by step 4 to `0.1.0-alpha.12` → keep `0.1.0-alpha.12` (step 4 works as expected). + - Original: `@azure-tools/azure-http-specs: 0.1.0-alpha.12-dev.2`, updated to `0.1.0-alpha.11` → keep `0.1.0-alpha.12-dev.2`. + - Original: `@azure-tools/azure-http-specs: 0.1.0-alpha.12-dev.2`, updated to `0.1.0-alpha.12` → keep `0.1.0-alpha.12` (step 4 works as expected). + +7. Run version change script: + + ```bash + npm run change:version + ``` + +8. Build and commit: + + ```bash + npm install && npm run build && git add -u && git commit -m "bump version" + ``` + +9. Push and create PR: + + ```bash + cd {REPO} + git push origin HEAD + ``` + +10. Create PR with title `[python] release new version` and no description. diff --git a/.github/skills/pnpm-format/SKILL.md b/.github/skills/pnpm-format/SKILL.md new file mode 100644 index 00000000000..70f9f7f0885 --- /dev/null +++ b/.github/skills/pnpm-format/SKILL.md @@ -0,0 +1,31 @@ +--- +name: pnpm-format +description: Format the codebase with pnpm and recover from common formatting failures. +--- + +# Format code with pnpm + +Use this skill any time formatting is required in the TypeSpec repo. Do not assume formatting happens automatically; always run `pnpm format` following this guidance. + +## Preconditions + +- Command must run from the repository root (where `package.json` and `pnpm-workspace.yaml` live). +- Dependencies must be installed. + +## Steps + +1. Confirm you are at the repo root. +2. If `node_modules` are missing or `pnpm` complains about missing packages, run: + ```bash + pnpm install + ``` +3. Run the formatter: + ```bash + pnpm format + ``` +4. If the command fails with `ERR_PNPM_NO_IMPORTER_MANIFEST_FOUND`, you are not at the repo root. `cd` to the root and retry. +5. If `pnpm format` exits with a non-zero code but prints a list of changed files, re-run `pnpm format` once to ensure a clean exit. + +## Notes + +- Do not cancel the command; formatting may take about a minute. diff --git a/.github/skills/python-sdk-spector-mock-api-tests/SKILL.md b/.github/skills/python-sdk-spector-mock-api-tests/SKILL.md new file mode 100644 index 00000000000..806a05cd16a --- /dev/null +++ b/.github/skills/python-sdk-spector-mock-api-tests/SKILL.md @@ -0,0 +1,336 @@ +--- +name: writing-python-sdk-spector-mock-api-tests +description: Writes TypeSpec http-client-python generator mock API tests (azure/unbranded/shared) from a Spector case. Use when given a Spector case link or a PR link that modifies Spector cases under http-specs/azure-http-specs. +--- + +# Writing python SDK tests from a Spector case + +## Inputs + +You may receive either: + +- **Spector case link** (preferred): link to a specific scenario/case under: + - `https://github.com/microsoft/typespec/tree/main/packages/http-specs/specs/...` + - `https://github.com/Azure/typespec-azure/tree/main/packages/azure-http-specs/specs/...` +- **PR link**: a GitHub PR that changes one or more Spector cases. + +Spector cases define the **expected request + response**. The goal is to add/extend python tests that validate the generated SDK behaves accordingly. + +## Output + +A python pytest test (sync) added to one of: + +- `packages/http-client-python/tests/mock_api/azure` +- `packages/http-client-python/tests/mock_api/unbranded` +- `packages/http-client-python/tests/mock_api/shared` + +And a corresponding async pytest test added under the matching `asynctests/` folder: + +- `packages/http-client-python/tests/mock_api/azure/asynctests` +- `packages/http-client-python/tests/mock_api/unbranded/asynctests` +- `packages/http-client-python/tests/mock_api/shared/asynctests` + +## Workflow (copy as checklist) + +Test-writing progress: + +- [ ] Ensure prerequisites are met (pnpm install, package build) +- [ ] Identify the Spector case link (directly, or extracted from PR) +- [ ] Update spec dependency version if the case is from an unreleased PR +- [ ] Decide the destination folder(s): azure vs unbranded vs shared +- [ ] Regenerate the specific generated client (do NOT run full regeneration) +- [ ] Find existing test file to extend (or create a new one) +- [ ] Implement sync + async test(s) that match the case’s request/response expectations +- [ ] Update test requirements only if a new dependency is introduced +- [ ] Format changed python files with Black (`python -m black --config ./eng/scripts/ci/config/pyproject.toml`) +- [ ] Validate test locally (start Spector mock server + run pytest) +- [ ] Add a changelog entry under `.chronus/changes` + +## Prerequisites — Environment setup + +Before starting, ensure the build environment is ready: + +1. **Install dependencies** (from repo root): + ```bash + pnpm install + ``` +2. **Build the http-client-python package** (required before any `tsp compile`): + ```bash + cd packages/http-client-python + npm install + npm run build + ``` + +> ⚠️ Do NOT run `pnpm build` at the repo root — it builds the entire monorepo (including the website) and takes 7+ minutes. Only the http-client-python package build is needed. + +## Step 1 — Identify the Spector case link + +### If input is a Spector case link + +Use it directly. + +### If input is a PR link + +1. List changed files. +2. From changed files, pick the ones under: + - `packages/http-specs/specs/` (microsoft/typespec) + - `packages/azure-http-specs/specs/` (Azure/typespec-azure) +3. Extract the specific case/scenario path(s) to target. + +## Step 2 — Update spec dependency (if needed) + +If the Spector case comes from a PR that hasn't been released yet, you must bump the spec dependency in `packages/http-client-python/package.json`: + +- For `Azure/typespec-azure` cases: update `@azure-tools/azure-http-specs` +- For `microsoft/typespec` cases: update `@typespec/http-specs` + +To find the latest dev version, check npm: + +```bash +npm view @azure-tools/azure-http-specs versions --json | tail -5 +npm view @typespec/http-specs versions --json | tail -5 +``` + +Pick the newest version that includes the Spector case you need. Prefer a stable version (e.g., `0.1.0-alpha.38`) if one exists; only fall back to a `-dev.X` version (e.g., `0.1.0-alpha.38-dev.2`) when no stable version contains the change yet. + +**Example 1 — a newer stable version is available:** + +```jsonc +// Before +"@azure-tools/azure-http-specs": "0.1.0-alpha.37", + +// After (stable 0.1.0-alpha.38 exists and includes the case) +"@azure-tools/azure-http-specs": "0.1.0-alpha.38", +``` + +**Example 2 — no new stable, only a dev version:** + +```jsonc +// Before +"@azure-tools/azure-http-specs": "0.1.0-alpha.37", + +// After (0.1.0-alpha.38 does not exist yet, use dev) +"@azure-tools/azure-http-specs": "0.1.0-alpha.38-dev.2", +``` + +Same pattern applies to `@typespec/http-specs`. + +After bumping, run `npm run install` under `packages/http-client-python` to update the lock file. + +## Step 3 — Choose where to put the test + +### Rule A: Spector in Azure/typespec-azure + +Write the python test in: + +- `packages/http-client-python/tests/mock_api/azure` + +### Rule B: Spector in microsoft/typespec + +You may need either: + +- **Option (a) shared only**: `.../mock_api/shared` +- **Option (b) both flavors**: `.../mock_api/azure` AND `.../mock_api/unbranded` + +Decide with this concrete check: + +1. Locate the generated python package/module for the scenario in BOTH: + - `packages/http-client-python/tests/generated/azure` + - `packages/http-client-python/tests/generated/unbranded` +2. If the import root and client/model API surface you need are the same (same module path + same client entrypoint), write ONE shared test in `mock_api/shared`. +3. If import paths differ (or one flavor lacks the needed client), write separate tests under both `mock_api/azure` and `mock_api/unbranded`. + +Why: both azure and unbranded tox runs include `mock_api/shared`, so shared tests are preferred when they can import the same generated package. + +## Step 4 — Regenerate the specific generated client + +Generated code is gitignored (`packages/http-client-python/tests/generated/`). You must regenerate the specific spec before writing tests. + +**Compile only the single spec you need** (example for azure-core-page): + +```bash +cd packages/http-client-python +npx tsx ./eng/scripts/ci/regenerate.ts --flavor azure --name azure/core/page +``` + +The `--flavor` flag selects `azure` or `unbranded`. The `--name` flag is a case-insensitive substring match on the package name. + +> ⚠️ Do NOT run `npx tsx ./eng/scripts/ci/regenerate.ts` without `--name` — it compiles ALL specs and takes 40+ minutes. Only regenerate the specific spec you need. +> ⚠️ Do NOT use `npm run regenerate -- --flavor ...` — npm may strip the flags. Use `npx tsx` directly. + +**Verify** the generated client has the expected method: + +```bash +grep -r "method_name" tests/generated/azure/ < package-name > / +``` + +## Step 5 — Find existing test file (or create one) + +1. Search in the chosen folder for an existing test covering the same feature area. + - Prefer extending an existing `test_*.py` when it already imports the same generated module. +2. In parallel, find the matching async test in `asynctests/`. + +- If you extend `mock_api/azure/test_.py`, also extend `mock_api/azure/asynctests/test__async.py` (or create it if missing). +- If you extend `mock_api/shared/test_.py`, also extend `mock_api/shared/asynctests/test__async.py`. +- If you extend `mock_api/unbranded/test_.py`, also extend `mock_api/unbranded/asynctests/test__async.py`. + +3. If no sync test exists, create a new `test_.py` and also create the async counterpart under `asynctests/`. + +Conventions to match: + +- Use `pytest`. +- Use a `client()` fixture that constructs the generated client and yields it via context manager. +- For async tests: use `async def client()` fixture + `async with ...` and mark tests with `@pytest.mark.asyncio`. +- Follow existing assertion style (direct equality for models; `list(...)` for paged results). + +## Step 6 — Implement the test from the Spector expectations + +1. Read the Spector case to identify: + - operation name / route + - HTTP method + - parameter locations (path/query/header/body) + - request body shape + media type + - response status code + headers + body +2. Translate into SDK calls: + - construct the client + - call the method with the specified inputs + - assert the returned value matches the expected response + - if the scenario requires sending data, call the corresponding PUT/POST/PATCH and assert no unexpected error + +Practical guidance: + +- Prefer comparing with generated model instances (e.g., `models.Foo(...)`) when the SDK returns models. +- If the response is a stream or iterator, materialize it (`list(...)`) before asserting. +- Async iterator pattern (seen in existing tests): `result = [item async for item in client.list(...)]`. +- If the scenario is about serialization (e.g., XML), assert round-trip via GET/PUT (pattern: `assert client.foo.get() == model; client.foo.put(model)`). + +Async client import patterns (match the folder you’re writing to): + +- Azure: import `aio` submodule alongside models, e.g. `from specs.<...> import models, aio`, then `async with aio.()` and `await client.(...)`. +- Shared/unbranded generated clients often expose `.aio` modules, e.g. `from .aio import `. + +## Step 7 — Dependencies (only when needed) + +Default: do NOT add new dependencies. + +Only if your new/extended test imports a package not already available: + +- Add it to the appropriate requirements file under `packages/http-client-python/tests/requirements/`: + - `base.txt` — shared dependencies (pytest, pytest-asyncio, etc.) + - `azure.txt` — Azure-specific dependencies (azure-core, azure-mgmt-core) + - `unbranded.txt` — unbranded-specific dependencies (corehttp) + +Avoid adding dependencies unless strictly required by the test. + +## Step 8 — Format changed files + +Format any python files you changed using Black with the project's shared config: + +```bash +cd packages/http-client-python +python -m black ./eng/scripts/ci/config/pyproject.toml < paths > --config +``` + +Replace `` with the specific files and/or folders you modified (relative to the `http-client-python` root). + +Alternatively, you can format all test files via the npm script: + +```bash +npm run format -- --generator +``` + +## Step 9 — Validate your test locally + +Before opening a PR, run your new or updated test. You will need two terminals: one to run the Spector mock API server, and another to run pytest. + +1. **Determine the test flavor.** Pick the flavor that matches the test you changed: + - Azure tests → `azure` + - Unbranded tests → `unbranded` + +2. **Regenerate and install packages** (if not already done): + + ```bash + cd packages/http-client-python + npx tsx ./eng/scripts/ci/regenerate.ts --flavor --name + ``` + +3. **Create and activate a virtual environment** (if one does not already exist): + + ```bash + cd packages/http-client-python/tests + python -m venv .venv + # Windows: + .venv\Scripts\activate + # Linux/Mac: + source .venv/bin/activate + ``` + +4. **Install dependencies and the generated SDK:** + + ```bash + pip install -r requirements/base.txt + pip install -r requirements/.txt + + # install only a single generated SDK: + pip install --no-deps -e generated// + ``` + +5. **Start the Spector mock API server** in a separate terminal: + + ```bash + cd packages/http-client-python + npx tsp-spector serve node_modules/@azure-tools/azure-http-specs/specs/ node_modules/@typespec/http-specs/specs/ + ``` + + Wait until you see the server listening message before running tests. + +6. **Run the test** in the original terminal (with venv activated): + + ```bash + cd packages/http-client-python/tests + pytest mock_api/ < azure | unbranded | shared > / < test_file > .py -v + ``` + + Verify that all tests pass before proceeding. + + > **Important:** If you only added or changed test files, confirming the changed test passes is sufficient. However, if you modified emitter source code (under `generator/` or `emitter/`), you **must** run the full test suite for the affected flavor(s) to catch regressions before proceeding. + +## Step 10 — Add a changelog entry + +Create a changelog file under `.chronus/changes/` to document the change. The file should be a Markdown file with YAML frontmatter specifying the change kind and affected package(s). + +**File naming convention:** `---
---.md` + +**Template:** + +```markdown +--- +changeKind: internal +packages: + - "@typespec/http-client-python" +--- + + +``` + +**Available `changeKind` values:** + +| Kind | When to use | +| -------------- | ------------------------------------------------ | +| `internal` | Internal changes not user-facing (most test PRs) | +| `fix` | Bug fixes to existing features | +| `feature` | New user-facing features | +| `deprecation` | Deprecating an existing feature | +| `breaking` | Breaking changes | +| `dependencies` | Dependency bumps | + +For test additions, use `changeKind: internal` and list `@typespec/http-client-python` as the package. + +## Notes + +- Keep the skill concise: prefer adding a single focused test per scenario. +- Don’t duplicate existing coverage: extend an existing file when reasonable. +- Use forward-slash paths only. +- Generated code is gitignored — do NOT attempt to commit it. Only commit: test files, and `package.json`/`package-lock.json` (if dependency versions were updated). +- You should still validate your test locally (Step 9) before pushing. CI runs the full regeneration and the complete test matrix, but catching failures early locally is faster. +- Do NOT run `npm run regenerate` without `--name` for verification — CI will handle full regeneration. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e86b9fb8945..da30c110fe3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,37 +1,63 @@ name: CI on: + push: + branches: + - main pull_request: branches: - main - release/* - paths-ignore: - - "packages/http-client-csharp/**" - - "packages/http-client-java/**" - - "packages/http-client-python/**" - - "website/**" + merge_group: + +permissions: + contents: read + concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: - preview: - runs-on: ubuntu-latest - + changes: + name: Detect Changes + runs-on: ubuntu-slim + outputs: + core: ${{ steps.filter.outputs.core }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 + # cspell:ignore dorny + - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4 + id: filter with: - fetch-depth: 0 ## Needed for Changesets to find `main` branch - - - uses: ./.github/actions/setup - - - name: Install dependencies - run: pnpm install - - - name: Build - run: pnpm run --filter "internal-build-utils" --filter "[origin/main]..." --filter='!@typespec/website' build - - - name: Bump version to prerelease targets - run: node ./packages/internal-build-utils/cmd/cli.js bump-version-pr . --pr ${{ github.event.pull_request.number }} --buildNumber ${{ github.run_number }} - - - run: pnpm tsx eng/tsp-core/pkg-pr-new.ts + predicate-quantifier: "every" + filters: | + core: + - '**' + - '!.prettierignore' + - '!.prettierrc.json' + - '!cspell.yaml' + - '!eslint.config.json' + - '!.chronus/**' + - '!eng/emitters/**' + - '!packages/http-client-csharp/**' + - '!packages/http-client-java/**' + - '!packages/http-client-python/**' + + core: + needs: changes + if: needs.changes.outputs.core == 'true' + uses: ./.github/workflows/core-ci.yml + + ci-gate: + name: CI Gate + runs-on: ubuntu-slim + if: "!cancelled() || needs.core.result == 'cancelled'" + needs: [core] + steps: + - name: Validate CI results + run: | + if [[ "${{ needs.core.result }}" == "failure" || "${{ needs.core.result }}" == "cancelled" ]]; then + echo "Core CI failed or was cancelled" + exit 1 + fi + echo "All CI checks passed or were appropriately skipped" diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 263c625f02a..3401cbea9a9 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -8,6 +8,9 @@ on: schedule: - cron: "30 3 * * 3" +permissions: + contents: read + jobs: analyze: name: Analyze @@ -26,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - language: ["javascript-typescript"] + language: ["actions", "javascript-typescript"] # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ] # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both @@ -34,7 +37,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v6 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/commenter.yml b/.github/workflows/commenter.yml index e1889595736..6275b424cd8 100644 --- a/.github/workflows/commenter.yml +++ b/.github/workflows/commenter.yml @@ -18,12 +18,15 @@ jobs: !startsWith(github.head_ref, 'publish/') runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/download-artifact@v4 + - uses: actions/checkout@v6 + - name: Prepare artifact directory + run: mkdir -p "${{ runner.temp }}/comment-artifact" + - uses: actions/download-artifact@v8 with: name: comment run-id: ${{github.event.workflow_run.id }} github-token: ${{secrets.GITHUB_TOKEN}} + path: ${{ runner.temp }}/comment-artifact - name: Display structure of downloaded files run: ls -R @@ -32,7 +35,7 @@ jobs: - run: pnpm install name: Install dependencies - - run: pnpm chronus-github-pr-commenter --comment-file comment.json + - run: pnpm chronus-github-pr-commenter --comment-file "${{ runner.temp }}/comment-artifact/comment.json" env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} name: Create/update comment diff --git a/.github/workflows/consistency.yml b/.github/workflows/consistency.yml index 4592ee08f75..91675258f64 100644 --- a/.github/workflows/consistency.yml +++ b/.github/workflows/consistency.yml @@ -10,6 +10,9 @@ on: merge_group: workflow_dispatch: {} +permissions: + contents: read + # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: check-changes: @@ -22,7 +25,7 @@ jobs: !startsWith(github.head_ref, 'backmerge/') && !startsWith(github.head_ref, 'revert-') steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 ## Needed for Changesets to find `main` branch @@ -39,7 +42,7 @@ jobs: env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: comment path: comment-out/ @@ -53,7 +56,7 @@ jobs: name: Spell check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: submodules: recursive - uses: ./.github/actions/setup @@ -69,7 +72,7 @@ jobs: name: Format runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: submodules: recursive - uses: ./.github/actions/setup @@ -88,7 +91,7 @@ jobs: name: Lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: submodules: recursive @@ -103,12 +106,22 @@ jobs: - run: pnpm run lint name: Lint - # Check version mismatch + # cspell:ignore rhysd + # Content copied from https://raw.githubusercontent.com/rhysd/actionlint/2ab3a12c7848f6c15faca9a92612ef4261d0e370/.github/actionlint-matcher.json + - run: echo "::add-matcher::.github/matchers/actionlint.json" + name: Add actionlint problem matcher + + - uses: docker://rhysd/actionlint:1.7.12 + name: Lint workflows + with: + args: -color -verbose + + # Check that all dependencies use the pnpm catalog version-consistency: name: Versions consistency runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: submodules: recursive @@ -117,5 +130,5 @@ jobs: - run: pnpm install name: Install dependencies - - run: pnpm run check-version-mismatch - name: Check version mismatch + - run: pnpm run check-catalog + name: Check catalog usage diff --git a/.github/workflows/core-ci.yml b/.github/workflows/core-ci.yml new file mode 100644 index 00000000000..97f2fcdd06e --- /dev/null +++ b/.github/workflows/core-ci.yml @@ -0,0 +1,152 @@ +name: Core CI + +permissions: + contents: read + +on: + workflow_call: + workflow_dispatch: + +jobs: + build: + name: Build (${{ matrix.os }}, Node ${{ matrix.node-version }}) + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest, windows-latest] + node-version: ["22.x", "24.x"] + + env: + TYPESPEC_VS_CI_BUILD: true + TYPESPEC_SKIP_WEBSITE_BUILD: true + + steps: + - name: Enable git long paths (Windows) + if: runner.os == 'Windows' + run: git config --global core.longpaths true + + - uses: actions/checkout@v6 + + - uses: ./.github/actions/setup + with: + node-version: ${{ matrix.node-version }} + + - uses: actions/setup-dotnet@v5 + with: + dotnet-version: 8.0.x + + - name: Install dependencies + run: pnpm install + + - name: Restore .NET dependencies + run: dotnet restore + working-directory: packages/typespec-vs + + - name: Build + run: pnpm run build + + - name: Test + run: pnpm vitest run --coverage --reporter=default --reporter=github-actions + + - name: Upload coverage artifacts + uses: actions/upload-artifact@v7 + if: always() + with: + name: coverage-${{ matrix.os }}-node${{ matrix.node-version }} + path: packages/*/coverage/ + retention-days: 5 + + - name: Check for changed files + run: node eng/common/scripts/check-for-changed-files.js + + website: + name: Website + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v6 + + - uses: ./.github/actions/setup + + - name: Install dependencies + run: pnpm install + + - name: Install Playwright browsers + run: npx playwright install --with-deps + + - name: Build website + run: pnpm --filter "@typespec/website..." run build + + - name: Check for changed files + run: node eng/common/scripts/check-for-changed-files.js + + e2e: + name: E2E Tests + runs-on: ubuntu-latest + + env: + TYPESPEC_VS_CI_BUILD: false + TYPESPEC_SKIP_WEBSITE_BUILD: true + DISPLAY: ":99" + + steps: + - uses: actions/checkout@v6 + + - uses: ./.github/actions/setup + + - name: Install dependencies + run: pnpm install + + - name: Install Playwright browsers + run: | + sudo dpkg --configure -a + npx playwright install --with-deps + + - name: Start Xvfb + run: | + /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & + echo "Started xvfb" + + - name: Build + run: pnpm run build + + - name: E2E Tests + run: pnpm run test:e2e + + - name: Upload UI test results + uses: actions/upload-artifact@v7 + if: always() + with: + name: uitestresults-e2e + path: packages/playground-website/test-results/ + retention-days: 5 + + - name: Upload screenshots + uses: actions/upload-artifact@v7 + if: always() + with: + name: screenshots + path: packages/typespec-vscode/temp/images-linux/ + retention-days: 5 + + - name: Upload trace results + uses: actions/upload-artifact@v7 + if: always() + with: + name: trace-results + path: packages/typespec-vscode/test-results/ + retention-days: 5 + + - name: Check for changed files + run: node eng/common/scripts/check-for-changed-files.js + + docker: + name: Docker Build + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v6 + + - name: Build Docker image + run: docker build -f ./docker/Dockerfile . diff --git a/.github/workflows/external-integration.yml b/.github/workflows/external-integration.yml index 472cde4a048..581db64aed3 100644 --- a/.github/workflows/external-integration.yml +++ b/.github/workflows/external-integration.yml @@ -12,6 +12,9 @@ on: # Allow manual triggering workflow_dispatch: +permissions: + contents: read + # This check is optional by default concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -30,18 +33,18 @@ jobs: steps: - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: node-version: lts/* - name: Checkout Azure/typespec-azure repo - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: Azure/typespec-azure submodules: true - name: Install pnpm - uses: pnpm/action-setup@v3 + uses: pnpm/action-setup@v5 - name: Update core submodule to PR commit run: | @@ -66,3 +69,47 @@ jobs: - name: E2E Test run: pnpm test:e2e + + azure-rest-api-specs: + name: Azure REST API Specs + runs-on: ubuntu-latest + if: contains(github.event.pull_request.labels.*.name, 'int:azure-specs') || github.event_name == 'workflow_dispatch' + + steps: + - name: Checkout repository + uses: actions/checkout@v6 + with: + submodules: true + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha || github.sha }} + + - name: Setup Node.js and pnpm + uses: ./.github/actions/setup + + - name: Install dependencies + run: pnpm install + + - name: Build and pack TypeSpec Azure packages + run: | + pnpm --filter "!@typespec/playground-website" --filter "!@typespec/website" -r build + + pnpm chronus pack --pack-destination ./tgz-packages --exclude standalone + + echo "Created tgz packages:" + ls -la ./tgz-packages/ + + cd packages/tsp-integration + npm link + + - name: Checkout + run: tsp-integration azure-specs --stage checkout + + - name: Patch package.json + run: tsp-integration azure-specs --stage patch --stage install --tgz-dir ./tgz-packages + + - name: Run TypeSpec validation in azure-rest-api-specs + run: tsp-integration azure-specs --stage validate + + - name: Check for git changes + if: success() || failure() # Still run this step even if validation fails to ensure as much information as possible + run: tsp-integration azure-specs --stage validate:clean diff --git a/.github/workflows/merge-release-in-main.yml b/.github/workflows/merge-release-in-main.yml index c8b72a5a7d5..ed379d8ef1a 100644 --- a/.github/workflows/merge-release-in-main.yml +++ b/.github/workflows/merge-release-in-main.yml @@ -21,24 +21,17 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Generate branch name id: branchname + env: + REF_NAME: ${{ github.ref_name }} run: | - echo "branchname=backmerge/${{ github.ref_name }}-$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT + echo "branchname=backmerge/${REF_NAME}-$(date +'%Y-%m-%d')" >> "$GITHUB_OUTPUT" - name: Create branch + env: + BRANCH: ${{ steps.branchname.outputs.branchname }} run: | - branch="${{ steps.branchname.outputs.branchname }}" - git checkout -b $branch - git push --set-upstream origin $branch - - - name: create pull request - id: open-pr - uses: repo-sync/pull-request@v2 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - source_branch: ${{ steps.branchname.outputs.branchname }} - destination_branch: ${{ github.event.repository.default_branch }} - pr_title: "[Automated] Merge ${{ github.ref_name }} into ${{ github.event.repository.default_branch }}" - pr_body: "Merge ${{github.ref}} back into ${{ github.event.repository.default_branch }}" + git checkout -b "$BRANCH" + git push --set-upstream origin "$BRANCH" diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml new file mode 100644 index 00000000000..509b76d8a1b --- /dev/null +++ b/.github/workflows/preview.yml @@ -0,0 +1,44 @@ +name: Preview + +on: + pull_request: + branches: + - main + - release/* + paths-ignore: + - "website/**" + +permissions: + contents: read + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + preview: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v6 + with: + fetch-depth: 0 ## Needed for Changesets to find `main` branch + + - uses: actions/setup-dotnet@v5 + name: Setup .NET + with: + # Automatically read .NET SDK version from global.json to stay in sync + global-json-file: packages/http-client-csharp/global.json + + - uses: ./.github/actions/setup + + - name: Install dependencies + run: npx tsx eng/tsp-core/tpm/cli.ts install --since origin/main + + - name: Build + run: npx tsx eng/tsp-core/tpm/cli.ts build --since origin/main + + - name: Bump version to prerelease targets + run: pnpm chronus version --prerelease "{nextVersion}-pr.${{ github.event.pull_request.number }}.${{ github.run_number }}" + + - run: pnpm tsx eng/tsp-core/pkg-pr-new.ts diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index 2241dfd89f3..f243f4933f4 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -21,7 +21,7 @@ jobs: sync: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: ./.github/actions/setup - run: pnpm install diff --git a/.github/workflows/verify-labels.yml b/.github/workflows/verify-labels.yml index 446c23665b5..a278154ab60 100644 --- a/.github/workflows/verify-labels.yml +++ b/.github/workflows/verify-labels.yml @@ -10,11 +10,14 @@ on: - ".github/workflows/sync-labels.yml" - "CONTRIBUTING.md" +permissions: + contents: read + jobs: verify: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: ./.github/actions/setup - run: pnpm install diff --git a/.github/workflows/website-gh-pages.yml b/.github/workflows/website-gh-pages.yml index cbe46619e7c..9a53afb9a71 100644 --- a/.github/workflows/website-gh-pages.yml +++ b/.github/workflows/website-gh-pages.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v6 - uses: ./.github/actions/setup @@ -38,7 +38,7 @@ jobs: run: pnpm --filter "@typespec/website..." run build - name: Upload artifact - uses: actions/upload-pages-artifact@v3 + uses: actions/upload-pages-artifact@v4 with: path: ./website/dist @@ -52,4 +52,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4 + uses: actions/deploy-pages@v5 diff --git a/.gitignore b/.gitignore index 7d848f69699..bd47e87ea2e 100644 --- a/.gitignore +++ b/.gitignore @@ -228,8 +228,8 @@ BenchmarkDotnet.Artifacts/ !packages/http-client-java/package-lock.json # python emitter -packages/http-client-python/generator/test/**/generated/ -packages/http-client-python/generator/test/**/cadl-ranch-coverage.json +packages/http-client-python/tests/**/generated/ +packages/http-client-python/tests/**/cadl-ranch-coverage.json !packages/http-client-python/package-lock.json packages/http-client-python/micropip.lock packages/http-client-python/venv_build_wheel/ diff --git a/.typespec-integration/config.yaml b/.typespec-integration/config.yaml new file mode 100644 index 00000000000..3749a462e33 --- /dev/null +++ b/.typespec-integration/config.yaml @@ -0,0 +1,17 @@ +suites: + azure-specs: + repo: https://github.com/Azure/azure-rest-api-specs + branch: typespec-next + pattern: "specification/**/tspconfig.yaml" + entrypoints: + - name: "client.tsp" + options: ["--no-emit"] + - name: "main.tsp" + azure-specs-pr: + repo: https://github.com/Azure/azure-rest-api-specs-pr + branch: typespec-next + pattern: "specification/**/tspconfig.yaml" + entrypoints: + - name: "client.tsp" + options: ["--no-emit"] + - name: "main.tsp" diff --git a/.vscode/launch.json b/.vscode/launch.json index ed76356799c..49952259cee 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -57,12 +57,7 @@ "request": "launch", "name": "Compile Scratch", "program": "${workspaceFolder}/packages/compiler/entrypoints/cli.js", - "args": [ - "compile", - "../samples/scratch", - "--output-dir=temp/scratch-output", - "--emit=@typespec/openapi3" - ], + "args": ["compile", "../samples/scratch", "--output-dir=temp/scratch-output"], "smartStep": true, "sourceMaps": true, "skipFiles": ["/**/*.js"], @@ -141,9 +136,13 @@ // Set the telemetry key environment variable to use if you dont want to set it in package.json //"TYPESPEC_VSCODE_TELEMETRY_KEY": "{The instrumentation key of your Application Insights}", - //"ENABLE_SERVER_COMPILE_LOGGING": "true", - //"ENABLE_UPDATE_MANAGER_LOGGING": "true", - //"ENABLE_LM_LOGGING": "true", + // Enable debug logging for specific areas using TYPESPEC_DEBUG environment variable + // Examples: + // "TYPESPEC_DEBUG": "server.compile" - Enable server compilation debug logs + // "TYPESPEC_DEBUG": "lm" - Enable Language Model debug logs + // "TYPESPEC_DEBUG": "*" - Enable all debug logs + // "TYPESPEC_DEBUG": "server.compile,compile.config" - Enable multiple areas + //"TYPESPEC_DEBUG": "server.compile,update.manager,compile.config,lm", "TYPESPEC_SERVER_NODE_OPTIONS": "--nolazy --inspect-brk=4242", "TYPESPEC_DEVELOPMENT_MODE": "true" diff --git a/.vscode/settings.json b/.vscode/settings.json index 61abbfa9412..dd34047115d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -57,5 +57,6 @@ "typescript.tsdk": "./node_modules/typescript/lib", "git.ignoreLimitWarning": true, "vitest.rootConfig": "vitest.config.js", + "eslint.rules.customizations": [{ "rule": "*", "severity": "warn" }], "typespec.tsp-server.path": "${workspaceFolder}/packages/compiler" } diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ad55c47dce0..5bad7dd3d7d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ This section goes over the setup of the repo for development. ## Repo setup -- Install [Node.js](https://nodejs.org/) 20 LTS +- Install [Node.js](https://nodejs.org/) 24 LTS - Install [pnpm](https://pnpm.io/) ```bash @@ -51,11 +51,12 @@ Those commands can be run on the workspace or in a specific package(`cd ./packag | `pnpm format` | Format | | `pnpm format:check` | Validate files are formatted | | `pnpm gen-extern-signature` | Regenerate TypeScript signature for decorators(except compiler) | -| `pnpm change add` | Add a change description | +| `pnpm change add` | Add a change description (see valid kinds in [`.chronus/config.yaml`](.chronus/config.yaml)) | | `pnpm lint` | Run linters | | `pnpm lint:fix` | Fix autofixable issues | | `pnpm regen-samples` | Regen the samples(when the samples test fail) | | `pnpm regen-docs` | Regen the reference docs | +| `pnpm tsp-integration` | Run integration tests against external repos using local package changes | ### Verbose test logging @@ -65,6 +66,15 @@ TYPESPEC_VERBOSE_TEST_OUTPUT=true. **For the compiler you will need to run it manually or run the whole workspace build. This is because for the tool to run it needs the compiler to build first.** +### Writing tests + +Tests use [vitest](https://vitest.dev/) with the `createTester` API from `@typespec/compiler/testing`. **Do not** use the legacy `createTestHost`/`createTestRunner` APIs — they are deprecated. See the [testing documentation](https://typespec.io/docs/extending-typespec/testing) for the full guide and migration instructions. + +**Test structure rules:** + +- Do **not** wrap tests in a top-level `describe`. The test file name already provides context. Use `it()` directly at the top level. Only use `describe()` for sub-groups within a file. +- Use `it` (not `test`) for test functions, as enforced by ESLint (`vitest/consistent-test-it`). + ## Using VS Code ### Recommended extensions @@ -202,6 +212,62 @@ configuration in Visual Studio, then you can install it by double-clicking on packages/typespec-vs/Microsoft.TypeSpec.VisualStudio.vsix that gets produced. +## Integration testing + +The `tsp-integration` tool allows you to test your local TypeSpec package changes against external repositories (e.g., `azure-rest-api-specs`). It clones the target repo, patches its `package.json` to use your local packages, installs dependencies, and compiles all TypeSpec projects found in the repo. + +### Configuration + +Integration test suites are defined in `.typespec-integration/config.yaml` at the repo root. Each suite specifies a target repository, branch, glob pattern for finding TypeSpec projects. + +### Running from workspace root + +```bash +pnpm integration-test +``` + +### CLI options + +| Option | Short | Description | +| ------------------ | ----- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `--clean` | | Force a fresh clone instead of reusing an existing checkout. By default the tool resets and pulls the existing repo. | +| `--stage ` | | Run only specific stages. Can be specified multiple times. Valid stages: `checkout`, `patch`, `install`, `validate`, `validate:clean`. | +| `--interactive` | `-i` | Enable interactive watch mode. After the initial run you can press **a** to rerun all tests, **f** to rerun only failed tests, or **q** to quit. | +| `--tgz-dir ` | | Use pre-built `.tgz` package artifacts from the given directory instead of resolving packages from the local workspace. Useful in CI with artifacts from `pnpm pack:all`. | +| `--repo ` | | Use an existing local repository checkout instead of cloning into the default temp directory (`.typespec-integration/temp/`). | + +### Examples + +```bash +# Run all stages for the azure-specs suite +pnpm tsp-integration azure-specs + +# Force a fresh clone +pnpm tsp-integration azure-specs --clean + +# Interactive mode — rerun failed specs on the fly +pnpm tsp-integration azure-specs --interactive + +# Test against a local clone of azure-rest-api-specs +pnpm tsp-integration azure-specs --repo ~/dev/azure-rest-api-specs + +# Only run the validate stage (skip checkout, patch, install) +pnpm tsp-integration azure-specs --stage validate + +# Use pre-built .tgz artifacts (CI scenario) +pnpm tsp-integration azure-specs --tgz-dir ./temp/artifacts +``` + +### Stages + +The tool runs the following stages in order: + +1. **checkout** — Clones (or resets) the target repository. +2. **patch** — Resolves local TypeSpec package versions and patches `package.json` / `overrides` in the target repo. +3. **install** — Runs `npm install --no-package-lock` in the target repo, then restores the original `package.json`. +4. **validate** — Finds all TypeSpec projects matching the configured pattern and compiles each entrypoint, running compilations in parallel. +5. **validate:clean** — Verifies the target repo has no uncommitted changes after validation. + ## TypeSpec website ### Run locally @@ -212,6 +278,28 @@ Go to `packages/website` and run the command: pnpm start ``` +## Creating release notes + +Release notes are published at each release in `website/src/content/docs/docs/release-notes/`. They follow the pattern `release-YYYY-MM-DD.md`. + +Run the following command to generate the changelog: + +```bash +pnpm chronus changelog --policy typespec-stable --policy typespec-preview +``` + +Create a new file `website/src/content/docs/docs/release-notes/release-YYYY-MM-DD.md` with this frontmatter and paste the command output below it, removing the `Dependencies` category: + +```markdown +--- +title: "X.Y.0" +releaseDate: YYYY-MM-DD +version: "X.Y.0" +--- +``` + +See existing release notes for examples. + # Pull request ## Trigger TypeSpec Playground Try It build @@ -378,10 +466,11 @@ Process labels Misc labels -| Name | Color | Description | -| ------------------ | ------- | --------------------- | -| `good first issue` | #7057ff | Good for newcomers | -| `mq` | #0969da | Good candidate for MQ | +| Name | Color | Description | +| ------------------ | ------- | -------------------------------------------------- | +| `good first issue` | #7057ff | Good for newcomers | +| `mq` | #0969da | Good candidate for MQ | +| `int:azure-specs` | #0e8a16 | Run integration tests against azure-rest-api-specs | diff --git a/cspell.yaml b/cspell.yaml index a726a71c8f9..b132f2bd475 100644 --- a/cspell.yaml +++ b/cspell.yaml @@ -144,6 +144,9 @@ words: - lropaging - lstrip - lzutf + - MACVMIMAGE + - MACVMIMAGEM + - marshal - mday - methodsubscriptionid - mgmt @@ -192,6 +195,7 @@ words: - openapiv - Packument - Perfolizer + - pkgs - picocolors - pnpx - posargs @@ -243,6 +247,7 @@ words: - sfixed - shiki - sint + - slnx - snakeyaml - srnagar - ssdlrs @@ -250,8 +255,8 @@ words: - ssvs - statment - strs + - stubbed - swaggerui - - syncpack - TCGC - terlson - timegm @@ -272,6 +277,7 @@ words: - unassignable - Uncapitalize - uncollapsed + - unconfigure - undifferentiable - undoc - Ungroup @@ -279,11 +285,13 @@ words: - unioned - unionified - unionify + - unmarshal - unparented - unprefixed - unprojected - unrepresentable - unsourced + - unstubbed - unversioned - venv - venvtools @@ -301,6 +309,8 @@ words: - WHATWG - WINDOWSARMVMIMAGE - WINDOWSVMIMAGE + - workerid + - xdist - xiangyan - xiaofei - xlarge @@ -330,6 +340,8 @@ ignorePaths: - packages/mutator-framework/**/*.test.ts - packages/typespec-vscode/test/scenarios/** - pnpm-lock.yaml + - pnpm-workspace.yaml + - "**/dependabot.yml" - "**/*.mp4" - "**/*.plist" - .git/** @@ -350,6 +362,10 @@ patterns: - name: Authorization_Basic description: Ignore Base64 authorization tokens pattern: "/Authorization: Basic\\s+\\S+/g" + - name: Todo + description: Ignore TODO comments with usernames + pattern: "/TODO[\\/\\s\\(][a-zA-Z0-9_-]+/g" ignoreRegExpList: - cursortest - Authorization_Basic + - Todo diff --git a/docker/Dockerfile b/docker/Dockerfile index 6454def1171..4222031370a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,9 +2,7 @@ # Build compiler # -------------------------------- # cspell:ignore tdnf -# mcr doesn't provide any update to date images for nodejs... so we use the devcontainers image for building. -# FROM mcr.microsoft.com/azurelinux/base/nodejs:20.14 AS builder -FROM mcr.microsoft.com/devcontainers/javascript-node:22 AS builder +FROM mcr.microsoft.com/devcontainers/javascript-node:24 AS builder COPY . /app # Upgrade all packages per https://eng.ms/docs/more/containers-secure-supply-chain/updating. @@ -19,12 +17,12 @@ RUN pnpm install --filter "@typespec/compiler..." RUN pnpm --filter "@typespec/compiler..." run build WORKDIR /app/packages/compiler -RUN npm pack +RUN pnpm pack # -------------------------------- # Setup final image # -------------------------------- -FROM mcr.microsoft.com/azurelinux/base/nodejs:20.14 +FROM mcr.microsoft.com/azurelinux/base/nodejs:24 COPY --from=builder /app/packages/compiler/*.tgz /tmp/compiler.tgz diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/AnimalOperations.RestClient.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/AnimalOperations.RestClient.cs index 5798e0deb91..85858639fda 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/AnimalOperations.RestClient.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/AnimalOperations.RestClient.cs @@ -12,7 +12,7 @@ public partial class AnimalOperations { private static PipelineMessageClassifier _pipelineMessageClassifier200; - private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 = PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); + private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); internal PipelineMessage CreateUpdatePetAsAnimalRequest(BinaryContent content, RequestOptions options) { diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/AnimalOperations.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/AnimalOperations.cs index 39ba0f88e01..8fa8739984f 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/AnimalOperations.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/AnimalOperations.cs @@ -112,7 +112,7 @@ public virtual ClientResult UpdatePetAsAnimal(Animal animal, Cancellatio System.Console.WriteLine("Entering method UpdatePetAsAnimal."); Argument.AssertNotNull(animal, nameof(animal)); - ClientResult result = UpdatePetAsAnimal(animal, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + ClientResult result = UpdatePetAsAnimal(animal, cancellationToken.ToRequestOptions()); return ClientResult.FromValue((Animal)result, result.GetRawResponse()); } catch (Exception ex) @@ -138,7 +138,7 @@ public virtual async Task> UpdatePetAsAnimalAsync(Animal an System.Console.WriteLine("Entering method UpdatePetAsAnimalAsync."); Argument.AssertNotNull(animal, nameof(animal)); - ClientResult result = await UpdatePetAsAnimalAsync(animal, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + ClientResult result = await UpdatePetAsAnimalAsync(animal, cancellationToken.ToRequestOptions()).ConfigureAwait(false); return ClientResult.FromValue((Animal)result, result.GetRawResponse()); } catch (Exception ex) @@ -232,7 +232,7 @@ public virtual ClientResult UpdateDogAsAnimal(Animal animal, Cancellatio System.Console.WriteLine("Entering method UpdateDogAsAnimal."); Argument.AssertNotNull(animal, nameof(animal)); - ClientResult result = UpdateDogAsAnimal(animal, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + ClientResult result = UpdateDogAsAnimal(animal, cancellationToken.ToRequestOptions()); return ClientResult.FromValue((Animal)result, result.GetRawResponse()); } catch (Exception ex) @@ -258,7 +258,7 @@ public virtual async Task> UpdateDogAsAnimalAsync(Animal an System.Console.WriteLine("Entering method UpdateDogAsAnimalAsync."); Argument.AssertNotNull(animal, nameof(animal)); - ClientResult result = await UpdateDogAsAnimalAsync(animal, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + ClientResult result = await UpdateDogAsAnimalAsync(animal, cancellationToken.ToRequestOptions()).ConfigureAwait(false); return ClientResult.FromValue((Animal)result, result.GetRawResponse()); } catch (Exception ex) diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenAsyncCollectionResult.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenAsyncCollectionResult.cs similarity index 96% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenAsyncCollectionResult.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenAsyncCollectionResult.cs index 6cd41b66849..f81fb8cc35b 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenAsyncCollectionResult.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenAsyncCollectionResult.cs @@ -38,7 +38,7 @@ public override async IAsyncEnumerable GetRawPagesAsync() yield return result; nextToken = ((ListWithContinuationTokenResponse)result).NextToken; - if (nextToken == null) + if (string.IsNullOrEmpty(nextToken)) { yield break; } @@ -52,7 +52,7 @@ public override async IAsyncEnumerable GetRawPagesAsync() public override ContinuationToken GetContinuationToken(ClientResult page) { string nextPage = ((ListWithContinuationTokenResponse)page).NextToken; - if (nextPage != null) + if (!string.IsNullOrEmpty(nextPage)) { return ContinuationToken.FromBytes(BinaryData.FromString(nextPage)); } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenAsyncCollectionResultOfT.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenAsyncCollectionResultOfT.cs similarity index 96% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenAsyncCollectionResultOfT.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenAsyncCollectionResultOfT.cs index 8c439f7c28f..89e20cc9a67 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenAsyncCollectionResultOfT.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenAsyncCollectionResultOfT.cs @@ -39,7 +39,7 @@ public override async IAsyncEnumerable GetRawPagesAsync() yield return result; nextToken = ((ListWithContinuationTokenResponse)result).NextToken; - if (nextToken == null) + if (string.IsNullOrEmpty(nextToken)) { yield break; } @@ -53,7 +53,7 @@ public override async IAsyncEnumerable GetRawPagesAsync() public override ContinuationToken GetContinuationToken(ClientResult page) { string nextPage = ((ListWithContinuationTokenResponse)page).NextToken; - if (nextPage != null) + if (!string.IsNullOrEmpty(nextPage)) { return ContinuationToken.FromBytes(BinaryData.FromString(nextPage)); } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenCollectionResult.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenCollectionResult.cs similarity index 96% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenCollectionResult.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenCollectionResult.cs index 0128c56bdc6..6f40da2d197 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenCollectionResult.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenCollectionResult.cs @@ -38,7 +38,7 @@ public override IEnumerable GetRawPages() yield return result; nextToken = ((ListWithContinuationTokenResponse)result).NextToken; - if (nextToken == null) + if (string.IsNullOrEmpty(nextToken)) { yield break; } @@ -52,7 +52,7 @@ public override IEnumerable GetRawPages() public override ContinuationToken GetContinuationToken(ClientResult page) { string nextPage = ((ListWithContinuationTokenResponse)page).NextToken; - if (nextPage != null) + if (!string.IsNullOrEmpty(nextPage)) { return ContinuationToken.FromBytes(BinaryData.FromString(nextPage)); } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenCollectionResultOfT.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenCollectionResultOfT.cs similarity index 96% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenCollectionResultOfT.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenCollectionResultOfT.cs index 8108365259e..8d876c1854a 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenCollectionResultOfT.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenCollectionResultOfT.cs @@ -38,7 +38,7 @@ public override IEnumerable GetRawPages() yield return result; nextToken = ((ListWithContinuationTokenResponse)result).NextToken; - if (nextToken == null) + if (string.IsNullOrEmpty(nextToken)) { yield break; } @@ -52,7 +52,7 @@ public override IEnumerable GetRawPages() public override ContinuationToken GetContinuationToken(ClientResult page) { string nextPage = ((ListWithContinuationTokenResponse)page).NextToken; - if (nextPage != null) + if (!string.IsNullOrEmpty(nextPage)) { return ContinuationToken.FromBytes(BinaryData.FromString(nextPage)); } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseAsyncCollectionResult.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseAsyncCollectionResult.cs similarity index 95% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseAsyncCollectionResult.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseAsyncCollectionResult.cs index cfa43bbdeda..ee4cdc1688e 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseAsyncCollectionResult.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseAsyncCollectionResult.cs @@ -37,7 +37,7 @@ public override async IAsyncEnumerable GetRawPagesAsync() ClientResult result = ClientResult.FromResponse(await _client.Pipeline.ProcessMessageAsync(message, _options).ConfigureAwait(false)); yield return result; - if (result.GetRawResponse().Headers.TryGetValue("next-token", out string value)) + if (result.GetRawResponse().Headers.TryGetValue("next-token", out string value) && !string.IsNullOrEmpty(value)) { nextToken = value; } @@ -54,7 +54,7 @@ public override async IAsyncEnumerable GetRawPagesAsync() /// The continuation token for the specified page. public override ContinuationToken GetContinuationToken(ClientResult page) { - if (page.GetRawResponse().Headers.TryGetValue("next-token", out string value)) + if (page.GetRawResponse().Headers.TryGetValue("next-token", out string value) && !string.IsNullOrEmpty(value)) { return ContinuationToken.FromBytes(BinaryData.FromString(value)); } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseAsyncCollectionResultOfT.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseAsyncCollectionResultOfT.cs similarity index 96% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseAsyncCollectionResultOfT.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseAsyncCollectionResultOfT.cs index 044f4402db0..8ac5b9c1a9b 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseAsyncCollectionResultOfT.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseAsyncCollectionResultOfT.cs @@ -38,7 +38,7 @@ public override async IAsyncEnumerable GetRawPagesAsync() ClientResult result = ClientResult.FromResponse(await _client.Pipeline.ProcessMessageAsync(message, _options).ConfigureAwait(false)); yield return result; - if (result.GetRawResponse().Headers.TryGetValue("next-token", out string value)) + if (result.GetRawResponse().Headers.TryGetValue("next-token", out string value) && !string.IsNullOrEmpty(value)) { nextToken = value; } @@ -55,7 +55,7 @@ public override async IAsyncEnumerable GetRawPagesAsync() /// The continuation token for the specified page. public override ContinuationToken GetContinuationToken(ClientResult page) { - if (page.GetRawResponse().Headers.TryGetValue("next-token", out string value)) + if (page.GetRawResponse().Headers.TryGetValue("next-token", out string value) && !string.IsNullOrEmpty(value)) { return ContinuationToken.FromBytes(BinaryData.FromString(value)); } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseCollectionResult.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseCollectionResult.cs similarity index 95% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseCollectionResult.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseCollectionResult.cs index d098874ba2b..9e907615204 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseCollectionResult.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseCollectionResult.cs @@ -37,7 +37,7 @@ public override IEnumerable GetRawPages() ClientResult result = ClientResult.FromResponse(_client.Pipeline.ProcessMessage(message, _options)); yield return result; - if (result.GetRawResponse().Headers.TryGetValue("next-token", out string value)) + if (result.GetRawResponse().Headers.TryGetValue("next-token", out string value) && !string.IsNullOrEmpty(value)) { nextToken = value; } @@ -54,7 +54,7 @@ public override IEnumerable GetRawPages() /// The continuation token for the specified page. public override ContinuationToken GetContinuationToken(ClientResult page) { - if (page.GetRawResponse().Headers.TryGetValue("next-token", out string value)) + if (page.GetRawResponse().Headers.TryGetValue("next-token", out string value) && !string.IsNullOrEmpty(value)) { return ContinuationToken.FromBytes(BinaryData.FromString(value)); } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseCollectionResultOfT.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseCollectionResultOfT.cs similarity index 96% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseCollectionResultOfT.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseCollectionResultOfT.cs index 2f1e2d3c2a3..152560a1230 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseCollectionResultOfT.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithContinuationTokenHeaderResponseCollectionResultOfT.cs @@ -37,7 +37,7 @@ public override IEnumerable GetRawPages() ClientResult result = ClientResult.FromResponse(_client.Pipeline.ProcessMessage(message, _options)); yield return result; - if (result.GetRawResponse().Headers.TryGetValue("next-token", out string value)) + if (result.GetRawResponse().Headers.TryGetValue("next-token", out string value) && !string.IsNullOrEmpty(value)) { nextToken = value; } @@ -54,7 +54,7 @@ public override IEnumerable GetRawPages() /// The continuation token for the specified page. public override ContinuationToken GetContinuationToken(ClientResult page) { - if (page.GetRawResponse().Headers.TryGetValue("next-token", out string value)) + if (page.GetRawResponse().Headers.TryGetValue("next-token", out string value) && !string.IsNullOrEmpty(value)) { return ContinuationToken.FromBytes(BinaryData.FromString(value)); } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResult.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResult.cs similarity index 96% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResult.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResult.cs index 298c4cbf722..9ee18c0a4ea 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResult.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResult.cs @@ -51,7 +51,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((ListWithNextLinkResponse)page).Next; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResultOfT.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResultOfT.cs similarity index 97% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResultOfT.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResultOfT.cs index 75cca5f61c6..32d65325b90 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResultOfT.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResultOfT.cs @@ -52,7 +52,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((ListWithNextLinkResponse)page).Next; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithNextLinkCollectionResult.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkCollectionResult.cs similarity index 96% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithNextLinkCollectionResult.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkCollectionResult.cs index aa07841a742..036a5e7d19f 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithNextLinkCollectionResult.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkCollectionResult.cs @@ -51,7 +51,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((ListWithNextLinkResponse)page).Next; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithNextLinkCollectionResultOfT.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkCollectionResultOfT.cs similarity index 97% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithNextLinkCollectionResultOfT.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkCollectionResultOfT.cs index be3237cadde..5c0ca6fd77b 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithNextLinkCollectionResultOfT.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkCollectionResultOfT.cs @@ -51,7 +51,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((ListWithNextLinkResponse)page).Next; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithPagingAsyncCollectionResult.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithPagingAsyncCollectionResult.cs similarity index 100% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithPagingAsyncCollectionResult.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithPagingAsyncCollectionResult.cs diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithPagingAsyncCollectionResultOfT.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithPagingAsyncCollectionResultOfT.cs similarity index 100% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithPagingAsyncCollectionResultOfT.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithPagingAsyncCollectionResultOfT.cs diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithPagingCollectionResult.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithPagingCollectionResult.cs similarity index 100% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithPagingCollectionResult.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithPagingCollectionResult.cs diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithPagingCollectionResultOfT.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithPagingCollectionResultOfT.cs similarity index 100% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithPagingCollectionResultOfT.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithPagingCollectionResultOfT.cs diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResult.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResult.cs similarity index 92% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResult.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResult.cs index 4f5be5dd0ac..df309fec4a2 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResult.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResult.cs @@ -35,11 +35,11 @@ public override async IAsyncEnumerable GetRawPagesAsync() yield return result; string nextPageString = ((ListWithStringNextLinkResponse)result).Next; - if (nextPageString == null) + if (string.IsNullOrEmpty(nextPageString)) { yield break; } - nextPageUri = new Uri(nextPageString); + nextPageUri = new Uri(nextPageString, UriKind.RelativeOrAbsolute); message = _client.CreateNextGetWithStringNextLinkRequest(nextPageUri, _options); } } @@ -50,7 +50,7 @@ public override async IAsyncEnumerable GetRawPagesAsync() public override ContinuationToken GetContinuationToken(ClientResult page) { string nextPage = ((ListWithStringNextLinkResponse)page).Next; - if (nextPage != null) + if (!string.IsNullOrEmpty(nextPage)) { return ContinuationToken.FromBytes(BinaryData.FromString(nextPage)); } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResultOfT.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResultOfT.cs similarity index 94% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResultOfT.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResultOfT.cs index 6985b85c76d..2523abcabb7 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResultOfT.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResultOfT.cs @@ -36,11 +36,11 @@ public override async IAsyncEnumerable GetRawPagesAsync() yield return result; string nextPageString = ((ListWithStringNextLinkResponse)result).Next; - if (nextPageString == null) + if (string.IsNullOrEmpty(nextPageString)) { yield break; } - nextPageUri = new Uri(nextPageString); + nextPageUri = new Uri(nextPageString, UriKind.RelativeOrAbsolute); message = _client.CreateNextGetWithStringNextLinkRequest(nextPageUri, _options); } } @@ -51,7 +51,7 @@ public override async IAsyncEnumerable GetRawPagesAsync() public override ContinuationToken GetContinuationToken(ClientResult page) { string nextPage = ((ListWithStringNextLinkResponse)page).Next; - if (nextPage != null) + if (!string.IsNullOrEmpty(nextPage)) { return ContinuationToken.FromBytes(BinaryData.FromString(nextPage)); } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithStringNextLinkCollectionResult.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkCollectionResult.cs similarity index 92% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithStringNextLinkCollectionResult.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkCollectionResult.cs index 2a8e94d9069..d764ca5f984 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithStringNextLinkCollectionResult.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkCollectionResult.cs @@ -35,11 +35,11 @@ public override IEnumerable GetRawPages() yield return result; string nextPageString = ((ListWithStringNextLinkResponse)result).Next; - if (nextPageString == null) + if (string.IsNullOrEmpty(nextPageString)) { yield break; } - nextPageUri = new Uri(nextPageString); + nextPageUri = new Uri(nextPageString, UriKind.RelativeOrAbsolute); message = _client.CreateNextGetWithStringNextLinkRequest(nextPageUri, _options); } } @@ -50,7 +50,7 @@ public override IEnumerable GetRawPages() public override ContinuationToken GetContinuationToken(ClientResult page) { string nextPage = ((ListWithStringNextLinkResponse)page).Next; - if (nextPage != null) + if (!string.IsNullOrEmpty(nextPage)) { return ContinuationToken.FromBytes(BinaryData.FromString(nextPage)); } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithStringNextLinkCollectionResultOfT.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkCollectionResultOfT.cs similarity index 93% rename from docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithStringNextLinkCollectionResultOfT.cs rename to docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkCollectionResultOfT.cs index 372c6549ab7..a43474cfa5f 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClientGetWithStringNextLinkCollectionResultOfT.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkCollectionResultOfT.cs @@ -35,11 +35,11 @@ public override IEnumerable GetRawPages() yield return result; string nextPageString = ((ListWithStringNextLinkResponse)result).Next; - if (nextPageString == null) + if (string.IsNullOrEmpty(nextPageString)) { yield break; } - nextPageUri = new Uri(nextPageString); + nextPageUri = new Uri(nextPageString, UriKind.RelativeOrAbsolute); message = _client.CreateNextGetWithStringNextLinkRequest(nextPageUri, _options); } } @@ -50,7 +50,7 @@ public override IEnumerable GetRawPages() public override ContinuationToken GetContinuationToken(ClientResult page) { string nextPage = ((ListWithStringNextLinkResponse)page).Next; - if (nextPage != null) + if (!string.IsNullOrEmpty(nextPage)) { return ContinuationToken.FromBytes(BinaryData.FromString(nextPage)); } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/DogOperations.RestClient.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/DogOperations.RestClient.cs index 3b628c186da..b1a85eb45e4 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/DogOperations.RestClient.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/DogOperations.RestClient.cs @@ -12,7 +12,7 @@ public partial class DogOperations { private static PipelineMessageClassifier _pipelineMessageClassifier200; - private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 = PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); + private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); internal PipelineMessage CreateUpdateDogAsDogRequest(BinaryContent content, RequestOptions options) { diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/DogOperations.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/DogOperations.cs index 553adb576a1..c80c36367aa 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/DogOperations.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/DogOperations.cs @@ -112,7 +112,7 @@ public virtual ClientResult UpdateDogAsDog(Dog dog, CancellationToken cance System.Console.WriteLine("Entering method UpdateDogAsDog."); Argument.AssertNotNull(dog, nameof(dog)); - ClientResult result = UpdateDogAsDog(dog, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + ClientResult result = UpdateDogAsDog(dog, cancellationToken.ToRequestOptions()); return ClientResult.FromValue((Dog)result, result.GetRawResponse()); } catch (Exception ex) @@ -138,7 +138,7 @@ public virtual async Task> UpdateDogAsDogAsync(Dog dog, Cancel System.Console.WriteLine("Entering method UpdateDogAsDogAsync."); Argument.AssertNotNull(dog, nameof(dog)); - ClientResult result = await UpdateDogAsDogAsync(dog, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + ClientResult result = await UpdateDogAsDogAsync(dog, cancellationToken.ToRequestOptions()).ConfigureAwait(false); return ClientResult.FromValue((Dog)result, result.GetRawResponse()); } catch (Exception ex) diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/Argument.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/Argument.cs index ceebb5e87f2..48144a285ae 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/Argument.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/Argument.cs @@ -67,5 +67,44 @@ public static void AssertNotNullOrEmpty(string value, string name) throw new ArgumentException("Value cannot be an empty string.", name); } } + + /// The value. + /// The name. + public static void AssertNotNullOrWhiteSpace(string value, string name) + { + if (value is null) + { + throw new ArgumentNullException(name); + } + if (string.IsNullOrWhiteSpace(value)) + { + throw new ArgumentException("Value cannot be empty or contain only white-space characters.", name); + } + } + + /// The value. + /// The minimum value. + /// The maximum value. + /// The name. + public static void AssertInRange(T value, T minimum, T maximum, string name) + where T : notnull, IComparable + { + if (minimum.CompareTo(value) > 0) + { + throw new ArgumentOutOfRangeException(name, "Value is less than the minimum allowed."); + } + if (maximum.CompareTo(value) < 0) + { + throw new ArgumentOutOfRangeException(name, "Value is greater than the maximum allowed."); + } + } + + /// The value. + /// The name. + public static string CheckNotNullOrEmpty(string value, string name) + { + AssertNotNullOrEmpty(value, name); + return value; + } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CancellationTokenExtensions.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CancellationTokenExtensions.cs new file mode 100644 index 00000000000..5e709b92ddf --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CancellationTokenExtensions.cs @@ -0,0 +1,14 @@ +// + +#nullable disable + +using System.ClientModel.Primitives; +using System.Threading; + +namespace SampleTypeSpec +{ + internal static partial class CancellationTokenExtensions + { + public static RequestOptions ToRequestOptions(this CancellationToken cancellationToken) => cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null; + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/ClientUriBuilder.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/ClientUriBuilder.cs index 5d1aebba3a3..2de75801980 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/ClientUriBuilder.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/ClientUriBuilder.cs @@ -12,24 +12,24 @@ namespace SampleTypeSpec internal partial class ClientUriBuilder { private UriBuilder _uriBuilder; - private StringBuilder _pathBuilder; - private StringBuilder _queryBuilder; + private StringBuilder _pathAndQuery; + private int _pathLength; public ClientUriBuilder() { } - private UriBuilder UriBuilder => _uriBuilder ??= new UriBuilder(); + private UriBuilder UriBuilder => _uriBuilder ??= new UriBuilder(); - private StringBuilder PathBuilder => _pathBuilder ??= new StringBuilder(UriBuilder.Path); - - private StringBuilder QueryBuilder => _queryBuilder ??= new StringBuilder(UriBuilder.Query); + private StringBuilder PathAndQuery => _pathAndQuery ??= new StringBuilder(); public void Reset(Uri uri) { _uriBuilder = new UriBuilder(uri); - _pathBuilder = new StringBuilder(UriBuilder.Path); - _queryBuilder = new StringBuilder(UriBuilder.Query); + PathAndQuery.Clear(); + PathAndQuery.Append(UriBuilder.Path); + _pathLength = PathAndQuery.Length; + PathAndQuery.Append(UriBuilder.Query); } public void AppendPath(string value, bool escape) @@ -38,12 +38,13 @@ public void AppendPath(string value, bool escape) { value = Uri.EscapeDataString(value); } - if (PathBuilder.Length > 0 && PathBuilder[PathBuilder.Length - 1] == '/' && value[0] == '/') + if (_pathLength > 0 && PathAndQuery[_pathLength - 1] == '/' && value[0] == '/') { - PathBuilder.Remove(PathBuilder.Length - 1, 1); + PathAndQuery.Remove(_pathLength - 1, 1); + _pathLength = _pathLength - 1; } - PathBuilder.Append(value); - UriBuilder.Path = PathBuilder.ToString(); + PathAndQuery.Insert(_pathLength, value); + _pathLength = _pathLength + value.Length; } public void AppendPath(bool value, bool escape = false) => AppendPath(TypeFormatters.ConvertToString(value), escape); @@ -54,17 +55,17 @@ public void AppendPath(string value, bool escape) public void AppendPath(int value, bool escape = true) => AppendPath(TypeFormatters.ConvertToString(value), escape); - public void AppendPath(byte[] value, string format, bool escape = true) => AppendPath(TypeFormatters.ConvertToString(value, format), escape); + public void AppendPath(byte[] value, SerializationFormat format = SerializationFormat.Default, bool escape = true) => AppendPath(TypeFormatters.ConvertToString(value, format), escape); - public void AppendPath(DateTimeOffset value, string format, bool escape = true) => AppendPath(TypeFormatters.ConvertToString(value, format), escape); + public void AppendPath(DateTimeOffset value, SerializationFormat format = SerializationFormat.Default, bool escape = true) => AppendPath(TypeFormatters.ConvertToString(value, format), escape); - public void AppendPath(TimeSpan value, string format, bool escape = true) => AppendPath(TypeFormatters.ConvertToString(value, format), escape); + public void AppendPath(TimeSpan value, SerializationFormat format = SerializationFormat.Default, bool escape = true) => AppendPath(TypeFormatters.ConvertToString(value, format), escape); public void AppendPath(Guid value, bool escape = true) => AppendPath(TypeFormatters.ConvertToString(value), escape); public void AppendPath(long value, bool escape = true) => AppendPath(TypeFormatters.ConvertToString(value), escape); - public void AppendPathDelimited(IEnumerable value, string delimiter, string format = null, bool escape = true) + public void AppendPathDelimited(IEnumerable value, string delimiter, SerializationFormat format = SerializationFormat.Default, bool escape = true) { delimiter ??= ","; IEnumerable stringValues = value.Select(v => TypeFormatters.ConvertToString(v, format)); @@ -73,26 +74,30 @@ public void AppendPathDelimited(IEnumerable value, string delimiter, strin public void AppendQuery(string name, string value, bool escape) { - if (QueryBuilder.Length > 0) + if (PathAndQuery.Length == _pathLength) + { + PathAndQuery.Append('?'); + } + if (PathAndQuery.Length > _pathLength && PathAndQuery[PathAndQuery.Length - 1] != '?') { - QueryBuilder.Append('&'); + PathAndQuery.Append('&'); } if (escape) { value = Uri.EscapeDataString(value); } - QueryBuilder.Append(name); - QueryBuilder.Append('='); - QueryBuilder.Append(value); + PathAndQuery.Append(name); + PathAndQuery.Append('='); + PathAndQuery.Append(value); } public void AppendQuery(string name, bool value, bool escape = false) => AppendQuery(name, TypeFormatters.ConvertToString(value), escape); public void AppendQuery(string name, float value, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value), escape); - public void AppendQuery(string name, DateTimeOffset value, string format, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value, format), escape); + public void AppendQuery(string name, DateTimeOffset value, SerializationFormat format = SerializationFormat.Default, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value, format), escape); - public void AppendQuery(string name, TimeSpan value, string format, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value, format), escape); + public void AppendQuery(string name, TimeSpan value, SerializationFormat format = SerializationFormat.Default, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value, format), escape); public void AppendQuery(string name, double value, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value), escape); @@ -104,26 +109,71 @@ public void AppendQuery(string name, string value, bool escape) public void AppendQuery(string name, TimeSpan value, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value), escape); - public void AppendQuery(string name, byte[] value, string format, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value, format), escape); + public void AppendQuery(string name, byte[] value, SerializationFormat format = SerializationFormat.Default, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value, format), escape); public void AppendQuery(string name, Guid value, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value), escape); - public void AppendQueryDelimited(string name, IEnumerable value, string delimiter, string format = null, bool escape = true) + public void AppendQueryDelimited(string name, IEnumerable value, string delimiter, SerializationFormat format = SerializationFormat.Default, bool escape = true) { delimiter ??= ","; IEnumerable stringValues = value.Select(v => TypeFormatters.ConvertToString(v, format)); AppendQuery(name, string.Join(delimiter, stringValues), escape); } + public void UpdateQuery(string name, string value) + { + if (PathAndQuery.Length == _pathLength) + { + AppendQuery(name, value, false); + } + else + { + int queryStartIndex = _pathLength + 1; + string searchPattern = name + "="; + string queryString = PathAndQuery.ToString(queryStartIndex, PathAndQuery.Length - queryStartIndex); + int paramStartIndex = -1; + if (queryString.StartsWith(searchPattern)) + { + paramStartIndex = 0; + } + if (paramStartIndex == -1) + { + int prefixedIndex = queryString.IndexOf("&" + searchPattern); + if (prefixedIndex >= 0) + { + paramStartIndex = prefixedIndex + 1; + } + } + if (paramStartIndex >= 0) + { + int valueStartIndex = paramStartIndex + searchPattern.Length; + int valueEndIndex = queryString.IndexOf('&', valueStartIndex); + if (valueEndIndex == -1) + { + valueEndIndex = queryString.Length; + } + int globalStart = queryStartIndex + valueStartIndex; + int globalEnd = queryStartIndex + valueEndIndex; + PathAndQuery.Remove(globalStart, globalEnd - globalStart); + PathAndQuery.Insert(globalStart, value); + } + else + { + AppendQuery(name, value, false); + } + } + } + public Uri ToUri() { - if (_pathBuilder != null) + UriBuilder.Path = PathAndQuery.ToString(0, _pathLength); + if (PathAndQuery.Length > _pathLength) { - UriBuilder.Path = _pathBuilder.ToString(); + UriBuilder.Query = PathAndQuery.ToString(_pathLength + 1, PathAndQuery.Length - _pathLength - 1); } - if (_queryBuilder != null) + if (PathAndQuery.Length == _pathLength) { - UriBuilder.Query = _queryBuilder.ToString(); + UriBuilder.Query = ""; } return UriBuilder.Uri; } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CodeGenMemberAttribute.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CodeGenMemberAttribute.cs index e71b3722d5d..044dfe314c5 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CodeGenMemberAttribute.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -4,7 +4,7 @@ using System; -namespace SampleTypeSpec +namespace Microsoft.TypeSpec.Generator.Customizations { [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CodeGenSerializationAttribute.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CodeGenSerializationAttribute.cs index be5ed5dc2f0..aedb8b359b8 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CodeGenSerializationAttribute.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -4,7 +4,7 @@ using System; -namespace SampleTypeSpec +namespace Microsoft.TypeSpec.Generator.Customizations { [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] internal partial class CodeGenSerializationAttribute : Attribute @@ -16,18 +16,18 @@ public CodeGenSerializationAttribute(string propertyName) } /// The property name which these hooks apply to. - /// The serialization name of the property. - public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + /// The serialization name of the property. + public CodeGenSerializationAttribute(string propertyName, string serializationName) { PropertyName = propertyName; - PropertySerializationName = propertySerializationName; + SerializationName = serializationName; } /// Gets or sets the property name which these hooks should apply to. public string PropertyName { get; } /// Gets or sets the serialization name of the property. - public string PropertySerializationName { get; set; } + public string SerializationName { get; set; } /// /// Gets or sets the method name to use when serializing the property value (property name excluded). diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CodeGenSuppressAttribute.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CodeGenSuppressAttribute.cs index fc114e4c784..601ded913ab 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CodeGenSuppressAttribute.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -4,7 +4,7 @@ using System; -namespace SampleTypeSpec +namespace Microsoft.TypeSpec.Generator.Customizations { [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] internal partial class CodeGenSuppressAttribute : Attribute diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CodeGenTypeAttribute.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CodeGenTypeAttribute.cs index 4b9c784570f..d7b56bdccdf 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CodeGenTypeAttribute.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -4,7 +4,7 @@ using System; -namespace SampleTypeSpec +namespace Microsoft.TypeSpec.Generator.Customizations { [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct))] internal partial class CodeGenTypeAttribute : Attribute diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/ModelSerializationExtensions.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/ModelSerializationExtensions.cs index 298945ade22..eba09d0aa3f 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/ModelSerializationExtensions.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/ModelSerializationExtensions.cs @@ -3,11 +3,17 @@ #nullable disable using System; +using System.Buffers.Text; using System.ClientModel.Primitives; using System.Collections.Generic; using System.Diagnostics; using System.Globalization; +using System.IO; +using System.Runtime.InteropServices; +using System.Text; using System.Text.Json; +using System.Xml; +using System.Xml.Linq; namespace SampleTypeSpec { @@ -18,6 +24,18 @@ internal static partial class ModelSerializationExtensions { MaxDepth = 256 }; + internal static readonly XmlWriterSettings XmlWriterSettings = new XmlWriterSettings + { + Encoding = new UTF8Encoding(false) + }; + private static readonly XmlReaderSettings XmlReaderSettings = new XmlReaderSettings + { + DtdProcessing = DtdProcessing.Prohibit, + XmlResolver = null, + MaxCharactersInDocument = 30000000, + IgnoreProcessingInstructions = true, + IgnoreComments = true + }; public static object GetObject(this JsonElement element) { @@ -251,5 +269,157 @@ public static void WriteObjectValue(this Utf8JsonWriter writer, object value, Mo { writer.WriteObjectValue(value, options); } + + public static BinaryData GetUtf8Bytes(this JsonElement element) + { +#if NET9_0_OR_GREATER + return new global::System.BinaryData(global::System.Runtime.InteropServices.JsonMarshal.GetRawUtf8Value(element).ToArray()); +#else + return BinaryData.FromString(element.GetRawText()); +#endif + } + + public static ReadOnlySpan SliceToStartOfPropertyName(this ReadOnlySpan jsonPath) + { + ReadOnlySpan local = jsonPath; + if (local.Length < 3) + { + return ReadOnlySpan.Empty; + } + if (local[0] != '$') + { + return ReadOnlySpan.Empty; + } + return local.Length >= 4 && local[1] == '[' && (local[2] == '\'' || local[2] == '"') ? local.Slice(3) : ReadOnlySpan.Empty; + } + + public static string GetFirstPropertyName(this ReadOnlySpan jsonPath, out int bytesConsumed) + { + ReadOnlySpan local = jsonPath; + for (bytesConsumed = 0; bytesConsumed < local.Length; bytesConsumed++) + { + byte current = local[bytesConsumed]; + if (current == '.') + { + break; + } + else + { + if (current == '\'' || current == '"') + { + if (bytesConsumed + 1 < local.Length && local[bytesConsumed + 1] == ']') + { + break; + } + } + } + } + + string key; +#if NET6_0_OR_GREATER + key = global::System.Text.Encoding.UTF8.GetString(local.Slice(0, bytesConsumed)); +#else + key = Encoding.UTF8.GetString(local.Slice(0, bytesConsumed).ToArray()); +#endif + bytesConsumed += jsonPath.Length - local.Length; + return key; + } + + public static bool TryGetIndex(this ReadOnlySpan indexSlice, out int index, out int bytesConsumed) + { + index = -1; + bytesConsumed = 0; + + if (indexSlice.IsEmpty || indexSlice[0] != '[') + { + return false; + } + + indexSlice = indexSlice.Slice(1); + if (indexSlice.IsEmpty || indexSlice[0] == '-') + { + return false; + } + + int indexEnd = indexSlice.Slice(1).IndexOf((byte)']'); + if (indexEnd < 0) + { + return false; + } + + return Utf8Parser.TryParse(indexSlice.Slice(0, indexEnd + 1), out index, out bytesConsumed); + } + + public static ReadOnlySpan GetRemainder(this ReadOnlySpan jsonPath, int index) + { + return index >= jsonPath.Length ? ReadOnlySpan.Empty : jsonPath[index] == '.' ? jsonPath.Slice(index) : jsonPath.Slice(index + 2); + } + + public static DateTimeOffset GetDateTimeOffset(this XElement element, string format) => format switch + { + "U" => DateTimeOffset.FromUnixTimeSeconds((long)element), + _ => TypeFormatters.ParseDateTimeOffset(element.Value, format) + }; + + public static TimeSpan GetTimeSpan(this XElement element, string format) => TypeFormatters.ParseTimeSpan(element.Value, format); + + public static byte[] GetBytesFromBase64(this XElement element, string format) => format switch + { + "U" => TypeFormatters.FromBase64UrlString(element.Value), + "D" => Convert.FromBase64String(element.Value), + _ => throw new ArgumentException("Format is not supported: ", nameof(format)) + }; + + public static void WriteStringValue(this XmlWriter writer, DateTimeOffset value, string format) + { + writer.WriteValue(TypeFormatters.ToString(value, format)); + } + + public static void WriteStringValue(this XmlWriter writer, TimeSpan value, string format) + { + writer.WriteValue(TypeFormatters.ToString(value, format)); + } + + public static void WriteBase64StringValue(this XmlWriter writer, byte[] value, string format) + { + writer.WriteValue(TypeFormatters.ToString(value, format)); + } + + public static void WriteObjectValue(this XmlWriter writer, T value, ModelReaderWriterOptions options = null, string nameHint = null) + { + switch (value) + { + case IPersistableModel persistableModel: + BinaryData data = ModelReaderWriter.Write(persistableModel, options ?? WireOptions, SampleTypeSpecContext.Default); + using (Stream stream = data.ToStream()) + { + using (XmlReader reader = XmlReader.Create(stream, XmlReaderSettings)) + { + reader.MoveToContent(); + if (nameHint != null) + { + writer.WriteStartElement(nameHint); + reader.ReadStartElement(); + while (reader.NodeType != XmlNodeType.EndElement) + { + writer.WriteNode(reader, true); + } + writer.WriteEndElement(); + } + else + { + reader.ReadStartElement(); + while (reader.NodeType != XmlNodeType.EndElement) + { + writer.WriteNode(reader, true); + } + } + } + } + return; + default: + throw new NotSupportedException($"Not supported type {typeof(T)}"); + } + } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/SerializationFormat.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/SerializationFormat.cs new file mode 100644 index 00000000000..fd3c61e8642 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/SerializationFormat.cs @@ -0,0 +1,46 @@ +// + +#nullable disable + +namespace SampleTypeSpec +{ + internal enum SerializationFormat + { + /// The default serialization format. + Default = 0, + /// The RFC1123 date time format. + DateTime_RFC1123 = 1, + /// The RFC3339 date time format. + DateTime_RFC3339 = 2, + /// The RFC7231 date time format. + DateTime_RFC7231 = 3, + /// The ISO8601 date time format. + DateTime_ISO8601 = 4, + /// The Unix date time format. + DateTime_Unix = 5, + /// The ISO8601 date format. + Date_ISO8601 = 6, + /// The ISO8601 duration format. + Duration_ISO8601 = 7, + /// The constant duration format. + Duration_Constant = 8, + /// The seconds duration format. + Duration_Seconds = 9, + /// The seconds duration format with float precision. + Duration_Seconds_Float = 10, + /// The seconds duration format with double precision. + Duration_Seconds_Double = 11, + /// The milliseconds duration format. + Duration_Milliseconds = 12, + /// The milliseconds duration format with float precision. + Duration_Milliseconds_Float = 13, + /// The milliseconds duration format with double precision. + Duration_Milliseconds_Double = 14, + /// The ISO8601 time format. + Time_ISO8601 = 15, + /// The Base64Url bytes format. + Bytes_Base64Url = 16, + /// The Base64 bytes format. + Bytes_Base64 = 17 + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/TypeFormatters.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/TypeFormatters.cs index d4a9ddac3b1..cfd1045bf04 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/TypeFormatters.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Internal/TypeFormatters.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Globalization; +using System.Xml; namespace SampleTypeSpec { @@ -33,7 +34,7 @@ internal static partial class TypeFormatters public static string ToString(TimeSpan value, string format) => format switch { - "P" => System.Xml.XmlConvert.ToString(value), + "P" => XmlConvert.ToString(value), _ => value.ToString(format, CultureInfo.InvariantCulture) }; @@ -126,24 +127,52 @@ public static byte[] FromBase64UrlString(string value) public static TimeSpan ParseTimeSpan(string value, string format) => format switch { - "P" => System.Xml.XmlConvert.ToTimeSpan(value), + "P" => XmlConvert.ToTimeSpan(value), _ => TimeSpan.ParseExact(value, format, CultureInfo.InvariantCulture) }; - public static string ConvertToString(object value, string format = null) => value switch + public static string ToFormatSpecifier(SerializationFormat format) => format switch { - null => "null", - string s => s, - bool b => ToString(b), - int or float or double or long or decimal => ((IFormattable)value).ToString(DefaultNumberFormat, CultureInfo.InvariantCulture), - byte[] b0 when format != null => ToString(b0, format), - IEnumerable s0 => string.Join(",", s0), - DateTimeOffset dateTime when format != null => ToString(dateTime, format), - TimeSpan timeSpan when format != null => ToString(timeSpan, format), - TimeSpan timeSpan0 => System.Xml.XmlConvert.ToString(timeSpan0), - Guid guid => guid.ToString(), - BinaryData binaryData => ConvertToString(binaryData.ToArray(), format), - _ => value.ToString() + SerializationFormat.DateTime_RFC1123 => "R", + SerializationFormat.DateTime_RFC3339 => "O", + SerializationFormat.DateTime_RFC7231 => "R", + SerializationFormat.DateTime_ISO8601 => "O", + SerializationFormat.Date_ISO8601 => "D", + SerializationFormat.DateTime_Unix => "U", + SerializationFormat.Bytes_Base64Url => "U", + SerializationFormat.Bytes_Base64 => "D", + SerializationFormat.Duration_ISO8601 => "P", + SerializationFormat.Duration_Constant => "c", + SerializationFormat.Duration_Seconds => "%s", + SerializationFormat.Duration_Seconds_Float => "s\\.FFF", + SerializationFormat.Duration_Seconds_Double => "s\\.FFFFFF", + SerializationFormat.Time_ISO8601 => "T", + _ => null }; + + public static string ConvertToString(object value, SerializationFormat format = SerializationFormat.Default) + { + string formatSpecifier = ToFormatSpecifier(format); + + return value switch + { + null => "null", + string s => s, + bool b => ToString(b), + int or float or double or long or decimal => ((IFormattable)value).ToString(DefaultNumberFormat, CultureInfo.InvariantCulture), + byte[] b0 when formatSpecifier != null => ToString(b0, formatSpecifier), + IEnumerable s0 => string.Join(",", s0), + DateTimeOffset dateTime when formatSpecifier != null => ToString(dateTime, formatSpecifier), + TimeSpan timeSpan when format == SerializationFormat.Duration_Seconds => Convert.ToInt32(timeSpan.TotalSeconds).ToString(CultureInfo.InvariantCulture), + TimeSpan timeSpan0 when format == SerializationFormat.Duration_Seconds_Float || format == SerializationFormat.Duration_Seconds_Double => timeSpan0.TotalSeconds.ToString(CultureInfo.InvariantCulture), + TimeSpan timeSpan1 when format == SerializationFormat.Duration_Milliseconds => Convert.ToInt32(timeSpan1.TotalMilliseconds).ToString(CultureInfo.InvariantCulture), + TimeSpan timeSpan2 when format == SerializationFormat.Duration_Milliseconds_Float || format == SerializationFormat.Duration_Milliseconds_Double => timeSpan2.TotalMilliseconds.ToString(CultureInfo.InvariantCulture), + TimeSpan timeSpan3 when formatSpecifier != null => ToString(timeSpan3, formatSpecifier), + TimeSpan timeSpan4 => XmlConvert.ToString(timeSpan4), + Guid guid => guid.ToString(), + BinaryData binaryData => ConvertToString(binaryData.ToArray(), format), + _ => value.ToString() + }; + } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Metrics.RestClient.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Metrics.RestClient.cs index b9446046ec0..371d027f6b7 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Metrics.RestClient.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Metrics.RestClient.cs @@ -11,13 +11,15 @@ public partial class Metrics { private static PipelineMessageClassifier _pipelineMessageClassifier200; - private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 = PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); + private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); internal PipelineMessage CreateGetWidgetMetricsRequest(string day, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); uri.Reset(_endpoint); - uri.AppendPath("/metrics/widgets/daysOfWeek/", false); + uri.AppendPath("/metrics/", false); + uri.AppendPath(_metricsNamespace, true); + uri.AppendPath("/widgets/daysOfWeek/", false); uri.AppendPath(day, true); PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Metrics.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Metrics.cs index 9ba1067eb8e..65e1ea56883 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Metrics.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Metrics.cs @@ -14,6 +14,7 @@ namespace SampleTypeSpec public partial class Metrics { private readonly Uri _endpoint; + private readonly string _metricsNamespace; /// Initializes a new instance of Metrics for mocking. protected Metrics() @@ -23,10 +24,39 @@ protected Metrics() /// Initializes a new instance of Metrics. /// The HTTP pipeline for sending and receiving REST requests and responses. /// Service endpoint. - internal Metrics(ClientPipeline pipeline, Uri endpoint) + /// + internal Metrics(ClientPipeline pipeline, Uri endpoint, string metricsNamespace) { _endpoint = endpoint; Pipeline = pipeline; + _metricsNamespace = metricsNamespace; + } + + /// Initializes a new instance of Metrics. + /// Service endpoint. + /// + /// or is null. + /// is an empty string, and was expected to be non-empty. + public Metrics(Uri endpoint, string metricsNamespace) : this(endpoint, metricsNamespace, new SampleTypeSpecClientOptions()) + { + } + + /// Initializes a new instance of Metrics. + /// Service endpoint. + /// + /// The options for configuring the client. + /// or is null. + /// is an empty string, and was expected to be non-empty. + public Metrics(Uri endpoint, string metricsNamespace, SampleTypeSpecClientOptions options) + { + Argument.AssertNotNull(endpoint, nameof(endpoint)); + Argument.AssertNotNullOrEmpty(metricsNamespace, nameof(metricsNamespace)); + + options ??= new SampleTypeSpecClientOptions(); + + _endpoint = endpoint; + _metricsNamespace = metricsNamespace; + Pipeline = ClientPipeline.Create(options, Array.Empty(), new PipelinePolicy[] { new UserAgentPolicy(typeof(Metrics).Assembly) }, Array.Empty()); } /// The HTTP pipeline for sending and receiving REST requests and responses. @@ -103,7 +133,7 @@ public virtual ClientResult GetWidgetMetrics(DaysOfWee try { System.Console.WriteLine("Entering method GetWidgetMetrics."); - ClientResult result = GetWidgetMetrics(day.ToString(), cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + ClientResult result = GetWidgetMetrics(day.ToString(), cancellationToken.ToRequestOptions()); return ClientResult.FromValue((GetWidgetMetricsResponse)result, result.GetRawResponse()); } catch (Exception ex) @@ -126,7 +156,7 @@ public virtual async Task> GetWidgetMetri try { System.Console.WriteLine("Entering method GetWidgetMetricsAsync."); - ClientResult result = await GetWidgetMetricsAsync(day.ToString(), cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + ClientResult result = await GetWidgetMetricsAsync(day.ToString(), cancellationToken.ToRequestOptions()).ConfigureAwait(false); return ClientResult.FromValue((GetWidgetMetricsResponse)result, result.GetRawResponse()); } catch (Exception ex) diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Animal.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Animal.Serialization.cs index 4b8a05c0640..4c3bf87bf7d 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Animal.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Animal.Serialization.cs @@ -21,6 +21,64 @@ internal Animal() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeAnimal(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(Animal)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(Animal)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Animal IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(Animal animal) + { + if (animal == null) + { + return null; + } + return BinaryContent.Create(animal, ModelSerializationExtensions.WireOptions); + } + + /// The to deserialize the from. + public static explicit operator Animal(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeAnimal(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -97,63 +155,5 @@ internal static Animal DeserializeAnimal(JsonElement element, ModelReaderWriterO } return UnknownAnimal.DeserializeUnknownAnimal(element, options); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(Animal)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - Animal IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializeAnimal(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(Animal)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to serialize into . - public static implicit operator BinaryContent(Animal animal) - { - if (animal == null) - { - return null; - } - return BinaryContent.Create(animal, ModelSerializationExtensions.WireOptions); - } - - /// The to deserialize the from. - public static explicit operator Animal(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeAnimal(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/AnotherDynamicModel.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/AnotherDynamicModel.Serialization.cs index dfcfd0f3636..cadb4b8cc87 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/AnotherDynamicModel.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/AnotherDynamicModel.Serialization.cs @@ -4,7 +4,7 @@ using System; using System.ClientModel.Primitives; -using System.Collections.Generic; +using System.Text; using System.Text.Json; namespace SampleTypeSpec @@ -17,10 +17,58 @@ internal AnotherDynamicModel() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual AnotherDynamicModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeAnotherDynamicModel(document.RootElement, data, options); + } + default: + throw new FormatException($"The model {nameof(AnotherDynamicModel)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(AnotherDynamicModel)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + AnotherDynamicModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { +#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + if (Patch.Contains("$"u8)) + { + writer.WriteRawValue(Patch.GetJson("$"u8)); + return; + } +#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + writer.WriteStartObject(); JsonModelWriteCore(writer, options); writer.WriteEndObject(); @@ -35,23 +83,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit { throw new FormatException($"The model {nameof(AnotherDynamicModel)} does not support writing '{format}' format."); } - writer.WritePropertyName("bar"u8); - writer.WriteStringValue(Bar); - if (options.Format != "W" && _additionalBinaryDataProperties != null) +#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + if (!Patch.Contains("$.bar"u8)) { - foreach (var item in _additionalBinaryDataProperties) - { - writer.WritePropertyName(item.Key); -#if NET6_0_OR_GREATER - writer.WriteRawValue(item.Value); -#else - using (JsonDocument document = JsonDocument.Parse(item.Value)) - { - JsonSerializer.Serialize(writer, document.RootElement); - } -#endif - } + writer.WritePropertyName("bar"u8); + writer.WriteStringValue(Bar); } + + Patch.WriteTo(writer); +#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } /// The JSON reader. @@ -68,19 +108,22 @@ protected virtual AnotherDynamicModel JsonModelCreateCore(ref Utf8JsonReader rea throw new FormatException($"The model {nameof(AnotherDynamicModel)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeAnotherDynamicModel(document.RootElement, options); + return DeserializeAnotherDynamicModel(document.RootElement, null, options); } /// The JSON element to deserialize. + /// The data to parse. /// The client options for reading and writing models. - internal static AnotherDynamicModel DeserializeAnotherDynamicModel(JsonElement element, ModelReaderWriterOptions options) + internal static AnotherDynamicModel DeserializeAnotherDynamicModel(JsonElement element, BinaryData data, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { return null; } string bar = default; - IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); +#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + JsonPatch patch = new JsonPatch(data is null ? ReadOnlyMemory.Empty : data.ToMemory()); +#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. foreach (var prop in element.EnumerateObject()) { if (prop.NameEquals("bar"u8)) @@ -88,52 +131,9 @@ internal static AnotherDynamicModel DeserializeAnotherDynamicModel(JsonElement e bar = prop.Value.GetString(); continue; } - if (options.Format != "W") - { - additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); - } - } - return new AnotherDynamicModel(bar, additionalBinaryDataProperties); - } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(AnotherDynamicModel)} does not support writing '{options.Format}' format."); + patch.Set([.. "$."u8, .. Encoding.UTF8.GetBytes(prop.Name)], prop.Value.GetUtf8Bytes()); } + return new AnotherDynamicModel(bar, patch); } - - /// The data to parse. - /// The client options for reading and writing models. - AnotherDynamicModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual AnotherDynamicModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializeAnotherDynamicModel(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(AnotherDynamicModel)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/AnotherDynamicModel.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/AnotherDynamicModel.cs index 49cd39c0686..08de4471318 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/AnotherDynamicModel.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/AnotherDynamicModel.cs @@ -3,15 +3,18 @@ #nullable disable using System; -using System.Collections.Generic; +using System.ClientModel.Primitives; +using System.ComponentModel; +using System.Diagnostics.CodeAnalysis; +using System.Text.Json.Serialization; namespace SampleTypeSpec { /// Another sample dynamic model. public partial class AnotherDynamicModel { - /// Keeps track of any properties unknown to the library. - private protected readonly IDictionary _additionalBinaryDataProperties; + [Experimental("SCME0001")] + private JsonPatch _patch; /// Initializes a new instance of . /// @@ -25,12 +28,20 @@ public AnotherDynamicModel(string bar) /// Initializes a new instance of . /// - /// Keeps track of any properties unknown to the library. - internal AnotherDynamicModel(string bar, IDictionary additionalBinaryDataProperties) + /// +#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + internal AnotherDynamicModel(string bar, in JsonPatch patch) { Bar = bar; - _additionalBinaryDataProperties = additionalBinaryDataProperties; + _patch = patch; } +#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + + /// Gets the Patch. + [JsonIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [Experimental("SCME0001")] + public ref JsonPatch Patch => ref _patch; /// Gets the Bar. public string Bar { get; } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Dog.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Dog.Serialization.cs index 7d2e62bb48a..09e635e0310 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Dog.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Dog.Serialization.cs @@ -18,6 +18,64 @@ internal Dog() { } + /// The data to parse. + /// The client options for reading and writing models. + protected override Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeDog(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(Dog)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(Dog)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Dog IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (Dog)PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(Dog dog) + { + if (dog == null) + { + return null; + } + return BinaryContent.Create(dog, ModelSerializationExtensions.WireOptions); + } + + /// The to deserialize the from. + public static explicit operator Dog(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeDog(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -100,63 +158,5 @@ internal static Dog DeserializeDog(JsonElement element, ModelReaderWriterOptions } return new Dog(kind, name, additionalBinaryDataProperties, trained, breed); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(Dog)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - Dog IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (Dog)PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected override Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializeDog(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(Dog)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to serialize into . - public static implicit operator BinaryContent(Dog dog) - { - if (dog == null) - { - return null; - } - return BinaryContent.Create(dog, ModelSerializationExtensions.WireOptions); - } - - /// The to deserialize the from. - public static explicit operator Dog(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeDog(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Dog.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Dog.cs index 29fc705738f..74aee910074 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Dog.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Dog.cs @@ -15,7 +15,7 @@ public partial class Dog : Pet /// Whether the pet is trained. /// The breed of the dog. /// or is null. - public Dog(string name, bool trained, string breed) : base(name, trained) + public Dog(string name, bool trained, string breed) : base("dog", name, trained) { Argument.AssertNotNull(name, nameof(name)); Argument.AssertNotNull(breed, nameof(breed)); diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/DynamicModel.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/DynamicModel.Serialization.cs index 1c31435154e..1dc3ba8d4f8 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/DynamicModel.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/DynamicModel.Serialization.cs @@ -6,6 +6,7 @@ using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; +using System.Text; using System.Text.Json; namespace SampleTypeSpec @@ -18,10 +19,68 @@ internal DynamicModel() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual DynamicModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeDynamicModel(document.RootElement, data, options); + } + default: + throw new FormatException($"The model {nameof(DynamicModel)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(DynamicModel)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + DynamicModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(DynamicModel dynamicModel) + { + if (dynamicModel == null) + { + return null; + } + return BinaryContent.Create(dynamicModel, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { +#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + if (Patch.Contains("$"u8)) + { + writer.WriteRawValue(Patch.GetJson("$"u8)); + return; + } +#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + writer.WriteStartObject(); JsonModelWriteCore(writer, options); writer.WriteEndObject(); @@ -36,9 +95,13 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit { throw new FormatException($"The model {nameof(DynamicModel)} does not support writing '{format}' format."); } - writer.WritePropertyName("name"u8); - writer.WriteStringValue(Name); - if (Optional.IsDefined(OptionalUnknown)) +#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + if (!Patch.Contains("$.name"u8)) + { + writer.WritePropertyName("name"u8); + writer.WriteStringValue(Name); + } + if (Optional.IsDefined(OptionalUnknown) && !Patch.Contains("$.optionalUnknown"u8)) { writer.WritePropertyName("optionalUnknown"u8); #if NET6_0_OR_GREATER @@ -50,173 +113,372 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } #endif } - if (Optional.IsDefined(OptionalInt)) + if (Optional.IsDefined(OptionalInt) && !Patch.Contains("$.optionalInt"u8)) { writer.WritePropertyName("optionalInt"u8); writer.WriteNumberValue(OptionalInt.Value); } - if (Optional.IsCollectionDefined(OptionalNullableList)) + if (Patch.Contains("$.optionalNullableList"u8)) + { + if (!Patch.IsRemoved("$.optionalNullableList"u8)) + { + writer.WritePropertyName("optionalNullableList"u8); + writer.WriteRawValue(Patch.GetJson("$.optionalNullableList"u8)); + } + } + else if (Optional.IsCollectionDefined(OptionalNullableList)) { writer.WritePropertyName("optionalNullableList"u8); writer.WriteStartArray(); - foreach (int item in OptionalNullableList) + for (int i = 0; i < OptionalNullableList.Count; i++) { - writer.WriteNumberValue(item); + if (Patch.IsRemoved(Encoding.UTF8.GetBytes($"$.optionalNullableList[{i}]"))) + { + continue; + } + writer.WriteNumberValue(OptionalNullableList[i]); } + Patch.WriteTo(writer, "$.optionalNullableList"u8); writer.WriteEndArray(); } - if (Optional.IsCollectionDefined(RequiredNullableList)) + if (Patch.Contains("$.requiredNullableList"u8)) + { + if (!Patch.IsRemoved("$.requiredNullableList"u8)) + { + writer.WritePropertyName("requiredNullableList"u8); + writer.WriteRawValue(Patch.GetJson("$.requiredNullableList"u8)); + } + } + else if (Optional.IsCollectionDefined(RequiredNullableList)) { writer.WritePropertyName("requiredNullableList"u8); writer.WriteStartArray(); - foreach (int item in RequiredNullableList) + for (int i = 0; i < RequiredNullableList.Count; i++) { - writer.WriteNumberValue(item); + if (Patch.IsRemoved(Encoding.UTF8.GetBytes($"$.requiredNullableList[{i}]"))) + { + continue; + } + writer.WriteNumberValue(RequiredNullableList[i]); } + Patch.WriteTo(writer, "$.requiredNullableList"u8); writer.WriteEndArray(); } else { writer.WriteNull("requiredNullableList"u8); } - if (Optional.IsCollectionDefined(OptionalNullableDictionary)) + if (Optional.IsCollectionDefined(OptionalNullableDictionary) && !Patch.Contains("$.optionalNullableDictionary"u8)) { writer.WritePropertyName("optionalNullableDictionary"u8); writer.WriteStartObject(); +#if NET8_0_OR_GREATER + global::System.Span buffer = stackalloc byte[256]; +#endif foreach (var item in OptionalNullableDictionary) { - writer.WritePropertyName(item.Key); - writer.WriteNumberValue(item.Value); +#if NET8_0_OR_GREATER + int bytesWritten = global::System.Text.Encoding.UTF8.GetBytes(item.Key.AsSpan(), buffer); + bool patchContains = (bytesWritten == 256) ? Patch.Contains("$.optionalNullableDictionary"u8, global::System.Text.Encoding.UTF8.GetBytes(item.Key)) : Patch.Contains("$.optionalNullableDictionary"u8, buffer.Slice(0, bytesWritten)); +#else + bool patchContains = Patch.Contains("$.optionalNullableDictionary"u8, Encoding.UTF8.GetBytes(item.Key)); +#endif + if (!patchContains) + { + writer.WritePropertyName(item.Key); + writer.WriteNumberValue(item.Value); + } } + + Patch.WriteTo(writer, "$.optionalNullableDictionary"u8); writer.WriteEndObject(); } - if (Optional.IsCollectionDefined(RequiredNullableDictionary)) + if (Optional.IsCollectionDefined(RequiredNullableDictionary) && !Patch.Contains("$.requiredNullableDictionary"u8)) { writer.WritePropertyName("requiredNullableDictionary"u8); writer.WriteStartObject(); +#if NET8_0_OR_GREATER + global::System.Span buffer = stackalloc byte[256]; +#endif foreach (var item in RequiredNullableDictionary) { - writer.WritePropertyName(item.Key); - writer.WriteNumberValue(item.Value); +#if NET8_0_OR_GREATER + int bytesWritten = global::System.Text.Encoding.UTF8.GetBytes(item.Key.AsSpan(), buffer); + bool patchContains = (bytesWritten == 256) ? Patch.Contains("$.requiredNullableDictionary"u8, global::System.Text.Encoding.UTF8.GetBytes(item.Key)) : Patch.Contains("$.requiredNullableDictionary"u8, buffer.Slice(0, bytesWritten)); +#else + bool patchContains = Patch.Contains("$.requiredNullableDictionary"u8, Encoding.UTF8.GetBytes(item.Key)); +#endif + if (!patchContains) + { + writer.WritePropertyName(item.Key); + writer.WriteNumberValue(item.Value); + } } + + Patch.WriteTo(writer, "$.requiredNullableDictionary"u8); writer.WriteEndObject(); } else { writer.WriteNull("requiredNullableDictionary"u8); } - writer.WritePropertyName("primitiveDictionary"u8); - writer.WriteStartObject(); - foreach (var item in PrimitiveDictionary) + if (!Patch.Contains("$.primitiveDictionary"u8)) { - writer.WritePropertyName(item.Key); - writer.WriteNumberValue(item.Value); + writer.WritePropertyName("primitiveDictionary"u8); + writer.WriteStartObject(); +#if NET8_0_OR_GREATER + global::System.Span buffer = stackalloc byte[256]; +#endif + foreach (var item in PrimitiveDictionary) + { +#if NET8_0_OR_GREATER + int bytesWritten = global::System.Text.Encoding.UTF8.GetBytes(item.Key.AsSpan(), buffer); + bool patchContains = (bytesWritten == 256) ? Patch.Contains("$.primitiveDictionary"u8, global::System.Text.Encoding.UTF8.GetBytes(item.Key)) : Patch.Contains("$.primitiveDictionary"u8, buffer.Slice(0, bytesWritten)); +#else + bool patchContains = Patch.Contains("$.primitiveDictionary"u8, Encoding.UTF8.GetBytes(item.Key)); +#endif + if (!patchContains) + { + writer.WritePropertyName(item.Key); + writer.WriteNumberValue(item.Value); + } + } + + Patch.WriteTo(writer, "$.primitiveDictionary"u8); + writer.WriteEndObject(); } - writer.WriteEndObject(); - writer.WritePropertyName("foo"u8); - writer.WriteObjectValue(Foo, options); - writer.WritePropertyName("listFoo"u8); - writer.WriteStartArray(); - foreach (AnotherDynamicModel item in ListFoo) + if (!Patch.Contains("$.foo"u8)) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("foo"u8); + writer.WriteObjectValue(Foo, options); } - writer.WriteEndArray(); - writer.WritePropertyName("listOfListFoo"u8); - writer.WriteStartArray(); - foreach (IList item in ListOfListFoo) + if (Patch.Contains("$.listFoo"u8)) { - if (item == null) + if (!Patch.IsRemoved("$.listFoo"u8)) { - writer.WriteNullValue(); - continue; + writer.WritePropertyName("listFoo"u8); + writer.WriteRawValue(Patch.GetJson("$.listFoo"u8)); } + } + else + { + writer.WritePropertyName("listFoo"u8); writer.WriteStartArray(); - foreach (AnotherDynamicModel item0 in item) + for (int i = 0; i < ListFoo.Count; i++) { - writer.WriteObjectValue(item0, options); + if (ListFoo[i].Patch.IsRemoved("$"u8)) + { + continue; + } + writer.WriteObjectValue(ListFoo[i], options); } + Patch.WriteTo(writer, "$.listFoo"u8); writer.WriteEndArray(); } - writer.WriteEndArray(); - writer.WritePropertyName("dictionaryFoo"u8); - writer.WriteStartObject(); - foreach (var item in DictionaryFoo) + if (Patch.Contains("$.listOfListFoo"u8)) { - writer.WritePropertyName(item.Key); - writer.WriteObjectValue(item.Value, options); + if (!Patch.IsRemoved("$.listOfListFoo"u8)) + { + writer.WritePropertyName("listOfListFoo"u8); + writer.WriteRawValue(Patch.GetJson("$.listOfListFoo"u8)); + } } - writer.WriteEndObject(); - writer.WritePropertyName("dictionaryOfDictionaryFoo"u8); - writer.WriteStartObject(); - foreach (var item in DictionaryOfDictionaryFoo) + else { - writer.WritePropertyName(item.Key); - if (item.Value == null) + writer.WritePropertyName("listOfListFoo"u8); + writer.WriteStartArray(); + for (int i = 0; i < ListOfListFoo.Count; i++) { - writer.WriteNullValue(); - continue; + if (Patch.IsRemoved(Encoding.UTF8.GetBytes($"$.listOfListFoo[{i}]"))) + { + continue; + } + if (ListOfListFoo[i] == null) + { + writer.WriteNullValue(); + continue; + } + writer.WriteStartArray(); + for (int i0 = 0; i0 < ListOfListFoo[i].Count; i0++) + { + if (ListOfListFoo[i][i0].Patch.IsRemoved("$"u8)) + { + continue; + } + writer.WriteObjectValue(ListOfListFoo[i][i0], options); + } + Patch.WriteTo(writer, Encoding.UTF8.GetBytes($"$.listOfListFoo[{i}]")); + writer.WriteEndArray(); } + Patch.WriteTo(writer, "$.listOfListFoo"u8); + writer.WriteEndArray(); + } + if (!Patch.Contains("$.dictionaryFoo"u8)) + { + writer.WritePropertyName("dictionaryFoo"u8); writer.WriteStartObject(); - foreach (var item0 in item.Value) +#if NET8_0_OR_GREATER + global::System.Span buffer = stackalloc byte[256]; +#endif + foreach (var item in DictionaryFoo) { - writer.WritePropertyName(item0.Key); - writer.WriteObjectValue(item0.Value, options); +#if NET8_0_OR_GREATER + int bytesWritten = global::System.Text.Encoding.UTF8.GetBytes(item.Key.AsSpan(), buffer); + bool patchContains = (bytesWritten == 256) ? Patch.Contains("$.dictionaryFoo"u8, global::System.Text.Encoding.UTF8.GetBytes(item.Key)) : Patch.Contains("$.dictionaryFoo"u8, buffer.Slice(0, bytesWritten)); +#else + bool patchContains = Patch.Contains("$.dictionaryFoo"u8, Encoding.UTF8.GetBytes(item.Key)); +#endif + if (!patchContains) + { + writer.WritePropertyName(item.Key); + writer.WriteObjectValue(item.Value, options); + } } + + Patch.WriteTo(writer, "$.dictionaryFoo"u8); writer.WriteEndObject(); } - writer.WriteEndObject(); - writer.WritePropertyName("dictionaryListFoo"u8); - writer.WriteStartObject(); - foreach (var item in DictionaryListFoo) + if (!Patch.Contains("$.dictionaryOfDictionaryFoo"u8)) { - writer.WritePropertyName(item.Key); - if (item.Value == null) - { - writer.WriteNullValue(); - continue; - } - writer.WriteStartArray(); - foreach (AnotherDynamicModel item0 in item.Value) + writer.WritePropertyName("dictionaryOfDictionaryFoo"u8); + writer.WriteStartObject(); +#if NET8_0_OR_GREATER + global::System.Span buffer = stackalloc byte[256]; +#endif + foreach (var item in DictionaryOfDictionaryFoo) { - writer.WriteObjectValue(item0, options); +#if NET8_0_OR_GREATER + int bytesWritten = global::System.Text.Encoding.UTF8.GetBytes(item.Key.AsSpan(), buffer); + bool patchContains = (bytesWritten == 256) ? Patch.Contains("$.dictionaryOfDictionaryFoo"u8, global::System.Text.Encoding.UTF8.GetBytes(item.Key)) : Patch.Contains("$.dictionaryOfDictionaryFoo"u8, buffer.Slice(0, bytesWritten)); +#else + bool patchContains = Patch.Contains("$.dictionaryOfDictionaryFoo"u8, Encoding.UTF8.GetBytes(item.Key)); +#endif + if (!patchContains) + { + writer.WritePropertyName(item.Key); + if (item.Value == null) + { + writer.WriteNullValue(); + continue; + } + writer.WriteStartObject(); +#if NET8_0_OR_GREATER + global::System.Span buffer0 = stackalloc byte[256]; +#endif + foreach (var item0 in item.Value) + { +#if NET8_0_OR_GREATER + int bytesWritten0 = global::System.Text.Encoding.UTF8.GetBytes(item0.Key.AsSpan(), buffer0); + bool patchContains0 = (bytesWritten0 == 256) ? Patch.Contains(global::System.Text.Encoding.UTF8.GetBytes($"$.dictionaryOfDictionaryFoo[\"{item.Key}\"]"), global::System.Text.Encoding.UTF8.GetBytes(item0.Key)) : Patch.Contains(global::System.Text.Encoding.UTF8.GetBytes($"$.dictionaryOfDictionaryFoo[\"{item.Key}\"]"), buffer0.Slice(0, bytesWritten0)); +#else + bool patchContains0 = Patch.Contains(Encoding.UTF8.GetBytes($"$.dictionaryOfDictionaryFoo[\"{item.Key}\"]"), Encoding.UTF8.GetBytes(item0.Key)); +#endif + if (!patchContains0) + { + writer.WritePropertyName(item0.Key); + writer.WriteObjectValue(item0.Value, options); + } + } + + Patch.WriteTo(writer, Encoding.UTF8.GetBytes($"$.dictionaryOfDictionaryFoo[\"{item.Key}\"]")); + writer.WriteEndObject(); + } } - writer.WriteEndArray(); + + Patch.WriteTo(writer, "$.dictionaryOfDictionaryFoo"u8); + writer.WriteEndObject(); } - writer.WriteEndObject(); - writer.WritePropertyName("listOfDictionaryFoo"u8); - writer.WriteStartArray(); - foreach (IDictionary item in ListOfDictionaryFoo) + if (!Patch.Contains("$.dictionaryListFoo"u8)) { - if (item == null) - { - writer.WriteNullValue(); - continue; - } + writer.WritePropertyName("dictionaryListFoo"u8); writer.WriteStartObject(); - foreach (var item0 in item) +#if NET8_0_OR_GREATER + global::System.Span buffer = stackalloc byte[256]; +#endif + foreach (var item in DictionaryListFoo) { - writer.WritePropertyName(item0.Key); - writer.WriteObjectValue(item0.Value, options); +#if NET8_0_OR_GREATER + int bytesWritten = global::System.Text.Encoding.UTF8.GetBytes(item.Key.AsSpan(), buffer); + bool patchContains = (bytesWritten == 256) ? Patch.Contains("$.dictionaryListFoo"u8, global::System.Text.Encoding.UTF8.GetBytes(item.Key)) : Patch.Contains("$.dictionaryListFoo"u8, buffer.Slice(0, bytesWritten)); +#else + bool patchContains = Patch.Contains("$.dictionaryListFoo"u8, Encoding.UTF8.GetBytes(item.Key)); +#endif + if (!patchContains) + { + writer.WritePropertyName(item.Key); + if (item.Value == null) + { + writer.WriteNullValue(); + continue; + } + writer.WriteStartArray(); + for (int i = 0; i < item.Value.Count; i++) + { + if (item.Value[i].Patch.IsRemoved("$"u8)) + { + continue; + } + writer.WriteObjectValue(item.Value[i], options); + } + Patch.WriteTo(writer, Encoding.UTF8.GetBytes($"$.dictionaryListFoo[\"{item.Key}\"]")); + writer.WriteEndArray(); + } } + + Patch.WriteTo(writer, "$.dictionaryListFoo"u8); writer.WriteEndObject(); } - writer.WriteEndArray(); - if (options.Format != "W" && _additionalBinaryDataProperties != null) + if (Patch.Contains("$.listOfDictionaryFoo"u8)) { - foreach (var item in _additionalBinaryDataProperties) + if (!Patch.IsRemoved("$.listOfDictionaryFoo"u8)) { - writer.WritePropertyName(item.Key); -#if NET6_0_OR_GREATER - writer.WriteRawValue(item.Value); -#else - using (JsonDocument document = JsonDocument.Parse(item.Value)) + writer.WritePropertyName("listOfDictionaryFoo"u8); + writer.WriteRawValue(Patch.GetJson("$.listOfDictionaryFoo"u8)); + } + } + else + { + writer.WritePropertyName("listOfDictionaryFoo"u8); + writer.WriteStartArray(); + for (int i = 0; i < ListOfDictionaryFoo.Count; i++) + { + if (Patch.IsRemoved(Encoding.UTF8.GetBytes($"$.listOfDictionaryFoo[{i}]"))) { - JsonSerializer.Serialize(writer, document.RootElement); + continue; + } + if (ListOfDictionaryFoo[i] == null) + { + writer.WriteNullValue(); + continue; } + writer.WriteStartObject(); +#if NET8_0_OR_GREATER + global::System.Span buffer = stackalloc byte[256]; #endif + foreach (var item in ListOfDictionaryFoo[i]) + { +#if NET8_0_OR_GREATER + int bytesWritten = global::System.Text.Encoding.UTF8.GetBytes(item.Key.AsSpan(), buffer); + bool patchContains = (bytesWritten == 256) ? Patch.Contains(global::System.Text.Encoding.UTF8.GetBytes($"$.listOfDictionaryFoo[{i}]"), global::System.Text.Encoding.UTF8.GetBytes(item.Key)) : Patch.Contains(global::System.Text.Encoding.UTF8.GetBytes($"$.listOfDictionaryFoo[{i}]"), buffer.Slice(0, bytesWritten)); +#else + bool patchContains = Patch.Contains(Encoding.UTF8.GetBytes($"$.listOfDictionaryFoo[{i}]"), Encoding.UTF8.GetBytes(item.Key)); +#endif + if (!patchContains) + { + writer.WritePropertyName(item.Key); + writer.WriteObjectValue(item.Value, options); + } + } + + Patch.WriteTo(writer, Encoding.UTF8.GetBytes($"$.listOfDictionaryFoo[{i}]")); + writer.WriteEndObject(); } + Patch.WriteTo(writer, "$.listOfDictionaryFoo"u8); + writer.WriteEndArray(); } + + Patch.WriteTo(writer); +#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } /// The JSON reader. @@ -233,12 +495,13 @@ protected virtual DynamicModel JsonModelCreateCore(ref Utf8JsonReader reader, Mo throw new FormatException($"The model {nameof(DynamicModel)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeDynamicModel(document.RootElement, options); + return DeserializeDynamicModel(document.RootElement, null, options); } /// The JSON element to deserialize. + /// The data to parse. /// The client options for reading and writing models. - internal static DynamicModel DeserializeDynamicModel(JsonElement element, ModelReaderWriterOptions options) + internal static DynamicModel DeserializeDynamicModel(JsonElement element, BinaryData data, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { @@ -259,7 +522,9 @@ internal static DynamicModel DeserializeDynamicModel(JsonElement element, ModelR IDictionary> dictionaryOfDictionaryFoo = default; IDictionary> dictionaryListFoo = default; IList> listOfDictionaryFoo = default; - IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); +#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + JsonPatch patch = new JsonPatch(data is null ? ReadOnlyMemory.Empty : data.ToMemory()); +#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. foreach (var prop in element.EnumerateObject()) { if (prop.NameEquals("name"u8)) @@ -355,7 +620,7 @@ internal static DynamicModel DeserializeDynamicModel(JsonElement element, ModelR } if (prop.NameEquals("foo"u8)) { - foo = AnotherDynamicModel.DeserializeAnotherDynamicModel(prop.Value, options); + foo = AnotherDynamicModel.DeserializeAnotherDynamicModel(prop.Value, prop.Value.GetUtf8Bytes(), options); continue; } if (prop.NameEquals("listFoo"u8)) @@ -363,7 +628,7 @@ internal static DynamicModel DeserializeDynamicModel(JsonElement element, ModelR List array = new List(); foreach (var item in prop.Value.EnumerateArray()) { - array.Add(AnotherDynamicModel.DeserializeAnotherDynamicModel(item, options)); + array.Add(AnotherDynamicModel.DeserializeAnotherDynamicModel(item, item.GetUtf8Bytes(), options)); } listFoo = array; continue; @@ -382,7 +647,7 @@ internal static DynamicModel DeserializeDynamicModel(JsonElement element, ModelR List array0 = new List(); foreach (var item0 in item.EnumerateArray()) { - array0.Add(AnotherDynamicModel.DeserializeAnotherDynamicModel(item0, options)); + array0.Add(AnotherDynamicModel.DeserializeAnotherDynamicModel(item0, item0.GetUtf8Bytes(), options)); } array.Add(array0); } @@ -395,7 +660,7 @@ internal static DynamicModel DeserializeDynamicModel(JsonElement element, ModelR Dictionary dictionary = new Dictionary(); foreach (var prop0 in prop.Value.EnumerateObject()) { - dictionary.Add(prop0.Name, AnotherDynamicModel.DeserializeAnotherDynamicModel(prop0.Value, options)); + dictionary.Add(prop0.Name, AnotherDynamicModel.DeserializeAnotherDynamicModel(prop0.Value, prop0.Value.GetUtf8Bytes(), options)); } dictionaryFoo = dictionary; continue; @@ -414,7 +679,7 @@ internal static DynamicModel DeserializeDynamicModel(JsonElement element, ModelR Dictionary dictionary0 = new Dictionary(); foreach (var prop1 in prop0.Value.EnumerateObject()) { - dictionary0.Add(prop1.Name, AnotherDynamicModel.DeserializeAnotherDynamicModel(prop1.Value, options)); + dictionary0.Add(prop1.Name, AnotherDynamicModel.DeserializeAnotherDynamicModel(prop1.Value, prop1.Value.GetUtf8Bytes(), options)); } dictionary.Add(prop0.Name, dictionary0); } @@ -436,7 +701,7 @@ internal static DynamicModel DeserializeDynamicModel(JsonElement element, ModelR List array = new List(); foreach (var item in prop0.Value.EnumerateArray()) { - array.Add(AnotherDynamicModel.DeserializeAnotherDynamicModel(item, options)); + array.Add(AnotherDynamicModel.DeserializeAnotherDynamicModel(item, item.GetUtf8Bytes(), options)); } dictionary.Add(prop0.Name, array); } @@ -458,7 +723,7 @@ internal static DynamicModel DeserializeDynamicModel(JsonElement element, ModelR Dictionary dictionary = new Dictionary(); foreach (var prop0 in item.EnumerateObject()) { - dictionary.Add(prop0.Name, AnotherDynamicModel.DeserializeAnotherDynamicModel(prop0.Value, options)); + dictionary.Add(prop0.Name, AnotherDynamicModel.DeserializeAnotherDynamicModel(prop0.Value, prop0.Value.GetUtf8Bytes(), options)); } array.Add(dictionary); } @@ -466,10 +731,7 @@ internal static DynamicModel DeserializeDynamicModel(JsonElement element, ModelR listOfDictionaryFoo = array; continue; } - if (options.Format != "W") - { - additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); - } + patch.Set([.. "$."u8, .. Encoding.UTF8.GetBytes(prop.Name)], prop.Value.GetUtf8Bytes()); } return new DynamicModel( name, @@ -487,57 +749,219 @@ internal static DynamicModel DeserializeDynamicModel(JsonElement element, ModelR dictionaryOfDictionaryFoo, dictionaryListFoo, listOfDictionaryFoo, - additionalBinaryDataProperties); + patch); } - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + /// + /// + /// + /// +#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + private bool PropagateGet(ReadOnlySpan jsonPath, out JsonPatch.EncodedValue value) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) + ReadOnlySpan local = jsonPath.SliceToStartOfPropertyName(); + value = default; + + if (local.StartsWith("foo"u8)) { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(DynamicModel)} does not support writing '{options.Format}' format."); + return Foo.Patch.TryGetEncodedValue([.. "$"u8, .. local.Slice("foo"u8.Length)], out value); } - } - - /// The data to parse. - /// The client options for reading and writing models. - DynamicModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual DynamicModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) + if (local.StartsWith("listFoo"u8)) { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializeDynamicModel(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(DynamicModel)} does not support reading '{options.Format}' format."); + int propertyLength = "listFoo"u8.Length; + ReadOnlySpan currentSlice = local.Slice(propertyLength); + if (!currentSlice.TryGetIndex(out int index, out int bytesConsumed)) + { + return false; + } + return ListFoo[index].Patch.TryGetEncodedValue([.. "$"u8, .. currentSlice.Slice(bytesConsumed)], out value); + } + if (local.StartsWith("listOfListFoo"u8)) + { + int propertyLength = "listOfListFoo"u8.Length; + ReadOnlySpan currentSlice = local.Slice(propertyLength); + if (!currentSlice.TryGetIndex(out int index, out int bytesConsumed)) + { + return false; + } + currentSlice = currentSlice.Slice(bytesConsumed); + if (!currentSlice.TryGetIndex(out int index0, out int bytesConsumed0)) + { + return false; + } + return ListOfListFoo[index][index0].Patch.TryGetEncodedValue([.. "$"u8, .. currentSlice.Slice(bytesConsumed0)], out value); + } + if (local.StartsWith("dictionaryFoo"u8)) + { + int propertyLength = "dictionaryFoo"u8.Length; + ReadOnlySpan currentSlice = local.Slice(propertyLength); + string key = currentSlice.GetFirstPropertyName(out int i); + if (!DictionaryFoo.TryGetValue(key, out AnotherDynamicModel item)) + { + return false; + } + return item.Patch.TryGetEncodedValue([.. "$"u8, .. currentSlice.GetRemainder(i)], out value); + } + if (local.StartsWith("dictionaryOfDictionaryFoo"u8)) + { + int propertyLength = "dictionaryOfDictionaryFoo"u8.Length; + ReadOnlySpan currentSlice = local.Slice(propertyLength); + string key = currentSlice.GetFirstPropertyName(out int i); + if (!DictionaryOfDictionaryFoo.TryGetValue(key, out IDictionary item)) + { + return false; + } + currentSlice = currentSlice.GetRemainder(i); + string key0 = currentSlice.GetFirstPropertyName(out int i0); + if (!item.TryGetValue(key0, out AnotherDynamicModel item0)) + { + return false; + } + return item0.Patch.TryGetEncodedValue([.. "$"u8, .. currentSlice.GetRemainder(i0)], out value); + } + if (local.StartsWith("dictionaryListFoo"u8)) + { + int propertyLength = "dictionaryListFoo"u8.Length; + ReadOnlySpan currentSlice = local.Slice(propertyLength); + string key = currentSlice.GetFirstPropertyName(out int i); + if (!DictionaryListFoo.TryGetValue(key, out IList item)) + { + return false; + } + currentSlice = currentSlice.GetRemainder(i); + if (!currentSlice.TryGetIndex(out int index, out int bytesConsumed)) + { + return false; + } + return item[index].Patch.TryGetEncodedValue([.. "$"u8, .. currentSlice.Slice(bytesConsumed)], out value); + } + if (local.StartsWith("listOfDictionaryFoo"u8)) + { + int propertyLength = "listOfDictionaryFoo"u8.Length; + ReadOnlySpan currentSlice = local.Slice(propertyLength); + if (!currentSlice.TryGetIndex(out int index, out int bytesConsumed)) + { + return false; + } + currentSlice = currentSlice.Slice(bytesConsumed); + string key = currentSlice.GetFirstPropertyName(out int i); + if (!ListOfDictionaryFoo[index].TryGetValue(key, out AnotherDynamicModel item)) + { + return false; + } + return item.Patch.TryGetEncodedValue([.. "$"u8, .. currentSlice.GetRemainder(i)], out value); } + return false; } +#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to serialize into . - public static implicit operator BinaryContent(DynamicModel dynamicModel) + /// + /// + /// + /// +#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + private bool PropagateSet(ReadOnlySpan jsonPath, JsonPatch.EncodedValue value) { - if (dynamicModel == null) + ReadOnlySpan local = jsonPath.SliceToStartOfPropertyName(); + + if (local.StartsWith("foo"u8)) { - return null; + Foo.Patch.Set([.. "$"u8, .. local.Slice("foo"u8.Length)], value); + return true; } - return BinaryContent.Create(dynamicModel, ModelSerializationExtensions.WireOptions); + if (local.StartsWith("listFoo"u8)) + { + int propertyLength = "listFoo"u8.Length; + ReadOnlySpan currentSlice = local.Slice(propertyLength); + if (!currentSlice.TryGetIndex(out int index, out int bytesConsumed)) + { + return false; + } + ListFoo[index].Patch.Set([.. "$"u8, .. currentSlice.Slice(bytesConsumed)], value); + return true; + } + if (local.StartsWith("listOfListFoo"u8)) + { + int propertyLength = "listOfListFoo"u8.Length; + ReadOnlySpan currentSlice = local.Slice(propertyLength); + if (!currentSlice.TryGetIndex(out int index, out int bytesConsumed)) + { + return false; + } + currentSlice = currentSlice.Slice(bytesConsumed); + if (!currentSlice.TryGetIndex(out int index0, out int bytesConsumed0)) + { + return false; + } + ListOfListFoo[index][index0].Patch.Set([.. "$"u8, .. currentSlice.Slice(bytesConsumed0)], value); + return true; + } + if (local.StartsWith("dictionaryFoo"u8)) + { + int propertyLength = "dictionaryFoo"u8.Length; + ReadOnlySpan currentSlice = local.Slice(propertyLength); + string key = currentSlice.GetFirstPropertyName(out int i); + if (!DictionaryFoo.TryGetValue(key, out AnotherDynamicModel item)) + { + return false; + } + item.Patch.Set([.. "$"u8, .. currentSlice.GetRemainder(i)], value); + return true; + } + if (local.StartsWith("dictionaryOfDictionaryFoo"u8)) + { + int propertyLength = "dictionaryOfDictionaryFoo"u8.Length; + ReadOnlySpan currentSlice = local.Slice(propertyLength); + string key = currentSlice.GetFirstPropertyName(out int i); + if (!DictionaryOfDictionaryFoo.TryGetValue(key, out IDictionary item)) + { + return false; + } + currentSlice = currentSlice.GetRemainder(i); + string key0 = currentSlice.GetFirstPropertyName(out int i0); + if (!item.TryGetValue(key0, out AnotherDynamicModel item0)) + { + return false; + } + item0.Patch.Set([.. "$"u8, .. currentSlice.GetRemainder(i0)], value); + return true; + } + if (local.StartsWith("dictionaryListFoo"u8)) + { + int propertyLength = "dictionaryListFoo"u8.Length; + ReadOnlySpan currentSlice = local.Slice(propertyLength); + string key = currentSlice.GetFirstPropertyName(out int i); + if (!DictionaryListFoo.TryGetValue(key, out IList item)) + { + return false; + } + currentSlice = currentSlice.GetRemainder(i); + if (!currentSlice.TryGetIndex(out int index, out int bytesConsumed)) + { + return false; + } + item[index].Patch.Set([.. "$"u8, .. currentSlice.Slice(bytesConsumed)], value); + return true; + } + if (local.StartsWith("listOfDictionaryFoo"u8)) + { + int propertyLength = "listOfDictionaryFoo"u8.Length; + ReadOnlySpan currentSlice = local.Slice(propertyLength); + if (!currentSlice.TryGetIndex(out int index, out int bytesConsumed)) + { + return false; + } + currentSlice = currentSlice.Slice(bytesConsumed); + string key = currentSlice.GetFirstPropertyName(out int i); + if (!ListOfDictionaryFoo[index].TryGetValue(key, out AnotherDynamicModel item)) + { + return false; + } + item.Patch.Set([.. "$"u8, .. currentSlice.GetRemainder(i)], value); + return true; + } + return false; } +#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/DynamicModel.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/DynamicModel.cs index 99887d78b09..1ed9528ab40 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/DynamicModel.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/DynamicModel.cs @@ -3,17 +3,21 @@ #nullable disable using System; +using System.ClientModel.Primitives; using System.Collections.Generic; +using System.ComponentModel; +using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Text.Json; +using System.Text.Json.Serialization; namespace SampleTypeSpec { /// A sample dynamic model. public partial class DynamicModel { - /// Keeps track of any properties unknown to the library. - private protected readonly IDictionary _additionalBinaryDataProperties; + [Experimental("SCME0001")] + private JsonPatch _patch; /// Initializes a new instance of . /// @@ -71,8 +75,9 @@ public DynamicModel(string name, IEnumerable requiredNullableList, IDiction /// /// /// - /// Keeps track of any properties unknown to the library. - internal DynamicModel(string name, BinaryData optionalUnknown, int? optionalInt, IList optionalNullableList, IList requiredNullableList, IDictionary optionalNullableDictionary, IDictionary requiredNullableDictionary, IDictionary primitiveDictionary, AnotherDynamicModel foo, IList listFoo, IList> listOfListFoo, IDictionary dictionaryFoo, IDictionary> dictionaryOfDictionaryFoo, IDictionary> dictionaryListFoo, IList> listOfDictionaryFoo, IDictionary additionalBinaryDataProperties) + /// +#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + internal DynamicModel(string name, BinaryData optionalUnknown, int? optionalInt, IList optionalNullableList, IList requiredNullableList, IDictionary optionalNullableDictionary, IDictionary requiredNullableDictionary, IDictionary primitiveDictionary, AnotherDynamicModel foo, IList listFoo, IList> listOfListFoo, IDictionary dictionaryFoo, IDictionary> dictionaryOfDictionaryFoo, IDictionary> dictionaryListFoo, IList> listOfDictionaryFoo, in JsonPatch patch) { Name = name; OptionalUnknown = optionalUnknown; @@ -89,8 +94,16 @@ internal DynamicModel(string name, BinaryData optionalUnknown, int? optionalInt, DictionaryOfDictionaryFoo = dictionaryOfDictionaryFoo; DictionaryListFoo = dictionaryListFoo; ListOfDictionaryFoo = listOfDictionaryFoo; - _additionalBinaryDataProperties = additionalBinaryDataProperties; + _patch = patch; + _patch.SetPropagators(PropagateSet, PropagateGet); } +#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + + /// Gets the Patch. + [JsonIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [Experimental("SCME0001")] + public ref JsonPatch Patch => ref _patch; /// Gets the Name. public string Name { get; } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Friend.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Friend.Serialization.cs index 062a24235b2..5eb29477d55 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Friend.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Friend.Serialization.cs @@ -18,6 +18,64 @@ internal Friend() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual Friend PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeFriend(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(Friend)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(Friend)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Friend IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(Friend friend) + { + if (friend == null) + { + return null; + } + return BinaryContent.Create(friend, ModelSerializationExtensions.WireOptions); + } + + /// The to deserialize the from. + public static explicit operator Friend(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeFriend(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -96,63 +154,5 @@ internal static Friend DeserializeFriend(JsonElement element, ModelReaderWriterO } return new Friend(name, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(Friend)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - Friend IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual Friend PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializeFriend(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(Friend)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to serialize into . - public static implicit operator BinaryContent(Friend friend) - { - if (friend == null) - { - return null; - } - return BinaryContent.Create(friend, ModelSerializationExtensions.WireOptions); - } - - /// The to deserialize the from. - public static explicit operator Friend(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeFriend(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/GetWidgetMetricsResponse.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/GetWidgetMetricsResponse.Serialization.cs index ca936906a4d..695b9066054 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/GetWidgetMetricsResponse.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/GetWidgetMetricsResponse.Serialization.cs @@ -18,6 +18,54 @@ internal GetWidgetMetricsResponse() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual GetWidgetMetricsResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeGetWidgetMetricsResponse(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(GetWidgetMetricsResponse)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(GetWidgetMetricsResponse)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + GetWidgetMetricsResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to deserialize the from. + public static explicit operator GetWidgetMetricsResponse(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeGetWidgetMetricsResponse(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -104,53 +152,5 @@ internal static GetWidgetMetricsResponse DeserializeGetWidgetMetricsResponse(Jso } return new GetWidgetMetricsResponse(numSold, averagePrice, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(GetWidgetMetricsResponse)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - GetWidgetMetricsResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual GetWidgetMetricsResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializeGetWidgetMetricsResponse(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(GetWidgetMetricsResponse)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to deserialize the from. - public static explicit operator GetWidgetMetricsResponse(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeGetWidgetMetricsResponse(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ListWithContinuationTokenHeaderResponseResponse.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ListWithContinuationTokenHeaderResponseResponse.Serialization.cs index b84cd676281..a688be1733e 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ListWithContinuationTokenHeaderResponseResponse.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ListWithContinuationTokenHeaderResponseResponse.Serialization.cs @@ -18,6 +18,54 @@ internal ListWithContinuationTokenHeaderResponseResponse() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual ListWithContinuationTokenHeaderResponseResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeListWithContinuationTokenHeaderResponseResponse(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(ListWithContinuationTokenHeaderResponseResponse)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(ListWithContinuationTokenHeaderResponseResponse)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + ListWithContinuationTokenHeaderResponseResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to deserialize the from. + public static explicit operator ListWithContinuationTokenHeaderResponseResponse(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeListWithContinuationTokenHeaderResponseResponse(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -106,53 +154,5 @@ internal static ListWithContinuationTokenHeaderResponseResponse DeserializeListW } return new ListWithContinuationTokenHeaderResponseResponse(things, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(ListWithContinuationTokenHeaderResponseResponse)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - ListWithContinuationTokenHeaderResponseResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual ListWithContinuationTokenHeaderResponseResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializeListWithContinuationTokenHeaderResponseResponse(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(ListWithContinuationTokenHeaderResponseResponse)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to deserialize the from. - public static explicit operator ListWithContinuationTokenHeaderResponseResponse(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeListWithContinuationTokenHeaderResponseResponse(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ListWithContinuationTokenResponse.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ListWithContinuationTokenResponse.Serialization.cs index 4e35291f242..5e6c75d0bf1 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ListWithContinuationTokenResponse.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ListWithContinuationTokenResponse.Serialization.cs @@ -18,6 +18,54 @@ internal ListWithContinuationTokenResponse() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual ListWithContinuationTokenResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeListWithContinuationTokenResponse(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(ListWithContinuationTokenResponse)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(ListWithContinuationTokenResponse)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + ListWithContinuationTokenResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to deserialize the from. + public static explicit operator ListWithContinuationTokenResponse(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeListWithContinuationTokenResponse(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -117,53 +165,5 @@ internal static ListWithContinuationTokenResponse DeserializeListWithContinuatio } return new ListWithContinuationTokenResponse(things, nextToken, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(ListWithContinuationTokenResponse)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - ListWithContinuationTokenResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual ListWithContinuationTokenResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializeListWithContinuationTokenResponse(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(ListWithContinuationTokenResponse)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to deserialize the from. - public static explicit operator ListWithContinuationTokenResponse(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeListWithContinuationTokenResponse(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ListWithNextLinkResponse.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ListWithNextLinkResponse.Serialization.cs index faecc111c44..0d591294f7e 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ListWithNextLinkResponse.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ListWithNextLinkResponse.Serialization.cs @@ -18,6 +18,54 @@ internal ListWithNextLinkResponse() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual ListWithNextLinkResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeListWithNextLinkResponse(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(ListWithNextLinkResponse)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(ListWithNextLinkResponse)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + ListWithNextLinkResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to deserialize the from. + public static explicit operator ListWithNextLinkResponse(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeListWithNextLinkResponse(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -111,7 +159,7 @@ internal static ListWithNextLinkResponse DeserializeListWithNextLinkResponse(Jso { continue; } - next = new Uri(prop.Value.GetString()); + next = string.IsNullOrEmpty(prop.Value.GetString()) ? null : new Uri(prop.Value.GetString(), UriKind.RelativeOrAbsolute); continue; } if (options.Format != "W") @@ -121,53 +169,5 @@ internal static ListWithNextLinkResponse DeserializeListWithNextLinkResponse(Jso } return new ListWithNextLinkResponse(things, next, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(ListWithNextLinkResponse)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - ListWithNextLinkResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual ListWithNextLinkResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializeListWithNextLinkResponse(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(ListWithNextLinkResponse)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to deserialize the from. - public static explicit operator ListWithNextLinkResponse(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeListWithNextLinkResponse(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ListWithStringNextLinkResponse.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ListWithStringNextLinkResponse.Serialization.cs index 913e94bc667..d44902a3128 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ListWithStringNextLinkResponse.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ListWithStringNextLinkResponse.Serialization.cs @@ -18,6 +18,54 @@ internal ListWithStringNextLinkResponse() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual ListWithStringNextLinkResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeListWithStringNextLinkResponse(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(ListWithStringNextLinkResponse)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(ListWithStringNextLinkResponse)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + ListWithStringNextLinkResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to deserialize the from. + public static explicit operator ListWithStringNextLinkResponse(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeListWithStringNextLinkResponse(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -117,53 +165,5 @@ internal static ListWithStringNextLinkResponse DeserializeListWithStringNextLink } return new ListWithStringNextLinkResponse(things, next, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(ListWithStringNextLinkResponse)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - ListWithStringNextLinkResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual ListWithStringNextLinkResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializeListWithStringNextLinkResponse(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(ListWithStringNextLinkResponse)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to deserialize the from. - public static explicit operator ListWithStringNextLinkResponse(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeListWithStringNextLinkResponse(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ModelWithEmbeddedNonBodyParameters.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ModelWithEmbeddedNonBodyParameters.Serialization.cs index acdeee27032..1a4767ff006 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ModelWithEmbeddedNonBodyParameters.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ModelWithEmbeddedNonBodyParameters.Serialization.cs @@ -18,6 +18,56 @@ internal ModelWithEmbeddedNonBodyParameters() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual ModelWithEmbeddedNonBodyParameters PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeModelWithEmbeddedNonBodyParameters(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(ModelWithEmbeddedNonBodyParameters)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(ModelWithEmbeddedNonBodyParameters)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + ModelWithEmbeddedNonBodyParameters IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(ModelWithEmbeddedNonBodyParameters modelWithEmbeddedNonBodyParameters) + { + if (modelWithEmbeddedNonBodyParameters == null) + { + return null; + } + return BinaryContent.Create(modelWithEmbeddedNonBodyParameters, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -106,55 +156,5 @@ internal static ModelWithEmbeddedNonBodyParameters DeserializeModelWithEmbeddedN optionalQuery, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(ModelWithEmbeddedNonBodyParameters)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - ModelWithEmbeddedNonBodyParameters IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual ModelWithEmbeddedNonBodyParameters PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializeModelWithEmbeddedNonBodyParameters(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(ModelWithEmbeddedNonBodyParameters)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to serialize into . - public static implicit operator BinaryContent(ModelWithEmbeddedNonBodyParameters modelWithEmbeddedNonBodyParameters) - { - if (modelWithEmbeddedNonBodyParameters == null) - { - return null; - } - return BinaryContent.Create(modelWithEmbeddedNonBodyParameters, ModelSerializationExtensions.WireOptions); - } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs index 717344ec3d8..e7c3fa34046 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs @@ -17,6 +17,46 @@ internal ModelWithRequiredNullableProperties() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual ModelWithRequiredNullableProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeModelWithRequiredNullableProperties(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(ModelWithRequiredNullableProperties)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(ModelWithRequiredNullableProperties)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + ModelWithRequiredNullableProperties IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -147,45 +187,5 @@ internal static ModelWithRequiredNullableProperties DeserializeModelWithRequired } return new ModelWithRequiredNullableProperties(requiredNullablePrimitive, requiredExtensibleEnum, requiredFixedEnum, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(ModelWithRequiredNullableProperties)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - ModelWithRequiredNullableProperties IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual ModelWithRequiredNullableProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializeModelWithRequiredNullableProperties(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(ModelWithRequiredNullableProperties)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/PageThing.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/PageThing.Serialization.cs index 08e5839be7f..def99a77e25 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/PageThing.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/PageThing.Serialization.cs @@ -18,6 +18,54 @@ internal PageThing() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual PageThing PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializePageThing(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(PageThing)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(PageThing)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + PageThing IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to deserialize the from. + public static explicit operator PageThing(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializePageThing(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -106,53 +154,5 @@ internal static PageThing DeserializePageThing(JsonElement element, ModelReaderW } return new PageThing(items, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(PageThing)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - PageThing IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual PageThing PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializePageThing(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(PageThing)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to deserialize the from. - public static explicit operator PageThing(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializePageThing(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Pet.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Pet.Serialization.cs index 1102daad746..21edb88d299 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Pet.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Pet.Serialization.cs @@ -17,6 +17,64 @@ internal Pet() { } + /// The data to parse. + /// The client options for reading and writing models. + protected override Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializePet(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(Pet)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(Pet)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Pet IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (Pet)PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(Pet pet) + { + if (pet == null) + { + return null; + } + return BinaryContent.Create(pet, ModelSerializationExtensions.WireOptions); + } + + /// The to deserialize the from. + public static explicit operator Pet(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializePet(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -65,65 +123,15 @@ internal static Pet DeserializePet(JsonElement element, ModelReaderWriterOptions { return null; } - return UnknownPet.DeserializeUnknownPet(element, options); - } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) + if (element.TryGetProperty("kind"u8, out JsonElement discriminator)) { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(Pet)} does not support writing '{options.Format}' format."); + switch (discriminator.GetString()) + { + case "dog": + return Dog.DeserializeDog(element, options); + } } - } - - /// The data to parse. - /// The client options for reading and writing models. - Pet IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (Pet)PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected override Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializePet(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(Pet)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to serialize into . - public static implicit operator BinaryContent(Pet pet) - { - if (pet == null) - { - return null; - } - return BinaryContent.Create(pet, ModelSerializationExtensions.WireOptions); - } - - /// The to deserialize the from. - public static explicit operator Pet(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializePet(document.RootElement, ModelSerializationExtensions.WireOptions); + return UnknownPet.DeserializeUnknownPet(element, options); } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Pet.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Pet.cs index fd7e8130718..7ad087231a6 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Pet.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Pet.cs @@ -31,6 +31,15 @@ internal Pet(string kind, string name, IDictionary additiona Trained = trained; } + /// Initializes a new instance of . + /// The kind of animal. + /// Name of the animal. + /// Whether the pet is trained. + private protected Pet(string kind, string name, bool trained) : base(kind, name) + { + Trained = trained; + } + /// Whether the pet is trained. public bool Trained { get; set; } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Plant.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Plant.Serialization.cs new file mode 100644 index 00000000000..bd5e9491664 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Plant.Serialization.cs @@ -0,0 +1,224 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.IO; +using System.Text.Json; +using System.Xml; +using System.Xml.Linq; + +namespace SampleTypeSpec +{ + /// + /// Base plant with discriminator + /// Please note this is the abstract base class. The derived classes available for instantiation are: . + /// + [PersistableModelProxy(typeof(UnknownPlant))] + public abstract partial class Plant : IJsonModel + { + /// Initializes a new instance of for deserialization. + internal Plant() + { + } + + /// The data to parse. + /// The client options for reading and writing models. + protected virtual Plant PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializePlant(document.RootElement, options); + } + case "X": + using (Stream dataStream = data.ToStream()) + { + return DeserializePlant(XElement.Load(dataStream, LoadOptions.PreserveWhitespace), options); + } + default: + throw new FormatException($"The model {nameof(Plant)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + case "X": + using (MemoryStream stream = new MemoryStream(256)) + { + using (XmlWriter writer = XmlWriter.Create(stream, ModelSerializationExtensions.XmlWriterSettings)) + { + WriteXml(writer, options, "Plant"); + } + if (stream.Position > int.MaxValue) + { + return BinaryData.FromStream(stream); + } + else + { + return new BinaryData(stream.GetBuffer().AsMemory(0, (int)stream.Position)); + } + } + default: + throw new FormatException($"The model {nameof(Plant)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Plant IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The JSON writer. + /// The client options for reading and writing models. + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + writer.WriteStartObject(); + JsonModelWriteCore(writer, options); + writer.WriteEndObject(); + } + + /// The JSON writer. + /// The client options for reading and writing models. + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(Plant)} does not support writing '{format}' format."); + } + writer.WritePropertyName("species"u8); + writer.WriteStringValue(Species); + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + writer.WritePropertyName("height"u8); + writer.WriteNumberValue(Height); + if (options.Format != "W" && _additionalBinaryDataProperties != null) + { + foreach (var item in _additionalBinaryDataProperties) + { + writer.WritePropertyName(item.Key); +#if NET6_0_OR_GREATER + writer.WriteRawValue(item.Value); +#else + using (JsonDocument document = JsonDocument.Parse(item.Value)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + } + } + + /// The JSON reader. + /// The client options for reading and writing models. + Plant IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + + /// The JSON reader. + /// The client options for reading and writing models. + protected virtual Plant JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(Plant)} does not support reading '{format}' format."); + } + using JsonDocument document = JsonDocument.ParseValue(ref reader); + return DeserializePlant(document.RootElement, options); + } + + /// The JSON element to deserialize. + /// The client options for reading and writing models. + internal static Plant DeserializePlant(JsonElement element, ModelReaderWriterOptions options) + { + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + if (element.TryGetProperty("species"u8, out JsonElement discriminator)) + { + switch (discriminator.GetString()) + { + case "tree": + return Tree.DeserializeTree(element, options); + } + } + return UnknownPlant.DeserializeUnknownPlant(element, options); + } + + /// The XML writer. + /// The client options for reading and writing models. + /// An optional name hint. + private void WriteXml(XmlWriter writer, ModelReaderWriterOptions options, string nameHint) + { + if (nameHint != null) + { + writer.WriteStartElement(nameHint); + } + + XmlModelWriteCore(writer, options); + + if (nameHint != null) + { + writer.WriteEndElement(); + } + } + + /// The XML writer. + /// The client options for reading and writing models. + internal virtual void XmlModelWriteCore(XmlWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "X") + { + throw new FormatException($"The model {nameof(Plant)} does not support writing '{format}' format."); + } + + writer.WriteStartElement("species"); + writer.WriteValue(Species); + writer.WriteEndElement(); + writer.WriteStartElement("id"); + writer.WriteValue(Id); + writer.WriteEndElement(); + writer.WriteStartElement("height"); + writer.WriteValue(Height); + writer.WriteEndElement(); + } + + /// The xml element to deserialize. + /// The client options for reading and writing models. + internal static Plant DeserializePlant(XElement element, ModelReaderWriterOptions options) + { + if (element == null) + { + return null; + } + + XElement discriminatorElement = element.Element("species"); + if (discriminatorElement != null) + { + switch ((string)discriminatorElement) + { + case "tree": + return Tree.DeserializeTree(element, options); + } + } + return UnknownPlant.DeserializeUnknownPlant(element, options); + } + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Plant.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Plant.cs new file mode 100644 index 00000000000..c15ab5aa885 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Plant.cs @@ -0,0 +1,52 @@ +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace SampleTypeSpec +{ + /// + /// Base plant with discriminator + /// Please note this is the abstract base class. The derived classes available for instantiation are: . + /// + public abstract partial class Plant + { + /// Keeps track of any properties unknown to the library. + private protected readonly IDictionary _additionalBinaryDataProperties; + + /// Initializes a new instance of . + /// The species of plant. + /// The unique identifier of the plant. + /// The height of the plant in centimeters. + private protected Plant(string species, string id, int height) + { + Species = species; + Id = id; + Height = height; + } + + /// Initializes a new instance of . + /// The species of plant. + /// The unique identifier of the plant. + /// The height of the plant in centimeters. + /// Keeps track of any properties unknown to the library. + internal Plant(string species, string id, int height, IDictionary additionalBinaryDataProperties) + { + Species = species; + Id = id; + Height = height; + _additionalBinaryDataProperties = additionalBinaryDataProperties; + } + + /// The species of plant. + internal string Species { get; set; } + + /// The unique identifier of the plant. + public string Id { get; set; } + + /// The height of the plant in centimeters. + public int Height { get; set; } + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/RenamedModel.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/RenamedModel.Serialization.cs index a5b390f5388..3e620b90e9a 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/RenamedModel.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/RenamedModel.Serialization.cs @@ -18,6 +18,64 @@ internal RenamedModel() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual RenamedModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeRenamedModel(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(RenamedModel)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(RenamedModel)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + RenamedModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(RenamedModel renamedModel) + { + if (renamedModel == null) + { + return null; + } + return BinaryContent.Create(renamedModel, ModelSerializationExtensions.WireOptions); + } + + /// The to deserialize the from. + public static explicit operator RenamedModel(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeRenamedModel(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -96,63 +154,5 @@ internal static RenamedModel DeserializeRenamedModel(JsonElement element, ModelR } return new RenamedModel(otherName, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(RenamedModel)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - RenamedModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual RenamedModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializeRenamedModel(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(RenamedModel)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to serialize into . - public static implicit operator BinaryContent(RenamedModel renamedModel) - { - if (renamedModel == null) - { - return null; - } - return BinaryContent.Create(renamedModel, ModelSerializationExtensions.WireOptions); - } - - /// The to deserialize the from. - public static explicit operator RenamedModel(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeRenamedModel(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs index 2a258c550fe..55195780f54 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs @@ -13,6 +13,54 @@ namespace SampleTypeSpec /// The ReturnsAnonymousModelResponse. public partial class ReturnsAnonymousModelResponse : IJsonModel { + /// The data to parse. + /// The client options for reading and writing models. + protected virtual ReturnsAnonymousModelResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeReturnsAnonymousModelResponse(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(ReturnsAnonymousModelResponse)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(ReturnsAnonymousModelResponse)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + ReturnsAnonymousModelResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to deserialize the from. + public static explicit operator ReturnsAnonymousModelResponse(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeReturnsAnonymousModelResponse(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -83,53 +131,5 @@ internal static ReturnsAnonymousModelResponse DeserializeReturnsAnonymousModelRe } return new ReturnsAnonymousModelResponse(additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(ReturnsAnonymousModelResponse)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - ReturnsAnonymousModelResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual ReturnsAnonymousModelResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializeReturnsAnonymousModelResponse(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(ReturnsAnonymousModelResponse)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to deserialize the from. - public static explicit operator ReturnsAnonymousModelResponse(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeReturnsAnonymousModelResponse(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/RoundTripModel.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/RoundTripModel.Serialization.cs index ca950d5f14d..9be911e1437 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/RoundTripModel.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/RoundTripModel.Serialization.cs @@ -18,6 +18,64 @@ internal RoundTripModel() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual RoundTripModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeRoundTripModel(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(RoundTripModel)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(RoundTripModel)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + RoundTripModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(RoundTripModel roundTripModel) + { + if (roundTripModel == null) + { + return null; + } + return BinaryContent.Create(roundTripModel, ModelSerializationExtensions.WireOptions); + } + + /// The to deserialize the from. + public static explicit operator RoundTripModel(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeRoundTripModel(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -601,63 +659,5 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo requiredBytes, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(RoundTripModel)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - RoundTripModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual RoundTripModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializeRoundTripModel(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(RoundTripModel)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to serialize into . - public static implicit operator BinaryContent(RoundTripModel roundTripModel) - { - if (roundTripModel == null) - { - return null; - } - return BinaryContent.Create(roundTripModel, ModelSerializationExtensions.WireOptions); - } - - /// The to deserialize the from. - public static explicit operator RoundTripModel(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeRoundTripModel(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/SampleTypeSpecContext.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/SampleTypeSpecContext.cs index acbd82d2f33..aa368d7b114 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/SampleTypeSpecContext.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/SampleTypeSpecContext.cs @@ -24,12 +24,20 @@ namespace SampleTypeSpec [ModelReaderWriterBuildable(typeof(ModelWithRequiredNullableProperties))] [ModelReaderWriterBuildable(typeof(PageThing))] [ModelReaderWriterBuildable(typeof(Pet))] + [ModelReaderWriterBuildable(typeof(Plant))] [ModelReaderWriterBuildable(typeof(RenamedModel))] [ModelReaderWriterBuildable(typeof(ReturnsAnonymousModelResponse))] [ModelReaderWriterBuildable(typeof(RoundTripModel))] [ModelReaderWriterBuildable(typeof(Thing))] + [ModelReaderWriterBuildable(typeof(Tree))] [ModelReaderWriterBuildable(typeof(UnknownAnimal))] [ModelReaderWriterBuildable(typeof(UnknownPet))] + [ModelReaderWriterBuildable(typeof(UnknownPlant))] + [ModelReaderWriterBuildable(typeof(Wrapper))] + [ModelReaderWriterBuildable(typeof(XmlAdvancedModel))] + [ModelReaderWriterBuildable(typeof(XmlItem))] + [ModelReaderWriterBuildable(typeof(XmlModelWithNamespace))] + [ModelReaderWriterBuildable(typeof(XmlNestedModel))] public partial class SampleTypeSpecContext : ModelReaderWriterContext { } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Thing.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Thing.Serialization.cs index 9932a260154..b86b2bd75b5 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Thing.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Thing.Serialization.cs @@ -18,6 +18,64 @@ internal Thing() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual Thing PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeThing(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(Thing)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(Thing)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Thing IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(Thing thing) + { + if (thing == null) + { + return null; + } + return BinaryContent.Create(thing, ModelSerializationExtensions.WireOptions); + } + + /// The to deserialize the from. + public static explicit operator Thing(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeThing(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -72,12 +130,12 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit if (Optional.IsDefined(OptionalLiteralString)) { writer.WritePropertyName("optionalLiteralString"u8); - writer.WriteStringValue(OptionalLiteralString); + writer.WriteStringValue(OptionalLiteralString.Value.ToString()); } if (Optional.IsDefined(RequiredNullableLiteralString)) { writer.WritePropertyName("requiredNullableLiteralString"u8); - writer.WriteStringValue(RequiredNullableLiteralString); + writer.WriteStringValue(RequiredNullableLiteralString.Value.ToString()); } else { @@ -86,12 +144,12 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit if (Optional.IsDefined(OptionalLiteralInt)) { writer.WritePropertyName("optionalLiteralInt"u8); - writer.WriteNumberValue(OptionalLiteralInt.Value); + writer.WriteNumberValue(OptionalLiteralInt.Value.ToSerialInt32()); } if (Optional.IsDefined(OptionalLiteralFloat)) { writer.WritePropertyName("optionalLiteralFloat"u8); - writer.WriteNumberValue(OptionalLiteralFloat.Value); + writer.WriteNumberValue(OptionalLiteralFloat.Value.ToSerialSingle()); } if (Optional.IsDefined(OptionalLiteralBool)) { @@ -176,10 +234,10 @@ internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOpt int requiredLiteralInt = default; float requiredLiteralFloat = default; bool requiredLiteralBool = default; - string optionalLiteralString = default; - string requiredNullableLiteralString = default; - int? optionalLiteralInt = default; - float? optionalLiteralFloat = default; + ThingOptionalLiteralString? optionalLiteralString = default; + ThingRequiredNullableLiteralString1? requiredNullableLiteralString = default; + ThingOptionalLiteralInt? optionalLiteralInt = default; + ThingOptionalLiteralFloat? optionalLiteralFloat = default; bool? optionalLiteralBool = default; string requiredBadDescription = default; IList optionalNullableList = default; @@ -240,7 +298,11 @@ internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOpt } if (prop.NameEquals("optionalLiteralString"u8)) { - optionalLiteralString = prop.Value.GetString(); + if (prop.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + optionalLiteralString = new ThingOptionalLiteralString(prop.Value.GetString()); continue; } if (prop.NameEquals("requiredNullableLiteralString"u8)) @@ -250,7 +312,7 @@ internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOpt requiredNullableLiteralString = null; continue; } - requiredNullableLiteralString = prop.Value.GetString(); + requiredNullableLiteralString = new ThingRequiredNullableLiteralString1(prop.Value.GetString()); continue; } if (prop.NameEquals("optionalLiteralInt"u8)) @@ -259,7 +321,7 @@ internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOpt { continue; } - optionalLiteralInt = prop.Value.GetInt32(); + optionalLiteralInt = new ThingOptionalLiteralInt(prop.Value.GetInt32()); continue; } if (prop.NameEquals("optionalLiteralFloat"u8)) @@ -268,7 +330,7 @@ internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOpt { continue; } - optionalLiteralFloat = prop.Value.GetSingle(); + optionalLiteralFloat = new ThingOptionalLiteralFloat(prop.Value.GetSingle()); continue; } if (prop.NameEquals("optionalLiteralBool"u8)) @@ -344,63 +406,5 @@ internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOpt propertyWithSpecialDocs, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(Thing)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - Thing IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual Thing PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializeThing(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(Thing)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to serialize into . - public static implicit operator BinaryContent(Thing thing) - { - if (thing == null) - { - return null; - } - return BinaryContent.Create(thing, ModelSerializationExtensions.WireOptions); - } - - /// The to deserialize the from. - public static explicit operator Thing(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeThing(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Thing.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Thing.cs index 2bc903282fb..5be37d3188d 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Thing.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Thing.cs @@ -19,19 +19,15 @@ public partial class Thing /// name of the Thing. /// required Union. /// required nullable string. + /// required nullable literal string. /// description with xml <|endoftext|>. /// required nullable collection. /// /// This tests: - /// - Simple bullet point. This bullet point is going to be very long to test how text wrapping is handled in bullet points within documentation comments. It should properly indent the wrapped lines. - /// - Another bullet point with **bold text**. This bullet point is also intentionally long to see how the formatting is preserved when the text wraps onto multiple lines in the generated documentation. - /// - Third bullet point with *italic text*. Similar to the previous points, this one is extended to ensure that the wrapping and formatting are correctly applied in the output. - /// - Complex bullet point with **bold** and *italic* combined. This bullet point combines both bold and italic formatting and is long enough to test the wrapping behavior in such cases. - /// - **Bold bullet point**: A bullet point that is entirely bolded. This point is also made lengthy to observe how the bold formatting is maintained across wrapped lines. - /// - *Italic bullet point*: A bullet point that is entirely italicized. This final point is extended to verify that italic formatting is correctly applied even when the text spans multiple lines. + /// Simple bullet point. This bullet point is going to be very long to test how text wrapping is handled in bullet points within documentation comments. It should properly indent the wrapped lines.Another bullet point with bold text. This bullet point is also intentionally long to see how the formatting is preserved when the text wraps onto multiple lines in the generated documentation.Third bullet point with italic text. Similar to the previous points, this one is extended to ensure that the wrapping and formatting are correctly applied in the output.Complex bullet point with bold and italic combined. This bullet point combines both bold and italic formatting and is long enough to test the wrapping behavior in such cases.Bold bullet point: A bullet point that is entirely bolded. This point is also made lengthy to observe how the bold formatting is maintained across wrapped lines.Italic bullet point: A bullet point that is entirely italicized. This final point is extended to verify that italic formatting is correctly applied even when the text spans multiple lines. /// /// , , or is null. - public Thing(string name, BinaryData requiredUnion, string requiredNullableString, string requiredBadDescription, IEnumerable requiredNullableList, string propertyWithSpecialDocs) + public Thing(string name, BinaryData requiredUnion, string requiredNullableString, ThingRequiredNullableLiteralString1? requiredNullableLiteralString, string requiredBadDescription, IEnumerable requiredNullableList, string propertyWithSpecialDocs) { Argument.AssertNotNull(name, nameof(name)); Argument.AssertNotNull(requiredUnion, nameof(requiredUnion)); @@ -41,6 +37,7 @@ public Thing(string name, BinaryData requiredUnion, string requiredNullableStrin Name = name; RequiredUnion = requiredUnion; RequiredNullableString = requiredNullableString; + RequiredNullableLiteralString = requiredNullableLiteralString; RequiredBadDescription = requiredBadDescription; OptionalNullableList = new ChangeTrackingList(); RequiredNullableList = requiredNullableList?.ToList(); @@ -66,15 +63,10 @@ public Thing(string name, BinaryData requiredUnion, string requiredNullableStrin /// required nullable collection. /// /// This tests: - /// - Simple bullet point. This bullet point is going to be very long to test how text wrapping is handled in bullet points within documentation comments. It should properly indent the wrapped lines. - /// - Another bullet point with **bold text**. This bullet point is also intentionally long to see how the formatting is preserved when the text wraps onto multiple lines in the generated documentation. - /// - Third bullet point with *italic text*. Similar to the previous points, this one is extended to ensure that the wrapping and formatting are correctly applied in the output. - /// - Complex bullet point with **bold** and *italic* combined. This bullet point combines both bold and italic formatting and is long enough to test the wrapping behavior in such cases. - /// - **Bold bullet point**: A bullet point that is entirely bolded. This point is also made lengthy to observe how the bold formatting is maintained across wrapped lines. - /// - *Italic bullet point*: A bullet point that is entirely italicized. This final point is extended to verify that italic formatting is correctly applied even when the text spans multiple lines. + /// Simple bullet point. This bullet point is going to be very long to test how text wrapping is handled in bullet points within documentation comments. It should properly indent the wrapped lines.Another bullet point with bold text. This bullet point is also intentionally long to see how the formatting is preserved when the text wraps onto multiple lines in the generated documentation.Third bullet point with italic text. Similar to the previous points, this one is extended to ensure that the wrapping and formatting are correctly applied in the output.Complex bullet point with bold and italic combined. This bullet point combines both bold and italic formatting and is long enough to test the wrapping behavior in such cases.Bold bullet point: A bullet point that is entirely bolded. This point is also made lengthy to observe how the bold formatting is maintained across wrapped lines.Italic bullet point: A bullet point that is entirely italicized. This final point is extended to verify that italic formatting is correctly applied even when the text spans multiple lines. /// /// Keeps track of any properties unknown to the library. - internal Thing(string name, BinaryData requiredUnion, string requiredLiteralString, string requiredNullableString, string optionalNullableString, int requiredLiteralInt, float requiredLiteralFloat, bool requiredLiteralBool, string optionalLiteralString, string requiredNullableLiteralString, int? optionalLiteralInt, float? optionalLiteralFloat, bool? optionalLiteralBool, string requiredBadDescription, IList optionalNullableList, IList requiredNullableList, string propertyWithSpecialDocs, IDictionary additionalBinaryDataProperties) + internal Thing(string name, BinaryData requiredUnion, string requiredLiteralString, string requiredNullableString, string optionalNullableString, int requiredLiteralInt, float requiredLiteralFloat, bool requiredLiteralBool, ThingOptionalLiteralString? optionalLiteralString, ThingRequiredNullableLiteralString1? requiredNullableLiteralString, ThingOptionalLiteralInt? optionalLiteralInt, ThingOptionalLiteralFloat? optionalLiteralFloat, bool? optionalLiteralBool, string requiredBadDescription, IList optionalNullableList, IList requiredNullableList, string propertyWithSpecialDocs, IDictionary additionalBinaryDataProperties) { Name = name; RequiredUnion = requiredUnion; @@ -162,16 +154,16 @@ internal Thing(string name, BinaryData requiredUnion, string requiredLiteralStri public bool RequiredLiteralBool { get; } = false; /// optional literal string. - public string OptionalLiteralString { get; set; } + public ThingOptionalLiteralString? OptionalLiteralString { get; set; } /// required nullable literal string. - public string RequiredNullableLiteralString { get; } = null; + public ThingRequiredNullableLiteralString1? RequiredNullableLiteralString { get; set; } /// optional literal int. - public int? OptionalLiteralInt { get; set; } + public ThingOptionalLiteralInt? OptionalLiteralInt { get; set; } /// optional literal float. - public float? OptionalLiteralFloat { get; set; } + public ThingOptionalLiteralFloat? OptionalLiteralFloat { get; set; } /// optional literal bool. public bool? OptionalLiteralBool { get; set; } @@ -187,12 +179,7 @@ internal Thing(string name, BinaryData requiredUnion, string requiredLiteralStri /// /// This tests: - /// - Simple bullet point. This bullet point is going to be very long to test how text wrapping is handled in bullet points within documentation comments. It should properly indent the wrapped lines. - /// - Another bullet point with **bold text**. This bullet point is also intentionally long to see how the formatting is preserved when the text wraps onto multiple lines in the generated documentation. - /// - Third bullet point with *italic text*. Similar to the previous points, this one is extended to ensure that the wrapping and formatting are correctly applied in the output. - /// - Complex bullet point with **bold** and *italic* combined. This bullet point combines both bold and italic formatting and is long enough to test the wrapping behavior in such cases. - /// - **Bold bullet point**: A bullet point that is entirely bolded. This point is also made lengthy to observe how the bold formatting is maintained across wrapped lines. - /// - *Italic bullet point*: A bullet point that is entirely italicized. This final point is extended to verify that italic formatting is correctly applied even when the text spans multiple lines. + /// Simple bullet point. This bullet point is going to be very long to test how text wrapping is handled in bullet points within documentation comments. It should properly indent the wrapped lines.Another bullet point with bold text. This bullet point is also intentionally long to see how the formatting is preserved when the text wraps onto multiple lines in the generated documentation.Third bullet point with italic text. Similar to the previous points, this one is extended to ensure that the wrapping and formatting are correctly applied in the output.Complex bullet point with bold and italic combined. This bullet point combines both bold and italic formatting and is long enough to test the wrapping behavior in such cases.Bold bullet point: A bullet point that is entirely bolded. This point is also made lengthy to observe how the bold formatting is maintained across wrapped lines.Italic bullet point: A bullet point that is entirely italicized. This final point is extended to verify that italic formatting is correctly applied even when the text spans multiple lines. /// public string PropertyWithSpecialDocs { get; set; } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ThingOptionalLiteralFloat.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ThingOptionalLiteralFloat.Serialization.cs new file mode 100644 index 00000000000..811bb88b929 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ThingOptionalLiteralFloat.Serialization.cs @@ -0,0 +1,12 @@ +// + +#nullable disable + +namespace SampleTypeSpec +{ + /// + public readonly partial struct ThingOptionalLiteralFloat + { + internal float ToSerialSingle() => _value; + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ThingOptionalLiteralFloat.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ThingOptionalLiteralFloat.cs new file mode 100644 index 00000000000..264da202f67 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ThingOptionalLiteralFloat.cs @@ -0,0 +1,55 @@ +// + +#nullable disable + +using System; +using System.ComponentModel; +using System.Globalization; + +namespace SampleTypeSpec +{ + /// + public readonly partial struct ThingOptionalLiteralFloat : IEquatable + { + private readonly float _value; + private const float _456Value = 4.56F; + + /// Initializes a new instance of . + /// The value. + public ThingOptionalLiteralFloat(float value) + { + _value = value; + } + + /// Gets the _456. + public static ThingOptionalLiteralFloat _456 { get; } = new ThingOptionalLiteralFloat(_456Value); + + /// Determines if two values are the same. + /// The left value to compare. + /// The right value to compare. + public static bool operator ==(ThingOptionalLiteralFloat left, ThingOptionalLiteralFloat right) => left.Equals(right); + + /// Determines if two values are not the same. + /// The left value to compare. + /// The right value to compare. + public static bool operator !=(ThingOptionalLiteralFloat left, ThingOptionalLiteralFloat right) => !left.Equals(right); + + /// Converts a string to a . + /// The value. + public static implicit operator ThingOptionalLiteralFloat(float value) => new ThingOptionalLiteralFloat(value); + + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object obj) => obj is ThingOptionalLiteralFloat other && Equals(other); + + /// + public bool Equals(ThingOptionalLiteralFloat other) => Equals(_value, other._value); + + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => _value.GetHashCode(); + + /// + public override string ToString() => _value.ToString(CultureInfo.InvariantCulture); + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ThingOptionalLiteralInt.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ThingOptionalLiteralInt.Serialization.cs new file mode 100644 index 00000000000..8f4403a9b67 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ThingOptionalLiteralInt.Serialization.cs @@ -0,0 +1,12 @@ +// + +#nullable disable + +namespace SampleTypeSpec +{ + /// + public readonly partial struct ThingOptionalLiteralInt + { + internal int ToSerialInt32() => _value; + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ThingOptionalLiteralInt.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ThingOptionalLiteralInt.cs new file mode 100644 index 00000000000..c041118c8d9 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ThingOptionalLiteralInt.cs @@ -0,0 +1,55 @@ +// + +#nullable disable + +using System; +using System.ComponentModel; +using System.Globalization; + +namespace SampleTypeSpec +{ + /// + public readonly partial struct ThingOptionalLiteralInt : IEquatable + { + private readonly int _value; + private const int _456Value = 456; + + /// Initializes a new instance of . + /// The value. + public ThingOptionalLiteralInt(int value) + { + _value = value; + } + + /// Gets the _456. + public static ThingOptionalLiteralInt _456 { get; } = new ThingOptionalLiteralInt(_456Value); + + /// Determines if two values are the same. + /// The left value to compare. + /// The right value to compare. + public static bool operator ==(ThingOptionalLiteralInt left, ThingOptionalLiteralInt right) => left.Equals(right); + + /// Determines if two values are not the same. + /// The left value to compare. + /// The right value to compare. + public static bool operator !=(ThingOptionalLiteralInt left, ThingOptionalLiteralInt right) => !left.Equals(right); + + /// Converts a string to a . + /// The value. + public static implicit operator ThingOptionalLiteralInt(int value) => new ThingOptionalLiteralInt(value); + + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object obj) => obj is ThingOptionalLiteralInt other && Equals(other); + + /// + public bool Equals(ThingOptionalLiteralInt other) => Equals(_value, other._value); + + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => _value.GetHashCode(); + + /// + public override string ToString() => _value.ToString(CultureInfo.InvariantCulture); + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ThingOptionalLiteralString.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ThingOptionalLiteralString.cs new file mode 100644 index 00000000000..ca0130adecb --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ThingOptionalLiteralString.cs @@ -0,0 +1,61 @@ +// + +#nullable disable + +using System; +using System.ComponentModel; + +namespace SampleTypeSpec +{ + /// + public readonly partial struct ThingOptionalLiteralString : IEquatable + { + private readonly string _value; + private const string RejectValue = "reject"; + + /// Initializes a new instance of . + /// The value. + /// is null. + public ThingOptionalLiteralString(string value) + { + Argument.AssertNotNull(value, nameof(value)); + + _value = value; + } + + /// Gets the Reject. + public static ThingOptionalLiteralString Reject { get; } = new ThingOptionalLiteralString(RejectValue); + + /// Determines if two values are the same. + /// The left value to compare. + /// The right value to compare. + public static bool operator ==(ThingOptionalLiteralString left, ThingOptionalLiteralString right) => left.Equals(right); + + /// Determines if two values are not the same. + /// The left value to compare. + /// The right value to compare. + public static bool operator !=(ThingOptionalLiteralString left, ThingOptionalLiteralString right) => !left.Equals(right); + + /// Converts a string to a . + /// The value. + public static implicit operator ThingOptionalLiteralString(string value) => new ThingOptionalLiteralString(value); + + /// Converts a string to a . + /// The value. + public static implicit operator ThingOptionalLiteralString?(string value) => value == null ? null : new ThingOptionalLiteralString(value); + + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object obj) => obj is ThingOptionalLiteralString other && Equals(other); + + /// + public bool Equals(ThingOptionalLiteralString other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); + + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; + + /// + public override string ToString() => _value; + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ThingRequiredNullableLiteralString1.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ThingRequiredNullableLiteralString1.cs new file mode 100644 index 00000000000..606fbd4fb69 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/ThingRequiredNullableLiteralString1.cs @@ -0,0 +1,61 @@ +// + +#nullable disable + +using System; +using System.ComponentModel; + +namespace SampleTypeSpec +{ + /// + public readonly partial struct ThingRequiredNullableLiteralString1 : IEquatable + { + private readonly string _value; + private const string SomeValueValue = "someValue"; + + /// Initializes a new instance of . + /// The value. + /// is null. + public ThingRequiredNullableLiteralString1(string value) + { + Argument.AssertNotNull(value, nameof(value)); + + _value = value; + } + + /// Gets the SomeValue. + public static ThingRequiredNullableLiteralString1 SomeValue { get; } = new ThingRequiredNullableLiteralString1(SomeValueValue); + + /// Determines if two values are the same. + /// The left value to compare. + /// The right value to compare. + public static bool operator ==(ThingRequiredNullableLiteralString1 left, ThingRequiredNullableLiteralString1 right) => left.Equals(right); + + /// Determines if two values are not the same. + /// The left value to compare. + /// The right value to compare. + public static bool operator !=(ThingRequiredNullableLiteralString1 left, ThingRequiredNullableLiteralString1 right) => !left.Equals(right); + + /// Converts a string to a . + /// The value. + public static implicit operator ThingRequiredNullableLiteralString1(string value) => new ThingRequiredNullableLiteralString1(value); + + /// Converts a string to a . + /// The value. + public static implicit operator ThingRequiredNullableLiteralString1?(string value) => value == null ? null : new ThingRequiredNullableLiteralString1(value); + + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object obj) => obj is ThingRequiredNullableLiteralString1 other && Equals(other); + + /// + public bool Equals(ThingRequiredNullableLiteralString1 other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); + + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; + + /// + public override string ToString() => _value; + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Tree.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Tree.Serialization.cs new file mode 100644 index 00000000000..9feeb28c5f5 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Tree.Serialization.cs @@ -0,0 +1,282 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.IO; +using System.Text.Json; +using System.Xml; +using System.Xml.Linq; + +namespace SampleTypeSpec +{ + /// Tree is a specific type of plant. + public partial class Tree : Plant, IJsonModel + { + /// Initializes a new instance of for deserialization. + internal Tree() + { + } + + /// The data to parse. + /// The client options for reading and writing models. + protected override Plant PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeTree(document.RootElement, options); + } + case "X": + using (Stream dataStream = data.ToStream()) + { + return DeserializeTree(XElement.Load(dataStream, LoadOptions.PreserveWhitespace), options); + } + default: + throw new FormatException($"The model {nameof(Tree)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + case "X": + using (MemoryStream stream = new MemoryStream(256)) + { + using (XmlWriter writer = XmlWriter.Create(stream, ModelSerializationExtensions.XmlWriterSettings)) + { + WriteXml(writer, options, "Tree"); + } + if (stream.Position > int.MaxValue) + { + return BinaryData.FromStream(stream); + } + else + { + return new BinaryData(stream.GetBuffer().AsMemory(0, (int)stream.Position)); + } + } + default: + throw new FormatException($"The model {nameof(Tree)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Tree IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (Tree)PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(Tree tree) + { + if (tree == null) + { + return null; + } + return BinaryContent.Create(tree, ModelSerializationExtensions.WireOptions); + } + + /// Converts the model to BinaryContent using the specified format. + /// The format to use for serialization. + internal BinaryContent ToBinaryContent(string format) + { + ModelReaderWriterOptions options = new ModelReaderWriterOptions(format); + return BinaryContent.Create(this, options); + } + + /// The to deserialize the from. + public static explicit operator Tree(ClientResult result) + { + using PipelineResponse response = result.GetRawResponse(); + + if (response.Headers.TryGetValue("Content-Type", out string value) && value.StartsWith("application/json", StringComparison.OrdinalIgnoreCase)) + { + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeTree(document.RootElement, ModelSerializationExtensions.WireOptions); + } + + using Stream stream = response.ContentStream; + if (stream == null) + { + return default; + } + + return DeserializeTree(XElement.Load(stream, LoadOptions.PreserveWhitespace), ModelSerializationExtensions.WireOptions); + } + + /// The JSON writer. + /// The client options for reading and writing models. + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + writer.WriteStartObject(); + JsonModelWriteCore(writer, options); + writer.WriteEndObject(); + } + + /// The JSON writer. + /// The client options for reading and writing models. + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(Tree)} does not support writing '{format}' format."); + } + base.JsonModelWriteCore(writer, options); + writer.WritePropertyName("age"u8); + writer.WriteNumberValue(Age); + } + + /// The JSON reader. + /// The client options for reading and writing models. + Tree IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (Tree)JsonModelCreateCore(ref reader, options); + + /// The JSON reader. + /// The client options for reading and writing models. + protected override Plant JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(Tree)} does not support reading '{format}' format."); + } + using JsonDocument document = JsonDocument.ParseValue(ref reader); + return DeserializeTree(document.RootElement, options); + } + + /// The JSON element to deserialize. + /// The client options for reading and writing models. + internal static Tree DeserializeTree(JsonElement element, ModelReaderWriterOptions options) + { + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + string species = "tree"; + string id = default; + int height = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + int age = default; + foreach (var prop in element.EnumerateObject()) + { + if (prop.NameEquals("species"u8)) + { + species = prop.Value.GetString(); + continue; + } + if (prop.NameEquals("id"u8)) + { + id = prop.Value.GetString(); + continue; + } + if (prop.NameEquals("height"u8)) + { + height = prop.Value.GetInt32(); + continue; + } + if (prop.NameEquals("age"u8)) + { + age = prop.Value.GetInt32(); + continue; + } + if (options.Format != "W") + { + additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); + } + } + return new Tree(species, id, height, additionalBinaryDataProperties, age); + } + + /// The XML writer. + /// The client options for reading and writing models. + /// An optional name hint. + private void WriteXml(XmlWriter writer, ModelReaderWriterOptions options, string nameHint) + { + if (nameHint != null) + { + writer.WriteStartElement(nameHint); + } + + XmlModelWriteCore(writer, options); + + if (nameHint != null) + { + writer.WriteEndElement(); + } + } + + /// The XML writer. + /// The client options for reading and writing models. + internal override void XmlModelWriteCore(XmlWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "X") + { + throw new FormatException($"The model {nameof(Tree)} does not support writing '{format}' format."); + } + + base.XmlModelWriteCore(writer, options); + writer.WriteStartElement("age"); + writer.WriteValue(Age); + writer.WriteEndElement(); + } + + /// The xml element to deserialize. + /// The client options for reading and writing models. + internal static Tree DeserializeTree(XElement element, ModelReaderWriterOptions options) + { + if (element == null) + { + return null; + } + + string species = "tree"; + string id = default; + int height = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + int age = default; + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if (localName == "species") + { + species = (string)child; + continue; + } + if (localName == "id") + { + id = (string)child; + continue; + } + if (localName == "height") + { + height = (int)child; + continue; + } + if (localName == "age") + { + age = (int)child; + continue; + } + } + return new Tree(species, id, height, additionalBinaryDataProperties, age); + } + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Tree.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Tree.cs new file mode 100644 index 00000000000..bf531aa6e98 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Tree.cs @@ -0,0 +1,39 @@ +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace SampleTypeSpec +{ + /// Tree is a specific type of plant. + public partial class Tree : Plant + { + /// Initializes a new instance of . + /// The unique identifier of the plant. + /// The height of the plant in centimeters. + /// The age of the tree in years. + /// is null. + public Tree(string id, int height, int age) : base("tree", id, height) + { + Argument.AssertNotNull(id, nameof(id)); + + Age = age; + } + + /// Initializes a new instance of . + /// The species of plant. + /// The unique identifier of the plant. + /// The height of the plant in centimeters. + /// Keeps track of any properties unknown to the library. + /// The age of the tree in years. + internal Tree(string species, string id, int height, IDictionary additionalBinaryDataProperties, int age) : base(species, id, height, additionalBinaryDataProperties) + { + Age = age; + } + + /// The age of the tree in years. + public int Age { get; set; } + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/UnknownAnimal.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/UnknownAnimal.Serialization.cs index e00de335fb2..1276e36f136 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/UnknownAnimal.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/UnknownAnimal.Serialization.cs @@ -16,6 +16,46 @@ internal UnknownAnimal() { } + /// The data to parse. + /// The client options for reading and writing models. + protected override Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeAnimal(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(Animal)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(Animal)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Animal IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -84,45 +124,5 @@ internal static UnknownAnimal DeserializeUnknownAnimal(JsonElement element, Mode } return new UnknownAnimal(kind, name, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(Animal)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - Animal IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected override Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializeAnimal(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(Animal)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/UnknownPet.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/UnknownPet.Serialization.cs index 59f22d181dc..582bab00bc4 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/UnknownPet.Serialization.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/UnknownPet.Serialization.cs @@ -16,6 +16,46 @@ internal UnknownPet() { } + /// The data to parse. + /// The client options for reading and writing models. + protected override Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializePet(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(Pet)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(Pet)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Pet IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (UnknownPet)PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -90,45 +130,5 @@ internal static UnknownPet DeserializeUnknownPet(JsonElement element, ModelReade } return new UnknownPet(kind, name, additionalBinaryDataProperties, trained); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(Pet)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - Pet IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (UnknownPet)PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected override Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data)) - { - return DeserializePet(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(Pet)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/UnknownPlant.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/UnknownPlant.Serialization.cs new file mode 100644 index 00000000000..f6735b77db9 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/UnknownPlant.Serialization.cs @@ -0,0 +1,225 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.IO; +using System.Text.Json; +using System.Xml; +using System.Xml.Linq; + +namespace SampleTypeSpec +{ + internal partial class UnknownPlant : Plant, IJsonModel + { + /// Initializes a new instance of for deserialization. + internal UnknownPlant() + { + } + + /// The data to parse. + /// The client options for reading and writing models. + protected override Plant PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializePlant(document.RootElement, options); + } + case "X": + using (Stream dataStream = data.ToStream()) + { + return DeserializePlant(XElement.Load(dataStream, LoadOptions.PreserveWhitespace), options); + } + default: + throw new FormatException($"The model {nameof(Plant)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + case "X": + using (MemoryStream stream = new MemoryStream(256)) + { + using (XmlWriter writer = XmlWriter.Create(stream, ModelSerializationExtensions.XmlWriterSettings)) + { + WriteXml(writer, options, "Plant"); + } + if (stream.Position > int.MaxValue) + { + return BinaryData.FromStream(stream); + } + else + { + return new BinaryData(stream.GetBuffer().AsMemory(0, (int)stream.Position)); + } + } + default: + throw new FormatException($"The model {nameof(Plant)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Plant IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The JSON writer. + /// The client options for reading and writing models. + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + writer.WriteStartObject(); + JsonModelWriteCore(writer, options); + writer.WriteEndObject(); + } + + /// The JSON writer. + /// The client options for reading and writing models. + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(Plant)} does not support writing '{format}' format."); + } + base.JsonModelWriteCore(writer, options); + } + + /// The JSON reader. + /// The client options for reading and writing models. + Plant IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + + /// The JSON reader. + /// The client options for reading and writing models. + protected override Plant JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(Plant)} does not support reading '{format}' format."); + } + using JsonDocument document = JsonDocument.ParseValue(ref reader); + return DeserializePlant(document.RootElement, options); + } + + /// The JSON element to deserialize. + /// The client options for reading and writing models. + internal static UnknownPlant DeserializeUnknownPlant(JsonElement element, ModelReaderWriterOptions options) + { + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + string species = "unknown"; + string id = default; + int height = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + foreach (var prop in element.EnumerateObject()) + { + if (prop.NameEquals("species"u8)) + { + species = prop.Value.GetString(); + continue; + } + if (prop.NameEquals("id"u8)) + { + id = prop.Value.GetString(); + continue; + } + if (prop.NameEquals("height"u8)) + { + height = prop.Value.GetInt32(); + continue; + } + if (options.Format != "W") + { + additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); + } + } + return new UnknownPlant(species, id, height, additionalBinaryDataProperties); + } + + /// The XML writer. + /// The client options for reading and writing models. + /// An optional name hint. + private void WriteXml(XmlWriter writer, ModelReaderWriterOptions options, string nameHint) + { + if (nameHint != null) + { + writer.WriteStartElement(nameHint); + } + + XmlModelWriteCore(writer, options); + + if (nameHint != null) + { + writer.WriteEndElement(); + } + } + + /// The XML writer. + /// The client options for reading and writing models. + internal override void XmlModelWriteCore(XmlWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "X") + { + throw new FormatException($"The model {nameof(Plant)} does not support writing '{format}' format."); + } + + base.XmlModelWriteCore(writer, options); + } + + /// The xml element to deserialize. + /// The client options for reading and writing models. + internal static UnknownPlant DeserializeUnknownPlant(XElement element, ModelReaderWriterOptions options) + { + if (element == null) + { + return null; + } + + string species = "unknown"; + string id = default; + int height = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if (localName == "species") + { + species = (string)child; + continue; + } + if (localName == "id") + { + id = (string)child; + continue; + } + if (localName == "height") + { + height = (int)child; + continue; + } + } + return new UnknownPlant(species, id, height, additionalBinaryDataProperties); + } + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/UnknownPlant.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/UnknownPlant.cs new file mode 100644 index 00000000000..7e2e30cea3a --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/UnknownPlant.cs @@ -0,0 +1,21 @@ +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace SampleTypeSpec +{ + internal partial class UnknownPlant : Plant + { + /// Initializes a new instance of . + /// The species of plant. + /// The unique identifier of the plant. + /// The height of the plant in centimeters. + /// Keeps track of any properties unknown to the library. + internal UnknownPlant(string species, string id, int height, IDictionary additionalBinaryDataProperties) : base(species ?? "unknown", id, height, additionalBinaryDataProperties) + { + } + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Wrapper.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Wrapper.Serialization.cs new file mode 100644 index 00000000000..914ff85c8dd --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Wrapper.Serialization.cs @@ -0,0 +1,141 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Text.Json; + +namespace SampleTypeSpec +{ + /// The Wrapper. + public partial class Wrapper : IJsonModel + { + /// Initializes a new instance of for deserialization. + internal Wrapper() + { + } + + /// The data to parse. + /// The client options for reading and writing models. + protected virtual Wrapper PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeWrapper(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(Wrapper)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(Wrapper)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Wrapper IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The JSON writer. + /// The client options for reading and writing models. + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + writer.WriteStartObject(); + JsonModelWriteCore(writer, options); + writer.WriteEndObject(); + } + + /// The JSON writer. + /// The client options for reading and writing models. + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(Wrapper)} does not support writing '{format}' format."); + } + writer.WritePropertyName("action"u8); + writer.WriteObjectValue(Action, options); + if (options.Format != "W" && _additionalBinaryDataProperties != null) + { + foreach (var item in _additionalBinaryDataProperties) + { + writer.WritePropertyName(item.Key); +#if NET6_0_OR_GREATER + writer.WriteRawValue(item.Value); +#else + using (JsonDocument document = JsonDocument.Parse(item.Value)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + } + } + + /// The JSON reader. + /// The client options for reading and writing models. + Wrapper IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + + /// The JSON reader. + /// The client options for reading and writing models. + protected virtual Wrapper JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(Wrapper)} does not support reading '{format}' format."); + } + using JsonDocument document = JsonDocument.ParseValue(ref reader); + return DeserializeWrapper(document.RootElement, options); + } + + /// The JSON element to deserialize. + /// The client options for reading and writing models. + internal static Wrapper DeserializeWrapper(JsonElement element, ModelReaderWriterOptions options) + { + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + string p1 = default; + RoundTripModel action = default; + string p2 = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + foreach (var prop in element.EnumerateObject()) + { + if (prop.NameEquals("action"u8)) + { + action = RoundTripModel.DeserializeRoundTripModel(prop.Value, options); + continue; + } + if (options.Format != "W") + { + additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); + } + } + return new Wrapper(p1, action, p2, additionalBinaryDataProperties); + } + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Wrapper.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Wrapper.cs new file mode 100644 index 00000000000..50389321087 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/Wrapper.cs @@ -0,0 +1,54 @@ +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace SampleTypeSpec +{ + /// The Wrapper. + public partial class Wrapper + { + /// Keeps track of any properties unknown to the library. + private protected readonly IDictionary _additionalBinaryDataProperties; + + /// Initializes a new instance of . + /// header parameter. + /// body parameter. + /// path parameter. + /// , or is null. + public Wrapper(string p1, RoundTripModel action, string p2) + { + Argument.AssertNotNull(p1, nameof(p1)); + Argument.AssertNotNull(action, nameof(action)); + Argument.AssertNotNull(p2, nameof(p2)); + + P1 = p1; + Action = action; + P2 = p2; + } + + /// Initializes a new instance of . + /// header parameter. + /// body parameter. + /// path parameter. + /// Keeps track of any properties unknown to the library. + internal Wrapper(string p1, RoundTripModel action, string p2, IDictionary additionalBinaryDataProperties) + { + P1 = p1; + Action = action; + P2 = p2; + _additionalBinaryDataProperties = additionalBinaryDataProperties; + } + + /// header parameter. + public string P1 { get; } + + /// body parameter. + public RoundTripModel Action { get; } + + /// path parameter. + public string P2 { get; } + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlAdvancedModel.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlAdvancedModel.Serialization.cs new file mode 100644 index 00000000000..a92c1d5e900 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlAdvancedModel.Serialization.cs @@ -0,0 +1,740 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.IO; +using System.Xml; +using System.Xml.Linq; + +namespace SampleTypeSpec +{ + /// An advanced XML model for testing various property types and XML features. + public partial class XmlAdvancedModel : IPersistableModel + { + /// Initializes a new instance of for deserialization. + internal XmlAdvancedModel() + { + } + + /// The data to parse. + /// The client options for reading and writing models. + protected virtual XmlAdvancedModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (Stream dataStream = data.ToStream()) + { + return DeserializeXmlAdvancedModel(XElement.Load(dataStream, LoadOptions.PreserveWhitespace), options); + } + default: + throw new FormatException($"The model {nameof(XmlAdvancedModel)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (MemoryStream stream = new MemoryStream(256)) + { + using (XmlWriter writer = XmlWriter.Create(stream, ModelSerializationExtensions.XmlWriterSettings)) + { + WriteXml(writer, options, "AdvancedXmlModel"); + } + if (stream.Position > int.MaxValue) + { + return BinaryData.FromStream(stream); + } + else + { + return new BinaryData(stream.GetBuffer().AsMemory(0, (int)stream.Position)); + } + } + default: + throw new FormatException($"The model {nameof(XmlAdvancedModel)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + XmlAdvancedModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "X"; + + /// The to serialize into . + public static implicit operator BinaryContent(XmlAdvancedModel xmlAdvancedModel) + { + if (xmlAdvancedModel == null) + { + return null; + } + return BinaryContent.Create(xmlAdvancedModel, ModelSerializationExtensions.WireOptions); + } + + /// The to deserialize the from. + public static explicit operator XmlAdvancedModel(ClientResult result) + { + using PipelineResponse response = result.GetRawResponse(); + using Stream stream = response.ContentStream; + if (stream == null) + { + return default; + } + + return DeserializeXmlAdvancedModel(XElement.Load(stream, LoadOptions.PreserveWhitespace), ModelSerializationExtensions.WireOptions); + } + + /// The XML writer. + /// The client options for reading and writing models. + /// An optional name hint. + private void WriteXml(XmlWriter writer, ModelReaderWriterOptions options, string nameHint) + { + if (nameHint != null) + { + writer.WriteStartElement(nameHint); + } + + XmlModelWriteCore(writer, options); + + if (nameHint != null) + { + writer.WriteEndElement(); + } + } + + /// The XML writer. + /// The client options for reading and writing models. + internal virtual void XmlModelWriteCore(XmlWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "X") + { + throw new FormatException($"The model {nameof(XmlAdvancedModel)} does not support writing '{format}' format."); + } + + writer.WriteStartAttribute("id"); + writer.WriteValue(Id); + writer.WriteEndAttribute(); + writer.WriteStartAttribute("version"); + writer.WriteValue(Version); + writer.WriteEndAttribute(); + writer.WriteStartAttribute("isActive"); + writer.WriteValue(IsActive); + writer.WriteEndAttribute(); + writer.WriteStartAttribute("xml-id"); + writer.WriteValue(XmlIdentifier); + writer.WriteEndAttribute(); + writer.WriteAttributeString("ns1", "label", "https://example.com/ns1", Label); + writer.WriteStartElement("name"); + writer.WriteValue(Name); + writer.WriteEndElement(); + writer.WriteStartElement("age"); + writer.WriteValue(Age); + writer.WriteEndElement(); + writer.WriteStartElement("enabled"); + writer.WriteValue(Enabled); + writer.WriteEndElement(); + writer.WriteStartElement("score"); + writer.WriteValue(Score); + writer.WriteEndElement(); + if (Optional.IsDefined(OptionalString)) + { + writer.WriteStartElement("optionalString"); + writer.WriteValue(OptionalString); + writer.WriteEndElement(); + } + if (Optional.IsDefined(OptionalInt)) + { + writer.WriteStartElement("optionalInt"); + writer.WriteValue(OptionalInt.Value); + writer.WriteEndElement(); + } + if (Optional.IsDefined(NullableString)) + { + writer.WriteStartElement("nullableString"); + writer.WriteValue(NullableString); + writer.WriteEndElement(); + } + writer.WriteStartElement("RenamedProperty"); + writer.WriteValue(OriginalName); + writer.WriteEndElement(); + foreach (string item in UnwrappedStrings) + { + writer.WriteStartElement("unwrappedStrings"); + writer.WriteValue(item); + writer.WriteEndElement(); + } + foreach (int item in UnwrappedCounts) + { + writer.WriteStartElement("unwrappedCounts"); + writer.WriteValue(item); + writer.WriteEndElement(); + } + foreach (XmlItem item in UnwrappedItems) + { + writer.WriteStartElement("unwrappedItems"); + writer.WriteObjectValue(item, options); + writer.WriteEndElement(); + } + writer.WriteStartElement("wrappedColors"); + foreach (string item in WrappedColors) + { + writer.WriteStartElement("string"); + writer.WriteValue(item); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteStartElement("ItemCollection"); + foreach (XmlItem item in Items) + { + writer.WriteStartElement("Item"); + writer.WriteObjectValue(item, options); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteStartElement("nestedModel"); + writer.WriteObjectValue(NestedModel, options); + writer.WriteEndElement(); + if (Optional.IsDefined(OptionalNestedModel)) + { + writer.WriteStartElement("optionalNestedModel"); + writer.WriteObjectValue(OptionalNestedModel, options); + writer.WriteEndElement(); + } + writer.WriteStartElement("metadata"); + foreach (var pair in Metadata) + { + writer.WriteStartElement(pair.Key); + writer.WriteValue(pair.Value); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteStartElement("createdAt"); + writer.WriteStringValue(CreatedAt, "O"); + writer.WriteEndElement(); + writer.WriteStartElement("duration"); + writer.WriteStringValue(Duration, "P"); + writer.WriteEndElement(); + writer.WriteStartElement("data"); + writer.WriteBase64StringValue(Data.ToArray(), "D"); + writer.WriteEndElement(); + if (Optional.IsCollectionDefined(OptionalRecordUnknown)) + { + writer.WriteStartElement("optionalRecordUnknown"); + foreach (var pair in OptionalRecordUnknown) + { + writer.WriteStartElement(pair.Key); + writer.WriteValue(pair.Value.ToString()); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + } + writer.WriteStartElement("fixedEnum"); + writer.WriteValue(FixedEnum.ToSerialString()); + writer.WriteEndElement(); + writer.WriteStartElement("extensibleEnum"); + writer.WriteValue(ExtensibleEnum.ToString()); + writer.WriteEndElement(); + if (Optional.IsDefined(OptionalFixedEnum)) + { + writer.WriteStartElement("optionalFixedEnum"); + writer.WriteValue((int)OptionalFixedEnum.Value); + writer.WriteEndElement(); + } + if (Optional.IsDefined(OptionalExtensibleEnum)) + { + writer.WriteStartElement("optionalExtensibleEnum"); + writer.WriteValue(OptionalExtensibleEnum.Value.ToSerialInt32()); + writer.WriteEndElement(); + } + writer.WriteStartElement("ns2", "daysUsed", "https://example.com/ns2"); + writer.WriteValue(DaysUsed); + writer.WriteEndElement(); + writer.WriteStartElement("foo", "fooItems", "http://www.contoso.com/anotherbook.dtd"); + foreach (string item in FooItems) + { + writer.WriteStartElement("string"); + writer.WriteValue(item); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteStartElement("bar", "anotherModel", "http://www.contoso.com/anothermodel.dtd"); + writer.WriteObjectValue(AnotherModel, options); + writer.WriteEndElement(); + writer.WriteStartElement("modelsWithNamespaces"); + foreach (XmlModelWithNamespace item in ModelsWithNamespaces) + { + writer.WriteStartElement("ns1", "XmlModelWithNamespace", "http://www.example.com/namespace"); + writer.WriteObjectValue(item, options); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + foreach (XmlModelWithNamespace item in UnwrappedModelsWithNamespaces) + { + writer.WriteStartElement("unwrappedModelsWithNamespaces"); + writer.WriteObjectValue(item, options); + writer.WriteEndElement(); + } + writer.WriteStartElement("listOfListFoo"); + foreach (IList item in ListOfListFoo) + { + writer.WriteStartElement("Array"); + foreach (XmlItem item0 in item) + { + writer.WriteStartElement("XmlItem"); + writer.WriteObjectValue(item0, options); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteStartElement("dictionaryFoo"); + foreach (var pair in DictionaryFoo) + { + writer.WriteStartElement(pair.Key); + writer.WriteObjectValue(pair.Value, options); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteStartElement("dictionaryOfDictionaryFoo"); + foreach (var pair in DictionaryOfDictionaryFoo) + { + writer.WriteStartElement(pair.Key); + foreach (var pair0 in pair.Value) + { + writer.WriteStartElement(pair0.Key); + writer.WriteObjectValue(pair0.Value, options); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteStartElement("dictionaryListFoo"); + foreach (var pair in DictionaryListFoo) + { + writer.WriteStartElement(pair.Key); + foreach (XmlItem item in pair.Value) + { + writer.WriteStartElement("XmlItem"); + writer.WriteObjectValue(item, options); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteStartElement("listOfDictionaryFoo"); + foreach (IDictionary item in ListOfDictionaryFoo) + { + writer.WriteStartElement("Record"); + foreach (var pair in item) + { + writer.WriteStartElement(pair.Key); + writer.WriteObjectValue(pair.Value, options); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteValue(Content); + } + + /// The xml element to deserialize. + /// The client options for reading and writing models. + internal static XmlAdvancedModel DeserializeXmlAdvancedModel(XElement element, ModelReaderWriterOptions options) + { + if (element == null) + { + return null; + } + + XNamespace labelNs = "https://example.com/ns1"; + XNamespace daysUsedNs = "https://example.com/ns2"; + XNamespace fooItemsNs = "http://www.contoso.com/anotherbook.dtd"; + XNamespace anotherModelNs = "http://www.contoso.com/anothermodel.dtd"; + XNamespace modelsWithNamespacesNs = "http://www.example.com/namespace"; + + string name = default; + int age = default; + bool enabled = default; + float score = default; + string optionalString = default; + int? optionalInt = default; + string nullableString = default; + string id = default; + int version = default; + bool isActive = default; + string originalName = default; + string xmlIdentifier = default; + string content = default; + IList unwrappedStrings = new List(); + IList unwrappedCounts = new List(); + IList unwrappedItems = new List(); + IList wrappedColors = default; + IList items = default; + XmlNestedModel nestedModel = default; + XmlNestedModel optionalNestedModel = default; + IDictionary metadata = default; + DateTimeOffset createdAt = default; + TimeSpan duration = default; + BinaryData data = default; + IDictionary optionalRecordUnknown = default; + StringFixedEnum fixedEnum = default; + StringExtensibleEnum extensibleEnum = default; + IntFixedEnum? optionalFixedEnum = default; + IntExtensibleEnum? optionalExtensibleEnum = default; + string label = default; + int daysUsed = default; + IList fooItems = default; + XmlNestedModel anotherModel = default; + IList modelsWithNamespaces = default; + IList unwrappedModelsWithNamespaces = new List(); + IList> listOfListFoo = default; + IDictionary dictionaryFoo = default; + IDictionary> dictionaryOfDictionaryFoo = default; + IDictionary> dictionaryListFoo = default; + IList> listOfDictionaryFoo = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + + foreach (var attr in element.Attributes()) + { + string localName = attr.Name.LocalName; + XNamespace ns = attr.Name.Namespace; + + if (localName == "id") + { + id = (string)attr; + continue; + } + if (localName == "version") + { + version = (int)attr; + continue; + } + if (localName == "isActive") + { + isActive = (bool)attr; + continue; + } + if (localName == "xml-id") + { + xmlIdentifier = (string)attr; + continue; + } + if (localName == "label" && ns == labelNs) + { + label = (string)attr; + continue; + } + } + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + XNamespace ns = child.Name.Namespace; + + if (localName == "name") + { + name = (string)child; + continue; + } + if (localName == "age") + { + age = (int)child; + continue; + } + if (localName == "enabled") + { + enabled = (bool)child; + continue; + } + if (localName == "score") + { + score = (float)child; + continue; + } + if (localName == "optionalString") + { + optionalString = (string)child; + continue; + } + if (localName == "optionalInt") + { + optionalInt = (int?)child; + continue; + } + if (localName == "nullableString") + { + nullableString = (string)child; + continue; + } + if (localName == "RenamedProperty") + { + originalName = (string)child; + continue; + } + if (localName == "unwrappedStrings") + { + unwrappedStrings.Add((string)child); + continue; + } + if (localName == "unwrappedCounts") + { + unwrappedCounts.Add((int)child); + continue; + } + if (localName == "unwrappedItems") + { + unwrappedItems.Add(XmlItem.DeserializeXmlItem(child, options)); + continue; + } + if (localName == "wrappedColors") + { + List array = new List(); + foreach (var e in child.Elements("string")) + { + array.Add((string)e); + } + wrappedColors = array; + continue; + } + if (localName == "ItemCollection") + { + List array = new List(); + foreach (var e in child.Elements("Item")) + { + array.Add(XmlItem.DeserializeXmlItem(e, options)); + } + items = array; + continue; + } + if (localName == "nestedModel") + { + nestedModel = XmlNestedModel.DeserializeXmlNestedModel(child, options); + continue; + } + if (localName == "optionalNestedModel") + { + optionalNestedModel = XmlNestedModel.DeserializeXmlNestedModel(child, options); + continue; + } + if (localName == "metadata") + { + Dictionary dictionary = new Dictionary(); + foreach (var e in child.Elements()) + { + dictionary.Add(e.Name.LocalName, (string)e); + } + metadata = dictionary; + continue; + } + if (localName == "createdAt") + { + createdAt = child.GetDateTimeOffset("O"); + continue; + } + if (localName == "duration") + { + duration = child.GetTimeSpan("P"); + continue; + } + if (localName == "data") + { + data = BinaryData.FromBytes(child.GetBytesFromBase64("D")); + continue; + } + if (localName == "optionalRecordUnknown") + { + Dictionary dictionary = new Dictionary(); + foreach (var e in child.Elements()) + { + dictionary.Add(e.Name.LocalName, BinaryData.FromString(e.Value)); + } + optionalRecordUnknown = dictionary; + continue; + } + if (localName == "fixedEnum") + { + fixedEnum = ((string)child).ToStringFixedEnum(); + continue; + } + if (localName == "extensibleEnum") + { + extensibleEnum = new StringExtensibleEnum((string)child); + continue; + } + if (localName == "optionalFixedEnum") + { + optionalFixedEnum = ((int)child).ToIntFixedEnum(); + continue; + } + if (localName == "optionalExtensibleEnum") + { + optionalExtensibleEnum = new IntExtensibleEnum((int)child); + continue; + } + if (localName == "daysUsed" && ns == daysUsedNs) + { + daysUsed = (int)child; + continue; + } + if (localName == "fooItems" && ns == fooItemsNs) + { + List array = new List(); + foreach (var e in child.Elements("string")) + { + array.Add((string)e); + } + fooItems = array; + continue; + } + if (localName == "anotherModel" && ns == anotherModelNs) + { + anotherModel = XmlNestedModel.DeserializeXmlNestedModel(child, options); + continue; + } + if (localName == "modelsWithNamespaces") + { + List array = new List(); + foreach (var e in child.Elements(modelsWithNamespacesNs + "XmlModelWithNamespace")) + { + array.Add(XmlModelWithNamespace.DeserializeXmlModelWithNamespace(e, options)); + } + modelsWithNamespaces = array; + continue; + } + if (localName == "unwrappedModelsWithNamespaces") + { + unwrappedModelsWithNamespaces.Add(XmlModelWithNamespace.DeserializeXmlModelWithNamespace(child, options)); + continue; + } + if (localName == "listOfListFoo") + { + List> array = new List>(); + foreach (var e in child.Elements("Array")) + { + List list = new List(); + foreach (var item in e.Elements()) + { + list.Add(XmlItem.DeserializeXmlItem(item, options)); + } + array.Add(list); + } + listOfListFoo = array; + continue; + } + if (localName == "dictionaryFoo") + { + Dictionary dictionary = new Dictionary(); + foreach (var e in child.Elements()) + { + dictionary.Add(e.Name.LocalName, XmlItem.DeserializeXmlItem(e, options)); + } + dictionaryFoo = dictionary; + continue; + } + if (localName == "dictionaryOfDictionaryFoo") + { + Dictionary> dictionary = new Dictionary>(); + foreach (var e in child.Elements()) + { + Dictionary dict = new Dictionary(); + foreach (var item in e.Elements()) + { + dict.Add(item.Name.LocalName, XmlItem.DeserializeXmlItem(item, options)); + } + dictionary.Add(e.Name.LocalName, dict); + } + dictionaryOfDictionaryFoo = dictionary; + continue; + } + if (localName == "dictionaryListFoo") + { + Dictionary> dictionary = new Dictionary>(); + foreach (var e in child.Elements()) + { + List list = new List(); + foreach (var item in e.Elements()) + { + list.Add(XmlItem.DeserializeXmlItem(item, options)); + } + dictionary.Add(e.Name.LocalName, list); + } + dictionaryListFoo = dictionary; + continue; + } + if (localName == "listOfDictionaryFoo") + { + List> array = new List>(); + foreach (var e in child.Elements("Record")) + { + Dictionary dict = new Dictionary(); + foreach (var item in e.Elements()) + { + dict.Add(item.Name.LocalName, XmlItem.DeserializeXmlItem(item, options)); + } + array.Add(dict); + } + listOfDictionaryFoo = array; + continue; + } + } + content = element.Value; + + return new XmlAdvancedModel( + name, + age, + enabled, + score, + optionalString, + optionalInt, + nullableString, + id, + version, + isActive, + originalName, + xmlIdentifier, + content, + unwrappedStrings, + unwrappedCounts, + unwrappedItems, + wrappedColors, + items, + nestedModel, + optionalNestedModel, + metadata, + createdAt, + duration, + data, + optionalRecordUnknown ?? new ChangeTrackingDictionary(), + fixedEnum, + extensibleEnum, + optionalFixedEnum, + optionalExtensibleEnum, + label, + daysUsed, + fooItems, + anotherModel, + modelsWithNamespaces, + unwrappedModelsWithNamespaces, + listOfListFoo, + dictionaryFoo, + dictionaryOfDictionaryFoo, + dictionaryListFoo, + listOfDictionaryFoo, + additionalBinaryDataProperties); + } + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlAdvancedModel.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlAdvancedModel.cs new file mode 100644 index 00000000000..b82679f4c68 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlAdvancedModel.cs @@ -0,0 +1,364 @@ +// + +#nullable disable + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json; + +namespace SampleTypeSpec +{ + /// An advanced XML model for testing various property types and XML features. + public partial class XmlAdvancedModel + { + /// Keeps track of any properties unknown to the library. + private protected readonly IDictionary _additionalBinaryDataProperties; + + /// Initializes a new instance of . + /// A simple string property. + /// An integer property. + /// A boolean property. + /// A float property. + /// A nullable string. + /// A string as XML attribute. + /// An integer as XML attribute. + /// A boolean as XML attribute. + /// A property with a custom XML element name. + /// An attribute with a custom XML name. + /// Text content in the element (unwrapped string). + /// An unwrapped array of strings - items appear directly without wrapper. + /// An unwrapped array of integers. + /// An unwrapped array of models. + /// A wrapped array of strings (default). + /// A wrapped array with custom wrapper name. + /// A nested model property. + /// A dictionary property. + /// A date-time property. + /// A duration property. + /// A bytes property. + /// A fixed enum property. + /// An extensible enum property. + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// , , , , , , , , , , , , , , , , , , , , , or is null. + public XmlAdvancedModel(string name, int age, bool enabled, float score, string nullableString, string id, int version, bool isActive, string originalName, string xmlIdentifier, string content, IEnumerable unwrappedStrings, IEnumerable unwrappedCounts, IEnumerable unwrappedItems, IEnumerable wrappedColors, IEnumerable items, XmlNestedModel nestedModel, IDictionary metadata, DateTimeOffset createdAt, TimeSpan duration, BinaryData data, StringFixedEnum fixedEnum, StringExtensibleEnum extensibleEnum, string label, int daysUsed, IEnumerable fooItems, XmlNestedModel anotherModel, IEnumerable modelsWithNamespaces, IEnumerable unwrappedModelsWithNamespaces, IEnumerable> listOfListFoo, IDictionary dictionaryFoo, IDictionary> dictionaryOfDictionaryFoo, IDictionary> dictionaryListFoo, IEnumerable> listOfDictionaryFoo) + { + Argument.AssertNotNull(name, nameof(name)); + Argument.AssertNotNull(id, nameof(id)); + Argument.AssertNotNull(originalName, nameof(originalName)); + Argument.AssertNotNull(xmlIdentifier, nameof(xmlIdentifier)); + Argument.AssertNotNull(content, nameof(content)); + Argument.AssertNotNull(unwrappedStrings, nameof(unwrappedStrings)); + Argument.AssertNotNull(unwrappedCounts, nameof(unwrappedCounts)); + Argument.AssertNotNull(unwrappedItems, nameof(unwrappedItems)); + Argument.AssertNotNull(wrappedColors, nameof(wrappedColors)); + Argument.AssertNotNull(items, nameof(items)); + Argument.AssertNotNull(nestedModel, nameof(nestedModel)); + Argument.AssertNotNull(metadata, nameof(metadata)); + Argument.AssertNotNull(data, nameof(data)); + Argument.AssertNotNull(label, nameof(label)); + Argument.AssertNotNull(fooItems, nameof(fooItems)); + Argument.AssertNotNull(anotherModel, nameof(anotherModel)); + Argument.AssertNotNull(modelsWithNamespaces, nameof(modelsWithNamespaces)); + Argument.AssertNotNull(unwrappedModelsWithNamespaces, nameof(unwrappedModelsWithNamespaces)); + Argument.AssertNotNull(listOfListFoo, nameof(listOfListFoo)); + Argument.AssertNotNull(dictionaryFoo, nameof(dictionaryFoo)); + Argument.AssertNotNull(dictionaryOfDictionaryFoo, nameof(dictionaryOfDictionaryFoo)); + Argument.AssertNotNull(dictionaryListFoo, nameof(dictionaryListFoo)); + Argument.AssertNotNull(listOfDictionaryFoo, nameof(listOfDictionaryFoo)); + + Name = name; + Age = age; + Enabled = enabled; + Score = score; + NullableString = nullableString; + Id = id; + Version = version; + IsActive = isActive; + OriginalName = originalName; + XmlIdentifier = xmlIdentifier; + Content = content; + UnwrappedStrings = unwrappedStrings.ToList(); + UnwrappedCounts = unwrappedCounts.ToList(); + UnwrappedItems = unwrappedItems.ToList(); + WrappedColors = wrappedColors.ToList(); + Items = items.ToList(); + NestedModel = nestedModel; + Metadata = metadata; + CreatedAt = createdAt; + Duration = duration; + Data = data; + OptionalRecordUnknown = new ChangeTrackingDictionary(); + FixedEnum = fixedEnum; + ExtensibleEnum = extensibleEnum; + Label = label; + DaysUsed = daysUsed; + FooItems = fooItems.ToList(); + AnotherModel = anotherModel; + ModelsWithNamespaces = modelsWithNamespaces.ToList(); + UnwrappedModelsWithNamespaces = unwrappedModelsWithNamespaces.ToList(); + ListOfListFoo = listOfListFoo.ToList(); + DictionaryFoo = dictionaryFoo; + DictionaryOfDictionaryFoo = dictionaryOfDictionaryFoo; + DictionaryListFoo = dictionaryListFoo; + ListOfDictionaryFoo = listOfDictionaryFoo.ToList(); + } + + /// Initializes a new instance of . + /// A simple string property. + /// An integer property. + /// A boolean property. + /// A float property. + /// An optional string. + /// An optional integer. + /// A nullable string. + /// A string as XML attribute. + /// An integer as XML attribute. + /// A boolean as XML attribute. + /// A property with a custom XML element name. + /// An attribute with a custom XML name. + /// Text content in the element (unwrapped string). + /// An unwrapped array of strings - items appear directly without wrapper. + /// An unwrapped array of integers. + /// An unwrapped array of models. + /// A wrapped array of strings (default). + /// A wrapped array with custom wrapper name. + /// A nested model property. + /// An optional nested model. + /// A dictionary property. + /// A date-time property. + /// A duration property. + /// A bytes property. + /// optional record of unknown. + /// A fixed enum property. + /// An extensible enum property. + /// An optional fixed enum property. + /// An optional extensible enum property. + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// Keeps track of any properties unknown to the library. + internal XmlAdvancedModel(string name, int age, bool enabled, float score, string optionalString, int? optionalInt, string nullableString, string id, int version, bool isActive, string originalName, string xmlIdentifier, string content, IList unwrappedStrings, IList unwrappedCounts, IList unwrappedItems, IList wrappedColors, IList items, XmlNestedModel nestedModel, XmlNestedModel optionalNestedModel, IDictionary metadata, DateTimeOffset createdAt, TimeSpan duration, BinaryData data, IDictionary optionalRecordUnknown, StringFixedEnum fixedEnum, StringExtensibleEnum extensibleEnum, IntFixedEnum? optionalFixedEnum, IntExtensibleEnum? optionalExtensibleEnum, string label, int daysUsed, IList fooItems, XmlNestedModel anotherModel, IList modelsWithNamespaces, IList unwrappedModelsWithNamespaces, IList> listOfListFoo, IDictionary dictionaryFoo, IDictionary> dictionaryOfDictionaryFoo, IDictionary> dictionaryListFoo, IList> listOfDictionaryFoo, IDictionary additionalBinaryDataProperties) + { + Name = name; + Age = age; + Enabled = enabled; + Score = score; + OptionalString = optionalString; + OptionalInt = optionalInt; + NullableString = nullableString; + Id = id; + Version = version; + IsActive = isActive; + OriginalName = originalName; + XmlIdentifier = xmlIdentifier; + Content = content; + UnwrappedStrings = unwrappedStrings; + UnwrappedCounts = unwrappedCounts; + UnwrappedItems = unwrappedItems; + WrappedColors = wrappedColors; + Items = items; + NestedModel = nestedModel; + OptionalNestedModel = optionalNestedModel; + Metadata = metadata; + CreatedAt = createdAt; + Duration = duration; + Data = data; + OptionalRecordUnknown = optionalRecordUnknown; + FixedEnum = fixedEnum; + ExtensibleEnum = extensibleEnum; + OptionalFixedEnum = optionalFixedEnum; + OptionalExtensibleEnum = optionalExtensibleEnum; + Label = label; + DaysUsed = daysUsed; + FooItems = fooItems; + AnotherModel = anotherModel; + ModelsWithNamespaces = modelsWithNamespaces; + UnwrappedModelsWithNamespaces = unwrappedModelsWithNamespaces; + ListOfListFoo = listOfListFoo; + DictionaryFoo = dictionaryFoo; + DictionaryOfDictionaryFoo = dictionaryOfDictionaryFoo; + DictionaryListFoo = dictionaryListFoo; + ListOfDictionaryFoo = listOfDictionaryFoo; + _additionalBinaryDataProperties = additionalBinaryDataProperties; + } + + /// A simple string property. + public string Name { get; set; } + + /// An integer property. + public int Age { get; set; } + + /// A boolean property. + public bool Enabled { get; set; } + + /// A float property. + public float Score { get; set; } + + /// An optional string. + public string OptionalString { get; set; } + + /// An optional integer. + public int? OptionalInt { get; set; } + + /// A nullable string. + public string NullableString { get; set; } + + /// A string as XML attribute. + public string Id { get; set; } + + /// An integer as XML attribute. + public int Version { get; set; } + + /// A boolean as XML attribute. + public bool IsActive { get; set; } + + /// A property with a custom XML element name. + public string OriginalName { get; set; } + + /// An attribute with a custom XML name. + public string XmlIdentifier { get; set; } + + /// Text content in the element (unwrapped string). + public string Content { get; set; } + + /// An unwrapped array of strings - items appear directly without wrapper. + public IList UnwrappedStrings { get; } + + /// An unwrapped array of integers. + public IList UnwrappedCounts { get; } + + /// An unwrapped array of models. + public IList UnwrappedItems { get; } + + /// A wrapped array of strings (default). + public IList WrappedColors { get; } + + /// A wrapped array with custom wrapper name. + public IList Items { get; } + + /// A nested model property. + public XmlNestedModel NestedModel { get; set; } + + /// An optional nested model. + public XmlNestedModel OptionalNestedModel { get; set; } + + /// A dictionary property. + public IDictionary Metadata { get; } + + /// A date-time property. + public DateTimeOffset CreatedAt { get; set; } + + /// A duration property. + public TimeSpan Duration { get; set; } + + /// + /// A bytes property + /// + /// To assign a byte[] to this property use . + /// The byte[] will be serialized to a Base64 encoded string. + /// + /// + /// Examples: + /// + /// + /// BinaryData.FromBytes(new byte[] { 1, 2, 3 }). + /// Creates a payload of "AQID". + /// + /// + /// + /// + public BinaryData Data { get; set; } + + /// + /// optional record of unknown + /// To assign an object to the value of this property use . + /// To assign an already formatted json string to this property use . + /// + /// Examples: + /// + /// + /// BinaryData.FromObjectAsJson("foo"). + /// Creates a payload of "foo". + /// + /// + /// BinaryData.FromString("\"foo\""). + /// Creates a payload of "foo". + /// + /// + /// BinaryData.FromObjectAsJson(new { key = "value" }). + /// Creates a payload of { "key": "value" }. + /// + /// + /// BinaryData.FromString("{\"key\": \"value\"}"). + /// Creates a payload of { "key": "value" }. + /// + /// + /// + /// + public IDictionary OptionalRecordUnknown { get; } + + /// A fixed enum property. + public StringFixedEnum FixedEnum { get; set; } + + /// An extensible enum property. + public StringExtensibleEnum ExtensibleEnum { get; set; } + + /// An optional fixed enum property. + public IntFixedEnum? OptionalFixedEnum { get; set; } + + /// An optional extensible enum property. + public IntExtensibleEnum? OptionalExtensibleEnum { get; set; } + + /// Gets or sets the Label. + public string Label { get; set; } + + /// Gets or sets the DaysUsed. + public int DaysUsed { get; set; } + + /// Gets the FooItems. + public IList FooItems { get; } + + /// Gets or sets the AnotherModel. + public XmlNestedModel AnotherModel { get; set; } + + /// Gets the ModelsWithNamespaces. + public IList ModelsWithNamespaces { get; } + + /// Gets the UnwrappedModelsWithNamespaces. + public IList UnwrappedModelsWithNamespaces { get; } + + /// Gets the ListOfListFoo. + public IList> ListOfListFoo { get; } + + /// Gets the DictionaryFoo. + public IDictionary DictionaryFoo { get; } + + /// Gets the DictionaryOfDictionaryFoo. + public IDictionary> DictionaryOfDictionaryFoo { get; } + + /// Gets the DictionaryListFoo. + public IDictionary> DictionaryListFoo { get; } + + /// Gets the ListOfDictionaryFoo. + public IList> ListOfDictionaryFoo { get; } + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlItem.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlItem.Serialization.cs new file mode 100644 index 00000000000..5b34154f8c0 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlItem.Serialization.cs @@ -0,0 +1,156 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.IO; +using System.Xml; +using System.Xml.Linq; + +namespace SampleTypeSpec +{ + /// An item model for XML array testing. + public partial class XmlItem : IPersistableModel + { + /// Initializes a new instance of for deserialization. + internal XmlItem() + { + } + + /// The data to parse. + /// The client options for reading and writing models. + protected virtual XmlItem PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (Stream dataStream = data.ToStream()) + { + return DeserializeXmlItem(XElement.Load(dataStream, LoadOptions.PreserveWhitespace), options); + } + default: + throw new FormatException($"The model {nameof(XmlItem)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (MemoryStream stream = new MemoryStream(256)) + { + using (XmlWriter writer = XmlWriter.Create(stream, ModelSerializationExtensions.XmlWriterSettings)) + { + WriteXml(writer, options, "Item"); + } + if (stream.Position > int.MaxValue) + { + return BinaryData.FromStream(stream); + } + else + { + return new BinaryData(stream.GetBuffer().AsMemory(0, (int)stream.Position)); + } + } + default: + throw new FormatException($"The model {nameof(XmlItem)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + XmlItem IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "X"; + + /// The XML writer. + /// The client options for reading and writing models. + /// An optional name hint. + private void WriteXml(XmlWriter writer, ModelReaderWriterOptions options, string nameHint) + { + if (nameHint != null) + { + writer.WriteStartElement(nameHint); + } + + XmlModelWriteCore(writer, options); + + if (nameHint != null) + { + writer.WriteEndElement(); + } + } + + /// The XML writer. + /// The client options for reading and writing models. + internal virtual void XmlModelWriteCore(XmlWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "X") + { + throw new FormatException($"The model {nameof(XmlItem)} does not support writing '{format}' format."); + } + + writer.WriteStartAttribute("itemId"); + writer.WriteValue(ItemId); + writer.WriteEndAttribute(); + writer.WriteStartElement("itemName"); + writer.WriteValue(ItemName); + writer.WriteEndElement(); + writer.WriteStartElement("itemValue"); + writer.WriteValue(ItemValue); + writer.WriteEndElement(); + } + + /// The xml element to deserialize. + /// The client options for reading and writing models. + internal static XmlItem DeserializeXmlItem(XElement element, ModelReaderWriterOptions options) + { + if (element == null) + { + return null; + } + + string itemName = default; + int itemValue = default; + string itemId = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + + foreach (var attr in element.Attributes()) + { + string localName = attr.Name.LocalName; + if (localName == "itemId") + { + itemId = (string)attr; + continue; + } + } + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if (localName == "itemName") + { + itemName = (string)child; + continue; + } + if (localName == "itemValue") + { + itemValue = (int)child; + continue; + } + } + return new XmlItem(itemName, itemValue, itemId, additionalBinaryDataProperties); + } + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlItem.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlItem.cs new file mode 100644 index 00000000000..65c93c2263d --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlItem.cs @@ -0,0 +1,53 @@ +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace SampleTypeSpec +{ + /// An item model for XML array testing. + public partial class XmlItem + { + /// Keeps track of any properties unknown to the library. + private protected readonly IDictionary _additionalBinaryDataProperties; + + /// Initializes a new instance of . + /// The item name. + /// The item value. + /// Item ID as attribute. + /// or is null. + public XmlItem(string itemName, int itemValue, string itemId) + { + Argument.AssertNotNull(itemName, nameof(itemName)); + Argument.AssertNotNull(itemId, nameof(itemId)); + + ItemName = itemName; + ItemValue = itemValue; + ItemId = itemId; + } + + /// Initializes a new instance of . + /// The item name. + /// The item value. + /// Item ID as attribute. + /// Keeps track of any properties unknown to the library. + internal XmlItem(string itemName, int itemValue, string itemId, IDictionary additionalBinaryDataProperties) + { + ItemName = itemName; + ItemValue = itemValue; + ItemId = itemId; + _additionalBinaryDataProperties = additionalBinaryDataProperties; + } + + /// The item name. + public string ItemName { get; set; } + + /// The item value. + public int ItemValue { get; set; } + + /// Item ID as attribute. + public string ItemId { get; set; } + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlModelWithNamespace.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlModelWithNamespace.Serialization.cs new file mode 100644 index 00000000000..0f175457a81 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlModelWithNamespace.Serialization.cs @@ -0,0 +1,133 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.IO; +using System.Xml; +using System.Xml.Linq; + +namespace SampleTypeSpec +{ + /// The XmlModelWithNamespace. + public partial class XmlModelWithNamespace : IPersistableModel + { + /// Initializes a new instance of for deserialization. + internal XmlModelWithNamespace() + { + } + + /// The data to parse. + /// The client options for reading and writing models. + protected virtual XmlModelWithNamespace PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (Stream dataStream = data.ToStream()) + { + return DeserializeXmlModelWithNamespace(XElement.Load(dataStream, LoadOptions.PreserveWhitespace), options); + } + default: + throw new FormatException($"The model {nameof(XmlModelWithNamespace)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (MemoryStream stream = new MemoryStream(256)) + { + using (XmlWriter writer = XmlWriter.Create(stream, ModelSerializationExtensions.XmlWriterSettings)) + { + WriteXml(writer, options, "XmlModelWithNamespace"); + } + if (stream.Position > int.MaxValue) + { + return BinaryData.FromStream(stream); + } + else + { + return new BinaryData(stream.GetBuffer().AsMemory(0, (int)stream.Position)); + } + } + default: + throw new FormatException($"The model {nameof(XmlModelWithNamespace)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + XmlModelWithNamespace IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "X"; + + /// The XML writer. + /// The client options for reading and writing models. + /// An optional name hint. + private void WriteXml(XmlWriter writer, ModelReaderWriterOptions options, string nameHint) + { + if (nameHint != null) + { + writer.WriteStartElement("ns1", nameHint, "http://www.example.com/namespace"); + } + + XmlModelWriteCore(writer, options); + + if (nameHint != null) + { + writer.WriteEndElement(); + } + } + + /// The XML writer. + /// The client options for reading and writing models. + internal virtual void XmlModelWriteCore(XmlWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "X") + { + throw new FormatException($"The model {nameof(XmlModelWithNamespace)} does not support writing '{format}' format."); + } + + writer.WriteStartElement("foo"); + writer.WriteValue(Foo); + writer.WriteEndElement(); + } + + /// The xml element to deserialize. + /// The client options for reading and writing models. + internal static XmlModelWithNamespace DeserializeXmlModelWithNamespace(XElement element, ModelReaderWriterOptions options) + { + if (element == null) + { + return null; + } + + string foo = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if (localName == "foo") + { + foo = (string)child; + continue; + } + } + return new XmlModelWithNamespace(foo, additionalBinaryDataProperties); + } + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlModelWithNamespace.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlModelWithNamespace.cs new file mode 100644 index 00000000000..e45ea6f56ad --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlModelWithNamespace.cs @@ -0,0 +1,38 @@ +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace SampleTypeSpec +{ + /// The XmlModelWithNamespace. + public partial class XmlModelWithNamespace + { + /// Keeps track of any properties unknown to the library. + private protected readonly IDictionary _additionalBinaryDataProperties; + + /// Initializes a new instance of . + /// + /// is null. + public XmlModelWithNamespace(string foo) + { + Argument.AssertNotNull(foo, nameof(foo)); + + Foo = foo; + } + + /// Initializes a new instance of . + /// + /// Keeps track of any properties unknown to the library. + internal XmlModelWithNamespace(string foo, IDictionary additionalBinaryDataProperties) + { + Foo = foo; + _additionalBinaryDataProperties = additionalBinaryDataProperties; + } + + /// Gets or sets the Foo. + public string Foo { get; set; } + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlNestedModel.Serialization.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlNestedModel.Serialization.cs new file mode 100644 index 00000000000..91016f0bc16 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlNestedModel.Serialization.cs @@ -0,0 +1,147 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.IO; +using System.Xml; +using System.Xml.Linq; + +namespace SampleTypeSpec +{ + /// A nested model for XML testing. + public partial class XmlNestedModel : IPersistableModel + { + /// Initializes a new instance of for deserialization. + internal XmlNestedModel() + { + } + + /// The data to parse. + /// The client options for reading and writing models. + protected virtual XmlNestedModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (Stream dataStream = data.ToStream()) + { + return DeserializeXmlNestedModel(XElement.Load(dataStream, LoadOptions.PreserveWhitespace), options); + } + default: + throw new FormatException($"The model {nameof(XmlNestedModel)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (MemoryStream stream = new MemoryStream(256)) + { + using (XmlWriter writer = XmlWriter.Create(stream, ModelSerializationExtensions.XmlWriterSettings)) + { + WriteXml(writer, options, "XmlNestedModel"); + } + if (stream.Position > int.MaxValue) + { + return BinaryData.FromStream(stream); + } + else + { + return new BinaryData(stream.GetBuffer().AsMemory(0, (int)stream.Position)); + } + } + default: + throw new FormatException($"The model {nameof(XmlNestedModel)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + XmlNestedModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "X"; + + /// The XML writer. + /// The client options for reading and writing models. + /// An optional name hint. + private void WriteXml(XmlWriter writer, ModelReaderWriterOptions options, string nameHint) + { + if (nameHint != null) + { + writer.WriteStartElement(nameHint); + } + + XmlModelWriteCore(writer, options); + + if (nameHint != null) + { + writer.WriteEndElement(); + } + } + + /// The XML writer. + /// The client options for reading and writing models. + internal virtual void XmlModelWriteCore(XmlWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "X") + { + throw new FormatException($"The model {nameof(XmlNestedModel)} does not support writing '{format}' format."); + } + + writer.WriteStartAttribute("nestedId"); + writer.WriteValue(NestedId); + writer.WriteEndAttribute(); + writer.WriteStartElement("value"); + writer.WriteValue(Value); + writer.WriteEndElement(); + } + + /// The xml element to deserialize. + /// The client options for reading and writing models. + internal static XmlNestedModel DeserializeXmlNestedModel(XElement element, ModelReaderWriterOptions options) + { + if (element == null) + { + return null; + } + + string value = default; + int nestedId = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + + foreach (var attr in element.Attributes()) + { + string localName = attr.Name.LocalName; + if (localName == "nestedId") + { + nestedId = (int)attr; + continue; + } + } + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if (localName == "value") + { + value = (string)child; + continue; + } + } + return new XmlNestedModel(value, nestedId, additionalBinaryDataProperties); + } + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlNestedModel.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlNestedModel.cs new file mode 100644 index 00000000000..4b663f2bb40 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/Models/XmlNestedModel.cs @@ -0,0 +1,45 @@ +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace SampleTypeSpec +{ + /// A nested model for XML testing. + public partial class XmlNestedModel + { + /// Keeps track of any properties unknown to the library. + private protected readonly IDictionary _additionalBinaryDataProperties; + + /// Initializes a new instance of . + /// The value of the nested model. + /// An attribute on the nested model. + /// is null. + public XmlNestedModel(string value, int nestedId) + { + Argument.AssertNotNull(value, nameof(value)); + + Value = value; + NestedId = nestedId; + } + + /// Initializes a new instance of . + /// The value of the nested model. + /// An attribute on the nested model. + /// Keeps track of any properties unknown to the library. + internal XmlNestedModel(string value, int nestedId, IDictionary additionalBinaryDataProperties) + { + Value = value; + NestedId = nestedId; + _additionalBinaryDataProperties = additionalBinaryDataProperties; + } + + /// The value of the nested model. + public string Value { get; set; } + + /// An attribute on the nested model. + public int NestedId { get; set; } + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/PetOperations.RestClient.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/PetOperations.RestClient.cs index e39efd2c1cf..90c482d1bf9 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/PetOperations.RestClient.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/PetOperations.RestClient.cs @@ -12,7 +12,7 @@ public partial class PetOperations { private static PipelineMessageClassifier _pipelineMessageClassifier200; - private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 = PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); + private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); internal PipelineMessage CreateUpdatePetAsPetRequest(BinaryContent content, RequestOptions options) { diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/PetOperations.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/PetOperations.cs index 2a60348d6b5..395ff6b18d9 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/PetOperations.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/PetOperations.cs @@ -112,7 +112,7 @@ public virtual ClientResult UpdatePetAsPet(Pet pet, CancellationToken cance System.Console.WriteLine("Entering method UpdatePetAsPet."); Argument.AssertNotNull(pet, nameof(pet)); - ClientResult result = UpdatePetAsPet(pet, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + ClientResult result = UpdatePetAsPet(pet, cancellationToken.ToRequestOptions()); return ClientResult.FromValue((Pet)result, result.GetRawResponse()); } catch (Exception ex) @@ -138,7 +138,7 @@ public virtual async Task> UpdatePetAsPetAsync(Pet pet, Cancel System.Console.WriteLine("Entering method UpdatePetAsPetAsync."); Argument.AssertNotNull(pet, nameof(pet)); - ClientResult result = await UpdatePetAsPetAsync(pet, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + ClientResult result = await UpdatePetAsPetAsync(pet, cancellationToken.ToRequestOptions()).ConfigureAwait(false); return ClientResult.FromValue((Pet)result, result.GetRawResponse()); } catch (Exception ex) @@ -232,7 +232,7 @@ public virtual ClientResult UpdateDogAsPet(Pet pet, CancellationToken cance System.Console.WriteLine("Entering method UpdateDogAsPet."); Argument.AssertNotNull(pet, nameof(pet)); - ClientResult result = UpdateDogAsPet(pet, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + ClientResult result = UpdateDogAsPet(pet, cancellationToken.ToRequestOptions()); return ClientResult.FromValue((Pet)result, result.GetRawResponse()); } catch (Exception ex) @@ -258,7 +258,7 @@ public virtual async Task> UpdateDogAsPetAsync(Pet pet, Cancel System.Console.WriteLine("Entering method UpdateDogAsPetAsync."); Argument.AssertNotNull(pet, nameof(pet)); - ClientResult result = await UpdateDogAsPetAsync(pet, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + ClientResult result = await UpdateDogAsPetAsync(pet, cancellationToken.ToRequestOptions()).ConfigureAwait(false); return ClientResult.FromValue((Pet)result, result.GetRawResponse()); } catch (Exception ex) diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/PlantOperations.RestClient.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/PlantOperations.RestClient.cs new file mode 100644 index 00000000000..37d98ca8b50 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/PlantOperations.RestClient.cs @@ -0,0 +1,69 @@ +// + +#nullable disable + +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace SampleTypeSpec +{ + /// + public partial class PlantOperations + { + private static PipelineMessageClassifier _pipelineMessageClassifier200; + + private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); + + internal PipelineMessage CreateGetTreeRequest(RequestOptions options) + { + ClientUriBuilder uri = new ClientUriBuilder(); + uri.Reset(_endpoint); + uri.AppendPath("/plants/tree/as-plant", false); + PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); + PipelineRequest request = message.Request; + request.Headers.Set("Accept", "application/xml"); + message.Apply(options); + return message; + } + + internal PipelineMessage CreateGetTreeAsJsonRequest(RequestOptions options) + { + ClientUriBuilder uri = new ClientUriBuilder(); + uri.Reset(_endpoint); + uri.AppendPath("/plants/tree/as-plant/json", false); + PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); + PipelineRequest request = message.Request; + request.Headers.Set("Accept", "application/json"); + message.Apply(options); + return message; + } + + internal PipelineMessage CreateUpdateTreeRequest(BinaryContent content, RequestOptions options) + { + ClientUriBuilder uri = new ClientUriBuilder(); + uri.Reset(_endpoint); + uri.AppendPath("/plants/tree/as-plant", false); + PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "PUT", PipelineMessageClassifier200); + PipelineRequest request = message.Request; + request.Headers.Set("Content-Type", "application/xml"); + request.Headers.Set("Accept", "application/xml"); + request.Content = content; + message.Apply(options); + return message; + } + + internal PipelineMessage CreateUpdateTreeAsJsonRequest(BinaryContent content, RequestOptions options) + { + ClientUriBuilder uri = new ClientUriBuilder(); + uri.Reset(_endpoint); + uri.AppendPath("/plants/tree/as-plant/json", false); + PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "PUT", PipelineMessageClassifier200); + PipelineRequest request = message.Request; + request.Headers.Set("Content-Type", "application/json"); + request.Headers.Set("Accept", "application/json"); + request.Content = content; + message.Apply(options); + return message; + } + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/PlantOperations.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/PlantOperations.cs new file mode 100644 index 00000000000..dcfa7b2cb12 --- /dev/null +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/PlantOperations.cs @@ -0,0 +1,487 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace SampleTypeSpec +{ + /// The PlantOperations sub-client. + public partial class PlantOperations + { + private readonly Uri _endpoint; + + /// Initializes a new instance of PlantOperations for mocking. + protected PlantOperations() + { + } + + /// Initializes a new instance of PlantOperations. + /// The HTTP pipeline for sending and receiving REST requests and responses. + /// Service endpoint. + internal PlantOperations(ClientPipeline pipeline, Uri endpoint) + { + _endpoint = endpoint; + Pipeline = pipeline; + } + + /// The HTTP pipeline for sending and receiving REST requests and responses. + public ClientPipeline Pipeline { get; } + + /// + /// [Protocol Method] Get a tree as a plant + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual ClientResult GetTree(RequestOptions options) + { + try + { + System.Console.WriteLine("Entering method GetTree."); + using PipelineMessage message = CreateGetTreeRequest(options); + return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method GetTree: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method GetTree."); + } + } + + /// + /// [Protocol Method] Get a tree as a plant + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual async Task GetTreeAsync(RequestOptions options) + { + try + { + System.Console.WriteLine("Entering method GetTreeAsync."); + using PipelineMessage message = CreateGetTreeRequest(options); + return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method GetTreeAsync: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method GetTreeAsync."); + } + } + + /// Get a tree as a plant. + /// The cancellation token that can be used to cancel the operation. + /// Service returned a non-success status code. + public virtual ClientResult GetTree(CancellationToken cancellationToken = default) + { + try + { + System.Console.WriteLine("Entering method GetTree."); + ClientResult result = GetTree(cancellationToken.ToRequestOptions()); + return ClientResult.FromValue((Tree)result, result.GetRawResponse()); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method GetTree: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method GetTree."); + } + } + + /// Get a tree as a plant. + /// The cancellation token that can be used to cancel the operation. + /// Service returned a non-success status code. + public virtual async Task> GetTreeAsync(CancellationToken cancellationToken = default) + { + try + { + System.Console.WriteLine("Entering method GetTreeAsync."); + ClientResult result = await GetTreeAsync(cancellationToken.ToRequestOptions()).ConfigureAwait(false); + return ClientResult.FromValue((Tree)result, result.GetRawResponse()); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method GetTreeAsync: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method GetTreeAsync."); + } + } + + /// + /// [Protocol Method] Get a tree as a plant + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual ClientResult GetTreeAsJson(RequestOptions options) + { + try + { + System.Console.WriteLine("Entering method GetTreeAsJson."); + using PipelineMessage message = CreateGetTreeAsJsonRequest(options); + return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method GetTreeAsJson: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method GetTreeAsJson."); + } + } + + /// + /// [Protocol Method] Get a tree as a plant + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual async Task GetTreeAsJsonAsync(RequestOptions options) + { + try + { + System.Console.WriteLine("Entering method GetTreeAsJsonAsync."); + using PipelineMessage message = CreateGetTreeAsJsonRequest(options); + return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method GetTreeAsJsonAsync: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method GetTreeAsJsonAsync."); + } + } + + /// Get a tree as a plant. + /// The cancellation token that can be used to cancel the operation. + /// Service returned a non-success status code. + public virtual ClientResult GetTreeAsJson(CancellationToken cancellationToken = default) + { + try + { + System.Console.WriteLine("Entering method GetTreeAsJson."); + ClientResult result = GetTreeAsJson(cancellationToken.ToRequestOptions()); + return ClientResult.FromValue((Tree)result, result.GetRawResponse()); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method GetTreeAsJson: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method GetTreeAsJson."); + } + } + + /// Get a tree as a plant. + /// The cancellation token that can be used to cancel the operation. + /// Service returned a non-success status code. + public virtual async Task> GetTreeAsJsonAsync(CancellationToken cancellationToken = default) + { + try + { + System.Console.WriteLine("Entering method GetTreeAsJsonAsync."); + ClientResult result = await GetTreeAsJsonAsync(cancellationToken.ToRequestOptions()).ConfigureAwait(false); + return ClientResult.FromValue((Tree)result, result.GetRawResponse()); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method GetTreeAsJsonAsync: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method GetTreeAsJsonAsync."); + } + } + + /// + /// [Protocol Method] Update a tree as a plant + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The content to send as the body of the request. + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// is null. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual ClientResult UpdateTree(BinaryContent content, RequestOptions options = null) + { + try + { + System.Console.WriteLine("Entering method UpdateTree."); + Argument.AssertNotNull(content, nameof(content)); + + using PipelineMessage message = CreateUpdateTreeRequest(content, options); + return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method UpdateTree: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method UpdateTree."); + } + } + + /// + /// [Protocol Method] Update a tree as a plant + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The content to send as the body of the request. + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// is null. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual async Task UpdateTreeAsync(BinaryContent content, RequestOptions options = null) + { + try + { + System.Console.WriteLine("Entering method UpdateTreeAsync."); + Argument.AssertNotNull(content, nameof(content)); + + using PipelineMessage message = CreateUpdateTreeRequest(content, options); + return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method UpdateTreeAsync: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method UpdateTreeAsync."); + } + } + + /// Update a tree as a plant. + /// + /// The cancellation token that can be used to cancel the operation. + /// is null. + /// Service returned a non-success status code. + public virtual ClientResult UpdateTree(Tree tree, CancellationToken cancellationToken = default) + { + try + { + System.Console.WriteLine("Entering method UpdateTree."); + Argument.AssertNotNull(tree, nameof(tree)); + + using BinaryContent content = tree.ToBinaryContent("X"); + ClientResult result = UpdateTree(content, cancellationToken.ToRequestOptions()); + return ClientResult.FromValue((Tree)result, result.GetRawResponse()); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method UpdateTree: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method UpdateTree."); + } + } + + /// Update a tree as a plant. + /// + /// The cancellation token that can be used to cancel the operation. + /// is null. + /// Service returned a non-success status code. + public virtual async Task> UpdateTreeAsync(Tree tree, CancellationToken cancellationToken = default) + { + try + { + System.Console.WriteLine("Entering method UpdateTreeAsync."); + Argument.AssertNotNull(tree, nameof(tree)); + + using BinaryContent content = tree.ToBinaryContent("X"); + ClientResult result = await UpdateTreeAsync(content, cancellationToken.ToRequestOptions()).ConfigureAwait(false); + return ClientResult.FromValue((Tree)result, result.GetRawResponse()); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method UpdateTreeAsync: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method UpdateTreeAsync."); + } + } + + /// + /// [Protocol Method] Update a tree as a plant + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The content to send as the body of the request. + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// is null. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual ClientResult UpdateTreeAsJson(BinaryContent content, RequestOptions options = null) + { + try + { + System.Console.WriteLine("Entering method UpdateTreeAsJson."); + Argument.AssertNotNull(content, nameof(content)); + + using PipelineMessage message = CreateUpdateTreeAsJsonRequest(content, options); + return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method UpdateTreeAsJson: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method UpdateTreeAsJson."); + } + } + + /// + /// [Protocol Method] Update a tree as a plant + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The content to send as the body of the request. + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// is null. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual async Task UpdateTreeAsJsonAsync(BinaryContent content, RequestOptions options = null) + { + try + { + System.Console.WriteLine("Entering method UpdateTreeAsJsonAsync."); + Argument.AssertNotNull(content, nameof(content)); + + using PipelineMessage message = CreateUpdateTreeAsJsonRequest(content, options); + return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method UpdateTreeAsJsonAsync: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method UpdateTreeAsJsonAsync."); + } + } + + /// Update a tree as a plant. + /// + /// The cancellation token that can be used to cancel the operation. + /// is null. + /// Service returned a non-success status code. + public virtual ClientResult UpdateTreeAsJson(Tree tree, CancellationToken cancellationToken = default) + { + try + { + System.Console.WriteLine("Entering method UpdateTreeAsJson."); + Argument.AssertNotNull(tree, nameof(tree)); + + using BinaryContent content = tree.ToBinaryContent("J"); + ClientResult result = UpdateTreeAsJson(content, cancellationToken.ToRequestOptions()); + return ClientResult.FromValue((Tree)result, result.GetRawResponse()); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method UpdateTreeAsJson: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method UpdateTreeAsJson."); + } + } + + /// Update a tree as a plant. + /// + /// The cancellation token that can be used to cancel the operation. + /// is null. + /// Service returned a non-success status code. + public virtual async Task> UpdateTreeAsJsonAsync(Tree tree, CancellationToken cancellationToken = default) + { + try + { + System.Console.WriteLine("Entering method UpdateTreeAsJsonAsync."); + Argument.AssertNotNull(tree, nameof(tree)); + + using BinaryContent content = tree.ToBinaryContent("J"); + ClientResult result = await UpdateTreeAsJsonAsync(content, cancellationToken.ToRequestOptions()).ConfigureAwait(false); + return ClientResult.FromValue((Tree)result, result.GetRawResponse()); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method UpdateTreeAsJsonAsync: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method UpdateTreeAsJsonAsync."); + } + } + } +} diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClient.RestClient.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClient.RestClient.cs index 6037a87bb26..7388bc4fc20 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClient.RestClient.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClient.RestClient.cs @@ -14,9 +14,9 @@ public partial class SampleTypeSpecClient private static PipelineMessageClassifier _pipelineMessageClassifier200; private static PipelineMessageClassifier _pipelineMessageClassifier204; - private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 = PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); + private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); - private static PipelineMessageClassifier PipelineMessageClassifier204 => _pipelineMessageClassifier204 = PipelineMessageClassifier.Create(stackalloc ushort[] { 204 }); + private static PipelineMessageClassifier PipelineMessageClassifier204 => _pipelineMessageClassifier204 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 204 }); internal PipelineMessage CreateSayHiRequest(string headParameter, string queryParameter, string optionalQuery, RequestOptions options) { @@ -100,7 +100,7 @@ internal PipelineMessage CreateHelloLiteralRequest(RequestOptions options) uri.Reset(_endpoint); uri.AppendPath("/helloLiteral/", false); uri.AppendPath(123.ToString(), true); - uri.AppendQuery("p3", TypeFormatters.ConvertToString(true, null), true); + uri.AppendQuery("p3", TypeFormatters.ConvertToString(true), true); PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; request.Headers.Set("p1", "test"); @@ -185,7 +185,7 @@ internal PipelineMessage CreateAddTimeHeaderRequest(RequestOptions options) uri.AppendPath("/", false); PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier204); PipelineRequest request = message.Request; - request.Headers.Set("Repeatability-First-Sent", TypeFormatters.ConvertToString(DateTimeOffset.Now, "R")); + request.Headers.Set("Repeatability-First-Sent", TypeFormatters.ConvertToString(DateTimeOffset.Now, SerializationFormat.DateTime_RFC7231)); message.Apply(options); return message; } @@ -270,7 +270,10 @@ internal PipelineMessage CreateWithApiVersionRequest(string p1, RequestOptions o ClientUriBuilder uri = new ClientUriBuilder(); uri.Reset(_endpoint); uri.AppendPath("/WithApiVersion", false); - uri.AppendQuery("apiVersion", _apiVersion, true); + if (_apiVersion != null) + { + uri.AppendQuery("apiVersion", _apiVersion, true); + } PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier204); PipelineRequest request = message.Request; request.Headers.Set("p1", p1); @@ -293,7 +296,14 @@ internal PipelineMessage CreateGetWithNextLinkRequest(RequestOptions options) internal PipelineMessage CreateNextGetWithNextLinkRequest(Uri nextPage, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(new Uri(_endpoint, nextPage)); + } PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; request.Headers.Set("Accept", "application/json"); @@ -316,7 +326,14 @@ internal PipelineMessage CreateGetWithStringNextLinkRequest(RequestOptions optio internal PipelineMessage CreateNextGetWithStringNextLinkRequest(Uri nextPage, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(new Uri(_endpoint, nextPage)); + } PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; request.Headers.Set("Accept", "application/json"); @@ -403,5 +420,31 @@ internal PipelineMessage CreateDynamicModelOperationRequest(BinaryContent conten message.Apply(options); return message; } + + internal PipelineMessage CreateGetXmlAdvancedModelRequest(RequestOptions options) + { + ClientUriBuilder uri = new ClientUriBuilder(); + uri.Reset(_endpoint); + uri.AppendPath("/xmlAdvanced", false); + PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); + PipelineRequest request = message.Request; + request.Headers.Set("Accept", "application/xml"); + message.Apply(options); + return message; + } + + internal PipelineMessage CreateUpdateXmlAdvancedModelRequest(BinaryContent content, RequestOptions options) + { + ClientUriBuilder uri = new ClientUriBuilder(); + uri.Reset(_endpoint); + uri.AppendPath("/xmlAdvanced", false); + PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "PUT", PipelineMessageClassifier200); + PipelineRequest request = message.Request; + request.Headers.Set("Content-Type", "application/xml"); + request.Headers.Set("Accept", "application/xml"); + request.Content = content; + message.Apply(options); + return message; + } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClient.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClient.cs index 3fe80eeac86..fdf22f78834 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClient.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecClient.cs @@ -35,7 +35,7 @@ public partial class SampleTypeSpecClient private AnimalOperations _cachedAnimalOperations; private PetOperations _cachedPetOperations; private DogOperations _cachedDogOperations; - private Metrics _cachedMetrics; + private PlantOperations _cachedPlantOperations; /// Initializes a new instance of SampleTypeSpecClient for mocking. protected SampleTypeSpecClient() @@ -72,7 +72,7 @@ public SampleTypeSpecClient(Uri endpoint, ApiKeyCredential credential, SampleTyp _endpoint = endpoint; _keyCredential = credential; - Pipeline = ClientPipeline.Create(options, Array.Empty(), new PipelinePolicy[] { ApiKeyAuthenticationPolicy.CreateHeaderApiKeyPolicy(_keyCredential, AuthorizationHeader) }, Array.Empty()); + Pipeline = ClientPipeline.Create(options, Array.Empty(), new PipelinePolicy[] { new UserAgentPolicy(typeof(SampleTypeSpecClient).Assembly), ApiKeyAuthenticationPolicy.CreateHeaderApiKeyPolicy(_keyCredential, AuthorizationHeader) }, Array.Empty()); _apiVersion = options.Version; } @@ -90,7 +90,7 @@ public SampleTypeSpecClient(Uri endpoint, AuthenticationTokenProvider tokenProvi _endpoint = endpoint; _tokenProvider = tokenProvider; - Pipeline = ClientPipeline.Create(options, Array.Empty(), new PipelinePolicy[] { new BearerTokenPolicy(_tokenProvider, _flows) }, Array.Empty()); + Pipeline = ClientPipeline.Create(options, Array.Empty(), new PipelinePolicy[] { new UserAgentPolicy(typeof(SampleTypeSpecClient).Assembly), new BearerTokenPolicy(_tokenProvider, _flows) }, Array.Empty()); _apiVersion = options.Version; } @@ -189,7 +189,7 @@ public virtual ClientResult SayHi(string headParameter, string queryParam Argument.AssertNotNullOrEmpty(headParameter, nameof(headParameter)); Argument.AssertNotNullOrEmpty(queryParameter, nameof(queryParameter)); - ClientResult result = SayHi(headParameter, queryParameter, optionalQuery, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + ClientResult result = SayHi(headParameter, queryParameter, optionalQuery, cancellationToken.ToRequestOptions()); return ClientResult.FromValue((Thing)result, result.GetRawResponse()); } catch (Exception ex) @@ -219,7 +219,7 @@ public virtual async Task> SayHiAsync(string headParameter, Argument.AssertNotNullOrEmpty(headParameter, nameof(headParameter)); Argument.AssertNotNullOrEmpty(queryParameter, nameof(queryParameter)); - ClientResult result = await SayHiAsync(headParameter, queryParameter, optionalQuery, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + ClientResult result = await SayHiAsync(headParameter, queryParameter, optionalQuery, cancellationToken.ToRequestOptions()).ConfigureAwait(false); return ClientResult.FromValue((Thing)result, result.GetRawResponse()); } catch (Exception ex) @@ -328,7 +328,7 @@ public virtual ClientResult HelloAgain(string p2, string p1, Rou Argument.AssertNotNullOrEmpty(p1, nameof(p1)); Argument.AssertNotNull(action, nameof(action)); - ClientResult result = HelloAgain(p2, p1, action, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + ClientResult result = HelloAgain(p2, p1, action, cancellationToken.ToRequestOptions()); return ClientResult.FromValue((RoundTripModel)result, result.GetRawResponse()); } catch (Exception ex) @@ -359,7 +359,7 @@ public virtual async Task> HelloAgainAsync(string p Argument.AssertNotNullOrEmpty(p1, nameof(p1)); Argument.AssertNotNull(action, nameof(action)); - ClientResult result = await HelloAgainAsync(p2, p1, action, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + ClientResult result = await HelloAgainAsync(p2, p1, action, cancellationToken.ToRequestOptions()).ConfigureAwait(false); return ClientResult.FromValue((RoundTripModel)result, result.GetRawResponse()); } catch (Exception ex) @@ -451,6 +451,58 @@ public virtual async Task NoContentTypeAsync(string p2, string p1, } } + /// Return hi again. + /// + /// The cancellation token that can be used to cancel the operation. + /// is null. + /// Service returned a non-success status code. + public virtual ClientResult NoContentType(Wrapper info, CancellationToken cancellationToken = default) + { + try + { + System.Console.WriteLine("Entering method NoContentType."); + Argument.AssertNotNull(info, nameof(info)); + + ClientResult result = NoContentType(info.P2, info.P1, info.Action, cancellationToken.ToRequestOptions()); + return ClientResult.FromValue((RoundTripModel)result, result.GetRawResponse()); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method NoContentType: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method NoContentType."); + } + } + + /// Return hi again. + /// + /// The cancellation token that can be used to cancel the operation. + /// is null. + /// Service returned a non-success status code. + public virtual async Task> NoContentTypeAsync(Wrapper info, CancellationToken cancellationToken = default) + { + try + { + System.Console.WriteLine("Entering method NoContentTypeAsync."); + Argument.AssertNotNull(info, nameof(info)); + + ClientResult result = await NoContentTypeAsync(info.P2, info.P1, info.Action, cancellationToken.ToRequestOptions()).ConfigureAwait(false); + return ClientResult.FromValue((RoundTripModel)result, result.GetRawResponse()); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method NoContentTypeAsync: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method NoContentTypeAsync."); + } + } + /// /// [Protocol Method] Return hi in demo2 /// @@ -519,7 +571,7 @@ public virtual ClientResult HelloDemo2(CancellationToken cancellationToke try { System.Console.WriteLine("Entering method HelloDemo2."); - ClientResult result = HelloDemo2(cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + ClientResult result = HelloDemo2(cancellationToken.ToRequestOptions()); return ClientResult.FromValue((Thing)result, result.GetRawResponse()); } catch (Exception ex) @@ -541,7 +593,7 @@ public virtual async Task> HelloDemo2Async(CancellationToken try { System.Console.WriteLine("Entering method HelloDemo2Async."); - ClientResult result = await HelloDemo2Async(cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + ClientResult result = await HelloDemo2Async(cancellationToken.ToRequestOptions()).ConfigureAwait(false); return ClientResult.FromValue((Thing)result, result.GetRawResponse()); } catch (Exception ex) @@ -635,7 +687,7 @@ public virtual ClientResult CreateLiteral(Thing body, CancellationToken c System.Console.WriteLine("Entering method CreateLiteral."); Argument.AssertNotNull(body, nameof(body)); - ClientResult result = CreateLiteral(body, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + ClientResult result = CreateLiteral(body, cancellationToken.ToRequestOptions()); return ClientResult.FromValue((Thing)result, result.GetRawResponse()); } catch (Exception ex) @@ -661,7 +713,7 @@ public virtual async Task> CreateLiteralAsync(Thing body, Ca System.Console.WriteLine("Entering method CreateLiteralAsync."); Argument.AssertNotNull(body, nameof(body)); - ClientResult result = await CreateLiteralAsync(body, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + ClientResult result = await CreateLiteralAsync(body, cancellationToken.ToRequestOptions()).ConfigureAwait(false); return ClientResult.FromValue((Thing)result, result.GetRawResponse()); } catch (Exception ex) @@ -743,7 +795,7 @@ public virtual ClientResult HelloLiteral(CancellationToken cancellationTo try { System.Console.WriteLine("Entering method HelloLiteral."); - ClientResult result = HelloLiteral(cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + ClientResult result = HelloLiteral(cancellationToken.ToRequestOptions()); return ClientResult.FromValue((Thing)result, result.GetRawResponse()); } catch (Exception ex) @@ -765,7 +817,7 @@ public virtual async Task> HelloLiteralAsync(CancellationTok try { System.Console.WriteLine("Entering method HelloLiteralAsync."); - ClientResult result = await HelloLiteralAsync(cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + ClientResult result = await HelloLiteralAsync(cancellationToken.ToRequestOptions()).ConfigureAwait(false); return ClientResult.FromValue((Thing)result, result.GetRawResponse()); } catch (Exception ex) @@ -850,7 +902,7 @@ public virtual ClientResult TopAction(DateTimeOffset action, Cancellation try { System.Console.WriteLine("Entering method TopAction."); - ClientResult result = TopAction(action, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + ClientResult result = TopAction(action, cancellationToken.ToRequestOptions()); return ClientResult.FromValue((Thing)result, result.GetRawResponse()); } catch (Exception ex) @@ -873,7 +925,7 @@ public virtual async Task> TopActionAsync(DateTimeOffset act try { System.Console.WriteLine("Entering method TopActionAsync."); - ClientResult result = await TopActionAsync(action, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + ClientResult result = await TopActionAsync(action, cancellationToken.ToRequestOptions()).ConfigureAwait(false); return ClientResult.FromValue((Thing)result, result.GetRawResponse()); } catch (Exception ex) @@ -1086,22 +1138,13 @@ public virtual async Task AnonymousBodyAsync(BinaryContent content /// body parameter without body decorator. /// name of the Thing. /// required Union. - /// required literal string. /// required nullable string. - /// required literal int. - /// required literal float. - /// required literal bool. /// required nullable literal string. /// description with xml <|endoftext|>. /// required nullable collection. /// /// This tests: - /// - Simple bullet point. This bullet point is going to be very long to test how text wrapping is handled in bullet points within documentation comments. It should properly indent the wrapped lines. - /// - Another bullet point with **bold text**. This bullet point is also intentionally long to see how the formatting is preserved when the text wraps onto multiple lines in the generated documentation. - /// - Third bullet point with *italic text*. Similar to the previous points, this one is extended to ensure that the wrapping and formatting are correctly applied in the output. - /// - Complex bullet point with **bold** and *italic* combined. This bullet point combines both bold and italic formatting and is long enough to test the wrapping behavior in such cases. - /// - **Bold bullet point**: A bullet point that is entirely bolded. This point is also made lengthy to observe how the bold formatting is maintained across wrapped lines. - /// - *Italic bullet point*: A bullet point that is entirely italicized. This final point is extended to verify that italic formatting is correctly applied even when the text spans multiple lines. + /// Simple bullet point. This bullet point is going to be very long to test how text wrapping is handled in bullet points within documentation comments. It should properly indent the wrapped lines.Another bullet point with bold text. This bullet point is also intentionally long to see how the formatting is preserved when the text wraps onto multiple lines in the generated documentation.Third bullet point with italic text. Similar to the previous points, this one is extended to ensure that the wrapping and formatting are correctly applied in the output.Complex bullet point with bold and italic combined. This bullet point combines both bold and italic formatting and is long enough to test the wrapping behavior in such cases.Bold bullet point: A bullet point that is entirely bolded. This point is also made lengthy to observe how the bold formatting is maintained across wrapped lines.Italic bullet point: A bullet point that is entirely italicized. This final point is extended to verify that italic formatting is correctly applied even when the text spans multiple lines. /// /// required optional string. /// optional literal string. @@ -1110,29 +1153,28 @@ public virtual async Task AnonymousBodyAsync(BinaryContent content /// optional literal bool. /// optional nullable collection. /// The cancellation token that can be used to cancel the operation. - /// , , , or is null. + /// , , or is null. /// , or is an empty string, and was expected to be non-empty. /// Service returned a non-success status code. - public virtual ClientResult AnonymousBody(string name, BinaryData requiredUnion, string requiredLiteralString, string requiredNullableString, int requiredLiteralInt, float requiredLiteralFloat, bool requiredLiteralBool, string requiredNullableLiteralString, string requiredBadDescription, IEnumerable requiredNullableList, string propertyWithSpecialDocs, string optionalNullableString = default, string optionalLiteralString = default, int? optionalLiteralInt = default, float? optionalLiteralFloat = default, bool? optionalLiteralBool = default, IEnumerable optionalNullableList = default, CancellationToken cancellationToken = default) + public virtual ClientResult AnonymousBody(string name, BinaryData requiredUnion, string requiredNullableString, ThingRequiredNullableLiteralString1? requiredNullableLiteralString, string requiredBadDescription, IEnumerable requiredNullableList, string propertyWithSpecialDocs, string optionalNullableString = default, ThingOptionalLiteralString? optionalLiteralString = default, ThingOptionalLiteralInt? optionalLiteralInt = default, ThingOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, IEnumerable optionalNullableList = default, CancellationToken cancellationToken = default) { try { System.Console.WriteLine("Entering method AnonymousBody."); Argument.AssertNotNullOrEmpty(name, nameof(name)); Argument.AssertNotNull(requiredUnion, nameof(requiredUnion)); - Argument.AssertNotNull(requiredLiteralString, nameof(requiredLiteralString)); Argument.AssertNotNullOrEmpty(requiredBadDescription, nameof(requiredBadDescription)); Argument.AssertNotNullOrEmpty(propertyWithSpecialDocs, nameof(propertyWithSpecialDocs)); Thing spreadModel = new Thing( name, requiredUnion, - requiredLiteralString, + "accept", requiredNullableString, optionalNullableString, - requiredLiteralInt, - requiredLiteralFloat, - requiredLiteralBool, + 123, + 1.23F, + false, optionalLiteralString, requiredNullableLiteralString, optionalLiteralInt, @@ -1142,8 +1184,8 @@ public virtual ClientResult AnonymousBody(string name, BinaryData require optionalNullableList?.ToList() as IList ?? new ChangeTrackingList(), requiredNullableList?.ToList() as IList ?? new ChangeTrackingList(), propertyWithSpecialDocs, - null); - ClientResult result = AnonymousBody(spreadModel, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + default); + ClientResult result = AnonymousBody(spreadModel, cancellationToken.ToRequestOptions()); return ClientResult.FromValue((Thing)result, result.GetRawResponse()); } catch (Exception ex) @@ -1160,22 +1202,13 @@ public virtual ClientResult AnonymousBody(string name, BinaryData require /// body parameter without body decorator. /// name of the Thing. /// required Union. - /// required literal string. /// required nullable string. - /// required literal int. - /// required literal float. - /// required literal bool. /// required nullable literal string. /// description with xml <|endoftext|>. /// required nullable collection. /// /// This tests: - /// - Simple bullet point. This bullet point is going to be very long to test how text wrapping is handled in bullet points within documentation comments. It should properly indent the wrapped lines. - /// - Another bullet point with **bold text**. This bullet point is also intentionally long to see how the formatting is preserved when the text wraps onto multiple lines in the generated documentation. - /// - Third bullet point with *italic text*. Similar to the previous points, this one is extended to ensure that the wrapping and formatting are correctly applied in the output. - /// - Complex bullet point with **bold** and *italic* combined. This bullet point combines both bold and italic formatting and is long enough to test the wrapping behavior in such cases. - /// - **Bold bullet point**: A bullet point that is entirely bolded. This point is also made lengthy to observe how the bold formatting is maintained across wrapped lines. - /// - *Italic bullet point*: A bullet point that is entirely italicized. This final point is extended to verify that italic formatting is correctly applied even when the text spans multiple lines. + /// Simple bullet point. This bullet point is going to be very long to test how text wrapping is handled in bullet points within documentation comments. It should properly indent the wrapped lines.Another bullet point with bold text. This bullet point is also intentionally long to see how the formatting is preserved when the text wraps onto multiple lines in the generated documentation.Third bullet point with italic text. Similar to the previous points, this one is extended to ensure that the wrapping and formatting are correctly applied in the output.Complex bullet point with bold and italic combined. This bullet point combines both bold and italic formatting and is long enough to test the wrapping behavior in such cases.Bold bullet point: A bullet point that is entirely bolded. This point is also made lengthy to observe how the bold formatting is maintained across wrapped lines.Italic bullet point: A bullet point that is entirely italicized. This final point is extended to verify that italic formatting is correctly applied even when the text spans multiple lines. /// /// required optional string. /// optional literal string. @@ -1184,29 +1217,28 @@ public virtual ClientResult AnonymousBody(string name, BinaryData require /// optional literal bool. /// optional nullable collection. /// The cancellation token that can be used to cancel the operation. - /// , , , or is null. + /// , , or is null. /// , or is an empty string, and was expected to be non-empty. /// Service returned a non-success status code. - public virtual async Task> AnonymousBodyAsync(string name, BinaryData requiredUnion, string requiredLiteralString, string requiredNullableString, int requiredLiteralInt, float requiredLiteralFloat, bool requiredLiteralBool, string requiredNullableLiteralString, string requiredBadDescription, IEnumerable requiredNullableList, string propertyWithSpecialDocs, string optionalNullableString = default, string optionalLiteralString = default, int? optionalLiteralInt = default, float? optionalLiteralFloat = default, bool? optionalLiteralBool = default, IEnumerable optionalNullableList = default, CancellationToken cancellationToken = default) + public virtual async Task> AnonymousBodyAsync(string name, BinaryData requiredUnion, string requiredNullableString, ThingRequiredNullableLiteralString1? requiredNullableLiteralString, string requiredBadDescription, IEnumerable requiredNullableList, string propertyWithSpecialDocs, string optionalNullableString = default, ThingOptionalLiteralString? optionalLiteralString = default, ThingOptionalLiteralInt? optionalLiteralInt = default, ThingOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, IEnumerable optionalNullableList = default, CancellationToken cancellationToken = default) { try { System.Console.WriteLine("Entering method AnonymousBodyAsync."); Argument.AssertNotNullOrEmpty(name, nameof(name)); Argument.AssertNotNull(requiredUnion, nameof(requiredUnion)); - Argument.AssertNotNull(requiredLiteralString, nameof(requiredLiteralString)); Argument.AssertNotNullOrEmpty(requiredBadDescription, nameof(requiredBadDescription)); Argument.AssertNotNullOrEmpty(propertyWithSpecialDocs, nameof(propertyWithSpecialDocs)); Thing spreadModel = new Thing( name, requiredUnion, - requiredLiteralString, + "accept", requiredNullableString, optionalNullableString, - requiredLiteralInt, - requiredLiteralFloat, - requiredLiteralBool, + 123, + 1.23F, + false, optionalLiteralString, requiredNullableLiteralString, optionalLiteralInt, @@ -1216,8 +1248,8 @@ public virtual async Task> AnonymousBodyAsync(string name, B optionalNullableList?.ToList() as IList ?? new ChangeTrackingList(), requiredNullableList?.ToList() as IList ?? new ChangeTrackingList(), propertyWithSpecialDocs, - null); - ClientResult result = await AnonymousBodyAsync(spreadModel, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + default); + ClientResult result = await AnonymousBodyAsync(spreadModel, cancellationToken.ToRequestOptions()).ConfigureAwait(false); return ClientResult.FromValue((Thing)result, result.GetRawResponse()); } catch (Exception ex) @@ -1312,8 +1344,8 @@ public virtual ClientResult FriendlyModel(string name, CancellationToken System.Console.WriteLine("Entering method FriendlyModel."); Argument.AssertNotNullOrEmpty(name, nameof(name)); - Friend spreadModel = new Friend(name, null); - ClientResult result = FriendlyModel(spreadModel, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + Friend spreadModel = new Friend(name, default); + ClientResult result = FriendlyModel(spreadModel, cancellationToken.ToRequestOptions()); return ClientResult.FromValue((Friend)result, result.GetRawResponse()); } catch (Exception ex) @@ -1340,8 +1372,8 @@ public virtual async Task> FriendlyModelAsync(string name, System.Console.WriteLine("Entering method FriendlyModelAsync."); Argument.AssertNotNullOrEmpty(name, nameof(name)); - Friend spreadModel = new Friend(name, null); - ClientResult result = await FriendlyModelAsync(spreadModel, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + Friend spreadModel = new Friend(name, default); + ClientResult result = await FriendlyModelAsync(spreadModel, cancellationToken.ToRequestOptions()).ConfigureAwait(false); return ClientResult.FromValue((Friend)result, result.GetRawResponse()); } catch (Exception ex) @@ -1423,7 +1455,7 @@ public virtual ClientResult AddTimeHeader(CancellationToken cancellationToken = try { System.Console.WriteLine("Entering method AddTimeHeader."); - return AddTimeHeader(cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + return AddTimeHeader(cancellationToken.ToRequestOptions()); } catch (Exception ex) { @@ -1444,7 +1476,7 @@ public virtual async Task AddTimeHeaderAsync(CancellationToken can try { System.Console.WriteLine("Entering method AddTimeHeaderAsync."); - return await AddTimeHeaderAsync(cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + return await AddTimeHeaderAsync(cancellationToken.ToRequestOptions()).ConfigureAwait(false); } catch (Exception ex) { @@ -1538,8 +1570,8 @@ public virtual ClientResult ProjectedNameModel(string otherName, C System.Console.WriteLine("Entering method ProjectedNameModel."); Argument.AssertNotNullOrEmpty(otherName, nameof(otherName)); - RenamedModel spreadModel = new RenamedModel(otherName, null); - ClientResult result = ProjectedNameModel(spreadModel, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + RenamedModel spreadModel = new RenamedModel(otherName, default); + ClientResult result = ProjectedNameModel(spreadModel, cancellationToken.ToRequestOptions()); return ClientResult.FromValue((RenamedModel)result, result.GetRawResponse()); } catch (Exception ex) @@ -1566,8 +1598,8 @@ public virtual async Task> ProjectedNameModelAsync(st System.Console.WriteLine("Entering method ProjectedNameModelAsync."); Argument.AssertNotNullOrEmpty(otherName, nameof(otherName)); - RenamedModel spreadModel = new RenamedModel(otherName, null); - ClientResult result = await ProjectedNameModelAsync(spreadModel, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + RenamedModel spreadModel = new RenamedModel(otherName, default); + ClientResult result = await ProjectedNameModelAsync(spreadModel, cancellationToken.ToRequestOptions()).ConfigureAwait(false); return ClientResult.FromValue((RenamedModel)result, result.GetRawResponse()); } catch (Exception ex) @@ -1649,7 +1681,7 @@ public virtual ClientResult ReturnsAnonymousModel try { System.Console.WriteLine("Entering method ReturnsAnonymousModel."); - ClientResult result = ReturnsAnonymousModel(cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + ClientResult result = ReturnsAnonymousModel(cancellationToken.ToRequestOptions()); return ClientResult.FromValue((ReturnsAnonymousModelResponse)result, result.GetRawResponse()); } catch (Exception ex) @@ -1671,7 +1703,7 @@ public virtual async Task> ReturnsAn try { System.Console.WriteLine("Entering method ReturnsAnonymousModelAsync."); - ClientResult result = await ReturnsAnonymousModelAsync(cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + ClientResult result = await ReturnsAnonymousModelAsync(cancellationToken.ToRequestOptions()).ConfigureAwait(false); return ClientResult.FromValue((ReturnsAnonymousModelResponse)result, result.GetRawResponse()); } catch (Exception ex) @@ -1768,7 +1800,7 @@ public virtual ClientResult GetUnknownValue(string accept, CancellationT System.Console.WriteLine("Entering method GetUnknownValue."); Argument.AssertNotNullOrEmpty(accept, nameof(accept)); - ClientResult result = GetUnknownValue(accept, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + ClientResult result = GetUnknownValue(accept, cancellationToken.ToRequestOptions()); return ClientResult.FromValue(result.GetRawResponse().Content.ToString(), result.GetRawResponse()); } catch (Exception ex) @@ -1795,7 +1827,7 @@ public virtual async Task> GetUnknownValueAsync(string acce System.Console.WriteLine("Entering method GetUnknownValueAsync."); Argument.AssertNotNullOrEmpty(accept, nameof(accept)); - ClientResult result = await GetUnknownValueAsync(accept, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + ClientResult result = await GetUnknownValueAsync(accept, cancellationToken.ToRequestOptions()).ConfigureAwait(false); return ClientResult.FromValue(result.GetRawResponse().Content.ToString(), result.GetRawResponse()); } catch (Exception ex) @@ -1889,7 +1921,7 @@ public virtual ClientResult InternalProtocol(Thing body, CancellationToke System.Console.WriteLine("Entering method InternalProtocol."); Argument.AssertNotNull(body, nameof(body)); - ClientResult result = InternalProtocol(body, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + ClientResult result = InternalProtocol(body, cancellationToken.ToRequestOptions()); return ClientResult.FromValue((Thing)result, result.GetRawResponse()); } catch (Exception ex) @@ -1915,7 +1947,7 @@ public virtual async Task> InternalProtocolAsync(Thing body, System.Console.WriteLine("Entering method InternalProtocolAsync."); Argument.AssertNotNull(body, nameof(body)); - ClientResult result = await InternalProtocolAsync(body, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + ClientResult result = await InternalProtocolAsync(body, cancellationToken.ToRequestOptions()).ConfigureAwait(false); return ClientResult.FromValue((Thing)result, result.GetRawResponse()); } catch (Exception ex) @@ -1997,7 +2029,7 @@ public virtual ClientResult StillConvenient(CancellationToken cancellationToken try { System.Console.WriteLine("Entering method StillConvenient."); - return StillConvenient(cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + return StillConvenient(cancellationToken.ToRequestOptions()); } catch (Exception ex) { @@ -2018,7 +2050,7 @@ public virtual async Task StillConvenientAsync(CancellationToken c try { System.Console.WriteLine("Entering method StillConvenientAsync."); - return await StillConvenientAsync(cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + return await StillConvenientAsync(cancellationToken.ToRequestOptions()).ConfigureAwait(false); } catch (Exception ex) { @@ -2114,7 +2146,7 @@ public virtual ClientResult HeadAsBoolean(string id, CancellationToken cancellat System.Console.WriteLine("Entering method HeadAsBoolean."); Argument.AssertNotNullOrEmpty(id, nameof(id)); - return HeadAsBoolean(id, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + return HeadAsBoolean(id, cancellationToken.ToRequestOptions()); } catch (Exception ex) { @@ -2140,7 +2172,7 @@ public virtual async Task HeadAsBooleanAsync(string id, Cancellati System.Console.WriteLine("Entering method HeadAsBooleanAsync."); Argument.AssertNotNullOrEmpty(id, nameof(id)); - return await HeadAsBooleanAsync(id, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + return await HeadAsBooleanAsync(id, cancellationToken.ToRequestOptions()).ConfigureAwait(false); } catch (Exception ex) { @@ -2236,7 +2268,7 @@ public virtual ClientResult WithApiVersion(string p1, CancellationToken cancella System.Console.WriteLine("Entering method WithApiVersion."); Argument.AssertNotNullOrEmpty(p1, nameof(p1)); - return WithApiVersion(p1, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + return WithApiVersion(p1, cancellationToken.ToRequestOptions()); } catch (Exception ex) { @@ -2262,7 +2294,7 @@ public virtual async Task WithApiVersionAsync(string p1, Cancellat System.Console.WriteLine("Entering method WithApiVersionAsync."); Argument.AssertNotNullOrEmpty(p1, nameof(p1)); - return await WithApiVersionAsync(p1, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + return await WithApiVersionAsync(p1, cancellationToken.ToRequestOptions()).ConfigureAwait(false); } catch (Exception ex) { @@ -2341,7 +2373,7 @@ public virtual CollectionResult GetWithNextLink(CancellationToken cancell try { System.Console.WriteLine("Entering method GetWithNextLink."); - return new SampleTypeSpecClientGetWithNextLinkCollectionResultOfT(this, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + return new SampleTypeSpecClientGetWithNextLinkCollectionResultOfT(this, cancellationToken.ToRequestOptions()); } catch (Exception ex) { @@ -2362,7 +2394,7 @@ public virtual AsyncCollectionResult GetWithNextLinkAsync(CancellationTok try { System.Console.WriteLine("Entering method GetWithNextLinkAsync."); - return new SampleTypeSpecClientGetWithNextLinkAsyncCollectionResultOfT(this, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + return new SampleTypeSpecClientGetWithNextLinkAsyncCollectionResultOfT(this, cancellationToken.ToRequestOptions()); } catch (Exception ex) { @@ -2441,7 +2473,7 @@ public virtual CollectionResult GetWithStringNextLink(CancellationToken c try { System.Console.WriteLine("Entering method GetWithStringNextLink."); - return new SampleTypeSpecClientGetWithStringNextLinkCollectionResultOfT(this, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + return new SampleTypeSpecClientGetWithStringNextLinkCollectionResultOfT(this, cancellationToken.ToRequestOptions()); } catch (Exception ex) { @@ -2462,7 +2494,7 @@ public virtual AsyncCollectionResult GetWithStringNextLinkAsync(Cancellat try { System.Console.WriteLine("Entering method GetWithStringNextLinkAsync."); - return new SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResultOfT(this, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + return new SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResultOfT(this, cancellationToken.ToRequestOptions()); } catch (Exception ex) { @@ -2544,7 +2576,7 @@ public virtual CollectionResult GetWithContinuationToken(string token = d try { System.Console.WriteLine("Entering method GetWithContinuationToken."); - return new SampleTypeSpecClientGetWithContinuationTokenCollectionResultOfT(this, token, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + return new SampleTypeSpecClientGetWithContinuationTokenCollectionResultOfT(this, token, cancellationToken.ToRequestOptions()); } catch (Exception ex) { @@ -2566,7 +2598,7 @@ public virtual AsyncCollectionResult GetWithContinuationTokenAsync(string try { System.Console.WriteLine("Entering method GetWithContinuationTokenAsync."); - return new SampleTypeSpecClientGetWithContinuationTokenAsyncCollectionResultOfT(this, token, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + return new SampleTypeSpecClientGetWithContinuationTokenAsyncCollectionResultOfT(this, token, cancellationToken.ToRequestOptions()); } catch (Exception ex) { @@ -2648,7 +2680,7 @@ public virtual CollectionResult GetWithContinuationTokenHeaderResponse(st try { System.Console.WriteLine("Entering method GetWithContinuationTokenHeaderResponse."); - return new SampleTypeSpecClientGetWithContinuationTokenHeaderResponseCollectionResultOfT(this, token, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + return new SampleTypeSpecClientGetWithContinuationTokenHeaderResponseCollectionResultOfT(this, token, cancellationToken.ToRequestOptions()); } catch (Exception ex) { @@ -2670,7 +2702,7 @@ public virtual AsyncCollectionResult GetWithContinuationTokenHeaderRespon try { System.Console.WriteLine("Entering method GetWithContinuationTokenHeaderResponseAsync."); - return new SampleTypeSpecClientGetWithContinuationTokenHeaderResponseAsyncCollectionResultOfT(this, token, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + return new SampleTypeSpecClientGetWithContinuationTokenHeaderResponseAsyncCollectionResultOfT(this, token, cancellationToken.ToRequestOptions()); } catch (Exception ex) { @@ -2749,7 +2781,7 @@ public virtual CollectionResult GetWithPaging(CancellationToken cancellat try { System.Console.WriteLine("Entering method GetWithPaging."); - return new SampleTypeSpecClientGetWithPagingCollectionResultOfT(this, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + return new SampleTypeSpecClientGetWithPagingCollectionResultOfT(this, cancellationToken.ToRequestOptions()); } catch (Exception ex) { @@ -2770,7 +2802,7 @@ public virtual AsyncCollectionResult GetWithPagingAsync(CancellationToken try { System.Console.WriteLine("Entering method GetWithPagingAsync."); - return new SampleTypeSpecClientGetWithPagingAsyncCollectionResultOfT(this, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + return new SampleTypeSpecClientGetWithPagingAsyncCollectionResultOfT(this, cancellationToken.ToRequestOptions()); } catch (Exception ex) { @@ -2877,7 +2909,7 @@ public virtual ClientResult EmbeddedParameters(ModelWithEmbeddedNonBodyParameter System.Console.WriteLine("Entering method EmbeddedParameters."); Argument.AssertNotNull(body, nameof(body)); - return EmbeddedParameters(body.RequiredHeader, body.RequiredQuery, body, body.OptionalHeader, body.OptionalQuery, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + return EmbeddedParameters(body.RequiredHeader, body.RequiredQuery, body, body.OptionalHeader, body.OptionalQuery, cancellationToken.ToRequestOptions()); } catch (Exception ex) { @@ -2902,7 +2934,7 @@ public virtual async Task EmbeddedParametersAsync(ModelWithEmbedde System.Console.WriteLine("Entering method EmbeddedParametersAsync."); Argument.AssertNotNull(body, nameof(body)); - return await EmbeddedParametersAsync(body.RequiredHeader, body.RequiredQuery, body, body.OptionalHeader, body.OptionalQuery, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + return await EmbeddedParametersAsync(body.RequiredHeader, body.RequiredQuery, body, body.OptionalHeader, body.OptionalQuery, cancellationToken.ToRequestOptions()).ConfigureAwait(false); } catch (Exception ex) { @@ -2995,7 +3027,7 @@ public virtual ClientResult DynamicModelOperation(DynamicModel body, Cancellatio System.Console.WriteLine("Entering method DynamicModelOperation."); Argument.AssertNotNull(body, nameof(body)); - return DynamicModelOperation(body, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); + return DynamicModelOperation(body, cancellationToken.ToRequestOptions()); } catch (Exception ex) { @@ -3020,7 +3052,7 @@ public virtual async Task DynamicModelOperationAsync(DynamicModel System.Console.WriteLine("Entering method DynamicModelOperationAsync."); Argument.AssertNotNull(body, nameof(body)); - return await DynamicModelOperationAsync(body, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); + return await DynamicModelOperationAsync(body, cancellationToken.ToRequestOptions()).ConfigureAwait(false); } catch (Exception ex) { @@ -3033,6 +3065,230 @@ public virtual async Task DynamicModelOperationAsync(DynamicModel } } + /// + /// [Protocol Method] Get an advanced XML model with various property types + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual ClientResult GetXmlAdvancedModel(RequestOptions options) + { + try + { + System.Console.WriteLine("Entering method GetXmlAdvancedModel."); + using PipelineMessage message = CreateGetXmlAdvancedModelRequest(options); + return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method GetXmlAdvancedModel: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method GetXmlAdvancedModel."); + } + } + + /// + /// [Protocol Method] Get an advanced XML model with various property types + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual async Task GetXmlAdvancedModelAsync(RequestOptions options) + { + try + { + System.Console.WriteLine("Entering method GetXmlAdvancedModelAsync."); + using PipelineMessage message = CreateGetXmlAdvancedModelRequest(options); + return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method GetXmlAdvancedModelAsync: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method GetXmlAdvancedModelAsync."); + } + } + + /// Get an advanced XML model with various property types. + /// The cancellation token that can be used to cancel the operation. + /// Service returned a non-success status code. + public virtual ClientResult GetXmlAdvancedModel(CancellationToken cancellationToken = default) + { + try + { + System.Console.WriteLine("Entering method GetXmlAdvancedModel."); + ClientResult result = GetXmlAdvancedModel(cancellationToken.ToRequestOptions()); + return ClientResult.FromValue((XmlAdvancedModel)result, result.GetRawResponse()); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method GetXmlAdvancedModel: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method GetXmlAdvancedModel."); + } + } + + /// Get an advanced XML model with various property types. + /// The cancellation token that can be used to cancel the operation. + /// Service returned a non-success status code. + public virtual async Task> GetXmlAdvancedModelAsync(CancellationToken cancellationToken = default) + { + try + { + System.Console.WriteLine("Entering method GetXmlAdvancedModelAsync."); + ClientResult result = await GetXmlAdvancedModelAsync(cancellationToken.ToRequestOptions()).ConfigureAwait(false); + return ClientResult.FromValue((XmlAdvancedModel)result, result.GetRawResponse()); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method GetXmlAdvancedModelAsync: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method GetXmlAdvancedModelAsync."); + } + } + + /// + /// [Protocol Method] Update an advanced XML model with various property types + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The content to send as the body of the request. + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// is null. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual ClientResult UpdateXmlAdvancedModel(BinaryContent content, RequestOptions options = null) + { + try + { + System.Console.WriteLine("Entering method UpdateXmlAdvancedModel."); + Argument.AssertNotNull(content, nameof(content)); + + using PipelineMessage message = CreateUpdateXmlAdvancedModelRequest(content, options); + return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method UpdateXmlAdvancedModel: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method UpdateXmlAdvancedModel."); + } + } + + /// + /// [Protocol Method] Update an advanced XML model with various property types + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The content to send as the body of the request. + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// is null. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual async Task UpdateXmlAdvancedModelAsync(BinaryContent content, RequestOptions options = null) + { + try + { + System.Console.WriteLine("Entering method UpdateXmlAdvancedModelAsync."); + Argument.AssertNotNull(content, nameof(content)); + + using PipelineMessage message = CreateUpdateXmlAdvancedModelRequest(content, options); + return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method UpdateXmlAdvancedModelAsync: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method UpdateXmlAdvancedModelAsync."); + } + } + + /// Update an advanced XML model with various property types. + /// + /// The cancellation token that can be used to cancel the operation. + /// is null. + /// Service returned a non-success status code. + public virtual ClientResult UpdateXmlAdvancedModel(XmlAdvancedModel body, CancellationToken cancellationToken = default) + { + try + { + System.Console.WriteLine("Entering method UpdateXmlAdvancedModel."); + Argument.AssertNotNull(body, nameof(body)); + + ClientResult result = UpdateXmlAdvancedModel(body, cancellationToken.ToRequestOptions()); + return ClientResult.FromValue((XmlAdvancedModel)result, result.GetRawResponse()); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method UpdateXmlAdvancedModel: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method UpdateXmlAdvancedModel."); + } + } + + /// Update an advanced XML model with various property types. + /// + /// The cancellation token that can be used to cancel the operation. + /// is null. + /// Service returned a non-success status code. + public virtual async Task> UpdateXmlAdvancedModelAsync(XmlAdvancedModel body, CancellationToken cancellationToken = default) + { + try + { + System.Console.WriteLine("Entering method UpdateXmlAdvancedModelAsync."); + Argument.AssertNotNull(body, nameof(body)); + + ClientResult result = await UpdateXmlAdvancedModelAsync(body, cancellationToken.ToRequestOptions()).ConfigureAwait(false); + return ClientResult.FromValue((XmlAdvancedModel)result, result.GetRawResponse()); + } + catch (Exception ex) + { + System.Console.WriteLine($"An exception was thrown in method UpdateXmlAdvancedModelAsync: {ex}"); + throw; + } + finally + { + System.Console.WriteLine("Exiting method UpdateXmlAdvancedModelAsync."); + } + } + /// Initializes a new instance of AnimalOperations. public virtual AnimalOperations GetAnimalOperationsClient() { @@ -3051,10 +3307,20 @@ public virtual DogOperations GetDogOperationsClient() return Volatile.Read(ref _cachedDogOperations) ?? Interlocked.CompareExchange(ref _cachedDogOperations, new DogOperations(Pipeline, _endpoint), null) ?? _cachedDogOperations; } + /// Initializes a new instance of PlantOperations. + public virtual PlantOperations GetPlantOperationsClient() + { + return Volatile.Read(ref _cachedPlantOperations) ?? Interlocked.CompareExchange(ref _cachedPlantOperations, new PlantOperations(Pipeline, _endpoint), null) ?? _cachedPlantOperations; + } + /// Initializes a new instance of Metrics. - public virtual Metrics GetMetricsClient() + /// + /// is null. + public virtual Metrics GetMetricsClient(string metricsNamespace) { - return Volatile.Read(ref _cachedMetrics) ?? Interlocked.CompareExchange(ref _cachedMetrics, new Metrics(Pipeline, _endpoint), null) ?? _cachedMetrics; + Argument.AssertNotNull(metricsNamespace, nameof(metricsNamespace)); + + return new Metrics(Pipeline, _endpoint, metricsNamespace); } } } diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecModelFactory.cs b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecModelFactory.cs index ff9639bb364..2a5ccb5a8e4 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecModelFactory.cs +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/Generated/SampleTypeSpecModelFactory.cs @@ -14,12 +14,8 @@ public static partial class SampleTypeSpecModelFactory /// A model with a few properties of literal types. /// name of the Thing. /// required Union. - /// required literal string. /// required nullable string. /// required optional string. - /// required literal int. - /// required literal float. - /// required literal bool. /// optional literal string. /// required nullable literal string. /// optional literal int. @@ -30,15 +26,10 @@ public static partial class SampleTypeSpecModelFactory /// required nullable collection. /// /// This tests: - /// - Simple bullet point. This bullet point is going to be very long to test how text wrapping is handled in bullet points within documentation comments. It should properly indent the wrapped lines. - /// - Another bullet point with **bold text**. This bullet point is also intentionally long to see how the formatting is preserved when the text wraps onto multiple lines in the generated documentation. - /// - Third bullet point with *italic text*. Similar to the previous points, this one is extended to ensure that the wrapping and formatting are correctly applied in the output. - /// - Complex bullet point with **bold** and *italic* combined. This bullet point combines both bold and italic formatting and is long enough to test the wrapping behavior in such cases. - /// - **Bold bullet point**: A bullet point that is entirely bolded. This point is also made lengthy to observe how the bold formatting is maintained across wrapped lines. - /// - *Italic bullet point*: A bullet point that is entirely italicized. This final point is extended to verify that italic formatting is correctly applied even when the text spans multiple lines. + /// Simple bullet point. This bullet point is going to be very long to test how text wrapping is handled in bullet points within documentation comments. It should properly indent the wrapped lines.Another bullet point with bold text. This bullet point is also intentionally long to see how the formatting is preserved when the text wraps onto multiple lines in the generated documentation.Third bullet point with italic text. Similar to the previous points, this one is extended to ensure that the wrapping and formatting are correctly applied in the output.Complex bullet point with bold and italic combined. This bullet point combines both bold and italic formatting and is long enough to test the wrapping behavior in such cases.Bold bullet point: A bullet point that is entirely bolded. This point is also made lengthy to observe how the bold formatting is maintained across wrapped lines.Italic bullet point: A bullet point that is entirely italicized. This final point is extended to verify that italic formatting is correctly applied even when the text spans multiple lines. /// /// A new instance for mocking. - public static Thing Thing(string name = default, BinaryData requiredUnion = default, string requiredLiteralString = default, string requiredNullableString = default, string optionalNullableString = default, int requiredLiteralInt = default, float requiredLiteralFloat = default, bool requiredLiteralBool = default, string optionalLiteralString = default, string requiredNullableLiteralString = default, int? optionalLiteralInt = default, float? optionalLiteralFloat = default, bool? optionalLiteralBool = default, string requiredBadDescription = default, IEnumerable optionalNullableList = default, IEnumerable requiredNullableList = default, string propertyWithSpecialDocs = default) + public static Thing Thing(string name = default, BinaryData requiredUnion = default, string requiredNullableString = default, string optionalNullableString = default, ThingOptionalLiteralString? optionalLiteralString = default, ThingRequiredNullableLiteralString1? requiredNullableLiteralString = default, ThingOptionalLiteralInt? optionalLiteralInt = default, ThingOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, string requiredBadDescription = default, IEnumerable optionalNullableList = default, IEnumerable requiredNullableList = default, string propertyWithSpecialDocs = default) { optionalNullableList ??= new ChangeTrackingList(); requiredNullableList ??= new ChangeTrackingList(); @@ -46,12 +37,12 @@ public static Thing Thing(string name = default, BinaryData requiredUnion = defa return new Thing( name, requiredUnion, - requiredLiteralString, + "accept", requiredNullableString, optionalNullableString, - requiredLiteralInt, - requiredLiteralFloat, - requiredLiteralBool, + 123, + 1.23F, + false, optionalLiteralString, requiredNullableLiteralString, optionalLiteralInt, @@ -141,6 +132,16 @@ public static ModelWithRequiredNullableProperties ModelWithRequiredNullablePrope return new ModelWithRequiredNullableProperties(requiredNullablePrimitive, requiredExtensibleEnum, requiredFixedEnum, additionalBinaryDataProperties: null); } + /// The Wrapper. + /// header parameter. + /// body parameter. + /// path parameter. + /// A new instance for mocking. + public static Wrapper Wrapper(string p1 = default, RoundTripModel action = default, string p2 = default) + { + return new Wrapper(p1, action, p2, additionalBinaryDataProperties: null); + } + /// this is not a friendly model but with a friendly name. /// name of the NotFriend. /// A new instance for mocking. @@ -229,7 +230,7 @@ public static DynamicModel DynamicModel(string name = default, BinaryData option dictionaryOfDictionaryFoo, dictionaryListFoo, listOfDictionaryFoo.ToList(), - additionalBinaryDataProperties: null); + default); } /// Another sample dynamic model. @@ -237,12 +238,143 @@ public static DynamicModel DynamicModel(string name = default, BinaryData option /// A new instance for mocking. public static AnotherDynamicModel AnotherDynamicModel(string bar = default) { - return new AnotherDynamicModel(bar, additionalBinaryDataProperties: null); + return new AnotherDynamicModel(bar, default); + } + + /// An advanced XML model for testing various property types and XML features. + /// A simple string property. + /// An integer property. + /// A boolean property. + /// A float property. + /// An optional string. + /// An optional integer. + /// A nullable string. + /// A string as XML attribute. + /// An integer as XML attribute. + /// A boolean as XML attribute. + /// A property with a custom XML element name. + /// An attribute with a custom XML name. + /// Text content in the element (unwrapped string). + /// An unwrapped array of strings - items appear directly without wrapper. + /// An unwrapped array of integers. + /// An unwrapped array of models. + /// A wrapped array of strings (default). + /// A wrapped array with custom wrapper name. + /// A nested model property. + /// An optional nested model. + /// A dictionary property. + /// A date-time property. + /// A duration property. + /// A bytes property. + /// optional record of unknown. + /// A fixed enum property. + /// An extensible enum property. + /// An optional fixed enum property. + /// An optional extensible enum property. + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// A new instance for mocking. + public static XmlAdvancedModel XmlAdvancedModel(string name = default, int age = default, bool enabled = default, float score = default, string optionalString = default, int? optionalInt = default, string nullableString = default, string id = default, int version = default, bool isActive = default, string originalName = default, string xmlIdentifier = default, string content = default, IEnumerable unwrappedStrings = default, IEnumerable unwrappedCounts = default, IEnumerable unwrappedItems = default, IEnumerable wrappedColors = default, IEnumerable items = default, XmlNestedModel nestedModel = default, XmlNestedModel optionalNestedModel = default, IDictionary metadata = default, DateTimeOffset createdAt = default, TimeSpan duration = default, BinaryData data = default, IDictionary optionalRecordUnknown = default, StringFixedEnum fixedEnum = default, StringExtensibleEnum extensibleEnum = default, IntFixedEnum? optionalFixedEnum = default, IntExtensibleEnum? optionalExtensibleEnum = default, string label = default, int daysUsed = default, IEnumerable fooItems = default, XmlNestedModel anotherModel = default, IEnumerable modelsWithNamespaces = default, IEnumerable unwrappedModelsWithNamespaces = default, IEnumerable> listOfListFoo = default, IDictionary dictionaryFoo = default, IDictionary> dictionaryOfDictionaryFoo = default, IDictionary> dictionaryListFoo = default, IEnumerable> listOfDictionaryFoo = default) + { + unwrappedStrings ??= new ChangeTrackingList(); + unwrappedCounts ??= new ChangeTrackingList(); + unwrappedItems ??= new ChangeTrackingList(); + wrappedColors ??= new ChangeTrackingList(); + items ??= new ChangeTrackingList(); + metadata ??= new ChangeTrackingDictionary(); + optionalRecordUnknown ??= new ChangeTrackingDictionary(); + fooItems ??= new ChangeTrackingList(); + modelsWithNamespaces ??= new ChangeTrackingList(); + unwrappedModelsWithNamespaces ??= new ChangeTrackingList(); + listOfListFoo ??= new ChangeTrackingList>(); + dictionaryFoo ??= new ChangeTrackingDictionary(); + dictionaryOfDictionaryFoo ??= new ChangeTrackingDictionary>(); + dictionaryListFoo ??= new ChangeTrackingDictionary>(); + listOfDictionaryFoo ??= new ChangeTrackingList>(); + + return new XmlAdvancedModel( + name, + age, + enabled, + score, + optionalString, + optionalInt, + nullableString, + id, + version, + isActive, + originalName, + xmlIdentifier, + content, + unwrappedStrings.ToList(), + unwrappedCounts.ToList(), + unwrappedItems.ToList(), + wrappedColors.ToList(), + items.ToList(), + nestedModel, + optionalNestedModel, + metadata, + createdAt, + duration, + data, + optionalRecordUnknown, + fixedEnum, + extensibleEnum, + optionalFixedEnum, + optionalExtensibleEnum, + label, + daysUsed, + fooItems.ToList(), + anotherModel, + modelsWithNamespaces.ToList(), + unwrappedModelsWithNamespaces.ToList(), + listOfListFoo.ToList(), + dictionaryFoo, + dictionaryOfDictionaryFoo, + dictionaryListFoo, + listOfDictionaryFoo.ToList(), + additionalBinaryDataProperties: null); + } + + /// An item model for XML array testing. + /// The item name. + /// The item value. + /// Item ID as attribute. + /// A new instance for mocking. + public static XmlItem XmlItem(string itemName = default, int itemValue = default, string itemId = default) + { + return new XmlItem(itemName, itemValue, itemId, additionalBinaryDataProperties: null); + } + + /// A nested model for XML testing. + /// The value of the nested model. + /// An attribute on the nested model. + /// A new instance for mocking. + public static XmlNestedModel XmlNestedModel(string value = default, int nestedId = default) + { + return new XmlNestedModel(value, nestedId, additionalBinaryDataProperties: null); + } + + /// The XmlModelWithNamespace. + /// + /// A new instance for mocking. + public static XmlModelWithNamespace XmlModelWithNamespace(string foo = default) + { + return new XmlModelWithNamespace(foo, additionalBinaryDataProperties: null); } /// /// Base animal with discriminator - /// Please note this is the abstract base class. The derived classes available for instantiation are: and . + /// Please note this is the abstract base class. The derived classes available for instantiation are: and . /// /// The kind of animal. /// Name of the animal. @@ -271,6 +403,29 @@ public static Dog Dog(string name = default, bool trained = default, string bree return new Dog("pet", name, additionalBinaryDataProperties: null, trained, breed); } + /// Tree is a specific type of plant. + /// The unique identifier of the plant. + /// The height of the plant in centimeters. + /// The age of the tree in years. + /// A new instance for mocking. + public static Tree Tree(string id = default, int height = default, int age = default) + { + return new Tree("tree", id, height, additionalBinaryDataProperties: null, age); + } + + /// + /// Base plant with discriminator + /// Please note this is the abstract base class. The derived classes available for instantiation are: . + /// + /// The species of plant. + /// The unique identifier of the plant. + /// The height of the plant in centimeters. + /// A new instance for mocking. + public static Plant Plant(string species = default, string id = default, int height = default) + { + return new UnknownPlant(species, id, height, additionalBinaryDataProperties: null); + } + /// The GetWidgetMetricsResponse. /// /// diff --git a/docs/samples/client/csharp/SampleService/SampleClient/src/SampleTypeSpec.csproj b/docs/samples/client/csharp/SampleService/SampleClient/src/SampleTypeSpec.csproj index f7f2c985822..8394941192f 100644 --- a/docs/samples/client/csharp/SampleService/SampleClient/src/SampleTypeSpec.csproj +++ b/docs/samples/client/csharp/SampleService/SampleClient/src/SampleTypeSpec.csproj @@ -4,12 +4,12 @@ SDK Code Generation SampleTypeSpec 1.0.0-beta.1 SampleTypeSpec - netstandard2.0;net8.0 + net10.0 latest true - + diff --git a/docs/samples/client/csharp/SampleService/main.tsp b/docs/samples/client/csharp/SampleService/main.tsp index e93467b99b1..037630d1073 100644 --- a/docs/samples/client/csharp/SampleService/main.tsp +++ b/docs/samples/client/csharp/SampleService/main.tsp @@ -1,595 +1 @@ -import "@typespec/rest"; -import "@typespec/http"; -import "@typespec/http-client-csharp"; -import "@azure-tools/typespec-client-generator-core"; -import "@azure-tools/typespec-azure-core"; - -@versioned(Versions) -@service(#{ title: "hello world" }) -@doc("This is a sample typespec project.") -@server( - "{sampleTypeSpecUrl}", - "Endpoint Service", - { - sampleTypeSpecUrl: url, - } -) -@useAuth(ApiKeyAuth | SampleOAuth2) -namespace SampleTypeSpec; - -using TypeSpec.Http; -using TypeSpec.Versioning; -using TypeSpec.HttpClient.CSharp; -using Azure.ClientGenerator.Core; - -alias SampleOAuth2 = OAuth2Auth<[ - { - type: OAuth2FlowType.implicit; - authorizationUrl: "https://api.example.com/oauth2/authorize"; - refreshUrl: "https://api.example.com/oauth2/refresh"; - scopes: ["read"]; - } -]>; - -enum Versions { - `2024-07-16-preview`, - `2024-08-16-preview`, -} - -@doc("float fixed enum") -enum FloatFixedEnumWithIntValue { - One: 1.0, - Two: 2.0, - Four: 4.0, -} - -@doc("float fixed enum") -enum FloatFixedEnum { - OneDotOne: 1.1, - TwoDotTwo: 2.2, - FourDotFour: 4.4, -} - -@doc("int fixed enum") -enum IntFixedEnum { - One: 1, - Two: 2, - Four: 4, -} - -@doc("Simple enum") -enum StringFixedEnum { - One: "1", - Two: "2", - Four: "4", -} - -@doc("Int based extensible enum") -union IntExtensibleEnum { - int32, - One: 1, - Two: 2, - Four: 4, -} - -@doc("Float based extensible enum") -union FloatExtensibleEnum { - float32, - OneDotOne: 1.1, - TwoDotTwo: 2.2, - FourDotFour: 4.4, -} - -@doc("float fixed enum") -union FloatExtensibleEnumWithIntValue { - float32, - One: 1.0, - Two: 2.0, - Four: 4.0, -} - -@doc("Extensible enum") -union StringExtensibleEnum { - string, - One: "1", - Two: "2", - Four: "4", -} - -@doc("A model with a few properties of literal types") -model Thing { - @doc("name of the Thing") - name: string; - - @doc("required Union") - requiredUnion: string | string[] | int32; - - @doc("required literal string") - requiredLiteralString: "accept"; - - @doc("required nullable string") - requiredNullableString: string | null; - - @doc("required optional string") - optionalNullableString?: string | null; - - @doc("required literal int") - requiredLiteralInt: 123; - - @doc("required literal float") - requiredLiteralFloat: 1.23; - - @doc("required literal bool") - requiredLiteralBool: false; - - @doc("optional literal string") - optionalLiteralString?: "reject"; - - @doc("required nullable literal string") - requiredNullableLiteralString: "someValue" | null; - - @doc("optional literal int") - optionalLiteralInt?: 456; - - @doc("optional literal float") - optionalLiteralFloat?: 4.56; - - @doc("optional literal bool") - optionalLiteralBool?: true; - - @doc("description with xml <|endoftext|>") - requiredBadDescription: string; - - @doc("optional nullable collection") - optionalNullableList?: int32[] | null; - - @doc("required nullable collection") - requiredNullableList: int32[] | null; - - /** - * This tests: - * - Simple bullet point. This bullet point is going to be very long to test how text wrapping is handled in bullet points within documentation comments. It should properly indent the wrapped lines. - * - Another bullet point with **bold text**. This bullet point is also intentionally long to see how the formatting is preserved when the text wraps onto multiple lines in the generated documentation. - * - Third bullet point with *italic text*. Similar to the previous points, this one is extended to ensure that the wrapping and formatting are correctly applied in the output. - * - Complex bullet point with **bold** and *italic* combined. This bullet point combines both bold and italic formatting and is long enough to test the wrapping behavior in such cases. - * - **Bold bullet point**: A bullet point that is entirely bolded. This point is also made lengthy to observe how the bold formatting is maintained across wrapped lines. - * - *Italic bullet point*: A bullet point that is entirely italicized. This final point is extended to verify that italic formatting is correctly applied even when the text spans multiple lines. - */ - propertyWithSpecialDocs: string; -} - -@doc("A model with a few required nullable properties") -model ModelWithRequiredNullableProperties { - @doc("required nullable primitive type") - requiredNullablePrimitive: int32 | null; - - @doc("required nullable extensible enum type") - requiredExtensibleEnum: StringExtensibleEnum | null; - - @doc("required nullable fixed enum type") - requiredFixedEnum: StringFixedEnum | null; -} - -@doc("this is not a friendly model but with a friendly name") -@friendlyName("Friend") -model NotFriend { - @doc("name of the NotFriend") - name: string; -} - -@doc("this is a model with a client name") -@clientName("RenamedModel") -model ModelWithClientName { - @doc("name of the ModelWithClientName") - otherName: string; -} - -model ModelWithEmbeddedNonBodyParameters { - @doc("name of the ModelWithEmbeddedNonBodyParameters") - name: string; - - @doc("required header parameter") - @header - requiredHeader: string; - - @doc("optional header parameter") - @header - optionalHeader?: string; - - @doc("required query parameter") - @query - requiredQuery: string; - - @doc("optional query parameter") - @query - optionalQuery?: string; -} - -@doc("this is a roundtrip model") -model RoundTripModel { - @doc("Required string, illustrating a reference type property.") - requiredString: string; - - @doc("Required int, illustrating a value type property.") - @encode(string) - requiredInt: int32; - - @doc("Required collection of enums") - requiredCollection: StringFixedEnum[]; - - @doc("Required dictionary of enums") - requiredDictionary: Record; - - @doc("Required model") - requiredModel: Thing; - - @doc("this is an int based extensible enum") - intExtensibleEnum?: IntExtensibleEnum; - - @doc("this is a collection of int based extensible enum") - intExtensibleEnumCollection?: IntExtensibleEnum[]; - - @doc("this is a float based extensible enum") - floatExtensibleEnum?: FloatExtensibleEnum; - - @doc("this is a float based extensible enum") - floatExtensibleEnumWithIntValue?: FloatExtensibleEnumWithIntValue; - - @doc("this is a collection of float based extensible enum") - floatExtensibleEnumCollection?: FloatExtensibleEnum[]; - - @doc("this is a float based fixed enum") - floatFixedEnum?: FloatFixedEnum; - - @doc("this is a float based fixed enum") - floatFixedEnumWithIntValue?: FloatFixedEnumWithIntValue; - - @doc("this is a collection of float based fixed enum") - floatFixedEnumCollection?: FloatFixedEnum[]; - - @doc("this is a int based fixed enum") - intFixedEnum?: IntFixedEnum; - - @doc("this is a collection of int based fixed enum") - intFixedEnumCollection?: IntFixedEnum[]; - - @doc("this is a string based fixed enum") - stringFixedEnum?: StringFixedEnum; - - @doc("required unknown") - requiredUnknown: unknown; - - @doc("optional unknown") - optionalUnknown?: unknown; - - @doc("required record of unknown") - requiredRecordUnknown: Record; - - @doc("optional record of unknown") - optionalRecordUnknown?: Record; - - @doc("required readonly record of unknown") - @visibility(Lifecycle.Read) - readOnlyRequiredRecordUnknown: Record; - - @doc("optional readonly record of unknown") - @visibility(Lifecycle.Read) - readOnlyOptionalRecordUnknown?: Record; - - @doc("this is a model with required nullable properties") - modelWithRequiredNullable: ModelWithRequiredNullableProperties; - - @doc("Required bytes") - requiredBytes: bytes; -} - -@doc("A sample dynamic model.") -@dynamicModel -model DynamicModel { - name: string; - optionalUnknown?: unknown; - optionalInt?: int32; - optionalNullableList?: int32[] | null; - requiredNullableList: int32[] | null; - optionalNullableDictionary?: Record | null; - requiredNullableDictionary: Record | null; - primitiveDictionary: Record; - foo: AnotherDynamicModel; - listFoo: AnotherDynamicModel[]; - listOfListFoo: AnotherDynamicModel[][]; - dictionaryFoo: Record; - dictionaryOfDictionaryFoo: Record>; - dictionaryListFoo: Record; - listOfDictionaryFoo: Record[]; -} - -@doc("Another sample dynamic model.") -@dynamicModel -model AnotherDynamicModel { - bar: string; -} - -union DaysOfWeekExtensibleEnum { - string, - Monday: "Monday", - Tuesday: "Tuesday", - Wednesday: "Wednesday", - Thursday: "Thursday", - Friday: "Friday", - Saturday: "Saturday", - Sunday: "Sunday", -} - -@route("/hello") -@doc("Return hi") -@get -op sayHi( - @header headParameter: string, - @query queryParameter: string, - @query optionalQuery?: string, -): Thing; - -@route("/againHi") -@doc("Return hi again") -@get -@convenientAPI(true) -op helloAgain( - @header p1: string, - @body action: RoundTripModel, - @header contentType: "text/plain", - @path p2: string, -): RoundTripModel; - -@route("/noContentType") -@doc("Return hi again") -@get -@convenientAPI(false) -op noContentType( - @header p1: string, - @body action: RoundTripModel, - @path p2: string, -): RoundTripModel; - -@route("/demoHi") -@doc("Return hi in demo2") -@get -@convenientAPI(true) -op helloDemo2(): Thing; - -@route("/literal") -@doc("Create with literal value") -@post -@convenientAPI(true) -op createLiteral(@body body: Thing): Thing; - -@route("/helloLiteral") -@doc("Send literal parameters") -@get -@convenientAPI(true) -op helloLiteral(@header p1: "test", @path p2: 123, @query p3: true): Thing; - -@route("/top") -@doc("top level method") -@get -@convenientAPI(true) -op topAction(@path action: utcDateTime): Thing; - -@route("/top2") -@doc("top level method2") -@get -@convenientAPI(false) -op topAction2(): Thing; - -@route("/patch") -@doc("top level patch") -@patch -@convenientAPI(true) -op patchAction(@body body: Thing): Thing; - -@route("/anonymousBody") -@doc("body parameter without body decorator") -@post -@convenientAPI(true) -op anonymousBody( - ...Thing, - @query requiredQueryParam: "someRequiredLiteralQueryParam", - @header requiredHeader: "someRequiredLiteralHeader", -): Thing; - -@route("/friendlyName") -@doc("Model can have its friendly name") -@post -@convenientAPI(true) -op friendlyModel(...NotFriend): NotFriend; - -op addTimeHeader(@header("Repeatability-First-Sent") repeatabilityFirstSent?: utcDateTime): void; - -@route("/projectedName") -@doc("Model can have its projected name") -@post -@convenientAPI(true) -op projectedNameModel(...ModelWithClientName): ModelWithClientName; - -@route("/returnsAnonymousModel") -@doc("return anonymous model") -@post -@convenientAPI(true) -op returnsAnonymousModel(): { - @body body: {}; -}; - -@get -@route("/unknown-value") -@doc("get extensible enum") -op getUnknownValue(): DaysOfWeekExtensibleEnum; - -@doc("When set protocol false and convenient true, then the protocol method should be internal") -@route("internalProtocol") -@post -@convenientAPI(true) -@protocolAPI(false) -op internalProtocol(@body body: Thing): Thing; - -@doc("When set protocol false and convenient true, the convenient method should be generated even it has the same signature as protocol one") -@route("stillConvenient") -@get -@convenientAPI(true) -@protocolAPI(false) -op stillConvenient(): void; - -@route("/headAsBoolean") -@doc("head as boolean.") -@head -@convenientAPI(true) -op headAsBoolean(@path id: string): void; - -@route("/WithApiVersion") -@doc("Return hi again") -@get -@convenientAPI(true) -op WithApiVersion(@header p1: string, @query apiVersion: string): void; - -@route("/link") -@doc("List things with nextlink") -@convenientAPI(true) -@list -op ListWithNextLink(): { - @pageItems - things: Thing[]; - - @nextLink next?: url; -}; - -@route("/linkString") -@doc("List things with nextlink") -@convenientAPI(true) -@list -op ListWithStringNextLink(): { - @pageItems - things: Thing[]; - - @nextLink next?: string; -}; - -@route("/continuation") -@doc("List things with continuation token") -@convenientAPI(true) -@list -op ListWithContinuationToken(@query @continuationToken token?: string): { - @pageItems - things: Thing[]; - - @continuationToken nextToken?: string; -}; - -@route("/continuation/header") -@doc("List things with continuation token header response") -@convenientAPI(true) -@list -op ListWithContinuationTokenHeaderResponse(@query @continuationToken token?: string): { - @pageItems - things: Thing[]; - - @header @continuationToken nextToken?: string; -}; - -model Page { - @pageItems items: T[]; -} - -@route("list/paging") -@doc("List things with paging") -@convenientAPI(true) -@list -op ListWithPaging(): Page; - -@route("embeddedParameters") -@doc("An operation with embedded parameters within the body") -@post -op EmbeddedParameters(@bodyRoot body: ModelWithEmbeddedNonBodyParameters): void; - -@route("dynamicModel") -@doc("An operation with a dynamic model") -@post -op DynamicModelOperation(@body body: DynamicModel): void; - -@doc("Base animal with discriminator") -@discriminator("kind") -model Animal { - @doc("The kind of animal") - kind: string; - - @doc("Name of the animal") - name: string; -} - -alias PetContent = { - @doc("Whether the pet is trained") - trained: boolean; -}; - -@doc("Pet is a discriminated animal") -model Pet extends Animal { - kind: "pet"; - ...PetContent; -} - -alias DogContent = { - @doc("The breed of the dog") - breed: string; -}; - -@doc("Dog is a specific type of pet with hierarchy building") -@Legacy.hierarchyBuilding(Pet) -model Dog extends Animal { - kind: "dog"; - ...PetContent; - ...DogContent; -} - -@route("/animals") -interface AnimalOperations { - @doc("Update a pet as an animal") - @put - @route("/pet/as-animal") - updatePetAsAnimal(@body animal: Animal): Animal; - - @doc("Update a dog as an animal") - @put - @route("/dog/as-animal") - updateDogAsAnimal(@body animal: Animal): Animal; -} - -@route("/pets") -interface PetOperations { - @doc("Update a pet as a pet") - @put - @route("/pet/as-pet") - updatePetAsPet(@body pet: Pet): Pet; - - @doc("Update a dog as a pet") - @put - @route("/dog/as-pet") - updateDogAsPet(@body pet: Pet): Pet; -} - -@route("/dogs") -interface DogOperations { - @doc("Update a dog as a dog") - @put - @route("/dog/as-dog") - updateDogAsDog(@body dog: Dog): Dog; -} - -@clientInitialization({ - initializedBy: InitializedBy.individually | InitializedBy.parent, -}) -interface Metrics { - @doc("Get Widget metrics for given day of week") - @get - @route("/metrics/widgets/daysOfWeek") - getWidgetMetrics(@path day: DaysOfWeekExtensibleEnum): { - numSold: int32; - averagePrice: float32; - }; -} +import "../../../../../packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/Sample-TypeSpec.tsp"; diff --git a/docs/samples/client/csharp/SampleService/package.json b/docs/samples/client/csharp/SampleService/package.json index cc47cb4f876..e24bc78579c 100644 --- a/docs/samples/client/csharp/SampleService/package.json +++ b/docs/samples/client/csharp/SampleService/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "@typespec/http-client-csharp": "1.0.0-alpha.20250923.2", + "@typespec/http-client-csharp": "1.0.0-alpha.20260310.2", "logging-plugin": "file:../plugins/logging" } } diff --git a/docs/samples/client/csharp/plugins/logging/Logging.Plugin/src/Logging.Plugin.csproj b/docs/samples/client/csharp/plugins/logging/Logging.Plugin/src/Logging.Plugin.csproj index 703225be71d..54a6883f359 100644 --- a/docs/samples/client/csharp/plugins/logging/Logging.Plugin/src/Logging.Plugin.csproj +++ b/docs/samples/client/csharp/plugins/logging/Logging.Plugin/src/Logging.Plugin.csproj @@ -1,13 +1,13 @@ - net8.0 + net10.0 true - + diff --git a/eng/common/config/labels.ts b/eng/common/config/labels.ts index ae8b867b286..83da5105468 100644 --- a/eng/common/config/labels.ts +++ b/eng/common/config/labels.ts @@ -218,6 +218,10 @@ export default defineConfig({ color: "0969da", description: "Good candidate for MQ", }, + "int:azure-specs": { + color: "0e8a16", + description: "Run integration tests against azure-rest-api-specs", + }, }, }, }, diff --git a/eng/common/scripts/check-catalog.ts b/eng/common/scripts/check-catalog.ts new file mode 100644 index 00000000000..521dc9870ae --- /dev/null +++ b/eng/common/scripts/check-catalog.ts @@ -0,0 +1,115 @@ +import { execSync } from "child_process"; +import { readFileSync } from "fs"; +import { join, relative } from "path"; +import { parse } from "yaml"; +import { repoRoot } from "./utils/common.js"; + +/** + * Validates that all workspace package dependencies use `catalog:` or `workspace:` protocols, + * ensuring versions are centrally managed via the pnpm catalog in pnpm-workspace.yaml. + */ + +interface WorkspaceConfig { + catalog?: Record; +} + +const workspaceConfig: WorkspaceConfig = parse( + readFileSync(join(repoRoot, "pnpm-workspace.yaml"), "utf8"), +); +const catalog = workspaceConfig.catalog ?? {}; + +/** + * Dependencies that are allowed to use explicit versions instead of catalog:. + * Each entry maps a package.json path (relative to repo root) to a set of dependency names. + */ +const exceptions: Record> = { + // vsce needs a real semver for @types/vscode to determine VS Code engine compatibility + "packages/typespec-vscode/package.json": new Set(["@types/vscode"]), +}; + +const depTypes = ["dependencies", "devDependencies", "peerDependencies"] as const; + +const errors: string[] = []; +const warnings: string[] = []; + +// Resolve workspace packages from pnpm +const pnpmOutput = execSync("pnpm ls -r --json --depth -1", { + cwd: repoRoot, + encoding: "utf8", +}); +const workspacePackages: { path: string }[] = JSON.parse(pnpmOutput); +const packageJsonPaths: string[] = workspacePackages.map((p) => + join(relative(repoRoot, p.path), "package.json"), +); + +for (const relPath of packageJsonPaths) { + const fullPath = join(repoRoot, relPath); + const pkg = JSON.parse(readFileSync(fullPath, "utf8")); + const fileExceptions = exceptions[relPath] ?? new Set(); + + for (const depType of depTypes) { + const deps: Record | undefined = pkg[depType]; + if (!deps) continue; + + for (const [name, version] of Object.entries(deps)) { + if (version === "catalog:" || version.startsWith("workspace:")) { + continue; + } + if (fileExceptions.has(name)) { + // Allowed exception — but warn if it drifts from the catalog + if (catalog[name] && catalog[name] !== version) { + warnings.push( + `${relPath}: ${depType}.${name} has version "${version}" but catalog has "${catalog[name]}". Keep them in sync.`, + ); + } + continue; + } + errors.push( + `${relPath}: ${depType}.${name} uses explicit version "${version}" instead of "catalog:".`, + ); + } + } +} + +// Check that every catalog entry is actually used somewhere +const usedCatalogEntries = new Set(); +for (const relPath of packageJsonPaths) { + const fullPath = join(repoRoot, relPath); + const pkg = JSON.parse(readFileSync(fullPath, "utf8")); + for (const depType of depTypes) { + const deps: Record | undefined = pkg[depType]; + if (!deps) continue; + for (const [name, version] of Object.entries(deps)) { + if (version === "catalog:") { + usedCatalogEntries.add(name); + } + } + } +} + +for (const name of Object.keys(catalog)) { + if (!usedCatalogEntries.has(name)) { + warnings.push(`pnpm-workspace.yaml: catalog entry "${name}" is not used by any package.`); + } +} + +// Report results +if (warnings.length > 0) { + console.log(`\n⚠ Warnings (${warnings.length}):`); + for (const w of warnings) { + console.log(` ${w}`); + } +} + +if (errors.length > 0) { + console.log(`\n✘ Errors (${errors.length}):`); + for (const e of errors) { + console.log(` ${e}`); + } + console.log( + '\nAll external dependencies must use "catalog:" protocol. Add the version to the catalog in pnpm-workspace.yaml and use "catalog:" in package.json.', + ); + process.exit(1); +} + +console.log("✔ All dependencies are using catalog: or workspace: protocols."); diff --git a/eng/common/scripts/utils/common.ts b/eng/common/scripts/utils/common.ts index ecf2e6fd689..f8fbe47f7e4 100644 --- a/eng/common/scripts/utils/common.ts +++ b/eng/common/scripts/utils/common.ts @@ -1,6 +1,5 @@ import { readFile, writeFile } from "fs/promises"; import { dirname, resolve } from "path"; -import pc from "picocolors"; import { fileURLToPath } from "url"; export const repo = { @@ -17,12 +16,10 @@ export async function syncFile(filename: string, newContent: string, options: Ch if (options.check) { const existingContent = await readFile(filename, "utf8"); if (newContent === existingContent) { - console.log(pc.green(`${filename} is up to date.`)); + console.log(`${filename} is up to date.`); } else { console.error( - pc.red( - `${filename} file label section is not up to date, run pnpm sync-labels to update it`, - ), + `${filename} file label section is not up to date, run pnpm sync-labels to update it`, ); process.exit(1); } diff --git a/eng/emitters/pipelines/templates/stages/emitter-stages.yml b/eng/emitters/pipelines/templates/stages/emitter-stages.yml index 08805e737f0..0ef45d4ec1e 100644 --- a/eng/emitters/pipelines/templates/stages/emitter-stages.yml +++ b/eng/emitters/pipelines/templates/stages/emitter-stages.yml @@ -7,7 +7,9 @@ parameters: - name: UseTypeSpecNext type: boolean - # Whether to publish to the internal feed. + # Whether and where to publish packages. Values: 'none', 'internal', 'public'. + # 'internal' publishes to the internal feed only. + # 'public' publishes to the internal feed AND to npmjs.org. - name: Publish type: string default: "none" @@ -80,6 +82,11 @@ parameters: type: string default: "3.12" + # Whether to bundle and upload the emitter package to the playground package storage. + - name: UploadPlaygroundBundle + type: boolean + default: false + stages: # Build stage # Responsible for building the autorest generator and typespec emitter packages @@ -281,27 +288,43 @@ stages: artifact: build_artifacts_${{ parameters.LanguageShortName }} displayName: Download build artifacts - # Create authenticated .npmrc file for publishing - - ${{ if eq(parameters.Publish, 'internal') }}: - - template: /eng/emitters/pipelines/templates/steps/create-authenticated-npmrc.yml - parameters: - npmrcPath: $(buildArtifactsPath)/packages/.npmrc - registryUrl: https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js-test-autorest/npm/registry/ - - ${{ else }}: - - pwsh: | - "//registry.npmjs.org/:_authToken=$(azure-sdk-npm-token)" | Out-File '.npmrc' - displayName: Authenticate .npmrc for npmjs.org - workingDirectory: $(buildArtifactsPath)/packages + # Always publish to internal feed + - template: /eng/emitters/pipelines/templates/steps/create-authenticated-npmrc.yml + parameters: + npmrcPath: $(buildArtifactsPath)/packages/.npmrc + registryUrl: https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js/npm/registry/ + + # publish to devops feed + - pwsh: | + $packageFiles = Get-ChildItem -Path . -Filter '*.tgz' + foreach ($file in $packageFiles.Name) { + Write-Host "npm publish $file --verbose --access public" + npm publish $file --verbose --access public + } + displayName: Publish to DevOps feed + workingDirectory: $(buildArtifactsPath)/packages + + # If publishing publicly, also publish to npmjs.org + - ${{ if eq(parameters.Publish, 'public') }}: + # publish to npmjs.org using ESRP + - task: EsrpRelease@11 + inputs: + displayName: Publish to npmjs.org + ConnectedServiceName: Azure SDK PME Managed Identity + ClientId: 5f81938c-2544-4f1f-9251-dd9de5b8a81b + DomainTenantId: 975f013f-7f24-47e8-a7d3-abc4752bf346 + UseManagedIdentity: true + KeyVaultName: kv-azuresdk-codesign + SignCertName: azure-sdk-esrp-release-certificate + Intent: PackageDistribution + ContentType: npm + FolderLocation: $(buildArtifactsPath)/packages + Owners: ${{ coalesce(variables['Build.RequestedForEmail'], 'azuresdk@microsoft.com') }} + Approvers: ${{ coalesce(variables['Build.RequestedForEmail'], 'azuresdk@microsoft.com') }} + ServiceEndpointUrl: https://api.esrp.microsoft.com + # cspell:ignore ESRPRELPACMANTEST + MainPublisher: ESRPRELPACMANTEST - # per package, publishing using appropriate tool - - ${{ each package in parameters.Packages }}: - - ${{ if eq(package.type, 'npm') }}: - - pwsh: | - $file = Resolve-Path "${{ package.file }}" - Write-Host "npm publish $file --verbose --access public --prefix $(buildArtifactsPath)/packages" - npm publish $file --verbose --access public --prefix $(buildArtifactsPath)/packages - displayName: Publish ${{ package.name }} - workingDirectory: $(buildArtifactsPath)/packages - ${{ if parameters.HasNugetPackages }}: - task: 1ES.PublishNuget@1 displayName: Publish Nuget packages @@ -323,6 +346,29 @@ stages: ArtifactPath: $(buildArtifactsPath) LanguageShortName: ${{ parameters.LanguageShortName }} + - ${{ if parameters.UploadPlaygroundBundle }}: + - script: npm ci + displayName: Install emitter dependencies for playground bundle + workingDirectory: $(Build.SourcesDirectory)/${{ parameters.PackagePath }} + - script: npm run build + displayName: Build emitter for playground bundle + workingDirectory: $(Build.SourcesDirectory)/${{ parameters.PackagePath }} + - script: npm install -g pnpm + displayName: Install pnpm for playground bundle upload + - script: pnpm install --filter "@typespec/bundle-uploader..." + displayName: Install bundle-uploader dependencies + workingDirectory: $(Build.SourcesDirectory) + - script: pnpm --filter "@typespec/bundle-uploader..." build + displayName: Build bundle-uploader + workingDirectory: $(Build.SourcesDirectory) + - task: AzureCLI@1 + displayName: Upload playground bundle + inputs: + azureSubscription: "Azure SDK Engineering System" + scriptLocation: inlineScript + inlineScript: node ./eng/emitters/scripts/upload-bundled-emitter.js ${{ parameters.PackagePath }} + workingDirectory: $(Build.SourcesDirectory) + templateContext: outputs: - output: pipelineArtifact diff --git a/eng/emitters/scripts/Generate-APIView-CodeFile.ps1 b/eng/emitters/scripts/Generate-APIView-CodeFile.ps1 index 15a6f28564b..18a9f47f6c3 100644 --- a/eng/emitters/scripts/Generate-APIView-CodeFile.ps1 +++ b/eng/emitters/scripts/Generate-APIView-CodeFile.ps1 @@ -11,7 +11,7 @@ if (!(Test-Path -Path $ArtifactPath)) exit 1 } -$apiviewParser = "@azure-tools/ts-genapi@2.0.3" +$apiviewParser = "@azure-tools/ts-genapi@2.0.11" Write-Host "Installing $($apiviewParser)" npm install $apiviewParser --registry $NpmDevopsFeedRegistry $installedPath = npm ls @azure-tools/ts-genapi -p diff --git a/eng/emitters/scripts/upload-bundled-emitter.js b/eng/emitters/scripts/upload-bundled-emitter.js new file mode 100644 index 00000000000..81b373b09ac --- /dev/null +++ b/eng/emitters/scripts/upload-bundled-emitter.js @@ -0,0 +1,18 @@ +// @ts-check +import { resolve } from "path"; +import { bundleAndUploadStandalonePackage } from "../../../packages/bundle-uploader/dist/src/index.js"; +import { repoRoot } from "../../common/scripts/helpers.js"; + +const packageRelativePath = process.argv[2]; +if (!packageRelativePath) { + // eslint-disable-next-line no-console + console.error("Usage: node upload-bundled-emitter.js "); + // eslint-disable-next-line no-console + console.error(" e.g. node upload-bundled-emitter.js packages/http-client-csharp"); + process.exit(1); +} + +// remove leading slash if exists, then resolve to absolute path +const packagePath = resolve(repoRoot, packageRelativePath.replace(/^\//, "")); + +await bundleAndUploadStandalonePackage({ packagePath }); diff --git a/eng/tsp-core/pipelines/jobs/build-for-publish.yml b/eng/tsp-core/pipelines/jobs/build-for-publish.yml index 340b4ccf222..d2f9fa6ad3b 100644 --- a/eng/tsp-core/pipelines/jobs/build-for-publish.yml +++ b/eng/tsp-core/pipelines/jobs/build-for-publish.yml @@ -3,7 +3,7 @@ jobs: displayName: Build Packages variables: - TYPESPEC_SKIP_DOCUSAURUS_BUILD: true # Disable docusaurus build + TYPESPEC_SKIP_WEBSITE_BUILD: true # Disable docusaurus build steps: - template: /eng/tsp-core/pipelines/templates/install.yml @@ -48,7 +48,6 @@ jobs: - task: AzureCLI@2 displayName: Upload scenario manifest - condition: eq(variables['PUBLISH_PKG_TYPESPEC_HTTP_SPECS'], 'true') inputs: workingDirectory: packages/http-specs azureSubscription: "TypeSpec Storage" @@ -57,7 +56,7 @@ jobs: inlineScript: "pnpm upload-manifest" # Update version for next version publish - - script: node ./packages/internal-build-utils/cmd/cli.js bump-version-preview . + - script: pnpm chronus version --prerelease displayName: Bump version to prerelease targets - script: pnpm run gen-manifest diff --git a/eng/tsp-core/pipelines/jobs/e2e.yml b/eng/tsp-core/pipelines/jobs/e2e.yml index ad628383065..db375014ab8 100644 --- a/eng/tsp-core/pipelines/jobs/e2e.yml +++ b/eng/tsp-core/pipelines/jobs/e2e.yml @@ -8,7 +8,7 @@ jobs: variables: TYPESPEC_VS_CI_BUILD: false # Enable official Visual Studio extension build - TYPESPEC_SKIP_DOCUSAURUS_BUILD: true # Disable docusaurus build + TYPESPEC_SKIP_WEBSITE_BUILD: true # Disable docusaurus build DISPLAY: ":99" # Set DISPLAY for Linux GUI applications pool: diff --git a/eng/tsp-core/pipelines/stages/ci-stages.yml b/eng/tsp-core/pipelines/stages/ci-stages.yml index 109875baecc..acd7b0bfa54 100644 --- a/eng/tsp-core/pipelines/stages/ci-stages.yml +++ b/eng/tsp-core/pipelines/stages/ci-stages.yml @@ -11,12 +11,10 @@ stages: variables: TYPESPEC_VS_CI_BUILD: true # Enable official Visual Studio extension build - TYPESPEC_SKIP_DOCUSAURUS_BUILD: true # Disable docusaurus build + TYPESPEC_SKIP_WEBSITE_BUILD: true # Disable docusaurus build strategy: matrix: - "Node 20.x": - nodeVersion: 20.x "Node 22.x": nodeVersion: 22.x "Node 24.x": @@ -38,12 +36,10 @@ stages: variables: TYPESPEC_VS_CI_BUILD: true # Enable official Visual Studio extension build - TYPESPEC_SKIP_DOCUSAURUS_BUILD: true # Disable docusaurus build + TYPESPEC_SKIP_WEBSITE_BUILD: true # Disable website build strategy: matrix: - "Node 20.x": - nodeVersion: 20.x "Node 22.x": nodeVersion: 22.x "Node 24.x": diff --git a/eng/tsp-core/pipelines/templates/install.yml b/eng/tsp-core/pipelines/templates/install.yml index 7fba594d5e5..e5d30499603 100644 --- a/eng/tsp-core/pipelines/templates/install.yml +++ b/eng/tsp-core/pipelines/templates/install.yml @@ -2,7 +2,7 @@ parameters: - name: nodeVersion type: string - default: 22.x + default: 24.x - name: useDotNet type: string @@ -24,12 +24,6 @@ steps: inputs: version: 8.0.x - - task: Cache@2 - inputs: - key: 'pnpm | "$(Agent.OS)" | pnpm-lock.yaml' - path: ${{ parameters.pnpmStorePath }} - displayName: Cache pnpm store - - script: npm install -g pnpm # Pnpm manage-package-manager-versions will respect packageManager field displayName: Install pnpm - script: pnpm config set store-dir ${{ parameters.pnpmStorePath }} diff --git a/eng/tsp-core/pkg-pr-new.ts b/eng/tsp-core/pkg-pr-new.ts index 7bc3cc3970c..ed6a9357014 100644 --- a/eng/tsp-core/pkg-pr-new.ts +++ b/eng/tsp-core/pkg-pr-new.ts @@ -1,21 +1,24 @@ import { execSync } from "child_process"; -import { readdir } from "fs/promises"; import { repoRoot } from "../common/scripts/utils/common.js"; import { listChangedFilesSince } from "../common/scripts/utils/git.js"; +import { getPublishablePackages } from "./tpm/packages.js"; const files = await listChangedFilesSince(`origin/main`, { repositoryPath: repoRoot }); // eslint-disable-next-line no-console console.log("modified files:", files); -const packages = await readdir(repoRoot + "/packages", { withFileTypes: true }); -const paths = packages - .filter((dirent) => dirent.isDirectory() && dirent.name !== "http-client-python") - .map((dirent) => `packages/${dirent.name}`); +const packages = await getPublishablePackages(); +const paths = packages.map((pkg) => pkg.path); -const modifiedPaths = paths.filter((x) => files.some((f) => f.startsWith(x))); +const modifiedPaths = paths.filter((x) => files.some((f) => f.startsWith(x + "/"))); // eslint-disable-next-line no-console console.log("Packages", { all: paths, modified: modifiedPaths }); +if (modifiedPaths.length === 0) { + // eslint-disable-next-line no-console + console.log("No modified packages found."); + process.exit(0); +} try { execSync(`pnpx pkg-pr-new publish ${modifiedPaths.map((x) => `'${x}'`).join(" ")} --pnpm`, { stdio: "inherit", @@ -25,4 +28,5 @@ try { } catch (e: any) { // eslint-disable-next-line no-console console.error("Failed to run pkg-pr-new publish"); + process.exit(1); } diff --git a/eng/tsp-core/tpm/cli.ts b/eng/tsp-core/tpm/cli.ts new file mode 100644 index 00000000000..23cd5b3dfdb --- /dev/null +++ b/eng/tsp-core/tpm/cli.ts @@ -0,0 +1,202 @@ +/** + * TPM - TypeSpec Repo Manager + * + * A tool to manage dependencies, build, and pack TypeSpec-related packages + * in a monorepo setup. It can operate on all packages or only those modified + * since a specified git reference. + */ + +/* eslint-disable no-console */ +import { execSync } from "child_process"; +import { join } from "path"; +import { parseArgs } from "util"; +import { repoRoot } from "../../common/scripts/utils/common.js"; +import { listChangedFilesSince } from "../../common/scripts/utils/git.js"; +import { CRITICAL_PACKAGES, getAllPackages, type PackageInfo } from "./packages.js"; + +async function getModifiedPackages(since: string): Promise { + const files = await listChangedFilesSince(since, { repositoryPath: repoRoot }); + console.log("Modified files:", files); + + const allPackages = await getAllPackages(); + const modifiedPackages = allPackages.filter((pkg) => + files.some((f) => f.startsWith(pkg.path + "/")), + ); + + console.log( + "Modified packages:", + modifiedPackages.map((p) => p.name), + ); + return modifiedPackages; +} + +function runCommand(command: string, cwd: string): void { + console.log(`\n[${cwd}] Running: ${command}`); + try { + execSync(command, { + stdio: "inherit", + encoding: "utf-8", + cwd, + }); + } catch (e: unknown) { + const error = e as Error; + console.error(`Failed to run command in ${cwd}: ${error.message}`); + throw e; + } +} + +function installPackages(packages: PackageInfo[]): void { + const standalonePackages = packages.filter((p) => p.isStandalone); + + console.log("\n=== Installing pnpm packages ==="); + runCommand("pnpm install", repoRoot); + + // Install standalone packages individually with npm + for (const pkg of standalonePackages) { + console.log(`\n=== Installing standalone package: ${pkg.name} ===`); + runCommand("npm ci", join(repoRoot, pkg.path)); + } +} + +function buildPnpmFilterArgs(packages: PackageInfo[]): string { + // Place critical packages first in the filter list to ensure correct build order. + // When using many --filter flags, pnpm may not properly resolve the dependency + // graph across all filters. By listing critical packages first, we ensure they + // (and their transitive dependencies via "...") are scheduled before dependents. + const criticalFilters = CRITICAL_PACKAGES.map((name) => `--filter "${name}..."`); + // Build a set of directory names that correspond to critical packages so we + // don't duplicate them in the filter list (e.g. "@typespec/tspd" → "tspd"). + const criticalDirNames = new Set( + CRITICAL_PACKAGES.map((name) => name.replace(/^@typespec\//, "")), + ); + const restFilters = packages + .filter((p) => !criticalDirNames.has(p.name)) + .map((p) => `--filter "./${p.name}..."`); + return [...criticalFilters, ...restFilters].join(" "); +} + +function buildPackages(packages: PackageInfo[]): void { + const pnpmPackages = packages.filter((p) => !p.isStandalone); + const standalonePackages = packages.filter((p) => p.isStandalone); + + // Build pnpm packages using pnpm filter + if (pnpmPackages.length > 0) { + console.log("\n=== Building pnpm packages ==="); + const filters = buildPnpmFilterArgs(pnpmPackages); + runCommand(`pnpm ${filters} run build`, repoRoot); + } + + // Build standalone packages individually with npm + for (const pkg of standalonePackages) { + console.log(`\n=== Building standalone package: ${pkg.name} ===`); + runCommand("npm run build", join(repoRoot, pkg.path)); + } +} + +function packPackages(packages: PackageInfo[]): void { + const pnpmPackages = packages.filter((p) => !p.isStandalone); + const standalonePackages = packages.filter((p) => p.isStandalone); + + // Pack pnpm packages using pnpm pack + if (pnpmPackages.length > 0) { + console.log("\n=== Packing pnpm packages ==="); + for (const pkg of pnpmPackages) { + runCommand("pnpm pack", join(repoRoot, pkg.path)); + } + } + + // Pack standalone packages with npm + for (const pkg of standalonePackages) { + console.log(`\n=== Packing standalone package: ${pkg.name} ===`); + runCommand("npm pack", join(repoRoot, pkg.path)); + } +} + +async function main(): Promise { + const { values, positionals } = parseArgs({ + args: process.argv.slice(2), + options: { + since: { + type: "string", + description: "Git ref to compare against for detecting changes (e.g., origin/main)", + }, + help: { + type: "boolean", + short: "h", + description: "Show help", + }, + }, + allowPositionals: true, + }); + + const command = positionals[0]; + + if (values.help || !command) { + console.log(` +Usage: tpm [options] + +Commands: + install Install dependencies for modified packages + build Build modified packages + pack Pack modified packages + +Options: + --since Git ref to compare against for detecting changes (e.g., origin/main) + -h, --help Show help + +Examples: + tpm install --since origin/main + tpm build --since HEAD~5 + tpm pack --since origin/main +`); + process.exit(values.help ? 0 : 1); + } + + if (!["install", "build", "pack"].includes(command)) { + console.error(`Unknown command: ${command}`); + console.error("Valid commands are: install, build, pack"); + process.exit(1); + } + + let packages: PackageInfo[]; + + if (values.since) { + packages = await getModifiedPackages(values.since); + } else { + // If no --since flag, operate on all packages + packages = await getAllPackages(); + console.log("Operating on all packages:", packages.map((p) => p.name).join(", ")); + } + + console.log("\n========================================"); + console.log(`Running command: ${command}`); + console.log(`Packages: ${packages.map((p) => p.name).join(", ")}`); + console.log( + `Standalone packages: ${ + packages + .filter((p) => p.isStandalone) + .map((p) => p.name) + .join(", ") || "none" + }`, + ); + console.log("========================================\n"); + + switch (command) { + case "install": + installPackages(packages); + break; + case "build": + buildPackages(packages); + break; + case "pack": + packPackages(packages); + break; + } + + console.log(`\n✅ ${command} completed successfully!`); +} + +main().catch((e) => { + console.error("Error:", e); + process.exit(1); +}); diff --git a/eng/tsp-core/tpm/packages.ts b/eng/tsp-core/tpm/packages.ts new file mode 100644 index 00000000000..656e83eaa71 --- /dev/null +++ b/eng/tsp-core/tpm/packages.ts @@ -0,0 +1,13 @@ +export { getAllPackages, getPublishablePackages, type PackageInfo } from "../utils/packages.js"; + +/** + * Critical packages that must be built before other packages. + * When using many pnpm --filter flags, pnpm may not correctly resolve the build + * order. These packages and their dependencies (via the "..." suffix) are placed + * first in the filter list to ensure they are built in the correct order. + * + * The key chain is: compiler → prettier-plugin-typespec → tspd + * Many packages run `tspd gen-extern-signature` during their build and need tspd + * (and its dependency prettier-plugin-typespec) to already be available. + */ +export const CRITICAL_PACKAGES = ["@typespec/prettier-plugin-typespec", "@typespec/tspd"]; diff --git a/eng/tsp-core/utils/packages.ts b/eng/tsp-core/utils/packages.ts new file mode 100644 index 00000000000..55e63e0dfbf --- /dev/null +++ b/eng/tsp-core/utils/packages.ts @@ -0,0 +1,54 @@ +import { readdir, readFile } from "fs/promises"; +import { join } from "path"; +import { repoRoot } from "../../common/scripts/utils/common.js"; + +// Standalone packages that need special handling with npm instead of pnpm +const STANDALONE_PACKAGES = [ + "packages/http-client-csharp", + // Java package is too large for pkg-pr-new at the moment + // "packages/http-client-java", + "packages/http-client-python", +]; + +// Packages to exclude from pkg-pr-new publishing +const EXCLUDED_PACKAGES = [ + "packages/http-client-java", // Too large for pkg-pr-new +]; + +export interface PackageInfo { + name: string; + path: string; + isStandalone: boolean; + isPrivate: boolean; +} + +export async function getAllPackages(): Promise { + const packagesDir = join(repoRoot, "packages"); + const packages = await readdir(packagesDir, { withFileTypes: true }); + + const results: PackageInfo[] = []; + for (const dirent of packages.filter((d) => d.isDirectory())) { + const pkgPath = `packages/${dirent.name}`; + const pkgJsonPath = join(repoRoot, pkgPath, "package.json"); + let pkgJson: { private?: boolean }; + try { + pkgJson = JSON.parse(await readFile(pkgJsonPath, "utf-8")); + } catch { + // eslint-disable-next-line no-console + console.warn(`Could not read package.json for ${pkgPath}, skipping.`); + continue; + } + results.push({ + name: dirent.name, + path: pkgPath, + isStandalone: STANDALONE_PACKAGES.includes(pkgPath), + isPrivate: pkgJson.private === true, + }); + } + return results; +} + +export async function getPublishablePackages(): Promise { + const allPackages = await getAllPackages(); + return allPackages.filter((pkg) => !pkg.isPrivate && !EXCLUDED_PACKAGES.includes(pkg.path)); +} diff --git a/eslint.config.js b/eslint.config.js index d26dd6159ca..b6f98a382a8 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -3,10 +3,11 @@ import eslint from "@eslint/js"; import vitest from "@vitest/eslint-plugin"; import reactHooks from "eslint-plugin-react-hooks"; import unicorn from "eslint-plugin-unicorn"; +import { defineConfig } from "eslint/config"; import tsEslint from "typescript-eslint"; /** Config that will apply to all files */ -const allFilesConfig = tsEslint.config({ +const allFilesConfig = defineConfig({ plugins: { unicorn, }, @@ -71,7 +72,7 @@ const allFilesConfig = tsEslint.config({ * @param {string} root */ export function getTypeScriptProjectRules(root) { - return tsEslint.config({ + return defineConfig({ files: [ "**/packages/*/src/**/*.ts", "**/packages/*/src/**/*.tsx", @@ -96,7 +97,7 @@ export function getTypeScriptProjectRules(root) { } /** Config that will apply to all test files only */ -const testFilesConfig = tsEslint.config({ +const testFilesConfig = defineConfig({ /** * Test files specific rules */ @@ -117,8 +118,9 @@ const testFilesConfig = tsEslint.config({ }, }); -const jsxFilesConfig = tsEslint.config({ +const jsxFilesConfig = defineConfig({ files: ["**/*.tsx"], + // @ts-expect-error --- plugins typing issue plugins: { "react-hooks": reactHooks }, // Exclude need **/ to make sure this can be reused in typespec-azure ignores: ["**/packages/emitter-framework/src/**/*", "**/packages/http-client-js/**/*"], @@ -136,7 +138,7 @@ export const TypeSpecCommonEslintConfigs = [ ...testFilesConfig, ]; -export default tsEslint.config( +export default defineConfig( { ignores: [ "**/dist/**/*", diff --git a/grammars/typespec.json b/grammars/typespec.json index f5d847fc0c7..c29ce411b12 100644 --- a/grammars/typespec.json +++ b/grammars/typespec.json @@ -19,7 +19,7 @@ "name": "keyword.operator.assignment.tsp" } }, - "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#expression" @@ -28,16 +28,19 @@ }, "alias-statement": { "name": "meta.alias-statement.typespec", - "begin": "\\b(alias)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*", + "begin": "(?:(internal)\\s+)?\\b(alias)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*", "beginCaptures": { "1": { - "name": "keyword.other.tsp" + "name": "storage.modifier.tsp" }, "2": { + "name": "keyword.other.tsp" + }, + "3": { "name": "entity.name.type.tsp" } }, - "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#alias-id" @@ -58,7 +61,7 @@ "name": "entity.name.tag.tsp" } }, - "end": "(?=([_$[:alpha:]]|`))|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=([_$[:alpha:]]|`))|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -108,16 +111,19 @@ }, "const-statement": { "name": "meta.const-statement.typespec", - "begin": "\\b(const)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)", + "begin": "(?:(internal)\\s+)?\\b(const)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)", "beginCaptures": { "1": { - "name": "keyword.other.tsp" + "name": "storage.modifier.tsp" }, "2": { + "name": "keyword.other.tsp" + }, + "3": { "name": "variable.name.tsp" } }, - "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#type-annotation" @@ -141,7 +147,7 @@ "name": "entity.name.tag.tsp" } }, - "end": "(?=([_$[:alpha:]]|`))|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=([_$[:alpha:]]|`))|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -153,19 +159,22 @@ }, "decorator-declaration-statement": { "name": "meta.decorator-declaration-statement.typespec", - "begin": "(?:(extern)\\s+)?\\b(dec)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)", + "begin": "(?:(internal)\\s+)?(?:(extern)\\s+)?\\b(dec)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)", "beginCaptures": { "1": { - "name": "keyword.other.tsp" + "name": "storage.modifier.tsp" }, "2": { "name": "keyword.other.tsp" }, "3": { + "name": "keyword.other.tsp" + }, + "4": { "name": "entity.name.function.tsp" } }, - "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -186,7 +195,7 @@ "name": "keyword.directive.name.tsp" } }, - "end": "$|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "$|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#string-literal" @@ -311,7 +320,7 @@ "name": "keyword.operator.type.annotation.tsp" } }, - "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -323,16 +332,19 @@ }, "enum-statement": { "name": "meta.enum-statement.typespec", - "begin": "\\b(enum)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)", + "begin": "(?:(internal)\\s+)?\\b(enum)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)", "beginCaptures": { "1": { - "name": "keyword.other.tsp" + "name": "storage.modifier.tsp" }, "2": { + "name": "keyword.other.tsp" + }, + "3": { "name": "entity.name.type.tsp" } }, - "end": "(?<=\\})|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?<=\\})|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -388,19 +400,22 @@ }, "function-declaration-statement": { "name": "meta.function-declaration-statement.typespec", - "begin": "(?:(extern)\\s+)?\\b(fn)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)", + "begin": "(?:(internal)\\s+)?(?:(extern)\\s+)?\\b(fn)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)", "beginCaptures": { "1": { - "name": "keyword.other.tsp" + "name": "storage.modifier.tsp" }, "2": { "name": "keyword.other.tsp" }, "3": { + "name": "keyword.other.tsp" + }, + "4": { "name": "entity.name.function.tsp" } }, - "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -425,7 +440,7 @@ "name": "keyword.other.tsp" } }, - "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -472,7 +487,7 @@ "name": "keyword.other.tsp" } }, - "end": "((?=\\{)|(?=;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))", + "end": "((?=\\{)|(?=;|@|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))", "patterns": [ { "include": "#expression" @@ -493,7 +508,7 @@ "name": "entity.name.function.tsp" } }, - "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -505,13 +520,16 @@ }, "interface-statement": { "name": "meta.interface-statement.typespec", - "begin": "\\b(interface)\\b", + "begin": "(?:(internal)\\s+)?\\b(interface)\\b", "beginCaptures": { "1": { + "name": "storage.modifier.tsp" + }, + "2": { "name": "keyword.other.tsp" } }, - "end": "(?<=\\})|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?<=\\})|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -577,7 +595,7 @@ "name": "keyword.other.tsp" } }, - "end": "((?=\\{)|(?=;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))", + "end": "((?=\\{)|(?=;|@|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))", "patterns": [ { "include": "#expression" @@ -598,7 +616,7 @@ "name": "string.quoted.double.tsp" } }, - "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -616,13 +634,16 @@ }, "model-statement": { "name": "meta.model-statement.typespec", - "begin": "\\b(model)\\b", + "begin": "(?:(internal)\\s+)?\\b(model)\\b", "beginCaptures": { "1": { + "name": "storage.modifier.tsp" + }, + "2": { "name": "keyword.other.tsp" } }, - "end": "(?<=\\})|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?<=\\})|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -661,7 +682,7 @@ "namespace-name": { "name": "meta.namespace-name.typespec", "begin": "(?=([_$[:alpha:]]|`))", - "end": "((?=\\{)|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))", + "end": "((?=\\{)|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))", "patterns": [ { "include": "#identifier-expression" @@ -679,7 +700,7 @@ "name": "keyword.other.tsp" } }, - "end": "((?<=\\})|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))", + "end": "((?<=\\})|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))", "patterns": [ { "include": "#token" @@ -739,7 +760,7 @@ "name": "keyword.operator.type.annotation.tsp" } }, - "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -757,7 +778,7 @@ "name": "keyword.other.tsp" } }, - "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#expression" @@ -814,16 +835,19 @@ }, "operation-statement": { "name": "meta.operation-statement.typespec", - "begin": "\\b(op)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)", + "begin": "(?:(internal)\\s+)?\\b(op)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)", "beginCaptures": { "1": { - "name": "keyword.other.tsp" + "name": "storage.modifier.tsp" }, "2": { + "name": "keyword.other.tsp" + }, + "3": { "name": "entity.name.function.tsp" } }, - "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -912,7 +936,7 @@ "name": "entity.name.function.tsp" } }, - "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -930,7 +954,7 @@ "name": "keyword.other.tsp" } }, - "end": "(?=;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=;|@|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#expression" @@ -942,16 +966,19 @@ }, "scalar-statement": { "name": "meta.scalar-statement.typespec", - "begin": "\\b(scalar)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)", + "begin": "(?:(internal)\\s+)?\\b(scalar)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)", "beginCaptures": { "1": { - "name": "keyword.other.tsp" + "name": "storage.modifier.tsp" }, "2": { + "name": "keyword.other.tsp" + }, + "3": { "name": "entity.name.type.tsp" } }, - "end": "(?<=\\})|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?<=\\})|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -975,7 +1002,7 @@ "name": "keyword.operator.spread.tsp" } }, - "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#expression" @@ -1183,7 +1210,7 @@ "name": "keyword.operator.assignment.tsp" } }, - "end": "(?=>)|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=>)|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "endCaptures": { "0": { "name": "keyword.operator.assignment.tsp" @@ -1235,7 +1262,7 @@ "name": "entity.name.type.tsp" } }, - "end": "(?=>)|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=>)|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -1256,7 +1283,7 @@ "name": "keyword.other.tsp" } }, - "end": "(?=>)|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=>)|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#expression" @@ -1271,7 +1298,7 @@ "name": "keyword.operator.assignment.tsp" } }, - "end": "(?=>)|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=>)|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#expression" @@ -1309,7 +1336,7 @@ "name": "keyword.other.tsp" } }, - "end": "(?=>)|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=>)|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#expression" @@ -1353,16 +1380,19 @@ }, "union-statement": { "name": "meta.union-statement.typespec", - "begin": "\\b(union)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)", + "begin": "(?:(internal)\\s+)?\\b(union)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)", "beginCaptures": { "1": { - "name": "keyword.other.tsp" + "name": "storage.modifier.tsp" }, "2": { + "name": "keyword.other.tsp" + }, + "3": { "name": "entity.name.type.tsp" } }, - "end": "(?<=\\})|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?<=\\})|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -1383,7 +1413,7 @@ "name": "keyword.operator.type.annotation.tsp" } }, - "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -1401,7 +1431,7 @@ "name": "keyword.other.tsp" } }, - "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#token" @@ -1422,7 +1452,7 @@ "name": "keyword.other.tsp" } }, - "end": "(?=>)|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", + "end": "(?=>)|(?=,|;|@|#[a-z]|\\)|\\}|\\b(?:extern|internal)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)", "patterns": [ { "include": "#expression" diff --git a/package.json b/package.json index a3d6927f2fe..38299fa8b38 100644 --- a/package.json +++ b/package.json @@ -2,19 +2,18 @@ "name": "@typespec/monorepo", "version": "0.0.1", "private": true, - "packageManager": "pnpm@10.23.0", + "packageManager": "pnpm@10.30.2", "type": "module", "scripts": { "build": "pnpm build:all && pnpm check:eng && pnpm gen-compiler-extern-signature", "build:all": "pnpm -r --workspace-concurrency=Infinity build", "check:eng": "tsc -p ./tsconfig.eng.json --noEmit", "setup:min": "pnpm install && pnpm --filter \"@typespec/prettier-plugin-typespec...\" --filter \"@typespec/tspd...\" run build", - "check-version-mismatch": "syncpack list-mismatches", + "check-catalog": "tsx eng/common/scripts/check-catalog.ts", "change": "chronus", "clean": "pnpm -r run clean", "cspell": "cspell --no-progress .", "dogfood": "pnpm install && pnpm build && pnpm -r dogfood", - "fix-version-mismatch": "syncpack fix-mismatches", "format": "prettier . --write", "format:check": "prettier . --check", "format:dir": "prettier --write", @@ -37,51 +36,39 @@ "validate-scenarios": "pnpm -r --filter=@typespec/http-specs run validate-scenarios", "validate-mock-apis": "pnpm -r --filter=@typespec/http-specs run validate-mock-apis", "generate-scenarios-summary": "pnpm -r --filter=@typespec/http-specs run generate-scenarios-summary", - "install-conflict": "git checkout upstream/main -- pnpm-lock.yaml && pnpm install" + "install-conflict": "git checkout upstream/main -- pnpm-lock.yaml && pnpm install", + "tsp-integration": "node packages/tsp-integration/cmd/tsp-integration.js" }, "devDependencies": { - "@chronus/chronus": "^1.0.1", - "@chronus/github": "^1.0.1", - "@chronus/github-pr-commenter": "^1.0.1", - "@eslint/js": "^9.39.2", - "@microsoft/api-extractor": "^7.55.2", - "@octokit/core": "^7.0.2", - "@octokit/plugin-paginate-graphql": "^6.0.0", - "@octokit/plugin-rest-endpoint-methods": "^17.0.0", - "@types/micromatch": "^4.0.9", - "@types/node": "~25.0.2", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/eslint-plugin": "^1.5.2", - "c8": "^10.1.3", - "cspell": "^9.4.0", - "eslint": "^9.39.2", - "eslint-plugin-import": "^2.31.0", - "eslint-plugin-react-hooks": "7.0.1", - "eslint-plugin-unicorn": "^62.0.0", - "micromatch": "^4.0.8", - "picocolors": "~1.1.1", - "playwright": "^1.57.0", - "prettier": "~3.8.0", - "prettier-plugin-astro": "^0.14.1", - "prettier-plugin-organize-imports": "~4.3.0", - "prettier-plugin-sh": "^0.18.0", - "rimraf": "~6.1.2", - "syncpack": "^13.0.3", - "tsx": "^4.21.0", - "typescript": "~5.9.2", - "typescript-eslint": "^8.49.0", - "vite-plugin-node-polyfills": "^0.25.0", - "vitest": "^4.0.15", - "yaml": "~2.8.2" - }, - "syncpack": { - "dependencyTypes": [ - "dev", - "overrides", - "peer", - "pnpmOverrides", - "prod", - "resolutions" - ] + "@chronus/chronus": "catalog:", + "@chronus/github": "catalog:", + "@chronus/github-pr-commenter": "catalog:", + "@eslint/js": "catalog:", + "@microsoft/api-extractor": "catalog:", + "@octokit/core": "catalog:", + "@octokit/plugin-paginate-graphql": "catalog:", + "@octokit/plugin-rest-endpoint-methods": "catalog:", + "@types/micromatch": "catalog:", + "@types/node": "catalog:", + "@vitest/coverage-v8": "catalog:", + "@vitest/eslint-plugin": "catalog:", + "c8": "catalog:", + "cspell": "catalog:", + "eslint": "catalog:", + "eslint-plugin-react-hooks": "catalog:", + "eslint-plugin-unicorn": "catalog:", + "micromatch": "catalog:", + "picocolors": "catalog:", + "playwright": "catalog:", + "prettier": "catalog:", + "prettier-plugin-astro": "catalog:", + "prettier-plugin-organize-imports": "catalog:", + "prettier-plugin-sh": "catalog:", + "rimraf": "catalog:", + "tsx": "catalog:", + "typescript": "catalog:", + "typescript-eslint": "catalog:", + "vitest": "catalog:", + "yaml": "catalog:" } } diff --git a/packages/asset-emitter/CHANGELOG.md b/packages/asset-emitter/CHANGELOG.md index 904053bd6b6..7c0a2f06528 100644 --- a/packages/asset-emitter/CHANGELOG.md +++ b/packages/asset-emitter/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog - @typespec/asset-emitter +## 0.79.1 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 0.79.0 + +### Bug Fixes + +- [#9580](https://github.com/microsoft/typespec/pull/9580) Keep lexical context for when working with template instance without name + + ## 0.78.0 ### Bump dependencies diff --git a/packages/asset-emitter/package.json b/packages/asset-emitter/package.json index 420d85dfe56..bdd16a896e1 100644 --- a/packages/asset-emitter/package.json +++ b/packages/asset-emitter/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/asset-emitter", - "version": "0.78.0", + "version": "0.79.1", "author": "Microsoft Corporation", "description": "TypeSpec Asset Emitter, this is to be replaced by the new emitter framework", "homepage": "https://typespec.io", @@ -23,12 +23,12 @@ } }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "tsc -p .", - "watch": "tsc -p . --watch", + "build": "tsc -p tsconfig.build.json", + "watch": "tsc -p tsconfig.build.json --watch", "test": "vitest run", "test:watch": "vitest -w", "test:ui": "vitest --ui", @@ -45,13 +45,13 @@ "@typespec/compiler": "workspace:^" }, "devDependencies": { - "@types/node": "~25.0.2", + "@types/node": "catalog:", "@typespec/compiler": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/asset-emitter/src/asset-emitter.ts b/packages/asset-emitter/src/asset-emitter.ts index 896f7ecb48a..d7441fab829 100644 --- a/packages/asset-emitter/src/asset-emitter.ts +++ b/packages/asset-emitter/src/asset-emitter.ts @@ -589,9 +589,20 @@ export function createAssetEmitter( const type = args[0]; let newTypeStack: LexicalTypeStackEntry[]; + // Check if this is an unspeakable template instantiation (name is undefined). + // Unspeakable instantiations should not reset the type stack because they are + // emitted inline and need to maintain the outer scope for reference resolution. + const isUnspeakableInstantiation = + (method === "modelInstantiation" || method === "unionInstantiation") && args[1] === undefined; + // if we've walked into a new declaration, reset the lexical type stack // to the lexical containers of the current type. - if (isDeclaration(type) && type.kind !== "Intrinsic" && !isInternalMethod(method)) { + if ( + isDeclaration(type) && + type.kind !== "Intrinsic" && + !isInternalMethod(method) && + !isUnspeakableInstantiation + ) { newTypeStack = [stackEntryInterner.intern({ method, args: stackEntryInterner.intern(args) })]; let ns = type.namespace; while (ns) { diff --git a/packages/asset-emitter/test/host.ts b/packages/asset-emitter/test/host.ts index 0b54ff19914..3e931bf04ec 100644 --- a/packages/asset-emitter/test/host.ts +++ b/packages/asset-emitter/test/host.ts @@ -1,37 +1,22 @@ import { resolvePath } from "@typespec/compiler"; -import { createTestHost, type TypeSpecTestLibrary } from "@typespec/compiler/testing"; -import { fileURLToPath } from "url"; +import { createTester, mockFile } from "@typespec/compiler/testing"; import { expect, type MockInstance, vi } from "vitest"; import { createAssetEmitter, TypeEmitter } from "../src/index.js"; -export const lib: TypeSpecTestLibrary = { - name: "typespec-ts-interface-emitter", - packageRoot: resolvePath(fileURLToPath(import.meta.url), "../../../"), - files: [ - { - realDir: "", - pattern: "package.json", - virtualPath: "./node_modules/typespec-ts-interface-emitter", - }, - { - realDir: "dist/src", - pattern: "*.js", - virtualPath: "./node_modules/typespec-ts-interface-emitter/dist/src", - }, - ], -}; +const Tester = createTester(resolvePath(import.meta.dirname, ".."), { + libraries: [], +}); export async function getHostForTypeSpecFile(contents: string, decorators?: Record) { - const host = await createTestHost(); + let tester = Tester; if (decorators) { - await host.addJsFile("dec.js", decorators); + tester = tester.files({ "dec.js": mockFile.js(decorators) }); contents = `import "./dec.js";\n` + contents; } - await host.addTypeSpecFile("main.tsp", contents); - await host.compile("main.tsp", { - outputDir: "tsp-output", + const [result] = await tester.compileAndDiagnose(contents, { + compilerOptions: { outputDir: "tsp-output" }, }); - return host; + return { program: result.program, compilerHost: result.fs.compilerHost }; } export async function emitTypeSpec( diff --git a/packages/asset-emitter/tsconfig.build.json b/packages/asset-emitter/tsconfig.build.json new file mode 100644 index 00000000000..11aa6998bf5 --- /dev/null +++ b/packages/asset-emitter/tsconfig.build.json @@ -0,0 +1,5 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "test/**/*.ts"], + "references": [{ "path": "../compiler/tsconfig.build.json" }] +} diff --git a/packages/asset-emitter/tsconfig.config.json b/packages/asset-emitter/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/asset-emitter/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/asset-emitter/tsconfig.json b/packages/asset-emitter/tsconfig.json index b4bcf7d0623..8d0eb2d00d4 100644 --- a/packages/asset-emitter/tsconfig.json +++ b/packages/asset-emitter/tsconfig.json @@ -6,6 +6,5 @@ "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo", "verbatimModuleSyntax": true - }, - "include": ["src/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/astro-utils/package.json b/packages/astro-utils/package.json index 353030a1634..b35e317dd4e 100644 --- a/packages/astro-utils/package.json +++ b/packages/astro-utils/package.json @@ -19,24 +19,24 @@ "index.ts" ], "scripts": { - "build": "astro check && tsc -p ./tsconfig.build.json", + "build": "node -e \"if(process.env.TYPESPEC_SKIP_WEBSITE_BUILD==='true'){console.log('Skipping astro-utils build');process.exit(0)}else{process.exit(1)}\" || (astro check && tsc -p ./tsconfig.build.json)", "watch": "tsc -p ./tsconfig.build.json --watch" }, "devDependencies": { - "@types/react": "~19.2.7", - "astro": "^5.16.5" + "@types/react": "catalog:", + "astro": "catalog:" }, "peerDependencies": { - "astro": "^5.16.5" + "astro": "catalog:" }, "dependencies": { - "@astrojs/check": "^0.9.4", - "@astrojs/starlight": "^0.37.0", - "@expressive-code/core": "^0.41.2", + "@astrojs/check": "catalog:", + "@astrojs/starlight": "catalog:", + "@expressive-code/core": "catalog:", "@typespec/playground": "workspace:^", - "astro-expressive-code": "^0.41.2", - "pathe": "^2.0.3", - "react": "~19.2.3", - "typescript": "~5.9.2" + "astro-expressive-code": "catalog:", + "pathe": "catalog:", + "react": "catalog:", + "typescript": "catalog:" } } diff --git a/packages/astro-utils/src/css/fluentui.css b/packages/astro-utils/src/css/fluentui.css index 9c9afb93098..bc16ee06536 100644 --- a/packages/astro-utils/src/css/fluentui.css +++ b/packages/astro-utils/src/css/fluentui.css @@ -111,3 +111,68 @@ html { -webkit-font-smoothing: antialiased; -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } + +@font-face { + font-family: "Segoe UI"; + src: + local("Segoe UI Light"), + url(https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/light/latest.woff2) + format("woff2"), + url(https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/light/latest.woff) + format("woff"), + url(https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/light/latest.ttf) + format("truetype"); + font-weight: 100; +} + +@font-face { + font-family: "Segoe UI"; + src: + local("Segoe UI Semilight"), + url(https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semilight/latest.woff2) + format("woff2"), + url(https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semilight/latest.woff) + format("woff"), + url(https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semilight/latest.ttf) + format("truetype"); + font-weight: 200; +} + +@font-face { + font-family: "Segoe UI"; + src: + local("Segoe UI"), + url(https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/normal/latest.woff2) + format("woff2"), + url(https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/normal/latest.woff) + format("woff"), + url(https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/normal/latest.ttf) + format("truetype"); + font-weight: 400; +} + +@font-face { + font-family: "Segoe UI"; + src: + local("Segoe UI Semibold"), + url(https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semibold/latest.woff2) + format("woff2"), + url(https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semibold/latest.woff) + format("woff"), + url(https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semibold/latest.ttf) + format("truetype"); + font-weight: 600; +} + +@font-face { + font-family: "Segoe UI"; + src: + local("Segoe UI Bold"), + url(https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/bold/latest.woff2) + format("woff2"), + url(https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/bold/latest.woff) + format("woff"), + url(https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/bold/latest.ttf) + format("truetype"); + font-weight: 700; +} diff --git a/packages/astro-utils/src/llmstxt/index.ts b/packages/astro-utils/src/llmstxt/index.ts index 0653cbed1d6..dde582e456c 100644 --- a/packages/astro-utils/src/llmstxt/index.ts +++ b/packages/astro-utils/src/llmstxt/index.ts @@ -1,4 +1,4 @@ -import type { z } from "astro:content"; +import { z } from "astro/zod"; import { generateMarkdownPath } from "./generators"; import type { llmstxtSchema } from "./schema"; diff --git a/packages/astro-utils/src/llmstxt/schema.ts b/packages/astro-utils/src/llmstxt/schema.ts index 43eb6c1c880..ae0f08f1f42 100644 --- a/packages/astro-utils/src/llmstxt/schema.ts +++ b/packages/astro-utils/src/llmstxt/schema.ts @@ -1,3 +1,3 @@ -import { z } from "astro:content"; +import { z } from "astro/zod"; export const llmstxtSchema = z.boolean().optional(); diff --git a/packages/astro-utils/src/sidebar/index.ts b/packages/astro-utils/src/sidebar/index.ts index 904f76f70ab..4569954ccf3 100644 --- a/packages/astro-utils/src/sidebar/index.ts +++ b/packages/astro-utils/src/sidebar/index.ts @@ -53,7 +53,8 @@ export async function processSidebar( function getSlugFromPath(directory: string, path: string) { const name = parse(path).name.toLocaleLowerCase(); const normalizedName = name === "index" ? "" : name; - return prefix(join(directory, normalizedName)) + const joined = join(directory, normalizedName); + return prefix(joined === "." ? "" : joined) .replaceAll("$", "") .replaceAll(" ", "-") .toLowerCase(); diff --git a/packages/best-practices/package.json b/packages/best-practices/package.json index 4d049fc8a47..b7fc4cb96c2 100644 --- a/packages/best-practices/package.json +++ b/packages/best-practices/package.json @@ -23,12 +23,12 @@ ".": "./dist/src/index.js" }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "tsc -p .", - "watch": "tsc -p . --watch", + "build": "tsc -p tsconfig.build.json", + "watch": "tsc -p tsconfig.build.json --watch", "test": "vitest run", "test:ui": "vitest --ui", "test:ci": "vitest run --coverage --reporter=junit --reporter=default", @@ -44,13 +44,13 @@ "@typespec/compiler": "workspace:^" }, "devDependencies": { - "@types/node": "~25.0.2", + "@types/node": "catalog:", "@typespec/compiler": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/best-practices/tsconfig.build.json b/packages/best-practices/tsconfig.build.json new file mode 100644 index 00000000000..11aa6998bf5 --- /dev/null +++ b/packages/best-practices/tsconfig.build.json @@ -0,0 +1,5 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "test/**/*.ts"], + "references": [{ "path": "../compiler/tsconfig.build.json" }] +} diff --git a/packages/best-practices/tsconfig.config.json b/packages/best-practices/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/best-practices/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/best-practices/tsconfig.json b/packages/best-practices/tsconfig.json index b320859bdef..3dc7c231583 100644 --- a/packages/best-practices/tsconfig.json +++ b/packages/best-practices/tsconfig.json @@ -5,6 +5,5 @@ "outDir": "dist", "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo" - }, - "include": ["src/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/bundle-uploader/package.json b/packages/bundle-uploader/package.json index 96b14ec617a..49ae21cfb10 100644 --- a/packages/bundle-uploader/package.json +++ b/packages/bundle-uploader/package.json @@ -20,12 +20,12 @@ "type": "module", "main": "dist/src/index.js", "engines": { - "node": ">=16.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "tsc -p .", - "watch": "tsc -p . --watch", + "build": "tsc -p tsconfig.build.json", + "watch": "tsc -p tsconfig.build.json --watch", "test": "echo 'no test'", "test:ci": "echo 'no test'", "lint": "eslint . --max-warnings=0", @@ -37,22 +37,23 @@ "!dist/test/**" ], "dependencies": { - "@azure/identity": "~4.13.0", - "@azure/storage-blob": "~12.30.0", - "@pnpm/workspace.find-packages": "^1000.0.24", + "@azure/identity": "catalog:", + "@azure/storage-blob": "catalog:", + "@pnpm/workspace.find-packages": "catalog:", "@typespec/bundler": "workspace:^", - "json5": "^2.2.3", - "picocolors": "~1.1.1", - "semver": "^7.7.1" + "globby": "catalog:", + "json5": "catalog:", + "picocolors": "catalog:", + "semver": "catalog:" }, "devDependencies": { - "@types/node": "~25.0.2", - "@types/semver": "^7.5.8", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@types/node": "catalog:", + "@types/semver": "catalog:", + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/bundle-uploader/src/index.ts b/packages/bundle-uploader/src/index.ts index 757403df988..abf805d40a9 100644 --- a/packages/bundle-uploader/src/index.ts +++ b/packages/bundle-uploader/src/index.ts @@ -1,7 +1,9 @@ import { AzureCliCredential } from "@azure/identity"; import { findWorkspacePackagesNoCheck } from "@pnpm/workspace.find-packages"; import { createTypeSpecBundle } from "@typespec/bundler"; -import { resolve } from "path"; +import { readFile } from "fs/promises"; +import { globby } from "globby"; +import { relative, resolve } from "path"; import { join as joinUnix } from "path/posix"; import pc from "picocolors"; import { parse } from "semver"; @@ -16,6 +18,137 @@ function logSuccess(message: string) { logInfo(pc.green(`✔ ${message}`)); } +export interface PlaygroundAssetConfig { + /** Glob pattern relative to the package root (e.g. "generator/dist/pygen-*.whl"). */ + path: string; + /** MIME content type for the blob upload. */ + contentType: string; +} + +export interface PlaygroundConfig { + /** Static files to upload as binary blobs. Paths support simple glob patterns. */ + assets?: PlaygroundAssetConfig[]; + /** Peer dependencies that should be bundled and uploaded. */ + bundlePeerDependencies?: string[]; +} + +export interface BundleAndUploadStandalonePackageOptions { + /** + * Absolute path to the package directory. + */ + packagePath: string; +} + +/** + * Bundle and upload a standalone package that is not part of the pnpm workspace. + * Uploads the bundle files and writes a `latest.json` under the package's blob directory + * (e.g. `@typespec/http-client-csharp/latest.json`). + * + * If the package's `package.json` contains a `playgroundConfig` section, this function + * will also upload static assets (resolved via glob patterns) and bundle peer dependencies. + */ +export async function bundleAndUploadStandalonePackage({ + packagePath, +}: BundleAndUploadStandalonePackageOptions) { + const pkgJsonPath = resolve(packagePath, "package.json"); + const pkgJson = JSON.parse(await readFile(pkgJsonPath, "utf-8")); + const playgroundConfig: PlaygroundConfig | undefined = pkgJson.playgroundConfig; + + const bundle = await createTypeSpecBundle(packagePath); + const manifest = bundle.manifest; + logInfo(`Bundling standalone package: ${manifest.name}@${manifest.version}`); + + const uploader = new TypeSpecBundledPackageUploader(new AzureCliCredential()); + await uploader.createIfNotExists(); + + const result = await uploader.upload(bundle); + if (result.status === "uploaded") { + logSuccess(`Bundle for package ${manifest.name}@${manifest.version} uploaded.`); + } else { + logInfo(`Bundle for package ${manifest.name} already exists for version ${manifest.version}.`); + } + + const importMap: Record = {}; + for (const [key, value] of Object.entries(result.imports)) { + importMap[joinUnix(manifest.name, key)] = value; + } + + await uploadPlaygroundAssets(uploader, packagePath, manifest, importMap, playgroundConfig); + + await uploader.updatePackageLatest(manifest.name, { + version: manifest.version, + imports: importMap, + }); + logSuccess(`Updated ${manifest.name}/latest.json for version ${manifest.version}.`); +} + +/** + * Upload playground assets and bundle peer dependencies based on the provided config. + */ +async function uploadPlaygroundAssets( + uploader: TypeSpecBundledPackageUploader, + packagePath: string, + manifest: { name: string; version: string }, + importMap: Record, + config: PlaygroundConfig | undefined, +) { + if (!config) { + return; + } + + // Upload static assets (e.g. .whl files) + if (config.assets) { + for (const asset of config.assets) { + const matchedFiles = await globby(asset.path, { cwd: packagePath, absolute: true }); + if (matchedFiles.length === 0) { + logInfo(pc.yellow(`⚠ No files matched asset pattern: ${asset.path}`)); + continue; + } + for (const filePath of matchedFiles) { + const relativePath = relative(packagePath, filePath).replace(/\\/g, "/"); + const blobPath = joinUnix(manifest.name, manifest.version, relativePath); + const content = await readFile(filePath); + const assetResult = await uploader.uploadBinaryAsset(blobPath, content, asset.contentType); + const importKey = joinUnix(manifest.name, relativePath); + importMap[importKey] = assetResult.url; + if (assetResult.status === "uploaded") { + logSuccess(`Uploaded asset: ${relativePath}`); + } else { + logInfo(`Asset already exists: ${relativePath}`); + } + } + } + } + + // Bundle and upload peer dependencies + if (config.bundlePeerDependencies) { + for (const depName of config.bundlePeerDependencies) { + const depPath = resolve(packagePath, "node_modules", depName); + try { + const depBundle = await createTypeSpecBundle(depPath); + const depResult = await uploader.upload(depBundle); + if (depResult.status === "uploaded") { + logSuccess( + `Bundle for peer dep ${depBundle.manifest.name}@${depBundle.manifest.version} uploaded.`, + ); + } else { + logInfo( + `Bundle for peer dep ${depBundle.manifest.name} already exists for version ${depBundle.manifest.version}.`, + ); + } + for (const [key, value] of Object.entries(depResult.imports)) { + importMap[joinUnix(depBundle.manifest.name, key)] = value; + } + } catch (e: unknown) { + throw new Error( + `Failed to bundle peer dependency ${depName}: ${e instanceof Error ? e.message : e}`, + { cause: e }, + ); + } + } + } +} + export interface BundleAndUploadPackagesOptions { repoRoot: string; /** @@ -85,9 +218,12 @@ export async function bundleAndUploadPackages({ } } logInfo(`Import map for ${indexVersion}:`, importMap); - await uploader.updateIndex(indexName, { + const index = { version: indexVersion, imports: importMap, - }); + }; + await uploader.updateIndex(indexName, index); logSuccess(`Updated index for version ${indexVersion}.`); + await uploader.updateLatestIndex(indexName, index); + logSuccess(`Updated latest index for version ${indexVersion}.`); } diff --git a/packages/bundle-uploader/src/upload-browser-package.ts b/packages/bundle-uploader/src/upload-browser-package.ts index eec752029d0..c2815847b9f 100644 --- a/packages/bundle-uploader/src/upload-browser-package.ts +++ b/packages/bundle-uploader/src/upload-browser-package.ts @@ -75,6 +75,80 @@ export class TypeSpecBundledPackageUploader { }); } + async uploadBinaryAsset( + blobPath: string, + content: Buffer, + contentType: string, + ): Promise<{ status: "uploaded" | "already-exists"; url: string }> { + const normalizedPath = normalizePath(blobPath); + const blob = this.#container.getBlockBlobClient(normalizedPath); + const url = `${this.#container.url}/${normalizedPath}`; + try { + await blob.uploadData(content, { + blobHTTPHeaders: { + blobContentType: contentType, + }, + conditions: { + ifNoneMatch: "*", + }, + }); + return { status: "uploaded", url }; + } catch (e: any) { + if (e.code === "BlobAlreadyExists") { + return { status: "already-exists", url }; + } + throw e; + } + } + + async getLatestIndex(name: string): Promise { + const blob = this.#container.getBlockBlobClient(`indexes/${name}/latest.json`); + if (await blob.exists()) { + const response = await blob.download(); + const body = await response.blobBody; + const existingContent = await body?.text(); + if (existingContent) { + return JSON.parse(existingContent); + } + } + return undefined; + } + + async updateLatestIndex(name: string, index: PackageIndex) { + const blob = this.#container.getBlockBlobClient(`indexes/${name}/latest.json`); + const content = JSON.stringify(index); + await blob.upload(content, content.length, { + blobHTTPHeaders: { + blobContentType: "application/json; charset=utf-8", + }, + }); + } + + /** Read the latest.json for a package from `{pkgName}/latest.json`. */ + async getPackageLatest(pkgName: string): Promise { + const blob = this.#container.getBlockBlobClient(normalizePath(join(pkgName, "latest.json"))); + if (await blob.exists()) { + const response = await blob.download(); + const body = await response.blobBody; + const existingContent = await body?.text(); + if (existingContent) { + return JSON.parse(existingContent); + } + } + return undefined; + } + + /** Write the latest.json for a package at `{pkgName}/latest.json`. */ + async updatePackageLatest(pkgName: string, index: PackageIndex) { + const blob = this.#container.getBlockBlobClient(normalizePath(join(pkgName, "latest.json"))); + const content = JSON.stringify(index); + await blob.upload(content, content.length, { + blobHTTPHeaders: { + blobContentType: "application/json; charset=utf-8", + }, + }); + } + async #uploadManifest(manifest: BundleManifest) { try { const blob = this.#container.getBlockBlobClient( diff --git a/packages/bundle-uploader/tsconfig.build.json b/packages/bundle-uploader/tsconfig.build.json new file mode 100644 index 00000000000..fb1f25450a4 --- /dev/null +++ b/packages/bundle-uploader/tsconfig.build.json @@ -0,0 +1,4 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "test/**/*.ts"] +} diff --git a/packages/bundle-uploader/tsconfig.config.json b/packages/bundle-uploader/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/bundle-uploader/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/bundle-uploader/tsconfig.json b/packages/bundle-uploader/tsconfig.json index 30ea2a96905..84433f97361 100644 --- a/packages/bundle-uploader/tsconfig.json +++ b/packages/bundle-uploader/tsconfig.json @@ -4,6 +4,5 @@ "outDir": "dist", "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo" - }, - "include": ["src/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/bundler/CHANGELOG.md b/packages/bundler/CHANGELOG.md index 5d60e24d9f9..abea0a325cf 100644 --- a/packages/bundler/CHANGELOG.md +++ b/packages/bundler/CHANGELOG.md @@ -1,5 +1,26 @@ # Change Log - @typespec/bundler +## 0.5.2 + +### Bug Fixes + +- [#10252](https://github.com/microsoft/typespec/pull/10252) Fix name minifying + + +## 0.5.1 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 0.5.0 + +### Features + +- [#9536](https://github.com/microsoft/typespec/pull/9536) Minify bundler output + + ## 0.4.7 ### Bump dependencies diff --git a/packages/bundler/package.json b/packages/bundler/package.json index 5cef0d9fee3..db778544b25 100644 --- a/packages/bundler/package.json +++ b/packages/bundler/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/bundler", - "version": "0.4.7", + "version": "0.5.2", "author": "Microsoft Corporation", "description": "Package to bundle a TypeSpec library.", "homepage": "https://typespec.io", @@ -23,13 +23,13 @@ "./vite": "./dist/src/vite/index.js" }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "bundle": "node ./dist/src/cli.js", "clean": "rimraf ./dist ./temp", - "build": "tsc -p .", - "watch": "tsc -p . --watch", + "build": "tsc -p tsconfig.build.json", + "watch": "tsc -p tsconfig.build.json --watch", "test": "vitest run", "test:ui": "vitest --ui", "test:ci": "vitest run --coverage --reporter=junit --reporter=default", @@ -43,21 +43,20 @@ ], "dependencies": { "@typespec/compiler": "workspace:^", - "esbuild": "^0.27.0", - "esbuild-plugins-node-modules-polyfill": "^1.7.0", - "node-stdlib-browser": "~1.3.1", - "picocolors": "~1.1.1", - "yargs": "~18.0.0" + "esbuild": "catalog:", + "esbuild-plugins-node-modules-polyfill": "catalog:", + "picocolors": "catalog:", + "yargs": "catalog:" }, "devDependencies": { - "@types/node": "~25.0.2", - "@types/yargs": "~17.0.33", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vite": "^7.2.7", - "vitest": "^4.0.15" + "@types/node": "catalog:", + "@types/yargs": "catalog:", + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vite": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/bundler/src/bundler.ts b/packages/bundler/src/bundler.ts index 0fc8f5dfc31..8e8676c1c1d 100644 --- a/packages/bundler/src/bundler.ts +++ b/packages/bundler/src/bundler.ts @@ -239,6 +239,7 @@ async function createEsBuildContext( format: "esm", target: "es2024", minify, + keepNames: minify, plugins: [virtualPlugin, nodeModulesPolyfillPlugin({}), ...plugins], }); } diff --git a/packages/bundler/test/test.test.ts b/packages/bundler/test/test.test.ts index 6924495d386..0b5d7b5ba85 100644 --- a/packages/bundler/test/test.test.ts +++ b/packages/bundler/test/test.test.ts @@ -1,8 +1,54 @@ -import { ok } from "assert"; -import { describe, it } from "vitest"; +import { mkdtemp, rm, writeFile } from "fs/promises"; +import { tmpdir } from "os"; +import { join } from "path"; +import { describe, expect, it } from "vitest"; +import { createTypeSpecBundle } from "../src/bundler.js"; describe("bundler", () => { - it("works", () => { - ok(true); + /** + * Regression test: TypeSpec decorator functions are identified by their `.name` property + * at runtime (e.g., `d.decorator.name === "$armResourceOperations"`). + * When esbuild minifies library bundles, it can rename functions, changing their `.name`. + * The bundler must use `keepNames: true` to preserve function names in minified output. + */ + it("preserves function names when minifying", async () => { + const tmpDir = await mkdtemp(join(tmpdir(), "typespec-bundler-test-")); + try { + // Create a minimal TypeSpec library with named decorator function exports + await writeFile( + join(tmpDir, "package.json"), + JSON.stringify({ + name: "test-lib", + version: "1.0.0", + main: "index.js", + tspMain: "main.tsp", + peerDependencies: {}, + }), + ); + await writeFile( + join(tmpDir, "main.tsp"), + ['import "./index.js";', "namespace TestLib;"].join("\n"), + ); + await writeFile( + join(tmpDir, "index.js"), + [ + "export function $testDecorator(context, target) { }", + "export function $anotherDecorator(context, target) { }", + ].join("\n"), + ); + + const bundle = await createTypeSpecBundle(tmpDir, { minify: true }); + const indexFile = bundle.files.find((f) => f.filename === "index.js"); + expect(indexFile, "index.js should be in bundle output").toBeDefined(); + + // The bundle's jsSourceFiles should contain modules where the function + // .name property is preserved. With keepNames, esbuild emits a helper + // that restores the original name via Object.defineProperty. + // We verify the original function names appear as string literals in the output. + expect(indexFile!.content).toContain('"$testDecorator"'); + expect(indexFile!.content).toContain('"$anotherDecorator"'); + } finally { + await rm(tmpDir, { recursive: true }); + } }); }); diff --git a/packages/bundler/tsconfig.build.json b/packages/bundler/tsconfig.build.json new file mode 100644 index 00000000000..6d0b8475eae --- /dev/null +++ b/packages/bundler/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "test/**/*.ts"], + "references": [ + { "path": "../compiler/tsconfig.build.json" }, + { "path": "../rest/tsconfig.build.json" } + ] +} diff --git a/packages/bundler/tsconfig.config.json b/packages/bundler/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/bundler/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/bundler/tsconfig.json b/packages/bundler/tsconfig.json index c24f79fff2b..be487b204db 100644 --- a/packages/bundler/tsconfig.json +++ b/packages/bundler/tsconfig.json @@ -6,6 +6,5 @@ "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo", "skipLibCheck": true - }, - "include": ["src/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/compiler/CHANGELOG.md b/packages/compiler/CHANGELOG.md index ba0bbdbd26f..76aae5174a1 100644 --- a/packages/compiler/CHANGELOG.md +++ b/packages/compiler/CHANGELOG.md @@ -1,5 +1,71 @@ # Change Log - @typespec/compiler +## 1.11.0 + +### Features + +- [#9893](https://github.com/microsoft/typespec/pull/9893) Added a new template `FilterVisibility` to support more accurate visibility transforms. This replaces the `@withVisibilityFilter` decorator, which is now deprecated and slated for removal in a future version of TypeSpec. + +### Bug Fixes + +- [#10196](https://github.com/microsoft/typespec/pull/10196) Include model name in `duplicate-property` error message +- [#10199](https://github.com/microsoft/typespec/pull/10199) [invalid-discriminated-union-variant] `duplicateDefaultVariant` diagnostic now includes the union type name +- [#10183](https://github.com/microsoft/typespec/pull/10183) Do not interpolate non primitive values in config automatically + ```yaml + file-type: ["json", "yaml"] + output-file: "openapi.{file-type}" + ``` + Will not be interpolated as `openapi.json,yaml` but keep the placeholder `{file-type}` intact for the emitter to handle. +- [#9893](https://github.com/microsoft/typespec/pull/9893) Fixed a bug that would prevent template parameters from assigning to values in some cases. + + +## 1.10.0 + +### Features + +- [#9819](https://github.com/microsoft/typespec/pull/9819) Export `resolveCodeFix` function to allow resolving a `CodeFix` into `CodeFixEdit[]` without the LSP layer. +- [#9829](https://github.com/microsoft/typespec/pull/9829) `tsp info` now accepts an optional `` argument to display detailed information about a specific library or emitter, including all available options. +- [#9060](https://github.com/microsoft/typespec/pull/9060) Added support for Functions, a new type graph entity and language feature. Functions enable library authors to provide input-output style transforms that operate on types and values. See [the Functions Documentation](https://typespec.io/docs/language-basics/functions/) for more information about the use and implementation of functions. +- [#9762](https://github.com/microsoft/typespec/pull/9762) Added experimental support for `internal` modifiers on type declarations. Any type _except `namespace`_ can be declared `internal`. An `internal` symbol can only be accessed from within the same package where it was declared. + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + +### Bug Fixes + +- [#9939](https://github.com/microsoft/typespec/pull/9939) Fix `@overload` interface validation failing when the enclosing namespace is versioned +- [#9641](https://github.com/microsoft/typespec/pull/9641) Don't report `non-literal-string-template` diagnostic when interpolating an invalid reference +- [#9803](https://github.com/microsoft/typespec/pull/9803) Support `TYPESPEC_NPM_REGISTRY` environment variable to configure the npm registry used by `tsp init` and `tsp install` when fetching package manifests and downloading packages. +- [#9804](https://github.com/microsoft/typespec/pull/9804) Fix crash when using custom scalar initializer in examples or default values + [API] Fix crash in `serializeValueAsJson` when a custom scalar initializer has no recognized constructor (e.g. `S.i()` with no args). Now returns `undefined` instead of crashing. +- [#9670](https://github.com/microsoft/typespec/pull/9670) Fixed an issue where referencing a member of a templated alias with defaultable parameters would fail to instantiate the alias, leaking template parameters. + + +## 1.9.0 + +### Deprecations + +- [#9336](https://github.com/microsoft/typespec/pull/9336) Deprecate `program` parameter in `isArrayModelType` and `isRecordModelType` functions. Use the new single-argument overload instead: `isArrayModelType(type)` and `isRecordModelType(type)`. + +### Features + +- [#9078](https://github.com/microsoft/typespec/pull/9078) Remove type constraints from `@continuationToken` decorator +- [#9512](https://github.com/microsoft/typespec/pull/9512) [API] Add performance reporting utilities for emitters [See docs for more info](https://typespec.io/docs/extending-typespec/performance-reporting/) +- [#9475](https://github.com/microsoft/typespec/pull/9475) [API] `serializeValueAsJson` throws a `UnsupportedScalarConstructorError` for unsupported scalar constructor instead of crashing + +### Bump dependencies + +- [#9446](https://github.com/microsoft/typespec/pull/9446) Upgrade dependencies + +### Bug Fixes + +- [#9320](https://github.com/microsoft/typespec/pull/9320) Fix `--list-files` not working when multiple instance of compiler are loaded +- [#9607](https://github.com/microsoft/typespec/pull/9607) Fix stack overflow for specs with large number of circular references +- [#9342](https://github.com/microsoft/typespec/pull/9342) Ensuring ignore-deprecated gets resolved. +- [#9588](https://github.com/microsoft/typespec/pull/9588) Fixed several checking errors around template instantiations that could cause TemplateParameter instances to leak into decorator calls. + + ## 1.8.0 ### Features diff --git a/packages/compiler/generated-defs/TypeSpec.Prototypes.ts-test.ts b/packages/compiler/generated-defs/TypeSpec.Prototypes.ts-test.ts index ba67b433b56..27a99b09c6f 100644 --- a/packages/compiler/generated-defs/TypeSpec.Prototypes.ts-test.ts +++ b/packages/compiler/generated-defs/TypeSpec.Prototypes.ts-test.ts @@ -7,4 +7,4 @@ import type { TypeSpecPrototypesDecorators } from "./TypeSpec.Prototypes.js"; /** * An error here would mean that the exported decorator is not using the same signature. Make sure to have export const $decName: DecNameDecorator = (...) => ... */ -const _: TypeSpecPrototypesDecorators = $decorators["TypeSpec.Prototypes"]; +const _decs: TypeSpecPrototypesDecorators = $decorators["TypeSpec.Prototypes"]; diff --git a/packages/compiler/generated-defs/TypeSpec.ts b/packages/compiler/generated-defs/TypeSpec.ts index 177b9afc681..2f066713ac6 100644 --- a/packages/compiler/generated-defs/TypeSpec.ts +++ b/packages/compiler/generated-defs/TypeSpec.ts @@ -3,6 +3,7 @@ import type { DecoratorValidatorCallbacks, Enum, EnumValue, + FunctionContext, Interface, Model, ModelProperty, @@ -1206,3 +1207,21 @@ export type TypeSpecDecorators = { withVisibilityFilter: WithVisibilityFilterDecorator; withLifecycleUpdate: WithLifecycleUpdateDecorator; }; + +export type ApplyVisibilityFilterFunctionImplementation = ( + context: FunctionContext, + input: Model, + filter: VisibilityFilter, + nameTemplate?: string, +) => Model; + +export type ApplyLifecycleUpdateFunctionImplementation = ( + context: FunctionContext, + input: Model, + nameTemplate?: string, +) => Model; + +export type TypeSpecFunctions = { + applyVisibilityFilter: ApplyVisibilityFilterFunctionImplementation; + applyLifecycleUpdate: ApplyLifecycleUpdateFunctionImplementation; +}; diff --git a/packages/compiler/generated-defs/TypeSpec.ts-test.ts b/packages/compiler/generated-defs/TypeSpec.ts-test.ts index 12337f14a8a..568630da9c4 100644 --- a/packages/compiler/generated-defs/TypeSpec.ts-test.ts +++ b/packages/compiler/generated-defs/TypeSpec.ts-test.ts @@ -1,10 +1,15 @@ // An error in the imports would mean that the decorator is not exported or // doesn't have the right name. -import { $decorators } from "../src/index.js"; -import type { TypeSpecDecorators } from "./TypeSpec.js"; +import { $decorators, $functions } from "../src/index.js"; +import type { TypeSpecDecorators, TypeSpecFunctions } from "./TypeSpec.js"; /** * An error here would mean that the exported decorator is not using the same signature. Make sure to have export const $decName: DecNameDecorator = (...) => ... */ -const _: TypeSpecDecorators = $decorators["TypeSpec"]; +const _decs: TypeSpecDecorators = $decorators["TypeSpec"]; + +/** + * An error here would mean that the exported function is not using the same signature. Make sure to have export const $funcName: FuncNameFunction = (...) => ... + */ +const _funcs: TypeSpecFunctions = $functions["TypeSpec"]; diff --git a/packages/compiler/lib/prototypes.tsp b/packages/compiler/lib/prototypes.tsp index f315dd5908c..2f7caea754c 100644 --- a/packages/compiler/lib/prototypes.tsp +++ b/packages/compiler/lib/prototypes.tsp @@ -1,6 +1,7 @@ namespace TypeSpec.Prototypes; -extern dec getter(target: unknown); +#suppress "experimental-feature" "Compiler internal decorator." +internal extern dec getter(target: unknown); namespace Types { interface ModelProperty { diff --git a/packages/compiler/lib/std/visibility.tsp b/packages/compiler/lib/std/visibility.tsp index fad44fa1ea5..3024070f396 100644 --- a/packages/compiler/lib/std/visibility.tsp +++ b/packages/compiler/lib/std/visibility.tsp @@ -299,12 +299,60 @@ model VisibilityFilter { * } * ``` */ +#deprecated "withVisibilityFilter is deprecated and will be removed in a future release. Use the `FilterVisibility` template or Lifecycle specific templates (e.g. `Read`, `Create`, `Update`, etc.) instead." extern dec withVisibilityFilter( target: Model, filter: valueof VisibilityFilter, nameTemplate?: valueof string ); +/** + * A copy of the input model `M` with only the properties that match the given visibility filter. + * + * This transformation is recursive, so it will also apply the filter to any nested + * or referenced models that are the types of any properties in the `target`. + * + * If a `nameTemplate` is provided, newly-created type instances will be named according + * to the template. See the `@friendlyName` decorator for more information on the template + * syntax. The transformed type is provided as the argument to the template. + * + * @template M the model to apply the visibility filter to. + * @template Filter the visibility filter to apply to the properties of the target model. + * @template NameTemplate the name template to use when renaming new type instances. + * + * @example + * ```typespec + * model Dog { + * @visibility(CustomVisibility.A) + * id: int32; + * @removeVisibility(CustomVisibility.A) + * name: string; + * } + * + * enum CustomVisibility { + * A, + * B, + * } + * + * const customFilter: VisibilityFilter = #{ all: #[CustomVisibility.A] }; + * + * // This model will have the `id` property but not the `name` property, since `id` has the CustomVisibility.A visibility and `name` does not. + * model DogRead is FilterVisibility; + * ``` + */ +alias FilterVisibility< + M extends Model, + Filter extends valueof VisibilityFilter, + NameTemplate extends valueof string +> = applyVisibilityFilter(M, Filter, NameTemplate); + +#suppress "experimental-feature" +internal extern fn applyVisibilityFilter( + input: Model, + filter: valueof VisibilityFilter, + nameTemplate?: valueof string +): Model; + /** * Transforms the `target` model to include only properties that are visible during the * "Update" lifecycle phase. @@ -338,8 +386,12 @@ extern dec withVisibilityFilter( * } * ``` */ +#deprecated "withLifecycleUpdate is deprecated and will be removed in a future release. Use the `Update` template instead." extern dec withLifecycleUpdate(target: Model, nameTemplate?: valueof string); +#suppress "experimental-feature" +internal extern fn applyLifecycleUpdate(input: Model, nameTemplate?: valueof string): Model; + /** * A copy of the input model `T` with only the properties that are visible during the * "Create" resource lifecycle phase. @@ -366,12 +418,10 @@ extern dec withLifecycleUpdate(target: Model, nameTemplate?: valueof string); * model CreateDog is Create; * ``` */ -@doc("") -@friendlyName(NameTemplate, T) -@withVisibilityFilter(#{ all: #[Lifecycle.Create] }, NameTemplate) -model Create { - ...T; -} +alias Create< + T extends Model, + NameTemplate extends valueof string = "Create{name}" +> = applyVisibilityFilter(T, #{ all: #[Lifecycle.Create] }, NameTemplate); /** * A copy of the input model `T` with only the properties that are visible during the @@ -405,12 +455,10 @@ model Create { - ...T; -} +alias Read< + T extends Model, + NameTemplate extends valueof string = "Read{name}" +> = applyVisibilityFilter(T, #{ all: #[Lifecycle.Read] }, NameTemplate); /** * A copy of the input model `T` with only the properties that are visible during the @@ -445,12 +493,10 @@ model Read { - ...T; -} +alias Update< + T extends Model, + NameTemplate extends valueof string = "Update{name}" +> = applyLifecycleUpdate(T, NameTemplate); /** * A copy of the input model `T` with only the properties that are visible during the @@ -487,15 +533,10 @@ model Update { - ...T; -} +> = applyVisibilityFilter(T, #{ any: #[Lifecycle.Create, Lifecycle.Update] }, NameTemplate); /** * A copy of the input model `T` with only the properties that are visible during the @@ -531,12 +572,10 @@ model CreateOrUpdate< * model DeleteDog is Delete; * ``` */ -@doc("") -@friendlyName(NameTemplate, T) -@withVisibilityFilter(#{ all: #[Lifecycle.Delete] }, NameTemplate) -model Delete { - ...T; -} +alias Delete< + T extends Model, + NameTemplate extends valueof string = "Delete{name}" +> = applyVisibilityFilter(T, #{ all: #[Lifecycle.Delete] }, NameTemplate); /** * A copy of the input model `T` with only the properties that are visible during the @@ -580,9 +619,7 @@ model Delete { - ...T; -} +alias Query< + T extends Model, + NameTemplate extends valueof string = "Query{name}" +> = applyVisibilityFilter(T, #{ all: #[Lifecycle.Query] }, NameTemplate); diff --git a/packages/compiler/package.json b/packages/compiler/package.json index a20d803bcea..b3fbae4cae5 100644 --- a/packages/compiler/package.json +++ b/packages/compiler/package.json @@ -1,7 +1,7 @@ { "name": "@typespec/compiler", - "version": "1.8.0", - "description": "TypeSpec Compiler Preview", + "version": "1.11.0", + "description": "TypeSpec compiler and standard library", "author": "Microsoft Corporation", "license": "MIT", "homepage": "https://typespec.io", @@ -69,7 +69,7 @@ "./dist/src/core/logger/console-sink.js": "./dist/src/core/logger/console-sink.browser.js" }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "bin": { "tsp": "cmd/tsp.js", @@ -87,8 +87,8 @@ "build:init-templates-index": "tsx ./.scripts/build-init-templates.ts", "build": "pnpm gen-manifest && pnpm build:init-templates-index && pnpm compile && pnpm generate-tmlanguage", "api-extractor": "api-extractor run --local --verbose", - "compile": "tsc -p .", - "watch": "tsc -p . --watch", + "compile": "tsc -p tsconfig.build.json", + "watch": "tsc -p tsconfig.build.json --watch", "watch-tmlanguage": "node scripts/watch-tmlanguage.js", "generate-tmlanguage": "node scripts/generate-tmlanguage.js", "gen-extern-signature": "tsx ./.scripts/gen-extern-signature.ts", @@ -105,42 +105,42 @@ "lint:fix": "eslint . --fix" }, "dependencies": { - "@babel/code-frame": "~7.28.6", - "@inquirer/prompts": "^8.0.1", - "ajv": "~8.17.1", - "change-case": "~5.4.4", - "env-paths": "^3.0.0", - "globby": "~16.1.0", - "is-unicode-supported": "^2.1.0", - "mustache": "~4.2.0", - "picocolors": "~1.1.1", - "prettier": "~3.8.0", - "semver": "^7.7.1", - "tar": "^7.5.2", - "temporal-polyfill": "^0.3.0", - "vscode-languageserver": "~9.0.1", - "vscode-languageserver-textdocument": "~1.0.12", - "yaml": "~2.8.2", - "yargs": "~18.0.0" + "@babel/code-frame": "catalog:", + "@inquirer/prompts": "catalog:", + "ajv": "catalog:", + "change-case": "catalog:", + "env-paths": "catalog:", + "globby": "catalog:", + "is-unicode-supported": "catalog:", + "mustache": "catalog:", + "picocolors": "catalog:", + "prettier": "catalog:", + "semver": "catalog:", + "tar": "catalog:", + "temporal-polyfill": "catalog:", + "vscode-languageserver": "catalog:", + "vscode-languageserver-textdocument": "catalog:", + "yaml": "catalog:", + "yargs": "catalog:" }, "devDependencies": { - "@types/babel__code-frame": "~7.27.0", - "@types/mustache": "~4.2.5", - "@types/node": "~25.0.2", - "@types/semver": "^7.5.8", - "@types/yargs": "~17.0.33", + "@types/babel__code-frame": "catalog:", + "@types/mustache": "catalog:", + "@types/node": "catalog:", + "@types/semver": "catalog:", + "@types/yargs": "catalog:", "@typespec/internal-build-utils": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "grammarkdown": "~3.3.2", - "pathe": "^2.0.3", - "rimraf": "~6.1.2", - "source-map-support": "~0.5.21", + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "grammarkdown": "catalog:", + "pathe": "catalog:", + "rimraf": "catalog:", + "source-map-support": "catalog:", "tmlanguage-generator": "workspace:^", - "typescript": "~5.9.2", - "vitest": "^4.0.15", - "vscode-oniguruma": "~2.0.1", - "vscode-textmate": "~9.3.0" + "typescript": "catalog:", + "vitest": "catalog:", + "vscode-oniguruma": "catalog:", + "vscode-textmate": "catalog:" } } diff --git a/packages/compiler/src/config/config-interpolation.ts b/packages/compiler/src/config/config-interpolation.ts index d96d8c4dd15..705cf2bce24 100644 --- a/packages/compiler/src/config/config-interpolation.ts +++ b/packages/compiler/src/config/config-interpolation.ts @@ -114,8 +114,13 @@ export function resolveValues>( resolvingValues.delete(keyPath); return value; } - const replaced = value.replace(VariableInterpolationRegex, (_, expression) => { - return (resolveExpression(expression) as string) ?? `{${expression}}`; + const replaced = value.replace(VariableInterpolationRegex, (match, expression) => { + const resolved = resolveExpression(expression); + return typeof resolved === "string" || + typeof resolved === "number" || + typeof resolved === "boolean" + ? String(resolved) + : match; }); resolvingValues.delete(keyPath); return replaced; diff --git a/packages/compiler/src/core/binder.ts b/packages/compiler/src/core/binder.ts index 1e7b10c3c65..09a5e5b5108 100644 --- a/packages/compiler/src/core/binder.ts +++ b/packages/compiler/src/core/binder.ts @@ -13,6 +13,7 @@ import { EnumStatementNode, FileLibraryMetadata, FunctionDeclarationStatementNode, + FunctionImplementations, FunctionParameterNode, InterfaceStatementNode, IntersectionExpressionNode, @@ -21,6 +22,7 @@ import { ModelExpressionNode, ModelPropertyNode, ModelStatementNode, + ModifierFlags, MutableSymbolTable, NamespaceStatementNode, Node, @@ -133,7 +135,6 @@ export function createBinder(program: Program): Binder { for (const [key, member] of Object.entries(sourceFile.esmExports)) { let name: string; - let kind: "decorator" | "function"; if (key === "$flags") { const context = getLocationContext(program, sourceFile); if (context.type === "library" || context.type === "project") { @@ -152,12 +153,24 @@ export function createBinder(program: Program): Binder { ); } } + } else if (key === "$functions") { + const value: FunctionImplementations = member as any; + for (const [namespaceName, functions] of Object.entries(value)) { + for (const [functionName, fn] of Object.entries(functions)) { + bindFunctionImplementation( + namespaceName === "" ? [] : namespaceName.split("."), + "function", + functionName, + fn, + sourceFile, + ); + } + } } else if (typeof member === "function") { // lots of 'any' casts here because control flow narrowing `member` to Function // isn't particularly useful it turns out. if (isFunctionName(key)) { name = getFunctionName(key); - kind = "decorator"; if (name === "onValidate") { const context = getLocationContext(program, sourceFile); const metadata = @@ -170,12 +183,9 @@ export function createBinder(program: Program): Binder { // nothing to do here this is loaded as emitter. continue; } - } else { - name = key; - kind = "function"; + const nsParts = resolveJSMemberNamespaceParts(rootNs, member); + bindFunctionImplementation(nsParts, "decorator", name, member as any, sourceFile); } - const nsParts = resolveJSMemberNamespaceParts(rootNs, member); - bindFunctionImplementation(nsParts, kind, name, member as any, sourceFile); } } } @@ -208,6 +218,8 @@ export function createBinder(program: Program): Binder { parent: sourceFile, flags: NodeFlags.None, symbol: undefined!, + modifiers: [], + modifierFlags: ModifierFlags.None, }; const sym = createSymbol( jsNamespaceNode, @@ -380,7 +392,10 @@ export function createBinder(program: Program): Binder { } function bindModelStatement(node: ModelStatementNode) { - declareSymbol(node, SymbolFlags.Model | SymbolFlags.Declaration); + const internal = + node.modifierFlags & ModifierFlags.Internal ? SymbolFlags.Internal : SymbolFlags.None; + + declareSymbol(node, SymbolFlags.Model | SymbolFlags.Declaration | internal); // Initialize locals for type parameters mutate(node).locals = new SymbolTable(); } @@ -398,7 +413,9 @@ export function createBinder(program: Program): Binder { } function bindScalarStatement(node: ScalarStatementNode) { - declareSymbol(node, SymbolFlags.Scalar | SymbolFlags.Declaration); + const internal = + node.modifierFlags & ModifierFlags.Internal ? SymbolFlags.Internal : SymbolFlags.None; + declareSymbol(node, SymbolFlags.Scalar | SymbolFlags.Declaration | internal); // Initialize locals for type parameters mutate(node).locals = new SymbolTable(); } @@ -408,26 +425,36 @@ export function createBinder(program: Program): Binder { } function bindInterfaceStatement(node: InterfaceStatementNode) { - declareSymbol(node, SymbolFlags.Interface | SymbolFlags.Declaration); + const internal = + node.modifierFlags & ModifierFlags.Internal ? SymbolFlags.Internal : SymbolFlags.None; + declareSymbol(node, SymbolFlags.Interface | SymbolFlags.Declaration | internal); mutate(node).locals = new SymbolTable(); } function bindUnionStatement(node: UnionStatementNode) { - declareSymbol(node, SymbolFlags.Union | SymbolFlags.Declaration); + const internal = + node.modifierFlags & ModifierFlags.Internal ? SymbolFlags.Internal : SymbolFlags.None; + declareSymbol(node, SymbolFlags.Union | SymbolFlags.Declaration | internal); mutate(node).locals = new SymbolTable(); } function bindAliasStatement(node: AliasStatementNode) { - declareSymbol(node, SymbolFlags.Alias | SymbolFlags.Declaration); + const internal = + node.modifierFlags & ModifierFlags.Internal ? SymbolFlags.Internal : SymbolFlags.None; + declareSymbol(node, SymbolFlags.Alias | SymbolFlags.Declaration | internal); // Initialize locals for type parameters mutate(node).locals = new SymbolTable(); } function bindConstStatement(node: ConstStatementNode) { - declareSymbol(node, SymbolFlags.Const | SymbolFlags.Declaration); + const internal = + node.modifierFlags & ModifierFlags.Internal ? SymbolFlags.Internal : SymbolFlags.None; + declareSymbol(node, SymbolFlags.Const | SymbolFlags.Declaration | internal); } function bindEnumStatement(node: EnumStatementNode) { - declareSymbol(node, SymbolFlags.Enum | SymbolFlags.Declaration); + const internal = + node.modifierFlags & ModifierFlags.Internal ? SymbolFlags.Internal : SymbolFlags.None; + declareSymbol(node, SymbolFlags.Enum | SymbolFlags.Declaration | internal); } function bindEnumMember(node: EnumMemberNode) { @@ -473,24 +500,34 @@ export function createBinder(program: Program): Binder { } function bindOperationStatement(statement: OperationStatementNode) { + const internal = + statement.modifierFlags & ModifierFlags.Internal ? SymbolFlags.Internal : SymbolFlags.None; if (scope.kind === SyntaxKind.InterfaceStatement) { declareMember( statement, - SymbolFlags.Operation | SymbolFlags.Member | SymbolFlags.Declaration, + SymbolFlags.Operation | SymbolFlags.Member | SymbolFlags.Declaration | internal, statement.id.sv, ); } else { - declareSymbol(statement, SymbolFlags.Operation | SymbolFlags.Declaration); + declareSymbol(statement, SymbolFlags.Operation | SymbolFlags.Declaration | internal); } mutate(statement).locals = createSymbolTable(); } function bindDecoratorDeclarationStatement(node: DecoratorDeclarationStatementNode) { - declareSymbol(node, SymbolFlags.Decorator | SymbolFlags.Declaration, `@${node.id.sv}`); + const internal = + node.modifierFlags & ModifierFlags.Internal ? SymbolFlags.Internal : SymbolFlags.None; + declareSymbol( + node, + SymbolFlags.Decorator | SymbolFlags.Declaration | internal, + `@${node.id.sv}`, + ); } function bindFunctionDeclarationStatement(node: FunctionDeclarationStatementNode) { - declareSymbol(node, SymbolFlags.Function | SymbolFlags.Declaration); + const internal = + node.modifierFlags & ModifierFlags.Internal ? SymbolFlags.Internal : SymbolFlags.None; + declareSymbol(node, SymbolFlags.Function | SymbolFlags.Declaration | internal); } function bindFunctionParameter(node: FunctionParameterNode) { @@ -510,7 +547,11 @@ export function createBinder(program: Program): Binder { * @param name Optional symbol name, default to the node id. * @returns Created Symbol */ - function declareSymbol(node: Declaration, flags: SymbolFlags, name?: string) { + function declareSymbol( + node: Declaration | TemplateParameterDeclarationNode, + flags: SymbolFlags, + name?: string, + ) { compilerAssert(flags & SymbolFlags.Declaration, `Expected declaration symbol: ${name}`, node); switch (scope.kind) { case SyntaxKind.NamespaceStatement: @@ -533,7 +574,11 @@ export function createBinder(program: Program): Binder { return symbol; } - function declareNamespaceMember(node: Declaration, flags: SymbolFlags, name?: string) { + function declareNamespaceMember( + node: Declaration | TemplateParameterDeclarationNode, + flags: SymbolFlags, + name?: string, + ) { if ( flags & SymbolFlags.Namespace && mergeNamespaceDeclarations(node as NamespaceStatementNode, scope) @@ -547,7 +592,11 @@ export function createBinder(program: Program): Binder { return symbol; } - function declareScriptMember(node: Declaration, flags: SymbolFlags, name?: string) { + function declareScriptMember( + node: Declaration | TemplateParameterDeclarationNode, + flags: SymbolFlags, + name?: string, + ) { const effectiveScope = scope; if ( flags & SymbolFlags.Namespace && diff --git a/packages/compiler/src/core/checker.ts b/packages/compiler/src/core/checker.ts index fd8563ff39c..6d6b43daf1e 100644 --- a/packages/compiler/src/core/checker.ts +++ b/packages/compiler/src/core/checker.ts @@ -10,13 +10,20 @@ import { createTupleToArrayValueCodeFix, } from "./compiler-code-fixes/convert-to-value.codefix.js"; import { getDeprecationDetails, markDeprecated } from "./deprecation.js"; -import { compilerAssert, ignoreDiagnostics, reportDeprecated } from "./diagnostics.js"; +import { + compilerAssert, + createDiagnosticCollector, + ignoreDiagnostics, + reportDeprecated, +} from "./diagnostics.js"; import { validateInheritanceDiscriminatedUnions } from "./helpers/discriminator-utils.js"; +import { getLocationContext } from "./helpers/location-context.js"; import { explainStringTemplateNotSerializable } from "./helpers/string-template-utils.js"; import { typeReferenceToString } from "./helpers/syntax-utils.js"; import { getEntityName, getTypeName } from "./helpers/type-name-utils.js"; -import { marshallTypeForJS } from "./js-marshaller.js"; +import { marshalTypeForJs, unmarshalJsToValue } from "./js-marshaller.js"; import { createDiagnostic } from "./messages.js"; +import { checkModifiers } from "./modifiers.js"; import { NameResolver } from "./name-resolver.js"; import { Numeric } from "./numeric.js"; import { @@ -58,6 +65,7 @@ import { DecoratorExpressionNode, DecoratorValidatorCallbacks, Diagnostic, + DiagnosticResult, DiagnosticTarget, DocContent, Entity, @@ -68,9 +76,13 @@ import { EnumValue, ErrorType, Expression, + FunctionContext, FunctionDeclarationStatementNode, FunctionParameter, FunctionParameterNode, + FunctionType, + FunctionTypeExpressionNode, + FunctionValue, IdentifierKind, IdentifierNode, IndeterminateEntity, @@ -81,6 +93,7 @@ import { JsNamespaceDeclarationNode, LiteralNode, LiteralType, + LocationContext, MemberContainerNode, MemberContainerType, MemberExpressionNode, @@ -94,7 +107,6 @@ import { ModelProperty, ModelPropertyNode, ModelStatementNode, - ModifierFlags, Namespace, NamespaceStatementNode, NeverType, @@ -136,7 +148,6 @@ import { SymbolTable, SyntaxKind, TemplateArgumentNode, - TemplateDeclarationNode, TemplateParameter, TemplateParameterDeclarationNode, TemplateableNode, @@ -165,6 +176,147 @@ import { export type CreateTypeProps = Omit; +enum CheckFlags { + /** No flags set. */ + None = 0, + /** Currently checking within an uninstantiated template declaration. */ + InTemplateDeclaration = 1 << 0, +} + +class CheckContext { + /** The type mapper associated with this context, if any. */ + mapper: Mapper; + /** The flags enabled in this context. */ + flags: CheckFlags; + + #templateParametersObserved: Set | undefined; + + /** + * Creates a new CheckContext from a type mapper. + * @param mapper - the type mapper + */ + static from(mapper: TypeMapper): CheckContext; + /** + * Creates a new CheckContext with no mapper. + */ + static from(mapper: undefined): CheckContext; + /** + * Creates a new CheckContext from an optional TypeMapper. + * @param mapper + */ + static from(mapper: TypeMapper | undefined): CheckContext; + /** + * Copies an existing CheckContext. + * @param context + */ + static from(context: C): C; + /** + * Coerces a CheckContext from either a CheckContext or TypeMapper. + */ + static from(contextOrMapper: CheckContext | TypeMapper | undefined): CheckContext; + static from(contextOrMapper: CheckContext | TypeMapper | undefined): CheckContext { + if (contextOrMapper instanceof CheckContext) { + return contextOrMapper; + } + + return new CheckContext(contextOrMapper, CheckFlags.None); + } + + /** + * The default CheckContext to use at API entrypoints. + */ + static DEFAULT = new CheckContext(undefined, CheckFlags.None); + + private constructor( + mapper: Mapper, + flags: CheckFlags, + templateParametersObserved?: Set, + ) { + this.mapper = mapper; + this.flags = flags; + this.#templateParametersObserved = templateParametersObserved; + Object.freeze(this); + } + + /** + * Returns a new context with the given flags _added_ to the existing flags. + * + * @param flags - the flags to enable + * @returns a new CheckContext with the given flags enabled. + */ + withFlags(flags: CheckFlags): CheckContext { + return new CheckContext(this.mapper, this.flags | flags, this.#templateParametersObserved); + } + + /** + * Returns a new context with the given flags disabled. + * + * @param flags - the flags to disable + * @returns a new CheckContext with the given flags disabled. + */ + maskFlags(flags: CheckFlags): CheckContext { + return new CheckContext(this.mapper, this.flags & ~flags, this.#templateParametersObserved); + } + + /** + * Returns true if ALL of the given flags are enabled in this context. + */ + hasFlags(flags: CheckFlags): boolean { + return (this.flags & flags) === flags; + } + + /** + * Returns a new context with the given mapper. + * + * @param mapper - the new type mapper, or undefined to clear the mapper + * @returns a new CheckContext with the given mapper. + */ + withMapper(mapper: NewMapper): CheckContext { + return new CheckContext(mapper, this.flags, this.#templateParametersObserved); + } + + /** + * Observes a template parameter within the current observation scope, if any. + * + * @param param - the TemplateParameter type instance to observe + */ + observeTemplateParameter(param: TemplateParameter): void { + this.#templateParametersObserved?.add(param); + } + + /** + * Returns a new CheckContext with a new (empty) template parameter observation scope. + * + * Call this when you need to observe template parameters used within a specific context. + * + * @returns a new CheckContext with an empty template parameter observation scope. + */ + enterTemplateObserverScope(): CheckContext { + return new CheckContext(this.mapper, this.flags, new Set()); + } + + /** + * Creates a new CheckContext with no template parameter observation enabled. + * + * Call this when the checker is moving from one declaration to another, where usage of template parameters + * from the next scope should not impact the usage from the previous scope. + * + * @returns a new CheckContext with no template parameter observation. + */ + exitTemplateObserverScope(): CheckContext { + return new CheckContext(this.mapper, this.flags, undefined); + } + + /** + * @returns true if the observer scope in this context has seen any template parameter usage. + */ + hasObservedTemplateParameters(): boolean { + return this.#templateParametersObserved !== undefined + ? this.#templateParametersObserved.size > 0 + : false; + } +} + export interface Checker { /** @internal */ typePrototype: TypePrototype; @@ -300,6 +452,8 @@ export interface Checker { readonly nullType: NullType; /** @internal */ readonly anyType: UnknownType; + /** @internal */ + readonly unknownType: UnknownType; /** @internal */ stats: CheckerStats; @@ -396,6 +550,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker nullType, anyType: unknownType, voidType, + unknownType, typePrototype, createType, createAndFinishType, @@ -457,6 +612,18 @@ export function createChecker(program: Program, resolver: NameResolver): Checker node: undefined as any, // TODO: is this correct? }); + const internalDecorators = [ + typespecNamespaceBinding!.exports?.get("@indexer"), + typespecNamespaceBinding!.exports?.get("@docFromComment"), + typespecNamespaceBinding!.exports?.get("Prototypes")?.exports?.get("@getter"), + ]; + + for (const decorator of internalDecorators) { + if (decorator) { + mutate(decorator).flags |= SymbolFlags.Internal; + } + } + // Until we have an `unit` type for `null` mutate(resolver.symbols.null).type = nullType; getSymbolLinks(resolver.symbols.null).type = nullType; @@ -471,9 +638,9 @@ export function createChecker(program: Program, resolver: NameResolver): Checker const sym = typespecNamespaceBinding?.exports?.get(name); compilerAssert(sym, `Unexpected missing symbol to std type "${name}"`); if (sym.flags & SymbolFlags.Model) { - checkModelStatement(sym!.declarations[0] as any, undefined); + checkModelStatement(CheckContext.DEFAULT, sym!.declarations[0] as any); } else { - checkScalar(sym.declarations[0] as any, undefined); + checkScalar(CheckContext.DEFAULT, sym.declarations[0] as any); } const loadedType = stdTypes[name]; @@ -492,17 +659,17 @@ export function createChecker(program: Program, resolver: NameResolver): Checker * @param type Type * @param mapper Type mapper if in an template instantiation */ - function linkType(links: SymbolLinks, type: Type, mapper: TypeMapper | undefined) { - if (mapper === undefined) { + function linkType(ctx: CheckContext, links: SymbolLinks, type: Type) { + if (ctx.mapper === undefined) { links.declaredType = type; links.instantiations = new TypeInstantiationMap(); } else if (links.instantiations) { - links.instantiations.set(mapper.args, type); + links.instantiations.set(ctx.mapper.args, type); } } - function linkMemberType(links: SymbolLinks, type: Type, mapper: TypeMapper | undefined) { - if (mapper === undefined) { + function linkMemberType(ctx: CheckContext, links: SymbolLinks, type: Type) { + if (ctx.mapper === undefined) { links.declaredType = type; } } @@ -513,17 +680,17 @@ export function createChecker(program: Program, resolver: NameResolver): Checker * @param mapper Type mapper. * @returns Checked type for the given member symbol. */ - function checkMemberSym(sym: Sym, mapper: TypeMapper | undefined): Type { + function checkMemberSym(ctx: CheckContext, sym: Sym): Type { const symbolLinks = getSymbolLinks(sym); - const memberContainer = getTypeForNode(getSymNode(sym.parent!), mapper); + const memberContainer = getTypeForNode(getSymNode(sym.parent!), ctx); const type = symbolLinks.declaredType ?? symbolLinks.type; if (type) { return type; } else { return checkMember( + ctx, getSymNode(sym) as MemberNode, - mapper, memberContainer as MemberContainerType, )!; } @@ -537,21 +704,21 @@ export function createChecker(program: Program, resolver: NameResolver): Checker * @returns Checked member */ function checkMember( + ctx: CheckContext, node: MemberNode, - mapper: TypeMapper | undefined, containerType: MemberContainerType, ): Type { switch (node.kind) { case SyntaxKind.ModelProperty: - return checkModelProperty(node, mapper); + return checkModelProperty(ctx, node); case SyntaxKind.EnumMember: - return checkEnumMember(node, mapper, containerType as Enum); + return checkEnumMember(ctx, node, containerType as Enum); case SyntaxKind.OperationStatement: - return checkOperation(node, mapper, containerType as Interface); + return checkOperation(ctx, node, containerType as Interface); case SyntaxKind.UnionVariant: - return checkUnionVariant(node, mapper); + return checkUnionVariant(ctx, node); case SyntaxKind.ScalarConstructor: - return checkScalarConstructor(node, mapper, containerType as Scalar); + return checkScalarConstructor(ctx, node, containerType as Scalar); } } @@ -562,8 +729,9 @@ export function createChecker(program: Program, resolver: NameResolver): Checker return entity; } - function getTypeForNode(node: Node, mapper?: TypeMapper): Type { - const entity = checkNode(node, mapper); + function getTypeForNode(node: Node, mapperOrContext?: TypeMapper | CheckContext): Type { + const ctx = CheckContext.from(mapperOrContext); + const entity = checkNode(ctx, node); if (entity === null) { return errorType; } @@ -596,11 +764,12 @@ export function createChecker(program: Program, resolver: NameResolver): Checker function getValueForNode( node: Node, - mapper?: TypeMapper, + mapperOrContext?: TypeMapper | CheckContext, constraint?: CheckValueConstraint, ): Value | null { - const initial = checkNode(node, mapper, constraint); - if (initial === null) { + const ctx = CheckContext.from(mapperOrContext); + const initial = checkNode(ctx, node, constraint); + if (initial === null || initial === errorType) { return null; } let entity: Type | Value | null; @@ -613,15 +782,19 @@ export function createChecker(program: Program, resolver: NameResolver): Checker return null; } if (isValue(entity)) { + if (entity.valueKind === "Function") return entity; return constraint ? inferScalarsFromConstraints(entity, constraint.type) : entity; } - // If a template parameter that can be a value is used in a template declaration then we allow it but we return null because we don't have an actual value. + // If a template parameter that can be a value is used where a value is expected, + // synthesize a template value placeholder even when the template parameter is mapped + // from an outer template declaration. if ( entity.kind === "TemplateParameter" && entity.constraint?.valueType && - entity.constraint.type === undefined && - mapper === undefined + entity.constraint.type === undefined ) { + // We must also observe that the template parameter is used here. + // ctx.observeTemplateParameter(entity); return createValue( { entityKind: "Value", @@ -686,9 +859,8 @@ export function createChecker(program: Program, resolver: NameResolver): Checker case "UnionVariant": return getValueFromIndeterminate(type.type, constraint, node); case "Intrinsic": - switch (type.name) { - case "null": - return checkNullValue(type as any, constraint, node); + if (type.name === "null") { + return checkNullValue(type as any, constraint, node); } return type; default: @@ -769,11 +941,12 @@ export function createChecker(program: Program, resolver: NameResolver): Checker */ function getTypeOrValueForNode( node: Node, - mapper?: TypeMapper, + contextOrMapper?: TypeMapper | CheckContext, constraint?: CheckConstraint | undefined, ): Type | Value | null { + const ctx = CheckContext.from(contextOrMapper); const valueConstraint = extractValueOfConstraints(constraint); - const entity = checkNode(node, mapper, valueConstraint); + const entity = checkNode(ctx, node, valueConstraint); if (entity === null) { return entity; } else if (isType(entity)) { @@ -797,6 +970,11 @@ export function createChecker(program: Program, resolver: NameResolver): Checker // If there were diagnostic reported but we still got a value this means that the value might be invalid. reportCheckerDiagnostics(valueDiagnostics); return result; + } else { + const canBeType = constraint?.constraint.type !== undefined; + // If the node _must_ resolve to a value, we will return it unconstrained, so that we will at least produce + // a value. If it _can_ be a type, we already failed the value constraint, so we return the type as is. + return canBeType ? entity.type : getValueFromIndeterminate(entity.type, undefined, node); } } @@ -820,36 +998,36 @@ export function createChecker(program: Program, resolver: NameResolver): Checker * It is the job of of the consumer to decide if it should be a type or a value depending on the context. */ function checkNode( + ctx: CheckContext, node: Node, - mapper?: TypeMapper, valueConstraint?: CheckValueConstraint | undefined, ): Type | Value | IndeterminateEntity | null { switch (node.kind) { case SyntaxKind.ModelExpression: - return checkModel(node, mapper); + return checkModel(ctx, node); case SyntaxKind.ModelStatement: - return checkModel(node, mapper); + return checkModel(ctx, node); case SyntaxKind.ModelProperty: - return checkModelProperty(node, mapper); + return checkModelProperty(ctx, node); case SyntaxKind.ScalarStatement: - return checkScalar(node, mapper); + return checkScalar(ctx, node); case SyntaxKind.AliasStatement: - return checkAlias(node, mapper); + return checkAlias(ctx, node); case SyntaxKind.EnumStatement: - return checkEnum(node, mapper); + return checkEnum(ctx, node); case SyntaxKind.EnumMember: - return checkEnumMember(node, mapper); + return checkEnumMember(ctx, node); case SyntaxKind.InterfaceStatement: - return checkInterface(node, mapper); + return checkInterface(ctx, node); case SyntaxKind.UnionStatement: - return checkUnion(node, mapper); + return checkUnion(ctx, node); case SyntaxKind.UnionVariant: - return checkUnionVariant(node, mapper); + return checkUnionVariant(ctx, node); case SyntaxKind.NamespaceStatement: case SyntaxKind.JsNamespaceDeclaration: - return checkNamespace(node); + return checkNamespace(ctx, node); case SyntaxKind.OperationStatement: - return checkOperation(node, mapper); + return checkOperation(ctx, node); case SyntaxKind.NumericLiteral: return checkNumericLiteral(node); case SyntaxKind.BooleanLiteral: @@ -857,25 +1035,27 @@ export function createChecker(program: Program, resolver: NameResolver): Checker case SyntaxKind.StringLiteral: return checkStringLiteral(node); case SyntaxKind.TupleExpression: - return checkTupleExpression(node, mapper); + return checkTupleExpression(ctx, node); case SyntaxKind.StringTemplateExpression: - return checkStringTemplateExpresion(node, mapper); + return checkStringTemplateExpresion(ctx, node); case SyntaxKind.ArrayExpression: - return checkArrayExpression(node, mapper); + return checkArrayExpression(ctx, node); case SyntaxKind.UnionExpression: - return checkUnionExpression(node, mapper); + return checkUnionExpression(ctx, node); case SyntaxKind.IntersectionExpression: - return checkIntersectionExpression(node, mapper); + return checkIntersectionExpression(ctx, node); case SyntaxKind.DecoratorDeclarationStatement: - return checkDecoratorDeclaration(node, mapper); + return checkDecoratorDeclaration(ctx, node); case SyntaxKind.FunctionDeclarationStatement: - return checkFunctionDeclaration(node, mapper); + return checkFunctionDeclaration(ctx, node); + case SyntaxKind.FunctionTypeExpression: + return checkFunctionTypeExpression(ctx, node); case SyntaxKind.TypeReference: - return checkTypeOrValueReference(node, mapper); + return checkTypeOrValueReference(ctx, node); case SyntaxKind.TemplateArgument: - return checkTemplateArgument(node, mapper); + return checkTemplateArgument(ctx, node); case SyntaxKind.TemplateParameterDeclaration: - return checkTemplateParameterDeclaration(node, mapper); + return checkTemplateParameterDeclaration(ctx, node); case SyntaxKind.VoidKeyword: return voidType; case SyntaxKind.NeverKeyword: @@ -883,19 +1063,19 @@ export function createChecker(program: Program, resolver: NameResolver): Checker case SyntaxKind.UnknownKeyword: return unknownType; case SyntaxKind.ObjectLiteral: - return checkObjectValue(node, mapper, valueConstraint); + return checkObjectValue(ctx, node, valueConstraint); case SyntaxKind.ArrayLiteral: - return checkArrayValue(node, mapper, valueConstraint); + return checkArrayValue(ctx, node, valueConstraint); case SyntaxKind.ConstStatement: return checkConst(node); case SyntaxKind.CallExpression: - return checkCallExpression(node, mapper); + return checkCallExpression(ctx, node); case SyntaxKind.TypeOfExpression: - return checkTypeOfExpression(node, mapper); + return checkTypeOfExpression(ctx, node); case SyntaxKind.AugmentDecoratorStatement: - return checkAugmentDecorator(node); + return checkAugmentDecorator(ctx, node); case SyntaxKind.UsingStatement: - return checkUsings(node); + return checkUsings(ctx, node); default: return errorType; } @@ -941,20 +1121,16 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkTemplateParameterDeclaration( + ctx: CheckContext, node: TemplateParameterDeclarationNode, - mapper: undefined, ): TemplateParameter; function checkTemplateParameterDeclaration( + ctx: CheckContext, node: TemplateParameterDeclarationNode, - mapper: TypeMapper, - ): Type | Value | IndeterminateEntity; - function checkTemplateParameterDeclaration( - node: TemplateParameterDeclarationNode, - mapper: TypeMapper | undefined, ): Type | Value | IndeterminateEntity; function checkTemplateParameterDeclaration( + ctx: CheckContext, node: TemplateParameterDeclarationNode, - mapper: TypeMapper | undefined, ): Type | Value | IndeterminateEntity { const parentNode = node.parent!; const grandParentNode = parentNode.parent; @@ -965,7 +1141,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } if (pendingResolutions.has(getNodeSym(node), ResolutionKind.Constraint)) { - if (mapper === undefined) { + if (ctx.mapper === undefined) { reportCheckerDiagnostic( createDiagnostic({ code: "circular-constraint", @@ -998,13 +1174,14 @@ export function createChecker(program: Program, resolver: NameResolver): Checker if (node.constraint) { pendingResolutions.start(getNodeSym(node), ResolutionKind.Constraint); - type.constraint = getParamConstraintEntityForNode(node.constraint); + type.constraint = getParamConstraintEntityForNode(ctx, node.constraint); pendingResolutions.finish(getNodeSym(node), ResolutionKind.Constraint); } if (node.default) { // Set this to unknownType in case the default points back to the template itself causing failures type.default = unknownType; type.default = checkTemplateParameterDefault( + ctx, node.default, parentNode.templateParameters, index, @@ -1012,13 +1189,13 @@ export function createChecker(program: Program, resolver: NameResolver): Checker ); } } - return mapper ? mapper.getMappedType(type) : type; + return ctx.mapper ? ctx.mapper.getMappedType(type) : type; } function getResolvedTypeParameterDefault( + ctx: CheckContext, declaredType: TemplateParameter, node: TemplateParameterDeclarationNode, - mapper: TypeMapper, ): Type | Value | IndeterminateEntity | null | undefined { if (declaredType.default === undefined) { return undefined; @@ -1030,17 +1207,18 @@ export function createChecker(program: Program, resolver: NameResolver): Checker return declaredType.default; } - return checkNode(node.default!, mapper); + return checkNode(ctx, node.default!); } function checkTemplateParameterDefault( + ctx: CheckContext, nodeDefault: Expression, templateParameters: readonly TemplateParameterDeclarationNode[], index: number, constraint: Entity | undefined, ): Type | Value | IndeterminateEntity { function visit(node: Node) { - const entity = checkNode(node); + const entity = checkNode(ctx, node); let hasError = false; if (entity !== null && "kind" in entity && entity.kind === "TemplateParameter") { for (let i = index; i < templateParameters.length; i++) { @@ -1076,19 +1254,20 @@ export function createChecker(program: Program, resolver: NameResolver): Checker * @param node Node. * @param mapper Type mapper for template instantiation context. * @param instantiateTemplate If templated type should be instantiated if they haven't yet. + * @param allowFunctions If functions are allowed as types. * @returns Resolved type. */ function checkTypeReference( + ctx: CheckContext, node: TypeReferenceNode | MemberExpressionNode | IdentifierNode, - mapper: TypeMapper | undefined, instantiateTemplate = true, ): Type { - const sym = resolveTypeReferenceSym(node, mapper); + const sym = resolveTypeReferenceSym(ctx, node); if (!sym) { return errorType; } - const type = checkTypeReferenceSymbol(sym, node, mapper, instantiateTemplate); + const type = checkTypeReferenceSymbol(ctx, sym, node, instantiateTemplate); return type; } @@ -1097,26 +1276,27 @@ export function createChecker(program: Program, resolver: NameResolver): Checker * @param node Node. * @param mapper Type mapper for template instantiation context. * @param instantiateTemplate If templated type should be instantiated if they haven't yet. + * @param allowFunctions If functions are allowed as types. * @returns Resolved type. */ function checkTypeOrValueReference( + ctx: CheckContext, node: TypeReferenceNode | MemberExpressionNode | IdentifierNode, - mapper: TypeMapper | undefined, instantiateTemplate = true, ): Type | Value | IndeterminateEntity { - const sym = resolveTypeReferenceSym(node, mapper); + const sym = resolveTypeReferenceSym(ctx, node); if (!sym) { return errorType; } - return checkTypeOrValueReferenceSymbol(sym, node, mapper, instantiateTemplate) ?? errorType; + return checkTypeOrValueReferenceSymbol(ctx, sym, node, instantiateTemplate) ?? errorType; } function checkTemplateArgument( + ctx: CheckContext, node: TemplateArgumentNode, - mapper: TypeMapper | undefined, ): Type | Value | IndeterminateEntity | null { - return checkNode(node.argument, mapper); + return checkNode(ctx, node.argument); } function resolveTypeOrValueReference( @@ -1125,7 +1305,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker const oldDiagnosticHook = onCheckerDiagnostic; const diagnostics: Diagnostic[] = []; onCheckerDiagnostic = (x: Diagnostic) => diagnostics.push(x); - const entity = checkTypeOrValueReference(node, undefined, false); + const entity = checkTypeOrValueReference(CheckContext.DEFAULT, node, false); onCheckerDiagnostic = oldDiagnosticHook; return [entity === errorType ? undefined : entity, diagnostics]; } @@ -1136,7 +1316,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker const oldDiagnosticHook = onCheckerDiagnostic; const diagnostics: Diagnostic[] = []; onCheckerDiagnostic = (x: Diagnostic) => diagnostics.push(x); - const type = checkTypeReference(node, undefined, false); + const type = checkTypeReference(CheckContext.DEFAULT, node, false); onCheckerDiagnostic = oldDiagnosticHook; return [type === errorType ? undefined : type, diagnostics]; } @@ -1206,10 +1386,10 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkTemplateInstantiationArgs( + ctx: CheckContext, node: Node, args: readonly TemplateArgumentNode[], decls: readonly TemplateParameterDeclarationNode[], - mapper: TypeMapper | undefined, parentMapper?: TypeMapper, ): Map { const params = new Map(); @@ -1221,7 +1401,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } const initMap = new Map( decls.map((decl) => { - const declaredType = checkTemplateParameterDeclaration(decl, undefined); + const declaredType = checkTemplateParameterDeclaration(CheckContext.DEFAULT, decl); positional.push(declaredType); params.set(decl.id.sv, declaredType); @@ -1240,7 +1420,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker for (const [arg, idx] of args.map((v, i) => [v, i] as const)) { function deferredCheck(): [Node, Type | Value | IndeterminateEntity | null] { - return [arg, checkNode(arg.argument, mapper)]; + return [arg, checkNode(ctx, arg.argument)]; } if (arg.name) { @@ -1323,10 +1503,14 @@ export function createChecker(program: Program, resolver: NameResolver): Checker const argumentMapper = createTypeMapper( mapperParams, mapperArgs, - { node, mapper }, + { node, mapper: ctx.mapper }, parentMapper, ); - const defaultValue = getResolvedTypeParameterDefault(param, decl, argumentMapper); + const defaultValue = getResolvedTypeParameterDefault( + ctx.withMapper(argumentMapper), + param, + decl, + ); if (defaultValue) { commit(param, defaultValue); } else { @@ -1404,15 +1588,16 @@ export function createChecker(program: Program, resolver: NameResolver): Checker * @param node Node * @param mapper Type mapper for template instantiation context. * @param instantiateTemplates If a templated type should be instantiated if not yet @default true + * @param allowFunctions If functions are allowed as types. @default false * @returns resolved type. */ function checkTypeReferenceSymbol( + ctx: CheckContext, sym: Sym, node: TypeReferenceNode | MemberExpressionNode | IdentifierNode, - mapper: TypeMapper | undefined, instantiateTemplates = true, ): Type { - const result = checkTypeOrValueReferenceSymbol(sym, node, mapper, instantiateTemplates); + const result = checkTypeOrValueReferenceSymbol(ctx, sym, node, instantiateTemplates); if (result === null || isValue(result)) { reportCheckerDiagnostic(createDiagnostic({ code: "value-in-type", target: node })); return errorType; @@ -1424,27 +1609,28 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkTypeOrValueReferenceSymbol( + ctx: CheckContext, sym: Sym, node: TypeReferenceNode | MemberExpressionNode | IdentifierNode, - mapper: TypeMapper | undefined, instantiateTemplates = true, ): Type | Value | IndeterminateEntity | null { - const entity = checkTypeOrValueReferenceSymbolWorker(sym, node, mapper, instantiateTemplates); + const entity = checkTypeOrValueReferenceSymbolWorker(ctx, sym, node, instantiateTemplates); if (entity !== null && isType(entity) && entity.kind === "TemplateParameter") { + ctx.observeTemplateParameter(entity); templateParameterUsageMap.set(entity.node!, true); } return entity; } function checkTypeOrValueReferenceSymbolWorker( + ctx: CheckContext, sym: Sym, node: TypeReferenceNode | MemberExpressionNode | IdentifierNode, - mapper: TypeMapper | undefined, instantiateTemplates = true, ): Type | Value | IndeterminateEntity | null { if (sym.flags & SymbolFlags.Const) { - return getValueForNode(sym.declarations[0], mapper); + return getValueForNode(sym.declarations[0], ctx.mapper); } if (sym.flags & SymbolFlags.Decorator) { @@ -1456,11 +1642,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } if (sym.flags & SymbolFlags.Function) { - reportCheckerDiagnostic( - createDiagnostic({ code: "invalid-type-ref", messageId: "function", target: sym }), - ); - - return errorType; + return getValueForNode(sym.declarations[0], ctx); } const argumentNodes = node.kind === SyntaxKind.TypeReference ? node.arguments : []; @@ -1478,6 +1660,12 @@ export function createChecker(program: Program, resolver: NameResolver): Checker ) { const decl = sym.declarations[0] as TemplateableNode; if (!isTemplatedNode(decl)) { + // Not a templated node, and we are moving through a typeref to a new declaration. + // Therefore, we are no longer in a template declaration if we were before, and we are + // visiting a new declaration, so we exit the active template observer scope, if any. + const innerCtx = ctx + .maskFlags(CheckFlags.InTemplateDeclaration) + .exitTemplateObserverScope(); if (argumentNodes.length > 0) { reportCheckerDiagnostic( createDiagnostic({ @@ -1494,27 +1682,40 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } else if (symbolLinks.declaredType) { baseType = symbolLinks.declaredType; } else if (sym.flags & SymbolFlags.Member) { - baseType = checkMemberSym(sym, mapper); + baseType = checkMemberSym(innerCtx, sym); } else { - baseType = checkDeclaredTypeOrIndeterminate(sym, decl, mapper); + // + baseType = checkDeclaredTypeOrIndeterminate(innerCtx, sym, decl); } } else { - const declaredType = getOrCheckDeclaredType(sym, decl, mapper); + // Checking the declaration to ensure we have the template itself, so we don't need the mapper. + const declaredType = getOrCheckDeclaredType(ctx.withMapper(undefined), sym, decl); const templateParameters = decl.templateParameters; + const instantiationArgsCtx = ctx.enterTemplateObserverScope(); const instantiation = checkTemplateInstantiationArgs( + instantiationArgsCtx, node, argumentNodes, templateParameters, - mapper, declaredType.templateMapper, ); + // If we didn't see any template parameters during argument checking, then this type reference is "pure" + // and we can mask the InTemplateDeclaration flag downstream. In either case, we are going to a new declaration + // so we exit the active template observer scope, if any. + const innerCtx = ( + instantiationArgsCtx.hasObservedTemplateParameters() + ? ctx + : ctx.maskFlags(CheckFlags.InTemplateDeclaration) + ).exitTemplateObserverScope(); + baseType = getOrInstantiateTemplate( + innerCtx, decl, [...instantiation.keys()], [...instantiation.values()], - { node, mapper }, + { node, mapper: ctx.mapper }, declaredType.templateMapper, instantiateTemplates, ); @@ -1537,8 +1738,8 @@ export function createChecker(program: Program, resolver: NameResolver): Checker return sym.type; } else if (sym.flags & SymbolFlags.TemplateParameter) { const mapped = checkTemplateParameterDeclaration( + ctx, symNode as TemplateParameterDeclarationNode, - mapper, ); baseType = mapped as any; } else if (symbolLinks.type) { @@ -1548,10 +1749,10 @@ export function createChecker(program: Program, resolver: NameResolver): Checker baseType = symbolLinks.declaredType; } else { if (sym.flags & SymbolFlags.Member) { - baseType = checkMemberSym(sym, mapper); + baseType = checkMemberSym(ctx, sym); } else { // don't have a cached type for this symbol, so go grab it and cache it - baseType = getTypeForNode(symNode, mapper); + baseType = getTypeForNode(symNode, ctx); symbolLinks.type = baseType; } } @@ -1561,7 +1762,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker // don't raise deprecation when the usage site is also a deprecated // declaration. const declarationNode = getSymNode(sym); - if (declarationNode && mapper === undefined && isType(baseType)) { + if (declarationNode && ctx.mapper === undefined && isType(baseType)) { if (!isTypeReferenceContextDeprecated(node.parent!)) { checkDeprecated(baseType, declarationNode, node); } @@ -1586,9 +1787,9 @@ export function createChecker(program: Program, resolver: NameResolver): Checker * @returns The declared type for the given node. */ function getOrCheckDeclaredType( + ctx: CheckContext, sym: Sym, decl: TemplateableNode, - mapper: TypeMapper | undefined, ): TemplatedType { const symbolLinks = getSymbolLinks(sym); if (symbolLinks.declaredType) { @@ -1601,9 +1802,9 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } if (sym.flags & SymbolFlags.Member) { - return checkMemberSym(sym, mapper) as TemplatedType; + return checkMemberSym(ctx, sym) as TemplatedType; } else { - return checkDeclaredType(sym, decl, mapper) as TemplatedType; + return checkDeclaredType(ctx, sym, decl) as TemplatedType; } } @@ -1615,41 +1816,38 @@ export function createChecker(program: Program, resolver: NameResolver): Checker * @returns The declared type for the given node. */ function checkDeclaredTypeOrIndeterminate( + ctx: CheckContext, sym: Sym, node: TemplateableNode, - mapper: TypeMapper | undefined, ): Type | IndeterminateEntity { const type = sym.flags & SymbolFlags.Model - ? checkModelStatement(node as ModelStatementNode, mapper) + ? checkModelStatement(ctx, node as ModelStatementNode) : sym.flags & SymbolFlags.Scalar - ? checkScalar(node as ScalarStatementNode, mapper) + ? checkScalar(ctx, node as ScalarStatementNode) : sym.flags & SymbolFlags.Alias - ? checkAlias(node as AliasStatementNode, mapper) + ? checkAlias(ctx, node as AliasStatementNode) : sym.flags & SymbolFlags.Interface - ? checkInterface(node as InterfaceStatementNode, mapper) + ? checkInterface(ctx, node as InterfaceStatementNode) : sym.flags & SymbolFlags.Operation - ? checkOperation(node as OperationStatementNode, mapper) - : checkUnion(node as UnionStatementNode, mapper); + ? checkOperation(ctx, node as OperationStatementNode) + : checkUnion(ctx, node as UnionStatementNode); return type; } - function checkDeclaredType( - sym: Sym, - node: TemplateableNode, - mapper: TypeMapper | undefined, - ): Type { - return getTypeForTypeOrIndeterminate(checkDeclaredTypeOrIndeterminate(sym, node, mapper)); + function checkDeclaredType(ctx: CheckContext, sym: Sym, node: TemplateableNode): Type { + return getTypeForTypeOrIndeterminate(checkDeclaredTypeOrIndeterminate(ctx, sym, node)); } function getOrInstantiateTemplate( + ctx: CheckContext, templateNode: TemplateableNode, params: TemplateParameter[], args: (Type | Value | IndeterminateEntity)[], source: TypeMapper["source"], parentMapper: TypeMapper | undefined, - instantiateTempalates = true, + instantiateTemplates = true, ): Type { const symbolLinks = templateNode.kind === SyntaxKind.OperationStatement && @@ -1680,8 +1878,13 @@ export function createChecker(program: Program, resolver: NameResolver): Checker if (cached) { return cached; } - if (instantiateTempalates) { - return instantiateTemplate(symbolLinks.instantiations, templateNode, params, mapper); + if (instantiateTemplates) { + return instantiateTemplate( + ctx.withMapper(mapper), + symbolLinks.instantiations, + templateNode, + params, + ); } else { return errorType; } @@ -1696,14 +1899,14 @@ export function createChecker(program: Program, resolver: NameResolver): Checker * are ever in scope at once. */ function instantiateTemplate( + ctx: CheckContext, instantiations: TypeInstantiationMap, templateNode: TemplateableNode, params: TemplateParameter[], - mapper: TypeMapper, ): Type { - const type = getTypeForNode(templateNode, mapper); - if (!instantiations.get(mapper.args)) { - instantiations.set(mapper.args, type); + const type = getTypeForNode(templateNode, ctx); + if (!instantiations.get(ctx.mapper.args)) { + instantiations.set(ctx.mapper.args, type); } if (type.kind === "Model") { type.templateNode = templateNode; @@ -1713,13 +1916,13 @@ export function createChecker(program: Program, resolver: NameResolver): Checker /** Check a union expresion used in a parameter constraint, those allow the use of `valueof` as a variant. */ function checkMixedParameterConstraintUnion( + ctx: CheckContext, node: UnionExpressionNode, - mapper: TypeMapper | undefined, ): MixedParameterConstraint { const values: Type[] = []; const types: Type[] = []; for (const option of node.options) { - const [kind, type] = getTypeOrValueOfTypeForNode(option, mapper); + const [kind, type] = getTypeOrValueOfTypeForNode(ctx, option); if (kind === "value") { values.push(type); } else { @@ -1772,7 +1975,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker return union; } - function checkUnionExpression(node: UnionExpressionNode, mapper: TypeMapper | undefined): Union { + function checkUnionExpression(ctx: CheckContext, node: UnionExpressionNode): Union { const unionType: Union = createAndFinishType({ kind: "Union", node, @@ -1786,7 +1989,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker }); for (const o of node.options) { - const type = getTypeForNode(o, mapper); + const type = getTypeForNode(o, ctx); // The type `A | never` is just `A` if (type === neverType) { @@ -1810,7 +2013,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } } - linkMapper(unionType, mapper); + linkMapper(unionType, ctx.mapper); return unionType; } @@ -1820,26 +2023,23 @@ export function createChecker(program: Program, resolver: NameResolver): Checker * So this doesn't work if we don't have a known set of properties (e.g. * with unions). The resulting model is anonymous. */ - function checkIntersectionExpression( - node: IntersectionExpressionNode, - mapper: TypeMapper | undefined, - ) { + function checkIntersectionExpression(ctx: CheckContext, node: IntersectionExpressionNode) { const links = getSymbolLinks(node.symbol); - if (links.declaredType && mapper === undefined) { + if (links.declaredType && ctx.mapper === undefined) { // we're not instantiating this model and we've already checked it return links.declaredType as any; } const intersection: Model = initModel(node); - const options = node.options.map((o): [Expression, Type] => [o, getTypeForNode(o, mapper)]); + const options = node.options.map((o): [Expression, Type] => [o, getTypeForNode(o, ctx)]); ensureResolved( options.map(([, type]) => type), intersection, () => { - const type = mergeModelTypes(node.symbol, node, options, mapper, intersection); - linkType(links, type, mapper); + const type = mergeModelTypes(ctx, node.symbol, node, options, intersection); + linkType(ctx, links, type); finishType(intersection); }, ); @@ -1881,15 +2081,16 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkDecoratorDeclaration( + ctx: CheckContext, node: DecoratorDeclarationStatementNode, - mapper: TypeMapper | undefined, ): Decorator { const symbol = getMergedSymbol(node.symbol); const links = getSymbolLinks(symbol); - if (links.declaredType && mapper === undefined) { + if (links.declaredType && ctx.mapper === undefined) { // we're not instantiating this operation and we've already checked it return links.declaredType as Decorator; } + checkModifiers(program, node); const namespace = getParentNamespaceType(node); compilerAssert( @@ -1898,10 +2099,6 @@ export function createChecker(program: Program, resolver: NameResolver): Checker ); const name = node.id.sv; - if (!(node.modifierFlags & ModifierFlags.Extern)) { - reportCheckerDiagnostic(createDiagnostic({ code: "decorator-extern", target: node })); - } - const implementation = symbol.value; if (implementation === undefined) { reportCheckerDiagnostic(createDiagnostic({ code: "missing-implementation", target: node })); @@ -1911,39 +2108,124 @@ export function createChecker(program: Program, resolver: NameResolver): Checker name: `@${name}`, namespace, node, - target: checkFunctionParameter(node.target, mapper, true), - parameters: node.parameters.map((x) => checkFunctionParameter(x, mapper, true)), + target: checkFunctionParameter(ctx, node.target, true), + parameters: node.parameters.map((param) => checkFunctionParameter(ctx, param, true)), implementation: implementation ?? (() => {}), }); namespace.decoratorDeclarations.set(name, decoratorType); - linkType(links, decoratorType, mapper); + linkType(ctx, links, decoratorType); return decoratorType; } function checkFunctionDeclaration( + ctx: CheckContext, node: FunctionDeclarationStatementNode, - mapper: TypeMapper | undefined, - ) { - reportCheckerDiagnostic(createDiagnostic({ code: "function-unsupported", target: node })); - return errorType; + ): FunctionValue { + const mergedSymbol = getMergedSymbol(node.symbol); + const links = getSymbolLinks(mergedSymbol); + + if (links.value !== undefined) { + return links.value as FunctionValue; + } + + checkModifiers(program, node); + + reportCheckerDiagnostic( + createDiagnostic({ + code: "experimental-feature", + messageId: "functionDeclarations", + target: node, + }), + ); + + const namespace = getParentNamespaceType(node); + compilerAssert( + namespace, + `Function ${node.id.sv} should have resolved a declared namespace or the global namespace.`, + ); + + const name = node.id.sv; + + const implementation = mergedSymbol.value; + if (implementation === undefined) { + reportCheckerDiagnostic(createDiagnostic({ code: "missing-implementation", target: node })); + } + + const parameters = node.parameters.map((x) => checkFunctionParameter(ctx, x, true)); + + const returnType: MixedParameterConstraint = node.returnType + ? getParamConstraintEntityForNode(ctx, node.returnType) + : { + entityKind: "MixedParameterConstraint", + type: unknownType, + }; + + const functionValue: FunctionValue = createValue( + { + entityKind: "Value", + valueKind: "Function", + name, + type: createAndFinishType({ + kind: "FunctionType", + parameters, + returnType, + }), + parameters, + returnType, + namespace, + node, + implementation: + implementation ?? + Object.assign(() => getDefaultFunctionResult(returnType), { + isDefaultFunctionImplementation: true, + }), + }, + unknownType, + ); + + namespace.functionDeclarations.set(name, functionValue); + + links.value = functionValue; + + return functionValue; + } + + function checkFunctionTypeExpression( + ctx: CheckContext, + node: FunctionTypeExpressionNode, + ): FunctionType { + const parameters = node.parameters.map((param) => checkFunctionParameter(ctx, param, true)); + const returnType: MixedParameterConstraint = node.returnType + ? getParamConstraintEntityForNode(ctx, node.returnType) + : { + entityKind: "MixedParameterConstraint", + type: unknownType, + }; + + return createAndFinishType({ + kind: "FunctionType", + node, + parameters, + returnType, + }); } function checkFunctionParameter( + ctx: CheckContext, node: FunctionParameterNode, - mapper: TypeMapper | undefined, mixed: true, ): MixedFunctionParameter; function checkFunctionParameter( + ctx: CheckContext, node: FunctionParameterNode, - mapper: TypeMapper | undefined, mixed: false, ): SignatureFunctionParameter; function checkFunctionParameter( + ctx: CheckContext, node: FunctionParameterNode, - mapper: TypeMapper | undefined, mixed: boolean, ): FunctionParameter { const links = getSymbolLinks(node.symbol); @@ -1977,7 +2259,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker if (mixed) { const type = node.type - ? getParamConstraintEntityForNode(node.type) + ? getParamConstraintEntityForNode(ctx, node.type) : ({ entityKind: "MixedParameterConstraint", type: unknownType, @@ -1997,30 +2279,30 @@ export function createChecker(program: Program, resolver: NameResolver): Checker }); } - linkType(links, parameterType, mapper); + linkType(ctx, links, parameterType); return parameterType; } - function getTypeOrValueOfTypeForNode(node: Node, mapper?: TypeMapper): ["type" | "value", Type] { + function getTypeOrValueOfTypeForNode(ctx: CheckContext, node: Node): ["type" | "value", Type] { switch (node.kind) { case SyntaxKind.ValueOfExpression: - const target = getTypeForNode(node.target, mapper); + const target = getTypeForNode(node.target, ctx); return ["value", target]; default: - return ["type", getTypeForNode(node, mapper)]; + return ["type", getTypeForNode(node, ctx)]; } } function getParamConstraintEntityForNode( + ctx: CheckContext, node: Expression, - mapper?: TypeMapper, ): MixedParameterConstraint { switch (node.kind) { case SyntaxKind.UnionExpression: - return checkMixedParameterConstraintUnion(node, mapper); + return checkMixedParameterConstraintUnion(ctx, node); default: - const [kind, entity] = getTypeOrValueOfTypeForNode(node, mapper); + const [kind, entity] = getTypeOrValueOfTypeForNode(ctx, node); return { entityKind: "MixedParameterConstraint", node: node, @@ -2031,10 +2313,10 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function mergeModelTypes( + ctx: CheckContext, parentModelSym: Sym | undefined, node: ModelStatementNode | ModelExpressionNode | IntersectionExpressionNode, options: [Node, Type][], - mapper: TypeMapper | undefined, intersection: Model, ) { const properties = intersection.properties; @@ -2092,7 +2374,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker ? cloneTypeForSymbol(memberSym, prop, overrides) : cloneType(prop, overrides); properties.set(prop.name, newPropType); - linkIndirectMember(node, newPropType, mapper); + linkIndirectMember(ctx, node, newPropType); for (const indexer of indexers.filter((x) => x !== option.indexer)) { checkPropertyCompatibleWithIndexer(indexer, prop, node); @@ -2106,33 +2388,43 @@ export function createChecker(program: Program, resolver: NameResolver): Checker intersection.indexer = { key: indexers[0].key, value: mergeModelTypes( + ctx, undefined, node, indexers.map((x) => [x.value.node!, x.value]), - mapper, initModel(node), ), }; } - linkMapper(intersection, mapper); + linkMapper(intersection, ctx.mapper); return finishType(intersection); } - function checkArrayExpression(node: ArrayExpressionNode, mapper: TypeMapper | undefined): Model { - const elementType = getTypeForNode(node.elementType, mapper); + function checkArrayExpression(ctx: CheckContext, node: ArrayExpressionNode): Model { + const elementCtx = ctx.enterTemplateObserverScope(); + const elementType = getTypeForNode(node.elementType, elementCtx); + + const instantiationCtx = elementCtx.hasObservedTemplateParameters() + ? ctx + : ctx.maskFlags(CheckFlags.InTemplateDeclaration); + const arrayType = getStdType("Array"); const arrayNode: ModelStatementNode = arrayType.node as any; const param: TemplateParameter = getTypeForNode(arrayNode.templateParameters[0]) as any; return getOrInstantiateTemplate( + instantiationCtx, arrayNode, [param], [elementType], - { node, mapper }, + { node, mapper: ctx.mapper }, undefined, ) as Model; } - function checkNamespace(node: NamespaceStatementNode | JsNamespaceDeclarationNode) { + function checkNamespace( + ctx: CheckContext, + node: NamespaceStatementNode | JsNamespaceDeclarationNode, + ) { const links = getSymbolLinks(getMergedSymbol(node.symbol)); let type = links.type as Namespace; if (!type) { @@ -2140,10 +2432,11 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } if (node.kind === SyntaxKind.NamespaceStatement) { + checkModifiers(program, node); if (isArray(node.statements)) { - node.statements.forEach((x) => checkNode(x)); + node.statements.forEach((x) => checkNode(ctx, x)); } else if (node.statements) { - const subNs = checkNamespace(node.statements); + const subNs = checkNamespace(ctx, node.statements); type.namespaces.set(subNs.name, subNs); } } @@ -2179,7 +2472,9 @@ export function createChecker(program: Program, resolver: NameResolver): Checker for (const sourceNode of mergedSymbol.declarations) { // namespaces created from TypeSpec scripts don't have decorators if (sourceNode.kind !== SyntaxKind.NamespaceStatement) continue; - type.decorators = type.decorators.concat(checkDecorators(type, sourceNode, undefined)); + type.decorators = type.decorators.concat( + checkDecorators(CheckContext.DEFAULT, type, sourceNode), + ); } finishType(type); @@ -2273,32 +2568,40 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkOperation( + ctx: CheckContext, node: OperationStatementNode, - mapper: TypeMapper | undefined, parentInterface?: Interface, ): Operation { const inInterface = node.parent?.kind === SyntaxKind.InterfaceStatement; const symbol = inInterface ? getSymbolForMember(node) : node.symbol; const links = symbol && getSymbolLinks(symbol); + if (links) { - if (links.declaredType && mapper === undefined) { + if (links.declaredType && ctx.mapper === undefined) { // we're not instantiating this operation and we've already checked it return links.declaredType as Operation; } } + if (ctx.mapper === undefined) { + checkModifiers(program, node); + } - if (mapper === undefined && inInterface) { + if (ctx.mapper === undefined && inInterface) { compilerAssert( parentInterface, "Operation in interface should already have been checked.", node.parent, ); } - checkTemplateDeclaration(node, mapper); + checkTemplateDeclaration(ctx, node); // If we are instantating operation inside of interface - if (isTemplatedNode(node) && mapper !== undefined && parentInterface) { - mapper = { ...mapper, partial: true }; + if (isTemplatedNode(node) && ctx.mapper !== undefined && parentInterface) { + ctx = ctx.withMapper({ ...ctx.mapper, partial: true }); + } + + if ((ctx.mapper === undefined || ctx.mapper.partial) && node.templateParameters.length > 0) { + ctx = ctx.withFlags(CheckFlags.InTemplateDeclaration); } const namespace = getParentNamespaceType(node); @@ -2331,7 +2634,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker interface: parentInterface, }); if (links) { - linkType(links, operationType, mapper); + linkType(ctx, links, operationType); } const parent = node.parent!; @@ -2339,18 +2642,16 @@ export function createChecker(program: Program, resolver: NameResolver): Checker function finishOperation() { operationType.parameters.namespace = namespace; - operationType.decorators.push(...checkDecorators(operationType, node, mapper)); - const runDecorators = - parent.kind === SyntaxKind.InterfaceStatement - ? shouldRunDecorators(parent, mapper) && shouldRunDecorators(node, mapper) - : shouldRunDecorators(node, mapper); + operationType.decorators.push(...checkDecorators(ctx, operationType, node)); - return finishType(operationType, { skipDecorators: !runDecorators }); + return finishType(operationType, { + skipDecorators: ctx.hasFlags(CheckFlags.InTemplateDeclaration), + }); } // Is this a definition or reference? if (node.signature.kind === SyntaxKind.OperationSignatureReference) { // Attempt to resolve the operation - const baseOperation = checkOperationIs(node, node.signature.baseOperation, mapper); + const baseOperation = checkOperationIs(ctx, node, node.signature.baseOperation); if (baseOperation) { ensureResolved([baseOperation], operationType, () => { operationType.sourceOperation = baseOperation; @@ -2382,15 +2683,15 @@ export function createChecker(program: Program, resolver: NameResolver): Checker finishOperation(); } } else { - operationType.parameters = getTypeForNode(node.signature.parameters, mapper) as Model; - operationType.returnType = getTypeForNode(node.signature.returnType, mapper); + operationType.parameters = getTypeForNode(node.signature.parameters, ctx) as Model; + operationType.returnType = getTypeForNode(node.signature.returnType, ctx); ensureResolved([operationType.parameters], operationType, () => { finishOperation(); }); } - linkMapper(operationType, mapper); - if (parent.kind !== SyntaxKind.InterfaceStatement && mapper === undefined) { + linkMapper(operationType, ctx.mapper); + if (parent.kind !== SyntaxKind.InterfaceStatement && ctx.mapper === undefined) { namespace?.operations.set(name, operationType); } @@ -2398,9 +2699,9 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkOperationIs( + ctx: CheckContext, operation: OperationStatementNode, opReference: TypeReferenceNode | undefined, - mapper: TypeMapper | undefined, ): Operation | undefined { if (!opReference) return undefined; // Ensure that we don't end up with a circular reference to the same operation @@ -2413,7 +2714,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker // Did we encounter a circular operation reference? if (target && pendingResolutions.has(target, ResolutionKind.BaseType)) { - if (mapper === undefined) { + if (ctx.mapper === undefined) { reportCheckerDiagnostic( createDiagnostic({ code: "circular-op-signature", @@ -2427,7 +2728,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } // Resolve the base operation type - const baseOperation = getTypeForNode(opReference, mapper); + const baseOperation = getTypeForNode(opReference, ctx); if (opSymId) { pendingResolutions.finish(opSymId, ResolutionKind.BaseType); } @@ -2453,11 +2754,11 @@ export function createChecker(program: Program, resolver: NameResolver): Checker return resolver.symbols.global.declarations[0] as any; } - function checkTupleExpression(node: TupleExpressionNode, mapper: TypeMapper | undefined): Tuple { + function checkTupleExpression(ctx: CheckContext, node: TupleExpressionNode): Tuple { return createAndFinishType({ kind: "Tuple", node: node, - values: node.values.map((v) => getTypeForNode(v, mapper)), + values: node.values.map((v) => getTypeForNode(v, ctx)), }); } @@ -2466,6 +2767,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function resolveRelatedSymbols(id: IdentifierNode, mapper?: TypeMapper): Sym[] | undefined { + const ctx = CheckContext.from(mapper); let sym: Sym | undefined; const { node, kind } = getIdentifierContext(id); @@ -2499,10 +2801,10 @@ export function createChecker(program: Program, resolver: NameResolver): Checker resolveDecorator = false; } } - sym = resolveTypeReferenceSym(ref, mapper, resolveDecorator); + sym = resolveTypeReferenceSym(ctx, ref, resolveDecorator); break; case IdentifierKind.TemplateArgument: - const templates = getTemplateDeclarationsForArgument(node as TemplateArgumentNode, mapper); + const templates = getTemplateDeclarationsForArgument(ctx, node as TemplateArgumentNode); const firstMatchingParameter = templates .flatMap((t) => t.templateParameters) @@ -2528,17 +2830,14 @@ export function createChecker(program: Program, resolver: NameResolver): Checker return undefined; //sym?.symbolSource ?? sym; } - function getTemplateDeclarationsForArgument( - node: TemplateArgumentNode, - mapper: TypeMapper | undefined, - ) { + function getTemplateDeclarationsForArgument(ctx: CheckContext, node: TemplateArgumentNode) { const ref = node.parent as TypeReferenceNode; - let resolved = resolveTypeReferenceSym(ref, mapper, false); + let resolved = resolveTypeReferenceSym(ctx, ref, false); // if the reference type can't be resolved and has parse error, // it likely means the reference type hasn't been completed yet. i.e. Foo isTemplatedNode(n)) ?? []) as TemplateableNode[]; } @@ -2688,9 +2987,9 @@ export function createChecker(program: Program, resolver: NameResolver): Checker const argNode = node.parent; const refNode = node.parent.parent; const decl = getTemplateDeclarationsForArgument( - argNode, // We should be giving the argument so the mapper here should be undefined - undefined /* mapper */, + CheckContext.DEFAULT, + argNode, ); const index = refNode.arguments.findIndex((n) => n === argNode); @@ -2734,9 +3033,9 @@ export function createChecker(program: Program, resolver: NameResolver): Checker return undefined; } - const ctorType = checkCallExpressionTarget(callExpNode, undefined); + const ctorType = checkCallExpressionTarget(CheckContext.DEFAULT, callExpNode); - if (ctorType?.kind !== "ScalarConstructor") { + if (ctorType?.entityKind !== "Type" || ctorType?.kind !== "ScalarConstructor") { return undefined; } @@ -2831,8 +3130,8 @@ export function createChecker(program: Program, resolver: NameResolver): Checker return completions; // cannot complete, name can be chosen arbitrarily case IdentifierKind.TemplateArgument: { const templates = getTemplateDeclarationsForArgument( + CheckContext.DEFAULT, ancestor as TemplateArgumentNode, - undefined, ); for (const template of templates) { @@ -2896,7 +3195,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker if (base) { if (base.flags & SymbolFlags.Alias) { - base = getAliasedSymbol(base, undefined); + base = getAliasedSymbol(CheckContext.DEFAULT, base); } if (base) { @@ -2929,8 +3228,8 @@ export function createChecker(program: Program, resolver: NameResolver): Checker ancestor.parent.name === undefined ) { const templates = getTemplateDeclarationsForArgument( + CheckContext.DEFAULT, ancestor.parent as TemplateArgumentNode, - undefined, ); for (const template of templates) { @@ -3014,12 +3313,15 @@ export function createChecker(program: Program, resolver: NameResolver): Checker case IdentifierKind.Decorator: // Only return decorators and namespaces when completing decorator return !!(sym.flags & (SymbolFlags.Decorator | SymbolFlags.Namespace)); + case IdentifierKind.Function: + // Only return functions and namespaces when completing function calls + return !!(sym.flags & (SymbolFlags.Function | SymbolFlags.Namespace)); case IdentifierKind.Using: // Only return namespaces when completing using return !!(sym.flags & SymbolFlags.Namespace); case IdentifierKind.TypeReference: - // Do not return functions or decorators when completing types - return !(sym.flags & (SymbolFlags.Function | SymbolFlags.Decorator)); + // Do not return decorators when completing types + return !(sym.flags & SymbolFlags.Decorator); case IdentifierKind.TemplateArgument: return !!(sym.flags & SymbolFlags.TemplateParameter); default: @@ -3038,8 +3340,8 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function resolveTypeReferenceSym( + ctx: CheckContext, node: TypeReferenceNode | MemberExpressionNode | IdentifierNode, - mapper: TypeMapper | undefined, options?: Partial | boolean, ): Sym | undefined { const resolvedOptions: SymbolResolutionOptions = @@ -3047,13 +3349,19 @@ export function createChecker(program: Program, resolver: NameResolver): Checker ? { ...defaultSymbolResolutionOptions, resolveDecorators: options } : { ...defaultSymbolResolutionOptions, ...(options ?? {}) }; if ( - mapper === undefined && + ctx.mapper === undefined && !resolvedOptions.resolveDeclarationOfTemplate && referenceSymCache.has(node) ) { return referenceSymCache.get(node); } - const sym = resolveTypeReferenceSymInternal(node, mapper, resolvedOptions); + resolvedOptions.locationContext ??= getLocationContext(program, node); + + const sym = resolveTypeReferenceSymInternal( + ctx, + node, + resolvedOptions as SymbolResolutionOptions & { locationContext: LocationContext }, + ); if (!resolvedOptions.resolveDeclarationOfTemplate) { referenceSymCache.set(node, sym); } @@ -3061,9 +3369,9 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function resolveTypeReferenceSymInternal( + ctx: CheckContext, node: TypeReferenceNode | MemberExpressionNode | IdentifierNode, - mapper: TypeMapper | undefined, - options: SymbolResolutionOptions, + options: SymbolResolutionOptions & { locationContext: LocationContext }, ): Sym | undefined { if (hasParseError(node)) { // Don't report synthetic identifiers used for parser error recovery. @@ -3071,12 +3379,12 @@ export function createChecker(program: Program, resolver: NameResolver): Checker return undefined; } if (node.kind === SyntaxKind.TypeReference) { - return resolveTypeReferenceSym(node.target, mapper, options); + return resolveTypeReferenceSym(ctx, node.target, options); } else if (node.kind === SyntaxKind.Identifier) { const links = resolver.getNodeLinks(node); - if (mapper === undefined && links.resolutionResult) { + if (ctx.mapper === undefined && links.resolutionResult) { if ( - mapper === undefined && // do not report error when instantiating + ctx.mapper === undefined && // do not report error when instantiating links.resolutionResult & (ResolutionResultFlags.NotFound | ResolutionResultFlags.Unknown) ) { reportCheckerDiagnostic( @@ -3093,10 +3401,13 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } } - const sym = links.resolvedSymbol; - return sym?.symbolSource ?? sym; + const sym = links.resolvedSymbol?.symbolSource ?? links.resolvedSymbol; + + checkSymbolAccess(options.locationContext, node, sym); + + return sym; } else if (node.kind === SyntaxKind.MemberExpression) { - let base = resolveTypeReferenceSym(node.base, mapper, { + let base = resolveTypeReferenceSym(ctx, node.base, { ...options, resolveDecorators: false, // when resolving decorator the base cannot also be one }); @@ -3107,37 +3418,109 @@ export function createChecker(program: Program, resolver: NameResolver): Checker // when resolving a type reference based on an alias, unwrap the alias. if (base.flags & SymbolFlags.Alias) { - const aliasedSym = getAliasedSymbol(base, mapper); - if (!aliasedSym) { - reportCheckerDiagnostic( - createDiagnostic({ - code: "invalid-ref", - messageId: "node", - format: { - id: node.id.sv, - nodeName: base.declarations[0] - ? SyntaxKind[base.declarations[0].kind] - : "Unknown node", - }, - target: node, - }), + if (!options.resolveDeclarationOfTemplate && isTemplatedNode(getSymNode(base))) { + // This is a bare identifier reference to a templated alias, so we need to actually check this type. + const ty = checkTypeReferenceSymbol( + ctx.withMapper(undefined), + base, + node.base, + /* instantiateTemplates */ true, ); - return undefined; + base = lateBindContainer(ty, base); + + if (base?.members) { + switch (ty.kind) { + case "Model": + case "Union": + case "Interface": + case "Enum": + case "Scalar": + lateBindMembers(ty); + } + } + + if (!base) return undefined; + } else { + const aliasedSym = getAliasedSymbol(ctx, base); + if (!aliasedSym) { + reportCheckerDiagnostic( + createDiagnostic({ + code: "invalid-ref", + messageId: "node", + format: { + id: node.id.sv, + nodeName: base.declarations[0] + ? SyntaxKind[base.declarations[0].kind] + : "Unknown node", + }, + target: node, + }), + ); + return undefined; + } + base = aliasedSym; } - base = aliasedSym; } else if (!options.resolveDeclarationOfTemplate && isTemplatedNode(getSymNode(base))) { - const baseSym = getContainerTemplateSymbol(base, node.base, mapper); + const baseSym = getContainerTemplateSymbol(ctx, base, node.base); if (!baseSym) { return undefined; } base = baseSym; } - return resolveMemberInContainer(base, node, options); + const sym = resolveMemberInContainer(base, node, options); + + checkSymbolAccess(options.locationContext, node, sym); + + return sym; } compilerAssert(false, `Unknown type reference kind "${SyntaxKind[(node as any).kind]}"`, node); } + function checkSymbolAccess(sourceLocation: LocationContext, node: Node, symbol: Sym | undefined) { + if (!symbol) return; + + const isInternalDeclaration = + (symbol.flags & (SymbolFlags.Internal | SymbolFlags.Declaration)) === + (SymbolFlags.Internal | SymbolFlags.Declaration); + + if (isInternalDeclaration) { + // The source location can access internal declaration symbols if: + // 1. The source location is synthetic. + // 2. The source location is in the compiler standard library. + // 3. SOME declaration of the target symbol meets the following: + // 1. The source location is in the user project, and the symbol is also declared in the user project. + // 2. The source location is in a library, and the symbol is also in the same library. + + if (sourceLocation.type === "synthetic" || sourceLocation.type === "compiler") { + return; + } + + const isDeclaredInCompatibleLocation = symbol.declarations.some((decl) => { + const declLocation = getLocationContext(program, decl); + + if (declLocation.type !== sourceLocation.type) return false; + + // Both are project + if (declLocation.type === "project") return true; + + // Both are library, use reference equality to check if they are the same library. + return declLocation === sourceLocation; + }); + + if (isDeclaredInCompatibleLocation) return; + + reportCheckerDiagnostic( + createDiagnostic({ + code: "invalid-ref", + messageId: "internal", + format: { id: symbol.name }, + target: node, + }), + ); + } + } + function reportAmbiguousIdentifier(node: IdentifierNode, symbols: Sym[]) { const duplicateNames = symbols.map((s) => getFullyQualifiedSymbolName(s, { useGlobalPrefixAtTopLevel: true }), @@ -3246,7 +3629,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker * (i.e. they contain symbols we don't know until we've instantiated the type and the type is an * instantiation) we late bind the container which creates the symbol that will hold its members. */ - function getAliasedSymbol(aliasSymbol: Sym, mapper: TypeMapper | undefined): Sym | undefined { + function getAliasedSymbol(ctx: CheckContext, aliasSymbol: Sym): Sym | undefined { const node = getSymNode(aliasSymbol); const links = resolver.getSymbolLinks(aliasSymbol); if (!links.aliasResolutionIsTemplate) { @@ -3254,7 +3637,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } // Otherwise for templates we need to get the type and retrieve the late bound symbol. - const aliasType = getTypeForNode(node as AliasStatementNode, mapper); + const aliasType = getTypeForNode(node as AliasStatementNode, ctx); return lateBindContainer(aliasType, aliasSymbol); } @@ -3265,12 +3648,12 @@ export function createChecker(program: Program, resolver: NameResolver): Checker * ``` */ function getContainerTemplateSymbol( + ctx: CheckContext, sym: Sym, node: MemberExpressionNode | IdentifierNode, - mapper: TypeMapper | undefined, ): Sym | undefined { if (pendingResolutions.has(sym, ResolutionKind.Type)) { - if (mapper === undefined) { + if (ctx.mapper === undefined) { reportCheckerDiagnostic( createDiagnostic({ code: "circular-alias-type", @@ -3283,7 +3666,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } pendingResolutions.start(sym, ResolutionKind.Type); - const type = checkTypeReferenceSymbol(sym, node, mapper); + const type = checkTypeReferenceSymbol(ctx, sym, node); pendingResolutions.finish(sym, ResolutionKind.Type); return lateBindContainer(type, sym); @@ -3311,13 +3694,13 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkStringTemplateExpresion( + ctx: CheckContext, node: StringTemplateExpressionNode, - mapper: TypeMapper | undefined, ): IndeterminateEntity | StringValue | null { let hasType = false; let hasValue = false; const spanTypeOrValues = node.spans.map( - (span) => [span, checkNode(span.expression, mapper)] as const, + (span) => [span, checkNode(ctx, span.expression)] as const, ); for (const [_, typeOrValue] of spanTypeOrValues) { if (typeOrValue !== null) { @@ -3564,7 +3947,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker function checkSourceFile(file: TypeSpecScriptNode) { for (const statement of file.statements) { - checkNode(statement, undefined); + checkNode(CheckContext.DEFAULT, statement, undefined); } } @@ -3573,34 +3956,38 @@ export function createChecker(program: Program, resolver: NameResolver): Checker * @param node Node with template parameters * @param mapper Type mapper, set if instantiating the template, undefined otherwise. */ - function checkTemplateDeclaration(node: TemplateableNode, mapper: TypeMapper | undefined) { + function checkTemplateDeclaration(ctx: CheckContext, node: TemplateableNode) { // If mapper is undefined it means we are checking the declaration of the template. - if (mapper === undefined) { + if (ctx.mapper === undefined) { for (const templateParameter of node.templateParameters) { - checkTemplateParameterDeclaration(templateParameter, undefined); + checkTemplateParameterDeclaration(ctx, templateParameter); } } } - function checkModel( - node: ModelExpressionNode | ModelStatementNode, - mapper: TypeMapper | undefined, - ): Model { + function checkModel(ctx: CheckContext, node: ModelExpressionNode | ModelStatementNode): Model { if (node.kind === SyntaxKind.ModelStatement) { - return checkModelStatement(node, mapper); + return checkModelStatement(ctx, node); } else { - return checkModelExpression(node, mapper); + return checkModelExpression(ctx, node); } } - function checkModelStatement(node: ModelStatementNode, mapper: TypeMapper | undefined): Model { + function checkModelStatement(ctx: CheckContext, node: ModelStatementNode): Model { const links = getSymbolLinks(node.symbol); - if (links.declaredType && mapper === undefined) { + if (ctx.mapper === undefined && node.templateParameters.length > 0) { + ctx = ctx.withFlags(CheckFlags.InTemplateDeclaration); + } + + if (links.declaredType && ctx.mapper === undefined) { // we're not instantiating this model and we've already checked it return links.declaredType as any; } - checkTemplateDeclaration(node, mapper); + if (ctx.mapper === undefined) { + checkModifiers(program, node); + } + checkTemplateDeclaration(ctx, node); const decorators: DecoratorApplication[] = []; const type: Model = createType({ @@ -3613,7 +4000,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker sourceModels: [], derivedModels: [], }); - linkType(links, type, mapper); + linkType(ctx, links, type); if (node.symbol.members) { const members = resolver.getAugmentedSymbolTable(node.symbol.members); @@ -3626,13 +4013,13 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } } - const isBase = checkModelIs(node, node.is, mapper); + const isBase = checkModelIs(ctx, node, node.is); ensureResolved( [ isBase, ...node.properties .filter((x) => x.kind === SyntaxKind.ModelSpreadProperty) - .map((x) => checkSpreadTarget(node, x.target, mapper)), + .map((x) => checkSpreadTarget(ctx, node, x.target)), ], type, () => { @@ -3650,7 +4037,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker sourceProperty: prop, model: type, }); - linkIndirectMember(node, newProp, mapper); + linkIndirectMember(ctx, node, newProp); type.properties.set(prop.name, newProp); } } @@ -3658,7 +4045,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker if (isBase) { type.baseModel = isBase.baseModel; } else if (node.extends) { - type.baseModel = checkClassHeritage(node, node.extends, mapper); + type.baseModel = checkClassHeritage(ctx, node, node.extends); if (type.baseModel) { copyDeprecation(type.baseModel, type); } @@ -3670,17 +4057,17 @@ export function createChecker(program: Program, resolver: NameResolver): Checker // Hold on to the model type that's being defined so that it // can be referenced - if (mapper === undefined) { + if (ctx.mapper === undefined) { type.namespace?.models.set(type.name, type); } // Evaluate the properties after - checkModelProperties(node, type.properties, type, mapper); + checkModelProperties(ctx, node, type.properties, type); - decorators.push(...checkDecorators(type, node, mapper)); + decorators.push(...checkDecorators(ctx, type, node)); - linkMapper(type, mapper); - finishType(type, { skipDecorators: !shouldRunDecorators(node, mapper) }); + linkMapper(type, ctx.mapper); + finishType(type, { skipDecorators: ctx.hasFlags(CheckFlags.InTemplateDeclaration) }); lateBindMemberContainer(type); lateBindMembers(type); @@ -3700,46 +4087,27 @@ export function createChecker(program: Program, resolver: NameResolver): Checker return type; } - function shouldRunDecorators(node: TemplateDeclarationNode, mapper: TypeMapper | undefined) { - // Node is not a template we should create the type. - if (node.templateParameters.length === 0) { - return true; - } - // There is no mapper so we shouldn't be instantiating the template. - if (mapper === undefined) { - return false; - } - - // Some of the mapper args are still template parameter so we shouldn't create the type. - return ( - !mapper.partial && - mapper.args.every( - (t) => isValue(t) || t.entityKind === "Indeterminate" || t.kind !== "TemplateParameter", - ) - ); - } - - function checkModelExpression(node: ModelExpressionNode, mapper: TypeMapper | undefined) { + function checkModelExpression(ctx: CheckContext, node: ModelExpressionNode) { const links = getSymbolLinks(node.symbol); - if (links.declaredType && mapper === undefined) { + if (links.declaredType && ctx.mapper === undefined) { // we're not instantiating this model and we've already checked it return links.declaredType as any; } const type = initModel(node); const properties = type.properties; - linkType(links, type, mapper); - linkMapper(type, mapper); + linkType(ctx, links, type); + linkMapper(type, ctx.mapper); ensureResolved( node.properties .filter((x) => x.kind === SyntaxKind.ModelSpreadProperty) - .map((x) => checkSpreadTarget(node, x.target, mapper)), + .map((x) => checkSpreadTarget(ctx, node, x.target)), type, () => { - checkModelProperties(node, properties, type, mapper); - finishType(type); + checkModelProperties(ctx, node, properties, type); + finishType(type, { skipDecorators: ctx.hasFlags(CheckFlags.InTemplateDeclaration) }); }, ); return type; @@ -3804,25 +4172,25 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkModelProperties( + ctx: CheckContext, node: ModelExpressionNode | ModelStatementNode, properties: Map, parentModel: Model, - mapper: TypeMapper | undefined, ) { let spreadIndexers: ModelIndexer[] | undefined; for (const prop of node.properties!) { if ("id" in prop) { - const newProp = checkModelProperty(prop, mapper); + const newProp = checkModelProperty(ctx, prop); newProp.model = parentModel; checkPropertyCompatibleWithModelIndexer(parentModel, newProp, prop); defineProperty(properties, newProp); } else { // spread property const [newProperties, additionalIndexer] = checkSpreadProperty( + ctx, node.symbol, prop.target, parentModel, - mapper, ); if (additionalIndexer) { @@ -3833,7 +4201,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } } for (const newProp of newProperties) { - linkIndirectMember(node, newProp, mapper); + linkIndirectMember(ctx, node, newProp); checkPropertyCompatibleWithModelIndexer(parentModel, newProp, prop); defineProperty(properties, newProp, prop); } @@ -3853,11 +4221,11 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkObjectValue( + ctx: CheckContext, node: ObjectLiteralNode, - mapper: TypeMapper | undefined, constraint: CheckValueConstraint | undefined, ): ObjectValue | null { - const properties = checkObjectLiteralProperties(node, mapper); + const properties = checkObjectLiteralProperties(ctx, node); if (properties === null) { return null; } @@ -3913,21 +4281,21 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkObjectLiteralProperties( + ctx: CheckContext, node: ObjectLiteralNode, - mapper: TypeMapper | undefined, ): Map | null { const properties = new Map(); let hasError = false; for (const prop of node.properties!) { if ("id" in prop) { - const value = getValueForNode(prop.value, mapper); + const value = getValueForNode(prop.value, ctx.mapper); if (value === null) { hasError = true; } else { properties.set(prop.id.sv, { name: prop.id.sv, value: value, node: prop }); } } else { - const targetType = checkObjectSpreadProperty(prop.target, mapper); + const targetType = checkObjectSpreadProperty(ctx, prop.target); if (targetType) { for (const [name, value] of targetType.properties) { properties.set(name, { ...value }); @@ -3939,10 +4307,10 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkObjectSpreadProperty( + ctx: CheckContext, targetNode: TypeReferenceNode, - mapper: TypeMapper | undefined, ): ObjectValue | null { - const value = getValueForNode(targetNode, mapper); + const value = getValueForNode(targetNode, ctx.mapper); if (value === null) { return null; } @@ -3955,13 +4323,13 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkArrayValue( + ctx: CheckContext, node: ArrayLiteralNode, - mapper: TypeMapper | undefined, constraint: CheckValueConstraint | undefined, ): ArrayValue | null { let hasError = false; const values = node.values.map((itemNode) => { - const value = getValueForNode(itemNode, mapper); + const value = getValueForNode(itemNode, ctx.mapper); if (value === null) { hasError = true; } @@ -4167,22 +4535,85 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkCallExpressionTarget( + ctx: CheckContext, node: CallExpressionNode, - mapper: TypeMapper | undefined, - ): ScalarConstructor | Scalar | null { - const target = checkTypeReference(node.target, mapper); + ): ScalarConstructor | Scalar | FunctionValue | null { + const target = checkTypeOrValueReference(ctx, node.target); + + if (target.entityKind === "Type") { + if (target.kind === "Scalar" || target.kind === "ScalarConstructor") { + return target; + } else if (target.kind === "TemplateParameter") { + const callable = target.constraint && constraintIsCallable(target.constraint); + if (!callable) { + reportCheckerDiagnostic( + createDiagnostic({ + code: "non-callable", + messageId: "templateParameter", + format: { + name: target.node.id.sv, + constraint: target.constraint + ? getEntityName(target.constraint, { printable: true }) + : "unknown", + }, + target: node.target, + }), + ); + } + return null; + } + } else if (target.entityKind === "Value") { + if (target.valueKind === "Function") { + return target; + } + } - if (target.kind === "Scalar" || target.kind === "ScalarConstructor") { - return target; - } else { + const kind = + target.entityKind === "Type" + ? target.kind + : target.entityKind === "Indeterminate" + ? target.type.kind + : target.valueKind; + + if (!isErrorType(target)) { reportCheckerDiagnostic( createDiagnostic({ code: "non-callable", - format: { type: target.kind }, + format: { type: kind }, target: node.target, }), ); - return null; + } + return null; + + function constraintIsCallable(constraint: MixedParameterConstraint): boolean { + compilerAssert( + constraint.type || constraint.valueType, + "Expected constraint to have type or value type", + ); + let callable = true; + + if (constraint.type) { + callable &&= typeIsCallable(constraint.type); + } + + if (constraint.valueType) { + callable &&= constraint.valueType.kind === "FunctionType"; + } + + return callable; + } + + function typeIsCallable(type: Type): boolean { + switch (type.kind) { + case "Scalar": + case "ScalarConstructor": + return true; + case "Union": + return [...type.variants.values()].every(typeIsCallable); + default: + return false; + } } } @@ -4224,8 +4655,8 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function createScalarValue( + ctx: CheckContext, node: CallExpressionNode, - mapper: TypeMapper | undefined, declaration: ScalarConstructor, ): ScalarValue | null { let hasError = false; @@ -4275,7 +4706,10 @@ export function createChecker(program: Program, resolver: NameResolver): Checker for (let i = index; i < node.arguments.length; i++) { const argNode = node.arguments[i]; if (argNode) { - const arg = getValueForNode(argNode, mapper, { kind: "argument", type: restType }); + const arg = getValueForNode(argNode, ctx.mapper, { + kind: "argument", + type: restType, + }); if (arg === null) { hasError = true; continue; @@ -4292,7 +4726,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } const argNode = node.arguments[index]; if (argNode) { - const arg = getValueForNode(argNode, mapper, { + const arg = getValueForNode(argNode, ctx.mapper, { kind: "argument", type: parameter.type, }); @@ -4322,18 +4756,19 @@ export function createChecker(program: Program, resolver: NameResolver): Checker }; } - function checkCallExpression( - node: CallExpressionNode, - mapper: TypeMapper | undefined, - ): Value | null { - const target = checkCallExpressionTarget(node, mapper); + function checkCallExpression(ctx: CheckContext, node: CallExpressionNode): Type | Value | null { + const target = checkCallExpressionTarget(ctx, node); if (target === null) { return null; } - if (target.kind === "ScalarConstructor") { - return createScalarValue(node, mapper, target); + if (target.entityKind === "Type" && target.kind === "ScalarConstructor") { + return createScalarValue(ctx, node, target); + } else if (target.entityKind === "Value" && target.valueKind === "Function") { + return checkFunctionCall(ctx, node, target as FunctionValue); } + compilerAssert(target.entityKind === "Type", "Expected type entity"); + if (relation.areScalarsRelated(target, getStdType("string"))) { return checkPrimitiveArg(node, target, "StringValue"); } else if (relation.areScalarsRelated(target, getStdType("numeric"))) { @@ -4352,8 +4787,397 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } } - function checkTypeOfExpression(node: TypeOfExpressionNode, mapper: TypeMapper | undefined): Type { - const entity = checkNode(node.target, mapper, undefined); + function checkFunctionCall( + ctx: CheckContext, + node: CallExpressionNode, + target: FunctionValue, + ): Type | Value | null { + const [satisfied, resolvedArgs] = checkFunctionCallArguments(ctx, node.arguments, target); + + const canCall = + satisfied && + !ctx.hasFlags(CheckFlags.InTemplateDeclaration) && + !(target.implementation as any).isDefaultFunctionImplementation; + + const fnCtx = createFunctionContext(program, node); + + if (!canCall) { + return getDefaultFunctionResult(target.returnType); + } + + const functionReturn = target.implementation(fnCtx, ...resolvedArgs); + + const returnIsEntity = + typeof functionReturn === "object" && + functionReturn !== null && + "entityKind" in functionReturn && + (functionReturn.entityKind === "Type" || + functionReturn.entityKind === "Value" || + functionReturn.entityKind === "Indeterminate"); + + // special case for when the return value is `undefined` and the return type is `void` or `valueof void`. + if (functionReturn === undefined && isVoidReturn(target.returnType)) { + return voidType; + } + + const unmarshaled = returnIsEntity + ? (functionReturn as Type | Value) + : unmarshalJsToValue(program, functionReturn, function onInvalid(value) { + let valueSummary = String(value); + if (valueSummary.length > 30) { + valueSummary = valueSummary.slice(0, 27) + "..."; + } + reportCheckerDiagnostic( + createDiagnostic({ + code: "function-return", + messageId: "invalid-value", + format: { value: valueSummary }, + target: node, + }), + ); + }); + + let result: Type | Value | IndeterminateEntity | null = unmarshaled; + if (satisfied && result !== null) result = checkFunctionReturn(target, result, node); + + return result; + } + + function isVoidReturn(constraint: MixedParameterConstraint): boolean { + if (constraint.valueType) { + return false; + } + + if (constraint.type) { + if (!isVoidType(constraint.type)) return false; + } + + return true; + + function isVoidType(type: Type): type is VoidType { + return type.kind === "Intrinsic" && type.name === "void"; + } + } + + /** + * Produces the default function result when a function call cannot be completed. + * + * This produces `null` if the function has a value type constraint but no type constraint, `errorType` + * otherwise (if the function _could_ return a Type). + * + * @param constraint - The function return constraint. + * @returns + */ + function getDefaultFunctionResult(constraint: MixedParameterConstraint): Type | null { + if (constraint.valueType) { + // If the function _can_ return a value, we will just return null. This is a bit of a hack, but it's the best fallback + // for a function that could return a type or value, since returning a type would cause type-in-value errors. + return null; + } else { + compilerAssert( + constraint.type, + "Expected function to have a return type when it did not have a value type constraint", + ); + // If for some reason we cannot evaluate the call, we will return the type constraint itself as a fallback. + // This is the strongest thing we can do in the context of an error or a template declaration, since the result + // of the function call must be assignable to the constraint, and by the transitive property if the constraint + // is assignable in the context of evaluation, so will be the result of any valid evaluation of the implementation. + // Technically, this isn't exactly ideal, since it could prevent function calls that return subtypes of the constraint + // from assigning if the _result_ would be assignable. However, we have other cases where we check constraints in + // templates to try to ensure that any instance will validate. We may need to revisit this in the future, but for + // now, I am choosing strictness in the face of uncertainty. + return constraint.type; + } + } + + function checkFunctionCallArguments( + ctx: CheckContext, + args: Expression[], + target: FunctionValue, + ): [boolean, any[]] { + let satisfied = true; + const minArgs = target.parameters.filter((p) => !p.optional && !p.rest).length; + const maxArgs = target.parameters[target.parameters.length - 1]?.rest + ? undefined + : target.parameters.length; + + if (args.length < minArgs) { + reportCheckerDiagnostic( + createDiagnostic({ + code: "invalid-argument-count", + messageId: "atLeast", + format: { actual: args.length.toString(), expected: minArgs.toString() }, + target: target.node!, + }), + ); + return [false, []]; + } else if (maxArgs !== undefined && args.length > maxArgs) { + reportCheckerDiagnostic( + createDiagnostic({ + code: "invalid-argument-count", + format: { actual: args.length.toString(), expected: maxArgs.toString() }, + target: target.node!, + }), + ); + // This error doesn't actually prevent us from checking the arguments and evaluating the function. + } + + const collector = createDiagnosticCollector(); + + const resolvedArgs: any[] = []; + + let idx = 0; + + for (const param of target.parameters) { + if (param.rest) { + const constraint = extractRestParamConstraint(param.type); + + if (!constraint) { + satisfied = false; + continue; + } + + const restArgExpressions = args.slice(idx); + + const restArgs = restArgExpressions.map((arg) => + getTypeOrValueForNode(arg, ctx, { kind: "argument", constraint }), + ); + + if (restArgs.some((x) => x === null)) { + satisfied = false; + continue; + } + + resolvedArgs.push( + ...restArgs.map((v, idx) => + v !== null && isValue(v) ? marshalTypeForJs(v, undefined) : v, + ), + ); + } else { + const arg = args[idx++]; + + if (!arg) { + if (param.optional) { + resolvedArgs.push(undefined); + continue; + } else { + // No need to report a diagnostic here because we already reported one for + // invalid argument counts above. + + satisfied = false; + continue; + } + } + + // Normal param + const checkedArg = getTypeOrValueForNode(arg, ctx, { + kind: "argument", + constraint: param.type, + }); + + if (!checkedArg) { + satisfied = false; + continue; + } + + const resolved = collector.pipe( + checkEntityAssignableToConstraint(checkedArg, param.type, arg), + ); + + satisfied &&= !!resolved; + + resolvedArgs.push( + resolved + ? isValue(resolved) + ? marshalTypeForJs(resolved, undefined) + : resolved + : undefined, + ); + } + } + + reportCheckerDiagnostics(collector.diagnostics); + + return [satisfied, resolvedArgs]; + } + + function checkFunctionReturn( + target: FunctionValue, + result: Type | Value | IndeterminateEntity, + diagnosticTarget: Node, + ): Type | Value | null { + const [checked, diagnostics] = checkEntityAssignableToConstraint( + result, + target.returnType, + diagnosticTarget, + ); + + if (diagnostics.length > 0) { + reportCheckerDiagnostic( + createDiagnostic({ + code: "function-return", + messageId: "unassignable", + format: { + name: getEntityName(target, { printable: true }), + entityKind: result.entityKind.toLowerCase(), + return: getEntityName(result, { printable: true }), + type: getEntityName(target.returnType, { printable: true }), + }, + target: diagnosticTarget, + }), + ); + } + + return checked; + } + + function checkEntityAssignableToConstraint( + entity: Type | Value | IndeterminateEntity, + constraint: MixedParameterConstraint, + diagnosticTarget: Node, + ): DiagnosticResult { + const constraintIsValue = !!constraint.valueType; + const constraintIsType = !!constraint.type; + + const collector = createDiagnosticCollector(); + + switch (true) { + case constraintIsValue && constraintIsType: { + const tried = tryAssignValue(); + + if (tried[0] !== null || entity.entityKind === "Value") { + // Succeeded as value or is a value + return tried; + } + + // Now we are guaranteed a type. + const typeEntity = entity.entityKind === "Indeterminate" ? entity.type : entity; + + const assignable = collector.pipe( + relation.isTypeAssignableTo(typeEntity, constraint.type, diagnosticTarget), + ); + + return collector.wrap(assignable ? typeEntity : null); + } + case constraintIsValue: { + const normed = collector.pipe(normalizeValue(entity, constraint, diagnosticTarget)); + + // Error should have been reported in normalizeValue + if (!normed) return collector.wrap(null); + + const assignable = collector.pipe( + relation.isValueOfType(normed, constraint.valueType, diagnosticTarget), + ); + + return collector.wrap(assignable ? normed : null); + } + case constraintIsType: { + if (entity.entityKind === "Indeterminate") entity = entity.type; + + if (entity.entityKind !== "Type") { + collector.add( + createDiagnostic({ + code: "value-in-type", + format: { name: getTypeName(entity.type) }, + target: diagnosticTarget, + }), + ); + return collector.wrap(null); + } + + const assignable = collector.pipe( + relation.isTypeAssignableTo(entity, constraint.type, diagnosticTarget), + ); + + return collector.wrap(assignable ? entity : null); + } + default: { + compilerAssert(false, "Expected at least one of type or value constraint to be defined."); + } + } + + function tryAssignValue(): DiagnosticResult { + const collector = createDiagnosticCollector(); + + const normed = collector.pipe(normalizeValue(entity, constraint, diagnosticTarget)); + + const assignable = normed + ? collector.pipe(relation.isValueOfType(normed, constraint.valueType!, diagnosticTarget)) + : false; + + return collector.wrap(assignable ? normed : null); + } + } + + function normalizeValue( + entity: Type | Value | IndeterminateEntity, + constraint: MixedParameterConstraint, + diagnosticTarget: Node, + ): DiagnosticResult { + if (entity.entityKind === "Value") return [entity, []]; + + if (entity.entityKind === "Indeterminate") { + // Coerce to a value + const coerced = getValueFromIndeterminate( + entity.type, + constraint.type && { kind: "argument", type: constraint.type }, + entity.type.node!, + ); + + if (coerced?.entityKind !== "Value") { + return [ + null, + [ + createDiagnostic({ + code: "expect-value", + format: { name: getTypeName(entity.type) }, + target: diagnosticTarget, + }), + ], + ]; + } + + return [coerced, []]; + } + + if (entity.entityKind === "Type") { + if ( + entity.kind === "TemplateParameter" && + entity.constraint?.valueType && + entity.constraint.type === undefined + ) { + return [ + createValue( + { + entityKind: "Value", + valueKind: "TemplateValue", + type: entity.constraint.valueType, + }, + entity.constraint.valueType, + ) as any, + [], + ]; + } + return [ + null, + [ + createDiagnostic({ + code: "expect-value", + format: { name: getTypeName(entity) }, + target: diagnosticTarget, + }), + ], + ]; + } + + compilerAssert( + false, + `Unreachable: unexpected entity kind '${(entity satisfies never as Entity).entityKind}'`, + ); + } + + function checkTypeOfExpression(ctx: CheckContext, node: TypeOfExpressionNode): Type { + const entity = checkNode(ctx, node.target, undefined); if (entity === null) { // Shouldn't need to emit error as we assume null value already emitted error when produced return errorType; @@ -4425,12 +5249,20 @@ export function createChecker(program: Program, resolver: NameResolver): Checker diagnosticTarget?: DiagnosticTarget, ) { if (properties.has(newProp.name)) { + const modelName = newProp.model?.name; reportCheckerDiagnostic( - createDiagnostic({ - code: "duplicate-property", - format: { propName: newProp.name }, - target: diagnosticTarget ?? newProp, - }), + modelName + ? createDiagnostic({ + code: "duplicate-property", + messageId: "withModel", + format: { propName: newProp.name, modelName }, + target: diagnosticTarget ?? newProp, + }) + : createDiagnostic({ + code: "duplicate-property", + format: { propName: newProp.name }, + target: diagnosticTarget ?? newProp, + }), ); return; } @@ -4562,9 +5394,9 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } } function checkClassHeritage( + ctx: CheckContext, model: ModelStatementNode, heritageRef: Expression, - mapper: TypeMapper | undefined, ): Model | undefined { if (heritageRef.kind === SyntaxKind.ModelExpression) { reportCheckerDiagnostic( @@ -4593,7 +5425,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker const target = resolver.getNodeLinks(heritageRef).resolvedSymbol; if (target && pendingResolutions.has(target, ResolutionKind.BaseType)) { - if (mapper === undefined) { + if (ctx.mapper === undefined) { reportCheckerDiagnostic( createDiagnostic({ code: "circular-base-type", @@ -4604,7 +5436,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } return undefined; } - const heritageType = getTypeForNode(heritageRef, mapper); + const heritageType = getTypeForNode(heritageRef, ctx); pendingResolutions.finish(modelSymId, ResolutionKind.BaseType); if (isErrorType(heritageType)) { compilerAssert(program.hasError(), "Should already have reported an error.", heritageRef); @@ -4630,9 +5462,9 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkModelIs( + ctx: CheckContext, model: ModelStatementNode, isExpr: Expression | undefined, - mapper: TypeMapper | undefined, ): Model | undefined { if (!isExpr) return undefined; @@ -4649,11 +5481,11 @@ export function createChecker(program: Program, resolver: NameResolver): Checker ); return undefined; } else if (isExpr.kind === SyntaxKind.ArrayExpression) { - isType = checkArrayExpression(isExpr, mapper); + isType = checkArrayExpression(ctx, isExpr); } else if (isExpr.kind === SyntaxKind.TypeReference) { const target = resolver.getNodeLinks(isExpr).resolvedSymbol; if (target && pendingResolutions.has(target, ResolutionKind.BaseType)) { - if (mapper === undefined) { + if (ctx.mapper === undefined) { reportCheckerDiagnostic( createDiagnostic({ code: "circular-base-type", @@ -4664,7 +5496,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } return undefined; } - isType = getTypeForNode(isExpr, mapper); + isType = getTypeForNode(isExpr, ctx); } else { reportCheckerDiagnostic(createDiagnostic({ code: "is-model", target: isExpr })); return undefined; @@ -4689,15 +5521,15 @@ export function createChecker(program: Program, resolver: NameResolver): Checker /** Get the type for the spread target */ function checkSpreadTarget( + ctx: CheckContext, model: ModelStatementNode | ModelExpressionNode, target: TypeReferenceNode, - mapper: TypeMapper | undefined, ): Type | undefined { const modelSymId = getNodeSym(model); const targetSym = resolver.getNodeLinks(target).resolvedSymbol; if (targetSym === modelSymId) { - if (mapper === undefined) { + if (ctx.mapper === undefined) { reportCheckerDiagnostic( createDiagnostic({ code: "spread-model", @@ -4708,17 +5540,17 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } return undefined; } - const type = getTypeForNode(target, mapper); + const type = getTypeForNode(target, ctx); return type; } function checkSpreadProperty( + ctx: CheckContext, parentModelSym: Sym, targetNode: TypeReferenceNode, parentModel: Model, - mapper: TypeMapper | undefined, ): [ModelProperty[], ModelIndexer | undefined] { - const targetType = getTypeForNode(targetNode, mapper); + const targetType = getTypeForNode(targetNode, ctx); if (targetType.kind === "TemplateParameter" || isErrorType(targetType)) { return [[], undefined]; @@ -4726,14 +5558,14 @@ export function createChecker(program: Program, resolver: NameResolver): Checker if (targetType.kind !== "Model") { reportCheckerDiagnostic( createDiagnostic({ code: "spread-model", target: targetNode }), - mapper, + ctx.mapper, ); return [[], undefined]; } if (isArrayModelType(targetType)) { reportCheckerDiagnostic( createDiagnostic({ code: "spread-model", target: targetNode }), - mapper, + ctx.mapper, ); return [[], undefined]; } @@ -4762,11 +5594,11 @@ export function createChecker(program: Program, resolver: NameResolver): Checker * @param mapper Type Mapper. */ function linkIndirectMember( + ctx: CheckContext, containerNode: MemberContainerNode, member: MemberType, - mapper: TypeMapper | undefined, ) { - if (mapper !== undefined) { + if (ctx.mapper !== undefined) { return; } compilerAssert(typeof member.name === "string", "Cannot link unmapped unions"); @@ -4777,18 +5609,15 @@ export function createChecker(program: Program, resolver: NameResolver): Checker const memberSym = getMemberSymbol(containerNode.symbol, member.name); if (memberSym) { const links = resolver.getSymbolLinks(memberSym); - linkMemberType(links, member, mapper); + linkMemberType(ctx, links, member); } } - function checkModelProperty( - prop: ModelPropertyNode, - mapper: TypeMapper | undefined, - ): ModelProperty { + function checkModelProperty(ctx: CheckContext, prop: ModelPropertyNode): ModelProperty { const sym = getSymbolForMember(prop)!; const links = getSymbolLinksForMember(prop); - if (links && links.declaredType && mapper === undefined) { + if (links && links.declaredType && ctx.mapper === undefined) { return links.declaredType as ModelProperty; } const name = prop.id.sv; @@ -4802,7 +5631,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker decorators: [], }); - if (pendingResolutions.has(sym, ResolutionKind.Type) && mapper === undefined) { + if (pendingResolutions.has(sym, ResolutionKind.Type) && ctx.mapper === undefined) { reportCheckerDiagnostic( createDiagnostic({ code: "circular-prop", @@ -4813,33 +5642,32 @@ export function createChecker(program: Program, resolver: NameResolver): Checker type.type = errorType; } else { pendingResolutions.start(sym, ResolutionKind.Type); - type.type = getTypeForNode(prop.value, mapper); + type.type = getTypeForNode(prop.value, ctx); if (prop.default) { - const defaultValue = checkDefaultValue(prop.default, type.type, mapper); + const defaultValue = checkDefaultValue(ctx, prop.default, type.type); if (defaultValue !== null) { type.defaultValue = defaultValue; } } if (links) { - linkType(links, type, mapper); + linkType(ctx, links, type); } } - type.decorators = checkDecorators(type, prop, mapper); + type.decorators = checkDecorators(ctx, type, prop); const parentTemplate = getParentTemplateNode(prop); - linkMapper(type, mapper); + linkMapper(type, ctx.mapper); - let runDecorators = false; - if (!parentTemplate || shouldRunDecorators(parentTemplate, mapper)) { + const shouldRunDecorators = !ctx.hasFlags(CheckFlags.InTemplateDeclaration); + if (!parentTemplate || shouldRunDecorators) { const docComment = docFromCommentForSym.get(sym); if (docComment) { type.decorators.unshift(createDocFromCommentDecorator("self", docComment)); } - runDecorators = true; } pendingResolutions.finish(sym, ResolutionKind.Type); - return finishType(type, { skipDecorators: !runDecorators }); + return finishType(type, { skipDecorators: !shouldRunDecorators }); } function createDocFromCommentDecorator(key: "self" | "returns" | "errors", doc: string) { @@ -4852,16 +5680,12 @@ export function createChecker(program: Program, resolver: NameResolver): Checker }; } - function checkDefaultValue( - defaultNode: Node, - type: Type, - mapper: TypeMapper | undefined, - ): Value | null { + function checkDefaultValue(ctx: CheckContext, defaultNode: Node, type: Type): Value | null { if (isErrorType(type)) { // if the prop type is an error we don't need to validate again. return null; } - const defaultValue = getValueForNode(defaultNode, mapper, { + const defaultValue = getValueForNode(defaultNode, ctx, { kind: "assignment", type, }); @@ -4882,11 +5706,11 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkDecoratorApplication( + ctx: CheckContext, targetType: Type, decNode: DecoratorExpressionNode | AugmentDecoratorStatementNode, - mapper: TypeMapper | undefined, ): DecoratorApplication | undefined { - const sym = resolveTypeReferenceSym(decNode.target, undefined, true); + const sym = resolveTypeReferenceSym(ctx.withMapper(undefined), decNode.target, true); if (!sym) { // Error should already have been reported above return undefined; @@ -4912,7 +5736,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker x.kind === SyntaxKind.DecoratorDeclarationStatement, ); if (decoratorDeclNode) { - checkDecoratorDeclaration(decoratorDeclNode, undefined); + checkDecoratorDeclaration(ctx.withMapper(undefined), decoratorDeclNode); } } if (symbolLinks.declaredType) { @@ -4924,11 +5748,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker hasError = true; } } - const [argsHaveError, args] = checkDecoratorArguments( - decNode, - mapper, - symbolLinks.declaredType, - ); + const [argsHaveError, args] = checkDecoratorArguments(ctx, decNode, symbolLinks.declaredType); if (hasError || argsHaveError) { return undefined; @@ -4967,8 +5787,8 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkDecoratorArguments( + ctx: CheckContext, node: DecoratorExpressionNode | AugmentDecoratorStatementNode, - mapper: TypeMapper | undefined, declaration: Decorator | undefined, ): [boolean, DecoratorArgument[]] { // if we don't have a declaration we can just return the types or values if @@ -4976,7 +5796,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker return [ false, node.arguments.map((argNode): DecoratorArgument => { - let type = checkNode(argNode, mapper) ?? errorType; + let type = checkNode(ctx, argNode) ?? errorType; if (type.entityKind === "Indeterminate") { type = type.type; } @@ -5032,7 +5852,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker argNode: Expression, perParamType: MixedParameterConstraint, ): DecoratorArgument | undefined { - const arg = getTypeOrValueForNode(argNode, mapper, { + const arg = getTypeOrValueForNode(argNode, ctx, { kind: "argument", constraint: perParamType, }); @@ -5042,16 +5862,21 @@ export function createChecker(program: Program, resolver: NameResolver): Checker !(isType(arg) && isErrorType(arg)) && checkArgumentAssignable(arg, perParamType, argNode) ) { + const [valid, jsValue] = resolveArgumentJsValue( + arg, + extractValueOfConstraints({ + kind: "argument", + constraint: perParamType, + }), + argNode, + ); + + if (!valid) return undefined; + return { value: arg, node: argNode, - jsValue: resolveDecoratorArgJsValue( - arg, - extractValueOfConstraints({ - kind: "argument", - constraint: perParamType, - }), - ), + jsValue, }; } else { return undefined; @@ -5121,18 +5946,20 @@ export function createChecker(program: Program, resolver: NameResolver): Checker return type.kind === "Model" ? type.indexer?.value : undefined; } - function resolveDecoratorArgJsValue( + function resolveArgumentJsValue( value: Type | Value, valueConstraint: CheckValueConstraint | undefined, - ) { + diagnosticTarget: Node, + ): [valid: boolean, jsValue: any] { if (valueConstraint !== undefined) { if (isValue(value)) { - return marshallTypeForJS(value, valueConstraint.type); + const unmarshaled = marshalTypeForJs(value, valueConstraint.type); + return [true, unmarshaled]; } else { - return value; + return [true, value]; } } - return value; + return [true, value]; } function checkArgumentAssignable( @@ -5157,15 +5984,15 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkAugmentDecorators( + ctx: CheckContext, sym: Sym, targetType: Type, - mapper: TypeMapper | undefined, ): DecoratorApplication[] { const augmentDecoratorNodes = resolver.getAugmentDecoratorsForSym(sym); const decorators: DecoratorApplication[] = []; for (const decNode of augmentDecoratorNodes) { - const decorator = checkDecoratorApplication(targetType, decNode, mapper); + const decorator = checkDecoratorApplication(ctx, targetType, decNode); if (decorator) { decorators.unshift(decorator); } @@ -5176,9 +6003,12 @@ export function createChecker(program: Program, resolver: NameResolver): Checker /** * Check that augment decorator are targeting valid symbols. */ - function checkAugmentDecorator(node: AugmentDecoratorStatementNode) { + function checkAugmentDecorator(ctx: CheckContext, node: AugmentDecoratorStatementNode) { // This will validate the target type is pointing to a valid ref. - resolveTypeReferenceSym(node.targetType, undefined, { resolveDeclarationOfTemplate: true }); + resolveTypeReferenceSym(ctx.withMapper(undefined), node.targetType, { + resolveDeclarationOfTemplate: true, + }); + const links = resolver.getNodeLinks(node.targetType); if (links.isTemplateInstantiation) { program.reportDiagnostic( @@ -5225,8 +6055,8 @@ export function createChecker(program: Program, resolver: NameResolver): Checker /** * Check that using statements are targeting valid symbols. */ - function checkUsings(node: UsingStatementNode) { - const usedSym = resolveTypeReferenceSym(node.name, undefined); + function checkUsings(ctx: CheckContext, node: UsingStatementNode) { + const usedSym = resolveTypeReferenceSym(ctx.withMapper(undefined), node.name); if (usedSym) { if (~usedSym.flags & SymbolFlags.Namespace) { reportCheckerDiagnostic(createDiagnostic({ code: "using-invalid-ref", target: node.name })); @@ -5236,9 +6066,9 @@ export function createChecker(program: Program, resolver: NameResolver): Checker return errorType; } function checkDecorators( + ctx: CheckContext, targetType: Type, node: Node & { decorators: readonly DecoratorExpressionNode[] }, - mapper: TypeMapper | undefined, ) { const sym = isMemberNode(node) ? (getSymbolForMember(node) ?? node.symbol) @@ -5251,7 +6081,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker ...node.decorators, ]; for (const decNode of decoratorNodes) { - const decorator = checkDecoratorApplication(targetType, decNode, mapper); + const decorator = checkDecoratorApplication(ctx, targetType, decNode); if (decorator) { decorators.unshift(decorator); } @@ -5275,14 +6105,22 @@ export function createChecker(program: Program, resolver: NameResolver): Checker return decorators; } - function checkScalar(node: ScalarStatementNode, mapper: TypeMapper | undefined): Scalar { + function checkScalar(ctx: CheckContext, node: ScalarStatementNode): Scalar { const links = getSymbolLinks(node.symbol); - if (links.declaredType && mapper === undefined) { + if (ctx.mapper === undefined && node.templateParameters.length > 0) { + // This is a templated declaration and we are not instantiating it, so we need to update the flags. + ctx = ctx.withFlags(CheckFlags.InTemplateDeclaration); + } + + if (links.declaredType && ctx.mapper === undefined) { // we're not instantiating this model and we've already checked it return links.declaredType as any; } - checkTemplateDeclaration(node, mapper); + if (ctx.mapper === undefined) { + checkModifiers(program, node); + } + checkTemplateDeclaration(ctx, node); const decorators: DecoratorApplication[] = []; @@ -5295,33 +6133,33 @@ export function createChecker(program: Program, resolver: NameResolver): Checker decorators, derivedScalars: [], }); - linkType(links, type, mapper); + linkType(ctx, links, type); if (node.extends) { - type.baseScalar = checkScalarExtends(node, node.extends, mapper); + type.baseScalar = checkScalarExtends(ctx, node, node.extends); if (type.baseScalar) { copyDeprecation(type.baseScalar, type); type.baseScalar.derivedScalars.push(type); } } - checkScalarConstructors(type, node, type.constructors, mapper); - decorators.push(...checkDecorators(type, node, mapper)); + checkScalarConstructors(ctx, type, node, type.constructors); + decorators.push(...checkDecorators(ctx, type, node)); - if (mapper === undefined) { + if (ctx.mapper === undefined) { type.namespace?.scalars.set(type.name, type); } - linkMapper(type, mapper); + linkMapper(type, ctx.mapper); if (isInTypeSpecNamespace(type)) { stdTypes[type.name as any as keyof StdTypes] = type as any; } - return finishType(type, { skipDecorators: !shouldRunDecorators(node, mapper) }); + return finishType(type, { skipDecorators: ctx.hasFlags(CheckFlags.InTemplateDeclaration) }); } function checkScalarExtends( + ctx: CheckContext, scalar: ScalarStatementNode, extendsRef: TypeReferenceNode, - mapper: TypeMapper | undefined, ): Scalar | undefined { const symId = getNodeSym(scalar); pendingResolutions.start(symId, ResolutionKind.BaseType); @@ -5329,7 +6167,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker const target = resolver.getNodeLinks(extendsRef).resolvedSymbol; if (target && pendingResolutions.has(target, ResolutionKind.BaseType)) { - if (mapper === undefined) { + if (ctx.mapper === undefined) { reportCheckerDiagnostic( createDiagnostic({ code: "circular-base-type", @@ -5340,7 +6178,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } return undefined; } - const extendsType = getTypeForNode(extendsRef, mapper); + const extendsType = getTypeForNode(extendsRef, ctx); pendingResolutions.finish(symId, ResolutionKind.BaseType); if (isErrorType(extendsType)) { compilerAssert(program.hasError(), "Should already have reported an error.", extendsRef); @@ -5356,10 +6194,10 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkScalarConstructors( + ctx: CheckContext, parentScalar: Scalar, node: ScalarStatementNode, constructors: Map, - mapper: TypeMapper | undefined, ) { if (parentScalar.baseScalar) { for (const member of parentScalar.baseScalar.constructors.values()) { @@ -5370,12 +6208,12 @@ export function createChecker(program: Program, resolver: NameResolver): Checker scalar: parentScalar, }, ); - linkIndirectMember(node, newConstructor, mapper); + linkIndirectMember(ctx, node, newConstructor); constructors.set(member.name, newConstructor); } } for (const member of node.members) { - const constructor = checkScalarConstructor(member, mapper, parentScalar); + const constructor = checkScalarConstructor(ctx, member, parentScalar); if (constructors.has(constructor.name as string)) { reportCheckerDiagnostic( createDiagnostic({ @@ -5391,13 +6229,13 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } function checkScalarConstructor( + ctx: CheckContext, node: ScalarConstructorNode, - mapper: TypeMapper | undefined, parentScalar: Scalar, ): ScalarConstructor { const name = node.id.sv; const links = getSymbolLinksForMember(node); - if (links && links.declaredType && mapper === undefined) { + if (links && links.declaredType && ctx.mapper === undefined) { // we're not instantiating this scalar constructor and we've already checked it return links.declaredType as ScalarConstructor; } @@ -5407,32 +6245,37 @@ export function createChecker(program: Program, resolver: NameResolver): Checker scalar: parentScalar, name, node, - parameters: node.parameters.map((x) => checkFunctionParameter(x, mapper, false)), + parameters: node.parameters.map((x) => checkFunctionParameter(ctx, x, false)), }); - linkMapper(member, mapper); + linkMapper(member, ctx.mapper); if (links) { - linkType(links, member, mapper); + linkType(ctx, links, member); } return finishType(member, { - skipDecorators: !shouldRunDecorators(node.parent!, mapper), + skipDecorators: ctx.hasFlags(CheckFlags.InTemplateDeclaration), }); } - function checkAlias( - node: AliasStatementNode, - mapper: TypeMapper | undefined, - ): Type | IndeterminateEntity { + function checkAlias(ctx: CheckContext, node: AliasStatementNode): Type | IndeterminateEntity { const links = getSymbolLinks(node.symbol); - if (links.declaredType && mapper === undefined) { + if (ctx.mapper === undefined && node.templateParameters.length > 0) { + // This is a templated declaration and we are not instantiating it, so we need to update the flags. + ctx = ctx.withFlags(CheckFlags.InTemplateDeclaration); + } + + if (links.declaredType && ctx.mapper === undefined) { return links.declaredType; } - checkTemplateDeclaration(node, mapper); + if (ctx.mapper === undefined) { + checkModifiers(program, node); + } + checkTemplateDeclaration(ctx, node); const aliasSymId = getNodeSym(node); if (pendingResolutions.has(aliasSymId, ResolutionKind.Type)) { - if (mapper === undefined) { + if (ctx.mapper === undefined) { reportCheckerDiagnostic( createDiagnostic({ code: "circular-alias-type", @@ -5446,7 +6289,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } pendingResolutions.start(aliasSymId, ResolutionKind.Type); - const type = checkNode(node.value, mapper); + const type = checkNode(ctx, node.value); if (type === null) { links.declaredType = errorType; return errorType; @@ -5456,7 +6299,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker links.declaredType = errorType; return errorType; } - linkType(links, type as any, mapper); + linkType(ctx, links, type as any); pendingResolutions.finish(aliasSymId, ResolutionKind.Type); return type; @@ -5467,6 +6310,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker if (links.value !== undefined) { return links.value; } + checkModifiers(program, node); const type = node.type ? getTypeForNode(node.type, undefined) : undefined; @@ -5507,13 +6351,15 @@ export function createChecker(program: Program, resolver: NameResolver): Checker case "EnumValue": case "NullValue": case "ScalarValue": + case "Function": return value; } } - function checkEnum(node: EnumStatementNode, mapper: TypeMapper | undefined): Type { + function checkEnum(ctx: CheckContext, node: EnumStatementNode): Type { const links = getSymbolLinks(node.symbol); if (!links.type) { + checkModifiers(program, node); const enumType: Enum = (links.type = createType({ kind: "Enum", name: node.id.sv, @@ -5526,7 +6372,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker for (const member of node.members) { if (member.kind === SyntaxKind.EnumMember) { - const memberType = checkEnumMember(member, mapper, enumType); + const memberType = checkEnumMember(ctx, member, enumType); if (memberNames.has(memberType.name)) { reportCheckerDiagnostic( createDiagnostic({ @@ -5541,14 +6387,14 @@ export function createChecker(program: Program, resolver: NameResolver): Checker enumType.members.set(memberType.name, memberType); } else { const members = checkEnumSpreadMember( + ctx, node.symbol, enumType, member.target, - mapper, memberNames, ); for (const memberType of members) { - linkIndirectMember(node, memberType, mapper); + linkIndirectMember(ctx, node, memberType); enumType.members.set(memberType.name, memberType); } } @@ -5557,22 +6403,30 @@ export function createChecker(program: Program, resolver: NameResolver): Checker const namespace = getParentNamespaceType(node); enumType.namespace = namespace; enumType.namespace?.enums.set(enumType.name!, enumType); - enumType.decorators = checkDecorators(enumType, node, mapper); - linkMapper(enumType, mapper); + enumType.decorators = checkDecorators(ctx, enumType, node); + linkMapper(enumType, ctx.mapper); finishType(enumType); } return links.type; } - function checkInterface(node: InterfaceStatementNode, mapper: TypeMapper | undefined): Interface { + function checkInterface(ctx: CheckContext, node: InterfaceStatementNode): Interface { const links = getSymbolLinks(node.symbol); - if (links.declaredType && mapper === undefined) { + if (ctx.mapper === undefined && node.templateParameters.length > 0) { + // This is a templated declaration and we are not instantiating it, so we need to update the flags. + ctx = ctx.withFlags(CheckFlags.InTemplateDeclaration); + } + + if (links.declaredType && ctx.mapper === undefined) { // we're not instantiating this interface and we've already checked it return links.declaredType as Interface; } - checkTemplateDeclaration(node, mapper); + if (ctx.mapper === undefined) { + checkModifiers(program, node); + } + checkTemplateDeclaration(ctx, node); const interfaceType: Interface = createType({ kind: "Interface", @@ -5584,14 +6438,14 @@ export function createChecker(program: Program, resolver: NameResolver): Checker name: node.id.sv, }); - linkType(links, interfaceType, mapper); + linkType(ctx, links, interfaceType); - interfaceType.decorators = checkDecorators(interfaceType, node, mapper); + interfaceType.decorators = checkDecorators(ctx, interfaceType, node); - const ownMembers = checkInterfaceMembers(node, mapper, interfaceType); + const ownMembers = checkInterfaceMembers(ctx, node, interfaceType); for (const extendsNode of node.extends) { - const extendsType = getTypeForNode(extendsNode, mapper); + const extendsType = getTypeForNode(extendsNode, ctx); if (extendsType.kind !== "Interface") { reportCheckerDiagnostic( createDiagnostic({ code: "extends-interface", target: extendsNode }), @@ -5615,7 +6469,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker }); // Don't link it it is overritten if (!ownMembers.has(member.name)) { - linkIndirectMember(node, newMember, mapper); + linkIndirectMember(ctx, node, newMember); } // Clone deprecation information @@ -5630,22 +6484,22 @@ export function createChecker(program: Program, resolver: NameResolver): Checker interfaceType.operations.set(key, value); } - linkMapper(interfaceType, mapper); + linkMapper(interfaceType, ctx.mapper); - if (mapper === undefined) { + if (ctx.mapper === undefined) { interfaceType.namespace?.interfaces.set(interfaceType.name, interfaceType); } lateBindMemberContainer(interfaceType); lateBindMembers(interfaceType); return finishType(interfaceType, { - skipDecorators: !shouldRunDecorators(node, mapper), + skipDecorators: ctx.hasFlags(CheckFlags.InTemplateDeclaration), }); } function checkInterfaceMembers( + ctx: CheckContext, node: InterfaceStatementNode, - mapper: TypeMapper | undefined, interfaceType: Interface, ): Map { const ownMembers = new Map(); @@ -5659,7 +6513,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } } for (const opNode of node.operations) { - const opType = checkOperation(opNode, mapper, interfaceType); + const opType = checkOperation(ctx, opNode, interfaceType); if (ownMembers.has(opType.name)) { reportCheckerDiagnostic( createDiagnostic({ @@ -5675,14 +6529,21 @@ export function createChecker(program: Program, resolver: NameResolver): Checker return ownMembers; } - function checkUnion(node: UnionStatementNode, mapper: TypeMapper | undefined) { + function checkUnion(ctx: CheckContext, node: UnionStatementNode) { const links = getSymbolLinks(node.symbol); - if (links.declaredType && mapper === undefined) { + if (ctx.mapper === undefined && node.templateParameters.length > 0) { + ctx = ctx.withFlags(CheckFlags.InTemplateDeclaration); + } + + if (links.declaredType && ctx.mapper === undefined) { // we're not instantiating this union and we've already checked it return links.declaredType as Union; } - checkTemplateDeclaration(node, mapper); + if (ctx.mapper === undefined) { + checkModifiers(program, node); + } + checkTemplateDeclaration(ctx, node); const variants = createRekeyableMap(); const unionType: Union = createType({ @@ -5697,31 +6558,33 @@ export function createChecker(program: Program, resolver: NameResolver): Checker }, expression: false, }); - linkType(links, unionType, mapper); + linkType(ctx, links, unionType); - unionType.decorators = checkDecorators(unionType, node, mapper); + unionType.decorators = checkDecorators(ctx, unionType, node); - checkUnionVariants(unionType, node, variants, mapper); + checkUnionVariants(ctx, unionType, node, variants); - linkMapper(unionType, mapper); + linkMapper(unionType, ctx.mapper); - if (mapper === undefined) { + if (ctx.mapper === undefined) { unionType.namespace?.unions.set(unionType.name!, unionType); } lateBindMemberContainer(unionType); lateBindMembers(unionType); - return finishType(unionType, { skipDecorators: !shouldRunDecorators(node, mapper) }); + return finishType(unionType, { + skipDecorators: ctx.hasFlags(CheckFlags.InTemplateDeclaration), + }); } function checkUnionVariants( + ctx: CheckContext, parentUnion: Union, node: UnionStatementNode, variants: Map, - mapper: TypeMapper | undefined, ) { for (const variantNode of node.options) { - const variantType = checkUnionVariant(variantNode, mapper); + const variantType = checkUnionVariant(ctx, variantNode); variantType.union = parentUnion; if (variants.has(variantType.name as string)) { reportCheckerDiagnostic( @@ -5737,18 +6600,15 @@ export function createChecker(program: Program, resolver: NameResolver): Checker } } - function checkUnionVariant( - variantNode: UnionVariantNode, - mapper: TypeMapper | undefined, - ): UnionVariant { + function checkUnionVariant(ctx: CheckContext, variantNode: UnionVariantNode): UnionVariant { const links = getSymbolLinksForMember(variantNode); - if (links && links.declaredType && mapper === undefined) { + if (links && links.declaredType && ctx.mapper === undefined) { // we're not instantiating this union variant and we've already checked it return links.declaredType as UnionVariant; } const name = variantNode.id ? variantNode.id.sv : Symbol("name"); - const type = getTypeForNode(variantNode.value, mapper); + const type = getTypeForNode(variantNode.value, ctx); const variantType: UnionVariant = createType({ kind: "UnionVariant", name, @@ -5757,14 +6617,14 @@ export function createChecker(program: Program, resolver: NameResolver): Checker type, union: undefined as any, }); - variantType.decorators = checkDecorators(variantType, variantNode, mapper); + variantType.decorators = checkDecorators(ctx, variantType, variantNode); - linkMapper(variantType, mapper); + linkMapper(variantType, ctx.mapper); if (links) { - linkType(links, variantType, mapper); + linkType(ctx, links, variantType); } return finishType(variantType, { - skipDecorators: !shouldRunDecorators(variantNode.parent!, mapper), + skipDecorators: ctx.hasFlags(CheckFlags.InTemplateDeclaration), }); } @@ -5790,11 +6650,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker return sym ? (getSymNode(sym) === node ? getSymbolLinks(sym) : undefined) : undefined; } - function checkEnumMember( - node: EnumMemberNode, - mapper: TypeMapper | undefined, - parentEnum?: Enum, - ): EnumMember { + function checkEnumMember(ctx: CheckContext, node: EnumMemberNode, parentEnum?: Enum): EnumMember { const name = node.id.sv; const links = getSymbolLinksForMember(node); if (links?.type) { @@ -5815,19 +6671,19 @@ export function createChecker(program: Program, resolver: NameResolver): Checker links.type = member; } - member.decorators = checkDecorators(member, node, mapper); + member.decorators = checkDecorators(ctx, member, node); return finishType(member); } function checkEnumSpreadMember( + ctx: CheckContext, parentEnumSym: Sym, parentEnum: Enum, targetNode: TypeReferenceNode, - mapper: TypeMapper | undefined, existingMemberNames: Set, ): EnumMember[] { const members: EnumMember[] = []; - const targetType = getTypeForNode(targetNode, mapper); + const targetType = getTypeForNode(targetNode, ctx); if (!isErrorType(targetType)) { if (targetType.kind !== "Enum") { @@ -6040,7 +6896,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker decorators: [], }); getSymbolLinks(sym).type = type; - type.decorators = checkAugmentDecorators(sym, type, undefined); + type.decorators = checkAugmentDecorators(CheckContext.DEFAULT, sym, type); return finishType(type); } @@ -6173,7 +7029,7 @@ export function createChecker(program: Program, resolver: NameResolver): Checker if (docComment) { clone.decorators.push(createDocFromCommentDecorator("self", docComment)); } - for (const dec of checkAugmentDecorators(sym, clone, undefined)) { + for (const dec of checkAugmentDecorators(CheckContext.DEFAULT, sym, clone)) { clone.decorators.push(dec); } } @@ -6718,26 +7574,81 @@ function applyDecoratorToType( } } -function createDecoratorContext(program: Program, decApp: DecoratorApplication): DecoratorContext { - function createPassThruContext(program: Program, decApp: DecoratorApplication): DecoratorContext { - return { - program, - decoratorTarget: decApp.node!, - getArgumentTarget: () => decApp.node!, - call: (decorator, target, ...args) => { - return decorator(createPassThruContext(program, decApp), target, ...args); - }, - }; - } +function createPassThruContexts( + program: Program, + target: DiagnosticTarget, +): { + decorator: DecoratorContext; + function: FunctionContext; +} { + const decCtx: DecoratorContext = { + program, + decoratorTarget: target, + getArgumentTarget: () => target, + call: (decorator, target, ...args) => { + return decCtx.callDecorator(decorator, target, ...args); + }, + callDecorator(decorator, target, ...args) { + return decorator(decCtx, target, ...args); + }, + callFunction(fn, ...args) { + return fn(fnCtx, ...args); + }, + }; + + const fnCtx: FunctionContext = { + program, + functionCallTarget: target, + getArgumentTarget: () => target, + callFunction(fn, ...args) { + return fn(fnCtx, ...args); + }, + callDecorator(decorator, target, ...args) { + return decorator(decCtx, target, ...args); + }, + }; return { + decorator: decCtx, + function: fnCtx, + }; +} + +function createDecoratorContext(program: Program, decApp: DecoratorApplication): DecoratorContext { + const passthrough = createPassThruContexts(program, decApp.node!); + const decCtx: DecoratorContext = { program, decoratorTarget: decApp.node!, getArgumentTarget: (index: number) => { return decApp.args[index]?.node; }, call: (decorator, target, ...args) => { - return decorator(createPassThruContext(program, decApp), target, ...args); + return decCtx.callDecorator(decorator, target, ...args); + }, + callDecorator: (decorator, target, ...args) => { + return decorator(passthrough.decorator, target, ...args); + }, + callFunction(fn, ...args) { + return fn(passthrough.function, ...args); + }, + }; + + return decCtx; +} + +function createFunctionContext(program: Program, fnCall: CallExpressionNode): FunctionContext { + const passthrough = createPassThruContexts(program, fnCall); + return { + program, + functionCallTarget: fnCall, + getArgumentTarget: (index: number) => { + return fnCall.arguments[index]; + }, + callDecorator(decorator, target, ...args) { + return decorator(passthrough.decorator, target, ...args); + }, + callFunction(fn, ...args) { + return fn(passthrough.function, ...args); }, }; } @@ -6799,6 +7710,11 @@ interface SymbolResolutionOptions { * @default false */ resolveDeclarationOfTemplate: boolean; + + /** + * Location context to use when resolving the symbol. This is used to enforce symbol access logic. + */ + locationContext?: LocationContext; } const defaultSymbolResolutionOptions: SymbolResolutionOptions = { diff --git a/packages/compiler/src/core/cli/actions/compile/compile.ts b/packages/compiler/src/core/cli/actions/compile/compile.ts index b7ab64d8cf7..e8412be94b7 100644 --- a/packages/compiler/src/core/cli/actions/compile/compile.ts +++ b/packages/compiler/src/core/cli/actions/compile/compile.ts @@ -212,18 +212,20 @@ function printStats(stats: Stats) { printRuntime(stats, "checker", Performance.stage, 4); printGroup(stats, "validation", "validators", Performance.validator, 4); printGroup(stats, "linter", "rules", Performance.lintingRule, 4); - printGroup(stats, "emit", "emitters", Performance.stage, 4); + for (const emitter of Object.keys(stats.emit.emitters).sort()) { + printGroup(stats.emit.emitters, emitter, "steps", Performance.stage, 6); + } } - function printGroup( - base: RuntimeStats, + function printGroup( + base: B, groupName: K, itemsKey: L, perf: readonly [number, number], indent: number = 0, ) { const group: any = base[groupName]; - printKV(groupName, runtimeStr(group["total"] ?? 0), indent); + printKV(groupName as any, runtimeStr(group["total"] ?? 0), indent); for (const [key, value] of Object.entries(group[itemsKey]).sort((a, b) => a[0].localeCompare(b[0]), )) { diff --git a/packages/compiler/src/core/cli/actions/info.ts b/packages/compiler/src/core/cli/actions/info.ts index e07b0fa384b..f5cb25a66c6 100644 --- a/packages/compiler/src/core/cli/actions/info.ts +++ b/packages/compiler/src/core/cli/actions/info.ts @@ -3,10 +3,23 @@ import { fileURLToPath } from "url"; import { stringify } from "yaml"; import { loadTypeSpecConfigForPath } from "../../../config/config-loader.js"; import { CompilerHost, Diagnostic } from "../../types.js"; +import { printEmitterOptionsAction } from "./info/emitter-options.js"; + +export interface InfoCliArgs { + emitter?: string; +} + /** - * Print the resolved TypeSpec configuration. + * Print the resolved TypeSpec configuration, or emitter options if an emitter is specified. */ -export async function printInfoAction(host: CompilerHost): Promise { +export async function printInfoAction( + host: CompilerHost, + args: InfoCliArgs, +): Promise { + if (args.emitter) { + return printEmitterOptionsAction(host, args.emitter); + } + const cwd = process.cwd(); console.log(`Module: ${fileURLToPath(import.meta.url)}`); diff --git a/packages/compiler/src/core/cli/actions/info/emitter-options.ts b/packages/compiler/src/core/cli/actions/info/emitter-options.ts new file mode 100644 index 00000000000..e9afa41d314 --- /dev/null +++ b/packages/compiler/src/core/cli/actions/info/emitter-options.ts @@ -0,0 +1,444 @@ +/* eslint-disable no-console */ +import pc from "picocolors"; +import { ResolveModuleError, resolveModule } from "../../../../module-resolver/index.js"; +import type { PackageJson } from "../../../../types/package-json.js"; +import { createResolveModuleHost } from "../../../module-host.js"; +import { loadJsFile } from "../../../source-loader.js"; +import { CompilerHost, Diagnostic, NoTarget, TypeSpecLibrary } from "../../../types.js"; + +interface ResolvedLibrary { + library: TypeSpecLibrary | undefined; + manifest: PackageJson | undefined; + diagnostics: readonly Diagnostic[]; +} + +/** + * Resolve an emitter package and return its library definition and package manifest. + */ +async function resolveEmitterLibrary( + host: CompilerHost, + emitterName: string, + baseDir: string, +): Promise { + try { + const module = await resolveModule(createResolveModuleHost(host), emitterName, { + baseDir, + conditions: ["import"], + }); + + const manifest = module.type === "module" ? module.manifest : undefined; + const entrypoint = module.type === "file" ? module.path : module.mainFile; + const [file, jsDiagnostics] = await loadJsFile(host, entrypoint, NoTarget); + if (!file) { + return { library: undefined, manifest, diagnostics: jsDiagnostics }; + } + + const libDefinition: TypeSpecLibrary | undefined = file.esmExports.$lib; + return { library: libDefinition, manifest, diagnostics: jsDiagnostics }; + } catch (e: any) { + if (e instanceof ResolveModuleError) { + return { + library: undefined, + manifest: undefined, + diagnostics: [ + { + code: "emitter-not-found", + severity: "error", + message: `Could not resolve emitter "${emitterName}". Make sure it is installed.\n ${e.message}`, + target: NoTarget, + }, + ], + }; + } + throw e; + } +} + +interface EmitterOptionVariant { + type: string; + allowedValues?: string[]; + default?: string; + description?: string; + nestedOptions?: EmitterOptionInfo[]; +} + +interface EmitterOptionInfo { + name: string; + type: string; + allowedValues?: string[]; + default?: string; + description?: string; + nestedOptions?: EmitterOptionInfo[]; + /** When present, this option is a union of multiple variants */ + variants?: EmitterOptionVariant[]; +} + +/** + * Extract option information from a JSON Schema properties object. + * This is a pure function that can be tested independently. + */ +export function extractEmitterOptionsInfo(schema: any): EmitterOptionInfo[] { + if (!schema || !schema.properties) { + return []; + } + + const options: EmitterOptionInfo[] = []; + + for (const [name, prop] of Object.entries(schema.properties)) { + options.push(extractOptionInfo(name, prop)); + } + + return options; +} + +function extractOptionInfo(name: string, prop: any): EmitterOptionInfo { + // Handle oneOf: extract variants, rendering object variants as nested + if (prop.oneOf) { + return extractOneOfOption(name, prop); + } + + const info: EmitterOptionInfo = { + name, + type: resolveType(prop), + }; + + if (prop.enum) { + info.allowedValues = prop.enum; + } else if (prop.type === "array" && prop.items?.enum) { + info.allowedValues = prop.items.enum; + } + + if (prop.default !== undefined) { + info.default = JSON.stringify(prop.default); + } + + if (prop.description) { + info.description = Array.isArray(prop.description) + ? prop.description.join("\n") + : prop.description; + } + + // Nested object properties + if (prop.type === "object" && prop.properties) { + info.nestedOptions = []; + for (const [subName, subProp] of Object.entries(prop.properties)) { + info.nestedOptions.push(extractOptionInfo(subName, subProp)); + } + } + + return info; +} + +function extractOneOfOption(name: string, prop: any): EmitterOptionInfo { + const rawVariants: any[] = prop.oneOf; + + const info: EmitterOptionInfo = { + name, + type: "", + variants: [], + }; + + if (prop.description) { + info.description = Array.isArray(prop.description) + ? prop.description.join("\n") + : prop.description; + } + + if (prop.default !== undefined) { + info.default = JSON.stringify(prop.default); + } + + for (const variant of rawVariants) { + const v: EmitterOptionVariant = { + type: variant.type ?? "unknown", + }; + + if (variant.enum) { + v.allowedValues = variant.enum; + } + + if (variant.default !== undefined) { + v.default = JSON.stringify(variant.default); + } + + if (variant.description) { + v.description = Array.isArray(variant.description) + ? variant.description.join("\n") + : variant.description; + } + + if (variant.type === "object" && variant.properties) { + v.nestedOptions = []; + for (const [subName, subProp] of Object.entries(variant.properties)) { + v.nestedOptions.push(extractOptionInfo(subName, subProp)); + } + } + + info.variants!.push(v); + } + + return info; +} + +function resolveType(prop: any): string { + if (prop.oneOf) { + return prop.oneOf.map((s: any) => resolveType(s)).join(" | "); + } + + if (prop.type === "array") { + if (prop.items) { + const itemType = prop.items.type ?? "unknown"; + return `${itemType}[]`; + } + return "array"; + } + + if (prop.type === "object" && prop.properties) { + const keys = Object.keys(prop.properties); + return `object { ${keys.join(", ")} }`; + } + + return prop.type ?? "unknown"; +} + +/** + * Format library metadata (name, version, description, homepage) as colorized key-value lines + * under a section title. + */ +export function formatLibraryInfo(manifest: PackageJson | undefined): string[] { + const lines: string[] = []; + + lines.push(pc.bold("Library")); + lines.push(""); + + const name = manifest?.name ?? "unknown"; + lines.push(` ${pc.gray("Name:")} ${pc.cyan(name)}`); + + if (manifest?.version) { + lines.push(` ${pc.gray("Version:")} ${pc.yellow(manifest.version)}`); + } + + if (manifest?.description) { + lines.push(` ${pc.gray("Description:")} ${manifest.description}`); + } + + if (manifest?.homepage) { + lines.push(` ${pc.gray("Homepage:")} ${pc.underline(pc.blue(manifest.homepage))}`); + } + + return lines; +} + +/** + * Format emitter options as a colorized string for terminal display. + * Returns lines of formatted output. + */ +export function formatEmitterOptions(schema: any): string[] { + const lines: string[] = []; + + lines.push(pc.bold("Emitter Options")); + lines.push(""); + + const options = extractEmitterOptionsInfo(schema); + + if (options.length === 0) { + lines.push(pc.gray(" This emitter does not define any options.")); + return lines; + } + + for (const opt of options) { + formatOption(lines, opt, 1); + } + + return lines; +} + +function formatOption(lines: string[], opt: EmitterOptionInfo, depth: number): void { + const indent = " ".repeat(depth); + const descIndent = " ".repeat(depth + 1); + + // Union with variants: render each variant separately + if (opt.variants && opt.variants.length > 0) { + lines.push(`${indent}${pc.bold(pc.cyan(opt.name))}:`); + + if (opt.description) { + for (const descLine of opt.description.split("\n")) { + lines.push(`${descIndent}${renderMarkdownLine(descLine)}`); + } + } + + for (const variant of opt.variants) { + formatVariant(lines, variant, depth + 1); + } + + lines.push(""); + return; + } + + // Simple option: name: type/enum (default: value) + const parts: string[] = [`${pc.bold(pc.cyan(opt.name))}:`]; + + if (opt.allowedValues) { + const valuesStr = opt.allowedValues.map((v: string) => pc.green(`"${v}"`)).join(" | "); + if (opt.type.endsWith("[]")) { + parts.push(`(${valuesStr})${pc.yellow("[]")}`); + } else { + parts.push(valuesStr); + } + } else if (opt.type) { + parts.push(pc.yellow(opt.type)); + } + + if (opt.default !== undefined) { + parts.push(pc.gray(`(default: ${colorizeDefault(opt.default, opt.type)})`)); + } + + lines.push(`${indent}${parts.join(" ")}`); + + if (opt.description) { + for (const descLine of opt.description.split("\n")) { + lines.push(`${descIndent}${renderMarkdownLine(descLine)}`); + } + } + + if (opt.nestedOptions && opt.nestedOptions.length > 0) { + for (const sub of opt.nestedOptions) { + formatOption(lines, sub, depth + 1); + } + } + + lines.push(""); +} + +function formatVariant(lines: string[], variant: EmitterOptionVariant, depth: number): void { + const indent = " ".repeat(depth); + + // Build variant header line + const parts: string[] = [`${pc.gray("-")}`]; + if (variant.allowedValues) { + const valuesStr = variant.allowedValues.map((v: string) => pc.green(`"${v}"`)).join(" | "); + if (variant.type.endsWith("[]")) { + parts.push(`(${valuesStr})${pc.yellow("[]")}`); + } else { + parts.push(valuesStr); + } + } else { + parts.push(pc.yellow(variant.type)); + } + + if (variant.default !== undefined) { + parts.push(pc.gray(`(default: ${colorizeDefault(variant.default, variant.type)})`)); + } + + lines.push(`${indent}${parts.join(" ")}`); + + if (variant.description) { + for (const descLine of variant.description.split("\n")) { + lines.push(`${indent} ${renderMarkdownLine(descLine)}`); + } + } + + if (variant.nestedOptions && variant.nestedOptions.length > 0) { + for (const sub of variant.nestedOptions) { + formatOption(lines, sub, depth + 1); + } + } +} + +function colorizeDefault(value: string, type: string): string { + if (type.includes("string")) { + return pc.green(value); + } + if (type.includes("boolean") || type.includes("number") || type.includes("int")) { + return pc.yellow(value); + } + return pc.yellow(value); +} + +/** + * Render basic markdown inline formatting for terminal display. + * Handles: `code`, **bold**, *italic*, and [links](url). + * Plain text is rendered in gray, formatted tokens get their own colors. + */ +function renderMarkdownLine(line: string): string { + // Tokenize: split into plain text and markdown tokens + // Process in order: links, code, bold, italic + const segments: { text: string; formatted: boolean }[] = []; + const remaining = line; + + // Regex that matches any markdown token we handle + const mdRegex = /`([^`]+)`|\*\*([^*]+)\*\*|\[([^\]]+)\]\(([^)]+)\)/g; + + let lastIndex = 0; + let match; + while ((match = mdRegex.exec(remaining)) !== null) { + // Add plain text before this match + if (match.index > lastIndex) { + segments.push({ text: remaining.slice(lastIndex, match.index), formatted: false }); + } + + if (match[1] !== undefined) { + // Inline code: `code` + segments.push({ text: pc.bold(pc.white(match[1])), formatted: true }); + } else if (match[2] !== undefined) { + // Bold: **text** + segments.push({ text: pc.bold(match[2]), formatted: true }); + } else if (match[3] !== undefined && match[4] !== undefined) { + // Link: [text](url) + segments.push({ + text: `${match[3]} ${pc.underline(pc.blue(match[4]))}`, + formatted: true, + }); + } + + lastIndex = match.index + match[0].length; + } + + // Add trailing plain text + if (lastIndex < remaining.length) { + segments.push({ text: remaining.slice(lastIndex), formatted: false }); + } + + // If no markdown was found, just return gray + if (segments.length === 0) { + return pc.gray(line); + } + + return segments.map((s) => (s.formatted ? s.text : pc.gray(s.text))).join(""); +} + +/** + * Resolve a library and print its info and emitter options. + */ +export async function printEmitterOptionsAction( + host: CompilerHost, + emitterName: string, +): Promise { + const cwd = process.cwd(); + const { library, manifest, diagnostics } = await resolveEmitterLibrary(host, emitterName, cwd); + + if (diagnostics.length > 0) { + return diagnostics; + } + + // Library info header + const infoLines = formatLibraryInfo(manifest); + for (const line of infoLines) { + console.log(line); + } + console.log(""); + + // Emitter options + if (!library) { + console.log(pc.yellow(`Could not load library definition for "${emitterName}".`)); + return []; + } + + const schema = library.emitter?.options; + const optionLines = formatEmitterOptions(schema); + for (const line of optionLines) { + console.log(line); + } + + return []; +} diff --git a/packages/compiler/src/core/cli/cli.ts b/packages/compiler/src/core/cli/cli.ts index 80c85892d2d..0bdd6030cc9 100644 --- a/packages/compiler/src/core/cli/cli.ts +++ b/packages/compiler/src/core/cli/cli.ts @@ -9,10 +9,12 @@ try { import yargs from "yargs"; import { installTypeSpecDependencies } from "../../install/install.js"; import { typespecVersion } from "../../manifest.js"; +import { logDiagnostics } from "../diagnostics.js"; import { getTypeSpecEngine } from "../engine.js"; import { compileAction } from "./actions/compile/compile.js"; import { formatAction } from "./actions/format.js"; import { printInfoAction } from "./actions/info.js"; +import { printEmitterOptionsAction } from "./actions/info/emitter-options.js"; import { initAction } from "./actions/init.js"; import { installVSExtension, uninstallVSExtension } from "./actions/vs.js"; import { @@ -23,13 +25,51 @@ import { } from "./actions/vscode.js"; import { CliHostArgs, + createCLICompilerHost, handleInternalCompilerError, + logDiagnosticCount, withCliHost, withCliHostAndDiagnostics, } from "./utils.js"; +/** + * Intercept `tsp compile --emit --help` to display emitter options. + * Returns true if the interception was handled. + */ +async function handleCompileEmitHelp(argv: string[]): Promise { + if (argv[0] !== "compile" || !argv.includes("--help")) { + return false; + } + const emitIdx = argv.indexOf("--emit"); + if (emitIdx === -1 || emitIdx + 1 >= argv.length) { + return false; + } + const emitterName = argv[emitIdx + 1]; + if (!emitterName || emitterName.startsWith("-")) { + return false; + } + + const host = createCLICompilerHost({ pretty: true }); + const diagnostics = await printEmitterOptionsAction(host, emitterName); + if (diagnostics.length > 0) { + logDiagnostics(diagnostics, host.logSink); + logDiagnosticCount(diagnostics); + } + if (diagnostics.some((d) => d.severity === "error")) { + process.exit(1); + } + return true; +} + async function main() { - await yargs(process.argv.slice(2)) + const argv = process.argv.slice(2); + + // Handle `tsp compile --emit --help` early before yargs intercepts --help + if (await handleCompileEmitHelp(argv)) { + return; + } + + await yargs(argv) .scriptName("tsp") .help() .strict() @@ -99,7 +139,8 @@ async function main() { .option("emit", { type: "array", string: true, - describe: "Name of the emitters", + describe: + "Name of the emitters. Use `tsp info ` to see available emitter options.", }) .option("list-files", { type: "boolean", @@ -270,10 +311,15 @@ async function main() { ), ) .command( - "info", - "Show information about the current TypeSpec compiler.", - () => {}, - withCliHostAndDiagnostics((host) => printInfoAction(host)), + "info [emitter]", + "Show information about the current TypeSpec compiler, or about a specific emitter.", + (cmd) => { + return cmd.positional("emitter", { + description: "The emitter package name to show options for.", + type: "string", + }); + }, + withCliHostAndDiagnostics((host, args) => printInfoAction(host, { emitter: args.emitter })), ) .version(getTypeSpecEngine() === "tsp" ? `${typespecVersion} standalone` : typespecVersion) .demandCommand(1, "You must use one of the supported commands.").argv; diff --git a/packages/compiler/src/core/emitter-utils.ts b/packages/compiler/src/core/emitter-utils.ts index 41e26d3a774..3f9fbfd5882 100644 --- a/packages/compiler/src/core/emitter-utils.ts +++ b/packages/compiler/src/core/emitter-utils.ts @@ -8,10 +8,19 @@ export interface EmitFileOptions { newLine?: NewLine; } -const emittedFilesPaths: string[] = []; -export function flushEmittedFilesPaths(): string[] { - return emittedFilesPaths.splice(0, emittedFilesPaths.length); +const emittedFilesPerProgramKey = Symbol.for("TYPESPEC_EMITTED_FILES_PATHS"); +if ((globalThis as any)[emittedFilesPerProgramKey] === undefined) { + (globalThis as any)[emittedFilesPerProgramKey] = new WeakMap(); } + +export function getEmittedFilesForProgram(program: Program): string[] { + const existing = (globalThis as any)[emittedFilesPerProgramKey].get(program); + if (existing) return existing; + const val: string[] = []; + (globalThis as any)[emittedFilesPerProgramKey].set(program, val); + return val; +} + /** * Helper to emit a file. * @param program TypeSpec Program @@ -25,8 +34,7 @@ export async function emitFile(program: Program, options: EmitFileOptions): Prom options.newLine && options.newLine === "crlf" ? options.content.replace(/(\r\n|\n|\r)/gm, "\r\n") : options.content; - - emittedFilesPaths.push(options.path); + getEmittedFilesForProgram(program).push(options.path); return await program.host.writeFile(options.path, content); } diff --git a/packages/compiler/src/core/helpers/discriminator-utils.ts b/packages/compiler/src/core/helpers/discriminator-utils.ts index 03581d0c8e8..4a267b0b1e1 100644 --- a/packages/compiler/src/core/helpers/discriminator-utils.ts +++ b/packages/compiler/src/core/helpers/discriminator-utils.ts @@ -65,6 +65,7 @@ function getDiscriminatedUnionForUnion( createDiagnostic({ code: "invalid-discriminated-union-variant", messageId: "duplicateDefaultVariant", + format: { unionName: type.name ?? "(anonymous)" }, target: variant, }), ); diff --git a/packages/compiler/src/core/helpers/string-template-utils.ts b/packages/compiler/src/core/helpers/string-template-utils.ts index 3fd9cb660c6..349f74ad746 100644 --- a/packages/compiler/src/core/helpers/string-template-utils.ts +++ b/packages/compiler/src/core/helpers/string-template-utils.ts @@ -1,5 +1,6 @@ import { createDiagnosticCollector } from "../diagnostics.js"; import { createDiagnostic } from "../messages.js"; +import { isErrorType } from "../type-utils.js"; import type { Diagnostic, StringTemplate } from "../types.js"; export function isStringTemplateSerializable( @@ -35,12 +36,14 @@ export function explainStringTemplateNotSerializable( } // eslint-disable-next-line no-fallthrough default: - diagnostics.add( - createDiagnostic({ - code: "non-literal-string-template", - target: span, - }), - ); + if (!isErrorType(span.type)) { + diagnostics.add( + createDiagnostic({ + code: "non-literal-string-template", + target: span, + }), + ); + } } } } diff --git a/packages/compiler/src/core/helpers/syntax-utils.ts b/packages/compiler/src/core/helpers/syntax-utils.ts index 6b7346b2fe3..3421cac5e8e 100644 --- a/packages/compiler/src/core/helpers/syntax-utils.ts +++ b/packages/compiler/src/core/helpers/syntax-utils.ts @@ -1,5 +1,5 @@ import { CharCode, isIdentifierContinue, isIdentifierStart, utf16CodeUnits } from "../charcode.js"; -import { Keywords, ReservedKeywords } from "../scanner.js"; +import { isModifier, Keywords, ReservedKeywords } from "../scanner.js"; import { IdentifierNode, MemberExpressionNode, SyntaxKind, TypeReferenceNode } from "../types.js"; /** @@ -34,8 +34,16 @@ function needBacktick(sv: string, context: "allow-reserved" | "disallow-reserved if (sv.length === 0) { return false; } - if (context === "allow-reserved" && ReservedKeywords.has(sv)) { - return false; + if (context === "allow-reserved") { + if (ReservedKeywords.has(sv)) { + return false; + } + // Modifier keywords (e.g. "internal", "extern") are contextual and can be + // used as identifiers without escaping in non-modifier positions. + const kwToken = Keywords.get(sv); + if (kwToken !== undefined && isModifier(kwToken)) { + return false; + } } if (Keywords.has(sv)) { return true; diff --git a/packages/compiler/src/core/helpers/type-name-utils.ts b/packages/compiler/src/core/helpers/type-name-utils.ts index f1390fb1a9d..6b71b1e7bf0 100644 --- a/packages/compiler/src/core/helpers/type-name-utils.ts +++ b/packages/compiler/src/core/helpers/type-name-utils.ts @@ -3,6 +3,7 @@ import { isTemplateInstance, isType, isValue } from "../type-utils.js"; import type { Entity, Enum, + FunctionType, Interface, Model, ModelProperty, @@ -60,11 +61,22 @@ export function getTypeName(type: Type, options?: TypeNameOptions): string { return type.value.toString(); case "Intrinsic": return type.name; + case "FunctionType": + return getFunctionSignature(type); default: return `(unnamed type)`; } } +function getFunctionSignature(type: FunctionType) { + const parameters = [...type.parameters].map((x) => { + const rest = x.rest ? "..." : ""; + const optional = x.optional ? "?" : ""; + return `${rest}${x.name}${optional}: ${getEntityName(x.type)}`; + }); + return `fn (${parameters.join(", ")}) => ${getEntityName(type.returnType)}`; +} + function getValuePreview(value: Value, options?: TypeNameOptions): string { switch (value.valueKind) { case "ObjectValue": @@ -83,6 +95,9 @@ function getValuePreview(value: Value, options?: TypeNameOptions): string { return "null"; case "ScalarValue": return `${getTypeName(value.type, options)}.${value.value.name}(${value.value.args.map((x) => getValuePreview(x, options)).join(", ")}})`; + case "Function": { + return `fn ${value.name ?? ""}`; + } } } diff --git a/packages/compiler/src/core/js-marshaller.ts b/packages/compiler/src/core/js-marshaller.ts index b6548b8630d..e1904c6bc45 100644 --- a/packages/compiler/src/core/js-marshaller.ts +++ b/packages/compiler/src/core/js-marshaller.ts @@ -1,17 +1,21 @@ +import { $ } from "../typekit/index.js"; import { compilerAssert } from "./diagnostics.js"; import { numericRanges } from "./numeric-ranges.js"; import { Numeric } from "./numeric.js"; +import { Program } from "./program.js"; import type { ArrayValue, MarshalledValue, NumericValue, ObjectValue, + ObjectValuePropertyDescriptor, Scalar, + TemplateValue, Type, Value, } from "./types.js"; -export function marshallTypeForJS( +export function marshalTypeForJs( value: T, valueConstraint: Type | undefined, ): MarshalledValue { @@ -25,12 +29,18 @@ export function marshallTypeForJS( return objectValueToJs(value) as any; case "ArrayValue": return arrayValueToJs(value) as any; - case "EnumValue": - return value as any; case "NullValue": + case "TemplateValue": return null as any; case "ScalarValue": + case "EnumValue": + case "Function": return value as any; + default: + compilerAssert( + false, + `Cannot marshal value of kind '${(value satisfies never as Value).valueKind}' to JS.`, + ); } } @@ -68,20 +78,115 @@ function numericValueToJs(type: NumericValue, valueConstraint: Type | undefined) const asNumber = type.value.asNumber(); compilerAssert( asNumber !== null, - `Numeric value '${type.value.toString()}' is not a able to convert to a number without loosing precision.`, + `Numeric value '${type.value.toString()}' is not a able to convert to a number without losing precision.`, ); return asNumber; } return type.value; } -function objectValueToJs(type: ObjectValue) { +function objectValueToJs(type: ObjectValue): Record { const result: Record = {}; for (const [key, value] of type.properties) { - result[key] = marshallTypeForJS(value.value, undefined); + result[key] = marshalTypeForJs(value.value, undefined); } return result; } function arrayValueToJs(type: ArrayValue) { - return type.values.map((x) => marshallTypeForJS(x, undefined)); + return type.values.map((x) => marshalTypeForJs(x, undefined)); +} + +export function unmarshalJsToValue( + program: Program, + value: unknown, + onInvalid: (value: unknown) => void, +): Value | null { + if ( + typeof value === "object" && + value !== null && + "entityKind" in value && + value.entityKind === "Value" + ) { + return value as Value; + } + + if (value === null || value === undefined) { + return { + entityKind: "Value", + valueKind: "NullValue", + value: null, + type: program.checker.nullType, + }; + } else if (typeof value === "boolean") { + const boolean = program.checker.getStdType("boolean"); + return { + entityKind: "Value", + valueKind: "BooleanValue", + value, + type: boolean, + scalar: boolean, + }; + } else if (typeof value === "string") { + const string = program.checker.getStdType("string"); + return { + entityKind: "Value", + valueKind: "StringValue", + value, + type: string, + scalar: string, + }; + } else if (typeof value === "number") { + const numeric = Numeric(String(value)); + const numericType = program.checker.getStdType("numeric"); + return { + entityKind: "Value", + valueKind: "NumericValue", + value: numeric, + type: $(program).literal.create(value), + scalar: numericType, + }; + } else if (Array.isArray(value)) { + const values: Value[] = []; + const uniqueTypes = new Set(); + + for (const item of value) { + const itemValue = unmarshalJsToValue(program, item, onInvalid); + + if (itemValue) { + values.push(itemValue); + uniqueTypes.add(itemValue.type); + } + } + + return { + entityKind: "Value", + valueKind: "ArrayValue", + type: $(program).array.create($(program).union.create([...uniqueTypes])), + values, + }; + } else if (typeof value === "object" && !("entityKind" in value)) { + const properties: Map = new Map(); + for (const [key, val] of Object.entries(value)) { + const propertyValue = unmarshalJsToValue(program, val, onInvalid); + if (propertyValue) { + properties.set(key, { name: key, value: propertyValue }); + } + } + return { + entityKind: "Value", + valueKind: "ObjectValue", + properties, + type: $(program).model.create({ + properties: Object.fromEntries( + [...properties.entries()].map( + ([k, v]) => + [k, $(program).modelProperty.create({ name: k, type: v.value.type })] as const, + ), + ), + }), + }; + } else { + onInvalid(value); + return null; + } } diff --git a/packages/compiler/src/core/linter.ts b/packages/compiler/src/core/linter.ts index 3d6c9741db4..586f00efd08 100644 --- a/packages/compiler/src/core/linter.ts +++ b/packages/compiler/src/core/linter.ts @@ -5,9 +5,9 @@ import { defineLinter } from "./library.js"; import { createUnusedTemplateParameterLinterRule } from "./linter-rules/unused-template-parameter.rule.js"; import { createUnusedUsingLinterRule } from "./linter-rules/unused-using.rule.js"; import { createDiagnostic } from "./messages.js"; +import { perf } from "./perf.js"; import type { Program } from "./program.js"; import { EventEmitter, mapEventEmitterToNodeListener, navigateProgram } from "./semantic-walker.js"; -import { startTimer } from "./stats.js"; import { Diagnostic, DiagnosticMessages, @@ -197,17 +197,17 @@ export function createLinter( [...filteredRules.keys()].map((x) => ` - ${x}`).join("\n"), ); - const timer = startTimer(); + const timer = perf.startTimer(); const exitCallbacks = []; const EXIT_EVENT_NAME = "exit"; const allPromises: Promise[] = []; for (const rule of filteredRules.values()) { - const createTiming = startTimer(); + const createTiming = perf.startTimer(); const listener = rule.create(createLinterRuleContext(program, rule, diagnostics)); stats.runtime.rules[rule.id] = createTiming.end(); for (const [name, cb] of Object.entries(listener)) { const timedCb = (...args: any[]) => { - const timer = startTimer(); + const timer = perf.startTimer(); const result = (cb as any)(...args); if (name === EXIT_EVENT_NAME && isPromise(result)) { compilerAssert( diff --git a/packages/compiler/src/core/messages.ts b/packages/compiler/src/core/messages.ts index 5c42d275d59..8d8d83c277e 100644 --- a/packages/compiler/src/core/messages.ts +++ b/packages/compiler/src/core/messages.ts @@ -249,6 +249,15 @@ const diagnostics = { /** * Checker */ + "experimental-feature": { + severity: "warning", + messages: { + default: paramMessage`${"feature"} is an experimental feature. It may change in the future or be removed. Use with caution and consider providing feedback on this feature.`, + functionDeclarations: + "Function declarations are an experimental feature that may change in the future. Use with caution and consider providing feedback to the TypeSpec team.", + internal: `Internal symbols are experimental and may be changed in a future release. Use with caution. Suppress this message ('#suppress "experimental-feature"') to silence this warning.`, + }, + }, "using-invalid-ref": { severity: "error", messages: { @@ -325,12 +334,14 @@ const diagnostics = { member: paramMessage`${"kind"} doesn't have member ${"id"}`, metaProperty: paramMessage`${"kind"} doesn't have meta property ${"id"}`, node: paramMessage`Cannot resolve '${"id"}' in node ${"nodeName"} since it has no members. Did you mean to use "::" instead of "."?`, + internal: paramMessage`Symbol '${"id"}' is internal and can only be accessed from within its declaring package.`, }, }, "duplicate-property": { severity: "error", messages: { default: paramMessage`Model already has a property named ${"propName"}`, + withModel: paramMessage`Model ${"modelName"} already has a property named ${"propName"}`, }, }, "override-property-mismatch": { @@ -395,12 +406,14 @@ const diagnostics = { modelExpression: `Is a model expression type, but is being used as a value here. Use #{} to create an object value.`, tuple: `Is a tuple type, but is being used as a value here. Use #[] to create an array value.`, templateConstraint: paramMessage`${"name"} template parameter can be a type but is being used as a value here.`, + functionReturn: paramMessage`Function returned a type, but a value was expected.`, }, }, "non-callable": { severity: "error", messages: { default: paramMessage`Type ${"type"} is not is not callable.`, + templateParameter: paramMessage`Template parameter '${"name"} extends ${"constraint"}' is not callable. Ensure it is constrained to a function value or callable type (scalar or scalar constructor).`, }, }, "named-init-required": { @@ -440,6 +453,14 @@ const diagnostics = { default: paramMessage`Property '${"propName"}' is required in type '${"targetType"}' but here is optional.`, }, }, + "parameter-required": { + severity: "error", + messages: { + default: paramMessage`Parameter '${"paramName"}' is required, but optional in the target function.`, + missing: paramMessage`Parameter '${"paramName"}' is required, but missing in the target function.`, + "rest-to-required": paramMessage`Parameter '${"paramName"}' is required and not satisfied by a rest parameter, as rest parameters are effectively optional.`, + }, + }, "value-in-type": { severity: "error", messages: { @@ -527,22 +548,26 @@ const diagnostics = { default: "A rest parameter must be of an array type.", }, }, - "decorator-extern": { + "invalid-modifier": { severity: "error", messages: { - default: "A decorator declaration must be prefixed with the 'extern' modifier.", + default: paramMessage`Modifier '${"modifier"}' is invalid.`, + "missing-required": paramMessage`Declaration of type '${"nodeKind"}' is missing required modifier '${"modifier"}'.`, + "not-allowed": paramMessage`Modifier '${"modifier"}' cannot be used on declarations of type '${"nodeKind"}'.`, }, }, - "function-extern": { + "function-return": { severity: "error", messages: { - default: "A function declaration must be prefixed with the 'extern' modifier.", + default: "Function implementation returned an invalid result.", + "invalid-value": paramMessage`Function implementation returned invalid JS value '${"value"}'.`, + unassignable: paramMessage`Implementation of '${"name"}' returned ${"entityKind"} '${"return"}', which is not assignable to the declared return type '${"type"}'.`, }, }, - "function-unsupported": { + "fn-in-union-expression": { severity: "error", messages: { - default: "Function are currently not supported.", + default: "Function types in anonymous union expressions must be parenthesized.", }, }, "missing-implementation": { @@ -839,7 +864,7 @@ const diagnostics = { default: paramMessage`Union variant "${"name"}" must be a model type.`, noEnvelopeModel: paramMessage`Union variant "${"name"}" must be a model type when the union has envelope: none.`, discriminantMismatch: paramMessage`Variant "${"name"}" explicitly defines the discriminator property "${"discriminant"}" but the value "${"propertyValue"}" do not match the variant name "${"variantName"}".`, - duplicateDefaultVariant: `Discriminated union only allow a single default variant(Without a variant name).`, + duplicateDefaultVariant: paramMessage`Discriminated union ${"unionName"} only allow a single default variant(Without a variant name).`, noDiscriminant: paramMessage`Variant "${"name"}" type is missing the discriminant property "${"discriminant"}".`, wrongDiscriminantType: paramMessage`Variant "${"name"}" type's discriminant property "${"discriminant"}" must be a string literal or string enum member.`, }, diff --git a/packages/compiler/src/core/modifiers.ts b/packages/compiler/src/core/modifiers.ts new file mode 100644 index 00000000000..6e4b49f4941 --- /dev/null +++ b/packages/compiler/src/core/modifiers.ts @@ -0,0 +1,205 @@ +// Copyright (c) Microsoft Corporation +// Licensed under the MIT License. + +import { compilerAssert } from "./diagnostics.js"; +import { createDiagnostic } from "./messages.js"; +import { Program } from "./program.js"; +import { Declaration, Modifier, ModifierFlags, SyntaxKind } from "./types.js"; + +/** + * The compatibility of modifiers for a given declaration node type. + */ +interface ModifierCompatibility { + /** A set of modifier flags that are allowed on the node type. */ + readonly allowed: ModifierFlags; + /** A set of modifier flags that are _required_ on the node type. */ + readonly required: ModifierFlags; +} + +/** + * The default compatibility for all declaration syntax nodes. + * + * By default, only the `internal` modifier is allowed on all declaration syntax nodes. + * No modifiers are required by default. + */ +const DEFAULT_COMPATIBILITY: ModifierCompatibility = { + allowed: ModifierFlags.Internal, + required: ModifierFlags.None, +}; + +const NO_MODIFIERS: ModifierCompatibility = { + allowed: ModifierFlags.None, + required: ModifierFlags.None, +}; + +const SYNTAX_MODIFIERS: Readonly> = { + [SyntaxKind.NamespaceStatement]: NO_MODIFIERS, + [SyntaxKind.OperationStatement]: DEFAULT_COMPATIBILITY, + [SyntaxKind.ModelStatement]: DEFAULT_COMPATIBILITY, + [SyntaxKind.ScalarStatement]: DEFAULT_COMPATIBILITY, + [SyntaxKind.InterfaceStatement]: DEFAULT_COMPATIBILITY, + [SyntaxKind.UnionStatement]: DEFAULT_COMPATIBILITY, + [SyntaxKind.EnumStatement]: DEFAULT_COMPATIBILITY, + [SyntaxKind.AliasStatement]: DEFAULT_COMPATIBILITY, + [SyntaxKind.ConstStatement]: DEFAULT_COMPATIBILITY, + [SyntaxKind.DecoratorDeclarationStatement]: { + allowed: ModifierFlags.All, + required: ModifierFlags.Extern, + }, + [SyntaxKind.FunctionDeclarationStatement]: { + allowed: ModifierFlags.All, + required: ModifierFlags.Extern, + }, +}; + +/** + * Checks the modifiers on a declaration node against the allowed and required modifiers. + * + * This will report diagnostics in the given program if there are any invalid or missing required modifiers. + * + * @param program - The current program (used to report diagnostics). + * @param node - The declaration node to check. + * @returns `true` if the modifiers are valid, `false` otherwise. + */ +export function checkModifiers(program: Program, node: Declaration): boolean { + const compatibility = SYNTAX_MODIFIERS[node.kind]; + + let isValid = true; + + // Emit experimental warning for any use of the 'internal' modifier. + if (node.modifierFlags & ModifierFlags.Internal) { + const internalModifiers = filterModifiersByFlags(node.modifiers, ModifierFlags.Internal); + for (const modifier of internalModifiers) { + program.reportDiagnostic( + createDiagnostic({ + code: "experimental-feature", + messageId: "internal", + target: modifier, + }), + ); + } + } + + const invalidModifiers = node.modifierFlags & ~compatibility.allowed; + + if (invalidModifiers) { + // There is at least one modifier used that is not allowed on this syntax node. + isValid = false; + + const invalidModifierList = filterModifiersByFlags(node.modifiers, invalidModifiers); + + for (const modifier of invalidModifierList) { + const modifierText = getTextForModifier(modifier); + program.reportDiagnostic( + createDiagnostic({ + code: "invalid-modifier", + messageId: "not-allowed", + format: { modifier: modifierText, nodeKind: getDeclarationKindText(node.kind) }, + target: modifier, + }), + ); + } + } + + const missingRequiredModifiers = compatibility.required & ~node.modifierFlags; + + if (missingRequiredModifiers) { + // There is at least one required modifier missing from this syntax node. + isValid = false; + + for (const missing of getNamesOfModifierFlags(missingRequiredModifiers)) { + program.reportDiagnostic( + createDiagnostic({ + code: "invalid-modifier", + messageId: "missing-required", + format: { modifier: missing, nodeKind: getDeclarationKindText(node.kind) }, + target: node, + }), + ); + } + } + + return isValid; +} + +function filterModifiersByFlags(modifiers: Modifier[], flags: ModifierFlags): Modifier[] { + const result = []; + + for (const modifier of modifiers) { + if (modifierToFlag(modifier) & flags) { + result.push(modifier); + } + } + + return result; +} + +export function modifiersToFlags(modifiers: Modifier[]): ModifierFlags { + let flags = ModifierFlags.None; + for (const modifier of modifiers) { + flags |= modifierToFlag(modifier); + } + return flags; +} + +function modifierToFlag(modifier: Modifier): ModifierFlags { + switch (modifier.kind) { + case SyntaxKind.ExternKeyword: + return ModifierFlags.Extern; + case SyntaxKind.InternalKeyword: + return ModifierFlags.Internal; + default: + compilerAssert(false, `Unknown modifier kind: ${(modifier as Modifier).kind}`); + } +} + +function getTextForModifier(modifier: Modifier): string { + switch (modifier.kind) { + case SyntaxKind.ExternKeyword: + return "extern"; + case SyntaxKind.InternalKeyword: + return "internal"; + default: + compilerAssert(false, `Unknown modifier kind: ${(modifier as Modifier).kind}`); + } +} + +function getNamesOfModifierFlags(flags: ModifierFlags): string[] { + const names: string[] = []; + if (flags & ModifierFlags.Extern) { + names.push("extern"); + } + if (flags & ModifierFlags.Internal) { + names.push("internal"); + } + return names; +} + +function getDeclarationKindText(nodeKind: Declaration["kind"]): string { + switch (nodeKind) { + case SyntaxKind.NamespaceStatement: + return "namespace"; + case SyntaxKind.OperationStatement: + return "op"; + case SyntaxKind.ModelStatement: + return "model"; + case SyntaxKind.ScalarStatement: + return "scalar"; + case SyntaxKind.InterfaceStatement: + return "interface"; + case SyntaxKind.UnionStatement: + return "union"; + case SyntaxKind.EnumStatement: + return "enum"; + case SyntaxKind.AliasStatement: + return "alias"; + case SyntaxKind.DecoratorDeclarationStatement: + return "dec"; + case SyntaxKind.FunctionDeclarationStatement: + return "function"; + case SyntaxKind.ConstStatement: + return "const"; + default: + compilerAssert(false, `Unknown declaration kind: ${nodeKind}`); + } +} diff --git a/packages/compiler/src/core/module-host.ts b/packages/compiler/src/core/module-host.ts new file mode 100644 index 00000000000..81abc48f142 --- /dev/null +++ b/packages/compiler/src/core/module-host.ts @@ -0,0 +1,14 @@ +import type { ResolveModuleHost } from "../module-resolver/index.js"; +import type { SystemHost } from "./types.js"; + +/** Create a {@link ResolveModuleHost} from a {@link SystemHost}. */ +export function createResolveModuleHost(host: SystemHost): ResolveModuleHost { + return { + realpath: host.realpath, + stat: host.stat, + readFile: async (path) => { + const file = await host.readFile(path); + return file.text; + }, + }; +} diff --git a/packages/compiler/src/core/name-resolver.ts b/packages/compiler/src/core/name-resolver.ts index 4af6b59be47..186de98e8c1 100644 --- a/packages/compiler/src/core/name-resolver.ts +++ b/packages/compiler/src/core/name-resolver.ts @@ -75,6 +75,7 @@ import { ModelExpressionNode, ModelPropertyNode, ModelStatementNode, + ModifierFlags, NamespaceStatementNode, Node, NodeFlags, @@ -167,6 +168,7 @@ export function createResolver(program: Program): NameResolver { const augmentedSymbolTables = new Map(); const nodeLinks = new Map(); const symbolLinks = new Map(); + const visitedNode = new Set(); const globalNamespaceNode = createGlobalNamespaceNode(); const globalNamespaceSym = createSymbol( @@ -321,7 +323,6 @@ export function createResolver(program: Program): NameResolver { } let result = resolveTypeReferenceWorker(node, options); - const resolvedSym = result.resolvedSymbol; Object.assign(links, result); @@ -610,6 +611,14 @@ export function createResolver(program: Program): NameResolver { resolutionResult: slinks.aliasResolutionResult, isTemplateInstantiation: result.isTemplateInstantiation, }; + } else if (node.value.kind === SyntaxKind.CallExpression) { + // The alias resolves to a function call expression. We want to resolve the constrained return type of the call. + const resolutionResult = resolveReturnType(node.value.target); + + slinks.aliasedSymbol = resolutionResult.finalSymbol; + slinks.aliasResolutionResult = resolutionResult.resolutionResult; + slinks.aliasResolutionIsTemplate = resolutionResult.isTemplateInstantiation; + return resolutionResult; } else if (node.value.symbol) { // a type literal slinks.aliasedSymbol = node.value.symbol; @@ -622,6 +631,38 @@ export function createResolver(program: Program): NameResolver { } } + function resolveReturnType(node: MemberExpressionNode | IdentifierNode): ResolutionResult { + const baseResult = resolveTypeReference(node, { resolveDecorators: false }); + + if (baseResult.resolutionResult & ResolutionResultFlags.ResolutionFailed) { + return baseResult; + } + + const baseSym = baseResult.finalSymbol; + + compilerAssert(baseSym, "Base symbol must be defined if resolution did not fail"); + + // If the base symbol is a function, get its return type + if (baseSym.flags & SymbolFlags.Function) { + const funcNode = baseSym.declarations.find( + (decl) => decl.kind === SyntaxKind.FunctionDeclarationStatement, + ); + + if (funcNode) { + const returnTypeNode = funcNode.returnType; + + if (returnTypeNode) { + return resolveExpression(returnTypeNode); + } + } + // Default (no function declaration or no return type), return nothing. + return failedResult(ResolutionResultFlags.None); + } + + // Any other kind of callable is something we cannot analyze right now. + return failedResult(ResolutionResultFlags.Unknown); + } + function resolveTemplateParameter(node: TemplateParameterDeclarationNode): ResolutionResult { const symbol = node.symbol; const slinks = getSymbolLinks(symbol); @@ -788,6 +829,7 @@ export function createResolver(program: Program): NameResolver { sym = node.symbol; } compilerAssert(sym, "Should have a symbol"); + links.resolvedSymbol = sym; links.resolutionResult = ResolutionResultFlags.Resolved; } @@ -1211,12 +1253,23 @@ export function createResolver(program: Program): NameResolver { symbol: undefined!, locals: createSymbolTable(), flags: NodeFlags.Synthetic, + modifiers: [], + modifierFlags: ModifierFlags.None, }; return nsNode; } function bindAndResolveNode(node: Node) { + if (visitedNode.has(node)) { + return; + } + visitedNode.add(node); + + if ("id" in node && node.kind !== SyntaxKind.MemberExpression && node.id) { + bindDeclarationIdentifier(node as any); + } + switch (node.kind) { case SyntaxKind.TypeReference: resolveTypeReference(node); @@ -1248,11 +1301,6 @@ export function createResolver(program: Program): NameResolver { case SyntaxKind.CallExpression: resolveTypeReference(node.target); break; - break; - } - - if ("id" in node && node.kind !== SyntaxKind.MemberExpression && node.id) { - bindDeclarationIdentifier(node as any); } visitChildren(node, bindAndResolveNode); diff --git a/packages/compiler/src/core/parser.ts b/packages/compiler/src/core/parser.ts index e977aa02fe2..63ed0076f13 100644 --- a/packages/compiler/src/core/parser.ts +++ b/packages/compiler/src/core/parser.ts @@ -2,10 +2,12 @@ import { isArray, mutate } from "../utils/misc.js"; import { codePointBefore, isIdentifierContinue, trim } from "./charcode.js"; import { compilerAssert } from "./diagnostics.js"; import { CompilerDiagnostics, createDiagnostic } from "./messages.js"; +import { modifiersToFlags } from "./modifiers.js"; import { createScanner, isComment, isKeyword, + isModifier, isPunctuation, isReservedKeyword, isStatementKeyword, @@ -27,6 +29,7 @@ import { CallExpressionNode, Comment, ConstStatementNode, + Declaration, DeclarationNode, DecoratorDeclarationStatementNode, DecoratorExpressionNode, @@ -52,11 +55,13 @@ import { ExternKeywordNode, FunctionDeclarationStatementNode, FunctionParameterNode, + FunctionTypeExpressionNode, IdentifierContext, IdentifierKind, IdentifierNode, ImportStatementNode, InterfaceStatementNode, + InternalKeywordNode, InvalidStatementNode, LineComment, MemberExpressionNode, @@ -76,6 +81,7 @@ import { ObjectLiteralSpreadPropertyNode, OperationSignature, OperationStatementNode, + ParenthesizedExpression, ParseOptions, PositionDetail, ScalarConstructorNode, @@ -435,35 +441,6 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa reportInvalidDecorators(decorators, "import statement"); item = parseImportStatement(); break; - case Token.ModelKeyword: - item = parseModelStatement(pos, decorators); - break; - case Token.ScalarKeyword: - item = parseScalarStatement(pos, decorators); - break; - case Token.NamespaceKeyword: - item = parseNamespaceStatement(pos, decorators, docs, directives); - break; - case Token.InterfaceKeyword: - item = parseInterfaceStatement(pos, decorators); - break; - case Token.UnionKeyword: - item = parseUnionStatement(pos, decorators); - break; - case Token.OpKeyword: - item = parseOperationStatement(pos, decorators); - break; - case Token.EnumKeyword: - item = parseEnumStatement(pos, decorators); - break; - case Token.AliasKeyword: - reportInvalidDecorators(decorators, "alias statement"); - item = parseAliasStatement(pos); - break; - case Token.ConstKeyword: - reportInvalidDecorators(decorators, "const statement"); - item = parseConstStatement(pos); - break; case Token.UsingKeyword: reportInvalidDecorators(decorators, "using statement"); item = parseUsingStatement(pos); @@ -473,10 +450,20 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa item = parseEmptyStatement(pos); break; // Start of declaration with modifiers + case Token.NamespaceKeyword: + case Token.ModelKeyword: + case Token.ScalarKeyword: + case Token.InterfaceKeyword: + case Token.UnionKeyword: + case Token.OpKeyword: + case Token.EnumKeyword: + case Token.AliasKeyword: + case Token.ConstKeyword: case Token.ExternKeyword: + case Token.InternalKeyword: case Token.FnKeyword: case Token.DecKeyword: - item = parseDeclaration(pos); + item = parseDeclaration(pos, decorators, docs, directives); break; default: item = parseInvalidStatement(pos, decorators); @@ -530,48 +517,24 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa item = parseImportStatement(); error({ code: "import-first", messageId: "topLevel", target: item }); break; - case Token.ModelKeyword: - item = parseModelStatement(pos, decorators); + case Token.UsingKeyword: + reportInvalidDecorators(decorators, "using statement"); + item = parseUsingStatement(pos); break; + case Token.ModelKeyword: case Token.ScalarKeyword: - item = parseScalarStatement(pos, decorators); - break; case Token.NamespaceKeyword: - const ns = parseNamespaceStatement(pos, decorators, docs, directives); - - if (isBlocklessNamespace(ns)) { - error({ code: "blockless-namespace-first", messageId: "topLevel", target: ns }); - } - item = ns; - break; case Token.InterfaceKeyword: - item = parseInterfaceStatement(pos, decorators); - break; case Token.UnionKeyword: - item = parseUnionStatement(pos, decorators); - break; case Token.OpKeyword: - item = parseOperationStatement(pos, decorators); - break; case Token.EnumKeyword: - item = parseEnumStatement(pos, decorators); - break; case Token.AliasKeyword: - reportInvalidDecorators(decorators, "alias statement"); - item = parseAliasStatement(pos); - break; case Token.ConstKeyword: - reportInvalidDecorators(decorators, "const statement"); - item = parseConstStatement(pos); - break; - case Token.UsingKeyword: - reportInvalidDecorators(decorators, "using statement"); - item = parseUsingStatement(pos); - break; case Token.ExternKeyword: + case Token.InternalKeyword: case Token.FnKeyword: case Token.DecKeyword: - item = parseDeclaration(pos); + item = parseDeclaration(pos, decorators, docs, directives); break; case Token.EndOfFile: parseExpected(Token.CloseBrace); @@ -584,6 +547,11 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa item = parseInvalidStatement(pos, decorators); break; } + + if (isBlocklessNamespace(item)) { + error({ code: "blockless-namespace-first", messageId: "topLevel", target: item }); + } + mutate(item).directives = directives; if (tok !== Token.NamespaceKeyword) { mutate(item).docs = docs; @@ -617,6 +585,7 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa function parseNamespaceStatement( pos: number, decorators: DecoratorExpressionNode[], + modifiers: Modifier[], docs: DocNode[], directives: DirectiveExpressionNode[], ): NamespaceStatementNode { @@ -645,6 +614,8 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa locals: undefined!, statements, directives: directives, + modifiers, + modifierFlags: modifiersToFlags(modifiers), ...finishNode(pos), }; @@ -656,6 +627,8 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa id: nsSegments[i], statements: outerNs, locals: undefined!, + modifiers: [], + modifierFlags: ModifierFlags.None, ...finishNode(pos), }; } @@ -666,6 +639,7 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa function parseInterfaceStatement( pos: number, decorators: DecoratorExpressionNode[], + modifiers: Modifier[], ): InterfaceStatementNode { parseExpected(Token.InterfaceKeyword); const id = parseIdentifier(); @@ -683,7 +657,8 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa const { items: operations, range: bodyRange } = parseList( ListKind.InterfaceMembers, - (pos, decorators) => parseOperationStatement(pos, decorators, true), + (pos, decorators) => + parseOperationStatement(pos, decorators, /* modifiers */ undefined, true), ); return { @@ -695,6 +670,8 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa bodyRange, extends: extendList.items, decorators, + modifiers, + modifierFlags: modifiersToFlags(modifiers), ...finishNode(pos), }; } @@ -719,6 +696,7 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa function parseUnionStatement( pos: number, decorators: DecoratorExpressionNode[], + modifiers: Modifier[], ): UnionStatementNode { parseExpected(Token.UnionKeyword); const id = parseIdentifier(); @@ -733,6 +711,8 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa templateParameters, templateParametersRange, decorators, + modifiers, + modifierFlags: modifiersToFlags(modifiers), options, ...finishNode(pos), }; @@ -742,11 +722,15 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa const nextToken = token(); let id: IdentifierNode | undefined; - if (isReservedKeyword(nextToken)) { + if (isReservedKeyword(nextToken) || isModifier(nextToken)) { id = parseIdentifier({ allowReservedIdentifier: true }); // If the next token is not a colon this means we tried to use the reserved keyword as a type reference if (token() !== Token.Colon) { - error({ code: "reserved-identifier", messageId: "future", format: { name: id.sv } }); + if (isReservedKeyword(nextToken)) { + error({ code: "reserved-identifier", messageId: "future", format: { name: id.sv } }); + } else { + error({ code: "reserved-identifier" }); + } } return { kind: SyntaxKind.TypeReference, @@ -820,11 +804,27 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa function parseOperationStatement( pos: number, decorators: DecoratorExpressionNode[], + modifiers: Modifier[], + inInterface?: undefined | false, + ): OperationStatementNode; + function parseOperationStatement( + pos: number, + decorators: DecoratorExpressionNode[], + modifiers: undefined, + inInterface: true, + ): OperationStatementNode; + function parseOperationStatement( + pos: number, + decorators: DecoratorExpressionNode[], + _modifiers: Modifier[] | undefined, inInterface?: boolean, ): OperationStatementNode { + let modifiers: Modifier[]; if (inInterface) { + modifiers = parseModifiers(); parseOptional(Token.OpKeyword); } else { + modifiers = _modifiers as Modifier[]; parseExpected(Token.OpKeyword); } @@ -872,6 +872,8 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa templateParametersRange, signature, decorators, + modifiers, + modifierFlags: modifiersToFlags(modifiers), ...finishNode(pos), }; } @@ -894,6 +896,7 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa function parseModelStatement( pos: number, decorators: DecoratorExpressionNode[], + modifiers: Modifier[], ): ModelStatementNode { parseExpected(Token.ModelKeyword); const id = parseIdentifier(); @@ -929,6 +932,8 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa decorators, properties: propDetail.items, bodyRange: propDetail.range, + modifiers, + modifierFlags: modifiersToFlags(modifiers), ...finishNode(pos), }; } @@ -952,7 +957,7 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa const id = parseIdentifier(); let constraint: Expression | ValueOfExpressionNode | undefined; if (parseOptional(Token.ExtendsKeyword)) { - constraint = parseMixedParameterConstraint(); + constraint = parseMixedConstraint(); } let def: Expression | undefined; if (parseOptional(Token.Equals)) { @@ -971,7 +976,7 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa if (token() === Token.ValueOfKeyword) { return parseValueOfExpression(); } else if (parseOptional(Token.OpenParen)) { - const expr = parseMixedParameterConstraint(); + const expr = parseMixedConstraint(); parseExpected(Token.CloseParen); return expr; } @@ -979,7 +984,7 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa return parseIntersectionExpressionOrHigher(); } - function parseMixedParameterConstraint(): Expression | ValueOfExpressionNode { + function parseMixedConstraint(): Expression | ValueOfExpressionNode { const pos = tokenPos(); parseOptional(Token.Bar); const node: Expression = parseValueOfExpressionOrIntersectionOrHigher(); @@ -1096,6 +1101,7 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa function parseScalarStatement( pos: number, decorators: DecoratorExpressionNode[], + modifiers: Modifier[], ): ScalarStatementNode { parseExpected(Token.ScalarKeyword); const id = parseIdentifier(); @@ -1114,6 +1120,8 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa members, bodyRange, decorators, + modifiers, + modifierFlags: modifiersToFlags(modifiers), ...finishNode(pos), }; } @@ -1154,6 +1162,7 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa function parseEnumStatement( pos: number, decorators: DecoratorExpressionNode[], + modifiers: Modifier[], ): EnumStatementNode { parseExpected(Token.EnumKeyword); const id = parseIdentifier(); @@ -1162,6 +1171,8 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa kind: SyntaxKind.EnumStatement, id, decorators, + modifiers, + modifierFlags: modifiersToFlags(modifiers), members, ...finishNode(pos), }; @@ -1222,12 +1233,14 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa }; } - function parseAliasStatement(pos: number): AliasStatementNode { + function parseAliasStatement(pos: number, modifiers: Modifier[]): AliasStatementNode { parseExpected(Token.AliasKeyword); const id = parseIdentifier(); const { items: templateParameters, range: templateParametersRange } = parseTemplateParameterList(); + parseExpected(Token.Equals); + const value = parseExpression(); parseExpected(Token.Semicolon); return { @@ -1236,11 +1249,13 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa templateParameters, templateParametersRange, value, + modifiers, + modifierFlags: modifiersToFlags(modifiers), ...finishNode(pos), }; } - function parseConstStatement(pos: number): ConstStatementNode { + function parseConstStatement(pos: number, modifiers: Modifier[]): ConstStatementNode { parseExpected(Token.ConstKeyword); const id = parseIdentifier(); const type = parseOptionalTypeAnnotation(); @@ -1252,6 +1267,8 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa id, value, type, + modifiers, + modifierFlags: modifiersToFlags(modifiers), ...finishNode(pos), }; } @@ -1282,6 +1299,15 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa options.push(expr); } + for (const fnVariant of options.filter((n) => n.kind === SyntaxKind.FunctionTypeExpression)) { + if (!(fnVariant as ParenthesizedExpression).parenthesized) { + error({ + code: "fn-in-union-expression", + target: fnVariant, + }); + } + } + return { kind: SyntaxKind.UnionExpression, options, @@ -1387,6 +1413,23 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa } } + function parseFunctionTypeExpression(): FunctionTypeExpressionNode { + const pos = tokenPos(); + parseExpected(Token.FnKeyword); + const { items: parameters } = parseFunctionParameters(); + + const optionalReturnType = parseOptional(Token.EqualsGreaterThan); + + const returnType = optionalReturnType ? parseMixedConstraint() : undefined; + + return { + kind: SyntaxKind.FunctionTypeExpression, + parameters, + returnType, + ...finishNode(pos), + }; + } + function parseReferenceExpression( message?: keyof CompilerDiagnostics["token-expected"], ): TypeReferenceNode { @@ -1666,6 +1709,8 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa switch (token()) { case Token.TypeOfKeyword: return parseTypeOfExpression(); + case Token.FnKeyword: + return parseFunctionTypeExpression(); case Token.Identifier: return parseCallOrReferenceExpression(); case Token.StringLiteral: @@ -1716,6 +1761,15 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa }; } + function parseInternalKeyword(): InternalKeywordNode { + const pos = tokenPos(); + parseExpected(Token.InternalKeyword); + return { + kind: SyntaxKind.InternalKeyword, + ...finishNode(pos), + }; + } + function parseVoidKeyword(): VoidKeywordNode { const pos = tokenPos(); parseExpected(Token.VoidKeyword); @@ -1743,12 +1797,12 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa }; } - function parseParenthesizedExpression(): Expression { + function parseParenthesizedExpression(): ParenthesizedExpression { const pos = tokenPos(); parseExpected(Token.OpenParen); const expr = parseExpression(); parseExpected(Token.CloseParen); - return { ...expr, ...finishNode(pos) }; + return { parenthesized: true, ...expr, ...finishNode(pos) }; } function parseTupleExpression(): TupleExpressionNode { @@ -1956,8 +2010,10 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa allowReservedIdentifier?: boolean; }): IdentifierNode { if (isKeyword(token())) { - error({ code: "reserved-identifier" }); - return createMissingIdentifier(); + if (!(isModifier(token()) && options?.allowReservedIdentifier)) { + error({ code: "reserved-identifier" }); + return createMissingIdentifier(); + } } else if (isReservedKeyword(token())) { if (!options?.allowReservedIdentifier) { error({ code: "reserved-identifier", messageId: "future", format: { name: tokenValue() } }); @@ -1985,9 +2041,32 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa function parseDeclaration( pos: number, - ): DecoratorDeclarationStatementNode | FunctionDeclarationStatementNode | InvalidStatementNode { + decorators: DecoratorExpressionNode[], + docs: DocNode[], + directives: DirectiveExpressionNode[], + ): Declaration | InvalidStatementNode { const modifiers = parseModifiers(); switch (token()) { + case Token.ModelKeyword: + return parseModelStatement(pos, decorators, modifiers); + case Token.ScalarKeyword: + return parseScalarStatement(pos, decorators, modifiers); + case Token.NamespaceKeyword: + return parseNamespaceStatement(pos, decorators, modifiers, docs, directives); + case Token.InterfaceKeyword: + return parseInterfaceStatement(pos, decorators, modifiers); + case Token.UnionKeyword: + return parseUnionStatement(pos, decorators, modifiers); + case Token.OpKeyword: + return parseOperationStatement(pos, decorators, modifiers); + case Token.EnumKeyword: + return parseEnumStatement(pos, decorators, modifiers); + case Token.AliasKeyword: + reportInvalidDecorators(decorators, "alias statement"); + return parseAliasStatement(pos, modifiers); + case Token.ConstKeyword: + reportInvalidDecorators(decorators, "const statement"); + return parseConstStatement(pos, modifiers); case Token.DecKeyword: return parseDecoratorDeclarationStatement(pos, modifiers); case Token.FnKeyword: @@ -2009,6 +2088,8 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa switch (token()) { case Token.ExternKeyword: return parseExternKeyword(); + case Token.InternalKeyword: + return parseInternalKeyword(); default: return undefined; } @@ -2059,7 +2140,7 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa const { items: parameters } = parseFunctionParameters(); let returnType; if (parseOptional(Token.Colon)) { - returnType = parseExpression(); + returnType = parseMixedConstraint(); } parseExpected(Token.Semicolon); return { @@ -2108,7 +2189,7 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa const optional = parseOptional(Token.Question); let type; if (parseOptional(Token.Colon)) { - type = parseMixedParameterConstraint(); + type = parseMixedConstraint(); } return { kind: SyntaxKind.FunctionParameter, @@ -2120,18 +2201,6 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa }; } - function modifiersToFlags(modifiers: Modifier[]): ModifierFlags { - let flags = ModifierFlags.None; - for (const modifier of modifiers) { - switch (modifier.kind) { - case SyntaxKind.ExternKeyword: - flags |= ModifierFlags.Extern; - break; - } - } - return flags; - } - function parseRange(mode: ParseMode, range: TextRange, callback: () => T): T { const savedMode = currentMode; const result = scanner.scanRange(range, () => { @@ -2920,6 +2989,7 @@ export function visitChildren(node: Node, cb: NodeCallback): T | undefined return visitNode(cb, node.path); case SyntaxKind.OperationStatement: return ( + visitEach(cb, node.modifiers) || visitEach(cb, node.decorators) || visitNode(cb, node.id) || visitEach(cb, node.templateParameters) || @@ -2931,12 +3001,14 @@ export function visitChildren(node: Node, cb: NodeCallback): T | undefined return visitNode(cb, node.baseOperation); case SyntaxKind.NamespaceStatement: return ( + visitEach(cb, node.modifiers) || visitEach(cb, node.decorators) || visitNode(cb, node.id) || (isArray(node.statements) ? visitEach(cb, node.statements) : visitNode(cb, node.statements)) ); case SyntaxKind.InterfaceStatement: return ( + visitEach(cb, node.modifiers) || visitEach(cb, node.decorators) || visitNode(cb, node.id) || visitEach(cb, node.templateParameters) || @@ -2963,6 +3035,7 @@ export function visitChildren(node: Node, cb: NodeCallback): T | undefined case SyntaxKind.ModelStatement: return ( + visitEach(cb, node.modifiers) || visitEach(cb, node.decorators) || visitNode(cb, node.id) || visitEach(cb, node.templateParameters) || @@ -2972,6 +3045,7 @@ export function visitChildren(node: Node, cb: NodeCallback): T | undefined ); case SyntaxKind.ScalarStatement: return ( + visitEach(cb, node.modifiers) || visitEach(cb, node.decorators) || visitNode(cb, node.id) || visitEach(cb, node.templateParameters) || @@ -2982,6 +3056,7 @@ export function visitChildren(node: Node, cb: NodeCallback): T | undefined return visitNode(cb, node.id) || visitEach(cb, node.parameters); case SyntaxKind.UnionStatement: return ( + visitEach(cb, node.modifiers) || visitEach(cb, node.decorators) || visitNode(cb, node.id) || visitEach(cb, node.templateParameters) || @@ -2991,7 +3066,10 @@ export function visitChildren(node: Node, cb: NodeCallback): T | undefined return visitEach(cb, node.decorators) || visitNode(cb, node.id) || visitNode(cb, node.value); case SyntaxKind.EnumStatement: return ( - visitEach(cb, node.decorators) || visitNode(cb, node.id) || visitEach(cb, node.members) + visitEach(cb, node.modifiers) || + visitEach(cb, node.decorators) || + visitNode(cb, node.id) || + visitEach(cb, node.members) ); case SyntaxKind.EnumMember: return visitEach(cb, node.decorators) || visitNode(cb, node.id) || visitNode(cb, node.value); @@ -2999,12 +3077,18 @@ export function visitChildren(node: Node, cb: NodeCallback): T | undefined return visitNode(cb, node.target); case SyntaxKind.AliasStatement: return ( + visitEach(cb, node.modifiers) || visitNode(cb, node.id) || visitEach(cb, node.templateParameters) || visitNode(cb, node.value) ); case SyntaxKind.ConstStatement: - return visitNode(cb, node.id) || visitNode(cb, node.value) || visitNode(cb, node.type); + return ( + visitEach(cb, node.modifiers) || + visitNode(cb, node.id) || + visitNode(cb, node.value) || + visitNode(cb, node.type) + ); case SyntaxKind.DecoratorDeclarationStatement: return ( visitEach(cb, node.modifiers) || @@ -3019,6 +3103,8 @@ export function visitChildren(node: Node, cb: NodeCallback): T | undefined visitEach(cb, node.parameters) || visitNode(cb, node.returnType) ); + case SyntaxKind.FunctionTypeExpression: + return visitEach(cb, node.parameters) || visitNode(cb, node.returnType); case SyntaxKind.FunctionParameter: return visitNode(cb, node.id) || visitNode(cb, node.type); case SyntaxKind.TypeReference: @@ -3080,6 +3166,7 @@ export function visitChildren(node: Node, cb: NodeCallback): T | undefined case SyntaxKind.VoidKeyword: case SyntaxKind.NeverKeyword: case SyntaxKind.ExternKeyword: + case SyntaxKind.InternalKeyword: case SyntaxKind.UnknownKeyword: case SyntaxKind.JsSourceFile: case SyntaxKind.JsNamespaceDeclaration: @@ -3308,6 +3395,9 @@ export function getIdentifierContext(id: IdentifierNode): IdentifierContext { case SyntaxKind.DecoratorExpression: kind = IdentifierKind.Decorator; break; + case SyntaxKind.CallExpression: + kind = IdentifierKind.Function; + break; case SyntaxKind.UsingStatement: kind = IdentifierKind.Using; break; diff --git a/packages/compiler/src/core/perf.ts b/packages/compiler/src/core/perf.ts new file mode 100644 index 00000000000..ca0de8f42ad --- /dev/null +++ b/packages/compiler/src/core/perf.ts @@ -0,0 +1,63 @@ +import type { PerfReporter, Timer } from "./types.js"; + +export function startTimer(): Timer { + const start = performance.now(); + return { + end: () => { + return performance.now() - start; + }, + }; +} + +export function time(fn: () => void): number { + const timer = startTimer(); + fn(); + return timer.end(); +} + +export async function timeAsync(fn: () => Promise): Promise { + const timer = startTimer(); + await fn(); + return timer.end(); +} + +/** Perf utils */ +export const perf = { + startTimer, + time, + timeAsync, +}; + +export function createPerfReporter(): PerfReporter { + const measures: Record = {}; + function startReportingTimer(label: string): Timer { + const timer = startTimer(); + return { + end: () => { + const time = timer.end(); + measures[label] = time; + return time; + }, + }; + } + + return { + startTimer: startReportingTimer, + time: (label: string, fn: () => T): T => { + const timer = startReportingTimer(label); + const result = fn(); + timer.end(); + return result; + }, + timeAsync: async (label: string, fn: () => Promise): Promise => { + const timer = startReportingTimer(label); + const result = await fn(); + timer.end(); + return result; + }, + report: (label: string, duration: number) => { + measures[label] = duration; + }, + measures, + }; +} diff --git a/packages/compiler/src/core/program.ts b/packages/compiler/src/core/program.ts index d5038ab0343..19699c1d779 100644 --- a/packages/compiler/src/core/program.ts +++ b/packages/compiler/src/core/program.ts @@ -4,11 +4,7 @@ import { validateEncodedNamesConflicts } from "../lib/encoded-names.js"; import { validatePagingOperations } from "../lib/paging.js"; import { MANIFEST } from "../manifest.js"; import { ResolveModuleError, resolveModule } from "../module-resolver/module-resolver.js"; -import { - ModuleResolutionResult, - ResolveModuleHost, - ResolvedModule, -} from "../module-resolver/types.js"; +import { ModuleResolutionResult, ResolvedModule } from "../module-resolver/types.js"; import { PackageJson } from "../types/package-json.js"; import { findProjectRoot } from "../utils/io.js"; import { deepEquals, isDefined, mapEquals, mutate } from "../utils/misc.js"; @@ -16,7 +12,7 @@ import { createBinder } from "./binder.js"; import { Checker, createChecker } from "./checker.js"; import { createSuppressCodeFix } from "./compiler-code-fixes/suppress.codefix.js"; import { compilerAssert } from "./diagnostics.js"; -import { flushEmittedFilesPaths } from "./emitter-utils.js"; +import { getEmittedFilesForProgram } from "./emitter-utils.js"; import { resolveTypeSpecEntrypoint } from "./entrypoint-resolution.js"; import { ExternalError } from "./external-error.js"; import { getLibraryUrlsLoaded } from "./library.js"; @@ -29,11 +25,13 @@ import { import { createLogger } from "./logger/index.js"; import { createTracer } from "./logger/tracer.js"; import { createDiagnostic } from "./messages.js"; +import { createResolveModuleHost } from "./module-host.js"; import { NameResolver, createResolver } from "./name-resolver.js"; import { Numeric } from "./numeric.js"; import { CompilerOptions } from "./options.js"; import { parse, parseStandaloneTypeReference } from "./parser.js"; import { getDirectoryPath, joinPaths, resolvePath } from "./path-utils.js"; +import { createPerfReporter, perf } from "./perf.js"; import { SourceLoader, SourceResolution, @@ -42,7 +40,7 @@ import { moduleResolutionErrorToDiagnostic, } from "./source-loader.js"; import { createStateAccessors } from "./state-accessors.js"; -import { ComplexityStats, RuntimeStats, Stats, startTimer, time, timeAsync } from "./stats.js"; +import { ComplexityStats, RuntimeStats, Stats } from "./stats.js"; import { CompilerHost, Diagnostic, @@ -61,6 +59,7 @@ import { Namespace, NoTarget, Node, + PerfReporter, SourceFile, Sym, SymbolFlags, @@ -186,17 +185,17 @@ export async function compile( total: 0, emitters: {}, }; - const timer = startTimer(); + const timer = perf.startTimer(); // Emitter stage for (const emitter of program.emitters) { // If in dry mode run and an emitter doesn't support it we have to skip it. if (program.compilerOptions.dryRun && !emitter.library.definition?.capabilities?.dryRun) { continue; } - const { duration } = await emit(emitter, program); - emitStats.emitters[emitter.metadata.name ?? ""] = duration; + const emitterStats = await emit(emitter, program); + emitStats.emitters[emitter.metadata.name ?? ""] = emitterStats; if (options.listFiles) { - logEmittedFilesPath(host.logSink); + logEmittedFilesPath(program); } } emitStats.total = timer.end(); @@ -278,7 +277,7 @@ async function createProgram( const basedir = getDirectoryPath(resolvedMain) || "/"; await checkForCompilerVersionMismatch(basedir); - runtimeStats.loader = await timeAsync(() => loadSources(resolvedMain)); + runtimeStats.loader = await perf.timeAsync(() => loadSources(resolvedMain)); const emit = options.noEmit ? [] : (options.emit ?? []); const emitterOptions = options.options; @@ -297,7 +296,7 @@ async function createProgram( oldProgram = undefined; const resolver = (program.resolver = createResolver(program)); - runtimeStats.resolver = time(() => resolver.resolveProgram()); + runtimeStats.resolver = perf.time(() => resolver.resolveProgram()); const linter = createLinter(program, (name) => loadLibrary(basedir, name)); linter.registerLinterLibrary(builtInLinterLibraryName, createBuiltInLinterLibrary()); @@ -306,7 +305,7 @@ async function createProgram( } program.checker = createChecker(program, resolver); - runtimeStats.checker = time(() => program.checker.checkProgram()); + runtimeStats.checker = perf.time(() => program.checker.checkProgram()); complexityStats.createdTypes = program.checker.stats.createdTypes; complexityStats.finishedTypes = program.checker.stats.finishedTypes; @@ -634,12 +633,12 @@ async function createProgram( } async function runValidators() { - const start = startTimer(); + const start = perf.startTimer(); runtimeStats.validation = { total: 0, validators: {} }; runCompilerValidators(); runtimeStats.validation.validators.compiler = start.end(); for (const validator of validateCbs) { - const start = startTimer(); + const start = perf.startTimer(); const diagnostics = await runValidator(validator); if (diagnostics && Array.isArray(diagnostics)) { program.reportDiagnostics(diagnostics); @@ -698,7 +697,10 @@ async function createProgram( ): Promise<[ModuleResolutionResult | undefined, readonly Diagnostic[]]> { try { return [ - await resolveModule(getResolveModuleHost(), specifier, { baseDir, conditions: ["import"] }), + await resolveModule(createResolveModuleHost(host), specifier, { + baseDir, + conditions: ["import"], + }), [], ]; } catch (e: any) { @@ -710,17 +712,6 @@ async function createProgram( } } - function getResolveModuleHost(): ResolveModuleHost { - return { - realpath: host.realpath, - stat: host.stat, - readFile: async (path) => { - const file = await host.readFile(path); - return file.text; - }, - }; - } - // It's important that we use the compiler version that resolves locally // from the input TypeSpec source location. Otherwise, there will be undefined // runtime behavior when decorators and handlers expect a @@ -972,7 +963,10 @@ function resolveOptions(options: CompilerOptions): CompilerOptions { return { ...options }; } -async function emit(emitter: EmitterRef, program: Program): Promise<{ duration: number }> { +async function emit( + emitter: EmitterRef, + program: Program, +): Promise<{ total: number; steps: Record }> { const emitterName = emitter.metadata.name ?? ""; const relativePathForEmittedFiles = transformPathForSink(program.host.logSink, emitter.emitterOutputDir) + "/"; @@ -981,8 +975,8 @@ async function emit(emitter: EmitterRef, program: Program): Promise<{ duration: const warnCount = program.diagnostics.filter((x) => x.severity === "warning").length; const logger = createLogger({ sink: program.host.logSink }); return await logger.trackAction(`Running ${emitterName}...`, "", async (task) => { - const start = startTimer(); - await runEmitter(emitter, program); + const start = perf.startTimer(); + const emitterPerfReporter = await runEmitter(emitter, program); const duration = start.end(); const message = `${emitterName} ${pc.green(`${Math.round(duration)}ms`)} ${pc.dim(relativePathForEmittedFiles)}`; const newErrorCount = program.diagnostics.filter((x) => x.severity === "error").length; @@ -994,30 +988,33 @@ async function emit(emitter: EmitterRef, program: Program): Promise<{ duration: } else { task.succeed(message); } - return { duration }; + return { total: duration, steps: emitterPerfReporter.measures }; }); } /** * @param emitter Emitter ref to run */ -async function runEmitter(emitter: EmitterRef, program: Program) { +async function runEmitter(emitter: EmitterRef, program: Program): Promise { + const perfReporter = createPerfReporter(); const context: EmitContext = { program, emitterOutputDir: emitter.emitterOutputDir, options: emitter.options, + perf: perfReporter, }; try { await emitter.emitFunction(context); + return perfReporter; } catch (error: unknown) { throw new ExternalError({ kind: "emitter", metadata: emitter.metadata, error }); } } -function logEmittedFilesPath(logSink: LogSink) { - flushEmittedFilesPaths().forEach((filePath) => { +function logEmittedFilesPath(program: Program) { + getEmittedFilesForProgram(program).forEach((filePath) => { // eslint-disable-next-line no-console - console.log(` ${pc.dim(transformPathForSink(logSink, filePath))}`); + console.log(` ${pc.dim(transformPathForSink(program.host.logSink, filePath))}`); }); } function transformPathForSink(logSink: LogSink, path: string) { diff --git a/packages/compiler/src/core/scanner.ts b/packages/compiler/src/core/scanner.ts index ebbd4db61bc..67fd2454300 100644 --- a/packages/compiler/src/core/scanner.ts +++ b/packages/compiler/src/core/scanner.ts @@ -126,7 +126,6 @@ export enum Token { ElseKeyword, IfKeyword, DecKeyword, - FnKeyword, ConstKeyword, InitKeyword, // Add new statement keyword above @@ -139,6 +138,7 @@ export enum Token { /** @internal */ __StartModifierKeyword = __EndStatementKeyword, ExternKeyword = __StartModifierKeyword, + InternalKeyword, /** @internal */ __EndModifierKeyword, /////////////////////////////////////////////////////////////// @@ -147,6 +147,7 @@ export enum Token { // Other keywords ExtendsKeyword = __EndModifierKeyword, + FnKeyword, TrueKeyword, FalseKeyword, ReturnKeyword, @@ -198,7 +199,6 @@ export enum Token { PrivateKeyword, PublicKeyword, ProtectedKeyword, - InternalKeyword, SealedKeyword, LocalKeyword, AsyncKeyword, @@ -383,6 +383,7 @@ export const Keywords: ReadonlyMap = new Map([ ["never", Token.NeverKeyword], ["unknown", Token.UnknownKeyword], ["extern", Token.ExternKeyword], + ["internal", Token.InternalKeyword], // Reserved keywords ["statemachine", Token.StatemachineKeyword], @@ -420,7 +421,6 @@ export const Keywords: ReadonlyMap = new Map([ ["private", Token.PrivateKeyword], ["public", Token.PublicKeyword], ["protected", Token.ProtectedKeyword], - ["internal", Token.InternalKeyword], ["sealed", Token.SealedKeyword], ["local", Token.LocalKeyword], ["async", Token.AsyncKeyword], @@ -460,7 +460,6 @@ export const ReservedKeywords: ReadonlyMap = new Map([ ["private", Token.PrivateKeyword], ["public", Token.PublicKeyword], ["protected", Token.ProtectedKeyword], - ["internal", Token.InternalKeyword], ["sealed", Token.SealedKeyword], ["local", Token.LocalKeyword], ["async", Token.AsyncKeyword], @@ -1274,6 +1273,7 @@ export function createScanner( if (isCrlf(end - 2, 0, end)) { end--; } + // eslint-disable-next-line no-useless-assignment end--; } @@ -1473,7 +1473,6 @@ export function createScanner( function scanIdentifierOrKeyword(): Token { let count = 0; - let ch = input.charCodeAt(position); while (true) { position++; @@ -1483,7 +1482,7 @@ export function createScanner( break; } - ch = input.charCodeAt(position); + const ch = input.charCodeAt(position); if (count < KeywordLimit.MaxLength && isLowercaseAsciiLetter(ch)) { continue; } diff --git a/packages/compiler/src/core/semantic-walker.ts b/packages/compiler/src/core/semantic-walker.ts index 6342db3d26a..7f08ea16fb3 100644 --- a/packages/compiler/src/core/semantic-walker.ts +++ b/packages/compiler/src/core/semantic-walker.ts @@ -3,6 +3,7 @@ import { isTemplateDeclaration } from "./type-utils.js"; import { Decorator, Enum, + FunctionValue, Interface, ListenerFlow, Model, @@ -20,6 +21,7 @@ import { TypeListeners, Union, UnionVariant, + Value, } from "./types.js"; export interface NavigationOptions { @@ -84,12 +86,12 @@ export function navigateType( * @param options Scope options * @returns wrapped listeners that that can be used with `navigateType` */ -export function scopeNavigationToNamespace( +export function scopeNavigationToNamespace( namespace: Namespace, listeners: T, options: NamespaceNavigationOptions = {}, ): T { - const wrappedListeners: TypeListeners = {}; + const wrappedListeners: SemanticNodeListener = {}; for (const [name, callback] of Object.entries(listeners)) { wrappedListeners[name as any as keyof TypeListeners] = (x) => { if (x !== namespace && "namespace" in x) { @@ -108,7 +110,7 @@ export function scopeNavigationToNamespace( export function navigateTypesInNamespace( namespace: Namespace, - listeners: TypeListeners, + listeners: SemanticNodeListener, options: NamespaceNavigationOptions & NavigationOptions = {}, ) { navigateType(namespace, scopeNavigationToNamespace(namespace, listeners, options), options); @@ -201,10 +203,14 @@ function navigateNamespaceType(namespace: Namespace, context: NavigationContext) navigateDecoratorDeclaration(decorator, context); } + for (const func of namespace.functionDeclarations.values()) { + navigateFunctionDeclaration(func, context); + } + context.emit("exitNamespace", namespace); } -function checkVisited(visited: Set, item: Type) { +function checkVisited(visited: Set, item: Type | Value) { if (visited.has(item)) { return true; } @@ -394,50 +400,66 @@ function navigateScalarConstructor(type: ScalarConstructor, context: NavigationC if (context.emit("scalarConstructor", type) === ListenerFlow.NoRecursion) return; } -function navigateTypeInternal(type: Type, context: NavigationContext) { - switch (type.kind) { - case "Model": - return navigateModelType(type, context); - case "Scalar": - return navigateScalarType(type, context); - case "ModelProperty": - return navigateModelTypeProperty(type, context); - case "Namespace": - return navigateNamespaceType(type, context); - case "Interface": - return navigateInterfaceType(type, context); - case "Enum": - return navigateEnumType(type, context); - case "Operation": - return navigateOperationType(type, context); - case "Union": - return navigateUnionType(type, context); - case "UnionVariant": - return navigateUnionTypeVariant(type, context); - case "Tuple": - return navigateTupleType(type, context); - case "StringTemplate": - return navigateStringTemplate(type, context); - case "StringTemplateSpan": - return navigateStringTemplateSpan(type, context); - case "TemplateParameter": - return navigateTemplateParameter(type, context); - case "Decorator": - return navigateDecoratorDeclaration(type, context); - case "ScalarConstructor": - return navigateScalarConstructor(type, context); - case "FunctionParameter": - case "Boolean": - case "EnumMember": - case "Intrinsic": - case "Number": - case "String": - return; - default: - // Dummy const to ensure we handle all types. - // If you get an error here, add a case for the new type you added - const _assertNever: never = type; - return; +function navigateFunctionDeclaration(value: FunctionValue, context: NavigationContext) { + if (checkVisited(context.visited, value)) { + return; + } + if (context.emit("function", value) === ListenerFlow.NoRecursion) return; +} + +function navigateTypeInternal(entity: Type | Value, context: NavigationContext) { + if (entity.entityKind === "Type") { + switch (entity.kind) { + case "Model": + return navigateModelType(entity, context); + case "Scalar": + return navigateScalarType(entity, context); + case "ModelProperty": + return navigateModelTypeProperty(entity, context); + case "Namespace": + return navigateNamespaceType(entity, context); + case "Interface": + return navigateInterfaceType(entity, context); + case "Enum": + return navigateEnumType(entity, context); + case "Operation": + return navigateOperationType(entity, context); + case "Union": + return navigateUnionType(entity, context); + case "UnionVariant": + return navigateUnionTypeVariant(entity, context); + case "Tuple": + return navigateTupleType(entity, context); + case "StringTemplate": + return navigateStringTemplate(entity, context); + case "StringTemplateSpan": + return navigateStringTemplateSpan(entity, context); + case "TemplateParameter": + return navigateTemplateParameter(entity, context); + case "Decorator": + return navigateDecoratorDeclaration(entity, context); + case "ScalarConstructor": + return navigateScalarConstructor(entity, context); + case "FunctionParameter": + case "FunctionType": + case "Boolean": + case "EnumMember": + case "Intrinsic": + case "Number": + case "String": + return; + default: + // Dummy const to ensure we handle all types. + // If you get an error here, add a case for the new type you added + const _assertNever: never = entity; + return; + } + } else { + if (entity.valueKind === "Function") { + return navigateFunctionDeclaration(entity, context); + } + + return; } } diff --git a/packages/compiler/src/core/source-loader.ts b/packages/compiler/src/core/source-loader.ts index 573af0a5363..dd17be3392d 100644 --- a/packages/compiler/src/core/source-loader.ts +++ b/packages/compiler/src/core/source-loader.ts @@ -3,7 +3,6 @@ import { ResolvedModule, resolveModule, ResolveModuleError, - ResolveModuleHost, } from "../module-resolver/index.js"; import { PackageJson } from "../types/package-json.js"; import { doIO } from "../utils/io.js"; @@ -11,11 +10,13 @@ import { deepEquals, resolveTspMain } from "../utils/misc.js"; import { compilerAssert, createDiagnosticCollector } from "./diagnostics.js"; import { resolveTypeSpecEntrypointForDir } from "./entrypoint-resolution.js"; import { createDiagnostic } from "./messages.js"; +import { createResolveModuleHost } from "./module-host.js"; import { isImportStatement, parse } from "./parser.js"; import { getDirectoryPath } from "./path-utils.js"; import { createSourceFile } from "./source-file.js"; import { DiagnosticTarget, + ModifierFlags, ModuleLibraryMetadata, NodeFlags, NoTarget, @@ -272,7 +273,7 @@ export async function createSourceLoader( target: DiagnosticTarget | typeof NoTarget, ): Promise { try { - return await resolveModule(getResolveModuleHost(), specifier, { + return await resolveModule(createResolveModuleHost(host), specifier, { baseDir, directoryIndexFiles: ["main.tsp", "index.mjs", "index.js"], resolveMain(pkg) { @@ -323,17 +324,6 @@ export async function createSourceLoader( } return file; } - - function getResolveModuleHost(): ResolveModuleHost { - return { - realpath: host.realpath, - stat: host.stat, - readFile: async (path) => { - const file = await host.readFile(path); - return file.text; - }, - }; - } } function computeModuleMetadata(module: ResolvedModule): ModuleLibraryMetadata { @@ -401,6 +391,8 @@ export async function loadJsFile( pos: 0, end: 0, flags: NodeFlags.None, + modifiers: [], + modifierFlags: ModifierFlags.None, }; return [node, diagnostics]; } diff --git a/packages/compiler/src/core/stats.ts b/packages/compiler/src/core/stats.ts index 936339ad103..d62d4678876 100644 --- a/packages/compiler/src/core/stats.ts +++ b/packages/compiler/src/core/stats.ts @@ -28,32 +28,12 @@ export interface RuntimeStats { emit: { total: number; emitters: { - [rule: string]: number; + [emitterName: string]: { + total: number; + steps: { + [stepName: string]: number; + }; + }; }; }; } - -export interface Timer { - end: () => number; -} - -export function startTimer(): Timer { - const start = performance.now(); - return { - end: () => { - return performance.now() - start; - }, - }; -} - -export function time(fn: () => void): number { - const timer = startTimer(); - fn(); - return timer.end(); -} - -export async function timeAsync(fn: () => Promise): Promise { - const timer = startTimer(); - await fn(); - return timer.end(); -} diff --git a/packages/compiler/src/core/type-relation-checker.ts b/packages/compiler/src/core/type-relation-checker.ts index 5444e682d4b..fbec81007d1 100644 --- a/packages/compiler/src/core/type-relation-checker.ts +++ b/packages/compiler/src/core/type-relation-checker.ts @@ -24,7 +24,9 @@ import { DiagnosticReport, Entity, Enum, + FunctionType, IndeterminateEntity, + MixedFunctionParameter, MixedParameterConstraint, Model, ModelIndexer, @@ -74,7 +76,9 @@ interface TypeRelationError { | "missing-index" | "property-required" | "missing-property" - | "unexpected-property"; + | "unexpected-property" + | "parameter-required"; + messageId?: string; message: string; children: readonly TypeRelationError[]; target: Entity | Node; @@ -98,9 +102,7 @@ const ReflectionNameToKind = { Tuple: "Tuple", Union: "Union", UnionVariant: "UnionVariant", -} as const; - -const _assertReflectionNameToKind: Record = ReflectionNameToKind; +} as const satisfies Record; type ReflectionTypeName = keyof typeof ReflectionNameToKind; @@ -278,6 +280,12 @@ export function createTypeRelationChecker(program: Program, checker: Checker): T return isTypeAssignableToInternal(source.type!, target, diagnosticTarget, relationCache); } + if (isReflectionType(target)) { + return source.kind === ReflectionNameToKind[target.name] || isNeverType(source) + ? [Related.true, []] + : [Related.false, [createUnassignableDiagnostic(source, target, diagnosticTarget)]]; + } + const isSimpleTypeRelated = isSimpleTypeAssignableTo(source, target); if (isSimpleTypeRelated === true) { return [Related.true, []]; @@ -343,6 +351,8 @@ export function createTypeRelationChecker(program: Program, checker: Checker): T return isAssignableToUnion(source, target, diagnosticTarget, relationCache); } else if (target.kind === "Enum") { return isAssignableToEnum(source, target, diagnosticTarget); + } else if (target.kind === "FunctionType") { + return isAssignableToFunctionType(source, target, diagnosticTarget, relationCache); } return [Related.false, [createUnassignableDiagnostic(source, target, diagnosticTarget)]]; @@ -502,11 +512,8 @@ export function createTypeRelationChecker(program: Program, checker: Checker): T function isSimpleTypeAssignableTo(source: Type, target: Type): boolean | undefined { if (isNeverType(source)) return true; - if (isVoidType(target)) return false; + if (isVoidType(target)) return isVoidType(source); if (isUnknownType(target)) return true; - if (isReflectionType(target)) { - return source.kind === ReflectionNameToKind[target.name]; - } if (target.kind === "Scalar") { return isRelatedToScalar(source, target); @@ -530,9 +537,223 @@ export function createTypeRelationChecker(program: Program, checker: Checker): T if (target.kind === "Number") { return source.kind === "Number" && target.value === source.value; } + return undefined; } + function isAssignableToFunctionType( + source: Type, + target: FunctionType, + diagnosticTarget: Entity | Node, + relationCache: MultiKeyMap<[Entity, Entity], Related>, + ): [Related, readonly TypeRelationError[]] { + if (source.kind !== "FunctionType") { + return [Related.false, [createUnassignableDiagnostic(source, target, source)]]; + } + + const { parameters: sourceParameters, returnType: sourceReturnType } = source; + const { parameters: targetParameters, returnType: targetReturnType } = target; + + // Check that target parameters assignable to source parameters (contravariant relation) + const [parametersAssignable, parameterErrors] = areParametersAssignable( + targetParameters, + sourceParameters, + diagnosticTarget, + relationCache, + ); + + // Check that source return type is assignable to target return type (covariant relation) + const [returnTypeAssignable, returnTypeErrors] = isAssignableToMixedParameterConstraint( + sourceReturnType, + targetReturnType, + diagnosticTarget, + relationCache, + ); + + const related = returnTypeAssignable === Related.true && parametersAssignable === Related.true; + + return related + ? [Related.true, []] + : [ + Related.false, + wrapUnassignableErrors(source, target, [...parameterErrors, ...returnTypeErrors]), + ]; + } + + /** + * Checks if a set of source parameter constraints are assignable to a set of target parameter constraints. + * + * This function assumes the directionality of source -> target has already been adjusted for contravariance. To check if + * a function F1 is assignable to F2, check that F2.parameters are assignable to F1.parameters. + * + * @param sourceParameters + * @param targetParameters + * @param diagnosticTarget + * @param relationCache + */ + function areParametersAssignable( + sourceParameters: readonly MixedFunctionParameter[], + targetParameters: readonly MixedFunctionParameter[], + diagnosticTarget: Entity | Node, + relationCache: MultiKeyMap<[Entity, Entity], Related>, + ): [Related, readonly TypeRelationError[]] { + const queue = sourceParameters.slice(); + const errors: TypeRelationError[] = []; + + for (const targetParam of targetParameters) { + if (targetParam.rest) { + // Target is a rest parameter, so all remaining source parameters must be assignable to the rest parameter type. + const restElementType = getArrayElementType(targetParam.type); + + for (const sourceParam of queue) { + if (sourceParam.rest) { + // Source is also a rest parameter, so its element type must be assignable to the target rest element type. + const sourceRestElementType = getArrayElementType(sourceParam.type); + + const [assignable, innerErrors] = isTypeAssignableToInternal( + sourceRestElementType, + restElementType, + diagnosticTarget, + relationCache, + ); + + // Assignability check can terminate here, since nothing can follow a rest parameter. + return assignable === Related.true + ? [Related.true, []] + : [Related.false, [...errors, ...innerErrors]]; + } else { + const [assignable, innerErrors] = isTypeAssignableToInternal( + sourceParam.type, + restElementType, + diagnosticTarget, + relationCache, + ); + + if (!assignable) { + errors.push(...innerErrors); + } + } + } + + // Assignability check can again terminate here, because the target parameter was a rest parameter and we have drained + // both source and target parameters. + return errors.length === 0 ? [Related.true, []] : [Related.false, errors]; + } else { + // Target is not a rest parameter. + const nextSourceParam = queue.shift(); + + if (!nextSourceParam) { + if (!targetParam.optional) { + // No more source params, but target param is required. + errors.push( + createTypeRelationError({ + code: "parameter-required", + messageId: "missing", + format: { + paramName: targetParam.name, + }, + diagnosticTarget, + }), + ); + } + } else { + if (nextSourceParam.rest) { + if (!targetParam.optional) { + // Rest parameters are effectively optional for satisfying non-rest target parameters, so this is an error. + errors.push( + createTypeRelationError({ + code: "parameter-required", + messageId: "rest-to-required", + format: { + paramName: nextSourceParam.name, + }, + diagnosticTarget, + }), + ); + } + // Source is a rest parameter, so its element type must be assignable to the target parameter type. + const sourceRestElementType = getArrayElementType(nextSourceParam.type); + const [assignable, innerErrors] = isTypeAssignableToInternal( + sourceRestElementType, + targetParam.type, + diagnosticTarget, + relationCache, + ); + + if (!assignable) { + errors.push(...innerErrors); + } + + queue.unshift(nextSourceParam); // Put it back since it can be used for subsequent target parameters as well. + } else { + if (nextSourceParam.optional && !targetParam.optional) { + // Source parameter is optional and cannot satisfy required target parameter. + errors.push( + createTypeRelationError({ + code: "parameter-required", + format: { + paramName: nextSourceParam.name, + }, + diagnosticTarget, + }), + ); + } + + // Source is a normal parameter + const [assignable, innerErrors] = isTypeAssignableToInternal( + nextSourceParam.type, + targetParam.type, + diagnosticTarget, + relationCache, + ); + + if (!assignable) { + errors.push(...innerErrors); + } + } + } + } + } + + return errors.length === 0 ? [Related.true, []] : [Related.false, errors]; + + function getArrayElementType(constraint: MixedParameterConstraint): MixedParameterConstraint { + // There are two cases: + // - constraint has `type` only: there's only a type constraint + // - constraint has `valueType` only: there's only a value constraint + + compilerAssert( + (constraint.type || constraint.valueType) && (!constraint.type || !constraint.valueType), + "Mixed parameter rest constraint cannot have both type and value constraints.", + ); + + if (constraint.type) { + compilerAssert( + constraint.type.kind === "Model" && isArrayModelType(constraint.type), + "Expected rest parameter type constraint to be an array type.", + ); + return { + entityKind: "MixedParameterConstraint", + node: constraint.node, + type: constraint.type.indexer.value, + }; + } else { + compilerAssert( + constraint.valueType && + constraint.valueType.kind === "Model" && + isArrayModelType(constraint.valueType), + "Mixed parameter rest constraint must have either type or value constraint.", + ); + + return { + entityKind: "MixedParameterConstraint", + node: constraint.node, + valueType: constraint.valueType.indexer.value, + }; + } + } + } + function isNumericLiteralRelatedTo(source: NumericLiteral, target: Scalar) { // First check that the source numeric literal is assignable to the target scalar if (!isNumericAssignableToNumericScalar(source.numericValue, target)) { @@ -698,10 +919,11 @@ export function createTypeRelationChecker(program: Program, checker: Checker): T } } - return [ - errors.length === 0 ? Related.true : Related.false, - wrapUnassignableErrors(source, target, errors), - ]; + if (errors.length === 0) { + return [Related.true, []]; + } else { + return [Related.false, wrapUnassignableErrors(source, target, errors)]; + } } /** If we should check for excess properties on the given model. */ @@ -911,10 +1133,14 @@ export function createTypeRelationChecker(program: Program, checker: Checker): T } // #region Helpers -interface TypeRelationeErrorInit { +interface TypeRelationErrorInit< + C extends TypeRelationError["code"], + M extends keyof CompilerDiagnostics[C], +> { code: C; + messageId?: M; diagnosticTarget: Entity | Node; - format: DiagnosticReport["format"]; + format: DiagnosticReport["format"]; details?: string; skipIfFirst?: boolean; } @@ -943,15 +1169,20 @@ function wrapUnassignablePropertyErrors( error.children = errors; return [error]; } -function createTypeRelationError({ +function createTypeRelationError< + const C extends TypeRelationError["code"], + M extends keyof CompilerDiagnostics[C] = "default", +>({ code, + messageId, format, details, diagnosticTarget, skipIfFirst, -}: TypeRelationeErrorInit): TypeRelationError { +}: TypeRelationErrorInit): TypeRelationError { const diag = createDiagnostic({ code: code as any, + messageId, format: format, target: NoTarget, }); diff --git a/packages/compiler/src/core/types.ts b/packages/compiler/src/core/types.ts index 94d439ff56c..29560bd3609 100644 --- a/packages/compiler/src/core/types.ts +++ b/packages/compiler/src/core/types.ts @@ -54,7 +54,7 @@ export interface DecoratorApplication { */ export interface DecoratorFunction { ( - program: DecoratorContext, + context: DecoratorContext, target: any, ...customArgs: any[] ): DecoratorValidatorCallbacks | void; @@ -137,6 +137,7 @@ export type Entity = Type | Value | MixedParameterConstraint | IndeterminateEnti export type Type = | BooleanLiteral | Decorator + | FunctionType | Enum | EnumMember | FunctionParameter @@ -347,7 +348,8 @@ export type Value = | ObjectValue | ArrayValue | EnumValue - | NullValue; + | NullValue + | FunctionValue; /** @internal */ export type ValueWithTemplate = Value | TemplateValue; @@ -603,6 +605,13 @@ export interface Namespace extends BaseType, DecoratedType { * Order is implementation-defined and may change. */ decoratorDeclarations: Map; + + /** + * The functions declared in the namespace. + * + * Order is implementation-defined and may change. + */ + functionDeclarations: Map; } export type LiteralType = StringLiteral | NumericLiteral | BooleanLiteral; @@ -711,27 +720,121 @@ export interface Decorator extends BaseType { namespace: Namespace; target: MixedFunctionParameter; parameters: MixedFunctionParameter[]; - implementation: (...args: unknown[]) => void; + implementation: (ctx: DecoratorContext, target: Type, ...args: unknown[]) => void; +} + +/** + * The type of a Function in TypeSpec. + */ +export interface FunctionType extends BaseType { + kind: "FunctionType"; + + /** + * The parameter constraints of the function. + */ + parameters: MixedFunctionParameter[]; + + /** + * The return type constraint of the function. + */ + returnType: MixedParameterConstraint; +} + +/** + * A function (`fn`) declared in the TypeSpec program. + * + * By default, function values have very restrictive types, where the parameters have type `never`, and the return type is `unknown`. + * + * To call a function, you must assert the type of the parameters. For example, if you have a `FunctionValue` that represents + * the following TypeSpec function: + * + * ```tsp + * extern fn example(a: valueof string, b: valueof int32): valueof boolean; + * ``` + * + * You can assert the parameter types in TypeScript like this: + * + * ```ts + * const exampleFn: FunctionValue = ...; // however you obtain a reference to the function value, it will be strictly typed. + * + * const assertedExampleFn = exampleFn as FunctionValue<[a: string, b: number], boolean>; + * + * // Now you can call assertedExampleFn with the correct types: + * ctx.callFunction(assertedExampleFn.implementation, "hello", 10); + * ``` + */ +export interface FunctionValue< + Parameters extends unknown[] = never[], + ReturnType = unknown, +> extends BaseValue { + valueKind: "Function"; + node?: FunctionDeclarationStatementNode; + /** + * The function's name as declared in the TypeSpec source, if any. + */ + name?: string; + /** + * The namespace in which this function was declared, if any. + */ + namespace?: Namespace; + /** + * The parameters of the function. + */ + parameters: MixedFunctionParameter[]; + /** + * The return type constraint of the function. + */ + returnType: MixedParameterConstraint; + /** + * The JavaScript implementation of the function. + * + * WARNING: Calling the implementation function directly is dangerous. It assumes that you have marshaled the arguments + * to JS values correctly and that you will handle the return value appropriately. Constructing the correct context + * is your responsibility (use the `call` methods of `FunctionContext` or `DecoratorContext` to create the context for you). + * + * @param ctx - The FunctionContext providing information about the call site. + * @param args - The arguments passed to the function. + * @returns The return value of the function, which is arbitrary. + */ + implementation: (ctx: FunctionContext, ...args: Parameters) => ReturnType; } export interface FunctionParameterBase extends BaseType { kind: "FunctionParameter"; node?: FunctionParameterNode; + /** + * The name of this function parameter, as declared in the TypeSpec source. + */ name: string; + /** + * Whether this parameter is optional. + */ optional: boolean; + /** + * Whether this parameter is a rest parameter (i.e., `...args`). + */ rest: boolean; } -/** Represent a function parameter that could accept types or values in the TypeSpec program. */ +/** + * A function parameter with a mixed parameter constraint that could accept a value. + */ export interface MixedFunctionParameter extends FunctionParameterBase { mixed: true; type: MixedParameterConstraint; } -/** Represent a function parameter that represent the parameter signature(i.e the type would be the type of the value passed) */ + +/** + * A function parameter with a simple type constraint. + */ export interface SignatureFunctionParameter extends FunctionParameterBase { mixed: false; type: Type; } + +/** + * A function parameter. + */ export type FunctionParameter = MixedFunctionParameter | SignatureFunctionParameter; export interface Sym { @@ -962,6 +1065,11 @@ export const enum SymbolFlags { */ LateBound = 1 << 22, + /** + * An internal symbol that can only be referenced from a source file in the same package. + */ + Internal = 1 << 23, + ExportContainer = Namespace | SourceFile, /** * Symbols whose members will be late bound (and stored on the type) @@ -1066,6 +1174,8 @@ export enum SyntaxKind { ConstStatement, CallExpression, ScalarConstructor, + InternalKeyword, + FunctionTypeExpression, } export const enum NodeFlags { @@ -1246,8 +1356,9 @@ export interface ParseOptions { readonly docs?: boolean; } -export interface TypeSpecScriptNode extends DeclarationNode, BaseNode { +export interface TypeSpecScriptNode extends BaseNode { readonly kind: SyntaxKind.TypeSpecScript; + readonly id: IdentifierNode; readonly statements: readonly Statement[]; readonly file: SourceFile; readonly inScopeNamespaces: readonly NamespaceStatementNode[]; // namespaces that declarations in this file belong to @@ -1280,22 +1391,23 @@ export type Statement = | InvalidStatementNode; export interface DeclarationNode { + /** + * Identifier that this node declares. + */ readonly id: IdentifierNode; + + /** + * Modifier nodes applied to this declaration. + */ + readonly modifiers: Modifier[]; + + /** + * Combined modifier flags for this declaration. + */ + readonly modifierFlags: ModifierFlags; } -export type Declaration = - | ModelStatementNode - | ScalarStatementNode - | InterfaceStatementNode - | UnionStatementNode - | NamespaceStatementNode - | OperationStatementNode - | TemplateParameterDeclarationNode - | EnumStatementNode - | AliasStatementNode - | ConstStatementNode - | DecoratorDeclarationStatementNode - | FunctionDeclarationStatementNode; +export type Declaration = Extract; export type ScopeNode = | NamespaceStatementNode @@ -1357,7 +1469,10 @@ export type Expression = | StringTemplateExpressionNode | VoidKeywordNode | NeverKeywordNode - | AnyKeywordNode; + | AnyKeywordNode + | FunctionTypeExpressionNode; + +export type ParenthesizedExpression = Expression & { readonly parenthesized: true }; export type ReferenceExpression = | TypeReferenceNode @@ -1622,6 +1737,10 @@ export interface ExternKeywordNode extends BaseNode { readonly kind: SyntaxKind.ExternKeyword; } +export interface InternalKeywordNode extends BaseNode { + readonly kind: SyntaxKind.InternalKeyword; +} + export interface VoidKeywordNode extends BaseNode { readonly kind: SyntaxKind.VoidKeyword; } @@ -1666,19 +1785,23 @@ export interface TemplateArgumentNode extends BaseNode { readonly argument: Expression; } -export interface TemplateParameterDeclarationNode extends DeclarationNode, BaseNode { +export interface TemplateParameterDeclarationNode extends BaseNode { readonly kind: SyntaxKind.TemplateParameterDeclaration; readonly constraint?: Expression; readonly default?: Expression; readonly parent?: TemplateableNode; + readonly id: IdentifierNode; } export const enum ModifierFlags { None, Extern = 1 << 1, + Internal = 1 << 2, + + All = Extern | Internal, } -export type Modifier = ExternKeywordNode; +export type Modifier = ExternKeywordNode | InternalKeywordNode; /** * Represent a decorator declaration @@ -1689,8 +1812,6 @@ export type Modifier = ExternKeywordNode; */ export interface DecoratorDeclarationStatementNode extends BaseNode, DeclarationNode { readonly kind: SyntaxKind.DecoratorDeclarationStatement; - readonly modifiers: readonly Modifier[]; - readonly modifierFlags: ModifierFlags; /** * Decorator target. First parameter. */ @@ -1720,21 +1841,34 @@ export interface FunctionParameterNode extends BaseNode { } /** - * Represent a function declaration + * The syntax representing a function value declaration. + * * @example * ```typespec - * extern fn camelCase(value: StringLiteral): StringLiteral; + * extern fn camelCase(value: valueof string): valueof string; * ``` */ export interface FunctionDeclarationStatementNode extends BaseNode, DeclarationNode { readonly kind: SyntaxKind.FunctionDeclarationStatement; - readonly modifiers: readonly Modifier[]; - readonly modifierFlags: ModifierFlags; readonly parameters: FunctionParameterNode[]; readonly returnType?: Expression; readonly parent?: TypeSpecScriptNode | NamespaceStatementNode; } +/** + * The syntax representing a function type expression. + * + * @example + * ```typespec + * fn(value: valueof string) => valueof string + * ``` + */ +export interface FunctionTypeExpressionNode extends BaseNode { + readonly kind: SyntaxKind.FunctionTypeExpression; + readonly parameters: FunctionParameterNode[]; + readonly returnType?: Expression; +} + export interface IdentifierContext { kind: IdentifierKind; node: Node; @@ -2164,9 +2298,18 @@ type ListenerForType = T extends Type export type TypeListeners = UnionToIntersection>; +type ValueListener = (context: V) => ListenerFlow | undefined | void; +type exitValueListener = T extends string ? `exit${T}` : T; +type ListenerForValue = V extends Value + ? { [k in Uncapitalize | exitValueListener]?: ValueListener } + : never; + +export type ValueListeners = UnionToIntersection>; + export type SemanticNodeListener = { root?: (context: Program) => void | undefined; -} & TypeListeners; +} & TypeListeners & + ValueListeners; export type DiagnosticReportWithoutTarget< T extends { [code: string]: DiagnosticMessages }, @@ -2336,6 +2479,12 @@ export interface DecoratorImplementations { }; } +export interface FunctionImplementations { + readonly [namespace: string]: { + readonly [name: string]: (ctx: FunctionContext, ...parameters: never[]) => unknown; + }; +} + export interface PackageFlags {} export interface LinterDefinition { @@ -2481,27 +2630,72 @@ export interface TypeSpecLibrary< */ export type EmitOptionsFor = C extends TypeSpecLibrary ? E : never; -export interface DecoratorContext { +/** + * Base context passed to JavaScript implementations of invocable constructs (decorators, functions). + */ +export interface InvocationContext { + /** + * The current TypeSpec Program. + */ program: Program; /** - * Point to the decorator target + * Helper to get the target for a given argument index. + * + * @param argIndex Argument index in the decorator call. + * @example + * ```tsp + * @dec("hello", 123) + * model MyModel { } + * ``` + * - `getArgumentTarget(0)` -> target for "hello" + * - `getArgumentTarget(1)` -> target for 123 + */ + getArgumentTarget(argIndex: number): DiagnosticTarget | undefined; + + /** + * Helper to call a decorator implementation from within another decorator implementation. + * + * @param decorator The decorator function to call. + * @param target The target to which the decorator is applied. + * @param args Arguments to pass to the decorator. */ - decoratorTarget: DiagnosticTarget; + callDecorator( + decorator: (context: DecoratorContext, target: T, ...args: A) => R, + target: T, + ...args: A + ): R; /** - * Function that can be used to retrieve the target for a parameter at the given index. - * @param paramIndex Parameter index in the typespec - * @example @foo("bar", 123) -> $foo(context, target, arg0: string, arg1: number); - * getArgumentTarget(0) -> target for arg0 - * getArgumentTarget(1) -> target for arg1 + * Helper to call a function implementation from within a decorator implementation. + * @param func The function implementation to call. + * @param args Arguments to pass to the function. */ - getArgumentTarget(paramIndex: number): DiagnosticTarget | undefined; + callFunction( + func: (context: FunctionContext, ...args: A) => R, + ...args: A + ): R; +} + +/** + * Context passed to decorator implementations. + */ +export interface DecoratorContext extends InvocationContext { + program: Program; /** - * Helper to call out to another decorator - * @param decorator Other decorator function - * @param args Args to pass to other decorator function + * The diagnostic target for the decorator application. + */ + decoratorTarget: DiagnosticTarget; + + /** + * Helper to call a decorator implementation from within another decorator implementation. + * + * This function is identical to `callDecorator`. + * + * @param decorator The decorator function to call. + * @param target The target to which the decorator is applied. + * @param args Arguments to pass to the decorator. */ call( decorator: (context: DecoratorContext, target: T, ...args: A) => R, @@ -2510,6 +2704,16 @@ export interface DecoratorContext { ): R; } +/** + * Context passed to function implementations. + */ +export interface FunctionContext extends InvocationContext { + /** + * The function call diagnostic target. + */ + functionCallTarget: DiagnosticTarget; +} + export interface EmitContext> { /** * TypeSpec Program. @@ -2525,6 +2729,55 @@ export interface EmitContext> { * Emitter custom options defined in createTypeSpecLibrary */ options: TOptions; + + /** + * Performance measurement utilities. + * Use this to report performance of areas of your emitter. + * The information will be displayed when the compiler is run with `--stats` flag. + */ + readonly perf: PerfReporter; +} + +export interface Timer { + end: () => number; +} + +export interface PerfReporter { + /** + * Start timer for the given label. + * + * @example + * ```ts + * const timer = emitContext.perf.startTimer("my-emitter-task"); + * // ... do work + * const elapsed = timer.end(); // my-emitter-task automatically reported to the compiler + * ``` + */ + startTimer(label: string): Timer; + /** Report a sync function elapsed time. */ + time(label: string, callback: () => T): T; + /** Report an async function elapsed time. */ + timeAsync(label: string, callback: () => Promise): Promise; + + /** + * Report a custom elapsed time for the given label. + * Can be used with {@link import("./perf.js").perf} + * @example + * ```ts + * import { perf } from "@typespec/compiler"; + * + * // somewhere in your emitter + * const start = perf.now(); + * await doSomething(); + * const end = perf.now(); + * + * emitContext.perf.report("doSomething", end - start); + * ``` + */ + report(label: string, milliseconds: number): void; + + /** @internal */ + readonly measures: Readonly>; } export type LogLevel = "trace" | "warning" | "error"; diff --git a/packages/compiler/src/experimental/mutators.ts b/packages/compiler/src/experimental/mutators.ts index 22df6a58db5..4e11c8dc48d 100644 --- a/packages/compiler/src/experimental/mutators.ts +++ b/packages/compiler/src/experimental/mutators.ts @@ -421,11 +421,11 @@ function createMutatorEngine( continue; } - let mutationFn: MutatorFn | null = null; + let mutationFn: MutatorFn | null; let replaceFn: MutatorReplaceFn | null = null; - let mutate = false; - let recurse = false; + let mutate; + let recurse; if (typeof record === "function") { mutationFn = record; diff --git a/packages/compiler/src/experimental/typekit/index.ts b/packages/compiler/src/experimental/typekit/index.ts index 32408209095..6fd78063a05 100644 --- a/packages/compiler/src/experimental/typekit/index.ts +++ b/packages/compiler/src/experimental/typekit/index.ts @@ -1,4 +1,4 @@ -import { type Typekit, TypekitPrototype } from "../../typekit/define-kit.js"; +import { TypekitPrototype, type Typekit } from "../../typekit/define-kit.js"; import { Realm } from "../realm.js"; /** diff --git a/packages/compiler/src/formatter/print/printer.ts b/packages/compiler/src/formatter/print/printer.ts index fe9834ce1c4..5ceb7b70abc 100644 --- a/packages/compiler/src/formatter/print/printer.ts +++ b/packages/compiler/src/formatter/print/printer.ts @@ -15,6 +15,7 @@ import { CallExpressionNode, Comment, ConstStatementNode, + DeclarationNode, DecoratorDeclarationStatementNode, DecoratorExpressionNode, DirectiveExpressionNode, @@ -24,6 +25,7 @@ import { EnumStatementNode, FunctionDeclarationStatementNode, FunctionParameterNode, + FunctionTypeExpressionNode, IdentifierNode, InterfaceStatementNode, IntersectionExpressionNode, @@ -241,6 +243,12 @@ export function printNode( options, print, ); + case SyntaxKind.FunctionTypeExpression: + return printFunctionTypeExpression( + path as AstPath, + options, + print, + ); case SyntaxKind.FunctionParameter: return printFunctionParameterDeclaration( path as AstPath, @@ -249,6 +257,8 @@ export function printNode( ); case SyntaxKind.ExternKeyword: return "extern"; + case SyntaxKind.InternalKeyword: + return "internal"; case SyntaxKind.VoidKeyword: return "void"; case SyntaxKind.NeverKeyword: @@ -333,7 +343,15 @@ export function printAliasStatement( ) { const id = path.call(print, "id"); const template = printTemplateParameters(path, options, print, "templateParameters"); - return ["alias ", id, template, " = ", path.call(print, "value"), ";"]; + return [ + printModifiers(path, options, print), + "alias ", + id, + template, + " = ", + path.call(print, "value"), + ";", + ]; } export function printConstStatement( @@ -344,7 +362,15 @@ export function printConstStatement( const node = path.node; const id = path.call(print, "id"); const type = node.type ? [": ", path.call(print, "type")] : ""; - return ["const ", id, type, " = ", path.call(print, "value"), ";"]; + return [ + printModifiers(path, options, print), + "const ", + id, + type, + " = ", + path.call(print, "value"), + ";", + ]; } export function printCallExpression( @@ -661,7 +687,14 @@ export function printEnumStatement( ) { const { decorators } = printDecorators(path, options, print, { tryInline: false }); const id = path.call(print, "id"); - return [decorators, "enum ", id, " ", printEnumBlock(path, options, print)]; + return [ + decorators, + printModifiers(path, options, print), + "enum ", + id, + " ", + printEnumBlock(path, options, print), + ]; } function printEnumBlock( @@ -708,7 +741,15 @@ export function printUnionStatement( const id = path.call(print, "id"); const { decorators } = printDecorators(path, options, print, { tryInline: false }); const generic = printTemplateParameters(path, options, print, "templateParameters"); - return [decorators, "union ", id, generic, " ", printUnionVariantsBlock(path, options, print)]; + return [ + decorators, + printModifiers(path, options, print), + "union ", + id, + generic, + " ", + printUnionVariantsBlock(path, options, print), + ]; } export function printUnionVariantsBlock( @@ -750,6 +791,7 @@ export function printInterfaceStatement( return [ decorators, + printModifiers(path, options, print), "interface ", id, generic, @@ -1011,6 +1053,7 @@ export function printModelStatement( const body = shouldPrintBody ? [" ", printModelPropertiesBlock(path, options, print)] : ";"; return [ printDecorators(path, options, print, { tryInline: false }).decorators, + printModifiers(path, options, print), "model ", id, generic, @@ -1199,6 +1242,7 @@ function printScalarStatement( const members = shouldPrintBody ? [" ", printScalarBody(path, options, print)] : ";"; return [ printDecorators(path, options, print, { tryInline: false }).decorators, + printModifiers(path, options, print), "scalar ", id, template, @@ -1296,6 +1340,7 @@ export function printOperationStatement( return [ decorators, + printModifiers(path, options, print), inInterface ? "" : "op ", path.call(print, "id"), templateParams, @@ -1483,6 +1528,27 @@ function printFunctionDeclarationStatement( return [printModifiers(path, options, print), "fn ", id, "(", parameters, ")", returnType, ";"]; } +function printFunctionTypeExpression( + path: AstPath, + options: TypeSpecPrettierOptions, + print: PrettierChildPrint, +): Doc { + const node = path.node; + const parameters = [ + group([ + indent( + join( + ", ", + path.map((arg) => [softline, print(arg)], "parameters"), + ), + ), + softline, + ]), + ]; + const returnType = node.returnType ? [" => ", path.call(print, "returnType")] : ""; + return ["fn", "(", parameters, ")", returnType]; +} + function printFunctionParameterDeclaration( path: AstPath, options: TypeSpecPrettierOptions, @@ -1503,12 +1569,12 @@ function printFunctionParameterDeclaration( } export function printModifiers( - path: AstPath, + path: AstPath, options: TypeSpecPrettierOptions, print: PrettierChildPrint, ): Doc { const node = path.node; - if (node.modifiers.length === 0) { + if (node.modifiers === undefined || node.modifiers.length === 0) { return ""; } diff --git a/packages/compiler/src/index.ts b/packages/compiler/src/index.ts index 301336ab3a3..99122b7b8d0 100644 --- a/packages/compiler/src/index.ts +++ b/packages/compiler/src/index.ts @@ -191,6 +191,7 @@ export { serializeValueAsJson, Service, ServiceDetails, + setMediaTypeHint, VisibilityProvider, type BytesKnownEncoding, type DateTimeKnownEncoding, @@ -200,6 +201,7 @@ export { type ExampleOptions, type OpExample, } from "./lib/decorators.js"; +export { UnserializableValueError, UnsupportedScalarConstructorError } from "./lib/examples.js"; export { MANIFEST, type TypeSpecManifest } from "./manifest.js"; export { resolveModule, @@ -231,7 +233,7 @@ export { export type { PackageJson } from "./types/package-json.js"; import { $decorators as intrinsicDecorators } from "./lib/intrinsic/tsp-index.js"; -import { $decorators as stdDecorators } from "./lib/tsp-index.js"; +import { $decorators as stdDecorators, $functions as stdFunctions } from "./lib/tsp-index.js"; /** @internal for Typespec compiler */ export const $decorators = { TypeSpec: { @@ -242,7 +244,14 @@ export const $decorators = { }, }; -export { applyCodeFix, applyCodeFixes } from "./core/code-fixes.js"; +/** @internal for Typespec compiler */ +export const $functions = { + TypeSpec: { + ...stdFunctions.TypeSpec, + }, +}; + +export { applyCodeFix, applyCodeFixes, resolveCodeFix } from "./core/code-fixes.js"; export { createAddDecoratorCodeFix } from "./core/compiler-code-fixes/create-add-decorator/create-add-decorator.codefix.js"; export { createSuppressCodeFix, @@ -355,8 +364,10 @@ export type { Expression, FileLibraryMetadata, FilePos, + FunctionContext, FunctionParameter, FunctionParameterBase, + FunctionValue, IdentifierContext, IdentifierKind, IndeterminateEntity, diff --git a/packages/compiler/src/lib/decorators.ts b/packages/compiler/src/lib/decorators.ts index 4ab03e7a673..3290a9dec74 100644 --- a/packages/compiler/src/lib/decorators.ts +++ b/packages/compiler/src/lib/decorators.ts @@ -435,7 +435,7 @@ export function isErrorModel(program: Program, target: Type): boolean { // -- @mediaTypeHint decorator -------------- -const [_getMediaTypeHint, setMediaTypeHint] = useStateMap( +const [_getMediaTypeHint, _setMediaTypeHint] = useStateMap( createStateSymbol("mediaTypeHint"), ); @@ -461,9 +461,40 @@ export const $mediaTypeHint: MediaTypeHintDecorator = ( }); } - setMediaTypeHint(context.program, target, mediaType); + _setMediaTypeHint(context.program, target, mediaType); }; +/** + * Sets the default media type hint for the given target type. + * + * This value is a hint _ONLY_. Emitters are not required to use it, but may use it to get the default media type + * associated with a TypeSpec type. + * + * If a type already has a default media type hint set, this function will override it with the new value. + * + * WARNING: this function _will throw an error_ if the provided media type string is not recognized as a valid + * MIME type. + * + * @param program - the Program containing the target + * @param target - the target to set the MIME type hint for + * @param mediaType - the default media type hint to set for the target + * @throws if the provided media type string is not recognized as a valid MIME type + */ +export function setMediaTypeHint( + program: Program, + target: MediaTypeHintable, + mediaType: string, +): void { + const mimeTypeObj = parseMimeType(mediaType); + + compilerAssert( + mimeTypeObj !== undefined, + `Invalid MIME type '${mediaType}' provided to setMediaTypeHint`, + ); + + _setMediaTypeHint(program, target, mediaType); +} + /** * Get the default media type hint for the given target type. * @@ -1216,9 +1247,18 @@ export const $overload: OverloadDecorator = ( }; function areOperationsInSameContainer(op1: Operation, op2: Operation): boolean { - return op1.interface || op2.interface - ? op1.interface === op2.interface - : op1.namespace === op2.namespace; + if (op1.interface || op2.interface) { + return ( + op1.interface === op2.interface || + // Handle mutated/cloned types (e.g., in versioned namespaces) where operations + // may reference different clones of the same interface by comparing AST nodes. + (op1.interface?.node !== undefined && op1.interface?.node === op2.interface?.node) + ); + } + return ( + op1.namespace === op2.namespace || + (op1.namespace?.node !== undefined && op1.namespace?.node === op2.namespace?.node) + ); } export { diff --git a/packages/compiler/src/lib/examples.ts b/packages/compiler/src/lib/examples.ts index 8f6f907fe9e..90d61d0b278 100644 --- a/packages/compiler/src/lib/examples.ts +++ b/packages/compiler/src/lib/examples.ts @@ -4,6 +4,8 @@ import type { Program } from "../core/program.js"; import { getProperty } from "../core/semantic-walker.js"; import { isArrayModelType, isUnknownType } from "../core/type-utils.js"; import { + DiagnosticTarget, + NoTarget, type ObjectValue, type Scalar, type ScalarValue, @@ -12,10 +14,20 @@ import { } from "../core/types.js"; import { getEncode, resolveEncodedName, type EncodeData } from "./decorators.js"; +/** + * Error thrown when a value cannot be serialized. + */ +export class UnserializableValueError extends Error { + constructor(public readonly reason: string = "Cannot serialize value as JSON.") { + super(reason); + this.name = "UnserializableValueError"; + } +} + /** * Error thrown when a scalar value cannot be serialized because it uses an unsupported constructor. */ -export class UnsupportedScalarConstructorError extends Error { +export class UnsupportedScalarConstructorError extends UnserializableValueError { constructor( public readonly scalarName: string, public readonly constructorName: string, @@ -54,6 +66,7 @@ export function serializeValueAsJson( type: Type, encodeAs?: EncodeData, handlers?: ValueJsonSerializers, + diagnosticTarget?: DiagnosticTarget | typeof NoTarget, ): unknown { if (type.kind === "ModelProperty") { return serializeValueAsJson( @@ -62,6 +75,7 @@ export function serializeValueAsJson( type.type, encodeAs ?? getEncode(program, type), handlers, + diagnosticTarget, ); } switch (value.valueKind) { @@ -82,12 +96,17 @@ export function serializeValueAsJson( type.kind === "Model" && isArrayModelType(type) ? type.indexer.value : program.checker.anyType, + /* encodeAs: */ undefined, + handlers, + diagnosticTarget, ), ); case "ObjectValue": - return serializeObjectValueAsJson(program, value, type); + return serializeObjectValueAsJson(program, value, type, handlers, diagnosticTarget); case "ScalarValue": return serializeScalarValueAsJson(program, value, type, encodeAs, handlers); + case "Function": + throw new UnserializableValueError("Cannot serialize a function value as JSON."); } } @@ -135,6 +154,8 @@ function serializeObjectValueAsJson( program: Program, value: ObjectValue, type: Type, + handlers?: ValueJsonSerializers, + diagnosticTarget?: DiagnosticTarget | typeof NoTarget, ): Record { type = resolveUnions(program, value, type) ?? type; const obj: Record = {}; @@ -145,7 +166,14 @@ function serializeObjectValueAsJson( definition.kind === "ModelProperty" ? resolveEncodedName(program, definition, "application/json") : propValue.name; - obj[name] = serializeValueAsJson(program, propValue.value, definition); + obj[name] = serializeValueAsJson( + program, + propValue.value, + definition, + /* encodeAs: */ undefined, + handlers, + propValue.node, + ); } } return obj; @@ -201,7 +229,7 @@ function serializeScalarValueAsJson( const result = resolveKnownScalar(program, value.scalar); if (result === undefined) { - return serializeValueAsJson(program, value.value.args[0], value.value.args[0].type); + return undefined; } encodeAs = encodeAs ?? result.encodeAs; diff --git a/packages/compiler/src/lib/paging.ts b/packages/compiler/src/lib/paging.ts index 54147351f07..bcca28def3c 100644 --- a/packages/compiler/src/lib/paging.ts +++ b/packages/compiler/src/lib/paging.ts @@ -26,7 +26,7 @@ import type { } from "../core/types.js"; import { createStateSymbol } from "../lib/utils.js"; import { DuplicateTracker, useStateSet } from "../utils/index.js"; -import { isNumericType, isStringType } from "./decorators.js"; +import { isNumericType } from "./decorators.js"; export const [ /** @@ -109,18 +109,7 @@ export const [ markContinuationTokenProperty, /** {@inheritdoc ContinuationTokenDecorator} */ continuationTokenDecorator, -] = createMarkerDecorator("continuationToken", (context, target) => { - if (!isStringType(context.program, target.type)) { - reportDiagnostic(context.program, { - code: "decorator-wrong-target", - messageId: "withExpected", - format: { decorator: "continuationToken", expected: "string", to: getTypeName(target.type) }, - target: context.decoratorTarget, - }); - return false; - } - return true; -}); +] = createMarkerDecorator("continuationToken"); export const [ /** diff --git a/packages/compiler/src/lib/tsp-index.ts b/packages/compiler/src/lib/tsp-index.ts index df7645e8335..255dc9793b1 100644 --- a/packages/compiler/src/lib/tsp-index.ts +++ b/packages/compiler/src/lib/tsp-index.ts @@ -1,4 +1,4 @@ -import { TypeSpecDecorators } from "../../generated-defs/TypeSpec.js"; +import { TypeSpecDecorators, TypeSpecFunctions } from "../../generated-defs/TypeSpec.js"; import { $discriminator, $doc, @@ -59,8 +59,18 @@ import { $withUpdateableProperties, $withVisibility, $withVisibilityFilter, + applyLifecycleUpdate, + applyVisibilityFilter, } from "./visibility.js"; +/** @internal */ +export const $functions = { + TypeSpec: { + applyVisibilityFilter, + applyLifecycleUpdate, + } satisfies TypeSpecFunctions, +}; + /** @internal */ export const $decorators = { TypeSpec: { diff --git a/packages/compiler/src/lib/visibility.ts b/packages/compiler/src/lib/visibility.ts index 1456e6402ae..dd8965ab487 100644 --- a/packages/compiler/src/lib/visibility.ts +++ b/packages/compiler/src/lib/visibility.ts @@ -405,12 +405,13 @@ interface VisibilityFilterMutatorCacheByNameTemplate { lifecycleUpdate?: Mutator; } -export const $withVisibilityFilter: WithVisibilityFilterDecorator = ( - context: DecoratorContext, - target: Model, +/** @internal */ +export function applyVisibilityFilter( + context: { program: Program }, + input: Model, _filter: GeneratedVisibilityFilter, nameTemplate?: string, -) => { +): Model { const filter = VisibilityFilter.fromDecoratorArgument(_filter); const mutatorCache = ((context.program as VisibilityFilterMutatorCache)[ @@ -436,27 +437,45 @@ export const $withVisibilityFilter: WithVisibilityFilterDecorator = ( if (!mutator) { mutator = createVisibilityFilterMutator(filter, { decoratorFn: $withVisibilityFilter, + decoratorName: "@withVisibilityFilter", nameTemplate, }); mutatorCacheByVisibilityFilter.set(vfKey, mutator); } - setAlwaysMutate(context.program, target); + setAlwaysMutate(context.program, input); - const { type } = cachedMutateSubgraph(context.program, mutator, target); + const { type } = cachedMutateSubgraph(context.program, mutator, input); - setAlwaysMutate(context.program, target, false); + setAlwaysMutate(context.program, input, false); - target.properties = (type as Model).properties; -}; + compilerAssert( + type.kind === "Model", + "Expected visibility filter mutator to return a Model type.", + ); -// -- @withLifecycleUpdate decorator ---------------------- + return type; +} -export const $withLifecycleUpdate: WithLifecycleUpdateDecorator = ( +export const $withVisibilityFilter: WithVisibilityFilterDecorator = ( context: DecoratorContext, target: Model, + _filter: GeneratedVisibilityFilter, nameTemplate?: string, ) => { + const transformed = applyVisibilityFilter(context, target, _filter, nameTemplate); + + target.properties = transformed.properties; +}; + +// -- @withLifecycleUpdate decorator ---------------------- + +/** @internal */ +export function applyLifecycleUpdate( + context: { program: Program }, + input: Model, + nameTemplate?: string, +): Model { const mutatorCache = ((context.program as VisibilityFilterMutatorCache)[ VISIBILITY_FILTER_MUTATOR_CACHE ] ??= {}); @@ -487,19 +506,35 @@ export const $withLifecycleUpdate: WithLifecycleUpdateDecorator = ( mutator = createVisibilityFilterMutator(lifecycleUpdate, { recur: createOrUpdateMutator, decoratorFn: $withLifecycleUpdate, + decoratorName: "@withLifecycleUpdate", nameTemplate, }); mutatorCacheByNameTemplate.lifecycleUpdate = mutator; } - setAlwaysMutate(context.program, target); + setAlwaysMutate(context.program, input); - const { type } = cachedMutateSubgraph(context.program, mutator, target); + const { type } = cachedMutateSubgraph(context.program, mutator, input); - setAlwaysMutate(context.program, target, false); + setAlwaysMutate(context.program, input, false); - target.properties = (type as Model).properties; + compilerAssert( + type.kind === "Model", + "Expected lifecycle update mutator to return a Model type.", + ); + + return type; +} + +export const $withLifecycleUpdate: WithLifecycleUpdateDecorator = ( + context: DecoratorContext, + target: Model, + nameTemplate?: string, +) => { + const transformed = applyLifecycleUpdate(context, target, nameTemplate); + + target.properties = transformed.properties; }; const VISIBILITY_FILTER_MUTATOR_RESULT = Symbol.for("TypeSpec.Core.visibilityFilterMutatorResult"); @@ -544,6 +579,13 @@ interface CreateVisibilityFilterMutatorOptions { */ decoratorFn?: DecoratorFunction; + /** + * Optionally, the fully-qualified TypeSpec decorator name corresponding to `decoratorFn`. + * + * This allows robust matching across module-boundary function identity differences. + */ + decoratorName?: `@${string}`; + /** * Optionally, the name template to apply in the mutator. * @@ -564,6 +606,19 @@ function createVisibilityFilterMutator( options: CreateVisibilityFilterMutatorOptions = {}, ): Mutator { const visibilityClasses = VisibilityFilter.getVisibilityClasses(filter); + const isTypeSpecDecorator = ( + application: DecoratorApplication, + decoratorName: `@${string}`, + ): boolean => + application.definition?.name === decoratorName && + application.definition.namespace.name === "TypeSpec"; + + const matchesDecorator = ( + application: DecoratorApplication, + decoratorName: `@${string}`, + decoratorFn: DecoratorFunction, + ): boolean => + isTypeSpecDecorator(application, decoratorName) || application.decorator === decoratorFn; const mpMutator: Mutator = { name: "VisibilityFilterProperty", ModelProperty: { @@ -577,8 +632,10 @@ function createVisibilityFilterMutator( const decorators: DecoratorApplication[] = []; for (const decorator of prop.decorators) { - const decFn = decorator.decorator; - if (decFn === $visibility || decFn === $removeVisibility) { + if ( + matchesDecorator(decorator, "@visibility", $visibility) || + matchesDecorator(decorator, "@removeVisibility", $removeVisibility) + ) { const nextArgs = decorator.args.filter((arg) => { if (arg.value.entityKind !== "Value") return false; @@ -597,7 +654,7 @@ function createVisibilityFilterMutator( args: nextArgs, }); } - } else if (decFn !== $invisible) { + } else if (!matchesDecorator(decorator, "@invisible", $invisible)) { decorators.push(decorator); } } @@ -687,12 +744,18 @@ function createVisibilityFilterMutator( clone.properties.set(key, mutated.type as ModelProperty); - modified ||= (mutated.type as ModelProperty).type !== prop.type; + modified ||= mutated.type !== prop; } } if (options.decoratorFn) { - clone.decorators = clone.decorators.filter((d) => d.decorator !== options.decoratorFn); + clone.decorators = clone.decorators.filter( + (d) => + !( + d.decorator === options.decoratorFn || + (options.decoratorName && isTypeSpecDecorator(d, options.decoratorName)) + ), + ); modified ||= clone.decorators.length !== model.decorators.length; } diff --git a/packages/compiler/src/manifest.ts b/packages/compiler/src/manifest.ts index be61dd7655f..f53cc5778bc 100644 --- a/packages/compiler/src/manifest.ts +++ b/packages/compiler/src/manifest.ts @@ -4,7 +4,9 @@ try { // @ts-ignore manifest = (await import("../manifest.js")).default; } catch { - const name = "../dist/manifest.js"; + // Construct path dynamically so bundlers cannot statically resolve this import. + // This fallback is only used when running directly from source during development. + const name = ["../dist", "manifest.js"].join("/"); manifest = (await import(/* @vite-ignore */ /* webpackIgnore: true */ name)).default; } diff --git a/packages/compiler/src/package-manger/npm-registry-utils.ts b/packages/compiler/src/package-manger/npm-registry-utils.ts index 58447c7a483..5e68cb262c3 100644 --- a/packages/compiler/src/package-manger/npm-registry-utils.ts +++ b/packages/compiler/src/package-manger/npm-registry-utils.ts @@ -85,13 +85,22 @@ export interface NpmHuman { readonly url?: string | undefined; } -const registry = `https://registry.npmjs.org`; +const defaultRegistry = `https://registry.npmjs.org`; + +/** + * Returns the npm registry URL to use for fetching packages. + * Uses the `TYPESPEC_NPM_REGISTRY` environment variable if set, + * otherwise falls back to the default npm registry. + */ +function getNpmRegistry(): string { + return (process.env["TYPESPEC_NPM_REGISTRY"] ?? defaultRegistry).replace(/\/$/, ""); +} export async function fetchPackageManifest( packageName: string, version: string, ): Promise { - const url = `${registry}/${packageName}/${version}`; + const url = `${getNpmRegistry()}/${packageName}/${version}`; const res = await fetch(url); return await res.json(); } diff --git a/packages/compiler/src/server/compile-service.ts b/packages/compiler/src/server/compile-service.ts index 2c41249149e..03875d7139f 100644 --- a/packages/compiler/src/server/compile-service.ts +++ b/packages/compiler/src/server/compile-service.ts @@ -20,6 +20,7 @@ import { getLocationInYamlScript } from "../yaml/diagnostics.js"; import { parseYaml } from "../yaml/parser.js"; import { ClientConfigProvider } from "./client-config-provider.js"; import { serverOptions } from "./constants.js"; +import { debugLoggers } from "./debug.js"; import { resolveEntrypointFile } from "./entrypoint-resolver.js"; import { FileService } from "./file-service.js"; import { FileSystemCache } from "./file-system-cache.js"; @@ -90,6 +91,8 @@ export function createCompileService({ const eventListeners = new Map void | Promise>(); const compileManager = new ServerCompileManager(updateManager, compilerHost, log); let configFilePath: string | undefined; + const debug = debugLoggers.compileConfig; + const logDebug = debug.enabled ? log : () => {}; return { compile, getScript, on, notifyChange, getMainFileForDocument }; @@ -129,7 +132,7 @@ export function createCompileService({ } const mainFile = await getMainFileForDocument(path); if (mainFile === undefined) { - log({ level: "debug", message: `failed to resolve main file for ${path}` }); + logDebug({ level: "debug", message: `failed to resolve main file for ${path}` }); return undefined; } if (!mainFile.endsWith(".tsp")) { @@ -137,7 +140,7 @@ export function createCompileService({ } const config = await getConfig(mainFile); configFilePath = config.filename; - log({ level: "debug", message: `config resolved`, detail: config }); + logDebug({ level: "debug", message: `config resolved`, detail: config }); const [optionsFromConfig, _] = resolveOptionsFromConfig(config, { cwd: getDirectoryPath(path), }); @@ -217,7 +220,7 @@ export function createCompileService({ ) { // If the file that changed wasn't imported by anything from the main // file, retry using the file itself as the main file. - log({ + logDebug({ level: "debug", message: `target file was not included in compiling, try to compile ${path} as main file directly`, }); @@ -246,7 +249,7 @@ export function createCompileService({ const [yamlScript] = parseYaml(await serverHost.compilerHost.readFile(configFilePath)); const target = getLocationInYamlScript(yamlScript, ["emit", emitterName], "key"); if (target.pos === 0) { - log({ + logDebug({ level: "debug", message: `Unexpected situation, can't find emitter '${emitterName}' in config file '${configFilePath}'`, }); @@ -286,7 +289,7 @@ export function createCompileService({ const lookupDir = entrypointStat.isDirectory() ? mainFile : getDirectoryPath(mainFile); const configPath = await findTypeSpecConfigPath(compilerHost, lookupDir, true); if (!configPath) { - log({ + logDebug({ level: "debug", message: `can't find path with config file, try to use default config`, }); @@ -337,7 +340,10 @@ export function createCompileService({ */ async function getMainFileForDocument(path: string) { if (path.startsWith("untitled:")) { - log({ level: "debug", message: `untitled document treated as its own main file: ${path}` }); + logDebug({ + level: "debug", + message: `untitled document treated as its own main file: ${path}`, + }); return path; } diff --git a/packages/compiler/src/server/completion.ts b/packages/compiler/src/server/completion.ts index 0f48ccb3c76..a4c3cf381d2 100644 --- a/packages/compiler/src/server/completion.ts +++ b/packages/compiler/src/server/completion.ts @@ -10,6 +10,7 @@ import { import { getSymNode } from "../core/binder.js"; import { getDeprecationDetails } from "../core/deprecation.js"; import { compilerAssert, getSourceLocation } from "../core/diagnostics.js"; +import { getLocationContext } from "../core/helpers/location-context.js"; import { printIdentifier } from "../core/helpers/syntax-utils.js"; import { getFirstAncestor, positionInRange } from "../core/parser.js"; import { @@ -27,6 +28,7 @@ import { NodeFlags, PositionDetail, StringLiteralNode, + Sym, SymbolFlags, SyntaxKind, Type, @@ -238,6 +240,7 @@ const keywords = [ // Modifiers ["extern", { root: true, namespace: true }], + ["internal", { root: true, namespace: true }], // Scalars ["init", { scalarBody: true }], @@ -410,7 +413,11 @@ async function addIdentifierCompletion( if (result.size === 0) { return; } + const sourceLocation = getLocationContext(program, node); for (const [key, { sym, label, suffix }] of result) { + if (!canAccessCompletionSymbol(sym, sourceLocation)) { + continue; + } let kind: CompletionItemKind; let deprecated = false; const symNode = getSymNode(sym); @@ -477,6 +484,27 @@ async function addIdentifierCompletion( if (node.parent?.kind === SyntaxKind.TypeReference) { addKeywordCompletion("identifier", completions); } + + function canAccessCompletionSymbol( + sym: Sym, + sourceLocation: ReturnType, + ) { + const isInternalDeclaration = + (sym.flags & (SymbolFlags.Internal | SymbolFlags.Declaration)) === + (SymbolFlags.Internal | SymbolFlags.Declaration); + + if (!isInternalDeclaration) return true; + if (sourceLocation.type === "synthetic" || sourceLocation.type === "compiler") return true; + + return sym.declarations.some((decl) => { + const declLocation = getLocationContext(program, decl); + + if (declLocation.type !== sourceLocation.type) return false; + if (declLocation.type === "project") return true; + + return declLocation === sourceLocation; + }); + } } const directiveNames = ["suppress", "deprecated"]; diff --git a/packages/compiler/src/server/constants.ts b/packages/compiler/src/server/constants.ts index 1bb0333bd04..65ffde94c19 100644 --- a/packages/compiler/src/server/constants.ts +++ b/packages/compiler/src/server/constants.ts @@ -12,9 +12,3 @@ export const serverOptions: CompilerOptions = { export const Commands = { APPLY_CODE_FIX: "typespec.applyCodeFix", }; - -/** - * Environment variables to enable some logging when needed - */ -export const ENABLE_SERVER_COMPILE_LOGGING = "ENABLE_SERVER_COMPILE_LOGGING"; -export const ENABLE_UPDATE_MANAGER_LOGGING = "ENABLE_UPDATE_MANAGER_LOGGING"; diff --git a/packages/compiler/src/server/debug.ts b/packages/compiler/src/server/debug.ts new file mode 100644 index 00000000000..006afee6502 --- /dev/null +++ b/packages/compiler/src/server/debug.ts @@ -0,0 +1,55 @@ +import { getEnvironmentVariable } from "../utils/misc.js"; + +/** + * Debug areas that can be enabled via TYPESPEC_DEBUG environment variable. + * + * Note: We use TYPESPEC_DEBUG instead of DEBUG because the DEBUG environment variable + * is not supported in VSCode extensions. See: https://github.com/microsoft/vscode/issues/290140 + * + * Usage: TYPESPEC_DEBUG=server.compile,compile.config + * + * Examples: + * TYPESPEC_DEBUG=server.compile - Enable server compilation debug logs + * TYPESPEC_DEBUG=* - Enable all debug logs + * TYPESPEC_DEBUG=server.compile,compile.config - Enable multiple areas + */ +const debugAreas = { + serverCompile: "server.compile", + updateManager: "update.manager", + compileConfig: "compile.config", +} as const; + +/** + * Check if a debug area is enabled via the TYPESPEC_DEBUG environment variable. + * Supports comma-separated values and wildcards. + */ +function isDebugEnabled(area: string): boolean { + const debug = getEnvironmentVariable("TYPESPEC_DEBUG"); + if (!debug) { + return false; + } + + const areas = debug.split(",").map((a) => a.trim()); + + return areas.some((pattern) => { + // Exact match + if (pattern === area) { + return true; + } + + // Wildcard pattern matching + if (pattern.includes("*")) { + const regexPattern = pattern.replace(/\*/g, ".*"); + const regex = new RegExp(`^${regexPattern}$`); + return regex.test(area); + } + + return false; + }); +} + +export const debugLoggers = { + serverCompile: { enabled: isDebugEnabled(debugAreas.serverCompile) }, + updateManager: { enabled: isDebugEnabled(debugAreas.updateManager) }, + compileConfig: { enabled: isDebugEnabled(debugAreas.compileConfig) }, +} as const; diff --git a/packages/compiler/src/server/entrypoint-resolver.ts b/packages/compiler/src/server/entrypoint-resolver.ts index 4865b44d4c6..e60e82d74ce 100644 --- a/packages/compiler/src/server/entrypoint-resolver.ts +++ b/packages/compiler/src/server/entrypoint-resolver.ts @@ -3,6 +3,7 @@ import { getDirectoryPath, joinPaths } from "../core/path-utils.js"; import { SystemHost, Diagnostic as TypeSpecDiagnostic } from "../core/types.js"; import { doIO, loadFile } from "../utils/io.js"; import { resolveTspMain } from "../utils/misc.js"; +import { debugLoggers } from "./debug.js"; import { FileSystemCache } from "./file-system-cache.js"; import { ServerLog } from "./types.js"; @@ -14,6 +15,8 @@ export async function resolveEntrypointFile( log: (log: ServerLog) => void, ): Promise { const options = { allowFileNotFound: true }; + const debug = debugLoggers.compileConfig; + const logDebug = debug.enabled ? log : () => {}; const pathStat = await doIO(() => host.stat(path), path, logMainFileSearchDiagnostic, options); const isFilePath = pathStat?.isFile() ?? false; @@ -36,14 +39,14 @@ export async function resolveEntrypointFile( const tspMain = resolveTspMain(pkg); if (typeof tspMain === "string") { - log({ + logDebug({ level: "debug", message: `tspMain resolved from package.json (${pkgPath}) as ${tspMain}`, }); const packageJsonEntrypoint = await existingFile(dir, tspMain); if (packageJsonEntrypoint) { - log({ level: "debug", message: `entrypoint file found as ${packageJsonEntrypoint}` }); + logDebug({ level: "debug", message: `entrypoint file found as ${packageJsonEntrypoint}` }); return packageJsonEntrypoint; } } @@ -51,7 +54,7 @@ export async function resolveEntrypointFile( for (const entrypoint of entrypoints) { const candidate = await existingFile(dir, entrypoint); if (candidate) { - log({ + logDebug({ level: "debug", message: `main file found using client provided entrypoint: ${candidate}`, }); @@ -67,7 +70,7 @@ export async function resolveEntrypointFile( dir = parentDir; } - log({ level: "debug", message: `reached directory root, using '${path}' as main file` }); + logDebug({ level: "debug", message: `reached directory root, using '${path}' as main file` }); return isFilePath ? path : undefined; function logMainFileSearchDiagnostic(diagnostic: TypeSpecDiagnostic) { diff --git a/packages/compiler/src/server/server-compile-manager.ts b/packages/compiler/src/server/server-compile-manager.ts index 552c0551893..b84b9046916 100644 --- a/packages/compiler/src/server/server-compile-manager.ts +++ b/packages/compiler/src/server/server-compile-manager.ts @@ -8,8 +8,7 @@ import { Program, ServerLog, } from "../index.js"; -import { getEnvironmentVariable } from "../utils/misc.js"; -import { ENABLE_SERVER_COMPILE_LOGGING } from "./constants.js"; +import { debugLoggers } from "./debug.js"; import { trackActionFunc } from "./server-track-action-task.js"; import { UpdateManager } from "./update-manager.js"; @@ -45,10 +44,8 @@ export class ServerCompileManager { private compilerHost: CompilerHost, private log: (log: ServerLog) => void, ) { - this.logDebug = - getEnvironmentVariable(ENABLE_SERVER_COMPILE_LOGGING)?.toLowerCase() === "true" - ? (msg) => this.log({ level: "debug", message: msg }) - : () => {}; + const debug = debugLoggers.serverCompile; + this.logDebug = debug.enabled ? (msg) => this.log({ level: "debug", message: msg }) : () => {}; } async compile( @@ -56,7 +53,7 @@ export class ServerCompileManager { compileOptions: CompilerOptions = {}, serverCompileOptions: ServerCompileOptions, ): Promise { - let cache = undefined; + let cache; const curId = this.compileId++; const err = new Error(); const lines = err.stack?.split("\n") ?? []; diff --git a/packages/compiler/src/server/tmlanguage.ts b/packages/compiler/src/server/tmlanguage.ts index 6794dc97095..025f146a326 100644 --- a/packages/compiler/src/server/tmlanguage.ts +++ b/packages/compiler/src/server/tmlanguage.ts @@ -22,6 +22,8 @@ export type TypeSpecScope = | "keyword.directive.name.tsp" | "keyword.other.tsp" | "keyword.tag.tspdoc" + // Storage + | "storage.modifier.tsp" // Entities | "entity.name.type.tsp" | "entity.name.function.tsp" @@ -65,7 +67,7 @@ const simpleIdentifier = `\\b${identifierStart}${identifierContinue}*\\b`; const identifier = `${simpleIdentifier}|${escapedIdentifier}`; const qualifiedIdentifier = `\\b${identifierStart}(?:${identifierContinue}|\\.${identifierStart})*\\b`; const stringPattern = '\\"(?:[^\\"\\\\]|\\\\.)*\\"'; -const modifierKeyword = `\\b(?:extern)\\b`; +const modifierKeyword = `\\b(?:extern|internal)\\b`; const statementKeyword = `\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b`; const universalEnd = `(?=,|;|@|#[a-z]|\\)|\\}|${modifierKeyword}|${statementKeyword})`; const universalEndExceptComma = `(?=;|@|\\)|\\}|${modifierKeyword}|${statementKeyword})`; @@ -549,9 +551,10 @@ const modelHeritage: BeginEndRule = { const modelStatement: BeginEndRule = { key: "model-statement", scope: meta, - begin: "\\b(model)\\b", + begin: "(?:(internal)\\s+)?\\b(model)\\b", beginCaptures: { - "1": { scope: "keyword.other.tsp" }, + "1": { scope: "storage.modifier.tsp" }, + "2": { scope: "keyword.other.tsp" }, }, end: `(?<=\\})|${universalEnd}`, patterns: [ @@ -616,10 +619,11 @@ const scalarBody: BeginEndRule = { const scalarStatement: BeginEndRule = { key: "scalar-statement", scope: meta, - begin: `\\b(scalar)\\b\\s+(${identifier})`, + begin: `(?:(internal)\\s+)?\\b(scalar)\\b\\s+(${identifier})`, beginCaptures: { - "1": { scope: "keyword.other.tsp" }, - "2": { scope: "entity.name.type.tsp" }, + "1": { scope: "storage.modifier.tsp" }, + "2": { scope: "keyword.other.tsp" }, + "3": { scope: "entity.name.type.tsp" }, }, end: `(?<=\\})|${universalEnd}`, patterns: [ @@ -659,10 +663,11 @@ const enumBody: BeginEndRule = { const enumStatement: BeginEndRule = { key: "enum-statement", scope: meta, - begin: `\\b(enum)\\b\\s+(${identifier})`, + begin: `(?:(internal)\\s+)?\\b(enum)\\b\\s+(${identifier})`, beginCaptures: { - "1": { scope: "keyword.other.tsp" }, - "2": { scope: "entity.name.type.tsp" }, + "1": { scope: "storage.modifier.tsp" }, + "2": { scope: "keyword.other.tsp" }, + "3": { scope: "entity.name.type.tsp" }, }, end: `(?<=\\})|${universalEnd}`, patterns: [token, enumBody], @@ -697,10 +702,11 @@ const unionBody: BeginEndRule = { const unionStatement: BeginEndRule = { key: "union-statement", scope: meta, - begin: `\\b(union)\\b\\s+(${identifier})`, + begin: `(?:(internal)\\s+)?\\b(union)\\b\\s+(${identifier})`, beginCaptures: { - "1": { scope: "keyword.other.tsp" }, - "2": { scope: "entity.name.type.tsp" }, + "1": { scope: "storage.modifier.tsp" }, + "2": { scope: "keyword.other.tsp" }, + "3": { scope: "entity.name.type.tsp" }, }, end: `(?<=\\})|${universalEnd}`, patterns: [token, unionBody], @@ -720,10 +726,11 @@ const aliasAssignment: BeginEndRule = { const aliasStatement: BeginEndRule = { key: "alias-statement", scope: meta, - begin: `\\b(alias)\\b\\s+(${identifier})\\s*`, + begin: `(?:(internal)\\s+)?\\b(alias)\\b\\s+(${identifier})\\s*`, beginCaptures: { - "1": { scope: "keyword.other.tsp" }, - "2": { scope: "entity.name.type.tsp" }, + "1": { scope: "storage.modifier.tsp" }, + "2": { scope: "keyword.other.tsp" }, + "3": { scope: "entity.name.type.tsp" }, }, end: universalEnd, patterns: [aliasAssignment, typeParameters], @@ -732,10 +739,11 @@ const aliasStatement: BeginEndRule = { const constStatement: BeginEndRule = { key: "const-statement", scope: meta, - begin: `\\b(const)\\b\\s+(${identifier})`, + begin: `(?:(internal)\\s+)?\\b(const)\\b\\s+(${identifier})`, beginCaptures: { - "1": { scope: "keyword.other.tsp" }, - "2": { scope: "variable.name.tsp" }, + "1": { scope: "storage.modifier.tsp" }, + "2": { scope: "keyword.other.tsp" }, + "3": { scope: "variable.name.tsp" }, }, end: universalEnd, patterns: [typeAnnotation, operatorAssignment, expression], @@ -798,10 +806,11 @@ const operationSignature: IncludeRule = { const operationStatement: BeginEndRule = { key: "operation-statement", scope: meta, - begin: `\\b(op)\\b\\s+(${identifier})`, + begin: `(?:(internal)\\s+)?\\b(op)\\b\\s+(${identifier})`, beginCaptures: { - "1": { scope: "keyword.other.tsp" }, - "2": { scope: "entity.name.function.tsp" }, + "1": { scope: "storage.modifier.tsp" }, + "2": { scope: "keyword.other.tsp" }, + "3": { scope: "entity.name.function.tsp" }, }, end: universalEnd, patterns: [token, operationSignature], @@ -847,9 +856,10 @@ const interfaceBody: BeginEndRule = { const interfaceStatement: BeginEndRule = { key: "interface-statement", scope: meta, - begin: "\\b(interface)\\b", + begin: "(?:(internal)\\s+)?\\b(interface)\\b", beginCaptures: { - "1": { scope: "keyword.other.tsp" }, + "1": { scope: "storage.modifier.tsp" }, + "2": { scope: "keyword.other.tsp" }, }, end: `(?<=\\})|${universalEnd}`, patterns: [ @@ -886,11 +896,12 @@ const usingStatement: BeginEndRule = { const decoratorDeclarationStatement: BeginEndRule = { key: "decorator-declaration-statement", scope: meta, - begin: `(?:(extern)\\s+)?\\b(dec)\\b\\s+(${identifier})`, + begin: `(?:(internal)\\s+)?(?:(extern)\\s+)?\\b(dec)\\b\\s+(${identifier})`, beginCaptures: { - "1": { scope: "keyword.other.tsp" }, + "1": { scope: "storage.modifier.tsp" }, "2": { scope: "keyword.other.tsp" }, - "3": { scope: "entity.name.function.tsp" }, + "3": { scope: "keyword.other.tsp" }, + "4": { scope: "entity.name.function.tsp" }, }, end: universalEnd, patterns: [token, operationParameters], @@ -899,11 +910,12 @@ const decoratorDeclarationStatement: BeginEndRule = { const functionDeclarationStatement: BeginEndRule = { key: "function-declaration-statement", scope: meta, - begin: `(?:(extern)\\s+)?\\b(fn)\\b\\s+(${identifier})`, + begin: `(?:(internal)\\s+)?(?:(extern)\\s+)?\\b(fn)\\b\\s+(${identifier})`, beginCaptures: { - "1": { scope: "keyword.other.tsp" }, + "1": { scope: "storage.modifier.tsp" }, "2": { scope: "keyword.other.tsp" }, - "3": { scope: "entity.name.function.tsp" }, + "3": { scope: "keyword.other.tsp" }, + "4": { scope: "entity.name.function.tsp" }, }, end: universalEnd, patterns: [token, operationParameters, typeAnnotation], diff --git a/packages/compiler/src/server/type-signature.ts b/packages/compiler/src/server/type-signature.ts index e2cf702dcba..542a95c9df1 100644 --- a/packages/compiler/src/server/type-signature.ts +++ b/packages/compiler/src/server/type-signature.ts @@ -12,11 +12,13 @@ import { EnumMember, FunctionParameter, Interface, + MixedParameterConstraint, Model, ModelProperty, Operation, StringTemplate, Sym, + SymbolFlags, SyntaxKind, Type, UnionVariant, @@ -57,6 +59,15 @@ function getEntitySignature( return "(error)"; } if ("valueKind" in entity) { + if (sym.flags & SymbolFlags.Function && entity.valueKind === "Function") { + const parameters = [...entity.parameters].map( + (x) => `${x.rest ? "..." : ""}${x.name}${x.optional ? "?" : ""}: ${getEntityName(x.type)}`, + ); + return fence( + `fn ${entity.name ?? ""}(${parameters.join(", ")}) => ${getEntityName(entity.returnType)}`, + ); + } + return fence(`const ${sym.name}: ${getTypeName(entity.type)}`); } @@ -105,12 +116,36 @@ function getTypeSignature(type: Type, options: GetSymbolSignatureOptions): strin return `(union variant)\n${fence(getUnionVariantSignature(type))}`; case "Tuple": return `(tuple)\n[${fence(type.values.map((v) => getTypeSignature(v, options)).join(", "))}]`; + case "FunctionType": + return `fn (${type.parameters.map((p) => getTypeSignature(p, options)).join(", ")}): ${getMixedConstraintSignature( + type.returnType, + options, + )}`; default: const _assertNever: never = type; compilerAssert(false, "Unexpected type kind"); } } +function getMixedConstraintSignature( + constraint: MixedParameterConstraint, + options: GetSymbolSignatureOptions, +) { + let result = ""; + + if (constraint.type) { + result += getTypeSignature(constraint.type, options); + } + + if (constraint.valueType) { + if (result.length > 0) { + result += " | "; + } + result += "valueof " + getTypeSignature(constraint.valueType, options); + } + return result; +} + function getDecoratorSignature(type: Decorator) { const ns = getQualifier(type.namespace); const name = type.name.slice(1); diff --git a/packages/compiler/src/server/update-manager.ts b/packages/compiler/src/server/update-manager.ts index 0d650dbc359..72e019c1b32 100644 --- a/packages/compiler/src/server/update-manager.ts +++ b/packages/compiler/src/server/update-manager.ts @@ -1,7 +1,6 @@ import { TextDocumentIdentifier } from "vscode-languageserver"; import { TextDocument } from "vscode-languageserver-textdocument"; -import { getEnvironmentVariable } from "../utils/misc.js"; -import { ENABLE_UPDATE_MANAGER_LOGGING } from "./constants.js"; +import { debugLoggers } from "./debug.js"; import { ServerLog } from "./types.js"; interface PendingUpdate { @@ -43,12 +42,12 @@ export class UpdateManager { log: (sl: ServerLog) => void, getDebounceDelay?: () => number, ) { - this._log = - getEnvironmentVariable(ENABLE_UPDATE_MANAGER_LOGGING)?.toLowerCase() === "true" - ? (sl: ServerLog) => { - log({ ...sl, message: `#FromUpdateManager(${this.name}): ${sl.message}` }); - } - : () => {}; + const debug = debugLoggers.updateManager; + this._log = debug.enabled + ? (sl: ServerLog) => { + log({ ...sl, message: `#FromUpdateManager(${this.name}): ${sl.message}` }); + } + : () => {}; // Set the debounce delay function once during construction this.getDebounceDelay = getDebounceDelay ?? this.getAdaptiveDebounceDelay; diff --git a/packages/compiler/src/testing/index.ts b/packages/compiler/src/testing/index.ts index 80fbe8465c0..fc701e6279d 100644 --- a/packages/compiler/src/testing/index.ts +++ b/packages/compiler/src/testing/index.ts @@ -6,7 +6,7 @@ export { export { expectCodeFixOnAst } from "./code-fix-testing.js"; export { expectDiagnosticEmpty, expectDiagnostics, type DiagnosticMatch } from "./expect.js"; export { createTestFileSystem, mockFile } from "./fs.js"; -export { t } from "./marked-template.js"; +export { t, type TemplateWithMarkers } from "./marked-template.js"; export { createLinterRuleTester, type ApplyCodeFixExpect, diff --git a/packages/compiler/src/utils/fs-utils.ts b/packages/compiler/src/utils/fs-utils.ts index 380bff84131..9d33f122e46 100644 --- a/packages/compiler/src/utils/fs-utils.ts +++ b/packages/compiler/src/utils/fs-utils.ts @@ -13,6 +13,7 @@ export async function mkTempDir(host: CompilerHost, base: string, prefix: string if ((error as any).code === `EACCES`) { throw new Error( `Cannot create temporary folder at ${path}. Permission denied. Please check your permissions.`, + { cause: error }, ); } else { throw error; diff --git a/packages/compiler/src/utils/index.ts b/packages/compiler/src/utils/index.ts index 2af3b409d38..4e0ab94c97a 100644 --- a/packages/compiler/src/utils/index.ts +++ b/packages/compiler/src/utils/index.ts @@ -2,6 +2,7 @@ // Exports for `@typespec/compiler/utils`. // Be explicit about what get exported so we don't export utils that are not meant to be public. // --------------------------------------- +export { createPerfReporter, perf } from "../core/perf.js"; export { DuplicateTracker } from "./duplicate-tracker.js"; export { Queue, TwoLevelMap, createRekeyableMap, deepClone, deepEquals } from "./misc.js"; export { useStateMap, useStateSet } from "./state-accessor.js"; diff --git a/packages/compiler/templates/__snapshots__/emitter-ts/eslint.config.js b/packages/compiler/templates/__snapshots__/emitter-ts/eslint.config.js index 75cb4f7ce3e..430df9c59ea 100644 --- a/packages/compiler/templates/__snapshots__/emitter-ts/eslint.config.js +++ b/packages/compiler/templates/__snapshots__/emitter-ts/eslint.config.js @@ -1,11 +1,20 @@ // @ts-check import eslint from "@eslint/js"; +import { defineConfig } from "eslint/config"; import tsEslint from "typescript-eslint"; -export default tsEslint.config( +export default defineConfig( { ignores: ["**/dist/**/*", "**/.temp/**/*"], }, eslint.configs.recommended, ...tsEslint.configs.recommended, + { + rules: { + "@typescript-eslint/no-unused-vars": [ + "warn", + { varsIgnorePattern: "^_", argsIgnorePattern: "^_" }, + ], + }, + }, ); diff --git a/packages/compiler/templates/__snapshots__/emitter-ts/package.json b/packages/compiler/templates/__snapshots__/emitter-ts/package.json index f9f12501c17..8231ab14f7b 100644 --- a/packages/compiler/templates/__snapshots__/emitter-ts/package.json +++ b/packages/compiler/templates/__snapshots__/emitter-ts/package.json @@ -18,8 +18,7 @@ }, "devDependencies": { "@types/node": "latest", - "@typescript-eslint/eslint-plugin": "^8.15.0", - "@typescript-eslint/parser": "^8.15.0", + "typescript-eslint": "^8.49.0", "eslint": "^9.15.0", "@typespec/compiler": "latest", "typescript": "^5.3.3", diff --git a/packages/compiler/templates/__snapshots__/emitter-ts/test/test-host.ts b/packages/compiler/templates/__snapshots__/emitter-ts/test/test-host.ts index 14b78cf71f5..8e62dac4d01 100644 --- a/packages/compiler/templates/__snapshots__/emitter-ts/test/test-host.ts +++ b/packages/compiler/templates/__snapshots__/emitter-ts/test/test-host.ts @@ -1,43 +1,16 @@ import { Diagnostic, resolvePath } from "@typespec/compiler"; -import { - createTestHost, - createTestWrapper, - expectDiagnosticEmpty, -} from "@typespec/compiler/testing"; -import { EmitterTsTestLibrary } from "../src/testing/index.js"; +import { expectDiagnosticEmpty } from "@typespec/compiler/testing"; +import { createTester } from "@typespec/compiler/testing"; -export async function createEmitterTsTestHost() { - return createTestHost({ - libraries: [EmitterTsTestLibrary], - }); -} - -export async function createEmitterTsTestRunner() { - const host = await createEmitterTsTestHost(); - - return createTestWrapper(host, { - compilerOptions: { - noEmit: false, - emit: ["emitter-ts"], - }, - }); -} +export const Tester = createTester(resolvePath(import.meta.dirname, "../.."), { + libraries: ["emitter-ts"], +}).emit("emitter-ts"); export async function emitWithDiagnostics( code: string ): Promise<[Record, readonly Diagnostic[]]> { - const runner = await createEmitterTsTestRunner(); - await runner.compileAndDiagnose(code, { - outputDir: "tsp-output", - }); - const emitterOutputDir = "./tsp-output/emitter-ts"; - const files = await runner.program.host.readDir(emitterOutputDir); - - const result: Record = {}; - for (const file of files) { - result[file] = (await runner.program.host.readFile(resolvePath(emitterOutputDir, file))).text; - } - return [result, runner.program.diagnostics]; + const [{ outputs }, diagnostics] = await Tester.compileAndDiagnose(code); + return [outputs, diagnostics]; } export async function emit(code: string): Promise> { diff --git a/packages/compiler/templates/__snapshots__/library-ts/eslint.config.js b/packages/compiler/templates/__snapshots__/library-ts/eslint.config.js index 75cb4f7ce3e..430df9c59ea 100644 --- a/packages/compiler/templates/__snapshots__/library-ts/eslint.config.js +++ b/packages/compiler/templates/__snapshots__/library-ts/eslint.config.js @@ -1,11 +1,20 @@ // @ts-check import eslint from "@eslint/js"; +import { defineConfig } from "eslint/config"; import tsEslint from "typescript-eslint"; -export default tsEslint.config( +export default defineConfig( { ignores: ["**/dist/**/*", "**/.temp/**/*"], }, eslint.configs.recommended, ...tsEslint.configs.recommended, + { + rules: { + "@typescript-eslint/no-unused-vars": [ + "warn", + { varsIgnorePattern: "^_", argsIgnorePattern: "^_" }, + ], + }, + }, ); diff --git a/packages/compiler/templates/__snapshots__/library-ts/package.json b/packages/compiler/templates/__snapshots__/library-ts/package.json index 408d5aac9ae..5e2377b221b 100644 --- a/packages/compiler/templates/__snapshots__/library-ts/package.json +++ b/packages/compiler/templates/__snapshots__/library-ts/package.json @@ -19,8 +19,7 @@ }, "devDependencies": { "@types/node": "latest", - "@typescript-eslint/eslint-plugin": "^8.15.0", - "@typescript-eslint/parser": "^8.15.0", + "typescript-eslint": "^8.49.0", "@typespec/compiler": "latest", "@typespec/library-linter": "latest", "eslint": "^9.15.0", diff --git a/packages/compiler/templates/__snapshots__/library-ts/test/decorators.test.ts b/packages/compiler/templates/__snapshots__/library-ts/test/decorators.test.ts index b089e56bcd8..51ee4d92418 100644 --- a/packages/compiler/templates/__snapshots__/library-ts/test/decorators.test.ts +++ b/packages/compiler/templates/__snapshots__/library-ts/test/decorators.test.ts @@ -1,29 +1,25 @@ import { strictEqual } from "node:assert"; -import { describe, it, beforeEach } from "node:test"; -import type { Operation } from "@typespec/compiler"; -import { BasicTestRunner, expectDiagnostics, extractCursor } from "@typespec/compiler/testing"; +import { describe, it } from "node:test"; +import type { Operation, Program } from "@typespec/compiler"; +import { expectDiagnostics } from "@typespec/compiler/testing"; import { getAlternateName } from "../src/decorators.js"; -import { createLibraryTsTestRunner } from "./test-host.js"; +import { Tester } from "./test-host.js"; describe("decorators", () => { - let runner: BasicTestRunner; - - beforeEach(async () => { - runner = await createLibraryTsTestRunner(); - }) - describe("@alternateName", () => { it("set alternate name on operation", async () => { - const { test } = (await runner.compile( - `@alternateName("bar") @test op test(): void;` - )) as { test: Operation }; - strictEqual(getAlternateName(runner.program, test), "bar"); + const { test, program } = (await Tester.compile(` + using LibraryTs; + @alternateName("bar") @test op test(): void; + `)) as unknown as { test: Operation; program: Program }; + strictEqual(getAlternateName(program, test), "bar"); }); it("emit diagnostic if not used on an operation", async () => { - const diagnostics = await runner.diagnose( - `@alternateName("bar") model Test {}` - ); + const diagnostics = await Tester.diagnose(` + using LibraryTs; + @alternateName("bar") model Test {} + `); expectDiagnostics(diagnostics, { severity: "error", code: "decorator-wrong-target", @@ -33,15 +29,14 @@ describe("decorators", () => { it("emit diagnostic if using banned name", async () => { - const {pos, source} = extractCursor(`@alternateName(┆"banned") op test(): void;`) - const diagnostics = await runner.diagnose( - source - ); + const diagnostics = await Tester.diagnose(` + using LibraryTs; + @alternateName("banned") op test(): void; + `); expectDiagnostics(diagnostics, { severity: "error", code: "library-ts/banned-alternate-name", - message: `Banned alternate name "banned".`, - pos: pos + runner.autoCodeOffset + message: `Banned alternate name "banned".` }) }); }); diff --git a/packages/compiler/templates/__snapshots__/library-ts/test/test-host.ts b/packages/compiler/templates/__snapshots__/library-ts/test/test-host.ts index e973984e84b..588a223c42b 100644 --- a/packages/compiler/templates/__snapshots__/library-ts/test/test-host.ts +++ b/packages/compiler/templates/__snapshots__/library-ts/test/test-host.ts @@ -1,17 +1,7 @@ -import { createTestHost, createTestWrapper } from "@typespec/compiler/testing"; -import { LibraryTsTestLibrary } from "../src/testing/index.js"; +import { resolvePath } from "@typespec/compiler"; +import { createTester } from "@typespec/compiler/testing"; -export async function createLibraryTsTestHost() { - return createTestHost({ - libraries: [LibraryTsTestLibrary], - }); -} - -export async function createLibraryTsTestRunner() { - const host = await createLibraryTsTestHost(); - - return createTestWrapper(host, { - autoUsings: ["LibraryTs"] - }); -} +export const Tester = createTester(resolvePath(import.meta.dirname, "../.."), { + libraries: ["library-ts"], +}).import("library-ts"); diff --git a/packages/compiler/templates/emitter-ts/eslint.config.js b/packages/compiler/templates/emitter-ts/eslint.config.js index 75cb4f7ce3e..430df9c59ea 100644 --- a/packages/compiler/templates/emitter-ts/eslint.config.js +++ b/packages/compiler/templates/emitter-ts/eslint.config.js @@ -1,11 +1,20 @@ // @ts-check import eslint from "@eslint/js"; +import { defineConfig } from "eslint/config"; import tsEslint from "typescript-eslint"; -export default tsEslint.config( +export default defineConfig( { ignores: ["**/dist/**/*", "**/.temp/**/*"], }, eslint.configs.recommended, ...tsEslint.configs.recommended, + { + rules: { + "@typescript-eslint/no-unused-vars": [ + "warn", + { varsIgnorePattern: "^_", argsIgnorePattern: "^_" }, + ], + }, + }, ); diff --git a/packages/compiler/templates/emitter-ts/package.json b/packages/compiler/templates/emitter-ts/package.json index 96ca29f0f73..1c9baaf7d2c 100644 --- a/packages/compiler/templates/emitter-ts/package.json +++ b/packages/compiler/templates/emitter-ts/package.json @@ -18,8 +18,7 @@ }, "devDependencies": { "@types/node": "latest", - "@typescript-eslint/eslint-plugin": "^8.15.0", - "@typescript-eslint/parser": "^8.15.0", + "typescript-eslint": "^8.49.0", "eslint": "^9.15.0", "@typespec/compiler": "latest", "typescript": "^5.3.3", diff --git a/packages/compiler/templates/emitter-ts/test/test-host.ts.mu b/packages/compiler/templates/emitter-ts/test/test-host.ts.mu index 5f1f869861a..950a699f0fa 100644 --- a/packages/compiler/templates/emitter-ts/test/test-host.ts.mu +++ b/packages/compiler/templates/emitter-ts/test/test-host.ts.mu @@ -1,43 +1,16 @@ import { Diagnostic, resolvePath } from "@typespec/compiler"; -import { - createTestHost, - createTestWrapper, - expectDiagnosticEmpty, -} from "@typespec/compiler/testing"; -import { {{#casing.pascalCase}}{{name}}{{/casing.pascalCase}}TestLibrary } from "../src/testing/index.js"; +import { expectDiagnosticEmpty } from "@typespec/compiler/testing"; +import { createTester } from "@typespec/compiler/testing"; -export async function create{{#casing.pascalCase}}{{name}}{{/casing.pascalCase}}TestHost() { - return createTestHost({ - libraries: [{{#casing.pascalCase}}{{name}}{{/casing.pascalCase}}TestLibrary], - }); -} - -export async function create{{#casing.pascalCase}}{{name}}{{/casing.pascalCase}}TestRunner() { - const host = await create{{#casing.pascalCase}}{{name}}{{/casing.pascalCase}}TestHost(); - - return createTestWrapper(host, { - compilerOptions: { - noEmit: false, - emit: ["{{name}}"], - }, - }); -} +export const Tester = createTester(resolvePath(import.meta.dirname, "../.."), { + libraries: ["{{name}}"], +}).emit("{{name}}"); export async function emitWithDiagnostics( code: string ): Promise<[Record, readonly Diagnostic[]]> { - const runner = await create{{#casing.pascalCase}}{{name}}{{/casing.pascalCase}}TestRunner(); - await runner.compileAndDiagnose(code, { - outputDir: "tsp-output", - }); - const emitterOutputDir = "./tsp-output/{{name}}"; - const files = await runner.program.host.readDir(emitterOutputDir); - - const result: Record = {}; - for (const file of files) { - result[file] = (await runner.program.host.readFile(resolvePath(emitterOutputDir, file))).text; - } - return [result, runner.program.diagnostics]; + const [{ outputs }, diagnostics] = await Tester.compileAndDiagnose(code); + return [outputs, diagnostics]; } export async function emit(code: string): Promise> { diff --git a/packages/compiler/templates/library-ts/eslint.config.js b/packages/compiler/templates/library-ts/eslint.config.js index 75cb4f7ce3e..430df9c59ea 100644 --- a/packages/compiler/templates/library-ts/eslint.config.js +++ b/packages/compiler/templates/library-ts/eslint.config.js @@ -1,11 +1,20 @@ // @ts-check import eslint from "@eslint/js"; +import { defineConfig } from "eslint/config"; import tsEslint from "typescript-eslint"; -export default tsEslint.config( +export default defineConfig( { ignores: ["**/dist/**/*", "**/.temp/**/*"], }, eslint.configs.recommended, ...tsEslint.configs.recommended, + { + rules: { + "@typescript-eslint/no-unused-vars": [ + "warn", + { varsIgnorePattern: "^_", argsIgnorePattern: "^_" }, + ], + }, + }, ); diff --git a/packages/compiler/templates/library-ts/package.json b/packages/compiler/templates/library-ts/package.json index 2a104d5c60b..456e579ed0a 100644 --- a/packages/compiler/templates/library-ts/package.json +++ b/packages/compiler/templates/library-ts/package.json @@ -19,8 +19,7 @@ }, "devDependencies": { "@types/node": "latest", - "@typescript-eslint/eslint-plugin": "^8.15.0", - "@typescript-eslint/parser": "^8.15.0", + "typescript-eslint": "^8.49.0", "@typespec/compiler": "latest", "@typespec/library-linter": "latest", "eslint": "^9.15.0", diff --git a/packages/compiler/templates/library-ts/test/decorators.test.ts.mu b/packages/compiler/templates/library-ts/test/decorators.test.ts.mu index 18b154793df..f79480f86f2 100644 --- a/packages/compiler/templates/library-ts/test/decorators.test.ts.mu +++ b/packages/compiler/templates/library-ts/test/decorators.test.ts.mu @@ -1,29 +1,25 @@ import { strictEqual } from "node:assert"; -import { describe, it, beforeEach } from "node:test"; -import type { Operation } from "@typespec/compiler"; -import { BasicTestRunner, expectDiagnostics, extractCursor } from "@typespec/compiler/testing"; +import { describe, it } from "node:test"; +import type { Operation, Program } from "@typespec/compiler"; +import { expectDiagnostics } from "@typespec/compiler/testing"; import { getAlternateName } from "../src/decorators.js"; -import { create{{#casing.pascalCase}}{{name}}{{/casing.pascalCase}}TestRunner } from "./test-host.js"; +import { Tester } from "./test-host.js"; describe("decorators", () => { - let runner: BasicTestRunner; - - beforeEach(async () => { - runner = await create{{#casing.pascalCase}}{{name}}{{/casing.pascalCase}}TestRunner(); - }) - describe("@alternateName", () => { it("set alternate name on operation", async () => { - const { test } = (await runner.compile( - `@alternateName("bar") @test op test(): void;` - )) as { test: Operation }; - strictEqual(getAlternateName(runner.program, test), "bar"); + const { test, program } = (await Tester.compile(` + using {{#casing.pascalCase}}{{name}}{{/casing.pascalCase}}; + @alternateName("bar") @test op test(): void; + `)) as unknown as { test: Operation; program: Program }; + strictEqual(getAlternateName(program, test), "bar"); }); it("emit diagnostic if not used on an operation", async () => { - const diagnostics = await runner.diagnose( - `@alternateName("bar") model Test {}` - ); + const diagnostics = await Tester.diagnose(` + using {{#casing.pascalCase}}{{name}}{{/casing.pascalCase}}; + @alternateName("bar") model Test {} + `); expectDiagnostics(diagnostics, { severity: "error", code: "decorator-wrong-target", @@ -33,15 +29,14 @@ describe("decorators", () => { it("emit diagnostic if using banned name", async () => { - const {pos, source} = extractCursor(`@alternateName(┆"banned") op test(): void;`) - const diagnostics = await runner.diagnose( - source - ); + const diagnostics = await Tester.diagnose(` + using {{#casing.pascalCase}}{{name}}{{/casing.pascalCase}}; + @alternateName("banned") op test(): void; + `); expectDiagnostics(diagnostics, { severity: "error", code: "{{name}}/banned-alternate-name", - message: `Banned alternate name "banned".`, - pos: pos + runner.autoCodeOffset + message: `Banned alternate name "banned".` }) }); }); diff --git a/packages/compiler/templates/library-ts/test/test-host.ts.mu b/packages/compiler/templates/library-ts/test/test-host.ts.mu index b75e5c1045d..e87ec478d83 100644 --- a/packages/compiler/templates/library-ts/test/test-host.ts.mu +++ b/packages/compiler/templates/library-ts/test/test-host.ts.mu @@ -1,17 +1,7 @@ -import { createTestHost, createTestWrapper } from "@typespec/compiler/testing"; -import { {{#casing.pascalCase}}{{name}}{{/casing.pascalCase}}TestLibrary } from "../src/testing/index.js"; +import { resolvePath } from "@typespec/compiler"; +import { createTester } from "@typespec/compiler/testing"; -export async function create{{#casing.pascalCase}}{{name}}{{/casing.pascalCase}}TestHost() { - return createTestHost({ - libraries: [{{#casing.pascalCase}}{{name}}{{/casing.pascalCase}}TestLibrary], - }); -} - -export async function create{{#casing.pascalCase}}{{name}}{{/casing.pascalCase}}TestRunner() { - const host = await create{{#casing.pascalCase}}{{name}}{{/casing.pascalCase}}TestHost(); - - return createTestWrapper(host, { - autoUsings: ["{{#casing.pascalCase}}{{name}}{{/casing.pascalCase}}"] - }); -} +export const Tester = createTester(resolvePath(import.meta.dirname, "../.."), { + libraries: ["{{name}}"], +}).import("{{name}}"); diff --git a/packages/compiler/templates/scaffolding.json b/packages/compiler/templates/scaffolding.json index d9f344aa50e..c520123fa79 100644 --- a/packages/compiler/templates/scaffolding.json +++ b/packages/compiler/templates/scaffolding.json @@ -2,7 +2,7 @@ "rest": { "title": "Generic REST API", "description": "Create a project representing a generic REST API service.", - "compilerVersion": "1.8.0", + "compilerVersion": "1.11.0", "libraries": [ "@typespec/http", "@typespec/rest", @@ -70,7 +70,7 @@ "target": "library", "title": "TypeSpec library", "description": "Build your own TypeSpec library with custom types, decorators or linters.", - "compilerVersion": "1.8.0", + "compilerVersion": "1.11.0", "libraries": [], "files": [ { @@ -147,7 +147,7 @@ "target": "library", "title": "TypeSpec emitter", "description": "Create a new package that emits artifacts from TypeSpec.", - "compilerVersion": "1.8.0", + "compilerVersion": "1.11.0", "libraries": [], "files": [ { diff --git a/packages/compiler/test/binder.test.ts b/packages/compiler/test/binder.test.ts index 488799be5da..32899465e99 100644 --- a/packages/compiler/test/binder.test.ts +++ b/packages/compiler/test/binder.test.ts @@ -11,6 +11,7 @@ import { InterfaceStatementNode, JsSourceFileNode, ModelStatementNode, + ModifierFlags, NodeFlags, Sym, SymbolFlags, @@ -421,20 +422,12 @@ describe("compiler: binder", () => { flags: SymbolFlags.Decorator | SymbolFlags.Declaration | SymbolFlags.Implementation, declarations: [SyntaxKind.JsSourceFile], }, - fn2: { - flags: SymbolFlags.Function | SymbolFlags.Declaration | SymbolFlags.Implementation, - declarations: [SyntaxKind.JsSourceFile], - }, }, }, "@myDec": { flags: SymbolFlags.Decorator | SymbolFlags.Declaration | SymbolFlags.Implementation, declarations: [SyntaxKind.JsSourceFile], }, - fn: { - flags: SymbolFlags.Function | SymbolFlags.Declaration | SymbolFlags.Implementation, - declarations: [SyntaxKind.JsSourceFile], - }, }, }, }); @@ -473,6 +466,39 @@ describe("compiler: binder", () => { }); }); + it("binds $functions in JS file", () => { + const exports = { + $functions: { + "Foo.Bar": { myFn2: () => {} }, + "": { myFn: () => {} }, + }, + }; + + const sourceFile = bindJs(exports); + assertBindings("jsFile", sourceFile.symbol.exports!, { + Foo: { + flags: SymbolFlags.Namespace | SymbolFlags.Declaration, + declarations: [SyntaxKind.JsNamespaceDeclaration], + exports: { + Bar: { + flags: SymbolFlags.Namespace | SymbolFlags.Declaration, + declarations: [SyntaxKind.JsNamespaceDeclaration], + exports: { + myFn2: { + flags: SymbolFlags.Function | SymbolFlags.Declaration | SymbolFlags.Implementation, + declarations: [SyntaxKind.JsSourceFile], + }, + }, + }, + }, + }, + myFn: { + flags: SymbolFlags.Function | SymbolFlags.Declaration | SymbolFlags.Implementation, + declarations: [SyntaxKind.JsSourceFile], + }, + }); + }); + function bindTypeSpec(code: string) { const sourceFile = parse(code); expectDiagnosticEmpty(sourceFile.parseDiagnostics); @@ -565,5 +591,7 @@ function createJsSourceFile(exports: any): JsSourceFileNode { pos: 0, end: 0, flags: NodeFlags.None, + modifiers: [], + modifierFlags: ModifierFlags.None, }; } diff --git a/packages/compiler/test/checker/alias.test.ts b/packages/compiler/test/checker/alias.test.ts index cef3c4df52e..2ba57aef012 100644 --- a/packages/compiler/test/checker/alias.test.ts +++ b/packages/compiler/test/checker/alias.test.ts @@ -1,39 +1,23 @@ import { ok, strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; -import { Model, Namespace, Type, Union } from "../../src/core/types.js"; -import { - TestHost, - createTestHost, - expectDiagnosticEmpty, - expectDiagnostics, -} from "../../src/testing/index.js"; +import { describe, it } from "vitest"; +import { Model, Type, Union } from "../../src/core/types.js"; +import { expectDiagnosticEmpty, expectDiagnostics, mockFile, t } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; describe("compiler: aliases", () => { - let testHost: TestHost; - - beforeEach(async () => { - testHost = await createTestHost(); - }); - function getOptionAtIndex(union: Union, index: number): Type { return [...union.variants.values()][index].type; } it("can alias a union expression", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { A } = await Tester.compile(t.code` alias Foo = int32 | string; alias Bar = "hi" | 10; alias FooBar = Foo | Bar; - @test model A { + model ${t.model("A")} { prop: FooBar } - `, - ); - const { A } = (await testHost.compile("./")) as { - A: Model; - }; + `); const propType: Union = A.properties.get("prop")!.type as Union; strictEqual(propType.kind, "Union"); @@ -45,22 +29,16 @@ describe("compiler: aliases", () => { }); it("can alias a deep union expression", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { A } = await Tester.compile(t.code` alias Foo = int32 | string; alias Bar = "hi" | 10; alias Baz = Foo | Bar; alias FooBar = Baz | "bye"; - @test model A { + model ${t.model("A")} { prop: FooBar } - `, - ); - const { A } = (await testHost.compile("./")) as { - A: Model; - }; + `); const propType: Union = A.properties.get("prop")!.type as Union; strictEqual(propType.kind, "Union"); @@ -73,20 +51,13 @@ describe("compiler: aliases", () => { }); it("can alias a union expression with parameters", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { A } = await Tester.compile(t.code` alias Foo = int32 | TEST; - @test model A { + model ${t.model("A")} { prop: Foo<"hi"> } - `, - ); - - const { A } = (await testHost.compile("./")) as { - A: Model; - }; + `); const propType: Union = A.properties.get("prop")!.type as Union; strictEqual(propType.kind, "Union"); @@ -96,21 +67,14 @@ describe("compiler: aliases", () => { }); it("can alias a deep union expression with parameters", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { A } = await Tester.compile(t.code` alias Foo = int32 | T; alias Bar = Foo | Foo; - @test model A { + model ${t.model("A")} { prop: Bar<"hi", 42> } - `, - ); - - const { A } = (await testHost.compile("./")) as { - A: Model; - }; + `); const propType: Union = A.properties.get("prop")!.type as Union; strictEqual(propType.kind, "Union"); @@ -122,21 +86,15 @@ describe("compiler: aliases", () => { }); it("can alias an intersection expression", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { A } = await Tester.compile(t.code` alias Foo = {a: string} & {b: string}; alias Bar = {c: string} & {d: string}; alias FooBar = Foo & Bar; - @test model A { + model ${t.model("A")} { prop: FooBar } - `, - ); - const { A } = (await testHost.compile("./")) as { - A: Model; - }; + `); const propType: Model = A.properties.get("prop")!.type as Model; strictEqual(propType.kind, "Model"); @@ -148,24 +106,15 @@ describe("compiler: aliases", () => { }); it("can be used like any model", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model Test { a: string }; + const { Test, A, B, C } = await Tester.compile(t.code` + model ${t.model("Test")} { a: string }; alias Alias = Test; - @test model A extends Alias { }; - @test model B { ... Alias }; - @test model C { c: Alias }; - `, - ); - const { Test, A, B, C } = (await testHost.compile("./")) as { - Test: Model; - A: Model; - B: Model; - C: Model; - }; + model ${t.model("A")} extends Alias { }; + model ${t.model("B")} { ... Alias }; + model ${t.model("C")} { c: Alias }; + `); strictEqual(A.baseModel, Test); ok(B.properties.has("a")); @@ -173,57 +122,37 @@ describe("compiler: aliases", () => { }); it("can be used like any namespace", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Bar, Baz } = await Tester.compile(t.code` namespace Foo { - @test model Bar { } + model ${t.model("Bar")} { } } alias AliasFoo = Foo; - @test model Baz { x: AliasFoo.Bar }; - `, - ); - - const { Bar, Baz } = (await testHost.compile("./")) as { - Bar: Model; - Baz: Model; - }; + model ${t.model("Baz")} { x: AliasFoo.Bar }; + `); strictEqual(Baz.properties.get("x")!.type, Bar); }); it("model expression defined in alias use containing namespace", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test namespace Foo { + const { Test, Foo } = await Tester.compile(t.code` + namespace ${t.namespace("Foo")} { alias B = {a: string}; } - @test model Test { + model ${t.model("Test")} { prop: Foo.B; } - `, - ); - - const { Test, Foo } = (await testHost.compile("./")) as { - Foo: Namespace; - Test: Model; - }; + `); const expr = Test.properties.get("prop")!.type as Model; strictEqual(expr.namespace, Foo); }); it("emit diagnostics if assign itself", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` alias A = A; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "circular-alias-type", message: "Alias type 'A' recursively references itself.", @@ -231,15 +160,11 @@ describe("compiler: aliases", () => { }); it("emit single diagnostics if assign itself as generic and is referenced", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` alias A = A; model Foo {a: A} - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "circular-alias-type", message: "Alias type 'A' recursively references itself.", @@ -247,13 +172,9 @@ describe("compiler: aliases", () => { }); it("emit diagnostics if reference itself", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` alias A = "string" | A; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "circular-alias-type", message: "Alias type 'A' recursively references itself.", @@ -262,53 +183,38 @@ describe("compiler: aliases", () => { // REGRESSION TEST: https://github.com/Azure/typespec-azure/issues/3365 it("alias an namespace in JS file shouldn't crash", async () => { - testHost.addJsFile("lib.js", { - namespace: "Foo.Bar", - $foo: () => {}, - }); - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./lib.js"; - namespace Foo.Bar { op abc(): void;} - - alias Aliased = Foo.Bar; - op getSmurf is Aliased.abc; - - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + const diagnostics = await Tester.files({ + "lib.js": mockFile.js({ + namespace: "Foo.Bar", + $foo: () => {}, + }), + }).import("./lib.js").diagnose(` + namespace Foo.Bar { op abc(): void;} + + alias Aliased = Foo.Bar; + op getSmurf is Aliased.abc; + `); expectDiagnosticEmpty(diagnostics); }); // REGRESSION TEST: https://github.com/microsoft/typespec/issues/3125 it("trying to access member of aliased union expression shouldn't crash", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` alias A = {foo: string} | {bar: string}; alias Aliased = A.prop; - - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "invalid-ref", message: `Cannot resolve 'prop' in node AliasStatement since it has no members. Did you mean to use "::" instead of "."?`, }); }); it("trying to access unknown member of aliased model expression shouldn't crash", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` alias A = {foo: string}; alias Aliased = A.prop; - - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "invalid-ref", message: `Model doesn't have member prop`, diff --git a/packages/compiler/test/checker/augment-decorators.test.ts b/packages/compiler/test/checker/augment-decorators.test.ts index 27e1b692963..54c87fba67d 100644 --- a/packages/compiler/test/checker/augment-decorators.test.ts +++ b/packages/compiler/test/checker/augment-decorators.test.ts @@ -1,128 +1,96 @@ import { ok, strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { StringLiteral, Type } from "../../src/core/types.js"; -import { - TestHost, - createTestHost, - expectDiagnosticEmpty, - expectDiagnostics, -} from "../../src/testing/index.js"; - -let testHost: TestHost; - -beforeEach(async () => { - testHost = await createTestHost(); -}); +import { expectDiagnosticEmpty, expectDiagnostics, mockFile, t } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; it("run decorator without arguments", async () => { let blueThing: Type | undefined; - testHost.addJsFile("test.js", { - $blue(_: any, t: Type) { - blueThing = t; - }, - }); - - testHost.addTypeSpecFile( - "test.tsp", - ` - import "./test.js"; - - @test model Foo { }; + const { Foo } = await Tester.files({ + "test.js": mockFile.js({ + $blue(_: any, t: Type) { + blueThing = t; + }, + }), + }).import("./test.js").compile(t.code` + model ${t.model("Foo")} { }; @@blue(Foo); - `, - ); - - const { Foo } = await testHost.compile("test.tsp"); + `); strictEqual(Foo, blueThing); }); it("run decorator with arguments", async () => { let customName: string | undefined; - testHost.addJsFile("test.js", { - $customName(_: any, t: Type, n: StringLiteral) { - customName = n.value; - }, - }); - - testHost.addTypeSpecFile( - "test.tsp", - ` - import "./test.js"; - + await Tester.files({ + "test.js": mockFile.js({ + $customName(_: any, t: Type, n: StringLiteral) { + customName = n.value; + }, + }), + }).import("./test.js").compile(` model Foo { }; @@customName(Foo, "FooCustom"); - `, - ); - - await testHost.compile("test.tsp"); + `); strictEqual(customName, "FooCustom"); }); describe("declaration scope", () => { - let blueThing: Type | undefined; + it("can be defined at the root of document", async () => { + let blueThing: Type | undefined; - beforeEach(() => { - blueThing = undefined; - testHost.addJsFile("test.js", { - $blue(_: any, t: Type) { - blueThing = t; - }, - }); - }); + const { Foo } = await Tester.files({ + "test.js": mockFile.js({ + $blue(_: any, t: Type) { + blueThing = t; + }, + }), + }).import("./test.js").compile(t.code` + model ${t.model("Foo")} { }; - it("can be defined at the root of document", async () => { - testHost.addTypeSpecFile( - "test.tsp", - ` - import "./test.js"; - - @test model Foo { }; - @@blue(Foo); - `, - ); - - const { Foo } = await testHost.compile("test.tsp"); + `); strictEqual(Foo, blueThing); }); it("can be defined in blockless namespace", async () => { - testHost.addTypeSpecFile( - "test.tsp", - ` - import "./test.js"; - + let blueThing: Type | undefined; + + const { Foo } = await Tester.files({ + "test.js": mockFile.js({ + $blue(_: any, t: Type) { + blueThing = t; + }, + }), + }).import("./test.js").compile(t.code` namespace MyLibrary; - @test model Foo { }; - - @@blue(Foo); - `, - ); + model ${t.model("Foo")} { }; - const { Foo } = await testHost.compile("test.tsp"); + @@blue(Foo); + `); strictEqual(Foo, blueThing); }); it("can be defined in namespace", async () => { - testHost.addTypeSpecFile( - "test.tsp", - ` - import "./test.js"; - + let blueThing: Type | undefined; + + const { Foo } = await Tester.files({ + "test.js": mockFile.js({ + $blue(_: any, t: Type) { + blueThing = t; + }, + }), + }).import("./test.js").compile(t.code` namespace MyLibrary { - @test model Foo { }; - + model ${t.model("Foo")} { }; + @@blue(Foo); } - `, - ); - - const { Foo } = await testHost.compile("test.tsp"); + `); strictEqual(Foo, blueThing); }); @@ -132,42 +100,38 @@ describe("declaration scope", () => { // As we resolve the member symbols and meta types early, // alias `FactoryString` would have checked the template instance `Factory` // which would then have checked `Foo` and then `@@blue` wouldn't have been run - testHost.addTypeSpecFile( - "test.tsp", - ` - import "./test.js"; - - @test model Foo {}; + let blueThing: Type | undefined; + + const { Foo } = await Tester.files({ + "test.js": mockFile.js({ + $blue(_: any, t: Type) { + blueThing = t; + }, + }), + }).import("./test.js").compile(t.code` + model ${t.model("Foo")} {}; interface Factory { op Action(): Foo; } alias FactoryString = Factory; - + op test is FactoryString.Action; @@doc(Foo, "This doc"); @@blue(Foo); - `, - ); - - const { Foo } = await testHost.compile("test.tsp"); + `); strictEqual(Foo, blueThing); }); }); describe("cannot augment expressions", () => { it("model expressions", async () => { - testHost.addTypeSpecFile( - "test.tsp", - ` - alias A = { some: string}; - @@doc(A, "This doc"); - `, - ); - - const diagnostics = await testHost.diagnose("test.tsp"); + const diagnostics = await Tester.diagnose(` + alias A = { some: string}; + @@doc(A, "This doc"); + `); expectDiagnostics(diagnostics, { code: "augment-decorator-target", message: "Cannot augment model expressions.", @@ -175,15 +139,10 @@ describe("cannot augment expressions", () => { }); it("union expressions", async () => { - testHost.addTypeSpecFile( - "test.tsp", - ` - alias A = string | int32; - @@doc(A, "This doc"); - `, - ); - - const diagnostics = await testHost.diagnose("test.tsp"); + const diagnostics = await Tester.diagnose(` + alias A = string | int32; + @@doc(A, "This doc"); + `); expectDiagnostics(diagnostics, { code: "augment-decorator-target", message: "Cannot augment union expressions.", @@ -196,27 +155,22 @@ describe("augment types", () => { let customName: string | undefined; let runOnTarget: Type | undefined; - testHost.addJsFile("test.js", { - $customName(_: any, t: Type, n: StringLiteral) { - runOnTarget = t; - customName = n.value; - }, - }); - - testHost.addTypeSpecFile( - "test.tsp", - ` - import "./test.js"; - - ${code} - - @@customName(${reference}, "FooCustom"); - `, - ); + const [result, diagnostics] = await Tester.files({ + "test.js": mockFile.js({ + $customName(_: any, t: Type, n: StringLiteral) { + runOnTarget = t; + customName = n.value; + }, + }), + }).import("./test.js").compileAndDiagnose(` + ${code} + + @@customName(${reference}, "FooCustom"); + `); - const [result, diagnostics] = await testHost.compileAndDiagnose("test.tsp"); expectDiagnosticEmpty(diagnostics); ok(result.target, `Missing element decorated with '@test("target")'`); + strictEqual(result.target?.entityKind, "Type"); strictEqual(runOnTarget?.kind, result.target.kind); strictEqual(runOnTarget, result.target); strictEqual(customName, "FooCustom"); @@ -345,28 +299,16 @@ describe("augment types", () => { describe("emit diagnostic", () => { function diagnose(code: string) { - testHost.addJsFile("test.js", { - $customName(_: any, t: Type, n: string) {}, - }); - - testHost.addTypeSpecFile( - "test.tsp", - ` - import "./test.js"; - ${code} - `, - ); - return testHost.diagnose("test.tsp"); + return Tester.files({ + "test.js": mockFile.js({ + $customName(_: any, t: Type, n: string) {}, + }), + }) + .import("./test.js") + .diagnose(code); } it("if using unknown decorator", async () => { - testHost.addTypeSpecFile( - "test.tsp", - ` - import "./test.js"; - - `, - ); const diagnostics = await diagnose(` model Foo {} @@notDefined(Foo, "A string Foo"); @@ -464,27 +406,22 @@ describe("emit diagnostic", () => { }); describe("augment location", () => { - async function expectAugmentTarget(code: string) { + async function expectAugmentTarget(code: string, extraFiles?: Record) { let customName: string | undefined; let runOnTarget: Type | undefined; - testHost.addJsFile("test.js", { - $customName(_: any, t: Type, n: StringLiteral) { - runOnTarget = t; - customName = n.value; - }, - }); - - testHost.addTypeSpecFile( - "test.tsp", - ` - import "./test.js"; - - ${code} - `, - ); - - const { target } = await testHost.compile("test.tsp"); + const { target } = await Tester.files({ + "test.js": mockFile.js({ + $customName(_: any, t: Type, n: StringLiteral) { + runOnTarget = t; + customName = n.value; + }, + }), + ...extraFiles, + }) + .import("./test.js") + .compile(code); + strictEqual(target?.entityKind, "Type"); strictEqual(runOnTarget?.kind, target.kind); strictEqual(runOnTarget, target); strictEqual(customName, "FooCustom"); @@ -503,22 +440,24 @@ describe("augment location", () => { }); it("augment type in another file checked before", async () => { - testHost.addTypeSpecFile("lib.tsp", `@test("target") model Foo {} `); - - await expectAugmentTarget(` + await expectAugmentTarget( + ` import "./lib.tsp"; @@customName(Foo, "FooCustom"); - `); + `, + { "lib.tsp": `@test("target") model Foo {} ` }, + ); }); it("augment type in another file checked after", async () => { - testHost.addTypeSpecFile("lib.tsp", `@@customName(Foo, "FooCustom"); `); - - await expectAugmentTarget(` + await expectAugmentTarget( + ` import "./lib.tsp"; @test("target") model Foo {} - `); + `, + { "lib.tsp": `@@customName(Foo, "FooCustom"); ` }, + ); }); }); @@ -527,23 +466,18 @@ describe("augment order", () => { let customName: string | undefined; let runOnTarget: Type | undefined; - testHost.addJsFile("test.js", { - $customName(_: any, t: Type, n: StringLiteral) { - runOnTarget = t; - customName = n.value; - }, - }); - - testHost.addTypeSpecFile( - "test.tsp", - ` - import "./test.js"; - - ${code} - `, - ); - - const { target } = await testHost.compile("test.tsp"); + const { target } = await Tester.files({ + "test.js": mockFile.js({ + $customName(_: any, t: Type, n: StringLiteral) { + runOnTarget = t; + customName = n.value; + }, + }), + }) + .import("./test.js") + .compile(code); + + strictEqual(target?.entityKind, "Type"); strictEqual(runOnTarget?.kind, target.kind); strictEqual(runOnTarget, target); strictEqual(customName, "FooCustom"); diff --git a/packages/compiler/test/checker/check-parse-errors.test.ts b/packages/compiler/test/checker/check-parse-errors.test.ts index c9845ab95b0..519e90685c0 100644 --- a/packages/compiler/test/checker/check-parse-errors.test.ts +++ b/packages/compiler/test/checker/check-parse-errors.test.ts @@ -1,29 +1,19 @@ -import { beforeEach, describe, it } from "vitest"; -import { TestHost, createTestHost, expectDiagnostics } from "../../src/testing/index.js"; +import { describe, it } from "vitest"; +import { expectDiagnostics } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; describe("compiler: semantic checks on source with parse errors", () => { - let testHost: TestHost; - - beforeEach(async () => { - testHost = await createTestHost(); - }); - it("reports semantic errors in addition to parse errors", async () => { - testHost.addTypeSpecFile( - "main.tsp", - `model M extends Q { + const diagnostics = await Tester.diagnose(`model M extends Q { a: B; a: C; - `, - ); - - const diagnostics = await testHost.diagnose("./"); + `); expectDiagnostics(diagnostics, [ { message: /'}' expected/ }, { message: /Unknown identifier Q/ }, { message: /Unknown identifier B/ }, { message: /Unknown identifier C/ }, - { message: /Model already has a property named a/ }, + { message: /Model M already has a property named a/ }, ]); }); }); diff --git a/packages/compiler/test/checker/clone-type.test.ts b/packages/compiler/test/checker/clone-type.test.ts index 841ea53469c..171f009d74e 100644 --- a/packages/compiler/test/checker/clone-type.test.ts +++ b/packages/compiler/test/checker/clone-type.test.ts @@ -1,46 +1,35 @@ import { deepStrictEqual, ok, strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import type { Program } from "../../src/core/program.js"; -import { DecoratorContext, Type } from "../../src/core/types.js"; -import { TestHost, createTestHost } from "../../src/testing/index.js"; +import { type DecoratorContext, type Model, type Type } from "../../src/core/types.js"; +import { mockFile, t, TemplateWithMarkers } from "../../src/testing/index.js"; import { createRekeyableMap } from "../../src/utils/misc.js"; +import { Tester } from "../tester.js"; describe("compiler: type cloning", () => { - let testHost: TestHost; - const blues = new Set(); + const blues = new Set(); - beforeEach(async () => { - testHost = await createTestHost(); - testHost.addJsFile("test.js", { + const BlueTester = Tester.files({ + "test.js": mockFile.js({ $blue(_: Program, t: Type) { blues.add(t); }, - }); - }); + }), + }).import("./test.js"); - testClone("models", "@test @blue model test { p: string; }"); - testClone("model properties", "model Foo { @test @blue test: string }"); - testClone("operations", "@test @blue op test(): string;"); - testClone("parameters", "op test(@test @blue test: string): string;"); - testClone("enums", "@test @blue enum test { e }"); - testClone("enum members", "enum Foo { @test @blue test: 1 }"); - testClone("interfaces", "@test @blue interface test { o(): void; }"); - testClone("unions", "@test @blue union test { s: string; n: int32; }"); + testClone("models", t.code`@blue model ${t.model("test")} { p: string; }`); + testClone("model properties", t.code`model Foo { @blue ${t.modelProperty("test")}: string }`); + testClone("operations", t.code`@blue op ${t.op("test")}(): string;`); + testClone("parameters", t.code`op test(@blue ${t.modelProperty("test")}: string): string;`); + testClone("enums", t.code`@blue enum ${t.enum("test")} { e }`); + testClone("enum members", t.code`enum Foo { @blue ${t.enumMember("test")}: 1 }`); + testClone("interfaces", t.code`@blue interface ${t.interface("test")} { o(): void; }`); + testClone("unions", t.code`@blue union ${t.union("test")} { s: string; n: int32; }`); - function testClone(description: string, code: string) { + function testClone(description: string, code: TemplateWithMarkers<{ test: Type }>) { it(`clones ${description}`, async () => { - testHost.addTypeSpecFile( - "test.tsp", - ` - import "./test.js"; - ${code} - `, - ); - - const { test } = (await testHost.compile("./test.tsp")) as { - test: Type; - }; - const clone = testHost.program.checker.cloneType(test); + const { test, program } = await BlueTester.compile(code); + const clone = program.checker.cloneType(test); ok(blues.has(clone!), "the clone is blue"); deepStrictEqual(test, clone!); @@ -53,8 +42,8 @@ describe("compiler: type cloning", () => { args: [], }); - strictEqual(test.decorators.length, 2); - strictEqual(clone.decorators.length, 3); + strictEqual(test.decorators.length, 1); + strictEqual(clone.decorators.length, 2); } // Ensure that cloned members are re-parented @@ -84,28 +73,28 @@ describe("compiler: type cloning", () => { // Ensure that you can set your own member list switch (test.kind) { case "Model": - const newModel = testHost.program.checker.cloneType(test, { + const newModel = program.checker.cloneType(test, { properties: createRekeyableMap(), }); ok(test.properties.size > 0, "no properties to change"); strictEqual(newModel.properties.size, 0, "properties not set."); break; case "Enum": - const newEnum = testHost.program.checker.cloneType(test, { + const newEnum = program.checker.cloneType(test, { members: createRekeyableMap(), }); ok(test.members.size > 0, "no members to change"); strictEqual(newEnum.members.size, 0, "members not set"); break; case "Interface": - const newInterface = testHost.program.checker.cloneType(test, { + const newInterface = program.checker.cloneType(test, { operations: createRekeyableMap(), }); ok(test.operations.size > 0, "no operations to change"); strictEqual(newInterface.operations.size, 0, "operations not set"); break; case "Union": - const newUnion = testHost.program.checker.cloneType(test, { + const newUnion = program.checker.cloneType(test, { variants: createRekeyableMap(), }); ok(test.variants.size > 0, "no variants to change"); @@ -116,20 +105,16 @@ describe("compiler: type cloning", () => { } it("preserves template arguments", async () => { - testHost.addTypeSpecFile( - "test.tsp", - ` + const { test, program } = await Tester.compile(t.code` model Template {} model Test { - @test test: Template; + ${t.modelProperty("test")}: Template; } - `, - ); - - const { test } = await testHost.compile("./test.tsp"); + `); strictEqual(test.kind, "ModelProperty" as const); strictEqual(test.type.kind, "Model" as const); - const clone = testHost.program.checker.cloneType(test.type); - deepStrictEqual(test.type.templateMapper, clone.templateMapper); + const testModel = test.type as Model; + const clone = program.checker.cloneType(testModel); + deepStrictEqual(testModel.templateMapper, clone.templateMapper); }); }); diff --git a/packages/compiler/test/checker/decorators.test.ts b/packages/compiler/test/checker/decorators.test.ts index bc5c2dd0e1a..cd46988fc77 100644 --- a/packages/compiler/test/checker/decorators.test.ts +++ b/packages/compiler/test/checker/decorators.test.ts @@ -6,125 +6,123 @@ import { DecoratorContext, DecoratorFunction, Model, - Namespace, - PackageFlags, setTypeSpecNamespace, } from "../../src/index.js"; -import { - BasicTestRunner, - TestHost, - createTestHost, - createTestWrapper, - expectDiagnostics, - mockFile, -} from "../../src/testing/index.js"; +import { expectDiagnostics, mockFile, t } from "../../src/testing/index.js"; import { Tester } from "../tester.js"; -describe("compiler: checker: decorators", () => { - let testHost: TestHost; - - beforeEach(async () => { - testHost = await createTestHost(); - }); +const DecTester = Tester.files({ + "test.js": mockFile.js({ $testDec: () => {} }), +}) + .import("./test.js") + .using("TypeSpec.Reflection"); +describe("compiler: checker: decorators", () => { describe("declaration", () => { - let runner: BasicTestRunner; - let $testDec: any; - let testJs: Record; - beforeEach(() => { - $testDec = () => {}; - testJs = { - $testDec, - }; - testHost.addJsFile("test.js", testJs); - runner = createTestWrapper(testHost, { - autoImports: ["./test.js"], - autoUsings: ["TypeSpec.Reflection"], - }); - }); - describe("bind implementation to declaration", () => { - let $otherDec: DecoratorFunction; - function expectDecorator(ns: Namespace) { - const otherDecDecorator = ns.decoratorDeclarations.get("otherDec"); - ok(otherDecDecorator); - strictEqual(otherDecDecorator.implementation, $otherDec); - } - describe("with $fn", () => { - beforeEach(() => { - $otherDec = () => {}; - testJs.$otherDec = $otherDec; - }); - it("defined at root", async () => { - await runner.compile(` - extern dec otherDec(target: unknown); - `); + const $otherDec: DecoratorFunction = () => {}; + const { program } = await Tester.files({ + "test.js": mockFile.js({ + $testDec: () => {}, + $otherDec, + }), + }) + .import("./test.js") + .using("TypeSpec.Reflection").compile(` + extern dec otherDec(target: unknown); + `); - expectDecorator(runner.program.getGlobalNamespaceType()); + const otherDecDecorator = program + .getGlobalNamespaceType() + .decoratorDeclarations.get("otherDec"); + ok(otherDecDecorator); + strictEqual(otherDecDecorator.implementation, $otherDec); }); it("in a namespace", async () => { + const $otherDec: DecoratorFunction = () => {}; setTypeSpecNamespace("Foo.Bar", $otherDec); - await runner.compile(` - namespace Foo.Bar { - extern dec otherDec(target: unknown); - } - `); - - const ns = runner.program - .getGlobalNamespaceType() - .namespaces.get("Foo") - ?.namespaces.get("Bar"); + const { program } = await Tester.files({ + "test.js": mockFile.js({ + $testDec: () => {}, + $otherDec, + }), + }) + .import("./test.js") + .using("TypeSpec.Reflection").compile(` + namespace Foo.Bar { + extern dec otherDec(target: unknown); + } + `); + + const ns = program.getGlobalNamespaceType().namespaces.get("Foo")?.namespaces.get("Bar"); ok(ns); - expectDecorator(ns); + const otherDecDecorator = ns.decoratorDeclarations.get("otherDec"); + ok(otherDecDecorator); + strictEqual(otherDecDecorator.implementation, $otherDec); }); }); describe("with $decorators", () => { it("defined at root", async () => { - testJs.$decorators = { "": { otherDec: $otherDec } }; - - await runner.compile(` - extern dec otherDec(target: unknown); - `); + const $otherDec: DecoratorFunction = () => {}; + const { program } = await Tester.files({ + "test.js": mockFile.js({ + $testDec: () => {}, + $decorators: { "": { otherDec: $otherDec } }, + }), + }) + .import("./test.js") + .using("TypeSpec.Reflection").compile(` + extern dec otherDec(target: unknown); + `); - expectDecorator(runner.program.getGlobalNamespaceType()); + const otherDecDecorator = program + .getGlobalNamespaceType() + .decoratorDeclarations.get("otherDec"); + ok(otherDecDecorator); + strictEqual(otherDecDecorator.implementation, $otherDec); }); it("in a namespace", async () => { - testJs.$decorators = { "Foo.Bar": { otherDec: $otherDec } }; - - await runner.compile(` - namespace Foo.Bar { - extern dec otherDec(target: unknown); - } - `); - - const ns = runner.program - .getGlobalNamespaceType() - .namespaces.get("Foo") - ?.namespaces.get("Bar"); + const $otherDec: DecoratorFunction = () => {}; + const { program } = await Tester.files({ + "test.js": mockFile.js({ + $testDec: () => {}, + $decorators: { "Foo.Bar": { otherDec: $otherDec } }, + }), + }) + .import("./test.js") + .using("TypeSpec.Reflection").compile(` + namespace Foo.Bar { + extern dec otherDec(target: unknown); + } + `); + + const ns = program.getGlobalNamespaceType().namespaces.get("Foo")?.namespaces.get("Bar"); ok(ns); - expectDecorator(ns); + const otherDecDecorator = ns.decoratorDeclarations.get("otherDec"); + ok(otherDecDecorator); + strictEqual(otherDecDecorator.implementation, $otherDec); }); }); }); it("errors if decorator is missing extern modifier", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await DecTester.diagnose(` dec testDec(target: unknown); `); expectDiagnostics(diagnostics, { - code: "decorator-extern", - message: "A decorator declaration must be prefixed with the 'extern' modifier.", + code: "invalid-modifier", + message: "Declaration of type 'dec' is missing required modifier 'extern'.", }); }); it("errors if rest parameter type is not an array expression", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await DecTester.diagnose(` extern dec testDec(target: unknown, ...rest: string); `); expectDiagnostics(diagnostics, { @@ -134,7 +132,7 @@ describe("compiler: checker: decorators", () => { }); it("errors if extern decorator is missing implementation", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await DecTester.diagnose(` extern dec notImplemented(target: unknown); `); expectDiagnostics(diagnostics, { @@ -145,26 +143,24 @@ describe("compiler: checker: decorators", () => { }); describe("usage", () => { - let runner: BasicTestRunner; let calledArgs: any[] | undefined; - let $flags: PackageFlags; + const UsageTester = Tester.files({ + "test.js": mockFile.js({ + $flags: {}, + $testDec: (...args: any[]) => (calledArgs = args), + }), + }) + .import("./test.js") + .using("TypeSpec.Reflection"); + beforeEach(() => { - $flags = {}; calledArgs = undefined; - testHost.addJsFile("test.js", { - $flags, - $testDec: (...args: any[]) => (calledArgs = args), - }); - runner = createTestWrapper(testHost, { - autoImports: ["./test.js"], - autoUsings: ["TypeSpec.Reflection"], - }); }); - function expectDecoratorCalledWith(target: unknown, ...args: unknown[]) { + function expectDecoratorCalledWith(program: any, target: unknown, ...args: unknown[]) { ok(calledArgs, "Decorator was not called."); strictEqual(calledArgs.length, 2 + args.length); - strictEqual(calledArgs[0].program, runner.program); + strictEqual(calledArgs[0].program, program); strictEqual(calledArgs[1], target); for (const [index, arg] of args.entries()) { strictEqual(calledArgs[2 + index], arg); @@ -176,55 +172,51 @@ describe("compiler: checker: decorators", () => { } it("calls a decorator with no argument", async () => { - const { Foo } = await runner.compile(` + const { Foo, program } = await UsageTester.compile(t.code` extern dec testDec(target: unknown); @testDec - @test - model Foo {} + model ${t.model("Foo")} {} `); - expectDecoratorCalledWith(Foo); + expectDecoratorCalledWith(program, Foo); }); it("calls a decorator with arguments", async () => { - const { Foo } = await runner.compile(` + const { Foo, program } = await UsageTester.compile(t.code` extern dec testDec(target: unknown, arg1: valueof string, arg2: valueof string); @testDec("one", "two") - @test - model Foo {} + model ${t.model("Foo")} {} `); - expectDecoratorCalledWith(Foo, "one", "two"); + expectDecoratorCalledWith(program, Foo, "one", "two"); }); it("calls a decorator with optional arguments", async () => { - const { Foo } = await runner.compile(` + const { Foo, program } = await UsageTester.compile(t.code` extern dec testDec(target: unknown, arg1: valueof string, arg2?: valueof string); @testDec("one") - @test - model Foo {} + model ${t.model("Foo")} {} `); - expectDecoratorCalledWith(Foo, "one"); + expectDecoratorCalledWith(program, Foo, "one"); }); it("calls a decorator with rest arguments", async () => { - const { Foo } = await runner.compile(` + const { Foo, program } = await UsageTester.compile(t.code` extern dec testDec(target: unknown, arg1: valueof string, ...args: valueof string[]); @testDec("one", "two", "three", "four") - @test - model Foo {} + model ${t.model("Foo")} {} `); - expectDecoratorCalledWith(Foo, "one", "two", "three", "four"); + expectDecoratorCalledWith(program, Foo, "one", "two", "three", "four"); }); it("errors if not calling with enough arguments", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await UsageTester.diagnose(` extern dec testDec(target: unknown, arg1: string, arg2: string); @testDec("one") @@ -239,22 +231,22 @@ describe("compiler: checker: decorators", () => { }); it("errors if not calling with too many arguments", async () => { - const [{ Foo }, diagnostics] = await runner.compileAndDiagnose(` + const [{ Foo, program }, diagnostics] = await UsageTester.compileAndDiagnose(t.code` extern dec testDec(target: unknown, arg1: valueof string, arg2?: valueof string); @testDec("one", "two", "three") - @test model Foo {} + model ${t.model("Foo")} {} `); expectDiagnostics(diagnostics, { code: "invalid-argument-count", message: "Expected 1-2 arguments, but got 3.", }); - expectDecoratorCalledWith(Foo, "one", "two"); + expectDecoratorCalledWith(program, Foo, "one", "two"); }); it("errors if not calling with argument and decorator expect none", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await UsageTester.diagnose(` extern dec testDec(target: unknown); @testDec("one") @@ -268,7 +260,7 @@ describe("compiler: checker: decorators", () => { }); it("errors if not calling with too few arguments with rest", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await UsageTester.diagnose(` extern dec testDec(target: unknown, arg1: string, ...args: string[]); @testDec @@ -283,7 +275,7 @@ describe("compiler: checker: decorators", () => { }); it("errors if target type is incorrect", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await UsageTester.diagnose(` extern dec testDec(target: Union, arg1: string); @testDec("abc") @@ -298,7 +290,7 @@ describe("compiler: checker: decorators", () => { }); it("errors if argument is not assignable to parameter type", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await UsageTester.diagnose(` extern dec testDec(target: unknown, arg1: string); @testDec(123) @@ -313,7 +305,7 @@ describe("compiler: checker: decorators", () => { }); it("errors if argument is not assignable to rest parameter type", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await UsageTester.diagnose(` extern dec testDec(target: unknown, ...args: string[]); @testDec(123, 456) @@ -335,7 +327,7 @@ describe("compiler: checker: decorators", () => { // Regresssion test for https://github.com/microsoft/typespec/issues/3211 it("augmenting a template model property before a decorator declaration resolve the declaration correctly", async () => { - await runner.compile(` + await UsageTester.compile(` model Foo { prop: T; } @@ -354,12 +346,11 @@ describe("compiler: checker: decorators", () => { value: string, suppress?: boolean, ): Promise { - await runner.compile(` + await UsageTester.compile(` extern dec testDec(target: unknown, arg1: ${type}); ${suppress ? `#suppress "deprecated" "for testing"` : ""} @testDec(${value}) - @test model Foo {} `); return calledArgs![2]; @@ -483,70 +474,50 @@ describe("compiler: checker: decorators", () => { it("can have the same name as types", async () => { let called = false; - testHost.addJsFile("test.js", { - $foo() { - called = true; - }, - }); - - testHost.addTypeSpecFile( - "test.tsp", - ` - import "./test.js"; - model foo { }; - @foo() - model MyFoo { }; - `, - ); - - await testHost.compile("test.tsp"); + await Tester.files({ + "test.js": mockFile.js({ + $foo() { + called = true; + }, + }), + }).import("./test.js").compile(` + model foo { }; + @foo() + model MyFoo { }; + `); ok(called); }); it("doesn't conflict with type bindings at global scope", async () => { - testHost.addJsFile("test.js", { - $foo(_: any, __: any, t: any) {}, - }); - - testHost.addTypeSpecFile( - "test.tsp", - ` - import "./test.js"; - - model foo { } - @foo(foo) - model Bar { } - `, - ); - - await testHost.diagnose("test.tsp"); + await Tester.files({ + "test.js": mockFile.js({ + $foo(_: any, __: any, t: any) {}, + }), + }).import("./test.js").diagnose(` + model foo { } + @foo(foo) + model Bar { } + `); }); it("evaluates in outside-in order", async () => { let result = false; let blueThing: any; - testHost.addJsFile("test.js", { - $blue(_: any, t: any) { - blueThing = t; - }, - $isBlue(_: any, t: any) { - result = blueThing === t; - }, - }); - - testHost.addTypeSpecFile( - "test.tsp", - ` - import "./test.js"; - - @isBlue - @blue - model Foo { }; - `, - ); - - await testHost.diagnose("test.tsp"); + await Tester.files({ + "test.js": mockFile.js({ + $blue(_: any, t: any) { + blueThing = t; + }, + $isBlue(_: any, t: any) { + result = blueThing === t; + }, + }), + }).import("./test.js").diagnose(` + @isBlue + @blue + model Foo { }; + `); ok(result, "expected Foo to be blue in isBlue decorator"); }); }); diff --git a/packages/compiler/test/checker/deprecation.test.ts b/packages/compiler/test/checker/deprecation.test.ts index 56b04ee2ae4..d17801aac0b 100644 --- a/packages/compiler/test/checker/deprecation.test.ts +++ b/packages/compiler/test/checker/deprecation.test.ts @@ -1,27 +1,18 @@ -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { - BasicTestRunner, DiagnosticMatch, - TestHost, - createTestHost, - createTestRunner, - createTestWrapper, expectDiagnosticEmpty, expectDiagnostics, extractCursor, + mockFile, } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; describe("compiler: checker: deprecation", () => { - let runner: BasicTestRunner; - - beforeEach(async () => { - runner = await createTestRunner(); - }); - async function expectDeprecations( source: string, deprecations: string[], - testRunner: BasicTestRunner = runner, + tester: typeof Tester = Tester, ) { const expectedDiagnostics: DiagnosticMatch[] = []; for (const deprecation of deprecations) { @@ -37,7 +28,7 @@ describe("compiler: checker: deprecation", () => { source = newSource; } - expectDiagnostics(await testRunner.diagnose(source), expectedDiagnostics); + expectDiagnostics(await tester.diagnose(source), expectedDiagnostics); } describe("#deprecated directive", () => { @@ -190,9 +181,7 @@ describe("compiler: checker: deprecation", () => { }); it("emits deprecation for use of deprecated decorator signatures", async () => { - const testHost: TestHost = await createTestHost(); - testHost.addJsFile("test.js", { $testDec: () => {} }); - const runner = createTestWrapper(testHost); + const tester = Tester.files({ "test.js": mockFile.js({ $testDec: () => {} }) }); await expectDeprecations( ` @@ -206,12 +195,12 @@ describe("compiler: checker: deprecation", () => { model Foo {} `, ["testDec is deprecated"], - runner, + tester, ); }); it("emits diagnostic when multiple #deprecated directives are used on a node", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` #deprecated "Foo is deprecated" #deprecated "Foo is deprecated again" model Foo {} @@ -249,7 +238,7 @@ describe("compiler: checker: deprecation", () => { }); it("can suppress", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` #deprecated "OldFoo is deprecated" model OldFoo {} @@ -277,7 +266,7 @@ describe("compiler: checker: deprecation", () => { }); it("can suppress", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` #deprecated "OldFoo is deprecated" model OldFoo {} @@ -293,7 +282,7 @@ describe("compiler: checker: deprecation", () => { it("can have its diagnostics suppressed", async () => { // cspell:ignore Morp - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` #deprecated "Foo is deprecated" model Foo { #deprecated "Name is deprecated" @@ -385,7 +374,7 @@ describe("compiler: checker: deprecation", () => { describe("--ignore-deprecated flag", () => { it("suppresses deprecation warnings", async () => { - const diagnostics = await runner.diagnose( + const diagnostics = await Tester.diagnose( ` #deprecated "OldFoo is deprecated" model OldFoo {} @@ -397,7 +386,9 @@ describe("compiler: checker: deprecation", () => { } `, { - ignoreDeprecated: true, + compilerOptions: { + ignoreDeprecated: true, + }, }, ); diff --git a/packages/compiler/test/checker/doc-comment.test.ts b/packages/compiler/test/checker/doc-comment.test.ts index 3f76f74c1ca..7525756401b 100644 --- a/packages/compiler/test/checker/doc-comment.test.ts +++ b/packages/compiler/test/checker/doc-comment.test.ts @@ -1,25 +1,20 @@ import { ok, strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; -import { Model, Operation } from "../../src/index.js"; +import { describe, it } from "vitest"; import { getDoc, getErrorsDoc, getReturnsDoc } from "../../src/lib/decorators.js"; -import { BasicTestRunner, createTestRunner } from "../../src/testing/index.js"; - -let runner: BasicTestRunner; -beforeEach(async () => { - runner = await createTestRunner(); -}); +import { t } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; describe("compiler: checker: doc comments", () => { const expectedMainDoc = "This is a doc comment."; const docComment = `/** * ${expectedMainDoc} */`; - function testMainDoc(name: string, code: string) { + function testMainDoc(name: string, code: string, key = "target") { it(name, async () => { - const { target } = await runner.compile(code); - ok(target, `Make sure to have @test("target") in code.`); + const result = (await Tester.compile(code)) as any; + ok(result[key], `Make sure to have /*${key}*/ marker in code.`); - strictEqual(getDoc(runner.program, target), expectedMainDoc); + strictEqual(getDoc(result.program, result[key]), expectedMainDoc); }); } @@ -27,23 +22,24 @@ describe("compiler: checker: doc comments", () => { testMainDoc( "model", `${docComment} - @test("target") model Foo {}`, + model /*target*/Foo {}`, ); - testMainDoc( - "templated model", - `${docComment} - @test("target") model Foo {} + it("templated model", async () => { + const { Bar, program } = await Tester.compile(t.code`${docComment} + model Foo {} - model Bar { foo: Foo }`, - ); + model ${t.model("Bar")} { foo: Foo }`); + const fooInstance = Bar.properties.get("foo")!.type; + strictEqual(getDoc(program, fooInstance), expectedMainDoc); + }); testMainDoc( "model property", ` model Foo { ${docComment} - @test("target") foo: string; + /*target*/name: string; } `, ); @@ -51,13 +47,13 @@ describe("compiler: checker: doc comments", () => { testMainDoc( "scalar", `${docComment} - @test("target") scalar foo;`, + scalar /*target*/unreal;`, ); testMainDoc( "enum", `${docComment} - @test("target") enum Foo {}`, + enum /*target*/Foo {}`, ); testMainDoc( @@ -65,120 +61,120 @@ describe("compiler: checker: doc comments", () => { ` enum Foo { ${docComment} - @test("target") foo, + /*target*/a, } `, ); testMainDoc( "operation", `${docComment} - @test("target") op test(): string;`, + op /*target*/foo(): string;`, ); testMainDoc( "interface", `${docComment} - @test("target") interface Foo {}`, + interface /*target*/Foo {}`, ); }); it("using @doc() decorator will override the doc comment", async () => { - const { Foo } = (await runner.compile(` + const { Foo, program } = await Tester.compile(t.code` /** * This is a doc comment. */ @doc("This is the actual doc.") - @test model Foo {} - `)) as { Foo: Model }; + model ${t.model("Foo")} {} + `); - strictEqual(getDoc(runner.program, Foo), "This is the actual doc."); + strictEqual(getDoc(program, Foo), "This is the actual doc."); }); describe("override model is comment", () => { it("override another doc comment", async () => { - const { Foo } = (await runner.compile(` + const { Foo, program } = await Tester.compile(t.code` /** Base comment */ model Base {} /** Override comment */ - @test model Foo is Base {} - `)) as { Foo: Model }; + model ${t.model("Foo")} is Base {} + `); - strictEqual(getDoc(runner.program, Foo), "Override comment"); + strictEqual(getDoc(program, Foo), "Override comment"); }); it("override @doc", async () => { - const { Foo } = (await runner.compile(` + const { Foo, program } = await Tester.compile(t.code` @doc("Base comment") model Base {} /** Override comment */ - @test model Foo is Base {} - `)) as { Foo: Model }; + model ${t.model("Foo")} is Base {} + `); - strictEqual(getDoc(runner.program, Foo), "Override comment"); + strictEqual(getDoc(program, Foo), "Override comment"); }); }); describe("override op is comment", () => { it("override another doc comment", async () => { - const { foo } = (await runner.compile(` + const { foo, program } = await Tester.compile(t.code` /** Base comment */ op base(): void; /** Override comment */ - @test op foo is base; - `)) as { foo: Operation }; + op ${t.op("foo")} is base; + `); - strictEqual(getDoc(runner.program, foo), "Override comment"); + strictEqual(getDoc(program, foo), "Override comment"); }); it("override @doc", async () => { - const { foo } = (await runner.compile(` + const { foo, program } = await Tester.compile(t.code` @doc("Base comment") op base(): void; /** Override comment */ - @test op foo is base; - `)) as { foo: Operation }; + op ${t.op("foo")} is base; + `); - strictEqual(getDoc(runner.program, foo), "Override comment"); + strictEqual(getDoc(program, foo), "Override comment"); }); }); describe("@returns", () => { it("set the returnsDoc on an operation", async () => { - const { test } = (await runner.compile(` + const { test, program } = await Tester.compile(t.code` /** * @returns A string */ - @test op test(): string; - `)) as { test: Operation }; + op ${t.op("test")}(): string; + `); - strictEqual(getReturnsDoc(runner.program, test), "A string"); + strictEqual(getReturnsDoc(program, test), "A string"); }); it("@returnsDoc decorator override the doc comment", async () => { - const { test } = (await runner.compile(` + const { test, program } = await Tester.compile(t.code` /** * @returns A string */ @returnsDoc("Another string") - @test op test(): string; - `)) as { test: Operation }; + op ${t.op("test")}(): string; + `); - strictEqual(getReturnsDoc(runner.program, test), "Another string"); + strictEqual(getReturnsDoc(program, test), "Another string"); }); it("doc comment on op is override the base comment", async () => { - const { test } = (await runner.compile(` + const { test, program } = await Tester.compile(t.code` /** * @returns A string @@ -188,41 +184,41 @@ describe("compiler: checker: doc comments", () => { /** * @returns Another string */ - @test op test(): string; - `)) as { test: Operation }; + op ${t.op("test")}(): string; + `); - strictEqual(getReturnsDoc(runner.program, test), "Another string"); + strictEqual(getReturnsDoc(program, test), "Another string"); }); }); describe("@errors", () => { it("set the errorsDoc on an operation", async () => { - const { test } = (await runner.compile(` + const { test, program } = await Tester.compile(t.code` /** * @errors A string */ - @test op test(): string; - `)) as { test: Operation }; + op ${t.op("test")}(): string; + `); - strictEqual(getErrorsDoc(runner.program, test), "A string"); + strictEqual(getErrorsDoc(program, test), "A string"); }); it("@errorsDoc decorator override the doc comment", async () => { - const { test } = (await runner.compile(` + const { test, program } = await Tester.compile(t.code` /** * @errors A string */ @errorsDoc("Another string") - @test op test(): string; - `)) as { test: Operation }; + op ${t.op("test")}(): string; + `); - strictEqual(getErrorsDoc(runner.program, test), "Another string"); + strictEqual(getErrorsDoc(program, test), "Another string"); }); it("doc comment on op is override the base comment", async () => { - const { test } = (await runner.compile(` + const { test, program } = await Tester.compile(t.code` /** * @errors A string @@ -232,19 +228,19 @@ describe("compiler: checker: doc comments", () => { /** * @errors Another string */ - @test op test(): string; - `)) as { test: Operation }; + op ${t.op("test")}(): string; + `); - strictEqual(getErrorsDoc(runner.program, test), "Another string"); + strictEqual(getErrorsDoc(program, test), "Another string"); }); }); }); describe("@param", () => { async function getDocForParam(code: string): Promise { - const { target } = (await runner.compile(code)) as { target: Operation }; - ok(target, `Make sure to have @test("target") in code.`); - return getDoc(runner.program, target.parameters.properties.get("one")!); + const { target, program } = (await Tester.compile(code)) as any; + ok(target, `Make sure to have /*target*/ marker in code.`); + return getDoc(program, target.parameters.properties.get("one")!); } it("applies doc on param", async () => { @@ -252,7 +248,7 @@ describe("@param", () => { /** * @param one Doc comment */ - @test("target") op base(one: string): void; + op /*target*/target(one: string): void; `); strictEqual(doc, "Doc comment"); }); @@ -262,7 +258,7 @@ describe("@param", () => { /** * @param one Doc comment */ - @test("target") op base(@doc("Explicit") one: string): void; + op /*target*/target(@doc("Explicit") one: string): void; `); strictEqual(doc, "Explicit"); }); @@ -272,9 +268,9 @@ describe("@param", () => { /** * @param one Doc comment */ - @test("target") op base(one: string): void; + op /*target*/target(one: string): void; - @@doc(base::parameters.one, "Override"); + @@doc(target::parameters.one, "Override"); `); strictEqual(doc, "Override"); }); @@ -286,7 +282,7 @@ describe("@param", () => { */ op base(one: string): void; - @test("target") op child is base; + op /*target*/target is base; `); strictEqual(doc, "Doc comment"); }); @@ -301,7 +297,7 @@ describe("@param", () => { /** * @param one Override for child */ - @test("target") op child is base; + op /*target*/target is base; `); strictEqual(doc, "Override for child"); }); @@ -316,8 +312,8 @@ describe("@param", () => { /** * @param one Override for child */ - @test("target") op child is base; - @@doc(child::parameters.one, "Override for child again"); + op /*target*/target is base; + @@doc(target::parameters.one, "Override for child again"); `); strictEqual(doc, "Override for child again"); }); @@ -327,7 +323,7 @@ describe("@param", () => { model A { @doc("Via model") one: string } - @test("target") op base(...A): void; + op /*target*/target(...A): void; `); strictEqual(doc, "Via model"); }); @@ -340,30 +336,30 @@ describe("@param", () => { /** * @param one Doc comment */ - @test("target") op base(...A): void; + op /*target*/target(...A): void; `); strictEqual(doc, "Doc comment"); }); it("applies to distinct parameters", async () => { // One @param has a hyphen but the other does not (should handle both cases) - const { addUser } = (await runner.compile(` + const { addUser, program } = await Tester.compile(t.code` /** * This is the operation doc. * @param name This is the name param doc. * @param age - This is the age param doc. */ - @test op addUser(name: string, age: string): void; - `)) as { addUser: Operation }; + op ${t.op("addUser")}(name: string, age: string): void; + `); - strictEqual(getDoc(runner.program, addUser), "This is the operation doc."); + strictEqual(getDoc(program, addUser), "This is the operation doc."); strictEqual( - getDoc(runner.program, addUser.parameters.properties.get("name")!), + getDoc(program, addUser.parameters.properties.get("name")!), "This is the name param doc.", ); strictEqual( - getDoc(runner.program, addUser.parameters.properties.get("age")!), + getDoc(program, addUser.parameters.properties.get("age")!), "This is the age param doc.", ); }); @@ -371,9 +367,9 @@ describe("@param", () => { describe("@prop", () => { async function getDocForProp(code: string): Promise { - const { target } = (await runner.compile(code)) as { target: Model }; - ok(target, `Make sure to have @test("target") in code.`); - return getDoc(runner.program, target.properties.get("one")!); + const { target, program } = (await Tester.compile(code)) as any; + ok(target, `Make sure to have /*target*/ marker in code.`); + return getDoc(program, target.properties.get("one")!); } it("applies doc on param", async () => { @@ -381,7 +377,7 @@ describe("@prop", () => { /** * @prop one Doc comment */ - @test("target") model Base { one: string } + model /*target*/target { one: string } `); strictEqual(doc, "Doc comment"); }); @@ -391,7 +387,7 @@ describe("@prop", () => { /** * @prop one Doc comment */ - @test("target") model Base { @doc("Explicit") one: string } + model /*target*/target { @doc("Explicit") one: string } `); strictEqual(doc, "Explicit"); }); @@ -401,9 +397,9 @@ describe("@prop", () => { /** * @prop one Doc comment */ - @test("target") model Base { one: string } + model /*target*/target { one: string } - @@doc(Base.one, "Override"); + @@doc(target.one, "Override"); `); strictEqual(doc, "Override"); }); @@ -415,7 +411,7 @@ describe("@prop", () => { */ model Base { one: string } - @test("target") model Child is Base; + model /*target*/target is Base; `); strictEqual(doc, "Doc comment"); }); @@ -430,7 +426,7 @@ describe("@prop", () => { /** * @prop one Override for child */ - @test("target") model Child is Base; + model /*target*/target is Base; `); strictEqual(doc, "Override for child"); }); @@ -445,8 +441,8 @@ describe("@prop", () => { /** * @prop one Override for child */ - @test("target") model Child is Base; - @@doc(Child.one, "Override for child again"); + model /*target*/target is Base; + @@doc(target.one, "Override for child again"); `); strictEqual(doc, "Override for child again"); }); @@ -456,7 +452,7 @@ describe("@prop", () => { model Base { @doc("Via model") one: string } - @test("target") model Child { ...Base } + model /*target*/target { ...Base } `); strictEqual(doc, "Via model"); }); @@ -469,25 +465,25 @@ describe("@prop", () => { /** * @prop one Doc comment */ - @test("target") model Child { ...Base } + model /*target*/target { ...Base } `); strictEqual(doc, "Doc comment"); }); it("applies to distinct parameters", async () => { // One @prop has a hyphen but the other does not (should handle both cases) - const { Base } = (await runner.compile(` + const { Base, program } = await Tester.compile(t.code` /** * This is the model doc. * @prop name This is the name prop doc. * @prop age - This is the age prop doc. */ - @test model Base { name: string, age: int32 } - `)) as { Base: Model }; + model ${t.model("Base")} { name: string, age: int32 } + `); - strictEqual(getDoc(runner.program, Base), "This is the model doc."); - strictEqual(getDoc(runner.program, Base.properties.get("name")!), "This is the name prop doc."); - strictEqual(getDoc(runner.program, Base.properties.get("age")!), "This is the age prop doc."); + strictEqual(getDoc(program, Base), "This is the model doc."); + strictEqual(getDoc(program, Base.properties.get("name")!), "This is the name prop doc."); + strictEqual(getDoc(program, Base.properties.get("age")!), "This is the age prop doc."); }); }); diff --git a/packages/compiler/test/checker/duplicate-ids.test.ts b/packages/compiler/test/checker/duplicate-ids.test.ts index cca3297c1ae..fd430108532 100644 --- a/packages/compiler/test/checker/duplicate-ids.test.ts +++ b/packages/compiler/test/checker/duplicate-ids.test.ts @@ -1,57 +1,34 @@ -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { Diagnostic } from "../../src/core/types.js"; -import { TestHost, createTestHost, expectDiagnostics } from "../../src/testing/index.js"; +import { expectDiagnostics } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; -describe("compiler: duplicate declarations", () => { - let testHost: TestHost; - - beforeEach(async () => { - testHost = await createTestHost(); - }); - - it("reports duplicate template parameters", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` +it("reports duplicate template parameters", async () => { + const diagnostics = await Tester.diagnose(` model A { } - `, - ); - - const diagnostics = await testHost.diagnose("./"); - assertDuplicates(diagnostics); - }); + `); + assertDuplicates(diagnostics); +}); - it("reports duplicate model declarations in global scope", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` +it("reports duplicate model declarations in global scope", async () => { + const diagnostics = await Tester.diagnose(` model A { } model A { } - `, - ); - - const diagnostics = await testHost.diagnose("./"); - assertDuplicates(diagnostics); - }); + `); + assertDuplicates(diagnostics); +}); - it("reports duplicate model declarations in a single namespace", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` +it("reports duplicate model declarations in a single namespace", async () => { + const diagnostics = await Tester.diagnose(` namespace Foo; model A { } model A { } - `, - ); - - const diagnostics = await testHost.diagnose("./"); - assertDuplicates(diagnostics); - }); + `); + assertDuplicates(diagnostics); +}); - it("reports duplicate model declarations across multiple namespaces", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` +it("reports duplicate model declarations across multiple namespaces", async () => { + const diagnostics = await Tester.diagnose(` namespace N { model A { }; } @@ -59,111 +36,81 @@ describe("compiler: duplicate declarations", () => { namespace N { model A { }; } - `, - ); - - const diagnostics = await testHost.diagnose("./"); - assertDuplicates(diagnostics); - }); + `); + assertDuplicates(diagnostics); +}); - it("reports duplicate model declarations across multiple files and namespaces", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` +it("reports duplicate model declarations across multiple files and namespaces", async () => { + const diagnostics = await Tester.files({ + "a.tsp": ` namespace N { model A { }; } `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` + "b.tsp": ` namespace N { model A { }; } `, - ); - - const diagnostics = await testHost.diagnose("./"); - assertDuplicates(diagnostics); - }); + }).diagnose(` + import "./a.tsp"; + import "./b.tsp"; + `); + assertDuplicates(diagnostics); +}); - describe("reports duplicate namespace/non-namespace", () => { - describe("in same file", () => { - it("with namespace first", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` +describe("reports duplicate namespace/non-namespace", () => { + describe("in same file", () => { + it("with namespace first", async () => { + const diagnostics = await Tester.diagnose(` namespace N {} model N {} - `, - ); - const diagnostics = await testHost.diagnose("./"); - assertDuplicates(diagnostics); - }); + `); + assertDuplicates(diagnostics); + }); - it("with non-namespace first", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + it("with non-namespace first", async () => { + const diagnostics = await Tester.files({ + "a.tsp": "namespace N {}", + "b.tsp": "model N {}", + }).diagnose(` model N {} namespace N {} - `, - ); - testHost.addTypeSpecFile("a.tsp", "namespace N {}"); - testHost.addTypeSpecFile("b.tsp", "model N {}"); - const diagnostics = await testHost.diagnose("./"); - assertDuplicates(diagnostics); - }); + `); + assertDuplicates(diagnostics); }); + }); - describe("across multiple files", () => { - // NOTE: Different order of declarations triggers different code paths, so test both - it("with namespace first", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - `, - ); - testHost.addTypeSpecFile("a.tsp", "namespace N {}"); - testHost.addTypeSpecFile("b.tsp", "model N {}"); - const diagnostics = await testHost.diagnose("./"); - assertDuplicates(diagnostics); - }); - it("with non-namespace first", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + describe("across multiple files", () => { + // NOTE: Different order of declarations triggers different code paths, so test both + it("with namespace first", async () => { + const diagnostics = await Tester.files({ + "a.tsp": "namespace N {}", + "b.tsp": "model N {}", + }).diagnose(` import "./a.tsp"; import "./b.tsp"; - `, - ); - testHost.addTypeSpecFile("a.tsp", "model MMM {}"); - testHost.addTypeSpecFile( - "b.tsp", - `namespace MMM { + `); + assertDuplicates(diagnostics); + }); + it("with non-namespace first", async () => { + const diagnostics = await Tester.files({ + "a.tsp": "model MMM {}", + "b.tsp": `namespace MMM { // Also check that we don't drop local dupes when the namespace is discarded. model QQQ {} model QQQ {} }`, - ); - const diagnostics = await testHost.diagnose("./"); - expectDiagnostics(diagnostics, [ - { code: "duplicate-symbol", message: /MMM/ }, - { code: "duplicate-symbol", message: /MMM/ }, - { code: "duplicate-symbol", message: /QQQ/ }, - { code: "duplicate-symbol", message: /QQQ/ }, - ]); - }); + }).diagnose(` + import "./a.tsp"; + import "./b.tsp"; + `); + expectDiagnostics(diagnostics, [ + { code: "duplicate-symbol", message: /MMM/ }, + { code: "duplicate-symbol", message: /MMM/ }, + { code: "duplicate-symbol", message: /QQQ/ }, + { code: "duplicate-symbol", message: /QQQ/ }, + ]); }); }); }); diff --git a/packages/compiler/test/checker/effective-type.test.ts b/packages/compiler/test/checker/effective-type.test.ts index fa2c1ea51e8..21657439e33 100644 --- a/packages/compiler/test/checker/effective-type.test.ts +++ b/packages/compiler/test/checker/effective-type.test.ts @@ -1,52 +1,42 @@ import { strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { filterModelProperties, getEffectiveModelType } from "../../src/core/checker.js"; import { DecoratorContext, Model, ModelProperty, Type } from "../../src/core/types.js"; -import { TestHost, createTestHost, expectTypeEquals } from "../../src/testing/index.js"; +import { expectTypeEquals, mockFile, t } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; -describe("compiler: effective type", () => { - let testHost: TestHost; - let removeFilter: (model: ModelProperty) => boolean; - - beforeEach(async () => { - const removeSymbol = Symbol("remove"); - testHost = await createTestHost(); - testHost.addJsFile("remove.js", { - $remove: ({ program }: DecoratorContext, entity: Type) => { - program.stateSet(removeSymbol).add(entity); - }, - }); - removeFilter = (property: ModelProperty) => - !testHost.program.stateSet(removeSymbol).has(property); - }); +const removeSymbol = Symbol("remove"); +const RemoveTester = Tester.files({ + "remove.js": mockFile.js({ + $remove: ({ program }: DecoratorContext, entity: Type) => { + program.stateSet(removeSymbol).add(entity); + }, + }), +}); + +describe("compiler: effective type", () => { it("spread", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model Source { + const { Source, Test, program } = await Tester.compile(t.code` + model ${t.model("Source")} { prop: string; } - @test model Test { + model ${t.model("Test")} { prop: { ...Source }; } - `, - ); - const { Source, Test } = await testHost.compile("./"); + `); strictEqual(Source.kind, "Model" as const); strictEqual(Test.kind, "Model" as const); const propType = Test.properties.get("prop")?.type as Model; - const effective = getEffectiveModelType(testHost.program, propType); + const effective = getEffectiveModelType(program, propType); expectTypeEquals(effective, Source); }); it("indirect spread", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model Source { + const { Source, Test, program } = await Tester.compile(t.code` + model ${t.model("Source")} { prop: string; } @@ -55,252 +45,222 @@ describe("compiler: effective type", () => { ...Source }; - @test model Test { + model ${t.model("Test")} { test: {...Spread }; } - `, - ); - const { Source, Test } = await testHost.compile("./"); + `); strictEqual(Source.kind, "Model" as const); strictEqual(Test.kind, "Model" as const); const propType = Test.properties.get("test")?.type; strictEqual(propType?.kind, "Model" as const); - const effective = getEffectiveModelType(testHost.program, propType); + const effective = getEffectiveModelType(program, propType); expectTypeEquals(effective, Source); }); it("indirect spread, intersect, and filter", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Source, Test, program } = await RemoveTester.compile(t.code` import "./remove.js"; model IndirectSource { prop1: string; } - @test model Source { + model ${t.model("Source")} { prop2: string; ...IndirectSource; } - @test model Test { + model ${t.model("Test")} { test: { @remove prop3: string; } & Source; } - `, - ); - const { Source, Test } = await testHost.compile("./"); + `); strictEqual(Source.kind, "Model" as const); strictEqual(Test.kind, "Model" as const); const propType = Test.properties.get("test")?.type; strictEqual(propType?.kind, "Model" as const); - const effective = getEffectiveModelType(testHost.program, propType, removeFilter); + const removeFilter = (property: ModelProperty) => !program.stateSet(removeSymbol).has(property); + const effective = getEffectiveModelType(program, propType, removeFilter); expectTypeEquals(effective, Source); }); it("intersect", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model Source { + const { Source, Test, program } = await Tester.compile(t.code` + model ${t.model("Source")} { prop: string; } - @test model Test { + model ${t.model("Test")} { test: Source & {} } - `, - ); - const { Source, Test } = await testHost.compile("./"); + `); strictEqual(Source.kind, "Model" as const); strictEqual(Test.kind, "Model" as const); const propType = Test.properties.get("test")?.type; strictEqual(propType?.kind, "Model" as const); - const effective = getEffectiveModelType(testHost.program, propType); + const effective = getEffectiveModelType(program, propType); expectTypeEquals(effective, Source); }); it("extends", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Test, Derived, program } = await Tester.compile(t.code` model Base { propBase: string; } - @test model Derived extends Base { + model ${t.model("Derived")} extends Base { propDerived: string; } - @test model Test { + model ${t.model("Test")} { test: { ...Derived }; } - `, - ); - const { Test, Derived } = await testHost.compile("./"); + `); strictEqual(Test.kind, "Model" as const); strictEqual(Derived.kind, "Model" as const); const propType = Test.properties.get("test")?.type; strictEqual(propType?.kind, "Model" as const); - const effective = getEffectiveModelType(testHost.program, propType); + const effective = getEffectiveModelType(program, propType); expectTypeEquals(effective, Derived); }); it("intersect and filter", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Source, Test, program } = await RemoveTester.compile(t.code` import "./remove.js"; - @test model Source { + model ${t.model("Source")} { prop: string; } - @test model Test { + model ${t.model("Test")} { test: Source & { @remove something: string; }; } - `, - ); - const { Source, Test } = await testHost.compile("./"); + `); strictEqual(Source.kind, "Model" as const); strictEqual(Test.kind, "Model" as const); const propType = Test.properties.get("test")?.type; strictEqual(propType?.kind, "Model" as const); - const effective = getEffectiveModelType(testHost.program, propType, removeFilter); + const removeFilter = (property: ModelProperty) => !program.stateSet(removeSymbol).has(property); + const effective = getEffectiveModelType(program, propType, removeFilter); expectTypeEquals(effective, Source); }); it("extend and filter", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Base, Derived, program } = await RemoveTester.compile(t.code` import "./remove.js"; - @test model Base { + model ${t.model("Base")} { prop: string; } - @test model Derived extends Base { + model ${t.model("Derived")} extends Base { @remove test: string; } - `, - ); - const { Base, Derived } = await testHost.compile("./"); + `); strictEqual(Base.kind, "Model" as const); strictEqual(Derived.kind, "Model" as const); const propType = Derived.properties.get("test")?.type; strictEqual(propType?.kind, "Scalar" as const); - const effective = getEffectiveModelType(testHost.program, Derived, removeFilter); + const removeFilter = (property: ModelProperty) => !program.stateSet(removeSymbol).has(property); + const effective = getEffectiveModelType(program, Derived, removeFilter); expectTypeEquals(effective, Base); }); it("extend and filter two levels", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Base, Derived, program } = await RemoveTester.compile(t.code` import "./remove.js"; - @test model Base { + model ${t.model("Base")} { prop: string; } - @test model Middle extends Base { + model Middle extends Base { @remove prop2: string; } - @test model Derived extends Middle { + model ${t.model("Derived")} extends Middle { @remove test: string; } - `, - ); - const { Base, Derived } = await testHost.compile("./"); + `); strictEqual(Base.kind, "Model" as const); strictEqual(Derived.kind, "Model" as const); const propType = Derived.properties.get("test")?.type; strictEqual(propType?.kind, "Scalar" as const); - const effective = getEffectiveModelType(testHost.program, Derived, removeFilter); + const removeFilter = (property: ModelProperty) => !program.stateSet(removeSymbol).has(property); + const effective = getEffectiveModelType(program, Derived, removeFilter); expectTypeEquals(effective, Base); }); it("extend and filter two levels with override", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Middle, Derived, program } = await RemoveTester.compile(t.code` import "./remove.js"; - @test model Base { + model Base { prop: string; prop2: string; } - @test model Middle extends Base { + model ${t.model("Middle")} extends Base { @remove prop3: string; @remove prop4: string; prop2: "hello"; } - @test model Derived extends Middle { + model ${t.model("Derived")} extends Middle { @remove test: string; } - `, - ); - const { Middle, Derived } = await testHost.compile("./"); + `); strictEqual(Middle.kind, "Model" as const); strictEqual(Derived.kind, "Model" as const); const propType = Derived.properties.get("test")?.type; strictEqual(propType?.kind, "Scalar" as const); - const effective = getEffectiveModelType(testHost.program, Derived, removeFilter); + const removeFilter = (property: ModelProperty) => !program.stateSet(removeSymbol).has(property); + const effective = getEffectiveModelType(program, Derived, removeFilter); expectTypeEquals(effective, Middle); }); it("extend, intersect, and filter", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Derived, Test, program } = await RemoveTester.compile(t.code` import "./remove.js"; model Base { prop: string; } - @test model Derived extends Base { + model ${t.model("Derived")} extends Base { propDerived: string; } - @test model Test { + model ${t.model("Test")} { test: Derived & { @remove something: string; }; } - `, - ); - const { Derived, Test } = await testHost.compile("./"); + `); strictEqual(Derived.kind, "Model" as const); strictEqual(Test.kind, "Model" as const); const propType = Test.properties.get("test")?.type; strictEqual(propType?.kind, "Model" as const); - const effective = getEffectiveModelType(testHost.program, propType, removeFilter); + const removeFilter = (property: ModelProperty) => !program.stateSet(removeSymbol).has(property); + const effective = getEffectiveModelType(program, propType, removeFilter); expectTypeEquals(effective, Derived); }); it("extend templated base with spread and filter", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Thing, Test, program } = await RemoveTester.compile(t.code` import "./remove.js"; model Base { @@ -308,72 +268,61 @@ describe("compiler: effective type", () => { ...T; } - @test model Thing { + model ${t.model("Thing")} { name: string; } - @test model Test { + model ${t.model("Test")} { test: Base; } - `, - ); - const { Thing, Test } = await testHost.compile("./"); + `); strictEqual(Thing.kind, "Model" as const); strictEqual(Test.kind, "Model" as const); const propType = Test.properties.get("test")?.type; strictEqual(propType?.kind, "Model" as const); - const effective = getEffectiveModelType(testHost.program, propType, removeFilter); + const removeFilter = (property: ModelProperty) => !program.stateSet(removeSymbol).has(property); + const effective = getEffectiveModelType(program, propType, removeFilter); expectTypeEquals(effective, Thing); }); it("empty model", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model Test { + const { Test, program } = await Tester.compile(t.code` + model ${t.model("Test")} { test: {}; } - `, - ); - const { Test } = await testHost.compile("./"); + `); strictEqual(Test.kind, "Model" as const); const propType = Test.properties.get("test")?.type; strictEqual(propType?.kind, "Model" as const); - const effective = getEffectiveModelType(testHost.program, propType); + const effective = getEffectiveModelType(program, propType); expectTypeEquals(effective, propType); }); it("unsourced property", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Test, program } = await Tester.compile(t.code` model Source { prop: string; } - @test model Test { + model ${t.model("Test")} { test: { notRemoved: string, ...Source }; } - `, - ); - const { Test } = await testHost.compile("./"); + `); strictEqual(Test.kind, "Model" as const); const propType = Test.properties.get("test")?.type; strictEqual(propType?.kind, "Model" as const); - const effective = getEffectiveModelType(testHost.program, propType); + const effective = getEffectiveModelType(program, propType); expectTypeEquals(effective, propType); }); it("different sources", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Test, program } = await Tester.compile(t.code` model SourceOne { one: string; } @@ -383,26 +332,21 @@ describe("compiler: effective type", () => { } - @test model Test { + model ${t.model("Test")} { test: SourceOne & SourceTwo; } - `, - ); - - const { Test } = await testHost.compile("./"); + `); strictEqual(Test.kind, "Model" as const); const SourceOneAndSourceTwo = Test.properties.get("test")?.type; strictEqual(SourceOneAndSourceTwo?.kind, "Model" as const); - const effective = getEffectiveModelType(testHost.program, SourceOneAndSourceTwo); + const effective = getEffectiveModelType(program, SourceOneAndSourceTwo); expectTypeEquals(effective, SourceOneAndSourceTwo); }); it("only part of source with separate filter", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Test, program } = await RemoveTester.compile(t.code` import "./remove.js"; model Source { @@ -411,28 +355,24 @@ describe("compiler: effective type", () => { propB: string; } - @test model Test { + model ${t.model("Test")} { test: Source; } - `, - ); - - const { Test } = await testHost.compile("./"); + `); strictEqual(Test.kind, "Model" as const); const Source = Test.properties.get("test")?.type; strictEqual(Source?.kind, "Model" as const); - const filtered = filterModelProperties(testHost.program, Source, removeFilter); - const effective = getEffectiveModelType(testHost.program, filtered); + const removeFilter = (property: ModelProperty) => !program.stateSet(removeSymbol).has(property); + const filtered = filterModelProperties(program, Source, removeFilter); + const effective = getEffectiveModelType(program, filtered); strictEqual(effective.name, "", "Result should be anonymous"); expectTypeEquals(effective, filtered); }); it("only parts of base and spread sources with separate filter", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Derived, program } = await RemoveTester.compile(t.code` import "./remove.js"; // NOTE: Base and Source should have the same number of properties so that we @@ -447,24 +387,21 @@ describe("compiler: effective type", () => { propD: string; } - @test model Derived extends Base { + model ${t.model("Derived")} extends Base { ...Source; } - `, - ); - const { Derived } = await testHost.compile("./"); + `); strictEqual(Derived.kind, "Model" as const); - const filtered = filterModelProperties(testHost.program, Derived, removeFilter); - const effective = getEffectiveModelType(testHost.program, filtered); + const removeFilter = (property: ModelProperty) => !program.stateSet(removeSymbol).has(property); + const filtered = filterModelProperties(program, Derived, removeFilter); + const effective = getEffectiveModelType(program, filtered); strictEqual(effective.name, "", "result should be anonymous"); expectTypeEquals(filtered, effective); }); it("only part of source with filter", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Test, program } = await RemoveTester.compile(t.code` import "./remove.js"; model Source { @@ -473,19 +410,17 @@ describe("compiler: effective type", () => { propB: string; } - @test model Test { + model ${t.model("Test")} { test: Source; } - `, - ); - - const { Test } = await testHost.compile("./"); + `); strictEqual(Test.kind, "Model" as const); const Source = Test.properties.get("test")?.type; strictEqual(Source?.kind, "Model" as const); - const effective = getEffectiveModelType(testHost.program, Source, removeFilter); + const removeFilter = (property: ModelProperty) => !program.stateSet(removeSymbol).has(property); + const effective = getEffectiveModelType(program, Source, removeFilter); expectTypeEquals(effective, Source); }); }); diff --git a/packages/compiler/test/checker/enum.test.ts b/packages/compiler/test/checker/enum.test.ts index 34a39107439..03183fa83f7 100644 --- a/packages/compiler/test/checker/enum.test.ts +++ b/packages/compiler/test/checker/enum.test.ts @@ -1,29 +1,17 @@ import { ok, strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; -import { DecoratorContext, Enum, EnumMember, Model, Type } from "../../src/core/types.js"; +import { describe, it } from "vitest"; +import { DecoratorContext, Enum, Type } from "../../src/core/types.js"; import { getDoc } from "../../src/index.js"; -import { TestHost, createTestHost, expectDiagnostics } from "../../src/testing/index.js"; +import { expectDiagnostics, mockFile, t } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; describe("compiler: enums", () => { - let testHost: TestHost; - - beforeEach(async () => { - testHost = await createTestHost(); - }); - it("can be valueless", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test enum E { + const { E } = await Tester.compile(t.code` + enum ${t.enum("E")} { A, B, C } - `, - ); - - const { E } = (await testHost.compile("./")) as { - E: Enum; - }; + `); ok(E); ok(!E.members.get("A")!.value); @@ -32,23 +20,13 @@ describe("compiler: enums", () => { }); it("can have values", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test enum E { - @test("A") A: "a"; - @test("B") B: "b"; - @test("C") C: "c"; + const { E, A, B, C } = await Tester.compile(t.code` + enum ${t.enum("E")} { + ${t.enumMember("A")}: "a"; + ${t.enumMember("B")}: "b"; + ${t.enumMember("C")}: "c"; } - `, - ); - - const { E, A, B, C } = (await testHost.compile("./")) as { - E: Enum; - A: EnumMember; - B: EnumMember; - C: EnumMember; - }; + `); ok(E); strictEqual(A.value, "a"); @@ -57,33 +35,22 @@ describe("compiler: enums", () => { }); it("can be a model property", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Foo } = await Tester.compile(t.code` namespace Foo; enum E { A, B, C } - @test model Foo { + model ${t.model("Foo")} { prop: E; } - `, - ); - - const { Foo } = (await testHost.compile("./")) as { - Foo: Model; - }; + `); ok(Foo); strictEqual(Foo.properties.get("prop")!.type.kind, "Enum"); }); it("can't have duplicate variants", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` enum A { A, A } - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "enum-member-duplicate", message: "Enum already has a member named A", @@ -91,24 +58,17 @@ describe("compiler: enums", () => { }); it("can have spread members", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test enum Bar { + const { Foo, Bar } = await Tester.compile(t.code` + enum ${t.enum("Bar")} { One: "1", Two: "2", } - @test enum Foo { + enum ${t.enum("Foo")} { ...Bar, Three: "3" } - `, - ); + `); - const { Foo, Bar } = (await testHost.compile("main.tsp")) as { - Foo: Enum; - Bar: Enum; - }; ok(Foo); ok(Bar); @@ -126,32 +86,27 @@ describe("compiler: enums", () => { it("enums can be referenced from decorator on namespace", async () => { let refViaMyService: Enum | undefined; let refViaMyLib: Enum | undefined; - testHost.addJsFile("lib.js", { - $saveMyService(context: DecoratorContext, target: Type, ref: Enum) { - refViaMyService = ref; - }, - $saveMyLib(context: DecoratorContext, target: Type, ref: Enum) { - refViaMyLib = ref; - }, - }); - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./lib.js"; - - @saveMyService(MyLib.E) - namespace MyService {} - - @saveMyLib(E) - namespace MyLib{ - @test enum E { - a, b - } - } - `, - ); - await testHost.compile("./"); + await Tester.files({ + "lib.js": mockFile.js({ + $saveMyService(context: DecoratorContext, target: Type, ref: Enum) { + refViaMyService = ref; + }, + $saveMyLib(context: DecoratorContext, target: Type, ref: Enum) { + refViaMyLib = ref; + }, + }), + }).import("./lib.js").compile(` + @saveMyService(MyLib.E) + namespace MyService {} + + @saveMyLib(E) + namespace MyLib{ + enum E { + a, b + } + } + `); ok(refViaMyService); ok(refViaMyLib); @@ -159,20 +114,14 @@ describe("compiler: enums", () => { }); it("can decorate spread member independently", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test enum Base {@doc("base doc") one} - @test enum Spread {...Base} + const { Base, Spread, program } = await Tester.compile(t.code` + enum ${t.enum("Base")} {@doc("base doc") one} + enum ${t.enum("Spread")} {...Base} @@doc(Spread.one, "override for spread"); - `, - ); - const { Base, Spread } = (await testHost.compile("main.tsp")) as { - Base: Enum; - Spread: Enum; - }; - strictEqual(getDoc(testHost.program, Spread.members.get("one")!), "override for spread"); - strictEqual(getDoc(testHost.program, Base.members.get("one")!), "base doc"); + `); + + strictEqual(getDoc(program, Spread.members.get("one")!), "override for spread"); + strictEqual(getDoc(program, Base.members.get("one")!), "base doc"); }); }); diff --git a/packages/compiler/test/checker/functions.test.ts b/packages/compiler/test/checker/functions.test.ts new file mode 100644 index 00000000000..7693cd49746 --- /dev/null +++ b/packages/compiler/test/checker/functions.test.ts @@ -0,0 +1,1827 @@ +import { deepStrictEqual, fail, ok, strictEqual } from "assert"; +import { beforeEach, describe, expect, it } from "vitest"; +import { + Diagnostic, + FunctionContext, + IndeterminateEntity, + Model, + Namespace, + Type, + Value, +} from "../../src/core/types.js"; +import { + DiagnosticMatch, + type Tester, + expectDiagnosticEmpty, + expectDiagnostics, + mockFile, + t, +} from "../../src/testing/index.js"; +import { $ } from "../../src/typekit/index.js"; +import { Tester as BaseTester } from "../tester.js"; + +/** Helper to assert a function declaration was bound to the js implementation */ +function expectFunction(ns: Namespace, name: string, impl: any) { + const fn = ns.functionDeclarations.get(name); + ok(fn, `Expected function ${name} to be declared.`); + strictEqual(fn.implementation, impl); +} + +function expectFunctionDiagnostics( + diagnostics: readonly Diagnostic[], + match: DiagnosticMatch | DiagnosticMatch[], +) { + expect(diagnostics.some((d) => d.code === "experimental-feature")).toBeTruthy(); + const filtered = diagnostics.filter((d) => d.code !== "experimental-feature"); + expectDiagnostics(filtered, match); +} + +function expectFunctionDiagnosticsEmpty(diagnostics: readonly Diagnostic[]) { + expect(diagnostics.some((d) => d.code === "experimental-feature")).toBeTruthy(); + expectDiagnosticEmpty(diagnostics.filter((d) => d.code !== "experimental-feature")); +} + +let tester: Tester = BaseTester; + +describe("declaration", () => { + let testImpl: any; + let nsFnImpl: any; + beforeEach(() => { + testImpl = (_ctx: FunctionContext) => undefined; + nsFnImpl = (_ctx: FunctionContext) => undefined; + + tester = BaseTester.files({ + "test.js": mockFile.js({ + $functions: { + "": { + testFn: testImpl, + }, + "Foo.Bar": { + nsFn: nsFnImpl, + }, + }, + }), + }) + .import("./test.js") + .using("TypeSpec.Reflection"); + }); + + describe("bind implementation to declaration", () => { + it("defined at root via direct export", async () => { + const [{ program }, diagnostics] = await tester.compileAndDiagnose(` + extern fn testFn(); + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + expectFunction(program.getGlobalNamespaceType(), "testFn", testImpl); + }); + + it("in namespace via $functions map", async () => { + const [{ program }, diagnostics] = await tester.compileAndDiagnose(` + namespace Foo.Bar { extern fn nsFn(); } + `); + expectFunctionDiagnosticsEmpty(diagnostics); + const ns = program.getGlobalNamespaceType().namespaces.get("Foo")?.namespaces.get("Bar"); + ok(ns); + expectFunction(ns, "nsFn", nsFnImpl); + }); + }); + + it("errors if function is missing extern modifier", async () => { + const diagnostics = await tester.diagnose(`fn testFn();`); + expectFunctionDiagnostics(diagnostics, { + code: "invalid-modifier", + message: "Declaration of type 'function' is missing required modifier 'extern'.", + }); + }); + + it("errors if extern function is missing implementation", async () => { + const diagnostics = await tester.diagnose(`extern fn missing();`); + expectFunctionDiagnostics(diagnostics, { + code: "missing-implementation", + message: "Extern declaration must have an implementation in JS file.", + }); + }); + + it("errors if rest parameter type is not array", async () => { + const diagnostics = await tester.diagnose(`extern fn f(...rest: string);`); + expectFunctionDiagnostics(diagnostics, [ + { + code: "missing-implementation", + message: "Extern declaration must have an implementation in JS file.", + }, + { + code: "rest-parameter-array", + message: "A rest parameter must be of an array type.", + }, + ]); + }); +}); + +describe("usage", () => { + let calledArgs: any[] | undefined; + beforeEach(() => { + calledArgs = undefined; + + tester = BaseTester.files({ + "test.js": mockFile.js({ + $functions: { + "": { + testFn(ctx: FunctionContext, a: any, b: any, ...rest: any[]) { + calledArgs = [ctx, a, b, ...rest]; + return a; // Return first arg + }, + sum(_ctx: FunctionContext, ...addends: number[]) { + return addends.reduce((a, b) => a + b, 0); + }, + valFirst(_ctx: FunctionContext, v: any) { + return v; + }, + voidFn(ctx: FunctionContext, arg: any) { + calledArgs = [ctx, arg]; + // No return value + }, + }, + }, + }), + }) + .import("./test.js") + .using("TypeSpec.Reflection"); + }); + + function expectNotCalled() { + ok(calledArgs === undefined, "Expected function not to be called."); + } + + function expectCalledWith(...args: any[]) { + ok(calledArgs, "Function was not called."); + strictEqual(calledArgs.length, 1 + args.length); + for (const [i, v] of args.entries()) { + strictEqual(calledArgs[1 + i], v); + } + } + + async function expectFunctionTypeUsage( + signature: string, + call: string, + match: DiagnosticMatch[] = [], + ): Promise { + const [{ p }, diagnostics] = await tester.compileAndDiagnose(t.code` + ${signature}; + + model Observer { + ${t.modelProperty("p")}: ${call}; + }`); + + expectFunctionDiagnostics(diagnostics, match); + + return p.type; + } + + async function expectFunctionValueUsage( + signature: string, + call: string, + match: DiagnosticMatch[] = [], + ): Promise { + const [{ p }, diagnostics] = await tester.compileAndDiagnose(t.code` + ${signature}; + + model Observer { + ${t.modelProperty("p")}: unknown = ${call}; + } + `); + + expectFunctionDiagnostics(diagnostics, match); + + return p.defaultValue; + } + + it("errors if function not declared", async () => { + const diagnostics = await tester.diagnose(`const X = missing();`); + + expectDiagnostics(diagnostics, { + code: "invalid-ref", + message: "Unknown identifier missing", + }); + }); + + it("calls function with arguments", async () => { + const v = await expectFunctionValueUsage( + "extern fn testFn(a: valueof string, b: valueof string, ...rest: valueof string[]): valueof string", + 'testFn("one", "two", "three")', + ); + + expectCalledWith("one", "two", "three"); + strictEqual(v?.entityKind, "Value"); + strictEqual(v.valueKind, "StringValue"); + strictEqual(v.value, "one"); + }); + + it("allows omitting optional param", async () => { + const v = await expectFunctionValueUsage( + "extern fn testFn(a: valueof string, b?: valueof string): valueof string", + 'testFn("one")', + ); + + expectCalledWith("one", undefined); + + strictEqual(v?.entityKind, "Value"); + strictEqual(v.valueKind, "StringValue"); + strictEqual(v.value, "one"); + }); + + it("allows zero args for rest-only", async () => { + const v = await expectFunctionValueUsage( + "extern fn sum(...addends: valueof int32[]): valueof int32", + "sum()", + ); + + strictEqual(v?.entityKind, "Value"); + strictEqual(v.valueKind, "NumericValue"); + strictEqual(v.value.asNumber(), 0); + }); + + it("accepts function with explicit void return type", async () => { + const t = await expectFunctionTypeUsage( + "extern fn voidFn(a: valueof string): void", + 'voidFn("test")', + ); + expectCalledWith("test"); + + strictEqual(t.kind, "Intrinsic"); + strictEqual(t.name, "void"); + }); + + it("errors if non-void function returns undefined", async () => { + const t = await expectFunctionTypeUsage( + "extern fn voidFn(a: valueof string): unknown", + 'voidFn("test")', + [ + { + code: "function-return", + message: + "Implementation of 'fn voidFn' returned value 'null', which is not assignable to the declared return type 'unknown'.", + }, + ], + ); + expectCalledWith("test"); + // Function returned wrong type, so we expect it to transpose to ErrorType. + strictEqual(t.kind, "Intrinsic"); + strictEqual(t.name, "ErrorType"); + }); + + it("errors if not enough args", async () => { + const v = await expectFunctionValueUsage( + "extern fn testFn(a: valueof string, b: valueof string): valueof string", + 'testFn("one")', + [ + { + code: "invalid-argument-count", + message: "Expected at least 2 arguments, but got 1.", + }, + ], + ); + + expectNotCalled(); + + // Because the const is invalid (transposed to null in the checker), we expect no default value. + strictEqual(v, undefined); + }); + + it("errors if too many args", async () => { + const v = await expectFunctionValueUsage( + "extern fn testFn(a: valueof string): valueof string", + 'testFn("one", "two")', + [ + { + code: "invalid-argument-count", + message: "Expected 1 arguments, but got 2.", + }, + ], + ); + + expectCalledWith("one", undefined); + + strictEqual(v?.entityKind, "Value"); + strictEqual(v.valueKind, "StringValue"); + strictEqual(v.value, "one"); + }); + + it("errors if too few with rest", async () => { + const t = await expectFunctionTypeUsage( + "extern fn testFn(a: string, ...rest: string[])", + "testFn()", + [ + { + code: "invalid-argument-count", + message: "Expected at least 1 arguments, but got 0.", + }, + ], + ); + + expectNotCalled(); + + // In this case, we did not call the function, so we expect the constraint. + strictEqual(t.kind, "Intrinsic"); + strictEqual(t.name, "unknown"); + }); + + it("errors if argument type mismatch (value)", async () => { + const v = await expectFunctionValueUsage( + "extern fn valFirst(a: valueof string): valueof string", + "valFirst(123)", + [ + { + code: "unassignable", + message: "Type '123' is not assignable to type 'string'", + }, + ], + ); + + expectNotCalled(); + + strictEqual(v, undefined); + }); + + it("errors if passing type where value expected", async () => { + const v = await expectFunctionValueUsage( + "extern fn valFirst(a: valueof string): valueof string", + "valFirst(string)", + [ + { + code: "expect-value", + message: "string refers to a type, but is being used as a value here.", + }, + ], + ); + + strictEqual(v, undefined); + }); + + it("accepts string literal for type param", async () => { + const t = await expectFunctionTypeUsage("extern fn testFn(a: string)", 'testFn("abc")'); + + strictEqual(calledArgs?.[1].entityKind, "Type"); + strictEqual(calledArgs[1].kind, "String"); + strictEqual(calledArgs[1].value, "abc"); + + strictEqual(t.kind, "String"); + strictEqual(t.value, "abc"); + }); + + it("accepts arguments matching rest", async () => { + const t = await expectFunctionTypeUsage( + "extern fn testFn(a: string, ...rest: string[])", + 'testFn("a", "b", "c")', + ); + + const expectedLiterals = ["a", "b", "c"]; + + for (let i = 1; i < calledArgs!.length; i++) { + strictEqual(calledArgs?.[i].entityKind, "Type"); + strictEqual(calledArgs[i].kind, "String"); + strictEqual(calledArgs[i].value, expectedLiterals[i - 1]); + } + + strictEqual(t.kind, "String"); + strictEqual(t.value, "a"); + }); + + it("accepts valueof model argument", async () => { + const [{ p }, diagnostics] = await tester.compileAndDiagnose(t.code` + model M { x: string } + extern fn testFn(m: valueof M): valueof M; + + model Observer { + ${t.modelProperty("p")}: M = testFn(#{ x: "test" }); + } + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + deepStrictEqual(calledArgs?.[1], { x: "test" }); + + strictEqual(p.defaultValue?.entityKind, "Value"); + strictEqual(p.defaultValue.valueKind, "ObjectValue"); + const props = p.defaultValue.properties; + strictEqual(props.size, 1); + const x = props.get("x"); + ok(x); + strictEqual(x.value.entityKind, "Value"); + strictEqual(x.value.valueKind, "StringValue"); + strictEqual(x.value.value, "test"); + }); + + it("does not accept invalid valueof model argument", async () => { + const diagnostics = await tester.diagnose(` + model M { x: string } + + extern fn testFn(m: valueof M): valueof M; + + model Observer { + p: M = testFn(#{ y: "test" }); + } + `); + + expectFunctionDiagnostics(diagnostics, { + code: "invalid-argument", + message: "Argument of type '{ y: \"test\" }' is not assignable to parameter of type 'M'", + }); + }); + + it("accepts literal type where parameter is a union of literals", async () => { + const t = await expectFunctionTypeUsage( + 'extern fn testFn(arg: "a" | 10 | true): "a" | 10 | true', + 'testFn("a")', + ); + + const arg = calledArgs?.[1] as Type; + ok(arg); + strictEqual(arg.entityKind, "Type"); + strictEqual(arg.kind, "String"); + strictEqual(arg.value, "a"); + + strictEqual(t.kind, "String"); + strictEqual(t.value, "a"); + }); + + it("accepts literal type where parameter is an array of union of literals", async () => { + const t = await expectFunctionTypeUsage( + 'extern fn testFn(args: Array<"a" | 10 | true>): Array<"a" | 10 | true>', + 'testFn(["a", 10, true])', + ); + + const arg = calledArgs?.[1] as Type; + + ok(arg); + + strictEqual(arg.entityKind, "Type"); + strictEqual(arg.kind, "Tuple"); + const [a, b, c] = arg.values; + + strictEqual(a.entityKind, "Type"); + strictEqual(a.kind, "String"); + strictEqual(a.value, "a"); + + strictEqual(b.entityKind, "Type"); + strictEqual(b.kind, "Number"); + strictEqual(b.value, 10); + + strictEqual(c.entityKind, "Type"); + strictEqual(c.kind, "Boolean"); + strictEqual(c.value, true); + + strictEqual(t.kind, "Tuple"); + strictEqual(t.values.length, 3); + const [tA, tB, tC] = t.values; + + strictEqual(tA.kind, "String"); + strictEqual(tA.value, "a"); + strictEqual(tB.kind, "Number"); + strictEqual(tB.value, 10); + strictEqual(tC.kind, "Boolean"); + strictEqual(tC.value, true); + }); + + it("accepts literal types where parameter is a rest array of a literal union", async () => { + const diagnostics = await tester.diagnose(` + alias U = "a" | 10 | true; + extern fn testFn(...args: U[]): "a" | 10 | true; + + alias X = testFn("a", 10, true); + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + const arg = calledArgs?.[1] as Type; + ok(arg); + strictEqual(arg.entityKind, "Type"); + strictEqual(arg.kind, "String"); + strictEqual(arg.value, "a"); + + const arg2 = calledArgs?.[2] as Type; + ok(arg2); + strictEqual(arg2.entityKind, "Type"); + strictEqual(arg2.kind, "Number"); + strictEqual(arg2.value, 10); + + const arg3 = calledArgs?.[3] as Type; + ok(arg3); + strictEqual(arg3.entityKind, "Type"); + strictEqual(arg3.kind, "Boolean"); + strictEqual(arg3.value, true); + }); + + it("accepts enum member where parameter is enum", async () => { + const diagnostics = await tester.diagnose(` + enum E { A, B } + + extern fn testFn(e: E): E; + + alias X = testFn(E.A); + `); + expectFunctionDiagnosticsEmpty(diagnostics); + const arg = calledArgs?.[1] as Type; + ok(arg); + strictEqual(arg.entityKind, "Type"); + strictEqual(arg.kind, "EnumMember"); + strictEqual(arg.name, "A"); + }); + + it("accepts enum value where parameter is valueof enum", async () => { + const [{ E, p }, diagnostics] = await tester.compileAndDiagnose(t.code` + enum ${t.enum("E")} { A, B } + extern fn testFn(e: valueof E): valueof E; + + model Observer { + ${t.modelProperty("p")}: E = testFn(E.A); + } + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + const arg = calledArgs?.[1] as Value; + ok(arg); + + strictEqual(arg.entityKind, "Value"); + strictEqual(arg.valueKind, "EnumValue"); + strictEqual(arg.value.name, "A"); + strictEqual(arg.value.enum, E); + + // Values have the same structure but are not reference-equal. + strictEqual(p.defaultValue?.entityKind, "Value"); + strictEqual(p.defaultValue.valueKind, "EnumValue"); + strictEqual(p.defaultValue.value.name, "A"); + strictEqual(p.defaultValue.value.enum, E); + }); + + it("calls function bound to const", async () => { + const [{ p }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn sum(...addends: valueof int32[]): valueof int32; + + const f = sum; + + model Observer { + ${t.modelProperty("p")}: int32 = f(1, 2, 3); + } + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + strictEqual(p.defaultValue?.entityKind, "Value"); + strictEqual(p.defaultValue.valueKind, "NumericValue"); + strictEqual(p.defaultValue.value.asNumber(), 6); + }); +}); + +describe("typekit construction", () => { + it("can construct array with typekit in impl", async () => { + tester = BaseTester.files({ + "test.js": mockFile.js({ + $functions: { + "": { + makeArray(ctx: FunctionContext, t: Type) { + return $(ctx.program).array.create(t); + }, + }, + }, + }), + }) + .import("./test.js") + .using("TypeSpec.Reflection"); + + const [{ program, p }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn makeArray(T: unknown); + + alias X = makeArray(string); + + model M { + ${t.modelProperty("p")}: X; + } + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + ok(p.type); + ok($(program).array.is(p.type)); + + const arrayIndexerType = p.type.indexer.value; + + ok(arrayIndexerType); + ok($(program).scalar.isString(arrayIndexerType)); + }); +}); + +describe("specific type constraints", () => { + let receivedType: Type | undefined; + + beforeEach(() => { + receivedType = undefined; + + tester = BaseTester.files({ + "test.js": mockFile.js({ + $functions: { + "": { + expect(_ctx: FunctionContext, arg: Type) { + receivedType = arg; + return arg; + }, + }, + }, + }), + }) + .import("./test.js") + .using("TypeSpec.Reflection"); + }); + + async function expectReflectionUsage( + kind: Type["kind"], + declaration: string, + reference: string, + match: DiagnosticMatch[] = [], + ) { + const [{ p }, diagnostics] = await tester.compileAndDiagnose(t.code` + ${declaration} + extern fn expect(arg: Reflection.${kind}): Reflection.${kind}; + + model Observer { + ${t.modelProperty("p")}: expect(${reference}); + } + `); + + expectFunctionDiagnostics(diagnostics, match); + + return p.type; + } + + async function expectReflectionUsageSimple( + kind: Extract["kind"], + declaration: string, + reference: string, + ): Promise { + const t = await expectReflectionUsage(kind, declaration, reference); + + strictEqual(receivedType?.kind, kind); + strictEqual(receivedType.name, reference); + strictEqual(t, receivedType); + } + + it("accepts Reflection.Model parameter", async () => { + await expectReflectionUsageSimple("Model", "model TestModel { x: string; }", "TestModel"); + }); + + it("accepts Reflection.Enum parameter", async () => { + await expectReflectionUsageSimple("Enum", "enum TestEnum { A, B }", "TestEnum"); + }); + + it("accepts Reflection.Scalar parameter", async () => { + await expectReflectionUsageSimple("Scalar", "scalar TestScalar extends string;", "TestScalar"); + }); + + it("accepts Reflection.Union parameter", async () => { + const t = await expectReflectionUsage("Union", "", "string | int32"); + + strictEqual(receivedType?.kind, "Union"); + strictEqual(receivedType.name, undefined); + strictEqual(receivedType.variants.size, 2); + const [stringVariant, intVariant] = receivedType.variants.values(); + strictEqual(stringVariant.type.kind, "Scalar"); + strictEqual(stringVariant.type.name, "string"); + strictEqual(intVariant.type.kind, "Scalar"); + strictEqual(intVariant.type.name, "int32"); + strictEqual(t, receivedType); + }); + + it("accepts Reflection.Interface parameter", async () => { + await expectReflectionUsageSimple( + "Interface", + "interface TestInterface { testOp(): void; }", + "TestInterface", + ); + }); + + it("accepts Reflection.Namespace parameter", async () => { + await expectReflectionUsageSimple("Namespace", "namespace TestNs { }", "TestNs"); + }); + + it("accepts Reflection.Operation parameter", async () => { + await expectReflectionUsageSimple("Operation", "op testOp(): string;", "testOp"); + }); + + it("errors when wrong type kind is passed", async () => { + const t = await expectReflectionUsage("Model", "enum TestEnum { A, B }", "TestEnum", [ + { + code: "unassignable", + message: "Type 'TestEnum' is not assignable to type 'Model'", + }, + ]); + + strictEqual(receivedType, undefined); + // Since we didn't call the function, we get back the constraint type, which is Reflection.Model. + strictEqual(t.kind, "Model"); + strictEqual(t.name, "Model"); + }); +}); + +describe("value marshalling", () => { + let receivedValue: any; + + beforeEach(() => { + receivedValue = undefined; + tester = BaseTester.files({ + "test.js": mockFile.js({ + $functions: { + "": { + expect(_ctx: FunctionContext, arg: any) { + receivedValue = arg; + return arg; + }, + returnInvalidJsValue(_ctx: FunctionContext) { + return Symbol("invalid"); + }, + returnComplexObject(_ctx: FunctionContext) { + return { + nested: { value: 42 }, + array: [1, "test", true], + null: null, + }; + }, + returnIndeterminate(ctx: FunctionContext): IndeterminateEntity { + return { entityKind: "Indeterminate", type: $(ctx.program).literal.create(42) }; + }, + }, + }, + }), + }) + .import("./test.js") + .using("TypeSpec.Reflection"); + }); + + async function expectValueUsage( + signature: string, + argument: string, + match: DiagnosticMatch[] = [], + ): Promise { + const [{ p }, diagnostics] = await tester.compileAndDiagnose(t.code` + ${signature}; + + model Observer { + ${t.modelProperty("p")}: unknown = ${argument}; + } + `); + + expectFunctionDiagnostics(diagnostics, match); + + return p.defaultValue; + } + + async function expectValueSimple(valueType: string, argument: any) { + await expectValueUsage( + `extern fn expect(v: valueof ${valueType}): valueof ${valueType}`, + `expect(${JSON.stringify(argument)})`, + ); + + strictEqual(receivedValue, argument); + } + + it("marshals string values correctly", async () => { + await expectValueSimple("string", "hello world"); + }); + + it("marshals numeric values correctly", async () => { + await expectValueSimple("int32", 42); + }); + + it("marshals boolean values correctly", async () => { + await expectValueSimple("boolean", true); + }); + + it("marshals array values correctly", async () => { + const v = await expectValueUsage( + `extern fn expect(arr: valueof string[]): valueof string[]`, + `expect(#["a", "b", "c"])`, + ); + + deepStrictEqual(receivedValue, ["a", "b", "c"]); + strictEqual(v?.valueKind, "ArrayValue"); + strictEqual(v.values.length, 3); + const [a, b, c] = v.values; + strictEqual(a.valueKind, "StringValue"); + strictEqual(a.value, "a"); + strictEqual(b.valueKind, "StringValue"); + strictEqual(b.value, "b"); + strictEqual(c.valueKind, "StringValue"); + strictEqual(c.value, "c"); + }); + + it("marshals object values correctly", async () => { + const v = await expectValueUsage( + `extern fn expect(obj: valueof {name: string, age: int32}): valueof {name: string, age: int32}`, + `expect(#{name: "test", age: 25})`, + ); + + strictEqual(receivedValue.name, "test"); + strictEqual(receivedValue.age, 25); + + strictEqual(v?.valueKind, "ObjectValue"); + const props = v.properties; + strictEqual(props.size, 2); + const nameProp = props.get("name"); + ok(nameProp); + strictEqual(nameProp.name, "name"); + strictEqual(nameProp.value.valueKind, "StringValue"); + strictEqual(nameProp.value.value, "test"); + const ageProp = props.get("age"); + ok(ageProp); + strictEqual(ageProp.name, "age"); + strictEqual(ageProp.value.valueKind, "NumericValue"); + strictEqual(ageProp.value.value.asNumber(), 25); + }); + + it("handles invalid JS return values gracefully", async () => { + const v = await expectValueUsage( + `extern fn returnInvalidJsValue(): valueof string`, + `returnInvalidJsValue()`, + [ + { + code: "function-return", + message: "Function implementation returned invalid JS value 'Symbol(invalid)'.", + }, + ], + ); + + strictEqual(v, undefined); + }); + + it("unmarshal complex JS objects to values", async () => { + const v = await expectValueUsage( + `extern fn returnComplexObject(): valueof unknown`, + `returnComplexObject()`, + ); + + strictEqual(v?.entityKind, "Value"); + strictEqual(v.valueKind, "ObjectValue"); + + const obj = v.properties; + strictEqual(obj.size, 3); + + const nested = obj.get("nested")?.value; + ok(nested); + strictEqual(nested.entityKind, "Value"); + strictEqual(nested.valueKind, "ObjectValue"); + + const nestedProps = nested.properties; + strictEqual(nestedProps.size, 1); + const nestedValue = nestedProps.get("value")?.value; + ok(nestedValue); + strictEqual(nestedValue.entityKind, "Value"); + strictEqual(nestedValue.valueKind, "NumericValue"); + strictEqual(nestedValue.value.asNumber(), 42); + + const array = obj.get("array")?.value; + ok(array); + strictEqual(array.entityKind, "Value"); + strictEqual(array.valueKind, "ArrayValue"); + + const arrayItems = array.values; + strictEqual(arrayItems.length, 3); + + strictEqual(arrayItems[0].entityKind, "Value"); + strictEqual(arrayItems[0].valueKind, "NumericValue"); + strictEqual(arrayItems[0].value.asNumber(), 1); + + strictEqual(arrayItems[1].entityKind, "Value"); + strictEqual(arrayItems[1].valueKind, "StringValue"); + strictEqual(arrayItems[1].value, "test"); + + strictEqual(arrayItems[2].entityKind, "Value"); + strictEqual(arrayItems[2].valueKind, "BooleanValue"); + strictEqual(arrayItems[2].value, true); + + const nullP = obj.get("null")?.value; + ok(nullP); + strictEqual(nullP.entityKind, "Value"); + strictEqual(nullP.valueKind, "NullValue"); + }); + + it("handles indeterminate entities coerced to values", async () => { + const [{ p }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn returnIndeterminate(): valueof int32; + extern fn expect(n: valueof int32): valueof int32; + const X = expect(returnIndeterminate()); + + model Observer { + ${t.modelProperty("p")}: int32 = X; + } + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + strictEqual(p.defaultValue?.entityKind, "Value"); + strictEqual(p.defaultValue?.valueKind, "NumericValue"); + strictEqual(p.defaultValue?.value.asNumber(), 42); + }); + + it("handles indeterminate entities coerced to types", async () => { + const [{ p }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn returnIndeterminate(): int32; + + alias X = returnIndeterminate(); + + model Observer { + ${t.modelProperty("p")}: X; + } + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + strictEqual(p.type.kind, "Number"); + strictEqual(p.type.value, 42); + }); +}); + +describe("union type constraints", () => { + let receivedArg: any; + + beforeEach(() => { + receivedArg = undefined; + + tester = BaseTester.files({ + "test.js": mockFile.js({ + $functions: { + "": { + accept(_ctx: FunctionContext, arg: any) { + receivedArg = arg; + return arg; + }, + returnTypeOrValue(ctx: FunctionContext, returnType: boolean) { + receivedArg = returnType; + if (returnType) { + return ctx.program.checker.getStdType("string"); + } else { + return "hello"; + } + }, + }, + }, + }), + }) + .import("./test.js") + .using("TypeSpec.Reflection"); + }); + + it("accepts type parameter", async () => { + const diagnostics = await tester.diagnose(` + extern fn accept(arg: unknown | valueof unknown): unknown; + + alias TypeResult = accept(string); + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + strictEqual(receivedArg.entityKind, "Type"); + strictEqual(receivedArg.kind, "Scalar"); + strictEqual(receivedArg.name, "string"); + }); + + it("prefers value when applicable", async () => { + const diagnostics = await tester.diagnose(` + extern fn accept(arg: string | valueof string): valueof string; + + const ValueResult = accept("hello"); + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + strictEqual(receivedArg, "hello"); + }); + + it("accepts multiple specific types", async () => { + const diagnostics = await tester.diagnose(` + extern fn accept(arg: Reflection.Model | Reflection.Enum): Reflection.Model | Reflection.Enum; + + model TestModel {} + enum TestEnum { A } + + alias ModelResult = accept(TestModel); + alias EnumResult = accept(TestEnum); + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + }); + + it("accepts multiple value types", async () => { + const diagnostics = await tester.diagnose(` + extern fn accept(arg: valueof (string | int32)): valueof (string | int32); + + const StringResult = accept("test"); + const NumberResult = accept(42); + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + }); + + it("errors when argument doesn't match union constraint", async () => { + const diagnostics = await tester.diagnose(` + extern fn accept(arg: Reflection.Model | Reflection.Enum): Reflection.Model | Reflection.Enum; + + scalar TestScalar extends string; + alias Result = accept(TestScalar); + `); + + expectFunctionDiagnostics(diagnostics, { + code: "unassignable", + message: "Type 'TestScalar' is not assignable to type 'Model | Enum'", + }); + + strictEqual(receivedArg, undefined); + }); + + it("can return type from function", async () => { + const [{ p }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn returnTypeOrValue(returnType: valueof boolean): unknown; + + model Observer { + ${t.modelProperty("p")}: returnTypeOrValue(true); + } + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + strictEqual(receivedArg, true); + + strictEqual(p.type.kind, "Scalar"); + strictEqual(p.type.name, "string"); + }); + + it("can return value from function", async () => { + const [{ p }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn returnTypeOrValue(returnType: valueof boolean): valueof string; + + const ValueResult = returnTypeOrValue(false); + + model Observer { + ${t.modelProperty("p")}: string = ValueResult; + } + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + strictEqual(receivedArg, false); + + strictEqual(p.defaultValue?.entityKind, "Value"); + strictEqual(p.defaultValue?.valueKind, "StringValue"); + strictEqual(p.defaultValue?.value, "hello"); + }); +}); + +describe("error cases and edge cases", () => { + beforeEach(() => { + tester = BaseTester.files({ + "test.js": mockFile.js({ + $functions: { + "": { + testFn() {}, + returnWrongEntityKind(_ctx: FunctionContext) { + return "string value"; // Returns value when type expected + }, + returnWrongValueType(_ctx: FunctionContext) { + return 42; // Returns number when string expected + }, + throwError(_ctx: FunctionContext) { + throw new Error("JS error"); + }, + returnUndefined(_ctx: FunctionContext) { + return undefined; + }, + returnNull(_ctx: FunctionContext) { + return null; + }, + expectNonOptionalAfterOptional(_ctx: FunctionContext, _opt: any, req: any) { + return req; + }, + }, + }, + }), + }) + .import("./test.js") + .using("TypeSpec.Reflection"); + }); + + it("errors when function returns wrong entity kind", async () => { + const diagnostics = await tester.diagnose(` + extern fn returnWrongEntityKind(): unknown; + alias X = returnWrongEntityKind(); + `); + + expectFunctionDiagnostics(diagnostics, { + code: "function-return", + message: + "Implementation of 'fn returnWrongEntityKind' returned value '\"string value\"', which is not assignable to the declared return type 'unknown'.", + }); + }); + + it("errors when function returns wrong value type", async () => { + const diagnostics = await tester.diagnose(` + extern fn returnWrongValueType(): valueof string; + const X = returnWrongValueType(); + `); + + expectFunctionDiagnostics(diagnostics, { + code: "function-return", + message: + "Implementation of 'fn returnWrongValueType' returned value '42', which is not assignable to the declared return type 'valueof string'.", + }); + }); + + it("thrown JS error bubbles up as ICE", async () => { + try { + await tester.diagnose(` + extern fn throwError(): unknown; + alias X = throwError(); + `); + + fail("Expected error to be thrown"); + } catch (error) { + ok(error instanceof Error); + strictEqual(error.message, "JS error"); + } + }); + + it("returns null for undefined return in value position", async () => { + const [{ p }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn returnUndefined(): valueof unknown; + + model Observer { + ${t.modelProperty("p")}: unknown = returnUndefined(); + } + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + strictEqual(p.defaultValue?.entityKind, "Value"); + strictEqual(p.defaultValue?.valueKind, "NullValue"); + }); + + it("handles null return value", async () => { + const [{ p }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn returnNull(): valueof unknown; + const X = returnNull(); + + model Observer { + ${t.modelProperty("p")}: unknown = X; + } + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + strictEqual(p.defaultValue?.entityKind, "Value"); + strictEqual(p.defaultValue?.valueKind, "NullValue"); + }); + + it("validates required parameter after optional not allowed in regular param position", async () => { + const diagnostics = await tester.diagnose(` + extern fn expectNonOptionalAfterOptional(opt?: valueof string, req: valueof string): valueof string; + const X = expectNonOptionalAfterOptional("test"); + `); + + expectFunctionDiagnostics(diagnostics, { + code: "required-parameter-first", + message: "A required parameter cannot follow an optional parameter.", + }); + }); + + it("cannot be used as a type", async () => { + const diagnostics = await tester.diagnose(` + extern fn testFn(): unknown; + + model M { + prop: testFn; + } + `); + + expectFunctionDiagnostics(diagnostics, { + code: "value-in-type", + message: "A value cannot be used as a type.", + }); + }); +}); + +describe("default function results", () => { + it("collapses to undefined for missing value-returning function", async () => { + const [{ p }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn missingValueFn(): valueof string; + const X = missingValueFn(); + + model Observer { + ${t.modelProperty("p")}: string = X; + } + `); + + expectFunctionDiagnostics(diagnostics, { + code: "missing-implementation", + }); + + strictEqual(p.defaultValue, undefined); + }); + + it("returns default type for missing type-returning function", async () => { + const [{ p }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn missingTypeFn(): unknown; + alias X = missingTypeFn(); + + model Observer { + ${t.modelProperty("p")}: X; + } + `); + + expectFunctionDiagnostics(diagnostics, { + code: "missing-implementation", + }); + + strictEqual(p.type.kind, "Intrinsic"); + strictEqual(p.type.name, "unknown"); + }); + + it("returns appropriate default for union return type", async () => { + const [{ p }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn missingUnionFn(): unknown | valueof string; + const X = missingUnionFn(); + + alias T = missingUnionFn(); + + model Observer { + ${t.modelProperty("p")}: T = X; + } + `); + + expectFunctionDiagnostics(diagnostics, { + code: "missing-implementation", + }); + + strictEqual(p.type.kind, "Intrinsic"); + strictEqual(p.type.name, "ErrorType"); + + strictEqual(p.defaultValue, undefined); + }); +}); + +describe("template and generic scenarios", () => { + beforeEach(() => { + tester = BaseTester.files({ + "templates.js": mockFile.js({ + $functions: { + "": { + processGeneric(ctx: FunctionContext, type: Type) { + return $(ctx.program).array.create(type); + }, + processConstrainedGeneric(_ctx: FunctionContext, type: Type) { + return type; + }, + }, + }, + }), + }) + .import("./templates.js") + .using("TypeSpec.Reflection"); + }); + + it("works with template aliases", async () => { + const [{ program, prop }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn processGeneric(T: unknown): unknown; + + alias ArrayOf = processGeneric(T); + + model TestModel { + ${t.modelProperty("prop")}: ArrayOf; + } + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + ok(prop.type); + ok($(program).array.is(prop.type)); + }); + + it("works with constrained templates", async () => { + const diagnostics = await tester.diagnose(` + extern fn processConstrainedGeneric(T: Reflection.Model): Reflection.Model; + + alias ProcessModel = processConstrainedGeneric(T); + + model TestModel {} + alias Result = ProcessModel; + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + }); + + it("errors when template constraint not satisfied", async () => { + const diagnostics = await tester.diagnose(` + extern fn processConstrainedGeneric(T: Reflection.Model): Reflection.Model; + + alias ProcessModel = processConstrainedGeneric(T); + + enum TestEnum { A } + alias Result = ProcessModel; + `); + + expectFunctionDiagnostics(diagnostics, { + code: "invalid-argument", + }); + }); + + it("template instantiations of function calls yield identical instances", async () => { + const [{ program, A, B }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn processGeneric(T: unknown): unknown; + + alias ArrayOf = processGeneric(T); + + model ${t.model("A")} { + propA: ArrayOf; + } + + model ${t.model("B")} { + propB: ArrayOf; + } + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + const aProp = A.properties.get("propA"); + const bProp = B.properties.get("propB"); + + ok(aProp); + ok(bProp); + + ok($(program).array.is(aProp.type)); + ok($(program).array.is(bProp.type)); + + strictEqual(aProp.type, bProp.type); + }); +}); + +describe("assignability of functions to fn types", () => { + beforeEach(() => { + tester = BaseTester.files({ + "test.js": mockFile.js({ + $functions: { + "": { + testFn(_ctx: FunctionContext, a: string): string { + return a; + }, + }, + }, + }), + }).import("./test.js"); + }); + + it("can be assigned to a Function type", async () => { + const [{ p }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn testFn(a: string): string; + + const f: fn(arg: never) => unknown = testFn; + + model Observer { + ${t.modelProperty("p")}: fn(arg: never) => unknown = f; + } + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + strictEqual(p.defaultValue?.entityKind, "Value"); + strictEqual(p.defaultValue?.valueKind, "Function"); + strictEqual(p.defaultValue?.name, "testFn"); + }); + + it("can be assigned to a function type with specified parameters", async () => { + const [{ p }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn testFn(a: string): string; + + const f: fn(arg: string) => unknown = testFn; + + model Observer { + ${t.modelProperty("p")}: fn(arg: string) => unknown = f; + } + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + strictEqual(p.defaultValue?.entityKind, "Value"); + strictEqual(p.defaultValue?.valueKind, "Function"); + strictEqual(p.defaultValue?.name, "testFn"); + }); + + it("can be assigned to a function type with specified return type", async () => { + const [{ p }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn testFn(a: string): string; + + const f: fn(arg: never) => string = testFn; + + model Observer { + ${t.modelProperty("p")}: fn(arg: never) => string = f; + } + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + strictEqual(p.defaultValue?.entityKind, "Value"); + strictEqual(p.defaultValue?.valueKind, "Function"); + strictEqual(p.defaultValue?.name, "testFn"); + }); + + it("errors when assigned to function type with incompatible parameters", async () => { + const diagnostics = await tester.diagnose(` + extern fn testFn(a: string): string; + + const f: fn(arg: numeric) => string = testFn; + `); + + expectFunctionDiagnostics(diagnostics, { + code: "unassignable", + message: + "Type 'fn (a: string) => string' is not assignable to type 'fn (arg: numeric) => string'\n Type 'numeric' is not assignable to type 'string'", + }); + }); + + it("errors when assigned to function type with incompatible return type", async () => { + const diagnostics = await tester.diagnose(` + extern fn testFn(a: string): string; + + const f: fn(arg: never) => int32 = testFn; + `); + + expectFunctionDiagnostics(diagnostics, { + code: "unassignable", + message: + "Type 'fn (a: string) => string' is not assignable to type 'fn (arg: never) => int32'\n Type 'string' is not assignable to type 'int32'", + }); + }); +}); + +describe("function type assignability", () => { + async function diagnoseFunctionAssignment(source: string, target: string) { + const diagnostics = await tester.diagnose(` + alias Source = ${source}; + alias Target = ${target}; + + model Expect {} + + alias Test = Expect; + `); + return diagnostics; + } + + function expectAssignmentOk(source: string, target: string) { + it(`allows assignment from '${source}' to '${target}'`, async () => { + const diagnostics = await diagnoseFunctionAssignment(source, target); + + expectDiagnosticEmpty(diagnostics); + }); + } + + function expectAssignmentErrors(source: string, target: string) { + it(`disallows assignment from '${source}' to '${target}'`, async () => { + const diagnostics = await diagnoseFunctionAssignment(source, target); + + expectDiagnostics(diagnostics, { code: "invalid-argument" }); + }); + } + + // Simple valid assignments + expectAssignmentOk("fn()", "fn()"); + expectAssignmentOk("fn(a: string)", "fn(a: string)"); + expectAssignmentOk("fn() => string", "fn() => string"); + expectAssignmentOk("fn(a: string, b: int32) => boolean", "fn(a: string, b: int32) => boolean"); + expectAssignmentOk("fn() => { x: string }", "fn() => Reflection.Model"); + + // Parameter contravariance + expectAssignmentOk("fn(a: unknown)", "fn(a: string)"); // string -> unknown + expectAssignmentOk("fn(a: string | int32)", "fn(a: string)"); // string -> string | int32 + expectAssignmentOk("fn(a: Reflection.Model)", "fn(a: { x: string })"); // ModelWithId -> Model + + expectAssignmentOk("fn() => string", "fn() => unknown"); + expectAssignmentOk("fn() => { x: string }", "fn() => Reflection.Model"); + + expectAssignmentErrors("fn() => string", "fn() => int32"); + expectAssignmentErrors("fn(a: string)", "fn(a: unknown)"); // unknown -> string + expectAssignmentErrors("fn(a: string)", "fn(a: string | int32)"); // string | int32 -> string + expectAssignmentErrors("fn(a: { x: string })", "fn(a: Reflection.Model)"); // Model -> ModelWithId + + expectAssignmentErrors("fn() => unknown", "fn() => string"); + expectAssignmentErrors("fn() => Reflection.Model", "fn() => { x: string }"); + + // T | valueof T mixed constraints + expectAssignmentOk("fn(a: unknown | valueof unknown)", "fn(a: string | valueof string)"); + expectAssignmentOk("fn() => string | valueof string", "fn() => unknown | valueof unknown"); + expectAssignmentOk("fn() => valueof string", "fn() => string | valueof string"); + expectAssignmentOk("fn() => string", "fn() => string | valueof string"); + + expectAssignmentErrors("fn(a: string | valueof string)", "fn(a: valueof unknown)"); + expectAssignmentErrors("fn() => valueof unknown", "fn() => string | valueof string"); + + // Parameter arity + expectAssignmentOk("fn()", "fn()"); + expectAssignmentOk("fn()", "fn(a: string)"); // Ok -- source ignores the parameter from the target + expectAssignmentOk("fn(a: string)", "fn(a: string, b: int32)"); + + expectAssignmentErrors("fn(a: string)", "fn()"); // Not ok -- source requires a parameter that target doesn't provide + expectAssignmentErrors("fn(a: string, b: int32)", "fn(a: string)"); + + // Optional parameters + expectAssignmentOk("fn()", "fn(a?: string)"); // ok -- source ignores the parameter if provided + expectAssignmentOk("fn(a?: string)", "fn(a: string)"); // ok -- target always provides optional param + expectAssignmentOk("fn(a: string, b?: int32)", "fn(a: string, b: int32)"); + expectAssignmentOk("fn(a?: string)", "fn()"); // ok - source doesn't require the parameter + + expectAssignmentErrors("fn(a: string)", "fn()"); // not ok -- source requires param that target doesn't provide + expectAssignmentErrors("fn(a: string)", "fn(a?: string)"); // not ok -- source requires param that target may not provide + expectAssignmentErrors("fn(a: string, b: int32)", "fn(a: string, b?: int32)"); + + // Rest parameters + expectAssignmentOk("fn(...args: string[])", "fn(...args: string[])"); + expectAssignmentOk("fn(...args: unknown[])", "fn(...args: string[])"); + expectAssignmentOk("fn(...args: valueof string[])", "fn(...args: valueof string[])"); + + expectAssignmentErrors("fn(...args: string[])", "fn(...args: unknown[])"); + expectAssignmentErrors("fn(...args: string[])", "fn(...args: valueof string[])"); + + // Rest parameters cannot satisfy required params + expectAssignmentErrors("fn(a: string)", "fn(...args: string[])"); + expectAssignmentErrors("fn(a: string, b: int32)", "fn(...args: unknown[])"); + expectAssignmentErrors("fn(a: string)", "fn(...args: valueof string[])"); + expectAssignmentErrors("fn(a: string, b: int32)", "fn(...args: valueof unknown[])"); + + // Rest parameters can satisfy optional params + expectAssignmentOk("fn()", "fn(...args: string[])"); + expectAssignmentOk("fn(a?: string)", "fn(...args: string[])"); + expectAssignmentOk("fn(a: unknown, b?: unknown)", "fn(a: string, ...args: int32[])"); // string -> unknown, int32? -> unknown? + expectAssignmentOk("fn()", "fn(...args: valueof string[])"); + expectAssignmentOk("fn(a?: valueof string)", "fn(...args: valueof string[])"); + expectAssignmentOk( + "fn(a: valueof unknown, b?: valueof unknown)", + "fn(a: valueof string, ...args: valueof int32[])", + ); // string -> unknown, int32? -> unknown? +}); + +describe("calling template arguments", () => { + beforeEach(() => { + tester = BaseTester.files({ + "templates.js": mockFile.js({ + $functions: { + "": { + f(_ctx: FunctionContext, T: Model) { + return T.name; + }, + }, + }, + }), + }) + .import("./templates.js") + .using("TypeSpec.Reflection"); + }); + + it("does not allow calling an unconstrained template parameter", async () => { + const diagnostics = await tester.diagnose(` + model Test { + p: string = F(); + } + `); + + expectDiagnostics(diagnostics, { + code: "non-callable", + message: + "Template parameter 'F extends unknown' is not callable. Ensure it is constrained to a function value or callable type (scalar or scalar constructor).", + }); + }); + + it("does not allow calling a template paremeter constrained to a type that is possibly not a function", async () => { + const diagnostics = await tester.diagnose(` + model Test valueof string> { + p: string = F(); + } + `); + + expectDiagnostics(diagnostics, { + code: "non-callable", + message: + "Template parameter 'F extends Model | valueof fn () => valueof string' is not callable. Ensure it is constrained to a function value or callable type (scalar or scalar constructor).", + }); + }); + + it("allows calling a template parameter constrained to a function value", async () => { + const [{ Instance }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn f(T: Model): valueof string; + + model Foo {} + + model Test valueof string> { + p: string = F(Foo); + } + + model ${t.model("Instance")} is Test; + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + + const p = Instance.properties.get("p"); + + strictEqual(p?.defaultValue?.entityKind, "Value"); + strictEqual(p.defaultValue?.valueKind, "StringValue"); + strictEqual(p.defaultValue?.value, "Foo"); + }); +}); + +describe("function calls within template declarations", () => { + let receivedTypes: any[] = []; + let observed: any; + + beforeEach(() => { + receivedTypes = []; + + tester = BaseTester.files({ + "fns.js": mockFile.js({ + $functions: { + "": { + f(_ctx: FunctionContext, T: unknown) { + receivedTypes.push(T); + return T; + }, + }, + }, + $decorators: { + "": { + d(_ctx: DecoratorContext, target: any) {}, + test(_ctx: DecoratorContext, target: any) { + observed = target; + }, + }, + }, + }), + }) + .import("./fns.js") + .using("TypeSpec.Reflection"); + }); + + it("does not call a function in a templated model declaration", async () => { + const diagnostics = await tester.diagnose(` + extern fn f(T: unknown): valueof unknown; + + model Test { + p: T = f(T); + } + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + strictEqual(receivedTypes.length, 0); + }); + + it("does not call a function in a templated alias declaration", async () => { + const diagnostics = await tester.diagnose(` + extern fn f(T: unknown): valueof unknown; + + alias Test = f(T); + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + strictEqual(receivedTypes.length, 0); + }); + + it("allows passing value-constrained template parameters to valueof function parameters", async () => { + const diagnostics = await tester.diagnose(` + extern fn f(T: valueof uint32): valueof uint32; + + alias Test = f(V); + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + strictEqual(receivedTypes.length, 0); + }); + + it("does not call a function in a decorator argument of a templated operation declaration", async () => { + const diagnostics = await tester.diagnose(` + extern fn f(T: unknown): unknown; + extern dec d(target: unknown, arg: unknown); + + @d(f(T)) op test(): void; + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + strictEqual(receivedTypes.length, 0); + }); + + it("does not call a function in any position of a templated alias to a literal model", async () => { + const diagnostics = await tester.diagnose(` + extern fn f(T: unknown): unknown; + extern dec d(target: unknown, arg: unknown); + + alias Test = { + @d(f(T)) prop: f(T); + }; + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + strictEqual(receivedTypes.length, 0); + }); + + it("calls a function once on instantiation of a templated model", async () => { + const [{ Instance }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn f(T: unknown): unknown; + + model Test { + p: f(T); + } + + model ${t.model("Instance")} is Test; + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + strictEqual(receivedTypes.length, 1); + strictEqual(receivedTypes[0].kind, "Scalar"); + strictEqual(receivedTypes[0].name, "string"); + + const p = Instance.properties.get("p"); + + strictEqual(p?.type.kind, "Scalar"); + strictEqual(p.type.name, "string"); + }); + + it("calls a function twice on instantiation of a templated alias to a literal model", async () => { + const [{ Instance }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn f(T: unknown): unknown; + extern dec d(target: unknown, arg: unknown); + + alias Test = { + @d(f(T)) p: f(T); + }; + + model ${t.model("Instance")} { + outer: Test; + } + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + strictEqual(receivedTypes.length, 2); + strictEqual(receivedTypes[0].kind, "Scalar"); + strictEqual(receivedTypes[0].name, "string"); + strictEqual(receivedTypes[1].kind, "Scalar"); + strictEqual(receivedTypes[1].name, "string"); + + const outer = Instance.properties.get("outer"); + ok(outer); + + strictEqual(outer.type.kind, "Model"); + const p = outer.type.properties.get("p"); + ok(p); + + strictEqual(p.type.kind, "Scalar"); + strictEqual(p.type.name, "string"); + }); + + it("calls a function on instantiation of a templated operation", async () => { + const diagnostics = await tester.diagnose(` + extern fn f(T: unknown): unknown; + extern dec d(target: unknown, arg: unknown); + + @d(f(T)) op test(): void; + + alias Instance = test; + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + strictEqual(receivedTypes.length, 1); + strictEqual(receivedTypes[0].kind, "Scalar"); + strictEqual(receivedTypes[0].name, "string"); + }); + + it("calls a function once on instantiation of templated alias through 'model is'", async () => { + const [{ X }, diagnostics] = await tester.compileAndDiagnose(t.code` + extern fn f(m: Reflection.Model): { myProperty: string }; + + alias F = f(M); + + model Y { + id: string; + myProperty: string; + } + + + model ${t.model("X")} is F; + + // This also checks that 'myProperty' exists as a member symbol of X, resolved from return constraint of 'f' + @@global.test(X.myProperty); + `); + + expectFunctionDiagnosticsEmpty(diagnostics); + strictEqual(receivedTypes.length, 1); + strictEqual(receivedTypes[0].kind, "Model"); + strictEqual(receivedTypes[0].name, "Y"); + + const myProp = X.properties.get("myProperty"); + ok(myProp); + strictEqual(myProp.type.kind, "Scalar"); + strictEqual(myProp.type.name, "string"); + + strictEqual(observed, myProp); + }); +}); diff --git a/packages/compiler/test/checker/global-namespace.test.ts b/packages/compiler/test/checker/global-namespace.test.ts index 1933f52af46..b7165580ca2 100644 --- a/packages/compiler/test/checker/global-namespace.test.ts +++ b/packages/compiler/test/checker/global-namespace.test.ts @@ -1,22 +1,14 @@ import assert, { notStrictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; -import { Model } from "../../src/core/types.js"; -import { TestHost, createTestHost } from "../../src/testing/index.js"; +import { describe, it } from "vitest"; +import { t } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; describe("compiler: global namespace", () => { - let testHost: TestHost; - - beforeEach(async () => { - testHost = await createTestHost(); - }); - describe("it adds top level entities to the global namespace", () => { it("adds top-level namespaces", async () => { - testHost.addTypeSpecFile("main.tsp", `namespace Foo {}`); - - await testHost.compile("./"); + const { program } = await Tester.compile(`namespace Foo {}`); - const globalNamespaceType = testHost.program.checker.getGlobalNamespaceType(); + const globalNamespaceType = program.checker.getGlobalNamespaceType(); assert( globalNamespaceType?.namespaces.get("Foo"), "Namespace Foo was added to global namespace type", @@ -24,11 +16,9 @@ describe("compiler: global namespace", () => { }); it("adds top-level models", async () => { - testHost.addTypeSpecFile("main.tsp", `model MyModel {}`); + const { program } = await Tester.compile(`model MyModel {}`); - await testHost.compile("./"); - - const globalNamespaceType = testHost.program.checker.getGlobalNamespaceType(); + const globalNamespaceType = program.checker.getGlobalNamespaceType(); assert( globalNamespaceType?.models.get("MyModel"), "model MyModel was added to global namespace type", @@ -36,11 +26,9 @@ describe("compiler: global namespace", () => { }); it("adds top-level operations", async () => { - testHost.addTypeSpecFile("main.tsp", `op myOperation(): string;`); - - await testHost.compile("./"); + const { program } = await Tester.compile(`op myOperation(): string;`); - const globalNamespaceType = testHost.program.checker.getGlobalNamespaceType(); + const globalNamespaceType = program.checker.getGlobalNamespaceType(); assert( globalNamespaceType?.operations.get("myOperation"), "operation myOperation was added to global namespace type", @@ -49,23 +37,12 @@ describe("compiler: global namespace", () => { }); describe("it adds top level entities used in other files to the global namespace", () => { - beforeEach(() => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - - model Base {} - `, - ); - }); - it("adds top-level namespaces", async () => { - testHost.addTypeSpecFile("a.tsp", `namespace Foo {}`); - - await testHost.compile("./"); + const { program } = await Tester.files({ "a.tsp": `namespace Foo {}` }) + .import("./a.tsp") + .compile(`model Base {}`); - const globalNamespaceType = testHost.program.checker.getGlobalNamespaceType(); + const globalNamespaceType = program.checker.getGlobalNamespaceType(); assert( globalNamespaceType?.namespaces.get("Foo"), "Namespace Foo was added to global namespace type", @@ -77,11 +54,11 @@ describe("compiler: global namespace", () => { }); it("adds top-level models", async () => { - testHost.addTypeSpecFile("a.tsp", `model MyModel {}`); + const { program } = await Tester.files({ "a.tsp": `model MyModel {}` }) + .import("./a.tsp") + .compile(`model Base {}`); - await testHost.compile("./"); - - const globalNamespaceType = testHost.program.checker.getGlobalNamespaceType(); + const globalNamespaceType = program.checker.getGlobalNamespaceType(); assert( globalNamespaceType?.models.get("MyModel"), "model MyModel was added to global namespace type", @@ -89,11 +66,11 @@ describe("compiler: global namespace", () => { }); it("adds top-level operations", async () => { - testHost.addTypeSpecFile("a.tsp", `op myOperation(): string;`); - - await testHost.compile("./"); + const { program } = await Tester.files({ "a.tsp": `op myOperation(): string;` }) + .import("./a.tsp") + .compile(`model Base {}`); - const globalNamespaceType = testHost.program.checker.getGlobalNamespaceType(); + const globalNamespaceType = program.checker.getGlobalNamespaceType(); assert( globalNamespaceType?.operations.get("myOperation"), "operation myOperation was added to global namespace type", @@ -102,9 +79,7 @@ describe("compiler: global namespace", () => { }); it("can override TypeSpec library things", async () => { - testHost.addTypeSpecFile("./main.tsp", `@test model int32 { x: TypeSpec.int32 }`); - - const { int32 } = (await testHost.compile("./")) as { int32: Model }; + const { int32 } = await Tester.compile(t.code`model ${t.model("int32")} { x: TypeSpec.int32 }`); notStrictEqual(int32, int32.properties.get("x")!.type); }); }); diff --git a/packages/compiler/test/checker/imports.test.ts b/packages/compiler/test/checker/imports.test.ts index 9a90637188d..69c630064f9 100644 --- a/packages/compiler/test/checker/imports.test.ts +++ b/packages/compiler/test/checker/imports.test.ts @@ -1,27 +1,18 @@ import { deepStrictEqual, ok } from "assert"; -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { LibraryLocationContext, LocationContext, ModuleLibraryMetadata, + Program, ProjectLocationContext, } from "../../src/index.js"; -import { - TestHost, - createTestHost, - expectDiagnostics, - resolveVirtualPath, -} from "../../src/testing/index.js"; +import { expectDiagnostics, mockFile, resolveVirtualPath } from "../../src/testing/index.js"; import { PackageJson } from "../../src/types/package-json.js"; +import { Tester } from "../tester.js"; describe("compiler: imports", () => { - let host: TestHost; - - beforeEach(async () => { - host = await createTestHost(); - }); - - function expectFileLoaded(files: { typespec?: string[]; js?: string[] }) { + function expectFileLoaded(program: Program, files: { typespec?: string[]; js?: string[] }) { const expectFileIn = (file: string, map: Map) => { const vFile = resolveVirtualPath(file); ok( @@ -34,152 +25,95 @@ describe("compiler: imports", () => { }; if (files.typespec) { for (const file of files.typespec) { - expectFileIn(file, host.program.sourceFiles); + expectFileIn(file, program.sourceFiles); } } if (files.js) { for (const file of files.js) { - expectFileIn(file, host.program.jsSourceFiles); + expectFileIn(file, program.jsSourceFiles); } } } it("import relative TypeSpec file", async () => { - host.addJsFile("blue.js", { $blue() {} }); - host.addTypeSpecFile( - "main.tsp", - ` + const { program } = await Tester.files({ + "b.tsp": `model B { }`, + }).compile(` import "./b.tsp"; model A extends B { } - `, - ); - host.addTypeSpecFile( - "b.tsp", - ` - model B { } - `, - ); - await host.compile("main.tsp"); - expectFileLoaded({ typespec: ["main.tsp", "b.tsp"] }); + `); + expectFileLoaded(program, { typespec: ["main.tsp", "b.tsp"] }); }); it("import relative JS file", async () => { - host.addJsFile("blue.js", { $blue() {} }); - host.addTypeSpecFile( - "main.tsp", - ` + const { program } = await Tester.files({ + "blue.js": mockFile.js({ $blue() {} }), + }).compile(` import "./blue.js"; - @blue model A {} - `, - ); - await host.compile("main.tsp"); - expectFileLoaded({ typespec: ["main.tsp"], js: ["blue.js"] }); + `); + expectFileLoaded(program, { typespec: ["main.tsp"], js: ["blue.js"] }); }); it("import relative JS file in parent folder", async () => { - host.addJsFile("blue.js", { $blue() {} }); - host.addTypeSpecFile( - "proj/main.tsp", - ` + const { program } = await Tester.files({ + "blue.js": mockFile.js({ $blue() {} }), + "proj/main.tsp": ` import "../blue.js"; - @blue model A {} `, - ); - await host.compile("proj/main.tsp"); - expectFileLoaded({ typespec: ["proj/main.tsp"], js: ["blue.js"] }); + }).compile(`import "./proj/main.tsp";`); + expectFileLoaded(program, { typespec: ["proj/main.tsp"], js: ["blue.js"] }); }); it("import directory with main.tsp", async () => { - host.addTypeSpecFile( - "main.tsp", - ` + const { program } = await Tester.files({ + "test/main.tsp": `model C { }`, + }).compile(` import "./test"; - model A { x: C } - `, - ); - host.addTypeSpecFile( - "test/main.tsp", - ` - model C { } - `, - ); - - await host.compile("main.tsp"); - expectFileLoaded({ typespec: ["main.tsp", "test/main.tsp"] }); + `); + expectFileLoaded(program, { typespec: ["main.tsp", "test/main.tsp"] }); }); it("import library with typespec exports", async () => { - host.addTypeSpecFile( - "main.tsp", - ` - import "my-lib"; - - model A { x: C } - `, - ); - host.addTypeSpecFile( - "node_modules/my-lib/package.json", - JSON.stringify({ + const { program } = await Tester.files({ + "node_modules/my-lib/package.json": JSON.stringify({ name: "my-test-lib", exports: { ".": { typespec: "./main.tsp" } }, }), - ); - host.addTypeSpecFile( - "node_modules/my-lib/main.tsp", - ` - model C { } - `, - ); - - await host.compile("main.tsp"); - expectFileLoaded({ typespec: ["main.tsp", "node_modules/my-lib/main.tsp"] }); - const file = host.program.sourceFiles.get(resolveVirtualPath("node_modules/my-lib/main.tsp")); + "node_modules/my-lib/main.tsp": `model C { }`, + }).compile(` + import "my-lib"; + model A { x: C } + `); + expectFileLoaded(program, { typespec: ["main.tsp", "node_modules/my-lib/main.tsp"] }); + const file = program.sourceFiles.get(resolveVirtualPath("node_modules/my-lib/main.tsp")); ok(file, "File exists"); }); it("import library(with tspmain)", async () => { - host.addTypeSpecFile( - "main.tsp", - ` - import "my-lib"; - - model A { x: C } - `, - ); - host.addTypeSpecFile( - "node_modules/my-lib/package.json", - JSON.stringify({ + const { program } = await Tester.files({ + "node_modules/my-lib/package.json": JSON.stringify({ name: "my-test-lib", tspMain: "./main.tsp", }), - ); - host.addTypeSpecFile( - "node_modules/my-lib/main.tsp", - ` - model C { } - `, - ); - - await host.compile("main.tsp"); - expectFileLoaded({ typespec: ["main.tsp", "node_modules/my-lib/main.tsp"] }); - const file = host.program.sourceFiles.get(resolveVirtualPath("node_modules/my-lib/main.tsp")); + "node_modules/my-lib/main.tsp": `model C { }`, + }).compile(` + import "my-lib"; + model A { x: C } + `); + expectFileLoaded(program, { typespec: ["main.tsp", "node_modules/my-lib/main.tsp"] }); + const file = program.sourceFiles.get(resolveVirtualPath("node_modules/my-lib/main.tsp")); ok(file, "File exists"); }); it("emit diagnostic when trying to load invalid relative file", async () => { - host.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` import "./doesnotexists"; - `, - ); - - const diagnostics = await host.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "import-not-found", message: `Couldn't resolve import "./doesnotexists"`, @@ -187,14 +121,9 @@ describe("compiler: imports", () => { }); it("emit diagnostic when trying to load invalid library", async () => { - host.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` import "@typespec/doesnotexists"; - `, - ); - - const diagnostics = await host.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "import-not-found", message: `Couldn't resolve import "@typespec/doesnotexists"`, @@ -222,22 +151,22 @@ describe("compiler: imports", () => { function givenStructure(config: ScopeTest): ScopeExpectation { return { expectScopes: async (scopes: Record) => { + const filesMap: Record = {}; for (const [filename, fileConfig] of Object.entries(config.structure)) { if (filename.endsWith(".tsp")) { - host.addTypeSpecFile( - filename, - (fileConfig as string[]).map((x) => `import "${x}";`).join("\n"), - ); + filesMap[filename] = (fileConfig as string[]).map((x) => `import "${x}";`).join("\n"); } else { - host.addTypeSpecFile(filename, JSON.stringify(fileConfig, null, 2)); + filesMap[filename] = JSON.stringify(fileConfig, null, 2); } } - await host.compile(config.entrypoint); + const { program } = await Tester.files(filesMap).compile( + `import "./${config.entrypoint}";`, + ); for (const [filename, expectedScope] of Object.entries(scopes)) { - const file = host.program.sourceFiles.get(resolveVirtualPath(filename)); + const file = program.sourceFiles.get(resolveVirtualPath(filename)); ok(file, `Expected to have file "${filename}"`); - deepStrictEqual(host.program.getSourceFileLocationContext(file.file), expectedScope); + deepStrictEqual(program.getSourceFileLocationContext(file.file), expectedScope); } }, }; diff --git a/packages/compiler/test/checker/interface.test.ts b/packages/compiler/test/checker/interface.test.ts index 367ae54782f..fa4c651c138 100644 --- a/packages/compiler/test/checker/interface.test.ts +++ b/packages/compiler/test/checker/interface.test.ts @@ -1,48 +1,27 @@ import { deepStrictEqual, notStrictEqual, ok, strictEqual } from "assert"; -import { beforeEach, describe, expect, it, vi } from "vitest"; +import { describe, expect, it, vi } from "vitest"; import { isTemplateDeclaration } from "../../src/core/type-utils.js"; -import { Interface, Model, Operation, Type } from "../../src/core/types.js"; +import { Interface, Model, Type } from "../../src/core/types.js"; import { getDoc } from "../../src/index.js"; -import { - BasicTestRunner, - TestHost, - createTestHost, - createTestRunner, - expectDiagnostics, -} from "../../src/testing/index.js"; +import { expectDiagnostics, mockFile, t } from "../../src/testing/index.js"; import { Tester } from "../tester.js"; describe("compiler: interfaces", () => { - let testHost: TestHost; - let runner: BasicTestRunner; - - beforeEach(async () => { - testHost = await createTestHost(); - runner = await createTestRunner(testHost); - }); - it("works", async () => { const blues = new Set(); - testHost.addJsFile("test.js", { - $blue(p: any, t: Interface) { - blues.add(t); - }, - }); - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./test.js"; - @test @blue interface Foo { + const { Foo, program } = await Tester.files({ + "test.js": mockFile.js({ + $blue(p: any, target: Interface) { + blues.add(target); + }, + }), + }).import("./test.js").compile(t.code` + @blue interface ${t.interface("Foo")} { @blue bar(): string; } - `, - ); - - const { Foo } = (await testHost.compile("./")) as { - Foo: Interface; - }; + `); - strictEqual(Foo.namespace, testHost.program.checker.getGlobalNamespaceType()); + strictEqual(Foo.namespace, program.checker.getGlobalNamespaceType()); strictEqual(Foo.name, "Foo"); strictEqual(Foo.operations.size, 1); const bar = Foo.operations.get("bar"); @@ -54,17 +33,12 @@ describe("compiler: interfaces", () => { }); it("throws diagnostics for duplicate properties", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test interface Foo { + const diagnostics = await Tester.diagnose(` + interface Foo { bar(): string; bar(): int32; } - `, - ); - - const diagnostics = await testHost.diagnose("./"); + `); expectDiagnostics(diagnostics, { code: "interface-duplicate", message: "Interface already has a member named bar", @@ -72,43 +46,32 @@ describe("compiler: interfaces", () => { }); it("can be templated", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test interface Foo { + const { Foo, bar } = await Tester.compile(t.code` + interface ${t.interface("Foo")} { bar(): T; } - alias Bar = Foo; - `, - ); - - const { Foo } = (await testHost.compile("./")) as { - Foo: Interface; - }; + alias MyFoo = Foo; + op ${t.op("bar")} is MyFoo.bar; + `); strictEqual(Foo.operations.size, 1); - const returnType = Foo.operations.get("bar")!.returnType; + const returnType = bar.returnType; strictEqual(returnType.kind, "Scalar" as const); strictEqual(returnType.name, "int32"); }); it("can extend one other interfaces", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Foo, bar } = await Tester.compile(t.code` interface Bar { bar(): T } - @test interface Foo extends Bar { + interface ${t.interface("Foo")} extends Bar { foo(): T; } alias Baz = Foo; - `, - ); + op ${t.op("bar")} is Baz.bar; + `); - const { Foo } = (await testHost.compile("./")) as { - Foo: Interface; - }; deepStrictEqual( Foo.sourceInterfaces.map((i) => i.name), ["Bar"], @@ -116,26 +79,21 @@ describe("compiler: interfaces", () => { strictEqual(Foo.operations.size, 2); ok(Foo.operations.get("foo")); ok(Foo.operations.get("bar")); - strictEqual((Foo.operations.get("bar")!.returnType as Model).name, "int32"); + strictEqual((bar.returnType as Model).name, "int32"); }); it("can extend two other interfaces", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Foo, bar } = await Tester.compile(t.code` interface Bar { bar(): T } interface Baz { baz(): T } - @test interface Foo extends Bar, Baz { + interface ${t.interface("Foo")} extends Bar, Baz { foo(): T; } alias Qux = Foo; - `, - ); + op ${t.op("bar")} is Qux.bar; + `); - const { Foo } = (await testHost.compile("./")) as { - Foo: Interface; - }; deepStrictEqual( Foo.sourceInterfaces.map((i) => i.name), ["Bar", "Baz"], @@ -144,31 +102,23 @@ describe("compiler: interfaces", () => { ok(Foo.operations.get("foo")); ok(Foo.operations.get("bar")); ok(Foo.operations.get("baz")); - strictEqual((Foo.operations.get("bar")!.returnType as Model).name, "int32"); + strictEqual((bar.returnType as Model).name, "int32"); }); it("doesn't copy interface decorators down when using extends", async () => { const blues = new Set(); - testHost.addJsFile("test.js", { - $blue(p: any, t: Interface) { - blues.add(t); - }, - }); - - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./test.js"; + const { Bar } = await Tester.files({ + "test.js": mockFile.js({ + $blue(p: any, target: Interface) { + blues.add(target); + }, + }), + }).import("./test.js").compile(t.code` @blue interface Foo { foo(): int32 } - @test interface Bar extends Foo { + interface ${t.interface("Bar")} extends Foo { bar(): int32; } - `, - ); - - const { Bar } = (await testHost.compile("./")) as { - Bar: Interface; - }; + `); ok(!blues.has(Bar)); strictEqual(Bar.operations.size, 2); @@ -177,41 +127,29 @@ describe("compiler: interfaces", () => { it("clones extended operations", async () => { const blues = new Set(); let calls = 0; - testHost.addJsFile("test.js", { - $blue(p: any, t: Interface) { - calls++; - blues.add(t); - }, - }); - - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./test.js"; + const { Bar } = await Tester.files({ + "test.js": mockFile.js({ + $blue(p: any, target: Interface) { + calls++; + blues.add(target); + }, + }), + }).import("./test.js").compile(t.code` interface Foo { @blue foo(): int32 } - @test interface Bar extends Foo {} - `, - ); - - const { Bar } = (await testHost.compile("./")) as { - Bar: Interface; - }; + interface ${t.interface("Bar")} extends Foo {} + `); strictEqual(calls, 2); ok(blues.has(Bar.operations.get("foo")!)); }); it("doesn't allow extensions to contain duplicate members", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` interface Bar { bar(): int32 } interface Baz { bar(): int32 } - @test interface Foo extends Bar, Baz { } - `, - ); + interface Foo extends Bar, Baz { } + `); - const diagnostics = await testHost.diagnose("./"); expectDiagnostics(diagnostics, { code: "extends-interface-duplicate", message: "Interface extends cannot have duplicate members. The duplicate member is named bar", @@ -219,32 +157,22 @@ describe("compiler: interfaces", () => { }); it("allows overriding extended interface members", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Foo } = await Tester.compile(t.code` interface Bar { bar(): int32 } - @test interface Foo extends Bar { bar(): string } - `, - ); + interface ${t.interface("Foo")} extends Bar { bar(): string } + `); - const { Foo } = (await testHost.compile("./")) as { - Foo: Interface; - }; strictEqual(Foo.operations.size, 1); ok(Foo.operations.get("bar")); strictEqual((Foo.operations.get("bar")!.returnType as Model).name, "string"); }); it("doesn't allow extending non-interfaces", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model Bar { } - @test interface Foo extends Bar { bar(): string } - `, - ); + interface Foo extends Bar { bar(): string } + `); - const diagnostics = await testHost.diagnose("./"); expectDiagnostics(diagnostics, { code: "extends-interface", message: "Interfaces can only extend other interfaces", @@ -304,16 +232,13 @@ describe("compiler: interfaces", () => { describe("templated operations", () => { it("can instantiate template operation inside non-templated interface", async () => { - const { Foo, bar } = (await runner.compile(` - @test interface Foo { - @test bar(): T; + const { Foo, bar } = await Tester.compile(t.code` + interface ${t.interface("Foo")} { + bar(): T; } - alias Bar = Foo.bar; - `)) as { - Foo: Interface; - bar: Operation; - }; + op ${t.op("bar")} is Foo.bar; + `); strictEqual(Foo.operations.size, 1); ok(isTemplateDeclaration(Foo.operations.get("bar")!)); @@ -324,17 +249,14 @@ describe("compiler: interfaces", () => { }); it("can instantiate template operation inside templated interface", async () => { - const { Foo, bar } = (await runner.compile(` - @test interface Foo { - @test bar(input: A): B; + const { Foo, bar } = await Tester.compile(t.code` + interface ${t.interface("Foo")} { + bar(input: A): B; } alias MyFoo = Foo; - alias Bar = MyFoo.bar; - `)) as { - Foo: Interface; - bar: Operation; - }; + op ${t.op("bar")} is MyFoo.bar; + `); strictEqual(Foo.operations.size, 1); @@ -348,18 +270,15 @@ describe("compiler: interfaces", () => { }); it("can instantiate template operation inside templated interface (inverted order)", async () => { - const { Foo, bar } = (await runner.compile(` - alias Bar = MyFoo.bar; + const { Foo, bar } = await Tester.compile(t.code` + op ${t.op("bar")} is MyFoo.bar; alias MyFoo = Foo; - @test interface Foo { - @test bar(input: A): B; + interface ${t.interface("Foo")} { + bar(input: A): B; } - `)) as { - Foo: Interface; - bar: Operation; - }; + `); strictEqual(Foo.operations.size, 1); const input = bar.parameters.properties.get("input")!.type; @@ -372,19 +291,17 @@ describe("compiler: interfaces", () => { }); it("cache templated operations", async () => { - const { Index } = (await runner.compile(` - @test interface Foo { - @test bar(input: A): B; + const { Index } = await Tester.compile(t.code` + interface Foo { + bar(input: A): B; } alias MyFoo = Foo; - @test model Index { + model ${t.model("Index")} { a: MyFoo.bar; b: MyFoo.bar; } - `)) as { - Index: Model; - }; + `); const a = Index.properties.get("a"); const b = Index.properties.get("b"); ok(a); @@ -394,20 +311,18 @@ describe("compiler: interfaces", () => { }); it("templated interface with different args but templated operations with the same arg shouldn't be the same", async () => { - const { Index } = (await runner.compile(` - @test interface Foo { - @test bar(input: A): B; + const { Index } = await Tester.compile(t.code` + interface Foo { + bar(input: A): B; } alias MyFoo8 = Foo; alias MyFoo16 = Foo; - @test model Index { + model ${t.model("Index")} { a: MyFoo8.bar; b: MyFoo16.bar; } - `)) as { - Index: Model; - }; + `); const a = Index.properties.get("a"); const b = Index.properties.get("b"); ok(a); @@ -417,19 +332,16 @@ describe("compiler: interfaces", () => { }); it("can extend an interface with templated operations", async () => { - const { Foo, myBar: bar } = (await runner.compile(` + const { Foo, myBar: bar } = await Tester.compile(t.code` interface Base { bar(input: A): B; } - @test interface Foo extends Base { + interface ${t.interface("Foo")} extends Base { } - @test op myBar is Foo.bar; - `)) as { - Foo: Interface; - myBar: Operation; - }; + op ${t.op("myBar")} is Foo.bar; + `); strictEqual(Foo.operations.size, 1); @@ -443,45 +355,39 @@ describe("compiler: interfaces", () => { }); it("instantiating an templated interface doesn't finish template operation inside", async () => { - const $track = vi.fn(); - testHost.addJsFile("dec.js", { $track }); - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./dec.js"; - - interface Base { + const _track = vi.fn(); + await Tester.files({ + "dec.js": mockFile.js({ + $track() { + _track(); + }, + }), + }).import("./dec.js").compile(` + interface Base { @track bar(input: A): B; } alias My = Base; - `, - ); - await testHost.compile("./"); - expect($track).not.toHaveBeenCalled(); + `); + expect(_track).not.toHaveBeenCalled(); }); it("templated interface extending another templated interface doesn't run decorator on extended interface operations", async () => { const $track = vi.fn(); - testHost.addJsFile("dec.js", { $track }); - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./dec.js"; - + await Tester.files({ + "dec.js": mockFile.js({ $track }), + }).import("./dec.js").compile(` interface Base { @track bar(): T; } interface Foo extends Base {} - `, - ); - await testHost.compile("./"); + `); expect($track).not.toHaveBeenCalled(); }); it("emit warning if shadowing parent templated type", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` interface Base { bar(input: A): A; } @@ -494,7 +400,7 @@ describe("compiler: interfaces", () => { }); it("emit diagnostic if trying to instantiate non templated operation", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` interface Base { bar(input: A): void; } @@ -512,16 +418,14 @@ describe("compiler: interfaces", () => { // https://github.com/microsoft/typespec/pull/2617 it("can 'op is' a templated operation inside templated interface", async () => { - const { myBar } = (await runner.compile(` + const { myBar } = await Tester.compile(t.code` interface Foo { bar(input: A): B; } alias MyFoo = Foo; - @test op myBar is MyFoo.bar; - `)) as { - myBar: Operation; - }; + op ${t.op("myBar")} is MyFoo.bar; + `); const input = myBar.parameters.properties.get("input")!.type; strictEqual(input.kind, "Scalar" as const); @@ -534,19 +438,12 @@ describe("compiler: interfaces", () => { }); it("can decorate extended operations independently", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test interface Base {@doc("base doc") one(): void} - @test interface Extending extends Base {} + const { Base, Extending, program } = await Tester.compile(t.code` + interface ${t.interface("Base")} {@doc("base doc") one(): void} + interface ${t.interface("Extending")} extends Base {} @@doc(Extending.one, "override for spread"); - `, - ); - const { Base, Extending } = (await testHost.compile("main.tsp")) as { - Base: Interface; - Extending: Interface; - }; - strictEqual(getDoc(testHost.program, Extending.operations.get("one")!), "override for spread"); - strictEqual(getDoc(testHost.program, Base.operations.get("one")!), "base doc"); + `); + strictEqual(getDoc(program, Extending.operations.get("one")!), "override for spread"); + strictEqual(getDoc(program, Base.operations.get("one")!), "base doc"); }); }); diff --git a/packages/compiler/test/checker/internal.test.ts b/packages/compiler/test/checker/internal.test.ts new file mode 100644 index 00000000000..d4798b7dfcd --- /dev/null +++ b/packages/compiler/test/checker/internal.test.ts @@ -0,0 +1,396 @@ +import { describe, it } from "vitest"; +import { expectDiagnosticEmpty, expectDiagnostics } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; + +describe("modifier validation", () => { + const declarationKinds = [ + { keyword: "model", code: "internal model Foo {}" }, + { keyword: "scalar", code: "internal scalar Foo;" }, + { keyword: "interface", code: "internal interface Foo {}" }, + { keyword: "union", code: "internal union Foo {}" }, + { keyword: "op", code: "internal op foo(): void;" }, + { keyword: "enum", code: "internal enum Foo {}" }, + { keyword: "alias", code: "internal alias Foo = string;" }, + { keyword: "const", code: "internal const foo = 1;" }, + ]; + + for (const { keyword, code } of declarationKinds) { + it(`allows 'internal' on ${keyword} declaration (with experimental warning)`, async () => { + const diagnostics = await Tester.diagnose(code); + expectDiagnostics(diagnostics, { + code: "experimental-feature", + severity: "warning", + message: `Internal symbols are experimental and may be changed in a future release. Use with caution. Suppress this message ('#suppress "experimental-feature"') to silence this warning.`, + }); + }); + } + + it("allows 'internal' combined with 'extern' on decorator declaration", async () => { + const diagnostics = await Tester.files({ + "test.js": { kind: "js", exports: { $myDec: () => {} } }, + }) + .import("./test.js") + .diagnose(`internal extern dec myDec(target: unknown);`); + + // Only the experimental warning, no error + expectDiagnostics(diagnostics, { + code: "experimental-feature", + }); + }); + + it("does not allow 'internal' on namespace", async () => { + const diagnostics = await Tester.diagnose(`internal namespace Foo {}`); + expectDiagnostics(diagnostics, [ + { + code: "experimental-feature", + }, + { + code: "invalid-modifier", + message: "Modifier 'internal' cannot be used on declarations of type 'namespace'.", + }, + ]); + }); + + it("does not allow 'internal' on blockless namespace", async () => { + const diagnostics = await Tester.diagnose(`internal namespace Foo;`); + expectDiagnostics(diagnostics, [ + { + code: "experimental-feature", + }, + { + code: "invalid-modifier", + message: "Modifier 'internal' cannot be used on declarations of type 'namespace'.", + }, + ]); + }); + + it("does not emit experimental warning without 'internal' modifier", async () => { + const diagnostics = await Tester.diagnose(`model Foo {}`); + expectDiagnosticEmpty(diagnostics); + }); +}); + +describe("access control", () => { + function createLibraryTester(libFiles: Record) { + const files: Record = { + "node_modules/my-lib/package.json": JSON.stringify({ + name: "my-lib", + version: "1.0.0", + exports: { ".": { typespec: "./main.tsp" } }, + }), + }; + for (const [name, content] of Object.entries(libFiles)) { + files[`node_modules/my-lib/${name}`] = content; + } + return Tester.files(files); + } + + describe("compiler internal decorators", () => { + it("rejects access to TypeSpec.indexer from user code", async () => { + const diagnostics = await Tester.diagnose(` + @TypeSpec.indexer(string, string) + model Test {} + `); + + expectDiagnostics(diagnostics, [{ code: "invalid-ref", message: /internal/ }]); + }); + + it("rejects access to TypeSpec.docFromComment from user code", async () => { + const diagnostics = await Tester.diagnose(` + @TypeSpec.docFromComment("self", "test") + model Test {} + `); + + expectDiagnostics(diagnostics, [{ code: "invalid-ref", message: /internal/ }]); + }); + + it("rejects access to TypeSpec.Prototypes.getter from user code", async () => { + const diagnostics = await Tester.diagnose(` + @TypeSpec.Prototypes.getter + model Test {} + `); + + expectDiagnostics(diagnostics, [{ code: "invalid-ref", message: /internal/ }]); + }); + }); + + describe("cross-library access", () => { + it("rejects access to internal model from another package", async () => { + const diagnostics = await createLibraryTester({ + "main.tsp": "internal model LibModel {}", + }).diagnose(` + import "my-lib"; + model Consumer { x: LibModel } + `); + + expectDiagnostics(diagnostics, [ + { code: "invalid-ref", message: /internal/ }, + { code: "experimental-feature" }, + ]); + }); + + it("rejects access to internal scalar from another package", async () => { + const diagnostics = await createLibraryTester({ + "main.tsp": "internal scalar LibScalar;", + }).diagnose(` + import "my-lib"; + model Consumer { x: LibScalar } + `); + + expectDiagnostics(diagnostics, [ + { code: "invalid-ref", message: /internal/ }, + { code: "experimental-feature" }, + ]); + }); + + it("rejects access to internal interface from another package", async () => { + const diagnostics = await createLibraryTester({ + "main.tsp": "internal interface LibIface {}", + }).diagnose(` + import "my-lib"; + interface Consumer extends LibIface {} + `); + + expectDiagnostics(diagnostics, [ + { code: "invalid-ref", message: /internal/ }, + { code: "experimental-feature" }, + ]); + }); + + it("rejects access to internal union from another package", async () => { + const diagnostics = await createLibraryTester({ + "main.tsp": "internal union LibUnion {}", + }).diagnose(` + import "my-lib"; + model Consumer { x: LibUnion } + `); + + expectDiagnostics(diagnostics, [ + { code: "invalid-ref", message: /internal/ }, + { code: "experimental-feature" }, + ]); + }); + + it("rejects access to internal op from another package", async () => { + const diagnostics = await createLibraryTester({ + "main.tsp": "internal op libOp(): void;", + }).diagnose(` + import "my-lib"; + op consumer is libOp; + `); + + expectDiagnostics(diagnostics, [ + { code: "invalid-ref", message: /internal/ }, + { code: "experimental-feature" }, + ]); + }); + + it("rejects access to internal enum from another package", async () => { + const diagnostics = await createLibraryTester({ + "main.tsp": "internal enum LibEnum { a, b }", + }).diagnose(` + import "my-lib"; + model Consumer { x: LibEnum } + `); + + expectDiagnostics(diagnostics, [ + { code: "invalid-ref", message: /internal/ }, + { code: "experimental-feature" }, + ]); + }); + + it("rejects access to internal alias from another package", async () => { + const diagnostics = await createLibraryTester({ + "main.tsp": ` + model Impl {} + internal alias LibAlias = Impl; + `, + }).diagnose(` + import "my-lib"; + model Consumer { x: LibAlias } + `); + + expectDiagnostics(diagnostics, [ + { code: "invalid-ref", message: /internal/ }, + { code: "experimental-feature" }, + ]); + }); + + it("rejects access to internal model in a namespace from another package", async () => { + const diagnostics = await createLibraryTester({ + "main.tsp": ` + namespace MyLib; + internal model Secret {} + `, + }).diagnose(` + import "my-lib"; + model Consumer { x: MyLib.Secret } + `); + + expectDiagnostics(diagnostics, [ + { code: "invalid-ref", message: /internal/ }, + { code: "experimental-feature" }, + ]); + }); + + it("rejects access to internal model via 'using' from another package", async () => { + const diagnostics = await createLibraryTester({ + "main.tsp": ` + namespace MyLib; + internal model Secret {} + `, + }).diagnose(` + import "my-lib"; + using MyLib; + model Consumer { x: Secret } + `); + + expectDiagnostics(diagnostics, [ + { code: "invalid-ref", message: /internal/ }, + { code: "experimental-feature" }, + ]); + }); + + it("rejects extending an internal model from another package", async () => { + const diagnostics = await createLibraryTester({ + "main.tsp": "internal model Base { x: string }", + }).diagnose(` + import "my-lib"; + model Consumer extends Base {} + `); + + expectDiagnostics(diagnostics, [ + { code: "invalid-ref", message: /internal/ }, + { code: "experimental-feature" }, + ]); + }); + }); + + describe("user-project local access", () => { + it("allows access to internal model within the same project", async () => { + const diagnostics = await Tester.diagnose(` + internal model Secret {} + model Consumer { x: Secret } + `); + + // Only the experimental warning, no access error + expectDiagnostics(diagnostics, { code: "experimental-feature" }); + }); + + it("allows access to internal enum within the same project", async () => { + const diagnostics = await Tester.diagnose(` + internal enum Status { active, inactive } + model Consumer { x: Status } + `); + + expectDiagnostics(diagnostics, { code: "experimental-feature" }); + }); + + it("allows access to internal model across files in the same project", async () => { + const [, diagnostics] = await Tester.compileAndDiagnose({ + "main.tsp": ` + import "./other.tsp"; + model Consumer { x: Secret } + `, + "other.tsp": ` + internal model Secret {} + `, + }); + + expectDiagnostics(diagnostics, { code: "experimental-feature" }); + }); + + it("allows access to internal op within the same project", async () => { + const diagnostics = await Tester.diagnose(` + internal op helper(): void; + op consumer is helper; + `); + + expectDiagnostics(diagnostics, { code: "experimental-feature" }); + }); + + it("allows access to internal scalar within the same project", async () => { + const diagnostics = await Tester.diagnose(` + internal scalar MyScalar; + model Consumer { x: MyScalar } + `); + + expectDiagnostics(diagnostics, { code: "experimental-feature" }); + }); + + it("allows access to internal alias within the same project", async () => { + const diagnostics = await Tester.diagnose(` + internal alias Shorthand = string; + model Consumer { x: Shorthand } + `); + + expectDiagnostics(diagnostics, { code: "experimental-feature" }); + }); + }); + + describe("same-library access", () => { + it("allows access to internal model within the same library", async () => { + const diagnostics = await createLibraryTester({ + "main.tsp": ` + import "./helper.tsp"; + model Public { x: InternalHelper } + `, + "helper.tsp": ` + internal model InternalHelper {} + `, + }).diagnose(` + import "my-lib"; + model Consumer { x: Public } + `); + + // experimental-feature for InternalHelper in the library, no access error + expectDiagnostics(diagnostics, { code: "experimental-feature" }); + }); + }); + + describe("public symbols from library that reference internal symbols", () => { + it("allows access to non-internal model from another package", async () => { + const diagnostics = await createLibraryTester({ + "main.tsp": ` + internal model InternalModel {} + + model PublicModel { prop: InternalModel; } + `, + }).diagnose(` + import "my-lib"; + model Consumer { x: PublicModel } + `); + + expectDiagnostics(diagnostics, { code: "experimental-feature" }); + }); + + it("allows access to non-internal model in a namespace from another package", async () => { + const diagnostics = await createLibraryTester({ + "main.tsp": ` + internal model InternalModel {} + + namespace MyLib { + model PublicModel { prop: InternalModel; } + } + `, + }).diagnose(` + import "my-lib"; + model Consumer { x: MyLib.PublicModel } + `); + + expectDiagnostics(diagnostics, { code: "experimental-feature" }); + }); + }); +}); + +describe("'internal' as identifier", () => { + it("allows 'internal' as a model property name", async () => { + const diagnostics = await Tester.diagnose(`model M { internal: string; }`); + expectDiagnosticEmpty(diagnostics); + }); + + it("allows 'internal' as a union variant name", async () => { + const diagnostics = await Tester.diagnose(`union U { internal: string }`); + expectDiagnosticEmpty(diagnostics); + }); +}); diff --git a/packages/compiler/test/checker/intersections.test.ts b/packages/compiler/test/checker/intersections.test.ts index 90e3aaec6c1..7966082d829 100644 --- a/packages/compiler/test/checker/intersections.test.ts +++ b/packages/compiler/test/checker/intersections.test.ts @@ -1,31 +1,17 @@ import { ok, strictEqual } from "assert"; -import { beforeEach, describe, expect, it } from "vitest"; +import { describe, expect, it } from "vitest"; import { SyntaxKind } from "../../src/core/types.js"; -import { Model, ModelProperty } from "../../src/index.js"; -import { - BasicTestRunner, - createTestHost, - createTestWrapper, - expectDiagnostics, - extractSquiggles, - t, -} from "../../src/testing/index.js"; +import { Model } from "../../src/index.js"; +import { expectDiagnostics, extractSquiggles, t } from "../../src/testing/index.js"; import { Tester } from "../tester.js"; describe("compiler: intersections", () => { - let runner: BasicTestRunner; - - beforeEach(async () => { - const host = await createTestHost(); - runner = createTestWrapper(host); - }); - it("intersect 2 models", async () => { - const { prop } = (await runner.compile(` + const { prop } = await Tester.compile(t.code` model Foo { - @test prop: {a: string} & {b: string}; + ${t.modelProperty("prop")}: {a: string} & {b: string}; } - `)) as { prop: ModelProperty }; + `); const propType = prop.type; strictEqual(propType.kind, "Model"); @@ -53,7 +39,7 @@ describe("compiler: intersections", () => { }); it("intersection type belong to namespace it is declared in", async () => { - const { Foo } = (await runner.compile(` + const { Foo } = await Tester.compile(t.code` namespace A { model ModelA {name: string} } @@ -61,11 +47,11 @@ describe("compiler: intersections", () => { model ModelB {age: int32} } namespace C { - @test model Foo { + model ${t.model("Foo")} { prop: A.ModelA & B.ModelB; } } - `)) as { Foo: Model }; + `); const prop = Foo.properties.get("prop")!.type as Model; strictEqual(prop.kind, "Model"); @@ -74,14 +60,14 @@ describe("compiler: intersections", () => { }); it("allow intersections of template params", async () => { - const { Foo } = (await runner.compile(` + const { Foo } = await Tester.compile(t.code` model Bar { prop: A & B; } - @test model Foo { + model ${t.model("Foo")} { prop: Bar<{a: string}, {b: string}>; } - `)) as { Foo: Model }; + `); const Bar = Foo.properties.get("prop")!.type as Model; const prop = Bar.properties.get("prop")!.type as Model; @@ -93,12 +79,12 @@ describe("compiler: intersections", () => { it("emit diagnostic if one of the intersected type is not a model", async () => { const { source, pos, end } = extractSquiggles(` - @test model Foo { + model Foo { prop: {a: string} & ~~~"string literal"~~~ } `); - const diagnostics = await runner.diagnose(source); + const diagnostics = await Tester.diagnose(source); expectDiagnostics(diagnostics, { code: "intersect-non-model", message: "Cannot intersect non-model types (including union types).", diff --git a/packages/compiler/test/checker/model-circular-references.test.ts b/packages/compiler/test/checker/model-circular-references.test.ts index ad5a1e5907c..c80b64dacaa 100644 --- a/packages/compiler/test/checker/model-circular-references.test.ts +++ b/packages/compiler/test/checker/model-circular-references.test.ts @@ -1,129 +1,100 @@ import assert, { strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { Model, Type } from "../../src/core/types.js"; -import { TestHost, createTestHost } from "../../src/testing/index.js"; +import { t } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; function assertModel(type?: Type): asserts type is Model { assert(type?.kind === "Model"); } describe("compiler: model circular references", () => { - let testHost: TestHost; - - beforeEach(async () => { - testHost = await createTestHost(); - }); - it("model can reference itself", async () => { - testHost.addTypeSpecFile( - "main.tsp", - `@test model M { + const { M } = await Tester.compile(t.code`model ${t.model("M")} { self: M; } - `, - ); - const records = await testHost.compile("./"); + `); - const m = records["M"]; - assertModel(m); - assert(m.properties.get("self")?.type === m); + assertModel(M); + assert(M.properties.get("self")?.type === M); }); it("model can reference itself in an array", async () => { - testHost.addTypeSpecFile( - "main.tsp", - `@test model M { + const { M } = await Tester.compile(t.code`model ${t.model("M")} { selfs: M[]; } - `, - ); - const records = await testHost.compile("./"); + `); - const m = records["M"]; - assertModel(m); - const propType = m.properties.get("selfs")!.type; + assertModel(M); + const propType = M.properties.get("selfs")!.type; assertModel(propType); - assert(propType.indexer!.value === m); + assert(propType.indexer!.value === M); }); it("models can reference each other", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model Parent { + const { Parent, Child } = await Tester.compile(t.code` + model ${t.model("Parent")} { child: Child; } - @test model Child { + model ${t.model("Child")} { parent: Parent; } - `, - ); - const records = await testHost.compile("./"); - - const parent = records["Parent"]; - const child = records["Child"]; - assertModel(parent); - assertModel(child); - assert(parent.properties.get("child")?.type === child); - assert(child.properties.get("parent")?.type === parent); + `); + + assertModel(Parent); + assertModel(Child); + assert(Parent.properties.get("child")?.type === Child); + assert(Child.properties.get("parent")?.type === Parent); }); it("template model can reference itself", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model Templated { + const { test } = await Tester.compile(t.code` + model Templated { value: T; parent?: Templated; parents: Templated[]; } - op test(): Templated; - `, - ); - const records = await testHost.compile("./"); - const model = records["Templated"]; - assertModel(model); - const parentType = model.properties.get("parent")?.type; + op ${t.op("test")}(): Templated; + `); + + const Templated = test.returnType; + assertModel(Templated); + const parentType = Templated.properties.get("parent")?.type; assertModel(parentType); - strictEqual(parentType, model); + strictEqual(parentType, Templated); }); it("template model can reference each other", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model A { + const { test } = await Tester.compile(t.code` + model A { value: T; b?: B; } - @test model B { + model B { value: T; a?: A; } - op test(): A; - `, - ); - const records = await testHost.compile("./"); - const model = records["A"]; - assertModel(model); - const bType = model.properties.get("b")?.type; + op ${t.op("test")}(): A; + `); + + const A = test.returnType; + assertModel(A); + const bType = A.properties.get("b")?.type; assertModel(bType); const aTypeViaB = bType.properties.get("a")?.type; assertModel(aTypeViaB); - strictEqual(model, aTypeViaB); + strictEqual(A, aTypeViaB); }); it("models can reference each other in different namespace with the same name", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Some: fooSome } = await Tester.compile(t.code` namespace Foo { namespace Nested { - @test model Some { + model ${t.model("Some")} { self: Some; related: Bar.Nested.Some; } @@ -138,12 +109,8 @@ describe("compiler: model circular references", () => { } } } - `, - ); - - const records = await testHost.compile("./"); + `); - const fooSome = records["Some"]; assertModel(fooSome); assert(fooSome.properties.get("self")?.type === fooSome); diff --git a/packages/compiler/test/checker/model.test.ts b/packages/compiler/test/checker/model.test.ts index 46f9d7a63a4..63135b43c53 100644 --- a/packages/compiler/test/checker/model.test.ts +++ b/packages/compiler/test/checker/model.test.ts @@ -1,88 +1,59 @@ import { deepStrictEqual, match, ok, strictEqual } from "assert"; -import { beforeEach, describe, expect, it } from "vitest"; +import { describe, expect, it, vi } from "vitest"; import { isTemplateDeclaration } from "../../src/core/type-utils.js"; -import { Model, ModelProperty, SyntaxKind, Type } from "../../src/core/types.js"; +import { Model, SyntaxKind, Type } from "../../src/core/types.js"; +import { Numeric, getDoc, isArrayModelType, isRecordModelType } from "../../src/index.js"; import { - Numeric, - Operation, - getDoc, - isArrayModelType, - isRecordModelType, -} from "../../src/index.js"; -import { - TestHost, - createTestHost, expectDiagnosticEmpty, expectDiagnostics, extractCursor, + mockFile, t, } from "../../src/testing/index.js"; import { Tester } from "../tester.js"; describe("compiler: models", () => { - let testHost: TestHost; - - beforeEach(async () => { - testHost = await createTestHost(); - }); - it("allow template parameters passed into decorators", async () => { - let t1, t2; - - testHost.addJsFile("dec.js", { - $myDec(p: any, t: any, _t1: Model, _t2: Model) { - t1 = _t1; - t2 = _t2; - }, - }); + let t1: any, t2: any; - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./dec.js"; - model B { } - model C { } + const { B, C } = await Tester.files({ + "dec.js": mockFile.js({ + $myDec(p: any, _t: any, _t1: Model, _t2: Model) { + t1 = _t1; + t2 = _t2; + }, + }), + }).import("./dec.js").compile(t.code` + model ${t.model("B")} { } + model ${t.model("C")} { } @myDec(T1, T2) model A { } - `, - ); - - const { B, C } = (await testHost.compile("./")) as { - B: Model; - C: Model; - }; + alias _ = A; + `); strictEqual(t1, B); strictEqual(t2, C); }); it("doesn't allow duplicate properties", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A { x: int32; x: int32; } - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); strictEqual(diagnostics.length, 1); - match(diagnostics[0].message, /Model already has a property/); + match(diagnostics[0].message, /Model A already has a property/); }); it("emit single error when there is an invalid ref in a templated type", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A {t: T, invalid: notValidType } model Bar { instance1: A; instance2: A; } - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, [ { code: "invalid-ref", @@ -102,76 +73,52 @@ describe("compiler: models", () => { ]; it.each(testCases)(`foo?: %s = %s`, async (type, defaultValue, expectedValue) => { - testHost.addTypeSpecFile( - "main.tsp", - ` - model A { @test foo?: ${type} = ${defaultValue} } - `, - ); - const { foo } = (await testHost.compile("main.tsp")) as { foo: ModelProperty }; + const { foo } = await Tester.compile(t.code` + model A { ${t.modelProperty("foo")}?: ${type} = ${defaultValue} } + `); strictEqual(foo.defaultValue?.valueKind, expectedValue.kind); expect((foo.defaultValue as any).value).toMatchObject(expectedValue.value); }); it(`foo?: string[] = #["abc"]`, async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - model A { @test foo?: string[] = #["abc"] } - `, - ); - const { foo } = (await testHost.compile("main.tsp")) as { foo: ModelProperty }; + const { foo } = await Tester.compile(t.code` + model A { ${t.modelProperty("foo")}?: string[] = #["abc"] } + `); strictEqual(foo.defaultValue?.valueKind, "ArrayValue"); }); it(`foo?: {name: string} = #{name: "abc"}`, async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - model A { @test foo?: {name: string} = #{name: "abc"} } - `, - ); - const { foo } = (await testHost.compile("main.tsp")) as { foo: ModelProperty }; + const { foo } = await Tester.compile(t.code` + model A { ${t.modelProperty("foo")}?: {name: string} = #{name: "abc"} } + `); strictEqual(foo.defaultValue?.valueKind, "ObjectValue"); }); it(`assign scalar for primitive types if not yet`, async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { foo } = await Tester.compile(t.code` const a = 123; - model A { @test foo?: int32 = a } - `, - ); - const { foo } = (await testHost.compile("main.tsp")) as { foo: ModelProperty }; + model A { ${t.modelProperty("foo")}?: int32 = a } + `); strictEqual(foo.defaultValue?.valueKind, "NumericValue"); strictEqual(foo.defaultValue.scalar?.kind, "Scalar"); strictEqual(foo.defaultValue.scalar?.name, "int32"); }); it(`foo?: Enum = Enum.up`, async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - model A { @test foo?: TestEnum = TestEnum.up } + const { foo } = await Tester.compile(t.code` + model A { ${t.modelProperty("foo")}?: TestEnum = TestEnum.up } enum TestEnum {up, down} - `, - ); - const { foo } = (await testHost.compile("main.tsp")) as { foo: ModelProperty }; + `); strictEqual(foo.defaultValue?.valueKind, "EnumValue"); deepStrictEqual(foo.defaultValue?.value.kind, "EnumMember"); deepStrictEqual(foo.defaultValue?.value.name, "up"); }); it(`foo?: Union = Union.up`, async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - model A { @test foo?: Direction = Direction.up } + const { foo } = await Tester.compile(t.code` + model A { ${t.modelProperty("foo")}?: Direction = Direction.up } union Direction {up: "up-value", down: "down-value"} - `, - ); - const { foo } = (await testHost.compile("main.tsp")) as { foo: ModelProperty }; + `); strictEqual(foo.defaultValue?.valueKind, "StringValue"); deepStrictEqual(foo.defaultValue?.value, "up-value"); }); @@ -179,25 +126,31 @@ describe("compiler: models", () => { describe("using a template parameter", () => { it(`set it with valid constraint`, async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - model A { @test foo?: string = T } - alias Test = A<"Abc">; - `, - ); - const { foo } = (await testHost.compile("main.tsp")) as { foo: ModelProperty }; + const { Test } = await Tester.compile(t.code` + model A { foo?: string = T } + model ${t.model("Test")} is A<"Abc">; + `); + const foo = Test.properties.get("foo")!; strictEqual(foo.defaultValue?.valueKind, "StringValue"); }); + it(`set it with valid passthrough template constraint`, async () => { + const diagnostics = await Tester.diagnose(` + model X { + i: uint32 = V; + } + + model Y { + x: X; + } + `); + expectDiagnosticEmpty(diagnostics); + }); + it(`error if constraint is not compatible with property type`, async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - model A { @test foo?: string = T } - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + const diagnostics = await Tester.diagnose(` + model A { foo?: string = T } + `); expectDiagnostics(diagnostics, { code: "unassignable", message: "Type 'int32' is not assignable to type 'string'", @@ -217,13 +170,9 @@ describe("compiler: models", () => { for (const [type, defaultValue, errorMessage] of testCases) { it(`foo?: ${type} = ${defaultValue}`, async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A { foo?: ${type} = ${defaultValue} } - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "unassignable", message: errorMessage, @@ -238,8 +187,7 @@ describe("compiler: models", () => { prop?: string = ┆D; } `); - testHost.addTypeSpecFile("main.tsp", source); - const diagnostics = await testHost.diagnose("main.tsp"); + const diagnostics = await Tester.diagnose(source); expectDiagnostics(diagnostics, { code: "expect-value", message: "D refers to a type, but is being used as a value here.", @@ -248,44 +196,31 @@ describe("compiler: models", () => { }); it(`doesn't emit additional diagnostic when type is an error`, async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A { foo?: bool = false } - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, [{ code: "invalid-ref", message: "Unknown identifier bool" }]); }); describe("link model with its properties", () => { it("provides parent model of properties", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test - model A { + const { A, B } = await Tester.compile(t.code` + model ${t.model("A")} { pA: int32; } - - @test - model B { + + model ${t.model("B")} { pB: int32; - - } - `, - ); - const { A, B } = (await testHost.compile("./")) as { A: Model; B: Model }; + } + `); strictEqual(A.properties.get("pA")?.model, A); strictEqual(B.properties.get("pB")?.model, B); }); it("property merged via intersection", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Test } = await Tester.compile(t.code` model A { a: string; } @@ -293,10 +228,8 @@ describe("compiler: models", () => { b: string; } - @test model Test {prop: A & B} - `, - ); - const { Test } = (await testHost.compile("main.tsp")) as { Test: Model }; + model ${t.model("Test")} {prop: A & B} + `); const AB = Test.properties.get("prop")?.type; strictEqual(AB?.kind, "Model" as const); @@ -305,94 +238,70 @@ describe("compiler: models", () => { }); it("property copied via spread", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Test } = await Tester.compile(t.code` model Foo { prop: string; } - @test model Test {...Foo} - `, - ); - const { Test } = (await testHost.compile("main.tsp")) as { Test: Model }; + model ${t.model("Test")} {...Foo} + `); strictEqual(Test.properties.get("prop")?.model, Test); }); it("property copied via `is`", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Test } = await Tester.compile(t.code` model Foo { prop: string; } - @test model Test is Foo; - `, - ); - const { Test } = (await testHost.compile("main.tsp")) as { Test: Model }; + model ${t.model("Test")} is Foo; + `); strictEqual(Test.properties.get("prop")?.model, Test); }); }); describe("with extends", () => { it("allow subtype to override parent property if subtype is assignable to parent type", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + await Tester.compile(` model A { x: int32 } model B extends A { x: int16 }; model Car { kind: string }; model Ford extends Car { kind: "Ford" }; - `, - ); - await testHost.compile("main.tsp"); + `); }); it("alllow subtype overriding of union", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A { x: 1 | 2 | 3 } model B extends A { x: 2 }; model Car { kind: "Ford" | "Toyota" }; model Ford extends Car { kind: "Ford" }; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnosticEmpty(diagnostics); }); it("alllow subtype overriding of Record", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model Named { name: string; } model A { x: Named } model B extends A { x: {name: "B"} }; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnosticEmpty(diagnostics); }); it("disallow subtype overriding parent property if subtype is not assignable to parent type", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A { x: int16 } model B extends A { x: int32 }; model Car { kind: string }; model Ford extends Car { kind: int32 }; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, [ { code: "override-property-mismatch", @@ -408,15 +317,11 @@ describe("compiler: models", () => { }); it("disallows subtype overriding required parent property with optional property", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A { x: int32; } model B extends A { x?: int32; } - `, - ); + `); - const diagnostics = await testHost.diagnose("main.tsp"); expectDiagnostics(diagnostics, [ { code: "override-property-mismatch", @@ -428,16 +333,12 @@ describe("compiler: models", () => { }); it("disallows subtype overriding required parent property with optional through multiple levels of inheritance", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A { x: int32; } model B extends A { } model C extends B { x?: int16; } - `, - ); + `); - const diagnostics = await testHost.diagnose("main.tsp"); expectDiagnostics(diagnostics, [ { code: "override-property-mismatch", @@ -449,15 +350,11 @@ describe("compiler: models", () => { }); it("shows both errors when an override is optional and not assignable", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A { x: int32; } model B extends A { x?: string; } - `, - ); + `); - const diagnostics = await testHost.diagnose("main.tsp"); expectDiagnostics(diagnostics, [ { code: "override-property-mismatch", @@ -475,27 +372,19 @@ describe("compiler: models", () => { }); it("allow multiple overrides", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + await Tester.compile(` model A { x: int64 }; model B extends A { x: int32 }; model C extends B { x: int16 }; - `, - ); - await testHost.compile("main.tsp"); + `); }); it("ensure subtype overriding is not shadowed", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A { x: int64 }; model B extends A { x: int16 }; model C extends B { x: int32 }; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, [ { code: "override-property-mismatch", @@ -506,66 +395,46 @@ describe("compiler: models", () => { }); it("removes decorators not specified on derived type that are on the base type", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Widget } = await Tester.compile(t.code` model Base { @doc("Base") h: string;} - @test model Widget extends Base { h: "test";} - `, - ); - const { Widget } = (await testHost.compile("main.tsp")) as { Widget: Model }; - strictEqual(Widget.decorators.length, 1); + model ${t.model("Widget")} extends Base { h: "test";} + `); + strictEqual(Widget.decorators.length, 0); strictEqual((Widget.properties.get("h")!.type as any)!.value, "test"); }); it("allow intersection of model with overridden property", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { foo } = await Tester.compile(t.code` model Base {prop: string;} model Widget extends Base {prop: "test";} - @test op foo(): Widget & {}; - `, - ); - const { foo } = (await testHost.compile("main.tsp")) as { foo: Operation }; + op ${t.op("foo")}(): Widget & {}; + `); strictEqual(((foo.returnType as Model).properties.get("prop")!.type as any)!.value, "test"); }); it("allow spreading of model with overridden property", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Spread } = await Tester.compile(t.code` model Base {h1: string} model Widget extends Base {h1: "test"} - @test model Spread {...Widget} - `, - ); - const { Spread } = (await testHost.compile("main.tsp")) as { Spread: Model }; + model ${t.model("Spread")} {...Widget} + `); strictEqual((Spread.properties.get("h1")!.type as any)!.value, "test"); }); it("keeps reference of children", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model Pet { + const { Pet, Dog, Cat } = await Tester.compile(t.code` + model ${t.model("Pet")} { name: true; } - @test model Cat extends Pet { + model ${t.model("Cat")} extends Pet { meow: true; } - @test model Dog extends Pet { + model ${t.model("Dog")} extends Pet { bark: true; } - `, - ); - const { Pet, Dog, Cat } = (await testHost.compile("main.tsp")) as { - Pet: Model; - Dog: Model; - Cat: Model; - }; + `); ok(Pet.derivedModels); strictEqual(Pet.derivedModels.length, 2); strictEqual(Pet.derivedModels[0], Cat); @@ -573,10 +442,8 @@ describe("compiler: models", () => { }); it("keeps reference of children with templates", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model Pet { + const { Pet, Dog, Cat } = await Tester.compile(t.code` + model ${t.model("Pet")} { name: true; } @@ -584,20 +451,14 @@ describe("compiler: models", () => { t: T; } - @test model Cat is TPet { + model ${t.model("Cat")} is TPet { meow: true; } - @test model Dog is TPet { + model ${t.model("Dog")} is TPet { bark: true; } - `, - ); - const { Pet, Dog, Cat } = (await testHost.compile("main.tsp")) as { - Pet: Model; - Dog: Model; - Cat: Model; - }; + `); strictEqual(Pet.derivedModels.length, 4); strictEqual(Pet.derivedModels[0].name, "TPet"); ok(isTemplateDeclaration(Pet.derivedModels[0])); @@ -613,13 +474,9 @@ describe("compiler: models", () => { }); it("emit error when extends non model", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A extends (string | int32) {} - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "extend-model", message: "Models must extend other models.", @@ -627,13 +484,9 @@ describe("compiler: models", () => { }); it("emit error when extend model expression", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A extends {name: string} {} - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "extend-model", message: "Models cannot extend model expressions.", @@ -641,14 +494,10 @@ describe("compiler: models", () => { }); it("emit error when extend model expression via alias", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` alias B = {name: string}; model A extends B {} - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "extend-model", message: "Models cannot extend model expressions.", @@ -656,40 +505,28 @@ describe("compiler: models", () => { }); it("emit error when extends itself", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A extends A {} - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); strictEqual(diagnostics.length, 1); strictEqual(diagnostics[0].message, "Type 'A' recursively references itself as a base type."); }); it("emit error when extends circular reference", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A extends B {} model B extends A {} - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); strictEqual(diagnostics.length, 1); strictEqual(diagnostics[0].message, "Type 'A' recursively references itself as a base type."); }); it("emit error when extends circular reference with alias - case 1", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A extends B {} model C extends A {} alias B = C; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "circular-base-type", message: "Type 'A' recursively references itself as a base type.", @@ -697,14 +534,10 @@ describe("compiler: models", () => { }); it("emit error when extends circular reference with alias - case 2", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A extends B {} alias B = A; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "circular-base-type", message: "Type 'A' recursively references itself as a base type.", @@ -712,29 +545,21 @@ describe("compiler: models", () => { }); it("emit error when model is circular reference with alias", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A is B; model C is A; alias B = C; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "circular-base-type", message: "Type 'A' recursively references itself as a base type.", }); }); it("emit error when model is circular reference with alias - case 2", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A is B; alias B = A; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "circular-base-type", message: "Type 'A' recursively references itself as a base type.", @@ -742,45 +567,22 @@ describe("compiler: models", () => { }); it("emit no error when extends has property to base model", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A extends B {} model B { a: A } - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnosticEmpty(diagnostics); }); }); describe("with is", () => { - let testHost: TestHost; - const blues = new WeakSet(); - const reds = new WeakSet(); - beforeEach(async () => { - testHost = await createTestHost(); - testHost.addJsFile("dec.js", { - $blue(p: any, t: Type) { - blues.add(t); - }, - $red(p: any, t: Type) { - reds.add(t); - }, - }); - }); - it("keeps reference to source model in sourceModel", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model A { } - @test model B is A { }; - `, - ); - const { A, B } = (await testHost.compile("main.tsp")) as { A: Model; B: Model }; + const { A, B } = await Tester.compile(t.code` + model ${t.model("A")} { } + model ${t.model("B")} is A { }; + `); strictEqual(B.sourceModel, A); }); @@ -797,68 +599,55 @@ describe("compiler: models", () => { }); it("copies decorators", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./dec.js"; + const blues = new WeakSet(); + const reds = new WeakSet(); + const { B } = await Tester.files({ + "dec.js": mockFile.js({ + $blue(p: any, _t: Type) { + blues.add(_t); + }, + $red(p: any, _t: Type) { + reds.add(_t); + }, + }), + }).import("./dec.js").compile(t.code` @blue model A { } - @test @red model B is A { }; - `, - ); - const { B } = (await testHost.compile("main.tsp")) as { B: Model }; + @red model ${t.model("B")} is A { }; + `); ok(blues.has(B)); ok(reds.has(B)); }); it("copies properties", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { B } = await Tester.compile(t.code` model A { x: int32 } - @test model B is A { y: string }; - `, - ); - const { B } = (await testHost.compile("main.tsp")) as { B: Model }; + model ${t.model("B")} is A { y: string }; + `); ok(B.properties.has("x")); ok(B.properties.has("y")); }); it("copies heritage", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./dec.js"; - @test model A { x: int32 } + const { A, C } = await Tester.compile(t.code` + model ${t.model("A")} { x: int32 } model B extends A { y: string }; - @test model C is B { } - `, - ); - const { A, C } = (await testHost.compile("main.tsp")) as { A: Model; C: Model }; + model ${t.model("C")} is B { } + `); strictEqual(C.baseModel, A); strictEqual(A.derivedModels[1], C); }); it("model is accept array expression", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./dec.js"; - @test model A is string[]; - `, - ); - const { A } = (await testHost.compile("main.tsp")) as { A: Model }; + const { A } = await Tester.compile(t.code` + model ${t.model("A")} is string[]; + `); ok(isArrayModelType(A)); }); it("model is accept array expression of complex type", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./dec.js"; - @test model A is (string | int32)[]; - `, - ); - const { A } = (await testHost.compile("main.tsp")) as { A: Model }; + const { A } = await Tester.compile(t.code` + model ${t.model("A")} is (string | int32)[]; + `); ok(isArrayModelType(A)); strictEqual(A.indexer.value.kind, "Union"); }); @@ -892,15 +681,11 @@ describe("compiler: models", () => { }); it("model is array cannot have properties", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model A is string[] { + const diagnostics = await Tester.diagnose(` + model A is string[] { prop: string; } - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "no-array-properties", message: "Array models cannot have any properties.", @@ -908,15 +693,11 @@ describe("compiler: models", () => { }); it("model extends array cannot have properties", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model A extends Array { + const diagnostics = await Tester.diagnose(` + model A extends Array { prop: string; } - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "no-array-properties", message: "Array models cannot have any properties.", @@ -924,27 +705,18 @@ describe("compiler: models", () => { }); it("doesn't allow duplicate properties", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./dec.js"; + const diagnostics = await Tester.diagnose(` model A { x: int32 } model B is A { x: int32 }; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); strictEqual(diagnostics.length, 1); - match(diagnostics[0].message, /Model already has a property/); + match(diagnostics[0].message, /Model B already has a property/); }); it("emit error when is non model or array", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A is (string | int32) {} - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "is-model", message: "Model `is` must specify another model.", @@ -952,13 +724,9 @@ describe("compiler: models", () => { }); it("emit error when is model expression", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A is {name: string} {} - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "is-model", message: "Model `is` cannot specify a model expression.", @@ -966,14 +734,10 @@ describe("compiler: models", () => { }); it("emit error when is model expression via alias", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` alias B = {name: string}; model A is B {} - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "is-model", message: "Model `is` cannot specify a model expression.", @@ -981,30 +745,22 @@ describe("compiler: models", () => { }); it("emit error when is itself", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A is A {} - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); strictEqual(diagnostics.length, 1); strictEqual(diagnostics[0].message, "Type 'A' recursively references itself as a base type."); }); it("emit single error when is itself as a templated with multiple instantiations", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A is A {} model Bar { instance1: A; instance2: A; } - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, [ { code: "circular-base-type", @@ -1014,87 +770,162 @@ describe("compiler: models", () => { }); it("emit error when 'is' has circular reference", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A is B {} model B is A {} - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); strictEqual(diagnostics.length, 1); strictEqual(diagnostics[0].message, "Type 'A' recursively references itself as a base type."); }); it("emit error when 'is' circular reference via extends", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A is B {} model B extends A {} - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); strictEqual(diagnostics.length, 1); strictEqual(diagnostics[0].message, "Type 'A' recursively references itself as a base type."); }); it("emit no error when extends has property to base model", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A is B {} model B { a: A } - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnosticEmpty(diagnostics); }); it("resolve recursive template types", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { B, C } = await Tester.compile(t.code` model A { c: T; b: B } - @test - model B is A {} - @test - model C is A {} - `, - ); - const { B, C } = await testHost.compile("main.tsp"); - strictEqual((B as Model).properties.size, 2); - strictEqual(((B as Model).properties.get("c")?.type as any).name, "string"); - strictEqual(((B as Model).properties.get("b")?.type as any).name, "B"); - - strictEqual((C as Model).properties.size, 2); - strictEqual(((C as Model).properties.get("c")?.type as any).name, "int32"); - strictEqual(((C as Model).properties.get("b")?.type as any).name, "B"); + model ${t.model("B")} is A {} + model ${t.model("C")} is A {} + `); + strictEqual(B.properties.size, 2); + strictEqual((B.properties.get("c")?.type as any).name, "string"); + strictEqual((B.properties.get("b")?.type as any).name, "B"); + + strictEqual(C.properties.size, 2); + strictEqual((C.properties.get("c")?.type as any).name, "int32"); + strictEqual((C.properties.get("b")?.type as any).name, "B"); + }); + + it("resolves a recursive template model when the recursion is also templated", async () => { + const $observe = vi.fn(); + const { Result } = await Tester.files({ + "utils.js": mockFile.js({ + $observe, + }), + }).import("./utils.js").compile(t.code` + model A { + b: T; + c: C; + } + + @observe + model C is A { + d: U; + } + + model ${t.model("Result")} is A; + `); + + ok(Result); + strictEqual(Result.properties.size, 2); + strictEqual((Result.properties.get("b")?.type as any).name, "boolean"); + const cProp = Result.properties.get("c")?.type; + ok(cProp); + ok(cProp.kind === "Model"); + strictEqual(cProp.properties.size, 3); + strictEqual((cProp.properties.get("b")?.type as any).name, "int32"); + strictEqual((cProp.properties.get("c")?.type as any).name, "C"); + strictEqual((cProp.properties.get("d")?.type as any).name, "string"); + + // Just checking that the inner layer is identical + const innerCProp = cProp.properties.get("c")?.type; + strictEqual(innerCProp, cProp); + + expect($observe).toHaveBeenCalledTimes(1); + }); + + it("resolves a cyclic recursion with a property aliased to a recursive spread", async () => { + const $observe = vi.fn(); + const { Result } = await Tester.files({ + "utils.js": mockFile.js({ + $observe, + }), + }).import("./utils.js").compile(t.code` + model X { + prop: T; + y: Y; + } + + model Y is X { + extra: Z; + } + + alias Z = { + @observe foo: T; + ...X + }; + + model ${t.model("Result")} is X; + `); + + ok(Result); + strictEqual(Result.properties.size, 2); + strictEqual((Result.properties.get("prop")?.type as any).name, "int32"); + const yProp = Result.properties.get("y")?.type; + ok(yProp); + ok(yProp.kind === "Model"); + strictEqual(yProp.properties.size, 3); + strictEqual((yProp.properties.get("prop")?.type as any).name, "string"); + const zProp = yProp.properties.get("extra")?.type; + ok(zProp); + ok(zProp.kind === "Model"); + strictEqual(zProp.properties.size, 3); + strictEqual((zProp.properties.get("foo")?.type as any).name, "int32"); + strictEqual((zProp.properties.get("y")?.type as any).name, "Y"); + strictEqual((zProp.properties.get("prop")?.type as any).name, "string"); + + const innerXFromZ = zProp.properties.get("y")?.type; + ok(innerXFromZ); + ok(innerXFromZ.kind === "Model"); + strictEqual(innerXFromZ.properties.size, 3); + strictEqual((innerXFromZ.properties.get("prop")?.type as any).name, "string"); + const innerYFromZ = innerXFromZ.properties.get("y")?.type; + ok(innerYFromZ); + ok(innerYFromZ.kind === "Model"); + strictEqual(innerYFromZ.properties.size, 3); + strictEqual((innerYFromZ.properties.get("prop")?.type as any).name, "string"); + const innerZFromZ = innerYFromZ.properties.get("extra")?.type; + ok(innerZFromZ); + ok(innerZFromZ.kind === "Model"); + strictEqual(innerZFromZ.properties.size, 3); + strictEqual((innerZFromZ.properties.get("foo")?.type as any).name, "string"); + strictEqual((innerZFromZ.properties.get("y")?.type as any).name, "Y"); + strictEqual((innerZFromZ.properties.get("prop")?.type as any).name, "string"); + + // Called twice, once for Z and once for Z + expect($observe).toHaveBeenCalledTimes(2); }); }); describe("spread", () => { it("can decorate spread properties independently", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model Base {@doc("base doc") one: string} - @test model Spread {...Base} + const { Base, Spread, program } = await Tester.compile(t.code` + model ${t.model("Base")} {@doc("base doc") one: string} + model ${t.model("Spread")} {...Base} @@doc(Spread.one, "override for spread"); - `, - ); - const { Base, Spread } = (await testHost.compile("main.tsp")) as { - Base: Model; - Spread: Model; - }; - strictEqual(getDoc(testHost.program, Spread.properties.get("one")!), "override for spread"); - strictEqual(getDoc(testHost.program, Base.properties.get("one")!), "base doc"); + `); + strictEqual(getDoc(program, Spread.properties.get("one")!), "override for spread"); + strictEqual(getDoc(program, Base.properties.get("one")!), "base doc"); }); it("keeps reference to source model in sourceModels", async () => { @@ -1115,15 +946,9 @@ describe("compiler: models", () => { }); it("can spread a Record", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model Test {...Record;} - `, - ); - const { Test } = (await testHost.compile("main.tsp")) as { - Test: Model; - }; + const { Test } = await Tester.compile(t.code` + model ${t.model("Test")} {...Record;} + `); ok(isRecordModelType(Test)); strictEqual(Test.indexer?.key.name, "string"); strictEqual(Test.indexer?.value.kind, "Scalar"); @@ -1131,18 +956,12 @@ describe("compiler: models", () => { }); it("can spread a Record with different value than existing props", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model Test { + const { Test } = await Tester.compile(t.code` + model ${t.model("Test")} { name: string; ...Record; } - `, - ); - const { Test } = (await testHost.compile("main.tsp")) as { - Test: Model; - }; + `); ok(isRecordModelType(Test)); const nameProp = Test.properties.get("name"); strictEqual(nameProp?.type.kind, "Scalar"); @@ -1153,18 +972,12 @@ describe("compiler: models", () => { }); it("can spread different records", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model Test { + const { Test } = await Tester.compile(t.code` + model ${t.model("Test")} { ...Record; ...Record; } - `, - ); - const { Test } = (await testHost.compile("main.tsp")) as { - Test: Model; - }; + `); ok(isRecordModelType(Test)); strictEqual(Test.indexer?.key.name, "string"); const indexerValue = Test.indexer?.value; @@ -1177,13 +990,9 @@ describe("compiler: models", () => { }); it("emit diagnostic if spreading an T[]", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model Test {...Array;} - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + const diagnostics = await Tester.diagnose(` + model Test {...Array;} + `); expectDiagnostics(diagnostics, { code: "spread-model", message: "Cannot spread properties of non-model type.", @@ -1193,13 +1002,9 @@ describe("compiler: models", () => { describe("property circular references", () => { it("emit diagnostics if property reference itself", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A { a: A.a } - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "circular-prop", message: "Property 'a' recursively references itself.", @@ -1207,14 +1012,10 @@ describe("compiler: models", () => { }); it("emit diagnostics if property reference itself via another prop", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A { a: B.a } model B { a: A.a } - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "circular-prop", message: "Property 'a' recursively references itself.", @@ -1222,15 +1023,11 @@ describe("compiler: models", () => { }); it("emit diagnostics if property reference itself via alias", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A { a: B.a } model B { a: C } alias C = A.a; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "circular-prop", message: "Property 'a' recursively references itself.", diff --git a/packages/compiler/test/checker/namespaces.test.ts b/packages/compiler/test/checker/namespaces.test.ts index 74355a90471..7ddc446dd80 100644 --- a/packages/compiler/test/checker/namespaces.test.ts +++ b/packages/compiler/test/checker/namespaces.test.ts @@ -1,15 +1,9 @@ import { ok, strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import type { Program } from "../../src/core/program.js"; -import { Model, Namespace, Type } from "../../src/core/types.js"; +import type { Type } from "../../src/core/types.js"; import { getTypeName } from "../../src/index.js"; -import { - TestHost, - createTestHost, - expectDiagnostics, - expectTypeEquals, - t, -} from "../../src/testing/index.js"; +import { expectDiagnostics, expectTypeEquals, mockFile, t } from "../../src/testing/index.js"; import { Tester } from "../tester.js"; describe("compiler: namespaces with blocks", () => { @@ -18,28 +12,15 @@ describe("compiler: namespaces with blocks", () => { blues.add(target); } - let testHost: TestHost; - - beforeEach(async () => { - testHost = await createTestHost(); - testHost.addJsFile("blue.js", { $blue }); - }); - it("can be decorated", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Q, N, Y } = await Tester.files({ + "blue.js": mockFile.js({ $blue }), + }).compile(t.code` import "./blue.js"; - @blue @test namespace Z.Q; - @blue @test namespace N { } - @blue @test namespace X.Y { } - `, - ); - const { N, Y, Q } = (await testHost.compile("./")) as { - N: Namespace; - Y: Namespace; - Q: Namespace; - }; + @blue namespace Z.${t.namespace("Q")}; + @blue namespace ${t.namespace("N")} { } + @blue namespace X.${t.namespace("Y")} { } + `); ok(blues.has(N), "N is blue"); ok(blues.has(Y), "Y is blue"); @@ -47,39 +28,27 @@ describe("compiler: namespaces with blocks", () => { }); it("can reference array expression on decorator of namespace", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./blue.js"; - @blue(Bar) @test - namespace Test { - model Bar { - arrayProp: string[]; + const { Test } = await Tester.files({ + "blue.js": mockFile.js({ $blue }), + }).compile(t.code` + import "./blue.js"; + @blue(Bar) + namespace ${t.namespace("Test")} { + model Bar { + arrayProp: string[]; + } } - } - `, - ); - const { Test } = await testHost.compile("./"); + `); strictEqual(Test.kind, "Namespace" as const); }); it("merges like namespaces", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test - namespace N { @test model X { x: string } } - namespace N { @test model Y { y: string } } - namespace N { @test model Z { ... X, ... Y } } - `, - ); - const { N, X, Y, Z } = (await testHost.compile("./")) as { - N: Namespace; - X: Model; - Y: Model; - Z: Model; - }; + const { N, X, Y, Z } = await Tester.compile(t.code` + namespace ${t.namespace("N")} { model ${t.model("X")} { x: string } } + namespace N { model ${t.model("Y")} { y: string } } + namespace N { model ${t.model("Z")} { ... X, ... Y } } + `); strictEqual(X.namespace, N); strictEqual(Y.namespace, N); strictEqual(Z.namespace, N); @@ -87,39 +56,16 @@ describe("compiler: namespaces with blocks", () => { }); it("merges like namespaces across files", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { N, Z } = await Tester.files({ + "a.tsp": `namespace N { model X { x: string } }`, + "b.tsp": `namespace N { model Y { y: int32 } }`, + }).compile(t.code` import "./a.tsp"; import "./b.tsp"; - import "./c.tsp"; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` - @test - namespace N { @test model X { x: string } } - `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` - namespace N { @test model Y { y: int32 } } - `, - ); - testHost.addTypeSpecFile( - "c.tsp", - ` - namespace N { @test model Z { ... X, ... Y } } - `, - ); - const { N, X, Y, Z } = (await testHost.compile("./")) as { - N: Namespace; - X: Model; - Y: Model; - Z: Model; - }; + namespace ${t.namespace("N")} { model ${t.model("Z")} { ... X, ... Y } } + `); + const X = N.models.get("X")!; + const Y = N.models.get("Y")!; strictEqual(X.namespace, N, "X namespace"); strictEqual(Y.namespace, N, "Y namespace"); strictEqual(Z.namespace, N, "Z namespace"); @@ -127,36 +73,14 @@ describe("compiler: namespaces with blocks", () => { }); it("merges sub-namespaces across files", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Z } = await Tester.files({ + "a.tsp": `namespace N { namespace M { model X { x: string } } }`, + "b.tsp": `namespace N { namespace M { model Y { y: int32 } } }`, + }).compile(t.code` import "./a.tsp"; import "./b.tsp"; - import "./c.tsp"; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` - namespace N { namespace M { model X { x: string } } } - `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` - namespace N { namespace M { model Y { y: int32 } } } - `, - ); - testHost.addTypeSpecFile( - "c.tsp", - ` - namespace N { @test model Z { ... M.X, ... M.Y } } - `, - ); - - const { Z } = (await testHost.compile("./")) as { - Z: Model; - }; + namespace N { model ${t.model("Z")} { ... M.X, ... M.Y } } + `); strictEqual(Z.properties.size, 2, "has two properties"); }); @@ -164,37 +88,31 @@ describe("compiler: namespaces with blocks", () => { const reds = new WeakSet(); let isRedDuringRef = false; let isBlueDuringRef = false; - testHost.addJsFile("red.js", { - $red(p: Program, t: Type) { - reds.add(t); - }, - $ref(p: Program, t: Type, arg: Type) { - isRedDuringRef = reds.has(arg); - isBlueDuringRef = blues.has(arg); - }, - }); - testHost.addTypeSpecFile( - "main.tsp", - ` + const { N } = await Tester.files({ + "blue.js": mockFile.js({ $blue }), + "red.js": mockFile.js({ + $red(p: Program, t: Type) { + reds.add(t); + }, + $ref(p: Program, t: Type, arg: Type) { + isRedDuringRef = reds.has(arg); + isBlueDuringRef = blues.has(arg); + }, + }), + }).compile(t.code` import "./blue.js"; import "./red.js"; @ref(N) namespace A { } - + @red - @test - namespace N {} + namespace ${t.namespace("N")} {} @blue namespace N {} - `, - ); - - const { N } = (await testHost.compile("./")) as { - N: Namespace; - }; + `); ok(reds.has(N), "is ultimately red"); // passes ok(blues.has(N), "is ultimately blue"); // passes @@ -207,51 +125,31 @@ describe("compiler: namespaces with blocks", () => { const reds = new WeakSet(); let isRedDuringRef = false; let isBlueDuringRef = false; - testHost.addJsFile("red.js", { - $red(p: Program, t: Type) { - reds.add(t); - }, - $ref(p: Program, t: Type, arg: Type) { - isRedDuringRef = reds.has(arg); - isBlueDuringRef = blues.has(arg); - }, - }); - testHost.addTypeSpecFile( - "main.tsp", - ` + const { N } = await Tester.files({ + "blue.js": mockFile.js({ $blue }), + "red.js": mockFile.js({ + $red(p: Program, t: Type) { + reds.add(t); + }, + $ref(p: Program, t: Type, arg: Type) { + isRedDuringRef = reds.has(arg); + isBlueDuringRef = blues.has(arg); + }, + }), + "one.tsp": `@red namespace N {}`, + "two.tsp": `@blue namespace N {}`, + }).compile(t.code` import "./blue.js"; import "./red.js"; import "./one.tsp"; import "./two.tsp"; - + @ref(N) namespace A { } - - `, - ); - - testHost.addTypeSpecFile( - "one.tsp", - ` - @red - @test - namespace N {} - - `, - ); - testHost.addTypeSpecFile( - "two.tsp", - ` - @blue - namespace N {} - `, - ); - - const { N } = (await testHost.compile("./")) as { - N: Namespace; - }; + namespace ${t.namespace("N")} {} + `); ok(reds.has(N), "is ultimately red"); // passes ok(blues.has(N), "is ultimately blue"); // passes @@ -261,64 +159,37 @@ describe("compiler: namespaces with blocks", () => { }); it("can see things in outer scope same file", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + await Tester.compile(` model A { } namespace N { model B extends A { } } - `, - ); - await testHost.compile("./"); + `); }); it("can see things in outer scope cross file", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + await Tester.files({ + "a.tsp": `model A { }`, + "b.tsp": `model B extends A { }`, + "c.tsp": ` + model C { } + namespace foo { + op foo(a: A, b: B): C; + } + `, + }).compile(` import "./a.tsp"; import "./b.tsp"; import "./c.tsp"; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` - model A { } - `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` - model B extends A { } - `, - ); - testHost.addTypeSpecFile( - "c.tsp", - ` - model C { } - namespace foo { - op foo(a: A, b: B): C; - } - `, - ); - await testHost.compile("./"); + `); }); it("accumulates declarations inside of it", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test namespace Foo { + const { Foo } = await Tester.compile(t.code` + namespace ${t.namespace("Foo")} { namespace Bar { }; op Baz(): {}; model Qux { }; } - `, - ); - - const { Foo } = (await testHost.compile("./")) as { - Foo: Namespace; - }; + `); strictEqual(Foo.operations.size, 1); strictEqual(Foo.models.size, 1); @@ -326,67 +197,35 @@ describe("compiler: namespaces with blocks", () => { }); it("can be decorated, passing a model in a later namespace", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test(Azure.Foo) + await Tester.files({ + "dec.js": mockFile.js({ $myDec() {} }), + }).compile(` + import "./dec.js"; + @myDec(Azure.Foo) namespace Baz { }; namespace Azure { model Foo { } } - - `, - ); - - await testHost.compile("./"); + `); }); }); describe("compiler: blockless namespaces", () => { - const blues = new WeakSet(); - function $blue(_: any, target: Type) { - blues.add(target); - } - - let testHost: TestHost; - - beforeEach(async () => { - testHost = await createTestHost(); - testHost.addJsFile("blue.js", { $blue }); - }); - it("merges properly with other namespaces", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - import "./c.tsp"; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` - namespace N; - model X { x: int32 } - `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` - namespace N; - model Y { y: int32 } + const { Z } = await Tester.files({ + "a.tsp": ` + namespace N; + model X { x: int32 } `, - ); - testHost.addTypeSpecFile( - "c.tsp", - ` - @test model Z { ... N.X, ... N.Y } + "b.tsp": ` + namespace N; + model Y { y: int32 } `, - ); - const { Z } = (await testHost.compile("./")) as { - Z: Model; - }; + }).compile(t.code` + import "./a.tsp"; + import "./b.tsp"; + model ${t.model("Z")} { ... N.X, ... N.Y } + `); strictEqual(Z.properties.size, 2, "has two properties"); }); @@ -405,123 +244,73 @@ describe("compiler: blockless namespaces", () => { }); it("does lookup correctly", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + await Tester.compile(` namespace Repro; model Yo { } model Hey { wat: Yo; } - `, - ); - - await testHost.compile("./"); + `); }); it("does lookup correctly with nested namespaces", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + await Tester.files({ + "b.tsp": ` + namespace Repro.Uhoh; + model SayYo { + yo: Hey; + wat: Yo; + } + `, + }).compile(` + import "./b.tsp"; namespace Repro; model Yo { } model Hey { wat: Yo; } - `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` - namespace Repro.Uhoh; - model SayYo { - yo: Hey; - wat: Yo; - } - `, - ); - - await testHost.compile("./"); + `); }); it("binds correctly", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + await Tester.files({ + "b.tsp": `model X { a: N.M.A }`, + }).compile(` + import "./b.tsp"; namespace N.M; model A { } - `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` - model X { a: N.M.A } - `, - ); - - await testHost.compile("./"); + `); }); it("works with blockful namespaces", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test - namespace N; - - @test - namespace M { + const { N, M } = await Tester.files({ + "b.tsp": `model X { a: N.M.A }`, + }).compile(t.code` + import "./b.tsp"; + namespace ${t.namespace("N")}; + + namespace ${t.namespace("M")} { model A { } } - `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` - model X { a: N.M.A } - `, - ); - const { N, M } = (await testHost.compile("./")) as { - N: Namespace; - M: Namespace; - }; + `); ok(M.namespace); strictEqual(M.namespace, N); }); it("works with nested blockless and blockfull namespaces", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; + const { M, O } = await Tester.files({ + "b.tsp": `model X { a: N.M.O.A }`, + }).compile(t.code` import "./b.tsp"; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` - @test - namespace N.M; + namespace N.${t.namespace("M")}; - @test - namespace O { + namespace ${t.namespace("O")} { model A { } } - `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` - model X { a: N.M.O.A } - `, - ); - const { M, O } = (await testHost.compile("./")) as { - M: Namespace; - O: Namespace; - }; + `); ok(M.namespace); ok(O.namespace); @@ -529,38 +318,24 @@ describe("compiler: blockless namespaces", () => { }); it("works when namespaces aren't evaluated first", async () => { - testHost.addTypeSpecFile( - "a.tsp", - ` + await Tester.files({ + "b.tsp": ` + namespace N; + model X {} + `, + }).compile(` import "./b.tsp"; model M {x: N.X } - `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` - namespace N; - model X {} - `, - ); - - await testHost.compile("./a.tsp"); + `); }); it("accumulates declarations inside of it", async () => { - testHost.addTypeSpecFile( - "a.tsp", - ` - @test namespace Foo; + const { Foo } = await Tester.compile(t.code` + namespace ${t.namespace("Foo")}; namespace Bar { }; op Baz(): {}; model Qux { }; - `, - ); - - const { Foo } = (await testHost.compile("./a.tsp")) as { - Foo: Namespace; - }; + `); strictEqual(Foo.operations.size, 1); strictEqual(Foo.models.size, 1); @@ -569,70 +344,46 @@ describe("compiler: blockless namespaces", () => { }); describe("compiler: namespace type name", () => { - let testHost: TestHost; - - beforeEach(async () => { - testHost = await createTestHost(); - }); - it("prefix with the namespace of the entity", async () => { - testHost.addTypeSpecFile( - "a.tsp", - ` + const { Model1, Model2 } = await Tester.compile(t.code` namespace Foo; - - @test() - model Model1 {} + + model ${t.model("Model1")} {} namespace Other.Bar { - @test() - model Model2 {} + model ${t.model("Model2")} {} } - `, - ); + `); - const { Model1, Model2 } = await testHost.compile("./a.tsp"); strictEqual(getTypeName(Model1), "Foo.Model1"); strictEqual(getTypeName(Model2), "Foo.Other.Bar.Model2"); }); it("gets full name in edge case with decorators", async () => { - testHost.addJsFile("lib.js", { - namespace: "AnotherNamespace", - $myDec() {}, - }); - - testHost.addTypeSpecFile( - "main.tsp", - ` + const { SomeModel, AnotherModel } = await Tester.files({ + "lib.js": mockFile.js({ + namespace: "AnotherNamespace", + $myDec() {}, + }), + }).compile(t.code` import "./lib.js"; @AnotherNamespace.myDec(AnotherNamespace.AnotherModel) namespace SomeNamespace { - @test() - model SomeModel {} + model ${t.model("SomeModel")} {} } namespace AnotherNamespace { - @test() - model AnotherModel {} + model ${t.model("AnotherModel")} {} } - `, - ); + `); - const { SomeModel, AnotherModel } = await testHost.compile("./main.tsp"); strictEqual(getTypeName(SomeModel), "SomeNamespace.SomeModel"); strictEqual(getTypeName(AnotherModel), "AnotherNamespace.AnotherModel"); }); }); describe("compiler: decorators in namespaces", () => { - let testHost: TestHost; - - beforeEach(async () => { - testHost = await createTestHost(); - }); - it("puts decorators in namespaces using an exported string", async () => { let fooCalled = false; let barCalled = false; @@ -649,17 +400,12 @@ describe("compiler: decorators in namespaces", () => { (dec.$bar as any).namespace = "C"; - testHost.addJsFile("dec.js", dec); - - testHost.addTypeSpecFile( - "main.tsp", - ` + await Tester.files({ + "dec.js": mockFile.js(dec), + }).compile(` import "./dec.js"; @A.B.foo @A.B.C.bar model M { }; - `, - ); - - await testHost.compile("main.tsp"); + `); ok(fooCalled); ok(barCalled); }); @@ -678,41 +424,30 @@ describe("compiler: decorators in namespaces", () => { (dec.$foo as any).namespace = "A"; (dec.$bar as any).namespace = "A.B"; - testHost.addJsFile("dec.js", dec); - testHost.addTypeSpecFile( - "main.tsp", - ` + await Tester.files({ + "dec.js": mockFile.js(dec), + }).compile(` import "./dec.js"; @A.foo @A.B.bar model M { }; - `, - ); - - await testHost.compile("main.tsp"); + `); ok(fooCalled); ok(barCalled); }); it("provides full namespace name in error when namespace is missing a member", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.files({ + "other.tsp": ` + namespace A.B.A.B; + model N {} + `, + }).diagnose(` import "./other.tsp"; namespace A.B; model M { } model N extends A.B.M {}// There's a A.B.M, but this looks in A.B.A.B for M - `, - ); - testHost.addTypeSpecFile( - "other.tsp", - ` - namespace A.B.A.B; - model N {} - `, - ); - - const diagnostics = await testHost.diagnose("./"); + `); expectDiagnostics(diagnostics, [ { code: "invalid-ref", @@ -722,21 +457,16 @@ describe("compiler: decorators in namespaces", () => { }); it("can reference global namespace using `global` for disambiguation", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { B, X, Y } = await Tester.compile(t.code` namespace A { - @test namespace B { - @test model Y extends global.B.X {} + namespace ${t.namespace("B")} { + model ${t.model("Y")} extends global.B.X {} } } namespace B { - @test model X {} + model ${t.model("X")} {} } - `, - ); - - const { B, X, Y } = await testHost.compile("./main.tsp"); + `); strictEqual(B.kind, "Namespace" as const); strictEqual(X.kind, "Model" as const); strictEqual(Y.kind, "Model" as const); diff --git a/packages/compiler/test/checker/operations.test.ts b/packages/compiler/test/checker/operations.test.ts index 2117e16f6c0..a133cfc833d 100644 --- a/packages/compiler/test/checker/operations.test.ts +++ b/packages/compiler/test/checker/operations.test.ts @@ -1,51 +1,32 @@ import { deepStrictEqual, notStrictEqual, ok, strictEqual } from "assert"; -import { beforeEach, describe, expect, it } from "vitest"; -import { DecoratorContext, IntrinsicType, Operation, Type } from "../../src/core/types.js"; +import { describe, expect, it } from "vitest"; +import { DecoratorContext, IntrinsicType, Type } from "../../src/core/types.js"; import { getDoc } from "../../src/index.js"; -import { TestHost, createTestHost, expectDiagnostics, t } from "../../src/testing/index.js"; +import { expectDiagnostics, mockFile, t } from "../../src/testing/index.js"; import { Tester } from "../tester.js"; describe("compiler: operations", () => { - let testHost: TestHost; - - beforeEach(async () => { - testHost = await createTestHost(); - }); - it("can return void", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test op foo(): void; - `, - ); - - const { foo } = (await testHost.compile("./main.tsp")) as { foo: Operation }; + const { foo } = await Tester.compile(t.code` + op ${t.op("foo")}(): void; + `); strictEqual(foo.returnType.kind, "Intrinsic"); strictEqual((foo.returnType as IntrinsicType).name, "void"); }); it("keeps reference to source operation", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test op a(): void; - @test op b is a; - `, - ); - const { a, b } = (await testHost.compile("main.tsp")) as { a: Operation; b: Operation }; + const { a, b } = await Tester.compile(t.code` + op ${t.op("a")}(): void; + op ${t.op("b")} is a; + `); strictEqual(b.sourceOperation, a); }); it("operation reference parameters are spread in target operation", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test op a(one: string, two: string): void; - @test op b is a; - `, - ); - const { a, b } = (await testHost.compile("main.tsp")) as { a: Operation; b: Operation }; + const { a, b } = await Tester.compile(t.code` + op ${t.op("a")}(one: string, two: string): void; + op ${t.op("b")} is a; + `); notStrictEqual(b.parameters, a.parameters); notStrictEqual(b.parameters.properties.get("one"), a.parameters.properties.get("one")); notStrictEqual(b.parameters.properties.get("two"), a.parameters.properties.get("two")); @@ -61,61 +42,43 @@ describe("compiler: operations", () => { describe("js special words for parameter names", () => { it.each(["constructor", "toString"])("%s", async (name) => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test op a(${name}: string): void; - `, - ); - const { a } = (await testHost.compile("main.tsp")) as { a: Operation }; + const { a } = await Tester.compile(t.code` + op ${t.op("a")}(${name}: string): void; + `); ok(a.parameters.properties.has(name)); }); }); it("can decorate operation parameters independently", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test op a(@doc("base doc") one: string): void; - @test op b is a; + const { a, b, program } = await Tester.compile(t.code` + op ${t.op("a")}(@doc("base doc") one: string): void; + op ${t.op("b")} is a; @@doc(b::parameters.one, "override for b"); - `, - ); - const { a, b } = (await testHost.compile("main.tsp")) as { a: Operation; b: Operation }; - strictEqual(getDoc(testHost.program, b.parameters.properties.get("one")!), "override for b"); - strictEqual(getDoc(testHost.program, a.parameters.properties.get("one")!), "base doc"); + `); + strictEqual(getDoc(program, b.parameters.properties.get("one")!), "override for b"); + strictEqual(getDoc(program, a.parameters.properties.get("one")!), "base doc"); }); it("can decorate operation parameters independently from a template operation", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test op a(@doc("base doc") one: T): void; - @test op b is a; - @test op c is a; + const { b, c, program } = await Tester.compile(t.code` + op a(@doc("base doc") one: T): void; + op ${t.op("b")} is a; + op ${t.op("c")} is a; @@doc(b::parameters.one, "override for b"); - `, - ); - const { b, c } = (await testHost.compile("main.tsp")) as { b: Operation; c: Operation }; - strictEqual(getDoc(testHost.program, b.parameters.properties.get("one")!), "override for b"); - strictEqual(getDoc(testHost.program, c.parameters.properties.get("one")!), "base doc"); + `); + strictEqual(getDoc(program, b.parameters.properties.get("one")!), "override for b"); + strictEqual(getDoc(program, c.parameters.properties.get("one")!), "base doc"); }); it("can be templated and referenced to define other operations", async () => { - testHost.addTypeSpecFile( - "main.tsp", - `op Foo(name: TName, payload: TPayload): boolean; - - @test - op newFoo is Foo;`, - ); + const { newFoo } = await Tester.compile(t.code` + op Foo(name: TName, payload: TPayload): boolean; - const [result, diagnostics] = await testHost.compileAndDiagnose("./main.tsp"); - expectDiagnostics(diagnostics, []); + op ${t.op("newFoo")} is Foo; + `); - const { newFoo } = result as { newFoo: Operation }; strictEqual(newFoo.parameters.properties.size, 2); const props = Array.from(newFoo.parameters.properties.values()); @@ -126,19 +89,13 @@ describe("compiler: operations", () => { }); it("can be defined based on other operation references", async () => { - testHost.addTypeSpecFile( - "main.tsp", - `op Foo(name: TName, payload: TPayload): boolean; + const { newFoo } = await Tester.compile(t.code` + op Foo(name: TName, payload: TPayload): boolean; op NewFooBase is Foo; - @test - op newFoo is NewFooBase;`, - ); - - const [result, diagnostics] = await testHost.compileAndDiagnose("./main.tsp"); - expectDiagnostics(diagnostics, []); + op ${t.op("newFoo")} is NewFooBase; + `); - const { newFoo } = result as { newFoo: Operation }; strictEqual(newFoo.parameters.properties.size, 2); const props = Array.from(newFoo.parameters.properties.values()); @@ -149,17 +106,13 @@ describe("compiler: operations", () => { }); it("can reference an operation when being defined in an interface", async () => { - testHost.addTypeSpecFile( - "main.tsp", - `op Foo(name: TName, payload: TPayload): boolean; + const { newFoo } = await Tester.compile(t.code` + op Foo(name: TName, payload: TPayload): boolean; interface Test { - @test - newFoo is Foo; - }`, - ); - - const { newFoo } = (await testHost.compile("./main.tsp")) as { newFoo: Operation }; + ${t.op("newFoo")} is Foo; + } + `); strictEqual(newFoo.parameters.properties.size, 2); const props = Array.from(newFoo.parameters.properties.values()); @@ -170,63 +123,47 @@ describe("compiler: operations", () => { }); it("can reference an operation defined inside an interface", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { newFoo } = await Tester.compile(t.code` interface Foo { bar(): boolean; } - @test op newFoo is Foo.bar; - `, - ); - - const { newFoo } = (await testHost.compile("./main.tsp")) as { newFoo: Operation }; + op ${t.op("newFoo")} is Foo.bar; + `); strictEqual(newFoo.returnType.kind, "Scalar" as const); strictEqual(newFoo.returnType.name, "boolean"); }); it("can reference an operation defined in the same interface", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { newFoo } = await Tester.compile(t.code` interface Foo { bar(): boolean; - @test op newFoo is Foo.bar; + op ${t.op("newFoo")} is Foo.bar; } - `, - ); - - const { newFoo } = (await testHost.compile("./main.tsp")) as { newFoo: Operation }; + `); strictEqual(newFoo.returnType.kind, "Scalar" as const); strictEqual(newFoo.returnType.name, "boolean"); }); it("doesn't apply operation decorators to referenced signature", async () => { - testHost.addJsFile("test.js", { - $alpha() {}, - $beta() {}, - }); - - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Foo } = await Tester.files({ + "test.js": mockFile.js({ + $alpha() {}, + $beta() {}, + }), + }).compile(t.code` import "./test.js"; @alpha - @test - op Foo(): T; + op ${t.op("Foo")}(): T; @beta op bar is Foo; - `, - ); - - const { Foo } = (await testHost.compile("./main.tsp")) as { Foo: Operation }; + `); deepStrictEqual( Foo.decorators.map((x) => x.decorator.name), - ["$test", "$alpha"], + ["$alpha"], ); }); @@ -235,23 +172,21 @@ describe("compiler: operations", () => { const betaTargets = new Set(); const gammaTargets = new Set(); - testHost.addJsFile("test.js", { - $alpha(context: DecoratorContext, target: Type, param: Type) { - alphaTargets.set(target, param); - }, - - $beta(context: DecoratorContext, target: Type) { - betaTargets.add(target); - }, + const { newFoo } = await Tester.files({ + "test.js": mockFile.js({ + $alpha(context: DecoratorContext, target: Type, param: Type) { + alphaTargets.set(target, param); + }, - $gamma(context: DecoratorContext, target: Type) { - gammaTargets.add(target); - }, - }); + $beta(context: DecoratorContext, target: Type) { + betaTargets.add(target); + }, - testHost.addTypeSpecFile( - "main.tsp", - ` + $gamma(context: DecoratorContext, target: Type) { + gammaTargets.add(target); + }, + }), + }).compile(t.code` import "./test.js"; @alpha(TPayload) op Foo(name: TName, payload: TPayload): boolean; @@ -259,12 +194,9 @@ describe("compiler: operations", () => { @beta op NewFooBase is Foo; - @test @gamma - op newFoo is NewFooBase;`, - ); - - const { newFoo } = (await testHost.compile("./main.tsp")) as { newFoo: Operation }; + op ${t.op("newFoo")} is NewFooBase; + `); strictEqual(newFoo.parameters.properties.size, 2); // Check that the decorators were applied correctly to `newFoo` @@ -275,18 +207,13 @@ describe("compiler: operations", () => { // Regression test for https://github.com/microsoft/typespec/issues/3199 it("produce an empty interface operation in template when op is reference is invalid", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test op test is IFace.Action; + const [{ test }, diagnostics] = await Tester.compileAndDiagnose(t.code` + op ${t.op("test")} is IFace.Action; interface IFace { Action is string; } - `, - ); - - const [{ test }, diagnostics] = await testHost.compileAndDiagnose("./main.tsp"); + `); expectDiagnostics(diagnostics, [ { code: "is-operation", @@ -305,13 +232,9 @@ describe("compiler: operations", () => { }); it("emit diagnostic when operation is referencing itself as signature", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` op foo is foo; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, [ { code: "circular-op-signature", @@ -321,15 +244,11 @@ describe("compiler: operations", () => { }); it("emit error when extends circular reference with alias", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` op a is b; op c is a; alias b = c; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "circular-op-signature", message: `Operation 'a' recursively references itself.`, @@ -337,15 +256,11 @@ describe("compiler: operations", () => { }); it("emit diagnostic when operation(in interface) is referencing itself as signature", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` interface Group { foo is Group.foo; } - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "circular-op-signature", message: "Operation 'foo' recursively references itself.", @@ -353,14 +268,10 @@ describe("compiler: operations", () => { }); it("emit diagnostic when operations reference each other using signature", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` op foo is bar; op bar is foo; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, [ { code: "circular-op-signature", @@ -370,16 +281,12 @@ describe("compiler: operations", () => { }); it("emit diagnostic when operations(in same interface) reference each other using signature", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` interface Group { foo is Group.bar; bar is Group.foo; } - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, [ { code: "circular-op-signature", @@ -389,43 +296,39 @@ describe("compiler: operations", () => { }); describe("circular ref in decorators", () => { - let tracked: any[]; - beforeEach(() => { - tracked = []; - testHost.addJsFile("track.js", { - $track: (context: DecoratorContext, ...args: any[]) => { - tracked.push(args); - }, - }); - }); - it("operation can reference itself in a decorator", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./track.js"; - @test @track(foo) - op foo(): void; - `, - ); - const { foo } = await testHost.compile("main.tsp"); + const tracked: any[] = []; + const { foo } = await Tester.files({ + "track.js": mockFile.js({ + $track: (context: DecoratorContext, ...args: any[]) => { + tracked.push(args); + }, + }), + }).compile(t.code` + import "./track.js"; + @track(foo) + op ${t.op("foo")}(): void; + `); deepStrictEqual(tracked, [[foo, foo]]); }); it("operation can reference another operation which reference back to this one", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./track.js"; - @test @track(foo) - op bar(): void; - - @test @track(bar) - op foo(): void; - `, - ); - const { foo, bar } = await testHost.compile("main.tsp"); + const tracked: any[] = []; + const { foo, bar } = await Tester.files({ + "track.js": mockFile.js({ + $track: (context: DecoratorContext, ...args: any[]) => { + tracked.push(args); + }, + }), + }).compile(t.code` + import "./track.js"; + @track(foo) + op ${t.op("bar")}(): void; + + @track(bar) + op ${t.op("foo")}(): void; + `); deepStrictEqual(tracked, [ [foo, bar], diff --git a/packages/compiler/test/checker/references.test.ts b/packages/compiler/test/checker/references.test.ts index 1d6a58b7950..7896c6dc19f 100644 --- a/packages/compiler/test/checker/references.test.ts +++ b/packages/compiler/test/checker/references.test.ts @@ -1,20 +1,11 @@ /* eslint-disable vitest/valid-describe-callback */ import { ok, strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { Enum, Interface, Model, Operation, Type } from "../../src/core/types.js"; -import { - TestHost, - createTestHost, - expectDiagnostics, - expectTypeEquals, -} from "../../src/testing/index.js"; +import { expectDiagnostics, expectTypeEquals, mockFile, t } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; describe("compiler: references", () => { - let testHost: TestHost; - beforeEach(async () => { - testHost = await createTestHost(); - }); - function itCanReference({ code, ref, @@ -24,21 +15,19 @@ describe("compiler: references", () => { ref: string; resolveTarget?: (target: any) => Type | undefined; }) { - async function runTest(code: string) { - testHost.addTypeSpecFile("main.tsp", code); - const { RefContainer, target } = (await testHost.compile("./main.tsp")) as { - RefContainer: Model; - target: any; - }; + async function runTest(codeBefore: string, codeAfter: string) { + const { RefContainer, target } = (await Tester.compile( + t.code` + ${codeBefore} + model ${t.model("RefContainer")} { y: ${ref} } + ${codeAfter} + `, + )) as any; const expectedTarget = resolveTarget ? resolveTarget(target) : target; expectTypeEquals(RefContainer.properties.get("y")!.type, expectedTarget); } - const refCode = ` - @test model RefContainer { y: ${ref} } - `; - it("reference before declaration", () => runTest(`${refCode}\n${code}`)); - - it("reference after declaration", () => runTest(`${code}\n${refCode}`)); + it("reference before declaration", () => runTest("", code)); + it("reference after declaration", () => runTest(code, "")); } describe("model properties", () => { @@ -227,39 +216,97 @@ describe("compiler: references", () => { describe("sibling property", () => { it("can reference sibling property defined before", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model Foo { + const { Foo } = await Tester.compile(t.code` + model ${t.model("Foo")} { a: string; b: Foo.a; } - `, - ); + `); - const { Foo } = (await testHost.compile("./main.tsp")) as { - Foo: Model; - }; expectTypeEquals(Foo.properties.get("b")!.type, Foo.properties.get("a")!); }); it("can reference sibling property defined after", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model Foo { - a: Foo.b; - b: string; - } - `, - ); + const { Foo } = await Tester.compile(t.code` + model ${t.model("Foo")} { + a: Foo.b; + b: string; + } + `); - const { Foo } = (await testHost.compile("./main.tsp")) as { - Foo: Model; - }; strictEqual(Foo.properties.get("a")!.type, Foo.properties.get("b")); }); }); + + it("member reference via templated alias with default parameters", async () => { + const { X } = await Tester.compile(t.code` + model M { prop: T; } + alias A = M; + + model ${t.model("X")} { y: A.prop; } + `); + + const y = X.properties.get("y")!; + strictEqual(y.type.kind, "ModelProperty"); + strictEqual(y.type.type.kind, "Scalar"); + strictEqual(y.type.type.name, "string"); + }); + + it("member reference via templated alias with different alias defaults", async () => { + const { X } = await Tester.compile(t.code` + model M { prop: T; } + alias A = M; + + model ${t.model("X")} { y: A.prop; } + `); + + const y = X.properties.get("y")!; + strictEqual(y.type.kind, "ModelProperty"); + strictEqual(y.type.type.kind, "Scalar"); + strictEqual(y.type.type.name, "boolean"); + }); + + it("member reference via alias-of-alias (templated, defaultable)", async () => { + const { X } = await Tester.compile(t.code` + model M { prop: T; } + + alias A = M; + alias B = A; + + model ${t.model("X")} { y: B.prop; } + `); + + const y = X.properties.get("y")!; + strictEqual(y.type.kind, "ModelProperty"); + strictEqual(y.type.type.kind, "Scalar"); + strictEqual(y.type.type.name, "boolean"); + }); + + it("member reference via templated alias to model literal with default argument", async () => { + const { Example } = await Tester.compile(t.code` + alias A = { t: T; }; + model ${t.model("Example")} { prop: A.t } + `); + + const prop = Example.properties.get("prop")!; + strictEqual(prop.type.kind, "ModelProperty"); + strictEqual(prop.type.type.kind, "Scalar"); + strictEqual(prop.type.type.name, "string"); + }); + + it("reports an error when referencing an uninstantiated alias", async () => { + const diagnostics = await Tester.diagnose(` + alias A = { t: T; }; + model Example { prop: A.t } + `); + + expectDiagnostics(diagnostics, [ + { + code: "invalid-template-args", + message: "Template argument 'T' is required and not specified.", + }, + ]); + }); }); describe("enum members", () => { @@ -301,80 +348,65 @@ describe("compiler: references", () => { })); describe("reference in namespace decorator", () => { - let taggedValue: Model | undefined; - - beforeEach(() => { - taggedValue = undefined; - testHost.addJsFile("collect.js", { - $collect: (_: any, t: any, value: any) => (taggedValue = value), - }); - }); - it("can reference enum resolved in a namespace decorator", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./collect.js"; - @test enum MyEnum { a, b } - - model Template { - t: T; - } - - alias AorB = A | B; + let taggedValue: Model | undefined; + const { MyEnum } = await Tester.files({ + "collect.js": mockFile.js({ + $collect: (_: any, _t: any, value: any) => (taggedValue = value), + }), + }).import("./collect.js").compile(t.code` + enum ${t.enum("MyEnum")} { a, b } + + model Template { + t: T; + } - model A { - type: MyEnum.a; - } + alias AorB = A | B; - model B { - type: MyEnum.b; - } + model A { + type: MyEnum.a; + } - model My { - type: MyEnum.b; - } + model B { + type: MyEnum.b; + } - @collect(Template) - namespace Test { } - `, - ); + model My { + type: MyEnum.b; + } - const { MyEnum } = (await testHost.compile("./main.tsp")) as { MyEnum: Enum }; + @collect(Template) + namespace Test { } + `); ok(taggedValue); - const t = taggedValue.properties.get("t")?.type; - strictEqual(t?.kind, "Model" as const); - strictEqual(t.properties.get("type")?.type.kind, "EnumMember" as const); - strictEqual(t.properties.get("type")?.type, MyEnum.members.get("b")); + const tagType = taggedValue.properties.get("t")?.type; + strictEqual(tagType?.kind, "Model" as const); + strictEqual(tagType.properties.get("type")?.type.kind, "EnumMember" as const); + strictEqual(tagType.properties.get("type")?.type, MyEnum.members.get("b")); }); it("alias don't conflict", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./collect.js"; - - @collect(Foo.a) - namespace MyService; - - interface Base {} - - alias ViaAlias = Base; - alias ViaAlias2 = ViaAlias; - - interface MyInterface extends ViaAlias2 {} - - @test enum Foo { - a, - } - - `, - ); - - const { Foo } = (await testHost.compile("./main.tsp")) as { - Foo: Enum; - }; + let taggedValue: Model | undefined; + const { Foo } = await Tester.files({ + "collect.js": mockFile.js({ + $collect: (_: any, _t: any, value: any) => (taggedValue = value), + }), + }).import("./collect.js").compile(t.code` + @collect(Foo.a) + namespace MyService; + + interface Base {} + + alias ViaAlias = Base; + alias ViaAlias2 = ViaAlias; + + interface MyInterface extends ViaAlias2 {} + + enum ${t.enum("Foo")} { + a, + } + `); strictEqual(taggedValue, Foo.members.get("a")); }); @@ -479,56 +511,85 @@ describe("compiler: references", () => { })); describe("reference sibling members", () => { + // Those tests look broken https://github.com/microsoft/typespec/issues/9731 + // eslint-disable-next-line no-unassigned-vars let linkedValue: Operation | undefined; - beforeEach(() => { - testHost.addJsFile("./test-link.js", { - $testLink: (_: any, t: any, value: Operation) => {}, - }); - }); + it("defined before", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./test-link.js"; - @test interface Foo { - one(): void; - @testLink(Foo.one) - two(): void; - } - `, - ); + const { Foo } = await Tester.files({ + "test-link.js": mockFile.js({ + $testLink: (_: any, _t: any, value: Operation) => {}, + }), + }).import("./test-link.js").compile(t.code` + interface ${t.interface("Foo")} { + one(): void; + @testLink(Foo.one) + two(): void; + } + `); - const { Foo } = (await testHost.compile("./main.tsp")) as { - Foo: Interface; - }; strictEqual(linkedValue, Foo.operations.get("a")); }); it("defined after", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./test-link.js"; - @test interface Foo { - @testLink(Foo.two) // <- No issues here! - one(): void; - two(): void; - } - `, - ); + const { Foo } = await Tester.files({ + "test-link.js": mockFile.js({ + $testLink: (_: any, _t: any, value: Operation) => {}, + }), + }).import("./test-link.js").compile(t.code` + interface ${t.interface("Foo")} { + @testLink(Foo.two) + one(): void; + two(): void; + } + `); - const { Foo } = (await testHost.compile("./main.tsp")) as { - Foo: Interface; - }; strictEqual(linkedValue, Foo.operations.get("a")); }); }); + + it("operation reference via templated alias with default parameters", async () => { + const { example } = await Tester.compile(t.code` + interface I { o(): T; } + alias A = I; + + op ${t.op("example")} is A.o; + `); + strictEqual(example.kind, "Operation"); + strictEqual(example.returnType.kind, "Scalar"); + strictEqual(example.returnType.name, "string"); + }); + + it("operation reference via templated alias with different alias defaults", async () => { + const { example } = await Tester.compile(t.code` + interface I { o(): T; } + alias A = I; + + op ${t.op("example")} is A.o; + `); + + strictEqual(example.kind, "Operation"); + strictEqual(example.returnType.kind, "Scalar"); + strictEqual(example.returnType.name, "boolean"); + }); + + it("operation reference via alias-of-alias (templated, defaultable)", async () => { + const { example } = await Tester.compile(t.code` + interface I { o(): T; } + alias A = I; + alias B = A; + + op ${t.op("example")} is B.o; + `); + + strictEqual(example.kind, "Operation"); + strictEqual(example.returnType.kind, "Scalar"); + strictEqual(example.returnType.name, "boolean"); + }); }); it("throws proper diagnostics", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model M { } interface I { } union U { } @@ -540,10 +601,7 @@ describe("compiler: references", () => { u: U.x; e: E.x; } - `, - ); - - const diagnostics = await testHost.diagnose("./main.tsp"); + `); expectDiagnostics(diagnostics, [ { @@ -566,15 +624,10 @@ describe("compiler: references", () => { }); it("referencing alias that reference an invalid ref should emit diagnostic", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` alias A = NotDefined; alias B = A; - `, - ); - - const diagnostics = await testHost.diagnose("./main.tsp"); + `); expectDiagnostics(diagnostics, [ { @@ -657,9 +710,7 @@ describe("compiler: references", () => { })); it("emits a diagnostic when referencing a non-existent meta type property", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A { name: string; } @@ -669,10 +720,7 @@ describe("compiler: references", () => { } op testOp(...B::foo): void; - `, - ); - - const diagnostics = await testHost.diagnose("./main.tsp"); + `); expectDiagnostics(diagnostics, [ { @@ -683,9 +731,7 @@ describe("compiler: references", () => { }); it("allows spreading meta type property", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Spread } = await Tester.compile(t.code` model A { name: string; } @@ -694,34 +740,26 @@ describe("compiler: references", () => { a: A; } - @test model Spread { + model ${t.model("Spread")} { ... B.a::type; } - `, - ); + `); - const { Spread } = (await testHost.compile("./main.tsp")) as { Spread: Model }; strictEqual(Spread.properties.size, 1); ok(Spread.properties.get("name")); }); it("the Johan test case", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { azureVersion } = await Tester.compile(t.code` model Completion { choices: string[]; } op baseVersion("model": string, top_n: int32): Completion; - @test op azureVersion(... baseVersion::parameters, dataSources: string[]): baseVersion::returnType & { rai: string[] }; - `, - ); + op ${t.op("azureVersion")}(... baseVersion::parameters, dataSources: string[]): baseVersion::returnType & { rai: string[] }; + `); - const { azureVersion } = (await testHost.compile("./main.tsp")) as { - azureVersion: Operation; - }; const existingNames = [...azureVersion.parameters.properties.values()].map((v) => v.name); strictEqual(existingNames.length, 3); ok(existingNames.includes("model")); diff --git a/packages/compiler/test/checker/relation.test.ts b/packages/compiler/test/checker/relation.test.ts index 544c26e9bec..716e04242d2 100644 --- a/packages/compiler/test/checker/relation.test.ts +++ b/packages/compiler/test/checker/relation.test.ts @@ -1,18 +1,17 @@ import { deepStrictEqual, ok, strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import type { FunctionParameterNode } from "../../src/ast/index.js"; import { Diagnostic, Model, Type, definePackageFlags } from "../../src/index.js"; import { - BasicTestRunner, DiagnosticMatch, - TestHost, - createTestHost, - createTestWrapper, expectDiagnosticEmpty, expectDiagnostics, extractCursor, extractSquiggles, + mockFile, + t, } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; interface RelatedTypeOptions { source: string; @@ -20,36 +19,30 @@ interface RelatedTypeOptions { commonCode?: string; } -let runner: BasicTestRunner; -let host: TestHost; -beforeEach(async () => { - host = await createTestHost(); - runner = createTestWrapper(host); -}); - describe("compiler: checker: type relations", () => { + const MockTester = Tester.files({ + "mock.js": mockFile.js({ + $flags: definePackageFlags({}), + $mock: () => null, + }), + }); + async function checkTypeAssignable({ source, target, commonCode }: RelatedTypeOptions): Promise<{ related: boolean; diagnostics: readonly Diagnostic[]; expectedDiagnosticPos: number; }> { - host.addJsFile("mock.js", { - $flags: definePackageFlags({}), - $mock: () => null, - }); const { source: code, pos } = extractCursor(` import "./mock.js"; ${commonCode ?? ""} extern dec mock(target: unknown, source: ┆${source}, value: ${target}); `); - await runner.compile(code); - const decDeclaration = runner.program - .getGlobalNamespaceType() - .decoratorDeclarations.get("mock"); + const { program } = await MockTester.compile(code); + const decDeclaration = program.getGlobalNamespaceType().decoratorDeclarations.get("mock"); const sourceProp = decDeclaration?.parameters[0].type!; const targetProp = decDeclaration?.parameters[1].type!; - const [related, diagnostics] = runner.program.checker.isTypeAssignableTo( + const [related, diagnostics] = program.checker.isTypeAssignableTo( sourceProp, targetProp, (decDeclaration?.parameters[0].node! as FunctionParameterNode).type!, @@ -73,7 +66,7 @@ describe("compiler: checker: type relations", () => { alias Case = Test<${cursor}${source}>; `); - const diagnostics = await runner.diagnose(code); + const diagnostics = await Tester.diagnose(code); return { related: diagnostics.length === 0, diagnostics, expectedDiagnosticPos: pos }; } @@ -107,7 +100,7 @@ describe("compiler: checker: type relations", () => { describe("model with indexer", () => { it("can add property of subtype of indexer", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Foo is Record { prop1: int16; prop2: 123; @@ -116,7 +109,7 @@ describe("compiler: checker: type relations", () => { }); it("cannot add property incompatible with indexer", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Foo is Record { prop1: string; }`); @@ -130,7 +123,7 @@ describe("compiler: checker: type relations", () => { }); it("cannot add property where parent model has incompatible indexer", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Foo extends Record { prop1: string; }`); @@ -144,10 +137,10 @@ describe("compiler: checker: type relations", () => { }); it("can intersect 2 record", async () => { - const { Bar } = (await runner.compile(` + const { Bar } = await Tester.compile(t.code` alias Foo = Record<{foo: string}> & Record<{bar: string}>; - @test model Bar {foo: Foo} - `)) as { Bar: Model }; + model ${t.model("Bar")} {foo: Foo} + `); const Foo = Bar.properties.get("foo")!.type as Model; ok(Foo.indexer); const indexValue = Foo.indexer.value; @@ -156,7 +149,7 @@ describe("compiler: checker: type relations", () => { }); it("cannot intersect model with property incompatible with record", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` alias A = Record & {prop1: string}; `); expectDiagnostics(diagnostics, { @@ -169,7 +162,7 @@ describe("compiler: checker: type relations", () => { }); it("cannot intersect model with a scalar", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` alias A = string & {prop1: string}; `); expectDiagnostics(diagnostics, { @@ -179,7 +172,7 @@ describe("compiler: checker: type relations", () => { }); it("cannot intersect array and Record", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` alias A = string[] & Record; `); expectDiagnostics(diagnostics, { @@ -189,7 +182,7 @@ describe("compiler: checker: type relations", () => { }); it("cannot intersect array and model", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` alias A = string[] & {prop1: string}; `); expectDiagnostics(diagnostics, { @@ -199,7 +192,7 @@ describe("compiler: checker: type relations", () => { }); it("spread Record lets other property be non string", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Foo { age: int32; enabled: boolean; @@ -210,7 +203,7 @@ describe("compiler: checker: type relations", () => { }); it("model is a model that spread record does need to respect indexer", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Foo { age: int32; enabled: boolean; @@ -1157,7 +1150,7 @@ describe("compiler: checker: type relations", () => { describe("Template constraint", () => { it("validate template usage using template constraint", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Test { t: Target; } @@ -1172,7 +1165,7 @@ describe("compiler: checker: type relations", () => { describe("using template parameter as a constraint", () => { it("pass if the argument is assignable to the constraint", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Template { a: A; b: B; @@ -1187,7 +1180,7 @@ describe("compiler: checker: type relations", () => { }); it("pass with multiple constraints", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Template { a: A; b: B; @@ -1203,7 +1196,7 @@ describe("compiler: checker: type relations", () => { }); it("fail if the argument is not assignable to the constraint", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Template { a: A; b: B; @@ -1221,7 +1214,7 @@ describe("compiler: checker: type relations", () => { }); it("respect the constraint when using in another template", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Other { t: T } @@ -1285,6 +1278,13 @@ describe("compiler: checker: type relations", () => { }); }); testReflectionType("UnionVariant", "Foo.a", `union Foo {a: string, b: int32};`); + + it("can assign never to a Reflection type constraint", async () => { + await expectTypeAssignable({ + source: "never", + target: `TypeSpec.Reflection.Model`, + }); + }); }); describe("Value constraint", () => { @@ -1294,7 +1294,7 @@ describe("compiler: checker: type relations", () => { }); it("can assign string literal via alias", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Foo {} alias Test = Foo; alias A = "abc"; @@ -1626,7 +1626,7 @@ describe("compiler: checker: type relations", () => { }); it("can use valueof in template parameter constraints", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Foo { @doc(T) prop1: int16; @@ -1635,7 +1635,7 @@ describe("compiler: checker: type relations", () => { }); it("valueof X template constraint cannot be used as a type", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Foo { kind: T; }`); @@ -1649,7 +1649,7 @@ describe("compiler: checker: type relations", () => { const { source, pos } = extractCursor(` model A {} model B is A<┆T> {}`); - const diagnostics = await runner.diagnose(source); + const diagnostics = await Tester.diagnose(source); expectDiagnostics(diagnostics, { code: "invalid-argument", message: "Argument of type 'T' is not assignable to parameter of type 'unknown'", @@ -1658,7 +1658,7 @@ describe("compiler: checker: type relations", () => { }); it("cannot use string constraint where valueof string is expected", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Foo { @doc(T) prop1: int16; @@ -1718,7 +1718,7 @@ describe("compiler: checker: type relations", () => { describe("relation error target and messages", () => { async function expectRelationDiagnostics(code: string, expected: DiagnosticMatch) { const { pos, end, source } = extractSquiggles(code, "┆"); - const diagnostics = await runner.diagnose(source); + const diagnostics = await Tester.diagnose(source); expectDiagnostics(diagnostics, { pos, end, @@ -1754,7 +1754,7 @@ describe("relation error target and messages", () => { "┆", ); const { source, ...pos2 } = extractSquiggles(sourceTmp, "┆"); - const diagnostics = await runner.diagnose(source); + const diagnostics = await Tester.diagnose(source); expectDiagnostics(diagnostics, [ { code: "unexpected-property", diff --git a/packages/compiler/test/checker/resolve-type-reference.test.ts b/packages/compiler/test/checker/resolve-type-reference.test.ts index eac9e00200c..c41454494dc 100644 --- a/packages/compiler/test/checker/resolve-type-reference.test.ts +++ b/packages/compiler/test/checker/resolve-type-reference.test.ts @@ -1,152 +1,83 @@ import { ok, strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; -import { - BasicTestRunner, - createTestHost, - createTestWrapper, - expectDiagnosticEmpty, - expectDiagnostics, -} from "../../src/testing/index.js"; +import { describe, it } from "vitest"; +import { expectDiagnosticEmpty, expectDiagnostics } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; describe("compiler: resolveTypeReference", () => { - let runner: BasicTestRunner; - beforeEach(async () => { - runner = createTestWrapper(await createTestHost()); - }); - async function expectResolve(reference: string, code: string) { - const { target } = await runner.compile(code); + const { target, program } = (await Tester.compile(code)) as any; if (target === undefined) { - throw new Error(`Must have @test("target") on type that should be referenced`); + throw new Error(`Must have a /*target*/ marker on type that should be referenced`); } - const [resolved, diagnostics] = runner.program.resolveTypeReference(reference); + const [resolved, diagnostics] = program.resolveTypeReference(reference); expectDiagnosticEmpty(diagnostics); - ok(resolved === target, `Exected to resolve ${reference} to same type as ${code}`); + ok(resolved === target, `Expected to resolve ${reference} to same type as target`); } async function diagnoseResolution(reference: string, code: string) { - await runner.compile(code); - const [resolved, diagnostics] = runner.program.resolveTypeReference(reference); + const { program } = await Tester.compile(code); + const [resolved, diagnostics] = program.resolveTypeReference(reference); strictEqual(resolved, undefined); return diagnostics; } - it("resolve simple namespace", async () => { - await expectResolve( - "MyService", - ` - @test("target") namespace MyService {} - `, - ); - }); + it("resolve simple namespace", () => + expectResolve("MyService", `namespace /*target*/MyService {}`)); it("resolve a deprecated type", async () => { - const { target } = await runner.compile(` - #deprecated "Test deprecated item" - @test("target") - model MyModel {} - `); - if (target === undefined) { - throw new Error(`Must have @test("target") on type that should be referenced`); - } - const [resolved, diagnostics] = runner.program.resolveTypeReference("MyModel"); + const { target, program } = (await Tester.compile(` + #deprecated "Test deprecated item" + model /*target*/MyModel {} + `)) as any; + const [resolved, diagnostics] = program.resolveTypeReference("MyModel"); expectDiagnostics(diagnostics, { severity: "warning", code: "deprecated" }); strictEqual(resolved, target); }); - it("resolve nested namespace", async () => { - await expectResolve( - "MyOrg.MyService", - ` - @test("target") namespace MyOrg.MyService {} - `, - ); - }); + it("resolve nested namespace", () => + expectResolve("MyOrg.MyService", `namespace MyOrg./*target*/MyService {}`)); - it("resolve model at root", async () => { - await expectResolve( - "Pet", - ` - @test("target") model Pet {} - `, - ); - }); + it("resolve model at root", () => expectResolve("Pet", `model /*target*/Pet {}`)); - it("resolve model in namespace", async () => { - await expectResolve( - "MyOrg.MyService.Pet", - ` - namespace MyOrg.MyService; - @test("target") model Pet {} - `, - ); - }); + it("resolve model in namespace", () => + expectResolve("MyOrg.MyService.Pet", `namespace MyOrg.MyService; model /*target*/Pet {}`)); - it("resolve model property", async () => { - await expectResolve( - "Pet.name", - ` - model Pet { @test("target") name: string} - `, - ); - }); + it("resolve model property", () => + expectResolve("Pet.name", `model Pet { /*target*/name: string }`)); - it("resolve model property from base class", async () => { - await expectResolve( + it("resolve model property from base class", () => + expectResolve( "Pet.name", - ` - model Animal { @test("target") name: string} - model Pet extends Animal { } - `, - ); - }); + `model Animal { /*target*/name: string } model Pet extends Animal { }`, + )); - it("resolve metatype", async () => { - await expectResolve( - "Pet.home::type.street", - ` - model Pet { home: { @test("target") street: string}} - `, - ); - }); + it("resolve metatype", () => + expectResolve("Pet.home::type.street", `model Pet { home: { /*target*/street: string } }`)); it("doesn't instantiate template", async () => { - const diagnostics = await diagnoseResolution("Foo<{}>", "model Foo {t: T}"); + const diagnostics = await diagnoseResolution("Foo<{}>", `model Foo {t: T}`); expectDiagnostics(diagnostics, []); }); - it("resolve enum member", async () => { - await expectResolve( - "Direction.up", - ` - enum Direction { @test("target") up} - `, - ); - }); + it("resolve enum member", () => expectResolve("Direction.up", `enum Direction { /*target*/up }`)); it("resolve enum member with spread", async () => { - await expectResolve( - "Direction.up", - ` - enum Foo { @test("target") up } - enum Direction { ... Foo } - `, - ); + const { Direction, program } = (await Tester.compile(` + enum Foo { up } + enum /*Direction*/Direction { ... Foo } + `)) as any; + const [resolved, diagnostics] = program.resolveTypeReference("Direction.up"); + expectDiagnosticEmpty(diagnostics); + const directionUp = Direction.members.get("up"); + ok(directionUp, "Direction should have member 'up'"); + ok(resolved === directionUp); }); - it("resolve via alias", async () => { - await expectResolve( - "PetName", - ` - model Pet { @test("target") name: string} - - alias PetName = Pet.name; - `, - ); - }); + it("resolve via alias", () => + expectResolve("PetName", `model Pet { /*target*/name: string } alias PetName = Pet.name;`)); it("emit diagnostic if not found", async () => { - const diagnostics = await diagnoseResolution("Direction.up", ""); + const diagnostics = await diagnoseResolution("Direction.up", ``); expectDiagnostics(diagnostics, { code: "invalid-ref", message: "Unknown identifier Direction", @@ -154,7 +85,7 @@ describe("compiler: resolveTypeReference", () => { }); it("emit diagnostic if invalid type reference", async () => { - const diagnostics = await diagnoseResolution("model Bar {}", ""); + const diagnostics = await diagnoseResolution("model Bar {}", ``); expectDiagnostics(diagnostics, { code: "reserved-identifier", message: "Keyword cannot be used as identifier.", diff --git a/packages/compiler/test/checker/scalar.test.ts b/packages/compiler/test/checker/scalar.test.ts index 4d54b8523fa..0ed431781f5 100644 --- a/packages/compiler/test/checker/scalar.test.ts +++ b/packages/compiler/test/checker/scalar.test.ts @@ -1,25 +1,12 @@ import { ok, strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; -import { Model } from "../../src/index.js"; -import { - BasicTestRunner, - createTestHost, - createTestWrapper, - expectDiagnostics, - expectTypeEquals, -} from "../../src/testing/index.js"; +import { describe, it } from "vitest"; +import { expectDiagnostics, expectTypeEquals, t } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; describe("compiler: scalars", () => { - let runner: BasicTestRunner; - - beforeEach(async () => { - const host = await createTestHost(); - runner = createTestWrapper(host); - }); - it("declare simple scalar", async () => { - const { A } = await runner.compile(` - @test scalar A; + const { A } = await Tester.compile(t.code` + scalar ${t.scalar("A")}; `); strictEqual(A.kind, "Scalar"); @@ -28,20 +15,19 @@ describe("compiler: scalars", () => { }); it("declare simple scalar extending another", async () => { - const { A } = await runner.compile(` - @test scalar A extends numeric; + const { A, program } = await Tester.compile(t.code` + scalar ${t.scalar("A")} extends numeric; `); strictEqual(A.kind, "Scalar"); strictEqual(A.name, "A"); - strictEqual(A.baseScalar, runner.program.checker.getStdType("numeric")); + strictEqual(A.baseScalar, program.checker.getStdType("numeric")); }); it("declare scalar with template parameters", async () => { - const { A } = await runner.compile(` + const { A } = await Tester.compile(t.code` @doc(T) - @test - scalar A; + scalar ${t.scalar("A")}; alias B = A<"123">; `); @@ -52,9 +38,9 @@ describe("compiler: scalars", () => { // Test for https://github.com/microsoft/typespec/issues/1764 it("template parameter are scoped to the scalar", async () => { - const { A, B } = await runner.compile(` - @test @doc(T) scalar A; - @test @doc(T) scalar B; + const { A, B } = await Tester.compile(t.code` + @doc(T) scalar ${t.scalar("A")}; + @doc(T) scalar ${t.scalar("B")}; alias AIns = A<"">; alias BIns = B<"">; @@ -65,11 +51,11 @@ describe("compiler: scalars", () => { }); it("allows a decimal to have a default value", async () => { - const { A } = (await runner.compile(` - @test model A { + const { A } = await Tester.compile(t.code` + model ${t.model("A")} { x: decimal = 42; } - `)) as { A: Model }; + `); const def = A.properties.get("x")!.defaultValue!; strictEqual(def.valueKind, "NumericValue"); @@ -78,9 +64,9 @@ describe("compiler: scalars", () => { describe("custom scalars and default values", () => { it("allows custom numeric scalar to have a default value", async () => { - const { S, M } = await runner.compile(` - @test scalar S extends int32; - @test model M { p?: S = 42; } + const { S, M } = await Tester.compile(t.code` + scalar ${t.scalar("S")} extends int32; + model ${t.model("M")} { p?: S = 42; } `); strictEqual(S.kind, "Scalar"); @@ -93,9 +79,9 @@ describe("compiler: scalars", () => { }); it("allows custom boolean scalar to have a default value", async () => { - const { S, M } = await runner.compile(` - @test scalar S extends boolean; - @test model M { p?: S = true; } + const { S, M } = await Tester.compile(t.code` + scalar ${t.scalar("S")} extends boolean; + model ${t.model("M")} { p?: S = true; } `); strictEqual(S.kind, "Scalar"); @@ -108,9 +94,9 @@ describe("compiler: scalars", () => { }); it("allows custom string scalar to have a default value", async () => { - const { S, M } = await runner.compile(` - @test scalar S extends string; - @test model M { p?: S = "hello"; } + const { S, M } = await Tester.compile(t.code` + scalar ${t.scalar("S")} extends string; + model ${t.model("M")} { p?: S = "hello"; } `); strictEqual(S.kind, "Scalar"); @@ -123,7 +109,7 @@ describe("compiler: scalars", () => { }); it("does not allow custom numeric scalar to have a default outside range", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` namespace SomeNamespace; scalar S extends int8; model M { p?: S = 9999; } @@ -132,7 +118,7 @@ describe("compiler: scalars", () => { }); it("does not allow non-numeric/boolean/string custom scalar to have a default", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` scalar S; model M { p?: S = 42; } `); @@ -143,14 +129,14 @@ describe("compiler: scalars", () => { describe("circular references", () => { describe("emit diagnostic when circular reference in extends", () => { it("reference itself", async () => { - const diagnostics = await runner.diagnose(`scalar a extends a;`); + const diagnostics = await Tester.diagnose(`scalar a extends a;`); expectDiagnostics(diagnostics, { code: "circular-base-type", message: "Type 'a' recursively references itself as a base type.", }); }); it("reference itself via another scalar", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` scalar a extends b; scalar b extends a; `); @@ -160,7 +146,7 @@ describe("compiler: scalars", () => { }); }); it("reference itself via an alias", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` scalar a extends b; alias b = a; `); diff --git a/packages/compiler/test/checker/spread.test.ts b/packages/compiler/test/checker/spread.test.ts index f5a58d545ff..126b147a885 100644 --- a/packages/compiler/test/checker/spread.test.ts +++ b/packages/compiler/test/checker/spread.test.ts @@ -13,7 +13,7 @@ it("clones decorated properties", async () => { import "./blue.js"; model A { @blue foo: string } model B { @blue bar: string } - @test model ${t.model("C")} { ... A, ... B } + model ${t.model("C")} { ... A, ... B } `); strictEqual(C.properties.size, 2); diff --git a/packages/compiler/test/checker/string-template.test.ts b/packages/compiler/test/checker/string-template.test.ts index 29f0e083034..ffefac7f517 100644 --- a/packages/compiler/test/checker/string-template.test.ts +++ b/packages/compiler/test/checker/string-template.test.ts @@ -1,33 +1,25 @@ import { strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; -import { Model, StringTemplate } from "../../src/index.js"; +import { describe, it } from "vitest"; +import { StringTemplate } from "../../src/index.js"; import { - BasicTestRunner, - createTestRunner, expectDiagnosticEmpty, expectDiagnostics, extractSquiggles, + t, } from "../../src/testing/index.js"; - -let runner: BasicTestRunner; - -beforeEach(async () => { - runner = await createTestRunner(); -}); +import { Tester } from "../tester.js"; async function compileStringTemplate( templateString: string, other?: string, ): Promise { - const { Test } = (await runner.compile( - ` - @test model Test { + const { Test } = await Tester.compile(t.code` + model ${t.model("Test")} { test: ${templateString}; } ${other ?? ""} - `, - )) as { Test: Model }; + `); const prop = Test.properties.get("test")!.type; @@ -79,7 +71,7 @@ it("can interpolate a model", async () => { // Regression test for https://github.com/microsoft/typespec/issues/7401 it("can use empty string to interpolate in tempalates", async () => { - const diagnostics = await runner.diagnose( + const diagnostics = await Tester.diagnose( ` @doc("\${T} strange") model Test {} @@ -90,7 +82,7 @@ it("can use empty string to interpolate in tempalates", async () => { }); it("emit error if interpolating value and types", async () => { - const diagnostics = await runner.diagnose( + const diagnostics = await Tester.diagnose( ` const str1 = "hi"; alias str2 = "\${str1} and \${string}"; @@ -112,7 +104,7 @@ describe("emit error if interpolating value in a context where template is used const str1 = "hi"; ${code} `; - const diagnostics = await runner.diagnose(source); + const diagnostics = await Tester.diagnose(source); expectDiagnostics(diagnostics, { code: "value-in-type", message: "A value cannot be used as a type.", @@ -126,7 +118,7 @@ it("emit error if interpolating template parameter that can be a type or value", a: ~~~"\${T}"~~~; }; `); - const diagnostics = await runner.diagnose(source); + const diagnostics = await Tester.diagnose(source); expectDiagnostics(diagnostics, { code: "mixed-string-template", message: @@ -142,7 +134,7 @@ it("emit error if interpolating template parameter that is a value but using tem a: ~~~"\${T}"~~~; }; `); - const diagnostics = await runner.diagnose(source); + const diagnostics = await Tester.diagnose(source); expectDiagnostics(diagnostics, { code: "value-in-type", message: "A value cannot be used as a type.", diff --git a/packages/compiler/test/checker/templates.test.ts b/packages/compiler/test/checker/templates.test.ts index 1d06680fd6e..5e4ba9b3a01 100644 --- a/packages/compiler/test/checker/templates.test.ts +++ b/packages/compiler/test/checker/templates.test.ts @@ -1,29 +1,20 @@ import { deepStrictEqual, fail, ok, strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { getSourceLocation } from "../../src/core/diagnostics.js"; -import { Diagnostic, Model, Operation, StringLiteral, Type } from "../../src/core/types.js"; +import { DecoratorContext, Diagnostic, Model, StringLiteral, Type } from "../../src/core/types.js"; import { isUnknownType } from "../../src/index.js"; import { - BasicTestRunner, - TestHost, - createTestHost, - createTestRunner, expectDiagnosticEmpty, expectDiagnostics, expectTypeEquals, extractCursor, extractSquiggles, + mockFile, t, } from "../../src/testing/index.js"; import { Tester } from "../tester.js"; describe("compiler: templates", () => { - let testHost: TestHost; - - beforeEach(async () => { - testHost = await createTestHost(); - }); - function getLineAndCharOfDiagnostic(diagnostic: Diagnostic) { const source = getSourceLocation(diagnostic.target); if (source === undefined) { @@ -33,16 +24,12 @@ describe("compiler: templates", () => { } it("emit diagnostics when using template params on non templated model", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A {} model B { foo: A }; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); strictEqual(diagnostics.length, 1); strictEqual(diagnostics[0].code, "invalid-template-args"); strictEqual(diagnostics[0].message, "Can't pass template arguments to non-templated type"); @@ -54,16 +41,12 @@ describe("compiler: templates", () => { }); it("emit diagnostics when using template without passing any arguments", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A {} model B { foo: A }; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); strictEqual(diagnostics.length, 1); strictEqual(diagnostics[0].code, "invalid-template-args"); strictEqual(diagnostics[0].message, "Template argument 'T' is required and not specified."); @@ -75,16 +58,12 @@ describe("compiler: templates", () => { }); it("emit diagnostics when using template with too many arguments", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A {} model B { foo: A }; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); strictEqual(diagnostics.length, 1); strictEqual(diagnostics[0].code, "invalid-template-args"); strictEqual(diagnostics[0].message, "Too many template arguments provided."); @@ -97,17 +76,14 @@ describe("compiler: templates", () => { }); it("allows default template parameters", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model A { a: T, b: U } - model B { + const { B } = await Tester.compile(t.code` + model A { a: T, b: U } + model ${t.model("B")} { foo: A<"bye"> }; - `, - ); + `); - const { A } = (await testHost.compile("main.tsp")) as { A: Model }; + const A = B.properties.get("foo")!.type as Model; const a = A.properties.get("a")!; const b = A.properties.get("b")!; strictEqual(a.type.kind, "String"); @@ -117,68 +93,53 @@ describe("compiler: templates", () => { }); it("indeterminate defaults", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model B {} - @test model A { + model A { b: B } alias Test = A; - `, - ); + `); - const diagnostics = await testHost.diagnose("main.tsp"); expectDiagnosticEmpty(diagnostics); }); it("cache indeterminate types", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Test } = await Tester.compile(t.code` model Template {t: T} - @test model Test { + model ${t.model("Test")} { a: Template<"a">; b: Template<"a">; } - `, - ); + `); - const { Test } = (await testHost.compile("main.tsp")) as { Test: Model }; expectTypeEquals(Test.properties.get("a")!.type, Test.properties.get("b")!.type); }); it("allows default template parameters that are models", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model A { a: T } - model B { + const { B } = await Tester.compile(t.code` + model A { a: T } + model ${t.model("B")} { foo: A }; - `, - ); + `); - const { A } = (await testHost.compile("main.tsp")) as { A: Model }; + const A = B.properties.get("foo")!.type as Model; const a = A.properties.get("a")!; strictEqual(a.type.kind, "Scalar"); strictEqual(a.type.name, "string"); }); it("template instance should be the exact same when passing value that is the same as the default", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { Test } = await Tester.compile(t.code` model Foo { a: A, b: B } - @test model Test { + model ${t.model("Test")} { a: Foo; b: Foo; c: Foo; }; - `, - ); + `); - const { Test } = (await testHost.compile("main.tsp")) as { Test: Model }; const a = Test.properties.get("a")!; const b = Test.properties.get("b")!; const c = Test.properties.get("c")!; @@ -187,43 +148,31 @@ describe("compiler: templates", () => { }); it("emits diagnostics when using too few template parameters", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model A { a: T, b: U, c: V } + const diagnostics = await Tester.diagnose(` + model A { a: T, b: U, c: V } model B { foo: A<"bye"> }; - `, - ); + `); - const diagnostics = await testHost.diagnose("main.tsp"); strictEqual(diagnostics.length, 1); strictEqual(diagnostics[0].code, "invalid-template-args"); strictEqual(diagnostics[0].message, "Template argument 'U' is required and not specified."); }); it("emits diagnostics when non-defaulted template parameter comes after defaulted one", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model A { a: T, b: U } - `, - ); - - const diagnostics = await testHost.diagnose("main.tsp"); + const diagnostics = await Tester.diagnose(` + model A { a: T, b: U } + `); + expectDiagnostics(diagnostics, { code: "default-required" }); }); it("emits diagnostics when defaulted template use later template parameter", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model A { a: A, b: B } - `, - ); - - const diagnostics = await testHost.diagnose("main.tsp"); + const diagnostics = await Tester.diagnose(` + model A { a: A, b: B } + `); + expectDiagnostics(diagnostics, { code: "invalid-template-default", message: @@ -232,14 +181,10 @@ describe("compiler: templates", () => { }); it("emits diagnostics when defaulted template use later template parameter in complex type", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model A { a: A, b: B } - `, - ); - - const diagnostics = await testHost.diagnose("main.tsp"); + const diagnostics = await Tester.diagnose(` + model A { a: A, b: B } + `); + expectDiagnostics(diagnostics, { code: "invalid-template-default", message: @@ -248,14 +193,10 @@ describe("compiler: templates", () => { }); it("emits diagnostics for template parameter defaults that are incorrect", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model A { a: T } - `, - ); - - const diagnostics = await testHost.diagnose("main.tsp"); + const diagnostics = await Tester.diagnose(` + model A { a: T } + `); + expectDiagnostics(diagnostics, { code: "invalid-template-args", message: "Template argument 'Element' is required and not specified.", @@ -263,16 +204,12 @@ describe("compiler: templates", () => { }); it("emits diagnostics when passing value to template parameter without constraint", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` model A { } const a = "abc"; alias B = A; - `, - ); + `); - const diagnostics = await testHost.diagnose("main.tsp"); expectDiagnostics(diagnostics, { code: "value-in-type", message: @@ -289,8 +226,7 @@ describe("compiler: templates", () => { alias NoConstaint = Bar<┆T>; `); - testHost.addTypeSpecFile("main.tsp", source); - const diagnostics = await testHost.diagnose("main.tsp"); + const diagnostics = await Tester.diagnose(source); // Only one error, Bar can't be created as T is not constraint to object expectDiagnostics(diagnostics, { code: "invalid-argument", @@ -300,25 +236,24 @@ describe("compiler: templates", () => { }); it("an error type should revert to unknown", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const [{ Bar }, diagnostics] = await Tester.compileAndDiagnose(t.code` model Test { - @test prop: T; + prop: T; } - model Bar { + model ${t.model("Bar")} { a: Test; } - `, - ); - const [{ prop }, diagnostics] = await testHost.compileAndDiagnose("main.tsp"); + `); // Only one error expectDiagnostics(diagnostics, { code: "invalid-ref", message: "Unknown identifier notExists", }); + const testInstance = Bar.properties.get("a")!.type as Model; + const prop = testInstance.properties.get("prop")!; + strictEqual(prop.kind, "ModelProperty"); ok(isUnknownType(prop.type), "Prop type should be unknown"); }); @@ -329,8 +264,7 @@ describe("compiler: templates", () => { op foo is Action<┆"abc">; `); - testHost.addTypeSpecFile("main.tsp", source); - const diagnostics = await testHost.diagnose("main.tsp"); + const diagnostics = await Tester.diagnose(source); // Only one error, Bar can't be created as T is not constraint to object expectDiagnostics(diagnostics, { code: "invalid-argument", @@ -341,17 +275,14 @@ describe("compiler: templates", () => { }); it("can reference other parameters", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model A { a: T, b: X } - model B { + const { B } = await Tester.compile(t.code` + model A { a: T, b: X } + model ${t.model("B")} { foo: A<"bye"> }; - `, - ); + `); - const { A } = (await testHost.compile("main.tsp")) as { A: Model }; + const A = B.properties.get("foo")!.type as Model; const a = A.properties.get("a")!; const b = A.properties.get("b")!; strictEqual(a.type.kind, "String"); @@ -361,59 +292,49 @@ describe("compiler: templates", () => { }); it("can reference other parameters in default in a model expression", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model A { b: X } - model B { + const { B } = await Tester.compile(t.code` + model A { b: X } + model ${t.model("B")} { foo: A<"bye"> }; - `, - ); + `); - const { A } = (await testHost.compile("main.tsp")) as { A: Model }; + const A = B.properties.get("foo")!.type as Model; const b = A.properties.get("b")!; strictEqual(b.type.kind, "Model" as const); - const t = b.type.properties.get("t")!.type; - strictEqual(t.kind, "String" as const); - strictEqual(t.value, "bye"); + const tp = (b.type as Model).properties.get("t")!.type; + strictEqual(tp.kind, "String" as const); + strictEqual((tp as StringLiteral).value, "bye"); }); it("can reference other parameters in default via another template", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model A> { b: X } - model B { + const { B } = await Tester.compile(t.code` + model A> { b: X } + model ${t.model("B")} { foo: A<"bye"> }; model Foo { t: T; } - `, - ); + `); - const { A } = (await testHost.compile("main.tsp")) as { A: Model }; + const A = B.properties.get("foo")!.type as Model; const b = A.properties.get("b")!; strictEqual(b.type.kind, "Model" as const); - const t = b.type.properties.get("t")!.type; - strictEqual(t.kind, "String" as const); - strictEqual(t.value, "bye"); + const tp = (b.type as Model).properties.get("t")!.type; + strictEqual(tp.kind, "String" as const); + strictEqual((tp as StringLiteral).value, "bye"); }); it("can reference parent parameters in default", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test interface A { + const { MyOp } = await Tester.compile(t.code` + interface A { op foo(params: P): R; } alias B = A; - @test op MyOp is B.foo; - `, - ); - const { MyOp } = (await testHost.compile("main.tsp")) as { MyOp: Operation }; + op ${t.op("MyOp")} is B.foo; + `); const params = MyOp.parameters.properties.get("params"); ok(params, "Expected params to be defined"); strictEqual(params.type.kind, "Scalar"); @@ -423,17 +344,13 @@ describe("compiler: templates", () => { }); it("can use parent parameters default in default", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test interface MyInterface { + const { MyOp } = await Tester.compile(t.code` + interface MyInterface { op foo(params: P): R; } alias AliasedInterface = MyInterface; - @test op MyOp is AliasedInterface.foo; - `, - ); - const { MyOp } = (await testHost.compile("main.tsp")) as { MyOp: Operation }; + op ${t.op("MyOp")} is AliasedInterface.foo; + `); const params = MyOp.parameters.properties.get("params"); ok(params, "Expected params to be defined"); strictEqual(params.type.kind, "Scalar"); @@ -443,33 +360,25 @@ describe("compiler: templates", () => { }); it("can override default provided by parent parameters", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test interface A { + const { MyOp } = await Tester.compile(t.code` + interface A { op foo(): U; } alias B = A; - @test op MyOp is B.foo; - `, - ); - const { MyOp } = (await testHost.compile("main.tsp")) as { MyOp: Operation }; + op ${t.op("MyOp")} is B.foo; + `); strictEqual(MyOp.returnType.kind, "Scalar"); strictEqual(MyOp.returnType.name, "bytes"); }); it("emit diagnostics if referencing itself", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model A { a: T } + const diagnostics = await Tester.diagnose(` + model A { a: T } model B { foo: A }; - `, - ); + `); - const diagnostics = await testHost.diagnose("main.tsp"); expectDiagnostics(diagnostics, { code: "invalid-template-default", message: @@ -478,17 +387,13 @@ describe("compiler: templates", () => { }); it("emit diagnostics if args reference each other", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model A { a: T } + const diagnostics = await Tester.diagnose(` + model A { a: T } model B { foo: A }; - `, - ); + `); - const diagnostics = await testHost.diagnose("main.tsp"); expectDiagnostics(diagnostics, { code: "invalid-template-default", message: @@ -497,17 +402,13 @@ describe("compiler: templates", () => { }); it("emit diagnostics if referencing itself nested", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test model A { a: T } + const diagnostics = await Tester.diagnose(` + model A { a: T } model B { foo: A }; - `, - ); + `); - const diagnostics = await testHost.diagnose("main.tsp"); expectDiagnostics(diagnostics, { code: "invalid-template-default", message: @@ -516,20 +417,14 @@ describe("compiler: templates", () => { }); describe("constraints", () => { - let runner: BasicTestRunner; - - beforeEach(async () => { - runner = await createTestRunner(); - }); - it("compile when the constrain is satisfied in the default value", async () => { - await runner.compile(` + await Tester.compile(` model A { a: T } `); }); it("compile when the constrain is satisfied in template arg", async () => { - await runner.compile(` + await Tester.compile(` model A { a: T } model B { @@ -539,9 +434,7 @@ describe("compiler: templates", () => { }); it("emits diagnostic when constraint reference itself", async () => { - testHost.addTypeSpecFile("main.tsp", `model Test {}`); - - const diagnostics = await testHost.diagnose("main.tsp"); + const diagnostics = await Tester.diagnose(`model Test {}`); expectDiagnostics(diagnostics, { code: "circular-constraint", message: "Type parameter 'A' has a circular constraint.", @@ -549,9 +442,7 @@ describe("compiler: templates", () => { }); it("emits diagnostic when constraint reference other parameter in circular constraint", async () => { - testHost.addTypeSpecFile("main.tsp", `model Test {}`); - - const diagnostics = await testHost.diagnose("main.tsp"); + const diagnostics = await Tester.diagnose(`model Test {}`); expectDiagnostics(diagnostics, { code: "circular-constraint", message: "Type parameter 'A' has a circular constraint.", @@ -559,9 +450,7 @@ describe("compiler: templates", () => { }); it("emits diagnostic when constraint reference itself inside an expression", async () => { - testHost.addTypeSpecFile("main.tsp", `model Test {}`); - - const diagnostics = await testHost.diagnose("main.tsp"); + const diagnostics = await Tester.diagnose(`model Test {}`); expectDiagnostics(diagnostics, { code: "circular-constraint", message: "Type parameter 'A' has a circular constraint.", @@ -572,7 +461,7 @@ describe("compiler: templates", () => { const { source, pos, end } = extractSquiggles(` model A { a: T } `); - const diagnostics = await runner.diagnose(source); + const diagnostics = await Tester.diagnose(source); expectDiagnostics(diagnostics, { code: "unassignable", message: "Type '123' is not assignable to type 'string'", @@ -589,7 +478,7 @@ describe("compiler: templates", () => { a: A<~~~456~~~> } `); - const diagnostics = await runner.diagnose(source); + const diagnostics = await Tester.diagnose(source); expectDiagnostics(diagnostics, { code: "invalid-argument", message: "Argument of type '456' is not assignable to parameter of type 'string'", @@ -599,14 +488,14 @@ describe("compiler: templates", () => { }); it("use constrain as type when referencing another template", async () => { - await runner.compile(` + await Tester.compile(` model A { b: B } model B {} `); }); it("use constrain as type when referencing another template parameter", async () => { - await runner.compile(` + await Tester.compile(` model Foo { b: B } `); }); @@ -616,7 +505,7 @@ describe("compiler: templates", () => { model A { b: B<~~~T~~~> } model B {} `); - const diagnostics = await runner.diagnose(source); + const diagnostics = await Tester.diagnose(source); expectDiagnostics(diagnostics, { code: "invalid-argument", message: "Argument of type 'T' is not assignable to parameter of type 'string'", @@ -628,19 +517,15 @@ describe("compiler: templates", () => { describe("doesn't run decorators when checking template declarations", () => { async function expectMarkDecoratorNotCalled(code: string) { - testHost.addJsFile("mark.js", { - $mark: () => fail("Should not have called decorator"), - }); - - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./mark.js"; - ${code} - `, - ); - - await testHost.compile("main.tsp"); + await Tester.files({ + "mark.js": mockFile.js({ + $mark: () => { + fail("Should not have called decorator"); + }, + }), + }) + .import("./mark.js") + .compile(code); } it("on model", async () => { @@ -671,6 +556,46 @@ describe("compiler: templates", () => { `); }); + describe("within aliases", () => { + it("on model property", async () => { + await expectMarkDecoratorNotCalled(` + alias Foo = { + @mark(T) prop: string; + }; + `); + }); + + it("on model property, when no argument is provided", async () => { + await expectMarkDecoratorNotCalled(` + alias Foo = { + @mark prop: string; + }; + `); + }); + + it("when instantiation is indirect", async () => { + await expectMarkDecoratorNotCalled(` + alias Bar = Foo; + + alias Foo = { + @mark(T) prop: string; + }; + `); + }); + + it("when instantiation is indirect and nested", async () => { + await expectMarkDecoratorNotCalled(` + alias Bar = { + nested: Foo; + }; + + alias Foo = { + @mark(T) prop: string; + }; + `); + }); + }); + describe("on model properties", () => { it("under model", async () => { await expectMarkDecoratorNotCalled(` @@ -724,17 +649,13 @@ describe("compiler: templates", () => { describe("named template argument instantiations", () => { it("with named arguments", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { B } = await Tester.compile(t.code` model A { a: T } - @test model B { + model ${t.model("B")} { foo: A }; - `, - ); + `); - const { B } = (await testHost.compile("main.tsp")) as { B: Model }; const foo = B.properties.get("foo")!.type; strictEqual(foo.kind, "Model"); const a = foo.properties.get("a")!; @@ -743,17 +664,13 @@ describe("compiler: templates", () => { }); it("with named arguments out of order", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { B } = await Tester.compile(t.code` model A { a: T, b: U } - @test model B { + model ${t.model("B")} { foo: A }; - `, - ); + `); - const { B } = (await testHost.compile("main.tsp")) as { B: Model }; const foo = B.properties.get("foo")!.type; strictEqual(foo.kind, "Model"); const a = foo.properties.get("a")!; @@ -765,17 +682,13 @@ describe("compiler: templates", () => { }); it("with named arguments and defaults", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { B } = await Tester.compile(t.code` model A { a: T, b: U } - @test model B { + model ${t.model("B")} { foo: A }; - `, - ); + `); - const { B } = (await testHost.compile("main.tsp")) as { B: Model }; const foo = B.properties.get("foo")!.type; strictEqual(foo.kind, "Model"); const a = foo.properties.get("a")!; @@ -787,17 +700,13 @@ describe("compiler: templates", () => { }); it("with named arguments and defaults bound to other parameters", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { B } = await Tester.compile(t.code` model A { a: T, b: U } - @test model B { + model ${t.model("B")} { foo: A }; - `, - ); + `); - const { B } = (await testHost.compile("main.tsp")) as { B: Model }; const foo = B.properties.get("foo")!.type; strictEqual(foo.kind, "Model"); const a = foo.properties.get("a")!; @@ -809,22 +718,17 @@ describe("compiler: templates", () => { }); it("with named and positional arguments", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const { B, C } = await Tester.compile(t.code` model A { a: T, b: U, c: V } - @test model B { + model ${t.model("B")} { foo: A } - @test model C { + model ${t.model("C")} { foo: A } - `, - ); - - const { B, C } = (await testHost.compile("main.tsp")) as { B: Model; C: Model }; + `); for (const M of [B, C]) { const foo = M.properties.get("foo")!.type; @@ -845,17 +749,13 @@ describe("compiler: templates", () => { const { pos, end, source } = extractSquiggles(` model A { a: T } - @test model B { + model B { foo: A } `); - testHost.addTypeSpecFile("main.tsp", source); - - const [{ B }, diagnostics] = (await testHost.compileAndDiagnose("main.tsp")) as [ - { B: Model }, - Diagnostic[], - ]; + const [{ program }, diagnostics] = await Tester.compileAndDiagnose(source); + const B = program.getGlobalNamespaceType().models.get("B")!; const foo = B.properties.get("foo")!.type; strictEqual(foo.kind, "Model"); @@ -875,17 +775,13 @@ describe("compiler: templates", () => { const { pos, end, source } = extractSquiggles(` model A { a: T } - @test model B { + model B { foo: A } `); - testHost.addTypeSpecFile("main.tsp", source); - - const [{ B }, diagnostics] = (await testHost.compileAndDiagnose("main.tsp")) as [ - { B: Model }, - Diagnostic[], - ]; + const [{ program }, diagnostics] = await Tester.compileAndDiagnose(source); + const B = program.getGlobalNamespaceType().models.get("B")!; const foo = B.properties.get("foo")!.type; strictEqual(foo.kind, "Model"); @@ -905,17 +801,13 @@ describe("compiler: templates", () => { const { pos, end, source } = extractSquiggles(` model A { a: T } - @test model B { + model B { foo: A } `); - testHost.addTypeSpecFile("main.tsp", source); - - const [{ B }, diagnostics] = (await testHost.compileAndDiagnose("main.tsp")) as [ - { B: Model }, - Diagnostic[], - ]; + const [{ program }, diagnostics] = await Tester.compileAndDiagnose(source); + const B = program.getGlobalNamespaceType().models.get("B")!; const foo = B.properties.get("foo")!.type; strictEqual(foo.kind, "Model"); @@ -935,17 +827,13 @@ describe("compiler: templates", () => { const { pos, end, source } = extractSquiggles(` model A { a: T, b: U, c: V } - @test model B { + model B { foo: ~~~A~~~ } `); - testHost.addTypeSpecFile("main.tsp", source); - - const [{ B }, diagnostics] = (await testHost.compileAndDiagnose("main.tsp")) as [ - { B: Model }, - Diagnostic[], - ]; + const [{ program }, diagnostics] = await Tester.compileAndDiagnose(source); + const B = program.getGlobalNamespaceType().models.get("B")!; const foo = B.properties.get("foo")!.type; strictEqual(foo.kind, "Model"); @@ -980,17 +868,13 @@ describe("compiler: templates", () => { const { pos, end, source } = extractSquiggles(` model A { a: T, b: U, c: V } - @test model B { + model B { foo: A } `); - testHost.addTypeSpecFile("main.tsp", source); - - const [{ B }, diagnostics] = (await testHost.compileAndDiagnose("main.tsp")) as [ - { B: Model }, - Diagnostic[], - ]; + const [{ program }, diagnostics] = await Tester.compileAndDiagnose(source); + const B = program.getGlobalNamespaceType().models.get("B")!; const foo = B.properties.get("foo")!.type; strictEqual(foo.kind, "Model"); @@ -1017,14 +901,12 @@ describe("compiler: templates", () => { const { pos, end, source } = extractSquiggles(` model A { a: T } - @test model B { + model B { foo: A<~~~T~~~ = string> } `); - testHost.addTypeSpecFile("main.tsp", source); - - const diagnostics = await testHost.diagnose("main.tsp"); + const diagnostics = await Tester.diagnose(source); expectDiagnostics(diagnostics, { code: "invalid-template-argument-name", @@ -1037,29 +919,23 @@ describe("compiler: templates", () => { it("template arguments are evaluated in the correct order", async () => { const members: [Type, Type][] = []; - testHost.addJsFile("effect.js", { - $effect: (_: DecoratorContext, target: Type, value: Type) => { - members.push([target, value]); - }, - }); - - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./effect.js"; - - @effect(T) - model Dec { t: T } + const { B } = await Tester.files({ + "effect.js": mockFile.js({ + $effect: (_: DecoratorContext, target: Type, value: Type) => { + members.push([target, value]); + }, + }), + }).import("./effect.js").compile(t.code` + @effect(T) + model Dec { t: T } - model A { a: T, b: U } + model A { a: T, b: U } - @test model B { - bar: A, T = Dec> - } - `, - ); + model ${t.model("B")} { + bar: A, T = Dec> + } + `); - const { B } = (await testHost.compile("main.tsp")) as { B: Model }; const bar = B.properties.get("bar")!.type; strictEqual(bar.kind, "Model"); const a = bar.properties.get("a")!; @@ -1083,53 +959,38 @@ describe("compiler: templates", () => { describe("template declaration passing values", () => { it("allows passing to a decorator expecting that value", async () => { - testHost.addJsFile("effect.js", { - $call: () => null, - }); - - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./effect.js"; + const diagnostics = await Tester.files({ + "effect.js": mockFile.js({ + $call: () => null, + }), + }).import("./effect.js").diagnose(` extern dec call(target, arg: valueof string); @call(T) model Dec {} - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnosticEmpty(diagnostics); }); it("allows passing to a decorator expecting a composed value", async () => { - testHost.addJsFile("effect.js", { - $call: () => null, - }); - - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./effect.js"; + const diagnostics = await Tester.files({ + "effect.js": mockFile.js({ + $call: () => null, + }), + }).import("./effect.js").diagnose(` extern dec call(target, arg: valueof unknown); @call(#{foo: T}) model Dec {} - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnosticEmpty(diagnostics); }); it("validate incompatible composed values", async () => { - testHost.addJsFile("effect.js", { - $call: () => null, - }); - - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./effect.js"; + const diagnostics = await Tester.files({ + "effect.js": mockFile.js({ + $call: () => null, + }), + }).import("./effect.js").diagnose(` extern dec call(target, arg: valueof {foo: int32}); @call(#{foo: T}) model Dec {} - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, { code: "invalid-argument", message: diff --git a/packages/compiler/test/checker/typeof.test.ts b/packages/compiler/test/checker/typeof.test.ts index 660c4e12948..c914d7e2203 100644 --- a/packages/compiler/test/checker/typeof.test.ts +++ b/packages/compiler/test/checker/typeof.test.ts @@ -1,26 +1,31 @@ import { ok, strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { expectDiagnostics } from "../../src/testing/expect.js"; +import { mockFile, t } from "../../src/testing/index.js"; import { extractSquiggles } from "../../src/testing/source-utils.js"; -import { createTestHost, createTestRunner } from "../../src/testing/test-host.js"; -import { BasicTestRunner } from "../../src/testing/types.js"; -import { defineTest } from "../test-utils.js"; +import { Tester } from "../tester.js"; -const { compile: compileTypeOf, diagnose: diagnoseTypeOf } = defineTest( - async (typeofCode: string, commonCode?: string) => { - const runner = await createTestRunner(); +async function compileTypeOf(typeofCode: string, commonCode?: string) { + const { target } = await Tester.compile(t.code` + ${commonCode ?? ""} + model Test { + ${t.modelProperty("target")}: ${typeofCode}; + } + `); + ok(target, `Expected a property tagged with @test("target")`); + strictEqual(target.kind, "ModelProperty"); + return target.type; +} - const [{ target }, diagnostics] = await runner.compileAndDiagnose(` - ${commonCode ?? ""} - model Test { - @test target: ${typeofCode}; - } - `); - ok(target, `Expected a property tagged with @test("target")`); - strictEqual(target.kind, "ModelProperty"); - return [target.type, diagnostics]; - }, -); +async function diagnoseTypeOf(typeofCode: string, commonCode?: string) { + const diagnostics = await Tester.diagnose(` + ${commonCode ?? ""} + model Test { + target: ${typeofCode}; + } + `); + return diagnostics; +} describe("get the type of a const", () => { it("const without an explicit type return the precise type of the value", async () => { @@ -59,13 +64,12 @@ describe("emit error if trying to typeof a template parameter that accept types" ["constrained to only types", "extends string"], ["constrained with types and value", "extends string | valueof string"], ])("%s", async (label, constraint) => { - const runner = await createTestRunner(); const { pos, end, source } = extractSquiggles(` model A { prop: typeof ~~~T~~~; } `); - const diagnostics = await runner.diagnose(source); + const diagnostics = await Tester.diagnose(source); expectDiagnostics(diagnostics, { code: "expect-value", pos, @@ -75,23 +79,19 @@ describe("emit error if trying to typeof a template parameter that accept types" }); describe("typeof can be used to force sending a type to a decorator that accept both", () => { - let runner: BasicTestRunner; - let called: any; - - beforeEach(async () => { - called = undefined; - const host = await createTestHost(); - host.addJsFile("dec.js", { + const tester = Tester.files({ + "dec.js": mockFile.js({ $foo: (_ctx: any, _target: any, value: any) => { called = value; }, - }); - runner = await createTestRunner(host); - }); + }), + }).import("./dec.js"); + + let called: any; it("directly to decorator", async () => { - await runner.compile(` - import "./dec.js"; + called = undefined; + await tester.compile(` extern dec foo(target, value: string | valueof string); @foo(typeof "abc") @@ -103,8 +103,8 @@ describe("typeof can be used to force sending a type to a decorator that accept }); it("via template", async () => { - await runner.compile(` - import "./dec.js"; + called = undefined; + await tester.compile(` extern dec foo(target, value: string | valueof string); alias T = A; diff --git a/packages/compiler/test/checker/unused-template-parameter.test.ts b/packages/compiler/test/checker/unused-template-parameter.test.ts index 9e564caca31..3d70a96e8c7 100644 --- a/packages/compiler/test/checker/unused-template-parameter.test.ts +++ b/packages/compiler/test/checker/unused-template-parameter.test.ts @@ -1,14 +1,13 @@ import { beforeEach, describe, it } from "vitest"; import { createUnusedTemplateParameterLinterRule } from "../../src/core/linter-rules/unused-template-parameter.rule.js"; import { LinterRuleTester, createLinterRuleTester } from "../../src/testing/rule-tester.js"; -import { createTestRunner } from "../../src/testing/test-host.js"; +import { Tester } from "../tester.js"; let ruleTester: LinterRuleTester; beforeEach(async () => { - const runner = await createTestRunner(); ruleTester = createLinterRuleTester( - runner, + await Tester.createInstance(), createUnusedTemplateParameterLinterRule(), "@typespec/compiler", ); diff --git a/packages/compiler/test/checker/unused-using.test.ts b/packages/compiler/test/checker/unused-using.test.ts index 4330b3314a7..ff58d942181 100644 --- a/packages/compiler/test/checker/unused-using.test.ts +++ b/packages/compiler/test/checker/unused-using.test.ts @@ -1,87 +1,65 @@ -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { CompilerOptions } from "../../src/index.js"; import { - TestHost, - createTestHost, + type TestCompileOptions, expectDiagnosticEmpty, expectDiagnostics, + mockFile, } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; describe("compiler: unused using statements", () => { - let testHost: TestHost; - - beforeEach(async () => { - testHost = await createTestHost(); - }); - - const diagnoseWithUnusedUsing = async (main: string, options: CompilerOptions = {}) => { - return testHost.diagnose(main, { + const unusedUsingOptions = (options: CompilerOptions = {}): TestCompileOptions => ({ + compilerOptions: { ...options, linterRuleSet: { enable: { "@typespec/compiler/unused-using": true, }, }, - }); - }; + }, + }); it("no unused diagnostic when using is used", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - - using N; - using M; - model Z { a: X, b: Y} - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const diagnostics = await Tester.files({ + "a.tsp": ` namespace N; model X { x: int32 } `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` + "b.tsp": ` namespace M; model Y { y: int32 } `, - ); - - const diagnostics = await testHost.diagnose("./"); + }).diagnose(` + import "./a.tsp"; + import "./b.tsp"; + + using N; + using M; + model Z { a: X, b: Y} + `); expectDiagnosticEmpty(diagnostics); }); it("report for unused using", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - - model Z { a: N.X, b: Y} - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const diagnostics = await Tester.files({ + "a.tsp": ` namespace N; model X { x: int32 } `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` + "b.tsp": ` using N; model Y { y: int32 } `, + }).diagnose( + ` + import "./a.tsp"; + import "./b.tsp"; + + model Z { a: N.X, b: Y} + `, + unusedUsingOptions(), ); - - const diagnostics = await diagnoseWithUnusedUsing("./"); expectDiagnostics(diagnostics, [ { code: "@typespec/compiler/unused-using", @@ -92,32 +70,25 @@ describe("compiler: unused using statements", () => { }); it("report for same unused using from different file", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - - using N; - model Z { a: Y, b: Y} - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const diagnostics = await Tester.files({ + "a.tsp": ` namespace N; model X { x: int32 } `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` + "b.tsp": ` using N; model Y { y: int32 } `, + }).diagnose( + ` + import "./a.tsp"; + import "./b.tsp"; + + using N; + model Z { a: Y, b: Y} + `, + unusedUsingOptions(), ); - - const diagnostics = await diagnoseWithUnusedUsing("./"); expectDiagnostics(diagnostics, [ { code: "@typespec/compiler/unused-using", @@ -133,8 +104,16 @@ describe("compiler: unused using statements", () => { }); it("report for multiple unused using in one file", async () => { - testHost.addTypeSpecFile( - "main.tsp", + const diagnostics = await Tester.files({ + "a.tsp": ` + namespace N; + model X { x: int32 } + `, + "b.tsp": ` + namespace M; + model Y { y: int32 } + `, + }).diagnose( ` import "./a.tsp"; import "./b.tsp"; @@ -142,24 +121,9 @@ describe("compiler: unused using statements", () => { using N; using M; model Z { a: N.X, b: M.Y} - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` - namespace N; - model X { x: int32 } - `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` - namespace M; - model Y { y: int32 } - `, + `, + unusedUsingOptions(), ); - - const diagnostics = await diagnoseWithUnusedUsing("./"); expectDiagnostics(diagnostics, [ { code: "@typespec/compiler/unused-using", @@ -175,8 +139,16 @@ describe("compiler: unused using statements", () => { }); it("report for unused using when there is used using", async () => { - testHost.addTypeSpecFile( - "main.tsp", + const diagnostics = await Tester.files({ + "a.tsp": ` + namespace N; + model X { x: int32 } + `, + "b.tsp": ` + namespace M; + model Y { y: int32 } + `, + }).diagnose( ` import "./a.tsp"; import "./b.tsp"; @@ -184,24 +156,9 @@ describe("compiler: unused using statements", () => { using N; using M; model Z { a: X, b: M.Y} - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` - namespace N; - model X { x: int32 } - `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` - namespace M; - model Y { y: int32 } - `, + `, + unusedUsingOptions(), ); - - const diagnostics = await diagnoseWithUnusedUsing("./"); expectDiagnostics(diagnostics, [ { code: "@typespec/compiler/unused-using", @@ -212,8 +169,14 @@ describe("compiler: unused using statements", () => { }); it("using in namespaces", async () => { - testHost.addTypeSpecFile( - "main.tsp", + const diagnostics = await Tester.files({ + "a.tsp": ` + namespace Z; + using N; + using M; + model Y { ... X } + `, + }).diagnose( ` import "./a.tsp"; namespace N{ @@ -222,19 +185,9 @@ describe("compiler: unused using statements", () => { namespace M{ model XX {xx: Z.Y } } - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` - namespace Z; - using N; - using M; - @test model Y { ... X } - `, + `, + unusedUsingOptions(), ); - - const diagnostics = await diagnoseWithUnusedUsing("./"); expectDiagnostics(diagnostics, [ { code: "@typespec/compiler/unused-using", @@ -245,8 +198,7 @@ describe("compiler: unused using statements", () => { }); it("using in the same file", async () => { - testHost.addTypeSpecFile( - "main.tsp", + const diagnostics = await Tester.diagnose( ` namespace N { using M; @@ -256,10 +208,9 @@ describe("compiler: unused using statements", () => { using N; model XX {xx: N.X } } - `, + `, + unusedUsingOptions(), ); - - const diagnostics = await diagnoseWithUnusedUsing("./"); expectDiagnostics(diagnostics, [ { code: "@typespec/compiler/unused-using", @@ -270,8 +221,16 @@ describe("compiler: unused using statements", () => { }); it("works with dotted namespaces", async () => { - testHost.addTypeSpecFile( - "main.tsp", + const diagnostics = await Tester.files({ + "a.tsp": ` + namespace N.M; + model X { x: int32 } + `, + "b.tsp": ` + using N.M; + model Y { ...N.M.X } + `, + }).diagnose( ` import "./a.tsp"; import "./b.tsp"; @@ -279,24 +238,9 @@ describe("compiler: unused using statements", () => { namespace Z { alias test = Y; } - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` - namespace N.M; - model X { x: int32 } - `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` - using N.M; - @test model Y { ...N.M.X } - `, + `, + unusedUsingOptions(), ); - - const diagnostics = await diagnoseWithUnusedUsing("./"); expectDiagnostics(diagnostics, [ { code: "@typespec/compiler/unused-using", @@ -312,38 +256,28 @@ describe("compiler: unused using statements", () => { }); it("TypeSpec.Xyz namespace doesn't need TypeSpec prefix in using", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - import "./c.tsp"; - using TypeSpec.Xyz; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const diagnostics = await Tester.files({ + "a.tsp": ` namespace TypeSpec.Xyz; model X { x: Y } `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` + "b.tsp": ` using Xyz; - @test model Y { x: Xyz.X, z: Z } + model Y { x: Xyz.X, z: Z } `, - ); - testHost.addTypeSpecFile( - "c.tsp", - ` + "c.tsp": ` using Xyz; - @test model Z {x: X } + model Z {x: X } `, + }).diagnose( + ` + import "./a.tsp"; + import "./b.tsp"; + import "./c.tsp"; + using TypeSpec.Xyz; + `, + unusedUsingOptions(), ); - - const diagnostics = await diagnoseWithUnusedUsing("./"); expectDiagnostics(diagnostics, [ { code: "@typespec/compiler/unused-using", @@ -359,17 +293,8 @@ describe("compiler: unused using statements", () => { }); it("2 namespace with the same last name", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - using N.A; - using M.A; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const diagnostics = await Tester.files({ + "a.tsp": ` namespace N.A { model B { } } @@ -377,9 +302,14 @@ describe("compiler: unused using statements", () => { model B { } } `, + }).diagnose( + ` + import "./a.tsp"; + using N.A; + using M.A; + `, + unusedUsingOptions(), ); - - const diagnostics = await diagnoseWithUnusedUsing("./"); expectDiagnostics(diagnostics, [ { code: "@typespec/compiler/unused-using", @@ -395,63 +325,49 @@ describe("compiler: unused using statements", () => { }); it("one namespace from two file, no unused using when just refering to one of them", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - using N.M; - model Z { b: B2} - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const diagnostics = await Tester.files({ + "a.tsp": ` namespace N.M { model B2 { } } `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` + "b.tsp": ` namespace N.M { model B { } } `, - ); - - const diagnostics = await diagnoseWithUnusedUsing("./"); - expectDiagnosticEmpty(diagnostics); - }); - - it("one namespace from two file, show unused using when none is referred", async () => { - testHost.addTypeSpecFile( - "main.tsp", + }).diagnose( ` import "./a.tsp"; import "./b.tsp"; using N.M; - `, + model Z { b: B2} + `, + unusedUsingOptions(), ); - testHost.addTypeSpecFile( - "a.tsp", - ` + expectDiagnosticEmpty(diagnostics); + }); + + it("one namespace from two file, show unused using when none is referred", async () => { + const diagnostics = await Tester.files({ + "a.tsp": ` namespace N.M { model B2 { } } `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` + "b.tsp": ` namespace N.M { model B { } } `, + }).diagnose( + ` + import "./a.tsp"; + import "./b.tsp"; + using N.M; + `, + unusedUsingOptions(), ); - - const diagnostics = await diagnoseWithUnusedUsing("./"); expectDiagnostics(diagnostics, [ { code: "@typespec/compiler/unused-using", @@ -462,21 +378,17 @@ describe("compiler: unused using statements", () => { }); it("unused invalid using, no unnecessary diagnostic when there is other error", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - using N.M2; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const diagnostics = await Tester.files({ + "a.tsp": ` namespace N.M; model X { x: int32 } `, + }).diagnose( + ` + using N.M2; + `, + unusedUsingOptions(), ); - - const diagnostics = await diagnoseWithUnusedUsing("./"); expectDiagnostics(diagnostics, [ { code: "invalid-ref", @@ -486,23 +398,19 @@ describe("compiler: unused using statements", () => { }); it("unused using along with duplicate usings, no unnecessary diagnostic when there is other error", async () => { - testHost.addTypeSpecFile( - "main.tsp", + const diagnostics = await Tester.files({ + "a.tsp": ` + namespace N.M; + model X { x: int32 } + `, + }).diagnose( ` import "./a.tsp"; using N.M; using N.M; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` - namespace N.M; - model X { x: int32 } - `, + `, + unusedUsingOptions(), ); - - const diagnostics = await diagnoseWithUnusedUsing("./"); expectDiagnostics(diagnostics, [ { code: "duplicate-using", @@ -516,8 +424,22 @@ describe("compiler: unused using statements", () => { }); it("does not throws errors for different usings with the same bindings if not used", async () => { - testHost.addTypeSpecFile( - "main.tsp", + const diagnostics = await Tester.files({ + "a.tsp": ` + namespace N { + model A1 { } + } + namespace M { + model A { } + } + namespace L { + model A2 { } + } + namespace Ns.N { + model A3 { } + } + `, + }).diagnose( ` import "./a.tsp"; @@ -532,26 +454,9 @@ describe("compiler: unused using statements", () => { } alias a = A3; } - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` - namespace N { - model A1 { } - } - namespace M { - model A { } - } - namespace L { - model A2 { } - } - namespace Ns.N { - model A3 { } - } - `, + `, + unusedUsingOptions(), ); - const diagnostics = await diagnoseWithUnusedUsing("./"); expectDiagnostics(diagnostics, [ { code: "@typespec/compiler/unused-using", @@ -562,8 +467,32 @@ describe("compiler: unused using statements", () => { }); it("using multi-level namespace", async () => { - testHost.addTypeSpecFile( - "main.tsp", + const diagnostics = await Tester.files({ + "a.tsp": ` + using Ns1; + using Ns1.Ns2; + using Ns1.Ns2.Ns3; + model A { } + `, + "b.tsp": ` + using Ns1; + using Ns1.Ns2; + using Ns1.Ns2.Ns3; + model B { a: A1 } + `, + "c.tsp": ` + using Ns1; + using Ns1.Ns2; + using Ns1.Ns2.Ns3; + model C { a: A2 } + `, + "d.tsp": ` + using Ns1; + using Ns1.Ns2; + using Ns1.Ns2.Ns3; + model D { a: A3 } + `, + }).diagnose( ` import "./a.tsp"; import "./b.tsp"; @@ -585,45 +514,9 @@ describe("compiler: unused using statements", () => { c: C; d: D; } - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` - using Ns1; - using Ns1.Ns2; - using Ns1.Ns2.Ns3; - model A { } - `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` - using Ns1; - using Ns1.Ns2; - using Ns1.Ns2.Ns3; - model B { a: A1 } - `, - ); - testHost.addTypeSpecFile( - "c.tsp", - ` - using Ns1; - using Ns1.Ns2; - using Ns1.Ns2.Ns3; - model C { a: A2 } - `, - ); - testHost.addTypeSpecFile( - "d.tsp", - ` - using Ns1; - using Ns1.Ns2; - using Ns1.Ns2.Ns3; - model D { a: A3 } - `, + `, + unusedUsingOptions(), ); - const diagnostics = await diagnoseWithUnusedUsing("./"); expectDiagnostics(diagnostics, [ { code: "@typespec/compiler/unused-using", @@ -674,19 +567,8 @@ describe("compiler: unused using statements", () => { }); it("no report unused using when the ref is ambiguous (error) while others not impacted", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - using N; - using M; - model B extends A {}; - model B2 extends C {}; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const diagnostics = await Tester.files({ + "a.tsp": ` namespace N { model A { } } @@ -695,9 +577,16 @@ describe("compiler: unused using statements", () => { model C { } } `, + }).diagnose( + ` + import "./a.tsp"; + using N; + using M; + model B extends A {}; + model B2 extends C {}; + `, + unusedUsingOptions({ nostdlib: true }), ); - - const diagnostics = await diagnoseWithUnusedUsing("./", { nostdlib: true }); expectDiagnostics(diagnostics, [ { code: "ambiguous-symbol", @@ -708,37 +597,33 @@ describe("compiler: unused using statements", () => { }); it("no not-used using for decorator", async () => { - testHost.addTypeSpecFile( - "main.tsp", + const diagnostics = await Tester.files({ + "doc.js": mockFile.js({ + namespace: "Test.A", + $dec1() {}, + }), + }).diagnose( ` import "./doc.js"; namespace Test; using A; @dec1 namespace Foo {} - `, + `, + unusedUsingOptions(), ); - - testHost.addJsFile("doc.js", { - namespace: "Test.A", - $dec1() {}, - }); - - const diagnostics = await diagnoseWithUnusedUsing("./"); expectDiagnosticEmpty(diagnostics); }); it("unused using for TypeSpec", async () => { - testHost.addTypeSpecFile( - "main.tsp", + const diagnostics = await Tester.diagnose( ` namespace Foo; using TypeSpec; model Bar { a : TypeSpec.int32 } `, + unusedUsingOptions({ nostdlib: true }), ); - - const diagnostics = await diagnoseWithUnusedUsing("./", { nostdlib: true }); expectDiagnostics(diagnostics, [ { code: "@typespec/compiler/unused-using", @@ -749,8 +634,14 @@ describe("compiler: unused using statements", () => { }); it("works same name in different namespace", async () => { - testHost.addTypeSpecFile( - "main.tsp", + const diagnostics = await Tester.files({ + "other.tsp": ` + namespace Other { + model OtherModel { + } + } + `, + }).diagnose( ` import "./other.tsp"; namespace Main { @@ -762,17 +653,8 @@ describe("compiler: unused using statements", () => { } } `, + unusedUsingOptions({ nostdlib: true }), ); - testHost.addTypeSpecFile( - "other.tsp", - ` - namespace Other { - model OtherModel { - } - } - `, - ); - const diagnostics = await diagnoseWithUnusedUsing("./", { nostdlib: true }); expectDiagnostics(diagnostics, [ { code: "@typespec/compiler/unused-using", @@ -783,39 +665,29 @@ describe("compiler: unused using statements", () => { }); it("not used using for lib", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "my-lib"; - using LibNs; - model A { x: int16; } - `, - ); - testHost.addTypeSpecFile( - "node_modules/my-lib/package.json", - JSON.stringify({ + const diagnostics = await Tester.files({ + "node_modules/my-lib/package.json": JSON.stringify({ name: "my-test-lib", exports: { ".": { typespec: "./main.tsp" } }, }), - ); - testHost.addTypeSpecFile( - "node_modules/my-lib/main.tsp", - ` + "node_modules/my-lib/main.tsp": ` import "./lib-a.tsp"; namespace LibNs { model LibMainModel{ } } `, - ); - testHost.addTypeSpecFile( - "node_modules/my-lib/lib-a.tsp", - ` + "node_modules/my-lib/lib-a.tsp": ` namespace LibNs; model LibAModel { } `, + }).diagnose( + ` + import "my-lib"; + using LibNs; + model A { x: int16; } + `, + unusedUsingOptions({ nostdlib: true }), ); - - const diagnostics = await diagnoseWithUnusedUsing("./", { nostdlib: true }); expectDiagnostics(diagnostics, [ { code: "@typespec/compiler/unused-using", @@ -826,45 +698,41 @@ describe("compiler: unused using statements", () => { }); it("no not-used using for lib", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "my-lib"; - using LibNs; - model A { x: LibAModel; } - `, - ); - testHost.addTypeSpecFile( - "node_modules/my-lib/package.json", - JSON.stringify({ + const diagnostics = await Tester.files({ + "node_modules/my-lib/package.json": JSON.stringify({ name: "my-test-lib", exports: { ".": { typespec: "./main.tsp" } }, }), - ); - testHost.addTypeSpecFile( - "node_modules/my-lib/main.tsp", - ` + "node_modules/my-lib/main.tsp": ` import "./lib-a.tsp"; namespace LibNs { model LibMainModel{ } } `, - ); - testHost.addTypeSpecFile( - "node_modules/my-lib/lib-a.tsp", - ` + "node_modules/my-lib/lib-a.tsp": ` namespace LibNs; model LibAModel { } `, + }).diagnose( + ` + import "my-lib"; + using LibNs; + model A { x: LibAModel; } + `, + unusedUsingOptions({ nostdlib: true }), ); - - const diagnostics = await diagnoseWithUnusedUsing("./", { nostdlib: true }); expectDiagnosticEmpty(diagnostics); }); it("unused using when type referenced directly", async () => { - testHost.addTypeSpecFile( - "main.tsp", + const diagnostics = await Tester.files({ + "other.tsp": ` + namespace Other { + model OtherModel { + } + } + `, + }).diagnose( ` import "./other.tsp"; namespace Main { @@ -875,17 +743,8 @@ describe("compiler: unused using statements", () => { } } `, + unusedUsingOptions({ nostdlib: true }), ); - testHost.addTypeSpecFile( - "other.tsp", - ` - namespace Other { - model OtherModel { - } - } - `, - ); - const diagnostics = await diagnoseWithUnusedUsing("./", { nostdlib: true }); expectDiagnostics(diagnostics, [ { code: "@typespec/compiler/unused-using", diff --git a/packages/compiler/test/checker/using.test.ts b/packages/compiler/test/checker/using.test.ts index 736e4b5052e..a6a4c7669da 100644 --- a/packages/compiler/test/checker/using.test.ts +++ b/packages/compiler/test/checker/using.test.ts @@ -1,107 +1,51 @@ import { rejects, strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; -import { Model } from "../../src/core/types.js"; -import { - TestHost, - createTestHost, - expectDiagnosticEmpty, - expectDiagnostics, -} from "../../src/testing/index.js"; +import { describe, it } from "vitest"; +import { expectDiagnosticEmpty, expectDiagnostics, mockFile, t } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; describe("compiler: using statements", () => { - let testHost: TestHost; - - beforeEach(async () => { - testHost = await createTestHost(); - }); - it("works in global scope", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const { Y } = await Tester.files({ + "a.tsp": ` namespace N; model X { x: int32 } `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` + }).compile(t.code` + import "./a.tsp"; using N; - @test model Y { ... X } - `, - ); - - const { Y } = (await testHost.compile("./")) as { - Y: Model; - }; + model ${t.model("Y")} { ... X } + `); strictEqual(Y.properties.size, 1); }); it("works in namespaces", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const { Y } = await Tester.files({ + "a.tsp": ` namespace N; model X { x: int32 } `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` + }).compile(t.code` + import "./a.tsp"; namespace Z; using N; - @test model Y { ... X } - `, - ); - - const { Y } = (await testHost.compile("./")) as { - Y: Model; - }; + model ${t.model("Y")} { ... X } + `); strictEqual(Y.properties.size, 1); }); it("works with dotted namespaces", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const { Y } = await Tester.files({ + "a.tsp": ` namespace N.M; model X { x: int32 } `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` + }).compile(t.code` + import "./a.tsp"; using N.M; - @test model Y { ... X } - `, - ); - - const { Y } = (await testHost.compile("./")) as { - Y: Model; - }; + model ${t.model("Y")} { ... X } + `); strictEqual(Y.properties.size, 1); }); @@ -109,67 +53,39 @@ describe("compiler: using statements", () => { // This is checking a case where when using a namespace it would start linking its content // before the using of the file were resolved themself causing invalid refs. it("using a namespace won't start linking it", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - using A; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const diagnostics = await Tester.files({ + "a.tsp": ` import "./b.tsp"; using B; - namespace A { @test model AModel { b: BModel } } + namespace A { model AModel { b: BModel } } `, - ); - testHost.addTypeSpecFile("b.tsp", `namespace B { model BModel {} }`); + "b.tsp": `namespace B { model BModel {} }`, + }).diagnose(` + import "./a.tsp"; + using A; + `); - expectDiagnosticEmpty(await testHost.diagnose("./")); + expectDiagnosticEmpty(diagnostics); }); it("TypeSpec.Xyz namespace doesn't need TypeSpec prefix in using", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const { Y } = await Tester.files({ + "a.tsp": ` namespace TypeSpec.Xyz; model X { x: int32 } `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` + }).compile(t.code` + import "./a.tsp"; using Xyz; - @test model Y { ... X } - `, - ); - - const { Y } = (await testHost.compile("./")) as { - Y: Model; - }; + model ${t.model("Y")} { ... X } + `); strictEqual(Y.properties.size, 1); }); it("can use 2 namespace with the same last name", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const diagnostics = await Tester.files({ + "a.tsp": ` namespace N.A { model B { } } @@ -178,67 +94,49 @@ describe("compiler: using statements", () => { model B { } } `, - ); - - testHost.addTypeSpecFile( - "b.tsp", - ` + "b.tsp": ` using N.A; using M.A; `, - ); - - const diagnostics = await testHost.diagnose("./"); + }).diagnose(` + import "./a.tsp"; + import "./b.tsp"; + `); expectDiagnosticEmpty(diagnostics); }); describe("duplicate usings", () => { it("doesn't consider using scoped in namespace as duplicate", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - using A; + const diagnostics = await Tester.files({ + "a.tsp": `namespace A { model AModel {} }`, + }).diagnose(` + import "./a.tsp"; + using A; - namespace B { - using A; - } - namespace C { - using A; - } - `, - ); - testHost.addTypeSpecFile("a.tsp", `namespace A { model AModel {} }`); - - const diagnostics = await testHost.diagnose("./"); + namespace B { + using A; + } + namespace C { + using A; + } + `); expectDiagnosticEmpty(diagnostics); }); it("throws errors for duplicate imported usings", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const diagnostics = await Tester.files({ + "a.tsp": ` namespace N.M; model X { x: int32 } `, - ); - - testHost.addTypeSpecFile( - "b.tsp", - ` + "b.tsp": ` using N.M; using N.M; `, - ); - - const diagnostics = await testHost.diagnose("./"); + }).diagnose(` + import "./a.tsp"; + import "./b.tsp"; + `); expectDiagnostics(diagnostics, [ { code: "duplicate-using", message: 'duplicate using of "N.M" namespace' }, { code: "duplicate-using", message: 'duplicate using of "N.M" namespace' }, @@ -247,16 +145,8 @@ describe("compiler: using statements", () => { }); it("does not throws errors for different usings with the same bindings if not used", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const diagnostics = await Tester.files({ + "a.tsp": ` namespace N { model A { } } @@ -265,31 +155,20 @@ describe("compiler: using statements", () => { model A { } } `, - ); - - testHost.addTypeSpecFile( - "b.tsp", - ` + "b.tsp": ` using N; using M; `, - ); - - const diagnostics = await testHost.diagnose("./"); + }).diagnose(` + import "./a.tsp"; + import "./b.tsp"; + `); expectDiagnosticEmpty(diagnostics); }); it("report ambiguous diagnostics when using name present in multiple using", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const diagnostics = await Tester.files({ + "a.tsp": ` namespace N { model A { } } @@ -298,18 +177,19 @@ describe("compiler: using statements", () => { model A { } } `, - ); - - testHost.addTypeSpecFile( - "b.tsp", - ` + "b.tsp": ` using N; using M; model B extends A {} `, + }).diagnose( + ` + import "./a.tsp"; + import "./b.tsp"; + `, + { compilerOptions: { nostdlib: true } }, ); - const diagnostics = await testHost.diagnose("./", { nostdlib: true }); expectDiagnostics(diagnostics, [ { code: "ambiguous-symbol", @@ -320,33 +200,26 @@ describe("compiler: using statements", () => { }); it("report ambiguous diagnostics when symbol exists in using namespace and global namespace", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const diagnostics = await Tester.files({ + "a.tsp": ` model M {} using B; model Q extends M {} `, - ); - testHost.addTypeSpecFile( - "b.tsp", - ` + "b.tsp": ` namespace B { model M { } } `, + }).diagnose( + ` + import "./a.tsp"; + import "./b.tsp"; + `, + { compilerOptions: { nostdlib: true } }, ); - - const diagnostics = await testHost.diagnose("./", { nostdlib: true }); expectDiagnostics(diagnostics, [ { code: "ambiguous-symbol", @@ -357,9 +230,12 @@ describe("compiler: using statements", () => { }); it("reports ambiguous symbol for decorator", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.files({ + "doc.js": mockFile.js({ + namespace: "Test.A", + $doc() {}, + }), + }).diagnose(` import "./doc.js"; namespace Test; @@ -371,15 +247,7 @@ describe("compiler: using statements", () => { @doc namespace Foo {} - `, - ); - - testHost.addJsFile("doc.js", { - namespace: "Test.A", - $doc() {}, - }); - - const diagnostics = await testHost.diagnose("./"); + `); expectDiagnostics(diagnostics, [ { code: "ambiguous-symbol", @@ -389,9 +257,7 @@ describe("compiler: using statements", () => { }); it("reports ambiguous symbol for decorator with missing implementation", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.diagnose(` namespace Test; namespace A { @@ -402,10 +268,7 @@ describe("compiler: using statements", () => { @doc namespace Foo {} - `, - ); - - const diagnostics = await testHost.diagnose("./"); + `); expectDiagnostics(diagnostics, [ { code: "ambiguous-symbol", @@ -416,17 +279,8 @@ describe("compiler: using statements", () => { }); it("ambiguous use doesn't affect other files", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./ambiguous.tsp"; - import "./notambiguous.tsp"; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const diagnostics = await Tester.files({ + "a.tsp": ` namespace N { model A { } } @@ -435,27 +289,22 @@ describe("compiler: using statements", () => { model A { } } `, - ); - - testHost.addTypeSpecFile( - "ambiguous.tsp", - ` + "ambiguous.tsp": ` using N; using M; model Ambiguous extends A {} `, - ); - - testHost.addTypeSpecFile( - "notambiguous.tsp", - ` + "notambiguous.tsp": ` using N; model NotAmbiguous extends A {} `, - ); - const diagnostics = await testHost.diagnose("./"); + }).diagnose(` + import "./a.tsp"; + import "./ambiguous.tsp"; + import "./notambiguous.tsp"; + `); expectDiagnostics(diagnostics, [ { code: "ambiguous-symbol", @@ -467,58 +316,31 @@ describe("compiler: using statements", () => { }); it("resolves 'local' decls over usings", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + const { B } = await Tester.files({ + "a.tsp": ` namespace N; model A { a: string } `, - ); - - testHost.addTypeSpecFile( - "b.tsp", - ` + }).compile(t.code` + import "./a.tsp"; using N; namespace B { model A { a: int32 | string } - @test model B { ... A } + model ${t.model("B")} { ... A } } - `, - ); - - const { B } = (await testHost.compile("./")) as { - B: Model; - }; + `); strictEqual(B.properties.size, 1); strictEqual(B.properties.get("a")!.type.kind, "Union"); }); it("usings are local to a file", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` - import "./a.tsp"; - import "./b.tsp"; - `, - ); - testHost.addTypeSpecFile( - "a.tsp", - ` + await rejects( + Tester.files({ + "a.tsp": ` namespace N; model A { a: string } `, - ); - - testHost.addTypeSpecFile( - "b.tsp", - ` + "b.tsp": ` namespace M { using N; } @@ -527,62 +349,42 @@ describe("compiler: using statements", () => { model X { a: A }; } `, + }).compile(` + import "./a.tsp"; + import "./b.tsp"; + `), ); - - await rejects(testHost.compile("./")); }); + it("TypeSpec namespace is automatically using'd", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + await Tester.compile(` namespace Foo; model test { x: int32 }; - `, - ); - - await testHost.compile("./"); + `); }); it("works when the using'd namespace is merged after the current namespace", async () => { - testHost.addTypeSpecFile( - "main.tsp", - ` + await Tester.files({ + "other.tsp": ` + namespace Other; + + model OtherModel { + } + `, + }).compile(` import "./other.tsp"; namespace Main; using Other; model Thing { other: OtherModel; } - `, - ); - testHost.addTypeSpecFile( - "other.tsp", - ` - namespace Other; - - model OtherModel { - } - `, - ); - await testHost.compile("./"); + `); }); }); describe("emit diagnostics", () => { - async function diagnose(code: string) { - const testHost = await createTestHost(); - testHost.addTypeSpecFile( - "main.tsp", - ` - ${code} - `, - ); - - return testHost.diagnose("main.tsp"); - } - it("unknown identifier", async () => { - const diagnostics = await diagnose(` + const diagnostics = await Tester.diagnose(` using NotDefined; `); expectDiagnostics(diagnostics, { @@ -601,7 +403,7 @@ describe("emit diagnostics", () => { ["operation", "op Target(): void;"], ].forEach(([name, code]) => { it(name, async () => { - const diagnostics = await diagnose(` + const diagnostics = await Tester.diagnose(` using Target; ${code} `); diff --git a/packages/compiler/test/checker/values/string-values.test.ts b/packages/compiler/test/checker/values/string-values.test.ts index 383adc1f08d..f8642586c83 100644 --- a/packages/compiler/test/checker/values/string-values.test.ts +++ b/packages/compiler/test/checker/values/string-values.test.ts @@ -87,6 +87,14 @@ describe("string templates", () => { "Value interpolated in this string template cannot be converted to a string. Only literal types can be automatically interpolated.", }); }); + + it("only emit invalid-ref error when interpolating an invalid reference, not non-literal-string-template", async () => { + const diagnostics = await diagnoseValue(`string("Some \${bad}")`); + expectDiagnostics(diagnostics, { + code: "invalid-ref", + message: "Unknown identifier bad", + }); + }); }); describe("validate literal are assignable", () => { diff --git a/packages/compiler/test/checker/values/utils.ts b/packages/compiler/test/checker/values/utils.ts index 151e3d1d726..2f5a690b89c 100644 --- a/packages/compiler/test/checker/values/utils.ts +++ b/packages/compiler/test/checker/values/utils.ts @@ -1,16 +1,11 @@ import { ok } from "assert"; -import { Diagnostic, Model, Type, Value, definePackageFlags } from "../../../src/index.js"; -import { - createTestHost, - createTestRunner, - expectDiagnosticEmpty, - extractCursor, -} from "../../../src/testing/index.js"; +import { Diagnostic, Type, Value, definePackageFlags } from "../../../src/index.js"; +import { expectDiagnosticEmpty, extractCursor, mockFile, t } from "../../../src/testing/index.js"; +import { Tester } from "../../tester.js"; export async function diagnoseUsage( code: string, ): Promise<{ diagnostics: readonly Diagnostic[]; pos: number; end?: number }> { - const runner = await createTestRunner(); let end; let { source, pos } = extractCursor(code); @@ -19,7 +14,7 @@ export async function diagnoseUsage( source = endMatch.source; end = endMatch.pos; } - const diagnostics = await runner.diagnose(source); + const diagnostics = await Tester.diagnose(source); return { diagnostics, pos, end }; } @@ -27,25 +22,21 @@ export async function compileAndDiagnoseValue( code: string, other?: string, ): Promise<[Value | undefined, readonly Diagnostic[]]> { - const host = await createTestHost(); let called: Value | undefined; - host.addJsFile("dec.js", { - $collect: (context: DecoratorContext, target: Type, value: Value) => { - called = value; - }, - }); - host.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.files({ + "dec.js": mockFile.js({ + $collect: (_: any, __: Type, value: Value) => { + called = value; + }, + }), + }).diagnose(` import "./dec.js"; @collect(${code}) model Test {} ${other ?? ""} - `, - ); - const diagnostics = await host.diagnose("main.tsp"); + `); return [called, diagnostics]; } @@ -70,27 +61,22 @@ export async function compileAndDiagnoseValueOrType( disableDeprecatedSuppression, }: { other?: string; disableDeprecatedSuppression?: boolean }, ): Promise<[Type | Value | undefined, readonly Diagnostic[]]> { - const host = await createTestHost(); - host.addJsFile("collect.js", { - $collect: () => {}, - $flags: definePackageFlags({}), - }); - host.addTypeSpecFile( - "main.tsp", - ` + const [{ Test }, diagnostics] = await Tester.files({ + "collect.js": mockFile.js({ + $collect: () => {}, + $flags: definePackageFlags({}), + }), + }).compileAndDiagnose( + t.code` import "./collect.js"; extern dec collect(target, value: ${constraint}); ${disableDeprecatedSuppression ? "" : `#suppress "deprecated" "for testing"`} @collect(${code}) - @test model Test {} + model ${t.model("Test")} {} ${other ?? ""} `, ); - const [{ Test }, diagnostics] = (await host.compileAndDiagnose("main.tsp")) as [ - { Test: Model }, - Diagnostic[], - ]; const dec = Test.decorators.find((x) => x.definition?.name === "@collect"); ok(dec); diff --git a/packages/compiler/test/config/config-interpolation.test.ts b/packages/compiler/test/config/config-interpolation.test.ts index 6a639444ce7..f8c5d711252 100644 --- a/packages/compiler/test/config/config-interpolation.test.ts +++ b/packages/compiler/test/config/config-interpolation.test.ts @@ -133,6 +133,32 @@ describe("compiler: config interpolation", () => { }, ]); }); + + it("does not interpolate variables that resolve to non-string values", () => { + const [resolved, diagnostics] = resolveValues({ + "output-file": "openapi.{file-type}", + "file-type": ["yaml", "json"] as any, + }); + expectDiagnosticEmpty(diagnostics); + deepStrictEqual(resolved, { + "output-file": "openapi.{file-type}", + "file-type": ["yaml", "json"], + }); + }); + + it("interpolates number and boolean values", () => { + const [resolved, diagnostics] = resolveValues({ + path: "v{version}/debug-{debug}", + version: 3 as any, + debug: true as any, + }); + expectDiagnosticEmpty(diagnostics); + deepStrictEqual(resolved, { + path: "v3/debug-true", + version: 3, + debug: true, + }); + }); }); describe("expandConfigVariables", () => { diff --git a/packages/compiler/test/config/config.test.ts b/packages/compiler/test/config/config.test.ts index abc4fca5b6d..a7c058b416b 100644 --- a/packages/compiler/test/config/config.test.ts +++ b/packages/compiler/test/config/config.test.ts @@ -112,6 +112,7 @@ describe("compiler: config file loading", () => { }); it("deep clones defaults when not found", async () => { + // eslint-disable-next-line no-useless-assignment let config = await loadTestConfig("empty", false, false); config = await loadTestConfig("empty", false, false); deepStrictEqual(config, { @@ -121,6 +122,7 @@ describe("compiler: config file loading", () => { }); it("deep clones defaults when found", async () => { + // eslint-disable-next-line no-useless-assignment let config = await loadTestConfig("simple", false, false); config = await loadTestConfig("simple"); diff --git a/packages/compiler/test/core/cli/actions/info/emitter-options.test.ts b/packages/compiler/test/core/cli/actions/info/emitter-options.test.ts new file mode 100644 index 00000000000..7e58a95e301 --- /dev/null +++ b/packages/compiler/test/core/cli/actions/info/emitter-options.test.ts @@ -0,0 +1,365 @@ +import { describe, expect, it } from "vitest"; +import { + extractEmitterOptionsInfo, + formatEmitterOptions, + formatLibraryInfo, +} from "../../../../../src/core/cli/actions/info/emitter-options.js"; +import { d } from "../../../../test-utils.js"; + +/** Strip ANSI escape codes to get plain text for assertions */ +function stripAnsi(str: string): string { + // eslint-disable-next-line no-control-regex + return str.replace(/\x1b\[[0-9;]*m/g, ""); +} + +function formatOptionsPlain(schema: any): string { + return stripAnsi(formatEmitterOptions(schema).join("\n")); +} + +function formatInfoPlain(manifest: any): string { + return stripAnsi(formatLibraryInfo(manifest).join("\n")); +} + +describe("extractEmitterOptionsInfo", () => { + it("returns empty array for undefined schema", () => { + expect(extractEmitterOptionsInfo(undefined)).toEqual([]); + }); + + it("returns empty array for schema with no properties", () => { + expect(extractEmitterOptionsInfo({ type: "object" })).toEqual([]); + }); + + it("extracts string option with enum", () => { + const schema = { + type: "object", + properties: { + "file-type": { + type: "string", + enum: ["yaml", "json"], + nullable: true, + description: "Output format", + }, + }, + }; + const result = extractEmitterOptionsInfo(schema); + expect(result).toEqual([ + { + name: "file-type", + type: "string", + allowedValues: ["yaml", "json"], + description: "Output format", + }, + ]); + }); + + it("extracts boolean option with default", () => { + const schema = { + type: "object", + properties: { + "seal-object-schemas": { + type: "boolean", + nullable: true, + default: false, + }, + }, + }; + const result = extractEmitterOptionsInfo(schema); + expect(result).toEqual([ + { + name: "seal-object-schemas", + type: "boolean", + default: "false", + }, + ]); + }); + + it("extracts array option with items", () => { + const schema = { + type: "object", + properties: { + "openapi-versions": { + type: "array", + items: { type: "string", enum: ["3.0.0", "3.1.0"] }, + default: ["3.0.0"], + description: "OpenAPI versions to emit.", + }, + }, + }; + const result = extractEmitterOptionsInfo(schema); + expect(result).toEqual([ + { + name: "openapi-versions", + type: "string[]", + allowedValues: ["3.0.0", "3.1.0"], + default: '["3.0.0"]', + description: "OpenAPI versions to emit.", + }, + ]); + }); + + it("extracts oneOf as variants with nested object properties", () => { + const schema = { + type: "object", + properties: { + "operation-id": { + oneOf: [ + { type: "string", enum: ["auto", "manual"] }, + { + type: "object", + properties: { + kind: { type: "string" }, + separator: { type: "string" }, + }, + }, + ], + }, + }, + }; + const result = extractEmitterOptionsInfo(schema); + expect(result).toHaveLength(1); + expect(result[0].name).toBe("operation-id"); + expect(result[0].variants).toHaveLength(2); + expect(result[0].variants![0].allowedValues).toEqual(["auto", "manual"]); + expect(result[0].variants![1].type).toBe("object"); + expect(result[0].variants![1].nestedOptions).toHaveLength(2); + expect(result[0].variants![1].nestedOptions![0].name).toBe("kind"); + expect(result[0].variants![1].nestedOptions![1].name).toBe("separator"); + }); + + it("extracts option with description as array", () => { + const schema = { + type: "object", + properties: { + "output-file": { + type: "string", + nullable: true, + description: ["Line 1", "Line 2"], + }, + }, + }; + const result = extractEmitterOptionsInfo(schema); + expect(result[0].description).toBe("Line 1\nLine 2"); + }); +}); + +describe("formatLibraryInfo", () => { + it("shows name and version", () => { + expect(formatInfoPlain({ name: "@typespec/openapi3", version: "1.2.3" })).toBe(d` + Library + + Name: @typespec/openapi3 + Version: 1.2.3 + `); + }); + + it("shows name, version, description, and homepage", () => { + expect( + formatInfoPlain({ + name: "@typespec/openapi3", + version: "1.2.3", + description: "OpenAPI 3 emitter for TypeSpec", + homepage: "https://typespec.io", + }), + ).toBe(d` + Library + + Name: @typespec/openapi3 + Version: 1.2.3 + Description: OpenAPI 3 emitter for TypeSpec + Homepage: https://typespec.io + `); + }); + + it("shows unknown when manifest is undefined", () => { + expect(formatInfoPlain(undefined)).toBe(d` + Library + + Name: unknown + `); + }); + + it("shows name without version when version is missing", () => { + expect(formatInfoPlain({ name: "@typespec/openapi3" })).toBe(d` + Library + + Name: @typespec/openapi3 + `); + }); +}); + +describe("formatEmitterOptions", () => { + it("shows message when emitter has no options", () => { + expect(formatOptionsPlain(undefined)).toBe(d` + Emitter Options + + This emitter does not define any options. + `); + }); + + it("shows message when schema has no properties", () => { + expect(formatOptionsPlain({ type: "object" })).toBe(d` + Emitter Options + + This emitter does not define any options. + `); + }); + + it("formats enum option with description", () => { + const schema = { + type: "object", + properties: { + "file-type": { + type: "string", + enum: ["yaml", "json"], + description: "Output format.", + }, + }, + }; + expect(formatOptionsPlain(schema)).toBe(d` + Emitter Options + + file-type: "yaml" | "json" + Output format. + + `); + }); + + it("formats boolean option with default", () => { + const schema = { + type: "object", + properties: { + noEmit: { + type: "boolean", + default: false, + description: "Do not emit files.", + }, + }, + }; + expect(formatOptionsPlain(schema)).toBe(d` + Emitter Options + + noEmit: boolean (default: false) + Do not emit files. + + `); + }); + + it("formats multiple options together", () => { + const schema = { + type: "object", + properties: { + "file-type": { + type: "string", + enum: ["yaml", "json"], + description: "Output file format.", + }, + "new-line": { + type: "string", + enum: ["crlf", "lf"], + default: "lf", + }, + noEmit: { + type: "boolean", + default: false, + description: "Do not emit files.", + }, + }, + }; + expect(formatOptionsPlain(schema)).toBe(d` + Emitter Options + + file-type: "yaml" | "json" + Output file format. + + new-line: "crlf" | "lf" (default: "lf") + + noEmit: boolean (default: false) + Do not emit files. + + `); + }); + + it("formats union variants with - prefix and nested properties", () => { + const schema = { + type: "object", + properties: { + strategy: { + oneOf: [ + { + type: "string", + enum: ["auto", "manual"], + default: "auto", + description: "Simple strategy.", + }, + { + type: "object", + properties: { + kind: { + type: "string", + enum: ["auto", "manual"], + description: "The strategy kind.", + }, + separator: { type: "string", description: "Separator character." }, + }, + }, + ], + }, + }, + }; + expect(formatOptionsPlain(schema)).toBe(d` + Emitter Options + + strategy: + - "auto" | "manual" (default: "auto") + Simple strategy. + - object + kind: "auto" | "manual" + The strategy kind. + + separator: string + Separator character. + + + `); + }); + + it("formats array option with enum items as union array", () => { + const schema = { + type: "object", + properties: { + "openapi-versions": { + type: "array", + items: { type: "string", enum: ["3.0.0", "3.1.0"] }, + default: ["3.0.0"], + description: "OpenAPI versions to emit.", + }, + }, + }; + expect(formatOptionsPlain(schema)).toBe(d` + Emitter Options + + openapi-versions: ("3.0.0" | "3.1.0")[] (default: ["3.0.0"]) + OpenAPI versions to emit. + + `); + }); + + it("renders markdown inline code and links in descriptions", () => { + const schema = { + type: "object", + properties: { + output: { + type: "string", + description: "Use `json` format. See [docs](https://example.com) for details.", + }, + }, + }; + expect(formatOptionsPlain(schema)).toBe(d` + Emitter Options + + output: string + Use json format. See docs https://example.com for details. + + `); + }); +}); diff --git a/packages/compiler/test/core/codefixes.test.ts b/packages/compiler/test/core/codefixes.test.ts index 2350a7299d7..b005a6d5393 100644 --- a/packages/compiler/test/core/codefixes.test.ts +++ b/packages/compiler/test/core/codefixes.test.ts @@ -12,7 +12,7 @@ import { createSourceFile, defineCodeFix, } from "../../src/index.js"; -import { createTestHost } from "../../src/testing/test-host.js"; +import { createTestFileSystem } from "../../src/testing/fs.js"; describe("Codefixes", () => { describe("applyCodeFix", () => { @@ -21,11 +21,11 @@ describe("Codefixes", () => { fix: (context: CodeFixContext, file: SourceFile) => CodeFixEdit | CodeFixEdit[], ): Promise { const fakeFile = createSourceFile(text, "test.ts"); - const host = await createTestHost(); + const fs = createTestFileSystem(); let result: string | undefined; await applyCodeFix( { - ...host.compilerHost, + ...fs.compilerHost, writeFile: (name, content) => { result = content; return Promise.resolve(); diff --git a/packages/compiler/test/core/diagnostics.test.ts b/packages/compiler/test/core/diagnostics.test.ts index a3f098bb283..179b04b8f3d 100644 --- a/packages/compiler/test/core/diagnostics.test.ts +++ b/packages/compiler/test/core/diagnostics.test.ts @@ -1,20 +1,13 @@ import { strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { SourceLocationOptions, getSourceLocation } from "../../src/index.js"; import { extractSquiggles } from "../../src/testing/source-utils.js"; -import { createTestRunner } from "../../src/testing/test-host.js"; -import { BasicTestRunner } from "../../src/testing/types.js"; +import { Tester } from "../tester.js"; describe("compiler: diagnostics", () => { - let runner: BasicTestRunner; - - beforeEach(async () => { - runner = await createTestRunner(); - }); - async function expectLocationMatch(code: string, options: SourceLocationOptions = {}) { const { pos, end, source } = extractSquiggles(code); - const { target } = await runner.compile(source); + const { target } = await Tester.compile(source); const location = getSourceLocation(target, options); strictEqual(location.pos, pos); strictEqual(location.end, end); @@ -24,8 +17,7 @@ describe("compiler: diagnostics", () => { it("report whole model by default", () => expectLocationMatch(` ~~~@doc("This is documentation") - @test("target") - model Foo { + model /*target*/Foo { name: string; }~~~ @@ -34,8 +26,7 @@ describe("compiler: diagnostics", () => { expectLocationMatch( ` @doc("This is documentation") - @test("target") - model ~~~Foo~~~ { + model /*target*/~~~Foo~~~ { name: string; } diff --git a/packages/compiler/test/core/emitter-options.test.ts b/packages/compiler/test/core/emitter-options.test.ts index cf479578d3e..d0aa5077980 100644 --- a/packages/compiler/test/core/emitter-options.test.ts +++ b/packages/compiler/test/core/emitter-options.test.ts @@ -2,7 +2,8 @@ import { ok, strictEqual } from "assert"; import { describe, it } from "vitest"; import { Diagnostic, EmitContext, createTypeSpecLibrary } from "../../src/index.js"; import { expectDiagnosticEmpty, expectDiagnostics } from "../../src/testing/expect.js"; -import { createTestHost } from "../../src/testing/test-host.js"; +import { mockFile } from "../../src/testing/fs.js"; +import { Tester } from "../tester.js"; const fakeEmitter = createTypeSpecLibrary({ name: "fake-emitter", @@ -24,25 +25,22 @@ describe("compiler: emitter options", () => { options: Record, ): Promise<[EmitContext | undefined, readonly Diagnostic[]]> { let emitContext: EmitContext | undefined; - const host = await createTestHost(); - host.addTypeSpecFile("main.tsp", ""); - host.addTypeSpecFile( - "node_modules/fake-emitter/package.json", - JSON.stringify({ + const diagnostics = await Tester.files({ + "node_modules/fake-emitter/package.json": JSON.stringify({ main: "index.js", }), - ); - host.addJsFile("node_modules/fake-emitter/index.js", { - $lib: fakeEmitter, - $onEmit: (ctx: EmitContext) => { - emitContext = ctx; - }, - }); - - const diagnostics = await host.diagnose("main.tsp", { - emit: ["fake-emitter"], - options: { - "fake-emitter": options, + "node_modules/fake-emitter/index.js": mockFile.js({ + $lib: fakeEmitter, + $onEmit: (ctx: EmitContext) => { + emitContext = ctx; + }, + }), + }).diagnose("", { + compilerOptions: { + emit: ["fake-emitter"], + options: { + "fake-emitter": options, + }, }, }); return [emitContext, diagnostics]; diff --git a/packages/compiler/test/core/emitter.test.ts b/packages/compiler/test/core/emitter.test.ts index b61e87c769c..300a5f406b1 100644 --- a/packages/compiler/test/core/emitter.test.ts +++ b/packages/compiler/test/core/emitter.test.ts @@ -7,7 +7,8 @@ import { TypeSpecLibraryDef, } from "../../src/index.js"; import { expectDiagnosticEmpty } from "../../src/testing/expect.js"; -import { createTestHost } from "../../src/testing/test-host.js"; +import { mockFile } from "../../src/testing/fs.js"; +import { Tester } from "../tester.js"; interface FakeEmitter { name: string; @@ -41,22 +42,19 @@ async function runEmitters( emitters: FakeEmitter[], options: CompilerOptions, ): Promise<[undefined, readonly Diagnostic[]]> { - const host = await createTestHost(); - host.addTypeSpecFile("main.tsp", "model Foo {}"); - + const files: Record> = {}; for (const emitter of emitters) { - host.addTypeSpecFile( - `node_modules/${emitter.name}/package.json`, - JSON.stringify({ - main: "index.js", - }), - ); - host.addJsFile(`node_modules/${emitter.name}/index.js`, { + files[`node_modules/${emitter.name}/package.json`] = JSON.stringify({ + main: "index.js", + }); + files[`node_modules/${emitter.name}/index.js`] = mockFile.js({ $lib: emitter.$lib, $onEmit: emitter.$onEmit, }); } - const diagnostics = await host.diagnose("main.tsp", options); + const diagnostics = await Tester.files(files).diagnose("model Foo {}", { + compilerOptions: options, + }); return [undefined, diagnostics]; } diff --git a/packages/compiler/test/core/helpers/syntax-utils.test.ts b/packages/compiler/test/core/helpers/syntax-utils.test.ts index 540e2b01688..8240d9b01bf 100644 --- a/packages/compiler/test/core/helpers/syntax-utils.test.ts +++ b/packages/compiler/test/core/helpers/syntax-utils.test.ts @@ -1,5 +1,5 @@ import { expect, it } from "vitest"; -import { printIdentifier } from "../../../src/index.js"; +import { printIdentifier } from "../../../src/core/helpers/syntax-utils.js"; it.each([ ["foo", "foo"], @@ -10,3 +10,19 @@ it.each([ ])("%s -> %s", (a, b) => { expect(printIdentifier(a)).toEqual(b); }); + +// Modifier keywords require backtick escaping in default (disallow-reserved) context +it.each([ + ["internal", "`internal`"], + ["extern", "`extern`"], +])("%s -> %s (disallow-reserved)", (a, b) => { + expect(printIdentifier(a)).toEqual(b); +}); + +// Modifier keywords do not require backtick escaping in allow-reserved context +it.each([ + ["internal", "internal"], + ["extern", "extern"], +])("%s -> %s (allow-reserved)", (a, b) => { + expect(printIdentifier(a, "allow-reserved")).toEqual(b); +}); diff --git a/packages/compiler/test/core/linter.test.ts b/packages/compiler/test/core/linter.test.ts index 36da211dedc..020d4a46b85 100644 --- a/packages/compiler/test/core/linter.test.ts +++ b/packages/compiler/test/core/linter.test.ts @@ -8,11 +8,8 @@ import { type LinterDefinition, type LinterRuleContext, } from "../../src/index.js"; -import { - createTestHost, - expectDiagnosticEmpty, - expectDiagnostics, -} from "../../src/testing/index.js"; +import { expectDiagnosticEmpty, expectDiagnostics, mockFile } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; const noModelFoo = createLinterRule({ name: "no-model-foo", @@ -98,13 +95,18 @@ describe("compiler: linter", () => { code: string | Record, linterDef: LinterDefinition, ): Promise { - const host = await createTestHost(); + let result; if (typeof code === "string") { - host.addTypeSpecFile("main.tsp", code); + result = await Tester.compile(code); } else { - for (const [name, content] of Object.entries(code)) { - host.addTypeSpecFile(name, content); - } + const mainCode = code["main.tsp"]; + const otherFiles = Object.fromEntries( + Object.entries(code).filter(([name]) => name !== "main.tsp"), + ); + result = + Object.keys(otherFiles).length > 0 + ? await Tester.files(otherFiles).compile(mainCode) + : await Tester.compile(mainCode); } const library: LibraryInstance = { @@ -118,9 +120,7 @@ describe("compiler: linter", () => { linter: resolveLinterDefinition("@typespec/test-linter", linterDef), }; - await host.compile("main.tsp"); - - const linter = createLinter(host.program, (libName) => + const linter = createLinter(result.program, (libName) => Promise.resolve(libName === "@typespec/test-linter" ? library : undefined), ); return linter; @@ -351,23 +351,20 @@ describe("compiler: linter", () => { describe("(integration) loading in program", () => { async function diagnoseReal(code: string) { - const host = await createTestHost(); - host.addTypeSpecFile("main.tsp", code); - host.addTypeSpecFile( - "node_modules/my-lib/package.json", - JSON.stringify({ name: "my-lib", main: "index.js" }), - ); - host.addJsFile("node_modules/my-lib/index.js", { - $lib: createTypeSpecLibrary({ - name: "my-lib", - diagnostics: {}, + return await Tester.files({ + "node_modules/my-lib/package.json": JSON.stringify({ name: "my-lib", main: "index.js" }), + "node_modules/my-lib/index.js": mockFile.js({ + $lib: createTypeSpecLibrary({ + name: "my-lib", + diagnostics: {}, + }), + $linter: { rules: [noModelFoo] }, }), - $linter: { rules: [noModelFoo] }, - }); - - return await host.diagnose("main.tsp", { - linterRuleSet: { - enable: { "my-lib/no-model-foo": true }, + }).diagnose(code, { + compilerOptions: { + linterRuleSet: { + enable: { "my-lib/no-model-foo": true }, + }, }, }); } diff --git a/packages/compiler/test/decorator-utils.test.ts b/packages/compiler/test/decorator-utils.test.ts index 0ac9bdf856a..3f678244f4f 100644 --- a/packages/compiler/test/decorator-utils.test.ts +++ b/packages/compiler/test/decorator-utils.test.ts @@ -1,5 +1,5 @@ import { deepStrictEqual, strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { Type } from "../src/core/types.js"; import { DecoratorContext, @@ -8,36 +8,23 @@ import { validateDecoratorNotOnType, validateDecoratorUniqueOnNode, } from "../src/index.js"; -import { - BasicTestRunner, - createTestHost, - createTestWrapper, - expectDiagnosticEmpty, - expectDiagnostics, -} from "../src/testing/index.js"; +import { expectDiagnosticEmpty, expectDiagnostics, mockFile } from "../src/testing/index.js"; +import { Tester } from "./tester.js"; describe("compiler: decorator utils", () => { describe("typespecTypeToJson", () => { async function convertDecoratorDataToJson(code: string) { - const host = await createTestHost(); let result: any; - // add test decorators - host.addJsFile("mapToJson.js", { - $jsonData(context: DecoratorContext, target: Type, value: TypeSpecValue) { - result = typespecTypeToJson(value, target); - }, - }); - - host.addTypeSpecFile( - "main.tsp", - ` - import "./mapToJson.js"; - - ${code}; - `, - ); - await host.compile("main.tsp"); + await Tester.files({ + "mapToJson.js": mockFile.js({ + $jsonData(context: DecoratorContext, target: Type, value: TypeSpecValue) { + result = typespecTypeToJson(value, target); + }, + }), + }) + .import("./mapToJson.js") + .compile(`${code};`); return result; } it("can convert a string", async () => { @@ -139,22 +126,18 @@ describe("compiler: decorator utils", () => { }); describe("validateDecoratorUniqueOnNode", () => { - let runner: BasicTestRunner; - beforeEach(async () => { - const host = await createTestHost(); - runner = createTestWrapper(host, { wrapper: (x) => `import "./lib.js";\n${x}` }); - - function $bar(context: DecoratorContext, target: Type) { - validateDecoratorUniqueOnNode(context, target, $bar); - } - // add test decorators - host.addJsFile("lib.js", { + function $bar(context: DecoratorContext, target: Type) { + validateDecoratorUniqueOnNode(context, target, $bar); + } + + const UniqueDecTester = Tester.files({ + "lib.js": mockFile.js({ $bar, - }); - }); + }), + }).import("./lib.js"); it("emit diagnostics if using the same decorator on the same node", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await UniqueDecTester.diagnose(` @bar @bar model Foo {} @@ -173,7 +156,7 @@ describe("compiler: decorator utils", () => { }); it("shouldn't emit diagnostic if decorator is used once only", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await UniqueDecTester.diagnose(` @bar model Foo {} `); @@ -182,7 +165,7 @@ describe("compiler: decorator utils", () => { }); it("shouldn't emit diagnostic if decorator is defined twice via `model is`", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await UniqueDecTester.diagnose(` @bar model Bar {} @bar @@ -193,7 +176,7 @@ describe("compiler: decorator utils", () => { }); it("shouldn't emit diagnostic if decorator is used again as augment decorator", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await UniqueDecTester.diagnose(` @bar model Foo {} @@ -205,27 +188,22 @@ describe("compiler: decorator utils", () => { }); describe("validateDecoratorNotOnType", () => { - let runner: BasicTestRunner; - - beforeEach(async () => { - const host = await createTestHost(); - runner = createTestWrapper(host, { wrapper: (x) => `import "./lib.js";\n${x}` }); - - function $red(context: DecoratorContext, target: Type) { - validateDecoratorNotOnType(context, target, $blue, $red); - } - function $blue(context: DecoratorContext, target: Type) { - validateDecoratorNotOnType(context, target, $red, $blue); - } - // add test decorators - host.addJsFile("lib.js", { + function $red(context: DecoratorContext, target: Type) { + validateDecoratorNotOnType(context, target, $blue, $red); + } + function $blue(context: DecoratorContext, target: Type) { + validateDecoratorNotOnType(context, target, $red, $blue); + } + + const ConflictDecTester = Tester.files({ + "lib.js": mockFile.js({ $red, $blue, - }); - }); + }), + }).import("./lib.js"); it("emit diagnostics if using the decorator has a conflict", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await ConflictDecTester.diagnose(` @red @blue model Foo {} @@ -242,7 +220,7 @@ describe("compiler: decorator utils", () => { }); it("emit diagnostics if using the decorator has a conflict with model is", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await ConflictDecTester.diagnose(` @red model Bar {} @blue @@ -260,7 +238,7 @@ describe("compiler: decorator utils", () => { }); it("emit diagnostics if using the decorator has a conflict with model extends", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await ConflictDecTester.diagnose(` @red model Bar {} @blue @@ -275,7 +253,7 @@ describe("compiler: decorator utils", () => { }); it("emit diagnostics if using the decorator has a conflict with scalar extends", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await ConflictDecTester.diagnose(` @red scalar foo extends int32; @blue @@ -290,7 +268,7 @@ describe("compiler: decorator utils", () => { }); it("should emit diagnostic if decorator conflict is created via augment decorator", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await ConflictDecTester.diagnose(` @red model Foo {} diff --git a/packages/compiler/test/decorators/decorators.test.ts b/packages/compiler/test/decorators/decorators.test.ts index 111972c7e49..5a1ec399d76 100644 --- a/packages/compiler/test/decorators/decorators.test.ts +++ b/packages/compiler/test/decorators/decorators.test.ts @@ -1,16 +1,6 @@ import { deepStrictEqual, ok, strictEqual } from "assert"; -import { beforeEach, describe, expect, it } from "vitest"; -import { - Enum, - Model, - ModelProperty, - Namespace, - Operation, - Scalar, - Union, - getDiscriminatedUnion, - isSecret, -} from "../../src/index.js"; +import { describe, expect, it } from "vitest"; +import { getDiscriminatedUnion, isSecret } from "../../src/index.js"; import { getDoc, getEncode, @@ -26,201 +16,153 @@ import { getReturnsDoc, isErrorModel, resolveEncodedName, + setMediaTypeHint, } from "../../src/lib/decorators.js"; -import { - BasicTestRunner, - createTestRunner, - expectDiagnosticEmpty, - expectDiagnostics, - t, -} from "../../src/testing/index.js"; +import { expectDiagnosticEmpty, expectDiagnostics, t } from "../../src/testing/index.js"; import { Tester } from "../tester.js"; describe("compiler: built-in decorators", () => { - let runner: BasicTestRunner; - - beforeEach(async () => { - runner = await createTestRunner(); - }); - describe("dev comment /** */", () => { it("applies /** */ on blockless namespace", async () => { - const { Foo } = await runner.compile( - ` - @test + const { Foo, program } = await Tester.compile(t.code` /** doc for namespace Foo */ - namespace TestDoc.Foo; + namespace TestDoc.${t.namespace("Foo")}; model A {} - `, - ); + `); - strictEqual(getDoc(runner.program, Foo), "doc for namespace Foo"); + strictEqual(getDoc(program, Foo), "doc for namespace Foo"); }); it("applies /** */ on enclosed namespace", async () => { - const { Foo } = await runner.compile( - ` - @test + const { Foo, program } = await Tester.compile(t.code` /** doc for namespace Foo */ - namespace TestDoc.Foo { + namespace TestDoc.${t.namespace("Foo")} { model A {} } - `, - ); + `); - strictEqual(getDoc(runner.program, Foo), "doc for namespace Foo"); + strictEqual(getDoc(program, Foo), "doc for namespace Foo"); }); it("applies /** */ on nested enclosed namespace", async () => { - const { Foo } = await runner.compile( - // const { Foo, Foo_Bar } = await runner.compile( - ` - @test + const { Foo, program } = await Tester.compile(t.code` /** doc for namespace Foo */ - namespace TestDoc.Foo { + namespace TestDoc.${t.namespace("Foo")} { /** doc for namespace Bar */ namespace Bar { model A {}; } } - `, - ); + `); - const Bar = (Foo as Namespace).namespaces.get("Bar")!; - strictEqual(getDoc(runner.program, Foo), "doc for namespace Foo"); - strictEqual(getDoc(runner.program, Bar), "doc for namespace Bar"); + const Bar = Foo.namespaces.get("Bar")!; + strictEqual(getDoc(program, Foo), "doc for namespace Foo"); + strictEqual(getDoc(program, Bar), "doc for namespace Bar"); }); it("applies /** */ on nested blockless + enclosed namespace", async () => { - const { Foo } = await runner.compile( - ` - @test + const { Foo, program } = await Tester.compile(t.code` /** doc for namespace Foo */ - namespace TestDoc.Foo; + namespace TestDoc.${t.namespace("Foo")}; /** doc for namespace Bar */ namespace Bar { model A {} } - `, - ); + `); - const Bar = (Foo as Namespace).namespaces.get("Bar")!; - strictEqual(getDoc(runner.program, Foo), "doc for namespace Foo"); - strictEqual(getDoc(runner.program, Bar), "doc for namespace Bar"); + const Bar = Foo.namespaces.get("Bar")!; + strictEqual(getDoc(program, Foo), "doc for namespace Foo"); + strictEqual(getDoc(program, Bar), "doc for namespace Bar"); }); }); describe("@doc", () => { it("applies @doc on model", async () => { - const { A } = await runner.compile( - ` - @test + const { A, program } = await Tester.compile(t.code` @doc("My Doc") - model A { } - `, - ); + model ${t.model("A")} { } + `); - strictEqual(getDoc(runner.program, A), "My Doc"); + strictEqual(getDoc(program, A), "My Doc"); }); it("formats @doc string using source object", async () => { - const { A, B } = await runner.compile( - ` + const { A, B, program } = await Tester.compile(t.code` @doc("Templated {name}", T) model Template { } - @test @doc("Model {name}", A) - model A { } + model ${t.model("A")} { } - @test - model B is Template { + model ${t.model("B")} is Template { } - `, - ); - strictEqual(getDoc(runner.program, A), "Model A"); - strictEqual(getDoc(runner.program, B), "Templated B"); + `); + strictEqual(getDoc(program, A), "Model A"); + strictEqual(getDoc(program, B), "Templated B"); }); it("applies @doc on namespace", async () => { - const { TestDoc } = await runner.compile( - ` - @test + const { TestDoc, program } = await Tester.compile(t.code` @doc("doc for namespace") - namespace Foo.TestDoc { + namespace Foo.${t.namespace("TestDoc")} { } - `, - ); + `); - strictEqual(getDoc(runner.program, TestDoc), "doc for namespace"); + strictEqual(getDoc(program, TestDoc), "doc for namespace"); }); it("applies @doc on enum", async () => { - const { Color, Red } = await runner.compile( - ` - @test + const { Color, Red, program } = await Tester.compile(t.code` @doc("doc for enum") - enum Color { - @test + enum ${t.enum("Color")} { @doc("doc for enum element") - Red: "red", + ${t.enumMember("Red")}: "red", } - `, - ); + `); - strictEqual(getDoc(runner.program, Color), "doc for enum"); - strictEqual(getDoc(runner.program, Red), "doc for enum element"); + strictEqual(getDoc(program, Color), "doc for enum"); + strictEqual(getDoc(program, Red), "doc for enum element"); }); it("applies @doc on union", async () => { - const { AB } = await runner.compile( - ` + const { AB, program } = await Tester.compile(t.code` model A { } model B { } - @test @doc("doc for union") - union AB { a: A, b: B } - `, - ); + union ${t.union("AB")} { a: A, b: B } + `); - strictEqual(getDoc(runner.program, AB), "doc for union"); + strictEqual(getDoc(program, AB), "doc for union"); }); it("applies @doc on interfaces", async () => { - const { TestDoc, a } = await runner.compile( - ` - @test + const { TestDoc, a, program } = await Tester.compile(t.code` @doc("doc for interface") - interface TestDoc { - @test + interface ${t.interface("TestDoc")} { @doc("doc for interface operation") - a(): string; + ${t.op("a")}(): string; } - `, - ); + `); - strictEqual(getDoc(runner.program, TestDoc), "doc for interface"); - strictEqual(getDoc(runner.program, a), "doc for interface operation"); + strictEqual(getDoc(program, TestDoc), "doc for interface"); + strictEqual(getDoc(program, a), "doc for interface operation"); }); it("applies @doc on operations", async () => { - const { b } = await runner.compile( - ` - @test + const { b, program } = await Tester.compile(t.code` @doc("doc for an operation") - op b(): string; - `, - ); + op ${t.op("b")}(): string; + `); - strictEqual(getDoc(runner.program, b), "doc for an operation"); + strictEqual(getDoc(program, b), "doc for an operation"); }); it("emit diagnostic if doc is not a string", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` @doc(123) model A { } `); @@ -233,36 +175,29 @@ describe("compiler: built-in decorators", () => { describe("@pattern", () => { it("applies @pattern to scalar", async () => { - const { A } = (await runner.compile( - ` - @test + const { A, program } = await Tester.compile(t.code` @pattern("^[a-z]+$") - scalar A extends string; - `, - )) as { A: Scalar }; + scalar ${t.scalar("A")} extends string; + `); - strictEqual(getPattern(runner.program, A), "^[a-z]+$"); + strictEqual(getPattern(program, A), "^[a-z]+$"); }); it("applies @pattern to model property", async () => { - const { A } = (await runner.compile( - ` - @test - model A { - @test + const { A, program } = await Tester.compile(t.code` + model ${t.model("A")} { @pattern("^[a-z]+$") prop: string; } - `, - )) as { A: Model }; + `); - const prop = A.properties.get("prop") as ModelProperty; + const prop = A.properties.get("prop")!; strictEqual(prop.kind, "ModelProperty"); - strictEqual(getPattern(runner.program, prop), "^[a-z]+$"); + strictEqual(getPattern(program, prop), "^[a-z]+$"); }); it("emit diagnostic if pattern is not a string", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model A { @pattern(123) prop: string; @@ -275,7 +210,7 @@ describe("compiler: built-in decorators", () => { }); it("emit diagnostic if pattern targe is a non-string union", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Employee { @pattern("^[a-zA-Z0-9-]{3,24}$") name: Test; @@ -291,7 +226,7 @@ describe("compiler: built-in decorators", () => { }); it("allows string union on @pattern", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Employee { @pattern("^[a-zA-Z0-9-]{3,24}$") name: Test; @@ -303,7 +238,7 @@ describe("compiler: built-in decorators", () => { }); it("emit diagnostic if pattern is not a valid RegEx", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model A { @pattern("[a-z") prop: string; @@ -316,27 +251,23 @@ describe("compiler: built-in decorators", () => { }); it("optionally allows specifying a pattern validation message", async () => { - const { A, B } = (await runner.compile( - ` - @test + const { A, B, program } = await Tester.compile(t.code` @pattern("^[a-z]+$", "Must be all lowercase.") - scalar A extends string; + scalar ${t.scalar("A")} extends string; - @test @pattern("^[a-z]+$") - scalar B extends string; - `, - )) as { A: Scalar; B: Scalar }; + scalar ${t.scalar("B")} extends string; + `); - const pattern = getPattern(runner.program, A); + const pattern = getPattern(program, A); strictEqual(pattern, "^[a-z]+$"); - const data = getPatternData(runner.program, A); + const data = getPatternData(program, A); strictEqual(data?.pattern, pattern); strictEqual(data?.validationMessage, "Must be all lowercase."); - const pattern2 = getPattern(runner.program, B); + const pattern2 = getPattern(program, B); strictEqual(pattern2, "^[a-z]+$"); - const data2 = getPatternData(runner.program, B); + const data2 = getPatternData(program, B); strictEqual(data2?.pattern, pattern2); strictEqual(data2?.validationMessage, undefined); }); @@ -344,32 +275,26 @@ describe("compiler: built-in decorators", () => { describe("@format", () => { it("applies @pattern to scalar", async () => { - const { A } = (await runner.compile( - ` - @test + const { A, program } = await Tester.compile(t.code` @format("email") - scalar A extends string; - `, - )) as { A: Scalar }; + scalar ${t.scalar("A")} extends string; + `); - strictEqual(getFormat(runner.program, A), "email"); + strictEqual(getFormat(program, A), "email"); }); it("applies @pattern to model property", async () => { - const { prop } = (await runner.compile( - ` + const { prop, program } = await Tester.compile(t.code` model A { - @test @format("email") - prop: string; + ${t.modelProperty("prop")}: string; } - `, - )) as { prop: ModelProperty }; - strictEqual(getFormat(runner.program, prop), "email"); + `); + strictEqual(getFormat(program, prop), "email"); }); it("emit diagnostic if targeting bytes", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model A { @format("email") prop: bytes; @@ -385,20 +310,16 @@ describe("compiler: built-in decorators", () => { describe("@returnsDoc", () => { it("applies @returnsDoc on operation", async () => { - const { test } = (await runner.compile( - ` - @test + const { test, program } = await Tester.compile(t.code` @returnsDoc("A string") - op test(): string; - `, - )) as { test: Operation }; + op ${t.op("test")}(): string; + `); - strictEqual(getReturnsDoc(runner.program, test), "A string"); + strictEqual(getReturnsDoc(program, test), "A string"); }); it("emit diagnostic if doc is not a string", async () => { - const diagnostics = await runner.diagnose(` - @test + const diagnostics = await Tester.diagnose(` @returnsDoc(123) op test(): string; `); @@ -411,20 +332,16 @@ describe("compiler: built-in decorators", () => { describe("@errorsDoc", () => { it("applies @errorsDoc on operation", async () => { - const { test } = (await runner.compile( - ` - @test + const { test, program } = await Tester.compile(t.code` @errorsDoc("An error") - op test(): string; - `, - )) as { test: Operation }; + op ${t.op("test")}(): string; + `); - strictEqual(getErrorsDoc(runner.program, test), "An error"); + strictEqual(getErrorsDoc(program, test), "An error"); }); it("emit diagnostic if doc is not a string", async () => { - const diagnostics = await runner.diagnose(` - @test + const diagnostics = await Tester.diagnose(` @errorsDoc(123) op test(): string; `); @@ -437,60 +354,55 @@ describe("compiler: built-in decorators", () => { describe("@friendlyName", () => { it("applies @friendlyName on model", async () => { - const { A, B } = await runner.compile(` - @test + const { A, B, program } = await Tester.compile(t.code` @friendlyName("MyNameIsA") - model A { } + model ${t.model("A")} { } - @test @friendlyName("{name}Model", B) - model B { } + model ${t.model("B")} { } @friendlyName("Templated{name}", T) model Templated { prop: T; } - `); - strictEqual(getFriendlyName(runner.program, A), "MyNameIsA"); - strictEqual(getFriendlyName(runner.program, B), "BModel"); + `); + strictEqual(getFriendlyName(program, A), "MyNameIsA"); + strictEqual(getFriendlyName(program, B), "BModel"); }); it(" @friendlyName doesn't carry over to derived models", async () => { - const { A, B } = await runner.compile(` - @test + const { A, B, program } = await Tester.compile(t.code` @friendlyName("MyNameIsA") - model A { t: T; } + model ${t.model("A")} { t: string; } - @test - model B is A { } - `); - strictEqual(getFriendlyName(runner.program, A), "MyNameIsA"); - strictEqual(getFriendlyName(runner.program, B), undefined); + model ${t.model("B")} is A { } + `); + strictEqual(getFriendlyName(program, A), "MyNameIsA"); + strictEqual(getFriendlyName(program, B), undefined); }); }); describe("@error", () => { it("applies @error on model", async () => { - const { A } = await runner.compile(` - @test + const { A, program } = await Tester.compile(t.code` @error - model A { } + model ${t.model("A")} { } `); - ok(isErrorModel(runner.program, A), "isError should be true"); + ok(isErrorModel(program, A), "isError should be true"); }); it("applies @error on derived models", async () => { - const { B, C } = await runner.compile(` + const { B, C, program } = await Tester.compile(t.code` @error model A { } - @test model B extends A { } - @test model C extends B { } + model ${t.model("B")} extends A { } + model ${t.model("C")} extends B { } `); - ok(isErrorModel(runner.program, B), "isError should be true"); - ok(isErrorModel(runner.program, C), "isError should be true"); + ok(isErrorModel(program, B), "isError should be true"); + ok(isErrorModel(program, C), "isError should be true"); }); it("emit diagnostic if error is not applied to a model", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` @error enum A { B, C } `); @@ -506,7 +418,7 @@ describe("compiler: built-in decorators", () => { describe("@key", () => { it("emits diagnostic when argument is not a string", async () => { - const diagnostics = await runner.diagnose( + const diagnostics = await Tester.diagnose( `model M { @key(4) prop: string; @@ -521,7 +433,7 @@ describe("compiler: built-in decorators", () => { }); it("emits diagnostic when not applied to model property", async () => { - const diagnostics = await runner.diagnose( + const diagnostics = await Tester.diagnose( `@key model M {}`, ); @@ -535,44 +447,42 @@ describe("compiler: built-in decorators", () => { }); it("sets key to property name by default", async () => { - const { prop } = await runner.compile( - `model M { - @test + const { prop, program } = await Tester.compile(t.code` + model M { @key - prop: string; - }`, - ); + ${t.modelProperty("prop")}: string; + } + `); strictEqual(prop.kind, "ModelProperty" as const); - strictEqual(getKeyName(runner.program, prop), "prop"); + strictEqual(getKeyName(program, prop), "prop"); }); it("sets key to alternate name when provided", async () => { - const { prop } = await runner.compile( - `model M { - @test + const { prop, program } = await Tester.compile(t.code` + model M { @key("alternateName") - prop: string; - }`, - ); + ${t.modelProperty("prop")}: string; + } + `); strictEqual(prop.kind, "ModelProperty" as const); - strictEqual(getKeyName(runner.program, prop), "alternateName"); + strictEqual(getKeyName(program, prop), "alternateName"); }); it("getKeyName returns undefined if used on property not annotated with @key", async () => { - const { prop } = await runner.compile( - `model M { - @test prop: string; - }`, - ); + const { prop, program } = await Tester.compile(t.code` + model M { + ${t.modelProperty("prop")}: string; + } + `); strictEqual(prop.kind, "ModelProperty" as const); - strictEqual(getKeyName(runner.program, prop), undefined); + strictEqual(getKeyName(program, prop), undefined); }); it("emits diagnostic when key property is marked as optional", async () => { - const diagnostics = await runner.diagnose( + const diagnostics = await Tester.diagnose( `model M { @key prop?: string; @@ -590,57 +500,52 @@ describe("compiler: built-in decorators", () => { describe("@encode", () => { it(`set encoding on scalar`, async () => { - const { s } = (await runner.compile(` + const { s, program } = await Tester.compile(t.code` @encode("rfc3339") - @test - scalar s extends utcDateTime; - `)) as { s: Scalar }; + scalar ${t.scalar("s")} extends utcDateTime; + `); - strictEqual(getEncode(runner.program, s)?.encoding, "rfc3339"); + strictEqual(getEncode(program, s)?.encoding, "rfc3339"); }); it(`set encoding on model property`, async () => { - const { prop } = (await runner.compile(` + const { prop, program } = await Tester.compile(t.code` model Foo { @encode("rfc3339") - @test - prop: utcDateTime; + ${t.modelProperty("prop")}: utcDateTime; } - `)) as { prop: ModelProperty }; + `); - strictEqual(getEncode(runner.program, prop)?.encoding, "rfc3339"); + strictEqual(getEncode(program, prop)?.encoding, "rfc3339"); }); it(`set encoding on model property of union type`, async () => { - const { prop } = (await runner.compile(` + const { prop, program } = await Tester.compile(t.code` model Foo { @encode("rfc3339") - @test - prop: utcDateTime | null; + ${t.modelProperty("prop")}: utcDateTime | null; } - `)) as { prop: ModelProperty }; + `); - strictEqual(getEncode(runner.program, prop)?.encoding, "rfc3339"); + strictEqual(getEncode(program, prop)?.encoding, "rfc3339"); }); it(`encode type default to string`, async () => { - const { s } = (await runner.compile(` + const { s, program } = await Tester.compile(t.code` @encode("rfc3339") - @test - scalar s extends utcDateTime; - `)) as { s: Scalar }; + scalar ${t.scalar("s")} extends utcDateTime; + `); - strictEqual(getEncode(runner.program, s)?.type.name, "string"); + strictEqual(getEncode(program, s)?.type.name, "string"); }); it(`change encode type`, async () => { - const { s } = (await runner.compile(` + const { s, program } = await Tester.compile(t.code` @encode("unixTimestamp", int32) - @test - scalar s extends utcDateTime; - `)) as { s: Scalar }; + scalar ${t.scalar("s")} extends utcDateTime; + `); - strictEqual(getEncode(runner.program, s)?.type.name, "int32"); + strictEqual(getEncode(program, s)?.type.name, "int32"); }); describe("known encoding validation", () => { @@ -658,7 +563,7 @@ describe("compiler: built-in decorators", () => { // Do not block unknown encoding ["utcDateTime", "custom-encoding", undefined], ["duration", "custom-encoding", "int32"], - ]; + ] as const; const invalidCases = [ [ "utcDateTime", @@ -737,13 +642,12 @@ describe("compiler: built-in decorators", () => { validCases.forEach(([target, encoding, encodeAs]) => { it(`encoding '${encoding}' on ${target} encoded as ${encodeAs ?? "string"}`, async () => { const encodeAsParam = encodeAs ? `, ${encodeAs}` : ""; - const { s } = (await runner.compile(` + const { s, program } = await Tester.compile(t.code` @encode("${encoding}"${encodeAsParam}) - @test - scalar s extends ${target}; - `)) as { s: Scalar }; + scalar ${t.scalar("s")} extends ${target}; + `); - const encodeData = getEncode(runner.program, s); + const encodeData = getEncode(program, s); ok(encodeData); strictEqual(encodeData.encoding, encoding); strictEqual(encodeData.type.name, encodeAs ?? "string"); @@ -751,13 +655,12 @@ describe("compiler: built-in decorators", () => { }); it(`@encode(string) on numeric scalar`, async () => { - const { s } = (await runner.compile(` + const { s, program } = await Tester.compile(t.code` @encode(string) - @test - scalar s extends int64; - `)) as { s: Scalar }; + scalar ${t.scalar("s")} extends int64; + `); - const encodeData = getEncode(runner.program, s); + const encodeData = getEncode(program, s); ok(encodeData); strictEqual(encodeData.encoding, undefined); strictEqual(encodeData.type.name, "string"); @@ -769,9 +672,8 @@ describe("compiler: built-in decorators", () => { encodeAs ?? "string" }`, async () => { const encodeAsParam = encodeAs ? `, ${encodeAs}` : ""; - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` @encode("${encoding}"${encodeAsParam}) - @test scalar s extends ${target}; `); expectDiagnostics(diagnostics, { @@ -783,9 +685,8 @@ describe("compiler: built-in decorators", () => { }); it(`@encode(string) on non-numeric scalar`, async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` @encode(string) - @test scalar s extends utcDateTime; `); @@ -847,81 +748,73 @@ describe("compiler: built-in decorators", () => { describe("@withoutOmittedProperties", () => { it("removes a model property when given a string literal", async () => { - const { TestModel } = await runner.compile( - ` + const { TestModel } = await Tester.compile(t.code` model OriginalModel { removeMe: string; notMe: string; } - @test - model TestModel is OmitProperties { - }`, - ); + model ${t.model("TestModel")} is OmitProperties { + } + `); - const properties = TestModel.kind === "Model" ? Array.from(TestModel.properties.keys()) : []; + const properties = Array.from(TestModel.properties.keys()); deepStrictEqual(properties, ["notMe"]); }); it("removes model properties when given a union containing strings", async () => { - const { TestModel } = await runner.compile( - ` + const { TestModel } = await Tester.compile(t.code` model OriginalModel { removeMe: string; removeMeToo: string; notMe: string; } - @test - model TestModel is OmitProperties { - }`, - ); + model ${t.model("TestModel")} is OmitProperties { + } + `); - const properties = TestModel.kind === "Model" ? Array.from(TestModel.properties.keys()) : []; + const properties = Array.from(TestModel.properties.keys()); deepStrictEqual(properties, ["notMe"]); }); }); describe("@withPickedProperties", () => { it("picks a model property when given a string literal", async () => { - const { TestModel } = await runner.compile( - ` + const { TestModel } = await Tester.compile(t.code` model OriginalModel { pickMe: string; notMe: string; } - @test - model TestModel is PickProperties { - }`, - ); + model ${t.model("TestModel")} is PickProperties { + } + `); - const properties = TestModel.kind === "Model" ? Array.from(TestModel.properties.keys()) : []; + const properties = Array.from(TestModel.properties.keys()); deepStrictEqual(properties, ["pickMe"]); }); it("picks model properties when given a union containing strings", async () => { - const { TestModel } = await runner.compile( - ` + const { TestModel } = await Tester.compile(t.code` model OriginalModel { pickMe: string; pickMeToo: string; notMe: string; } - @test - model TestModel is PickProperties { - }`, - ); + model ${t.model("TestModel")} is PickProperties { + } + `); - const properties = TestModel.kind === "Model" ? Array.from(TestModel.properties.keys()) : []; + const properties = Array.from(TestModel.properties.keys()); deepStrictEqual(properties, ["pickMe", "pickMeToo"]); }); }); describe("@overload", () => { it("emits an error when @overload is given something other than an operation", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` @overload("foo") op someStringThing(param: string): string; `); @@ -934,7 +827,7 @@ describe("compiler: built-in decorators", () => { }); it("emits an error when the overload's parameters are unrelated to the overloaded operation", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` op someThing(param: string | int32): string | int32; @overload(someThing) @@ -963,96 +856,74 @@ describe("compiler: built-in decorators", () => { }); it("can define operation overloads outside of a namespace or interface", async () => { - const compiled = (await runner.compile(` - @test - op someThing(param: string | int32): string | int32; + const { someThing, someStringThing, someNumberThing, someUnrelatedThing, program } = + await Tester.compile(t.code` + op ${t.op("someThing")}(param: string | int32): string | int32; - @test @overload(someThing) - op someStringThing(param: string): string; + op ${t.op("someStringThing")}(param: string): string; - @test @overload(someThing) - op someNumberThing(param: int32): int32; + op ${t.op("someNumberThing")}(param: int32): int32; - @test - op someUnrelatedThing(): void; - - `)) as { - someThing: Operation; - someStringThing: Operation; - someNumberThing: Operation; - someUnrelatedThing: Operation; - }; - - strictEqual(compiled.someThing.kind, "Operation"); - ok(getOverloadedOperation(runner.program, compiled.someStringThing)); - ok(getOverloadedOperation(runner.program, compiled.someNumberThing)); - ok(!getOverloadedOperation(runner.program, compiled.someThing)); - ok(!getOverloadedOperation(runner.program, compiled.someUnrelatedThing)); - const overloadedBy = getOverloads(runner.program, compiled.someThing)?.map((op) => op.name); + op ${t.op("someUnrelatedThing")}(): void; + + `); + + strictEqual(someThing.kind, "Operation"); + ok(getOverloadedOperation(program, someStringThing)); + ok(getOverloadedOperation(program, someNumberThing)); + ok(!getOverloadedOperation(program, someThing)); + ok(!getOverloadedOperation(program, someUnrelatedThing)); + const overloadedBy = getOverloads(program, someThing)?.map((op) => op.name); ok(overloadedBy?.length === 2); ok(overloadedBy?.includes("someStringThing")); ok(overloadedBy?.includes("someNumberThing")); - ok(getOverloads(runner.program, compiled.someUnrelatedThing) === undefined); + ok(getOverloads(program, someUnrelatedThing) === undefined); }); it("can overload operations defined in a namespace", async () => { - const compiled = (await runner.compile(` + const { someThing, someStringThing, someNumberThing, program } = await Tester.compile(t.code` namespace MyArea { - @test - op someThing(param: string | int32): string | int32; + op ${t.op("someThing")}(param: string | int32): string | int32; - @test @overload(someThing) - op someStringThing(param: string): string; + op ${t.op("someStringThing")}(param: string): string; - @test @overload(MyArea.someThing) - op someNumberThing(param: int32): int32; + op ${t.op("someNumberThing")}(param: int32): int32; } - `)) as { - someThing: Operation; - someStringThing: Operation; - someNumberThing: Operation; - }; - - strictEqual(compiled.someThing.kind, "Operation"); - ok(getOverloadedOperation(runner.program, compiled.someStringThing)); - ok(getOverloadedOperation(runner.program, compiled.someNumberThing)); - ok(!getOverloadedOperation(runner.program, compiled.someThing)); - const overloadedBy = getOverloads(runner.program, compiled.someThing)?.map((op) => op.name); + `); + + strictEqual(someThing.kind, "Operation"); + ok(getOverloadedOperation(program, someStringThing)); + ok(getOverloadedOperation(program, someNumberThing)); + ok(!getOverloadedOperation(program, someThing)); + const overloadedBy = getOverloads(program, someThing)?.map((op) => op.name); ok(overloadedBy?.length === 2); ok(overloadedBy?.includes("someStringThing")); ok(overloadedBy?.includes("someNumberThing")); }); it("can overload operations defined in an interface", async () => { - const compiled = (await runner.compile(` + const { someThing, someStringThing, someNumberThing, program } = await Tester.compile(t.code` interface SomeInterface { - @test - op someThing(param: string | int32): string | int32; + op ${t.op("someThing")}(param: string | int32): string | int32; - @test @overload(SomeInterface.someThing) - op someStringThing(param: string): string; + op ${t.op("someStringThing")}(param: string): string; - @test @overload(SomeInterface.someThing) - op someNumberThing(param: int32): int32; + op ${t.op("someNumberThing")}(param: int32): int32; } - `)) as { - someThing: Operation; - someStringThing: Operation; - someNumberThing: Operation; - }; - - strictEqual(compiled.someThing.kind, "Operation"); - ok(getOverloadedOperation(runner.program, compiled.someStringThing)); - ok(getOverloadedOperation(runner.program, compiled.someNumberThing)); - ok(!getOverloadedOperation(runner.program, compiled.someThing)); - const overloadedBy = getOverloads(runner.program, compiled.someThing)?.map((op) => op.name); + `); + + strictEqual(someThing.kind, "Operation"); + ok(getOverloadedOperation(program, someStringThing)); + ok(getOverloadedOperation(program, someNumberThing)); + ok(!getOverloadedOperation(program, someThing)); + const overloadedBy = getOverloads(program, someThing)?.map((op) => op.name); ok(overloadedBy?.length === 2); ok(overloadedBy?.includes("someStringThing")); ok(overloadedBy?.includes("someNumberThing")); @@ -1060,7 +931,7 @@ describe("compiler: built-in decorators", () => { describe("overloads must have the same parent as the overload base", () => { it("emit diagnostic if outside of interface", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` interface SomeInterface { someThing(param: string | int32): string | int32; } @@ -1075,7 +946,7 @@ describe("compiler: built-in decorators", () => { }); it("emit diagnostic if outside of namespace", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` namespace SomeNamespace { op someThing(param: string | int32): string | int32; } @@ -1090,7 +961,7 @@ describe("compiler: built-in decorators", () => { }); it("emit diagnostic if different interface", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` interface SomeInterface { someThing(param: string | int32): string | int32; } @@ -1107,7 +978,7 @@ describe("compiler: built-in decorators", () => { }); it("emit diagnostic if different namespace", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` namespace SomeNamespace { op someThing(param: string | int32): string | int32; } @@ -1124,7 +995,7 @@ describe("compiler: built-in decorators", () => { }); it("emit diagnostic if in an interface but base isn't", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` op someThing(param: string | int32): string | int32; interface OtherInterface { @@ -1142,176 +1013,143 @@ describe("compiler: built-in decorators", () => { describe("@secret", () => { it("can be applied on a string model", async () => { - const { A } = await runner.compile( - ` - @test + const { A, program } = await Tester.compile(t.code` @secret - scalar A extends string; - `, - ); + scalar ${t.scalar("A")} extends string; + `); - ok(isSecret(runner.program, A)); + ok(isSecret(program, A)); }); it("can be applied on a model property with string type", async () => { - const { A } = (await runner.compile( - ` - @test - model A { + const { A, program } = await Tester.compile(t.code` + model ${t.model("A")} { @secret a: string; } - `, - )) as { A: Model }; + `); - ok(isSecret(runner.program, A.properties.get("a")!)); + ok(isSecret(program, A.properties.get("a")!)); }); it("can be applied on a model property with stringlike model as type", async () => { - const { A } = (await runner.compile( - ` + const { A, program } = await Tester.compile(t.code` scalar CustomStr extends string; - @test - model A { + model ${t.model("A")} { @secret a: CustomStr; } - `, - )) as { A: Model }; + `); - ok(isSecret(runner.program, A.properties.get("a")!)); + ok(isSecret(program, A.properties.get("a")!)); }); it("can be applied on a model", async () => { - const { A } = (await runner.compile( - ` - @test + const { A, program } = await Tester.compile(t.code` @secret - model A {} - `, - )) as { A: Model }; + model ${t.model("A")} {} + `); - ok(isSecret(runner.program, A)); + ok(isSecret(program, A)); }); it("can be applied on a non-string scalar", async () => { - const { A } = await runner.compile( - ` - @test + const { A, program } = await Tester.compile(t.code` @secret - scalar A extends int32; - `, - ); + scalar ${t.scalar("A")} extends int32; + `); - ok(isSecret(runner.program, A)); + ok(isSecret(program, A)); }); it("can be applied on a model property with non-string type", async () => { - const { A } = (await runner.compile( - ` - @test - model A { + const { A, program } = await Tester.compile(t.code` + model ${t.model("A")} { @secret a: int32; } - `, - )) as { A: Model }; + `); - ok(isSecret(runner.program, A.properties.get("a")!)); + ok(isSecret(program, A.properties.get("a")!)); }); it("can be applied on a union", async () => { - const { A } = (await runner.compile( - ` - @test + const { A, program } = await Tester.compile(t.code` @secret - union A { + union ${t.union("A")} { x: string, y: int32 } - `, - )) as { A: Union }; + `); - ok(isSecret(runner.program, A)); + ok(isSecret(program, A)); }); it("can be applied on an enum", async () => { - const { A } = (await runner.compile( - ` - @test + const { A, program } = await Tester.compile(t.code` @secret - enum A { + enum ${t.enum("A")} { One: "one", Two: "two" } - `, - )) as { A: Enum }; + `); - ok(isSecret(runner.program, A)); + ok(isSecret(program, A)); }); it("can be applied on a model property with model type", async () => { - const { A } = (await runner.compile( - ` + const { A, program } = await Tester.compile(t.code` @secret model SecretModel { data: string; } - @test - model A { + model ${t.model("A")} { @secret secret: SecretModel; } - `, - )) as { A: Model }; + `); - ok(isSecret(runner.program, A.properties.get("secret")!)); + ok(isSecret(program, A.properties.get("secret")!)); }); it("can be applied on a model property with union type", async () => { - const { A } = (await runner.compile( - ` + const { A, program } = await Tester.compile(t.code` union SecretUnion { x: string, y: int32 } - @test - model A { + model ${t.model("A")} { @secret secret: SecretUnion; } - `, - )) as { A: Model }; + `); - ok(isSecret(runner.program, A.properties.get("secret")!)); + ok(isSecret(program, A.properties.get("secret")!)); }); it("can be applied on a model property with enum type", async () => { - const { A } = (await runner.compile( - ` + const { A, program } = await Tester.compile(t.code` enum SecretEnum { One: "one", Two: "two" } - @test - model A { + model ${t.model("A")} { @secret secret: SecretEnum; } - `, - )) as { A: Model }; + `); - ok(isSecret(runner.program, A.properties.get("secret")!)); + ok(isSecret(program, A.properties.get("secret")!)); }); }); describe("@discriminated", () => { it("error if more than one unnamed variant", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` @discriminated union Foo { "A", @@ -1321,12 +1159,12 @@ describe("compiler: built-in decorators", () => { expectDiagnostics(diagnostics, { code: "invalid-discriminated-union-variant", - message: `Discriminated union only allow a single default variant(Without a variant name).`, + message: `Discriminated union Foo only allow a single default variant(Without a variant name).`, }); }); it("error if using no envelope and variant name mismatch with property", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model A { kind: "a-kind", } @@ -1343,15 +1181,14 @@ describe("compiler: built-in decorators", () => { }); async function getTestDiscriminatedUnion(code: string) { - const { Foo } = (await runner.compile(code)) as { Foo: Union }; - - return getDiscriminatedUnion(runner.program, Foo)[0]!; + const { Foo, program } = (await Tester.compile(code)) as any; + return getDiscriminatedUnion(program, Foo)[0]!; } it("discriminated by default", async () => { const union = await getTestDiscriminatedUnion(` - @test @discriminated - union Foo { + @discriminated + union /*Foo*/Foo { } `); @@ -1364,8 +1201,8 @@ describe("compiler: built-in decorators", () => { it("change discriminator", async () => { const union = await getTestDiscriminatedUnion(` - @test @discriminated(#{discriminatorPropertyName: "dataKind"}) - union Foo { + @discriminated(#{discriminatorPropertyName: "dataKind"}) + union /*Foo*/Foo { } `); @@ -1378,8 +1215,8 @@ describe("compiler: built-in decorators", () => { it("change envelopePropertyName", async () => { const union = await getTestDiscriminatedUnion(` - @test @discriminated(#{envelopePropertyName: "data"}) - union Foo { + @discriminated(#{envelopePropertyName: "data"}) + union /*Foo*/Foo { } `); @@ -1392,8 +1229,8 @@ describe("compiler: built-in decorators", () => { it("set envelope: none", async () => { const union = await getTestDiscriminatedUnion(` - @test @discriminated(#{envelope: "none"}) - union Foo { + @discriminated(#{envelope: "none"}) + union /*Foo*/Foo { } `); @@ -1407,7 +1244,7 @@ describe("compiler: built-in decorators", () => { describe("@encodedName", () => { it("emit error if passing invalid mime type", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Cert { @encodedName("foo/bar/baz", "exp") expireAt: utcDateTime; @@ -1421,7 +1258,7 @@ describe("compiler: built-in decorators", () => { }); it("emit error if passing mime type with suffix", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Cert { @encodedName("application/merge-patch+json", "exp") expireAt: utcDateTime; @@ -1437,7 +1274,7 @@ describe("compiler: built-in decorators", () => { describe("detect conflicts", () => { it("emit error if encoded name is same as existing property ", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Cert { @encodedName("application/json", "exp") expireAt: utcDateTime; @@ -1453,7 +1290,7 @@ describe("compiler: built-in decorators", () => { }); it("emit error if 2 properties use the same encoded name with the same mimeType ", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Cert { @encodedName("application/json", "exp") expireAt: utcDateTime; @@ -1475,7 +1312,7 @@ describe("compiler: built-in decorators", () => { }); it("is ok if 2 different mime type have the same encoded name", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model Cert { @encodedName("application/json", "exp") expireAt: utcDateTime; @@ -1489,124 +1326,129 @@ describe("compiler: built-in decorators", () => { }); it("resolve explicit encoded name", async () => { - const { expireAt } = (await runner.compile(` + const { expireAt, program } = await Tester.compile(t.code` model Cert { @encodedName("application/json", "exp") - @test expireAt: utcDateTime; + ${t.modelProperty("expireAt")}: utcDateTime; } - `)) as { expireAt: ModelProperty }; - strictEqual(resolveEncodedName(runner.program, expireAt, "application/json"), "exp"); - strictEqual( - resolveEncodedName(runner.program, expireAt, "application/merge-patch+json"), - "exp", - ); + `); + strictEqual(resolveEncodedName(program, expireAt, "application/json"), "exp"); + strictEqual(resolveEncodedName(program, expireAt, "application/merge-patch+json"), "exp"); }); it("resolve default name if no explicit encoded name", async () => { - const { expireAt } = (await runner.compile(` + const { expireAt, program } = await Tester.compile(t.code` model Cert { @encodedName("application/json", "exp") - @test expireAt: utcDateTime; + ${t.modelProperty("expireAt")}: utcDateTime; } - `)) as { expireAt: ModelProperty }; - strictEqual(resolveEncodedName(runner.program, expireAt, "application/xml"), "expireAt"); + `); + strictEqual(resolveEncodedName(program, expireAt, "application/xml"), "expireAt"); }); }); describe("@mediaTypeHint", () => { it("returns correct media type hint for string", async () => { - const { A, B, C } = (await runner.compile(` - @test + const { A, B, C, program } = await Tester.compile(t.code` @mediaTypeHint("application/json") - scalar A extends string; + scalar ${t.scalar("A")} extends string; - @test - scalar B extends A; + scalar ${t.scalar("B")} extends A; - @test - scalar C extends string; - `)) as { A: Scalar; B: Scalar; C: Scalar }; + scalar ${t.scalar("C")} extends string; + `); - const string = runner.program.checker.getStdType("string"); + const string = program.checker.getStdType("string"); - strictEqual(getMediaTypeHint(runner.program, A), "application/json"); - strictEqual(getMediaTypeHint(runner.program, string), "text/plain"); + strictEqual(getMediaTypeHint(program, A), "application/json"); + strictEqual(getMediaTypeHint(program, string), "text/plain"); - strictEqual(getMediaTypeHint(runner.program, B), "application/json"); + strictEqual(getMediaTypeHint(program, B), "application/json"); - strictEqual(getMediaTypeHint(runner.program, C), "text/plain"); + strictEqual(getMediaTypeHint(program, C), "text/plain"); }); it("returns correct media type hint for bytes", async () => { - const { A, B, C } = (await runner.compile(` - @test + const { A, B, C, program } = await Tester.compile(t.code` @mediaTypeHint("application/json") - scalar A extends bytes; + scalar ${t.scalar("A")} extends bytes; - @test - scalar B extends A; + scalar ${t.scalar("B")} extends A; - @test - scalar C extends bytes; - `)) as { A: Scalar; B: Scalar; C: Scalar }; + scalar ${t.scalar("C")} extends bytes; + `); - strictEqual(getMediaTypeHint(runner.program, A), "application/json"); - strictEqual(getMediaTypeHint(runner.program, A.baseScalar!), "application/octet-stream"); + strictEqual(getMediaTypeHint(program, A), "application/json"); + strictEqual(getMediaTypeHint(program, A.baseScalar!), "application/octet-stream"); - strictEqual(getMediaTypeHint(runner.program, B), "application/json"); + strictEqual(getMediaTypeHint(program, B), "application/json"); - strictEqual(getMediaTypeHint(runner.program, C), "application/octet-stream"); + strictEqual(getMediaTypeHint(program, C), "application/octet-stream"); }); it("returns correct media type hint for model", async () => { - const { A, B, C, D } = (await runner.compile(` - @test - model A {} + const { A, B, C, D, program } = await Tester.compile(t.code` + model ${t.model("A")} {} - @test @mediaTypeHint("application/xml") - model B extends A {} + model ${t.model("B")} extends A {} - @test - model C extends B {} + model ${t.model("C")} extends B {} - @test @mediaTypeHint("application/json") - model D extends C {} - `)) as { A: Model; B: Model; C: Model; D: Model }; + model ${t.model("D")} extends C {} + `); - strictEqual(getMediaTypeHint(runner.program, A), undefined); - strictEqual(getMediaTypeHint(runner.program, B), "application/xml"); - strictEqual(getMediaTypeHint(runner.program, C), "application/xml"); - strictEqual(getMediaTypeHint(runner.program, D), "application/json"); + strictEqual(getMediaTypeHint(program, A), undefined); + strictEqual(getMediaTypeHint(program, B), "application/xml"); + strictEqual(getMediaTypeHint(program, C), "application/xml"); + strictEqual(getMediaTypeHint(program, D), "application/json"); }); it("returns correct media type hint for enum", async () => { - const { A, B } = (await runner.compile(` - @test - enum A { a, b } + const { A, B, program } = await Tester.compile(t.code` + enum ${t.enum("A")} { a, b } - @test @mediaTypeHint("application/json") - enum B { a, b } - `)) as { A: Enum; B: Enum }; + enum ${t.enum("B")} { a, b } + `); - strictEqual(getMediaTypeHint(runner.program, A), undefined); - strictEqual(getMediaTypeHint(runner.program, B), "application/json"); + strictEqual(getMediaTypeHint(program, A), undefined); + strictEqual(getMediaTypeHint(program, B), "application/json"); }); it("returns correct media type hint for union", async () => { - const { A, B } = (await runner.compile(` + const { A, B, program } = await Tester.compile(t.code` + union ${t.union("A")} {} + + @mediaTypeHint("text/plain") + union ${t.union("B")} {} + `); + + strictEqual(getMediaTypeHint(program, A), undefined); + strictEqual(getMediaTypeHint(program, B), "text/plain"); + }); + + it("can set media type hint programmatically", async () => { + const { A, program } = await Tester.compile(t.code` @test - union A {} + model ${t.model("A")} {} + `); + + strictEqual(getMediaTypeHint(program, A), undefined); + setMediaTypeHint(program, A, "application/merge-patch+json"); + strictEqual(getMediaTypeHint(program, A), "application/merge-patch+json"); + }); + it("validates media type when set programmatically", async () => { + const { A, program } = await Tester.compile(t.code` @test - @mediaTypeHint("text/plain") - union B {} - `)) as { A: Union; B: Union }; + model ${t.model("A")} {} + `); - strictEqual(getMediaTypeHint(runner.program, A), undefined); - strictEqual(getMediaTypeHint(runner.program, B), "text/plain"); + expect(() => setMediaTypeHint(program, A, "not-a-mime-type")).toThrow( + "Invalid MIME type 'not-a-mime-type' provided to setMediaTypeHint", + ); }); }); }); diff --git a/packages/compiler/test/decorators/examples.test.ts b/packages/compiler/test/decorators/examples.test.ts index 141e05655cf..69845247cc8 100644 --- a/packages/compiler/test/decorators/examples.test.ts +++ b/packages/compiler/test/decorators/examples.test.ts @@ -1,44 +1,37 @@ import { ok } from "assert"; import { describe, expect, it } from "vitest"; import { Operation, getExamples, getOpExamples, serializeValueAsJson } from "../../src/index.js"; -import { expectDiagnostics } from "../../src/testing/expect.js"; -import { createTestRunner } from "../../src/testing/test-host.js"; +import { expectDiagnostics } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; async function getExamplesFor(code: string) { - const runner = await createTestRunner(); - const { test } = await runner.compile(code); + const { test, program } = (await Tester.compile(code)) as any; - ok(test, "Expect to have @test type named test."); + ok(test, "Expect to have /*test*/ marker in code."); return { - program: runner.program, + program, target: test, - examples: getExamples(runner.program, test as any), + examples: getExamples(program, test as any), }; } async function getOpExamplesFor(code: string) { - const runner = await createTestRunner(); - const { test } = (await runner.compile(code)) as { test: Operation }; + const { test, program } = (await Tester.compile(code)) as any; - ok(test, "Expect to have @test type named test."); + ok(test, "Expect to have /*test*/ marker in code."); return { - program: runner.program, - target: test, - examples: getOpExamples(runner.program, test as any), + program, + target: test as Operation, + examples: getOpExamples(program, test as any), }; } -async function diagnoseCode(code: string) { - const runner = await createTestRunner(); - return await runner.diagnose(code); -} - describe("@example", () => { describe("model", () => { it("valid", async () => { const { program, examples, target } = await getExamplesFor(` @example(#{ a: 1, b: 2 }) - @test model test { + model /*test*/test { a: int32; b: int32; } @@ -49,9 +42,9 @@ describe("@example", () => { it("use const with type of model", async () => { const { program, examples, target } = await getExamplesFor(` - const example: Test = #{ a: 1, b: 2 }; + const example: test = #{ a: 1, b: 2 }; @example(example) - @test("test") model Test { + model /*test*/test { a: int32; b: int32; } @@ -61,9 +54,9 @@ describe("@example", () => { }); it("emit diagnostic for missing property", async () => { - const diagnostics = await diagnoseCode(` + const diagnostics = await Tester.diagnose(` @example(#{ a: 1 }) - @test model test { + model test { a: int32; b: int32; } @@ -79,7 +72,7 @@ describe("@example", () => { const { program, examples, target } = await getExamplesFor(` model TestModel { @example(1) - @test test: int32; + /*test*/test: int32; b: int32; } `); @@ -88,10 +81,10 @@ describe("@example", () => { }); it("emit diagnostic for unassignable value", async () => { - const diagnostics = await diagnoseCode(` + const diagnostics = await Tester.diagnose(` model TestModel { @example("abc") - @test test: int32; + test: int32; b: int32; } `); @@ -105,7 +98,7 @@ describe("@example", () => { it("valid", async () => { const { program, examples, target } = await getExamplesFor(` @example(test.fromISO("11:32")) - @test scalar test extends utcDateTime; + scalar /*test*/test extends utcDateTime; `); expect(examples).toHaveLength(1); expect(serializeValueAsJson(program, examples[0].value, target)).toEqual("11:32"); @@ -115,28 +108,50 @@ describe("@example", () => { const { program, examples, target } = await getExamplesFor(` const example: test = test.fromISO("11:32"); @example(example) - @test scalar test extends utcDateTime; + scalar /*test*/test extends utcDateTime; `); expect(examples).toHaveLength(1); expect(serializeValueAsJson(program, examples[0].value, target)).toEqual("11:32"); }); it("emit diagnostic for unassignable value", async () => { - const diagnostics = await diagnoseCode(` + const diagnostics = await Tester.diagnose(` @example("11:32") - @test scalar test extends utcDateTime; + scalar test extends utcDateTime; `); expectDiagnostics(diagnostics, { code: "unassignable", }); }); + + it("returns undefined for custom scalar with no-argument initializer", async () => { + const { program, examples, target } = await getExamplesFor(` + @example(test.i()) + scalar /*test*/test { + init i(); + } + `); + expect(examples).toHaveLength(1); + expect(serializeValueAsJson(program, examples[0].value, target)).toBeUndefined(); + }); + + it("returns undefined for custom scalar with string-argument initializer", async () => { + const { program, examples, target } = await getExamplesFor(` + @example(test.name("Shorty")) + scalar /*test*/test { + init name(value: string); + } + `); + expect(examples).toHaveLength(1); + expect(serializeValueAsJson(program, examples[0].value, target)).toBeUndefined(); + }); }); describe("enum", () => { it("valid", async () => { const { program, examples, target } = await getExamplesFor(` @example(test.a) - @test enum test { + enum /*test*/test { a, b, } @@ -147,9 +162,9 @@ describe("@example", () => { it("use const with type of enum", async () => { const { program, examples, target } = await getExamplesFor(` - const example: Test = Test.a; + const example: test = test.a; @example(example) - @test("test") enum Test { + enum /*test*/test { a, b, } @@ -159,9 +174,9 @@ describe("@example", () => { }); it("emit diagnostic for unassignable value", async () => { - const diagnostics = await diagnoseCode(` + const diagnostics = await Tester.diagnose(` @example(1) - @test enum test { + enum test { a, b, } @@ -176,7 +191,7 @@ describe("@example", () => { it("valid for union member reference", async () => { const { program, examples, target } = await getExamplesFor(` @example(test.a) - @test union test {a: "a", b: "b"} + union /*test*/test {a: "a", b: "b"} `); expect(examples).toHaveLength(1); expect(serializeValueAsJson(program, examples[0].value, target)).toEqual("a"); @@ -197,7 +212,7 @@ describe("@example", () => { type: "a", a: "a string", }) - @test union test {a: A, b: B} + union /*test*/test {a: A, b: B} `); expect(examples).toHaveLength(1); expect(serializeValueAsJson(program, examples[0].value, target)).toEqual({ @@ -207,9 +222,9 @@ describe("@example", () => { }); it("emit diagnostic for unassignable value", async () => { - const diagnostics = await diagnoseCode(` + const diagnostics = await Tester.diagnose(` @example(1) - @test union test {a: "a", b: "b"} + union test {a: "a", b: "b"} `); expectDiagnostics(diagnostics, { code: "unassignable", @@ -218,7 +233,7 @@ describe("@example", () => { }); it("emit diagnostic if used on Operation", async () => { - const diagnostics = await diagnoseCode(` + const diagnostics = await Tester.diagnose(` @example(1) op test(): void; `); @@ -239,7 +254,7 @@ describe("@opExample", () => { returnType: #{ id: "some", name: "Fluffy" }, } ) - @test op test(...Pet): Pet; + op /*test*/test(...Pet): Pet; `); expect(examples).toHaveLength(1); ok(examples[0].parameters); @@ -263,7 +278,7 @@ describe("@opExample", () => { parameters: #{ id: "some", name: "Fluffy" }, } ) - @test op test(...Pet): void; + op /*test*/test(...Pet): void; `); expect(examples).toHaveLength(1); ok(examples[0].parameters); @@ -282,7 +297,7 @@ describe("@opExample", () => { returnType: #{ id: "some", name: "Fluffy" }, } ) - @test op test(): Pet; + op /*test*/test(): Pet; `); expect(examples).toHaveLength(1); ok(examples[0].parameters === undefined); @@ -326,7 +341,7 @@ describe("@opExample", () => { @opExample(#{ returnType: #{ type: "BAR" } }) @opExample(#{ returnType: #{ type: "ONE" } }) @opExample(#{ returnType: #{ type: "TWO" } }) - @test op test(): FooOrBar | OneOrTwo; + op /*test*/test(): FooOrBar | OneOrTwo; `); expect(examples).toHaveLength(4); @@ -349,14 +364,14 @@ describe("@opExample", () => { }); it("emit diagnostic for unassignable value", async () => { - const diagnostics = await diagnoseCode(` + const diagnostics = await Tester.diagnose(` model Pet { id: string; name: string; } @opExample( #{ returnType: #{ id: 123, name: "Fluffy" }, } ) - @test op read(): Pet; + op read(): Pet; `); expectDiagnostics(diagnostics, { code: "unassignable", @@ -375,7 +390,7 @@ describe("json serialization of examples", () => { @example(#{ expireIn: 1 }) - @test model test { + model /*test*/test { @encodedName("application/json", "exp") expireIn: int32 } @@ -477,7 +492,7 @@ describe("json serialization of examples", () => { model TestModel { @example(${value}) ${encode ?? ""} - @test test: ${type}; + /*test*/test: ${type}; } `); if (expected instanceof RegExp) { @@ -493,7 +508,7 @@ describe("json serialization of examples", () => { it("serialize models with parent", async () => { const result = await getJsonValueOfExample(` @example(#{ a: "one", b: "two" }) - @test("test") model B extends A { + model /*test*/test extends A { b: string; } @@ -509,7 +524,7 @@ describe("json serialization of examples", () => { it("serialize nested models", async () => { const result = await getJsonValueOfExample(` @example(#{ a: #{ name: "one" } }) - @test("test") model B { + model /*test*/test { a: A; } @@ -525,7 +540,7 @@ describe("json serialization of examples", () => { it("serialize nested models in arrays", async () => { const result = await getJsonValueOfExample(` @example(#{ items: #[#{ name: "one" }, #{ name: "two" }] }) - @test("test") model B { + model /*test*/test { items: Array; } @@ -541,7 +556,7 @@ describe("json serialization of examples", () => { it("serialize nested record in arrays", async () => { const result = await getJsonValueOfExample(` @example(#{ items: #{one: #{ name: "one" }, two: #{ name: "two" }} }) - @test("test") model B { + model /*test*/test { items: Record; } @@ -557,7 +572,7 @@ describe("json serialization of examples", () => { it("serialize example as it is when type is unknown", async () => { const result = await getJsonValueOfExample(` @example(#{ a: #{ name: "one", other: 123 } }) - @test("test") model B { + model /*test*/test { a: unknown } `); @@ -568,7 +583,7 @@ describe("json serialization of examples", () => { it("serialize example targetting a union using one of the types", async () => { const result = await getJsonValueOfExample(` @example(#{ a: #{ name: "one", other: 123 } }) - @test("test") model Test { + model /*test*/test { a: A | B; } diff --git a/packages/compiler/test/decorators/paging.test.ts b/packages/compiler/test/decorators/paging.test.ts index 6174445cd30..b296859401a 100644 --- a/packages/compiler/test/decorators/paging.test.ts +++ b/packages/compiler/test/decorators/paging.test.ts @@ -1,18 +1,12 @@ -import { beforeEach, describe, expect, it } from "vitest"; -import { ignoreDiagnostics, ModelProperty, Operation } from "../../src/index.js"; +import { describe, expect, it } from "vitest"; +import { ignoreDiagnostics } from "../../src/index.js"; import { getPagingOperation, PagingOperation } from "../../src/lib/paging.js"; import { expectDiagnosticEmpty, expectDiagnostics } from "../../src/testing/expect.js"; -import { createTestRunner } from "../../src/testing/test-host.js"; -import { BasicTestRunner } from "../../src/testing/types.js"; - -let runner: BasicTestRunner; - -beforeEach(async () => { - runner = await createTestRunner(); -}); +import { t } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; it("emit conflict diagnostic if annotating property with different paging property marker", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` @list op list(): { @pageItems items: string[]; @nextLink @prevLink next: string; @@ -26,7 +20,7 @@ it("emit conflict diagnostic if annotating property with different paging proper }); it("emit error if missing pageItems property", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` @list op list(): { items: string[]; @nextLink next: string; @@ -40,7 +34,7 @@ it("emit error if missing pageItems property", async () => { }); it("identifies inherited paging properties", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model ListTestResult { @pageItems values: string[]; @@ -54,7 +48,7 @@ it("identifies inherited paging properties", async () => { }); it("@list decorator handle recursive models without infinite loop", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model MyPage { selfRef?: MyPage; @pageItems items: string[]; @@ -73,7 +67,7 @@ describe("emit conflict diagnostic if multiple properties are annotated with the ["pageIndex", "int32"], ["continuationToken", "string"], ])("@%s", async (name, type) => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` @list op list( @${name} prop1: ${type}; @${name} prop2: ${type}; @@ -100,7 +94,7 @@ describe("emit conflict diagnostic if multiple properties are annotated with the ["continuationToken", "string"], ["pageItems", "string[]"], ])("@%s", async (name, type) => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` @list op list(): { @${name} next: ${type}; @${name} nextToo: ${type}; @@ -128,13 +122,13 @@ describe("collect paging properties", () => { ["pageIndex", "int32"], ["continuationToken", "string"], ])("@%s", async (name, type) => { - const { list, prop } = (await runner.compile(` - @list @test op list( - @${name} @test prop: ${type}; + const { list, prop, program } = await Tester.compile(t.code` + @list op ${t.op("list")}( + @${name} ${t.modelProperty("prop")}: ${type}; ): { @pageItems items: string[] }; - `)) as { list: Operation; prop: ModelProperty }; + `); - const paging = ignoreDiagnostics(getPagingOperation(runner.program, list)); + const paging = ignoreDiagnostics(getPagingOperation(program, list)); expect(paging?.input).toHaveProperty(name); expect(paging?.input[name as keyof PagingOperation["input"]]!.property).toBe(prop); }); @@ -147,14 +141,14 @@ describe("collect paging properties", () => { ["continuationToken", "string"], ["pageItems", "string[]"], ])("@%s", async (name, type) => { - const { list, prop } = (await runner.compile(` - @list @test op list(): { - @${name} @test prop: ${type}; + const { list, prop, program } = await Tester.compile(t.code` + @list op ${t.op("list")}(): { + @${name} ${t.modelProperty("prop")}: ${type}; ${name !== "pageItems" ? "@pageItems items: string[];" : ""} }; - `)) as { list: Operation; prop: ModelProperty }; + `); - const paging = ignoreDiagnostics(getPagingOperation(runner.program, list)); + const paging = ignoreDiagnostics(getPagingOperation(program, list)); expect(paging?.output).toHaveProperty(name); expect(paging?.output[name as keyof PagingOperation["output"]]!.property).toBe(prop); }); @@ -167,13 +161,13 @@ describe("collect nested paging properties", () => { ["pageIndex", "int32"], ["continuationToken", "string"], ])("@%s", async (name, type) => { - const { list, prop } = (await runner.compile(` - @list @test op list( - @${name} @test prop: ${type}; + const { list, prop, program } = await Tester.compile(t.code` + @list op ${t.op("list")}( + @${name} ${t.modelProperty("prop")}: ${type}; ): { @pageItems items: string[] }; - `)) as { list: Operation; prop: ModelProperty }; + `); - const paging = ignoreDiagnostics(getPagingOperation(runner.program, list)); + const paging = ignoreDiagnostics(getPagingOperation(program, list)); expect(paging?.input).toHaveProperty(name); expect(paging?.input[name as keyof PagingOperation["input"]]!.property).toBe(prop); }); @@ -185,14 +179,14 @@ describe("collect nested paging properties", () => { ["lastLink", "string"], ["continuationToken", "string"], ])("@%s", async (name, type) => { - const { list, prop } = (await runner.compile(` - @list @test op list(): { - @test results : { @pageItems items: string[]; }; - @test pagination: { @${name} @test prop: ${type} }; + const { list, prop, program } = await Tester.compile(t.code` + @list op ${t.op("list")}(): { + results : { @pageItems items: string[]; }; + pagination: { @${name} ${t.modelProperty("prop")}: ${type} }; }; - `)) as { list: Operation; prop: ModelProperty; items: ModelProperty }; + `); - const paging = ignoreDiagnostics(getPagingOperation(runner.program, list)); + const paging = ignoreDiagnostics(getPagingOperation(program, list)); expect(paging?.output).toHaveProperty(name); expect(paging?.output[name as keyof PagingOperation["output"]]!.property).toBe(prop); const pathString = paging?.output[name as keyof PagingOperation["output"]]!.path.map( @@ -202,14 +196,91 @@ describe("collect nested paging properties", () => { }); it("nested @pageItem", async () => { - const { list } = (await runner.compile(` - @list @test op list(): { - @test results : { @pageItems items: string[]; }; + const { list, program } = await Tester.compile(t.code` + @list op ${t.op("list")}(): { + results : { @pageItems items: string[]; }; }; - `)) as { list: Operation; items: ModelProperty }; + `); - const paging = ignoreDiagnostics(getPagingOperation(runner.program, list)); + const paging = ignoreDiagnostics(getPagingOperation(program, list)); const pathString = paging?.output["pageItems"]!.path.map((p) => p.name).join("."); expect(pathString).toBe("results.items"); }); }); + +describe("@continuationToken supports nullable and optional properties", () => { + it("accepts nullable string type (string | null)", async () => { + const diagnostics = await Tester.diagnose(` + @list op list(): { + @pageItems items: string[]; + @continuationToken token: string | null; + }; + `); + expectDiagnosticEmpty(diagnostics); + }); + + it("accepts optional string type", async () => { + const diagnostics = await Tester.diagnose(` + @list op list(): { + @pageItems items: string[]; + @continuationToken token?: string; + }; + `); + expectDiagnosticEmpty(diagnostics); + }); + + it("accepts nullable optional string type", async () => { + const diagnostics = await Tester.diagnose(` + @list op list(): { + @pageItems items: string[]; + @continuationToken token?: string | null; + }; + `); + expectDiagnosticEmpty(diagnostics); + }); + + it("accepts non-string types", async () => { + const diagnostics = await Tester.diagnose(` + @list op list(): { + @pageItems items: string[]; + @continuationToken token: int32; + }; + `); + expectDiagnosticEmpty(diagnostics); + }); + + it("collects nullable continuation token in input", async () => { + const { list, token, program } = await Tester.compile(t.code` + @list op ${t.op("list")}( + @continuationToken ${t.modelProperty("token")}: string | null + ): { @pageItems items: string[] }; + `); + + const paging = ignoreDiagnostics(getPagingOperation(program, list)); + expect(paging?.input.continuationToken?.property).toBe(token); + }); + + it("collects nullable continuation token in output", async () => { + const { list, token, program } = await Tester.compile(t.code` + @list op ${t.op("list")}(): { + @pageItems items: string[]; + @continuationToken ${t.modelProperty("token")}: string | null; + }; + `); + + const paging = ignoreDiagnostics(getPagingOperation(program, list)); + expect(paging?.output.continuationToken?.property).toBe(token); + }); + + it("collects optional continuation token", async () => { + const { list, token, program } = await Tester.compile(t.code` + @list op ${t.op("list")}(): { + @pageItems items: string[]; + @continuationToken ${t.modelProperty("token")}?: string; + }; + `); + + const paging = ignoreDiagnostics(getPagingOperation(program, list)); + expect(paging?.output.continuationToken?.property).toBe(token); + }); +}); diff --git a/packages/compiler/test/decorators/range-limits.test.ts b/packages/compiler/test/decorators/range-limits.test.ts index 0ed993e0cac..7c5115bbaf1 100644 --- a/packages/compiler/test/decorators/range-limits.test.ts +++ b/packages/compiler/test/decorators/range-limits.test.ts @@ -1,5 +1,5 @@ import { ok, strictEqual } from "assert"; -import { beforeEach, describe, expect, it } from "vitest"; +import { describe, expect, it } from "vitest"; import { getMaxItems, getMaxLength, @@ -11,82 +11,69 @@ import { getMinValueForScalar, } from "../../src/core/intrinsic-type-state.js"; import { Numeric } from "../../src/core/numeric.js"; -import { Model, ScalarValue } from "../../src/core/types.js"; -import { - BasicTestRunner, - createTestRunner, - expectDiagnostics, - t, -} from "../../src/testing/index.js"; +import { ScalarValue } from "../../src/core/types.js"; +import { expectDiagnostics, t } from "../../src/testing/index.js"; import { Tester } from "../tester.js"; describe("compiler: range limiting decorators", () => { - let runner: BasicTestRunner; - - beforeEach(async () => { - runner = await createTestRunner(); - }); - it("applies @minimum and @maximum decorators", async () => { - const { A, B } = (await runner.compile( - ` - @test model A { @minValue(15) foo: int32; @maxValue(55) boo: float32; } - @test model B { @maxValue(20) bar: int64; @minValue(23) car: float64; } - `, - )) as { A: Model; B: Model }; - - strictEqual(getMinValue(runner.program, A.properties.get("foo")!), 15); - strictEqual(getMaxValue(runner.program, A.properties.get("boo")!), 55); - strictEqual(getMaxValue(runner.program, B.properties.get("bar")!), 20); - strictEqual(getMinValue(runner.program, B.properties.get("car")!), 23); + const { A, B, program } = await Tester.compile(t.code` + model ${t.model("A")} { @minValue(15) foo: int32; @maxValue(55) boo: float32; } + model ${t.model("B")} { @maxValue(20) bar: int64; @minValue(23) car: float64; } + `); + + strictEqual(getMinValue(program, A.properties.get("foo")!), 15); + strictEqual(getMaxValue(program, A.properties.get("boo")!), 55); + strictEqual(getMaxValue(program, B.properties.get("bar")!), 20); + strictEqual(getMinValue(program, B.properties.get("car")!), 23); }); describe("@minValue, @maxValue", () => { it("applies on ints", async () => { - const { Foo } = (await runner.compile(` - @test model Foo { + const { Foo, program } = await Tester.compile(t.code` + model ${t.model("Foo")} { @minValue(2) @maxValue(10) floor: int32; } - `)) as { Foo: Model }; + `); const floorProp = Foo.properties.get("floor")!; - strictEqual(getMinValue(runner.program, floorProp), 2); - strictEqual(getMaxValue(runner.program, floorProp), 10); + strictEqual(getMinValue(program, floorProp), 2); + strictEqual(getMaxValue(program, floorProp), 10); }); it("applies on float", async () => { - const { Foo } = (await runner.compile(` - @test model Foo { + const { Foo, program } = await Tester.compile(t.code` + model ${t.model("Foo")} { @minValue(2.5) @maxValue(32.9) percent: float64; } - `)) as { Foo: Model }; + `); const percentProp = Foo.properties.get("percent")!; - strictEqual(getMinValue(runner.program, percentProp), 2.5); - strictEqual(getMaxValue(runner.program, percentProp), 32.9); + strictEqual(getMinValue(program, percentProp), 2.5); + strictEqual(getMaxValue(program, percentProp), 32.9); }); it("applies on nullable numeric", async () => { - const { Foo } = (await runner.compile(` - @test model Foo { + const { Foo, program } = await Tester.compile(t.code` + model ${t.model("Foo")} { @minValue(2.5) @maxValue(32.9) percent: float64 | null; } - `)) as { Foo: Model }; + `); const percentProp = Foo.properties.get("percent")!; - strictEqual(getMinValue(runner.program, percentProp), 2.5); - strictEqual(getMaxValue(runner.program, percentProp), 32.9); + strictEqual(getMinValue(program, percentProp), 2.5); + strictEqual(getMaxValue(program, percentProp), 32.9); }); it("emit diagnostic if @minValue used on non numeric type", async () => { - const diagnostics = await runner.diagnose(` - @test model Foo { + const diagnostics = await Tester.diagnose(` + model Foo { @minValue(2) name: string; } @@ -98,8 +85,8 @@ describe("compiler: range limiting decorators", () => { }); it("emit diagnostic if @maxValue used on non numeric type", async () => { - const diagnostics = await runner.diagnose(` - @test model Foo { + const diagnostics = await Tester.diagnose(` + model Foo { @maxValue(2) name: string; } @@ -111,8 +98,8 @@ describe("compiler: range limiting decorators", () => { }); it("emit diagnostic if @minValue is more than @maxValue", async () => { - const diagnostics = await runner.diagnose(` - @test model Foo { + const diagnostics = await Tester.diagnose(` + model Foo { @minValue(3) @maxValue(2) name: int32; @@ -233,36 +220,36 @@ describe("compiler: range limiting decorators", () => { describe("@minLength, @maxLength", () => { it("applies @minLength and @maxLength decorators on strings", async () => { - const { Foo } = (await runner.compile(` - @test model Foo { + const { Foo, program } = await Tester.compile(t.code` + model ${t.model("Foo")} { @minLength(2) @maxLength(10) name: string; } - `)) as { Foo: Model }; + `); const nameProp = Foo.properties.get("name")!; - strictEqual(getMinLength(runner.program, nameProp), 2); - strictEqual(getMaxLength(runner.program, nameProp), 10); + strictEqual(getMinLength(program, nameProp), 2); + strictEqual(getMaxLength(program, nameProp), 10); }); it("applies @minLength and @maxLength decorators on nullable strings", async () => { - const { Foo } = (await runner.compile(` - @test model Foo { + const { Foo, program } = await Tester.compile(t.code` + model ${t.model("Foo")} { @minLength(2) @maxLength(10) name: string | null; } - `)) as { Foo: Model }; + `); const nameProp = Foo.properties.get("name")!; - strictEqual(getMinLength(runner.program, nameProp), 2); - strictEqual(getMaxLength(runner.program, nameProp), 10); + strictEqual(getMinLength(program, nameProp), 2); + strictEqual(getMaxLength(program, nameProp), 10); }); it("emit diagnostic if @minLength used on non string", async () => { - const diagnostics = await runner.diagnose(` - @test model Foo { + const diagnostics = await Tester.diagnose(` + model Foo { @minLength(2) name: int32; } @@ -274,8 +261,8 @@ describe("compiler: range limiting decorators", () => { }); it("emit diagnostic if @maxLength used on non string", async () => { - const diagnostics = await runner.diagnose(` - @test model Foo { + const diagnostics = await Tester.diagnose(` + model Foo { @maxLength(2) name: int32; } @@ -287,8 +274,8 @@ describe("compiler: range limiting decorators", () => { }); it("emit diagnostic if @minLength is more than @maxLength", async () => { - const diagnostics = await runner.diagnose(` - @test model Foo { + const diagnostics = await Tester.diagnose(` + model Foo { @minLength(3) @maxLength(2) name: string; @@ -303,36 +290,36 @@ describe("compiler: range limiting decorators", () => { describe("@minItems, @maxItems", () => { it("applies @minItems and @maxItems decorators on arrays", async () => { - const { Foo } = (await runner.compile(` - @test model Foo { + const { Foo, program } = await Tester.compile(t.code` + model ${t.model("Foo")} { @minItems(2) @maxItems(10) items: int32[]; } - `)) as { Foo: Model }; + `); const itemsProp = Foo.properties.get("items")!; - strictEqual(getMinItems(runner.program, itemsProp), 2); - strictEqual(getMaxItems(runner.program, itemsProp), 10); + strictEqual(getMinItems(program, itemsProp), 2); + strictEqual(getMaxItems(program, itemsProp), 10); }); it("applies @minItems and @maxItems decorators on nullable arrays", async () => { - const { Foo } = (await runner.compile(` - @test model Foo { + const { Foo, program } = await Tester.compile(t.code` + model ${t.model("Foo")} { @minItems(2) @maxItems(10) items: int32[] | null; } - `)) as { Foo: Model }; + `); const itemsProp = Foo.properties.get("items")!; - strictEqual(getMinItems(runner.program, itemsProp), 2); - strictEqual(getMaxItems(runner.program, itemsProp), 10); + strictEqual(getMinItems(program, itemsProp), 2); + strictEqual(getMaxItems(program, itemsProp), 10); }); it("emit diagnostic if @minItems used on non array", async () => { - const diagnostics = await runner.diagnose(` - @test model Foo { + const diagnostics = await Tester.diagnose(` + model Foo { @minItems(2) items: int32; } @@ -344,8 +331,8 @@ describe("compiler: range limiting decorators", () => { }); it("emit diagnostic if @maxItems used on non array", async () => { - const diagnostics = await runner.diagnose(` - @test model Foo { + const diagnostics = await Tester.diagnose(` + model Foo { @maxItems(2) items: int32; } @@ -357,8 +344,8 @@ describe("compiler: range limiting decorators", () => { }); it("emit diagnostic if @minItems is more than @maxItems", async () => { - const diagnostics = await runner.diagnose(` - @test model Foo { + const diagnostics = await Tester.diagnose(` + model Foo { @minItems(3) @maxItems(2) items: string[]; diff --git a/packages/compiler/test/decorators/service.test.ts b/packages/compiler/test/decorators/service.test.ts index f8081e49a42..cfd7864ba32 100644 --- a/packages/compiler/test/decorators/service.test.ts +++ b/packages/compiler/test/decorators/service.test.ts @@ -1,65 +1,60 @@ import { deepStrictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; -import { Namespace, getService, listServices } from "../../src/index.js"; -import { BasicTestRunner, createTestRunner, expectDiagnostics } from "../../src/testing/index.js"; +import { describe, it } from "vitest"; +import { getService, listServices } from "../../src/index.js"; +import { expectDiagnostics, t } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; describe("compiler: service", () => { - let runner: BasicTestRunner; - - beforeEach(async () => { - runner = await createTestRunner(); - }); - it("allows no services", async () => { - await runner.compile(` + const { program } = await Tester.compile(t.code` op test(): string; `); - deepStrictEqual(listServices(runner.program), []); + deepStrictEqual(listServices(program), []); }); it("allows a single service", async () => { - const { S } = await runner.compile(` - @test @service namespace S {} + const { S, program } = await Tester.compile(t.code` + @service namespace ${t.namespace("S")} {} `); - deepStrictEqual(listServices(runner.program), [{ type: S }]); + deepStrictEqual(listServices(program), [{ type: S }]); }); it("get a service", async () => { - const { S1, S2 } = (await runner.compile(` - @test @service namespace S1 {} + const { S1, S2, program } = await Tester.compile(t.code` + @service namespace ${t.namespace("S1")} {} - @test @service namespace S2 {} - `)) as { S1: Namespace; S2: Namespace }; + @service namespace ${t.namespace("S2")} {} + `); - deepStrictEqual(getService(runner.program, S1), { type: S1 }); - deepStrictEqual(getService(runner.program, S2), { type: S2 }); + deepStrictEqual(getService(program, S1), { type: S1 }); + deepStrictEqual(getService(program, S2), { type: S2 }); }); it("allows multiple services", async () => { - const { S1, S2 } = await runner.compile(` - @test @service namespace S1 {} + const { S1, S2, program } = await Tester.compile(t.code` + @service namespace ${t.namespace("S1")} {} - @test @service namespace S2 {} + @service namespace ${t.namespace("S2")} {} `); - deepStrictEqual(listServices(runner.program), [{ type: S1 }, { type: S2 }]); + deepStrictEqual(listServices(program), [{ type: S1 }, { type: S2 }]); }); it("customize service title", async () => { - const { S } = await runner.compile(` - @test @service(#{title: "My Service"}) namespace S {} + const { S, program } = await Tester.compile(t.code` + @service(#{title: "My Service"}) namespace ${t.namespace("S")} {} `); - deepStrictEqual(listServices(runner.program), [{ type: S, title: "My Service" }]); + deepStrictEqual(listServices(program), [{ type: S, title: "My Service" }]); }); it("emit diagnostic if service title is not a string", async () => { - const diagnostics = await runner.diagnose(` - @test @service(#{title: 123}) namespace S {} + const diagnostics = await Tester.diagnose(` + @service(#{title: 123}) namespace S {} `); expectDiagnostics(diagnostics, { @@ -70,7 +65,7 @@ describe("compiler: service", () => { }); it("emit diagnostic if service is used on a non namespace", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` @service model S {} `); diff --git a/packages/compiler/test/decorators/tags.test.ts b/packages/compiler/test/decorators/tags.test.ts index bce4a17f8f5..c2956f5efb6 100644 --- a/packages/compiler/test/decorators/tags.test.ts +++ b/packages/compiler/test/decorators/tags.test.ts @@ -1,93 +1,64 @@ import { deepStrictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; -import { Interface, Namespace, Operation } from "../../src/core/types.js"; +import { describe, it } from "vitest"; import { getAllTags } from "../../src/lib/decorators.js"; -import { TestHost, createTestHost } from "../../src/testing/index.js"; +import { t } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; describe("compiler: tag decorator", () => { - let testHost: TestHost; - - beforeEach(async () => { - testHost = await createTestHost(); - }); - it("applies @tag decorator to namespaces, interfaces, and operations", async (): Promise => { - testHost.addTypeSpecFile( - "main.tsp", - ` - @test + const { + OpNamespace, + OpInterface, + NamespaceOperation, + UntaggedInterface, + InterfaceOperation, + TaggedOperation, + RecursiveNamespace, + RecursiveInterface, + RecursiveOperation, + program, + } = await Tester.compile(t.code` @tag("namespace") - namespace OpNamespace { - @test + namespace ${t.namespace("OpNamespace")} { @tag("namespaceOp") - op NamespaceOperation(): string; + op ${t.op("NamespaceOperation")}(): string; } - @test @tag("interface") - interface OpInterface { - @test + interface ${t.interface("OpInterface")} { @tag("interfaceOp") - InterfaceOperation(): string; + ${t.op("InterfaceOperation")}(): string; } - @test - interface UntaggedInterface { - @test + interface ${t.interface("UntaggedInterface")} { @tag("taggedOp") - TaggedOperation(): string; + ${t.op("TaggedOperation")}(): string; } - @test @tag("recursiveNamespace") - namespace RecursiveNamespace { - @test + namespace ${t.namespace("RecursiveNamespace")} { @tag("recursiveInterface") - interface RecursiveInterface { - @test + interface ${t.interface("RecursiveInterface")} { @tag("recursiveOperation") - RecursiveOperation(): string; + ${t.op("RecursiveOperation")}(): string; } } - `, - ); - - const { - OpNamespace, - OpInterface, - NamespaceOperation, - UntaggedInterface, - InterfaceOperation, - TaggedOperation, - RecursiveNamespace, - RecursiveInterface, - RecursiveOperation, - } = (await testHost.compile("./")) as { - OpNamespace: Namespace; - OpInterface: Interface; - UntaggedInterface: Interface; - NamespaceOperation: Operation; - InterfaceOperation: Operation; - TaggedOperation: Operation; - RecursiveNamespace: Namespace; - RecursiveInterface: Interface; - RecursiveOperation: Operation; - }; + `); - deepStrictEqual(getAllTags(testHost.program, OpNamespace), ["namespace"]); - deepStrictEqual(getAllTags(testHost.program, OpInterface), ["interface"]); - deepStrictEqual(getAllTags(testHost.program, UntaggedInterface), undefined); - deepStrictEqual(getAllTags(testHost.program, NamespaceOperation), ["namespace", "namespaceOp"]); - deepStrictEqual(getAllTags(testHost.program, InterfaceOperation), ["interface", "interfaceOp"]); - deepStrictEqual(getAllTags(testHost.program, TaggedOperation), ["taggedOp"]); + deepStrictEqual(getAllTags(program, OpNamespace), ["namespace"]); + deepStrictEqual(getAllTags(program, OpInterface), ["interface"]); + deepStrictEqual(getAllTags(program, UntaggedInterface), undefined); + deepStrictEqual(getAllTags(program, NamespaceOperation), ["namespace", "namespaceOp"]); + deepStrictEqual(getAllTags(program, InterfaceOperation), ["interface", "interfaceOp"]); + deepStrictEqual(getAllTags(program, TaggedOperation), ["taggedOp"]); // Check recursive tag walking - deepStrictEqual(getAllTags(testHost.program, RecursiveNamespace), ["recursiveNamespace"]); - deepStrictEqual(getAllTags(testHost.program, RecursiveInterface), [ + deepStrictEqual(getAllTags(program, RecursiveNamespace), ["recursiveNamespace"]); + deepStrictEqual(getAllTags(program, RecursiveInterface), [ "recursiveNamespace", "recursiveInterface", ]); - deepStrictEqual(getAllTags(testHost.program, RecursiveOperation), [ + deepStrictEqual(getAllTags(program, RecursiveOperation), [ "recursiveNamespace", "recursiveInterface", "recursiveOperation", diff --git a/packages/compiler/test/e2e/cli/cli.e2e.ts b/packages/compiler/test/e2e/cli/cli.e2e.ts index 528aa8b60af..3b63235b4e3 100644 --- a/packages/compiler/test/e2e/cli/cli.e2e.ts +++ b/packages/compiler/test/e2e/cli/cli.e2e.ts @@ -16,7 +16,10 @@ interface ExecCliOptions { async function execCli(args: string[], { cwd }: ExecCliOptions) { const node = process.platform === "win32" ? "node.exe" : "node"; - return execAsync(node, [resolvePath(pkgRoot, "entrypoints/cli.js"), ...args], { cwd }); + return execAsync(node, [resolvePath(pkgRoot, "entrypoints/cli.js"), ...args], { + cwd, + env: { ...process.env, NO_COLOR: "1" }, + }); } async function execCliSuccess(args: string[], { cwd }: ExecCliOptions) { const result = await execCli(args, { cwd }); diff --git a/packages/compiler/test/experimental/mutator-propagation.test.ts b/packages/compiler/test/experimental/mutator-propagation.test.ts index cb6d01c07a1..d7c8ae29034 100644 --- a/packages/compiler/test/experimental/mutator-propagation.test.ts +++ b/packages/compiler/test/experimental/mutator-propagation.test.ts @@ -1,28 +1,17 @@ // TODO: find better name for file -import { beforeEach, expect, it } from "vitest"; +import { expect, it } from "vitest"; import { mutateSubgraph, Mutator } from "../../src/experimental/mutators.js"; -import { getTypeName, Model } from "../../src/index.js"; -import { createTestHost } from "../../src/testing/test-host.js"; -import { createTestWrapper } from "../../src/testing/test-utils.js"; -import { BasicTestRunner, TestHost } from "../../src/testing/types.js"; - -let host: TestHost; -let runner: BasicTestRunner; - -beforeEach(async () => { - host = await createTestHost(); - runner = createTestWrapper(host); -}); +import { getTypeName } from "../../src/index.js"; +import { t } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; it("works", async () => { - const code = ` - @test model A { + const { A, program } = await Tester.compile(t.code` + model ${t.model("A")} { b: B; } model B {} - `; - - const { A } = (await runner.compile(code)) as { A: Model }; + `); const mutator: Mutator = { name: "test", Model: { @@ -30,6 +19,6 @@ it("works", async () => { mutate: (_model, clone) => {}, }, }; - const { realm } = mutateSubgraph(runner.program, [mutator], A); + const { realm } = mutateSubgraph(program, [mutator], A); expect([...realm!.types].map((x) => getTypeName(x))).toEqual(["A", "A.b", "B"]); }); diff --git a/packages/compiler/test/experimental/mutator.test.ts b/packages/compiler/test/experimental/mutator.test.ts index dfb0c9169e2..84fe44f0740 100644 --- a/packages/compiler/test/experimental/mutator.test.ts +++ b/packages/compiler/test/experimental/mutator.test.ts @@ -1,5 +1,5 @@ import { strictEqual } from "assert"; -import { beforeEach, describe, expect, it } from "vitest"; +import { describe, expect, it } from "vitest"; import { mutateSubgraph, mutateSubgraphWithNamespace, @@ -7,30 +7,18 @@ import { MutatorFlow, MutatorWithNamespace, } from "../../src/experimental/mutators.js"; -import { Model, ModelProperty, Namespace, Operation } from "../../src/index.js"; -import { t } from "../../src/testing/index.js"; -import { createTestHost } from "../../src/testing/test-host.js"; -import { createTestWrapper, expectTypeEquals } from "../../src/testing/test-utils.js"; -import { BasicTestRunner, TestHost } from "../../src/testing/types.js"; +import { Model, Namespace, Operation } from "../../src/index.js"; +import { mockFile, t } from "../../src/testing/index.js"; +import { expectTypeEquals } from "../../src/testing/test-utils.js"; import { Tester } from "../tester.js"; -let host: TestHost; -let runner: BasicTestRunner; - -beforeEach(async () => { - host = await createTestHost(); - runner = createTestWrapper(host); -}); - it("works", async () => { - const code = ` - @test model Foo { + const { Foo, program } = await Tester.compile(t.code` + model ${t.model("Foo")} { x: string; y: string; }; - `; - - const { Foo } = (await runner.compile(code)) as { Foo: Model }; + `); const mutator: Mutator = { name: "test", Model: { @@ -39,7 +27,7 @@ it("works", async () => { }, }, }; - const mutated = mutateSubgraph(runner.program, [mutator], Foo); + const mutated = mutateSubgraph(program, [mutator], Foo); const mutatedModel = mutated.type as Model; expect(mutated.realm?.hasType(mutatedModel)).toBeTruthy(); @@ -52,19 +40,17 @@ it("works", async () => { }); it("recurses the model", async () => { - const code = ` - @test model Bar { + const visited: string[] = []; + const { Foo, program } = await Tester.compile(t.code` + model Bar { bar: string; } - @test model Foo { + model ${t.model("Foo")} { x: string; y: string; z: Bar; }; - `; - - const visited: string[] = []; - const { Foo } = (await runner.compile(code)) as { Foo: Model }; + `); const mutator: Mutator = { name: "test", Model: { @@ -76,21 +62,19 @@ it("recurses the model", async () => { }, }, }; - mutateSubgraph(runner.program, [mutator], Foo); + mutateSubgraph(program, [mutator], Foo); expect(visited).toStrictEqual(["Foo", "Bar"]); }); it("propagate mutated model to model property", async () => { - const code = ` - @test model Foo { + const visited: string[] = []; + const { Foo, program } = await Tester.compile(t.code` + model ${t.model("Foo")} { a: string; } - `; - - const visited: string[] = []; - const { Foo } = (await runner.compile(code)) as { Foo: Model }; + `); const mutator: Mutator = { name: "test", Model: (_, clone) => { @@ -100,20 +84,18 @@ it("propagate mutated model to model property", async () => { // Just to force mutation }, }; - const MutatedFoo = mutateSubgraph(runner.program, [mutator], Foo).type as Model; + const MutatedFoo = mutateSubgraph(program, [mutator], Foo).type as Model; expectTypeEquals(MutatedFoo.properties.get("a")!.model, MutatedFoo); }); describe("handles circular references", () => { it("reference itself", async () => { - const code = ` - @test model Foo { + const visited: string[] = []; + const { Foo, program } = await Tester.compile(t.code` + model ${t.model("Foo")} { foo: Foo }; - `; - - const visited: string[] = []; - const { Foo } = (await runner.compile(code)) as { Foo: Model }; + `); const mutator: Mutator = { name: "test", Model: { @@ -122,7 +104,7 @@ describe("handles circular references", () => { }, }, }; - mutateSubgraph(runner.program, [mutator], Foo); + mutateSubgraph(program, [mutator], Foo); expect(visited).toStrictEqual(["Foo"]); }); @@ -130,21 +112,19 @@ describe("handles circular references", () => { // We said we didn't actually want model properties to be cloned if they are not explicitly mutated.`¡ it.skip("doesn't duplicate references", async () => { - const code = ` - @test model Bar { + const visited: Model[] = []; + const { Foo, program } = await Tester.compile(t.code` + model Bar { bar: string; } - @test model Baz { + model Baz { bar: Bar; } - @test model Foo { + model ${t.model("Foo")} { baz: Baz; bar: Bar; }; - `; - - const visited: Model[] = []; - const { Foo } = (await runner.compile(code)) as { Foo: Model }; + `); const mutator: Mutator = { name: "test", Model: { @@ -153,7 +133,7 @@ it.skip("doesn't duplicate references", async () => { }, }, }; - mutateSubgraph(runner.program, [mutator], Foo); + mutateSubgraph(program, [mutator], Foo); expect(visited.map((x) => x.name)).toEqual(["Foo", "Baz", "Bar"]); const [MutatedFoo, _MutatedBaz, MutatedBar] = visited; @@ -165,13 +145,11 @@ it.skip("doesn't duplicate references", async () => { }); it("doesn't duplicate references from different types", async () => { - const code = ` - @test model Common {} - @test op test(bar: Common): Common; - `; - const visited: (Model | Operation)[] = []; - const { test } = await runner.compile(code); + const { test, program } = await Tester.compile(t.code` + model Common {} + op ${t.op("test")}(bar: Common): Common; + `); const mutator: Mutator = { name: "test", Operation: { @@ -185,7 +163,7 @@ it("doesn't duplicate references from different types", async () => { }, }, }; - mutateSubgraph(runner.program, [mutator], test as any); + mutateSubgraph(program, [mutator], test as any); expect(visited.map((x) => x.name)).toEqual(["test", "", "Common"]); const [MutatedTest, _, MutatedCommon] = visited; @@ -193,19 +171,17 @@ it("doesn't duplicate references from different types", async () => { }); it("removes model reference from namespace", async () => { - const code = ` - @test namespace Foo; - @test model Bar { + const { Foo, program } = await Tester.compile(t.code` + namespace ${t.namespace("Foo")}; + model Bar { bar: string; } - @test model Baz { + model Baz { x: string; y: string; z: Bar; }; - `; - - const { Foo } = (await runner.compile(code)) as { Foo: Namespace; Bar: Model; Baz: Model }; + `); const mutator: MutatorWithNamespace = { name: "test", Namespace: { @@ -215,7 +191,7 @@ it("removes model reference from namespace", async () => { }, }; - const { type } = mutateSubgraphWithNamespace(runner.program, [mutator], Foo); + const { type } = mutateSubgraphWithNamespace(program, [mutator], Foo); const mutatedNs = type as Namespace; @@ -233,17 +209,15 @@ it("removes model reference from namespace", async () => { }); it("doesn't mutate the same type twice when mutating namespace", async () => { - const code = ` - @test namespace Foo; - @test model Bar {} - @test model Baz { - z: Bar; - }; - `; - const visited: string[] = []; - const { Foo } = (await runner.compile(code)) as { Foo: Namespace; Bar: Model; Baz: Model }; + const { Foo, program } = await Tester.compile(t.code` + namespace ${t.namespace("Foo")}; + model Bar {} + model Baz { + z: Bar; + }; + `); const mutator: MutatorWithNamespace = { name: "test", Namespace: { @@ -256,24 +230,22 @@ it("doesn't mutate the same type twice when mutating namespace", async () => { }, }; - mutateSubgraphWithNamespace(runner.program, [mutator], Foo); + mutateSubgraphWithNamespace(program, [mutator], Foo); expect(visited).toEqual(["Bar", "Baz"]); }); it("do not recurse the model", async () => { - const code = ` - @test model Bar { + const visited: string[] = []; + const { Foo, program } = await Tester.compile(t.code` + model Bar { bar: string; } - @test model Foo { + model ${t.model("Foo")} { x: string; y: string; z: Bar; }; - `; - - const visited: string[] = []; - const { Foo } = (await runner.compile(code)) as { Foo: Model }; + `); const mutator: Mutator = { name: "test", Model: { @@ -285,19 +257,19 @@ it("do not recurse the model", async () => { }, }, }; - mutateSubgraph(runner.program, [mutator], Foo); + mutateSubgraph(program, [mutator], Foo); expect(visited).toStrictEqual(["Foo"]); }); it("can mutate literals", async () => { - const { a, b, c } = (await runner.compile(` + const { a, b, c, program } = await Tester.compile(t.code` model Foo { - @test a: "example"; - @test b: 42; - @test c: false; + ${t.modelProperty("a")}: "example"; + ${t.modelProperty("b")}: 42; + ${t.modelProperty("c")}: false; } - `)) as { a: ModelProperty; b: ModelProperty; c: ModelProperty }; + `); const mutator: Mutator = { name: "test", @@ -316,17 +288,17 @@ it("can mutate literals", async () => { strictEqual(b.type.kind, "Number"); strictEqual(c.type.kind, "Boolean"); - const mutatedA = mutateSubgraph(runner.program, [mutator], a.type).type; + const mutatedA = mutateSubgraph(program, [mutator], a.type).type; strictEqual(mutatedA.kind, "String"); strictEqual(mutatedA.value, "example!"); - const mutatedB = mutateSubgraph(runner.program, [mutator], b.type).type; + const mutatedB = mutateSubgraph(program, [mutator], b.type).type; strictEqual(mutatedB.kind, "Number"); strictEqual(mutatedB.value, 43); - const mutatedC = mutateSubgraph(runner.program, [mutator], c.type).type; + const mutatedC = mutateSubgraph(program, [mutator], c.type).type; strictEqual(mutatedC.kind, "Boolean"); strictEqual(mutatedC.value, true); @@ -351,12 +323,12 @@ describe("global graph mutation", () => { }; async function globalMutate(code: string): Promise { - await runner.compile(code); + const { program } = await Tester.compile(code); const { type } = mutateSubgraphWithNamespace( - runner.program, + program, [mutator], - runner.program.getGlobalNamespaceType(), + program.getGlobalNamespaceType(), ); strictEqual(type.kind, "Namespace"); @@ -440,9 +412,11 @@ describe("global graph mutation", () => { describe("decorators", () => { it("mutates arguments values", async () => { - const host = await createTestHost(); - const code = ` - import "./dec.js"; + const visited: string[] = []; + + const { Foo, program } = await Tester.files({ + "dec.js": mockFile.js({ $myDec: () => {} }), + }).import("./dec.js").compile(t.code` extern dec myDec(target, value: valueof unknown); enum E { @@ -452,14 +426,8 @@ describe("decorators", () => { @myDec(#{ enumValue: E.a, }) - @test model Foo {} - `; - host.addJsFile("dec.js", { $myDec: () => {} }); - host.addTypeSpecFile("main.tsp", code); - - const visited: string[] = []; - - const { Foo } = (await host.compile("main.tsp")) as { Foo: Model }; + model ${t.model("Foo")} {} + `); const mutator: Mutator = { name: "test", Enum: { @@ -479,7 +447,7 @@ describe("decorators", () => { }, }; - mutateSubgraph(host.program, [mutator], Foo); + mutateSubgraph(program, [mutator], Foo); expect(visited).toStrictEqual(["Foo", "a", "E"]); }); @@ -500,24 +468,20 @@ describe("decorators", () => { // Regression test for https://github.com/microsoft/typespec/issues/6655 it("doesn't crash when mutating null value", async () => { - const host = await createTestHost(); - const code = ` - import "./dec.js"; + const { Foo, program } = await Tester.files({ + "dec.js": mockFile.js({ $myDec: () => {} }), + }).import("./dec.js").compile(t.code` extern dec myDec(target, value: valueof unknown); @myDec(null) - @test model Foo {} - `; - host.addJsFile("dec.js", { $myDec: () => {} }); - host.addTypeSpecFile("main.tsp", code); - - const { Foo } = (await host.compile("main.tsp")) as { Foo: Model }; + model ${t.model("Foo")} {} + `); const mutator: Mutator = { name: "test", Model: { mutate: (_model, clone) => {}, }, }; - expect(() => mutateSubgraph(host.program, [mutator], Foo)).not.toThrow(); + expect(() => mutateSubgraph(program, [mutator], Foo)).not.toThrow(); }); }); diff --git a/packages/compiler/test/formatter/formatter.test.ts b/packages/compiler/test/formatter/formatter.test.ts index 71434be8249..1360a82e543 100644 --- a/packages/compiler/test/formatter/formatter.test.ts +++ b/packages/compiler/test/formatter/formatter.test.ts @@ -1794,6 +1794,31 @@ enum Foo { ...Baz, Two: "2", } +`, + }); + }); + + it("does not escape modifier keywords used as enum member names", async () => { + await assertFormat({ + code: ` +enum Foo { internal, extern } + `, + expected: ` +enum Foo { + internal, + extern, +} +`, + }); + }); + + it("does not escape modifier keywords in member expressions", async () => { + await assertFormat({ + code: ` +const x = Foo.internal; +`, + expected: ` +const x = Foo.internal; `, }); }); @@ -2827,6 +2852,136 @@ const a : in32= 123; `, expected: ` const a: in32 = 123; +`, + }); + }); + }); + + describe("internal modifier", () => { + it("format internal model", async () => { + await assertFormat({ + code: ` +internal model Foo { } +`, + expected: ` +internal model Foo {} +`, + }); + }); + + it("format internal model with decorators", async () => { + await assertFormat({ + code: ` +@doc("A model") +internal model Foo { x: string; } +`, + expected: ` +@doc("A model") +internal model Foo { + x: string; +} +`, + }); + }); + + it("format internal op", async () => { + await assertFormat({ + code: ` +internal op foo(): void; +`, + expected: ` +internal op foo(): void; +`, + }); + }); + + it("format internal scalar", async () => { + await assertFormat({ + code: ` +internal scalar foo; +`, + expected: ` +internal scalar foo; +`, + }); + }); + + it("format internal interface", async () => { + await assertFormat({ + code: ` +internal interface Foo { } +`, + expected: ` +internal interface Foo {} +`, + }); + }); + + it("format internal union", async () => { + await assertFormat({ + code: ` +internal union Foo { } +`, + expected: ` +internal union Foo {} +`, + }); + }); + + it("format internal enum", async () => { + await assertFormat({ + code: ` +internal enum Foo { a, b } +`, + expected: ` +internal enum Foo { + a, + b, +} +`, + }); + }); + + it("format internal alias", async () => { + await assertFormat({ + code: ` +internal alias Foo = string; +`, + expected: ` +internal alias Foo = string; +`, + }); + }); + + it("format internal const", async () => { + await assertFormat({ + code: ` +internal const x = 123; +`, + expected: ` +internal const x = 123; +`, + }); + }); + + it("format internal extern dec", async () => { + await assertFormat({ + code: ` +internal extern dec foo(target: Type, arg1: StringLiteral); +`, + expected: ` +internal extern dec foo(target: Type, arg1: StringLiteral); +`, + }); + }); + + it("format internal extern fn", async () => { + await assertFormat({ + code: ` +internal extern fn foo(arg1: StringLiteral): void; +`, + expected: ` +internal extern fn foo(arg1: StringLiteral): void; `, }); }); diff --git a/packages/compiler/test/helpers/discriminator-utils.test.ts b/packages/compiler/test/helpers/discriminator-utils.test.ts index da7d61a8014..9c1a70f1925 100644 --- a/packages/compiler/test/helpers/discriminator-utils.test.ts +++ b/packages/compiler/test/helpers/discriminator-utils.test.ts @@ -1,23 +1,18 @@ import { strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { getDiscriminatedUnionFromInheritance } from "../../src/core/helpers/discriminator-utils.js"; -import { Model, getDiscriminator } from "../../src/index.js"; +import { Model, Program, getDiscriminator } from "../../src/index.js"; import { - BasicTestRunner, - createTestRunner, expectDiagnosticEmpty, expectDiagnostics, extractCursor, + t, } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; describe("compiler: discriminator", () => { - let runner: BasicTestRunner; - beforeEach(async () => { - runner = await createTestRunner(); - }); - - function checkValidDiscriminatedUnion(model: Model) { - const discriminator = getDiscriminator(runner.program, model); + function checkValidDiscriminatedUnion(program: Program, model: Model) { + const discriminator = getDiscriminator(program, model); if (discriminator === undefined) { throw new Error("Discriminator shouldn't be undefined."); } @@ -28,62 +23,62 @@ describe("compiler: discriminator", () => { describe("inheritance based", () => { it("find variants from direct derived types", async () => { - const { Pet, Cat, Dog } = (await runner.compile(` + const { Pet, Cat, Dog, program } = await Tester.compile(t.code` @discriminator("kind") - @test model Pet {} + model ${t.model("Pet")} {} - @test model Cat extends Pet { + model ${t.model("Cat")} extends Pet { kind: "cat"; } - @test model Dog extends Pet { + model ${t.model("Dog")} extends Pet { kind: "dog"; } - `)) as { Pet: Model; Cat: Model; Dog: Model }; + `); - const union = checkValidDiscriminatedUnion(Pet); + const union = checkValidDiscriminatedUnion(program, Pet); strictEqual(union.variants.size, 2); strictEqual(union.variants.get("cat"), Cat); strictEqual(union.variants.get("dog"), Dog); }); it("doesn't include unrelated types", async () => { - const { Pet, Cat } = (await runner.compile(` + const { Pet, Cat, program } = await Tester.compile(t.code` @discriminator("kind") - @test model Pet {} + model ${t.model("Pet")} {} - @test model Cat extends Pet { + model ${t.model("Cat")} extends Pet { kind: "cat"; } - @test model Aligator { + model Aligator { kind: "aligator"; } - `)) as { Pet: Model; Cat: Model }; + `); - const union = checkValidDiscriminatedUnion(Pet); + const union = checkValidDiscriminatedUnion(program, Pet); strictEqual(union.variants.size, 1); strictEqual(union.variants.get("cat"), Cat); strictEqual(union.variants.get("aligator"), undefined); }); it("can use a templated type for derived types", async () => { - const { Pet, Cat, Dog } = (await runner.compile(` + const { Pet, Cat, Dog, program } = await Tester.compile(t.code` @discriminator("kind") - @test model Pet {} + model ${t.model("Pet")} {} model PetT extends Pet { kind: T; } - @test model Cat is PetT<"cat"> { + model ${t.model("Cat")} is PetT<"cat"> { } - @test model Dog is PetT<"dog"> { + model ${t.model("Dog")} is PetT<"dog"> { } - `)) as { Pet: Model; Cat: Model; Dog: Model }; + `); - const union = checkValidDiscriminatedUnion(Pet); + const union = checkValidDiscriminatedUnion(program, Pet); strictEqual(union.variants.size, 2); strictEqual(union.variants.get("cat"), Cat); strictEqual(union.variants.get("dog"), Dog); @@ -91,130 +86,130 @@ describe("compiler: discriminator", () => { describe("discriminator value", () => { it("can be a string", async () => { - const { Pet, Cat } = (await runner.compile(` + const { Pet, Cat, program } = await Tester.compile(t.code` @discriminator("kind") - @test model Pet {} + model ${t.model("Pet")} {} - @test model Cat extends Pet { + model ${t.model("Cat")} extends Pet { kind: "cat"; } - `)) as { Pet: Model; Cat: Model; Dog: Model }; + `); - const union = checkValidDiscriminatedUnion(Pet); + const union = checkValidDiscriminatedUnion(program, Pet); strictEqual(union.variants.size, 1); strictEqual(union.variants.get("cat"), Cat); }); it("can be a union of string", async () => { - const { Pet, Cat } = (await runner.compile(` + const { Pet, Cat, program } = await Tester.compile(t.code` @discriminator("kind") - @test model Pet {} + model ${t.model("Pet")} {} - @test model Cat extends Pet { + model ${t.model("Cat")} extends Pet { kind: "cat" | "feline"; } - `)) as { Pet: Model; Cat: Model; Dog: Model }; + `); - const union = checkValidDiscriminatedUnion(Pet); + const union = checkValidDiscriminatedUnion(program, Pet); strictEqual(union.variants.size, 2); strictEqual(union.variants.get("cat"), Cat); strictEqual(union.variants.get("feline"), Cat); }); it("can be a string enum member", async () => { - const { Pet, Cat } = (await runner.compile(` + const { Pet, Cat, program } = await Tester.compile(t.code` @discriminator("kind") - @test model Pet {} + model ${t.model("Pet")} {} enum PetKind {cat} - @test model Cat extends Pet { + model ${t.model("Cat")} extends Pet { kind: PetKind.cat; } - `)) as { Pet: Model; Cat: Model; Dog: Model }; + `); - const union = checkValidDiscriminatedUnion(Pet); + const union = checkValidDiscriminatedUnion(program, Pet); strictEqual(union.variants.size, 1); strictEqual(union.variants.get("cat"), Cat); }); }); it("find variants from nested derived types", async () => { - const { Pet, Cat } = (await runner.compile(` + const { Pet, Cat, program } = await Tester.compile(t.code` @discriminator("kind") - @test model Pet {} + model ${t.model("Pet")} {} - @test model Feline extends Pet {} - @test model Cat extends Feline { + model Feline extends Pet {} + model ${t.model("Cat")} extends Feline { kind: "cat"; } - `)) as { Pet: Model; Cat: Model; Dog: Model }; + `); - const union = checkValidDiscriminatedUnion(Pet); + const union = checkValidDiscriminatedUnion(program, Pet); strictEqual(union.variants.size, 1); strictEqual(union.variants.get("cat"), Cat); }); it("support nested discriminated types", async () => { - const { Pet, Cat, Siamese } = (await runner.compile(` + const { Pet, Cat, Siamese, program } = await Tester.compile(t.code` @discriminator("kind") - @test model Pet {} + model ${t.model("Pet")} {} @discriminator("breed") - @test model Cat extends Pet { + model ${t.model("Cat")} extends Pet { kind: "cat"; } @discriminator("breed") - @test model Siamese extends Cat { + model ${t.model("Siamese")} extends Cat { breed: "siamese" } - `)) as { Pet: Model; Cat: Model; Siamese: Model }; + `); - const petUnion = checkValidDiscriminatedUnion(Pet); + const petUnion = checkValidDiscriminatedUnion(program, Pet); strictEqual(petUnion.variants.size, 1); strictEqual(petUnion.variants.get("cat"), Cat); - const catUnion = checkValidDiscriminatedUnion(Cat); + const catUnion = checkValidDiscriminatedUnion(program, Cat); strictEqual(catUnion.variants.size, 1); strictEqual(catUnion.variants.get("siamese"), Siamese); }); it("support nested discriminated types with intermediate types", async () => { - const { Pet, Cat, Siamese } = (await runner.compile(` + const { Pet, Cat, Siamese, program } = await Tester.compile(t.code` @discriminator("kind") - @test model Pet {} + model ${t.model("Pet")} {} model Feline extends Pet {} @discriminator("breed") - @test model Cat extends Feline { + model ${t.model("Cat")} extends Feline { kind: "cat"; } model IndoorCat extends Cat {} @discriminator("breed") - @test model Siamese extends IndoorCat { + model ${t.model("Siamese")} extends IndoorCat { breed: "siamese" } - `)) as { Pet: Model; Cat: Model; Siamese: Model }; + `); - const petUnion = checkValidDiscriminatedUnion(Pet); + const petUnion = checkValidDiscriminatedUnion(program, Pet); strictEqual(petUnion.variants.size, 1); strictEqual(petUnion.variants.get("cat"), Cat); - const catUnion = checkValidDiscriminatedUnion(Cat); + const catUnion = checkValidDiscriminatedUnion(program, Cat); strictEqual(catUnion.variants.size, 1); strictEqual(catUnion.variants.get("siamese"), Siamese); }); it("errors if discriminator property is not a string-like type", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` @discriminator("kind") - @test model Pet {} + model Pet {} model Cat extends Pet { kind: int32; @@ -229,9 +224,9 @@ describe("compiler: discriminator", () => { }); it("errors if discriminator property is optional", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` @discriminator("kind") - @test model Pet {} + model Pet {} model Cat extends Pet { kind?: "cat"; @@ -245,9 +240,9 @@ describe("compiler: discriminator", () => { }); it("errors if discriminator value are duplicated", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` @discriminator("kind") - @test model Pet {} + model Pet {} model Cat extends Pet { kind: "cat"; @@ -276,7 +271,7 @@ describe("compiler: discriminator", () => { let source: string; ({ pos: catPos, source } = extractCursor(` @discriminator("kind") - @test model Pet {} + model Pet {} // No error has there is a derived type(Cat) model Feline extends Pet {} @@ -286,7 +281,7 @@ describe("compiler: discriminator", () => { ┆model Dog extends Pet{} `)); ({ pos: dogPos, source } = extractCursor(source)); - const diagnostics = await runner.diagnose(source); + const diagnostics = await Tester.diagnose(source); expectDiagnostics(diagnostics, [ { diff --git a/packages/compiler/test/helpers/operation-utils.test.ts b/packages/compiler/test/helpers/operation-utils.test.ts index 87f5cde8df3..1773a19b839 100644 --- a/packages/compiler/test/helpers/operation-utils.test.ts +++ b/packages/compiler/test/helpers/operation-utils.test.ts @@ -1,14 +1,10 @@ import { deepStrictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { Interface, ListOperationOptions, Namespace, listOperationsIn } from "../../src/index.js"; -import { BasicTestRunner, createTestRunner } from "../../src/testing/index.js"; +import { t } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; describe("compiler: operation-utils", () => { - let runner: BasicTestRunner; - beforeEach(async () => { - runner = await createTestRunner(); - }); - async function listOperationNames( container: Namespace | Interface, options?: ListOperationOptions, @@ -17,7 +13,7 @@ describe("compiler: operation-utils", () => { } it("list all operations when using global namespace", async () => { - await runner.compile(` + const { program } = await Tester.compile(` op one(): void; namespace Bar { @@ -29,7 +25,7 @@ describe("compiler: operation-utils", () => { } `); - deepStrictEqual(await listOperationNames(runner.program.getGlobalNamespaceType()), [ + deepStrictEqual(await listOperationNames(program.getGlobalNamespaceType()), [ "one", "two", "three", @@ -37,59 +33,59 @@ describe("compiler: operation-utils", () => { }); it("list all operations under interface", async () => { - const { Foo } = (await runner.compile(` + const { Foo } = await Tester.compile(t.code` op one(): void; - @test interface Foo { + interface ${t.interface("Foo")} { two(): void; three(): void; } - `)) as { Foo: Interface }; + `); deepStrictEqual(await listOperationNames(Foo), ["two", "three"]); }); it("list all operation including interface ops under namespace", async () => { - const { Foo } = (await runner.compile(` + const { Foo } = await Tester.compile(t.code` op one(): void; - @test namespace Foo { + namespace ${t.namespace("Foo")} { op two(): void; interface Bar { three(): void; } } - `)) as { Foo: Interface }; + `); deepStrictEqual(await listOperationNames(Foo), ["two", "three"]); }); it("include operation in subnamespace by default", async () => { - const { Foo } = (await runner.compile(` + const { Foo } = await Tester.compile(t.code` op one(): void; - @test namespace Foo { + namespace ${t.namespace("Foo")} { op two(): void; namespace Bar { op three(): void; } } - `)) as { Foo: Interface }; + `); deepStrictEqual(await listOperationNames(Foo), ["two", "three"]); }); it("can exclude sub namespaces", async () => { - const { Foo } = (await runner.compile(` + const { Foo } = await Tester.compile(t.code` op one(): void; - @test namespace Foo { + namespace ${t.namespace("Foo")} { op two(): void; namespace Bar { op three(): void; } } - `)) as { Foo: Interface }; + `); deepStrictEqual(await listOperationNames(Foo, { recursive: false }), ["two"]); }); diff --git a/packages/compiler/test/helpers/type-name-utils.test.ts b/packages/compiler/test/helpers/type-name-utils.test.ts index 925d779c7d2..726e6c6af09 100644 --- a/packages/compiler/test/helpers/type-name-utils.test.ts +++ b/packages/compiler/test/helpers/type-name-utils.test.ts @@ -1,12 +1,11 @@ import { strictEqual } from "assert"; import { describe, it } from "vitest"; import { TypeNameOptions, getTypeName } from "../../src/index.js"; -import { createTestRunner } from "../../src/testing/test-host.js"; +import { Tester } from "../tester.js"; describe("compiler: TypeNameUtils", () => { async function getNameFor(code: string, options: TypeNameOptions = {}) { - const runner = await createTestRunner(); - const { target } = await runner.compile(code); + const { target } = (await Tester.compile(code)) as any; return getTypeName(target, options); } @@ -16,55 +15,47 @@ describe("compiler: TypeNameUtils", () => { describe("Namespaces", () => { it("single namespace returned as its name", () => - assertNameFor(`@test("target") namespace Foo {}`, "Foo")); + assertNameFor(`namespace /*target*/Foo {}`, "Foo")); it("join namespace and subnamespaces", () => - assertNameFor(`@test("target") namespace Foo.Bar {}`, "Foo.Bar")); + assertNameFor(`namespace Foo./*target*/Bar {}`, "Foo.Bar")); it("keeps TypeSpec as top level namespace", () => - assertNameFor(`@test("target") namespace TypeSpec.Foo.Bar {}`, "TypeSpec.Foo.Bar")); + assertNameFor(`namespace TypeSpec.Foo./*target*/Bar {}`, "TypeSpec.Foo.Bar")); it("keeps TypeSpec as bottom level namespace", () => - assertNameFor(`@test("target") namespace Foo.Bar.TypeSpec {}`, "Foo.Bar.TypeSpec")); + assertNameFor(`namespace Foo.Bar./*target*/TypeSpec {}`, "Foo.Bar.TypeSpec")); it("filter out some namespace with callback", () => - assertNameFor(`@test("target") namespace Foo.Bar.Baz {}`, "Baz", { + assertNameFor(`namespace Foo.Bar./*target*/Baz {}`, "Baz", { namespaceFilter: (ns) => ns.name !== "Bar", })); }); describe("scalar", () => { - it("simple scalar", () => assertNameFor(`@test("target") scalar unreal;`, "unreal")); + it("simple scalar", () => assertNameFor(`scalar /*target*/unreal;`, "unreal")); it("include namespace qualifier", () => - assertNameFor(`namespace Foo { @test("target") scalar unreal; }`, "Foo.unreal")); - + assertNameFor(`namespace Foo { scalar /*target*/unreal; }`, "Foo.unreal")); it("keeps TypeSpec as top level namespace", () => - assertNameFor( - `namespace TypeSpec.Foo {@test("target") scalar unreal; }`, - "TypeSpec.Foo.unreal", - )); + assertNameFor(`namespace TypeSpec.Foo { scalar /*target*/unreal; }`, "TypeSpec.Foo.unreal")); it("keeps TypeSpec as bottom level namespace", () => - assertNameFor( - `namespace Foo.TypeSpec {@test("target") scalar unreal; }`, - "Foo.TypeSpec.unreal", - )); + assertNameFor(`namespace Foo.TypeSpec { scalar /*target*/unreal; }`, "Foo.TypeSpec.unreal")); }); describe("union", () => { - it("simple named union", () => assertNameFor(`@test("target") union Pet {}`, "Pet")); + it("simple named union", () => assertNameFor(`union /*target*/Pet {}`, "Pet")); it("include namespace qualifier", () => - assertNameFor(`namespace Foo { @test("target") union Pet {} }`, "Foo.Pet")); + assertNameFor(`namespace Foo { union /*target*/Pet {} }`, "Foo.Pet")); }); describe("Standard library", () => { - async function getNameForRef(ref: string) { - const runner = await createTestRunner(); - await runner.compile(""); - return getTypeName(runner.program.resolveTypeReference(ref)[0]!); - } - it("omit the TypeSpec qualifier", async () => { - strictEqual(await getNameForRef("TypeSpec.string"), "string"); + const { program } = await Tester.compile(``); + strictEqual(getTypeName(program.resolveTypeReference("TypeSpec.string")[0]!), "string"); }); it("omit the TypeSpec.Reflection qualifier", async () => { - strictEqual(await getNameForRef("TypeSpec.Reflection.Operation"), "Operation"); + const { program } = await Tester.compile(``); + strictEqual( + getTypeName(program.resolveTypeReference("TypeSpec.Reflection.Operation")[0]!), + "Operation", + ); }); }); }); diff --git a/packages/compiler/test/helpers/usage-resolver.test.ts b/packages/compiler/test/helpers/usage-resolver.test.ts index 6837f1bfa05..61681d46028 100644 --- a/packages/compiler/test/helpers/usage-resolver.test.ts +++ b/packages/compiler/test/helpers/usage-resolver.test.ts @@ -1,23 +1,20 @@ import { deepStrictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { UsageFlags, resolveUsages } from "../../src/core/helpers/usage-resolver.js"; import { getTypeName } from "../../src/index.js"; -import { BasicTestRunner, createTestRunner } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; describe("compiler: helpers: usage resolver", () => { - let runner: BasicTestRunner; - beforeEach(async () => { - runner = await createTestRunner(); - }); - async function getUsages( code: string, targetNames?: string | string[], ): Promise<{ inputs: string[]; outputs: string[] }> { - const testTypes = await runner.compile(code); + const compileResult: any = await Tester.compile(code); + const { program } = compileResult; const targetNames2 = typeof targetNames === "string" ? [targetNames] : targetNames; const targetTypes = - targetNames2?.map((x) => testTypes[x]) ?? runner.program.checker.getGlobalNamespaceType(); + targetNames2?.map((x: string) => compileResult[x]) ?? + program.checker.getGlobalNamespaceType(); const usages = resolveUsages(targetTypes as any); const result: { inputs: string[]; outputs: string[] } = { inputs: [], outputs: [] }; @@ -158,7 +155,7 @@ describe("compiler: helpers: usage resolver", () => { model Foo {} model Bar {} op set(): Bar; - @test op get(): Foo; + op /*get*/get(): Foo; `, "get", ); @@ -171,7 +168,7 @@ describe("compiler: helpers: usage resolver", () => { ` model Foo {} op set(input: Foo): void; - @test op get(): Foo; + op /*get*/get(): Foo; `, "get", ); @@ -189,7 +186,7 @@ describe("compiler: helpers: usage resolver", () => { interface One { set(input: Foo): void; } - @test interface Two { + interface /*Two*/Two { get(): Foo; other(input: Bar): void; } @@ -208,11 +205,11 @@ describe("compiler: helpers: usage resolver", () => { model Foo {} model Bar {} interface One { - @test set(input: Foo): void; + /*set*/set(input: Foo): void; } interface Two { get(): Foo; - @test other(input: Bar): void; + /*other*/other(input: Bar): void; } `, ["set", "other"], diff --git a/packages/compiler/test/install/spec.test.ts b/packages/compiler/test/install/spec.test.ts index 7271be71e7a..ebb5cdd0d0b 100644 --- a/packages/compiler/test/install/spec.test.ts +++ b/packages/compiler/test/install/spec.test.ts @@ -1,16 +1,17 @@ import { describe, expect, it } from "vitest"; import { PackageJson } from "../../src/index.js"; import { PackageManagerSpecError, resolvePackageManagerSpec } from "../../src/install/spec.js"; -import { createTestHost } from "../../src/testing/test-host.js"; import { resolveVirtualPath } from "../../src/testing/test-utils.js"; +import { Tester } from "../tester.js"; async function getPackageManagerSpecFor(cwd: string, packages: Record) { - const host = await createTestHost(); + const files: Record = {}; for (const [path, content] of Object.entries(packages)) { - host.addTypeSpecFile(path, JSON.stringify(content)); + files[path] = JSON.stringify(content); } + const instance = await Tester.files(files).createInstance(); const tracer: any = { trace: () => {}, sub: () => tracer }; - return resolvePackageManagerSpec(host.compilerHost, tracer, resolveVirtualPath(cwd)); + return resolvePackageManagerSpec(instance.fs.compilerHost, tracer, resolveVirtualPath(cwd)); } it("return no-package if no package.json is found", async () => { diff --git a/packages/compiler/test/libraries/libraries.test.ts b/packages/compiler/test/libraries/libraries.test.ts index 00d5f687df6..87828e69984 100644 --- a/packages/compiler/test/libraries/libraries.test.ts +++ b/packages/compiler/test/libraries/libraries.test.ts @@ -4,11 +4,13 @@ import { compile } from "../../src/core/program.js"; import { resolvePath } from "../../src/index.js"; import { MANIFEST } from "../../src/manifest.js"; import { - createTestHost, expectDiagnosticEmpty, expectDiagnostics, findTestPackageRoot, + mockFile, + resolveVirtualPath, } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; const libs = [ "simple", // Load a library in `node_modules` @@ -28,19 +30,19 @@ describe("compiler: libraries", () => { } it("detects compiler version mismatches", async () => { - const testHost = await createTestHost(); - testHost.addTypeSpecFile("other/main.tsp", ""); - testHost.addTypeSpecFile( - "./other/node_modules/@typespec/compiler/package.json", - JSON.stringify({ + const instance = await Tester.files({ + "other/main.tsp": "", + "./other/node_modules/@typespec/compiler/package.json": JSON.stringify({ name: "@typespec/compiler", main: "index.js", version: "0.1.0-notthesame.1", }), - ); - testHost.addJsFile("./other/node_modules/@typespec/compiler/index.js", {}); - const diagnostics = await testHost.diagnose("other/main.tsp"); - expectDiagnostics(diagnostics, { + "./other/node_modules/@typespec/compiler/index.js": mockFile.js({}), + }).createInstance(); + // Add test-lib placeholder (normally added internally by Tester.diagnose) + instance.fs.addTypeSpecFile("./node_modules/@typespec/compiler/test-lib/main.tsp", ""); + const program = await compile(instance.fs.compilerHost, resolveVirtualPath("other/main.tsp")); + expectDiagnostics(program.diagnostics, { code: "compiler-version-mismatch", severity: "warning", message: /Current TypeSpec compiler conflicts with local version/, @@ -48,29 +50,25 @@ describe("compiler: libraries", () => { }); it("allows compiler install to mismatch if the version are the same", async () => { - const testHost = await createTestHost(); - testHost.addTypeSpecFile("main.tsp", ""); - testHost.addTypeSpecFile( - "./node_modules/@typespec/compiler/package.json", - JSON.stringify({ name: "@typespec/compiler", main: "index.js", version: MANIFEST.version }), - ); - testHost.addJsFile("./node_modules/@typespec/compiler/index.js", {}); - const diagnostics = await testHost.diagnose("main.tsp"); + const diagnostics = await Tester.files({ + "./node_modules/@typespec/compiler/package.json": JSON.stringify({ + name: "@typespec/compiler", + main: "index.js", + version: MANIFEST.version, + }), + "./node_modules/@typespec/compiler/index.js": mockFile.js({}), + }).diagnose(""); expectDiagnosticEmpty(diagnostics); }); it("report errors in js files", async () => { - const testHost = await createTestHost(); - testHost.addJsFile("lib1.js", { $myDec: () => null }); - testHost.addJsFile("lib2.js", { $myDec: () => null }); - testHost.addTypeSpecFile( - "main.tsp", - ` + const diagnostics = await Tester.files({ + "lib1.js": mockFile.js({ $myDec: () => null }), + "lib2.js": mockFile.js({ $myDec: () => null }), + }).diagnose(` import "./lib1.js"; import "./lib2.js"; - `, - ); - const diagnostics = await testHost.diagnose("main.tsp"); + `); expectDiagnostics(diagnostics, [ { code: "duplicate-symbol", diff --git a/packages/compiler/test/name-resolver.test.ts b/packages/compiler/test/name-resolver.test.ts index 788d1be79e3..24fca9bdb45 100644 --- a/packages/compiler/test/name-resolver.test.ts +++ b/packages/compiler/test/name-resolver.test.ts @@ -11,6 +11,7 @@ import { IdentifierNode, JsSourceFileNode, MemberExpressionNode, + ModifierFlags, Node, NodeFlags, ResolutionResult, @@ -1251,6 +1252,28 @@ describe("aliases", () => { }); }); +describe("functions", () => { + it("resolves function return types", () => { + const { Baz: returnType } = getResolutions( + [ + ` + extern fn f(): { a: string }; + alias Baz = f(); + `, + ], + "Baz", + ); + + assertSymbol(returnType, { + members: { + a: { + flags: SymbolFlags.Member, + }, + }, + }); + }); +}); + describe("usings", () => { describe("binding", () => { it("binds usings to locals", () => { @@ -1520,5 +1543,7 @@ function createJsSourceFile(exports: any): JsSourceFileNode { pos: 0, end: 0, flags: NodeFlags.None, + modifiers: [], + modifierFlags: ModifierFlags.None, }; } diff --git a/packages/compiler/test/package-manager/npm-registry-utils.test.ts b/packages/compiler/test/package-manager/npm-registry-utils.test.ts new file mode 100644 index 00000000000..48dcfc6ba59 --- /dev/null +++ b/packages/compiler/test/package-manager/npm-registry-utils.test.ts @@ -0,0 +1,54 @@ +import * as http from "http"; +import type { AddressInfo } from "net"; +import { afterEach, beforeEach, describe, expect, it } from "vitest"; +import { fetchPackageManifest } from "../../src/package-manger/npm-registry-utils.js"; + +describe("TYPESPEC_NPM_REGISTRY", () => { + let server: http.Server; + let registryUrl: string; + let lastRequestUrl: string | undefined; + + beforeEach(async () => { + lastRequestUrl = undefined; + server = http.createServer((req, res) => { + lastRequestUrl = req.url ?? ""; + res.writeHead(200, { "Content-Type": "application/json" }); + res.end( + JSON.stringify({ + name: "test-pkg", + version: "1.0.0", + dependencies: {}, + optionalDependencies: {}, + devDependencies: {}, + peerDependencies: {}, + bundleDependencies: false, + dist: { shasum: "abc", tarball: "http://example.com/test.tgz" }, + bin: null, + _shrinkwrap: null, + }), + ); + }); + await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve)); + const { port } = server.address() as AddressInfo; + registryUrl = `http://127.0.0.1:${port}`; + }); + + afterEach(async () => { + delete process.env["TYPESPEC_NPM_REGISTRY"]; + await new Promise((resolve) => server.close(() => resolve())); + }); + + it("uses the registry URL from TYPESPEC_NPM_REGISTRY when set", async () => { + process.env["TYPESPEC_NPM_REGISTRY"] = registryUrl; + const manifest = await fetchPackageManifest("test-pkg", "latest"); + expect(manifest.name).toBe("test-pkg"); + expect(lastRequestUrl).toBe("/test-pkg/latest"); + }); + + it("strips trailing slash from TYPESPEC_NPM_REGISTRY", async () => { + process.env["TYPESPEC_NPM_REGISTRY"] = `${registryUrl}/`; + const manifest = await fetchPackageManifest("test-pkg", "1.0.0"); + expect(manifest.name).toBe("test-pkg"); + expect(lastRequestUrl).toBe("/test-pkg/1.0.0"); + }); +}); diff --git a/packages/compiler/test/parser.test.ts b/packages/compiler/test/parser.test.ts index 1e8d360c19d..e3d78e94607 100644 --- a/packages/compiler/test/parser.test.ts +++ b/packages/compiler/test/parser.test.ts @@ -51,6 +51,23 @@ describe("compiler: parser", () => { ); }); + describe("modifier keywords as identifiers", () => { + const modifiers = ["internal", "extern"]; + + // Allowed as members + parseEach(modifiers.map((x) => `model Foo { ${x}: string }`)); + parseEach(modifiers.map((x) => `union Foo { ${x}: string }`)); + parseEach(modifiers.map((x) => `const a = #{ ${x}: string };`)); + + // Error when used as declaration name + parseErrorEach( + modifiers.map((x) => [ + `model ${x} {}`, + [{ message: /Keyword cannot be used as identifier/ }], + ]), + ); + }); + describe("import statements", () => { parseEach(['import "x";']); @@ -1279,6 +1296,13 @@ describe("compiler: parser", () => { describe("template arguments", () => { parseEach(["alias Test = Foo;", "alias TrailingComma = Foo;"]); + // Some examples with using functions as args: + parseEach([ + "alias Test = Foo;", + "alias Test = Foo string>;", + "alias Test = Foo string>;", + "alias TrailingComma = Foo string,>;", + ]); }); describe("annotations order", () => { diff --git a/packages/compiler/test/regression/regression.test.ts b/packages/compiler/test/regression/regression.test.ts new file mode 100644 index 00000000000..bb2c48fa303 --- /dev/null +++ b/packages/compiler/test/regression/regression.test.ts @@ -0,0 +1,13 @@ +import { readdirSync } from "fs"; +import { readFile } from "fs/promises"; +import { resolve } from "path"; +import { it } from "vitest"; +import { Tester } from "../tester.js"; + +const specsDir = resolve(import.meta.dirname, "specs"); +const specFiles = readdirSync(specsDir).filter((f) => f.endsWith(".tsp")); + +it.each(specFiles)("%s", async (file) => { + const content = await readFile(resolve(specsDir, file), "utf-8"); + await Tester.compile(content); +}); diff --git a/packages/compiler/test/regression/specs/cycletopia.tsp b/packages/compiler/test/regression/specs/cycletopia.tsp new file mode 100644 index 00000000000..9e06dbfd160 --- /dev/null +++ b/packages/compiler/test/regression/specs/cycletopia.tsp @@ -0,0 +1,535 @@ +/** + * A spec with many models referencing each other in a circular manner which caused a stack overflow. + * Regression test for https://github.com/microsoft/typespec/issues/9603 + */ +model Model1 { + id: int32; + ref1: Model2; + ref2: Model3; + ref3: Model4; + ref4: Model5; + ref5: Model6; + ref6: Model7; + ref7: Model8; + ref8: Model9; + ref9: Model10; + ref10: Model11; + ref11: Model12; + ref12: Model13; + ref13: Model14; + ref14: Model15; + ref15: Model16; + ref16: Model17; + ref17: Model18; + ref18: Model19; + ref19: Model1; + ref20: Model2; + ref21: Model3; + ref22: Model4; + ref23: Model5; + ref24: Model6; +} + +model Model2 { + id: int32; + ref1: Model3; + ref2: Model4; + ref3: Model5; + ref4: Model6; + ref5: Model7; + ref6: Model8; + ref7: Model9; + ref8: Model10; + ref9: Model11; + ref10: Model12; + ref11: Model13; + ref12: Model14; + ref13: Model15; + ref14: Model16; + ref15: Model17; + ref16: Model18; + ref17: Model19; + ref18: Model1; + ref19: Model2; + ref20: Model3; + ref21: Model4; + ref22: Model5; + ref23: Model6; + ref24: Model7; +} + +model Model3 { + id: int32; + ref1: Model4; + ref2: Model5; + ref3: Model6; + ref4: Model7; + ref5: Model8; + ref6: Model9; + ref7: Model10; + ref8: Model11; + ref9: Model12; + ref10: Model13; + ref11: Model14; + ref12: Model15; + ref13: Model16; + ref14: Model17; + ref15: Model18; + ref16: Model19; + ref17: Model1; + ref18: Model2; + ref19: Model3; + ref20: Model4; + ref21: Model5; + ref22: Model6; + ref23: Model7; + ref24: Model8; +} + +model Model4 { + id: int32; + ref1: Model5; + ref2: Model6; + ref3: Model7; + ref4: Model8; + ref5: Model9; + ref6: Model10; + ref7: Model11; + ref8: Model12; + ref9: Model13; + ref10: Model14; + ref11: Model15; + ref12: Model16; + ref13: Model17; + ref14: Model18; + ref15: Model19; + ref16: Model1; + ref17: Model2; + ref18: Model3; + ref19: Model4; + ref20: Model5; + ref21: Model6; + ref22: Model7; + ref23: Model8; + ref24: Model9; +} + +model Model5 { + id: int32; + ref1: Model6; + ref2: Model7; + ref3: Model8; + ref4: Model9; + ref5: Model10; + ref6: Model11; + ref7: Model12; + ref8: Model13; + ref9: Model14; + ref10: Model15; + ref11: Model16; + ref12: Model17; + ref13: Model18; + ref14: Model19; + ref15: Model1; + ref16: Model2; + ref17: Model3; + ref18: Model4; + ref19: Model5; + ref20: Model6; + ref21: Model7; + ref22: Model8; + ref23: Model9; + ref24: Model10; +} + +model Model6 { + id: int32; + ref1: Model7; + ref2: Model8; + ref3: Model9; + ref4: Model10; + ref5: Model11; + ref6: Model12; + ref7: Model13; + ref8: Model14; + ref9: Model15; + ref10: Model16; + ref11: Model17; + ref12: Model18; + ref13: Model19; + ref14: Model1; + ref15: Model2; + ref16: Model3; + ref17: Model4; + ref18: Model5; + ref19: Model6; + ref20: Model7; + ref21: Model8; + ref22: Model9; + ref23: Model10; + ref24: Model11; +} + +model Model7 { + id: int32; + ref1: Model8; + ref2: Model9; + ref3: Model10; + ref4: Model11; + ref5: Model12; + ref6: Model13; + ref7: Model14; + ref8: Model15; + ref9: Model16; + ref10: Model17; + ref11: Model18; + ref12: Model19; + ref13: Model1; + ref14: Model2; + ref15: Model3; + ref16: Model4; + ref17: Model5; + ref18: Model6; + ref19: Model7; + ref20: Model8; + ref21: Model9; + ref22: Model10; + ref23: Model11; + ref24: Model12; +} + +model Model8 { + id: int32; + ref1: Model9; + ref2: Model10; + ref3: Model11; + ref4: Model12; + ref5: Model13; + ref6: Model14; + ref7: Model15; + ref8: Model16; + ref9: Model17; + ref10: Model18; + ref11: Model19; + ref12: Model1; + ref13: Model2; + ref14: Model3; + ref15: Model4; + ref16: Model5; + ref17: Model6; + ref18: Model7; + ref19: Model8; + ref20: Model9; + ref21: Model10; + ref22: Model11; + ref23: Model12; + ref24: Model13; +} + +model Model9 { + id: int32; + ref1: Model10; + ref2: Model11; + ref3: Model12; + ref4: Model13; + ref5: Model14; + ref6: Model15; + ref7: Model16; + ref8: Model17; + ref9: Model18; + ref10: Model19; + ref11: Model1; + ref12: Model2; + ref13: Model3; + ref14: Model4; + ref15: Model5; + ref16: Model6; + ref17: Model7; + ref18: Model8; + ref19: Model9; + ref20: Model10; + ref21: Model11; + ref22: Model12; + ref23: Model13; + ref24: Model14; +} + +model Model10 { + id: int32; + ref1: Model11; + ref2: Model12; + ref3: Model13; + ref4: Model14; + ref5: Model15; + ref6: Model16; + ref7: Model17; + ref8: Model18; + ref9: Model19; + ref10: Model1; + ref11: Model2; + ref12: Model3; + ref13: Model4; + ref14: Model5; + ref15: Model6; + ref16: Model7; + ref17: Model8; + ref18: Model9; + ref19: Model10; + ref20: Model11; + ref21: Model12; + ref22: Model13; + ref23: Model14; + ref24: Model15; +} + +model Model11 { + id: int32; + ref1: Model12; + ref2: Model13; + ref3: Model14; + ref4: Model15; + ref5: Model16; + ref6: Model17; + ref7: Model18; + ref8: Model19; + ref9: Model1; + ref10: Model2; + ref11: Model3; + ref12: Model4; + ref13: Model5; + ref14: Model6; + ref15: Model7; + ref16: Model8; + ref17: Model9; + ref18: Model10; + ref19: Model11; + ref20: Model12; + ref21: Model13; + ref22: Model14; + ref23: Model15; + ref24: Model16; +} + +model Model12 { + id: int32; + ref1: Model13; + ref2: Model14; + ref3: Model15; + ref4: Model16; + ref5: Model17; + ref6: Model18; + ref7: Model19; + ref8: Model1; + ref9: Model2; + ref10: Model3; + ref11: Model4; + ref12: Model5; + ref13: Model6; + ref14: Model7; + ref15: Model8; + ref16: Model9; + ref17: Model10; + ref18: Model11; + ref19: Model12; + ref20: Model13; + ref21: Model14; + ref22: Model15; + ref23: Model16; + ref24: Model17; +} + +model Model13 { + id: int32; + ref1: Model14; + ref2: Model15; + ref3: Model16; + ref4: Model17; + ref5: Model18; + ref6: Model19; + ref7: Model1; + ref8: Model2; + ref9: Model3; + ref10: Model4; + ref11: Model5; + ref12: Model6; + ref13: Model7; + ref14: Model8; + ref15: Model9; + ref16: Model10; + ref17: Model11; + ref18: Model12; + ref19: Model13; + ref20: Model14; + ref21: Model15; + ref22: Model16; + ref23: Model17; + ref24: Model18; +} + +model Model14 { + id: int32; + ref1: Model15; + ref2: Model16; + ref3: Model17; + ref4: Model18; + ref5: Model19; + ref6: Model1; + ref7: Model2; + ref8: Model3; + ref9: Model4; + ref10: Model5; + ref11: Model6; + ref12: Model7; + ref13: Model8; + ref14: Model9; + ref15: Model10; + ref16: Model11; + ref17: Model12; + ref18: Model13; + ref19: Model14; + ref20: Model15; + ref21: Model16; + ref22: Model17; + ref23: Model18; + ref24: Model19; +} + +model Model15 { + id: int32; + ref1: Model16; + ref2: Model17; + ref3: Model18; + ref4: Model19; + ref5: Model1; + ref6: Model2; + ref7: Model3; + ref8: Model4; + ref9: Model5; + ref10: Model6; + ref11: Model7; + ref12: Model8; + ref13: Model9; + ref14: Model10; + ref15: Model11; + ref16: Model12; + ref17: Model13; + ref18: Model14; + ref19: Model15; + ref20: Model16; + ref21: Model17; + ref22: Model18; + ref23: Model19; + ref24: Model1; +} + +model Model16 { + id: int32; + ref1: Model17; + ref2: Model18; + ref3: Model19; + ref4: Model1; + ref5: Model2; + ref6: Model3; + ref7: Model4; + ref8: Model5; + ref9: Model6; + ref10: Model7; + ref11: Model8; + ref12: Model9; + ref13: Model10; + ref14: Model11; + ref15: Model12; + ref16: Model13; + ref17: Model14; + ref18: Model15; + ref19: Model16; + ref20: Model17; + ref21: Model18; + ref22: Model19; + ref23: Model1; + ref24: Model2; +} + +model Model17 { + id: int32; + ref1: Model18; + ref2: Model19; + ref3: Model1; + ref4: Model2; + ref5: Model3; + ref6: Model4; + ref7: Model5; + ref8: Model6; + ref9: Model7; + ref10: Model8; + ref11: Model9; + ref12: Model10; + ref13: Model11; + ref14: Model12; + ref15: Model13; + ref16: Model14; + ref17: Model15; + ref18: Model16; + ref19: Model17; + ref20: Model18; + ref21: Model19; + ref22: Model1; + ref23: Model2; + ref24: Model3; +} + +model Model18 { + id: int32; + ref1: Model19; + ref2: Model1; + ref3: Model2; + ref4: Model3; + ref5: Model4; + ref6: Model5; + ref7: Model6; + ref8: Model7; + ref9: Model8; + ref10: Model9; + ref11: Model10; + ref12: Model11; + ref13: Model12; + ref14: Model13; + ref15: Model14; + ref16: Model15; + ref17: Model16; + ref18: Model17; + ref19: Model18; + ref20: Model19; + ref21: Model1; + ref22: Model2; + ref23: Model3; + ref24: Model4; +} + +model Model19 { + id: int32; + ref1: Model1; + ref2: Model2; + ref3: Model3; + ref4: Model4; + ref5: Model5; + ref6: Model6; + ref7: Model7; + ref8: Model8; + ref9: Model9; + ref10: Model10; + ref11: Model11; + ref12: Model12; + ref13: Model13; + ref14: Model14; + ref15: Model15; + ref16: Model16; + ref17: Model17; + ref18: Model18; + ref19: Model19; + ref20: Model1; + ref21: Model2; + ref22: Model3; + ref23: Model4; + ref24: Model5; +} diff --git a/packages/compiler/test/scanner.test.ts b/packages/compiler/test/scanner.test.ts index e2cb213801c..9dfa8f645fa 100644 --- a/packages/compiler/test/scanner.test.ts +++ b/packages/compiler/test/scanner.test.ts @@ -396,8 +396,11 @@ describe("compiler: scanner", () => { Token.NeverKeyword, Token.UnknownKeyword, Token.ExternKeyword, + Token.InternalKeyword, Token.ValueOfKeyword, Token.TypeOfKeyword, + // `fn` can be either a statement or the start of an expr depending on context. + Token.FnKeyword, ]; let minKeywordLengthFound = Number.MAX_SAFE_INTEGER; let maxKeywordLengthFound = Number.MIN_SAFE_INTEGER; diff --git a/packages/compiler/test/semantic-walker.test.ts b/packages/compiler/test/semantic-walker.test.ts index 81e4e464567..88588deec44 100644 --- a/packages/compiler/test/semantic-walker.test.ts +++ b/packages/compiler/test/semantic-walker.test.ts @@ -1,5 +1,5 @@ import { deepStrictEqual, ok, strictEqual } from "assert"; -import { beforeEach, describe, expect, it } from "vitest"; +import { describe, expect, it } from "vitest"; import { NavigationOptions, getProperty, @@ -7,6 +7,7 @@ import { navigateType, navigateTypesInNamespace, } from "../src/core/semantic-walker.js"; +import { FunctionValue } from "../src/core/types.js"; import { Enum, Interface, @@ -21,21 +22,19 @@ import { UnionVariant, getNamespaceFullName, } from "../src/index.js"; -import { - BasicTestRunner, - TestHost, - createTestHost, - createTestRunner, -} from "../src/testing/index.js"; +import { mockFile, t } from "../src/testing/index.js"; +import { Tester } from "./tester.js"; describe("compiler: semantic walker", () => { - let host: TestHost; - let runner: BasicTestRunner; - - beforeEach(async () => { - host = await createTestHost(); - runner = await createTestRunner(); - }); + const NavigatorTester = Tester.files({ + "main.js": mockFile.js({ + $functions: { + Extern: { + foo() {}, + }, + }, + }), + }).import("./main.js"); function createCollector(customListener?: SemanticNodeListener) { const result = { @@ -50,6 +49,7 @@ describe("compiler: semantic walker", () => { namespaces: [] as Namespace[], exitNamespaces: [] as Namespace[], operations: [] as Operation[], + functions: [] as FunctionValue[], exitOperations: [] as Operation[], tuples: [] as Tuple[], exitTuples: [] as Tuple[], @@ -72,6 +72,10 @@ describe("compiler: semantic walker", () => { result.operations.push(x); return customListener?.operation?.(x); }, + function: (x) => { + result.functions.push(x); + return customListener?.function?.(x); + }, exitOperation: (x) => { result.exitOperations.push(x); return customListener?.exitOperation?.(x); @@ -141,23 +145,22 @@ describe("compiler: semantic walker", () => { customListener?: SemanticNodeListener, options?: NavigationOptions, ) { - host.addTypeSpecFile("main.tsp", typespec); - - await host.compile("main.tsp", { nostdlib: true }); + const { program } = await NavigatorTester.compile(typespec, { + compilerOptions: { nostdlib: true }, + }); const [result, listener] = createCollector(customListener); - navigateProgram(host.program, listener, options); + navigateProgram(program, listener, options); return result; } it("finds derived models", async () => { - const { Bird } = (await runner.compile(` + const { Bird } = await Tester.compile(t.code` namespace Test; @discriminator("kind") - @test - model Bird { + model ${t.model("Bird")} { kind: string; wingspan: int32; } @@ -180,7 +183,7 @@ describe("compiler: semantic walker", () => { hate?: Record; partner?: Bird; } - `)) as { Bird: Model }; + `); const visitedModels: Model[] = []; navigateType( @@ -201,12 +204,11 @@ describe("compiler: semantic walker", () => { }); it("doesn't visit derived models without the option", async () => { - const { Bird } = (await runner.compile(` + const { Bird } = await Tester.compile(t.code` namespace Test; @discriminator("kind") - @test - model Bird { + model ${t.model("Bird")} { kind: string; wingspan: int32; } @@ -229,7 +231,7 @@ describe("compiler: semantic walker", () => { hate?: Record; partner?: Bird; } - `)) as { Bird: Model }; + `); const visitedModels: Model[] = []; navigateType( @@ -602,10 +604,11 @@ describe("compiler: semantic walker", () => { describe("findInNamespace", () => { async function runFindInNamespace(code: string) { - host.addTypeSpecFile("main.tsp", code); - await host.compile("main.tsp", { nostdlib: true }); + const { program } = await Tester.compile(code, { + compilerOptions: { nostdlib: true }, + }); - const TargetNs = host.program.getGlobalNamespaceType().namespaces.get("TargetNs"); + const TargetNs = program.getGlobalNamespaceType().namespaces.get("TargetNs"); ok(TargetNs, "Should have a namespace called TargetNs"); const [result, listener] = createCollector(); navigateTypesInNamespace(TargetNs, listener); @@ -692,5 +695,17 @@ describe("compiler: semantic walker", () => { expect(results.models).toHaveLength(2); }); + + it("include functions", async () => { + const results = await runNavigator(` + namespace Extern; + + #suppress "experimental-feature" + extern fn foo(): string; + `); + + expect(results.functions).toHaveLength(1); + expect(results.functions[0].name).toBe("foo"); + }); }); }); diff --git a/packages/compiler/test/server/colorization.test.ts b/packages/compiler/test/server/colorization.test.ts index 772710b0551..33222abb70c 100644 --- a/packages/compiler/test/server/colorization.test.ts +++ b/packages/compiler/test/server/colorization.test.ts @@ -44,6 +44,7 @@ const Token = { fn: createToken("fn", "keyword.other.tsp"), extends: createToken("extends", "keyword.other.tsp"), extern: createToken("extern", "keyword.other.tsp"), + internal: createToken("internal", "storage.modifier.tsp"), is: createToken("is", "keyword.other.tsp"), valueof: createToken("valueof", "keyword.other.tsp"), typeof: createToken("typeof", "keyword.other.tsp"), diff --git a/packages/compiler/test/server/completion.test.ts b/packages/compiler/test/server/completion.test.ts index aca984ec5ee..26f68319109 100644 --- a/packages/compiler/test/server/completion.test.ts +++ b/packages/compiler/test/server/completion.test.ts @@ -20,7 +20,9 @@ describe("complete statement keywords", () => { ["model", true], ["op", true], ["extern", true], + ["internal", true], ["dec", true], + ["fn", true], ["alias", true], ["namespace", true], ["import", true], @@ -455,6 +457,60 @@ describe("identifiers", () => { ); }); + it("completes internal functions in the same project", async () => { + const completions = await complete(` + internal fn inScopeInternal(): valueof string; + fn inScopePublic(): valueof string; + + const x = inS┆(); + `); + + deepStrictEqual( + ["inScopeInternal", "inScopePublic"], + completions.items + .filter((c) => c.label === "inScopeInternal" || c.label === "inScopePublic") + .map((c) => c.label) + .sort(), + ); + }); + + it("does not complete internal functions from another package", async () => { + const completions = await complete( + ` + import "@typespec/internal-lib"; + using InternalLib; + + const x = libFn┆(); + `, + undefined, + { + "test/package.json": JSON.stringify({ + dependencies: { + "@typespec/internal-lib": "~0.1.0", + }, + }), + "test/node_modules/@typespec/internal-lib/package.json": JSON.stringify({ + name: "@typespec/internal-lib", + version: "0.1.0", + tspMain: "./main.tsp", + }), + "test/node_modules/@typespec/internal-lib/main.tsp": ` + namespace InternalLib; + internal fn libFnInternal(): valueof string; + fn libFnPublic(): valueof string; + `, + }, + ); + + deepStrictEqual( + ["libFnPublic"], + completions.items + .filter((c) => c.label === "libFnInternal" || c.label === "libFnPublic") + .map((c) => c.label) + .sort(), + ); + }); + it("completes decorators on models", async () => { const completions = await complete( ` diff --git a/packages/compiler/test/stdlib.test.ts b/packages/compiler/test/stdlib.test.ts index 10dad9ae14f..00b93077a71 100644 --- a/packages/compiler/test/stdlib.test.ts +++ b/packages/compiler/test/stdlib.test.ts @@ -1,14 +1,7 @@ -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { CompilerOptions } from "../src/index.js"; import { expectDiagnosticEmpty } from "../src/testing/index.js"; -import { createTestRunner } from "../src/testing/test-host.js"; -import { BasicTestRunner } from "../src/testing/types.js"; - -let runner: BasicTestRunner; - -beforeEach(async () => { - runner = await createTestRunner(); -}); +import { Tester } from "./tester.js"; const intrinsicTypes = [ "string", @@ -26,19 +19,25 @@ const intrinsicTypes = [ describe("with stdlib", () => { const options: CompilerOptions = { nostdlib: false }; it("compiles", async () => { - const diagnostics = await runner.diagnose(`model Bar {}`, options); + const diagnostics = await Tester.diagnose(`model Bar {}`, { + compilerOptions: options, + }); expectDiagnosticEmpty(diagnostics); }); describe("can use intrinsic types", () => { it.each(intrinsicTypes)("%s", async (type) => { - const diagnostics = await runner.diagnose(`model Foo { name: ${type}; }`, options); + const diagnostics = await Tester.diagnose(`model Foo { name: ${type}; }`, { + compilerOptions: options, + }); expectDiagnosticEmpty(diagnostics); }); }); describe("can stdlib types", () => { it.each(["url", "unixTimestamp32"])("%s", async (type) => { - const diagnostics = await runner.diagnose(`model Foo { name: ${type}; }`, options); + const diagnostics = await Tester.diagnose(`model Foo { name: ${type}; }`, { + compilerOptions: options, + }); expectDiagnosticEmpty(diagnostics); }); }); @@ -48,13 +47,17 @@ describe("without stdlib(--nostdlib)", () => { const options: CompilerOptions = { nostdlib: true }; it("compiles", async () => { - const diagnostics = await runner.diagnose(`model Bar {}`, options); + const diagnostics = await Tester.diagnose(`model Bar {}`, { + compilerOptions: options, + }); expectDiagnosticEmpty(diagnostics); }); describe("can use intrinsic types", () => { it.each(intrinsicTypes)("%s", async (type) => { - const diagnostics = await runner.diagnose(`model Foo { name: ${type}; }`, options); + const diagnostics = await Tester.diagnose(`model Foo { name: ${type}; }`, { + compilerOptions: options, + }); expectDiagnosticEmpty(diagnostics); }); }); diff --git a/packages/compiler/test/suppression.test.ts b/packages/compiler/test/suppression.test.ts index 236dfbf47d9..661c14ea4a6 100644 --- a/packages/compiler/test/suppression.test.ts +++ b/packages/compiler/test/suppression.test.ts @@ -1,28 +1,18 @@ -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { navigateProgram } from "../src/core/semantic-walker.js"; -import { - TestHost, - createTestHost, - expectDiagnosticEmpty, - expectDiagnostics, -} from "../src/testing/index.js"; +import { expectDiagnosticEmpty, expectDiagnostics } from "../src/testing/index.js"; +import { Tester } from "./tester.js"; describe("compiler: suppress", () => { - let host: TestHost; - - beforeEach(async () => { - host = await createTestHost(); - }); - async function run(typespec: string) { - host.addTypeSpecFile("main.tsp", typespec); - - await host.compile("main.tsp", { nostdlib: true }); + const { program } = await Tester.compile(typespec, { + compilerOptions: { nostdlib: true }, + }); - navigateProgram(host.program, { + navigateProgram(program, { model: (model) => { if (model.name === "") { - host.program.reportDiagnostic({ + program.reportDiagnostic({ severity: "warning", code: "no-inline-model", message: "Inline models are not recommended", @@ -32,7 +22,7 @@ describe("compiler: suppress", () => { }, modelProperty: (prop) => { if (prop.name === "id") { - host.program.reportDiagnostic({ + program.reportDiagnostic({ severity: "error", code: "no-id-property", message: "Id properties on models are forbidden", @@ -42,7 +32,7 @@ describe("compiler: suppress", () => { }, }); - return host.program.diagnostics; + return program.diagnostics; } it("emit warning diagnostics when there is no suppression", async () => { diff --git a/packages/compiler/test/test-utils.ts b/packages/compiler/test/test-utils.ts index 040fd6902d6..d2513e0589f 100644 --- a/packages/compiler/test/test-utils.ts +++ b/packages/compiler/test/test-utils.ts @@ -25,3 +25,45 @@ export function defineTest( }, }; } + +/** + * Tagged template literal that removes common indentation from a multiline string. + * Removes the leading newline and the common indentation from all lines, + * allowing test expectations to be written at a readable indent level. + * + * @example + * ```ts + * const expected = d` + * line one + * indented + * line three + * `; + * // Produces: + * // "line one\n indented\nline three" + * ``` + */ +export function d(strings: TemplateStringsArray, ...values: unknown[]): string { + const result = strings.reduce((acc, str, i) => acc + str + (values[i] ?? ""), ""); + + return dedent(result); +} + +/** + * Remove common leading indentation from a multiline string. + * Strips the first and last empty lines, then removes the indentation + * level of the first non-empty line from all lines. + */ +export function dedent(str: string): string { + // Remove leading and trailing line breaks + str = str.replace(/^\n|\n[ ]*$/g, ""); + + // Find the indent of the first line + const match = str.match(/^[ \t]+/); + const indent = match ? match[0] : ""; + + // Remove the indent from each line + return str + .split("\n") + .map((line) => (line.startsWith(indent) ? line.slice(indent.length) : line)) + .join("\n"); +} diff --git a/packages/compiler/test/type-utils.test.ts b/packages/compiler/test/type-utils.test.ts index dcf83ae6569..e5e40620d4b 100644 --- a/packages/compiler/test/type-utils.test.ts +++ b/packages/compiler/test/type-utils.test.ts @@ -1,5 +1,5 @@ import { ok } from "assert"; -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { Enum, Interface, @@ -11,34 +11,29 @@ import { isTemplateDeclarationOrInstance, isTemplateInstance, } from "../src/index.js"; -import { BasicTestRunner, createTestRunner } from "../src/testing/index.js"; +import { t } from "../src/testing/index.js"; +import { Tester } from "./tester.js"; describe("compiler: type-utils", () => { - let runner: BasicTestRunner; - - beforeEach(async () => { - runner = await createTestRunner(); - }); - describe("template utils", () => { it("check model is a template declaration", async () => { - await runner.compile(` + const { program } = await Tester.compile(` model Foo {t: T}; `); - const Foo = runner.program.checker.getGlobalNamespaceType().models.get("Foo")!; + const Foo = program.checker.getGlobalNamespaceType().models.get("Foo")!; ok(isTemplateDeclarationOrInstance(Foo)); ok(isTemplateDeclaration(Foo), "Should BE a template declaration"); ok(!isTemplateInstance(Foo), "Should NOT be a template instance"); }); it("check model reference is a template instance", async () => { - const { Bar } = (await runner.compile(` + const { Bar } = await Tester.compile(t.code` model Foo {t: T}; - @test model Bar { + model ${t.model("Bar")} { foo: Foo } - `)) as { Bar: Model }; + `); const Foo = Bar.properties.get("foo")!.type as Model; ok(isTemplateDeclarationOrInstance(Foo)); @@ -47,13 +42,13 @@ describe("compiler: type-utils", () => { }); it("check model expression inside a template instance is also a template instance", async () => { - const { Bar } = (await runner.compile(` + const { Bar } = await Tester.compile(t.code` model Foo {a: { b: T }}; - @test model Bar { + model ${t.model("Bar")} { foo: Foo } - `)) as { Bar: Model }; + `); const Foo = Bar.properties.get("foo")!.type as Model; const expr = Foo.properties.get("a")!.type; @@ -62,13 +57,13 @@ describe("compiler: type-utils", () => { }); it("check union expression inside a template instance is also a template instance", async () => { - const { Bar } = (await runner.compile(` + const { Bar } = await Tester.compile(t.code` model Foo {a: int32 | T}; - @test model Bar { + model ${t.model("Bar")} { foo: Foo } - `)) as { Bar: Model }; + `); const Foo = Bar.properties.get("foo")!.type as Model; const expr = Foo.properties.get("a")!.type; @@ -89,34 +84,21 @@ describe("compiler: type-utils", () => { BarOperation, FooNamespace, FooInterface, - } = (await runner.compile(` - @test - namespace Alpha { - @test - namespace SubAlpha { - @test model FooModel {} - @test enum FooEnum {} - @test op FooOperation(): unknown; - @test namespace FooNamespace {} - @test interface FooInterface { - @test op BarOperation(): unknown; + } = await Tester.compile(t.code` + namespace ${t.namespace("Alpha")} { + namespace ${t.namespace("SubAlpha")} { + model ${t.model("FooModel")} {} + enum ${t.enum("FooEnum")} {} + op ${t.op("FooOperation")}(): unknown; + namespace ${t.namespace("FooNamespace")} {} + interface ${t.interface("FooInterface")} { + op ${t.op("BarOperation")}(): unknown; } } } - @test - namespace Beta {} -`)) as { - Alpha: Namespace; - SubAlpha: Namespace; - Beta: Namespace; - FooModel: Model; - FooEnum: Enum; - FooOperation: Operation; - BarOperation: Operation; - FooNamespace: Namespace; - FooInterface: Interface; - }; + namespace ${t.namespace("Beta")} {} +`); const candidates: [string, Model | Enum | Operation | Namespace | Interface][] = [ ["FooModel", FooModel], diff --git a/packages/compiler/test/typekit/entity.test.ts b/packages/compiler/test/typekit/entity.test.ts index 396239e3e2a..7291d507310 100644 --- a/packages/compiler/test/typekit/entity.test.ts +++ b/packages/compiler/test/typekit/entity.test.ts @@ -1,10 +1,8 @@ -import { beforeEach, describe, expect, it } from "vitest"; +import { describe, expect, it } from "vitest"; import { Model } from "../../src/index.js"; -import { expectDiagnosticEmpty, expectDiagnostics } from "../../src/testing/expect.js"; -import { createTestHost } from "../../src/testing/test-host.js"; -import { createTestWrapper } from "../../src/testing/test-utils.js"; -import { BasicTestRunner } from "../../src/testing/types.js"; +import { expectDiagnosticEmpty, expectDiagnostics } from "../../src/testing/index.js"; import { $ } from "../../src/typekit/index.js"; +import { Tester } from "../tester.js"; import { getAssignables } from "./utils.js"; describe("$.entity.isAssignableTo", () => { @@ -50,7 +48,7 @@ describe("$.entity.isAssignableTo", () => { target: "string", code: ` model Template { field: A } - @test model Instance is Template<"foo">; + model Instance is Template<"foo">; `, }); expect(sourceProp.entityKind).toBe("MixedParameterConstraint"); @@ -69,7 +67,7 @@ describe("$.entity.isAssignableTo", () => { } = await getAssignables({ code: ` model Template { field: A } - @test model Instance is Template<"foo">; + model Instance is Template<"foo">; `, }); const indeterminate = (Instance as Model).sourceModels[0].model!.templateMapper!.args[0]; @@ -87,7 +85,7 @@ describe("$.entity.isAssignableTo", () => { } = await getAssignables({ code: ` model Template { field: A } - @test model Instance is Template<"foo">; + model Instance is Template<"foo">; `, }); const indeterminate = (Instance as Model).sourceModels[0].model!.templateMapper!.args[0]; @@ -109,7 +107,7 @@ describe("$.entity.isAssignableTo", () => { source: "int8", code: ` model Template { field: A } - @test model Instance is Template<"foo">; + model Instance is Template<"foo">; `, }); const indeterminate = (Instance as Model).sourceModels[0].model!.templateMapper!.args[0]; @@ -128,7 +126,7 @@ describe("$.entity.isAssignableTo", () => { target: "valueof string", code: ` model Template { field: A } - @test model Instance is Template<"foo">; + model Instance is Template<"foo">; `, }); const indeterminate = (Instance as Model).sourceModels[0].model!.templateMapper!.args[0]; @@ -159,14 +157,9 @@ describe("$.entity.isAssignableTo", () => { }); describe("$.entity.resolve", () => { - let runner: BasicTestRunner; - beforeEach(async () => { - runner = createTestWrapper(await createTestHost()); - }); - it("resolve resolves existing types", async () => { - await runner.compile(""); - const tk = $(runner.program); + const { program } = await Tester.compile(""); + const tk = $(program); const stringType = tk.entity.resolve("TypeSpec.string"); expect(stringType).toBeDefined(); expect(tk.builtin.string).toBe(stringType); @@ -177,8 +170,8 @@ describe("$.entity.resolve", () => { }); it("resolve resolves existing values", async () => { - await runner.compile(`const stringValue = "test";`); - const tk = $(runner.program); + const { program } = await Tester.compile(`const stringValue = "test";`); + const tk = $(program); const stringValue = tk.entity.resolve("stringValue"); expect(stringValue).toBeDefined(); expect(tk.value.is(stringValue!)).toBe(true); @@ -189,13 +182,12 @@ describe("$.entity.resolve", () => { }); it("resolve returns undefined and diagnostics for invalid references", async () => { - await runner.compile(""); - const unknownType = $(runner.program).entity.resolve("UnknownModel"); + const { program } = await Tester.compile(""); + const unknownType = $(program).entity.resolve("UnknownModel"); expect(unknownType).toBeUndefined(); - const [unknownTypeDiag, diagnostics] = $(runner.program).entity.resolve.withDiagnostics( - "UnknownModel", - ); + const [unknownTypeDiag, diagnostics] = + $(program).entity.resolve.withDiagnostics("UnknownModel"); expect(unknownTypeDiag).toBeUndefined(); expect(diagnostics).toHaveLength(1); expect(diagnostics[0].code).toBe("invalid-ref"); diff --git a/packages/compiler/test/typekit/model.test.ts b/packages/compiler/test/typekit/model.test.ts index 9dacd23a535..779ea13b922 100644 --- a/packages/compiler/test/typekit/model.test.ts +++ b/packages/compiler/test/typekit/model.test.ts @@ -1,42 +1,28 @@ import { assert, expect, it } from "vitest"; import { Operation } from "../../src/index.js"; -import { expectDiagnostics } from "../../src/testing/expect.js"; -import { createTestHost } from "../../src/testing/test-host.js"; -import { createTestWrapper } from "../../src/testing/test-utils.js"; +import { expectDiagnostics, t } from "../../src/testing/index.js"; import { $ } from "../../src/typekit/index.js"; -import { createContextMock, getTypes } from "./utils.js"; +import { Tester } from "../tester.js"; it("can check if a type is a Model", async () => { - const { - Foo, - context: { program }, - } = await getTypes( - ` - model Foo {}; - `, - ["Foo"], - ); + const { Foo, program } = await Tester.compile(t.code` + model ${t.model("Foo")} {}; + `); expect($(program).model.is(Foo)).toBe(true); }); it("returns false whe the type is not a model", async () => { - const { - Foo, - context: { program }, - } = await getTypes( - ` - interface Foo {}; - `, - ["Foo"], - ); + const { Foo, program } = await Tester.compile(t.code` + interface ${t.interface("Foo")} {}; + `); expect($(program).model.is(Foo)).toBe(false); expect($(program).model.is($(program).value.create("foo"))).toBe(false); }); it("creates a new Model", async () => { - const { program } = await createContextMock(); + const { program } = await Tester.compile(""); const foo = $(program).model.create({ name: "Foo", properties: {}, @@ -46,20 +32,13 @@ it("creates a new Model", async () => { }); it("can get the effective model type", async () => { - const { - Foo, - create, - context: { program }, - } = await getTypes( - ` - model Foo { + const { Foo, create, program } = await Tester.compile(t.code` + model ${t.model("Foo")} { id: string; }; - op create(...Foo): void; - `, - ["Foo", "create"], - ); + op ${t.op("create")}(...Foo): void; + `); const createParameters = (create as Operation).parameters; const model = $(program).model.getEffectiveModel(createParameters); @@ -71,21 +50,13 @@ it("can get the effective model type", async () => { }); it("can get the discriminated union type", async () => { - const { - Pet, - Cat, - Dog, - context: { program }, - } = await getTypes( - ` + const { Pet, Cat, Dog, program } = await Tester.compile(t.code` @discriminator("kind") - model Pet { kind: string } + model ${t.model("Pet")} { kind: string } - model Cat extends Pet { kind: "cat", meow: boolean } - model Dog extends Pet { kind: "dog", bark: boolean } - `, - ["Pet", "Cat", "Dog"], - ); + model ${t.model("Cat")} extends Pet { kind: "cat", meow: boolean } + model ${t.model("Dog")} extends Pet { kind: "dog", bark: boolean } + `); assert.ok(Pet.kind === "Model"); @@ -97,18 +68,16 @@ it("can get the discriminated union type", async () => { }); it("can get diagnostics from getDiscriminatedUnion", async () => { - const runner = createTestWrapper(await createTestHost()); - const [{ Pet }] = await runner.compileAndDiagnose(` - @test + const [{ Pet, program }] = await Tester.compileAndDiagnose(t.code` @discriminator("kind") - model Pet { kind: string } + model ${t.model("Pet")} { kind: string } model Cat extends Pet { meow: boolean } `); assert.ok(Pet.kind === "Model"); - const [, diagnostics] = $(runner.program).model.getDiscriminatedUnion.withDiagnostics(Pet); + const [, diagnostics] = $(program).model.getDiscriminatedUnion.withDiagnostics(Pet); expectDiagnostics(diagnostics, { code: "missing-discriminator-property", }); diff --git a/packages/compiler/test/typekit/operation.test.ts b/packages/compiler/test/typekit/operation.test.ts index 1ba527179b8..b47d8a3284a 100644 --- a/packages/compiler/test/typekit/operation.test.ts +++ b/packages/compiler/test/typekit/operation.test.ts @@ -1,24 +1,16 @@ import { assert, expect, it } from "vitest"; -import { expectDiagnostics } from "../../src/testing/expect.js"; -import { createTestHost } from "../../src/testing/test-host.js"; -import { createTestWrapper } from "../../src/testing/test-utils.js"; +import { expectDiagnostics, t } from "../../src/testing/index.js"; import { $ } from "../../src/typekit/index.js"; -import { getTypes } from "./utils.js"; +import { Tester } from "../tester.js"; it("can get paging metadata", async () => { - const { - listPets, - context: { program }, - } = await getTypes( - ` + const { listPets, program } = await Tester.compile(t.code` model Pet { name: string } - @list op listPets(@continuationToken token?: string): { + @list op ${t.op("listPets")}(@continuationToken token?: string): { @pageItems pets: Pet[]; }; - `, - ["listPets"], - ); + `); assert.ok(listPets.kind === "Operation"); @@ -28,18 +20,17 @@ it("can get paging metadata", async () => { }); it("can get diagnostics from getPagingMetadata", async () => { - const runner = createTestWrapper(await createTestHost()); - const [{ listPets }] = await runner.compileAndDiagnose(` - model Pet { name: string } + const [{ listPets, program }] = await Tester.compileAndDiagnose(t.code` + model Pet { name: string } - @test @list op listPets(): { - pets: Pet[]; - }; - `); + @list op ${t.op("listPets")}(): { + pets: Pet[]; + }; + `); assert.ok(listPets.kind === "Operation"); - const [, diagnostics] = $(runner.program).operation.getPagingMetadata.withDiagnostics(listPets); + const [, diagnostics] = $(program).operation.getPagingMetadata.withDiagnostics(listPets); expectDiagnostics(diagnostics, { code: "missing-paging-items", }); diff --git a/packages/compiler/test/typekit/type.test.ts b/packages/compiler/test/typekit/type.test.ts index 46c422de864..bb8404a02c1 100644 --- a/packages/compiler/test/typekit/type.test.ts +++ b/packages/compiler/test/typekit/type.test.ts @@ -1,9 +1,10 @@ import { assert, describe, expect, it } from "vitest"; import { Enum, Model, Namespace, Scalar, Union } from "../../src/core/types.js"; import { isTemplateInstance } from "../../src/index.js"; -import { expectDiagnosticEmpty, expectDiagnostics } from "../../src/testing/expect.js"; +import { expectDiagnosticEmpty, expectDiagnostics, t } from "../../src/testing/index.js"; import { $ } from "../../src/typekit/index.js"; -import { getAssignables, getTypes } from "./utils.js"; +import { Tester } from "../tester.js"; +import { getAssignables } from "./utils.js"; describe("is", () => { it("checks if an entity is a type", async () => { @@ -22,17 +23,11 @@ describe("is", () => { }); it("should clone a model", async () => { - const { - Foo, - context: { program }, - } = await getTypes( - ` - model Foo { - props: string; - } - `, - ["Foo"], - ); + const { Foo, program } = await Tester.compile(t.code` + model ${t.model("Foo")} { + props: string; + } + `); const clone = $(program).type.clone(Foo) as Model; clone.properties.get("props")!.name = "props"; @@ -40,31 +35,22 @@ it("should clone a model", async () => { describe("getPlausibleName", () => { it("returns the original name if exists", async () => { - const { - Foo, - Bar, - Baz, - Qux, - context: { program }, - } = await getTypes( - ` - model Foo { + const { Foo, Bar, Baz, Qux, program } = await Tester.compile(t.code` + model ${t.model("Foo")} { props: string; } - - union Bar { + + union ${t.union("Bar")} { "hi"; "bye"; } - enum Baz { + enum ${t.enum("Baz")} { Baz: "baz"; }; - scalar Qux extends string; - `, - ["Foo", "Bar", "Baz", "Qux"], - ); + scalar ${t.scalar("Qux")} extends string; + `); expect($(program).type.getPlausibleName(Foo as Model)).toBe("Foo"); expect($(program).type.getPlausibleName(Bar as Union)).toBe("Bar"); @@ -73,25 +59,18 @@ describe("getPlausibleName", () => { }); it("returns a generated name for anonymous model", async () => { - const { - Bar, - Test, - context: { program }, - } = await getTypes( - ` - model Foo {t: T, k: K}; - - @test model Bar { + const { Bar, Test, program } = await Tester.compile(t.code` + model Foo {t: T, k: K}; + + model ${t.model("Bar")} { foo: Foo } - @test model Test { + model ${t.model("Test")} { foo: Foo } model Baz {} model Qux {} - `, - ["Bar", "Test"], - ); + `); const Foo = (Bar as Model).properties.get("foo")!.type as Model; const Foo2 = (Test as Model).properties.get("foo")!.type as Model; @@ -103,19 +82,13 @@ describe("getPlausibleName", () => { }); it("handles scalars correctly", async () => { - const { - Bar, - context: { program }, - } = await getTypes( - ` + const { Bar, program } = await Tester.compile(t.code` scalar myInt extends int32; - @test model Bar { + model ${t.model("Bar")} { myIntArray: Array; myInt: myInt; } - `, - ["Bar"], - ); + `); const myIntArray = (Bar as Model).properties.get("myIntArray")!.type as Model; expect(isTemplateInstance(myIntArray)).toBe(true); @@ -127,21 +100,15 @@ describe("getPlausibleName", () => { }); it("returns a generated name for various nesting levels", async () => { - const { - Bar, - context: { program }, - } = await getTypes( - ` + const { Bar, program } = await Tester.compile(t.code` model Foo {t: T}; model Box {t: T}; - @test model Bar { + model ${t.model("Bar")} { stringArrayArray: Array>; stringFoo: Foo; boxFoo: Box>; } - `, - ["Bar"], - ); + `); const stringArrayArray = (Bar as Model).properties.get("stringArrayArray")!.type as Model; const stringFoo = (Bar as Model).properties.get("stringFoo")!.type as Model; @@ -157,17 +124,11 @@ describe("getPlausibleName", () => { describe("minValue and maxValue", () => { it("can get the min and max values from number", async () => { - const { - myNumber, - context: { program }, - } = await getTypes( - ` - @minValue(1) - @maxValue(10) - scalar myNumber extends numeric; - `, - ["myNumber"], - ); + const { myNumber, program } = await Tester.compile(t.code` + @minValue(1) + @maxValue(10) + scalar ${t.scalar("myNumber")} extends numeric; + `); const max = $(program).type.maxValue(myNumber); const min = $(program).type.minValue(myNumber); @@ -177,19 +138,13 @@ describe("minValue and maxValue", () => { }); it("can get the min and max values from modelProperty", async () => { - const { - A, - context: { program }, - } = await getTypes( - ` - model A { - @minValue(15) - @maxValue(55) - foo: int32; - } - `, - ["A"], - ); + const { A, program } = await Tester.compile(t.code` + model ${t.model("A")} { + @minValue(15) + @maxValue(55) + foo: int32; + } + `); const max = $(program).type.maxValue((A as Model).properties.get("foo")!); const min = $(program).type.minValue((A as Model).properties.get("foo")!); @@ -201,17 +156,11 @@ describe("minValue and maxValue", () => { describe("minLength and maxLength", () => { it("can get the min and max length from string", async () => { - const { - myString, - context: { program }, - } = await getTypes( - ` - @minLength(1) - @maxLength(10) - scalar myString extends string; - `, - ["myString"], - ); + const { myString, program } = await Tester.compile(t.code` + @minLength(1) + @maxLength(10) + scalar ${t.scalar("myString")} extends string; + `); const max = $(program).type.maxLength(myString); const min = $(program).type.minLength(myString); @@ -221,19 +170,13 @@ describe("minLength and maxLength", () => { }); it("can get the min and max length from modelProperty", async () => { - const { - A, - context: { program }, - } = await getTypes( - ` - model A { - @minLength(15) - @maxLength(55) - foo: string; - } - `, - ["A"], - ); + const { A, program } = await Tester.compile(t.code` + model ${t.model("A")} { + @minLength(15) + @maxLength(55) + foo: string; + } + `); const max = $(program).type.maxLength((A as Model).properties.get("foo")!); const min = $(program).type.minLength((A as Model).properties.get("foo")!); @@ -245,17 +188,11 @@ describe("minLength and maxLength", () => { describe("minItems and maxItems", () => { it("can get the min and max items from array", async () => { - const { - myArray, - context: { program }, - } = await getTypes( - ` - @minItems(1) - @maxItems(10) - model myArray is Array; - `, - ["myArray"], - ); + const { myArray, program } = await Tester.compile(t.code` + @minItems(1) + @maxItems(10) + model ${t.model("myArray")} is Array; + `); const max = $(program).type.maxItems(myArray); const min = $(program).type.minItems(myArray); @@ -265,19 +202,13 @@ describe("minItems and maxItems", () => { }); it("can get the min and max items from modelProperty", async () => { - const { - A, - context: { program }, - } = await getTypes( - ` - model A { - @minItems(15) - @maxItems(55) - foo: string[]; - } - `, - ["A"], - ); + const { A, program } = await Tester.compile(t.code` + model ${t.model("A")} { + @minItems(15) + @maxItems(55) + foo: string[]; + } + `); const max = $(program).type.maxItems((A as Model).properties.get("foo")!); const min = $(program).type.minItems((A as Model).properties.get("foo")!); @@ -289,17 +220,11 @@ describe("minItems and maxItems", () => { describe("minValueExclusive and maxValueExclusive", () => { it("can get the min and max values from number", async () => { - const { - myNumber, - context: { program }, - } = await getTypes( - ` - @minValueExclusive(1) - @maxValueExclusive(10) - scalar myNumber extends numeric; - `, - ["myNumber"], - ); + const { myNumber, program } = await Tester.compile(t.code` + @minValueExclusive(1) + @maxValueExclusive(10) + scalar ${t.scalar("myNumber")} extends numeric; + `); const max = $(program).type.maxValueExclusive(myNumber); const min = $(program).type.minValueExclusive(myNumber); @@ -309,19 +234,13 @@ describe("minValueExclusive and maxValueExclusive", () => { }); it("can get the min and max values from modelProperty", async () => { - const { - A, - context: { program }, - } = await getTypes( - ` - model A { - @minValueExclusive(15) - @maxValueExclusive(55) - foo: int32; - } - `, - ["A"], - ); + const { A, program } = await Tester.compile(t.code` + model ${t.model("A")} { + @minValueExclusive(15) + @maxValueExclusive(55) + foo: int32; + } + `); const max = $(program).type.maxValueExclusive((A as Model).properties.get("foo")!); const min = $(program).type.minValueExclusive((A as Model).properties.get("foo")!); @@ -332,20 +251,13 @@ describe("minValueExclusive and maxValueExclusive", () => { }); it("isError can check if a type is an error model", async () => { - const { - Foo, - Error, - context: { program }, - } = await getTypes( - ` - @error - model Error { - props: string; - } - model Foo {} - `, - ["Foo", "Error"], - ); + const { Foo, Error, program } = await Tester.compile(t.code` + @error + model ${t.model("Error")} { + props: string; + } + model ${t.model("Foo")} {} + `); expect($(program).type.isError(Error)).toBe(true); expect($(program).type.isError(Foo)).toBe(false); @@ -353,32 +265,20 @@ it("isError can check if a type is an error model", async () => { describe("inNamespace", () => { it("checks that a namespace belongs to itself", async () => { - const { - Root, - context: { program }, - } = await getTypes( - ` - namespace Root {} - `, - ["Root"], - ); + const { Root, program } = await Tester.compile(t.code` + namespace ${t.namespace("Root")} {} + `); expect($(program).type.inNamespace(Root, Root as Namespace)).toBe(true); }); it("checks direct namespace membership", async () => { - const { - Root, - context: { program }, - } = await getTypes( - ` - namespace Root { + const { Root, program } = await Tester.compile(t.code` + namespace ${t.namespace("Root")} { namespace Child1 { namespace Child2 {} } } - `, - ["Root"], - ); + `); const child1 = (Root as Namespace).namespaces.get("Child1"); expect(child1).toBeDefined(); @@ -390,24 +290,17 @@ describe("inNamespace", () => { }); it("checks model property namespace membership", async () => { - const { - Root, - Outside, - context: { program }, - } = await getTypes( - ` - namespace Root { + const { Root, Outside, program } = await Tester.compile(t.code` + namespace ${t.namespace("Root")} { model Inside { prop: string; } } - model Outside { + model ${t.model("Outside")} { prop: string; } - `, - ["Root", "Inside", "Outside"], - ); + `); const model1 = (Root as Namespace).models.get("Inside"); expect(model1).toBeDefined(); @@ -422,20 +315,14 @@ describe("inNamespace", () => { }); it("checks enum member namespace membership", async () => { - const { - Root, - context: { program }, - } = await getTypes( - ` - namespace Root { + const { Root, program } = await Tester.compile(t.code` + namespace ${t.namespace("Root")} { enum Test { A, B } } - `, - ["Root"], - ); + `); const enum1 = (Root as Namespace).enums.get("Test"); const enumMember = enum1?.members.get("A"); @@ -445,20 +332,14 @@ describe("inNamespace", () => { }); it("checks union variant namespace membership", async () => { - const { - Root, - context: { program }, - } = await getTypes( - ` - namespace Root { + const { Root, program } = await Tester.compile(t.code` + namespace ${t.namespace("Root")} { union Test { A: string, B: int32 } } - `, - ["Root"], - ); + `); const union = (Root as Namespace).unions.get("Test"); const variant = union?.variants.get("A"); @@ -468,19 +349,13 @@ describe("inNamespace", () => { }); it("checks interface operation namespace membership", async () => { - const { - Root, - context: { program }, - } = await getTypes( - ` - namespace Root { + const { Root, program } = await Tester.compile(t.code` + namespace ${t.namespace("Root")} { interface Test { op myOp(): void; } } - `, - ["Root"], - ); + `); const test = (Root as Namespace).interfaces.get("Test"); const operation = test?.operations.get("myOp"); @@ -490,17 +365,11 @@ describe("inNamespace", () => { }); it("checks operations namespace membership", async () => { - const { - Root, - context: { program }, - } = await getTypes( - ` - namespace Root { + const { Root, program } = await Tester.compile(t.code` + namespace ${t.namespace("Root")} { op myOp(): void; } - `, - ["Root"], - ); + `); const operation = (Root as Namespace).operations.get("myOp"); expect(operation).toBeDefined(); @@ -508,19 +377,12 @@ describe("inNamespace", () => { }); it("returns false for types outside the namespace", async () => { - const { - Root, - Outside, - context: { program }, - } = await getTypes( - ` - namespace Root { + const { Root, Outside, program } = await Tester.compile(t.code` + namespace ${t.namespace("Root")} { namespace Child1 {} } - namespace Outside {} - `, - ["Root", "Outside"], - ); + namespace ${t.namespace("Outside")} {} + `); const child1 = (Root as Namespace).namespaces.get("Child1"); expect(child1).toBeDefined(); @@ -528,15 +390,9 @@ describe("inNamespace", () => { }); it("returns false for types without namespace", async () => { - const { - MyNamespace, - context: { program }, - } = await getTypes( - ` - namespace MyNamespace { } - `, - ["MyNamespace"], - ); + const { MyNamespace, program } = await Tester.compile(t.code` + namespace ${t.namespace("MyNamespace")} { } + `); const stringLiteral = $(program).literal.create("test"); expect($(program).type.inNamespace(stringLiteral, MyNamespace as Namespace)).toBe(false); @@ -577,7 +433,7 @@ describe("isAssignableTo", () => { } = await getAssignables({ code: ` model Template { field: A } - @test model Instance is Template<"foo">; + model Instance is Template<"foo">; `, }); const indeterminate = (Instance as Model).sourceModels[0].model!.templateMapper!.args[0]; @@ -610,17 +466,12 @@ describe("isAssignableTo", () => { describe("resolve", () => { it("resolves to the value type", async () => { - const { - context: { program }, - } = await getTypes( - ` - alias stringLiteral = "hello"; - alias aliasedLiteral = stringLiteral; - enum Foo { one: 1, two: 2 } - const aValue = "value"; - `, - [], - ); + const { program } = await Tester.compile(` + alias stringLiteral = "hello"; + alias aliasedLiteral = stringLiteral; + enum Foo { one: 1, two: 2 } + const aValue = "value"; + `); const tk = $(program); const stringLiteral = tk.type.resolve("stringLiteral"); @@ -639,14 +490,9 @@ describe("resolve", () => { }); it("throws an error for incorrect kind assertion", async () => { - const { - context: { program }, - } = await getTypes( - ` - alias stringLiteral = "hello"; - `, - [], - ); + const { program } = await Tester.compile(` + alias stringLiteral = "hello"; + `); const tk = $(program); expect(() => tk.type.resolve("stringLiteral", "Boolean")).toThrow( @@ -655,9 +501,7 @@ describe("resolve", () => { }); it("returns undefined and diagnostics for invalid references", async () => { - const { - context: { program }, - } = await getTypes(``, []); + const { program } = await Tester.compile(``); const tk = $(program); const [unknownType, diagnostics] = tk.type.resolve.withDiagnostics("unknownType"); diff --git a/packages/compiler/test/typekit/union.test.ts b/packages/compiler/test/typekit/union.test.ts index 9c4d8ac3afc..734f44bc087 100644 --- a/packages/compiler/test/typekit/union.test.ts +++ b/packages/compiler/test/typekit/union.test.ts @@ -1,20 +1,13 @@ import { assert, expect, it } from "vitest"; import { Enum, getDoc, StringLiteral, Union } from "../../src/index.js"; -import { expectDiagnostics } from "../../src/testing/expect.js"; -import { createTestHost } from "../../src/testing/test-host.js"; -import { createTestWrapper } from "../../src/testing/test-utils.js"; +import { expectDiagnostics, t } from "../../src/testing/index.js"; import { $ } from "../../src/typekit/index.js"; -import { createContextMock, getTypes } from "./utils.js"; +import { Tester } from "../tester.js"; it("can create a union", async () => { - const { - context: { program }, - } = await getTypes( - ` - model Foo {} - `, - ["Foo"], - ); + const { program } = await Tester.compile(t.code` + model ${t.model("Foo")} {} + `); const union = $(program).union.create({ name: "Foo", @@ -27,22 +20,13 @@ it("can create a union", async () => { }); it("can create a union from array of types", async () => { - const { - Foo, - Bar, - Qux, - FooBar, - context: { program }, - } = await getTypes( - ` + const { Foo, Bar, Qux, FooBar, program } = await Tester.compile(t.code` @doc("docs for foo") - model Foo {} - model Bar {} - scalar Qux extends string; - alias FooBar = Foo | Bar; - `, - ["Foo", "Bar", "Qux", "FooBar"], - ); + model ${t.model("Foo")} {} + model ${t.model("Bar")} {} + scalar ${t.scalar("Qux")} extends string; + alias ${t.type("FooBar")} = Foo | Bar; + `); const union = $(program).union.create([Foo, Bar, Qux, FooBar]); expect(union).toBeDefined(); @@ -67,32 +51,25 @@ it("can create a union from array of types", async () => { }); it("can check if the union is extensible", async () => { - const { - Foo, - Bar, - context: { program }, - } = await getTypes( - ` - union Foo { + const { Foo, Bar, program } = await Tester.compile(t.code` + union ${t.union("Foo")} { string; "hi"; "bye"; } - union Bar { + union ${t.union("Bar")} { "hi"; "bye"; } - `, - ["Foo", "Bar"], - ); + `); expect($(program).union.isExtensible(Foo as Union)).toBe(true); expect($(program).union.isExtensible(Bar as Union)).toBe(false); }); it("can build unions from enums", async () => { - const { program } = await createContextMock(); + const { program } = await Tester.compile(""); const tk = $(program); const srcEnum = $(program).enum.create({ @@ -110,7 +87,7 @@ it("can build unions from enums", async () => { }); it("can build unions from enums with custom values", async () => { - const { program } = await createContextMock(); + const { program } = await Tester.compile(""); const tk = $(program); const srcEnum = tk.enum.create({ @@ -133,20 +110,15 @@ it("can build unions from enums with custom values", async () => { }); it("preserves documentation when copying", async () => { - const { - Foo, - context: { program }, - } = await getTypes( - ` + const { Foo, program } = await Tester.compile(t.code` @doc("enum named foo") - enum Foo { + enum ${t.enum("Foo")} { /** * doc-comment */ a: 1; - }`, - ["Foo"], - ); + } + `); const union = $(program).union.createFromEnum(Foo as Enum); @@ -155,21 +127,13 @@ it("preserves documentation when copying", async () => { }); it("can get the discriminated union type", async () => { - const { - Pet, - Cat, - Dog, - context: { program }, - } = await getTypes( - ` - @discriminated - union Pet{ cat: Cat, dog: Dog } - - model Cat { name: string, meow: boolean } - model Dog { name: string, bark: boolean } - `, - ["Pet", "Cat", "Dog"], - ); + const { Pet, Cat, Dog, program } = await Tester.compile(t.code` + @discriminated + union ${t.union("Pet")}{ cat: Cat, dog: Dog } + + model ${t.model("Cat")} { name: string, meow: boolean } + model ${t.model("Dog")} { name: string, bark: boolean } + `); assert.ok(Pet.kind === "Union"); @@ -184,36 +148,29 @@ it("can get the discriminated union type", async () => { }); it("can get diagnostics from getDiscriminatedUnion", async () => { - const runner = createTestWrapper(await createTestHost()); - const [{ Pet }] = await runner.compileAndDiagnose(` - @test - @discriminated - union Pet{ Cat, Dog } - - model Cat { name: string, meow: boolean } - model Dog { name: string, bark: boolean } + const [{ Pet, program }] = await Tester.compileAndDiagnose(t.code` + @discriminated + union ${t.union("Pet")}{ Cat, Dog } + + model Cat { name: string, meow: boolean } + model Dog { name: string, bark: boolean } `); assert.ok(Pet.kind === "Union"); - const [, diagnostics] = $(runner.program).union.getDiscriminatedUnion.withDiagnostics(Pet); + const [, diagnostics] = $(program).union.getDiscriminatedUnion.withDiagnostics(Pet); expectDiagnostics(diagnostics, { code: "invalid-discriminated-union-variant", }); }); it("can check if an entity is a union", async () => { - const { - Foo, - context: { program }, - } = await getTypes( - ` - union Foo { + const { Foo, program } = await Tester.compile(t.code` + union ${t.union("Foo")} { hi: "hello", bye: "goodbye" - }`, - ["Foo"], - ); + } + `); const tk = $(program); expect(tk.union.is(Foo)).toBe(true); diff --git a/packages/compiler/test/typekit/utils.ts b/packages/compiler/test/typekit/utils.ts index a89a8f78889..825e5033fdf 100644 --- a/packages/compiler/test/typekit/utils.ts +++ b/packages/compiler/test/typekit/utils.ts @@ -1,20 +1,20 @@ +import { createPerfReporter } from "../../src/core/perf.js"; import type { Program } from "../../src/core/program.js"; import type { EmitContext, Type } from "../../src/core/types.js"; -import { createTestHost } from "../../src/testing/test-host.js"; -import { createTestWrapper } from "../../src/testing/test-utils.js"; +import { mockFile } from "../../src/testing/index.js"; +import { Tester } from "../tester.js"; export async function createContextMock(program?: Program): Promise> { if (!program) { - const host = await createTestHost(); - const runner = createTestWrapper(host); - await runner.compile(""); - program = runner.program; + const result = await Tester.compile(""); + program = result.program; } return { program, emitterOutputDir: "", options: {}, + perf: createPerfReporter(), }; } @@ -22,16 +22,14 @@ export async function getTypes( code: string, names: T[], ): Promise<{ [k in T]: Type } & { context: EmitContext }> { - const host = await createTestHost(); - const runner = createTestWrapper(host); - await runner.compile(code); + const { program } = await Tester.compile(code); const obj: any = { - context: await createContextMock(runner.program), + context: await createContextMock(program), }; for (const name of names) { - obj[name] = runner.program.resolveTypeReference(name)[0]!; + obj[name] = program.resolveTypeReference(name)[0]!; } return obj; @@ -43,28 +41,28 @@ export type GetAssignablesProps = { code?: string; }; export async function getAssignables({ source, target, code }: GetAssignablesProps) { - const host = await createTestHost(); - const runner = createTestWrapper(host); - host.addJsFile("mock.js", { - $decorators: { - TestMock: { - mock: () => null, + const { program } = await Tester.files({ + "mock.js": mockFile.js({ + $decorators: { + TestMock: { + mock: () => null, + }, }, - }, - }); - - const testTypes = await runner.compile(` + }), + }).compile(` import "./mock.js"; namespace TestMock; ${code ?? ""} extern dec mock(target: unknown, source: ${source ?? "unknown"}, destination: ${target ?? "unknown"}); `); - const decDeclaration = runner.program - .getGlobalNamespaceType() - .namespaces.get("TestMock")! - .decoratorDeclarations.get("mock"); + + const testMockNs = program.getGlobalNamespaceType().namespaces.get("TestMock")!; + const decDeclaration = testMockNs.decoratorDeclarations.get("mock"); const sourceProp = decDeclaration!.parameters[0].type!; const targetProp = decDeclaration!.parameters[1].type!; - return { sourceProp, targetProp, program: runner.program, types: testTypes }; + const types: Record = {}; + for (const [name, model] of testMockNs.models) types[name] = model; + + return { sourceProp, targetProp, program, types }; } diff --git a/packages/compiler/test/typekit/value.test.ts b/packages/compiler/test/typekit/value.test.ts index 311f181d449..3ded690238c 100644 --- a/packages/compiler/test/typekit/value.test.ts +++ b/packages/compiler/test/typekit/value.test.ts @@ -1,8 +1,9 @@ import { assert, describe, expect, it } from "vitest"; import { Model } from "../../src/index.js"; -import { expectDiagnosticEmpty, expectDiagnostics } from "../../src/testing/expect.js"; +import { expectDiagnosticEmpty, expectDiagnostics } from "../../src/testing/index.js"; import { $ } from "../../src/typekit/index.js"; -import { getAssignables, getTypes } from "./utils.js"; +import { Tester } from "../tester.js"; +import { getAssignables } from "./utils.js"; describe("isAssignableTo", () => { it("validates against Type", async () => { @@ -39,7 +40,7 @@ describe("isAssignableTo", () => { } = await getAssignables({ code: ` model Template { field: A } - @test model Instance is Template<"foo">; + model Instance is Template<"foo">; `, }); const indeterminate = (Instance as Model).sourceModels[0].model!.templateMapper!.args[0]; @@ -84,18 +85,13 @@ describe("isOfType", () => { describe("resolve", () => { it("resolves to the value type", async () => { - const { - context: { program }, - } = await getTypes( - ` - const stringConstant = "hello"; - const aliasedConstant = stringConstant; - enum Foo { one: 1, two: 2 } - const fooOne = Foo.one; - alias confused = "what am I?"; - `, - [], - ); + const { program } = await Tester.compile(` + const stringConstant = "hello"; + const aliasedConstant = stringConstant; + enum Foo { one: 1, two: 2 } + const fooOne = Foo.one; + alias confused = "what am I?"; + `); const tk = $(program); const stringConstant = tk.value.resolve("stringConstant"); @@ -115,14 +111,9 @@ describe("resolve", () => { }); it("throws an error for incorrect kind assertion", async () => { - const { - context: { program }, - } = await getTypes( - ` - const stringConstant = "hello"; - `, - [], - ); + const { program } = await Tester.compile(` + const stringConstant = "hello"; + `); const tk = $(program); expect(() => tk.value.resolve("stringConstant", "BooleanValue")).toThrow( @@ -131,9 +122,7 @@ describe("resolve", () => { }); it("returns undefined and diagnostics for invalid references", async () => { - const { - context: { program }, - } = await getTypes(``, []); + const { program } = await Tester.compile(``); const tk = $(program); const [unknownValue, diagnostics] = tk.value.resolve.withDiagnostics("unknownValue"); diff --git a/packages/compiler/test/visibility.test.ts b/packages/compiler/test/visibility.test.ts index a9aaff561f1..b4c6911a06c 100644 --- a/packages/compiler/test/visibility.test.ts +++ b/packages/compiler/test/visibility.test.ts @@ -2,16 +2,14 @@ // Licensed under the MIT license. import { ok, strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; +import { describe, it } from "vitest"; import { VisibilityFilter } from "../src/core/visibility/core.js"; +import type { EnumMember, EnumValue, FunctionContext } from "../src/index.js"; import { $visibility, addVisibilityModifiers, clearVisibilityModifiersForClass, - Diagnostic, EmptyVisibilityProvider, - Enum, - getFriendlyName, getLifecycleVisibilityEnum, getParameterVisibilityFilter, getVisibilityForClass, @@ -20,19 +18,15 @@ import { isVisible, Model, ModelProperty, - Operation, removeVisibilityModifiers, resetVisibilityModifiersForClass, sealVisibilityModifiers, sealVisibilityModifiersForProgram, } from "../src/index.js"; -import { - BasicTestRunner, - createTestRunner, - expectDiagnosticEmpty, - expectDiagnostics, -} from "../src/testing/index.js"; +import { applyLifecycleUpdate, applyVisibilityFilter } from "../src/lib/visibility.js"; +import { expectDiagnosticEmpty, expectDiagnostics, t } from "../src/testing/index.js"; import { $ } from "../src/typekit/index.js"; +import { Tester } from "./tester.js"; function assertSetsEqual(a: Set, b: Set): void { strictEqual(a.size, b.size); @@ -42,28 +36,35 @@ function assertSetsEqual(a: Set, b: Set): void { } } -describe("compiler: visibility core", () => { - let runner: BasicTestRunner; +function enumMemberToValue(member: EnumMember): EnumValue { + return { + entityKind: "Value", + valueKind: "EnumValue", + value: member, + type: member.enum, + }; +} - beforeEach(async () => { - runner = await createTestRunner(); - }); +function anyFilter(...members: EnumMember[]): Parameters[2] { + return { + any: members.map((m) => enumMemberToValue(m)), + }; +} +describe("compiler: visibility core", () => { it("default visibility", async () => { - const { name, Dummy } = (await runner.compile(` - @test + const { name, Dummy, program } = await Tester.compile(t.code` @defaultVisibility(Dummy.B) - enum Dummy { + enum ${t.enum("Dummy")} { A, B, } model TestModel { - @test - name: string; - }`)) as { name: ModelProperty; Dummy: Enum }; + ${t.modelProperty("name")}: string; + }`); - const LifecycleEnum = getLifecycleVisibilityEnum(runner.program); + const LifecycleEnum = getLifecycleVisibilityEnum(program); const Lifecycle = { Read: LifecycleEnum.members.get("Read")!, @@ -74,7 +75,7 @@ describe("compiler: visibility core", () => { }; assertSetsEqual( - getVisibilityForClass(runner.program, name, LifecycleEnum), + getVisibilityForClass(program, name, LifecycleEnum), new Set([ Lifecycle.Read, Lifecycle.Create, @@ -85,128 +86,128 @@ describe("compiler: visibility core", () => { ); assertSetsEqual( - getVisibilityForClass(runner.program, name, Dummy), + getVisibilityForClass(program, name, Dummy), new Set([Dummy.members.get("B")!]), ); }); it("produces correct lifecycle visibility enum reference", async () => { - const { lifecycle } = (await runner.compile(` + const { lifecycle, program } = await Tester.compile(t.code` model X { - @test lifecycle: TypeSpec.Lifecycle; + ${t.modelProperty("lifecycle")}: TypeSpec.Lifecycle; } - `)) as { lifecycle: ModelProperty }; + `); - const lifecycleEnum = getLifecycleVisibilityEnum(runner.program); + const lifecycleEnum = getLifecycleVisibilityEnum(program); strictEqual(lifecycleEnum, lifecycle.type); - strictEqual(lifecycleEnum, runner.program.resolveTypeReference("TypeSpec.Lifecycle")[0]); + strictEqual(lifecycleEnum, program.resolveTypeReference("TypeSpec.Lifecycle")[0]); }); describe("visibility seals", () => { it("seals visibility modifiers for a program", async () => { - const { Example, Dummy } = (await runner.compile(` - @test model Example { + const { Example, Dummy, program } = await Tester.compile(t.code` + model ${t.model("Example")} { x: string; } - @test enum Dummy {} - `)) as { Example: Model; Dummy: Enum }; + enum ${t.enum("Dummy")} {} + `); const x = Example.properties.get("x")!; - const lifecycle = getLifecycleVisibilityEnum(runner.program); + const lifecycle = getLifecycleVisibilityEnum(program); - ok(!isSealed(runner.program, x)); - ok(!isSealed(runner.program, x, lifecycle)); - ok(!isSealed(runner.program, x, Dummy)); + ok(!isSealed(program, x)); + ok(!isSealed(program, x, lifecycle)); + ok(!isSealed(program, x, Dummy)); - sealVisibilityModifiersForProgram(runner.program); + sealVisibilityModifiersForProgram(program); - ok(isSealed(runner.program, x)); - ok(isSealed(runner.program, x, lifecycle)); - ok(isSealed(runner.program, x, Dummy)); + ok(isSealed(program, x)); + ok(isSealed(program, x, lifecycle)); + ok(isSealed(program, x, Dummy)); }); it("seals visibility modifiers for a visibility class", async () => { - const { Example, Dummy } = (await runner.compile(` - @test model Example { + const { Example, Dummy, program } = await Tester.compile(t.code` + model ${t.model("Example")} { x: string; } - @test enum Dummy {} - `)) as { Example: Model; Dummy: Enum }; + enum ${t.enum("Dummy")} {} + `); const x = Example.properties.get("x")!; - const lifecycle = getLifecycleVisibilityEnum(runner.program); + const lifecycle = getLifecycleVisibilityEnum(program); - ok(!isSealed(runner.program, x)); - ok(!isSealed(runner.program, x, lifecycle)); - ok(!isSealed(runner.program, x, Dummy)); + ok(!isSealed(program, x)); + ok(!isSealed(program, x, lifecycle)); + ok(!isSealed(program, x, Dummy)); - sealVisibilityModifiers(runner.program, x, lifecycle); + sealVisibilityModifiers(program, x, lifecycle); - ok(!isSealed(runner.program, x)); - ok(isSealed(runner.program, x, lifecycle)); - ok(!isSealed(runner.program, x, Dummy)); + ok(!isSealed(program, x)); + ok(isSealed(program, x, lifecycle)); + ok(!isSealed(program, x, Dummy)); }); it("seals visibility modifiers for a property", async () => { - const { Example, Dummy } = (await runner.compile(` - @test model Example { + const { Example, Dummy, program } = await Tester.compile(t.code` + model ${t.model("Example")} { x: string; y: string; } - @test enum Dummy {} - `)) as { Example: Model; Dummy: Enum }; + enum ${t.enum("Dummy")} {} + `); const x = Example.properties.get("x")!; const y = Example.properties.get("y")!; - const lifecycle = getLifecycleVisibilityEnum(runner.program); + const lifecycle = getLifecycleVisibilityEnum(program); - ok(!isSealed(runner.program, x)); - ok(!isSealed(runner.program, x, lifecycle)); - ok(!isSealed(runner.program, x, Dummy)); + ok(!isSealed(program, x)); + ok(!isSealed(program, x, lifecycle)); + ok(!isSealed(program, x, Dummy)); - ok(!isSealed(runner.program, y)); - ok(!isSealed(runner.program, y, lifecycle)); - ok(!isSealed(runner.program, y, Dummy)); + ok(!isSealed(program, y)); + ok(!isSealed(program, y, lifecycle)); + ok(!isSealed(program, y, Dummy)); - sealVisibilityModifiers(runner.program, x); + sealVisibilityModifiers(program, x); - ok(isSealed(runner.program, x)); - ok(isSealed(runner.program, x, lifecycle)); - ok(isSealed(runner.program, x, Dummy)); + ok(isSealed(program, x)); + ok(isSealed(program, x, lifecycle)); + ok(isSealed(program, x, Dummy)); - ok(!isSealed(runner.program, y)); - ok(!isSealed(runner.program, y, lifecycle)); - ok(!isSealed(runner.program, y, Dummy)); + ok(!isSealed(program, y)); + ok(!isSealed(program, y, lifecycle)); + ok(!isSealed(program, y, Dummy)); }); it("correctly diagnoses modifying sealed visibility", async () => { - const { Example } = (await runner.compile(` - @test model Example { + const { Example, program } = await Tester.compile(t.code` + model ${t.model("Example")} { x: string; } - `)) as { Example: Model }; + `); const x = Example.properties.get("x")!; - const Lifecycle = getLifecycleVisibilityEnum(runner.program); + const Lifecycle = getLifecycleVisibilityEnum(program); const Create = Lifecycle.members.get("Create")!; - sealVisibilityModifiersForProgram(runner.program); + sealVisibilityModifiersForProgram(program); - addVisibilityModifiers(runner.program, x, [Create]); - removeVisibilityModifiers(runner.program, x, [Create]); - clearVisibilityModifiersForClass(runner.program, x, Lifecycle); + addVisibilityModifiers(program, x, [Create]); + removeVisibilityModifiers(program, x, [Create]); + clearVisibilityModifiersForClass(program, x, Lifecycle); - strictEqual(runner.program.diagnostics.length, 3); + strictEqual(program.diagnostics.length, 3); - expectDiagnostics(runner.program.diagnostics, [ + expectDiagnostics(program.diagnostics, [ { code: "visibility-sealed", message: "Visibility of property 'x' is sealed and cannot be changed.", @@ -225,83 +226,82 @@ describe("compiler: visibility core", () => { describe("visibility modifiers", () => { it("default visibility modifiers are all modifiers", async () => { - const { Example, Dummy } = (await runner.compile(` - @test model Example { + const { Example, Dummy, program } = await Tester.compile(t.code` + model ${t.model("Example")} { x: string; } - @test @defaultVisibility(Dummy.A) - enum Dummy { + enum ${t.enum("Dummy")} { A, B, } - `)) as { Example: Model; Dummy: Enum }; + `); const x = Example.properties.get("x")!; - const Lifecycle = getLifecycleVisibilityEnum(runner.program); + const Lifecycle = getLifecycleVisibilityEnum(program); - const visibility = getVisibilityForClass(runner.program, x, Lifecycle); + const visibility = getVisibilityForClass(program, x, Lifecycle); strictEqual(visibility.size, Lifecycle.members.size); for (const member of Lifecycle.members.values()) { ok(visibility.has(member)); - ok(hasVisibility(runner.program, x, member)); + ok(hasVisibility(program, x, member)); } - const dummyVisibility = getVisibilityForClass(runner.program, x, Dummy); + const dummyVisibility = getVisibilityForClass(program, x, Dummy); strictEqual(dummyVisibility.size, 1); ok(dummyVisibility.has(Dummy.members.get("A")!)); - ok(hasVisibility(runner.program, x, Dummy.members.get("A")!)); + ok(hasVisibility(program, x, Dummy.members.get("A")!)); ok(!dummyVisibility.has(Dummy.members.get("B")!)); - ok(!hasVisibility(runner.program, x, Dummy.members.get("B")!)); + ok(!hasVisibility(program, x, Dummy.members.get("B")!)); }); it("adds a visibility modifier", async () => { - const { Example } = (await runner.compile(` - @test model Example { + const { Example, program } = await Tester.compile(t.code` + model ${t.model("Example")} { x: string; } - `)) as { Example: Model }; + `); const x = Example.properties.get("x")!; - const Lifecycle = getLifecycleVisibilityEnum(runner.program); + const Lifecycle = getLifecycleVisibilityEnum(program); const Create = Lifecycle.members.get("Create")!; - addVisibilityModifiers(runner.program, x, [Create]); + addVisibilityModifiers(program, x, [Create]); - const visibility = getVisibilityForClass(runner.program, x, Lifecycle); + const visibility = getVisibilityForClass(program, x, Lifecycle); strictEqual(visibility.size, 1); for (const member of Lifecycle.members.values()) { if (member !== Create) { ok(!visibility.has(member)); - ok(!hasVisibility(runner.program, x, member)); + ok(!hasVisibility(program, x, member)); } else { ok(visibility.has(member)); - ok(hasVisibility(runner.program, x, member)); + ok(hasVisibility(program, x, member)); } } }); it("removes a visibility modifier", async () => { - const { Example } = (await runner.compile(` - @test model Example { + const { Example, program } = await Tester.compile(t.code` + model ${t.model("Example")} { x: string; } - `)) as { Example: Model }; + `); const x = Example.properties.get("x")!; - const Lifecycle = getLifecycleVisibilityEnum(runner.program); + const Lifecycle = getLifecycleVisibilityEnum(program); const Create = Lifecycle.members.get("Create")!; - removeVisibilityModifiers(runner.program, x, [Create]); + removeVisibilityModifiers(program, x, [Create]); - const visibility = getVisibilityForClass(runner.program, x, Lifecycle); + const visibility = getVisibilityForClass(program, x, Lifecycle); strictEqual(visibility.size, Lifecycle.members.size - 1); @@ -315,81 +315,81 @@ describe("compiler: visibility core", () => { }); it("clears visibility modifiers for a class", async () => { - const { Example } = (await runner.compile(` - @test model Example { + const { Example, program } = await Tester.compile(t.code` + model ${t.model("Example")} { x: string; } - `)) as { Example: Model }; + `); const x = Example.properties.get("x")!; - const Lifecycle = getLifecycleVisibilityEnum(runner.program); + const Lifecycle = getLifecycleVisibilityEnum(program); - clearVisibilityModifiersForClass(runner.program, x, Lifecycle); + clearVisibilityModifiersForClass(program, x, Lifecycle); - const visibility = getVisibilityForClass(runner.program, x, Lifecycle); + const visibility = getVisibilityForClass(program, x, Lifecycle); strictEqual(visibility.size, 0); for (const member of Lifecycle.members.values()) { ok(!visibility.has(member)); - ok(!hasVisibility(runner.program, x, member)); + ok(!hasVisibility(program, x, member)); } }); it("resets visibility modifiers for a class", async () => { - const { Example } = (await runner.compile(` - @test model Example { + const { Example, program } = await Tester.compile(t.code` + model ${t.model("Example")} { @visibility(Lifecycle.Create) x: string; } - `)) as { Example: Model }; + `); const x = Example.properties.get("x")!; - const Lifecycle = getLifecycleVisibilityEnum(runner.program); + const Lifecycle = getLifecycleVisibilityEnum(program); - const visibility = getVisibilityForClass(runner.program, x, Lifecycle); + const visibility = getVisibilityForClass(program, x, Lifecycle); strictEqual(visibility.size, 1); ok(visibility.has(Lifecycle.members.get("Create")!)); - ok(hasVisibility(runner.program, x, Lifecycle.members.get("Create")!)); + ok(hasVisibility(program, x, Lifecycle.members.get("Create")!)); - resetVisibilityModifiersForClass(runner.program, x, Lifecycle); + resetVisibilityModifiersForClass(program, x, Lifecycle); - const resetVisibility = getVisibilityForClass(runner.program, x, Lifecycle); + const resetVisibility = getVisibilityForClass(program, x, Lifecycle); strictEqual(resetVisibility.size, 5); for (const member of Lifecycle.members.values()) { ok(resetVisibility.has(member)); - ok(hasVisibility(runner.program, x, member)); + ok(hasVisibility(program, x, member)); } }); it("preserves visibility for other classes", async () => { - const { Example, Dummy } = (await runner.compile(` - @test model Example { + const { Example, Dummy, program } = await Tester.compile(t.code` + model ${t.model("Example")} { x: string; } - @test enum Dummy { + enum ${t.enum("Dummy")} { A, B, } - `)) as { Example: Model; Dummy: Enum }; + `); const x = Example.properties.get("x")!; - const Lifecycle = getLifecycleVisibilityEnum(runner.program); + const Lifecycle = getLifecycleVisibilityEnum(program); - clearVisibilityModifiersForClass(runner.program, x, Dummy); + clearVisibilityModifiersForClass(program, x, Dummy); - const visibility = getVisibilityForClass(runner.program, x, Lifecycle); + const visibility = getVisibilityForClass(program, x, Lifecycle); strictEqual(visibility.size, Lifecycle.members.size); for (const member of Lifecycle.members.values()) { ok(visibility.has(member)); - ok(hasVisibility(runner.program, x, member)); + ok(hasVisibility(program, x, member)); } }); }); @@ -532,15 +532,15 @@ describe("compiler: visibility core", () => { scenario.visibility.length > 0 ? `@visibility(${scenario.visibility.map((v) => `Lifecycle.${v}`).join(", ")})` : ""; - const { Example } = (await runner.compile(` - @test model Example { + const { Example, program } = await Tester.compile(t.code` + model ${t.model("Example")} { ${visibilityDecorator} x: string; } - `)) as { Example: Model }; + `); const x = Example.properties.get("x")!; - const Lifecycle = getLifecycleVisibilityEnum(runner.program); + const Lifecycle = getLifecycleVisibilityEnum(program); const filter = Object.fromEntries( Object.entries(scenario.filter).map(([k, vis]) => [ @@ -549,27 +549,30 @@ describe("compiler: visibility core", () => { ]), ) as VisibilityFilter; - strictEqual(isVisible(runner.program, x, filter), scenario.expect); + strictEqual(isVisible(program, x, filter), scenario.expect); }); } it("mixed visibility classes in filter", async () => { - const { Example, Dummy: DummyEnum } = (await runner.compile(` - @test model Example { + const { + Example, + Dummy: DummyEnum, + program, + } = await Tester.compile(t.code` + model ${t.model("Example")} { @visibility(Lifecycle.Create, Dummy.B) x: string; } - @test @defaultVisibility(Dummy.A) - enum Dummy { + enum ${t.enum("Dummy")} { A, B, } - `)) as { Example: Model; Dummy: Enum }; + `); const x = Example.properties.get("x")!; - const LifecycleEnum = getLifecycleVisibilityEnum(runner.program); + const LifecycleEnum = getLifecycleVisibilityEnum(program); const Lifecycle = { Create: LifecycleEnum.members.get("Create")!, @@ -583,28 +586,28 @@ describe("compiler: visibility core", () => { }; strictEqual( - isVisible(runner.program, x, { + isVisible(program, x, { all: new Set([Lifecycle.Create, Dummy.B]), }), true, ); strictEqual( - isVisible(runner.program, x, { + isVisible(program, x, { any: new Set([Dummy.A]), }), false, ); strictEqual( - isVisible(runner.program, x, { + isVisible(program, x, { none: new Set([Lifecycle.Update]), }), true, ); strictEqual( - isVisible(runner.program, x, { + isVisible(program, x, { all: new Set([Lifecycle.Create]), none: new Set([Dummy.A]), }), @@ -612,7 +615,7 @@ describe("compiler: visibility core", () => { ); strictEqual( - isVisible(runner.program, x, { + isVisible(program, x, { all: new Set([Lifecycle.Create, Dummy.B]), none: new Set([Dummy.A]), }), @@ -620,7 +623,7 @@ describe("compiler: visibility core", () => { ); strictEqual( - isVisible(runner.program, x, { + isVisible(program, x, { all: new Set([Lifecycle.Create]), any: new Set([Dummy.A, Dummy.B]), none: new Set([Lifecycle.Update]), @@ -631,63 +634,63 @@ describe("compiler: visibility core", () => { describe("parameter visibility filters", () => { it("correctly provides empty default visibility filter", async () => { - const { Example, foo } = (await runner.compile(` - @test model Example { + const { Example, foo, program } = await Tester.compile(t.code` + model ${t.model("Example")} { @visibility(Lifecycle.Create) x: string; } - @test op foo(example: Example): void; - `)) as { Example: Model; foo: Operation }; + op ${t.op("foo")}(example: Example): void; + `); const x = Example.properties.get("x")!; - const filter = getParameterVisibilityFilter(runner.program, foo, EmptyVisibilityProvider); + const filter = getParameterVisibilityFilter(program, foo, EmptyVisibilityProvider); strictEqual(filter.all, undefined); strictEqual(filter.any, undefined); strictEqual(filter.none, undefined); - strictEqual(isVisible(runner.program, x, filter), true); + strictEqual(isVisible(program, x, filter), true); }); it("correctly provides visibility filter from operation", async () => { - const { Example, foo } = (await runner.compile(` - @test model Example { + const { Example, foo, program } = await Tester.compile(t.code` + model ${t.model("Example")} { @visibility(Lifecycle.Create) x: string; } @parameterVisibility(Lifecycle.Update) - @test op foo( + op ${t.op("foo")}( example: Example ): void; - `)) as { Example: Model; foo: Operation }; + `); const x = Example.properties.get("x")!; - const filter = getParameterVisibilityFilter(runner.program, foo, EmptyVisibilityProvider); + const filter = getParameterVisibilityFilter(program, foo, EmptyVisibilityProvider); - const Lifecycle = getLifecycleVisibilityEnum(runner.program); + const Lifecycle = getLifecycleVisibilityEnum(program); strictEqual(filter.all, undefined); strictEqual(filter.any?.size, 1); strictEqual(filter.any.has(Lifecycle.members.get("Update")!), true); strictEqual(filter.none, undefined); - strictEqual(isVisible(runner.program, x, filter), false); + strictEqual(isVisible(program, x, filter), false); }); it("does not allow empty operation visibility constraints", async () => { - const diagnostics = await runner.diagnose(` - @test model Example { + const diagnostics = await Tester.diagnose(` + model Example { @visibility(Lifecycle.Create) x: string; } @parameterVisibility @returnTypeVisibility - @test op foo( + op foo( example: Example ): Example; `); @@ -712,7 +715,7 @@ describe("compiler: visibility core", () => { Create: "Lifecycle.Create", Update: "Lifecycle.Update", }; - const [{ Result }, diagnostics] = (await runner.compileAndDiagnose(` + const [{ Result }, diagnostics] = await Tester.compileAndDiagnose(t.code` model Example { @visibility(${Lifecycle.Read}) r: string; @@ -768,8 +771,8 @@ describe("compiler: visibility core", () => { // This ensures the transforms are non-side-effecting. model ReadExample is Read; - @test model Result is ${transform}; - `)) as [{ Result: Model }, Diagnostic[]]; + model ${t.model("Result")} is ${transform}; + `); expectDiagnosticEmpty(diagnostics); @@ -810,6 +813,74 @@ describe("compiler: visibility core", () => { validateUpdateTransform(props, Result, getProperties); }); + it("correctly applies Update transform via applyLifecycleUpdate", async () => { + const Lifecycle = { + Read: "Lifecycle.Read", + Create: "Lifecycle.Create", + Update: "Lifecycle.Update", + }; + + const { Example, program } = await Tester.compile(t.code` + model ${t.model("Example")} { + @visibility(${Lifecycle.Read}) + r: string; + + cru: string; + + @visibility(${Lifecycle.Create}, ${Lifecycle.Read}) + cr: string; + + @visibility(${Lifecycle.Create}, ${Lifecycle.Update}) + cu: string; + + @visibility(${Lifecycle.Create}) + c: string; + + @visibility(${Lifecycle.Update}, ${Lifecycle.Read}) + ru: string; + + @visibility(${Lifecycle.Update}) + u: string; + + @invisible(Lifecycle) + invisible: string; + + nested: Nested; + } + + model Nested { + @visibility(${Lifecycle.Read}) + r: string; + + cru: string; + + @visibility(${Lifecycle.Create}, ${Lifecycle.Read}) + cr: string; + + @visibility(${Lifecycle.Create}, ${Lifecycle.Update}) + cu: string; + + @visibility(${Lifecycle.Create}) + c: string; + + @visibility(${Lifecycle.Update}, ${Lifecycle.Read}) + ru: string; + + @visibility(${Lifecycle.Update}) + u: string; + + @invisible(Lifecycle) + invisible: string; + }; + `); + + const fnContext = { program } satisfies Pick; + const Result = applyLifecycleUpdate(fnContext, Example, "Update{name}"); + const props = getProperties(Result); + + validateUpdateTransform(props, Result, getProperties); + }); + it("correctly applies CreateOrUpdate transform", async () => { const Result = await compileWithTransform("CreateOrUpdate"); const props = getProperties(Result); @@ -819,7 +890,7 @@ describe("compiler: visibility core", () => { }); it("correctly transforms a union", async () => { - const { Result } = (await runner.compile(` + const { Result } = await Tester.compile(t.code` model Example { example: A | B; } @@ -834,9 +905,8 @@ describe("compiler: visibility core", () => { b: string; } - @test - model Result is Read; - `)) as { Result: Model }; + model ${t.model("Result")} is Read; + `); const example = Result.properties.get("example"); @@ -860,7 +930,7 @@ describe("compiler: visibility core", () => { }); it("correctly transforms a model property reference", async () => { - const { Result } = (await runner.compile(` + const { Result } = await Tester.compile(t.code` model Example { a: ExampleRef.a; } @@ -876,9 +946,8 @@ describe("compiler: visibility core", () => { b: string; } - @test - model Result is Create; - `)) as { Result: Model }; + model ${t.model("Result")} is Create; + `); const example = Result.properties.get("a"); @@ -900,7 +969,7 @@ describe("compiler: visibility core", () => { }); it("correctly transforms a tuple", async () => { - const { Result } = (await runner.compile(` + const { Result } = await Tester.compile(t.code` model Example { example: [A, B]; } @@ -915,9 +984,8 @@ describe("compiler: visibility core", () => { b: string; } - @test - model Result is Read; - `)) as { Result: Model }; + model ${t.model("Result")} is Read; + `); const example = Result.properties.get("example"); @@ -943,16 +1011,16 @@ describe("compiler: visibility core", () => { describe("withVisibilityFilter transforms", () => { it("correctly makes transformed models immune from further transformation", async () => { - const { ExampleRead, ExampleReadCreate } = (await runner.compile(` + const { ExampleRead, ExampleReadCreate } = await Tester.compile(t.code` model Example { @visibility(Lifecycle.Read) id: string; } - @test model ExampleRead is Read; + model ${t.model("ExampleRead")} is Read; - @test model ExampleReadCreate is Create; - `)) as { ExampleRead: Model; ExampleReadCreate: Model }; + model ${t.model("ExampleReadCreate")} is Create; + `); const idRead = ExampleRead.properties.get("id")!; @@ -970,7 +1038,7 @@ describe("compiler: visibility core", () => { }); it("deeply renames types using the name template", async () => { - const { DataA, DataB } = (await runner.compile(` + const { DataA, DataB } = await Tester.compile(t.code` enum Example { A, B, @@ -991,16 +1059,133 @@ describe("compiler: visibility core", () => { foo_a: string; } + #suppress "deprecated" @withVisibilityFilter(#{ any: #[Example.A] }, "{name}A") - @test model DataA { + model ${t.model("DataA")} { ...Data } + #suppress "deprecated" @withVisibilityFilter(#{ any: #[Example.B] }, "{name}B") - @test model DataB { + model ${t.model("DataB")} { ...Data } - `)) as { DataA: Model; DataB: Model }; + `); + + ok(DataA); + ok(DataB); + + ok(DataA.properties.has("data_a")); + ok(!DataA.properties.has("data_b")); + ok(DataB.properties.has("data_b")); + ok(!DataB.properties.has("data_a")); + + const dataA = DataA.properties.get("data_a")!; + const dataB = DataB.properties.get("data_b")!; + + strictEqual(dataA.type.kind, "Model"); + strictEqual(dataB.type.kind, "Model"); + + const FooA = dataA.type as Model; + const FooB = dataB.type as Model; + + strictEqual(FooA.name, "FooA"); + strictEqual(FooB.name, "FooB"); + + ok(FooA.properties.has("foo_a")); + ok(!FooA.properties.has("foo_b")); + ok(FooB.properties.has("foo_b")); + ok(!FooB.properties.has("foo_a")); + }); + + it("deeply renames types using the name template via applyVisibilityFilter", async () => { + const { Data, Example, program } = await Tester.compile(t.code` + enum ${t.enum("Example")} { + A, + B, + } + + model ${t.model("Data")} { + @visibility(Example.A) + data_a: Foo; + + @visibility(Example.B) + data_b: Foo; + } + + model Foo { + @visibility(Example.B) + foo_b: string; + @visibility(Example.A) + foo_a: string; + } + `); + + const fnContext = { program } satisfies Pick; + const DataA = applyVisibilityFilter( + fnContext, + Data, + anyFilter(Example.members.get("A")!), + "{name}A", + ); + const DataB = applyVisibilityFilter( + fnContext, + Data, + anyFilter(Example.members.get("B")!), + "{name}B", + ); + + ok(DataA); + ok(DataB); + + ok(DataA.properties.has("data_a")); + ok(!DataA.properties.has("data_b")); + ok(DataB.properties.has("data_b")); + ok(!DataB.properties.has("data_a")); + + const dataA = DataA.properties.get("data_a")!; + const dataB = DataB.properties.get("data_b")!; + + strictEqual(dataA.type.kind, "Model"); + strictEqual(dataB.type.kind, "Model"); + + const FooA = dataA.type as Model; + const FooB = dataB.type as Model; + + strictEqual(FooA.name, "FooA"); + strictEqual(FooB.name, "FooB"); + + ok(FooA.properties.has("foo_a")); + ok(!FooA.properties.has("foo_b")); + ok(FooB.properties.has("foo_b")); + ok(!FooB.properties.has("foo_a")); + }); + + it("deeply renames types using FilterVisibility", async () => { + const { DataA, DataB } = await Tester.compile(t.code` + enum Example { + A, + B, + } + + model Data { + @visibility(Example.A) + data_a: Foo; + + @visibility(Example.B) + data_b: Foo; + } + + model Foo { + @visibility(Example.B) + foo_b: string; + @visibility(Example.A) + foo_a: string; + } + + @test model ${t.model("DataA")} is FilterVisibility; + @test model ${t.model("DataB")} is FilterVisibility; + `); ok(DataA); ok(DataB); @@ -1028,8 +1213,58 @@ describe("compiler: visibility core", () => { ok(!FooB.properties.has("foo_a")); }); + it("correctly transforms arrays and records via FilterVisibility", async () => { + const { Result, program } = await Tester.compile(t.code` + model A { + @visibility(Lifecycle.Read) + a: string; + + @visibility(Lifecycle.Create) + invisible: string; + } + + model Input { + array: A[]; + record: Record; + } + + model ${t.model("Result")} is FilterVisibility; + `); + + ok(Result); + + const array = Result.properties.get("array"); + const record = Result.properties.get("record"); + + ok(array); + ok(record); + + const arrayType = array.type; + const recordType = record.type; + + strictEqual(arrayType.kind, "Model"); + strictEqual(recordType.kind, "Model"); + + ok($(program).array.is(arrayType)); + ok($(program).record.is(recordType)); + + const arrayA = (arrayType as Model).indexer!.value as Model; + const recordA = (recordType as Model).indexer!.value as Model; + + strictEqual(arrayA.kind, "Model"); + strictEqual(recordA.kind, "Model"); + + strictEqual(arrayA.name, "ATransform"); + strictEqual(recordA.name, "ATransform"); + + strictEqual(arrayA, recordA); + + ok(arrayA.properties.has("a")); + ok(!arrayA.properties.has("invisible")); + }); + it("correctly caches and deduplicates transformed instances", async () => { - const { Out } = (await runner.compile(` + const { Out } = await Tester.compile(t.code` model A { @visibility(Lifecycle.Read) a: string; @@ -1058,11 +1293,11 @@ describe("compiler: visibility core", () => { c: string; } - @test model Out { + model ${t.model("Out")} { a: Read; b: Read; } - `)) as { Out: Model }; + `); ok(Out); @@ -1078,8 +1313,8 @@ describe("compiler: visibility core", () => { const A = a.type as Model; const B = b.type as Model; - ok(getFriendlyName(runner.program, A) === "ReadA"); - ok(getFriendlyName(runner.program, B) === "ReadB"); + ok(A.name === "ReadA"); + ok(B.name === "ReadB"); ok(A.properties.has("a")); ok(!A.properties.has("invisible")); @@ -1113,18 +1348,17 @@ describe("compiler: visibility core", () => { }); it("correctly caches and deduplicates instances that are not transformed", async () => { - const { example, B } = (await runner.compile(` - @test op example(): Read; + const { example, B } = await Tester.compile(t.code` + op ${t.op("example")}(): Read; model A { b: B; } - @test - model B { + model ${t.model("B")} { c: string; } - `)) as { example: Operation; B: Model }; + `); ok(example); strictEqual(example.kind, "Operation"); @@ -1141,7 +1375,7 @@ describe("compiler: visibility core", () => { }); it("correctly transforms arrays and records", async () => { - const { Result } = (await runner.compile(` + const { Result, program } = await Tester.compile(t.code` model A { @visibility(Lifecycle.Read) a: string; @@ -1150,12 +1384,13 @@ describe("compiler: visibility core", () => { invisible: string; } + #suppress "deprecated" @withVisibilityFilter(#{ any: #[Lifecycle.Read] }, "{name}Transform") - @test model Result { + model ${t.model("Result")} { array: A[]; record: Record; } - `)) as { Result: Model }; + `); ok(Result); @@ -1171,8 +1406,65 @@ describe("compiler: visibility core", () => { strictEqual(arrayType.kind, "Model"); strictEqual(recordType.kind, "Model"); - ok($(runner.program).array.is(arrayType)); - ok($(runner.program).record.is(recordType)); + ok($(program).array.is(arrayType)); + ok($(program).record.is(recordType)); + + const arrayA = (arrayType as Model).indexer!.value as Model; + const recordA = (recordType as Model).indexer!.value as Model; + + strictEqual(arrayA.kind, "Model"); + strictEqual(recordA.kind, "Model"); + + strictEqual(arrayA.name, "ATransform"); + strictEqual(recordA.name, "ATransform"); + + strictEqual(arrayA, recordA); + + ok(arrayA.properties.has("a")); + ok(!arrayA.properties.has("invisible")); + }); + + it("correctly transforms arrays and records via applyVisibilityFilter", async () => { + const { Result, program } = await Tester.compile(t.code` + model A { + @visibility(Lifecycle.Read) + a: string; + + @visibility(Lifecycle.Create) + invisible: string; + } + + model ${t.model("Result")} { + array: A[]; + record: Record; + } + `); + + const fnContext = { program } satisfies Pick; + const lifecycle = getLifecycleVisibilityEnum(program); + const transformed = applyVisibilityFilter( + fnContext, + Result, + anyFilter(lifecycle.members.get("Read")!), + "{name}Transform", + ); + + ok(transformed); + + const array = transformed.properties.get("array"); + const record = transformed.properties.get("record"); + + ok(array); + ok(record); + + const arrayType = array.type; + const recordType = record.type; + + strictEqual(arrayType.kind, "Model"); + strictEqual(recordType.kind, "Model"); + + ok($(program).array.is(arrayType)); + ok($(program).record.is(recordType)); const arrayA = (arrayType as Model).indexer!.value as Model; const recordA = (recordType as Model).indexer!.value as Model; @@ -1190,7 +1482,7 @@ describe("compiler: visibility core", () => { }); it("correctly transforms 'model is' declarations of arrays and records", async () => { - const { Result } = (await runner.compile(` + const { Result, program } = await Tester.compile(t.code` model A { @visibility(Lifecycle.Read) a: string; @@ -1203,12 +1495,13 @@ describe("compiler: visibility core", () => { model C is Record; + #suppress "deprecated" @withVisibilityFilter(#{ any: #[Lifecycle.Read] }, "{name}Transform") - @test model Result { + model ${t.model("Result")} { arr: B; rec: C; } - `)) as { Result: Model }; + `); ok(Result); @@ -1224,8 +1517,69 @@ describe("compiler: visibility core", () => { strictEqual(arrType.kind, "Model"); strictEqual(recType.kind, "Model"); - ok($(runner.program).array.is(arrType)); - ok($(runner.program).record.is(recType)); + ok($(program).array.is(arrType)); + ok($(program).record.is(recType)); + + strictEqual(arrType.name, "BTransform"); + strictEqual(recType.name, "CTransform"); + + const arrA = (arrType as Model).indexer!.value as Model; + const recA = (recType as Model).indexer!.value as Model; + + strictEqual(arrA, recA); + + strictEqual(arrA.kind, "Model"); + strictEqual(arrA.name, "ATransform"); + + ok(arrA.properties.has("a")); + ok(!arrA.properties.has("invisible")); + }); + + it("correctly transforms 'model is' declarations of arrays and records via applyVisibilityFilter", async () => { + const { Result, program } = await Tester.compile(t.code` + model A { + @visibility(Lifecycle.Read) + a: string; + + @visibility(Lifecycle.Create) + invisible: string; + } + + model B is Array; + + model C is Record; + + model ${t.model("Result")} { + arr: B; + rec: C; + } + `); + + const fnContext = { program } satisfies Pick; + const lifecycle = getLifecycleVisibilityEnum(program); + const transformed = applyVisibilityFilter( + fnContext, + Result, + anyFilter(lifecycle.members.get("Read")!), + "{name}Transform", + ); + + ok(transformed); + + const arr = transformed.properties.get("arr"); + const rec = transformed.properties.get("rec"); + + ok(arr); + ok(rec); + + const arrType = arr.type; + const recType = rec.type; + + strictEqual(arrType.kind, "Model"); + strictEqual(recType.kind, "Model"); + + ok($(program).array.is(arrType)); + ok($(program).record.is(recType)); strictEqual(arrType.name, "BTransform"); strictEqual(recType.name, "CTransform"); @@ -1243,7 +1597,7 @@ describe("compiler: visibility core", () => { }); it("does not duplicate encodedName metadata", async () => { - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.diagnose(` model SomeModel { @visibility(Lifecycle.Read) @encodedName("application/json", "some_other_name") diff --git a/packages/compiler/tsconfig.build.json b/packages/compiler/tsconfig.build.json new file mode 100644 index 00000000000..12d19b55966 --- /dev/null +++ b/packages/compiler/tsconfig.build.json @@ -0,0 +1,10 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src/**/*.ts", + "test/**/*.ts", + "generated-defs/**/*.ts", + "templates/index.ts", + "templates/*.e2e.ts" + ] +} diff --git a/packages/compiler/tsconfig.config.json b/packages/compiler/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/compiler/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/compiler/tsconfig.json b/packages/compiler/tsconfig.json index dbf998b7776..84433f97361 100644 --- a/packages/compiler/tsconfig.json +++ b/packages/compiler/tsconfig.json @@ -4,12 +4,5 @@ "outDir": "dist", "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts", - "generated-defs/**/*.ts", - "templates/index.ts", - "templates/*.e2e.ts" - ] + } } diff --git a/packages/emitter-framework/CHANGELOG.md b/packages/emitter-framework/CHANGELOG.md index 886c84bfd43..4e69153e79a 100644 --- a/packages/emitter-framework/CHANGELOG.md +++ b/packages/emitter-framework/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog - @typespec/emitter-framework +## 0.17.0 + +### Features + +- [#7993](https://github.com/microsoft/typespec/pull/7993) [csharp] Add new `ExtensibleEnumDeclaration` component allowing an unbound enum representation using a c# `struct` + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + +### Bug Fixes + +- [#9879](https://github.com/microsoft/typespec/pull/9879) Add the missing export in index for extensible-enum in csharp + + +## 0.16.0 + +### Bump dependencies + +- [#9446](https://github.com/microsoft/typespec/pull/9446) Upgrade dependencies + + ## 0.15.0 ### Features diff --git a/packages/emitter-framework/package.json b/packages/emitter-framework/package.json index de0572f6470..0644a13f341 100644 --- a/packages/emitter-framework/package.json +++ b/packages/emitter-framework/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/emitter-framework", - "version": "0.15.0", + "version": "0.17.0", "type": "module", "main": "dist/index.js", "repository": { @@ -62,29 +62,29 @@ "license": "MIT", "description": "", "peerDependencies": { - "@alloy-js/core": "^0.22.0", - "@alloy-js/csharp": "^0.22.0", - "@alloy-js/python": "^0.3.0", - "@alloy-js/typescript": "^0.22.0", + "@alloy-js/core": "catalog:", + "@alloy-js/csharp": "catalog:", + "@alloy-js/python": "catalog:", + "@alloy-js/typescript": "catalog:", "@typespec/compiler": "workspace:^" }, "devDependencies": { - "@alloy-js/cli": "^0.22.0", - "@alloy-js/core": "^0.22.0", - "@alloy-js/python": "^0.3.0", - "@alloy-js/rollup-plugin": "^0.1.0", - "@alloy-js/typescript": "^0.22.0", + "@alloy-js/cli": "catalog:", + "@alloy-js/core": "catalog:", + "@alloy-js/python": "catalog:", + "@alloy-js/rollup-plugin": "catalog:", + "@alloy-js/typescript": "catalog:", "@typespec/compiler": "workspace:^", - "concurrently": "^9.1.2", - "pathe": "^2.0.3", - "prettier": "~3.8.0", - "tree-sitter-c-sharp": "^0.23.0", - "tree-sitter-java": "^0.23.2", - "tree-sitter-javascript": "^0.25.0", - "tree-sitter-python": "^0.25.0", - "tree-sitter-typescript": "^0.23.0", - "typescript": "~5.9.2", - "vitest": "^4.0.15", - "web-tree-sitter": "^0.26.3" + "concurrently": "catalog:", + "pathe": "catalog:", + "prettier": "catalog:", + "tree-sitter-c-sharp": "catalog:", + "tree-sitter-java": "catalog:", + "tree-sitter-javascript": "catalog:", + "tree-sitter-python": "catalog:", + "tree-sitter-typescript": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:", + "web-tree-sitter": "catalog:" } } diff --git a/packages/emitter-framework/src/csharp/components/class/declaration.tsx b/packages/emitter-framework/src/csharp/components/class/declaration.tsx index 057d132ecdd..bade989ad42 100644 --- a/packages/emitter-framework/src/csharp/components/class/declaration.tsx +++ b/packages/emitter-framework/src/csharp/components/class/declaration.tsx @@ -1,7 +1,7 @@ import { For, type Children } from "@alloy-js/core"; import * as cs from "@alloy-js/csharp"; -import { Method } from "@alloy-js/csharp"; -import { isVoidType, type Interface, type Model } from "@typespec/compiler"; +import type { Interface, Model } from "@typespec/compiler"; +import { isVoidType } from "@typespec/compiler"; import { useTsp } from "../../../core/index.js"; import { Property } from "../property/property.jsx"; import { TypeExpression } from "../type-expression.jsx"; @@ -77,7 +77,7 @@ function ClassMethods(props: ClassMethodsProps): Children { const abstractMethods: Children = []; for (const [name, method] of props.type.operations) { abstractMethods.push( - { diff --git a/packages/emitter-framework/src/csharp/components/extensible-enum/extensible-enum.test.tsx b/packages/emitter-framework/src/csharp/components/extensible-enum/extensible-enum.test.tsx new file mode 100644 index 00000000000..3bf9d126218 --- /dev/null +++ b/packages/emitter-framework/src/csharp/components/extensible-enum/extensible-enum.test.tsx @@ -0,0 +1,240 @@ +import { Tester } from "#test/test-host.js"; +import { type Children } from "@alloy-js/core"; +import { createCSharpNamePolicy, SourceFile } from "@alloy-js/csharp"; +import { t, type TesterInstance } from "@typespec/compiler/testing"; +import { beforeEach, expect, it } from "vitest"; +import { Output } from "../../../core/index.js"; +import { TypeExpression } from "../type-expression.jsx"; +import { ExtensibleEnumDeclaration } from "./extensible-enum.jsx"; + +let tester: TesterInstance; + +beforeEach(async () => { + tester = await Tester.createInstance(); +}); + +function Wrapper(props: { children: Children }) { + const policy = createCSharpNamePolicy(); + return ( + + {props.children} + + ); +} + +it("pass struct properties down", async () => { + const { TestEnum } = await tester.compile(t.code` + union ${t.union("TestEnum")} { + string, + a: "a", + } + `); + + expect( + + + , + ).toRenderTo(` + public partial struct TestEnum : IEquatable + { + private readonly string _value; + + TestEnum(string value) + { + _value = value; + } + + public static TestEnum A { get; } = new TestEnum(@"a"); + + public bool Equals(TestEnum other) => + string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); + + public override bool Equals(object? obj) => obj is TestEnum other && Equals(other); + + public override int GetHashCode() => + _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; + + public override string ToString() => _value; + + public static bool operator ==(TestEnum left, TestEnum right) => left.Equals(right); + + public static bool operator !=(TestEnum left, TestEnum right) => !left.Equals(right); + } + `); +}); + +it("renders union with string variants", async () => { + const { TestEnum } = await tester.compile(t.code` + union ${t.union("TestEnum")} { + string, + up: "up", + down: "down", + } + `); + + expect( + + + , + ).toRenderTo(` + readonly struct TestEnum : IEquatable + { + private readonly string _value; + + TestEnum(string value) + { + _value = value; + } + + public static TestEnum Up { get; } = new TestEnum(@"up"); + public static TestEnum Down { get; } = new TestEnum(@"down"); + + public bool Equals(TestEnum other) => + string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); + + public override bool Equals(object? obj) => obj is TestEnum other && Equals(other); + + public override int GetHashCode() => + _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; + + public override string ToString() => _value; + + public static bool operator ==(TestEnum left, TestEnum right) => left.Equals(right); + + public static bool operator !=(TestEnum left, TestEnum right) => !left.Equals(right); + } + `); +}); + +it("renders string-based enums with case-insensitive equality", async () => { + const { WidgetColor } = await tester.compile(t.code` + union ${t.union("WidgetColor")} { + Default: "default"; + "blue-value": "blue"; + "camelCase"; + } + `); + + const tree = ( + + + + ); + + await expect(tree).toRenderToAsync(` + readonly struct WidgetColor : IEquatable + { + private readonly string _value; + + WidgetColor(string value) + { + _value = value; + } + + public static WidgetColor Default { get; } = new WidgetColor(@"default"); + public static WidgetColor BlueValue { get; } = new WidgetColor(@"blue"); + public static WidgetColor CamelCase { get; } = new WidgetColor(@"camelCase"); + + public bool Equals(WidgetColor other) => + string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); + + public override bool Equals(object? obj) => obj is WidgetColor other && Equals(other); + + public override int GetHashCode() => + _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; + + public override string ToString() => _value; + + public static bool operator ==(WidgetColor left, WidgetColor right) => left.Equals(right); + + public static bool operator !=(WidgetColor left, WidgetColor right) => !left.Equals(right); + } + `); +}); + +it("renders number-based enums with integer equality", async () => { + const { WidgetSize } = await tester.compile(t.code` + union ${t.union("WidgetSize")} { + Small: 1; + 2; + } + `); + + const tree = ( + + + + ); + + await expect(tree).toRenderToAsync(` + readonly struct WidgetSize : IEquatable + { + private readonly int _value; + + WidgetSize(int value) + { + _value = value; + } + + public static WidgetSize Small { get; } = new WidgetSize(1); + public static WidgetSize NumberValue_2 { get; } = new WidgetSize(2); + + public bool Equals(WidgetSize other) => _value == other._value; + + public override bool Equals(object? obj) => obj is WidgetSize other && Equals(other); + + public override int GetHashCode() => + _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; + + public override string ToString() => _value; + + public static bool operator ==(WidgetSize left, WidgetSize right) => left.Equals(right); + + public static bool operator !=(WidgetSize left, WidgetSize right) => !left.Equals(right); + } + `); +}); + +it("is referencable in TypeExpression by default", async () => { + const { TestEnum } = await tester.compile(t.code` + union ${t.union("TestEnum")} { + string, + a: "a", + } + `); + + expect( + + ref: + + + , + ).toRenderTo(` + ref: TestEnum + readonly struct TestEnum : IEquatable + { + private readonly string _value; + + TestEnum(string value) + { + _value = value; + } + + public static TestEnum A { get; } = new TestEnum(@"a"); + + public bool Equals(TestEnum other) => + string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); + + public override bool Equals(object? obj) => obj is TestEnum other && Equals(other); + + public override int GetHashCode() => + _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; + + public override string ToString() => _value; + + public static bool operator ==(TestEnum left, TestEnum right) => left.Equals(right); + + public static bool operator !=(TestEnum left, TestEnum right) => !left.Equals(right); + } + `); +}); diff --git a/packages/emitter-framework/src/csharp/components/extensible-enum/extensible-enum.tsx b/packages/emitter-framework/src/csharp/components/extensible-enum/extensible-enum.tsx new file mode 100644 index 00000000000..824c733f610 --- /dev/null +++ b/packages/emitter-framework/src/csharp/components/extensible-enum/extensible-enum.tsx @@ -0,0 +1,164 @@ +import { code, For, List, namekey, refkey, type Children } from "@alloy-js/core"; +import { + Constructor, + Field, + Method, + Property, + StructDeclaration, + useCSharpNamePolicy, + type StructDeclarationProps, +} from "@alloy-js/csharp"; +import type { Union } from "@typespec/compiler"; +import { declarationRefkeys } from "../utils/refkey.js"; + +export interface ExtensibleEnumDeclarationProps extends Omit { + /** Union that should be rendered as an extensible enum struct */ + type: Union; + /** Name override */ + name?: string; +} + +/** + * Render a struct designed to represent an extensible enum based on a TypeSpec union. + */ +export function ExtensibleEnumDeclaration(props: ExtensibleEnumDeclarationProps): Children { + const { variants, kind } = getExtensibleEnumVariantsFromUnion(props.type); + const refkeys = declarationRefkeys(props.refkey, props.type)[0]; + return ( + + ); +} + +function getExtensibleEnumVariantsFromUnion(union: Union): { + kind: "string" | "int32"; + variants: ExtensibleEnumVariant[]; +} { + const variants: ExtensibleEnumVariant[] = []; + const kinds = new Set<"string" | "int32">(); + for (const member of union.variants.values()) { + switch (member.type.kind) { + case "String": + const name = typeof member.name === "string" ? member.name : member.type.value; + variants.push({ name, value: member.type.value }); + kinds.add("string"); + break; + case "Number": + const numName = + typeof member.name === "string" ? member.name : `NumberValue_${member.type.value}`; + variants.push({ name: numName, value: member.type.value.toString() }); + kinds.add("int32"); + break; + default: + break; // Ignore other types + } + } + if (kinds.size > 1) { + throw new Error("ExtensibleEnumUnion cannot have mixed kinds of variants."); + } + return { kind: [...kinds][0], variants }; +} + +interface ExtensibleEnumVariant { + name: string; + value: string | number; +} + +interface ExtensibleEnumFromVariantsProps extends Omit { + name: string; + kind: "string" | "int32"; + variants: ExtensibleEnumVariant[]; +} + +function ExtensibleEnumFromVariants(props: ExtensibleEnumFromVariantsProps): Children { + const valueRk = refkey(); + const constructorRk = refkey(); + const namepolicy = useCSharpNamePolicy(); + const name = namepolicy.getName(props.name, "struct"); + const type = props.kind === "string" ? "string" : "int"; + return ( + `]} + > + + + + {valueRk} = value; + + + {(x) => ( + + )} + + + {props.kind === "string" + ? code`string.Equals(${valueRk}, other.${valueRk}, StringComparison.InvariantCultureIgnoreCase)` + : code`${valueRk} == other.${valueRk}`} + + + {code`obj is ${name} other && Equals(other)`} + + + {code`${valueRk} != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(${valueRk}) : 0`} + + + {valueRk} + + + {code`left.Equals(right)`} + + + {code`!left.Equals(right)`} + + + + ); +} diff --git a/packages/emitter-framework/src/csharp/components/index.ts b/packages/emitter-framework/src/csharp/components/index.ts index 9d22f199970..78efc8cf46e 100644 --- a/packages/emitter-framework/src/csharp/components/index.ts +++ b/packages/emitter-framework/src/csharp/components/index.ts @@ -1,5 +1,6 @@ export * from "./class/declaration.js"; export * from "./enum/declaration.jsx"; +export * from "./extensible-enum/extensible-enum.jsx"; export * from "./json-converter/json-converter-resolver.jsx"; export * from "./json-converter/json-converter.jsx"; export * from "./property/property.jsx"; diff --git a/packages/emitter-framework/src/python/components/type-expression/type-expression.tsx b/packages/emitter-framework/src/python/components/type-expression/type-expression.tsx index 6bf20e9e2cf..979551b776b 100644 --- a/packages/emitter-framework/src/python/components/type-expression/type-expression.tsx +++ b/packages/emitter-framework/src/python/components/type-expression/type-expression.tsx @@ -161,7 +161,7 @@ export function TypeExpression(props: TypeExpressionProps) { case "Operation": { // Render function types as typing.Callable[[ArgTypes...], ReturnType] // If parameters cannot be enumerated, fall back to Callable[..., ReturnType] - let paramTypes: Type[] | null = null; + let paramTypes: Type[] | null; const op: any = type as any; if (op.parameters) { try { @@ -276,18 +276,19 @@ const pythonTypeToImport = new Map([ function getScalarIntrinsicExpression($: Typekit, type: Scalar | IntrinsicType): string | null { let intrinsicName: string; if ($.scalar.is(type)) { - if ($.scalar.isUtcDateTime(type) || $.scalar.extendsUtcDateTime(type)) { - const encoding = $.scalar.getEncoding(type); - intrinsicName = "utcDateTime"; - switch (encoding?.encoding) { - case "unixTimestamp": - case "rfc7231": - case "rfc3339": - default: - intrinsicName = `utcDateTime`; - break; - } - } + // This was always is overridden below? + // if ($.scalar.isUtcDateTime(type) || $.scalar.extendsUtcDateTime(type)) { + // const encoding = $.scalar.getEncoding(type); + // intrinsicName = "utcDateTime"; + // switch (encoding?.encoding) { + // case "unixTimestamp": + // case "rfc7231": + // case "rfc3339": + // default: + // intrinsicName = `utcDateTime`; + // break; + // } + // } intrinsicName = $.scalar.getStdBase(type)?.name ?? ""; } else { intrinsicName = type.name; diff --git a/packages/emitter-framework/src/typescript/components/type-expression.tsx b/packages/emitter-framework/src/typescript/components/type-expression.tsx index 18123f64258..7743ef4bb2f 100644 --- a/packages/emitter-framework/src/typescript/components/type-expression.tsx +++ b/packages/emitter-framework/src/typescript/components/type-expression.tsx @@ -132,7 +132,7 @@ function getScalarIntrinsicExpression($: Typekit, type: Scalar | IntrinsicType): if ($.scalar.is(type)) { if ($.scalar.isUtcDateTime(type) || $.scalar.extendsUtcDateTime(type)) { const encoding = $.scalar.getEncoding(type); - let emittedType = "Date"; + let emittedType; switch (encoding?.encoding) { case "unixTimestamp": case "rfc7231": diff --git a/packages/eslint-plugin-typespec/CHANGELOG.md b/packages/eslint-plugin-typespec/CHANGELOG.md index ca40f1c7b66..3add11b0d1a 100644 --- a/packages/eslint-plugin-typespec/CHANGELOG.md +++ b/packages/eslint-plugin-typespec/CHANGELOG.md @@ -1,5 +1,20 @@ # Change Log - @typespec/eslint-plugin +## 0.81.0 + +No changes, version bump only. + +## 0.80.0 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 0.79.0 + +No changes, version bump only. + ## 0.78.0 ### Bump dependencies diff --git a/packages/eslint-plugin-typespec/package.json b/packages/eslint-plugin-typespec/package.json index cc08e16ee45..cacc2ee9ed9 100644 --- a/packages/eslint-plugin-typespec/package.json +++ b/packages/eslint-plugin-typespec/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/eslint-plugin", - "version": "0.78.0", + "version": "0.81.0", "author": "Microsoft Corporation", "description": "Eslint plugin providing set of rules to be used in the JS/TS code of TypeSpec libraries", "homepage": "https://typespec.io", @@ -19,12 +19,12 @@ "type": "commonjs", "main": "dist/src/index.js", "engines": { - "node": ">=14.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "tsc -p .", - "watch": "tsc -p . --watch", + "build": "tsc -p tsconfig.build.json", + "watch": "tsc -p tsconfig.build.json --watch", "test": "vitest run", "test:ui": "vitest --ui", "test:ci": "vitest run --coverage --reporter=junit --reporter=default", @@ -37,22 +37,22 @@ "!dist/test/**" ], "peerDependencies": { - "eslint": "^9.39.2" + "eslint": "catalog:" }, "devDependencies": { - "@types/node": "~25.0.2", - "@typescript-eslint/parser": "^8.49.0", - "@typescript-eslint/rule-tester": "^8.49.0", - "@typescript-eslint/types": "^8.49.0", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "eslint": "^9.39.2", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@types/node": "catalog:", + "@typescript-eslint/parser": "catalog:", + "@typescript-eslint/rule-tester": "catalog:", + "@typescript-eslint/types": "catalog:", + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "eslint": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" }, "dependencies": { - "@typescript-eslint/utils": "^8.27.0" + "@typescript-eslint/utils": "catalog:" } } diff --git a/packages/eslint-plugin-typespec/tsconfig.build.json b/packages/eslint-plugin-typespec/tsconfig.build.json new file mode 100644 index 00000000000..33eafb056f2 --- /dev/null +++ b/packages/eslint-plugin-typespec/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "test/**/*.ts"], + "references": [ + { "path": "../compiler/tsconfig.build.json" }, + { "path": "../rest/tsconfig.build.json" }, + { "path": "../openapi/tsconfig.build.json" } + ] +} diff --git a/packages/eslint-plugin-typespec/tsconfig.config.json b/packages/eslint-plugin-typespec/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/eslint-plugin-typespec/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/eslint-plugin-typespec/tsconfig.json b/packages/eslint-plugin-typespec/tsconfig.json index 16ec2215509..460f1979bf5 100644 --- a/packages/eslint-plugin-typespec/tsconfig.json +++ b/packages/eslint-plugin-typespec/tsconfig.json @@ -10,6 +10,5 @@ "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo", "skipLibCheck": true - }, - "include": ["src/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/events/CHANGELOG.md b/packages/events/CHANGELOG.md index 28e5258207b..46de10dc21f 100644 --- a/packages/events/CHANGELOG.md +++ b/packages/events/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog - @typespec/events +## 0.81.0 + +No changes, version bump only. + +## 0.80.0 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 0.79.0 + +No changes, version bump only. + ## 0.78.0 ### Bump dependencies diff --git a/packages/events/generated-defs/TypeSpec.Events.ts-test.ts b/packages/events/generated-defs/TypeSpec.Events.ts-test.ts index b49c6638a51..e284767b985 100644 --- a/packages/events/generated-defs/TypeSpec.Events.ts-test.ts +++ b/packages/events/generated-defs/TypeSpec.Events.ts-test.ts @@ -7,4 +7,4 @@ import type { TypeSpecEventsDecorators } from "./TypeSpec.Events.js"; /** * An error here would mean that the exported decorator is not using the same signature. Make sure to have export const $decName: DecNameDecorator = (...) => ... */ -const _: TypeSpecEventsDecorators = $decorators["TypeSpec.Events"]; +const _decs: TypeSpecEventsDecorators = $decorators["TypeSpec.Events"]; diff --git a/packages/events/package.json b/packages/events/package.json index b4e748550b2..fb531abc728 100644 --- a/packages/events/package.json +++ b/packages/events/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/events", - "version": "0.78.0", + "version": "0.81.0", "author": "Microsoft Corporation", "description": "TypeSpec library providing events bindings", "homepage": "https://typespec.io", @@ -31,12 +31,12 @@ } }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "pnpm gen-extern-signature && tsc -p . && pnpm lint-typespec-library", - "watch": "tsc -p . --watch", + "build": "pnpm gen-extern-signature && tsc -p tsconfig.build.json && pnpm lint-typespec-library", + "watch": "tsc -p tsconfig.build.json --watch", "gen-extern-signature": "tspd --enable-experimental gen-extern-signature .", "lint-typespec-library": "tsp compile . --warn-as-error --import @typespec/library-linter --no-emit", "test": "vitest run", @@ -56,15 +56,15 @@ "@typespec/compiler": "workspace:^" }, "devDependencies": { - "@types/node": "~25.0.2", + "@types/node": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/library-linter": "workspace:^", "@typespec/tspd": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/events/test/decorators.test.ts b/packages/events/test/decorators.test.ts index 3a03a41b5a7..e577e55b231 100644 --- a/packages/events/test/decorators.test.ts +++ b/packages/events/test/decorators.test.ts @@ -1,32 +1,23 @@ -import type { Model, Union } from "@typespec/compiler"; -import { - expectDiagnosticEmpty, - expectDiagnostics, - type BasicTestRunner, -} from "@typespec/compiler/testing"; -import { assert, beforeEach, describe, expect, it } from "vitest"; +import type { Model } from "@typespec/compiler"; +import { expectDiagnosticEmpty, expectDiagnostics, t } from "@typespec/compiler/testing"; +import { describe, expect, it } from "vitest"; import { getContentType, isEventData, isEvents } from "../src/decorators.js"; import { unsafe_getEventDefinitions as getEventDefinitions } from "../src/experimental/index.js"; -import { createEventsTestRunner } from "./test-host.js"; - -let runner: BasicTestRunner; - -beforeEach(async () => { - runner = await createEventsTestRunner(); -}); +import { Tester } from "./test-host.js"; describe("@events", () => { it("marks the union as containing event definitions", async () => { - const { MixedEvents } = await runner.compile(`@test @events union MixedEvents {}`); + const { MixedEvents, program } = await Tester.compile( + t.code`@events union ${t.union("MixedEvents")} {}`, + ); - expect(isEvents(runner.program, MixedEvents as Union)).toBe(true); + expect(isEvents(program, MixedEvents)).toBe(true); }); it("can contain multiple event definitions", async () => { - const { MixedEvents, JsonEvent, StringEvent } = await runner.compile( - ` -@test -model StringEvent { + const { MixedEvents, JsonEvent, StringEvent, program } = await Tester.compile( + t.code` +model ${t.model("StringEvent")} { payload: { @Events.contentType("text/plain") @Events.data @@ -34,8 +25,7 @@ model StringEvent { }; } -@test -model JsonEvent { +model ${t.model("JsonEvent")} { @Events.data @Events.contentType("application/json") payload: { @@ -44,9 +34,8 @@ model JsonEvent { }; } -@test @events -union MixedEvents { +union ${t.union("MixedEvents")} { @Events.contentType("application/json") stringEvent: StringEvent, @@ -58,14 +47,10 @@ union MixedEvents { `, ); - assert(MixedEvents.kind === "Union"); - assert(JsonEvent.kind === "Model"); - assert(StringEvent.kind === "Model"); - const variants = Array.from(MixedEvents.variants.values()); - expect(isEvents(runner.program, MixedEvents)).toBe(true); - const [eventDefinitions, diagnostics] = getEventDefinitions(runner.program, MixedEvents); + expect(isEvents(program, MixedEvents)).toBe(true); + const [eventDefinitions, diagnostics] = getEventDefinitions(program, MixedEvents); expectDiagnosticEmpty(diagnostics); expect(eventDefinitions.length).toBe(3); @@ -101,14 +86,15 @@ union MixedEvents { describe("@data", () => { it("marks a model property as being the event payload", async () => { - const { Event } = await runner.compile(`@test model Event { @data foo: string }`); - assert(Event.kind === "Model"); + const { Event, program } = await Tester.compile( + t.code`model ${t.model("Event")} { @data foo: string }`, + ); - expect(isEventData(runner.program, Event.properties.get("foo")!)).toBe(true); + expect(isEventData(program, Event.properties.get("foo")!)).toBe(true); }); it("can be applied directly only once in an event model", async () => { - const diagnostics = await runner.diagnose( + const diagnostics = await Tester.diagnose( ` model SampleEvent { @data @@ -131,7 +117,7 @@ union SampleEvents { }); it("cannot be applied directly more than once in an event model", async () => { - const diagnostics = await runner.diagnose( + const diagnostics = await Tester.diagnose( ` model SampleEvent { @data @@ -155,7 +141,7 @@ union SampleEvents { }); it("cannot be applied indirectly more than once in an event model", async () => { - const diagnostics = await runner.diagnose( + const diagnostics = await Tester.diagnose( ` model Foo { @data @@ -181,7 +167,7 @@ union SampleEvents { }); it("cannot be applied in a Record", async () => { - const diagnostics = await runner.diagnose( + const diagnostics = await Tester.diagnose( ` model Foo { @data @@ -206,7 +192,7 @@ union SampleEvents { }); it("cannot be applied in an Array", async () => { - const diagnostics = await runner.diagnose( + const diagnostics = await Tester.diagnose( ` model Foo { @data @@ -231,7 +217,7 @@ union SampleEvents { }); it("detects multiple event payloads nested in tuples", async () => { - const diagnostics = await runner.diagnose( + const diagnostics = await Tester.diagnose( ` model Foo { @data @@ -265,41 +251,34 @@ union SampleEvents { describe("@contentType", () => { it("can set the top-level event's content-type", async () => { - const { MixedEvents, TargetEvent } = await runner.compile( - ` + const { stringEvent, program } = await Tester.compile( + t.code` model StringEvent { @Events.contentType("text/plain") @Events.data payload: string; } -@test @events union MixedEvents { - @test("TargetEvent") @Events.contentType("application/json") - stringEvent: StringEvent, + ${t.unionVariant("stringEvent")}: StringEvent, } `, ); - assert(MixedEvents.kind === "Union"); - assert(TargetEvent.kind === "UnionVariant"); - - expect(getContentType(runner.program, TargetEvent)).toBe("application/json"); + expect(getContentType(program, stringEvent)).toBe("application/json"); }); it("can set the event payload's content-type", async () => { - const { MixedEvents, EventPayload } = await runner.compile( - ` + const { payload, program } = await Tester.compile( + t.code` model StringEvent { - @test("EventPayload") @Events.contentType("text/plain") @Events.data - payload: string; + ${t.modelProperty("payload")}: string; } -@test @events union MixedEvents { @Events.contentType("application/json") @@ -308,22 +287,17 @@ union MixedEvents { `, ); - assert(MixedEvents.kind === "Union"); - assert(EventPayload.kind === "ModelProperty"); - - expect(getContentType(runner.program, EventPayload)).toBe("text/plain"); + expect(getContentType(program, payload)).toBe("text/plain"); }); it("cannot be set on a non-payload property", async () => { - const diagnostics = await runner.diagnose( + const diagnostics = await Tester.diagnose( ` model StringEvent { - @test("EventPayload") @Events.contentType("text/plain") payload: string; } -@test @events union MixedEvents { stringEvent: StringEvent, diff --git a/packages/events/test/test-host.ts b/packages/events/test/test-host.ts index 41e474b99bf..6681a5def7e 100644 --- a/packages/events/test/test-host.ts +++ b/packages/events/test/test-host.ts @@ -1,13 +1,8 @@ -import { createTestHost, createTestWrapper } from "@typespec/compiler/testing"; -import { EventsTestLibrary } from "../src/testing/index.js"; +import { resolvePath } from "@typespec/compiler"; +import { createTester } from "@typespec/compiler/testing"; -export async function createEventsTestHost() { - return createTestHost({ - libraries: [EventsTestLibrary], - }); -} - -export async function createEventsTestRunner() { - const host = await createEventsTestHost(); - return createTestWrapper(host, { autoUsings: ["TypeSpec.Events"] }); -} +export const Tester = createTester(resolvePath(import.meta.dirname, ".."), { + libraries: ["@typespec/events"], +}) + .importLibraries() + .using("Events"); diff --git a/packages/events/tsconfig.build.json b/packages/events/tsconfig.build.json new file mode 100644 index 00000000000..85c215d455c --- /dev/null +++ b/packages/events/tsconfig.build.json @@ -0,0 +1,5 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"], + "references": [{ "path": "../compiler/tsconfig.build.json" }] +} diff --git a/packages/events/tsconfig.config.json b/packages/events/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/events/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/events/tsconfig.json b/packages/events/tsconfig.json index 19de0b3a83d..8d0eb2d00d4 100644 --- a/packages/events/tsconfig.json +++ b/packages/events/tsconfig.json @@ -6,6 +6,5 @@ "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo", "verbatimModuleSyntax": true - }, - "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/html-program-viewer/CHANGELOG.md b/packages/html-program-viewer/CHANGELOG.md index 3a42515d02b..803d198d996 100644 --- a/packages/html-program-viewer/CHANGELOG.md +++ b/packages/html-program-viewer/CHANGELOG.md @@ -1,5 +1,27 @@ # Change Log - @typespec/html-program-viewer +## 0.81.0 + +No changes, version bump only. + +## 0.80.0 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + +### Bug Fixes + +- [#9617](https://github.com/microsoft/typespec/pull/9617) Fix type graph viewer to display Symbol-keyed decorator state + + +## 0.79.0 + +### Bump dependencies + +- [#9446](https://github.com/microsoft/typespec/pull/9446) Upgrade dependencies + + ## 0.78.0 ### Bump dependencies diff --git a/packages/html-program-viewer/package.json b/packages/html-program-viewer/package.json index fff21791c3a..3e215ca46c6 100644 --- a/packages/html-program-viewer/package.json +++ b/packages/html-program-viewer/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/html-program-viewer", - "version": "0.78.0", + "version": "0.81.0", "author": "Microsoft Corporation", "description": "TypeSpec library for emitting an html view of the program.", "homepage": "https://typespec.io", @@ -29,7 +29,7 @@ "./style.css": "./dist/style.css" }, "engines": { - "node": ">=14.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", @@ -51,33 +51,32 @@ "@typespec/compiler": "workspace:^" }, "dependencies": { - "@fluentui/react-components": "~9.72.3", - "@fluentui/react-icons": "^2.0.292", - "@fluentui/react-list": "^9.1.2", - "react": "~19.2.3", - "react-dom": "~19.2.3", - "react-hotkeys-hook": "^5.1.0" + "@fluentui/react-components": "catalog:", + "@fluentui/react-icons": "catalog:", + "@fluentui/react-list": "catalog:", + "react": "catalog:", + "react-dom": "catalog:", + "react-hotkeys-hook": "catalog:" }, "devDependencies": { - "@babel/core": "^7.26.10", - "@testing-library/dom": "^10.4.0", - "@testing-library/jest-dom": "^6.6.3", - "@testing-library/react": "^16.2.0", - "@types/node": "~25.0.2", - "@types/react": "~19.2.7", - "@types/react-dom": "~19.2.2", + "@babel/core": "catalog:", + "@testing-library/dom": "catalog:", + "@testing-library/jest-dom": "catalog:", + "@testing-library/react": "catalog:", + "@types/node": "catalog:", + "@types/react": "catalog:", + "@types/react-dom": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/react-components": "workspace:^", - "@vitejs/plugin-react": "~5.1.2", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vite": "^7.2.7", - "vite-plugin-checker": "^0.12.0", - "vite-plugin-dts": "4.5.4", - "vite-plugin-node-polyfills": "^0.25.0", - "vitest": "^4.0.15" + "@vitejs/plugin-react": "catalog:", + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vite": "catalog:", + "vite-plugin-checker": "catalog:", + "vite-plugin-dts": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/html-program-viewer/src/react/js-inspector/object-inspector.test.tsx b/packages/html-program-viewer/src/react/js-inspector/object-inspector.test.tsx new file mode 100644 index 00000000000..dfce1c3dac9 --- /dev/null +++ b/packages/html-program-viewer/src/react/js-inspector/object-inspector.test.tsx @@ -0,0 +1,65 @@ +import { render } from "@testing-library/react"; +import { expect, it } from "vitest"; +import { ObjectInspector } from "./object-inspector.js"; + +it("should display Symbol-keyed properties", () => { + const sym = Symbol("testSymbol"); + const data = { + stringProp: "value1", + [sym]: "symbolValue", + }; + + const { container } = render(); + + expect(container.textContent).toContain("Symbol(testSymbol)"); + expect(container.textContent).toContain("symbolValue"); +}); + +it("should display Symbol-keyed properties without description", () => { + // eslint-disable-next-line symbol-description + const sym = Symbol(); + const data = { + [sym]: "symbolValue", + }; + + const { container } = render(); + + expect(container.textContent).toContain("Symbol()"); + expect(container.textContent).toContain("symbolValue"); +}); + +it("should display both string and Symbol properties", () => { + const sym1 = Symbol("first"); + const sym2 = Symbol("second"); + const data = { + stringProp1: "value1", + stringProp2: "value2", + [sym1]: "symbolValue1", + [sym2]: "symbolValue2", + }; + + const { container } = render(); + + expect(container.textContent).toContain("stringProp1"); + expect(container.textContent).toContain("value1"); + expect(container.textContent).toContain("stringProp2"); + expect(container.textContent).toContain("value2"); + expect(container.textContent).toContain("Symbol(first)"); + expect(container.textContent).toContain("symbolValue1"); + expect(container.textContent).toContain("Symbol(second)"); + expect(container.textContent).toContain("symbolValue2"); +}); + +it("should not display non-enumerable Symbol properties when showNonenumerable is false", () => { + const sym = Symbol("nonEnumSymbol"); + const data = {}; + Object.defineProperty(data, sym, { + value: "nonEnumValue", + enumerable: false, + }); + + const { container } = render(); + + expect(container.textContent).not.toContain("Symbol(nonEnumSymbol)"); + expect(container.textContent).not.toContain("nonEnumValue"); +}); diff --git a/packages/html-program-viewer/src/react/js-inspector/object-inspector.tsx b/packages/html-program-viewer/src/react/js-inspector/object-inspector.tsx index b5bf0f4af58..28373ac0d05 100644 --- a/packages/html-program-viewer/src/react/js-inspector/object-inspector.tsx +++ b/packages/html-program-viewer/src/react/js-inspector/object-inspector.tsx @@ -33,19 +33,25 @@ const createIterator = (showNonenumerable?: boolean, sortObjectKeys?: boolean) = i++; } } else { - const keys = Object.getOwnPropertyNames(data); - if (sortObjectKeys === true && !dataIsArray) { + // Get all property keys (both string and Symbol) + const stringKeys = Object.getOwnPropertyNames(data); + const symbolKeys = Object.getOwnPropertySymbols(data); + const allKeys: (string | symbol)[] = [...stringKeys, ...symbolKeys]; + + if (sortObjectKeys && !dataIsArray) { // Array keys should not be sorted in alphabetical order - keys.sort(); - } else if (typeof sortObjectKeys === "function") { - keys.sort(sortObjectKeys); + allKeys.sort((a, b) => { + const aStr = typeof a === "string" ? a : a.toString(); + const bStr = typeof b === "string" ? b : b.toString(); + return aStr.localeCompare(bStr); + }); } - for (const propertyName of keys) { - if (propertyIsEnumerable.call(data, propertyName)) { - const propertyValue = getPropertyValue(data, propertyName); + for (const key of allKeys) { + if (propertyIsEnumerable.call(data, key)) { + const propertyValue = getPropertyValue(data, key); yield { - name: propertyName || `""`, + name: typeof key === "string" ? key || `""` : key.toString(), data: propertyValue, }; } else if (showNonenumerable) { @@ -54,14 +60,14 @@ const createIterator = (showNonenumerable?: boolean, sortObjectKeys?: boolean) = // http://stackoverflow.com/questions/31921189/caller-and-arguments-are-restricted-function-properties-and-cannot-be-access let propertyValue; try { - propertyValue = getPropertyValue(data, propertyName); + propertyValue = getPropertyValue(data, key); } catch (e) { // console.warn(e) } if (propertyValue !== undefined) { yield { - name: propertyName, + name: typeof key === "string" ? key || `""` : key.toString(), data: propertyValue, isNonenumerable: true, }; @@ -109,7 +115,6 @@ export const ObjectInspector: FC = ({ const [expandedPaths, setExpandedPaths] = useState(new Set()); const dataIterator = createIterator(showNonenumerable, sortObjectKeys); const renderer = nodeRenderer ?? DefaultNodeRenderer; - const tree = computeNode({ path: DEFAULT_ROOT_PATH, name: "root", diff --git a/packages/html-program-viewer/src/react/js-inspector/object-preview.test.tsx b/packages/html-program-viewer/src/react/js-inspector/object-preview.test.tsx new file mode 100644 index 00000000000..abb8a691a96 --- /dev/null +++ b/packages/html-program-viewer/src/react/js-inspector/object-preview.test.tsx @@ -0,0 +1,50 @@ +import { render } from "@testing-library/react"; +import { expect, it } from "vitest"; +import { ObjectPreview } from "./object-preview.js"; + +it("should display Symbol properties in object preview", () => { + const sym = Symbol("testSymbol"); + const data = { + stringProp: "value1", + [sym]: "symbolValue", + }; + + const { container } = render(); + + // Check that both string and Symbol properties are displayed in preview + expect(container.textContent).toContain("stringProp"); + expect(container.textContent).toContain("value1"); + expect(container.textContent).toContain("Symbol(testSymbol)"); + expect(container.textContent).toContain("symbolValue"); +}); + +it("should display Symbol properties without description in preview", () => { + // eslint-disable-next-line symbol-description + const sym = Symbol(); + const data = { + [sym]: "value", + }; + + const { container } = render(); + + expect(container.textContent).toContain("Symbol()"); + expect(container.textContent).toContain("value"); +}); + +it("should respect max properties limit including Symbol properties", () => { + const sym1 = Symbol("first"); + const sym2 = Symbol("second"); + const data = { + prop1: "val1", + prop2: "val2", + prop3: "val3", + prop4: "val4", + [sym1]: "symVal1", + [sym2]: "symVal2", + }; + + const { container } = render(); + + // Should show ellipsis when exceeding max properties (5) + expect(container.textContent).toContain("…"); +}); diff --git a/packages/html-program-viewer/src/react/js-inspector/object-preview.tsx b/packages/html-program-viewer/src/react/js-inspector/object-preview.tsx index f5e0a98b6fb..6e6ea9b0696 100644 --- a/packages/html-program-viewer/src/react/js-inspector/object-preview.tsx +++ b/packages/html-program-viewer/src/react/js-inspector/object-preview.tsx @@ -4,7 +4,7 @@ import { JsValue } from "./js-value/js-value.js"; import { ObjectName } from "./object-name.js"; import style from "./object-inspector.module.css"; -import { hasOwnProperty } from "./utils/object-prototype.js"; +import { propertyIsEnumerable } from "./utils/object-prototype.js"; import { getPropertyValue } from "./utils/property-utils.js"; /* intersperse arr with separator */ @@ -54,27 +54,33 @@ export const ObjectPreview: FC = ({ data }) => { } else { const maxProperties = OBJECT_MAX_PROPERTIES; const propertyNodes: ReactNode[] = []; - for (const propertyName in object) { - if (hasOwnProperty.call(object, propertyName)) { - let ellipsis; - if ( - propertyNodes.length === maxProperties - 1 && - Object.keys(object).length > maxProperties - ) { - ellipsis = …; - } - const propertyValue = getPropertyValue(object, propertyName); - propertyNodes.push( - - - :  - - {ellipsis} - , - ); - if (ellipsis) break; + // Get all property keys (both string and Symbol), filtering for enumerable ones + const stringKeys = Object.keys(object); // Object.keys only returns enumerable string properties + const symbolKeys = Object.getOwnPropertySymbols(object).filter((sym) => + propertyIsEnumerable.call(object, sym), + ); + const allKeys: (string | symbol)[] = [...stringKeys, ...symbolKeys]; + const totalProperties = allKeys.length; + + for (let i = 0; i < allKeys.length; i++) { + const key = allKeys[i]; + let ellipsis; + if (propertyNodes.length === maxProperties - 1 && totalProperties > maxProperties) { + ellipsis = …; } + + const propertyValue = getPropertyValue(object, key); + const displayName = typeof key === "string" ? key || `""` : key.toString(); + propertyNodes.push( + + + :  + + {ellipsis} + , + ); + if (ellipsis) break; } const objectConstructorName = object.constructor ? object.constructor.name : "Object"; diff --git a/packages/html-program-viewer/src/react/js-inspector/utils/property-utils.tsx b/packages/html-program-viewer/src/react/js-inspector/utils/property-utils.tsx index 614e3975b2c..b87dc15df2a 100644 --- a/packages/html-program-viewer/src/react/js-inspector/utils/property-utils.tsx +++ b/packages/html-program-viewer/src/react/js-inspector/utils/property-utils.tsx @@ -1,4 +1,4 @@ -export function getPropertyValue(object: any, propertyName: string) { +export function getPropertyValue(object: any, propertyName: string | symbol) { const propertyDescriptor = Object.getOwnPropertyDescriptor(object, propertyName); if (propertyDescriptor?.get) { try { diff --git a/packages/html-program-viewer/src/react/type-config.ts b/packages/html-program-viewer/src/react/type-config.ts index 1066c137a37..8bda40b820a 100644 --- a/packages/html-program-viewer/src/react/type-config.ts +++ b/packages/html-program-viewer/src/react/type-config.ts @@ -57,6 +57,7 @@ export const TypeConfig: TypeGraphConfig = buildConfig({ unions: "nested-items", enums: "nested-items", decoratorDeclarations: "nested-items", + functionDeclarations: "nested-items", }, Interface: { operations: "nested-items", @@ -148,6 +149,7 @@ export const TypeConfig: TypeGraphConfig = buildConfig({ }, // Don't want to expose those for now + FunctionType: null, Intrinsic: null, }); diff --git a/packages/html-program-viewer/src/react/type-graph.test.tsx b/packages/html-program-viewer/src/react/type-graph.test.tsx index bb08113212a..f46cb8422a2 100644 --- a/packages/html-program-viewer/src/react/type-graph.test.tsx +++ b/packages/html-program-viewer/src/react/type-graph.test.tsx @@ -1,12 +1,11 @@ import { render } from "@testing-library/react"; import { it } from "vitest"; -import { createViewerTestRunner } from "../../test/test-host.js"; +import { Tester } from "../../test/test-host.js"; import { TypeGraph } from "./index.js"; async function renderTypeGraphFor(code: string) { - const runner = await createViewerTestRunner(); - await runner.compile(code); - render(); + const { program } = await Tester.compile(code); + render(); } it("operation", async () => { diff --git a/packages/html-program-viewer/test/emitter.test.ts b/packages/html-program-viewer/test/emitter.test.ts index 5f2a74e1dd4..17196dcbe07 100644 --- a/packages/html-program-viewer/test/emitter.test.ts +++ b/packages/html-program-viewer/test/emitter.test.ts @@ -1,15 +1,8 @@ -import type { BasicTestRunner } from "@typespec/compiler/testing"; -import { beforeEach, it } from "vitest"; -import { createViewerTestRunner } from "./test-host.js"; +import { it } from "vitest"; +import { Tester } from "./test-host.js"; -let runner: BasicTestRunner; - -beforeEach(async () => { - runner = await createViewerTestRunner(); -}); +const EmitterTester = Tester.emit("@typespec/html-program-viewer"); it("runs emitter", async () => { - await runner.compile(`op foo(): string;`, { - emit: ["@typespec/html-program-viewer"], - }); + await EmitterTester.compile(`op foo(): string;`); }); diff --git a/packages/html-program-viewer/test/test-host.ts b/packages/html-program-viewer/test/test-host.ts index 0842d203836..b5d1197b89f 100644 --- a/packages/html-program-viewer/test/test-host.ts +++ b/packages/html-program-viewer/test/test-host.ts @@ -1,15 +1,6 @@ -import { createTestHost, createTestWrapper } from "@typespec/compiler/testing"; -import { ProgramViewerTestLibrary } from "../src/testing/index.js"; +import { resolvePath } from "@typespec/compiler"; +import { createTester } from "@typespec/compiler/testing"; -export async function createViewerTestHost() { - return createTestHost({ - libraries: [ProgramViewerTestLibrary], - }); -} - -export async function createViewerTestRunner() { - const host = await createViewerTestHost(); - return createTestWrapper(host, { - autoImports: [], - }); -} +export const Tester = createTester(resolvePath(import.meta.dirname, ".."), { + libraries: ["@typespec/html-program-viewer"], +}); diff --git a/packages/html-program-viewer/tsconfig.build.json b/packages/html-program-viewer/tsconfig.build.json index 4d8a7442d81..f34cd970576 100644 --- a/packages/html-program-viewer/tsconfig.build.json +++ b/packages/html-program-viewer/tsconfig.build.json @@ -1,8 +1,6 @@ { "extends": "./tsconfig.json", - "compilerOptions": { - "rootDir": "src" - }, "include": ["src"], - "exclude": ["src/index.ts", "src/emitter.ts", "**/*.test.ts", "**/*.test.tsx"] + "exclude": ["src/index.ts", "src/emitter.ts", "**/*.test.ts", "**/*.test.tsx"], + "references": [{ "path": "../compiler/tsconfig.build.json" }] } diff --git a/packages/html-program-viewer/vite.config.ts b/packages/html-program-viewer/vite.config.ts index 0c30367dc80..db0cd087750 100644 --- a/packages/html-program-viewer/vite.config.ts +++ b/packages/html-program-viewer/vite.config.ts @@ -25,7 +25,7 @@ export default defineConfig({ formats: ["es"], }, rollupOptions: { - external: externals, + external: (id) => externals.some((x) => id.startsWith(x)), }, }, plugins: [ diff --git a/packages/http-canonicalization/CHANGELOG.md b/packages/http-canonicalization/CHANGELOG.md index 41c46c47727..86c62565b9d 100644 --- a/packages/http-canonicalization/CHANGELOG.md +++ b/packages/http-canonicalization/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog - @typespec/http-canonicalization +## 0.16.1 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 0.16.0 + +### Bump dependencies + +- [#9446](https://github.com/microsoft/typespec/pull/9446) Upgrade dependencies + + ## 0.15.0 ### Breaking Changes diff --git a/packages/http-canonicalization/package.json b/packages/http-canonicalization/package.json index 2b1800d3c66..d43920119c4 100644 --- a/packages/http-canonicalization/package.json +++ b/packages/http-canonicalization/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/http-canonicalization", - "version": "0.15.0", + "version": "0.16.1", "type": "module", "main": "dist/src/index.js", "repository": { @@ -8,10 +8,10 @@ "url": "git+https://github.com/microsoft/typespec.git" }, "scripts": { - "build": "tsc -p .", + "build": "tsc -p tsconfig.build.json", "clean": "rimraf ./dist", "format": "prettier . --write", - "watch": "tsc -p . --watch", + "watch": "tsc -p tsconfig.build.json --watch", "test": "vitest run", "test:ui": "vitest --ui", "test:watch": "vitest -w", @@ -39,8 +39,8 @@ "@typespec/http": "workspace:^" }, "devDependencies": { - "@types/node": "~25.0.2", - "concurrently": "^9.1.2", - "prettier": "~3.8.0" + "@types/node": "catalog:", + "concurrently": "catalog:", + "prettier": "catalog:" } } diff --git a/packages/http-canonicalization/tsconfig.build.json b/packages/http-canonicalization/tsconfig.build.json new file mode 100644 index 00000000000..8d7fbf7b69e --- /dev/null +++ b/packages/http-canonicalization/tsconfig.build.json @@ -0,0 +1,5 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "src/**/*.tsx", "test/**/*.ts", "test/**/*.tsx"], + "exclude": ["node_modules", "dist"] +} diff --git a/packages/http-canonicalization/tsconfig.json b/packages/http-canonicalization/tsconfig.json index 6b38294b73c..2041003b42b 100644 --- a/packages/http-canonicalization/tsconfig.json +++ b/packages/http-canonicalization/tsconfig.json @@ -14,6 +14,5 @@ "rootDir": "./", "verbatimModuleSyntax": true }, - "include": ["src/**/*.ts", "src/**/*.tsx", "test/**/*.ts", "test/**/*.tsx"], "exclude": ["node_modules", "dist"] } diff --git a/packages/http-client-csharp/.tspd/docs/customization.md b/packages/http-client-csharp/.tspd/docs/customization.md index fe9323e4b31..87286f97a19 100644 --- a/packages/http-client-csharp/.tspd/docs/customization.md +++ b/packages/http-client-csharp/.tspd/docs/customization.md @@ -1,5 +1,11 @@ # Customizing the generated code +## Before You Customize + +Before customizing generated code, consider whether your change should be made in TypeSpec (`client.tsp`) instead. TypeSpec customizations allow you to apply changes to multiple languages at once, are more discoverable for other languages, and live right near the spec bringing us more to a single source of truth. See the [TypeSpec Client Customizations Reference](https://github.com/Azure/azure-sdk-tools/blob/main/eng/common/knowledge/customizing-client-tsp.md) for available decorators like `@@clientName`, `@@access`, etc. + +Use C# code customizations (partial classes) when TypeSpec cannot express the behavior you need. + ## Make a model internal Define a class with the same namespace and name as generated model and use the desired accessibility. diff --git a/packages/http-client-csharp/docs/decorators.md b/packages/http-client-csharp/docs/decorators.md new file mode 100644 index 00000000000..46589b06c79 --- /dev/null +++ b/packages/http-client-csharp/docs/decorators.md @@ -0,0 +1,42 @@ +--- +title: "Decorators" +description: "Decorators exported by @typespec/http-client-csharp" +toc_min_heading_level: 2 +toc_max_heading_level: 3 +--- + +## TypeSpec.HttpClient.CSharp + +### `@dynamicModel` {#@TypeSpec.HttpClient.CSharp.dynamicModel} + +Marks a model or namespace as dynamic, indicating it should generate dynamic model code. +Can be applied to Model or Namespace types. + +```typespec +@TypeSpec.HttpClient.CSharp.dynamicModel +``` + +#### Target + +`Model | Namespace` + +#### Parameters + +None + +#### Examples + +```tsp +@dynamicModel +model Pet { + name: string; + kind: string; +} + +@dynamicModel +namespace PetStore { + model Dog extends Pet { + breed: string; + } +} +``` diff --git a/packages/http-client-csharp/docs/emitter.md b/packages/http-client-csharp/docs/emitter.md new file mode 100644 index 00000000000..f20d6edee33 --- /dev/null +++ b/packages/http-client-csharp/docs/emitter.md @@ -0,0 +1,127 @@ +--- +title: "Emitter usage" +--- + +## Emitter usage + +1. Via the command line + +```bash +tsp compile . --emit=@typespec/http-client-csharp +``` + +2. Via the config + +```yaml +emit: + - "@typespec/http-client-csharp" +``` + +The config can be extended with options as follows: + +```yaml +emit: + - "@typespec/http-client-csharp" +options: + "@typespec/http-client-csharp": + option: value +``` + +## Emitter options + +### `emitter-output-dir` + +**Type:** `absolutePath` + +Defines the emitter output directory. Defaults to `{output-dir}/@typespec/http-client-csharp` +See [Configuring output directory for more info](https://typespec.io/docs/handbook/configuration/configuration/#configuring-output-directory) + +### `api-version` + +**Type:** `string` + +For TypeSpec files using the [`@versioned`](https://typespec.io/docs/libraries/versioning/reference/decorators/#@TypeSpec.Versioning.versioned) decorator, set this option to the version that should be used to generate against. + +### `generate-protocol-methods` + +**Type:** `boolean` + +Set to `false` to skip generation of protocol methods. The default value is `true`. + +### `generate-convenience-methods` + +**Type:** `boolean` + +Set to `false` to skip generation of convenience methods. The default value is `true`. + +### `unreferenced-types-handling` + +**Type:** `"removeOrInternalize" | "internalize" | "keepAll"` + +Defines the strategy on how to handle unreferenced types. The default value is `removeOrInternalize`. + +### `new-project` + +**Type:** `boolean` + +Set to `true` to overwrite the csproj if it already exists. The default value is `false`. + +### `save-inputs` + +**Type:** `boolean` + +Set to `true` to save the `tspCodeModel.json` and `Configuration.json` files that are emitted and used as inputs to the generator. The default value is `false`. + +### `package-name` + +**Type:** `string` + +Define the package name. If not specified, the first namespace defined in the TypeSpec is used as the package name. + +### `debug` + +**Type:** `boolean` + +Set to `true` to automatically attempt to attach to a debugger when executing the C# generator. The default value is `false`. + +### `logLevel` + +**Type:** `"info" | "debug" | "verbose"` + +Set the log level for which to collect traces. The default value is `info`. + +### `disable-xml-docs` + +**Type:** `boolean` + +Set to `true` to disable XML documentation generation. The default value is `false`. + +### `generator-name` + +**Type:** `string` + +The name of the generator. By default this is set to `ScmCodeModelGenerator`. Generator authors can set this to the name of a generator that inherits from `ScmCodeModelGenerator`. + +### `emitter-extension-path` + +**Type:** `string` + +Allows emitter authors to specify the path to a custom emitter package, allowing you to extend the emitter behavior. This should be set to `import.meta.url` if you are using a custom emitter. + +### `plugins` + +**Type:** `array` + +Paths to generator plugin assemblies (DLLs) or directories containing plugin assemblies. Each plugin must contain a class that extends GeneratorPlugin. + +### `license` + +**Type:** `object` + +License information for the generated client code. + +### `sdk-context-options` + +**Type:** `object` + +The SDK context options that implement the `CreateSdkContextOptions` interface from the [`@azure-tools/typespec-client-generator-core`](https://www.npmjs.com/package/@azure-tools/typespec-client-generator-core) package to be used by the CSharp emitter. diff --git a/packages/http-client-csharp/docs/index.mdx b/packages/http-client-csharp/docs/index.mdx new file mode 100644 index 00000000000..ca373e97796 --- /dev/null +++ b/packages/http-client-csharp/docs/index.mdx @@ -0,0 +1,41 @@ +--- +title: Overview +sidebar_position: 0 +toc_min_heading_level: 2 +toc_max_heading_level: 3 +--- + +import { Tabs, TabItem } from "@astrojs/starlight/components"; + +TypeSpec library for emitting Http Client libraries for C#. + +## Install + + + + +```bash +npm install @typespec/http-client-csharp +``` + + + + +```bash +npm install --save-peer @typespec/http-client-csharp +``` + + + + +## Emitter usage + +[See documentation](./emitter.md) + +## TypeSpec.HttpClient + +## TypeSpec.HttpClient.CSharp + +### Decorators + +- [`@dynamicModel`](./decorators.md#@TypeSpec.HttpClient.CSharp.dynamicModel) diff --git a/packages/http-client-csharp/emitter/src/emitter.ts b/packages/http-client-csharp/emitter/src/emitter.ts index 8bd34db8889..a41e196e09f 100644 --- a/packages/http-client-csharp/emitter/src/emitter.ts +++ b/packages/http-client-csharp/emitter/src/emitter.ts @@ -3,6 +3,8 @@ import { createSdkContext, SdkContext } from "@azure-tools/typespec-client-generator-core"; import { + createDiagnosticCollector, + Diagnostic, EmitContext, getDirectoryPath, joinPaths, @@ -11,7 +13,7 @@ import { resolvePath, } from "@typespec/compiler"; import fs, { statSync } from "fs"; -import { dirname } from "path"; +import { dirname, resolve } from "path"; import { fileURLToPath } from "url"; import { writeCodeModel, writeConfiguration } from "./code-model-writer.js"; import { @@ -20,11 +22,13 @@ import { tspOutputFileName, } from "./constants.js"; import { createModel } from "./lib/client-model-builder.js"; +import { createDiagnostic } from "./lib/lib.js"; import { LoggerLevel } from "./lib/logger-level.js"; import { Logger } from "./lib/logger.js"; import { execAsync, execCSharpGenerator } from "./lib/utils.js"; import { CSharpEmitterOptions, resolveOptions } from "./options.js"; import { createCSharpEmitterContext, CSharpEmitterContext } from "./sdk-context.js"; +import { CodeModel } from "./type/code-model.js"; import { Configuration } from "./type/configuration.js"; /** @@ -48,15 +52,43 @@ function findProjectRoot(path: string): string | undefined { } /** - * The entry point for the emitter. This function is called by the typespec compiler. + * Creates a code model by executing the full emission logic. + * This function can be called by downstream emitters to generate a code model and collect diagnostics. + * + * @example + * ```typescript + * import { emitCodeModel } from "@typespec/http-client-csharp"; + * + * export async function $onEmit(context: EmitContext) { + * const updateCodeModel = (model: CodeModel, context: CSharpEmitterContext) => { + * // Customize the code model here + * return model; + * }; + * const [, diagnostics] = await emitCodeModel(context, updateCodeModel); + * // Process diagnostics as needed + * context.program.reportDiagnostics(diagnostics); + * } + * ``` + * * @param context - The emit context + * @param updateCodeModel - Optional callback to modify the code model before emission + * @returns A tuple containing void and any diagnostics that were generated during the emission * @beta */ -export async function $onEmit(context: EmitContext) { +export async function emitCodeModel( + context: EmitContext, + updateCodeModel?: (model: CodeModel, context: CSharpEmitterContext) => CodeModel, +): Promise<[void, readonly Diagnostic[]]> { + const diagnostics = createDiagnosticCollector(); const program: Program = context.program; const options = resolveOptions(context); const outputFolder = context.emitterOutputDir; + // Resolve plugin paths to absolute if specified + if (options["plugins"]) { + options["plugins"] = options["plugins"].map((p) => resolve(outputFolder, p)); + } + /* set the log level. */ const logger = new Logger(program, options.logLevel ?? LoggerLevel.INFO); @@ -70,12 +102,16 @@ export async function $onEmit(context: EmitContext) { ), logger, ); - program.reportDiagnostics(sdkContext.diagnostics); + for (const diag of sdkContext.diagnostics) { + diagnostics.add(diag); + } - let root = createModel(sdkContext); + const root = diagnostics.pipe(createModel(sdkContext)); if (root) { - root = options["update-code-model"](root, sdkContext); + // Apply optional code model update callback + const updatedRoot = updateCodeModel ? updateCodeModel(root, sdkContext) : root; + const generatedFolder = resolvePath(outputFolder, "src", "Generated"); if (!fs.existsSync(generatedFolder)) { @@ -83,9 +119,9 @@ export async function $onEmit(context: EmitContext) { } // emit tspCodeModel.json - await writeCodeModel(sdkContext, root, outputFolder); + await writeCodeModel(sdkContext, updatedRoot, outputFolder); - const namespace = root.name; + const namespace = updatedRoot.name; const configurations: Configuration = createConfiguration(options, namespace, sdkContext); //emit configuration.json @@ -113,18 +149,38 @@ export async function $onEmit(context: EmitContext) { debug: options.debug ?? false, }); if (result.exitCode !== 0) { - const isValid = await _validateDotNetSdk(sdkContext, _minSupportedDotNetSdkVersion); + const isValid = diagnostics.pipe( + await _validateDotNetSdk(sdkContext, _minSupportedDotNetSdkVersion), + ); // if the dotnet sdk is valid, the error is not dependency issue, log it as normal if (isValid) { - throw new Error( - `Failed to generate the library. Exit code: ${result.exitCode}.\nStackTrace: \n${result.stderr}`, + diagnostics.add( + createDiagnostic({ + code: "general-error", + format: { + message: `Failed to generate the library. Exit code: ${result.exitCode}.\n${result.stderr}`, + }, + target: NoTarget, + }), ); } } } catch (error: any) { - const isValid = await _validateDotNetSdk(sdkContext, _minSupportedDotNetSdkVersion); + const isValid = diagnostics.pipe( + await _validateDotNetSdk(sdkContext, _minSupportedDotNetSdkVersion), + ); // if the dotnet sdk is valid, the error is not dependency issue, log it as normal - if (isValid) throw new Error(error); + if (isValid) { + diagnostics.add( + createDiagnostic({ + code: "general-error", + format: { + message: `Failed to generate the library. Error: ${error.message ?? error}`, + }, + target: NoTarget, + }), + ); + } } if (!options["save-inputs"]) { // delete @@ -133,6 +189,18 @@ export async function $onEmit(context: EmitContext) { } } } + + return diagnostics.wrap(undefined); +} + +/** + * The entry point for the emitter. This function is called by the typespec compiler. + * @param context - The emit context + * @beta + */ +export async function $onEmit(context: EmitContext) { + const [, diagnostics] = await emitCodeModel(context); + context.program.reportDiagnostics(diagnostics); } export function createConfiguration( @@ -142,7 +210,6 @@ export function createConfiguration( ): Configuration { const skipKeys = [ "new-project", - "update-code-model", "sdk-context-options", "save-inputs", "generator-name", @@ -172,29 +239,34 @@ export function createConfiguration( * Report diagnostic if dotnet sdk is not installed or its version does not meet prerequisite * @param sdkContext - The SDK context * @param minVersionRequisite - The minimum required major version - * @param logger - The logger + * @returns A tuple containing whether the SDK is valid and any diagnostics * @internal */ export async function _validateDotNetSdk( sdkContext: CSharpEmitterContext, minMajorVersion: number, -): Promise { +): Promise<[boolean, readonly Diagnostic[]]> { + const diagnostics = createDiagnosticCollector(); try { const result = await execAsync("dotnet", ["--version"], { stdio: "pipe" }); - return validateDotNetSdkVersionCore(sdkContext, result.stdout, minMajorVersion); + return diagnostics.wrap( + diagnostics.pipe(validateDotNetSdkVersionCore(sdkContext, result.stdout, minMajorVersion)), + ); } catch (error: any) { if (error && "code" in error && error["code"] === "ENOENT") { - sdkContext.logger.reportDiagnostic({ - code: "invalid-dotnet-sdk-dependency", - messageId: "missing", - format: { - dotnetMajorVersion: `${minMajorVersion}`, - downloadUrl: "https://dotnet.microsoft.com/", - }, - target: NoTarget, - }); + diagnostics.add( + createDiagnostic({ + code: "invalid-dotnet-sdk-dependency", + messageId: "missing", + format: { + dotnetMajorVersion: `${minMajorVersion}`, + downloadUrl: "https://dotnet.microsoft.com/", + }, + target: NoTarget, + }), + ); } - return false; + return diagnostics.wrap(false); } } @@ -202,32 +274,41 @@ function validateDotNetSdkVersionCore( sdkContext: CSharpEmitterContext, version: string, minMajorVersion: number, -): boolean { +): [boolean, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); if (version) { const dotIndex = version.indexOf("."); const firstPart = dotIndex === -1 ? version : version.substring(0, dotIndex); const major = Number(firstPart); if (isNaN(major)) { - return false; + return diagnostics.wrap(false); } if (major < minMajorVersion) { - sdkContext.logger.reportDiagnostic({ - code: "invalid-dotnet-sdk-dependency", - messageId: "invalidVersion", - format: { - installedVersion: version, - dotnetMajorVersion: `${minMajorVersion}`, - downloadUrl: "https://dotnet.microsoft.com/", - }, - target: NoTarget, - }); - return false; + diagnostics.add( + createDiagnostic({ + code: "invalid-dotnet-sdk-dependency", + messageId: "invalidVersion", + format: { + installedVersion: version, + dotnetMajorVersion: `${minMajorVersion}`, + downloadUrl: "https://dotnet.microsoft.com/", + }, + target: NoTarget, + }), + ); + return diagnostics.wrap(false); } - return true; + return diagnostics.wrap(true); } else { - sdkContext.logger.error("Cannot get the installed .NET SDK version."); - return false; + diagnostics.add( + createDiagnostic({ + code: "general-error", + format: { message: "Cannot get the installed .NET SDK version." }, + target: NoTarget, + }), + ); + return diagnostics.wrap(false); } } diff --git a/packages/http-client-csharp/emitter/src/index.ts b/packages/http-client-csharp/emitter/src/index.ts index 5a0b24094c7..fb26b5a8b09 100644 --- a/packages/http-client-csharp/emitter/src/index.ts +++ b/packages/http-client-csharp/emitter/src/index.ts @@ -3,7 +3,7 @@ export { writeCodeModel } from "./code-model-writer.js"; export { configurationFileName, tspOutputFileName } from "./constants.js"; -export { $onEmit } from "./emitter.js"; +export { $onEmit, emitCodeModel } from "./emitter.js"; // we export `createModel` only for autorest.csharp because it uses the emitter to generate the code model file but not calling the dll here // we could remove this export when in the future we deprecate autorest.csharp export { createModel } from "./lib/client-model-builder.js"; diff --git a/packages/http-client-csharp/emitter/src/lib/client-converter.ts b/packages/http-client-csharp/emitter/src/lib/client-converter.ts index 0099b5331ae..52586f2ddf0 100644 --- a/packages/http-client-csharp/emitter/src/lib/client-converter.ts +++ b/packages/http-client-csharp/emitter/src/lib/client-converter.ts @@ -9,7 +9,7 @@ import { SdkHttpOperation, SdkMethodParameter, } from "@azure-tools/typespec-client-generator-core"; -import { NoTarget } from "@typespec/compiler"; +import { createDiagnosticCollector, Diagnostic, NoTarget } from "@typespec/compiler"; import { CSharpEmitterContext } from "../sdk-context.js"; import { InputParameterScope } from "../type/input-parameter-scope.js"; import { @@ -18,9 +18,11 @@ import { InputParameter, InputType, } from "../type/input-type.js"; +import { createDiagnostic } from "./lib.js"; import { fromMethodParameter, fromSdkServiceMethod, + getMethodParameterSegments, getParameterDefaultValue, } from "./operation-converter.js"; import { fromSdkType } from "./type-converter.js"; @@ -32,24 +34,26 @@ export function fromSdkClients( sdkContext: CSharpEmitterContext, clients: SdkClientType[], rootApiVersions: string[], -): InputClient[] { +): [InputClient[], readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); const inputClients: InputClient[] = []; for (const client of clients) { - const inputClient = fromSdkClient(sdkContext, client, rootApiVersions); + const inputClient = diagnostics.pipe(fromSdkClient(sdkContext, client, rootApiVersions)); inputClients.push(inputClient); } - return inputClients; + return diagnostics.wrap(inputClients); } function fromSdkClient( sdkContext: CSharpEmitterContext, client: SdkClientType, rootApiVersions: string[], -): InputClient { +): [InputClient, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); let inputClient: InputClient | undefined = sdkContext.__typeCache.clients.get(client); if (inputClient) { - return inputClient; + return diagnostics.wrap(inputClient); } const endpointParameter = client.clientInitialization.parameters.find( (p) => p.kind === "endpoint", @@ -57,10 +61,12 @@ function fromSdkClient( const uri = getMethodUri(endpointParameter); // Convert all clientInitialization parameters - const clientParameters = fromSdkClientInitializationParameters( - sdkContext, - client.clientInitialization.parameters, - client.namespace, + const clientParameters = diagnostics.pipe( + fromSdkClientInitializationParameters( + sdkContext, + client.clientInitialization.parameters, + client.namespace, + ), ); const isMultiService = isMultiServiceClient(client); @@ -76,7 +82,11 @@ function fromSdkClient( doc: client.doc, summary: client.summary, methods: client.methods - .map((m) => fromSdkServiceMethod(sdkContext, m, uri, rootApiVersions, client.namespace)) + .map((m) => + diagnostics.pipe( + fromSdkServiceMethod(sdkContext, m, uri, rootApiVersions, client.namespace), + ), + ) .filter((m) => m !== undefined), parameters: clientParameters, initializedBy: client.clientInitialization.initializedBy, @@ -92,62 +102,73 @@ function fromSdkClient( // fill parent if (client.parent) { - inputClient.parent = fromSdkClient(sdkContext, client.parent, rootApiVersions); + inputClient.parent = diagnostics.pipe( + fromSdkClient(sdkContext, client.parent, rootApiVersions), + ); } // fill children if (client.children) { inputClient.children = client.children.map((c) => - fromSdkClient(sdkContext, c, rootApiVersions), + diagnostics.pipe(fromSdkClient(sdkContext, c, rootApiVersions)), ); } - return inputClient; + return diagnostics.wrap(inputClient); function fromSdkClientInitializationParameters( sdkContext: CSharpEmitterContext, parameters: (SdkEndpointParameter | SdkCredentialParameter | SdkMethodParameter)[], namespace: string, - ): InputParameter[] { + ): [InputParameter[], readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); const inputParameters: InputParameter[] = []; for (const param of parameters) { if (param.kind === "endpoint") { // Convert endpoint parameters - const endpointParams = fromSdkEndpointParameter(param); + const endpointParams = diagnostics.pipe(fromSdkEndpointParameter(param)); inputParameters.push(...endpointParams); } else if (param.kind === "method") { // Convert method parameters - const methodParam = fromMethodParameter(sdkContext, param, namespace); + const methodParam = diagnostics.pipe(fromMethodParameter(sdkContext, param, namespace)); inputParameters.push(methodParam); } // Note: credential parameters are handled separately in service-authentication.ts // and are not included in the client parameters list } - return inputParameters; + return diagnostics.wrap(inputParameters); } - function fromSdkEndpointParameter(p: SdkEndpointParameter): InputEndpointParameter[] { + function fromSdkEndpointParameter( + p: SdkEndpointParameter, + ): [InputEndpointParameter[], readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); if (p.type.kind === "union") { - return fromSdkEndpointType(p.type.variantTypes[0]); + return diagnostics.wrap(diagnostics.pipe(fromSdkEndpointType(p.type.variantTypes[0]))); } else { - return fromSdkEndpointType(p.type); + return diagnostics.wrap(diagnostics.pipe(fromSdkEndpointType(p.type))); } } - function fromSdkEndpointType(type: SdkEndpointType): InputEndpointParameter[] { + function fromSdkEndpointType( + type: SdkEndpointType, + ): [InputEndpointParameter[], readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); // TODO: support free-style endpoint url with multiple parameters const endpointExpr = type.serverUrl .replace("https://", "") .replace("http://", "") .split("/")[0]; if (!/^\{\w+\}$/.test(endpointExpr)) { - sdkContext.logger.reportDiagnostic({ - code: "unsupported-endpoint-url", - format: { endpoint: type.serverUrl }, - target: NoTarget, - }); - return []; + diagnostics.add( + createDiagnostic({ + code: "unsupported-endpoint-url", + format: { endpoint: type.serverUrl }, + target: NoTarget, + }), + ); + return diagnostics.wrap([]); } const endpointVariableName = endpointExpr.substring(1, endpointExpr.length - 1); @@ -161,7 +182,7 @@ function fromSdkClient( crossLanguageDefinitionId: parameter.type.kind === "string" ? "TypeSpec.string" : "TypeSpec.url", } - : fromSdkType(sdkContext, parameter.type); // TODO: consolidate with converter.fromSdkEndpointType + : diagnostics.pipe(fromSdkType(sdkContext, parameter.type)); // TODO: consolidate with converter.fromSdkEndpointType parameters.push({ kind: "endpoint", name: parameter.name, @@ -173,18 +194,19 @@ function fromSdkClient( optional: parameter.optional, scope: InputParameterScope.Client, isEndpoint: isEndpoint, - defaultValue: getParameterDefaultValue( - sdkContext, - parameter.clientDefaultValue, - parameterType, + defaultValue: diagnostics.pipe( + getParameterDefaultValue(sdkContext, parameter.clientDefaultValue, parameterType), ), serverUrlTemplate: type.serverUrl, skipUrlEncoding: false, readOnly: isReadOnly(parameter), crossLanguageDefinitionId: parameter.crossLanguageDefinitionId, + methodParameterSegments: diagnostics.pipe( + getMethodParameterSegments(sdkContext, parameter), + ), }); } - return parameters; + return diagnostics.wrap(parameters); } } diff --git a/packages/http-client-csharp/emitter/src/lib/client-model-builder.ts b/packages/http-client-csharp/emitter/src/lib/client-model-builder.ts index 94f1bfd767d..f0fc8413bff 100644 --- a/packages/http-client-csharp/emitter/src/lib/client-model-builder.ts +++ b/packages/http-client-csharp/emitter/src/lib/client-model-builder.ts @@ -5,8 +5,8 @@ import { SdkClientType, SdkEnumType, SdkHttpOperation, - UsageFlags, } from "@azure-tools/typespec-client-generator-core"; +import { createDiagnosticCollector, Diagnostic } from "@typespec/compiler"; import { CSharpEmitterContext } from "../sdk-context.js"; import { CodeModel } from "../type/code-model.js"; import { InputEnumType, InputLiteralType, InputModelType } from "../type/input-type.js"; @@ -14,25 +14,33 @@ import { fromSdkClients } from "./client-converter.js"; import { fromSdkNamespaces } from "./namespace-converter.js"; import { processServiceAuthentication } from "./service-authentication.js"; import { fromSdkType } from "./type-converter.js"; -import { - containsMultiServiceClient, - firstLetterToUpperCase, - getClientNamespaceString, -} from "./utils.js"; +import { firstLetterToUpperCase, getClientNamespaceString } from "./utils.js"; /** * Creates the code model from the SDK context. + * This function follows TypeSpec best practices by returning diagnostics alongside the result. + * + * @example + * ```typescript + * import { createModel } from "@typespec/http-client-csharp"; + * + * const sdkContext = createCSharpEmitterContext(context, logger); + * const [codeModel, diagnostics] = createModel(sdkContext); + * // Process the code model and handle diagnostics + * ``` + * * @param sdkContext - The SDK context - * @returns The code model + * @returns A tuple containing the code model and any diagnostics that were generated * @beta */ -export function createModel(sdkContext: CSharpEmitterContext): CodeModel { +export function createModel(sdkContext: CSharpEmitterContext): [CodeModel, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); const sdkPackage = sdkContext.sdkPackage; // TO-DO: Consider exposing the namespace hierarchy in the code model https://github.com/microsoft/typespec/issues/8332 - fromSdkNamespaces(sdkContext, sdkPackage.namespaces); + diagnostics.pipe(fromSdkNamespaces(sdkContext, sdkPackage.namespaces)); // TO-DO: Consider using the TCGC model + enum cache once https://github.com/Azure/typespec-azure/issues/3180 is resolved - navigateModels(sdkContext); + diagnostics.pipe(navigateModels(sdkContext)); const types = Array.from(sdkContext.__typeCache.types.values()); const [models, enums] = [ @@ -42,7 +50,7 @@ export function createModel(sdkContext: CSharpEmitterContext): CodeModel { const rootClients = sdkPackage.clients; const rootApiVersions = parseApiVersions(sdkPackage.enums, rootClients); - const inputClients = fromSdkClients(sdkContext, rootClients, rootApiVersions); + const inputClients = diagnostics.pipe(fromSdkClients(sdkContext, rootClients, rootApiVersions)); // TODO -- TCGC now does not have constants field in its sdkPackage, they might add it in the future. const constants = Array.from(sdkContext.__typeCache.constants.values()); @@ -57,10 +65,10 @@ export function createModel(sdkContext: CSharpEmitterContext): CodeModel { constants: constants, models: models, clients: inputClients, - auth: processServiceAuthentication(sdkContext, sdkPackage), + auth: diagnostics.pipe(processServiceAuthentication(sdkContext, sdkPackage)), }; - return clientModel; + return diagnostics.wrap(clientModel); } /** @@ -75,15 +83,7 @@ function parseApiVersions( enums: SdkEnumType[], rootClients: SdkClientType[], ): string[] { - if (containsMultiServiceClient(rootClients)) { - return rootClients[0]?.apiVersions ?? []; - } - - const apiVersionEnum = enums.find((e) => (e.usage & UsageFlags.ApiVersionEnum) !== 0); - if (apiVersionEnum) { - return apiVersionEnum.values.map((v) => v.value as string); - } - + // Always use client.apiVersions as the source of truth. return rootClients[0]?.apiVersions ?? []; } @@ -152,11 +152,13 @@ function fixNamingConflicts(models: InputModelType[], constants: InputLiteralTyp } } -function navigateModels(sdkContext: CSharpEmitterContext) { +function navigateModels(sdkContext: CSharpEmitterContext): [void, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); for (const m of sdkContext.sdkPackage.models) { - fromSdkType(sdkContext, m); + diagnostics.pipe(fromSdkType(sdkContext, m)); } for (const e of sdkContext.sdkPackage.enums) { - fromSdkType(sdkContext, e); + diagnostics.pipe(fromSdkType(sdkContext, e)); } + return diagnostics.wrap(undefined as void); } diff --git a/packages/http-client-csharp/emitter/src/lib/example-converter.ts b/packages/http-client-csharp/emitter/src/lib/example-converter.ts index 74b20a8c479..ce23c24eb70 100644 --- a/packages/http-client-csharp/emitter/src/lib/example-converter.ts +++ b/packages/http-client-csharp/emitter/src/lib/example-converter.ts @@ -16,6 +16,7 @@ import { SdkUnionExampleValue, SdkUnknownExampleValue, } from "@azure-tools/typespec-client-generator-core"; +import { createDiagnosticCollector, Diagnostic } from "@typespec/compiler"; import { CSharpEmitterContext } from "../sdk-context.js"; import { InputArrayExampleValue, @@ -47,8 +48,13 @@ import { fromSdkType } from "./type-converter.js"; export function fromSdkHttpExamples( sdkContext: CSharpEmitterContext, examples: SdkHttpOperationExample[], -): InputHttpOperationExample[] { - return examples.map((example) => fromSdkHttpExample(example)); +): [InputHttpOperationExample[], readonly Diagnostic[]] { + // Create a diagnostics collector for internal use + // Any errors in examples won't prevent the code model from being generated + const diagnostics = createDiagnosticCollector(); + + const result = examples.map((example) => fromSdkHttpExample(example)); + return diagnostics.wrap(result); function fromSdkHttpExample(example: SdkHttpOperationExample): InputHttpOperationExample { return { @@ -76,7 +82,7 @@ export function fromSdkHttpExamples( responseValue: SdkHttpResponseExampleValue, ): OperationResponseExample { return { - response: fromSdkHttpOperationResponse(sdkContext, responseValue.response), + response: diagnostics.pipe(fromSdkHttpOperationResponse(sdkContext, responseValue.response)), statusCode: responseValue.statusCode, bodyValue: responseValue.bodyValue ? fromSdkExample(responseValue.bodyValue) : undefined, }; @@ -108,7 +114,7 @@ export function fromSdkHttpExamples( function fromSdkStringExample(example: SdkStringExampleValue): InputStringExampleValue { return { kind: "string", - type: fromSdkType(sdkContext, example.type), + type: diagnostics.pipe(fromSdkType(sdkContext, example.type)), value: example.value, }; } @@ -116,7 +122,7 @@ export function fromSdkHttpExamples( function fromSdkNumberExample(example: SdkNumberExampleValue): InputNumberExampleValue { return { kind: "number", - type: fromSdkType(sdkContext, example.type), + type: diagnostics.pipe(fromSdkType(sdkContext, example.type)), value: example.value, }; } @@ -124,7 +130,7 @@ export function fromSdkHttpExamples( function fromSdkBooleanExample(example: SdkBooleanExampleValue): InputBooleanExampleValue { return { kind: example.kind, - type: fromSdkType(sdkContext, example.type) as InputPrimitiveType, + type: diagnostics.pipe(fromSdkType(sdkContext, example.type)) as InputPrimitiveType, value: example.value, }; } @@ -132,7 +138,7 @@ export function fromSdkHttpExamples( function fromSdkUnionExample(example: SdkUnionExampleValue): InputUnionExampleValue { return { kind: example.kind, - type: fromSdkType(sdkContext, example.type) as InputUnionType, + type: diagnostics.pipe(fromSdkType(sdkContext, example.type)) as InputUnionType, value: example.value, }; } @@ -140,7 +146,7 @@ export function fromSdkHttpExamples( function fromSdkArrayExample(example: SdkArrayExampleValue): InputArrayExampleValue { return { kind: example.kind, - type: fromSdkType(sdkContext, example.type) as InputArrayType, + type: diagnostics.pipe(fromSdkType(sdkContext, example.type)) as InputArrayType, value: example.value.map((v) => fromSdkExample(v)), }; } @@ -150,7 +156,7 @@ export function fromSdkHttpExamples( ): InputDictionaryExampleValue { return { kind: example.kind, - type: fromSdkType(sdkContext, example.type) as InputDictionaryType, + type: diagnostics.pipe(fromSdkType(sdkContext, example.type)) as InputDictionaryType, value: fromExampleRecord(example.value), }; } @@ -158,7 +164,7 @@ export function fromSdkHttpExamples( function fromSdkModelExample(example: SdkModelExampleValue): InputModelExampleValue { return { kind: example.kind, - type: fromSdkType(sdkContext, example.type) as InputModelType, + type: diagnostics.pipe(fromSdkType(sdkContext, example.type)) as InputModelType, value: fromExampleRecord(example.value), additionalPropertiesValue: example.additionalPropertiesValue ? fromExampleRecord(example.additionalPropertiesValue) @@ -169,7 +175,7 @@ export function fromSdkHttpExamples( function fromSdkAnyExample(example: SdkUnknownExampleValue): InputUnknownExampleValue { return { kind: example.kind, - type: fromSdkType(sdkContext, example.type) as InputPrimitiveType, + type: diagnostics.pipe(fromSdkType(sdkContext, example.type)) as InputPrimitiveType, value: example.value, }; } @@ -177,7 +183,7 @@ export function fromSdkHttpExamples( function fromSdkNullExample(example: SdkNullExampleValue): InputNullExampleValue { return { kind: example.kind, - type: fromSdkType(sdkContext, example.type) as InputNullableType, + type: diagnostics.pipe(fromSdkType(sdkContext, example.type)) as InputNullableType, value: example.value, }; } diff --git a/packages/http-client-csharp/emitter/src/lib/logger.ts b/packages/http-client-csharp/emitter/src/lib/logger.ts index 8b087a400f3..8b1682f0c27 100644 --- a/packages/http-client-csharp/emitter/src/lib/logger.ts +++ b/packages/http-client-csharp/emitter/src/lib/logger.ts @@ -1,12 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -import { DiagnosticReport, NoTarget, Program, Tracer } from "@typespec/compiler"; -import { - DiagnosticMessagesMap, - getTracer, - reportDiagnostic as libReportDiagnostic, -} from "./lib.js"; +import { Program, Tracer } from "@typespec/compiler"; +import { getTracer } from "./lib.js"; import { LoggerLevel } from "./logger-level.js"; /** @@ -16,12 +12,10 @@ import { LoggerLevel } from "./logger-level.js"; export class Logger { private tracer: Tracer; private level: LoggerLevel; - private program: Program; public constructor(program: Program, level: LoggerLevel) { this.tracer = getTracer(program); this.level = level; - this.program = program; } trace(level: LoggerLevel, message: string): void { @@ -60,25 +54,7 @@ export class Logger { } } - reportDiagnostic( - diag: DiagnosticReport, - ): void { - libReportDiagnostic(this.program, diag); - } - warn(message: string): void { - this.reportDiagnostic({ - code: "general-warning", - format: { message: message }, - target: NoTarget, - }); - } - - error(message: string): void { - this.reportDiagnostic({ - code: "general-error", - format: { message: message }, - target: NoTarget, - }); + this.tracer.trace("warning", message); } } diff --git a/packages/http-client-csharp/emitter/src/lib/namespace-converter.ts b/packages/http-client-csharp/emitter/src/lib/namespace-converter.ts index ef3f8f38195..cfc2eb761a0 100644 --- a/packages/http-client-csharp/emitter/src/lib/namespace-converter.ts +++ b/packages/http-client-csharp/emitter/src/lib/namespace-converter.ts @@ -1,18 +1,20 @@ import { SdkHttpOperation, SdkNamespace } from "@azure-tools/typespec-client-generator-core"; +import { createDiagnosticCollector, Diagnostic } from "@typespec/compiler"; import { CSharpEmitterContext } from "../sdk-context.js"; import { InputNamespace } from "../type/input-type.js"; export function fromSdkNamespaces( sdkContext: CSharpEmitterContext, namespaces: SdkNamespace[], -): InputNamespace[] { +): [InputNamespace[], readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); const inputNamespaces: InputNamespace[] = []; for (const namespace of namespaces) { const inputNamespace = fromSdkNamespace(sdkContext, namespace); inputNamespaces.push(inputNamespace); } - return inputNamespaces; + return diagnostics.wrap(inputNamespaces); } function fromSdkNamespace( diff --git a/packages/http-client-csharp/emitter/src/lib/operation-converter.ts b/packages/http-client-csharp/emitter/src/lib/operation-converter.ts index bada9905120..decc442eb79 100644 --- a/packages/http-client-csharp/emitter/src/lib/operation-converter.ts +++ b/packages/http-client-csharp/emitter/src/lib/operation-converter.ts @@ -3,7 +3,9 @@ import { getClientNamespace, + getClientOptions, getHttpOperationParameter, + getParamAlias, isHttpMetadata, SdkBodyParameter, SdkBuiltInKinds, @@ -26,7 +28,13 @@ import { shouldGenerateConvenient, shouldGenerateProtocol, } from "@azure-tools/typespec-client-generator-core"; -import { getDeprecated, isErrorModel, NoTarget } from "@typespec/compiler"; +import { + createDiagnosticCollector, + Diagnostic, + getDeprecated, + isErrorModel, + NoTarget, +} from "@typespec/compiler"; import { HttpStatusCodeRange } from "@typespec/http"; import { getResourceOperation } from "@typespec/rest"; import { CSharpEmitterContext } from "../sdk-context.js"; @@ -63,6 +71,7 @@ import { parseHttpRequestMethod } from "../type/request-method.js"; import { ResponseLocation } from "../type/response-location.js"; import { getExternalDocs, getOperationId } from "./decorators.js"; import { fromSdkHttpExamples } from "./example-converter.js"; +import { createDiagnostic } from "./lib.js"; import { fromSdkType } from "./type-converter.js"; import { getClientNamespaceString, isReadOnly } from "./utils.js"; @@ -72,75 +81,83 @@ export function fromSdkServiceMethod( uri: string, rootApiVersions: string[], namespace: string, -): InputServiceMethod | undefined { +): [InputServiceMethod | undefined, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + let method = sdkContext.__typeCache.methods.get(sdkMethod); if (method) { - return method; + return diagnostics.wrap(method); } const methodKind = sdkMethod.kind; switch (methodKind) { case "basic": - method = createServiceMethod( - sdkContext, - sdkMethod, - uri, - rootApiVersions, - namespace, + method = diagnostics.pipe( + createServiceMethod( + sdkContext, + sdkMethod, + uri, + rootApiVersions, + namespace, + ), ); break; case "paging": - const pagingServiceMethod = createServiceMethod( - sdkContext, - sdkMethod, - uri, - rootApiVersions, - namespace, + const pagingServiceMethod = diagnostics.pipe( + createServiceMethod( + sdkContext, + sdkMethod, + uri, + rootApiVersions, + namespace, + ), ); - pagingServiceMethod.pagingMetadata = loadPagingServiceMetadata( - sdkContext, - sdkMethod, - rootApiVersions, - uri, - namespace, + pagingServiceMethod.pagingMetadata = diagnostics.pipe( + loadPagingServiceMetadata(sdkContext, sdkMethod, rootApiVersions, uri, namespace), ); method = pagingServiceMethod; break; case "lro": - const lroServiceMethod = createServiceMethod( - sdkContext, - sdkMethod, - uri, - rootApiVersions, - namespace, + const lroServiceMethod = diagnostics.pipe( + createServiceMethod( + sdkContext, + sdkMethod, + uri, + rootApiVersions, + namespace, + ), + ); + lroServiceMethod.lroMetadata = diagnostics.pipe( + loadLongRunningMetadata(sdkContext, sdkMethod), ); - lroServiceMethod.lroMetadata = loadLongRunningMetadata(sdkContext, sdkMethod); method = lroServiceMethod; break; case "lropaging": - const lroPagingMethod = createServiceMethod( - sdkContext, - sdkMethod, - uri, - rootApiVersions, - namespace, + const lroPagingMethod = diagnostics.pipe( + createServiceMethod( + sdkContext, + sdkMethod, + uri, + rootApiVersions, + namespace, + ), ); - lroPagingMethod.lroMetadata = loadLongRunningMetadata(sdkContext, sdkMethod); - lroPagingMethod.pagingMetadata = loadPagingServiceMetadata( - sdkContext, - sdkMethod, - rootApiVersions, - uri, - namespace, + lroPagingMethod.lroMetadata = diagnostics.pipe( + loadLongRunningMetadata(sdkContext, sdkMethod), + ); + lroPagingMethod.pagingMetadata = diagnostics.pipe( + loadPagingServiceMetadata(sdkContext, sdkMethod, rootApiVersions, uri, namespace), ); method = lroPagingMethod; break; default: - sdkContext.logger.reportDiagnostic({ - code: "unsupported-service-method", - format: { methodKind: methodKind }, - target: NoTarget, - }); + diagnostics.add( + createDiagnostic({ + code: "unsupported-service-method", + format: { methodKind: methodKind }, + target: NoTarget, + }), + ); method = undefined; break; } @@ -149,7 +166,7 @@ export function fromSdkServiceMethod( sdkContext.__typeCache.updateSdkMethodReferences(sdkMethod, method); } - return method; + return diagnostics.wrap(method); } export function fromSdkServiceMethodOperation( @@ -157,21 +174,25 @@ export function fromSdkServiceMethodOperation( method: SdkServiceMethod, uri: string, rootApiVersions: string[], -): InputOperation { +): [InputOperation, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + let operation = sdkContext.__typeCache.operations.get(method.operation); if (operation) { - return operation; + return diagnostics.wrap(operation); } let generateConvenience = shouldGenerateConvenient(sdkContext, method.operation.__raw.operation); if (method.operation.verb === "patch" && generateConvenience) { - sdkContext.logger.reportDiagnostic({ - code: "unsupported-patch-convenience-method", - format: { - methodCrossLanguageDefinitionId: method.crossLanguageDefinitionId, - }, - target: method.__raw ?? NoTarget, - }); + diagnostics.add( + createDiagnostic({ + code: "unsupported-patch-convenience-method", + format: { + methodCrossLanguageDefinitionId: method.crossLanguageDefinitionId, + }, + target: method.__raw ?? NoTarget, + }), + ); generateConvenience = false; } @@ -185,8 +206,12 @@ export function fromSdkServiceMethodOperation( summary: method.summary, doc: method.doc, accessibility: method.access, - parameters: fromSdkOperationParameters(sdkContext, method.operation, rootApiVersions), - responses: fromSdkHttpOperationResponses(sdkContext, method.operation.responses), + parameters: diagnostics.pipe( + fromSdkOperationParameters(sdkContext, method.operation, rootApiVersions), + ), + responses: diagnostics.pipe( + fromSdkHttpOperationResponses(sdkContext, method.operation.responses), + ), httpMethod: parseHttpRequestMethod(method.operation.verb), uri: uri, path: method.operation.path, @@ -198,7 +223,7 @@ export function fromSdkServiceMethodOperation( crossLanguageDefinitionId: method.crossLanguageDefinitionId, decorators: method.decorators, examples: method.operation.examples - ? fromSdkHttpExamples(sdkContext, method.operation.examples) + ? diagnostics.pipe(fromSdkHttpExamples(sdkContext, method.operation.examples)) : undefined, namespace: method.__raw?.namespace ? getClientNamespace(sdkContext, method.__raw.namespace) @@ -207,31 +232,33 @@ export function fromSdkServiceMethodOperation( sdkContext.__typeCache.updateSdkOperationReferences(method.operation, operation); - return operation; + return diagnostics.wrap(operation); } export function getParameterDefaultValue( sdkContext: CSharpEmitterContext, clientDefaultValue: any, parameterType: InputType, -): InputConstant | undefined { +): [InputConstant | undefined, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + if ( clientDefaultValue === undefined || // a constant parameter should overwrite client default value parameterType.kind === "constant" ) { - return undefined; + return diagnostics.wrap(undefined); } - const kind = getValueType(sdkContext, clientDefaultValue); - return { + const kind = diagnostics.pipe(getValueType(sdkContext, clientDefaultValue)); + return diagnostics.wrap({ type: { kind: kind, name: kind, crossLanguageDefinitionId: `TypeSpec.${kind}`, }, value: clientDefaultValue, - }; + }); } function createServiceMethod( @@ -240,44 +267,57 @@ function createServiceMethod( uri: string, rootApiVersions: string[], namespace: string, -): T { - return { +): [T, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + + return diagnostics.wrap({ kind: method.kind, name: method.name, accessibility: method.access, apiVersions: method.apiVersions, doc: method.doc, summary: method.summary, - operation: fromSdkServiceMethodOperation(sdkContext, method, uri, rootApiVersions), - parameters: fromSdkServiceMethodParameters(sdkContext, method, rootApiVersions, namespace), - response: fromSdkServiceMethodResponse(sdkContext, method.response), + operation: diagnostics.pipe( + fromSdkServiceMethodOperation(sdkContext, method, uri, rootApiVersions), + ), + parameters: diagnostics.pipe( + fromSdkServiceMethodParameters(sdkContext, method, rootApiVersions, namespace), + ), + response: diagnostics.pipe(fromSdkServiceMethodResponse(sdkContext, method.response)), exception: method.exception - ? fromSdkServiceMethodResponse(sdkContext, method.exception) + ? diagnostics.pipe(fromSdkServiceMethodResponse(sdkContext, method.exception)) : undefined, isOverride: method.isOverride, generateConvenient: method.generateConvenient, generateProtocol: method.generateProtocol, crossLanguageDefinitionId: method.crossLanguageDefinitionId, - } as T; + } as T); } -function getValueType(sdkContext: CSharpEmitterContext, value: any): SdkBuiltInKinds { +function getValueType( + sdkContext: CSharpEmitterContext, + value: any, +): [SdkBuiltInKinds, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + switch (typeof value) { case "string": - return "string"; + return diagnostics.wrap("string"); case "number": - return "int32"; + return diagnostics.wrap("int32"); case "boolean": - return "boolean"; + return diagnostics.wrap("boolean"); case "bigint": - return "int64"; + return diagnostics.wrap("int64"); default: - sdkContext.logger.reportDiagnostic({ - code: "unsupported-default-value-type", - format: { valueType: typeof value }, - target: NoTarget, - }); - return "unknown"; + diagnostics.add( + createDiagnostic({ + code: "unsupported-default-value-type", + format: { valueType: typeof value }, + target: NoTarget, + }), + ); + return diagnostics.wrap("unknown"); } } @@ -286,11 +326,12 @@ function fromSdkServiceMethodParameters( method: SdkServiceMethod, rootApiVersions: string[], namespace: string, -): InputMethodParameter[] { +): [InputMethodParameter[], readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); const parameters: InputMethodParameter[] = []; for (const p of method.parameters) { - const methodInputParameter = fromMethodParameter(sdkContext, p, namespace); + const methodInputParameter = diagnostics.pipe(fromMethodParameter(sdkContext, p, namespace)); const operationHttpParameter = getHttpOperationParameter(method, p); if (!operationHttpParameter) { @@ -304,11 +345,12 @@ function fromSdkServiceMethodParameters( methodInputParameter, operationHttpParameter, rootApiVersions, + diagnostics, ); parameters.push(methodInputParameter); } - return parameters; + return diagnostics.wrap(parameters); } function updateMethodParameter( @@ -316,7 +358,14 @@ function updateMethodParameter( methodParameter: InputMethodParameter, operationHttpParameter: SdkHttpParameter | SdkModelPropertyType, rootApiVersions: string[], + diagnostics: ReturnType, ): void { + // for content type parameter + if (isContentType(operationHttpParameter)) { + methodParameter.type = diagnostics.pipe( + fromSdkType(sdkContext, operationHttpParameter.type, operationHttpParameter), + ); + } methodParameter.serializedName = getNameInRequest(operationHttpParameter); methodParameter.location = getParameterLocation(operationHttpParameter); methodParameter.scope = getParameterScope( @@ -327,10 +376,8 @@ function updateMethodParameter( if (methodParameter.location === RequestLocation.Body) { // Convert constants to enums if (methodParameter.type.kind === "constant") { - methodParameter.type = fromSdkType( - sdkContext, - operationHttpParameter.type, - operationHttpParameter, + methodParameter.type = diagnostics.pipe( + fromSdkType(sdkContext, operationHttpParameter.type, operationHttpParameter), ); } } @@ -339,75 +386,87 @@ function updateMethodParameter( function fromSdkServiceMethodResponse( sdkContext: CSharpEmitterContext, methodResponse: SdkMethodResponse, -): InputServiceMethodResponse { - return { - type: getResponseType(sdkContext, methodResponse.type), +): [InputServiceMethodResponse, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + + return diagnostics.wrap({ + type: diagnostics.pipe(getResponseType(sdkContext, methodResponse.type)), resultSegments: methodResponse.resultSegments?.map((segment) => getResponseSegmentName(segment), ), - }; + }); } function fromSdkOperationParameters( sdkContext: CSharpEmitterContext, operation: SdkHttpOperation, rootApiVersions: string[], -): InputHttpParameter[] { +): [InputHttpParameter[], readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); const parameters: InputHttpParameter[] = []; + for (const p of operation.parameters) { if (p.kind === "cookie") { - sdkContext.logger.reportDiagnostic({ - code: "unsupported-cookie-parameter", - format: { parameterName: p.name, path: operation.path }, - target: NoTarget, - }); - return parameters; + diagnostics.add( + createDiagnostic({ + code: "unsupported-cookie-parameter", + format: { parameterName: p.name, path: operation.path }, + target: NoTarget, + }), + ); + return diagnostics.wrap(parameters); } - const param = fromParameter(sdkContext, p, rootApiVersions); + const param = diagnostics.pipe(fromParameter(sdkContext, p, rootApiVersions)); if (param) { parameters.push(param); } } if (operation.bodyParam) { - const bodyParam = fromParameter(sdkContext, operation.bodyParam, rootApiVersions); + const bodyParam = diagnostics.pipe( + fromParameter(sdkContext, operation.bodyParam, rootApiVersions), + ); if (bodyParam) { parameters.push(bodyParam); } } - return parameters; + return diagnostics.wrap(parameters); } export function fromParameter( sdkContext: CSharpEmitterContext, p: SdkHttpParameter | SdkModelPropertyType, rootApiVersions: string[], -): InputHttpParameter | undefined { +): [InputHttpParameter | undefined, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + let parameter = sdkContext.__typeCache.operationParameters.get(p); if (parameter) { - return parameter; + return diagnostics.wrap(parameter); } const parameterKind = p.kind; switch (parameterKind) { case "query": - parameter = fromQueryParameter(sdkContext, p, rootApiVersions); + parameter = diagnostics.pipe(fromQueryParameter(sdkContext, p, rootApiVersions)); break; case "path": - parameter = fromPathParameter(sdkContext, p, rootApiVersions); + parameter = diagnostics.pipe(fromPathParameter(sdkContext, p, rootApiVersions)); break; case "header": - parameter = fromHeaderParameter(sdkContext, p, rootApiVersions); + parameter = diagnostics.pipe(fromHeaderParameter(sdkContext, p, rootApiVersions)); break; case "body": - parameter = fromBodyParameter(sdkContext, p, rootApiVersions); + parameter = diagnostics.pipe(fromBodyParameter(sdkContext, p, rootApiVersions)); break; default: - sdkContext.logger.reportDiagnostic({ - code: "unsupported-parameter-kind", - format: { parameterKind }, - target: p.__raw ?? NoTarget, - }); + diagnostics.add( + createDiagnostic({ + code: "unsupported-parameter-kind", + format: { parameterKind }, + target: p.__raw ?? NoTarget, + }), + ); parameter = undefined; break; } @@ -415,15 +474,16 @@ export function fromParameter( if (parameter) { sdkContext.__typeCache.operationParameters.set(p, parameter); } - return parameter; + return diagnostics.wrap(parameter); } function fromQueryParameter( sdkContext: CSharpEmitterContext, p: SdkQueryParameter, rootApiVersions: string[], -): InputQueryParameter { - const parameterType = fromSdkType(sdkContext, p.type, p); +): [InputQueryParameter, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + const parameterType = diagnostics.pipe(fromSdkType(sdkContext, p.type, p)); const retVar: InputQueryParameter = { kind: "query", @@ -434,25 +494,29 @@ function fromQueryParameter( type: parameterType, isApiVersion: p.isApiVersionParam, explode: isExploded(p), - defaultValue: getParameterDefaultValue(sdkContext, p.clientDefaultValue, parameterType), + defaultValue: diagnostics.pipe( + getParameterDefaultValue(sdkContext, p.clientDefaultValue, parameterType), + ), arraySerializationDelimiter: getArraySerializationDelimiter(p), optional: p.optional, scope: getParameterScope(p, parameterType, rootApiVersions.length > 0), decorators: p.decorators, crossLanguageDefinitionId: p.crossLanguageDefinitionId, readOnly: isReadOnly(p), + methodParameterSegments: diagnostics.pipe(getMethodParameterSegments(sdkContext, p)), }; sdkContext.__typeCache.updateSdkOperationParameterReferences(p, retVar); - return retVar; + return diagnostics.wrap(retVar); } function fromPathParameter( sdkContext: CSharpEmitterContext, p: SdkPathParameter, rootApiVersions: string[], -): InputPathParameter { - const parameterType = fromSdkType(sdkContext, p.type, p); +): [InputPathParameter, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + const parameterType = diagnostics.pipe(fromSdkType(sdkContext, p.type, p)); const retVar: InputPathParameter = { kind: "path", @@ -466,24 +530,28 @@ function fromPathParameter( style: p.style, allowReserved: p.allowReserved, skipUrlEncoding: p.allowReserved, - defaultValue: getParameterDefaultValue(sdkContext, p.clientDefaultValue, parameterType), + defaultValue: diagnostics.pipe( + getParameterDefaultValue(sdkContext, p.clientDefaultValue, parameterType), + ), optional: p.optional, scope: getParameterScope(p, parameterType, rootApiVersions.length > 0), decorators: p.decorators, readOnly: isReadOnly(p), crossLanguageDefinitionId: p.crossLanguageDefinitionId, + methodParameterSegments: diagnostics.pipe(getMethodParameterSegments(sdkContext, p)), }; sdkContext.__typeCache.updateSdkOperationParameterReferences(p, retVar); - return retVar; + return diagnostics.wrap(retVar); } function fromHeaderParameter( sdkContext: CSharpEmitterContext, p: SdkHeaderParameter, rootApiVersions: string[], -): InputHeaderParameter { - const parameterType = fromSdkType(sdkContext, p.type, p); +): [InputHeaderParameter, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + const parameterType = diagnostics.pipe(fromSdkType(sdkContext, p.type, p)); const retVar: InputHeaderParameter = { kind: "header", @@ -495,25 +563,30 @@ function fromHeaderParameter( isApiVersion: p.isApiVersionParam, collectionFormat: p.collectionFormat, arraySerializationDelimiter: getArraySerializationDelimiter(p), - defaultValue: getParameterDefaultValue(sdkContext, p.clientDefaultValue, parameterType), + defaultValue: diagnostics.pipe( + getParameterDefaultValue(sdkContext, p.clientDefaultValue, parameterType), + ), optional: p.optional, isContentType: isContentType(p), scope: getParameterScope(p, parameterType, rootApiVersions.length > 0), readOnly: isReadOnly(p), decorators: p.decorators, crossLanguageDefinitionId: p.crossLanguageDefinitionId, + methodParameterSegments: diagnostics.pipe(getMethodParameterSegments(sdkContext, p)), + collectionHeaderPrefix: diagnostics.pipe(getCollectionHeaderPrefix(sdkContext, p)), }; sdkContext.__typeCache.updateSdkOperationParameterReferences(p, retVar); - return retVar; + return diagnostics.wrap(retVar); } function fromBodyParameter( sdkContext: CSharpEmitterContext, p: SdkBodyParameter, rootApiVersions: string[], -): InputBodyParameter { - const parameterType = fromSdkType(sdkContext, p.type, p); +): [InputBodyParameter, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + const parameterType = diagnostics.pipe(fromSdkType(sdkContext, p.type, p)); const retVar: InputBodyParameter = { kind: "body", @@ -530,23 +603,28 @@ function fromBodyParameter( decorators: p.decorators, readOnly: isReadOnly(p), crossLanguageDefinitionId: p.crossLanguageDefinitionId, + methodParameterSegments: diagnostics.pipe(getMethodParameterSegments(sdkContext, p)), }; sdkContext.__typeCache.updateSdkOperationParameterReferences(p, retVar); - return retVar; + return diagnostics.wrap(retVar); } export function fromMethodParameter( sdkContext: CSharpEmitterContext, p: SdkMethodParameter, namespace: string, -): InputMethodParameter { +): [InputMethodParameter, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + let retVar = sdkContext.__typeCache.methodParmeters.get(p); if (retVar) { - return retVar as InputMethodParameter; + return diagnostics.wrap(retVar as InputMethodParameter); } - const parameterType = fromSdkType(sdkContext, p.type, p, namespace); + const parameterType = diagnostics.pipe(fromSdkType(sdkContext, p.type, p, namespace)); + + const paramAlias = p.__raw ? getParamAlias(sdkContext, p.__raw) : undefined; retVar = { kind: "method", @@ -557,24 +635,29 @@ export function fromMethodParameter( type: parameterType, location: RequestLocation.None, isApiVersion: p.isApiVersionParam, - defaultValue: getParameterDefaultValue(sdkContext, p.clientDefaultValue, parameterType), + defaultValue: diagnostics.pipe( + getParameterDefaultValue(sdkContext, p.clientDefaultValue, parameterType), + ), optional: p.optional, scope: InputParameterScope.Method, crossLanguageDefinitionId: p.crossLanguageDefinitionId, readOnly: isReadOnly(p), access: p.access, decorators: p.decorators, + paramAlias, }; sdkContext.__typeCache.updateSdkMethodParameterReferences(p, retVar); - return retVar; + return diagnostics.wrap(retVar); } function loadLongRunningMetadata( sdkContext: CSharpEmitterContext, method: SdkLroServiceMethod | SdkLroPagingServiceMethod, -): InputLongRunningServiceMetadata { - return { +): [InputLongRunningServiceMetadata, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + + return diagnostics.wrap({ finalStateVia: convertLroFinalStateVia(method.lroMetadata.finalStateVia), finalResponse: { // in swagger, we allow delete to return some meaningful body content @@ -582,60 +665,70 @@ function loadLongRunningMetadata( statusCodes: method.operation.verb === "delete" ? [204] : [200], bodyType: method.lroMetadata.finalResponse?.envelopeResult !== undefined - ? fromSdkType(sdkContext, method.lroMetadata.finalResponse.envelopeResult) + ? diagnostics.pipe( + fromSdkType(sdkContext, method.lroMetadata.finalResponse.envelopeResult), + ) : undefined, } as OperationResponse, resultPath: method.lroMetadata.finalResultPath, - }; + }); } function fromSdkHttpOperationResponses( sdkContext: CSharpEmitterContext, operationResponses: SdkHttpResponse[], -): OperationResponse[] { +): [OperationResponse[], readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); const responses: OperationResponse[] = []; + for (const r of operationResponses) { - responses.push(fromSdkHttpOperationResponse(sdkContext, r)); + responses.push(diagnostics.pipe(fromSdkHttpOperationResponse(sdkContext, r))); } - return responses; + return diagnostics.wrap(responses); } export function fromSdkHttpOperationResponse( sdkContext: CSharpEmitterContext, sdkResponse: SdkHttpResponse, -): OperationResponse { +): [OperationResponse, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + let retVar = sdkContext.__typeCache.responses.get(sdkResponse); if (retVar) { - return retVar; + return diagnostics.wrap(retVar); } const range = sdkResponse.statusCodes; retVar = { statusCodes: toStatusCodesArray(range), - bodyType: getResponseType(sdkContext, sdkResponse.type), - headers: fromSdkServiceResponseHeaders(sdkContext, sdkResponse.headers), + bodyType: diagnostics.pipe(getResponseType(sdkContext, sdkResponse.type)), + headers: diagnostics.pipe(fromSdkServiceResponseHeaders(sdkContext, sdkResponse.headers)), isErrorResponse: sdkResponse.type !== undefined && isErrorModel(sdkContext.program, sdkResponse.type.__raw!), contentTypes: sdkResponse.contentTypes, }; sdkContext.__typeCache.updateSdkResponseReferences(sdkResponse, retVar); - return retVar; + return diagnostics.wrap(retVar); } function fromSdkServiceResponseHeaders( sdkContext: CSharpEmitterContext, headers: SdkServiceResponseHeader[], -): HttpResponseHeader[] { - return headers.map( - (h) => - ({ - name: h.__raw!.name, - nameInResponse: h.serializedName, - summary: h.summary, - doc: h.doc, - type: fromSdkType(sdkContext, h.type), - }) as HttpResponseHeader, +): [HttpResponseHeader[], readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + + return diagnostics.wrap( + headers.map( + (h) => + ({ + name: h.__raw!.name, + nameInResponse: h.serializedName, + summary: h.summary, + doc: h.doc, + type: diagnostics.pipe(fromSdkType(sdkContext, h.type)), + }) as HttpResponseHeader, + ), ); } @@ -688,27 +781,29 @@ function loadPagingServiceMetadata( rootApiVersions: string[], uri: string, namespace: string, -): InputPagingServiceMetadata { +): [InputPagingServiceMetadata, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + let nextLink: InputNextLink | undefined; if (method.pagingMetadata.nextLinkSegments) { nextLink = { responseSegments: method.pagingMetadata.nextLinkSegments.map((segment) => getResponseSegmentName(segment), ), - responseLocation: getResponseLocation( - context, - method, - method.pagingMetadata.nextLinkSegments[0], + responseLocation: diagnostics.pipe( + getResponseLocation(context, method, method.pagingMetadata.nextLinkSegments[0]), ), }; if (method.pagingMetadata.nextLinkOperation) { - nextLink.operation = fromSdkServiceMethod( - context, - method.pagingMetadata.nextLinkOperation, - uri, - rootApiVersions, - namespace, + nextLink.operation = diagnostics.pipe( + fromSdkServiceMethod( + context, + method.pagingMetadata.nextLinkOperation, + uri, + rootApiVersions, + namespace, + ), ); } @@ -724,7 +819,9 @@ function loadPagingServiceMetadata( ] as SdkModelPropertyType; const operationParameter = getHttpOperationParameter(method, lastParameterSegment); if (operationParameter) { - const parameter = fromParameter(context, operationParameter, rootApiVersions); + const parameter = diagnostics.pipe( + fromParameter(context, operationParameter, rootApiVersions), + ); if (parameter) { nextLinkReInjectedParameters.push(parameter); } @@ -745,10 +842,12 @@ function loadPagingServiceMetadata( const lastParameterSegment = method.pagingMetadata.continuationTokenParameterSegments[ method.pagingMetadata.continuationTokenParameterSegments.length - 1 ] as SdkModelPropertyType; - const continuationTokenParameter = fromParameter( - context, - getHttpOperationParameter(method, lastParameterSegment)!, - rootApiVersions, + const continuationTokenParameter = diagnostics.pipe( + fromParameter( + context, + getHttpOperationParameter(method, lastParameterSegment)!, + rootApiVersions, + ), ); if (continuationTokenParameter) { continuationToken = { @@ -756,10 +855,12 @@ function loadPagingServiceMetadata( responseSegments: method.pagingMetadata.continuationTokenResponseSegments!.map((segment) => getResponseSegmentName(segment), ), - responseLocation: getResponseLocation( - context, - method, - method.pagingMetadata.continuationTokenResponseSegments?.[0], + responseLocation: diagnostics.pipe( + getResponseLocation( + context, + method, + method.pagingMetadata.continuationTokenResponseSegments?.[0], + ), ), }; } @@ -772,12 +873,12 @@ function loadPagingServiceMetadata( ); } - return { + return diagnostics.wrap({ itemPropertySegments: method.response.resultSegments!.map((s) => getResponseSegmentName(s)), nextLink: nextLink, continuationToken: continuationToken, pageSizeParameterSegments: pageSizeParameterSegments, - }; + }); } function getResponseSegmentName(segment: SdkServiceResponseHeader | SdkModelPropertyType): string { @@ -796,23 +897,27 @@ function getResponseLocation( context: CSharpEmitterContext, method: SdkPagingServiceMethod | SdkLroPagingServiceMethod, p: SdkServiceResponseHeader | SdkModelPropertyType, -): ResponseLocation { +): [ResponseLocation, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + if (p.kind === "responseheader") { - return ResponseLocation.Header; + return diagnostics.wrap(ResponseLocation.Header); } if (isHttpMetadata(context, p)) { - context.logger.reportDiagnostic({ - code: "unsupported-continuation-location", - format: { - crossLanguageDefinitionId: method.crossLanguageDefinitionId, - }, - target: NoTarget, - }); - return ResponseLocation.None; + diagnostics.add( + createDiagnostic({ + code: "unsupported-continuation-location", + format: { + crossLanguageDefinitionId: method.crossLanguageDefinitionId, + }, + target: NoTarget, + }), + ); + return diagnostics.wrap(ResponseLocation.None); } - return ResponseLocation.Body; + return diagnostics.wrap(ResponseLocation.Body); } // TODO: https://github.com/Azure/typespec-azure/issues/1441 @@ -920,12 +1025,46 @@ function getArraySerializationDelimiter( return format ? collectionFormatToDelimMap[format] : undefined; } +export function getMethodParameterSegments( + sdkContext: CSharpEmitterContext, + p: SdkHttpParameter | SdkModelPropertyType, +): [InputMethodParameter[] | undefined, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + // methodParameterSegments is a 2D array where each segment array represents a path to a method parameter + // For spread body cases, there could be multiple paths, but we simplify by taking the first element + // We need the complete segment path (e.g., ['Params', 'foo'] for accessing params.foo) + const methodParameterSegments = (p as any).methodParameterSegments; + if (!methodParameterSegments || methodParameterSegments.length === 0) { + return diagnostics.wrap(undefined); + } + + // Take the first segment path (simplification - no spector scenario for multiple paths yet) + const firstSegmentPath = methodParameterSegments[0]; + if (!firstSegmentPath || firstSegmentPath.length === 0) { + return diagnostics.wrap(undefined); + } + + const namespace = getClientNamespaceString(sdkContext) ?? ""; + const methodParams: InputMethodParameter[] = []; + + // Convert each element in the segment path to an InputMethodParameter + // This preserves the full path information (e.g., ['Params', 'foo']) + for (const segment of firstSegmentPath) { + const methodParam = segment as SdkMethodParameter; + methodParams.push(diagnostics.pipe(fromMethodParameter(sdkContext, methodParam, namespace))); + } + + return diagnostics.wrap(methodParams.length > 0 ? methodParams : undefined); +} + function getResponseType( sdkContext: CSharpEmitterContext, type: SdkType | undefined, -): InputType | undefined { +): [InputType | undefined, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + if (!type) { - return undefined; + return diagnostics.wrap(undefined); } // handle anonymous union enum response types by defaulting to the enum value type in the case of @@ -935,3 +1074,32 @@ function getResponseType( return fromSdkType(sdkContext, type); } + +function getCollectionHeaderPrefix( + sdkContext: CSharpEmitterContext, + p: SdkHeaderParameter, +): [string | undefined, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + const value = getClientOptions(p, "collectionHeaderPrefix"); + if (value === undefined) { + return diagnostics.wrap(undefined); + } + // Only apply to dictionary types (unwrap nullable) + const rawType = p.type.kind === "nullable" ? p.type.type : p.type; + if (rawType.kind !== "dict") { + return diagnostics.wrap(undefined); + } + if (typeof value !== "string") { + diagnostics.add( + createDiagnostic({ + code: "general-warning", + format: { + message: `The 'collectionHeaderPrefix' client option must be a string value, but got '${typeof value}'. The option will be ignored.`, + }, + target: p.__raw ?? NoTarget, + }), + ); + return diagnostics.wrap(undefined); + } + return diagnostics.wrap(value); +} diff --git a/packages/http-client-csharp/emitter/src/lib/service-authentication.ts b/packages/http-client-csharp/emitter/src/lib/service-authentication.ts index 728cd30c5f2..52b1b44de5a 100644 --- a/packages/http-client-csharp/emitter/src/lib/service-authentication.ts +++ b/packages/http-client-csharp/emitter/src/lib/service-authentication.ts @@ -7,16 +7,18 @@ import { SdkHttpOperation, SdkPackage, } from "@azure-tools/typespec-client-generator-core"; -import { NoTarget } from "@typespec/compiler"; +import { createDiagnosticCollector, Diagnostic, NoTarget } from "@typespec/compiler"; import { Oauth2Auth, OAuth2Flow } from "@typespec/http"; import { CSharpEmitterContext } from "../sdk-context.js"; import { InputAuth } from "../type/input-auth.js"; import { InputOAuth2Flow } from "../type/input-oauth2-auth.js"; +import { createDiagnostic } from "./lib.js"; export function processServiceAuthentication( sdkContext: CSharpEmitterContext, sdkPackage: SdkPackage, -): InputAuth | undefined { +): [InputAuth | undefined, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); let authClientParameter: SdkCredentialParameter | undefined = undefined; for (const client of sdkPackage.clients) { for (const parameter of client.clientInitialization.parameters) { @@ -28,29 +30,31 @@ export function processServiceAuthentication( } if (!authClientParameter) { - return undefined; + return diagnostics.wrap(undefined); } const inputAuth: InputAuth = {}; if (authClientParameter.type.kind === "credential") { - const auth = processAuthType(sdkContext, authClientParameter.type); + const auth = diagnostics.pipe(processAuthType(sdkContext, authClientParameter.type)); if (!auth && authClientParameter.type.scheme.type !== "noAuth") { - sdkContext.logger.reportDiagnostic({ - code: "unsupported-auth", - messageId: "onlyUnsupportedAuthProvided", - target: authClientParameter.type.__raw ?? NoTarget, - }); + diagnostics.add( + createDiagnostic({ + code: "unsupported-auth", + messageId: "onlyUnsupportedAuthProvided", + target: authClientParameter.type.__raw ?? NoTarget, + }), + ); - return inputAuth; + return diagnostics.wrap(inputAuth); } - return auth; + return diagnostics.wrap(auth); } let containsNoAuth = false; for (const authType of authClientParameter.type.variantTypes) { containsNoAuth = containsNoAuth || authType.scheme.type === "noAuth"; - const auth = processAuthType(sdkContext, authType); + const auth = diagnostics.pipe(processAuthType(sdkContext, authType)); if (auth?.apiKey) { inputAuth.apiKey = auth.apiKey; } @@ -60,75 +64,86 @@ export function processServiceAuthentication( } if (containsNoAuth && !inputAuth.apiKey && !inputAuth.oAuth2) { - return undefined; + return diagnostics.wrap(undefined); } if (!inputAuth?.apiKey && !inputAuth?.oAuth2) { - sdkContext.logger.reportDiagnostic({ - code: "unsupported-auth", - messageId: "onlyUnsupportedAuthProvided", - target: authClientParameter.type.__raw ?? NoTarget, - }); + diagnostics.add( + createDiagnostic({ + code: "unsupported-auth", + messageId: "onlyUnsupportedAuthProvided", + target: authClientParameter.type.__raw ?? NoTarget, + }), + ); } - return inputAuth; + return diagnostics.wrap(inputAuth); } function processAuthType( sdkContext: CSharpEmitterContext, credentialType: SdkCredentialType, -): InputAuth | undefined { +): [InputAuth | undefined, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); const scheme = credentialType.scheme; switch (scheme.type) { case "apiKey": if (scheme.in !== "header") { - sdkContext.logger.reportDiagnostic({ - code: "unsupported-auth", - format: { - message: `Only header is supported for ApiKey authentication. ${scheme.in} is not supported.`, - }, - target: credentialType.__raw ?? NoTarget, - }); - return undefined; + diagnostics.add( + createDiagnostic({ + code: "unsupported-auth", + format: { + message: `Only header is supported for ApiKey authentication. ${scheme.in} is not supported.`, + }, + target: credentialType.__raw ?? NoTarget, + }), + ); + return diagnostics.wrap(undefined); } - return { apiKey: { name: scheme.name, in: scheme.in } } as InputAuth; + return diagnostics.wrap({ apiKey: { name: scheme.name, in: scheme.in } } as InputAuth); case "oauth2": - return processOAuth2(scheme); + return diagnostics.wrap(processOAuth2(scheme)); case "http": { const schemeOrApiKeyPrefix = scheme.scheme; switch (schemeOrApiKeyPrefix) { case "Basic": - sdkContext.logger.reportDiagnostic({ - code: "unsupported-auth", - format: { message: `${schemeOrApiKeyPrefix} auth method is currently not supported.` }, - target: credentialType.__raw ?? NoTarget, - }); - return undefined; + diagnostics.add( + createDiagnostic({ + code: "unsupported-auth", + format: { + message: `${schemeOrApiKeyPrefix} auth method is currently not supported.`, + }, + target: credentialType.__raw ?? NoTarget, + }), + ); + return diagnostics.wrap(undefined); case "Bearer": - return { + return diagnostics.wrap({ apiKey: { name: "Authorization", in: "header", prefix: "Bearer", }, - }; + }); default: - return { + return diagnostics.wrap({ apiKey: { name: "Authorization", in: "header", prefix: schemeOrApiKeyPrefix, }, - }; + }); } } default: - sdkContext.logger.reportDiagnostic({ - code: "unsupported-auth", - format: { message: `un-supported authentication scheme ${scheme.type}` }, - target: credentialType.__raw ?? NoTarget, - }); - return undefined; + diagnostics.add( + createDiagnostic({ + code: "unsupported-auth", + format: { message: `un-supported authentication scheme ${scheme.type}` }, + target: credentialType.__raw ?? NoTarget, + }), + ); + return diagnostics.wrap(undefined); } } diff --git a/packages/http-client-csharp/emitter/src/lib/type-converter.ts b/packages/http-client-csharp/emitter/src/lib/type-converter.ts index f3a008ed668..ded35eb85e8 100644 --- a/packages/http-client-csharp/emitter/src/lib/type-converter.ts +++ b/packages/http-client-csharp/emitter/src/lib/type-converter.ts @@ -3,6 +3,8 @@ import { DecoratorInfo, + getAccessOverride, + isHttpMetadata, SdkArrayType, SdkBuiltInType, SdkConstantType, @@ -17,10 +19,8 @@ import { SdkType, SdkUnionType, UsageFlags, - getAccessOverride, - isHttpMetadata, } from "@azure-tools/typespec-client-generator-core"; -import { Model, NoTarget } from "@typespec/compiler"; +import { createDiagnosticCollector, Diagnostic, Model, NoTarget } from "@typespec/compiler"; import { CSharpEmitterContext } from "../sdk-context.js"; import { InputArrayType, @@ -39,6 +39,7 @@ import { InputType, InputUnionType, } from "../type/input-type.js"; +import { createDiagnostic } from "./lib.js"; import { isReadOnly } from "./utils.js"; // we have this complicated type here to let the caller of fromSdkType could infer the real return type of this function. @@ -75,36 +76,37 @@ export function fromSdkType( sdkType: T, sdkProperty?: SdkModelPropertyTypeBase, namespace?: string, -): InputReturnType { +): [InputReturnType, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); let retVar = sdkContext.__typeCache.types.get(sdkType); if (retVar) { - return retVar as any; + return diagnostics.wrap(retVar as any); } switch (sdkType.kind) { case "nullable": const nullableType: InputNullableType = { kind: "nullable", - type: fromSdkType(sdkContext, sdkType.type, sdkProperty, namespace), + type: diagnostics.pipe(fromSdkType(sdkContext, sdkType.type, sdkProperty, namespace)), namespace: sdkType.namespace, external: fromSdkExternalTypeInfo(sdkType), }; retVar = nullableType; break; case "model": - retVar = fromSdkModelType(sdkContext, sdkType); + retVar = diagnostics.pipe(fromSdkModelType(sdkContext, sdkType)); break; case "enum": - retVar = fromSdkEnumType(sdkContext, sdkType); + retVar = diagnostics.pipe(fromSdkEnumType(sdkContext, sdkType)); break; case "enumvalue": - retVar = fromSdkEnumValueType(sdkContext, sdkType); + retVar = diagnostics.pipe(fromSdkEnumValueType(sdkContext, sdkType)); break; case "dict": - retVar = fromSdkDictionaryType(sdkContext, sdkType); + retVar = diagnostics.pipe(fromSdkDictionaryType(sdkContext, sdkType)); break; case "array": - retVar = fromSdkArrayType(sdkContext, sdkType); + retVar = diagnostics.pipe(fromSdkArrayType(sdkContext, sdkType)); break; case "constant": // Don't transform optional Content-Type headers into enums - keep them as constants @@ -124,27 +126,29 @@ export function fromSdkType( sdkType.valueType.kind !== "boolean" ) { // turn the constant into an extensible enum - retVar = createEnumType(sdkContext, sdkType, namespace!); + retVar = diagnostics.pipe(createEnumType(sdkContext, sdkType, namespace!)); } else { - retVar = fromSdkConstantType(sdkContext, sdkType); + retVar = diagnostics.pipe(fromSdkConstantType(sdkContext, sdkType)); } break; case "union": - retVar = fromUnionType(sdkContext, sdkType); + retVar = diagnostics.pipe(fromUnionType(sdkContext, sdkType)); break; case "utcDateTime": case "offsetDateTime": - retVar = fromSdkDateTimeType(sdkContext, sdkType); + retVar = diagnostics.pipe(fromSdkDateTimeType(sdkContext, sdkType)); break; case "duration": - retVar = fromSdkDurationType(sdkContext, sdkType); + retVar = diagnostics.pipe(fromSdkDurationType(sdkContext, sdkType)); break; case "tuple": - sdkContext.logger.reportDiagnostic({ - code: "unsupported-sdk-type", - format: { sdkType: "tuple" }, - target: sdkType.__raw ?? NoTarget, - }); + diagnostics.add( + createDiagnostic({ + code: "unsupported-sdk-type", + format: { sdkType: "tuple" }, + target: sdkType.__raw ?? NoTarget, + }), + ); const tupleType: InputPrimitiveType = { kind: "unknown", name: "tuple", @@ -160,11 +164,13 @@ export function fromSdkType( retVar = fromSdkEndpointType(); break; case "credential": - sdkContext.logger.reportDiagnostic({ - code: "unsupported-sdk-type", - format: { sdkType: "credential" }, - target: sdkType.__raw ?? NoTarget, - }); + diagnostics.add( + createDiagnostic({ + code: "unsupported-sdk-type", + format: { sdkType: "credential" }, + target: sdkType.__raw ?? NoTarget, + }), + ); const credentialType: InputPrimitiveType = { kind: "unknown", name: "credential", @@ -175,19 +181,20 @@ export function fromSdkType( retVar = credentialType; break; default: - retVar = fromSdkBuiltInType(sdkContext, sdkType); + retVar = diagnostics.pipe(fromSdkBuiltInType(sdkContext, sdkType)); break; } sdkContext.__typeCache.updateSdkTypeReferences(sdkType, retVar); // we have to cast to any because TypeScript's type narrowing does not automatically infer the return type for conditional types - return retVar as any; + return diagnostics.wrap(retVar as any); } function fromSdkModelType( sdkContext: CSharpEmitterContext, modelType: SdkModelType, -): InputModelType { +): [InputModelType, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); // get all unique decorators for the model type from the namespace level and the model level let decorators: DecoratorInfo[] = modelType.decorators; const namespace = sdkContext.__typeCache.namespaces.get(modelType.namespace); @@ -213,12 +220,12 @@ function fromSdkModelType( sdkContext.__typeCache.updateSdkTypeReferences(modelType, inputModelType); inputModelType.additionalProperties = modelType.additionalProperties - ? fromSdkType(sdkContext, modelType.additionalProperties) + ? diagnostics.pipe(fromSdkType(sdkContext, modelType.additionalProperties)) : undefined; const properties: InputModelProperty[] = []; for (const property of modelType.properties) { - const ourProperty = fromSdkModelProperty(sdkContext, property, modelType); + const ourProperty = diagnostics.pipe(fromSdkModelProperty(sdkContext, property, modelType)); if (ourProperty) { properties.push(ourProperty); @@ -226,11 +233,11 @@ function fromSdkModelType( } inputModelType.discriminatorProperty = modelType.discriminatorProperty - ? fromSdkModelProperty(sdkContext, modelType.discriminatorProperty, modelType) + ? diagnostics.pipe(fromSdkModelProperty(sdkContext, modelType.discriminatorProperty, modelType)) : undefined; inputModelType.baseModel = modelType.baseModel - ? fromSdkType(sdkContext, modelType.baseModel) + ? diagnostics.pipe(fromSdkType(sdkContext, modelType.baseModel)) : undefined; inputModelType.properties = properties; @@ -239,25 +246,26 @@ function fromSdkModelType( const discriminatedSubtypes: Record = {}; for (const key in modelType.discriminatedSubtypes) { const subtype = modelType.discriminatedSubtypes[key]; - discriminatedSubtypes[key] = fromSdkType(sdkContext, subtype); + discriminatedSubtypes[key] = diagnostics.pipe(fromSdkType(sdkContext, subtype)); } inputModelType.discriminatedSubtypes = discriminatedSubtypes; } - return inputModelType; + return diagnostics.wrap(inputModelType); } function fromSdkModelProperty( sdkContext: CSharpEmitterContext, sdkProperty: SdkModelPropertyType, sdkModel: SdkModelType, -): InputModelProperty | undefined { +): [InputModelProperty | undefined, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); // TODO -- this returns undefined because some properties we do not support yet. let property = sdkContext.__typeCache.properties.get(sdkProperty) as | InputModelProperty | undefined; if (property) { - return property; + return diagnostics.wrap(property); } const serializedName = @@ -270,7 +278,9 @@ function fromSdkModelProperty( serializedName: serializedName, summary: sdkProperty.summary, doc: sdkProperty.doc, - type: fromSdkType(sdkContext, sdkProperty.type, sdkProperty, sdkModel.namespace), + type: diagnostics.pipe( + fromSdkType(sdkContext, sdkProperty.type, sdkProperty, sdkModel.namespace), + ), optional: sdkProperty.optional, readOnly: isReadOnly(sdkProperty), discriminator: sdkProperty.discriminator, @@ -287,18 +297,25 @@ function fromSdkModelProperty( sdkContext.__typeCache.updateSdkPropertyReferences(sdkProperty, property); } - return property; + return diagnostics.wrap(property); } -function fromSdkEnumType(sdkContext: CSharpEmitterContext, enumType: SdkEnumType): InputEnumType { - return createEnumType(sdkContext, enumType, enumType.namespace); +function fromSdkEnumType( + sdkContext: CSharpEmitterContext, + enumType: SdkEnumType, +): [InputEnumType, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + return diagnostics.wrap( + diagnostics.pipe(createEnumType(sdkContext, enumType, enumType.namespace)), + ); } function createEnumType( sdkContext: CSharpEmitterContext, sdkType: SdkConstantType | SdkEnumType, namespace: string, -): InputEnumType { +): [InputEnumType, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); const values: InputEnumValueType[] = []; const inputEnumType: InputEnumType = { @@ -307,8 +324,8 @@ function createEnumType( crossLanguageDefinitionId: sdkType.kind === "enum" ? sdkType.crossLanguageDefinitionId : "", valueType: sdkType.kind === "enum" - ? (fromSdkType(sdkContext, sdkType.valueType) as InputPrimitiveType) - : fromSdkBuiltInType(sdkContext, sdkType.valueType), + ? (diagnostics.pipe(fromSdkType(sdkContext, sdkType.valueType)) as InputPrimitiveType) + : diagnostics.pipe(fromSdkBuiltInType(sdkContext, sdkType.valueType)), values: values, // constantType.access, TODO - constant type now does not have access. TCGC will add it later access: @@ -329,112 +346,130 @@ function createEnumType( if (sdkType.kind === "enum") { for (const v of sdkType.values) { - values.push(createEnumValueType(sdkContext, v, inputEnumType)); + values.push(diagnostics.pipe(createEnumValueType(sdkContext, v, inputEnumType))); } } else { - values.push(createEnumValueType(sdkContext, sdkType, inputEnumType)); + values.push(diagnostics.pipe(createEnumValueType(sdkContext, sdkType, inputEnumType))); } - return inputEnumType; + return diagnostics.wrap(inputEnumType); } function fromSdkDateTimeType( sdkContext: CSharpEmitterContext, dateTimeType: SdkDateTimeType, -): InputDateTimeType { - return { +): [InputDateTimeType, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + return diagnostics.wrap({ kind: dateTimeType.kind, name: dateTimeType.name, encode: dateTimeType.encode, - wireType: fromSdkType(sdkContext, dateTimeType.wireType), + wireType: diagnostics.pipe(fromSdkType(sdkContext, dateTimeType.wireType)), crossLanguageDefinitionId: dateTimeType.crossLanguageDefinitionId, - baseType: dateTimeType.baseType ? fromSdkType(sdkContext, dateTimeType.baseType) : undefined, + baseType: dateTimeType.baseType + ? diagnostics.pipe(fromSdkType(sdkContext, dateTimeType.baseType)) + : undefined, decorators: dateTimeType.decorators, external: fromSdkExternalTypeInfo(dateTimeType), - }; + }); } function fromSdkDurationType( sdkContext: CSharpEmitterContext, durationType: SdkDurationType, -): InputDurationType { - return { +): [InputDurationType, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + return diagnostics.wrap({ kind: durationType.kind, name: durationType.name, encode: durationType.encode, - wireType: fromSdkType(sdkContext, durationType.wireType), + wireType: diagnostics.pipe(fromSdkType(sdkContext, durationType.wireType)), crossLanguageDefinitionId: durationType.crossLanguageDefinitionId, - baseType: durationType.baseType ? fromSdkType(sdkContext, durationType.baseType) : undefined, + baseType: durationType.baseType + ? diagnostics.pipe(fromSdkType(sdkContext, durationType.baseType)) + : undefined, decorators: durationType.decorators, external: fromSdkExternalTypeInfo(durationType), - }; + }); } function fromSdkBuiltInType( sdkContext: CSharpEmitterContext, builtInType: SdkBuiltInType, -): InputPrimitiveType { - return { +): [InputPrimitiveType, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + return diagnostics.wrap({ kind: builtInType.kind, name: builtInType.name, encode: builtInType.encode !== builtInType.kind ? builtInType.encode : undefined, crossLanguageDefinitionId: builtInType.crossLanguageDefinitionId, - baseType: builtInType.baseType ? fromSdkType(sdkContext, builtInType.baseType) : undefined, + baseType: builtInType.baseType + ? diagnostics.pipe(fromSdkType(sdkContext, builtInType.baseType)) + : undefined, decorators: builtInType.decorators, external: fromSdkExternalTypeInfo(builtInType), - }; + }); } -function fromUnionType(sdkContext: CSharpEmitterContext, union: SdkUnionType): InputUnionType { +function fromUnionType( + sdkContext: CSharpEmitterContext, + union: SdkUnionType, +): [InputUnionType, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); const variantTypes: InputType[] = []; for (const value of union.variantTypes) { - const variantType = fromSdkType(sdkContext, value); + const variantType = diagnostics.pipe(fromSdkType(sdkContext, value)); variantTypes.push(variantType); } - return { + return diagnostics.wrap({ kind: "union", name: union.name, variantTypes: variantTypes, namespace: union.namespace, decorators: union.decorators, external: fromSdkExternalTypeInfo(union), - }; + }); } function fromSdkConstantType( sdkContext: CSharpEmitterContext, constantType: SdkConstantType, -): InputLiteralType { +): [InputLiteralType, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); const literalType = { kind: constantType.kind, name: constantType.name, namespace: "", // constantType.namespace, TODO - constant type now does not have namespace. TCGC will add it later access: undefined, // constantType.access, TODO - constant type now does not have access. TCGC will add it later usage: UsageFlags.None, // constantType.usage, TODO - constant type now does not have usage. TCGC will add it later - valueType: fromSdkType(sdkContext, constantType.valueType), + valueType: diagnostics.pipe(fromSdkType(sdkContext, constantType.valueType)), value: constantType.value, decorators: constantType.decorators, }; sdkContext.__typeCache.updateConstantCache(constantType, literalType); - return literalType; + return diagnostics.wrap(literalType); } function fromSdkEnumValueType( sdkContext: CSharpEmitterContext, enumValueType: SdkEnumValueType, -): InputEnumValueType { - return createEnumValueType(sdkContext, enumValueType, enumValueType.enumType); +): [InputEnumValueType, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + return diagnostics.wrap( + diagnostics.pipe(createEnumValueType(sdkContext, enumValueType, enumValueType.enumType)), + ); } function createEnumValueType( sdkContext: CSharpEmitterContext, sdkType: SdkEnumValueType | SdkConstantType, enumType: InputEnumType, -): InputEnumValueType { - return { +): [InputEnumValueType, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + return diagnostics.wrap({ kind: "enumvalue", name: sdkType.kind === "constant" @@ -444,39 +479,43 @@ function createEnumValueType( : sdkType.name, value: typeof sdkType.value === "boolean" ? (sdkType.value ? 1 : 0) : sdkType.value, valueType: - sdkType.kind === "constant" ? sdkType.valueType : fromSdkType(sdkContext, sdkType.valueType), + sdkType.kind === "constant" + ? sdkType.valueType + : diagnostics.pipe(fromSdkType(sdkContext, sdkType.valueType)), enumType: enumType, summary: sdkType.summary, doc: sdkType.doc, decorators: sdkType.decorators, - }; + }); } function fromSdkDictionaryType( sdkContext: CSharpEmitterContext, dictionaryType: SdkDictionaryType, -): InputDictionaryType { - return { +): [InputDictionaryType, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + return diagnostics.wrap({ kind: "dict", - keyType: fromSdkType(sdkContext, dictionaryType.keyType), - valueType: fromSdkType(sdkContext, dictionaryType.valueType), + keyType: diagnostics.pipe(fromSdkType(sdkContext, dictionaryType.keyType)), + valueType: diagnostics.pipe(fromSdkType(sdkContext, dictionaryType.valueType)), decorators: dictionaryType.decorators, external: fromSdkExternalTypeInfo(dictionaryType), - }; + }); } function fromSdkArrayType( sdkContext: CSharpEmitterContext, arrayType: SdkArrayType, -): InputArrayType { - return { +): [InputArrayType, readonly Diagnostic[]] { + const diagnostics = createDiagnosticCollector(); + return diagnostics.wrap({ kind: "array", name: arrayType.name, - valueType: fromSdkType(sdkContext, arrayType.valueType), + valueType: diagnostics.pipe(fromSdkType(sdkContext, arrayType.valueType)), crossLanguageDefinitionId: arrayType.crossLanguageDefinitionId, decorators: arrayType.decorators, external: fromSdkExternalTypeInfo(arrayType), - }; + }); } function fromSdkEndpointType(): InputPrimitiveType { diff --git a/packages/http-client-csharp/emitter/src/lib/typespec-server.ts b/packages/http-client-csharp/emitter/src/lib/typespec-server.ts index 77cfe50b341..f31b9830dda 100644 --- a/packages/http-client-csharp/emitter/src/lib/typespec-server.ts +++ b/packages/http-client-csharp/emitter/src/lib/typespec-server.ts @@ -2,7 +2,13 @@ // Licensed under the MIT License. See License.txt in the project root for license information. import { getClientType } from "@azure-tools/typespec-client-generator-core"; -import { getDoc, getSummary, Value } from "@typespec/compiler"; +import { + createDiagnosticCollector, + Diagnostic, + getDoc, + getSummary, + Value, +} from "@typespec/compiler"; import { HttpServer } from "@typespec/http"; import { getExtensions } from "@typespec/openapi"; import { CSharpEmitterContext } from "../sdk-context.js"; @@ -20,8 +26,11 @@ export interface TypeSpecServer { export function resolveServers( sdkContext: CSharpEmitterContext, servers: HttpServer[], -): TypeSpecServer[] { - return servers.map((server) => { +): [TypeSpecServer[], readonly Diagnostic[]] { + // Create a diagnostics collector for internal use + const diagnostics = createDiagnosticCollector(); + + const result = servers.map((server) => { const parameters: InputEndpointParameter[] = []; let url: string = server.url; const endpoint: string = url.replace("http://", "").replace("https://", "").split("/")[0]; @@ -35,7 +44,7 @@ export function resolveServers( name: "url", crossLanguageDefinitionId: "TypeSpec.url", } - : fromSdkType(sdkContext, getClientType(sdkContext, prop)); + : diagnostics.pipe(fromSdkType(sdkContext, getClientType(sdkContext, prop))); if (value) { defaultValue = { @@ -101,6 +110,8 @@ export function resolveServers( parameters, }; }); + + return diagnostics.wrap(result); } function getDefaultValue(value: Value): any { diff --git a/packages/http-client-csharp/emitter/src/options.ts b/packages/http-client-csharp/emitter/src/options.ts index 42196440cac..b980b4121f8 100644 --- a/packages/http-client-csharp/emitter/src/options.ts +++ b/packages/http-client-csharp/emitter/src/options.ts @@ -1,10 +1,8 @@ import { CreateSdkContextOptions } from "@azure-tools/typespec-client-generator-core"; import { EmitContext, JSONSchemaType } from "@typespec/compiler"; import { _defaultGeneratorName } from "./constants.js"; -import { CSharpEmitterContext } from "./index.js"; import { DYNAMIC_MODEL_DECORATOR_PATTERN } from "./lib/decorators.js"; import { LoggerLevel } from "./lib/logger-level.js"; -import { CodeModel } from "./type/code-model.js"; /** * The emitter options for the CSharp emitter. @@ -20,7 +18,7 @@ export interface CSharpEmitterOptions { "disable-xml-docs"?: boolean; "generator-name"?: string; "emitter-extension-path"?: string; - "update-code-model"?: (model: CodeModel, context: CSharpEmitterContext) => CodeModel; + plugins?: string[]; "sdk-context-options"?: CreateSdkContextOptions; "generate-protocol-methods"?: boolean; "generate-convenience-methods"?: boolean; @@ -116,11 +114,13 @@ export const CSharpEmitterOptionsSchema: JSONSchemaType = description: "Allows emitter authors to specify the path to a custom emitter package, allowing you to extend the emitter behavior. This should be set to `import.meta.url` if you are using a custom emitter.", }, - "update-code-model": { - type: "object", + plugins: { + type: "array", + items: { type: "string" }, nullable: true, description: - "Allows emitter authors to specify a custom function to modify the generated code model before emitting. This is useful for modifying the code model before it is passed to the generator.", + "Paths to generator plugin assemblies (DLLs) or directories containing plugin assemblies. " + + "Each plugin must contain a class that extends GeneratorPlugin.", }, license: { type: "object", @@ -160,7 +160,6 @@ export const defaultOptions = { debug: undefined, logLevel: LoggerLevel.INFO, "generator-name": _defaultGeneratorName, - "update-code-model": (model: CodeModel, context: CSharpEmitterContext) => model, "sdk-context-options": { additionalDecorators: [DYNAMIC_MODEL_DECORATOR_PATTERN], }, diff --git a/packages/http-client-csharp/emitter/src/type/input-type.ts b/packages/http-client-csharp/emitter/src/type/input-type.ts index 922aa4a8063..96189e1a161 100644 --- a/packages/http-client-csharp/emitter/src/type/input-type.ts +++ b/packages/http-client-csharp/emitter/src/type/input-type.ts @@ -107,7 +107,7 @@ export type InputDateTimeType = InputUtcDateTimeType | InputOffsetDateTimeType; interface InputDateTimeTypeBase extends InputTypeBase { name: string; - encode: DateTimeKnownEncoding; + encode: DateTimeKnownEncoding | string; wireType: InputPrimitiveType; crossLanguageDefinitionId: string; baseType?: InputDateTimeType; @@ -124,7 +124,7 @@ export interface InputOffsetDateTimeType extends InputDateTimeTypeBase { export interface InputDurationType extends InputTypeBase { kind: "duration"; name: string; - encode: DurationKnownEncoding; + encode: DurationKnownEncoding | string; wireType: InputPrimitiveType; crossLanguageDefinitionId: string; baseType?: InputDurationType; @@ -199,6 +199,7 @@ export interface InputMethodParameter extends InputPropertyTypeBase { location: RequestLocation; scope: InputParameterScope; serializedName: string; + paramAlias?: string; } export interface InputQueryParameter extends InputPropertyTypeBase { @@ -208,6 +209,7 @@ export interface InputQueryParameter extends InputPropertyTypeBase { explode: boolean; scope: InputParameterScope; serializedName: string; + methodParameterSegments?: InputMethodParameter[]; } export interface InputPathParameter extends InputPropertyTypeBase { @@ -219,15 +221,18 @@ export interface InputPathParameter extends InputPropertyTypeBase { serverUrlTemplate?: string; scope: InputParameterScope; serializedName: string; + methodParameterSegments?: InputMethodParameter[]; } export interface InputHeaderParameter extends InputPropertyTypeBase { kind: "header"; collectionFormat?: CollectionFormat; arraySerializationDelimiter?: string; + collectionHeaderPrefix?: string; isContentType: boolean; scope: InputParameterScope; serializedName: string; + methodParameterSegments?: InputMethodParameter[]; } export interface InputBodyParameter extends InputPropertyTypeBase { @@ -236,6 +241,7 @@ export interface InputBodyParameter extends InputPropertyTypeBase { defaultContentType: string; scope: InputParameterScope; serializedName: string; + methodParameterSegments?: InputMethodParameter[]; } export interface InputEndpointParameter extends InputPropertyTypeBase { @@ -245,6 +251,7 @@ export interface InputEndpointParameter extends InputPropertyTypeBase { scope: InputParameterScope; serializedName: string; isEndpoint: boolean; + methodParameterSegments?: InputMethodParameter[]; } export interface InputEnumType extends InputTypeBase { diff --git a/packages/http-client-csharp/emitter/test/Unit/auth.test.ts b/packages/http-client-csharp/emitter/test/Unit/auth.test.ts index ee94b078d41..ceac4514668 100644 --- a/packages/http-client-csharp/emitter/test/Unit/auth.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/auth.test.ts @@ -30,8 +30,7 @@ describe("Test auth", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); - const diagnostics = context.program.diagnostics; + const [root, diagnostics] = createModel(sdkContext); const noAuthDiagnostics = diagnostics.filter( (d) => @@ -72,8 +71,7 @@ describe("Test auth", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); - const diagnostics = context.program.diagnostics; + const [root, diagnostics] = createModel(sdkContext); const noAuthDiagnostics = diagnostics.filter( (d) => @@ -114,8 +112,7 @@ describe("Test auth", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); - const diagnostics = context.program.diagnostics; + const [root, diagnostics] = createModel(sdkContext); const noAuthDiagnostics = diagnostics.filter( (d) => @@ -154,8 +151,7 @@ describe("Test auth", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); - const diagnostics = context.program.diagnostics; + const [root, diagnostics] = createModel(sdkContext); const noAuthDiagnostic = diagnostics.find( (d) => d.code === "@typespec/http-client-csharp/unsupported-auth", @@ -182,8 +178,7 @@ describe("Test auth", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); - const diagnostics = context.program.diagnostics; + const [root, diagnostics] = createModel(sdkContext); const noAuthDiagnostics = diagnostics.filter( (d) => d.code === "@typespec/http-client-csharp/unsupported-auth", @@ -216,8 +211,7 @@ describe("Test auth", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); - const diagnostics = context.program.diagnostics; + const [root, diagnostics] = createModel(sdkContext); const noAuthDiagnostics = diagnostics.filter( (d) => @@ -249,8 +243,7 @@ describe("Test auth", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); - const diagnostics = context.program.diagnostics; + const [root, diagnostics] = createModel(sdkContext); // Should have no auth-related diagnostics const authDiagnostics = diagnostics.filter( @@ -290,7 +283,7 @@ describe("Test auth", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); ok(root.auth?.oAuth2); strictEqual(root.auth.oAuth2.flows.length, 1); @@ -322,7 +315,7 @@ describe("Test auth", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); ok(root.auth?.oAuth2); strictEqual(root.auth.oAuth2.flows.length, 1); @@ -352,7 +345,7 @@ describe("Test auth", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); ok(root.auth?.oAuth2); strictEqual(root.auth.oAuth2.flows.length, 1); @@ -389,7 +382,7 @@ describe("Test auth", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); ok(root.auth?.oAuth2); strictEqual(root.auth.oAuth2.flows.length, 2); @@ -426,7 +419,7 @@ describe("Test auth", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); ok(root.auth?.oAuth2); strictEqual(root.auth.oAuth2.flows.length, 1); @@ -454,7 +447,7 @@ describe("Test auth", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); ok(root.auth?.oAuth2); strictEqual(root.auth.oAuth2.flows.length, 1); @@ -482,7 +475,7 @@ describe("Test auth", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); // Should have both OAuth2 and API key auth ok(root.auth?.oAuth2); @@ -513,7 +506,7 @@ describe("Test auth", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); ok(root.auth?.oAuth2); strictEqual(root.auth.oAuth2.flows.length, 1); diff --git a/packages/http-client-csharp/emitter/test/Unit/client-converter.test.ts b/packages/http-client-csharp/emitter/test/Unit/client-converter.test.ts index 49d80ee6033..8aa7561cbf7 100644 --- a/packages/http-client-csharp/emitter/test/Unit/client-converter.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/client-converter.test.ts @@ -28,7 +28,7 @@ describe("isMultiServiceClient", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const client = root.clients[0]; ok(client, "Client should exist"); @@ -81,7 +81,7 @@ describe("isMultiServiceClient", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); strictEqual(root.name, "Service.MultiService", "Root namespace should be Service.MultiService"); const client = root.clients[0]; @@ -147,7 +147,7 @@ describe("isMultiServiceClient", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); strictEqual(root.name, "Service.MultiService", "Root namespace should be Service.MultiService"); const client = root.clients[0]; @@ -219,7 +219,7 @@ describe("isMultiServiceClient", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); strictEqual(root.name, "Service.MultiService", "Root namespace should be Service.MultiService"); const clients = root.clients; @@ -293,7 +293,7 @@ describe("client name suffix", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const client = root.clients[0]; ok(client, "Client should exist"); @@ -338,7 +338,7 @@ describe("client name suffix", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const client = root.clients[0]; ok(client, "Client should exist"); @@ -383,7 +383,7 @@ describe("client name suffix", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const client = root.clients[0]; ok(client, "Client should exist"); @@ -435,7 +435,7 @@ describe("client name suffix", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const client = root.clients[0]; ok(client, "Client should exist"); diff --git a/packages/http-client-csharp/emitter/test/Unit/client-initialization.test.ts b/packages/http-client-csharp/emitter/test/Unit/client-initialization.test.ts index 8715259052f..e03f8fcffb5 100644 --- a/packages/http-client-csharp/emitter/test/Unit/client-initialization.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/client-initialization.test.ts @@ -4,6 +4,7 @@ import { TestHost } from "@typespec/compiler/testing"; import { ok, strictEqual } from "assert"; import { beforeEach, describe, it, vi } from "vitest"; import { createModel } from "../../src/lib/client-model-builder.js"; +import { InputMethodParameter } from "../../src/type/input-type.js"; import { createCSharpSdkContext, createEmitterContext, @@ -34,7 +35,7 @@ describe("ClientInitialization", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const client = root.clients[0]; ok(client, "Client should exist"); @@ -59,7 +60,7 @@ describe("ClientInitialization", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const client = root.clients[0]; // initializedBy field should exist on the client (may be undefined or have a value) @@ -84,7 +85,7 @@ describe("ClientInitialization", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const client = root.clients[0]; ok(client.parameters, "Client should have parameters"); @@ -113,7 +114,7 @@ describe("ClientInitialization", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const client = root.clients[0]; ok("initializedBy" in client, "Parent client should have initializedBy field"); @@ -123,4 +124,82 @@ describe("ClientInitialization", () => { ok("initializedBy" in childClient, "Child client should have initializedBy field"); } }); + + it("should include paramAlias on client parameters when @paramAlias is used", async () => { + const program = await typeSpecCompile( + ` + @service(#{ + title: "Test Service", + }) + @server("https://example.com", "Test endpoint") + namespace TestService; + + op upload(@path blobName: string): void; + + model TestServiceClientOptions { + @paramAlias("blobName") + blob: string; + } + + @@clientInitialization(TestService, {parameters: TestServiceClientOptions}); + `, + runner, + { IsNamespaceNeeded: false, IsTCGCNeeded: true }, + ); + + const context = createEmitterContext(program); + const sdkContext = await createCSharpSdkContext(context); + const [root] = createModel(sdkContext); + + const client = root.clients[0]; + ok(client, "Client should exist"); + ok(client.parameters, "Client should have parameters"); + + // Find the method parameter with paramAlias + const blobParam = client.parameters.find((p) => p.kind === "method" && p.name === "blob") as + | InputMethodParameter + | undefined; + ok(blobParam, "Should have a 'blob' method parameter"); + strictEqual(blobParam.paramAlias, "blobName", "paramAlias should be 'blobName'"); + }); + + it("should not include paramAlias when @paramAlias is not used", async () => { + const program = await typeSpecCompile( + ` + @service(#{ + title: "Test Service", + }) + @server("https://example.com", "Test endpoint") + namespace TestService; + + op upload(@path blobName: string): void; + + model TestServiceClientOptions { + blobName: string; + } + + @@clientInitialization(TestService, {parameters: TestServiceClientOptions}); + `, + runner, + { IsNamespaceNeeded: false, IsTCGCNeeded: true }, + ); + + const context = createEmitterContext(program); + const sdkContext = await createCSharpSdkContext(context); + const [root] = createModel(sdkContext); + + const client = root.clients[0]; + ok(client, "Client should exist"); + ok(client.parameters, "Client should have parameters"); + + const blobParam = client.parameters.find( + (p) => p.kind === "method" && p.name === "blobName", + ) as InputMethodParameter | undefined; + ok(blobParam, "Should have a 'blobName' method parameter"); + strictEqual( + blobParam.paramAlias, + undefined, + "paramAlias should be undefined when @paramAlias is not used", + ); + }); }); diff --git a/packages/http-client-csharp/emitter/test/Unit/client-model-builder.test.ts b/packages/http-client-csharp/emitter/test/Unit/client-model-builder.test.ts index 611fafc9ec9..908ed25ab19 100644 --- a/packages/http-client-csharp/emitter/test/Unit/client-model-builder.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/client-model-builder.test.ts @@ -58,7 +58,7 @@ describe("fixNamingConflicts", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); // Find the real enum const realEnum = root.enums.find( @@ -142,7 +142,7 @@ describe("fixNamingConflicts", () => { namespace: targetNamespace, } as any); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); // Get all ErrorResponse models - fixNamingConflicts should have resolved the conflicts const errorModels = root.models.filter( @@ -194,7 +194,7 @@ describe("parseApiVersions", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); // The root apiVersions should include the version from the Versions enum // which is defined in the default namespace with version "2023-01-01-preview" @@ -228,7 +228,7 @@ describe("parseApiVersions", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); // The root apiVersions should include all versions from the TestVersions enum strictEqual(root.apiVersions.length, 3, "Root apiVersions should have 3 versions"); @@ -247,7 +247,7 @@ describe("parseApiVersions", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); // Single service client should have apiVersions from the @versioned decorator ok(root.apiVersions.length > 0, "Root apiVersions should not be empty for single service"); @@ -299,7 +299,7 @@ describe("parseApiVersions", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); ok(root.apiVersions.length === 0, "Root apiVersions should be empty for multiservice"); @@ -358,7 +358,7 @@ describe("parseApiVersions", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); ok(root.apiVersions.length === 0, "Root apiVersions should be empty for multiservice"); }); @@ -415,7 +415,7 @@ describe("parseApiVersions", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); ok( root.apiVersions.length === 0, @@ -440,4 +440,131 @@ describe("parseApiVersions", () => { ok(barClient.apiVersions.includes("bv1"), "Bar client should include bv1"); ok(barClient.apiVersions.includes("bv2"), "Bar client should include bv2"); }); + + it("should include all API versions from @versioned enum", async () => { + const program = await typeSpecCompile( + ` + @service(#{ + title: "Test Service", + }) + @versioned(Versions) + namespace TestService; + + enum Versions { + v1: "v1", + v2: "v2", + v3: "v3", + } + + @route("/test") + op test(): void; + `, + runner, + { IsNamespaceNeeded: false }, + ); + const context = createEmitterContext(program); + const sdkContext = await createCSharpSdkContext(context); + const [root] = createModel(sdkContext); + + // Verify all three versions are present in the root apiVersions + strictEqual(root.apiVersions.length, 3, "Should have 3 apiVersions"); + ok(root.apiVersions.includes("v1"), "Should include v1"); + ok(root.apiVersions.includes("v2"), "Should include v2"); + ok(root.apiVersions.includes("v3"), "Should include v3"); + }); + + it("should preserve version order from TCGC", async () => { + const program = await typeSpecCompile( + ` + @service(#{ + title: "Test Service", + }) + @versioned(Versions) + namespace TestService; + + enum Versions { + "2023-01-01", + "2024-01-01", + "2025-01-01", + } + + @route("/test") + op test(): void; + `, + runner, + { IsNamespaceNeeded: false }, + ); + const context = createEmitterContext(program); + const sdkContext = await createCSharpSdkContext(context); + const [root] = createModel(sdkContext); + + // Verify versions are in the order TCGC provides them + strictEqual(root.apiVersions.length, 3, "Should have 3 apiVersions"); + strictEqual(root.apiVersions[0], "2023-01-01", "First version should be 2023-01-01"); + strictEqual(root.apiVersions[1], "2024-01-01", "Second version should be 2024-01-01"); + strictEqual(root.apiVersions[2], "2025-01-01", "Third version should be 2025-01-01"); + }); +}); + +describe("createModel diagnostic collection", () => { + let runner: TestHost; + + beforeEach(async () => { + runner = await createEmitterTestHost(); + }); + + it("should return a tuple with CodeModel and diagnostics array", async () => { + const program = await typeSpecCompile( + ` + model TestModel { + name: string; + } + + @route("/test") + op test(): TestModel; + `, + runner, + ); + const context = createEmitterContext(program); + const sdkContext = await createCSharpSdkContext(context); + const result = createModel(sdkContext); + + // Verify the result is a tuple + ok(Array.isArray(result), "Result should be an array (tuple)"); + strictEqual(result.length, 2, "Result should have exactly 2 elements"); + + const [codeModel, diagnostics] = result; + + // Verify the code model + ok(codeModel, "CodeModel should be defined"); + strictEqual( + codeModel.name, + "Azure.Csharp.Testing", + "CodeModel name should be Azure.Csharp.Testing", + ); + + // Verify diagnostics is an array + ok(Array.isArray(diagnostics), "Diagnostics should be an array"); + }); + + it("should collect diagnostics when using diagnostic collection mode", async () => { + const program = await typeSpecCompile( + ` + model TestModel { + name: string; + } + + @route("/test") + op test(): TestModel; + `, + runner, + ); + const context = createEmitterContext(program); + const sdkContext = await createCSharpSdkContext(context); + const [, diagnostics] = createModel(sdkContext); + + // Verify diagnostics array exists (may be empty or contain diagnostics) + ok(diagnostics !== undefined, "Diagnostics should not be undefined"); + ok(Array.isArray(diagnostics), "Diagnostics should be an array"); + }); }); diff --git a/packages/http-client-csharp/emitter/test/Unit/constant-type.test.ts b/packages/http-client-csharp/emitter/test/Unit/constant-type.test.ts index 595e936d2f5..3730f08dbdd 100644 --- a/packages/http-client-csharp/emitter/test/Unit/constant-type.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/constant-type.test.ts @@ -33,7 +33,7 @@ describe("Name for constant type", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const testModel = root.models.find((m) => m.name === "TestModel"); ok(testModel); const propertyType = testModel.properties[0].type; @@ -64,7 +64,7 @@ describe("Name for constant type", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const testModel1 = root.models.find((m) => m.name === "TestModel1"); ok(testModel1); const testModel2 = root.models.find((m) => m.name === "TestModel2"); @@ -103,7 +103,7 @@ describe("Constant enum conversion", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const testModel = root.models.find((m) => m.name === "TestModel"); ok(testModel); const propertyType = testModel.properties[0].type; @@ -134,7 +134,7 @@ describe("Constant enum conversion", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const testModel = root.models.find((m) => m.name === "TestModel"); ok(testModel); const propertyType = testModel.properties[0].type; diff --git a/packages/http-client-csharp/emitter/test/Unit/decorator-list.test.ts b/packages/http-client-csharp/emitter/test/Unit/decorator-list.test.ts index 37aaa5ad3fc..53df8aa6e86 100644 --- a/packages/http-client-csharp/emitter/test/Unit/decorator-list.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/decorator-list.test.ts @@ -34,7 +34,7 @@ describe("Test emitting decorator list", () => { const sdkContext = await createCSharpSdkContext(context, { additionalDecorators: ["Azure\\.ClientGenerator\\.Core\\.@clientName"], }); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const clients = root.clients; strictEqual(clients.length, 1); ok(clients[0].children); @@ -66,7 +66,7 @@ describe("Test emitting decorator list", () => { const sdkContext = await createCSharpSdkContext(context, { additionalDecorators: ["Azure\\.ClientGenerator\\.Core\\.@clientName"], }); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const methods = root.clients[0].methods; strictEqual(methods.length, 1); const operation = methods[0].operation; @@ -97,7 +97,7 @@ describe("Test emitting decorator list", () => { const sdkContext = await createCSharpSdkContext(context, { additionalDecorators: ["Azure\\.ClientGenerator\\.Core\\.@clientName"], }); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const models = root.models; strictEqual(models.length, 1); deepStrictEqual(models[0].decorators, [ @@ -127,7 +127,7 @@ describe("Test emitting decorator list", () => { const sdkContext = await createCSharpSdkContext(context, { additionalDecorators: ["Azure\\.ClientGenerator\\.Core\\.@clientName"], }); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const models = root.models; strictEqual(models.length, 1); deepStrictEqual(models[0].properties[0].decorators, [ @@ -153,7 +153,7 @@ describe("Test emitting decorator list", () => { const sdkContext = await createCSharpSdkContext(context, { additionalDecorators: ["Azure\\.ClientGenerator\\.Core\\.@clientName"], }); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const methods = root.clients[0].methods; strictEqual(methods.length, 1); const operation = methods[0].operation; diff --git a/packages/http-client-csharp/emitter/test/Unit/emitter.test.ts b/packages/http-client-csharp/emitter/test/Unit/emitter.test.ts index 6755c79fde1..640d242a63e 100644 --- a/packages/http-client-csharp/emitter/test/Unit/emitter.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/emitter.test.ts @@ -1,6 +1,6 @@ vi.resetModules(); -import { EmitContext, Program } from "@typespec/compiler"; +import { Diagnostic, EmitContext, Program } from "@typespec/compiler"; import { TestHost } from "@typespec/compiler/testing"; import { strictEqual } from "assert"; import { statSync } from "fs"; @@ -19,6 +19,10 @@ import { describe("$onEmit tests", () => { let program: Program; let $onEmit: (arg0: EmitContext) => any; + let emitCodeModel: ( + context: EmitContext, + updateCodeModel?: (model: CodeModel, context: any) => CodeModel, + ) => any; beforeEach(async () => { // Reset the dynamically imported module to ensure a clean state vi.resetModules(); @@ -58,7 +62,7 @@ describe("$onEmit tests", () => { })); vi.mock("../../src/lib/client-model-builder.js", () => ({ - createModel: vi.fn().mockReturnValue({ Name: "TestNamespace" }), + createModel: vi.fn().mockReturnValue([{ name: "TestNamespace" }, []]), })); program = { @@ -79,21 +83,42 @@ describe("$onEmit tests", () => { reportDiagnostics: vi.fn(), } as unknown as Program; - // dynamically import the module to get the $onEmit function + // dynamically import the module to get the $onEmit and emitCodeModel functions // we avoid importing it at the top to allow mocking of dependencies - $onEmit = (await import("../../src/emitter.js")).$onEmit; + const emitterModule = await import("../../src/emitter.js"); + $onEmit = emitterModule.$onEmit; + emitCodeModel = emitterModule.emitCodeModel; }); - it("should apply the update-code-model callback just once", async () => { + it("should apply the updateCodeModel callback", async () => { const context: EmitContext = createEmitterContext(program); const updateCallback = vi.fn().mockImplementation((model: CodeModel) => { return model; }); - context.options["update-code-model"] = updateCallback; - await $onEmit(context); + await emitCodeModel(context, updateCallback); expect(updateCallback).toHaveBeenCalledTimes(1); }); + it("should report diagnostic instead of throwing when generator fails", async () => { + vi.mocked(execCSharpGenerator).mockResolvedValueOnce({ + exitCode: 1, + stdout: "", + stderr: "Unable to parse required option package-name from configuration.", + } as any); + vi.mocked(execAsync).mockResolvedValueOnce({ + exitCode: 0, + stdio: "", + stdout: "9.0.102", + stderr: "", + proc: { pid: 0, output: "", stdout: "", stderr: "", stdin: "" }, + } as any); + + const context: EmitContext = createEmitterContext(program); + // should not throw + await $onEmit(context); + expect(program.reportDiagnostics).toHaveBeenCalled(); + }); + it("should apply sdk-context-options", async () => { const context: EmitContext = createEmitterContext(program); const additionalDecorators = ["Decorator1", "Decorator2"]; @@ -179,11 +204,64 @@ describe("$onEmit tests", () => { }); }); +describe("emitCodeModel tests", () => { + let runner: TestHost; + let program: Program; + + beforeEach(async () => { + vi.restoreAllMocks(); + runner = await createEmitterTestHost(); + }); + + it("should return diagnostics array from emitCodeModel", async () => { + program = await typeSpecCompile( + ` + model TestModel { + name: string; + } + + @route("/test") + op test(): TestModel; + `, + runner, + ); + const context = createEmitterContext(program); + const { emitCodeModel } = await import("../../src/emitter.js"); + const [, diagnostics] = await emitCodeModel(context); + + // Verify that diagnostics is an array + expect(Array.isArray(diagnostics)).toBe(true); + // Diagnostics array should be defined (may be empty or have diagnostics) + expect(diagnostics).toBeDefined(); + }); + + it("should collect diagnostics from createModel in emitCodeModel", async () => { + program = await typeSpecCompile( + ` + model TestModel { + name: string; + } + + @route("/test") + op test(): TestModel; + `, + runner, + ); + const context = createEmitterContext(program); + const { emitCodeModel } = await import("../../src/emitter.js"); + const [, diagnostics] = await emitCodeModel(context); + + // The function should return diagnostics even if empty + expect(diagnostics).toBeDefined(); + expect(Array.isArray(diagnostics)).toBe(true); + }); +}); + describe("Test _validateDotNetSdk", () => { let runner: TestHost; let program: Program; const minVersion = 8; - let _validateDotNetSdk: (arg0: any, arg1: number) => Promise; + let _validateDotNetSdk: (arg0: any, arg1: number) => Promise<[boolean, readonly Diagnostic[]]>; beforeEach(async () => { vi.resetModules(); @@ -217,7 +295,9 @@ describe("Test _validateDotNetSdk", () => { (execAsync as Mock).mockRejectedValueOnce(error); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const result = await _validateDotNetSdk(sdkContext, minVersion); + const [result, diagnostics] = await _validateDotNetSdk(sdkContext, minVersion); + // Report collected diagnostics to program + program.reportDiagnostics(diagnostics); expect(result).toBe(false); strictEqual(program.diagnostics.length, 1); strictEqual( @@ -241,10 +321,10 @@ describe("Test _validateDotNetSdk", () => { }); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const result = await _validateDotNetSdk(sdkContext, minVersion); + const [result, diagnostics] = await _validateDotNetSdk(sdkContext, minVersion); expect(result).toBe(true); /* no diagnostics */ - strictEqual(program.diagnostics.length, 0); + strictEqual(diagnostics.length, 0); }); it("should return true for installed SDK version whose major greaters than min supported version", async () => { @@ -258,10 +338,10 @@ describe("Test _validateDotNetSdk", () => { }); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const result = await _validateDotNetSdk(sdkContext, minVersion); + const [result, diagnostics] = await _validateDotNetSdk(sdkContext, minVersion); expect(result).toBe(true); /* no diagnostics */ - strictEqual(program.diagnostics.length, 0); + strictEqual(diagnostics.length, 0); }); it("should return false and report diagnostic for invalid .NET SDK version", async () => { @@ -275,7 +355,9 @@ describe("Test _validateDotNetSdk", () => { }); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const result = await _validateDotNetSdk(sdkContext, minVersion); + const [result, diagnostics] = await _validateDotNetSdk(sdkContext, minVersion); + // Report collected diagnostics to program + program.reportDiagnostics(diagnostics); expect(result).toBe(false); strictEqual(program.diagnostics.length, 1); strictEqual( diff --git a/packages/http-client-csharp/emitter/test/Unit/encode.test.ts b/packages/http-client-csharp/emitter/test/Unit/encode.test.ts index 559d2d54dbb..6344bd3f4ca 100644 --- a/packages/http-client-csharp/emitter/test/Unit/encode.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/encode.test.ts @@ -32,7 +32,7 @@ describe("Test encode duration", () => { // validate method parameter const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const methodParamArray = root.clients[0].methods[0].parameters; strictEqual(1, methodParamArray.length); let type = methodParamArray[0].type; @@ -74,7 +74,7 @@ describe("Test encode duration", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); // validate method parameter const methodParamArray = root.clients[0].methods[0].parameters; strictEqual(1, methodParamArray.length); @@ -117,7 +117,7 @@ describe("Test encode duration", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); // validate method parameter const methodParamArray = root.clients[0].methods[0].parameters; strictEqual(1, methodParamArray.length); @@ -161,7 +161,7 @@ describe("Test encode duration", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const codeModel = createModel(sdkContext); + const [codeModel] = createModel(sdkContext); const models = codeModel.models; const durationModel = models.find((m) => m.name === "ISO8601DurationProperty"); ok(durationModel); @@ -190,7 +190,7 @@ describe("Test encode duration", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const codeModel = createModel(sdkContext); + const [codeModel] = createModel(sdkContext); const models = codeModel.models; const durationModel = models.find((m) => m.name === "Int32SecondsDurationProperty"); ok(durationModel); @@ -219,7 +219,7 @@ describe("Test encode duration", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const codeModel = createModel(sdkContext); + const [codeModel] = createModel(sdkContext); const models = codeModel.models; const durationModel = models.find((m) => m.name === "FloatSecondsDurationProperty"); ok(durationModel); diff --git a/packages/http-client-csharp/emitter/test/Unit/input-parameter.test.ts b/packages/http-client-csharp/emitter/test/Unit/input-parameter.test.ts index d552104b525..7e4db98cba1 100644 --- a/packages/http-client-csharp/emitter/test/Unit/input-parameter.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/input-parameter.test.ts @@ -42,7 +42,7 @@ describe("Test Parameter Explode", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "param", ); @@ -72,7 +72,7 @@ describe("Test Parameter Explode", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "param", ); @@ -102,7 +102,7 @@ describe("Test Parameter Explode", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "param", ); @@ -136,7 +136,7 @@ describe("Test Parameter Explode", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "param", ); @@ -166,7 +166,7 @@ describe("Test Parameter Explode", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "param", ); @@ -196,7 +196,7 @@ describe("Test Parameter Explode", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "param", ); @@ -228,7 +228,7 @@ describe("Test Parameter Explode", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "param", ); @@ -258,7 +258,7 @@ describe("Test Parameter Explode", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "param", ); @@ -288,7 +288,7 @@ describe("Test Parameter Explode", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "param", ); @@ -320,7 +320,7 @@ describe("Test Parameter Explode", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "param", ); @@ -350,7 +350,7 @@ describe("Test Parameter Explode", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "param", ); @@ -380,7 +380,7 @@ describe("Test Parameter Explode", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "param", ); @@ -414,7 +414,7 @@ describe("Test Parameter Explode", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "param", ); @@ -445,7 +445,7 @@ describe("Test Parameter Explode", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "param", ); @@ -476,7 +476,7 @@ describe("Test Parameter Explode", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "param", ); @@ -509,7 +509,7 @@ describe("Test Parameter Explode", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "param", ); @@ -540,7 +540,7 @@ describe("Test Parameter Explode", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "param", ); @@ -571,7 +571,7 @@ describe("Test Parameter Explode", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "param", ); @@ -609,8 +609,7 @@ describe("Test Cookie Parameters", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const diagnostics = context.program.diagnostics; - createModel(sdkContext); + const [, diagnostics] = createModel(sdkContext); const unsupportedCookie = diagnostics.find( (d) => d.code === "@typespec/http-client-csharp/unsupported-cookie-parameter", @@ -653,8 +652,7 @@ describe("Endpoint parameters", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const diagnostics = context.program.diagnostics; - createModel(sdkContext); + const [, diagnostics] = createModel(sdkContext); const unsupportedCookie = diagnostics.find( (d) => d.code === "@typespec/http-client-csharp/unsupported-endpoint-url", @@ -686,7 +684,7 @@ describe("Endpoint parameters", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const codeModel = createModel(sdkContext); + const [codeModel] = createModel(sdkContext); const client = codeModel.clients[0]; ok(client); ok(client.parameters); @@ -722,7 +720,7 @@ describe("Endpoint parameters", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const codeModel = createModel(sdkContext); + const [codeModel] = createModel(sdkContext); const client = codeModel.clients[0]; ok(client); ok(client.parameters); @@ -759,7 +757,7 @@ describe("Test Spread Parameters", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); ok(root); // validate service method @@ -802,7 +800,7 @@ describe("Test Spread Parameters", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); ok(root); // validate service method @@ -855,8 +853,7 @@ describe("Test Operation Parameters", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); - + const [root] = createModel(sdkContext); const operation = root.clients[0].methods[0].operation; const queryParam = operation.parameters.find((p) => p.name === "queryParam"); @@ -881,8 +878,7 @@ describe("Test Operation Parameters", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); - + const [root] = createModel(sdkContext); const operation = root.clients[0].methods[0].operation; const pathParam = operation.parameters.find((p) => p.name === "pathParam"); @@ -910,8 +906,7 @@ describe("Test Operation Parameters", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); - + const [root] = createModel(sdkContext); const operation = root.clients[0].methods[0].operation; const headerParam = operation.parameters.find((p) => p.name === "headerParam"); @@ -940,8 +935,7 @@ describe("Test Operation Parameters", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); - + const [root] = createModel(sdkContext); const operation = root.clients[0].methods[0].operation; const contentTypeParam = operation.parameters.find((p) => p.name === "contentType"); @@ -952,6 +946,100 @@ describe("Test Operation Parameters", () => { strictEqual(typedParam.isContentType, true); strictEqual(typedParam.type.kind, "constant"); }); + + it("should populate collectionHeaderPrefix from clientOption decorator", async () => { + const program = await typeSpecCompile( + ` + #suppress "@azure-tools/typespec-client-generator-core/client-option" "test" + @route("test") + @post + op test( + #suppress "@azure-tools/typespec-client-generator-core/client-option" "test" + @header("x-ms-meta") + @clientOption("collectionHeaderPrefix", "x-ms-meta-", "csharp") + metadata: Record): void; + `, + runner, + { IsTCGCNeeded: true }, + ); + const context = createEmitterContext(program); + const sdkContext = await createCSharpSdkContext(context); + const [root] = createModel(sdkContext); + + const operation = root.clients[0].methods[0].operation; + const metadataParam = operation.parameters.find((p) => p.name === "metadata"); + + ok(metadataParam); + strictEqual(metadataParam.kind, "header"); + + const typedParam = metadataParam as InputHeaderParameter; + strictEqual(typedParam.collectionHeaderPrefix, "x-ms-meta-"); + }); + + it("should return undefined for collectionHeaderPrefix when client option value is not a string", async () => { + const program = await typeSpecCompile( + ` + #suppress "@azure-tools/typespec-client-generator-core/client-option" "test" + @route("test") + @post + op test( + #suppress "@azure-tools/typespec-client-generator-core/client-option" "test" + @header("x-ms-meta") + @clientOption("collectionHeaderPrefix", 42, "csharp") + metadata: Record): void; + `, + runner, + { IsTCGCNeeded: true }, + ); + const context = createEmitterContext(program); + const sdkContext = await createCSharpSdkContext(context); + const [root, modelDiagnostics] = createModel(sdkContext); + + const operation = root.clients[0].methods[0].operation; + const metadataParam = operation.parameters.find((p) => p.name === "metadata"); + + ok(metadataParam); + strictEqual(metadataParam.kind, "header"); + + const typedParam = metadataParam as InputHeaderParameter; + strictEqual(typedParam.collectionHeaderPrefix, undefined); + + const warningDiagnostic = modelDiagnostics.find( + (d) => + d.code === "@typespec/http-client-csharp/general-warning" && + d.message?.includes("collectionHeaderPrefix"), + ); + ok(warningDiagnostic, "A warning diagnostic should be reported for non-string value"); + }); + + it("should return undefined for collectionHeaderPrefix when header parameter is not a dictionary type", async () => { + const program = await typeSpecCompile( + ` + #suppress "@azure-tools/typespec-client-generator-core/client-option" "test" + @route("test") + @post + op test( + #suppress "@azure-tools/typespec-client-generator-core/client-option" "test" + @header("x-ms-name") + @clientOption("collectionHeaderPrefix", "x-ms-name-", "csharp") + name: string): void; + `, + runner, + { IsTCGCNeeded: true }, + ); + const context = createEmitterContext(program); + const sdkContext = await createCSharpSdkContext(context); + const [root] = createModel(sdkContext); + + const operation = root.clients[0].methods[0].operation; + const nameParam = operation.parameters.find((p) => p.name === "name"); + + ok(nameParam); + strictEqual(nameParam.kind, "header"); + + const typedParam = nameParam as InputHeaderParameter; + strictEqual(typedParam.collectionHeaderPrefix, undefined); + }); }); describe("Body parameters", () => { @@ -970,8 +1058,7 @@ describe("Test Operation Parameters", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); - + const [root] = createModel(sdkContext); const operation = root.clients[0].methods[0].operation; const bodyParam = operation.parameters.find((p) => p.name === "bodyParam"); diff --git a/packages/http-client-csharp/emitter/test/Unit/method-parameter-segments.test.ts b/packages/http-client-csharp/emitter/test/Unit/method-parameter-segments.test.ts new file mode 100644 index 00000000000..0940caf23e7 --- /dev/null +++ b/packages/http-client-csharp/emitter/test/Unit/method-parameter-segments.test.ts @@ -0,0 +1,329 @@ +import { TestHost } from "@typespec/compiler/testing"; +import { ok, strictEqual } from "assert"; +import { beforeEach, describe, it } from "vitest"; +import { createModel } from "../../src/index.js"; +import { InputServiceMethod } from "../../src/type/input-service-method.js"; +import { InputHttpParameter, InputParameter } from "../../src/type/input-type.js"; +import { + createCSharpSdkContext, + createEmitterContext, + createEmitterTestHost, + typeSpecCompile, +} from "./utils/test-util.js"; + +describe("MethodParameterSegments", () => { + let runner: TestHost; + + beforeEach(async () => { + runner = await createEmitterTestHost(); + }); + + describe("override decorator with model parameter", () => { + it("should flow methodParameterSegments for path parameters", async () => { + const tsp = ` + model Params { + @path p1: string; + @path p2: string; + } + + @route("/test/{p1}/{p2}") + @get op testOp(@path p1: string, @path p2: string): void; + + @get op testOpCustomization(params: Azure.Csharp.Testing.Params): void; + + @@override(Azure.Csharp.Testing.testOp, Azure.Csharp.Testing.testOpCustomization); + `; + + const program = await typeSpecCompile(tsp, runner, { IsTCGCNeeded: true }); + + const context = createEmitterContext(program); + const sdkContext = await createCSharpSdkContext(context); + const [root] = createModel(sdkContext); + ok(root, "Output model should be generated"); + const clients = root.clients; + ok(clients && clients.length > 0, "Should have at least one client"); + + const methods = clients[0].methods; + ok(methods && methods.length > 0, "Should have methods"); + + const testMethod = methods.find((method: InputServiceMethod) => method.name === "testOp"); + ok(testMethod, "Should find testOp operation"); + + const pathParams = testMethod.operation.parameters.filter( + (p: InputParameter) => p.kind === "path", + ); + strictEqual(pathParams.length, 2, "Should have 2 path parameters"); + + for (const param of pathParams) { + ok( + param.methodParameterSegments, + `Parameter ${param.name} should have MethodParameterSegments`, + ); + strictEqual( + param.methodParameterSegments.length, + 2, + `Parameter ${param.name} should have 2 segments in path`, + ); + strictEqual( + param.methodParameterSegments[0].name, + "params", + "First segment should be 'params'", + ); + strictEqual( + param.methodParameterSegments[1].name, + param.name, + `Second segment should be '${param.name}'`, + ); + } + }); + + it("should flow methodParameterSegments for body parameter", async () => { + const tsp = ` + model RequestBody { + prop1: string; + prop2: string; + } + + model Params { + body: RequestBody; + } + + @route("/test") + @post op testOp(@body body: RequestBody): void; + + @post op testOpCustomization(params: Azure.Csharp.Testing.Params): void; + + @@override(Azure.Csharp.Testing.testOp, Azure.Csharp.Testing.testOpCustomization); + `; + + const program = await typeSpecCompile(tsp, runner, { IsTCGCNeeded: true }); + + const context = createEmitterContext(program); + const sdkContext = await createCSharpSdkContext(context); + const [root] = createModel(sdkContext); + ok(root, "Output model should be generated"); + const clients = root.clients; + ok(clients && clients.length > 0, "Should have at least one client"); + + const methods = clients[0].methods; + ok(methods && methods.length > 0, "Should have methods"); + + const testMethod = methods.find((op: InputServiceMethod) => op.name === "testOp"); + ok(testMethod, "Should find testOp operation"); + + const bodyParam = testMethod.operation.parameters.find((p) => p.kind === "body"); + ok(bodyParam, "Should have body parameter"); + ok(bodyParam.methodParameterSegments, "Body parameter should have MethodParameterSegments"); + strictEqual(bodyParam.methodParameterSegments.length, 2, "Should have 2 segments in path"); + strictEqual( + bodyParam.methodParameterSegments[0].name, + "params", + "First segment should be 'params'", + ); + strictEqual( + bodyParam.methodParameterSegments[1].name, + "body", + "Second segment should be 'body'", + ); + }); + + it("should flow methodParameterSegments for mixed parameter types", async () => { + const tsp = ` + model Params { + @path pathParam: string; + @query queryParam: string; + @header headerParam: string; + bodyParam: string; + } + + @route("/test/{pathParam}") + @post op testOp( + @path pathParam: string, + @query queryParam: string, + @header headerParam: string, + @body bodyParam: string + ): void; + + @post op testOpCustomization(params: Azure.Csharp.Testing.Params): void; + + @@override(Azure.Csharp.Testing.testOp, Azure.Csharp.Testing.testOpCustomization); + `; + + const program = await typeSpecCompile(tsp, runner, { IsTCGCNeeded: true }); + + const context = createEmitterContext(program); + const sdkContext = await createCSharpSdkContext(context); + const [root] = createModel(sdkContext); + ok(root, "Output model should be generated"); + const clients = root.clients; + ok(clients && clients.length > 0, "Should have at least one client"); + + const methods = clients[0].methods; + ok(methods && methods.length > 0, "Should have methods"); + + const testMethod = methods.find((op: InputServiceMethod) => op.name === "testOp"); + ok(testMethod, "Should find testOp operation"); + + const locations = ["Path", "Query", "Header", "Body"]; + for (const location of locations) { + const param: InputHttpParameter | undefined = testMethod.operation.parameters.find( + (p) => p.kind === location.toLowerCase(), + ); + ok(param, `Should have ${location} parameter`); + ok( + param.methodParameterSegments, + `${location} parameter should have MethodParameterSegments`, + ); + strictEqual( + param.methodParameterSegments.length, + 2, + `${location} parameter should have 2 segments`, + ); + strictEqual( + param.methodParameterSegments[0].name, + "params", + `${location} parameter first segment should be 'params'`, + ); + } + }); + + it("should handle nested property access in methodParameterSegments", async () => { + const tsp = ` + model InnerModel { + prop: string; + } + + model Params { + nested: InnerModel; + } + + @route("/test") + @post op testOp(@body nested: InnerModel): void; + + @post op testOpCustomization(params: Azure.Csharp.Testing.Params): void; + + @@override(Azure.Csharp.Testing.testOp, Azure.Csharp.Testing.testOpCustomization); + `; + + const program = await typeSpecCompile(tsp, runner, { IsTCGCNeeded: true }); + + const context = createEmitterContext(program); + const sdkContext = await createCSharpSdkContext(context); + const [root] = createModel(sdkContext); + ok(root, "Output model should be generated"); + const clients = root.clients; + ok(clients && clients.length > 0, "Should have at least one client"); + + const methods = clients[0].methods; + ok(methods && methods.length > 0, "Should have methods"); + + const testMethod = methods.find((op: InputServiceMethod) => op.name === "testOp"); + ok(testMethod, "Should find testOp operation"); + + const bodyParam = testMethod.operation.parameters.find((p) => p.kind === "body"); + ok(bodyParam, "Should have body parameter"); + ok(bodyParam.methodParameterSegments, "Body parameter should have MethodParameterSegments"); + strictEqual(bodyParam.methodParameterSegments.length, 2, "Should have 2 segments in path"); + strictEqual( + bodyParam.methodParameterSegments[0].name, + "params", + "First segment should be 'params'", + ); + strictEqual( + bodyParam.methodParameterSegments[1].name, + "nested", + "Second segment should be 'nested'", + ); + }); + }); + + describe("operations without override decorator", () => { + it("should have methodParameterSegments", async () => { + const tsp = ` + @route("/test/{pathParam}") + @get op testOp(@path pathParam: string, @query queryParam: string): void; + `; + + const program = await typeSpecCompile(tsp, runner, { IsTCGCNeeded: true }); + const context = createEmitterContext(program); + const sdkContext = await createCSharpSdkContext(context); + const [root] = createModel(sdkContext); + + ok(root, "Output model should be generated"); + const clients = root.clients; + ok(clients && clients.length > 0, "Should have at least one client"); + + const methods = clients[0].methods; + ok(methods && methods.length > 0, "Should have methods"); + + const testMethod = methods.find((op: InputServiceMethod) => op.name === "testOp"); + ok(testMethod, "Should find testOp operation"); + + for (const param of testMethod.operation.parameters) { + strictEqual( + param.methodParameterSegments?.length, + 1, + `Parameter ${param.name} should have 1 MethodParameterSegment without override`, + ); + strictEqual( + param.methodParameterSegments?.[0].name, + param.name, + `MethodParameterSegment name should be the same as parameter name without override`, + ); + } + }); + }); + + describe("spread parameters with override", () => { + it("should flow methodParameterSegments for spread body properties", async () => { + const tsp = ` + model SpreadModel { + prop1: string; + prop2: string; + } + + @route("/test") + @post op testOp(...SpreadModel): void; + + @post op testOpCustomization(params: Azure.Csharp.Testing.SpreadModel): void; + + @@override(Azure.Csharp.Testing.testOp, Azure.Csharp.Testing.testOpCustomization); + `; + + const program = await typeSpecCompile(tsp, runner, { IsTCGCNeeded: true }); + const context = createEmitterContext(program); + const sdkContext = await createCSharpSdkContext(context); + const [root] = createModel(sdkContext); + + ok(root, "Output model should be generated"); + const clients = root.clients; + ok(clients && clients.length > 0, "Should have at least one client"); + + const methods = clients[0].methods; + ok(methods && methods.length > 0, "Should have methods"); + + const testMethod = methods.find((op: InputServiceMethod) => op.name === "testOp"); + ok(testMethod, "Should find testOp operation"); + + const bodyParams = testMethod.operation.parameters.filter( + (p: InputParameter) => p.kind === "body", + ); + ok(bodyParams.length > 0, "Should have body parameters from spread"); + + for (const param of bodyParams) { + if (param.methodParameterSegments) { + strictEqual( + param.methodParameterSegments.length, + 1, + `Spread parameter ${param.name} should have 1 segment`, + ); + strictEqual( + param.methodParameterSegments[0].name, + "params", + `Spread parameter ${param.name} segment should be 'params'`, + ); + } + } + }); + }); +}); diff --git a/packages/http-client-csharp/emitter/test/Unit/model-type.test.ts b/packages/http-client-csharp/emitter/test/Unit/model-type.test.ts index 51b9415430b..025e8f5ef91 100644 --- a/packages/http-client-csharp/emitter/test/Unit/model-type.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/model-type.test.ts @@ -51,7 +51,7 @@ op test(@body input: Pet): Pet; ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const models = root.models; const petModel = models.find((m) => m.name === "Pet"); const catModel = models.find((m) => m.name === "Cat"); @@ -135,7 +135,7 @@ op test(@body input: Pet): Pet; ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const codeModel = createModel(sdkContext); + const [codeModel] = createModel(sdkContext); const models = codeModel.models; const pet = models.find((m) => m.name === "Pet"); assert(pet !== undefined); @@ -229,7 +229,7 @@ op test(@body input: Pet): Pet; ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const codeModel = createModel(sdkContext); + const [codeModel] = createModel(sdkContext); const models = codeModel.models; const pet = models.find((m) => m.name === "Pet"); assert(pet !== undefined); @@ -350,7 +350,7 @@ op op5(@body body: ExtendsFooArray): ExtendsFooArray; ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const models = root.models; const extendsUnknownModel = models.find((m) => m.name === "ExtendsUnknown"); const extendsStringModel = models.find((m) => m.name === "ExtendsString"); @@ -442,7 +442,7 @@ op op5(@body body: IsFooArray): IsFooArray; ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const models = root.models; const isUnknownModel = models.find((m) => m.name === "IsUnknown"); const isStringModel = models.find((m) => m.name === "IsString"); @@ -493,7 +493,7 @@ op op1(): void; ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const models = root.models; const isEmptyModel = models.find((m) => m.name === "Empty"); ok(isEmptyModel); @@ -522,7 +522,7 @@ model Foo { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const models = root.models; const model = models.find((m) => m.name === "Foo"); ok(model); @@ -560,7 +560,7 @@ describe("Anonymous models should be included in library", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); ok(root); // validate service method @@ -602,7 +602,7 @@ op testOperation(@bodyRoot body: HeaderModel): void; const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const models = root.models; const isEmptyModel = models.find((m) => m.name === "HeaderModel"); ok(isEmptyModel); @@ -647,7 +647,7 @@ op testOperation(@bodyRoot body: HeaderModel): void; const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const models = root.models; const isEmptyModel = models.find((m) => m.name === "HeaderModel"); ok(isEmptyModel); @@ -680,7 +680,7 @@ op testOperation(@bodyRoot body: HeaderModel): void; const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const models = root.models; const isEmptyModel = models.find((m) => m.name === "HeaderModel"); ok(isEmptyModel); @@ -707,7 +707,7 @@ op testOperation(@bodyRoot body: HeaderModel): void; const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const models = root.models; const isEmptyModel = models.find((m) => m.name === "HeaderModel"); ok(isEmptyModel); @@ -757,7 +757,7 @@ describe("typespec-client-generator-core: general decorators list", () => { const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const models = root.models; strictEqual(models.length, 1); deepStrictEqual(models[0].decorators, [ @@ -799,7 +799,7 @@ describe("Access decorator on enums", () => { const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const enums = root.enums; const colorEnum = enums.find((e) => e.name === "Color"); @@ -830,7 +830,7 @@ describe("Access decorator on enums", () => { const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const enums = root.enums; const colorEnum = enums.find((e) => e.name === "Color"); @@ -860,7 +860,7 @@ describe("Access decorator on enums", () => { const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const enums = root.enums; const statusEnum = enums.find((e) => e.name === "Status"); @@ -898,7 +898,7 @@ describe("Usage decorator on enums", () => { const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const enums = root.enums; const colorEnum = enums.find((e) => e.name === "Color"); @@ -928,7 +928,7 @@ describe("Usage decorator on enums", () => { const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const enums = root.enums; const colorEnum = enums.find((e) => e.name === "Color"); @@ -971,7 +971,7 @@ describe("XML serialization options", () => { const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const models = root.models; const bookModel = models.find((m) => m.name === "Book"); @@ -1035,7 +1035,7 @@ describe("XML serialization options", () => { const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const models = root.models; const xmlModel = models.find((m) => m.name === "XmlModel"); @@ -1079,7 +1079,7 @@ describe("XML serialization options", () => { const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const models = root.models; const containerModel = models.find((m) => m.name === "Container"); diff --git a/packages/http-client-csharp/emitter/test/Unit/namespace-converter.test.ts b/packages/http-client-csharp/emitter/test/Unit/namespace-converter.test.ts index 95583fb6fc2..8179f78486b 100644 --- a/packages/http-client-csharp/emitter/test/Unit/namespace-converter.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/namespace-converter.test.ts @@ -50,7 +50,7 @@ describe("Namespace Converter", () => { const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); const sdkPackage = sdkContext.sdkPackage; - const parsedNamespaces = fromSdkNamespaces(sdkContext, sdkPackage.namespaces); + const [parsedNamespaces] = fromSdkNamespaces(sdkContext, sdkPackage.namespaces); strictEqual(parsedNamespaces.length, 1); diff --git a/packages/http-client-csharp/emitter/test/Unit/operation-converter.test.ts b/packages/http-client-csharp/emitter/test/Unit/operation-converter.test.ts index bf8958e71a9..af8d27f6fc0 100644 --- a/packages/http-client-csharp/emitter/test/Unit/operation-converter.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/operation-converter.test.ts @@ -35,7 +35,7 @@ describe("Operation Converter", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); strictEqual(root.clients.length, 1); strictEqual(root.clients[0].methods.length, 1); @@ -106,7 +106,7 @@ describe("Operation Converter", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); strictEqual(root.clients.length, 1); strictEqual(root.clients[0].methods.length, 1); @@ -176,7 +176,7 @@ describe("Operation Converter", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); strictEqual(root.clients.length, 1); strictEqual(root.clients[0].methods.length, 1); @@ -231,7 +231,7 @@ describe("Operation Converter", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); strictEqual(root.clients.length, 1); strictEqual(root.clients[0].methods.length, 1); @@ -275,7 +275,7 @@ describe("Operation Converter", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); strictEqual(root.clients.length, 1); strictEqual(root.clients[0].methods.length, 1); @@ -314,7 +314,7 @@ describe("Operation Converter", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); strictEqual(root.clients.length, 1); strictEqual(root.clients[0].methods.length, 1); @@ -346,7 +346,7 @@ describe("Operation Converter", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); strictEqual(root.clients.length, 1); strictEqual(root.clients[0].methods.length, 1); @@ -382,7 +382,7 @@ describe("Operation Converter", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); strictEqual(root.clients.length, 1); strictEqual(root.clients[0].methods.length, 1); @@ -390,6 +390,14 @@ describe("Operation Converter", () => { const method = root.clients[0].methods[0]; ok(method); + const contentTypeMethodParam = method.parameters.find((p) => p.name === "contentType"); + ok(contentTypeMethodParam, "Content-Type parameter should exist in service method"); + strictEqual( + contentTypeMethodParam.type.kind, + "constant", + "Content-type should remain a constant type, not transformed to enum", + ); + // validate operation const operation = method.operation; ok(operation); @@ -426,7 +434,7 @@ describe("Operation Converter", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); strictEqual(root.clients.length, 1); strictEqual(root.clients[0].methods.length, 1); diff --git a/packages/http-client-csharp/emitter/test/Unit/operation-paging.test.ts b/packages/http-client-csharp/emitter/test/Unit/operation-paging.test.ts index d5f5cd66d54..5338c2f7f53 100644 --- a/packages/http-client-csharp/emitter/test/Unit/operation-paging.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/operation-paging.test.ts @@ -39,7 +39,7 @@ describe("Next link operations", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const method = root.clients[0].methods[0]; strictEqual(method.kind, "paging"); @@ -93,7 +93,7 @@ describe("Next link operations", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const method = root.clients[0].methods[0]; strictEqual(method.kind, "paging"); @@ -138,7 +138,7 @@ describe("Next link operations", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const method = root.clients[0].methods[0]; strictEqual(method.kind, "paging"); @@ -174,7 +174,7 @@ describe("Next link operations", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const method = root.clients[0].methods[0]; strictEqual(method.kind, "paging"); @@ -208,7 +208,7 @@ describe("Next link operations", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root, modelDiagnostics] = createModel(sdkContext); const method = root.clients[0].methods[0]; strictEqual(method.kind, "paging"); @@ -220,13 +220,13 @@ describe("Next link operations", () => { strictEqual(paging.nextLink?.responseSegments.length, 1); strictEqual(paging.nextLink?.responseSegments[0], "next"); - strictEqual(program.diagnostics.length, 1); + strictEqual(modelDiagnostics.length, 1); strictEqual( - program.diagnostics[0].code, + modelDiagnostics[0].code, "@typespec/http-client-csharp/unsupported-continuation-location", ); strictEqual( - program.diagnostics[0].message, + modelDiagnostics[0].message, `Unsupported continuation location for operation ${root.clients[0].methods[0].operation.crossLanguageDefinitionId}.`, ); }); @@ -256,7 +256,7 @@ describe("Continuation token operations", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const method = root.clients[0].methods[0]; strictEqual(method.kind, "paging"); @@ -291,7 +291,7 @@ describe("Continuation token operations", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const method = root.clients[0].methods[0]; strictEqual(method.kind, "paging"); @@ -327,7 +327,7 @@ describe("Continuation token operations", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const method = root.clients[0].methods[0]; strictEqual(method.kind, "paging"); @@ -363,7 +363,7 @@ describe("Continuation token operations", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const method = root.clients[0].methods[0]; strictEqual(method.kind, "paging"); @@ -399,7 +399,7 @@ describe("Continuation token operations", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root, modelDiagnostics] = createModel(sdkContext); const method = root.clients[0].methods[0]; strictEqual(method.kind, "paging"); @@ -415,13 +415,13 @@ describe("Continuation token operations", () => { strictEqual(continuationToken.responseLocation, ResponseLocation.None); strictEqual(continuationToken.responseSegments.length, 1); strictEqual(continuationToken.responseSegments[0], "nextToken"); - strictEqual(program.diagnostics.length, 1); + strictEqual(modelDiagnostics.length, 1); strictEqual( - program.diagnostics[0].code, + modelDiagnostics[0].code, "@typespec/http-client-csharp/unsupported-continuation-location", ); strictEqual( - program.diagnostics[0].message, + modelDiagnostics[0].message, `Unsupported continuation location for operation ${root.clients[0].methods[0].operation.crossLanguageDefinitionId}.`, ); }); @@ -453,7 +453,7 @@ describe("PageSize parameter operations", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const method = root.clients[0].methods[0]; strictEqual(method.kind, "paging"); @@ -491,7 +491,7 @@ describe("PageSize parameter operations", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const method = root.clients[0].methods[0]; strictEqual(method.kind, "paging"); diff --git a/packages/http-client-csharp/emitter/test/Unit/options.test.ts b/packages/http-client-csharp/emitter/test/Unit/options.test.ts index 77b240ade30..2d82da0c25d 100644 --- a/packages/http-client-csharp/emitter/test/Unit/options.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/options.test.ts @@ -162,4 +162,27 @@ describe("Configuration tests", async () => { expect(config["generate-protocol-methods"]).toBeUndefined(); expect(config["generate-convenience-methods"]).toBeUndefined(); }); + + it("should pass plugins option to configuration", async () => { + const options: CSharpEmitterOptions = { + "package-name": "test-package", + plugins: ["/path/to/Plugin.dll", "/path/to/plugin-dir"], + }; + const context = createEmitterContext(program, options); + const sdkContext = await createCSharpSdkContext(context); + const config = createConfiguration(options, "namespace", sdkContext); + + expect(config["plugins"]).toEqual(["/path/to/Plugin.dll", "/path/to/plugin-dir"]); + }); + + it("should not include plugins in configuration when not set", async () => { + const options: CSharpEmitterOptions = { + "package-name": "test-package", + }; + const context = createEmitterContext(program, options); + const sdkContext = await createCSharpSdkContext(context); + const config = createConfiguration(options, "namespace", sdkContext); + + expect(config["plugins"]).toBeUndefined(); + }); }); diff --git a/packages/http-client-csharp/emitter/test/Unit/property-type.test.ts b/packages/http-client-csharp/emitter/test/Unit/property-type.test.ts index 5de9f067d45..e3589538bd3 100644 --- a/packages/http-client-csharp/emitter/test/Unit/property-type.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/property-type.test.ts @@ -28,7 +28,7 @@ describe("Test GetInputType for array", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "input", ); @@ -49,7 +49,7 @@ describe("Test GetInputType for array", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const bodyType = root.clients[0].methods[0].operation.responses[0].bodyType; strictEqual(bodyType?.kind, "array"); strictEqual(bodyType.crossLanguageDefinitionId, "TypeSpec.Array"); @@ -86,7 +86,7 @@ describe("Test GetInputType for enum", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "input", ); @@ -130,7 +130,7 @@ describe("Test GetInputType for enum", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "input", ); @@ -169,7 +169,7 @@ describe("Test GetInputType for enum", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "input", ); diff --git a/packages/http-client-csharp/emitter/test/Unit/scalar.test.ts b/packages/http-client-csharp/emitter/test/Unit/scalar.test.ts index 015d4ca3c43..cea35899816 100644 --- a/packages/http-client-csharp/emitter/test/Unit/scalar.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/scalar.test.ts @@ -28,7 +28,7 @@ describe("Test GetInputType for scalar", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "location", ); diff --git a/packages/http-client-csharp/emitter/test/Unit/string-format.test.ts b/packages/http-client-csharp/emitter/test/Unit/string-format.test.ts index 2f86dc8409e..3eea60ca0d1 100644 --- a/packages/http-client-csharp/emitter/test/Unit/string-format.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/string-format.test.ts @@ -27,7 +27,7 @@ describe("Test string format", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const inputParamArray = root.clients[0].methods[0].operation.parameters.filter( (p) => p.name === "sourceUrl", ); @@ -51,7 +51,7 @@ describe("Test string format", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const codeModel = createModel(sdkContext); + const [codeModel] = createModel(sdkContext); const models = codeModel.models; const foo = models.find((m) => m.name === "Foo"); ok(foo); diff --git a/packages/http-client-csharp/emitter/test/Unit/type-converter.test.ts b/packages/http-client-csharp/emitter/test/Unit/type-converter.test.ts index 081708c903f..b6fb88bbdf9 100644 --- a/packages/http-client-csharp/emitter/test/Unit/type-converter.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/type-converter.test.ts @@ -69,7 +69,7 @@ describe("Enum value references", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const enumType = root.enums.find((e) => e.name === "TestEnum"); ok(enumType, "TestEnum should exist in the enums list"); strictEqual(enumType.values.length, 3, "TestEnum should have 3 values"); @@ -119,7 +119,7 @@ describe("External types", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const testModel = root.models.find((m) => m.name === "TestModel"); ok(testModel, "TestModel should exist"); @@ -164,7 +164,7 @@ describe("External types", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const testModel = root.models.find((m) => m.name === "TestModel"); ok(testModel, "TestModel should exist"); diff --git a/packages/http-client-csharp/emitter/test/Unit/usage.test.ts b/packages/http-client-csharp/emitter/test/Unit/usage.test.ts index a20ee81a401..ee0923b0174 100644 --- a/packages/http-client-csharp/emitter/test/Unit/usage.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/usage.test.ts @@ -33,7 +33,7 @@ describe("Test Usage", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const fooModel = root.models.find((model) => model.name === "Foo"); ok(fooModel); @@ -54,7 +54,7 @@ describe("Test Usage", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const fooModel = root.models.find((model) => model.name === "Foo"); ok(fooModel); @@ -75,7 +75,7 @@ describe("Test Usage", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const fooModel = root.models.find((model) => model.name === "Foo"); ok(fooModel); @@ -97,7 +97,7 @@ describe("Test Usage", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const fooModel = root.models.find((model) => model.name === "Foo"); ok(fooModel); @@ -124,7 +124,7 @@ describe("Test Usage", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const fooModel = root.models.find((model) => model.name === "Foo"); const templateModel = root.models.find((model) => model.name === "TemplateModelFoo"); @@ -154,7 +154,7 @@ describe("Test Usage", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const baseModel = root.models.find((model) => model.name === "BaseModel"); const fooModel = root.models.find((model) => model.name === "Foo"); @@ -191,7 +191,7 @@ describe("Test Usage", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const baseModel = root.models.find((model) => model.name === "BaseModel"); const fooModel = root.models.find((model) => model.name === "Foo"); const propertyModel = root.models.find((model) => model.name === "PropertyModel"); @@ -218,7 +218,7 @@ describe("Test Usage", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const fooAlias = root.models.find((model) => model.name === "TestRequest"); ok(fooAlias); @@ -266,7 +266,7 @@ describe("Test Usage", () => { ); const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const fooInfo = root.models.find((model) => model.name === "FooInfo"); const batchCreateFooListItemsRequest = root.models.find( (model) => model.name === "BatchCreateFooListItemsRequest", @@ -312,7 +312,7 @@ describe("Test Usage", () => { const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const fooModel = root.models.find((model) => model.name === "Foo"); ok(fooModel); @@ -371,7 +371,7 @@ describe("Test Usage", () => { const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const baseModel = root.models.find((model) => model.name === "BaseModelWithDiscriminator"); const derivedModel = root.models.find( (model) => model.name === "DerivedModelWithDiscriminatorA", @@ -441,7 +441,7 @@ describe("Test Usage", () => { const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const baseModel = root.models.find((model) => model.name === "BaseModelWithDiscriminator"); const derivedModel = root.models.find( (model) => model.name === "DerivedModelWithDiscriminatorA", @@ -478,7 +478,7 @@ describe("Test Usage", () => { const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const simpleEnumRenamed = root.enums.find((enumType) => enumType.name === "SimpleEnumRenamed"); ok(simpleEnumRenamed); @@ -502,7 +502,7 @@ describe("Test Usage", () => { const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const renamedModel = root.models.find((model) => model.name === "RenamedModel"); ok(renamedModel); @@ -660,7 +660,7 @@ interface LegacyLro { const context = createEmitterContext(program); const sdkContext = await createCSharpSdkContext(context); - const root = createModel(sdkContext); + const [root] = createModel(sdkContext); const radiologyInsightsInferenceResult = root.models.find( (model) => model.name === "RadiologyInsightsInferenceResult", ); diff --git a/packages/http-client-csharp/eng/pipeline/publish.yml b/packages/http-client-csharp/eng/pipeline/publish.yml index 71469813b6f..e369e98bebd 100644 --- a/packages/http-client-csharp/eng/pipeline/publish.yml +++ b/packages/http-client-csharp/eng/pipeline/publish.yml @@ -5,8 +5,6 @@ trigger: paths: include: - packages/http-client-csharp/ - exclude: - - packages/http-client-csharp/eng/ pr: none @@ -16,6 +14,21 @@ parameters: type: boolean default: false + - name: RegenerateAzureLibraries + displayName: Regenerate Azure data plane SDK libraries (builds Azure emitter locally) + type: boolean + default: false + + - name: RegenerateMgmtLibraries + displayName: Regenerate Azure mgmt SDK libraries (builds mgmt emitter locally) + type: boolean + default: false + + - name: RunTests + displayName: Run unit tests + type: boolean + default: true + extends: template: /eng/common/pipelines/templates/1es-redirect.yml @@ -26,7 +39,7 @@ extends: BuildPrereleaseVersion: true UseTypeSpecNext: false Publish: ${{replace(replace('True',eq(variables['Build.SourceBranchName'], 'main'), 'public'),'True','internal')}} - PublishDependsOnTest: true + PublishDependsOnTest: ${{ parameters.RunTests }} PackagePath: /packages/http-client-csharp EmitterPackageJsonPath: packages/http-client-csharp/package.json Packages: @@ -45,7 +58,8 @@ extends: - name: Microsoft.TypeSpec.Generator.Customization file: Microsoft.TypeSpec.Generator.Customization.*.nupkg type: nuget - UnitTestArgs: -UnitTests + ${{ if parameters.RunTests }}: + UnitTestArgs: -UnitTests StagePrefix: "CSharp" LanguageShortName: "csharp" HasNugetPackages: true @@ -86,6 +100,7 @@ extends: os: linux jobs: - job: CreatePR + timeoutInMinutes: 90 steps: - checkout: self - pwsh: | @@ -106,6 +121,29 @@ extends: - task: NuGetAuthenticate@1 + - pwsh: | + Write-Host "Creating .npmrc file $(Build.SourcesDirectory)/packages/http-client-csharp/.npmrc for registry https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js/npm/registry/" + $parentFolder = Split-Path -Path '$(Build.SourcesDirectory)/packages/http-client-csharp/.npmrc' -Parent + + if (!(Test-Path $parentFolder)) { + Write-Host "Creating folder $parentFolder" + New-Item -Path $parentFolder -ItemType Directory | Out-Null + } + + $content = "registry=https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js/npm/registry/`n`nalways-auth=true" + $content | Out-File '$(Build.SourcesDirectory)/packages/http-client-csharp/.npmrc' + + Write-Host "##[section].npmrc file created successfully. Contents:" + Get-Content '$(Build.SourcesDirectory)/packages/http-client-csharp/.npmrc' | ForEach-Object { Write-Host " $_" } + displayName: "Create .npmrc" + condition: eq('${{replace(replace('True',eq(variables['Build.SourceBranchName'], 'main'), 'public'),'True','internal')}}', 'internal') + + - task: npmAuthenticate@0 + displayName: Authenticate npm for Azure Artifacts + condition: eq('${{replace(replace('True',eq(variables['Build.SourceBranchName'], 'main'), 'public'),'True','internal')}}', 'internal') + inputs: + workingFile: $(Build.SourcesDirectory)/packages/http-client-csharp/.npmrc + - download: current displayName: Download pipeline artifacts @@ -113,6 +151,10 @@ extends: npm install -g @azure-tools/typespec-client-generator-cli@latest displayName: Install tsp-client + - pwsh: | + npm install -g semver + displayName: Install semver + - task: PowerShell@2 displayName: Update package.json with injected dependencies inputs: @@ -128,6 +170,24 @@ extends: useGlobalJson: true workingDirectory: $(Build.SourcesDirectory)/packages/http-client-csharp + - pwsh: | + Write-Host "##[section]Checking npm configuration before PR submission..." + Write-Host "Current npm registry:" + npm config get registry + + Write-Host "`nChecking for .npmrc files:" + $npmrcPath = "$(Build.SourcesDirectory)/packages/http-client-csharp/.npmrc" + if (Test-Path $npmrcPath) { + Write-Host "Found .npmrc at: $npmrcPath" + } else { + Write-Host ".npmrc file not found - will use default npm registry" + } + + Write-Host "`nNpm config list (user + global):" + npm config list + displayName: "Log npm configuration" + condition: eq(${{ parameters.CreateAzureSdkForNetPR }}, true) + - task: PowerShell@2 displayName: Generate emitter-package.json files & create PR in azure-sdk-for-net inputs: @@ -138,3 +198,16 @@ extends: -TypeSpecCommitUrl '$(TypeSpecCommitUrl)' -AuthToken '$(azuresdk-github-pat)' -TypeSpecSourcePackageJsonPath '$(Build.SourcesDirectory)/packages/http-client-csharp/package.json' + ${{ replace(replace('True', eq(variables['Build.SourceBranchName'], 'main'), ''), 'True', '-Internal') }} + ${{ replace(replace('True', eq(parameters.RegenerateAzureLibraries, false), ''), 'True', '-RegenerateAzureLibraries') }} + ${{ replace(replace('True', eq(parameters.RegenerateMgmtLibraries, false), ''), 'True', '-RegenerateMgmtLibraries') }} + -BuildArtifactsPath '$(Pipeline.Workspace)/build_artifacts_csharp/packages' + + - pwsh: | + $npmrcPath = "$(Build.SourcesDirectory)/packages/http-client-csharp/.npmrc" + if (Test-Path $npmrcPath) { + Remove-Item $npmrcPath -Force + Write-Host "Cleaned up .npmrc file" + } + displayName: Cleanup .npmrc file + condition: always() diff --git a/packages/http-client-csharp/eng/scripts/Build-Packages.ps1 b/packages/http-client-csharp/eng/scripts/Build-Packages.ps1 index 587a46bb1ce..e606da1c6f5 100644 --- a/packages/http-client-csharp/eng/scripts/Build-Packages.ps1 +++ b/packages/http-client-csharp/eng/scripts/Build-Packages.ps1 @@ -150,7 +150,7 @@ finally } if ($PublishType -eq "internal") { - $feedUrl = "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js-test-autorest/npm/registry" + $feedUrl = "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js/npm/registry" $overrides = @{ "@typespec/http-client-csharp" = "$feedUrl/@typespec/http-client-csharp/-/http-client-csharp-$emitterVersion.tgz" diff --git a/packages/http-client-csharp/eng/scripts/Check-GitChanges.ps1 b/packages/http-client-csharp/eng/scripts/Check-GitChanges.ps1 index c4bde91a49e..9c7190758cb 100644 --- a/packages/http-client-csharp/eng/scripts/Check-GitChanges.ps1 +++ b/packages/http-client-csharp/eng/scripts/Check-GitChanges.ps1 @@ -20,3 +20,12 @@ Invoke-LoggedCommand "git -c core.safecrlf=false diff --ignore-space-at-eol --ex if($LastExitCode -ne 0) { throw "Changes detected" } + +# Check for untracked files that should have been committed (e.g. newly generated files) +$generatorRoot = "$packageRoot/generator" +$untrackedOutput = Invoke-LoggedCommand "git ls-files --others --exclude-standard -- $generatorRoot" +if ($untrackedOutput) { + Write-Host "Untracked files detected:" + Write-Host $untrackedOutput + throw "Untracked files detected" +} diff --git a/packages/http-client-csharp/eng/scripts/Generate.ps1 b/packages/http-client-csharp/eng/scripts/Generate.ps1 index a047b8aa7f3..895bc96690f 100644 --- a/packages/http-client-csharp/eng/scripts/Generate.ps1 +++ b/packages/http-client-csharp/eng/scripts/Generate.ps1 @@ -19,33 +19,6 @@ if (-not $LaunchOnly) { if ($null -eq $filter -or $filter -eq "Sample-TypeSpec") { - Write-Host "Building logging plugin" -ForegroundColor Cyan - $pluginDir = Join-Path $packageRoot '..' '..' 'docs' 'samples' 'client' 'csharp' 'plugins' 'logging' 'Logging.Plugin' 'src' - Invoke "dotnet build" $pluginDir - - $sampleDir = Join-Path $packageRoot '..' '..' 'docs' 'samples' 'client' 'csharp' 'SampleService' - - Write-Host "Installing SampleTypeSpec plugins" -ForegroundColor Cyan - - Invoke "npm install --force" $sampleDir - - Write-Host "Generating SampleTypeSpec using plugins" -ForegroundColor Cyan - - Invoke "npx tsp compile . --trace @typespec/http-client-csharp --option @typespec/http-client-csharp.new-project=true" $sampleDir - - # exit if the generation failed - if ($LASTEXITCODE -ne 0) { - exit $LASTEXITCODE - } - - Write-Host "Building SampleTypeSpec plugin library" -ForegroundColor Cyan - Invoke "dotnet build $sampleDir/SampleClient/src/SampleTypeSpec.csproj" - - # exit if the generation failed - if ($LASTEXITCODE -ne 0) { - exit $LASTEXITCODE - } - Write-Host "Generating SampleTypeSpec" -ForegroundColor Cyan $testProjectsLocalDir = Join-Path $packageRoot 'generator' 'TestProjects' 'Local' diff --git a/packages/http-client-csharp/eng/scripts/RegenPreview.ps1 b/packages/http-client-csharp/eng/scripts/RegenPreview.ps1 index 57319021a69..3f71099a576 100644 --- a/packages/http-client-csharp/eng/scripts/RegenPreview.ps1 +++ b/packages/http-client-csharp/eng/scripts/RegenPreview.ps1 @@ -5,12 +5,12 @@ Builds local generator packages and regenerates Azure SDK for .NET or OpenAI .NET libraries for validation. .DESCRIPTION - This script supports two modes: + This script supports three modes: Azure SDK Mode (default): 1. Builds a local npm package of @typespec/http-client-csharp with a versioned name (1.0.0-alpha.YYYYMMDD.hash) 2. Builds and packages the three NuGet generator framework packages with the same versioning - 3. Updates Packages.Data.props in azure-sdk-for-net with the local NuGet version + 3. Updates Directory.Generation.Packages.props in azure-sdk-for-net with the local NuGet version 4. Updates the Azure generator (@azure-typespec/http-client-csharp) to use the local unbranded generator 5. Builds and packages the Azure generator locally 6. Updates the management plane generator (@azure-typespec/http-client-csharp-mgmt) to use local generators @@ -26,6 +26,14 @@ 5. Invokes Invoke-CodeGen.ps1 to regenerate the OpenAI library 6. Restores all modified artifacts to original state on success + Spector Mode (when -Spector switch is specified): + 1. Builds a local npm package of @typespec/http-client-csharp with a versioned name + 2. Builds and packages the NuGet generator framework packages + 3. Updates the Azure generator's package.json to use the local unbranded package + 4. Updates Directory.Generation.Packages.props with local NuGet version and adds local NuGet source + 5. Runs the Azure generator's Generate.ps1 to regenerate spector test scenarios + 6. Restores all modified artifacts to original state + Generator Filtering (Azure SDK Mode only): - Use -Azure to regenerate only Azure-branded libraries (@azure-typespec/http-client-csharp) - Use -Unbranded to regenerate only unbranded libraries (@typespec/http-client-csharp) @@ -58,6 +66,13 @@ If no generator filter is specified, all libraries are regenerated. Not applicable in OpenAI mode. +.PARAMETER Spector + Optional. Azure SDK Mode only. When specified, regenerates the Azure spector test scenarios in azure-sdk-for-net + instead of regenerating SDK libraries. This builds the local unbranded generator, wires it into the Azure generator, + and runs the Azure generator's Generate.ps1 to regenerate spector test projects. + Mutually exclusive with Select, Azure, Unbranded, and Mgmt parameters. + Not applicable in OpenAI mode. + .EXAMPLE # Azure SDK Mode - Regenerate all libraries .\RegenPreview.ps1 -SdkLibraryRepoPath "C:\repos\azure-sdk-for-net" @@ -85,6 +100,10 @@ .EXAMPLE # Regenerate only management plane libraries .\RegenPreview.ps1 -SdkLibraryRepoPath "C:\repos\azure-sdk-for-net" -Mgmt + +.EXAMPLE + # Regenerate Azure spector test scenarios using local changes + .\RegenPreview.ps1 -SdkLibraryRepoPath "C:\repos\azure-sdk-for-net" -Spector #> param( @@ -101,7 +120,10 @@ param( [switch]$Unbranded, [Parameter(Mandatory=$false)] - [switch]$Mgmt + [switch]$Mgmt, + + [Parameter(Mandatory=$false)] + [switch]$Spector ) $ErrorActionPreference = 'Stop' @@ -113,11 +135,17 @@ $isOpenAIMode = $SdkLibraryRepoPath -like "*openai-dotnet*" # Validate mutually exclusive parameters if ($isOpenAIMode) { # In OpenAI mode, no filter parameters are allowed - if ($Select -or $Azure -or $Unbranded -or $Mgmt) { - Write-Error "OpenAI mode detected. The -Select, -Azure, -Unbranded, and -Mgmt parameters are not applicable when regenerating OpenAI libraries." + if ($Select -or $Azure -or $Unbranded -or $Mgmt -or $Spector) { + Write-Error "OpenAI mode detected. The -Select, -Azure, -Unbranded, -Mgmt, and -Spector parameters are not applicable when regenerating OpenAI libraries." exit 1 } } else { + # -Spector is mutually exclusive with all other filter parameters + if ($Spector -and ($Select -or $Azure -or $Unbranded -or $Mgmt)) { + Write-Error "The -Spector parameter is mutually exclusive with -Select, -Azure, -Unbranded, and -Mgmt." + exit 1 + } + # In Azure SDK mode, validate filter parameters $generatorFilters = @($Azure, $Unbranded, $Mgmt) $activeFilters = @($generatorFilters | Where-Object { $_ }).Count @@ -145,7 +173,9 @@ if ($isOpenAIMode) { Write-Host "Repository: Azure SDK for .NET" -ForegroundColor Gray # Display active mode - $modeText = if ($Select) { + $modeText = if ($Spector) { + "Regenerate Azure spector test scenarios" + } elseif ($Select) { "Interactive library selection" } elseif ($Azure) { "Regenerate Azure SDK libraries only" @@ -221,14 +251,14 @@ function Update-PackageJsonVersion { $packageJson | ConvertTo-Json -Depth 100 | Set-Content $PackageJsonPath -Encoding utf8 -NoNewline } -# Update UnbrandedGeneratorVersion in Packages.Data.props +# Update UnbrandedGeneratorVersion in Directory.Generation.Packages.props function Update-UnbrandedGeneratorVersion { param( [string]$PackagesDataPropsPath, [string]$NewVersion ) - Write-Host "Updating UnbrandedGeneratorVersion to $NewVersion in Packages.Data.props" -ForegroundColor Gray + Write-Host "Updating UnbrandedGeneratorVersion to $NewVersion in Directory.Generation.Packages.props" -ForegroundColor Gray $content = Get-Content $PackagesDataPropsPath -Raw @@ -553,7 +583,7 @@ try { Write-Host "" # Step 1: Build the unbranded generator - if ($isOpenAIMode) { + if ($isOpenAIMode -or $Spector) { Write-Host "`n[1/3] Building unbranded generator..." -ForegroundColor Cyan } else { Write-Host "`n[2/5] Building unbranded generator..." -ForegroundColor Cyan @@ -586,7 +616,7 @@ try { } # Step 2: Package the generators with local version - if ($isOpenAIMode) { + if ($isOpenAIMode -or $Spector) { Write-Host "`n[2/3] Packaging generators..." -ForegroundColor Cyan } else { Write-Host "`n[2/5] Packaging generators..." -ForegroundColor Cyan @@ -682,12 +712,59 @@ try { } } + # Spector Mode: Regenerate Azure spector test scenarios + if ($Spector) { + Write-Host "`n[3/3] Regenerating Azure spector test scenarios..." -ForegroundColor Cyan + + try { + $generationOutput = Update-AzureSpectorScenarios ` + -AzureGeneratorPath (Join-Path $sdkRepoPath "eng" "packages" "http-client-csharp") ` + -UnbrandedPackagePath $unbrandedPackagePath ` + -LocalVersion $localVersion ` + -DebugFolder $debugFolder + + $result = @{ + Success = $true + Library = "Azure Spector Test Scenarios" + Service = "Spector" + Path = "eng/packages/http-client-csharp/generator/TestProjects/Spector" + Generator = "@azure-typespec/http-client-csharp" + Error = "" + Output = $generationOutput + } + } + catch { + $result = @{ + Success = $false + Library = "Azure Spector Test Scenarios" + Service = "Spector" + Path = "eng/packages/http-client-csharp/generator/TestProjects/Spector" + Generator = "@azure-typespec/http-client-csharp" + Error = $_.Exception.Message + Output = $_.Exception.ToString() + } + } + + $scriptEndTime = Get-Date + $elapsedTime = $scriptEndTime - $scriptStartTime + + Write-RegenerationReport -Results @($result) -ElapsedTime $elapsedTime -DebugFolder $debugFolder + + if ($result.Success) { + Write-Host "`nScript completed successfully." -ForegroundColor Cyan + exit 0 + } else { + Write-Host "`nScript failed." -ForegroundColor Red + exit 1 + } + } + # Azure SDK Mode: Continue with Azure SDK-specific steps - # Update Packages.Data.props with local NuGet version - $packagesDataPropsPath = Join-Path $sdkRepoPath "eng" "Packages.Data.props" + # Update Directory.Generation.Packages.props with local NuGet version + $packagesDataPropsPath = Join-Path $sdkRepoPath "eng" "centralpackagemanagement" "Directory.Generation.Packages.props" if (-not (Test-Path $packagesDataPropsPath)) { - throw "Packages.Data.props not found at: $packagesDataPropsPath" + throw "Directory.Generation.Packages.props not found at: $packagesDataPropsPath" } Update-UnbrandedGeneratorVersion -PackagesDataPropsPath $packagesDataPropsPath -NewVersion $localVersion @@ -744,7 +821,7 @@ try { Write-Host "Building Azure generator..." -ForegroundColor Gray $azureGeneratorPath = Join-Path $sdkRepoPath "eng" "packages" "http-client-csharp" - $packagesDataPropsPath = Join-Path $sdkRepoPath "eng" "Packages.Data.props" + $packagesDataPropsPath = Join-Path $sdkRepoPath "eng" "centralpackagemanagement" "Directory.Generation.Packages.props" $azurePackagePath = Update-AzureGenerator ` -AzureGeneratorPath $azureGeneratorPath ` @@ -1011,7 +1088,7 @@ try { "eng/packages/http-client-csharp/package-lock.json" "eng/packages/http-client-csharp-mgmt/package.json" "eng/packages/http-client-csharp-mgmt/package-lock.json" - "eng/Packages.Data.props" + "eng/centralpackagemanagement/Directory.Generation.Packages.props" "NuGet.Config" ) $restoreCmd = "git restore $($filesToRestore -join ' ')" diff --git a/packages/http-client-csharp/eng/scripts/RegenPreview.psm1 b/packages/http-client-csharp/eng/scripts/RegenPreview.psm1 index eec37613623..4f08d46666f 100644 --- a/packages/http-client-csharp/eng/scripts/RegenPreview.psm1 +++ b/packages/http-client-csharp/eng/scripts/RegenPreview.psm1 @@ -189,7 +189,7 @@ function Update-MgmtGenerator { .PARAMETER EngFolder The eng folder path in azure-sdk-for-net. All other paths (mgmt generator, - package paths, Packages.Data.props) are derived from this. + package paths, Directory.Generation.Packages.props) are derived from this. .PARAMETER DebugFolder The debug folder path where the packaged generators (.tgz files) are located. @@ -305,7 +305,7 @@ function Update-AzureGenerator { 2. Runs npm clean, install, and build 3. Packages the Azure generator 4. Builds and packages the Azure.Generator NuGet package - 5. Updates Packages.Data.props with AzureGeneratorVersion + 5. Updates Directory.Generation.Packages.props with AzureGeneratorVersion This function is designed to be called from RegenPreview.ps1. @@ -319,7 +319,7 @@ function Update-AzureGenerator { The debug folder path where packaged artifacts will be stored. .PARAMETER PackagesDataPropsPath - Path to the Packages.Data.props file. + Path to the Directory.Generation.Packages.props file. .PARAMETER LocalVersion The version string to use for the local package (e.g., "1.0.0-alpha.20250127.abc123"). @@ -371,8 +371,8 @@ function Update-AzureGenerator { Write-Host " Azure.Generator NuGet package created" -ForegroundColor Green - # Update Packages.Data.props with Azure generator version - Write-Host "Updating Packages.Data.props..." -ForegroundColor Gray + # Update Directory.Generation.Packages.props with Azure generator version + Write-Host "Updating Directory.Generation.Packages.props..." -ForegroundColor Gray $propsContent = Get-Content $PackagesDataPropsPath -Raw $pattern = '()([^<]+)()' @@ -554,15 +554,24 @@ function Update-OpenAIGenerator { $packageJson | ConvertTo-Json -Depth 100 | Set-Content $codegenPackageJsonPath -Encoding UTF8 - # Delete package-lock.json to force regeneration with new dependencies + # Remove stale node_modules and package-lock.json to ensure clean dependency resolution + Write-Host "Removing stale node_modules and package-lock.json..." -ForegroundColor Gray + $rootNodeModules = Join-Path $OpenAIRepoPath "node_modules" + if (Test-Path $rootNodeModules) { + Remove-Item $rootNodeModules -Recurse -Force + } + $codegenNodeModules = Join-Path $OpenAIRepoPath "codegen" "node_modules" + if (Test-Path $codegenNodeModules) { + Remove-Item $codegenNodeModules -Recurse -Force + } $packageLockPath = Join-Path $OpenAIRepoPath "package-lock.json" if (Test-Path $packageLockPath) { Write-Host "Deleting package-lock.json..." -ForegroundColor Gray Remove-Item $packageLockPath -Force } - # Run npm install to regenerate package-lock.json with local dependencies - Write-Host "Installing dependencies in openai directory..." -ForegroundColor Gray + # Install dependencies + Write-Host "Installing dependencies..." -ForegroundColor Gray Push-Location $OpenAIRepoPath try { $npmOutput = Invoke "npm install" $OpenAIRepoPath @@ -576,25 +585,23 @@ function Update-OpenAIGenerator { Pop-Location } - # Update OpenAI.Library.Plugin.csproj - $pluginCsprojPath = Join-Path $OpenAIRepoPath "codegen" "generator" "src" "OpenAI.Library.Plugin.csproj" - if (-not (Test-Path $pluginCsprojPath)) { - throw "OpenAI.Library.Plugin.csproj not found: $pluginCsprojPath" + # Update Directory.Packages.props + $directoryPackagesPropsPath = Join-Path $OpenAIRepoPath "Directory.Packages.props" + if (-not (Test-Path $directoryPackagesPropsPath)) { + throw "Directory.Packages.props not found: $directoryPackagesPropsPath" } - Write-Host "Updating OpenAI.Library.Plugin.csproj..." -ForegroundColor Gray - [xml]$csproj = Get-Content $pluginCsprojPath + Write-Host "Updating Directory.Packages.props..." -ForegroundColor Gray + $propsContent = Get-Content $directoryPackagesPropsPath -Raw + $pattern = '( + param( + [Parameter(Mandatory=$true)] + [string]$AzureGeneratorPath, + + [Parameter(Mandatory=$true)] + [string]$UnbrandedPackagePath, + + [Parameter(Mandatory=$true)] + [string]$LocalVersion, + + [Parameter(Mandatory=$true)] + [string]$DebugFolder + ) + + $ErrorActionPreference = 'Stop' + + # Derive the azure-sdk-for-net root from the Azure generator path (eng/packages/http-client-csharp) + $sdkRepoPath = Resolve-Path (Join-Path $AzureGeneratorPath ".." ".." "..") + + Write-Host "Azure generator path: $AzureGeneratorPath" -ForegroundColor Gray + Write-Host "Unbranded package: $UnbrandedPackagePath" -ForegroundColor Gray + Write-Host "Local NuGet version: $LocalVersion" -ForegroundColor Gray + Write-Host "" + + $packageJsonPath = Join-Path $AzureGeneratorPath "package.json" + if (-not (Test-Path $packageJsonPath)) { + throw "Azure generator package.json not found: $packageJsonPath" + } + + $originalPackageJson = Get-Content $packageJsonPath -Raw + + # Save original Directory.Generation.Packages.props content for restore + $packagesDataPropsPath = Join-Path $sdkRepoPath "eng" "centralpackagemanagement" "Directory.Generation.Packages.props" + $originalPackagesDataProps = $null + if (Test-Path $packagesDataPropsPath) { + $originalPackagesDataProps = Get-Content $packagesDataPropsPath -Raw + } + + # Save original NuGet.Config content for restore + $nugetConfigPath = Join-Path $sdkRepoPath "NuGet.Config" + $originalNugetConfig = $null + if (Test-Path $nugetConfigPath) { + $originalNugetConfig = Get-Content $nugetConfigPath -Raw + } + + try { + # Step 1: Update Directory.Generation.Packages.props with local NuGet version + if ($originalPackagesDataProps) { + Write-Host "Updating Directory.Generation.Packages.props with local NuGet version..." -ForegroundColor Gray + + $pattern = '()([^<]+)()' + + if ($originalPackagesDataProps -match $pattern) { + $newContent = $originalPackagesDataProps -replace $pattern, "$LocalVersion" + Set-Content $packagesDataPropsPath -Value $newContent -Encoding utf8 -NoNewline + Write-Host " Updated UnbrandedGeneratorVersion to $LocalVersion" -ForegroundColor Green + } else { + throw "UnbrandedGeneratorVersion property not found in $packagesDataPropsPath" + } + } + + # Step 2: Add local NuGet source + if ($originalNugetConfig) { + Write-Host "Adding local NuGet source..." -ForegroundColor Gray + Add-LocalNuGetSource -NuGetConfigPath $nugetConfigPath -SourcePath $DebugFolder + } + + # Step 3: Update package.json to use local unbranded package + Write-Host "Updating Azure generator to use local unbranded package..." -ForegroundColor Gray + $packageJson = $originalPackageJson | ConvertFrom-Json + + $updated = $false + if ($packageJson.dependencies -and $packageJson.dependencies.PSObject.Properties['@typespec/http-client-csharp']) { + $packageJson.dependencies.'@typespec/http-client-csharp' = "file:$UnbrandedPackagePath" + $updated = $true + } + if ($packageJson.devDependencies -and $packageJson.devDependencies.PSObject.Properties['@typespec/http-client-csharp']) { + $packageJson.devDependencies.'@typespec/http-client-csharp' = "file:$UnbrandedPackagePath" + $updated = $true + } + + if (-not $updated) { + throw "@typespec/http-client-csharp not found in Azure generator's dependencies or devDependencies" + } + + $packageJson | ConvertTo-Json -Depth 100 | Set-Content $packageJsonPath -Encoding UTF8 + Write-Host " Updated dependency to local package" -ForegroundColor Green + + # Step 4: Install dependencies + Write-Host "Installing dependencies..." -ForegroundColor Gray + Push-Location $AzureGeneratorPath + try { + $installOutput = & npm install 2>&1 + if ($LASTEXITCODE -ne 0) { + Write-Host $installOutput -ForegroundColor Red + throw "npm install failed in Azure generator" + } + Write-Host " Dependencies installed" -ForegroundColor Green + } + finally { + Pop-Location + } + + # Step 5: Run the Azure generator's Generate.ps1 + $generateScript = Join-Path $AzureGeneratorPath "eng" "scripts" "Generate.ps1" + if (-not (Test-Path $generateScript)) { + throw "Azure generator Generate.ps1 not found: $generateScript" + } + + Write-Host "Running Azure spector generation..." -ForegroundColor Gray + Push-Location $AzureGeneratorPath + try { + $output = & $generateScript -Stubbed $true 2>&1 + if ($LASTEXITCODE -ne 0) { + Write-Host $output -ForegroundColor Red + throw "Azure spector generation failed with exit code $LASTEXITCODE" + } + Write-Host " Spector scenarios regenerated successfully" -ForegroundColor Green + $generationOutput = $output -join "`n" + } + finally { + Pop-Location + } + } + finally { + # Restore all modified files from saved originals + Write-Host "Restoring modified files..." -ForegroundColor Gray + + # Restore package.json + Set-Content $packageJsonPath $originalPackageJson -Encoding utf8 -NoNewline + + # Restore Directory.Generation.Packages.props + if ($originalPackagesDataProps -and (Test-Path $packagesDataPropsPath)) { + Set-Content $packagesDataPropsPath $originalPackagesDataProps -Encoding utf8 -NoNewline + } + + # Restore NuGet.Config + if ($originalNugetConfig -and (Test-Path $nugetConfigPath)) { + Set-Content $nugetConfigPath $originalNugetConfig -Encoding utf8 -NoNewline + } + + # Restore package-lock.json via git (generated file, no original to save) + Push-Location $AzureGeneratorPath + try { + $lockFile = Join-Path $AzureGeneratorPath "package-lock.json" + if (Test-Path $lockFile) { + & git restore "package-lock.json" 2>&1 | Out-Null + } + } + catch { + Write-Warning "Failed to restore package-lock.json: $_" + } + finally { + Pop-Location + } + + Write-Host " All artifacts restored" -ForegroundColor Green + } + + Write-Host "" + return $generationOutput +} + +Export-ModuleMember -Function "Update-MgmtGenerator", "Update-AzureGenerator", "Filter-LibrariesByGenerator", "Update-OpenAIGenerator", "Add-LocalNuGetSource", "Update-AzureSpectorScenarios" diff --git a/packages/http-client-csharp/eng/scripts/Spector-Helper.psm1 b/packages/http-client-csharp/eng/scripts/Spector-Helper.psm1 index eb11f366015..9a0e609b5bd 100644 --- a/packages/http-client-csharp/eng/scripts/Spector-Helper.psm1 +++ b/packages/http-client-csharp/eng/scripts/Spector-Helper.psm1 @@ -1,11 +1,13 @@ $repoRoot = Resolve-Path (Join-Path $PSScriptRoot '..') $failingSpecs = @( - Join-Path 'http' 'payload' 'xml' Join-Path 'http' 'type' 'model' 'flatten' Join-Path 'http' 'type' 'model' 'templated' + Join-Path 'http' 'type' 'file' Join-Path 'http' 'client' 'naming' # pending until https://github.com/microsoft/typespec/issues/5653 is resolved Join-Path 'http' 'streaming' 'jsonl' + Join-Path 'http' 'type' 'union' 'discriminated' # pending design + Join-Path 'http' 'authentication' 'noauth' 'union' # pending design ) $azureAllowSpecs = @( diff --git a/packages/http-client-csharp/eng/scripts/Submit-AzureSdkForNetPr.ps1 b/packages/http-client-csharp/eng/scripts/Submit-AzureSdkForNetPr.ps1 index 221e469b589..e5fd8ac7a53 100755 --- a/packages/http-client-csharp/eng/scripts/Submit-AzureSdkForNetPr.ps1 +++ b/packages/http-client-csharp/eng/scripts/Submit-AzureSdkForNetPr.ps1 @@ -2,7 +2,7 @@ <# .DESCRIPTION -Creates a pull request in the Azure SDK for .NET repository to update the UnbrandedGeneratorVersion property in eng/Packages.Data.props and the @typespec/http-client-csharp dependency in eng/packages/http-client-csharp/package.json. +Creates a pull request in the Azure SDK for .NET repository to update the UnbrandedGeneratorVersion property in eng/centralpackagemanagement/Directory.Generation.Packages.props and the @typespec/http-client-csharp dependency in eng/packages/http-client-csharp/package.json. .PARAMETER PackageVersion The version of the Microsoft.TypeSpec.Generator.ClientModel package to update to. .PARAMETER TypeSpecPRUrl @@ -13,6 +13,12 @@ A GitHub personal access token for authentication. The name of the branch to create in the azure-sdk-for-net repository. .PARAMETER TypeSpecSourcePackageJsonPath The path to the TypeSpec package.json file to use for generating emitter-package.json files. +.PARAMETER RegenerateAzureLibraries +When specified, builds the Azure emitter locally and regenerates Azure data plane SDK libraries. +.PARAMETER RegenerateMgmtLibraries +When specified, builds the management plane emitter locally and regenerates mgmt SDK libraries. Implies Azure emitter build since mgmt depends on it. +.PARAMETER BuildArtifactsPath +Path to the build artifacts directory containing the published .tgz and .nupkg files. Required when RegenerateAzureLibraries or RegenerateMgmtLibraries is specified. #> [CmdletBinding(SupportsShouldProcess = $true)] param( @@ -29,11 +35,25 @@ param( [string]$BranchName = "typespec/update-http-client-$PackageVersion", [Parameter(Mandatory = $false)] - [string]$TypeSpecSourcePackageJsonPath + [string]$TypeSpecSourcePackageJsonPath, + + [Parameter(Mandatory = $false)] + [switch]$Internal, + + [Parameter(Mandatory = $false)] + [switch]$RegenerateAzureLibraries, + + [Parameter(Mandatory = $false)] + [switch]$RegenerateMgmtLibraries, + + [Parameter(Mandatory = $false)] + [string]$BuildArtifactsPath ) # Import the Generation module to use the Invoke helper function Import-Module (Join-Path $PSScriptRoot "Generation.psm1") -DisableNameChecking -Force +# Import RegenPreview module for Update-AzureGenerator and Update-MgmtGenerator +Import-Module (Join-Path $PSScriptRoot "RegenPreview.psm1") -DisableNameChecking -Force # Set up variables for the PR $RepoOwner = "Azure" @@ -42,8 +62,18 @@ $BaseBranch = "main" $PRBranch = $BranchName $PRTitle = "Update UnbrandedGeneratorVersion to $PackageVersion" +if ($Internal) { + $PRTitle = "[DO NOT MERGE] Preview Generator Version $PackageVersion" +} +if ($RegenerateAzureLibraries -and $RegenerateMgmtLibraries) { + $PRTitle += " (Azure data plane + mgmt)" +} elseif ($RegenerateAzureLibraries) { + $PRTitle += " (Azure data plane)" +} elseif ($RegenerateMgmtLibraries) { + $PRTitle += " (Azure mgmt)" +} $PRBody = @" -This PR updates the UnbrandedGeneratorVersion property in eng/Packages.Data.props and the @typespec/http-client-csharp dependency in eng/packages/http-client-csharp/package.json to version $PackageVersion. +This PR updates the UnbrandedGeneratorVersion property in eng/centralpackagemanagement/Directory.Generation.Packages.props and the @typespec/http-client-csharp dependency in eng/packages/http-client-csharp/package.json to version $PackageVersion. ## Details @@ -51,11 +81,30 @@ This PR updates the UnbrandedGeneratorVersion property in eng/Packages.Data.prop ## Changes -- Updated eng/Packages.Data.props UnbrandedGeneratorVersion property +- Updated eng/centralpackagemanagement/Directory.Generation.Packages.props UnbrandedGeneratorVersion property - Updated eng/packages/http-client-csharp/package.json dependency version - Ran npm install to update package-lock.json - Ran eng/packages/http-client-csharp/eng/scripts/Generate.ps1 to regenerate test projects - Generated emitter-package.json artifacts using tsp-client +- Regenerated SDK libraries using the unbranded emitter via dotnet msbuild /t:GenerateCode +$(if ($RegenerateAzureLibraries) { +@" + +### Additional changes (Azure data plane regeneration) +- Built and packaged Azure emitter locally from eng/packages/http-client-csharp +- Updated Azure emitter package artifacts in eng/ +- Regenerated Azure data plane SDK libraries via dotnet msbuild /t:GenerateCode +"@ +}) +$(if ($RegenerateMgmtLibraries) { +@" + +### Additional changes (mgmt regeneration) +- Built and packaged management plane emitter locally from eng/packages/http-client-csharp-mgmt +- Updated mgmt emitter package artifacts in eng/ +- Regenerated mgmt SDK libraries via dotnet msbuild /t:GenerateCode +"@ +}) This is an automated PR created by the TypeSpec publish pipeline. "@ @@ -81,6 +130,15 @@ try { } Push-Location $tempDir + + # Set the authentication token for gh CLI early so that scripts invoked + # during the build (e.g. Emitter_Version_Dashboard.ps1) can call the + # GitHub API to resolve commit hashes in shallow clones. + $env:GH_TOKEN = $AuthToken + + # Configure git user for commits in this repository + git config user.name "azure-sdk" + git config user.email "azuresdk@microsoft.com" # Add the remote git remote add origin "https://github.com/$RepoOwner/$RepoName.git" @@ -95,7 +153,9 @@ try { } # Set the sparse checkout patterns - only the directories we need - git sparse-checkout set eng/packages/http-client-csharp eng sdk/core/Azure.Core/src/Shared sdk/core/Azure.Core.TestFramework/src + # Note: 'eng' covers eng/packages/http-client-csharp, eng/packages/http-client-csharp-mgmt, and all eng/ artifacts + # Note: 'doc/GeneratorVersions' is needed for regenerating the emitter version dashboard + git sparse-checkout set eng sdk/core/Azure.Core/src/Shared sdk/core/Azure.Core.TestFramework/src doc/GeneratorVersions if ($LASTEXITCODE -ne 0) { throw "Failed to set sparse checkout patterns" } @@ -120,12 +180,12 @@ try { throw "Failed to create branch" } - # Update the dependency in eng/Packages.Data.props - Write-Host "Updating dependency version in eng/Packages.Data.props..." - $propsFilePath = Join-Path $tempDir "eng/Packages.Data.props" + # Update the dependency in eng/centralpackagemanagement/Directory.Generation.Packages.props + Write-Host "Updating dependency version in eng/centralpackagemanagement/Directory.Generation.Packages.props..." + $propsFilePath = Join-Path $tempDir "eng/centralpackagemanagement/Directory.Generation.Packages.props" if (-not (Test-Path $propsFilePath)) { - throw "eng/Packages.Data.props not found in the repository" + throw "eng/centralpackagemanagement/Directory.Generation.Packages.props not found in the repository" } $propsFileContent = Get-Content $propsFilePath -Raw @@ -138,7 +198,7 @@ try { $propsFileUpdated = $false if ($updatedContent -eq $propsFileContent) { - Write-Warning "No changes were made to eng/Packages.Data.props. The UnbrandedGeneratorVersion property might not exist or have a different format." + Write-Warning "No changes were made to eng/centralpackagemanagement/Directory.Generation.Packages.props. The UnbrandedGeneratorVersion property might not exist or have a different format." Write-Host "Current content around UnbrandedGeneratorVersion:" $propsFileContent | Select-String -Pattern "UnbrandedGeneratorVersion" -Context 2, 2 } else { @@ -179,16 +239,54 @@ try { $installSucceeded = $true if ($packageJsonUpdated) { # Run npm install in the http-client-csharp directory - Write-Host "Running npm install in eng/packages/http-client-csharp..." + Write-Host "##[section]Running npm install in eng/packages/http-client-csharp..." $httpClientDir = Join-Path $tempDir "eng/packages/http-client-csharp" + + # Copy .npmrc file from source directory if it exists (for internal builds) + $sourceNpmrcPath = Join-Path $PSScriptRoot "../../.npmrc" + $targetNpmrcPath = Join-Path $httpClientDir ".npmrc" + + if (Test-Path $sourceNpmrcPath) { + Write-Host "Copying .npmrc from source directory to cloned repo..." + Copy-Item -Path $sourceNpmrcPath -Destination $targetNpmrcPath -Force + Write-Host "Successfully copied .npmrc to: $targetNpmrcPath" + } else { + Write-Host "No .npmrc file found in source directory - will use default npm registry" + } + + # Log npm configuration before install + Write-Host "##[group]NPM Configuration Check" + Write-Host "Working directory: $httpClientDir" + + # Check for .npmrc file in the directory + $npmrcPath = Join-Path $httpClientDir ".npmrc" + if (Test-Path $npmrcPath) { + Write-Host "Found .npmrc file at: $npmrcPath" + } else { + Write-Host "No .npmrc file found in working directory - will use default npm registry" + } + + # Show what registry npm will use + Push-Location $httpClientDir + try { + $currentRegistry = npm config get registry 2>&1 + Write-Host "Current npm registry: $currentRegistry" + } finally { + Pop-Location + } + Write-Host "##[endgroup]" + $previousErrorAction = $ErrorActionPreference $ErrorActionPreference = "Continue" try { - Invoke "npm install" $httpClientDir + Write-Host "Running: npm install --verbose" + Invoke "npm install --verbose" $httpClientDir if ($LASTEXITCODE -ne 0) { Write-Warning "npm install failed with exit code $LASTEXITCODE, skipping generation." Write-Host "##vso[task.complete result=SucceededWithIssues;]" $installSucceeded = $false + } else { + Write-Host "##[section]npm install completed successfully" } } catch { Write-Warning "npm install failed: $($_.Exception.Message), skipping generation." @@ -246,19 +344,226 @@ try { # Generate emitter-package.json files using tsp-client if TypeSpec package.json is provided if ($TypeSpecSourcePackageJsonPath -and (Test-Path $TypeSpecSourcePackageJsonPath)) { - Write-Host "Generating emitter-package.json files using tsp-client..." + Write-Host "##[section]Generating emitter-package.json files using tsp-client..." + + Write-Host "Source package.json: $TypeSpecSourcePackageJsonPath" + Write-Host "Package version being installed: $PackageVersion" + $configFilesOutputDir = Join-Path $tempDir "eng" $emitterPackageJsonPath = Join-Path $configFilesOutputDir "http-client-csharp-emitter-package.json" + + # Set NPM_CONFIG_USERCONFIG to point to our .npmrc so tsp-client's internal npm install + # can resolve packages from Azure Artifacts. tsp-client creates a temp directory for + # npm install, so a project-level .npmrc in the eng directory won't be found. + $sourceNpmrcPath = Join-Path $PSScriptRoot "../../.npmrc" + $previousNpmConfigUserconfig = $env:NPM_CONFIG_USERCONFIG + + if (Test-Path $sourceNpmrcPath) { + $resolvedNpmrcPath = (Resolve-Path $sourceNpmrcPath).Path + Write-Host "Setting NPM_CONFIG_USERCONFIG to use .npmrc for tsp-client package resolution..." + Write-Host " Source .npmrc: $resolvedNpmrcPath" + $env:NPM_CONFIG_USERCONFIG = $resolvedNpmrcPath + + Write-Host "npm registry for tsp-client:" + npm config get registry + } else { + Write-Host "No .npmrc file found - tsp-client will use default npm registry" + } - Invoke "tsp-client generate-config-files --package-json $TypeSpecSourcePackageJsonPath --emitter-package-json-path $emitterPackageJsonPath --output-dir $configFilesOutputDir" $tempDir - if ($LASTEXITCODE -ne 0) { - throw "Failed to generate emitter-package.json files" + try { + Invoke "tsp-client generate-config-files --package-json $TypeSpecSourcePackageJsonPath --emitter-package-json-path $emitterPackageJsonPath --output-dir $configFilesOutputDir" $tempDir + if ($LASTEXITCODE -ne 0) { + throw "Failed to generate emitter-package.json files" + } + Write-Host "Successfully generated emitter-package.json files" + } finally { + # Restore previous NPM_CONFIG_USERCONFIG + $env:NPM_CONFIG_USERCONFIG = $previousNpmConfigUserconfig } - Write-Host "Successfully generated emitter-package.json files" } else { Write-Warning "TypeSpecSourcePackageJsonPath not provided or file doesn't exist. Skipping emitter-package.json generation." } + # Regenerate all SDK libraries that use the unbranded emitter + if ($installSucceeded) { + Write-Host "Expanding sparse checkout to include sdk directory for SDK regeneration..." + git sparse-checkout add sdk + if ($LASTEXITCODE -ne 0) { + Write-Warning "Failed to expand sparse checkout. Skipping SDK regeneration." + Write-Host "##vso[task.complete result=SucceededWithIssues;]" + } else { + # Build the emitter patterns to match in tsp-location.yaml + $emitterPatterns = @("eng/http-client-csharp-emitter-package.json") + + if ($RegenerateAzureLibraries -or $RegenerateMgmtLibraries) { + $regenScope = @() + if ($RegenerateAzureLibraries) { $regenScope += "Azure data plane" } + if ($RegenerateMgmtLibraries) { $regenScope += "mgmt" } + Write-Host "##[section]Building emitters locally for: $($regenScope -join ', ')..." + + # Locate the unbranded .tgz and .nupkg files from build artifacts + if (-not $BuildArtifactsPath -or -not (Test-Path $BuildArtifactsPath)) { + throw "BuildArtifactsPath is required when RegenerateAzureLibraries or RegenerateMgmtLibraries is specified. Path: $BuildArtifactsPath" + } + + $debugFolder = Join-Path ([System.IO.Path]::GetTempPath()) "csharp-debug-$(Get-Date -Format 'yyyyMMdd-HHmmss')" + New-Item -ItemType Directory -Path $debugFolder -Force | Out-Null + + # Find unbranded .tgz from build artifacts + $unbrandedTgz = Get-ChildItem -Path $BuildArtifactsPath -Filter "typespec-http-client-csharp-*.tgz" -Recurse | Select-Object -First 1 + if (-not $unbrandedTgz) { + throw "Could not find unbranded emitter .tgz in build artifacts at: $BuildArtifactsPath" + } + $unbrandedPackagePath = $unbrandedTgz.FullName + Write-Host "Using unbranded package from build artifacts: $unbrandedPackagePath" + + # Copy .nupkg files from build artifacts to debug folder + $nupkgFiles = Get-ChildItem -Path $BuildArtifactsPath -Filter "*.nupkg" -Recurse + foreach ($nupkg in $nupkgFiles) { + Copy-Item $nupkg.FullName -Destination $debugFolder -Force + Write-Host "Copied NuGet package: $($nupkg.Name)" + } + + # Build and package Azure generator (needed for both Azure data plane and mgmt) + $azureGeneratorPath = Join-Path $tempDir "eng" "packages" "http-client-csharp" + $packagesDataPropsPath = Join-Path $tempDir "eng" "centralpackagemanagement" "Directory.Generation.Packages.props" + + Write-Host "##[section]Building Azure generator..." + $previousErrorAction = $ErrorActionPreference + $ErrorActionPreference = "Continue" + try { + $azurePackagePath = Update-AzureGenerator ` + -AzureGeneratorPath $azureGeneratorPath ` + -UnbrandedPackagePath $unbrandedPackagePath ` + -DebugFolder $debugFolder ` + -PackagesDataPropsPath $packagesDataPropsPath ` + -LocalVersion $PackageVersion + Write-Host "Azure generator built successfully" + + # Update Azure emitter package artifacts + Write-Host "Updating Azure emitter package artifacts..." + $engFolder = Join-Path $tempDir "eng" + $azureTempDir = Join-Path $engFolder "temp-azure-package-update" + New-Item -ItemType Directory -Path $azureTempDir -Force | Out-Null + + try { + $azureEmitterJson = Join-Path $engFolder "azure-typespec-http-client-csharp-emitter-package.json" + $tempPackageJson = Join-Path $azureTempDir "package.json" + + Copy-Item $azureEmitterJson $tempPackageJson -Force + + Push-Location $azureTempDir + try { + Invoke "npm install `"`"file:$azurePackagePath`"`" --package-lock-only" $azureTempDir + + Copy-Item $tempPackageJson $azureEmitterJson -Force + $lockFile = Join-Path $azureTempDir "package-lock.json" + if (Test-Path $lockFile) { + $azureLockJson = Join-Path $engFolder "azure-typespec-http-client-csharp-emitter-package-lock.json" + Copy-Item $lockFile $azureLockJson -Force + } + } finally { + Pop-Location + } + } finally { + Remove-Item $azureTempDir -Recurse -Force -ErrorAction SilentlyContinue + } + + if ($RegenerateAzureLibraries) { + $emitterPatterns += "eng/azure-typespec-http-client-csharp-emitter-package.json" + } + + # Add NuGet source for local packages + $nugetConfigPath = Join-Path $tempDir "NuGet.Config" + if (Test-Path $nugetConfigPath) { + Add-LocalNuGetSource -NuGetConfigPath $nugetConfigPath -SourcePath $debugFolder + } + } catch { + Write-Warning "Failed to build Azure generator: $($_.Exception.Message). Continuing without Azure library regeneration." + Write-Host "##vso[task.complete result=SucceededWithIssues;]" + } finally { + $ErrorActionPreference = $previousErrorAction + } + + # Build and package management plane generator (only when mgmt is requested) + if ($RegenerateMgmtLibraries) { + $mgmtGeneratorPath = Join-Path $tempDir "eng" "packages" "http-client-csharp-mgmt" + if (Test-Path $mgmtGeneratorPath) { + Write-Host "##[section]Building management plane generator..." + $previousErrorAction = $ErrorActionPreference + $ErrorActionPreference = "Continue" + try { + $engFolder = Join-Path $tempDir "eng" + Update-MgmtGenerator ` + -EngFolder $engFolder ` + -DebugFolder $debugFolder ` + -LocalVersion $PackageVersion + Write-Host "Management plane generator built successfully" + + $emitterPatterns += "eng/azure-typespec-http-client-csharp-mgmt-emitter-package.json" + } catch { + Write-Warning "Failed to build management plane generator: $($_.Exception.Message). Continuing without mgmt library regeneration." + Write-Host "##vso[task.complete result=SucceededWithIssues;]" + } finally { + $ErrorActionPreference = $previousErrorAction + } + } else { + Write-Host "Management plane generator not found at $mgmtGeneratorPath, skipping..." + } + } + } + + # Discover service directories with tsp-location.yaml referencing any of the matched emitter patterns + $tspLocations = Get-ChildItem -Path (Join-Path $tempDir "sdk") -Filter "tsp-location.yaml" -Recurse + $serviceDirectories = @() + foreach ($tspLocation in $tspLocations) { + $content = Get-Content $tspLocation.FullName -Raw + $matched = $false + foreach ($pattern in $emitterPatterns) { + if ($content -match [regex]::Escape($pattern)) { + $matched = $true + break + } + } + if ($matched) { + $relativePath = $tspLocation.DirectoryName -replace ".*[\\/]sdk[\\/]", "" + $serviceDirectory = $relativePath -replace "[\\/].*", "" + if ($serviceDirectories -notcontains $serviceDirectory) { + $serviceDirectories += $serviceDirectory + } + } + } + + if ($serviceDirectories.Count -eq 0) { + Write-Host "No SDK libraries found matching emitter patterns. Skipping SDK regeneration." + } else { + $serviceProj = Join-Path $tempDir "eng/service.proj" + foreach ($serviceDirectory in $serviceDirectories) { + Write-Host "Regenerating code for service directory: $serviceDirectory" + $previousErrorAction = $ErrorActionPreference + $ErrorActionPreference = "Continue" + try { + Invoke "dotnet msbuild $serviceProj /restore /t:GenerateCode /p:ServiceDirectory=$serviceDirectory" $tempDir + if ($LASTEXITCODE -ne 0) { + Write-Warning "Code generation failed for $serviceDirectory with exit code $LASTEXITCODE. Continuing with next service directory." + Write-Host "##vso[task.complete result=SucceededWithIssues;]" + } + } catch { + Write-Warning "Code generation failed for $serviceDirectory`: $($_.Exception.Message). Continuing with next service directory." + Write-Host "##vso[task.complete result=SucceededWithIssues;]" + } finally { + $ErrorActionPreference = $previousErrorAction + } + } + } + } + } + + # Regenerate the emitter version dashboard + Write-Host "Regenerating emitter version dashboard..." + $dashboardScript = Join-Path $tempDir "doc/GeneratorVersions/Emitter_Version_Dashboard.ps1" + & $dashboardScript -RepoRoot $tempDir + # Check if there are changes to commit $gitStatus = git status --porcelain if (-not $gitStatus) { @@ -295,12 +600,53 @@ try { git add $emitterPackageLockPath } + # Add Azure and mgmt emitter artifacts if they were updated + if ($RegenerateAzureLibraries -or $RegenerateMgmtLibraries) { + $azureEmitterFiles = @( + "eng/azure-typespec-http-client-csharp-emitter-package.json", + "eng/azure-typespec-http-client-csharp-emitter-package-lock.json", + "eng/centralpackagemanagement/Directory.Generation.Packages.props", + "NuGet.Config" + ) + if ($RegenerateMgmtLibraries) { + $azureEmitterFiles += @( + "eng/azure-typespec-http-client-csharp-mgmt-emitter-package.json", + "eng/azure-typespec-http-client-csharp-mgmt-emitter-package-lock.json" + ) + } + foreach ($file in $azureEmitterFiles) { + $filePath = Join-Path $tempDir $file + if (Test-Path $filePath) { + git add $filePath + } + } + } + + # Add any SDK regeneration changes + $sdkPath = Join-Path $tempDir "sdk" + if (Test-Path $sdkPath) { + git add $sdkPath + } + + # Add the regenerated dashboard + $dashboardPath = Join-Path $tempDir "doc/GeneratorVersions/Emitter_Version_Dashboard.md" + if (Test-Path $dashboardPath) { + git add $dashboardPath + } + if ($LASTEXITCODE -ne 0) { throw "Failed to add changes" } # Build commit message based on what was updated $commitMessage = "Update UnbrandedGeneratorVersion to $PackageVersion" + if ($RegenerateAzureLibraries -and $RegenerateMgmtLibraries) { + $commitMessage = "Update GeneratorVersion to $PackageVersion (all libraries)" + } elseif ($RegenerateAzureLibraries) { + $commitMessage = "Update GeneratorVersion to $PackageVersion (Azure data plane)" + } elseif ($RegenerateMgmtLibraries) { + $commitMessage = "Update GeneratorVersion to $PackageVersion (Azure mgmt)" + } git commit -m $commitMessage if ($LASTEXITCODE -ne 0) { @@ -318,11 +664,12 @@ try { # Create PR using GitHub CLI Write-Host "Creating PR in $RepoOwner/$RepoName using gh CLI..." - # Set the authentication token for gh CLI - $env:GH_TOKEN = $AuthToken - # Create the PR using gh CLI - $ghOutput = gh pr create --repo "$RepoOwner/$RepoName" --title $PRTitle --body $PRBody --base $BaseBranch --head $PRBranch 2>&1 + $ghArgs = @("pr", "create", "--repo", "$RepoOwner/$RepoName", "--title", $PRTitle, "--body", $PRBody, "--base", $BaseBranch, "--head", $PRBranch) + if ($Internal) { + $ghArgs += @("--label", "Do Not Merge") + } + $ghOutput = & gh @ghArgs 2>&1 if ($LASTEXITCODE -ne 0) { throw "Failed to create PR using gh CLI: $ghOutput" diff --git a/packages/http-client-csharp/eng/scripts/Update-PackageJson.ps1 b/packages/http-client-csharp/eng/scripts/Update-PackageJson.ps1 index f8607498168..9f45df340e8 100644 --- a/packages/http-client-csharp/eng/scripts/Update-PackageJson.ps1 +++ b/packages/http-client-csharp/eng/scripts/Update-PackageJson.ps1 @@ -25,6 +25,9 @@ param( $ErrorActionPreference = 'Stop' Set-StrictMode -Version 3.0 +# Internal dev feed for npm package resolution +$DevFeedUrl = "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js/npm/registry/" + # Define the list of dependencies to inject $InjectedDependencies = @( '@azure-tools/typespec-azure-core', @@ -41,7 +44,7 @@ function Test-PackageVersion { ) Write-Host "Checking if $PackageName@$Version exists..." - $checkResult = & npm view "$PackageName@$Version" version 2>&1 + $checkResult = & npm view "$PackageName@$Version" version --registry $DevFeedUrl 2>&1 if ($LASTEXITCODE -eq 0) { Write-Host "✓ Found $PackageName@$Version" @@ -61,7 +64,7 @@ function Get-PackageDependencyVersion { ) Write-Host "Getting $DependencyName version from $PackageName@$PackageVersion..." - $result = & npm view "$PackageName@$PackageVersion" devDependencies.$DependencyName 2>&1 + $result = & npm view "$PackageName@$PackageVersion" devDependencies.$DependencyName --registry $DevFeedUrl 2>&1 if ($LASTEXITCODE -eq 0 -and $result) { $dependencyVersion = $result.Trim() @@ -74,6 +77,90 @@ function Get-PackageDependencyVersion { } } +# Function to get the latest GA (non-prerelease) version of a package +function Get-LatestGAVersion { + param( + [string]$PackageName + ) + + Write-Host "Getting latest GA version for $PackageName..." + $result = & npm view $PackageName dist-tags.latest --registry $DevFeedUrl 2>&1 + + if ($LASTEXITCODE -eq 0 -and $result) { + $latestVersion = $result.Trim() + Write-Host "Found latest GA version for ${PackageName}: $latestVersion" + return $latestVersion + } else { + Write-Warning "Could not determine latest GA version for $PackageName" + return $null + } +} + +# Function to check if a dependency version's peer dep on tcgc is satisfied by our tcgcVersion +function Test-TcgcCompatibility { + param( + [string]$PackageName, + [string]$PackageVersion, + [string]$TcgcVersion + ) + + Write-Host "Checking if $PackageName@$PackageVersion is compatible with tcgc@$TcgcVersion..." + $tcgcRange = & npm view "${PackageName}@${PackageVersion}" "peerDependencies.@azure-tools/typespec-client-generator-core" --registry $DevFeedUrl 2>&1 + + if ($LASTEXITCODE -ne 0 -or -not $tcgcRange) { + Write-Host " No tcgc peer dependency found, assuming compatible" + return $true + } + + $tcgcRange = ($tcgcRange | Out-String).Trim() + Write-Host " Requires tcgc: $tcgcRange" + + $semverResult = & npx semver -r $tcgcRange $TcgcVersion 2>&1 + + if ($LASTEXITCODE -eq 0 -and $semverResult) { + Write-Host " ✓ Compatible" + return $true + } else { + Write-Host " ✗ Not compatible" + return $false + } +} + +# Function to get previous GA versions of a package sorted descending, before a given version +function Get-PreviousGAVersions { + param( + [string]$PackageName, + [string]$BeforeVersion + ) + + Write-Host "Getting previous GA versions of $PackageName (before $BeforeVersion)..." + $result = & npm view $PackageName versions --json --registry $DevFeedUrl 2>&1 + + if ($LASTEXITCODE -ne 0) { + Write-Warning "Could not retrieve versions for $PackageName" + return @() + } + + $allVersions = ($result | Out-String) | ConvertFrom-Json + + if ($allVersions -isnot [array]) { + $allVersions = @($allVersions) + } + + # Filter to GA only (no prerelease) and versions strictly less than BeforeVersion + $gaVersions = @($allVersions | Where-Object { + $_ -notmatch '-' -and ([version]$_ -lt [version]$BeforeVersion) + } | Sort-Object { [version]$_ } -Descending) + + if ($gaVersions.Count -gt 0) { + Write-Host " Found $($gaVersions.Count) previous GA version(s), most recent: $($gaVersions[0])" + } else { + Write-Host " No previous GA versions found" + } + + return $gaVersions +} + # Resolve paths $PackageJsonPath = Resolve-Path $PackageJsonPath @@ -121,22 +208,53 @@ try { $dependencyVersions = @{} foreach ($dependency in $InjectedDependencies) { - $versionToUse = $tcgcVersion + $versionToUse = $null + + # 1. Try the tcgc version if it exists and is compatible with our tcgc + if ((Test-PackageVersion -PackageName $dependency -Version $tcgcVersion) -and + (Test-TcgcCompatibility -PackageName $dependency -PackageVersion $tcgcVersion -TcgcVersion $tcgcVersion)) { + $versionToUse = $tcgcVersion + } + + # 2. Search up to 2 previous GA versions for one compatible with our tcgc + if (-not $versionToUse) { + Write-Host "Searching previous GA versions of $dependency compatible with tcgc@$tcgcVersion..." + $previousVersions = Get-PreviousGAVersions -PackageName $dependency -BeforeVersion $tcgcVersion + $attempts = 0 + foreach ($prevVersion in $previousVersions) { + if ($attempts -ge 2) { break } + $attempts++ + + if (Test-TcgcCompatibility -PackageName $dependency -PackageVersion $prevVersion -TcgcVersion $tcgcVersion) { + $versionToUse = $prevVersion + Write-Host "Found compatible previous version: $dependency@$prevVersion" + break + } + } + } - # Check if the tcgc version exists for this dependency - if (-not (Test-PackageVersion -PackageName $dependency -Version $tcgcVersion)) { - Write-Warning "Version $tcgcVersion not found for $dependency" - - # Use the version from tcgc's @azure-tools/typespec-azure-core dependency as fallback - if ($fallbackVersion) { - Write-Host "Using fallback version $fallbackVersion for all injected dependencies" + # 3. Fallback: use the version from tcgc's azure-core dependency + if (-not $versionToUse -and $fallbackVersion) { + if (Test-PackageVersion -PackageName $dependency -Version $fallbackVersion) { + Write-Host "Using fallback version $fallbackVersion for $dependency" $versionToUse = $fallbackVersion - } else { - Write-Error "Could not determine a valid version for $dependency (no fallback available)" - exit 1 } } + # 4. Final fallback: latest GA version + if (-not $versionToUse) { + $latestGA = Get-LatestGAVersion -PackageName $dependency + if ($latestGA) { + Write-Host "Using latest GA version $latestGA for $dependency" + $versionToUse = $latestGA + } + } + + if (-not $versionToUse) { + Write-Error "Could not determine a valid version for $dependency (no fallback available)" + exit 1 + } + # Store the version to use for this dependency $dependencyVersions[$dependency] = $versionToUse @@ -168,7 +286,7 @@ try { # Validate dependencies by running npm install Write-Host "Validating dependencies with npm install..." - $npmInstallResult = & npm install 2>&1 + $npmInstallResult = & npm install --registry $DevFeedUrl 2>&1 if ($LASTEXITCODE -ne 0) { Write-Error "npm install failed after injecting dependencies: $npmInstallResult" exit 1 @@ -179,4 +297,4 @@ try { catch { Write-Error "Script failed with error: $_" exit 1 -} \ No newline at end of file +} diff --git a/packages/http-client-csharp/eng/scripts/docs/RegenPreview.md b/packages/http-client-csharp/eng/scripts/docs/RegenPreview.md index 38092a1b997..f9f42de05b1 100644 --- a/packages/http-client-csharp/eng/scripts/docs/RegenPreview.md +++ b/packages/http-client-csharp/eng/scripts/docs/RegenPreview.md @@ -2,10 +2,11 @@ ## Overview -`RegenPreview.ps1` is a PowerShell script that automates the process of building local generator packages and regenerating libraries for validation purposes. This script supports two modes: +`RegenPreview.ps1` is a PowerShell script that automates the process of building local generator packages and regenerating libraries for validation purposes. This script supports three modes: - **Azure SDK Mode**: Regenerate Azure SDK for .NET libraries - **OpenAI Mode**: Regenerate the OpenAI .NET library +- **Spector Mode**: Regenerate Azure spector test scenarios in azure-sdk-for-net This script is designed to streamline the workflow for testing changes to the TypeSpec HTTP Client C# generator before submitting a pull request. @@ -28,6 +29,14 @@ When making changes to the TypeSpec HTTP Client C# generator, it may be helpful 4. Regenerating the OpenAI library using Invoke-CodeGen.ps1 5. Cleaning up all modifications after validation +### Spector Mode + +1. Building local version of the unbranded generator package +2. Building local NuGet framework packages +3. Wiring the Azure generator in azure-sdk-for-net to use local packages +4. Running the Azure generator's Generate.ps1 to regenerate spector test scenarios +5. Cleaning up all modifications after validation + ## Prerequisites - **PowerShell 7.0 or later** (cross-platform: Windows, Linux, macOS) @@ -155,6 +164,20 @@ Not applicable in OpenAI mode. .\RegenPreview.ps1 -SdkLibraryRepoPath "C:\repos\azure-sdk-for-net" -Mgmt ``` +#### `-Spector` (Optional) + +**Azure SDK Mode only.** When specified, regenerates the Azure spector test scenarios in azure-sdk-for-net instead of regenerating SDK libraries. This builds the local unbranded generator, wires it into the Azure generator, and runs the Azure generator's Generate.ps1 to regenerate spector test projects. + +Mutually exclusive with `-Select`, `-Azure`, `-Unbranded`, and `-Mgmt`. + +Not applicable in OpenAI mode. + +**Example:** + +```powershell +.\RegenPreview.ps1 -SdkLibraryRepoPath "C:\repos\azure-sdk-for-net" -Spector +``` + ### Interactive Selection When running with the `-Select` flag, the script presents an interactive menu listing all available libraries: @@ -228,7 +251,7 @@ The script performs the following steps in sequence when the repository path poi - `Microsoft.TypeSpec.Generator.ClientModel` - Uses Debug configuration with `--no-build` (reuses binaries from Step 1) - Outputs `.nupkg` files to the `debug` folder -- In Azure SDK mode: Updates `Packages.Data.props` and `NuGet.Config` +- In Azure SDK mode: Updates `Directory.Generation.Packages.props` and `NuGet.Config` - In OpenAI mode: Proceeds to Step 3 (OpenAI regeneration) --- @@ -305,7 +328,7 @@ In Azure SDK mode, the script continues with additional steps after Step 2.5: - Updates eng folder emitter package artifacts: - `azure-typespec-http-client-csharp-mgmt-emitter-package.json` - `azure-typespec-http-client-csharp-mgmt-emitter-package-lock.json` -- Updates `Packages.Data.props` in azure-sdk-for-net with `AzureGeneratorVersion` property +- Updates `Directory.Generation.Packages.props` in azure-sdk-for-net with `AzureGeneratorVersion` property - This version is used by management plane libraries that reference the `Azure.Generator` NuGet package - This step is skipped if the management plane generator directory doesn't exist @@ -351,7 +374,7 @@ If all libraries regenerate successfully, the script restores modified files: - `eng/packages/http-client-csharp/package-lock.json` - `eng/packages/http-client-csharp-mgmt/package.json` - `eng/packages/http-client-csharp-mgmt/package-lock.json` -- `eng/Packages.Data.props` +- `eng/centralpackagemanagement/Directory.Generation.Packages.props` - `NuGet.Config` **Note:** If any libraries fail, artifacts are NOT restored, allowing you to debug the issue with the modified configuration intact. @@ -437,3 +460,10 @@ Detailed report saved to: C:\...\debug\regen-report.json ```powershell .\RegenPreview.ps1 -SdkLibraryRepoPath "C:\repos\azure-sdk-for-net" ``` + +### Scenario 4: Regenerate Azure Spector Test Scenarios + +```powershell +# Validate that local changes don't break Azure spector test scenarios +.\RegenPreview.ps1 -SdkLibraryRepoPath "C:\repos\azure-sdk-for-net" -Spector +``` diff --git a/packages/http-client-csharp/generated-defs/TypeSpec.HttpClient.CSharp.ts b/packages/http-client-csharp/generated-defs/TypeSpec.HttpClient.CSharp.ts index 76b42972fcf..8089a3929f5 100644 --- a/packages/http-client-csharp/generated-defs/TypeSpec.HttpClient.CSharp.ts +++ b/packages/http-client-csharp/generated-defs/TypeSpec.HttpClient.CSharp.ts @@ -1,4 +1,9 @@ -import type { DecoratorContext, Model, Namespace } from "@typespec/compiler"; +import type { + DecoratorContext, + DecoratorValidatorCallbacks, + Model, + Namespace, +} from "@typespec/compiler"; /** * Marks a model or namespace as dynamic, indicating it should generate dynamic model code. @@ -20,7 +25,10 @@ import type { DecoratorContext, Model, Namespace } from "@typespec/compiler"; * } * ``` */ -export type DynamicModelDecorator = (context: DecoratorContext, target: Model | Namespace) => void; +export type DynamicModelDecorator = ( + context: DecoratorContext, + target: Model | Namespace, +) => DecoratorValidatorCallbacks | void; export type TypeSpecHttpClientCSharpDecorators = { dynamicModel: DynamicModelDecorator; diff --git a/packages/http-client-csharp/generated-defs/TypeSpec.HttpClient.CSharp.ts-test.ts b/packages/http-client-csharp/generated-defs/TypeSpec.HttpClient.CSharp.ts-test.ts index 91be891162c..3b48cb2111d 100644 --- a/packages/http-client-csharp/generated-defs/TypeSpec.HttpClient.CSharp.ts-test.ts +++ b/packages/http-client-csharp/generated-defs/TypeSpec.HttpClient.CSharp.ts-test.ts @@ -7,4 +7,4 @@ import type { TypeSpecHttpClientCSharpDecorators } from "./TypeSpec.HttpClient.C /** * An error here would mean that the exported decorator is not using the same signature. Make sure to have export const $decName: DecNameDecorator = (...) => ... */ -const _: TypeSpecHttpClientCSharpDecorators = $decorators["TypeSpec.HttpClient.CSharp"]; +const _decs: TypeSpecHttpClientCSharpDecorators = $decorators["TypeSpec.HttpClient.CSharp"]; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel.StubLibrary/src/StubLibraryVisitor.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel.StubLibrary/src/StubLibraryVisitor.cs index c3ea6a82987..a24a1b21c42 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel.StubLibrary/src/StubLibraryVisitor.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel.StubLibrary/src/StubLibraryVisitor.cs @@ -46,6 +46,7 @@ internal class StubLibraryVisitor : ScmLibraryVisitor if (!IsCallingBaseCtor(constructor) && !IsEffectivelyPublic(constructor.Signature.Modifiers) && !IsParameterlessInternalCtorOnMrwSerializationType(constructor) && + !IsInternalClientConstructor(constructor) && (constructor.EnclosingType is not ModelProvider model || model.DerivedModels.Count == 0)) return null; @@ -57,6 +58,14 @@ internal class StubLibraryVisitor : ScmLibraryVisitor return constructor; } + private static bool IsInternalClientConstructor(ConstructorProvider constructor) + { + if (!constructor.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Internal)) + return false; + + return constructor.EnclosingType is ClientProvider; + } + private static bool IsParameterlessInternalCtorOnMrwSerializationType(ConstructorProvider constructor) { if (constructor.Signature.Parameters.Count != 0) @@ -78,7 +87,13 @@ private static bool IsCallingBaseCtor(ConstructorProvider constructor) protected override FieldProvider? VisitField(FieldProvider field) { // For ClientOptions, keep the non-public field as this currently represents the latest service version for a client. - return (field.Modifiers.HasFlag(FieldModifiers.Public) || field.EnclosingType.BaseType?.Equals(typeof(ClientPipelineOptions)) == true) + // For ClientProvider, keep const and static fields as they are referenced by stub constructor initializers + // (e.g. AuthorizationHeader const used in this() API key ctor, _flows static used in this() OAuth2 ctor). + return (field.Modifiers.HasFlag(FieldModifiers.Public) + || field.EnclosingType.BaseType?.Equals(typeof(ClientPipelineOptions)) == true + || (field.EnclosingType is ClientProvider + && (field.Modifiers.HasFlag(FieldModifiers.Const) + || field.Modifiers.HasFlag(FieldModifiers.Static)))) ? field : null; } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ConfigurationSchemaGenerator.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ConfigurationSchemaGenerator.cs new file mode 100644 index 00000000000..1eb7b022861 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ConfigurationSchemaGenerator.cs @@ -0,0 +1,456 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json; +using System.Text.Json.Nodes; +using Microsoft.TypeSpec.Generator.ClientModel.Providers; +using Microsoft.TypeSpec.Generator.Input.Extensions; +using Microsoft.TypeSpec.Generator.Primitives; +using Microsoft.TypeSpec.Generator.Providers; + +namespace Microsoft.TypeSpec.Generator.ClientModel +{ + /// + /// Generates a ConfigurationSchema.json file for JSON IntelliSense support in appsettings.json. + /// The schema defines well-known client names and their configuration properties. + /// Common definitions (credential, options) are inherited from the System.ClientModel base schema + /// and not duplicated here. Only additional types specific to the generated client (e.g., enums, + /// custom models) are defined locally. + /// + internal static class ConfigurationSchemaGenerator + { + internal const string DefaultSectionName = "Clients"; + internal const string DefaultOptionsRef = "options"; + + private static readonly JsonSerializerOptions s_jsonOptions = new() + { + WriteIndented = true + }; + + /// + /// Generates the ConfigurationSchema.json content based on the output library's type providers. + /// Returns null if no clients with are found. + /// + internal static string? Generate(OutputLibrary output, string sectionName = DefaultSectionName, string optionsRef = DefaultOptionsRef) + { + var clientsWithSettings = output.TypeProviders + .OfType() + .Where(c => c.ClientSettings != null && c.DeclarationModifiers.HasFlag(TypeSignatureModifiers.Public)) + .ToList(); + + if (clientsWithSettings.Count == 0) + { + return null; + } + + var schema = BuildSchema(clientsWithSettings, sectionName, optionsRef); + return JsonSerializer.Serialize(schema, s_jsonOptions).ReplaceLineEndings("\n") + "\n"; + } + + private static JsonObject BuildSchema( + List clients, + string sectionName, + string optionsRef) + { + // Collect local definitions for non-base types during schema generation + var localDefinitions = new Dictionary(); + var clientProperties = new JsonObject(); + + foreach (var client in clients) + { + var clientEntry = BuildClientEntry(client, optionsRef, localDefinitions); + clientProperties[client.Name] = clientEntry; + } + + var schema = new JsonObject + { + ["type"] = "object", + ["properties"] = new JsonObject + { + [sectionName] = new JsonObject + { + ["type"] = "object", + ["properties"] = clientProperties, + ["additionalProperties"] = new JsonObject + { + ["type"] = "object", + ["description"] = "Configuration for a named client instance." + } + } + } + }; + + // Add local definitions only for types not covered by the base schema + if (localDefinitions.Count > 0) + { + var definitions = new JsonObject(); + foreach (var (name, definition) in localDefinitions.OrderBy(kvp => kvp.Key)) + { + definitions[name] = definition; + } + schema["definitions"] = definitions; + } + + return schema; + } + + private static JsonObject BuildClientEntry(ClientProvider client, string optionsRef, Dictionary localDefinitions) + { + var settings = client.ClientSettings!; + var properties = new JsonObject(); + + // Add endpoint property (Name is already transformed by PropertyProvider construction) + if (settings.EndpointProperty != null) + { + properties[settings.EndpointProperty.Name] = BuildPropertySchema(settings.EndpointProperty, localDefinitions); + } + + // Add other required parameters (raw param names need ToIdentifierName() for PascalCase) + foreach (var param in settings.OtherRequiredParams) + { + var propName = param.Name.ToIdentifierName(); + properties[propName] = GetJsonSchemaForType(param.Type, localDefinitions); + } + + // Add custom constructor parameters from custom code (e.g., hand-written constructors + // added via partial classes) that are not already covered by generated parameters. + // Only consider public constructors — internal/private constructors contain infrastructure + // parameters (pipeline, key credentials, etc.) that are not suitable for configuration. + var customConstructors = client.CustomCodeView?.Constructors; + if (customConstructors != null) + { + var knownProps = new HashSet(properties.Select(p => p.Key)); + knownProps.Add("Credential"); + knownProps.Add("Options"); + foreach (var ctor in customConstructors) + { + if (!ctor.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Public) || + settings.HasSettingsParameter(ctor)) + { + continue; + } + + foreach (var param in ctor.Signature.Parameters) + { + var propName = param.Name.ToIdentifierName(); + if (!knownProps.Contains(propName) && + !ClientSettingsProvider.IsStandardParameterType(param.Type)) + { + properties[propName] = GetJsonSchemaForType(param.Type, localDefinitions); + knownProps.Add(propName); + } + } + } + } + + // Add credential reference (defined in System.ClientModel base schema) + properties["Credential"] = new JsonObject + { + ["$ref"] = "#/definitions/credential" + }; + + // Add options + properties["Options"] = BuildOptionsSchema(client, optionsRef, localDefinitions); + + return new JsonObject + { + ["type"] = "object", + ["description"] = $"Configuration for {client.Name}.", + ["properties"] = properties + }; + } + + private static JsonObject BuildOptionsSchema(ClientProvider client, string optionsRef, Dictionary localDefinitions) + { + var clientOptions = client.EffectiveClientOptions; + if (clientOptions == null) + { + return new JsonObject + { + ["$ref"] = $"#/definitions/{optionsRef}" + }; + } + + // Build a named local definition for this client's options type that inherits from the base options. + // This follows the same pattern used in the Azure emitter where client options types extend the + // core options type using allOf. + var optionsTypeName = clientOptions.Name; + var definitionName = optionsTypeName.Length > 1 + ? char.ToLowerInvariant(optionsTypeName[0]) + optionsTypeName.Substring(1) + : optionsTypeName.ToLowerInvariant(); + + if (!localDefinitions.ContainsKey(definitionName)) + { + // Get client-specific option properties (public, non-version properties) + var customProperties = clientOptions.Properties + .Where(p => p.Modifiers.HasFlag(MethodSignatureModifiers.Public)) + .ToList(); + + // Also include custom code properties (e.g., hand-written properties added via partial classes) + // that are not already in the generated properties set. + var generatedPropNames = new HashSet(customProperties.Select(p => p.Name)); + var customCodeProperties = clientOptions.CustomCodeView?.Properties; + if (customCodeProperties != null) + { + foreach (var prop in customCodeProperties) + { + if (prop.Modifiers.HasFlag(MethodSignatureModifiers.Public) && + !generatedPropNames.Contains(prop.Name)) + { + customProperties.Add(prop); + generatedPropNames.Add(prop.Name); + } + } + } + + var allOfArray = new JsonArray + { + new JsonObject { ["$ref"] = $"#/definitions/{optionsRef}" } + }; + + if (customProperties.Count > 0) + { + var extensionProperties = new JsonObject(); + foreach (var prop in customProperties) + { + extensionProperties[prop.Name] = GetJsonSchemaForType(prop.Type, localDefinitions); + } + + allOfArray.Add(new JsonObject + { + ["type"] = "object", + ["properties"] = extensionProperties + }); + } + + localDefinitions[definitionName] = new JsonObject + { + ["allOf"] = allOfArray + }; + } + + return new JsonObject + { + ["$ref"] = $"#/definitions/{definitionName}" + }; + } + + private static JsonObject BuildPropertySchema(PropertyProvider property, Dictionary localDefinitions) + { + var schema = GetJsonSchemaForType(property.Type, localDefinitions); + + if (property.Description != null) + { + var descriptionText = property.Description.ToString(); + if (!string.IsNullOrEmpty(descriptionText)) + { + schema["description"] = descriptionText; + } + } + + return schema; + } + + internal static JsonObject GetJsonSchemaForType(CSharpType type, Dictionary? localDefinitions = null) + { + // Unwrap nullable types + var effectiveType = type.IsNullable ? type.WithNullable(false) : type; + + // Handle non-framework types + if (!effectiveType.IsFrameworkType) + { + if (effectiveType.IsEnum) + { + return GetJsonSchemaForEnum(effectiveType, localDefinitions); + } + + if (effectiveType.IsStruct) + { + // Non-enum struct — look up custom code constructor to determine the underlying type + return GetJsonSchemaForNonEnumStruct(effectiveType, localDefinitions); + } + + return GetJsonSchemaForModel(effectiveType, localDefinitions); + } + + // Handle collection types + if (effectiveType.IsList) + { + return BuildArraySchema(effectiveType, localDefinitions); + } + + var frameworkType = effectiveType.FrameworkType; + + if (frameworkType == typeof(string)) + { + return new JsonObject { ["type"] = "string" }; + } + if (frameworkType == typeof(bool)) + { + return new JsonObject { ["type"] = "boolean" }; + } + if (frameworkType == typeof(int) || frameworkType == typeof(long)) + { + return new JsonObject { ["type"] = "integer" }; + } + if (frameworkType == typeof(float) || frameworkType == typeof(double)) + { + return new JsonObject { ["type"] = "number" }; + } + if (frameworkType == typeof(Uri)) + { + return new JsonObject { ["type"] = "string", ["format"] = "uri" }; + } + if (frameworkType == typeof(TimeSpan)) + { + return new JsonObject { ["type"] = "string" }; + } + + return new JsonObject { ["type"] = "object" }; + } + + private static JsonObject GetJsonSchemaForEnum(CSharpType enumType, Dictionary? localDefinitions) + { + // Search both top-level and nested types (e.g., service version enums nested in options) in a single pass + var enumProvider = CodeModelGenerator.Instance.OutputLibrary.TypeProviders + .SelectMany(t => new[] { t }.Concat(t.NestedTypes)) + .OfType() + .FirstOrDefault(e => e.Type.Equals(enumType)); + + if (enumProvider != null) + { + var values = new JsonArray(); + foreach (var member in enumProvider.EnumValues) + { + values.Add(JsonValue.Create(member.Value?.ToString())); + } + + JsonObject enumSchema; + if (enumType.IsStruct) + { + // Extensible enum — use anyOf to allow known values + custom strings + enumSchema = new JsonObject + { + ["anyOf"] = new JsonArray + { + new JsonObject { ["enum"] = values }, + new JsonObject { ["type"] = "string" } + } + }; + } + else + { + // Fixed enum + enumSchema = new JsonObject { ["enum"] = values }; + } + + // Register as a local definition if we're collecting them + if (localDefinitions != null) + { + var name = enumProvider.Name; + var definitionName = name.Length > 1 + ? char.ToLowerInvariant(name[0]) + name.Substring(1) + : name.ToLowerInvariant(); + if (!localDefinitions.ContainsKey(definitionName)) + { + localDefinitions[definitionName] = enumSchema; + } + return new JsonObject { ["$ref"] = $"#/definitions/{definitionName}" }; + } + + return enumSchema; + } + + // Fallback: just string + return new JsonObject { ["type"] = "string" }; + } + + private static JsonObject GetJsonSchemaForNonEnumStruct(CSharpType structType, Dictionary? localDefinitions) + { + // Look up the struct's constructor to determine the underlying value type + var underlyingType = ClientSettingsProvider.TryGetStructUnderlyingType(structType); + + if (underlyingType != null) + { + var ft = underlyingType.FrameworkType; + if (ft == typeof(string)) + { + return new JsonObject { ["type"] = "string" }; + } + if (ft == typeof(int) || ft == typeof(long)) + { + return new JsonObject { ["type"] = "integer" }; + } + if (ft == typeof(float) || ft == typeof(double)) + { + return new JsonObject { ["type"] = "number" }; + } + } + + // Fallback: treat as object to be consistent with AppendComplexObjectBinding + return new JsonObject { ["type"] = "object" }; + } + + private static JsonObject GetJsonSchemaForModel(CSharpType modelType, Dictionary? localDefinitions) + { + // Search for the model provider in the output library + var modelProvider = CodeModelGenerator.Instance.OutputLibrary.TypeProviders + .SelectMany(t => new[] { t }.Concat(t.NestedTypes)) + .FirstOrDefault(m => m is ModelProvider && m.Type.Equals(modelType)); + + if (modelProvider != null) + { + var name = modelProvider.Name; + var definitionName = name.Length > 1 + ? char.ToLowerInvariant(name[0]) + name.Substring(1) + : name.ToLowerInvariant(); + + if (localDefinitions != null && !localDefinitions.ContainsKey(definitionName)) + { + var modelProperties = new JsonObject(); + foreach (var prop in modelProvider.Properties + .Where(p => p.Modifiers.HasFlag(MethodSignatureModifiers.Public))) + { + modelProperties[prop.Name] = GetJsonSchemaForType(prop.Type, localDefinitions); + } + + var modelSchema = new JsonObject { ["type"] = "object" }; + if (modelProperties.Count > 0) + { + modelSchema["properties"] = modelProperties; + } + + localDefinitions[definitionName] = modelSchema; + } + + if (localDefinitions != null) + { + return new JsonObject { ["$ref"] = $"#/definitions/{definitionName}" }; + } + } + + return new JsonObject { ["type"] = "object" }; + } + + private static JsonObject BuildArraySchema(CSharpType listType, Dictionary? localDefinitions) + { + if (listType.Arguments.Count > 0) + { + return new JsonObject + { + ["type"] = "array", + ["items"] = GetJsonSchemaForType(listType.Arguments[0], localDefinitions) + }; + } + + return new JsonObject + { + ["type"] = "array", + ["items"] = new JsonObject { ["type"] = "string" } + }; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ConfigurationSchemaOptions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ConfigurationSchemaOptions.cs new file mode 100644 index 00000000000..c1ad887b65c --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ConfigurationSchemaOptions.cs @@ -0,0 +1,29 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.TypeSpec.Generator.ClientModel +{ + /// + /// Options that control ConfigurationSchema.json generation. + /// + public class ConfigurationSchemaOptions + { + /// + /// Gets or sets the top-level section name used in the generated ConfigurationSchema.json. + /// Defaults to "Clients". Azure SDK generators should set this to "AzureClients". + /// + public string SectionName { get; set; } = ConfigurationSchemaGenerator.DefaultSectionName; + + /// + /// Gets or sets the $ref value used for the base options definition in the generated ConfigurationSchema.json. + /// Defaults to "options". Azure SDK generators should set this to "azureOptions". + /// + public string OptionsRef { get; set; } = ConfigurationSchemaGenerator.DefaultOptionsRef; + + /// + /// Gets or sets whether to generate the .NuGet.targets file alongside the ConfigurationSchema.json. + /// Defaults to true. Set to false when the build infrastructure handles targets file packing centrally. + /// + public bool GenerateNuGetTargets { get; set; } = true; + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Microsoft.TypeSpec.Generator.ClientModel.csproj b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Microsoft.TypeSpec.Generator.ClientModel.csproj index a14cd844c1c..3179721bdfb 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Microsoft.TypeSpec.Generator.ClientModel.csproj +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Microsoft.TypeSpec.Generator.ClientModel.csproj @@ -9,6 +9,7 @@ + diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Primitives/JsonSerialization.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Primitives/JsonSerialization.cs new file mode 100644 index 00000000000..b54a9428a0e --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Primitives/JsonSerialization.cs @@ -0,0 +1,23 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using Microsoft.TypeSpec.Generator.Input; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Primitives +{ + /// + /// Represents JSON serialization options for a property or model. + /// + public class JsonSerialization + { + public JsonSerialization(InputJsonSerializationOptions options) + { + Name = options.Name; + } + + /// + /// Gets or sets the serialized name for JSON format. + /// + public string Name { get; internal set; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Primitives/ScmKnownParameters.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Primitives/ScmKnownParameters.cs index bfbefd24fbb..e07006acf43 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Primitives/ScmKnownParameters.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Primitives/ScmKnownParameters.cs @@ -21,7 +21,6 @@ internal static class ScmKnownParameters public static readonly ParameterProvider XmlWriter = new("writer", FormattableStringHelpers.Empty, typeof(XmlWriter)); public static readonly ParameterProvider NameHint = new("nameHint", FormattableStringHelpers.Empty, typeof(string)); - public static readonly ParameterProvider XElement = new("element", FormattableStringHelpers.Empty, typeof(XElement)); public static readonly ParameterProvider Utf8JsonWriter = new("writer", FormattableStringHelpers.Empty, typeof(Utf8JsonWriter)); public static readonly ParameterProvider Utf8JsonReader = new("reader", FormattableStringHelpers.Empty, typeof(Utf8JsonReader), isRef: true); public static readonly ParameterProvider JsonOptions = new("options", FormattableStringHelpers.Empty, typeof(JsonSerializerOptions)); @@ -42,28 +41,17 @@ public static ParameterProvider ClientOptions(CSharpType clientOptionsType) private static readonly FormattableString RequestContentDescription = $"The content to send as the body of the request."; private const string RequestContentParameterName = "content"; - public static readonly ParameterProvider RequestContent = new( + public static ParameterProvider CreateRequestContent(InputParameter? parameter = null, bool optional = false, bool nullable = false) => new( RequestContentParameterName, RequestContentDescription, ScmCodeModelGenerator.Instance.TypeFactory.RequestContentApi.RequestContentType, - location: ParameterLocation.Body) + location: ParameterLocation.Body, + defaultValue: optional ? Null : null, + inputParameter: parameter) { - Validation = ParameterValidationType.AssertNotNull + Validation = nullable ? ParameterValidationType.None : ParameterValidationType.AssertNotNull, }; - public static readonly ParameterProvider NullableRequiredRequestContent = new( - RequestContentParameterName, - RequestContentDescription, - ScmCodeModelGenerator.Instance.TypeFactory.RequestContentApi.RequestContentType, - location: ParameterLocation.Body); - - public static readonly ParameterProvider OptionalRequestContent = new( - RequestContentParameterName, - RequestContentDescription, - ScmCodeModelGenerator.Instance.TypeFactory.RequestContentApi.RequestContentType, - location: ParameterLocation.Body, - defaultValue: Null); - // Known header parameters public static readonly ParameterProvider RepeatabilityRequestId = new("repeatabilityRequestId", FormattableStringHelpers.Empty, typeof(Guid)) { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Primitives/ScmSerializationOptions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Primitives/ScmSerializationOptions.cs new file mode 100644 index 00000000000..1a424697aff --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Primitives/ScmSerializationOptions.cs @@ -0,0 +1,25 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using Microsoft.TypeSpec.Generator.Input; +using Microsoft.TypeSpec.Generator.Primitives; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Primitives +{ + public class ScmSerializationOptions : SerializationOptions + { + public ScmSerializationOptions(InputSerializationOptions inputSerializationOptions) : base() + { + Json = inputSerializationOptions.Json != null + ? new(inputSerializationOptions.Json) + : null; + Xml = inputSerializationOptions.Xml != null + ? new(inputSerializationOptions.Xml) + : null; + } + + public JsonSerialization? Json { get; } + + public XmlSerialization? Xml { get; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Primitives/XmlSerialization.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Primitives/XmlSerialization.cs new file mode 100644 index 00000000000..3ae94947dcb --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Primitives/XmlSerialization.cs @@ -0,0 +1,39 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using Microsoft.TypeSpec.Generator.Input; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Primitives +{ + /// + /// Represents XML serialization options for a property or model. + /// + public class XmlSerialization + { + public XmlSerialization(InputXmlSerializationOptions xmlOptions) + { + Name = xmlOptions.Name; + Attribute = xmlOptions.Attribute; + Namespace = xmlOptions.Namespace != null + ? new(xmlOptions.Namespace) + : null; + Unwrapped = xmlOptions.Unwrapped; + ItemsName = xmlOptions.ItemsName; + ItemsNamespace = xmlOptions.ItemsNamespace != null + ? new(xmlOptions.ItemsNamespace) + : null; + } + + public string Name { get; } + + public bool? Attribute { get; } + + public XmlSerializationNamespace? Namespace { get; } + + public bool? Unwrapped { get; } + + public string? ItemsName { get; } + + public XmlSerializationNamespace? ItemsNamespace { get; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Primitives/XmlSerializationNamespace.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Primitives/XmlSerializationNamespace.cs new file mode 100644 index 00000000000..5bae1386c10 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Primitives/XmlSerializationNamespace.cs @@ -0,0 +1,20 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using Microsoft.TypeSpec.Generator.Input; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Primitives +{ + public class XmlSerializationNamespace + { + public XmlSerializationNamespace(InputXmlNamespaceOptions options) + { + Namespace = options.Namespace; + Prefix = options.Prefix; + } + + public string Namespace { get; } + + public string Prefix { get; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/Abstractions/HttpRequestApi.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/Abstractions/HttpRequestApi.cs index 5682caff3d1..434d24f5c6c 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/Abstractions/HttpRequestApi.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/Abstractions/HttpRequestApi.cs @@ -18,6 +18,7 @@ protected HttpRequestApi(CSharpType type, ValueExpression original) : base(type, public abstract Type UriBuilderType { get; } public abstract MethodBodyStatement SetHeaders(IReadOnlyList arguments); + public abstract MethodBodyStatement AddCollectionHeaders(ValueExpression prefix, ValueExpression headers); public abstract ValueExpression Content(); public abstract ValueExpression ClientRequestId(); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/BinaryContentHelperDefinition.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/BinaryContentHelperDefinition.cs index afee276f61d..a2ee813e298 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/BinaryContentHelperDefinition.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/BinaryContentHelperDefinition.cs @@ -2,8 +2,10 @@ // Licensed under the MIT License. using System; +using System.ClientModel; using System.Collections.Generic; using System.IO; +using System.Xml; using Microsoft.TypeSpec.Generator.ClientModel.Snippets; using Microsoft.TypeSpec.Generator.Expressions; using Microsoft.TypeSpec.Generator.Input; @@ -15,7 +17,7 @@ namespace Microsoft.TypeSpec.Generator.ClientModel.Providers { - internal class BinaryContentHelperDefinition : TypeProvider + public class BinaryContentHelperDefinition : TypeProvider { private const string _fromEnumerableName = "FromEnumerable"; private const string _fromDictionaryName = "FromDictionary"; @@ -35,8 +37,8 @@ protected override TypeSignatureModifiers BuildDeclarationModifiers() protected override MethodProvider[] BuildMethods() { - return - [ + var methods = new List + { BuildFromEnumerableTMethod(), BuildFromEnumerableBinaryDataMethod(), BuildFromReadOnlySpanMethod(), @@ -44,7 +46,14 @@ protected override MethodProvider[] BuildMethods() BuildFromDictionaryBinaryDataMethod(), BuildFromObjectMethod(), BuildFromBinaryDataMethod() - ]; + }; + + if (ScmCodeModelGenerator.Instance.InputLibrary.HasXmlModelSerialization) + { + methods.Add(BuildFromEnumerableXmlMethod()); + } + + return [.. methods]; } private MethodProvider BuildFromEnumerableTMethod() @@ -268,5 +277,51 @@ private MethodProvider BuildFromBinaryDataMethod() return new MethodProvider(signature, body, this); } + + private MethodProvider BuildFromEnumerableXmlMethod() + { + var enumerableTType = typeof(IEnumerable<>); + CSharpType tType = enumerableTType.GetGenericArguments()[0]; + var enumerableParameter = new ParameterProvider("enumerable", FormattableStringHelpers.Empty, enumerableTType); + var rootNameHintParameter = new ParameterProvider("rootNameHint", FormattableStringHelpers.Empty, typeof(string)); + var childNameHintParameter = new ParameterProvider("childNameHint", FormattableStringHelpers.Empty, typeof(string)); + var signature = new MethodSignature( + Name: _fromEnumerableName, + Modifiers: _methodModifiers, + Parameters: [enumerableParameter, rootNameHintParameter, childNameHintParameter], + ReturnType: _requestBodyType, + GenericArguments: [tType], + GenericParameterConstraints: [Where.NotNull(tType)], + Description: null, + ReturnDescription: null); + + var outerUsing = new UsingScopeStatement(typeof(MemoryStream), "stream", New.Instance(typeof(MemoryStream), Int(256)), out var streamVar); + var innerUsing = new UsingScopeStatement(typeof(XmlWriter), "writer", + XmlWriterSnippets.Create(streamVar, ModelSerializationExtensionsSnippets.XmlWriterSettings), out var writerVar); + var xmlWriter = writerVar.As(); + + innerUsing.AddRange([ + xmlWriter.WriteStartElement(rootNameHintParameter), + new ForEachStatement("item", enumerableParameter.As(enumerableParameter.Type), out var item) + { + xmlWriter.WriteObjectValue(item.As(tType), ModelSerializationExtensionsSnippets.Wire, childNameHintParameter) + }, + xmlWriter.WriteEndElement(), + ]); + outerUsing.AddRange([ + innerUsing, + MethodBodyStatement.EmptyLine, + new IfElseStatement( + streamVar.Property(nameof(MemoryStream.Position)).GreaterThan(new MemberExpression(typeof(int), nameof(int.MaxValue))), + Return(RequestContentApiSnippets.Create(BinaryDataSnippets.FromStream(streamVar, false))), + Return(RequestContentApiSnippets.Create(New.Instance(typeof(BinaryData), + streamVar.Invoke(nameof(MemoryStream.GetBuffer)).Invoke(nameof(System.MemoryExtensions.AsMemory), + [Int(0), streamVar.Property(nameof(MemoryStream.Position)).CastTo(typeof(int))]))))) + ]); + + var body = new MethodBodyStatement[] { outerUsing }; + + return new MethodProvider(signature, body, this); + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/BinaryContentProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/BinaryContentProvider.cs index d7e452714fd..6b0d2fbcfcf 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/BinaryContentProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/BinaryContentProvider.cs @@ -3,10 +3,10 @@ using System.ClientModel; using Microsoft.TypeSpec.Generator.ClientModel.Snippets; -using static Microsoft.TypeSpec.Generator.Snippets.Snippet; using Microsoft.TypeSpec.Generator.Expressions; -using Microsoft.TypeSpec.Generator.Statements; using Microsoft.TypeSpec.Generator.Primitives; +using Microsoft.TypeSpec.Generator.Statements; +using static Microsoft.TypeSpec.Generator.Snippets.Snippet; namespace Microsoft.TypeSpec.Generator.ClientModel.Providers { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientOptionsProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientOptionsProvider.cs index 7001641f55e..e0a0bf9edf8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientOptionsProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientOptionsProvider.cs @@ -11,6 +11,7 @@ using Microsoft.TypeSpec.Generator.Primitives; using Microsoft.TypeSpec.Generator.Providers; using Microsoft.TypeSpec.Generator.Shared; +using Microsoft.TypeSpec.Generator.Snippets; using Microsoft.TypeSpec.Generator.Statements; using Microsoft.TypeSpec.Generator.Utilities; using static Microsoft.TypeSpec.Generator.Snippets.Snippet; @@ -19,7 +20,6 @@ namespace Microsoft.TypeSpec.Generator.ClientModel.Providers { public class ClientOptionsProvider : TypeProvider { - private const string ServicePrefix = "Service"; private const string VersionSuffix = "Version"; private const string ApiVersionSuffix = "ApiVersion"; private const string LatestPrefix = "Latest"; @@ -133,9 +133,26 @@ private static bool UseSingletonInstance(InputClient inputClient) var properties = new Dictionary(_serviceVersionsEnums.Count); foreach (var (inputEnum, enumProvider) in _serviceVersionsEnums) { - var versionPropertyName = _inputClient.IsMultiServiceClient - ? ClientHelper.BuildNameForService(inputEnum.Namespace, ServicePrefix, ApiVersionSuffix) - : VersionSuffix; + string versionPropertyName; + if (!_inputClient.IsMultiServiceClient) + { + versionPropertyName = VersionSuffix; + } + else + { + var serviceNamespace = inputEnum.Namespace; + if (!string.IsNullOrEmpty(serviceNamespace) && + ClientHelper.HasLastSegmentCollision(serviceNamespace, inputEnum, _serviceVersionsEnums.Keys)) + { + // Last segment collides — find the shortest unique namespace suffix. + string uniquePrefix = ClientHelper.GetShortestUniqueNamespacePrefix(serviceNamespace, inputEnum, _serviceVersionsEnums.Keys); + versionPropertyName = $"{uniquePrefix.ToIdentifierName()}{ApiVersionSuffix}"; + } + else + { + versionPropertyName = ClientHelper.BuildNameForService(serviceNamespace ?? string.Empty, string.Empty, ApiVersionSuffix); + } + } var versionProperty = new PropertyProvider( null, @@ -159,11 +176,28 @@ private static bool UseSingletonInstance(InputClient inputClient) } Dictionary latestVersionFields = new(_serviceVersionsEnums.Count); - foreach (var enumProvider in _serviceVersionsEnums.Values) + foreach (var (inputEnum, enumProvider) in _serviceVersionsEnums) { - var fieldName = _inputClient.IsMultiServiceClient - ? $"{LatestPrefix}{enumProvider.Name.ToIdentifierName()}" - : LatestVersionFieldName; + string fieldName; + if (!_inputClient.IsMultiServiceClient) + { + fieldName = LatestVersionFieldName; + } + else + { + var serviceNamespace = inputEnum.Namespace; + if (!string.IsNullOrEmpty(serviceNamespace) && + ClientHelper.HasLastSegmentCollision(serviceNamespace, inputEnum, _serviceVersionsEnums.Keys)) + { + // Last segment collides — find the shortest unique namespace suffix. + string uniquePrefix = ClientHelper.GetShortestUniqueNamespacePrefix(serviceNamespace, inputEnum, _serviceVersionsEnums.Keys); + fieldName = $"{LatestPrefix}{uniquePrefix.ToIdentifierName()}{VersionSuffix}"; + } + else + { + fieldName = ClientHelper.BuildNameForService(serviceNamespace ?? string.Empty, LatestPrefix, VersionSuffix); + } + } var field = new FieldProvider( modifiers: FieldModifiers.Private | FieldModifiers.Const, type: enumProvider.Type, @@ -230,9 +264,15 @@ protected override TypeProvider[] BuildNestedTypes() protected override ConstructorProvider[] BuildConstructors() { + var configSectionCtor = BuildConfigurationSectionConstructor(); + if (LatestVersionsFields is null) { - return []; + var defaultCtor = new ConstructorProvider( + new ConstructorSignature(Type, $"Initializes a new instance of {_clientProvider.Name}Options.", MethodSignatureModifiers.Public, []), + MethodBodyStatement.Empty, + this); + return [defaultCtor, configSectionCtor]; } var constructorBody = new List(); @@ -249,10 +289,7 @@ protected override ConstructorProvider[] BuildConstructors() FormattableString versionParamDescription = $"The service version"; if (_inputClient.IsMultiServiceClient) { - versionParameterName = ClientHelper.BuildNameForService( - serviceVersionEnum.Name, - ServicePrefix, - VersionSuffix).ToVariableName(); + versionParameterName = serviceVersionEnum.Name.ToVariableName(); versionParamDescription = $"The {serviceVersionEnum.Name} service version"; } @@ -281,7 +318,110 @@ protected override ConstructorProvider[] BuildConstructors() new ConstructorSignature(Type, $"Initializes a new instance of {_clientProvider.Name}Options.", MethodSignatureModifiers.Public, constructorParameters), constructorBody, this); - return [constructor]; + return [constructor, configSectionCtor]; + } + + private ConstructorProvider BuildConfigurationSectionConstructor() + { + var sectionParam = new ParameterProvider( + "section", + $"The configuration section.", + ClientSettingsProvider.IConfigurationSectionType); + + var experimentalAttr = new AttributeStatement( + typeof(System.Diagnostics.CodeAnalysis.ExperimentalAttribute), + [Literal(ClientSettingsProvider.ClientSettingsDiagnosticId)]); + + // Set version to latest version before the guard so it is always initialized + var body = new List(); + if (LatestVersionsFields != null && VersionProperties != null) + { + foreach (var (_, serviceVersionEnum) in LatestVersionsFields.OrderBy(kvp => kvp.Key.Name)) + { + if (VersionProperties.TryGetValue(serviceVersionEnum, out var versionProperty)) + { + var latestVersion = serviceVersionEnum.EnumValues[^1]; + body.Add(versionProperty.Assign(Literal(latestVersion.Value)).Terminate()); + } + } + } + + // if (section is null || !section.Exists()) { return; } + var guardCondition = sectionParam.Is(Null).Or(Not(sectionParam.Invoke("Exists"))); + var guardStatement = new IfStatement(guardCondition) { Return() }; + + body.Add(guardStatement); + + // Bind version properties from configuration (after guard, default already set before guard) + if (LatestVersionsFields != null && VersionProperties != null) + { + foreach (var (_, serviceVersionEnum) in LatestVersionsFields.OrderBy(kvp => kvp.Key.Name)) + { + if (VersionProperties.TryGetValue(serviceVersionEnum, out var versionProperty)) + { + // if (section["VersionPropertyName"] is string version) { Version = version; } + var versionVarDecl = Declare(versionProperty.Name.ToVariableName(), new CSharpType(typeof(string)), out var versionVar); + var ifVersionStatement = new IfStatement(new IndexerExpression(sectionParam, Literal(versionProperty.Name)).Is(versionVarDecl)); + ifVersionStatement.Add(This.Property(versionProperty.Name).Assign(versionVar).Terminate()); + body.Add(ifVersionStatement); + } + } + } + + // Build a set of version property names for O(1) lookup + var versionPropertyNames = VersionProperties?.Values.Select(vp => vp.Name).ToHashSet(); + + // Bind non-version properties from configuration using type-aware binding + foreach (var property in Properties) + { + if (versionPropertyNames?.Contains(property.Name) == true) + { + continue; + } + + ClientSettingsProvider.AppendBindingForProperty( + body, + sectionParam, + property.Name, + property.Name.ToVariableName(), + property.Type); + } + + // Also bind custom code properties (e.g., hand-written properties added via partial classes) + var generatedPropNames = new HashSet(Properties.Select(p => p.Name)); + if (versionPropertyNames != null) + { + generatedPropNames.UnionWith(versionPropertyNames); + } + var customCodeProperties = CustomCodeView?.Properties; + if (customCodeProperties != null) + { + foreach (var prop in customCodeProperties) + { + if (prop.Modifiers.HasFlag(MethodSignatureModifiers.Public) && + !generatedPropNames.Contains(prop.Name)) + { + ClientSettingsProvider.AppendBindingForProperty( + body, + sectionParam, + prop.Name, + prop.Name.ToVariableName(), + prop.Type); + generatedPropNames.Add(prop.Name); + } + } + } + + return new ConstructorProvider( + new ConstructorSignature( + Type, + $"Initializes a new instance of {_clientProvider.Name}Options from configuration.", + MethodSignatureModifiers.Internal, + [sectionParam], + attributes: [experimentalAttr], + initializer: new ConstructorInitializer(true, [sectionParam])), + new MethodBodyStatements([.. body]), + this); } protected override PropertyProvider[] BuildProperties() diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs index 0d5372e01ff..5b6d76d93b6 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.IO; using System.Linq; using System.Threading; @@ -36,9 +37,12 @@ private record ApiVersionFields(FieldProvider Field, PropertyProvider? Correspon private const string TokenProviderFieldName = "_tokenProvider"; private const string TokenCredentialFieldName = "_tokenCredential"; private const string EndpointFieldName = "_endpoint"; + private const string CredentialParamName = "credential"; + private const string SettingsParamName = "settings"; private const string ClientSuffix = "Client"; private readonly FormattableString _publicCtorDescription; private readonly InputClient _inputClient; + internal InputClient InputClient => _inputClient; private readonly InputAuth? _inputAuth; private readonly ParameterProvider _endpointParameter; /// @@ -58,6 +62,13 @@ private record ApiVersionFields(FieldProvider Field, PropertyProvider? Correspon private Dictionary? _methodCache; private Dictionary MethodCache => _methodCache ??= []; + private TypeProvider? _backCompatProvider; + + /// + /// Gets the effective type provider to use for backward compatibility checks. + /// When a is set, it is used instead of this client. + /// + internal TypeProvider BackCompatProvider => _backCompatProvider ?? this; public ParameterProvider? ClientOptionsParameter { get; } @@ -95,6 +106,11 @@ public ClientProvider(InputClient inputClient) _publicCtorDescription = $"Initializes a new instance of {Name}."; ClientOptions = _inputClient.Parent is null ? ClientOptionsProvider.CreateClientOptionsProvider(_inputClient, this) : null; ClientOptionsParameter = ClientOptions != null ? ScmKnownParameters.ClientOptions(ClientOptions.Type) : null; + bool isIndividuallyInitialized = (_inputClient.InitializedBy & InputClientInitializedBy.Individually) != 0; + ClientSettings = isIndividuallyInitialized + && DeclarationModifiers.HasFlag(TypeSignatureModifiers.Public) + ? new ClientSettingsProvider(_inputClient, this) + : null; IsMultiServiceClient = _inputClient.IsMultiServiceClient; var apiKey = _inputAuth?.ApiKey; @@ -121,8 +137,7 @@ public ClientProvider(InputClient inputClient) this, initializationValue: Literal(apiKey.Prefix)) : null; - // skip auth fields for sub-clients - _apiKeyAuthFields = ClientOptions is null ? null : new(apiKeyAuthField, authorizationHeaderField, authorizationApiKeyPrefixField); + _apiKeyAuthFields = isIndividuallyInitialized ? new(apiKeyAuthField, authorizationHeaderField, authorizationApiKeyPrefixField) : null; } var tokenAuth = _inputAuth?.OAuth2; @@ -146,8 +161,7 @@ public ClientProvider(InputClient inputClient) var tokenCredentialScopesField = BuildTokenCredentialScopesField(tokenAuth, tokenCredentialType); - // skip auth fields for sub-clients - _oauth2Fields = ClientOptions is null ? null : new(tokenCredentialField, tokenCredentialScopesField); + _oauth2Fields = isIndividuallyInitialized ? new(tokenCredentialField, tokenCredentialScopesField) : null; } EndpointField = new( FieldModifiers.Private | FieldModifiers.ReadOnly, @@ -182,6 +196,7 @@ public ClientProvider(InputClient inputClient) _additionalClientFields = new(BuildAdditionalClientFields); _subClientInternalConstructorParams = new(GetSubClientInternalConstructorParameters); _clientParameters = new(GetClientParameters); + _effectiveClientParamNames = new(() => GetEffectiveParameterNames(_inputClient.Parameters)); _subClients = new(GetSubClients); _allClientParameters = GetAllClientParameters(); } @@ -288,20 +303,51 @@ private IReadOnlyList GetSubClientInternalConstructorParamete PipelineProperty.AsParameter }; - if (_apiKeyAuthFields != null) - { - subClientParameters.Add(_apiKeyAuthFields.AuthField.AsParameter); - } - if (_oauth2Fields != null) - { - subClientParameters.Add(_oauth2Fields.AuthField.AsParameter); - } + // Auth credentials are NOT included here — the parent passes its authenticated + // pipeline, so the sub-client doesn't need separate credential parameters. subClientParameters.Add(_endpointParameter); subClientParameters.AddRange(ClientParameters); return subClientParameters; } + /// + /// Determines whether this subclient has non-infrastructure parameters + /// (not API versions, not endpoint) that are not present on the parent's InputClient.Parameters. + /// Uses the raw to avoid circular lazy-initialization dependencies. + /// + internal bool HasAccessorOnlyParameters(InputClient parentInputClient) + { + var parentParamNames = GetEffectiveParameterNames(parentInputClient.Parameters); + + return _inputClient.Parameters + .Where(p => !p.IsApiVersion && !(p is InputEndpointParameter ep && ep.IsEndpoint)) + .Any(p => !IsSupersededByClientParameter(p, parentParamNames)); + } + + /// + /// Builds a set of effective parameter names. When a parameter has a ParamAlias, + /// the alias is used instead of the parameter name. + /// + private static HashSet GetEffectiveParameterNames(IReadOnlyList parameters) + { + var names = new HashSet(StringComparer.OrdinalIgnoreCase); + foreach (var p in parameters) + { + if (p is InputMethodParameter { ParamAlias: string alias }) + { + names.Add(alias); + } + else + { + names.Add(p.Name); + } + } + return names; + } + + private Lazy> _effectiveClientParamNames; + private Lazy> _clientParameters; internal IReadOnlyList ClientParameters => _clientParameters.Value; private IReadOnlyList GetClientParameters() @@ -355,6 +401,13 @@ private IReadOnlyList GetClientParameters() /// public RestClientProvider RestClient => _restClient ??= new RestClientProvider(_inputClient, this); public ClientOptionsProvider? ClientOptions { get; } + public ClientSettingsProvider? ClientSettings { get; } + + /// + /// Gets the effective — the client's own options for root clients, + /// or the root client's options for individually-initialized sub-clients. + /// + internal ClientOptionsProvider? EffectiveClientOptions => ClientOptions ?? GetRootClient()?.ClientOptions; public PropertyProvider PipelineProperty { get; } public FieldProvider EndpointField { get; } @@ -371,7 +424,7 @@ protected override FieldProvider[] BuildFields() if (_apiKeyAuthFields != null) { - fields.Add(_apiKeyAuthFields.AuthField); + // No longer add AuthField (_keyCredential) — auth is handled via AuthenticationPolicy parameter in the internal constructor fields.Add(_apiKeyAuthFields.AuthorizationHeaderField); if (_apiKeyAuthFields.AuthorizationApiKeyPrefixField != null) { @@ -381,7 +434,7 @@ protected override FieldProvider[] BuildFields() if (_oauth2Fields != null) { - fields.Add(_oauth2Fields.AuthField); + // No longer add AuthField (_tokenProvider) — auth is handled via AuthenticationPolicy parameter in the internal constructor fields.Add(_oauth2Fields.AuthorizationScopesField); } @@ -390,7 +443,10 @@ protected override FieldProvider[] BuildFields() // add sub-client caching fields foreach (var subClient in _subClients.Value) { - if (subClient._clientCachingField != null) + // Only add caching field when the accessor does not require additional parameters. + // If the subclient has parameters that are not on the parent, each accessor call may + // produce a different client instance, so caching is not appropriate. + if (subClient._clientCachingField != null && !subClient.HasAccessorOnlyParameters(_inputClient)) { fields.Add(subClient._clientCachingField); } @@ -427,11 +483,14 @@ private IReadOnlyList BuildAdditionalClientFields() false, p.IsApiVersion); - if (p.IsApiVersion && !builtApiVersionFields) + if (p.IsApiVersion) { - _apiVersionFields = BuildApiVersionFields(p, type, wireInfo); - fields.AddRange(_apiVersionFields.Select(f => f.Field).OrderBy(f => f.Name)); - builtApiVersionFields = true; + if (!builtApiVersionFields) + { + _apiVersionFields = BuildApiVersionFields(p, type, wireInfo); + fields.AddRange(_apiVersionFields.Select(f => f.Field).OrderBy(f => f.Name)); + builtApiVersionFields = true; + } } else { @@ -540,45 +599,89 @@ protected override ConstructorProvider[] BuildConstructors() var primaryConstructors = new List(); var secondaryConstructors = new List(); + bool hasAnyAuth = _apiKeyAuthFields != null || _oauth2Fields != null; + + // The internal implementation constructor takes AuthenticationPolicy? as first parameter. + // It is shared across all auth types - add it once. + if (hasAnyAuth || _apiKeyAuthFields == null && _oauth2Fields == null) + { + // Always add the single internal implementation constructor + var authPolicyParam = new ParameterProvider( + "authenticationPolicy", + $"The authentication policy to use for pipeline creation.", + new CSharpType(typeof(AuthenticationPolicy), isNullable: true)); + + var requiredNonAuthParams = GetRequiredParameters(null); + ParameterProvider[] internalConstructorParameters = [authPolicyParam, _endpointParameter, .. requiredNonAuthParams, ClientOptionsParameter]; + + // Use the first available auth fields to determine pipeline auth type + AuthFields? firstAuthFields = _apiKeyAuthFields as AuthFields ?? _oauth2Fields; + var internalConstructor = new ConstructorProvider( + new ConstructorSignature(Type, _publicCtorDescription, MethodSignatureModifiers.Internal, internalConstructorParameters), + BuildPrimaryConstructorBody(internalConstructorParameters, firstAuthFields, authPolicyParam, ClientOptions, ClientOptionsParameter, addExplicitValidation: true), + this); + primaryConstructors.Add(internalConstructor); + } + // if there is key auth if (_apiKeyAuthFields != null) { - AppendConstructors(_apiKeyAuthFields, primaryConstructors, secondaryConstructors); + AppendPublicConstructors(_apiKeyAuthFields, primaryConstructors, secondaryConstructors); } // if there is oauth2 auth if (_oauth2Fields != null) { - AppendConstructors(_oauth2Fields, primaryConstructors, secondaryConstructors); + AppendPublicConstructors(_oauth2Fields, primaryConstructors, secondaryConstructors); } bool onlyContainsUnsupportedAuth = _inputAuth != null && _apiKeyAuthFields == null && _oauth2Fields == null; // if there is no auth if (_apiKeyAuthFields == null && _oauth2Fields == null) { - AppendConstructors(null, primaryConstructors, secondaryConstructors, onlyContainsUnsupportedAuth); + AppendPublicConstructors(null, primaryConstructors, secondaryConstructors, onlyContainsUnsupportedAuth); } var shouldIncludeMockingConstructor = !onlyContainsUnsupportedAuth && secondaryConstructors.All(c => c.Signature.Parameters.Count > 0); + var settingsConstructors = BuildSettingsConstructors(); + return shouldIncludeMockingConstructor - ? [ConstructorProviderHelper.BuildMockingConstructor(this), .. secondaryConstructors, .. primaryConstructors] - : [.. secondaryConstructors, .. primaryConstructors]; + ? [ConstructorProviderHelper.BuildMockingConstructor(this), .. secondaryConstructors, .. primaryConstructors, .. settingsConstructors] + : [.. secondaryConstructors, .. primaryConstructors, .. settingsConstructors]; - void AppendConstructors( + void AppendPublicConstructors( AuthFields? authFields, List primaryConstructors, List secondaryConstructors, bool onlyContainsUnsupportedAuth = false) { + // Public constructor with credential parameter — delegates to the internal constructor. var requiredParameters = GetRequiredParameters(authFields?.AuthField); ParameterProvider[] primaryConstructorParameters = [_endpointParameter, .. requiredParameters, ClientOptionsParameter]; - // If auth exists but it's not supported, we will make the constructor internal. var constructorModifier = onlyContainsUnsupportedAuth ? MethodSignatureModifiers.Internal : MethodSignatureModifiers.Public; + + // Build the auth policy expression for the this() initializer + ValueExpression authPolicyArg = BuildAuthPolicyArgument(authFields, requiredParameters); + var initializerArgs = new List { authPolicyArg, _endpointParameter }; + // Add non-auth required parameters from the SAME parameter list (requiredParameters) + // to ensure the initializer references the same objects as the constructor signature. + string? authParamName = authFields != null + ? (authFields.AuthField.Name != TokenProviderFieldName ? CredentialParamName : authFields.AuthField.AsParameter.Name) + : null; + foreach (var p in requiredParameters) + { + if (authParamName == null || p.Name != authParamName) + { + initializerArgs.Add(p); + } + } + initializerArgs.Add(ClientOptionsParameter!); + var primaryConstructor = new ConstructorProvider( - new ConstructorSignature(Type, _publicCtorDescription, constructorModifier, primaryConstructorParameters), - BuildPrimaryConstructorBody(primaryConstructorParameters, authFields, ClientOptions, ClientOptionsParameter), + new ConstructorSignature(Type, _publicCtorDescription, constructorModifier, primaryConstructorParameters, + initializer: new ConstructorInitializer(false, initializerArgs)), + MethodBodyStatement.Empty, this); - primaryConstructors.Add(primaryConstructor); // If the endpoint parameter contains an initialization value, it is not required. @@ -602,67 +705,170 @@ void AppendConstructors( } } + private IEnumerable BuildSettingsConstructors() + { + if (ClientSettings == null || ClientSettings.EndpointProperty == null) + { + yield break; + } + + // Only publicly constructible clients should get the Settings constructor. + // Internal clients (e.g., those made internal via custom code) cannot be + // constructed by consumers, so a public Settings constructor is not useful. + if (!DeclarationModifiers.HasFlag(TypeSignatureModifiers.Public)) + { + yield break; + } + + var settingsParam = new ParameterProvider(SettingsParamName, $"The settings for {Name}.", ClientSettings.Type); + var experimentalAttr = new AttributeStatement(typeof(ExperimentalAttribute), [Literal(ClientSettingsProvider.ClientSettingsDiagnosticId)]); + + // Build the arguments for the this(...) internal constructor initializer: + // this(AuthenticationPolicy.Create(settings), settings?.Endpoint, otherParams..., settings?.Options) + var args = new List(); + + // auth policy argument: AuthenticationPolicy.Create(settings) +#pragma warning disable SCME0002 + args.Add(Static(typeof(AuthenticationPolicy)).Invoke("Create", settingsParam)); +#pragma warning restore SCME0002 + + // endpoint argument - we know EndpointProperty is not null at this point + args.Add(new MemberExpression(new NullConditionalExpression(settingsParam), ClientSettings.EndpointProperty.Name)); + + // other required parameters (non-auth, non-endpoint) in primary constructor order + foreach (var param in ClientSettings.OtherRequiredParams) + { + var propName = param.Name.ToIdentifierName(); + var propAccess = new MemberExpression(new NullConditionalExpression(settingsParam), propName); + // Value types (enums, primitives) need ?? default since null-conditional returns T? + ValueExpression arg = param.Type.IsValueType + ? propAccess.NullCoalesce(new KeywordExpression("default", null)) + : propAccess; + args.Add(arg); + } + + // options argument + args.Add(new MemberExpression(new NullConditionalExpression(settingsParam), "Options")); + + var settingsConstructor = new ConstructorProvider( + new ConstructorSignature( + Type, + $"Initializes a new instance of {Name} from a .", + MethodSignatureModifiers.Public, + [settingsParam], + attributes: [experimentalAttr], + initializer: new ConstructorInitializer(false, args)), + MethodBodyStatement.Empty, + this); + + yield return settingsConstructor; + } + private void AppendSubClientPublicConstructors(List constructors) { // For sub-clients that can be initialized individually, we need to create public constructors - // similar to the root client constructors but adapted for sub-client needs + // with the same auth pattern as the root client. var primaryConstructors = new List(); var secondaryConstructors = new List(); - // if there is key auth + var rootClient = GetRootClient(); + var clientOptionsParameter = rootClient?.ClientOptionsParameter; + var clientOptionsProvider = rootClient?.ClientOptions; + + if (clientOptionsParameter == null || clientOptionsProvider == null) + { + return; + } + + // Add the internal AuthenticationPolicy constructor first — public constructors chain to it. + var authPolicyParam = new ParameterProvider( + "authenticationPolicy", + $"The authentication policy to use for pipeline creation.", + new CSharpType(typeof(AuthenticationPolicy), isNullable: true)); + + var requiredNonAuthParams = GetRequiredParameters(null); + ParameterProvider[] internalConstructorParameters = [authPolicyParam, _endpointParameter, .. requiredNonAuthParams, clientOptionsParameter]; + + var internalConstructor = new ConstructorProvider( + new ConstructorSignature(Type, _publicCtorDescription, MethodSignatureModifiers.Internal, internalConstructorParameters), + BuildPrimaryConstructorBody(internalConstructorParameters, null, authPolicyParam, clientOptionsProvider, clientOptionsParameter, addExplicitValidation: true), + this); + primaryConstructors.Add(internalConstructor); + + // Add public constructors with auth — same pattern as root client if (_apiKeyAuthFields != null) { AppendSubClientPublicConstructorsForAuth(_apiKeyAuthFields, primaryConstructors, secondaryConstructors); } - // if there is oauth2 auth if (_oauth2Fields != null) { AppendSubClientPublicConstructorsForAuth(_oauth2Fields, primaryConstructors, secondaryConstructors); } - // if there is no auth + bool onlyContainsUnsupportedAuth = _inputAuth != null && _apiKeyAuthFields == null && _oauth2Fields == null; if (_apiKeyAuthFields == null && _oauth2Fields == null) { - AppendSubClientPublicConstructorsForAuth(null, primaryConstructors, secondaryConstructors); + AppendSubClientPublicConstructorsForAuth(null, primaryConstructors, secondaryConstructors, onlyContainsUnsupportedAuth); } constructors.AddRange(secondaryConstructors); constructors.AddRange(primaryConstructors); + // Add Settings constructor for individually-initialized sub-clients + foreach (var settingsConstructor in BuildSettingsConstructors()) + { + constructors.Add(settingsConstructor); + } + void AppendSubClientPublicConstructorsForAuth( AuthFields? authFields, List primaryConstructors, - List secondaryConstructors) - { - // For a sub-client with individual initialization, we need: - // - endpoint parameter - // - auth parameter (if auth exists) - // - client options parameter (we need to get this from the root client) - var rootClient = GetRootClient(); - var clientOptionsParameter = rootClient?.ClientOptionsParameter; - var clientOptionsProvider = rootClient?.ClientOptions; - if (clientOptionsParameter == null || clientOptionsProvider == null) + List secondaryConstructors, + bool onlyContainsUnsupportedAuth = false) + { + // Public constructor with credential parameter — delegates to the internal constructor via this(...). + var requiredParameters = GetRequiredParameters(authFields?.AuthField); + ParameterProvider[] primaryConstructorParameters = [_endpointParameter, .. requiredParameters, clientOptionsParameter]; + var constructorModifier = onlyContainsUnsupportedAuth ? MethodSignatureModifiers.Internal : MethodSignatureModifiers.Public; + + // Build the auth policy expression for the this() initializer + ValueExpression authPolicyArg = BuildAuthPolicyArgument(authFields, requiredParameters); + var initializerArgs = new List { authPolicyArg, _endpointParameter }; + string? authParamName = authFields != null + ? (authFields.AuthField.Name != TokenProviderFieldName ? CredentialParamName : authFields.AuthField.AsParameter.Name) + : null; + foreach (var p in requiredParameters) { - // Cannot create public constructor without client options - return; + if (authParamName == null || p.Name != authParamName) + { + initializerArgs.Add(p); + } } + initializerArgs.Add(clientOptionsParameter!); - var requiredParameters = GetRequiredParameters(authFields?.AuthField); - ParameterProvider[] primaryConstructorParameters = [_endpointParameter, .. requiredParameters, clientOptionsParameter]; var primaryConstructor = new ConstructorProvider( - new ConstructorSignature(Type, _publicCtorDescription, MethodSignatureModifiers.Public, primaryConstructorParameters), - BuildPrimaryConstructorBody(primaryConstructorParameters, authFields, clientOptionsProvider, clientOptionsParameter), + new ConstructorSignature(Type, _publicCtorDescription, constructorModifier, primaryConstructorParameters, + initializer: new ConstructorInitializer(false, initializerArgs)), + MethodBodyStatement.Empty, this); - primaryConstructors.Add(primaryConstructor); // If the endpoint parameter contains an initialization value, it is not required. ParameterProvider[] secondaryConstructorParameters = _endpointParameter.InitializationValue is null ? [_endpointParameter, .. requiredParameters] : [.. requiredParameters]; - var secondaryConstructor = BuildSecondaryConstructor(secondaryConstructorParameters, primaryConstructorParameters, MethodSignatureModifiers.Public); + var secondaryConstructor = BuildSecondaryConstructor(secondaryConstructorParameters, primaryConstructorParameters, constructorModifier); secondaryConstructors.Add(secondaryConstructor); + + // When endpoint has a default value and there are required parameters, + // add an additional constructor that accepts required parameters + options. + if (_endpointParameter.InitializationValue is not null && requiredParameters.Count > 0) + { + ParameterProvider[] simplifiedConstructorWithOptionsParameters = [.. requiredParameters, clientOptionsParameter]; + var simplifiedConstructorWithOptions = BuildSecondaryConstructor(simplifiedConstructorWithOptionsParameters, primaryConstructorParameters, constructorModifier); + secondaryConstructors.Add(simplifiedConstructorWithOptions); + } } } @@ -705,7 +911,7 @@ private IReadOnlyList GetRequiredParameters(FieldProvider? au var authParameter = authField.AsParameter; if (authField.Name != TokenProviderFieldName) { - authParameter.Update(name: "credential"); + authParameter.Update(name: CredentialParamName); } requiredParameters.Add(authParameter); } @@ -724,29 +930,51 @@ private IReadOnlyList GetRequiredParameters(FieldProvider? au return param; } - private MethodBodyStatement[] BuildPrimaryConstructorBody(IReadOnlyList primaryConstructorParameters, AuthFields? authFields, ClientOptionsProvider? clientOptionsProvider, ParameterProvider? clientOptionsParameter) + private MethodBodyStatement[] BuildPrimaryConstructorBody(IReadOnlyList primaryConstructorParameters, AuthFields? authFields, ParameterProvider? authPolicyParam, ClientOptionsProvider? clientOptionsProvider, ParameterProvider? clientOptionsParameter, bool addExplicitValidation = false) { if (clientOptionsProvider is null || clientOptionsParameter is null) { return [MethodBodyStatement.Empty]; } + + List body = []; + // Add parameter validation assertions explicitly only for internal constructors. + // The framework's automatic validation only applies to public methods, so internal + // implementation constructors need explicit validation since they contain the body. + if (addExplicitValidation) + { + bool hasValidation = false; + foreach (var p in primaryConstructorParameters) + { + if (p.Validation != ParameterValidationType.None) + { + body.Add(ArgumentSnippets.ValidateParameter(p)); + hasValidation = true; + } + } + if (hasValidation) + { + body.Add(MethodBodyStatement.EmptyLine); + } + } + AssignmentExpression endpointAssignment; if (_endpointParameter.Type.Equals(typeof(string))) { var serverTemplate = _inputEndpointParam!.ServerUrlTemplate; + // Build the URI by converting the named placeholders to indexed placeholders and collecting arguments + var (convertedTemplate, templateArgs) = ConvertUriTemplateToFormattableString(serverTemplate!, primaryConstructorParameters); endpointAssignment = EndpointField.Assign( New.Instance(typeof(Uri), - new FormattableStringExpression(serverTemplate!, [_endpointParameter]))); + new FormattableStringExpression(convertedTemplate, templateArgs))); } else { endpointAssignment = EndpointField.Assign(_endpointParameter); } - List body = [ - clientOptionsParameter.Assign(clientOptionsParameter.InitializationValue!, nullCoalesce: true).Terminate(), - MethodBodyStatement.EmptyLine, - endpointAssignment.Terminate() - ]; + body.Add(clientOptionsParameter.Assign(clientOptionsParameter.InitializationValue!, nullCoalesce: true).Terminate()); + body.Add(MethodBodyStatement.EmptyLine); + body.Add(endpointAssignment.Terminate()); // add other parameter assignments to their corresponding fields foreach (var p in primaryConstructorParameters) @@ -767,23 +995,39 @@ private MethodBodyStatement[] BuildPrimaryConstructorBody(IReadOnlyList().KeyAuthorizationPolicy(keyAuthFields.AuthField, keyAuthFields.AuthorizationHeaderField, keyPrefixExpression)); - perRetryPolicies = New.Array(ScmCodeModelGenerator.Instance.TypeFactory.ClientPipelineApi.PipelinePolicyType, isInline: true, [.. perRetryPoliciesList]); - break; - case OAuth2Fields oauth2AuthFields: - perRetryPoliciesList.Add(This.ToApi().TokenAuthorizationPolicy(oauth2AuthFields.AuthField, oauth2AuthFields.AuthorizationScopesField)); - perRetryPolicies = New.Array(ScmCodeModelGenerator.Instance.TypeFactory.ClientPipelineApi.PipelinePolicyType, isInline: true, [.. perRetryPoliciesList]); - break; - default: - perRetryPolicies = New.Array(ScmCodeModelGenerator.Instance.TypeFactory.ClientPipelineApi.PipelinePolicyType, isInline: true, [.. perRetryPoliciesList]); - break; + // Internal implementation constructor: generate a runtime null check for the auth policy. + // No-auth clients pass null, so we must guard against adding null to the policies array. + var pipelinePolicyType = ScmCodeModelGenerator.Instance.TypeFactory.ClientPipelineApi.PipelinePolicyType; + var perRetryWithoutAuth = New.Array(pipelinePolicyType, isInline: true, [.. perRetryPoliciesList]); + var perRetryWithAuth = New.Array(pipelinePolicyType, isInline: true, [.. perRetryPoliciesList, authPolicyParam]); + + body.Add(new IfElseStatement( + authPolicyParam.NotEqual(Null), + PipelineProperty.Assign(This.ToApi().Create(clientOptionsParameter, perRetryWithAuth)).Terminate(), + PipelineProperty.Assign(This.ToApi().Create(clientOptionsParameter, perRetryWithoutAuth)).Terminate())); } + else + { + switch (authFields) + { + case ApiKeyFields keyAuthFields: + ValueExpression? keyPrefixExpression = keyAuthFields.AuthorizationApiKeyPrefixField != null ? (ValueExpression)keyAuthFields.AuthorizationApiKeyPrefixField : null; + perRetryPoliciesList.Add(This.ToApi().KeyAuthorizationPolicy(keyAuthFields.AuthField, keyAuthFields.AuthorizationHeaderField, keyPrefixExpression)); + perRetryPolicies = New.Array(ScmCodeModelGenerator.Instance.TypeFactory.ClientPipelineApi.PipelinePolicyType, isInline: true, [.. perRetryPoliciesList]); + break; + case OAuth2Fields oauth2AuthFields: + perRetryPoliciesList.Add(This.ToApi().TokenAuthorizationPolicy(oauth2AuthFields.AuthField, oauth2AuthFields.AuthorizationScopesField)); + perRetryPolicies = New.Array(ScmCodeModelGenerator.Instance.TypeFactory.ClientPipelineApi.PipelinePolicyType, isInline: true, [.. perRetryPoliciesList]); + break; + default: + perRetryPolicies = New.Array(ScmCodeModelGenerator.Instance.TypeFactory.ClientPipelineApi.PipelinePolicyType, isInline: true, [.. perRetryPoliciesList]); + break; + } - body.Add(PipelineProperty.Assign(This.ToApi().Create(clientOptionsParameter, perRetryPolicies)).Terminate()); + body.Add(PipelineProperty.Assign(This.ToApi().Create(clientOptionsParameter, perRetryPolicies)).Terminate()); + } foreach (var f in Fields) { @@ -797,6 +1041,37 @@ private MethodBodyStatement[] BuildPrimaryConstructorBody(IReadOnlyList + /// Builds the ValueExpression for the AuthenticationPolicy argument passed to the internal constructor initializer. + /// + private ValueExpression BuildAuthPolicyArgument(AuthFields? authFields, IReadOnlyList requiredParameters) + { + if (authFields is ApiKeyFields keyFields) + { + // ApiKeyAuthenticationPolicy.CreateHeaderApiKeyPolicy(credential, AuthorizationHeader, prefix?) + var credParam = requiredParameters.FirstOrDefault(p => p.Name == CredentialParamName); + if (credParam != null) + { + ValueExpression? keyPrefixExpression = keyFields.AuthorizationApiKeyPrefixField != null ? (ValueExpression)keyFields.AuthorizationApiKeyPrefixField : null; + return This.ToApi().KeyAuthorizationPolicy(credParam, keyFields.AuthorizationHeaderField, keyPrefixExpression); + } + } + else if (authFields is OAuth2Fields oauth2Fields) + { + // new BearerTokenPolicy(tokenProvider, AuthorizationScopes) + // The param name is derived from the field name: _tokenProvider → tokenProvider, _tokenCredential → credential + var credParam = requiredParameters.FirstOrDefault(p => + p.Name == TokenProviderFieldName.ToVariableName() || + p.Name == CredentialParamName); + if (credParam != null) + { + return This.ToApi().TokenAuthorizationPolicy(credParam, oauth2Fields.AuthorizationScopesField); + } + } + + return Null; + } + /// /// Builds the secondary constructor for the client. The secondary constructor contains all required parameters as arguments. /// @@ -830,8 +1105,25 @@ [.. primaryCtorOrderedParams.Select(p => secondaryParamNames.Contains(p.Name) ? this); } - public ScmMethodProviderCollection GetMethodCollectionByOperation(InputOperation operation) + public ScmMethodProviderCollection GetMethodCollectionByOperation(InputOperation operation, TypeProvider? backCompatProvider = null) { + if (backCompatProvider != null && backCompatProvider != this) + { + if (_backCompatProvider != backCompatProvider) + { + _backCompatProvider = backCompatProvider; + // reset cache so methods are rebuilt with the new backcompat provider + Reset(); + _methodCache = null; + } + } + else if (_backCompatProvider != null) + { + // backcompat provider was previously set but not requested now — reset to default + _backCompatProvider = null; + Reset(); + _methodCache = null; + } _ = Methods; // Ensure methods are built return MethodCache[operation]; } @@ -870,8 +1162,16 @@ protected override ScmMethodProvider[] BuildMethods() var cachedClientFieldVar = new VariableExpression(subClient.Type, subClient._clientCachingField.Declaration, IsRef: true); List subClientConstructorArgs = new(3); + List accessorMethodParams = []; + + // Identify subclient-specific parameters by comparing with the parent's input parameters. + // Parameters present on both parent and subclient are shared (sourced from parent fields/properties). + var subClientSpecificParamNames = subClient._inputClient.Parameters + .Where(p => !IsSupersededByClientParameter(p, _effectiveClientParamNames.Value)) + .Select(p => p.Name) + .ToHashSet(StringComparer.OrdinalIgnoreCase); - // Populate constructor arguments + // Populate constructor arguments, collecting subclient-specific params for the accessor method signature foreach (var param in subClient._subClientInternalConstructorParams.Value) { if (parentClientProperties.TryGetValue(param.Name, out var parentProperty)) @@ -891,30 +1191,57 @@ protected override ScmMethodProvider[] BuildMethods() subClientConstructorArgs.Add(correspondingApiVersionField.Field); } } + else if (subClientSpecificParamNames.Contains(param.Name)) + { + // This parameter is subclient-specific — expose it as an accessor method parameter. + accessorMethodParams.Add(param); + subClientConstructorArgs.Add(param); + } } - // Create the interlocked compare exchange expression for the body - var interlockedCompareExchange = Static(typeof(Interlocked)).Invoke( - nameof(Interlocked.CompareExchange), - [cachedClientFieldVar, New.Instance(subClient.Type, subClientConstructorArgs), Null]); var factoryMethodName = subClient.Name.EndsWith(ClientSuffix, StringComparison.OrdinalIgnoreCase) ? $"Get{subClient.Name}" : $"Get{subClient.Name}{ClientSuffix}"; - var factoryMethod = new ScmMethodProvider( - new( - factoryMethodName, - $"Initializes a new instance of {subClient.Type.Name}", - MethodSignatureModifiers.Public | MethodSignatureModifiers.Virtual, - subClient.Type, - null, - []), - // return Volatile.Read(ref _cachedClient) ?? Interlocked.CompareExchange(ref _cachedClient, new Client(_pipeline, _keyCredential, _endpoint), null) ?? _cachedClient; - Return( - Static(typeof(Volatile)).Invoke(nameof(Volatile.Read), cachedClientFieldVar) - .NullCoalesce(interlockedCompareExchange.NullCoalesce(subClient._clientCachingField))), - this, - ScmMethodKind.Convenience); + ScmMethodProvider factoryMethod; + if (accessorMethodParams.Count > 0) + { + // When the accessor requires extra parameters, caching is not appropriate + // (different parameter values may produce different client instances). + // Return a new instance directly. + factoryMethod = new ScmMethodProvider( + new( + factoryMethodName, + $"Initializes a new instance of {subClient.Type.Name}", + MethodSignatureModifiers.Public | MethodSignatureModifiers.Virtual, + subClient.Type, + null, + [.. accessorMethodParams]), + Return(New.Instance(subClient.Type, subClientConstructorArgs)), + this, + ScmMethodKind.Convenience); + } + else + { + // No extra params - use the existing caching pattern + var interlockedCompareExchange = Static(typeof(Interlocked)).Invoke( + nameof(Interlocked.CompareExchange), + [cachedClientFieldVar, New.Instance(subClient.Type, subClientConstructorArgs), Null]); + factoryMethod = new ScmMethodProvider( + new( + factoryMethodName, + $"Initializes a new instance of {subClient.Type.Name}", + MethodSignatureModifiers.Public | MethodSignatureModifiers.Virtual, + subClient.Type, + null, + []), + // return Volatile.Read(ref _cachedClient) ?? Interlocked.CompareExchange(ref _cachedClient, new Client(_pipeline, _keyCredential, _endpoint), null) ?? _cachedClient; + Return( + Static(typeof(Volatile)).Invoke(nameof(Volatile.Read), cachedClientFieldVar) + .NullCoalesce(interlockedCompareExchange.NullCoalesce(subClient._clientCachingField))), + this, + ScmMethodKind.Convenience); + } methods.Add(factoryMethod); } @@ -968,7 +1295,12 @@ private Dictionary BuildCurrentMethodSignatures ? originalMethods.Concat(CustomCodeView.Methods) : originalMethods; - return allMethods.ToDictionary(m => m.Signature, m => m, MethodSignature.MethodSignatureComparer); + var result = new Dictionary(MethodSignature.MethodSignatureComparer); + foreach (var method in allMethods) + { + result.TryAdd(method.Signature, method); + } + return result; } private static bool ShouldProcessMethodForBackCompat( @@ -1086,6 +1418,87 @@ private ParameterProvider BuildClientEndpointParameter() }; } + /// Converts a URI template with named placeholders like "{Endpoint}/anomalydetector/{ApiVersion}" + /// to a formattable string format with indexed placeholders like "{0}/anomalydetector/{1}" + /// and returns the corresponding arguments. + private (string Template, List Args) ConvertUriTemplateToFormattableString( + string uriTemplate, + IReadOnlyList parameters) + { + // Build a lookup for parameters by name (case-insensitive) + var paramsByName = new Dictionary(StringComparer.OrdinalIgnoreCase); + foreach (var param in parameters) + { + paramsByName[param.Name] = param; + } + + // Also add the endpoint parameter explicitly (it may have a different name) + if (!paramsByName.ContainsKey(_endpointParameter.Name)) + { + paramsByName[_endpointParameter.Name] = _endpointParameter; + } + + // Also add fields from _additionalClientFields + foreach (var field in _additionalClientFields.Value) + { + // Field names are like "_apiVersion", parameter names are like "ApiVersion" + var paramName = field.Name.TrimStart('_'); + if (!paramsByName.ContainsKey(paramName)) + { + paramsByName[paramName] = field.AsParameter; + } + } + + var args = new List(); + var result = new System.Text.StringBuilder(); + var templateSpan = uriTemplate.AsSpan(); + + while (templateSpan.Length > 0) + { + var openBrace = templateSpan.IndexOf('{'); + if (openBrace < 0) + { + // No more placeholders, append the rest + result.Append(templateSpan); + break; + } + + // Append literal part before the placeholder + result.Append(templateSpan.Slice(0, openBrace)); + templateSpan = templateSpan.Slice(openBrace + 1); + + var closeBrace = templateSpan.IndexOf('}'); + if (closeBrace < 0) + { + // Malformed template, append remaining as-is + result.Append('{'); + result.Append(templateSpan); + break; + } + + var paramName = templateSpan.Slice(0, closeBrace).ToString(); + templateSpan = templateSpan.Slice(closeBrace + 1); + + // Find the corresponding parameter or field + if (paramsByName.TryGetValue(paramName, out var param)) + { + result.Append('{'); + result.Append(args.Count); + result.Append('}'); + args.Add(param.Field ?? (ValueExpression)param); + } + else + { + // Parameter not found - this is a configuration error + throw new InvalidOperationException( + $"URI template placeholder '{{{paramName}}}' in '{uriTemplate}' could not be resolved. " + + $"Available parameters: {string.Join(", ", paramsByName.Keys)}"); + } + } + + return (result.ToString(), args); + } + private IReadOnlyList GetSubClients() { var subClients = new List(_inputClient.Children.Count); @@ -1104,20 +1517,48 @@ private IReadOnlyList GetSubClients() private IReadOnlyList GetAllClientParameters() { - // Get all parameters from the client and its methods + var clientParamNames = _effectiveClientParamNames.Value; + + // Get all parameters from the client and its methods, deduplicating by SerializedName to handle renamed parameters. + // When @paramAlias is used (via @clientInitialization), an operation parameter may map + // to a client parameter via MethodParameterSegments or ParamAlias. Exclude such operation + // parameters since the client parameter supersedes them. var parameters = _inputClient.Parameters.Concat( _inputClient.Methods.SelectMany(m => m.Operation.Parameters) - .Where(p => p.Scope == InputParameterScope.Client)).DistinctBy(p => p.Name).ToArray(); + .Where(p => p.Scope == InputParameterScope.Client) + .Where(p => !IsSupersededByClientParameter(p, clientParamNames))) + .DistinctBy(p => p.SerializedName ?? p.Name).ToArray(); foreach (var subClient in _subClients.Value) { - // Add parameters from sub-clients - parameters = parameters.Concat(subClient.GetAllClientParameters()).DistinctBy(p => p.Name).ToArray(); + // Only hoist ApiVersion parameters from sub-clients; other sub-client parameters should remain on the sub-client. + // Auth parameters are handled separately via dedicated auth fields. + parameters = parameters.Concat(subClient.GetAllClientParameters().Where(p => p.IsApiVersion)).DistinctBy(p => p.SerializedName ?? p.Name).ToArray(); } return parameters; } + /// + /// Determines whether a parameter is superseded by an existing client parameter, + /// either by direct name match or via MethodParameterSegments. + /// + private static bool IsSupersededByClientParameter(InputParameter param, HashSet clientParamNames) + { + if (clientParamNames.Contains(param.Name)) + { + return true; + } + + if (param.MethodParameterSegments is { Count: > 0 } segments && + clientParamNames.Contains(segments[0].Name)) + { + return true; + } + + return false; + } + private FieldProvider BuildTokenCredentialScopesField(InputOAuth2Auth oauth2Auth, CSharpType tokenCredentialType) { return tokenCredentialType.Equals(ClientPipelineProvider.Instance.TokenCredentialType) @@ -1153,7 +1594,7 @@ [new MemberExpression(typeof(GetTokenOptions), nameof(GetTokenOptions.ScopesProp } return new FieldProvider( - FieldModifiers.Private | FieldModifiers.ReadOnly, + FieldModifiers.Private | FieldModifiers.Static | FieldModifiers.ReadOnly, typeof(Dictionary[]), TokenCredentialFlowsFieldName, this, diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientResultProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientResultProvider.cs index 50c312cc161..ab246abdb3d 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientResultProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientResultProvider.cs @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using System.ClientModel.Primitives; using System.ClientModel; +using System.ClientModel.Primitives; using Microsoft.TypeSpec.Generator.Expressions; using Microsoft.TypeSpec.Generator.Input; -using Microsoft.TypeSpec.Generator.Snippets; -using static Microsoft.TypeSpec.Generator.Snippets.Snippet; using Microsoft.TypeSpec.Generator.Primitives; using Microsoft.TypeSpec.Generator.Providers; +using Microsoft.TypeSpec.Generator.Snippets; +using static Microsoft.TypeSpec.Generator.Snippets.Snippet; namespace Microsoft.TypeSpec.Generator.ClientModel.Providers { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientSettingsProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientSettingsProvider.cs new file mode 100644 index 00000000000..69f14aca61c --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientSettingsProvider.cs @@ -0,0 +1,561 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; +using System.IO; +using System.Linq; +using Microsoft.Extensions.Configuration; +using Microsoft.TypeSpec.Generator.Expressions; +using Microsoft.TypeSpec.Generator.Input; +using Microsoft.TypeSpec.Generator.Input.Extensions; +using Microsoft.TypeSpec.Generator.Primitives; +using Microsoft.TypeSpec.Generator.Providers; +using Microsoft.TypeSpec.Generator.Snippets; +using Microsoft.TypeSpec.Generator.Statements; +using static Microsoft.TypeSpec.Generator.Snippets.Snippet; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Providers +{ + public class ClientSettingsProvider : TypeProvider + { + internal const string ClientSettingsDiagnosticId = "SCME0002"; + + private readonly ClientProvider _clientProvider; + +#pragma warning disable SCME0002 // ClientSettings is for evaluation purposes only + internal static readonly CSharpType ClientSettingsType = typeof(ClientSettings); +#pragma warning restore SCME0002 + + internal static readonly CSharpType IConfigurationSectionType = typeof(IConfigurationSection); + + internal ClientSettingsProvider(InputClient inputClient, ClientProvider clientProvider) + { + _clientProvider = clientProvider; + + var inputEndpointParam = inputClient.Parameters + .FirstOrDefault(p => p is InputEndpointParameter ep && ep.IsEndpoint) as InputEndpointParameter; + + if (inputEndpointParam != null) + { + var endpointType = ScmCodeModelGenerator.Instance.TypeFactory.CreateCSharpType(inputEndpointParam.Type); + if (endpointType != null) + { + EndpointProperty = new PropertyProvider( + null, + MethodSignatureModifiers.Public, + endpointType.WithNullable(true), + inputEndpointParam.Name.ToIdentifierName(), + new AutoPropertyBody(true), + this); + } + } + + // Collect non-endpoint, non-apiVersion required parameters (auth params come separately via InputClient.Auth) + OtherRequiredParams = inputClient.Parameters + .Where(p => p.IsRequired && !p.IsApiVersion && + !(p is InputEndpointParameter ep && ep.IsEndpoint)) + .Select(p => ScmCodeModelGenerator.Instance.TypeFactory.CreateParameter(p)) + .Where(p => p != null) + .Select(p => p!) + .ToList(); + } + + /// Gets the endpoint property (name and type) when the client has an endpoint parameter. + internal PropertyProvider? EndpointProperty { get; } + + /// Gets non-endpoint, non-auth required parameters that have settings properties. + internal IReadOnlyList OtherRequiredParams { get; } + + protected override FormattableString BuildDescription() + => $"Represents the settings used to configure a that can be loaded from an ."; + + protected override string BuildRelativeFilePath() => Path.Combine("src", "Generated", $"{Name}.cs"); + + protected override string BuildName() => $"{_clientProvider.Name}Settings"; + + protected override string BuildNamespace() => _clientProvider.Type.Namespace; + + protected override CSharpType BuildBaseType() => ClientSettingsType; + + protected override IReadOnlyList BuildAttributes() + { + return [new AttributeStatement(typeof(ExperimentalAttribute), Literal(ClientSettingsDiagnosticId))]; + } + + protected override PropertyProvider[] BuildProperties() + { + var properties = new List(); + + if (EndpointProperty != null) + { + properties.Add(EndpointProperty); + } + + foreach (var param in OtherRequiredParams) + { + properties.Add(new PropertyProvider( + null, + MethodSignatureModifiers.Public, + param.Type.WithNullable(true), + param.Name.ToIdentifierName(), + new AutoPropertyBody(true), + this)); + } + + // Include custom constructor parameters from custom code (e.g., hand-written constructors + // added via partial classes) that are not already covered by generated parameters. + // Only consider public constructors — internal/private constructors contain infrastructure + // parameters (pipeline, key credentials, etc.) that are not suitable for configuration binding. + var customConstructors = _clientProvider.CustomCodeView?.Constructors; + if (customConstructors != null) + { + var knownProps = new HashSet(properties.Select(p => p.Name)); + knownProps.Add("Credential"); + knownProps.Add("Options"); + foreach (var ctor in customConstructors) + { + if (!ctor.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Public) || + HasSettingsParameter(ctor)) + { + continue; + } + + foreach (var param in ctor.Signature.Parameters) + { + var propName = param.Name.ToIdentifierName(); + if (!knownProps.Contains(propName) && !IsStandardParameterType(param.Type)) + { + properties.Add(new PropertyProvider( + null, + MethodSignatureModifiers.Public, + param.Type.WithNullable(true), + propName, + new AutoPropertyBody(true), + this)); + knownProps.Add(propName); + } + } + } + } + + var clientOptions = _clientProvider.EffectiveClientOptions; + if (clientOptions != null) + { + properties.Add(new PropertyProvider( + null, + MethodSignatureModifiers.Public, + clientOptions.Type.WithNullable(true), + "Options", + new AutoPropertyBody(true), + this)); + } + + return [.. properties]; + } + + protected override MethodProvider[] BuildMethods() + { + var sectionParam = new ParameterProvider("section", $"The configuration section.", IConfigurationSectionType); + var body = new List(); + + if (EndpointProperty != null) + { + AppendBindingForProperty(body, sectionParam, EndpointProperty.Name, EndpointProperty.Name.ToVariableName(), EndpointProperty.Type); + } + + foreach (var param in OtherRequiredParams) + { + var propName = param.Name.ToIdentifierName(); + AppendBindingForProperty(body, sectionParam, propName, param.Name.ToVariableName(), param.Type); + } + + // Bind custom constructor parameters from custom code. + // Only consider public constructors — internal/private constructors contain infrastructure + // parameters (pipeline, key credentials, etc.) that are not suitable for configuration binding. + var customConstructors = _clientProvider.CustomCodeView?.Constructors; + if (customConstructors != null) + { + var knownProps = new HashSet(); + if (EndpointProperty != null) + { + knownProps.Add(EndpointProperty.Name); + } + foreach (var param in OtherRequiredParams) + { + knownProps.Add(param.Name.ToIdentifierName()); + } + knownProps.Add("Credential"); + knownProps.Add("Options"); + foreach (var ctor in customConstructors) + { + if (!ctor.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Public) || + HasSettingsParameter(ctor)) + { + continue; + } + + foreach (var param in ctor.Signature.Parameters) + { + var propName = param.Name.ToIdentifierName(); + if (!knownProps.Contains(propName) && !IsStandardParameterType(param.Type)) + { + AppendBindingForProperty(body, sectionParam, propName, param.Name.ToVariableName(), param.Type); + knownProps.Add(propName); + } + } + } + } + + var clientOptions = _clientProvider.EffectiveClientOptions; + if (clientOptions != null) + { + AppendComplexObjectBinding(body, sectionParam, "Options", "options", clientOptions.Type); + } + + var bindCoreMethod = new MethodProvider( + new MethodSignature( + "BindCore", + $"Binds configuration values from the given section.", + MethodSignatureModifiers.Protected | MethodSignatureModifiers.Override, + null, + null, + [sectionParam]), + new MethodBodyStatements([.. body]), + this); + + return [bindCoreMethod]; + } + + /// + /// Dispatches to the appropriate binding method based on the property type. + /// + internal static void AppendBindingForProperty( + List body, + ParameterProvider sectionParam, + string propName, + string varName, + CSharpType type) + { + // Handle non-framework types (enums, complex objects) + if (!type.IsFrameworkType) + { + if (type.IsEnum) + { + if (type.IsStruct) + { + AppendEnumBinding(body, sectionParam, propName, varName, type); + } + else + { + AppendFixedEnumBinding(body, sectionParam, propName, varName, type); + } + } + else if (type.IsStruct && TryGetStructUnderlyingType(type) is { } underlyingType) + { + // Non-enum struct with a discoverable constructor parameter type. + // Use the constructor's parameter type to pick the correct binding. + if (underlyingType.FrameworkType == typeof(string)) + { + AppendEnumBinding(body, sectionParam, propName, varName, type); + } + else if (underlyingType.FrameworkType == typeof(int) || underlyingType.FrameworkType == typeof(long)) + { + AppendTryParseBinding(body, sectionParam, propName, varName, typeof(int)); + } + else if (underlyingType.FrameworkType == typeof(float) || underlyingType.FrameworkType == typeof(double)) + { + AppendTryParseBinding(body, sectionParam, propName, varName, typeof(double)); + } + else + { + AppendComplexObjectBinding(body, sectionParam, propName, varName, type); + } + } + else + { + AppendComplexObjectBinding(body, sectionParam, propName, varName, type); + } + return; + } + + // Handle collection types (string[]/List) + if (type.IsList) + { + AppendStringListBinding(body, sectionParam, propName, varName, type); + return; + } + + var frameworkType = type.FrameworkType; + + if (frameworkType == typeof(string)) + { + AppendStringBinding(body, sectionParam, propName, varName); + } + else if (frameworkType == typeof(bool)) + { + AppendTryParseBinding(body, sectionParam, propName, varName, typeof(bool)); + } + else if (frameworkType == typeof(int)) + { + AppendTryParseBinding(body, sectionParam, propName, varName, typeof(int)); + } + else if (frameworkType == typeof(long)) + { + AppendTryParseBinding(body, sectionParam, propName, varName, typeof(long)); + } + else if (frameworkType == typeof(float)) + { + AppendTryParseBinding(body, sectionParam, propName, varName, typeof(float)); + } + else if (frameworkType == typeof(double)) + { + AppendTryParseBinding(body, sectionParam, propName, varName, typeof(double)); + } + else if (frameworkType == typeof(TimeSpan)) + { + AppendTryParseBinding(body, sectionParam, propName, varName, typeof(TimeSpan)); + } + else if (frameworkType == typeof(Uri)) + { + AppendUriTryCreateBinding(body, sectionParam, propName, varName); + } + else + { + AppendComplexObjectBinding(body, sectionParam, propName, varName, type); + } + } + + /// + /// Appends a string binding: string? val = section[name]; if (!string.IsNullOrEmpty(val)) PropName = val; + /// + internal static void AppendStringBinding( + List body, + ParameterProvider sectionParam, + string propName, + string varName) + { + body.Add(Declare(varName, new CSharpType(typeof(string), isNullable: true), new IndexerExpression(sectionParam, Literal(propName)), out var valVar)); + var ifStatement = new IfStatement(Not(StringSnippets.IsNullOrEmpty(valVar.As()))); + ifStatement.Add(This.Property(propName).Assign(valVar).Terminate()); + body.Add(ifStatement); + } + + /// + /// Appends a TryParse-based binding statement: if (Type.TryParse(section[name], out Type val)) PropName = val; + /// + internal static void AppendTryParseBinding( + List body, + ParameterProvider sectionParam, + string propName, + string varName, + Type parseType) + { + var outDecl = new DeclarationExpression(parseType, varName, out var parsedVar, isOut: true); + var ifStatement = new IfStatement(Static(parseType).Invoke("TryParse", + new ValueExpression[] + { + new IndexerExpression(sectionParam, Literal(propName)), + outDecl + })); + ifStatement.Add(This.Property(propName).Assign(parsedVar).Terminate()); + body.Add(ifStatement); + } + + /// + /// Appends a Uri.TryCreate binding: if (Uri.TryCreate(section[name], UriKind.Absolute, out Uri val)) PropName = val; + /// + internal static void AppendUriTryCreateBinding( + List body, + ParameterProvider sectionParam, + string propName, + string varName) + { + var outUriDecl = new DeclarationExpression(typeof(Uri), varName, out var uriVar, isOut: true); + var ifStatement = new IfStatement(Static(typeof(Uri)).Invoke("TryCreate", + new ValueExpression[] + { + new IndexerExpression(sectionParam, Literal(propName)), + new MemberExpression(typeof(UriKind), nameof(UriKind.Absolute)), + outUriDecl + })); + ifStatement.Add(This.Property(propName).Assign(uriVar).Terminate()); + body.Add(ifStatement); + } + + /// + /// Appends a string list binding: IConfigurationSection s = section.GetSection(name); + /// if (s.Exists()) { PropName = s.GetChildren().Where(c => c.Value is not null).Select(c => c.Value!).ToList(); } + /// + internal static void AppendStringListBinding( + List body, + ParameterProvider sectionParam, + string propName, + string varName, + CSharpType type) + { + // Only handle List for now + if (type.Arguments.Count == 0 || + !type.Arguments[0].IsFrameworkType || + type.Arguments[0].FrameworkType != typeof(string)) + { + return; + } + + // IConfigurationSection listSection = section.GetSection("PropName"); + body.Add(Declare((propName + "Section").ToVariableName(), IConfigurationSectionType, sectionParam.Invoke("GetSection", Literal(propName)), out var sectionVar)); + + // if (listSection.Exists()) + var ifExistsStatement = new IfStatement(sectionVar.Invoke("Exists")); + + // listSection.GetChildren().Where(c => c.Value is not null).Select(c => c.Value!).ToList() + var cWhereVar = new VariableExpression(IConfigurationSectionType, "c"); + var whereCondition = cWhereVar.Property("Value").IsNot(Null); + var whereLambda = new FuncExpression([cWhereVar.Declaration], whereCondition); + var whereResult = sectionVar.Invoke("GetChildren") + .Invoke("Where", [whereLambda], null, false, extensionType: typeof(Enumerable)); + + var cSelectVar = new VariableExpression(IConfigurationSectionType, "c"); + var selectBody = new UnaryOperatorExpression("!", cSelectVar.Property("Value"), true); + var selectLambda = new FuncExpression([cSelectVar.Declaration], selectBody); + var selectResult = whereResult + .Invoke("Select", [selectLambda], null, false, extensionType: typeof(Enumerable)); + + var toListResult = selectResult.ToList(); + + ifExistsStatement.Add(This.Property(propName).Assign(toListResult).Terminate()); + body.Add(ifExistsStatement); + } + + /// + /// Appends an extensible enum binding: if (section[name] is string val) { PropName = new TypeName(val); } + /// + internal static void AppendEnumBinding( + List body, + ParameterProvider sectionParam, + string propName, + string varName, + CSharpType type) + { + var decl = Declare(varName, new CSharpType(typeof(string)), out var declVar); + var ifStatement = new IfStatement(new IndexerExpression(sectionParam, Literal(propName)).Is(decl)); + ifStatement.Add(This.Property(propName).Assign(New.Instance(type, declVar)).Terminate()); + body.Add(ifStatement); + } + + /// + /// Appends a fixed enum binding: if (Enum.TryParse(section[name], out TypeName val)) { PropName = val; } + /// + internal static void AppendFixedEnumBinding( + List body, + ParameterProvider sectionParam, + string propName, + string varName, + CSharpType type) + { + var outDecl = new DeclarationExpression(type, varName, out var parsedVar, isOut: true); + var ifStatement = new IfStatement(Static(typeof(Enum)).Invoke("TryParse", + new ValueExpression[] + { + new IndexerExpression(sectionParam, Literal(propName)), + outDecl + })); + ifStatement.Add(This.Property(propName).Assign(parsedVar).Terminate()); + body.Add(ifStatement); + } + + /// + /// Appends a complex object binding: IConfigurationSection s = section.GetSection(name); + /// if (s.Exists()) { PropName = new TypeName(s); } + /// + internal static void AppendComplexObjectBinding( + List body, + ParameterProvider sectionParam, + string propName, + string varName, + CSharpType type) + { + // IConfigurationSection {name}Section = section.GetSection("PropName"); + body.Add(Declare((propName + "Section").ToVariableName(), IConfigurationSectionType, sectionParam.Invoke("GetSection", Literal(propName)), out var sectionVar)); + + // if ({name}Section.Exists()) { PropName = new TypeName({name}Section); } + var ifExistsStatement = new IfStatement(sectionVar.Invoke("Exists")); + ifExistsStatement.Add(This.Property(propName).Assign(New.Instance(type, sectionVar)).Terminate()); + body.Add(ifExistsStatement); + } + + /// + /// Finds the single-value constructor parameter type for a non-framework struct type + /// by looking up the type's constructors in custom code. Returns null if no suitable + /// constructor is found. + /// + internal static CSharpType? TryGetStructUnderlyingType(CSharpType type) + { + var typeProvider = CodeModelGenerator.Instance.SourceInputModel + .FindForTypeInCustomization(type.Namespace, type.Name); + + if (typeProvider == null) + { + return null; + } + + foreach (var ctor in typeProvider.Constructors) + { + var parameters = ctor.Signature.Parameters; + if (parameters.Count == 1 && parameters[0].Type.IsFrameworkType) + { + return parameters[0].Type; + } + } + + return null; + } + + /// + /// Checks if a type is a standard client parameter type that should not be included as a + /// custom settings property (credential types, endpoint types, or options types). + /// + internal static bool IsStandardParameterType(CSharpType type) + { + var effectiveType = type.IsNullable ? type.WithNullable(false) : type; + + // Skip endpoint types (Uri) + if (effectiveType.IsFrameworkType && effectiveType.FrameworkType == typeof(Uri)) + { + return true; + } + + // Skip credential types — compare by both type equality and name since the CSharpType + // from CustomCodeView (Roslyn-based) may not directly equal typeof()-based CSharpType. + var tokenCredentialType = ScmCodeModelGenerator.Instance.TypeFactory.ClientPipelineApi.TokenCredentialType; + if (tokenCredentialType != null) + { + if (effectiveType.Equals(tokenCredentialType) || + effectiveType.Name == tokenCredentialType.Name) + { + return true; + } + } + + // Skip options types (derives from ClientPipelineOptions) + var optionsType = ScmCodeModelGenerator.Instance.TypeFactory.ClientPipelineApi.ClientPipelineOptionsType; + if (effectiveType.Equals(optionsType) || effectiveType.Name == optionsType.Name) + { + return true; + } + + return false; + } + + /// + /// Returns true if the constructor has a parameter whose type matches this client's + /// settings type. + /// + internal bool HasSettingsParameter(ConstructorProvider ctor) + { + return ctor.Signature.Parameters.Any(p => p.Type.Name == Type.Name); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/CollectionResultDefinition.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/CollectionResultDefinition.cs index 9d631107d0c..453815faea3 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/CollectionResultDefinition.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/CollectionResultDefinition.cs @@ -94,7 +94,7 @@ public CollectionResultDefinition(ClientProvider client, InputPagingServiceMetho NextTokenField = field; } - if (field.AsParameter.Name == pageSize) + if (string.Equals(field.AsParameter.Name, pageSize, StringComparison.OrdinalIgnoreCase)) { PageSizeField = field; } @@ -182,7 +182,34 @@ private PropertyProvider FindPropertyInModelHierarchy(TypeProvider model, string protected override string BuildNamespace() => Client.Type.Namespace; protected override string BuildName() - => $"{Client.Type.Name}{Operation.Name.ToIdentifierName()}{(IsAsync ? "Async" : "")}CollectionResult{(ItemModelType == null ? "" : "OfT")}"; + { + var operationName = Operation.Name.ToIdentifierName(); + // Check if there is another paging operation in the same client whose name would produce a collision. + // If so, use the OriginalName to differentiate. + if (HasPagingOperationNameCollision(operationName)) + { + operationName = (Operation.OriginalName ?? Operation.Name).ToIdentifierName(); + } + return $"{Client.Type.Name}{operationName}{(IsAsync ? "Async" : "")}CollectionResult{(ItemModelType == null ? "" : "OfT")}"; + } + + private bool HasPagingOperationNameCollision(string operationName) + { + var pagingMethods = Client.InputClient.Methods.OfType(); + int count = 0; + foreach (var method in pagingMethods) + { + if (method.Operation.Name.ToIdentifierName() == operationName) + { + count++; + if (count > 1) + { + return true; + } + } + } + return false; + } protected override TypeSignatureModifiers BuildDeclarationModifiers() => TypeSignatureModifiers.Internal | TypeSignatureModifiers.Partial | TypeSignatureModifiers.Class; @@ -344,7 +371,10 @@ private MethodBodyStatement[] BuildGetContinuationToken() { Return(Static(typeof(ContinuationToken)) .Invoke("FromBytes", BinaryDataSnippets.FromString( - nextPageVariable.Property("AbsoluteUri")))) + new TernaryConditionalExpression( + nextPageVariable.Property(nameof(Uri.IsAbsoluteUri)), + nextPageVariable.Property(nameof(Uri.AbsoluteUri)), + nextPageVariable.Property(nameof(Uri.OriginalString)))))) }, Return(Null)) : new IfElseStatement(new IfStatement(Not(Static().Invoke(nameof(string.IsNullOrEmpty), nextPageVariable))) @@ -501,7 +531,7 @@ protected MethodBodyStatement[] AssignAndCheckNextPageVariable(ClientResponseApi { YieldBreak() }, - nextPage.Assign(New.Instance(nextPageString)).Terminate() + nextPage.Assign(New.Instance(nextPageString, FrameworkEnumValue(UriKind.RelativeOrAbsolute))).Terminate() ]; case InputResponseLocation.Header: return @@ -511,7 +541,7 @@ protected MethodBodyStatement[] AssignAndCheckNextPageVariable(ClientResponseApi .And(Not(Static().Invoke(nameof(string.IsNullOrEmpty), nextLinkHeader!)))) { nextPage.Type.Equals(typeof(Uri)) ? - nextPage.Assign(New.Instance(nextLinkHeader!)).Terminate() : + nextPage.Assign(New.Instance(nextLinkHeader!, FrameworkEnumValue(UriKind.RelativeOrAbsolute))).Terminate() : nextPage.Assign(nextLinkHeader!).Terminate(), }, YieldBreak()) @@ -528,7 +558,7 @@ private ScopedApi InvokeCreateRequestForNextLink(ValueExpressio Client.RestClient.GetCreateNextLinkRequestMethod(Operation).Signature.Name; return ClientField.Invoke( createNextLinkRequestMethodName, - [nextPageUri, ..RequestFields]) + [nextPageUri, .. RequestFields]) .As(); } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelSerializationExtensionsDefinition.Xml.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelSerializationExtensionsDefinition.Xml.cs new file mode 100644 index 00000000000..a905391ece9 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelSerializationExtensionsDefinition.Xml.cs @@ -0,0 +1,262 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; +using System.ClientModel.Primitives; +using System.IO; +using System.Xml; +using System.Xml.Linq; +using Microsoft.TypeSpec.Generator.ClientModel.Snippets; +using Microsoft.TypeSpec.Generator.Expressions; +using Microsoft.TypeSpec.Generator.Primitives; +using Microsoft.TypeSpec.Generator.Providers; +using Microsoft.TypeSpec.Generator.Snippets; +using Microsoft.TypeSpec.Generator.Statements; +using static Microsoft.TypeSpec.Generator.Snippets.Snippet; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Providers +{ + public sealed partial class ModelSerializationExtensionsDefinition + { + private const string XmlWriterSettingsFieldName = "XmlWriterSettings"; + private const string XmlReaderSettingsFieldName = "XmlReaderSettings"; + + private readonly ParameterProvider _xElementParameter = + new("element", FormattableStringHelpers.Empty, typeof(XElement)); + + private readonly ParameterProvider _xmlWriterParameter = + new("writer", FormattableStringHelpers.Empty, typeof(XmlWriter)); + + private FieldProvider _xmlWriterSettingsField; + private FieldProvider _xmlReaderSettingsField; + + private FieldProvider[] BuildXmlFields() + { + if (!ScmCodeModelGenerator.Instance.InputLibrary.HasXmlModelSerialization) + { + return []; + } + + return [_xmlWriterSettingsField, _xmlReaderSettingsField]; + } + + private MethodProvider[] BuildXmlExtensionMethods() + { + if (!ScmCodeModelGenerator.Instance.InputLibrary.HasXmlModelSerialization) + { + return []; + } + + return + [ + BuildXmlGetDateTimeOffsetMethodProvider(), + BuildXmlGetTimeSpanMethodProvider(), + BuildXmlGetBytesFromBase64MethodProvider(), + BuildXmlWriteStringValueDateTimeOffsetMethodProvider(), + BuildXmlWriteStringValueTimeSpanMethodProvider(), + BuildXmlWriteBase64StringValueMethodProvider(), + BuildXmlWriteObjectValueMethodProvider() + ]; + } + + private MethodProvider BuildXmlGetDateTimeOffsetMethodProvider() + { + var signature = new MethodSignature( + Name: _getDateTimeOffsetMethodName, + Modifiers: _methodModifiers, + Parameters: [_xElementParameter, _formatParameter], + ReturnType: typeof(DateTimeOffset), + Description: null, + ReturnDescription: null); + + var element = _xElementParameter.As(); + var body = new SwitchExpression( + _formatParameter, + new SwitchCaseExpression(Literal("U"), DateTimeOffsetSnippets.FromUnixTimeSeconds(element.CastTo(typeof(long)))), + SwitchCaseExpression.Default(TypeFormattersSnippets.ParseDateTimeOffset(element.Value(), _formatParameter))); + + return new MethodProvider(signature, body, this, XmlDocProvider.Empty); + } + + private MethodProvider BuildXmlGetTimeSpanMethodProvider() + { + var signature = new MethodSignature( + Name: _getTimeSpanMethodName, + Modifiers: _methodModifiers, + Parameters: [_xElementParameter, _formatParameter], + ReturnType: typeof(TimeSpan), + Description: null, + ReturnDescription: null); + + var element = _xElementParameter.As(); + var body = TypeFormattersSnippets.ParseTimeSpan(element.Value(), _formatParameter); + + return new MethodProvider(signature, body, this, XmlDocProvider.Empty); + } + + private MethodProvider BuildXmlGetBytesFromBase64MethodProvider() + { + var signature = new MethodSignature( + Name: _getBytesFromBase64MethodName, + Modifiers: _methodModifiers, + Parameters: [_xElementParameter, _formatParameter], + ReturnType: typeof(byte[]), + Description: null, + ReturnDescription: null); + + var element = _xElementParameter.As(); + var body = new SwitchExpression( + _formatParameter, + new SwitchCaseExpression(Literal("U"), TypeFormattersSnippets.FromBase64UrlString(element.Value())), + new SwitchCaseExpression(Literal("D"), Static(typeof(Convert)).Invoke(nameof(Convert.FromBase64String), element.Value())), + SwitchCaseExpression.Default(ThrowExpression(New.ArgumentException(_formatParameter, Literal("Format is not supported: "), true)))); + + return new MethodProvider(signature, body, this, XmlDocProvider.Empty); + } + + private MethodProvider BuildXmlWriteStringValueDateTimeOffsetMethodProvider() + { + var valueParameter = new ParameterProvider("value", FormattableStringHelpers.Empty, typeof(DateTimeOffset)); + var signature = new MethodSignature( + Name: WriteStringValueMethodName, + Modifiers: _methodModifiers, + Parameters: [_xmlWriterParameter, valueParameter, _formatParameter], + ReturnType: null, + Description: null, + ReturnDescription: null); + + var writer = _xmlWriterParameter.As(); + var body = writer.WriteValue(TypeFormattersSnippets.ToString(valueParameter, _formatParameter)); + + return new MethodProvider(signature, body, this, XmlDocProvider.Empty); + } + + private MethodProvider BuildXmlWriteStringValueTimeSpanMethodProvider() + { + var valueParameter = new ParameterProvider("value", FormattableStringHelpers.Empty, typeof(TimeSpan)); + var signature = new MethodSignature( + Name: WriteStringValueMethodName, + Modifiers: _methodModifiers, + Parameters: [_xmlWriterParameter, valueParameter, _formatParameter], + ReturnType: null, + Description: null, + ReturnDescription: null); + + var writer = _xmlWriterParameter.As(); + var body = writer.WriteValue(TypeFormattersSnippets.ToString(valueParameter, _formatParameter)); + + return new MethodProvider(signature, body, this, XmlDocProvider.Empty); + } + + private MethodProvider BuildXmlWriteBase64StringValueMethodProvider() + { + var valueParameter = new ParameterProvider("value", FormattableStringHelpers.Empty, typeof(byte[])); + var signature = new MethodSignature( + Name: WriteBase64StringValueMethodName, + Modifiers: _methodModifiers, + Parameters: [_xmlWriterParameter, valueParameter, _formatParameter], + ReturnType: null, + Description: null, + ReturnDescription: null); + + var writer = _xmlWriterParameter.As(); + var body = writer.WriteValue(TypeFormattersSnippets.ToString(valueParameter, _formatParameter)); + + return new MethodProvider(signature, body, this, XmlDocProvider.Empty); + } + + private MethodProvider BuildXmlWriteObjectValueMethodProvider() + { + var valueParameter = new ParameterProvider("value", FormattableStringHelpers.Empty, _t); + var optionsParameter = new ParameterProvider( + "options", + FormattableStringHelpers.Empty, + new CSharpType(typeof(ModelReaderWriterOptions), isNullable: true), + DefaultOf(new CSharpType(typeof(ModelReaderWriterOptions), isNullable: true))); + var nameHintParameter = new ParameterProvider( + "nameHint", + FormattableStringHelpers.Empty, + new CSharpType(typeof(string), isNullable: true), + DefaultOf(new CSharpType(typeof(string), isNullable: true))); + + var signature = new MethodSignature( + Name: WriteObjectValueMethodName, + Modifiers: _methodModifiers, + Parameters: [_xmlWriterParameter, valueParameter, optionsParameter, nameHintParameter], + ReturnType: null, + GenericArguments: [_t], + Description: null, + ReturnDescription: null); + + var writer = _xmlWriterParameter.As(); + ValueExpression value = valueParameter; + ValueExpression options = optionsParameter; + ValueExpression nameHint = nameHintParameter; + + // Build the switch statement + var persistableModelType = new CSharpType(typeof(IPersistableModel<>), _t); + var dataVar = new VariableExpression(typeof(BinaryData), "data"); + + // Create outer using scope to capture streamVar + var outerUsing = new UsingScopeStatement(typeof(Stream), "stream", dataVar.As().ToStream(), out var streamVar); + + // Create inner using scope to capture readerVar + var innerUsing = new UsingScopeStatement( + typeof(XmlReader), + "reader", + XmlReaderSnippets.Create(streamVar, new MemberExpression(null, XmlReaderSettingsFieldName)), + out var readerVar); + + var readerTyped = readerVar.As(); + var writeNodeLoop = new WhileStatement(readerTyped.NodeType().NotEqual(new MemberExpression(typeof(XmlNodeType), nameof(XmlNodeType.EndElement)))) + { + writer.WriteNode(readerVar, True) + }; + + var nameHintBranch = new IfElseStatement( + nameHint.NotEqual(Null), + new MethodBodyStatement[] + { + writer.WriteStartElement(nameHint), + readerTyped.ReadStartElement(), + writeNodeLoop, + writer.WriteEndElement(), + }, + new MethodBodyStatement[] + { + readerTyped.ReadStartElement(), + new WhileStatement(readerTyped.NodeType().NotEqual(new MemberExpression(typeof(XmlNodeType), nameof(XmlNodeType.EndElement)))) + { + writer.WriteNode(readerVar, True) + } + }); + + innerUsing.AddRange([readerTyped.MoveToContent(), nameHintBranch]); + outerUsing.Add(innerUsing); + + var persistableModelCase = new SwitchCaseStatement( + Declare("persistableModel", persistableModelType, out var persistableModelVar), + new MethodBodyStatement[] + { + Declare( + dataVar, + Static(typeof(ModelReaderWriter)).Invoke( + nameof(ModelReaderWriter.Write), + [ + persistableModelVar, + options.NullCoalesce(ModelSerializationExtensionsSnippets.Wire), + ModelReaderWriterContextSnippets.Default + ])), + outerUsing, + Return() + }); + + var defaultCase = SwitchCaseStatement.Default( + Throw(New.NotSupportedException(new FormattableStringExpression("Not supported type {0}", [new TypeOfExpression(_t)])))); + + var body = new SwitchStatement(value, [persistableModelCase, defaultCase]); + + return new MethodProvider(signature, body, this, XmlDocProvider.Empty); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelSerializationExtensionsDefinition.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelSerializationExtensionsDefinition.cs index 5a839f27088..d0408674b83 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelSerializationExtensionsDefinition.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelSerializationExtensionsDefinition.cs @@ -8,10 +8,10 @@ using System.Diagnostics; using System.Globalization; using System.IO; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; using System.Text.Json; +using System.Xml; using Microsoft.TypeSpec.Generator.ClientModel.Primitives; using Microsoft.TypeSpec.Generator.ClientModel.Snippets; using Microsoft.TypeSpec.Generator.Expressions; @@ -23,7 +23,7 @@ namespace Microsoft.TypeSpec.Generator.ClientModel.Providers { - public sealed class ModelSerializationExtensionsDefinition : TypeProvider + public sealed partial class ModelSerializationExtensionsDefinition : TypeProvider { public const string WireOptionsFieldName = "WireOptions"; public const string JsonDocumentOptionsFieldName = "JsonDocumentOptions"; @@ -64,6 +64,31 @@ public ModelSerializationExtensionsDefinition() initializationValue: New.Instance(typeof(JsonDocumentOptions), new Dictionary { [Identifier("MaxDepth")] = Int(256) }), enclosingType: this); + _xmlWriterSettingsField = new FieldProvider( + modifiers: FieldModifiers.Internal | FieldModifiers.Static | FieldModifiers.ReadOnly, + type: typeof(XmlWriterSettings), + name: XmlWriterSettingsFieldName, + initializationValue: New.Instance(typeof(XmlWriterSettings), + new Dictionary + { + [Identifier("Encoding")] = New.Instance(False) + }), + enclosingType: this); + + _xmlReaderSettingsField = new FieldProvider( + modifiers: FieldModifiers.Private | FieldModifiers.Static | FieldModifiers.ReadOnly, + type: typeof(XmlReaderSettings), + name: XmlReaderSettingsFieldName, + initializationValue: New.Instance(typeof(XmlReaderSettings), + new Dictionary + { + [Identifier("DtdProcessing")] = new MemberExpression(typeof(DtdProcessing), nameof(DtdProcessing.Prohibit)), + [Identifier("XmlResolver")] = Null, + [Identifier("MaxCharactersInDocument")] = Literal(30_000_000), + [Identifier("IgnoreProcessingInstructions")] = True, + [Identifier("IgnoreComments")] = True + }), + enclosingType: this); } protected override TypeSignatureModifiers BuildDeclarationModifiers() @@ -80,7 +105,7 @@ protected override TypeSignatureModifiers BuildDeclarationModifiers() protected override FieldProvider[] BuildFields() { - return [WireOptionsField, _jsonDocumentOptionsField]; + return [WireOptionsField, _jsonDocumentOptionsField, .. BuildXmlFields()]; } protected override MethodProvider[] BuildMethods() @@ -158,7 +183,8 @@ protected override MethodProvider[] BuildMethods() BuildWriteObjectValueMethodGeneric(), BuildWriteObjectValueMethodProvider(), BuildGetUtf8BytesMethodProvider(), - .. BuildDynamicModelHelpers() + .. BuildDynamicModelHelpers(), + .. BuildXmlExtensionMethods() ]; } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/MrwSerializationTypeDefinition.Dynamic.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/MrwSerializationTypeDefinition.Dynamic.cs index c62dfd0df8b..ecffc906348 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/MrwSerializationTypeDefinition.Dynamic.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/MrwSerializationTypeDefinition.Dynamic.cs @@ -309,7 +309,7 @@ private MethodBodyStatement[] BuildDynamicPropertyIfStatements( // Add direct dynamic properties var dynamicProperties = properties.Where(p => - p.WireInfo?.SerializedName != null && + p.WireInfo != null && ScmCodeModelGenerator.Instance.TypeFactory.CSharpTypeMap.TryGetValue(p.Type, out var provider) && provider is ScmModelProvider { JsonPatchProperty: not null }); allDynamicProperties.AddRange(dynamicProperties); @@ -317,7 +317,7 @@ private MethodBodyStatement[] BuildDynamicPropertyIfStatements( // Add dynamic collection properties var dynamicCollectionProperties = properties .Where(p => p.Type.IsCollection && - p.WireInfo?.SerializedName != null && + p.WireInfo != null && ScmCodeModelGenerator.Instance.TypeFactory.CSharpTypeMap.TryGetValue( p.Type.GetNestedElementType(), out var provider) && @@ -333,8 +333,9 @@ private MethodBodyStatement[] BuildDynamicPropertyIfStatements( foreach (var property in allDynamicProperties) { var patchProperty = ((MemberExpression)property).Property("Patch").As(); + var jsonSerializedName = GetJsonSerializedName(property.WireInfo!); statements.Add( - new IfStatement(localVariable.Invoke("StartsWith", LiteralU8(property.WireInfo!.SerializedName))) + new IfStatement(localVariable.Invoke("StartsWith", LiteralU8(jsonSerializedName))) { propagateGet ? Return(patchProperty.TryGetEncodedValue( @@ -342,7 +343,7 @@ private MethodBodyStatement[] BuildDynamicPropertyIfStatements( Spread(LiteralU8("$")), Spread(ReadOnlySpanSnippets.Slice( localVariable, - LiteralU8(property.WireInfo!.SerializedName).Property("Length")))), + LiteralU8(jsonSerializedName).Property("Length")))), valueParameter)) : new MethodBodyStatement[] { @@ -351,7 +352,7 @@ private MethodBodyStatement[] BuildDynamicPropertyIfStatements( Spread(LiteralU8("$")), Spread(ReadOnlySpanSnippets.Slice( localVariable, - LiteralU8(property.WireInfo!.SerializedName).Property("Length")))), + LiteralU8(jsonSerializedName).Property("Length")))), valueParameter), Return(True) } @@ -363,7 +364,7 @@ private MethodBodyStatement[] BuildDynamicPropertyIfStatements( var indexableProperty = new IndexableExpression(property); statements.Add( new IfStatement( - localVariable.Invoke("StartsWith", LiteralU8(property.WireInfo!.SerializedName))) + localVariable.Invoke("StartsWith", LiteralU8(GetJsonSerializedName(property.WireInfo!)))) { BuildCollectionIfStatements( property, @@ -393,7 +394,7 @@ private static MethodBodyStatement[] BuildCollectionIfStatements( ValueExpression? remainderSlice = null; statements.Add(Declare("propertyLength", typeof(int), - LiteralU8(property.WireInfo!.SerializedName).Property("Length"), + LiteralU8(GetJsonSerializedName(property.WireInfo!)).Property("Length"), out var propertyLength)); statements.Add(Declare("currentSlice", typeof(ReadOnlySpan), @@ -503,14 +504,14 @@ private static string BuildJsonPathForElement(string propertySerializedName, Lis private static ValueExpression GetDeserializationMethodInvocationForType( ModelProvider model, - ScopedApi jsonElementVariable, + ScopedApi element, ValueExpression? dataVariable = null, ValueExpression? optionsVariable = null) { optionsVariable ??= ModelSerializationExtensionsSnippets.Wire; return model is ScmModelProvider { IsDynamicModel: true } - ? model.Type.Deserialize(jsonElementVariable, dataVariable, optionsVariable) - : model.Type.Deserialize(jsonElementVariable, null, optionsVariable); + ? model.Type.Deserialize(element, dataVariable, optionsVariable) + : model.Type.Deserialize(element, null, optionsVariable); } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/MrwSerializationTypeDefinition.Xml.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/MrwSerializationTypeDefinition.Xml.cs new file mode 100644 index 00000000000..1cb7f967592 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/MrwSerializationTypeDefinition.Xml.cs @@ -0,0 +1,1304 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Net; +using System.Text.Json; +using System.Xml; +using System.Xml.Linq; +using Microsoft.TypeSpec.Generator.ClientModel.Primitives; +using Microsoft.TypeSpec.Generator.ClientModel.Snippets; +using Microsoft.TypeSpec.Generator.Expressions; +using Microsoft.TypeSpec.Generator.Input; +using Microsoft.TypeSpec.Generator.Input.Extensions; +using Microsoft.TypeSpec.Generator.Primitives; +using Microsoft.TypeSpec.Generator.Providers; +using Microsoft.TypeSpec.Generator.Snippets; +using Microsoft.TypeSpec.Generator.SourceInput; +using Microsoft.TypeSpec.Generator.Statements; +using static Microsoft.TypeSpec.Generator.Snippets.Snippet; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Providers +{ + public partial class MrwSerializationTypeDefinition + { + private const string XmlWriteMethodName = "WriteXml"; + private const string XmlModelWriteCoreMethodName = "XmlModelWriteCore"; + private readonly ParameterProvider _xmlWriterParameter = new("writer", $"The XML writer.", typeof(XmlWriter)); + private readonly ParameterProvider _xElementDeserializationParam = new("element", $"The xml element to deserialize.", typeof(XElement)); + private readonly ParameterProvider _nameHintParameter = new("nameHint", $"An optional name hint.", typeof(string)); + private readonly ScopedApi _xmlElementParameterSnippet; + private ScopedApi _xmlWriterSnippet; + private const string ContentTypeHeader = "Content-Type"; + + private record XmlPropertyInfo( + string PropertyName, + CSharpType PropertyType, + MemberExpression SerializationExp, + VariableExpression DeserializationExp, + XmlSerialization XmlWireInfo, + SerializationFormat SerializationFormat, + IEnumerable SerializationAttributes, + bool IsRequired, + bool IsReadOnly); + + private record XmlNamespaceInfo(string Namespace, string VariableName, string Prefix, VariableExpression VariableExpression); + + private record XmlPropertyCategories( + List? AttributeProperties, + List? ElementProperties, + XmlPropertyInfo? TextContentProperty, + Dictionary? Namespaces); + + private XmlPropertyCategories? _allCategorizedXmlProperties; + private XmlPropertyCategories AllCategorizedXmlProperties => _allCategorizedXmlProperties ??= CategorizeXmlProperties(); + + private XmlPropertyCategories? _categorizedXmlProperties; + private XmlPropertyCategories CategorizedXmlProperties => _categorizedXmlProperties ??= CategorizeXmlProperties(ownPropertiesOnly: true); + + private MethodProvider BuildXmlModelWriteCoreMethod() + { + MethodSignatureModifiers modifiers = _isStruct + ? MethodSignatureModifiers.Private + : MethodSignatureModifiers.Internal | MethodSignatureModifiers.Virtual; + if (_shouldOverrideMethods) + { + modifiers = MethodSignatureModifiers.Internal | MethodSignatureModifiers.Override; + } + + // void XmlModelWriteCore(XmlWriter writer, ModelReaderWriterOptions options) + return new MethodProvider( + new MethodSignature(XmlModelWriteCoreMethodName, null, modifiers, null, null, [_xmlWriterParameter, _serializationOptionsParameter]), + BuildXmlModelWriteCoreMethodBody(), + this); + } + + private MethodBodyStatement[] BuildXmlModelWriteCoreMethodBody() + { + var categorizedProperties = _shouldOverrideMethods + ? CategorizedXmlProperties + : AllCategorizedXmlProperties; + var statements = new List + { + CreateValidateFormat(_persistableModelTInterface, WriteAction, ModelReaderWriterOptionsSnippets.XmlFormat), + MethodBodyStatement.EmptyLine + }; + + if (_shouldOverrideMethods) + { + statements.Add(Base.Invoke(XmlModelWriteCoreMethodName, _xmlWriterParameter, _serializationOptionsParameter).Terminate()); + } + + // Write attributes + if (categorizedProperties.AttributeProperties?.Count > 0) + { + foreach (var prop in categorizedProperties.AttributeProperties) + { + statements.Add(CreateXmlWriteAttributeStatement(prop, categorizedProperties.Namespaces)); + } + } + + // Write elements + if (categorizedProperties.ElementProperties?.Count > 0) + { + foreach (var prop in categorizedProperties.ElementProperties) + { + statements.Add(CreateXmlWriteElementStatement(prop, categorizedProperties.Namespaces)); + } + } + + // Write unwrapped content + if (categorizedProperties.TextContentProperty != null) + { + statements.Add(CreateXmlWriteTextContentStatement(categorizedProperties.TextContentProperty)); + } + + return [.. statements]; + } + + private MethodProvider BuildXmlWriteMethod() + { + // private void WriteXml(XmlWriter writer, ModelReaderWriterOptions options, string nameHint) + return new MethodProvider( + new MethodSignature(XmlWriteMethodName, null, MethodSignatureModifiers.Private, null, null, [_xmlWriterParameter, _serializationOptionsParameter, _nameHintParameter]), + BuildXmlWriteMethodBody(), + this); + } + + private MethodBodyStatement[] BuildXmlWriteMethodBody() + { + VariableExpression nameHintExpression = _nameHintParameter; + var nameHintNotNull = nameHintExpression.NotEqual(Null); + var ns = _inputModel.SerializationOptions.Xml?.Namespace; + + MethodBodyStatement writeStartElement = ns != null + ? _xmlWriterSnippet.WriteStartElement(ns.Prefix, nameHintExpression, ns.Namespace) + : _xmlWriterSnippet.WriteStartElement(nameHintExpression); + + // When the model has a root namespace, pre-declare property namespaces that + // differ from the root so they appear on the root element rather than inline. + var nsDeclarations = new List(); + if (ns != null) + { + var propertyNamespaces = AllCategorizedXmlProperties.Namespaces; + if (propertyNamespaces != null) + { + foreach (var kvp in propertyNamespaces) + { + if (kvp.Key != ns.Namespace) + { + nsDeclarations.Add( + _xmlWriterSnippet.WriteNamespaceDeclaration(kvp.Value.Prefix, kvp.Key)); + } + } + } + } + + var ifBody = new List { writeStartElement }; + ifBody.AddRange(nsDeclarations); + + return + [ + new IfStatement(nameHintNotNull) { ifBody.ToArray() }, + MethodBodyStatement.EmptyLine, + This.Invoke(XmlModelWriteCoreMethodName, _xmlWriterParameter, _serializationOptionsParameter).Terminate(), + MethodBodyStatement.EmptyLine, + new IfStatement(nameHintNotNull) { _xmlWriterSnippet.WriteEndElement() } + ]; + } + + private MethodBodyStatement CreateXmlWriteAttributeStatement(XmlPropertyInfo prop, Dictionary? namespaces) + { + // Check for custom serialization hook + var serializationHook = GetXmlSerializationHookStatement(prop.PropertyName, prop.SerializationAttributes); + if (serializationHook != null) + { + return WrapInIsDefinedCheck(prop, serializationHook); + } + + var xmlWireInfo = prop.XmlWireInfo; + if (xmlWireInfo.Namespace != null && namespaces?.TryGetValue(xmlWireInfo.Namespace.Namespace, out var nsInfo) == true) + { + var writeStatement = _xmlWriterSnippet.WriteAttributeString( + nsInfo.Prefix, + xmlWireInfo.Name, + nsInfo.Namespace, + prop.SerializationExp); + + return WrapInIsDefinedCheck(prop, writeStatement); + } + + var statements = new List + { + _xmlWriterSnippet.WriteStartAttribute(xmlWireInfo.Name), + CreateXmlWriteValueStatement(prop.SerializationExp, prop.PropertyType, prop.SerializationFormat), + _xmlWriterSnippet.WriteEndAttribute() + }; + + return WrapInIsDefinedCheck(prop, statements); + } + + private MethodBodyStatement CreateXmlWriteElementStatement(XmlPropertyInfo prop, Dictionary? namespaces) + { + // Check for custom serialization hook + var serializationHook = GetXmlSerializationHookStatement(prop.PropertyName, prop.SerializationAttributes); + if (serializationHook != null) + { + return WrapInIsDefinedCheck(prop, serializationHook); + } + + if (prop.PropertyType.IsList || prop.PropertyType.IsArray) + { + return CreateXmlWriteListStatement(prop, namespaces); + } + + if (prop.PropertyType.IsDictionary) + { + return CreateXmlWriteDictionaryStatement(prop, namespaces); + } + + return CreateXmlWriteSingleElementStatement(prop, namespaces); + } + + private MethodBodyStatement CreateXmlWriteSingleElementStatement( + XmlPropertyInfo prop, + Dictionary? namespaces) + { + var statements = new List(); + + if (prop.XmlWireInfo.Namespace != null && namespaces != null && namespaces.TryGetValue(prop.XmlWireInfo.Namespace.Namespace, out var nsInfo)) + { + statements.Add(_xmlWriterSnippet.WriteStartElement( + nsInfo.Prefix, + prop.XmlWireInfo.Name, + nsInfo.Namespace)); + } + else + { + statements.Add(_xmlWriterSnippet.WriteStartElement(prop.XmlWireInfo.Name)); + } + + statements.AddRange( + CreateXmlWriteValueStatement(prop.SerializationExp, prop.PropertyType, prop.SerializationFormat), + _xmlWriterSnippet.WriteEndElement()); + + return WrapInIsDefinedCheck(prop, statements); + } + + private MethodBodyStatement CreateXmlWriteValueStatement(ValueExpression value, CSharpType valueType, SerializationFormat serializationFormat) + { + var underlyingType = valueType.IsNullable && valueType.Arguments.Count > 0 + ? valueType.Arguments[0] + : valueType; + + if (underlyingType.IsList || underlyingType.IsArray) + { + return CreateXmlWriteListForEachStatement(value, underlyingType.ElementType, null, null, serializationFormat, null); + } + + if (underlyingType.IsDictionary) + { + return CreateXmlWriteDictionaryForEachStatement(value, underlyingType.Arguments[0], underlyingType.Arguments[1], serializationFormat); + } + + if (!underlyingType.IsFrameworkType) + { + return ScmCodeModelGenerator.Instance.TypeFactory.SerializeXmlValue(valueType, value, _xmlWriterSnippet, _mrwOptionsParameterSnippet, serializationFormat); + } + + return underlyingType.FrameworkType switch + { + Type t when (t == typeof(DateTimeOffset) || t == typeof(TimeSpan)) && serializationFormat.ToFormatSpecifier() is string formatSpecifier + => _xmlWriterSnippet.WriteStringValue(value.NullableStructValue(valueType), formatSpecifier), + Type t when (t == typeof(byte[]) || t == typeof(BinaryData)) && serializationFormat is SerializationFormat.Bytes_Base64 or SerializationFormat.Bytes_Base64Url + => _xmlWriterSnippet.WriteBase64StringValue(t == typeof(BinaryData) + ? value.As().ToArray() + : value.NullableStructValue(valueType), + serializationFormat.ToFormatSpecifier()), + _ => ScmCodeModelGenerator.Instance.TypeFactory.SerializeXmlValue(valueType, value, _xmlWriterSnippet, _mrwOptionsParameterSnippet, serializationFormat) + }; + } + + private MethodBodyStatement CreateXmlWriteListStatement( + XmlPropertyInfo prop, + Dictionary? namespaces) + { + var elementType = prop.PropertyType.ElementType; + var xmlWireInfo = prop.XmlWireInfo; + var statements = new List(); + + // If not unwrapped, write the wrapper element + if (xmlWireInfo.Unwrapped != true) + { + if (xmlWireInfo.Namespace != null && namespaces != null && namespaces.TryGetValue(xmlWireInfo.Namespace.Namespace, out var nsInfo)) + { + statements.Add(_xmlWriterSnippet.WriteStartElement( + nsInfo.Prefix, + xmlWireInfo.Name, + nsInfo.Namespace)); + } + else + { + statements.Add(_xmlWriterSnippet.WriteStartElement(xmlWireInfo.Name)); + } + } + + statements.Add(CreateXmlWriteListForEachStatement(prop.SerializationExp, elementType, xmlWireInfo.ItemsName, xmlWireInfo.ItemsNamespace, prop.SerializationFormat, namespaces)); + + // If not unwrapped, write the end element + if (xmlWireInfo.Unwrapped != true) + { + statements.Add(_xmlWriterSnippet.WriteEndElement()); + } + + return WrapInIsDefinedCheck(prop, statements); + } + + private ForEachStatement CreateXmlWriteListForEachStatement( + ValueExpression collection, + CSharpType elementType, + string? itemsName, + XmlSerializationNamespace? itemsNamespace, + SerializationFormat serializationFormat, + Dictionary? namespaces) + { + return new ForEachStatement(elementType, "item", collection, false, out var itemVariable) + { + CreateXmlWriteItemStatement(itemVariable, elementType, itemsName, itemsNamespace, serializationFormat, namespaces) + }; + } + + private MethodBodyStatement CreateXmlWriteItemStatement( + VariableExpression itemVariable, + CSharpType itemType, + string? itemsName, + XmlSerializationNamespace? itemsNamespace, + SerializationFormat serializationFormat, + Dictionary? namespaces) + { + var statements = new List(); + var elementName = itemsName ?? itemType.Name; + + // Write start element for item + if (itemsNamespace != null && namespaces != null && namespaces.TryGetValue(itemsNamespace.Namespace, out var nsInfo)) + { + statements.Add(_xmlWriterSnippet.WriteStartElement( + nsInfo.Prefix, + elementName, + nsInfo.Namespace)); + } + else + { + statements.Add(_xmlWriterSnippet.WriteStartElement(elementName)); + } + + statements.AddRange( + CreateXmlWriteValueStatement(itemVariable, itemType, serializationFormat), + _xmlWriterSnippet.WriteEndElement()); + + return statements; + } + + private MethodBodyStatement CreateXmlWriteDictionaryStatement( + XmlPropertyInfo prop, + Dictionary? namespaces) + { + var keyType = prop.PropertyType.Arguments[0]; + var valueType = prop.PropertyType.Arguments[1]; + var xmlWireInfo = prop.XmlWireInfo; + var statements = new List(); + + // If not unwrapped, write the wrapper element + if (xmlWireInfo.Unwrapped != true) + { + if (xmlWireInfo.Namespace != null && namespaces != null && namespaces.TryGetValue(xmlWireInfo.Namespace.Namespace, out var nsInfo)) + { + statements.Add(_xmlWriterSnippet.WriteStartElement( + nsInfo.Prefix, + xmlWireInfo.Name, + nsInfo.Namespace)); + } + else + { + statements.Add(_xmlWriterSnippet.WriteStartElement(xmlWireInfo.Name)); + } + } + + statements.Add(CreateXmlWriteDictionaryForEachStatement(prop.SerializationExp, keyType, valueType, prop.SerializationFormat)); + + // If not unwrapped, write the end element + if (xmlWireInfo.Unwrapped != true) + { + statements.Add(_xmlWriterSnippet.WriteEndElement()); + } + + return WrapInIsDefinedCheck(prop, statements); + } + + private ForEachStatement CreateXmlWriteDictionaryForEachStatement( + ValueExpression collection, + CSharpType keyType, + CSharpType valueType, + SerializationFormat serializationFormat) + { + return new ForEachStatement("pair", collection.AsDictionary(keyType, valueType), out KeyValuePairExpression kvpExpression) + { + CreateXmlWriteDictionaryEntryStatement(kvpExpression, valueType, serializationFormat) + }; + } + + private MethodBodyStatement CreateXmlWriteDictionaryEntryStatement( + KeyValuePairExpression kvpExpression, + CSharpType valueType, + SerializationFormat serializationFormat) + { + var statements = new List + { + _xmlWriterSnippet.WriteStartElement(kvpExpression.Key), + CreateXmlWriteValueStatement(kvpExpression.Value, valueType, serializationFormat), + _xmlWriterSnippet.WriteEndElement() + }; + return statements; + } + + private MethodBodyStatement CreateXmlWriteTextContentStatement(XmlPropertyInfo prop) + { + var writeStatement = ScmCodeModelGenerator.Instance.TypeFactory.SerializeXmlValue(prop.PropertyType, prop.SerializationExp, _xmlWriterSnippet, _mrwOptionsParameterSnippet, prop.SerializationFormat); + return WrapInIsDefinedCheck(prop, writeStatement); + } + + private static ValueExpression CreateXmlSerializePrimitiveExpression(ValueExpression value, CSharpType valueType, SerializationFormat serializationFormat) + { + return valueType.FrameworkType switch + { + Type t when t == typeof(DateTimeOffset) => serializationFormat switch + { + _ => value.Invoke(nameof(ToString), Literal(serializationFormat.ToFormatSpecifier())) + }, + Type t when t == typeof(TimeSpan) => value.Invoke(nameof(ToString), Literal(serializationFormat.ToFormatSpecifier())), + Type t when t == typeof(byte[]) => serializationFormat switch + { + SerializationFormat.Bytes_Base64Url => Static(typeof(Convert)).Invoke(nameof(Convert.ToBase64String), value), + _ => Static(typeof(Convert)).Invoke(nameof(Convert.ToBase64String), value) + }, + Type t when t == typeof(BinaryData) => serializationFormat switch + { + SerializationFormat.Bytes_Base64 or SerializationFormat.Bytes_Base64Url => + Static(typeof(Convert)).Invoke(nameof(Convert.ToBase64String), value.Invoke("ToArray")), + _ => value.Invoke(nameof(ToString)) + }, + _ => value + }; + } + + private static MethodBodyStatement WrapInIsDefinedCheck(XmlPropertyInfo prop, MethodBodyStatement writeStatements) + { + if (!prop.IsReadOnly && + (IsNonNullableValueType(prop.PropertyType) || (prop.IsRequired && !prop.PropertyType.IsNullable))) + { + return writeStatements; + } + + var isDefinedCondition = prop.PropertyType is { IsCollection: true, IsReadOnlyMemory: false } + ? OptionalSnippets.IsCollectionDefined(prop.SerializationExp) + : OptionalSnippets.IsDefined(prop.SerializationExp); + + return new IfStatement(isDefinedCondition) + { + writeStatements + }; + } + + internal MethodProvider BuildXmlDeserializationMethod() + { + var methodName = $"{DeserializationMethodNamePrefix}{_model.Name}"; + var signatureModifiers = MethodSignatureModifiers.Internal | MethodSignatureModifiers.Static; + var parameters = new List + { + _xElementDeserializationParam, + _serializationOptionsParameter, + }; + + var methodBody = _inputModel.DiscriminatedSubtypes.Count > 0 + ? BuildXmlDiscriminatedModelDeserializationMethodBody() + : BuildXmlDeserializationMethodBody(); + + return new MethodProvider( + new MethodSignature(methodName, null, signatureModifiers, _model.Type, null, parameters), + methodBody, + this); + } + + private MethodBodyStatement[] BuildXmlDiscriminatedModelDeserializationMethodBody() + { + var unknownVariant = _model.DerivedModels.First(m => m.IsUnknownDiscriminatorModel); + bool onlyContainsUnknownDerivedModel = _model.DerivedModels.Count == 1; + var discriminator = _model.CanonicalView.Properties.Where(p => p.IsDiscriminator).FirstOrDefault(); + if (discriminator == null && _model.BaseModelProvider != null) + { + // Look for discriminator property in the base model + discriminator = _model.BaseModelProvider.CanonicalView.Properties.Where(p => p.IsDiscriminator).FirstOrDefault(); + } + + var deserializeDiscriminatedModelsConditions = BuildXmlDiscriminatedModelsCondition( + discriminator, + GetXmlDiscriminatorSwitchCases(unknownVariant), + onlyContainsUnknownDerivedModel, + _xmlElementParameterSnippet); + + return + [ + new IfStatement(_xmlElementParameterSnippet.Equal(Null)) { Return(Null) }, + MethodBodyStatement.EmptyLine, + deserializeDiscriminatedModelsConditions, + Return(GetDeserializationMethodInvocationForType(unknownVariant, _xmlElementParameterSnippet, null, _serializationOptionsParameter)) + ]; + } + + private static MethodBodyStatement BuildXmlDiscriminatedModelsCondition( + PropertyProvider? discriminatorProperty, + SwitchCaseStatement[] abstractSwitchCases, + bool onlyContainsUnknownDerivedModel, + ScopedApi elementParameter) + { + var xmlSerializationOptions = (discriminatorProperty?.WireInfo?.SerializationOptions as ScmSerializationOptions)?.Xml; + if (!onlyContainsUnknownDerivedModel && xmlSerializationOptions?.Name != null) + { + var discriminatorElementName = xmlSerializationOptions.Name; + var discriminatorElement = new VariableExpression(typeof(XElement), "discriminatorElement"); + + return new MethodBodyStatements( + [ + Declare(discriminatorElement, elementParameter.Element(Literal(discriminatorElementName))), + new IfStatement(discriminatorElement.NotEqual(Null)) + { + new SwitchStatement(discriminatorElement.CastTo(typeof(string)), abstractSwitchCases) + } + ]); + } + + return MethodBodyStatement.Empty; + } + + private SwitchCaseStatement[] GetXmlDiscriminatorSwitchCases(ModelProvider unknownVariant) + { + SwitchCaseStatement[] cases = new SwitchCaseStatement[_model.DerivedModels.Count - 1]; + int index = 0; + for (int i = 0; i < _model.DerivedModels.Count; i++) + { + var model = _model.DerivedModels[i]; + if (ReferenceEquals(model, unknownVariant)) + { + continue; + } + cases[index++] = new SwitchCaseStatement( + Literal(model.DiscriminatorValue!), + Return(GetDeserializationMethodInvocationForType(model, _xmlElementParameterSnippet, _dataParameter, _serializationOptionsParameter))); + } + return cases; + } + + private MethodBodyStatement[] BuildXmlDeserializationMethodBody() + { + var valueKindEqualsNullReturn = _isStruct + ? Return(Default) + : Return(Null); + + var categorizedProperties = AllCategorizedXmlProperties; + var statements = new List + { + new IfStatement(_xmlElementParameterSnippet.Equal(Null)) { valueKindEqualsNullReturn }, + MethodBodyStatement.EmptyLine, + GetXmlNamespaceDeclarations(categorizedProperties.Namespaces), + GetPropertyVariableDeclarations(), + MethodBodyStatement.EmptyLine + }; + + if (categorizedProperties.AttributeProperties?.Count > 0) + { + statements.Add(CreateXmlDeserializeForEachStatement( + _xmlElementParameterSnippet, + categorizedProperties.AttributeProperties, + categorizedProperties.Namespaces, + isAttributes: true)); + statements.Add(MethodBodyStatement.EmptyLine); + } + + if (categorizedProperties.ElementProperties?.Count > 0) + { + statements.Add(CreateXmlDeserializeForEachStatement( + _xmlElementParameterSnippet, + categorizedProperties.ElementProperties, + categorizedProperties.Namespaces, + isAttributes: false)); + } + + if (categorizedProperties.TextContentProperty != null) + { + statements.Add(categorizedProperties.TextContentProperty.DeserializationExp.Assign(_xmlElementParameterSnippet.Value()).Terminate()); + statements.Add(MethodBodyStatement.EmptyLine); + } + + statements.Add(Return(New.Instance(_model.Type, GetSerializationCtorParameterValues()))); + + return [.. statements]; + } + + private XmlPropertyCategories CategorizeXmlProperties(bool ownPropertiesOnly = false) + { + List? attributeProperties = null; + List? elementProperties = null; + XmlPropertyInfo? textContentProperty = null; + Dictionary? namespaces = null; + + var parameters = SerializationConstructor.Signature.Parameters; + HashSet? ownProperties = null; + HashSet? ownFields = null; + + // Get the custom serialization attributes + var serializationAttributes = GetSerializationAttributes(); + + for (int i = 0; i < parameters.Count; i++) + { + var parameter = parameters[i]; + if (parameter.Property == null && parameter.Field == null) + { + continue; + } + + if (ownPropertiesOnly) + { + if (parameter.Property != null) + { + ownProperties ??= [.. _model.CanonicalView.Properties]; + if (!ownProperties.Contains(parameter.Property)) + { + continue; + } + } + else if (parameter.Field != null) + { + ownFields ??= [.. _model.CanonicalView.Fields]; + if (!ownFields.Contains(parameter.Field)) + { + continue; + } + } + } + + var wireInfo = parameter.Property?.WireInfo ?? parameter.Field?.WireInfo; + var xmlWireInfo = (wireInfo?.SerializationOptions as ScmSerializationOptions)?.Xml; + if (xmlWireInfo == null || wireInfo?.IsHttpMetadata == true) + { + continue; + } + + var propertyType = parameter.Property?.Type ?? parameter.Field?.Type; + var propertyExpression = parameter.Property?.AsVariableExpression ?? parameter.Field?.AsVariableExpression; + var propertyName = parameter.Property?.Name ?? parameter.Field?.Name; + if (propertyType == null || propertyExpression == null || propertyName == null) + { + continue; + } + + // Collect unique namespaces + if (xmlWireInfo.Namespace != null) + { + namespaces ??= []; + CollectNamespace(propertyName, xmlWireInfo.Namespace, namespaces); + } + if (xmlWireInfo.ItemsNamespace != null) + { + namespaces ??= []; + CollectNamespace(propertyName, xmlWireInfo.ItemsNamespace, namespaces); + } + + var serializationFormat = wireInfo?.SerializationFormat ?? SerializationFormat.Default; + var isRequired = wireInfo?.IsRequired ?? false; + var isReadOnly = wireInfo?.IsReadOnly ?? false; + MemberExpression SerializationExp; + if (parameter.Property != null) + { + SerializationExp = parameter.Property; + } + else if (parameter.Field != null) + { + SerializationExp = parameter.Field; + } + else + { + continue; + } + + var propertyInfo = new XmlPropertyInfo(propertyName, propertyType, SerializationExp, propertyExpression, xmlWireInfo, serializationFormat, serializationAttributes, isRequired, isReadOnly); + + // Categorize by XML serialization type + if (xmlWireInfo.Attribute == true) + { + (attributeProperties ??= []).Add(propertyInfo); + continue; + } + if (xmlWireInfo.Unwrapped == true && !propertyType.IsCollection) + { + textContentProperty = propertyInfo; + continue; + } + + (elementProperties ??= []).Add(propertyInfo); + } + + return new XmlPropertyCategories(attributeProperties, elementProperties, textContentProperty, namespaces); + } + + private ForEachStatement CreateXmlDeserializeForEachStatement( + ScopedApi elementParameter, + List properties, + Dictionary? namespaces, + bool isAttributes) + { + return isAttributes switch + { + true => new ForEachStatement("attr", elementParameter.Attributes(), out var attr) + { + CreateXmlDeserializeAttributeStatements(attr.As(), properties, namespaces) + }, + false => new ForEachStatement("child", elementParameter.Elements(), out var child) + { + CreateXmlDeserializeElementStatements(child.As(), properties, namespaces) + } + }; + } + + private MethodBodyStatement CreateXmlDeserializeElementStatements( + ScopedApi childElement, + List elementProperties, + Dictionary? namespaces) + { + var statements = new List(); + var localNameVariable = new VariableExpression(typeof(string), "localName"); + var nsVariable = new VariableExpression(typeof(XNamespace), "ns"); + + statements.Add(Declare(localNameVariable, childElement.GetLocalName())); + if (namespaces?.Count > 0) + { + statements.AddRange( + Declare(nsVariable, childElement.Property("Name").Property("Namespace").As()), + MethodBodyStatement.EmptyLine); + } + + foreach (var prop in elementProperties) + { + MethodBodyStatement deserializationStatement = GetXmlDeserializationHookStatement( + prop.PropertyName, + prop.SerializationAttributes, + childElement, + prop.DeserializationExp, + out bool hasHook); + + if (!hasHook) + { + bool isPreInitialized = prop.IsRequired && !prop.PropertyType.IsNullable; + deserializationStatement = CreateXmlDeserializePropertyAssignment( + childElement, + prop.PropertyType, + prop.DeserializationExp, + prop.XmlWireInfo, + prop.SerializationFormat, + namespaces, + isPreInitialized); + } + + // Build condition: check localName and optionally namespace + ScopedApi condition = localNameVariable.Equal(Literal(prop.XmlWireInfo.Name)); + if (prop.XmlWireInfo.Namespace != null && namespaces != null && namespaces.TryGetValue(prop.XmlWireInfo.Namespace.Namespace, out var nsInfo)) + { + condition = condition.And(nsVariable.Equal(nsInfo.VariableExpression)); + } + + var checkIfLocalNameEquals = new IfStatement(condition) + { + deserializationStatement, + Continue + }; + + statements.Add(checkIfLocalNameEquals); + } + + return statements; + } + + private MethodBodyStatement GetXmlDeserializationHookStatement( + string propertyName, + IEnumerable serializationAttributes, + ValueExpression xmlValue, + VariableExpression variableExpression, + out bool hasHook) + { + hasHook = false; + foreach (var attribute in serializationAttributes) + { + if (CodeGenAttributes.TryGetCodeGenSerializationAttributeValue( + attribute, + out var name, + out _, + out _, + out var deserializationHook, + out _) && name == propertyName && deserializationHook != null) + { + hasHook = true; + var xmlValueTypeName = xmlValue is ScopedApi scopedApi ? scopedApi.Type.Name : nameof(XElement); + var knownArgs = new (string TypeName, ValueExpression Argument)[] + { + (xmlValueTypeName, xmlValue), + (nameof(ModelReaderWriterOptions), _serializationOptionsParameter) + }; + var hookArgs = GetDeserializationHookArguments(deserializationHook, variableExpression, knownArgs); + return Static().Invoke(deserializationHook, hookArgs).Terminate(); + } + } + + return MethodBodyStatement.Empty; + } + + private MethodBodyStatement? GetXmlSerializationHookStatement( + string propertyName, + IEnumerable serializationAttributes) + { + foreach (var attribute in serializationAttributes) + { + if (CodeGenAttributes.TryGetCodeGenSerializationAttributeValue( + attribute, + out var name, + out _, + out var serializationHook, + out _, + out _) && name == propertyName && serializationHook != null) + { + return This.Invoke(serializationHook, _xmlWriterSnippet, _serializationOptionsParameter).Terminate(); + } + } + + return null; + } + + private MethodBodyStatement CreateXmlDeserializePropertyAssignment( + ScopedApi childElement, + CSharpType propertyType, + VariableExpression propertyExpression, + XmlSerialization xmlWireInfo, + SerializationFormat serializationFormat, + Dictionary? namespaces = null, + bool isPreInitialized = false) + { + if (propertyType.IsList || propertyType.IsArray) + { + return CreateXmlDeserializeListAssignment(childElement, propertyType, propertyExpression, xmlWireInfo, serializationFormat, namespaces, isPreInitialized); + } + + if (propertyType.IsDictionary) + { + return CreateXmlDeserializeDictionaryAssignment(childElement, propertyType, propertyExpression, xmlWireInfo, serializationFormat); + } + + var deserializedValue = ScmCodeModelGenerator.Instance.TypeFactory.DeserializeXmlValue(propertyType, childElement, _mrwOptionsParameterSnippet, serializationFormat); + return propertyExpression.Assign(deserializedValue).Terminate(); + } + + private MethodBodyStatement CreateXmlDeserializeListAssignment( + ScopedApi childElement, + CSharpType listType, + VariableExpression listExpression, + XmlSerialization xmlWireInfo, + SerializationFormat serializationFormat, + Dictionary? namespaces = null, + bool isPreInitialized = false) + { + var elementType = listType.ElementType; + if (xmlWireInfo.Unwrapped == true) + { + var statements = new List(); + if (!isPreInitialized) + { + statements.Add(new IfStatement(listExpression.Equal(Null)) + { + listExpression.Assign(New.List(elementType)).Terminate(), + }); + } + statements.Add(DeserializeXmlValue(childElement, elementType, serializationFormat, out var itemValue)); + statements.Add(listExpression.Invoke("Add", itemValue).Terminate()); + return new MethodBodyStatements([.. statements]); + } + else + { + var itemsName = xmlWireInfo.ItemsName; + var arrayDeclaration = Declare("array", New.List(elementType), out var listVariable); + + // Build element name expression - with namespace if available + ValueExpression elementNameExpression; + if (xmlWireInfo.ItemsNamespace != null && namespaces != null && namespaces.TryGetValue(xmlWireInfo.ItemsNamespace.Namespace, out var nsInfo)) + { + elementNameExpression = new BinaryOperatorExpression("+", nsInfo.VariableExpression, Literal(itemsName)).As(); + } + else + { + elementNameExpression = Literal(itemsName); + } + + var foreachStatement = ForEachStatement.Create("e", childElement.Elements(elementNameExpression), out ScopedApi item) + .Add(new MethodBodyStatement[] + { + DeserializeXmlValue(item, elementType, serializationFormat, out var deserializedItem), + listVariable.Add(deserializedItem) + }); + + return new MethodBodyStatements( + [ + arrayDeclaration, + foreachStatement, + listExpression.Assign(listVariable).Terminate() + ]); + } + } + + private MethodBodyStatement CreateXmlDeserializeDictionaryAssignment( + ScopedApi childElement, + CSharpType dictionaryType, + VariableExpression dictionaryExpression, + XmlSerialization xmlWireInfo, + SerializationFormat serializationFormat) + { + var valueType = dictionaryType.ElementType; + if (xmlWireInfo.Unwrapped == true) + { + return new MethodBodyStatements( + [ + new IfStatement(dictionaryExpression.Equal(Null)) + { + dictionaryExpression.Assign(New.Dictionary(dictionaryType.Arguments[0], dictionaryType.Arguments[1])).Terminate(), + }, + CreateXmlDeserializeDictionaryValueStatement(valueType, dictionaryExpression, childElement, serializationFormat) + ]); + } + + var dictionaryDeclaration = Declare( + "dictionary", + New.Dictionary(dictionaryType.Arguments[0], dictionaryType.Arguments[1]), + out var dictVariable); + + var foreachStatement = ForEachStatement.Create("e", childElement.Elements(), out ScopedApi item) + .Add(new MethodBodyStatement[] + { + CreateXmlDeserializeDictionaryValueStatement(valueType, dictVariable, item, serializationFormat) + }); + + return new MethodBodyStatements( + [ + dictionaryDeclaration, + foreachStatement, + dictionaryExpression.Assign(dictVariable).Terminate() + ]); + } + + private MethodBodyStatement CreateXmlDeserializeDictionaryValueStatement( + CSharpType valueType, + ValueExpression dictionary, + ScopedApi element, + SerializationFormat serializationFormat) + { + return new MethodBodyStatement[] + { + DeserializeXmlValue(element, valueType, serializationFormat, out var value), + dictionary.Invoke("Add", element.GetLocalName(), value).Terminate() + }; + } + + private MethodBodyStatement DeserializeXmlValue( + ScopedApi element, + CSharpType valueType, + SerializationFormat serializationFormat, + out ValueExpression value) + { + if (valueType.IsList || valueType.IsArray) + { + var listDeclaration = Declare("list", New.List(valueType.ElementType), out var listVariable); + var foreachStatement = ForEachStatement.Create("item", element.Elements(), out ScopedApi item) + .Add(new MethodBodyStatement[] + { + DeserializeXmlValue(item, valueType.ElementType, serializationFormat, out var deserializedItem), + listVariable.Add(deserializedItem) + }); + + value = listVariable; + return new MethodBodyStatement[] { listDeclaration, foreachStatement }; + } + + if (valueType.IsDictionary) + { + var dictDeclaration = Declare("dict", New.Dictionary(valueType.Arguments[0], valueType.Arguments[1]), out var dictVariable); + var foreachStatement = ForEachStatement.Create("item", element.Elements(), out ScopedApi item) + .Add(CreateXmlDeserializeDictionaryValueStatement(valueType.ElementType, dictVariable, item, serializationFormat)); + + value = dictVariable; + return new MethodBodyStatement[] { dictDeclaration, foreachStatement }; + } + + value = ScmCodeModelGenerator.Instance.TypeFactory.DeserializeXmlValue(valueType, element, _mrwOptionsParameterSnippet, serializationFormat); + return MethodBodyStatement.Empty; + } + + private static ValueExpression CreateXmlDeserializePrimitiveExpression( + ScopedApi element, + CSharpType valueType, + SerializationFormat serializationFormat) + { + return valueType.FrameworkType switch + { + Type t when t == typeof(Uri) => New.Instance(element.Value(), FrameworkEnumValue(UriKind.RelativeOrAbsolute)), + Type t when t == typeof(IPAddress) => Static().Invoke(nameof(IPAddress.Parse), element.Value()), + Type t when t == typeof(Stream) => BinaryDataSnippets.FromString(element.Value()).ToStream(), + Type t when t == typeof(byte[]) => element.GetBytesFromBase64(serializationFormat.ToFormatSpecifier()), + Type t when t == typeof(BinaryData) => serializationFormat is SerializationFormat.Bytes_Base64 or SerializationFormat.Bytes_Base64Url + ? BinaryDataSnippets.FromBytes(element.GetBytesFromBase64(serializationFormat.ToFormatSpecifier())) + : BinaryDataSnippets.FromString(element.Value()), + Type t when t == typeof(DateTimeOffset) => element.GetDateTimeOffset(serializationFormat.ToFormatSpecifier()), + Type t when t == typeof(TimeSpan) => element.GetTimeSpan(serializationFormat.ToFormatSpecifier()), + Type t when t == typeof(byte) => element.CastTo(typeof(int)).CastTo(typeof(byte)), + Type t when t == typeof(sbyte) => element.CastTo(typeof(int)).CastTo(typeof(sbyte)), + Type t when t == typeof(short) => element.CastTo(typeof(int)).CastTo(typeof(short)), + Type t when t == typeof(ushort) => element.CastTo(typeof(int)).CastTo(typeof(ushort)), + _ => element.CastTo(valueType) + }; + } + + internal static ValueExpression DeserializeXmlValueCore( + CSharpType valueType, + ScopedApi element, + ScopedApi mrwOptions, + SerializationFormat format) + { + var underlyingType = valueType.IsNullable && valueType.Arguments.Count > 0 + ? valueType.Arguments[0] + : valueType; + + if (underlyingType.IsEnum && underlyingType.UnderlyingEnumType != null) + { + var underlyingExpression = CreateXmlDeserializePrimitiveExpression(element, underlyingType.UnderlyingEnumType, format); + return underlyingType.ToEnum(underlyingExpression); + } + + if (!underlyingType.IsFrameworkType) + { + return GetDeserializationMethodInvocationForType(underlyingType, element, null, mrwOptions); + } + + return CreateXmlDeserializePrimitiveExpression(element, valueType, format); + } + + internal static MethodBodyStatement SerializeXmlValueCore( + CSharpType valueType, + ValueExpression value, + ScopedApi xmlWriter, + ScopedApi mrwOptionsParameter, + SerializationFormat serializationFormat) + { + var underlyingType = valueType.IsNullable && valueType.Arguments.Count > 0 + ? valueType.Arguments[0] + : valueType; + + if (underlyingType.IsEnum) + { + return xmlWriter.WriteValue(underlyingType.ToSerial(value.NullableStructValue(valueType))); + } + + if (!underlyingType.IsFrameworkType) + { + return xmlWriter.WriteObjectValue(value.As(valueType), mrwOptionsParameter); + } + + return xmlWriter.WriteValue(CreateXmlSerializePrimitiveExpression(value.NullableStructValue(valueType), underlyingType, serializationFormat)); + } + + private MethodBodyStatement CreateXmlDeserializeAttributeStatements( + ScopedApi attrVariable, + List attributeProperties, + Dictionary? namespaces) + { + var hasNamespacedAttributes = attributeProperties.Any(p => p.XmlWireInfo.Namespace != null); + var statements = new List + { + Declare("localName", typeof(string), attrVariable.GetLocalName(), out var localNameVar) + }; + + VariableExpression? nsVar = null; + if (hasNamespacedAttributes) + { + statements.AddRange( + Declare("ns", typeof(XNamespace), attrVariable.Name().Namespace(), out nsVar), + MethodBodyStatement.EmptyLine); + } + + foreach (var prop in attributeProperties) + { + MethodBodyStatement deserializationStatement = GetXmlDeserializationHookStatement( + prop.PropertyName, + prop.SerializationAttributes, + attrVariable, + prop.DeserializationExp, + out bool hasHook); + + if (!hasHook) + { + var deserializedValue = attrVariable.CastTo(prop.PropertyType); + deserializationStatement = prop.DeserializationExp.Assign(deserializedValue).Terminate(); + } + + ScopedApi condition = localNameVar.Equal(Literal(prop.XmlWireInfo.Name)); + if (prop.XmlWireInfo.Namespace != null && namespaces != null && nsVar != null) + { + var nsInfo = namespaces[prop.XmlWireInfo.Namespace.Namespace]; + condition = condition.And(nsVar.Equal(nsInfo.VariableExpression)); + } + + var checkIfLocalNameEquals = new IfStatement(condition) + { + deserializationStatement, + Continue + }; + + statements.Add(checkIfLocalNameEquals); + } + + return statements; + } + + private SwitchCaseStatement CreatePersistableModelWriteCoreXmlSwitchCase() + { + var xmlElementName = _inputModel.SerializationOptions.Xml?.Name ?? _model.Name; + + return new SwitchCaseStatement( + ModelReaderWriterOptionsSnippets.XmlFormat, + new UsingScopeStatement(typeof(MemoryStream), "stream", New.Instance(typeof(MemoryStream), Int(256)), out var streamVar) + { + new UsingScopeStatement( + typeof(XmlWriter), + "writer", + XmlWriterSnippets.Create(streamVar, ModelSerializationExtensionsSnippets.XmlWriterSettings), + out var xmlWriterVar) + { + This.Invoke(XmlWriteMethodName, [xmlWriterVar, _serializationOptionsParameter, Literal(xmlElementName)]).Terminate() + }, + new IfElseStatement( + streamVar.As().Position().GreaterThan(IntSnippets.MaxValue), + Return(BinaryDataSnippets.FromStream(streamVar, false)), + Return(New.Instance( + typeof(BinaryData), + streamVar.As().GetBuffer() + .Invoke(nameof(MemoryExtensions.AsMemory), [Int(0), streamVar.As().Position().CastTo(typeof(int))])))) + }); + } + + private SwitchCaseStatement CreatePersistableModelCreateCoreXmlSwitchCase(CSharpType typeForDeserialize) + { + return new SwitchCaseStatement( + ModelReaderWriterOptionsSnippets.XmlFormat, + new MethodBodyStatement[] + { + new UsingScopeStatement(typeof(Stream), "dataStream", _dataParameter.As().ToStream(), out var streamVar) + { + Return(GetDeserializationMethodInvocationForType( + typeForDeserialize, + XElementSnippets.Load(streamVar.As(), XmlLinqSnippets.PreserveWhitespace), + _dataParameter, + _serializationOptionsParameter)) + }, + }); + } + + private MethodProvider BuildXmlExplicitFromClientResult() + { + var result = new ParameterProvider( + ScmCodeModelGenerator.Instance.TypeFactory.ClientResponseApi.ResponseParameterName, + $"The {ScmCodeModelGenerator.Instance.TypeFactory.ClientResponseApi.ClientResponseType:C} to deserialize the {Type:C} from.", + ScmCodeModelGenerator.Instance.TypeFactory.ClientResponseApi.ClientResponseType); + var modifiers = MethodSignatureModifiers.Public | MethodSignatureModifiers.Static | + MethodSignatureModifiers.Explicit | MethodSignatureModifiers.Operator; + + var response = result.ToApi(); + MethodBodyStatement responseDeclaration; + + if (response.Original == response.GetRawResponse().Original) + { + responseDeclaration = MethodBodyStatement.Empty; + } + else + { + responseDeclaration = UsingDeclare("response", ScmCodeModelGenerator.Instance.TypeFactory.HttpResponseApi.HttpResponseType, result.ToApi().GetRawResponse(), out var responseVar); + response = responseVar.ToApi(); + } + + MethodBodyStatement[] methodBody = + [ + responseDeclaration, + UsingDeclare("stream", typeof(Stream), response.Property(nameof(HttpResponseApi.ContentStream)), out var streamVar), + new IfStatement(streamVar.Equal(Null)) { Return(Default) }, + MethodBodyStatement.EmptyLine, + Return(GetDeserializationMethodInvocationForType( + _model, + XElementSnippets.Load(streamVar.As(), XmlLinqSnippets.PreserveWhitespace))) + ]; + + return new MethodProvider( + new MethodSignature(Type.Name, null, modifiers, Type, null, [result]), + methodBody, + this); + } + + private MethodProvider BuildJsonAndXmlExplicitFromClientResult() + { + var result = new ParameterProvider( + ScmCodeModelGenerator.Instance.TypeFactory.ClientResponseApi.ResponseParameterName, + $"The {ScmCodeModelGenerator.Instance.TypeFactory.ClientResponseApi.ClientResponseType:C} to deserialize the {Type:C} from.", + ScmCodeModelGenerator.Instance.TypeFactory.ClientResponseApi.ClientResponseType); + var modifiers = MethodSignatureModifiers.Public | MethodSignatureModifiers.Static | + MethodSignatureModifiers.Explicit | MethodSignatureModifiers.Operator; + + var response = result.ToApi(); + MethodBodyStatement responseDeclaration; + ScopedApi tryGetContentType; + ScopedApi? contentTypeVar; + + if (response.Original == response.GetRawResponse().Original) + { + responseDeclaration = MethodBodyStatement.Empty; + tryGetContentType = result.ToApi().TryGetHeader(ContentTypeHeader, out contentTypeVar); + } + else + { + responseDeclaration = UsingDeclare("response", ScmCodeModelGenerator.Instance.TypeFactory.HttpResponseApi.HttpResponseType, response.GetRawResponse(), out var responseVar); + response = responseVar.ToApi(); + tryGetContentType = responseVar.ToApi().TryGetHeader(ContentTypeHeader, out contentTypeVar); + } + + var startsWithJson = contentTypeVar!.StartsWith(Literal("application/json"), StringComparison.OrdinalIgnoreCase); + var isJsonCondition = tryGetContentType.And(startsWithJson); + var jsonDeserializationBlock = new MethodBodyStatement[] + { + UsingDeclare("document", typeof(JsonDocument), response.Property(nameof(HttpResponseApi.Content)).As().Parse(ModelSerializationExtensionsSnippets.JsonDocumentOptions), out var docVariable), + Return(GetDeserializationMethodInvocationForType(_model, docVariable.As().RootElement())) + }; + + var xmlDeserialization = new MethodBodyStatement[] + { + UsingDeclare("stream", typeof(Stream), response.Property(nameof(HttpResponseApi.ContentStream)), out var streamVar), + new IfStatement(streamVar.Equal(Null)) { Return(Default) }, + MethodBodyStatement.EmptyLine, + Return(GetDeserializationMethodInvocationForType(_model, XElementSnippets.Load(streamVar.As(), XmlLinqSnippets.PreserveWhitespace))) + }; + + MethodBodyStatement[] methodBody = + [ + responseDeclaration, + MethodBodyStatement.EmptyLine, + new IfStatement(isJsonCondition) { jsonDeserializationBlock }, + MethodBodyStatement.EmptyLine, + xmlDeserialization + ]; + + return new MethodProvider( + new MethodSignature(Type.Name, null, modifiers, Type, null, [result]), + methodBody, + this); + } + + private static void CollectNamespace(string propertyName, XmlSerializationNamespace nsOptions, Dictionary namespaces) + { + if (!namespaces.ContainsKey(nsOptions.Namespace)) + { + var variableName = $"{propertyName}Ns".ToVariableName(); + var variableExpression = new VariableExpression(typeof(XNamespace), variableName); + namespaces[nsOptions.Namespace] = new XmlNamespaceInfo(nsOptions.Namespace, variableName, nsOptions.Prefix, variableExpression); + } + } + + private static MethodBodyStatement GetXmlNamespaceDeclarations(Dictionary? namespaces) + { + if (namespaces == null || namespaces.Count == 0) + { + return MethodBodyStatement.Empty; + } + + var statements = new List(); + foreach (var ns in namespaces.Values) + { + statements.Add(Declare(ns.VariableExpression, Literal(ns.Namespace))); + } + + statements.Add(MethodBodyStatement.EmptyLine); + return statements; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/MrwSerializationTypeDefinition.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/MrwSerializationTypeDefinition.cs index 3fe0464ffcb..4159758ce6a 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/MrwSerializationTypeDefinition.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/MrwSerializationTypeDefinition.cs @@ -10,6 +10,9 @@ using System.Net; using System.Text; using System.Text.Json; +using System.Xml; +using System.Xml.Linq; +using Microsoft.TypeSpec.Generator.ClientModel.Primitives; using Microsoft.TypeSpec.Generator.ClientModel.Snippets; using Microsoft.TypeSpec.Generator.ClientModel.Utilities; using Microsoft.TypeSpec.Generator.EmitterRpc; @@ -34,6 +37,7 @@ public partial class MrwSerializationTypeDefinition : TypeProvider private const string JsonModelCreateCoreMethodName = "JsonModelCreateCore"; private const string PersistableModelWriteCoreMethodName = "PersistableModelWriteCore"; private const string PersistableModelCreateCoreMethodName = "PersistableModelCreateCore"; + private const string DeserializationMethodNamePrefix = "Deserialize"; private const string WriteAction = "writing"; private const string ReadAction = "reading"; private readonly ParameterProvider _utf8JsonWriterParameter = new("writer", $"The JSON writer.", typeof(Utf8JsonWriter)); @@ -57,6 +61,8 @@ public partial class MrwSerializationTypeDefinition : TypeProvider private readonly Lazy _additionalBinaryDataProperty; private readonly PropertyProvider? _jsonPatchProperty; private readonly bool _isStruct; + private readonly bool _supportsJson; + private readonly bool _supportsXml; private ConstructorProvider? _serializationConstructor; // Flag to determine if the model should override the serialization methods private readonly bool _shouldOverrideMethods; @@ -73,6 +79,8 @@ public MrwSerializationTypeDefinition(InputModelType inputModel, ModelProvider m : null; _inputModel = inputModel; _isStruct = _model.DeclarationModifiers.HasFlag(TypeSignatureModifiers.Struct); + _supportsJson = inputModel.Usage.HasFlag(InputModelTypeUsage.Json); + _supportsXml = inputModel.Usage.HasFlag(InputModelTypeUsage.Xml); // Initialize the serialization interfaces var interfaceType = inputModel.IsUnknownDiscriminatorModel ? ScmCodeModelGenerator.Instance.TypeFactory.CreateModel(inputModel.BaseModel!)! : _model; _jsonModelTInterface = new CSharpType(typeof(IJsonModel<>), interfaceType.Type); @@ -86,7 +94,9 @@ public MrwSerializationTypeDefinition(InputModelType inputModel, ModelProvider m _utf8JsonWriterSnippet = _utf8JsonWriterParameter.As(); _mrwOptionsParameterSnippet = _serializationOptionsParameter.As(); _jsonElementParameterSnippet = _jsonElementDeserializationParam.As(); + _xmlElementParameterSnippet = _xElementDeserializationParam.As(); _isNotEqualToWireConditionSnippet = _mrwOptionsParameterSnippet.Format().NotEqual(ModelReaderWriterOptionsSnippets.WireFormat); + _xmlWriterSnippet = _xmlWriterParameter.As(); } protected override FormattableString BuildDescription() => _model.Description; @@ -165,45 +175,70 @@ protected override ConstructorProvider[] BuildConstructors() /// A list of serialization and deserialization methods for the model. protected override MethodProvider[] BuildMethods() { - var jsonModelWriteCoreMethod = BuildJsonModelWriteCoreMethod(); - var methods = new List() + var methods = new List(); + + if (_supportsJson || _supportsXml) { - // Add JsonModel serialization methods - BuildJsonModelWriteMethod(jsonModelWriteCoreMethod), - jsonModelWriteCoreMethod, - // Add JsonModel deserialization methods - BuildJsonModelCreateMethod(), - BuildJsonModelCreateCoreMethod(), - BuildDeserializationMethod(), // Add PersistableModel serialization methods - BuildPersistableModelWriteMethod(), - BuildPersistableModelWriteCoreMethod(), - BuildPersistableModelCreateMethod(), - BuildPersistableModelCreateCoreMethod(), - BuildPersistableModelGetFormatFromOptionsMethod(), - }; + methods.AddRange( + BuildPersistableModelCreateCoreMethod(), + BuildPersistableModelWriteCoreMethod(), + BuildPersistableModelWriteMethod(), + BuildPersistableModelCreateMethod(), + BuildPersistableModelGetFormatFromOptionsMethod()); + + if (!_inputModel.IsUnknownDiscriminatorModel) + { + // cast operators + if (ScmCodeModelGenerator.Instance.TypeFactory.RootInputModels.Contains(_inputModel)) + { + methods.Add(BuildImplicitToBinaryContent()); + // Add internal ToBinaryContent helper for format-specific serialization + if (_supportsJson && _supportsXml) + { + methods.Add(BuildToBinaryContentMethod()); + } + } - if (!_inputModel.IsUnknownDiscriminatorModel) - { - //cast operators - if (ScmCodeModelGenerator.Instance.TypeFactory.RootInputModels.Contains(_inputModel)) + if (ScmCodeModelGenerator.Instance.TypeFactory.RootOutputModels.Contains(_inputModel)) + { + methods.Add(GetExplicitFromClientResultMethod(_supportsJson, _supportsXml)); + } + } + + if (_isStruct) { - methods.Add(BuildImplicitToBinaryContent()); + methods.AddRange( + BuildPersistableModelWriteMethodObjectDeclaration(), + BuildPersistableModelGetFormatFromOptionsObjectDeclaration(), + BuildPersistableModelCreateMethodObjectDeclaration()); } + } + + // Add JsonModel serialization methods only if the model supports JSON + if (_supportsJson) + { + var jsonModelWriteCoreMethod = BuildJsonModelWriteCoreMethod(); + methods.Add(BuildJsonModelWriteMethod(jsonModelWriteCoreMethod)); + methods.Add(jsonModelWriteCoreMethod); + // Add JsonModel deserialization methods + methods.Add(BuildJsonModelCreateMethod()); + methods.Add(BuildJsonModelCreateCoreMethod()); + methods.Add(BuildDeserializationMethod()); - if (ScmCodeModelGenerator.Instance.TypeFactory.RootOutputModels.Contains(_inputModel)) + if (_isStruct) { - methods.Add(BuildExplicitFromClientResult()); + methods.Add(BuildJsonModelWriteMethodObjectDeclaration()); + methods.Add(BuildJsonModelCreateMethodObjectDeclaration()); } } - if (_isStruct) + if (_supportsXml) { - methods.Add(BuildJsonModelWriteMethodObjectDeclaration()); - methods.Add(BuildJsonModelCreateMethodObjectDeclaration()); - methods.Add(BuildPersistableModelWriteMethodObjectDeclaration()); - methods.Add(BuildPersistableModelGetFormatFromOptionsObjectDeclaration()); - methods.Add(BuildPersistableModelCreateMethodObjectDeclaration()); + methods.AddRange( + BuildXmlWriteMethod(), + BuildXmlModelWriteCoreMethod(), + BuildXmlDeserializationMethod()); } if (_model is ScmModelProvider { IsDynamicModel: true, HasDynamicProperties: true }) @@ -214,6 +249,21 @@ protected override MethodProvider[] BuildMethods() return [.. methods]; } + private MethodProvider GetExplicitFromClientResultMethod(bool supportsJson, bool supportsXml) + { + if (supportsJson && supportsXml) + { + return BuildJsonAndXmlExplicitFromClientResult(); + } + + if (supportsXml) + { + return BuildXmlExplicitFromClientResult(); + } + + return BuildExplicitFromClientResult(); + } + private MethodProvider BuildExplicitFromClientResult() { var result = new ParameterProvider( @@ -281,22 +331,49 @@ private MethodProvider BuildImplicitToBinaryContent() this); } + private MethodProvider BuildToBinaryContentMethod() + { + var formatParameter = new ParameterProvider("format", $"The format to use for serialization", typeof(string)); + + // ModelReaderWriterOptions options = new ModelReaderWriterOptions(format); + // return BinaryContent.Create(this, options); + var requestContentType = ScmCodeModelGenerator.Instance.TypeFactory.RequestContentApi.RequestContentType; + return new MethodProvider( + new MethodSignature($"To{requestContentType.Name}", FormattableStringHelpers.FromString($"Converts the model to {requestContentType.Name} using the specified format"), MethodSignatureModifiers.Internal, requestContentType, null, [formatParameter]), + new MethodBodyStatement[] + { + Declare("options", typeof(ModelReaderWriterOptions), New.Instance(typeof(ModelReaderWriterOptions), formatParameter), out var options), + Return(RequestContentApiSnippets.Create(This, options.As())) + }, + this); + } + /// /// Builds the types that the model type serialization implements. /// /// An array of types that the model implements. protected override CSharpType[] BuildImplements() { - int interfaceCount = _jsonModelObjectInterface != null ? 2 : 1; - CSharpType[] interfaces = new CSharpType[interfaceCount]; - interfaces[0] = _jsonModelTInterface; + var interfaces = new List(); - if (_jsonModelObjectInterface != null) + if (_supportsJson) + { + interfaces.Add(_jsonModelTInterface); + if (_jsonModelObjectInterface != null) + { + interfaces.Add(_jsonModelObjectInterface); + } + } + else if (_supportsXml) { - interfaces[1] = _jsonModelObjectInterface; + interfaces.Add(_persistableModelTInterface); + if (_persistableModelObjectInterface != null) + { + interfaces.Add(_persistableModelObjectInterface); + } } - return interfaces; + return [.. interfaces]; } /// @@ -486,7 +563,7 @@ internal MethodProvider BuildJsonModelCreateCoreMethod() var methodBody = new MethodBodyStatement[] { - CreateValidateJsonFormat( _persistableModelTInterface, ReadAction), + CreateValidateFormat(_persistableModelTInterface, ReadAction, ModelReaderWriterOptionsSnippets.JsonFormat), // using var document = JsonDocument.ParseValue(ref reader); UsingDeclare("document", typeof(JsonDocument), JsonDocumentSnippets.ParseValue(_utf8JsonReaderParameter.AsArgument()), out var docVariable), // return DeserializeT(doc.RootElement, options); @@ -507,7 +584,7 @@ internal MethodProvider BuildJsonModelCreateCoreMethod() /// internal MethodProvider BuildDeserializationMethod() { - var methodName = $"Deserialize{_model.Name}"; + var methodName = $"{DeserializationMethodNamePrefix}{_model.Name}"; var signatureModifiers = MethodSignatureModifiers.Internal | MethodSignatureModifiers.Static; List parameters = _model is ScmModelProvider { IsDynamicModel: true } ? [_jsonElementDeserializationParam, _dataParameter, _serializationOptionsParameter] @@ -553,10 +630,10 @@ private static MethodBodyStatement BuildDiscriminatedModelsCondition( bool onlyContainsUnknownDerivedModel, ScopedApi jsonElementParameterSnippet) { - if (!onlyContainsUnknownDerivedModel && discriminatorProperty?.WireInfo?.SerializedName != null) + if (!onlyContainsUnknownDerivedModel && discriminatorProperty?.WireInfo != null) { return new IfStatement(jsonElementParameterSnippet.TryGetProperty( - discriminatorProperty.WireInfo.SerializedName, + GetJsonSerializedName(discriminatorProperty.WireInfo), out var discriminator)) { new SwitchStatement(discriminator.GetString(), abstractSwitchCases) @@ -629,12 +706,12 @@ internal MethodProvider BuildPersistableModelCreateMethod() /// internal MethodProvider BuildPersistableModelGetFormatFromOptionsMethod() { - ValueExpression jsonWireFormat = SystemSnippet.JsonFormatSerialization; + ValueExpression wireFormat = _supportsJson ? SystemSnippet.JsonFormatSerialization : SystemSnippet.XmlFormatSerialization; // string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) return new MethodProvider ( new MethodSignature(nameof(IPersistableModel.GetFormatFromOptions), null, MethodSignatureModifiers.None, typeof(string), null, [_serializationOptionsParameter], ExplicitInterface: _persistableModelTInterface), - jsonWireFormat, + wireFormat, this ); } @@ -644,7 +721,6 @@ internal MethodProvider BuildPersistableModelGetFormatFromOptionsMethod() /// internal MethodProvider BuildPersistableModelGetFormatFromOptionsObjectDeclaration() { - ValueExpression jsonWireFormat = SystemSnippet.JsonFormatSerialization; var castToT = This.CastTo(_persistableModelTInterface); // string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => ((IPersistableModel)this).GetFormatFromOptions(options); @@ -728,7 +804,7 @@ private MethodBodyStatement[] BuildJsonModelWriteCoreMethodBody() return [ - CreateValidateJsonFormat(_persistableModelTInterface, WriteAction), + CreateValidateFormat(_persistableModelTInterface, WriteAction, ModelReaderWriterOptionsSnippets.JsonFormat), CallBaseJsonModelWriteCore(isDynamicModelWithNonDynamicBase), writePropertiesStatements, CreateWriteAdditionalRawDataStatement() @@ -792,9 +868,19 @@ private MethodBodyStatement GetPropertyVariableDeclarations() } else { - var defaultValue = (property.IsDiscriminator && _model.DiscriminatorValue != null && property.Type.IsFrameworkType) - ? Literal(_model.DiscriminatorValue) - : Default; + ValueExpression defaultValue; + if (property.IsDiscriminator && _model.DiscriminatorValue != null && property.Type.IsFrameworkType) + { + defaultValue = Literal(_model.DiscriminatorValue); + } + else if (IsXmlUnwrappedRequiredCollection(property)) + { + defaultValue = New.List(property.Type.ElementType); + } + else + { + defaultValue = Default; + } propertyDeclarationStatements.Add(Declare(variableRef, defaultValue)); } } @@ -819,11 +905,34 @@ private MethodBodyStatement GetPropertyVariableDeclarations() return propertyDeclarationStatements; } + private static bool IsXmlUnwrappedRequiredCollection(PropertyProvider property) + { + var wireInfo = property.WireInfo; + if (wireInfo == null || !wireInfo.IsRequired || wireInfo.IsNullable || !property.Type.IsCollection) + { + return false; + } + + var xmlWireInfo = (wireInfo.SerializationOptions as ScmSerializationOptions)?.Xml; + return xmlWireInfo?.Unwrapped == true; + } + private MethodBodyStatement[] BuildPersistableModelWriteCoreMethodBody() { - var switchCase = new SwitchCaseStatement( - ModelReaderWriterOptionsSnippets.JsonFormat, - Return(Static(typeof(ModelReaderWriter)).Invoke(nameof(ModelReaderWriter.Write), [This, _mrwOptionsParameterSnippet, ModelReaderWriterContextSnippets.Default]))); + var switchCases = new List(); + + if (_supportsJson) + { + switchCases.Add(new SwitchCaseStatement( + ModelReaderWriterOptionsSnippets.JsonFormat, + Return(Static(typeof(ModelReaderWriter)).Invoke(nameof(ModelReaderWriter.Write), [This, _mrwOptionsParameterSnippet, ModelReaderWriterContextSnippets.Default])))); + } + + if (_supportsXml) + { + switchCases.Add(CreatePersistableModelWriteCoreXmlSwitchCase()); + } + var typeOfT = _persistableModelTInterface.Arguments[0]; var defaultCase = SwitchCaseStatement.Default( ThrowValidationFailException(_mrwOptionsParameterSnippet.Format(), typeOfT, WriteAction)); @@ -831,26 +940,37 @@ private MethodBodyStatement[] BuildPersistableModelWriteCoreMethodBody() return [ GetConcreteFormat(_mrwOptionsParameterSnippet, _persistableModelTInterface, out VariableExpression format), - new SwitchStatement(format, [switchCase, defaultCase]) + new SwitchStatement(format, [.. switchCases, defaultCase]) ]; } private MethodBodyStatement[] BuildPersistableModelCreateCoreMethodBody() { var typeForDeserialize = _model.IsUnknownDiscriminatorModel ? _model.Type.BaseType! : _model.Type; - var switchCase = new SwitchCaseStatement( - ModelReaderWriterOptionsSnippets.JsonFormat, - new MethodBodyStatement[] - { - new UsingScopeStatement(typeof(JsonDocument), "document", JsonDocumentSnippets.Parse(_dataParameter, ModelSerializationExtensionsSnippets.JsonDocumentOptions), out var jsonDocumentVar) + var switchCases = new List(); + + if (_supportsJson) + { + switchCases.Add(new SwitchCaseStatement( + ModelReaderWriterOptionsSnippets.JsonFormat, + new MethodBodyStatement[] { - Return(GetDeserializationMethodInvocationForType( - typeForDeserialize, - jsonDocumentVar.As().RootElement(), - _dataParameter, - _serializationOptionsParameter)) - }, - }); + new UsingScopeStatement(typeof(JsonDocument), "document", JsonDocumentSnippets.Parse(_dataParameter, ModelSerializationExtensionsSnippets.JsonDocumentOptions), out var jsonDocumentVar) + { + Return(GetDeserializationMethodInvocationForType( + typeForDeserialize, + jsonDocumentVar.As().RootElement(), + _dataParameter, + _serializationOptionsParameter)) + }, + })); + } + + if (_supportsXml) + { + switchCases.Add(CreatePersistableModelCreateCoreXmlSwitchCase(typeForDeserialize)); + } + var typeOfT = _persistableModelTInterface.Arguments[0]; var defaultCase = SwitchCaseStatement.Default( ThrowValidationFailException(_mrwOptionsParameterSnippet.Format(), typeOfT, ReadAction)); @@ -858,7 +978,7 @@ private MethodBodyStatement[] BuildPersistableModelCreateCoreMethodBody() return [ GetConcreteFormat(_mrwOptionsParameterSnippet, _persistableModelTInterface, out VariableExpression format), - new SwitchStatement(format, [switchCase, defaultCase]) + new SwitchStatement(format, [.. switchCases, defaultCase]) ]; } @@ -924,23 +1044,8 @@ private List BuildDeserializePropertiesStatements(ScopedApi Dictionary> additionalPropsValueKindBodyStatements = []; var parameters = SerializationConstructor.Signature.Parameters; - // Parse the custom serialization attributes - List serializationAttributes = _model.CustomCodeView?.Attributes - .Where(a => a.Type.Name == CodeGenAttributes.CodeGenSerializationAttributeName) - .ToList() ?? []; - var baseModelProvider = _model.BaseModelProvider; - - while (baseModelProvider != null) - { - var customCodeView = baseModelProvider.CustomCodeView; - if (customCodeView != null) - { - serializationAttributes - .AddRange(customCodeView.Attributes - .Where(a => a.Type.Name == CodeGenAttributes.CodeGenSerializationAttributeName)); - } - baseModelProvider = baseModelProvider.BaseModelProvider; - } + // Get the custom serialization attributes + var serializationAttributes = GetSerializationAttributes(); // Create each property's deserialization statement for (int i = 0; i < parameters.Count; i++) @@ -963,13 +1068,13 @@ private List BuildDeserializePropertiesStatements(ScopedApi { continue; } - var propertySerializationName = wireInfo.SerializedName; + var propertySerializationName = GetJsonSerializedName(wireInfo); var propertyName = parameter.Property?.Name ?? parameter.Field?.Name; var propertyType = parameter.Property?.Type ?? parameter.Field?.Type; var propertyExpression = parameter.Property?.AsVariableExpression ?? parameter.Field?.AsVariableExpression; var checkIfJsonPropEqualsName = new IfStatement(jsonProperty.NameEquals(propertySerializationName)) { - DeserializeProperty(propertyName!, propertyType!, wireInfo, propertyExpression!, jsonProperty, serializationAttributes, parameter.Property?.SerializationFormat) + DeserializeProperty(propertyName!, propertyType!, wireInfo, propertyExpression!, jsonProperty, serializationAttributes, wireInfo.SerializationFormat) }; propertyDeserializationStatements.Add(checkIfJsonPropEqualsName); } @@ -990,7 +1095,7 @@ private List BuildDeserializePropertiesStatements(ScopedApi var rawBinaryData = _rawDataField; if (rawBinaryData == null) { - baseModelProvider = _model.BaseModelProvider; + var baseModelProvider = _model.BaseModelProvider; while (baseModelProvider != null) { var field = baseModelProvider.Fields.FirstOrDefault(f => f.Name == AdditionalPropertiesHelper.AdditionalBinaryDataPropsFieldName); @@ -1299,10 +1404,16 @@ private MethodBodyStatement[] DeserializeProperty( out var deserializationHook, out _) && name == propertyName && deserializationHook != null) { + var knownArgs = new (string TypeName, ValueExpression Argument)[] + { + (nameof(JsonProperty), jsonProperty), + (nameof(ModelReaderWriterOptions), _serializationOptionsParameter) + }; + var hookArgs = GetDeserializationHookArguments(deserializationHook, variableExpression, knownArgs); return [ MethodBodyStatement.Empty, - Static().Invoke(deserializationHook, jsonProperty, ByRef(variableExpression)).Terminate(), + Static().Invoke(deserializationHook, hookArgs).Terminate(), Continue ]; } @@ -1407,6 +1518,13 @@ private MethodBodyStatement DeserializeValue( SerializationFormat serializationFormat, out ValueExpression value) { + // byte[] is a special case - it represents a base64-encoded bytes value, not a JSON array + if (valueType.IsFrameworkType && valueType.FrameworkType == typeof(byte[])) + { + value = CreateDeserializeValueExpression(valueType, serializationFormat, jsonElement); + return MethodBodyStatement.Empty; + } + if (valueType.IsList || valueType.IsArray) { if (valueType.IsReadOnlyMemory) @@ -1546,9 +1664,9 @@ private ConstructorProvider BuildEmptyConstructor() } /// - /// Produces the validation body statements for the JSON serialization format. + /// Produces the validation body statements for the serialization format. /// - private MethodBodyStatement CreateValidateJsonFormat(CSharpType modelInterface, string action) + private MethodBodyStatement CreateValidateFormat(CSharpType modelInterface, string action, ValueExpression expectedFormat) { /* var format = options.Format == "W" ? GetFormatFromOptions(options) : options.Format; @@ -1560,7 +1678,7 @@ private MethodBodyStatement CreateValidateJsonFormat(CSharpType modelInterface, MethodBodyStatement[] statements = [ GetConcreteFormat(_mrwOptionsParameterSnippet, modelInterface, out VariableExpression format), - new IfStatement(format.NotEqual(ModelReaderWriterOptionsSnippets.JsonFormat)) + new IfStatement(format.NotEqual(expectedFormat)) { ThrowValidationFailException(format, modelInterface.Arguments[0], action) }, @@ -1609,6 +1727,7 @@ private MethodBodyStatement[] CreateWritePropertiesStatements(bool isDynamicMode { continue; } + propertyStatements.Add(CreateWritePropertyStatement(property.WireInfo, property.Type, property.Name, property, property.WireInfo?.SerializationFormat)); } @@ -1618,6 +1737,7 @@ private MethodBodyStatement[] CreateWritePropertiesStatements(bool isDynamicMode { continue; } + propertyStatements.Add(CreateWritePropertyStatement(field.WireInfo, field.Type, field.Name, field, field.WireInfo?.SerializationFormat)); } @@ -1634,7 +1754,7 @@ private MethodBodyStatement[] CreateWritePropertiesStatements(bool isDynamicMode continue; } - propertyStatements.Add(CreateWritePropertyStatement(property.WireInfo, property.Type, property.Name, property, property.SerializationFormat)); + propertyStatements.Add(CreateWritePropertyStatement(property.WireInfo, property.Type, property.Name, property, property.WireInfo.SerializationFormat)); } foreach (var field in _model.CanonicalView.Fields) @@ -1657,7 +1777,7 @@ private MethodBodyStatement CreateWritePropertyStatement( MemberExpression propertyExpression, SerializationFormat? serializationFormat) { - var propertySerializationName = wireInfo.SerializedName; + var propertySerializationName = GetJsonSerializedName(wireInfo); var propertySerializationFormat = wireInfo.SerializationFormat; var propertyIsReadOnly = wireInfo.IsReadOnly; var propertyIsRequired = wireInfo.IsRequired; @@ -1712,7 +1832,7 @@ private MethodBodyStatement CreateWritePropertyStatement( var wrapInIsDefinedStatement = WrapInIsDefined( propertyExpression, propertyType, - wireInfo, + propertySerializationName, propertyIsRequired, propertyIsReadOnly, propertyIsNullable, @@ -1724,7 +1844,7 @@ private MethodBodyStatement CreateWritePropertyStatement( private MethodBodyStatement WrapInIsDefined( MemberExpression propertyExpression, CSharpType propertyType, - PropertyWireInformation wireInfo, + string jsonSerializedName, bool propertyIsRequired, bool propertyIsReadOnly, bool propertyIsNullable, @@ -1732,7 +1852,7 @@ private MethodBodyStatement WrapInIsDefined( { #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. ScopedApi? patchCheck = _jsonPatchProperty != null - ? Not(_jsonPatchProperty.As().Contains(LiteralU8($"$.{wireInfo.SerializedName}"))) + ? Not(_jsonPatchProperty.As().Contains(LiteralU8($"$.{jsonSerializedName}"))) : null; #pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. @@ -1745,7 +1865,7 @@ private MethodBodyStatement WrapInIsDefined( return writePropertySerializationStatement; return (propertyType.IsList || propertyType.IsArray) - ? CreateConditionalPatchSerializationStatement(wireInfo.SerializedName, null, writePropertySerializationStatement, writePropertySerializationStatement) + ? CreateConditionalPatchSerializationStatement(jsonSerializedName, null, writePropertySerializationStatement, writePropertySerializationStatement) : new IfStatement(patchCheck) { writePropertySerializationStatement }; } @@ -1756,7 +1876,7 @@ private MethodBodyStatement WrapInIsDefined( propertyIsReadOnly, propertyIsNullable, propertyIsRequired, - wireInfo.SerializedName, + jsonSerializedName, patchCheck, writePropertySerializationStatement); } @@ -1894,14 +2014,15 @@ private MethodBodyStatement CreateEncodedArraySerializationStatement( { stringJoinExpression = StringSnippets.Join(Literal(delimiter), propertyExpression); } - else if (elementType.IsEnum && !elementType.IsStruct && elementType.UnderlyingEnumType?.Equals(typeof(string)) == true) + else if (elementType.IsEnum && elementType.UnderlyingEnumType?.Equals(typeof(string)) == true) { - var x = new VariableExpression(typeof(object), "x"); + var x = new VariableExpression(elementType, "x"); + var body = elementType.ToSerial(x); var selectExpression = propertyExpression.Invoke(nameof(Enumerable.Select), - new FuncExpression([x.Declaration], new TernaryConditionalExpression( - x.Equal(Null), - Literal(""), - elementType.ToSerial(x)))); + [new FuncExpression([x.Declaration], body)], + [], + false, + extensionType: typeof(Enumerable)); stringJoinExpression = StringSnippets.Join(Literal(delimiter), selectExpression); } else @@ -1965,27 +2086,32 @@ private MethodBodyStatement[] CreateEncodedArrayDeserializationStatements( createArrayStatement = variableExpression.Assign(conditionalExpression).Terminate(); } } - else if (elementType.IsEnum && !elementType.IsStruct && elementType.UnderlyingEnumType?.Equals(typeof(string)) == true) + else if (elementType.IsEnum && elementType.UnderlyingEnumType?.Equals(typeof(string)) == true) { - var splitExpression = new TernaryConditionalExpression( - isNullOrEmptyCheck, - New.Array(typeof(string)), - stringValueVar.As().Split(delimiterChar)); - var s = new VariableExpression(typeof(string), "s"); var trimmedS = s.Invoke(nameof(string.Trim)); + var parseExpression = elementType.ToEnum(trimmedS); - var parseExpression = Static(elementType).Invoke("Parse", trimmedS); - - var selectExpression = splitExpression.Invoke(nameof(Enumerable.Select), - new FuncExpression([s.Declaration], parseExpression)); + var splitAndParse = stringValueVar.As().Split(delimiterChar) + .Invoke(nameof(Enumerable.Select), new FuncExpression([s.Declaration], parseExpression)); - var finalExpression = propertyType.IsArray - ? selectExpression.Invoke(nameof(Enumerable.ToArray)) - : propertyType.IsList - ? New.Instance(typeof(List<>).MakeGenericType(elementType.FrameworkType), selectExpression) - : New.Instance(propertyType.PropertyInitializationType, selectExpression); - createArrayStatement = variableExpression.Assign(finalExpression).Terminate(); + if (propertyType.IsArray) + { + var conditionalExpression = new TernaryConditionalExpression( + isNullOrEmptyCheck, + New.Array(elementType), + splitAndParse.Invoke(nameof(Enumerable.ToArray))); + createArrayStatement = variableExpression.Assign(conditionalExpression).Terminate(); + } + else + { + var initType = propertyType.PropertyInitializationType; + var conditionalExpression = new TernaryConditionalExpression( + isNullOrEmptyCheck, + New.Instance(initType), + New.Instance(initType, splitAndParse.Invoke(nameof(Enumerable.ToList)).CastTo(new CSharpType(typeof(IList<>), elementType)))); + createArrayStatement = variableExpression.Assign(conditionalExpression).Terminate(); + } } else { @@ -2163,13 +2289,17 @@ internal static ValueExpression DeserializeJsonValueCore( ValueExpression? exp = frameworkType switch { Type t when t == typeof(Uri) => - New.Instance(frameworkType, element.GetString()), + New.Instance(element.GetString(), FrameworkEnumValue(UriKind.RelativeOrAbsolute)), Type t when t == typeof(IPAddress) => Static().Invoke(nameof(IPAddress.Parse), element.GetString()), Type t when t == typeof(BinaryData) => format is SerializationFormat.Bytes_Base64 or SerializationFormat.Bytes_Base64Url ? BinaryDataSnippets.FromBytes(element.GetBytesFromBase64(format.ToFormatSpecifier())) : BinaryDataSnippets.FromString(element.GetRawText()), + Type t when t == typeof(byte[]) => + format is SerializationFormat.Bytes_Base64 or SerializationFormat.Bytes_Base64Url + ? element.GetBytesFromBase64(format.ToFormatSpecifier()) + : BinaryDataSnippets.FromString(element.GetRawText()).ToArray(), Type t when t == typeof(Stream) => BinaryDataSnippets.FromString(element.GetRawText()).ToStream(), Type t when t == typeof(JsonElement) => @@ -2192,8 +2322,6 @@ Type t when ValueTypeIsInt(t) => element.GetString(), Type t when t == typeof(Guid) => element.GetGuid(), - Type t when t == typeof(byte[]) => - element.GetBytesFromBase64(format.ToFormatSpecifier()), Type t when t == typeof(DateTimeOffset) => format == SerializationFormat.DateTime_Unix ? DateTimeOffsetSnippets.FromUnixTimeSeconds(element.GetInt64()) @@ -2424,6 +2552,80 @@ private MethodBodyStatement CreateWriteAdditionalPropertiesStatement() p => p.BackingField?.Name == AdditionalPropertiesHelper.AdditionalBinaryDataPropsFieldName); } + private MethodProvider? FindCustomHookMethod(string hookName) + { + var model = _model; + while (model != null) + { + var method = model.CanonicalView.Methods.FirstOrDefault(m => m.Signature.Name == hookName); + if (method != null) + { + return method; + } + model = model.BaseModelProvider; + } + return null; + } + + /// + /// Builds the argument list for a deserialization hook invocation by matching the hook's parameters + /// to the known available arguments. Parameters are matched as follows: + /// + /// ref parameters are matched to the designated ref variable argument. + /// Other parameters are matched by type name. + /// Unmatched parameters receive the default value for their type. + /// + /// + private IReadOnlyList GetDeserializationHookArguments( + string hookName, + ValueExpression refVariable, + IReadOnlyList<(string TypeName, ValueExpression Argument)> knownArguments) + { + var hookMethod = FindCustomHookMethod(hookName); + if (hookMethod == null) + { + // Fall back: no method found, use previous behavior (first known arg, ref variable, no options) + return [knownArguments[0].Argument, ByRef(refVariable)]; + } + + var args = new List(); + foreach (var param in hookMethod.Signature.Parameters) + { + if (param.IsRef) + { + args.Add(ByRef(refVariable)); + } + else + { + var matched = knownArguments.FirstOrDefault(a => a.TypeName == param.Type.Name); + args.Add(matched.Argument ?? DefaultOf(param.Type)); + } + } + return args; + } + + private List GetSerializationAttributes() + { + List serializationAttributes = _model.CustomCodeView?.Attributes + .Where(a => a.Type.Name == CodeGenAttributes.CodeGenSerializationAttributeName) + .ToList() ?? []; + var baseModelProvider = _model.BaseModelProvider; + + while (baseModelProvider != null) + { + var customCodeView = baseModelProvider.CustomCodeView; + if (customCodeView != null) + { + serializationAttributes + .AddRange(customCodeView.Attributes + .Where(a => a.Type.Name == CodeGenAttributes.CodeGenSerializationAttributeName)); + } + baseModelProvider = baseModelProvider.BaseModelProvider; + } + + return serializationAttributes; + } + private static bool TypeRequiresNullCheckInSerialization(CSharpType type) { if (type.IsCollection) @@ -2444,16 +2646,21 @@ private static bool TypeRequiresNullCheckInSerialization(CSharpType type) return false; } + private static string GetJsonSerializedName(PropertyWireInformation wireInfo) + { + return (wireInfo.SerializationOptions as ScmSerializationOptions)?.Json?.Name ?? wireInfo.SerializedName; + } + internal static ValueExpression GetDeserializationMethodInvocationForType( CSharpType modelType, - ScopedApi jsonElementVariable, - ValueExpression dataVariable, + ScopedApi element, + ValueExpression? dataVariable, ValueExpression? optionsVariable = null) { return ScmCodeModelGenerator.Instance.TypeFactory.CSharpTypeMap.TryGetValue(modelType, out var provider) && provider is ModelProvider modelProvider - ? GetDeserializationMethodInvocationForType(modelProvider, jsonElementVariable, dataVariable, optionsVariable) - : modelType.Deserialize(jsonElementVariable, null, optionsVariable); + ? GetDeserializationMethodInvocationForType(modelProvider, element, dataVariable, optionsVariable) + : modelType.Deserialize(element, null, optionsVariable); } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/PipelineMessageClassifierProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/PipelineMessageClassifierProvider.cs index 9e42f218ff4..32b550c2384 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/PipelineMessageClassifierProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/PipelineMessageClassifierProvider.cs @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using Microsoft.TypeSpec.Generator.Expressions; -using static Microsoft.TypeSpec.Generator.Snippets.Snippet; using System.ClientModel.Primitives; -using Microsoft.TypeSpec.Generator.Primitives; using System.Collections.Generic; using System.Linq; +using Microsoft.TypeSpec.Generator.Expressions; +using Microsoft.TypeSpec.Generator.Primitives; +using static Microsoft.TypeSpec.Generator.Snippets.Snippet; namespace Microsoft.TypeSpec.Generator.ClientModel.Providers { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/PipelineRequestHeadersExtensionsDefinition.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/PipelineRequestHeadersExtensionsDefinition.cs index 2296e822934..1971678b82f 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/PipelineRequestHeadersExtensionsDefinition.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/PipelineRequestHeadersExtensionsDefinition.cs @@ -10,6 +10,7 @@ using Microsoft.TypeSpec.Generator.Primitives; using Microsoft.TypeSpec.Generator.Providers; using Microsoft.TypeSpec.Generator.Snippets; +using Microsoft.TypeSpec.Generator.Statements; using static Microsoft.TypeSpec.Generator.Snippets.Snippet; namespace Microsoft.TypeSpec.Generator.ClientModel.Providers @@ -17,6 +18,7 @@ namespace Microsoft.TypeSpec.Generator.ClientModel.Providers internal class PipelineRequestHeadersExtensionsDefinition : TypeProvider { private const string _setDelimited = "SetDelimited"; + private const string _addWithPrefix = "Add"; private ParameterProvider _pipelineRequestHeadersParam; public PipelineRequestHeadersExtensionsDefinition() { @@ -38,6 +40,7 @@ protected override MethodProvider[] BuildMethods() [ BuildSetDelimited(false), BuildSetDelimited(true), + BuildAddWithPrefix(), ]; } @@ -73,5 +76,29 @@ private MethodProvider BuildSetDelimited(bool hasFormat) return new(signature, body, this); } + + private MethodProvider BuildAddWithPrefix() + { + var prefixParameter = new ParameterProvider("prefix", $"The prefix to prepend to each header key.", typeof(string)); + var headersToAddParameter = new ParameterProvider("value", $"The dictionary of headers to add.", new CSharpType(typeof(IDictionary<,>), typeof(string), typeof(string))); + var modifiers = MethodSignatureModifiers.Public | MethodSignatureModifiers.Static | MethodSignatureModifiers.Extension; + MethodSignature signature = new MethodSignature( + Name: _addWithPrefix, + Modifiers: modifiers, + Parameters: [_pipelineRequestHeadersParam, prefixParameter, headersToAddParameter], + ReturnType: null, + Description: null, + ReturnDescription: null); + + var dictionaryExpression = headersToAddParameter.AsDictionary(typeof(string), typeof(string)); + var forEachStatement = new ForEachStatement("header", dictionaryExpression, out var header); + forEachStatement.Add( + new InvokeMethodExpression(_pipelineRequestHeadersParam, nameof(PipelineRequestHeaders.Add), + [new BinaryOperatorExpression("+", prefixParameter, header.Key), header.Value]).Terminate() + ); + + MethodBodyStatement[] body = [forEachStatement]; + return new(signature, body, this); + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/PipelineRequestProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/PipelineRequestProvider.cs index 026a9da3673..63c100116e0 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/PipelineRequestProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/PipelineRequestProvider.cs @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +using System; using System.ClientModel.Primitives; using System.Collections.Generic; using Microsoft.TypeSpec.Generator.Expressions; using Microsoft.TypeSpec.Generator.Statements; -using System; namespace Microsoft.TypeSpec.Generator.ClientModel.Providers { @@ -32,6 +32,9 @@ public override HttpRequestApi FromExpression(ValueExpression original) public override MethodBodyStatement SetHeaders(IReadOnlyList arguments) => Original.Property(nameof(PipelineRequest.Headers)).Invoke(nameof(PipelineRequestHeaders.Set), arguments).Terminate(); + public override MethodBodyStatement AddCollectionHeaders(ValueExpression prefix, ValueExpression headers) + => Original.Property(nameof(PipelineRequest.Headers)).Invoke(nameof(PipelineRequestHeaders.Add), [prefix, headers]).Terminate(); + public override HttpRequestApi ToExpression() => this; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/RestClientProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/RestClientProvider.cs index 4428c404b4e..88e710a5373 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/RestClientProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/RestClientProvider.cs @@ -25,6 +25,7 @@ public class RestClientProvider : TypeProvider private const string RepeatabilityFirstSentHeader = "Repeatability-First-Sent"; private const string TopParameterName = "top"; private const string MaxCountParameterName = "maxCount"; + private const string MaxPageSizeParameterName = "maxPageSize"; private static readonly Dictionary _knownSpecialHeaderParams = new(StringComparer.OrdinalIgnoreCase) { @@ -46,7 +47,7 @@ public RestClientProvider(InputClient inputClient, ClientProvider clientProvider _pipelineMessage20xClassifiers = BuildPipelineMessage20xClassifiers(); } - internal ClientProvider ClientProvider { get; } + public ClientProvider ClientProvider { get; } protected override string BuildRelativeFilePath() => Path.Combine("src", "Generated", $"{Name}.RestClient.cs"); @@ -194,12 +195,23 @@ private MethodBodyStatements BuildMessage( var operation = serviceMethod.Operation; var classifier = GetClassifier(operation); - var paramMap = new Dictionary(signature.Parameters.ToDictionary(p => p.Name)); + var paramMap = signature.Parameters.ToDictionary(p => p.Name, StringComparer.OrdinalIgnoreCase); foreach (var param in ClientProvider.ClientParameters) { paramMap[param.Name] = param; } + // Register client parameters under their paramAlias names so that operation parameters + // (which use the original name) can find the corresponding client parameter. + foreach (var inputParam in _inputClient.Parameters) + { + if (inputParam is InputMethodParameter { ParamAlias: string alias } && + paramMap.TryGetValue(inputParam.Name, out var aliasedParam)) + { + paramMap[alias] = aliasedParam; + } + } + InputPagingServiceMethod? pagingServiceMethod = serviceMethod as InputPagingServiceMethod; var uriBuilderType = ScmCodeModelGenerator.Instance.TypeFactory.HttpRequestApi.ToExpression().UriBuilderType; @@ -214,10 +226,14 @@ private MethodBodyStatements BuildMessage( if (isNextLinkRequest && nextLink != null) { - statements.AddRange([ - declareUri, - uri.Reset(ScmKnownParameters.NextPage.AsVariable()).Terminate() - ]); + var nextPageVar = ScmKnownParameters.NextPage.AsVariable(); + statements.Add(declareUri); + statements.Add(new IfElseStatement( + new IfStatement(nextPageVar.Property(nameof(Uri.IsAbsoluteUri))) + { + uri.Reset(nextPageVar).Terminate() + }, + uri.Reset(New.Instance(ClientProvider.EndpointField, nextPageVar)).Terminate())); // handle reinjected parameters for URI var reinjectedParamsMap = GetReinjectedParametersMap(nextLink, pagingServiceMethod, operation, paramMap); @@ -277,7 +293,7 @@ private Dictionary GetReinjectedParametersMap( InputOperation operation, Dictionary paramMap) { - var reinjectedParamsMap = new Dictionary(); + var reinjectedParamsMap = new Dictionary(StringComparer.OrdinalIgnoreCase); // Add parameters from nextLink.ReInjectedParameters if (nextLink.ReInjectedParameters?.Count > 0) @@ -297,7 +313,7 @@ private Dictionary GetReinjectedParametersMap( if (pageSizeParameterName != null) { // Find the parameter in the operation parameters - var pageSizeParameter = operation.Parameters.FirstOrDefault(p => p.Name == pageSizeParameterName); + var pageSizeParameter = operation.Parameters.FirstOrDefault(p => p.Name.Equals(pageSizeParameterName, StringComparison.OrdinalIgnoreCase)); if (pageSizeParameter != null) { var pageSizeParam = ScmCodeModelGenerator.Instance.TypeFactory.CreateParameter(pageSizeParameter); @@ -325,7 +341,7 @@ private Dictionary GetReinjectedParametersMap( private IReadOnlyList GetSetContent(HttpRequestApi request, IReadOnlyList parameters) { var contentParam = parameters.FirstOrDefault( - p => ReferenceEquals(p, ScmKnownParameters.RequestContent) || ReferenceEquals(p, ScmKnownParameters.OptionalRequestContent)); + p => p.Location == ParameterLocation.Body); return contentParam is null ? [] : [request.Content().Assign(contentParam).Terminate()]; } @@ -353,7 +369,7 @@ private Dictionary, PropertyProvider> BuildPipelineMessage20xClassifie ScmCodeModelGenerator.Instance.TypeFactory.StatusCodeClassifierApi.ResponseClassifierType, classifierBackingField.Name.Substring(1).ToIdentifierName(), new ExpressionPropertyBody( - classifierBackingField.Assign(This.ToApi().Create(GetSuccessStatusCodes(inputOperation)))), + classifierBackingField.Assign(This.ToApi().Create(GetSuccessStatusCodes(inputOperation)), nullCoalesce: true)), this) { BackingField = classifierBackingField @@ -412,29 +428,30 @@ private IEnumerable AppendHeaderParameters(HttpRequestApi r if (type?.IsCollection == true) { - statement = request.SetHeaderDelimited(inputHeaderParameter.SerializedName, valueExpression, Literal(inputHeaderParameter.ArraySerializationDelimiter), GetFormatEnumValue(serializationFormat)); + if (!string.IsNullOrEmpty(inputHeaderParameter.CollectionHeaderPrefix) && type.IsDictionary) + { + statement = request.AddCollectionHeaders(Literal(inputHeaderParameter.CollectionHeaderPrefix), valueExpression); + } + else + { + statement = request.SetHeaderDelimited(inputHeaderParameter.SerializedName, valueExpression, Literal(inputHeaderParameter.ArraySerializationDelimiter), GetFormatEnumValue(serializationFormat)); + } } else { statement = request.SetHeaders([Literal(inputHeaderParameter.SerializedName), toStringExpression.As()]); } - if (!TryGetSpecialHeaderParam(inputHeaderParameter, out _) && (!inputHeaderParameter.IsRequired || type?.IsNullable == true || - (type is { IsValueType: false, IsFrameworkType: true } && type.FrameworkType != typeof(string)))) + // If this is a Content-Type header and there's an optional content parameter, wrap in content null check + if (inputHeaderParameter.IsContentType && contentParam != null && + operation.Parameters.Any(p => p is InputBodyParameter bodyParam && !bodyParam.IsRequired)) { - statement = BuildQueryOrHeaderOrPathParameterNullCheck(type, valueExpression, statement); + statement = new IfStatement(contentParam.NotEqual(Null)) { statement }; } - // If this is a Content-Type header and there's an optional content parameter, wrap in content null check - else if (inputHeaderParameter.IsContentType && contentParam != null) + else if (!TryGetSpecialHeaderParam(inputHeaderParameter, out _) && (!inputHeaderParameter.IsRequired || type?.IsNullable == true || + (type is { IsValueType: false, IsFrameworkType: true } && type.FrameworkType != typeof(string)))) { - // Check if any body parameter in the operation is optional - var hasOptionalBody = operation.Parameters.Any(p => - p is InputBodyParameter bodyParam && !bodyParam.IsRequired); - - if (hasOptionalBody) - { - statement = new IfStatement(contentParam.NotEqual(Null)) { statement }; - } + statement = BuildQueryOrHeaderOrPathParameterNullCheck(type, valueExpression, statement); } statements.Add(statement); @@ -622,7 +639,7 @@ private static IfStatement BuildQueryOrHeaderOrPathParameterNullCheck( private IReadOnlyList AppendPathParameters(ScopedApi uri, InputOperation operation, Dictionary paramMap) { - Dictionary inputParamMap = new(operation.Parameters.ToDictionary(p => p.SerializedName)); + Dictionary inputParamMap = operation.Parameters.ToDictionary(p => p.SerializedName); List statements = new(operation.Parameters.Count); // Only process operation.Uri segments that come AFTER the endpoint parameter @@ -691,19 +708,20 @@ private void AddUriSegments( var paramIndex = pathSpan.IndexOf('{'); if (paramIndex < 0) { - statements.Add(uri.AppendPath(Literal(pathSpan.ToString()), false).Terminate()); + AppendLiteralSegment(uri, pathSpan.ToString(), statements); break; } var path = pathSpan.Slice(0, paramIndex); - statements.Add(uri.AppendPath(Literal(path.ToString()), false).Terminate()); + AppendLiteralSegment(uri, path.ToString(), statements); pathSpan = pathSpan.Slice(paramIndex + 1); var paramEndIndex = pathSpan.IndexOf('}'); var paramName = pathSpan.Slice(0, paramEndIndex).ToString(); /* when the parameter is in operation.uri, it is client parameter * It is not operation parameter and not in inputParamHash list. */ - var isClientParameter = ClientProvider.ClientParameters.Any(p => p.Name == paramName); + var isClientParameter = ClientProvider.ClientParameters.Any(p => string.Equals(p.Name, paramName, StringComparison.OrdinalIgnoreCase)) + || _inputClient.Parameters.Any(p => p is InputMethodParameter { ParamAlias: string alias } && string.Equals(alias, paramName, StringComparison.OrdinalIgnoreCase)); CSharpType? type; SerializationFormat? serializationFormat; ValueExpression? valueExpression; @@ -714,25 +732,18 @@ private void AddUriSegments( } else { - if (isClientParameter) + inputParam = inputParamMap[paramName]; + if (inputParam is InputPathParameter || inputParam is InputEndpointParameter) { - GetParamInfo(paramMap[paramName], out type, out serializationFormat, out valueExpression); + GetParamInfo(paramMap, operation, inputParam, out type, out serializationFormat, out valueExpression); + if (valueExpression == null) + { + break; + } } else { - inputParam = inputParamMap[paramName]; - if (inputParam is InputPathParameter || inputParam is InputEndpointParameter) - { - GetParamInfo(paramMap, operation, inputParam, out type, out serializationFormat, out valueExpression); - if (valueExpression == null) - { - break; - } - } - else - { - throw new InvalidOperationException($"The location of parameter {inputParam.Name} should be path or uri"); - } + throw new InvalidOperationException($"The location of parameter {inputParam.Name} should be path or uri"); } } string? format = serializationFormat?.ToFormatSpecifier(); @@ -771,6 +782,44 @@ private void AddUriSegments( } } + private static void AppendLiteralSegment(ScopedApi uri, string literal, List statements) + { + var queryIndex = literal.IndexOf('?'); + if (queryIndex < 0) + { + // No query string, just append as path + if (literal.Length > 0) + { + statements.Add(uri.AppendPath(Literal(literal), false).Terminate()); + } + return; + } + + // Append the path portion (before ?) + var pathPart = literal.Substring(0, queryIndex); + if (pathPart.Length > 0) + { + statements.Add(uri.AppendPath(Literal(pathPart), false).Terminate()); + } + + // Parse and append query parameters (after ?) + var queryPart = literal.Substring(queryIndex + 1); + if (queryPart.Length > 0) + { + var queryParams = queryPart.Split('&'); + foreach (var param in queryParams) + { + var eqIndex = param.IndexOf('='); + if (eqIndex > 0) + { + var name = param.Substring(0, eqIndex); + var value = param.Substring(eqIndex + 1); + statements.Add(uri.AppendQuery(Literal(name), Literal(value), true).Terminate()); + } + } + } + } + private void GetParamInfo(Dictionary paramMap, InputOperation operation, InputParameter inputParam, out CSharpType? type, out SerializationFormat? serializationFormat, out ValueExpression? valueExpression) { type = ScmCodeModelGenerator.Instance.TypeFactory.CreateCSharpType(inputParam.Type); @@ -870,13 +919,34 @@ private static bool TryGetSpecialHeaderParam(InputParameter inputParameter, [Not return false; } - private static string? GetPageSizeParameterName(InputPagingServiceMethod? pagingServiceMethod) + private static string? GetPageSizeParameterName(InputPagingServiceMethod? pagingServiceMethod) { return pagingServiceMethod?.PagingMetadata?.PageSizeParameterSegments?.Count > 0 ? pagingServiceMethod.PagingMetadata.PageSizeParameterSegments.Last() : null; } + private static void UpdateParameterNameWithBackCompat(InputParameter inputParameter, string proposedName, TypeProvider backCompatProvider) + { + // Check if the original wire name exists in LastContractView for backward compatibility. + var existingParam = backCompatProvider.LastContractView?.Methods + ?.SelectMany(method => method.Signature.Parameters) + .FirstOrDefault(p => string.Equals(p.Name, inputParameter.OriginalName, StringComparison.OrdinalIgnoreCase)) + ?.Name; + + if (existingParam != null) + { + // Preserve the exact name (including casing) from the previous contract for backward compatibility + proposedName = existingParam; + } + + // Use the updated name + if (!string.Equals(inputParameter.Name, proposedName, StringComparison.Ordinal)) + { + inputParameter.Update(name: proposedName); + } + } + private static bool ShouldUpdateReinjectedParameter(InputParameter inputParameter, InputPagingServiceMethod? pagingServiceMethod) { // Check if this is an API version parameter @@ -887,7 +957,7 @@ private static bool ShouldUpdateReinjectedParameter(InputParameter inputParamete // Check if this is a max page size parameter var pageSizeParameterName = GetPageSizeParameterName(pagingServiceMethod); - if (pageSizeParameterName != null && inputParameter.Name.Equals(pageSizeParameterName, StringComparison.OrdinalIgnoreCase)) + if (pageSizeParameterName != null && string.Equals(inputParameter.OriginalName, pageSizeParameterName, StringComparison.OrdinalIgnoreCase)) { return true; } @@ -943,6 +1013,8 @@ internal static List GetMethodParameters( // For convenience methods, use the service method parameters var inputParameters = methodType is ScmMethodKind.Convenience ? serviceMethod.Parameters : operation.Parameters; + var pageSizeParameterName = GetPageSizeParameterName(serviceMethod as InputPagingServiceMethod); + ModelProvider? spreadSource = null; if (methodType == ScmMethodKind.Convenience) { @@ -988,11 +1060,27 @@ internal static List GetMethodParameters( continue; } - // For paging operations, rename "top" parameter to "maxCount" - if (serviceMethod is InputPagingServiceMethod && - string.Equals(inputParam.Name, TopParameterName, StringComparison.OrdinalIgnoreCase)) + // For paging operations, handle parameter name corrections with backward compatibility + if (serviceMethod is InputPagingServiceMethod) { - inputParam.Update(name: MaxCountParameterName); + var backCompatProvider = client.BackCompatProvider; + + // Rename "top" parameter to "maxCount" (with backward compatibility). + if (string.Equals(inputParam.OriginalName, TopParameterName, StringComparison.OrdinalIgnoreCase)) + { + UpdateParameterNameWithBackCompat(inputParam, MaxCountParameterName, backCompatProvider); + } + + // Ensure page size parameter uses the correct casing (with backward compatibility) + if (pageSizeParameterName != null && string.Equals(inputParam.OriginalName, pageSizeParameterName, StringComparison.OrdinalIgnoreCase)) + { + var updatedPageSizeParameterName = pageSizeParameterName.Equals(MaxPageSizeParameterName, StringComparison.OrdinalIgnoreCase) + ? MaxPageSizeParameterName + : pageSizeParameterName; + // For page size parameters, normalize badly-cased "maxpagesize" variants to proper camelCase, but always + // respect backcompat. + UpdateParameterNameWithBackCompat(inputParam, updatedPageSizeParameterName, backCompatProvider); + } } ParameterProvider? parameter = ScmCodeModelGenerator.Instance.TypeFactory.CreateParameter(inputParam)?.ToPublicInputParameter(); @@ -1007,13 +1095,12 @@ internal static List GetMethodParameters( { if (methodType == ScmMethodKind.CreateRequest) { - parameter = ScmKnownParameters.RequestContent; + parameter = ScmKnownParameters.CreateRequestContent(inputParam); } else { - parameter = parameter.DefaultValue == null - ? ScmKnownParameters.RequestContent - : ScmKnownParameters.OptionalRequestContent; + parameter = ScmKnownParameters.CreateRequestContent(inputParam, + optional: parameter.DefaultValue != null); } } else diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmMethodProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmMethodProvider.cs index fc4847b10e6..9bc034f8378 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmMethodProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmMethodProvider.cs @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +using Microsoft.TypeSpec.Generator.ClientModel.Primitives; using Microsoft.TypeSpec.Generator.Input; using Microsoft.TypeSpec.Generator.Primitives; using Microsoft.TypeSpec.Generator.Providers; using Microsoft.TypeSpec.Generator.Statements; -using Microsoft.TypeSpec.Generator.ClientModel.Primitives; namespace Microsoft.TypeSpec.Generator.ClientModel.Providers { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmMethodProviderCollection.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmMethodProviderCollection.cs index 98d59f4448f..73148e9ed9c 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmMethodProviderCollection.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmMethodProviderCollection.cs @@ -5,9 +5,12 @@ using System.ClientModel.Primitives; using System.Collections; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; +using System.IO; using System.Linq; using System.Text.Json; using System.Threading.Tasks; +using System.Xml.Linq; using Microsoft.TypeSpec.Generator.ClientModel.Primitives; using Microsoft.TypeSpec.Generator.ClientModel.Snippets; using Microsoft.TypeSpec.Generator.ClientModel.Utilities; @@ -28,6 +31,8 @@ public class ScmMethodProviderCollection : IReadOnlyList private readonly MethodProvider _createRequestMethod; private static readonly ClientPipelineExtensionsDefinition _clientPipelineExtensionsDefinition = new(); private static readonly CancellationTokenExtensionsDefinition _cancellationTokenExtensionsDefinition = new(); + private const string JsonMediaType = "application/json"; + private const string XmlMediaType = "application/xml"; private IList ProtocolMethodParameters => _protocolMethodParameters ??= RestClientProvider.GetMethodParameters(ServiceMethod, ScmMethodKind.Protocol, Client); private IList? _protocolMethodParameters; @@ -192,8 +197,16 @@ private IEnumerable GetStackVariablesForProtocolParamConver } else if (parameter.Type.IsList) { - statements.Add(UsingDeclare("content", requestContentType, BinaryContentHelperSnippets.FromEnumerable(parameter), out var content)); - declarations["content"] = content; + if (TryGetXmlCollectionNames(parameter, out var rootName, out var childName)) + { + statements.Add(UsingDeclare("content", requestContentType, BinaryContentHelperSnippets.FromEnumerable(parameter, Literal(rootName), Literal(childName)), out var content)); + declarations["content"] = content; + } + else + { + statements.Add(UsingDeclare("content", requestContentType, BinaryContentHelperSnippets.FromEnumerable(parameter), out var content)); + declarations["content"] = content; + } } else if (parameter.Type.IsDictionary) { @@ -224,8 +237,31 @@ private IEnumerable GetStackVariablesForProtocolParamConver SerializationFormat.Default)); declarations["content"] = content; } - // else rely on implicit operator to convert to BinaryContent - // For BinaryData we have special handling as well + else + { + // Check if this is a dual-format model that needs explicit serialization + ModelProvider? bodyModel = null; + InputModelType? bodyInputModel = null; + if (parameter.Type is { IsFrameworkType: false }) + { + var inputParam = ServiceMethod.Parameters.FirstOrDefault(p => p.Location == InputRequestLocation.Body); + if (inputParam?.Type is InputModelType model) + { + bodyInputModel = model; + bodyModel = ScmCodeModelGenerator.Instance.TypeFactory.CreateModel(model); + } + } + + if (TryGetFormatArgumentForDualFormatModel(bodyModel, bodyInputModel, out var format)) + { + // Create using declaration for BinaryContent + var methodName = $"To{requestContentType.Name}"; + statements.Add(UsingDeclare("content", requestContentType, parameter.Invoke(methodName, format), out var content)); + declarations["content"] = content; + } + // else rely on implicit operator to convert to BinaryContent + // For BinaryData we have special handling as well + } } } @@ -242,7 +278,44 @@ private IEnumerable GetStackVariablesForProtocolParamConver private List GetSpreadConversion(TypeProvider spreadSource) { - var convenienceMethodParams = ConvenienceMethodParameters.ToDictionary(p => p.Name); + // Match convenience method parameters to constructor parameters by wire (serialized) name + // to handle cases where C# names diverge due to @clientName renames, @encodedName, + // or casing differences between the convenience parameters and model properties. + var convenienceMethodParamsByWireName = new Dictionary(StringComparer.OrdinalIgnoreCase); + foreach (var p in ConvenienceMethodParameters) + { + if (p.WireInfo?.SerializedName != null) + { + convenienceMethodParamsByWireName.TryAdd(p.WireInfo.SerializedName, p); + } + } + + // For customized properties (where OriginalName identifies the original property), + // use the original property's wire info to ensure the dictionary has the correct mapping. + foreach (var property in spreadSource.CanonicalView.Properties) + { + if (property.OriginalName != null && property.WireInfo?.SerializedName is { } wireName) + { + var matchedParam = ConvenienceMethodParameters.FirstOrDefault( + p => string.Equals(p.WireInfo?.SerializedName, wireName, StringComparison.OrdinalIgnoreCase)); + if (matchedParam != null) + { + convenienceMethodParamsByWireName.TryAdd(wireName, matchedParam); + } + } + } + + // Build a lookup from property name to wire name so we can resolve wire names + // for custom constructor parameters that don't have a Property reference. + var propertyWireNames = new Dictionary(StringComparer.OrdinalIgnoreCase); + foreach (var property in spreadSource.CanonicalView.Properties) + { + if (property.WireInfo?.SerializedName is { } propWireName) + { + propertyWireNames.TryAdd(property.Name, propWireName); + } + } + List expressions = new(spreadSource.Properties.Count); // we should make this find more deterministic var ctor = spreadSource.CanonicalView.Constructors.First(c => @@ -251,7 +324,21 @@ private List GetSpreadConversion(TypeProvider spreadSource) foreach (var param in ctor.Signature.Parameters) { - if (convenienceMethodParams.TryGetValue(param.Name, out var convenienceParam)) + // Get wire name from the parameter's property if available, otherwise resolve + // from the model's properties by matching the parameter name to a property name. + var wireName = param.Property?.WireInfo?.SerializedName; + if (wireName == null) + { + propertyWireNames.TryGetValue(param.Name, out wireName); + } + + ParameterProvider? convenienceParam = null; + if (wireName != null) + { + convenienceMethodParamsByWireName.TryGetValue(wireName, out convenienceParam); + } + + if (convenienceParam != null) { if (convenienceParam.Type.IsList) { @@ -290,6 +377,19 @@ private IEnumerable GetStackVariablesForReturnValueConversi if (responseBodyType.IsList) { var elementType = responseBodyType.Arguments[0]; + + // Check if the response uses XML content type + if (TryGetXmlCollectionNamesForResponse(elementType, out var rootName, out var childName)) + { + return BuildXmlCollectionConversionForResult( + result, + responseBodyType, + elementType, + rootName, + childName, + out declarations); + } + return BuildCollectionConversionForResult( result, responseBodyType, @@ -349,6 +449,50 @@ private List BuildCollectionConversionForResult(ClientRespo return statements; } + private List BuildXmlCollectionConversionForResult( + ClientResponseApi result, + CSharpType responseBodyType, + CSharpType elementType, + string rootName, + string childName, + out Dictionary declarations) + { + var listType = new CSharpType(typeof(List<>), elementType); + var defaultValue = new VariableExpression(responseBodyType, "value"); + var statements = new List + { + Declare(defaultValue, Default), + Declare("data", result.GetRawResponse().Content(), out var data) + }; + declarations = new Dictionary { { "value", defaultValue } }; + + // Build the inner loop + var arrayVar = new VariableExpression(listType, "array"); + + statements.Add( + new UsingScopeStatement(typeof(Stream), "stream", data.ToStream(), out var streamVar) + { + Declare("document", typeof(XDocument), Static(typeof(XDocument)).Invoke(nameof(XDocument.Load), [streamVar, XmlLinqSnippets.PreserveWhitespace]), out var documentVar), + new IfStatement(documentVar.Invoke(nameof(XDocument.Element), Literal(rootName)).Is(Declare("element", out var rootElementVar))) + { + Declare(arrayVar, New.Instance(listType)), + ForEachStatement.Create( + "item", + rootElementVar.Elements(Literal(childName)), + out ScopedApi item) + .Add(arrayVar.As(listType).Add( + MrwSerializationTypeDefinition.GetDeserializationMethodInvocationForType( + elementType, + item, + null, + ModelSerializationExtensionsSnippets.Wire))), + defaultValue.Assign(arrayVar).Terminate() + } + }); + + return statements; + } + private List BuildDictionaryConversionForResult(ClientResponseApi result, CSharpType responseBodyType, CSharpType keyType, CSharpType valueType, bool usesJsonDocument, out Dictionary declarations) { var dictType = new CSharpType(typeof(Dictionary<,>), keyType, valueType); @@ -583,73 +727,127 @@ private IReadOnlyList GetProtocolMethodArguments(Dictionary p.Location == ParameterLocation.Body); + var nonBodyProperties = bodyModel?.CanonicalView.Properties + .Where(p => p.WireInfo?.IsHttpMetadata == true) + .ToDictionary(p => p.WireInfo!.SerializedName, p => p); + + // Create a mapping from convenience parameter names to their ParameterProvider + var convenienceParamsMap = ConvenienceMethodParameters.ToDictionary(p => p.Name, p => p, StringComparer.OrdinalIgnoreCase); + + bool requireNamedArgs = false; + // Iterate through protocol parameters to maintain correct argument order + foreach (var protocolParam in ProtocolMethodParameters) { - // handle spread - if (param.SpreadSource is not null) + // Skip RequestOptions parameter as it's added at the end + if (protocolParam.Type.Equals(ScmCodeModelGenerator.Instance.TypeFactory.HttpRequestOptionsApi.HttpRequestOptionsType)) + { + continue; + } + + // Try to find the corresponding convenience parameter using MethodParameterSegments + if (protocolParam.InputParameter?.MethodParameterSegments is { Count: > 1 } && nonBodyProperties?.ContainsKey(protocolParam.Name) != true) { - if (!addedSpreadSource && declarations.TryGetValue("spread", out ValueExpression? spread)) + // The MethodParameterSegments represents a path (e.g., ['Params', 'foo'] means params.foo) + var rootParameterName = protocolParam.InputParameter.MethodParameterSegments[0].Name; + if (!convenienceParamsMap.TryGetValue(rootParameterName, out var convenienceParam) || + // Body parameters are handled separately + convenienceParam.Location == ParameterLocation.Body) { - conversions.Add(spread); - addedSpreadSource = true; + continue; + } + + // Navigate through the property path + var propertySegments = protocolParam.InputParameter.MethodParameterSegments + .Skip(1) + .Select(p => p.Name) + .ToList(); + + if (ScmCodeModelGenerator.Instance.TypeFactory.CSharpTypeMap.TryGetValue(convenienceParam.Type, out var typeProvider) && + typeProvider is ModelProvider paramModel) + { + AddArgument(protocolParam, paramModel.GetPropertyExpression(convenienceParam, propertySegments)); } } - else if (param.Location == ParameterLocation.Body) + else { - // Add any non-body parameters that may have been declared within the request body model - List? requiredParameters = null; - List? optionalParameters = null; - - if (param.Type.Equals(bodyModel?.Type) == true) + if (!convenienceParamsMap.TryGetValue(protocolParam.Name, out var convenienceParam)) { - var parameterConversions = GetNonBodyModelPropertiesConversions(param, bodyModel); - if (parameterConversions != null) + if (protocolParam.IsContentParameter) { - requiredParameters = parameterConversions.Value.RequiredParameters; - optionalParameters = parameterConversions.Value.OptionalParameters; + convenienceParam = bodyParamProvider; } } - // Add required non-body parameters - if (requiredParameters != null) + if (convenienceParam == null) { - conversions.AddRange(requiredParameters); + if (TryGetNonBodyModelPropertyConversion(protocolParam, out var conversion)) + { + AddArgument(protocolParam, conversion); + } + else + { + requireNamedArgs = true; + // The protocol parameter might be required due to our need to avoid ambiguity with overloads. In this + // case, the parameter should have also been made nullable. + if (protocolParam.DefaultValue == null && protocolParam.Type.IsNullable) + { + AddArgument(protocolParam, Null); + } + } + continue; } - if (param.Type.IsReadOnlyMemory || param.Type.IsList) - { - conversions.Add(declarations["content"]); - } - else if (param.Type.IsEnum) + // Handle spread + if (convenienceParam.SpreadSource is not null) { - conversions.Add(RequestContentApiSnippets.Create(BinaryDataSnippets.FromObjectAsJson(param.Type.ToSerial(param)))); + if (!addedSpreadSource && declarations.TryGetValue("spread", out ValueExpression? spread)) + { + AddArgument(protocolParam, spread); + addedSpreadSource = true; + } } - else if (param.Type.Equals(typeof(BinaryData))) + else if (convenienceParam.Location == ParameterLocation.Body) { - conversions.Add(RequestContentApiSnippets.Create(param)); + if (convenienceParam.Type.IsReadOnlyMemory || convenienceParam.Type.IsList) + { + AddArgument(protocolParam, declarations["content"]); + } + else if (convenienceParam.Type.IsEnum) + { + AddArgument(protocolParam, RequestContentApiSnippets.Create( + BinaryDataSnippets.FromObjectAsJson(convenienceParam.Type.ToSerial(convenienceParam)))); + } + else if (convenienceParam.Type.Equals(typeof(BinaryData))) + { + AddArgument(protocolParam, RequestContentApiSnippets.Create(convenienceParam)); + } + else if (convenienceParam.Type.IsFrameworkType) + { + AddArgument(protocolParam, declarations["content"]); + } + else + { + // Check if we created a using declaration for dual-format model + if (declarations.TryGetValue("content", out var content)) + { + AddArgument(protocolParam, content); + } + else + { + // Use implicit operator as fallback + AddArgument(protocolParam, convenienceParam); + } + } } - else if (param.Type.IsFrameworkType) + else if (convenienceParam.Type.IsEnum) { - conversions.Add(declarations["content"]); + AddArgument(protocolParam, convenienceParam.Type.ToSerial(convenienceParam)); } else { - conversions.Add(param); + AddArgument(protocolParam, convenienceParam); } - - // Add optional non-body parameters - if (optionalParameters != null) - { - conversions.AddRange(optionalParameters); - } - } - else if (param.Type.IsEnum) - { - conversions.Add(param.Type.ToSerial(param)); - } - else - { - conversions.Add(param); } } @@ -657,45 +855,37 @@ private IReadOnlyList GetProtocolMethodArguments(Dictionary RequiredParameters, List OptionalParameters)? - GetNonBodyModelPropertiesConversions(ParameterProvider bodyParam, ModelProvider bodyModel) - { - // Extract non-body properties from the body model - var nonBodyProperties = bodyModel.CanonicalView.Properties - .Where(p => p.WireInfo?.IsHttpMetadata == true) - .ToDictionary(p => p.WireInfo!.SerializedName, p => p); + void AddArgument(ParameterProvider protocolParam, ValueExpression argument) + { + conversions.Add(requireNamedArgs ? protocolParam.PositionalReference(argument) : argument); + } - if (nonBodyProperties.Count == 0) - return null; + bool TryGetNonBodyModelPropertyConversion(ParameterProvider protocolParam, out ValueExpression conversion) + { + conversion = Default; + if (bodyParamProvider is null || bodyModel is null || nonBodyProperties is null) + { + return false; + } - List required = []; - List optional = []; + if (!bodyParamProvider.Type.Equals(bodyModel.Type) || protocolParam.Location == ParameterLocation.Body) + { + return false; + } - // Add properties for matching protocol parameters - foreach (var protocolParameter in ProtocolMethodParameters) - { - if (protocolParameter.Location != ParameterLocation.Body && - (nonBodyProperties.TryGetValue(protocolParameter.WireInfo.SerializedName, out var nonBodyProperty) || - nonBodyProperties.TryGetValue(protocolParameter.Name, out nonBodyProperty))) + if (nonBodyProperties.TryGetValue(protocolParam.WireInfo.SerializedName, out var nonBodyProperty) || + nonBodyProperties.TryGetValue(protocolParam.Name, out nonBodyProperty)) { - var conversion = bodyParam.Property(nonBodyProperty.Name); - if (protocolParameter.DefaultValue != null) - { - optional.Add(conversion); - } - else - { - required.Add(conversion); - } + conversion = bodyParamProvider.Property(nonBodyProperty.Name); + return true; } + + return false; } - return (required, optional); + return conversions; } private ScmMethodProvider BuildProtocolMethod(MethodProvider createRequestMethod, bool isAsync, bool shouldMakeParametersRequired) @@ -800,7 +990,7 @@ private ParameterProvider ProcessOptionalParameters( // If we need to make parameters required, make only the first optional parameter nullable required. // This is to prevent ambiguous callsites with the RequestOptions parameter while avoiding overly aggressive required parameter conversion. bool hasOptionalRequestContent = - optionalParameters.Any(p => p.Equals(ScmKnownParameters.OptionalRequestContent)); + optionalParameters.Any(p => p.IsContentParameter); // If there is an optional request content parameter, we need to make all parameters required up to and including the request content parameter if (hasOptionalRequestContent) @@ -808,13 +998,15 @@ private ParameterProvider ProcessOptionalParameters( int parametersMadeRequired = 0; foreach (var optionalParameter in optionalParameters) { - if (optionalParameter.Equals(ScmKnownParameters.OptionalRequestContent)) + if (optionalParameter.IsContentParameter) { - requiredParameters.Add(ScmKnownParameters.NullableRequiredRequestContent); + var nullableRequiredContent = + ScmKnownParameters.CreateRequestContent(optionalParameter.InputParameter, nullable: true); + requiredParameters.Add(nullableRequiredContent); // Update the body param in the underlying collection var bodyParamIndex = ProtocolMethodParameters.IndexOf(optionalParameter); ProtocolMethodParameters[bodyParamIndex] = - ScmKnownParameters.NullableRequiredRequestContent; + nullableRequiredContent; parametersMadeRequired++; break; } @@ -832,7 +1024,7 @@ private ParameterProvider ProcessOptionalParameters( { // If there is a required request content, then we don't need to make the optional parameters required bool hasRequiredRequestContent = - requiredParameters.Any(p => p.Equals(ScmKnownParameters.RequestContent)); + requiredParameters.Any(p => p.IsContentParameter); if (hasRequiredRequestContent) { @@ -1019,5 +1211,139 @@ private static bool ShouldUseJsonDocForDeserializingType(CSharpType type) return type.Equals(typeof(TimeSpan)) || type.Equals(typeof(BinaryData)); } + + private bool TryGetFormatArgumentForDualFormatModel( + ModelProvider? bodyModel, + InputModelType? bodyInputModel, + [NotNullWhen(true)] out ScopedApi? format) + { + format = null; + + // Find the first JSON or XML media type + string? matchedMediaType = null; + if (ServiceMethod.Operation.RequestMediaTypes != null) + { + foreach (var mediaType in ServiceMethod.Operation.RequestMediaTypes) + { + if (mediaType.Contains(XmlMediaType, StringComparison.OrdinalIgnoreCase) || + mediaType.Contains(JsonMediaType, StringComparison.OrdinalIgnoreCase)) + { + matchedMediaType = mediaType; + break; + } + } + } + + // Check if this is a dual-format model + if (matchedMediaType != null && + bodyModel != null && + bodyInputModel != null && + bodyInputModel.Usage.HasFlag(InputModelTypeUsage.Json) && + bodyInputModel.Usage.HasFlag(InputModelTypeUsage.Xml)) + { + // Determine the format: XML or JSON + format = matchedMediaType.Contains(XmlMediaType, StringComparison.OrdinalIgnoreCase) + ? ModelReaderWriterOptionsSnippets.XmlFormat + : ModelReaderWriterOptionsSnippets.JsonFormat; + return true; + } + + return false; + } + + /// + /// Tries to get the XML root and child element names for a list body parameter + /// when the operation uses XML content type. + /// + private bool TryGetXmlCollectionNames( + ParameterProvider parameter, + [NotNullWhen(true)] out string? rootName, + [NotNullWhen(true)] out string? childName) + { + rootName = null; + childName = null; + + // Check if the request uses XML content type + if (ServiceMethod.Operation.RequestMediaTypes == null || + !ServiceMethod.Operation.RequestMediaTypes.Any(m => m.Contains(XmlMediaType, StringComparison.OrdinalIgnoreCase))) + { + return false; + } + + // The element type must be a non-framework (model) type + if (!parameter.Type.IsList || parameter.Type.Arguments[0].IsFrameworkType) + { + return false; + } + + // Get the body parameter from the operation to get the serialized name (root element name) + var operationBodyParam = ServiceMethod.Operation.Parameters.OfType().FirstOrDefault(); + if (operationBodyParam == null) + { + return false; + } + + // TODO: https://github.com/Azure/typespec-azure/issues/3978 - fix root name calculation once the issue is resolved. + rootName = operationBodyParam.Type.Name; + + // Get the element type's XML name + if (operationBodyParam.Type is InputArrayType arrayType && + arrayType.ValueType is InputModelType elementModelType && + elementModelType.SerializationOptions.Xml?.Name is string xmlName) + { + childName = xmlName; + } + else + { + return false; + } + + return true; + } + + /// + /// Tries to get the XML root and child element names for a list response body + /// when the operation response uses XML content type. + /// + private bool TryGetXmlCollectionNamesForResponse( + CSharpType elementType, + [NotNullWhen(true)] out string? rootName, + [NotNullWhen(true)] out string? childName) + { + rootName = null; + childName = null; + + // Check if the response uses XML content type + var response = ServiceMethod.Operation.Responses.FirstOrDefault(r => !r.IsErrorResponse); + if (response == null || !response.ContentTypes.Any(c => c.Contains(XmlMediaType, StringComparison.OrdinalIgnoreCase))) + { + return false; + } + + // The element type must be a non-framework (model) type + if (elementType.IsFrameworkType) + { + return false; + } + + // Get the response body type to extract XML names + if (response.BodyType is InputArrayType arrayType) + { + if (arrayType.ValueType is InputModelType elementModelType && + elementModelType.SerializationOptions.Xml?.Name is string xmlChildName) + { + childName = xmlChildName; + } + else + { + return false; + } + + // TODO: https://github.com/Azure/typespec-azure/issues/3978 - fix root name calculation once the issue is resolved. + rootName = arrayType.Name; + } + + return rootName != null && childName != null; + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmModelProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmModelProvider.cs index fec65524067..1faf1ae4044 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmModelProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmModelProvider.cs @@ -39,6 +39,11 @@ public sealed class ScmModelProvider : ModelProvider internal bool HasDynamicProperties => _hasDynamicProperties ??= BuildHasDynamicProperties(); private bool? _hasDynamicProperties; + // When true, the model needs to generate both JsonPatch and AdditionalProperties for + // backward compatibility (the model was previously shipped with AdditionalProperties). + private bool NeedsBackCompatAdditionalProperties => _needsBackCompatAdditionalProperties ??= BuildNeedsBackCompatAdditionalProperties(); + private bool? _needsBackCompatAdditionalProperties; + internal static SuppressionStatement JsonPatchSuppression = new SuppressionStatement(null, Literal(ScmEvaluationTypeDiagnosticId), ScmEvaluationTypeSuppressionJustification); @@ -62,10 +67,12 @@ protected override FieldProvider[] BuildFields() foreach (var field in fields) { - if (!field.Equals(RawDataField)) + // Keep the RawDataField when backcompat requires AdditionalProperties to be generated alongside JsonPatch + if (field.Equals(RawDataField) && !NeedsBackCompatAdditionalProperties) { - updatedFields.Add(field); + continue; } + updatedFields.Add(field); } return [JsonPatchField, .. updatedFields]; @@ -78,6 +85,14 @@ protected override PropertyProvider[] BuildProperties() return base.BuildProperties(); } + // For dynamic models with BinaryData additional properties (Record), + // skip generating AdditionalProperties since JsonPatch handles dynamic properties. + // Exception: when backcompat requires preserving AdditionalProperties from the last contract. + if (SupportsBinaryDataAdditionalProperties && !NeedsBackCompatAdditionalProperties) + { + return [JsonPatchProperty, .. base.BuildProperties().Where(p => !p.IsAdditionalProperties)]; + } + return [JsonPatchProperty, .. base.BuildProperties()]; } @@ -122,7 +137,9 @@ protected override ConstructorProvider[] BuildConstructors() foreach (var statement in constructor.BodyStatements) { if (statement is ExpressionStatement { Expression: AssignmentExpression assignmentExpression } - && assignmentExpression.Value.Equals(RawDataField.AsParameter)) + && (assignmentExpression.Value.Equals(RawDataField.AsParameter) || + (!NeedsBackCompatAdditionalProperties && + assignmentExpression.Variable is MemberExpression { MemberName: AdditionalPropertiesHelper.AdditionalBinaryDataPropsFieldName }))) { continue; } @@ -152,6 +169,20 @@ protected override ConstructorProvider[] BuildConstructors() constructor.Update(bodyStatements: updatedBody); } } + else if (JsonPatchField != null && SupportsBinaryDataAdditionalProperties && !NeedsBackCompatAdditionalProperties && constructor.BodyStatements != null) + { + // Remove the additional binary data properties initialization from the init constructor + var updatedBody = constructor.BodyStatements + .Where(s => s is not ExpressionStatement + { + Expression: AssignmentExpression + { + Variable: MemberExpression { MemberName: AdditionalPropertiesHelper.AdditionalBinaryDataPropsFieldName } + } + }) + .ToList(); + constructor.Update(bodyStatements: updatedBody); + } updatedConstructors.Add(constructor); } @@ -166,7 +197,7 @@ protected override ConstructorProvider[] BuildConstructors() private FieldProvider? BuildJsonPatchField() { - if (!IsDynamicModel || SupportsBinaryDataAdditionalProperties) + if (!IsDynamicModel) { return null; } @@ -232,10 +263,13 @@ private bool ShouldUpdateFullConstructor() return true; } - return FullConstructor.Signature.Parameters - .Any(p => p.Field?.Name.Equals(AdditionalPropertiesHelper.AdditionalBinaryDataPropsFieldName) == true); + return FullConstructor.Signature.Parameters.Any(IsAdditionalBinaryDataParameter); } + private static bool IsAdditionalBinaryDataParameter(ParameterProvider p) => + p.Field?.Name.Equals(AdditionalPropertiesHelper.AdditionalBinaryDataPropsFieldName) == true || + p.Property?.BackingField?.Name.Equals(AdditionalPropertiesHelper.AdditionalBinaryDataPropsFieldName) == true; + private void UpdateFullConstructorParameters() { if (BaseJsonPatchProperty.Value is null) @@ -249,8 +283,13 @@ private void UpdateFullConstructorParameters() foreach (var parameter in FullConstructor.Signature.Parameters) { - if (parameter.Field?.Name.Equals(AdditionalPropertiesHelper.AdditionalBinaryDataPropsFieldName) == true) + if (IsAdditionalBinaryDataParameter(parameter)) { + if (NeedsBackCompatAdditionalProperties) + { + // Backcompat: keep the additionalBinaryData parameter + updatedParameters.Add(parameter); + } updatedParameters.Add(jsonPatchParameter); } else @@ -308,7 +347,7 @@ private bool BuildHasDynamicProperties() { var propertiesWithWireInfo = CanonicalView.Properties; if (propertiesWithWireInfo.Any(p => - p.WireInfo?.SerializedName != null && + p.WireInfo != null && ScmCodeModelGenerator.Instance.TypeFactory.CSharpTypeMap.TryGetValue(p.Type, out var provider) && provider is ScmModelProvider { IsDynamicModel: true })) { @@ -316,7 +355,7 @@ private bool BuildHasDynamicProperties() } return propertiesWithWireInfo - .Where(p => p.Type.IsCollection && p.WireInfo?.SerializedName != null) + .Where(p => p.Type.IsCollection && p.WireInfo != null) .Any(p => ScmCodeModelGenerator.Instance.TypeFactory.CSharpTypeMap.TryGetValue( p.Type.GetNestedElementType(), out var provider) && @@ -342,5 +381,16 @@ private bool BuildHasDynamicProperties() return null; } + + private bool BuildNeedsBackCompatAdditionalProperties() + { + if (!IsDynamicModel || !SupportsBinaryDataAdditionalProperties || LastContractView == null) + { + return false; + } + + return LastContractView.Properties.Any(p => + p.Name == AdditionalPropertiesHelper.DefaultAdditionalPropertiesPropertyName); + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/SerializationFormatDefinition.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/SerializationFormatDefinition.cs index 79e0987acf6..13233bee220 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/SerializationFormatDefinition.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/SerializationFormatDefinition.cs @@ -73,7 +73,7 @@ protected override IReadOnlyList BuildEnumValues() var members = new EnumTypeMember[enumValues.Count]; for (int i = 0; i < enumValues.Count; i++) { - var (name, value, description ) = enumValues[i]; + var (name, value, description) = enumValues[i]; var field = new FieldProvider( FieldModifiers.Public | FieldModifiers.Static, EnumUnderlyingType, diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmCodeModelGenerator.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmCodeModelGenerator.cs index 0d9f0b3a36e..ba4c5ffe6a1 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmCodeModelGenerator.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmCodeModelGenerator.cs @@ -4,7 +4,9 @@ using System; using System.ClientModel; using System.ComponentModel.Composition; +using System.IO; using System.Text.Json; +using System.Threading.Tasks; using Microsoft.CodeAnalysis; using Microsoft.TypeSpec.Generator.ClientModel.Providers; @@ -28,6 +30,11 @@ public class ScmCodeModelGenerator : CodeModelGenerator internal SerializationFormatDefinition SerializationFormatDefinition { get; } = new SerializationFormatDefinition(); + /// + /// Gets the options that control ConfigurationSchema.json generation. + /// + public ConfigurationSchemaOptions ConfigurationSchema { get; } = new(); + [ImportingConstructor] public ScmCodeModelGenerator(GeneratorContext context) : base(context) @@ -44,5 +51,52 @@ protected override void Configure() AddMetadataReference(MetadataReference.CreateFromFile(typeof(JsonSerializer).Assembly.Location)); AddTypeToKeep(ModelReaderWriterContextDefinition.s_name, isRoot: false); } + + public override async Task WriteAdditionalFiles(string outputPath) + { + // Skip generation if a custom ConfigurationSchema.json exists outside the Generated folder + var customSchemaPath = Path.Combine(outputPath, "schema", "ConfigurationSchema.json"); + if (File.Exists(customSchemaPath)) + { + Emitter.Info($"Custom ConfigurationSchema.json detected at {Path.GetFullPath(customSchemaPath)}, skipping generation."); + return; + } + + var schemaContent = ConfigurationSchemaGenerator.Generate( + OutputLibrary, + ConfigurationSchema.SectionName, + ConfigurationSchema.OptionsRef); + if (schemaContent != null) + { + var schemaPath = Path.Combine(outputPath, "src", "Generated", "schema", "ConfigurationSchema.json"); + var schemaDir = Path.GetDirectoryName(schemaPath); + if (schemaDir != null) + { + Directory.CreateDirectory(schemaDir); + } + Emitter.Info($"Writing {Path.GetFullPath(schemaPath)}"); + await File.WriteAllTextAsync(schemaPath, schemaContent); + + if (ConfigurationSchema.GenerateNuGetTargets) + { + // Generate the .targets file for JsonSchemaSegment registration + var packageName = Configuration.PackageName; + var targetsPath = Path.Combine(outputPath, $"{packageName}.NuGet.targets"); + var targetsContent = GenerateTargetsFile(); + Emitter.Info($"Writing {Path.GetFullPath(targetsPath)}"); + await File.WriteAllTextAsync(targetsPath, targetsContent); + } + } + } + + private static string GenerateTargetsFile() + { + return "\n" + + " \n" + + " \n" + + " \n" + + "\n"; + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmOutputLibrary.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmOutputLibrary.cs index 432561572ba..13e43ad6a70 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmOutputLibrary.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmOutputLibrary.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using Microsoft.TypeSpec.Generator.ClientModel.Providers; using Microsoft.TypeSpec.Generator.Input; +using Microsoft.TypeSpec.Generator.Primitives; using Microsoft.TypeSpec.Generator.Providers; namespace Microsoft.TypeSpec.Generator.ClientModel @@ -43,6 +44,13 @@ private static void BuildClient(InputClient inputClient, HashSet t types.Add(clientOptions); } + // Emit the Settings class for any publicly constructible client (root or individually-initialized sub-client). + var clientSettings = client.ClientSettings; + if (clientSettings != null && client.DeclarationModifiers.HasFlag(TypeSignatureModifiers.Public)) + { + types.Add(clientSettings); + } + // We use the spec view methods so that we include collection definitions even if the user is customizing or suppressing // the methods. They will still be filtered out by the post processor if not needed. foreach (var method in client.SpecView.Methods) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs index 73127364c4e..9936e75a22a 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs @@ -6,6 +6,9 @@ using System.Collections.Generic; using System.Linq; using System.Text.Json; +using System.Xml; +using System.Xml.Linq; +using Microsoft.TypeSpec.Generator.ClientModel.Primitives; using Microsoft.TypeSpec.Generator.ClientModel.Providers; using Microsoft.TypeSpec.Generator.Expressions; using Microsoft.TypeSpec.Generator.Input; @@ -143,7 +146,7 @@ protected override IReadOnlyList CreateSerializationsCore(InputTyp { switch (inputType) { - case InputModelType inputModel when inputModel.Usage.HasFlag(InputModelTypeUsage.Json): + case InputModelType inputModel when (inputModel.Usage & (InputModelTypeUsage.Json | InputModelTypeUsage.Xml)) != 0: if (typeProvider is ModelProvider modelProvider) { return [new MrwSerializationTypeDefinition(inputModel, modelProvider)]; @@ -245,6 +248,24 @@ public virtual MethodBodyStatement SerializeJsonValue( SerializationFormat serializationFormat) => MrwSerializationTypeDefinition.SerializeJsonValueCore(valueType, value, utf8JsonWriter, mrwOptionsParameter, serializationFormat); + public virtual ValueExpression DeserializeXmlValue( + CSharpType valueType, + ScopedApi element, + ScopedApi mrwOptionsParameter, + SerializationFormat format) + => MrwSerializationTypeDefinition.DeserializeXmlValueCore(valueType, element, mrwOptionsParameter, format); + + public virtual MethodBodyStatement SerializeXmlValue( + CSharpType valueType, + ValueExpression value, + ScopedApi xmlWriter, + ScopedApi mrwOptionsParameter, + SerializationFormat format) + => MrwSerializationTypeDefinition.SerializeXmlValueCore(valueType, value, xmlWriter, mrwOptionsParameter, format); + protected override ModelProvider? CreateModelCore(InputModelType model) => new ScmModelProvider(model); + + protected override ScmSerializationOptions? CreateSerializationOptionsCore(InputSerializationOptions inputSerializationOptions) + => new(inputSerializationOptions); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/BinaryContentHelperSnippets.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/BinaryContentHelperSnippets.cs index bfc2e8b7515..6722c9f4857 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/BinaryContentHelperSnippets.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/BinaryContentHelperSnippets.cs @@ -12,6 +12,9 @@ internal static class BinaryContentHelperSnippets public static ValueExpression FromEnumerable(ValueExpression body) => Static().Invoke("FromEnumerable", body); + public static ValueExpression FromEnumerable(ValueExpression body, ValueExpression rootNameHint, ValueExpression childNameHint) + => Static().Invoke("FromEnumerable", [body, rootNameHint, childNameHint]); + public static ValueExpression FromDictionary(ValueExpression body) => Static().Invoke("FromDictionary", body); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/JsonElementSnippets.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/JsonElementSnippets.cs index f9951bc523d..f320ef94429 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/JsonElementSnippets.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/JsonElementSnippets.cs @@ -105,7 +105,7 @@ public static ScopedApi TryGetInt64(this ScopedApi jsonElemen public static ScopedApi TryGetSingle(this ScopedApi jsonElement, out ScopedApi floatValue) { var floatValueDeclaration = new VariableExpression(typeof(float), "floatValue"); - floatValue= floatValueDeclaration.As(); + floatValue = floatValueDeclaration.As(); var invocation = new InvokeMethodExpression(jsonElement, nameof(JsonElement.TryGetSingle), [new DeclarationExpression(floatValueDeclaration, true)]); return invocation.As(); } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/ModelReaderWriterOptionsSnippets.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/ModelReaderWriterOptionsSnippets.cs index 614719f2f29..f7b4ba31709 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/ModelReaderWriterOptionsSnippets.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/ModelReaderWriterOptionsSnippets.cs @@ -14,6 +14,7 @@ internal static class ModelReaderWriterOptionsSnippets public static ValueExpression Format(this ScopedApi mrwOptions) => mrwOptions.Property(nameof(ModelReaderWriterOptions.Format)); internal static ScopedApi WireFormat => Literal("W"); internal static ScopedApi JsonFormat => Literal("J"); + internal static ScopedApi XmlFormat => Literal("X"); internal static ScopedApi InitializeWireOptions => New.Instance(typeof(ModelReaderWriterOptions), Wire).As(); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/ModelSerializationExtensionsSnippets.Xml.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/ModelSerializationExtensionsSnippets.Xml.cs new file mode 100644 index 00000000000..a4d364eeecb --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/ModelSerializationExtensionsSnippets.Xml.cs @@ -0,0 +1,49 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using System.Xml; +using System.Xml.Linq; +using Microsoft.TypeSpec.Generator.Expressions; +using Microsoft.TypeSpec.Generator.Snippets; +using Microsoft.TypeSpec.Generator.Statements; +using static Microsoft.TypeSpec.Generator.Snippets.Snippet; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Snippets +{ + internal static partial class ModelSerializationExtensionsSnippets + { + public static MethodBodyStatement WriteStringValue(ScopedApi writer, ValueExpression value, string? format) + => writer.Invoke(WriteStringValueMethodName, [value, Literal(format)]).Terminate(); + + public static MethodBodyStatement WriteBase64StringValue(ScopedApi writer, ValueExpression value, string? format) + => writer.Invoke(WriteBase64StringValueMethodName, [value, Literal(format)]).Terminate(); + + public static MethodBodyStatement WriteObjectValue(ScopedApi writer, ScopedApi value, ValueExpression? options = null, ValueExpression? nameHint = null) + { + var parameters = new List { value }; + if (options is not null) + { + parameters.Add(options); + } + if (nameHint is not null) + { + if (options is null) + { + parameters.Add(Null); + } + parameters.Add(nameHint); + } + return writer.Invoke(WriteObjectValueMethodName, [.. parameters], [value.Type], false).Terminate(); + } + + public static InvokeMethodExpression GetDateTimeOffset(ScopedApi element, string? format) + => element.Invoke(GetDateTimeOffsetMethodName, Literal(format)); + + public static InvokeMethodExpression GetTimeSpan(ScopedApi element, string? format) + => element.Invoke(GetTimeSpanMethodName, Literal(format)); + + public static InvokeMethodExpression GetBytesFromBase64(ScopedApi element, string? format) + => element.Invoke(GetBytesFromBase64MethodName, Literal(format)); + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/ModelSerializationExtensionsSnippets.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/ModelSerializationExtensionsSnippets.cs index 6652c0fc730..3e94de43916 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/ModelSerializationExtensionsSnippets.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/ModelSerializationExtensionsSnippets.cs @@ -11,7 +11,7 @@ namespace Microsoft.TypeSpec.Generator.ClientModel.Snippets { - internal static class ModelSerializationExtensionsSnippets + internal static partial class ModelSerializationExtensionsSnippets { private const string WriteStringValueMethodName = "WriteStringValue"; private const string WriteBase64StringValueMethodName = "WriteBase64StringValue"; @@ -24,9 +24,11 @@ internal static class ModelSerializationExtensionsSnippets private const string GetTimeSpanMethodName = "GetTimeSpan"; private const string WireOptionsName = "WireOptions"; private const string JsonDocumentOptionsName = "JsonDocumentOptions"; + private const string XmlWriterSettingsName = "XmlWriterSettings"; public static readonly ScopedApi Wire = Static().Property(WireOptionsName).As(); public static readonly ValueExpression JsonDocumentOptions = Static().Property(JsonDocumentOptionsName); + public static readonly ValueExpression XmlWriterSettings = Static().Property(XmlWriterSettingsName); public static MethodBodyStatement WriteObjectValue(ScopedApi snippet, ScopedApi value, ValueExpression? options = null) { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/SystemSnippets.Serializations.JsonFormat.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/SystemSnippets.Serializations.JsonFormat.cs index 2b1b8000e5a..da4662a9971 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/SystemSnippets.Serializations.JsonFormat.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/SystemSnippets.Serializations.JsonFormat.cs @@ -8,5 +8,6 @@ namespace Microsoft.TypeSpec.Generator.ClientModel.Snippets internal static partial class SystemSnippet { internal static ScopedApi JsonFormatSerialization = Snippet.Literal("J"); + internal static ScopedApi XmlFormatSerialization = Snippet.Literal("X"); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/XElementSnippets.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/XElementSnippets.cs new file mode 100644 index 00000000000..137a2d82401 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/XElementSnippets.cs @@ -0,0 +1,59 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; +using System.Collections.Generic; +using System.Xml.Linq; +using Microsoft.TypeSpec.Generator.Expressions; +using Microsoft.TypeSpec.Generator.Snippets; +using static Microsoft.TypeSpec.Generator.Snippets.Snippet; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Snippets +{ + /// + /// Provides extension methods for generating code that works with and . + /// + internal static class XElementSnippets + { + public static ScopedApi Name(this ScopedApi element) + => element.Property(nameof(XElement.Name)).As(); + public static ScopedApi GetLocalName(this ScopedApi element) + => Name(element).Property(nameof(XName.LocalName)).As(); + + public static ScopedApi> Elements(this ScopedApi element) + => element.Invoke(nameof(XElement.Elements)).As>(); + + public static ScopedApi> Elements(this ScopedApi element, ValueExpression name) + => element.Invoke(nameof(XElement.Elements), name).As>(); + + public static ScopedApi Element(this ScopedApi element, ValueExpression name) + => element.Invoke(nameof(XElement.Element), name).As(); + + public static ScopedApi Value(this ScopedApi element) + => element.Property(nameof(XElement.Value)).As(); + + public static ScopedApi> Attributes(this ScopedApi element) + => element.Invoke(nameof(XElement.Attributes)).As>(); + + public static ScopedApi Name(this ScopedApi attribute) + => attribute.Property(nameof(XAttribute.Name)).As(); + + public static ScopedApi GetLocalName(this ScopedApi attribute) + => Name(attribute).Property(nameof(XName.LocalName)).As(); + + public static ScopedApi Load(params ValueExpression[] args) + => Static().Invoke(nameof(XElement.Load), args).As(); + + public static ScopedApi GetDateTimeOffset(this ScopedApi element, string? format) + => ModelSerializationExtensionsSnippets.GetDateTimeOffset(element, format).As(); + + public static ScopedApi GetTimeSpan(this ScopedApi element, string? format) + => ModelSerializationExtensionsSnippets.GetTimeSpan(element, format).As(); + + public static ScopedApi GetBytesFromBase64(this ScopedApi element, string? format) + => ModelSerializationExtensionsSnippets.GetBytesFromBase64(element, format).As(); + + public static ScopedApi Namespace(this ScopedApi name) + => name.Property(nameof(XName.Namespace)).As(); + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/XmlLinqSnippets.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/XmlLinqSnippets.cs new file mode 100644 index 00000000000..25eaea912f4 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/XmlLinqSnippets.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Xml.Linq; +using Microsoft.TypeSpec.Generator.Snippets; +using static Microsoft.TypeSpec.Generator.Snippets.Snippet; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Snippets +{ + internal class XmlLinqSnippets + { + public static ScopedApi PreserveWhitespace + => Static().Property(nameof(LoadOptions.PreserveWhitespace)).As(); + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/XmlReaderSnippets.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/XmlReaderSnippets.cs new file mode 100644 index 00000000000..e596967936c --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/XmlReaderSnippets.cs @@ -0,0 +1,29 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Xml; +using Microsoft.TypeSpec.Generator.Expressions; +using Microsoft.TypeSpec.Generator.Snippets; +using Microsoft.TypeSpec.Generator.Statements; +using static Microsoft.TypeSpec.Generator.Snippets.Snippet; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Snippets +{ + /// + /// Provides extension methods for generating code that works with . + /// + internal static class XmlReaderSnippets + { + public static InvokeMethodExpression Create(ValueExpression input, ValueExpression settings) + => Static().Invoke(nameof(XmlReader.Create), [input, settings]); + + public static MethodBodyStatement MoveToContent(this ScopedApi reader) + => reader.Invoke(nameof(XmlReader.MoveToContent)).Terminate(); + + public static MethodBodyStatement ReadStartElement(this ScopedApi reader) + => reader.Invoke(nameof(XmlReader.ReadStartElement)).Terminate(); + + public static ScopedApi NodeType(this ScopedApi reader) + => reader.Property(nameof(XmlReader.NodeType)).As(); + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/XmlWriterSnippets.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/XmlWriterSnippets.cs new file mode 100644 index 00000000000..32f0e379c9f --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Snippets/XmlWriterSnippets.cs @@ -0,0 +1,65 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Xml; +using Microsoft.TypeSpec.Generator.Expressions; +using Microsoft.TypeSpec.Generator.Snippets; +using Microsoft.TypeSpec.Generator.Statements; +using static Microsoft.TypeSpec.Generator.Snippets.Snippet; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Snippets +{ + /// + /// Provides extension methods for generating code that works with . + /// + internal static class XmlWriterSnippets + { + public static MethodBodyStatement WriteStartElement(this ScopedApi writer, string localName) + => writer.Invoke(nameof(XmlWriter.WriteStartElement), Literal(localName)).Terminate(); + + public static MethodBodyStatement WriteStartElement(this ScopedApi writer, ValueExpression localName) + => writer.Invoke(nameof(XmlWriter.WriteStartElement), localName).Terminate(); + + public static MethodBodyStatement WriteStartElement(this ScopedApi writer, string prefix, string localName, string ns) + => writer.WriteStartElement(prefix, Literal(localName), ns); + + public static MethodBodyStatement WriteStartElement(this ScopedApi writer, string prefix, ValueExpression localName, string ns) + => writer.Invoke(nameof(XmlWriter.WriteStartElement), [Literal(prefix), localName, Literal(ns)]).Terminate(); + + public static MethodBodyStatement WriteEndElement(this ScopedApi writer) + => writer.Invoke(nameof(XmlWriter.WriteEndElement)).Terminate(); + + public static MethodBodyStatement WriteStartAttribute(this ScopedApi writer, string localName) + => writer.Invoke(nameof(XmlWriter.WriteStartAttribute), Literal(localName)).Terminate(); + + public static MethodBodyStatement WriteEndAttribute(this ScopedApi writer) + => writer.Invoke(nameof(XmlWriter.WriteEndAttribute)).Terminate(); + + public static MethodBodyStatement WriteValue(this ScopedApi writer, ValueExpression value) + => writer.Invoke(nameof(XmlWriter.WriteValue), value).Terminate(); + + public static MethodBodyStatement WriteAttributeString(this ScopedApi writer, string prefix, string localName, string ns, ValueExpression value) + => writer.Invoke(nameof(XmlWriter.WriteAttributeString), [Literal(prefix), Literal(localName), Literal(ns), value]).Terminate(); + + /// + /// Generates a namespace declaration attribute on the current element: xmlns:prefix="namespace". + /// + public static MethodBodyStatement WriteNamespaceDeclaration(this ScopedApi writer, string prefix, string ns) + => writer.Invoke(nameof(XmlWriter.WriteAttributeString), [Literal("xmlns"), Literal(prefix), Null, Literal(ns)]).Terminate(); + + public static MethodBodyStatement WriteStringValue(this ScopedApi writer, ValueExpression value, string format) + => ModelSerializationExtensionsSnippets.WriteStringValue(writer, value, format); + + public static MethodBodyStatement WriteBase64StringValue(this ScopedApi writer, ValueExpression value, string? format) + => ModelSerializationExtensionsSnippets.WriteBase64StringValue(writer, value, format); + + public static MethodBodyStatement WriteNode(this ScopedApi writer, ValueExpression reader, ValueExpression defattr) + => writer.Invoke(nameof(XmlWriter.WriteNode), [reader, defattr]).Terminate(); + + public static MethodBodyStatement WriteObjectValue(this ScopedApi writer, ScopedApi value, ValueExpression options, ValueExpression? nameHint = null) + => ModelSerializationExtensionsSnippets.WriteObjectValue(writer, value, options, nameHint); + + public static InvokeMethodExpression Create(ValueExpression output, ValueExpression settings) + => Static().Invoke(nameof(XmlWriter.Create), [output, settings]); + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ConfigurationSchemaGeneratorTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ConfigurationSchemaGeneratorTests.cs new file mode 100644 index 00000000000..4af8fbb4b54 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ConfigurationSchemaGeneratorTests.cs @@ -0,0 +1,1044 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Text.Json; +using System.Text.Json.Nodes; +using System.Threading.Tasks; +using Microsoft.TypeSpec.Generator.ClientModel.Providers; +using Microsoft.TypeSpec.Generator.Input; +using Microsoft.TypeSpec.Generator.Primitives; +using Microsoft.TypeSpec.Generator.Providers; +using Microsoft.TypeSpec.Generator.Tests.Common; +using NUnit.Framework; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Tests +{ + public class ConfigurationSchemaGeneratorTests + { + [SetUp] + public void SetUp() + { + // Reset the singleton instance before each test + var singletonField = typeof(ClientOptionsProvider).GetField("_singletonInstance", BindingFlags.Static | BindingFlags.NonPublic); + singletonField?.SetValue(null, null); + + MockHelpers.LoadMockGenerator(); + } + + private static string GetExpectedJsonFromFile([CallerMemberName] string method = "", [CallerFilePath] string filePath = "") + { + var callingClass = Path.GetFileName(filePath).Split('.').First(); + var path = Path.Combine(Path.GetDirectoryName(filePath)!, "TestData", callingClass, $"{method}.json"); + return File.ReadAllText(path); + } + + [Test] + public void Generate_ReturnsNull_WhenNoClientsWithSettings() + { + var output = new TestOutputLibrary([]); + var result = ConfigurationSchemaGenerator.Generate(output); + Assert.IsNull(result); + } + + [Test] + public void Generate_ReturnsNull_WhenClientMadeInternalAfterConstruction() + { + var client = InputFactory.Client("TestService"); + var clientProvider = new ClientProvider(client); + + Assert.IsNotNull(clientProvider.ClientSettings, "ClientSettings should not be null for individually-initialized client"); + + // Simulate a visitor changing the client from public to internal (e.g., management RestClientVisitor) + var modifiers = clientProvider.DeclarationModifiers; + modifiers &= ~TypeSignatureModifiers.Public; + modifiers |= TypeSignatureModifiers.Internal; + clientProvider.Update(modifiers: modifiers); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + Assert.IsNull(result, "Schema should not be generated for internal clients"); + } + + [Test] + public void Generate_ReturnsSchema_ForClientWithSettings() + { + var client = InputFactory.Client("TestService"); + var clientProvider = new ClientProvider(client); + + Assert.IsNotNull(clientProvider.ClientSettings, "ClientSettings should not be null for individually-initialized client"); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + + Assert.IsNotNull(result); + + var doc = JsonNode.Parse(result!)!; + Assert.AreEqual("object", doc["type"]?.GetValue()); + + // Since the default generator uses SCM (System.ClientModel), the section should be "Clients" + var clients = doc["properties"]?["Clients"]; + Assert.IsNotNull(clients, "Schema should have a 'Clients' section for SCM clients"); + Assert.AreEqual("object", clients!["type"]?.GetValue()); + + var testClient = clients["properties"]?["TestService"]; + Assert.IsNotNull(testClient, "Schema should have a well-known 'TestService' entry"); + Assert.AreEqual("object", testClient!["type"]?.GetValue()); + + var expected = GetExpectedJsonFromFile(); + Assert.AreEqual(expected, result); + } + + [Test] + public void Generate_IncludesCredentialReference() + { + var client = InputFactory.Client("TestService"); + var clientProvider = new ClientProvider(client); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + var clientEntry = doc["properties"]?["Clients"]?["properties"]?["TestService"]; + var credential = clientEntry?["properties"]?["Credential"]; + Assert.IsNotNull(credential, "Client entry should have a Credential property"); + Assert.AreEqual("#/definitions/credential", credential!["$ref"]?.GetValue()); + } + + [Test] + public void Generate_IncludesOptionsReference() + { + var client = InputFactory.Client("TestService"); + var clientProvider = new ClientProvider(client); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + var clientEntry = doc["properties"]?["Clients"]?["properties"]?["TestService"]; + var options = clientEntry?["properties"]?["Options"]; + Assert.IsNotNull(options, "Client entry should have an Options property"); + + // Options should reference a local named definition that inherits from the base options + var optionsRef = options!["$ref"]?.GetValue(); + Assert.IsNotNull(optionsRef, "Options should be a $ref"); + Assert.That(optionsRef, Does.StartWith("#/definitions/"), "Options $ref should point to a local definition"); + + // Verify the local definition exists and inherits from base options via allOf + var defName = optionsRef!.Replace("#/definitions/", ""); + var optionsDef = doc["definitions"]?[defName]; + Assert.IsNotNull(optionsDef, $"Local definition '{defName}' should exist"); + + var allOf = optionsDef!["allOf"]; + Assert.IsNotNull(allOf, "Options definition should use allOf to inherit from base options"); + Assert.AreEqual("#/definitions/options", allOf!.AsArray()[0]?["$ref"]?.GetValue()); + } + + [Test] + public void Generate_IncludesOptionsDefinition_InheritingFromBase() + { + var client = InputFactory.Client("TestService"); + var clientProvider = new ClientProvider(client); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + // The options type should always be defined as a local definition that inherits from base options. + // Common definitions (credential, base options) are provided by System.ClientModel base schema. + var definitions = doc["definitions"]; + Assert.IsNotNull(definitions, "Schema should include local definitions for the options type"); + + // Find the options definition and verify it inherits from the base options + var clientEntry = doc["properties"]?["Clients"]?["properties"]?["TestService"]; + var optionsRef = clientEntry?["properties"]?["Options"]?["$ref"]?.GetValue(); + Assert.IsNotNull(optionsRef, "Options should reference a local definition"); + var defName = optionsRef!.Replace("#/definitions/", ""); + var optionsDef = definitions![defName]; + Assert.IsNotNull(optionsDef, $"Options definition '{defName}' should exist"); + + var allOf = optionsDef!["allOf"]; + Assert.IsNotNull(allOf, "Options definition should use allOf to inherit from base options"); + Assert.AreEqual("#/definitions/options", allOf!.AsArray()[0]?["$ref"]?.GetValue(), + "First allOf element should reference the base options type"); + } + + [Test] + public void Generate_IncludesLocalDefinitions_ForEnumTypes() + { + // Create a non-api-version enum type + var retryModeEnum = InputFactory.StringEnum( + "RetryMode", + [("Fixed", "Fixed"), ("Exponential", "Exponential")], + isExtensible: false); + + // Reset and reload mock with the enum registered + var singletonField = typeof(ClientOptionsProvider).GetField("_singletonInstance", BindingFlags.Static | BindingFlags.NonPublic); + singletonField?.SetValue(null, null); + MockHelpers.LoadMockGenerator(inputEnums: () => [retryModeEnum]); + + InputParameter[] inputParameters = + [ + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.QueryParameter( + "retryMode", + retryModeEnum, + isRequired: false, + defaultValue: new InputConstant("Exponential", retryModeEnum), + scope: InputParameterScope.Client, + isApiVersion: false) + ]; + var client = InputFactory.Client("TestService", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + // Verify local definitions contain the enum + var definitions = doc["definitions"]; + Assert.IsNotNull(definitions, "Schema should include local definitions for non-base types"); + + var retryModeDef = definitions!["retryMode"]; + Assert.IsNotNull(retryModeDef, "Definitions should include 'retryMode' enum"); + + // Fixed enum should have enum values + var enumValues = retryModeDef!["enum"]; + Assert.IsNotNull(enumValues, "Enum definition should have 'enum' values"); + + // Verify the option property references the local definition via $ref + var clientEntry = doc["properties"]?["Clients"]?["properties"]?["TestService"]; + var options = clientEntry?["properties"]?["Options"]; + var optionsRef = options?["$ref"]?.GetValue(); + Assert.IsNotNull(optionsRef, "Options should reference a local definition"); + var optionsDefName = optionsRef!.Replace("#/definitions/", ""); + + // The options definition should use allOf with custom properties + var optionsDef = definitions![optionsDefName]; + Assert.IsNotNull(optionsDef, $"Options definition '{optionsDefName}' should exist"); + var allOf = optionsDef!["allOf"]; + Assert.IsNotNull(allOf, "Options definition should use allOf"); + + var extensionProperties = allOf!.AsArray()[1]?["properties"]; + var retryModeProp = extensionProperties!["RetryMode"]; + Assert.IsNotNull(retryModeProp, "Custom option property should exist"); + Assert.AreEqual("#/definitions/retryMode", retryModeProp!["$ref"]?.GetValue()); + } + + [Test] + public void Generate_IncludesEndpointProperty_ForStringEndpoint() + { + var inputParameters = new[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true) + }; + var client = InputFactory.Client("TestService", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + var clientEntry = doc["properties"]?["Clients"]?["properties"]?["TestService"]; + var endpoint = clientEntry?["properties"]?["Endpoint"]; + Assert.IsNotNull(endpoint, "Client entry should have an Endpoint property"); + Assert.AreEqual("string", endpoint!["type"]?.GetValue()); + } + + [Test] + public void Generate_IncludesEndpointProperty_ForUriEndpoint() + { + var inputParameters = new[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.Url, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true) + }; + var client = InputFactory.Client("TestService", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + var clientEntry = doc["properties"]?["Clients"]?["properties"]?["TestService"]; + var endpoint = clientEntry?["properties"]?["Endpoint"]; + Assert.IsNotNull(endpoint, "Client entry should have an Endpoint property"); + Assert.AreEqual("string", endpoint!["type"]?.GetValue()); + Assert.AreEqual("uri", endpoint!["format"]?.GetValue()); + } + + [Test] + public void Generate_IncludesOptionsAllOf_WhenClientHasCustomOptions() + { + InputParameter[] inputParameters = + [ + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.QueryParameter( + "enableTenantDiscovery", + InputPrimitiveType.Boolean, + isRequired: false, + defaultValue: new InputConstant(false, InputPrimitiveType.Boolean), + scope: InputParameterScope.Client, + isApiVersion: false) + ]; + var client = InputFactory.Client("BlobService", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + var clientEntry = doc["properties"]?["Clients"]?["properties"]?["BlobService"]; + var options = clientEntry?["properties"]?["Options"]; + Assert.IsNotNull(options, "Client entry should have an Options property"); + + // Options should reference a named local definition + var optionsRef = options!["$ref"]?.GetValue(); + Assert.IsNotNull(optionsRef, "Options should be a $ref to a local definition"); + var defName = optionsRef!.Replace("#/definitions/", ""); + + // Verify the local definition uses allOf to inherit from base options with custom properties + var optionsDef = doc["definitions"]?[defName]; + Assert.IsNotNull(optionsDef, $"Options definition '{defName}' should exist"); + + var allOf = optionsDef!["allOf"]; + Assert.IsNotNull(allOf, "Options definition should use allOf"); + + var allOfArray = allOf!.AsArray(); + Assert.AreEqual(2, allOfArray.Count, + "allOf should have base options ref + custom properties extension"); + Assert.AreEqual("#/definitions/options", allOfArray[0]?["$ref"]?.GetValue()); + Assert.AreEqual("object", allOfArray[1]?["type"]?.GetValue()); + + // Verify the custom property is included + var extensionProperties = allOfArray[1]?["properties"]; + Assert.IsNotNull(extensionProperties); + var enableTenantDiscovery = extensionProperties!["EnableTenantDiscovery"]; + Assert.IsNotNull(enableTenantDiscovery, "Custom option property should be included"); + Assert.AreEqual("boolean", enableTenantDiscovery!["type"]?.GetValue()); + } + + [Test] + public void Generate_OptionsDefinition_IncludesStringProperty() + { + InputParameter[] inputParameters = + [ + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.QueryParameter( + "audience", + InputPrimitiveType.String, + isRequired: false, + defaultValue: new InputConstant("https://api.example.com", InputPrimitiveType.String), + scope: InputParameterScope.Client, + isApiVersion: false) + ]; + var client = InputFactory.Client("TestService", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + var clientEntry = doc["properties"]?["Clients"]?["properties"]?["TestService"]; + var optionsRef = clientEntry?["properties"]?["Options"]?["$ref"]?.GetValue(); + Assert.IsNotNull(optionsRef); + var defName = optionsRef!.Replace("#/definitions/", ""); + + var optionsDef = doc["definitions"]?[defName]; + Assert.IsNotNull(optionsDef); + + var allOf = optionsDef!["allOf"]!.AsArray(); + Assert.AreEqual(2, allOf.Count, "allOf should have base options + extension"); + Assert.AreEqual("#/definitions/options", allOf[0]?["$ref"]?.GetValue()); + + var extensionProperties = allOf[1]?["properties"]; + Assert.IsNotNull(extensionProperties); + var audienceProp = extensionProperties!["Audience"]; + Assert.IsNotNull(audienceProp, "String option property should exist"); + Assert.AreEqual("string", audienceProp!["type"]?.GetValue()); + } + + [Test] + public void Generate_OptionsDefinition_IncludesIntegerProperty() + { + InputParameter[] inputParameters = + [ + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.QueryParameter( + "maxRetries", + InputPrimitiveType.Int32, + isRequired: false, + defaultValue: new InputConstant(3, InputPrimitiveType.Int32), + scope: InputParameterScope.Client, + isApiVersion: false) + ]; + var client = InputFactory.Client("TestService", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + var clientEntry = doc["properties"]?["Clients"]?["properties"]?["TestService"]; + var optionsRef = clientEntry?["properties"]?["Options"]?["$ref"]?.GetValue(); + Assert.IsNotNull(optionsRef); + var defName = optionsRef!.Replace("#/definitions/", ""); + + var optionsDef = doc["definitions"]?[defName]; + Assert.IsNotNull(optionsDef); + + var allOf = optionsDef!["allOf"]!.AsArray(); + Assert.AreEqual(2, allOf.Count, "allOf should have base options + extension"); + + var extensionProperties = allOf[1]?["properties"]; + Assert.IsNotNull(extensionProperties); + var maxRetriesProp = extensionProperties!["MaxRetries"]; + Assert.IsNotNull(maxRetriesProp, "Integer option property should exist"); + Assert.AreEqual("integer", maxRetriesProp!["type"]?.GetValue()); + } + + [Test] + public void Generate_OptionsDefinition_IncludesMultipleMixedProperties() + { + InputParameter[] inputParameters = + [ + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.QueryParameter( + "audience", + InputPrimitiveType.String, + isRequired: false, + defaultValue: new InputConstant("https://api.example.com", InputPrimitiveType.String), + scope: InputParameterScope.Client, + isApiVersion: false), + InputFactory.QueryParameter( + "enableCaching", + InputPrimitiveType.Boolean, + isRequired: false, + defaultValue: new InputConstant(true, InputPrimitiveType.Boolean), + scope: InputParameterScope.Client, + isApiVersion: false), + InputFactory.QueryParameter( + "maxRetries", + InputPrimitiveType.Int32, + isRequired: false, + defaultValue: new InputConstant(3, InputPrimitiveType.Int32), + scope: InputParameterScope.Client, + isApiVersion: false) + ]; + var client = InputFactory.Client("TestService", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + var clientEntry = doc["properties"]?["Clients"]?["properties"]?["TestService"]; + var optionsRef = clientEntry?["properties"]?["Options"]?["$ref"]?.GetValue(); + Assert.IsNotNull(optionsRef); + var defName = optionsRef!.Replace("#/definitions/", ""); + + var optionsDef = doc["definitions"]?[defName]; + Assert.IsNotNull(optionsDef); + + var allOf = optionsDef!["allOf"]!.AsArray(); + Assert.AreEqual(2, allOf.Count, "allOf should have base options + extension with multiple properties"); + Assert.AreEqual("#/definitions/options", allOf[0]?["$ref"]?.GetValue()); + Assert.AreEqual("object", allOf[1]?["type"]?.GetValue()); + + var extensionProperties = allOf[1]?["properties"]; + Assert.IsNotNull(extensionProperties); + + // Verify all three additional properties are present with correct types + var audienceProp = extensionProperties!["Audience"]; + Assert.IsNotNull(audienceProp, "String option property should exist"); + Assert.AreEqual("string", audienceProp!["type"]?.GetValue()); + + var enableCachingProp = extensionProperties!["EnableCaching"]; + Assert.IsNotNull(enableCachingProp, "Boolean option property should exist"); + Assert.AreEqual("boolean", enableCachingProp!["type"]?.GetValue()); + + var maxRetriesProp = extensionProperties!["MaxRetries"]; + Assert.IsNotNull(maxRetriesProp, "Integer option property should exist"); + Assert.AreEqual("integer", maxRetriesProp!["type"]?.GetValue()); + } + + [Test] + public void Generate_OptionsDefinition_IncludesModelProperty() + { + // Create a model type with properties + var retryPolicyModel = InputFactory.Model( + "RetryPolicyConfig", + properties: + [ + InputFactory.Property("MaxRetries", InputPrimitiveType.Int32), + InputFactory.Property("Delay", InputPrimitiveType.String) + ]); + + // Reset and reload mock with the model registered + var singletonField = typeof(ClientOptionsProvider).GetField("_singletonInstance", BindingFlags.Static | BindingFlags.NonPublic); + singletonField?.SetValue(null, null); + MockHelpers.LoadMockGenerator(inputModels: () => [retryPolicyModel]); + + InputParameter[] inputParameters = + [ + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.QueryParameter( + "retryPolicy", + retryPolicyModel, + isRequired: false, + defaultValue: new InputConstant(null, retryPolicyModel), + scope: InputParameterScope.Client, + isApiVersion: false) + ]; + var client = InputFactory.Client("TestService", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + // Verify local definitions contain the model + var definitions = doc["definitions"]; + Assert.IsNotNull(definitions, "Schema should include local definitions"); + + var retryPolicyDef = definitions!["retryPolicyConfig"]; + Assert.IsNotNull(retryPolicyDef, "Definitions should include 'retryPolicyConfig' model"); + Assert.AreEqual("object", retryPolicyDef!["type"]?.GetValue()); + + // Verify the model definition has its properties + var modelProperties = retryPolicyDef["properties"]; + Assert.IsNotNull(modelProperties, "Model definition should have properties"); + Assert.IsNotNull(modelProperties!["MaxRetries"], "Model should have MaxRetries property"); + Assert.AreEqual("integer", modelProperties["MaxRetries"]!["type"]?.GetValue()); + Assert.IsNotNull(modelProperties["Delay"], "Model should have Delay property"); + Assert.AreEqual("string", modelProperties["Delay"]!["type"]?.GetValue()); + + // Verify the options definition references the model via $ref + var clientEntry = doc["properties"]?["Clients"]?["properties"]?["TestService"]; + var optionsRef = clientEntry?["properties"]?["Options"]?["$ref"]?.GetValue(); + Assert.IsNotNull(optionsRef); + var optionsDefName = optionsRef!.Replace("#/definitions/", ""); + + var optionsDef = definitions[optionsDefName]; + Assert.IsNotNull(optionsDef); + var allOf = optionsDef!["allOf"]!.AsArray(); + Assert.AreEqual(2, allOf.Count, "allOf should have base options + extension"); + + var extensionProperties = allOf[1]?["properties"]; + Assert.IsNotNull(extensionProperties); + var retryPolicyProp = extensionProperties!["RetryPolicy"]; + Assert.IsNotNull(retryPolicyProp, "Model option property should exist"); + Assert.AreEqual("#/definitions/retryPolicyConfig", retryPolicyProp!["$ref"]?.GetValue()); + } + + [Test] + public void Generate_ConstructorParameter_IncludesModelDefinition() + { + // Create a model type with properties to use as a required constructor parameter + var connectionConfigModel = InputFactory.Model( + "ConnectionConfig", + properties: + [ + InputFactory.Property("Host", InputPrimitiveType.String), + InputFactory.Property("Port", InputPrimitiveType.Int32) + ]); + + // Reset and reload mock with the model registered + var singletonField = typeof(ClientOptionsProvider).GetField("_singletonInstance", BindingFlags.Static | BindingFlags.NonPublic); + singletonField?.SetValue(null, null); + MockHelpers.LoadMockGenerator(inputModels: () => [connectionConfigModel]); + + InputParameter[] inputParameters = + [ + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.QueryParameter( + "connectionConfig", + connectionConfigModel, + isRequired: true, + scope: InputParameterScope.Client, + isApiVersion: false) + ]; + var client = InputFactory.Client("TestService", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + // Verify local definitions contain the model + var definitions = doc["definitions"]; + Assert.IsNotNull(definitions, "Schema should include local definitions"); + + var connectionConfigDef = definitions!["connectionConfig"]; + Assert.IsNotNull(connectionConfigDef, "Definitions should include 'connectionConfig' model"); + Assert.AreEqual("object", connectionConfigDef!["type"]?.GetValue()); + + // Verify the model definition has its properties + var modelProperties = connectionConfigDef["properties"]; + Assert.IsNotNull(modelProperties, "Model definition should have properties"); + Assert.IsNotNull(modelProperties!["Host"], "Model should have Host property"); + Assert.AreEqual("string", modelProperties["Host"]!["type"]?.GetValue()); + Assert.IsNotNull(modelProperties["Port"], "Model should have Port property"); + Assert.AreEqual("integer", modelProperties["Port"]!["type"]?.GetValue()); + + // Verify the model appears as a top-level constructor parameter property (not under Options) + var clientEntry = doc["properties"]?["Clients"]?["properties"]?["TestService"]; + Assert.IsNotNull(clientEntry); + var connectionConfigProp = clientEntry!["properties"]?["ConnectionConfig"]; + Assert.IsNotNull(connectionConfigProp, "Constructor parameter model should appear as top-level client property"); + Assert.AreEqual("#/definitions/connectionConfig", connectionConfigProp!["$ref"]?.GetValue()); + + var expected = GetExpectedJsonFromFile(); + Assert.AreEqual(expected, result); + } + + [Test] + public void Generate_HandlesMultipleClients() + { + var client1 = InputFactory.Client("ServiceA"); + var client2 = InputFactory.Client("ServiceB"); + var provider1 = new ClientProvider(client1); + var provider2 = new ClientProvider(client2); + + var output = new TestOutputLibrary([provider1, provider2]); + var result = ConfigurationSchemaGenerator.Generate(output); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + var clientsSection = doc["properties"]?["Clients"]?["properties"]; + Assert.IsNotNull(clientsSection?["ServiceA"], "Should include ServiceA"); + Assert.IsNotNull(clientsSection?["ServiceB"], "Should include ServiceB"); + + var expected = GetExpectedJsonFromFile(); + Assert.AreEqual(expected, result); + } + + [Test] + public void Generate_IncludesAdditionalPropertiesOnSection() + { + var client = InputFactory.Client("TestService"); + var clientProvider = new ClientProvider(client); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + var clientsSection = doc["properties"]?["Clients"]; + var additionalProperties = clientsSection?["additionalProperties"]; + Assert.IsNotNull(additionalProperties, "Section should have additionalProperties for custom-named instances"); + Assert.AreEqual("object", additionalProperties!["type"]?.GetValue()); + } + + [Test] + public void Generate_ReturnsNull_WhenClientIsParentOnlyInitialized() + { + // Create a sub-client initialized by parent only + var parentClient = InputFactory.Client("ParentService"); + var subClient = InputFactory.Client( + "SubService", + parent: parentClient, + initializedBy: InputClientInitializedBy.Parent); + var subProvider = new ClientProvider(subClient); + + // Sub-client with Parent initialization should NOT have ClientSettings + Assert.IsNull(subProvider.ClientSettings); + + var output = new TestOutputLibrary([subProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + Assert.IsNull(result, "Should return null when no clients have settings"); + } + + [Test] + public void GetJsonSchemaForType_ReturnsCorrectSchema_ForPrimitiveTypes() + { + // String + var stringSchema = ConfigurationSchemaGenerator.GetJsonSchemaForType(new CSharpType(typeof(string))); + Assert.AreEqual("string", stringSchema["type"]?.GetValue()); + + // Boolean + var boolSchema = ConfigurationSchemaGenerator.GetJsonSchemaForType(new CSharpType(typeof(bool))); + Assert.AreEqual("boolean", boolSchema["type"]?.GetValue()); + + // Integer types + var intSchema = ConfigurationSchemaGenerator.GetJsonSchemaForType(new CSharpType(typeof(int))); + Assert.AreEqual("integer", intSchema["type"]?.GetValue()); + + var longSchema = ConfigurationSchemaGenerator.GetJsonSchemaForType(new CSharpType(typeof(long))); + Assert.AreEqual("integer", longSchema["type"]?.GetValue()); + + // Float types + var floatSchema = ConfigurationSchemaGenerator.GetJsonSchemaForType(new CSharpType(typeof(float))); + Assert.AreEqual("number", floatSchema["type"]?.GetValue()); + + var doubleSchema = ConfigurationSchemaGenerator.GetJsonSchemaForType(new CSharpType(typeof(double))); + Assert.AreEqual("number", doubleSchema["type"]?.GetValue()); + + // Uri + var uriSchema = ConfigurationSchemaGenerator.GetJsonSchemaForType(new CSharpType(typeof(Uri))); + Assert.AreEqual("string", uriSchema["type"]?.GetValue()); + Assert.AreEqual("uri", uriSchema["format"]?.GetValue()); + + // TimeSpan + var timeSpanSchema = ConfigurationSchemaGenerator.GetJsonSchemaForType(new CSharpType(typeof(TimeSpan))); + Assert.AreEqual("string", timeSpanSchema["type"]?.GetValue()); + } + + [Test] + public void GetJsonSchemaForType_ReturnsCorrectSchema_ForNullableTypes() + { + var nullableStringSchema = ConfigurationSchemaGenerator.GetJsonSchemaForType(new CSharpType(typeof(string), isNullable: true)); + Assert.AreEqual("string", nullableStringSchema["type"]?.GetValue()); + + var nullableBoolSchema = ConfigurationSchemaGenerator.GetJsonSchemaForType(new CSharpType(typeof(bool), isNullable: true)); + Assert.AreEqual("boolean", nullableBoolSchema["type"]?.GetValue()); + } + + [Test] + public void Generate_UsesCustomSectionName() + { + var client = InputFactory.Client("TestService"); + var clientProvider = new ClientProvider(client); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output, sectionName: "AzureClients"); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + Assert.IsNull(doc["properties"]?["Clients"], "Schema should not have a 'Clients' section"); + var azureClients = doc["properties"]?["AzureClients"]; + Assert.IsNotNull(azureClients, "Schema should have an 'AzureClients' section"); + + var testClient = azureClients!["properties"]?["TestService"]; + Assert.IsNotNull(testClient, "Schema should have a well-known 'TestService' entry under AzureClients"); + } + + [Test] + public void Generate_UsesCustomOptionsRef() + { + var client = InputFactory.Client("TestService"); + var clientProvider = new ClientProvider(client); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output, optionsRef: "azureOptions"); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + // The options definition should inherit from azureOptions instead of options + var definitions = doc["definitions"]; + Assert.IsNotNull(definitions); + + // Find the client options definition and verify it references azureOptions + foreach (var def in definitions!.AsObject()) + { + var allOf = def.Value?["allOf"]; + if (allOf != null) + { + var baseRef = allOf.AsArray()[0]?["$ref"]?.GetValue(); + Assert.AreEqual("#/definitions/azureOptions", baseRef, + $"Definition '{def.Key}' should reference azureOptions"); + } + } + } + + [Test] + public void Generate_UsesCustomSectionNameAndOptionsRef() + { + var client = InputFactory.Client("TestService"); + var clientProvider = new ClientProvider(client); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate( + output, + sectionName: "AzureClients", + optionsRef: "azureOptions"); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + // Verify section name + Assert.IsNull(doc["properties"]?["Clients"]); + Assert.IsNotNull(doc["properties"]?["AzureClients"]); + + // Verify options ref + var clientEntry = doc["properties"]?["AzureClients"]?["properties"]?["TestService"]; + Assert.IsNotNull(clientEntry); + + // The options definition should use azureOptions + var optionsRef = clientEntry!["properties"]?["Options"]?["$ref"]?.GetValue(); + Assert.IsNotNull(optionsRef); + var defName = optionsRef!.Replace("#/definitions/", ""); + var optionsDef = doc["definitions"]?[defName]; + Assert.IsNotNull(optionsDef); + Assert.AreEqual("#/definitions/azureOptions", optionsDef!["allOf"]?.AsArray()[0]?["$ref"]?.GetValue()); + } + + [Test] + public void ConfigurationSchemaOptions_HasCorrectDefaults() + { + var options = new ConfigurationSchemaOptions(); + Assert.AreEqual("Clients", options.SectionName); + Assert.AreEqual("options", options.OptionsRef); + Assert.IsTrue(options.GenerateNuGetTargets); + } + + [Test] + public async Task Generate_IncludesCustomCodeOptionsProperties() + { + // Reset singleton before loading async mock + var singletonField = typeof(ClientOptionsProvider).GetField("_singletonInstance", BindingFlags.Static | BindingFlags.NonPublic); + singletonField?.SetValue(null, null); + + // Load mock generator with a compilation that contains a custom partial class + // for TestServiceOptions with an "Audience" property. + await MockHelpers.LoadMockGeneratorAsync( + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var client = InputFactory.Client("TestService"); + var clientProvider = new ClientProvider(client); + + Assert.IsNotNull(clientProvider.ClientOptions, "ClientOptions should not be null"); + Assert.IsNotNull(clientProvider.ClientOptions!.CustomCodeView, + "CustomCodeView should be available from the compilation"); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + // Find the options definition + var clientEntry = doc["properties"]?["Clients"]?["properties"]?["TestService"]; + var optionsRef = clientEntry?["properties"]?["Options"]?["$ref"]?.GetValue(); + Assert.IsNotNull(optionsRef, "Options should reference a local definition"); + var defName = optionsRef!.Replace("#/definitions/", ""); + + var optionsDef = doc["definitions"]?[defName]; + Assert.IsNotNull(optionsDef, $"Options definition '{defName}' should exist"); + + var allOf = optionsDef!["allOf"]!.AsArray(); + Assert.AreEqual(2, allOf.Count, "allOf should have base options + extension with custom properties"); + + // Verify the custom "Audience" property from the partial class is included + var extensionProperties = allOf[1]?["properties"]; + Assert.IsNotNull(extensionProperties, "Extension properties should exist"); + var audienceProp = extensionProperties!["Audience"]; + Assert.IsNotNull(audienceProp, "Custom code 'Audience' property should be included in the schema"); + Assert.AreEqual("string", audienceProp!["type"]?.GetValue()); + } + + [Test] + public async Task Generate_IncludesCustomConstructorParameters() + { + // Reset singleton before loading async mock + var singletonField = typeof(ClientOptionsProvider).GetField("_singletonInstance", BindingFlags.Static | BindingFlags.NonPublic); + singletonField?.SetValue(null, null); + + // Load mock generator with a compilation that contains a custom partial class + // for TestService with a constructor that takes a "connectionString" parameter. + await MockHelpers.LoadMockGeneratorAsync( + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var client = InputFactory.Client("TestService"); + var clientProvider = new ClientProvider(client); + + Assert.IsNotNull(clientProvider.CustomCodeView, + "CustomCodeView should be available from the compilation"); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + // Verify the custom "ConnectionString" constructor parameter appears as a client-level property + var clientEntry = doc["properties"]?["Clients"]?["properties"]?["TestService"]; + Assert.IsNotNull(clientEntry, "TestService client entry should exist"); + + var connectionStringProp = clientEntry!["properties"]?["ConnectionString"]; + Assert.IsNotNull(connectionStringProp, + "Custom constructor parameter 'connectionString' should appear as 'ConnectionString' in the schema"); + Assert.AreEqual("string", connectionStringProp!["type"]?.GetValue()); + } + + [Test] + public async Task Generate_ExcludesInternalConstructorParameters() + { + // Reset singleton before loading async mock + var singletonField = typeof(ClientOptionsProvider).GetField("_singletonInstance", BindingFlags.Static | BindingFlags.NonPublic); + singletonField?.SetValue(null, null); + + // Load mock generator with a compilation that contains a custom partial class + // for TestService with a public constructor (connectionString) and an internal + // constructor (internalParam, anotherInternalParam). + await MockHelpers.LoadMockGeneratorAsync( + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var client = InputFactory.Client("TestService"); + var clientProvider = new ClientProvider(client); + + Assert.IsNotNull(clientProvider.CustomCodeView, + "CustomCodeView should be available from the compilation"); + + var output = new TestOutputLibrary([clientProvider]); + var result = ConfigurationSchemaGenerator.Generate(output); + + Assert.IsNotNull(result); + var doc = JsonNode.Parse(result!)!; + + var clientEntry = doc["properties"]?["Clients"]?["properties"]?["TestService"]; + Assert.IsNotNull(clientEntry, "TestService client entry should exist"); + + // Public constructor param should be included + var connectionStringProp = clientEntry!["properties"]?["ConnectionString"]; + Assert.IsNotNull(connectionStringProp, + "Public constructor parameter 'connectionString' should appear in schema"); + + // Internal constructor params should NOT be included + var internalParamProp = clientEntry["properties"]?["InternalParam"]; + Assert.IsNull(internalParamProp, + "Internal constructor parameter 'internalParam' should NOT appear in schema"); + + var anotherInternalProp = clientEntry["properties"]?["AnotherInternalParam"]; + Assert.IsNull(anotherInternalProp, + "Internal constructor parameter 'anotherInternalParam' should NOT appear in schema"); + } + + [Test] + public async Task GetJsonSchemaForType_ReturnsStringSchema_ForCustomStringStruct() + { + await MockHelpers.LoadMockGeneratorAsync( + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var typeProvider = CodeModelGenerator.Instance.SourceInputModel + .FindForTypeInCustomization("SampleNamespace", "CustomAudience"); + Assert.IsNotNull(typeProvider, "CustomAudience should be found in custom code"); + + var schema = ConfigurationSchemaGenerator.GetJsonSchemaForType(typeProvider!.Type); + Assert.AreEqual("string", schema["type"]?.GetValue(), + "Custom struct with string constructor should produce string schema"); + } + + [Test] + public async Task GetJsonSchemaForType_ReturnsIntegerSchema_ForCustomIntStruct() + { + await MockHelpers.LoadMockGeneratorAsync( + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var typeProvider = CodeModelGenerator.Instance.SourceInputModel + .FindForTypeInCustomization("SampleNamespace", "CustomPriority"); + Assert.IsNotNull(typeProvider, "CustomPriority should be found in custom code"); + + var schema = ConfigurationSchemaGenerator.GetJsonSchemaForType(typeProvider!.Type); + Assert.AreEqual("integer", schema["type"]?.GetValue(), + "Custom struct with int constructor should produce integer schema"); + } + + [Test] + public async Task GetJsonSchemaForType_ReturnsObjectSchema_ForCustomStructWithNoValidConstructor() + { + await MockHelpers.LoadMockGeneratorAsync( + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var typeProvider = CodeModelGenerator.Instance.SourceInputModel + .FindForTypeInCustomization("SampleNamespace", "CustomComplex"); + Assert.IsNotNull(typeProvider, "CustomComplex should be found in custom code"); + + var schema = ConfigurationSchemaGenerator.GetJsonSchemaForType(typeProvider!.Type); + Assert.AreEqual("object", schema["type"]?.GetValue(), + "Custom struct with no single-parameter framework-type constructor should fall back to object"); + } + + /// + /// Test output library that wraps provided TypeProviders. + /// + private class TestOutputLibrary : OutputLibrary + { + private readonly TypeProvider[] _types; + + public TestOutputLibrary(TypeProvider[] types) + { + _types = types; + } + + protected override TypeProvider[] BuildTypeProviders() => _types; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Microsoft.TypeSpec.Generator.ClientModel.Tests.csproj b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Microsoft.TypeSpec.Generator.ClientModel.Tests.csproj index 5de90de879a..94476387728 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Microsoft.TypeSpec.Generator.ClientModel.Tests.csproj +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Microsoft.TypeSpec.Generator.ClientModel.Tests.csproj @@ -14,6 +14,9 @@ PreserveNewest + + PreserveNewest + diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ModelReaderWriterValidation/LocalModelXmlTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ModelReaderWriterValidation/LocalModelXmlTests.cs new file mode 100644 index 00000000000..c859d882337 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ModelReaderWriterValidation/LocalModelXmlTests.cs @@ -0,0 +1,84 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.ClientModel.Primitives; +using System.Xml.Linq; +using Microsoft.TypeSpec.Generator.Tests.Common; +using NUnit.Framework; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Tests.ModelReaderWriterValidation +{ + /// + /// Base class for XML model round-trip tests. + /// Provides test cases for XML format ("X") serialization. + /// + public abstract class LocalModelXmlTests : LocalModelTests where T : IPersistableModel + { + /// + /// Gets the XML payload for testing. + /// + protected abstract string XmlPayload { get; } + + /// + /// Override GetExpectedResult to return XmlPayload for format "X". + /// + protected override string GetExpectedResult(string format) + { + if (format == "X") + { + return XmlPayload; + } + return base.GetExpectedResult(format); + } + + /// + /// Override RoundTripTest to handle XML format serialization validation. + /// For XML format, we parse and validate XML structure instead of JSON equivalency. + /// + protected new void RoundTripTest(string format, RoundTripStrategy strategy) + { + if (format == "X") + { + // XML-specific round-trip test + string serviceResponse = XmlPayload; + ModelReaderWriterOptions options = new ModelReaderWriterOptions(format); + + var modelInstance = GetModelInstance(); + T model = (T)strategy.Read(serviceResponse, modelInstance, options); + VerifyModel(model, format); + + var data = strategy.Write(model, options); + string roundTrip = data.ToString(); + + // Parse XML to ensure it's valid + var expectedXml = XElement.Parse(serviceResponse); + var resultXml = XElement.Parse(roundTrip); + + // Deserialize again and compare models + T model2 = (T)strategy.Read(roundTrip, modelInstance, options); + CompareModels(model, model2, format); + } + else + { + // For non-XML formats, use base implementation + base.RoundTripTest(format, strategy); + } + } + + [Test] + public void RoundTripWithModelReaderWriter_XML() + => RoundTripTest("X", new ModelReaderWriterStrategy()); + + [Test] + public void RoundTripWithModelReaderWriterNonGeneric_XML() + => RoundTripTest("X", new ModelReaderWriterNonGenericStrategy()); + + [Test] + public void RoundTripWithModelInterface_XML() + => RoundTripTest("X", new ModelInterfaceStrategy()); + + [Test] + public void RoundTripWithModelInterfaceNonGeneric_XML() + => RoundTripTest("X", new ModelInterfaceAsObjectStrategy()); + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ModelReaderWriterValidation/TestProjects/Sample_TypeSpec/TestData/Tree/Tree.json b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ModelReaderWriterValidation/TestProjects/Sample_TypeSpec/TestData/Tree/Tree.json new file mode 100644 index 00000000000..83bebc4f01d --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ModelReaderWriterValidation/TestProjects/Sample_TypeSpec/TestData/Tree/Tree.json @@ -0,0 +1,6 @@ +{ + "species": "tree", + "id": "tree-123", + "height": 500, + "age": 100 +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ModelReaderWriterValidation/TestProjects/Sample_TypeSpec/TestData/Tree/Tree.xml b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ModelReaderWriterValidation/TestProjects/Sample_TypeSpec/TestData/Tree/Tree.xml new file mode 100644 index 00000000000..7f54153f41d --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ModelReaderWriterValidation/TestProjects/Sample_TypeSpec/TestData/Tree/Tree.xml @@ -0,0 +1,7 @@ + + + tree + tree-123 + 500 + 100 + diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ModelReaderWriterValidation/TestProjects/Sample_TypeSpec/TestData/XmlAdvancedModel/XmlAdvancedModel.xml b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ModelReaderWriterValidation/TestProjects/Sample_TypeSpec/TestData/XmlAdvancedModel/XmlAdvancedModel.xml new file mode 100644 index 00000000000..b82754f6d5c --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ModelReaderWriterValidation/TestProjects/Sample_TypeSpec/TestData/XmlAdvancedModel/XmlAdvancedModel.xml @@ -0,0 +1,97 @@ + + + Test Model + 42 + true + 3.14 + nullable value + renamed value + string1 + string2 + 10 + 20 + + Item 1 + 100 + + + Item 2 + 200 + + + red + blue + + + + Item 3 + 300 + + + + nested value + + + value1 + value2 + + 2024-01-15T10:30:00.0000000Z + PT1H30M + U0dWc2JHOGdWMjl5YkdRPQ== + 1 + 1 + 365 + + foo1 + foo2 + + + another value + + + + namespace content + + + + content2 + + + + + Item 1 + 100 + + + + + + Item 1 + 100 + + + + + + Item 1 + 100 + + + + + + + Item 1 + 100 + + + + + + + Item 1 + 100 + + + + diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ModelReaderWriterValidation/TestProjects/Sample_TypeSpec/TreeXmlTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ModelReaderWriterValidation/TestProjects/Sample_TypeSpec/TreeXmlTests.cs new file mode 100644 index 00000000000..d9ac35840d3 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ModelReaderWriterValidation/TestProjects/Sample_TypeSpec/TreeXmlTests.cs @@ -0,0 +1,114 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.ClientModel; +using System.ClientModel.Primitives; +using System.IO; +using System.Xml.Linq; +using Microsoft.TypeSpec.Generator.Tests.Common; +using NUnit.Framework; +using SampleTypeSpec; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Tests.ModelReaderWriterValidation.TestProjects.Sample_TypeSpec +{ + /// + /// Tests for Tree model supporting both JSON and XML serialization. + /// Extends LocalModelJsonTests for standard JSON tests (including wire format), + /// and adds XML-specific round-trip tests. + /// + internal class TreeXmlTests : LocalModelJsonTests + { + protected override string JsonPayload => File.ReadAllText(ModelTestHelper.GetLocation("TestData/Tree/Tree.json")); + protected override string WirePayload => File.ReadAllText(ModelTestHelper.GetLocation("TestData/Tree/Tree.json")); // Wire format uses JSON for Tree + protected string XmlPayload => File.ReadAllText(ModelTestHelper.GetLocation("TestData/Tree/Tree.xml")); + protected override Tree ToModel(ClientResult result) => (Tree)result; + protected override BinaryContent ToBinaryContent(Tree model) => model; + + protected override void CompareModels(Tree model, Tree model2, string format) + { + Assert.AreEqual(model.Id, model2.Id); + Assert.AreEqual(model.Height, model2.Height); + Assert.AreEqual(model.Age, model2.Age); + } + + protected override void VerifyModel(Tree model, string format) + { + Assert.AreEqual("tree-123", model.Id); + Assert.AreEqual(500, model.Height); + Assert.AreEqual(100, model.Age); + } + + // Add XML-specific round-trip tests + [Test] + public void RoundTripWithModelReaderWriter_XML() + => RoundTripTestXml("X", new ModelReaderWriterStrategy()); + + [Test] + public void RoundTripWithModelReaderWriterNonGeneric_XML() + => RoundTripTestXml("X", new ModelReaderWriterNonGenericStrategy()); + + [Test] + public void RoundTripWithModelInterface_XML() + => RoundTripTestXml("X", new ModelInterfaceStrategy()); + + [Test] + public void RoundTripWithModelInterfaceNonGeneric_XML() + => RoundTripTestXml("X", new ModelInterfaceAsObjectStrategy()); + + private void RoundTripTestXml(string format, RoundTripStrategy strategy) + { + string serviceResponse = XmlPayload; + ModelReaderWriterOptions options = new ModelReaderWriterOptions(format); + + var modelInstance = GetModelInstance(); + Tree model = (Tree)strategy.Read(serviceResponse, modelInstance, options); + VerifyModel(model, format); + + var data = strategy.Write(model, options); + string roundTrip = data.ToString(); + + // Parse XML and compare structure + var expectedXml = XElement.Parse(serviceResponse); + var resultXml = XElement.Parse(roundTrip); + + // Verify we can deserialize again + Tree model2 = (Tree)strategy.Read(roundTrip, modelInstance, options); + CompareModels(model, model2, format); + } + + [Test] + public void ToBinaryContent_WithJsonFormat_ProducesJsonPayload() + { + var tree = new Tree("tree-123", 500, 100); + + // Use reflection to call the internal ToBinaryContent method + var method = typeof(Tree).GetMethod("ToBinaryContent", + System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Public); + Assert.IsNotNull(method, "ToBinaryContent method should exist on Tree"); + + var binaryContent = (BinaryContent)method!.Invoke(tree, new object[] { "J" })!; + + // Verify the MediaType is set correctly for JSON + Assert.That(binaryContent.MediaType, + Is.EqualTo("application/json"), + "MediaType should be application/json for format 'J'"); + } + + [Test] + public void ToBinaryContent_WithXmlFormat_ProducesXmlPayload() + { + var tree = new Tree("tree-123", 500, 100); + + // Use reflection to call the internal ToBinaryContent method + var method = typeof(Tree).GetMethod("ToBinaryContent", + System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Public); + Assert.IsNotNull(method, "ToBinaryContent method should exist on Tree"); + + var binaryContent = (BinaryContent)method!.Invoke(tree, new object[] { "X" })!; + + // Verify the MediaType is null or empty for XML format + Assert.That(string.IsNullOrEmpty(binaryContent.MediaType), Is.True, + "MediaType should be null or empty for format 'X'"); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ModelReaderWriterValidation/TestProjects/Sample_TypeSpec/XmlAdvancedModelXmlTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ModelReaderWriterValidation/TestProjects/Sample_TypeSpec/XmlAdvancedModelXmlTests.cs new file mode 100644 index 00000000000..f5cb1a54a62 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ModelReaderWriterValidation/TestProjects/Sample_TypeSpec/XmlAdvancedModelXmlTests.cs @@ -0,0 +1,117 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; +using System.ClientModel; +using System.IO; +using Microsoft.TypeSpec.Generator.Tests.Common; +using NUnit.Framework; +using SampleTypeSpec; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Tests.ModelReaderWriterValidation.TestProjects.Sample_TypeSpec +{ + /// + /// Tests for XmlAdvancedModel XML serialization. + /// Since XmlAdvancedModel is XML-only, it extends LocalModelXmlTests. + /// + internal class XmlAdvancedModelXmlTests : LocalModelXmlTests + { + protected override string JsonPayload => string.Empty; // XmlAdvancedModel does not support JSON + protected override string WirePayload => File.ReadAllText(ModelTestHelper.GetLocation("TestData/XmlAdvancedModel/XmlAdvancedModel.xml")); + protected override string XmlPayload => File.ReadAllText(ModelTestHelper.GetLocation("TestData/XmlAdvancedModel/XmlAdvancedModel.xml")); + protected override XmlAdvancedModel ToModel(ClientResult result) => (XmlAdvancedModel)result; + protected override BinaryContent ToBinaryContent(XmlAdvancedModel model) => model; + + protected override void CompareModels(XmlAdvancedModel model, XmlAdvancedModel model2, string format) + { + // Compare basic properties + Assert.AreEqual(model.Name, model2.Name); + Assert.AreEqual(model.Age, model2.Age); + Assert.AreEqual(model.Enabled, model2.Enabled); + Assert.AreEqual(model.Score, model2.Score); + Assert.AreEqual(model.NullableString, model2.NullableString); + + // Compare XML attributes + Assert.AreEqual(model.Id, model2.Id); + Assert.AreEqual(model.Version, model2.Version); + Assert.AreEqual(model.IsActive, model2.IsActive); + Assert.AreEqual(model.OriginalName, model2.OriginalName); + Assert.AreEqual(model.XmlIdentifier, model2.XmlIdentifier); + + // Compare arrays + Assert.AreEqual(model.UnwrappedStrings.Count, model2.UnwrappedStrings.Count); + for (int i = 0; i < model.UnwrappedStrings.Count; i++) + { + Assert.AreEqual(model.UnwrappedStrings[i], model2.UnwrappedStrings[i]); + } + + Assert.AreEqual(model.UnwrappedCounts.Count, model2.UnwrappedCounts.Count); + Assert.AreEqual(model.WrappedColors.Count, model2.WrappedColors.Count); + + // Compare nested model (NestedId not preserved - WriteObjectValue limitation) + Assert.AreEqual(model.NestedModel.Value, model2.NestedModel.Value); + + // Compare metadata dictionary + Assert.AreEqual(model.Metadata.Count, model2.Metadata.Count); + + // Compare date/time and duration + Assert.AreEqual(model.CreatedAt, model2.CreatedAt); + Assert.AreEqual(model.Duration, model2.Duration); + + // Compare enums + Assert.AreEqual(model.FixedEnum, model2.FixedEnum); + Assert.AreEqual(model.ExtensibleEnum.ToString(), model2.ExtensibleEnum.ToString()); + + // Compare namespace properties + Assert.AreEqual(model.Label, model2.Label); + Assert.AreEqual(model.DaysUsed, model2.DaysUsed); + } + + protected override void VerifyModel(XmlAdvancedModel model, string format) + { + // Verify basic properties + Assert.AreEqual("Test Model", model.Name); + Assert.AreEqual(42, model.Age); + Assert.AreEqual(true, model.Enabled); + Assert.AreEqual(3.14f, model.Score); + Assert.AreEqual("nullable value", model.NullableString); + + // Verify XML attributes + Assert.AreEqual("model-123", model.Id); + Assert.AreEqual(1, model.Version); + Assert.AreEqual(true, model.IsActive); + Assert.AreEqual("renamed value", model.OriginalName); + Assert.AreEqual("xml-id-456", model.XmlIdentifier); + + // Verify unwrapped arrays + Assert.AreEqual(2, model.UnwrappedStrings.Count); + Assert.AreEqual("string1", model.UnwrappedStrings[0]); + Assert.AreEqual("string2", model.UnwrappedStrings[1]); + + Assert.AreEqual(2, model.UnwrappedCounts.Count); + Assert.AreEqual(10, model.UnwrappedCounts[0]); + Assert.AreEqual(20, model.UnwrappedCounts[1]); + + // Verify nested model + Assert.AreEqual("nested value", model.NestedModel.Value); + // Note: NestedId defaults to 0 (not in XML, attributes not preserved) + + // Verify metadata + Assert.AreEqual(2, model.Metadata.Count); + Assert.AreEqual("value1", model.Metadata["key1"]); + Assert.AreEqual("value2", model.Metadata["key2"]); + + // Verify date/time + Assert.AreEqual(new DateTimeOffset(2024, 1, 15, 10, 30, 0, TimeSpan.Zero), model.CreatedAt); + Assert.AreEqual(new TimeSpan(1, 30, 0), model.Duration); + + // Verify enums + Assert.AreEqual(StringFixedEnum.One, model.FixedEnum); + Assert.AreEqual(StringExtensibleEnum.One, model.ExtensibleEnum); + + // Verify namespace properties + Assert.AreEqual("test-label", model.Label); + Assert.AreEqual(365, model.DaysUsed); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Abstractions/RequestContentApiTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Abstractions/RequestContentApiTests.cs index 49dd83bbb03..c0cf268aa1a 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Abstractions/RequestContentApiTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Abstractions/RequestContentApiTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. using System.ClientModel; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientOptionsProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientOptionsProviderTests.cs index 5f5abcd8410..93664c6310b 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientOptionsProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientOptionsProviderTests.cs @@ -137,21 +137,67 @@ public void TestConstructors(bool containsApiVersions) Assert.IsNotNull(clientOptionsProvider); var ctors = clientOptionsProvider.Constructors; + // IConfigurationSection constructor is always generated + var configSectionCtor = ctors.FirstOrDefault(c => c.Signature.Parameters.Any(p => p.Name == "section")); + Assert.IsNotNull(configSectionCtor, "IConfigurationSection constructor should always be generated"); + if (containsApiVersions) { - Assert.AreEqual(1, ctors.Count); - var ctor = ctors[0]; - var signature = ctor.Signature; + Assert.AreEqual(2, ctors.Count); + var versionCtor = ctors.First(c => c.Signature.Parameters.Any(p => p.Name == "version")); + var signature = versionCtor.Signature; Assert.AreEqual(1, signature.Parameters.Count); var versionParam = signature.Parameters[0]; Assert.AreEqual("version", versionParam.Name); Assert.AreEqual(clientOptionsProvider.NestedTypes[0].Type, versionParam.Type); Assert.IsNotNull(versionParam.DefaultValue); - Assert.IsNotNull(ctor.BodyStatements); + Assert.IsNotNull(versionCtor.BodyStatements); } else { - Assert.AreEqual(0, ctors.Count); + Assert.AreEqual(2, ctors.Count); + var defaultCtor = ctors.First(c => !c.Signature.Parameters.Any()); + Assert.IsNotNull(defaultCtor, "Default parameterless constructor should be generated"); + } + } + + [TestCase(true, Category = ApiVersionsCategory)] + [TestCase(false)] + public void TestConfigurationSectionConstructorBody(bool containsApiVersions) + { + var client = InputFactory.Client("TestClient"); + var clientProvider = new ClientProvider(client); + var clientOptionsProvider = new ClientOptionsProvider(client, clientProvider); + + var ctors = clientOptionsProvider.Constructors; + var configSectionCtor = ctors.FirstOrDefault(c => c.Signature.Parameters.Any(p => p.Name == "section")); + Assert.IsNotNull(configSectionCtor); + + // Validate it's internal + Assert.AreEqual(MethodSignatureModifiers.Internal, configSectionCtor!.Signature.Modifiers); + + // Validate it has the base(section) initializer + Assert.IsNotNull(configSectionCtor.Signature.Initializer); + Assert.IsTrue(configSectionCtor.Signature.Initializer!.IsBase); + + // Validate the body is not empty + var body = configSectionCtor.BodyStatements; + Assert.IsNotNull(body); + + var bodyString = body!.ToDisplayString(); + + // Always has a guard statement + Assert.IsTrue(bodyString.Contains("section is null") || bodyString.Contains("Exists"), + "Configuration section constructor should have a guard statement"); + + if (containsApiVersions) + { + // When API versions exist, Version should be set to latest before guard + Assert.IsTrue(bodyString.Contains("Version ="), + "Configuration constructor should set Version when API versions exist"); + // After guard, should read version from config + Assert.IsTrue(bodyString.Contains("section[\"Version\"]"), + "Configuration constructor should read Version from config section"); } } @@ -330,7 +376,7 @@ await MockHelpers.LoadMockGeneratorAsync( var body = constructor?.BodyStatements?.ToDisplayString(); Assert.IsNotNull(body); - + // Verify the switch statement contains custom enum members with their correct string values Assert.IsTrue(body?.Contains("ServiceVersion.V2023_10_01_Preview_1 => \"2023-10-01-preview-1\"")); Assert.IsTrue(body?.Contains("ServiceVersion.V2023_11_01 => \"2023-11-01\"")); @@ -368,17 +414,17 @@ public void SingletonCreatedForMultipleClientsWithStandardParameters() public void SingleClientCreatesClientSpecificOptions() { var client = InputFactory.Client("TestClient", clientNamespace: "TestNamespace"); - + MockHelpers.LoadMockGenerator(clients: () => [client]); var clientProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(client); Assert.IsNotNull(clientProvider); - + var options = clientProvider!.ClientOptions; Assert.IsNotNull(options); - + // The name should be based on the client name Assert.AreEqual("TestClientOptions", options!.Name); } @@ -666,5 +712,436 @@ public void MultiServiceCombinedClient_WithThreeServices_GeneratesExpectedClient Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); } + + [Test] + public void MultiServiceClient_SameLastSegment_ProducesUniqueVersionEnums() + { + // Regression test: when two services have different full namespaces but the same last + // segment, the generated service version enums should still have distinct names. + List serviceOneVersions = ["1.0", "2.0"]; + List serviceTwoVersions = ["3.0", "4.0"]; + + var serviceOneEnumValues = serviceOneVersions.Select(a => (a, a)); + var serviceTwoEnumValues = serviceTwoVersions.Select(a => (a, a)); + + // Different full namespaces, same last segment ("Tests") + var serviceOneEnum = InputFactory.StringEnum( + "ServiceOneVersions", + serviceOneEnumValues, + usage: InputModelTypeUsage.ApiVersionEnum, + clientNamespace: "Azure.ServiceOne.Tests"); + var serviceTwoEnum = InputFactory.StringEnum( + "ServiceTwoVersions", + serviceTwoEnumValues, + usage: InputModelTypeUsage.ApiVersionEnum, + clientNamespace: "Azure.ServiceTwo.Tests"); + + var client = InputFactory.Client("TestClient", isMultiServiceClient: true); + + MockHelpers.LoadMockGenerator( + apiVersions: () => [.. serviceOneVersions, .. serviceTwoVersions], + clients: () => [client], + inputEnums: () => [serviceOneEnum, serviceTwoEnum]); + + var clientProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(client); + var clientOptionsProvider = clientProvider?.ClientOptions; + + Assert.IsNotNull(clientOptionsProvider); + + // Validate nested service version enums have unique names + var nestedTypes = clientOptionsProvider!.NestedTypes; + Assert.AreEqual(2, nestedTypes.Count); + CollectionAssert.AllItemsAreUnique(nestedTypes.Select(t => t.Name).ToList()); + + var writer = new TypeProviderWriter(clientOptionsProvider!); + var file = writer.Write(); + + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public void MultiServiceClient_UniqueNamespaces_ProducesUniqueVersionEnums() + { + List serviceOneVersions = ["2024-01-01"]; + List serviceTwoVersions = ["2024-06-01"]; + + var serviceOneEnumValues = serviceOneVersions.Select(a => (a, a)); + var serviceTwoEnumValues = serviceTwoVersions.Select(a => (a, a)); + + var serviceOneEnum = InputFactory.StringEnum( + "Versions", + serviceOneEnumValues, + usage: InputModelTypeUsage.ApiVersionEnum, + clientNamespace: "ServiceOne"); + var serviceTwoEnum = InputFactory.StringEnum( + "Versions", + serviceTwoEnumValues, + usage: InputModelTypeUsage.ApiVersionEnum, + clientNamespace: "ServiceTwo"); + + InputParameter apiVersionParameter = InputFactory.QueryParameter( + "apiVersion", + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client, + isApiVersion: true); + + var serviceOneOperation = InputFactory.Operation( + "ServiceOneOperation", + parameters: [apiVersionParameter], + ns: "ServiceOne"); + + var serviceTwoOperation = InputFactory.Operation( + "ServiceTwoOperation", + parameters: [apiVersionParameter], + ns: "ServiceTwo"); + + var client = InputFactory.Client( + "MultiServiceClient", + methods: + [ + InputFactory.BasicServiceMethod("ServiceOneMethod", serviceOneOperation), + InputFactory.BasicServiceMethod("ServiceTwoMethod", serviceTwoOperation) + ], + parameters: [apiVersionParameter], + isMultiServiceClient: true); + + MockHelpers.LoadMockGenerator( + apiVersions: () => [.. serviceOneVersions, .. serviceTwoVersions], + clients: () => [client], + inputEnums: () => [serviceOneEnum, serviceTwoEnum]); + + var clientProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(client); + Assert.IsNotNull(clientProvider); + + // Validate that Fields access does not crash (the original issue crashed here) + Assert.DoesNotThrow(() => _ = clientProvider!.Fields); + + // Validate that Methods access does not crash (original crash site: Fields.ToDictionary in BuildMethods) + Assert.DoesNotThrow(() => _ = clientProvider!.Methods); + + var clientOptionsProvider = clientProvider?.ClientOptions; + Assert.IsNotNull(clientOptionsProvider); + + // Validate nested service version enums have unique names + var nestedTypes = clientOptionsProvider!.NestedTypes; + Assert.AreEqual(2, nestedTypes.Count); + CollectionAssert.AllItemsAreUnique(nestedTypes.Select(t => t.Name).ToList()); + + // Verify enum names follow the XServiceVersion pattern + Assert.AreEqual("ServiceOneServiceVersion", nestedTypes[0].Name); + Assert.AreEqual("ServiceTwoServiceVersion", nestedTypes[1].Name); + + var writer = new TypeProviderWriter(clientOptionsProvider!); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public void MultiServiceClient_SameNamespace_ProducesUniqueVersionEnums() + { + // Regression test for the scenario where both enums share the exact same namespace + // (e.g., when tspconfig remaps both services to the same C# output namespace). + List serviceOneVersions = ["2024-01-01"]; + List serviceTwoVersions = ["2024-06-01"]; + + var serviceOneEnumValues = serviceOneVersions.Select(a => (a, a)); + var serviceTwoEnumValues = serviceTwoVersions.Select(a => (a, a)); + + // Both enums have the EXACT SAME namespace (simulates tspconfig namespace override) + var serviceOneEnum = InputFactory.StringEnum( + "ServiceOneVersions", + serviceOneEnumValues, + usage: InputModelTypeUsage.ApiVersionEnum, + clientNamespace: "Azure.Generator.MgmtTypeSpec.MultiService.Tests"); + var serviceTwoEnum = InputFactory.StringEnum( + "ServiceTwoVersions", + serviceTwoEnumValues, + usage: InputModelTypeUsage.ApiVersionEnum, + clientNamespace: "Azure.Generator.MgmtTypeSpec.MultiService.Tests"); + + InputParameter apiVersionParameter = InputFactory.QueryParameter( + "apiVersion", + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client, + isApiVersion: true); + + var serviceOneOperation = InputFactory.Operation( + "ServiceOneOperation", + parameters: [apiVersionParameter], + ns: "Azure.Generator.MgmtTypeSpec.MultiService.Tests"); + + var serviceTwoOperation = InputFactory.Operation( + "ServiceTwoOperation", + parameters: [apiVersionParameter], + ns: "Azure.Generator.MgmtTypeSpec.MultiService.Tests"); + + var client = InputFactory.Client( + "MultiServiceClient", + methods: + [ + InputFactory.BasicServiceMethod("ServiceOneMethod", serviceOneOperation), + InputFactory.BasicServiceMethod("ServiceTwoMethod", serviceTwoOperation) + ], + parameters: [apiVersionParameter], + isMultiServiceClient: true); + + MockHelpers.LoadMockGenerator( + apiVersions: () => [.. serviceOneVersions, .. serviceTwoVersions], + clients: () => [client], + inputEnums: () => [serviceOneEnum, serviceTwoEnum]); + + var clientProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(client); + Assert.IsNotNull(clientProvider); + + Assert.DoesNotThrow(() => _ = clientProvider!.Fields); + Assert.DoesNotThrow(() => _ = clientProvider!.Methods); + + var clientOptionsProvider = clientProvider?.ClientOptions; + Assert.IsNotNull(clientOptionsProvider); + + // Validate nested service version enums have unique names + var nestedTypes = clientOptionsProvider!.NestedTypes; + Assert.AreEqual(2, nestedTypes.Count); + CollectionAssert.AllItemsAreUnique(nestedTypes.Select(t => t.Name).ToList()); + + var writer = new TypeProviderWriter(clientOptionsProvider!); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public void TestConfigurationSectionConstructorBody_WithBoolProperty() + { + var boolParam = InputFactory.MethodParameter( + "enableRetry", + InputPrimitiveType.Boolean, + isRequired: false, + defaultValue: new InputConstant(true, InputPrimitiveType.Boolean), + scope: InputParameterScope.Client); + + var client = InputFactory.Client("TestClient", parameters: [boolParam]); + + MockHelpers.LoadMockGenerator(clients: () => [client]); + + var clientProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(client); + var clientOptionsProvider = clientProvider!.ClientOptions; + + Assert.IsNotNull(clientOptionsProvider); + + var configSectionCtor = clientOptionsProvider!.Constructors + .FirstOrDefault(c => c.Signature.Parameters.Any(p => p.Name == "section")); + Assert.IsNotNull(configSectionCtor); + + var bodyString = configSectionCtor!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("bool.TryParse"), + "IConfigurationSection constructor should use bool.TryParse for bool property binding"); + Assert.IsTrue(bodyString.Contains("EnableRetry"), + "IConfigurationSection constructor should assign to EnableRetry property"); + } + + [Test] + public void TestConfigurationSectionConstructorBody_WithIntProperty() + { + var intParam = InputFactory.MethodParameter( + "maxRetries", + InputPrimitiveType.Int32, + isRequired: false, + defaultValue: new InputConstant(3, InputPrimitiveType.Int32), + scope: InputParameterScope.Client); + + var client = InputFactory.Client("TestClient", parameters: [intParam]); + + MockHelpers.LoadMockGenerator(clients: () => [client]); + + var clientProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(client); + var clientOptionsProvider = clientProvider!.ClientOptions; + + Assert.IsNotNull(clientOptionsProvider); + + var configSectionCtor = clientOptionsProvider!.Constructors + .FirstOrDefault(c => c.Signature.Parameters.Any(p => p.Name == "section")); + Assert.IsNotNull(configSectionCtor); + + var bodyString = configSectionCtor!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("int.TryParse"), + "IConfigurationSection constructor should use int.TryParse for int property binding"); + Assert.IsTrue(bodyString.Contains("MaxRetries"), + "IConfigurationSection constructor should assign to MaxRetries property"); + } + + [Test] + public void TestConfigurationSectionConstructorBody_WithEnumProperty() + { + var enumType = InputFactory.StringEnum( + "AppAudience", + [("Public", "public"), ("Private", "private")], + isExtensible: true); + + var enumParam = InputFactory.MethodParameter( + "audience", + enumType, + isRequired: false, + defaultValue: new InputConstant("public", enumType), + scope: InputParameterScope.Client); + + var client = InputFactory.Client("TestClient", parameters: [enumParam]); + + MockHelpers.LoadMockGenerator( + clients: () => [client], + inputEnums: () => [enumType]); + + var clientProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(client); + var clientOptionsProvider = clientProvider!.ClientOptions; + + Assert.IsNotNull(clientOptionsProvider); + + var configSectionCtor = clientOptionsProvider!.Constructors + .FirstOrDefault(c => c.Signature.Parameters.Any(p => p.Name == "section")); + Assert.IsNotNull(configSectionCtor); + + var bodyString = configSectionCtor!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("is string"), + "IConfigurationSection constructor should use 'is string' pattern for extensible enum property binding"); + Assert.IsTrue(bodyString.Contains("new"), + "IConfigurationSection constructor should create new enum instance"); + Assert.IsTrue(bodyString.Contains("Audience"), + "IConfigurationSection constructor should assign to Audience property"); + } + + [Test] + public void TestConfigurationSectionConstructorBody_WithStringProperty() + { + var stringParam = InputFactory.MethodParameter( + "tenantId", + InputPrimitiveType.String, + isRequired: false, + defaultValue: InputFactory.Constant.String("default"), + scope: InputParameterScope.Client); + + var client = InputFactory.Client("TestClient", parameters: [stringParam]); + + MockHelpers.LoadMockGenerator(clients: () => [client]); + + var clientProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(client); + var clientOptionsProvider = clientProvider!.ClientOptions; + + Assert.IsNotNull(clientOptionsProvider); + + var configSectionCtor = clientOptionsProvider!.Constructors + .FirstOrDefault(c => c.Signature.Parameters.Any(p => p.Name == "section")); + Assert.IsNotNull(configSectionCtor); + + var bodyString = configSectionCtor!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("IsNullOrEmpty"), + "IConfigurationSection constructor should use string.IsNullOrEmpty for string property binding"); + Assert.IsTrue(bodyString.Contains("TenantId"), + "IConfigurationSection constructor should assign to TenantId property"); + } + + [Test] + public void TestConfigurationSectionConstructorBody_WithComplexObjectProperty() + { + var complexModel = InputFactory.Model( + "CustomOptions", + properties: new[] + { + InputFactory.Property("setting1", InputPrimitiveType.String, isRequired: true, wireName: "setting1"), + InputFactory.Property("setting2", InputPrimitiveType.Int32, isRequired: false, wireName: "setting2") + }); + + var complexParam = InputFactory.MethodParameter( + "customOptions", + complexModel, + isRequired: false, + defaultValue: new InputConstant(null, complexModel), + scope: InputParameterScope.Client); + + var client = InputFactory.Client("TestClient", parameters: [complexParam]); + + MockHelpers.LoadMockGenerator( + clients: () => [client], + inputModels: () => [complexModel]); + + var clientProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(client); + var clientOptionsProvider = clientProvider!.ClientOptions; + + Assert.IsNotNull(clientOptionsProvider); + + var configSectionCtor = clientOptionsProvider!.Constructors + .FirstOrDefault(c => c.Signature.Parameters.Any(p => p.Name == "section")); + Assert.IsNotNull(configSectionCtor); + + var bodyString = configSectionCtor!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("GetSection"), + "IConfigurationSection constructor should use GetSection for complex object property binding"); + Assert.IsTrue(bodyString.Contains("Exists"), + "IConfigurationSection constructor should check Exists for complex object property binding"); + Assert.IsTrue(bodyString.Contains("CustomOptions") && bodyString.Contains("new"), + "IConfigurationSection constructor should create new CustomOptions instance for complex object property binding"); + } + + [Test] + public void TestConfigurationSectionConstructorBody_WithFixedEnumProperty() + { + var enumType = InputFactory.StringEnum( + "ClientMode", + [("Default", "default"), ("MultiClient", "multi-client")], + isExtensible: false); + + var enumParam = InputFactory.MethodParameter( + "mode", + enumType, + isRequired: false, + defaultValue: new InputConstant("default", enumType), + scope: InputParameterScope.Client); + + var client = InputFactory.Client("TestClient", parameters: [enumParam]); + + MockHelpers.LoadMockGenerator( + clients: () => [client], + inputEnums: () => [enumType]); + + var clientProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(client); + var clientOptionsProvider = clientProvider!.ClientOptions; + + Assert.IsNotNull(clientOptionsProvider); + + var configSectionCtor = clientOptionsProvider!.Constructors + .FirstOrDefault(c => c.Signature.Parameters.Any(p => p.Name == "section")); + Assert.IsNotNull(configSectionCtor); + + var bodyString = configSectionCtor!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("Enum.TryParse"), + "IConfigurationSection constructor should use Enum.TryParse for fixed enum property binding"); + Assert.IsTrue(bodyString.Contains("Mode"), + "IConfigurationSection constructor should assign to Mode property"); + Assert.IsFalse(bodyString.Contains("new ClientMode"), + "IConfigurationSection constructor should NOT use new for fixed enum property binding"); + } + + [Test] + public async Task TestConfigurationSectionConstructorBody_BindsCustomCodeProperties() + { + await MockHelpers.LoadMockGeneratorAsync( + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var client = InputFactory.Client("TestClient", clientNamespace: "SampleNamespace"); + var clientProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(client); + var clientOptionsProvider = clientProvider!.ClientOptions; + + Assert.IsNotNull(clientOptionsProvider); + Assert.IsNotNull(clientOptionsProvider!.CustomCodeView, + "CustomCodeView should be available from the compilation"); + + var configSectionCtor = clientOptionsProvider.Constructors + .FirstOrDefault(c => c.Signature.Parameters.Any(p => p.Name == "section")); + Assert.IsNotNull(configSectionCtor); + + var bodyString = configSectionCtor!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("Audience"), + "IConfigurationSection constructor should bind the custom code 'Audience' property from configuration"); + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderCustomizationTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderCustomizationTests.cs index d058de7cf6e..0b8620ee7ab 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderCustomizationTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderCustomizationTests.cs @@ -228,6 +228,10 @@ public async Task CanChangeClientAccessibility() // The client options were not customized Assert.IsTrue(clientOptionsProvider!.DeclarationModifiers.HasFlag(TypeSignatureModifiers.Public)); + // ClientSettings should not be generated for internal clients + Assert.IsNull(((ClientProvider)clientProvider).ClientSettings, + "Internal client should not have ClientSettings generated"); + // The docs should be generated even when then methods is internal foreach (var method in clientProvider.Methods) { @@ -265,6 +269,10 @@ public async Task CanChangeClientOptionsAccessibility() // The client options were not customized Assert.IsTrue(clientOptionsProvider!.DeclarationModifiers.HasFlag(TypeSignatureModifiers.Internal)); + // ClientSettings should not be generated for internal clients + Assert.IsNull(((ClientProvider)clientProvider).ClientSettings, + "Internal client should not have ClientSettings generated"); + // The docs should be generated even when then methods is internal foreach (var method in clientProvider.Methods) { @@ -281,7 +289,7 @@ public async Task CanRenameSubClient() ]); var inputServiceMethod = InputFactory.BasicServiceMethod("test", inputOperation); var inputClient = InputFactory.Client("TestClient", methods: [inputServiceMethod]); - InputClient subClient = InputFactory.Client("custom", parent: inputClient); + InputClient subClient = InputFactory.Client("custom", parent: inputClient, initializedBy: InputClientInitializedBy.Parent); var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( clients: () => [inputClient], compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); @@ -309,7 +317,7 @@ public async Task CanRemoveCachingField() ]); var inputServiceMethod = InputFactory.BasicServiceMethod("test", inputOperation); var inputClient = InputFactory.Client("TestClient", methods: [inputServiceMethod]); - InputClient subClient = InputFactory.Client("dog", methods: [], parameters: [], parent: inputClient); + InputClient subClient = InputFactory.Client("dog", methods: [], parameters: [], parent: inputClient, initializedBy: InputClientInitializedBy.Parent); var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( clients: () => [inputClient], compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderSubClientTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderSubClientTests.cs index 6de8507f420..46566e74c68 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderSubClientTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderSubClientTests.cs @@ -15,11 +15,11 @@ namespace Microsoft.TypeSpec.Generator.ClientModel.Tests.Providers.ClientProvide public class ClientProviderSubClientTests { private static readonly InputClient _testClient = InputFactory.Client("TestClient"); - private static readonly InputClient _animalClient = InputFactory.Client("animal", doc: "AnimalClient description", parent: _testClient); - private static readonly InputClient _dogClient = InputFactory.Client("dog", doc: "DogClient description", parent: _animalClient); - private static readonly InputClient _catClient = InputFactory.Client("cat", doc: "CatClient description", parent: _animalClient); - private static readonly InputClient _hawkClient = InputFactory.Client("hawkClient", doc: "HawkClient description", parent: _animalClient); - private static readonly InputClient _huskyClient = InputFactory.Client("husky", doc: "HuskyClient description", parent: _dogClient); + private static readonly InputClient _animalClient = InputFactory.Client("animal", doc: "AnimalClient description", parent: _testClient, initializedBy: InputClientInitializedBy.Parent); + private static readonly InputClient _dogClient = InputFactory.Client("dog", doc: "DogClient description", parent: _animalClient, initializedBy: InputClientInitializedBy.Parent); + private static readonly InputClient _catClient = InputFactory.Client("cat", doc: "CatClient description", parent: _animalClient, initializedBy: InputClientInitializedBy.Parent); + private static readonly InputClient _hawkClient = InputFactory.Client("hawkClient", doc: "HawkClient description", parent: _animalClient, initializedBy: InputClientInitializedBy.Parent); + private static readonly InputClient _huskyClient = InputFactory.Client("husky", doc: "HuskyClient description", parent: _dogClient, initializedBy: InputClientInitializedBy.Parent); [SetUp] public void SetUp() @@ -79,6 +79,45 @@ public void SubClientSummaryIsPopulatedWithDefaultDocs() Assert.AreEqual("/// The Test sub-client. \n", client!.XmlDocs.Summary!.ToDisplayString()); } + [Test] + public void HasAccessorOnlyParameters_ReturnsFalse_WhenSubClientParamMatchesParentAlias() + { + // Parent has parameter "blobName" with paramAlias "name" + // Subclient has parameter "name" + // The alias should make it recognized as a shared parameter, not subclient-specific + var parentClient = InputFactory.Client( + "ParentClient", + parameters: [InputFactory.MethodParameter("blobName", InputPrimitiveType.String, isRequired: true, scope: InputParameterScope.Client, paramAlias: "name")]); + var subClient = InputFactory.Client( + "SubClient", + parent: parentClient, + parameters: [InputFactory.MethodParameter("name", InputPrimitiveType.String, isRequired: true, scope: InputParameterScope.Client)]); + + MockHelpers.LoadMockGenerator(clients: () => [parentClient]); + + var subClientProvider = new ClientProvider(subClient); + Assert.IsFalse(subClientProvider.HasAccessorOnlyParameters(parentClient)); + } + + [Test] + public void HasAccessorOnlyParameters_ReturnsTrue_WhenSubClientParamDoesNotMatchParentAlias() + { + // Parent has parameter "blobName" with paramAlias "name" + // Subclient has parameter "color" — not matching either parent name or alias + var parentClient = InputFactory.Client( + "ParentClient", + parameters: [InputFactory.MethodParameter("blobName", InputPrimitiveType.String, isRequired: true, scope: InputParameterScope.Client, paramAlias: "name")]); + var subClient = InputFactory.Client( + "SubClient", + parent: parentClient, + parameters: [InputFactory.MethodParameter("color", InputPrimitiveType.String, isRequired: true, scope: InputParameterScope.Client)]); + + MockHelpers.LoadMockGenerator(clients: () => [parentClient]); + + var subClientProvider = new ClientProvider(subClient); + Assert.IsTrue(subClientProvider.HasAccessorOnlyParameters(parentClient)); + } + private class MockClientProvider : ClientProvider { private readonly string[] _expectedSubClientFactoryMethodNames; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderTests.cs index 6068edcf87c..c18cf79e9ff 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderTests.cs @@ -48,9 +48,9 @@ public bool ValidateIsLastNamespaceSegmentTheSame(string left, string right) private const string OnlyUnsupportedAuthCategory = "WithOnlyUnsupportedAuth"; private const string TestClientName = "TestClient"; private static readonly InputClient _testClient = InputFactory.Client(TestClientName); - private static readonly InputClient _animalClient = InputFactory.Client("animal", doc: "AnimalClient description", parent: _testClient); - private static readonly InputClient _dogClient = InputFactory.Client("dog", doc: "DogClient description", parent: _animalClient); - private static readonly InputClient _huskyClient = InputFactory.Client("husky", doc: "HuskyClient description", parent: _dogClient); + private static readonly InputClient _animalClient = InputFactory.Client("animal", doc: "AnimalClient description", parent: _testClient, initializedBy: InputClientInitializedBy.Parent); + private static readonly InputClient _dogClient = InputFactory.Client("dog", doc: "DogClient description", parent: _animalClient, initializedBy: InputClientInitializedBy.Parent); + private static readonly InputClient _huskyClient = InputFactory.Client("husky", doc: "HuskyClient description", parent: _dogClient, initializedBy: InputClientInitializedBy.Parent); private static readonly InputModelType _spreadModel = InputFactory.Model( "spreadModel", usage: InputModelTypeUsage.Spread, @@ -160,31 +160,34 @@ public void TestBuildAuthFields_WithAuth(List inputParameters) if (_hasKeyAuth) { - // key auth should have the following fields: AuthorizationHeader, _keyCredential + // key auth should have the AuthorizationHeader const field; _keyCredential is no longer stored AssertHasFields(clientProvider, new List { new(FieldModifiers.Private | FieldModifiers.Const, new CSharpType(typeof(string)), "AuthorizationHeader"), - new(FieldModifiers.Private | FieldModifiers.ReadOnly, new CSharpType(typeof(ApiKeyCredential)), "_keyCredential") }); + // _keyCredential field is no longer on the client (auth handled via AuthenticationPolicy parameter) + Assert.IsFalse(clientProvider.Fields.Any(f => f.Name == "_keyCredential")); } if (_hasOAuth2) { - // oauth2 auth should have the following fields: _flows, _tokenProvider + // oauth2 auth should have the _flows field; _tokenProvider is no longer stored AssertHasFields(clientProvider, new List { - new(FieldModifiers.Private | FieldModifiers.ReadOnly, new CSharpType(typeof(Dictionary[])), "_flows"), - new(FieldModifiers.Private | FieldModifiers.ReadOnly, new CSharpType(typeof(AuthenticationTokenProvider)), "_tokenProvider"), + new(FieldModifiers.Private | FieldModifiers.Static | FieldModifiers.ReadOnly, new CSharpType(typeof(Dictionary[])), "_flows"), }); + // _tokenProvider field is no longer on the client (auth handled via AuthenticationPolicy parameter) + Assert.IsFalse(clientProvider.Fields.Any(f => f.Name == "_tokenProvider")); } if (_hasOAuth2WithOtherCredType) { - // if another cred type other than the SCM type is used, then the client should default to the following fields: _scopes, _tokenCredential + // if another cred type other than the SCM type is used, then the client should default to the following fields: _scopes (no _tokenCredential) AssertHasFields(clientProvider, new List { new(FieldModifiers.Private | FieldModifiers.Static | FieldModifiers.ReadOnly, new CSharpType(typeof(string[])), "AuthorizationScopes"), - new(FieldModifiers.Private | FieldModifiers.ReadOnly, new CSharpType(typeof(FakeTokenCredential)), "_tokenCredential"), }); + // _tokenCredential field is no longer on the client (auth handled via AuthenticationPolicy parameter) + Assert.IsFalse(clientProvider.Fields.Any(f => f.Name == "_tokenCredential")); } if (_hasOnlyUnsupportedAuth) @@ -206,12 +209,12 @@ public void TestBuildOAuth2FlowsField(IEnumerable inputFlows) Assert.IsNotNull(clientProvider); - // oauth2 auth should have the following fields: _flows, _tokenProvider + // oauth2 auth should have the _flows field; _tokenProvider is no longer stored on the client AssertHasFields(clientProvider, new List { - new(FieldModifiers.Private | FieldModifiers.ReadOnly, new CSharpType(typeof(AuthenticationTokenProvider)), "_tokenProvider"), - new(FieldModifiers.Private | FieldModifiers.ReadOnly, new CSharpType(typeof(Dictionary[])), "_flows"), + new(FieldModifiers.Private | FieldModifiers.Static | FieldModifiers.ReadOnly, new CSharpType(typeof(Dictionary[])), "_flows"), }); + Assert.IsFalse(clientProvider.Fields.Any(f => f.Name == "_tokenProvider"), "_tokenProvider should not be present - auth handled via AuthenticationPolicy parameter"); // validate the field initialization var testName = TestContext.CurrentContext.Test.Name; @@ -298,29 +301,29 @@ public void TestBuildAuthFields_WithSubClients_WithAuth(InputClient client) if (_hasKeyAuth) { - // key auth should have the following fields: AuthorizationHeader, _keyCredential + // key auth should have AuthorizationHeader const field; _keyCredential is no longer stored AssertHasFields(clientProvider, new List { new(FieldModifiers.Private | FieldModifiers.Const, new CSharpType(typeof(string)), "AuthorizationHeader"), - new(FieldModifiers.Private | FieldModifiers.ReadOnly, new CSharpType(typeof(ApiKeyCredential)), "_keyCredential") }); + Assert.IsFalse(clientProvider.Fields.Any(f => f.Name == "_keyCredential")); } if (_hasOAuth2) { - // oauth2 auth should have the following fields: _flows, _tokenProvider + // oauth2 auth should have _flows field; _tokenProvider is no longer stored AssertHasFields(clientProvider, new List { - new(FieldModifiers.Private | FieldModifiers.ReadOnly, new CSharpType(typeof(Dictionary[])), "_flows"), - new(FieldModifiers.Private | FieldModifiers.ReadOnly, new CSharpType(typeof(AuthenticationTokenProvider)), "_tokenProvider"), + new(FieldModifiers.Private | FieldModifiers.Static | FieldModifiers.ReadOnly, new CSharpType(typeof(Dictionary[])), "_flows"), }); + Assert.IsFalse(clientProvider.Fields.Any(f => f.Name == "_tokenProvider")); } if (_hasOAuth2WithOtherCredType) { AssertHasFields(clientProvider, new List { new(FieldModifiers.Private | FieldModifiers.Static | FieldModifiers.ReadOnly, new CSharpType(typeof(string[])), "AuthorizationScopes"), - new(FieldModifiers.Private | FieldModifiers.ReadOnly, new CSharpType(typeof(FakeTokenCredential)), "_tokenCredential"), }); + Assert.IsFalse(clientProvider.Fields.Any(f => f.Name == "_tokenCredential")); } } @@ -366,26 +369,18 @@ public void TestBuildConstructors_PrimaryConstructor(List inputP var constructors = clientProvider.Constructors; - var primaryPublicConstructors = constructors.Where( - c => c.Signature?.Initializer == null && c.Signature?.Modifiers == MethodSignatureModifiers.Public).ToArray(); + // The implementation constructors are now INTERNAL (taking AuthenticationPolicy? as first param) + var implementationConstructors = constructors.Where( + c => c.Signature?.Initializer == null && c.Signature?.Modifiers == MethodSignatureModifiers.Internal).ToArray(); - // for no auth or one auth case, this should be 1 - // for both auth case, this should be 2 - // for only unsupported auth case, this should be 0 - int expectedPrimaryCtorCount; - if (_hasOnlyUnsupportedAuth) - { - expectedPrimaryCtorCount = 0; - } - else - { - expectedPrimaryCtorCount = _hasKeyAuth && _hasOAuth2 ? 2 : 1; - } - Assert.AreEqual(expectedPrimaryCtorCount, primaryPublicConstructors.Length); + // There is always exactly 1 internal implementation constructor, regardless of auth type count. + // All public credential constructors are pass-throughs to this single implementation constructor. + int expectedImplCtorCount = 1; + Assert.AreEqual(expectedImplCtorCount, implementationConstructors.Length); - for (int i = 0; i < primaryPublicConstructors.Length; i++) + for (int i = 0; i < implementationConstructors.Length; i++) { - ValidatePrimaryConstructor(primaryPublicConstructors[i], inputParameters, i); + ValidatePrimaryConstructor(implementationConstructors[i], inputParameters, i); } } @@ -404,10 +399,14 @@ public void TestBuildConstructors_SecondaryConstructor(List inpu var constructors = clientProvider.Constructors; - var primaryPublicConstructors = constructors.Where( - c => c.Signature?.Initializer == null && c.Signature?.Modifiers == MethodSignatureModifiers.Public).ToArray(); + var implementationConstructors = constructors.Where( + c => c.Signature?.Initializer == null && c.Signature?.Modifiers == MethodSignatureModifiers.Internal).ToArray(); var secondaryPublicConstructors = constructors.Where( - c => c.Signature?.Initializer != null && c.Signature?.Modifiers == MethodSignatureModifiers.Public).ToArray(); + c => c.Signature?.Initializer != null && + c.Signature?.Modifiers == MethodSignatureModifiers.Public && + !IsSettingsConstructor(c) && + !IsPrimaryPassThroughConstructor(c)).ToArray(); + var primaryPassThroughConstructors = constructors.Where(IsPrimaryPassThroughConstructor).ToArray(); // Check if endpoint has a default value var endpointParam = inputParameters.FirstOrDefault(p => p is InputEndpointParameter ep && ep.IsEndpoint); @@ -447,7 +446,7 @@ public void TestBuildConstructors_SecondaryConstructor(List inpu Assert.AreEqual(expectedSecondaryCtorCount, secondaryPublicConstructors.Length); foreach (var secondaryPublicConstructor in secondaryPublicConstructors) { - ValidateSecondaryConstructor(primaryPublicConstructors, secondaryPublicConstructor, inputParameters); + ValidateSecondaryConstructor(primaryPassThroughConstructors, secondaryPublicConstructor, inputParameters); } } @@ -543,15 +542,22 @@ public void TestBuildConstructors_SimplifiedWithOptions_WhenDefaultEndpoint() var constructors = clientProvider.Constructors; - // Get all public constructors with an initializer (secondary constructors) + // Get secondary constructors (not primary pass-through, not settings constructor) var secondaryPublicConstructors = constructors.Where( - c => c.Signature?.Initializer != null && c.Signature?.Modifiers == MethodSignatureModifiers.Public).ToList(); + c => c.Signature?.Initializer != null && + c.Signature?.Modifiers == MethodSignatureModifiers.Public && + !IsSettingsConstructor(c) && + !IsPrimaryPassThroughConstructor(c)).ToList(); // We should have 2 secondary constructors per auth type: // 1. Client(credential) - simple with just auth // 2. Client(credential, options) - simplified with auth + options Assert.AreEqual(2, secondaryPublicConstructors.Count); + // Verify the settings constructor also exists + var settingsConstructor = constructors.FirstOrDefault(IsSettingsConstructor); + Assert.IsNotNull(settingsConstructor, "Expected a settings constructor"); + // Verify the simple constructor exists (just auth) var simpleConstructor = secondaryPublicConstructors.FirstOrDefault(c => c.Signature.Parameters.Count == 1); Assert.IsNotNull(simpleConstructor, "Expected a simple constructor with just auth parameter"); @@ -582,15 +588,184 @@ public void TestBuildConstructors_SimplifiedWithOptions_WhenDefaultEndpoint() Assert.IsFalse(optionsArg is NewInstanceExpression, "Options argument should be the parameter itself, not a new instance"); } + [TestCase(Category = KeyAuthCategory)] + [TestCase(Category = OAuth2Category)] + public void TestBuildConstructors_SettingsConstructor() + { + var inputParameters = new List + { + InputFactory.EndpointParameter( + KnownParameters.Endpoint.Name, + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true) + }; + var client = InputFactory.Client(TestClientName, parameters: [.. inputParameters]); + var clientProvider = new ClientProvider(client); + + Assert.IsNotNull(clientProvider); + + var constructors = clientProvider.Constructors; + var settingsConstructor = constructors.FirstOrDefault(IsSettingsConstructor); + Assert.IsNotNull(settingsConstructor, "Expected a settings constructor"); + + // Validate it's public + Assert.AreEqual(MethodSignatureModifiers.Public, settingsConstructor!.Signature.Modifiers); + + // Validate it has exactly 1 parameter: settings + Assert.AreEqual(1, settingsConstructor.Signature.Parameters.Count); + Assert.AreEqual("settings", settingsConstructor.Signature.Parameters[0].Name); + + // Validate it's a pass-through (body is empty) + Assert.AreEqual(MethodBodyStatement.Empty, settingsConstructor.BodyStatements); + + // Validate it has a this(...) initializer + var initializer = settingsConstructor.Signature.Initializer; + Assert.IsNotNull(initializer); + Assert.IsFalse(initializer!.IsBase, "Settings constructor should use this() initializer, not base()"); + } + + [Test] + public void TestBuildConstructors_NoSettingsConstructor_WhenNoEndpoint() + { + // No endpoint parameter — settings constructor should not be generated + var client = InputFactory.Client(TestClientName); + var clientProvider = new ClientProvider(client); + + Assert.IsNotNull(clientProvider); + + var constructors = clientProvider.Constructors; + var settingsConstructor = constructors.FirstOrDefault(IsSettingsConstructor); + Assert.IsNull(settingsConstructor, "Settings constructor should not be generated when there is no endpoint"); + } + + [Test] + public void TestBuildConstructors_DeduplicatesParametersBySerializedName() + { + // Scenario: Client has a parameter with name "indexName" and serializedName "indexName" + // An operation has a parameter with name "name" but serializedName "indexName" (renamed via @encodedName) + // These should be deduplicated by SerializedName to avoid duplicate fields + var clientParameter = InputFactory.PathParameter( + "indexName", + InputPrimitiveType.String, + serializedName: "indexName", + isRequired: true, + scope: InputParameterScope.Client); + + var operationParameterWithRenamedName = InputFactory.PathParameter( + "name", + InputPrimitiveType.String, + serializedName: "indexName", + isRequired: true, + scope: InputParameterScope.Client); + + var endpointParameter = InputFactory.EndpointParameter( + KnownParameters.Endpoint.Name, + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true); + + var operation = InputFactory.Operation( + "TestOperation", + parameters: [operationParameterWithRenamedName]); + + var client = InputFactory.Client( + TestClientName, + methods: [InputFactory.BasicServiceMethod("TestMethod", operation)], + parameters: [endpointParameter, clientParameter]); + + var clientProvider = new ClientProvider(client); + Assert.IsNotNull(clientProvider); + + // Verify the field with the same SerializedName only appears once + var fields = clientProvider.Fields; + var indexNameFields = fields.Where(f => f.Name == "_indexName" || f.Name == "_name").ToList(); + + // Should only have ONE field for the "indexName" serialized name, not two + Assert.AreEqual(1, indexNameFields.Count, + $"Expected 1 field for serializedName 'indexName', but found {indexNameFields.Count}: {string.Join(", ", indexNameFields.Select(f => f.Name))}"); + + // The field should be "_indexName" (from the client parameters, which comes first) + Assert.AreEqual("_indexName", indexNameFields[0].Name, + "Expected the client parameter field '_indexName' to be used, not the operation parameter field '_name'"); + } + + [Test] + public void TestBuildConstructors_DeduplicatesConstructorParametersBySerializedName() + { + // Scenario: Create required client-scoped parameters that will become constructor parameters. + // We use required non-path/query/header parameters that are client-scoped - these become fields + // and their corresponding parameters in the constructor. + var clientParameter = InputFactory.QueryParameter( + "indexName", + InputPrimitiveType.String, + serializedName: "indexName", + isRequired: true, + scope: InputParameterScope.Client); + + var operationParameterWithRenamedName = InputFactory.QueryParameter( + "name", + InputPrimitiveType.String, + serializedName: "indexName", + isRequired: true, + scope: InputParameterScope.Client); + + var endpointParameter = InputFactory.EndpointParameter( + KnownParameters.Endpoint.Name, + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true); + + var operation = InputFactory.Operation( + "TestOperation", + parameters: [operationParameterWithRenamedName]); + + var client = InputFactory.Client( + TestClientName, + methods: [InputFactory.BasicServiceMethod("TestMethod", operation)], + parameters: [endpointParameter, clientParameter]); + + var clientProvider = new ClientProvider(client); + Assert.IsNotNull(clientProvider); + + // Verify the underlying parameter deduplication occurred + var allClientParameters = clientProvider.GetType() + .GetMethod("GetAllClientParameters", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance) + ?.Invoke(clientProvider, null) as IReadOnlyList; + + Assert.IsNotNull(allClientParameters, "Could not access GetAllClientParameters method"); + + var indexNameParams = allClientParameters!.Where(p => + p.Name == "indexName" || p.Name == "name").ToList(); + + // Should only have 1 parameter after deduplication by name + Assert.AreEqual(1, indexNameParams.Count, + $"Expected 1 parameter after deduplication, but found {indexNameParams.Count}: {string.Join(", ", indexNameParams.Select(p => p.Name))}"); + + // Should be the client parameter (first one wins) + Assert.AreEqual("indexName", indexNameParams[0].Name, + "Expected the client parameter 'indexName' to be preserved after deduplication"); + } + // Tests for InitializedBy flag behavior [Test] public void TestBuildConstructors_ForSubClient_InitializedByIndividually_HasPublicConstructors() { - var parentClient = InputFactory.Client("ParentClient"); + var endpointParameter = InputFactory.EndpointParameter( + KnownParameters.Endpoint.Name, + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true); + var parentClient = InputFactory.Client("ParentClient", parameters: [endpointParameter]); var subClient = InputFactory.Client( "SubClient", parent: parentClient, + parameters: [endpointParameter], initializedBy: InputClientInitializedBy.Individually); MockHelpers.LoadMockGenerator( @@ -608,23 +783,28 @@ public void TestBuildConstructors_ForSubClient_InitializedByIndividually_HasPubl c => c.Signature?.Modifiers == MethodSignatureModifiers.Public).ToList(); Assert.IsTrue(publicConstructors.Count > 0, "SubClient with InitializedBy.Individually should have public constructors"); - // primary constructor should set the pipeline, options, and endpoint + // Primary public constructor should have auth credential param and chain to internal via this(...) var primaryConstructor = publicConstructors.FirstOrDefault( - c => c.Signature?.Initializer == null); - Assert.IsNotNull(primaryConstructor, "SubClient with InitializedBy.Individually should have primary public constructor"); - StringAssert.Contains( - "options ??= new global::Sample.ParentClientOptions();", - primaryConstructor!.BodyStatements!.ToDisplayString(), - "Primary constructor should null coalesce options parameter"); - StringAssert.Contains( - "Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.SubClient).Assembly) }, Array.Empty());", - primaryConstructor.BodyStatements!.ToDisplayString(), - "Primary constructor should set the Pipeline property"); - - // Should NOT have internal constructor since InitializedBy does not include Parent - var internalConstructor = constructors.FirstOrDefault( - c => c.Signature?.Modifiers == MethodSignatureModifiers.Internal); - Assert.IsNull(internalConstructor, "SubClient with InitializedBy.Individually (without Parent) should not have internal constructor"); + c => c.Signature?.Parameters.Any(p => p.Name == "options") == true && c.Signature?.Initializer != null); + Assert.IsNotNull(primaryConstructor, "SubClient with InitializedBy.Individually should have primary public constructor with initializer"); + + // Should have a credential parameter (from the mock api key auth) + Assert.IsTrue(primaryConstructor!.Signature.Parameters.Any(p => p.Name == "credential"), + "SubClient with InitializedBy.Individually should have credential parameter in public constructor"); + + // Should have internal AuthenticationPolicy constructor + var internalConstructors = constructors.Where( + c => c.Signature?.Modifiers == MethodSignatureModifiers.Internal).ToList(); + Assert.IsTrue(internalConstructors.Count > 0, "SubClient with InitializedBy.Individually should have internal constructor"); + var authPolicyConstructor = internalConstructors.FirstOrDefault( + c => c.Signature?.Parameters.Any(p => p.Type.Name == nameof(AuthenticationPolicy)) == true); + Assert.IsNotNull(authPolicyConstructor, "SubClient with InitializedBy.Individually should have internal AuthenticationPolicy constructor"); + + // Should have a Settings constructor + Assert.IsNotNull(clientProvider.ClientSettings, "SubClient with InitializedBy.Individually should have ClientSettings"); + var settingsConstructor = publicConstructors.FirstOrDefault( + c => c.Signature?.Parameters.Count == 1 && c.Signature.Parameters[0].Name == "settings"); + Assert.IsNotNull(settingsConstructor, "SubClient with InitializedBy.Individually should have Settings constructor"); var mockingConstructor = constructors.FirstOrDefault( c => c.Signature?.Modifiers == MethodSignatureModifiers.Protected); @@ -667,10 +847,17 @@ public void TestBuildConstructors_ForSubClient_InitializedByParentOnly_HasOnlyIn [Test] public void TestBuildConstructors_ForSubClient_InitializedByBoth_HasBothConstructors() { - var parentClient = InputFactory.Client("ParentClient"); + var endpointParameter = InputFactory.EndpointParameter( + KnownParameters.Endpoint.Name, + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true); + var parentClient = InputFactory.Client("ParentClient", parameters: [endpointParameter]); var subClient = InputFactory.Client( "SubClient", parent: parentClient, + parameters: [endpointParameter], initializedBy: InputClientInitializedBy.Individually | InputClientInitializedBy.Parent); MockHelpers.LoadMockGenerator( @@ -688,23 +875,21 @@ public void TestBuildConstructors_ForSubClient_InitializedByBoth_HasBothConstruc c => c.Signature?.Modifiers == MethodSignatureModifiers.Public).ToList(); Assert.IsTrue(publicConstructors.Count > 0, "SubClient with InitializedBy.Individually | Parent should have public constructors"); - // primary constructor should set the pipeline, options, and endpoint + // Primary public constructor should have auth credential param and chain to internal via this(...) var primaryConstructor = publicConstructors.FirstOrDefault( - c => c.Signature?.Initializer == null); - Assert.IsNotNull(primaryConstructor, "SubClient with InitializedBy.Individually should have primary public constructor"); - StringAssert.Contains( - "options ??= new global::Sample.ParentClientOptions();", - primaryConstructor!.BodyStatements!.ToDisplayString(), - "Primary constructor should null coalesce options parameter"); - StringAssert.Contains( - "Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.SubClient).Assembly) }, Array.Empty());", - primaryConstructor.BodyStatements!.ToDisplayString(), - "Primary constructor should set the Pipeline property"); - - // Should also have internal constructor - var internalConstructor = constructors.FirstOrDefault( - c => c.Signature?.Modifiers == MethodSignatureModifiers.Internal); - Assert.IsNotNull(internalConstructor, "SubClient with InitializedBy.Individually | Parent should have internal constructor"); + c => c.Signature?.Parameters.Any(p => p.Name == "options") == true && c.Signature?.Initializer != null); + Assert.IsNotNull(primaryConstructor, "SubClient with InitializedBy.Individually should have primary public constructor with initializer"); + + // Should also have internal constructors (sub-client internal + AuthenticationPolicy internal) + var internalConstructors = constructors.Where( + c => c.Signature?.Modifiers == MethodSignatureModifiers.Internal).ToList(); + Assert.IsTrue(internalConstructors.Count > 0, "SubClient with InitializedBy.Individually | Parent should have internal constructor"); + + // Should have a Settings constructor + Assert.IsNotNull(clientProvider.ClientSettings, "SubClient with InitializedBy.Individually | Parent should have ClientSettings"); + var settingsConstructor = publicConstructors.FirstOrDefault( + c => c.Signature?.Parameters.Count == 1 && c.Signature.Parameters[0].Name == "settings"); + Assert.IsNotNull(settingsConstructor, "SubClient with InitializedBy.Individually | Parent should have Settings constructor"); var mockingConstructor = constructors.FirstOrDefault( c => c.Signature?.Modifiers == MethodSignatureModifiers.Protected); @@ -789,6 +974,116 @@ public void TestBuildMethods_ForParent_InitializedByBoth_HasSubClientAccessor() Assert.IsNotNull(cachingField, "Parent should have caching field for subclient with InitializedBy.Individually | Parent"); } + [Test] + public void TestBuildMethods_ForParent_InitializedByBoth_WithSubClientParams_HasParameterizedAccessor() + { + var parentClient = InputFactory.Client("ParentClient"); + var subClientParam = InputFactory.PathParameter("resourceId", InputPrimitiveType.String, scope: InputParameterScope.Client); + var subClient = InputFactory.Client( + "SubClient", + parent: parentClient, + parameters: [subClientParam], + initializedBy: InputClientInitializedBy.Individually | InputClientInitializedBy.Parent); + + MockHelpers.LoadMockGenerator( + clients: () => [parentClient]); + + var parentProvider = new ClientProvider(parentClient); + + Assert.IsNotNull(parentProvider); + + // The parent should have a factory method for the subclient + var factoryMethod = parentProvider.Methods.FirstOrDefault( + m => m.Signature?.Name == "GetSubClient" || m.Signature?.Name == "GetSubClientClient"); + Assert.IsNotNull(factoryMethod, "Parent should have factory method for subclient with parameters"); + + // The accessor method should include the subclient's extra parameters + Assert.IsNotNull(factoryMethod!.Signature, "Factory method should have a signature"); + Assert.AreEqual(1, factoryMethod.Signature!.Parameters.Count, + "Accessor method should include subclient parameters not present on parent"); + Assert.AreEqual("resourceId", factoryMethod.Signature.Parameters[0].Name, + "Accessor method parameter should be the subclient's extra parameter"); + } + + [Test] + public void TestBuildFields_ForParent_InitializedByBoth_WithSubClientParams_NoCachingField() + { + var parentClient = InputFactory.Client("ParentClient"); + var subClientParam = InputFactory.PathParameter("resourceId", InputPrimitiveType.String, scope: InputParameterScope.Client); + var subClient = InputFactory.Client( + "SubClient", + parent: parentClient, + parameters: [subClientParam], + initializedBy: InputClientInitializedBy.Individually | InputClientInitializedBy.Parent); + + MockHelpers.LoadMockGenerator( + clients: () => [parentClient]); + + var parentProvider = new ClientProvider(parentClient); + + Assert.IsNotNull(parentProvider); + + // The parent should NOT have a caching field for the subclient when the accessor requires parameters, + // since caching is not appropriate when different parameter values produce different client instances. + var cachingField = parentProvider.Fields.FirstOrDefault(f => f.Name == "_cachedSubClient"); + Assert.IsNull(cachingField, "Parent should not have caching field for subclient that has subclient-specific parameters in its accessor"); + } + + [Test] + public void TestBuildMethods_ForParent_InitializedByParentOnly_WithSubClientParams_HasParameterizedAccessor() + { + var parentClient = InputFactory.Client("ParentClient"); + var subClientParam = InputFactory.PathParameter("resourceId", InputPrimitiveType.String, scope: InputParameterScope.Client); + var subClient = InputFactory.Client( + "SubClient", + parent: parentClient, + parameters: [subClientParam], + initializedBy: InputClientInitializedBy.Parent); + + MockHelpers.LoadMockGenerator( + clients: () => [parentClient]); + + var parentProvider = new ClientProvider(parentClient); + + Assert.IsNotNull(parentProvider); + + // The parent should have a factory method for the subclient + var factoryMethod = parentProvider.Methods.FirstOrDefault( + m => m.Signature?.Name == "GetSubClient" || m.Signature?.Name == "GetSubClientClient"); + Assert.IsNotNull(factoryMethod, "Parent should have factory method for subclient with parameters"); + + // The accessor method should include the subclient's extra parameters + Assert.IsNotNull(factoryMethod!.Signature, "Factory method should have a signature"); + Assert.AreEqual(1, factoryMethod.Signature!.Parameters.Count, + "Accessor method should include subclient parameters not present on parent"); + Assert.AreEqual("resourceId", factoryMethod.Signature.Parameters[0].Name, + "Accessor method parameter should be the subclient's extra parameter"); + } + + [Test] + public void TestBuildFields_ForParent_InitializedByParentOnly_WithSubClientParams_NoCachingField() + { + var parentClient = InputFactory.Client("ParentClient"); + var subClientParam = InputFactory.PathParameter("resourceId", InputPrimitiveType.String, scope: InputParameterScope.Client); + var subClient = InputFactory.Client( + "SubClient", + parent: parentClient, + parameters: [subClientParam], + initializedBy: InputClientInitializedBy.Parent); + + MockHelpers.LoadMockGenerator( + clients: () => [parentClient]); + + var parentProvider = new ClientProvider(parentClient); + + Assert.IsNotNull(parentProvider); + + // The parent should NOT have a caching field for the subclient when the accessor requires parameters, + // since caching is not appropriate when different parameter values produce different client instances. + var cachingField = parentProvider.Fields.FirstOrDefault(f => f.Name == "_cachedSubClient"); + Assert.IsNull(cachingField, "Parent should not have caching field for subclient that has subclient-specific parameters in its accessor"); + } + private void ValidatePrimaryConstructor( ConstructorProvider primaryPublicConstructor, List inputParameters, @@ -797,15 +1092,18 @@ private void ValidatePrimaryConstructor( [CallerFilePath] string filePath = "") { var primaryCtorParams = primaryPublicConstructor?.Signature?.Parameters; - // in no auth case, the ctor only have two parameters: endpoint and options - // in other cases, the ctor should have three parameters: endpoint, credential, options - // specifically, in both auth cases, we should have two ctors corresponding to each credential type as the second parameter - var expectedPrimaryCtorParamCount = !_hasKeyAuth && !_hasOAuth2 ? 2 : 3; + // The internal implementation constructor always has 3 parameters: authenticationPolicy, endpoint, options + var expectedPrimaryCtorParamCount = 3; Assert.AreEqual(expectedPrimaryCtorParamCount, primaryCtorParams?.Count); - // the first should be endpoint - var endpointParam = primaryCtorParams?[0]; + // the first should be authenticationPolicy (AuthenticationPolicy?) + var authPolicyParam = primaryCtorParams?[0]; + Assert.AreEqual("authenticationPolicy", authPolicyParam?.Name); + Assert.IsTrue(authPolicyParam?.Type.Equals(new CSharpType(typeof(AuthenticationPolicy), isNullable: true))); + + // the second should be endpoint + var endpointParam = primaryCtorParams?[1]; Assert.AreEqual(KnownParameters.Endpoint.Name, endpointParam?.Name); if (endpointParam?.DefaultValue != null) @@ -820,25 +1118,6 @@ private void ValidatePrimaryConstructor( var optionsParam = primaryCtorParams?[^1]; Assert.AreEqual("options", optionsParam?.Name); - if (_hasSupportedAuth) - { - // when there is any auth, the second should be auth parameter - var authParam = primaryCtorParams?[1]; - Assert.IsNotNull(authParam); - if (authParam?.Type.Equals(typeof(ApiKeyCredential)) == true) - { - Assert.AreEqual("credential", authParam.Name); - } - else if (authParam?.Type.Equals(typeof(AuthenticationTokenProvider)) == true) - { - Assert.AreEqual("tokenProvider", authParam.Name); - } - else - { - Assert.Fail("Unexpected auth parameter"); - } - } - // validate the body of the primary ctor var caseName = TestContext.CurrentContext.Test.Properties.Get("caseName"); var expected = Helpers.GetExpectedFromFile($"{caseName},{_hasKeyAuth},{_hasOAuth2},{ctorIndex}", method, filePath); @@ -910,6 +1189,23 @@ private void ValidateSecondaryConstructor( Assert.IsTrue(primaryConstructors.Any(pc => pc.Signature.Parameters.Count == initializer?.Arguments.Count)); } + private static bool IsSettingsConstructor(ConstructorProvider c) => + c.Signature?.Initializer != null && + c.Signature?.Modifiers == MethodSignatureModifiers.Public && + c.Signature.Parameters.Any(p => p.Name == "settings"); + + /// + /// Identifies the public primary pass-through constructor (calls the internal implementation constructor). + /// It is the public constructor that has both an endpoint parameter AND an options parameter. + /// Secondary constructors never have both endpoint and options (they have a subset). + /// + private static bool IsPrimaryPassThroughConstructor(ConstructorProvider c) => + c.Signature?.Initializer != null && + c.Signature?.Modifiers == MethodSignatureModifiers.Public && + !IsSettingsConstructor(c) && + c.Signature.Parameters.Any(p => p.Name == KnownParameters.Endpoint.Name) && + c.Signature.Parameters.Any(p => p.Name == "options"); + [TestCaseSource(nameof(EndpointParamInitializationValueTestCases))] public void EndpointInitializationValue(InputParameter endpointParameter, ValueExpression? expectedValue) { @@ -919,7 +1215,7 @@ public void EndpointInitializationValue(InputParameter endpointParameter, ValueE Assert.IsNotNull(clientProvider); // find the endpoint parameter from the primary constructor var primaryConstructor = clientProvider.Constructors.FirstOrDefault( - c => c.Signature?.Initializer == null && c.Signature?.Modifiers == MethodSignatureModifiers.Public); + c => c.Signature?.Initializer == null && c.Signature?.Modifiers == MethodSignatureModifiers.Internal); var endpoint = primaryConstructor?.Signature?.Parameters?.FirstOrDefault(p => p.Name == KnownParameters.Endpoint.Name); Assert.IsNotNull(endpoint); @@ -940,7 +1236,7 @@ public void TestGetClientOptions(bool isSubClient) parentClient = InputFactory.Client("parent"); } - var client = InputFactory.Client(TestClientName, parent: parentClient); + var client = InputFactory.Client(TestClientName, parent: parentClient, initializedBy: isSubClient ? InputClientInitializedBy.Parent : InputClientInitializedBy.Individually); var clientProvider = new ClientProvider(client); Assert.IsNotNull(clientProvider); @@ -1008,6 +1304,61 @@ public void ValidateQueryParamDiff() Assert.AreEqual(2, methods.Where(m => m.Signature.Parameters.Any(p => p.Name == "queryParam" && p.Type.IsFrameworkType && p.Type.FrameworkType == typeof(string))).Count()); } + // Validates that when generateConvenienceMethod is false (i.e. @convenientAPI(false)), + [Test] + public void ValidateEnumQueryParamWithoutConvenienceMethod() + { + MockHelpers.LoadMockGenerator(); + + var enumType = InputFactory.StringEnum( + "InputEnum", + [("value1", "value1"), ("value2", "value2")], + usage: InputModelTypeUsage.Input, + isExtensible: true); + var inputClient = InputFactory.Client( + TestClientName, + methods: + [ + InputFactory.BasicServiceMethod( + "test", + InputFactory.Operation( + "Operation", + parameters: + [ + InputFactory.QueryParameter( + "queryParam", + enumType, + isRequired: true) + ], + generateConvenienceMethod: false), + parameters: + [ + InputFactory.MethodParameter( + "queryParam", + enumType, + isRequired: true, + location: InputRequestLocation.Query) + ]) + ]); + + var clientProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(inputClient); + Assert.IsNotNull(clientProvider); + var methods = clientProvider!.Methods; + + // only protocol methods (sync + async), no convenience methods + Assert.AreEqual(2, methods.Count); + Assert.IsTrue(methods.All(m => m is ScmMethodProvider)); + + Assert.AreEqual(2, methods.Where(m => m.Signature.Parameters.Any( + p => p.Name == "queryParam" && p.Type.IsFrameworkType && p.Type.FrameworkType == typeof(string))).Count()); + + Assert.AreEqual(0, methods.Where(m => m.Signature.Parameters.Any( + p => p.Name == "queryParam" && p.Type.Name == "InputEnum")).Count()); + + var enumProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateEnum(enumType); + Assert.IsNotNull(enumProvider); + } + [TestCase(true)] [TestCase(false)] public void ValidateQueryParamWriterDiff(bool isAsync) @@ -1181,7 +1532,7 @@ public void TestApiVersionOfClient() /* verify the apiVersion assignment in constructor body */ var primaryConstructor = clientProvider.Constructors.FirstOrDefault( - c => c.Signature?.Initializer == null && c.Signature?.Modifiers == MethodSignatureModifiers.Public); + c => c.Signature?.Initializer == null && c.Signature?.Modifiers == MethodSignatureModifiers.Internal); Assert.IsNotNull(primaryConstructor); var bodyStatements = primaryConstructor?.BodyStatements as MethodBodyStatements; Assert.IsNotNull(bodyStatements); @@ -1218,7 +1569,7 @@ public void TestApiVersionPathParameterOfClient(InputClient inputClient) /* verify the apiVersion assignment in constructor body */ var primaryConstructor = clientProvider.Constructors.FirstOrDefault( - c => c.Signature?.Initializer == null && c.Signature?.Modifiers == MethodSignatureModifiers.Public); + c => c.Signature?.Initializer == null && c.Signature?.Modifiers == MethodSignatureModifiers.Internal); Assert.IsNotNull(primaryConstructor); var bodyStatements = primaryConstructor?.BodyStatements as MethodBodyStatements; Assert.IsNotNull(bodyStatements); @@ -1231,13 +1582,14 @@ public void TestApiVersionPathParameterOfClient(InputClient inputClient) } [Test] - public void SubClientFieldsAreStoredOnRootClient() + public void ApiVersionFieldIsStoredOnRootClient() { var rootClient = InputFactory.Client( "RootClient"); var subClient = InputFactory.Client( "SubClient", parent: rootClient, + initializedBy: InputClientInitializedBy.Parent, parameters: [ InputFactory.PathParameter("apiVersion", InputPrimitiveType.String, isRequired: true, scope: InputParameterScope.Client, isApiVersion: true), @@ -1249,7 +1601,8 @@ public void SubClientFieldsAreStoredOnRootClient() var rootClientProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(rootClient); Assert.IsNotNull(rootClientProvider); Assert.IsTrue(rootClientProvider!.Fields.Any(f => f.Name.Equals("_apiVersion"))); - Assert.IsTrue(rootClientProvider.Fields.Any(f => f.Name.Equals("_someOtherParameter"))); + // Other subclient parameters are not hoisted + Assert.IsFalse(rootClientProvider.Fields.Any(f => f.Name.Equals("_someOtherParameter"))); } [TestCase] @@ -1391,7 +1744,7 @@ public void EndpointFieldAssignedFromUriParameter() isEndpoint: true)]); var clientProvider = new ClientProvider(client); var constructor = clientProvider.Constructors.FirstOrDefault( - c => c.Signature.Initializer == null && c.Signature?.Modifiers == MethodSignatureModifiers.Public); + c => c.Signature.Initializer == null && c.Signature?.Modifiers == MethodSignatureModifiers.Internal); StringAssert.Contains("_endpoint = endpoint;", constructor?.BodyStatements?.ToDisplayString()); } @@ -1412,7 +1765,7 @@ public void EndpointFieldAssignedFromStringParameter(string serverTemplate, stri isEndpoint: true)]); var clientProvider = new ClientProvider(client); var constructor = clientProvider.Constructors.FirstOrDefault( - c => c.Signature.Initializer == null && c.Signature?.Modifiers == MethodSignatureModifiers.Public); + c => c.Signature.Initializer == null && c.Signature?.Modifiers == MethodSignatureModifiers.Internal); StringAssert.Contains($"_endpoint = new global::System.Uri($\"{serverTemplate}\");", constructor?.BodyStatements?.ToDisplayString()); } @@ -2751,6 +3104,46 @@ public async Task BackCompatibility_ExactMatchWithCompatibleOverload() } } + [Test] + public async Task BackCompatibility_DuplicateMethodSignatureDoesNotThrow() + { + var bodyParam1 = InputFactory.BodyParameter("param1", InputPrimitiveType.String, isRequired: true); + var bodyParam2 = InputFactory.BodyParameter("param1", InputPrimitiveType.Int32, isRequired: true); + + var operation1 = InputFactory.Operation( + "TestMethod", + parameters: [bodyParam1]); + var operation2 = InputFactory.Operation( + "TestMethod", + parameters: [bodyParam2]); + + List methodParameters1 = + [ + InputFactory.MethodParameter("param1", InputPrimitiveType.String, location: InputRequestLocation.Body, isRequired: true), + ]; + List methodParameters2 = + [ + InputFactory.MethodParameter("param1", InputPrimitiveType.Int32, location: InputRequestLocation.Body, isRequired: true), + ]; + + var method1 = InputFactory.BasicServiceMethod("TestMethod", operation1, parameters: methodParameters1); + var method2 = InputFactory.BasicServiceMethod("TestMethod", operation2, parameters: methodParameters2); + var client = InputFactory.Client(TestClientName, methods: [method1, method2]); + + var generator = await MockHelpers.LoadMockGeneratorAsync( + clients: () => [client], + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var clientProvider = generator.Object.OutputLibrary.TypeProviders.OfType().FirstOrDefault(); + Assert.IsNotNull(clientProvider); + Assert.IsNotNull(clientProvider!.LastContractView); + + // Use reflection to invoke internal ProcessTypeForBackCompatibility method + // This should not throw even when there are duplicate method signatures + var processMethod = typeof(ClientProvider).GetMethod("ProcessTypeForBackCompatibility", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance); + Assert.DoesNotThrow(() => processMethod?.Invoke(clientProvider, null)); + } + [Test] public void ServerTemplateWithBasePathOnly_DoesNotDuplicateBasePath() { @@ -2952,8 +3345,8 @@ public void MultiServiceClient_GeneratesExpectedClient() scope: InputParameterScope.Client); var client = InputFactory.Client(TestClientName, parameters: [subscriptionIdParameter, apiVersionParameter], isMultiServiceClient: true); - var serviceAClient = InputFactory.Client("ServiceA", clientNamespace: "Sample.ServiceA", parent: client, parameters: [apiVersionParameter, subscriptionIdParameter]); - var serviceBClient = InputFactory.Client("ServiceB", clientNamespace: "Sample.ServiceB", parent: client, parameters: [apiVersionParameter, subscriptionIdParameter]); + var serviceAClient = InputFactory.Client("ServiceA", clientNamespace: "Sample.ServiceA", parent: client, initializedBy: InputClientInitializedBy.Parent, parameters: [apiVersionParameter, subscriptionIdParameter]); + var serviceBClient = InputFactory.Client("ServiceB", clientNamespace: "Sample.ServiceB", parent: client, initializedBy: InputClientInitializedBy.Parent, parameters: [apiVersionParameter, subscriptionIdParameter]); MockHelpers.LoadMockGenerator( apiVersions: () => [.. serviceAVersions, .. serviceBVersions], @@ -3012,9 +3405,9 @@ public void MultiServiceClient_WithThreeServices_GeneratesExpectedClient() scope: InputParameterScope.Client); var client = InputFactory.Client(TestClientName, parameters: [subscriptionIdParameter, apiVersionParameter], isMultiServiceClient: true); - var keyVaultClient = InputFactory.Client("KeyVault", clientNamespace: "Sample.KeyVault", parent: client, parameters: [apiVersionParameter, subscriptionIdParameter]); - var storageClient = InputFactory.Client("Storage", clientNamespace: "Sample.Storage", parent: client, parameters: [apiVersionParameter, subscriptionIdParameter]); - var computeClient = InputFactory.Client("Compute", clientNamespace: "Sample.Compute", parent: client, parameters: [apiVersionParameter, subscriptionIdParameter]); + var keyVaultClient = InputFactory.Client("KeyVault", clientNamespace: "Sample.KeyVault", parent: client, initializedBy: InputClientInitializedBy.Parent, parameters: [apiVersionParameter, subscriptionIdParameter]); + var storageClient = InputFactory.Client("Storage", clientNamespace: "Sample.Storage", parent: client, initializedBy: InputClientInitializedBy.Parent, parameters: [apiVersionParameter, subscriptionIdParameter]); + var computeClient = InputFactory.Client("Compute", clientNamespace: "Sample.Compute", parent: client, initializedBy: InputClientInitializedBy.Parent, parameters: [apiVersionParameter, subscriptionIdParameter]); MockHelpers.LoadMockGenerator( apiVersions: () => [.. keyVaultVersions, .. storageVersions, .. computeVersions], @@ -3427,5 +3820,366 @@ public void GetApiVersionFieldForService_MultiService_CaseInsensitiveMatch() Assert.IsNotNull(fieldUpperCase); Assert.AreEqual("_serviceAApiVersion", fieldUpperCase!.Name); } + + [Test] + public void GetApiVersionFieldForService_MultiService_SameLastSegment_ProducesUniqueFields() + { + // Regression test: when two services have different full namespaces but the same last + // segment, using only the last segment would produce duplicate field names. The fix + // uses the full namespace to guarantee uniqueness. + List serviceOneVersions = ["1.0", "2.0"]; + List serviceTwoVersions = ["3.0", "4.0"]; + + var serviceOneEnumValues = serviceOneVersions.Select(a => (a, a)); + var serviceTwoEnumValues = serviceTwoVersions.Select(a => (a, a)); + + // Different full namespaces, same last segment ("Tests") — would collide with last-segment-only naming + var serviceOneEnum = InputFactory.StringEnum( + "ServiceOneVersions", + serviceOneEnumValues, + usage: InputModelTypeUsage.ApiVersionEnum, + clientNamespace: "Azure.ServiceOne.Tests"); + var serviceTwoEnum = InputFactory.StringEnum( + "ServiceTwoVersions", + serviceTwoEnumValues, + usage: InputModelTypeUsage.ApiVersionEnum, + clientNamespace: "Azure.ServiceTwo.Tests"); + + InputParameter apiVersionParameter = InputFactory.QueryParameter( + "apiVersion", + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client, + isApiVersion: true); + + var serviceOneOperation = InputFactory.Operation( + "ServiceOneOperation", + parameters: [apiVersionParameter], + ns: "Azure.ServiceOne.Tests"); + + var serviceTwoOperation = InputFactory.Operation( + "ServiceTwoOperation", + parameters: [apiVersionParameter], + ns: "Azure.ServiceTwo.Tests"); + + var client = InputFactory.Client( + TestClientName, + methods: + [ + InputFactory.BasicServiceMethod("ServiceOneMethod", serviceOneOperation), + InputFactory.BasicServiceMethod("ServiceTwoMethod", serviceTwoOperation) + ], + parameters: [apiVersionParameter], + isMultiServiceClient: true); + + MockHelpers.LoadMockGenerator( + apiVersions: () => [.. serviceOneVersions, .. serviceTwoVersions], + clients: () => [client], + inputEnums: () => [serviceOneEnum, serviceTwoEnum]); + + var clientProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(client); + Assert.IsNotNull(clientProvider); + + // This should not crash — previously it threw due to duplicate field names + Assert.DoesNotThrow(() => _ = clientProvider!.Fields); + + // Verify we have two distinct api version fields using the shortest unique namespace suffix + var apiVersionFields = clientProvider!.Fields + .Where(f => f.Name.Contains("ApiVersion", StringComparison.OrdinalIgnoreCase)) + .OrderBy(f => f.Name) + .ToList(); + Assert.AreEqual(2, apiVersionFields.Count); + Assert.AreNotEqual(apiVersionFields[0].Name, apiVersionFields[1].Name); + + // Shortest unique suffix: "ServiceOne.Tests" → "ServiceOneTests" + Assert.AreEqual("_serviceOneTestsApiVersion", apiVersionFields[0].Name); + Assert.AreEqual("_serviceTwoTestsApiVersion", apiVersionFields[1].Name); + } + + [TestCase("{endpoint}")] + [TestCase("{Endpoint}")] + [TestCase("{ENDPOINT}")] + public void ConvertUriTemplate_CaseInsensitiveEndpointLookup(string serverTemplate) + { + // Tests that the parameter lookup in ConvertUriTemplateToFormattableString is case-insensitive + MockHelpers.LoadMockGenerator(); + var client = InputFactory.Client( + TestClientName, + parameters: [InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client, + serverUrlTemplate: serverTemplate, + isEndpoint: true)]); + var clientProvider = new ClientProvider(client); + var constructor = clientProvider.Constructors.FirstOrDefault( + c => c.Signature.Initializer == null && c.Signature?.Modifiers == MethodSignatureModifiers.Internal); + + Assert.IsNotNull(constructor); + // Should not throw and should contain the Uri assignment + var bodyText = constructor!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyText.Contains("_endpoint = new global::System.Uri($\"")); + } + + [Test] + public void ConvertUriTemplate_CaseInsensitivePathParameterLookup() + { + // Tests template with mixed case placeholders like "{Endpoint}/services/{ApiVersion}" + MockHelpers.LoadMockGenerator(); + + var serverTemplate = "{Endpoint}/{ApiVersion}"; + var client = InputFactory.Client( + TestClientName, + methods: [InputFactory.BasicServiceMethod("Test", InputFactory.Operation("test", uri: serverTemplate))], + parameters: [ + InputFactory.EndpointParameter( + "endpoint", // lowercase parameter name + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client, + serverUrlTemplate: serverTemplate, + isEndpoint: true), + InputFactory.PathParameter( + "apiVersion", // lowercase parameter name + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client) + ]); + var clientProvider = new ClientProvider(client); + var constructor = clientProvider.Constructors.FirstOrDefault( + c => c.Signature.Initializer == null && c.Signature?.Modifiers == MethodSignatureModifiers.Internal); + + Assert.IsNotNull(constructor); + // Should not throw - case-insensitive lookup should find parameters + var bodyText = constructor!.BodyStatements!.ToDisplayString(); + Assert.IsNotNull(bodyText); + // Verify that the Uri is built according to the server template with case-insensitive parameter matching + Assert.IsTrue(bodyText.Contains("$\"{endpoint}/{_apiVersion}\"")); + } + + [Test] + public void ConvertUriTemplate_WithMultiplePlaceholders() + { + // Tests template with multiple placeholders: "{endpoint}/{apiVersion}/services/{subscriptionId}" + MockHelpers.LoadMockGenerator(); + + var serverTemplate = "{endpoint}/{apiVersion}/services/{subscriptionId}"; + var client = InputFactory.Client( + TestClientName, + methods: [InputFactory.BasicServiceMethod("Test", InputFactory.Operation("test", uri: serverTemplate))], + parameters: [ + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client, + serverUrlTemplate: serverTemplate, + isEndpoint: true), + InputFactory.PathParameter( + "apiVersion", + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client), + InputFactory.PathParameter( + "subscriptionId", + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client) + ]); + var clientProvider = new ClientProvider(client); + var constructor = clientProvider.Constructors.FirstOrDefault( + c => c.Signature.Initializer == null && c.Signature?.Modifiers == MethodSignatureModifiers.Internal); + + Assert.IsNotNull(constructor); + var bodyText = constructor!.BodyStatements!.ToDisplayString(); + Assert.IsNotNull(bodyText); + // Verify that the Uri is built according to the server template + Assert.IsTrue(bodyText.Contains("$\"{endpoint}/{_apiVersion}/services/{_subscriptionId}\"")); + } + + [Test] + public void TestParamAlias_ClientConstructorDoesNotDuplicateAliasedParameter() + { + // A client parameter "blob" with paramAlias "blobName" should not produce + // a duplicate field when the operation also declares "blobName" as client-scoped. + var clientParam = InputFactory.MethodParameter( + "blob", + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client, + paramAlias: "blobName"); + + var operationParam = InputFactory.PathParameter( + "blobName", + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client); + + var operation = InputFactory.Operation("Upload", parameters: [operationParam]); + var client = InputFactory.Client( + TestClientName, + methods: [InputFactory.BasicServiceMethod("Upload", operation)], + parameters: [ + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + clientParam]); + + var clientProvider = new ClientProvider(client); + + Assert.IsNotNull(clientProvider); + + // Should have exactly one field for the blob/blobName parameter (not two) + var blobFields = clientProvider.Fields.Where(f => f.Name == "_blob" || f.Name == "_blobName").ToList(); + Assert.AreEqual(1, blobFields.Count, + $"Expected 1 field but found {blobFields.Count}: {string.Join(", ", blobFields.Select(f => f.Name))}"); + Assert.AreEqual("_blob", blobFields[0].Name); + + // ClientParameters should contain only the "blob" parameter + var blobParams = clientProvider.ClientParameters.Where( + p => p.Name == "blob" || p.Name == "blobName").ToList(); + Assert.AreEqual(1, blobParams.Count, + $"Expected 1 client parameter but found {blobParams.Count}: {string.Join(", ", blobParams.Select(p => p.Name))}"); + Assert.AreEqual("blob", blobParams[0].Name); + } + + [Test] + public void TestParamAlias_ClientConstructorKeepsBothWhenNoAlias() + { + // Without paramAlias, a client parameter "blob" and operation parameter "blobName" + // should both appear since they have different names. + var clientParam = InputFactory.MethodParameter( + "blob", + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client); + + var operationParam = InputFactory.PathParameter( + "blobName", + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client); + + var operation = InputFactory.Operation("Upload", parameters: [operationParam]); + var client = InputFactory.Client( + TestClientName, + methods: [InputFactory.BasicServiceMethod("Upload", operation)], + parameters: [ + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + clientParam]); + + var clientProvider = new ClientProvider(client); + + Assert.IsNotNull(clientProvider); + + // Without alias, both fields should exist + var blobFields = clientProvider.Fields.Where(f => f.Name == "_blob" || f.Name == "_blobName").ToList(); + Assert.AreEqual(2, blobFields.Count, + $"Expected 2 fields but found {blobFields.Count}: {string.Join(", ", blobFields.Select(f => f.Name))}"); + } + + [Test] + public void TestParamAlias_MatchingNamesWithoutAliasDeduplicate() + { + // When the client parameter and operation parameter share the same name, + // deduplication occurs by name even without paramAlias. + var clientParam = InputFactory.MethodParameter( + "blobName", + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client); + + var operationParam = InputFactory.PathParameter( + "blobName", + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client); + + var operation = InputFactory.Operation("Upload", parameters: [operationParam]); + var client = InputFactory.Client( + TestClientName, + methods: [InputFactory.BasicServiceMethod("Upload", operation)], + parameters: [ + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + clientParam]); + + var clientProvider = new ClientProvider(client); + + Assert.IsNotNull(clientProvider); + + // Same name means they get deduplicated to one field + var blobFields = clientProvider.Fields.Where(f => f.Name == "_blobName").ToList(); + Assert.AreEqual(1, blobFields.Count); + } + + [Test] + public void TestParamAlias_MethodParametersSkipAliasedClientParam() + { + // When a client parameter "blob" is aliased to "blobName" via @paramAlias, + // the generated operation method should NOT have "blobName" as a method parameter + // since it's already on the client. + var clientParam = InputFactory.MethodParameter( + "blob", + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client, + paramAlias: "blobName"); + + var operationParam = InputFactory.PathParameter( + "blobName", + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client); + + var operation = InputFactory.Operation("Upload", parameters: [operationParam]); + var client = InputFactory.Client( + TestClientName, + methods: [InputFactory.BasicServiceMethod("Upload", operation)], + parameters: [ + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + clientParam]); + + var clientProvider = new ClientProvider(client); + + Assert.IsNotNull(clientProvider); + + // Get the generated operation methods (excluding subclient accessors and constructors) + var operationMethods = clientProvider.Methods + .Where(m => m.Signature?.Name == "Upload" || m.Signature?.Name == "UploadAsync") + .ToList(); + + Assert.IsTrue(operationMethods.Count > 0, "Should have Upload methods"); + + foreach (var method in operationMethods) + { + var paramNames = method.Signature!.Parameters.Select(p => p.Name).ToList(); + Assert.IsFalse(paramNames.Contains("blobName"), + $"Method '{method.Signature.Name}' should not have 'blobName' parameter since it's an aliased client parameter. " + + $"Params: [{string.Join(", ", paramNames)}]"); + Assert.IsFalse(paramNames.Contains("blob"), + $"Method '{method.Signature.Name}' should not have 'blob' parameter since it's a client parameter. " + + $"Params: [{string.Join(", ", paramNames)}]"); + } + } } } + diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/BackCompatibility_DuplicateMethodSignatureDoesNotThrow/TestClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/BackCompatibility_DuplicateMethodSignatureDoesNotThrow/TestClient.cs new file mode 100644 index 00000000000..6536b99b621 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/BackCompatibility_DuplicateMethodSignatureDoesNotThrow/TestClient.cs @@ -0,0 +1,20 @@ +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading.Tasks; + +namespace Sample +{ + public partial class TestClient + { + public virtual ClientResult TestMethod(BinaryContent content, RequestOptions options) + { + throw new NotImplementedException(); + } + + public virtual Task TestMethodAsync(BinaryContent content, RequestOptions options) + { + throw new NotImplementedException(); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceClient_GeneratesExpectedClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceClient_GeneratesExpectedClient.cs index b650c53a695..7aa404c1406 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceClient_GeneratesExpectedClient.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceClient_GeneratesExpectedClient.cs @@ -27,7 +27,7 @@ protected TestClient() { } - public TestClient(global::System.Uri endpoint, string subscriptionId, global::Sample.TestClientOptions options) + internal TestClient(global::System.ClientModel.Primitives.AuthenticationPolicy authenticationPolicy, global::System.Uri endpoint, string subscriptionId, global::Sample.TestClientOptions options) { global::Sample.Argument.AssertNotNull(endpoint, nameof(endpoint)); global::Sample.Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId)); @@ -36,11 +36,22 @@ public TestClient(global::System.Uri endpoint, string subscriptionId, global::Sa _endpoint = endpoint; _subscriptionId = subscriptionId; - Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + if ((authenticationPolicy != null)) + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); + } + else + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + } _serviceAApiVersion = options.ServiceAApiVersion; _serviceBApiVersion = options.ServiceBApiVersion; } + public TestClient(global::System.Uri endpoint, string subscriptionId, global::Sample.TestClientOptions options) : this(null, endpoint, subscriptionId, options) + { + } + public global::System.ClientModel.Primitives.ClientPipeline Pipeline { get; } public virtual global::Sample.ServiceA.ServiceA GetServiceAClient() diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceClient_WithThreeServices_GeneratesExpectedClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceClient_WithThreeServices_GeneratesExpectedClient.cs index ae8e7b8d8ae..f0dc227b3eb 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceClient_WithThreeServices_GeneratesExpectedClient.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceClient_WithThreeServices_GeneratesExpectedClient.cs @@ -15,9 +15,9 @@ public partial class TestClient { private readonly global::System.Uri _endpoint; private readonly string _subscriptionId; - private readonly string _serviceComputeApiVersion; - private readonly string _serviceKeyVaultApiVersion; - private readonly string _serviceStorageApiVersion; + private readonly string _computeApiVersion; + private readonly string _keyVaultApiVersion; + private readonly string _storageApiVersion; private global::Sample.KeyVault.KeyVault _cachedKeyVault; private global::Sample.Storage.Storage _cachedStorage; private global::Sample.Compute.Compute _cachedCompute; @@ -30,7 +30,7 @@ protected TestClient() { } - public TestClient(global::System.Uri endpoint, string subscriptionId, global::Sample.TestClientOptions options) + internal TestClient(global::System.ClientModel.Primitives.AuthenticationPolicy authenticationPolicy, global::System.Uri endpoint, string subscriptionId, global::Sample.TestClientOptions options) { global::Sample.Argument.AssertNotNull(endpoint, nameof(endpoint)); global::Sample.Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId)); @@ -39,27 +39,38 @@ public TestClient(global::System.Uri endpoint, string subscriptionId, global::Sa _endpoint = endpoint; _subscriptionId = subscriptionId; - Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); - _serviceComputeApiVersion = options.ServiceComputeApiVersion; - _serviceKeyVaultApiVersion = options.ServiceKeyVaultApiVersion; - _serviceStorageApiVersion = options.ServiceStorageApiVersion; + if ((authenticationPolicy != null)) + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); + } + else + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + } + _computeApiVersion = options.ComputeApiVersion; + _keyVaultApiVersion = options.KeyVaultApiVersion; + _storageApiVersion = options.StorageApiVersion; + } + + public TestClient(global::System.Uri endpoint, string subscriptionId, global::Sample.TestClientOptions options) : this(null, endpoint, subscriptionId, options) + { } public global::System.ClientModel.Primitives.ClientPipeline Pipeline { get; } public virtual global::Sample.KeyVault.KeyVault GetKeyVaultClient() { - return (global::System.Threading.Volatile.Read(ref _cachedKeyVault) ?? (global::System.Threading.Interlocked.CompareExchange(ref _cachedKeyVault, new global::Sample.KeyVault.KeyVault(Pipeline, _endpoint, _serviceKeyVaultApiVersion, _subscriptionId), null) ?? _cachedKeyVault)); + return (global::System.Threading.Volatile.Read(ref _cachedKeyVault) ?? (global::System.Threading.Interlocked.CompareExchange(ref _cachedKeyVault, new global::Sample.KeyVault.KeyVault(Pipeline, _endpoint, _keyVaultApiVersion, _subscriptionId), null) ?? _cachedKeyVault)); } public virtual global::Sample.Storage.Storage GetStorageClient() { - return (global::System.Threading.Volatile.Read(ref _cachedStorage) ?? (global::System.Threading.Interlocked.CompareExchange(ref _cachedStorage, new global::Sample.Storage.Storage(Pipeline, _endpoint, _serviceStorageApiVersion, _subscriptionId), null) ?? _cachedStorage)); + return (global::System.Threading.Volatile.Read(ref _cachedStorage) ?? (global::System.Threading.Interlocked.CompareExchange(ref _cachedStorage, new global::Sample.Storage.Storage(Pipeline, _endpoint, _storageApiVersion, _subscriptionId), null) ?? _cachedStorage)); } public virtual global::Sample.Compute.Compute GetComputeClient() { - return (global::System.Threading.Volatile.Read(ref _cachedCompute) ?? (global::System.Threading.Interlocked.CompareExchange(ref _cachedCompute, new global::Sample.Compute.Compute(Pipeline, _endpoint, _serviceComputeApiVersion, _subscriptionId), null) ?? _cachedCompute)); + return (global::System.Threading.Volatile.Read(ref _cachedCompute) ?? (global::System.Threading.Interlocked.CompareExchange(ref _cachedCompute, new global::Sample.Compute.Compute(Pipeline, _endpoint, _computeApiVersion, _subscriptionId), null) ?? _cachedCompute)); } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceCombinedClient_GeneratesExpectedClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceCombinedClient_GeneratesExpectedClient.cs index 7ca9e6f204f..56c1c6cf460 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceCombinedClient_GeneratesExpectedClient.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceCombinedClient_GeneratesExpectedClient.cs @@ -24,18 +24,29 @@ protected TestClient() { } - public TestClient(global::System.Uri endpoint, global::Sample.TestClientOptions options) + internal TestClient(global::System.ClientModel.Primitives.AuthenticationPolicy authenticationPolicy, global::System.Uri endpoint, global::Sample.TestClientOptions options) { global::Sample.Argument.AssertNotNull(endpoint, nameof(endpoint)); options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; - Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + if ((authenticationPolicy != null)) + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); + } + else + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + } _serviceAApiVersion = options.ServiceAApiVersion; _serviceBApiVersion = options.ServiceBApiVersion; } + public TestClient(global::System.Uri endpoint, global::Sample.TestClientOptions options) : this(null, endpoint, options) + { + } + public global::System.ClientModel.Primitives.ClientPipeline Pipeline { get; } public virtual global::System.ClientModel.ClientResult ServiceAOperation(global::System.ClientModel.Primitives.RequestOptions options) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceCombinedClient_WithThreeServices_GeneratesExpectedClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceCombinedClient_WithThreeServices_GeneratesExpectedClient.cs index dcb06d16e99..7a3f23c4d82 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceCombinedClient_WithThreeServices_GeneratesExpectedClient.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceCombinedClient_WithThreeServices_GeneratesExpectedClient.cs @@ -13,9 +13,9 @@ namespace Sample public partial class TestClient { private readonly global::System.Uri _endpoint; - private readonly string _serviceComputeApiVersion; - private readonly string _serviceKeyVaultApiVersion; - private readonly string _serviceStorageApiVersion; + private readonly string _computeApiVersion; + private readonly string _keyVaultApiVersion; + private readonly string _storageApiVersion; protected TestClient() { @@ -25,17 +25,28 @@ protected TestClient() { } - public TestClient(global::System.Uri endpoint, global::Sample.TestClientOptions options) + internal TestClient(global::System.ClientModel.Primitives.AuthenticationPolicy authenticationPolicy, global::System.Uri endpoint, global::Sample.TestClientOptions options) { global::Sample.Argument.AssertNotNull(endpoint, nameof(endpoint)); options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; - Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); - _serviceComputeApiVersion = options.ServiceComputeApiVersion; - _serviceKeyVaultApiVersion = options.ServiceKeyVaultApiVersion; - _serviceStorageApiVersion = options.ServiceStorageApiVersion; + if ((authenticationPolicy != null)) + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); + } + else + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + } + _computeApiVersion = options.ComputeApiVersion; + _keyVaultApiVersion = options.KeyVaultApiVersion; + _storageApiVersion = options.StorageApiVersion; + } + + public TestClient(global::System.Uri endpoint, global::Sample.TestClientOptions options) : this(null, endpoint, options) + { } public global::System.ClientModel.Primitives.ClientPipeline Pipeline { get; } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,False,False,0).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,False,False,0).cs index bc5bbc28eac..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,False,False,0).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,False,False,0).cs @@ -3,4 +3,11 @@ options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,False,True,0).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,False,True,0).cs index 4bfcac8a646..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,False,True,0).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,False,True,0).cs @@ -1,8 +1,13 @@ global::Sample.Argument.AssertNotNull(endpoint, nameof(endpoint)); -global::Sample.Argument.AssertNotNull(tokenProvider, nameof(tokenProvider)); options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -_tokenProvider = tokenProvider; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), new global::System.ClientModel.Primitives.BearerTokenPolicy(_tokenProvider, _flows) }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,False,0).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,False,0).cs index da28a866fe6..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,False,0).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,False,0).cs @@ -1,8 +1,13 @@ global::Sample.Argument.AssertNotNull(endpoint, nameof(endpoint)); -global::Sample.Argument.AssertNotNull(credential, nameof(credential)); options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -_keyCredential = credential; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), global::System.ClientModel.Primitives.ApiKeyAuthenticationPolicy.CreateHeaderApiKeyPolicy(_keyCredential, AuthorizationHeader) }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,True,0).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,True,0).cs index da28a866fe6..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,True,0).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,True,0).cs @@ -1,8 +1,13 @@ global::Sample.Argument.AssertNotNull(endpoint, nameof(endpoint)); -global::Sample.Argument.AssertNotNull(credential, nameof(credential)); options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -_keyCredential = credential; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), global::System.ClientModel.Primitives.ApiKeyAuthenticationPolicy.CreateHeaderApiKeyPolicy(_keyCredential, AuthorizationHeader) }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,True,1).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,True,1).cs index 4bfcac8a646..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,True,1).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,True,1).cs @@ -1,8 +1,13 @@ global::Sample.Argument.AssertNotNull(endpoint, nameof(endpoint)); -global::Sample.Argument.AssertNotNull(tokenProvider, nameof(tokenProvider)); options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -_tokenProvider = tokenProvider; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), new global::System.ClientModel.Primitives.BearerTokenPolicy(_tokenProvider, _flows) }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,False,False,0).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,False,False,0).cs index bc5bbc28eac..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,False,False,0).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,False,False,0).cs @@ -3,4 +3,11 @@ options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,False,True,0).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,False,True,0).cs index 4bfcac8a646..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,False,True,0).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,False,True,0).cs @@ -1,8 +1,13 @@ global::Sample.Argument.AssertNotNull(endpoint, nameof(endpoint)); -global::Sample.Argument.AssertNotNull(tokenProvider, nameof(tokenProvider)); options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -_tokenProvider = tokenProvider; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), new global::System.ClientModel.Primitives.BearerTokenPolicy(_tokenProvider, _flows) }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,False,0).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,False,0).cs index da28a866fe6..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,False,0).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,False,0).cs @@ -1,8 +1,13 @@ global::Sample.Argument.AssertNotNull(endpoint, nameof(endpoint)); -global::Sample.Argument.AssertNotNull(credential, nameof(credential)); options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -_keyCredential = credential; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), global::System.ClientModel.Primitives.ApiKeyAuthenticationPolicy.CreateHeaderApiKeyPolicy(_keyCredential, AuthorizationHeader) }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,True,0).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,True,0).cs index da28a866fe6..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,True,0).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,True,0).cs @@ -1,8 +1,13 @@ global::Sample.Argument.AssertNotNull(endpoint, nameof(endpoint)); -global::Sample.Argument.AssertNotNull(credential, nameof(credential)); options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -_keyCredential = credential; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), global::System.ClientModel.Primitives.ApiKeyAuthenticationPolicy.CreateHeaderApiKeyPolicy(_keyCredential, AuthorizationHeader) }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,True,1).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,True,1).cs index 4bfcac8a646..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,True,1).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,True,1).cs @@ -1,8 +1,13 @@ global::Sample.Argument.AssertNotNull(endpoint, nameof(endpoint)); -global::Sample.Argument.AssertNotNull(tokenProvider, nameof(tokenProvider)); options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -_tokenProvider = tokenProvider; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), new global::System.ClientModel.Primitives.BearerTokenPolicy(_tokenProvider, _flows) }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/ValidateConstructorsWhenUnsupportedAuth.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/ValidateConstructorsWhenUnsupportedAuth.cs index 67b3361362f..89829df5a76 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/ValidateConstructorsWhenUnsupportedAuth.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/ValidateConstructorsWhenUnsupportedAuth.cs @@ -13,12 +13,25 @@ public partial class TestClient { } - internal TestClient(global::System.Uri endpoint, global::Sample.TestClientOptions options) + internal TestClient(global::System.ClientModel.Primitives.AuthenticationPolicy authenticationPolicy, global::System.Uri endpoint, global::Sample.TestClientOptions options) { + global::Sample.Argument.AssertNotNull(endpoint, nameof(endpoint)); + options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; - Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + if ((authenticationPolicy != null)) + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); + } + else + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + } + } + + internal TestClient(global::System.Uri endpoint, global::Sample.TestClientOptions options) : this(null, endpoint, options) + { } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/XmlDocsAreWritten.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/XmlDocsAreWritten.cs index 31e104ce003..7166e071f8c 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/XmlDocsAreWritten.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/XmlDocsAreWritten.cs @@ -1,4 +1,4 @@ -// +// #nullable disable @@ -31,12 +31,11 @@ protected TestClient() } /// Initializes a new instance of TestClient. + /// The authentication policy to use for pipeline creation. /// Service endpoint. /// queryParam description. /// The options for configuring the client. - /// or is null. - /// is an empty string, and was expected to be non-empty. - public TestClient(global::System.Uri endpoint, string queryParam, global::Sample.TestClientOptions options) + internal TestClient(global::System.ClientModel.Primitives.AuthenticationPolicy authenticationPolicy, global::System.Uri endpoint, string queryParam, global::Sample.TestClientOptions options) { global::Sample.Argument.AssertNotNull(endpoint, nameof(endpoint)); global::Sample.Argument.AssertNotNullOrEmpty(queryParam, nameof(queryParam)); @@ -45,7 +44,24 @@ public TestClient(global::System.Uri endpoint, string queryParam, global::Sample _endpoint = endpoint; _queryParam = queryParam; - Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + if ((authenticationPolicy != null)) + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); + } + else + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + } + } + + /// Initializes a new instance of TestClient. + /// Service endpoint. + /// queryParam description. + /// The options for configuring the client. + /// or is null. + /// is an empty string, and was expected to be non-empty. + public TestClient(global::System.Uri endpoint, string queryParam, global::Sample.TestClientOptions options) : this(null, endpoint, queryParam, options) + { } /// The HTTP pipeline for sending and receiving REST requests and responses. diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientSettingsProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientSettingsProviderTests.cs new file mode 100644 index 00000000000..d5c35c7676c --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientSettingsProviderTests.cs @@ -0,0 +1,1091 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Threading.Tasks; +using Microsoft.TypeSpec.Generator.ClientModel.Providers; +using Microsoft.TypeSpec.Generator.Input; +using Microsoft.TypeSpec.Generator.Primitives; +using Microsoft.TypeSpec.Generator.Providers; +using Microsoft.TypeSpec.Generator.Statements; +using Microsoft.TypeSpec.Generator.Tests.Common; +using NUnit.Framework; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Tests.Providers +{ + public class ClientSettingsProviderTests + { + [SetUp] + public void SetUp() + { + MockHelpers.LoadMockGenerator(); + } + + [Test] + public void TestName() + { + var client = InputFactory.Client("TestClient"); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + Assert.AreEqual("TestClientSettings", settingsProvider!.Name); + } + + [Test] + public void TestBaseType() + { + var client = InputFactory.Client("TestClient"); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + Assert.AreEqual(ClientSettingsProvider.ClientSettingsType, settingsProvider!.Type.BaseType); + } + + [Test] + public void TestGeneratedSettings_WithStringEndpoint() + { + var inputParameters = new[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true) + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + + // Validate Endpoint property is string? (not Uri?) + var properties = settingsProvider!.Properties; + var endpointProp = properties.FirstOrDefault(p => p.Name == "Endpoint" && p.Type.Equals(new CSharpType(typeof(string), isNullable: true))); + Assert.IsNotNull(endpointProp, "Settings should have an Endpoint property of type string?"); + + var optionsProp = properties.FirstOrDefault(p => p.Name == "Options"); + Assert.IsNotNull(optionsProp, "Settings should have an Options property"); + + // Validate BindCore method + var bindCoreMethod = settingsProvider.Methods.FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod, "Settings should have a BindCore method"); + Assert.AreEqual( + MethodSignatureModifiers.Protected | MethodSignatureModifiers.Override, + bindCoreMethod!.Signature.Modifiers); + Assert.AreEqual(1, bindCoreMethod.Signature.Parameters.Count); + Assert.AreEqual("section", bindCoreMethod.Signature.Parameters[0].Name); + var bodyString = bindCoreMethod.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("IsNullOrEmpty"), "BindCore should use string.IsNullOrEmpty for string endpoint binding"); + + // Validate full generated output + var writer = new TypeProviderWriter(settingsProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public void TestProperties_NoEndpoint() + { + var client = InputFactory.Client("TestClient"); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + // Settings provider should exist but without endpoint-related properties + Assert.IsNotNull(settingsProvider); + + var endpointProp = settingsProvider!.Properties.FirstOrDefault(p => p.Name == "Endpoint" && p.Type.Equals(new CSharpType(typeof(Uri), isNullable: true))); + Assert.IsNull(endpointProp, "Settings should not have an Endpoint property when no endpoint parameter exists"); + } + + [Test] + public void TestGeneratedSettings_WithUrlEndpoint() + { + var inputParameters = new[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.Url, + scope: InputParameterScope.Client, + isEndpoint: true) + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + + // Validate Endpoint property is Uri? + var properties = settingsProvider!.Properties; + var endpointProp = properties.FirstOrDefault(p => p.Name == "Endpoint" && p.Type.Equals(new CSharpType(typeof(Uri), isNullable: true))); + Assert.IsNotNull(endpointProp, "Settings should have an Endpoint property of type Uri?"); + + // Validate BindCore uses Uri.TryCreate + var bindCoreMethod = settingsProvider.Methods.FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod); + var bodyString = bindCoreMethod!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("TryCreate"), "BindCore should use Uri.TryCreate for Uri endpoint binding"); + + // Validate full generated output + var writer = new TypeProviderWriter(settingsProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public void TestBindCoreMethod_WithOptionsSection() + { + var inputParameters = new[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true) + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + + var methods = settingsProvider!.Methods; + var bindCoreMethod = methods.FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod); + + var bodyString = bindCoreMethod!.BodyStatements!.ToDisplayString(); + // Should get the options section and create options from it + Assert.IsTrue(bodyString.Contains("GetSection") && bodyString.Contains("Options"), + "BindCore should get the Options section from configuration"); + } + + [Test] + public void TestBindCoreMethod_WithBoolParam() + { + var inputParameters = new InputParameter[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.MethodParameter( + "enableRetry", + InputPrimitiveType.Boolean, + isRequired: true, + scope: InputParameterScope.Client) + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + + var bindCoreMethod = settingsProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod); + + var bodyString = bindCoreMethod!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("bool.TryParse"), "BindCore should use bool.TryParse for bool parameter binding"); + Assert.IsTrue(bodyString.Contains("EnableRetry"), "BindCore should assign to EnableRetry property"); + } + + [Test] + public void TestBindCoreMethod_WithIntParam() + { + var inputParameters = new InputParameter[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.MethodParameter( + "maxRetries", + InputPrimitiveType.Int32, + isRequired: true, + scope: InputParameterScope.Client) + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + + var bindCoreMethod = settingsProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod); + + var bodyString = bindCoreMethod!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("int.TryParse"), "BindCore should use int.TryParse for int parameter binding"); + Assert.IsTrue(bodyString.Contains("MaxRetries"), "BindCore should assign to MaxRetries property"); + } + + [Test] + public void TestBindCoreMethod_WithStringParam() + { + var inputParameters = new InputParameter[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.MethodParameter( + "tenantId", + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client) + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + + var bindCoreMethod = settingsProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod); + + var bodyString = bindCoreMethod!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("IsNullOrEmpty"), "BindCore should use string.IsNullOrEmpty for string parameter binding"); + Assert.IsTrue(bodyString.Contains("TenantId"), "BindCore should assign to TenantId property"); + } + + [Test] + public void TestProperties_WithMultipleParamTypes() + { + var inputParameters = new InputParameter[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.MethodParameter( + "enableRetry", + InputPrimitiveType.Boolean, + isRequired: true, + scope: InputParameterScope.Client), + InputFactory.MethodParameter( + "maxRetries", + InputPrimitiveType.Int32, + isRequired: true, + scope: InputParameterScope.Client), + InputFactory.MethodParameter( + "tenantId", + InputPrimitiveType.String, + isRequired: true, + scope: InputParameterScope.Client) + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + + var properties = settingsProvider!.Properties; + Assert.IsNotNull(properties.FirstOrDefault(p => p.Name == "Endpoint"), "Settings should have Endpoint property"); + Assert.IsNotNull(properties.FirstOrDefault(p => p.Name == "EnableRetry"), "Settings should have EnableRetry property"); + Assert.IsNotNull(properties.FirstOrDefault(p => p.Name == "MaxRetries"), "Settings should have MaxRetries property"); + Assert.IsNotNull(properties.FirstOrDefault(p => p.Name == "TenantId"), "Settings should have TenantId property"); + Assert.IsNotNull(properties.FirstOrDefault(p => p.Name == "Options"), "Settings should have Options property"); + } + + [Test] + public void TestBindCoreMethod_WithUriParam() + { + var inputParameters = new InputParameter[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.MethodParameter( + "redirectUri", + InputPrimitiveType.Url, + isRequired: true, + scope: InputParameterScope.Client) + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + + var bindCoreMethod = settingsProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod); + + var bodyString = bindCoreMethod!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("Uri.TryCreate"), "BindCore should use Uri.TryCreate for Uri parameter binding"); + Assert.IsTrue(bodyString.Contains("UriKind.Absolute"), "BindCore should use UriKind.Absolute"); + Assert.IsTrue(bodyString.Contains("RedirectUri"), "BindCore should assign to RedirectUri property"); + } + + [Test] + public void TestBindCoreMethod_WithStringListParam() + { + var inputParameters = new InputParameter[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.MethodParameter( + "allowedTenants", + InputFactory.Array(InputPrimitiveType.String), + isRequired: true, + scope: InputParameterScope.Client) + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + + var bindCoreMethod = settingsProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod); + + var bodyString = bindCoreMethod!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("GetSection"), "BindCore should use GetSection for list parameter binding"); + Assert.IsTrue(bodyString.Contains("GetChildren"), "BindCore should use GetChildren for list parameter binding"); + Assert.IsTrue(bodyString.Contains("Where"), "BindCore should use Where to filter null values"); + Assert.IsTrue(bodyString.Contains("is not null"), "BindCore should use 'is not null' pattern in Where filter"); + Assert.IsTrue(bodyString.Contains("Select"), "BindCore should use Select to extract values"); + Assert.IsTrue(bodyString.Contains("ToList"), "BindCore should use ToList to materialize the list"); + } + + [Test] + public void TestBindCoreMethod_WithEnumParam() + { + var enumType = InputFactory.StringEnum( + "AppAudience", + [("Public", "public"), ("Private", "private")], + isExtensible: true); + + MockHelpers.LoadMockGenerator(inputEnums: () => [enumType]); + + var inputParameters = new InputParameter[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.MethodParameter( + "audience", + enumType, + isRequired: true, + scope: InputParameterScope.Client) + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + + var bindCoreMethod = settingsProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod); + + var bodyString = bindCoreMethod!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("is string"), "BindCore should use 'is string' pattern for enum parameter binding"); + Assert.IsTrue(bodyString.Contains("new"), "BindCore should create new enum instance"); + Assert.IsTrue(bodyString.Contains("Audience"), "BindCore should assign to Audience property"); + } + + [Test] + public void TestBindCoreMethod_WithFixedEnumParam() + { + var enumType = InputFactory.StringEnum( + "ClientMode", + [("Default", "default"), ("MultiClient", "multi-client")], + isExtensible: false); + + MockHelpers.LoadMockGenerator(inputEnums: () => [enumType]); + + var inputParameters = new InputParameter[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.MethodParameter( + "mode", + enumType, + isRequired: true, + scope: InputParameterScope.Client) + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + + var bindCoreMethod = settingsProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod); + + var bodyString = bindCoreMethod!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("Enum.TryParse"), "BindCore should use Enum.TryParse for fixed enum parameter binding"); + Assert.IsTrue(bodyString.Contains("Mode"), "BindCore should assign to Mode property"); + Assert.IsFalse(bodyString.Contains("new ClientMode"), "BindCore should NOT use new for fixed enum binding"); + } + + [Test] + public void TestBindCoreMethod_WithTimeSpanParam() + { + var inputParameters = new InputParameter[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.MethodParameter( + "networkTimeout", + InputPrimitiveType.PlainTime, + isRequired: true, + scope: InputParameterScope.Client) + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + + var bindCoreMethod = settingsProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod); + + var bodyString = bindCoreMethod!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("TimeSpan.TryParse"), "BindCore should use TimeSpan.TryParse for TimeSpan parameter binding"); + Assert.IsTrue(bodyString.Contains("NetworkTimeout"), "BindCore should assign to NetworkTimeout property"); + } + + [Test] + public void TestBindCoreMethod_WithComplexObjectParam() + { + var complexModel = InputFactory.Model( + "CustomOptions", + properties: new[] + { + InputFactory.Property("setting1", InputPrimitiveType.String, isRequired: true, wireName: "setting1"), + InputFactory.Property("setting2", InputPrimitiveType.Int32, isRequired: false, wireName: "setting2") + }); + + MockHelpers.LoadMockGenerator(inputModels: () => [complexModel]); + + var inputParameters = new InputParameter[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.MethodParameter( + "customOptions", + complexModel, + isRequired: true, + scope: InputParameterScope.Client) + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + + var bindCoreMethod = settingsProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod); + + var bodyString = bindCoreMethod!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("GetSection"), "BindCore should use GetSection for complex object binding"); + Assert.IsTrue(bodyString.Contains("Exists"), "BindCore should check Exists for complex object binding"); + Assert.IsTrue(bodyString.Contains("CustomOptions") && bodyString.Contains("new"), "BindCore should create new CustomOptions instance for complex object binding"); + } + + [Test] + public void TestBindCoreMethod_WithLongParam() + { + var inputParameters = new InputParameter[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.MethodParameter( + "maxSize", + InputPrimitiveType.Int64, + isRequired: true, + scope: InputParameterScope.Client) + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + + var bindCoreMethod = settingsProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod); + + var bodyString = bindCoreMethod!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("long.TryParse"), "BindCore should use long.TryParse for long parameter binding"); + Assert.IsTrue(bodyString.Contains("MaxSize"), "BindCore should assign to MaxSize property"); + } + + [Test] + public void TestBindCoreMethod_WithFloatParam() + { + var inputParameters = new InputParameter[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.MethodParameter( + "temperature", + InputPrimitiveType.Float32, + isRequired: true, + scope: InputParameterScope.Client) + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + + var bindCoreMethod = settingsProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod); + + var bodyString = bindCoreMethod!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("float.TryParse"), "BindCore should use float.TryParse for float parameter binding"); + Assert.IsTrue(bodyString.Contains("Temperature"), "BindCore should assign to Temperature property"); + } + + [Test] + public void TestBindCoreMethod_WithDoubleParam() + { + var inputParameters = new InputParameter[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true), + InputFactory.MethodParameter( + "precision", + InputPrimitiveType.Float64, + isRequired: true, + scope: InputParameterScope.Client) + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + + var bindCoreMethod = settingsProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod); + + var bodyString = bindCoreMethod!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("double.TryParse"), "BindCore should use double.TryParse for double parameter binding"); + Assert.IsTrue(bodyString.Contains("Precision"), "BindCore should assign to Precision property"); + } + + [Test] + public void TestExperimentalAttribute() + { + var client = InputFactory.Client("TestClient"); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + + var attributes = settingsProvider!.Attributes; + Assert.IsNotNull(attributes); + Assert.IsTrue(attributes.Any(), "Settings should have an Experimental attribute"); + } + + [Test] + public void TestNamespace() + { + var client = InputFactory.Client("TestClient"); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + Assert.AreEqual(clientProvider.Type.Namespace, settingsProvider!.Type.Namespace); + } + + // Sub-client settings tests + + [Test] + public void TestSubClient_IndividuallyInitialized_HasSettings() + { + var endpointParam = InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true); + var parentClient = InputFactory.Client("ParentClient", parameters: [endpointParam]); + var subClient = InputFactory.Client( + "SubClient", + parent: parentClient, + parameters: [endpointParam], + initializedBy: InputClientInitializedBy.Individually); + + MockHelpers.LoadMockGenerator( + auth: () => new(new InputApiKeyAuth("mock", null), null), + clients: () => [parentClient]); + + var clientProvider = new ClientProvider(subClient); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider, "Individually-initialized sub-client should have ClientSettings"); + Assert.AreEqual("SubClientSettings", settingsProvider!.Name); + } + + [Test] + public void TestSubClient_ParentOnly_NoSettings() + { + var parentClient = InputFactory.Client("ParentClient"); + var subClient = InputFactory.Client( + "SubClient", + parent: parentClient, + initializedBy: InputClientInitializedBy.Parent); + + MockHelpers.LoadMockGenerator( + auth: () => new(new InputApiKeyAuth("mock", null), null), + clients: () => [parentClient]); + + var clientProvider = new ClientProvider(subClient); + + Assert.IsNull(clientProvider.ClientSettings, "Parent-only sub-client should not have ClientSettings"); + } + + [Test] + public void TestSubClient_IndividuallyInitialized_HasEndpointProperty() + { + var endpointParam = InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true); + var parentClient = InputFactory.Client("ParentClient", parameters: [endpointParam]); + var subClient = InputFactory.Client( + "SubClient", + parent: parentClient, + parameters: [endpointParam], + initializedBy: InputClientInitializedBy.Individually); + + MockHelpers.LoadMockGenerator( + auth: () => new(new InputApiKeyAuth("mock", null), null), + clients: () => [parentClient]); + + var clientProvider = new ClientProvider(subClient); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + var endpointProp = settingsProvider!.Properties.FirstOrDefault( + p => p.Name == "Endpoint" && p.Type.Equals(new CSharpType(typeof(string), isNullable: true))); + Assert.IsNotNull(endpointProp, "Sub-client settings should have an Endpoint property"); + } + + [Test] + public void TestSubClient_IndividuallyInitialized_HasOptionsFromRootClient() + { + var endpointParam = InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true); + var parentClient = InputFactory.Client("ParentClient", parameters: [endpointParam]); + var subClient = InputFactory.Client( + "SubClient", + parent: parentClient, + parameters: [endpointParam], + initializedBy: InputClientInitializedBy.Individually); + + MockHelpers.LoadMockGenerator( + auth: () => new(new InputApiKeyAuth("mock", null), null), + clients: () => [parentClient]); + + var clientProvider = new ClientProvider(subClient); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + var optionsProp = settingsProvider!.Properties.FirstOrDefault(p => p.Name == "Options"); + Assert.IsNotNull(optionsProp, "Sub-client settings should have Options property from root client"); + + // The Options type should be the parent's ClientOptions type + var parentProvider = new ClientProvider(parentClient); + Assert.IsNotNull(parentProvider.ClientOptions); + Assert.AreEqual( + parentProvider.ClientOptions!.Type.WithNullable(true), + optionsProp!.Type, + "Sub-client settings Options type should match root client's ClientOptions type"); + } + + [Test] + public void TestSubClient_IndividuallyInitialized_BindCoreHasEndpointAndOptions() + { + var endpointParam = InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true); + var parentClient = InputFactory.Client("ParentClient", parameters: [endpointParam]); + var subClient = InputFactory.Client( + "SubClient", + parent: parentClient, + parameters: [endpointParam], + initializedBy: InputClientInitializedBy.Individually); + + MockHelpers.LoadMockGenerator( + auth: () => new(new InputApiKeyAuth("mock", null), null), + clients: () => [parentClient]); + + var clientProvider = new ClientProvider(subClient); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + var bindCoreMethod = settingsProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod, "Sub-client settings should have BindCore method"); + + var bodyString = bindCoreMethod!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("IsNullOrEmpty"), "BindCore should bind the Endpoint via string.IsNullOrEmpty for string endpoint"); + Assert.IsTrue(bodyString.Contains("GetSection") && bodyString.Contains("Options"), + "BindCore should bind the Options section"); + } + + [Test] + public void TestSubClient_IndividuallyInitialized_SettingsBaseType() + { + var endpointParam = InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true); + var parentClient = InputFactory.Client("ParentClient", parameters: [endpointParam]); + var subClient = InputFactory.Client( + "SubClient", + parent: parentClient, + parameters: [endpointParam], + initializedBy: InputClientInitializedBy.Individually); + + MockHelpers.LoadMockGenerator( + auth: () => new(new InputApiKeyAuth("mock", null), null), + clients: () => [parentClient]); + + var clientProvider = new ClientProvider(subClient); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + Assert.AreEqual(ClientSettingsProvider.ClientSettingsType, settingsProvider!.Type.BaseType, + "Sub-client settings should inherit from ClientSettings"); + } + + [Test] + public void TestGeneratedSettings_WithNamedStringEndpoint() + { + var inputParameters = new[] + { + InputFactory.EndpointParameter( + "fullyQualifiedNamespace", + InputPrimitiveType.String, + scope: InputParameterScope.Client, + isEndpoint: true, + serverUrlTemplate: "https://{fullyQualifiedNamespace}") + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + + // Validate FullyQualifiedNamespace property is string? (not Uri?) + var properties = settingsProvider!.Properties; + var endpointProp = properties.FirstOrDefault(p => p.Name == "FullyQualifiedNamespace" && p.Type.Equals(new CSharpType(typeof(string), isNullable: true))); + Assert.IsNotNull(endpointProp, "Settings should have a FullyQualifiedNamespace property of type string?"); + + // Validate full generated output + var writer = new TypeProviderWriter(settingsProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public void TestSettingsConstructor_WithStringEndpoint() + { + var inputParameters = new[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + scope: InputParameterScope.Client, + isEndpoint: true, + serverUrlTemplate: "https://{endpoint}") + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + + var settingsConstructor = clientProvider.Constructors.FirstOrDefault(IsSettingsConstructor); + Assert.IsNotNull(settingsConstructor, "Expected a settings constructor for string endpoint"); + + // Validate the initializer references the settings endpoint property + var initializer = settingsConstructor!.Signature.Initializer; + Assert.IsNotNull(initializer); + Assert.IsFalse(initializer!.IsBase, "Settings constructor should use this() initializer"); + + // The initializer should have arguments for auth policy, endpoint, and options + Assert.IsTrue(initializer.Arguments.Count >= 3, + "Settings constructor initializer should have at least 3 arguments (auth, endpoint, options)"); + + // Validate the endpoint argument references settings?.Endpoint + var endpointArg = initializer.Arguments[1].ToDisplayString(); + Assert.IsTrue(endpointArg.Contains("Endpoint"), + $"Endpoint argument should reference Endpoint property, got: {endpointArg}"); + + // Validate full generated client output + var writer = new TypeProviderWriter(clientProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public void TestSettingsConstructor_WithUrlEndpoint() + { + var inputParameters = new[] + { + InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.Url, + scope: InputParameterScope.Client, + isEndpoint: true) + }; + var client = InputFactory.Client("TestClient", parameters: inputParameters); + var clientProvider = new ClientProvider(client); + + var settingsConstructor = clientProvider.Constructors.FirstOrDefault(IsSettingsConstructor); + Assert.IsNotNull(settingsConstructor, "Expected a settings constructor for URL endpoint"); + + // Validate the initializer references the settings endpoint property + var initializer = settingsConstructor!.Signature.Initializer; + Assert.IsNotNull(initializer); + Assert.IsFalse(initializer!.IsBase, "Settings constructor should use this() initializer"); + + // The initializer should have arguments for auth policy, endpoint, and options + Assert.IsTrue(initializer.Arguments.Count >= 3, + "Settings constructor initializer should have at least 3 arguments (auth, endpoint, options)"); + + // Validate the endpoint argument references settings?.Endpoint + var endpointArg = initializer.Arguments[1].ToDisplayString(); + Assert.IsTrue(endpointArg.Contains("Endpoint"), + $"Endpoint argument should reference Endpoint property, got: {endpointArg}"); + + // Validate full generated client output + var writer = new TypeProviderWriter(clientProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task TestBindCoreMethod_WithCustomStructParam() + { + // A custom struct with a string constructor should use string binding + var singletonField = typeof(ClientOptionsProvider).GetField("_singletonInstance", + BindingFlags.Static | BindingFlags.NonPublic); + singletonField?.SetValue(null, null); + + await MockHelpers.LoadMockGeneratorAsync( + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var typeProvider = CodeModelGenerator.Instance.SourceInputModel + .FindForTypeInCustomization("SampleNamespace", "CustomAudience"); + Assert.IsNotNull(typeProvider, "CustomAudience should be found in custom code"); + + var body = new List(); + var sectionParam = new ParameterProvider( + "section", + $"The configuration section.", + ClientSettingsProvider.IConfigurationSectionType); + + ClientSettingsProvider.AppendBindingForProperty(body, sectionParam, "Audience", "audience", typeProvider!.Type); + + var bodyString = string.Join("\n", body.Select(s => s.ToDisplayString())); + Assert.IsTrue(bodyString.Contains("is string"), + "Should use 'is string' pattern for custom struct with string constructor"); + Assert.IsFalse(bodyString.Contains("GetSection"), + "Should NOT use GetSection for custom struct with string constructor"); + } + + [Test] + public async Task TestBindCoreMethod_WithCustomIntStructParam() + { + // A custom struct with an int constructor should use int.TryParse binding + var singletonField = typeof(ClientOptionsProvider).GetField("_singletonInstance", + BindingFlags.Static | BindingFlags.NonPublic); + singletonField?.SetValue(null, null); + + await MockHelpers.LoadMockGeneratorAsync( + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var typeProvider = CodeModelGenerator.Instance.SourceInputModel + .FindForTypeInCustomization("SampleNamespace", "CustomPriority"); + Assert.IsNotNull(typeProvider, "CustomPriority should be found in custom code"); + + var body = new List(); + var sectionParam = new ParameterProvider( + "section", + $"The configuration section.", + ClientSettingsProvider.IConfigurationSectionType); + + ClientSettingsProvider.AppendBindingForProperty(body, sectionParam, "Priority", "priority", typeProvider!.Type); + + var bodyString = string.Join("\n", body.Select(s => s.ToDisplayString())); + Assert.IsTrue(bodyString.Contains("int.TryParse"), + "Should use int.TryParse for custom struct with int constructor"); + Assert.IsFalse(bodyString.Contains("GetSection"), + "Should NOT use GetSection for custom struct with int constructor"); + } + + [Test] + public async Task TestBindCoreMethod_WithCustomStructParam_FallsBackToComplexObject() + { + // A custom struct with no single-parameter framework-type constructor + // should fall back to complex object binding + var singletonField = typeof(ClientOptionsProvider).GetField("_singletonInstance", + BindingFlags.Static | BindingFlags.NonPublic); + singletonField?.SetValue(null, null); + + await MockHelpers.LoadMockGeneratorAsync( + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var typeProvider = CodeModelGenerator.Instance.SourceInputModel + .FindForTypeInCustomization("SampleNamespace", "CustomComplex"); + Assert.IsNotNull(typeProvider, "CustomComplex should be found in custom code"); + + var body = new List(); + var sectionParam = new ParameterProvider( + "section", + $"The configuration section.", + ClientSettingsProvider.IConfigurationSectionType); + + ClientSettingsProvider.AppendBindingForProperty(body, sectionParam, "Complex", "complex", typeProvider!.Type); + + var bodyString = string.Join("\n", body.Select(s => s.ToDisplayString())); + Assert.IsTrue(bodyString.Contains("GetSection"), + "Should fall back to GetSection for struct with no single-parameter framework-type constructor"); + } + + private static bool IsSettingsConstructor(ConstructorProvider c) => + c.Signature?.Initializer != null && + c.Signature?.Modifiers == MethodSignatureModifiers.Public && + c.Signature.Parameters.Any(p => p.Name == "settings"); + + [Test] + public async Task TestProperties_IncludesCustomConstructorParameters() + { + await MockHelpers.LoadMockGeneratorAsync( + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var client = InputFactory.Client("TestClient", clientNamespace: "SampleNamespace"); + var clientProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(client); + Assert.IsNotNull(clientProvider); + Assert.IsNotNull(clientProvider!.CustomCodeView, + "CustomCodeView should be available from the compilation"); + + var settings = clientProvider.ClientSettings; + Assert.IsNotNull(settings); + + var connectionStringProp = settings!.Properties + .FirstOrDefault(p => p.Name == "ConnectionString"); + Assert.IsNotNull(connectionStringProp, + "Settings should include 'ConnectionString' property from custom constructor parameter"); + } + + [Test] + public async Task TestBindCoreMethod_BindsCustomConstructorParameters() + { + await MockHelpers.LoadMockGeneratorAsync( + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var client = InputFactory.Client("TestClient", clientNamespace: "SampleNamespace"); + var clientProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(client); + Assert.IsNotNull(clientProvider); + + var settings = clientProvider!.ClientSettings; + Assert.IsNotNull(settings); + + var bindCoreMethod = settings!.Methods + .FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod); + + var bodyString = bindCoreMethod!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("ConnectionString"), + "BindCore should bind the custom constructor parameter 'ConnectionString' from configuration"); + } + + [Test] + public async Task TestSettingsType_DoesNotContainSelfReferentialSettingsProperty() + { + await MockHelpers.LoadMockGeneratorAsync( + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var client = InputFactory.Client("TestClient", clientNamespace: "SampleNamespace"); + var clientProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(client); + Assert.IsNotNull(clientProvider); + + var settingsProvider = clientProvider!.ClientSettings; + Assert.IsNotNull(settingsProvider); + + var settingsProperty = settingsProvider!.Properties.FirstOrDefault(p => p.Name == "Settings"); + Assert.IsNull(settingsProperty, + "Settings type should not contain a self-referential 'Settings' property"); + } + + [Test] + public async Task TestBindCoreMethod_DoesNotBindSettingsParameter() + { + await MockHelpers.LoadMockGeneratorAsync( + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var client = InputFactory.Client("TestClient", clientNamespace: "SampleNamespace"); + var clientProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(client); + Assert.IsNotNull(clientProvider); + + var settingsProvider = clientProvider!.ClientSettings; + Assert.IsNotNull(settingsProvider); + + var bindCoreMethod = settingsProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod); + + var bodyString = bindCoreMethod!.BodyStatements!.ToDisplayString(); + Assert.IsFalse(bodyString.Contains("GetSection(\"Settings\")"), + "BindCore should not bind a self-referential Settings section"); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/CollectionResultDefinitionTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/CollectionResultDefinitionTests.cs index b9957e4c6e9..cd8683227d4 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/CollectionResultDefinitionTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/CollectionResultDefinitionTests.cs @@ -165,9 +165,9 @@ public void TestEmptyStringHandlingForStringContinuationToken() var writer = new TypeProviderWriter(collectionResultDefinition!); var file = writer.Write(); - + // Verify the generated code includes empty string check - Assert.IsTrue(file.Content.Contains("string.IsNullOrEmpty"), + Assert.IsTrue(file.Content.Contains("string.IsNullOrEmpty"), "Generated code should check for empty strings in continuation tokens"); } @@ -199,12 +199,87 @@ public void TestEmptyStringHandlingForUriNextLink() var writer = new TypeProviderWriter(collectionResultDefinition!); var file = writer.Write(); - + // Verify the generated code handles URI types correctly (null check is sufficient for Uri type) - Assert.IsTrue(file.Content.Contains("if ((nextPageUri == null))"), + Assert.IsTrue(file.Content.Contains("if ((nextPageUri == null))"), "Generated code should check for null URI"); } + [Test] + public void TestCollectionResultNamesDoNotCollideWhenOperationsAreRenamed() + { + // Two paging operations "list" and "listAll" both get renamed to "GetAll" by CleanOperationNames. + // The CollectionResult names should use OriginalName to avoid collision. + var thingModel = InputFactory.Model("thing", properties: + [ + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true), + ]); + var thingsProperty = InputFactory.Property("things", InputFactory.Array(thingModel)); + var nextProperty = InputFactory.Property("next", InputPrimitiveType.Url); + var pageModel = InputFactory.Model("page", properties: [thingsProperty, nextProperty]); + var response = InputFactory.OperationResponse([200], pageModel); + + var pagingMetadata = InputFactory.NextLinkPagingMetadata(["things"], ["next"], InputResponseLocation.Body); + + // "list" will be renamed to "GetAll", "listAll" will also be renamed to "GetAll" + var listOperation = InputFactory.Operation("list", responses: [response]); + var listAllOperation = InputFactory.Operation("listAll", responses: [response]); + + var listServiceMethod = InputFactory.PagingServiceMethod("list", listOperation, pagingMetadata: pagingMetadata); + var listAllServiceMethod = InputFactory.PagingServiceMethod("listAll", listAllOperation, pagingMetadata: pagingMetadata); + + var client = InputFactory.Client("FooClient", methods: [listServiceMethod, listAllServiceMethod]); + + MockHelpers.LoadMockGenerator(inputModels: () => [thingModel], clients: () => [client]); + + var collectionResults = ScmCodeModelGenerator.Instance.OutputLibrary.TypeProviders + .Where(t => t is CollectionResultDefinition) + .ToList(); + + // Should have 8 CollectionResult types (2 ops × 2 sync/async × 2 typed/untyped) and they should all have unique names + Assert.AreEqual(8, collectionResults.Count, + $"Expected 8 CollectionResult types but found {collectionResults.Count}"); + var collectionResultNames = collectionResults.Select(t => t.Name).ToList(); + Assert.AreEqual(collectionResultNames.Distinct().Count(), collectionResultNames.Count, + $"CollectionResult names should be unique but found duplicates: {string.Join(", ", collectionResultNames)}"); + + // Both should use the original names for disambiguation + Assert.IsTrue(collectionResultNames.Any(n => n == "FooClientListCollectionResult"), + $"Expected 'FooClientListCollectionResult' in [{string.Join(", ", collectionResultNames)}]"); + Assert.IsTrue(collectionResultNames.Any(n => n == "FooClientListAllCollectionResult"), + $"Expected 'FooClientListAllCollectionResult' in [{string.Join(", ", collectionResultNames)}]"); + } + + [Test] + public void TestCollectionResultNameUsesCurrentNameWhenNoCollision() + { + // A single paging operation should use the current (cleaned) name, not the original name. + var thingModel = InputFactory.Model("thing", properties: + [ + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true), + ]); + var thingsProperty = InputFactory.Property("things", InputFactory.Array(thingModel)); + var nextProperty = InputFactory.Property("next", InputPrimitiveType.Url); + var pageModel = InputFactory.Model("page", properties: [thingsProperty, nextProperty]); + var response = InputFactory.OperationResponse([200], pageModel); + + var pagingMetadata = InputFactory.NextLinkPagingMetadata(["things"], ["next"], InputResponseLocation.Body); + + // "listAll" gets renamed to "GetAll" by CleanOperationNames, no collision + var listAllOperation = InputFactory.Operation("listAll", responses: [response]); + var listAllServiceMethod = InputFactory.PagingServiceMethod("listAll", listAllOperation, pagingMetadata: pagingMetadata); + + var client = InputFactory.Client("FooClient", methods: [listAllServiceMethod]); + + MockHelpers.LoadMockGenerator(inputModels: () => [thingModel], clients: () => [client]); + + // When there's no collision, the cleaned name "GetAll" should be used + var collectionResultDefinition = ScmCodeModelGenerator.Instance.OutputLibrary.TypeProviders.FirstOrDefault( + t => t is CollectionResultDefinition && t.Name == "FooClientGetAllCollectionResult") as CollectionResultDefinition; + Assert.IsNotNull(collectionResultDefinition, + "CollectionResult should use cleaned name 'GetAll' when there's no collision"); + } + internal static void CreatePagingOperation(InputResponseLocation responseLocation, bool isNested = false) { var inputModel = InputFactory.Model("cat", properties: diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/ListPageableTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/ListPageableTests.cs index c7654a7d662..56b0b87fe10 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/ListPageableTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/ListPageableTests.cs @@ -1,10 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +using System; +using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; using Microsoft.TypeSpec.Generator.ClientModel.Providers; using Microsoft.TypeSpec.Generator.Input; using Microsoft.TypeSpec.Generator.Primitives; +using Microsoft.TypeSpec.Generator.Providers; using Microsoft.TypeSpec.Generator.Tests.Common; using NUnit.Framework; @@ -59,7 +63,7 @@ public void TopParameterRenamedToMaxCountInPagingOperation() .OfType().ToList(); Assert.IsTrue(restClientProviders.Count > 0, "RestClientProvider should be generated"); - + var parameterNames = restClientProviders .SelectMany(p => p.Methods) .SelectMany(m => m.Signature.Parameters) @@ -69,7 +73,68 @@ public void TopParameterRenamedToMaxCountInPagingOperation() Assert.Contains("maxCount", parameterNames, "Should contain 'maxCount' parameter"); Assert.IsFalse(parameterNames.Contains("top"), "Should not contain 'top' parameter after renaming"); } - + + [Test] + public async Task TopParameterPreservedWhenExistsInLastContractView() + { + // This test verifies that when a "top" parameter exists in LastContractView, + // it is preserved for backward compatibility instead of being converted to "maxCount" + var topParameter = InputFactory.QueryParameter("top", InputPrimitiveType.Int32, isRequired: false, serializedName: "top"); + + List parameters = [topParameter]; + List methodParameters = + [ + InputFactory.MethodParameter("top", InputPrimitiveType.Int32, isRequired: false, + location: InputRequestLocation.Query, serializedName: "top"), + ]; + + var inputModel = InputFactory.Model("Item", properties: + [ + InputFactory.Property("id", InputPrimitiveType.String, isRequired: true), + ]); + + var pagingMetadata = new InputPagingServiceMetadata( + ["items"], + new InputNextLink(null, ["nextLink"], InputResponseLocation.Body, []), + null, + null); + + var response = InputFactory.OperationResponse( + [200], + InputFactory.Model( + "PagedItems", + properties: [ + InputFactory.Property("items", InputFactory.Array(inputModel)), + InputFactory.Property("nextLink", InputPrimitiveType.Url) + ])); + + var operation = InputFactory.Operation("getItems", responses: [response], parameters: parameters); + var inputServiceMethod = InputFactory.PagingServiceMethod( + "getItems", + operation, + pagingMetadata: pagingMetadata, + parameters: methodParameters); + + var client = InputFactory.Client("testClient", methods: [inputServiceMethod]); + + var generator = await MockHelpers.LoadMockGeneratorAsync( + clients: () => [client], + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var clientProvider = generator.Object.OutputLibrary.TypeProviders.OfType().FirstOrDefault(); + Assert.IsNotNull(clientProvider); + Assert.IsNotNull(clientProvider!.LastContractView); + + var methodParams = RestClientProvider.GetMethodParameters(inputServiceMethod, ScmMethodKind.Convenience, clientProvider!); + + var topParam = methodParams.FirstOrDefault(p => + string.Equals(p.Name, "top", StringComparison.Ordinal)); + + Assert.IsNotNull(topParam, "Top parameter should be present in method parameters"); + Assert.AreEqual("top", topParam!.Name, + "Parameter name should be 'top' (from LastContractView), not 'maxCount' (conversion should be prevented)"); + } + [Test] public void NoNextLinkOrContinuationTokenOfT() { @@ -98,6 +163,100 @@ public void NoNextLinkOrContinuationTokenOfTAsync() Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); } + [Test] + public async Task TopParameterPreservedViaBackCompatProvider() + { + // This test verifies that when a different TypeProvider (e.g., MockableResourceProvider in mgmt) + // has "top" in its LastContractView, the GetConvenienceMethodByOperation method preserves the + // "top" parameter name even though the ClientProvider's own LastContractView doesn't have it. + var topParameter = InputFactory.QueryParameter("top", InputPrimitiveType.Int32, isRequired: false, serializedName: "top"); + + List parameters = [topParameter]; + List methodParameters = + [ + InputFactory.MethodParameter("top", InputPrimitiveType.Int32, isRequired: false, + location: InputRequestLocation.Query, serializedName: "top"), + ]; + + var inputModel = InputFactory.Model("Item", properties: + [ + InputFactory.Property("id", InputPrimitiveType.String, isRequired: true), + ]); + + var pagingMetadata = new InputPagingServiceMetadata( + ["items"], + new InputNextLink(null, ["nextLink"], InputResponseLocation.Body, []), + null, + null); + + var response = InputFactory.OperationResponse( + [200], + InputFactory.Model( + "PagedItems", + properties: [ + InputFactory.Property("items", InputFactory.Array(inputModel)), + InputFactory.Property("nextLink", InputPrimitiveType.Url) + ])); + + var operation = InputFactory.Operation("getItems", responses: [response], parameters: parameters); + var inputServiceMethod = InputFactory.PagingServiceMethod( + "getItems", + operation, + pagingMetadata: pagingMetadata, + parameters: methodParameters); + + var client = InputFactory.Client("testClient", methods: [inputServiceMethod]); + + var generator = await MockHelpers.LoadMockGeneratorAsync( + clients: () => [client], + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var clientProvider = generator.Object.OutputLibrary.TypeProviders.OfType().FirstOrDefault(); + Assert.IsNotNull(clientProvider); + + // The ClientProvider's LastContractView should NOT have "top" (MockableTestResource has it, not TestClient) + // Verify the convenience method has maxCount (because the ClientProvider's own backcompat didn't find "top") + var methodsWithoutBackCompat = clientProvider!.GetMethodCollectionByOperation(operation); + var convenienceMethodWithoutBackCompat = methodsWithoutBackCompat[^2]; // sync convenience method + var maxCountParam = convenienceMethodWithoutBackCompat.Signature.Parameters.FirstOrDefault(p => + string.Equals(p.Name, "maxCount", StringComparison.Ordinal)); + Assert.IsNotNull(maxCountParam, "Without backcompat provider, parameter should be 'maxCount'"); + + // Now create a backcompat provider whose LastContractView has "top" + var backCompatProvider = new BackCompatTypeProvider("MockableTestResource", "Sample"); + Assert.IsNotNull(backCompatProvider.LastContractView, "BackCompat provider should have a LastContractView"); + + // Call GetMethodCollectionByOperation with the backcompat provider — this resets and rebuilds + var methodsWithBackCompat = clientProvider.GetMethodCollectionByOperation(operation, backCompatProvider); + var convenienceMethodWithBackCompat = methodsWithBackCompat[^2]; // sync convenience method + var topParam = convenienceMethodWithBackCompat.Signature.Parameters.FirstOrDefault(p => + string.Equals(p.Name, "top", StringComparison.Ordinal)); + + Assert.IsNotNull(topParam, "With backcompat provider, parameter should be 'top' (preserved from LastContractView)"); + Assert.AreEqual("top", topParam!.Name, + "Parameter name should be 'top' (from backcompat provider's LastContractView), not 'maxCount'"); + } + + /// + /// A simple TypeProvider used to simulate a backcompat provider (e.g., MockableResourceProvider) + /// whose LastContractView contains previously published parameter names. + /// + private class BackCompatTypeProvider : TypeProvider + { + private readonly string _name; + private readonly string _namespace; + + public BackCompatTypeProvider(string name, string ns) + { + _name = name; + _namespace = ns; + } + + protected override string BuildRelativeFilePath() => $"{_name}.cs"; + protected override string BuildName() => _name; + protected override string BuildNamespace() => _namespace; + } + private static void CreatePagingOperation() { var inputModel = InputFactory.Model("cat", properties: diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/ListPageableTests/TopParameterPreservedViaBackCompatProvider/MockableTestResource.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/ListPageableTests/TopParameterPreservedViaBackCompatProvider/MockableTestResource.cs new file mode 100644 index 00000000000..a16b13865c6 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/ListPageableTests/TopParameterPreservedViaBackCompatProvider/MockableTestResource.cs @@ -0,0 +1,18 @@ +#nullable disable + +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading.Tasks; + +namespace Sample +{ + /// + /// Represents the previous contract for the enclosing type (e.g., MockableResourceProvider) + /// that has the "top" parameter in its public API methods. + /// + public partial class MockableTestResource + { + public virtual Task GetItemsAsync(int? top, CancellationToken cancellationToken = default) { return null; } + public virtual ClientResult GetItems(int? top, CancellationToken cancellationToken = default) { return null; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/ListPageableTests/TopParameterPreservedWhenExistsInLastContractView/TestClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/ListPageableTests/TopParameterPreservedWhenExistsInLastContractView/TestClient.cs new file mode 100644 index 00000000000..1dfec4120c3 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/ListPageableTests/TopParameterPreservedWhenExistsInLastContractView/TestClient.cs @@ -0,0 +1,15 @@ +#nullable disable + +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading.Tasks; + +namespace Sample +{ + public partial class TestClient + { + // This represents the previous contract with top parameter + public virtual Task GetItemsAsync(int? top, CancellationToken cancellationToken = default) { return null; } + public virtual ClientResult GetItems(int? top, CancellationToken cancellationToken = default) { return null; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/InheritedNextLinkInBody.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/InheritedNextLinkInBody.cs index 06a5525b8d9..e1f78cc8679 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/InheritedNextLinkInBody.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/InheritedNextLinkInBody.cs @@ -44,7 +44,7 @@ public CatClientGetCatsCollectionResult(global::Sample.CatClient client, global: global::System.Uri nextPage = ((global::Sample.Models.Page)page).NextCat; if ((nextPage != null)) { - return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.AbsoluteUri)); + return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/InheritedNextLinkInBodyAsync.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/InheritedNextLinkInBodyAsync.cs index 89813e7a174..0491709e3c8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/InheritedNextLinkInBodyAsync.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/InheritedNextLinkInBodyAsync.cs @@ -44,7 +44,7 @@ public CatClientGetCatsAsyncCollectionResult(global::Sample.CatClient client, gl global::System.Uri nextPage = ((global::Sample.Models.Page)page).NextCat; if ((nextPage != null)) { - return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.AbsoluteUri)); + return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/InheritedNextLinkInBodyOfT.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/InheritedNextLinkInBodyOfT.cs index 1ccd43e7e51..33d94bd80a9 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/InheritedNextLinkInBodyOfT.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/InheritedNextLinkInBodyOfT.cs @@ -44,7 +44,7 @@ public CatClientGetCatsCollectionResultOfT(global::Sample.CatClient client, glob global::System.Uri nextPage = ((global::Sample.Models.Page)page).NextCat; if ((nextPage != null)) { - return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.AbsoluteUri)); + return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/InheritedNextLinkInBodyOfTAsync.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/InheritedNextLinkInBodyOfTAsync.cs index fedf5d6934e..020919ead77 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/InheritedNextLinkInBodyOfTAsync.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/InheritedNextLinkInBodyOfTAsync.cs @@ -45,7 +45,7 @@ public CatClientGetCatsAsyncCollectionResultOfT(global::Sample.CatClient client, global::System.Uri nextPage = ((global::Sample.Models.Page)page).NextCat; if ((nextPage != null)) { - return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.AbsoluteUri)); + return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NestedNextLinkInBody.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NestedNextLinkInBody.cs index 67cc928dcf4..0b2e4c398a3 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NestedNextLinkInBody.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NestedNextLinkInBody.cs @@ -44,7 +44,7 @@ public CatClientGetCatsCollectionResult(global::Sample.CatClient client, global: global::System.Uri nextPage = ((global::Sample.Models.Page)page).NestedNext?.NextCat; if ((nextPage != null)) { - return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.AbsoluteUri)); + return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NestedNextLinkInBodyAsync.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NestedNextLinkInBodyAsync.cs index b4f69cb49e7..82f8d0a8341 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NestedNextLinkInBodyAsync.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NestedNextLinkInBodyAsync.cs @@ -44,7 +44,7 @@ public CatClientGetCatsAsyncCollectionResult(global::Sample.CatClient client, gl global::System.Uri nextPage = ((global::Sample.Models.Page)page).NestedNext?.NextCat; if ((nextPage != null)) { - return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.AbsoluteUri)); + return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NestedNextLinkInBodyOfT.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NestedNextLinkInBodyOfT.cs index faa50456013..cf2c5317d2f 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NestedNextLinkInBodyOfT.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NestedNextLinkInBodyOfT.cs @@ -44,7 +44,7 @@ public CatClientGetCatsCollectionResultOfT(global::Sample.CatClient client, glob global::System.Uri nextPage = ((global::Sample.Models.Page)page).NestedNext?.NextCat; if ((nextPage != null)) { - return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.AbsoluteUri)); + return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NestedNextLinkInBodyOfTAsync.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NestedNextLinkInBodyOfTAsync.cs index bd376a0ccf3..7397512821b 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NestedNextLinkInBodyOfTAsync.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NestedNextLinkInBodyOfTAsync.cs @@ -45,7 +45,7 @@ public CatClientGetCatsAsyncCollectionResultOfT(global::Sample.CatClient client, global::System.Uri nextPage = ((global::Sample.Models.Page)page).NestedNext?.NextCat; if ((nextPage != null)) { - return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.AbsoluteUri)); + return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBody.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBody.cs index 06a5525b8d9..e1f78cc8679 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBody.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBody.cs @@ -44,7 +44,7 @@ public CatClientGetCatsCollectionResult(global::Sample.CatClient client, global: global::System.Uri nextPage = ((global::Sample.Models.Page)page).NextCat; if ((nextPage != null)) { - return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.AbsoluteUri)); + return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyAsync.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyAsync.cs index 89813e7a174..0491709e3c8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyAsync.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyAsync.cs @@ -44,7 +44,7 @@ public CatClientGetCatsAsyncCollectionResult(global::Sample.CatClient client, gl global::System.Uri nextPage = ((global::Sample.Models.Page)page).NextCat; if ((nextPage != null)) { - return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.AbsoluteUri)); + return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfT.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfT.cs index 1ccd43e7e51..33d94bd80a9 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfT.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfT.cs @@ -44,7 +44,7 @@ public CatClientGetCatsCollectionResultOfT(global::Sample.CatClient client, glob global::System.Uri nextPage = ((global::Sample.Models.Page)page).NextCat; if ((nextPage != null)) { - return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.AbsoluteUri)); + return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfTAsync.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfTAsync.cs index fedf5d6934e..020919ead77 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfTAsync.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfTAsync.cs @@ -45,7 +45,7 @@ public CatClientGetCatsAsyncCollectionResultOfT(global::Sample.CatClient client, global::System.Uri nextPage = ((global::Sample.Models.Page)page).NextCat; if ((nextPage != null)) { - return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.AbsoluteUri)); + return global::System.ClientModel.ContinuationToken.FromBytes(global::System.BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeader.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeader.cs index 675f743bb6b..7ea1821acd6 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeader.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeader.cs @@ -31,7 +31,7 @@ public CatClientGetCatsCollectionResult(global::Sample.CatClient client, global: if ((result.GetRawResponse().Headers.TryGetValue("nextCat", out string value) && !string.IsNullOrEmpty(value))) { - nextPageUri = new global::System.Uri(value); + nextPageUri = new global::System.Uri(value, global::System.UriKind.RelativeOrAbsolute); } else { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderAsync.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderAsync.cs index 10bb2c64b83..f1dc58323dd 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderAsync.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderAsync.cs @@ -31,7 +31,7 @@ public CatClientGetCatsAsyncCollectionResult(global::Sample.CatClient client, gl if ((result.GetRawResponse().Headers.TryGetValue("nextCat", out string value) && !string.IsNullOrEmpty(value))) { - nextPageUri = new global::System.Uri(value); + nextPageUri = new global::System.Uri(value, global::System.UriKind.RelativeOrAbsolute); } else { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderOfT.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderOfT.cs index fbea23f25cc..d064505fef6 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderOfT.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderOfT.cs @@ -32,7 +32,7 @@ public CatClientGetCatsCollectionResultOfT(global::Sample.CatClient client, glob if ((result.GetRawResponse().Headers.TryGetValue("nextCat", out string value) && !string.IsNullOrEmpty(value))) { - nextPageUri = new global::System.Uri(value); + nextPageUri = new global::System.Uri(value, global::System.UriKind.RelativeOrAbsolute); } else { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderOfTAsync.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderOfTAsync.cs index 637d20e4ce4..dfa872611cd 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderOfTAsync.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderOfTAsync.cs @@ -33,7 +33,7 @@ public CatClientGetCatsAsyncCollectionResultOfT(global::Sample.CatClient client, if ((result.GetRawResponse().Headers.TryGetValue("nextCat", out string value) && !string.IsNullOrEmpty(value))) { - nextPageUri = new global::System.Uri(value); + nextPageUri = new global::System.Uri(value, global::System.UriKind.RelativeOrAbsolute); } else { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/BinaryContentHelperDefinitionTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/BinaryContentHelperDefinitionTests.cs index f5f7d684f57..715bdb21e5b 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/BinaryContentHelperDefinitionTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/BinaryContentHelperDefinitionTests.cs @@ -1,9 +1,11 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. using System; using System.Linq; using Microsoft.TypeSpec.Generator.ClientModel.Providers; +using Microsoft.TypeSpec.Generator.Input; +using Microsoft.TypeSpec.Generator.Primitives; using Microsoft.TypeSpec.Generator.Tests.Common; using NUnit.Framework; @@ -38,5 +40,41 @@ public void FromObjectBinaryDataMethodIsCorrectlyDefined() Assert.IsNotNull(fromObjectMethod.BodyStatements); Assert.AreEqual(Helpers.GetExpectedFromFile(), fromObjectMethod.BodyStatements!.ToDisplayString()); } + + [Test] + public void FromEnumerableXmlMethodIsCorrectlyDefined() + { + var xmlModel = InputFactory.Model( + "XmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + serializationOptions: InputFactory.Serialization.Options( + xml: InputFactory.Serialization.Xml("XmlModel"))); + MockHelpers.LoadMockGenerator(inputModels: () => [xmlModel]); + + var binaryContentHelper = new BinaryContentHelperDefinition(); + Assert.IsNotNull(binaryContentHelper.Methods); + var method = binaryContentHelper.Methods.Single(m => m.Signature.Name == "FromEnumerable" + && m.Signature.Parameters.Count == 3 + && m.Signature.Parameters[1].Name == "rootNameHint"); + Assert.IsNotNull(method); + + // Validate signature + var signature = method.Signature; + Assert.AreEqual("FromEnumerable", signature.Name); + Assert.AreEqual(MethodSignatureModifiers.Public | MethodSignatureModifiers.Static, signature.Modifiers); + Assert.IsNotNull(signature.ReturnType); + Assert.AreEqual(3, signature.Parameters.Count); + Assert.AreEqual("enumerable", signature.Parameters[0].Name); + Assert.AreEqual("rootNameHint", signature.Parameters[1].Name); + Assert.AreEqual("childNameHint", signature.Parameters[2].Name); + Assert.IsNotNull(signature.GenericArguments); + Assert.AreEqual(1, signature.GenericArguments!.Count); + Assert.IsNotNull(signature.GenericParameterConstraints); + Assert.AreEqual(1, signature.GenericParameterConstraints!.Count); + + // Validate body + Assert.IsNotNull(method.BodyStatements); + Assert.AreEqual(Helpers.GetExpectedFromFile(), method.BodyStatements!.ToDisplayString()); + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/ModelSerializationExtensionsDefinitionTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/ModelSerializationExtensionsDefinitionTests.cs index a9e2b5677a3..c64ef9ef24c 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/ModelSerializationExtensionsDefinitionTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/ModelSerializationExtensionsDefinitionTests.cs @@ -5,10 +5,11 @@ using System.ClientModel.Primitives; using System.Linq; using System.Text.Json; +using System.Xml; +using System.Xml.Linq; using Microsoft.TypeSpec.Generator.ClientModel.Providers; -using Microsoft.TypeSpec.Generator.ClientModel.Tests; +using Microsoft.TypeSpec.Generator.Input; using Microsoft.TypeSpec.Generator.Primitives; -using Microsoft.TypeSpec.Generator.Providers; using Microsoft.TypeSpec.Generator.Tests.Common; using NUnit.Framework; @@ -428,5 +429,180 @@ public void ValidateGetRemainder() var file = writer.Write(); Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); } + + [Test] + public void ValidateXmlGetDateTimeOffsetMethodIsGenerated() + { + // Create a model with XML usage to enable XML extension methods + var xmlModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("Name", InputPrimitiveType.String)]); + MockHelpers.LoadMockGenerator(inputModels: () => [xmlModel]); + + var definition = new ModelSerializationExtensionsDefinition(); + var methods = definition.Methods; + + Assert.IsNotNull(methods); + var getDateTimeOffsetMethods = methods.Where(m => m.Signature.Name == "GetDateTimeOffset").ToList(); + Assert.IsTrue(getDateTimeOffsetMethods.Count >= 2, "GetDateTimeOffset methods should include both JsonElement and XElement versions"); + + // Check XElement version + var xElementMethod = getDateTimeOffsetMethods.SingleOrDefault(m => + m.Signature.Parameters.Count == 2 && + m.Signature.Parameters[0].Type.FrameworkType == typeof(XElement)); + Assert.IsNotNull(xElementMethod, "GetDateTimeOffset for XElement should be generated"); + Assert.AreEqual(typeof(DateTimeOffset), xElementMethod!.Signature.ReturnType?.FrameworkType); + Assert.IsTrue(xElementMethod.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Public)); + Assert.IsTrue(xElementMethod.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Static)); + Assert.IsTrue(xElementMethod.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Extension)); + Assert.AreEqual(typeof(string), xElementMethod.Signature.Parameters[1].Type.FrameworkType); + } + + [Test] + public void ValidateXmlGetTimeSpanMethodIsGenerated() + { + // Create a model with XML usage to enable XML extension methods + var xmlModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("Name", InputPrimitiveType.String)]); + MockHelpers.LoadMockGenerator(inputModels: () => [xmlModel]); + + var definition = new ModelSerializationExtensionsDefinition(); + var methods = definition.Methods; + + Assert.IsNotNull(methods); + var getTimeSpanMethods = methods.Where(m => m.Signature.Name == "GetTimeSpan").ToList(); + Assert.IsTrue(getTimeSpanMethods.Count >= 2, "GetTimeSpan methods should include both JsonElement and XElement versions"); + + // Check XElement version + var xElementMethod = getTimeSpanMethods.SingleOrDefault(m => + m.Signature.Parameters.Count == 2 && + m.Signature.Parameters[0].Type.FrameworkType == typeof(XElement)); + Assert.IsNotNull(xElementMethod, "GetTimeSpan for XElement should be generated"); + Assert.AreEqual(typeof(TimeSpan), xElementMethod!.Signature.ReturnType?.FrameworkType); + Assert.IsTrue(xElementMethod.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Public)); + Assert.IsTrue(xElementMethod.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Static)); + Assert.IsTrue(xElementMethod.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Extension)); + Assert.AreEqual(typeof(string), xElementMethod.Signature.Parameters[1].Type.FrameworkType); + } + + [Test] + public void ValidateXmlGetBytesFromBase64MethodIsGenerated() + { + // Create a model with XML usage to enable XML extension methods + var xmlModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("Name", InputPrimitiveType.String)]); + MockHelpers.LoadMockGenerator(inputModels: () => [xmlModel]); + + var definition = new ModelSerializationExtensionsDefinition(); + var methods = definition.Methods; + + Assert.IsNotNull(methods); + var getBytesFromBase64Methods = methods.Where(m => m.Signature.Name == "GetBytesFromBase64").ToList(); + Assert.IsTrue(getBytesFromBase64Methods.Count >= 2, "GetBytesFromBase64 methods should include both JsonElement and XElement versions"); + + // Check XElement version + var xElementMethod = getBytesFromBase64Methods.SingleOrDefault(m => + m.Signature.Parameters.Count == 2 && + m.Signature.Parameters[0].Type.FrameworkType == typeof(XElement)); + Assert.IsNotNull(xElementMethod, "GetBytesFromBase64 for XElement should be generated"); + Assert.AreEqual(typeof(byte[]), xElementMethod!.Signature.ReturnType?.FrameworkType); + Assert.IsTrue(xElementMethod.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Public)); + Assert.IsTrue(xElementMethod.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Static)); + Assert.IsTrue(xElementMethod.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Extension)); + Assert.AreEqual(typeof(string), xElementMethod.Signature.Parameters[1].Type.FrameworkType); + } + + [Test] + public void ValidateXmlWriteStringValueMethodIsGenerated() + { + // Create a model with XML usage to enable XML extension methods + var xmlModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("Name", InputPrimitiveType.String)]); + MockHelpers.LoadMockGenerator(inputModels: () => [xmlModel]); + + var definition = new ModelSerializationExtensionsDefinition(); + var methods = definition.Methods; + + Assert.IsNotNull(methods); + var writeStringValueMethods = methods + .Where(m => m.Signature.Name == "WriteStringValue" + && m.Signature.Parameters.FirstOrDefault(p => p.Type.Equals(typeof(XmlWriter))) != null).ToList(); + Assert.IsTrue(writeStringValueMethods.Count == 2); + + var xmlWriterDateTimeOverload = writeStringValueMethods.FirstOrDefault(m => + m.Signature.Parameters.Count == 3 && + m.Signature.Parameters[1].Type.FrameworkType == typeof(DateTimeOffset)); + Assert.IsNotNull(xmlWriterDateTimeOverload); + + var xmlWriterTimeSpanOverload = writeStringValueMethods.FirstOrDefault(m => + m.Signature.Parameters.Count == 3 && + m.Signature.Parameters[1].Type.FrameworkType == typeof(TimeSpan)); + Assert.IsNotNull(xmlWriterTimeSpanOverload); + } + + [Test] + public void ValidateXmlWriteObjectValueMethodIsGenerated() + { + // Create a model with XML usage to enable XML extension methods + var xmlModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("Name", InputPrimitiveType.String)]); + MockHelpers.LoadMockGenerator(inputModels: () => [xmlModel]); + + var definition = new ModelSerializationExtensionsDefinition(); + var methods = definition.Methods; + + Assert.IsNotNull(methods); + var writeStringValueMethods = methods + .Where(m => m.Signature.Name == "WriteObjectValue" + && m.Signature.Parameters.FirstOrDefault(p => p.Type.Equals(typeof(XmlWriter))) != null).ToList(); + Assert.IsTrue(writeStringValueMethods.Count == 1); + } + + [Test] + public void ValidateXmlWriteBase64StringVAlueMethodIsGenerated() + { + // Create a model with XML usage to enable XML extension methods + var xmlModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("Name", InputPrimitiveType.String)]); + MockHelpers.LoadMockGenerator(inputModels: () => [xmlModel]); + + var definition = new ModelSerializationExtensionsDefinition(); + var methods = definition.Methods; + + Assert.IsNotNull(methods); + var writeStringValueMethods = methods + .Where(m => m.Signature.Name == "WriteBase64StringValue" + && m.Signature.Parameters.FirstOrDefault(p => p.Type.Equals(typeof(XmlWriter))) != null).ToList(); + Assert.IsTrue(writeStringValueMethods.Count == 1); + } + + [Test] + public void ValidateXmlMethodsAreNotGeneratedWhenNoXmlSupport() + { + // Load generator without any XML models + MockHelpers.LoadMockGenerator(); + + var definition = new ModelSerializationExtensionsDefinition(); + var methods = definition.Methods; + + Assert.IsNotNull(methods); + + // Verify that no XElement methods are generated + var xElementMethods = methods.Where(m => + m.Signature.Parameters.Count > 0 && + m.Signature.Parameters[0].Type.FrameworkType == typeof(XElement)).ToList(); + Assert.AreEqual(0, xElementMethods.Count, "No XElement methods should be generated when library doesn't support XML"); + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/MultiPartFormDataBinaryContentDefinitionTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/MultiPartFormDataBinaryContentDefinitionTests.cs index 19015ea0588..f7481fa91b6 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/MultiPartFormDataBinaryContentDefinitionTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/MultiPartFormDataBinaryContentDefinitionTests.cs @@ -1,11 +1,11 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. using System.Linq; using Microsoft.TypeSpec.Generator.ClientModel.Providers; using Microsoft.TypeSpec.Generator.Tests.Common; -using NUnit.Framework; using Moq; +using NUnit.Framework; namespace Microsoft.TypeSpec.Generator.ClientModel.Tests.Providers.Definitions { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/PipelineRequestHeadersExtensionsDefinitionTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/PipelineRequestHeadersExtensionsDefinitionTests.cs new file mode 100644 index 00000000000..66b026ff2d4 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/PipelineRequestHeadersExtensionsDefinitionTests.cs @@ -0,0 +1,75 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Linq; +using Microsoft.TypeSpec.Generator.ClientModel.Providers; +using Microsoft.TypeSpec.Generator.Primitives; +using Microsoft.TypeSpec.Generator.Tests.Common; +using NUnit.Framework; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Tests.Providers.Definitions +{ + public class PipelineRequestHeadersExtensionsDefinitionTests + { + [SetUp] + public void Setup() + { + MockHelpers.LoadMockGenerator(); + } + + [Test] + public void ValidateAddMethodIsGenerated() + { + var definition = new PipelineRequestHeadersExtensionsDefinition(); + + Assert.IsNotNull(definition.Methods); + var addMethod = definition.Methods.SingleOrDefault(m => + m.Signature.Name == "Add" && + m.Signature.Parameters.Any(p => p.Type.Equals(new global::Microsoft.TypeSpec.Generator.Primitives.CSharpType(typeof(IDictionary<,>), typeof(string), typeof(string))))); + Assert.IsNotNull(addMethod, "Add method with prefix and dictionary parameters should be generated"); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider(definition, name => name == "Add")); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public void ValidateSetDelimitedMethodsAreGenerated() + { + var definition = new PipelineRequestHeadersExtensionsDefinition(); + + Assert.IsNotNull(definition.Methods); + var setDelimitedMethods = definition.Methods.Where(m => m.Signature.Name == "SetDelimited").ToList(); + Assert.AreEqual(2, setDelimitedMethods.Count, "Two SetDelimited overloads should be generated"); + } + + [Test] + public void ValidateDefinitionIsInternalAndStatic() + { + var definition = new PipelineRequestHeadersExtensionsDefinition(); + + Assert.IsTrue(definition.DeclarationModifiers.HasFlag(global::Microsoft.TypeSpec.Generator.Primitives.TypeSignatureModifiers.Internal)); + Assert.IsTrue(definition.DeclarationModifiers.HasFlag(global::Microsoft.TypeSpec.Generator.Primitives.TypeSignatureModifiers.Static)); + } + + [Test] + public void ValidateAddMethodExtensionParameterType() + { + var definition = new PipelineRequestHeadersExtensionsDefinition(); + + var addMethod = definition.Methods.SingleOrDefault(m => + m.Signature.Name == "Add" && + m.Signature.Parameters.Any(p => p.Type.Equals(new global::Microsoft.TypeSpec.Generator.Primitives.CSharpType(typeof(IDictionary<,>), typeof(string), typeof(string))))); + Assert.IsNotNull(addMethod); + // First parameter should be PipelineRequestHeaders (the extension target) + Assert.IsTrue(addMethod!.Signature.Parameters[0].Type.Equals(typeof(PipelineRequestHeaders))); + // Second parameter should be string (prefix) + Assert.IsTrue(addMethod.Signature.Parameters[1].Type.Equals(typeof(string))); + Assert.AreEqual("prefix", addMethod.Signature.Parameters[1].Name); + // Third parameter should be IDictionary + Assert.IsTrue(addMethod.Signature.Parameters[2].Type.IsDictionary); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/TestData/BinaryContentHelperDefinitionTests/FromEnumerableXmlMethodIsCorrectlyDefined.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/TestData/BinaryContentHelperDefinitionTests/FromEnumerableXmlMethodIsCorrectlyDefined.cs new file mode 100644 index 00000000000..263fdcc3fc9 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/TestData/BinaryContentHelperDefinitionTests/FromEnumerableXmlMethodIsCorrectlyDefined.cs @@ -0,0 +1,21 @@ +using (global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream(256)) +{ + using (global::System.Xml.XmlWriter writer = global::System.Xml.XmlWriter.Create(stream, global::Sample.ModelSerializationExtensions.XmlWriterSettings)) + { + writer.WriteStartElement(rootNameHint); + foreach (var item in enumerable) + { + writer.WriteObjectValue(item, global::Sample.ModelSerializationExtensions.WireOptions, childNameHint); + } + writer.WriteEndElement(); + } + + if ((stream.Position > int.MaxValue)) + { + return global::System.ClientModel.BinaryContent.Create(global::System.BinaryData.FromStream(stream)); + } + else + { + return global::System.ClientModel.BinaryContent.Create(new global::System.BinaryData(stream.GetBuffer().AsMemory(0, ((int)stream.Position)))); + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/TestData/PipelineRequestHeadersExtensionsDefinitionTests/ValidateAddMethodIsGenerated.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/TestData/PipelineRequestHeadersExtensionsDefinitionTests/ValidateAddMethodIsGenerated.cs new file mode 100644 index 00000000000..6522bed714e --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/Definitions/TestData/PipelineRequestHeadersExtensionsDefinitionTests/ValidateAddMethodIsGenerated.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System.ClientModel.Primitives; +using System.Collections.Generic; + +namespace Sample +{ + public partial class PipelineRequestHeadersExtensions + { + public static void Add(this global::System.ClientModel.Primitives.PipelineRequestHeaders headers, string prefix, global::System.Collections.Generic.IDictionary value) + { + foreach (var header in value) + { + headers.Add((prefix + header.Key), header.Value); + } + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/EnumProvider/EnumProviderSerializationTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/EnumProvider/EnumProviderSerializationTests.cs index d4355c3920d..1ba06a081f6 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/EnumProvider/EnumProviderSerializationTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/EnumProvider/EnumProviderSerializationTests.cs @@ -25,17 +25,17 @@ private static object[] ValidateTypes(bool isExtensible) { var intType = InputFactory.Int32Enum( "mockInputEnum", - [ ("One", 1), ("Two", 2)], + [("One", 1), ("Two", 2)], isExtensible: isExtensible); var floatType = InputFactory.Float32Enum( "mockInputEnum", - [ ("One", 1f), ("Two", 2f)], + [("One", 1f), ("Two", 2f)], isExtensible: isExtensible); var stringType = InputFactory.StringEnum( "mockInputEnum", - [ ("One", "1"), ("Two", "2")], + [("One", "1"), ("Two", "2")], isExtensible: isExtensible); return [intType, floatType, stringType]; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DeserializationTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DeserializationTests.cs index b1b1423b449..7822017048c 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DeserializationTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DeserializationTests.cs @@ -93,5 +93,25 @@ public static IEnumerable TestDeserializationStatementTestCases false); } } + + [Test] + public void TestDeserializationUsesUriKindRelativeOrAbsolute() + { + var inputModel = InputFactory.Model("TestModel", properties: + [InputFactory.Property("prop1", InputPrimitiveType.Url)]); + + var mrwProvider = new ModelProvider(inputModel).SerializationProviders.FirstOrDefault(); + Assert.IsNotNull(mrwProvider); + + var deserializationMethod = mrwProvider!.Methods.Where(m => m.Signature.Name.StartsWith("Deserialize")).FirstOrDefault(); + Assert.IsNotNull(deserializationMethod); + + var methodBody = deserializationMethod!.BodyStatements!.ToDisplayString(); + + Assert.IsTrue(methodBody.Contains("new global::System.Uri("), + $"Uri property should use new Uri() constructor. Actual:\n{methodBody}"); + Assert.IsTrue(methodBody.Contains("global::System.UriKind.RelativeOrAbsolute"), + $"Uri property should specify UriKind.RelativeOrAbsolute. Actual:\n{methodBody}"); + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs index e5945ad27b1..e09cb635a1f 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs @@ -139,7 +139,7 @@ public void UnknownVariantDeserializeShouldUseBaseProperties() var serialization = unknownModel!.SerializationProviders.FirstOrDefault(); Assert.IsNotNull(serialization); var deserializeMethod = serialization!.Methods.FirstOrDefault(m => m.Signature.Name == "DeserializeUnknownPet"); - foreach(var property in _baseModel.Properties) + foreach (var property in _baseModel.Properties) { Assert.IsNotNull( deserializeMethod!.BodyStatements!.ToDisplayString().Contains($"if (property.NameEquals(\"{property.Name}\"u8))"), diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DynamicModelSerializationTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DynamicModelSerializationTests.cs index 192d5b25a79..3613629c0be 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DynamicModelSerializationTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DynamicModelSerializationTests.cs @@ -962,14 +962,17 @@ public void WriteDerivedModel() [Test] public void DeserializeMultiplePrimitiveProperties() { + var fooSerializationOptions = InputFactory.Serialization.Json("foo"); + var catSerializationOptions = InputFactory.Serialization.Json("x-cat"); + var barSerializationOptions = InputFactory.Serialization.Json("bar"); var inputModel = InputFactory.Model( "dynamicModel", isDynamicModel: true, properties: [ - InputFactory.Property("foo", InputPrimitiveType.String, isRequired: true), - InputFactory.Property("cat", InputPrimitiveType.String, serializedName: "x-cat", isRequired: true), - InputFactory.Property("bar", InputPrimitiveType.Int32, isRequired: false) + InputFactory.Property("foo", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(fooSerializationOptions)), + InputFactory.Property("cat", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(catSerializationOptions)), + InputFactory.Property("bar", InputPrimitiveType.Int32, isRequired: false, serializationOptions: InputFactory.Serialization.Options(barSerializationOptions)) ]); MockHelpers.LoadMockGenerator(inputModels: () => [inputModel]); @@ -1315,7 +1318,7 @@ public void DerivedModelWithoutOwnDynamicPropertiesDoesNotGeneratePropagators() Assert.IsNotNull(model); Assert.IsTrue(model!.IsDynamicModel, "Derived model should be marked as dynamic because base is dynamic"); Assert.IsFalse(model.HasDynamicProperties, "Derived model should not have dynamic properties when neither it nor base have dynamic property types"); - + var serialization = model.SerializationProviders.SingleOrDefault(); Assert.IsNotNull(serialization); @@ -1364,12 +1367,12 @@ public void DerivedModelWithoutDynamicPropertiesButBaseHasDynamicProperties() ]); MockHelpers.LoadMockGenerator(inputModels: () => [baseModel, derivedModel, baseDynamicModel]); - + // Validate base model has dynamic properties and propagators var baseModelProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateModel(baseModel) as ClientModel.Providers.ScmModelProvider; Assert.IsNotNull(baseModelProvider); Assert.IsTrue(baseModelProvider!.HasDynamicProperties, "Base model should have dynamic properties"); - + var baseSerialization = baseModelProvider.SerializationProviders.SingleOrDefault(); Assert.IsNotNull(baseSerialization); var baseMethods = baseSerialization!.Methods; @@ -1381,7 +1384,7 @@ public void DerivedModelWithoutDynamicPropertiesButBaseHasDynamicProperties() Assert.IsNotNull(derivedModelProvider); Assert.IsTrue(derivedModelProvider!.IsDynamicModel, "Derived model should be marked as dynamic because base is dynamic"); Assert.IsFalse(derivedModelProvider.HasDynamicProperties, "Derived model should not have dynamic properties when it has no dynamic property types of its own"); - + var derivedSerialization = derivedModelProvider.SerializationProviders.SingleOrDefault(); Assert.IsNotNull(derivedSerialization); @@ -1420,7 +1423,7 @@ public void WriteDynamicDerivedModelWithNonDiscriminatedBase() ]); MockHelpers.LoadMockGenerator(inputModels: () => [baseModel, dynamicDerivedModel]); - + // Verify base model is NOT dynamic var baseModelProvider = ScmCodeModelGenerator.Instance.TypeFactory.CreateModel(baseModel) as ClientModel.Providers.ScmModelProvider; Assert.IsNotNull(baseModelProvider); @@ -1476,7 +1479,7 @@ public void DeserializeDynamicDerivedModelWithNonDiscriminatedBase() Assert.IsTrue(derivedModelProvider!.IsDynamicModel, "Derived model should be dynamic"); Assert.IsTrue(derivedModelProvider.Constructors.Count > 0); -var serialization = derivedModelProvider.SerializationProviders.SingleOrDefault(); + var serialization = derivedModelProvider.SerializationProviders.SingleOrDefault(); Assert.IsNotNull(serialization); var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( @@ -1486,5 +1489,81 @@ public void DeserializeDynamicDerivedModelWithNonDiscriminatedBase() var file = writer.Write(); Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); } + + [Test] + public async Task WriteModelWithBinaryDataAdditionalPropsBackCompat() + { + var inputModel = InputFactory.Model( + "dynamicModel", + isDynamicModel: true, + additionalProperties: InputPrimitiveType.Any, + properties: + [ + InputFactory.Property("p1", InputPrimitiveType.String, isRequired: true) + ]); + + await MockHelpers.LoadMockGeneratorAsync( + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync(), + inputModels: () => [inputModel]); + var model = ScmCodeModelGenerator.Instance.TypeFactory.CreateModel(inputModel) as ClientModel.Providers.ScmModelProvider; + + Assert.IsNotNull(model); + Assert.IsTrue(model!.IsDynamicModel); + Assert.IsTrue(model.Properties.Any(p => p.IsAdditionalProperties), + "Backcompat model should still generate AdditionalProperties"); + + var serialization = model.SerializationProviders.SingleOrDefault(); + Assert.IsNotNull(serialization); + + // Ensure Constructors have been built (which updates FullConstructor parameters + // used by the serialization provider). In the full pipeline, the model's Constructors + // are always written before the serialization file. + Assert.AreEqual(2, model.Constructors.Count); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serialization!, + name => name is "JsonModelWriteCore" or "Write")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task DeserializeModelWithBinaryDataAdditionalPropsBackCompat() + { + var inputModel = InputFactory.Model( + "dynamicModel", + isDynamicModel: true, + additionalProperties: InputPrimitiveType.Any, + properties: + [ + InputFactory.Property("p1", InputPrimitiveType.String, isRequired: true) + ]); + + await MockHelpers.LoadMockGeneratorAsync( + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync(), + inputModels: () => [inputModel]); + var model = ScmCodeModelGenerator.Instance.TypeFactory.CreateModel(inputModel) as ClientModel.Providers.ScmModelProvider; + + Assert.IsNotNull(model); + Assert.IsTrue(model!.IsDynamicModel); + Assert.IsTrue(model.Properties.Any(p => p.IsAdditionalProperties), + "Backcompat model should still generate AdditionalProperties"); + + var serialization = model.SerializationProviders.SingleOrDefault(); + Assert.IsNotNull(serialization); + + // Ensure Constructors have been built (which updates FullConstructor parameters + // used by the serialization provider). In the full pipeline, the model's Constructors + // are always written before the serialization file. + Assert.AreEqual(2, model.Constructors.Count); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serialization!, + name => name.StartsWith("Deserialize"))); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/ModelCustomizationTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/ModelCustomizationTests.cs index fcff349c3f3..1ed43b979a1 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/ModelCustomizationTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/ModelCustomizationTests.cs @@ -367,13 +367,13 @@ public async Task CustomizedExplicitOperatorNotGenerated() var customCodeView = modelProvider.CustomCodeView; Assert.IsNotNull(customCodeView, "CustomCodeView should be detected"); var customMethods = customCodeView!.Methods; - var customOperator = customMethods.FirstOrDefault(m => + var customOperator = customMethods.FirstOrDefault(m => m.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Explicit) && m.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Operator)); Assert.IsNotNull(customOperator, "Custom explicit operator should be detected in CustomCodeView"); // Verify that the custom explicit operator is recognized and not generated - var explicitOperator = serializationProvider!.Methods.FirstOrDefault(m => + var explicitOperator = serializationProvider!.Methods.FirstOrDefault(m => m.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Explicit) && m.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Operator)); Assert.IsNull(explicitOperator, "Custom explicit operator should not be generated"); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/MrwSerializationTypeDefinitionTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/MrwSerializationTypeDefinitionTests.cs index 8132e9f323f..4ce3df526ad 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/MrwSerializationTypeDefinitionTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/MrwSerializationTypeDefinitionTests.cs @@ -29,7 +29,7 @@ internal static (ModelProvider Model, MrwSerializationTypeDefinition Serializati var generator = MockHelpers.LoadMockGenerator( inputModels: () => [inputModel], createSerializationsCore: (inputType, typeProvider) => - inputType is InputModelType modelType ? [new MrwSerializationTypeDefinition(modelType, (typeProvider as ModelProvider)!)]: []); + inputType is InputModelType modelType ? [new MrwSerializationTypeDefinition(modelType, (typeProvider as ModelProvider)!)] : []); if (isRootInput) { generator.Object.TypeFactory.RootInputModels.Add(inputModel); @@ -1145,7 +1145,7 @@ public void TestGetDeserializationMethodInvocationForType_InDeserializationMetho var generator = MockHelpers.LoadMockGenerator( inputModels: () => [inputModel, innerModel], createSerializationsCore: (inputType, typeProvider) => - inputType is InputModelType modelType ? [new MrwSerializationTypeDefinition(modelType, (typeProvider as ModelProvider)!)]: []); + inputType is InputModelType modelType ? [new MrwSerializationTypeDefinition(modelType, (typeProvider as ModelProvider)!)] : []); generator.Object.TypeFactory.RootInputModels.Add(inputModel); generator.Object.TypeFactory.RootOutputModels.Add(inputModel); @@ -1183,7 +1183,7 @@ public void TestGetDeserializationMethodInvocationForType_CollectionOfModels() var generator = MockHelpers.LoadMockGenerator( inputModels: () => [inputModel, innerModel], createSerializationsCore: (inputType, typeProvider) => - inputType is InputModelType modelType ? [new MrwSerializationTypeDefinition(modelType, (typeProvider as ModelProvider)!)]: []); + inputType is InputModelType modelType ? [new MrwSerializationTypeDefinition(modelType, (typeProvider as ModelProvider)!)] : []); generator.Object.TypeFactory.RootInputModels.Add(inputModel); generator.Object.TypeFactory.RootOutputModels.Add(inputModel); @@ -1220,7 +1220,7 @@ public void TestGetDeserializationMethodInvocationForType_DictionaryOfModels() var generator = MockHelpers.LoadMockGenerator( inputModels: () => [inputModel, valueModel], createSerializationsCore: (inputType, typeProvider) => - inputType is InputModelType modelType ? [new MrwSerializationTypeDefinition(modelType, (typeProvider as ModelProvider)!)]: []); + inputType is InputModelType modelType ? [new MrwSerializationTypeDefinition(modelType, (typeProvider as ModelProvider)!)] : []); generator.Object.TypeFactory.RootInputModels.Add(inputModel); generator.Object.TypeFactory.RootOutputModels.Add(inputModel); @@ -1250,9 +1250,9 @@ public void TestSerializationTypeNameMatchesModelProviderName() var (model, serialization) = CreateModelAndSerialization(inputModel); // The serialization type name should match the model provider name - Assert.AreEqual(model.Name, serialization.Name, + Assert.AreEqual(model.Name, serialization.Name, "Serialization type name should match ModelProvider name"); - + // The deserialization method should also use the model provider name var deserializationMethod = serialization.BuildDeserializationMethod(); Assert.IsNotNull(deserializationMethod); @@ -1269,29 +1269,29 @@ public void TestArrayEncodingSerializationStatement(string encoding, string expe Enum.TryParse(encoding, ignoreCase: true, out var arrayEncoding); var arrayType = new InputArrayType("TestArray", "TypeSpec.Array", InputPrimitiveType.String); var arrayProperty = new InputModelProperty( - "TestArray", + "TestArray", "Test array property summary", - "Test array property", - arrayType, - true, - false, - null, - false, - "testArray", - false, - false, - null, + "Test array property", + arrayType, + true, + false, + null, + false, + "testArray", + false, + false, + null, new(json: new("testArray")), arrayEncoding); - + var properties = new List { arrayProperty }; var inputModel = new InputModelType("TestModel", "TestNamespace", "TestModel", "public", null, null, "Test model.", InputModelTypeUsage.Input, properties, null, Array.Empty(), null, null, new Dictionary(), null, false, new(), false); var (_, serialization) = CreateModelAndSerialization(inputModel); var writeMethod = serialization.BuildJsonModelWriteCoreMethod(); var methodBody = writeMethod.BodyStatements!.ToDisplayString(); - - Assert.IsTrue(methodBody.Contains($"string.Join(\"{expectedDelimiter}\", TestArray)"), + + Assert.IsTrue(methodBody.Contains($"string.Join(\"{expectedDelimiter}\", TestArray)"), $"Expected serialization to use string.Join with delimiter '{expectedDelimiter}', but got: {methodBody}"); } @@ -1304,30 +1304,166 @@ public void TestArrayEncodingDeserializationStatement(string encoding, string ex Enum.TryParse(encoding, ignoreCase: true, out var arrayEncoding); var arrayType = new InputArrayType("TestArray", "TypeSpec.Array", InputPrimitiveType.String); var arrayProperty = new InputModelProperty( - "TestArray", + "TestArray", "Test array property summary", - "Test array property", - arrayType, - true, - false, - null, - false, - "testArray", - false, - false, - null, + "Test array property", + arrayType, + true, + false, + null, + false, + "testArray", + false, + false, + null, new(json: new("testArray")), arrayEncoding); - + var properties = new List { arrayProperty }; var inputModel = new InputModelType("TestModel", "TestNamespace", "TestModel", "public", null, null, "Test model.", InputModelTypeUsage.Input, properties, null, Array.Empty(), null, null, new Dictionary(), null, false, new(), false); var (_, serialization) = CreateModelAndSerialization(inputModel); var deserializeMethod = serialization.BuildDeserializationMethod(); var methodBody = deserializeMethod.BodyStatements!.ToDisplayString(); - - Assert.IsTrue(methodBody.Contains($".Split('{expectedDelimiter}')") || methodBody.Contains($".Split(\"{expectedDelimiter}\")"), + + Assert.IsTrue(methodBody.Contains($".Split('{expectedDelimiter}')") || methodBody.Contains($".Split(\"{expectedDelimiter}\")"), $"Expected deserialization to use Split with delimiter '{expectedDelimiter}', but got: {methodBody}"); } + + [Test] + public void TestBuildToBinaryContentMethod_DualFormatModel_MethodGenerated() + { + // Create a model that supports both JSON and XML + var inputModel = InputFactory.Model("DualFormatModel", usage: InputModelTypeUsage.Json | InputModelTypeUsage.Xml); + var (model, serialization) = CreateModelAndSerialization(inputModel); + + // Verify the ToBinaryContent method is generated + var toBinaryContentMethod = serialization.Methods.FirstOrDefault(m => + m.Signature.Name == "ToBinaryContent" && + m.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Internal)); + + Assert.IsNotNull(toBinaryContentMethod, "ToBinaryContent method should be generated for dual-format models"); + Assert.AreEqual(1, toBinaryContentMethod!.Signature.Parameters.Count); + Assert.AreEqual("format", toBinaryContentMethod.Signature.Parameters[0].Name); + Assert.AreEqual(typeof(string), toBinaryContentMethod.Signature.Parameters[0].Type.FrameworkType); + } + + [Test] + public void TestBuildToBinaryContentMethod_JsonOnlyModel_MethodNotGenerated() + { + // Create a model that supports only JSON + var inputModel = InputFactory.Model("JsonOnlyModel", usage: InputModelTypeUsage.Json); + var (model, serialization) = CreateModelAndSerialization(inputModel); + + // Verify the ToBinaryContent method is NOT generated + var toBinaryContentMethod = serialization.Methods.FirstOrDefault(m => + m.Signature.Name == "ToBinaryContent" && + m.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Internal)); + + Assert.IsNull(toBinaryContentMethod, "ToBinaryContent method should not be generated for JSON-only models"); + } + + [Test] + public void TestBuildToBinaryContentMethod_XmlOnlyModel_MethodNotGenerated() + { + // Create a model that supports only XML + var inputModel = InputFactory.Model("XmlOnlyModel", usage: InputModelTypeUsage.Xml); + var (model, serialization) = CreateModelAndSerialization(inputModel); + + // Verify the ToBinaryContent method is NOT generated + var toBinaryContentMethod = serialization.Methods.FirstOrDefault(m => + m.Signature.Name == "ToBinaryContent" && + m.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Internal)); + + Assert.IsNull(toBinaryContentMethod, "ToBinaryContent method should not be generated for XML-only models"); + } + + [Test] + public void TestDeserializationOfByteArrayPropertyUsesGetBytesFromBase64() + { + var inputModel = InputFactory.Model("TestModel", properties: + [InputFactory.Property("data", InputPrimitiveType.Base64)]); + + var generator = MockHelpers.LoadMockGenerator( + inputModels: () => [inputModel], + createSerializationsCore: (inputType, typeProvider) => + inputType is InputModelType modelType ? [new MrwSerializationTypeDefinition(modelType, (typeProvider as ModelProvider)!)] : [], + createCSharpTypeCore: (inputType) => inputType is InputPrimitiveType { Kind: InputPrimitiveTypeKind.Bytes } + ? new CSharpType(typeof(byte[])) + : null!, + createCSharpTypeCoreFallback: (inputType) => inputType is InputPrimitiveType { Kind: InputPrimitiveTypeKind.Bytes }); + + var model = ScmCodeModelGenerator.Instance.TypeFactory.CreateModel(inputModel) as ModelProvider; + var serialization = model!.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(serialization); + + var deserializationMethod = serialization!.BuildDeserializationMethod(); + var methodBody = deserializationMethod!.BodyStatements!.ToDisplayString(); + + Assert.IsTrue(methodBody.Contains("GetBytesFromBase64(\"D\")"), + $"byte[] property with Base64 format should use GetBytesFromBase64(\"D\"). Actual:\n{methodBody}"); + Assert.IsFalse(methodBody.Contains("EnumerateArray"), + $"byte[] property should not use array enumeration. Actual:\n{methodBody}"); + } + + [Test] + public void TestDeserializationOfBase64UrlByteArrayPropertyUsesGetBytesFromBase64() + { + var inputModel = InputFactory.Model("TestModel", properties: + [InputFactory.Property("data", InputPrimitiveType.Base64Url)]); + + var generator = MockHelpers.LoadMockGenerator( + inputModels: () => [inputModel], + createSerializationsCore: (inputType, typeProvider) => + inputType is InputModelType modelType ? [new MrwSerializationTypeDefinition(modelType, (typeProvider as ModelProvider)!)] : [], + createCSharpTypeCore: (inputType) => inputType is InputPrimitiveType { Kind: InputPrimitiveTypeKind.Bytes } + ? new CSharpType(typeof(byte[])) + : null!, + createCSharpTypeCoreFallback: (inputType) => inputType is InputPrimitiveType { Kind: InputPrimitiveTypeKind.Bytes }); + + var model = ScmCodeModelGenerator.Instance.TypeFactory.CreateModel(inputModel) as ModelProvider; + var serialization = model!.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(serialization); + + var deserializationMethod = serialization!.BuildDeserializationMethod(); + var methodBody = deserializationMethod!.BodyStatements!.ToDisplayString(); + + Assert.IsTrue(methodBody.Contains("GetBytesFromBase64(\"U\")"), + $"byte[] property with Base64Url format should use GetBytesFromBase64(\"U\"). Actual:\n{methodBody}"); + Assert.IsFalse(methodBody.Contains("EnumerateArray"), + $"byte[] property should not use array enumeration. Actual:\n{methodBody}"); + } + + [Test] + public void TestDeserializationOfNonBase64ByteArrayPropertyUsesGetRawText() + { + var bytesNoEncoding = new InputPrimitiveType(InputPrimitiveTypeKind.Bytes, "bytes", "TypeSpec.bytes"); + var inputModel = InputFactory.Model("TestModel", properties: + [InputFactory.Property("data", bytesNoEncoding)]); + + var generator = MockHelpers.LoadMockGenerator( + inputModels: () => [inputModel], + createSerializationsCore: (inputType, typeProvider) => + inputType is InputModelType modelType ? [new MrwSerializationTypeDefinition(modelType, (typeProvider as ModelProvider)!)] : [], + createCSharpTypeCore: (inputType) => inputType is InputPrimitiveType { Kind: InputPrimitiveTypeKind.Bytes } + ? new CSharpType(typeof(byte[])) + : null!, + createCSharpTypeCoreFallback: (inputType) => inputType is InputPrimitiveType { Kind: InputPrimitiveTypeKind.Bytes }); + + var model = ScmCodeModelGenerator.Instance.TypeFactory.CreateModel(inputModel) as ModelProvider; + var serialization = model!.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(serialization); + + var deserializationMethod = serialization!.BuildDeserializationMethod(); + var methodBody = deserializationMethod!.BodyStatements!.ToDisplayString(); + + Assert.IsTrue(methodBody.Contains("GetRawText"), + $"byte[] property with no encoding should use GetRawText() fallback. Actual:\n{methodBody}"); + Assert.IsTrue(methodBody.Contains("ToArray"), + $"byte[] property with no encoding should call ToArray(). Actual:\n{methodBody}"); + Assert.IsFalse(methodBody.Contains("EnumerateArray"), + $"byte[] property should not use array enumeration. Actual:\n{methodBody}"); + } + } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/SerializationCustomizationTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/SerializationCustomizationTests.cs index ea0507547ec..4c28452d689 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/SerializationCustomizationTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/SerializationCustomizationTests.cs @@ -84,6 +84,56 @@ public async Task CanCustomizeSerializationMethod() Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); } + // Validates that when a custom deserialization hook has a ModelReaderWriterOptions parameter, + // the generated code passes the options to the hook. + [Test] + public async Task CanCustomizeDeserializationMethodWithOptions() + { + var inputModel = InputFactory.Model("mockInputModel", properties: [ + InputFactory.Property("Prop1", InputPrimitiveType.String), + InputFactory.Property("Prop2", new InputNullableType(InputPrimitiveType.String)) + ], + usage: InputModelTypeUsage.Json); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel], + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider!, + name => name == "DeserializeMockInputModel")); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + // Validates that when a custom deserialization hook does not have a ModelReaderWriterOptions parameter, + // the generated code does not pass options to the hook. + [Test] + public async Task CanCustomizeDeserializationMethodWithoutOptions() + { + var inputModel = InputFactory.Model("mockInputModel", properties: [ + InputFactory.Property("Prop1", InputPrimitiveType.String), + InputFactory.Property("Prop2", new InputNullableType(InputPrimitiveType.String)) + ], + usage: InputModelTypeUsage.Json); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel], + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider!, + name => name == "DeserializeMockInputModel")); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + [Test] public async Task CanCustomizeSerializationMethodForRenamedProperty() { @@ -427,5 +477,29 @@ public async Task CanChangePropertyNameAndRedefineOriginal() var file = writer.Write(); Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); } + + [Test] + public async Task CanPreserveArrayEncodingForCustomizedProperty() + { + var props = new[] + { + InputFactory.Property("Prop1", InputFactory.Array(InputPrimitiveType.String), encode: ArrayKnownEncoding.CommaDelimited) + }; + + var inputModel = InputFactory.Model("Model", properties: props, usage: InputModelTypeUsage.Json); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel], + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider!, + name => name == "DeserializeModel" || name == "JsonModelWriteCore")); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/TestNestedDiscriminatedModelWithOwnDiscriminator.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/TestNestedDiscriminatedModelWithOwnDiscriminator.cs index d4675768e7f..cb65adf8d32 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/TestNestedDiscriminatedModelWithOwnDiscriminator.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/TestNestedDiscriminatedModelWithOwnDiscriminator.cs @@ -15,6 +15,39 @@ internal Tree() { } + protected override global::Sample.Models.Plant PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.Tree.DeserializeTree(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Tree)} does not support reading '{options.Format}' format."); + } + } + + protected override global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Tree)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.Tree global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => ((global::Sample.Models.Tree)this.PersistableModelCreateCore(data, options)); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -63,38 +96,5 @@ protected override void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrit } return global::Sample.Models.UnknownTree.DeserializeUnknownTree(element, options); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected override global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Tree)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.Tree global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => ((global::Sample.Models.Tree)this.PersistableModelCreateCore(data, options)); - - protected override global::Sample.Models.Plant PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.Tree.DeserializeTree(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Tree)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/DeserializeModelWithBinaryDataAdditionalPropsBackCompat.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/DeserializeModelWithBinaryDataAdditionalPropsBackCompat.cs new file mode 100644 index 00000000000..f796749b994 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/DeserializeModelWithBinaryDataAdditionalPropsBackCompat.cs @@ -0,0 +1,38 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Text.Json; +using Sample.Models; + +namespace Sample +{ + public partial class DynamicModel + { + internal static global::Sample.Models.DynamicModel DeserializeDynamicModel(global::System.Text.Json.JsonElement element, global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element.ValueKind == global::System.Text.Json.JsonValueKind.Null)) + { + return null; + } + string p1 = default; + global::System.Collections.Generic.IDictionary additionalProperties = new global::Sample.ChangeTrackingDictionary(); +#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + global::System.ClientModel.Primitives.JsonPatch patch = new global::System.ClientModel.Primitives.JsonPatch((data is null) ? global::System.ReadOnlyMemory.Empty : data.ToMemory()); +#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + foreach (var prop in element.EnumerateObject()) + { + if (prop.NameEquals("p1"u8)) + { + p1 = prop.Value.GetString(); + continue; + } + additionalProperties.Add(prop.Name, global::System.BinaryData.FromString(prop.Value.GetRawText())); + } + return new global::Sample.Models.DynamicModel(p1, additionalProperties, patch); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/DeserializeModelWithBinaryDataAdditionalPropsBackCompat/DynamicModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/DeserializeModelWithBinaryDataAdditionalPropsBackCompat/DynamicModel.cs new file mode 100644 index 00000000000..faa54488597 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/DeserializeModelWithBinaryDataAdditionalPropsBackCompat/DynamicModel.cs @@ -0,0 +1,14 @@ +// This file represents the previous (last contract) state of the model before @dynamicModel was added. +// It has AdditionalProperties but no JsonPatch, which triggers the backcompat path. + +using System.Collections.Generic; + +namespace Sample.Models +{ + public partial class DynamicModel + { + public string P1 { get; set; } + + public global::System.Collections.Generic.IDictionary AdditionalProperties { get; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteArrayProperties.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteArrayProperties.cs index 189b0ed3188..5890cda0ba3 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteArrayProperties.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteArrayProperties.cs @@ -12,6 +12,8 @@ namespace Sample { public partial class DynamicModel { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. @@ -118,7 +120,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite Patch.WriteTo(writer); #pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteBaseModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteBaseModel.cs index 71f77e00f8b..12b509d98ce 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteBaseModel.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteBaseModel.cs @@ -11,6 +11,8 @@ namespace Sample { public partial class Pet { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. @@ -43,7 +45,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite Patch.WriteTo(writer); #pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDerivedModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDerivedModel.cs index 864186fd775..974944c431c 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDerivedModel.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDerivedModel.cs @@ -11,6 +11,8 @@ namespace Sample { public partial class Cat { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. @@ -44,7 +46,5 @@ protected override void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrit Patch.WriteTo(writer); #pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDictionaryProperties.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDictionaryProperties.cs index 4469f4c7d00..3e786fd1bea 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDictionaryProperties.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDictionaryProperties.cs @@ -12,6 +12,8 @@ namespace Sample { public partial class DynamicModel { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. @@ -124,7 +126,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite Patch.WriteTo(writer); #pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDiscriminatedBaseModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDiscriminatedBaseModel.cs index ac04c82ea98..8fd65009f44 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDiscriminatedBaseModel.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDiscriminatedBaseModel.cs @@ -11,6 +11,8 @@ namespace Sample { public partial class Pet { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. @@ -46,7 +48,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } #pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDiscriminatedDerivedModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDiscriminatedDerivedModel.cs index 228378b1c9e..3e61ab69905 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDiscriminatedDerivedModel.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDiscriminatedDerivedModel.cs @@ -11,6 +11,8 @@ namespace Sample { public partial class Cat { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. @@ -42,7 +44,5 @@ protected override void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrit } #pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDynamicDerivedModelWithNonDiscriminatedBase.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDynamicDerivedModelWithNonDiscriminatedBase.cs index e4258ad660e..b760cd48ea1 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDynamicDerivedModelWithNonDiscriminatedBase.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteDynamicDerivedModelWithNonDiscriminatedBase.cs @@ -11,6 +11,8 @@ namespace Sample { public partial class Dog { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. @@ -48,7 +50,5 @@ protected override void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrit Patch.WriteTo(writer); #pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteModelPropertyType.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteModelPropertyType.cs index 5ce7b72971f..1674708e6ec 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteModelPropertyType.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteModelPropertyType.cs @@ -11,6 +11,8 @@ namespace Sample { public partial class DynamicModel { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. @@ -55,7 +57,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite Patch.WriteTo(writer); #pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteModelWithAdditionalProperties.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteModelWithAdditionalProperties.cs index 1e13b4623c5..ba32205599d 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteModelWithAdditionalProperties.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteModelWithAdditionalProperties.cs @@ -11,6 +11,8 @@ namespace Sample { public partial class DynamicModel { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. @@ -48,7 +50,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite Patch.WriteTo(writer); #pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteModelWithBinaryDataAdditionalPropsBackCompat.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteModelWithBinaryDataAdditionalPropsBackCompat.cs new file mode 100644 index 00000000000..53e20edaaa0 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteModelWithBinaryDataAdditionalPropsBackCompat.cs @@ -0,0 +1,61 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Text.Json; +using Sample.Models; + +namespace Sample +{ + public partial class DynamicModel + { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { +#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + if (Patch.Contains("$"u8)) + { + writer.WriteRawValue(Patch.GetJson("$"u8)); + return; + } +#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + + writer.WriteStartObject(); + this.JsonModelWriteCore(writer, options); + writer.WriteEndObject(); + } + + protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "J")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.DynamicModel)} does not support writing '{format}' format."); + } +#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + if (!Patch.Contains("$.p1"u8)) + { + writer.WritePropertyName("p1"u8); + writer.WriteStringValue(P1); + } + foreach (var item in AdditionalProperties) + { + writer.WritePropertyName(item.Key); +#if NET6_0_OR_GREATER + writer.WriteRawValue(item.Value); +#else + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(item.Value)) + { + global::System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + + Patch.WriteTo(writer); +#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteModelWithBinaryDataAdditionalPropsBackCompat/DynamicModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteModelWithBinaryDataAdditionalPropsBackCompat/DynamicModel.cs new file mode 100644 index 00000000000..faa54488597 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteModelWithBinaryDataAdditionalPropsBackCompat/DynamicModel.cs @@ -0,0 +1,14 @@ +// This file represents the previous (last contract) state of the model before @dynamicModel was added. +// It has AdditionalProperties but no JsonPatch, which triggers the backcompat path. + +using System.Collections.Generic; + +namespace Sample.Models +{ + public partial class DynamicModel + { + public string P1 { get; set; } + + public global::System.Collections.Generic.IDictionary AdditionalProperties { get; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteMultiplePrimitiveProperties.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteMultiplePrimitiveProperties.cs index 47fc8605186..e41608a7d41 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteMultiplePrimitiveProperties.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteMultiplePrimitiveProperties.cs @@ -11,6 +11,8 @@ namespace Sample { public partial class DynamicModel { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. @@ -53,7 +55,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite Patch.WriteTo(writer); #pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedArrayDictionaryProperties.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedArrayDictionaryProperties.cs index 72914d450f7..8c9ba821bd2 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedArrayDictionaryProperties.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedArrayDictionaryProperties.cs @@ -12,6 +12,8 @@ namespace Sample { public partial class DynamicModel { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. @@ -122,7 +124,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite Patch.WriteTo(writer); #pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedArrayDynamicModelProperties.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedArrayDynamicModelProperties.cs index 79056a194d5..2736fdccfd7 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedArrayDynamicModelProperties.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedArrayDynamicModelProperties.cs @@ -12,6 +12,8 @@ namespace Sample { public partial class DynamicModel { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. @@ -92,7 +94,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite Patch.WriteTo(writer); #pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedArrayPrimitiveProperties.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedArrayPrimitiveProperties.cs index 51db4873cf1..e97966c52d4 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedArrayPrimitiveProperties.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedArrayPrimitiveProperties.cs @@ -12,6 +12,8 @@ namespace Sample { public partial class DynamicModel { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. @@ -97,7 +99,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite Patch.WriteTo(writer); #pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedDictDynamicModelProperties.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedDictDynamicModelProperties.cs index f225c00b1d0..e2997e91593 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedDictDynamicModelProperties.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedDictDynamicModelProperties.cs @@ -12,6 +12,8 @@ namespace Sample { public partial class DynamicModel { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. @@ -114,7 +116,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite Patch.WriteTo(writer); #pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedDictPrimitiveProperties.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedDictPrimitiveProperties.cs index 12b9c0e22e8..0dc4862a482 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedDictPrimitiveProperties.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteNestedDictPrimitiveProperties.cs @@ -12,6 +12,8 @@ namespace Sample { public partial class DynamicModel { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. @@ -119,7 +121,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite Patch.WriteTo(writer); #pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteReadOnlySpanProperty.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteReadOnlySpanProperty.cs index 5b396f5021b..06b711420ae 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteReadOnlySpanProperty.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DynamicModelSerializationTests/WriteReadOnlySpanProperty.cs @@ -12,6 +12,8 @@ namespace Sample.Models { public partial class DynamicModel { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. @@ -62,7 +64,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite Patch.WriteTo(writer); #pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeBaseType.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeBaseType.cs index bb9d644eb64..35b533bcbe7 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeBaseType.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeBaseType.cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::Sample.Models.MockInputModelBase, global::System.ClientModel.Primitives.IJsonModel { + protected override global::Sample.Models.MockInputModelBase PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected override global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => ((global::Sample.Models.MockInputModel)this.PersistableModelCreateCore(data, options)); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -64,38 +97,5 @@ protected override void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrit } return new global::Sample.Models.MockInputModel(prop1, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected override global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => ((global::Sample.Models.MockInputModel)this.PersistableModelCreateCore(data, options)); - - protected override global::Sample.Models.MockInputModelBase PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeEnumToFieldFrameworkType.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeEnumToFieldFrameworkType.cs index 38e17d785be..62f66ef21d5 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeEnumToFieldFrameworkType.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeEnumToFieldFrameworkType.cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -87,38 +120,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.MockInputModel(prop1, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeEnumToFrameworkType.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeEnumToFrameworkType.cs index 93e46da235a..f86bef73dc2 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeEnumToFrameworkType.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeEnumToFrameworkType.cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -87,38 +120,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.MockInputModel(prop1, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeFixedEnumString.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeFixedEnumString.cs index 00e8913cdb3..3791351e95a 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeFixedEnumString.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeFixedEnumString.cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -84,38 +117,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.MockInputModel(prop1, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeNullableStringToFixedEnum.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeNullableStringToFixedEnum.cs index 00e8913cdb3..3791351e95a 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeNullableStringToFixedEnum.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeNullableStringToFixedEnum.cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -84,38 +117,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.MockInputModel(prop1, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizePropertyIntoReadOnlyMemory.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizePropertyIntoReadOnlyMemory.cs index 6727533f0aa..dd232a7bb81 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizePropertyIntoReadOnlyMemory.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizePropertyIntoReadOnlyMemory.cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -96,38 +129,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.MockInputModel(prop1, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeStringToFixedEnum.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeStringToFixedEnum.cs index 00e8913cdb3..3791351e95a 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeStringToFixedEnum.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeStringToFixedEnum.cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -84,38 +117,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.MockInputModel(prop1, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeUriProperty.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeUriProperty.cs index 5c8284fd70b..eafe4856187 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeUriProperty.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/ModelCustomizationTests/CanCustomizeUriProperty.cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -77,7 +110,7 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite { continue; } - prop1 = string.IsNullOrEmpty(prop.Value.GetString()) ? null : new global::System.Uri(prop.Value.GetString()); + prop1 = string.IsNullOrEmpty(prop.Value.GetString()) ? null : new global::System.Uri(prop.Value.GetString(), global::System.UriKind.RelativeOrAbsolute); continue; } if ((options.Format != "W")) @@ -87,38 +120,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.MockInputModel(prop1, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangeDictionaryToBinaryData.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangeDictionaryToBinaryData.cs index b70e90d45af..39469acce40 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangeDictionaryToBinaryData.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangeDictionaryToBinaryData.cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -94,38 +127,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.MockInputModel(prop1, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangeListOfEnumPropToListOfExtensibleEnum.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangeListOfEnumPropToListOfExtensibleEnum.cs index 60d445a0f33..0fe6a5d2986 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangeListOfEnumPropToListOfExtensibleEnum.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangeListOfEnumPropToListOfExtensibleEnum.cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class Model : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.Model PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.Model.DeserializeModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Model)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Model)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.Model global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -97,38 +130,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.Model((prop1 ?? new global::Sample.ChangeTrackingList()), additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Model)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.Model global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.Model PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.Model.DeserializeModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Model)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangePropertyName.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangePropertyName.cs index 3dc952dc48b..5fa1d41d2af 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangePropertyName.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangePropertyName.cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class Model : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.Model PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.Model.DeserializeModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Model)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Model)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.Model global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -109,38 +142,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.Model(prop2, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Model)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.Model global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.Model PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.Model.DeserializeModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Model)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangePropertyNameAndRedefineOriginal.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangePropertyNameAndRedefineOriginal.cs index a626b935d49..9aa065327d2 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangePropertyNameAndRedefineOriginal.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangePropertyNameAndRedefineOriginal.cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -109,38 +142,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.MockInputModel(prop2, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangePropertySerializedName.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangePropertySerializedName.cs index a75d78aba6e..b7949359dbd 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangePropertySerializedName.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanChangePropertySerializedName.cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -105,38 +138,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.MockInputModel(name, customColor, flavor, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeDeserializationMethodWithOptions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeDeserializationMethodWithOptions.cs new file mode 100644 index 00000000000..5b9e80782cf --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeDeserializationMethodWithOptions.cs @@ -0,0 +1,44 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Text.Json; +using Sample.Models; + +namespace Sample +{ + public partial class MockInputModel + { + internal static global::Sample.Models.MockInputModel DeserializeMockInputModel(global::System.Text.Json.JsonElement element, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element.ValueKind == global::System.Text.Json.JsonValueKind.Null)) + { + return null; + } + string prop1 = default; + string prop2 = default; + global::System.Collections.Generic.IDictionary additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); + foreach (var prop in element.EnumerateObject()) + { + if (prop.NameEquals("prop1"u8)) + { + DeserializationMethod(prop, ref prop1, options); + continue; + } + if (prop.NameEquals("prop2"u8)) + { + DeserializationMethod(prop, ref prop2, options); + continue; + } + if ((options.Format != "W")) + { + additionalBinaryDataProperties.Add(prop.Name, global::System.BinaryData.FromString(prop.Value.GetRawText())); + } + } + return new global::Sample.Models.MockInputModel(prop1, prop2, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeDeserializationMethodWithOptions/MockInputModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeDeserializationMethodWithOptions/MockInputModel.cs new file mode 100644 index 00000000000..b9b4c9f1370 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeDeserializationMethodWithOptions/MockInputModel.cs @@ -0,0 +1,13 @@ +using SampleTypeSpec; +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample.Models +{ + [CodeGenSerialization(nameof(Prop1), DeserializationValueHook = nameof(DeserializationMethod))] + [CodeGenSerialization(nameof(Prop2), DeserializationValueHook = nameof(DeserializationMethod))] + public partial class MockInputModel + { + private static void DeserializationMethod(JsonProperty property, ref string fieldValue, ModelReaderWriterOptions options) + => fieldValue = property.Value.GetString(); + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeDeserializationMethodWithoutOptions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeDeserializationMethodWithoutOptions.cs new file mode 100644 index 00000000000..0a95ef91408 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeDeserializationMethodWithoutOptions.cs @@ -0,0 +1,44 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Text.Json; +using Sample.Models; + +namespace Sample +{ + public partial class MockInputModel + { + internal static global::Sample.Models.MockInputModel DeserializeMockInputModel(global::System.Text.Json.JsonElement element, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element.ValueKind == global::System.Text.Json.JsonValueKind.Null)) + { + return null; + } + string prop1 = default; + string prop2 = default; + global::System.Collections.Generic.IDictionary additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); + foreach (var prop in element.EnumerateObject()) + { + if (prop.NameEquals("prop1"u8)) + { + DeserializationMethod(prop, ref prop1); + continue; + } + if (prop.NameEquals("prop2"u8)) + { + DeserializationMethod(prop, ref prop2); + continue; + } + if ((options.Format != "W")) + { + additionalBinaryDataProperties.Add(prop.Name, global::System.BinaryData.FromString(prop.Value.GetRawText())); + } + } + return new global::Sample.Models.MockInputModel(prop1, prop2, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeDeserializationMethodWithoutOptions/MockInputModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeDeserializationMethodWithoutOptions/MockInputModel.cs new file mode 100644 index 00000000000..1d78066d68f --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeDeserializationMethodWithoutOptions/MockInputModel.cs @@ -0,0 +1,12 @@ +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample.Models +{ + [CodeGenSerialization(nameof(Prop1), DeserializationValueHook = nameof(DeserializationMethod))] + [CodeGenSerialization(nameof(Prop2), DeserializationValueHook = nameof(DeserializationMethod))] + public partial class MockInputModel + { + private static void DeserializationMethod(JsonProperty property, ref string fieldValue) + => fieldValue = property.Value.GetString(); + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeExtensibleEnum(int32).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeExtensibleEnum(int32).cs index 3e9ead1f328..bb6587546f2 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeExtensibleEnum(int32).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeExtensibleEnum(int32).cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -84,38 +117,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.MockInputModel(prop1, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeExtensibleEnum(string).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeExtensibleEnum(string).cs index 80b879dab03..408d2df4d24 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeExtensibleEnum(string).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeExtensibleEnum(string).cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -84,38 +117,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.MockInputModel(prop1, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeLiteralExtensibleEnum(int32,1).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeLiteralExtensibleEnum(int32,1).cs index 3e9ead1f328..bb6587546f2 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeLiteralExtensibleEnum(int32,1).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeLiteralExtensibleEnum(int32,1).cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -84,38 +117,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.MockInputModel(prop1, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeLiteralExtensibleEnum(string,foo).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeLiteralExtensibleEnum(string,foo).cs index 80b879dab03..408d2df4d24 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeLiteralExtensibleEnum(string,foo).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeLiteralExtensibleEnum(string,foo).cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -84,38 +117,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.MockInputModel(prop1, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizePropertyUsingField.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizePropertyUsingField.cs index 8c7070f8b3e..f5152b14025 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizePropertyUsingField.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizePropertyUsingField.cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -83,38 +116,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.MockInputModel(prop1, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeSerializationMethod.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeSerializationMethod.cs index d566c635d4b..57807408e48 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeSerializationMethod.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeSerializationMethod.cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -94,38 +127,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.MockInputModel(prop1, prop2, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeSerializationMethodForPropertyInBase.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeSerializationMethodForPropertyInBase.cs index cab0cb71425..07b08ae624c 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeSerializationMethodForPropertyInBase.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeSerializationMethodForPropertyInBase.cs @@ -16,6 +16,39 @@ internal MockInputModel() { } + protected override global::Sample.Models.BaseModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected override global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => ((global::Sample.Models.MockInputModel)this.PersistableModelCreateCore(data, options)); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -76,38 +109,5 @@ protected override void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrit } return new global::Sample.Models.MockInputModel(prop1, additionalBinaryDataProperties, otherProp); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected override global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => ((global::Sample.Models.MockInputModel)this.PersistableModelCreateCore(data, options)); - - protected override global::Sample.Models.BaseModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeSerializationMethodForRenamedProperty.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeSerializationMethodForRenamedProperty.cs index 51b90cdb410..c01446428d7 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeSerializationMethodForRenamedProperty.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanCustomizeSerializationMethodForRenamedProperty.cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -94,38 +127,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.MockInputModel(prop1, prop3, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanPreserveArrayEncodingForCustomizedProperty.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanPreserveArrayEncodingForCustomizedProperty.cs new file mode 100644 index 00000000000..2d18b87d28f --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanPreserveArrayEncodingForCustomizedProperty.cs @@ -0,0 +1,72 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Text.Json; +using Sample.Models; + +namespace Sample +{ + public partial class Model + { + protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "J")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Model)} does not support writing '{format}' format."); + } + if (global::Sample.Optional.IsCollectionDefined(Prop2)) + { + writer.WritePropertyName("prop1"u8); + writer.WriteStringValue(string.Join(",", Prop2)); + } + if (((options.Format != "W") && (_additionalBinaryDataProperties != null))) + { + foreach (var item in _additionalBinaryDataProperties) + { + writer.WritePropertyName(item.Key); +#if NET6_0_OR_GREATER + writer.WriteRawValue(item.Value); +#else + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(item.Value)) + { + global::System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + } + } + + internal static global::Sample.Models.Model DeserializeModel(global::System.Text.Json.JsonElement element, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element.ValueKind == global::System.Text.Json.JsonValueKind.Null)) + { + return null; + } + global::System.Collections.Generic.IList prop2 = default; + global::System.Collections.Generic.IDictionary additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); + foreach (var prop in element.EnumerateObject()) + { + if (prop.NameEquals("prop1"u8)) + { + if ((prop.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)) + { + continue; + } + string stringValue = prop.Value.GetString(); + prop2 = string.IsNullOrEmpty(stringValue) ? new global::System.Collections.Generic.List() : new global::System.Collections.Generic.List(stringValue.Split(',')); + continue; + } + if ((options.Format != "W")) + { + additionalBinaryDataProperties.Add(prop.Name, global::System.BinaryData.FromString(prop.Value.GetRawText())); + } + } + return new global::Sample.Models.Model((prop2 ?? new global::Sample.ChangeTrackingList()), additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanPreserveArrayEncodingForCustomizedProperty/Model.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanPreserveArrayEncodingForCustomizedProperty/Model.cs new file mode 100644 index 00000000000..23bc9276356 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanPreserveArrayEncodingForCustomizedProperty/Model.cs @@ -0,0 +1,13 @@ + +using SampleTypeSpec; +using System.Collections.Generic; +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample.Models +{ + public partial class Model + { + [CodeGenMember("Prop1")] + public IList Prop2 { get; internal set; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanReplaceDeserializationMethod.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanReplaceDeserializationMethod.cs index 3c6dc1297ae..7143c9c8325 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanReplaceDeserializationMethod.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanReplaceDeserializationMethod.cs @@ -11,6 +11,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -64,38 +97,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite using global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.ParseValue(ref reader); return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanReplaceSerializationMethod.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanReplaceSerializationMethod.cs index cc858e50137..43c0bccdd13 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanReplaceSerializationMethod.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/CanReplaceSerializationMethod.cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class MockInputModel : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -65,38 +98,5 @@ public partial class MockInputModel : global::System.ClientModel.Primitives.IJso } return new global::Sample.Models.MockInputModel(prop1, prop2, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.MockInputModel.DeserializeMockInputModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/ReadOnlyMemPropertyType.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/ReadOnlyMemPropertyType.cs index d8b360de9d2..792b95a463e 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/ReadOnlyMemPropertyType.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/SerializationCustomizationTests/ReadOnlyMemPropertyType.cs @@ -12,6 +12,39 @@ namespace Sample.Models { public partial class Model : global::System.ClientModel.Primitives.IJsonModel { + protected virtual global::Sample.Models.Model PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) + { + return global::Sample.Models.Model.DeserializeModel(document.RootElement, options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Model)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Model)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.Model global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; + void global::System.ClientModel.Primitives.IJsonModel.Write(global::System.Text.Json.Utf8JsonWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) { writer.WriteStartObject(); @@ -123,38 +156,5 @@ protected virtual void JsonModelWriteCore(global::System.Text.Json.Utf8JsonWrite } return new global::Sample.Models.Model(newProp1, newProp2, additionalBinaryDataProperties); } - - global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); - - protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Model)} does not support writing '{options.Format}' format."); - } - } - - global::Sample.Models.Model global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); - - protected virtual global::Sample.Models.Model PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) - { - string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data, global::Sample.ModelSerializationExtensions.JsonDocumentOptions)) - { - return global::Sample.Models.Model.DeserializeModel(document.RootElement, options); - } - default: - throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Model)} does not support reading '{options.Format}' format."); - } - } - - string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/DeserializeXmlValueOverride_CustomTypeDeserialization.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/DeserializeXmlValueOverride_CustomTypeDeserialization.cs new file mode 100644 index 00000000000..16d6c5bd4c0 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/DeserializeXmlValueOverride_CustomTypeDeserialization.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Xml.Linq; +using Sample.Models; + +namespace Sample +{ + public partial class TestXmlModel + { + internal static global::Sample.Models.TestXmlModel DeserializeTestXmlModel(global::System.Xml.Linq.XElement element, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element == null)) + { + return null; + } + + string name = default; + global::System.Collections.Generic.IDictionary additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if ((localName == "Name")) + { + name = child.ToString(); + continue; + } + } + return new global::Sample.Models.TestXmlModel(name, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/ExplicitOperatorForJsonAndXmlModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/ExplicitOperatorForJsonAndXmlModel.cs new file mode 100644 index 00000000000..e623033da8b --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/ExplicitOperatorForJsonAndXmlModel.cs @@ -0,0 +1,36 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.IO; +using System.Text.Json; +using System.Xml.Linq; +using Sample.Models; + +namespace Sample +{ + public partial class TestModel + { + public static explicit operator TestModel(global::System.ClientModel.ClientResult result) + { + using global::System.ClientModel.Primitives.PipelineResponse response = result.GetRawResponse(); + + if ((response.Headers.TryGetValue("Content-Type", out string value) && value.StartsWith("application/json", global::System.StringComparison.OrdinalIgnoreCase))) + { + using global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(response.Content, global::Sample.ModelSerializationExtensions.JsonDocumentOptions); + return global::Sample.Models.TestModel.DeserializeTestModel(document.RootElement, global::Sample.ModelSerializationExtensions.WireOptions); + } + + using global::System.IO.Stream stream = response.ContentStream; + if ((stream == null)) + { + return default; + } + + return global::Sample.Models.TestModel.DeserializeTestModel(global::System.Xml.Linq.XElement.Load(stream, global::System.Xml.Linq.LoadOptions.PreserveWhitespace), global::Sample.ModelSerializationExtensions.WireOptions); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/ExplicitOperatorForXmlOnlyModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/ExplicitOperatorForXmlOnlyModel.cs new file mode 100644 index 00000000000..a16bbfeea64 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/ExplicitOperatorForXmlOnlyModel.cs @@ -0,0 +1,27 @@ +// + +#nullable disable + +using System.ClientModel; +using System.ClientModel.Primitives; +using System.IO; +using System.Xml.Linq; +using Sample.Models; + +namespace Sample +{ + public partial class TestXmlModel + { + public static explicit operator TestXmlModel(global::System.ClientModel.ClientResult result) + { + using global::System.ClientModel.Primitives.PipelineResponse response = result.GetRawResponse(); + using global::System.IO.Stream stream = response.ContentStream; + if ((stream == null)) + { + return default; + } + + return global::Sample.Models.TestXmlModel.DeserializeTestXmlModel(global::System.Xml.Linq.XElement.Load(stream, global::System.Xml.Linq.LoadOptions.PreserveWhitespace), global::Sample.ModelSerializationExtensions.WireOptions); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationForDiscriminatedBaseType.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationForDiscriminatedBaseType.cs new file mode 100644 index 00000000000..ea3a0c1f542 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationForDiscriminatedBaseType.cs @@ -0,0 +1,32 @@ +// + +#nullable disable + +using System.ClientModel.Primitives; +using System.Xml.Linq; +using Sample.Models; + +namespace Sample +{ + public partial class Pet + { + internal static global::Sample.Models.Pet DeserializePet(global::System.Xml.Linq.XElement element, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element == null)) + { + return null; + } + + global::System.Xml.Linq.XElement discriminatorElement = element.Element("kind"); + if ((discriminatorElement != null)) + { + switch (((string)discriminatorElement)) + { + case "cat": + return global::Sample.Models.Cat.DeserializeCat(element, options); + } + } + return global::Sample.Models.UnknownPet.DeserializeUnknownPet(element, options); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationForDiscriminatedSubtype.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationForDiscriminatedSubtype.cs new file mode 100644 index 00000000000..1c8d7084b5b --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationForDiscriminatedSubtype.cs @@ -0,0 +1,49 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Xml.Linq; +using Sample.Models; + +namespace Sample +{ + public partial class Cat + { + internal static global::Sample.Models.Cat DeserializeCat(global::System.Xml.Linq.XElement element, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element == null)) + { + return null; + } + + string kind = "cat"; + string name = default; + global::System.Collections.Generic.IDictionary additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); + bool meows = default; + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if ((localName == "kind")) + { + kind = ((string)child); + continue; + } + if ((localName == "name")) + { + name = ((string)child); + continue; + } + if ((localName == "meows")) + { + meows = ((bool)child); + continue; + } + } + return new global::Sample.Models.Cat(kind, name, additionalBinaryDataProperties, meows); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationHandlesAttributeProperties.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationHandlesAttributeProperties.cs new file mode 100644 index 00000000000..d78f351b8f9 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationHandlesAttributeProperties.cs @@ -0,0 +1,48 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Xml.Linq; +using Sample.Models; + +namespace Sample +{ + public partial class TestXmlModel + { + internal static global::Sample.Models.TestXmlModel DeserializeTestXmlModel(global::System.Xml.Linq.XElement element, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element == null)) + { + return null; + } + + string id = default; + string name = default; + global::System.Collections.Generic.IDictionary additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); + + foreach (var attr in element.Attributes()) + { + string localName = attr.Name.LocalName; + if ((localName == "id")) + { + id = ((string)attr); + continue; + } + } + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if ((localName == "name")) + { + name = ((string)child); + continue; + } + } + return new global::Sample.Models.TestXmlModel(id, name, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationHandlesAttributeWithNamespace.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationHandlesAttributeWithNamespace.cs new file mode 100644 index 00000000000..4f6df6e0015 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationHandlesAttributeWithNamespace.cs @@ -0,0 +1,60 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Xml.Linq; +using Sample.Models; + +namespace Sample +{ + public partial class TestXmlModel + { + internal static global::Sample.Models.TestXmlModel DeserializeTestXmlModel(global::System.Xml.Linq.XElement element, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element == null)) + { + return null; + } + + global::System.Xml.Linq.XNamespace labelNs = "https://example.com/ns1"; + + string id = default; + string label = default; + string name = default; + global::System.Collections.Generic.IDictionary additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); + + foreach (var attr in element.Attributes()) + { + string localName = attr.Name.LocalName; + global::System.Xml.Linq.XNamespace ns = attr.Name.Namespace; + + if ((localName == "id")) + { + id = ((string)attr); + continue; + } + if (((localName == "label") && (ns == labelNs))) + { + label = ((string)attr); + continue; + } + } + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + global::System.Xml.Linq.XNamespace ns = child.Name.Namespace; + + if ((localName == "name")) + { + name = ((string)child); + continue; + } + } + return new global::Sample.Models.TestXmlModel(id, label, name, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationHandlesElementWithNamespace.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationHandlesElementWithNamespace.cs new file mode 100644 index 00000000000..2b1beef65fa --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationHandlesElementWithNamespace.cs @@ -0,0 +1,47 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Xml.Linq; +using Sample.Models; + +namespace Sample +{ + public partial class TestXmlModel + { + internal static global::Sample.Models.TestXmlModel DeserializeTestXmlModel(global::System.Xml.Linq.XElement element, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element == null)) + { + return null; + } + + global::System.Xml.Linq.XNamespace categoryNs = "https://example.com/ns1"; + + string id = default; + string category = default; + global::System.Collections.Generic.IDictionary additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + global::System.Xml.Linq.XNamespace ns = child.Name.Namespace; + + if ((localName == "id")) + { + id = ((string)child); + continue; + } + if (((localName == "category") && (ns == categoryNs))) + { + category = ((string)child); + continue; + } + } + return new global::Sample.Models.TestXmlModel(id, category, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationMethodBodyContainsPropertyDeserialization.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationMethodBodyContainsPropertyDeserialization.cs new file mode 100644 index 00000000000..fd9978a35ca --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationMethodBodyContainsPropertyDeserialization.cs @@ -0,0 +1,57 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.IO; +using System.Xml.Linq; +using Sample; + +namespace Sample.Models +{ + public partial class TestXmlModel : global::System.ClientModel.Primitives.IPersistableModel + { + internal TestXmlModel() + { + } + + protected virtual global::Sample.Models.TestXmlModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (global::System.IO.Stream dataStream = data.ToStream()) + { + return global::Sample.Models.TestXmlModel.DeserializeTestXmlModel(global::System.Xml.Linq.XElement.Load(dataStream, global::System.Xml.Linq.LoadOptions.PreserveWhitespace), options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestXmlModel)} does not support reading '{options.Format}' format."); + } + } + + internal static global::Sample.Models.TestXmlModel DeserializeTestXmlModel(global::System.Xml.Linq.XElement element, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element == null)) + { + return null; + } + + string name = default; + global::System.Collections.Generic.IDictionary additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if ((localName == "name")) + { + name = ((string)child); + continue; + } + } + return new global::Sample.Models.TestXmlModel(name, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationMethodHandlesNestedModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationMethodHandlesNestedModel.cs new file mode 100644 index 00000000000..38232184a0d --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationMethodHandlesNestedModel.cs @@ -0,0 +1,53 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.IO; +using System.Xml.Linq; +using Sample; + +namespace Sample.Models +{ + public partial class OuterModel : global::System.ClientModel.Primitives.IPersistableModel + { + protected virtual global::Sample.Models.OuterModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (global::System.IO.Stream dataStream = data.ToStream()) + { + return global::Sample.Models.OuterModel.DeserializeOuterModel(global::System.Xml.Linq.XElement.Load(dataStream, global::System.Xml.Linq.LoadOptions.PreserveWhitespace), options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.OuterModel)} does not support reading '{options.Format}' format."); + } + } + + internal static global::Sample.Models.OuterModel DeserializeOuterModel(global::System.Xml.Linq.XElement element, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element == null)) + { + return null; + } + + global::Sample.Models.InnerModel inner = default; + global::System.Collections.Generic.IDictionary additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if ((localName == "inner")) + { + inner = global::Sample.Models.InnerModel.DeserializeInnerModel(child, options); + continue; + } + } + return new global::Sample.Models.OuterModel(inner, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationMethodHandlesOptionalUnwrappedListProperty.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationMethodHandlesOptionalUnwrappedListProperty.cs new file mode 100644 index 00000000000..b39dde3d8a1 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationMethodHandlesOptionalUnwrappedListProperty.cs @@ -0,0 +1,41 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Xml.Linq; +using Sample.Models; + +namespace Sample +{ + public partial class TestXmlModel + { + internal static global::Sample.Models.TestXmlModel DeserializeTestXmlModel(global::System.Xml.Linq.XElement element, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element == null)) + { + return null; + } + + global::System.Collections.Generic.IList colors = default; + global::System.Collections.Generic.IDictionary additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if ((localName == "colors")) + { + if ((colors == null)) + { + colors = new global::System.Collections.Generic.List(); + } + colors.Add(((string)child)); + continue; + } + } + return new global::Sample.Models.TestXmlModel((colors ?? new global::Sample.ChangeTrackingList()), additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationMethodHandlesUnwrappedListProperty.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationMethodHandlesUnwrappedListProperty.cs new file mode 100644 index 00000000000..f0924206575 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationMethodHandlesUnwrappedListProperty.cs @@ -0,0 +1,57 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.IO; +using System.Xml.Linq; +using Sample; + +namespace Sample.Models +{ + public partial class TestXmlModel : global::System.ClientModel.Primitives.IPersistableModel + { + internal TestXmlModel() + { + } + + protected virtual global::Sample.Models.TestXmlModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (global::System.IO.Stream dataStream = data.ToStream()) + { + return global::Sample.Models.TestXmlModel.DeserializeTestXmlModel(global::System.Xml.Linq.XElement.Load(dataStream, global::System.Xml.Linq.LoadOptions.PreserveWhitespace), options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestXmlModel)} does not support reading '{options.Format}' format."); + } + } + + internal static global::Sample.Models.TestXmlModel DeserializeTestXmlModel(global::System.Xml.Linq.XElement element, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element == null)) + { + return null; + } + + global::System.Collections.Generic.IList colors = new global::System.Collections.Generic.List(); + global::System.Collections.Generic.IDictionary additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if ((localName == "colors")) + { + colors.Add(((string)child)); + continue; + } + } + return new global::Sample.Models.TestXmlModel(colors, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationMethodHandlesWrappedListProperty.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationMethodHandlesWrappedListProperty.cs new file mode 100644 index 00000000000..4d90272f7c8 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlDeserializationTests/XmlDeserializationMethodHandlesWrappedListProperty.cs @@ -0,0 +1,62 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.IO; +using System.Xml.Linq; +using Sample; + +namespace Sample.Models +{ + public partial class TestXmlModel : global::System.ClientModel.Primitives.IPersistableModel + { + internal TestXmlModel() + { + } + + protected virtual global::Sample.Models.TestXmlModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (global::System.IO.Stream dataStream = data.ToStream()) + { + return global::Sample.Models.TestXmlModel.DeserializeTestXmlModel(global::System.Xml.Linq.XElement.Load(dataStream, global::System.Xml.Linq.LoadOptions.PreserveWhitespace), options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestXmlModel)} does not support reading '{options.Format}' format."); + } + } + + internal static global::Sample.Models.TestXmlModel DeserializeTestXmlModel(global::System.Xml.Linq.XElement element, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element == null)) + { + return null; + } + + global::System.Collections.Generic.IList counts = default; + global::System.Collections.Generic.IDictionary additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if ((localName == "counts")) + { + global::System.Collections.Generic.List array = new global::System.Collections.Generic.List(); + foreach (var e in child.Elements("int32")) + { + array.Add(((int)e)); + } + counts = array; + continue; + } + } + return new global::Sample.Models.TestXmlModel(counts, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanChangePropertyName.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanChangePropertyName.cs new file mode 100644 index 00000000000..57bd89ae9ec --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanChangePropertyName.cs @@ -0,0 +1,54 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Xml; +using System.Xml.Linq; +using Sample.Models; + +namespace Sample +{ + public partial class Model + { + internal virtual void XmlModelWriteCore(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "X")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Model)} does not support writing '{format}' format."); + } + + if (global::Sample.Optional.IsDefined(Prop2)) + { + writer.WriteStartElement("prop1"); + writer.WriteValue(Prop2); + writer.WriteEndElement(); + } + } + + internal static global::Sample.Models.Model DeserializeModel(global::System.Xml.Linq.XElement element, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element == null)) + { + return null; + } + + string prop2 = default; + global::System.Collections.Generic.IDictionary additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if ((localName == "prop1")) + { + prop2 = ((string)child); + continue; + } + } + return new global::Sample.Models.Model(prop2, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanChangePropertyName/Model.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanChangePropertyName/Model.cs new file mode 100644 index 00000000000..9c9442f5a3f --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanChangePropertyName/Model.cs @@ -0,0 +1,12 @@ + +using SampleTypeSpec; +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample.Models +{ + public partial class Model + { + [CodeGenMember("Prop1")] + public string Prop2 { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeAttributeDeserializationMethod.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeAttributeDeserializationMethod.cs new file mode 100644 index 00000000000..0670d9d22c3 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeAttributeDeserializationMethod.cs @@ -0,0 +1,48 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Xml.Linq; +using Sample.Models; + +namespace Sample +{ + public partial class MockInputModel + { + internal static global::Sample.Models.MockInputModel DeserializeMockInputModel(global::System.Xml.Linq.XElement element, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element == null)) + { + return null; + } + + string id = default; + string name = default; + global::System.Collections.Generic.IDictionary additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); + + foreach (var attr in element.Attributes()) + { + string localName = attr.Name.LocalName; + if ((localName == "id")) + { + DeserializationMethod(attr, ref id); + continue; + } + } + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if ((localName == "name")) + { + name = ((string)child); + continue; + } + } + return new global::Sample.Models.MockInputModel(id, name, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeAttributeDeserializationMethod/MockInputModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeAttributeDeserializationMethod/MockInputModel.cs new file mode 100644 index 00000000000..8a2fec05f39 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeAttributeDeserializationMethod/MockInputModel.cs @@ -0,0 +1,12 @@ +using System.Xml.Linq; +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample.Models +{ + [CodeGenSerialization(nameof(Id), DeserializationValueHook = nameof(DeserializationMethod))] + public partial class MockInputModel + { + private static void DeserializationMethod(XAttribute attribute, ref string fieldValue) + => fieldValue = attribute.Value; + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeAttributeSerializationMethod.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeAttributeSerializationMethod.cs new file mode 100644 index 00000000000..0f452c14f3f --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeAttributeSerializationMethod.cs @@ -0,0 +1,34 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Xml; +using Sample.Models; + +namespace Sample +{ + public partial class MockInputModel + { + internal virtual void XmlModelWriteCore(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "X")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{format}' format."); + } + + if (global::Sample.Optional.IsDefined(Id)) + { + this.SerializeIdMethod(writer, options); + } + if (global::Sample.Optional.IsDefined(Name)) + { + writer.WriteStartElement("name"); + writer.WriteValue(Name); + writer.WriteEndElement(); + } + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeAttributeSerializationMethod/MockInputModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeAttributeSerializationMethod/MockInputModel.cs new file mode 100644 index 00000000000..295de216116 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeAttributeSerializationMethod/MockInputModel.cs @@ -0,0 +1,13 @@ +using System.ClientModel.Primitives; +using System.Xml; +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample.Models +{ + [CodeGenSerialization(nameof(Id), SerializationValueHook = nameof(SerializeIdMethod))] + public partial class MockInputModel + { + private void SerializeIdMethod(XmlWriter writer, ModelReaderWriterOptions options) + => writer.WriteAttributeString("id", Id); + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeDeserializationMethod.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeDeserializationMethod.cs new file mode 100644 index 00000000000..0cc66cbc057 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeDeserializationMethod.cs @@ -0,0 +1,43 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Xml.Linq; +using Sample.Models; + +namespace Sample +{ + public partial class MockInputModel + { + internal static global::Sample.Models.MockInputModel DeserializeMockInputModel(global::System.Xml.Linq.XElement element, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element == null)) + { + return null; + } + + string prop1 = default; + string prop2 = default; + global::System.Collections.Generic.IDictionary additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if ((localName == "prop1")) + { + DeserializationMethod(child, ref prop1); + continue; + } + if ((localName == "prop2")) + { + DeserializationMethod(child, ref prop2); + continue; + } + } + return new global::Sample.Models.MockInputModel(prop1, prop2, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeDeserializationMethod/MockInputModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeDeserializationMethod/MockInputModel.cs new file mode 100644 index 00000000000..b80993c8457 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeDeserializationMethod/MockInputModel.cs @@ -0,0 +1,13 @@ +using System.Xml.Linq; +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample.Models +{ + [CodeGenSerialization(nameof(Prop1), DeserializationValueHook = nameof(DeserializationMethod))] + [CodeGenSerialization(nameof(Prop2), DeserializationValueHook = nameof(DeserializationMethod))] + public partial class MockInputModel + { + private static void DeserializationMethod(XElement element, ref string fieldValue) + => fieldValue = element.Value; + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeDeserializationMethodWithOptions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeDeserializationMethodWithOptions.cs new file mode 100644 index 00000000000..365e808343b --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeDeserializationMethodWithOptions.cs @@ -0,0 +1,43 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Xml.Linq; +using Sample.Models; + +namespace Sample +{ + public partial class MockInputModel + { + internal static global::Sample.Models.MockInputModel DeserializeMockInputModel(global::System.Xml.Linq.XElement element, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + if ((element == null)) + { + return null; + } + + string prop1 = default; + string prop2 = default; + global::System.Collections.Generic.IDictionary additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if ((localName == "prop1")) + { + DeserializationMethod(child, ref prop1, options); + continue; + } + if ((localName == "prop2")) + { + DeserializationMethod(child, ref prop2, options); + continue; + } + } + return new global::Sample.Models.MockInputModel(prop1, prop2, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeDeserializationMethodWithOptions/MockInputModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeDeserializationMethodWithOptions/MockInputModel.cs new file mode 100644 index 00000000000..014e90c75ef --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeDeserializationMethodWithOptions/MockInputModel.cs @@ -0,0 +1,14 @@ +using System.ClientModel.Primitives; +using System.Xml.Linq; +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample.Models +{ + [CodeGenSerialization(nameof(Prop1), DeserializationValueHook = nameof(DeserializationMethod))] + [CodeGenSerialization(nameof(Prop2), DeserializationValueHook = nameof(DeserializationMethod))] + public partial class MockInputModel + { + private static void DeserializationMethod(XElement element, ref string fieldValue, ModelReaderWriterOptions options) + => fieldValue = element.Value; + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeSerializationMethod.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeSerializationMethod.cs new file mode 100644 index 00000000000..0b8a5c63f8e --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeSerializationMethod.cs @@ -0,0 +1,32 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Xml; +using Sample.Models; + +namespace Sample +{ + public partial class MockInputModel + { + internal virtual void XmlModelWriteCore(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "X")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{format}' format."); + } + + if (global::Sample.Optional.IsDefined(Prop1)) + { + this.SerializationMethod(writer, options); + } + if (global::Sample.Optional.IsDefined(Prop2)) + { + this.SerializationMethod(writer, options); + } + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeSerializationMethod/MockInputModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeSerializationMethod/MockInputModel.cs new file mode 100644 index 00000000000..a27d139016d --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanCustomizeSerializationMethod/MockInputModel.cs @@ -0,0 +1,14 @@ +using System.ClientModel.Primitives; +using System.Xml; +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample.Models +{ + [CodeGenSerialization(nameof(Prop1), SerializationValueHook = nameof(SerializationMethod))] + [CodeGenSerialization(nameof(Prop2), SerializationValueHook = nameof(SerializationMethod))] + public partial class MockInputModel + { + private void SerializationMethod(XmlWriter writer, ModelReaderWriterOptions options) + => writer.WriteValue(Prop1); + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanReplaceDeserializationMethod.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanReplaceDeserializationMethod.cs new file mode 100644 index 00000000000..af15a593578 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanReplaceDeserializationMethod.cs @@ -0,0 +1,100 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.IO; +using System.Xml; +using System.Xml.Linq; +using Sample; + +namespace Sample.Models +{ + public partial class MockInputModel : global::System.ClientModel.Primitives.IPersistableModel + { + protected virtual global::Sample.Models.MockInputModel PersistableModelCreateCore(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (global::System.IO.Stream dataStream = data.ToStream()) + { + return global::Sample.Models.MockInputModel.DeserializeMockInputModel(global::System.Xml.Linq.XElement.Load(dataStream, global::System.Xml.Linq.LoadOptions.PreserveWhitespace), options); + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support reading '{options.Format}' format."); + } + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream(256)) + { + using (global::System.Xml.XmlWriter writer = global::System.Xml.XmlWriter.Create(stream, global::Sample.ModelSerializationExtensions.XmlWriterSettings)) + { + this.WriteXml(writer, options, "MockInputModel"); + } + if ((stream.Position > int.MaxValue)) + { + return global::System.BinaryData.FromStream(stream); + } + else + { + return new global::System.BinaryData(stream.GetBuffer().AsMemory(0, ((int)stream.Position))); + } + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.MockInputModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "X"; + + private void WriteXml(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options, string nameHint) + { + if ((nameHint != null)) + { + writer.WriteStartElement(nameHint); + } + + this.XmlModelWriteCore(writer, options); + + if ((nameHint != null)) + { + writer.WriteEndElement(); + } + } + + internal virtual void XmlModelWriteCore(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "X")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{format}' format."); + } + + if (global::Sample.Optional.IsDefined(Prop1)) + { + writer.WriteStartElement("prop1"); + writer.WriteValue(Prop1); + writer.WriteEndElement(); + } + if (global::Sample.Optional.IsDefined(Prop2)) + { + writer.WriteStartElement("prop2"); + writer.WriteValue(Prop2); + writer.WriteEndElement(); + } + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanReplaceDeserializationMethod/MockInputModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanReplaceDeserializationMethod/MockInputModel.cs new file mode 100644 index 00000000000..fef26bfa2df --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanReplaceDeserializationMethod/MockInputModel.cs @@ -0,0 +1,36 @@ +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Xml.Linq; +using Sample; + +namespace Sample.Models +{ + /// + public partial class MockInputModel + { + internal static MockInputModel DeserializeMockInputModel(XElement element, ModelReaderWriterOptions options) + { + if ((element == null)) + { + return null; + } + string prop1 = default; + string prop2 = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if ((localName == "prop1")) + { + prop1 = ((string)child); + continue; + } + // customization: remove Prop2 deserialization + } + return new MockInputModel(prop1, prop2, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanSerializeCustomizedNullableDateTimeOffset.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanSerializeCustomizedNullableDateTimeOffset.cs new file mode 100644 index 00000000000..e6e9288d21b --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanSerializeCustomizedNullableDateTimeOffset.cs @@ -0,0 +1,30 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Xml; +using Sample.Models; + +namespace Sample +{ + public partial class MockInputModel + { + internal virtual void XmlModelWriteCore(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "X")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.MockInputModel)} does not support writing '{format}' format."); + } + + if (global::Sample.Optional.IsDefined(CustomTimestamp)) + { + writer.WriteStartElement("timestamp"); + writer.WriteStringValue(CustomTimestamp.Value, "O"); + writer.WriteEndElement(); + } + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanSerializeCustomizedNullableDateTimeOffset/MockInputModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanSerializeCustomizedNullableDateTimeOffset/MockInputModel.cs new file mode 100644 index 00000000000..84847f65bb5 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationCustomizationTests/CanSerializeCustomizedNullableDateTimeOffset/MockInputModel.cs @@ -0,0 +1,14 @@ + +using System; +using SampleTypeSpec; +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample.Models +{ + public partial class MockInputModel + { + // Customizing Timestamp to be nullable DateTimeOffset instead of required DateTimeOffset + [CodeGenMember("Timestamp")] + public DateTimeOffset? CustomTimestamp { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/PersistableModelWriteCoreHandlesJsonAndXmlFormats.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/PersistableModelWriteCoreHandlesJsonAndXmlFormats.cs new file mode 100644 index 00000000000..8df81fa180f --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/PersistableModelWriteCoreHandlesJsonAndXmlFormats.cs @@ -0,0 +1,43 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.IO; +using System.Xml; +using Sample.Models; + +namespace Sample +{ + public partial class TestModel + { + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return global::System.ClientModel.Primitives.ModelReaderWriter.Write(this, options, global::Sample.SampleContext.Default); + case "X": + using (global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream(256)) + { + using (global::System.Xml.XmlWriter writer = global::System.Xml.XmlWriter.Create(stream, global::Sample.ModelSerializationExtensions.XmlWriterSettings)) + { + this.WriteXml(writer, options, "TestModel"); + } + if ((stream.Position > int.MaxValue)) + { + return global::System.BinaryData.FromStream(stream); + } + else + { + return new global::System.BinaryData(stream.GetBuffer().AsMemory(0, ((int)stream.Position))); + } + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestModel)} does not support writing '{options.Format}' format."); + } + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/PersistableModelWriteCoreHandlesXmlFormat.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/PersistableModelWriteCoreHandlesXmlFormat.cs new file mode 100644 index 00000000000..146c7587b39 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/PersistableModelWriteCoreHandlesXmlFormat.cs @@ -0,0 +1,41 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.IO; +using System.Xml; +using Sample.Models; + +namespace Sample +{ + public partial class TestXmlModel + { + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream(256)) + { + using (global::System.Xml.XmlWriter writer = global::System.Xml.XmlWriter.Create(stream, global::Sample.ModelSerializationExtensions.XmlWriterSettings)) + { + this.WriteXml(writer, options, "TestXmlModel"); + } + if ((stream.Position > int.MaxValue)) + { + return global::System.BinaryData.FromStream(stream); + } + else + { + return new global::System.BinaryData(stream.GetBuffer().AsMemory(0, ((int)stream.Position))); + } + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestXmlModel)} does not support writing '{options.Format}' format."); + } + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/SerializeXmlValueOverride_CustomTypeSerialization.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/SerializeXmlValueOverride_CustomTypeSerialization.cs new file mode 100644 index 00000000000..40be7e5713d --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/SerializeXmlValueOverride_CustomTypeSerialization.cs @@ -0,0 +1,30 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Xml; +using Sample.Models; + +namespace Sample +{ + public partial class TestXmlModel + { + internal virtual void XmlModelWriteCore(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "X")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestXmlModel)} does not support writing '{format}' format."); + } + + if (global::Sample.Optional.IsDefined(Name)) + { + writer.WriteStartElement("Name"); + writer.WriteValue(Name.ToString()); + writer.WriteEndElement(); + } + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlOnlyModelGeneratesIPersistableModelMethods.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlOnlyModelGeneratesIPersistableModelMethods.cs new file mode 100644 index 00000000000..c5dc681e6db --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlOnlyModelGeneratesIPersistableModelMethods.cs @@ -0,0 +1,22 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; + +namespace Sample.Models +{ + public partial class TestXmlModel : global::System.ClientModel.Primitives.IPersistableModel + { + internal TestXmlModel() + { + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + global::Sample.Models.TestXmlModel global::System.ClientModel.Primitives.IPersistableModel.Create(global::System.BinaryData data, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelCreateCore(data, options); + + string global::System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => "X"; + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationForDiscriminatedBaseType.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationForDiscriminatedBaseType.cs new file mode 100644 index 00000000000..1dcaa819dec --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationForDiscriminatedBaseType.cs @@ -0,0 +1,47 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Xml; +using Sample.Models; + +namespace Sample +{ + public partial class Pet + { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + private void WriteXml(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options, string nameHint) + { + if ((nameHint != null)) + { + writer.WriteStartElement(nameHint); + } + + this.XmlModelWriteCore(writer, options); + + if ((nameHint != null)) + { + writer.WriteEndElement(); + } + } + + internal virtual void XmlModelWriteCore(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "X")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Pet)} does not support writing '{format}' format."); + } + + writer.WriteStartElement("kind"); + writer.WriteValue(Kind); + writer.WriteEndElement(); + writer.WriteStartElement("name"); + writer.WriteValue(Name); + writer.WriteEndElement(); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationForDiscriminatedSubtype.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationForDiscriminatedSubtype.cs new file mode 100644 index 00000000000..8d0c03f9820 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationForDiscriminatedSubtype.cs @@ -0,0 +1,45 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Xml; +using Sample.Models; + +namespace Sample +{ + public partial class Cat + { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + private void WriteXml(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options, string nameHint) + { + if ((nameHint != null)) + { + writer.WriteStartElement(nameHint); + } + + this.XmlModelWriteCore(writer, options); + + if ((nameHint != null)) + { + writer.WriteEndElement(); + } + } + + internal override void XmlModelWriteCore(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "X")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.Cat)} does not support writing '{format}' format."); + } + + base.XmlModelWriteCore(writer, options); + writer.WriteStartElement("meows"); + writer.WriteValue(Meows); + writer.WriteEndElement(); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationHandlesAttributeProperties.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationHandlesAttributeProperties.cs new file mode 100644 index 00000000000..a9be8a6ed0c --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationHandlesAttributeProperties.cs @@ -0,0 +1,47 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Xml; +using Sample.Models; + +namespace Sample +{ + public partial class TestXmlModel + { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + private void WriteXml(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options, string nameHint) + { + if ((nameHint != null)) + { + writer.WriteStartElement(nameHint); + } + + this.XmlModelWriteCore(writer, options); + + if ((nameHint != null)) + { + writer.WriteEndElement(); + } + } + + internal virtual void XmlModelWriteCore(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "X")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestXmlModel)} does not support writing '{format}' format."); + } + + writer.WriteStartAttribute("id"); + writer.WriteValue(Id); + writer.WriteEndAttribute(); + writer.WriteStartElement("name"); + writer.WriteValue(Name); + writer.WriteEndElement(); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationHandlesAttributeWithNamespace.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationHandlesAttributeWithNamespace.cs new file mode 100644 index 00000000000..8952315d386 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationHandlesAttributeWithNamespace.cs @@ -0,0 +1,48 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Xml; +using Sample.Models; + +namespace Sample +{ + public partial class TestXmlModel + { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + private void WriteXml(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options, string nameHint) + { + if ((nameHint != null)) + { + writer.WriteStartElement(nameHint); + } + + this.XmlModelWriteCore(writer, options); + + if ((nameHint != null)) + { + writer.WriteEndElement(); + } + } + + internal virtual void XmlModelWriteCore(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "X")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestXmlModel)} does not support writing '{format}' format."); + } + + writer.WriteStartAttribute("id"); + writer.WriteValue(Id); + writer.WriteEndAttribute(); + writer.WriteAttributeString("ns1", "label", "https://example.com/ns1", Label); + writer.WriteStartElement("name"); + writer.WriteValue(Name); + writer.WriteEndElement(); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationHandlesElementWithNamespace.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationHandlesElementWithNamespace.cs new file mode 100644 index 00000000000..b80d87437ea --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationHandlesElementWithNamespace.cs @@ -0,0 +1,47 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Xml; +using Sample.Models; + +namespace Sample +{ + public partial class TestXmlModel + { + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + private void WriteXml(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options, string nameHint) + { + if ((nameHint != null)) + { + writer.WriteStartElement(nameHint); + } + + this.XmlModelWriteCore(writer, options); + + if ((nameHint != null)) + { + writer.WriteEndElement(); + } + } + + internal virtual void XmlModelWriteCore(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "X")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestXmlModel)} does not support writing '{format}' format."); + } + + writer.WriteStartElement("id"); + writer.WriteValue(Id); + writer.WriteEndElement(); + writer.WriteStartElement("ns1", "category", "https://example.com/ns1"); + writer.WriteValue(Category); + writer.WriteEndElement(); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationHandlesNullableDateTimeOffsetProperty.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationHandlesNullableDateTimeOffsetProperty.cs new file mode 100644 index 00000000000..a64a6102cfb --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationHandlesNullableDateTimeOffsetProperty.cs @@ -0,0 +1,74 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.IO; +using System.Xml; +using Sample; + +namespace Sample.Models +{ + public partial class TestXmlModel : global::System.ClientModel.Primitives.IPersistableModel + { + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream(256)) + { + using (global::System.Xml.XmlWriter writer = global::System.Xml.XmlWriter.Create(stream, global::Sample.ModelSerializationExtensions.XmlWriterSettings)) + { + this.WriteXml(writer, options, "TestXmlModel"); + } + if ((stream.Position > int.MaxValue)) + { + return global::System.BinaryData.FromStream(stream); + } + else + { + return new global::System.BinaryData(stream.GetBuffer().AsMemory(0, ((int)stream.Position))); + } + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestXmlModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + private void WriteXml(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options, string nameHint) + { + if ((nameHint != null)) + { + writer.WriteStartElement(nameHint); + } + + this.XmlModelWriteCore(writer, options); + + if ((nameHint != null)) + { + writer.WriteEndElement(); + } + } + + internal virtual void XmlModelWriteCore(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "X")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestXmlModel)} does not support writing '{format}' format."); + } + + if (global::Sample.Optional.IsDefined(Timestamp)) + { + writer.WriteStartElement("timestamp"); + writer.WriteStringValue(Timestamp.Value, "O"); + writer.WriteEndElement(); + } + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationHandlesNullableTimeSpanProperty.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationHandlesNullableTimeSpanProperty.cs new file mode 100644 index 00000000000..26f14a3dac1 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationHandlesNullableTimeSpanProperty.cs @@ -0,0 +1,74 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.IO; +using System.Xml; +using Sample; + +namespace Sample.Models +{ + public partial class TestXmlModel : global::System.ClientModel.Primitives.IPersistableModel + { + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream(256)) + { + using (global::System.Xml.XmlWriter writer = global::System.Xml.XmlWriter.Create(stream, global::Sample.ModelSerializationExtensions.XmlWriterSettings)) + { + this.WriteXml(writer, options, "TestXmlModel"); + } + if ((stream.Position > int.MaxValue)) + { + return global::System.BinaryData.FromStream(stream); + } + else + { + return new global::System.BinaryData(stream.GetBuffer().AsMemory(0, ((int)stream.Position))); + } + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestXmlModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + private void WriteXml(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options, string nameHint) + { + if ((nameHint != null)) + { + writer.WriteStartElement(nameHint); + } + + this.XmlModelWriteCore(writer, options); + + if ((nameHint != null)) + { + writer.WriteEndElement(); + } + } + + internal virtual void XmlModelWriteCore(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "X")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestXmlModel)} does not support writing '{format}' format."); + } + + if (global::Sample.Optional.IsDefined(Duration)) + { + writer.WriteStartElement("duration"); + writer.WriteStringValue(Duration.Value, "P"); + writer.WriteEndElement(); + } + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationMethodBodyContainsPropertySerialization.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationMethodBodyContainsPropertySerialization.cs new file mode 100644 index 00000000000..055c5ceb52a --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationMethodBodyContainsPropertySerialization.cs @@ -0,0 +1,75 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.IO; +using System.Xml; +using Sample; + +namespace Sample.Models +{ + public partial class TestXmlModel : global::System.ClientModel.Primitives.IPersistableModel + { + internal TestXmlModel() + { + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream(256)) + { + using (global::System.Xml.XmlWriter writer = global::System.Xml.XmlWriter.Create(stream, global::Sample.ModelSerializationExtensions.XmlWriterSettings)) + { + this.WriteXml(writer, options, "TestXmlModel"); + } + if ((stream.Position > int.MaxValue)) + { + return global::System.BinaryData.FromStream(stream); + } + else + { + return new global::System.BinaryData(stream.GetBuffer().AsMemory(0, ((int)stream.Position))); + } + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestXmlModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + private void WriteXml(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options, string nameHint) + { + if ((nameHint != null)) + { + writer.WriteStartElement(nameHint); + } + + this.XmlModelWriteCore(writer, options); + + if ((nameHint != null)) + { + writer.WriteEndElement(); + } + } + + internal virtual void XmlModelWriteCore(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "X")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestXmlModel)} does not support writing '{format}' format."); + } + + writer.WriteStartElement("name"); + writer.WriteValue(Name); + writer.WriteEndElement(); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationMethodHandlesNestedModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationMethodHandlesNestedModel.cs new file mode 100644 index 00000000000..f9da4005f38 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationMethodHandlesNestedModel.cs @@ -0,0 +1,74 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.IO; +using System.Xml; +using Sample; + +namespace Sample.Models +{ + public partial class OuterModel : global::System.ClientModel.Primitives.IPersistableModel + { + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream(256)) + { + using (global::System.Xml.XmlWriter writer = global::System.Xml.XmlWriter.Create(stream, global::Sample.ModelSerializationExtensions.XmlWriterSettings)) + { + this.WriteXml(writer, options, "OuterModel"); + } + if ((stream.Position > int.MaxValue)) + { + return global::System.BinaryData.FromStream(stream); + } + else + { + return new global::System.BinaryData(stream.GetBuffer().AsMemory(0, ((int)stream.Position))); + } + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.OuterModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + private void WriteXml(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options, string nameHint) + { + if ((nameHint != null)) + { + writer.WriteStartElement(nameHint); + } + + this.XmlModelWriteCore(writer, options); + + if ((nameHint != null)) + { + writer.WriteEndElement(); + } + } + + internal virtual void XmlModelWriteCore(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "X")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.OuterModel)} does not support writing '{format}' format."); + } + + if (global::Sample.Optional.IsDefined(Inner)) + { + writer.WriteStartElement("inner"); + writer.WriteObjectValue(Inner, options); + writer.WriteEndElement(); + } + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationMethodHandlesUnwrappedListProperty.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationMethodHandlesUnwrappedListProperty.cs new file mode 100644 index 00000000000..d586dc5458a --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationMethodHandlesUnwrappedListProperty.cs @@ -0,0 +1,78 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.IO; +using System.Xml; +using Sample; + +namespace Sample.Models +{ + public partial class TestXmlModel : global::System.ClientModel.Primitives.IPersistableModel + { + internal TestXmlModel() + { + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream(256)) + { + using (global::System.Xml.XmlWriter writer = global::System.Xml.XmlWriter.Create(stream, global::Sample.ModelSerializationExtensions.XmlWriterSettings)) + { + this.WriteXml(writer, options, "TestXmlModel"); + } + if ((stream.Position > int.MaxValue)) + { + return global::System.BinaryData.FromStream(stream); + } + else + { + return new global::System.BinaryData(stream.GetBuffer().AsMemory(0, ((int)stream.Position))); + } + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestXmlModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + private void WriteXml(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options, string nameHint) + { + if ((nameHint != null)) + { + writer.WriteStartElement(nameHint); + } + + this.XmlModelWriteCore(writer, options); + + if ((nameHint != null)) + { + writer.WriteEndElement(); + } + } + + internal virtual void XmlModelWriteCore(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "X")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestXmlModel)} does not support writing '{format}' format."); + } + + foreach (string item in Colors) + { + writer.WriteStartElement("String"); + writer.WriteValue(item); + writer.WriteEndElement(); + } + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationMethodHandlesWrappedListProperty.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationMethodHandlesWrappedListProperty.cs new file mode 100644 index 00000000000..044b5ce0234 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/XmlSerializationTests/XmlSerializationMethodHandlesWrappedListProperty.cs @@ -0,0 +1,80 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.IO; +using System.Xml; +using Sample; + +namespace Sample.Models +{ + public partial class TestXmlModel : global::System.ClientModel.Primitives.IPersistableModel + { + internal TestXmlModel() + { + } + + protected virtual global::System.BinaryData PersistableModelWriteCore(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream(256)) + { + using (global::System.Xml.XmlWriter writer = global::System.Xml.XmlWriter.Create(stream, global::Sample.ModelSerializationExtensions.XmlWriterSettings)) + { + this.WriteXml(writer, options, "TestXmlModel"); + } + if ((stream.Position > int.MaxValue)) + { + return global::System.BinaryData.FromStream(stream); + } + else + { + return new global::System.BinaryData(stream.GetBuffer().AsMemory(0, ((int)stream.Position))); + } + } + default: + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestXmlModel)} does not support writing '{options.Format}' format."); + } + } + + global::System.BinaryData global::System.ClientModel.Primitives.IPersistableModel.Write(global::System.ClientModel.Primitives.ModelReaderWriterOptions options) => this.PersistableModelWriteCore(options); + + private void WriteXml(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options, string nameHint) + { + if ((nameHint != null)) + { + writer.WriteStartElement(nameHint); + } + + this.XmlModelWriteCore(writer, options); + + if ((nameHint != null)) + { + writer.WriteEndElement(); + } + } + + internal virtual void XmlModelWriteCore(global::System.Xml.XmlWriter writer, global::System.ClientModel.Primitives.ModelReaderWriterOptions options) + { + string format = (options.Format == "W") ? ((global::System.ClientModel.Primitives.IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if ((format != "X")) + { + throw new global::System.FormatException($"The model {nameof(global::Sample.Models.TestXmlModel)} does not support writing '{format}' format."); + } + + writer.WriteStartElement("counts"); + foreach (int item in Counts) + { + writer.WriteStartElement("int32"); + writer.WriteValue(item); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/XmlDeserializationTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/XmlDeserializationTests.cs new file mode 100644 index 00000000000..5402cfe4b86 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/XmlDeserializationTests.cs @@ -0,0 +1,686 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using System.Xml.Linq; +using Microsoft.TypeSpec.Generator.ClientModel.Providers; +using Microsoft.TypeSpec.Generator.Expressions; +using Microsoft.TypeSpec.Generator.Input; +using Microsoft.TypeSpec.Generator.Primitives; +using Microsoft.TypeSpec.Generator.Providers; +using Microsoft.TypeSpec.Generator.Snippets; +using Microsoft.TypeSpec.Generator.Tests.Common; +using Moq; +using NUnit.Framework; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Tests.Providers.MrwSerializationTypeDefinitions +{ + public class XmlDeserializationTests + { + [SetUp] + public void SetUp() + { + MockHelpers.LoadMockGenerator(createSerializationsCore: (inputType, typeProvider) + => inputType is InputModelType modeltype ? [new MockMrwProvider(modeltype, (typeProvider as ModelProvider)!)] : []); + } + + [Test] + public void XmlDeserializationMethodIsGeneratedForXmlModel() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("Name", InputPrimitiveType.String)]); + + var modelProvider = new ModelProvider(inputModel); + var mrwProvider = modelProvider.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + + Assert.IsNotNull(mrwProvider); + var xmlDeserializationMethod = mrwProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "DeserializeTestXmlModel" && + m.Signature.Parameters.Any(p => p.Type.Equals(typeof(XElement)))); + Assert.IsNotNull(xmlDeserializationMethod, "XML deserialization method should be generated for models with XML usage"); + Assert.AreEqual("DeserializeTestXmlModel", xmlDeserializationMethod!.Signature.Name); + Assert.AreEqual(2, xmlDeserializationMethod.Signature.Parameters.Count); + Assert.AreEqual(typeof(XElement), xmlDeserializationMethod.Signature.Parameters[0].Type.FrameworkType); + Assert.IsTrue(xmlDeserializationMethod.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Internal)); + Assert.IsTrue(xmlDeserializationMethod.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Static)); + } + + [Test] + public void XmlDeserializationMethodIsNotGeneratedForJsonOnlyModel() + { + var inputModel = InputFactory.Model( + "TestJsonModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Output | InputModelTypeUsage.Json, + properties: [InputFactory.Property("Name", InputPrimitiveType.String)]); + + var modelProvider = new ModelProvider(inputModel); + var mrwProvider = modelProvider.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + + Assert.IsNotNull(mrwProvider); + var xmlDeserializationMethod = mrwProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "DeserializeTestJsonModel" && + m.Signature.Parameters.Any(p => p.Type.Equals(typeof(XElement)))); + Assert.IsNull(xmlDeserializationMethod, "XML deserialization method should NOT be generated for JSON-only models"); + } + + [Test] + public async Task XmlDeserializationMethodBodyContainsPropertyDeserialization() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("name", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("name")))]); + var mockGenerator = MockHelpers.LoadMockGenerator( + inputModels: () => [inputModel], + createSerializationsCore: (inputType, typeProvider) + => inputType is InputModelType modeltype + ? [new MockMrwProvider(modeltype, (typeProvider as ModelProvider)!)] + : []); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(serializationProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task XmlDeserializationMethodHandlesNestedModel() + { + var innerModel = InputFactory.Model( + "InnerModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("value", InputPrimitiveType.String, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("value")))]); + var outerModel = InputFactory.Model( + "OuterModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("inner", innerModel, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("inner")))]); + var mockGenerator = MockHelpers.LoadMockGenerator( + inputModels: () => [innerModel, outerModel], + createSerializationsCore: (inputType, typeProvider) + => inputType is InputModelType modeltype + ? [new MockMrwProvider(modeltype, (typeProvider as ModelProvider)!)] + : []); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "OuterModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(serializationProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task XmlDeserializationMethodHandlesUnwrappedListProperty() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "colors", + InputFactory.Array(InputPrimitiveType.String), + isRequired: true, + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("colors", unwrapped: true)))]); + var mockGenerator = MockHelpers.LoadMockGenerator( + inputModels: () => [inputModel], + createSerializationsCore: (inputType, typeProvider) + => inputType is InputModelType modeltype + ? [new MockMrwProvider(modeltype, (typeProvider as ModelProvider)!)] + : []); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(serializationProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task XmlDeserializationMethodHandlesOptionalUnwrappedListProperty() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "colors", + InputFactory.Array(InputPrimitiveType.String), + isRequired: false, + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("colors", unwrapped: true)))]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel]); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider, + name => name == "DeserializeTestXmlModel")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task XmlDeserializationMethodHandlesWrappedListProperty() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "counts", + InputFactory.Array(InputPrimitiveType.Int32), + isRequired: true, + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("counts", unwrapped: false, itemsName: "int32")))]); + var mockGenerator = MockHelpers.LoadMockGenerator( + inputModels: () => [inputModel], + createSerializationsCore: (inputType, typeProvider) + => inputType is InputModelType modeltype + ? [new MockMrwProvider(modeltype, (typeProvider as ModelProvider)!)] + : []); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(serializationProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public void XmlDeserializationHandlesDateTimeOffsetProperty() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "timestamp", + new InputDateTimeType(DateTimeKnownEncoding.Rfc3339, "utcDateTime", "TypeSpec.utcDateTime", InputPrimitiveType.String), + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("timestamp")))]); + + var modelProvider = new ModelProvider(inputModel); + var mrwProvider = modelProvider.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(mrwProvider); + var xmlDeserializationMethod = mrwProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "DeserializeTestXmlModel" && + m.Signature.Parameters.Any(p => p.Type.Equals(typeof(XElement)))); + + Assert.IsNotNull(xmlDeserializationMethod); + var methodBody = xmlDeserializationMethod!.BodyStatements!.ToDisplayString(); + + Assert.IsTrue(methodBody.Contains("timestamp = child.GetDateTimeOffset(\"O\")"), + $"DateTimeOffset property should use child.GetDateTimeOffset(\"O\") with RFC3339 format. Actual:\n{methodBody}"); + } + + [Test] + public void XmlDeserializationHandlesTimeSpanProperty() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "duration", + new InputDurationType(DurationKnownEncoding.Iso8601, "duration", "TypeSpec.duration", InputPrimitiveType.String, null), + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("duration")))]); + + var modelProvider = new ModelProvider(inputModel); + var mrwProvider = modelProvider.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(mrwProvider); + var xmlDeserializationMethod = mrwProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "DeserializeTestXmlModel" && + m.Signature.Parameters.Any(p => p.Type.Equals(typeof(XElement)))); + + Assert.IsNotNull(xmlDeserializationMethod); + var methodBody = xmlDeserializationMethod!.BodyStatements!.ToDisplayString(); + + Assert.IsTrue(methodBody.Contains("duration = child.GetTimeSpan(\"P\")"), + $"TimeSpan property should use child.GetTimeSpan(\"P\") with ISO8601 format. Actual:\n{methodBody}"); + } + + [Test] + public void XmlDeserializationHandlesBytesProperty() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "data", + InputPrimitiveType.Base64, + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("data")))]); + + var modelProvider = new ModelProvider(inputModel); + var mrwProvider = modelProvider.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(mrwProvider); + var xmlDeserializationMethod = mrwProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "DeserializeTestXmlModel" && + m.Signature.Parameters.Any(p => p.Type.Equals(typeof(XElement)))); + + Assert.IsNotNull(xmlDeserializationMethod); + var methodBody = xmlDeserializationMethod!.BodyStatements!.ToDisplayString(); + + Assert.IsTrue(methodBody.Contains("child.GetBytesFromBase64(\"D\")"), + $"Bytes property should use child.GetBytesFromBase64(\"D\") with Base64 format. Actual:\n{methodBody}"); + } + + [Test] + public void XmlDeserializationHandlesUriProperty() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "endpoint", + InputPrimitiveType.Url, + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("endpoint")))]); + + var modelProvider = new ModelProvider(inputModel); + var mrwProvider = modelProvider.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(mrwProvider); + var xmlDeserializationMethod = mrwProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "DeserializeTestXmlModel" && + m.Signature.Parameters.Any(p => p.Type.Equals(typeof(XElement)))); + + Assert.IsNotNull(xmlDeserializationMethod); + var methodBody = xmlDeserializationMethod!.BodyStatements!.ToDisplayString(); + + Assert.IsTrue(methodBody.Contains("new global::System.Uri("), + $"Uri property should use new Uri() constructor for deserialization. Actual:\n{methodBody}"); + Assert.IsTrue(methodBody.Contains("global::System.UriKind.RelativeOrAbsolute"), + $"Uri property should specify UriKind.RelativeOrAbsolute. Actual:\n{methodBody}"); + } + + [Test] + public void XmlDeserializationHandlesBinaryDataProperty() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "content", + InputPrimitiveType.Any, + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("content")))]); + + var modelProvider = new ModelProvider(inputModel); + var mrwProvider = modelProvider.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(mrwProvider); + var xmlDeserializationMethod = mrwProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "DeserializeTestXmlModel" && + m.Signature.Parameters.Any(p => p.Type.Equals(typeof(XElement)))); + + Assert.IsNotNull(xmlDeserializationMethod); + var methodBody = xmlDeserializationMethod!.BodyStatements!.ToDisplayString(); + + Assert.IsTrue(methodBody.Contains("content = global::System.BinaryData.FromString(child.Value)"), + $"BinaryData property should use BinaryData.FromString(child.Value) for deserialization. Actual:\n{methodBody}"); + } + + [Test] + public void XmlDeserializationHandlesFixedEnumProperty() + { + var enumType = InputFactory.StringEnum( + "TestEnum", + [("Value1", "value1"), ("Value2", "value2")], + isExtensible: false); + + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "status", + enumType, + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("status")))]); + + MockHelpers.LoadMockGenerator( + inputEnums: () => [enumType], + createSerializationsCore: (inputType, typeProvider) + => inputType is InputModelType modelType ? [new MrwSerializationTypeDefinition(modelType, (typeProvider as ModelProvider)!)] : []); + + var modelProvider = new ModelProvider(inputModel); + var mrwProvider = modelProvider.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(mrwProvider); + var xmlDeserializationMethod = mrwProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "DeserializeTestXmlModel" && + m.Signature.Parameters.Any(p => p.Type.Equals(typeof(XElement)))); + + Assert.IsNotNull(xmlDeserializationMethod); + var methodBody = xmlDeserializationMethod!.BodyStatements!.ToDisplayString(); + + Assert.IsTrue(methodBody.Contains("status = ((string)child).ToTestEnum()"), + $"Fixed enum property should use ToEnumName() extension method. Actual:\n{methodBody}"); + } + + [Test] + public void XmlDeserializationHandlesExtensibleEnumProperty() + { + var enumType = InputFactory.StringEnum( + "TestEnum", + [("Value1", "value1"), ("Value2", "value2")], + isExtensible: true); + + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "status", + enumType, + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("status")))]); + + MockHelpers.LoadMockGenerator( + inputEnums: () => [enumType], + createSerializationsCore: (inputType, typeProvider) + => inputType is InputModelType modelType ? [new MrwSerializationTypeDefinition(modelType, (typeProvider as ModelProvider)!)] : []); + + var modelProvider = new ModelProvider(inputModel); + var mrwProvider = modelProvider.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(mrwProvider); + var xmlDeserializationMethod = mrwProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "DeserializeTestXmlModel" && + m.Signature.Parameters.Any(p => p.Type.Equals(typeof(XElement)))); + + Assert.IsNotNull(xmlDeserializationMethod); + var methodBody = xmlDeserializationMethod!.BodyStatements!.ToDisplayString(); + + Assert.IsTrue(methodBody.Contains("status = new global::Sample.Models.TestEnum(((string)child))"), + $"Extensible enum property should use new EnumName(value) constructor. Actual:\n{methodBody}"); + } + + [Test] + public async Task XmlDeserializationForDiscriminatedBaseType() + { + var catModel = InputFactory.Model( + "cat", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + discriminatedKind: "cat", + properties: + [ + InputFactory.Property("meows", InputPrimitiveType.Boolean, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("meows"))) + ]); + var baseModel = InputFactory.Model( + "pet", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("kind", InputPrimitiveType.String, isRequired: true, isDiscriminator: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("kind"))), + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("name"))) + ], + discriminatedModels: new Dictionary() { { "cat", catModel } }); + + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [baseModel, catModel]); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "Pet") as ModelProvider; + Assert.IsNotNull(modelProvider); + var mrwProvider = modelProvider!.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(mrwProvider); + + // Validate proxy attribute is generated for discriminated base type + var proxyAttribute = mrwProvider!.Attributes.FirstOrDefault(a => a.Type.Equals(typeof(PersistableModelProxyAttribute))); + Assert.IsNotNull(proxyAttribute, "Base discriminated type should have PersistableModelProxyAttribute"); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + mrwProvider!, + name => name == "DeserializePet")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task XmlDeserializationForDiscriminatedSubtype() + { + var catModel = InputFactory.Model( + "cat", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + discriminatedKind: "cat", + properties: + [ + InputFactory.Property("meows", InputPrimitiveType.Boolean, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("meows"))) + ]); + var baseModel = InputFactory.Model( + "pet", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("kind", InputPrimitiveType.String, isRequired: true, isDiscriminator: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("kind"))), + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("name"))) + ], + discriminatedModels: new Dictionary() { { "cat", catModel } }); + + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [baseModel, catModel]); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "Cat") as ModelProvider; + Assert.IsNotNull(modelProvider); + var mrwProvider = modelProvider!.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(mrwProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + mrwProvider!, + name => name == "DeserializeCat")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task XmlDeserializationHandlesAttributeProperties() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("id", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("id", attribute: true))), + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("name"))) + ]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel]); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider, + name => name == "DeserializeTestXmlModel")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task XmlDeserializationHandlesAttributeWithNamespace() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("id", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("id", attribute: true))), + InputFactory.Property("label", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("label", attribute: true, @namespace: InputFactory.Serialization.XmlNamespace("https://example.com/ns1", "ns1")))), + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("name"))) + ]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel]); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider, + name => name == "DeserializeTestXmlModel")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task XmlDeserializationHandlesElementWithNamespace() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("id", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("id"))), + InputFactory.Property("category", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("category", @namespace: InputFactory.Serialization.XmlNamespace("https://example.com/ns1", "ns1")))) + ]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel]); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider, + name => name == "DeserializeTestXmlModel")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public void ExplicitOperatorForXmlOnlyModel() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Output | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("name"))) + ]); + + var (_, serialization) = MrwSerializationTypeDefinitionTests.CreateModelAndSerialization(inputModel); + var method = serialization.Methods.FirstOrDefault(m => m.Signature.Name == "TestXmlModel"); + Assert.IsNotNull(method); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serialization, + name => name == "TestXmlModel")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public void ExplicitOperatorForJsonAndXmlModel() + { + var inputModel = InputFactory.Model( + "TestModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Output | InputModelTypeUsage.Json | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true, wireName: "name", serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("name"))) + ]); + + var (_, serialization) = MrwSerializationTypeDefinitionTests.CreateModelAndSerialization(inputModel); + var method = serialization.Methods.FirstOrDefault(m => m.Signature.Name == "TestModel"); + Assert.IsNotNull(method); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serialization, + name => name == "TestModel")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + private class MockMrwProvider : MrwSerializationTypeDefinition + { + public MockMrwProvider(InputModelType inputModel, ModelProvider modelProvider) + : base(inputModel, modelProvider) + { + } + + protected override MethodProvider[] BuildMethods() + { + return [.. base.BuildMethods() + .Where(m => m.Signature.Name.StartsWith("Deserialize") || m.Signature.Name.StartsWith("PersistableModelCreateCore"))]; + } + + protected override FieldProvider[] BuildFields() => []; + } + + [TestCase(typeof(int), SerializationFormat.Default, ExpectedResult = "((int)foo)")] + [TestCase(typeof(string), SerializationFormat.Default, ExpectedResult = "((string)foo)")] + [TestCase(typeof(bool), SerializationFormat.Default, ExpectedResult = "((bool)foo)")] + [TestCase(typeof(long), SerializationFormat.Default, ExpectedResult = "((long)foo)")] + [TestCase(typeof(float), SerializationFormat.Default, ExpectedResult = "((float)foo)")] + [TestCase(typeof(double), SerializationFormat.Default, ExpectedResult = "((double)foo)")] + [TestCase(typeof(byte), SerializationFormat.Default, ExpectedResult = "((byte)((int)foo))")] + [TestCase(typeof(sbyte), SerializationFormat.Default, ExpectedResult = "((sbyte)((int)foo))")] + [TestCase(typeof(short), SerializationFormat.Default, ExpectedResult = "((short)((int)foo))")] + public string DeserializeXmlValueCore_PrimitiveTypes(Type type, SerializationFormat format) + { + var expr = MrwSerializationTypeDefinition.DeserializeXmlValueCore( + type, + new ScopedApi(new VariableExpression(typeof(XElement), "foo")), + new ScopedApi(new VariableExpression(typeof(ModelReaderWriterOptions), "options")), + format); + return expr.ToDisplayString(); + } + + [TestCase(SerializationFormat.DateTime_ISO8601, ExpectedResult = "foo.GetDateTimeOffset(\"O\")")] + [TestCase(SerializationFormat.DateTime_RFC1123, ExpectedResult = "foo.GetDateTimeOffset(\"R\")")] + [TestCase(SerializationFormat.DateTime_RFC3339, ExpectedResult = "foo.GetDateTimeOffset(\"O\")")] + public string DeserializeXmlValueCore_DateTimeOffset(SerializationFormat format) + { + var expr = MrwSerializationTypeDefinition.DeserializeXmlValueCore( + typeof(DateTimeOffset), + new ScopedApi(new VariableExpression(typeof(XElement), "foo")), + new ScopedApi(new VariableExpression(typeof(ModelReaderWriterOptions), "options")), + format); + return expr.ToDisplayString(); + } + + [TestCase(SerializationFormat.Duration_ISO8601, ExpectedResult = "foo.GetTimeSpan(\"P\")")] + [TestCase(SerializationFormat.Duration_Constant, ExpectedResult = "foo.GetTimeSpan(\"c\")")] + public string DeserializeXmlValueCore_TimeSpan(SerializationFormat format) + { + var expr = MrwSerializationTypeDefinition.DeserializeXmlValueCore( + typeof(TimeSpan), + new ScopedApi(new VariableExpression(typeof(XElement), "foo")), + new ScopedApi(new VariableExpression(typeof(ModelReaderWriterOptions), "options")), + format); + return expr.ToDisplayString(); + } + + [Test] + public void DeserializeXmlValueOverride_CustomTypeDeserialization() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("Name", InputPrimitiveType.String, + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("Name")))]); + + var mockGenerator = MockHelpers.LoadMockGenerator( + inputModels: () => [inputModel]); + + // override DeserializeXmlValue to return a custom expression for string types + var mockTypeFactory = Mock.Get((ScmTypeFactory)mockGenerator.Object.TypeFactory); + mockTypeFactory.Setup(p => p.DeserializeXmlValue( + It.Is(t => t.FrameworkType == typeof(string)), + It.IsAny>(), + It.IsAny>(), + It.IsAny())) + .Returns((CSharpType type, ScopedApi element, ScopedApi mrwOptions, SerializationFormat format) => + element.InvokeToString()); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider, + name => name == "DeserializeTestXmlModel")); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/XmlSerializationCustomizationTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/XmlSerializationCustomizationTests.cs new file mode 100644 index 00000000000..e85c5a4c46d --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/XmlSerializationCustomizationTests.cs @@ -0,0 +1,261 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Linq; +using System.Threading.Tasks; +using Microsoft.TypeSpec.Generator.ClientModel.Providers; +using Microsoft.TypeSpec.Generator.Input; +using Microsoft.TypeSpec.Generator.Primitives; +using Microsoft.TypeSpec.Generator.Providers; +using Microsoft.TypeSpec.Generator.Tests.Common; +using NUnit.Framework; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Tests.Providers.MrwSerializationTypeDefinitions +{ + public class XmlSerializationCustomizationTests + { + // Validates that the generated deserialization method is replaced when a custom one is provided. + [Test] + public async Task CanReplaceDeserializationMethod() + { + var inputModel = InputFactory.Model( + "mockInputModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("Prop1", InputPrimitiveType.String, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("prop1"))), + InputFactory.Property("Prop2", new InputNullableType(InputPrimitiveType.String), serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("prop2"))) + ]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel], + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var methods = serializationProvider!.Methods; + + // Validate the deserialization method doesn't exist in the serialization provider + Assert.IsNull(methods.FirstOrDefault(m => m.Signature.Name == "DeserializeMockInputModel")); + + var canonicalView = modelProvider.CanonicalView; + Assert.IsNotNull(canonicalView); + + var canonicalMethods = canonicalView.Methods; + Assert.IsNotNull(canonicalMethods); + Assert.IsNotNull(canonicalMethods.FirstOrDefault(m => m.Signature.Name == "DeserializeMockInputModel")); + + + var writer = new TypeProviderWriter(serializationProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + // Validates that a property name can be changed using CodeGenMember attribute and + // the serialization and deserialization methods use the renamed property. + [Test] + public async Task CanChangePropertyName() + { + var inputModel = InputFactory.Model( + "model", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("Prop1", InputPrimitiveType.String, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("prop1"))) + ]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel], + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + + Assert.IsNotNull(modelProvider); + Assert.IsNotNull(serializationProvider); + + // Validate that the Prop1 property was renamed to Prop2 + var customCodeView = modelProvider.CustomCodeView; + Assert.IsNotNull(customCodeView); + var customProperties = customCodeView!.Properties; + Assert.AreEqual(1, customProperties.Count); + Assert.AreEqual("Prop2", customProperties[0].Name); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider, + name => name == "DeserializeModel" || name == "XmlModelWriteCore")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + // Validates that a custom deserialization hook can be used to customize property deserialization. + [Test] + public async Task CanCustomizeDeserializationMethod() + { + var inputModel = InputFactory.Model( + "mockInputModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("Prop1", InputPrimitiveType.String, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("prop1"))), + InputFactory.Property("Prop2", new InputNullableType(InputPrimitiveType.String), serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("prop2"))) + ]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel], + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider!, + name => name == "DeserializeMockInputModel")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + // Validates that when a custom XML deserialization hook has a ModelReaderWriterOptions parameter, + // the generated code passes the options to the hook. + [Test] + public async Task CanCustomizeDeserializationMethodWithOptions() + { + var inputModel = InputFactory.Model( + "mockInputModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("Prop1", InputPrimitiveType.String, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("prop1"))), + InputFactory.Property("Prop2", new InputNullableType(InputPrimitiveType.String), serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("prop2"))) + ]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel], + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider!, + name => name == "DeserializeMockInputModel")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + // Validates that a custom deserialization hook can be used to customize attribute property deserialization. + [Test] + public async Task CanCustomizeAttributeDeserializationMethod() + { + var inputModel = InputFactory.Model( + "mockInputModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("Id", InputPrimitiveType.String, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("id", attribute: true))), + InputFactory.Property("Name", InputPrimitiveType.String, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("name"))) + ]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel], + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider!, + name => name == "DeserializeMockInputModel")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + // Validates that a custom serialization hook can be used to customize property serialization. + [Test] + public async Task CanCustomizeSerializationMethod() + { + var inputModel = InputFactory.Model( + "mockInputModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("Prop1", InputPrimitiveType.String, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("prop1"))), + InputFactory.Property("Prop2", new InputNullableType(InputPrimitiveType.String), serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("prop2"))) + ]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel], + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider!, + name => name == "XmlModelWriteCore")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + // Validates that a custom serialization hook can be used to customize attribute property serialization. + [Test] + public async Task CanCustomizeAttributeSerializationMethod() + { + var inputModel = InputFactory.Model( + "mockInputModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("Id", InputPrimitiveType.String, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("id", attribute: true))), + InputFactory.Property("Name", InputPrimitiveType.String, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("name"))) + ]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel], + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider!, + name => name == "XmlModelWriteCore")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + // Validates that a nullable DateTimeOffset property customized via custom code + // correctly accesses .Value when serializing to XML. + [Test] + public async Task CanSerializeCustomizedNullableDateTimeOffset() + { + var inputModel = InputFactory.Model( + "mockInputModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("Timestamp", new InputDateTimeType(DateTimeKnownEncoding.Rfc3339, "utcDateTime", "TypeSpec.utcDateTime", InputPrimitiveType.String), isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("timestamp"))) + ]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel], + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider!, + name => name == "XmlModelWriteCore")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/XmlSerializationTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/XmlSerializationTests.cs new file mode 100644 index 00000000000..9c22c8c08c1 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/XmlSerializationTests.cs @@ -0,0 +1,809 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using System.Xml; +using Microsoft.TypeSpec.Generator.ClientModel.Providers; +using Microsoft.TypeSpec.Generator.ClientModel.Snippets; +using Microsoft.TypeSpec.Generator.Expressions; +using Microsoft.TypeSpec.Generator.Input; +using Microsoft.TypeSpec.Generator.Primitives; +using Microsoft.TypeSpec.Generator.Providers; +using Microsoft.TypeSpec.Generator.Snippets; +using Microsoft.TypeSpec.Generator.Tests.Common; +using Moq; +using NUnit.Framework; + +namespace Microsoft.TypeSpec.Generator.ClientModel.Tests.Providers.MrwSerializationTypeDefinitions +{ + public class XmlSerializationTests + { + [SetUp] + public void SetUp() + { + MockHelpers.LoadMockGenerator(createSerializationsCore: (inputType, typeProvider) + => inputType is InputModelType modeltype ? [new MockMrwProvider(modeltype, (typeProvider as ModelProvider)!)] : []); + } + + [Test] + public void XmlSerializationMethodIsGeneratedForXmlModel() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("Name", InputPrimitiveType.String)]); + + var modelProvider = new ModelProvider(inputModel); + var mrwProvider = modelProvider.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + + Assert.IsNotNull(mrwProvider); + var xmlSerializationMethod = mrwProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "XmlModelWriteCore" && + m.Signature.Parameters.Any(p => p.Type.Equals(typeof(XmlWriter)))); + Assert.IsNotNull(xmlSerializationMethod, "XML serialization method should be generated for models with XML usage"); + Assert.AreEqual("XmlModelWriteCore", xmlSerializationMethod!.Signature.Name); + Assert.AreEqual(2, xmlSerializationMethod.Signature.Parameters.Count); + Assert.AreEqual(typeof(XmlWriter), xmlSerializationMethod.Signature.Parameters[0].Type.FrameworkType); + Assert.IsTrue(xmlSerializationMethod.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Internal)); + Assert.IsTrue(xmlSerializationMethod.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Virtual)); + } + + [Test] + public void XmlSerializationMethodIsNotGeneratedForJsonOnlyModel() + { + var inputModel = InputFactory.Model( + "TestJsonModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Output | InputModelTypeUsage.Json, + properties: [InputFactory.Property("Name", InputPrimitiveType.String)]); + + var modelProvider = new ModelProvider(inputModel); + var mrwProvider = modelProvider.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + + Assert.IsNotNull(mrwProvider); + var xmlSerializationMethod = mrwProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "XmlModelWriteCore" && + m.Signature.Parameters.Any(p => p.Type.Equals(typeof(XmlWriter)))); + Assert.IsNull(xmlSerializationMethod, "XML serialization method should NOT be generated for JSON-only models"); + } + + [Test] + public void TestBuildImplicitToBinaryContent() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("Name", InputPrimitiveType.String)]); + + var (model, serialization) = MrwSerializationTypeDefinitionTests.CreateModelAndSerialization(inputModel, isRootInput: true, isRootOutput: false); + var methods = serialization.Methods; + + Assert.IsTrue(methods.Count > 0); + + var method = methods.FirstOrDefault(m => m.Signature.Name == nameof(BinaryContent)); + + Assert.IsNotNull(method, "Implicit operator to BinaryContent should be generated for XML models that are root input models"); + + var methodSignature = method?.Signature; + Assert.IsNotNull(methodSignature); + + var expectedModifiers = MethodSignatureModifiers.Public | MethodSignatureModifiers.Static | MethodSignatureModifiers.Implicit | MethodSignatureModifiers.Operator; + Assert.AreEqual(nameof(BinaryContent), methodSignature?.Name); + Assert.AreEqual(expectedModifiers, methodSignature?.Modifiers); + + var methodParameters = methodSignature?.Parameters; + Assert.AreEqual(1, methodParameters?.Count); + Assert.IsTrue(methodSignature?.ReturnType!.Equals(typeof(BinaryContent))); + } + + [Test] + public void XmlOnlyModelImplementsIPersistableModel() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("Name", InputPrimitiveType.String)]); + + var (model, serialization) = MrwSerializationTypeDefinitionTests.CreateModelAndSerialization(inputModel, isRootInput: true, isRootOutput: false); + var interfaces = serialization.Implements; + + Assert.IsNotNull(interfaces); + Assert.AreEqual(1, interfaces.Count); + + var expectedIPersistableModelInterface = new CSharpType(typeof(IPersistableModel<>), model.Type); + Assert.IsTrue(interfaces.Any(i => i.Equals(expectedIPersistableModelInterface)), "XML-only models should implement IPersistableModel"); + + var unexpectedIJsonModelInterface = new CSharpType(typeof(IJsonModel<>), model.Type); + Assert.IsFalse(interfaces.Any(i => i.Equals(unexpectedIJsonModelInterface)), "XML-only models should NOT implement IJsonModel"); + } + + [Test] + public void JsonAndXmlModelImplementsIJsonModel() + { + var inputModel = InputFactory.Model( + "TestJsonXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Output | InputModelTypeUsage.Json | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("Name", InputPrimitiveType.String)]); + + var (model, serialization) = MrwSerializationTypeDefinitionTests.CreateModelAndSerialization(inputModel); + var interfaces = serialization.Implements; + + Assert.IsNotNull(interfaces); + Assert.AreEqual(1, interfaces.Count); + + var expectedIJsonModelInterface = new CSharpType(typeof(IJsonModel<>), model.Type); + Assert.IsTrue(interfaces.Any(i => i.Equals(expectedIJsonModelInterface)), "JSON+XML models should implement IJsonModel"); + + // IJsonModel extends IPersistableModel, so we don't need to explicitly implement IPersistableModel + var unexpectedIPersistableModelInterface = new CSharpType(typeof(IPersistableModel<>), model.Type); + Assert.IsFalse(interfaces.Any(i => i.Equals(unexpectedIPersistableModelInterface)), "JSON+XML models should implement IJsonModel not IPersistableModel directly"); + } + + [Test] + public async Task XmlOnlyModelGeneratesIPersistableModelMethods() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true, wireName: "name", serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("name"))) + ]); + var mockGenerator = MockHelpers.LoadMockGenerator( + inputModels: () => [inputModel], + createSerializationsCore: (inputType, typeProvider) + => inputType is InputModelType modeltype + ? [new MockIPersistableModelMrwProvider(modeltype, (typeProvider as ModelProvider)!)] + : []); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(serializationProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task XmlSerializationMethodBodyContainsPropertySerialization() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("name", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("name")))]); + var mockGenerator = MockHelpers.LoadMockGenerator( + inputModels: () => [inputModel], + createSerializationsCore: (inputType, typeProvider) + => inputType is InputModelType modeltype + ? [new MockMrwProvider(modeltype, (typeProvider as ModelProvider)!)] + : []); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(serializationProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task XmlSerializationMethodHandlesNestedModel() + { + var innerModel = InputFactory.Model( + "InnerModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("value", InputPrimitiveType.String, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("value")))]); + var outerModel = InputFactory.Model( + "OuterModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("inner", innerModel, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("inner")))]); + var mockGenerator = MockHelpers.LoadMockGenerator( + inputModels: () => [innerModel, outerModel], + createSerializationsCore: (inputType, typeProvider) + => inputType is InputModelType modeltype + ? [new MockMrwProvider(modeltype, (typeProvider as ModelProvider)!)] + : []); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "OuterModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(serializationProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task XmlSerializationMethodHandlesUnwrappedListProperty() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "colors", + InputFactory.Array(InputPrimitiveType.String), + isRequired: true, + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("colors", unwrapped: true)))]); + var mockGenerator = MockHelpers.LoadMockGenerator( + inputModels: () => [inputModel], + createSerializationsCore: (inputType, typeProvider) + => inputType is InputModelType modeltype + ? [new MockMrwProvider(modeltype, (typeProvider as ModelProvider)!)] + : []); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(serializationProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task XmlSerializationMethodHandlesWrappedListProperty() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "counts", + InputFactory.Array(InputPrimitiveType.Int32), + isRequired: true, + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("counts", unwrapped: false, itemsName: "int32")))]); + var mockGenerator = MockHelpers.LoadMockGenerator( + inputModels: () => [inputModel], + createSerializationsCore: (inputType, typeProvider) + => inputType is InputModelType modeltype + ? [new MockMrwProvider(modeltype, (typeProvider as ModelProvider)!)] + : []); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(serializationProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public void XmlSerializationHandlesDateTimeOffsetProperty() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "timestamp", + new InputDateTimeType(DateTimeKnownEncoding.Rfc3339, "utcDateTime", "TypeSpec.utcDateTime", InputPrimitiveType.String), + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("timestamp")))]); + + var modelProvider = new ModelProvider(inputModel); + var mrwProvider = modelProvider.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(mrwProvider); + var xmlSerializationMethod = mrwProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "XmlModelWriteCore" && + m.Signature.Parameters.Any(p => p.Type.Equals(typeof(XmlWriter)))); + + Assert.IsNotNull(xmlSerializationMethod); + var methodBody = xmlSerializationMethod!.BodyStatements!.ToDisplayString(); + + Assert.IsTrue(methodBody.Contains("WriteStringValue") && methodBody.Contains("Timestamp"), + $"DateTimeOffset property should be serialized with WriteStringValue. Actual:\n{methodBody}"); + } + + [Test] + public void XmlSerializationHandlesTimeSpanProperty() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "duration", + new InputDurationType(DurationKnownEncoding.Iso8601, "duration", "TypeSpec.duration", InputPrimitiveType.String, null), + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("duration")))]); + + var modelProvider = new ModelProvider(inputModel); + var mrwProvider = modelProvider.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(mrwProvider); + var xmlSerializationMethod = mrwProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "XmlModelWriteCore" && + m.Signature.Parameters.Any(p => p.Type.Equals(typeof(XmlWriter)))); + + Assert.IsNotNull(xmlSerializationMethod); + var methodBody = xmlSerializationMethod!.BodyStatements!.ToDisplayString(); + + Assert.IsTrue(methodBody.Contains("Duration") && methodBody.Contains("WriteStringValue"), + $"TimeSpan property should be serialized with WriteStringValue. Actual:\n{methodBody}"); + } + + [Test] + public void XmlSerializationHandlesNullableDateTimeOffsetProperty() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "timestamp", + new InputDateTimeType(DateTimeKnownEncoding.Rfc3339, "utcDateTime", "TypeSpec.utcDateTime", InputPrimitiveType.String), + isRequired: false, + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("timestamp")))]); + var mockGenerator = MockHelpers.LoadMockGenerator( + inputModels: () => [inputModel], + createSerializationsCore: (inputType, typeProvider) + => inputType is InputModelType modeltype + ? [new MockMrwProvider(modeltype, (typeProvider as ModelProvider)!)] + : []); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(serializationProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public void XmlSerializationHandlesNullableTimeSpanProperty() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "duration", + new InputDurationType(DurationKnownEncoding.Iso8601, "duration", "TypeSpec.duration", InputPrimitiveType.String, null), + isRequired: false, + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("duration")))]); + var mockGenerator = MockHelpers.LoadMockGenerator( + inputModels: () => [inputModel], + createSerializationsCore: (inputType, typeProvider) + => inputType is InputModelType modeltype + ? [new MockMrwProvider(modeltype, (typeProvider as ModelProvider)!)] + : []); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(serializationProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public void XmlSerializationHandlesBytesProperty() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "data", + InputPrimitiveType.Base64, + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("data")))]); + + var modelProvider = new ModelProvider(inputModel); + var mrwProvider = modelProvider.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(mrwProvider); + var xmlSerializationMethod = mrwProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "XmlModelWriteCore" && + m.Signature.Parameters.Any(p => p.Type.Equals(typeof(XmlWriter)))); + + Assert.IsNotNull(xmlSerializationMethod); + var methodBody = xmlSerializationMethod!.BodyStatements!.ToDisplayString(); + + Assert.IsTrue(methodBody.Contains("WriteBase64") && methodBody.Contains("Data"), + $"Bytes property should use WriteBase64 for serialization. Actual:\n{methodBody}"); + } + + [Test] + public void XmlSerializationHandlesBinaryDataProperty() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "content", + InputPrimitiveType.Any, + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("content")))]); + + var modelProvider = new ModelProvider(inputModel); + var mrwProvider = modelProvider.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(mrwProvider); + var xmlSerializationMethod = mrwProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "XmlModelWriteCore" && + m.Signature.Parameters.Any(p => p.Type.Equals(typeof(XmlWriter)))); + + Assert.IsNotNull(xmlSerializationMethod); + var methodBody = xmlSerializationMethod!.BodyStatements!.ToDisplayString(); + + Assert.IsTrue(methodBody.Contains("Content") && methodBody.Contains("WriteValue"), + $"BinaryData property should be serialized. Actual:\n{methodBody}"); + } + + [Test] + public void XmlSerializationHandlesFixedEnumProperty() + { + var enumType = InputFactory.StringEnum( + "TestEnum", + [("Value1", "value1"), ("Value2", "value2")], + isExtensible: false); + + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "status", + enumType, + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("status")))]); + + MockHelpers.LoadMockGenerator( + inputEnums: () => [enumType], + createSerializationsCore: (inputType, typeProvider) + => inputType is InputModelType modelType ? [new MrwSerializationTypeDefinition(modelType, (typeProvider as ModelProvider)!)] : []); + + var modelProvider = new ModelProvider(inputModel); + var mrwProvider = modelProvider.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(mrwProvider); + var xmlSerializationMethod = mrwProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "XmlModelWriteCore" && + m.Signature.Parameters.Any(p => p.Type.Equals(typeof(XmlWriter)))); + + Assert.IsNotNull(xmlSerializationMethod); + var methodBody = xmlSerializationMethod!.BodyStatements!.ToDisplayString(); + + Assert.IsTrue(methodBody.Contains("Status") && methodBody.Contains("ToSerialString"), + $"Fixed enum property should use ToSerialString() extension method. Actual:\n{methodBody}"); + } + + [Test] + public void XmlSerializationHandlesExtensibleEnumProperty() + { + var enumType = InputFactory.StringEnum( + "TestEnum", + [("Value1", "value1"), ("Value2", "value2")], + isExtensible: true); + + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property( + "status", + enumType, + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("status")))]); + + MockHelpers.LoadMockGenerator( + inputEnums: () => [enumType], + createSerializationsCore: (inputType, typeProvider) + => inputType is InputModelType modelType ? [new MrwSerializationTypeDefinition(modelType, (typeProvider as ModelProvider)!)] : []); + + var modelProvider = new ModelProvider(inputModel); + var mrwProvider = modelProvider.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(mrwProvider); + var xmlSerializationMethod = mrwProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "XmlModelWriteCore" && + m.Signature.Parameters.Any(p => p.Type.Equals(typeof(XmlWriter)))); + + Assert.IsNotNull(xmlSerializationMethod); + var methodBody = xmlSerializationMethod!.BodyStatements!.ToDisplayString(); + + Assert.IsTrue(methodBody.Contains("Status") && methodBody.Contains("ToString"), + $"Extensible enum property should use ToString() method. Actual:\n{methodBody}"); + } + + [Test] + public async Task XmlSerializationForDiscriminatedBaseType() + { + var catModel = InputFactory.Model( + "cat", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + discriminatedKind: "cat", + properties: + [ + InputFactory.Property("meows", InputPrimitiveType.Boolean, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("meows"))) + ]); + var baseModel = InputFactory.Model( + "pet", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("kind", InputPrimitiveType.String, isRequired: true, isDiscriminator: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("kind"))), + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("name"))) + ], + discriminatedModels: new Dictionary() { { "cat", catModel } }); + + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [baseModel, catModel]); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "Pet") as ModelProvider; + Assert.IsNotNull(modelProvider); + var mrwProvider = modelProvider!.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(mrwProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + mrwProvider!, + name => name == "XmlModelWriteCore" || name == "WriteXml" || name == "Write")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task XmlSerializationForDiscriminatedSubtype() + { + var catModel = InputFactory.Model( + "cat", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + discriminatedKind: "cat", + properties: + [ + InputFactory.Property("meows", InputPrimitiveType.Boolean, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("meows"))) + ]); + var baseModel = InputFactory.Model( + "pet", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("kind", InputPrimitiveType.String, isRequired: true, isDiscriminator: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("kind"))), + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("name"))) + ], + discriminatedModels: new Dictionary() { { "cat", catModel } }); + + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [baseModel, catModel]); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "Cat") as ModelProvider; + Assert.IsNotNull(modelProvider); + var mrwProvider = modelProvider!.SerializationProviders.FirstOrDefault() as MrwSerializationTypeDefinition; + Assert.IsNotNull(mrwProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + mrwProvider!, + name => name == "XmlModelWriteCore" || name == "WriteXml" || name == "Write")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task XmlSerializationHandlesAttributeProperties() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("id", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("id", attribute: true))), + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("name"))) + ]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel]); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider, + name => name == "XmlModelWriteCore" || name == "WriteXml" || name == "Write")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task XmlSerializationHandlesAttributeWithNamespace() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("id", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("id", attribute: true))), + InputFactory.Property("label", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("label", attribute: true, @namespace: InputFactory.Serialization.XmlNamespace("https://example.com/ns1", "ns1")))), + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("name"))) + ]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel]); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider, + name => name == "XmlModelWriteCore" || name == "WriteXml" || name == "Write")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task XmlSerializationHandlesElementWithNamespace() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("id", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("id"))), + InputFactory.Property("category", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("category", @namespace: InputFactory.Serialization.XmlNamespace("https://example.com/ns1", "ns1")))) + ]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel]); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider, + name => name == "XmlModelWriteCore" || name == "WriteXml" || name == "Write")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task PersistableModelWriteCoreHandlesXmlFormat() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Output | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true, serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("name"))) + ]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel]); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider, + name => name == "PersistableModelWriteCore")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task PersistableModelWriteCoreHandlesJsonAndXmlFormats() + { + var inputModel = InputFactory.Model( + "TestModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Output | InputModelTypeUsage.Json | InputModelTypeUsage.Xml, + properties: + [ + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true, wireName: "name", serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("name"))) + ]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [inputModel]); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider, + name => name == "PersistableModelWriteCore")); + + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [TestCase(typeof(int), SerializationFormat.Default, ExpectedResult = "writer.WriteValue(value);\n")] + [TestCase(typeof(string), SerializationFormat.Default, ExpectedResult = "writer.WriteValue(value);\n")] + [TestCase(typeof(bool), SerializationFormat.Default, ExpectedResult = "writer.WriteValue(value);\n")] + [TestCase(typeof(long), SerializationFormat.Default, ExpectedResult = "writer.WriteValue(value);\n")] + [TestCase(typeof(float), SerializationFormat.Default, ExpectedResult = "writer.WriteValue(value);\n")] + [TestCase(typeof(double), SerializationFormat.Default, ExpectedResult = "writer.WriteValue(value);\n")] + public string SerializeXmlValueCore_PrimitiveTypes(Type type, SerializationFormat format) + { + var statement = MrwSerializationTypeDefinition.SerializeXmlValueCore( + type, + new VariableExpression(type, "value"), + new ScopedApi(new VariableExpression(typeof(XmlWriter), "writer")), + new ScopedApi(new VariableExpression(typeof(ModelReaderWriterOptions), "options")), + format); + return statement.ToDisplayString(); + } + + [TestCase(SerializationFormat.DateTime_ISO8601, ExpectedResult = "writer.WriteValue(value.ToString(\"O\"));\n")] + [TestCase(SerializationFormat.DateTime_RFC1123, ExpectedResult = "writer.WriteValue(value.ToString(\"R\"));\n")] + [TestCase(SerializationFormat.DateTime_RFC3339, ExpectedResult = "writer.WriteValue(value.ToString(\"O\"));\n")] + public string SerializeXmlValueCore_DateTimeOffset(SerializationFormat format) + { + var statement = MrwSerializationTypeDefinition.SerializeXmlValueCore( + typeof(DateTimeOffset), + new VariableExpression(typeof(DateTimeOffset), "value"), + new ScopedApi(new VariableExpression(typeof(XmlWriter), "writer")), + new ScopedApi(new VariableExpression(typeof(ModelReaderWriterOptions), "options")), + format); + return statement.ToDisplayString(); + } + + [TestCase(SerializationFormat.Duration_ISO8601, ExpectedResult = "writer.WriteValue(value.ToString(\"P\"));\n")] + [TestCase(SerializationFormat.Duration_Constant, ExpectedResult = "writer.WriteValue(value.ToString(\"c\"));\n")] + public string SerializeXmlValueCore_TimeSpan(SerializationFormat format) + { + var statement = MrwSerializationTypeDefinition.SerializeXmlValueCore( + typeof(TimeSpan), + new VariableExpression(typeof(TimeSpan), "value"), + new ScopedApi(new VariableExpression(typeof(XmlWriter), "writer")), + new ScopedApi(new VariableExpression(typeof(ModelReaderWriterOptions), "options")), + format); + return statement.ToDisplayString(); + } + + [Test] + public void SerializeXmlValueOverride_CustomTypeSerialization() + { + var inputModel = InputFactory.Model( + "TestXmlModel", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("Name", InputPrimitiveType.String, + serializationOptions: InputFactory.Serialization.Options(xml: InputFactory.Serialization.Xml("Name")))]); + + var mockGenerator = MockHelpers.LoadMockGenerator( + inputModels: () => [inputModel]); + + // override SerializeXmlValue to return a custom statement for string types + var mockTypeFactory = Mock.Get((ScmTypeFactory)mockGenerator.Object.TypeFactory); + mockTypeFactory.Setup(p => p.SerializeXmlValue( + It.Is(t => t.FrameworkType == typeof(string)), + It.IsAny(), + It.IsAny>(), + It.IsAny>(), + It.IsAny())) + .Returns((CSharpType type, ValueExpression value, ScopedApi xmlWriter, ScopedApi options, SerializationFormat format) => + xmlWriter.WriteValue(value.Invoke(nameof(ToString)))); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t is ModelProvider && t.Name == "TestXmlModel"); + var serializationProvider = modelProvider.SerializationProviders.Single(t => t is MrwSerializationTypeDefinition); + Assert.IsNotNull(serializationProvider); + + var writer = new TypeProviderWriter(new FilteredMethodsTypeProvider( + serializationProvider, + name => name == "XmlModelWriteCore")); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + private class MockMrwProvider : MrwSerializationTypeDefinition + { + public MockMrwProvider(InputModelType inputModel, ModelProvider modelProvider) + : base(inputModel, modelProvider) + { + } + + protected override MethodProvider[] BuildMethods() + { + return [.. base.BuildMethods() + .Where(m => m.Signature.Name.StartsWith("XmlModelWriteCore") || + m.Signature.Name.StartsWith("PersistableModelWriteCore") || + m.Signature.Name == "WriteXml" || m.Signature.Name == "Write")]; + } + + protected override FieldProvider[] BuildFields() => []; + } + + private class MockIPersistableModelMrwProvider : MrwSerializationTypeDefinition + { + public MockIPersistableModelMrwProvider(InputModelType inputModel, ModelProvider modelProvider) + : base(inputModel, modelProvider) + { + } + + protected override MethodProvider[] BuildMethods() + { + // Filter to only include IPersistableModel explicit interface methods + return [.. base.BuildMethods() + .Where(m => m.Signature.ExplicitInterface != null && + m.Signature.ExplicitInterface.Name == "IPersistableModel")]; + } + + protected override FieldProvider[] BuildFields() => []; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/RestClientProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/RestClientProviderTests.cs index ba39f3a8488..2a9638dab4b 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/RestClientProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/RestClientProviderTests.cs @@ -4,16 +4,17 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; using Microsoft.CodeAnalysis; using Microsoft.TypeSpec.Generator.ClientModel.Providers; using Microsoft.TypeSpec.Generator.Input; +using Microsoft.TypeSpec.Generator.Input.Extensions; using Microsoft.TypeSpec.Generator.Primitives; using Microsoft.TypeSpec.Generator.Providers; -using Microsoft.TypeSpec.Generator.Tests.Common; -using NUnit.Framework; using Microsoft.TypeSpec.Generator.Snippets; using Microsoft.TypeSpec.Generator.Statements; -using Microsoft.TypeSpec.Generator.Input.Extensions; +using Microsoft.TypeSpec.Generator.Tests.Common; +using NUnit.Framework; namespace Microsoft.TypeSpec.Generator.ClientModel.Tests.Providers.RestClientProviders { @@ -133,7 +134,7 @@ public void Validate3xxRedirectStatusCode() // Validate that the classifier for 302 status code exists Dictionary propertyHash = restClient.Properties.ToDictionary(p => p.Name); - Assert.IsTrue(propertyHash.ContainsKey("PipelineMessageClassifier302"), + Assert.IsTrue(propertyHash.ContainsKey("PipelineMessageClassifier302"), "PipelineMessageClassifier302 should be present for 302 redirect"); var pipelineMessageClassifier302 = propertyHash["PipelineMessageClassifier302"]; @@ -143,7 +144,7 @@ public void Validate3xxRedirectStatusCode() // Validate that fields are created correctly Dictionary fieldHash = restClient.Fields.ToDictionary(f => f.Name); - Assert.IsTrue(fieldHash.ContainsKey("_pipelineMessageClassifier302"), + Assert.IsTrue(fieldHash.ContainsKey("_pipelineMessageClassifier302"), "_pipelineMessageClassifier302 field should be present for 302 redirect"); var pipelineMessageClassifier302Field = fieldHash["_pipelineMessageClassifier302"]; @@ -532,7 +533,7 @@ public void ValidateGetResponseClassifiersThrowsWhenNoSuccess() try { - var methods = restClientProvider.Methods; + var methods = restClientProvider.Methods; } catch (InvalidOperationException e) { @@ -624,6 +625,82 @@ public void TestBuildCreateRequestMethodWithPathParameters() Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); } + [Test] + public void TestBuildCreateRequestMethodWithQueryInPath() + { + List parameters = + [ + InputFactory.QueryParameter("copyid", InputPrimitiveType.String, isRequired: true), + ]; + var operation = InputFactory.Operation( + "abortCopyFromUrl", + parameters: parameters, + path: "?comp=copy", + httpMethod: "PUT"); + + var client = InputFactory.Client( + "TestClient", + methods: [InputFactory.BasicServiceMethod("Test", operation)]); + + var clientProvider = new ClientProvider(client); + var restClientProvider = new MockClientProvider(client, clientProvider); + + var writer = new TypeProviderWriter(restClientProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public void TestBuildCreateRequestMethodWithSlashQueryInPath() + { + List parameters = + [ + InputFactory.QueryParameter("copyid", InputPrimitiveType.String, isRequired: true), + ]; + var operation = InputFactory.Operation( + "abortCopyFromUrl", + parameters: parameters, + path: "/?comp=copy", + httpMethod: "PUT"); + + var client = InputFactory.Client( + "TestClient", + methods: [InputFactory.BasicServiceMethod("Test", operation)]); + + var clientProvider = new ClientProvider(client); + var restClientProvider = new MockClientProvider(client, clientProvider); + + var writer = new TypeProviderWriter(restClientProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public void TestBuildCreateRequestMethodWithMixedPathAndQueryInPath() + { + List parameters = + [ + InputFactory.PathParameter("p1", InputPrimitiveType.String, isRequired: true), + InputFactory.QueryParameter("optionalParam", new InputNullableType(InputPrimitiveType.String), isRequired: false), + ]; + var operation = InputFactory.Operation( + "sampleOp", + parameters: parameters, + path: "/items/{p1}?comp=copy&restype=container", + httpMethod: "PUT"); + + var client = InputFactory.Client( + "TestClient", + methods: [InputFactory.BasicServiceMethod("Test", operation)]); + + var clientProvider = new ClientProvider(client); + var restClientProvider = new MockClientProvider(client, clientProvider); + + var writer = new TypeProviderWriter(restClientProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + [TestCase(true)] [TestCase(false)] public void TestBuildCreateRequestMethodWithPaging(bool acceptIsConstant) @@ -728,7 +805,7 @@ public void TestPageSizeParameterReinjectedInCreateNextRequestMethod() var p1 = InputFactory.QueryParameter("p1", InputPrimitiveType.String, isRequired: true); var p2 = InputFactory.QueryParameter("p2", InputPrimitiveType.String, isRequired: true); var h1 = InputFactory.HeaderParameter("h1", InputPrimitiveType.String, isRequired: true); - var maxPageSize = InputFactory.QueryParameter("maxPageSize", InputPrimitiveType.Int32, isRequired: false); + var maxPageSize = InputFactory.QueryParameter("maxpagesize", InputPrimitiveType.Int32, isRequired: false); List parameters = [ p1, @@ -752,10 +829,10 @@ public void TestPageSizeParameterReinjectedInCreateNextRequestMethod() InputFactory.Property("color", InputPrimitiveType.String, isRequired: true), ]); var pagingMetadata = new InputPagingServiceMetadata( - ["cats"], - new InputNextLink(null, ["nextCat"], InputResponseLocation.Header, [p1]), + ["cats"], + new InputNextLink(null, ["nextCat"], InputResponseLocation.Header, [p1]), null, - ["maxPageSize"]); + ["maxpagesize"]); var response = InputFactory.OperationResponse( [200], InputFactory.Model( @@ -1070,6 +1147,41 @@ public void MultiServiceCombinedClient_WithThreeServices_GeneratesExpectedRestCl Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); } + [TestCase(true)] + [TestCase(false)] + public void TestCollectionHeaderPrefix_UsesAddWithPrefixCall(bool hasPrefix) + { + var metadataHeaderParam = hasPrefix + ? InputFactory.HeaderParameter( + "metadata", + InputFactory.Dictionary(InputPrimitiveType.String), + isRequired: true, + serializedName: "x-ms-meta", + collectionHeaderPrefix: "x-ms-meta-") + : InputFactory.HeaderParameter( + "metadata", + InputFactory.Dictionary(InputPrimitiveType.String), + isRequired: true, + serializedName: "x-ms-meta"); + var inputServiceMethod = InputFactory.BasicServiceMethod( + "TestServiceMethod", + InputFactory.Operation( + "TestOperation", + parameters: [metadataHeaderParam]), + parameters: + [ + InputFactory.MethodParameter("metadata", InputFactory.Dictionary(InputPrimitiveType.String), isRequired: true, location: InputRequestLocation.Header) + ]); + + var client = InputFactory.Client("TestClient", methods: [inputServiceMethod]); + var clientProvider = new ClientProvider(client); + var restClientProvider = new MockClientProvider(client, clientProvider); + + var writer = new TypeProviderWriter(restClientProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(parameters: hasPrefix.ToString()), file.Content); + } + private static void ValidateResponseClassifier(MethodBodyStatements bodyStatements, string parsedStatusCodes) { @@ -1393,6 +1505,14 @@ private static IEnumerable ValidateApiVersionPathParameterTestCase scope: InputParameterScope.Client, isApiVersion: true); + InputMethodParameter pascalCaseApiVersionParameter = InputFactory.MethodParameter( + "ApiVersion", + InputPrimitiveType.String, + location: InputRequestLocation.Uri, + isRequired: true, + scope: InputParameterScope.Client, + isApiVersion: true); + InputMethodParameter enumApiVersionParameter = InputFactory.MethodParameter( "apiVersion", InputFactory.StringEnum( @@ -1433,62 +1553,101 @@ private static IEnumerable ValidateApiVersionPathParameterTestCase uri: "{endpoint}/{apiVersion}")) ], parameters: [endpointParameter, enumApiVersionParameter])); + + yield return new TestCaseData( + InputFactory.Client( + "TestClient", + methods: + [ + InputFactory.BasicServiceMethod( + "TestServiceMethod", + InputFactory.Operation( + "TestOperation", + uri: "{endpoint}/{ApiVersion}")) + ], + parameters: [endpointParameter, stringApiVersionParameter])); + + yield return new TestCaseData( + InputFactory.Client( + "TestClient", + methods: + [ + InputFactory.BasicServiceMethod( + "TestServiceMethod", + InputFactory.Operation( + "TestOperation", + uri: "{endpoint}/{apiVersion}")) + ], + parameters: [endpointParameter, pascalCaseApiVersionParameter])); + + yield return new TestCaseData( + InputFactory.Client( + "TestClient", + methods: + [ + InputFactory.BasicServiceMethod( + "TestServiceMethod", + InputFactory.Operation( + "TestOperation", + uri: "{endpoint}/{ApiVersion}")) + ], + parameters: [endpointParameter, pascalCaseApiVersionParameter])); } [Test] public void TestApiVersionParameterReinjectedInCreateNextRequestMethod() { // Create API version parameter marked with IsApiVersion = true - var apiVersionParam = InputFactory.QueryParameter("apiVersion", InputPrimitiveType.String, + var apiVersionParam = InputFactory.QueryParameter("apiVersion", InputPrimitiveType.String, isRequired: true, serializedName: "api-version", isApiVersion: true); - var pageSizeParam = InputFactory.QueryParameter("maxpagesize", InputPrimitiveType.Int32, + var pageSizeParam = InputFactory.QueryParameter("maxpagesize", InputPrimitiveType.Int32, isRequired: false, serializedName: "maxpagesize"); - + List parameters = [ apiVersionParam, pageSizeParam, ]; - + List methodParameters = [ - InputFactory.MethodParameter("apiVersion", InputPrimitiveType.String, isRequired: true, + InputFactory.MethodParameter("apiVersion", InputPrimitiveType.String, isRequired: true, location: InputRequestLocation.Query, serializedName: "api-version"), - InputFactory.MethodParameter("maxpagesize", InputPrimitiveType.Int32, isRequired: false, + InputFactory.MethodParameter("maxpagesize", InputPrimitiveType.Int32, isRequired: false, location: InputRequestLocation.Query, serializedName: "maxpagesize"), ]; - + var inputModel = InputFactory.Model("Item", properties: [ InputFactory.Property("id", InputPrimitiveType.String, isRequired: true), ]); - - var pagingMetadata = InputFactory.NextLinkPagingMetadata(["value"], ["nextLink"], + + var pagingMetadata = InputFactory.NextLinkPagingMetadata(["value"], ["nextLink"], InputResponseLocation.Body, reinjectedParameters: []); - + var response = InputFactory.OperationResponse( [200], InputFactory.Model( "PagedItems", properties: [ - InputFactory.Property("value", InputFactory.Array(inputModel)), + InputFactory.Property("value", InputFactory.Array(inputModel)), InputFactory.Property("nextLink", InputPrimitiveType.Url) ])); - + var operation = InputFactory.Operation("listItems", responses: [response], parameters: parameters); var inputServiceMethod = InputFactory.PagingServiceMethod( "listItems", operation, pagingMetadata: pagingMetadata, parameters: methodParameters); - + var client = InputFactory.Client("TestClient", methods: [inputServiceMethod]); var clientProvider = new ClientProvider(client); var restClientProvider = new MockClientProvider(client, clientProvider); var writer = new TypeProviderWriter(restClientProvider); var file = writer.Write(); - + Assert.That(file.Content, Contains.Substring("api-version")); Assert.That(file.Content, Contains.Substring("maxpagesize")); } @@ -1496,8 +1655,6 @@ public void TestApiVersionParameterReinjectedInCreateNextRequestMethod() [Test] public void ContentTypeHeaderWrappedInNullCheckWhenContentIsOptional() { - // Test that when there's an optional body parameter with a Content-Type header, - // the Content-Type header setting is wrapped in a null check for the content parameter var contentTypeParam = InputFactory.HeaderParameter( "Content-Type", InputFactory.Literal.String("application/json"), @@ -1512,37 +1669,21 @@ public void ContentTypeHeaderWrappedInNullCheckWhenContentIsOptional() "TestOperation", requestMediaTypes: ["application/json"], parameters: [contentTypeParam, bodyParam]); - var inputServiceMethod = InputFactory.BasicServiceMethod("Test", operation); - var inputClient = InputFactory.Client("TestClient", methods: [inputServiceMethod]); - MockHelpers.LoadMockGenerator(clients: () => [inputClient]); - - var client = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(inputClient); - Assert.IsNotNull(client); - - var restClient = client!.RestClient; - Assert.IsNotNull(restClient); - - var createMethod = restClient.Methods.FirstOrDefault(m => m.Signature.Name == "CreateTestOperationRequest"); - Assert.IsNotNull(createMethod, "CreateTestOperationRequest method not found"); + var inputClient = InputFactory.Client( + "TestClient", + methods: [InputFactory.BasicServiceMethod("Test", operation)]); - var statements = createMethod!.BodyStatements as MethodBodyStatements; - Assert.IsNotNull(statements); + var clientProvider = new ClientProvider(inputClient); + var restClientProvider = new MockClientProvider(inputClient, clientProvider); - var expectedStatement = @"if ((content != null)) -{ - request.Headers.Set(""Content-Type"", ""application/json""); -} -"; - var statementsString = string.Join("\n", statements!.Select(s => s.ToDisplayString())); - Assert.IsTrue(statements!.Any(s => s.ToDisplayString() == expectedStatement), - $"Expected to find statement:\n{expectedStatement}\nBut got statements:\n{statementsString}"); + var writer = new TypeProviderWriter(restClientProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); } [Test] public void ContentTypeHeaderNotWrappedInNullCheckWhenContentIsRequired() { - // Test that when there's a required body parameter with a Content-Type header, - // the Content-Type header setting is NOT wrapped in a null check var contentTypeParam = InputFactory.HeaderParameter( "Content-Type", InputFactory.Literal.String("application/json"), @@ -1557,32 +1698,245 @@ public void ContentTypeHeaderNotWrappedInNullCheckWhenContentIsRequired() "TestOperation", requestMediaTypes: ["application/json"], parameters: [contentTypeParam, bodyParam]); - var inputServiceMethod = InputFactory.BasicServiceMethod("Test", operation); - var inputClient = InputFactory.Client("TestClient", methods: [inputServiceMethod]); - MockHelpers.LoadMockGenerator(clients: () => [inputClient]); + var inputClient = InputFactory.Client( + "TestClient", + methods: [InputFactory.BasicServiceMethod("Test", operation)]); - var client = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(inputClient); - Assert.IsNotNull(client); + var clientProvider = new ClientProvider(inputClient); + var restClientProvider = new MockClientProvider(inputClient, clientProvider); - var restClient = client!.RestClient; - Assert.IsNotNull(restClient); + var writer = new TypeProviderWriter(restClientProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public void ContentTypeHeaderWrappedInNullCheckWhenContentTypeIsOptional() + { + var contentTypeParam = InputFactory.HeaderParameter( + "Content-Type", + InputFactory.Literal.String("application/xml"), + isRequired: false, + isContentType: true, + scope: InputParameterScope.Constant); + var bodyParam = InputFactory.BodyParameter( + "body", + InputPrimitiveType.String, + isRequired: false); + var operation = InputFactory.Operation( + "TestOperation", + requestMediaTypes: ["application/xml"], + parameters: [contentTypeParam, bodyParam]); + var inputClient = InputFactory.Client( + "TestClient", + methods: [InputFactory.BasicServiceMethod("Test", operation)]); - var createMethod = restClient.Methods.FirstOrDefault(m => m.Signature.Name == "CreateTestOperationRequest"); - Assert.IsNotNull(createMethod, "CreateTestOperationRequest method not found"); + var clientProvider = new ClientProvider(inputClient); + var restClientProvider = new MockClientProvider(inputClient, clientProvider); - var statements = createMethod!.BodyStatements as MethodBodyStatements; - Assert.IsNotNull(statements); + var writer = new TypeProviderWriter(restClientProvider); + var file = writer.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } - // Verify there's no if statement wrapping the Content-Type header - var wrappedStatement = @"if ((content != null)) -{ - request.Headers.Set(""Content-Type"", ""application/json""); -} -"; - var statementsString = string.Join("\n", statements!.Select(s => s.ToDisplayString())); - var hasIfWrappedContentType = statements!.Any(s => s.ToDisplayString().Contains(wrappedStatement)); - Assert.IsFalse(hasIfWrappedContentType, - $"Content-Type should NOT be wrapped in an if statement for required content, but found:\n{statementsString}"); + [Test] + public async Task PageSizeParameterCasingPreservedFromLastContractView() + { + var pageSizeParam = InputFactory.QueryParameter("maxSizepaging", InputPrimitiveType.Int32, + isRequired: false, serializedName: "maxSizepaging"); + + List parameters = + [ + pageSizeParam, + ]; + + List methodParameters = + [ + InputFactory.MethodParameter("maxSizepaging", InputPrimitiveType.Int32, isRequired: false, + location: InputRequestLocation.Query, serializedName: "maxSizepaging"), + ]; + + var inputModel = InputFactory.Model("Item", properties: + [ + InputFactory.Property("id", InputPrimitiveType.String, isRequired: true), + ]); + + var pagingMetadata = new InputPagingServiceMetadata( + ["value"], + new InputNextLink(null, ["nextLink"], InputResponseLocation.Body, []), + null, + ["maxSizepaging"]); + + var response = InputFactory.OperationResponse( + [200], + InputFactory.Model( + "PagedItems", + properties: [ + InputFactory.Property("value", InputFactory.Array(inputModel)), + InputFactory.Property("nextLink", InputPrimitiveType.Url) + ])); + + var operation = InputFactory.Operation("GetItems", responses: [response], parameters: parameters); + var inputServiceMethod = InputFactory.PagingServiceMethod( + "GetItems", + operation, + pagingMetadata: pagingMetadata, + parameters: methodParameters); + + var client = InputFactory.Client("TestClient", methods: [inputServiceMethod]); + + var generator = await MockHelpers.LoadMockGeneratorAsync( + clients: () => [client], + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var clientProvider = generator.Object.OutputLibrary.TypeProviders.OfType().FirstOrDefault(); + Assert.IsNotNull(clientProvider); + Assert.IsNotNull(clientProvider!.LastContractView); + + var methodParams = RestClientProvider.GetMethodParameters(inputServiceMethod, ScmMethodKind.Convenience, clientProvider!); + + var pageSizeParameter = methodParams.FirstOrDefault(p => + string.Equals(p.Name, "maxsizepaging", StringComparison.Ordinal) || + string.Equals(p.Name, "maxSizepaging", StringComparison.Ordinal)); + + Assert.IsNotNull(pageSizeParameter, "Page size parameter should be present in method parameters"); + Assert.AreEqual("maxsizepaging", pageSizeParameter!.Name, + "Parameter name should be 'maxsizepaging' (from LastContractView), not 'maxSizepaging' (from input)"); + } + + [Test] + public async Task PageSizeParameterUsesConstantWhenNotInLastContractView() + { + var pageSizeParam = InputFactory.QueryParameter("maxpagesize", InputPrimitiveType.Int32, + isRequired: false, serializedName: "maxpagesize"); + + List parameters = + [ + pageSizeParam, + ]; + + List methodParameters = + [ + InputFactory.MethodParameter("maxpagesize", InputPrimitiveType.Int32, isRequired: false, + location: InputRequestLocation.Query, serializedName: "maxpagesize"), + ]; + + var inputModel = InputFactory.Model("Item", properties: + [ + InputFactory.Property("id", InputPrimitiveType.String, isRequired: true), + ]); + + var pagingMetadata = new InputPagingServiceMetadata( + ["value"], + new InputNextLink(null, ["nextLink"], InputResponseLocation.Body, []), + null, + ["maxpagesize"]); + + var response = InputFactory.OperationResponse( + [200], + InputFactory.Model( + "PagedItems", + properties: [ + InputFactory.Property("value", InputFactory.Array(inputModel)), + InputFactory.Property("nextLink", InputPrimitiveType.Url) + ])); + + var operation = InputFactory.Operation("GetItems", responses: [response], parameters: parameters); + var inputServiceMethod = InputFactory.PagingServiceMethod( + "GetItems", + operation, + pagingMetadata: pagingMetadata, + parameters: methodParameters); + + var client = InputFactory.Client("TestClient", methods: [inputServiceMethod]); + + var generator = await MockHelpers.LoadMockGeneratorAsync( + clients: () => [client], + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var clientProvider = generator.Object.OutputLibrary.TypeProviders.OfType().FirstOrDefault(); + Assert.IsNotNull(clientProvider); + Assert.IsNotNull(clientProvider!.LastContractView); + + var methodParams = RestClientProvider.GetMethodParameters(inputServiceMethod, ScmMethodKind.Convenience, clientProvider!); + + var pageSizeParameter = methodParams.FirstOrDefault(p => + string.Equals(p.Name, "maxPageSize", StringComparison.Ordinal) || + string.Equals(p.Name, "maxpagesize", StringComparison.Ordinal)); + + Assert.IsNotNull(pageSizeParameter, "Page size parameter should be present in method parameters"); + Assert.AreEqual("maxPageSize", pageSizeParameter!.Name, + "Parameter name should be 'maxPageSize' (from constant), not 'maxpagesize' (from input)"); + } + + [Test] + public void PageSizeParameterSerializedNameUsedInCreateRequestMethod() + { + var pageSizeParam = InputFactory.QueryParameter("maxpagesize", InputPrimitiveType.Int32, + isRequired: false, serializedName: "maxpagesize"); + + List parameters = [pageSizeParam]; + + List methodParameters = + [ + InputFactory.MethodParameter("maxpagesize", InputPrimitiveType.Int32, isRequired: false, + location: InputRequestLocation.Query, serializedName: "maxpagesize"), + ]; + + var inputModel = InputFactory.Model("Item", properties: + [ + InputFactory.Property("id", InputPrimitiveType.String, isRequired: true), + ]); + + var pagingMetadata = new InputPagingServiceMetadata( + ["value"], + new InputNextLink(null, ["nextLink"], InputResponseLocation.Body, []), + null, + ["maxpagesize"]); + + var response = InputFactory.OperationResponse( + [200], + InputFactory.Model( + "PagedItems", + properties: [ + InputFactory.Property("value", InputFactory.Array(inputModel)), + InputFactory.Property("nextLink", InputPrimitiveType.Url) + ])); + + var operation = InputFactory.Operation("GetItems", responses: [response], parameters: parameters); + var inputServiceMethod = InputFactory.PagingServiceMethod( + "GetItems", + operation, + pagingMetadata: pagingMetadata, + parameters: methodParameters); + + var client = InputFactory.Client("TestClient", methods: [inputServiceMethod]); + var clientProvider = new ClientProvider(client); + var restClientProvider = clientProvider.RestClient; + + // Get the CreateRequest method + var createRequestMethod = restClientProvider.Methods.FirstOrDefault(m => + m.Signature.Name == "CreateGetItemsRequest"); + + Assert.IsNotNull(createRequestMethod, "CreateGetItemsRequest method should exist"); + + // Verify the method parameter uses the corrected name + var methodParam = createRequestMethod!.Signature.Parameters.FirstOrDefault(p => + string.Equals(p.Name, "maxPageSize", StringComparison.Ordinal)); + + Assert.IsNotNull(methodParam, "Method parameter should use corrected name 'maxPageSize'"); + Assert.AreEqual("maxPageSize", methodParam!.Name, + "Method signature should use 'maxPageSize' (corrected from 'maxpagesize')"); + + var writer = new TypeProviderWriter(restClientProvider); + var file = writer.Write(); + + // The generated code should use the parameter name "maxPageSize" and append it to the query string + // The serialized name "maxpagesize" should be used in uri.AppendQuery("maxpagesize", maxPageSize, true) + Assert.IsTrue(file.Content.Contains("maxPageSize"), + "Generated code should use corrected parameter name 'maxPageSize'"); + Assert.IsTrue(file.Content.Contains("uri.AppendQuery(\"maxpagesize\""), + "Generated code should use the serialized name 'maxpagesize' in the query string"); } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/ContentTypeHeaderNotWrappedInNullCheckWhenContentIsRequired.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/ContentTypeHeaderNotWrappedInNullCheckWhenContentIsRequired.cs new file mode 100644 index 00000000000..7444c570591 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/ContentTypeHeaderNotWrappedInNullCheckWhenContentIsRequired.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Sample +{ + public partial class TestClient + { + internal global::System.ClientModel.Primitives.PipelineMessage CreateTestOperationRequest(global::System.ClientModel.BinaryContent content, global::System.ClientModel.Primitives.RequestOptions options) + { + global::Sample.ClientUriBuilder uri = new global::Sample.ClientUriBuilder(); + uri.Reset(_endpoint); + global::System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); + global::System.ClientModel.Primitives.PipelineRequest request = message.Request; + request.Headers.Set("Content-Type", "application/json"); + request.Content = content; + message.Apply(options); + return message; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/ContentTypeHeaderWrappedInNullCheckWhenContentIsOptional.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/ContentTypeHeaderWrappedInNullCheckWhenContentIsOptional.cs new file mode 100644 index 00000000000..08028ebda4d --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/ContentTypeHeaderWrappedInNullCheckWhenContentIsOptional.cs @@ -0,0 +1,27 @@ +// + +#nullable disable + +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Sample +{ + public partial class TestClient + { + internal global::System.ClientModel.Primitives.PipelineMessage CreateTestOperationRequest(global::System.ClientModel.BinaryContent content, global::System.ClientModel.Primitives.RequestOptions options) + { + global::Sample.ClientUriBuilder uri = new global::Sample.ClientUriBuilder(); + uri.Reset(_endpoint); + global::System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); + global::System.ClientModel.Primitives.PipelineRequest request = message.Request; + if ((content != null)) + { + request.Headers.Set("Content-Type", "application/json"); + } + request.Content = content; + message.Apply(options); + return message; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/ContentTypeHeaderWrappedInNullCheckWhenContentTypeIsOptional.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/ContentTypeHeaderWrappedInNullCheckWhenContentTypeIsOptional.cs new file mode 100644 index 00000000000..47ab29490c4 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/ContentTypeHeaderWrappedInNullCheckWhenContentTypeIsOptional.cs @@ -0,0 +1,27 @@ +// + +#nullable disable + +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Sample +{ + public partial class TestClient + { + internal global::System.ClientModel.Primitives.PipelineMessage CreateTestOperationRequest(global::System.ClientModel.BinaryContent content, global::System.ClientModel.Primitives.RequestOptions options) + { + global::Sample.ClientUriBuilder uri = new global::Sample.ClientUriBuilder(); + uri.Reset(_endpoint); + global::System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); + global::System.ClientModel.Primitives.PipelineRequest request = message.Request; + if ((content != null)) + { + request.Headers.Set("Content-Type", "application/xml"); + } + request.Content = content; + message.Apply(options); + return message; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/MultiServiceCombinedClient_GeneratesExpectedRestClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/MultiServiceCombinedClient_GeneratesExpectedRestClient.cs index 9c3fa24e144..c083bf8f50e 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/MultiServiceCombinedClient_GeneratesExpectedRestClient.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/MultiServiceCombinedClient_GeneratesExpectedRestClient.cs @@ -10,7 +10,7 @@ public partial class TestClient { private static global::System.ClientModel.Primitives.PipelineMessageClassifier _pipelineMessageClassifier200; - private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 = global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); + private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); internal global::System.ClientModel.Primitives.PipelineMessage CreateServiceAOperationRequest(global::System.ClientModel.Primitives.RequestOptions options) { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/MultiServiceCombinedClient_WithThreeServices_GeneratesExpectedRestClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/MultiServiceCombinedClient_WithThreeServices_GeneratesExpectedRestClient.cs index 5055536305c..15cc22e0e14 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/MultiServiceCombinedClient_WithThreeServices_GeneratesExpectedRestClient.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/MultiServiceCombinedClient_WithThreeServices_GeneratesExpectedRestClient.cs @@ -10,13 +10,13 @@ public partial class TestClient { private static global::System.ClientModel.Primitives.PipelineMessageClassifier _pipelineMessageClassifier200; - private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 = global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); + private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); internal global::System.ClientModel.Primitives.PipelineMessage CreateKeyVaultOperationRequest(global::System.ClientModel.Primitives.RequestOptions options) { global::Sample.ClientUriBuilder uri = new global::Sample.ClientUriBuilder(); uri.Reset(_endpoint); - uri.AppendQuery("apiVersion", _serviceKeyVaultApiVersion, true); + uri.AppendQuery("apiVersion", _keyVaultApiVersion, true); global::System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); global::System.ClientModel.Primitives.PipelineRequest request = message.Request; message.Apply(options); @@ -27,7 +27,7 @@ public partial class TestClient { global::Sample.ClientUriBuilder uri = new global::Sample.ClientUriBuilder(); uri.Reset(_endpoint); - uri.AppendQuery("apiVersion", _serviceStorageApiVersion, true); + uri.AppendQuery("apiVersion", _storageApiVersion, true); global::System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); global::System.ClientModel.Primitives.PipelineRequest request = message.Request; message.Apply(options); @@ -38,7 +38,7 @@ public partial class TestClient { global::Sample.ClientUriBuilder uri = new global::Sample.ClientUriBuilder(); uri.Reset(_endpoint); - uri.AppendQuery("apiVersion", _serviceComputeApiVersion, true); + uri.AppendQuery("apiVersion", _computeApiVersion, true); global::System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); global::System.ClientModel.Primitives.PipelineRequest request = message.Request; message.Apply(options); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/PageSizeParameterCasingPreservedFromLastContractView/TestClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/PageSizeParameterCasingPreservedFromLastContractView/TestClient.cs new file mode 100644 index 00000000000..eb748ec70fc --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/PageSizeParameterCasingPreservedFromLastContractView/TestClient.cs @@ -0,0 +1,15 @@ +#nullable disable + +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading.Tasks; + +namespace Sample +{ + public partial class TestClient + { + // This represents the previous contract with maxsizepaging parameter + public virtual Task GetItemsAsync(int? maxsizepaging, CancellationToken cancellationToken = default) { return null; } + public virtual ClientResult GetItems(int? maxsizepaging, CancellationToken cancellationToken = default) { return null; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/PageSizeParameterUsesConstantWhenNotInLastContractView/TestClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/PageSizeParameterUsesConstantWhenNotInLastContractView/TestClient.cs new file mode 100644 index 00000000000..2206fa7fbd6 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/PageSizeParameterUsesConstantWhenNotInLastContractView/TestClient.cs @@ -0,0 +1,15 @@ +#nullable disable + +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading.Tasks; + +namespace Sample +{ + public partial class TestClient + { + // This represents a previous contract WITHOUT maxPageSize parameter + public virtual Task GetItemsAsync(string someOtherParam, CancellationToken cancellationToken = default) { return null; } + public virtual ClientResult GetItems(string someOtherParam, CancellationToken cancellationToken = default) { return null; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestBuildCreateRequestMethodWithMixedPathAndQueryInPath.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestBuildCreateRequestMethodWithMixedPathAndQueryInPath.cs new file mode 100644 index 00000000000..8fef9bd07e7 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestBuildCreateRequestMethodWithMixedPathAndQueryInPath.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System.ClientModel.Primitives; + +namespace Sample +{ + public partial class TestClient + { + internal global::System.ClientModel.Primitives.PipelineMessage CreateSampleOpRequest(string p1, string optionalParam, global::System.ClientModel.Primitives.RequestOptions options) + { + global::Sample.ClientUriBuilder uri = new global::Sample.ClientUriBuilder(); + uri.Reset(_endpoint); + uri.AppendPath("/items/", false); + uri.AppendPath(p1, true); + uri.AppendQuery("comp", "copy", true); + uri.AppendQuery("restype", "container", true); + if ((optionalParam != null)) + { + uri.AppendQuery("optionalParam", optionalParam, true); + } + global::System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "PUT", PipelineMessageClassifier200); + global::System.ClientModel.Primitives.PipelineRequest request = message.Request; + message.Apply(options); + return message; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestBuildCreateRequestMethodWithPaging(False).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestBuildCreateRequestMethodWithPaging(False).cs index 172cc6077aa..6b51772b28b 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestBuildCreateRequestMethodWithPaging(False).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestBuildCreateRequestMethodWithPaging(False).cs @@ -33,7 +33,14 @@ public partial class TestClient internal global::System.ClientModel.Primitives.PipelineMessage CreateNextGetCatsRequest(global::System.Uri nextPage, string p1, global::System.Collections.Generic.IEnumerable p2, global::System.Collections.Generic.IDictionary p3, string accept, global::System.ClientModel.Primitives.RequestOptions options) { global::Sample.ClientUriBuilder uri = new global::Sample.ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(new global::System.Uri(_endpoint, nextPage)); + } global::System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); global::System.ClientModel.Primitives.PipelineRequest request = message.Request; request.Headers.Set("Accept", accept); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestBuildCreateRequestMethodWithPaging(True).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestBuildCreateRequestMethodWithPaging(True).cs index c62c9053909..832945305d4 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestBuildCreateRequestMethodWithPaging(True).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestBuildCreateRequestMethodWithPaging(True).cs @@ -33,7 +33,14 @@ public partial class TestClient internal global::System.ClientModel.Primitives.PipelineMessage CreateNextGetCatsRequest(global::System.Uri nextPage, string p1, global::System.Collections.Generic.IEnumerable p2, global::System.Collections.Generic.IDictionary p3, global::System.ClientModel.Primitives.RequestOptions options) { global::Sample.ClientUriBuilder uri = new global::Sample.ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(new global::System.Uri(_endpoint, nextPage)); + } global::System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); global::System.ClientModel.Primitives.PipelineRequest request = message.Request; request.Headers.Set("Accept", "application/json"); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestBuildCreateRequestMethodWithQueryInPath.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestBuildCreateRequestMethodWithQueryInPath.cs new file mode 100644 index 00000000000..903e0990ec9 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestBuildCreateRequestMethodWithQueryInPath.cs @@ -0,0 +1,23 @@ +// + +#nullable disable + +using System.ClientModel.Primitives; + +namespace Sample +{ + public partial class TestClient + { + internal global::System.ClientModel.Primitives.PipelineMessage CreateAbortCopyFromUrlRequest(string copyid, global::System.ClientModel.Primitives.RequestOptions options) + { + global::Sample.ClientUriBuilder uri = new global::Sample.ClientUriBuilder(); + uri.Reset(_endpoint); + uri.AppendQuery("comp", "copy", true); + uri.AppendQuery("copyid", copyid, true); + global::System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "PUT", PipelineMessageClassifier200); + global::System.ClientModel.Primitives.PipelineRequest request = message.Request; + message.Apply(options); + return message; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestBuildCreateRequestMethodWithSlashQueryInPath.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestBuildCreateRequestMethodWithSlashQueryInPath.cs new file mode 100644 index 00000000000..7d8ed12eb89 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestBuildCreateRequestMethodWithSlashQueryInPath.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System.ClientModel.Primitives; + +namespace Sample +{ + public partial class TestClient + { + internal global::System.ClientModel.Primitives.PipelineMessage CreateAbortCopyFromUrlRequest(string copyid, global::System.ClientModel.Primitives.RequestOptions options) + { + global::Sample.ClientUriBuilder uri = new global::Sample.ClientUriBuilder(); + uri.Reset(_endpoint); + uri.AppendPath("/", false); + uri.AppendQuery("comp", "copy", true); + uri.AppendQuery("copyid", copyid, true); + global::System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "PUT", PipelineMessageClassifier200); + global::System.ClientModel.Primitives.PipelineRequest request = message.Request; + message.Apply(options); + return message; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestCollectionHeaderPrefix_UsesAddWithPrefixCall(False).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestCollectionHeaderPrefix_UsesAddWithPrefixCall(False).cs new file mode 100644 index 00000000000..0a8a05f4f42 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestCollectionHeaderPrefix_UsesAddWithPrefixCall(False).cs @@ -0,0 +1,26 @@ +// + +#nullable disable + +using System.ClientModel.Primitives; +using System.Collections.Generic; + +namespace Sample +{ + public partial class TestClient + { + internal global::System.ClientModel.Primitives.PipelineMessage CreateTestOperationRequest(global::System.Collections.Generic.IDictionary metadata, global::System.ClientModel.Primitives.RequestOptions options) + { + global::Sample.ClientUriBuilder uri = new global::Sample.ClientUriBuilder(); + uri.Reset(_endpoint); + global::System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); + global::System.ClientModel.Primitives.PipelineRequest request = message.Request; + if (((metadata != null) && !((metadata is global::Sample.ChangeTrackingDictionary changeTrackingDictionary) && changeTrackingDictionary.IsUndefined))) + { + request.Headers.SetDelimited("x-ms-meta", metadata, null); + } + message.Apply(options); + return message; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestCollectionHeaderPrefix_UsesAddWithPrefixCall(True).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestCollectionHeaderPrefix_UsesAddWithPrefixCall(True).cs new file mode 100644 index 00000000000..586b4d6ec22 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestCollectionHeaderPrefix_UsesAddWithPrefixCall(True).cs @@ -0,0 +1,26 @@ +// + +#nullable disable + +using System.ClientModel.Primitives; +using System.Collections.Generic; + +namespace Sample +{ + public partial class TestClient + { + internal global::System.ClientModel.Primitives.PipelineMessage CreateTestOperationRequest(global::System.Collections.Generic.IDictionary metadata, global::System.ClientModel.Primitives.RequestOptions options) + { + global::Sample.ClientUriBuilder uri = new global::Sample.ClientUriBuilder(); + uri.Reset(_endpoint); + global::System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); + global::System.ClientModel.Primitives.PipelineRequest request = message.Request; + if (((metadata != null) && !((metadata is global::Sample.ChangeTrackingDictionary changeTrackingDictionary) && changeTrackingDictionary.IsUndefined))) + { + request.Headers.Add("x-ms-meta-", metadata); + } + message.Apply(options); + return message; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestNextLinkReinjectedParametersInCreateRequestMethod.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestNextLinkReinjectedParametersInCreateRequestMethod.cs index 98e32bb46c2..cb2438a151e 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestNextLinkReinjectedParametersInCreateRequestMethod.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestNextLinkReinjectedParametersInCreateRequestMethod.cs @@ -26,7 +26,14 @@ public partial class TestClient internal global::System.ClientModel.Primitives.PipelineMessage CreateNextGetCatsRequest(global::System.Uri nextPage, string p1, string p2, string p3, global::System.ClientModel.Primitives.RequestOptions options) { global::Sample.ClientUriBuilder uri = new global::Sample.ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(new global::System.Uri(_endpoint, nextPage)); + } uri.AppendQuery("someOtherName", p1, true); uri.AppendQuery("p2", p2, true); global::System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestPageSizeParameterReinjectedInCreateNextRequestMethod.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestPageSizeParameterReinjectedInCreateNextRequestMethod.cs index 2d53c8f4f05..3f72026e8a6 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestPageSizeParameterReinjectedInCreateNextRequestMethod.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/TestPageSizeParameterReinjectedInCreateNextRequestMethod.cs @@ -17,7 +17,7 @@ public partial class TestClient uri.AppendQuery("p2", p2, true); if ((maxPageSize != null)) { - uri.AppendQuery("maxPageSize", global::Sample.TypeFormatters.ConvertToString(maxPageSize), true); + uri.AppendQuery("maxpagesize", global::Sample.TypeFormatters.ConvertToString(maxPageSize), true); } global::System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); global::System.ClientModel.Primitives.PipelineRequest request = message.Request; @@ -30,11 +30,18 @@ public partial class TestClient internal global::System.ClientModel.Primitives.PipelineMessage CreateNextGetCatsRequest(global::System.Uri nextPage, string p1, int? maxPageSize, global::System.ClientModel.Primitives.RequestOptions options) { global::Sample.ClientUriBuilder uri = new global::Sample.ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(new global::System.Uri(_endpoint, nextPage)); + } uri.AppendQuery("p1", p1, true); if ((maxPageSize != null)) { - uri.UpdateQuery("maxPageSize", global::Sample.TypeFormatters.ConvertToString(maxPageSize)); + uri.UpdateQuery("maxpagesize", global::Sample.TypeFormatters.ConvertToString(maxPageSize)); } global::System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); global::System.ClientModel.Primitives.PipelineRequest request = message.Request; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/ValidateAllClientResponseClassifiers.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/ValidateAllClientResponseClassifiers.cs index e28371e7967..068f78bfa8a 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/ValidateAllClientResponseClassifiers.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/RestClientProviders/TestData/RestClientProviderTests/ValidateAllClientResponseClassifiers.cs @@ -18,21 +18,21 @@ public partial class TestClient private static global::System.ClientModel.Primitives.PipelineMessageClassifier _pipelineMessageClassifier205; private static global::System.ClientModel.Primitives.PipelineMessageClassifier _pipelineMessageClassifier206; - private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 = global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); + private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); - private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier200201202 => _pipelineMessageClassifier200201202 = global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 200, 201, 202 }); + private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier200201202 => _pipelineMessageClassifier200201202 ??= global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 200, 201, 202 }); - private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier201 => _pipelineMessageClassifier201 = global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 201 }); + private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier201 => _pipelineMessageClassifier201 ??= global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 201 }); - private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier202 => _pipelineMessageClassifier202 = global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 202 }); + private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier202 => _pipelineMessageClassifier202 ??= global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 202 }); - private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier203 => _pipelineMessageClassifier203 = global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 203 }); + private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier203 => _pipelineMessageClassifier203 ??= global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 203 }); - private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier204 => _pipelineMessageClassifier204 = global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 204 }); + private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier204 => _pipelineMessageClassifier204 ??= global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 204 }); - private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier205 => _pipelineMessageClassifier205 = global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 205 }); + private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier205 => _pipelineMessageClassifier205 ??= global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 205 }); - private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier206 => _pipelineMessageClassifier206 = global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 206 }); + private static global::System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier206 => _pipelineMessageClassifier206 ??= global::System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 206 }); internal global::System.ClientModel.Primitives.PipelineMessage CreateTestOperation204Request(global::System.ClientModel.BinaryContent content, global::System.ClientModel.Primitives.RequestOptions options) { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ScmMethodProviderCollectionTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ScmMethodProviderCollectionTests.cs index 8f270779b58..b54ece36bd0 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ScmMethodProviderCollectionTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ScmMethodProviderCollectionTests.cs @@ -677,10 +677,17 @@ public void OperationWithOptionalExtensibleIntEnum() parameters: parameters); var inputServiceMethod = InputFactory.BasicServiceMethod("Test", inputOperation, parameters: methodParameters); var inputClient = InputFactory.Client("TestClient", methods: [inputServiceMethod]); + + MockHelpers.LoadMockGenerator(clients: () => [inputClient]); var client = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(inputClient); - var methodCollection = new ScmMethodProviderCollection(inputServiceMethod, client!); + Assert.IsNotNull(client); + + var methodCollection = new ScmMethodProviderCollection(inputClient.Methods.First(), client!); + Assert.IsNotNull(methodCollection); + Assert.AreEqual(4, methodCollection.Count); + var convenienceMethod = methodCollection.FirstOrDefault( - m => m.Signature.Parameters.All(p => p.Name != "options") && m.Signature.Name == "TestOperation"); + m => !m.Signature.Parameters.Any(p => p.Name == "options") && m.Signature.Name == "TestOperation"); return convenienceMethod; } @@ -1378,5 +1385,616 @@ public void DictionaryOfValueTypeUsesJsonDoc(Type valueType) Assert.AreEqual(Helpers.GetExpectedFromFile(valueType.Name), actualCode); } + [Test] + public async Task MethodParameterSegments_ExtractsPropertyValues() + { + // Test scenario: Verify MethodParameterSegments correctly maps convenience params to protocol params + var wrapperModel = InputFactory.Model( + "Wrapper", + properties: + [ + InputFactory.Property("p1", InputPrimitiveType.String, isRequired: true), + InputFactory.Property("p2", InputPrimitiveType.String, isRequired: true), + ]); + + var p1Param = InputFactory.PathParameter("p1", InputPrimitiveType.String, isRequired: true); + p1Param.Update(methodParameterSegments: [ + InputFactory.MethodParameter("wrapper", wrapperModel, isRequired: true), + InputFactory.MethodParameter("p1", InputPrimitiveType.String, isRequired: true) + ]); + + var p2Param = InputFactory.PathParameter("p2", InputPrimitiveType.String, isRequired: true); + p2Param.Update(methodParameterSegments: [ + InputFactory.MethodParameter("wrapper", wrapperModel, isRequired: true), + InputFactory.MethodParameter("p2", InputPrimitiveType.String, isRequired: true) + ]); + + var serviceMethod = InputFactory.BasicServiceMethod( + "testOp", + InputFactory.Operation( + "testOp", + parameters: [p1Param, p2Param]), + parameters: [InputFactory.MethodParameter("wrapper", wrapperModel, isRequired: true)]); + + var inputClient = InputFactory.Client("TestClient", methods: [serviceMethod]); + await MockHelpers.LoadMockGeneratorAsync(clients: () => [inputClient]); + + var client = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(inputClient); + Assert.IsNotNull(client); + + var methodCollection = new ScmMethodProviderCollection(serviceMethod, client!); + Assert.IsNotNull(methodCollection); + + // Verify that MethodParameterSegments are correctly set on the input parameters + Assert.AreEqual(2, p1Param.MethodParameterSegments!.Count, "p1 should have 2 segments"); + Assert.AreEqual("wrapper", p1Param.MethodParameterSegments[0].Name); + Assert.AreEqual("p1", p1Param.MethodParameterSegments[1].Name); + + Assert.AreEqual(2, p2Param.MethodParameterSegments!.Count, "p2 should have 2 segments"); + Assert.AreEqual("wrapper", p2Param.MethodParameterSegments[0].Name); + Assert.AreEqual("p2", p2Param.MethodParameterSegments[1].Name); + } + + [Test] + public async Task MethodParameterSegments_BodyParameterSerialization() + { + // Test scenario: Body parameter with MethodParameterSegments should be serialized + var wrapperModel = InputFactory.Model( + "Wrapper", + properties: + [ + InputFactory.Property("action", InputPrimitiveType.String, isRequired: true), + ]); + + var bodyParam = InputFactory.BodyParameter("action", InputPrimitiveType.String, isRequired: true); + bodyParam.Update(methodParameterSegments: [ + InputFactory.MethodParameter("wrapper", wrapperModel, isRequired: true), + InputFactory.MethodParameter("action", InputPrimitiveType.String, isRequired: true) + ]); + + var serviceMethod = InputFactory.BasicServiceMethod( + "testOp", + InputFactory.Operation( + "testOp", + parameters: [bodyParam]), + parameters: [InputFactory.MethodParameter("wrapper", wrapperModel, isRequired: true)]); + + var inputClient = InputFactory.Client("TestClient", methods: [serviceMethod]); + await MockHelpers.LoadMockGeneratorAsync(clients: () => [inputClient]); + + var client = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(inputClient); + Assert.IsNotNull(client); + + var methodCollection = new ScmMethodProviderCollection(serviceMethod, client!); + Assert.IsNotNull(methodCollection); + + // Verify MethodParameterSegments are set correctly + Assert.IsNotNull(bodyParam.MethodParameterSegments); + Assert.AreEqual(2, bodyParam.MethodParameterSegments!.Count); + Assert.AreEqual("wrapper", bodyParam.MethodParameterSegments[0].Name); + Assert.AreEqual("action", bodyParam.MethodParameterSegments[1].Name); + } + + [Test] + public async Task MethodParameterSegments_MultipleSegments() + { + // Test scenario: Nested property access with 3+ segments + var innerModel = InputFactory.Model( + "Inner", + properties: + [ + InputFactory.Property("data", InputPrimitiveType.String, isRequired: true), + ]); + + var wrapperModel = InputFactory.Model( + "Wrapper", + properties: + [ + InputFactory.Property("inner", innerModel, isRequired: true), + ]); + + var bodyParam = InputFactory.BodyParameter("data", InputPrimitiveType.String, isRequired: true); + bodyParam.Update(methodParameterSegments: [ + InputFactory.MethodParameter("wrapper", wrapperModel, isRequired: true), + InputFactory.MethodParameter("inner", innerModel, isRequired: true), + InputFactory.MethodParameter("data", InputPrimitiveType.String, isRequired: true) + ]); + + var serviceMethod = InputFactory.BasicServiceMethod( + "testOp", + InputFactory.Operation( + "testOp", + parameters: [bodyParam]), + parameters: [InputFactory.MethodParameter("wrapper", wrapperModel, isRequired: true)]); + + var inputClient = InputFactory.Client("TestClient", methods: [serviceMethod]); + await MockHelpers.LoadMockGeneratorAsync(clients: () => [inputClient]); + + var client = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(inputClient); + Assert.IsNotNull(client); + + var methodCollection = new ScmMethodProviderCollection(serviceMethod, client!); + Assert.IsNotNull(methodCollection); + + // Verify 3-level nesting in MethodParameterSegments + Assert.IsNotNull(bodyParam.MethodParameterSegments); + Assert.AreEqual(3, bodyParam.MethodParameterSegments!.Count, "Should have 3 segments for nested property"); + Assert.AreEqual("wrapper", bodyParam.MethodParameterSegments[0].Name); + Assert.AreEqual("inner", bodyParam.MethodParameterSegments[1].Name); + Assert.AreEqual("data", bodyParam.MethodParameterSegments[2].Name); + } + + [Test] + public async Task MethodParameterSegments_MixedParameterLocations() + { + // Test scenario: Mix of path, query, header, and body parameters + var paramsModel = InputFactory.Model( + "Params", + properties: + [ + InputFactory.Property("pathParam", InputPrimitiveType.String, isRequired: true), + InputFactory.Property("queryParam", InputPrimitiveType.String, isRequired: true), + InputFactory.Property("headerParam", InputPrimitiveType.String, isRequired: true), + InputFactory.Property("bodyParam", InputPrimitiveType.String, isRequired: true), + ]); + + var pathParam = InputFactory.PathParameter("pathParam", InputPrimitiveType.String, isRequired: true); + pathParam.Update(methodParameterSegments: [ + InputFactory.MethodParameter("params", paramsModel, isRequired: true), + InputFactory.MethodParameter("pathParam", InputPrimitiveType.String, isRequired: true) + ]); + + var queryParam = InputFactory.QueryParameter("queryParam", InputPrimitiveType.String, isRequired: true); + queryParam.Update(methodParameterSegments: [ + InputFactory.MethodParameter("params", paramsModel, isRequired: true), + InputFactory.MethodParameter("queryParam", InputPrimitiveType.String, isRequired: true) + ]); + + var headerParam = InputFactory.HeaderParameter("headerParam", InputPrimitiveType.String, isRequired: true); + headerParam.Update(methodParameterSegments: [ + InputFactory.MethodParameter("params", paramsModel, isRequired: true), + InputFactory.MethodParameter("headerParam", InputPrimitiveType.String, isRequired: true) + ]); + + var bodyParam = InputFactory.BodyParameter("bodyParam", InputPrimitiveType.String, isRequired: true); + bodyParam.Update(methodParameterSegments: [ + InputFactory.MethodParameter("params", paramsModel, isRequired: true), + InputFactory.MethodParameter("bodyParam", InputPrimitiveType.String, isRequired: true) + ]); + + var serviceMethod = InputFactory.BasicServiceMethod( + "testOp", + InputFactory.Operation( + "testOp", + parameters: [pathParam, queryParam, headerParam, bodyParam]), + parameters: [InputFactory.MethodParameter("params", paramsModel, isRequired: true)]); + + var inputClient = InputFactory.Client("TestClient", methods: [serviceMethod]); + await MockHelpers.LoadMockGeneratorAsync(clients: () => [inputClient]); + + var client = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(inputClient); + Assert.IsNotNull(client); + + var methodCollection = new ScmMethodProviderCollection(serviceMethod, client!); + Assert.IsNotNull(methodCollection); + + // Verify all parameter types have MethodParameterSegments + Assert.IsNotNull(pathParam.MethodParameterSegments); + Assert.AreEqual(2, pathParam.MethodParameterSegments!.Count); + + Assert.IsNotNull(queryParam.MethodParameterSegments); + Assert.AreEqual(2, queryParam.MethodParameterSegments!.Count); + + Assert.IsNotNull(headerParam.MethodParameterSegments); + Assert.AreEqual(2, headerParam.MethodParameterSegments!.Count); + + Assert.IsNotNull(bodyParam.MethodParameterSegments); + Assert.AreEqual(2, bodyParam.MethodParameterSegments!.Count); + } + + [Test] + public async Task MethodParameterSegments_UpdateMethod_SetsSegments() + { + // Test the InputParameter.Update method correctly sets MethodParameterSegments + var model = InputFactory.Model("TestModel"); + var param = InputFactory.PathParameter("test", InputPrimitiveType.String, isRequired: true); + + // Initially should be null or empty + Assert.IsTrue(param.MethodParameterSegments == null || param.MethodParameterSegments.Count == 0); + + // Update with segments + var segments = new List + { + InputFactory.MethodParameter("param1", model, isRequired: true), + InputFactory.MethodParameter("param2", InputPrimitiveType.String, isRequired: true) + }; + param.Update(methodParameterSegments: segments); + + // Verify segments are set + Assert.IsNotNull(param.MethodParameterSegments); + Assert.AreEqual(2, param.MethodParameterSegments!.Count); + Assert.AreEqual("param1", param.MethodParameterSegments[0].Name); + Assert.AreEqual("param2", param.MethodParameterSegments[1].Name); + } + + [Test] + public async Task MissingOperationParamsResultInNamedArgsForSubsequent() + { + var idParam = InputFactory.PathParameter("id", InputPrimitiveType.String, isRequired: true); + var takeParam = InputFactory.QueryParameter("take", InputPrimitiveType.Int32, isRequired: true); + var filterParam = InputFactory.QueryParameter("filter", InputPrimitiveType.String, isRequired: false); + var orderParam = InputFactory.HeaderParameter("order", InputPrimitiveType.String, isRequired: false); + + var serviceMethod = InputFactory.BasicServiceMethod( + "TestOp", + InputFactory.Operation( + "TestOp", + parameters: [idParam, filterParam, orderParam, takeParam], + responses: [InputFactory.OperationResponse([200])]), + parameters: + [ + InputFactory.MethodParameter("id", InputPrimitiveType.String, isRequired: true, location: InputRequestLocation.Path), + InputFactory.MethodParameter("take", InputPrimitiveType.Int32, isRequired: true, location: InputRequestLocation.Query), + InputFactory.MethodParameter("order", InputPrimitiveType.Int32, isRequired: true, location: InputRequestLocation.Header), + ]); + + var inputClient = InputFactory.Client("TestClient", methods: [serviceMethod]); + await MockHelpers.LoadMockGeneratorAsync(clients: () => [inputClient]); + + var client = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(inputClient); + Assert.IsNotNull(client); + + var methodCollection = new ScmMethodProviderCollection(serviceMethod, client!); + Assert.IsNotNull(methodCollection); + + var convenienceMethod = methodCollection.FirstOrDefault(m + => m.Signature.Parameters.All(p => p.Name != "options") + && m.Signature.Name == "TestOp"); + Assert.IsNotNull(convenienceMethod); + + var methodBody = convenienceMethod!.BodyStatements!.ToDisplayString(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), methodBody); + } + + [Test] + public async Task MissingRequiredOperationParamsResultInPassingNull() + { + var idParam = InputFactory.PathParameter("id", InputPrimitiveType.String, isRequired: true); + // This will be made required in the protocol method due to method overload ambiguity + var takeParam = InputFactory.QueryParameter("take", InputPrimitiveType.Int32, isRequired: false); + var filterParam = InputFactory.QueryParameter("filter", InputPrimitiveType.String, isRequired: false); + var orderParam = InputFactory.HeaderParameter("order", InputPrimitiveType.String, isRequired: false); + + var serviceMethod = InputFactory.BasicServiceMethod( + "TestOp", + InputFactory.Operation( + "TestOp", + parameters: [idParam, filterParam, orderParam, takeParam], + responses: [InputFactory.OperationResponse([200])]), + parameters: + [ + InputFactory.MethodParameter("id", InputPrimitiveType.String, isRequired: true, location: InputRequestLocation.Path), + InputFactory.MethodParameter("take", InputPrimitiveType.Int32, isRequired: false, location: InputRequestLocation.Query), + InputFactory.MethodParameter("order", InputPrimitiveType.Int32, isRequired: false, location: InputRequestLocation.Header), + ]); + + var inputClient = InputFactory.Client("TestClient", methods: [serviceMethod]); + await MockHelpers.LoadMockGeneratorAsync(clients: () => [inputClient]); + + var client = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(inputClient); + Assert.IsNotNull(client); + + var methodCollection = new ScmMethodProviderCollection(serviceMethod, client!); + Assert.IsNotNull(methodCollection); + + var convenienceMethod = methodCollection.FirstOrDefault(m + => m.Signature.Parameters.All(p => p.Name != "options") + && m.Signature.Name == "TestOp"); + Assert.IsNotNull(convenienceMethod); + + var methodBody = convenienceMethod!.BodyStatements!.ToDisplayString(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), methodBody); + } + + [Test] + public async Task CombinedMissingOperationParamsAndNonBodyModelParams() + { + // Create a body model with HTTP metadata properties (header/query params) + var requestModel = InputFactory.Model( + "RequestModel", + properties: + [ + InputFactory.Property("data", InputPrimitiveType.String, isRequired: true, isHttpMetadata: false), + InputFactory.Property("x-custom-header", InputPrimitiveType.String, isRequired: true, isHttpMetadata: true, wireName: "x-custom-header"), + InputFactory.Property("queryParam", InputPrimitiveType.Int32, isRequired: false, isHttpMetadata: true, wireName: "queryParam"), + ]); + + // Protocol operation parameters + var idParam = InputFactory.PathParameter("id", InputPrimitiveType.String, isRequired: true); + var headerParam = InputFactory.HeaderParameter("x-custom-header", InputPrimitiveType.String, isRequired: true); + headerParam.Update(methodParameterSegments: + [ + InputFactory.MethodParameter("request", requestModel, isRequired: true, location: InputRequestLocation.Body), + InputFactory.MethodParameter("x-custom-header", InputPrimitiveType.String, isRequired: true) + ]); + var optionalQueryParam = InputFactory.QueryParameter("queryParam", InputPrimitiveType.Int32, isRequired: false); + optionalQueryParam.Update(methodParameterSegments: + [ + InputFactory.MethodParameter("request", requestModel, isRequired: true, location: InputRequestLocation.Body), + InputFactory.MethodParameter("queryParam", InputPrimitiveType.Int32, isRequired: false) + ]); + var optionalFilter = InputFactory.QueryParameter("filter", InputPrimitiveType.String, isRequired: false); + var bodyParam = InputFactory.BodyParameter("body", requestModel, isRequired: true); + var optionalTake = InputFactory.QueryParameter("take", InputPrimitiveType.Int32, isRequired: false); + + var serviceMethod = InputFactory.BasicServiceMethod( + "TestOp", + InputFactory.Operation( + "TestOp", + parameters: [idParam, headerParam, optionalQueryParam, optionalFilter, bodyParam, optionalTake], + responses: [InputFactory.OperationResponse([200])]), + parameters: + [ + InputFactory.MethodParameter("id", InputPrimitiveType.String, isRequired: true, location: InputRequestLocation.Path), + InputFactory.MethodParameter("request", requestModel, isRequired: true, location: InputRequestLocation.Body), + ]); + + var inputClient = InputFactory.Client("TestClient", methods: [serviceMethod]); + await MockHelpers.LoadMockGeneratorAsync(clients: () => [inputClient], inputModels: () => [requestModel]); + + var client = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(inputClient); + Assert.IsNotNull(client); + + var methodCollection = new ScmMethodProviderCollection(serviceMethod, client!); + Assert.IsNotNull(methodCollection); + + var convenienceMethod = methodCollection.FirstOrDefault(m + => m.Signature.Parameters.All(p => p.Name != "options") + && m.Signature.Name == "TestOp"); + Assert.IsNotNull(convenienceMethod); + + var methodBody = convenienceMethod!.BodyStatements!.ToDisplayString(); + Assert.AreEqual(Helpers.GetExpectedFromFile(), methodBody); + } + + [Test] + public void ConvenienceMethod_DualFormatModel_XmlContentType_CallsToBinaryContentWithX() + { + // Create a dual-format model + var dualFormatModel = InputFactory.Model("DualFormatModel", usage: InputModelTypeUsage.Json | InputModelTypeUsage.Xml); + var bodyParam = InputFactory.BodyParameter("body", dualFormatModel, isRequired: true); + var methodBodyParam = InputFactory.MethodParameter("body", dualFormatModel, isRequired: true, location: InputRequestLocation.Body); + + var operation = InputFactory.Operation( + "UpdateModel", + parameters: [bodyParam], + requestMediaTypes: ["application/xml"], + responses: [InputFactory.OperationResponse([200])]); + + var serviceMethod = InputFactory.BasicServiceMethod("UpdateModel", operation, parameters: [methodBodyParam]); + var inputClient = InputFactory.Client("TestClient", methods: [serviceMethod]); + + MockHelpers.LoadMockGenerator(clients: () => [inputClient], inputModels: () => [dualFormatModel]); + + var client = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(inputClient); + var methodCollection = new ScmMethodProviderCollection(serviceMethod, client!); + + var convenienceMethod = methodCollection.FirstOrDefault(m => + m.Signature.Parameters.All(p => p.Name != "options") && + m.Signature.Name == "UpdateModel"); + + Assert.IsNotNull(convenienceMethod); + var methodBody = convenienceMethod!.BodyStatements!.ToDisplayString(); + var expectedMethodBody = Helpers.GetExpectedFromFile(); + + Assert.AreEqual(expectedMethodBody, methodBody); + } + + [Test] + public void ConvenienceMethod_DualFormatModel_JsonContentType_CallsToBinaryContentWithJ() + { + // Create a dual-format model + var dualFormatModel = InputFactory.Model("DualFormatModel", usage: InputModelTypeUsage.Json | InputModelTypeUsage.Xml); + var bodyParam = InputFactory.BodyParameter("body", dualFormatModel, isRequired: true); + var methodBodyParam = InputFactory.MethodParameter("body", dualFormatModel, isRequired: true, location: InputRequestLocation.Body); + + var operation = InputFactory.Operation( + "UpdateModel", + parameters: [bodyParam], + requestMediaTypes: ["application/json"], + responses: [InputFactory.OperationResponse([200])]); + + var serviceMethod = InputFactory.BasicServiceMethod("UpdateModel", operation, parameters: [methodBodyParam]); + var inputClient = InputFactory.Client("TestClient", methods: [serviceMethod]); + + MockHelpers.LoadMockGenerator(clients: () => [inputClient], inputModels: () => [dualFormatModel]); + + var client = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(inputClient); + var methodCollection = new ScmMethodProviderCollection(serviceMethod, client!); + + var convenienceMethod = methodCollection.FirstOrDefault(m => + m.Signature.Parameters.All(p => p.Name != "options") && + m.Signature.Name == "UpdateModel"); + + Assert.IsNotNull(convenienceMethod); + var methodBody = convenienceMethod!.BodyStatements!.ToDisplayString(); + var expectedMethodBody = Helpers.GetExpectedFromFile(); + + Assert.AreEqual(expectedMethodBody, methodBody); + } + + [Test] + public void ConvenienceMethod_SingleFormatModel_UsesImplicitOperator() + { + // Create a JSON-only model + var jsonOnlyModel = InputFactory.Model("JsonOnlyModel", usage: InputModelTypeUsage.Json); + var bodyParam = InputFactory.BodyParameter("body", jsonOnlyModel, isRequired: true); + var methodBodyParam = InputFactory.MethodParameter("body", jsonOnlyModel, isRequired: true, location: InputRequestLocation.Body); + + var operation = InputFactory.Operation( + "UpdateModel", + parameters: [bodyParam], + requestMediaTypes: ["application/json"], + responses: [InputFactory.OperationResponse([200])]); + + var serviceMethod = InputFactory.BasicServiceMethod("UpdateModel", operation, parameters: [methodBodyParam]); + var inputClient = InputFactory.Client("TestClient", methods: [serviceMethod]); + + MockHelpers.LoadMockGenerator(clients: () => [inputClient], inputModels: () => [jsonOnlyModel]); + + var client = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(inputClient); + var methodCollection = new ScmMethodProviderCollection(serviceMethod, client!); + + var convenienceMethod = methodCollection.FirstOrDefault(m => + m.Signature.Parameters.All(p => p.Name != "options") && + m.Signature.Name == "UpdateModel"); + + Assert.IsNotNull(convenienceMethod); + var methodBody = convenienceMethod!.BodyStatements!.ToDisplayString(); + var expectedMethodBody = Helpers.GetExpectedFromFile(); + + Assert.AreEqual(expectedMethodBody, methodBody); + } + + [Test] + public void ConvenienceMethod_XmlListBody_UsesXmlFromEnumerable() + { + // Create a model with XML serialization options + var elementModel = InputFactory.Model( + "SignedIdentifier", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("Id", InputPrimitiveType.String)], + serializationOptions: InputFactory.Serialization.Options( + xml: InputFactory.Serialization.Xml("SignedIdentifier"))); + + var arrayType = InputFactory.Array(elementModel); + + var bodyParam = InputFactory.BodyParameter( + "body", + arrayType, + isRequired: true, + serializedName: "SignedIdentifiers", + contentTypes: ["application/xml"], + defaultContentType: "application/xml"); + var methodBodyParam = InputFactory.MethodParameter( + "body", + arrayType, + isRequired: true, + location: InputRequestLocation.Body); + + var operation = InputFactory.Operation( + "Foo", + httpMethod: "POST", + parameters: [bodyParam], + requestMediaTypes: ["application/xml"], + responses: [InputFactory.OperationResponse([200])]); + + var serviceMethod = InputFactory.BasicServiceMethod("Foo", operation, parameters: [methodBodyParam]); + var inputClient = InputFactory.Client("TestClient", methods: [serviceMethod]); + + MockHelpers.LoadMockGenerator(clients: () => [inputClient], inputModels: () => [elementModel]); + + var client = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(inputClient); + var methodCollection = new ScmMethodProviderCollection(serviceMethod, client!); + + var convenienceMethod = methodCollection.FirstOrDefault(m => + m.Signature.Parameters.All(p => p.Name != "options") && + m.Signature.Name == "Foo"); + + Assert.IsNotNull(convenienceMethod); + var methodBody = convenienceMethod!.BodyStatements!.ToDisplayString(); + var expectedMethodBody = Helpers.GetExpectedFromFile(); + + Assert.AreEqual(expectedMethodBody, methodBody); + } + + [Test] + public void ConvenienceMethod_XmlListResponse_UsesXDocumentDeserialization() + { + // Create a model with XML serialization options + var elementModel = InputFactory.Model( + "SignedIdentifier", + usage: InputModelTypeUsage.Output | InputModelTypeUsage.Xml, + properties: [InputFactory.Property("Id", InputPrimitiveType.String)], + serializationOptions: InputFactory.Serialization.Options( + xml: InputFactory.Serialization.Xml("SignedIdentifier"))); + + var arrayType = InputFactory.Array(elementModel); + + var operation = InputFactory.Operation( + "GetFoo", + httpMethod: "GET", + responses: [InputFactory.OperationResponse([200], bodytype: arrayType, contentTypes: ["application/xml"])]); + + var serviceMethod = InputFactory.BasicServiceMethod( + "GetFoo", + operation, + response: InputFactory.ServiceMethodResponse(arrayType, null)); + var inputClient = InputFactory.Client("TestClient", methods: [serviceMethod]); + + MockHelpers.LoadMockGenerator(clients: () => [inputClient], inputModels: () => [elementModel]); + + var client = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(inputClient); + var methodCollection = new ScmMethodProviderCollection(serviceMethod, client!); + + var convenienceMethod = methodCollection.FirstOrDefault(m => + m.Signature.Parameters.All(p => p.Name != "options") && + m.Signature.Name == "GetFoo"); + + Assert.IsNotNull(convenienceMethod); + var methodBody = convenienceMethod!.BodyStatements!.ToDisplayString(); + var expectedMethodBody = Helpers.GetExpectedFromFile(); + + Assert.AreEqual(expectedMethodBody, methodBody); + } + + [Test] + public void ConvenienceMethod_JsonListBody_DoesNotUseXmlFromEnumerable() + { + // Ensure that JSON list body parameters continue to use the standard JSON FromEnumerable + var elementModel = InputFactory.Model( + "Item", + usage: InputModelTypeUsage.Input | InputModelTypeUsage.Json, + properties: [InputFactory.Property("Name", InputPrimitiveType.String)]); + + var arrayType = InputFactory.Array(elementModel); + + var bodyParam = InputFactory.BodyParameter( + "body", + arrayType, + isRequired: true); + var methodBodyParam = InputFactory.MethodParameter( + "body", + arrayType, + isRequired: true, + location: InputRequestLocation.Body); + + var operation = InputFactory.Operation( + "Foo", + httpMethod: "POST", + parameters: [bodyParam], + requestMediaTypes: ["application/json"], + responses: [InputFactory.OperationResponse([200])]); + + var serviceMethod = InputFactory.BasicServiceMethod("Foo", operation, parameters: [methodBodyParam]); + var inputClient = InputFactory.Client("TestClient", methods: [serviceMethod]); + + MockHelpers.LoadMockGenerator(clients: () => [inputClient], inputModels: () => [elementModel]); + + var client = ScmCodeModelGenerator.Instance.TypeFactory.CreateClient(inputClient); + var methodCollection = new ScmMethodProviderCollection(serviceMethod, client!); + + var convenienceMethod = methodCollection.FirstOrDefault(m => + m.Signature.Parameters.All(p => p.Name != "options") && + m.Signature.Name == "Foo"); + + Assert.IsNotNull(convenienceMethod); + var methodBody = convenienceMethod!.BodyStatements!.ToDisplayString(); + + // Ensure the method body uses the standard JSON FromEnumerable (no rootNameHint/childNameHint) + Assert.IsTrue(methodBody.Contains("BinaryContentHelper.FromEnumerable(body)")); + Assert.IsFalse(methodBody.Contains("rootNameHint")); + Assert.IsFalse(methodBody.Contains("childNameHint")); + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ScmModelProvider/ScmModelProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ScmModelProvider/ScmModelProviderTests.cs index a3879c800d2..86d0fce01d6 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ScmModelProvider/ScmModelProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ScmModelProvider/ScmModelProviderTests.cs @@ -62,7 +62,7 @@ public void TestSingleDiscriminatorDynamicModel(bool validateBase) InputFactory.Property("kind", InputPrimitiveType.String, isRequired: true, isDiscriminator: true), InputFactory.Property("name", InputPrimitiveType.String, isRequired: true) ], - discriminatedModels: new Dictionary() { {"cat", catModel } }); + discriminatedModels: new Dictionary() { { "cat", catModel } }); MockHelpers.LoadMockGenerator(inputModels: () => [baseModel, catModel]); var outputLibrary = ScmCodeModelGenerator.Instance.OutputLibrary; @@ -157,6 +157,45 @@ public void TestDynamicModelWithBinaryDataAdditionalProps() Assert.IsNotNull(model); Assert.IsTrue(model!.IsDynamicModel); + // Dynamic models with Record (BinaryData additional properties) should generate + // JsonPatch instead of AdditionalProperties. + Assert.IsNotNull(model.JsonPatchProperty, "Dynamic models with Record should generate JsonPatch"); + Assert.IsFalse(model.Properties.Any(p => p.IsAdditionalProperties), + "Dynamic models with Record should not generate AdditionalProperties"); + AssertJsonIgnoreAttributeOnPatchProperty(model); + + var writer = new TypeProviderWriter(model); + var file = writer.Write(); + + Assert.AreEqual(Helpers.GetExpectedFromFile(), file.Content); + } + + [Test] + public async Task TestDynamicModelWithBinaryDataAdditionalPropsBackCompat() + { + // Scenario: A model was previously shipped with AdditionalProperties (IDictionary) + // but the model has now been updated to use @dynamicModel. Both JsonPatch and AdditionalProperties + // should be generated to maintain backward compatibility. + var inputModel = InputFactory.Model( + "dynamicModel", + isDynamicModel: true, + additionalProperties: InputPrimitiveType.Any, + properties: + [ + InputFactory.Property("p1", InputPrimitiveType.String, isRequired: true) + ]); + + await MockHelpers.LoadMockGeneratorAsync( + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync(), + inputModels: () => [inputModel]); + var model = ScmCodeModelGenerator.Instance.TypeFactory.CreateModel(inputModel) as ScmModel; + + Assert.IsNotNull(model); + Assert.IsTrue(model!.IsDynamicModel); + // Backcompat: both JsonPatch and AdditionalProperties should be generated + Assert.IsNotNull(model.JsonPatchProperty, "Dynamic model should generate JsonPatch"); + Assert.IsTrue(model.Properties.Any(p => p.IsAdditionalProperties), + "Dynamic model should still generate AdditionalProperties for backcompat"); AssertJsonIgnoreAttributeOnPatchProperty(model); var writer = new TypeProviderWriter(model); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ScmModelProvider/TestData/ScmModelProviderTests/TestDynamicModelWithBinaryDataAdditionalProps.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ScmModelProvider/TestData/ScmModelProviderTests/TestDynamicModelWithBinaryDataAdditionalProps.cs index 53c73900574..0a4f0f7e108 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ScmModelProvider/TestData/ScmModelProviderTests/TestDynamicModelWithBinaryDataAdditionalProps.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ScmModelProvider/TestData/ScmModelProviderTests/TestDynamicModelWithBinaryDataAdditionalProps.cs @@ -2,32 +2,39 @@ #nullable disable -using System; -using System.Collections.Generic; +using System.ClientModel.Primitives; +using System.ComponentModel; +using System.Diagnostics.CodeAnalysis; +using System.Text.Json.Serialization; using Sample; namespace Sample.Models { public partial class DynamicModel { - private protected readonly global::System.Collections.Generic.IDictionary _additionalBinaryDataProperties; + [global::System.Diagnostics.CodeAnalysis.ExperimentalAttribute("SCME0001")] + private global::System.ClientModel.Primitives.JsonPatch _patch; public DynamicModel(string p1) { global::Sample.Argument.AssertNotNull(p1, nameof(p1)); P1 = p1; - _additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); } - internal DynamicModel(string p1, global::System.Collections.Generic.IDictionary additionalProperties) +#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + internal DynamicModel(string p1, in global::System.ClientModel.Primitives.JsonPatch patch) { P1 = p1; - _additionalBinaryDataProperties = additionalProperties; + _patch = patch; } +#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. - public string P1 { get; set; } + [global::System.Text.Json.Serialization.JsonIgnoreAttribute] + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Never)] + [global::System.Diagnostics.CodeAnalysis.ExperimentalAttribute("SCME0001")] + public ref global::System.ClientModel.Primitives.JsonPatch Patch => ref _patch; - public global::System.Collections.Generic.IDictionary AdditionalProperties => _additionalBinaryDataProperties; + public string P1 { get; set; } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ScmModelProvider/TestData/ScmModelProviderTests/TestDynamicModelWithBinaryDataAdditionalPropsBackCompat.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ScmModelProvider/TestData/ScmModelProviderTests/TestDynamicModelWithBinaryDataAdditionalPropsBackCompat.cs new file mode 100644 index 00000000000..93e3f01f540 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ScmModelProvider/TestData/ScmModelProviderTests/TestDynamicModelWithBinaryDataAdditionalPropsBackCompat.cs @@ -0,0 +1,47 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.ComponentModel; +using System.Diagnostics.CodeAnalysis; +using System.Text.Json.Serialization; +using Sample; + +namespace Sample.Models +{ + public partial class DynamicModel + { + [global::System.Diagnostics.CodeAnalysis.ExperimentalAttribute("SCME0001")] + private global::System.ClientModel.Primitives.JsonPatch _patch; + private protected readonly global::System.Collections.Generic.IDictionary _additionalBinaryDataProperties; + + public DynamicModel(string p1) + { + global::Sample.Argument.AssertNotNull(p1, nameof(p1)); + + P1 = p1; + _additionalBinaryDataProperties = new global::Sample.ChangeTrackingDictionary(); + } + +#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + internal DynamicModel(string p1, global::System.Collections.Generic.IDictionary additionalProperties, in global::System.ClientModel.Primitives.JsonPatch patch) + { + P1 = p1; + _additionalBinaryDataProperties = additionalProperties; + _patch = patch; + } +#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. + + [global::System.Text.Json.Serialization.JsonIgnoreAttribute] + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Never)] + [global::System.Diagnostics.CodeAnalysis.ExperimentalAttribute("SCME0001")] + public ref global::System.ClientModel.Primitives.JsonPatch Patch => ref _patch; + + public string P1 { get; set; } + + public global::System.Collections.Generic.IDictionary AdditionalProperties => _additionalBinaryDataProperties; + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ScmModelProvider/TestData/ScmModelProviderTests/TestDynamicModelWithBinaryDataAdditionalPropsBackCompat/DynamicModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ScmModelProvider/TestData/ScmModelProviderTests/TestDynamicModelWithBinaryDataAdditionalPropsBackCompat/DynamicModel.cs new file mode 100644 index 00000000000..faa54488597 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ScmModelProvider/TestData/ScmModelProviderTests/TestDynamicModelWithBinaryDataAdditionalPropsBackCompat/DynamicModel.cs @@ -0,0 +1,14 @@ +// This file represents the previous (last contract) state of the model before @dynamicModel was added. +// It has AdditionalProperties but no JsonPatch, which triggers the backcompat path. + +using System.Collections.Generic; + +namespace Sample.Models +{ + public partial class DynamicModel + { + public string P1 { get; set; } + + public global::System.Collections.Generic.IDictionary AdditionalProperties { get; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceClient_GeneratesExpectedClientOptions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceClient_GeneratesExpectedClientOptions.cs index f3f3227ef90..cbb435387e8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceClient_GeneratesExpectedClientOptions.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceClient_GeneratesExpectedClientOptions.cs @@ -4,41 +4,62 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Sample { public partial class TestClientOptions : global::System.ClientModel.Primitives.ClientPipelineOptions { - private const global::Sample.TestClientOptions.ServiceAVersion LatestServiceAVersion = global::Sample.TestClientOptions.ServiceAVersion.V2_0; - private const global::Sample.TestClientOptions.ServiceBVersion LatestServiceBVersion = global::Sample.TestClientOptions.ServiceBVersion.V4_0; + private const global::Sample.TestClientOptions.ServiceAServiceVersion LatestServiceAVersion = global::Sample.TestClientOptions.ServiceAServiceVersion.V2_0; + private const global::Sample.TestClientOptions.ServiceBServiceVersion LatestServiceBVersion = global::Sample.TestClientOptions.ServiceBServiceVersion.V4_0; - public TestClientOptions(global::Sample.TestClientOptions.ServiceAVersion serviceAVersion = LatestServiceAVersion, global::Sample.TestClientOptions.ServiceBVersion serviceBVersion = LatestServiceBVersion) + public TestClientOptions(global::Sample.TestClientOptions.ServiceAServiceVersion serviceAServiceVersion = LatestServiceAVersion, global::Sample.TestClientOptions.ServiceBServiceVersion serviceBServiceVersion = LatestServiceBVersion) { - ServiceAApiVersion = serviceAVersion switch + ServiceAApiVersion = serviceAServiceVersion switch { - global::Sample.TestClientOptions.ServiceAVersion.V1_0 => "1.0", - global::Sample.TestClientOptions.ServiceAVersion.V2_0 => "2.0", + global::Sample.TestClientOptions.ServiceAServiceVersion.V1_0 => "1.0", + global::Sample.TestClientOptions.ServiceAServiceVersion.V2_0 => "2.0", _ => throw new global::System.NotSupportedException() }; - ServiceBApiVersion = serviceBVersion switch + ServiceBApiVersion = serviceBServiceVersion switch { - global::Sample.TestClientOptions.ServiceBVersion.V3_0 => "3.0", - global::Sample.TestClientOptions.ServiceBVersion.V4_0 => "4.0", + global::Sample.TestClientOptions.ServiceBServiceVersion.V3_0 => "3.0", + global::Sample.TestClientOptions.ServiceBServiceVersion.V4_0 => "4.0", _ => throw new global::System.NotSupportedException() }; } + [global::System.Diagnostics.CodeAnalysis.ExperimentalAttribute("SCME0002")] + internal TestClientOptions(global::Microsoft.Extensions.Configuration.IConfigurationSection section) : base(section) + { + ServiceAApiVersion = "2.0"; + ServiceBApiVersion = "4.0"; + if (((section is null) || !section.Exists())) + { + return; + } + if ((section["ServiceAApiVersion"] is string serviceAApiVersion)) + { + this.ServiceAApiVersion = serviceAApiVersion; + } + if ((section["ServiceBApiVersion"] is string serviceBApiVersion)) + { + this.ServiceBApiVersion = serviceBApiVersion; + } + } + internal string ServiceAApiVersion { get; } internal string ServiceBApiVersion { get; } - public enum ServiceAVersion + public enum ServiceAServiceVersion { V1_0 = 1, V2_0 = 2 } - public enum ServiceBVersion + public enum ServiceBServiceVersion { V3_0 = 1, V4_0 = 2 diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceClient_SameLastSegment_ProducesUniqueVersionEnums.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceClient_SameLastSegment_ProducesUniqueVersionEnums.cs new file mode 100644 index 00000000000..9308d24e008 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceClient_SameLastSegment_ProducesUniqueVersionEnums.cs @@ -0,0 +1,68 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Sample +{ + public partial class TestClientOptions : global::System.ClientModel.Primitives.ClientPipelineOptions + { + private const global::Sample.TestClientOptions.ServiceOneTestsVersion LatestServiceOneTestsVersion = global::Sample.TestClientOptions.ServiceOneTestsVersion.V2_0; + private const global::Sample.TestClientOptions.ServiceTwoTestsVersion LatestServiceTwoTestsVersion = global::Sample.TestClientOptions.ServiceTwoTestsVersion.V4_0; + + public TestClientOptions(global::Sample.TestClientOptions.ServiceOneTestsVersion serviceOneTestsVersion = LatestServiceOneTestsVersion, global::Sample.TestClientOptions.ServiceTwoTestsVersion serviceTwoTestsVersion = LatestServiceTwoTestsVersion) + { + ServiceOneTestsApiVersion = serviceOneTestsVersion switch + { + global::Sample.TestClientOptions.ServiceOneTestsVersion.V1_0 => "1.0", + global::Sample.TestClientOptions.ServiceOneTestsVersion.V2_0 => "2.0", + _ => throw new global::System.NotSupportedException() + }; + ServiceTwoTestsApiVersion = serviceTwoTestsVersion switch + { + global::Sample.TestClientOptions.ServiceTwoTestsVersion.V3_0 => "3.0", + global::Sample.TestClientOptions.ServiceTwoTestsVersion.V4_0 => "4.0", + _ => throw new global::System.NotSupportedException() + }; + } + + [global::System.Diagnostics.CodeAnalysis.ExperimentalAttribute("SCME0002")] + internal TestClientOptions(global::Microsoft.Extensions.Configuration.IConfigurationSection section) : base(section) + { + ServiceOneTestsApiVersion = "2.0"; + ServiceTwoTestsApiVersion = "4.0"; + if (((section is null) || !section.Exists())) + { + return; + } + if ((section["ServiceOneTestsApiVersion"] is string serviceOneTestsApiVersion)) + { + this.ServiceOneTestsApiVersion = serviceOneTestsApiVersion; + } + if ((section["ServiceTwoTestsApiVersion"] is string serviceTwoTestsApiVersion)) + { + this.ServiceTwoTestsApiVersion = serviceTwoTestsApiVersion; + } + } + + internal string ServiceOneTestsApiVersion { get; } + + internal string ServiceTwoTestsApiVersion { get; } + + public enum ServiceOneTestsVersion + { + V1_0 = 1, + V2_0 = 2 + } + + public enum ServiceTwoTestsVersion + { + V3_0 = 1, + V4_0 = 2 + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceClient_SameNamespace_ProducesUniqueVersionEnums.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceClient_SameNamespace_ProducesUniqueVersionEnums.cs new file mode 100644 index 00000000000..8381cce6351 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceClient_SameNamespace_ProducesUniqueVersionEnums.cs @@ -0,0 +1,64 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Sample +{ + public partial class MultiServiceClientOptions : global::System.ClientModel.Primitives.ClientPipelineOptions + { + private const global::Sample.MultiServiceClientOptions.AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceOneVersionsVersion LatestAzureGeneratorMgmtTypeSpecMultiServiceTestsServiceOneVersionsVersion = global::Sample.MultiServiceClientOptions.AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceOneVersionsVersion.V2024_01_01; + private const global::Sample.MultiServiceClientOptions.AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceTwoVersionsVersion LatestAzureGeneratorMgmtTypeSpecMultiServiceTestsServiceTwoVersionsVersion = global::Sample.MultiServiceClientOptions.AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceTwoVersionsVersion.V2024_06_01; + + public MultiServiceClientOptions(global::Sample.MultiServiceClientOptions.AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceOneVersionsVersion azureGeneratorMgmtTypeSpecMultiServiceTestsServiceOneVersionsVersion = LatestAzureGeneratorMgmtTypeSpecMultiServiceTestsServiceOneVersionsVersion, global::Sample.MultiServiceClientOptions.AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceTwoVersionsVersion azureGeneratorMgmtTypeSpecMultiServiceTestsServiceTwoVersionsVersion = LatestAzureGeneratorMgmtTypeSpecMultiServiceTestsServiceTwoVersionsVersion) + { + AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceOneVersionsApiVersion = azureGeneratorMgmtTypeSpecMultiServiceTestsServiceOneVersionsVersion switch + { + global::Sample.MultiServiceClientOptions.AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceOneVersionsVersion.V2024_01_01 => "2024-01-01", + _ => throw new global::System.NotSupportedException() + }; + AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceTwoVersionsApiVersion = azureGeneratorMgmtTypeSpecMultiServiceTestsServiceTwoVersionsVersion switch + { + global::Sample.MultiServiceClientOptions.AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceTwoVersionsVersion.V2024_06_01 => "2024-06-01", + _ => throw new global::System.NotSupportedException() + }; + } + + [global::System.Diagnostics.CodeAnalysis.ExperimentalAttribute("SCME0002")] + internal MultiServiceClientOptions(global::Microsoft.Extensions.Configuration.IConfigurationSection section) : base(section) + { + AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceOneVersionsApiVersion = "2024-01-01"; + AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceTwoVersionsApiVersion = "2024-06-01"; + if (((section is null) || !section.Exists())) + { + return; + } + if ((section["AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceOneVersionsApiVersion"] is string azureGeneratorMgmtTypeSpecMultiServiceTestsServiceOneVersionsApiVersion)) + { + this.AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceOneVersionsApiVersion = azureGeneratorMgmtTypeSpecMultiServiceTestsServiceOneVersionsApiVersion; + } + if ((section["AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceTwoVersionsApiVersion"] is string azureGeneratorMgmtTypeSpecMultiServiceTestsServiceTwoVersionsApiVersion)) + { + this.AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceTwoVersionsApiVersion = azureGeneratorMgmtTypeSpecMultiServiceTestsServiceTwoVersionsApiVersion; + } + } + + internal string AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceOneVersionsApiVersion { get; } + + internal string AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceTwoVersionsApiVersion { get; } + + public enum AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceOneVersionsVersion + { + V2024_01_01 = 1 + } + + public enum AzureGeneratorMgmtTypeSpecMultiServiceTestsServiceTwoVersionsVersion + { + V2024_06_01 = 1 + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceClient_UniqueNamespaces_ProducesUniqueVersionEnums.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceClient_UniqueNamespaces_ProducesUniqueVersionEnums.cs new file mode 100644 index 00000000000..ae41ff46731 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceClient_UniqueNamespaces_ProducesUniqueVersionEnums.cs @@ -0,0 +1,64 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Sample +{ + public partial class MultiServiceClientOptions : global::System.ClientModel.Primitives.ClientPipelineOptions + { + private const global::Sample.MultiServiceClientOptions.ServiceOneServiceVersion LatestServiceOneVersion = global::Sample.MultiServiceClientOptions.ServiceOneServiceVersion.V2024_01_01; + private const global::Sample.MultiServiceClientOptions.ServiceTwoServiceVersion LatestServiceTwoVersion = global::Sample.MultiServiceClientOptions.ServiceTwoServiceVersion.V2024_06_01; + + public MultiServiceClientOptions(global::Sample.MultiServiceClientOptions.ServiceOneServiceVersion serviceOneServiceVersion = LatestServiceOneVersion, global::Sample.MultiServiceClientOptions.ServiceTwoServiceVersion serviceTwoServiceVersion = LatestServiceTwoVersion) + { + ServiceOneApiVersion = serviceOneServiceVersion switch + { + global::Sample.MultiServiceClientOptions.ServiceOneServiceVersion.V2024_01_01 => "2024-01-01", + _ => throw new global::System.NotSupportedException() + }; + ServiceTwoApiVersion = serviceTwoServiceVersion switch + { + global::Sample.MultiServiceClientOptions.ServiceTwoServiceVersion.V2024_06_01 => "2024-06-01", + _ => throw new global::System.NotSupportedException() + }; + } + + [global::System.Diagnostics.CodeAnalysis.ExperimentalAttribute("SCME0002")] + internal MultiServiceClientOptions(global::Microsoft.Extensions.Configuration.IConfigurationSection section) : base(section) + { + ServiceOneApiVersion = "2024-01-01"; + ServiceTwoApiVersion = "2024-06-01"; + if (((section is null) || !section.Exists())) + { + return; + } + if ((section["ServiceOneApiVersion"] is string serviceOneApiVersion)) + { + this.ServiceOneApiVersion = serviceOneApiVersion; + } + if ((section["ServiceTwoApiVersion"] is string serviceTwoApiVersion)) + { + this.ServiceTwoApiVersion = serviceTwoApiVersion; + } + } + + internal string ServiceOneApiVersion { get; } + + internal string ServiceTwoApiVersion { get; } + + public enum ServiceOneServiceVersion + { + V2024_01_01 = 1 + } + + public enum ServiceTwoServiceVersion + { + V2024_06_01 = 1 + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceClient_WithThreeServices_GeneratesExpectedClientOptions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceClient_WithThreeServices_GeneratesExpectedClientOptions.cs index d7c4856dae2..37011ea3530 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceClient_WithThreeServices_GeneratesExpectedClientOptions.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceClient_WithThreeServices_GeneratesExpectedClientOptions.cs @@ -4,58 +4,84 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Sample { public partial class TestClientOptions : global::System.ClientModel.Primitives.ClientPipelineOptions { - private const global::Sample.TestClientOptions.ServiceComputeVersion LatestServiceComputeVersion = global::Sample.TestClientOptions.ServiceComputeVersion.V2024_07_01; - private const global::Sample.TestClientOptions.ServiceKeyVaultVersion LatestServiceKeyVaultVersion = global::Sample.TestClientOptions.ServiceKeyVaultVersion.V7_5; - private const global::Sample.TestClientOptions.ServiceStorageVersion LatestServiceStorageVersion = global::Sample.TestClientOptions.ServiceStorageVersion.V2024_01_01; + private const global::Sample.TestClientOptions.ComputeServiceVersion LatestComputeVersion = global::Sample.TestClientOptions.ComputeServiceVersion.V2024_07_01; + private const global::Sample.TestClientOptions.KeyVaultServiceVersion LatestKeyVaultVersion = global::Sample.TestClientOptions.KeyVaultServiceVersion.V7_5; + private const global::Sample.TestClientOptions.StorageServiceVersion LatestStorageVersion = global::Sample.TestClientOptions.StorageServiceVersion.V2024_01_01; - public TestClientOptions(global::Sample.TestClientOptions.ServiceKeyVaultVersion serviceKeyVaultVersion = LatestServiceKeyVaultVersion, global::Sample.TestClientOptions.ServiceStorageVersion serviceStorageVersion = LatestServiceStorageVersion, global::Sample.TestClientOptions.ServiceComputeVersion serviceComputeVersion = LatestServiceComputeVersion) + public TestClientOptions(global::Sample.TestClientOptions.KeyVaultServiceVersion keyVaultServiceVersion = LatestKeyVaultVersion, global::Sample.TestClientOptions.StorageServiceVersion storageServiceVersion = LatestStorageVersion, global::Sample.TestClientOptions.ComputeServiceVersion computeServiceVersion = LatestComputeVersion) { - ServiceKeyVaultApiVersion = serviceKeyVaultVersion switch + KeyVaultApiVersion = keyVaultServiceVersion switch { - global::Sample.TestClientOptions.ServiceKeyVaultVersion.V7_4 => "7.4", - global::Sample.TestClientOptions.ServiceKeyVaultVersion.V7_5 => "7.5", + global::Sample.TestClientOptions.KeyVaultServiceVersion.V7_4 => "7.4", + global::Sample.TestClientOptions.KeyVaultServiceVersion.V7_5 => "7.5", _ => throw new global::System.NotSupportedException() }; - ServiceStorageApiVersion = serviceStorageVersion switch + StorageApiVersion = storageServiceVersion switch { - global::Sample.TestClientOptions.ServiceStorageVersion.V2023_01_01 => "2023-01-01", - global::Sample.TestClientOptions.ServiceStorageVersion.V2024_01_01 => "2024-01-01", + global::Sample.TestClientOptions.StorageServiceVersion.V2023_01_01 => "2023-01-01", + global::Sample.TestClientOptions.StorageServiceVersion.V2024_01_01 => "2024-01-01", _ => throw new global::System.NotSupportedException() }; - ServiceComputeApiVersion = serviceComputeVersion switch + ComputeApiVersion = computeServiceVersion switch { - global::Sample.TestClientOptions.ServiceComputeVersion.V2023_07_01 => "2023-07-01", - global::Sample.TestClientOptions.ServiceComputeVersion.V2024_03_01 => "2024-03-01", - global::Sample.TestClientOptions.ServiceComputeVersion.V2024_07_01 => "2024-07-01", + global::Sample.TestClientOptions.ComputeServiceVersion.V2023_07_01 => "2023-07-01", + global::Sample.TestClientOptions.ComputeServiceVersion.V2024_03_01 => "2024-03-01", + global::Sample.TestClientOptions.ComputeServiceVersion.V2024_07_01 => "2024-07-01", _ => throw new global::System.NotSupportedException() }; } - internal string ServiceComputeApiVersion { get; } + [global::System.Diagnostics.CodeAnalysis.ExperimentalAttribute("SCME0002")] + internal TestClientOptions(global::Microsoft.Extensions.Configuration.IConfigurationSection section) : base(section) + { + ComputeApiVersion = "2024-07-01"; + KeyVaultApiVersion = "7.5"; + StorageApiVersion = "2024-01-01"; + if (((section is null) || !section.Exists())) + { + return; + } + if ((section["ComputeApiVersion"] is string computeApiVersion)) + { + this.ComputeApiVersion = computeApiVersion; + } + if ((section["KeyVaultApiVersion"] is string keyVaultApiVersion)) + { + this.KeyVaultApiVersion = keyVaultApiVersion; + } + if ((section["StorageApiVersion"] is string storageApiVersion)) + { + this.StorageApiVersion = storageApiVersion; + } + } + + internal string ComputeApiVersion { get; } - internal string ServiceKeyVaultApiVersion { get; } + internal string KeyVaultApiVersion { get; } - internal string ServiceStorageApiVersion { get; } + internal string StorageApiVersion { get; } - public enum ServiceComputeVersion + public enum ComputeServiceVersion { V2023_07_01 = 1, V2024_03_01 = 2, V2024_07_01 = 3 } - public enum ServiceKeyVaultVersion + public enum KeyVaultServiceVersion { V7_4 = 1, V7_5 = 2 } - public enum ServiceStorageVersion + public enum StorageServiceVersion { V2023_01_01 = 1, V2024_01_01 = 2 diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceCombinedClient_GeneratesExpectedClientOptions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceCombinedClient_GeneratesExpectedClientOptions.cs index f3f3227ef90..cbb435387e8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceCombinedClient_GeneratesExpectedClientOptions.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceCombinedClient_GeneratesExpectedClientOptions.cs @@ -4,41 +4,62 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Sample { public partial class TestClientOptions : global::System.ClientModel.Primitives.ClientPipelineOptions { - private const global::Sample.TestClientOptions.ServiceAVersion LatestServiceAVersion = global::Sample.TestClientOptions.ServiceAVersion.V2_0; - private const global::Sample.TestClientOptions.ServiceBVersion LatestServiceBVersion = global::Sample.TestClientOptions.ServiceBVersion.V4_0; + private const global::Sample.TestClientOptions.ServiceAServiceVersion LatestServiceAVersion = global::Sample.TestClientOptions.ServiceAServiceVersion.V2_0; + private const global::Sample.TestClientOptions.ServiceBServiceVersion LatestServiceBVersion = global::Sample.TestClientOptions.ServiceBServiceVersion.V4_0; - public TestClientOptions(global::Sample.TestClientOptions.ServiceAVersion serviceAVersion = LatestServiceAVersion, global::Sample.TestClientOptions.ServiceBVersion serviceBVersion = LatestServiceBVersion) + public TestClientOptions(global::Sample.TestClientOptions.ServiceAServiceVersion serviceAServiceVersion = LatestServiceAVersion, global::Sample.TestClientOptions.ServiceBServiceVersion serviceBServiceVersion = LatestServiceBVersion) { - ServiceAApiVersion = serviceAVersion switch + ServiceAApiVersion = serviceAServiceVersion switch { - global::Sample.TestClientOptions.ServiceAVersion.V1_0 => "1.0", - global::Sample.TestClientOptions.ServiceAVersion.V2_0 => "2.0", + global::Sample.TestClientOptions.ServiceAServiceVersion.V1_0 => "1.0", + global::Sample.TestClientOptions.ServiceAServiceVersion.V2_0 => "2.0", _ => throw new global::System.NotSupportedException() }; - ServiceBApiVersion = serviceBVersion switch + ServiceBApiVersion = serviceBServiceVersion switch { - global::Sample.TestClientOptions.ServiceBVersion.V3_0 => "3.0", - global::Sample.TestClientOptions.ServiceBVersion.V4_0 => "4.0", + global::Sample.TestClientOptions.ServiceBServiceVersion.V3_0 => "3.0", + global::Sample.TestClientOptions.ServiceBServiceVersion.V4_0 => "4.0", _ => throw new global::System.NotSupportedException() }; } + [global::System.Diagnostics.CodeAnalysis.ExperimentalAttribute("SCME0002")] + internal TestClientOptions(global::Microsoft.Extensions.Configuration.IConfigurationSection section) : base(section) + { + ServiceAApiVersion = "2.0"; + ServiceBApiVersion = "4.0"; + if (((section is null) || !section.Exists())) + { + return; + } + if ((section["ServiceAApiVersion"] is string serviceAApiVersion)) + { + this.ServiceAApiVersion = serviceAApiVersion; + } + if ((section["ServiceBApiVersion"] is string serviceBApiVersion)) + { + this.ServiceBApiVersion = serviceBApiVersion; + } + } + internal string ServiceAApiVersion { get; } internal string ServiceBApiVersion { get; } - public enum ServiceAVersion + public enum ServiceAServiceVersion { V1_0 = 1, V2_0 = 2 } - public enum ServiceBVersion + public enum ServiceBServiceVersion { V3_0 = 1, V4_0 = 2 diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceCombinedClient_WithThreeServices_GeneratesExpectedClientOptions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceCombinedClient_WithThreeServices_GeneratesExpectedClientOptions.cs index d7c4856dae2..37011ea3530 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceCombinedClient_WithThreeServices_GeneratesExpectedClientOptions.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/MultiServiceCombinedClient_WithThreeServices_GeneratesExpectedClientOptions.cs @@ -4,58 +4,84 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Sample { public partial class TestClientOptions : global::System.ClientModel.Primitives.ClientPipelineOptions { - private const global::Sample.TestClientOptions.ServiceComputeVersion LatestServiceComputeVersion = global::Sample.TestClientOptions.ServiceComputeVersion.V2024_07_01; - private const global::Sample.TestClientOptions.ServiceKeyVaultVersion LatestServiceKeyVaultVersion = global::Sample.TestClientOptions.ServiceKeyVaultVersion.V7_5; - private const global::Sample.TestClientOptions.ServiceStorageVersion LatestServiceStorageVersion = global::Sample.TestClientOptions.ServiceStorageVersion.V2024_01_01; + private const global::Sample.TestClientOptions.ComputeServiceVersion LatestComputeVersion = global::Sample.TestClientOptions.ComputeServiceVersion.V2024_07_01; + private const global::Sample.TestClientOptions.KeyVaultServiceVersion LatestKeyVaultVersion = global::Sample.TestClientOptions.KeyVaultServiceVersion.V7_5; + private const global::Sample.TestClientOptions.StorageServiceVersion LatestStorageVersion = global::Sample.TestClientOptions.StorageServiceVersion.V2024_01_01; - public TestClientOptions(global::Sample.TestClientOptions.ServiceKeyVaultVersion serviceKeyVaultVersion = LatestServiceKeyVaultVersion, global::Sample.TestClientOptions.ServiceStorageVersion serviceStorageVersion = LatestServiceStorageVersion, global::Sample.TestClientOptions.ServiceComputeVersion serviceComputeVersion = LatestServiceComputeVersion) + public TestClientOptions(global::Sample.TestClientOptions.KeyVaultServiceVersion keyVaultServiceVersion = LatestKeyVaultVersion, global::Sample.TestClientOptions.StorageServiceVersion storageServiceVersion = LatestStorageVersion, global::Sample.TestClientOptions.ComputeServiceVersion computeServiceVersion = LatestComputeVersion) { - ServiceKeyVaultApiVersion = serviceKeyVaultVersion switch + KeyVaultApiVersion = keyVaultServiceVersion switch { - global::Sample.TestClientOptions.ServiceKeyVaultVersion.V7_4 => "7.4", - global::Sample.TestClientOptions.ServiceKeyVaultVersion.V7_5 => "7.5", + global::Sample.TestClientOptions.KeyVaultServiceVersion.V7_4 => "7.4", + global::Sample.TestClientOptions.KeyVaultServiceVersion.V7_5 => "7.5", _ => throw new global::System.NotSupportedException() }; - ServiceStorageApiVersion = serviceStorageVersion switch + StorageApiVersion = storageServiceVersion switch { - global::Sample.TestClientOptions.ServiceStorageVersion.V2023_01_01 => "2023-01-01", - global::Sample.TestClientOptions.ServiceStorageVersion.V2024_01_01 => "2024-01-01", + global::Sample.TestClientOptions.StorageServiceVersion.V2023_01_01 => "2023-01-01", + global::Sample.TestClientOptions.StorageServiceVersion.V2024_01_01 => "2024-01-01", _ => throw new global::System.NotSupportedException() }; - ServiceComputeApiVersion = serviceComputeVersion switch + ComputeApiVersion = computeServiceVersion switch { - global::Sample.TestClientOptions.ServiceComputeVersion.V2023_07_01 => "2023-07-01", - global::Sample.TestClientOptions.ServiceComputeVersion.V2024_03_01 => "2024-03-01", - global::Sample.TestClientOptions.ServiceComputeVersion.V2024_07_01 => "2024-07-01", + global::Sample.TestClientOptions.ComputeServiceVersion.V2023_07_01 => "2023-07-01", + global::Sample.TestClientOptions.ComputeServiceVersion.V2024_03_01 => "2024-03-01", + global::Sample.TestClientOptions.ComputeServiceVersion.V2024_07_01 => "2024-07-01", _ => throw new global::System.NotSupportedException() }; } - internal string ServiceComputeApiVersion { get; } + [global::System.Diagnostics.CodeAnalysis.ExperimentalAttribute("SCME0002")] + internal TestClientOptions(global::Microsoft.Extensions.Configuration.IConfigurationSection section) : base(section) + { + ComputeApiVersion = "2024-07-01"; + KeyVaultApiVersion = "7.5"; + StorageApiVersion = "2024-01-01"; + if (((section is null) || !section.Exists())) + { + return; + } + if ((section["ComputeApiVersion"] is string computeApiVersion)) + { + this.ComputeApiVersion = computeApiVersion; + } + if ((section["KeyVaultApiVersion"] is string keyVaultApiVersion)) + { + this.KeyVaultApiVersion = keyVaultApiVersion; + } + if ((section["StorageApiVersion"] is string storageApiVersion)) + { + this.StorageApiVersion = storageApiVersion; + } + } + + internal string ComputeApiVersion { get; } - internal string ServiceKeyVaultApiVersion { get; } + internal string KeyVaultApiVersion { get; } - internal string ServiceStorageApiVersion { get; } + internal string StorageApiVersion { get; } - public enum ServiceComputeVersion + public enum ComputeServiceVersion { V2023_07_01 = 1, V2024_03_01 = 2, V2024_07_01 = 3 } - public enum ServiceKeyVaultVersion + public enum KeyVaultServiceVersion { V7_4 = 1, V7_5 = 2 } - public enum ServiceStorageVersion + public enum StorageServiceVersion { V2023_01_01 = 1, V2024_01_01 = 2 diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/TestConfigurationSectionConstructorBody_BindsCustomCodeProperties/TestClientOptions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/TestConfigurationSectionConstructorBody_BindsCustomCodeProperties/TestClientOptions.cs new file mode 100644 index 00000000000..30f1955a770 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientOptionsProviderTests/TestConfigurationSectionConstructorBody_BindsCustomCodeProperties/TestClientOptions.cs @@ -0,0 +1,11 @@ +#nullable disable + +using System.ClientModel.Primitives; + +namespace SampleNamespace +{ + public partial class TestClientOptions : ClientPipelineOptions + { + public string Audience { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestBindCoreMethod_BindsCustomConstructorParameters/TestClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestBindCoreMethod_BindsCustomConstructorParameters/TestClient.cs new file mode 100644 index 00000000000..488eb113e09 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestBindCoreMethod_BindsCustomConstructorParameters/TestClient.cs @@ -0,0 +1,9 @@ +#nullable disable + +namespace SampleNamespace +{ + public partial class TestClient + { + public TestClient(string connectionString) { } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestBindCoreMethod_DoesNotBindSettingsParameter/TestClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestBindCoreMethod_DoesNotBindSettingsParameter/TestClient.cs new file mode 100644 index 00000000000..295c1e16637 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestBindCoreMethod_DoesNotBindSettingsParameter/TestClient.cs @@ -0,0 +1,12 @@ +#nullable disable + +using System.Diagnostics.CodeAnalysis; + +namespace SampleNamespace +{ + public partial class TestClient + { + [Experimental("SCME0002")] + public TestClient(TestClientSettings settings) { } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestBindCoreMethod_WithCustomIntStructParam/CustomPriority.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestBindCoreMethod_WithCustomIntStructParam/CustomPriority.cs new file mode 100644 index 00000000000..11c10870750 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestBindCoreMethod_WithCustomIntStructParam/CustomPriority.cs @@ -0,0 +1,14 @@ +#nullable disable + +namespace SampleNamespace +{ + public readonly partial struct CustomPriority + { + private readonly int _value; + + public CustomPriority(int value) + { + _value = value; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestBindCoreMethod_WithCustomStructParam/CustomAudience.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestBindCoreMethod_WithCustomStructParam/CustomAudience.cs new file mode 100644 index 00000000000..05dec1f8c23 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestBindCoreMethod_WithCustomStructParam/CustomAudience.cs @@ -0,0 +1,14 @@ +#nullable disable + +namespace SampleNamespace +{ + public readonly partial struct CustomAudience + { + private readonly string _value; + + public CustomAudience(string value) + { + _value = value; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestBindCoreMethod_WithCustomStructParam_FallsBackToComplexObject/CustomComplex.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestBindCoreMethod_WithCustomStructParam_FallsBackToComplexObject/CustomComplex.cs new file mode 100644 index 00000000000..655f7536bac --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestBindCoreMethod_WithCustomStructParam_FallsBackToComplexObject/CustomComplex.cs @@ -0,0 +1,16 @@ +#nullable disable + +namespace SampleNamespace +{ + public readonly partial struct CustomComplex + { + private readonly string _name; + private readonly int _value; + + public CustomComplex(string name, int value) + { + _name = name; + _value = value; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestGeneratedSettings_WithNamedStringEndpoint.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestGeneratedSettings_WithNamedStringEndpoint.cs new file mode 100644 index 00000000000..ec384277371 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestGeneratedSettings_WithNamedStringEndpoint.cs @@ -0,0 +1,32 @@ +// + +#nullable disable + +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Sample +{ + [global::System.Diagnostics.CodeAnalysis.ExperimentalAttribute("SCME0002")] + public partial class TestClientSettings : global::System.ClientModel.Primitives.ClientSettings + { + public string FullyQualifiedNamespace { get; set; } + + public global::Sample.TestClientOptions Options { get; set; } + + protected override void BindCore(global::Microsoft.Extensions.Configuration.IConfigurationSection section) + { + string fullyQualifiedNamespace = section["FullyQualifiedNamespace"]; + if (!string.IsNullOrEmpty(fullyQualifiedNamespace)) + { + this.FullyQualifiedNamespace = fullyQualifiedNamespace; + } + global::Microsoft.Extensions.Configuration.IConfigurationSection optionsSection = section.GetSection("Options"); + if (optionsSection.Exists()) + { + this.Options = new global::Sample.TestClientOptions(optionsSection); + } + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestGeneratedSettings_WithStringEndpoint.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestGeneratedSettings_WithStringEndpoint.cs new file mode 100644 index 00000000000..d788bffbdd1 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestGeneratedSettings_WithStringEndpoint.cs @@ -0,0 +1,32 @@ +// + +#nullable disable + +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Sample +{ + [global::System.Diagnostics.CodeAnalysis.ExperimentalAttribute("SCME0002")] + public partial class TestClientSettings : global::System.ClientModel.Primitives.ClientSettings + { + public string Endpoint { get; set; } + + public global::Sample.TestClientOptions Options { get; set; } + + protected override void BindCore(global::Microsoft.Extensions.Configuration.IConfigurationSection section) + { + string endpoint = section["Endpoint"]; + if (!string.IsNullOrEmpty(endpoint)) + { + this.Endpoint = endpoint; + } + global::Microsoft.Extensions.Configuration.IConfigurationSection optionsSection = section.GetSection("Options"); + if (optionsSection.Exists()) + { + this.Options = new global::Sample.TestClientOptions(optionsSection); + } + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestGeneratedSettings_WithUrlEndpoint.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestGeneratedSettings_WithUrlEndpoint.cs new file mode 100644 index 00000000000..308ed1bed8b --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestGeneratedSettings_WithUrlEndpoint.cs @@ -0,0 +1,32 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Sample +{ + [global::System.Diagnostics.CodeAnalysis.ExperimentalAttribute("SCME0002")] + public partial class TestClientSettings : global::System.ClientModel.Primitives.ClientSettings + { + public global::System.Uri Endpoint { get; set; } + + public global::Sample.TestClientOptions Options { get; set; } + + protected override void BindCore(global::Microsoft.Extensions.Configuration.IConfigurationSection section) + { + if (global::System.Uri.TryCreate(section["Endpoint"], global::System.UriKind.Absolute, out global::System.Uri endpoint)) + { + this.Endpoint = endpoint; + } + global::Microsoft.Extensions.Configuration.IConfigurationSection optionsSection = section.GetSection("Options"); + if (optionsSection.Exists()) + { + this.Options = new global::Sample.TestClientOptions(optionsSection); + } + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestProperties_IncludesCustomConstructorParameters/TestClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestProperties_IncludesCustomConstructorParameters/TestClient.cs new file mode 100644 index 00000000000..488eb113e09 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestProperties_IncludesCustomConstructorParameters/TestClient.cs @@ -0,0 +1,9 @@ +#nullable disable + +namespace SampleNamespace +{ + public partial class TestClient + { + public TestClient(string connectionString) { } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestSettingsConstructor_WithStringEndpoint.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestSettingsConstructor_WithStringEndpoint.cs new file mode 100644 index 00000000000..b34c34bc1fa --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestSettingsConstructor_WithStringEndpoint.cs @@ -0,0 +1,49 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; + +namespace Sample +{ + public partial class TestClient + { + private readonly global::System.Uri _endpoint; + + protected TestClient() + { + } + + public TestClient(string endpoint = default) : this(endpoint, new global::Sample.TestClientOptions()) + { + } + + internal TestClient(global::System.ClientModel.Primitives.AuthenticationPolicy authenticationPolicy, string endpoint = default, global::Sample.TestClientOptions options) + { + options ??= new global::Sample.TestClientOptions(); + + _endpoint = new global::System.Uri($"https://{endpoint}"); + if ((authenticationPolicy != null)) + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); + } + else + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + } + } + + public TestClient(string endpoint = default, global::Sample.TestClientOptions options) : this(null, endpoint, options) + { + } + + [global::System.Diagnostics.CodeAnalysis.ExperimentalAttribute("SCME0002")] + public TestClient(global::Sample.TestClientSettings settings) : this(global::System.ClientModel.Primitives.AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) + { + } + + public global::System.ClientModel.Primitives.ClientPipeline Pipeline { get; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestSettingsConstructor_WithUrlEndpoint.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestSettingsConstructor_WithUrlEndpoint.cs new file mode 100644 index 00000000000..ad76eb92090 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestSettingsConstructor_WithUrlEndpoint.cs @@ -0,0 +1,51 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; + +namespace Sample +{ + public partial class TestClient + { + private readonly global::System.Uri _endpoint; + + protected TestClient() + { + } + + public TestClient(global::System.Uri endpoint) : this(endpoint, new global::Sample.TestClientOptions()) + { + } + + internal TestClient(global::System.ClientModel.Primitives.AuthenticationPolicy authenticationPolicy, global::System.Uri endpoint, global::Sample.TestClientOptions options) + { + global::Sample.Argument.AssertNotNull(endpoint, nameof(endpoint)); + + options ??= new global::Sample.TestClientOptions(); + + _endpoint = endpoint; + if ((authenticationPolicy != null)) + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); + } + else + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + } + } + + public TestClient(global::System.Uri endpoint, global::Sample.TestClientOptions options) : this(null, endpoint, options) + { + } + + [global::System.Diagnostics.CodeAnalysis.ExperimentalAttribute("SCME0002")] + public TestClient(global::Sample.TestClientSettings settings) : this(global::System.ClientModel.Primitives.AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) + { + } + + public global::System.ClientModel.Primitives.ClientPipeline Pipeline { get; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestSettingsType_DoesNotContainSelfReferentialSettingsProperty/TestClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestSettingsType_DoesNotContainSelfReferentialSettingsProperty/TestClient.cs new file mode 100644 index 00000000000..295c1e16637 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ClientSettingsProviderTests/TestSettingsType_DoesNotContainSelfReferentialSettingsProperty/TestClient.cs @@ -0,0 +1,12 @@ +#nullable disable + +using System.Diagnostics.CodeAnalysis; + +namespace SampleNamespace +{ + public partial class TestClient + { + [Experimental("SCME0002")] + public TestClient(TestClientSettings settings) { } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/CombinedMissingOperationParamsAndNonBodyModelParams.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/CombinedMissingOperationParamsAndNonBodyModelParams.cs new file mode 100644 index 00000000000..d8060badd68 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/CombinedMissingOperationParamsAndNonBodyModelParams.cs @@ -0,0 +1,4 @@ +global::Sample.Argument.AssertNotNullOrEmpty(id, nameof(id)); +global::Sample.Argument.AssertNotNull(request, nameof(request)); + +return this.TestOp(id, request.XCustomHeader, request, request.QueryParam, options: cancellationToken.ToRequestOptions()); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ConvenienceMethod_DualFormatModel_JsonContentType_CallsToBinaryContentWithJ.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ConvenienceMethod_DualFormatModel_JsonContentType_CallsToBinaryContentWithJ.cs new file mode 100644 index 00000000000..baeda794215 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ConvenienceMethod_DualFormatModel_JsonContentType_CallsToBinaryContentWithJ.cs @@ -0,0 +1,4 @@ +global::Sample.Argument.AssertNotNull(body, nameof(body)); + +using global::System.ClientModel.BinaryContent content = body.ToBinaryContent("J"); +return this.UpdateModel(content, cancellationToken.ToRequestOptions()); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ConvenienceMethod_DualFormatModel_XmlContentType_CallsToBinaryContentWithX.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ConvenienceMethod_DualFormatModel_XmlContentType_CallsToBinaryContentWithX.cs new file mode 100644 index 00000000000..71551d82947 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ConvenienceMethod_DualFormatModel_XmlContentType_CallsToBinaryContentWithX.cs @@ -0,0 +1,4 @@ +global::Sample.Argument.AssertNotNull(body, nameof(body)); + +using global::System.ClientModel.BinaryContent content = body.ToBinaryContent("X"); +return this.UpdateModel(content, cancellationToken.ToRequestOptions()); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ConvenienceMethod_SingleFormatModel_UsesImplicitOperator.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ConvenienceMethod_SingleFormatModel_UsesImplicitOperator.cs new file mode 100644 index 00000000000..efb6afcb9f1 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ConvenienceMethod_SingleFormatModel_UsesImplicitOperator.cs @@ -0,0 +1,3 @@ +global::Sample.Argument.AssertNotNull(body, nameof(body)); + +return this.UpdateModel(body, cancellationToken.ToRequestOptions()); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ConvenienceMethod_XmlListBody_UsesXmlFromEnumerable.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ConvenienceMethod_XmlListBody_UsesXmlFromEnumerable.cs new file mode 100644 index 00000000000..9fedf14efd0 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ConvenienceMethod_XmlListBody_UsesXmlFromEnumerable.cs @@ -0,0 +1,4 @@ +global::Sample.Argument.AssertNotNull(body, nameof(body)); + +using global::System.ClientModel.BinaryContent content = global::Sample.BinaryContentHelper.FromEnumerable(body, "list", "SignedIdentifier"); +return this.Foo(content, cancellationToken.ToRequestOptions()); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ConvenienceMethod_XmlListResponse_UsesXDocumentDeserialization.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ConvenienceMethod_XmlListResponse_UsesXDocumentDeserialization.cs new file mode 100644 index 00000000000..53582ce29b2 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ConvenienceMethod_XmlListResponse_UsesXDocumentDeserialization.cs @@ -0,0 +1,17 @@ +global::System.ClientModel.ClientResult result = this.GetFoo(cancellationToken.ToRequestOptions()); +global::System.Collections.Generic.IList value = default; +global::System.BinaryData data = result.GetRawResponse().Content; +using (global::System.IO.Stream stream = data.ToStream()) +{ + global::System.Xml.Linq.XDocument document = global::System.Xml.Linq.XDocument.Load(stream, global::System.Xml.Linq.LoadOptions.PreserveWhitespace); + if ((document.Element("list") is global::System.Xml.Linq.XElement element)) + { + global::System.Collections.Generic.List array = new global::System.Collections.Generic.List(); + foreach (var item in element.Elements("SignedIdentifier")) + { + array.Add(global::Sample.Models.SignedIdentifier.DeserializeSignedIdentifier(item, global::Sample.ModelSerializationExtensions.WireOptions)); + } + value = array; + } +} +return global::System.ClientModel.ClientResult.FromValue(((global::System.Collections.Generic.IReadOnlyList)value), result.GetRawResponse()); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/MissingOperationParamsResultInNamedArgsForSubsequent.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/MissingOperationParamsResultInNamedArgsForSubsequent.cs new file mode 100644 index 00000000000..ebfa29f66d5 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/MissingOperationParamsResultInNamedArgsForSubsequent.cs @@ -0,0 +1,3 @@ +global::Sample.Argument.AssertNotNullOrEmpty(id, nameof(id)); + +return this.TestOp(id, take, order: order, options: cancellationToken.ToRequestOptions()); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/MissingRequiredOperationParamsResultInPassingNull.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/MissingRequiredOperationParamsResultInPassingNull.cs new file mode 100644 index 00000000000..4fd9c48882d --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/MissingRequiredOperationParamsResultInPassingNull.cs @@ -0,0 +1,3 @@ +global::Sample.Argument.AssertNotNullOrEmpty(id, nameof(id)); + +return this.TestOp(id, filter: null, order: order, take: take, options: cancellationToken.ToRequestOptions()); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ScalarReturnTypeMethods(Uri).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ScalarReturnTypeMethods(Uri).cs index 6348e84a1c9..3a0a7cfdd2e 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ScalarReturnTypeMethods(Uri).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/TestData/ScmMethodProviderCollectionTests/ScalarReturnTypeMethods(Uri).cs @@ -2,4 +2,4 @@ global::System.BinaryData data = result.GetRawResponse().Content; using global::System.Text.Json.JsonDocument document = global::System.Text.Json.JsonDocument.Parse(data); global::System.Text.Json.JsonElement element = document.RootElement; -return global::System.ClientModel.ClientResult.FromValue(new global::System.Uri(element.GetString()), result.GetRawResponse()); +return global::System.ClientModel.ClientResult.FromValue(new global::System.Uri(element.GetString(), global::System.UriKind.RelativeOrAbsolute), result.GetRawResponse()); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ScmKnownParametersTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ScmKnownParametersTests.cs index e96bfd1b498..40e7c9e92bd 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ScmKnownParametersTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/ScmKnownParametersTests.cs @@ -21,7 +21,7 @@ public void Setup() [Test] public void BinaryDataParameterHasValidation() { - var parameter = ScmKnownParameters.RequestContent; + var parameter = ScmKnownParameters.CreateRequestContent(); Assert.AreEqual(ParameterValidationType.AssertNotNull, parameter.Validation); } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/Generate_ConstructorParameter_IncludesModelDefinition.json b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/Generate_ConstructorParameter_IncludesModelDefinition.json new file mode 100644 index 00000000000..c36ea45c926 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/Generate_ConstructorParameter_IncludesModelDefinition.json @@ -0,0 +1,53 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "TestService": { + "type": "object", + "description": "Configuration for TestService.", + "properties": { + "Endpoint": { + "type": "string", + "description": "Gets or sets the Endpoint." + }, + "ConnectionConfig": { + "$ref": "#/definitions/connectionConfig" + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/testServiceOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "connectionConfig": { + "type": "object", + "properties": { + "Host": { + "type": "string" + }, + "Port": { + "type": "integer" + } + } + }, + "testServiceOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/Generate_ExcludesInternalConstructorParameters/TestService.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/Generate_ExcludesInternalConstructorParameters/TestService.cs new file mode 100644 index 00000000000..47edb029eba --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/Generate_ExcludesInternalConstructorParameters/TestService.cs @@ -0,0 +1,10 @@ +#nullable disable + +namespace Sample +{ + public partial class TestService + { + public TestService(string connectionString) { } + internal TestService(string internalParam, int anotherInternalParam) { } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/Generate_HandlesMultipleClients.json b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/Generate_HandlesMultipleClients.json new file mode 100644 index 00000000000..7283b9b2c1f --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/Generate_HandlesMultipleClients.json @@ -0,0 +1,54 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "ServiceA": { + "type": "object", + "description": "Configuration for ServiceA.", + "properties": { + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/serviceAOptions" + } + } + }, + "ServiceB": { + "type": "object", + "description": "Configuration for ServiceB.", + "properties": { + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/serviceBOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "serviceAOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + }, + "serviceBOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/Generate_IncludesCustomCodeOptionsProperties/TestServiceOptions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/Generate_IncludesCustomCodeOptionsProperties/TestServiceOptions.cs new file mode 100644 index 00000000000..f420dba0474 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/Generate_IncludesCustomCodeOptionsProperties/TestServiceOptions.cs @@ -0,0 +1,11 @@ +#nullable disable + +using System.ClientModel.Primitives; + +namespace Sample +{ + public partial class TestServiceOptions : ClientPipelineOptions + { + public string Audience { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/Generate_IncludesCustomConstructorParameters/TestService.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/Generate_IncludesCustomConstructorParameters/TestService.cs new file mode 100644 index 00000000000..22eada52e54 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/Generate_IncludesCustomConstructorParameters/TestService.cs @@ -0,0 +1,9 @@ +#nullable disable + +namespace Sample +{ + public partial class TestService + { + public TestService(string connectionString) { } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/Generate_ReturnsSchema_ForClientWithSettings.json b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/Generate_ReturnsSchema_ForClientWithSettings.json new file mode 100644 index 00000000000..7bf8de8af1b --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/Generate_ReturnsSchema_ForClientWithSettings.json @@ -0,0 +1,35 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "TestService": { + "type": "object", + "description": "Configuration for TestService.", + "properties": { + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/testServiceOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "testServiceOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/GetJsonSchemaForType_ReturnsIntegerSchema_ForCustomIntStruct/CustomPriority.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/GetJsonSchemaForType_ReturnsIntegerSchema_ForCustomIntStruct/CustomPriority.cs new file mode 100644 index 00000000000..11c10870750 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/GetJsonSchemaForType_ReturnsIntegerSchema_ForCustomIntStruct/CustomPriority.cs @@ -0,0 +1,14 @@ +#nullable disable + +namespace SampleNamespace +{ + public readonly partial struct CustomPriority + { + private readonly int _value; + + public CustomPriority(int value) + { + _value = value; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/GetJsonSchemaForType_ReturnsObjectSchema_ForCustomStructWithNoValidConstructor/CustomComplex.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/GetJsonSchemaForType_ReturnsObjectSchema_ForCustomStructWithNoValidConstructor/CustomComplex.cs new file mode 100644 index 00000000000..655f7536bac --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/GetJsonSchemaForType_ReturnsObjectSchema_ForCustomStructWithNoValidConstructor/CustomComplex.cs @@ -0,0 +1,16 @@ +#nullable disable + +namespace SampleNamespace +{ + public readonly partial struct CustomComplex + { + private readonly string _name; + private readonly int _value; + + public CustomComplex(string name, int value) + { + _name = name; + _value = value; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/GetJsonSchemaForType_ReturnsStringSchema_ForCustomStringStruct/CustomAudience.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/GetJsonSchemaForType_ReturnsStringSchema_ForCustomStringStruct/CustomAudience.cs new file mode 100644 index 00000000000..05dec1f8c23 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestData/ConfigurationSchemaGeneratorTests/GetJsonSchemaForType_ReturnsStringSchema_ForCustomStringStruct/CustomAudience.cs @@ -0,0 +1,14 @@ +#nullable disable + +namespace SampleNamespace +{ + public readonly partial struct CustomAudience + { + private readonly string _value; + + public CustomAudience(string value) + { + _value = value; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestHelpers/TestRequestContentApi.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestHelpers/TestRequestContentApi.cs index 106afd687af..3c84cc249ea 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestHelpers/TestRequestContentApi.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestHelpers/TestRequestContentApi.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. using Microsoft.TypeSpec.Generator.ClientModel.Providers; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/DurationKnownEncodingExtensions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/DurationKnownEncodingExtensions.cs deleted file mode 100644 index 1a75ba822eb..00000000000 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/DurationKnownEncodingExtensions.cs +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using System.Diagnostics.CodeAnalysis; - -namespace Microsoft.TypeSpec.Generator.Input.Extensions -{ - internal static class DurationKnownEncodingExtensions - { - public static bool TryParse(string? value, [NotNullWhen(true)] out DurationKnownEncoding? result) - { - result = value?.ToLowerInvariant() switch - { - "iso8601" => DurationKnownEncoding.Iso8601, - "seconds" => DurationKnownEncoding.Seconds, - "duration-constant" => DurationKnownEncoding.Constant, - "milliseconds" => DurationKnownEncoding.Milliseconds, - _ => null - }; - - return result.HasValue; - } - } -} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs index 5c754e5fe48..53fe46f08cd 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs @@ -9,10 +9,11 @@ namespace Microsoft.TypeSpec.Generator.Input.Extensions { public static class StringExtensions { - private static bool IsWordSeparator(char c) => !SyntaxFacts.IsIdentifierPartCharacter(c) || c == '_'; + private static bool IsWordSeparator(char c, bool preserveUnderscores = false) + => !SyntaxFacts.IsIdentifierPartCharacter(c) || (!preserveUnderscores && c == '_'); [return: NotNullIfNotNull("name")] - public static string ToIdentifierName(this string name, bool useCamelCase = false) + public static string ToIdentifierName(this string name, bool useCamelCase = false, bool preserveUnderscores = false) { if (string.IsNullOrEmpty(name)) { @@ -39,7 +40,7 @@ public static string ToIdentifierName(this string name, bool useCamelCase = fals for (; i < name.Length; i++) { var c = name[i]; - if (IsWordSeparator(c)) + if (IsWordSeparator(c, preserveUnderscores)) { upperCase = true; continue; @@ -56,7 +57,7 @@ public static string ToIdentifierName(this string name, bool useCamelCase = fals upperCase = false; // grow the first word length when this letter follows by two other upper case letters // this happens in OSProfile, where OS is the first word - if (i + 2 < name.Length && char.IsUpper(name[i + 1]) && (char.IsUpper(name[i + 2]) || IsWordSeparator(name[i + 2]))) + if (i + 2 < name.Length && char.IsUpper(name[i + 1]) && (char.IsUpper(name[i + 2]) || IsWordSeparator(name[i + 2], preserveUnderscores))) firstWordLength++; // grow the first word length when this letter follows by another upper case letter and an end of the string // this happens when the string only has one word, like OS, DNS @@ -77,6 +78,6 @@ public static string ToIdentifierName(this string name, bool useCamelCase = fals } [return: NotNullIfNotNull(nameof(name))] - public static string ToVariableName(this string name) => name.ToIdentifierName(useCamelCase: true); + public static string ToVariableName(this string name, bool preserveUnderscores = false) => name.ToIdentifierName(useCamelCase: true, preserveUnderscores: preserveUnderscores); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputLibrary.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputLibrary.cs index d49942c1e39..01ceed10a25 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputLibrary.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputLibrary.cs @@ -45,6 +45,9 @@ internal InputNamespace Load() private bool? _hasMultiServiceClient; public bool HasMultiServiceClient => _hasMultiServiceClient ??= GetHasMultiServiceClient(); + private bool? _hasXmlModelSerialization; + public bool HasXmlModelSerialization => _hasXmlModelSerialization ??= GetHasXmlModelSerialization(); + private bool GetHasMultipartFormDataOperation() { foreach (var client in InputNamespace.Clients) @@ -73,5 +76,25 @@ private bool GetHasMultiServiceClient() return false; } + + private bool GetHasXmlModelSerialization() + { + foreach (var model in InputNamespace.Models) + { + if (model.Usage.HasFlag(InputModelTypeUsage.Xml)) + { + return true; + } + } + + foreach (var enumType in InputNamespace.Enums) + { + if (enumType.Usage.HasFlag(InputModelTypeUsage.Xml)) + { + return true; + } + } + return false; + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/DateTimeKnownEncoding.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/DateTimeKnownEncoding.cs index 07cd0407cf3..4d8bda45aa6 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/DateTimeKnownEncoding.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/DateTimeKnownEncoding.cs @@ -1,10 +1,70 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +using System; +using System.ComponentModel; + namespace Microsoft.TypeSpec.Generator.Input { - public enum DateTimeKnownEncoding + /// + /// Represents a DateTime encoding format. + /// + public readonly struct DateTimeKnownEncoding : IEquatable { - Rfc3339, Rfc7231, UnixTimestamp + private readonly string _value; + + /// + /// Initializes a new instance of . + /// + /// The string value of the encoding. + /// is null. + public DateTimeKnownEncoding(string value) + { + _value = value ?? throw new ArgumentNullException(nameof(value)); + } + + /// + /// RFC 3339 date-time format (ISO 8601). + /// + public static DateTimeKnownEncoding Rfc3339 { get; } = new DateTimeKnownEncoding("Rfc3339"); + + /// + /// RFC 7231 HTTP date format. + /// + public static DateTimeKnownEncoding Rfc7231 { get; } = new DateTimeKnownEncoding("Rfc7231"); + + /// + /// Unix timestamp (seconds since epoch). + /// + public static DateTimeKnownEncoding UnixTimestamp { get; } = new DateTimeKnownEncoding("UnixTimestamp"); + + /// + /// Determines if two values are the same. + /// + public static bool operator ==(DateTimeKnownEncoding left, DateTimeKnownEncoding right) => left.Equals(right); + + /// + /// Determines if two values are not the same. + /// + public static bool operator !=(DateTimeKnownEncoding left, DateTimeKnownEncoding right) => !left.Equals(right); + + /// + /// Converts a string to a . + /// + public static implicit operator DateTimeKnownEncoding(string value) => new DateTimeKnownEncoding(value); + + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object? obj) => obj is DateTimeKnownEncoding other && Equals(other); + + /// + public bool Equals(DateTimeKnownEncoding other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); + + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; + + /// + public override string ToString() => _value; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/DurationKnownEncoding.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/DurationKnownEncoding.cs index 99927f4ecfe..3d737d22e7f 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/DurationKnownEncoding.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/DurationKnownEncoding.cs @@ -1,10 +1,75 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +using System; +using System.ComponentModel; + namespace Microsoft.TypeSpec.Generator.Input { - public enum DurationKnownEncoding + /// + /// Represents a Duration encoding format. + /// + public readonly struct DurationKnownEncoding : IEquatable { - Iso8601, Seconds, Constant, Milliseconds + private readonly string _value; + + /// + /// Initializes a new instance of . + /// + /// The string value of the encoding. + /// is null. + public DurationKnownEncoding(string value) + { + _value = value ?? throw new ArgumentNullException(nameof(value)); + } + + /// + /// ISO 8601 duration format. + /// + public static DurationKnownEncoding Iso8601 { get; } = new DurationKnownEncoding("Iso8601"); + + /// + /// Duration as seconds. + /// + public static DurationKnownEncoding Seconds { get; } = new DurationKnownEncoding("Seconds"); + + /// + /// Constant duration value. + /// + public static DurationKnownEncoding Constant { get; } = new DurationKnownEncoding("Constant"); + + /// + /// Duration as milliseconds. + /// + public static DurationKnownEncoding Milliseconds { get; } = new DurationKnownEncoding("Milliseconds"); + + /// + /// Determines if two values are the same. + /// + public static bool operator ==(DurationKnownEncoding left, DurationKnownEncoding right) => left.Equals(right); + + /// + /// Determines if two values are not the same. + /// + public static bool operator !=(DurationKnownEncoding left, DurationKnownEncoding right) => !left.Equals(right); + + /// + /// Converts a string to a . + /// + public static implicit operator DurationKnownEncoding(string value) => new DurationKnownEncoding(value); + + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object? obj) => obj is DurationKnownEncoding other && Equals(other); + + /// + public bool Equals(DurationKnownEncoding other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); + + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; + + /// + public override string ToString() => _value; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/InputHeaderParameter.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/InputHeaderParameter.cs index a35c4294714..422ad0deb81 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/InputHeaderParameter.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/InputHeaderParameter.cs @@ -19,16 +19,19 @@ public InputHeaderParameter( InputConstant? defaultValue, InputParameterScope scope, string? arraySerializationDelimiter, - bool isContentType) + bool isContentType, + string? collectionHeaderPrefix = null) : base(name, summary, doc, type, isRequired, isReadOnly, access, serializedName, isApiVersion, defaultValue, scope) { CollectionFormat = collectionFormat; ArraySerializationDelimiter = arraySerializationDelimiter; IsContentType = isContentType; + CollectionHeaderPrefix = collectionHeaderPrefix; } public string? CollectionFormat { get; internal set; } public string? ArraySerializationDelimiter { get; internal set; } public bool IsContentType { get; internal set; } + public string? CollectionHeaderPrefix { get; internal set; } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/InputMethodParameter.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/InputMethodParameter.cs index 538dbef5efc..6a5b9cc5c83 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/InputMethodParameter.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/InputMethodParameter.cs @@ -24,5 +24,7 @@ public InputMethodParameter( } public InputRequestLocation Location { get; internal set; } + + public string? ParamAlias { get; internal set; } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/InputOperation.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/InputOperation.cs index 54f37df38db..6db80119d68 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/InputOperation.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/InputOperation.cs @@ -73,6 +73,11 @@ public InputOperation() : this( { } public string Name { get; internal set; } + + /// + /// Gets the original name of the operation as defined in the TypeSpec before any mutations. + /// + public string? OriginalName { get; internal set; } public string? ResourceName { get; internal set; } public string? Summary { get; internal set; } public string? Doc { get; internal set; } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/InputParameter.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/InputParameter.cs index 1dfd9e14a5c..b6f1a058329 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/InputParameter.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/InputParameter.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. using System; +using System.Collections.Generic; using System.Text.Json; namespace Microsoft.TypeSpec.Generator.Input @@ -23,16 +24,26 @@ protected InputParameter( : base(name, summary, doc, type, isRequired, isReadOnly, access, serializedName, isApiVersion, defaultValue) { Scope = scope; + _originalName = name; } + private string? _originalName; + + /// + /// Gets the original parameter name specified in the spec prior to any mutations. + /// + public string OriginalName => _originalName ?? Name; + public InputParameterScope Scope { get; internal set; } + public IReadOnlyList? MethodParameterSegments { get; internal set; } /// /// Update the instance with given parameters. /// /// The scope of the /// The name of the - public void Update(InputParameterScope? scope = null, string? name = null) + /// The method parameter segments for override scenarios + public void Update(InputParameterScope? scope = null, string? name = null, IReadOnlyList? methodParameterSegments = null) { if (scope.HasValue) { @@ -40,8 +51,13 @@ public void Update(InputParameterScope? scope = null, string? name = null) } if (name != null) { + _originalName ??= Name; Name = name; } + if (methodParameterSegments != null) + { + MethodParameterSegments = methodParameterSegments; + } } public static InputParameterScope ParseScope(InputType type, string name, string? scope) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputBodyParameterConverter.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputBodyParameterConverter.cs index f2eae76bd38..1e9330c069d 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputBodyParameterConverter.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputBodyParameterConverter.cs @@ -62,6 +62,7 @@ internal static InputBodyParameter ReadInputBodyParameter(ref Utf8JsonReader rea IReadOnlyList? contentTypes = null; string? defaultContentType = null; IReadOnlyList? decorators = null; + IReadOnlyList? methodParameterSegments = null; while (reader.TokenType != JsonTokenType.EndObject) { @@ -79,7 +80,8 @@ internal static InputBodyParameter ReadInputBodyParameter(ref Utf8JsonReader rea || reader.TryReadString("scope", ref scope) || reader.TryReadComplexType("contentTypes",options, ref contentTypes) || reader.TryReadComplexType("defaultContentType", options, ref defaultContentType) - || reader.TryReadComplexType("decorators", options, ref decorators); + || reader.TryReadComplexType("decorators", options, ref decorators) + || reader.TryReadComplexType("methodParameterSegments", options, ref methodParameterSegments); if (!isKnownProperty) { @@ -101,6 +103,7 @@ internal static InputBodyParameter ReadInputBodyParameter(ref Utf8JsonReader rea parameter.Scope = InputParameter.ParseScope(type, name, scope); parameter.ContentTypes = contentTypes ?? throw new JsonException($"{nameof(InputBodyParameter)} must have a contentTypes."); parameter.DefaultContentType = defaultContentType ?? throw new JsonException($"{nameof(InputBodyParameter)} must have a defaultContentType."); + parameter.MethodParameterSegments = methodParameterSegments; return parameter; } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputDateTimeTypeConverter.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputDateTimeTypeConverter.cs index 9cec784fcff..60641e7b697 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputDateTimeTypeConverter.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputDateTimeTypeConverter.cs @@ -53,9 +53,7 @@ public static InputDateTimeType CreateDateTimeType(ref Utf8JsonReader reader, st encode = encode ?? throw new JsonException("DateTime type must have encoding"); wireType = wireType ?? throw new JsonException("DateTime type must have wireType"); - var dateTimeType = Enum.TryParse(encode, ignoreCase: true, out var encodeKind) - ? new InputDateTimeType(encodeKind, name, crossLanguageDefinitionId, wireType, baseType) { Decorators = decorators ?? [], External = external } - : throw new JsonException($"Encoding of DateTime type {encode} is unknown."); + var dateTimeType = new InputDateTimeType(new DateTimeKnownEncoding(encode), name, crossLanguageDefinitionId, wireType, baseType) { Decorators = decorators ?? [], External = external }; if (id != null) { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputDurationTypeConverter.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputDurationTypeConverter.cs index 3107ddc9f0c..ee61696e9d2 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputDurationTypeConverter.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputDurationTypeConverter.cs @@ -52,11 +52,14 @@ public static InputDurationType CreateDurationType(ref Utf8JsonReader reader, st name = name ?? throw new JsonException("Duration type must have name"); crossLanguageDefinitionId = crossLanguageDefinitionId ?? throw new JsonException("Duration type must have crossLanguageDefinitionId"); encode = encode ?? throw new JsonException("Duration type must have encoding"); + // translate "duration-constant" into simply "constant". Both strings are supported + if (encode.Equals( "duration-constant", StringComparison.OrdinalIgnoreCase)) + { + encode = "constant"; + } wireType = wireType ?? throw new JsonException("Duration type must have wireType"); - var dateTimeType = DurationKnownEncodingExtensions.TryParse(encode, out var encodeKind) - ? new InputDurationType(encodeKind.Value, name, crossLanguageDefinitionId, wireType, baseType) { Decorators = decorators ?? [], External = external } - : throw new JsonException($"Encoding of Duration type {encode} is unknown."); + var dateTimeType = new InputDurationType(new DurationKnownEncoding(encode), name, crossLanguageDefinitionId, wireType, baseType) { Decorators = decorators ?? [], External = external }; if (id != null) { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputEndpointParameterConverter.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputEndpointParameterConverter.cs index 7fdbf820a88..f77af62a9fa 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputEndpointParameterConverter.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputEndpointParameterConverter.cs @@ -64,6 +64,7 @@ internal static InputEndpointParameter ReadInputEndpointParameter(ref Utf8JsonRe string? serverUrlTemplate = null; bool isEndpoint = false; IReadOnlyList? decorators = null; + IReadOnlyList? methodParameterSegments = null; while (reader.TokenType != JsonTokenType.EndObject) { @@ -82,7 +83,8 @@ internal static InputEndpointParameter ReadInputEndpointParameter(ref Utf8JsonRe || reader.TryReadString("scope", ref scope) || reader.TryReadBoolean("skipUrlEncoding", ref skipUrlEncoding) || reader.TryReadBoolean("isEndpoint", ref isEndpoint) - || reader.TryReadComplexType("decorators", options, ref decorators); + || reader.TryReadComplexType("decorators", options, ref decorators) + || reader.TryReadComplexType("methodParameterSegments", options, ref methodParameterSegments); if (!isKnownProperty) { @@ -103,8 +105,9 @@ internal static InputEndpointParameter ReadInputEndpointParameter(ref Utf8JsonRe parameter.IsApiVersion = isApiVersion; parameter.DefaultValue = defaultValue; parameter.IsEndpoint = isEndpoint; - parameter.Scope = InputParameter.ParseScope(type, name, scope);; + parameter.Scope = InputParameter.ParseScope(type, name, scope); parameter.SkipUrlEncoding = skipUrlEncoding; + parameter.MethodParameterSegments = methodParameterSegments; return parameter; } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputHeaderParameterConverter.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputHeaderParameterConverter.cs index cbd522550e8..63dfdc14ef9 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputHeaderParameterConverter.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputHeaderParameterConverter.cs @@ -46,7 +46,8 @@ internal static InputHeaderParameter ReadInputHeaderParameter(ref Utf8JsonReader defaultValue: null, scope: default, arraySerializationDelimiter: null, - isContentType: false); + isContentType: false, + collectionHeaderPrefix: null); resolver.AddReference(id, parameter); string? name = null; @@ -58,12 +59,14 @@ internal static InputHeaderParameter ReadInputHeaderParameter(ref Utf8JsonReader string? scope = null; string? arraySerializationDelimiter = null; bool isContentType = false; + string? collectionHeaderPrefix = null; InputType? type = null; bool isReadOnly = false; bool isOptional = false; string? access = null; string? collectionFormat = null; IReadOnlyList? decorators = null; + IReadOnlyList? methodParameterSegments = null; while (reader.TokenType != JsonTokenType.EndObject) { @@ -82,7 +85,9 @@ internal static InputHeaderParameter ReadInputHeaderParameter(ref Utf8JsonReader || reader.TryReadString("scope", ref scope) || reader.TryReadString("arraySerializationDelimiter", ref arraySerializationDelimiter) || reader.TryReadBoolean("isContentType", ref isContentType) - || reader.TryReadComplexType("decorators", options, ref decorators); + || reader.TryReadString("collectionHeaderPrefix", ref collectionHeaderPrefix) + || reader.TryReadComplexType("decorators", options, ref decorators) + || reader.TryReadComplexType("methodParameterSegments", options, ref methodParameterSegments); if (!isKnownProperty) { @@ -102,9 +107,11 @@ internal static InputHeaderParameter ReadInputHeaderParameter(ref Utf8JsonReader parameter.SerializedName = serializedName ?? throw new JsonException($"{nameof(InputHeaderParameter)} must have a serializedName."); parameter.IsApiVersion = isApiVersion; parameter.DefaultValue = defaultValue; - parameter.Scope = InputParameter.ParseScope(type, name, scope);; + parameter.Scope = InputParameter.ParseScope(type, name, scope); parameter.ArraySerializationDelimiter = arraySerializationDelimiter; parameter.IsContentType = isContentType; + parameter.CollectionHeaderPrefix = collectionHeaderPrefix; + parameter.MethodParameterSegments = methodParameterSegments; return parameter; } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputMethodParameterConverter.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputMethodParameterConverter.cs index def2b8456b2..3e61c3d629a 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputMethodParameterConverter.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputMethodParameterConverter.cs @@ -62,6 +62,7 @@ internal static InputMethodParameter ReadInputMethodParameter(ref Utf8JsonReader string? defaultContentType = null; IReadOnlyList? decorators = null; string? location = null; + string? paramAlias = null; while (reader.TokenType != JsonTokenType.EndObject) { @@ -80,7 +81,8 @@ internal static InputMethodParameter ReadInputMethodParameter(ref Utf8JsonReader || reader.TryReadComplexType("contentTypes", options, ref contentTypes) || reader.TryReadComplexType("defaultContentType", options, ref defaultContentType) || reader.TryReadString("location", ref location) - || reader.TryReadComplexType("decorators", options, ref decorators); + || reader.TryReadComplexType("decorators", options, ref decorators) + || reader.TryReadString("paramAlias", ref paramAlias); if (!isKnownProperty) { @@ -107,6 +109,7 @@ internal static InputMethodParameter ReadInputMethodParameter(ref Utf8JsonReader } Enum.TryParse(location, ignoreCase: true, out var requestLocation); parameter.Location = requestLocation; + parameter.ParamAlias = paramAlias; return parameter; } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputOperationConverter.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputOperationConverter.cs index 28b6a06c988..32e27880757 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputOperationConverter.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputOperationConverter.cs @@ -87,6 +87,7 @@ public override void Write(Utf8JsonWriter writer, InputOperation value, JsonSeri } operation.Name = name ?? throw new JsonException("InputOperation must have name"); + operation.OriginalName = name; operation.ResourceName = resourceName; operation.Summary = summary; operation.Doc = doc; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputPathParameterConverter.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputPathParameterConverter.cs index 185466eaf56..28b58bb7bd8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputPathParameterConverter.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputPathParameterConverter.cs @@ -66,6 +66,7 @@ internal static InputPathParameter ReadInputPathParameter(ref Utf8JsonReader rea string? serverUrlTemplate = null; bool allowReserved = false; IReadOnlyList? decorators = null; + IReadOnlyList? methodParameterSegments = null; while (reader.TokenType != JsonTokenType.EndObject) { @@ -85,7 +86,8 @@ internal static InputPathParameter ReadInputPathParameter(ref Utf8JsonReader rea || reader.TryReadString("scope", ref scope) || reader.TryReadBoolean("explode", ref explode) || reader.TryReadBoolean("skipUrlEncoding", ref skipUrlEncoding) - || reader.TryReadComplexType("decorators", options, ref decorators); + || reader.TryReadComplexType("decorators", options, ref decorators) + || reader.TryReadComplexType("methodParameterSegments", options, ref methodParameterSegments); if (!isKnownProperty) { @@ -106,9 +108,10 @@ internal static InputPathParameter ReadInputPathParameter(ref Utf8JsonReader rea parameter.SerializedName = serializedName ?? throw new JsonException($"{nameof(InputPathParameter)} must have a serializedName."); parameter.IsApiVersion = isApiVersion; parameter.DefaultValue = defaultValue; - parameter.Scope = InputParameter.ParseScope(type, name, scope);; + parameter.Scope = InputParameter.ParseScope(type, name, scope); parameter.Explode = explode; parameter.SkipUrlEncoding = skipUrlEncoding; + parameter.MethodParameterSegments = methodParameterSegments; return parameter; } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputQueryParameterConverter.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputQueryParameterConverter.cs index 066e9469e6c..a05f70408f5 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputQueryParameterConverter.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputQueryParameterConverter.cs @@ -64,6 +64,7 @@ internal static InputQueryParameter ReadInputQueryParameter(ref Utf8JsonReader r string? collectionFormat = null; bool explode = false; IReadOnlyList? decorators = null; + IReadOnlyList? methodParameterSegments = null; while (reader.TokenType != JsonTokenType.EndObject) { @@ -82,7 +83,8 @@ internal static InputQueryParameter ReadInputQueryParameter(ref Utf8JsonReader r || reader.TryReadString("scope", ref scope) || reader.TryReadString("arraySerializationDelimiter", ref arraySerializationDelimiter) || reader.TryReadBoolean("explode", ref explode) - || reader.TryReadComplexType("decorators", options, ref decorators); + || reader.TryReadComplexType("decorators", options, ref decorators) + || reader.TryReadComplexType("methodParameterSegments", options, ref methodParameterSegments); if (!isKnownProperty) { @@ -103,8 +105,9 @@ internal static InputQueryParameter ReadInputQueryParameter(ref Utf8JsonReader r parameter.SerializedName = serializedName ?? throw new JsonException($"{nameof(InputQueryParameter)} must have a serializedName."); parameter.IsApiVersion = isApiVersion; parameter.DefaultValue = defaultValue; - parameter.Scope = InputParameter.ParseScope(type, name, scope);; + parameter.Scope = InputParameter.ParseScope(type, name, scope); parameter.ArraySerializationDelimiter = arraySerializationDelimiter; + parameter.MethodParameterSegments = methodParameterSegments; return parameter; } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/Utf8JsonReaderExtensions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/Utf8JsonReaderExtensions.cs index f02980b787d..00124c64137 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/Utf8JsonReaderExtensions.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/Utf8JsonReaderExtensions.cs @@ -146,6 +146,43 @@ public static bool TryReadComplexType(this ref Utf8JsonReader reader, string return true; } + public static bool TryReadComplexType(this ref Utf8JsonReader reader, string propertyName, JsonSerializerOptions options, ref IReadOnlyDictionary? value) + { + if (reader.TokenType != JsonTokenType.PropertyName) + { + throw new JsonException(); + } + + if (reader.GetString() != propertyName) + { + return false; + } + + reader.Read(); + if (reader.TokenType != JsonTokenType.StartObject) + { + throw new JsonException(); + } + reader.Read(); + string? id = null; + var result = new Dictionary(); + while (reader.TokenType != JsonTokenType.EndObject) + { + // Skip $id metadata (reference tracking), just like TryReadReferenceId does + if (reader.TryReadReferenceId(ref id)) + { + continue; + } + var key = reader.GetString() ?? throw new JsonException("Dictionary key cannot be null"); + reader.Read(); + var item = reader.ReadWithConverter(options); + result[key] = item ?? throw new JsonException(); + } + reader.Read(); + value = result; + return true; + } + public static T? ReadWithConverter(this ref Utf8JsonReader reader, JsonSerializerOptions options) { var converter = (JsonConverter)options.GetConverter(typeof(T)); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/DurationKnownEncodingTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/DurationKnownEncodingTests.cs index 0a27878d6f4..00ab431bf00 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/DurationKnownEncodingTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/DurationKnownEncodingTests.cs @@ -1,30 +1,41 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using Microsoft.TypeSpec.Generator.Input.Extensions; using NUnit.Framework; namespace Microsoft.TypeSpec.Generator.Input.Tests { public class DurationKnownEncodingTests { - [TestCase("duration-constant", DurationKnownEncoding.Constant)] - [TestCase("iso8601", DurationKnownEncoding.Iso8601)] - [TestCase("seconds", DurationKnownEncoding.Seconds)] - [TestCase("milliseconds", DurationKnownEncoding.Milliseconds)] - public void TryParseEachEncoding(string encoding, DurationKnownEncoding expectedEncoding) + [TestCase("duration-constant")] + [TestCase("Constant")] + [TestCase("iso8601")] + [TestCase("Iso8601")] + [TestCase("seconds")] + [TestCase("Seconds")] + [TestCase("milliseconds")] + [TestCase("Milliseconds")] + public void CanCreateFromString(string encoding) { - var result = DurationKnownEncodingExtensions.TryParse(encoding, out var parsedEncoding); - Assert.IsTrue(result); - Assert.AreEqual(expectedEncoding, parsedEncoding); + var parsedEncoding = new DurationKnownEncoding(encoding); + Assert.IsNotNull(parsedEncoding); + Assert.AreEqual(encoding, parsedEncoding.ToString()); } [Test] - public void TryParseInvalidEncoding() + public void KnownEncodingsAreEqual() { - var result = DurationKnownEncodingExtensions.TryParse("invalid-encoding", out var parsedEncoding); - Assert.IsFalse(result); - Assert.IsNull(parsedEncoding); + Assert.AreEqual(DurationKnownEncoding.Iso8601, new DurationKnownEncoding("Iso8601")); + Assert.AreEqual(DurationKnownEncoding.Seconds, new DurationKnownEncoding("Seconds")); + Assert.AreEqual(DurationKnownEncoding.Constant, new DurationKnownEncoding("Constant")); + Assert.AreEqual(DurationKnownEncoding.Milliseconds, new DurationKnownEncoding("Milliseconds")); + } + + [Test] + public void CustomEncodingWorks() + { + var customEncoding = new DurationKnownEncoding("custom-format"); + Assert.AreEqual("custom-format", customEncoding.ToString()); } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/InputParameterTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/InputParameterTests.cs new file mode 100644 index 00000000000..3ffef9e25db --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/InputParameterTests.cs @@ -0,0 +1,124 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using Microsoft.TypeSpec.Generator.Tests.Common; +using NUnit.Framework; + +namespace Microsoft.TypeSpec.Generator.Input.Tests +{ + public class InputParameterTests + { + [Test] + public void OriginalNameIsSetFromConstructor() + { + var parameter = InputFactory.QueryParameter("top", InputPrimitiveType.Int32); + + Assert.AreEqual("top", parameter.OriginalName); + } + + [Test] + public void OriginalNameIsPreservedAfterUpdate() + { + var parameter = InputFactory.QueryParameter("top", InputPrimitiveType.Int32); + parameter.Update(name: "maxCount"); + + Assert.AreEqual("maxCount", parameter.Name); + Assert.AreEqual("top", parameter.OriginalName); + } + + [Test] + public void OriginalNameIsPreservedAfterMultipleUpdates() + { + var parameter = InputFactory.QueryParameter("top", InputPrimitiveType.Int32); + parameter.Update(name: "maxCount"); + parameter.Update(name: "anotherName"); + + Assert.AreEqual("anotherName", parameter.Name); + Assert.AreEqual("top", parameter.OriginalName); + } + + [Test] + public void OriginalNameFallsBackToNameWhenConstructedWithNull() + { + // This simulates the deserialization pattern where converters pass null! to the + // constructor and then set Name via the internal setter afterward. + var parameter = new InputQueryParameter( + name: null!, + summary: null, + doc: null, + type: InputPrimitiveType.Int32, + isRequired: false, + isReadOnly: false, + access: null, + serializedName: "top", + collectionFormat: null, + explode: false, + isApiVersion: false, + defaultValue: null, + scope: InputParameterScope.Method, + arraySerializationDelimiter: null); + + // Simulate what the JSON converter does: set Name after construction + parameter.Name = "top"; + + Assert.AreEqual("top", parameter.OriginalName); + } + + [Test] + public void OriginalNameCapturedBeforeFirstMutationForDeserializedParameter() + { + // Simulates deserialization followed by a rename mutation + var parameter = new InputQueryParameter( + name: null!, + summary: null, + doc: null, + type: InputPrimitiveType.Int32, + isRequired: false, + isReadOnly: false, + access: null, + serializedName: "top", + collectionFormat: null, + explode: false, + isApiVersion: false, + defaultValue: null, + scope: InputParameterScope.Method, + arraySerializationDelimiter: null); + + // Simulate what the JSON converter does: set Name after construction + parameter.Name = "top"; + + // Simulate the rename that happens in GetMethodParameters + parameter.Update(name: "maxCount"); + + Assert.AreEqual("maxCount", parameter.Name); + Assert.AreEqual("top", parameter.OriginalName); + } + + [Test] + public void OriginalNameMatchesNameWhenNoUpdateOccurs() + { + var parameter = InputFactory.QueryParameter("filter", InputPrimitiveType.String); + + Assert.AreEqual("filter", parameter.Name); + Assert.AreEqual("filter", parameter.OriginalName); + } + + [Test] + public void ParamAliasIsSetFromFactory() + { + var parameter = InputFactory.MethodParameter("blobName", InputPrimitiveType.String, paramAlias: "name"); + + Assert.AreEqual("blobName", parameter.Name); + Assert.AreEqual("name", parameter.ParamAlias); + } + + [Test] + public void ParamAliasIsNullByDefault() + { + var parameter = InputFactory.MethodParameter("blobName", InputPrimitiveType.String); + + Assert.AreEqual("blobName", parameter.Name); + Assert.IsNull(parameter.ParamAlias); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/StringExtensionsTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/StringExtensionsTests.cs new file mode 100644 index 00000000000..f6d04805531 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/StringExtensionsTests.cs @@ -0,0 +1,51 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using Microsoft.TypeSpec.Generator.Input.Extensions; +using NUnit.Framework; + +namespace Microsoft.TypeSpec.Generator.Input.Tests +{ + public class StringExtensionsTests + { + // Existing behavior without preserveUnderscores (default) + [TestCase("Tls_1_0", false, "Tls10")] + [TestCase("hello_world", false, "HelloWorld")] + [TestCase("_leading", false, "Leading")] + [TestCase("trailing_", false, "Trailing")] + [TestCase("UPPER_CASE", false, "UPPERCASE")] + [TestCase("simple", false, "Simple")] + [TestCase("", false, "")] + [TestCase(null, false, null)] + // New behavior with preserveUnderscores = true + [TestCase("Tls_1_0", true, "Tls_1_0")] + [TestCase("hello_world", true, "Hello_world")] + [TestCase("_leading", true, "_leading")] + [TestCase("trailing_", true, "Trailing_")] + [TestCase("UPPER_CASE", true, "UPPER_CASE")] + [TestCase("simple", true, "Simple")] + [TestCase("", true, "")] + [TestCase(null, true, null)] + [TestCase("TLS_1_0", true, "TLS_1_0")] + [TestCase("foo__bar", true, "Foo__bar")] + public void TestToIdentifierNamePreserveUnderscores(string name, bool preserveUnderscores, string expected) + { + var result = name.ToIdentifierName(preserveUnderscores: preserveUnderscores); + Assert.AreEqual(expected, result); + } + + // Existing behavior of ToVariableName without preserveUnderscores + [TestCase("HelloWorld", false, "helloWorld")] + [TestCase("Tls_1_0", false, "tls10")] + [TestCase("UPPER_CASE", false, "upperCASE")] + // New behavior with preserveUnderscores = true + [TestCase("HelloWorld", true, "helloWorld")] + [TestCase("Tls_1_0", true, "tls_1_0")] + [TestCase("UPPER_CASE", true, "uppeR_CASE")] + public void TestToVariableNamePreserveUnderscores(string name, bool preserveUnderscores, string expected) + { + var result = name.ToVariableName(preserveUnderscores: preserveUnderscores); + Assert.AreEqual(expected, result); + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TestData/TypeSpecInputConverterTests/LoadsInputDurationTypeTranslatesDurationConstantEncoding/tspCodeModel.json b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TestData/TypeSpecInputConverterTests/LoadsInputDurationTypeTranslatesDurationConstantEncoding/tspCodeModel.json new file mode 100644 index 00000000000..5f07f433c4f --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TestData/TypeSpecInputConverterTests/LoadsInputDurationTypeTranslatesDurationConstantEncoding/tspCodeModel.json @@ -0,0 +1,14 @@ +{ + "name": "inputDuration", + "$id": "1", + "kind": "duration", + "encode": "duration-constant", + "crossLanguageDefinitionId": "TypeSpec.duration", + "wireType": { + "$id": "2", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TestData/TypeSpecInputConverterTests/LoadsInputDurationTypeWithConstantEncoding/tspCodeModel.json b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TestData/TypeSpecInputConverterTests/LoadsInputDurationTypeWithConstantEncoding/tspCodeModel.json new file mode 100644 index 00000000000..fc2dcf171f8 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TestData/TypeSpecInputConverterTests/LoadsInputDurationTypeWithConstantEncoding/tspCodeModel.json @@ -0,0 +1,14 @@ +{ + "name": "inputDuration", + "$id": "1", + "kind": "duration", + "encode": "constant", + "crossLanguageDefinitionId": "TypeSpec.duration", + "wireType": { + "$id": "2", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TestData/TypeSpecInputExampleConverterTests/LoadOperationExamples/tspCodeModel.json b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TestData/TypeSpecInputExampleConverterTests/LoadOperationExamples/tspCodeModel.json index 8de71bb388c..034dc234913 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TestData/TypeSpecInputExampleConverterTests/LoadOperationExamples/tspCodeModel.json +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TestData/TypeSpecInputExampleConverterTests/LoadOperationExamples/tspCodeModel.json @@ -6080,6 +6080,14 @@ "$ref": "203" }, "value": { + "$filter": { + "$id": "2000", + "kind": "string", + "type": { + "$ref": "209" + }, + "value": "status eq 'Active'" + }, "description": { "$id": "471", "kind": "string", diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TypeSpecInputConverterTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TypeSpecInputConverterTests.cs index 4acc926d637..e86f71df1ee 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TypeSpecInputConverterTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TypeSpecInputConverterTests.cs @@ -130,6 +130,56 @@ public void LoadsInputDurationType() Assert.IsNotNull(inputType); + var inputDuration = inputType as InputDurationType; + Assert.IsNotNull(inputDuration); + Assert.AreEqual("constant", inputDuration!.Encode.ToString()); + } + + [Test] + public void LoadsInputDurationTypeTranslatesDurationConstantEncoding() + { + var directory = Helpers.GetAssetFileOrDirectoryPath(false); + var content = File.ReadAllText(Path.Combine(directory, "tspCodeModel.json")); + var referenceHandler = new TypeSpecReferenceHandler(); + var options = new JsonSerializerOptions + { + AllowTrailingCommas = true, + Converters = + { + new JsonStringEnumConverter(JsonNamingPolicy.CamelCase), + new InputTypeConverter(referenceHandler), + new InputPrimitiveTypeConverter(referenceHandler), + }, + }; + var inputType = JsonSerializer.Deserialize(content, options); + + Assert.IsNotNull(inputType); + + var inputDuration = inputType as InputDurationType; + Assert.IsNotNull(inputDuration); + Assert.AreEqual(DurationKnownEncoding.Constant, inputDuration!.Encode); + } + + [Test] + public void LoadsInputDurationTypeWithConstantEncoding() + { + var directory = Helpers.GetAssetFileOrDirectoryPath(false); + var content = File.ReadAllText(Path.Combine(directory, "tspCodeModel.json")); + var referenceHandler = new TypeSpecReferenceHandler(); + var options = new JsonSerializerOptions + { + AllowTrailingCommas = true, + Converters = + { + new JsonStringEnumConverter(JsonNamingPolicy.CamelCase), + new InputTypeConverter(referenceHandler), + new InputPrimitiveTypeConverter(referenceHandler), + }, + }; + var inputType = JsonSerializer.Deserialize(content, options); + + Assert.IsNotNull(inputType); + var inputDuration = inputType as InputDurationType; Assert.IsNotNull(inputDuration); Assert.AreEqual(DurationKnownEncoding.Constant, inputDuration!.Encode); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TypeSpecInputExampleConverterTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TypeSpecInputExampleConverterTests.cs index b7892554d22..d12d272cfcd 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TypeSpecInputExampleConverterTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TypeSpecInputExampleConverterTests.cs @@ -103,6 +103,7 @@ static void AssertStorageTaskClientExample(InputClient client) { "location", "westus" }, { "properties.description", "My Storage task" }, { "properties.enabled", true }, + { "properties.$filter", "status eq 'Active'" }, { "properties.action.if.condition", "[[equals(AccessTier, 'Cool')]]" }, { "properties.action.if.operations[0].name", "SetBlobTier" }, { "properties.action.if.operations[0].onFailure", "break" }, diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/CSharpGen.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/CSharpGen.cs index 82798228e99..504f9c31e15 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/CSharpGen.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/CSharpGen.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.CodeAnalysis; +using Microsoft.TypeSpec.Generator.Providers; using Microsoft.TypeSpec.Generator.SourceInput; using Microsoft.TypeSpec.Generator.Utilities; @@ -31,6 +32,10 @@ public async Task ExecuteAsync() var outputPath = CodeModelGenerator.Instance.Configuration.OutputDirectory; var generatedSourceOutputPath = CodeModelGenerator.Instance.Configuration.ProjectGeneratedDirectory; + // Resolve PackageReference items from the .csproj so custom code referencing + // external NuGet types (e.g., Azure.Storage.Common) compiles correctly. + await GeneratedCodeWorkspace.AddPackageReferencesFromProject(); + GeneratedCodeWorkspace customCodeWorkspace = await GeneratedCodeWorkspace.Create(isCustomCodeProject: true); // The generated attributes need to be added into the workspace before loading the custom code. Otherwise, // Roslyn doesn't load the attributes completely and we are unable to get the attribute arguments. @@ -67,16 +72,7 @@ await customCodeWorkspace.GetCompilationAsync(), visitor.VisitLibrary(output); } - foreach (var typeProvider in output.TypeProviders) - { - // Update the type with the potentially modified members, filtering out customized members - // after the visitors have been applied so that the filtering is done against the final version. - typeProvider.Update( - typeProvider.FilterCustomizedMethods(typeProvider.Methods), - typeProvider.FilterCustomizedConstructors(typeProvider.Constructors), - typeProvider.FilterCustomizedProperties(typeProvider.Properties), - typeProvider.FilterCustomizedFields(typeProvider.Fields)); - } + FilterAllCustomizedMembers(output); LoggingHelpers.LogElapsedTime("All visitors have been applied"); @@ -120,7 +116,10 @@ await customCodeWorkspace.GetCompilationAsync(), await File.WriteAllTextAsync(filename, file.Text); } - // Write project scaffolding files + // Write additional output files (e.g. configuration schemas, .targets files) + await CodeModelGenerator.Instance.WriteAdditionalFiles(outputPath); + + // Write project scaffolding files (after additional files so schema existence can be checked) if (CodeModelGenerator.Instance.IsNewProject) { await CodeModelGenerator.Instance.TypeFactory.CreateNewProjectScaffolding().Execute(); @@ -129,6 +128,29 @@ await customCodeWorkspace.GetCompilationAsync(), LoggingHelpers.LogElapsedTime("All files have been written to disk"); } + internal static void FilterAllCustomizedMembers(OutputLibrary output) + { + foreach (var typeProvider in output.TypeProviders) + { + // Update the type with the potentially modified members, filtering out customized members + // after the visitors have been applied so that the filtering is done against the final version. + FilterCustomizedMembers(typeProvider); + foreach (var serializationProvider in typeProvider.SerializationProviders) + { + FilterCustomizedMembers(serializationProvider); + } + } + } + + private static void FilterCustomizedMembers(TypeProvider typeProvider) + { + typeProvider.Update( + typeProvider.FilterCustomizedMethods(typeProvider.Methods), + typeProvider.FilterCustomizedConstructors(typeProvider.Constructors), + typeProvider.FilterCustomizedProperties(typeProvider.Properties), + typeProvider.FilterCustomizedFields(typeProvider.Fields)); + } + /// /// Clears the output directory specified by . If is not null, /// the specified files in the output directory will not be deleted. diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/CodeModelGenerator.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/CodeModelGenerator.cs index 4a41327828e..df1ac4a27de 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/CodeModelGenerator.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/CodeModelGenerator.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.ComponentModel.Composition; using System.Diagnostics; +using System.Threading.Tasks; using Microsoft.CodeAnalysis; using Microsoft.TypeSpec.Generator.EmitterRpc; using Microsoft.TypeSpec.Generator.Input; @@ -108,6 +109,12 @@ internal set protected internal virtual void Configure() { + if (string.IsNullOrEmpty(Configuration.PackageName)) + { + Configuration.PackageName = TypeFactory.PrimaryNamespace; + Emitter.Info($"'package-name' was not specified. Defaulting to namespace '{Configuration.PackageName}'."); + } + foreach (var type in CustomCodeAttributeProviders) { AddTypeToKeep(type); @@ -119,6 +126,25 @@ public virtual void AddVisitor(LibraryVisitor visitor) _visitors.Add(visitor); } + /// + /// Removes all visitors of the specified type from the list of visitors. + /// + /// The type of visitor to remove. + public virtual void RemoveVisitor() where T : LibraryVisitor + { + _visitors.RemoveAll(v => v.GetType() == typeof(T)); + } + + /// + /// Removes all visitors whose type name matches the specified name from the list of visitors. + /// This overload is useful when the visitor type is not publicly accessible. + /// + /// The name of the visitor type to remove. + public virtual void RemoveVisitor(string visitorTypeName) + { + _visitors.RemoveAll(v => v.GetType().Name == visitorTypeName); + } + public virtual void AddRewriter(LibraryRewriter rewriter) { _rewriters.Add(rewriter); @@ -163,5 +189,12 @@ public void AddTypeToKeep(string typeName, bool isRoot = true) /// Whether to treat the type as a root type. Any dependencies of root types will /// not have their accessibility changed regardless of the 'unreferenced-types-handling' value. public void AddTypeToKeep(TypeProvider type, bool isRoot = true) => AddTypeToKeep(type.Type.FullyQualifiedName, isRoot); + + /// + /// Writes additional output files (e.g. configuration schemas) after the main code generation is complete. + /// Override this method to generate non-C# output files. + /// + /// The root output directory. + public virtual Task WriteAdditionalFiles(string outputPath) => Task.CompletedTask; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Configuration.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Configuration.cs index 98169440b6f..d7cb00bf8b0 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Configuration.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Configuration.cs @@ -32,17 +32,19 @@ protected Configuration() public Configuration( string outputPath, Dictionary additionalConfigurationOptions, - string packageName, + string? packageName, bool disableXmlDocs, UnreferencedTypesHandlingOption unreferencedTypesHandling, - LicenseInfo? licenseInfo) + LicenseInfo? licenseInfo, + IReadOnlyList? pluginPaths = null) { OutputDirectory = outputPath; AdditionalConfigurationOptions = additionalConfigurationOptions; - PackageName = packageName; + PackageName = packageName!; DisableXmlDocs = disableXmlDocs; UnreferencedTypesHandling = unreferencedTypesHandling; LicenseInfo = licenseInfo; + PluginPaths = pluginPaths; } /// @@ -53,6 +55,7 @@ private static class Options public const string PackageName = "package-name"; public const string DisableXmlDocs = "disable-xml-docs"; public const string UnreferencedTypesHandling = "unreferenced-types-handling"; + public const string Plugins = "plugins"; } /// @@ -84,7 +87,14 @@ private static class Options private string? _testGeneratedDirectory; internal string TestGeneratedDirectory => _testGeneratedDirectory ??= Path.Combine(TestProjectDirectory, GeneratedFolderName); - public string PackageName { get; } + public string PackageName { get; internal set; } + + /// + /// Gets the paths to plugin assemblies (DLLs) or directories containing plugin assemblies. + /// When specified, the generator loads plugins from these paths in addition to any + /// plugins discovered via node_modules. + /// + public IReadOnlyList? PluginPaths { get; } /// /// True if a sample project should be generated. @@ -120,10 +130,11 @@ internal static Configuration Load(string outputPath, string? json = null) return new Configuration( Path.GetFullPath(outputPath), ParseAdditionalConfigOptions(root), - ReadRequiredStringOption(root, Options.PackageName), + ReadStringOption(root, Options.PackageName), ReadOption(root, Options.DisableXmlDocs), ReadEnumOption(root, Options.UnreferencedTypesHandling), - ReadLicenseInfo(root)); + ReadLicenseInfo(root), + ReadStringArrayOption(root, Options.Plugins)); } private static LicenseInfo? ReadLicenseInfo(JsonElement root) @@ -164,6 +175,7 @@ internal static Configuration Load(string outputPath, string? json = null) Options.PackageName, Options.DisableXmlDocs, Options.UnreferencedTypesHandling, + Options.Plugins, }; private static bool ReadOption(JsonElement root, string option) @@ -178,11 +190,6 @@ private static bool ReadOption(JsonElement root, string option) } } - private static string ReadRequiredStringOption(JsonElement root, string option) - { - return ReadStringOption(root, option) ?? throw new InvalidOperationException($"Unable to parse required option {option} from configuration."); - } - private static string? ReadStringOption(JsonElement root, string option) { if (root.TryGetProperty(option, out JsonElement value)) @@ -191,6 +198,25 @@ private static string ReadRequiredStringOption(JsonElement root, string option) return null; } + private static IReadOnlyList? ReadStringArrayOption(JsonElement root, string option) + { + if (root.TryGetProperty(option, out JsonElement value) && value.ValueKind == JsonValueKind.Array) + { + var list = new List(); + foreach (var item in value.EnumerateArray()) + { + var str = item.GetString(); + if (!string.IsNullOrEmpty(str)) + { + list.Add(str); + } + } + return list.Count > 0 ? list : null; + } + + return null; + } + /// /// Returns the default value for the given option. /// diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Expressions/MemberExpression.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Expressions/MemberExpression.cs index d6a9be31011..ed582f3620c 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Expressions/MemberExpression.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Expressions/MemberExpression.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +using Microsoft.TypeSpec.Generator.Primitives; using Microsoft.TypeSpec.Generator.Providers; using Microsoft.TypeSpec.Generator.Statements; @@ -10,6 +11,7 @@ public sealed record MemberExpression(ValueExpression? Inner, string MemberName) { public ValueExpression? Inner { get; internal set; } = Inner; public string MemberName { get; private set; } = MemberName; + internal CodeWriterDeclaration? Declaration { get; set; } internal override void Write(CodeWriter writer) { if (Inner is not null) @@ -17,9 +19,17 @@ internal override void Write(CodeWriter writer) Inner.Write(writer); writer.AppendRaw("."); } - // workaround to avoid Roslyn reducing properties named Object to object - // Should come up with a better approach - https://github.com/microsoft/typespec/issues/4724 - writer.AppendRaw(MemberName == "Object" && Inner == null ? $"this.{MemberName}" : MemberName); + + if (Declaration is not null) + { + writer.Append(Declaration, referenceOnly: true); + } + else + { + // workaround to avoid Roslyn reducing properties named Object to object + // Should come up with a better approach - https://github.com/microsoft/typespec/issues/4724 + writer.AppendRaw(MemberName == "Object" && Inner == null ? $"this.{MemberName}" : MemberName); + } } internal override ValueExpression? Accept(LibraryVisitor visitor, MethodProvider method) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Expressions/ValueExpression.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Expressions/ValueExpression.cs index 35de326bf4d..0e37d14cd15 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Expressions/ValueExpression.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Expressions/ValueExpression.cs @@ -126,6 +126,8 @@ public InvokeMethodExpression Invoke(string methodName, IReadOnlyList Is(ValueExpression other) => new BinaryOperatorExpression("is", this, other).As(); + public ScopedApi IsNot(ValueExpression other) => new BinaryOperatorExpression("is not", this, other).As(); + public UnaryOperatorExpression Increment() => new UnaryOperatorExpression("++", this, true); public ValueExpression AndExpr(ValueExpression other) => new BinaryOperatorExpression("and", this, other); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/PostProcessing/GeneratedCodeWorkspace.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/PostProcessing/GeneratedCodeWorkspace.cs index 6a389540e83..431b5443059 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/PostProcessing/GeneratedCodeWorkspace.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/PostProcessing/GeneratedCodeWorkspace.cs @@ -10,6 +10,7 @@ using System.Threading.Tasks; using Microsoft.Build.Construction; using Microsoft.CodeAnalysis; +using MSBuildProjectCollection = Microsoft.Build.Evaluation.ProjectCollection; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Formatting; using Microsoft.CodeAnalysis.Simplification; @@ -17,6 +18,8 @@ using Microsoft.TypeSpec.Generator.Providers; using Microsoft.TypeSpec.Generator.Utilities; using NuGet.Configuration; +using NuGet.Protocol; +using NuGet.Protocol.Core.Types; namespace Microsoft.TypeSpec.Generator { @@ -280,6 +283,147 @@ public async Task PostProcessAsync() } } + /// + /// Resolves PackageReference items from the project's .csproj file and adds their assemblies + /// as metadata references so that custom code referencing external NuGet types compiles correctly. + /// + internal static async Task AddPackageReferencesFromProject() + { + var packageName = CodeModelGenerator.Instance.Configuration.PackageName; + string projectFilePath = Path.GetFullPath( + Path.Combine(CodeModelGenerator.Instance.Configuration.ProjectDirectory, $"{packageName}.csproj")); + + if (!File.Exists(projectFilePath)) + { + return; + } + + var projectRoot = ProjectRootElement.Open(projectFilePath, new MSBuildProjectCollection()); + + var nugetSettings = Settings.LoadDefaultSettings(projectFilePath); + var globalPackagesFolder = SettingsUtility.GetGlobalPackagesFolder(nugetSettings); + + // Build a set of assembly names already registered so we can skip them + var existingRefs = new HashSet( + CodeModelGenerator.Instance.AdditionalMetadataReferences + .Where(r => r.Display is not null) + .Select(r => Path.GetFileNameWithoutExtension(r.Display!)) + .Where(n => !string.IsNullOrEmpty(n)), + StringComparer.OrdinalIgnoreCase); + + foreach (var item in projectRoot.Items.Where(i => i.ItemType == "PackageReference")) + { + var refPackageName = item.Include; + + if (string.IsNullOrEmpty(refPackageName)) + { + continue; + } + + // Skip packages already added as metadata references (e.g., by a plugin) + if (existingRefs.Contains(refPackageName)) + { + continue; + } + + // Search the NuGet global packages folder for any cached version of this package. + string? resolvedAssemblyPath = FindPackageAssembly(globalPackagesFolder, refPackageName); + + // If not found in cache, download the latest version from NuGet feeds + if (resolvedAssemblyPath == null) + { + try + { + var latestVersion = await ResolveLatestPackageVersion(refPackageName, nugetSettings); + if (latestVersion != null) + { + var downloader = new NugetPackageDownloader(refPackageName, latestVersion, null, nugetSettings); + var downloadedPath = await downloader.DownloadAndInstallPackage(); + var downloadedAssembly = Path.Combine(downloadedPath, $"{refPackageName}.dll"); + if (File.Exists(downloadedAssembly)) + { + resolvedAssemblyPath = downloadedAssembly; + } + } + } + catch (Exception ex) + { + CodeModelGenerator.Instance.Emitter.Debug( + $"Could not download package {refPackageName}: {ex.Message}"); + } + } + + if (resolvedAssemblyPath != null) + { + CodeModelGenerator.Instance.AddMetadataReference( + MetadataReference.CreateFromFile(resolvedAssemblyPath)); + CodeModelGenerator.Instance.Emitter.Debug( + $"Added metadata reference: {refPackageName} from {resolvedAssemblyPath}"); + } + } + } + + /// + /// Searches the NuGet global packages folder for a package assembly across all cached versions. + /// Returns the first matching assembly found, preferring newer versions. + /// + private static string? FindPackageAssembly(string globalPackagesFolder, string packageName) + { + var packageDir = Path.Combine(globalPackagesFolder, packageName.ToLowerInvariant()); + + if (!Directory.Exists(packageDir)) + { + return null; + } + + foreach (var versionDir in Directory.GetDirectories(packageDir).OrderDescending()) + { + foreach (var tfm in NugetPackageDownloader.PreferredDotNetFrameworkVersions) + { + var assemblyPath = Path.Combine(versionDir, "lib", tfm, $"{packageName}.dll"); + if (File.Exists(assemblyPath)) + { + return assemblyPath; + } + } + } + + return null; + } + + /// + /// Queries configured NuGet feeds to resolve the latest stable version of a package. + /// + private static async Task ResolveLatestPackageVersion(string packageName, ISettings nugetSettings) + { + var sources = SettingsUtility.GetEnabledSources(nugetSettings); + using var cacheContext = new SourceCacheContext(); + foreach (var source in sources) + { + try + { + var repository = Repository.Factory.GetCoreV3(source.Source); + var resource = await repository.GetResourceAsync(); + var versions = await resource.GetAllVersionsAsync( + packageName, cacheContext, NuGet.Common.NullLogger.Instance, CancellationToken.None); + var latest = versions? + .Where(v => !v.IsPrerelease) + .OrderByDescending(v => v) + .FirstOrDefault(); + if (latest != null) + { + return latest.ToString(); + } + } + catch + { + // Skip sources that fail (auth, network, etc.) + } + } + + return null; + } + internal static async Task LoadBaselineContract() { var packageName = CodeModelGenerator.Instance.TypeFactory.PrimaryNamespace; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/MethodSignature.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/MethodSignature.cs index 50004231b65..03b40ae1924 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/MethodSignature.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/MethodSignature.cs @@ -38,52 +38,6 @@ public sealed class MethodSignature(string Name, FormattableString? Description, public FormattableString GetCRef() => $"{Name}({Parameters.GetTypesFormattable()})"; internal string FullMethodName => ExplicitInterface != null ? $"{ExplicitInterface}.{Name}" : Name; - public static readonly IEqualityComparer MethodSignatureComparer = new MethodSignatureEqualityComparer(); - - private class MethodSignatureEqualityComparer : IEqualityComparer - { - public bool Equals(MethodSignature? x, MethodSignature? y) - { - if (ReferenceEquals(x, y)) - { - return true; - } - - if (x is null || y is null) - { - return false; - } - - if (x.Parameters.Count != y.Parameters.Count || x.FullMethodName != y.FullMethodName) - { - return false; - } - - if (x.ReturnType == null && y.ReturnType != null) - { - return false; - } - - if (x.ReturnType != null && y.ReturnType != null && !x.ReturnType.AreNamesEqual(y.ReturnType)) - { - return false; - } - - for (int i = 0; i < x.Parameters.Count; i++) - { - if (!x.Parameters[i].Type.AreNamesEqual(y.Parameters[i].Type)) - { - return false; - } - } - - return true; - } - - public int GetHashCode([DisallowNull] MethodSignature obj) - { - return HashCode.Combine(obj.Name, obj.ReturnType); - } - } + public static IEqualityComparer MethodSignatureComparer => SignatureComparer; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/MethodSignatureBase.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/MethodSignatureBase.cs index 040d6486517..624e23ba8ea 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/MethodSignatureBase.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/MethodSignatureBase.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using Microsoft.TypeSpec.Generator.Providers; using Microsoft.TypeSpec.Generator.Statements; @@ -85,5 +86,87 @@ public void Update(string? name = default, FormattableString? description = defa ReturnType = returnType; } } + + public static readonly IEqualityComparer SignatureComparer = new MethodSignatureBaseEqualityComparer(); + + private class MethodSignatureBaseEqualityComparer : IEqualityComparer + { + public bool Equals(MethodSignatureBase? x, MethodSignatureBase? y) + { + if (ReferenceEquals(x, y)) + { + return true; + } + + if (x is null || y is null) + { + return false; + } + + if (x.Parameters.Count != y.Parameters.Count || GetFullMethodName(x) != GetFullMethodName(y)) + { + return false; + } + + // For operators, we need to also check the return type and operator type (explicit vs implicit) + // since operators can have the same "name" (the target type) but different signatures + if (x.Modifiers.HasFlag(MethodSignatureModifiers.Operator)) + { + // Check if both are operators and of the same type (explicit or implicit) + if (!y.Modifiers.HasFlag(MethodSignatureModifiers.Operator)) + { + return false; + } + + // Check explicit vs implicit - both flags must match + bool xIsExplicit = x.Modifiers.HasFlag(MethodSignatureModifiers.Explicit); + bool yIsExplicit = y.Modifiers.HasFlag(MethodSignatureModifiers.Explicit); + bool xIsImplicit = x.Modifiers.HasFlag(MethodSignatureModifiers.Implicit); + bool yIsImplicit = y.Modifiers.HasFlag(MethodSignatureModifiers.Implicit); + if (xIsExplicit != yIsExplicit || xIsImplicit != yIsImplicit) + { + return false; + } + + // For operators, the return type is crucial for matching + if (x.ReturnType != null && y.ReturnType != null) + { + if (!x.ReturnType.AreNamesEqual(y.ReturnType)) + { + return false; + } + } + else if (x.ReturnType != y.ReturnType) // One is null, the other is not + { + return false; + } + } + + for (int i = 0; i < x.Parameters.Count; i++) + { + if (!x.Parameters[i].Type.AreNamesEqual(y.Parameters[i].Type)) + { + return false; + } + } + + return true; + } + + public int GetHashCode([DisallowNull] MethodSignatureBase obj) + { + return HashCode.Combine(obj.Name, obj.ReturnType); + } + + private static string GetFullMethodName(MethodSignatureBase method) + { + if (method is MethodSignature methodSignature) + { + return methodSignature.FullMethodName; + } + + return method.Name; + } + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/MethodSignatureModifiers.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/MethodSignatureModifiers.cs index 2a0f6b07ec8..77c755b3299 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/MethodSignatureModifiers.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/MethodSignatureModifiers.cs @@ -21,6 +21,8 @@ public enum MethodSignatureModifiers Override = 512, Operator = 1024, Explicit = 2048, - Implicit = 4096 + Implicit = 4096, + Partial = 8192, + Abstract = 16384 } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs index 18f58c9bf48..e58c5ff3a79 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs @@ -9,12 +9,11 @@ namespace Microsoft.TypeSpec.Generator.Primitives { - //TODO Need to define the rest of the extensibility points https://github.com/microsoft/typespec/issues/4065 public class NewProjectScaffolding { public async Task Execute() { - //clean up old sln and csproj files + //clean up old sln, slnx and csproj files foreach (var file in Directory.GetFiles(CodeModelGenerator.Instance.Configuration.OutputDirectory, "*.csproj", SearchOption.AllDirectories)) { File.Delete(file); @@ -23,14 +22,29 @@ public async Task Execute() { File.Delete(file); } + foreach (var file in Directory.GetFiles(CodeModelGenerator.Instance.Configuration.OutputDirectory, "*.slnx", SearchOption.TopDirectoryOnly)) + { + File.Delete(file); + } await WriteSolutionFiles(); await WriteProjectFiles(); + await WriteAdditionalFiles(); + return true; } + /// + /// Override this method to write additional files during new project scaffolding. + /// This is called after the solution and project files have been written. + /// + protected virtual Task WriteAdditionalFiles() + { + return Task.CompletedTask; + } + private async Task WriteProjectFiles() { await File.WriteAllBytesAsync( @@ -46,7 +60,7 @@ private string NormalizeLineEndings(string content) private async Task WriteSolutionFiles() { await File.WriteAllBytesAsync( - Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, $"{CodeModelGenerator.Instance.Configuration.PackageName}.sln"), + Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, $"{CodeModelGenerator.Instance.Configuration.PackageName}.slnx"), Encoding.UTF8.GetBytes(NormalizeLineEndings(GetSolutionFileContent()))); } @@ -71,6 +85,15 @@ protected virtual string GetSourceProjectFileContent() builder.CompileIncludes.Add(compileInclude); } + // Add pack items for ConfigurationSchema.json and .targets file if no custom schema is defined + var packageName = CodeModelGenerator.Instance.Configuration.PackageName; + var customSchemaPath = Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, "schema", "ConfigurationSchema.json"); + if (!File.Exists(customSchemaPath)) + { + builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"Generated\schema\ConfigurationSchema.json", @"\")); + builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem($@"..\{packageName}.NuGet.targets", @"buildTransitive\netstandard2.0\" + $"{packageName}.targets")); + } + return builder.Write(); } @@ -81,64 +104,16 @@ protected virtual string GetSourceProjectFileContent() private static readonly IReadOnlyList _unbrandedDependencyPackages = new CSharpProjectWriter.CSProjDependencyPackage[] { - new("System.ClientModel", "1.9.0"), + new("System.ClientModel", "1.10.0"), }; protected virtual string GetSolutionFileContent() { - string slnContent = @"Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -"; - slnContent += @"Project(""{{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}}"") = ""{0}"", ""src\{0}.csproj"", ""{{28FF4005-4467-4E36-92E7-DEA27DEB1519}}"" -EndProject -"; - slnContent += @"Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {{B0C276D1-2930-4887-B29A-D1A33E7009A2}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {{B0C276D1-2930-4887-B29A-D1A33E7009A2}}.Debug|Any CPU.Build.0 = Debug|Any CPU - {{B0C276D1-2930-4887-B29A-D1A33E7009A2}}.Release|Any CPU.ActiveCfg = Release|Any CPU - {{B0C276D1-2930-4887-B29A-D1A33E7009A2}}.Release|Any CPU.Build.0 = Release|Any CPU - {{8E9A77AC-792A-4432-8320-ACFD46730401}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {{8E9A77AC-792A-4432-8320-ACFD46730401}}.Debug|Any CPU.Build.0 = Debug|Any CPU - {{8E9A77AC-792A-4432-8320-ACFD46730401}}.Release|Any CPU.ActiveCfg = Release|Any CPU - {{8E9A77AC-792A-4432-8320-ACFD46730401}}.Release|Any CPU.Build.0 = Release|Any CPU -"; - slnContent += @" {{A4241C1F-A53D-474C-9E4E-075054407E74}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {{A4241C1F-A53D-474C-9E4E-075054407E74}}.Debug|Any CPU.Build.0 = Debug|Any CPU - {{A4241C1F-A53D-474C-9E4E-075054407E74}}.Release|Any CPU.ActiveCfg = Release|Any CPU - {{A4241C1F-A53D-474C-9E4E-075054407E74}}.Release|Any CPU.Build.0 = Release|Any CPU - {{FA8BD3F1-8616-47B6-974C-7576CDF4717E}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {{FA8BD3F1-8616-47B6-974C-7576CDF4717E}}.Debug|Any CPU.Build.0 = Debug|Any CPU - {{FA8BD3F1-8616-47B6-974C-7576CDF4717E}}.Release|Any CPU.ActiveCfg = Release|Any CPU - {{FA8BD3F1-8616-47B6-974C-7576CDF4717E}}.Release|Any CPU.Build.0 = Release|Any CPU - {{85677AD3-C214-42FA-AE6E-49B956CAC8DC}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {{85677AD3-C214-42FA-AE6E-49B956CAC8DC}}.Debug|Any CPU.Build.0 = Debug|Any CPU - {{85677AD3-C214-42FA-AE6E-49B956CAC8DC}}.Release|Any CPU.ActiveCfg = Release|Any CPU - {{85677AD3-C214-42FA-AE6E-49B956CAC8DC}}.Release|Any CPU.Build.0 = Release|Any CPU - {{28FF4005-4467-4E36-92E7-DEA27DEB1519}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {{28FF4005-4467-4E36-92E7-DEA27DEB1519}}.Debug|Any CPU.Build.0 = Debug|Any CPU - {{28FF4005-4467-4E36-92E7-DEA27DEB1519}}.Release|Any CPU.ActiveCfg = Release|Any CPU - {{28FF4005-4467-4E36-92E7-DEA27DEB1519}}.Release|Any CPU.Build.0 = Release|Any CPU - {{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}}.Debug|Any CPU.Build.0 = Debug|Any CPU - {{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}}.Release|Any CPU.ActiveCfg = Release|Any CPU - {{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {{A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}} - EndGlobalSection -EndGlobal -"; - return string.Format(slnContent, CodeModelGenerator.Instance.Configuration.PackageName); + return string.Format( + @" + + +", CodeModelGenerator.Instance.Configuration.PackageName); } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/PropertyWireInformation.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/PropertyWireInformation.cs index 68b43a1c015..603686c1c73 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/PropertyWireInformation.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/PropertyWireInformation.cs @@ -16,6 +16,8 @@ public class PropertyWireInformation : WireInformation public bool IsHttpMetadata { get; } public bool IsApiVersion { get; } internal FormattableString? Description { get; } + public SerializationOptions? SerializationOptions { get; } + public PropertyWireInformation(SerializationFormat serializationFormat, bool isRequired, bool isReadOnly, bool isNullable, bool isDiscriminator, string serializedName, bool isHttpMetadata, bool isApiVersion) : base(serializationFormat, serializedName) { @@ -32,7 +34,7 @@ public PropertyWireInformation(SerializationFormat serializationFormat, bool isR /// /// The input model property. internal PropertyWireInformation(InputProperty inputProperty) - : base(CodeModelGenerator.Instance.TypeFactory.GetSerializationFormat(inputProperty.Type), inputProperty.SerializedName) + : base(CodeModelGenerator.Instance.TypeFactory.GetSerializationFormat(inputProperty), inputProperty.SerializedName) // TODO -- this is only temporary because we do not support other type of serialization, improvement tracking https://github.com/microsoft/typespec/issues/5861 { InputModelProperty? modelProperty = inputProperty as InputModelProperty; @@ -43,6 +45,9 @@ internal PropertyWireInformation(InputProperty inputProperty) IsDiscriminator = modelProperty != null && modelProperty.IsDiscriminator; Description = DocHelpers.GetFormattableDescription(inputProperty.Summary, inputProperty.Doc); IsApiVersion = inputProperty.IsApiVersion; + SerializationOptions = modelProperty?.SerializationOptions != null + ? CodeModelGenerator.Instance.TypeFactory.CreateSerializationOptions(modelProperty.SerializationOptions) + : null; } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/SerializationOptions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/SerializationOptions.cs new file mode 100644 index 00000000000..10914162ee3 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/SerializationOptions.cs @@ -0,0 +1,7 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.TypeSpec.Generator.Primitives +{ + public abstract class SerializationOptions { } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/TypeProviderWriter.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/TypeProviderWriter.cs index 2fd1002e3ba..7c52a23a76d 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/TypeProviderWriter.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/TypeProviderWriter.cs @@ -116,6 +116,10 @@ private void WriteEnumContent(CodeWriter writer) for (int i = 0; i < _provider.Fields.Count; i++) { writer.WriteXmlDocsNoScope(_provider.Fields[i].XmlDocs); + foreach (var attr in _provider.Fields[i].Attributes) + { + attr.Write(writer); + } writer.Append($"{_provider.Fields[i].Name}"); if (_provider.Fields[i].InitializationValue != null) { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Properties/launchSettings.json b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Properties/launchSettings.json index b95f8ae913a..4011716de9f 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Properties/launchSettings.json +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Properties/launchSettings.json @@ -10,11 +10,6 @@ "commandName": "Executable", "executablePath": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.exe" }, - "http-authentication-noauth-union": { - "commandLineArgs": "$(SolutionDir)/TestProjects/Spector/http/authentication/noauth/union -g StubLibraryGenerator", - "commandName": "Executable", - "executablePath": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.exe" - }, "http-authentication-oauth2": { "commandLineArgs": "$(SolutionDir)/TestProjects/Spector/http/authentication/oauth2 -g StubLibraryGenerator", "commandName": "Executable", @@ -135,6 +130,11 @@ "commandName": "Executable", "executablePath": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.exe" }, + "http-payload-xml": { + "commandLineArgs": "$(SolutionDir)/TestProjects/Spector/http/payload/xml -g StubLibraryGenerator", + "commandName": "Executable", + "executablePath": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.exe" + }, "http-resiliency-srv-driven-v1": { "commandLineArgs": "$(SolutionDir)/TestProjects/Spector/http/resiliency/srv-driven/v1 -g StubLibraryGenerator", "commandName": "Executable", @@ -290,11 +290,6 @@ "commandName": "Executable", "executablePath": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.exe" }, - "http-type-union-discriminated": { - "commandLineArgs": "$(SolutionDir)/TestProjects/Spector/http/type/union/discriminated -g StubLibraryGenerator", - "commandName": "Executable", - "executablePath": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.exe" - }, "http-versioning-added-v1": { "commandLineArgs": "$(SolutionDir)/TestProjects/Spector/http/versioning/added/v1 -g StubLibraryGenerator", "commandName": "Executable", diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ApiVersionEnumProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ApiVersionEnumProvider.cs index 76f41c1e6f4..8bb38365343 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ApiVersionEnumProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ApiVersionEnumProvider.cs @@ -7,6 +7,7 @@ using System.Linq; using Microsoft.TypeSpec.Generator.Expressions; using Microsoft.TypeSpec.Generator.Input; +using Microsoft.TypeSpec.Generator.Input.Extensions; using Microsoft.TypeSpec.Generator.Primitives; using Microsoft.TypeSpec.Generator.Shared; using Microsoft.TypeSpec.Generator.Utilities; @@ -38,7 +39,15 @@ protected override string BuildName() var serviceNamespace = _inputEnum.Namespace; if (!string.IsNullOrEmpty(serviceNamespace)) { - return ClientHelper.BuildNameForService(serviceNamespace, ServicePrefix, VersionSuffix); + if (!ClientHelper.HasLastSegmentCollision(serviceNamespace, _inputEnum, apiVersionEnums)) + { + // No collision in the last segment — use BuildNameForService with the last segment. + return ClientHelper.BuildNameForService(serviceNamespace, string.Empty, ApiVersionEnumName); + } + + // Last segment collides — find the shortest unique namespace suffix. + string uniquePrefix = ClientHelper.GetShortestUniqueNamespacePrefix(serviceNamespace, _inputEnum, apiVersionEnums); + return $"{uniquePrefix.ToIdentifierName()}{VersionSuffix}"; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ArgumentDefinition.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ArgumentDefinition.cs index 7dda538078d..6c7e62bd102 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ArgumentDefinition.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ArgumentDefinition.cs @@ -11,6 +11,7 @@ using Microsoft.TypeSpec.Generator.Statements; using static Microsoft.TypeSpec.Generator.Snippets.ArgumentSnippets; using static Microsoft.TypeSpec.Generator.Snippets.Snippet; +using static Microsoft.TypeSpec.Generator.Snippets.StringSnippets; namespace Microsoft.TypeSpec.Generator.Providers { @@ -20,6 +21,9 @@ private class Template { } private const string AssertNotNullMethodName = "AssertNotNull"; private const string AssertNotNullOrEmptyMethodName = "AssertNotNullOrEmpty"; + private const string AssertNotNullOrWhiteSpaceMethodName = "AssertNotNullOrWhiteSpace"; + private const string AssertInRangeMethodName = "AssertInRange"; + private const string CheckNotNullOrEmptyMethodName = "CheckNotNullOrEmpty"; private readonly CSharpType _t = typeof(Template<>).GetGenericArguments()[0]; private readonly ParameterProvider _nameParam = new ParameterProvider("name", $"The name.", typeof(string)); @@ -65,9 +69,60 @@ protected internal override MethodProvider[] BuildMethods() BuildAssertNotNullStruct(), BuildAssertNotNullOrEmptyCollection(), BuildAssertNotNullOrEmptyString(), + BuildAssertNotNullOrWhiteSpace(), + BuildAssertInRange(), + BuildCheckNotNullOrEmpty(), ]; } + private MethodProvider BuildAssertNotNullOrWhiteSpace() + { + var valueParam = new ParameterProvider("value", $"The value.", typeof(string)); + var signature = GetSignature(AssertNotNullOrWhiteSpaceMethodName, [valueParam, _nameParam]); + return new MethodProvider(signature, new MethodBodyStatement[] + { + AssertNotNullSnippet(valueParam), + new IfStatement(IsNullOrWhiteSpace(valueParam.As())) + { + ThrowArgumentException("Value cannot be empty or contain only white-space characters.") + } + }, + this); + } + + private MethodProvider BuildAssertInRange() + { + var valueParam = new ParameterProvider("value", $"The value.", _t); + var minimumParam = new ParameterProvider("minimum", $"The minimum value.", _t); + var maximumParam = new ParameterProvider("maximum", $"The maximum value.", _t); + var whereExpression = Where.NotNull(_t).And(new CSharpType(typeof(IComparable<>), _t)); + var signature = GetSignature(AssertInRangeMethodName, [valueParam, minimumParam, maximumParam, _nameParam], [_t], [whereExpression]); + return new MethodProvider(signature, new MethodBodyStatement[] + { + new IfStatement(minimumParam.Invoke("CompareTo", valueParam).GreaterThan(Literal(0))) + { + Throw(New.ArgumentOutOfRangeException(_nameParam, "Value is less than the minimum allowed.", false)) + }, + new IfStatement(maximumParam.Invoke("CompareTo", valueParam).LessThan(Literal(0))) + { + Throw(New.ArgumentOutOfRangeException(_nameParam, "Value is greater than the maximum allowed.", false)) + } + }, + this); + } + + private MethodProvider BuildCheckNotNullOrEmpty() + { + var valueParam = new ParameterProvider("value", $"The value.", typeof(string)); + var signature = GetSignature(CheckNotNullOrEmptyMethodName, [valueParam, _nameParam], returnType: typeof(string)); + return new MethodProvider(signature, new MethodBodyStatement[] + { + Static().Invoke(AssertNotNullOrEmptyMethodName, [valueParam, _nameParam]).Terminate(), + Return(valueParam) + }, + this); + } + private MethodProvider BuildAssertNotNullOrEmptyString() { var valueParam = new ParameterProvider("value", $"The value.", typeof(string)); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/CanonicalTypeProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/CanonicalTypeProvider.cs index 754dadefabc..df3ec03a1b4 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/CanonicalTypeProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/CanonicalTypeProvider.cs @@ -55,12 +55,12 @@ protected override IReadOnlyList BuildAttributes() protected internal override ConstructorProvider[] BuildConstructors() { - return [.. _generatedTypeProvider.Constructors, .. _generatedTypeProvider.CustomCodeView?.Constructors ?? []]; + return [.. FilterCustomizedConstructors(_generatedTypeProvider.Constructors), .. _generatedTypeProvider.CustomCodeView?.Constructors ?? []]; } protected internal override MethodProvider[] BuildMethods() { - return [.. _generatedTypeProvider.Methods, .. _generatedTypeProvider.CustomCodeView?.Methods ?? []]; + return [.. FilterCustomizedMethods(_generatedTypeProvider.Methods), .. _generatedTypeProvider.CustomCodeView?.Methods ?? []]; } protected internal override PropertyProvider[] BuildProperties() @@ -133,6 +133,11 @@ protected internal override PropertyProvider[] BuildProperties() customProperty.InputProperty = specProperty; } + // Filter out generated properties that have been customized to avoid duplicates. + // This is needed because EnsureBuilt caches members without applying customization + // filtering, so _generatedTypeProvider.Properties may contain unfiltered results. + var filteredGeneratedProperties = FilterCustomizedProperties(generatedProperties); + if (_specProperties.Count > 0) { // Input properties will only contain this types properties, i.e. it won't include base type properties. @@ -140,7 +145,7 @@ protected internal override PropertyProvider[] BuildProperties() var nonSpecProperties = new List(); // Process all properties in single pass, categorizing them - foreach (var prop in generatedProperties) + foreach (var prop in filteredGeneratedProperties) { if (prop.InputProperty != null) { @@ -186,7 +191,7 @@ protected internal override PropertyProvider[] BuildProperties() } // For other types, there is no canonical order, so we can just return generated followed by custom properties. - return [..generatedProperties, ..customProperties]; + return [..filteredGeneratedProperties, ..customProperties]; } protected internal override FieldProvider[] BuildFields() @@ -251,7 +256,7 @@ protected internal override FieldProvider[] BuildFields() } // Order is not important for fields, so we can just return generated followed by custom fields - return [..generatedFields, ..customFields]; + return [..FilterCustomizedFields(generatedFields), ..customFields]; } private bool TryGetSpecProperty( diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/FieldProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/FieldProvider.cs index c76b632ef46..cb411d1d53f 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/FieldProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/FieldProvider.cs @@ -101,6 +101,10 @@ public void Update( _variable?.Update(name: name); _asMember?.Update(memberName: name); _declaration = null; + if (_asMember != null) + { + _asMember.Declaration = Declaration; + } InitializeParameter(); } @@ -148,6 +152,6 @@ private void InitializeParameter() } private MemberExpression? _asMember; - public static implicit operator MemberExpression(FieldProvider field) => field._asMember ??= new MemberExpression(null, field.Name); + public static implicit operator MemberExpression(FieldProvider field) => field._asMember ??= new MemberExpression(null, field.Name) { Declaration = field.Declaration }; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/FixedEnumProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/FixedEnumProvider.cs index 258c5c4d125..aa3d5adcede 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/FixedEnumProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/FixedEnumProvider.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +using System; using System.Collections.Generic; using System.Linq; using Microsoft.TypeSpec.Generator.Expressions; @@ -89,6 +90,44 @@ protected override IReadOnlyList BuildEnumValues() return values; } + protected internal override IReadOnlyList? BuildEnumValuesForBackCompatibility(IReadOnlyList currentValues) + { + var lastContractFields = LastContractView?.Fields; + if (lastContractFields == null || lastContractFields.Count == 0) + { + return null; + } + + var currentLookup = currentValues.ToDictionary(v => v.Name, StringComparer.OrdinalIgnoreCase); + var allMembers = new List(currentValues.Count); + + foreach (var field in lastContractFields) + { + if (currentLookup.TryGetValue(field.Name, out var existingMember)) + { + var updatedField = new FieldProvider( + existingMember.Field.Modifiers, + existingMember.Field.Type, + existingMember.Name, + existingMember.Field.EnclosingType, + existingMember.Field.Description); + allMembers.Add(new EnumTypeMember(existingMember.Name, updatedField, existingMember.Value)); + } + } + + // Then, add new members that weren't in the last contract (in their original input order) + var processedNames = new HashSet(lastContractFields.Select(f => f.Name), StringComparer.OrdinalIgnoreCase); + foreach (var current in currentValues) + { + if (!processedNames.Contains(current.Name)) + { + allMembers.Add(current); + } + } + + return allMembers; + } + protected internal override FieldProvider[] BuildFields() => EnumValues.Select(v => v.Field).ToArray(); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/MethodProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/MethodProvider.cs index 80b06df817c..4418cba645b 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/MethodProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/MethodProvider.cs @@ -73,6 +73,24 @@ public MethodProvider( Suppressions = (suppressions as IReadOnlyList) ?? []; } + /// + /// Initializes a new instance of the class with only a method signature and no body, + /// for use with partial method declarations. + /// + /// The method signature. + /// The enclosing type. + /// The XML documentation provider. + public MethodProvider( + MethodSignature signature, + TypeProvider enclosingType, + XmlDocProvider? xmlDocProvider = default) + { + Signature = signature; + XmlDocs = xmlDocProvider ?? MethodProviderHelpers.BuildXmlDocs(signature, enclosingType); + EnclosingType = enclosingType; + Suppressions = []; + } + public void Update( MethodSignature? signature = null, MethodBodyStatement? bodyStatements = null, @@ -129,9 +147,9 @@ public void Update( BodyExpression = expression; } } - else + else if (BodyStatements != null) { - var updatedStatements = BodyStatements!.Accept(visitor, this); + var updatedStatements = BodyStatements.Accept(visitor, this); if (!ReferenceEquals(updatedStatements, BodyStatements)) { BodyStatements = updatedStatements; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs index b7741d64749..c7c8949dda4 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs @@ -121,7 +121,51 @@ private IReadOnlyList BuildDerivedModels() return [.. derivedModels]; } - internal override TypeProvider? BaseTypeProvider => BaseModelProvider; + internal override TypeProvider? BaseTypeProvider => _baseTypeProvider ??= BuildBaseTypeProvider(); + private TypeProvider? _baseTypeProvider; + + private TypeProvider? BuildBaseTypeProvider() + { + // First check if there's a generated base model + if (BaseModelProvider != null) + { + return BaseModelProvider; + } + + // If there's a custom base type that's not a generated model, create a provider for it + if (CustomCodeView?.BaseType != null && !string.IsNullOrEmpty(CustomCodeView.BaseType.Namespace)) + { + var baseType = CustomCodeView.BaseType; + + // Try to find it in the CSharpTypeMap first + if (CodeModelGenerator.Instance.TypeFactory.CSharpTypeMap.TryGetValue(baseType, out var existingProvider)) + { + return existingProvider; + } + + // Try to find the type in the customization compilation (excluding referenced assemblies) + var baseTypeProvider = CodeModelGenerator.Instance.SourceInputModel.FindForTypeInCustomization( + baseType.Namespace, + baseType.Name, + baseType.DeclaringType?.Name); + + if (baseTypeProvider != null) + { + // Cache it in CSharpTypeMap for future lookups + CodeModelGenerator.Instance.TypeFactory.CSharpTypeMap[baseType] = baseTypeProvider; + return baseTypeProvider; + } + + // If we couldn't find the type symbol (e.g., type is from a referenced assembly), + // create a SystemObjectTypeProvider that represents the external type + var systemObjectTypeProvider = new SystemObjectTypeProvider(baseType); + // Cache it in CSharpTypeMap for future lookups + CodeModelGenerator.Instance.TypeFactory.CSharpTypeMap[baseType] = systemObjectTypeProvider; + return systemObjectTypeProvider; + } + + return null; + } public ModelProvider? BaseModelProvider => _baseModelProvider ??= BuildBaseModelProvider(); @@ -246,7 +290,7 @@ private static bool IsDiscriminator(InputProperty property) private ModelProvider? BuildBaseModelProvider() { - // consider models that have been customized to inherit from a different model + // consider models that have been customized to inherit from a different generated model if (CustomCodeView?.BaseType != null) { var baseType = CustomCodeView.BaseType; @@ -256,11 +300,31 @@ private static bool IsDiscriminator(InputProperty property) // was not also defined in custom code so Roslyn does not recognize it. if (string.IsNullOrEmpty(baseType.Namespace)) { - if (CodeModelGenerator.Instance.TypeFactory.InputModelTypeNameMap.TryGetValue(baseType.Name, out var baseInputModel)) + // Cheap check: the base model may already be created and registered under the right name. + if (CodeModelGenerator.Instance.TypeFactory.TypeProvidersByName.TryGetValue( + baseType.Name, out var resolvedProvider) && + resolvedProvider is ModelProvider resolvedModel) { - baseType = CodeModelGenerator.Instance.TypeFactory.CreateCSharpType(baseInputModel); + return resolvedModel; + } + + // Force-create all input models so that visitors run (which may rename models + // via TypeProvider.Update) and TypeProvidersByName is fully populated. + // This is a no-op for models that have already been created. + foreach (var model in CodeModelGenerator.Instance.InputLibrary.InputNamespace.Models) + { + CodeModelGenerator.Instance.TypeFactory.CreateModel(model); + } + + if (CodeModelGenerator.Instance.TypeFactory.TypeProvidersByName.TryGetValue( + baseType.Name, out resolvedProvider) && + resolvedProvider is ModelProvider resolvedAfterCreate) + { + return resolvedAfterCreate; } } + + // Try to find the base type in the CSharpTypeMap if (baseType != null && CodeModelGenerator.Instance.TypeFactory.CSharpTypeMap.TryGetValue( baseType, out var customBaseType) && @@ -268,6 +332,13 @@ private static bool IsDiscriminator(InputProperty property) { return customBaseModel; } + + // If the custom base type has a namespace (external type), we don't return it here + // as it's handled by BuildBaseTypeProvider() which returns a TypeProvider + if (!string.IsNullOrEmpty(baseType?.Namespace)) + { + return null; + } } if (_inputModel.BaseModel == null) @@ -885,7 +956,7 @@ p.Property is null if (type is { IsFrameworkType: false, IsEnum: true }) { - if (_inputModel.BaseModel.DiscriminatorProperty!.Type is InputEnumType inputEnumType) + if (_inputModel.BaseModel.DiscriminatorProperty?.Type is InputEnumType inputEnumType) { var discriminatorProvider = CodeModelGenerator.Instance.TypeFactory.CreateEnum(enumType: inputEnumType); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ParameterProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ParameterProvider.cs index 7d844e45a8a..21e6f9c1adf 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ParameterProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ParameterProvider.cs @@ -34,6 +34,8 @@ public sealed class ParameterProvider : IEquatable public bool IsOut { get; private set; } public bool IsParams { get; private set; } + public bool IsContentParameter => Name == "content" && Location == ParameterLocation.Body; + public IReadOnlyList Attributes { get; private set; } public WireInformation WireInfo { get; private set; } public ParameterLocation Location { get; private set; } @@ -48,12 +50,19 @@ public sealed class ParameterProvider : IEquatable /// public FieldProvider? Field { get; set; } + /// + /// This property stores the InputParameter that this ParameterProvider was created from. + /// Used to access metadata like MethodParameterSegments for override scenarios. + /// + public InputParameter? InputParameter { get; private set; } + /// /// Creates a from an . /// /// The to convert. public ParameterProvider(InputParameter inputParameter) { + InputParameter = inputParameter; Name = inputParameter.Name; Description = DocHelpers.GetFormattableDescription(inputParameter.Summary, inputParameter.Doc) ?? FormattableStringHelpers.Empty; var type = CodeModelGenerator.Instance.TypeFactory.CreateCSharpType(inputParameter.Type) ?? throw new InvalidOperationException($"Failed to create CSharpType for {inputParameter.Type}"); @@ -88,7 +97,8 @@ public ParameterProvider( ValueExpression? initializationValue = null, ParameterLocation? location = null, WireInformation? wireInfo = null, - ParameterValidationType? validation = null) + ParameterValidationType? validation = null, + InputParameter? inputParameter = null) { Debug.Assert(!(property is not null && field is not null), "A parameter cannot be both a property and a field"); @@ -107,6 +117,7 @@ public ParameterProvider( InitializationValue = initializationValue; WireInfo = wireInfo ?? new WireInformation(SerializationFormat.Default, name); Location = location ?? ParameterLocation.Unknown; + InputParameter = inputParameter; } private ParameterProvider? _inputParameter; @@ -136,7 +147,8 @@ private ParameterProvider BuildInputVariant() validation: Validation) { _asVariable = _asVariable, - SpreadSource = SpreadSource + SpreadSource = SpreadSource, + InputParameter = InputParameter }; } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/PropertyProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/PropertyProvider.cs index d6ffb0fa6ed..a7cd7e1a6cc 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/PropertyProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/PropertyProvider.cs @@ -92,7 +92,7 @@ private PropertyProvider(InputProperty inputProperty, CSharpType propertyType, T } EnclosingType = enclosingType; - _serializationFormat = GetSerializationFormat(inputProperty); + _serializationFormat = CodeModelGenerator.Instance.TypeFactory.GetSerializationFormat(inputProperty); _isRequiredNonNullableConstant = inputProperty.IsRequired && propertyType is { IsLiteral: true, IsNullable: false }; var propHasSetter = PropertyHasSetter(propertyType, inputProperty); MethodSignatureModifiers setterModifier = propHasSetter ? MethodSignatureModifiers.Public : MethodSignatureModifiers.None; @@ -101,9 +101,10 @@ private PropertyProvider(InputProperty inputProperty, CSharpType propertyType, T IsDiscriminator = IsDiscriminatorProperty(inputProperty); var hasOutputUsage = inputProperty.EnclosingType?.Usage.HasFlag(InputModelTypeUsage.Output) ?? false; Modifiers = IsDiscriminator || (!hasOutputUsage && _isRequiredNonNullableConstant) ? MethodSignatureModifiers.Internal : MethodSignatureModifiers.Public; - Name = inputProperty.Name == enclosingType.Name - ? $"{inputProperty.Name.ToIdentifierName()}Property" - : inputProperty.Name.ToIdentifierName(); + var identifierName = inputProperty.Name.ToIdentifierName(); + Name = identifierName == enclosingType.Name + ? $"{identifierName}Property" + : identifierName; Body = new AutoPropertyBody(propHasSetter, setterModifier, GetPropertyInitializationValue(propertyType, inputProperty)); WireInfo = new PropertyWireInformation(inputProperty); @@ -335,21 +336,5 @@ public void Update( BuildDocs(); } } - - private SerializationFormat GetSerializationFormat(InputProperty inputProperty) - { - // Handle array encoding from InputModelProperty - if (inputProperty is InputModelProperty modelProperty && - inputProperty.Type is InputArrayType) - { - var arrayEncoding = modelProperty.Encode; - if (arrayEncoding.HasValue) - { - return arrayEncoding.Value.ToSerializationFormat(); - } - } - - return CodeModelGenerator.Instance.TypeFactory.GetSerializationFormat(inputProperty.Type); - } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/SystemObjectTypeProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/SystemObjectTypeProvider.cs new file mode 100644 index 00000000000..67d4d0c3f34 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/SystemObjectTypeProvider.cs @@ -0,0 +1,61 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; +using System.Collections.Generic; +using Microsoft.TypeSpec.Generator.Primitives; +using Microsoft.TypeSpec.Generator.Statements; + +namespace Microsoft.TypeSpec.Generator.Providers +{ + /// + /// Represents a type from an external assembly (system or referenced assembly) that is not part of the current generation. + /// This provider is used when a generated model inherits from a type that exists in a referenced assembly + /// but doesn't have a Roslyn type symbol available in the customization compilation. + /// + internal sealed class SystemObjectTypeProvider : TypeProvider + { + private readonly CSharpType _type; + + public SystemObjectTypeProvider(CSharpType type) + { + _type = type ?? throw new ArgumentNullException(nameof(type)); + + if (string.IsNullOrEmpty(_type.Namespace)) + { + throw new ArgumentException("Type must have a namespace", nameof(type)); + } + } + + private protected sealed override TypeProvider? BuildCustomCodeView(string? generatedTypeName = default, string? generatedTypeNamespace = default) => null; + private protected sealed override TypeProvider? BuildLastContractView(string? generatedTypeName = default, string? generatedTypeNamespace = default) => null; + + protected override string BuildRelativeFilePath() => throw new InvalidOperationException("This type should not be writing in generation"); + + protected override string BuildName() => _type.Name; + + protected override string BuildNamespace() => _type.Namespace; + + protected override IReadOnlyList BuildAttributes() => []; + + protected override CSharpType? BuildBaseType() => _type.BaseType; + + protected override TypeSignatureModifiers BuildDeclarationModifiers() + { + // Default to public class since we don't have symbol information + return TypeSignatureModifiers.Public | TypeSignatureModifiers.Class; + } + + protected internal override FieldProvider[] BuildFields() => []; + + protected internal override PropertyProvider[] BuildProperties() => []; + + protected internal override ConstructorProvider[] BuildConstructors() => []; + + protected internal override MethodProvider[] BuildMethods() => []; + + protected override bool GetIsEnum() => false; + + protected override CSharpType BuildEnumUnderlyingType() => throw new InvalidOperationException("This type is not an enum"); + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/TypeProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/TypeProvider.cs index c5ed0328e12..e34c6b33e35 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/TypeProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/TypeProvider.cs @@ -412,6 +412,7 @@ public virtual void Reset() _properties = null; _fields = null; _constructors = null; + _implements = null; _serializationProviders = null; _nestedTypes = null; _xmlDocs = null; @@ -438,6 +439,8 @@ public virtual void Reset() /// The new fields. /// The new serializations. /// The new nested types. + /// The new attributes. + /// The new implemented interfaces. /// The new XML docs. /// The new modifiers. /// The new name. @@ -453,6 +456,7 @@ public void Update( IEnumerable? serializations = null, IEnumerable? nestedTypes = null, IEnumerable? attributes = default, + IEnumerable? implements = null, XmlDocProvider? xmlDocs = null, TypeSignatureModifiers? modifiers = null, string? name = null, @@ -480,6 +484,10 @@ public void Update( { _constructors = (constructors as IReadOnlyList) ?? constructors.ToList(); } + if (implements != null) + { + _implements = (implements as IReadOnlyList) ?? implements.ToList(); + } if (serializations != null) { _serializationProviders = (serializations as IReadOnlyList) ?? serializations.ToList(); @@ -543,10 +551,14 @@ private void ResetMembersBasedOnIdentityChange(string? name = null, string? @nam internal void EnsureBuilt() { - _ = Methods; - _ = Constructors; - _ = Properties; - _ = Fields; + // Build all members without applying customization filtering. + // Filtering is deferred to CSharpGen.ExecuteAsync after visitors have had a chance + // to transform members (e.g., merging parameters). This ensures visitors see the + // full set of members before customization filtering is applied. + _methods ??= BuildMethods(); + _constructors ??= BuildConstructors(); + _properties ??= BuildProperties(); + _fields ??= BuildFields(); _ = Implements; if (IsEnum) { @@ -568,17 +580,33 @@ internal void ProcessTypeForBackCompatibility() var hasMethods = LastContractView?.Methods != null && LastContractView.Methods.Count > 0; var hasConstructors = LastContractView?.Constructors != null && LastContractView.Constructors.Count > 0; - if (!hasMethods && !hasConstructors) + IEnumerable? newFields = null; + if (this is EnumProvider) { - return; + var hasFields = LastContractView?.Fields != null && LastContractView.Fields.Count > 0; + if (hasFields) + { + var newEnumValues = BuildEnumValuesForBackCompatibility(EnumValues); + if (newEnumValues != null) + { + _enumValues = newEnumValues; + newFields = newEnumValues.Select(v => v.Field); + } + } } var newMethods = hasMethods ? BuildMethodsForBackCompatibility(Methods) : null; var newConstructors = hasConstructors ? BuildConstructorsForBackCompatibility(Constructors) : null; - Update(methods: newMethods, constructors: newConstructors); + if (newFields != null || newMethods != null || newConstructors != null) + { + Update(fields: newFields, methods: newMethods, constructors: newConstructors); + } } + protected internal virtual IReadOnlyList? BuildEnumValuesForBackCompatibility(IReadOnlyList originalEnumValues) + => null; + protected internal virtual IReadOnlyList BuildMethodsForBackCompatibility(IEnumerable originalMethods) => [.. originalMethods]; @@ -600,7 +628,7 @@ private bool ShouldGenerate(ConstructorProvider constructor) var customConstructors = constructor.EnclosingType.CustomCodeView?.Constructors ?? []; foreach (var customConstructor in customConstructors) { - if (IsMatch(customConstructor.Signature, constructor.Signature)) + if (MethodSignatureBase.SignatureComparer.Equals(customConstructor.Signature, constructor.Signature)) { return false; } @@ -632,7 +660,7 @@ private bool ShouldGenerate(MethodProvider method) var customMethods = method.EnclosingType.CustomCodeView?.Methods ?? []; foreach (var customMethod in customMethods) { - if (IsMatch(customMethod.Signature, method.Signature)) + if (MethodSignatureBase.SignatureComparer.Equals(customMethod.Signature, method.Signature)) { return false; } @@ -711,9 +739,17 @@ private static bool IsMatch(TypeProvider enclosingType, MethodSignatureBase sign for (int i = 0; i < parameterTypes.Length; i++) { var parameterType = ((ITypeSymbol)parameterTypes[i]!).GetCSharpType(); + var signatureParamType = signature.Parameters[i].Type; + + // If the parameter type is a generic type alias, resolve to the constraint type for matching. + if (signature is MethodSignature methodSig) + { + signatureParamType = ResolveGenericConstraintType(signatureParamType, methodSig); + } + // we ignore nullability for reference types as these are generated the same regardless of nullability - if (!IsNameMatch(parameterType, signature.Parameters[i].Type) || - (parameterType.IsValueType && parameterType.IsNullable != signature.Parameters[i].Type.IsNullable)) + if (!IsNameMatch(parameterType, signatureParamType) || + (parameterType.IsValueType && parameterType.IsNullable != signatureParamType.IsNullable)) { return false; } @@ -722,58 +758,38 @@ private static bool IsMatch(TypeProvider enclosingType, MethodSignatureBase sign return true; } - private static bool IsMatch(MethodSignatureBase customMethod, MethodSignatureBase method) + private static CSharpType ResolveGenericConstraintType(CSharpType paramType, MethodSignature methodSignature) { - if (customMethod.Parameters.Count != method.Parameters.Count || GetFullMethodName(customMethod) != GetFullMethodName(method)) + if (methodSignature.GenericArguments is null || methodSignature.GenericParameterConstraints is null) { - return false; + return paramType; } - // For operators, we need to also check the return type and operator type (explicit vs implicit) - // since operators can have the same "name" (the target type) but different signatures - if (customMethod.Modifiers.HasFlag(MethodSignatureModifiers.Operator)) + foreach (var genericArg in methodSignature.GenericArguments) { - // Check if both are operators and of the same type (explicit or implicit) - if (!method.Modifiers.HasFlag(MethodSignatureModifiers.Operator)) - { - return false; - } - - // Check explicit vs implicit - both flags must match - bool customIsExplicit = customMethod.Modifiers.HasFlag(MethodSignatureModifiers.Explicit); - bool methodIsExplicit = method.Modifiers.HasFlag(MethodSignatureModifiers.Explicit); - bool customIsImplicit = customMethod.Modifiers.HasFlag(MethodSignatureModifiers.Implicit); - bool methodIsImplicit = method.Modifiers.HasFlag(MethodSignatureModifiers.Implicit); - if (customIsExplicit != methodIsExplicit || customIsImplicit != methodIsImplicit) + if (genericArg.Name != paramType.Name) { - return false; + continue; } - // For operators, the return type is crucial for matching - if (customMethod.ReturnType != null && method.ReturnType != null) + foreach (var whereExpr in methodSignature.GenericParameterConstraints) { - if (!IsNameMatch(customMethod.ReturnType, method.ReturnType)) + if (whereExpr.Type.Name != paramType.Name) { - return false; + continue; } - } - else if (customMethod.ReturnType != method.ReturnType) // One is null, the other is not - { - return false; - } - } - for (int i = 0; i < customMethod.Parameters.Count; i++) - { - // The namespace may not be available for generated types as they are not yet generated - // so Roslyn will not have the namespace information. - if (!IsNameMatch(customMethod.Parameters[i].Type, method.Parameters[i].Type)) - { - return false; + foreach (var constraint in whereExpr.Constraints) + { + if (constraint is TypeReferenceExpression { Type: { } constraintType }) + { + return constraintType; + } + } } } - return true; + return paramType; } private static bool IsNameMatch(CSharpType typeFromCustomization, CSharpType generatedType) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Samples/ExampleMockValueBuilder.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Samples/ExampleMockValueBuilder.cs new file mode 100644 index 00000000000..fd592a24e94 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Samples/ExampleMockValueBuilder.cs @@ -0,0 +1,280 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; +using System.Collections.Generic; +using System.Linq; +using Microsoft.TypeSpec.Generator.Input; + +namespace Microsoft.TypeSpec.Generator.Samples +{ + /// + /// Generates mock instances for operations + /// that don't have examples provided in the spec. + /// + public static class ExampleMockValueBuilder + { + /// + /// Example key for the variant that includes only required parameters. + /// + public const string ShortVersionKey = "ShortVersion"; + + /// + /// Example key for the variant that includes all parameters. + /// + public const string AllParametersKey = "AllParameters"; + + private const string DefaultEndpointValue = "http://localhost:3000"; + + /// + /// Builds mock operation examples for the given operation. + /// Produces two variants: "ShortVersion" (required params only) and "AllParameters" (all params). + /// + public static IReadOnlyList BuildOperationExamples(InputOperation operation) + { + return new[] + { + BuildOperationExample(operation, ShortVersionKey, useAllParameters: false), + BuildOperationExample(operation, AllParametersKey, useAllParameters: true) + }; + } + + private static InputOperationExample BuildOperationExample(InputOperation operation, string name, bool useAllParameters) + { + var parameterExamples = new List(operation.Parameters.Count); + foreach (var parameter in operation.Parameters) + { + if (!useAllParameters && !parameter.IsRequired) + { + continue; + } + var parameterExample = BuildParameterExample(parameter, useAllParameters); + parameterExamples.Add(parameterExample); + } + + return new InputOperationExample(name, null, parameterExamples, string.Empty); + } + + /// + /// Builds a mock example value for a single parameter. + /// + internal static InputParameterExample BuildParameterExample(InputParameter parameter, bool useAllParameters) + { + // Constant parameters use their constant value directly + if (parameter.Scope == InputParameterScope.Constant) + { + var value = GetConstantValue(parameter); + return new InputParameterExample(parameter, value); + } + + // Endpoint parameters use a mock URL + if (parameter is InputEndpointParameter { IsEndpoint: true }) + { + var value = InputExampleValue.Value(parameter.Type, DefaultEndpointValue); + return new InputParameterExample(parameter, value); + } + + // Parameters with default values use those + if (parameter.DefaultValue != null) + { + var value = InputExampleValue.Value(parameter.Type, parameter.DefaultValue.Value); + return new InputParameterExample(parameter, value); + } + + // Everything else: generate a mock value based on the type + var exampleValue = BuildExampleValue(parameter.Type, parameter.Name, useAllParameters, new HashSet()); + return new InputParameterExample(parameter, exampleValue); + } + + private static InputExampleValue GetConstantValue(InputParameter parameter) + { + if (parameter.Type is InputLiteralType { Value: not null } literal) + { + return InputExampleValue.Value(parameter.Type, literal.Value); + } + if (parameter.DefaultValue != null) + { + return InputExampleValue.Value(parameter.Type, parameter.DefaultValue.Value); + } + if (parameter.Type is InputUnionType unionType && unionType.VariantTypes[0] is InputLiteralType literalVariant) + { + return InputExampleValue.Value(parameter.Type, literalVariant.Value); + } + if (parameter.Type is InputEnumType enumType && enumType.Values.Count > 0) + { + return InputExampleValue.Value(parameter.Type, enumType.Values[0].Value); + } + return InputExampleValue.Null(parameter.Type); + } + + /// + /// Builds a mock example value for the given input type. + /// This is the main dispatch method that handles all type kinds. + /// + internal static InputExampleValue BuildExampleValue(InputType type, string? hint, bool useAllParameters, HashSet visitedModels) => type switch + { + InputArrayType arrayType => BuildListExampleValue(arrayType, hint, useAllParameters, visitedModels), + InputDictionaryType dictType => BuildDictionaryExampleValue(dictType, hint, useAllParameters, visitedModels), + InputEnumType enumType => BuildEnumExampleValue(enumType), + InputPrimitiveType primitiveType => BuildPrimitiveExampleValue(primitiveType, hint), + InputLiteralType literalType => InputExampleValue.Value(literalType, literalType.Value), + InputModelType modelType => BuildModelExampleValue(modelType, useAllParameters, visitedModels), + InputUnionType unionType => BuildExampleValue(unionType.VariantTypes[0], hint, useAllParameters, visitedModels), + InputNullableType nullableType => BuildExampleValue(nullableType.Type, hint, useAllParameters, visitedModels), + InputDateTimeType dateTimeType => BuildDateTimeExampleValue(dateTimeType), + InputDurationType durationType => BuildDurationExampleValue(durationType), + _ => InputExampleValue.Object(type, new Dictionary()) + }; + + private static InputExampleValue BuildListExampleValue(InputArrayType arrayType, string? hint, bool useAllParameters, HashSet visitedModels) + { + var elementValue = BuildExampleValue(arrayType.ValueType, hint, useAllParameters, visitedModels); + return InputExampleValue.List(arrayType, new[] { elementValue }); + } + + private static InputExampleValue BuildDictionaryExampleValue(InputDictionaryType dictType, string? hint, bool useAllParameters, HashSet visitedModels) + { + var valueExample = BuildExampleValue(dictType.ValueType, hint, useAllParameters, visitedModels); + return InputExampleValue.Object(dictType, new Dictionary + { + ["key"] = valueExample + }); + } + + private static InputExampleValue BuildEnumExampleValue(InputEnumType enumType) + { + var firstValue = enumType.Values.FirstOrDefault(); + return firstValue != null + ? InputExampleValue.Value(enumType, firstValue.Value) + : InputExampleValue.Null(enumType); + } + + private static InputExampleValue BuildPrimitiveExampleValue(InputPrimitiveType primitiveType, string? hint) => primitiveType.Kind switch + { + InputPrimitiveTypeKind.Boolean => InputExampleValue.Value(primitiveType, true), + InputPrimitiveTypeKind.Int8 => InputExampleValue.Value(primitiveType, (sbyte)123), + InputPrimitiveTypeKind.UInt8 => InputExampleValue.Value(primitiveType, (byte)123), + InputPrimitiveTypeKind.Int16 => InputExampleValue.Value(primitiveType, (short)1234), + InputPrimitiveTypeKind.Int32 or InputPrimitiveTypeKind.Integer => InputExampleValue.Value(primitiveType, 1234), + InputPrimitiveTypeKind.Int64 or InputPrimitiveTypeKind.SafeInt => InputExampleValue.Value(primitiveType, 1234L), + InputPrimitiveTypeKind.UInt16 => InputExampleValue.Value(primitiveType, (ushort)1234), + InputPrimitiveTypeKind.UInt32 => InputExampleValue.Value(primitiveType, (uint)1234), + InputPrimitiveTypeKind.UInt64 => InputExampleValue.Value(primitiveType, (ulong)1234), + InputPrimitiveTypeKind.Float32 or InputPrimitiveTypeKind.Float => InputExampleValue.Value(primitiveType, 123.45f), + InputPrimitiveTypeKind.Float64 or InputPrimitiveTypeKind.Numeric => InputExampleValue.Value(primitiveType, 123.45), + InputPrimitiveTypeKind.Decimal or InputPrimitiveTypeKind.Decimal128 => InputExampleValue.Value(primitiveType, 123.45m), + InputPrimitiveTypeKind.String => BuildStringExampleValue(primitiveType, hint), + InputPrimitiveTypeKind.Url => InputExampleValue.Value(primitiveType, "http://localhost:3000"), + InputPrimitiveTypeKind.PlainDate => InputExampleValue.Value(primitiveType, "2022-05-10"), + InputPrimitiveTypeKind.PlainTime => InputExampleValue.Value(primitiveType, "01:23:45"), + InputPrimitiveTypeKind.Stream => InputExampleValue.Stream(primitiveType, ""), + InputPrimitiveTypeKind.Bytes => InputExampleValue.Value(primitiveType, "dGVzdA=="), // base64 for "test" + _ => InputExampleValue.Object(primitiveType, new Dictionary()) + }; + + private static InputExampleValue BuildStringExampleValue(InputPrimitiveType primitiveType, string? hint) + { + // UUID-typed strings get a mock UUID + if (primitiveType.Encode == "uuid") + { + return InputExampleValue.Value(primitiveType, "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"); + } + + return string.IsNullOrWhiteSpace(hint) + ? InputExampleValue.Value(primitiveType, "") + : InputExampleValue.Value(primitiveType, $"<{hint}>"); + } + + private static InputExampleValue BuildDateTimeExampleValue(InputDateTimeType dateTimeType) + { + if (dateTimeType.Encode == DateTimeKnownEncoding.Rfc7231) + return InputExampleValue.Value(dateTimeType.WireType, "Tue, 10 May 2022 18:57:31 GMT"); + if (dateTimeType.Encode == DateTimeKnownEncoding.Rfc3339) + return InputExampleValue.Value(dateTimeType.WireType, "2022-05-10T18:57:31.2311892Z"); + if (dateTimeType.Encode == DateTimeKnownEncoding.UnixTimestamp) + return InputExampleValue.Value(dateTimeType.WireType, 1652209051); + + return InputExampleValue.Null(dateTimeType); + } + + private static InputExampleValue BuildDurationExampleValue(InputDurationType durationType) + { + if (durationType.Encode == DurationKnownEncoding.Iso8601) + return InputExampleValue.Value(durationType.WireType, "PT1H23M45S"); + + if (durationType.Encode == DurationKnownEncoding.Seconds) + { + return durationType.WireType.Kind switch + { + InputPrimitiveTypeKind.Int32 => InputExampleValue.Value(durationType.WireType, 10), + InputPrimitiveTypeKind.Float or InputPrimitiveTypeKind.Float32 => InputExampleValue.Value(durationType.WireType, 10f), + _ => InputExampleValue.Value(durationType.WireType, 3.141592) + }; + } + + return InputExampleValue.Null(durationType); + } + + private static InputExampleValue BuildModelExampleValue(InputModelType model, bool useAllParameters, HashSet visitedModels) + { + // Cycle detection: if we've already visited this model, return null to break the loop + if (visitedModels.Contains(model)) + return InputExampleValue.Null(model); + + var properties = new Dictionary(); + var result = InputExampleValue.Object(model, properties); + visitedModels.Add(model); + + // If this model has a discriminator, choose the first derived type + if (model.DiscriminatorProperty != null && model.DerivedModels.Count > 0) + { + var derived = model.DerivedModels.FirstOrDefault(m => !m.IsUnknownDiscriminatorModel); + if (derived != null) + { + model = derived; + } + else + { + return InputExampleValue.Null(model); + } + } + + // Iterate all properties from this model and its base models + foreach (var modelInChain in model.GetSelfAndBaseModels()) + { + foreach (var property in modelInChain.Properties) + { + // Skip read-only properties (they can't be set) + if (property.IsReadOnly) + continue; + + // In ShortVersion, skip optional properties + if (!useAllParameters && !property.IsRequired) + continue; + + // Skip duplicate properties (keep the one from the most-derived type) + if (properties.ContainsKey(property.SerializedName)) + continue; + + InputExampleValue exampleValue; + if (property.IsDiscriminator && model.DiscriminatorValue != null) + { + exampleValue = InputExampleValue.Value(property.Type, model.DiscriminatorValue); + } + else if (property.DefaultValue is { Value: not null } defaultValue) + { + exampleValue = InputExampleValue.Value(property.Type, defaultValue.Value); + } + else + { + exampleValue = BuildExampleValue(property.Type, property.SerializedName, useAllParameters, visitedModels); + } + + properties.Add(property.SerializedName, exampleValue); + } + } + + return result; + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Shared/ClientHelper.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Shared/ClientHelper.cs index 527959086ec..7430554896a 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Shared/ClientHelper.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Shared/ClientHelper.cs @@ -2,6 +2,9 @@ // Licensed under the MIT License. using System; +using System.Collections.Generic; +using System.Linq; +using Microsoft.TypeSpec.Generator.Input; namespace Microsoft.TypeSpec.Generator.Shared { @@ -35,5 +38,81 @@ public static string BuildNameForService(string serviceName, string prefix, stri (false, false) => $"{prefix}{lastNamespaceSegment}{suffix}" }; } + + /// + /// Extracts the last segment of a dotted namespace. + /// + /// The full namespace (e.g., "Sample.KeyVault"). + /// The last segment (e.g., "KeyVault"), or the input if there is no dot. + public static string GetLastNamespaceSegment(string ns) + { + int lastDot = ns.LastIndexOf('.'); + return lastDot >= 0 ? ns.Substring(lastDot + 1) : ns; + } + + /// + /// Determines whether the last namespace segment of the given service namespace + /// collides with any other enum's last namespace segment in the collection. + /// + /// The namespace to check for collisions. + /// The current enum to exclude from the comparison. + /// All API version enums to compare against. + /// True if another enum has the same last namespace segment. + public static bool HasLastSegmentCollision(string serviceNamespace, InputEnumType currentEnum, IEnumerable apiVersionEnums) + { + var lastSegment = GetLastNamespaceSegment(serviceNamespace); + return apiVersionEnums.Any(e => + e != currentEnum && + !string.IsNullOrEmpty(e.Namespace) && + string.Equals(GetLastNamespaceSegment(e.Namespace), lastSegment, StringComparison.OrdinalIgnoreCase)); + } + + /// + /// Finds the shortest unique namespace suffix for the given enum among all API version enums, + /// by progressively adding segments from right to left until the suffix is unique. + /// If all segments are exhausted and the suffix is still not unique (same namespace), + /// the enum's input name is appended for disambiguation. + /// + /// The full namespace of the current enum. + /// The current enum to exclude from the comparison. + /// All API version enums to compare against. + /// + /// The shortest unique namespace suffix string (e.g., "ServiceOne.Tests" from "Azure.ServiceOne.Tests"), + /// or the full namespace plus the enum's input name if the namespace itself is not unique. + /// + public static string GetShortestUniqueNamespacePrefix(string serviceNamespace, InputEnumType currentEnum, IEnumerable apiVersionEnums) + { + var otherNamespaces = apiVersionEnums + .Where(e => e != currentEnum && !string.IsNullOrEmpty(e.Namespace)) + .Select(e => e.Namespace!) + .ToList(); + + string[] segments = serviceNamespace.Split('.'); + + // Start from the last segment and progressively prepend segments + for (int count = 1; count <= segments.Length; count++) + { + string candidate = string.Join(".", segments, segments.Length - count, count); + bool isUnique = true; + foreach (var otherNs in otherNamespaces) + { + string[] otherSegments = otherNs.Split('.'); + int otherCount = Math.Min(count, otherSegments.Length); + string otherCandidate = string.Join(".", otherSegments, otherSegments.Length - otherCount, otherCount); + if (string.Equals(candidate, otherCandidate, StringComparison.OrdinalIgnoreCase)) + { + isUnique = false; + break; + } + } + if (isUnique) + { + return candidate; + } + } + + // Full namespace still collides (identical namespaces) — append enum input name + return $"{serviceNamespace}.{currentEnum.Name}"; + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Snippets/Snippet.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Snippets/Snippet.cs index 783263be300..bfb6e7360ff 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Snippets/Snippet.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Snippets/Snippet.cs @@ -15,6 +15,7 @@ public static partial class Snippet { public static ScopedApi Equal(this ParameterProvider parameter, ValueExpression other) => new BinaryOperatorExpression("==", parameter, other).As(); public static ScopedApi Is(this ParameterProvider parameter, ValueExpression other) => new BinaryOperatorExpression("is", parameter, other).As(); + public static ScopedApi IsNot(this ParameterProvider parameter, ValueExpression other) => new BinaryOperatorExpression("is not", parameter, other).As(); public static ScopedApi As(this ParameterProvider parameter, CSharpType type) => ((ValueExpression)parameter).As(type); public static ScopedApi As(this ParameterProvider parameter) => ((ValueExpression)parameter).As(); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Snippets/StringSnippets.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Snippets/StringSnippets.cs index af77b445581..41a9b42a01e 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Snippets/StringSnippets.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Snippets/StringSnippets.cs @@ -38,5 +38,8 @@ public static ValueExpression ToCharArray(this ScopedApi stringExpressio public static ScopedApi Index(this ScopedApi stringExpression, ValueExpression index) => new IndexableExpression(stringExpression)[index].As(); + + public static ScopedApi StartsWith(this ScopedApi stringExpression, ValueExpression value, StringComparison comparisonType) + => stringExpression.Invoke(nameof(string.StartsWith), [value, FrameworkEnumValue(comparisonType)]).As(); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/StartUp/CommandLineOptions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/StartUp/CommandLineOptions.cs index 4e635daa3cb..dfe6aeb1e3e 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/StartUp/CommandLineOptions.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/StartUp/CommandLineOptions.cs @@ -18,7 +18,7 @@ internal class CommandLineOptions private const string CmdLineOutputDirectoryOptionHelpText = "The path to the directory containing the input files to the generator including the code model file and the configuration file for the generator."; private const string CmdLineDebugOptionHelpText = "Attempt to attach the debugger on execute."; private const string CmdLineGeneratorOptionHelpText = "The name of the generator to execute."; - private const string CmdLineNewProjectOptionHelpText = "Indicates if the generator should create the project files such as csproj, sln, etc."; + private const string CmdLineNewProjectOptionHelpText = "Indicates if the generator should create the project files such as csproj, slnx, etc."; /// /// The command line option to specify the path to the directory containing the input files to the generator. diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/StartUp/GeneratorHandler.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/StartUp/GeneratorHandler.cs index 7c68b51533a..bee78c0034c 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/StartUp/GeneratorHandler.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/StartUp/GeneratorHandler.cs @@ -5,10 +5,12 @@ using System.Collections.Generic; using System.ComponentModel.Composition; using System.ComponentModel.Composition.Hosting; +using System.Diagnostics; using System.IO; using System.Linq; using System.Reflection; using System.Text.Json; +using System.Xml.Linq; using Microsoft.TypeSpec.Generator.EmitterRpc; namespace Microsoft.TypeSpec.Generator @@ -24,9 +26,13 @@ public void LoadGenerator(CommandLineOptions options) AddPluginDlls(catalog); + // Load plugins specified via the 'plugins' configuration option + var configuration = Configuration.Load(options.OutputDirectory); + AddConfiguredPluginDlls(catalog, configuration); + using CompositionContainer container = new(catalog); - container.ComposeExportedValue(new GeneratorContext(Configuration.Load(options.OutputDirectory))); + container.ComposeExportedValue(new GeneratorContext(configuration)); container.ComposeParts(this); SelectGenerator(options); @@ -34,14 +40,56 @@ public void LoadGenerator(CommandLineOptions options) private static void AddPluginDlls(AggregateCatalog catalog) { - var dllPathsInOrder = GetOrderedPluginDlls(AppContext.BaseDirectory); - if (dllPathsInOrder.Count == 0) + string? rootDirectory = FindRootDirectory(AppContext.BaseDirectory); + if (rootDirectory == null) + { + return; + } + + var packagePath = Path.Combine(rootDirectory, "package.json"); + if (!File.Exists(packagePath)) + { + return; + } + + using var doc = JsonDocument.Parse(File.ReadAllText(packagePath)); + if (!doc.RootElement.TryGetProperty("dependencies", out var deps)) { return; } + // We need to construct the emitter independently as the CodeModelGenerator is not yet initialized. using var emitter = new Emitter(Console.OpenStandardOutput()); + var packageNamesInOrder = deps.EnumerateObject().Select(p => p.Name).ToList(); + var dllPathsInOrder = new List(); + + foreach (var package in packageNamesInOrder) + { + var packageDir = Path.Combine(rootDirectory, NodeModulesDir, package); + var packageDistPath = Path.Combine(packageDir, "dist"); + + if (Directory.Exists(packageDistPath)) + { + var dlls = Directory.EnumerateFiles(packageDistPath, "*.dll", SearchOption.AllDirectories); + dllPathsInOrder.AddRange(dlls); + } + else + { + // No pre-built DLLs — look for a .csproj to build + var builtDll = BuildPluginIfNeeded(packageDir, emitter); + if (builtDll != null) + { + dllPathsInOrder.Add(builtDll); + } + } + } + + if (dllPathsInOrder.Count == 0) + { + return; + } + var highestVersions = new Dictionary(StringComparer.OrdinalIgnoreCase); foreach (var dllPath in dllPathsInOrder) { @@ -86,6 +134,167 @@ private static void AddPluginDlls(AggregateCatalog catalog) } } + /// + /// Loads plugin assemblies from directory paths specified via the 'plugins' configuration option. + /// If a directory contains a .csproj file, the project is built first to produce the plugin assembly. + /// + internal static void AddConfiguredPluginDlls(AggregateCatalog catalog, Configuration configuration) + { + var pluginPaths = configuration.PluginPaths; + if (pluginPaths == null || pluginPaths.Count == 0) + { + return; + } + + using var emitter = new Emitter(Console.OpenStandardOutput()); + + foreach (var pluginPath in pluginPaths) + { + if (string.IsNullOrEmpty(pluginPath)) + { + continue; + } + + if (!Directory.Exists(pluginPath)) + { + throw new InvalidOperationException( + $"Plugin path '{pluginPath}' is not a valid directory."); + } + + var builtDll = BuildPluginIfNeeded(pluginPath, emitter); + if (builtDll != null) + { + catalog.Catalogs.Add(new AssemblyCatalog(builtDll)); + } + else + { + // No .csproj found — scan for pre-built DLLs + foreach (var dll in Directory.EnumerateFiles(pluginPath, "*.dll")) + { + try + { + catalog.Catalogs.Add(new AssemblyCatalog(dll)); + } + catch + { + // Skip DLLs that can't be loaded as MEF catalogs (e.g. native DLLs) + } + } + } + } + } + + /// + /// Looks for a .csproj in the given directory (recursively) and builds it if found. + /// Returns the path to the built DLL, or null if no .csproj was found. + /// + internal static string? BuildPluginIfNeeded(string directory, Emitter emitter) + { + var csprojFiles = Directory.GetFiles(directory, "*.csproj", SearchOption.AllDirectories); + if (csprojFiles.Length == 0) + { + return null; + } + + return BuildPlugin(csprojFiles[0], emitter); + } + + /// + /// Builds a plugin .csproj and returns the path to the output DLL. + /// The output path is constructed from the csproj properties rather than parsing build output. + /// + internal static string? BuildPlugin(string csprojPath, Emitter emitter) + { + emitter.Info($"Building plugin: {csprojPath}"); + + var process = new Process + { + StartInfo = new ProcessStartInfo + { + FileName = "dotnet", + Arguments = $"build \"{csprojPath}\" -c Release", + RedirectStandardOutput = true, + RedirectStandardError = true, + UseShellExecute = false, + CreateNoWindow = true + } + }; + + process.Start(); + // Read both streams to avoid deadlocks, even though we only use stderr for error reporting. + process.StandardOutput.ReadToEnd(); + var stderr = process.StandardError.ReadToEnd(); + process.WaitForExit(); + + if (process.ExitCode != 0) + { + throw new InvalidOperationException( + $"Failed to build plugin '{csprojPath}'. Exit code: {process.ExitCode}\n{stderr}"); + } + + var dllPath = GetExpectedOutputPath(csprojPath); + if (dllPath != null && File.Exists(dllPath)) + { + emitter.Info($"Plugin built: {dllPath}"); + return dllPath; + } + + emitter.Info($"Warning: Build succeeded but could not determine output DLL path for '{csprojPath}'"); + return null; + } + + /// + /// Constructs the expected output DLL path from the csproj properties: + /// [ProjectDirectory]/bin/Release/[TargetFramework]/[AssemblyName].dll + /// + internal static string? GetExpectedOutputPath(string csprojPath) + { + var projectDir = Path.GetDirectoryName(csprojPath)!; + var projectName = Path.GetFileNameWithoutExtension(csprojPath); + + try + { + using var stream = File.OpenRead(csprojPath); + var doc = XDocument.Load(stream); + + var propertyGroups = doc.Descendants("PropertyGroup"); + string? targetFramework = null; + string? assemblyName = null; + + foreach (var pg in propertyGroups) + { + targetFramework ??= pg.Element("TargetFramework")?.Value; + assemblyName ??= pg.Element("AssemblyName")?.Value; + } + + // For multi-targeting projects, use the first target framework + if (string.IsNullOrEmpty(targetFramework)) + { + foreach (var pg in propertyGroups) + { + var frameworks = pg.Element("TargetFrameworks")?.Value; + if (!string.IsNullOrEmpty(frameworks)) + { + targetFramework = frameworks.Split(';', StringSplitOptions.RemoveEmptyEntries).FirstOrDefault(); + break; + } + } + } + + if (string.IsNullOrEmpty(targetFramework)) + { + return null; + } + + var effectiveAssemblyName = string.IsNullOrEmpty(assemblyName) ? projectName : assemblyName; + return Path.Combine(projectDir, "bin", "Release", targetFramework, $"{effectiveAssemblyName}.dll"); + } + catch + { + return null; + } + } + internal static IList GetOrderedPluginDlls(string pluginDirectoryStart) { var dllPathsInOrder = new List(); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Statements/UsingScopeStatement.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Statements/UsingScopeStatement.cs index 45a62dfe340..a31383d7e04 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Statements/UsingScopeStatement.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Statements/UsingScopeStatement.cs @@ -31,6 +31,8 @@ public UsingScopeStatement(CSharpType? type, CodeWriterDeclaration variable, Val public void Add(MethodBodyStatement statement) => _body.Add(statement); + public void AddRange(IEnumerable statements) => _body.AddRange(statements); + internal override void Write(CodeWriter writer) { using (writer.AmbientScope()) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs index bd6a4d8c6dc..c5f46a399d5 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs @@ -23,9 +23,14 @@ public class TypeFactory private Dictionary InputTypeToModelProvider { get; } = []; public IDictionary CSharpTypeMap { get; } = new Dictionary(CSharpType.IgnoreNullableComparer); + + // Maps C# type names to TypeProviders for efficient lookup when resolving types by name + internal IDictionary TypeProvidersByName { get; } = new Dictionary(); + private Dictionary EnumCache { get; } = []; private Dictionary TypeCache { get; } = []; + private Dictionary SerializationOptionsCache { get; } = []; private Dictionary PropertyCache { get; } = []; @@ -34,20 +39,6 @@ public class TypeFactory internal HashSet UnionVariantTypesToKeep { get; } = []; - internal IDictionary InputModelTypeNameMap - { - get - { - if (_inputModelTypeNameMap == null) - { - _inputModelTypeNameMap = CodeModelGenerator.Instance.InputLibrary.InputNamespace.Models.ToDictionary(m => m.Name.ToIdentifierName(), m => m); - } - - return _inputModelTypeNameMap; - } - } - private IDictionary? _inputModelTypeNameMap; - protected internal TypeFactory() { } @@ -60,7 +51,7 @@ protected internal TypeFactory() } type = CreateCSharpTypeCore(inputType); - TypeCache.Add(inputType, type); + TypeCache[inputType] = type; return type; } @@ -185,6 +176,10 @@ protected internal TypeFactory() if (InputTypeToModelProvider.TryGetValue(model, out var modelProvider)) return modelProvider; + // Add sentinel before construction to prevent re-entrant creation of the same model + // (e.g., when BuildBaseModelProvider triggers CreateModel for all input models). + InputTypeToModelProvider[model] = null; + modelProvider = CreateModelCore(model); foreach (var visitor in Visitors) @@ -192,11 +187,12 @@ protected internal TypeFactory() modelProvider = visitor.PreVisitModel(model, modelProvider); } - InputTypeToModelProvider.Add(model, modelProvider); + InputTypeToModelProvider[model] = modelProvider; if (modelProvider != null) { CSharpTypeMap[modelProvider.Type] = modelProvider; + TypeProvidersByName[modelProvider.Type.Name] = modelProvider; } return modelProvider; } @@ -255,6 +251,7 @@ protected internal TypeFactory() if (enumProvider != null) { CSharpTypeMap[enumProvider.Type] = enumProvider; + TypeProvidersByName[enumProvider.Type.Name] = enumProvider; } return enumProvider; @@ -345,29 +342,29 @@ protected internal TypeFactory() InputNullableType nullableType => GetSerializationFormat(nullableType.Type), InputDateTimeType dateTimeType => dateTimeType.Encode switch { - DateTimeKnownEncoding.Rfc3339 => SerializationFormat.DateTime_RFC3339, - DateTimeKnownEncoding.Rfc7231 => SerializationFormat.DateTime_RFC7231, - DateTimeKnownEncoding.UnixTimestamp => SerializationFormat.DateTime_Unix, - _ => throw new IndexOutOfRangeException($"unknown encode {dateTimeType.Encode}"), + var e when e == DateTimeKnownEncoding.Rfc3339 => SerializationFormat.DateTime_RFC3339, + var e when e == DateTimeKnownEncoding.Rfc7231 => SerializationFormat.DateTime_RFC7231, + var e when e == DateTimeKnownEncoding.UnixTimestamp => SerializationFormat.DateTime_Unix, + _ => SerializationFormat.Default, // Custom encoding formats use default serialization }, InputDurationType durationType => durationType.Encode switch { // there is no such thing as `DurationConstant` - DurationKnownEncoding.Iso8601 => SerializationFormat.Duration_ISO8601, - DurationKnownEncoding.Seconds => durationType.WireType.Kind switch + var e when e == DurationKnownEncoding.Iso8601 => SerializationFormat.Duration_ISO8601, + var e when e == DurationKnownEncoding.Seconds => durationType.WireType.Kind switch { InputPrimitiveTypeKind.Int32 => SerializationFormat.Duration_Seconds, InputPrimitiveTypeKind.Float or InputPrimitiveTypeKind.Float32 => SerializationFormat.Duration_Seconds_Float, _ => SerializationFormat.Duration_Seconds_Double }, - DurationKnownEncoding.Milliseconds => durationType.WireType.Kind switch + var e when e == DurationKnownEncoding.Milliseconds => durationType.WireType.Kind switch { InputPrimitiveTypeKind.Int32 => SerializationFormat.Duration_Milliseconds, InputPrimitiveTypeKind.Float or InputPrimitiveTypeKind.Float32 => SerializationFormat.Duration_Milliseconds_Float, _ => SerializationFormat.Duration_Milliseconds_Double }, - DurationKnownEncoding.Constant => SerializationFormat.Duration_Constant, - _ => throw new IndexOutOfRangeException($"unknown encode {durationType.Encode}") + var e when e == DurationKnownEncoding.Constant => SerializationFormat.Duration_Constant, + _ => SerializationFormat.Default // Custom encoding formats use default serialization }, InputPrimitiveType primitiveType => primitiveType.Kind switch { @@ -388,6 +385,25 @@ or InputPrimitiveTypeKind.Int64 or InputPrimitiveTypeKind.UInt8 or InputPrimitiv _ => SerializationFormat.Default }; + /// + /// Retrieves the serialization format for a given input property. For array-typed properties + /// this checks the property-level before falling + /// back to . + /// + /// The to retrieve the serialization format for. + /// The for the input property. + internal SerializationFormat GetSerializationFormat(InputProperty inputProperty) + { + if (inputProperty is InputModelProperty modelProperty && + inputProperty.Type is InputArrayType && + modelProperty.Encode.HasValue) + { + return modelProperty.Encode.Value.ToSerializationFormat(); + } + + return GetSerializationFormat(inputProperty.Type); + } + /// /// The initialization type of list properties. This type should implement both and . /// @@ -423,6 +439,34 @@ public virtual NewProjectScaffolding CreateNewProjectScaffolding() return new NewProjectScaffolding(); } + /// + /// Creates serialization options for the given input serialization options. + /// + /// The input serialization options. + /// The serialization options, or null if not applicable. + public SerializationOptions? CreateSerializationOptions(InputSerializationOptions inputSerializationOptions) + { + if (SerializationOptionsCache.TryGetValue(inputSerializationOptions, out var options)) + { + return options; + } + + options = CreateSerializationOptionsCore(inputSerializationOptions); + SerializationOptionsCache.Add(inputSerializationOptions, options); + + return options; + } + + /// + /// Factory method for creating for the given input serialization options. + /// + /// The input serialization options. + /// The serialization options, or null if not applicable. + protected virtual SerializationOptions? CreateSerializationOptionsCore(InputSerializationOptions inputSerializationOptions) + { + return null; + } + private readonly struct EnumCacheKey { public InputEnumType EnumType { get; } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Utilities/CSharpTypeExtensions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Utilities/CSharpTypeExtensions.cs index f7a7f22db7e..ae2f51a6d14 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Utilities/CSharpTypeExtensions.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Utilities/CSharpTypeExtensions.cs @@ -47,6 +47,18 @@ private static CSharpType EnsureNamespace(InputProperty? specProperty, CSharpTyp inputType = GetInputEnumType(specProperty?.Type); } + // If we still don't have an input type (e.g., custom property without spec property), + // try to look up the type by name in the TypeFactory + if (inputType == null) + { + // Try to resolve by looking up the CSharp type directly + var resolvedType = TryFindCSharpTypeByName(type.Name); + if (resolvedType != null) + { + return type.IsNullable ? resolvedType.WithNullable(true) : resolvedType; + } + } + if (inputType == null) { return type; @@ -64,6 +76,18 @@ private static CSharpType EnsureNamespace(InputProperty? specProperty, CSharpTyp return type; } + private static CSharpType? TryFindCSharpTypeByName(string typeName) + { + // Look up type provider by name using the efficient name-based dictionary + // This handles cases where the type is renamed using CodeGenType attribute + if (CodeModelGenerator.Instance.TypeFactory.TypeProvidersByName.TryGetValue(typeName, out var typeProvider)) + { + return typeProvider.Type; + } + + return null; + } + private static bool IsCustomizedEnumProperty( InputProperty? inputProperty, CSharpType customType, diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Writers/CSharpProjectWriter.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Writers/CSharpProjectWriter.cs index c6cf1db6ebb..810ac06e632 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Writers/CSharpProjectWriter.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Writers/CSharpProjectWriter.cs @@ -19,6 +19,7 @@ public CSharpProjectWriter() PackageReferences = new List(); PrivatePackageReferences = new List(); CompileIncludes = new List(); + PackItems = new List(); } public CSProjProperty? Description { get; init; } @@ -61,6 +62,8 @@ public CSharpProjectWriter() public IList CompileIncludes { get; } + public IList PackItems { get; } + public string Write() { var builder = new StringBuilder(); @@ -132,6 +135,19 @@ public string Write() writer.WriteEndElement(); } + // write pack items for NuGet package + if (PackItems.Count > 0) + { + writer.Flush(); + builder.Append(NewLine); + writer.WriteStartElement("ItemGroup"); + foreach (var item in PackItems) + { + WritePackItem(writer, item); + } + writer.WriteEndElement(); + } + writer.WriteEndDocument(); writer.Close(); writer.Flush(); @@ -207,6 +223,15 @@ private void WritePackageReference(XmlWriter writer, CSProjDependencyPackage pac writer.WriteEndElement(); } + private static void WritePackItem(XmlWriter writer, CSProjPackItem item) + { + writer.WriteStartElement("None"); + writer.WriteAttributeString("Include", item.Include); + writer.WriteAttributeString("Pack", "true"); + writer.WriteAttributeString("PackagePath", item.PackagePath); + writer.WriteEndElement(); + } + public record CSProjProperty(string Value, string? Comment) { public CSProjProperty(string value) : this(value, null) @@ -220,4 +245,6 @@ public record CSProjDependencyPackage(string PackageName, string? Version) { public CSProjDependencyPackage(string packageName) : this(packageName, null) { } } + + public record CSProjPackItem(string Include, string PackagePath); } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Writers/CodeWriter.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Writers/CodeWriter.cs index f1d50f2fcfa..1302db936ac 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Writers/CodeWriter.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Writers/CodeWriter.cs @@ -217,6 +217,14 @@ public void WriteMethod(MethodProvider method) suppression.RestoreStatement.Write(this); } } + else if (method.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Partial) + || method.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Abstract)) + { + using (WriteMethodDeclarationNoScope(method.Signature)) + { + WriteRawLine(";"); + } + } } } @@ -786,6 +794,11 @@ public IDisposable WriteMethodDeclaration(MethodSignatureBase methodBase, params public IDisposable WriteMethodDeclarationNoScope(MethodSignatureBase methodBase, params string[] disabledWarnings) { + if (methodBase.NonDocumentComment is { } comment) + { + WriteLine($"// {comment}"); + } + foreach (var attribute in methodBase.Attributes) { attribute.Write(this); @@ -800,11 +813,13 @@ public IDisposable WriteMethodDeclarationNoScope(MethodSignatureBase methodBase, .AppendRawIf("private ", methodBase.Modifiers.HasFlag(MethodSignatureModifiers.Private)) .AppendRawIf("protected ", methodBase.Modifiers.HasFlag(MethodSignatureModifiers.Protected)) .AppendRawIf("internal ", methodBase.Modifiers.HasFlag(MethodSignatureModifiers.Internal)) - .AppendRawIf("static ", methodBase.Modifiers.HasFlag(MethodSignatureModifiers.Static)); + .AppendRawIf("static ", methodBase.Modifiers.HasFlag(MethodSignatureModifiers.Static)) + .AppendRawIf("partial ", methodBase.Modifiers.HasFlag(MethodSignatureModifiers.Partial)); if (methodBase is MethodSignature method) { AppendRawIf("virtual ", methodBase.Modifiers.HasFlag(MethodSignatureModifiers.Virtual)) + .AppendRawIf("abstract ", methodBase.Modifiers.HasFlag(MethodSignatureModifiers.Abstract)) .AppendRawIf("override ", methodBase.Modifiers.HasFlag(MethodSignatureModifiers.Override)) .AppendRawIf("new ", methodBase.Modifiers.HasFlag(MethodSignatureModifiers.New)) .AppendRawIf("async ", methodBase.Modifiers.HasFlag(MethodSignatureModifiers.Async)); @@ -989,12 +1004,16 @@ public CodeScope AmbientScope() return codeWriterScope; } - internal void Append(CodeWriterDeclaration declaration) + internal void Append(CodeWriterDeclaration declaration, bool referenceOnly = false) { if (declaration.HasBeenDeclared(_scopes)) { WriteIdentifier(declaration.GetActualName(_scopes.Peek())); } + else if (referenceOnly) + { + WriteIdentifier(declaration.RequestedName); + } else { WriteDeclaration(declaration); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/ConfigurationTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/ConfigurationTests.cs index d0ca28deb43..1d81073459e 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/ConfigurationTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/ConfigurationTests.cs @@ -66,20 +66,48 @@ public void TestParseConfig_OutputFolder(string mockJson, bool throwsError) // Validates that the LibraryName field is parsed correctly from the configuration [TestCaseSource("ParseConfigLibraryNameTestCases")] - public void TestParseConfig_LibraryName(string mockJson, bool throwsError) + public void TestParseConfig_LibraryName(string mockJson, string? expected) { - if (throwsError) - { - Assert.Throws(() => MockHelpers.LoadMockGenerator(configuration: mockJson)); - return; - } + MockHelpers.LoadMockGenerator(configuration: mockJson); var library = CodeModelGenerator.Instance.Configuration.PackageName; - var expected = "libraryName"; Assert.AreEqual(expected, library); } + // Validates that when package-name is not specified, Configure() defaults to the PrimaryNamespace + [Test] + public void TestParseConfig_PackageNameDefaultsToPrimaryNamespace() + { + var mockJson = @"{ + ""output-folder"": ""outputFolder"" + }"; + + MockHelpers.LoadMockGenerator(configuration: mockJson, inputNamespaceName: "My.Custom.Namespace"); + + // Before Configure, package name should be null + Assert.IsNull(CodeModelGenerator.Instance.Configuration.PackageName); + + // After Configure, package name should be resolved from the namespace + CodeModelGenerator.Instance.Configure(); + Assert.AreEqual("My.Custom.Namespace", CodeModelGenerator.Instance.Configuration.PackageName); + } + + // Validates that when package-name is explicitly set, Configure() does not override it + [Test] + public void TestParseConfig_ExplicitPackageNameNotOverridden() + { + var mockJson = @"{ + ""output-folder"": ""outputFolder"", + ""package-name"": ""ExplicitName"" + }"; + + MockHelpers.LoadMockGenerator(configuration: mockJson, inputNamespaceName: "My.Custom.Namespace"); + + CodeModelGenerator.Instance.Configure(); + Assert.AreEqual("ExplicitName", CodeModelGenerator.Instance.Configuration.PackageName); + } + // Validates that additional configuration options are parsed correctly [Test] public void TestParseConfig_AdditionalConfigOptions() @@ -253,6 +281,64 @@ public void LicenseInfoIsNullWhenNotInConfig() Assert.IsNull(licenseInfo); } + [Test] + public void PluginPaths_ParsedFromConfig() + { + var mockJson = @"{ + ""output-folder"": ""outputFolder"", + ""package-name"": ""libraryName"", + ""plugins"": [""/path/to/Plugin.dll"", ""/path/to/plugin-dir""] + }"; + + MockHelpers.LoadMockGenerator(configuration: mockJson); + var pluginPaths = CodeModelGenerator.Instance.Configuration.PluginPaths; + Assert.IsNotNull(pluginPaths); + Assert.AreEqual(2, pluginPaths!.Count); + Assert.AreEqual("/path/to/Plugin.dll", pluginPaths[0]); + Assert.AreEqual("/path/to/plugin-dir", pluginPaths[1]); + } + + [Test] + public void PluginPaths_NullWhenNotInConfig() + { + var mockJson = @"{ + ""output-folder"": ""outputFolder"", + ""package-name"": ""libraryName"" + }"; + + MockHelpers.LoadMockGenerator(configuration: mockJson); + var pluginPaths = CodeModelGenerator.Instance.Configuration.PluginPaths; + Assert.IsNull(pluginPaths); + } + + [Test] + public void PluginPaths_NullWhenEmptyArray() + { + var mockJson = @"{ + ""output-folder"": ""outputFolder"", + ""package-name"": ""libraryName"", + ""plugins"": [] + }"; + + MockHelpers.LoadMockGenerator(configuration: mockJson); + var pluginPaths = CodeModelGenerator.Instance.Configuration.PluginPaths; + Assert.IsNull(pluginPaths); + } + + [Test] + public void PluginPaths_NotInAdditionalConfigOptions() + { + var mockJson = @"{ + ""output-folder"": ""outputFolder"", + ""package-name"": ""libraryName"", + ""plugins"": [""/path/to/Plugin.dll""] + }"; + + MockHelpers.LoadMockGenerator(configuration: mockJson); + var additionalOptions = CodeModelGenerator.Instance.Configuration.AdditionalConfigurationOptions; + Assert.IsFalse(additionalOptions.ContainsKey("plugins")); + } + public static IEnumerable ParseConfigOutputFolderTestCases { get @@ -273,11 +359,11 @@ public static IEnumerable ParseConfigLibraryNameTestCases { yield return new TestCaseData(@"{ ""output-folder"": ""outputFolder"", - ""package-name"": ""libraryName"", - }", false); + ""package-name"": ""libraryName"" + }", "libraryName"); yield return new TestCaseData(@"{ ""output-folder"": ""outputFolder"" - }", true); + }", (string?)null); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/GeneratedCodeWorkspaceTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/GeneratedCodeWorkspaceTests.cs index 62c2fa12635..0a75d8c9360 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/GeneratedCodeWorkspaceTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/GeneratedCodeWorkspaceTests.cs @@ -97,6 +97,245 @@ await MockHelpers.LoadMockGeneratorAsync( Assert.NotNull(fooMethod, "Foo method should be found in the SimpleType"); } + [Test] + public async Task AddPackageReferencesFromProject_AddsReferencesFromCsproj() + { + var ns = "TestNamespace"; + var nugetCacheDir = Path.Combine(_tempDirectory!, "NuGetCache"); + + // Create a fake external package assembly in the NuGet cache + var externalPkgName = "My.External.Library"; + var externalPkgVersion = "2.0.0"; + var externalPkgDir = Path.Combine( + nugetCacheDir, externalPkgName.ToLowerInvariant(), externalPkgVersion, "lib", "netstandard2.0"); + Directory.CreateDirectory(externalPkgDir); + + var externalSyntaxTree = CSharpSyntaxTree.ParseText(@" +namespace My.External.Library +{ + public class ExternalCredential { } +}"); + var externalCompilation = CSharpCompilation.Create( + externalPkgName, + [externalSyntaxTree], + [MetadataReference.CreateFromFile(typeof(object).Assembly.Location)], + new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary)); + var externalDllPath = Path.Combine(externalPkgDir, $"{externalPkgName}.dll"); + var emitResult = externalCompilation.Emit(externalDllPath); + Assert.IsTrue(emitResult.Success, "Failed to emit external test assembly"); + + // Create a .csproj with a PackageReference to the external package + var csprojContent = $@" + + netstandard2.0 + + + + {externalPkgVersion} + + +"; + var csProjPath = Path.Combine(_projectDir!, "src", $"{ns}.csproj"); + File.WriteAllText(csProjPath, csprojContent); + + MockHelpers.LoadMockGenerator( + inputNamespaceName: ns, + outputPath: _projectDir, + configuration: $"{{\"package-name\": \"{ns}\"}}"); + + var refCountBefore = CodeModelGenerator.Instance.AdditionalMetadataReferences.Count; + await GeneratedCodeWorkspace.AddPackageReferencesFromProject(); + var refCountAfter = CodeModelGenerator.Instance.AdditionalMetadataReferences.Count; + + Assert.AreEqual(refCountBefore + 1, refCountAfter, "Should have added one metadata reference"); + } + + [Test] + public async Task AddPackageReferencesFromProject_SkipsWhenNoCsproj() + { + // Use a namespace that doesn't match any .csproj in the project dir + MockHelpers.LoadMockGenerator( + inputNamespaceName: "NonExistentNamespace", + outputPath: _projectDir, + configuration: "{\"package-name\": \"NonExistentNamespace\"}"); + + var refCountBefore = CodeModelGenerator.Instance.AdditionalMetadataReferences.Count; + await GeneratedCodeWorkspace.AddPackageReferencesFromProject(); + var refCountAfter = CodeModelGenerator.Instance.AdditionalMetadataReferences.Count; + + Assert.AreEqual(refCountBefore, refCountAfter, "Should not add references when no .csproj exists"); + } + + [Test] + public async Task AddPackageReferencesFromProject_SkipsPackageNotInCache() + { + var ns = "TestNamespace"; + + // Create a .csproj referencing a package that doesn't exist in + // the cache or on any NuGet feed — should gracefully skip it. + var csprojContent = @" + + netstandard2.0 + + + + 1.0.0 + + +"; + var csProjPath = Path.Combine(_projectDir!, "src", $"{ns}.csproj"); + File.WriteAllText(csProjPath, csprojContent); + + MockHelpers.LoadMockGenerator( + inputNamespaceName: ns, + outputPath: _projectDir, + configuration: $"{{\"package-name\": \"{ns}\"}}"); + + var refCountBefore = CodeModelGenerator.Instance.AdditionalMetadataReferences.Count; + await GeneratedCodeWorkspace.AddPackageReferencesFromProject(); + var refCountAfter = CodeModelGenerator.Instance.AdditionalMetadataReferences.Count; + + Assert.AreEqual(refCountBefore, refCountAfter, "Should not add references for packages not in cache"); + } + + [Test] + public async Task AddPackageReferencesFromProject_ResolvesPackageWithNoVersion() + { + var ns = "TestNamespace"; + var nugetCacheDir = Path.Combine(_tempDirectory!, "NuGetCache"); + + // Create a fake package in the cache (simulating a centrally managed package) + var externalPkgName = "Centrally.Managed.Package"; + CreateFakeNuGetPackage(nugetCacheDir, externalPkgName, "4.2.0"); + + // Create a .csproj with no Version on the PackageReference + var csprojContent = $@" + + netstandard2.0 + + + + +"; + File.WriteAllText(Path.Combine(_projectDir!, "src", $"{ns}.csproj"), csprojContent); + + MockHelpers.LoadMockGenerator( + inputNamespaceName: ns, + outputPath: _projectDir, + configuration: $"{{\"package-name\": \"{ns}\"}}"); + + var refCountBefore = CodeModelGenerator.Instance.AdditionalMetadataReferences.Count; + await GeneratedCodeWorkspace.AddPackageReferencesFromProject(); + var refCountAfter = CodeModelGenerator.Instance.AdditionalMetadataReferences.Count; + + Assert.AreEqual(refCountBefore + 1, refCountAfter, + "Should resolve package from cache even without a version (centrally managed)"); + } + + [Test] + public async Task AddPackageReferencesFromProject_SkipsAlreadyAddedReferences() + { + var ns = "TestNamespace"; + var nugetCacheDir = Path.Combine(_tempDirectory!, "NuGetCache"); + + // Create a fake external package assembly in the NuGet cache + var externalPkgName = "Already.Added.Package"; + var externalPkgVersion = "1.0.0"; + var dllPath = CreateFakeNuGetPackage(nugetCacheDir, externalPkgName, externalPkgVersion); + + // Create a .csproj referencing the package + var csprojContent = $@" + + netstandard2.0 + + + + {externalPkgVersion} + + +"; + File.WriteAllText(Path.Combine(_projectDir!, "src", $"{ns}.csproj"), csprojContent); + + MockHelpers.LoadMockGenerator( + inputNamespaceName: ns, + outputPath: _projectDir, + configuration: $"{{\"package-name\": \"{ns}\"}}"); + + // Pre-add the reference (simulating a plugin that already added it) + CodeModelGenerator.Instance.AddMetadataReference( + MetadataReference.CreateFromFile(dllPath)); + + var refCountBefore = CodeModelGenerator.Instance.AdditionalMetadataReferences.Count; + await GeneratedCodeWorkspace.AddPackageReferencesFromProject(); + var refCountAfter = CodeModelGenerator.Instance.AdditionalMetadataReferences.Count; + + Assert.AreEqual(refCountBefore, refCountAfter, + "Should not add duplicate reference for a package already in AdditionalMetadataReferences"); + } + + [Test] + public async Task AddPackageReferencesFromProject_AddsMultiplePackageReferences() + { + var ns = "TestNamespace"; + var nugetCacheDir = Path.Combine(_tempDirectory!, "NuGetCache"); + + // Create two fake packages in the cache + CreateFakeNuGetPackage(nugetCacheDir, "First.Package", "1.0.0"); + CreateFakeNuGetPackage(nugetCacheDir, "Second.Package", "3.5.0"); + + var csprojContent = @" + + netstandard2.0 + + + + 1.0.0 + + + 3.5.0 + + +"; + File.WriteAllText(Path.Combine(_projectDir!, "src", $"{ns}.csproj"), csprojContent); + + MockHelpers.LoadMockGenerator( + inputNamespaceName: ns, + outputPath: _projectDir, + configuration: $"{{\"package-name\": \"{ns}\"}}"); + + var refCountBefore = CodeModelGenerator.Instance.AdditionalMetadataReferences.Count; + await GeneratedCodeWorkspace.AddPackageReferencesFromProject(); + var refCountAfter = CodeModelGenerator.Instance.AdditionalMetadataReferences.Count; + + Assert.AreEqual(refCountBefore + 2, refCountAfter, "Should have added two metadata references"); + } + + /// + /// Creates a fake NuGet package assembly in the given cache directory and returns the DLL path. + /// + private static string CreateFakeNuGetPackage(string nugetCacheDir, string packageName, string version) + { + var pkgDir = Path.Combine( + nugetCacheDir, packageName.ToLowerInvariant(), version, "lib", "netstandard2.0"); + Directory.CreateDirectory(pkgDir); + + var syntaxTree = CSharpSyntaxTree.ParseText($@" +namespace {packageName} +{{ + public class Placeholder {{ }} +}}"); + var compilation = CSharpCompilation.Create( + packageName, + [syntaxTree], + [MetadataReference.CreateFromFile(typeof(object).Assembly.Location)], + new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary)); + + var dllPath = Path.Combine(pkgDir, $"{packageName}.dll"); + var result = compilation.Emit(dllPath); + Assert.IsTrue(result.Success, $"Failed to emit fake assembly for {packageName}"); + return dllPath; + } + private void CreateTestAssemblyAndProjectFile(string nugetCacheDir, string csProjectFileName) { var ns = csProjectFileName.StartsWith("TestNamespaceUnevaluatedFrameworkValue") diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/GeneratorTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/GeneratorTests.cs index 5cf50c5e25e..bced881740b 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/GeneratorTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/GeneratorTests.cs @@ -15,5 +15,91 @@ public void CanAddVisitors() mockGenerator.AddVisitor(new TestLibraryVisitor()); Assert.AreEqual(1, mockGenerator.Visitors.Count); } + + [Test] + public void CanRemoveVisitorByType() + { + var mockGenerator = new TestGenerator(); + mockGenerator.AddVisitor(new TestLibraryVisitor()); + Assert.AreEqual(1, mockGenerator.Visitors.Count); + + mockGenerator.RemoveVisitor(); + Assert.AreEqual(0, mockGenerator.Visitors.Count); + } + + [Test] + public void RemoveVisitorDoesNothingWhenTypeNotFound() + { + var mockGenerator = new TestGenerator(); + mockGenerator.AddVisitor(new TestLibraryVisitor()); + Assert.AreEqual(1, mockGenerator.Visitors.Count); + + mockGenerator.RemoveVisitor(); + Assert.AreEqual(1, mockGenerator.Visitors.Count); + } + + [Test] + public void RemoveVisitorRemovesAllMatchingInstances() + { + var mockGenerator = new TestGenerator(); + mockGenerator.AddVisitor(new TestLibraryVisitor()); + mockGenerator.AddVisitor(new TestLibraryVisitor()); + mockGenerator.AddVisitor(new DerivedTestLibraryVisitor()); + Assert.AreEqual(3, mockGenerator.Visitors.Count); + + mockGenerator.RemoveVisitor(); + Assert.AreEqual(1, mockGenerator.Visitors.Count); + Assert.IsInstanceOf(mockGenerator.Visitors[0]); + } + + [Test] + public void RemoveVisitorDoesNotRemoveDerivedType() + { + var mockGenerator = new TestGenerator(); + mockGenerator.AddVisitor(new DerivedTestLibraryVisitor()); + Assert.AreEqual(1, mockGenerator.Visitors.Count); + + // Removing by base type should NOT remove derived instances (exact type matching) + mockGenerator.RemoveVisitor(); + Assert.AreEqual(1, mockGenerator.Visitors.Count); + } + + [Test] + public void CanRemoveVisitorByName() + { + var mockGenerator = new TestGenerator(); + mockGenerator.AddVisitor(new TestLibraryVisitor()); + Assert.AreEqual(1, mockGenerator.Visitors.Count); + + mockGenerator.RemoveVisitor(nameof(TestLibraryVisitor)); + Assert.AreEqual(0, mockGenerator.Visitors.Count); + } + + [Test] + public void RemoveVisitorByNameDoesNothingWhenNameNotFound() + { + var mockGenerator = new TestGenerator(); + mockGenerator.AddVisitor(new TestLibraryVisitor()); + Assert.AreEqual(1, mockGenerator.Visitors.Count); + + mockGenerator.RemoveVisitor("NonExistentVisitor"); + Assert.AreEqual(1, mockGenerator.Visitors.Count); + } + + [Test] + public void RemoveVisitorByNameRemovesAllMatchingInstances() + { + var mockGenerator = new TestGenerator(); + mockGenerator.AddVisitor(new TestLibraryVisitor()); + mockGenerator.AddVisitor(new TestLibraryVisitor()); + mockGenerator.AddVisitor(new DerivedTestLibraryVisitor()); + Assert.AreEqual(3, mockGenerator.Visitors.Count); + + mockGenerator.RemoveVisitor(nameof(TestLibraryVisitor)); + Assert.AreEqual(1, mockGenerator.Visitors.Count); + Assert.IsInstanceOf(mockGenerator.Visitors[0]); + } + + private class DerivedTestLibraryVisitor : TestLibraryVisitor { } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/OutputLibraryVisitorTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/OutputLibraryVisitorTests.cs index 112ac130410..1acaba45bb6 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/OutputLibraryVisitorTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/OutputLibraryVisitorTests.cs @@ -225,6 +225,52 @@ public async Task MatchingMethodSignatureIsFilteredAfterVisitorMutation() Assert.AreEqual(0, typeProvider.Methods.Count); } + [Test] + public async Task MethodIsNotFilteredWhenVisitorChangesSignature() + { + // Use a type provider subclass with mutable BuildMethods to avoid setting + // the TypeProvider._methods cache directly (which would bypass EnsureBuilt's + // new code path that calls BuildMethods without filtering). + var typeProvider = new MutableMethodsTypeProvider(); + var methodProvider = new MethodProvider( + new MethodSignature("TestMethod", $"", MethodSignatureModifiers.Public, null, $"", + [new ParameterProvider("param1", $"", typeof(int))]), + Snippet.Throw(Snippet.Null), typeProvider); + typeProvider.MethodProviders = [methodProvider]; + + var generator = await MockHelpers.LoadMockGeneratorAsync( + createOutputLibrary: () => new TestOutputLibrary(typeProvider), + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + // Reset to reinitialize CustomCodeView now that the mock generator is set up + typeProvider.Update(reset: true); + + // Step 1: Build all types (simulating CSharpGen.ExecuteAsync) + // EnsureBuilt bypasses customization filtering, so the method is preserved + foreach (var type in generator.Object.OutputLibrary.TypeProviders) + { + type.EnsureBuilt(); + } + + // Verify that the custom code is correctly loaded and the method is present + Assert.IsNotNull(typeProvider.CustomCodeView, "CustomCodeView should not be null"); + Assert.AreEqual(1, typeProvider.Methods.Count, "Method should be present after EnsureBuilt"); + + // Step 2: Visitor changes the parameter type from int to float, + // so it no longer matches the custom code + var visitor = new ChangeParameterTypeVisitor("TestMethod", typeof(float)); + visitor.VisitLibrary(generator.Object.OutputLibrary); + + // Step 3: Apply customization filtering after visitor + typeProvider.Update(methods: typeProvider.FilterCustomizedMethods(typeProvider.Methods)); + + // The method should NOT be filtered because the visitor changed its signature + // to no longer match the custom code + Assert.AreEqual(1, typeProvider.Methods.Count); + Assert.AreEqual("TestMethod", typeProvider.Methods[0].Signature.Name); + Assert.AreEqual(typeof(float), typeProvider.Methods[0].Signature.Parameters[0].Type.FrameworkType); + } + [Test] public async Task MatchingConstructorSignatureIsFilteredAfterVisitorMutation() { @@ -246,6 +292,43 @@ public async Task MatchingConstructorSignatureIsFilteredAfterVisitorMutation() Assert.AreEqual(0, typeProvider.Constructors.Count); } + [Test] + public async Task SerializationProviderConstructorIsFilteredWhenMatchingCustomCode() + { + // Create a type provider with a serialization provider + var typeProvider = new TestTypeProvider(); + var serializationProvider = new TestSerializationTypeProvider(); + var constructor = new ConstructorProvider( + new ConstructorSignature(serializationProvider.Type, $"", MethodSignatureModifiers.Public, [new ParameterProvider("param1", $"", typeof(string))]), + Snippet.Throw(Snippet.Null), serializationProvider); + serializationProvider.ConstructorProviders = [constructor]; + typeProvider.Update(serializations: [serializationProvider], reset: true); + + var generator = await MockHelpers.LoadMockGeneratorAsync( + createOutputLibrary: () => new TestOutputLibrary(typeProvider), + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + // Reset to reinitialize CustomCodeView now that the mock generator is set up + serializationProvider.Update(reset: true); + + // Build all types (simulating CSharpGen.ExecuteAsync) — EnsureBuilt bypasses + // customization filtering so the constructor is preserved. + foreach (var type in generator.Object.OutputLibrary.TypeProviders) + { + type.EnsureBuilt(); + } + + // Verify serialization provider constructor is present after EnsureBuilt + Assert.IsNotNull(serializationProvider.CustomCodeView, "CustomCodeView should not be null"); + Assert.AreEqual(1, serializationProvider.Constructors.Count, "Serialization provider should have 1 constructor before filtering"); + + // Apply filtering through the real pipeline + CSharpGen.FilterAllCustomizedMembers(generator.Object.OutputLibrary); + + // The constructor should be filtered out because it matches custom code + Assert.AreEqual(0, serializationProvider.Constructors.Count, "Serialization provider constructor should be filtered when matching custom code"); + } + [Test] public async Task MatchingPropertyIsFilteredAfterVisitorMutation() { @@ -406,5 +489,31 @@ private class MethodVisitor : LibraryVisitor return base.VisitMethod(method); } } + + /// + /// A TypeProvider subclass that allows setting methods after construction via BuildMethods, + /// which avoids writing to the TypeProvider._methods cache directly. + /// This is needed for tests that exercise EnsureBuilt's code path. + /// + private class MutableMethodsTypeProvider : TypeProvider + { + public MethodProvider[] MethodProviders { get; set; } = []; + protected override string BuildRelativeFilePath() => $"{Name}.cs"; + protected override string BuildName() => "TestName"; + protected override string BuildNamespace() => "Test"; + protected internal override MethodProvider[] BuildMethods() => MethodProviders; + } + + /// + /// A TypeProvider subclass that simulates a serialization provider with configurable constructors. + /// + private class TestSerializationTypeProvider : TypeProvider + { + public ConstructorProvider[] ConstructorProviders { get; set; } = []; + protected override string BuildRelativeFilePath() => $"{Name}.cs"; + protected override string BuildName() => "TestSerializationProvider"; + protected override string BuildNamespace() => "Test"; + protected internal override ConstructorProvider[] BuildConstructors() => ConstructorProviders; + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Primitives/NewProjectScaffoldingTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Primitives/NewProjectScaffoldingTests.cs new file mode 100644 index 00000000000..571c5474397 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Primitives/NewProjectScaffoldingTests.cs @@ -0,0 +1,134 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.IO; +using System.Threading.Tasks; +using Microsoft.TypeSpec.Generator.Primitives; +using NUnit.Framework; + +namespace Microsoft.TypeSpec.Generator.Tests.Primitives +{ + internal class NewProjectScaffoldingTests + { + private string _outputDir = null!; + + [SetUp] + public void SetUp() + { + _outputDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); + Directory.CreateDirectory(_outputDir); + Directory.CreateDirectory(Path.Combine(_outputDir, "src")); + + MockHelpers.LoadMockGenerator( + outputPath: _outputDir, + configuration: "{\"package-name\": \"TestPackage\"}"); + } + + [TearDown] + public void TearDown() + { + if (Directory.Exists(_outputDir)) + { + Directory.Delete(_outputDir, true); + } + } + + [Test] + public async Task Execute_WritesSlnxAndCsprojFiles() + { + var scaffolding = new NewProjectScaffolding(); + var result = await scaffolding.Execute(); + + Assert.IsTrue(result); + Assert.IsTrue(File.Exists(Path.Combine(_outputDir, "TestPackage.slnx"))); + Assert.IsTrue(File.Exists(Path.Combine(_outputDir, "src", "TestPackage.csproj"))); + } + + [Test] + public async Task Execute_CleansUpOldSlnFiles() + { + // Create old .sln file + var oldSlnPath = Path.Combine(_outputDir, "OldProject.sln"); + await File.WriteAllTextAsync(oldSlnPath, "old content"); + + var scaffolding = new NewProjectScaffolding(); + await scaffolding.Execute(); + + Assert.IsFalse(File.Exists(oldSlnPath)); + } + + [Test] + public async Task Execute_CleansUpOldSlnxFiles() + { + // Create old .slnx file + var oldSlnxPath = Path.Combine(_outputDir, "OldProject.slnx"); + await File.WriteAllTextAsync(oldSlnxPath, "old content"); + + var scaffolding = new NewProjectScaffolding(); + await scaffolding.Execute(); + + Assert.IsFalse(File.Exists(oldSlnxPath)); + } + + [Test] + public async Task Execute_SlnxUsesForwardSlashes() + { + var scaffolding = new NewProjectScaffolding(); + await scaffolding.Execute(); + + var slnxPath = Path.Combine(_outputDir, "TestPackage.slnx"); + var content = await File.ReadAllTextAsync(slnxPath); + Assert.That(content, Does.Contain("src/TestPackage.csproj")); + Assert.That(content, Does.Not.Contain("src\\TestPackage.csproj")); + } + + [Test] + public async Task Execute_CallsWriteAdditionalFiles() + { + var scaffolding = new TestScaffolding(); + var result = await scaffolding.Execute(); + + Assert.IsTrue(result); + Assert.IsTrue(scaffolding.WriteAdditionalFilesCalled); + } + + [Test] + public async Task WriteAdditionalFiles_CanEmitCustomFiles() + { + var ciYmlPath = Path.Combine(_outputDir, "ci.yml"); + var scaffolding = new FileWritingScaffolding(ciYmlPath, "name: CI"); + await scaffolding.Execute(); + + Assert.IsTrue(File.Exists(ciYmlPath)); + Assert.AreEqual("name: CI", await File.ReadAllTextAsync(ciYmlPath)); + } + + private class TestScaffolding : NewProjectScaffolding + { + public bool WriteAdditionalFilesCalled { get; private set; } + + protected override Task WriteAdditionalFiles() + { + WriteAdditionalFilesCalled = true; + return Task.CompletedTask; + } + } + + private class FileWritingScaffolding : NewProjectScaffolding + { + private readonly string _filePath; + private readonly string _content; + + public FileWritingScaffolding(string filePath, string content) + { + _filePath = filePath; + _content = content; + } + + protected override async Task WriteAdditionalFiles() + { + await File.WriteAllTextAsync(_filePath, _content); + } + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ArgumentTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ArgumentTests.cs index 05055d25ba1..222522530a6 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ArgumentTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ArgumentTests.cs @@ -59,6 +59,71 @@ public void NotNullOrEmptyStringThrowsOnEmpty() Assert.Throws(() => Argument.AssertNotNullOrEmpty(string.Empty, "value")); } + [Test] + public void NotNullOrWhiteSpace() + { + string value = "test"; + Argument.AssertNotNullOrWhiteSpace(value, "value"); + } + + [Test] + public void NotNullOrWhiteSpaceThrowsOnNull() + { + string? value = null; + Assert.Throws(() => Argument.AssertNotNullOrWhiteSpace(value, "value")); + } + + [Test] + public void NotNullOrWhiteSpaceThrowsOnWhiteSpace() + { + Assert.Throws(() => Argument.AssertNotNullOrWhiteSpace(" ", "value")); + } + + [Test] + public void NotNullOrWhiteSpaceThrowsOnEmpty() + { + Assert.Throws(() => Argument.AssertNotNullOrWhiteSpace(string.Empty, "value")); + } + + [Test] + public void AssertInRange() + { + Argument.AssertInRange(5, 1, 10, "value"); + } + + [Test] + public void AssertInRangeThrowsWhenBelowMinimum() + { + Assert.Throws(() => Argument.AssertInRange(0, 1, 10, "value")); + } + + [Test] + public void AssertInRangeThrowsWhenAboveMaximum() + { + Assert.Throws(() => Argument.AssertInRange(11, 1, 10, "value")); + } + + [Test] + public void CheckNotNullOrEmpty() + { + string value = "test"; + string result = Argument.CheckNotNullOrEmpty(value, "value"); + Assert.AreEqual("test", result); + } + + [Test] + public void CheckNotNullOrEmptyThrowsOnNull() + { + string? value = null; + Assert.Throws(() => Argument.CheckNotNullOrEmpty(value, "value")); + } + + [Test] + public void CheckNotNullOrEmptyThrowsOnEmpty() + { + Assert.Throws(() => Argument.CheckNotNullOrEmpty(string.Empty, "value")); + } + private readonly struct TestStructure : IEquatable { internal readonly string A; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/CanonicalTypeProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/CanonicalTypeProviderTests.cs index c754dbd6d00..fe92bcb714a 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/CanonicalTypeProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/CanonicalTypeProviderTests.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -54,6 +55,9 @@ public void ValidateNamespace() [Test] public void ValidateProperties() { + // Call EnsureBuilt to simulate the real build pipeline where members are cached + // without customization filtering before the canonical view is accessed. + _typeProvider.EnsureBuilt(); // customization code provides 5 properties: // - public int IntProperty { get; set; } // - public string StringProperty { get; } @@ -67,14 +71,12 @@ public void ValidateProperties() // therefore the CanonicalType should have 6 properties: // - public int IntProperty { get; set; } (from customization code) // - public string StringProperty { get; } (from customization code) + // - public string NullWireInfoProperty { get; set; } (from customization code) + // - public string SpecProperty { get; } (from generated code) // - public string InternalStringProperty { get; } (from customization code) // - public PropertyType PropertyTypeProperty { get; set; } (from customization code) - // - public string SpecProperty { get; } (from generated code) - // - public string NullWireInfoProperty { get; set; } (from customization code) Dictionary properties = _typeProvider.CanonicalView.Properties.ToDictionary(p => p.Name); Assert.AreEqual(6, properties.Count); - // 1 non-customized property - Assert.AreEqual(1, _typeProvider.Properties.Count); Assert.AreEqual(5, _typeProvider.CustomCodeView!.Properties.Count); // Validate the exact order @@ -176,6 +178,10 @@ private void ValidatePropertyAttributes(PropertyProvider expected, PropertyProvi [Test] public void ValidateMethods() { + // Call EnsureBuilt to simulate the real build pipeline where members are cached + // without customization filtering before the canonical view is accessed. + _typeProvider.EnsureBuilt(); + // customization code provides a method: // - public virtual Task Method1(int intParam) // generated code provides three methods: @@ -189,7 +195,6 @@ public void ValidateMethods() var methods = _typeProvider.CanonicalView.Methods; Assert.AreEqual(4, methods.Count); - Assert.AreEqual(2, _typeProvider.Methods.Count); Assert.AreEqual(2, _typeProvider.CustomCodeView!.Methods.Count); // the first should be public virtual Task Method1(string strParam) @@ -228,6 +233,113 @@ public void ValidateMethods() Assert.AreEqual(0, fourth.Parameters.Count); } + [Test] + public void ValidateConstructors() + { + // Call EnsureBuilt to simulate the real build pipeline where members are cached + // without customization filtering before the canonical view is accessed. + _typeProvider.EnsureBuilt(); + + // customization code provides 1 constructor: + // - public TestName(int intParam) + // generated code provides 2 constructors: + // - internal TestName(int intParam) (customized by the NamedSymbol) + // - internal TestName() (not customized) + // therefore the CanonicalType should have 2 constructors: + // - public TestName(int intParam) (from customization code) + // - internal TestName() (from generated code) + var constructors = _typeProvider.CanonicalView.Constructors; + + Assert.AreEqual(2, constructors.Count); + + // the first should be the non-customized parameterless constructor + var first = constructors[0].Signature; + Assert.AreEqual(0, first.Parameters.Count); + Assert.AreEqual(MethodSignatureModifiers.Internal, first.Modifiers); + + // the second should be the custom constructor with int param + var second = constructors[1].Signature; + Assert.AreEqual(1, second.Parameters.Count); + Assert.AreEqual("intParam", second.Parameters[0].Name); + Assert.AreEqual(new CSharpType(typeof(int)), second.Parameters[0].Type); + Assert.AreEqual(MethodSignatureModifiers.Public, second.Modifiers); + } + + [Test] + public void ValidateFields() + { + // Call EnsureBuilt to simulate the real build pipeline where members are cached + // without customization filtering before the canonical view is accessed. + _typeProvider.EnsureBuilt(); + + // customization code provides 4 fields: + // - public int IntField + // - private string StringField + // - internal double DoubleField + // - public static float FloatField + // generated code provides 2 fields: + // - private int IntField (customized by the NamedSymbol) + // - private string GeneratedOnlyField (not customized) + // therefore the CanonicalType should have 5 fields: + // - private string GeneratedOnlyField (from generated code) + // - public int IntField (from customization code) + // - private string StringField (from customization code) + // - internal double DoubleField (from customization code) + // - public static float FloatField (from customization code) + var fields = _typeProvider.CanonicalView.Fields; + + Assert.AreEqual(5, fields.Count); + var fieldNames = fields.Select(f => f.Name).ToList(); + Assert.Contains("GeneratedOnlyField", fieldNames); + Assert.Contains("IntField", fieldNames); + Assert.Contains("StringField", fieldNames); + Assert.Contains("DoubleField", fieldNames); + Assert.Contains("FloatField", fieldNames); + + // IntField should appear only once (not duplicated) + Assert.AreEqual(1, fields.Count(f => f.Name == "IntField")); + } + + [Test] + public void ValidatePropertiesWithNoSpecProperties() + { + // Call EnsureBuilt to simulate the real build pipeline where members are cached + // without customization filtering before the canonical view is accessed. + var noSpecProvider = new NoSpecTypeProvider(Name, Ns); + noSpecProvider.EnsureBuilt(); + + // customization code provides 5 properties: + // - public int IntProperty { get; set; } + // - public string StringProperty { get; } + // - public string InternalStringProperty { get; } + // - public PropertyType PropertyTypeProperty { get; set; } + // - public string NullWireInfoProperty { get; set; } + // generated code provides 2 properties: + // - public int IntProperty { get; set; } (customized by the NamedSymbol) + // - public string SpecProperty { get; } (not customized) + // therefore the CanonicalType should have 6 properties: + // - public string SpecProperty { get; } (from generated code) + // - public int IntProperty { get; set; } (from customization code) + // - public string StringProperty { get; } (from customization code) + // - public string InternalStringProperty { get; } (from customization code) + // - public PropertyType PropertyTypeProperty { get; set; } (from customization code) + // - public string NullWireInfoProperty { get; set; } (from customization code) + var properties = noSpecProvider.CanonicalView.Properties; + + Assert.AreEqual(6, properties.Count); + + // IntProperty should appear only once (not duplicated) + Assert.AreEqual(1, properties.Count(p => p.Name == "IntProperty")); + + var propertyNames = properties.Select(p => p.Name).ToList(); + Assert.Contains("SpecProperty", propertyNames); + Assert.Contains("IntProperty", propertyNames); + Assert.Contains("StringProperty", propertyNames); + Assert.Contains("InternalStringProperty", propertyNames); + Assert.Contains("PropertyTypeProperty", propertyNames); + Assert.Contains("NullWireInfoProperty", propertyNames); + } + [Test] public async Task TestPropertyDocs() { @@ -314,6 +426,62 @@ protected internal override MethodProvider[] BuildMethods() this), ]; } + + protected internal override ConstructorProvider[] BuildConstructors() + { + var intParam = new ParameterProvider("intParam", $"intParam", typeof(int)); + return + [ + // customized by the NamedSymbol + new ConstructorProvider( + new ConstructorSignature(Type, $"Generated constructor", MethodSignatureModifiers.Internal, [intParam]), + Throw(Null), + this), + // not customized by the NamedSymbol + new ConstructorProvider( + new ConstructorSignature(Type, $"Not customized constructor", MethodSignatureModifiers.Internal, []), + Throw(Null), + this), + ]; + } + + protected internal override FieldProvider[] BuildFields() + { + return + [ + // customized by the NamedSymbol + new FieldProvider(FieldModifiers.Private, typeof(int), "IntField", this, $"Generated IntField"), + // not customized by the NamedSymbol + new FieldProvider(FieldModifiers.Private, typeof(string), "GeneratedOnlyField", this, $"Generated only field"), + ]; + } + } + + private class NoSpecTypeProvider : TypeProvider + { + private readonly string _name; + private readonly string _namespace; + public NoSpecTypeProvider(string name, string ns) + : base(InputFactory.Model(name, ns, properties: [])) + { + _name = name; + _namespace = ns; + } + + protected override string BuildRelativeFilePath() => "NamedSymbol"; + protected override string BuildName() => _name; + protected override string BuildNamespace() => _namespace; + + protected internal override PropertyProvider[] BuildProperties() + { + return + [ + // customized by the NamedSymbol + new PropertyProvider($"Int property", MethodSignatureModifiers.Public, typeof(int), "IntProperty", new AutoPropertyBody(true), this), + // not customized by the NamedSymbol + new PropertyProvider($"Spec property", MethodSignatureModifiers.Public, typeof(string), "SpecProperty", new AutoPropertyBody(false), this), + ]; + } } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/ApiVersionEnumProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/ApiVersionEnumProviderTests.cs index 548e71f06a2..a26619bceb3 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/ApiVersionEnumProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/ApiVersionEnumProviderTests.cs @@ -3,6 +3,7 @@ using System.Linq; using Microsoft.TypeSpec.Generator.Input; +using Microsoft.TypeSpec.Generator.Primitives; using Microsoft.TypeSpec.Generator.Providers; using Microsoft.TypeSpec.Generator.Tests.Common; using NUnit.Framework; @@ -178,9 +179,9 @@ public void MultiServiceClient_WithMultipleApiVersionEnums_GeneratesCorrectEnumN Assert.IsTrue(storageEnumType is ApiVersionEnumProvider); var storageProvider = (ApiVersionEnumProvider)storageEnumType; - // Verify enum names follow the multiservice naming pattern: Service{ServiceName}Version - Assert.AreEqual("ServiceKeyVaultVersion", keyVaultProvider.Name); - Assert.AreEqual("ServiceStorageVersion", storageProvider.Name); + // Verify enum names use BuildNameForService when there are no collisions + Assert.AreEqual("KeyVaultServiceVersion", keyVaultProvider.Name); + Assert.AreEqual("StorageServiceVersion", storageProvider.Name); } [Test] @@ -211,5 +212,53 @@ public void MultiServiceClient_WithOneApiVersionEnums_GeneratesCorrectEnumNames( // Verify enum names follow the multiservice naming pattern: Service{ServiceName}Version Assert.AreEqual("ServiceVersion", keyVaultProvider.Name); } + + [Test] + public void MultiServiceClient_WithCollidingLastSegments_UsesShortestUniquePrefix() + { + // When two services have different full namespaces but the same last segment, + // the shortest unique namespace suffix should be used to avoid collisions. + var serviceOneEnum = InputFactory.StringEnum( + "ServiceOneVersion", + [("1.0", "1.0"), ("2.0", "2.0")], + usage: InputModelTypeUsage.ApiVersionEnum, + clientNamespace: "Azure.ServiceOne.Tests"); + var serviceTwoEnum = InputFactory.StringEnum( + "ServiceTwoVersion", + [("3.0", "3.0"), ("4.0", "4.0")], + usage: InputModelTypeUsage.ApiVersionEnum, + clientNamespace: "Azure.ServiceTwo.Tests"); + + var client = InputFactory.Client("TestClient", isMultiServiceClient: true); + + MockHelpers.LoadMockGenerator( + inputEnumTypes: [serviceOneEnum, serviceTwoEnum], + inputClients: [client]); + + var mockDeclaringType = new Mock(); + mockDeclaringType.Protected().Setup("BuildName").Returns("TestClientOptions"); + mockDeclaringType.Protected().Setup("BuildNamespace").Returns("Azure"); + + var serviceOneEnumType = EnumProvider.Create(serviceOneEnum, mockDeclaringType.Object); + Assert.IsTrue(serviceOneEnumType is ApiVersionEnumProvider); + var serviceOneProvider = (ApiVersionEnumProvider)serviceOneEnumType; + + var serviceTwoEnumType = EnumProvider.Create(serviceTwoEnum, mockDeclaringType.Object); + Assert.IsTrue(serviceTwoEnumType is ApiVersionEnumProvider); + var serviceTwoProvider = (ApiVersionEnumProvider)serviceTwoEnumType; + + // Verify enum names use the shortest unique namespace suffix (2 segments: ServiceOne.Tests) + Assert.AreEqual("ServiceOneTestsVersion", serviceOneProvider.Name); + Assert.AreEqual("ServiceTwoTestsVersion", serviceTwoProvider.Name); + + // Validate generated output + var writerOne = new TypeProviderWriter(serviceOneProvider); + var fileOne = writerOne.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile("ServiceOne"), fileOne.Content); + + var writerTwo = new TypeProviderWriter(serviceTwoProvider); + var fileTwo = writerTwo.Write(); + Assert.AreEqual(Helpers.GetExpectedFromFile("ServiceTwo"), fileTwo.Content); + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs index b12df97b8cf..218995d1677 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. using System.Linq; +using System.Threading.Tasks; using Microsoft.TypeSpec.Generator.Expressions; using Microsoft.TypeSpec.Generator.Input; using Microsoft.TypeSpec.Generator.Utilities; @@ -364,6 +365,139 @@ public void InternalModelsAreNotIncludedInAdditionalRootTypes() Assert.IsFalse(rootTypes.Contains("Sample.Models.StringEnum")); } + // Validates that int enum member order is preserved from the last contract when values are reordered + [Test] + public async Task BackCompat_IntEnumOrderPreserved() + { + await MockHelpers.LoadMockGeneratorAsync( + createCSharpTypeCore: (inputType) => typeof(int), + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + // Current input has values in DIFFERENT order than last contract (Default first, Recover second) + var input = InputFactory.Int32Enum("mockInputEnum", [ + ("Default", 0), + ("Recover", 1), + ]); + + var enumType = EnumProvider.Create(input); + Assert.IsFalse(enumType is ApiVersionEnumProvider); + + // Simulate the back-compat processing that CSharpGen performs after visitors + enumType.EnsureBuilt(); + enumType.ProcessTypeForBackCompatibility(); + + var fields = enumType.Fields; + Assert.AreEqual(2, fields.Count); + + // Order should be preserved from last contract: Recover first, Default second + Assert.AreEqual("Recover", fields[0].Name); + Assert.AreEqual("Default", fields[1].Name); + + // No explicit initialization values - compiler auto-assigns based on order + Assert.IsNull(fields[0].InitializationValue); + Assert.IsNull(fields[1].InitializationValue); + } + + // Validates that int enum member order is preserved and new values are appended + [Test] + public async Task BackCompat_IntEnumNewValueAppended() + { + await MockHelpers.LoadMockGeneratorAsync( + createCSharpTypeCore: (inputType) => typeof(int), + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + // Current input has different order AND a new value + var input = InputFactory.Int32Enum("mockInputEnum", [ + ("Default", 0), + ("Recover", 1), + ("Third", 2), + ]); + + var enumType = EnumProvider.Create(input); + Assert.IsFalse(enumType is ApiVersionEnumProvider); + + // Simulate the back-compat processing that CSharpGen performs after visitors + enumType.EnsureBuilt(); + enumType.ProcessTypeForBackCompatibility(); + + var fields = enumType.Fields; + Assert.AreEqual(3, fields.Count); + + // Order should be preserved from last contract: Recover first, Default second, new value Third appended + Assert.AreEqual("Recover", fields[0].Name); + Assert.AreEqual("Default", fields[1].Name); + Assert.AreEqual("Third", fields[2].Name); + + // No explicit initialization values for reordered members - compiler auto-assigns based on order + Assert.IsNull(fields[0].InitializationValue); + Assert.IsNull(fields[1].InitializationValue); + // New value keeps its initialization value from the input + var value3 = fields[2].InitializationValue as LiteralExpression; + Assert.IsNotNull(value3); + Assert.AreEqual(2, value3?.Literal); + } + + // Validates that removed enum values from last contract are not included + [Test] + public async Task BackCompat_IntEnumValueRemoved() + { + await MockHelpers.LoadMockGeneratorAsync( + createCSharpTypeCore: (inputType) => typeof(int), + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + // Current input has values in different order and removed "Third" + var input = InputFactory.Int32Enum("mockInputEnum", [ + ("Default", 0), + ("Recover", 1), + ]); + + var enumType = EnumProvider.Create(input); + Assert.IsFalse(enumType is ApiVersionEnumProvider); + + // Simulate the back-compat processing that CSharpGen performs after visitors + enumType.EnsureBuilt(); + enumType.ProcessTypeForBackCompatibility(); + + var fields = enumType.Fields; + Assert.AreEqual(2, fields.Count); + + // Order should be preserved from last contract for members that still exist + Assert.AreEqual("Recover", fields[0].Name); + Assert.AreEqual("Default", fields[1].Name); + + // No explicit initialization values - compiler auto-assigns based on order + Assert.IsNull(fields[0].InitializationValue); + Assert.IsNull(fields[1].InitializationValue); + } + + // Validates that string enum order is also preserved from last contract + [Test] + public async Task BackCompat_StringEnumOrderPreserved() + { + await MockHelpers.LoadMockGeneratorAsync( + createCSharpTypeCore: (inputType) => typeof(string), + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + // Current input has values in DIFFERENT order than last contract + var input = InputFactory.StringEnum("mockInputEnum", [ + ("Default", "default"), + ("Recover", "recover"), + ]); + + var enumType = EnumProvider.Create(input); + + // Simulate the back-compat processing that CSharpGen performs after visitors + enumType.EnsureBuilt(); + enumType.ProcessTypeForBackCompatibility(); + + var fields = enumType.Fields; + Assert.AreEqual(2, fields.Count); + + // Order should be preserved from last contract: Recover first, Default second + Assert.AreEqual("Recover", fields[0].Name); + Assert.AreEqual("Default", fields[1].Name); + } + private static void ValidateGetHashCodeMethod(EnumProvider enumType) { var getHashCodeMethod = enumType.Methods.Single(m => m.Signature.Name == "GetHashCode"); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/ApiVersionEnumProviderTests/MultiServiceClient_WithCollidingLastSegments_UsesShortestUniquePrefix(ServiceOne).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/ApiVersionEnumProviderTests/MultiServiceClient_WithCollidingLastSegments_UsesShortestUniquePrefix(ServiceOne).cs new file mode 100644 index 00000000000..574d744733f --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/ApiVersionEnumProviderTests/MultiServiceClient_WithCollidingLastSegments_UsesShortestUniquePrefix(ServiceOne).cs @@ -0,0 +1,12 @@ +// + +#nullable disable + +namespace Azure.ServiceOne.Tests +{ + public enum ServiceOneTestsVersion + { + V1_0 = 1, + V2_0 = 2 + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/ApiVersionEnumProviderTests/MultiServiceClient_WithCollidingLastSegments_UsesShortestUniquePrefix(ServiceTwo).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/ApiVersionEnumProviderTests/MultiServiceClient_WithCollidingLastSegments_UsesShortestUniquePrefix(ServiceTwo).cs new file mode 100644 index 00000000000..7c2c401c0ce --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/ApiVersionEnumProviderTests/MultiServiceClient_WithCollidingLastSegments_UsesShortestUniquePrefix(ServiceTwo).cs @@ -0,0 +1,12 @@ +// + +#nullable disable + +namespace Azure.ServiceTwo.Tests +{ + public enum ServiceTwoTestsVersion + { + V3_0 = 1, + V4_0 = 2 + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BackCompat_IntEnumNewValueAppended/MockInputEnum.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BackCompat_IntEnumNewValueAppended/MockInputEnum.cs new file mode 100644 index 00000000000..1c6a58d2c47 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BackCompat_IntEnumNewValueAppended/MockInputEnum.cs @@ -0,0 +1,10 @@ +#nullable disable + +namespace Sample.Models +{ + public enum MockInputEnum + { + Recover = 0, + Default = 1, + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BackCompat_IntEnumOrderPreserved/MockInputEnum.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BackCompat_IntEnumOrderPreserved/MockInputEnum.cs new file mode 100644 index 00000000000..1c6a58d2c47 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BackCompat_IntEnumOrderPreserved/MockInputEnum.cs @@ -0,0 +1,10 @@ +#nullable disable + +namespace Sample.Models +{ + public enum MockInputEnum + { + Recover = 0, + Default = 1, + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BackCompat_IntEnumValueRemoved/MockInputEnum.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BackCompat_IntEnumValueRemoved/MockInputEnum.cs new file mode 100644 index 00000000000..e93e6f85a4a --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BackCompat_IntEnumValueRemoved/MockInputEnum.cs @@ -0,0 +1,11 @@ +#nullable disable + +namespace Sample.Models +{ + public enum MockInputEnum + { + Recover = 0, + Default = 1, + Third = 2, + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BackCompat_StringEnumOrderPreserved/MockInputEnum.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BackCompat_StringEnumOrderPreserved/MockInputEnum.cs new file mode 100644 index 00000000000..eefcc51dd97 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BackCompat_StringEnumOrderPreserved/MockInputEnum.cs @@ -0,0 +1,10 @@ +#nullable disable + +namespace Sample.Models +{ + public enum MockInputEnum + { + Recover, + Default, + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ClientCustomizationTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ClientCustomizationTests.cs index 39c14090e4f..b8ac1479a4d 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ClientCustomizationTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ClientCustomizationTests.cs @@ -4,11 +4,13 @@ using System; using System.Linq; using System.Threading.Tasks; +using Microsoft.TypeSpec.Generator.Expressions; using Microsoft.TypeSpec.Generator.Primitives; using Microsoft.TypeSpec.Generator.Providers; using Microsoft.TypeSpec.Generator.Snippets; using Microsoft.TypeSpec.Generator.Tests.Common; using NUnit.Framework; +using static Microsoft.TypeSpec.Generator.Snippets.Snippet; namespace Microsoft.TypeSpec.Generator.Tests.Providers.ModelProviders { @@ -361,6 +363,43 @@ protected override TypeProvider[] BuildTypeProviders() } } + [Test] + public async Task CanRemoveMethodWithGenericTypeConstraintParameter() + { + var client = new ClientTypeProvider(); + var outputLibrary = new ClientOutputLibrary(client); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + createOutputLibrary: () => outputLibrary, + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + // Create a generic type parameter T + var tType = typeof(GenericTemplate<>).GetGenericArguments()[0]; + + var methods = new[] + { + new MethodProvider(new MethodSignature( + "Method1", + $"", + MethodSignatureModifiers.Public, + null, + $"", + [ + new ParameterProvider("param1", $"", tType) + ], + GenericArguments: [tType], + GenericParameterConstraints: [Where.Implements(tType, typeof(IDisposable))]), + Snippet.ThrowExpression(Snippet.Null), client), + }; + client.MethodProviders = methods; + + var csharpGen = new CSharpGen(); + await csharpGen.ExecuteAsync(); + + Assert.AreEqual(0, mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t.Name == "MockInputClient").Methods.Count); + } + + private class GenericTemplate { } + private class ClientTypeProvider : TypeProvider { public MethodProvider[] MethodProviders { get; set; } = []; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelCustomizationTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelCustomizationTests.cs index ae09d2e9a53..556948c476e 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelCustomizationTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelCustomizationTests.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.TypeSpec.Generator.Input; +using Microsoft.TypeSpec.Generator.Input.Extensions; using Microsoft.TypeSpec.Generator.Primitives; using Microsoft.TypeSpec.Generator.Providers; using Microsoft.TypeSpec.Generator.Tests.Common; @@ -1475,6 +1476,69 @@ public async Task CanCustomizeBaseModelWithSpecBase() Assert.AreEqual("CustomBaseProp", modelProvider.BaseTypeProvider.Properties[0].Name); } + [Test] + public async Task CanAddPropertyReferencingGeneratedType() + { + // Create Bar model that will be referenced by the custom property + var barModel = InputFactory.Model("Bar", properties: [ + InputFactory.Property("b", InputPrimitiveType.String) + ], usage: InputModelTypeUsage.Input); + + var inputModel = InputFactory.Model("mockInputModel", properties: [ + InputFactory.Property("Prop1", InputPrimitiveType.String) + ], usage: InputModelTypeUsage.Input); + + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModelTypes: [inputModel, barModel], + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var modelTypeProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t.Name == "MockInputModel"); + AssertCommon(modelTypeProvider, "Sample.Models", "MockInputModel"); + + // Validate that the custom property Bars exists in the canonical view + var barsProperty = modelTypeProvider.CanonicalView.Properties.FirstOrDefault(p => p.Name == "Bars"); + Assert.IsNotNull(barsProperty, "Bars property should exist in canonical view"); + + // Validate that the Bars property has IList type with proper namespace + Assert.IsTrue(barsProperty!.Type.IsList); + var elementType = barsProperty.Type.ElementType; + Assert.AreEqual("Bar", elementType.Name); + Assert.AreEqual("Sample.Models", elementType.Namespace, "Bar type should have proper namespace"); + Assert.IsFalse(string.IsNullOrEmpty(elementType.Namespace), "Element type namespace should not be empty"); + } + + [Test] + public async Task CanAddPropertyReferencingRenamedGeneratedType() + { + // Create Bar model that will be renamed to RenamedBar via CodeGenType + var barModel = InputFactory.Model("Bar", properties: [ + InputFactory.Property("b", InputPrimitiveType.String) + ], usage: InputModelTypeUsage.Input); + + var inputModel = InputFactory.Model("mockInputModel", properties: [ + InputFactory.Property("Prop1", InputPrimitiveType.String) + ], usage: InputModelTypeUsage.Input); + + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModelTypes: [inputModel, barModel], + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var modelTypeProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t.Name == "MockInputModel"); + AssertCommon(modelTypeProvider, "Sample.Models", "MockInputModel"); + + // Validate that the custom property RenamedBars exists in the canonical view + var renamedBarsProperty = modelTypeProvider.CanonicalView.Properties.FirstOrDefault(p => p.Name == "RenamedBars"); + Assert.IsNotNull(renamedBarsProperty, "RenamedBars property should exist in canonical view"); + + // Validate that the RenamedBars property has IList type with proper namespace + // Even though Bar is the TypeSpec name, the C# code uses RenamedBar + Assert.IsTrue(renamedBarsProperty!.Type.IsList); + var elementType = renamedBarsProperty.Type.ElementType; + Assert.AreEqual("RenamedBar", elementType.Name); + Assert.AreEqual("Sample.Models", elementType.Namespace, "RenamedBar type should have proper namespace"); + Assert.IsFalse(string.IsNullOrEmpty(elementType.Namespace), "Element type namespace should not be empty"); + } + private class NameSpaceVisitor : LibraryVisitor { protected override TypeProvider? VisitType(TypeProvider type) @@ -1507,6 +1571,133 @@ private class TestNamespaceVisitor : NameSpaceVisitor } } + [Test] + public async Task CanCustomizeBaseModelToRenamedGeneratedModel() + { + // This test verifies that when a base model is renamed (e.g., by a library visitor), + // a child model whose custom code inherits from the renamed name correctly resolves the base type. + // The base model is NOT defined in custom code, so Roslyn cannot resolve the namespace. + var baseModel = InputFactory.Model( + "baseModel", + properties: [InputFactory.Property("baseProp", InputPrimitiveType.String)], + usage: InputModelTypeUsage.Json); + var childModel = InputFactory.Model( + "mockInputModel", + properties: [InputFactory.Property("childProp", InputPrimitiveType.String)], + usage: InputModelTypeUsage.Json); + + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModelTypes: [childModel, baseModel], + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + // Simulate a visitor renaming the base model (e.g., adding a "Resource" suffix) + mockGenerator.Object.AddVisitor(new BaseModelRenameVisitor("BaseModel", "RenamedBaseModel")); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t.Name == "MockInputModel") as ModelProvider; + + Assert.IsNotNull(modelProvider); + Assert.IsNotNull(modelProvider!.BaseModelProvider); + Assert.IsNotNull(modelProvider.BaseType); + Assert.AreEqual("RenamedBaseModel", modelProvider.BaseType!.Name); + Assert.AreEqual("Sample.Models", modelProvider.BaseType!.Namespace); + Assert.AreEqual(1, modelProvider.BaseModelProvider!.Properties.Count); + Assert.AreEqual("BaseProp", modelProvider.BaseModelProvider.Properties[0].Name); + } + + private class BaseModelRenameVisitor : LibraryVisitor + { + private readonly string _originalName; + private readonly string _newName; + + public BaseModelRenameVisitor(string originalName, string newName) + { + _originalName = originalName; + _newName = newName; + } + + protected internal override ModelProvider? PreVisitModel(InputModelType model, ModelProvider? type) + { + if (type != null && model.Name.ToIdentifierName() == _originalName) + { + type.Update(name: _newName); + } + return type; + } + } + + [Test] + public async Task CanCustomizeBaseModelToExternalType() + { + // This test verifies that a model can be customized to inherit from an external base type + // that is not generated during the current generation run (e.g., from another assembly) + var childModel = InputFactory.Model( + "mockInputModel", + properties: [InputFactory.Property("childProp", InputPrimitiveType.String)], + usage: InputModelTypeUsage.Json); + + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModelTypes: [childModel], + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t.Name == "MockInputModel") as ModelProvider; + + // Should have customized base type from external assembly + Assert.IsNotNull(modelProvider); + Assert.IsNotNull(modelProvider!.BaseType); + Assert.IsNotNull(modelProvider.BaseTypeProvider); + Assert.AreEqual("ExternalBaseModel", modelProvider.BaseType!.Name); + Assert.AreEqual("Sample.Models", modelProvider.BaseType!.Namespace); + + // The BaseModelProvider should be null since the base is not a generated model + Assert.IsNull(modelProvider.BaseModelProvider); + + // BaseTypeProvider should be NamedTypeSymbolProvider because ExternalBaseModel + // is defined in the same file and will be found in the customization compilation + Assert.IsInstanceOf(modelProvider.BaseTypeProvider, + "ExternalBaseModel is in the customization compilation and should use NamedTypeSymbolProvider"); + + // It should have the properties from the symbol + // ExternalBaseModel has 2 properties: ExternalProperty and ExternalDictionary + Assert.AreEqual(2, modelProvider.BaseTypeProvider!.Properties.Count, + "ExternalBaseModel should have ExternalProperty and ExternalDictionary"); + var externalPropertyNames = modelProvider.BaseTypeProvider.Properties.Select(p => p.Name).ToList(); + Assert.Contains("ExternalProperty", externalPropertyNames); + Assert.Contains("ExternalDictionary", externalPropertyNames); + } + + [Test] + public async Task CanCustomizeBaseModelToSystemType() + { + // This test verifies that a model can be customized to inherit from a system type + // (e.g., System.Exception) which simulates inheriting from types like + // Azure.ResourceManager.TrackedResourceData that are from referenced assemblies. + var childModel = InputFactory.Model( + "mockInputModel", + properties: [InputFactory.Property("childProp", InputPrimitiveType.String)], + usage: InputModelTypeUsage.Json); + + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModelTypes: [childModel], + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + + var modelProvider = mockGenerator.Object.OutputLibrary.TypeProviders.Single(t => t.Name == "MockInputModel") as ModelProvider; + + // Should have customized base type from system library + Assert.IsNotNull(modelProvider); + Assert.IsNotNull(modelProvider!.BaseType); + Assert.IsNotNull(modelProvider.BaseTypeProvider); + Assert.AreEqual("Exception", modelProvider.BaseType!.Name); + Assert.AreEqual("System", modelProvider.BaseType!.Namespace); + + // The BaseModelProvider should be null since the base is not a generated model + Assert.IsNull(modelProvider.BaseModelProvider); + + // System types from referenced assemblies are NOT found by FindForTypeInCustomization + // (which only searches the customization assembly, not references), so they use SystemObjectTypeProvider + Assert.IsInstanceOf(modelProvider.BaseTypeProvider, + "System.Exception is from a referenced assembly and should use SystemObjectTypeProvider"); + } + private class TestNameVisitor : NameVisitor { public TypeProvider? InvokeVisit(TypeProvider type) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ClientCustomizationTests/CanRemoveMethodWithGenericTypeConstraintParameter/MockInputClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ClientCustomizationTests/CanRemoveMethodWithGenericTypeConstraintParameter/MockInputClient.cs new file mode 100644 index 00000000000..509a4348149 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ClientCustomizationTests/CanRemoveMethodWithGenericTypeConstraintParameter/MockInputClient.cs @@ -0,0 +1,10 @@ +using System; +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample +{ + [CodeGenSuppress("Method1", typeof(IDisposable))] + public partial class MockInputClient + { + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanAddPropertyReferencingGeneratedType/MockInputModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanAddPropertyReferencingGeneratedType/MockInputModel.cs new file mode 100644 index 00000000000..ff0ffe6bcd3 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanAddPropertyReferencingGeneratedType/MockInputModel.cs @@ -0,0 +1,10 @@ +#nullable disable + +using System.Collections.Generic; + +namespace Sample.Models; + +internal partial class MockInputModel +{ + public IList Bars { get; } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanAddPropertyReferencingRenamedGeneratedType/Bar.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanAddPropertyReferencingRenamedGeneratedType/Bar.cs new file mode 100644 index 00000000000..d5b5e7ed4d7 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanAddPropertyReferencingRenamedGeneratedType/Bar.cs @@ -0,0 +1,11 @@ +#nullable disable + +using SampleTypeSpec; +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample.Models; + +[CodeGenType("Bar")] +internal partial class RenamedBar +{ +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanAddPropertyReferencingRenamedGeneratedType/MockInputModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanAddPropertyReferencingRenamedGeneratedType/MockInputModel.cs new file mode 100644 index 00000000000..76d32498477 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanAddPropertyReferencingRenamedGeneratedType/MockInputModel.cs @@ -0,0 +1,10 @@ +#nullable disable + +using System.Collections.Generic; + +namespace Sample.Models; + +internal partial class MockInputModel +{ + public IList RenamedBars { get; } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanCustomizeBaseModelToExternalType/MockInputModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanCustomizeBaseModelToExternalType/MockInputModel.cs new file mode 100644 index 00000000000..052967e40d0 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanCustomizeBaseModelToExternalType/MockInputModel.cs @@ -0,0 +1,19 @@ +#nullable disable + +using Sample.Models; +using System.Collections.Generic; + +namespace Sample.Models +{ + public partial class MockInputModel : ExternalBaseModel + { + } + + // This simulates an external base type from another assembly/namespace + // that is not generated by the current generation run + public class ExternalBaseModel + { + public string ExternalProperty { get; set; } + public IDictionary ExternalDictionary { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanCustomizeBaseModelToRenamedGeneratedModel/MockInputModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanCustomizeBaseModelToRenamedGeneratedModel/MockInputModel.cs new file mode 100644 index 00000000000..8adbb6e2bac --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanCustomizeBaseModelToRenamedGeneratedModel/MockInputModel.cs @@ -0,0 +1,7 @@ +#nullable disable + +namespace Sample.Models; + +internal partial class MockInputModel : RenamedBaseModel +{ +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanCustomizeBaseModelToSystemType/MockInputModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanCustomizeBaseModelToSystemType/MockInputModel.cs new file mode 100644 index 00000000000..c1069c7824d --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanCustomizeBaseModelToSystemType/MockInputModel.cs @@ -0,0 +1,13 @@ +#nullable disable + +using System; + +namespace Sample.Models +{ + // This test case shows a model inheriting from a system type (System.Exception). + // This simulates inheriting from types like Azure.ResourceManager.TrackedResourceData + // which are from referenced assemblies. + public partial class MockInputModel : Exception + { + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/PropertyProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/PropertyProviderTests.cs index a8abb739b69..cb95a6cb497 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/PropertyProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/PropertyProviderTests.cs @@ -129,6 +129,17 @@ public void TestSpecialWords() Assert.AreEqual(inputPropertyName.ToIdentifierName() + "Property", property.Name); } + [Test] + public void TestPropertyNameConflictsWithTypeNameAfterPascalCase() + { + var testTypeProvider = new TestTypeProvider(name: "Filter"); + InputModelProperty inputModelProperty = InputFactory.Property("filter", InputPrimitiveType.String); + InputFactory.Model("Filter", properties: [inputModelProperty]); + + var property = new PropertyProvider(inputModelProperty, testTypeProvider); + Assert.AreEqual("FilterProperty", property.Name); + } + [Test] public void CanUpdatePropertyProvider() { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/TypeProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/TypeProviderTests.cs index 840e932d8aa..055470c5527 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/TypeProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/TypeProviderTests.cs @@ -249,6 +249,36 @@ public void TestCanUpdateAttributes() Assert.AreEqual(new CSharpType(typeof(ObsoleteAttribute)), typeProvider.Attributes[0].Type); } + [Test] + public void CanUpdateImplements() + { + var typeProvider = new TestTypeProvider(name: "OriginalName"); + Assert.AreEqual(0, typeProvider.Implements.Count); + + // Update with new implements + var implements = new List + { + new CSharpType(typeof(IDisposable)), + new CSharpType(typeof(IEquatable)) + }; + typeProvider.Update(implements: implements); + + Assert.IsNotNull(typeProvider.Implements); + Assert.AreEqual(2, typeProvider.Implements.Count); + Assert.AreEqual(new CSharpType(typeof(IDisposable)), typeProvider.Implements[0]); + Assert.AreEqual(new CSharpType(typeof(IEquatable)), typeProvider.Implements[1]); + + // Reset and validate + typeProvider.Reset(); + Assert.AreEqual(0, typeProvider.Implements.Count); + + // Re-add the implements + typeProvider.Update(implements: [new CSharpType(typeof(IDisposable))]); + + Assert.AreEqual(1, typeProvider.Implements.Count); + Assert.AreEqual(new CSharpType(typeof(IDisposable)), typeProvider.Implements[0]); + } + [Test] public async Task TestCanCustomizeTypeWithChangedName() { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Samples/ExampleMockValueBuilderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Samples/ExampleMockValueBuilderTests.cs new file mode 100644 index 00000000000..232067ce99d --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Samples/ExampleMockValueBuilderTests.cs @@ -0,0 +1,536 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using Microsoft.TypeSpec.Generator.Input; +using Microsoft.TypeSpec.Generator.Samples; +using Microsoft.TypeSpec.Generator.Tests.Common; +using NUnit.Framework; + +namespace Microsoft.TypeSpec.Generator.Tests.Samples +{ + public class ExampleMockValueBuilderTests + { + // ----------------------------------------------------------------------- + // BuildOperationExamples — top-level behavior + // ----------------------------------------------------------------------- + + [Test] + public void BuildOperationExamples_ProducesTwoVariants() + { + var operation = InputFactory.Operation("TestOp", parameters: [ + InputFactory.PathParameter("id", InputPrimitiveType.String, isRequired: true) + ]); + + var examples = ExampleMockValueBuilder.BuildOperationExamples(operation); + + Assert.AreEqual(2, examples.Count); + Assert.AreEqual(ExampleMockValueBuilder.ShortVersionKey, examples[0].Name); + Assert.AreEqual(ExampleMockValueBuilder.AllParametersKey, examples[1].Name); + } + + [Test] + public void ShortVersion_SkipsOptionalParameters() + { + var operation = InputFactory.Operation("TestOp", parameters: [ + InputFactory.PathParameter("requiredId", InputPrimitiveType.String, isRequired: true), + InputFactory.QueryParameter("optionalFilter", InputPrimitiveType.String, isRequired: false) + ]); + + var examples = ExampleMockValueBuilder.BuildOperationExamples(operation); + var shortVersion = examples[0]; + var allParams = examples[1]; + + Assert.AreEqual(1, shortVersion.Parameters.Count); + Assert.AreEqual("requiredId", shortVersion.Parameters[0].Parameter.Name); + + Assert.AreEqual(2, allParams.Parameters.Count); + } + + [Test] + public void AllParameters_IncludesOptionalParameters() + { + var operation = InputFactory.Operation("TestOp", parameters: [ + InputFactory.PathParameter("requiredId", InputPrimitiveType.String, isRequired: true), + InputFactory.QueryParameter("optionalFilter", InputPrimitiveType.String, isRequired: false), + InputFactory.HeaderParameter("optionalHeader", InputPrimitiveType.Int32, isRequired: false) + ]); + + var examples = ExampleMockValueBuilder.BuildOperationExamples(operation); + var allParams = examples[1]; + + Assert.AreEqual(3, allParams.Parameters.Count); + } + + [Test] + public void EmptyFilePath_ForMockExamples() + { + var operation = InputFactory.Operation("TestOp", parameters: [ + InputFactory.PathParameter("id", InputPrimitiveType.String, isRequired: true) + ]); + + var examples = ExampleMockValueBuilder.BuildOperationExamples(operation); + + Assert.AreEqual(string.Empty, examples[0].FilePath); + Assert.AreEqual(string.Empty, examples[1].FilePath); + } + + // ----------------------------------------------------------------------- + // Primitive type mock values + // ----------------------------------------------------------------------- + + [Test] + public void PrimitiveType_Boolean() + { + var value = BuildExampleValueForType(InputPrimitiveType.Boolean); + AssertRawValue(value, true); + } + + [Test] + public void PrimitiveType_Int32() + { + var value = BuildExampleValueForType(InputPrimitiveType.Int32); + AssertRawValue(value, 1234); + } + + [Test] + public void PrimitiveType_Int64() + { + var value = BuildExampleValueForType(InputPrimitiveType.Int64); + AssertRawValue(value, 1234L); + } + + [Test] + public void PrimitiveType_Float32() + { + var value = BuildExampleValueForType(InputPrimitiveType.Float32); + AssertRawValue(value, 123.45f); + } + + [Test] + public void PrimitiveType_Float64() + { + var value = BuildExampleValueForType(InputPrimitiveType.Float64); + AssertRawValue(value, 123.45); + } + + [Test] + public void PrimitiveType_String_WithHint() + { + var value = ExampleMockValueBuilder.BuildExampleValue( + InputPrimitiveType.String, "myParam", false, new HashSet()); + + AssertRawValue(value, ""); + } + + [Test] + public void PrimitiveType_String_WithoutHint() + { + var value = ExampleMockValueBuilder.BuildExampleValue( + InputPrimitiveType.String, null, false, new HashSet()); + + AssertRawValue(value, ""); + } + + [Test] + public void PrimitiveType_Url() + { + var value = BuildExampleValueForType(InputPrimitiveType.Url); + AssertRawValue(value, "http://localhost:3000"); + } + + [Test] + public void PrimitiveType_PlainDate() + { + var value = BuildExampleValueForType(InputPrimitiveType.PlainDate); + AssertRawValue(value, "2022-05-10"); + } + + [Test] + public void PrimitiveType_PlainTime() + { + var value = BuildExampleValueForType(InputPrimitiveType.PlainTime); + AssertRawValue(value, "01:23:45"); + } + + [Test] + public void PrimitiveType_Bytes() + { + var value = BuildExampleValueForType(InputPrimitiveType.Base64); + AssertRawValue(value, "dGVzdA=="); + } + + [Test] + public void PrimitiveType_Uuid_String() + { + var uuidType = new InputPrimitiveType(InputPrimitiveTypeKind.String, "string", "TypeSpec.string", "uuid"); + var value = ExampleMockValueBuilder.BuildExampleValue( + uuidType, "id", false, new HashSet()); + + AssertRawValue(value, "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"); + } + + // ----------------------------------------------------------------------- + // DateTime mock values + // ----------------------------------------------------------------------- + + [Test] + public void DateTime_Rfc3339() + { + var dateTimeType = new InputDateTimeType( + DateTimeKnownEncoding.Rfc3339, "dateTime", "TypeSpec.utcDateTime", InputPrimitiveType.String); + var value = ExampleMockValueBuilder.BuildExampleValue( + dateTimeType, null, false, new HashSet()); + + AssertRawValue(value, "2022-05-10T18:57:31.2311892Z"); + } + + [Test] + public void DateTime_Rfc7231() + { + var dateTimeType = new InputDateTimeType( + DateTimeKnownEncoding.Rfc7231, "dateTime", "TypeSpec.utcDateTime", InputPrimitiveType.String); + var value = ExampleMockValueBuilder.BuildExampleValue( + dateTimeType, null, false, new HashSet()); + + AssertRawValue(value, "Tue, 10 May 2022 18:57:31 GMT"); + } + + [Test] + public void DateTime_UnixTimestamp() + { + var dateTimeType = new InputDateTimeType( + DateTimeKnownEncoding.UnixTimestamp, "dateTime", "TypeSpec.utcDateTime", InputPrimitiveType.Int64); + var value = ExampleMockValueBuilder.BuildExampleValue( + dateTimeType, null, false, new HashSet()); + + AssertRawValue(value, 1652209051); + } + + // ----------------------------------------------------------------------- + // Duration mock values + // ----------------------------------------------------------------------- + + [Test] + public void Duration_Iso8601() + { + var durationType = new InputDurationType( + DurationKnownEncoding.Iso8601, "duration", "TypeSpec.duration", InputPrimitiveType.String, null); + var value = ExampleMockValueBuilder.BuildExampleValue( + durationType, null, false, new HashSet()); + + AssertRawValue(value, "PT1H23M45S"); + } + + [Test] + public void Duration_Seconds_Int32() + { + var durationType = new InputDurationType( + DurationKnownEncoding.Seconds, "duration", "TypeSpec.duration", InputPrimitiveType.Int32, null); + var value = ExampleMockValueBuilder.BuildExampleValue( + durationType, null, false, new HashSet()); + + AssertRawValue(value, 10); + } + + // ----------------------------------------------------------------------- + // Collection mock values + // ----------------------------------------------------------------------- + + [Test] + public void Array_ProducesSingleElementList() + { + var arrayType = new InputArrayType("list", "TypeSpec.Array", InputPrimitiveType.Int32); + var value = ExampleMockValueBuilder.BuildExampleValue( + arrayType, null, false, new HashSet()); + + // The value should be a list type — verify via the Type property + Assert.AreEqual(arrayType, value.Type); + // We can't access internal Values directly, but we can verify it's not null/raw + AssertIsNotRawNull(value); + } + + [Test] + public void Dictionary_ProducesSingleKeyEntry() + { + var dictType = new InputDictionaryType("dict", InputPrimitiveType.String, InputPrimitiveType.Int32); + var value = ExampleMockValueBuilder.BuildExampleValue( + dictType, null, false, new HashSet()); + + Assert.AreEqual(dictType, value.Type); + AssertIsNotRawNull(value); + } + + // ----------------------------------------------------------------------- + // Enum mock values + // ----------------------------------------------------------------------- + + [Test] + public void Enum_ReturnsFirstEnumValue() + { + var enumType = InputFactory.StringEnum("Color", [("Red", "red"), ("Blue", "blue")]); + var value = ExampleMockValueBuilder.BuildExampleValue( + enumType, null, false, new HashSet()); + + AssertRawValue(value, "red"); + } + + [Test] + public void Enum_Int32_ReturnsFirstValue() + { + var enumType = InputFactory.Int32Enum("Status", [("Active", 1), ("Inactive", 0)]); + var value = ExampleMockValueBuilder.BuildExampleValue( + enumType, null, false, new HashSet()); + + AssertRawValue(value, 1); + } + + // ----------------------------------------------------------------------- + // Literal type + // ----------------------------------------------------------------------- + + [Test] + public void LiteralType_ReturnsLiteralValue() + { + var literalType = InputFactory.Literal.String("fixedValue"); + var value = ExampleMockValueBuilder.BuildExampleValue( + literalType, null, false, new HashSet()); + + AssertRawValue(value, "fixedValue"); + } + + // ----------------------------------------------------------------------- + // Union type + // ----------------------------------------------------------------------- + + [Test] + public void UnionType_ReturnsFirstVariant() + { + var unionType = new InputUnionType("myUnion", [InputPrimitiveType.String, InputPrimitiveType.Int32]); + var value = ExampleMockValueBuilder.BuildExampleValue( + unionType, "field", false, new HashSet()); + + // Should pick the first variant (String) and mock it + AssertRawValue(value, ""); + } + + // ----------------------------------------------------------------------- + // Nullable type + // ----------------------------------------------------------------------- + + [Test] + public void NullableType_UnwrapsAndMocksInner() + { + var nullableType = new InputNullableType(InputPrimitiveType.Int32); + var value = ExampleMockValueBuilder.BuildExampleValue( + nullableType, null, false, new HashSet()); + + AssertRawValue(value, 1234); + } + + // ----------------------------------------------------------------------- + // Model mock values + // ----------------------------------------------------------------------- + + [Test] + public void Model_PopulatesRequiredProperties() + { + var model = InputFactory.Model("Widget", properties: [ + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true), + InputFactory.Property("optionalColor", InputPrimitiveType.String, isRequired: false) + ]); + + var value = ExampleMockValueBuilder.BuildExampleValue( + model, null, false, new HashSet()); + + // Should be an object value (not null/raw) + Assert.AreEqual(model, value.Type); + AssertIsNotRawNull(value); + } + + [Test] + public void Model_PopulatesAllProperties_WhenUseAll() + { + var model = InputFactory.Model("Widget", properties: [ + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true), + InputFactory.Property("optionalColor", InputPrimitiveType.String, isRequired: false) + ]); + + var value = ExampleMockValueBuilder.BuildExampleValue( + model, null, true, new HashSet()); + + Assert.AreEqual(model, value.Type); + AssertIsNotRawNull(value); + } + + [Test] + public void Model_SkipsReadOnlyProperties() + { + var model = InputFactory.Model("Widget", properties: [ + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true), + InputFactory.Property("id", InputPrimitiveType.String, isRequired: true, isReadOnly: true) + ]); + + var value = ExampleMockValueBuilder.BuildExampleValue( + model, null, true, new HashSet()); + + Assert.AreEqual(model, value.Type); + AssertIsNotRawNull(value); + } + + [Test] + public void Model_IncludesBaseModelProperties() + { + var baseModel = InputFactory.Model("BaseWidget", properties: [ + InputFactory.Property("baseField", InputPrimitiveType.String, isRequired: true) + ]); + var derivedModel = InputFactory.Model("DerivedWidget", baseModel: baseModel, properties: [ + InputFactory.Property("derivedField", InputPrimitiveType.Int32, isRequired: true) + ]); + + var value = ExampleMockValueBuilder.BuildExampleValue( + derivedModel, null, true, new HashSet()); + + AssertIsNotRawNull(value); + } + + [Test] + public void Model_CircularReference_ReturnsNull() + { + var selfRefModel = InputFactory.Model("Node", properties: [ + InputFactory.Property("name", InputPrimitiveType.String, isRequired: true) + ]); + + // Pre-add to visited set to simulate circular reference + var visited = new HashSet { selfRefModel }; + var value = ExampleMockValueBuilder.BuildExampleValue( + selfRefModel, null, true, visited); + + // Circular reference should produce a null value + Assert.IsNotNull(value); + Assert.AreEqual(selfRefModel, value.Type); + } + + [Test] + public void Model_WithDiscriminator_ChoosesDerivedType() + { + var baseModel = InputFactory.Model("Pet", + properties: [ + InputFactory.Property("kind", InputPrimitiveType.String, isRequired: true, isDiscriminator: true) + ], + discriminatedModels: new Dictionary()); + + var catModel = InputFactory.Model("Cat", + discriminatedKind: "cat", + baseModel: baseModel, + properties: [ + InputFactory.Property("meow", InputPrimitiveType.Boolean, isRequired: true) + ]); + + var value = ExampleMockValueBuilder.BuildExampleValue( + baseModel, null, true, new HashSet()); + + // Should produce a non-null object value (derived type selected) + Assert.IsNotNull(value); + AssertIsNotRawNull(value); + } + + // ----------------------------------------------------------------------- + // Parameter handling + // ----------------------------------------------------------------------- + + [Test] + public void Parameter_Endpoint_UsesMockUrl() + { + var endpointParam = InputFactory.EndpointParameter("endpoint", InputPrimitiveType.Url, isRequired: true); + var operation = InputFactory.Operation("TestOp", parameters: [endpointParam]); + + var examples = ExampleMockValueBuilder.BuildOperationExamples(operation); + var paramExample = examples[0].Parameters[0]; + + AssertRawValue(paramExample.ExampleValue, "http://localhost:3000"); + } + + [Test] + public void Parameter_Constant_UsesConstantValue() + { + var constParam = InputFactory.HeaderParameter("apiVersion", InputFactory.Literal.String("2024-01-01"), + isRequired: true, scope: InputParameterScope.Constant, + defaultValue: InputFactory.Constant.String("2024-01-01")); + + var operation = InputFactory.Operation("TestOp", parameters: [constParam]); + + var examples = ExampleMockValueBuilder.BuildOperationExamples(operation); + var paramExample = examples[0].Parameters[0]; + + AssertRawValue(paramExample.ExampleValue, "2024-01-01"); + } + + [Test] + public void Parameter_WithDefaultValue_UsesDefault() + { + var paramWithDefault = InputFactory.QueryParameter("count", InputPrimitiveType.Int32, + isRequired: true, defaultValue: new InputConstant(10, InputPrimitiveType.Int32)); + + var operation = InputFactory.Operation("TestOp", parameters: [paramWithDefault]); + + var examples = ExampleMockValueBuilder.BuildOperationExamples(operation); + var paramExample = examples[0].Parameters[0]; + + AssertRawValue(paramExample.ExampleValue, 10); + } + + [Test] + public void OperationWithNoParameters_ProducesEmptyExamples() + { + var operation = InputFactory.Operation("EmptyOp", parameters: []); + + var examples = ExampleMockValueBuilder.BuildOperationExamples(operation); + + Assert.AreEqual(2, examples.Count); + Assert.AreEqual(0, examples[0].Parameters.Count); + Assert.AreEqual(0, examples[1].Parameters.Count); + } + + // ----------------------------------------------------------------------- + // Helpers + // ----------------------------------------------------------------------- + + private static InputExampleValue BuildExampleValueForType(InputType type) + { + return ExampleMockValueBuilder.BuildExampleValue(type, null, false, new HashSet()); + } + + /// + /// Asserts that the value is a raw example value matching the expected object. + /// Since InputExampleRawValue is internal, we use reflection to access RawValue. + /// + private static void AssertRawValue(InputExampleValue value, object expected) + { + var expectedValue = InputExampleValue.Value(value.Type, expected); + Assert.AreEqual(expectedValue.GetType(), value.GetType(), + $"Expected raw value type but got {value.GetType().Name}"); + var rawValueProp = value.GetType().GetProperty("RawValue"); + Assert.IsNotNull(rawValueProp, "Expected value to have RawValue property"); + var actualRaw = rawValueProp!.GetValue(value); + Assert.AreEqual(expected, actualRaw); + } + + /// + /// Asserts the value is not a null raw value — it should be a composite type (list, object). + /// + private static void AssertIsNotRawNull(InputExampleValue value) + { + var rawValueProp = value.GetType().GetProperty("RawValue"); + if (rawValueProp != null) + { + // It's a raw value — it should not be null (meaning it was a real value, not a cycle) + var rawVal = rawValueProp.GetValue(value); + Assert.IsNotNull(rawVal, "Expected a non-null value but got null (possible circular reference issue)"); + } + // If no RawValue property, it's a list/object/stream — that's fine + } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/StartUp/GeneratorHandlerTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/StartUp/GeneratorHandlerTests.cs index 45f98adace2..18589224bdf 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/StartUp/GeneratorHandlerTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/StartUp/GeneratorHandlerTests.cs @@ -7,6 +7,7 @@ using System.ComponentModel.Composition.Hosting; using System.IO; using System.Linq; +using Microsoft.TypeSpec.Generator.EmitterRpc; using Moq; using NUnit.Framework; @@ -184,5 +185,423 @@ public void GetOrderedPluginDlls() File.Delete(Path.Combine(plugin2Directory, "Plugin2.dll")); } } + + [Test] + public void BuildPlugin_BuildsProjectAndReturnsDllPath() + { + var testDir = Path.Combine(Path.GetTempPath(), "typespec-test-plugin-" + Guid.NewGuid().ToString("N")[..8]); + try + { + Directory.CreateDirectory(testDir); + + // Create a minimal .csproj + File.WriteAllText(Path.Combine(testDir, "TestPlugin.csproj"), @" + + net10.0 + +"); + + // Create a minimal .cs file (doesn't need to be a real plugin for the build test) + File.WriteAllText(Path.Combine(testDir, "TestPlugin.cs"), @" +namespace TestPlugin +{ + public class Dummy { } +}"); + + using var emitter = new Emitter(Stream.Null); + var result = GeneratorHandler.BuildPlugin( + Path.Combine(testDir, "TestPlugin.csproj"), + emitter); + + Assert.IsNotNull(result, "BuildPlugin should return a DLL path"); + Assert.IsTrue(result!.EndsWith("TestPlugin.dll", StringComparison.OrdinalIgnoreCase)); + Assert.IsTrue(File.Exists(result), $"Built DLL should exist at {result}"); + } + finally + { + try { Directory.Delete(testDir, true); } catch { } + } + } + + [Test] + public void BuildPlugin_ThrowsOnInvalidProject() + { + var testDir = Path.Combine(Path.GetTempPath(), "typespec-test-plugin-" + Guid.NewGuid().ToString("N")[..8]); + try + { + Directory.CreateDirectory(testDir); + + // Create an invalid .csproj + File.WriteAllText(Path.Combine(testDir, "Bad.csproj"), "not valid xml"); + + using var emitter = new Emitter(Stream.Null); + + Assert.Throws(() => + GeneratorHandler.BuildPlugin( + Path.Combine(testDir, "Bad.csproj"), + emitter)); + } + finally + { + try { Directory.Delete(testDir, true); } catch { } + } + } + + [Test] + public void BuildPluginIfNeeded_ReturnsNullWhenNoCsproj() + { + var testDir = Path.Combine(Path.GetTempPath(), "typespec-test-plugin-" + Guid.NewGuid().ToString("N")[..8]); + try + { + Directory.CreateDirectory(testDir); + File.WriteAllText(Path.Combine(testDir, "readme.txt"), "no csproj here"); + + using var emitter = new Emitter(Stream.Null); + var result = GeneratorHandler.BuildPluginIfNeeded(testDir, emitter); + + Assert.IsNull(result); + } + finally + { + try { Directory.Delete(testDir, true); } catch { } + } + } + + [Test] + public void BuildPluginIfNeeded_FindsCsprojInSubdirectory() + { + var testDir = Path.Combine(Path.GetTempPath(), "typespec-test-plugin-" + Guid.NewGuid().ToString("N")[..8]); + var srcDir = Path.Combine(testDir, "src"); + try + { + Directory.CreateDirectory(srcDir); + + File.WriteAllText(Path.Combine(srcDir, "SubPlugin.csproj"), @" + + net10.0 + +"); + + File.WriteAllText(Path.Combine(srcDir, "SubPlugin.cs"), @" +namespace SubPlugin { public class Dummy { } }"); + + using var emitter = new Emitter(Stream.Null); + var result = GeneratorHandler.BuildPluginIfNeeded(testDir, emitter); + + Assert.IsNotNull(result); + Assert.IsTrue(result!.EndsWith("SubPlugin.dll", StringComparison.OrdinalIgnoreCase)); + Assert.IsTrue(File.Exists(result)); + } + finally + { + try { Directory.Delete(testDir, true); } catch { } + } + } + + [Test] + public void BuildPlugin_OutputDllContainsCompiledType() + { + var testDir = Path.Combine(Path.GetTempPath(), "typespec-test-plugin-" + Guid.NewGuid().ToString("N")[..8]); + try + { + Directory.CreateDirectory(testDir); + + File.WriteAllText(Path.Combine(testDir, "TypedPlugin.csproj"), @" + + net10.0 + +"); + + File.WriteAllText(Path.Combine(testDir, "MyType.cs"), @" +namespace TypedPlugin { public class MyType { public int Value => 42; } }"); + + using var emitter = new Emitter(Stream.Null); + var dllPath = GeneratorHandler.BuildPlugin( + Path.Combine(testDir, "TypedPlugin.csproj"), emitter); + + Assert.IsNotNull(dllPath); + var asm = System.Reflection.Assembly.LoadFrom(dllPath!); + var type = asm.GetType("TypedPlugin.MyType"); + Assert.IsNotNull(type, "Compiled assembly should contain MyType"); + } + finally + { + try { Directory.Delete(testDir, true); } catch { } + } + } + + [Test] + public void AddConfiguredPluginDlls_NoPluginPaths_DoesNothing() + { + var config = new Configuration( + Path.GetTempPath(), + new Dictionary(), + "TestPackage", + false, + Configuration.UnreferencedTypesHandlingOption.RemoveOrInternalize, + null, + pluginPaths: null); + + using var catalog = new AggregateCatalog(); + GeneratorHandler.AddConfiguredPluginDlls(catalog, config); + + Assert.AreEqual(0, catalog.Catalogs.Count); + } + + [Test] + public void AddConfiguredPluginDlls_InvalidDirectory_Throws() + { + var config = new Configuration( + Path.GetTempPath(), + new Dictionary(), + "TestPackage", + false, + Configuration.UnreferencedTypesHandlingOption.RemoveOrInternalize, + null, + pluginPaths: ["/nonexistent/path"]); + + using var catalog = new AggregateCatalog(); + + Assert.Throws(() => + GeneratorHandler.AddConfiguredPluginDlls(catalog, config)); + } + + [Test] + public void AddConfiguredPluginDlls_DirectoryWithPreBuiltDlls_LoadsThem() + { + var testDir = Path.Combine(Path.GetTempPath(), "typespec-test-plugin-" + Guid.NewGuid().ToString("N")[..8]); + try + { + Directory.CreateDirectory(testDir); + + // Copy the test assembly as a pre-built plugin DLL + var testAssembly = typeof(GeneratorHandlerTests).Assembly.Location; + File.Copy(testAssembly, Path.Combine(testDir, "PreBuiltPlugin.dll")); + + var config = new Configuration( + Path.GetTempPath(), + new Dictionary(), + "TestPackage", + false, + Configuration.UnreferencedTypesHandlingOption.RemoveOrInternalize, + null, + pluginPaths: [testDir]); + + using var catalog = new AggregateCatalog(); + GeneratorHandler.AddConfiguredPluginDlls(catalog, config); + + Assert.IsTrue(catalog.Catalogs.Count > 0, "Should have loaded at least one catalog"); + } + finally + { + try { Directory.Delete(testDir, true); } catch { } + } + } + + [Test] + public void AddConfiguredPluginDlls_DirectoryWithCsproj_BuildsAndLoads() + { + var testDir = Path.Combine(Path.GetTempPath(), "typespec-test-plugin-" + Guid.NewGuid().ToString("N")[..8]); + try + { + Directory.CreateDirectory(testDir); + + File.WriteAllText(Path.Combine(testDir, "AutoBuildPlugin.csproj"), @" + + net10.0 + +"); + + File.WriteAllText(Path.Combine(testDir, "Plugin.cs"), @" +namespace AutoBuildPlugin { public class Dummy { } }"); + + var config = new Configuration( + Path.GetTempPath(), + new Dictionary(), + "TestPackage", + false, + Configuration.UnreferencedTypesHandlingOption.RemoveOrInternalize, + null, + pluginPaths: [testDir]); + + using var catalog = new AggregateCatalog(); + GeneratorHandler.AddConfiguredPluginDlls(catalog, config); + + Assert.IsTrue(catalog.Catalogs.Count > 0, "Should have built and loaded the plugin"); + } + finally + { + try { Directory.Delete(testDir, true); } catch { } + } + } + + [Test] + public void AddConfiguredPluginDlls_MultiplePluginPaths() + { + var testDir1 = Path.Combine(Path.GetTempPath(), "typespec-test-plugin-" + Guid.NewGuid().ToString("N")[..8]); + var testDir2 = Path.Combine(Path.GetTempPath(), "typespec-test-plugin-" + Guid.NewGuid().ToString("N")[..8]); + try + { + // Plugin 1: pre-built DLL + Directory.CreateDirectory(testDir1); + var testAssembly = typeof(GeneratorHandlerTests).Assembly.Location; + File.Copy(testAssembly, Path.Combine(testDir1, "Plugin1.dll")); + + // Plugin 2: .csproj to build + Directory.CreateDirectory(testDir2); + File.WriteAllText(Path.Combine(testDir2, "Plugin2.csproj"), @" + + net10.0 + +"); + File.WriteAllText(Path.Combine(testDir2, "Plugin2.cs"), @" +namespace Plugin2 { public class Dummy { } }"); + + var config = new Configuration( + Path.GetTempPath(), + new Dictionary(), + "TestPackage", + false, + Configuration.UnreferencedTypesHandlingOption.RemoveOrInternalize, + null, + pluginPaths: [testDir1, testDir2]); + + using var catalog = new AggregateCatalog(); + GeneratorHandler.AddConfiguredPluginDlls(catalog, config); + + Assert.IsTrue(catalog.Catalogs.Count >= 2, "Should have loaded catalogs from both plugin paths"); + } + finally + { + try { Directory.Delete(testDir1, true); } catch { } + try { Directory.Delete(testDir2, true); } catch { } + } + } + [Test] + public void GetExpectedOutputPath_ConstructsPathFromCsprojProperties() + { + var testDir = Path.Combine(Path.GetTempPath(), "typespec-test-plugin-" + Guid.NewGuid().ToString("N")[..8]); + try + { + Directory.CreateDirectory(testDir); + + File.WriteAllText(Path.Combine(testDir, "MyPlugin.csproj"), @" + + net10.0 + +"); + + var result = GeneratorHandler.GetExpectedOutputPath( + Path.Combine(testDir, "MyPlugin.csproj")); + + Assert.IsNotNull(result); + var expected = Path.Combine(testDir, "bin", "Release", "net10.0", "MyPlugin.dll"); + Assert.AreEqual(expected, result); + } + finally + { + try { Directory.Delete(testDir, true); } catch { } + } + } + + [Test] + public void GetExpectedOutputPath_UsesAssemblyNameWhenSpecified() + { + var testDir = Path.Combine(Path.GetTempPath(), "typespec-test-plugin-" + Guid.NewGuid().ToString("N")[..8]); + try + { + Directory.CreateDirectory(testDir); + + File.WriteAllText(Path.Combine(testDir, "MyPlugin.csproj"), @" + + net10.0 + CustomName + +"); + + var result = GeneratorHandler.GetExpectedOutputPath( + Path.Combine(testDir, "MyPlugin.csproj")); + + Assert.IsNotNull(result); + var expected = Path.Combine(testDir, "bin", "Release", "net10.0", "CustomName.dll"); + Assert.AreEqual(expected, result); + } + finally + { + try { Directory.Delete(testDir, true); } catch { } + } + } + + [Test] + public void GetExpectedOutputPath_ReturnsNullWhenNoTargetFramework() + { + var testDir = Path.Combine(Path.GetTempPath(), "typespec-test-plugin-" + Guid.NewGuid().ToString("N")[..8]); + try + { + Directory.CreateDirectory(testDir); + + File.WriteAllText(Path.Combine(testDir, "Bad.csproj"), @" + + +"); + + var result = GeneratorHandler.GetExpectedOutputPath( + Path.Combine(testDir, "Bad.csproj")); + + Assert.IsNull(result); + } + finally + { + try { Directory.Delete(testDir, true); } catch { } + } + } + + [Test] + public void GetExpectedOutputPath_ReturnsNullForInvalidXml() + { + var testDir = Path.Combine(Path.GetTempPath(), "typespec-test-plugin-" + Guid.NewGuid().ToString("N")[..8]); + try + { + Directory.CreateDirectory(testDir); + + File.WriteAllText(Path.Combine(testDir, "Bad.csproj"), "not valid xml"); + + var result = GeneratorHandler.GetExpectedOutputPath( + Path.Combine(testDir, "Bad.csproj")); + + Assert.IsNull(result); + } + finally + { + try { Directory.Delete(testDir, true); } catch { } + } + } + + [Test] + public void GetExpectedOutputPath_UsesFirstTargetFrameworkFromMultiTargeting() + { + var testDir = Path.Combine(Path.GetTempPath(), "typespec-test-plugin-" + Guid.NewGuid().ToString("N")[..8]); + try + { + Directory.CreateDirectory(testDir); + + File.WriteAllText(Path.Combine(testDir, "MultiTarget.csproj"), @" + + net8.0;net10.0 + +"); + + var result = GeneratorHandler.GetExpectedOutputPath( + Path.Combine(testDir, "MultiTarget.csproj")); + + Assert.IsNotNull(result); + var expected = Path.Combine(testDir, "bin", "Release", "net8.0", "MultiTarget.dll"); + Assert.AreEqual(expected, result); + } + finally + { + try { Directory.Delete(testDir, true); } catch { } + } + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/TestData/OutputLibraryVisitorTests/MethodIsNotFilteredWhenVisitorChangesSignature/TestName.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/TestData/OutputLibraryVisitorTests/MethodIsNotFilteredWhenVisitorChangesSignature/TestName.cs new file mode 100644 index 00000000000..c91cd0a5331 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/TestData/OutputLibraryVisitorTests/MethodIsNotFilteredWhenVisitorChangesSignature/TestName.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Test +{ + /// + /// Custom method with int parameter. The generated method initially has int too (matching), + /// but a visitor changes it to float (no longer matching), so the generated method should be kept. + /// + public partial class TestName + { + public void TestMethod(int param1) { } + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/TestData/OutputLibraryVisitorTests/SerializationProviderConstructorIsFilteredWhenMatchingCustomCode/TestSerializationProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/TestData/OutputLibraryVisitorTests/SerializationProviderConstructorIsFilteredWhenMatchingCustomCode/TestSerializationProvider.cs new file mode 100644 index 00000000000..b5c22388e4a --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/TestData/OutputLibraryVisitorTests/SerializationProviderConstructorIsFilteredWhenMatchingCustomCode/TestSerializationProvider.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Test +{ + /// + /// This is used to verify constructor filtering for serialization providers when a constructor is repeated in custom code. + /// + public partial class TestSerializationProvider + { + public TestSerializationProvider(string param1) { } + } +} + diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/TypeFactoryTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/TypeFactoryTests.cs index 557d08a7a7f..174c1c24eb2 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/TypeFactoryTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/TypeFactoryTests.cs @@ -283,6 +283,30 @@ public void CreateEnum_ExtensibleEnumWithoutVisitorsOrCustomCode_ReturnsExtensib Assert.IsTrue(enumProvider!.IsExtensible); } + [Test] + public void CreateCSharpType_SelfReferencingModel_DoesNotThrow() + { + var selfRefModel = InputFactory.Model("QueryFilter"); + var isReentrant = false; + + MockHelpers.LoadMockGenerator(createCSharpTypeCore: (InputType inputType) => + { + if (inputType == selfRefModel && !isReentrant) + { + isReentrant = true; + // Simulate the re-entrant call that occurs with self-referencing models + // (e.g., QueryFilter with property and: QueryFilter[]). + // CreateCSharpTypeCore -> CreateModel -> BuildProperties -> CreateCSharpType(same model) + CodeModelGenerator.Instance.TypeFactory.CreateCSharpType(selfRefModel); + } + return typeof(object); + }); + + // Before the fix, this would throw ArgumentException: + // "An item with the same key has already been added" + Assert.DoesNotThrow(() => CodeModelGenerator.Instance.TypeFactory.CreateCSharpType(selfRefModel)); + } + /// /// Test visitor that modifies enum namespaces to end with ".Models" /// diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/CodeWriterDeclarationTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/CodeWriterDeclarationTests.cs index 259c75ea069..35d1f628594 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/CodeWriterDeclarationTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/CodeWriterDeclarationTests.cs @@ -168,6 +168,35 @@ public void ScopeDeclaredTwiceForMethodSignatureParam() Assert.AreEqual(Helpers.GetExpectedFromFile(), codeWriter.ToString(false)); } + [Test] + public void FieldDeduplicationUpdatesReferencesViaMemberExpression() + { + var type = new TestTypeProvider(); + var field1 = new FieldProvider(FieldModifiers.Private | FieldModifiers.ReadOnly, typeof(string), "_scope", type); + var field2 = new FieldProvider(FieldModifiers.Private | FieldModifiers.ReadOnly, typeof(string), "_scope", type); + + using var codeWriter = new CodeWriter(); + // Write both field declarations - the second should be deduped to _scope0 + codeWriter.WriteField(field1); + codeWriter.WriteField(field2); + // Write a reference to the second field via AsValueExpression (implicit MemberExpression) + field2.AsValueExpression.Write(codeWriter); + Assert.AreEqual(Helpers.GetExpectedFromFile(), codeWriter.ToString(false)); + } + + [Test] + public void FieldReferenceBeforeDeclarationUsesRequestedName() + { + var type = new TestTypeProvider(); + var field = new FieldProvider(FieldModifiers.Private | FieldModifiers.ReadOnly, typeof(string), "_token", type); + + using var codeWriter = new CodeWriter(); + // Write a reference BEFORE the field declaration — should use the original name, not create a declaration + field.AsValueExpression.Write(codeWriter); + codeWriter.WriteField(field); + Assert.AreEqual(Helpers.GetExpectedFromFile(), codeWriter.ToString(false)); + } + private Dictionary GetDeclarationScopes(CodeWriterDeclaration declaration) { var namesDictionaryField = typeof(CodeWriterDeclaration).GetField("_actualNames", BindingFlags.NonPublic | BindingFlags.Instance); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/CodeWriterTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/CodeWriterTests.cs index 13a48843b34..6fec1f24139 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/CodeWriterTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/CodeWriterTests.cs @@ -193,6 +193,24 @@ [new CSharpType(t)], Assert.AreEqual("public global::System.Void TestMethod()\n where T : global::System.BinaryData, global::System.IDisposable", result); } + [Test] + public void CodeWriter_WriteMethod_NonDocumentComment() + { + var methodSignature = new MethodSignature( + "TestMethod", + $"To test a method with a non-document comment", + MethodSignatureModifiers.Public, + typeof(void), + null, + [], + NonDocumentComment: "This is a non-document comment"); + using var codeWriter = new CodeWriter(); + codeWriter.WriteMethodDeclarationNoScope(methodSignature); + + var result = codeWriter.ToString(false); + Assert.AreEqual("// This is a non-document comment\npublic global::System.Void TestMethod()", result); + } + [Test] public void CodeWriter_WriteField() { @@ -608,5 +626,106 @@ public void CodeWriter_WriteParameter_WithInModifier() Assert.AreEqual(expected, result); } + + [Test] + public void CodeWriter_WriteMethodDeclaration_WithPartialModifier() + { + var methodSignature = new MethodSignature( + "DefineAdditionalProperties", + $"Defines additional properties.", + MethodSignatureModifiers.Private | MethodSignatureModifiers.Partial, + null, + null, + []); + using var codeWriter = new CodeWriter(); + codeWriter.WriteMethodDeclarationNoScope(methodSignature); + + var result = codeWriter.ToString(false); + Assert.AreEqual("private partial void DefineAdditionalProperties()", result); + } + + [Test] + public void CodeWriter_WriteMethod_PartialMethodWithBody() + { + var methodSignature = new MethodSignature( + "DefineAdditionalProperties", + $"Defines additional properties.", + MethodSignatureModifiers.Private | MethodSignatureModifiers.Partial, + null, + null, + []); + var method = new MethodProvider( + methodSignature, + MethodBodyStatement.Empty, + new TestTypeProvider()); + + using var codeWriter = new CodeWriter(); + codeWriter.WriteMethod(method); + + var expected = Helpers.GetExpectedFromFile(); + var result = codeWriter.ToString(false); + Assert.AreEqual(expected, result); + } + + [Test] + public void CodeWriter_WriteMethod_PartialMethodWithoutBody() + { + var methodSignature = new MethodSignature( + "DefineAdditionalProperties", + $"Defines additional properties.", + MethodSignatureModifiers.Private | MethodSignatureModifiers.Partial, + null, + null, + []); + var method = new MethodProvider( + methodSignature, + new TestTypeProvider()); + + using var codeWriter = new CodeWriter(); + codeWriter.WriteMethod(method); + + var expected = Helpers.GetExpectedFromFile(); + var result = codeWriter.ToString(false); + Assert.AreEqual(expected, result); + } + + [Test] + public void CodeWriter_WriteMethodDeclaration_WithAbstractModifier() + { + var methodSignature = new MethodSignature( + "GetDefaultOptions", + $"Gets the default options.", + MethodSignatureModifiers.Protected | MethodSignatureModifiers.Abstract, + typeof(string), + null, + []); + using var codeWriter = new CodeWriter(); + codeWriter.WriteMethodDeclarationNoScope(methodSignature); + + var result = codeWriter.ToString(false); + Assert.AreEqual("protected abstract string GetDefaultOptions()", result); + } + + [Test] + public void CodeWriter_WriteMethod_AbstractMethodWithoutBody() + { + var methodSignature = new MethodSignature( + "GetDefaultOptions", + $"Gets the default options.", + MethodSignatureModifiers.Protected | MethodSignatureModifiers.Abstract, + typeof(string), + null, + []); + var method = new MethodProvider( + methodSignature, + new TestTypeProvider()); + + using var codeWriter = new CodeWriter(); + codeWriter.WriteMethod(method); + + var expected = Helpers.GetExpectedFromFile(); + var result = codeWriter.ToString(false); + Assert.AreEqual(expected, result); + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TestData/CodeWriterDeclarationTests/FieldDeduplicationUpdatesReferencesViaMemberExpression.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TestData/CodeWriterDeclarationTests/FieldDeduplicationUpdatesReferencesViaMemberExpression.cs new file mode 100644 index 00000000000..93797a79ad5 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TestData/CodeWriterDeclarationTests/FieldDeduplicationUpdatesReferencesViaMemberExpression.cs @@ -0,0 +1,3 @@ +private readonly string _scope; +private readonly string _scope0; +_scope0 \ No newline at end of file diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TestData/CodeWriterDeclarationTests/FieldReferenceBeforeDeclarationUsesRequestedName.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TestData/CodeWriterDeclarationTests/FieldReferenceBeforeDeclarationUsesRequestedName.cs new file mode 100644 index 00000000000..69338c17a95 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TestData/CodeWriterDeclarationTests/FieldReferenceBeforeDeclarationUsesRequestedName.cs @@ -0,0 +1 @@ +_tokenprivate readonly string _token; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TestData/CodeWriterTests/CodeWriter_WriteMethod_AbstractMethodWithoutBody.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TestData/CodeWriterTests/CodeWriter_WriteMethod_AbstractMethodWithoutBody.cs new file mode 100644 index 00000000000..d29a8cc1113 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TestData/CodeWriterTests/CodeWriter_WriteMethod_AbstractMethodWithoutBody.cs @@ -0,0 +1,2 @@ +/// Gets the default options. +protected abstract string GetDefaultOptions(); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TestData/CodeWriterTests/CodeWriter_WriteMethod_PartialMethodWithBody.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TestData/CodeWriterTests/CodeWriter_WriteMethod_PartialMethodWithBody.cs new file mode 100644 index 00000000000..8520c7dbff8 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TestData/CodeWriterTests/CodeWriter_WriteMethod_PartialMethodWithBody.cs @@ -0,0 +1,4 @@ +/// Defines additional properties. +private partial void DefineAdditionalProperties() +{ +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TestData/CodeWriterTests/CodeWriter_WriteMethod_PartialMethodWithoutBody.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TestData/CodeWriterTests/CodeWriter_WriteMethod_PartialMethodWithoutBody.cs new file mode 100644 index 00000000000..f2e1bc61e49 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TestData/CodeWriterTests/CodeWriter_WriteMethod_PartialMethodWithoutBody.cs @@ -0,0 +1,2 @@ +/// Defines additional properties. +private partial void DefineAdditionalProperties(); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TestData/TypeProviderWriterTests/TypeProviderWriter_WriteEnumWithFieldAttributes.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TestData/TypeProviderWriterTests/TypeProviderWriter_WriteEnumWithFieldAttributes.cs new file mode 100644 index 00000000000..a44b0586324 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TestData/TypeProviderWriterTests/TypeProviderWriter_WriteEnumWithFieldAttributes.cs @@ -0,0 +1,15 @@ +// + +#nullable disable + +using System; + +namespace Sample.Models +{ + public enum TestEnum + { + [global::System.ObsoleteAttribute] + Value1 = 1, + Value2 = 2 + } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TypeProviderWriterTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TypeProviderWriterTests.cs index 7543bb0fb24..1258ccb409d 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TypeProviderWriterTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Writers/TypeProviderWriterTests.cs @@ -4,9 +4,11 @@ using System; using System.Collections.Generic; using System.Linq; +using Microsoft.TypeSpec.Generator.Expressions; using Microsoft.TypeSpec.Generator.Input; using Microsoft.TypeSpec.Generator.Primitives; using Microsoft.TypeSpec.Generator.Providers; +using Microsoft.TypeSpec.Generator.Statements; using Microsoft.TypeSpec.Generator.Tests.Common; using NUnit.Framework; @@ -73,5 +75,47 @@ public void TypeProviderWriter_WriteModelAsStruct() internal static readonly InputModelProperty RequiredStringProperty = InputFactory.Property("requiredString", InputPrimitiveType.String, isRequired: true); internal static readonly InputModelProperty RequiredIntProperty = InputFactory.Property("requiredInt", InputPrimitiveType.Int32, isRequired: true); + + [Test] + public void TypeProviderWriter_WriteEnumWithFieldAttributes() + { + var enumProvider = new TestEnumWithAttributesProvider(); + var codeFile = new TypeProviderWriter(enumProvider).Write(); + var result = codeFile.Content; + + var expected = Helpers.GetExpectedFromFile(); + + Assert.AreEqual(expected, result); + } + + private class TestEnumWithAttributesProvider : TypeProvider + { + protected override string BuildRelativeFilePath() => "TestEnum.cs"; + protected override string BuildName() => "TestEnum"; + protected override string BuildNamespace() => "Sample.Models"; + protected override TypeSignatureModifiers BuildDeclarationModifiers() => TypeSignatureModifiers.Public | TypeSignatureModifiers.Enum; + + protected internal override FieldProvider[] BuildFields() + { + return + [ + new FieldProvider( + FieldModifiers.Public | FieldModifiers.Static, + typeof(int), + "Value1", + this, + $"First value", + initializationValue: new LiteralExpression(1), + attributes: [new AttributeStatement(typeof(ObsoleteAttribute))]), + new FieldProvider( + FieldModifiers.Public | FieldModifiers.Static, + typeof(int), + "Value2", + this, + $"Second value", + initializationValue: new LiteralExpression(2)) + ]; + } + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/InputFactory.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/InputFactory.cs index f117d6d42d1..2881aceeaa6 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/InputFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/InputFactory.cs @@ -6,6 +6,7 @@ using System.Reflection; using Microsoft.TypeSpec.Generator.Input; using Microsoft.TypeSpec.Generator.Input.Extensions; +using Microsoft.TypeSpec.Generator.Primitives; namespace Microsoft.TypeSpec.Generator.Tests.Common { @@ -65,6 +66,37 @@ public static InputConstant Int64(long value) } } + public static class Serialization + { + public static InputSerializationOptions Options( + InputJsonSerializationOptions? json = null, + InputXmlSerializationOptions? xml = null) + { + return new InputSerializationOptions(json, xml); + } + + public static InputJsonSerializationOptions Json(string name) + { + return new InputJsonSerializationOptions(name); + } + + public static InputXmlSerializationOptions Xml( + string name, + bool? attribute = null, + InputXmlNamespaceOptions? @namespace = null, + bool? unwrapped = null, + string? itemsName = null, + InputXmlNamespaceOptions? itemsNamespace = null) + { + return new InputXmlSerializationOptions(name, attribute, @namespace, unwrapped, itemsName, itemsNamespace); + } + + public static InputXmlNamespaceOptions XmlNamespace(string ns, string prefix) + { + return new InputXmlNamespaceOptions(ns, prefix); + } + } + public static InputHeaderParameter ContentTypeParameter(string contentType) => HeaderParameter( "contentType", @@ -245,8 +277,11 @@ public static InputModelProperty Property( string? wireName = null, string? summary = null, string? serializedName = null, - string? doc = null) + string? doc = null, + InputSerializationOptions? serializationOptions = null, + ArrayKnownEncoding? encode = null) { + serializationOptions ??= new InputSerializationOptions(); return new InputModelProperty( name: name, summary: summary, @@ -260,7 +295,8 @@ public static InputModelProperty Property( access: null, isDiscriminator: isDiscriminator, serializedName: serializedName ?? wireName ?? name.ToVariableName(), - serializationOptions: new(json: new(wireName ?? name.ToVariableName()))); + serializationOptions: serializationOptions, + encode: encode); } public static InputHeaderParameter HeaderParameter( @@ -275,7 +311,8 @@ public static InputHeaderParameter HeaderParameter( string? collectionFormat = null, string? serializedName = null, InputConstant? defaultValue = null, - InputParameterScope scope = InputParameterScope.Method) + InputParameterScope scope = InputParameterScope.Method, + string? collectionHeaderPrefix = null) { return new InputHeaderParameter( name: name, @@ -291,7 +328,8 @@ public static InputHeaderParameter HeaderParameter( collectionFormat: collectionFormat, scope: scope, arraySerializationDelimiter: null, - serializedName: serializedName ?? name); + serializedName: serializedName ?? name, + collectionHeaderPrefix: collectionHeaderPrefix); } public static InputQueryParameter QueryParameter( @@ -433,7 +471,8 @@ public static InputMethodParameter MethodParameter( string? doc = null, string? serializedName = null, InputRequestLocation location = InputRequestLocation.Body, - InputParameterScope scope = InputParameterScope.Method) + InputParameterScope scope = InputParameterScope.Method, + string? paramAlias = null) { return new InputMethodParameter( name: name, @@ -447,7 +486,10 @@ public static InputMethodParameter MethodParameter( scope: scope, access: null, location: location, - serializedName: serializedName ?? name); + serializedName: serializedName ?? name) + { + ParamAlias = paramAlias + }; } // Replace reflection with InternalsVisibleTo after fixing https://github.com/microsoft/typespec/issues/7075")] @@ -466,7 +508,8 @@ public static InputModelType Model( IEnumerable? derivedModels = null, InputModelProperty? discriminatorProperty = null, bool isDynamicModel = false, - InputExternalTypeMetadata? external = null) + InputExternalTypeMetadata? external = null, + InputSerializationOptions? serializationOptions = null) { IEnumerable propertiesList = properties ?? [Property("StringProperty", InputPrimitiveType.String)]; @@ -490,7 +533,7 @@ discriminatedModels is null : discriminatedModels.AsReadOnly(), additionalProperties, modelAsStruct, - new(), + serializationOptions ?? new(), isDynamicModel); if (baseModel is not null) { @@ -602,7 +645,7 @@ public static InputOperation Operation( bool generateConvenienceMethod = true, string? ns = null) { - return new InputOperation( + var operation = new InputOperation( name, null, "", @@ -621,6 +664,8 @@ public static InputOperation Operation( generateConvenienceMethod, name, ns); + operation.OriginalName = name; + return operation; } public static InputPagingServiceMetadata NextLinkPagingMetadata( @@ -670,7 +715,7 @@ public static InputServiceMethodResponse ServiceMethodResponse(InputType? type, private static readonly Dictionary> _childClientsCache = new(); - public static InputClient Client(string name, string clientNamespace = "Sample", string? doc = null, IEnumerable? methods = null, IEnumerable? parameters = null, InputClient? parent = null, string? crossLanguageDefinitionId = null, IEnumerable? apiVersions = null, InputClientInitializedBy initializedBy = InputClientInitializedBy.Default, bool? isMultiServiceClient = false) + public static InputClient Client(string name, string clientNamespace = "Sample", string? doc = null, IEnumerable? methods = null, IEnumerable? parameters = null, InputClient? parent = null, string? crossLanguageDefinitionId = null, IEnumerable? apiVersions = null, InputClientInitializedBy initializedBy = InputClientInitializedBy.Individually, bool? isMultiServiceClient = false) { // when this client has parent, we add the constructed client into the `children` list of the parent var clientChildren = new List(); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/ModelTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/ModelTests.cs index 934c9efa4f4..16320ace245 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/ModelTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/ModelTests.cs @@ -78,8 +78,13 @@ protected void RoundTripTest(string format, RoundTripStrategy strategy) var data = strategy.Write(model, options); string roundTrip = data.ToString(); - // we validate those are equivalent element, representing the same json object (ignoring the spaces and orders, etc) - AssertJsonEquivalency(expectedSerializedString, roundTrip); + // For XML payloads, skip JSON equivalency check since XML has different formatting rules + bool isXmlPayload = expectedSerializedString.TrimStart().StartsWith("<"); + if (!isXmlPayload) + { + // we validate those are equivalent element, representing the same json object (ignoring the spaces and orders, etc) + AssertJsonEquivalency(expectedSerializedString, roundTrip); + } T model2 = (T)strategy.Read(roundTrip, ModelInstance, options); CompareModels(model, model2, format); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/RoundTripStrategy.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/RoundTripStrategy.cs index 76482635d5a..b807cb75f59 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/RoundTripStrategy.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/RoundTripStrategy.cs @@ -198,6 +198,17 @@ public override object Read(string payload, object model, ModelReaderWriterOptio { var responseWithBody = new TestPipelineResponse(200); responseWithBody.SetContent(payload); + + // Set Content-Type header to help models that support multiple formats + // Determine format based on payload content + if (payload.TrimStart().StartsWith("{") || payload.TrimStart().StartsWith("[")) + { + ((TestResponseHeaders)responseWithBody.Headers).SetHeader("Content-Type", "application/json"); + } + else if (payload.TrimStart().StartsWith("<")) + { + ((TestResponseHeaders)responseWithBody.Headers).SetHeader("Content-Type", "application/xml"); + } ClientResult result = ClientResult.FromResponse(responseWithBody); return _fromResult(result); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/TestResponseHeaders.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/TestResponseHeaders.cs index 6edd427e27c..05eefb393dd 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/TestResponseHeaders.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/TestResponseHeaders.cs @@ -16,6 +16,11 @@ public TestResponseHeaders() _headers = new Dictionary(); } + public void SetHeader(string name, string value) + { + _headers[name] = value; + } + public override IEnumerator> GetEnumerator() { throw new NotImplementedException(); diff --git a/packages/http-client-csharp/generator/Packages.Data.props b/packages/http-client-csharp/generator/Packages.Data.props index 3a46d074dfa..e0d387e0cfb 100644 --- a/packages/http-client-csharp/generator/Packages.Data.props +++ b/packages/http-client-csharp/generator/Packages.Data.props @@ -14,7 +14,8 @@ - - + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/Sample-TypeSpec.tsp b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/Sample-TypeSpec.tsp index ede0acbb6bd..5e4fe46ddc1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/Sample-TypeSpec.tsp +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/Sample-TypeSpec.tsp @@ -1 +1,875 @@ -import "../../../../../../docs/samples/client/csharp/SampleService/main.tsp"; +import "@typespec/rest"; +import "@typespec/http"; +import "@typespec/xml"; +import "@typespec/http-client-csharp"; +import "@azure-tools/typespec-client-generator-core"; +import "@azure-tools/typespec-azure-core"; + +@versioned(Versions) +@service(#{ title: "hello world" }) +@doc("This is a sample typespec project.") +@server( + "{sampleTypeSpecUrl}", + "Endpoint Service", + { + sampleTypeSpecUrl: url, + } +) +@useAuth(ApiKeyAuth | SampleOAuth2) +namespace SampleTypeSpec; + +using TypeSpec.Http; +using TypeSpec.Versioning; +using TypeSpec.HttpClient.CSharp; +using TypeSpec.Xml; +using Azure.ClientGenerator.Core; + +alias SampleOAuth2 = OAuth2Auth<[ + { + type: OAuth2FlowType.implicit; + authorizationUrl: "https://api.example.com/oauth2/authorize"; + refreshUrl: "https://api.example.com/oauth2/refresh"; + scopes: ["read"]; + } +]>; + +enum Versions { + `2024-07-16-preview`, + `2024-08-16-preview`, +} + +@doc("float fixed enum") +enum FloatFixedEnumWithIntValue { + One: 1.0, + Two: 2.0, + Four: 4.0, +} + +@doc("float fixed enum") +enum FloatFixedEnum { + OneDotOne: 1.1, + TwoDotTwo: 2.2, + FourDotFour: 4.4, +} + +@doc("int fixed enum") +enum IntFixedEnum { + One: 1, + Two: 2, + Four: 4, +} + +@doc("Simple enum") +enum StringFixedEnum { + One: "1", + Two: "2", + Four: "4", +} + +@doc("Int based extensible enum") +union IntExtensibleEnum { + int32, + One: 1, + Two: 2, + Four: 4, +} + +@doc("Float based extensible enum") +union FloatExtensibleEnum { + float32, + OneDotOne: 1.1, + TwoDotTwo: 2.2, + FourDotFour: 4.4, +} + +@doc("float fixed enum") +union FloatExtensibleEnumWithIntValue { + float32, + One: 1.0, + Two: 2.0, + Four: 4.0, +} + +@doc("Extensible enum") +union StringExtensibleEnum { + string, + One: "1", + Two: "2", + Four: "4", +} + +@doc("A model with a few properties of literal types") +model Thing { + @doc("name of the Thing") + name: string; + + @doc("required Union") + requiredUnion: string | string[] | int32; + + @doc("required literal string") + requiredLiteralString: "accept"; + + @doc("required nullable string") + requiredNullableString: string | null; + + @doc("required optional string") + optionalNullableString?: string | null; + + @doc("required literal int") + requiredLiteralInt: 123; + + @doc("required literal float") + requiredLiteralFloat: 1.23; + + @doc("required literal bool") + requiredLiteralBool: false; + + @doc("optional literal string") + optionalLiteralString?: "reject"; + + @doc("required nullable literal string") + requiredNullableLiteralString: "someValue" | null; + + @doc("optional literal int") + optionalLiteralInt?: 456; + + @doc("optional literal float") + optionalLiteralFloat?: 4.56; + + @doc("optional literal bool") + optionalLiteralBool?: true; + + @doc("description with xml <|endoftext|>") + requiredBadDescription: string; + + @doc("optional nullable collection") + optionalNullableList?: int32[] | null; + + @doc("required nullable collection") + requiredNullableList: int32[] | null; + + /** + * This tests: + * - Simple bullet point. This bullet point is going to be very long to test how text wrapping is handled in bullet points within documentation comments. It should properly indent the wrapped lines. + * - Another bullet point with **bold text**. This bullet point is also intentionally long to see how the formatting is preserved when the text wraps onto multiple lines in the generated documentation. + * - Third bullet point with *italic text*. Similar to the previous points, this one is extended to ensure that the wrapping and formatting are correctly applied in the output. + * - Complex bullet point with **bold** and *italic* combined. This bullet point combines both bold and italic formatting and is long enough to test the wrapping behavior in such cases. + * - **Bold bullet point**: A bullet point that is entirely bolded. This point is also made lengthy to observe how the bold formatting is maintained across wrapped lines. + * - *Italic bullet point*: A bullet point that is entirely italicized. This final point is extended to verify that italic formatting is correctly applied even when the text spans multiple lines. + */ + propertyWithSpecialDocs: string; +} + +@doc("A model with a few required nullable properties") +model ModelWithRequiredNullableProperties { + @doc("required nullable primitive type") + requiredNullablePrimitive: int32 | null; + + @doc("required nullable extensible enum type") + requiredExtensibleEnum: StringExtensibleEnum | null; + + @doc("required nullable fixed enum type") + requiredFixedEnum: StringFixedEnum | null; +} + +@doc("this is not a friendly model but with a friendly name") +@friendlyName("Friend") +model NotFriend { + @doc("name of the NotFriend") + name: string; +} + +@doc("this is a model with a client name") +@clientName("RenamedModel") +model ModelWithClientName { + @doc("name of the ModelWithClientName") + otherName: string; +} + +model ModelWithEmbeddedNonBodyParameters { + @doc("name of the ModelWithEmbeddedNonBodyParameters") + name: string; + + @doc("required header parameter") + @header + requiredHeader: string; + + @doc("optional header parameter") + @header + optionalHeader?: string; + + @doc("required query parameter") + @query + requiredQuery: string; + + @doc("optional query parameter") + @query + optionalQuery?: string; +} + +@doc("this is a roundtrip model") +model RoundTripModel { + @doc("Required string, illustrating a reference type property.") + requiredString: string; + + @doc("Required int, illustrating a value type property.") + @encode(string) + requiredInt: int32; + + @doc("Required collection of enums") + requiredCollection: StringFixedEnum[]; + + @doc("Required dictionary of enums") + requiredDictionary: Record; + + @doc("Required model") + requiredModel: Thing; + + @doc("this is an int based extensible enum") + intExtensibleEnum?: IntExtensibleEnum; + + @doc("this is a collection of int based extensible enum") + intExtensibleEnumCollection?: IntExtensibleEnum[]; + + @doc("this is a float based extensible enum") + floatExtensibleEnum?: FloatExtensibleEnum; + + @doc("this is a float based extensible enum") + floatExtensibleEnumWithIntValue?: FloatExtensibleEnumWithIntValue; + + @doc("this is a collection of float based extensible enum") + floatExtensibleEnumCollection?: FloatExtensibleEnum[]; + + @doc("this is a float based fixed enum") + floatFixedEnum?: FloatFixedEnum; + + @doc("this is a float based fixed enum") + floatFixedEnumWithIntValue?: FloatFixedEnumWithIntValue; + + @doc("this is a collection of float based fixed enum") + floatFixedEnumCollection?: FloatFixedEnum[]; + + @doc("this is a int based fixed enum") + intFixedEnum?: IntFixedEnum; + + @doc("this is a collection of int based fixed enum") + intFixedEnumCollection?: IntFixedEnum[]; + + @doc("this is a string based fixed enum") + stringFixedEnum?: StringFixedEnum; + + @doc("required unknown") + requiredUnknown: unknown; + + @doc("optional unknown") + optionalUnknown?: unknown; + + @doc("required record of unknown") + requiredRecordUnknown: Record; + + @doc("optional record of unknown") + optionalRecordUnknown?: Record; + + @doc("required readonly record of unknown") + @visibility(Lifecycle.Read) + readOnlyRequiredRecordUnknown: Record; + + @doc("optional readonly record of unknown") + @visibility(Lifecycle.Read) + readOnlyOptionalRecordUnknown?: Record; + + @doc("this is a model with required nullable properties") + modelWithRequiredNullable: ModelWithRequiredNullableProperties; + + @doc("Required bytes") + requiredBytes: bytes; +} + +@doc("A sample dynamic model.") +@dynamicModel +model DynamicModel { + name: string; + optionalUnknown?: unknown; + optionalInt?: int32; + optionalNullableList?: int32[] | null; + requiredNullableList: int32[] | null; + optionalNullableDictionary?: Record | null; + requiredNullableDictionary: Record | null; + primitiveDictionary: Record; + foo: AnotherDynamicModel; + listFoo: AnotherDynamicModel[]; + listOfListFoo: AnotherDynamicModel[][]; + dictionaryFoo: Record; + dictionaryOfDictionaryFoo: Record>; + dictionaryListFoo: Record; + listOfDictionaryFoo: Record[]; +} + +@doc("Another sample dynamic model.") +@dynamicModel +model AnotherDynamicModel { + bar: string; +} + +@nsDeclarations +enum XmlNamespaces { + ns1: "https://example.com/ns1", + ns2: "https://example.com/ns2", +} + +@doc("An advanced XML model for testing various property types and XML features.") +@Xml.name("AdvancedXmlModel") +model XmlAdvancedModel { + @doc("A simple string property") + name: string; + + @doc("An integer property") + age: int32; + + @doc("A boolean property") + enabled: boolean; + + @doc("A float property") + score: float32; + + @doc("An optional string") + optionalString?: string; + + @doc("An optional integer") + optionalInt?: int32; + + @doc("A nullable string") + nullableString: string | null; + + @doc("A string as XML attribute") + @attribute + id: string; + + @doc("An integer as XML attribute") + @attribute + version: int32; + + @doc("A boolean as XML attribute") + @attribute + isActive: boolean; + + @doc("A property with a custom XML element name") + @Xml.name("RenamedProperty") + originalName: string; + + @doc("An attribute with a custom XML name") + @attribute + @Xml.name("xml-id") + xmlIdentifier: string; + + @doc("Text content in the element (unwrapped string)") + @unwrapped + content: string; + + @doc("An unwrapped array of strings - items appear directly without wrapper") + @unwrapped + unwrappedStrings: string[]; + + @doc("An unwrapped array of integers") + @unwrapped + unwrappedCounts: int32[]; + + @doc("An unwrapped array of models") + @unwrapped + unwrappedItems: XmlItem[]; + + @doc("A wrapped array of strings (default)") + wrappedColors: string[]; + + @doc("A wrapped array with custom wrapper name") + @Xml.name("ItemCollection") + items: XmlItem[]; + + @doc("A nested model property") + nestedModel: XmlNestedModel; + + @doc("An optional nested model") + optionalNestedModel?: XmlNestedModel; + + @doc("A dictionary property") + metadata: Record; + + @doc("A date-time property") + createdAt: utcDateTime; + + @doc("A duration property") + duration: duration; + + @doc("A bytes property") + data: bytes; + + @doc("optional record of unknown") + optionalRecordUnknown?: Record; + + @doc("A fixed enum property") + fixedEnum: StringFixedEnum; + + @doc("An extensible enum property") + extensibleEnum: StringExtensibleEnum; + + @doc("An optional fixed enum property") + optionalFixedEnum?: IntFixedEnum; + + @doc("An optional extensible enum property") + optionalExtensibleEnum?: IntExtensibleEnum; + + @attribute + @ns(XmlNamespaces.ns1) + label: string; + + @ns(XmlNamespaces.ns2) + daysUsed: int32; + + @ns("http://www.contoso.com/anotherbook.dtd", "foo") + fooItems: string[]; + + @ns("http://www.contoso.com/anothermodel.dtd", "bar") + anotherModel: XmlNestedModel; + + modelsWithNamespaces: XmlModelWithNamespace[]; + + @unwrapped + unwrappedModelsWithNamespaces: XmlModelWithNamespace[]; + + listOfListFoo: XmlItem[][]; + dictionaryFoo: Record; + dictionaryOfDictionaryFoo: Record>; + dictionaryListFoo: Record; + listOfDictionaryFoo: Record[]; +} + +@doc("A nested model for XML testing") +model XmlNestedModel { + @doc("The value of the nested model") + value: string; + + @doc("An attribute on the nested model") + @attribute + nestedId: int32; +} + +@doc("An item model for XML array testing") +@Xml.name("Item") +model XmlItem { + @doc("The item name") + itemName: string; + + @doc("The item value") + itemValue: int32; + + @doc("Item ID as attribute") + @attribute + itemId: string; +} + +@ns("http://www.example.com/namespace", "ns1") +model XmlModelWithNamespace { + foo: string; +} + +model Wrapper { + @doc("header parameter") + @header + p1: string; + + @doc("body parameter") + @body + action: RoundTripModel; + + @doc("path parameter") + @path + p2: string; +} + +union DaysOfWeekExtensibleEnum { + string, + Monday: "Monday", + Tuesday: "Tuesday", + Wednesday: "Wednesday", + Thursday: "Thursday", + Friday: "Friday", + Saturday: "Saturday", + Sunday: "Sunday", +} + +@route("/hello") +@doc("Return hi") +@get +op sayHi( + @header headParameter: string, + @query queryParameter: string, + @query optionalQuery?: string, +): Thing; + +@route("/againHi") +@doc("Return hi again") +@get +@convenientAPI(true) +op helloAgain( + @header p1: string, + @body action: RoundTripModel, + @header contentType: "text/plain", + @path p2: string, +): RoundTripModel; + +@route("/noContentType") +@doc("Return hi again") +@get +op noContentType( + @header p1: string, + @body action: RoundTripModel, + @path p2: string, +): RoundTripModel; + +op noContentTypeOverride(info: Wrapper): RoundTripModel; + +@@override(noContentType, noContentTypeOverride); + +@route("/demoHi") +@doc("Return hi in demo2") +@get +@convenientAPI(true) +op helloDemo2(): Thing; + +@route("/literal") +@doc("Create with literal value") +@post +@convenientAPI(true) +op createLiteral(@body body: Thing): Thing; + +@route("/helloLiteral") +@doc("Send literal parameters") +@get +@convenientAPI(true) +op helloLiteral(@header p1: "test", @path p2: 123, @query p3: true): Thing; + +@route("/top") +@doc("top level method") +@get +@convenientAPI(true) +op topAction(@path action: utcDateTime): Thing; + +@route("/top2") +@doc("top level method2") +@get +@convenientAPI(false) +op topAction2(): Thing; + +@route("/patch") +@doc("top level patch") +@patch +@convenientAPI(true) +op patchAction(@body body: Thing): Thing; + +@route("/anonymousBody") +@doc("body parameter without body decorator") +@post +@convenientAPI(true) +op anonymousBody( + ...Thing, + @query requiredQueryParam: "someRequiredLiteralQueryParam", + @header requiredHeader: "someRequiredLiteralHeader", +): Thing; + +@route("/friendlyName") +@doc("Model can have its friendly name") +@post +@convenientAPI(true) +op friendlyModel(...NotFriend): NotFriend; + +op addTimeHeader(@header("Repeatability-First-Sent") repeatabilityFirstSent?: utcDateTime): void; + +@route("/projectedName") +@doc("Model can have its projected name") +@post +@convenientAPI(true) +op projectedNameModel(...ModelWithClientName): ModelWithClientName; + +@route("/returnsAnonymousModel") +@doc("return anonymous model") +@post +@convenientAPI(true) +op returnsAnonymousModel(): { + @body body: {}; +}; + +@get +@route("/unknown-value") +@doc("get extensible enum") +op getUnknownValue(): DaysOfWeekExtensibleEnum; + +@doc("When set protocol false and convenient true, then the protocol method should be internal") +@route("internalProtocol") +@post +@convenientAPI(true) +@protocolAPI(false) +op internalProtocol(@body body: Thing): Thing; + +@doc("When set protocol false and convenient true, the convenient method should be generated even it has the same signature as protocol one") +@route("stillConvenient") +@get +@convenientAPI(true) +@protocolAPI(false) +op stillConvenient(): void; + +@route("/headAsBoolean") +@doc("head as boolean.") +@head +@convenientAPI(true) +op headAsBoolean(@path id: string): void; + +@route("/WithApiVersion") +@doc("Return hi again") +@get +@convenientAPI(true) +op WithApiVersion(@header p1: string, @query apiVersion: string): void; + +@route("/link") +@doc("List things with nextlink") +@convenientAPI(true) +@list +op ListWithNextLink(): { + @pageItems + things: Thing[]; + + @nextLink next?: url; +}; + +@route("/linkString") +@doc("List things with nextlink") +@convenientAPI(true) +@list +op ListWithStringNextLink(): { + @pageItems + things: Thing[]; + + @nextLink next?: string; +}; + +@route("/continuation") +@doc("List things with continuation token") +@convenientAPI(true) +@list +op ListWithContinuationToken(@query @continuationToken token?: string): { + @pageItems + things: Thing[]; + + @continuationToken nextToken?: string; +}; + +@route("/continuation/header") +@doc("List things with continuation token header response") +@convenientAPI(true) +@list +op ListWithContinuationTokenHeaderResponse(@query @continuationToken token?: string): { + @pageItems + things: Thing[]; + + @header @continuationToken nextToken?: string; +}; + +model Page { + @pageItems items: T[]; +} + +@route("list/paging") +@doc("List things with paging") +@convenientAPI(true) +@list +op ListWithPaging(): Page; + +@route("embeddedParameters") +@doc("An operation with embedded parameters within the body") +@post +op EmbeddedParameters(@bodyRoot body: ModelWithEmbeddedNonBodyParameters): void; + +@route("dynamicModel") +@doc("An operation with a dynamic model") +@post +op DynamicModelOperation(@body body: DynamicModel): void; + +@route("xmlAdvanced") +@doc("Get an advanced XML model with various property types") +@get +op GetXmlAdvancedModel(): { + @header contentType: "application/xml"; + @body body: XmlAdvancedModel; +}; + +@route("xmlAdvanced") +@doc("Update an advanced XML model with various property types") +@put +op UpdateXmlAdvancedModel(@body body: XmlAdvancedModel, @header contentType: "application/xml"): { + @header contentType: "application/xml"; + @body body: XmlAdvancedModel; +}; + +@doc("Base animal with discriminator") +@discriminator("kind") +model Animal { + @doc("The kind of animal") + kind: string; + + @doc("Name of the animal") + name: string; +} + +alias PetContent = { + @doc("Whether the pet is trained") + trained: boolean; +}; + +@doc("Pet is a discriminated animal") +model Pet extends Animal { + kind: "pet"; + ...PetContent; +} + +alias DogContent = { + @doc("The breed of the dog") + breed: string; +}; + +@doc("Dog is a specific type of pet with hierarchy building") +@Legacy.hierarchyBuilding(Pet) +model Dog extends Animal { + kind: "dog"; + ...PetContent; + ...DogContent; +} + +@route("/animals") +interface AnimalOperations { + @doc("Update a pet as an animal") + @put + @route("/pet/as-animal") + updatePetAsAnimal(@body animal: Animal): Animal; + + @doc("Update a dog as an animal") + @put + @route("/dog/as-animal") + updateDogAsAnimal(@body animal: Animal): Animal; +} + +@route("/pets") +interface PetOperations { + @doc("Update a pet as a pet") + @put + @route("/pet/as-pet") + updatePetAsPet(@body pet: Pet): Pet; + + @doc("Update a dog as a pet") + @put + @route("/dog/as-pet") + updateDogAsPet(@body pet: Pet): Pet; +} + +@route("/dogs") +interface DogOperations { + @doc("Update a dog as a dog") + @put + @route("/dog/as-dog") + updateDogAsDog(@body dog: Dog): Dog; +} + +@doc("Base plant with discriminator") +@discriminator("species") +model Plant { + @doc("The species of plant") + species: string; + + @doc("The unique identifier of the plant") + id: string; + + @doc("The height of the plant in centimeters") + height: int32; +} + +@doc("Tree is a specific type of plant") +model Tree extends Plant { + species: "tree"; + + @doc("The age of the tree in years") + age: int32; +} + +@route("/plants") +interface PlantOperations { + @doc("Get a tree as a plant") + @get + @route("/tree/as-plant") + getTree(): { + @header contentType: "application/xml"; + @body body: Tree; + }; + + @doc("Get a tree as a plant") + @get + @route("/tree/as-plant/json") + getTreeAsJson(): { + @header contentType: "application/json"; + @body body: Tree; + }; + + @doc("Update a tree as a plant") + @put + @route("/tree/as-plant") + updateTree(@body tree: Tree, @header contentType: "application/xml"): { + @header contentType: "application/xml"; + @body body: Tree; + }; + + @doc("Update a tree as a plant") + @put + @route("/tree/as-plant/json") + updateTreeAsJson(@body tree: Tree, @header contentType: "application/json"): { + @header contentType: "application/json"; + @body body: Tree; + }; +} + +model MetricsClientParams { + metricsNamespace: string; +} + +@clientInitialization({ + initializedBy: InitializedBy.individually | InitializedBy.parent, + parameters: MetricsClientParams, +}) +interface Metrics { + @doc("Get Widget metrics for given day of week") + @get + @route("/metrics/{metricsNamespace}/widgets/daysOfWeek") + getWidgetMetrics(@path metricsNamespace: string, @path day: DaysOfWeekExtensibleEnum): { + numSold: int32; + averagePrice: float32; + }; +} + +// E2E example demonstrating @paramAlias with @clientInitialization. +// The client parameter "notebook" is aliased to the operation's "notebookName" path parameter, +// allowing a different parameter name in client initialization while mapping to the original +// operation parameter name on the wire. +model NotebookClientParams { + @paramAlias("notebookName") + notebook: string; +} + +@clientInitialization({ + initializedBy: InitializedBy.individually | InitializedBy.parent, + parameters: NotebookClientParams, +}) +interface Notebooks { + @doc("Get a notebook by name") + @get + @route("/notebooks/{notebookName}") + getNotebook(@path notebookName: string): { + name: string; + content: string; + }; +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/SampleTypeSpec.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/SampleTypeSpec.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/SampleTypeSpec.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/SampleTypeSpec.sln b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/SampleTypeSpec.sln deleted file mode 100644 index 4165fdf5119..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/SampleTypeSpec.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleTypeSpec", "src\SampleTypeSpec.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/SampleTypeSpec.slnx b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/SampleTypeSpec.slnx new file mode 100644 index 00000000000..cf872960259 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/SampleTypeSpec.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/AnimalOperations.RestClient.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/AnimalOperations.RestClient.cs index 8d8d8ffdd75..00cb6af204a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/AnimalOperations.RestClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/AnimalOperations.RestClient.cs @@ -15,7 +15,7 @@ public partial class AnimalOperations { private static PipelineMessageClassifier _pipelineMessageClassifier200; - private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 = PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); + private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); internal PipelineMessage CreateUpdatePetAsAnimalRequest(BinaryContent content, RequestOptions options) { diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResult.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResult.cs index 734a500ba5f..034facf2353 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResult.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResult.cs @@ -54,7 +54,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((ListWithNextLinkResponse)page).Next; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResultOfT.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResultOfT.cs index 8e16c7df327..6ecde199e1c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResultOfT.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkAsyncCollectionResultOfT.cs @@ -55,7 +55,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((ListWithNextLinkResponse)page).Next; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkCollectionResult.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkCollectionResult.cs index 7f73fb10036..e43d87a042a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkCollectionResult.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkCollectionResult.cs @@ -54,7 +54,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((ListWithNextLinkResponse)page).Next; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkCollectionResultOfT.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkCollectionResultOfT.cs index a55b5f1075b..51e1a2f5494 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkCollectionResultOfT.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithNextLinkCollectionResultOfT.cs @@ -54,7 +54,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((ListWithNextLinkResponse)page).Next; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResult.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResult.cs index a172109a1a7..5f2f970edc6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResult.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResult.cs @@ -42,7 +42,7 @@ public override async IAsyncEnumerable GetRawPagesAsync() { yield break; } - nextPageUri = new Uri(nextPageString); + nextPageUri = new Uri(nextPageString, UriKind.RelativeOrAbsolute); message = _client.CreateNextGetWithStringNextLinkRequest(nextPageUri, _options); } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResultOfT.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResultOfT.cs index 7a922887d96..b8b6c3524a1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResultOfT.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkAsyncCollectionResultOfT.cs @@ -43,7 +43,7 @@ public override async IAsyncEnumerable GetRawPagesAsync() { yield break; } - nextPageUri = new Uri(nextPageString); + nextPageUri = new Uri(nextPageString, UriKind.RelativeOrAbsolute); message = _client.CreateNextGetWithStringNextLinkRequest(nextPageUri, _options); } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkCollectionResult.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkCollectionResult.cs index 1c7458f1175..041284bd988 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkCollectionResult.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkCollectionResult.cs @@ -42,7 +42,7 @@ public override IEnumerable GetRawPages() { yield break; } - nextPageUri = new Uri(nextPageString); + nextPageUri = new Uri(nextPageString, UriKind.RelativeOrAbsolute); message = _client.CreateNextGetWithStringNextLinkRequest(nextPageUri, _options); } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkCollectionResultOfT.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkCollectionResultOfT.cs index eeeb20e4615..5d4b31a80f6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkCollectionResultOfT.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/CollectionResults/SampleTypeSpecClientGetWithStringNextLinkCollectionResultOfT.cs @@ -42,7 +42,7 @@ public override IEnumerable GetRawPages() { yield break; } - nextPageUri = new Uri(nextPageString); + nextPageUri = new Uri(nextPageString, UriKind.RelativeOrAbsolute); message = _client.CreateNextGetWithStringNextLinkRequest(nextPageUri, _options); } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/DogOperations.RestClient.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/DogOperations.RestClient.cs index ce03fb07b17..fe9cd837dd9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/DogOperations.RestClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/DogOperations.RestClient.cs @@ -15,7 +15,7 @@ public partial class DogOperations { private static PipelineMessageClassifier _pipelineMessageClassifier200; - private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 = PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); + private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); internal PipelineMessage CreateUpdateDogAsDogRequest(BinaryContent content, RequestOptions options) { diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Internal/Argument.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Internal/Argument.cs index ec840fc17ad..e9d84f503cd 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Internal/Argument.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Internal/Argument.cs @@ -70,5 +70,44 @@ public static void AssertNotNullOrEmpty(string value, string name) throw new ArgumentException("Value cannot be an empty string.", name); } } + + /// The value. + /// The name. + public static void AssertNotNullOrWhiteSpace(string value, string name) + { + if (value is null) + { + throw new ArgumentNullException(name); + } + if (string.IsNullOrWhiteSpace(value)) + { + throw new ArgumentException("Value cannot be empty or contain only white-space characters.", name); + } + } + + /// The value. + /// The minimum value. + /// The maximum value. + /// The name. + public static void AssertInRange(T value, T minimum, T maximum, string name) + where T : notnull, IComparable + { + if (minimum.CompareTo(value) > 0) + { + throw new ArgumentOutOfRangeException(name, "Value is less than the minimum allowed."); + } + if (maximum.CompareTo(value) < 0) + { + throw new ArgumentOutOfRangeException(name, "Value is greater than the maximum allowed."); + } + } + + /// The value. + /// The name. + public static string CheckNotNullOrEmpty(string value, string name) + { + AssertNotNullOrEmpty(value, name); + return value; + } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Internal/ModelSerializationExtensions.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Internal/ModelSerializationExtensions.cs index 099511239df..2fa84356c07 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Internal/ModelSerializationExtensions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Internal/ModelSerializationExtensions.cs @@ -11,9 +11,12 @@ using System.Collections.Generic; using System.Diagnostics; using System.Globalization; +using System.IO; using System.Runtime.InteropServices; using System.Text; using System.Text.Json; +using System.Xml; +using System.Xml.Linq; namespace SampleTypeSpec { @@ -24,6 +27,18 @@ internal static partial class ModelSerializationExtensions { MaxDepth = 256 }; + internal static readonly XmlWriterSettings XmlWriterSettings = new XmlWriterSettings + { + Encoding = new UTF8Encoding(false) + }; + private static readonly XmlReaderSettings XmlReaderSettings = new XmlReaderSettings + { + DtdProcessing = DtdProcessing.Prohibit, + XmlResolver = null, + MaxCharactersInDocument = 30000000, + IgnoreProcessingInstructions = true, + IgnoreComments = true + }; public static object GetObject(this JsonElement element) { @@ -342,5 +357,72 @@ public static ReadOnlySpan GetRemainder(this ReadOnlySpan jsonPath, { return index >= jsonPath.Length ? ReadOnlySpan.Empty : jsonPath[index] == '.' ? jsonPath.Slice(index) : jsonPath.Slice(index + 2); } + + public static DateTimeOffset GetDateTimeOffset(this XElement element, string format) => format switch + { + "U" => DateTimeOffset.FromUnixTimeSeconds((long)element), + _ => TypeFormatters.ParseDateTimeOffset(element.Value, format) + }; + + public static TimeSpan GetTimeSpan(this XElement element, string format) => TypeFormatters.ParseTimeSpan(element.Value, format); + + public static byte[] GetBytesFromBase64(this XElement element, string format) => format switch + { + "U" => TypeFormatters.FromBase64UrlString(element.Value), + "D" => Convert.FromBase64String(element.Value), + _ => throw new ArgumentException("Format is not supported: ", nameof(format)) + }; + + public static void WriteStringValue(this XmlWriter writer, DateTimeOffset value, string format) + { + writer.WriteValue(TypeFormatters.ToString(value, format)); + } + + public static void WriteStringValue(this XmlWriter writer, TimeSpan value, string format) + { + writer.WriteValue(TypeFormatters.ToString(value, format)); + } + + public static void WriteBase64StringValue(this XmlWriter writer, byte[] value, string format) + { + writer.WriteValue(TypeFormatters.ToString(value, format)); + } + + public static void WriteObjectValue(this XmlWriter writer, T value, ModelReaderWriterOptions options = null, string nameHint = null) + { + switch (value) + { + case IPersistableModel persistableModel: + BinaryData data = ModelReaderWriter.Write(persistableModel, options ?? WireOptions, SampleTypeSpecContext.Default); + using (Stream stream = data.ToStream()) + { + using (XmlReader reader = XmlReader.Create(stream, XmlReaderSettings)) + { + reader.MoveToContent(); + if (nameHint != null) + { + writer.WriteStartElement(nameHint); + reader.ReadStartElement(); + while (reader.NodeType != XmlNodeType.EndElement) + { + writer.WriteNode(reader, true); + } + writer.WriteEndElement(); + } + else + { + reader.ReadStartElement(); + while (reader.NodeType != XmlNodeType.EndElement) + { + writer.WriteNode(reader, true); + } + } + } + } + return; + default: + throw new NotSupportedException($"Not supported type {typeof(T)}"); + } + } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Metrics.RestClient.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Metrics.RestClient.cs index 46dcb8b7d81..697b9766d36 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Metrics.RestClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Metrics.RestClient.cs @@ -14,13 +14,15 @@ public partial class Metrics { private static PipelineMessageClassifier _pipelineMessageClassifier200; - private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 = PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); + private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); internal PipelineMessage CreateGetWidgetMetricsRequest(string day, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); uri.Reset(_endpoint); - uri.AppendPath("/metrics/widgets/daysOfWeek/", false); + uri.AppendPath("/metrics/", false); + uri.AppendPath(_metricsNamespace, true); + uri.AppendPath("/widgets/daysOfWeek/", false); uri.AppendPath(day, true); PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Metrics.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Metrics.cs index 8f9c0ffffb6..dab61b07de2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Metrics.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Metrics.cs @@ -8,6 +8,8 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -17,6 +19,18 @@ namespace SampleTypeSpec public partial class Metrics { private readonly Uri _endpoint; + private const string AuthorizationHeader = "my-api-key"; + /// The OAuth2 flows supported by the service. + private static readonly Dictionary[] _flows = new Dictionary[] + { + new Dictionary + { + { GetTokenOptions.ScopesPropertyName, new string[] { "read" } }, + { GetTokenOptions.AuthorizationUrlPropertyName, "https://api.example.com/oauth2/authorize" }, + { GetTokenOptions.RefreshUrlPropertyName, "https://api.example.com/oauth2/refresh" } + } + }; + private readonly string _metricsNamespace; /// Initializes a new instance of Metrics for mocking. protected Metrics() @@ -26,31 +40,85 @@ protected Metrics() /// Initializes a new instance of Metrics. /// The HTTP pipeline for sending and receiving REST requests and responses. /// Service endpoint. - internal Metrics(ClientPipeline pipeline, Uri endpoint) + /// + internal Metrics(ClientPipeline pipeline, Uri endpoint, string metricsNamespace) { _endpoint = endpoint; Pipeline = pipeline; + _metricsNamespace = metricsNamespace; + } + + /// Initializes a new instance of Metrics. + /// Service endpoint. + /// + /// A credential used to authenticate to the service. + /// , or is null. + /// is an empty string, and was expected to be non-empty. + public Metrics(Uri endpoint, string metricsNamespace, ApiKeyCredential credential) : this(endpoint, metricsNamespace, credential, new SampleTypeSpecClientOptions()) + { } /// Initializes a new instance of Metrics. /// Service endpoint. - /// is null. - public Metrics(Uri endpoint) : this(endpoint, new SampleTypeSpecClientOptions()) + /// + /// A credential provider used to authenticate to the service. + /// , or is null. + /// is an empty string, and was expected to be non-empty. + public Metrics(Uri endpoint, string metricsNamespace, AuthenticationTokenProvider tokenProvider) : this(endpoint, metricsNamespace, tokenProvider, new SampleTypeSpecClientOptions()) { } /// Initializes a new instance of Metrics. + /// The authentication policy to use for pipeline creation. /// Service endpoint. + /// /// The options for configuring the client. - /// is null. - public Metrics(Uri endpoint, SampleTypeSpecClientOptions options) + internal Metrics(AuthenticationPolicy authenticationPolicy, Uri endpoint, string metricsNamespace, SampleTypeSpecClientOptions options) { Argument.AssertNotNull(endpoint, nameof(endpoint)); + Argument.AssertNotNullOrEmpty(metricsNamespace, nameof(metricsNamespace)); options ??= new SampleTypeSpecClientOptions(); _endpoint = endpoint; - Pipeline = ClientPipeline.Create(options, Array.Empty(), new PipelinePolicy[] { new UserAgentPolicy(typeof(Metrics).Assembly) }, Array.Empty()); + _metricsNamespace = metricsNamespace; + if (authenticationPolicy != null) + { + Pipeline = ClientPipeline.Create(options, Array.Empty(), new PipelinePolicy[] { new UserAgentPolicy(typeof(Metrics).Assembly), authenticationPolicy }, Array.Empty()); + } + else + { + Pipeline = ClientPipeline.Create(options, Array.Empty(), new PipelinePolicy[] { new UserAgentPolicy(typeof(Metrics).Assembly) }, Array.Empty()); + } + } + + /// Initializes a new instance of Metrics. + /// Service endpoint. + /// + /// A credential used to authenticate to the service. + /// The options for configuring the client. + /// , or is null. + /// is an empty string, and was expected to be non-empty. + public Metrics(Uri endpoint, string metricsNamespace, ApiKeyCredential credential, SampleTypeSpecClientOptions options) : this(ApiKeyAuthenticationPolicy.CreateHeaderApiKeyPolicy(credential, AuthorizationHeader), endpoint, metricsNamespace, options) + { + } + + /// Initializes a new instance of Metrics. + /// Service endpoint. + /// + /// A credential provider used to authenticate to the service. + /// The options for configuring the client. + /// , or is null. + /// is an empty string, and was expected to be non-empty. + public Metrics(Uri endpoint, string metricsNamespace, AuthenticationTokenProvider tokenProvider, SampleTypeSpecClientOptions options) : this(new BearerTokenPolicy(tokenProvider, _flows), endpoint, metricsNamespace, options) + { + } + + /// Initializes a new instance of Metrics from a . + /// The settings for Metrics. + [Experimental("SCME0002")] + public Metrics(MetricsSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.SampleTypeSpecUrl, settings?.MetricsNamespace, settings?.Options) + { } /// The HTTP pipeline for sending and receiving REST requests and responses. diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/MetricsSettings.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/MetricsSettings.cs new file mode 100644 index 00000000000..ef92878a0d4 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/MetricsSettings.cs @@ -0,0 +1,48 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace SampleTypeSpec +{ + /// Represents the settings used to configure a that can be loaded from an . + [Experimental("SCME0002")] + public partial class MetricsSettings : ClientSettings + { + /// Gets or sets the SampleTypeSpecUrl. + public Uri SampleTypeSpecUrl { get; set; } + + /// Gets or sets the MetricsNamespace. + public string MetricsNamespace { get; set; } + + /// Gets or sets the Options. + public SampleTypeSpecClientOptions Options { get; set; } + + /// Binds configuration values from the given section. + /// The configuration section. + protected override void BindCore(IConfigurationSection section) + { + if (Uri.TryCreate(section["SampleTypeSpecUrl"], UriKind.Absolute, out Uri sampleTypeSpecUrl)) + { + SampleTypeSpecUrl = sampleTypeSpecUrl; + } + string metricsNamespace = section["MetricsNamespace"]; + if (!string.IsNullOrEmpty(metricsNamespace)) + { + MetricsNamespace = metricsNamespace; + } + IConfigurationSection optionsSection = section.GetSection("Options"); + if (optionsSection.Exists()) + { + Options = new SampleTypeSpecClientOptions(optionsSection); + } + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Animal.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Animal.Serialization.cs index 36d704a717f..fa3a9214a91 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Animal.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Animal.Serialization.cs @@ -24,6 +24,64 @@ internal Animal() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeAnimal(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(Animal)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(Animal)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Animal IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(Animal animal) + { + if (animal == null) + { + return null; + } + return BinaryContent.Create(animal, ModelSerializationExtensions.WireOptions); + } + + /// The to deserialize the from. + public static explicit operator Animal(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeAnimal(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -100,63 +158,5 @@ internal static Animal DeserializeAnimal(JsonElement element, ModelReaderWriterO } return UnknownAnimal.DeserializeUnknownAnimal(element, options); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(Animal)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - Animal IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializeAnimal(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(Animal)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to serialize into . - public static implicit operator BinaryContent(Animal animal) - { - if (animal == null) - { - return null; - } - return BinaryContent.Create(animal, ModelSerializationExtensions.WireOptions); - } - - /// The to deserialize the from. - public static explicit operator Animal(ClientResult result) - { - PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeAnimal(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/AnotherDynamicModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/AnotherDynamicModel.Serialization.cs index 05e288342d8..e1f0fb26a5a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/AnotherDynamicModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/AnotherDynamicModel.Serialization.cs @@ -20,6 +20,46 @@ internal AnotherDynamicModel() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual AnotherDynamicModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeAnotherDynamicModel(document.RootElement, data, options); + } + default: + throw new FormatException($"The model {nameof(AnotherDynamicModel)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(AnotherDynamicModel)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + AnotherDynamicModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -98,45 +138,5 @@ internal static AnotherDynamicModel DeserializeAnotherDynamicModel(JsonElement e } return new AnotherDynamicModel(bar, patch); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(AnotherDynamicModel)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - AnotherDynamicModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual AnotherDynamicModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializeAnotherDynamicModel(document.RootElement, data, options); - } - default: - throw new FormatException($"The model {nameof(AnotherDynamicModel)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Dog.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Dog.Serialization.cs index 470450f2c6e..552a00748d7 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Dog.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Dog.Serialization.cs @@ -21,6 +21,64 @@ internal Dog() { } + /// The data to parse. + /// The client options for reading and writing models. + protected override Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeDog(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(Dog)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(Dog)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Dog IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (Dog)PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(Dog dog) + { + if (dog == null) + { + return null; + } + return BinaryContent.Create(dog, ModelSerializationExtensions.WireOptions); + } + + /// The to deserialize the from. + public static explicit operator Dog(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeDog(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -103,63 +161,5 @@ internal static Dog DeserializeDog(JsonElement element, ModelReaderWriterOptions } return new Dog(kind, name, additionalBinaryDataProperties, trained, breed); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(Dog)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - Dog IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (Dog)PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected override Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializeDog(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(Dog)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to serialize into . - public static implicit operator BinaryContent(Dog dog) - { - if (dog == null) - { - return null; - } - return BinaryContent.Create(dog, ModelSerializationExtensions.WireOptions); - } - - /// The to deserialize the from. - public static explicit operator Dog(ClientResult result) - { - PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeDog(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/DynamicModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/DynamicModel.Serialization.cs index acf28b88405..804c2d3a362 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/DynamicModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/DynamicModel.Serialization.cs @@ -22,6 +22,56 @@ internal DynamicModel() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual DynamicModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeDynamicModel(document.RootElement, data, options); + } + default: + throw new FormatException($"The model {nameof(DynamicModel)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(DynamicModel)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + DynamicModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(DynamicModel dynamicModel) + { + if (dynamicModel == null) + { + return null; + } + return BinaryContent.Create(dynamicModel, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -705,56 +755,6 @@ internal static DynamicModel DeserializeDynamicModel(JsonElement element, Binary patch); } - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(DynamicModel)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - DynamicModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual DynamicModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializeDynamicModel(document.RootElement, data, options); - } - default: - throw new FormatException($"The model {nameof(DynamicModel)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to serialize into . - public static implicit operator BinaryContent(DynamicModel dynamicModel) - { - if (dynamicModel == null) - { - return null; - } - return BinaryContent.Create(dynamicModel, ModelSerializationExtensions.WireOptions); - } - /// /// /// diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Friend.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Friend.Serialization.cs index 715466fac81..eb5a160122a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Friend.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Friend.Serialization.cs @@ -22,6 +22,64 @@ internal Friend() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual Friend PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeFriend(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(Friend)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(Friend)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Friend IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(Friend friend) + { + if (friend == null) + { + return null; + } + return BinaryContent.Create(friend, ModelSerializationExtensions.WireOptions); + } + + /// The to deserialize the from. + public static explicit operator Friend(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeFriend(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -100,63 +158,5 @@ internal static Friend DeserializeFriend(JsonElement element, ModelReaderWriterO } return new Friend(name, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(Friend)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - Friend IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual Friend PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializeFriend(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(Friend)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to serialize into . - public static implicit operator BinaryContent(Friend friend) - { - if (friend == null) - { - return null; - } - return BinaryContent.Create(friend, ModelSerializationExtensions.WireOptions); - } - - /// The to deserialize the from. - public static explicit operator Friend(ClientResult result) - { - PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeFriend(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/GetNotebookResponse.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/GetNotebookResponse.Serialization.cs new file mode 100644 index 00000000000..9c34abe0624 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/GetNotebookResponse.Serialization.cs @@ -0,0 +1,159 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Text.Json; + +namespace SampleTypeSpec +{ + /// The GetNotebookResponse. + public partial class GetNotebookResponse : IJsonModel + { + /// Initializes a new instance of for deserialization. + internal GetNotebookResponse() + { + } + + /// The data to parse. + /// The client options for reading and writing models. + protected virtual GetNotebookResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeGetNotebookResponse(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(GetNotebookResponse)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(GetNotebookResponse)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + GetNotebookResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to deserialize the from. + public static explicit operator GetNotebookResponse(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeGetNotebookResponse(document.RootElement, ModelSerializationExtensions.WireOptions); + } + + /// The JSON writer. + /// The client options for reading and writing models. + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + writer.WriteStartObject(); + JsonModelWriteCore(writer, options); + writer.WriteEndObject(); + } + + /// The JSON writer. + /// The client options for reading and writing models. + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(GetNotebookResponse)} does not support writing '{format}' format."); + } + writer.WritePropertyName("name"u8); + writer.WriteStringValue(Name); + writer.WritePropertyName("content"u8); + writer.WriteStringValue(Content); + if (options.Format != "W" && _additionalBinaryDataProperties != null) + { + foreach (var item in _additionalBinaryDataProperties) + { + writer.WritePropertyName(item.Key); +#if NET6_0_OR_GREATER + writer.WriteRawValue(item.Value); +#else + using (JsonDocument document = JsonDocument.Parse(item.Value)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + } + } + + /// The JSON reader. + /// The client options for reading and writing models. + GetNotebookResponse IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + + /// The JSON reader. + /// The client options for reading and writing models. + protected virtual GetNotebookResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(GetNotebookResponse)} does not support reading '{format}' format."); + } + using JsonDocument document = JsonDocument.ParseValue(ref reader); + return DeserializeGetNotebookResponse(document.RootElement, options); + } + + /// The JSON element to deserialize. + /// The client options for reading and writing models. + internal static GetNotebookResponse DeserializeGetNotebookResponse(JsonElement element, ModelReaderWriterOptions options) + { + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + string name = default; + string content = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + foreach (var prop in element.EnumerateObject()) + { + if (prop.NameEquals("name"u8)) + { + name = prop.Value.GetString(); + continue; + } + if (prop.NameEquals("content"u8)) + { + content = prop.Value.GetString(); + continue; + } + if (options.Format != "W") + { + additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); + } + } + return new GetNotebookResponse(name, content, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/GetNotebookResponse.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/GetNotebookResponse.cs new file mode 100644 index 00000000000..af0f633f72a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/GetNotebookResponse.cs @@ -0,0 +1,45 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace SampleTypeSpec +{ + /// The GetNotebookResponse. + public partial class GetNotebookResponse + { + /// Keeps track of any properties unknown to the library. + private protected readonly IDictionary _additionalBinaryDataProperties; + + /// Initializes a new instance of . + /// + /// + internal GetNotebookResponse(string name, string content) + { + Name = name; + Content = content; + } + + /// Initializes a new instance of . + /// + /// + /// Keeps track of any properties unknown to the library. + internal GetNotebookResponse(string name, string content, IDictionary additionalBinaryDataProperties) + { + Name = name; + Content = content; + _additionalBinaryDataProperties = additionalBinaryDataProperties; + } + + /// Gets the Name. + public string Name { get; } + + /// Gets the Content. + public string Content { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/GetWidgetMetricsResponse.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/GetWidgetMetricsResponse.Serialization.cs index d7a261e2e5b..166e38e991e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/GetWidgetMetricsResponse.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/GetWidgetMetricsResponse.Serialization.cs @@ -21,6 +21,54 @@ internal GetWidgetMetricsResponse() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual GetWidgetMetricsResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeGetWidgetMetricsResponse(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(GetWidgetMetricsResponse)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(GetWidgetMetricsResponse)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + GetWidgetMetricsResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to deserialize the from. + public static explicit operator GetWidgetMetricsResponse(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeGetWidgetMetricsResponse(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -107,53 +155,5 @@ internal static GetWidgetMetricsResponse DeserializeGetWidgetMetricsResponse(Jso } return new GetWidgetMetricsResponse(numSold, averagePrice, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(GetWidgetMetricsResponse)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - GetWidgetMetricsResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual GetWidgetMetricsResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializeGetWidgetMetricsResponse(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(GetWidgetMetricsResponse)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to deserialize the from. - public static explicit operator GetWidgetMetricsResponse(ClientResult result) - { - PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeGetWidgetMetricsResponse(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ListWithContinuationTokenHeaderResponseResponse.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ListWithContinuationTokenHeaderResponseResponse.Serialization.cs index 753e36cf347..2ebf7fbba85 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ListWithContinuationTokenHeaderResponseResponse.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ListWithContinuationTokenHeaderResponseResponse.Serialization.cs @@ -21,6 +21,54 @@ internal ListWithContinuationTokenHeaderResponseResponse() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual ListWithContinuationTokenHeaderResponseResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeListWithContinuationTokenHeaderResponseResponse(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(ListWithContinuationTokenHeaderResponseResponse)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(ListWithContinuationTokenHeaderResponseResponse)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + ListWithContinuationTokenHeaderResponseResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to deserialize the from. + public static explicit operator ListWithContinuationTokenHeaderResponseResponse(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeListWithContinuationTokenHeaderResponseResponse(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -109,53 +157,5 @@ internal static ListWithContinuationTokenHeaderResponseResponse DeserializeListW } return new ListWithContinuationTokenHeaderResponseResponse(things, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(ListWithContinuationTokenHeaderResponseResponse)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - ListWithContinuationTokenHeaderResponseResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual ListWithContinuationTokenHeaderResponseResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializeListWithContinuationTokenHeaderResponseResponse(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(ListWithContinuationTokenHeaderResponseResponse)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to deserialize the from. - public static explicit operator ListWithContinuationTokenHeaderResponseResponse(ClientResult result) - { - PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeListWithContinuationTokenHeaderResponseResponse(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ListWithContinuationTokenResponse.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ListWithContinuationTokenResponse.Serialization.cs index 1f3bdc3a151..6e622e685fe 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ListWithContinuationTokenResponse.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ListWithContinuationTokenResponse.Serialization.cs @@ -21,6 +21,54 @@ internal ListWithContinuationTokenResponse() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual ListWithContinuationTokenResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeListWithContinuationTokenResponse(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(ListWithContinuationTokenResponse)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(ListWithContinuationTokenResponse)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + ListWithContinuationTokenResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to deserialize the from. + public static explicit operator ListWithContinuationTokenResponse(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeListWithContinuationTokenResponse(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -120,53 +168,5 @@ internal static ListWithContinuationTokenResponse DeserializeListWithContinuatio } return new ListWithContinuationTokenResponse(things, nextToken, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(ListWithContinuationTokenResponse)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - ListWithContinuationTokenResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual ListWithContinuationTokenResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializeListWithContinuationTokenResponse(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(ListWithContinuationTokenResponse)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to deserialize the from. - public static explicit operator ListWithContinuationTokenResponse(ClientResult result) - { - PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeListWithContinuationTokenResponse(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ListWithNextLinkResponse.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ListWithNextLinkResponse.Serialization.cs index a7b7a76b808..96bd3d2b4cb 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ListWithNextLinkResponse.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ListWithNextLinkResponse.Serialization.cs @@ -21,6 +21,54 @@ internal ListWithNextLinkResponse() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual ListWithNextLinkResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeListWithNextLinkResponse(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(ListWithNextLinkResponse)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(ListWithNextLinkResponse)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + ListWithNextLinkResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to deserialize the from. + public static explicit operator ListWithNextLinkResponse(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeListWithNextLinkResponse(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -114,7 +162,7 @@ internal static ListWithNextLinkResponse DeserializeListWithNextLinkResponse(Jso { continue; } - next = string.IsNullOrEmpty(prop.Value.GetString()) ? null : new Uri(prop.Value.GetString()); + next = string.IsNullOrEmpty(prop.Value.GetString()) ? null : new Uri(prop.Value.GetString(), UriKind.RelativeOrAbsolute); continue; } if (options.Format != "W") @@ -124,53 +172,5 @@ internal static ListWithNextLinkResponse DeserializeListWithNextLinkResponse(Jso } return new ListWithNextLinkResponse(things, next, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(ListWithNextLinkResponse)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - ListWithNextLinkResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual ListWithNextLinkResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializeListWithNextLinkResponse(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(ListWithNextLinkResponse)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to deserialize the from. - public static explicit operator ListWithNextLinkResponse(ClientResult result) - { - PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeListWithNextLinkResponse(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ListWithStringNextLinkResponse.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ListWithStringNextLinkResponse.Serialization.cs index d67a1f445b4..8c69549a2dd 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ListWithStringNextLinkResponse.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ListWithStringNextLinkResponse.Serialization.cs @@ -21,6 +21,54 @@ internal ListWithStringNextLinkResponse() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual ListWithStringNextLinkResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeListWithStringNextLinkResponse(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(ListWithStringNextLinkResponse)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(ListWithStringNextLinkResponse)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + ListWithStringNextLinkResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to deserialize the from. + public static explicit operator ListWithStringNextLinkResponse(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeListWithStringNextLinkResponse(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -120,53 +168,5 @@ internal static ListWithStringNextLinkResponse DeserializeListWithStringNextLink } return new ListWithStringNextLinkResponse(things, next, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(ListWithStringNextLinkResponse)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - ListWithStringNextLinkResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual ListWithStringNextLinkResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializeListWithStringNextLinkResponse(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(ListWithStringNextLinkResponse)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to deserialize the from. - public static explicit operator ListWithStringNextLinkResponse(ClientResult result) - { - PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeListWithStringNextLinkResponse(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ModelWithEmbeddedNonBodyParameters.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ModelWithEmbeddedNonBodyParameters.Serialization.cs index 89013095b0b..9a14bf5a949 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ModelWithEmbeddedNonBodyParameters.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ModelWithEmbeddedNonBodyParameters.Serialization.cs @@ -21,6 +21,56 @@ internal ModelWithEmbeddedNonBodyParameters() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual ModelWithEmbeddedNonBodyParameters PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeModelWithEmbeddedNonBodyParameters(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(ModelWithEmbeddedNonBodyParameters)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(ModelWithEmbeddedNonBodyParameters)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + ModelWithEmbeddedNonBodyParameters IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(ModelWithEmbeddedNonBodyParameters modelWithEmbeddedNonBodyParameters) + { + if (modelWithEmbeddedNonBodyParameters == null) + { + return null; + } + return BinaryContent.Create(modelWithEmbeddedNonBodyParameters, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -109,55 +159,5 @@ internal static ModelWithEmbeddedNonBodyParameters DeserializeModelWithEmbeddedN optionalQuery, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(ModelWithEmbeddedNonBodyParameters)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - ModelWithEmbeddedNonBodyParameters IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual ModelWithEmbeddedNonBodyParameters PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializeModelWithEmbeddedNonBodyParameters(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(ModelWithEmbeddedNonBodyParameters)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to serialize into . - public static implicit operator BinaryContent(ModelWithEmbeddedNonBodyParameters modelWithEmbeddedNonBodyParameters) - { - if (modelWithEmbeddedNonBodyParameters == null) - { - return null; - } - return BinaryContent.Create(modelWithEmbeddedNonBodyParameters, ModelSerializationExtensions.WireOptions); - } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs index 9871324e6a1..2f3f4434cdc 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs @@ -20,6 +20,46 @@ internal ModelWithRequiredNullableProperties() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual ModelWithRequiredNullableProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeModelWithRequiredNullableProperties(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(ModelWithRequiredNullableProperties)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(ModelWithRequiredNullableProperties)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + ModelWithRequiredNullableProperties IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -150,45 +190,5 @@ internal static ModelWithRequiredNullableProperties DeserializeModelWithRequired } return new ModelWithRequiredNullableProperties(requiredNullablePrimitive, requiredExtensibleEnum, requiredFixedEnum, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(ModelWithRequiredNullableProperties)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - ModelWithRequiredNullableProperties IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual ModelWithRequiredNullableProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializeModelWithRequiredNullableProperties(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(ModelWithRequiredNullableProperties)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/PageThing.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/PageThing.Serialization.cs index c1c6b331996..cb23fca29f1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/PageThing.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/PageThing.Serialization.cs @@ -21,6 +21,54 @@ internal PageThing() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual PageThing PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializePageThing(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(PageThing)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(PageThing)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + PageThing IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to deserialize the from. + public static explicit operator PageThing(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializePageThing(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -109,53 +157,5 @@ internal static PageThing DeserializePageThing(JsonElement element, ModelReaderW } return new PageThing(items, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(PageThing)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - PageThing IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual PageThing PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializePageThing(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(PageThing)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to deserialize the from. - public static explicit operator PageThing(ClientResult result) - { - PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializePageThing(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Pet.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Pet.Serialization.cs index e7d61d27402..8aa4a4afecf 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Pet.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Pet.Serialization.cs @@ -20,6 +20,64 @@ internal Pet() { } + /// The data to parse. + /// The client options for reading and writing models. + protected override Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializePet(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(Pet)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(Pet)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Pet IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (Pet)PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(Pet pet) + { + if (pet == null) + { + return null; + } + return BinaryContent.Create(pet, ModelSerializationExtensions.WireOptions); + } + + /// The to deserialize the from. + public static explicit operator Pet(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializePet(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -78,63 +136,5 @@ internal static Pet DeserializePet(JsonElement element, ModelReaderWriterOptions } return UnknownPet.DeserializeUnknownPet(element, options); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(Pet)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - Pet IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (Pet)PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected override Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializePet(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(Pet)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to serialize into . - public static implicit operator BinaryContent(Pet pet) - { - if (pet == null) - { - return null; - } - return BinaryContent.Create(pet, ModelSerializationExtensions.WireOptions); - } - - /// The to deserialize the from. - public static explicit operator Pet(ClientResult result) - { - PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializePet(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Plant.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Plant.Serialization.cs new file mode 100644 index 00000000000..74ed6663ebd --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Plant.Serialization.cs @@ -0,0 +1,227 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.IO; +using System.Text.Json; +using System.Xml; +using System.Xml.Linq; + +namespace SampleTypeSpec +{ + /// + /// Base plant with discriminator + /// Please note this is the abstract base class. The derived classes available for instantiation are: . + /// + [PersistableModelProxy(typeof(UnknownPlant))] + public abstract partial class Plant : IJsonModel + { + /// Initializes a new instance of for deserialization. + internal Plant() + { + } + + /// The data to parse. + /// The client options for reading and writing models. + protected virtual Plant PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializePlant(document.RootElement, options); + } + case "X": + using (Stream dataStream = data.ToStream()) + { + return DeserializePlant(XElement.Load(dataStream, LoadOptions.PreserveWhitespace), options); + } + default: + throw new FormatException($"The model {nameof(Plant)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + case "X": + using (MemoryStream stream = new MemoryStream(256)) + { + using (XmlWriter writer = XmlWriter.Create(stream, ModelSerializationExtensions.XmlWriterSettings)) + { + WriteXml(writer, options, "Plant"); + } + if (stream.Position > int.MaxValue) + { + return BinaryData.FromStream(stream); + } + else + { + return new BinaryData(stream.GetBuffer().AsMemory(0, (int)stream.Position)); + } + } + default: + throw new FormatException($"The model {nameof(Plant)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Plant IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The JSON writer. + /// The client options for reading and writing models. + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + writer.WriteStartObject(); + JsonModelWriteCore(writer, options); + writer.WriteEndObject(); + } + + /// The JSON writer. + /// The client options for reading and writing models. + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(Plant)} does not support writing '{format}' format."); + } + writer.WritePropertyName("species"u8); + writer.WriteStringValue(Species); + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + writer.WritePropertyName("height"u8); + writer.WriteNumberValue(Height); + if (options.Format != "W" && _additionalBinaryDataProperties != null) + { + foreach (var item in _additionalBinaryDataProperties) + { + writer.WritePropertyName(item.Key); +#if NET6_0_OR_GREATER + writer.WriteRawValue(item.Value); +#else + using (JsonDocument document = JsonDocument.Parse(item.Value)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + } + } + + /// The JSON reader. + /// The client options for reading and writing models. + Plant IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + + /// The JSON reader. + /// The client options for reading and writing models. + protected virtual Plant JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(Plant)} does not support reading '{format}' format."); + } + using JsonDocument document = JsonDocument.ParseValue(ref reader); + return DeserializePlant(document.RootElement, options); + } + + /// The JSON element to deserialize. + /// The client options for reading and writing models. + internal static Plant DeserializePlant(JsonElement element, ModelReaderWriterOptions options) + { + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + if (element.TryGetProperty("species"u8, out JsonElement discriminator)) + { + switch (discriminator.GetString()) + { + case "tree": + return Tree.DeserializeTree(element, options); + } + } + return UnknownPlant.DeserializeUnknownPlant(element, options); + } + + /// The XML writer. + /// The client options for reading and writing models. + /// An optional name hint. + private void WriteXml(XmlWriter writer, ModelReaderWriterOptions options, string nameHint) + { + if (nameHint != null) + { + writer.WriteStartElement(nameHint); + } + + XmlModelWriteCore(writer, options); + + if (nameHint != null) + { + writer.WriteEndElement(); + } + } + + /// The XML writer. + /// The client options for reading and writing models. + internal virtual void XmlModelWriteCore(XmlWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "X") + { + throw new FormatException($"The model {nameof(Plant)} does not support writing '{format}' format."); + } + + writer.WriteStartElement("species"); + writer.WriteValue(Species); + writer.WriteEndElement(); + writer.WriteStartElement("id"); + writer.WriteValue(Id); + writer.WriteEndElement(); + writer.WriteStartElement("height"); + writer.WriteValue(Height); + writer.WriteEndElement(); + } + + /// The xml element to deserialize. + /// The client options for reading and writing models. + internal static Plant DeserializePlant(XElement element, ModelReaderWriterOptions options) + { + if (element == null) + { + return null; + } + + XElement discriminatorElement = element.Element("species"); + if (discriminatorElement != null) + { + switch ((string)discriminatorElement) + { + case "tree": + return Tree.DeserializeTree(element, options); + } + } + return UnknownPlant.DeserializeUnknownPlant(element, options); + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Plant.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Plant.cs new file mode 100644 index 00000000000..5971ae229a6 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Plant.cs @@ -0,0 +1,55 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace SampleTypeSpec +{ + /// + /// Base plant with discriminator + /// Please note this is the abstract base class. The derived classes available for instantiation are: . + /// + public abstract partial class Plant + { + /// Keeps track of any properties unknown to the library. + private protected readonly IDictionary _additionalBinaryDataProperties; + + /// Initializes a new instance of . + /// The species of plant. + /// The unique identifier of the plant. + /// The height of the plant in centimeters. + private protected Plant(string species, string id, int height) + { + Species = species; + Id = id; + Height = height; + } + + /// Initializes a new instance of . + /// The species of plant. + /// The unique identifier of the plant. + /// The height of the plant in centimeters. + /// Keeps track of any properties unknown to the library. + internal Plant(string species, string id, int height, IDictionary additionalBinaryDataProperties) + { + Species = species; + Id = id; + Height = height; + _additionalBinaryDataProperties = additionalBinaryDataProperties; + } + + /// The species of plant. + internal string Species { get; set; } + + /// The unique identifier of the plant. + public string Id { get; set; } + + /// The height of the plant in centimeters. + public int Height { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/RenamedModelCustom.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/RenamedModelCustom.Serialization.cs index 667d863ca58..3a1718f8385 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/RenamedModelCustom.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/RenamedModelCustom.Serialization.cs @@ -22,6 +22,64 @@ internal RenamedModelCustom() { } + /// The data to parse. + /// The client options for reading and writing models. + protected override Friend PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeRenamedModelCustom(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(RenamedModelCustom)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(RenamedModelCustom)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + RenamedModelCustom IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (RenamedModelCustom)PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(RenamedModelCustom renamedModelCustom) + { + if (renamedModelCustom == null) + { + return null; + } + return BinaryContent.Create(renamedModelCustom, ModelSerializationExtensions.WireOptions); + } + + /// The to deserialize the from. + public static explicit operator RenamedModelCustom(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeRenamedModelCustom(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -92,63 +150,5 @@ internal static RenamedModelCustom DeserializeRenamedModelCustom(JsonElement ele } return new RenamedModelCustom(name, additionalBinaryDataProperties, otherName); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(RenamedModelCustom)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - RenamedModelCustom IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (RenamedModelCustom)PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected override Friend PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializeRenamedModelCustom(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(RenamedModelCustom)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to serialize into . - public static implicit operator BinaryContent(RenamedModelCustom renamedModelCustom) - { - if (renamedModelCustom == null) - { - return null; - } - return BinaryContent.Create(renamedModelCustom, ModelSerializationExtensions.WireOptions); - } - - /// The to deserialize the from. - public static explicit operator RenamedModelCustom(ClientResult result) - { - PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeRenamedModelCustom(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs index 28685cb3e92..b12004ddab8 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs @@ -16,6 +16,54 @@ namespace SampleTypeSpec /// The ReturnsAnonymousModelResponse. public partial class ReturnsAnonymousModelResponse : IJsonModel { + /// The data to parse. + /// The client options for reading and writing models. + protected virtual ReturnsAnonymousModelResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeReturnsAnonymousModelResponse(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(ReturnsAnonymousModelResponse)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(ReturnsAnonymousModelResponse)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + ReturnsAnonymousModelResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to deserialize the from. + public static explicit operator ReturnsAnonymousModelResponse(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeReturnsAnonymousModelResponse(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -86,53 +134,5 @@ internal static ReturnsAnonymousModelResponse DeserializeReturnsAnonymousModelRe } return new ReturnsAnonymousModelResponse(additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(ReturnsAnonymousModelResponse)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - ReturnsAnonymousModelResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual ReturnsAnonymousModelResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializeReturnsAnonymousModelResponse(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(ReturnsAnonymousModelResponse)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to deserialize the from. - public static explicit operator ReturnsAnonymousModelResponse(ClientResult result) - { - PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeReturnsAnonymousModelResponse(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/RoundTripModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/RoundTripModel.Serialization.cs index 59152f4ac49..0fa6f37b2d4 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/RoundTripModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/RoundTripModel.Serialization.cs @@ -21,6 +21,64 @@ internal RoundTripModel() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual RoundTripModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeRoundTripModel(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(RoundTripModel)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(RoundTripModel)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + RoundTripModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(RoundTripModel roundTripModel) + { + if (roundTripModel == null) + { + return null; + } + return BinaryContent.Create(roundTripModel, ModelSerializationExtensions.WireOptions); + } + + /// The to deserialize the from. + public static explicit operator RoundTripModel(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeRoundTripModel(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -604,63 +662,5 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo requiredBytes, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(RoundTripModel)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - RoundTripModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual RoundTripModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializeRoundTripModel(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(RoundTripModel)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to serialize into . - public static implicit operator BinaryContent(RoundTripModel roundTripModel) - { - if (roundTripModel == null) - { - return null; - } - return BinaryContent.Create(roundTripModel, ModelSerializationExtensions.WireOptions); - } - - /// The to deserialize the from. - public static explicit operator RoundTripModel(ClientResult result) - { - PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeRoundTripModel(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/SampleTypeSpecContext.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/SampleTypeSpecContext.cs index 2a2fe6a977f..c50862552e8 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/SampleTypeSpecContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/SampleTypeSpecContext.cs @@ -19,6 +19,7 @@ namespace SampleTypeSpec [ModelReaderWriterBuildable(typeof(Dog))] [ModelReaderWriterBuildable(typeof(DynamicModel))] [ModelReaderWriterBuildable(typeof(Friend))] + [ModelReaderWriterBuildable(typeof(GetNotebookResponse))] [ModelReaderWriterBuildable(typeof(GetWidgetMetricsResponse))] [ModelReaderWriterBuildable(typeof(ListWithContinuationTokenHeaderResponseResponse))] [ModelReaderWriterBuildable(typeof(ListWithContinuationTokenResponse))] @@ -28,12 +29,20 @@ namespace SampleTypeSpec [ModelReaderWriterBuildable(typeof(ModelWithRequiredNullableProperties))] [ModelReaderWriterBuildable(typeof(PageThing))] [ModelReaderWriterBuildable(typeof(Pet))] + [ModelReaderWriterBuildable(typeof(Plant))] [ModelReaderWriterBuildable(typeof(RenamedModelCustom))] [ModelReaderWriterBuildable(typeof(ReturnsAnonymousModelResponse))] [ModelReaderWriterBuildable(typeof(RoundTripModel))] [ModelReaderWriterBuildable(typeof(Thing))] + [ModelReaderWriterBuildable(typeof(Tree))] [ModelReaderWriterBuildable(typeof(UnknownAnimal))] [ModelReaderWriterBuildable(typeof(UnknownPet))] + [ModelReaderWriterBuildable(typeof(UnknownPlant))] + [ModelReaderWriterBuildable(typeof(Wrapper))] + [ModelReaderWriterBuildable(typeof(XmlAdvancedModel))] + [ModelReaderWriterBuildable(typeof(XmlItem))] + [ModelReaderWriterBuildable(typeof(XmlModelWithNamespace))] + [ModelReaderWriterBuildable(typeof(XmlNestedModel))] public partial class SampleTypeSpecContext : ModelReaderWriterContext { } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Thing.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Thing.Serialization.cs index cc309d6d3ad..18f817f1050 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Thing.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Thing.Serialization.cs @@ -21,6 +21,64 @@ internal Thing() { } + /// The data to parse. + /// The client options for reading and writing models. + protected virtual Thing PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeThing(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(Thing)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(Thing)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Thing IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(Thing thing) + { + if (thing == null) + { + return null; + } + return BinaryContent.Create(thing, ModelSerializationExtensions.WireOptions); + } + + /// The to deserialize the from. + public static explicit operator Thing(ClientResult result) + { + PipelineResponse response = result.GetRawResponse(); + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeThing(document.RootElement, ModelSerializationExtensions.WireOptions); + } + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -351,63 +409,5 @@ internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOpt propertyWithSpecialDocs, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(Thing)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - Thing IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected virtual Thing PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializeThing(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(Thing)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; - - /// The to serialize into . - public static implicit operator BinaryContent(Thing thing) - { - if (thing == null) - { - return null; - } - return BinaryContent.Create(thing, ModelSerializationExtensions.WireOptions); - } - - /// The to deserialize the from. - public static explicit operator Thing(ClientResult result) - { - PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeThing(document.RootElement, ModelSerializationExtensions.WireOptions); - } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Tree.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Tree.Serialization.cs new file mode 100644 index 00000000000..54ff6299a2d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Tree.Serialization.cs @@ -0,0 +1,285 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.IO; +using System.Text.Json; +using System.Xml; +using System.Xml.Linq; + +namespace SampleTypeSpec +{ + /// Tree is a specific type of plant. + public partial class Tree : Plant, IJsonModel + { + /// Initializes a new instance of for deserialization. + internal Tree() + { + } + + /// The data to parse. + /// The client options for reading and writing models. + protected override Plant PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeTree(document.RootElement, options); + } + case "X": + using (Stream dataStream = data.ToStream()) + { + return DeserializeTree(XElement.Load(dataStream, LoadOptions.PreserveWhitespace), options); + } + default: + throw new FormatException($"The model {nameof(Tree)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + case "X": + using (MemoryStream stream = new MemoryStream(256)) + { + using (XmlWriter writer = XmlWriter.Create(stream, ModelSerializationExtensions.XmlWriterSettings)) + { + WriteXml(writer, options, "Tree"); + } + if (stream.Position > int.MaxValue) + { + return BinaryData.FromStream(stream); + } + else + { + return new BinaryData(stream.GetBuffer().AsMemory(0, (int)stream.Position)); + } + } + default: + throw new FormatException($"The model {nameof(Tree)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Tree IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (Tree)PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The to serialize into . + public static implicit operator BinaryContent(Tree tree) + { + if (tree == null) + { + return null; + } + return BinaryContent.Create(tree, ModelSerializationExtensions.WireOptions); + } + + /// Converts the model to BinaryContent using the specified format. + /// The format to use for serialization. + internal BinaryContent ToBinaryContent(string format) + { + ModelReaderWriterOptions options = new ModelReaderWriterOptions(format); + return BinaryContent.Create(this, options); + } + + /// The to deserialize the from. + public static explicit operator Tree(ClientResult result) + { + using PipelineResponse response = result.GetRawResponse(); + + if (response.Headers.TryGetValue("Content-Type", out string value) && value.StartsWith("application/json", StringComparison.OrdinalIgnoreCase)) + { + using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeTree(document.RootElement, ModelSerializationExtensions.WireOptions); + } + + using Stream stream = response.ContentStream; + if (stream == null) + { + return default; + } + + return DeserializeTree(XElement.Load(stream, LoadOptions.PreserveWhitespace), ModelSerializationExtensions.WireOptions); + } + + /// The JSON writer. + /// The client options for reading and writing models. + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + writer.WriteStartObject(); + JsonModelWriteCore(writer, options); + writer.WriteEndObject(); + } + + /// The JSON writer. + /// The client options for reading and writing models. + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(Tree)} does not support writing '{format}' format."); + } + base.JsonModelWriteCore(writer, options); + writer.WritePropertyName("age"u8); + writer.WriteNumberValue(Age); + } + + /// The JSON reader. + /// The client options for reading and writing models. + Tree IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (Tree)JsonModelCreateCore(ref reader, options); + + /// The JSON reader. + /// The client options for reading and writing models. + protected override Plant JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(Tree)} does not support reading '{format}' format."); + } + using JsonDocument document = JsonDocument.ParseValue(ref reader); + return DeserializeTree(document.RootElement, options); + } + + /// The JSON element to deserialize. + /// The client options for reading and writing models. + internal static Tree DeserializeTree(JsonElement element, ModelReaderWriterOptions options) + { + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + string species = "tree"; + string id = default; + int height = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + int age = default; + foreach (var prop in element.EnumerateObject()) + { + if (prop.NameEquals("species"u8)) + { + species = prop.Value.GetString(); + continue; + } + if (prop.NameEquals("id"u8)) + { + id = prop.Value.GetString(); + continue; + } + if (prop.NameEquals("height"u8)) + { + height = prop.Value.GetInt32(); + continue; + } + if (prop.NameEquals("age"u8)) + { + age = prop.Value.GetInt32(); + continue; + } + if (options.Format != "W") + { + additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); + } + } + return new Tree(species, id, height, additionalBinaryDataProperties, age); + } + + /// The XML writer. + /// The client options for reading and writing models. + /// An optional name hint. + private void WriteXml(XmlWriter writer, ModelReaderWriterOptions options, string nameHint) + { + if (nameHint != null) + { + writer.WriteStartElement(nameHint); + } + + XmlModelWriteCore(writer, options); + + if (nameHint != null) + { + writer.WriteEndElement(); + } + } + + /// The XML writer. + /// The client options for reading and writing models. + internal override void XmlModelWriteCore(XmlWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "X") + { + throw new FormatException($"The model {nameof(Tree)} does not support writing '{format}' format."); + } + + base.XmlModelWriteCore(writer, options); + writer.WriteStartElement("age"); + writer.WriteValue(Age); + writer.WriteEndElement(); + } + + /// The xml element to deserialize. + /// The client options for reading and writing models. + internal static Tree DeserializeTree(XElement element, ModelReaderWriterOptions options) + { + if (element == null) + { + return null; + } + + string species = "tree"; + string id = default; + int height = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + int age = default; + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if (localName == "species") + { + species = (string)child; + continue; + } + if (localName == "id") + { + id = (string)child; + continue; + } + if (localName == "height") + { + height = (int)child; + continue; + } + if (localName == "age") + { + age = (int)child; + continue; + } + } + return new Tree(species, id, height, additionalBinaryDataProperties, age); + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Tree.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Tree.cs new file mode 100644 index 00000000000..4f2da7ae83d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Tree.cs @@ -0,0 +1,42 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace SampleTypeSpec +{ + /// Tree is a specific type of plant. + public partial class Tree : Plant + { + /// Initializes a new instance of . + /// The unique identifier of the plant. + /// The height of the plant in centimeters. + /// The age of the tree in years. + /// is null. + public Tree(string id, int height, int age) : base("tree", id, height) + { + Argument.AssertNotNull(id, nameof(id)); + + Age = age; + } + + /// Initializes a new instance of . + /// The species of plant. + /// The unique identifier of the plant. + /// The height of the plant in centimeters. + /// Keeps track of any properties unknown to the library. + /// The age of the tree in years. + internal Tree(string species, string id, int height, IDictionary additionalBinaryDataProperties, int age) : base(species, id, height, additionalBinaryDataProperties) + { + Age = age; + } + + /// The age of the tree in years. + public int Age { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/UnknownAnimal.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/UnknownAnimal.Serialization.cs index 535dd928e85..dc78a3ac157 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/UnknownAnimal.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/UnknownAnimal.Serialization.cs @@ -19,6 +19,46 @@ internal UnknownAnimal() { } + /// The data to parse. + /// The client options for reading and writing models. + protected override Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeAnimal(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(Animal)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(Animal)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Animal IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -87,45 +127,5 @@ internal static UnknownAnimal DeserializeUnknownAnimal(JsonElement element, Mode } return new UnknownAnimal(kind, name, additionalBinaryDataProperties); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(Animal)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - Animal IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected override Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializeAnimal(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(Animal)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/UnknownPet.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/UnknownPet.Serialization.cs index b0074ad04b3..7030900a374 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/UnknownPet.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/UnknownPet.Serialization.cs @@ -19,6 +19,46 @@ internal UnknownPet() { } + /// The data to parse. + /// The client options for reading and writing models. + protected override Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializePet(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(Pet)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(Pet)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Pet IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (UnknownPet)PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + /// The JSON writer. /// The client options for reading and writing models. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) @@ -93,45 +133,5 @@ internal static UnknownPet DeserializeUnknownPet(JsonElement element, ModelReade } return new UnknownPet(kind, name, additionalBinaryDataProperties, trained); } - - /// The client options for reading and writing models. - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); - - /// The client options for reading and writing models. - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); - default: - throw new FormatException($"The model {nameof(Pet)} does not support writing '{options.Format}' format."); - } - } - - /// The data to parse. - /// The client options for reading and writing models. - Pet IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (UnknownPet)PersistableModelCreateCore(data, options); - - /// The data to parse. - /// The client options for reading and writing models. - protected override Animal PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) - { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; - switch (format) - { - case "J": - using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) - { - return DeserializePet(document.RootElement, options); - } - default: - throw new FormatException($"The model {nameof(Pet)} does not support reading '{options.Format}' format."); - } - } - - /// The client options for reading and writing models. - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/UnknownPlant.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/UnknownPlant.Serialization.cs new file mode 100644 index 00000000000..ce27edb64eb --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/UnknownPlant.Serialization.cs @@ -0,0 +1,228 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.IO; +using System.Text.Json; +using System.Xml; +using System.Xml.Linq; + +namespace SampleTypeSpec +{ + internal partial class UnknownPlant : Plant, IJsonModel + { + /// Initializes a new instance of for deserialization. + internal UnknownPlant() + { + } + + /// The data to parse. + /// The client options for reading and writing models. + protected override Plant PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializePlant(document.RootElement, options); + } + case "X": + using (Stream dataStream = data.ToStream()) + { + return DeserializePlant(XElement.Load(dataStream, LoadOptions.PreserveWhitespace), options); + } + default: + throw new FormatException($"The model {nameof(Plant)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + case "X": + using (MemoryStream stream = new MemoryStream(256)) + { + using (XmlWriter writer = XmlWriter.Create(stream, ModelSerializationExtensions.XmlWriterSettings)) + { + WriteXml(writer, options, "Plant"); + } + if (stream.Position > int.MaxValue) + { + return BinaryData.FromStream(stream); + } + else + { + return new BinaryData(stream.GetBuffer().AsMemory(0, (int)stream.Position)); + } + } + default: + throw new FormatException($"The model {nameof(Plant)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Plant IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The JSON writer. + /// The client options for reading and writing models. + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + writer.WriteStartObject(); + JsonModelWriteCore(writer, options); + writer.WriteEndObject(); + } + + /// The JSON writer. + /// The client options for reading and writing models. + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(Plant)} does not support writing '{format}' format."); + } + base.JsonModelWriteCore(writer, options); + } + + /// The JSON reader. + /// The client options for reading and writing models. + Plant IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + + /// The JSON reader. + /// The client options for reading and writing models. + protected override Plant JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(Plant)} does not support reading '{format}' format."); + } + using JsonDocument document = JsonDocument.ParseValue(ref reader); + return DeserializePlant(document.RootElement, options); + } + + /// The JSON element to deserialize. + /// The client options for reading and writing models. + internal static UnknownPlant DeserializeUnknownPlant(JsonElement element, ModelReaderWriterOptions options) + { + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + string species = "unknown"; + string id = default; + int height = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + foreach (var prop in element.EnumerateObject()) + { + if (prop.NameEquals("species"u8)) + { + species = prop.Value.GetString(); + continue; + } + if (prop.NameEquals("id"u8)) + { + id = prop.Value.GetString(); + continue; + } + if (prop.NameEquals("height"u8)) + { + height = prop.Value.GetInt32(); + continue; + } + if (options.Format != "W") + { + additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); + } + } + return new UnknownPlant(species, id, height, additionalBinaryDataProperties); + } + + /// The XML writer. + /// The client options for reading and writing models. + /// An optional name hint. + private void WriteXml(XmlWriter writer, ModelReaderWriterOptions options, string nameHint) + { + if (nameHint != null) + { + writer.WriteStartElement(nameHint); + } + + XmlModelWriteCore(writer, options); + + if (nameHint != null) + { + writer.WriteEndElement(); + } + } + + /// The XML writer. + /// The client options for reading and writing models. + internal override void XmlModelWriteCore(XmlWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "X") + { + throw new FormatException($"The model {nameof(Plant)} does not support writing '{format}' format."); + } + + base.XmlModelWriteCore(writer, options); + } + + /// The xml element to deserialize. + /// The client options for reading and writing models. + internal static UnknownPlant DeserializeUnknownPlant(XElement element, ModelReaderWriterOptions options) + { + if (element == null) + { + return null; + } + + string species = "unknown"; + string id = default; + int height = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if (localName == "species") + { + species = (string)child; + continue; + } + if (localName == "id") + { + id = (string)child; + continue; + } + if (localName == "height") + { + height = (int)child; + continue; + } + } + return new UnknownPlant(species, id, height, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/UnknownPlant.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/UnknownPlant.cs new file mode 100644 index 00000000000..3b2b318e66f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/UnknownPlant.cs @@ -0,0 +1,24 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace SampleTypeSpec +{ + internal partial class UnknownPlant : Plant + { + /// Initializes a new instance of . + /// The species of plant. + /// The unique identifier of the plant. + /// The height of the plant in centimeters. + /// Keeps track of any properties unknown to the library. + internal UnknownPlant(string species, string id, int height, IDictionary additionalBinaryDataProperties) : base(species ?? "unknown", id, height, additionalBinaryDataProperties) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Wrapper.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Wrapper.Serialization.cs new file mode 100644 index 00000000000..3ff5f26729d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Wrapper.Serialization.cs @@ -0,0 +1,144 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Text.Json; + +namespace SampleTypeSpec +{ + /// The Wrapper. + public partial class Wrapper : IJsonModel + { + /// Initializes a new instance of for deserialization. + internal Wrapper() + { + } + + /// The data to parse. + /// The client options for reading and writing models. + protected virtual Wrapper PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions)) + { + return DeserializeWrapper(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(Wrapper)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, SampleTypeSpecContext.Default); + default: + throw new FormatException($"The model {nameof(Wrapper)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + Wrapper IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// The JSON writer. + /// The client options for reading and writing models. + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + writer.WriteStartObject(); + JsonModelWriteCore(writer, options); + writer.WriteEndObject(); + } + + /// The JSON writer. + /// The client options for reading and writing models. + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(Wrapper)} does not support writing '{format}' format."); + } + writer.WritePropertyName("action"u8); + writer.WriteObjectValue(Action, options); + if (options.Format != "W" && _additionalBinaryDataProperties != null) + { + foreach (var item in _additionalBinaryDataProperties) + { + writer.WritePropertyName(item.Key); +#if NET6_0_OR_GREATER + writer.WriteRawValue(item.Value); +#else + using (JsonDocument document = JsonDocument.Parse(item.Value)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + } + } + + /// The JSON reader. + /// The client options for reading and writing models. + Wrapper IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + + /// The JSON reader. + /// The client options for reading and writing models. + protected virtual Wrapper JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(Wrapper)} does not support reading '{format}' format."); + } + using JsonDocument document = JsonDocument.ParseValue(ref reader); + return DeserializeWrapper(document.RootElement, options); + } + + /// The JSON element to deserialize. + /// The client options for reading and writing models. + internal static Wrapper DeserializeWrapper(JsonElement element, ModelReaderWriterOptions options) + { + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + string p1 = default; + RoundTripModel action = default; + string p2 = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + foreach (var prop in element.EnumerateObject()) + { + if (prop.NameEquals("action"u8)) + { + action = RoundTripModel.DeserializeRoundTripModel(prop.Value, options); + continue; + } + if (options.Format != "W") + { + additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); + } + } + return new Wrapper(p1, action, p2, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Wrapper.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Wrapper.cs new file mode 100644 index 00000000000..4899c3770e7 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/Wrapper.cs @@ -0,0 +1,57 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace SampleTypeSpec +{ + /// The Wrapper. + public partial class Wrapper + { + /// Keeps track of any properties unknown to the library. + private protected readonly IDictionary _additionalBinaryDataProperties; + + /// Initializes a new instance of . + /// header parameter. + /// body parameter. + /// path parameter. + /// , or is null. + public Wrapper(string p1, RoundTripModel action, string p2) + { + Argument.AssertNotNull(p1, nameof(p1)); + Argument.AssertNotNull(action, nameof(action)); + Argument.AssertNotNull(p2, nameof(p2)); + + P1 = p1; + Action = action; + P2 = p2; + } + + /// Initializes a new instance of . + /// header parameter. + /// body parameter. + /// path parameter. + /// Keeps track of any properties unknown to the library. + internal Wrapper(string p1, RoundTripModel action, string p2, IDictionary additionalBinaryDataProperties) + { + P1 = p1; + Action = action; + P2 = p2; + _additionalBinaryDataProperties = additionalBinaryDataProperties; + } + + /// header parameter. + public string P1 { get; } + + /// body parameter. + public RoundTripModel Action { get; } + + /// path parameter. + public string P2 { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlAdvancedModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlAdvancedModel.Serialization.cs new file mode 100644 index 00000000000..82cb1a9d4f8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlAdvancedModel.Serialization.cs @@ -0,0 +1,743 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.IO; +using System.Xml; +using System.Xml.Linq; + +namespace SampleTypeSpec +{ + /// An advanced XML model for testing various property types and XML features. + public partial class XmlAdvancedModel : IPersistableModel + { + /// Initializes a new instance of for deserialization. + internal XmlAdvancedModel() + { + } + + /// The data to parse. + /// The client options for reading and writing models. + protected virtual XmlAdvancedModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (Stream dataStream = data.ToStream()) + { + return DeserializeXmlAdvancedModel(XElement.Load(dataStream, LoadOptions.PreserveWhitespace), options); + } + default: + throw new FormatException($"The model {nameof(XmlAdvancedModel)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (MemoryStream stream = new MemoryStream(256)) + { + using (XmlWriter writer = XmlWriter.Create(stream, ModelSerializationExtensions.XmlWriterSettings)) + { + WriteXml(writer, options, "AdvancedXmlModel"); + } + if (stream.Position > int.MaxValue) + { + return BinaryData.FromStream(stream); + } + else + { + return new BinaryData(stream.GetBuffer().AsMemory(0, (int)stream.Position)); + } + } + default: + throw new FormatException($"The model {nameof(XmlAdvancedModel)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + XmlAdvancedModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "X"; + + /// The to serialize into . + public static implicit operator BinaryContent(XmlAdvancedModel xmlAdvancedModel) + { + if (xmlAdvancedModel == null) + { + return null; + } + return BinaryContent.Create(xmlAdvancedModel, ModelSerializationExtensions.WireOptions); + } + + /// The to deserialize the from. + public static explicit operator XmlAdvancedModel(ClientResult result) + { + using PipelineResponse response = result.GetRawResponse(); + using Stream stream = response.ContentStream; + if (stream == null) + { + return default; + } + + return DeserializeXmlAdvancedModel(XElement.Load(stream, LoadOptions.PreserveWhitespace), ModelSerializationExtensions.WireOptions); + } + + /// The XML writer. + /// The client options for reading and writing models. + /// An optional name hint. + private void WriteXml(XmlWriter writer, ModelReaderWriterOptions options, string nameHint) + { + if (nameHint != null) + { + writer.WriteStartElement(nameHint); + } + + XmlModelWriteCore(writer, options); + + if (nameHint != null) + { + writer.WriteEndElement(); + } + } + + /// The XML writer. + /// The client options for reading and writing models. + internal virtual void XmlModelWriteCore(XmlWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "X") + { + throw new FormatException($"The model {nameof(XmlAdvancedModel)} does not support writing '{format}' format."); + } + + writer.WriteStartAttribute("id"); + writer.WriteValue(Id); + writer.WriteEndAttribute(); + writer.WriteStartAttribute("version"); + writer.WriteValue(Version); + writer.WriteEndAttribute(); + writer.WriteStartAttribute("isActive"); + writer.WriteValue(IsActive); + writer.WriteEndAttribute(); + writer.WriteStartAttribute("xml-id"); + writer.WriteValue(XmlIdentifier); + writer.WriteEndAttribute(); + writer.WriteAttributeString("ns1", "label", "https://example.com/ns1", Label); + writer.WriteStartElement("name"); + writer.WriteValue(Name); + writer.WriteEndElement(); + writer.WriteStartElement("age"); + writer.WriteValue(Age); + writer.WriteEndElement(); + writer.WriteStartElement("enabled"); + writer.WriteValue(Enabled); + writer.WriteEndElement(); + writer.WriteStartElement("score"); + writer.WriteValue(Score); + writer.WriteEndElement(); + if (Optional.IsDefined(OptionalString)) + { + writer.WriteStartElement("optionalString"); + writer.WriteValue(OptionalString); + writer.WriteEndElement(); + } + if (Optional.IsDefined(OptionalInt)) + { + writer.WriteStartElement("optionalInt"); + writer.WriteValue(OptionalInt.Value); + writer.WriteEndElement(); + } + if (Optional.IsDefined(NullableString)) + { + writer.WriteStartElement("nullableString"); + writer.WriteValue(NullableString); + writer.WriteEndElement(); + } + writer.WriteStartElement("RenamedProperty"); + writer.WriteValue(OriginalName); + writer.WriteEndElement(); + foreach (string item in UnwrappedStrings) + { + writer.WriteStartElement("unwrappedStrings"); + writer.WriteValue(item); + writer.WriteEndElement(); + } + foreach (int item in UnwrappedCounts) + { + writer.WriteStartElement("unwrappedCounts"); + writer.WriteValue(item); + writer.WriteEndElement(); + } + foreach (XmlItem item in UnwrappedItems) + { + writer.WriteStartElement("unwrappedItems"); + writer.WriteObjectValue(item, options); + writer.WriteEndElement(); + } + writer.WriteStartElement("wrappedColors"); + foreach (string item in WrappedColors) + { + writer.WriteStartElement("string"); + writer.WriteValue(item); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteStartElement("ItemCollection"); + foreach (XmlItem item in Items) + { + writer.WriteStartElement("Item"); + writer.WriteObjectValue(item, options); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteStartElement("nestedModel"); + writer.WriteObjectValue(NestedModel, options); + writer.WriteEndElement(); + if (Optional.IsDefined(OptionalNestedModel)) + { + writer.WriteStartElement("optionalNestedModel"); + writer.WriteObjectValue(OptionalNestedModel, options); + writer.WriteEndElement(); + } + writer.WriteStartElement("metadata"); + foreach (var pair in Metadata) + { + writer.WriteStartElement(pair.Key); + writer.WriteValue(pair.Value); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteStartElement("createdAt"); + writer.WriteStringValue(CreatedAt, "O"); + writer.WriteEndElement(); + writer.WriteStartElement("duration"); + writer.WriteStringValue(Duration, "P"); + writer.WriteEndElement(); + writer.WriteStartElement("data"); + writer.WriteBase64StringValue(Data.ToArray(), "D"); + writer.WriteEndElement(); + if (Optional.IsCollectionDefined(OptionalRecordUnknown)) + { + writer.WriteStartElement("optionalRecordUnknown"); + foreach (var pair in OptionalRecordUnknown) + { + writer.WriteStartElement(pair.Key); + writer.WriteValue(pair.Value.ToString()); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + } + writer.WriteStartElement("fixedEnum"); + writer.WriteValue(FixedEnum.ToSerialString()); + writer.WriteEndElement(); + writer.WriteStartElement("extensibleEnum"); + writer.WriteValue(ExtensibleEnum.ToString()); + writer.WriteEndElement(); + if (Optional.IsDefined(OptionalFixedEnum)) + { + writer.WriteStartElement("optionalFixedEnum"); + writer.WriteValue((int)OptionalFixedEnum.Value); + writer.WriteEndElement(); + } + if (Optional.IsDefined(OptionalExtensibleEnum)) + { + writer.WriteStartElement("optionalExtensibleEnum"); + writer.WriteValue(OptionalExtensibleEnum.Value.ToSerialInt32()); + writer.WriteEndElement(); + } + writer.WriteStartElement("ns2", "daysUsed", "https://example.com/ns2"); + writer.WriteValue(DaysUsed); + writer.WriteEndElement(); + writer.WriteStartElement("foo", "fooItems", "http://www.contoso.com/anotherbook.dtd"); + foreach (string item in FooItems) + { + writer.WriteStartElement("string"); + writer.WriteValue(item); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteStartElement("bar", "anotherModel", "http://www.contoso.com/anothermodel.dtd"); + writer.WriteObjectValue(AnotherModel, options); + writer.WriteEndElement(); + writer.WriteStartElement("modelsWithNamespaces"); + foreach (XmlModelWithNamespace item in ModelsWithNamespaces) + { + writer.WriteStartElement("ns1", "XmlModelWithNamespace", "http://www.example.com/namespace"); + writer.WriteObjectValue(item, options); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + foreach (XmlModelWithNamespace item in UnwrappedModelsWithNamespaces) + { + writer.WriteStartElement("unwrappedModelsWithNamespaces"); + writer.WriteObjectValue(item, options); + writer.WriteEndElement(); + } + writer.WriteStartElement("listOfListFoo"); + foreach (IList item in ListOfListFoo) + { + writer.WriteStartElement("Array"); + foreach (XmlItem item0 in item) + { + writer.WriteStartElement("XmlItem"); + writer.WriteObjectValue(item0, options); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteStartElement("dictionaryFoo"); + foreach (var pair in DictionaryFoo) + { + writer.WriteStartElement(pair.Key); + writer.WriteObjectValue(pair.Value, options); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteStartElement("dictionaryOfDictionaryFoo"); + foreach (var pair in DictionaryOfDictionaryFoo) + { + writer.WriteStartElement(pair.Key); + foreach (var pair0 in pair.Value) + { + writer.WriteStartElement(pair0.Key); + writer.WriteObjectValue(pair0.Value, options); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteStartElement("dictionaryListFoo"); + foreach (var pair in DictionaryListFoo) + { + writer.WriteStartElement(pair.Key); + foreach (XmlItem item in pair.Value) + { + writer.WriteStartElement("XmlItem"); + writer.WriteObjectValue(item, options); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteStartElement("listOfDictionaryFoo"); + foreach (IDictionary item in ListOfDictionaryFoo) + { + writer.WriteStartElement("Record"); + foreach (var pair in item) + { + writer.WriteStartElement(pair.Key); + writer.WriteObjectValue(pair.Value, options); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteValue(Content); + } + + /// The xml element to deserialize. + /// The client options for reading and writing models. + internal static XmlAdvancedModel DeserializeXmlAdvancedModel(XElement element, ModelReaderWriterOptions options) + { + if (element == null) + { + return null; + } + + XNamespace labelNs = "https://example.com/ns1"; + XNamespace daysUsedNs = "https://example.com/ns2"; + XNamespace fooItemsNs = "http://www.contoso.com/anotherbook.dtd"; + XNamespace anotherModelNs = "http://www.contoso.com/anothermodel.dtd"; + XNamespace modelsWithNamespacesNs = "http://www.example.com/namespace"; + + string name = default; + int age = default; + bool enabled = default; + float score = default; + string optionalString = default; + int? optionalInt = default; + string nullableString = default; + string id = default; + int version = default; + bool isActive = default; + string originalName = default; + string xmlIdentifier = default; + string content = default; + IList unwrappedStrings = new List(); + IList unwrappedCounts = new List(); + IList unwrappedItems = new List(); + IList wrappedColors = default; + IList items = default; + XmlNestedModel nestedModel = default; + XmlNestedModel optionalNestedModel = default; + IDictionary metadata = default; + DateTimeOffset createdAt = default; + TimeSpan duration = default; + BinaryData data = default; + IDictionary optionalRecordUnknown = default; + StringFixedEnum fixedEnum = default; + StringExtensibleEnum extensibleEnum = default; + IntFixedEnum? optionalFixedEnum = default; + IntExtensibleEnum? optionalExtensibleEnum = default; + string label = default; + int daysUsed = default; + IList fooItems = default; + XmlNestedModel anotherModel = default; + IList modelsWithNamespaces = default; + IList unwrappedModelsWithNamespaces = new List(); + IList> listOfListFoo = default; + IDictionary dictionaryFoo = default; + IDictionary> dictionaryOfDictionaryFoo = default; + IDictionary> dictionaryListFoo = default; + IList> listOfDictionaryFoo = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + + foreach (var attr in element.Attributes()) + { + string localName = attr.Name.LocalName; + XNamespace ns = attr.Name.Namespace; + + if (localName == "id") + { + id = (string)attr; + continue; + } + if (localName == "version") + { + version = (int)attr; + continue; + } + if (localName == "isActive") + { + isActive = (bool)attr; + continue; + } + if (localName == "xml-id") + { + xmlIdentifier = (string)attr; + continue; + } + if (localName == "label" && ns == labelNs) + { + label = (string)attr; + continue; + } + } + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + XNamespace ns = child.Name.Namespace; + + if (localName == "name") + { + name = (string)child; + continue; + } + if (localName == "age") + { + age = (int)child; + continue; + } + if (localName == "enabled") + { + enabled = (bool)child; + continue; + } + if (localName == "score") + { + score = (float)child; + continue; + } + if (localName == "optionalString") + { + optionalString = (string)child; + continue; + } + if (localName == "optionalInt") + { + optionalInt = (int?)child; + continue; + } + if (localName == "nullableString") + { + nullableString = (string)child; + continue; + } + if (localName == "RenamedProperty") + { + originalName = (string)child; + continue; + } + if (localName == "unwrappedStrings") + { + unwrappedStrings.Add((string)child); + continue; + } + if (localName == "unwrappedCounts") + { + unwrappedCounts.Add((int)child); + continue; + } + if (localName == "unwrappedItems") + { + unwrappedItems.Add(XmlItem.DeserializeXmlItem(child, options)); + continue; + } + if (localName == "wrappedColors") + { + List array = new List(); + foreach (var e in child.Elements("string")) + { + array.Add((string)e); + } + wrappedColors = array; + continue; + } + if (localName == "ItemCollection") + { + List array = new List(); + foreach (var e in child.Elements("Item")) + { + array.Add(XmlItem.DeserializeXmlItem(e, options)); + } + items = array; + continue; + } + if (localName == "nestedModel") + { + nestedModel = XmlNestedModel.DeserializeXmlNestedModel(child, options); + continue; + } + if (localName == "optionalNestedModel") + { + optionalNestedModel = XmlNestedModel.DeserializeXmlNestedModel(child, options); + continue; + } + if (localName == "metadata") + { + Dictionary dictionary = new Dictionary(); + foreach (var e in child.Elements()) + { + dictionary.Add(e.Name.LocalName, (string)e); + } + metadata = dictionary; + continue; + } + if (localName == "createdAt") + { + createdAt = child.GetDateTimeOffset("O"); + continue; + } + if (localName == "duration") + { + duration = child.GetTimeSpan("P"); + continue; + } + if (localName == "data") + { + data = BinaryData.FromBytes(child.GetBytesFromBase64("D")); + continue; + } + if (localName == "optionalRecordUnknown") + { + Dictionary dictionary = new Dictionary(); + foreach (var e in child.Elements()) + { + dictionary.Add(e.Name.LocalName, BinaryData.FromString(e.Value)); + } + optionalRecordUnknown = dictionary; + continue; + } + if (localName == "fixedEnum") + { + fixedEnum = ((string)child).ToStringFixedEnum(); + continue; + } + if (localName == "extensibleEnum") + { + extensibleEnum = new StringExtensibleEnum((string)child); + continue; + } + if (localName == "optionalFixedEnum") + { + optionalFixedEnum = ((int)child).ToIntFixedEnum(); + continue; + } + if (localName == "optionalExtensibleEnum") + { + optionalExtensibleEnum = new IntExtensibleEnum((int)child); + continue; + } + if (localName == "daysUsed" && ns == daysUsedNs) + { + daysUsed = (int)child; + continue; + } + if (localName == "fooItems" && ns == fooItemsNs) + { + List array = new List(); + foreach (var e in child.Elements("string")) + { + array.Add((string)e); + } + fooItems = array; + continue; + } + if (localName == "anotherModel" && ns == anotherModelNs) + { + anotherModel = XmlNestedModel.DeserializeXmlNestedModel(child, options); + continue; + } + if (localName == "modelsWithNamespaces") + { + List array = new List(); + foreach (var e in child.Elements(modelsWithNamespacesNs + "XmlModelWithNamespace")) + { + array.Add(XmlModelWithNamespace.DeserializeXmlModelWithNamespace(e, options)); + } + modelsWithNamespaces = array; + continue; + } + if (localName == "unwrappedModelsWithNamespaces") + { + unwrappedModelsWithNamespaces.Add(XmlModelWithNamespace.DeserializeXmlModelWithNamespace(child, options)); + continue; + } + if (localName == "listOfListFoo") + { + List> array = new List>(); + foreach (var e in child.Elements("Array")) + { + List list = new List(); + foreach (var item in e.Elements()) + { + list.Add(XmlItem.DeserializeXmlItem(item, options)); + } + array.Add(list); + } + listOfListFoo = array; + continue; + } + if (localName == "dictionaryFoo") + { + Dictionary dictionary = new Dictionary(); + foreach (var e in child.Elements()) + { + dictionary.Add(e.Name.LocalName, XmlItem.DeserializeXmlItem(e, options)); + } + dictionaryFoo = dictionary; + continue; + } + if (localName == "dictionaryOfDictionaryFoo") + { + Dictionary> dictionary = new Dictionary>(); + foreach (var e in child.Elements()) + { + Dictionary dict = new Dictionary(); + foreach (var item in e.Elements()) + { + dict.Add(item.Name.LocalName, XmlItem.DeserializeXmlItem(item, options)); + } + dictionary.Add(e.Name.LocalName, dict); + } + dictionaryOfDictionaryFoo = dictionary; + continue; + } + if (localName == "dictionaryListFoo") + { + Dictionary> dictionary = new Dictionary>(); + foreach (var e in child.Elements()) + { + List list = new List(); + foreach (var item in e.Elements()) + { + list.Add(XmlItem.DeserializeXmlItem(item, options)); + } + dictionary.Add(e.Name.LocalName, list); + } + dictionaryListFoo = dictionary; + continue; + } + if (localName == "listOfDictionaryFoo") + { + List> array = new List>(); + foreach (var e in child.Elements("Record")) + { + Dictionary dict = new Dictionary(); + foreach (var item in e.Elements()) + { + dict.Add(item.Name.LocalName, XmlItem.DeserializeXmlItem(item, options)); + } + array.Add(dict); + } + listOfDictionaryFoo = array; + continue; + } + } + content = element.Value; + + return new XmlAdvancedModel( + name, + age, + enabled, + score, + optionalString, + optionalInt, + nullableString, + id, + version, + isActive, + originalName, + xmlIdentifier, + content, + unwrappedStrings, + unwrappedCounts, + unwrappedItems, + wrappedColors, + items, + nestedModel, + optionalNestedModel, + metadata, + createdAt, + duration, + data, + optionalRecordUnknown ?? new ChangeTrackingDictionary(), + fixedEnum, + extensibleEnum, + optionalFixedEnum, + optionalExtensibleEnum, + label, + daysUsed, + fooItems, + anotherModel, + modelsWithNamespaces, + unwrappedModelsWithNamespaces, + listOfListFoo, + dictionaryFoo, + dictionaryOfDictionaryFoo, + dictionaryListFoo, + listOfDictionaryFoo, + additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlAdvancedModel.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlAdvancedModel.cs new file mode 100644 index 00000000000..afffaa39cda --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlAdvancedModel.cs @@ -0,0 +1,367 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json; + +namespace SampleTypeSpec +{ + /// An advanced XML model for testing various property types and XML features. + public partial class XmlAdvancedModel + { + /// Keeps track of any properties unknown to the library. + private protected readonly IDictionary _additionalBinaryDataProperties; + + /// Initializes a new instance of . + /// A simple string property. + /// An integer property. + /// A boolean property. + /// A float property. + /// A nullable string. + /// A string as XML attribute. + /// An integer as XML attribute. + /// A boolean as XML attribute. + /// A property with a custom XML element name. + /// An attribute with a custom XML name. + /// Text content in the element (unwrapped string). + /// An unwrapped array of strings - items appear directly without wrapper. + /// An unwrapped array of integers. + /// An unwrapped array of models. + /// A wrapped array of strings (default). + /// A wrapped array with custom wrapper name. + /// A nested model property. + /// A dictionary property. + /// A date-time property. + /// A duration property. + /// A bytes property. + /// A fixed enum property. + /// An extensible enum property. + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// , , , , , , , , , , , , , , , , , , , , , or is null. + public XmlAdvancedModel(string name, int age, bool enabled, float score, string nullableString, string id, int version, bool isActive, string originalName, string xmlIdentifier, string content, IEnumerable unwrappedStrings, IEnumerable unwrappedCounts, IEnumerable unwrappedItems, IEnumerable wrappedColors, IEnumerable items, XmlNestedModel nestedModel, IDictionary metadata, DateTimeOffset createdAt, TimeSpan duration, BinaryData data, StringFixedEnum fixedEnum, StringExtensibleEnum extensibleEnum, string label, int daysUsed, IEnumerable fooItems, XmlNestedModel anotherModel, IEnumerable modelsWithNamespaces, IEnumerable unwrappedModelsWithNamespaces, IEnumerable> listOfListFoo, IDictionary dictionaryFoo, IDictionary> dictionaryOfDictionaryFoo, IDictionary> dictionaryListFoo, IEnumerable> listOfDictionaryFoo) + { + Argument.AssertNotNull(name, nameof(name)); + Argument.AssertNotNull(id, nameof(id)); + Argument.AssertNotNull(originalName, nameof(originalName)); + Argument.AssertNotNull(xmlIdentifier, nameof(xmlIdentifier)); + Argument.AssertNotNull(content, nameof(content)); + Argument.AssertNotNull(unwrappedStrings, nameof(unwrappedStrings)); + Argument.AssertNotNull(unwrappedCounts, nameof(unwrappedCounts)); + Argument.AssertNotNull(unwrappedItems, nameof(unwrappedItems)); + Argument.AssertNotNull(wrappedColors, nameof(wrappedColors)); + Argument.AssertNotNull(items, nameof(items)); + Argument.AssertNotNull(nestedModel, nameof(nestedModel)); + Argument.AssertNotNull(metadata, nameof(metadata)); + Argument.AssertNotNull(data, nameof(data)); + Argument.AssertNotNull(label, nameof(label)); + Argument.AssertNotNull(fooItems, nameof(fooItems)); + Argument.AssertNotNull(anotherModel, nameof(anotherModel)); + Argument.AssertNotNull(modelsWithNamespaces, nameof(modelsWithNamespaces)); + Argument.AssertNotNull(unwrappedModelsWithNamespaces, nameof(unwrappedModelsWithNamespaces)); + Argument.AssertNotNull(listOfListFoo, nameof(listOfListFoo)); + Argument.AssertNotNull(dictionaryFoo, nameof(dictionaryFoo)); + Argument.AssertNotNull(dictionaryOfDictionaryFoo, nameof(dictionaryOfDictionaryFoo)); + Argument.AssertNotNull(dictionaryListFoo, nameof(dictionaryListFoo)); + Argument.AssertNotNull(listOfDictionaryFoo, nameof(listOfDictionaryFoo)); + + Name = name; + Age = age; + Enabled = enabled; + Score = score; + NullableString = nullableString; + Id = id; + Version = version; + IsActive = isActive; + OriginalName = originalName; + XmlIdentifier = xmlIdentifier; + Content = content; + UnwrappedStrings = unwrappedStrings.ToList(); + UnwrappedCounts = unwrappedCounts.ToList(); + UnwrappedItems = unwrappedItems.ToList(); + WrappedColors = wrappedColors.ToList(); + Items = items.ToList(); + NestedModel = nestedModel; + Metadata = metadata; + CreatedAt = createdAt; + Duration = duration; + Data = data; + OptionalRecordUnknown = new ChangeTrackingDictionary(); + FixedEnum = fixedEnum; + ExtensibleEnum = extensibleEnum; + Label = label; + DaysUsed = daysUsed; + FooItems = fooItems.ToList(); + AnotherModel = anotherModel; + ModelsWithNamespaces = modelsWithNamespaces.ToList(); + UnwrappedModelsWithNamespaces = unwrappedModelsWithNamespaces.ToList(); + ListOfListFoo = listOfListFoo.ToList(); + DictionaryFoo = dictionaryFoo; + DictionaryOfDictionaryFoo = dictionaryOfDictionaryFoo; + DictionaryListFoo = dictionaryListFoo; + ListOfDictionaryFoo = listOfDictionaryFoo.ToList(); + } + + /// Initializes a new instance of . + /// A simple string property. + /// An integer property. + /// A boolean property. + /// A float property. + /// An optional string. + /// An optional integer. + /// A nullable string. + /// A string as XML attribute. + /// An integer as XML attribute. + /// A boolean as XML attribute. + /// A property with a custom XML element name. + /// An attribute with a custom XML name. + /// Text content in the element (unwrapped string). + /// An unwrapped array of strings - items appear directly without wrapper. + /// An unwrapped array of integers. + /// An unwrapped array of models. + /// A wrapped array of strings (default). + /// A wrapped array with custom wrapper name. + /// A nested model property. + /// An optional nested model. + /// A dictionary property. + /// A date-time property. + /// A duration property. + /// A bytes property. + /// optional record of unknown. + /// A fixed enum property. + /// An extensible enum property. + /// An optional fixed enum property. + /// An optional extensible enum property. + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// Keeps track of any properties unknown to the library. + internal XmlAdvancedModel(string name, int age, bool enabled, float score, string optionalString, int? optionalInt, string nullableString, string id, int version, bool isActive, string originalName, string xmlIdentifier, string content, IList unwrappedStrings, IList unwrappedCounts, IList unwrappedItems, IList wrappedColors, IList items, XmlNestedModel nestedModel, XmlNestedModel optionalNestedModel, IDictionary metadata, DateTimeOffset createdAt, TimeSpan duration, BinaryData data, IDictionary optionalRecordUnknown, StringFixedEnum fixedEnum, StringExtensibleEnum extensibleEnum, IntFixedEnum? optionalFixedEnum, IntExtensibleEnum? optionalExtensibleEnum, string label, int daysUsed, IList fooItems, XmlNestedModel anotherModel, IList modelsWithNamespaces, IList unwrappedModelsWithNamespaces, IList> listOfListFoo, IDictionary dictionaryFoo, IDictionary> dictionaryOfDictionaryFoo, IDictionary> dictionaryListFoo, IList> listOfDictionaryFoo, IDictionary additionalBinaryDataProperties) + { + Name = name; + Age = age; + Enabled = enabled; + Score = score; + OptionalString = optionalString; + OptionalInt = optionalInt; + NullableString = nullableString; + Id = id; + Version = version; + IsActive = isActive; + OriginalName = originalName; + XmlIdentifier = xmlIdentifier; + Content = content; + UnwrappedStrings = unwrappedStrings; + UnwrappedCounts = unwrappedCounts; + UnwrappedItems = unwrappedItems; + WrappedColors = wrappedColors; + Items = items; + NestedModel = nestedModel; + OptionalNestedModel = optionalNestedModel; + Metadata = metadata; + CreatedAt = createdAt; + Duration = duration; + Data = data; + OptionalRecordUnknown = optionalRecordUnknown; + FixedEnum = fixedEnum; + ExtensibleEnum = extensibleEnum; + OptionalFixedEnum = optionalFixedEnum; + OptionalExtensibleEnum = optionalExtensibleEnum; + Label = label; + DaysUsed = daysUsed; + FooItems = fooItems; + AnotherModel = anotherModel; + ModelsWithNamespaces = modelsWithNamespaces; + UnwrappedModelsWithNamespaces = unwrappedModelsWithNamespaces; + ListOfListFoo = listOfListFoo; + DictionaryFoo = dictionaryFoo; + DictionaryOfDictionaryFoo = dictionaryOfDictionaryFoo; + DictionaryListFoo = dictionaryListFoo; + ListOfDictionaryFoo = listOfDictionaryFoo; + _additionalBinaryDataProperties = additionalBinaryDataProperties; + } + + /// A simple string property. + public string Name { get; set; } + + /// An integer property. + public int Age { get; set; } + + /// A boolean property. + public bool Enabled { get; set; } + + /// A float property. + public float Score { get; set; } + + /// An optional string. + public string OptionalString { get; set; } + + /// An optional integer. + public int? OptionalInt { get; set; } + + /// A nullable string. + public string NullableString { get; set; } + + /// A string as XML attribute. + public string Id { get; set; } + + /// An integer as XML attribute. + public int Version { get; set; } + + /// A boolean as XML attribute. + public bool IsActive { get; set; } + + /// A property with a custom XML element name. + public string OriginalName { get; set; } + + /// An attribute with a custom XML name. + public string XmlIdentifier { get; set; } + + /// Text content in the element (unwrapped string). + public string Content { get; set; } + + /// An unwrapped array of strings - items appear directly without wrapper. + public IList UnwrappedStrings { get; } + + /// An unwrapped array of integers. + public IList UnwrappedCounts { get; } + + /// An unwrapped array of models. + public IList UnwrappedItems { get; } + + /// A wrapped array of strings (default). + public IList WrappedColors { get; } + + /// A wrapped array with custom wrapper name. + public IList Items { get; } + + /// A nested model property. + public XmlNestedModel NestedModel { get; set; } + + /// An optional nested model. + public XmlNestedModel OptionalNestedModel { get; set; } + + /// A dictionary property. + public IDictionary Metadata { get; } + + /// A date-time property. + public DateTimeOffset CreatedAt { get; set; } + + /// A duration property. + public TimeSpan Duration { get; set; } + + /// + /// A bytes property + /// + /// To assign a byte[] to this property use . + /// The byte[] will be serialized to a Base64 encoded string. + /// + /// + /// Examples: + /// + /// + /// BinaryData.FromBytes(new byte[] { 1, 2, 3 }). + /// Creates a payload of "AQID". + /// + /// + /// + /// + public BinaryData Data { get; set; } + + /// + /// optional record of unknown + /// To assign an object to the value of this property use . + /// To assign an already formatted json string to this property use . + /// + /// Examples: + /// + /// + /// BinaryData.FromObjectAsJson("foo"). + /// Creates a payload of "foo". + /// + /// + /// BinaryData.FromString("\"foo\""). + /// Creates a payload of "foo". + /// + /// + /// BinaryData.FromObjectAsJson(new { key = "value" }). + /// Creates a payload of { "key": "value" }. + /// + /// + /// BinaryData.FromString("{\"key\": \"value\"}"). + /// Creates a payload of { "key": "value" }. + /// + /// + /// + /// + public IDictionary OptionalRecordUnknown { get; } + + /// A fixed enum property. + public StringFixedEnum FixedEnum { get; set; } + + /// An extensible enum property. + public StringExtensibleEnum ExtensibleEnum { get; set; } + + /// An optional fixed enum property. + public IntFixedEnum? OptionalFixedEnum { get; set; } + + /// An optional extensible enum property. + public IntExtensibleEnum? OptionalExtensibleEnum { get; set; } + + /// Gets or sets the Label. + public string Label { get; set; } + + /// Gets or sets the DaysUsed. + public int DaysUsed { get; set; } + + /// Gets the FooItems. + public IList FooItems { get; } + + /// Gets or sets the AnotherModel. + public XmlNestedModel AnotherModel { get; set; } + + /// Gets the ModelsWithNamespaces. + public IList ModelsWithNamespaces { get; } + + /// Gets the UnwrappedModelsWithNamespaces. + public IList UnwrappedModelsWithNamespaces { get; } + + /// Gets the ListOfListFoo. + public IList> ListOfListFoo { get; } + + /// Gets the DictionaryFoo. + public IDictionary DictionaryFoo { get; } + + /// Gets the DictionaryOfDictionaryFoo. + public IDictionary> DictionaryOfDictionaryFoo { get; } + + /// Gets the DictionaryListFoo. + public IDictionary> DictionaryListFoo { get; } + + /// Gets the ListOfDictionaryFoo. + public IList> ListOfDictionaryFoo { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlItem.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlItem.Serialization.cs new file mode 100644 index 00000000000..fb1ac232c86 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlItem.Serialization.cs @@ -0,0 +1,159 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.IO; +using System.Xml; +using System.Xml.Linq; + +namespace SampleTypeSpec +{ + /// An item model for XML array testing. + public partial class XmlItem : IPersistableModel + { + /// Initializes a new instance of for deserialization. + internal XmlItem() + { + } + + /// The data to parse. + /// The client options for reading and writing models. + protected virtual XmlItem PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (Stream dataStream = data.ToStream()) + { + return DeserializeXmlItem(XElement.Load(dataStream, LoadOptions.PreserveWhitespace), options); + } + default: + throw new FormatException($"The model {nameof(XmlItem)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (MemoryStream stream = new MemoryStream(256)) + { + using (XmlWriter writer = XmlWriter.Create(stream, ModelSerializationExtensions.XmlWriterSettings)) + { + WriteXml(writer, options, "Item"); + } + if (stream.Position > int.MaxValue) + { + return BinaryData.FromStream(stream); + } + else + { + return new BinaryData(stream.GetBuffer().AsMemory(0, (int)stream.Position)); + } + } + default: + throw new FormatException($"The model {nameof(XmlItem)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + XmlItem IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "X"; + + /// The XML writer. + /// The client options for reading and writing models. + /// An optional name hint. + private void WriteXml(XmlWriter writer, ModelReaderWriterOptions options, string nameHint) + { + if (nameHint != null) + { + writer.WriteStartElement(nameHint); + } + + XmlModelWriteCore(writer, options); + + if (nameHint != null) + { + writer.WriteEndElement(); + } + } + + /// The XML writer. + /// The client options for reading and writing models. + internal virtual void XmlModelWriteCore(XmlWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "X") + { + throw new FormatException($"The model {nameof(XmlItem)} does not support writing '{format}' format."); + } + + writer.WriteStartAttribute("itemId"); + writer.WriteValue(ItemId); + writer.WriteEndAttribute(); + writer.WriteStartElement("itemName"); + writer.WriteValue(ItemName); + writer.WriteEndElement(); + writer.WriteStartElement("itemValue"); + writer.WriteValue(ItemValue); + writer.WriteEndElement(); + } + + /// The xml element to deserialize. + /// The client options for reading and writing models. + internal static XmlItem DeserializeXmlItem(XElement element, ModelReaderWriterOptions options) + { + if (element == null) + { + return null; + } + + string itemName = default; + int itemValue = default; + string itemId = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + + foreach (var attr in element.Attributes()) + { + string localName = attr.Name.LocalName; + if (localName == "itemId") + { + itemId = (string)attr; + continue; + } + } + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if (localName == "itemName") + { + itemName = (string)child; + continue; + } + if (localName == "itemValue") + { + itemValue = (int)child; + continue; + } + } + return new XmlItem(itemName, itemValue, itemId, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlItem.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlItem.cs new file mode 100644 index 00000000000..0788e17adf2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlItem.cs @@ -0,0 +1,56 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace SampleTypeSpec +{ + /// An item model for XML array testing. + public partial class XmlItem + { + /// Keeps track of any properties unknown to the library. + private protected readonly IDictionary _additionalBinaryDataProperties; + + /// Initializes a new instance of . + /// The item name. + /// The item value. + /// Item ID as attribute. + /// or is null. + public XmlItem(string itemName, int itemValue, string itemId) + { + Argument.AssertNotNull(itemName, nameof(itemName)); + Argument.AssertNotNull(itemId, nameof(itemId)); + + ItemName = itemName; + ItemValue = itemValue; + ItemId = itemId; + } + + /// Initializes a new instance of . + /// The item name. + /// The item value. + /// Item ID as attribute. + /// Keeps track of any properties unknown to the library. + internal XmlItem(string itemName, int itemValue, string itemId, IDictionary additionalBinaryDataProperties) + { + ItemName = itemName; + ItemValue = itemValue; + ItemId = itemId; + _additionalBinaryDataProperties = additionalBinaryDataProperties; + } + + /// The item name. + public string ItemName { get; set; } + + /// The item value. + public int ItemValue { get; set; } + + /// Item ID as attribute. + public string ItemId { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlModelWithNamespace.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlModelWithNamespace.Serialization.cs new file mode 100644 index 00000000000..33afc32982a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlModelWithNamespace.Serialization.cs @@ -0,0 +1,136 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.IO; +using System.Xml; +using System.Xml.Linq; + +namespace SampleTypeSpec +{ + /// The XmlModelWithNamespace. + public partial class XmlModelWithNamespace : IPersistableModel + { + /// Initializes a new instance of for deserialization. + internal XmlModelWithNamespace() + { + } + + /// The data to parse. + /// The client options for reading and writing models. + protected virtual XmlModelWithNamespace PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (Stream dataStream = data.ToStream()) + { + return DeserializeXmlModelWithNamespace(XElement.Load(dataStream, LoadOptions.PreserveWhitespace), options); + } + default: + throw new FormatException($"The model {nameof(XmlModelWithNamespace)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (MemoryStream stream = new MemoryStream(256)) + { + using (XmlWriter writer = XmlWriter.Create(stream, ModelSerializationExtensions.XmlWriterSettings)) + { + WriteXml(writer, options, "XmlModelWithNamespace"); + } + if (stream.Position > int.MaxValue) + { + return BinaryData.FromStream(stream); + } + else + { + return new BinaryData(stream.GetBuffer().AsMemory(0, (int)stream.Position)); + } + } + default: + throw new FormatException($"The model {nameof(XmlModelWithNamespace)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + XmlModelWithNamespace IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "X"; + + /// The XML writer. + /// The client options for reading and writing models. + /// An optional name hint. + private void WriteXml(XmlWriter writer, ModelReaderWriterOptions options, string nameHint) + { + if (nameHint != null) + { + writer.WriteStartElement("ns1", nameHint, "http://www.example.com/namespace"); + } + + XmlModelWriteCore(writer, options); + + if (nameHint != null) + { + writer.WriteEndElement(); + } + } + + /// The XML writer. + /// The client options for reading and writing models. + internal virtual void XmlModelWriteCore(XmlWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "X") + { + throw new FormatException($"The model {nameof(XmlModelWithNamespace)} does not support writing '{format}' format."); + } + + writer.WriteStartElement("foo"); + writer.WriteValue(Foo); + writer.WriteEndElement(); + } + + /// The xml element to deserialize. + /// The client options for reading and writing models. + internal static XmlModelWithNamespace DeserializeXmlModelWithNamespace(XElement element, ModelReaderWriterOptions options) + { + if (element == null) + { + return null; + } + + string foo = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if (localName == "foo") + { + foo = (string)child; + continue; + } + } + return new XmlModelWithNamespace(foo, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlModelWithNamespace.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlModelWithNamespace.cs new file mode 100644 index 00000000000..0311112da10 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlModelWithNamespace.cs @@ -0,0 +1,41 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace SampleTypeSpec +{ + /// The XmlModelWithNamespace. + public partial class XmlModelWithNamespace + { + /// Keeps track of any properties unknown to the library. + private protected readonly IDictionary _additionalBinaryDataProperties; + + /// Initializes a new instance of . + /// + /// is null. + public XmlModelWithNamespace(string foo) + { + Argument.AssertNotNull(foo, nameof(foo)); + + Foo = foo; + } + + /// Initializes a new instance of . + /// + /// Keeps track of any properties unknown to the library. + internal XmlModelWithNamespace(string foo, IDictionary additionalBinaryDataProperties) + { + Foo = foo; + _additionalBinaryDataProperties = additionalBinaryDataProperties; + } + + /// Gets or sets the Foo. + public string Foo { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlNestedModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlNestedModel.Serialization.cs new file mode 100644 index 00000000000..d0508de1e74 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlNestedModel.Serialization.cs @@ -0,0 +1,150 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.IO; +using System.Xml; +using System.Xml.Linq; + +namespace SampleTypeSpec +{ + /// A nested model for XML testing. + public partial class XmlNestedModel : IPersistableModel + { + /// Initializes a new instance of for deserialization. + internal XmlNestedModel() + { + } + + /// The data to parse. + /// The client options for reading and writing models. + protected virtual XmlNestedModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (Stream dataStream = data.ToStream()) + { + return DeserializeXmlNestedModel(XElement.Load(dataStream, LoadOptions.PreserveWhitespace), options); + } + default: + throw new FormatException($"The model {nameof(XmlNestedModel)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "X": + using (MemoryStream stream = new MemoryStream(256)) + { + using (XmlWriter writer = XmlWriter.Create(stream, ModelSerializationExtensions.XmlWriterSettings)) + { + WriteXml(writer, options, "XmlNestedModel"); + } + if (stream.Position > int.MaxValue) + { + return BinaryData.FromStream(stream); + } + else + { + return new BinaryData(stream.GetBuffer().AsMemory(0, (int)stream.Position)); + } + } + default: + throw new FormatException($"The model {nameof(XmlNestedModel)} does not support writing '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The data to parse. + /// The client options for reading and writing models. + XmlNestedModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "X"; + + /// The XML writer. + /// The client options for reading and writing models. + /// An optional name hint. + private void WriteXml(XmlWriter writer, ModelReaderWriterOptions options, string nameHint) + { + if (nameHint != null) + { + writer.WriteStartElement(nameHint); + } + + XmlModelWriteCore(writer, options); + + if (nameHint != null) + { + writer.WriteEndElement(); + } + } + + /// The XML writer. + /// The client options for reading and writing models. + internal virtual void XmlModelWriteCore(XmlWriter writer, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "X") + { + throw new FormatException($"The model {nameof(XmlNestedModel)} does not support writing '{format}' format."); + } + + writer.WriteStartAttribute("nestedId"); + writer.WriteValue(NestedId); + writer.WriteEndAttribute(); + writer.WriteStartElement("value"); + writer.WriteValue(Value); + writer.WriteEndElement(); + } + + /// The xml element to deserialize. + /// The client options for reading and writing models. + internal static XmlNestedModel DeserializeXmlNestedModel(XElement element, ModelReaderWriterOptions options) + { + if (element == null) + { + return null; + } + + string value = default; + int nestedId = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + + foreach (var attr in element.Attributes()) + { + string localName = attr.Name.LocalName; + if (localName == "nestedId") + { + nestedId = (int)attr; + continue; + } + } + + foreach (var child in element.Elements()) + { + string localName = child.Name.LocalName; + if (localName == "value") + { + value = (string)child; + continue; + } + } + return new XmlNestedModel(value, nestedId, additionalBinaryDataProperties); + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlNestedModel.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlNestedModel.cs new file mode 100644 index 00000000000..3ef8d208de6 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Models/XmlNestedModel.cs @@ -0,0 +1,48 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace SampleTypeSpec +{ + /// A nested model for XML testing. + public partial class XmlNestedModel + { + /// Keeps track of any properties unknown to the library. + private protected readonly IDictionary _additionalBinaryDataProperties; + + /// Initializes a new instance of . + /// The value of the nested model. + /// An attribute on the nested model. + /// is null. + public XmlNestedModel(string value, int nestedId) + { + Argument.AssertNotNull(value, nameof(value)); + + Value = value; + NestedId = nestedId; + } + + /// Initializes a new instance of . + /// The value of the nested model. + /// An attribute on the nested model. + /// Keeps track of any properties unknown to the library. + internal XmlNestedModel(string value, int nestedId, IDictionary additionalBinaryDataProperties) + { + Value = value; + NestedId = nestedId; + _additionalBinaryDataProperties = additionalBinaryDataProperties; + } + + /// The value of the nested model. + public string Value { get; set; } + + /// An attribute on the nested model. + public int NestedId { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Notebooks.RestClient.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Notebooks.RestClient.cs new file mode 100644 index 00000000000..745de2d13b0 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Notebooks.RestClient.cs @@ -0,0 +1,32 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System.ClientModel.Primitives; + +namespace SampleTypeSpec +{ + /// + public partial class Notebooks + { + private static PipelineMessageClassifier _pipelineMessageClassifier200; + + private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); + + internal PipelineMessage CreateGetNotebookRequest(RequestOptions options) + { + ClientUriBuilder uri = new ClientUriBuilder(); + uri.Reset(_endpoint); + uri.AppendPath("/notebooks/", false); + uri.AppendPath(_notebook, true); + PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); + PipelineRequest request = message.Request; + request.Headers.Set("Accept", "application/json"); + message.Apply(options); + return message; + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Notebooks.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Notebooks.cs new file mode 100644 index 00000000000..27cc5179a09 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Notebooks.cs @@ -0,0 +1,179 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; +using System.Threading; +using System.Threading.Tasks; + +namespace SampleTypeSpec +{ + /// The Notebooks sub-client. + public partial class Notebooks + { + private readonly Uri _endpoint; + private const string AuthorizationHeader = "my-api-key"; + /// The OAuth2 flows supported by the service. + private static readonly Dictionary[] _flows = new Dictionary[] + { + new Dictionary + { + { GetTokenOptions.ScopesPropertyName, new string[] { "read" } }, + { GetTokenOptions.AuthorizationUrlPropertyName, "https://api.example.com/oauth2/authorize" }, + { GetTokenOptions.RefreshUrlPropertyName, "https://api.example.com/oauth2/refresh" } + } + }; + private readonly string _notebook; + + /// Initializes a new instance of Notebooks for mocking. + protected Notebooks() + { + } + + /// Initializes a new instance of Notebooks. + /// The HTTP pipeline for sending and receiving REST requests and responses. + /// Service endpoint. + /// + internal Notebooks(ClientPipeline pipeline, Uri endpoint, string notebook) + { + _endpoint = endpoint; + Pipeline = pipeline; + _notebook = notebook; + } + + /// Initializes a new instance of Notebooks. + /// Service endpoint. + /// + /// A credential used to authenticate to the service. + /// , or is null. + /// is an empty string, and was expected to be non-empty. + public Notebooks(Uri endpoint, string notebook, ApiKeyCredential credential) : this(endpoint, notebook, credential, new SampleTypeSpecClientOptions()) + { + } + + /// Initializes a new instance of Notebooks. + /// Service endpoint. + /// + /// A credential provider used to authenticate to the service. + /// , or is null. + /// is an empty string, and was expected to be non-empty. + public Notebooks(Uri endpoint, string notebook, AuthenticationTokenProvider tokenProvider) : this(endpoint, notebook, tokenProvider, new SampleTypeSpecClientOptions()) + { + } + + /// Initializes a new instance of Notebooks. + /// The authentication policy to use for pipeline creation. + /// Service endpoint. + /// + /// The options for configuring the client. + internal Notebooks(AuthenticationPolicy authenticationPolicy, Uri endpoint, string notebook, SampleTypeSpecClientOptions options) + { + Argument.AssertNotNull(endpoint, nameof(endpoint)); + Argument.AssertNotNullOrEmpty(notebook, nameof(notebook)); + + options ??= new SampleTypeSpecClientOptions(); + + _endpoint = endpoint; + _notebook = notebook; + if (authenticationPolicy != null) + { + Pipeline = ClientPipeline.Create(options, Array.Empty(), new PipelinePolicy[] { new UserAgentPolicy(typeof(Notebooks).Assembly), authenticationPolicy }, Array.Empty()); + } + else + { + Pipeline = ClientPipeline.Create(options, Array.Empty(), new PipelinePolicy[] { new UserAgentPolicy(typeof(Notebooks).Assembly) }, Array.Empty()); + } + } + + /// Initializes a new instance of Notebooks. + /// Service endpoint. + /// + /// A credential used to authenticate to the service. + /// The options for configuring the client. + /// , or is null. + /// is an empty string, and was expected to be non-empty. + public Notebooks(Uri endpoint, string notebook, ApiKeyCredential credential, SampleTypeSpecClientOptions options) : this(ApiKeyAuthenticationPolicy.CreateHeaderApiKeyPolicy(credential, AuthorizationHeader), endpoint, notebook, options) + { + } + + /// Initializes a new instance of Notebooks. + /// Service endpoint. + /// + /// A credential provider used to authenticate to the service. + /// The options for configuring the client. + /// , or is null. + /// is an empty string, and was expected to be non-empty. + public Notebooks(Uri endpoint, string notebook, AuthenticationTokenProvider tokenProvider, SampleTypeSpecClientOptions options) : this(new BearerTokenPolicy(tokenProvider, _flows), endpoint, notebook, options) + { + } + + /// Initializes a new instance of Notebooks from a . + /// The settings for Notebooks. + [Experimental("SCME0002")] + public Notebooks(NotebooksSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.SampleTypeSpecUrl, settings?.Notebook, settings?.Options) + { + } + + /// The HTTP pipeline for sending and receiving REST requests and responses. + public ClientPipeline Pipeline { get; } + + /// + /// [Protocol Method] Get a notebook by name + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual ClientResult GetNotebook(RequestOptions options) + { + using PipelineMessage message = CreateGetNotebookRequest(options); + return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); + } + + /// + /// [Protocol Method] Get a notebook by name + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual async Task GetNotebookAsync(RequestOptions options) + { + using PipelineMessage message = CreateGetNotebookRequest(options); + return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); + } + + /// Get a notebook by name. + /// The cancellation token that can be used to cancel the operation. + /// Service returned a non-success status code. + public virtual ClientResult GetNotebook(CancellationToken cancellationToken = default) + { + ClientResult result = GetNotebook(cancellationToken.ToRequestOptions()); + return ClientResult.FromValue((GetNotebookResponse)result, result.GetRawResponse()); + } + + /// Get a notebook by name. + /// The cancellation token that can be used to cancel the operation. + /// Service returned a non-success status code. + public virtual async Task> GetNotebookAsync(CancellationToken cancellationToken = default) + { + ClientResult result = await GetNotebookAsync(cancellationToken.ToRequestOptions()).ConfigureAwait(false); + return ClientResult.FromValue((GetNotebookResponse)result, result.GetRawResponse()); + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/NotebooksSettings.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/NotebooksSettings.cs new file mode 100644 index 00000000000..576a053e6bb --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/NotebooksSettings.cs @@ -0,0 +1,48 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace SampleTypeSpec +{ + /// Represents the settings used to configure a that can be loaded from an . + [Experimental("SCME0002")] + public partial class NotebooksSettings : ClientSettings + { + /// Gets or sets the SampleTypeSpecUrl. + public Uri SampleTypeSpecUrl { get; set; } + + /// Gets or sets the Notebook. + public string Notebook { get; set; } + + /// Gets or sets the Options. + public SampleTypeSpecClientOptions Options { get; set; } + + /// Binds configuration values from the given section. + /// The configuration section. + protected override void BindCore(IConfigurationSection section) + { + if (Uri.TryCreate(section["SampleTypeSpecUrl"], UriKind.Absolute, out Uri sampleTypeSpecUrl)) + { + SampleTypeSpecUrl = sampleTypeSpecUrl; + } + string notebook = section["Notebook"]; + if (!string.IsNullOrEmpty(notebook)) + { + Notebook = notebook; + } + IConfigurationSection optionsSection = section.GetSection("Options"); + if (optionsSection.Exists()) + { + Options = new SampleTypeSpecClientOptions(optionsSection); + } + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/PetOperations.RestClient.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/PetOperations.RestClient.cs index 6681f9e7d79..7148993d982 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/PetOperations.RestClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/PetOperations.RestClient.cs @@ -15,7 +15,7 @@ public partial class PetOperations { private static PipelineMessageClassifier _pipelineMessageClassifier200; - private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 = PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); + private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); internal PipelineMessage CreateUpdatePetAsPetRequest(BinaryContent content, RequestOptions options) { diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/PlantOperations.RestClient.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/PlantOperations.RestClient.cs new file mode 100644 index 00000000000..2e630d7c798 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/PlantOperations.RestClient.cs @@ -0,0 +1,72 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace SampleTypeSpec +{ + /// + public partial class PlantOperations + { + private static PipelineMessageClassifier _pipelineMessageClassifier200; + + private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); + + internal PipelineMessage CreateGetTreeRequest(RequestOptions options) + { + ClientUriBuilder uri = new ClientUriBuilder(); + uri.Reset(_endpoint); + uri.AppendPath("/plants/tree/as-plant", false); + PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); + PipelineRequest request = message.Request; + request.Headers.Set("Accept", "application/xml"); + message.Apply(options); + return message; + } + + internal PipelineMessage CreateGetTreeAsJsonRequest(RequestOptions options) + { + ClientUriBuilder uri = new ClientUriBuilder(); + uri.Reset(_endpoint); + uri.AppendPath("/plants/tree/as-plant/json", false); + PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); + PipelineRequest request = message.Request; + request.Headers.Set("Accept", "application/json"); + message.Apply(options); + return message; + } + + internal PipelineMessage CreateUpdateTreeRequest(BinaryContent content, RequestOptions options) + { + ClientUriBuilder uri = new ClientUriBuilder(); + uri.Reset(_endpoint); + uri.AppendPath("/plants/tree/as-plant", false); + PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "PUT", PipelineMessageClassifier200); + PipelineRequest request = message.Request; + request.Headers.Set("Content-Type", "application/xml"); + request.Headers.Set("Accept", "application/xml"); + request.Content = content; + message.Apply(options); + return message; + } + + internal PipelineMessage CreateUpdateTreeAsJsonRequest(BinaryContent content, RequestOptions options) + { + ClientUriBuilder uri = new ClientUriBuilder(); + uri.Reset(_endpoint); + uri.AppendPath("/plants/tree/as-plant/json", false); + PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "PUT", PipelineMessageClassifier200); + PipelineRequest request = message.Request; + request.Headers.Set("Content-Type", "application/json"); + request.Headers.Set("Accept", "application/json"); + request.Content = content; + message.Apply(options); + return message; + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/PlantOperations.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/PlantOperations.cs new file mode 100644 index 00000000000..6db6d1ce51e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/PlantOperations.cs @@ -0,0 +1,282 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace SampleTypeSpec +{ + /// The PlantOperations sub-client. + public partial class PlantOperations + { + private readonly Uri _endpoint; + + /// Initializes a new instance of PlantOperations for mocking. + protected PlantOperations() + { + } + + /// Initializes a new instance of PlantOperations. + /// The HTTP pipeline for sending and receiving REST requests and responses. + /// Service endpoint. + internal PlantOperations(ClientPipeline pipeline, Uri endpoint) + { + _endpoint = endpoint; + Pipeline = pipeline; + } + + /// The HTTP pipeline for sending and receiving REST requests and responses. + public ClientPipeline Pipeline { get; } + + /// + /// [Protocol Method] Get a tree as a plant + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual ClientResult GetTree(RequestOptions options) + { + using PipelineMessage message = CreateGetTreeRequest(options); + return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); + } + + /// + /// [Protocol Method] Get a tree as a plant + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual async Task GetTreeAsync(RequestOptions options) + { + using PipelineMessage message = CreateGetTreeRequest(options); + return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); + } + + /// Get a tree as a plant. + /// The cancellation token that can be used to cancel the operation. + /// Service returned a non-success status code. + public virtual ClientResult GetTree(CancellationToken cancellationToken = default) + { + ClientResult result = GetTree(cancellationToken.ToRequestOptions()); + return ClientResult.FromValue((Tree)result, result.GetRawResponse()); + } + + /// Get a tree as a plant. + /// The cancellation token that can be used to cancel the operation. + /// Service returned a non-success status code. + public virtual async Task> GetTreeAsync(CancellationToken cancellationToken = default) + { + ClientResult result = await GetTreeAsync(cancellationToken.ToRequestOptions()).ConfigureAwait(false); + return ClientResult.FromValue((Tree)result, result.GetRawResponse()); + } + + /// + /// [Protocol Method] Get a tree as a plant + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual ClientResult GetTreeAsJson(RequestOptions options) + { + using PipelineMessage message = CreateGetTreeAsJsonRequest(options); + return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); + } + + /// + /// [Protocol Method] Get a tree as a plant + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual async Task GetTreeAsJsonAsync(RequestOptions options) + { + using PipelineMessage message = CreateGetTreeAsJsonRequest(options); + return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); + } + + /// Get a tree as a plant. + /// The cancellation token that can be used to cancel the operation. + /// Service returned a non-success status code. + public virtual ClientResult GetTreeAsJson(CancellationToken cancellationToken = default) + { + ClientResult result = GetTreeAsJson(cancellationToken.ToRequestOptions()); + return ClientResult.FromValue((Tree)result, result.GetRawResponse()); + } + + /// Get a tree as a plant. + /// The cancellation token that can be used to cancel the operation. + /// Service returned a non-success status code. + public virtual async Task> GetTreeAsJsonAsync(CancellationToken cancellationToken = default) + { + ClientResult result = await GetTreeAsJsonAsync(cancellationToken.ToRequestOptions()).ConfigureAwait(false); + return ClientResult.FromValue((Tree)result, result.GetRawResponse()); + } + + /// + /// [Protocol Method] Update a tree as a plant + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The content to send as the body of the request. + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// is null. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual ClientResult UpdateTree(BinaryContent content, RequestOptions options = null) + { + Argument.AssertNotNull(content, nameof(content)); + + using PipelineMessage message = CreateUpdateTreeRequest(content, options); + return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); + } + + /// + /// [Protocol Method] Update a tree as a plant + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The content to send as the body of the request. + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// is null. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual async Task UpdateTreeAsync(BinaryContent content, RequestOptions options = null) + { + Argument.AssertNotNull(content, nameof(content)); + + using PipelineMessage message = CreateUpdateTreeRequest(content, options); + return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); + } + + /// Update a tree as a plant. + /// + /// The cancellation token that can be used to cancel the operation. + /// is null. + /// Service returned a non-success status code. + public virtual ClientResult UpdateTree(Tree tree, CancellationToken cancellationToken = default) + { + Argument.AssertNotNull(tree, nameof(tree)); + + using BinaryContent content = tree.ToBinaryContent("X"); + ClientResult result = UpdateTree(content, cancellationToken.ToRequestOptions()); + return ClientResult.FromValue((Tree)result, result.GetRawResponse()); + } + + /// Update a tree as a plant. + /// + /// The cancellation token that can be used to cancel the operation. + /// is null. + /// Service returned a non-success status code. + public virtual async Task> UpdateTreeAsync(Tree tree, CancellationToken cancellationToken = default) + { + Argument.AssertNotNull(tree, nameof(tree)); + + using BinaryContent content = tree.ToBinaryContent("X"); + ClientResult result = await UpdateTreeAsync(content, cancellationToken.ToRequestOptions()).ConfigureAwait(false); + return ClientResult.FromValue((Tree)result, result.GetRawResponse()); + } + + /// + /// [Protocol Method] Update a tree as a plant + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The content to send as the body of the request. + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// is null. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual ClientResult UpdateTreeAsJson(BinaryContent content, RequestOptions options = null) + { + Argument.AssertNotNull(content, nameof(content)); + + using PipelineMessage message = CreateUpdateTreeAsJsonRequest(content, options); + return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); + } + + /// + /// [Protocol Method] Update a tree as a plant + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The content to send as the body of the request. + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// is null. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual async Task UpdateTreeAsJsonAsync(BinaryContent content, RequestOptions options = null) + { + Argument.AssertNotNull(content, nameof(content)); + + using PipelineMessage message = CreateUpdateTreeAsJsonRequest(content, options); + return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); + } + + /// Update a tree as a plant. + /// + /// The cancellation token that can be used to cancel the operation. + /// is null. + /// Service returned a non-success status code. + public virtual ClientResult UpdateTreeAsJson(Tree tree, CancellationToken cancellationToken = default) + { + Argument.AssertNotNull(tree, nameof(tree)); + + using BinaryContent content = tree.ToBinaryContent("J"); + ClientResult result = UpdateTreeAsJson(content, cancellationToken.ToRequestOptions()); + return ClientResult.FromValue((Tree)result, result.GetRawResponse()); + } + + /// Update a tree as a plant. + /// + /// The cancellation token that can be used to cancel the operation. + /// is null. + /// Service returned a non-success status code. + public virtual async Task> UpdateTreeAsJsonAsync(Tree tree, CancellationToken cancellationToken = default) + { + Argument.AssertNotNull(tree, nameof(tree)); + + using BinaryContent content = tree.ToBinaryContent("J"); + ClientResult result = await UpdateTreeAsJsonAsync(content, cancellationToken.ToRequestOptions()).ConfigureAwait(false); + return ClientResult.FromValue((Tree)result, result.GetRawResponse()); + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecClient.RestClient.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecClient.RestClient.cs index ef5e2f87d29..8842d696981 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecClient.RestClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecClient.RestClient.cs @@ -17,9 +17,9 @@ public partial class SampleTypeSpecClient private static PipelineMessageClassifier _pipelineMessageClassifier200; private static PipelineMessageClassifier _pipelineMessageClassifier204; - private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 = PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); + private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 200 }); - private static PipelineMessageClassifier PipelineMessageClassifier204 => _pipelineMessageClassifier204 = PipelineMessageClassifier.Create(stackalloc ushort[] { 204 }); + private static PipelineMessageClassifier PipelineMessageClassifier204 => _pipelineMessageClassifier204 ??= PipelineMessageClassifier.Create(stackalloc ushort[] { 204 }); internal PipelineMessage CreateSayHiRequest(string headParameter, string queryParameter, string optionalQuery, RequestOptions options) { @@ -273,7 +273,10 @@ internal PipelineMessage CreateWithApiVersionRequest(string p1, RequestOptions o ClientUriBuilder uri = new ClientUriBuilder(); uri.Reset(_endpoint); uri.AppendPath("/WithApiVersion", false); - uri.AppendQuery("apiVersion", _apiVersion, true); + if (_apiVersion != null) + { + uri.AppendQuery("apiVersion", _apiVersion, true); + } PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier204); PipelineRequest request = message.Request; request.Headers.Set("p1", p1); @@ -296,7 +299,14 @@ internal PipelineMessage CreateGetWithNextLinkRequest(RequestOptions options) internal PipelineMessage CreateNextGetWithNextLinkRequest(Uri nextPage, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(new Uri(_endpoint, nextPage)); + } PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; request.Headers.Set("Accept", "application/json"); @@ -319,7 +329,14 @@ internal PipelineMessage CreateGetWithStringNextLinkRequest(RequestOptions optio internal PipelineMessage CreateNextGetWithStringNextLinkRequest(Uri nextPage, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(new Uri(_endpoint, nextPage)); + } PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; request.Headers.Set("Accept", "application/json"); @@ -406,5 +423,31 @@ internal PipelineMessage CreateDynamicModelOperationRequest(BinaryContent conten message.Apply(options); return message; } + + internal PipelineMessage CreateGetXmlAdvancedModelRequest(RequestOptions options) + { + ClientUriBuilder uri = new ClientUriBuilder(); + uri.Reset(_endpoint); + uri.AppendPath("/xmlAdvanced", false); + PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); + PipelineRequest request = message.Request; + request.Headers.Set("Accept", "application/xml"); + message.Apply(options); + return message; + } + + internal PipelineMessage CreateUpdateXmlAdvancedModelRequest(BinaryContent content, RequestOptions options) + { + ClientUriBuilder uri = new ClientUriBuilder(); + uri.Reset(_endpoint); + uri.AppendPath("/xmlAdvanced", false); + PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "PUT", PipelineMessageClassifier200); + PipelineRequest request = message.Request; + request.Headers.Set("Content-Type", "application/xml"); + request.Headers.Set("Accept", "application/xml"); + request.Content = content; + message.Apply(options); + return message; + } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecClient.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecClient.cs index 83acde20eb0..1f9910fa362 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecClient.cs @@ -9,6 +9,7 @@ using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -20,13 +21,9 @@ namespace SampleTypeSpec public partial class SampleTypeSpecClient { private readonly Uri _endpoint; - /// A credential used to authenticate to the service. - private readonly ApiKeyCredential _keyCredential; private const string AuthorizationHeader = "my-api-key"; - /// A credential provider used to authenticate to the service. - private readonly AuthenticationTokenProvider _tokenProvider; /// The OAuth2 flows supported by the service. - private readonly Dictionary[] _flows = new Dictionary[] + private static readonly Dictionary[] _flows = new Dictionary[] { new Dictionary { @@ -39,7 +36,7 @@ public partial class SampleTypeSpecClient private AnimalOperations _cachedAnimalOperations; private PetOperations _cachedPetOperations; private DogOperations _cachedDogOperations; - private Metrics _cachedMetrics; + private PlantOperations _cachedPlantOperations; /// Initializes a new instance of SampleTypeSpecClient for mocking. protected SampleTypeSpecClient() @@ -55,39 +52,50 @@ protected SampleTypeSpecClient() } /// Initializes a new instance of SampleTypeSpecClient. + /// The authentication policy to use for pipeline creation. /// Service endpoint. - /// A credential used to authenticate to the service. /// The options for configuring the client. - /// or is null. - public SampleTypeSpecClient(Uri endpoint, ApiKeyCredential credential, SampleTypeSpecClientOptions options) + internal SampleTypeSpecClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, SampleTypeSpecClientOptions options) { Argument.AssertNotNull(endpoint, nameof(endpoint)); - Argument.AssertNotNull(credential, nameof(credential)); options ??= new SampleTypeSpecClientOptions(); _endpoint = endpoint; - _keyCredential = credential; - Pipeline = ClientPipeline.Create(options, Array.Empty(), new PipelinePolicy[] { new UserAgentPolicy(typeof(SampleTypeSpecClient).Assembly), ApiKeyAuthenticationPolicy.CreateHeaderApiKeyPolicy(_keyCredential, AuthorizationHeader) }, Array.Empty()); + if (authenticationPolicy != null) + { + Pipeline = ClientPipeline.Create(options, Array.Empty(), new PipelinePolicy[] { new UserAgentPolicy(typeof(SampleTypeSpecClient).Assembly), authenticationPolicy }, Array.Empty()); + } + else + { + Pipeline = ClientPipeline.Create(options, Array.Empty(), new PipelinePolicy[] { new UserAgentPolicy(typeof(SampleTypeSpecClient).Assembly) }, Array.Empty()); + } _apiVersion = options.Version; } + /// Initializes a new instance of SampleTypeSpecClient. + /// Service endpoint. + /// A credential used to authenticate to the service. + /// The options for configuring the client. + /// or is null. + public SampleTypeSpecClient(Uri endpoint, ApiKeyCredential credential, SampleTypeSpecClientOptions options) : this(ApiKeyAuthenticationPolicy.CreateHeaderApiKeyPolicy(credential, AuthorizationHeader), endpoint, options) + { + } + /// Initializes a new instance of SampleTypeSpecClient. /// Service endpoint. /// A credential provider used to authenticate to the service. /// The options for configuring the client. /// or is null. - public SampleTypeSpecClient(Uri endpoint, AuthenticationTokenProvider tokenProvider, SampleTypeSpecClientOptions options) + public SampleTypeSpecClient(Uri endpoint, AuthenticationTokenProvider tokenProvider, SampleTypeSpecClientOptions options) : this(new BearerTokenPolicy(tokenProvider, _flows), endpoint, options) { - Argument.AssertNotNull(endpoint, nameof(endpoint)); - Argument.AssertNotNull(tokenProvider, nameof(tokenProvider)); - - options ??= new SampleTypeSpecClientOptions(); + } - _endpoint = endpoint; - _tokenProvider = tokenProvider; - Pipeline = ClientPipeline.Create(options, Array.Empty(), new PipelinePolicy[] { new UserAgentPolicy(typeof(SampleTypeSpecClient).Assembly), new BearerTokenPolicy(_tokenProvider, _flows) }, Array.Empty()); - _apiVersion = options.Version; + /// Initializes a new instance of SampleTypeSpecClient from a . + /// The settings for SampleTypeSpecClient. + [Experimental("SCME0002")] + public SampleTypeSpecClient(SampleTypeSpecClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.SampleTypeSpecUrl, settings?.Options) + { } /// The HTTP pipeline for sending and receiving REST requests and responses. @@ -317,6 +325,32 @@ public virtual async Task NoContentTypeAsync(string p2, string p1, return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } + /// Return hi again. + /// + /// The cancellation token that can be used to cancel the operation. + /// is null. + /// Service returned a non-success status code. + public virtual ClientResult NoContentType(Wrapper info, CancellationToken cancellationToken = default) + { + Argument.AssertNotNull(info, nameof(info)); + + ClientResult result = NoContentType(info.P2, info.P1, info.Action, cancellationToken.ToRequestOptions()); + return ClientResult.FromValue((RoundTripModel)result, result.GetRawResponse()); + } + + /// Return hi again. + /// + /// The cancellation token that can be used to cancel the operation. + /// is null. + /// Service returned a non-success status code. + public virtual async Task> NoContentTypeAsync(Wrapper info, CancellationToken cancellationToken = default) + { + Argument.AssertNotNull(info, nameof(info)); + + ClientResult result = await NoContentTypeAsync(info.P2, info.P1, info.Action, cancellationToken.ToRequestOptions()).ConfigureAwait(false); + return ClientResult.FromValue((RoundTripModel)result, result.GetRawResponse()); + } + /// /// [Protocol Method] Return hi in demo2 /// @@ -692,7 +726,7 @@ public virtual ClientResult AnonymousBody(string name, BinaryData require Argument.AssertNotNullOrEmpty(propertyWithSpecialDocs, nameof(propertyWithSpecialDocs)); Thing spreadModel = new Thing( - default, + name, requiredUnion, "accept", requiredNullableString, @@ -743,7 +777,7 @@ public virtual async Task> AnonymousBodyAsync(string name, B Argument.AssertNotNullOrEmpty(propertyWithSpecialDocs, nameof(propertyWithSpecialDocs)); Thing spreadModel = new Thing( - default, + name, requiredUnion, "accept", requiredNullableString, @@ -1735,6 +1769,126 @@ public virtual async Task DynamicModelOperationAsync(DynamicModel return await DynamicModelOperationAsync(body, cancellationToken.ToRequestOptions()).ConfigureAwait(false); } + /// + /// [Protocol Method] Get an advanced XML model with various property types + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual ClientResult GetXmlAdvancedModel(RequestOptions options) + { + using PipelineMessage message = CreateGetXmlAdvancedModelRequest(options); + return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); + } + + /// + /// [Protocol Method] Get an advanced XML model with various property types + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual async Task GetXmlAdvancedModelAsync(RequestOptions options) + { + using PipelineMessage message = CreateGetXmlAdvancedModelRequest(options); + return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); + } + + /// Get an advanced XML model with various property types. + /// The cancellation token that can be used to cancel the operation. + /// Service returned a non-success status code. + public virtual ClientResult GetXmlAdvancedModel(CancellationToken cancellationToken = default) + { + ClientResult result = GetXmlAdvancedModel(cancellationToken.ToRequestOptions()); + return ClientResult.FromValue((XmlAdvancedModel)result, result.GetRawResponse()); + } + + /// Get an advanced XML model with various property types. + /// The cancellation token that can be used to cancel the operation. + /// Service returned a non-success status code. + public virtual async Task> GetXmlAdvancedModelAsync(CancellationToken cancellationToken = default) + { + ClientResult result = await GetXmlAdvancedModelAsync(cancellationToken.ToRequestOptions()).ConfigureAwait(false); + return ClientResult.FromValue((XmlAdvancedModel)result, result.GetRawResponse()); + } + + /// + /// [Protocol Method] Update an advanced XML model with various property types + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The content to send as the body of the request. + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// is null. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual ClientResult UpdateXmlAdvancedModel(BinaryContent content, RequestOptions options = null) + { + Argument.AssertNotNull(content, nameof(content)); + + using PipelineMessage message = CreateUpdateXmlAdvancedModelRequest(content, options); + return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); + } + + /// + /// [Protocol Method] Update an advanced XML model with various property types + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// The content to send as the body of the request. + /// The request options, which can override default behaviors of the client pipeline on a per-call basis. + /// is null. + /// Service returned a non-success status code. + /// The response returned from the service. + public virtual async Task UpdateXmlAdvancedModelAsync(BinaryContent content, RequestOptions options = null) + { + Argument.AssertNotNull(content, nameof(content)); + + using PipelineMessage message = CreateUpdateXmlAdvancedModelRequest(content, options); + return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); + } + + /// Update an advanced XML model with various property types. + /// + /// The cancellation token that can be used to cancel the operation. + /// is null. + /// Service returned a non-success status code. + public virtual ClientResult UpdateXmlAdvancedModel(XmlAdvancedModel body, CancellationToken cancellationToken = default) + { + Argument.AssertNotNull(body, nameof(body)); + + ClientResult result = UpdateXmlAdvancedModel(body, cancellationToken.ToRequestOptions()); + return ClientResult.FromValue((XmlAdvancedModel)result, result.GetRawResponse()); + } + + /// Update an advanced XML model with various property types. + /// + /// The cancellation token that can be used to cancel the operation. + /// is null. + /// Service returned a non-success status code. + public virtual async Task> UpdateXmlAdvancedModelAsync(XmlAdvancedModel body, CancellationToken cancellationToken = default) + { + Argument.AssertNotNull(body, nameof(body)); + + ClientResult result = await UpdateXmlAdvancedModelAsync(body, cancellationToken.ToRequestOptions()).ConfigureAwait(false); + return ClientResult.FromValue((XmlAdvancedModel)result, result.GetRawResponse()); + } + /// Initializes a new instance of AnimalOperations. public virtual AnimalOperations GetAnimalOperationsClient() { @@ -1753,10 +1907,30 @@ public virtual DogOperations GetDogOperationsClient() return Volatile.Read(ref _cachedDogOperations) ?? Interlocked.CompareExchange(ref _cachedDogOperations, new DogOperations(Pipeline, _endpoint), null) ?? _cachedDogOperations; } + /// Initializes a new instance of PlantOperations. + public virtual PlantOperations GetPlantOperationsClient() + { + return Volatile.Read(ref _cachedPlantOperations) ?? Interlocked.CompareExchange(ref _cachedPlantOperations, new PlantOperations(Pipeline, _endpoint), null) ?? _cachedPlantOperations; + } + /// Initializes a new instance of Metrics. - public virtual Metrics GetMetricsClient() + /// + /// is null. + public virtual Metrics GetMetricsClient(string metricsNamespace) + { + Argument.AssertNotNull(metricsNamespace, nameof(metricsNamespace)); + + return new Metrics(Pipeline, _endpoint, metricsNamespace); + } + + /// Initializes a new instance of Notebooks. + /// + /// is null. + public virtual Notebooks GetNotebooksClient(string notebook) { - return Volatile.Read(ref _cachedMetrics) ?? Interlocked.CompareExchange(ref _cachedMetrics, new Metrics(Pipeline, _endpoint), null) ?? _cachedMetrics; + Argument.AssertNotNull(notebook, nameof(notebook)); + + return new Notebooks(Pipeline, _endpoint, notebook); } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecClientOptions.cs index 43baf1ff90f..e26fb92bc89 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecClientOptions.cs @@ -7,6 +7,8 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace SampleTypeSpec { @@ -27,6 +29,22 @@ public SampleTypeSpecClientOptions(ServiceVersion version = LatestVersion) }; } + /// Initializes a new instance of SampleTypeSpecClientOptions from configuration. + /// The configuration section. + [Experimental("SCME0002")] + internal SampleTypeSpecClientOptions(IConfigurationSection section) : base(section) + { + Version = "2024-08-16-preview"; + if (section is null || !section.Exists()) + { + return; + } + if (section["Version"] is string version) + { + Version = version; + } + } + /// Gets the Version. internal string Version { get; } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecClientSettings.cs new file mode 100644 index 00000000000..ecda8d3d801 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecClientSettings.cs @@ -0,0 +1,40 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace SampleTypeSpec +{ + /// Represents the settings used to configure a that can be loaded from an . + [Experimental("SCME0002")] + public partial class SampleTypeSpecClientSettings : ClientSettings + { + /// Gets or sets the SampleTypeSpecUrl. + public Uri SampleTypeSpecUrl { get; set; } + + /// Gets or sets the Options. + public SampleTypeSpecClientOptions Options { get; set; } + + /// Binds configuration values from the given section. + /// The configuration section. + protected override void BindCore(IConfigurationSection section) + { + if (Uri.TryCreate(section["SampleTypeSpecUrl"], UriKind.Absolute, out Uri sampleTypeSpecUrl)) + { + SampleTypeSpecUrl = sampleTypeSpecUrl; + } + IConfigurationSection optionsSection = section.GetSection("Options"); + if (optionsSection.Exists()) + { + Options = new SampleTypeSpecClientOptions(optionsSection); + } + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecModelFactory.cs index f8616b3f57e..a0dc92df9f0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecModelFactory.cs @@ -136,6 +136,16 @@ public static ModelWithRequiredNullableProperties ModelWithRequiredNullablePrope return new ModelWithRequiredNullableProperties(requiredNullablePrimitive, requiredExtensibleEnum, requiredFixedEnum, additionalBinaryDataProperties: null); } + /// The Wrapper. + /// header parameter. + /// body parameter. + /// path parameter. + /// A new instance for mocking. + public static Wrapper Wrapper(string p1 = default, RoundTripModel action = default, string p2 = default) + { + return new Wrapper(p1, action, p2, additionalBinaryDataProperties: null); + } + /// this is not a friendly model but with a friendly name. /// name of the NotFriend. /// A new instance for mocking. @@ -236,6 +246,137 @@ public static AnotherDynamicModel AnotherDynamicModel(string bar = default) return new AnotherDynamicModel(bar, default); } + /// An advanced XML model for testing various property types and XML features. + /// A simple string property. + /// An integer property. + /// A boolean property. + /// A float property. + /// An optional string. + /// An optional integer. + /// A nullable string. + /// A string as XML attribute. + /// An integer as XML attribute. + /// A boolean as XML attribute. + /// A property with a custom XML element name. + /// An attribute with a custom XML name. + /// Text content in the element (unwrapped string). + /// An unwrapped array of strings - items appear directly without wrapper. + /// An unwrapped array of integers. + /// An unwrapped array of models. + /// A wrapped array of strings (default). + /// A wrapped array with custom wrapper name. + /// A nested model property. + /// An optional nested model. + /// A dictionary property. + /// A date-time property. + /// A duration property. + /// A bytes property. + /// optional record of unknown. + /// A fixed enum property. + /// An extensible enum property. + /// An optional fixed enum property. + /// An optional extensible enum property. + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// A new instance for mocking. + public static XmlAdvancedModel XmlAdvancedModel(string name = default, int age = default, bool enabled = default, float score = default, string optionalString = default, int? optionalInt = default, string nullableString = default, string id = default, int version = default, bool isActive = default, string originalName = default, string xmlIdentifier = default, string content = default, IEnumerable unwrappedStrings = default, IEnumerable unwrappedCounts = default, IEnumerable unwrappedItems = default, IEnumerable wrappedColors = default, IEnumerable items = default, XmlNestedModel nestedModel = default, XmlNestedModel optionalNestedModel = default, IDictionary metadata = default, DateTimeOffset createdAt = default, TimeSpan duration = default, BinaryData data = default, IDictionary optionalRecordUnknown = default, StringFixedEnum fixedEnum = default, StringExtensibleEnum extensibleEnum = default, IntFixedEnum? optionalFixedEnum = default, IntExtensibleEnum? optionalExtensibleEnum = default, string label = default, int daysUsed = default, IEnumerable fooItems = default, XmlNestedModel anotherModel = default, IEnumerable modelsWithNamespaces = default, IEnumerable unwrappedModelsWithNamespaces = default, IEnumerable> listOfListFoo = default, IDictionary dictionaryFoo = default, IDictionary> dictionaryOfDictionaryFoo = default, IDictionary> dictionaryListFoo = default, IEnumerable> listOfDictionaryFoo = default) + { + unwrappedStrings ??= new ChangeTrackingList(); + unwrappedCounts ??= new ChangeTrackingList(); + unwrappedItems ??= new ChangeTrackingList(); + wrappedColors ??= new ChangeTrackingList(); + items ??= new ChangeTrackingList(); + metadata ??= new ChangeTrackingDictionary(); + optionalRecordUnknown ??= new ChangeTrackingDictionary(); + fooItems ??= new ChangeTrackingList(); + modelsWithNamespaces ??= new ChangeTrackingList(); + unwrappedModelsWithNamespaces ??= new ChangeTrackingList(); + listOfListFoo ??= new ChangeTrackingList>(); + dictionaryFoo ??= new ChangeTrackingDictionary(); + dictionaryOfDictionaryFoo ??= new ChangeTrackingDictionary>(); + dictionaryListFoo ??= new ChangeTrackingDictionary>(); + listOfDictionaryFoo ??= new ChangeTrackingList>(); + + return new XmlAdvancedModel( + name, + age, + enabled, + score, + optionalString, + optionalInt, + nullableString, + id, + version, + isActive, + originalName, + xmlIdentifier, + content, + unwrappedStrings.ToList(), + unwrappedCounts.ToList(), + unwrappedItems.ToList(), + wrappedColors.ToList(), + items.ToList(), + nestedModel, + optionalNestedModel, + metadata, + createdAt, + duration, + data, + optionalRecordUnknown, + fixedEnum, + extensibleEnum, + optionalFixedEnum, + optionalExtensibleEnum, + label, + daysUsed, + fooItems.ToList(), + anotherModel, + modelsWithNamespaces.ToList(), + unwrappedModelsWithNamespaces.ToList(), + listOfListFoo.ToList(), + dictionaryFoo, + dictionaryOfDictionaryFoo, + dictionaryListFoo, + listOfDictionaryFoo.ToList(), + additionalBinaryDataProperties: null); + } + + /// An item model for XML array testing. + /// The item name. + /// The item value. + /// Item ID as attribute. + /// A new instance for mocking. + public static XmlItem XmlItem(string itemName = default, int itemValue = default, string itemId = default) + { + return new XmlItem(itemName, itemValue, itemId, additionalBinaryDataProperties: null); + } + + /// A nested model for XML testing. + /// The value of the nested model. + /// An attribute on the nested model. + /// A new instance for mocking. + public static XmlNestedModel XmlNestedModel(string value = default, int nestedId = default) + { + return new XmlNestedModel(value, nestedId, additionalBinaryDataProperties: null); + } + + /// The XmlModelWithNamespace. + /// + /// A new instance for mocking. + public static XmlModelWithNamespace XmlModelWithNamespace(string foo = default) + { + return new XmlModelWithNamespace(foo, additionalBinaryDataProperties: null); + } + /// /// Base animal with discriminator /// Please note this is the abstract base class. The derived classes available for instantiation are: and . @@ -267,6 +408,29 @@ public static Dog Dog(string name = default, bool trained = default, string bree return new Dog("pet", name, additionalBinaryDataProperties: null, trained, breed); } + /// Tree is a specific type of plant. + /// The unique identifier of the plant. + /// The height of the plant in centimeters. + /// The age of the tree in years. + /// A new instance for mocking. + public static Tree Tree(string id = default, int height = default, int age = default) + { + return new Tree("tree", id, height, additionalBinaryDataProperties: null, age); + } + + /// + /// Base plant with discriminator + /// Please note this is the abstract base class. The derived classes available for instantiation are: . + /// + /// The species of plant. + /// The unique identifier of the plant. + /// The height of the plant in centimeters. + /// A new instance for mocking. + public static Plant Plant(string species = default, string id = default, int height = default) + { + return new UnknownPlant(species, id, height, additionalBinaryDataProperties: null); + } + /// The GetWidgetMetricsResponse. /// /// @@ -275,5 +439,14 @@ public static GetWidgetMetricsResponse GetWidgetMetricsResponse(int numSold = de { return new GetWidgetMetricsResponse(numSold, averagePrice, additionalBinaryDataProperties: null); } + + /// The GetNotebookResponse. + /// + /// + /// A new instance for mocking. + public static GetNotebookResponse GetNotebookResponse(string name = default, string content = default) + { + return new GetNotebookResponse(name, content, additionalBinaryDataProperties: null); + } } } diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..355ab228733 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,80 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "Metrics": { + "type": "object", + "description": "Configuration for Metrics.", + "properties": { + "SampleTypeSpecUrl": { + "type": "string", + "format": "uri", + "description": "Gets or sets the SampleTypeSpecUrl." + }, + "MetricsNamespace": { + "type": "string" + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/sampleTypeSpecClientOptions" + } + } + }, + "Notebooks": { + "type": "object", + "description": "Configuration for Notebooks.", + "properties": { + "SampleTypeSpecUrl": { + "type": "string", + "format": "uri", + "description": "Gets or sets the SampleTypeSpecUrl." + }, + "Notebook": { + "type": "string" + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/sampleTypeSpecClientOptions" + } + } + }, + "SampleTypeSpecClient": { + "type": "object", + "description": "Configuration for SampleTypeSpecClient.", + "properties": { + "SampleTypeSpecUrl": { + "type": "string", + "format": "uri", + "description": "Gets or sets the SampleTypeSpecUrl." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/sampleTypeSpecClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "sampleTypeSpecClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/SampleTypeSpec.csproj b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/SampleTypeSpec.csproj index 9465df7d19f..cde3e14b047 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/SampleTypeSpec.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/SampleTypeSpec.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/tspCodeModel.json index 43e7b9552c0..eb5275b0626 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/tspCodeModel.json @@ -214,7 +214,7 @@ "doc": "Simple enum", "isFixed": true, "isFlags": false, - "usage": "Input,Output,Json", + "usage": "Input,Output,Json,Xml", "decorators": [] }, { @@ -274,7 +274,7 @@ "doc": "Extensible enum", "isFixed": false, "isFlags": false, - "usage": "Input,Output,Json", + "usage": "Input,Output,Json,Xml", "decorators": [] }, { @@ -334,7 +334,7 @@ "doc": "Int based extensible enum", "isFixed": false, "isFlags": false, - "usage": "Input,Output,Json", + "usage": "Input,Output,Json,Xml", "decorators": [] }, { @@ -634,7 +634,7 @@ "doc": "int fixed enum", "isFixed": true, "isFlags": false, - "usage": "Input,Output,Json", + "usage": "Input,Output,Json,Xml", "decorators": [] }, { @@ -911,9 +911,9 @@ { "$id": "84", "kind": "constant", - "name": "sayHiContentType", - "namespace": "", - "usage": "None", + "name": "TreeSpecies", + "namespace": "SampleTypeSpec", + "usage": "Input,Output,Json,Xml", "valueType": { "$id": "85", "kind": "string", @@ -921,13 +921,13 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "application/json", + "value": "tree", "decorators": [] }, { "$id": "86", "kind": "constant", - "name": "HelloAgainRequestContentType", + "name": "sayHiContentType", "namespace": "", "usage": "None", "valueType": { @@ -937,13 +937,13 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "text/plain", + "value": "application/json", "decorators": [] }, { "$id": "88", "kind": "constant", - "name": "helloAgainContentType", + "name": "HelloAgainRequestContentType", "namespace": "", "usage": "None", "valueType": { @@ -953,7 +953,7 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "application/json", + "value": "text/plain", "decorators": [] }, { @@ -975,7 +975,7 @@ { "$id": "92", "kind": "constant", - "name": "noContentTypeContentType", + "name": "helloAgainContentType", "namespace": "", "usage": "None", "valueType": { @@ -991,7 +991,7 @@ { "$id": "94", "kind": "constant", - "name": "noContentTypeContentType1", + "name": "noContentTypeContentType", "namespace": "", "usage": "None", "valueType": { @@ -1007,7 +1007,7 @@ { "$id": "96", "kind": "constant", - "name": "helloDemo2ContentType", + "name": "noContentTypeContentType1", "namespace": "", "usage": "None", "valueType": { @@ -1023,7 +1023,7 @@ { "$id": "98", "kind": "constant", - "name": "createLiteralContentType", + "name": "helloDemo2ContentType", "namespace": "", "usage": "None", "valueType": { @@ -1039,7 +1039,7 @@ { "$id": "100", "kind": "constant", - "name": "createLiteralContentType1", + "name": "createLiteralContentType", "namespace": "", "usage": "None", "valueType": { @@ -1055,7 +1055,7 @@ { "$id": "102", "kind": "constant", - "name": "HelloLiteralRequestP1", + "name": "createLiteralContentType1", "namespace": "", "usage": "None", "valueType": { @@ -1065,87 +1065,87 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "test", + "value": "application/json", "decorators": [] }, { "$id": "104", "kind": "constant", - "name": "ThingRequiredLiteralInt1", + "name": "HelloLiteralRequestP1", "namespace": "", "usage": "None", "valueType": { "$id": "105", - "kind": "int32", - "name": "int32", - "crossLanguageDefinitionId": "TypeSpec.int32", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": 123, + "value": "test", "decorators": [] }, { "$id": "106", "kind": "constant", - "name": "ThingOptionalLiteralBool1", + "name": "HelloLiteralRequestP11", "namespace": "", "usage": "None", "valueType": { "$id": "107", - "kind": "boolean", - "name": "boolean", - "crossLanguageDefinitionId": "TypeSpec.boolean", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": true, + "value": "test", "decorators": [] }, { "$id": "108", "kind": "constant", - "name": "helloLiteralContentType", + "name": "ThingRequiredLiteralInt1", "namespace": "", "usage": "None", "valueType": { "$id": "109", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", "decorators": [] }, - "value": "application/json", + "value": 123, "decorators": [] }, { "$id": "110", "kind": "constant", - "name": "HelloLiteralRequestP11", + "name": "ThingRequiredLiteralInt2", "namespace": "", "usage": "None", "valueType": { "$id": "111", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", "decorators": [] }, - "value": "test", + "value": 123, "decorators": [] }, { "$id": "112", "kind": "constant", - "name": "ThingRequiredLiteralInt2", + "name": "ThingOptionalLiteralBool1", "namespace": "", "usage": "None", "valueType": { "$id": "113", - "kind": "int32", - "name": "int32", - "crossLanguageDefinitionId": "TypeSpec.int32", + "kind": "boolean", + "name": "boolean", + "crossLanguageDefinitionId": "TypeSpec.boolean", "decorators": [] }, - "value": 123, + "value": true, "decorators": [] }, { @@ -1167,7 +1167,7 @@ { "$id": "116", "kind": "constant", - "name": "topActionContentType", + "name": "helloLiteralContentType", "namespace": "", "usage": "None", "valueType": { @@ -1183,7 +1183,7 @@ { "$id": "118", "kind": "constant", - "name": "topAction2ContentType", + "name": "topActionContentType", "namespace": "", "usage": "None", "valueType": { @@ -1199,7 +1199,7 @@ { "$id": "120", "kind": "constant", - "name": "patchActionContentType", + "name": "topAction2ContentType", "namespace": "", "usage": "None", "valueType": { @@ -1215,7 +1215,7 @@ { "$id": "122", "kind": "constant", - "name": "patchActionContentType1", + "name": "patchActionContentType", "namespace": "", "usage": "None", "valueType": { @@ -1231,7 +1231,7 @@ { "$id": "124", "kind": "constant", - "name": "AnonymousBodyRequestRequiredQueryParam", + "name": "patchActionContentType1", "namespace": "", "usage": "None", "valueType": { @@ -1241,13 +1241,13 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "someRequiredLiteralQueryParam", + "value": "application/json", "decorators": [] }, { "$id": "126", "kind": "constant", - "name": "AnonymousBodyRequestRequiredHeader", + "name": "AnonymousBodyRequestRequiredQueryParam", "namespace": "", "usage": "None", "valueType": { @@ -1257,13 +1257,13 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "someRequiredLiteralHeader", + "value": "someRequiredLiteralQueryParam", "decorators": [] }, { "$id": "128", "kind": "constant", - "name": "anonymousBodyContentType", + "name": "AnonymousBodyRequestRequiredQueryParam1", "namespace": "", "usage": "None", "valueType": { @@ -1273,13 +1273,13 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "application/json", + "value": "someRequiredLiteralQueryParam", "decorators": [] }, { "$id": "130", "kind": "constant", - "name": "anonymousBodyContentType1", + "name": "AnonymousBodyRequestRequiredHeader", "namespace": "", "usage": "None", "valueType": { @@ -1289,13 +1289,13 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "application/json", + "value": "someRequiredLiteralHeader", "decorators": [] }, { "$id": "132", "kind": "constant", - "name": "ThingRequiredLiteralString1", + "name": "AnonymousBodyRequestRequiredHeader1", "namespace": "", "usage": "None", "valueType": { @@ -1305,125 +1305,125 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "accept", + "value": "someRequiredLiteralHeader", "decorators": [] }, { "$id": "134", "kind": "constant", - "name": "ThingRequiredLiteralInt3", + "name": "anonymousBodyContentType", "namespace": "", "usage": "None", "valueType": { "$id": "135", - "kind": "int32", - "name": "int32", - "crossLanguageDefinitionId": "TypeSpec.int32", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": 123, + "value": "application/json", "decorators": [] }, { "$id": "136", "kind": "constant", - "name": "ThingRequiredLiteralFloat1", + "name": "anonymousBodyContentType1", "namespace": "", "usage": "None", "valueType": { "$id": "137", - "kind": "float32", - "name": "float32", - "crossLanguageDefinitionId": "TypeSpec.float32", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": 1.23, + "value": "application/json", "decorators": [] }, { "$id": "138", "kind": "constant", - "name": "ThingRequiredLiteralBool1", + "name": "ThingRequiredLiteralString1", "namespace": "", "usage": "None", "valueType": { "$id": "139", - "kind": "boolean", - "name": "boolean", - "crossLanguageDefinitionId": "TypeSpec.boolean", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": false, + "value": "accept", "decorators": [] }, { "$id": "140", "kind": "constant", - "name": "ThingOptionalLiteralBool3", + "name": "ThingRequiredLiteralInt3", "namespace": "", "usage": "None", "valueType": { "$id": "141", - "kind": "boolean", - "name": "boolean", - "crossLanguageDefinitionId": "TypeSpec.boolean", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", "decorators": [] }, - "value": true, + "value": 123, "decorators": [] }, { "$id": "142", "kind": "constant", - "name": "AnonymousBodyRequestRequiredQueryParam1", + "name": "ThingRequiredLiteralFloat1", "namespace": "", "usage": "None", "valueType": { "$id": "143", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", + "kind": "float32", + "name": "float32", + "crossLanguageDefinitionId": "TypeSpec.float32", "decorators": [] }, - "value": "someRequiredLiteralQueryParam", + "value": 1.23, "decorators": [] }, { "$id": "144", "kind": "constant", - "name": "AnonymousBodyRequestRequiredHeader1", + "name": "ThingRequiredLiteralBool1", "namespace": "", "usage": "None", "valueType": { "$id": "145", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", + "kind": "boolean", + "name": "boolean", + "crossLanguageDefinitionId": "TypeSpec.boolean", "decorators": [] }, - "value": "someRequiredLiteralHeader", + "value": false, "decorators": [] }, { "$id": "146", "kind": "constant", - "name": "friendlyModelContentType", + "name": "ThingOptionalLiteralBool3", "namespace": "", "usage": "None", "valueType": { "$id": "147", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", + "kind": "boolean", + "name": "boolean", + "crossLanguageDefinitionId": "TypeSpec.boolean", "decorators": [] }, - "value": "application/json", + "value": true, "decorators": [] }, { "$id": "148", "kind": "constant", - "name": "friendlyModelContentType1", + "name": "friendlyModelContentType", "namespace": "", "usage": "None", "valueType": { @@ -1439,7 +1439,7 @@ { "$id": "150", "kind": "constant", - "name": "projectedNameModelContentType", + "name": "friendlyModelContentType1", "namespace": "", "usage": "None", "valueType": { @@ -1455,7 +1455,7 @@ { "$id": "152", "kind": "constant", - "name": "projectedNameModelContentType1", + "name": "projectedNameModelContentType", "namespace": "", "usage": "None", "valueType": { @@ -1471,7 +1471,7 @@ { "$id": "154", "kind": "constant", - "name": "returnsAnonymousModelContentType", + "name": "projectedNameModelContentType1", "namespace": "", "usage": "None", "valueType": { @@ -1487,7 +1487,7 @@ { "$id": "156", "kind": "constant", - "name": "internalProtocolContentType", + "name": "returnsAnonymousModelContentType", "namespace": "", "usage": "None", "valueType": { @@ -1503,7 +1503,7 @@ { "$id": "158", "kind": "constant", - "name": "internalProtocolContentType1", + "name": "internalProtocolContentType", "namespace": "", "usage": "None", "valueType": { @@ -1519,7 +1519,7 @@ { "$id": "160", "kind": "constant", - "name": "ListWithNextLinkContentType", + "name": "internalProtocolContentType1", "namespace": "", "usage": "None", "valueType": { @@ -1535,7 +1535,7 @@ { "$id": "162", "kind": "constant", - "name": "ListWithStringNextLinkContentType", + "name": "ListWithNextLinkContentType", "namespace": "", "usage": "None", "valueType": { @@ -1551,7 +1551,7 @@ { "$id": "164", "kind": "constant", - "name": "ListWithContinuationTokenContentType", + "name": "ListWithStringNextLinkContentType", "namespace": "", "usage": "None", "valueType": { @@ -1567,7 +1567,7 @@ { "$id": "166", "kind": "constant", - "name": "ListWithContinuationTokenHeaderResponseContentType", + "name": "ListWithContinuationTokenContentType", "namespace": "", "usage": "None", "valueType": { @@ -1583,7 +1583,7 @@ { "$id": "168", "kind": "constant", - "name": "ListWithPagingContentType", + "name": "ListWithContinuationTokenHeaderResponseContentType", "namespace": "", "usage": "None", "valueType": { @@ -1599,7 +1599,7 @@ { "$id": "170", "kind": "constant", - "name": "EmbeddedParametersContentType", + "name": "ListWithPagingContentType", "namespace": "", "usage": "None", "valueType": { @@ -1615,7 +1615,7 @@ { "$id": "172", "kind": "constant", - "name": "DynamicModelOperationContentType", + "name": "EmbeddedParametersContentType", "namespace": "", "usage": "None", "valueType": { @@ -1631,7 +1631,7 @@ { "$id": "174", "kind": "constant", - "name": "updatePetAsAnimalContentType", + "name": "DynamicModelOperationContentType", "namespace": "", "usage": "None", "valueType": { @@ -1647,7 +1647,7 @@ { "$id": "176", "kind": "constant", - "name": "updatePetAsAnimalContentType1", + "name": "GetXmlAdvancedModelContentType", "namespace": "", "usage": "None", "valueType": { @@ -1657,13 +1657,13 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "application/json", + "value": "application/xml", "decorators": [] }, { "$id": "178", "kind": "constant", - "name": "updateDogAsAnimalContentType", + "name": "GetXmlAdvancedModelResponseContentType", "namespace": "", "usage": "None", "valueType": { @@ -1673,13 +1673,13 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "application/json", + "value": "application/xml", "decorators": [] }, { "$id": "180", "kind": "constant", - "name": "updateDogAsAnimalContentType1", + "name": "GetXmlAdvancedModelResponseContentType1", "namespace": "", "usage": "None", "valueType": { @@ -1689,13 +1689,13 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "application/json", + "value": "application/xml", "decorators": [] }, { "$id": "182", "kind": "constant", - "name": "updatePetAsPetContentType", + "name": "GetXmlAdvancedModelResponseContentType2", "namespace": "", "usage": "None", "valueType": { @@ -1705,13 +1705,13 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "application/json", + "value": "application/xml", "decorators": [] }, { "$id": "184", "kind": "constant", - "name": "updatePetAsPetContentType1", + "name": "UpdateXmlAdvancedModelContentType", "namespace": "", "usage": "None", "valueType": { @@ -1721,13 +1721,13 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "application/json", + "value": "application/xml", "decorators": [] }, { "$id": "186", "kind": "constant", - "name": "updateDogAsPetContentType", + "name": "GetXmlAdvancedModelResponseContentType3", "namespace": "", "usage": "None", "valueType": { @@ -1737,13 +1737,13 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "application/json", + "value": "application/xml", "decorators": [] }, { "$id": "188", "kind": "constant", - "name": "updateDogAsPetContentType1", + "name": "updatePetAsAnimalContentType", "namespace": "", "usage": "None", "valueType": { @@ -1759,7 +1759,7 @@ { "$id": "190", "kind": "constant", - "name": "updateDogAsDogContentType", + "name": "updatePetAsAnimalContentType1", "namespace": "", "usage": "None", "valueType": { @@ -1775,7 +1775,7 @@ { "$id": "192", "kind": "constant", - "name": "updateDogAsDogContentType1", + "name": "updateDogAsAnimalContentType", "namespace": "", "usage": "None", "valueType": { @@ -1791,7 +1791,7 @@ { "$id": "194", "kind": "constant", - "name": "getWidgetMetricsContentType", + "name": "updateDogAsAnimalContentType1", "namespace": "", "usage": "None", "valueType": { @@ -1803,35 +1803,1244 @@ }, "value": "application/json", "decorators": [] - } - ], - "models": [ + }, { "$id": "196", - "kind": "model", - "name": "Thing", - "namespace": "SampleTypeSpec", - "crossLanguageDefinitionId": "SampleTypeSpec.Thing", - "usage": "Input,Output,Spread,Json", - "doc": "A model with a few properties of literal types", - "decorators": [], - "serializationOptions": { - "json": { - "name": "Thing" - } + "kind": "constant", + "name": "updatePetAsPetContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "197", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, - "properties": [ - { - "$id": "197", - "kind": "property", - "name": "name", - "serializedName": "name", + "value": "application/json", + "decorators": [] + }, + { + "$id": "198", + "kind": "constant", + "name": "updatePetAsPetContentType1", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "199", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "200", + "kind": "constant", + "name": "updateDogAsPetContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "201", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "202", + "kind": "constant", + "name": "updateDogAsPetContentType1", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "203", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "204", + "kind": "constant", + "name": "updateDogAsDogContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "205", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "206", + "kind": "constant", + "name": "updateDogAsDogContentType1", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "207", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "208", + "kind": "constant", + "name": "getTreeContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "209", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "210", + "kind": "constant", + "name": "GetXmlAdvancedModelResponseContentType4", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "211", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "212", + "kind": "constant", + "name": "getTreeAsJsonContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "213", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "214", + "kind": "constant", + "name": "GetTreeAsJsonResponseContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "215", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "216", + "kind": "constant", + "name": "GetXmlAdvancedModelResponseContentType5", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "217", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "218", + "kind": "constant", + "name": "GetXmlAdvancedModelResponseContentType6", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "219", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "220", + "kind": "constant", + "name": "updateTreeContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "221", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "222", + "kind": "constant", + "name": "GetXmlAdvancedModelResponseContentType7", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "223", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "224", + "kind": "constant", + "name": "GetTreeAsJsonResponseContentType1", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "225", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "226", + "kind": "constant", + "name": "GetTreeAsJsonResponseContentType2", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "227", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "228", + "kind": "constant", + "name": "updateTreeAsJsonContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "229", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "230", + "kind": "constant", + "name": "GetTreeAsJsonResponseContentType3", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "231", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "232", + "kind": "constant", + "name": "getWidgetMetricsContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "233", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "234", + "kind": "constant", + "name": "getNotebookContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "235", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + } + ], + "models": [ + { + "$id": "236", + "kind": "model", + "name": "Thing", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.Thing", + "usage": "Input,Output,Spread,Json", + "doc": "A model with a few properties of literal types", + "decorators": [], + "serializationOptions": { + "json": { + "name": "Thing" + } + }, + "properties": [ + { + "$id": "237", + "kind": "property", + "name": "name", + "serializedName": "name", "doc": "name of the Thing", "type": { - "$id": "198", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", + "$id": "238", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Thing.name", + "serializationOptions": { + "json": { + "name": "name" + } + }, + "isHttpMetadata": false + }, + { + "$id": "239", + "kind": "property", + "name": "requiredUnion", + "serializedName": "requiredUnion", + "doc": "required Union", + "type": { + "$id": "240", + "kind": "union", + "name": "ThingRequiredUnion", + "variantTypes": [ + { + "$id": "241", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + { + "$id": "242", + "kind": "array", + "name": "Array", + "valueType": { + "$id": "243", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] + }, + { + "$id": "244", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + } + ], + "namespace": "SampleTypeSpec", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Thing.requiredUnion", + "serializationOptions": { + "json": { + "name": "requiredUnion" + } + }, + "isHttpMetadata": false + }, + { + "$id": "245", + "kind": "property", + "name": "requiredLiteralString", + "serializedName": "requiredLiteralString", + "doc": "required literal string", + "type": { + "$ref": "70" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Thing.requiredLiteralString", + "serializationOptions": { + "json": { + "name": "requiredLiteralString" + } + }, + "isHttpMetadata": false + }, + { + "$id": "246", + "kind": "property", + "name": "requiredNullableString", + "serializedName": "requiredNullableString", + "doc": "required nullable string", + "type": { + "$id": "247", + "kind": "nullable", + "type": { + "$id": "248", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "namespace": "SampleTypeSpec" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Thing.requiredNullableString", + "serializationOptions": { + "json": { + "name": "requiredNullableString" + } + }, + "isHttpMetadata": false + }, + { + "$id": "249", + "kind": "property", + "name": "optionalNullableString", + "serializedName": "optionalNullableString", + "doc": "required optional string", + "type": { + "$id": "250", + "kind": "nullable", + "type": { + "$id": "251", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "namespace": "SampleTypeSpec" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Thing.optionalNullableString", + "serializationOptions": { + "json": { + "name": "optionalNullableString" + } + }, + "isHttpMetadata": false + }, + { + "$id": "252", + "kind": "property", + "name": "requiredLiteralInt", + "serializedName": "requiredLiteralInt", + "doc": "required literal int", + "type": { + "$ref": "72" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Thing.requiredLiteralInt", + "serializationOptions": { + "json": { + "name": "requiredLiteralInt" + } + }, + "isHttpMetadata": false + }, + { + "$id": "253", + "kind": "property", + "name": "requiredLiteralFloat", + "serializedName": "requiredLiteralFloat", + "doc": "required literal float", + "type": { + "$ref": "74" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Thing.requiredLiteralFloat", + "serializationOptions": { + "json": { + "name": "requiredLiteralFloat" + } + }, + "isHttpMetadata": false + }, + { + "$id": "254", + "kind": "property", + "name": "requiredLiteralBool", + "serializedName": "requiredLiteralBool", + "doc": "required literal bool", + "type": { + "$ref": "76" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Thing.requiredLiteralBool", + "serializationOptions": { + "json": { + "name": "requiredLiteralBool" + } + }, + "isHttpMetadata": false + }, + { + "$id": "255", + "kind": "property", + "name": "optionalLiteralString", + "serializedName": "optionalLiteralString", + "doc": "optional literal string", + "type": { + "$ref": "1" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Thing.optionalLiteralString", + "serializationOptions": { + "json": { + "name": "optionalLiteralString" + } + }, + "isHttpMetadata": false + }, + { + "$id": "256", + "kind": "property", + "name": "requiredNullableLiteralString", + "serializedName": "requiredNullableLiteralString", + "doc": "required nullable literal string", + "type": { + "$id": "257", + "kind": "nullable", + "type": { + "$ref": "5" + }, + "namespace": "SampleTypeSpec" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Thing.requiredNullableLiteralString", + "serializationOptions": { + "json": { + "name": "requiredNullableLiteralString" + } + }, + "isHttpMetadata": false + }, + { + "$id": "258", + "kind": "property", + "name": "optionalLiteralInt", + "serializedName": "optionalLiteralInt", + "doc": "optional literal int", + "type": { + "$ref": "9" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Thing.optionalLiteralInt", + "serializationOptions": { + "json": { + "name": "optionalLiteralInt" + } + }, + "isHttpMetadata": false + }, + { + "$id": "259", + "kind": "property", + "name": "optionalLiteralFloat", + "serializedName": "optionalLiteralFloat", + "doc": "optional literal float", + "type": { + "$ref": "13" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Thing.optionalLiteralFloat", + "serializationOptions": { + "json": { + "name": "optionalLiteralFloat" + } + }, + "isHttpMetadata": false + }, + { + "$id": "260", + "kind": "property", + "name": "optionalLiteralBool", + "serializedName": "optionalLiteralBool", + "doc": "optional literal bool", + "type": { + "$ref": "78" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Thing.optionalLiteralBool", + "serializationOptions": { + "json": { + "name": "optionalLiteralBool" + } + }, + "isHttpMetadata": false + }, + { + "$id": "261", + "kind": "property", + "name": "requiredBadDescription", + "serializedName": "requiredBadDescription", + "doc": "description with xml <|endoftext|>", + "type": { + "$id": "262", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Thing.requiredBadDescription", + "serializationOptions": { + "json": { + "name": "requiredBadDescription" + } + }, + "isHttpMetadata": false + }, + { + "$id": "263", + "kind": "property", + "name": "optionalNullableList", + "serializedName": "optionalNullableList", + "doc": "optional nullable collection", + "type": { + "$id": "264", + "kind": "nullable", + "type": { + "$id": "265", + "kind": "array", + "name": "Array1", + "valueType": { + "$id": "266", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] + }, + "namespace": "SampleTypeSpec" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Thing.optionalNullableList", + "serializationOptions": { + "json": { + "name": "optionalNullableList" + } + }, + "isHttpMetadata": false + }, + { + "$id": "267", + "kind": "property", + "name": "requiredNullableList", + "serializedName": "requiredNullableList", + "doc": "required nullable collection", + "type": { + "$id": "268", + "kind": "nullable", + "type": { + "$ref": "265" + }, + "namespace": "SampleTypeSpec" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Thing.requiredNullableList", + "serializationOptions": { + "json": { + "name": "requiredNullableList" + } + }, + "isHttpMetadata": false + }, + { + "$id": "269", + "kind": "property", + "name": "propertyWithSpecialDocs", + "serializedName": "propertyWithSpecialDocs", + "doc": "This tests:\n- Simple bullet point. This bullet point is going to be very long to test how text wrapping is handled in bullet points within documentation comments. It should properly indent the wrapped lines.\n- Another bullet point with **bold text**. This bullet point is also intentionally long to see how the formatting is preserved when the text wraps onto multiple lines in the generated documentation.\n- Third bullet point with *italic text*. Similar to the previous points, this one is extended to ensure that the wrapping and formatting are correctly applied in the output.\n- Complex bullet point with **bold** and *italic* combined. This bullet point combines both bold and italic formatting and is long enough to test the wrapping behavior in such cases.\n- **Bold bullet point**: A bullet point that is entirely bolded. This point is also made lengthy to observe how the bold formatting is maintained across wrapped lines.\n- *Italic bullet point*: A bullet point that is entirely italicized. This final point is extended to verify that italic formatting is correctly applied even when the text spans multiple lines.", + "type": { + "$id": "270", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Thing.propertyWithSpecialDocs", + "serializationOptions": { + "json": { + "name": "propertyWithSpecialDocs" + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "271", + "kind": "model", + "name": "RoundTripModel", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel", + "usage": "Input,Output,Json", + "doc": "this is a roundtrip model", + "decorators": [], + "serializationOptions": { + "json": { + "name": "RoundTripModel" + } + }, + "properties": [ + { + "$id": "272", + "kind": "property", + "name": "requiredString", + "serializedName": "requiredString", + "doc": "Required string, illustrating a reference type property.", + "type": { + "$id": "273", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.requiredString", + "serializationOptions": { + "json": { + "name": "requiredString" + } + }, + "isHttpMetadata": false + }, + { + "$id": "274", + "kind": "property", + "name": "requiredInt", + "serializedName": "requiredInt", + "doc": "Required int, illustrating a value type property.", + "type": { + "$id": "275", + "kind": "int32", + "name": "int32", + "encode": "string", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.requiredInt", + "serializationOptions": { + "json": { + "name": "requiredInt" + } + }, + "isHttpMetadata": false + }, + { + "$id": "276", + "kind": "property", + "name": "requiredCollection", + "serializedName": "requiredCollection", + "doc": "Required collection of enums", + "type": { + "$id": "277", + "kind": "array", + "name": "ArrayStringFixedEnum", + "valueType": { + "$ref": "17" + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.requiredCollection", + "serializationOptions": { + "json": { + "name": "requiredCollection" + } + }, + "isHttpMetadata": false + }, + { + "$id": "278", + "kind": "property", + "name": "requiredDictionary", + "serializedName": "requiredDictionary", + "doc": "Required dictionary of enums", + "type": { + "$id": "279", + "kind": "dict", + "keyType": { + "$id": "280", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "valueType": { + "$ref": "22" + }, + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.requiredDictionary", + "serializationOptions": { + "json": { + "name": "requiredDictionary" + } + }, + "isHttpMetadata": false + }, + { + "$id": "281", + "kind": "property", + "name": "requiredModel", + "serializedName": "requiredModel", + "doc": "Required model", + "type": { + "$ref": "236" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.requiredModel", + "serializationOptions": { + "json": { + "name": "requiredModel" + } + }, + "isHttpMetadata": false + }, + { + "$id": "282", + "kind": "property", + "name": "intExtensibleEnum", + "serializedName": "intExtensibleEnum", + "doc": "this is an int based extensible enum", + "type": { + "$ref": "27" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.intExtensibleEnum", + "serializationOptions": { + "json": { + "name": "intExtensibleEnum" + } + }, + "isHttpMetadata": false + }, + { + "$id": "283", + "kind": "property", + "name": "intExtensibleEnumCollection", + "serializedName": "intExtensibleEnumCollection", + "doc": "this is a collection of int based extensible enum", + "type": { + "$id": "284", + "kind": "array", + "name": "ArrayIntExtensibleEnum", + "valueType": { + "$ref": "27" + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.intExtensibleEnumCollection", + "serializationOptions": { + "json": { + "name": "intExtensibleEnumCollection" + } + }, + "isHttpMetadata": false + }, + { + "$id": "285", + "kind": "property", + "name": "floatExtensibleEnum", + "serializedName": "floatExtensibleEnum", + "doc": "this is a float based extensible enum", + "type": { + "$ref": "32" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.floatExtensibleEnum", + "serializationOptions": { + "json": { + "name": "floatExtensibleEnum" + } + }, + "isHttpMetadata": false + }, + { + "$id": "286", + "kind": "property", + "name": "floatExtensibleEnumWithIntValue", + "serializedName": "floatExtensibleEnumWithIntValue", + "doc": "this is a float based extensible enum", + "type": { + "$ref": "37" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.floatExtensibleEnumWithIntValue", + "serializationOptions": { + "json": { + "name": "floatExtensibleEnumWithIntValue" + } + }, + "isHttpMetadata": false + }, + { + "$id": "287", + "kind": "property", + "name": "floatExtensibleEnumCollection", + "serializedName": "floatExtensibleEnumCollection", + "doc": "this is a collection of float based extensible enum", + "type": { + "$id": "288", + "kind": "array", + "name": "ArrayFloatExtensibleEnum", + "valueType": { + "$ref": "32" + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.floatExtensibleEnumCollection", + "serializationOptions": { + "json": { + "name": "floatExtensibleEnumCollection" + } + }, + "isHttpMetadata": false + }, + { + "$id": "289", + "kind": "property", + "name": "floatFixedEnum", + "serializedName": "floatFixedEnum", + "doc": "this is a float based fixed enum", + "type": { + "$ref": "42" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.floatFixedEnum", + "serializationOptions": { + "json": { + "name": "floatFixedEnum" + } + }, + "isHttpMetadata": false + }, + { + "$id": "290", + "kind": "property", + "name": "floatFixedEnumWithIntValue", + "serializedName": "floatFixedEnumWithIntValue", + "doc": "this is a float based fixed enum", + "type": { + "$ref": "47" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.floatFixedEnumWithIntValue", + "serializationOptions": { + "json": { + "name": "floatFixedEnumWithIntValue" + } + }, + "isHttpMetadata": false + }, + { + "$id": "291", + "kind": "property", + "name": "floatFixedEnumCollection", + "serializedName": "floatFixedEnumCollection", + "doc": "this is a collection of float based fixed enum", + "type": { + "$id": "292", + "kind": "array", + "name": "ArrayFloatFixedEnum", + "valueType": { + "$ref": "42" + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.floatFixedEnumCollection", + "serializationOptions": { + "json": { + "name": "floatFixedEnumCollection" + } + }, + "isHttpMetadata": false + }, + { + "$id": "293", + "kind": "property", + "name": "intFixedEnum", + "serializedName": "intFixedEnum", + "doc": "this is a int based fixed enum", + "type": { + "$ref": "52" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.intFixedEnum", + "serializationOptions": { + "json": { + "name": "intFixedEnum" + } + }, + "isHttpMetadata": false + }, + { + "$id": "294", + "kind": "property", + "name": "intFixedEnumCollection", + "serializedName": "intFixedEnumCollection", + "doc": "this is a collection of int based fixed enum", + "type": { + "$id": "295", + "kind": "array", + "name": "ArrayIntFixedEnum", + "valueType": { + "$ref": "52" + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.intFixedEnumCollection", + "serializationOptions": { + "json": { + "name": "intFixedEnumCollection" + } + }, + "isHttpMetadata": false + }, + { + "$id": "296", + "kind": "property", + "name": "stringFixedEnum", + "serializedName": "stringFixedEnum", + "doc": "this is a string based fixed enum", + "type": { + "$ref": "17" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.stringFixedEnum", + "serializationOptions": { + "json": { + "name": "stringFixedEnum" + } + }, + "isHttpMetadata": false + }, + { + "$id": "297", + "kind": "property", + "name": "requiredUnknown", + "serializedName": "requiredUnknown", + "doc": "required unknown", + "type": { + "$id": "298", + "kind": "unknown", + "name": "unknown", + "crossLanguageDefinitionId": "", "decorators": [] }, "optional": false, @@ -1839,448 +3048,730 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Thing.name", + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.requiredUnknown", "serializationOptions": { "json": { - "name": "name" + "name": "requiredUnknown" } }, "isHttpMetadata": false }, { - "$id": "199", + "$id": "299", "kind": "property", - "name": "requiredUnion", - "serializedName": "requiredUnion", - "doc": "required Union", + "name": "optionalUnknown", + "serializedName": "optionalUnknown", + "doc": "optional unknown", "type": { - "$id": "200", - "kind": "union", - "name": "ThingRequiredUnion", - "variantTypes": [ + "$id": "300", + "kind": "unknown", + "name": "unknown", + "crossLanguageDefinitionId": "", + "decorators": [] + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.optionalUnknown", + "serializationOptions": { + "json": { + "name": "optionalUnknown" + } + }, + "isHttpMetadata": false + }, + { + "$id": "301", + "kind": "property", + "name": "requiredRecordUnknown", + "serializedName": "requiredRecordUnknown", + "doc": "required record of unknown", + "type": { + "$id": "302", + "kind": "dict", + "keyType": { + "$id": "303", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "valueType": { + "$id": "304", + "kind": "unknown", + "name": "unknown", + "crossLanguageDefinitionId": "", + "decorators": [] + }, + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.requiredRecordUnknown", + "serializationOptions": { + "json": { + "name": "requiredRecordUnknown" + } + }, + "isHttpMetadata": false + }, + { + "$id": "305", + "kind": "property", + "name": "optionalRecordUnknown", + "serializedName": "optionalRecordUnknown", + "doc": "optional record of unknown", + "type": { + "$ref": "302" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.optionalRecordUnknown", + "serializationOptions": { + "json": { + "name": "optionalRecordUnknown" + } + }, + "isHttpMetadata": false + }, + { + "$id": "306", + "kind": "property", + "name": "readOnlyRequiredRecordUnknown", + "serializedName": "readOnlyRequiredRecordUnknown", + "doc": "required readonly record of unknown", + "type": { + "$ref": "302" + }, + "optional": false, + "readOnly": true, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.readOnlyRequiredRecordUnknown", + "serializationOptions": { + "json": { + "name": "readOnlyRequiredRecordUnknown" + } + }, + "isHttpMetadata": false + }, + { + "$id": "307", + "kind": "property", + "name": "readOnlyOptionalRecordUnknown", + "serializedName": "readOnlyOptionalRecordUnknown", + "doc": "optional readonly record of unknown", + "type": { + "$ref": "302" + }, + "optional": true, + "readOnly": true, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.readOnlyOptionalRecordUnknown", + "serializationOptions": { + "json": { + "name": "readOnlyOptionalRecordUnknown" + } + }, + "isHttpMetadata": false + }, + { + "$id": "308", + "kind": "property", + "name": "modelWithRequiredNullable", + "serializedName": "modelWithRequiredNullable", + "doc": "this is a model with required nullable properties", + "type": { + "$id": "309", + "kind": "model", + "name": "ModelWithRequiredNullableProperties", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithRequiredNullableProperties", + "usage": "Input,Output,Json", + "doc": "A model with a few required nullable properties", + "decorators": [], + "serializationOptions": { + "json": { + "name": "ModelWithRequiredNullableProperties" + } + }, + "properties": [ { - "$id": "201", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] + "$id": "310", + "kind": "property", + "name": "requiredNullablePrimitive", + "serializedName": "requiredNullablePrimitive", + "doc": "required nullable primitive type", + "type": { + "$id": "311", + "kind": "nullable", + "type": { + "$id": "312", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "namespace": "SampleTypeSpec" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithRequiredNullableProperties.requiredNullablePrimitive", + "serializationOptions": { + "json": { + "name": "requiredNullablePrimitive" + } + }, + "isHttpMetadata": false }, { - "$id": "202", - "kind": "array", - "name": "Array", - "valueType": { - "$id": "203", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] + "$id": "313", + "kind": "property", + "name": "requiredExtensibleEnum", + "serializedName": "requiredExtensibleEnum", + "doc": "required nullable extensible enum type", + "type": { + "$id": "314", + "kind": "nullable", + "type": { + "$ref": "22" + }, + "namespace": "SampleTypeSpec" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithRequiredNullableProperties.requiredExtensibleEnum", + "serializationOptions": { + "json": { + "name": "requiredExtensibleEnum" + } + }, + "isHttpMetadata": false + }, + { + "$id": "315", + "kind": "property", + "name": "requiredFixedEnum", + "serializedName": "requiredFixedEnum", + "doc": "required nullable fixed enum type", + "type": { + "$id": "316", + "kind": "nullable", + "type": { + "$ref": "17" + }, + "namespace": "SampleTypeSpec" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithRequiredNullableProperties.requiredFixedEnum", + "serializationOptions": { + "json": { + "name": "requiredFixedEnum" + } }, - "crossLanguageDefinitionId": "TypeSpec.Array", - "decorators": [] - }, - { - "$id": "204", - "kind": "int32", - "name": "int32", - "crossLanguageDefinitionId": "TypeSpec.int32", - "decorators": [] + "isHttpMetadata": false } - ], - "namespace": "SampleTypeSpec", - "decorators": [] + ] }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Thing.requiredUnion", + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.modelWithRequiredNullable", "serializationOptions": { "json": { - "name": "requiredUnion" + "name": "modelWithRequiredNullable" } }, "isHttpMetadata": false }, { - "$id": "205", + "$id": "317", "kind": "property", - "name": "requiredLiteralString", - "serializedName": "requiredLiteralString", - "doc": "required literal string", + "name": "requiredBytes", + "serializedName": "requiredBytes", + "doc": "Required bytes", "type": { - "$ref": "70" + "$id": "318", + "kind": "bytes", + "name": "bytes", + "encode": "base64", + "crossLanguageDefinitionId": "TypeSpec.bytes", + "decorators": [] }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Thing.requiredLiteralString", + "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.requiredBytes", "serializationOptions": { "json": { - "name": "requiredLiteralString" + "name": "requiredBytes" } }, "isHttpMetadata": false - }, + } + ] + }, + { + "$ref": "309" + }, + { + "$id": "319", + "kind": "model", + "name": "Wrapper", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.Wrapper", + "usage": "Input", + "decorators": [], + "serializationOptions": {}, + "properties": [ { - "$id": "206", + "$id": "320", "kind": "property", - "name": "requiredNullableString", - "serializedName": "requiredNullableString", - "doc": "required nullable string", + "name": "p1", + "doc": "header parameter", "type": { - "$id": "207", - "kind": "nullable", - "type": { - "$id": "208", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "namespace": "SampleTypeSpec" + "$id": "321", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Thing.requiredNullableString", - "serializationOptions": { - "json": { - "name": "requiredNullableString" - } - }, - "isHttpMetadata": false - }, - { - "$id": "209", - "kind": "property", - "name": "optionalNullableString", - "serializedName": "optionalNullableString", - "doc": "required optional string", - "type": { - "$id": "210", - "kind": "nullable", - "type": { - "$id": "211", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "namespace": "SampleTypeSpec" - }, - "optional": true, - "readOnly": false, - "discriminator": false, - "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Thing.optionalNullableString", - "serializationOptions": { - "json": { - "name": "optionalNullableString" - } - }, - "isHttpMetadata": false + "crossLanguageDefinitionId": "SampleTypeSpec.Wrapper.p1", + "serializationOptions": {}, + "isHttpMetadata": true }, { - "$id": "212", + "$id": "322", "kind": "property", - "name": "requiredLiteralInt", - "serializedName": "requiredLiteralInt", - "doc": "required literal int", + "name": "action", + "doc": "body parameter", "type": { - "$ref": "72" + "$ref": "271" }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Thing.requiredLiteralInt", - "serializationOptions": { - "json": { - "name": "requiredLiteralInt" - } - }, + "crossLanguageDefinitionId": "SampleTypeSpec.Wrapper.action", + "serializationOptions": {}, "isHttpMetadata": false }, { - "$id": "213", + "$id": "323", "kind": "property", - "name": "requiredLiteralFloat", - "serializedName": "requiredLiteralFloat", - "doc": "required literal float", + "name": "p2", + "doc": "path parameter", "type": { - "$ref": "74" + "$id": "324", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Thing.requiredLiteralFloat", - "serializationOptions": { - "json": { - "name": "requiredLiteralFloat" - } - }, - "isHttpMetadata": false - }, + "crossLanguageDefinitionId": "SampleTypeSpec.Wrapper.p2", + "serializationOptions": {}, + "isHttpMetadata": true + } + ] + }, + { + "$id": "325", + "kind": "model", + "name": "Friend", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.NotFriend", + "usage": "Output,Spread,Json", + "doc": "this is not a friendly model but with a friendly name", + "decorators": [], + "serializationOptions": { + "json": { + "name": "NotFriend" + } + }, + "properties": [ { - "$id": "214", + "$id": "326", "kind": "property", - "name": "requiredLiteralBool", - "serializedName": "requiredLiteralBool", - "doc": "required literal bool", + "name": "name", + "serializedName": "name", + "doc": "name of the NotFriend", "type": { - "$ref": "76" + "$id": "327", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Thing.requiredLiteralBool", + "crossLanguageDefinitionId": "SampleTypeSpec.NotFriend.name", "serializationOptions": { "json": { - "name": "requiredLiteralBool" + "name": "name" } }, "isHttpMetadata": false - }, + } + ] + }, + { + "$id": "328", + "kind": "model", + "name": "RenamedModel", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithClientName", + "usage": "Output,Spread,Json", + "doc": "this is a model with a client name", + "decorators": [], + "serializationOptions": { + "json": { + "name": "ModelWithClientName" + } + }, + "properties": [ { - "$id": "215", + "$id": "329", "kind": "property", - "name": "optionalLiteralString", - "serializedName": "optionalLiteralString", - "doc": "optional literal string", + "name": "otherName", + "serializedName": "otherName", + "doc": "name of the ModelWithClientName", "type": { - "$ref": "1" + "$id": "330", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, - "optional": true, + "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Thing.optionalLiteralString", + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithClientName.otherName", "serializationOptions": { "json": { - "name": "optionalLiteralString" + "name": "otherName" } }, "isHttpMetadata": false - }, + } + ] + }, + { + "$id": "331", + "kind": "model", + "name": "ReturnsAnonymousModelResponse", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.returnsAnonymousModel.Response.anonymous", + "usage": "Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "" + } + }, + "properties": [] + }, + { + "$id": "332", + "kind": "model", + "name": "ListWithNextLinkResponse", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithNextLink.Response.anonymous", + "usage": "Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "" + } + }, + "properties": [ { - "$id": "216", + "$id": "333", "kind": "property", - "name": "requiredNullableLiteralString", - "serializedName": "requiredNullableLiteralString", - "doc": "required nullable literal string", + "name": "things", + "serializedName": "things", "type": { - "$id": "217", - "kind": "nullable", - "type": { - "$ref": "5" + "$id": "334", + "kind": "array", + "name": "ArrayThing", + "valueType": { + "$ref": "236" }, - "namespace": "SampleTypeSpec" + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Thing.requiredNullableLiteralString", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithNextLink.Response.anonymous.things", "serializationOptions": { "json": { - "name": "requiredNullableLiteralString" + "name": "things" } }, "isHttpMetadata": false }, { - "$id": "218", + "$id": "335", "kind": "property", - "name": "optionalLiteralInt", - "serializedName": "optionalLiteralInt", - "doc": "optional literal int", + "name": "next", + "serializedName": "next", "type": { - "$ref": "9" + "$id": "336", + "kind": "url", + "name": "url", + "crossLanguageDefinitionId": "TypeSpec.url", + "decorators": [] }, "optional": true, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Thing.optionalLiteralInt", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithNextLink.Response.anonymous.next", "serializationOptions": { "json": { - "name": "optionalLiteralInt" + "name": "next" } }, "isHttpMetadata": false - }, + } + ] + }, + { + "$id": "337", + "kind": "model", + "name": "ListWithStringNextLinkResponse", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithStringNextLink.Response.anonymous", + "usage": "Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "" + } + }, + "properties": [ { - "$id": "219", + "$id": "338", "kind": "property", - "name": "optionalLiteralFloat", - "serializedName": "optionalLiteralFloat", - "doc": "optional literal float", + "name": "things", + "serializedName": "things", "type": { - "$ref": "13" + "$ref": "334" }, - "optional": true, + "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Thing.optionalLiteralFloat", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithStringNextLink.Response.anonymous.things", "serializationOptions": { "json": { - "name": "optionalLiteralFloat" + "name": "things" } }, "isHttpMetadata": false }, { - "$id": "220", + "$id": "339", "kind": "property", - "name": "optionalLiteralBool", - "serializedName": "optionalLiteralBool", - "doc": "optional literal bool", + "name": "next", + "serializedName": "next", "type": { - "$ref": "78" + "$id": "340", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, "optional": true, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Thing.optionalLiteralBool", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithStringNextLink.Response.anonymous.next", "serializationOptions": { "json": { - "name": "optionalLiteralBool" + "name": "next" } }, "isHttpMetadata": false - }, + } + ] + }, + { + "$id": "341", + "kind": "model", + "name": "ListWithContinuationTokenResponse", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationToken.Response.anonymous", + "usage": "Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "" + } + }, + "properties": [ { - "$id": "221", + "$id": "342", "kind": "property", - "name": "requiredBadDescription", - "serializedName": "requiredBadDescription", - "doc": "description with xml <|endoftext|>", + "name": "things", + "serializedName": "things", "type": { - "$id": "222", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] + "$ref": "334" }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Thing.requiredBadDescription", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationToken.Response.anonymous.things", "serializationOptions": { "json": { - "name": "requiredBadDescription" + "name": "things" } }, "isHttpMetadata": false }, { - "$id": "223", + "$id": "343", "kind": "property", - "name": "optionalNullableList", - "serializedName": "optionalNullableList", - "doc": "optional nullable collection", + "name": "nextToken", + "serializedName": "nextToken", "type": { - "$id": "224", - "kind": "nullable", - "type": { - "$id": "225", - "kind": "array", - "name": "Array1", - "valueType": { - "$id": "226", - "kind": "int32", - "name": "int32", - "crossLanguageDefinitionId": "TypeSpec.int32", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.Array", - "decorators": [] - }, - "namespace": "SampleTypeSpec" + "$id": "344", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, "optional": true, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Thing.optionalNullableList", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationToken.Response.anonymous.nextToken", "serializationOptions": { "json": { - "name": "optionalNullableList" + "name": "nextToken" } }, "isHttpMetadata": false - }, + } + ] + }, + { + "$id": "345", + "kind": "model", + "name": "ListWithContinuationTokenHeaderResponseResponse", + "namespace": "", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationTokenHeaderResponse.Response.anonymous", + "usage": "Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "" + } + }, + "properties": [ { - "$id": "227", + "$id": "346", "kind": "property", - "name": "requiredNullableList", - "serializedName": "requiredNullableList", - "doc": "required nullable collection", + "name": "things", + "serializedName": "things", "type": { - "$id": "228", - "kind": "nullable", - "type": { - "$ref": "225" - }, - "namespace": "SampleTypeSpec" + "$ref": "334" }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Thing.requiredNullableList", + "crossLanguageDefinitionId": "ListWithContinuationTokenHeaderResponse.Response.anonymous.things", "serializationOptions": { "json": { - "name": "requiredNullableList" + "name": "things" } }, "isHttpMetadata": false - }, + } + ] + }, + { + "$id": "347", + "kind": "model", + "name": "PageThing", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.Page", + "usage": "Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "Page" + } + }, + "properties": [ { - "$id": "229", + "$id": "348", "kind": "property", - "name": "propertyWithSpecialDocs", - "serializedName": "propertyWithSpecialDocs", - "doc": "This tests:\n- Simple bullet point. This bullet point is going to be very long to test how text wrapping is handled in bullet points within documentation comments. It should properly indent the wrapped lines.\n- Another bullet point with **bold text**. This bullet point is also intentionally long to see how the formatting is preserved when the text wraps onto multiple lines in the generated documentation.\n- Third bullet point with *italic text*. Similar to the previous points, this one is extended to ensure that the wrapping and formatting are correctly applied in the output.\n- Complex bullet point with **bold** and *italic* combined. This bullet point combines both bold and italic formatting and is long enough to test the wrapping behavior in such cases.\n- **Bold bullet point**: A bullet point that is entirely bolded. This point is also made lengthy to observe how the bold formatting is maintained across wrapped lines.\n- *Italic bullet point*: A bullet point that is entirely italicized. This final point is extended to verify that italic formatting is correctly applied even when the text spans multiple lines.", + "name": "items", + "serializedName": "items", "type": { - "$id": "230", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] + "$ref": "334" }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Thing.propertyWithSpecialDocs", + "crossLanguageDefinitionId": "SampleTypeSpec.Page.items", "serializationOptions": { "json": { - "name": "propertyWithSpecialDocs" + "name": "items" } }, "isHttpMetadata": false @@ -2288,28 +3779,27 @@ ] }, { - "$id": "231", + "$id": "349", "kind": "model", - "name": "RoundTripModel", + "name": "ModelWithEmbeddedNonBodyParameters", "namespace": "SampleTypeSpec", - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel", - "usage": "Input,Output,Json", - "doc": "this is a roundtrip model", + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters", + "usage": "Input,Json", "decorators": [], "serializationOptions": { "json": { - "name": "RoundTripModel" + "name": "ModelWithEmbeddedNonBodyParameters" } }, "properties": [ { - "$id": "232", + "$id": "350", "kind": "property", - "name": "requiredString", - "serializedName": "requiredString", - "doc": "Required string, illustrating a reference type property.", + "name": "name", + "serializedName": "name", + "doc": "name of the ModelWithEmbeddedNonBodyParameters", "type": { - "$id": "233", + "$id": "351", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2320,26 +3810,25 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.requiredString", + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.name", "serializationOptions": { "json": { - "name": "requiredString" + "name": "name" } }, "isHttpMetadata": false }, { - "$id": "234", + "$id": "352", "kind": "property", - "name": "requiredInt", - "serializedName": "requiredInt", - "doc": "Required int, illustrating a value type property.", + "name": "requiredHeader", + "serializedName": "requiredHeader", + "doc": "required header parameter", "type": { - "$id": "235", - "kind": "int32", - "name": "int32", - "encode": "string", - "crossLanguageDefinitionId": "TypeSpec.int32", + "$id": "353", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "optional": false, @@ -2347,62 +3836,51 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.requiredInt", + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.requiredHeader", "serializationOptions": { "json": { - "name": "requiredInt" + "name": "requiredHeader" } }, - "isHttpMetadata": false + "isHttpMetadata": true }, { - "$id": "236", + "$id": "354", "kind": "property", - "name": "requiredCollection", - "serializedName": "requiredCollection", - "doc": "Required collection of enums", + "name": "optionalHeader", + "serializedName": "optionalHeader", + "doc": "optional header parameter", "type": { - "$id": "237", - "kind": "array", - "name": "ArrayStringFixedEnum", - "valueType": { - "$ref": "17" - }, - "crossLanguageDefinitionId": "TypeSpec.Array", + "$id": "355", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "optional": false, + "optional": true, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.requiredCollection", + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.optionalHeader", "serializationOptions": { "json": { - "name": "requiredCollection" + "name": "optionalHeader" } }, - "isHttpMetadata": false + "isHttpMetadata": true }, { - "$id": "238", + "$id": "356", "kind": "property", - "name": "requiredDictionary", - "serializedName": "requiredDictionary", - "doc": "Required dictionary of enums", + "name": "requiredQuery", + "serializedName": "requiredQuery", + "doc": "required query parameter", "type": { - "$id": "239", - "kind": "dict", - "keyType": { - "$id": "240", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "valueType": { - "$ref": "22" - }, + "$id": "357", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "optional": false, @@ -2410,72 +3888,97 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.requiredDictionary", + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.requiredQuery", "serializationOptions": { "json": { - "name": "requiredDictionary" + "name": "requiredQuery" } }, - "isHttpMetadata": false + "isHttpMetadata": true }, { - "$id": "241", + "$id": "358", "kind": "property", - "name": "requiredModel", - "serializedName": "requiredModel", - "doc": "Required model", + "name": "optionalQuery", + "serializedName": "optionalQuery", + "doc": "optional query parameter", "type": { - "$ref": "196" + "$id": "359", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, - "optional": false, + "optional": true, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.requiredModel", + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.optionalQuery", "serializationOptions": { "json": { - "name": "requiredModel" + "name": "optionalQuery" } }, - "isHttpMetadata": false - }, + "isHttpMetadata": true + } + ] + }, + { + "$id": "360", + "kind": "model", + "name": "DynamicModel", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel", + "usage": "Input,Json", + "doc": "A sample dynamic model.", + "decorators": [ + { + "name": "TypeSpec.HttpClient.CSharp.@dynamicModel", + "arguments": {} + } + ], + "serializationOptions": { + "json": { + "name": "DynamicModel" + } + }, + "properties": [ { - "$id": "242", + "$id": "361", "kind": "property", - "name": "intExtensibleEnum", - "serializedName": "intExtensibleEnum", - "doc": "this is an int based extensible enum", + "name": "name", + "serializedName": "name", "type": { - "$ref": "27" + "$id": "362", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, - "optional": true, + "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.intExtensibleEnum", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.name", "serializationOptions": { "json": { - "name": "intExtensibleEnum" + "name": "name" } }, "isHttpMetadata": false }, { - "$id": "243", + "$id": "363", "kind": "property", - "name": "intExtensibleEnumCollection", - "serializedName": "intExtensibleEnumCollection", - "doc": "this is a collection of int based extensible enum", + "name": "optionalUnknown", + "serializedName": "optionalUnknown", "type": { - "$id": "244", - "kind": "array", - "name": "ArrayIntExtensibleEnum", - "valueType": { - "$ref": "27" - }, - "crossLanguageDefinitionId": "TypeSpec.Array", + "$id": "364", + "kind": "unknown", + "name": "unknown", + "crossLanguageDefinitionId": "", "decorators": [] }, "optional": true, @@ -2483,244 +3986,319 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.intExtensibleEnumCollection", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.optionalUnknown", "serializationOptions": { "json": { - "name": "intExtensibleEnumCollection" + "name": "optionalUnknown" } }, "isHttpMetadata": false }, { - "$id": "245", + "$id": "365", "kind": "property", - "name": "floatExtensibleEnum", - "serializedName": "floatExtensibleEnum", - "doc": "this is a float based extensible enum", + "name": "optionalInt", + "serializedName": "optionalInt", "type": { - "$ref": "32" + "$id": "366", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] }, "optional": true, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.floatExtensibleEnum", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.optionalInt", "serializationOptions": { "json": { - "name": "floatExtensibleEnum" + "name": "optionalInt" } }, "isHttpMetadata": false }, { - "$id": "246", + "$id": "367", "kind": "property", - "name": "floatExtensibleEnumWithIntValue", - "serializedName": "floatExtensibleEnumWithIntValue", - "doc": "this is a float based extensible enum", + "name": "optionalNullableList", + "serializedName": "optionalNullableList", "type": { - "$ref": "37" + "$id": "368", + "kind": "nullable", + "type": { + "$ref": "265" + }, + "namespace": "SampleTypeSpec" }, "optional": true, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.floatExtensibleEnumWithIntValue", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.optionalNullableList", "serializationOptions": { "json": { - "name": "floatExtensibleEnumWithIntValue" + "name": "optionalNullableList" } }, "isHttpMetadata": false }, { - "$id": "247", + "$id": "369", "kind": "property", - "name": "floatExtensibleEnumCollection", - "serializedName": "floatExtensibleEnumCollection", - "doc": "this is a collection of float based extensible enum", + "name": "requiredNullableList", + "serializedName": "requiredNullableList", "type": { - "$id": "248", - "kind": "array", - "name": "ArrayFloatExtensibleEnum", - "valueType": { - "$ref": "32" + "$id": "370", + "kind": "nullable", + "type": { + "$ref": "265" }, - "crossLanguageDefinitionId": "TypeSpec.Array", - "decorators": [] + "namespace": "SampleTypeSpec" }, - "optional": true, + "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.floatExtensibleEnumCollection", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.requiredNullableList", "serializationOptions": { "json": { - "name": "floatExtensibleEnumCollection" + "name": "requiredNullableList" } }, "isHttpMetadata": false }, { - "$id": "249", + "$id": "371", "kind": "property", - "name": "floatFixedEnum", - "serializedName": "floatFixedEnum", - "doc": "this is a float based fixed enum", + "name": "optionalNullableDictionary", + "serializedName": "optionalNullableDictionary", "type": { - "$ref": "42" + "$id": "372", + "kind": "nullable", + "type": { + "$id": "373", + "kind": "dict", + "keyType": { + "$id": "374", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "valueType": { + "$id": "375", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "decorators": [] + }, + "namespace": "SampleTypeSpec" }, "optional": true, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.floatFixedEnum", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.optionalNullableDictionary", "serializationOptions": { "json": { - "name": "floatFixedEnum" + "name": "optionalNullableDictionary" } }, "isHttpMetadata": false }, { - "$id": "250", + "$id": "376", "kind": "property", - "name": "floatFixedEnumWithIntValue", - "serializedName": "floatFixedEnumWithIntValue", - "doc": "this is a float based fixed enum", + "name": "requiredNullableDictionary", + "serializedName": "requiredNullableDictionary", "type": { - "$ref": "47" + "$id": "377", + "kind": "nullable", + "type": { + "$ref": "373" + }, + "namespace": "SampleTypeSpec" }, - "optional": true, + "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.floatFixedEnumWithIntValue", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.requiredNullableDictionary", "serializationOptions": { "json": { - "name": "floatFixedEnumWithIntValue" + "name": "requiredNullableDictionary" } }, "isHttpMetadata": false }, { - "$id": "251", + "$id": "378", "kind": "property", - "name": "floatFixedEnumCollection", - "serializedName": "floatFixedEnumCollection", - "doc": "this is a collection of float based fixed enum", + "name": "primitiveDictionary", + "serializedName": "primitiveDictionary", "type": { - "$id": "252", - "kind": "array", - "name": "ArrayFloatFixedEnum", - "valueType": { - "$ref": "42" - }, - "crossLanguageDefinitionId": "TypeSpec.Array", - "decorators": [] + "$ref": "373" }, - "optional": true, + "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.floatFixedEnumCollection", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.primitiveDictionary", "serializationOptions": { "json": { - "name": "floatFixedEnumCollection" + "name": "primitiveDictionary" } }, "isHttpMetadata": false }, { - "$id": "253", + "$id": "379", "kind": "property", - "name": "intFixedEnum", - "serializedName": "intFixedEnum", - "doc": "this is a int based fixed enum", + "name": "foo", + "serializedName": "foo", "type": { - "$ref": "52" + "$id": "380", + "kind": "model", + "name": "AnotherDynamicModel", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.AnotherDynamicModel", + "usage": "Input,Json", + "doc": "Another sample dynamic model.", + "decorators": [ + { + "name": "TypeSpec.HttpClient.CSharp.@dynamicModel", + "arguments": {} + } + ], + "serializationOptions": { + "json": { + "name": "AnotherDynamicModel" + } + }, + "properties": [ + { + "$id": "381", + "kind": "property", + "name": "bar", + "serializedName": "bar", + "type": { + "$id": "382", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.AnotherDynamicModel.bar", + "serializationOptions": { + "json": { + "name": "bar" + } + }, + "isHttpMetadata": false + } + ] }, - "optional": true, + "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.intFixedEnum", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.foo", "serializationOptions": { "json": { - "name": "intFixedEnum" + "name": "foo" } }, "isHttpMetadata": false }, { - "$id": "254", - "kind": "property", - "name": "intFixedEnumCollection", - "serializedName": "intFixedEnumCollection", - "doc": "this is a collection of int based fixed enum", + "$id": "383", + "kind": "property", + "name": "listFoo", + "serializedName": "listFoo", "type": { - "$id": "255", + "$id": "384", "kind": "array", - "name": "ArrayIntFixedEnum", + "name": "ArrayAnotherDynamicModel", "valueType": { - "$ref": "52" + "$ref": "380" }, "crossLanguageDefinitionId": "TypeSpec.Array", "decorators": [] }, - "optional": true, + "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.intFixedEnumCollection", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.listFoo", "serializationOptions": { "json": { - "name": "intFixedEnumCollection" + "name": "listFoo" } }, "isHttpMetadata": false }, { - "$id": "256", + "$id": "385", "kind": "property", - "name": "stringFixedEnum", - "serializedName": "stringFixedEnum", - "doc": "this is a string based fixed enum", + "name": "listOfListFoo", + "serializedName": "listOfListFoo", "type": { - "$ref": "17" + "$id": "386", + "kind": "array", + "name": "ArrayArray", + "valueType": { + "$ref": "384" + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] }, - "optional": true, + "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.stringFixedEnum", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.listOfListFoo", "serializationOptions": { "json": { - "name": "stringFixedEnum" + "name": "listOfListFoo" } }, "isHttpMetadata": false }, { - "$id": "257", + "$id": "387", "kind": "property", - "name": "requiredUnknown", - "serializedName": "requiredUnknown", - "doc": "required unknown", + "name": "dictionaryFoo", + "serializedName": "dictionaryFoo", "type": { - "$id": "258", - "kind": "unknown", - "name": "unknown", - "crossLanguageDefinitionId": "", + "$id": "388", + "kind": "dict", + "keyType": { + "$id": "389", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "valueType": { + "$ref": "380" + }, "decorators": [] }, "optional": false, @@ -2728,62 +4306,64 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.requiredUnknown", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.dictionaryFoo", "serializationOptions": { "json": { - "name": "requiredUnknown" + "name": "dictionaryFoo" } }, "isHttpMetadata": false }, { - "$id": "259", + "$id": "390", "kind": "property", - "name": "optionalUnknown", - "serializedName": "optionalUnknown", - "doc": "optional unknown", + "name": "dictionaryOfDictionaryFoo", + "serializedName": "dictionaryOfDictionaryFoo", "type": { - "$id": "260", - "kind": "unknown", - "name": "unknown", - "crossLanguageDefinitionId": "", + "$id": "391", + "kind": "dict", + "keyType": { + "$id": "392", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "valueType": { + "$ref": "388" + }, "decorators": [] }, - "optional": true, + "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.optionalUnknown", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.dictionaryOfDictionaryFoo", "serializationOptions": { "json": { - "name": "optionalUnknown" + "name": "dictionaryOfDictionaryFoo" } }, "isHttpMetadata": false }, { - "$id": "261", + "$id": "393", "kind": "property", - "name": "requiredRecordUnknown", - "serializedName": "requiredRecordUnknown", - "doc": "required record of unknown", + "name": "dictionaryListFoo", + "serializedName": "dictionaryListFoo", "type": { - "$id": "262", + "$id": "394", "kind": "dict", "keyType": { - "$id": "263", + "$id": "395", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "valueType": { - "$id": "264", - "kind": "unknown", - "name": "unknown", - "crossLanguageDefinitionId": "", - "decorators": [] + "$ref": "384" }, "decorators": [] }, @@ -2792,213 +4372,166 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.requiredRecordUnknown", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.dictionaryListFoo", "serializationOptions": { "json": { - "name": "requiredRecordUnknown" + "name": "dictionaryListFoo" } }, "isHttpMetadata": false }, { - "$id": "265", + "$id": "396", "kind": "property", - "name": "optionalRecordUnknown", - "serializedName": "optionalRecordUnknown", - "doc": "optional record of unknown", + "name": "listOfDictionaryFoo", + "serializedName": "listOfDictionaryFoo", "type": { - "$ref": "262" + "$id": "397", + "kind": "array", + "name": "ArrayRecord", + "valueType": { + "$ref": "388" + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] }, - "optional": true, + "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.optionalRecordUnknown", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.listOfDictionaryFoo", "serializationOptions": { "json": { - "name": "optionalRecordUnknown" + "name": "listOfDictionaryFoo" } }, "isHttpMetadata": false - }, + } + ] + }, + { + "$ref": "380" + }, + { + "$id": "398", + "kind": "model", + "name": "XmlAdvancedModel", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel", + "usage": "Input,Output,Xml", + "doc": "An advanced XML model for testing various property types and XML features.", + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "AdvancedXmlModel" + } + } + ], + "serializationOptions": { + "xml": { + "name": "AdvancedXmlModel", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ { - "$id": "266", + "$id": "399", "kind": "property", - "name": "readOnlyRequiredRecordUnknown", - "serializedName": "readOnlyRequiredRecordUnknown", - "doc": "required readonly record of unknown", + "name": "name", + "serializedName": "name", + "doc": "A simple string property", "type": { - "$ref": "262" + "$id": "400", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, "optional": false, - "readOnly": true, + "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.readOnlyRequiredRecordUnknown", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.name", "serializationOptions": { - "json": { - "name": "readOnlyRequiredRecordUnknown" + "xml": { + "name": "name", + "attribute": false, + "unwrapped": false } }, "isHttpMetadata": false }, { - "$id": "267", + "$id": "401", "kind": "property", - "name": "readOnlyOptionalRecordUnknown", - "serializedName": "readOnlyOptionalRecordUnknown", - "doc": "optional readonly record of unknown", + "name": "age", + "serializedName": "age", + "doc": "An integer property", "type": { - "$ref": "262" + "$id": "402", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] }, - "optional": true, - "readOnly": true, + "optional": false, + "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.readOnlyOptionalRecordUnknown", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.age", "serializationOptions": { - "json": { - "name": "readOnlyOptionalRecordUnknown" + "xml": { + "name": "age", + "attribute": false, + "unwrapped": false } }, "isHttpMetadata": false }, { - "$id": "268", + "$id": "403", "kind": "property", - "name": "modelWithRequiredNullable", - "serializedName": "modelWithRequiredNullable", - "doc": "this is a model with required nullable properties", + "name": "enabled", + "serializedName": "enabled", + "doc": "A boolean property", "type": { - "$id": "269", - "kind": "model", - "name": "ModelWithRequiredNullableProperties", - "namespace": "SampleTypeSpec", - "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithRequiredNullableProperties", - "usage": "Input,Output,Json", - "doc": "A model with a few required nullable properties", - "decorators": [], - "serializationOptions": { - "json": { - "name": "ModelWithRequiredNullableProperties" - } - }, - "properties": [ - { - "$id": "270", - "kind": "property", - "name": "requiredNullablePrimitive", - "serializedName": "requiredNullablePrimitive", - "doc": "required nullable primitive type", - "type": { - "$id": "271", - "kind": "nullable", - "type": { - "$id": "272", - "kind": "int32", - "name": "int32", - "crossLanguageDefinitionId": "TypeSpec.int32", - "decorators": [] - }, - "namespace": "SampleTypeSpec" - }, - "optional": false, - "readOnly": false, - "discriminator": false, - "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithRequiredNullableProperties.requiredNullablePrimitive", - "serializationOptions": { - "json": { - "name": "requiredNullablePrimitive" - } - }, - "isHttpMetadata": false - }, - { - "$id": "273", - "kind": "property", - "name": "requiredExtensibleEnum", - "serializedName": "requiredExtensibleEnum", - "doc": "required nullable extensible enum type", - "type": { - "$id": "274", - "kind": "nullable", - "type": { - "$ref": "22" - }, - "namespace": "SampleTypeSpec" - }, - "optional": false, - "readOnly": false, - "discriminator": false, - "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithRequiredNullableProperties.requiredExtensibleEnum", - "serializationOptions": { - "json": { - "name": "requiredExtensibleEnum" - } - }, - "isHttpMetadata": false - }, - { - "$id": "275", - "kind": "property", - "name": "requiredFixedEnum", - "serializedName": "requiredFixedEnum", - "doc": "required nullable fixed enum type", - "type": { - "$id": "276", - "kind": "nullable", - "type": { - "$ref": "17" - }, - "namespace": "SampleTypeSpec" - }, - "optional": false, - "readOnly": false, - "discriminator": false, - "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithRequiredNullableProperties.requiredFixedEnum", - "serializationOptions": { - "json": { - "name": "requiredFixedEnum" - } - }, - "isHttpMetadata": false - } - ] + "$id": "404", + "kind": "boolean", + "name": "boolean", + "crossLanguageDefinitionId": "TypeSpec.boolean", + "decorators": [] }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.modelWithRequiredNullable", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.enabled", "serializationOptions": { - "json": { - "name": "modelWithRequiredNullable" + "xml": { + "name": "enabled", + "attribute": false, + "unwrapped": false } }, "isHttpMetadata": false }, { - "$id": "277", + "$id": "405", "kind": "property", - "name": "requiredBytes", - "serializedName": "requiredBytes", - "doc": "Required bytes", + "name": "score", + "serializedName": "score", + "doc": "A float property", "type": { - "$id": "278", - "kind": "bytes", - "name": "bytes", - "encode": "base64", - "crossLanguageDefinitionId": "TypeSpec.bytes", + "$id": "406", + "kind": "float32", + "name": "float32", + "crossLanguageDefinitionId": "TypeSpec.float32", "decorators": [] }, "optional": false, @@ -3006,85 +4539,113 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.RoundTripModel.requiredBytes", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.score", "serializationOptions": { - "json": { - "name": "requiredBytes" + "xml": { + "name": "score", + "attribute": false, + "unwrapped": false } }, "isHttpMetadata": false - } - ] - }, - { - "$ref": "269" - }, - { - "$id": "279", - "kind": "model", - "name": "Friend", - "namespace": "SampleTypeSpec", - "crossLanguageDefinitionId": "SampleTypeSpec.NotFriend", - "usage": "Output,Spread,Json", - "doc": "this is not a friendly model but with a friendly name", - "decorators": [], - "serializationOptions": { - "json": { - "name": "NotFriend" - } - }, - "properties": [ + }, { - "$id": "280", + "$id": "407", "kind": "property", - "name": "name", - "serializedName": "name", - "doc": "name of the NotFriend", + "name": "optionalString", + "serializedName": "optionalString", + "doc": "An optional string", "type": { - "$id": "281", + "$id": "408", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.optionalString", + "serializationOptions": { + "xml": { + "name": "optionalString", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "409", + "kind": "property", + "name": "optionalInt", + "serializedName": "optionalInt", + "doc": "An optional integer", + "type": { + "$id": "410", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.optionalInt", + "serializationOptions": { + "xml": { + "name": "optionalInt", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "411", + "kind": "property", + "name": "nullableString", + "serializedName": "nullableString", + "doc": "A nullable string", + "type": { + "$id": "412", + "kind": "nullable", + "type": { + "$id": "413", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "namespace": "SampleTypeSpec" + }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.NotFriend.name", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.nullableString", "serializationOptions": { - "json": { - "name": "name" + "xml": { + "name": "nullableString", + "attribute": false, + "unwrapped": false } }, "isHttpMetadata": false - } - ] - }, - { - "$id": "282", - "kind": "model", - "name": "RenamedModel", - "namespace": "SampleTypeSpec", - "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithClientName", - "usage": "Output,Spread,Json", - "doc": "this is a model with a client name", - "decorators": [], - "serializationOptions": { - "json": { - "name": "ModelWithClientName" - } - }, - "properties": [ + }, { - "$id": "283", + "$id": "414", "kind": "property", - "name": "otherName", - "serializedName": "otherName", - "doc": "name of the ModelWithClientName", + "name": "id", + "serializedName": "id", + "doc": "A string as XML attribute", "type": { - "$id": "284", + "$id": "415", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -3094,324 +4655,609 @@ "readOnly": false, "discriminator": false, "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithClientName.otherName", + "decorators": [ + { + "name": "TypeSpec.Xml.@attribute", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.id", "serializationOptions": { - "json": { - "name": "otherName" + "xml": { + "name": "id", + "attribute": true, + "unwrapped": false } }, "isHttpMetadata": false - } - ] - }, - { - "$id": "285", - "kind": "model", - "name": "ReturnsAnonymousModelResponse", - "namespace": "SampleTypeSpec", - "crossLanguageDefinitionId": "SampleTypeSpec.returnsAnonymousModel.Response.anonymous", - "usage": "Output,Json", - "decorators": [], - "serializationOptions": { - "json": { - "name": "" - } - }, - "properties": [] - }, - { - "$id": "286", - "kind": "model", - "name": "ListWithNextLinkResponse", - "namespace": "SampleTypeSpec", - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithNextLink.Response.anonymous", - "usage": "Output,Json", - "decorators": [], - "serializationOptions": { - "json": { - "name": "" - } - }, - "properties": [ + }, { - "$id": "287", + "$id": "416", "kind": "property", - "name": "things", - "serializedName": "things", + "name": "version", + "serializedName": "version", + "doc": "An integer as XML attribute", "type": { - "$id": "288", - "kind": "array", - "name": "ArrayThing", - "valueType": { - "$ref": "196" - }, - "crossLanguageDefinitionId": "TypeSpec.Array", + "$id": "417", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", "decorators": [] }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithNextLink.Response.anonymous.things", + "decorators": [ + { + "name": "TypeSpec.Xml.@attribute", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.version", "serializationOptions": { - "json": { - "name": "things" + "xml": { + "name": "version", + "attribute": true, + "unwrapped": false } }, "isHttpMetadata": false }, { - "$id": "289", + "$id": "418", "kind": "property", - "name": "next", - "serializedName": "next", + "name": "isActive", + "serializedName": "isActive", + "doc": "A boolean as XML attribute", "type": { - "$id": "290", - "kind": "url", - "name": "url", - "crossLanguageDefinitionId": "TypeSpec.url", + "$id": "419", + "kind": "boolean", + "name": "boolean", + "crossLanguageDefinitionId": "TypeSpec.boolean", "decorators": [] }, - "optional": true, + "optional": false, "readOnly": false, "discriminator": false, "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithNextLink.Response.anonymous.next", + "decorators": [ + { + "name": "TypeSpec.Xml.@attribute", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.isActive", "serializationOptions": { - "json": { - "name": "next" + "xml": { + "name": "isActive", + "attribute": true, + "unwrapped": false } }, "isHttpMetadata": false - } - ] - }, - { - "$id": "291", - "kind": "model", - "name": "ListWithStringNextLinkResponse", - "namespace": "SampleTypeSpec", - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithStringNextLink.Response.anonymous", - "usage": "Output,Json", - "decorators": [], - "serializationOptions": { - "json": { - "name": "" - } - }, - "properties": [ + }, + { + "$id": "420", + "kind": "property", + "name": "originalName", + "serializedName": "RenamedProperty", + "doc": "A property with a custom XML element name", + "type": { + "$id": "421", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "RenamedProperty" + } + } + ], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.originalName", + "serializationOptions": { + "xml": { + "name": "RenamedProperty", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "422", + "kind": "property", + "name": "xmlIdentifier", + "serializedName": "xml-id", + "doc": "An attribute with a custom XML name", + "type": { + "$id": "423", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "xml-id" + } + }, + { + "name": "TypeSpec.Xml.@attribute", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.xmlIdentifier", + "serializationOptions": { + "xml": { + "name": "xml-id", + "attribute": true, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "424", + "kind": "property", + "name": "content", + "serializedName": "content", + "doc": "Text content in the element (unwrapped string)", + "type": { + "$id": "425", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@unwrapped", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.content", + "serializationOptions": { + "xml": { + "name": "content", + "attribute": false, + "unwrapped": true + } + }, + "isHttpMetadata": false + }, { - "$id": "292", + "$id": "426", "kind": "property", - "name": "things", - "serializedName": "things", + "name": "unwrappedStrings", + "serializedName": "unwrappedStrings", + "doc": "An unwrapped array of strings - items appear directly without wrapper", "type": { - "$ref": "288" + "$ref": "242" }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithStringNextLink.Response.anonymous.things", + "decorators": [ + { + "name": "TypeSpec.Xml.@unwrapped", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.unwrappedStrings", "serializationOptions": { - "json": { - "name": "things" + "xml": { + "name": "unwrappedStrings", + "attribute": false, + "unwrapped": true, + "itemsName": "unwrappedStrings" } }, "isHttpMetadata": false }, { - "$id": "293", + "$id": "427", "kind": "property", - "name": "next", - "serializedName": "next", + "name": "unwrappedCounts", + "serializedName": "unwrappedCounts", + "doc": "An unwrapped array of integers", "type": { - "$id": "294", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] + "$ref": "265" }, - "optional": true, + "optional": false, "readOnly": false, "discriminator": false, "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithStringNextLink.Response.anonymous.next", + "decorators": [ + { + "name": "TypeSpec.Xml.@unwrapped", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.unwrappedCounts", "serializationOptions": { - "json": { - "name": "next" + "xml": { + "name": "unwrappedCounts", + "attribute": false, + "unwrapped": true, + "itemsName": "unwrappedCounts" } }, "isHttpMetadata": false - } - ] - }, - { - "$id": "295", - "kind": "model", - "name": "ListWithContinuationTokenResponse", - "namespace": "SampleTypeSpec", - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationToken.Response.anonymous", - "usage": "Output,Json", - "decorators": [], - "serializationOptions": { - "json": { - "name": "" - } - }, - "properties": [ + }, { - "$id": "296", + "$id": "428", "kind": "property", - "name": "things", - "serializedName": "things", + "name": "unwrappedItems", + "serializedName": "unwrappedItems", + "doc": "An unwrapped array of models", "type": { - "$ref": "288" + "$id": "429", + "kind": "array", + "name": "ArrayXmlItem", + "valueType": { + "$id": "430", + "kind": "model", + "name": "XmlItem", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlItem", + "usage": "Input,Output,Xml", + "doc": "An item model for XML array testing", + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "Item" + } + } + ], + "serializationOptions": { + "xml": { + "name": "Item", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "431", + "kind": "property", + "name": "itemName", + "serializedName": "itemName", + "doc": "The item name", + "type": { + "$id": "432", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlItem.itemName", + "serializationOptions": { + "xml": { + "name": "itemName", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "433", + "kind": "property", + "name": "itemValue", + "serializedName": "itemValue", + "doc": "The item value", + "type": { + "$id": "434", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlItem.itemValue", + "serializationOptions": { + "xml": { + "name": "itemValue", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "435", + "kind": "property", + "name": "itemId", + "serializedName": "itemId", + "doc": "Item ID as attribute", + "type": { + "$id": "436", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@attribute", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlItem.itemId", + "serializationOptions": { + "xml": { + "name": "itemId", + "attribute": true, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationToken.Response.anonymous.things", + "decorators": [ + { + "name": "TypeSpec.Xml.@unwrapped", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.unwrappedItems", "serializationOptions": { - "json": { - "name": "things" + "xml": { + "name": "unwrappedItems", + "attribute": false, + "unwrapped": true, + "itemsName": "unwrappedItems" } }, "isHttpMetadata": false }, { - "$id": "297", + "$id": "437", "kind": "property", - "name": "nextToken", - "serializedName": "nextToken", + "name": "wrappedColors", + "serializedName": "wrappedColors", + "doc": "A wrapped array of strings (default)", "type": { - "$id": "298", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] + "$ref": "242" }, - "optional": true, + "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationToken.Response.anonymous.nextToken", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.wrappedColors", "serializationOptions": { - "json": { - "name": "nextToken" + "xml": { + "name": "wrappedColors", + "attribute": false, + "unwrapped": false, + "itemsName": "string" } }, "isHttpMetadata": false - } - ] - }, - { - "$id": "299", - "kind": "model", - "name": "ListWithContinuationTokenHeaderResponseResponse", - "namespace": "", - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationTokenHeaderResponse.Response.anonymous", - "usage": "Output,Json", - "decorators": [], - "serializationOptions": { - "json": { - "name": "" - } - }, - "properties": [ + }, { - "$id": "300", + "$id": "438", "kind": "property", - "name": "things", - "serializedName": "things", + "name": "items", + "serializedName": "ItemCollection", + "doc": "A wrapped array with custom wrapper name", "type": { - "$ref": "288" + "$ref": "429" }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "ListWithContinuationTokenHeaderResponse.Response.anonymous.things", + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "ItemCollection" + } + } + ], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.items", "serializationOptions": { - "json": { - "name": "things" + "xml": { + "name": "ItemCollection", + "attribute": false, + "unwrapped": false, + "itemsName": "Item" } }, "isHttpMetadata": false - } - ] - }, - { - "$id": "301", - "kind": "model", - "name": "PageThing", - "namespace": "SampleTypeSpec", - "crossLanguageDefinitionId": "SampleTypeSpec.Page", - "usage": "Output,Json", - "decorators": [], - "serializationOptions": { - "json": { - "name": "Page" - } - }, - "properties": [ + }, { - "$id": "302", + "$id": "439", "kind": "property", - "name": "items", - "serializedName": "items", + "name": "nestedModel", + "serializedName": "nestedModel", + "doc": "A nested model property", "type": { - "$ref": "288" + "$id": "440", + "kind": "model", + "name": "XmlNestedModel", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlNestedModel", + "usage": "Input,Output,Xml", + "doc": "A nested model for XML testing", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "XmlNestedModel", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "441", + "kind": "property", + "name": "value", + "serializedName": "value", + "doc": "The value of the nested model", + "type": { + "$id": "442", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlNestedModel.value", + "serializationOptions": { + "xml": { + "name": "value", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "443", + "kind": "property", + "name": "nestedId", + "serializedName": "nestedId", + "doc": "An attribute on the nested model", + "type": { + "$id": "444", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@attribute", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlNestedModel.nestedId", + "serializationOptions": { + "xml": { + "name": "nestedId", + "attribute": true, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Page.items", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.nestedModel", "serializationOptions": { - "json": { - "name": "items" + "xml": { + "name": "nestedModel", + "attribute": false, + "unwrapped": false } }, - "isHttpMetadata": false - } - ] - }, - { - "$id": "303", - "kind": "model", - "name": "ModelWithEmbeddedNonBodyParameters", - "namespace": "SampleTypeSpec", - "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters", - "usage": "Input,Json", - "decorators": [], - "serializationOptions": { - "json": { - "name": "ModelWithEmbeddedNonBodyParameters" - } - }, - "properties": [ + "isHttpMetadata": false + }, { - "$id": "304", + "$id": "445", "kind": "property", - "name": "name", - "serializedName": "name", - "doc": "name of the ModelWithEmbeddedNonBodyParameters", + "name": "optionalNestedModel", + "serializedName": "optionalNestedModel", + "doc": "An optional nested model", "type": { - "$id": "305", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", + "$ref": "440" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.optionalNestedModel", + "serializationOptions": { + "xml": { + "name": "optionalNestedModel", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "446", + "kind": "property", + "name": "metadata", + "serializedName": "metadata", + "doc": "A dictionary property", + "type": { + "$id": "447", + "kind": "dict", + "keyType": { + "$id": "448", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "valueType": { + "$id": "449", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, "decorators": [] }, "optional": false, @@ -3419,25 +5265,35 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.name", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.metadata", "serializationOptions": { - "json": { - "name": "name" + "xml": { + "name": "metadata", + "attribute": false, + "unwrapped": false } }, "isHttpMetadata": false }, { - "$id": "306", + "$id": "450", "kind": "property", - "name": "requiredHeader", - "serializedName": "requiredHeader", - "doc": "required header parameter", + "name": "createdAt", + "serializedName": "createdAt", + "doc": "A date-time property", "type": { - "$id": "307", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", + "$id": "451", + "kind": "utcDateTime", + "name": "utcDateTime", + "encode": "rfc3339", + "wireType": { + "$id": "452", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.utcDateTime", "decorators": [] }, "optional": false, @@ -3445,51 +5301,64 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.requiredHeader", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.createdAt", "serializationOptions": { - "json": { - "name": "requiredHeader" + "xml": { + "name": "createdAt", + "attribute": false, + "unwrapped": false } }, - "isHttpMetadata": true + "isHttpMetadata": false }, { - "$id": "308", + "$id": "453", "kind": "property", - "name": "optionalHeader", - "serializedName": "optionalHeader", - "doc": "optional header parameter", + "name": "duration", + "serializedName": "duration", + "doc": "A duration property", "type": { - "$id": "309", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", + "$id": "454", + "kind": "duration", + "name": "duration", + "encode": "ISO8601", + "wireType": { + "$id": "455", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", "decorators": [] }, - "optional": true, + "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.optionalHeader", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.duration", "serializationOptions": { - "json": { - "name": "optionalHeader" + "xml": { + "name": "duration", + "attribute": false, + "unwrapped": false } }, - "isHttpMetadata": true + "isHttpMetadata": false }, { - "$id": "310", + "$id": "456", "kind": "property", - "name": "requiredQuery", - "serializedName": "requiredQuery", - "doc": "required query parameter", + "name": "data", + "serializedName": "data", + "doc": "A bytes property", "type": { - "$id": "311", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", + "$id": "457", + "kind": "bytes", + "name": "bytes", + "encode": "base64", + "crossLanguageDefinitionId": "TypeSpec.bytes", "decorators": [] }, "optional": false, @@ -3497,382 +5366,501 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.requiredQuery", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.data", "serializationOptions": { - "json": { - "name": "requiredQuery" + "xml": { + "name": "data", + "attribute": false, + "unwrapped": false } }, - "isHttpMetadata": true + "isHttpMetadata": false }, { - "$id": "312", + "$id": "458", "kind": "property", - "name": "optionalQuery", - "serializedName": "optionalQuery", - "doc": "optional query parameter", + "name": "optionalRecordUnknown", + "serializedName": "optionalRecordUnknown", + "doc": "optional record of unknown", "type": { - "$id": "313", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] + "$ref": "302" }, "optional": true, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.optionalQuery", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.optionalRecordUnknown", "serializationOptions": { - "json": { - "name": "optionalQuery" + "xml": { + "name": "optionalRecordUnknown", + "attribute": false, + "unwrapped": false } }, - "isHttpMetadata": true - } - ] - }, - { - "$id": "314", - "kind": "model", - "name": "DynamicModel", - "namespace": "SampleTypeSpec", - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel", - "usage": "Input,Json", - "doc": "A sample dynamic model.", - "decorators": [ - { - "name": "TypeSpec.HttpClient.CSharp.@dynamicModel", - "arguments": {} - } - ], - "serializationOptions": { - "json": { - "name": "DynamicModel" - } - }, - "properties": [ + "isHttpMetadata": false + }, { - "$id": "315", + "$id": "459", "kind": "property", - "name": "name", - "serializedName": "name", + "name": "fixedEnum", + "serializedName": "fixedEnum", + "doc": "A fixed enum property", "type": { - "$id": "316", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] + "$ref": "17" }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.name", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.fixedEnum", "serializationOptions": { - "json": { - "name": "name" + "xml": { + "name": "fixedEnum", + "attribute": false, + "unwrapped": false } }, "isHttpMetadata": false }, { - "$id": "317", + "$id": "460", "kind": "property", - "name": "optionalUnknown", - "serializedName": "optionalUnknown", + "name": "extensibleEnum", + "serializedName": "extensibleEnum", + "doc": "An extensible enum property", "type": { - "$id": "318", - "kind": "unknown", - "name": "unknown", - "crossLanguageDefinitionId": "", - "decorators": [] + "$ref": "22" }, - "optional": true, + "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.optionalUnknown", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.extensibleEnum", "serializationOptions": { - "json": { - "name": "optionalUnknown" + "xml": { + "name": "extensibleEnum", + "attribute": false, + "unwrapped": false } }, "isHttpMetadata": false }, { - "$id": "319", + "$id": "461", "kind": "property", - "name": "optionalInt", - "serializedName": "optionalInt", + "name": "optionalFixedEnum", + "serializedName": "optionalFixedEnum", + "doc": "An optional fixed enum property", "type": { - "$id": "320", - "kind": "int32", - "name": "int32", - "crossLanguageDefinitionId": "TypeSpec.int32", - "decorators": [] + "$ref": "52" }, "optional": true, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.optionalInt", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.optionalFixedEnum", "serializationOptions": { - "json": { - "name": "optionalInt" + "xml": { + "name": "optionalFixedEnum", + "attribute": false, + "unwrapped": false } }, "isHttpMetadata": false }, { - "$id": "321", + "$id": "462", "kind": "property", - "name": "optionalNullableList", - "serializedName": "optionalNullableList", + "name": "optionalExtensibleEnum", + "serializedName": "optionalExtensibleEnum", + "doc": "An optional extensible enum property", "type": { - "$id": "322", - "kind": "nullable", - "type": { - "$ref": "225" - }, - "namespace": "SampleTypeSpec" + "$ref": "27" }, "optional": true, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.optionalNullableList", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.optionalExtensibleEnum", "serializationOptions": { - "json": { - "name": "optionalNullableList" + "xml": { + "name": "optionalExtensibleEnum", + "attribute": false, + "unwrapped": false } }, "isHttpMetadata": false }, { - "$id": "323", + "$id": "463", "kind": "property", - "name": "requiredNullableList", - "serializedName": "requiredNullableList", + "name": "label", + "serializedName": "label", "type": { - "$id": "324", - "kind": "nullable", - "type": { - "$ref": "225" - }, - "namespace": "SampleTypeSpec" + "$id": "464", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.requiredNullableList", + "decorators": [ + { + "name": "TypeSpec.Xml.@ns", + "arguments": { + "ns": { + "$id": "465", + "kind": "enumvalue", + "decorators": [], + "name": "ns1", + "value": "https://example.com/ns1", + "enumType": { + "$id": "466", + "kind": "enum", + "decorators": [ + { + "name": "TypeSpec.Xml.@nsDeclarations", + "arguments": {} + } + ], + "name": "XmlNamespaces", + "isGeneratedName": false, + "namespace": "SampleTypeSpec", + "valueType": { + "$id": "467", + "kind": "string", + "decorators": [], + "doc": "A sequence of textual characters.", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "values": [ + { + "$id": "468", + "kind": "enumvalue", + "decorators": [], + "name": "ns1", + "value": "https://example.com/ns1", + "enumType": { + "$ref": "466" + }, + "valueType": { + "$ref": "467" + }, + "crossLanguageDefinitionId": "SampleTypeSpec.XmlNamespaces.ns1" + }, + { + "$id": "469", + "kind": "enumvalue", + "decorators": [], + "name": "ns2", + "value": "https://example.com/ns2", + "enumType": { + "$ref": "466" + }, + "valueType": { + "$ref": "467" + }, + "crossLanguageDefinitionId": "SampleTypeSpec.XmlNamespaces.ns2" + } + ], + "isFixed": true, + "isFlags": false, + "usage": "None", + "access": "public", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlNamespaces", + "apiVersions": [ + "2024-07-16-preview", + "2024-08-16-preview" + ], + "isUnionAsEnum": false, + "__accessSet": true + }, + "valueType": { + "$ref": "467" + }, + "crossLanguageDefinitionId": "SampleTypeSpec.XmlNamespaces.ns1" + } + } + }, + { + "name": "TypeSpec.Xml.@attribute", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.label", "serializationOptions": { - "json": { - "name": "requiredNullableList" + "xml": { + "name": "label", + "attribute": true, + "ns": { + "namespace": "https://example.com/ns1", + "prefix": "ns1" + }, + "unwrapped": false } }, "isHttpMetadata": false }, { - "$id": "325", + "$id": "470", "kind": "property", - "name": "optionalNullableDictionary", - "serializedName": "optionalNullableDictionary", + "name": "daysUsed", + "serializedName": "daysUsed", "type": { - "$id": "326", - "kind": "nullable", - "type": { - "$id": "327", - "kind": "dict", - "keyType": { - "$id": "328", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "valueType": { - "$id": "329", - "kind": "int32", - "name": "int32", - "crossLanguageDefinitionId": "TypeSpec.int32", - "decorators": [] - }, - "decorators": [] - }, - "namespace": "SampleTypeSpec" + "$id": "471", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] }, - "optional": true, + "optional": false, "readOnly": false, "discriminator": false, "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.optionalNullableDictionary", + "decorators": [ + { + "name": "TypeSpec.Xml.@ns", + "arguments": { + "ns": { + "$id": "472", + "kind": "enumvalue", + "decorators": [], + "name": "ns2", + "value": "https://example.com/ns2", + "enumType": { + "$ref": "466" + }, + "valueType": { + "$ref": "467" + }, + "crossLanguageDefinitionId": "SampleTypeSpec.XmlNamespaces.ns2" + } + } + } + ], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.daysUsed", "serializationOptions": { - "json": { - "name": "optionalNullableDictionary" + "xml": { + "name": "daysUsed", + "attribute": false, + "ns": { + "namespace": "https://example.com/ns2", + "prefix": "ns2" + }, + "unwrapped": false } }, "isHttpMetadata": false }, { - "$id": "330", + "$id": "473", "kind": "property", - "name": "requiredNullableDictionary", - "serializedName": "requiredNullableDictionary", + "name": "fooItems", + "serializedName": "fooItems", "type": { - "$id": "331", - "kind": "nullable", - "type": { - "$ref": "327" - }, - "namespace": "SampleTypeSpec" + "$ref": "242" }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.requiredNullableDictionary", + "decorators": [ + { + "name": "TypeSpec.Xml.@ns", + "arguments": { + "ns": "http://www.contoso.com/anotherbook.dtd", + "prefix": "foo" + } + } + ], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.fooItems", "serializationOptions": { - "json": { - "name": "requiredNullableDictionary" + "xml": { + "name": "fooItems", + "attribute": false, + "ns": { + "namespace": "http://www.contoso.com/anotherbook.dtd", + "prefix": "foo" + }, + "unwrapped": false, + "itemsName": "string" } }, "isHttpMetadata": false }, { - "$id": "332", + "$id": "474", "kind": "property", - "name": "primitiveDictionary", - "serializedName": "primitiveDictionary", + "name": "anotherModel", + "serializedName": "anotherModel", "type": { - "$ref": "327" + "$ref": "440" }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.primitiveDictionary", + "decorators": [ + { + "name": "TypeSpec.Xml.@ns", + "arguments": { + "ns": "http://www.contoso.com/anothermodel.dtd", + "prefix": "bar" + } + } + ], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.anotherModel", "serializationOptions": { - "json": { - "name": "primitiveDictionary" + "xml": { + "name": "anotherModel", + "attribute": false, + "ns": { + "namespace": "http://www.contoso.com/anothermodel.dtd", + "prefix": "bar" + }, + "unwrapped": false } }, "isHttpMetadata": false }, { - "$id": "333", + "$id": "475", "kind": "property", - "name": "foo", - "serializedName": "foo", + "name": "modelsWithNamespaces", + "serializedName": "modelsWithNamespaces", "type": { - "$id": "334", - "kind": "model", - "name": "AnotherDynamicModel", - "namespace": "SampleTypeSpec", - "crossLanguageDefinitionId": "SampleTypeSpec.AnotherDynamicModel", - "usage": "Input,Json", - "doc": "Another sample dynamic model.", - "decorators": [ - { - "name": "TypeSpec.HttpClient.CSharp.@dynamicModel", - "arguments": {} - } - ], - "serializationOptions": { - "json": { - "name": "AnotherDynamicModel" - } - }, - "properties": [ - { - "$id": "335", - "kind": "property", - "name": "bar", - "serializedName": "bar", - "type": { - "$id": "336", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "optional": false, - "readOnly": false, - "discriminator": false, - "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.AnotherDynamicModel.bar", - "serializationOptions": { - "json": { - "name": "bar" + "$id": "476", + "kind": "array", + "name": "ArrayXmlModelWithNamespace", + "valueType": { + "$id": "477", + "kind": "model", + "name": "XmlModelWithNamespace", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlModelWithNamespace", + "usage": "Input,Output,Xml", + "decorators": [ + { + "name": "TypeSpec.Xml.@ns", + "arguments": { + "ns": "http://www.example.com/namespace", + "prefix": "ns1" } - }, - "isHttpMetadata": false - } - ] + } + ], + "serializationOptions": { + "xml": { + "name": "XmlModelWithNamespace", + "attribute": false, + "ns": { + "namespace": "http://www.example.com/namespace", + "prefix": "ns1" + }, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "478", + "kind": "property", + "name": "foo", + "serializedName": "foo", + "type": { + "$id": "479", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlModelWithNamespace.foo", + "serializationOptions": { + "xml": { + "name": "foo", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.foo", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.modelsWithNamespaces", "serializationOptions": { - "json": { - "name": "foo" + "xml": { + "name": "modelsWithNamespaces", + "attribute": false, + "unwrapped": false, + "itemsName": "XmlModelWithNamespace", + "itemsNs": { + "namespace": "http://www.example.com/namespace", + "prefix": "ns1" + } } }, "isHttpMetadata": false }, { - "$id": "337", + "$id": "480", "kind": "property", - "name": "listFoo", - "serializedName": "listFoo", + "name": "unwrappedModelsWithNamespaces", + "serializedName": "unwrappedModelsWithNamespaces", "type": { - "$id": "338", - "kind": "array", - "name": "ArrayAnotherDynamicModel", - "valueType": { - "$ref": "334" - }, - "crossLanguageDefinitionId": "TypeSpec.Array", - "decorators": [] + "$ref": "476" }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.listFoo", + "decorators": [ + { + "name": "TypeSpec.Xml.@unwrapped", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.unwrappedModelsWithNamespaces", "serializationOptions": { - "json": { - "name": "listFoo" + "xml": { + "name": "unwrappedModelsWithNamespaces", + "attribute": false, + "unwrapped": true, + "itemsName": "unwrappedModelsWithNamespaces" } }, "isHttpMetadata": false }, { - "$id": "339", + "$id": "481", "kind": "property", "name": "listOfListFoo", "serializedName": "listOfListFoo", "type": { - "$id": "340", + "$id": "482", "kind": "array", - "name": "ArrayArray", + "name": "ArrayArray1", "valueType": { - "$ref": "338" + "$ref": "429" }, "crossLanguageDefinitionId": "TypeSpec.Array", "decorators": [] @@ -3882,31 +5870,34 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.listOfListFoo", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.listOfListFoo", "serializationOptions": { - "json": { - "name": "listOfListFoo" + "xml": { + "name": "listOfListFoo", + "attribute": false, + "unwrapped": false, + "itemsName": "Array" } }, "isHttpMetadata": false }, { - "$id": "341", + "$id": "483", "kind": "property", "name": "dictionaryFoo", "serializedName": "dictionaryFoo", "type": { - "$id": "342", + "$id": "484", "kind": "dict", "keyType": { - "$id": "343", + "$id": "485", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "valueType": { - "$ref": "334" + "$ref": "430" }, "decorators": [] }, @@ -3915,31 +5906,33 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.dictionaryFoo", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.dictionaryFoo", "serializationOptions": { - "json": { - "name": "dictionaryFoo" + "xml": { + "name": "dictionaryFoo", + "attribute": false, + "unwrapped": false } }, "isHttpMetadata": false }, { - "$id": "344", + "$id": "486", "kind": "property", "name": "dictionaryOfDictionaryFoo", "serializedName": "dictionaryOfDictionaryFoo", "type": { - "$id": "345", + "$id": "487", "kind": "dict", "keyType": { - "$id": "346", + "$id": "488", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "valueType": { - "$ref": "342" + "$ref": "484" }, "decorators": [] }, @@ -3948,31 +5941,33 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.dictionaryOfDictionaryFoo", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.dictionaryOfDictionaryFoo", "serializationOptions": { - "json": { - "name": "dictionaryOfDictionaryFoo" + "xml": { + "name": "dictionaryOfDictionaryFoo", + "attribute": false, + "unwrapped": false } }, "isHttpMetadata": false }, { - "$id": "347", + "$id": "489", "kind": "property", "name": "dictionaryListFoo", "serializedName": "dictionaryListFoo", "type": { - "$id": "348", + "$id": "490", "kind": "dict", "keyType": { - "$id": "349", + "$id": "491", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "valueType": { - "$ref": "338" + "$ref": "429" }, "decorators": [] }, @@ -3981,25 +5976,27 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.dictionaryListFoo", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.dictionaryListFoo", "serializationOptions": { - "json": { - "name": "dictionaryListFoo" + "xml": { + "name": "dictionaryListFoo", + "attribute": false, + "unwrapped": false } }, "isHttpMetadata": false }, { - "$id": "350", + "$id": "492", "kind": "property", "name": "listOfDictionaryFoo", "serializedName": "listOfDictionaryFoo", "type": { - "$id": "351", + "$id": "493", "kind": "array", - "name": "ArrayRecord", + "name": "ArrayRecord1", "valueType": { - "$ref": "342" + "$ref": "484" }, "crossLanguageDefinitionId": "TypeSpec.Array", "decorators": [] @@ -4009,10 +6006,13 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModel.listOfDictionaryFoo", + "crossLanguageDefinitionId": "SampleTypeSpec.XmlAdvancedModel.listOfDictionaryFoo", "serializationOptions": { - "json": { - "name": "listOfDictionaryFoo" + "xml": { + "name": "listOfDictionaryFoo", + "attribute": false, + "unwrapped": false, + "itemsName": "Record" } }, "isHttpMetadata": false @@ -4020,10 +6020,16 @@ ] }, { - "$ref": "334" + "$ref": "430" + }, + { + "$ref": "440" + }, + { + "$ref": "477" }, { - "$id": "352", + "$id": "494", "kind": "model", "name": "Animal", "namespace": "SampleTypeSpec", @@ -4037,13 +6043,13 @@ } }, "discriminatorProperty": { - "$id": "353", + "$id": "495", "kind": "property", "name": "kind", "serializedName": "kind", "doc": "The kind of animal", "type": { - "$id": "354", + "$id": "496", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -4064,16 +6070,16 @@ }, "properties": [ { - "$ref": "353" + "$ref": "495" }, { - "$id": "355", + "$id": "497", "kind": "property", "name": "name", "serializedName": "name", "doc": "Name of the animal", "type": { - "$id": "356", + "$id": "498", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -4095,7 +6101,7 @@ ], "discriminatedSubtypes": { "pet": { - "$id": "357", + "$id": "499", "kind": "model", "name": "Pet", "namespace": "SampleTypeSpec", @@ -4110,7 +6116,7 @@ } }, "discriminatorProperty": { - "$id": "358", + "$id": "500", "kind": "property", "name": "kind", "serializedName": "kind", @@ -4131,20 +6137,20 @@ "isHttpMetadata": false }, "baseModel": { - "$ref": "352" + "$ref": "494" }, "properties": [ { - "$ref": "358" + "$ref": "500" }, { - "$id": "359", + "$id": "501", "kind": "property", "name": "trained", "serializedName": "trained", "doc": "Whether the pet is trained", "type": { - "$id": "360", + "$id": "502", "kind": "boolean", "name": "boolean", "crossLanguageDefinitionId": "TypeSpec.boolean", @@ -4166,7 +6172,7 @@ ], "discriminatedSubtypes": { "dog": { - "$id": "361", + "$id": "503", "kind": "model", "name": "Dog", "namespace": "SampleTypeSpec", @@ -4181,11 +6187,11 @@ } }, "baseModel": { - "$ref": "357" + "$ref": "499" }, "properties": [ { - "$id": "362", + "$id": "504", "kind": "property", "name": "kind", "serializedName": "kind", @@ -4206,13 +6212,13 @@ "isHttpMetadata": false }, { - "$id": "363", + "$id": "505", "kind": "property", "name": "breed", "serializedName": "breed", "doc": "The breed of the dog", "type": { - "$id": "364", + "$id": "506", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -4236,18 +6242,224 @@ } }, "dog": { - "$ref": "361" + "$ref": "503" + } + } + }, + { + "$ref": "499" + }, + { + "$ref": "503" + }, + { + "$id": "507", + "kind": "model", + "name": "Tree", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.Tree", + "usage": "Input,Output,Json,Xml", + "doc": "Tree is a specific type of plant", + "discriminatorValue": "tree", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "Tree", + "attribute": false, + "unwrapped": false + }, + "json": { + "name": "Tree" + } + }, + "baseModel": { + "$id": "508", + "kind": "model", + "name": "Plant", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.Plant", + "usage": "Input,Output,Json,Xml", + "doc": "Base plant with discriminator", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "Plant", + "attribute": false, + "unwrapped": false + }, + "json": { + "name": "Plant" + } + }, + "discriminatorProperty": { + "$id": "509", + "kind": "property", + "name": "species", + "serializedName": "species", + "doc": "The species of plant", + "type": { + "$id": "510", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": true, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Plant.species", + "serializationOptions": { + "xml": { + "name": "species", + "attribute": false, + "unwrapped": false + }, + "json": { + "name": "species" + } + }, + "isHttpMetadata": false + }, + "properties": [ + { + "$ref": "509" + }, + { + "$id": "511", + "kind": "property", + "name": "id", + "serializedName": "id", + "doc": "The unique identifier of the plant", + "type": { + "$id": "512", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Plant.id", + "serializationOptions": { + "xml": { + "name": "id", + "attribute": false, + "unwrapped": false + }, + "json": { + "name": "id" + } + }, + "isHttpMetadata": false + }, + { + "$id": "513", + "kind": "property", + "name": "height", + "serializedName": "height", + "doc": "The height of the plant in centimeters", + "type": { + "$id": "514", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Plant.height", + "serializationOptions": { + "xml": { + "name": "height", + "attribute": false, + "unwrapped": false + }, + "json": { + "name": "height" + } + }, + "isHttpMetadata": false + } + ], + "discriminatedSubtypes": { + "tree": { + "$ref": "507" + } + } + }, + "properties": [ + { + "$id": "515", + "kind": "property", + "name": "species", + "serializedName": "species", + "type": { + "$ref": "84" + }, + "optional": false, + "readOnly": false, + "discriminator": true, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Tree.species", + "serializationOptions": { + "xml": { + "name": "species", + "attribute": false, + "unwrapped": false + }, + "json": { + "name": "species" + } + }, + "isHttpMetadata": false + }, + { + "$id": "516", + "kind": "property", + "name": "age", + "serializedName": "age", + "doc": "The age of the tree in years", + "type": { + "$id": "517", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Tree.age", + "serializationOptions": { + "xml": { + "name": "age", + "attribute": false, + "unwrapped": false + }, + "json": { + "name": "age" + } + }, + "isHttpMetadata": false } - } - }, - { - "$ref": "357" + ] }, { - "$ref": "361" + "$ref": "508" }, { - "$id": "365", + "$id": "518", "kind": "model", "name": "GetWidgetMetricsResponse", "namespace": "SampleTypeSpec", @@ -4261,12 +6473,12 @@ }, "properties": [ { - "$id": "366", + "$id": "519", "kind": "property", "name": "numSold", "serializedName": "numSold", "type": { - "$id": "367", + "$id": "520", "kind": "int32", "name": "int32", "crossLanguageDefinitionId": "TypeSpec.int32", @@ -4286,12 +6498,12 @@ "isHttpMetadata": false }, { - "$id": "368", + "$id": "521", "kind": "property", "name": "averagePrice", "serializedName": "averagePrice", "type": { - "$id": "369", + "$id": "522", "kind": "float32", "name": "float32", "crossLanguageDefinitionId": "TypeSpec.float32", @@ -4311,18 +6523,84 @@ "isHttpMetadata": false } ] + }, + { + "$id": "523", + "kind": "model", + "name": "GetNotebookResponse", + "namespace": "SampleTypeSpec", + "crossLanguageDefinitionId": "SampleTypeSpec.getNotebook.Response.anonymous", + "usage": "Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "" + } + }, + "properties": [ + { + "$id": "524", + "kind": "property", + "name": "name", + "serializedName": "name", + "type": { + "$id": "525", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.getNotebook.Response.anonymous.name", + "serializationOptions": { + "json": { + "name": "name" + } + }, + "isHttpMetadata": false + }, + { + "$id": "526", + "kind": "property", + "name": "content", + "serializedName": "content", + "type": { + "$id": "527", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.getNotebook.Response.anonymous.content", + "serializationOptions": { + "json": { + "name": "content" + } + }, + "isHttpMetadata": false + } + ] } ], "clients": [ { - "$id": "370", + "$id": "528", "kind": "client", "name": "SampleTypeSpecClient", "namespace": "SampleTypeSpec", "doc": "This is a sample typespec project.", "methods": [ { - "$id": "371", + "$id": "529", "kind": "basic", "name": "sayHi", "accessibility": "public", @@ -4332,19 +6610,19 @@ ], "doc": "Return hi", "operation": { - "$id": "372", + "$id": "530", "name": "sayHi", "resourceName": "SampleTypeSpec", "doc": "Return hi", "accessibility": "public", "parameters": [ { - "$id": "373", + "$id": "531", "kind": "header", "name": "headParameter", "serializedName": "head-parameter", "type": { - "$id": "374", + "$id": "532", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -4356,15 +6634,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.sayHi.headParameter" + "crossLanguageDefinitionId": "SampleTypeSpec.sayHi.headParameter", + "methodParameterSegments": [ + { + "$id": "533", + "kind": "method", + "name": "headParameter", + "serializedName": "head-parameter", + "type": { + "$id": "534", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.sayHi.headParameter", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "375", + "$id": "535", "kind": "query", "name": "queryParameter", "serializedName": "queryParameter", "type": { - "$id": "376", + "$id": "536", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -4376,15 +6677,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SampleTypeSpec.sayHi.queryParameter", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "537", + "kind": "method", + "name": "queryParameter", + "serializedName": "queryParameter", + "type": { + "$id": "538", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.sayHi.queryParameter", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "377", + "$id": "539", "kind": "query", "name": "optionalQuery", "serializedName": "optionalQuery", "type": { - "$id": "378", + "$id": "540", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -4396,15 +6720,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SampleTypeSpec.sayHi.optionalQuery", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "541", + "kind": "method", + "name": "optionalQuery", + "serializedName": "optionalQuery", + "type": { + "$id": "542", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.sayHi.optionalQuery", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "379", + "$id": "543", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "84" + "$ref": "86" }, "isApiVersion": false, "optional": false, @@ -4412,7 +6759,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.sayHi.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.sayHi.accept", + "methodParameterSegments": [ + { + "$id": "544", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "86" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.sayHi.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4421,7 +6787,7 @@ 200 ], "bodyType": { - "$ref": "196" + "$ref": "236" }, "headers": [], "isErrorResponse": false, @@ -4442,89 +6808,21 @@ }, "parameters": [ { - "$id": "380", - "kind": "method", - "name": "headParameter", - "serializedName": "head-parameter", - "type": { - "$id": "381", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.sayHi.headParameter", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "533" }, { - "$id": "382", - "kind": "method", - "name": "queryParameter", - "serializedName": "queryParameter", - "type": { - "$id": "383", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.sayHi.queryParameter", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "537" }, { - "$id": "384", - "kind": "method", - "name": "optionalQuery", - "serializedName": "optionalQuery", - "type": { - "$id": "385", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.sayHi.optionalQuery", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "541" }, { - "$id": "386", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "84" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.sayHi.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "544" } ], "response": { "type": { - "$ref": "196" + "$ref": "236" } }, "isOverride": false, @@ -4533,7 +6831,7 @@ "crossLanguageDefinitionId": "SampleTypeSpec.sayHi" }, { - "$id": "387", + "$id": "545", "kind": "basic", "name": "helloAgain", "accessibility": "public", @@ -4543,19 +6841,19 @@ ], "doc": "Return hi again", "operation": { - "$id": "388", + "$id": "546", "name": "helloAgain", "resourceName": "SampleTypeSpec", "doc": "Return hi again", "accessibility": "public", "parameters": [ { - "$id": "389", + "$id": "547", "kind": "header", "name": "p1", "serializedName": "p1", "type": { - "$id": "390", + "$id": "548", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -4567,15 +6865,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.p1" + "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.p1", + "methodParameterSegments": [ + { + "$id": "549", + "kind": "method", + "name": "p1", + "serializedName": "p1", + "type": { + "$id": "550", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.p1", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "391", + "$id": "551", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "type": { - "$ref": "86" + "$ref": "88" }, "isApiVersion": false, "optional": false, @@ -4583,15 +6904,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.contentType" + "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.contentType", + "methodParameterSegments": [ + { + "$id": "552", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "88" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "392", + "$id": "553", "kind": "path", "name": "p2", "serializedName": "p2", "type": { - "$id": "393", + "$id": "554", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -4606,15 +6946,38 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.p2" + "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.p2", + "methodParameterSegments": [ + { + "$id": "555", + "kind": "method", + "name": "p2", + "serializedName": "p2", + "type": { + "$id": "556", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.p2", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "394", + "$id": "557", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "88" + "$ref": "92" }, "isApiVersion": false, "optional": false, @@ -4622,15 +6985,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.accept", + "methodParameterSegments": [ + { + "$id": "558", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "92" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "395", + "$id": "559", "kind": "body", "name": "action", "serializedName": "action", "type": { - "$ref": "231" + "$ref": "271" }, "isApiVersion": false, "contentTypes": [ @@ -4641,7 +7023,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.action" + "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.action", + "methodParameterSegments": [ + { + "$id": "560", + "kind": "method", + "name": "action", + "serializedName": "action", + "type": { + "$ref": "271" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.action", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4650,7 +7051,7 @@ 200 ], "bodyType": { - "$ref": "231" + "$ref": "271" }, "headers": [], "isErrorResponse": false, @@ -4671,105 +7072,27 @@ "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain", "decorators": [], "namespace": "SampleTypeSpec" - }, - "parameters": [ - { - "$id": "396", - "kind": "method", - "name": "p1", - "serializedName": "p1", - "type": { - "$id": "397", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.p1", - "readOnly": false, - "access": "public", - "decorators": [] + }, + "parameters": [ + { + "$ref": "549" }, { - "$id": "398", - "kind": "method", - "name": "action", - "serializedName": "action", - "type": { - "$ref": "231" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.action", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "560" }, { - "$id": "399", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "90" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "552" }, { - "$id": "400", - "kind": "method", - "name": "p2", - "serializedName": "p2", - "type": { - "$id": "401", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.p2", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "555" }, { - "$id": "402", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "88" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "558" } ], "response": { "type": { - "$ref": "231" + "$ref": "271" } }, "isOverride": false, @@ -4778,7 +7101,7 @@ "crossLanguageDefinitionId": "SampleTypeSpec.helloAgain" }, { - "$id": "403", + "$id": "561", "kind": "basic", "name": "noContentType", "accessibility": "public", @@ -4788,19 +7111,19 @@ ], "doc": "Return hi again", "operation": { - "$id": "404", + "$id": "562", "name": "noContentType", "resourceName": "SampleTypeSpec", "doc": "Return hi again", "accessibility": "public", "parameters": [ { - "$id": "405", + "$id": "563", "kind": "header", "name": "p1", "serializedName": "p1", "type": { - "$id": "406", + "$id": "564", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -4812,15 +7135,52 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.noContentType.p1" + "crossLanguageDefinitionId": "SampleTypeSpec.noContentType.p1", + "methodParameterSegments": [ + { + "$id": "565", + "kind": "method", + "name": "info", + "serializedName": "info", + "type": { + "$ref": "319" + }, + "location": "", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec..anonymous.info", + "readOnly": false, + "access": "public", + "decorators": [] + }, + { + "$id": "566", + "kind": "method", + "name": "p1", + "serializedName": "p1", + "doc": "header parameter", + "type": { + "$ref": "321" + }, + "location": "", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.Wrapper.p1", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "407", + "$id": "567", "kind": "path", "name": "p2", "serializedName": "p2", "type": { - "$id": "408", + "$id": "568", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -4835,16 +7195,39 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.noContentType.p2" + "crossLanguageDefinitionId": "SampleTypeSpec.noContentType.p2", + "methodParameterSegments": [ + { + "$ref": "565" + }, + { + "$id": "569", + "kind": "method", + "name": "p2", + "serializedName": "p2", + "doc": "path parameter", + "type": { + "$ref": "324" + }, + "location": "", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.Wrapper.p2", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "409", + "$id": "570", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "92" + "$ref": "94" }, "isApiVersion": false, "optional": false, @@ -4852,15 +7235,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.noContentType.contentType" + "crossLanguageDefinitionId": "SampleTypeSpec.noContentType.contentType", + "methodParameterSegments": [ + { + "$id": "571", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "94" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.noContentType.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "410", + "$id": "572", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "94" + "$ref": "96" }, "isApiVersion": false, "optional": false, @@ -4868,15 +7271,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.noContentType.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.noContentType.accept", + "methodParameterSegments": [ + { + "$id": "573", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "96" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.noContentType.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "411", + "$id": "574", "kind": "body", "name": "action", "serializedName": "action", "type": { - "$ref": "231" + "$ref": "271" }, "isApiVersion": false, "contentTypes": [ @@ -4887,7 +7309,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.noContentType.action" + "crossLanguageDefinitionId": "SampleTypeSpec.noContentType.action", + "methodParameterSegments": [ + { + "$ref": "565" + }, + { + "$id": "575", + "kind": "method", + "name": "action", + "serializedName": "action", + "doc": "body parameter", + "type": { + "$ref": "271" + }, + "location": "", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.Wrapper.action", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4896,7 +7341,7 @@ 200 ], "bodyType": { - "$ref": "231" + "$ref": "271" }, "headers": [], "isErrorResponse": false, @@ -4913,119 +7358,34 @@ ], "bufferResponse": true, "generateProtocolMethod": true, - "generateConvenienceMethod": false, + "generateConvenienceMethod": true, "crossLanguageDefinitionId": "SampleTypeSpec.noContentType", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "412", - "kind": "method", - "name": "p1", - "serializedName": "p1", - "type": { - "$id": "413", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.noContentType.p1", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "414", - "kind": "method", - "name": "action", - "serializedName": "action", - "type": { - "$ref": "231" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.noContentType.action", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "415", - "kind": "method", - "name": "p2", - "serializedName": "p2", - "type": { - "$id": "416", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.noContentType.p2", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "565" }, { - "$id": "417", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "92" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.noContentType.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "571" }, { - "$id": "418", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "94" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.noContentType.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "573" } ], "response": { "type": { - "$ref": "231" + "$ref": "271" } }, - "isOverride": false, - "generateConvenient": false, + "isOverride": true, + "generateConvenient": true, "generateProtocol": true, "crossLanguageDefinitionId": "SampleTypeSpec.noContentType" }, { - "$id": "419", + "$id": "576", "kind": "basic", "name": "helloDemo2", "accessibility": "public", @@ -5035,19 +7395,19 @@ ], "doc": "Return hi in demo2", "operation": { - "$id": "420", + "$id": "577", "name": "helloDemo2", "resourceName": "SampleTypeSpec", "doc": "Return hi in demo2", "accessibility": "public", "parameters": [ { - "$id": "421", + "$id": "578", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "96" + "$ref": "98" }, "isApiVersion": false, "optional": false, @@ -5055,7 +7415,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.helloDemo2.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.helloDemo2.accept", + "methodParameterSegments": [ + { + "$id": "579", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "98" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.helloDemo2.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5064,7 +7443,7 @@ 200 ], "bodyType": { - "$ref": "196" + "$ref": "236" }, "headers": [], "isErrorResponse": false, @@ -5085,26 +7464,12 @@ }, "parameters": [ { - "$id": "422", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "96" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.helloDemo2.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "579" } ], "response": { "type": { - "$ref": "196" + "$ref": "236" } }, "isOverride": false, @@ -5113,7 +7478,7 @@ "crossLanguageDefinitionId": "SampleTypeSpec.helloDemo2" }, { - "$id": "423", + "$id": "580", "kind": "basic", "name": "createLiteral", "accessibility": "public", @@ -5123,20 +7488,20 @@ ], "doc": "Create with literal value", "operation": { - "$id": "424", + "$id": "581", "name": "createLiteral", "resourceName": "SampleTypeSpec", "doc": "Create with literal value", "accessibility": "public", "parameters": [ { - "$id": "425", + "$id": "582", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "98" + "$ref": "100" }, "isApiVersion": false, "optional": false, @@ -5144,15 +7509,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.createLiteral.contentType" + "crossLanguageDefinitionId": "SampleTypeSpec.createLiteral.contentType", + "methodParameterSegments": [ + { + "$id": "583", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "100" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.createLiteral.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "426", + "$id": "584", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "100" + "$ref": "102" }, "isApiVersion": false, "optional": false, @@ -5160,15 +7545,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.createLiteral.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.createLiteral.accept", + "methodParameterSegments": [ + { + "$id": "585", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "102" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.createLiteral.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "427", + "$id": "586", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "196" + "$ref": "236" }, "isApiVersion": false, "contentTypes": [ @@ -5179,7 +7583,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.createLiteral.body" + "crossLanguageDefinitionId": "SampleTypeSpec.createLiteral.body", + "methodParameterSegments": [ + { + "$id": "587", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "236" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.createLiteral.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5188,7 +7611,7 @@ 200 ], "bodyType": { - "$ref": "196" + "$ref": "236" }, "headers": [], "isErrorResponse": false, @@ -5209,64 +7632,21 @@ "crossLanguageDefinitionId": "SampleTypeSpec.createLiteral", "decorators": [], "namespace": "SampleTypeSpec" - }, - "parameters": [ - { - "$id": "428", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "196" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.createLiteral.body", - "readOnly": false, - "access": "public", - "decorators": [] + }, + "parameters": [ + { + "$ref": "587" }, { - "$id": "429", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "98" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.createLiteral.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "583" }, { - "$id": "430", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "100" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.createLiteral.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "585" } ], "response": { "type": { - "$ref": "196" + "$ref": "236" } }, "isOverride": false, @@ -5275,7 +7655,7 @@ "crossLanguageDefinitionId": "SampleTypeSpec.createLiteral" }, { - "$id": "431", + "$id": "588", "kind": "basic", "name": "helloLiteral", "accessibility": "public", @@ -5285,19 +7665,19 @@ ], "doc": "Send literal parameters", "operation": { - "$id": "432", + "$id": "589", "name": "helloLiteral", "resourceName": "SampleTypeSpec", "doc": "Send literal parameters", "accessibility": "public", "parameters": [ { - "$id": "433", + "$id": "590", "kind": "header", "name": "p1", "serializedName": "p1", "type": { - "$ref": "102" + "$ref": "104" }, "isApiVersion": false, "optional": false, @@ -5305,15 +7685,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.helloLiteral.p1" + "crossLanguageDefinitionId": "SampleTypeSpec.helloLiteral.p1", + "methodParameterSegments": [ + { + "$id": "591", + "kind": "method", + "name": "p1", + "serializedName": "p1", + "type": { + "$ref": "106" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.helloLiteral.p1", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "434", + "$id": "592", "kind": "path", "name": "p2", "serializedName": "p2", "type": { - "$ref": "104" + "$ref": "108" }, "isApiVersion": false, "explode": false, @@ -5324,15 +7723,34 @@ "scope": "Constant", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.helloLiteral.p2" + "crossLanguageDefinitionId": "SampleTypeSpec.helloLiteral.p2", + "methodParameterSegments": [ + { + "$id": "593", + "kind": "method", + "name": "p2", + "serializedName": "p2", + "type": { + "$ref": "110" + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.helloLiteral.p2", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "435", + "$id": "594", "kind": "query", "name": "p3", "serializedName": "p3", "type": { - "$ref": "106" + "$ref": "112" }, "isApiVersion": false, "explode": false, @@ -5340,15 +7758,34 @@ "scope": "Constant", "decorators": [], "crossLanguageDefinitionId": "SampleTypeSpec.helloLiteral.p3", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "595", + "kind": "method", + "name": "p3", + "serializedName": "p3", + "type": { + "$ref": "114" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.helloLiteral.p3", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "436", + "$id": "596", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "108" + "$ref": "116" }, "isApiVersion": false, "optional": false, @@ -5356,7 +7793,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.helloLiteral.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.helloLiteral.accept", + "methodParameterSegments": [ + { + "$id": "597", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "116" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.helloLiteral.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5365,7 +7821,7 @@ 200 ], "bodyType": { - "$ref": "196" + "$ref": "236" }, "headers": [], "isErrorResponse": false, @@ -5386,77 +7842,21 @@ }, "parameters": [ { - "$id": "437", - "kind": "method", - "name": "p1", - "serializedName": "p1", - "type": { - "$ref": "110" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.helloLiteral.p1", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "591" }, { - "$id": "438", - "kind": "method", - "name": "p2", - "serializedName": "p2", - "type": { - "$ref": "112" - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.helloLiteral.p2", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "593" }, { - "$id": "439", - "kind": "method", - "name": "p3", - "serializedName": "p3", - "type": { - "$ref": "114" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.helloLiteral.p3", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "595" }, { - "$id": "440", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "108" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.helloLiteral.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "597" } ], "response": { "type": { - "$ref": "196" + "$ref": "236" } }, "isOverride": false, @@ -5465,7 +7865,7 @@ "crossLanguageDefinitionId": "SampleTypeSpec.helloLiteral" }, { - "$id": "441", + "$id": "598", "kind": "basic", "name": "topAction", "accessibility": "public", @@ -5475,24 +7875,24 @@ ], "doc": "top level method", "operation": { - "$id": "442", + "$id": "599", "name": "topAction", "resourceName": "SampleTypeSpec", "doc": "top level method", "accessibility": "public", "parameters": [ { - "$id": "443", + "$id": "600", "kind": "path", "name": "action", "serializedName": "action", "type": { - "$id": "444", + "$id": "601", "kind": "utcDateTime", "name": "utcDateTime", "encode": "rfc3339", "wireType": { - "$id": "445", + "$id": "602", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -5510,15 +7910,46 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.topAction.action" + "crossLanguageDefinitionId": "SampleTypeSpec.topAction.action", + "methodParameterSegments": [ + { + "$id": "603", + "kind": "method", + "name": "action", + "serializedName": "action", + "type": { + "$id": "604", + "kind": "utcDateTime", + "name": "utcDateTime", + "encode": "rfc3339", + "wireType": { + "$id": "605", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.utcDateTime", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.topAction.action", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "446", + "$id": "606", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "116" + "$ref": "118" }, "isApiVersion": false, "optional": false, @@ -5526,7 +7957,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.topAction.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.topAction.accept", + "methodParameterSegments": [ + { + "$id": "607", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "118" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.topAction.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5535,7 +7985,7 @@ 200 ], "bodyType": { - "$ref": "196" + "$ref": "236" }, "headers": [], "isErrorResponse": false, @@ -5556,55 +8006,15 @@ }, "parameters": [ { - "$id": "447", - "kind": "method", - "name": "action", - "serializedName": "action", - "type": { - "$id": "448", - "kind": "utcDateTime", - "name": "utcDateTime", - "encode": "rfc3339", - "wireType": { - "$id": "449", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.utcDateTime", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.topAction.action", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "603" }, { - "$id": "450", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "116" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.topAction.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "607" } ], "response": { "type": { - "$ref": "196" + "$ref": "236" } }, "isOverride": false, @@ -5613,7 +8023,7 @@ "crossLanguageDefinitionId": "SampleTypeSpec.topAction" }, { - "$id": "451", + "$id": "608", "kind": "basic", "name": "topAction2", "accessibility": "public", @@ -5623,19 +8033,19 @@ ], "doc": "top level method2", "operation": { - "$id": "452", + "$id": "609", "name": "topAction2", "resourceName": "SampleTypeSpec", "doc": "top level method2", "accessibility": "public", "parameters": [ { - "$id": "453", + "$id": "610", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "118" + "$ref": "120" }, "isApiVersion": false, "optional": false, @@ -5643,7 +8053,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.topAction2.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.topAction2.accept", + "methodParameterSegments": [ + { + "$id": "611", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "120" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.topAction2.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5652,7 +8081,7 @@ 200 ], "bodyType": { - "$ref": "196" + "$ref": "236" }, "headers": [], "isErrorResponse": false, @@ -5673,26 +8102,12 @@ }, "parameters": [ { - "$id": "454", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "118" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.topAction2.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "611" } ], "response": { "type": { - "$ref": "196" + "$ref": "236" } }, "isOverride": false, @@ -5701,7 +8116,7 @@ "crossLanguageDefinitionId": "SampleTypeSpec.topAction2" }, { - "$id": "455", + "$id": "612", "kind": "basic", "name": "patchAction", "accessibility": "public", @@ -5711,20 +8126,20 @@ ], "doc": "top level patch", "operation": { - "$id": "456", + "$id": "613", "name": "patchAction", "resourceName": "SampleTypeSpec", "doc": "top level patch", "accessibility": "public", "parameters": [ { - "$id": "457", + "$id": "614", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "120" + "$ref": "122" }, "isApiVersion": false, "optional": false, @@ -5732,15 +8147,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.patchAction.contentType" + "crossLanguageDefinitionId": "SampleTypeSpec.patchAction.contentType", + "methodParameterSegments": [ + { + "$id": "615", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "122" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.patchAction.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "458", + "$id": "616", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "122" + "$ref": "124" }, "isApiVersion": false, "optional": false, @@ -5748,15 +8183,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.patchAction.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.patchAction.accept", + "methodParameterSegments": [ + { + "$id": "617", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "124" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.patchAction.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "459", + "$id": "618", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "196" + "$ref": "236" }, "isApiVersion": false, "contentTypes": [ @@ -5767,7 +8221,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.patchAction.body" + "crossLanguageDefinitionId": "SampleTypeSpec.patchAction.body", + "methodParameterSegments": [ + { + "$id": "619", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "236" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.patchAction.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5776,7 +8249,7 @@ 200 ], "bodyType": { - "$ref": "196" + "$ref": "236" }, "headers": [], "isErrorResponse": false, @@ -5800,61 +8273,18 @@ }, "parameters": [ { - "$id": "460", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "196" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.patchAction.body", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "461", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "120" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.patchAction.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "619" }, - { - "$id": "462", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "122" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.patchAction.accept", - "readOnly": false, - "access": "public", - "decorators": [] + { + "$ref": "615" + }, + { + "$ref": "617" } ], "response": { "type": { - "$ref": "196" + "$ref": "236" } }, "isOverride": false, @@ -5863,7 +8293,7 @@ "crossLanguageDefinitionId": "SampleTypeSpec.patchAction" }, { - "$id": "463", + "$id": "620", "kind": "basic", "name": "anonymousBody", "accessibility": "public", @@ -5873,19 +8303,19 @@ ], "doc": "body parameter without body decorator", "operation": { - "$id": "464", + "$id": "621", "name": "anonymousBody", "resourceName": "SampleTypeSpec", "doc": "body parameter without body decorator", "accessibility": "public", "parameters": [ { - "$id": "465", + "$id": "622", "kind": "query", "name": "requiredQueryParam", "serializedName": "requiredQueryParam", "type": { - "$ref": "124" + "$ref": "126" }, "isApiVersion": false, "explode": false, @@ -5893,15 +8323,34 @@ "scope": "Constant", "decorators": [], "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.requiredQueryParam", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "623", + "kind": "method", + "name": "requiredQueryParam", + "serializedName": "requiredQueryParam", + "type": { + "$ref": "128" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.requiredQueryParam", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "466", + "$id": "624", "kind": "header", "name": "requiredHeader", "serializedName": "required-header", "type": { - "$ref": "126" + "$ref": "130" }, "isApiVersion": false, "optional": false, @@ -5909,16 +8358,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.requiredHeader" + "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.requiredHeader", + "methodParameterSegments": [ + { + "$id": "625", + "kind": "method", + "name": "requiredHeader", + "serializedName": "required-header", + "type": { + "$ref": "132" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.requiredHeader", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "467", + "$id": "626", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "128" + "$ref": "134" }, "isApiVersion": false, "optional": false, @@ -5926,15 +8394,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.contentType" + "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.contentType", + "methodParameterSegments": [ + { + "$id": "627", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "134" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "468", + "$id": "628", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "130" + "$ref": "136" }, "isApiVersion": false, "optional": false, @@ -5942,15 +8430,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.accept", + "methodParameterSegments": [ + { + "$id": "629", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "136" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "469", + "$id": "630", "kind": "body", "name": "thing", "serializedName": "thing", "type": { - "$ref": "196" + "$ref": "236" }, "isApiVersion": false, "contentTypes": [ @@ -5961,7 +8468,31 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.body" + "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.body", + "methodParameterSegments": [ + { + "$id": "631", + "kind": "method", + "name": "name", + "serializedName": "name", + "doc": "name of the Thing", + "type": { + "$id": "632", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.name", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5970,7 +8501,7 @@ 200 ], "bodyType": { - "$ref": "196" + "$ref": "236" }, "headers": [], "isErrorResponse": false, @@ -5994,35 +8525,16 @@ }, "parameters": [ { - "$id": "470", - "kind": "method", - "name": "name", - "serializedName": "name", - "doc": "name of the Thing", - "type": { - "$id": "471", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.name", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "631" }, { - "$id": "472", + "$id": "633", "kind": "method", "name": "requiredUnion", "serializedName": "requiredUnion", "doc": "required Union", "type": { - "$ref": "200" + "$ref": "240" }, "location": "Body", "isApiVersion": false, @@ -6034,7 +8546,7 @@ "decorators": [] }, { - "$id": "473", + "$id": "634", "kind": "method", "name": "requiredLiteralString", "serializedName": "requiredLiteralString", @@ -6052,13 +8564,13 @@ "decorators": [] }, { - "$id": "474", + "$id": "635", "kind": "method", "name": "requiredNullableString", "serializedName": "requiredNullableString", "doc": "required nullable string", "type": { - "$ref": "207" + "$ref": "247" }, "location": "Body", "isApiVersion": false, @@ -6070,13 +8582,13 @@ "decorators": [] }, { - "$id": "475", + "$id": "636", "kind": "method", "name": "optionalNullableString", "serializedName": "optionalNullableString", "doc": "required optional string", "type": { - "$ref": "210" + "$ref": "250" }, "location": "Body", "isApiVersion": false, @@ -6088,7 +8600,7 @@ "decorators": [] }, { - "$id": "476", + "$id": "637", "kind": "method", "name": "requiredLiteralInt", "serializedName": "requiredLiteralInt", @@ -6106,7 +8618,7 @@ "decorators": [] }, { - "$id": "477", + "$id": "638", "kind": "method", "name": "requiredLiteralFloat", "serializedName": "requiredLiteralFloat", @@ -6124,7 +8636,7 @@ "decorators": [] }, { - "$id": "478", + "$id": "639", "kind": "method", "name": "requiredLiteralBool", "serializedName": "requiredLiteralBool", @@ -6142,18 +8654,18 @@ "decorators": [] }, { - "$id": "479", + "$id": "640", "kind": "method", "name": "optionalLiteralString", "serializedName": "optionalLiteralString", "doc": "optional literal string", "type": { - "$id": "480", + "$id": "641", "kind": "enum", "name": "ThingOptionalLiteralString", "crossLanguageDefinitionId": "", "valueType": { - "$id": "481", + "$id": "642", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -6161,12 +8673,12 @@ }, "values": [ { - "$id": "482", + "$id": "643", "kind": "enumvalue", "name": "reject", "value": "reject", "valueType": { - "$id": "483", + "$id": "644", "kind": "string", "decorators": [], "doc": "A sequence of textual characters.", @@ -6174,7 +8686,7 @@ "crossLanguageDefinitionId": "TypeSpec.string" }, "enumType": { - "$ref": "480" + "$ref": "641" }, "decorators": [] } @@ -6195,13 +8707,13 @@ "decorators": [] }, { - "$id": "484", + "$id": "645", "kind": "method", "name": "requiredNullableLiteralString", "serializedName": "requiredNullableLiteralString", "doc": "required nullable literal string", "type": { - "$ref": "217" + "$ref": "257" }, "location": "Body", "isApiVersion": false, @@ -6213,18 +8725,18 @@ "decorators": [] }, { - "$id": "485", + "$id": "646", "kind": "method", "name": "optionalLiteralInt", "serializedName": "optionalLiteralInt", "doc": "optional literal int", "type": { - "$id": "486", + "$id": "647", "kind": "enum", "name": "ThingOptionalLiteralInt", "crossLanguageDefinitionId": "", "valueType": { - "$id": "487", + "$id": "648", "kind": "int32", "name": "int32", "crossLanguageDefinitionId": "TypeSpec.int32", @@ -6232,12 +8744,12 @@ }, "values": [ { - "$id": "488", + "$id": "649", "kind": "enumvalue", "name": "456", "value": 456, "valueType": { - "$id": "489", + "$id": "650", "kind": "int32", "decorators": [], "doc": "A 32-bit integer. (`-2,147,483,648` to `2,147,483,647`)", @@ -6245,7 +8757,7 @@ "crossLanguageDefinitionId": "TypeSpec.int32" }, "enumType": { - "$ref": "486" + "$ref": "647" }, "decorators": [] } @@ -6266,18 +8778,18 @@ "decorators": [] }, { - "$id": "490", + "$id": "651", "kind": "method", "name": "optionalLiteralFloat", "serializedName": "optionalLiteralFloat", "doc": "optional literal float", "type": { - "$id": "491", + "$id": "652", "kind": "enum", "name": "ThingOptionalLiteralFloat", "crossLanguageDefinitionId": "", "valueType": { - "$id": "492", + "$id": "653", "kind": "float32", "name": "float32", "crossLanguageDefinitionId": "TypeSpec.float32", @@ -6285,12 +8797,12 @@ }, "values": [ { - "$id": "493", + "$id": "654", "kind": "enumvalue", "name": "4.56", "value": 4.56, "valueType": { - "$id": "494", + "$id": "655", "kind": "float32", "decorators": [], "doc": "A 32 bit floating point number. (`±1.5 x 10^−45` to `±3.4 x 10^38`)", @@ -6298,7 +8810,7 @@ "crossLanguageDefinitionId": "TypeSpec.float32" }, "enumType": { - "$ref": "491" + "$ref": "652" }, "decorators": [] } @@ -6319,7 +8831,7 @@ "decorators": [] }, { - "$id": "495", + "$id": "656", "kind": "method", "name": "optionalLiteralBool", "serializedName": "optionalLiteralBool", @@ -6337,13 +8849,13 @@ "decorators": [] }, { - "$id": "496", + "$id": "657", "kind": "method", "name": "requiredBadDescription", "serializedName": "requiredBadDescription", "doc": "description with xml <|endoftext|>", "type": { - "$id": "497", + "$id": "658", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -6359,13 +8871,13 @@ "decorators": [] }, { - "$id": "498", + "$id": "659", "kind": "method", "name": "optionalNullableList", "serializedName": "optionalNullableList", "doc": "optional nullable collection", "type": { - "$ref": "224" + "$ref": "264" }, "location": "Body", "isApiVersion": false, @@ -6377,13 +8889,13 @@ "decorators": [] }, { - "$id": "499", + "$id": "660", "kind": "method", "name": "requiredNullableList", "serializedName": "requiredNullableList", "doc": "required nullable collection", "type": { - "$ref": "228" + "$ref": "268" }, "location": "Body", "isApiVersion": false, @@ -6395,13 +8907,13 @@ "decorators": [] }, { - "$id": "500", + "$id": "661", "kind": "method", "name": "propertyWithSpecialDocs", "serializedName": "propertyWithSpecialDocs", "doc": "This tests:\n- Simple bullet point. This bullet point is going to be very long to test how text wrapping is handled in bullet points within documentation comments. It should properly indent the wrapped lines.\n- Another bullet point with **bold text**. This bullet point is also intentionally long to see how the formatting is preserved when the text wraps onto multiple lines in the generated documentation.\n- Third bullet point with *italic text*. Similar to the previous points, this one is extended to ensure that the wrapping and formatting are correctly applied in the output.\n- Complex bullet point with **bold** and *italic* combined. This bullet point combines both bold and italic formatting and is long enough to test the wrapping behavior in such cases.\n- **Bold bullet point**: A bullet point that is entirely bolded. This point is also made lengthy to observe how the bold formatting is maintained across wrapped lines.\n- *Italic bullet point*: A bullet point that is entirely italicized. This final point is extended to verify that italic formatting is correctly applied even when the text spans multiple lines.", "type": { - "$id": "501", + "$id": "662", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -6417,110 +8929,340 @@ "decorators": [] }, { - "$id": "502", - "kind": "method", - "name": "requiredQueryParam", - "serializedName": "requiredQueryParam", - "type": { - "$ref": "142" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.requiredQueryParam", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "623" }, { - "$id": "503", - "kind": "method", - "name": "requiredHeader", - "serializedName": "required-header", - "type": { - "$ref": "144" + "$ref": "625" + }, + { + "$ref": "627" + }, + { + "$ref": "629" + } + ], + "response": { + "type": { + "$ref": "236" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody" + }, + { + "$id": "663", + "kind": "basic", + "name": "friendlyModel", + "accessibility": "public", + "apiVersions": [ + "2024-07-16-preview", + "2024-08-16-preview" + ], + "doc": "Model can have its friendly name", + "operation": { + "$id": "664", + "name": "friendlyModel", + "resourceName": "SampleTypeSpec", + "doc": "Model can have its friendly name", + "accessibility": "public", + "parameters": [ + { + "$id": "665", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "148" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.friendlyModel.contentType", + "methodParameterSegments": [ + { + "$id": "666", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "148" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.friendlyModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.requiredHeader", - "readOnly": false, - "access": "public", - "decorators": [] + { + "$id": "667", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "150" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.friendlyModel.accept", + "methodParameterSegments": [ + { + "$id": "668", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "150" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.friendlyModel.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "669", + "kind": "body", + "name": "friend", + "serializedName": "friend", + "type": { + "$ref": "325" + }, + "isApiVersion": false, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", + "optional": false, + "scope": "Spread", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "SampleTypeSpec.friendlyModel.body", + "methodParameterSegments": [ + { + "$id": "670", + "kind": "method", + "name": "name", + "serializedName": "name", + "doc": "name of the NotFriend", + "type": { + "$id": "671", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.friendlyModel.name", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "325" + }, + "headers": [], + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] + } + ], + "httpMethod": "POST", + "uri": "{sampleTypeSpecUrl}", + "path": "/friendlyName", + "requestMediaTypes": [ + "application/json" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "SampleTypeSpec.friendlyModel", + "decorators": [], + "namespace": "SampleTypeSpec" + }, + "parameters": [ + { + "$ref": "670" }, { - "$id": "504", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "128" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "666" }, { - "$id": "505", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "130" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "668" } ], "response": { "type": { - "$ref": "196" + "$ref": "325" } }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.anonymousBody" + "crossLanguageDefinitionId": "SampleTypeSpec.friendlyModel" }, { - "$id": "506", + "$id": "672", "kind": "basic", - "name": "friendlyModel", + "name": "addTimeHeader", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "Model can have its friendly name", "operation": { - "$id": "507", - "name": "friendlyModel", + "$id": "673", + "name": "addTimeHeader", "resourceName": "SampleTypeSpec", - "doc": "Model can have its friendly name", "accessibility": "public", "parameters": [ { - "$id": "508", + "$id": "674", + "kind": "header", + "name": "repeatabilityFirstSent", + "serializedName": "Repeatability-First-Sent", + "type": { + "$id": "675", + "kind": "utcDateTime", + "name": "utcDateTime", + "encode": "rfc7231", + "wireType": { + "$id": "676", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.utcDateTime", + "decorators": [] + }, + "isApiVersion": false, + "optional": true, + "isContentType": false, + "scope": "Method", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.addTimeHeader.repeatabilityFirstSent", + "methodParameterSegments": [ + { + "$id": "677", + "kind": "method", + "name": "repeatabilityFirstSent", + "serializedName": "Repeatability-First-Sent", + "type": { + "$id": "678", + "kind": "utcDateTime", + "name": "utcDateTime", + "encode": "rfc7231", + "wireType": { + "$id": "679", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.utcDateTime", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.addTimeHeader.repeatabilityFirstSent", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "GET", + "uri": "{sampleTypeSpecUrl}", + "path": "/", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "SampleTypeSpec.addTimeHeader", + "decorators": [], + "namespace": "SampleTypeSpec" + }, + "parameters": [ + { + "$ref": "677" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "SampleTypeSpec.addTimeHeader" + }, + { + "$id": "680", + "kind": "basic", + "name": "projectedNameModel", + "accessibility": "public", + "apiVersions": [ + "2024-07-16-preview", + "2024-08-16-preview" + ], + "doc": "Model can have its projected name", + "operation": { + "$id": "681", + "name": "projectedNameModel", + "resourceName": "SampleTypeSpec", + "doc": "Model can have its projected name", + "accessibility": "public", + "parameters": [ + { + "$id": "682", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "146" + "$ref": "152" }, "isApiVersion": false, "optional": false, @@ -6528,15 +9270,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.friendlyModel.contentType" + "crossLanguageDefinitionId": "SampleTypeSpec.projectedNameModel.contentType", + "methodParameterSegments": [ + { + "$id": "683", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "152" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.projectedNameModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "509", + "$id": "684", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "148" + "$ref": "154" }, "isApiVersion": false, "optional": false, @@ -6544,15 +9306,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.friendlyModel.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.projectedNameModel.accept", + "methodParameterSegments": [ + { + "$id": "685", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "154" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.projectedNameModel.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "510", + "$id": "686", "kind": "body", - "name": "friend", - "serializedName": "friend", + "name": "renamedModel", + "serializedName": "renamedModel", "type": { - "$ref": "279" + "$ref": "328" }, "isApiVersion": false, "contentTypes": [ @@ -6563,7 +9344,31 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.friendlyModel.body" + "crossLanguageDefinitionId": "SampleTypeSpec.projectedNameModel.body", + "methodParameterSegments": [ + { + "$id": "687", + "kind": "method", + "name": "otherName", + "serializedName": "otherName", + "doc": "name of the ModelWithClientName", + "type": { + "$id": "688", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.projectedNameModel.otherName", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6572,7 +9377,7 @@ 200 ], "bodyType": { - "$ref": "279" + "$ref": "328" }, "headers": [], "isErrorResponse": false, @@ -6583,211 +9388,264 @@ ], "httpMethod": "POST", "uri": "{sampleTypeSpecUrl}", - "path": "/friendlyName", + "path": "/projectedName", "requestMediaTypes": [ "application/json" ], "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.friendlyModel", + "crossLanguageDefinitionId": "SampleTypeSpec.projectedNameModel", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "511", - "kind": "method", - "name": "name", - "serializedName": "name", - "doc": "name of the NotFriend", - "type": { - "$id": "512", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.friendlyModel.name", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "687" }, { - "$id": "513", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "146" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.friendlyModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "683" }, { - "$id": "514", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "148" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.friendlyModel.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "685" + } + ], + "response": { + "type": { + "$ref": "328" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "SampleTypeSpec.projectedNameModel" + }, + { + "$id": "689", + "kind": "basic", + "name": "returnsAnonymousModel", + "accessibility": "public", + "apiVersions": [ + "2024-07-16-preview", + "2024-08-16-preview" + ], + "doc": "return anonymous model", + "operation": { + "$id": "690", + "name": "returnsAnonymousModel", + "resourceName": "SampleTypeSpec", + "doc": "return anonymous model", + "accessibility": "public", + "parameters": [ + { + "$id": "691", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "156" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.returnsAnonymousModel.accept", + "methodParameterSegments": [ + { + "$id": "692", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "156" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.returnsAnonymousModel.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "331" + }, + "headers": [], + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] + } + ], + "httpMethod": "POST", + "uri": "{sampleTypeSpecUrl}", + "path": "/returnsAnonymousModel", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "SampleTypeSpec.returnsAnonymousModel", + "decorators": [], + "namespace": "SampleTypeSpec" + }, + "parameters": [ + { + "$ref": "692" } ], "response": { "type": { - "$ref": "279" + "$ref": "331" } }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.friendlyModel" + "crossLanguageDefinitionId": "SampleTypeSpec.returnsAnonymousModel" }, { - "$id": "515", + "$id": "693", "kind": "basic", - "name": "addTimeHeader", + "name": "getUnknownValue", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], + "doc": "get extensible enum", "operation": { - "$id": "516", - "name": "addTimeHeader", + "$id": "694", + "name": "getUnknownValue", "resourceName": "SampleTypeSpec", + "doc": "get extensible enum", "accessibility": "public", "parameters": [ { - "$id": "517", + "$id": "695", "kind": "header", - "name": "repeatabilityFirstSent", - "serializedName": "Repeatability-First-Sent", + "name": "accept", + "serializedName": "Accept", "type": { - "$id": "518", - "kind": "utcDateTime", - "name": "utcDateTime", - "encode": "rfc7231", - "wireType": { - "$id": "519", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.utcDateTime", + "$id": "696", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "isApiVersion": false, - "optional": true, + "optional": false, "isContentType": false, "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.addTimeHeader.repeatabilityFirstSent" + "crossLanguageDefinitionId": "SampleTypeSpec.getUnknownValue.accept", + "methodParameterSegments": [ + { + "$id": "697", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "696" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.getUnknownValue.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ { "statusCodes": [ - 204 + 200 ], + "bodyType": { + "$id": "698", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, "headers": [], - "isErrorResponse": false + "isErrorResponse": false, + "contentTypes": [ + "text/plain", + "text/plain", + "text/plain", + "text/plain", + "text/plain", + "text/plain", + "text/plain", + "text/plain" + ] } ], "httpMethod": "GET", "uri": "{sampleTypeSpecUrl}", - "path": "/", + "path": "/unknown-value", "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.addTimeHeader", + "crossLanguageDefinitionId": "SampleTypeSpec.getUnknownValue", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "520", - "kind": "method", - "name": "repeatabilityFirstSent", - "serializedName": "Repeatability-First-Sent", - "type": { - "$id": "521", - "kind": "utcDateTime", - "name": "utcDateTime", - "encode": "rfc7231", - "wireType": { - "$id": "522", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.utcDateTime", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.addTimeHeader.repeatabilityFirstSent", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "697" } ], - "response": {}, + "response": { + "type": { + "$ref": "698" + } + }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.addTimeHeader" + "crossLanguageDefinitionId": "SampleTypeSpec.getUnknownValue" }, { - "$id": "523", + "$id": "699", "kind": "basic", - "name": "projectedNameModel", + "name": "internalProtocol", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "Model can have its projected name", + "doc": "When set protocol false and convenient true, then the protocol method should be internal", "operation": { - "$id": "524", - "name": "projectedNameModel", + "$id": "700", + "name": "internalProtocol", "resourceName": "SampleTypeSpec", - "doc": "Model can have its projected name", + "doc": "When set protocol false and convenient true, then the protocol method should be internal", "accessibility": "public", "parameters": [ { - "$id": "525", + "$id": "701", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "150" + "$ref": "158" }, "isApiVersion": false, "optional": false, @@ -6795,15 +9653,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.projectedNameModel.contentType" + "crossLanguageDefinitionId": "SampleTypeSpec.internalProtocol.contentType", + "methodParameterSegments": [ + { + "$id": "702", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "158" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.internalProtocol.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "526", + "$id": "703", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "152" + "$ref": "160" }, "isApiVersion": false, "optional": false, @@ -6811,15 +9689,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.projectedNameModel.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.internalProtocol.accept", + "methodParameterSegments": [ + { + "$id": "704", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "160" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.internalProtocol.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "527", + "$id": "705", "kind": "body", - "name": "renamedModel", - "serializedName": "renamedModel", + "name": "body", + "serializedName": "body", "type": { - "$ref": "282" + "$ref": "236" }, "isApiVersion": false, "contentTypes": [ @@ -6827,10 +9724,29 @@ ], "defaultContentType": "application/json", "optional": false, - "scope": "Spread", + "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.projectedNameModel.body" + "crossLanguageDefinitionId": "SampleTypeSpec.internalProtocol.body", + "methodParameterSegments": [ + { + "$id": "706", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "236" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.internalProtocol.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6839,7 +9755,7 @@ 200 ], "bodyType": { - "$ref": "282" + "$ref": "236" }, "headers": [], "isErrorResponse": false, @@ -6850,710 +9766,767 @@ ], "httpMethod": "POST", "uri": "{sampleTypeSpecUrl}", - "path": "/projectedName", + "path": "/internalProtocol", "requestMediaTypes": [ "application/json" ], "bufferResponse": true, - "generateProtocolMethod": true, + "generateProtocolMethod": false, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.projectedNameModel", + "crossLanguageDefinitionId": "SampleTypeSpec.internalProtocol", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "528", - "kind": "method", - "name": "otherName", - "serializedName": "otherName", - "doc": "name of the ModelWithClientName", - "type": { - "$id": "529", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.projectedNameModel.otherName", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "706" }, { - "$id": "530", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "150" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.projectedNameModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "702" }, { - "$id": "531", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "152" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.projectedNameModel.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "704" } ], "response": { "type": { - "$ref": "282" + "$ref": "236" } }, "isOverride": false, "generateConvenient": true, - "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.projectedNameModel" + "generateProtocol": false, + "crossLanguageDefinitionId": "SampleTypeSpec.internalProtocol" }, { - "$id": "532", + "$id": "707", "kind": "basic", - "name": "returnsAnonymousModel", + "name": "stillConvenient", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "return anonymous model", + "doc": "When set protocol false and convenient true, the convenient method should be generated even it has the same signature as protocol one", "operation": { - "$id": "533", - "name": "returnsAnonymousModel", + "$id": "708", + "name": "stillConvenient", "resourceName": "SampleTypeSpec", - "doc": "return anonymous model", + "doc": "When set protocol false and convenient true, the convenient method should be generated even it has the same signature as protocol one", "accessibility": "public", - "parameters": [ - { - "$id": "534", - "kind": "header", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "154" - }, - "isApiVersion": false, - "optional": false, - "isContentType": false, - "scope": "Constant", - "readOnly": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.returnsAnonymousModel.accept" - } - ], + "parameters": [], "responses": [ { "statusCodes": [ - 200 - ], - "bodyType": { - "$ref": "285" - }, - "headers": [], - "isErrorResponse": false, - "contentTypes": [ - "application/json" - ] - } - ], - "httpMethod": "POST", - "uri": "{sampleTypeSpecUrl}", - "path": "/returnsAnonymousModel", - "bufferResponse": true, - "generateProtocolMethod": true, - "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.returnsAnonymousModel", - "decorators": [], - "namespace": "SampleTypeSpec" - }, - "parameters": [ - { - "$id": "535", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "154" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.returnsAnonymousModel.accept", - "readOnly": false, - "access": "public", - "decorators": [] - } - ], - "response": { - "type": { - "$ref": "285" - } + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "GET", + "uri": "{sampleTypeSpecUrl}", + "path": "/stillConvenient", + "bufferResponse": true, + "generateProtocolMethod": false, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "SampleTypeSpec.stillConvenient", + "decorators": [], + "namespace": "SampleTypeSpec" }, + "parameters": [], + "response": {}, "isOverride": false, "generateConvenient": true, - "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.returnsAnonymousModel" + "generateProtocol": false, + "crossLanguageDefinitionId": "SampleTypeSpec.stillConvenient" }, { - "$id": "536", + "$id": "709", "kind": "basic", - "name": "getUnknownValue", + "name": "headAsBoolean", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "get extensible enum", + "doc": "head as boolean.", "operation": { - "$id": "537", - "name": "getUnknownValue", + "$id": "710", + "name": "headAsBoolean", "resourceName": "SampleTypeSpec", - "doc": "get extensible enum", + "doc": "head as boolean.", "accessibility": "public", "parameters": [ { - "$id": "538", - "kind": "header", - "name": "accept", - "serializedName": "Accept", + "$id": "711", + "kind": "path", + "name": "id", + "serializedName": "id", "type": { - "$id": "539", + "$id": "712", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "isApiVersion": false, + "explode": false, + "style": "simple", + "allowReserved": false, + "skipUrlEncoding": false, "optional": false, - "isContentType": false, "scope": "Method", - "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.getUnknownValue.accept" + "readOnly": false, + "crossLanguageDefinitionId": "SampleTypeSpec.headAsBoolean.id", + "methodParameterSegments": [ + { + "$id": "713", + "kind": "method", + "name": "id", + "serializedName": "id", + "type": { + "$id": "714", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.headAsBoolean.id", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ { "statusCodes": [ - 200 + 204 ], - "bodyType": { - "$id": "540", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, "headers": [], - "isErrorResponse": false, - "contentTypes": [ - "text/plain", - "text/plain", - "text/plain", - "text/plain", - "text/plain", - "text/plain", - "text/plain", - "text/plain" - ] + "isErrorResponse": false } ], - "httpMethod": "GET", + "httpMethod": "HEAD", "uri": "{sampleTypeSpecUrl}", - "path": "/unknown-value", + "path": "/headAsBoolean/{id}", "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.getUnknownValue", + "crossLanguageDefinitionId": "SampleTypeSpec.headAsBoolean", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "541", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "539" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.getUnknownValue.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "713" } ], - "response": { - "type": { - "$ref": "540" - } - }, + "response": {}, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.getUnknownValue" + "crossLanguageDefinitionId": "SampleTypeSpec.headAsBoolean" }, { - "$id": "542", + "$id": "715", "kind": "basic", - "name": "internalProtocol", + "name": "WithApiVersion", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "When set protocol false and convenient true, then the protocol method should be internal", + "doc": "Return hi again", "operation": { - "$id": "543", - "name": "internalProtocol", + "$id": "716", + "name": "WithApiVersion", "resourceName": "SampleTypeSpec", - "doc": "When set protocol false and convenient true, then the protocol method should be internal", + "doc": "Return hi again", "accessibility": "public", "parameters": [ { - "$id": "544", - "kind": "header", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "156" - }, - "isApiVersion": false, - "optional": false, - "isContentType": true, - "scope": "Constant", - "readOnly": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.internalProtocol.contentType" - }, - { - "$id": "545", + "$id": "717", "kind": "header", - "name": "accept", - "serializedName": "Accept", + "name": "p1", + "serializedName": "p1", "type": { - "$ref": "158" + "$id": "718", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, "isApiVersion": false, "optional": false, "isContentType": false, - "scope": "Constant", + "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.internalProtocol.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.WithApiVersion.p1", + "methodParameterSegments": [ + { + "$id": "719", + "kind": "method", + "name": "p1", + "serializedName": "p1", + "type": { + "$id": "720", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.WithApiVersion.p1", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "546", - "kind": "body", - "name": "body", - "serializedName": "body", + "$id": "721", + "kind": "query", + "name": "apiVersion", + "serializedName": "apiVersion", "type": { - "$ref": "196" + "$id": "722", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "isApiVersion": true, + "explode": false, + "defaultValue": { + "type": { + "$id": "723", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "2024-08-16-preview" }, - "isApiVersion": false, - "contentTypes": [ - "application/json" - ], - "defaultContentType": "application/json", "optional": false, - "scope": "Method", + "scope": "Client", "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.WithApiVersion.apiVersion", "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.internalProtocol.body" + "methodParameterSegments": [ + { + "$id": "724", + "kind": "method", + "name": "apiVersion", + "serializedName": "apiVersion", + "type": { + "$id": "725", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "", + "isApiVersion": true, + "defaultValue": { + "type": { + "$id": "726", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "2024-08-16-preview" + }, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.WithApiVersion.apiVersion", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ { "statusCodes": [ - 200 + 204 ], - "bodyType": { - "$ref": "196" - }, "headers": [], - "isErrorResponse": false, - "contentTypes": [ - "application/json" - ] + "isErrorResponse": false } ], - "httpMethod": "POST", + "httpMethod": "GET", "uri": "{sampleTypeSpecUrl}", - "path": "/internalProtocol", - "requestMediaTypes": [ - "application/json" - ], + "path": "/WithApiVersion", "bufferResponse": true, - "generateProtocolMethod": false, + "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.internalProtocol", + "crossLanguageDefinitionId": "SampleTypeSpec.WithApiVersion", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "547", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "196" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.internalProtocol.body", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "548", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "156" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.internalProtocol.contentType", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "549", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "158" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.internalProtocol.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "719" } ], - "response": { - "type": { - "$ref": "196" - } - }, + "response": {}, "isOverride": false, "generateConvenient": true, - "generateProtocol": false, - "crossLanguageDefinitionId": "SampleTypeSpec.internalProtocol" + "generateProtocol": true, + "crossLanguageDefinitionId": "SampleTypeSpec.WithApiVersion" }, { - "$id": "550", - "kind": "basic", - "name": "stillConvenient", + "$id": "727", + "kind": "paging", + "name": "ListWithNextLink", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "When set protocol false and convenient true, the convenient method should be generated even it has the same signature as protocol one", + "doc": "List things with nextlink", "operation": { - "$id": "551", - "name": "stillConvenient", + "$id": "728", + "name": "ListWithNextLink", "resourceName": "SampleTypeSpec", - "doc": "When set protocol false and convenient true, the convenient method should be generated even it has the same signature as protocol one", + "doc": "List things with nextlink", "accessibility": "public", - "parameters": [], + "parameters": [ + { + "$id": "729", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "162" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithNextLink.accept", + "methodParameterSegments": [ + { + "$id": "730", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "162" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithNextLink.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], "responses": [ { "statusCodes": [ - 204 + 200 ], + "bodyType": { + "$ref": "332" + }, "headers": [], - "isErrorResponse": false + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] } ], "httpMethod": "GET", "uri": "{sampleTypeSpecUrl}", - "path": "/stillConvenient", + "path": "/link", "bufferResponse": true, - "generateProtocolMethod": false, + "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.stillConvenient", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithNextLink", "decorators": [], "namespace": "SampleTypeSpec" }, - "parameters": [], - "response": {}, + "parameters": [ + { + "$ref": "730" + } + ], + "response": { + "type": { + "$ref": "334" + }, + "resultSegments": [ + "things" + ] + }, "isOverride": false, "generateConvenient": true, - "generateProtocol": false, - "crossLanguageDefinitionId": "SampleTypeSpec.stillConvenient" + "generateProtocol": true, + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithNextLink", + "pagingMetadata": { + "itemPropertySegments": [ + "things" + ], + "nextLink": { + "responseSegments": [ + "next" + ], + "responseLocation": "Body" + }, + "pageSizeParameterSegments": [] + } }, { - "$id": "552", - "kind": "basic", - "name": "headAsBoolean", + "$id": "731", + "kind": "paging", + "name": "ListWithStringNextLink", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "head as boolean.", + "doc": "List things with nextlink", "operation": { - "$id": "553", - "name": "headAsBoolean", + "$id": "732", + "name": "ListWithStringNextLink", "resourceName": "SampleTypeSpec", - "doc": "head as boolean.", + "doc": "List things with nextlink", "accessibility": "public", "parameters": [ { - "$id": "554", - "kind": "path", - "name": "id", - "serializedName": "id", + "$id": "733", + "kind": "header", + "name": "accept", + "serializedName": "Accept", "type": { - "$id": "555", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] + "$ref": "164" }, "isApiVersion": false, - "explode": false, - "style": "simple", - "allowReserved": false, - "skipUrlEncoding": false, "optional": false, - "scope": "Method", - "decorators": [], + "isContentType": false, + "scope": "Constant", "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.headAsBoolean.id" + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithStringNextLink.accept", + "methodParameterSegments": [ + { + "$id": "734", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "164" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithStringNextLink.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ { "statusCodes": [ - 204 + 200 ], + "bodyType": { + "$ref": "337" + }, "headers": [], - "isErrorResponse": false + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] } ], - "httpMethod": "HEAD", + "httpMethod": "GET", "uri": "{sampleTypeSpecUrl}", - "path": "/headAsBoolean/{id}", + "path": "/linkString", "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.headAsBoolean", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithStringNextLink", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "556", - "kind": "method", - "name": "id", - "serializedName": "id", - "type": { - "$id": "557", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.headAsBoolean.id", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "734" } ], - "response": {}, + "response": { + "type": { + "$ref": "334" + }, + "resultSegments": [ + "things" + ] + }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.headAsBoolean" + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithStringNextLink", + "pagingMetadata": { + "itemPropertySegments": [ + "things" + ], + "nextLink": { + "responseSegments": [ + "next" + ], + "responseLocation": "Body" + }, + "pageSizeParameterSegments": [] + } }, { - "$id": "558", - "kind": "basic", - "name": "WithApiVersion", + "$id": "735", + "kind": "paging", + "name": "ListWithContinuationToken", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "Return hi again", + "doc": "List things with continuation token", "operation": { - "$id": "559", - "name": "WithApiVersion", + "$id": "736", + "name": "ListWithContinuationToken", "resourceName": "SampleTypeSpec", - "doc": "Return hi again", + "doc": "List things with continuation token", "accessibility": "public", "parameters": [ { - "$id": "560", - "kind": "header", - "name": "p1", - "serializedName": "p1", + "$id": "737", + "kind": "query", + "name": "token", + "serializedName": "token", "type": { - "$id": "561", + "$id": "738", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "isApiVersion": false, - "optional": false, - "isContentType": false, + "explode": false, + "optional": true, "scope": "Method", - "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.WithApiVersion.p1" + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationToken.token", + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "739", + "kind": "method", + "name": "token", + "serializedName": "token", + "type": { + "$id": "740", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationToken.token", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "562", - "kind": "query", - "name": "apiVersion", - "serializedName": "apiVersion", + "$id": "741", + "kind": "header", + "name": "accept", + "serializedName": "Accept", "type": { - "$id": "563", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "isApiVersion": true, - "explode": false, - "defaultValue": { - "type": { - "$id": "564", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string" - }, - "value": "2024-08-16-preview" + "$ref": "166" }, + "isApiVersion": false, "optional": false, - "scope": "Client", + "isContentType": false, + "scope": "Constant", + "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.WithApiVersion.apiVersion", - "readOnly": false + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationToken.accept", + "methodParameterSegments": [ + { + "$id": "742", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "166" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationToken.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ { "statusCodes": [ - 204 + 200 ], + "bodyType": { + "$ref": "341" + }, "headers": [], - "isErrorResponse": false + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] } ], "httpMethod": "GET", "uri": "{sampleTypeSpecUrl}", - "path": "/WithApiVersion", + "path": "/continuation", "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.WithApiVersion", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationToken", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "565", - "kind": "method", - "name": "p1", - "serializedName": "p1", - "type": { - "$id": "566", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.WithApiVersion.p1", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "739" + }, + { + "$ref": "742" } ], - "response": {}, + "response": { + "type": { + "$ref": "334" + }, + "resultSegments": [ + "things" + ] + }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.WithApiVersion" + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationToken", + "pagingMetadata": { + "itemPropertySegments": [ + "things" + ], + "continuationToken": { + "parameter": { + "$ref": "737" + }, + "responseSegments": [ + "nextToken" + ], + "responseLocation": "Body" + }, + "pageSizeParameterSegments": [] + } }, { - "$id": "567", + "$id": "743", "kind": "paging", - "name": "ListWithNextLink", + "name": "ListWithContinuationTokenHeaderResponse", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "List things with nextlink", + "doc": "List things with continuation token header response", "operation": { - "$id": "568", - "name": "ListWithNextLink", + "$id": "744", + "name": "ListWithContinuationTokenHeaderResponse", "resourceName": "SampleTypeSpec", - "doc": "List things with nextlink", + "doc": "List things with continuation token header response", "accessibility": "public", "parameters": [ { - "$id": "569", + "$id": "745", + "kind": "query", + "name": "token", + "serializedName": "token", + "type": { + "$id": "746", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "isApiVersion": false, + "explode": false, + "optional": true, + "scope": "Method", + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationTokenHeaderResponse.token", + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "747", + "kind": "method", + "name": "token", + "serializedName": "token", + "type": { + "$id": "748", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationTokenHeaderResponse.token", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "749", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "160" + "$ref": "168" }, "isApiVersion": false, "optional": false, @@ -7561,7 +10534,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithNextLink.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationTokenHeaderResponse.accept", + "methodParameterSegments": [ + { + "$id": "750", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "168" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationTokenHeaderResponse.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7570,9 +10562,21 @@ 200 ], "bodyType": { - "$ref": "286" + "$ref": "345" }, - "headers": [], + "headers": [ + { + "name": "nextToken", + "nameInResponse": "next-token", + "type": { + "$id": "751", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + } + } + ], "isErrorResponse": false, "contentTypes": [ "application/json" @@ -7581,36 +10585,25 @@ ], "httpMethod": "GET", "uri": "{sampleTypeSpecUrl}", - "path": "/link", + "path": "/continuation/header", "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithNextLink", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationTokenHeaderResponse", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "570", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "160" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithNextLink.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "747" + }, + { + "$ref": "750" } ], "response": { "type": { - "$ref": "288" + "$ref": "334" }, "resultSegments": [ "things" @@ -7619,44 +10612,47 @@ "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithNextLink", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationTokenHeaderResponse", "pagingMetadata": { "itemPropertySegments": [ "things" ], - "nextLink": { + "continuationToken": { + "parameter": { + "$ref": "745" + }, "responseSegments": [ - "next" + "next-token" ], - "responseLocation": "Body" + "responseLocation": "Header" }, "pageSizeParameterSegments": [] } }, { - "$id": "571", + "$id": "752", "kind": "paging", - "name": "ListWithStringNextLink", + "name": "ListWithPaging", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "List things with nextlink", + "doc": "List things with paging", "operation": { - "$id": "572", - "name": "ListWithStringNextLink", + "$id": "753", + "name": "ListWithPaging", "resourceName": "SampleTypeSpec", - "doc": "List things with nextlink", + "doc": "List things with paging", "accessibility": "public", "parameters": [ { - "$id": "573", + "$id": "754", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "162" + "$ref": "170" }, "isApiVersion": false, "optional": false, @@ -7664,7 +10660,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithStringNextLink.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithPaging.accept", + "methodParameterSegments": [ + { + "$id": "755", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "170" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithPaging.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7673,7 +10688,7 @@ 200 ], "bodyType": { - "$ref": "291" + "$ref": "347" }, "headers": [], "isErrorResponse": false, @@ -7684,82 +10699,209 @@ ], "httpMethod": "GET", "uri": "{sampleTypeSpecUrl}", - "path": "/linkString", + "path": "/list/paging", "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithStringNextLink", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithPaging", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "574", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "162" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithStringNextLink.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "755" } ], "response": { "type": { - "$ref": "288" + "$ref": "334" }, "resultSegments": [ - "things" + "items" ] }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithStringNextLink", + "crossLanguageDefinitionId": "SampleTypeSpec.ListWithPaging", "pagingMetadata": { "itemPropertySegments": [ - "things" + "items" ], - "nextLink": { - "responseSegments": [ - "next" - ], - "responseLocation": "Body" - }, "pageSizeParameterSegments": [] } }, { - "$id": "575", - "kind": "paging", - "name": "ListWithContinuationToken", + "$id": "756", + "kind": "basic", + "name": "EmbeddedParameters", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "List things with continuation token", + "doc": "An operation with embedded parameters within the body", "operation": { - "$id": "576", - "name": "ListWithContinuationToken", + "$id": "757", + "name": "EmbeddedParameters", "resourceName": "SampleTypeSpec", - "doc": "List things with continuation token", + "doc": "An operation with embedded parameters within the body", "accessibility": "public", "parameters": [ { - "$id": "577", + "$id": "758", + "kind": "header", + "name": "requiredHeader", + "serializedName": "required-header", + "doc": "required header parameter", + "type": { + "$id": "759", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Method", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.requiredHeader", + "methodParameterSegments": [ + { + "$id": "760", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "349" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.EmbeddedParameters.body", + "readOnly": false, + "access": "public", + "decorators": [] + }, + { + "$id": "761", + "kind": "method", + "name": "requiredHeader", + "serializedName": "requiredHeader", + "doc": "required header parameter", + "type": { + "$ref": "353" + }, + "location": "", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.requiredHeader", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "762", + "kind": "header", + "name": "optionalHeader", + "serializedName": "optional-header", + "doc": "optional header parameter", + "type": { + "$id": "763", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "isApiVersion": false, + "optional": true, + "isContentType": false, + "scope": "Method", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.optionalHeader", + "methodParameterSegments": [ + { + "$ref": "760" + }, + { + "$id": "764", + "kind": "method", + "name": "optionalHeader", + "serializedName": "optionalHeader", + "doc": "optional header parameter", + "type": { + "$ref": "355" + }, + "location": "", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.optionalHeader", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "765", "kind": "query", - "name": "token", - "serializedName": "token", + "name": "requiredQuery", + "serializedName": "requiredQuery", + "doc": "required query parameter", + "type": { + "$id": "766", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "isApiVersion": false, + "explode": false, + "optional": false, + "scope": "Method", + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.requiredQuery", + "readOnly": false, + "methodParameterSegments": [ + { + "$ref": "760" + }, + { + "$id": "767", + "kind": "method", + "name": "requiredQuery", + "serializedName": "requiredQuery", + "doc": "required query parameter", + "type": { + "$ref": "357" + }, + "location": "", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.requiredQuery", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "768", + "kind": "query", + "name": "optionalQuery", + "serializedName": "optionalQuery", + "doc": "optional query parameter", "type": { - "$id": "578", + "$id": "769", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -7770,302 +10912,283 @@ "optional": true, "scope": "Method", "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationToken.token", - "readOnly": false + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.optionalQuery", + "readOnly": false, + "methodParameterSegments": [ + { + "$ref": "760" + }, + { + "$id": "770", + "kind": "method", + "name": "optionalQuery", + "serializedName": "optionalQuery", + "doc": "optional query parameter", + "type": { + "$ref": "359" + }, + "location": "", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.optionalQuery", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "579", + "$id": "771", "kind": "header", - "name": "accept", - "serializedName": "Accept", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "164" + "$ref": "172" }, "isApiVersion": false, "optional": false, - "isContentType": false, + "isContentType": true, "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationToken.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.EmbeddedParameters.contentType", + "methodParameterSegments": [ + { + "$id": "772", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "172" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.EmbeddedParameters.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "773", + "kind": "body", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "349" + }, + "isApiVersion": false, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "SampleTypeSpec.EmbeddedParameters.body", + "methodParameterSegments": [ + { + "$ref": "760" + } + ] } ], "responses": [ { "statusCodes": [ - 200 + 204 ], - "bodyType": { - "$ref": "295" - }, "headers": [], - "isErrorResponse": false, - "contentTypes": [ - "application/json" - ] + "isErrorResponse": false } ], - "httpMethod": "GET", + "httpMethod": "POST", "uri": "{sampleTypeSpecUrl}", - "path": "/continuation", + "path": "/embeddedParameters", + "requestMediaTypes": [ + "application/json" + ], "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationToken", + "crossLanguageDefinitionId": "SampleTypeSpec.EmbeddedParameters", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "580", - "kind": "method", - "name": "token", - "serializedName": "token", - "type": { - "$id": "581", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationToken.token", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "760" }, { - "$id": "582", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "164" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationToken.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "772" } ], - "response": { - "type": { - "$ref": "288" - }, - "resultSegments": [ - "things" - ] - }, + "response": {}, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationToken", - "pagingMetadata": { - "itemPropertySegments": [ - "things" - ], - "continuationToken": { - "parameter": { - "$ref": "577" - }, - "responseSegments": [ - "nextToken" - ], - "responseLocation": "Body" - }, - "pageSizeParameterSegments": [] - } + "crossLanguageDefinitionId": "SampleTypeSpec.EmbeddedParameters" }, { - "$id": "583", - "kind": "paging", - "name": "ListWithContinuationTokenHeaderResponse", + "$id": "774", + "kind": "basic", + "name": "DynamicModelOperation", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "List things with continuation token header response", + "doc": "An operation with a dynamic model", "operation": { - "$id": "584", - "name": "ListWithContinuationTokenHeaderResponse", + "$id": "775", + "name": "DynamicModelOperation", "resourceName": "SampleTypeSpec", - "doc": "List things with continuation token header response", + "doc": "An operation with a dynamic model", "accessibility": "public", "parameters": [ { - "$id": "585", - "kind": "query", - "name": "token", - "serializedName": "token", + "$id": "776", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", "type": { - "$id": "586", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] + "$ref": "174" }, "isApiVersion": false, - "explode": false, - "optional": true, - "scope": "Method", + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationTokenHeaderResponse.token", - "readOnly": false + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModelOperation.contentType", + "methodParameterSegments": [ + { + "$id": "777", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "174" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModelOperation.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "587", - "kind": "header", - "name": "accept", - "serializedName": "Accept", + "$id": "778", + "kind": "body", + "name": "body", + "serializedName": "body", "type": { - "$ref": "166" + "$ref": "360" }, "isApiVersion": false, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", "optional": false, - "isContentType": false, - "scope": "Constant", - "readOnly": false, + "scope": "Method", "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationTokenHeaderResponse.accept" + "readOnly": false, + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModelOperation.body", + "methodParameterSegments": [ + { + "$id": "779", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "360" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModelOperation.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ { "statusCodes": [ - 200 - ], - "bodyType": { - "$ref": "299" - }, - "headers": [ - { - "name": "nextToken", - "nameInResponse": "next-token", - "type": { - "$id": "588", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - } - } + 204 ], - "isErrorResponse": false, - "contentTypes": [ - "application/json" - ] + "headers": [], + "isErrorResponse": false } ], - "httpMethod": "GET", + "httpMethod": "POST", "uri": "{sampleTypeSpecUrl}", - "path": "/continuation/header", + "path": "/dynamicModel", + "requestMediaTypes": [ + "application/json" + ], "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationTokenHeaderResponse", + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModelOperation", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "589", - "kind": "method", - "name": "token", - "serializedName": "token", - "type": { - "$id": "590", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationTokenHeaderResponse.token", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "779" }, { - "$id": "591", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "166" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationTokenHeaderResponse.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "777" } ], - "response": { - "type": { - "$ref": "288" - }, - "resultSegments": [ - "things" - ] - }, + "response": {}, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithContinuationTokenHeaderResponse", - "pagingMetadata": { - "itemPropertySegments": [ - "things" - ], - "continuationToken": { - "parameter": { - "$ref": "585" - }, - "responseSegments": [ - "next-token" - ], - "responseLocation": "Header" - }, - "pageSizeParameterSegments": [] - } + "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModelOperation" }, { - "$id": "592", - "kind": "paging", - "name": "ListWithPaging", + "$id": "780", + "kind": "basic", + "name": "GetXmlAdvancedModel", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "List things with paging", + "doc": "Get an advanced XML model with various property types", "operation": { - "$id": "593", - "name": "ListWithPaging", + "$id": "781", + "name": "GetXmlAdvancedModel", "resourceName": "SampleTypeSpec", - "doc": "List things with paging", + "doc": "Get an advanced XML model with various property types", "accessibility": "public", "parameters": [ { - "$id": "594", + "$id": "782", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "168" + "$ref": "176" }, "isApiVersion": false, "optional": false, @@ -8073,7 +11196,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithPaging.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.GetXmlAdvancedModel.accept", + "methodParameterSegments": [ + { + "$id": "783", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "176" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.GetXmlAdvancedModel.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8082,477 +11224,868 @@ 200 ], "bodyType": { - "$ref": "301" + "$ref": "398" }, - "headers": [], + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "178" + } + } + ], "isErrorResponse": false, "contentTypes": [ - "application/json" + "application/xml" ] } ], "httpMethod": "GET", "uri": "{sampleTypeSpecUrl}", - "path": "/list/paging", + "path": "/xmlAdvanced", "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithPaging", + "crossLanguageDefinitionId": "SampleTypeSpec.GetXmlAdvancedModel", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "595", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "168" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithPaging.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "783" } ], "response": { "type": { - "$ref": "288" - }, - "resultSegments": [ - "items" - ] + "$ref": "398" + } }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.ListWithPaging", - "pagingMetadata": { - "itemPropertySegments": [ - "items" - ], - "pageSizeParameterSegments": [] - } + "crossLanguageDefinitionId": "SampleTypeSpec.GetXmlAdvancedModel" }, { - "$id": "596", + "$id": "784", "kind": "basic", - "name": "EmbeddedParameters", + "name": "UpdateXmlAdvancedModel", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "An operation with embedded parameters within the body", + "doc": "Update an advanced XML model with various property types", "operation": { - "$id": "597", - "name": "EmbeddedParameters", + "$id": "785", + "name": "UpdateXmlAdvancedModel", "resourceName": "SampleTypeSpec", - "doc": "An operation with embedded parameters within the body", + "doc": "Update an advanced XML model with various property types", "accessibility": "public", "parameters": [ { - "$id": "598", + "$id": "786", "kind": "header", - "name": "requiredHeader", - "serializedName": "required-header", - "doc": "required header parameter", + "name": "contentType", + "serializedName": "Content-Type", "type": { - "$id": "599", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] + "$ref": "180" }, "isApiVersion": false, "optional": false, - "isContentType": false, - "scope": "Method", - "readOnly": false, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.requiredHeader" - }, - { - "$id": "600", - "kind": "header", - "name": "optionalHeader", - "serializedName": "optional-header", - "doc": "optional header parameter", - "type": { - "$id": "601", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "isApiVersion": false, - "optional": true, - "isContentType": false, - "scope": "Method", + "isContentType": true, + "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.optionalHeader" - }, - { - "$id": "602", - "kind": "query", - "name": "requiredQuery", - "serializedName": "requiredQuery", - "doc": "required query parameter", - "type": { - "$id": "603", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "isApiVersion": false, - "explode": false, - "optional": false, - "scope": "Method", - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.requiredQuery", - "readOnly": false - }, - { - "$id": "604", - "kind": "query", - "name": "optionalQuery", - "serializedName": "optionalQuery", - "doc": "optional query parameter", - "type": { - "$id": "605", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "isApiVersion": false, - "explode": false, - "optional": true, - "scope": "Method", - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.ModelWithEmbeddedNonBodyParameters.optionalQuery", - "readOnly": false + "crossLanguageDefinitionId": "SampleTypeSpec.UpdateXmlAdvancedModel.contentType", + "methodParameterSegments": [ + { + "$id": "787", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "180" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.UpdateXmlAdvancedModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "606", + "$id": "788", "kind": "header", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", + "name": "accept", + "serializedName": "Accept", "type": { - "$ref": "170" + "$ref": "184" }, "isApiVersion": false, "optional": false, - "isContentType": true, + "isContentType": false, "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.EmbeddedParameters.contentType" + "crossLanguageDefinitionId": "SampleTypeSpec.UpdateXmlAdvancedModel.accept", + "methodParameterSegments": [ + { + "$id": "789", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "184" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.UpdateXmlAdvancedModel.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "607", + "$id": "790", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "303" + "$ref": "398" }, "isApiVersion": false, "contentTypes": [ - "application/json" + "application/xml" ], - "defaultContentType": "application/json", + "defaultContentType": "application/xml", "optional": false, "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.EmbeddedParameters.body" + "crossLanguageDefinitionId": "SampleTypeSpec.UpdateXmlAdvancedModel.body", + "methodParameterSegments": [ + { + "$id": "791", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "398" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.UpdateXmlAdvancedModel.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ { "statusCodes": [ - 204 + 200 ], - "headers": [], - "isErrorResponse": false + "bodyType": { + "$ref": "398" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "186" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] } ], - "httpMethod": "POST", + "httpMethod": "PUT", "uri": "{sampleTypeSpecUrl}", - "path": "/embeddedParameters", + "path": "/xmlAdvanced", "requestMediaTypes": [ - "application/json" + "application/xml" ], "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.EmbeddedParameters", + "crossLanguageDefinitionId": "SampleTypeSpec.UpdateXmlAdvancedModel", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "608", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "303" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.EmbeddedParameters.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "791" }, { - "$id": "609", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "170" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.EmbeddedParameters.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "787" + }, + { + "$ref": "789" } ], - "response": {}, + "response": { + "type": { + "$ref": "398" + } + }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.EmbeddedParameters" + "crossLanguageDefinitionId": "SampleTypeSpec.UpdateXmlAdvancedModel" + } + ], + "parameters": [ + { + "$id": "792", + "kind": "endpoint", + "name": "sampleTypeSpecUrl", + "serializedName": "sampleTypeSpecUrl", + "type": { + "$id": "793", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "serverUrlTemplate": "{sampleTypeSpecUrl}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "SampleTypeSpec.sampleTypeSpecUrl" }, { - "$id": "610", - "kind": "basic", - "name": "DynamicModelOperation", - "accessibility": "public", - "apiVersions": [ - "2024-07-16-preview", - "2024-08-16-preview" - ], - "doc": "An operation with a dynamic model", - "operation": { - "$id": "611", - "name": "DynamicModelOperation", - "resourceName": "SampleTypeSpec", - "doc": "An operation with a dynamic model", - "accessibility": "public", - "parameters": [ - { - "$id": "612", - "kind": "header", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "172" - }, - "isApiVersion": false, - "optional": false, - "isContentType": true, - "scope": "Constant", - "readOnly": false, + "$ref": "724" + } + ], + "initializedBy": 1, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec", + "apiVersions": [ + "2024-07-16-preview", + "2024-08-16-preview" + ], + "children": [ + { + "$id": "794", + "kind": "client", + "name": "AnimalOperations", + "namespace": "SampleTypeSpec", + "methods": [ + { + "$id": "795", + "kind": "basic", + "name": "updatePetAsAnimal", + "accessibility": "public", + "apiVersions": [ + "2024-07-16-preview", + "2024-08-16-preview" + ], + "doc": "Update a pet as an animal", + "operation": { + "$id": "796", + "name": "updatePetAsAnimal", + "resourceName": "AnimalOperations", + "doc": "Update a pet as an animal", + "accessibility": "public", + "parameters": [ + { + "$id": "797", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "188" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updatePetAsAnimal.contentType", + "methodParameterSegments": [ + { + "$id": "798", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "188" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updatePetAsAnimal.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "799", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "190" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updatePetAsAnimal.accept", + "methodParameterSegments": [ + { + "$id": "800", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "190" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updatePetAsAnimal.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "801", + "kind": "body", + "name": "animal", + "serializedName": "animal", + "type": { + "$ref": "494" + }, + "isApiVersion": false, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updatePetAsAnimal.animal", + "methodParameterSegments": [ + { + "$id": "802", + "kind": "method", + "name": "animal", + "serializedName": "animal", + "type": { + "$ref": "494" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updatePetAsAnimal.animal", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "494" + }, + "headers": [], + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] + } + ], + "httpMethod": "PUT", + "uri": "{sampleTypeSpecUrl}", + "path": "/animals/pet/as-animal", + "requestMediaTypes": [ + "application/json" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updatePetAsAnimal", "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModelOperation.contentType" + "namespace": "SampleTypeSpec" }, - { - "$id": "613", - "kind": "body", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "314" + "parameters": [ + { + "$ref": "802" }, - "isApiVersion": false, - "contentTypes": [ + { + "$ref": "798" + }, + { + "$ref": "800" + } + ], + "response": { + "type": { + "$ref": "494" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updatePetAsAnimal" + }, + { + "$id": "803", + "kind": "basic", + "name": "updateDogAsAnimal", + "accessibility": "public", + "apiVersions": [ + "2024-07-16-preview", + "2024-08-16-preview" + ], + "doc": "Update a dog as an animal", + "operation": { + "$id": "804", + "name": "updateDogAsAnimal", + "resourceName": "AnimalOperations", + "doc": "Update a dog as an animal", + "accessibility": "public", + "parameters": [ + { + "$id": "805", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "192" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updateDogAsAnimal.contentType", + "methodParameterSegments": [ + { + "$id": "806", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "192" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updateDogAsAnimal.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "807", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "194" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updateDogAsAnimal.accept", + "methodParameterSegments": [ + { + "$id": "808", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "194" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updateDogAsAnimal.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "809", + "kind": "body", + "name": "animal", + "serializedName": "animal", + "type": { + "$ref": "494" + }, + "isApiVersion": false, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updateDogAsAnimal.animal", + "methodParameterSegments": [ + { + "$id": "810", + "kind": "method", + "name": "animal", + "serializedName": "animal", + "type": { + "$ref": "494" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updateDogAsAnimal.animal", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "494" + }, + "headers": [], + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] + } + ], + "httpMethod": "PUT", + "uri": "{sampleTypeSpecUrl}", + "path": "/animals/dog/as-animal", + "requestMediaTypes": [ "application/json" ], - "defaultContentType": "application/json", - "optional": false, - "scope": "Method", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updateDogAsAnimal", "decorators": [], - "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModelOperation.body" - } - ], - "responses": [ - { - "statusCodes": [ - 204 - ], - "headers": [], - "isErrorResponse": false - } - ], - "httpMethod": "POST", - "uri": "{sampleTypeSpecUrl}", - "path": "/dynamicModel", - "requestMediaTypes": [ - "application/json" - ], - "bufferResponse": true, - "generateProtocolMethod": true, - "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModelOperation", - "decorators": [], - "namespace": "SampleTypeSpec" - }, - "parameters": [ - { - "$id": "614", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "314" + "namespace": "SampleTypeSpec" }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModelOperation.body", - "readOnly": false, - "access": "public", - "decorators": [] - }, + "parameters": [ + { + "$ref": "810" + }, + { + "$ref": "806" + }, + { + "$ref": "808" + } + ], + "response": { + "type": { + "$ref": "494" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updateDogAsAnimal" + } + ], + "parameters": [ { - "$id": "615", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", + "$id": "811", + "kind": "endpoint", + "name": "sampleTypeSpecUrl", + "serializedName": "sampleTypeSpecUrl", "type": { - "$ref": "172" + "$id": "812", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" }, - "location": "Header", "isApiVersion": false, "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModelOperation.contentType", + "scope": "Client", + "isEndpoint": true, + "serverUrlTemplate": "{sampleTypeSpecUrl}", + "skipUrlEncoding": false, "readOnly": false, - "access": "public", - "decorators": [] + "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.sampleTypeSpecUrl" } ], - "response": {}, - "isOverride": false, - "generateConvenient": true, - "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.DynamicModelOperation" - } - ], - "parameters": [ - { - "$id": "616", - "kind": "endpoint", - "name": "sampleTypeSpecUrl", - "serializedName": "sampleTypeSpecUrl", - "type": { - "$id": "617", - "kind": "url", - "name": "endpoint", - "crossLanguageDefinitionId": "TypeSpec.url" + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations", + "apiVersions": [ + "2024-07-16-preview", + "2024-08-16-preview" + ], + "parent": { + "$ref": "528" }, - "isApiVersion": false, - "optional": false, - "scope": "Client", - "isEndpoint": true, - "serverUrlTemplate": "{sampleTypeSpecUrl}", - "skipUrlEncoding": false, - "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.sampleTypeSpecUrl" + "isMultiServiceClient": false }, { - "$id": "618", - "kind": "method", - "name": "apiVersion", - "serializedName": "apiVersion", - "type": { - "$id": "619", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "", - "isApiVersion": true, - "defaultValue": { - "type": { - "$id": "620", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string" - }, - "value": "2024-08-16-preview" - }, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.WithApiVersion.apiVersion", - "readOnly": false, - "access": "public", - "decorators": [] - } - ], - "initializedBy": 1, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec", - "apiVersions": [ - "2024-07-16-preview", - "2024-08-16-preview" - ], - "children": [ - { - "$id": "621", + "$id": "813", "kind": "client", - "name": "AnimalOperations", + "name": "PetOperations", "namespace": "SampleTypeSpec", "methods": [ { - "$id": "622", + "$id": "814", + "kind": "basic", + "name": "updatePetAsPet", + "accessibility": "public", + "apiVersions": [ + "2024-07-16-preview", + "2024-08-16-preview" + ], + "doc": "Update a pet as a pet", + "operation": { + "$id": "815", + "name": "updatePetAsPet", + "resourceName": "PetOperations", + "doc": "Update a pet as a pet", + "accessibility": "public", + "parameters": [ + { + "$id": "816", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "196" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updatePetAsPet.contentType", + "methodParameterSegments": [ + { + "$id": "817", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "196" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updatePetAsPet.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "818", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "198" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updatePetAsPet.accept", + "methodParameterSegments": [ + { + "$id": "819", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "198" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updatePetAsPet.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "820", + "kind": "body", + "name": "pet", + "serializedName": "pet", + "type": { + "$ref": "499" + }, + "isApiVersion": false, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updatePetAsPet.pet", + "methodParameterSegments": [ + { + "$id": "821", + "kind": "method", + "name": "pet", + "serializedName": "pet", + "type": { + "$ref": "499" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updatePetAsPet.pet", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "499" + }, + "headers": [], + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] + } + ], + "httpMethod": "PUT", + "uri": "{sampleTypeSpecUrl}", + "path": "/pets/pet/as-pet", + "requestMediaTypes": [ + "application/json" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updatePetAsPet", + "decorators": [], + "namespace": "SampleTypeSpec" + }, + "parameters": [ + { + "$ref": "821" + }, + { + "$ref": "817" + }, + { + "$ref": "819" + } + ], + "response": { + "type": { + "$ref": "499" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updatePetAsPet" + }, + { + "$id": "822", "kind": "basic", - "name": "updatePetAsAnimal", + "name": "updateDogAsPet", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "Update a pet as an animal", + "doc": "Update a dog as a pet", "operation": { - "$id": "623", - "name": "updatePetAsAnimal", - "resourceName": "AnimalOperations", - "doc": "Update a pet as an animal", + "$id": "823", + "name": "updateDogAsPet", + "resourceName": "PetOperations", + "doc": "Update a dog as a pet", "accessibility": "public", "parameters": [ { - "$id": "624", + "$id": "824", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "174" + "$ref": "200" }, "isApiVersion": false, "optional": false, @@ -8560,15 +12093,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updatePetAsAnimal.contentType" + "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updateDogAsPet.contentType", + "methodParameterSegments": [ + { + "$id": "825", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "200" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updateDogAsPet.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "625", + "$id": "826", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "176" + "$ref": "202" }, "isApiVersion": false, "optional": false, @@ -8576,15 +12129,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updatePetAsAnimal.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updateDogAsPet.accept", + "methodParameterSegments": [ + { + "$id": "827", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "202" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updateDogAsPet.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "626", + "$id": "828", "kind": "body", - "name": "animal", - "serializedName": "animal", + "name": "pet", + "serializedName": "pet", "type": { - "$ref": "352" + "$ref": "499" }, "isApiVersion": false, "contentTypes": [ @@ -8595,7 +12167,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updatePetAsAnimal.animal" + "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updateDogAsPet.pet", + "methodParameterSegments": [ + { + "$id": "829", + "kind": "method", + "name": "pet", + "serializedName": "pet", + "type": { + "$ref": "499" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updateDogAsPet.pet", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8604,7 +12195,7 @@ 200 ], "bodyType": { - "$ref": "352" + "$ref": "499" }, "headers": [], "isErrorResponse": false, @@ -8615,106 +12206,104 @@ ], "httpMethod": "PUT", "uri": "{sampleTypeSpecUrl}", - "path": "/animals/pet/as-animal", + "path": "/pets/dog/as-pet", "requestMediaTypes": [ "application/json" ], "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updatePetAsAnimal", + "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updateDogAsPet", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "627", - "kind": "method", - "name": "animal", - "serializedName": "animal", - "type": { - "$ref": "352" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updatePetAsAnimal.animal", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "829" }, { - "$id": "628", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "174" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updatePetAsAnimal.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "825" }, { - "$id": "629", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "176" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updatePetAsAnimal.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "827" } ], "response": { "type": { - "$ref": "352" + "$ref": "499" } }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updatePetAsAnimal" - }, + "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updateDogAsPet" + } + ], + "parameters": [ + { + "$id": "830", + "kind": "endpoint", + "name": "sampleTypeSpecUrl", + "serializedName": "sampleTypeSpecUrl", + "type": { + "$id": "831", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "serverUrlTemplate": "{sampleTypeSpecUrl}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.sampleTypeSpecUrl" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations", + "apiVersions": [ + "2024-07-16-preview", + "2024-08-16-preview" + ], + "parent": { + "$ref": "528" + }, + "isMultiServiceClient": false + }, + { + "$id": "832", + "kind": "client", + "name": "DogOperations", + "namespace": "SampleTypeSpec", + "methods": [ { - "$id": "630", + "$id": "833", "kind": "basic", - "name": "updateDogAsAnimal", + "name": "updateDogAsDog", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "Update a dog as an animal", + "doc": "Update a dog as a dog", "operation": { - "$id": "631", - "name": "updateDogAsAnimal", - "resourceName": "AnimalOperations", - "doc": "Update a dog as an animal", + "$id": "834", + "name": "updateDogAsDog", + "resourceName": "DogOperations", + "doc": "Update a dog as a dog", "accessibility": "public", "parameters": [ { - "$id": "632", + "$id": "835", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "178" + "$ref": "204" }, "isApiVersion": false, "optional": false, @@ -8722,15 +12311,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updateDogAsAnimal.contentType" + "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations.updateDogAsDog.contentType", + "methodParameterSegments": [ + { + "$id": "836", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "204" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations.updateDogAsDog.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "633", + "$id": "837", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "180" + "$ref": "206" }, "isApiVersion": false, "optional": false, @@ -8738,15 +12347,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updateDogAsAnimal.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations.updateDogAsDog.accept", + "methodParameterSegments": [ + { + "$id": "838", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "206" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations.updateDogAsDog.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "634", + "$id": "839", "kind": "body", - "name": "animal", - "serializedName": "animal", + "name": "dog", + "serializedName": "dog", "type": { - "$ref": "352" + "$ref": "503" }, "isApiVersion": false, "contentTypes": [ @@ -8757,7 +12385,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updateDogAsAnimal.animal" + "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations.updateDogAsDog.dog", + "methodParameterSegments": [ + { + "$id": "840", + "kind": "method", + "name": "dog", + "serializedName": "dog", + "type": { + "$ref": "503" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations.updateDogAsDog.dog", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8766,7 +12413,7 @@ 200 ], "bodyType": { - "$ref": "352" + "$ref": "503" }, "headers": [], "isErrorResponse": false, @@ -8777,147 +12424,305 @@ ], "httpMethod": "PUT", "uri": "{sampleTypeSpecUrl}", - "path": "/animals/dog/as-animal", + "path": "/dogs/dog/as-dog", "requestMediaTypes": [ "application/json" ], "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updateDogAsAnimal", + "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations.updateDogAsDog", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "635", - "kind": "method", - "name": "animal", - "serializedName": "animal", - "type": { - "$ref": "352" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updateDogAsAnimal.animal", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "840" }, { - "$id": "636", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "178" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updateDogAsAnimal.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "836" }, { - "$id": "637", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "180" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updateDogAsAnimal.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "838" } ], "response": { "type": { - "$ref": "352" + "$ref": "503" } }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.updateDogAsAnimal" + "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations.updateDogAsDog" } ], "parameters": [ { - "$id": "638", + "$id": "841", "kind": "endpoint", "name": "sampleTypeSpecUrl", "serializedName": "sampleTypeSpecUrl", "type": { - "$id": "639", + "$id": "842", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" }, - "isApiVersion": false, - "optional": false, - "scope": "Client", - "isEndpoint": true, - "serverUrlTemplate": "{sampleTypeSpecUrl}", - "skipUrlEncoding": false, - "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations.sampleTypeSpecUrl" - } - ], - "initializedBy": 0, - "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.AnimalOperations", - "apiVersions": [ - "2024-07-16-preview", - "2024-08-16-preview" - ], - "parent": { - "$ref": "370" - }, - "isMultiServiceClient": false - }, - { - "$id": "640", - "kind": "client", - "name": "PetOperations", - "namespace": "SampleTypeSpec", - "methods": [ + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "serverUrlTemplate": "{sampleTypeSpecUrl}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations.sampleTypeSpecUrl" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations", + "apiVersions": [ + "2024-07-16-preview", + "2024-08-16-preview" + ], + "parent": { + "$ref": "528" + }, + "isMultiServiceClient": false + }, + { + "$id": "843", + "kind": "client", + "name": "PlantOperations", + "namespace": "SampleTypeSpec", + "methods": [ + { + "$id": "844", + "kind": "basic", + "name": "getTree", + "accessibility": "public", + "apiVersions": [ + "2024-07-16-preview", + "2024-08-16-preview" + ], + "doc": "Get a tree as a plant", + "operation": { + "$id": "845", + "name": "getTree", + "resourceName": "PlantOperations", + "doc": "Get a tree as a plant", + "accessibility": "public", + "parameters": [ + { + "$id": "846", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "208" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.getTree.accept", + "methodParameterSegments": [ + { + "$id": "847", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "208" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.getTree.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "507" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "210" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{sampleTypeSpecUrl}", + "path": "/plants/tree/as-plant", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.getTree", + "decorators": [], + "namespace": "SampleTypeSpec" + }, + "parameters": [ + { + "$ref": "847" + } + ], + "response": { + "type": { + "$ref": "507" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.getTree" + }, + { + "$id": "848", + "kind": "basic", + "name": "getTreeAsJson", + "accessibility": "public", + "apiVersions": [ + "2024-07-16-preview", + "2024-08-16-preview" + ], + "doc": "Get a tree as a plant", + "operation": { + "$id": "849", + "name": "getTreeAsJson", + "resourceName": "PlantOperations", + "doc": "Get a tree as a plant", + "accessibility": "public", + "parameters": [ + { + "$id": "850", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "212" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.getTreeAsJson.accept", + "methodParameterSegments": [ + { + "$id": "851", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "212" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.getTreeAsJson.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "507" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "214" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] + } + ], + "httpMethod": "GET", + "uri": "{sampleTypeSpecUrl}", + "path": "/plants/tree/as-plant/json", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.getTreeAsJson", + "decorators": [], + "namespace": "SampleTypeSpec" + }, + "parameters": [ + { + "$ref": "851" + } + ], + "response": { + "type": { + "$ref": "507" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.getTreeAsJson" + }, { - "$id": "641", + "$id": "852", "kind": "basic", - "name": "updatePetAsPet", + "name": "updateTree", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "Update a pet as a pet", + "doc": "Update a tree as a plant", "operation": { - "$id": "642", - "name": "updatePetAsPet", - "resourceName": "PetOperations", - "doc": "Update a pet as a pet", + "$id": "853", + "name": "updateTree", + "resourceName": "PlantOperations", + "doc": "Update a tree as a plant", "accessibility": "public", "parameters": [ { - "$id": "643", + "$id": "854", "kind": "header", "name": "contentType", "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "182" + "$ref": "216" }, "isApiVersion": false, "optional": false, @@ -8925,15 +12730,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updatePetAsPet.contentType" + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.updateTree.contentType", + "methodParameterSegments": [ + { + "$id": "855", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "216" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.updateTree.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "644", + "$id": "856", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "184" + "$ref": "220" }, "isApiVersion": false, "optional": false, @@ -8941,26 +12765,64 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updatePetAsPet.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.updateTree.accept", + "methodParameterSegments": [ + { + "$id": "857", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "220" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.updateTree.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "645", + "$id": "858", "kind": "body", - "name": "pet", - "serializedName": "pet", + "name": "tree", + "serializedName": "tree", "type": { - "$ref": "357" + "$ref": "507" }, "isApiVersion": false, "contentTypes": [ - "application/json" + "application/xml" ], - "defaultContentType": "application/json", + "defaultContentType": "application/xml", "optional": false, "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updatePetAsPet.pet" + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.updateTree.tree", + "methodParameterSegments": [ + { + "$id": "859", + "kind": "method", + "name": "tree", + "serializedName": "tree", + "type": { + "$ref": "507" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.updateTree.tree", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8969,117 +12831,81 @@ 200 ], "bodyType": { - "$ref": "357" + "$ref": "507" }, - "headers": [], + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "222" + } + } + ], "isErrorResponse": false, "contentTypes": [ - "application/json" + "application/xml" ] } ], "httpMethod": "PUT", "uri": "{sampleTypeSpecUrl}", - "path": "/pets/pet/as-pet", + "path": "/plants/tree/as-plant", "requestMediaTypes": [ - "application/json" + "application/xml" ], "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updatePetAsPet", + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.updateTree", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "646", - "kind": "method", - "name": "pet", - "serializedName": "pet", - "type": { - "$ref": "357" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updatePetAsPet.pet", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "859" }, { - "$id": "647", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "182" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updatePetAsPet.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "855" }, { - "$id": "648", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "184" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updatePetAsPet.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "857" } ], "response": { "type": { - "$ref": "357" + "$ref": "507" } }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updatePetAsPet" + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.updateTree" }, { - "$id": "649", + "$id": "860", "kind": "basic", - "name": "updateDogAsPet", + "name": "updateTreeAsJson", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "Update a dog as a pet", + "doc": "Update a tree as a plant", "operation": { - "$id": "650", - "name": "updateDogAsPet", - "resourceName": "PetOperations", - "doc": "Update a dog as a pet", + "$id": "861", + "name": "updateTreeAsJson", + "resourceName": "PlantOperations", + "doc": "Update a tree as a plant", "accessibility": "public", "parameters": [ { - "$id": "651", + "$id": "862", "kind": "header", "name": "contentType", "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "186" + "$ref": "224" }, "isApiVersion": false, "optional": false, @@ -9087,15 +12913,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updateDogAsPet.contentType" + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.updateTreeAsJson.contentType", + "methodParameterSegments": [ + { + "$id": "863", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "224" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.updateTreeAsJson.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "652", + "$id": "864", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "188" + "$ref": "228" }, "isApiVersion": false, "optional": false, @@ -9103,15 +12948,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updateDogAsPet.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.updateTreeAsJson.accept", + "methodParameterSegments": [ + { + "$id": "865", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "228" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.updateTreeAsJson.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "653", + "$id": "866", "kind": "body", - "name": "pet", - "serializedName": "pet", + "name": "tree", + "serializedName": "tree", "type": { - "$ref": "357" + "$ref": "507" }, "isApiVersion": false, "contentTypes": [ @@ -9122,7 +12986,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updateDogAsPet.pet" + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.updateTreeAsJson.tree", + "methodParameterSegments": [ + { + "$id": "867", + "kind": "method", + "name": "tree", + "serializedName": "tree", + "type": { + "$ref": "507" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.updateTreeAsJson.tree", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9131,9 +13014,17 @@ 200 ], "bodyType": { - "$ref": "357" + "$ref": "507" }, - "headers": [], + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "230" + } + } + ], "isErrorResponse": false, "contentTypes": [ "application/json" @@ -9142,90 +13033,47 @@ ], "httpMethod": "PUT", "uri": "{sampleTypeSpecUrl}", - "path": "/pets/dog/as-pet", + "path": "/plants/tree/as-plant/json", "requestMediaTypes": [ "application/json" ], "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updateDogAsPet", + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.updateTreeAsJson", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "654", - "kind": "method", - "name": "pet", - "serializedName": "pet", - "type": { - "$ref": "357" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updateDogAsPet.pet", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "867" }, { - "$id": "655", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "186" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updateDogAsPet.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "863" }, { - "$id": "656", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "188" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updateDogAsPet.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "865" } ], "response": { "type": { - "$ref": "357" + "$ref": "507" } }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.updateDogAsPet" + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.updateTreeAsJson" } ], "parameters": [ { - "$id": "657", + "$id": "868", "kind": "endpoint", "name": "sampleTypeSpecUrl", "serializedName": "sampleTypeSpecUrl", "type": { - "$id": "658", + "$id": "869", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -9237,95 +13085,162 @@ "serverUrlTemplate": "{sampleTypeSpecUrl}", "skipUrlEncoding": false, "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations.sampleTypeSpecUrl" + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations.sampleTypeSpecUrl" } ], "initializedBy": 0, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.PetOperations", + "crossLanguageDefinitionId": "SampleTypeSpec.PlantOperations", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], "parent": { - "$ref": "370" + "$ref": "528" }, "isMultiServiceClient": false }, { - "$id": "659", + "$id": "870", "kind": "client", - "name": "DogOperations", + "name": "Metrics", "namespace": "SampleTypeSpec", "methods": [ { - "$id": "660", + "$id": "871", "kind": "basic", - "name": "updateDogAsDog", + "name": "getWidgetMetrics", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "Update a dog as a dog", + "doc": "Get Widget metrics for given day of week", "operation": { - "$id": "661", - "name": "updateDogAsDog", - "resourceName": "DogOperations", - "doc": "Update a dog as a dog", + "$id": "872", + "name": "getWidgetMetrics", + "resourceName": "Metrics", + "doc": "Get Widget metrics for given day of week", "accessibility": "public", "parameters": [ { - "$id": "662", - "kind": "header", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", + "$id": "873", + "kind": "path", + "name": "metricsNamespace", + "serializedName": "metricsNamespace", "type": { - "$ref": "190" + "$id": "874", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, "isApiVersion": false, + "explode": false, + "style": "simple", + "allowReserved": false, + "skipUrlEncoding": false, "optional": false, - "isContentType": true, - "scope": "Constant", - "readOnly": false, + "scope": "Client", "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations.updateDogAsDog.contentType" + "readOnly": false, + "crossLanguageDefinitionId": "SampleTypeSpec.Metrics.getWidgetMetrics.metricsNamespace", + "methodParameterSegments": [ + { + "$id": "875", + "kind": "method", + "name": "metricsNamespace", + "serializedName": "metricsNamespace", + "type": { + "$id": "876", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.MetricsClientParams.metricsNamespace", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "663", - "kind": "header", - "name": "accept", - "serializedName": "Accept", + "$id": "877", + "kind": "path", + "name": "day", + "serializedName": "day", "type": { - "$ref": "192" + "$ref": "57" }, "isApiVersion": false, + "explode": false, + "style": "simple", + "allowReserved": false, + "skipUrlEncoding": false, "optional": false, - "isContentType": false, - "scope": "Constant", - "readOnly": false, + "scope": "Method", "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations.updateDogAsDog.accept" + "readOnly": false, + "crossLanguageDefinitionId": "SampleTypeSpec.Metrics.getWidgetMetrics.day", + "methodParameterSegments": [ + { + "$id": "878", + "kind": "method", + "name": "day", + "serializedName": "day", + "type": { + "$ref": "57" + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.Metrics.getWidgetMetrics.day", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "664", - "kind": "body", - "name": "dog", - "serializedName": "dog", + "$id": "879", + "kind": "header", + "name": "accept", + "serializedName": "Accept", "type": { - "$ref": "361" + "$ref": "232" }, "isApiVersion": false, - "contentTypes": [ - "application/json" - ], - "defaultContentType": "application/json", "optional": false, - "scope": "Method", - "decorators": [], + "isContentType": false, + "scope": "Constant", "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations.updateDogAsDog.dog" + "decorators": [], + "crossLanguageDefinitionId": "SampleTypeSpec.Metrics.getWidgetMetrics.accept", + "methodParameterSegments": [ + { + "$id": "880", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "232" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.Metrics.getWidgetMetrics.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9334,7 +13249,7 @@ 200 ], "bodyType": { - "$ref": "361" + "$ref": "518" }, "headers": [], "isErrorResponse": false, @@ -9343,92 +13258,43 @@ ] } ], - "httpMethod": "PUT", + "httpMethod": "GET", "uri": "{sampleTypeSpecUrl}", - "path": "/dogs/dog/as-dog", - "requestMediaTypes": [ - "application/json" - ], + "path": "/metrics/{metricsNamespace}/widgets/daysOfWeek/{day}", "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations.updateDogAsDog", + "crossLanguageDefinitionId": "SampleTypeSpec.Metrics.getWidgetMetrics", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "665", - "kind": "method", - "name": "dog", - "serializedName": "dog", - "type": { - "$ref": "361" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations.updateDogAsDog.dog", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "666", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "190" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations.updateDogAsDog.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "878" }, { - "$id": "667", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "192" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations.updateDogAsDog.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "880" } ], "response": { "type": { - "$ref": "361" + "$ref": "518" } }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations.updateDogAsDog" + "crossLanguageDefinitionId": "SampleTypeSpec.Metrics.getWidgetMetrics" } ], "parameters": [ { - "$id": "668", + "$id": "881", "kind": "endpoint", "name": "sampleTypeSpecUrl", "serializedName": "sampleTypeSpecUrl", "type": { - "$id": "669", + "$id": "882", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -9440,51 +13306,58 @@ "serverUrlTemplate": "{sampleTypeSpecUrl}", "skipUrlEncoding": false, "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations.sampleTypeSpecUrl" + "crossLanguageDefinitionId": "SampleTypeSpec.Metrics.sampleTypeSpecUrl" + }, + { + "$ref": "875" } ], - "initializedBy": 0, + "initializedBy": 3, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.DogOperations", + "crossLanguageDefinitionId": "SampleTypeSpec.Metrics", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], "parent": { - "$ref": "370" + "$ref": "528" }, "isMultiServiceClient": false }, { - "$id": "670", + "$id": "883", "kind": "client", - "name": "Metrics", + "name": "Notebooks", "namespace": "SampleTypeSpec", "methods": [ { - "$id": "671", + "$id": "884", "kind": "basic", - "name": "getWidgetMetrics", + "name": "getNotebook", "accessibility": "public", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], - "doc": "Get Widget metrics for given day of week", + "doc": "Get a notebook by name", "operation": { - "$id": "672", - "name": "getWidgetMetrics", - "resourceName": "Metrics", - "doc": "Get Widget metrics for given day of week", + "$id": "885", + "name": "getNotebook", + "resourceName": "Notebooks", + "doc": "Get a notebook by name", "accessibility": "public", "parameters": [ { - "$id": "673", + "$id": "886", "kind": "path", - "name": "day", - "serializedName": "day", + "name": "notebookName", + "serializedName": "notebookName", "type": { - "$ref": "57" + "$id": "887", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, "isApiVersion": false, "explode": false, @@ -9492,18 +13365,42 @@ "allowReserved": false, "skipUrlEncoding": false, "optional": false, - "scope": "Method", + "scope": "Client", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.Metrics.getWidgetMetrics.day" + "crossLanguageDefinitionId": "SampleTypeSpec.Notebooks.getNotebook.notebookName", + "methodParameterSegments": [ + { + "$id": "888", + "kind": "method", + "name": "notebook", + "serializedName": "notebook", + "type": { + "$id": "889", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SampleTypeSpec.NotebookClientParams.notebook", + "readOnly": false, + "access": "public", + "decorators": [], + "paramAlias": "notebookName" + } + ] }, { - "$id": "674", + "$id": "890", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "194" + "$ref": "234" }, "isApiVersion": false, "optional": false, @@ -9511,7 +13408,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Metrics.getWidgetMetrics.accept" + "crossLanguageDefinitionId": "SampleTypeSpec.Notebooks.getNotebook.accept", + "methodParameterSegments": [ + { + "$id": "891", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "234" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SampleTypeSpec.Notebooks.getNotebook.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9520,7 +13436,7 @@ 200 ], "bodyType": { - "$ref": "365" + "$ref": "523" }, "headers": [], "isErrorResponse": false, @@ -9531,69 +13447,38 @@ ], "httpMethod": "GET", "uri": "{sampleTypeSpecUrl}", - "path": "/metrics/widgets/daysOfWeek/{day}", + "path": "/notebooks/{notebookName}", "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SampleTypeSpec.Metrics.getWidgetMetrics", + "crossLanguageDefinitionId": "SampleTypeSpec.Notebooks.getNotebook", "decorators": [], "namespace": "SampleTypeSpec" }, "parameters": [ { - "$id": "675", - "kind": "method", - "name": "day", - "serializedName": "day", - "type": { - "$ref": "57" - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SampleTypeSpec.Metrics.getWidgetMetrics.day", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "676", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "194" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SampleTypeSpec.Metrics.getWidgetMetrics.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "891" } ], "response": { "type": { - "$ref": "365" + "$ref": "523" } }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SampleTypeSpec.Metrics.getWidgetMetrics" + "crossLanguageDefinitionId": "SampleTypeSpec.Notebooks.getNotebook" } ], "parameters": [ { - "$id": "677", + "$id": "892", "kind": "endpoint", "name": "sampleTypeSpecUrl", "serializedName": "sampleTypeSpecUrl", "type": { - "$id": "678", + "$id": "893", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -9605,18 +13490,21 @@ "serverUrlTemplate": "{sampleTypeSpecUrl}", "skipUrlEncoding": false, "readOnly": false, - "crossLanguageDefinitionId": "SampleTypeSpec.Metrics.sampleTypeSpecUrl" + "crossLanguageDefinitionId": "SampleTypeSpec.Notebooks.sampleTypeSpecUrl" + }, + { + "$ref": "888" } ], "initializedBy": 3, "decorators": [], - "crossLanguageDefinitionId": "SampleTypeSpec.Metrics", + "crossLanguageDefinitionId": "SampleTypeSpec.Notebooks", "apiVersions": [ "2024-07-16-preview", "2024-08-16-preview" ], "parent": { - "$ref": "370" + "$ref": "528" }, "isMultiServiceClient": false } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Authentication/OAuth2/OAuth2Tests.cs b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Authentication/OAuth2/OAuth2Tests.cs index dc6e99bee90..f40e866724e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Authentication/OAuth2/OAuth2Tests.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Authentication/OAuth2/OAuth2Tests.cs @@ -22,12 +22,12 @@ public Task Valid() => Test(async (host) => // create a test client to access the private field "_flows". This will be used to pass to the test token provider. var tokenProvider = new ClientCredentialTokenProvider("myClientId", "myClientSecret"); var testClient = new OAuth2Client(tokenProvider); - var flowsField = testClient.GetType().GetField("_flows", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance); + var flowsField = testClient.GetType().GetField("_flows", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static); Assert.IsNotNull(flowsField, "Flows field should not be null"); - Assert.IsInstanceOf[]>(flowsField!.GetValue(testClient), "Flows field should be of type Dictionary[]"); + Assert.IsInstanceOf[]>(flowsField!.GetValue(null), "Flows field should be of type Dictionary[]"); // Retrieve the value of the field and cast it to the expected type. - var flows = flowsField!.GetValue(testClient) as Dictionary[]; + var flows = flowsField!.GetValue(null) as Dictionary[]; Assert.IsNotNull(flows, "Flows field should be of type Dictionary[]"); // Parse the generated scope to use in the test. @@ -62,12 +62,12 @@ public Task Invalid() => Test((host) => // create a test client to access the private field "_flows". This will be used to pass to the test token provider. var tokenProvider = new ClientCredentialTokenProvider("myClientId", "myClientSecret"); var testClient = new OAuth2Client(tokenProvider); - var flowsField = testClient.GetType().GetField("_flows", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance); + var flowsField = testClient.GetType().GetField("_flows", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static); Assert.IsNotNull(flowsField, "Flows field should not be null"); - Assert.IsInstanceOf[]>(flowsField!.GetValue(testClient), "Flows field should be of type Dictionary[]"); + Assert.IsInstanceOf[]>(flowsField!.GetValue(null), "Flows field should be of type Dictionary[]"); // Retrieve the value of the field and cast it to the expected type. - var flows = flowsField!.GetValue(testClient) as Dictionary[]; + var flows = flowsField!.GetValue(null) as Dictionary[]; Assert.IsNotNull(flows, "Flows field should be of type Dictionary[]"); // Parse the generated scope to use in the test. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Authentication/Union/UnionAuthTests.cs b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Authentication/Union/UnionAuthTests.cs index e95d981e829..00084d6ed77 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Authentication/Union/UnionAuthTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Authentication/Union/UnionAuthTests.cs @@ -29,12 +29,12 @@ public Task AuthenticationUnionValidToken() => Test(async (host) => // create a test client to access the private field "_flows". This will be used to pass to the test token provider. var tokenProvider = new ClientCredentialTokenProvider("myClientId", "myClientSecret"); var testClient = new UnionClient(tokenProvider); - var flowsField = testClient.GetType().GetField("_flows", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance); + var flowsField = testClient.GetType().GetField("_flows", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static); Assert.IsNotNull(flowsField, "Flows field should not be null"); - Assert.IsInstanceOf[]>(flowsField!.GetValue(testClient), "Flows field should be of type Dictionary[]"); + Assert.IsInstanceOf[]>(flowsField!.GetValue(null), "Flows field should be of type Dictionary[]"); // Retrieve the value of the field and cast it to the expected type. - var flows = flowsField!.GetValue(testClient) as Dictionary[]; + var flows = flowsField!.GetValue(null) as Dictionary[]; Assert.IsNotNull(flows, "Flows field should be of type Dictionary[]"); // Parse the generated scope to use in the test. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Encode/Array/EncodeArrayTests.cs b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Encode/Array/EncodeArrayTests.cs index fda1d9d1423..8e96e5410c8 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Encode/Array/EncodeArrayTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Encode/Array/EncodeArrayTests.cs @@ -18,7 +18,7 @@ public Task CommaDelimited() => Test(async (host) => { var testData = new List { "blue", "red", "green" }; var body = new CommaDelimitedArrayProperty(testData); - + ClientResult result = await new ArrayClient(host, null).GetPropertyClient().CommaDelimitedAsync(body); Assert.AreEqual(200, result.GetRawResponse().Status); Assert.AreEqual(testData, result.Value.Value); @@ -29,7 +29,7 @@ public Task SpaceDelimited() => Test(async (host) => { var testData = new List { "blue", "red", "green" }; var body = new SpaceDelimitedArrayProperty(testData); - + ClientResult result = await new ArrayClient(host, null).GetPropertyClient().SpaceDelimitedAsync(body); Assert.AreEqual(200, result.GetRawResponse().Status); Assert.AreEqual(testData, result.Value.Value); @@ -40,7 +40,7 @@ public Task PipeDelimited() => Test(async (host) => { var testData = new List { "blue", "red", "green" }; var body = new PipeDelimitedArrayProperty(testData); - + ClientResult result = await new ArrayClient(host, null).GetPropertyClient().PipeDelimitedAsync(body); Assert.AreEqual(200, result.GetRawResponse().Status); Assert.AreEqual(testData, result.Value.Value); @@ -51,12 +51,98 @@ public Task NewlineDelimited() => Test(async (host) => { var testData = new List { "blue", "red", "green" }; var body = new NewlineDelimitedArrayProperty(testData); - + ClientResult result = await new ArrayClient(host, null).GetPropertyClient().NewlineDelimitedAsync(body); Assert.AreEqual(200, result.GetRawResponse().Status); Assert.AreEqual(testData, result.Value.Value); }); + [SpectorTest] + public Task EnumCommaDelimited() => Test(async (host) => + { + var testData = new List { Colors.Blue, Colors.Red, Colors.Green }; + var body = new CommaDelimitedEnumArrayProperty(testData); + + ClientResult result = await new ArrayClient(host, null).GetPropertyClient().EnumCommaDelimitedAsync(body); + Assert.AreEqual(200, result.GetRawResponse().Status); + Assert.AreEqual(testData, result.Value.Value); + }); + + [SpectorTest] + public Task EnumSpaceDelimited() => Test(async (host) => + { + var testData = new List { Colors.Blue, Colors.Red, Colors.Green }; + var body = new SpaceDelimitedEnumArrayProperty(testData); + + ClientResult result = await new ArrayClient(host, null).GetPropertyClient().EnumSpaceDelimitedAsync(body); + Assert.AreEqual(200, result.GetRawResponse().Status); + Assert.AreEqual(testData, result.Value.Value); + }); + + [SpectorTest] + public Task EnumPipeDelimited() => Test(async (host) => + { + var testData = new List { Colors.Blue, Colors.Red, Colors.Green }; + var body = new PipeDelimitedEnumArrayProperty(testData); + + ClientResult result = await new ArrayClient(host, null).GetPropertyClient().EnumPipeDelimitedAsync(body); + Assert.AreEqual(200, result.GetRawResponse().Status); + Assert.AreEqual(testData, result.Value.Value); + }); + + [SpectorTest] + public Task EnumNewlineDelimited() => Test(async (host) => + { + var testData = new List { Colors.Blue, Colors.Red, Colors.Green }; + var body = new NewlineDelimitedEnumArrayProperty(testData); + + ClientResult result = await new ArrayClient(host, null).GetPropertyClient().EnumNewlineDelimitedAsync(body); + Assert.AreEqual(200, result.GetRawResponse().Status); + Assert.AreEqual(testData, result.Value.Value); + }); + + [SpectorTest] + public Task ExtensibleEnumCommaDelimited() => Test(async (host) => + { + var testData = new List { ColorsExtensibleEnum.Blue, ColorsExtensibleEnum.Red, ColorsExtensibleEnum.Green }; + var body = new CommaDelimitedExtensibleEnumArrayProperty(testData); + ClientResult result = await new ArrayClient(host, null).GetPropertyClient().ExtensibleEnumCommaDelimitedAsync(body); + Assert.AreEqual(200, result.GetRawResponse().Status); + Assert.AreEqual(testData, result.Value.Value); + }); + + [SpectorTest] + public Task ExtensibleEnumSpaceDelimited() => Test(async (host) => + { + var testData = new List { ColorsExtensibleEnum.Blue, ColorsExtensibleEnum.Red, ColorsExtensibleEnum.Green }; + var body = new SpaceDelimitedExtensibleEnumArrayProperty(testData); + + ClientResult result = await new ArrayClient(host, null).GetPropertyClient().ExtensibleEnumSpaceDelimitedAsync(body); + Assert.AreEqual(200, result.GetRawResponse().Status); + Assert.AreEqual(testData, result.Value.Value); + }); + + [SpectorTest] + public Task ExtensibleEnumPipeDelimited() => Test(async (host) => + { + var testData = new List { ColorsExtensibleEnum.Blue, ColorsExtensibleEnum.Red, ColorsExtensibleEnum.Green }; + var body = new PipeDelimitedExtensibleEnumArrayProperty(testData); + + ClientResult result = await new ArrayClient(host, null).GetPropertyClient().ExtensibleEnumPipeDelimitedAsync(body); + Assert.AreEqual(200, result.GetRawResponse().Status); + Assert.AreEqual(testData, result.Value.Value); + }); + + [SpectorTest] + public Task ExtensibleEnumNewlineDelimited() => Test(async (host) => + { + var testData = new List { ColorsExtensibleEnum.Blue, ColorsExtensibleEnum.Red, ColorsExtensibleEnum.Green }; + var body = new NewlineDelimitedExtensibleEnumArrayProperty(testData); + + ClientResult result = await new ArrayClient(host, null).GetPropertyClient().ExtensibleEnumNewlineDelimitedAsync(body); + Assert.AreEqual(200, result.GetRawResponse().Status); + Assert.AreEqual(testData, result.Value.Value); + }); } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Encode/Duration/EncodeDurationTest.cs b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Encode/Duration/EncodeDurationTest.cs index bef8f1d38f8..541566a83ab 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Encode/Duration/EncodeDurationTest.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Encode/Duration/EncodeDurationTest.cs @@ -54,7 +54,6 @@ public Task HeaderInt32SecondsLargerUnit() => Test(async (host) => }); [SpectorTest] - [Ignore("https://github.com/microsoft/typespec/issues/8987")] public Task HeaderFloatSecondsLargerUnit() => Test(async (host) => { var input = TimeSpan.FromMinutes(2.5); @@ -203,7 +202,7 @@ public Task PropertyFloatSecondsArrayConvenience() => Test(async (host) => { var data1 = TimeSpan.FromSeconds(35.625); var data2 = TimeSpan.FromSeconds(46.75); - var body = new FloatSecondsDurationArrayProperty(new[] { data1, data2}); + var body = new FloatSecondsDurationArrayProperty(new[] { data1, data2 }); ClientResult result = await new DurationClient(host, null).GetPropertyClient().FloatSecondsArrayAsync(body); Assert.AreEqual(body.Value, result.Value.Value); }); @@ -257,7 +256,6 @@ public Task QueryInt32SecondsLargerUnit() => Test(async (host) => }); [SpectorTest] - [Ignore("https://github.com/microsoft/typespec/issues/8987")] public Task QueryFloatSecondsLargerUnit() => Test(async (host) => { var input = TimeSpan.FromMinutes(2.5); @@ -307,7 +305,6 @@ public Task QueryInt32MillisecondsLargerUnit() => Test(async (host) => }); [SpectorTest] - [Ignore("https://github.com/microsoft/typespec/issues/8987")] public Task QueryFloatMillisecondsLargerUnit() => Test(async (host) => { var input = TimeSpan.FromMinutes(3.5); @@ -357,7 +354,6 @@ public Task HeaderInt32MillisecondsLargerUnit() => Test(async (host) => }); [SpectorTest] - [Ignore("https://github.com/microsoft/typespec/issues/8987")] public Task HeaderFloatMillisecondsLargerUnit() => Test(async (host) => { var input = TimeSpan.FromMinutes(3.5); diff --git a/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Parameters/Query/QueryTests.cs b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Parameters/Query/QueryTests.cs new file mode 100644 index 00000000000..65ec38bbd1c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Parameters/Query/QueryTests.cs @@ -0,0 +1,20 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.ClientModel; +using System.Threading.Tasks; +using NUnit.Framework; +using Parameters.Query; + +namespace TestProjects.Spector.Tests.Http.Parameters.Query +{ + public class QueryTests : SpectorTestBase + { + [SpectorTest] + public Task Constant() => Test(async (host) => + { + ClientResult result = await new QueryClient(host, null).GetConstantClient().PostAsync(); + Assert.AreEqual(204, result.GetRawResponse().Status); + }); + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Payload/Pageable/XmlPaginationTests.cs b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Payload/Pageable/XmlPaginationTests.cs new file mode 100644 index 00000000000..96617489c5f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Payload/Pageable/XmlPaginationTests.cs @@ -0,0 +1,191 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Threading.Tasks; +using System.Xml.Linq; +using NUnit.Framework; +using Payload.Pageable; + +namespace TestProjects.Spector.Tests.Http.Payload.Pageable +{ + public class XmlPaginationTests : SpectorTestBase + { + private static readonly Dictionary ExpectedPets = new() + { + { "1", "dog" }, + { "2", "cat" }, + { "3", "bird" }, + { "4", "fish" }, + }; + + [SpectorTest] + public Task ConvenienceMethodWithContinuation() => Test(async (host) => + { + var client = new PageableClient(host, null); + var result = client.GetXmlPaginationClient().GetWithContinuationAsync(); + int count = 0; + await foreach (var pet in result) + { + Assert.IsNotNull(pet); + Assert.AreEqual((++count).ToString(), pet.Id); + Assert.AreEqual(ExpectedPets[pet.Id], pet.Name); + } + Assert.AreEqual(4, count); + }); + + [SpectorTest] + public Task ConvenienceMethodWithContinuationSync() => Test((host) => + { + var client = new PageableClient(host, null); + var result = client.GetXmlPaginationClient().GetWithContinuation(); + int count = 0; + foreach (var pet in result) + { + Assert.IsNotNull(pet); + Assert.AreEqual((++count).ToString(), pet.Id); + Assert.AreEqual(ExpectedPets[pet.Id], pet.Name); + } + Assert.AreEqual(4, count); + return Task.CompletedTask; + }); + + [SpectorTest] + public Task ProtocolMethodWithContinuation() => Test(async (host) => + { + var client = new PageableClient(host, null); + var result = client.GetXmlPaginationClient().GetWithContinuationAsync(null, new RequestOptions()); + int count = 0; + await foreach (var page in result.GetRawPagesAsync()) + { + Assert.IsNotNull(page); + var xml = XDocument.Parse(page.GetRawResponse().Content.ToString()); + var pets = xml.Root?.Element("Pets")?.Elements("Pet"); + Assert.IsNotNull(pets); + foreach (var pet in pets!) + { + Assert.IsNotNull(pet); + var id = pet.Element("Id")?.Value; + var name = pet.Element("Name")?.Value; + Assert.IsNotNull(id); + Assert.IsNotNull(name); + Assert.AreEqual((++count).ToString(), id); + Assert.AreEqual(ExpectedPets[id!], name); + } + } + Assert.AreEqual(4, count); + }); + + [SpectorTest] + public Task ProtocolMethodWithContinuationSync() => Test((host) => + { + var client = new PageableClient(host, null); + var result = client.GetXmlPaginationClient().GetWithContinuation(null, new RequestOptions()); + int count = 0; + foreach (var page in result.GetRawPages()) + { + Assert.IsNotNull(page); + var xml = XDocument.Parse(page.GetRawResponse().Content.ToString()); + var pets = xml.Root?.Element("Pets")?.Elements("Pet"); + Assert.IsNotNull(pets); + foreach (var pet in pets!) + { + Assert.IsNotNull(pet); + var id = pet.Element("Id")?.Value; + var name = pet.Element("Name")?.Value; + Assert.IsNotNull(id); + Assert.IsNotNull(name); + Assert.AreEqual((++count).ToString(), id); + Assert.AreEqual(ExpectedPets[id!], name); + } + } + Assert.AreEqual(4, count); + return Task.CompletedTask; + }); + + [SpectorTest] + public Task ConvenienceMethodWithNextLink() => Test(async (host) => + { + var client = new PageableClient(host, null); + var result = client.GetXmlPaginationClient().GetWithNextLinkAsync(); + int count = 0; + await foreach (var pet in result) + { + Assert.IsNotNull(pet); + Assert.AreEqual((++count).ToString(), pet.Id); + Assert.AreEqual(ExpectedPets[pet.Id], pet.Name); + } + Assert.AreEqual(4, count); + }); + + [SpectorTest] + public Task ConvenienceMethodWithNextLinkSync() => Test((host) => + { + var client = new PageableClient(host, null); + var result = client.GetXmlPaginationClient().GetWithNextLink(); + int count = 0; + foreach (var pet in result) + { + Assert.IsNotNull(pet); + Assert.AreEqual((++count).ToString(), pet.Id); + Assert.AreEqual(ExpectedPets[pet.Id], pet.Name); + } + Assert.AreEqual(4, count); + return Task.CompletedTask; + }); + + [SpectorTest] + public Task ProtocolMethodWithNextLink() => Test(async (host) => + { + var client = new PageableClient(host, null); + var result = client.GetXmlPaginationClient().GetWithNextLinkAsync(new RequestOptions()); + int count = 0; + await foreach (var page in result.GetRawPagesAsync()) + { + Assert.IsNotNull(page); + var xml = XDocument.Parse(page.GetRawResponse().Content.ToString()); + var pets = xml.Root?.Element("Pets")?.Elements("Pet"); + Assert.IsNotNull(pets); + foreach (var pet in pets!) + { + Assert.IsNotNull(pet); + var id = pet.Element("Id")?.Value; + var name = pet.Element("Name")?.Value; + Assert.IsNotNull(id); + Assert.IsNotNull(name); + Assert.AreEqual((++count).ToString(), id); + Assert.AreEqual(ExpectedPets[id!], name); + } + } + Assert.AreEqual(4, count); + }); + + [SpectorTest] + public Task ProtocolMethodWithNextLinkSync() => Test((host) => + { + var client = new PageableClient(host, null); + var result = client.GetXmlPaginationClient().GetWithNextLink(new RequestOptions()); + int count = 0; + foreach (var page in result.GetRawPages()) + { + Assert.IsNotNull(page); + var xml = XDocument.Parse(page.GetRawResponse().Content.ToString()); + var pets = xml.Root?.Element("Pets")?.Elements("Pet"); + Assert.IsNotNull(pets); + foreach (var pet in pets!) + { + Assert.IsNotNull(pet); + var id = pet.Element("Id")?.Value; + var name = pet.Element("Name")?.Value; + Assert.IsNotNull(id); + Assert.IsNotNull(name); + Assert.AreEqual((++count).ToString(), id); + Assert.AreEqual(ExpectedPets[id!], name); + } + } + Assert.AreEqual(4, count); + return Task.CompletedTask; + }); + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Payload/Xml/XmlTests.cs b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Payload/Xml/XmlTests.cs new file mode 100644 index 00000000000..bf045267f4a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Payload/Xml/XmlTests.cs @@ -0,0 +1,619 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; +using System.ClientModel; +using System.Collections.Generic; +using System.Threading.Tasks; +using NUnit.Framework; +using Payload.Xml; + +namespace TestProjects.Spector.Tests.Http.Payload.Xml +{ + public class XmlTests : SpectorTestBase + { + [SpectorTest] + public Task GetSimpleModel() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetSimpleModelValueClient().GetAsync(); + + Assert.AreEqual(200, response.GetRawResponse().Status); + + var model = response.Value; + Assert.NotNull(model); + + Assert.AreEqual("foo", model.Name); + Assert.AreEqual(123, model.Age); + }); + + [SpectorTest] + public Task PutSimpleModel() => Test(async (host) => + { + SimpleModel model = new SimpleModel("foo", 123); + var response = await new XmlClient(host, null).GetSimpleModelValueClient() + .PutAsync(model); + + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithSimpleArrays() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithSimpleArraysValueClient().GetAsync(); + + Assert.AreEqual(200, response.GetRawResponse().Status); + + var model = response.Value; + Assert.NotNull(model); + Assert.AreEqual(3, model.Colors.Count); + Assert.AreEqual(model.Colors[0], "red"); + Assert.AreEqual(model.Colors[1], "green"); + Assert.AreEqual(model.Colors[2], "blue"); + + Assert.AreEqual(2, model.Counts.Count); + Assert.AreEqual(model.Counts[0], 1); + Assert.AreEqual(model.Counts[1], 2); + }); + + [SpectorTest] + public Task PutModelWithSimpleArrays() => Test(async (host) => + { + var model = new ModelWithSimpleArrays( + new[] { "red", "green", "blue" }, + new[] { 1, 2 }); + var response = await new XmlClient(host, null).GetModelWithSimpleArraysValueClient() + .PutAsync(model); + + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithArrayOfModel() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithArrayOfModelValueClient().GetAsync(); + + Assert.AreEqual(200, response.GetRawResponse().Status); + + var model = response.Value; + Assert.NotNull(model); + Assert.AreEqual(2, model.Items.Count); + Assert.AreEqual("foo", model.Items[0].Name); + Assert.AreEqual(123, model.Items[0].Age); + Assert.AreEqual("bar", model.Items[1].Name); + Assert.AreEqual(456, model.Items[1].Age); + }); + + [SpectorTest] + public Task PutModelWithArrayOfModel() => Test(async (host) => + { + var model = new ModelWithArrayOfModel(new[] + { + new SimpleModel("foo", 123), + new SimpleModel("bar", 456) + }); + var response = await new XmlClient(host, null).GetModelWithArrayOfModelValueClient() + .PutAsync(model); + + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithOptionalField() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithOptionalFieldValueClient().GetAsync(); + + Assert.AreEqual(200, response.GetRawResponse().Status); + + var model = response.Value; + Assert.NotNull(model); + Assert.AreEqual("widget", model.Item); + }); + + [SpectorTest] + public Task PutModelWithOptionalField() => Test(async (host) => + { + var model = new ModelWithOptionalField("widget"); + var response = await new XmlClient(host, null).GetModelWithOptionalFieldValueClient() + .PutAsync(model); + + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithAttributes() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithAttributesValueClient().GetAsync(); + + Assert.AreEqual(200, response.GetRawResponse().Status); + + var model = response.Value; + Assert.NotNull(model); + Assert.IsTrue(model.Enabled); + Assert.AreEqual(123, model.Id1); + Assert.AreEqual("foo", model.Id2); + }); + + [SpectorTest] + public Task PutModelWithAttributes() => Test(async (host) => + { + var model = new ModelWithAttributes(123, "foo", true); + var response = await new XmlClient(host, null).GetModelWithAttributesValueClient() + .PutAsync(model); + + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithUnwrappedArray() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithUnwrappedArrayValueClient().GetAsync(); + + Assert.AreEqual(200, response.GetRawResponse().Status); + + var model = response.Value; + Assert.NotNull(model); + + var colors = model.Colors; + Assert.NotNull(colors); + Assert.AreEqual(3, colors.Count); + Assert.AreEqual("red", colors[0]); + Assert.AreEqual("green", colors[1]); + Assert.AreEqual("blue", colors[2]); + + var counts = model.Counts; + Assert.NotNull(counts); + Assert.AreEqual(2, counts.Count); + Assert.AreEqual(1, counts[0]); + Assert.AreEqual(2, counts[1]); + }); + + [SpectorTest] + public Task PutModelWithUnwrappedArray() => Test(async (host) => + { + var model = new ModelWithUnwrappedArray( + new[] { "red", "green", "blue" }, + new[] { 1, 2 }); + var response = await new XmlClient(host, null).GetModelWithUnwrappedArrayValueClient() + .PutAsync(model); + + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithRenamedArrays() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithRenamedArraysValueClient().GetAsync(); + + Assert.AreEqual(200, response.GetRawResponse().Status); + + var model = response.Value; + Assert.NotNull(model); + Assert.AreEqual(3, model.Colors.Count); + Assert.AreEqual(model.Colors[0], "red"); + Assert.AreEqual(model.Colors[1], "green"); + Assert.AreEqual(model.Colors[2], "blue"); + Assert.AreEqual(2, model.Counts.Count); + Assert.AreEqual(model.Counts[0], 1); + Assert.AreEqual(model.Counts[1], 2); + }); + + [SpectorTest] + public Task PutModelWithRenamedArrays() => Test(async (host) => + { + var model = new ModelWithRenamedArrays( + new[] { "red", "green", "blue" }, + new[] { 1, 2 }); + var response = await new XmlClient(host, null).GetModelWithRenamedArraysValueClient() + .PutAsync(model); + + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithRenamedFields() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithRenamedFieldsValueClient().GetAsync(); + + Assert.AreEqual(200, response.GetRawResponse().Status); + + var model = response.Value; + Assert.NotNull(model); + var inputData = model.InputData; + Assert.NotNull(inputData); + Assert.AreEqual("foo", inputData.Name); + Assert.AreEqual(123, inputData.Age); + + var outputData = model.OutputData; + Assert.NotNull(outputData); + Assert.AreEqual("bar", outputData.Name); + Assert.AreEqual(456, outputData.Age); + }); + + [SpectorTest] + public Task PutModelWithRenamedFields() => Test(async (host) => + { + var model = new ModelWithRenamedFields( + new SimpleModel("foo", 123), + new SimpleModel("bar", 456)); + var response = await new XmlClient(host, null).GetModelWithRenamedFieldsValueClient() + .PutAsync(model); + + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithEmptyArray() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithEmptyArrayValueClient().GetAsync(); + + Assert.AreEqual(200, response.GetRawResponse().Status); + + var model = response.Value; + Assert.NotNull(model); + Assert.NotNull(model.Items); + Assert.AreEqual(0, model.Items.Count); + }); + + [SpectorTest] + public Task PutModelWithEmptyArray() => Test(async (host) => + { + var model = new ModelWithEmptyArray(new List()); + var response = await new XmlClient(host, null).GetModelWithEmptyArrayValueClient() + .PutAsync(model); + + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithText() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithTextValueClient().GetAsync(); + + Assert.AreEqual(200, response.GetRawResponse().Status); + + var model = response.Value; + Assert.NotNull(model); + Assert.AreEqual("foo", model.Language); + Assert.IsTrue(model.Content.Contains("This is some text.")); + }); + + [SpectorTest] + public Task PutModelWithText() => Test(async (host) => + { + var model = new ModelWithText("foo", "\n This is some text.\n"); + var response = await new XmlClient(host, null).GetModelWithTextValueClient() + .PutAsync(model); + + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithDictionary() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithDictionaryValueClient().GetAsync(); + + Assert.AreEqual(200, response.GetRawResponse().Status); + + var model = response.Value; + Assert.NotNull(model); + + var metadata = model.Metadata; + Assert.NotNull(metadata); + Assert.AreEqual(3, metadata.Count); + Assert.AreEqual("blue", metadata["Color"]); + Assert.AreEqual("123", metadata["Count"]); + Assert.AreEqual("false", metadata["Enabled"]); + }); + + [SpectorTest] + public Task PutModelWithDictionary() => Test(async (host) => + { + var model = new ModelWithDictionary(new Dictionary + { + { "Color", "blue" }, + { "Count", "123" }, + { "Enabled", "false" } + }); + var response = await new XmlClient(host, null).GetModelWithDictionaryValueClient() + .PutAsync(model); + + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithEncodedNames() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithEncodedNamesValueClient().GetAsync(); + + Assert.AreEqual(200, response.GetRawResponse().Status); + + var model = response.Value; + Assert.NotNull(model); + + var modelData = model.ModelData; + Assert.NotNull(modelData); + Assert.AreEqual("foo", modelData.Name); + Assert.AreEqual(123, modelData.Age); + + var colors = model.Colors; + Assert.NotNull(colors); + Assert.AreEqual(3, colors.Count); + Assert.AreEqual("red", colors[0]); + Assert.AreEqual("green", colors[1]); + Assert.AreEqual("blue", colors[2]); + }); + + [SpectorTest] + public Task PutModelWithEncodedNames() => Test(async (host) => + { + var model = new ModelWithEncodedNames( + new SimpleModel("foo", 123), + new[] { "red", "green", "blue" }); + var response = await new XmlClient(host, null).GetModelWithEncodedNamesValueClient() + .PutAsync(model); + + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithEnum() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithEnumValueClient().GetAsync(); + + Assert.AreEqual(200, response.GetRawResponse().Status); + + var model = response.Value; + Assert.NotNull(model); + Assert.AreEqual(Status.Success, model.Status); + }); + + [SpectorTest] + public Task PutModelWithEnum() => Test(async (host) => + { + var model = new ModelWithEnum(Status.Success); + var response = await new XmlClient(host, null).GetModelWithEnumValueClient() + .PutAsync(model); + + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithDatetime() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithDatetimeValueClient().GetAsync(); + + Assert.AreEqual(200, response.GetRawResponse().Status); + + var model = response.Value; + Assert.NotNull(model); + Assert.AreEqual(DateTimeOffset.Parse("2022-08-26T18:38:00Z"), model.Rfc3339); + Assert.AreEqual(DateTimeOffset.Parse("Fri, 26 Aug 2022 14:38:00 GMT"), model.Rfc7231); + }); + + [SpectorTest] + public Task GetXmlErrorValue() => Test((host) => + { + var exception = Assert.ThrowsAsync( + async () => await new XmlClient(host, null).GetXmlErrorValueClient().GetAsync()); + Assert.AreEqual(400, exception!.Status); + return Task.CompletedTask; + }); + + [SpectorTest] + public Task GetModelWithRenamedProperty() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithRenamedPropertyValueClient().GetAsync(); + Assert.AreEqual(200, response.GetRawResponse().Status); + Assert.AreEqual("foo", response.Value.Title); + Assert.AreEqual("bar", response.Value.Author); + }); + + [SpectorTest] + public Task PutModelWithRenamedProperty() => Test(async (host) => + { + var model = new ModelWithRenamedProperty("foo", "bar"); + var response = await new XmlClient(host, null).GetModelWithRenamedPropertyValueClient().PutAsync(model); + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithNestedModel() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithNestedModelValueClient().GetAsync(); + Assert.AreEqual(200, response.GetRawResponse().Status); + Assert.NotNull(response.Value.Nested); + Assert.AreEqual("foo", response.Value.Nested.Name); + Assert.AreEqual(123, response.Value.Nested.Age); + }); + + [SpectorTest] + public Task PutModelWithNestedModel() => Test(async (host) => + { + var model = new ModelWithNestedModel(new SimpleModel("foo", 123)); + var response = await new XmlClient(host, null).GetModelWithNestedModelValueClient().PutAsync(model); + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithRenamedNestedModel() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithRenamedNestedModelValueClient().GetAsync(); + Assert.AreEqual(200, response.GetRawResponse().Status); + Assert.NotNull(response.Value.Author); + Assert.AreEqual("foo", response.Value.Author.Name); + }); + + [SpectorTest] + public Task PutModelWithRenamedNestedModel() => Test(async (host) => + { + var model = new ModelWithRenamedNestedModel(new Author("foo")); + var response = await new XmlClient(host, null).GetModelWithRenamedNestedModelValueClient().PutAsync(model); + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithWrappedPrimitiveCustomItemNames() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithWrappedPrimitiveCustomItemNamesValueClient().GetAsync(); + Assert.AreEqual(200, response.GetRawResponse().Status); + Assert.AreEqual(2, response.Value.Tags.Count); + Assert.AreEqual("fiction", response.Value.Tags[0]); + Assert.AreEqual("classic", response.Value.Tags[1]); + }); + + [SpectorTest] + public Task PutModelWithWrappedPrimitiveCustomItemNames() => Test(async (host) => + { + var model = new ModelWithWrappedPrimitiveCustomItemNames(new[] { "fiction", "classic" }); + var response = await new XmlClient(host, null).GetModelWithWrappedPrimitiveCustomItemNamesValueClient().PutAsync(model); + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithUnwrappedModelArray() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithUnwrappedModelArrayValueClient().GetAsync(); + Assert.AreEqual(200, response.GetRawResponse().Status); + Assert.AreEqual(2, response.Value.Items.Count); + Assert.AreEqual("foo", response.Value.Items[0].Name); + Assert.AreEqual(123, response.Value.Items[0].Age); + Assert.AreEqual("bar", response.Value.Items[1].Name); + Assert.AreEqual(456, response.Value.Items[1].Age); + }); + + [SpectorTest] + public Task PutModelWithUnwrappedModelArray() => Test(async (host) => + { + var model = new ModelWithUnwrappedModelArray(new[] + { + new SimpleModel("foo", 123), + new SimpleModel("bar", 456) + }); + var response = await new XmlClient(host, null).GetModelWithUnwrappedModelArrayValueClient().PutAsync(model); + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithRenamedWrappedModelArray() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithRenamedWrappedModelArrayValueClient().GetAsync(); + Assert.AreEqual(200, response.GetRawResponse().Status); + Assert.AreEqual(2, response.Value.Items.Count); + Assert.AreEqual("foo", response.Value.Items[0].Name); + Assert.AreEqual(123, response.Value.Items[0].Age); + Assert.AreEqual("bar", response.Value.Items[1].Name); + Assert.AreEqual(456, response.Value.Items[1].Age); + }); + + [SpectorTest] + public Task PutModelWithRenamedWrappedModelArray() => Test(async (host) => + { + var model = new ModelWithRenamedWrappedModelArray(new[] + { + new SimpleModel("foo", 123), + new SimpleModel("bar", 456) + }); + var response = await new XmlClient(host, null).GetModelWithRenamedWrappedModelArrayValueClient().PutAsync(model); + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithRenamedUnwrappedModelArray() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithRenamedUnwrappedModelArrayValueClient().GetAsync(); + Assert.AreEqual(200, response.GetRawResponse().Status); + Assert.AreEqual(2, response.Value.Items.Count); + Assert.AreEqual("foo", response.Value.Items[0].Name); + Assert.AreEqual(123, response.Value.Items[0].Age); + Assert.AreEqual("bar", response.Value.Items[1].Name); + Assert.AreEqual(456, response.Value.Items[1].Age); + }); + + [SpectorTest] + public Task PutModelWithRenamedUnwrappedModelArray() => Test(async (host) => + { + var model = new ModelWithRenamedUnwrappedModelArray(new[] + { + new SimpleModel("foo", 123), + new SimpleModel("bar", 456) + }); + var response = await new XmlClient(host, null).GetModelWithRenamedUnwrappedModelArrayValueClient().PutAsync(model); + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithRenamedWrappedAndItemModelArray() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithRenamedWrappedAndItemModelArrayValueClient().GetAsync(); + Assert.AreEqual(200, response.GetRawResponse().Status); + Assert.AreEqual(2, response.Value.Books.Count); + Assert.AreEqual("The Great Gatsby", response.Value.Books[0].Title); + Assert.AreEqual("Les Miserables", response.Value.Books[1].Title); + }); + + [SpectorTest] + public Task PutModelWithRenamedWrappedAndItemModelArray() => Test(async (host) => + { + var model = new ModelWithRenamedWrappedAndItemModelArray(new[] + { + new Book("The Great Gatsby"), + new Book("Les Miserables") + }); + var response = await new XmlClient(host, null).GetModelWithRenamedWrappedAndItemModelArrayValueClient().PutAsync(model); + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithRenamedAttribute() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithRenamedAttributeValueClient().GetAsync(); + Assert.AreEqual(200, response.GetRawResponse().Status); + Assert.AreEqual(123, response.Value.Id); + Assert.AreEqual("The Great Gatsby", response.Value.Title); + Assert.AreEqual("F. Scott Fitzgerald", response.Value.Author); + }); + + [SpectorTest] + public Task PutModelWithRenamedAttribute() => Test(async (host) => + { + var model = new ModelWithRenamedAttribute(123, "The Great Gatsby", "F. Scott Fitzgerald"); + var response = await new XmlClient(host, null).GetModelWithRenamedAttributeValueClient().PutAsync(model); + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithNamespace() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithNamespaceValueClient().GetAsync(); + Assert.AreEqual(200, response.GetRawResponse().Status); + Assert.AreEqual(123, response.Value.Id); + Assert.AreEqual("The Great Gatsby", response.Value.Title); + }); + + [SpectorTest] + public Task PutModelWithNamespace() => Test(async (host) => + { + var model = new ModelWithNamespace(123, "The Great Gatsby"); + var response = await new XmlClient(host, null).GetModelWithNamespaceValueClient().PutAsync(model); + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task GetModelWithNamespaceOnProperties() => Test(async (host) => + { + var response = await new XmlClient(host, null).GetModelWithNamespaceOnPropertiesValueClient().GetAsync(); + Assert.AreEqual(200, response.GetRawResponse().Status); + Assert.AreEqual(123, response.Value.Id); + Assert.AreEqual("The Great Gatsby", response.Value.Title); + Assert.AreEqual("F. Scott Fitzgerald", response.Value.Author); + }); + + [SpectorTest] + public Task PutModelWithNamespaceOnProperties() => Test(async (host) => + { + var model = new ModelWithNamespaceOnProperties(123, "The Great Gatsby", "F. Scott Fitzgerald"); + var response = await new XmlClient(host, null).GetModelWithNamespaceOnPropertiesValueClient().PutAsync(model); + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/SpecialWords/SpecialWordsTests.Models.cs b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/SpecialWords/SpecialWordsTests.Models.cs index f6623d5bfc7..9c7cf20b7fa 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/SpecialWords/SpecialWordsTests.Models.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/SpecialWords/SpecialWordsTests.Models.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using SpecialWords; +using SpecialWords._ExtensibleStrings; using SpecialWords._ModelProperties; using SpecialWords._Models; using SpecialWordsAssert = SpecialWords._Models.Assert; @@ -285,5 +286,31 @@ public Task ModelProperties_SameAsModelAsync() => Test(async (host) => var response = await client.SameAsModelAsync(body); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); + + [SpectorTest] + public Task ModelProperties_DictMethodsAsync() => Test(async (host) => + { + DictMethods body = new DictMethods("ok", "ok", "ok", "ok", "ok", "ok", "ok", "ok", "ok", "ok"); + var client = new SpecialWordsClient(host, null).GetModelPropertiesClient(); + var response = await client.DictMethodsAsync(body); + NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task ModelProperties_WithListAsync() => Test(async (host) => + { + ModelWithList body = new ModelWithList("ok"); + var client = new SpecialWordsClient(host, null).GetModelPropertiesClient(); + var response = await client.WithListAsync(body); + NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); + }); + + [SpectorTest] + public Task ExtensibleStrings_PutExtensibleStringValueAsync() => Test(async (host) => + { + var client = new SpecialWordsClient(host, null).GetExtensibleStringsClient(); + var response = await client.PutExtensibleStringValueAsync(ExtensibleString.Class); + NUnit.Framework.Assert.AreEqual(ExtensibleString.Class, response.Value); + }); } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/_Type/Property/AdditionalProperties/AdditionalPropertiesTests.cs b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/_Type/Property/AdditionalProperties/AdditionalPropertiesTests.cs index 0550b638447..926d1cd492f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/_Type/Property/AdditionalProperties/AdditionalPropertiesTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/_Type/Property/AdditionalProperties/AdditionalPropertiesTests.cs @@ -841,6 +841,45 @@ public Task SpreadRecordNonDiscriminatedUnion2Put() => Test(async host => Assert.AreEqual(204, response.GetRawResponse().Status); }); + [SpectorTest] + public Task SpreadRecordNonDiscriminatedUnion3Get() => Test(async host => + { + var response = await new AdditionalPropertiesClient(host, null).GetSpreadRecordNonDiscriminatedUnion3Client().GetAsync(); + Assert.AreEqual(200, response.GetRawResponse().Status); + Assert.AreEqual("abc", response.Value.Name); + Assert.AreEqual(2, response.Value.AdditionalProperties.Count); + using var jsonDoc = System.Text.Json.JsonDocument.Parse(response.Value.AdditionalProperties["prop1"].ToMemory()); + var prop1Items = jsonDoc.RootElement.EnumerateArray() + .Select(e => ModelReaderWriter.Read(BinaryData.FromString(e.GetRawText()))) + .ToList(); + Assert.AreEqual(2, prop1Items.Count); + Assert.AreEqual("2021-01-01T00:00:00Z", prop1Items[0]!.Start); + Assert.AreEqual("2021-01-01T00:00:00Z", prop1Items[1]!.Start); + var prop2 = ModelReaderWriter.Read(response.Value.AdditionalProperties["prop2"]); + Assert.AreEqual(new DateTimeOffset(2021, 1, 1, 0, 0, 0, TimeSpan.Zero), prop2!.Start); + Assert.AreEqual(new DateTimeOffset(2021, 1, 2, 0, 0, 0, TimeSpan.Zero), prop2.End); + }); + + [SpectorTest] + public Task SpreadRecordNonDiscriminatedUnion3Put() => Test(async host => + { + var prop1BinaryData = BinaryData.FromString( + "[{\"kind\":\"kind1\",\"start\":\"2021-01-01T00:00:00Z\"},{\"kind\":\"kind1\",\"start\":\"2021-01-01T00:00:00Z\"}]"); + var value = new SpreadRecordForNonDiscriminatedUnion3("abc") + { + AdditionalProperties = + { + ["prop1"] = prop1BinaryData, + ["prop2"] = ModelReaderWriter.Write(new WidgetData1(new DateTimeOffset(2021, 1, 1, 0, 0, 0, TimeSpan.Zero)) + { + End = new DateTimeOffset(2021, 1, 2, 0, 0, 0, TimeSpan.Zero) + }) + } + }; + var response = await new AdditionalPropertiesClient(host, null).GetSpreadRecordNonDiscriminatedUnion3Client().PutAsync(value); + Assert.AreEqual(204, response.GetRawResponse().Status); + }); + [SpectorTest] public Task SpreadRecordUnionGet() => Test(async host => { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector.Tests/TestProjects.Spector.Tests.csproj b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/TestProjects.Spector.Tests.csproj index d02bd82aef4..32fd7b3b133 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector.Tests/TestProjects.Spector.Tests.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector.Tests/TestProjects.Spector.Tests.csproj @@ -1,4 +1,4 @@ - + TestProjects.Spector.Tests @@ -43,11 +43,13 @@ + + @@ -77,7 +79,7 @@ - + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Authentication.ApiKey.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Authentication.ApiKey.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Authentication.ApiKey.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Authentication.ApiKey.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Authentication.ApiKey.sln deleted file mode 100644 index d25f24e5988..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Authentication.ApiKey.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ApiKey", "src\Authentication.ApiKey.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Authentication.ApiKey.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Authentication.ApiKey.slnx new file mode 100644 index 00000000000..b3d44586fdc --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Authentication.ApiKey.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Authentication.ApiKey.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Authentication.ApiKey.csproj index b2f00a0960b..a71a9e4fd04 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Authentication.ApiKey.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Authentication.ApiKey.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/ApiKeyClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/ApiKeyClient.cs index 4cc79b324ba..bb90d193964 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/ApiKeyClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/ApiKeyClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -12,13 +13,20 @@ namespace Authentication.ApiKey { public partial class ApiKeyClient { + private const string AuthorizationHeader = "x-ms-api-key"; + protected ApiKeyClient() => throw null; public ApiKeyClient(ApiKeyCredential credential) : this(new Uri("http://localhost:3000"), credential, new ApiKeyClientOptions()) => throw null; public ApiKeyClient(ApiKeyCredential credential, ApiKeyClientOptions options) : this(new Uri("http://localhost:3000"), credential, options) => throw null; - public ApiKeyClient(Uri endpoint, ApiKeyCredential credential, ApiKeyClientOptions options) => throw null; + internal ApiKeyClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, ApiKeyClientOptions options) => throw null; + + public ApiKeyClient(Uri endpoint, ApiKeyCredential credential, ApiKeyClientOptions options) : this(ApiKeyAuthenticationPolicy.CreateHeaderApiKeyPolicy(credential, AuthorizationHeader), endpoint, options) => throw null; + + [Experimental("SCME0002")] + public ApiKeyClient(ApiKeyClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/ApiKeyClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/ApiKeyClientOptions.cs index 898f3926f96..7f1d0ec3a4c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/ApiKeyClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/ApiKeyClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Authentication.ApiKey { public partial class ApiKeyClientOptions : ClientPipelineOptions { + public ApiKeyClientOptions() => throw null; + + [Experimental("SCME0002")] + internal ApiKeyClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/ApiKeyClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/ApiKeyClientSettings.cs new file mode 100644 index 00000000000..54fd6f05531 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/ApiKeyClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Authentication.ApiKey +{ + [Experimental("SCME0002")] + public partial class ApiKeyClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public ApiKeyClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..1978b2f0446 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "ApiKeyClient": { + "type": "object", + "description": "Configuration for ApiKeyClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/apiKeyClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "apiKeyClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Authentication.Http.Custom.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Authentication.Http.Custom.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Authentication.Http.Custom.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Authentication.Http.Custom.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Authentication.Http.Custom.sln deleted file mode 100644 index 9ff83d08928..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Authentication.Http.Custom.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.Http.Custom", "src\Authentication.Http.Custom.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Authentication.Http.Custom.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Authentication.Http.Custom.slnx new file mode 100644 index 00000000000..83937fcafb0 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Authentication.Http.Custom.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Authentication.Http.Custom.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Authentication.Http.Custom.csproj index 36f4cbbe8ba..3a351cdfca3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Authentication.Http.Custom.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Authentication.Http.Custom.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/CustomClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/CustomClient.cs index 1bae28cfe95..25ff19d43b1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/CustomClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/CustomClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -12,13 +13,21 @@ namespace Authentication.Http.Custom { public partial class CustomClient { + private const string AuthorizationHeader = "Authorization"; + private const string AuthorizationApiKeyPrefix = "SharedAccessKey"; + protected CustomClient() => throw null; public CustomClient(ApiKeyCredential credential) : this(new Uri("http://localhost:3000"), credential, new CustomClientOptions()) => throw null; public CustomClient(ApiKeyCredential credential, CustomClientOptions options) : this(new Uri("http://localhost:3000"), credential, options) => throw null; - public CustomClient(Uri endpoint, ApiKeyCredential credential, CustomClientOptions options) => throw null; + internal CustomClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, CustomClientOptions options) => throw null; + + public CustomClient(Uri endpoint, ApiKeyCredential credential, CustomClientOptions options) : this(ApiKeyAuthenticationPolicy.CreateHeaderApiKeyPolicy(credential, AuthorizationHeader, AuthorizationApiKeyPrefix), endpoint, options) => throw null; + + [Experimental("SCME0002")] + public CustomClient(CustomClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/CustomClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/CustomClientOptions.cs index bd234ac920d..ae206c5cecf 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/CustomClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/CustomClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Authentication.Http.Custom { public partial class CustomClientOptions : ClientPipelineOptions { + public CustomClientOptions() => throw null; + + [Experimental("SCME0002")] + internal CustomClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/CustomClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/CustomClientSettings.cs new file mode 100644 index 00000000000..2a96fe4f0e7 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/CustomClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Authentication.Http.Custom +{ + [Experimental("SCME0002")] + public partial class CustomClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public CustomClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..b206c55fc71 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "CustomClient": { + "type": "object", + "description": "Configuration for CustomClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/customClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "customClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/Authentication.Noauth.Union.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/Authentication.Noauth.Union.sln deleted file mode 100644 index e2a0cd86497..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/Authentication.Noauth.Union.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.Noauth.Union", "src\Authentication.Noauth.Union.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/Configuration.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/Configuration.json deleted file mode 100644 index 294217fb51f..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/Configuration.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "package-name": "Authentication.Noauth.Union" -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/src/Authentication.Noauth.Union.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/src/Authentication.Noauth.Union.csproj deleted file mode 100644 index 6d4e9bb9cd1..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/src/Authentication.Noauth.Union.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - This is the Authentication.Noauth.Union client library for developing .NET applications with rich experience. - SDK Code Generation Authentication.Noauth.Union - 1.0.0-beta.1 - Authentication.Noauth.Union - netstandard2.0;net8.0 - latest - true - - - - - - diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/src/Generated/Models/AuthenticationNoauthUnionContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/src/Generated/Models/AuthenticationNoauthUnionContext.cs deleted file mode 100644 index 350a9c31e97..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/src/Generated/Models/AuthenticationNoauthUnionContext.cs +++ /dev/null @@ -1,12 +0,0 @@ -// - -#nullable disable - -using System.ClientModel.Primitives; - -namespace Authentication.Noauth.Union -{ - public partial class AuthenticationNoauthUnionContext : ModelReaderWriterContext - { - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/src/Generated/UnionClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/src/Generated/UnionClient.cs deleted file mode 100644 index 314c47e1956..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/src/Generated/UnionClient.cs +++ /dev/null @@ -1,41 +0,0 @@ -// - -#nullable disable - -using System; -using System.ClientModel; -using System.ClientModel.Primitives; -using System.Threading; -using System.Threading.Tasks; - -namespace Authentication.Noauth.Union -{ - public partial class UnionClient - { - protected UnionClient() => throw null; - - public UnionClient(AuthenticationTokenProvider tokenProvider) : this(new Uri("http://localhost:3000"), tokenProvider, new UnionClientOptions()) => throw null; - - public UnionClient(AuthenticationTokenProvider tokenProvider, UnionClientOptions options) : this(new Uri("http://localhost:3000"), tokenProvider, options) => throw null; - - public UnionClient(Uri endpoint, AuthenticationTokenProvider tokenProvider, UnionClientOptions options) => throw null; - - public ClientPipeline Pipeline => throw null; - - public virtual ClientResult ValidNoAuth(RequestOptions options) => throw null; - - public virtual Task ValidNoAuthAsync(RequestOptions options) => throw null; - - public virtual ClientResult ValidNoAuth(CancellationToken cancellationToken = default) => throw null; - - public virtual Task ValidNoAuthAsync(CancellationToken cancellationToken = default) => throw null; - - public virtual ClientResult ValidToken(RequestOptions options) => throw null; - - public virtual Task ValidTokenAsync(RequestOptions options) => throw null; - - public virtual ClientResult ValidToken(CancellationToken cancellationToken = default) => throw null; - - public virtual Task ValidTokenAsync(CancellationToken cancellationToken = default) => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/src/Generated/UnionClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/src/Generated/UnionClientOptions.cs deleted file mode 100644 index 1643079facb..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/src/Generated/UnionClientOptions.cs +++ /dev/null @@ -1,12 +0,0 @@ -// - -#nullable disable - -using System.ClientModel.Primitives; - -namespace Authentication.Noauth.Union -{ - public partial class UnionClientOptions : ClientPipelineOptions - { - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/tspCodeModel.json deleted file mode 100644 index c047229bfc7..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/noauth/union/tspCodeModel.json +++ /dev/null @@ -1,147 +0,0 @@ -{ - "name": "Authentication.Noauth.Union", - "apiVersions": [], - "enums": [], - "constants": [], - "models": [], - "clients": [ - { - "$id": "1", - "kind": "client", - "name": "UnionClient", - "namespace": "Authentication.Noauth.Union", - "doc": "Illustrates clients generated with NoAuth and OAuth2 authentication union.", - "methods": [ - { - "$id": "2", - "kind": "basic", - "name": "validNoAuth", - "accessibility": "public", - "apiVersions": [], - "doc": "Check whether client can make a request without authentication", - "operation": { - "$id": "3", - "name": "validNoAuth", - "resourceName": "Union", - "doc": "Check whether client can make a request without authentication", - "accessibility": "public", - "parameters": [], - "responses": [ - { - "statusCodes": [ - 204 - ], - "headers": [], - "isErrorResponse": false - } - ], - "httpMethod": "GET", - "uri": "{endpoint}", - "path": "/authentication/noauth/union/valid", - "bufferResponse": true, - "generateProtocolMethod": true, - "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Authentication.Noauth.Union.validNoAuth", - "decorators": [], - "namespace": "Authentication.Noauth.Union" - }, - "parameters": [], - "response": {}, - "isOverride": false, - "generateConvenient": true, - "generateProtocol": true, - "crossLanguageDefinitionId": "Authentication.Noauth.Union.validNoAuth" - }, - { - "$id": "4", - "kind": "basic", - "name": "validToken", - "accessibility": "public", - "apiVersions": [], - "doc": "Check whether client is authenticated with OAuth2 token", - "operation": { - "$id": "5", - "name": "validToken", - "resourceName": "Union", - "doc": "Check whether client is authenticated with OAuth2 token", - "accessibility": "public", - "parameters": [], - "responses": [ - { - "statusCodes": [ - 204 - ], - "headers": [], - "isErrorResponse": false - } - ], - "httpMethod": "GET", - "uri": "{endpoint}", - "path": "/authentication/noauth/union/validtoken", - "bufferResponse": true, - "generateProtocolMethod": true, - "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Authentication.Noauth.Union.validToken", - "decorators": [], - "namespace": "Authentication.Noauth.Union" - }, - "parameters": [], - "response": {}, - "isOverride": false, - "generateConvenient": true, - "generateProtocol": true, - "crossLanguageDefinitionId": "Authentication.Noauth.Union.validToken" - } - ], - "parameters": [ - { - "$id": "6", - "kind": "endpoint", - "name": "endpoint", - "serializedName": "endpoint", - "doc": "Service host", - "type": { - "$id": "7", - "kind": "url", - "name": "endpoint", - "crossLanguageDefinitionId": "TypeSpec.url" - }, - "isApiVersion": false, - "optional": false, - "scope": "Client", - "isEndpoint": true, - "defaultValue": { - "type": { - "$id": "8", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string" - }, - "value": "http://localhost:3000" - }, - "serverUrlTemplate": "{endpoint}", - "skipUrlEncoding": false, - "readOnly": false, - "crossLanguageDefinitionId": "Authentication.Noauth.Union.endpoint" - } - ], - "initializedBy": 1, - "decorators": [], - "crossLanguageDefinitionId": "Authentication.Noauth.Union", - "apiVersions": [], - "isMultiServiceClient": false - } - ], - "auth": { - "oAuth2": { - "flows": [ - { - "scopes": [ - "https://security.microsoft.com/.default" - ], - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize" - } - ] - } - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Authentication.OAuth2.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Authentication.OAuth2.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Authentication.OAuth2.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Authentication.OAuth2.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Authentication.OAuth2.sln deleted file mode 100644 index bbd935073c3..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Authentication.OAuth2.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.OAuth2", "src\Authentication.OAuth2.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Authentication.OAuth2.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Authentication.OAuth2.slnx new file mode 100644 index 00000000000..be560f58035 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Authentication.OAuth2.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Authentication.OAuth2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Authentication.OAuth2.csproj index 42430909fa0..ab616d00dca 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Authentication.OAuth2.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Authentication.OAuth2.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/OAuth2Client.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/OAuth2Client.cs index be4fc518c9f..0b34d500610 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/OAuth2Client.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/OAuth2Client.cs @@ -5,6 +5,8 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -12,13 +14,28 @@ namespace Authentication.OAuth2 { public partial class OAuth2Client { + /// The OAuth2 flows supported by the service. + private static readonly Dictionary[] _flows = new Dictionary[] + { + new Dictionary + { + { GetTokenOptions.ScopesPropertyName, new string[] { "https://security.microsoft.com/.default" } }, + { GetTokenOptions.AuthorizationUrlPropertyName, "https://login.microsoftonline.com/common/oauth2/authorize" } + } + }; + protected OAuth2Client() => throw null; public OAuth2Client(AuthenticationTokenProvider tokenProvider) : this(new Uri("http://localhost:3000"), tokenProvider, new OAuth2ClientOptions()) => throw null; public OAuth2Client(AuthenticationTokenProvider tokenProvider, OAuth2ClientOptions options) : this(new Uri("http://localhost:3000"), tokenProvider, options) => throw null; - public OAuth2Client(Uri endpoint, AuthenticationTokenProvider tokenProvider, OAuth2ClientOptions options) => throw null; + internal OAuth2Client(AuthenticationPolicy authenticationPolicy, Uri endpoint, OAuth2ClientOptions options) => throw null; + + public OAuth2Client(Uri endpoint, AuthenticationTokenProvider tokenProvider, OAuth2ClientOptions options) : this(new BearerTokenPolicy(tokenProvider, _flows), endpoint, options) => throw null; + + [Experimental("SCME0002")] + public OAuth2Client(OAuth2ClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/OAuth2ClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/OAuth2ClientOptions.cs index 1c41f844e44..8fc4380d187 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/OAuth2ClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/OAuth2ClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Authentication.OAuth2 { public partial class OAuth2ClientOptions : ClientPipelineOptions { + public OAuth2ClientOptions() => throw null; + + [Experimental("SCME0002")] + internal OAuth2ClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/OAuth2ClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/OAuth2ClientSettings.cs new file mode 100644 index 00000000000..1051c7cf048 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/OAuth2ClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Authentication.OAuth2 +{ + [Experimental("SCME0002")] + public partial class OAuth2ClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public OAuth2ClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..d5d64542f56 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "OAuth2Client": { + "type": "object", + "description": "Configuration for OAuth2Client.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/oAuth2ClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "oAuth2ClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/Authentication.Union.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/Authentication.Union.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/Authentication.Union.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/Authentication.Union.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/Authentication.Union.sln deleted file mode 100644 index 60f4e7c55e2..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/Authentication.Union.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.Union", "src\Authentication.Union.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/Authentication.Union.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/Authentication.Union.slnx new file mode 100644 index 00000000000..d8212bc4dc4 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/Authentication.Union.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Authentication.Union.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Authentication.Union.csproj index 60336a11ddc..b31707d9fbe 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Authentication.Union.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Authentication.Union.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/UnionClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/UnionClient.cs index f7f4255c91e..cf14844ba08 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/UnionClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/UnionClient.cs @@ -5,6 +5,8 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -12,6 +14,17 @@ namespace Authentication.Union { public partial class UnionClient { + private const string AuthorizationHeader = "x-ms-api-key"; + /// The OAuth2 flows supported by the service. + private static readonly Dictionary[] _flows = new Dictionary[] + { + new Dictionary + { + { GetTokenOptions.ScopesPropertyName, new string[] { "https://security.microsoft.com/.default" } }, + { GetTokenOptions.AuthorizationUrlPropertyName, "https://login.microsoftonline.com/common/oauth2/authorize" } + } + }; + protected UnionClient() => throw null; public UnionClient(ApiKeyCredential credential) : this(new Uri("http://localhost:3000"), credential, new UnionClientOptions()) => throw null; @@ -22,9 +35,14 @@ public partial class UnionClient public UnionClient(AuthenticationTokenProvider tokenProvider, UnionClientOptions options) : this(new Uri("http://localhost:3000"), tokenProvider, options) => throw null; - public UnionClient(Uri endpoint, ApiKeyCredential credential, UnionClientOptions options) => throw null; + internal UnionClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, UnionClientOptions options) => throw null; + + public UnionClient(Uri endpoint, ApiKeyCredential credential, UnionClientOptions options) : this(ApiKeyAuthenticationPolicy.CreateHeaderApiKeyPolicy(credential, AuthorizationHeader), endpoint, options) => throw null; + + public UnionClient(Uri endpoint, AuthenticationTokenProvider tokenProvider, UnionClientOptions options) : this(new BearerTokenPolicy(tokenProvider, _flows), endpoint, options) => throw null; - public UnionClient(Uri endpoint, AuthenticationTokenProvider tokenProvider, UnionClientOptions options) => throw null; + [Experimental("SCME0002")] + public UnionClient(UnionClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/UnionClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/UnionClientOptions.cs index 3a0a17570ae..c75e08f6cee 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/UnionClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/UnionClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Authentication.Union { public partial class UnionClientOptions : ClientPipelineOptions { + public UnionClientOptions() => throw null; + + [Experimental("SCME0002")] + internal UnionClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/UnionClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/UnionClientSettings.cs new file mode 100644 index 00000000000..f14eadcbcd3 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/UnionClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Authentication.Union +{ + [Experimental("SCME0002")] + public partial class UnionClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public UnionClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..370dae5b9f1 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "UnionClient": { + "type": "object", + "description": "Configuration for UnionClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/unionClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "unionClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/Client.Structure.Service.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/Client.Structure.Service.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/Client.Structure.Service.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/Client.Structure.Service.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/Client.Structure.Service.sln deleted file mode 100644 index 2742e23c2ef..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/Client.Structure.Service.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.Structure.Service", "src\Client.Structure.Service.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/Client.Structure.Service.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/Client.Structure.Service.slnx new file mode 100644 index 00000000000..84cf67be8b9 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/Client.Structure.Service.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Client.Structure.Service.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Client.Structure.Service.csproj index efce57fd9a0..e192640ee20 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Client.Structure.Service.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Client.Structure.Service.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/FirstClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/FirstClient.cs index 09efa090360..0ae16d068ff 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/FirstClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/FirstClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; using Client.Structure.Service; @@ -17,7 +18,12 @@ public partial class FirstClient public FirstClient(Uri endpoint, ClientType client) : this(endpoint, client, new FirstClientOptions()) => throw null; - public FirstClient(Uri endpoint, ClientType client, FirstClientOptions options) => throw null; + internal FirstClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, ClientType client, FirstClientOptions options) => throw null; + + public FirstClient(Uri endpoint, ClientType client, FirstClientOptions options) : this(null, endpoint, client, options) => throw null; + + [Experimental("SCME0002")] + public FirstClient(FirstClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Client ?? default, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/FirstClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/FirstClientOptions.cs index 881ed44ef7e..6a8bb3b3dab 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/FirstClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/FirstClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Client.Structure.ClientOperationGroup { public partial class FirstClientOptions : ClientPipelineOptions { + public FirstClientOptions() => throw null; + + [Experimental("SCME0002")] + internal FirstClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/FirstClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/FirstClientSettings.cs new file mode 100644 index 00000000000..47fe311045d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/FirstClientSettings.cs @@ -0,0 +1,36 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Client.Structure.Service; +using Microsoft.Extensions.Configuration; + +namespace Client.Structure.ClientOperationGroup +{ + [Experimental("SCME0002")] + public partial class FirstClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public ClientType? Client + { + get => throw null; + set => throw null; + } + + public FirstClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/Group3.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/Group3.cs index 36f592b901d..424b1f729bd 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/Group3.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/Group3.cs @@ -2,10 +2,12 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; +using Client.Structure.Service; namespace Client.Structure.ClientOperationGroup { @@ -13,6 +15,8 @@ public partial class Group3 { protected Group3() => throw null; + internal Group3(ClientPipeline pipeline, Uri endpoint, ClientType client) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Two(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/Group4.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/Group4.cs index 5470b3bbc52..6f372e14c53 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/Group4.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/Group4.cs @@ -2,10 +2,12 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; +using Client.Structure.Service; namespace Client.Structure.ClientOperationGroup { @@ -13,6 +15,8 @@ public partial class Group4 { protected Group4() => throw null; + internal Group4(ClientPipeline pipeline, Uri endpoint, ClientType client) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Four(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/Group5.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/Group5.cs index eb10cff56a7..16a035048f3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/Group5.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/Group5.cs @@ -2,10 +2,12 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; +using Client.Structure.Service; namespace Client.Structure.AnotherClientOperationGroup { @@ -13,6 +15,8 @@ public partial class Group5 { protected Group5() => throw null; + internal Group5(ClientPipeline pipeline, Uri endpoint, ClientType client) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Six(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/SubNamespaceSecondClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/SubNamespaceSecondClient.cs index 9fe43ebbd7c..693eca9df30 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/SubNamespaceSecondClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/SubNamespaceSecondClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; using Client.Structure.Service; @@ -17,7 +18,12 @@ public partial class SubNamespaceSecondClient public SubNamespaceSecondClient(Uri endpoint, ClientType client) : this(endpoint, client, new SubNamespaceSecondClientOptions()) => throw null; - public SubNamespaceSecondClient(Uri endpoint, ClientType client, SubNamespaceSecondClientOptions options) => throw null; + internal SubNamespaceSecondClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, ClientType client, SubNamespaceSecondClientOptions options) => throw null; + + public SubNamespaceSecondClient(Uri endpoint, ClientType client, SubNamespaceSecondClientOptions options) : this(null, endpoint, client, options) => throw null; + + [Experimental("SCME0002")] + public SubNamespaceSecondClient(SubNamespaceSecondClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Client ?? default, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/SubNamespaceSecondClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/SubNamespaceSecondClientOptions.cs index d853790bd79..9bdb3865466 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/SubNamespaceSecondClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/SubNamespaceSecondClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Client.Structure.AnotherClientOperationGroup { public partial class SubNamespaceSecondClientOptions : ClientPipelineOptions { + public SubNamespaceSecondClientOptions() => throw null; + + [Experimental("SCME0002")] + internal SubNamespaceSecondClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/SubNamespaceSecondClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/SubNamespaceSecondClientSettings.cs new file mode 100644 index 00000000000..1f632d30799 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/SubNamespaceSecondClientSettings.cs @@ -0,0 +1,36 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Client.Structure.Service; +using Microsoft.Extensions.Configuration; + +namespace Client.Structure.AnotherClientOperationGroup +{ + [Experimental("SCME0002")] + public partial class SubNamespaceSecondClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public ClientType? Client + { + get => throw null; + set => throw null; + } + + public SubNamespaceSecondClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..f15b3ce0d20 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,79 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "FirstClient": { + "type": "object", + "description": "Configuration for FirstClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Client": { + "$ref": "#/definitions/clientType" + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/firstClientOptions" + } + } + }, + "SubNamespaceSecondClient": { + "type": "object", + "description": "Configuration for SubNamespaceSecondClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Client": { + "$ref": "#/definitions/clientType" + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/subNamespaceSecondClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "clientType": { + "enum": [ + "default", + "multi-client", + "renamed-operation", + "two-operation-group", + "client-operation-group" + ] + }, + "firstClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + }, + "subNamespaceSecondClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/Client.Structure.Service.Default.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/Client.Structure.Service.Default.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/Client.Structure.Service.Default.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/Client.Structure.Service.Default.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/Client.Structure.Service.Default.sln deleted file mode 100644 index 42f1b36c659..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/Client.Structure.Service.Default.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.Structure.Service.Default", "src\Client.Structure.Service.Default.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/Client.Structure.Service.Default.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/Client.Structure.Service.Default.slnx new file mode 100644 index 00000000000..aca223ef466 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/Client.Structure.Service.Default.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Client.Structure.Service.Default.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Client.Structure.Service.Default.csproj index fe6e72f7cb7..ddfabd4261b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Client.Structure.Service.Default.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Client.Structure.Service.Default.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Bar.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Bar.cs index b477c997e2f..ecb520de880 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Bar.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Bar.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Bar { protected Bar() => throw null; + internal Bar(ClientPipeline pipeline, Uri endpoint, ClientType client) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Five(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Baz.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Baz.cs index c13fd297ec5..9846828d6a2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Baz.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Baz.cs @@ -2,7 +2,9 @@ #nullable disable +using System; using System.ClientModel.Primitives; +using Client.Structure.Service; namespace Client.Structure.Service._Baz { @@ -10,6 +12,8 @@ public partial class Baz { protected Baz() => throw null; + internal Baz(ClientPipeline pipeline, Uri endpoint, ClientType client) => throw null; + public ClientPipeline Pipeline => throw null; public virtual BazFoo GetBazFooClient() => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/BazFoo.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/BazFoo.cs index 6ed62d51d4e..4b8d81d5939 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/BazFoo.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/BazFoo.cs @@ -2,10 +2,12 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; +using Client.Structure.Service; namespace Client.Structure.Service._Baz { @@ -13,6 +15,8 @@ public partial class BazFoo { protected BazFoo() => throw null; + internal BazFoo(ClientPipeline pipeline, Uri endpoint, ClientType client) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Seven(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Foo.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Foo.cs index 4989e29298c..40c3caa537f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Foo.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Foo.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Foo { protected Foo() => throw null; + internal Foo(ClientPipeline pipeline, Uri endpoint, ClientType client) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Three(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Qux.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Qux.cs index e94b919e17f..886bf284df7 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Qux.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Qux.cs @@ -2,10 +2,12 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; +using Client.Structure.Service; namespace Client.Structure.Service._Qux { @@ -13,6 +15,8 @@ public partial class Qux { protected Qux() => throw null; + internal Qux(ClientPipeline pipeline, Uri endpoint, ClientType client) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Eight(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/QuxBar.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/QuxBar.cs index 1cf32f91487..5b7bc794ae7 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/QuxBar.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/QuxBar.cs @@ -2,10 +2,12 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; +using Client.Structure.Service; namespace Client.Structure.Service._Qux { @@ -13,6 +15,8 @@ public partial class QuxBar { protected QuxBar() => throw null; + internal QuxBar(ClientPipeline pipeline, Uri endpoint, ClientType client) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Nine(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/ServiceClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/ServiceClient.cs index c6745dfd7c9..7dd25ed35c3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/ServiceClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/ServiceClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; using Client.Structure.Service._Baz; @@ -18,7 +19,12 @@ public partial class ServiceClient public ServiceClient(Uri endpoint, ClientType client) : this(endpoint, client, new ServiceClientOptions()) => throw null; - public ServiceClient(Uri endpoint, ClientType client, ServiceClientOptions options) => throw null; + internal ServiceClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, ClientType client, ServiceClientOptions options) => throw null; + + public ServiceClient(Uri endpoint, ClientType client, ServiceClientOptions options) : this(null, endpoint, client, options) => throw null; + + [Experimental("SCME0002")] + public ServiceClient(ServiceClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Client ?? default, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/ServiceClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/ServiceClientOptions.cs index 721c8b6c398..629dbd99553 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/ServiceClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/ServiceClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Client.Structure.Service { public partial class ServiceClientOptions : ClientPipelineOptions { + public ServiceClientOptions() => throw null; + + [Experimental("SCME0002")] + internal ServiceClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/ServiceClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/ServiceClientSettings.cs new file mode 100644 index 00000000000..3f55cc86a90 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/ServiceClientSettings.cs @@ -0,0 +1,35 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Client.Structure.Service +{ + [Experimental("SCME0002")] + public partial class ServiceClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public ClientType? Client + { + get => throw null; + set => throw null; + } + + public ServiceClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..56265421f49 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,52 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "ServiceClient": { + "type": "object", + "description": "Configuration for ServiceClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Client": { + "$ref": "#/definitions/clientType" + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/serviceClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "clientType": { + "enum": [ + "default", + "multi-client", + "renamed-operation", + "two-operation-group", + "client-operation-group" + ] + }, + "serviceClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/Client.Structure.Service.Multi.Client.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/Client.Structure.Service.Multi.Client.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/Client.Structure.Service.Multi.Client.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/Client.Structure.Service.Multi.Client.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/Client.Structure.Service.Multi.Client.sln deleted file mode 100644 index e23454261c2..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/Client.Structure.Service.Multi.Client.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.Structure.Service.Multi.Client", "src\Client.Structure.Service.Multi.Client.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/Client.Structure.Service.Multi.Client.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/Client.Structure.Service.Multi.Client.slnx new file mode 100644 index 00000000000..5186a4e9f5c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/Client.Structure.Service.Multi.Client.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Client.Structure.Service.Multi.Client.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Client.Structure.Service.Multi.Client.csproj index e6b5dbce271..61e469eeebc 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Client.Structure.Service.Multi.Client.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Client.Structure.Service.Multi.Client.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientAClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientAClient.cs index 8474e633848..8c586cc178c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientAClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientAClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; using Client.Structure.Service; @@ -17,7 +18,12 @@ public partial class ClientAClient public ClientAClient(Uri endpoint, ClientType client) : this(endpoint, client, new ClientAClientOptions()) => throw null; - public ClientAClient(Uri endpoint, ClientType client, ClientAClientOptions options) => throw null; + internal ClientAClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, ClientType client, ClientAClientOptions options) => throw null; + + public ClientAClient(Uri endpoint, ClientType client, ClientAClientOptions options) : this(null, endpoint, client, options) => throw null; + + [Experimental("SCME0002")] + public ClientAClient(ClientAClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Client ?? default, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientAClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientAClientOptions.cs index d52bc376d61..3eb91cb70a2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientAClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientAClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Client.Structure.MultiClient { public partial class ClientAClientOptions : ClientPipelineOptions { + public ClientAClientOptions() => throw null; + + [Experimental("SCME0002")] + internal ClientAClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientAClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientAClientSettings.cs new file mode 100644 index 00000000000..6f0bbb16861 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientAClientSettings.cs @@ -0,0 +1,36 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Client.Structure.Service; +using Microsoft.Extensions.Configuration; + +namespace Client.Structure.MultiClient +{ + [Experimental("SCME0002")] + public partial class ClientAClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public ClientType? Client + { + get => throw null; + set => throw null; + } + + public ClientAClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientBClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientBClient.cs index 63271b0bf6f..603a41b38b0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientBClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientBClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; using Client.Structure.Service; @@ -17,7 +18,12 @@ public partial class ClientBClient public ClientBClient(Uri endpoint, ClientType client) : this(endpoint, client, new ClientBClientOptions()) => throw null; - public ClientBClient(Uri endpoint, ClientType client, ClientBClientOptions options) => throw null; + internal ClientBClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, ClientType client, ClientBClientOptions options) => throw null; + + public ClientBClient(Uri endpoint, ClientType client, ClientBClientOptions options) : this(null, endpoint, client, options) => throw null; + + [Experimental("SCME0002")] + public ClientBClient(ClientBClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Client ?? default, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientBClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientBClientOptions.cs index 79f628d59e3..5a0fed08e44 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientBClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientBClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Client.Structure.MultiClient { public partial class ClientBClientOptions : ClientPipelineOptions { + public ClientBClientOptions() => throw null; + + [Experimental("SCME0002")] + internal ClientBClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientBClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientBClientSettings.cs new file mode 100644 index 00000000000..e7fc25b871d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/ClientBClientSettings.cs @@ -0,0 +1,36 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Client.Structure.Service; +using Microsoft.Extensions.Configuration; + +namespace Client.Structure.MultiClient +{ + [Experimental("SCME0002")] + public partial class ClientBClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public ClientType? Client + { + get => throw null; + set => throw null; + } + + public ClientBClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..52b7facca37 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,79 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "ClientAClient": { + "type": "object", + "description": "Configuration for ClientAClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Client": { + "$ref": "#/definitions/clientType" + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/clientAClientOptions" + } + } + }, + "ClientBClient": { + "type": "object", + "description": "Configuration for ClientBClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Client": { + "$ref": "#/definitions/clientType" + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/clientBClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "clientAClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + }, + "clientBClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + }, + "clientType": { + "enum": [ + "default", + "multi-client", + "renamed-operation", + "two-operation-group", + "client-operation-group" + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/Client.Structure.Service.Renamed.Operation.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/Client.Structure.Service.Renamed.Operation.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/Client.Structure.Service.Renamed.Operation.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/Client.Structure.Service.Renamed.Operation.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/Client.Structure.Service.Renamed.Operation.sln deleted file mode 100644 index 2b43c22454c..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/Client.Structure.Service.Renamed.Operation.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.Structure.Service.Renamed.Operation", "src\Client.Structure.Service.Renamed.Operation.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/Client.Structure.Service.Renamed.Operation.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/Client.Structure.Service.Renamed.Operation.slnx new file mode 100644 index 00000000000..86c0957c228 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/Client.Structure.Service.Renamed.Operation.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Client.Structure.Service.Renamed.Operation.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Client.Structure.Service.Renamed.Operation.csproj index e7f97fb99b8..60d5bc3d136 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Client.Structure.Service.Renamed.Operation.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Client.Structure.Service.Renamed.Operation.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/Group.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/Group.cs index 43d04d3edb0..f9ce619bfe6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/Group.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/Group.cs @@ -2,10 +2,12 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; +using Client.Structure.Service; namespace Client.Structure.RenamedOperation { @@ -13,6 +15,8 @@ public partial class Group { protected Group() => throw null; + internal Group(ClientPipeline pipeline, Uri endpoint, ClientType client) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult RenamedTwo(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/RenamedOperationClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/RenamedOperationClient.cs index acb300be1b5..a3aa6ae6103 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/RenamedOperationClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/RenamedOperationClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; using Client.Structure.Service; @@ -17,7 +18,12 @@ public partial class RenamedOperationClient public RenamedOperationClient(Uri endpoint, ClientType client) : this(endpoint, client, new RenamedOperationClientOptions()) => throw null; - public RenamedOperationClient(Uri endpoint, ClientType client, RenamedOperationClientOptions options) => throw null; + internal RenamedOperationClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, ClientType client, RenamedOperationClientOptions options) => throw null; + + public RenamedOperationClient(Uri endpoint, ClientType client, RenamedOperationClientOptions options) : this(null, endpoint, client, options) => throw null; + + [Experimental("SCME0002")] + public RenamedOperationClient(RenamedOperationClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Client ?? default, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/RenamedOperationClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/RenamedOperationClientOptions.cs index 981265b249d..d0992ccf0df 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/RenamedOperationClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/RenamedOperationClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Client.Structure.RenamedOperation { public partial class RenamedOperationClientOptions : ClientPipelineOptions { + public RenamedOperationClientOptions() => throw null; + + [Experimental("SCME0002")] + internal RenamedOperationClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/RenamedOperationClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/RenamedOperationClientSettings.cs new file mode 100644 index 00000000000..ad180f069ef --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/RenamedOperationClientSettings.cs @@ -0,0 +1,36 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Client.Structure.Service; +using Microsoft.Extensions.Configuration; + +namespace Client.Structure.RenamedOperation +{ + [Experimental("SCME0002")] + public partial class RenamedOperationClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public ClientType? Client + { + get => throw null; + set => throw null; + } + + public RenamedOperationClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..486c6fe3689 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,52 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "RenamedOperationClient": { + "type": "object", + "description": "Configuration for RenamedOperationClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Client": { + "$ref": "#/definitions/clientType" + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/renamedOperationClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "clientType": { + "enum": [ + "default", + "multi-client", + "renamed-operation", + "two-operation-group", + "client-operation-group" + ] + }, + "renamedOperationClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/Client.Structure.Service.TwoOperationGroup.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/Client.Structure.Service.TwoOperationGroup.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/Client.Structure.Service.TwoOperationGroup.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/Client.Structure.Service.TwoOperationGroup.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/Client.Structure.Service.TwoOperationGroup.sln deleted file mode 100644 index 1b674d73e3a..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/Client.Structure.Service.TwoOperationGroup.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.Structure.Service.TwoOperationGroup", "src\Client.Structure.Service.TwoOperationGroup.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/Client.Structure.Service.TwoOperationGroup.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/Client.Structure.Service.TwoOperationGroup.slnx new file mode 100644 index 00000000000..be48e3168e6 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/Client.Structure.Service.TwoOperationGroup.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Client.Structure.Service.TwoOperationGroup.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Client.Structure.Service.TwoOperationGroup.csproj index 1bb7799a71e..2dc596e34e8 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Client.Structure.Service.TwoOperationGroup.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Client.Structure.Service.TwoOperationGroup.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/Group1.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/Group1.cs index 4657d169616..292fd14c3c6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/Group1.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/Group1.cs @@ -2,10 +2,12 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; +using Client.Structure.Service; namespace Client.Structure.TwoOperationGroup { @@ -13,6 +15,8 @@ public partial class Group1 { protected Group1() => throw null; + internal Group1(ClientPipeline pipeline, Uri endpoint, ClientType client) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult One(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/Group2.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/Group2.cs index 783310627ed..9b04ac2eba9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/Group2.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/Group2.cs @@ -2,10 +2,12 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; +using Client.Structure.Service; namespace Client.Structure.TwoOperationGroup { @@ -13,6 +15,8 @@ public partial class Group2 { protected Group2() => throw null; + internal Group2(ClientPipeline pipeline, Uri endpoint, ClientType client) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Two(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClient.cs index 42cdaf6080a..a5ae0dae401 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using Client.Structure.Service; namespace Client.Structure.TwoOperationGroup @@ -14,7 +15,12 @@ public partial class TwoOperationGroupClient public TwoOperationGroupClient(Uri endpoint, ClientType client) : this(endpoint, client, new TwoOperationGroupClientOptions()) => throw null; - public TwoOperationGroupClient(Uri endpoint, ClientType client, TwoOperationGroupClientOptions options) => throw null; + internal TwoOperationGroupClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, ClientType client, TwoOperationGroupClientOptions options) => throw null; + + public TwoOperationGroupClient(Uri endpoint, ClientType client, TwoOperationGroupClientOptions options) : this(null, endpoint, client, options) => throw null; + + [Experimental("SCME0002")] + public TwoOperationGroupClient(TwoOperationGroupClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Client ?? default, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClientOptions.cs index 95058870aa8..f2f71a70cb9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Client.Structure.TwoOperationGroup { public partial class TwoOperationGroupClientOptions : ClientPipelineOptions { + public TwoOperationGroupClientOptions() => throw null; + + [Experimental("SCME0002")] + internal TwoOperationGroupClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClientSettings.cs new file mode 100644 index 00000000000..95a3a7d145b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClientSettings.cs @@ -0,0 +1,36 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Client.Structure.Service; +using Microsoft.Extensions.Configuration; + +namespace Client.Structure.TwoOperationGroup +{ + [Experimental("SCME0002")] + public partial class TwoOperationGroupClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public ClientType? Client + { + get => throw null; + set => throw null; + } + + public TwoOperationGroupClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..e45184ac881 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,52 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "TwoOperationGroupClient": { + "type": "object", + "description": "Configuration for TwoOperationGroupClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Client": { + "$ref": "#/definitions/clientType" + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/twoOperationGroupClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "clientType": { + "enum": [ + "default", + "multi-client", + "renamed-operation", + "two-operation-group", + "client-operation-group" + ] + }, + "twoOperationGroupClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/Documentation.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/Documentation.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/Documentation.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/Documentation.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/Documentation.sln deleted file mode 100644 index a0b3f32bbb2..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/Documentation.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Documentation", "src\Documentation.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/Documentation.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/Documentation.slnx new file mode 100644 index 00000000000..270592e0b7d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/Documentation.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Documentation.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Documentation.csproj index 0b3fe015fb3..975a58bd719 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Documentation.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Documentation.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/DocumentationClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/DocumentationClient.cs index 8f961dff791..a666718a60c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/DocumentationClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/DocumentationClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using Documentation._Lists; using Documentation._TextFormatting; @@ -13,7 +14,12 @@ public partial class DocumentationClient { public DocumentationClient() : this(new Uri("http://localhost:3000"), new DocumentationClientOptions()) => throw null; - public DocumentationClient(Uri endpoint, DocumentationClientOptions options) => throw null; + internal DocumentationClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, DocumentationClientOptions options) => throw null; + + public DocumentationClient(Uri endpoint, DocumentationClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public DocumentationClient(DocumentationClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/DocumentationClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/DocumentationClientOptions.cs index d14497f2a3d..71abccf911b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/DocumentationClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/DocumentationClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Documentation { public partial class DocumentationClientOptions : ClientPipelineOptions { + public DocumentationClientOptions() => throw null; + + [Experimental("SCME0002")] + internal DocumentationClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/DocumentationClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/DocumentationClientSettings.cs new file mode 100644 index 00000000000..3359778538d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/DocumentationClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Documentation +{ + [Experimental("SCME0002")] + public partial class DocumentationClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public DocumentationClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/Lists.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/Lists.cs index 34bf1c4e427..448bdd8c7c6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/Lists.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/Lists.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Lists { protected Lists() => throw null; + internal Lists(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult BulletPointsOp(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/Models/BulletPointsModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/Models/BulletPointsModel.Serialization.cs index 0648f46131f..ce306ea607d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/Models/BulletPointsModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/Models/BulletPointsModel.Serialization.cs @@ -12,22 +12,22 @@ public partial class BulletPointsModel : IJsonModel { internal BulletPointsModel() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BulletPointsModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - BulletPointsModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BulletPointsModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BulletPointsModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - BulletPointsModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual BulletPointsModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + BulletPointsModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual BulletPointsModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/TextFormatting.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/TextFormatting.cs index 6fb8a1e8646..d2190f98461 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/TextFormatting.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/TextFormatting.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class TextFormatting { protected TextFormatting() => throw null; + internal TextFormatting(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult BoldText(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..e9879042aa4 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "DocumentationClient": { + "type": "object", + "description": "Configuration for DocumentationClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/documentationClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "documentationClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/tspCodeModel.json index 86d05631c51..8954a325268 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/tspCodeModel.json @@ -280,10 +280,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Documentation.Lists.bulletPointsModel.contentType" + "crossLanguageDefinitionId": "Documentation.Lists.bulletPointsModel.contentType", + "methodParameterSegments": [ + { + "$id": "22", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "6" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Documentation.Lists.bulletPointsModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "22", + "$id": "23", "kind": "body", "name": "bulletPointsModelRequest", "serializedName": "bulletPointsModelRequest", @@ -299,13 +319,32 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Documentation.Lists.bulletPointsModel.body" + "crossLanguageDefinitionId": "Documentation.Lists.bulletPointsModel.body", + "methodParameterSegments": [ + { + "$id": "24", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "8" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Documentation.Lists.bulletPointsModel.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ { "statusCodes": [ - 204 + 200 ], "headers": [], "isErrorResponse": false @@ -326,39 +365,10 @@ }, "parameters": [ { - "$id": "23", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "8" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Documentation.Lists.bulletPointsModel.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "24" }, { - "$id": "24", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "6" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Documentation.Lists.bulletPointsModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "22" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/Encode.Array.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/Encode.Array.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/Encode.Array.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/Encode.Array.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/Encode.Array.sln deleted file mode 100644 index 112586204f8..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/Encode.Array.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Encode.Array", "src\Encode.Array.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/Encode.Array.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/Encode.Array.slnx new file mode 100644 index 00000000000..e27ac1f591d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/Encode.Array.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Encode.Array.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Encode.Array.csproj index d7ccd424c1e..ef50ac3f6a5 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Encode.Array.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Encode.Array.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/ArrayClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/ArrayClient.cs index 55ae5b366f0..be13cf124dd 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/ArrayClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/ArrayClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using Encode._Array._Property; namespace Encode._Array @@ -12,7 +13,12 @@ public partial class ArrayClient { public ArrayClient() : this(new Uri("http://localhost:3000"), new ArrayClientOptions()) => throw null; - public ArrayClient(Uri endpoint, ArrayClientOptions options) => throw null; + internal ArrayClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, ArrayClientOptions options) => throw null; + + public ArrayClient(Uri endpoint, ArrayClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public ArrayClient(ArrayClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/ArrayClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/ArrayClientOptions.cs index 392d2e67a55..53bc44de8ab 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/ArrayClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/ArrayClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Encode._Array { public partial class ArrayClientOptions : ClientPipelineOptions { + public ArrayClientOptions() => throw null; + + [Experimental("SCME0002")] + internal ArrayClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/ArrayClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/ArrayClientSettings.cs new file mode 100644 index 00000000000..a63b499749e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/ArrayClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Encode._Array +{ + [Experimental("SCME0002")] + public partial class ArrayClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public ArrayClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/EncodeArrayModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/EncodeArrayModelFactory.cs index f1b065009ce..9c9a8a45b56 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/EncodeArrayModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/EncodeArrayModelFactory.cs @@ -15,5 +15,21 @@ public static partial class EncodeArrayModelFactory public static PipeDelimitedArrayProperty PipeDelimitedArrayProperty(IEnumerable value = default) => throw null; public static NewlineDelimitedArrayProperty NewlineDelimitedArrayProperty(IEnumerable value = default) => throw null; + + public static CommaDelimitedEnumArrayProperty CommaDelimitedEnumArrayProperty(IEnumerable value = default) => throw null; + + public static SpaceDelimitedEnumArrayProperty SpaceDelimitedEnumArrayProperty(IEnumerable value = default) => throw null; + + public static PipeDelimitedEnumArrayProperty PipeDelimitedEnumArrayProperty(IEnumerable value = default) => throw null; + + public static NewlineDelimitedEnumArrayProperty NewlineDelimitedEnumArrayProperty(IEnumerable value = default) => throw null; + + public static CommaDelimitedExtensibleEnumArrayProperty CommaDelimitedExtensibleEnumArrayProperty(IEnumerable value = default) => throw null; + + public static SpaceDelimitedExtensibleEnumArrayProperty SpaceDelimitedExtensibleEnumArrayProperty(IEnumerable value = default) => throw null; + + public static PipeDelimitedExtensibleEnumArrayProperty PipeDelimitedExtensibleEnumArrayProperty(IEnumerable value = default) => throw null; + + public static NewlineDelimitedExtensibleEnumArrayProperty NewlineDelimitedExtensibleEnumArrayProperty(IEnumerable value = default) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/Colors.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/Colors.cs new file mode 100644 index 00000000000..e3b0dba273d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/Colors.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +namespace Encode._Array +{ + public enum Colors + { + /// Blue. + Blue, + /// Red. + Red, + /// Green. + Green + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/ColorsExtensibleEnum.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/ColorsExtensibleEnum.cs new file mode 100644 index 00000000000..72d5493e135 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/ColorsExtensibleEnum.cs @@ -0,0 +1,38 @@ +// + +#nullable disable + +using System; +using System.ComponentModel; + +namespace Encode._Array +{ + public readonly partial struct ColorsExtensibleEnum : IEquatable + { + public ColorsExtensibleEnum(string value) => throw null; + + public static ColorsExtensibleEnum Blue => throw null; + + public static ColorsExtensibleEnum Red => throw null; + + public static ColorsExtensibleEnum Green => throw null; + + public static bool operator ==(ColorsExtensibleEnum left, ColorsExtensibleEnum right) => throw null; + + public static bool operator !=(ColorsExtensibleEnum left, ColorsExtensibleEnum right) => throw null; + + public static implicit operator ColorsExtensibleEnum(string value) => throw null; + + public static implicit operator ColorsExtensibleEnum?(string value) => throw null; + + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object obj) => throw null; + + public bool Equals(ColorsExtensibleEnum other) => throw null; + + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => throw null; + + public override string ToString() => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/CommaDelimitedArrayProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/CommaDelimitedArrayProperty.Serialization.cs index c0c7fbd4732..1d4369770a8 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/CommaDelimitedArrayProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/CommaDelimitedArrayProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class CommaDelimitedArrayProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - CommaDelimitedArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual CommaDelimitedArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual CommaDelimitedArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - CommaDelimitedArrayProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual CommaDelimitedArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(CommaDelimitedArrayProperty commaDelimitedArrayProperty) => throw null; public static explicit operator CommaDelimitedArrayProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + CommaDelimitedArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual CommaDelimitedArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/CommaDelimitedEnumArrayProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/CommaDelimitedEnumArrayProperty.Serialization.cs new file mode 100644 index 00000000000..a5971f65c20 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/CommaDelimitedEnumArrayProperty.Serialization.cs @@ -0,0 +1,38 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Text.Json; + +namespace Encode._Array +{ + public partial class CommaDelimitedEnumArrayProperty : IJsonModel + { + internal CommaDelimitedEnumArrayProperty() => throw null; + + protected virtual CommaDelimitedEnumArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + CommaDelimitedEnumArrayProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(CommaDelimitedEnumArrayProperty commaDelimitedEnumArrayProperty) => throw null; + + public static explicit operator CommaDelimitedEnumArrayProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + CommaDelimitedEnumArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual CommaDelimitedEnumArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/CommaDelimitedEnumArrayProperty.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/CommaDelimitedEnumArrayProperty.cs new file mode 100644 index 00000000000..a2bf5aa9700 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/CommaDelimitedEnumArrayProperty.cs @@ -0,0 +1,15 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Encode._Array +{ + public partial class CommaDelimitedEnumArrayProperty + { + public CommaDelimitedEnumArrayProperty(IEnumerable value) => throw null; + + public IList Value => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/CommaDelimitedExtensibleEnumArrayProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/CommaDelimitedExtensibleEnumArrayProperty.Serialization.cs new file mode 100644 index 00000000000..41e725622a2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/CommaDelimitedExtensibleEnumArrayProperty.Serialization.cs @@ -0,0 +1,38 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Text.Json; + +namespace Encode._Array +{ + public partial class CommaDelimitedExtensibleEnumArrayProperty : IJsonModel + { + internal CommaDelimitedExtensibleEnumArrayProperty() => throw null; + + protected virtual CommaDelimitedExtensibleEnumArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + CommaDelimitedExtensibleEnumArrayProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(CommaDelimitedExtensibleEnumArrayProperty commaDelimitedExtensibleEnumArrayProperty) => throw null; + + public static explicit operator CommaDelimitedExtensibleEnumArrayProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + CommaDelimitedExtensibleEnumArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual CommaDelimitedExtensibleEnumArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/CommaDelimitedExtensibleEnumArrayProperty.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/CommaDelimitedExtensibleEnumArrayProperty.cs new file mode 100644 index 00000000000..10ebefbe14d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/CommaDelimitedExtensibleEnumArrayProperty.cs @@ -0,0 +1,15 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Encode._Array +{ + public partial class CommaDelimitedExtensibleEnumArrayProperty + { + public CommaDelimitedExtensibleEnumArrayProperty(IEnumerable value) => throw null; + + public IList Value => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/Encode_ArrayContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/Encode_ArrayContext.cs index f3ab669d97b..4b8aeb35b97 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/Encode_ArrayContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/Encode_ArrayContext.cs @@ -7,9 +7,17 @@ namespace Encode._Array { [ModelReaderWriterBuildable(typeof(CommaDelimitedArrayProperty))] + [ModelReaderWriterBuildable(typeof(CommaDelimitedEnumArrayProperty))] + [ModelReaderWriterBuildable(typeof(CommaDelimitedExtensibleEnumArrayProperty))] [ModelReaderWriterBuildable(typeof(NewlineDelimitedArrayProperty))] + [ModelReaderWriterBuildable(typeof(NewlineDelimitedEnumArrayProperty))] + [ModelReaderWriterBuildable(typeof(NewlineDelimitedExtensibleEnumArrayProperty))] [ModelReaderWriterBuildable(typeof(PipeDelimitedArrayProperty))] + [ModelReaderWriterBuildable(typeof(PipeDelimitedEnumArrayProperty))] + [ModelReaderWriterBuildable(typeof(PipeDelimitedExtensibleEnumArrayProperty))] [ModelReaderWriterBuildable(typeof(SpaceDelimitedArrayProperty))] + [ModelReaderWriterBuildable(typeof(SpaceDelimitedEnumArrayProperty))] + [ModelReaderWriterBuildable(typeof(SpaceDelimitedExtensibleEnumArrayProperty))] public partial class Encode_ArrayContext : ModelReaderWriterContext { } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/NewlineDelimitedArrayProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/NewlineDelimitedArrayProperty.Serialization.cs index cd31ef81498..5e5633f20a1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/NewlineDelimitedArrayProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/NewlineDelimitedArrayProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class NewlineDelimitedArrayProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - NewlineDelimitedArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual NewlineDelimitedArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual NewlineDelimitedArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - NewlineDelimitedArrayProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual NewlineDelimitedArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(NewlineDelimitedArrayProperty newlineDelimitedArrayProperty) => throw null; public static explicit operator NewlineDelimitedArrayProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + NewlineDelimitedArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual NewlineDelimitedArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/NewlineDelimitedEnumArrayProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/NewlineDelimitedEnumArrayProperty.Serialization.cs new file mode 100644 index 00000000000..6854b3e6aef --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/NewlineDelimitedEnumArrayProperty.Serialization.cs @@ -0,0 +1,38 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Text.Json; + +namespace Encode._Array +{ + public partial class NewlineDelimitedEnumArrayProperty : IJsonModel + { + internal NewlineDelimitedEnumArrayProperty() => throw null; + + protected virtual NewlineDelimitedEnumArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + NewlineDelimitedEnumArrayProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(NewlineDelimitedEnumArrayProperty newlineDelimitedEnumArrayProperty) => throw null; + + public static explicit operator NewlineDelimitedEnumArrayProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + NewlineDelimitedEnumArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual NewlineDelimitedEnumArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/NewlineDelimitedEnumArrayProperty.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/NewlineDelimitedEnumArrayProperty.cs new file mode 100644 index 00000000000..cfcf8bb6912 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/NewlineDelimitedEnumArrayProperty.cs @@ -0,0 +1,15 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Encode._Array +{ + public partial class NewlineDelimitedEnumArrayProperty + { + public NewlineDelimitedEnumArrayProperty(IEnumerable value) => throw null; + + public IList Value => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/NewlineDelimitedExtensibleEnumArrayProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/NewlineDelimitedExtensibleEnumArrayProperty.Serialization.cs new file mode 100644 index 00000000000..72ed6ecbb21 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/NewlineDelimitedExtensibleEnumArrayProperty.Serialization.cs @@ -0,0 +1,38 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Text.Json; + +namespace Encode._Array +{ + public partial class NewlineDelimitedExtensibleEnumArrayProperty : IJsonModel + { + internal NewlineDelimitedExtensibleEnumArrayProperty() => throw null; + + protected virtual NewlineDelimitedExtensibleEnumArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + NewlineDelimitedExtensibleEnumArrayProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(NewlineDelimitedExtensibleEnumArrayProperty newlineDelimitedExtensibleEnumArrayProperty) => throw null; + + public static explicit operator NewlineDelimitedExtensibleEnumArrayProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + NewlineDelimitedExtensibleEnumArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual NewlineDelimitedExtensibleEnumArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/NewlineDelimitedExtensibleEnumArrayProperty.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/NewlineDelimitedExtensibleEnumArrayProperty.cs new file mode 100644 index 00000000000..9a48539c395 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/NewlineDelimitedExtensibleEnumArrayProperty.cs @@ -0,0 +1,15 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Encode._Array +{ + public partial class NewlineDelimitedExtensibleEnumArrayProperty + { + public NewlineDelimitedExtensibleEnumArrayProperty(IEnumerable value) => throw null; + + public IList Value => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/PipeDelimitedArrayProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/PipeDelimitedArrayProperty.Serialization.cs index 77fb59cc6da..ef3e89a72df 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/PipeDelimitedArrayProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/PipeDelimitedArrayProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class PipeDelimitedArrayProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - PipeDelimitedArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual PipeDelimitedArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual PipeDelimitedArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - PipeDelimitedArrayProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual PipeDelimitedArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(PipeDelimitedArrayProperty pipeDelimitedArrayProperty) => throw null; public static explicit operator PipeDelimitedArrayProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + PipeDelimitedArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual PipeDelimitedArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/PipeDelimitedEnumArrayProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/PipeDelimitedEnumArrayProperty.Serialization.cs new file mode 100644 index 00000000000..cb75b92391e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/PipeDelimitedEnumArrayProperty.Serialization.cs @@ -0,0 +1,38 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Text.Json; + +namespace Encode._Array +{ + public partial class PipeDelimitedEnumArrayProperty : IJsonModel + { + internal PipeDelimitedEnumArrayProperty() => throw null; + + protected virtual PipeDelimitedEnumArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + PipeDelimitedEnumArrayProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(PipeDelimitedEnumArrayProperty pipeDelimitedEnumArrayProperty) => throw null; + + public static explicit operator PipeDelimitedEnumArrayProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + PipeDelimitedEnumArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual PipeDelimitedEnumArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/PipeDelimitedEnumArrayProperty.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/PipeDelimitedEnumArrayProperty.cs new file mode 100644 index 00000000000..6ba5f1acaed --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/PipeDelimitedEnumArrayProperty.cs @@ -0,0 +1,15 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Encode._Array +{ + public partial class PipeDelimitedEnumArrayProperty + { + public PipeDelimitedEnumArrayProperty(IEnumerable value) => throw null; + + public IList Value => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/PipeDelimitedExtensibleEnumArrayProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/PipeDelimitedExtensibleEnumArrayProperty.Serialization.cs new file mode 100644 index 00000000000..f8bdee4fd3c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/PipeDelimitedExtensibleEnumArrayProperty.Serialization.cs @@ -0,0 +1,38 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Text.Json; + +namespace Encode._Array +{ + public partial class PipeDelimitedExtensibleEnumArrayProperty : IJsonModel + { + internal PipeDelimitedExtensibleEnumArrayProperty() => throw null; + + protected virtual PipeDelimitedExtensibleEnumArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + PipeDelimitedExtensibleEnumArrayProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(PipeDelimitedExtensibleEnumArrayProperty pipeDelimitedExtensibleEnumArrayProperty) => throw null; + + public static explicit operator PipeDelimitedExtensibleEnumArrayProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + PipeDelimitedExtensibleEnumArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual PipeDelimitedExtensibleEnumArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/PipeDelimitedExtensibleEnumArrayProperty.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/PipeDelimitedExtensibleEnumArrayProperty.cs new file mode 100644 index 00000000000..eb8179b1bd2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/PipeDelimitedExtensibleEnumArrayProperty.cs @@ -0,0 +1,15 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Encode._Array +{ + public partial class PipeDelimitedExtensibleEnumArrayProperty + { + public PipeDelimitedExtensibleEnumArrayProperty(IEnumerable value) => throw null; + + public IList Value => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/SpaceDelimitedArrayProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/SpaceDelimitedArrayProperty.Serialization.cs index d37d4f47a96..ae06f3b208b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/SpaceDelimitedArrayProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/SpaceDelimitedArrayProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class SpaceDelimitedArrayProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - SpaceDelimitedArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual SpaceDelimitedArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SpaceDelimitedArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - SpaceDelimitedArrayProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SpaceDelimitedArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(SpaceDelimitedArrayProperty spaceDelimitedArrayProperty) => throw null; public static explicit operator SpaceDelimitedArrayProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + SpaceDelimitedArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual SpaceDelimitedArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/SpaceDelimitedEnumArrayProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/SpaceDelimitedEnumArrayProperty.Serialization.cs new file mode 100644 index 00000000000..ddb4262a384 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/SpaceDelimitedEnumArrayProperty.Serialization.cs @@ -0,0 +1,38 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Text.Json; + +namespace Encode._Array +{ + public partial class SpaceDelimitedEnumArrayProperty : IJsonModel + { + internal SpaceDelimitedEnumArrayProperty() => throw null; + + protected virtual SpaceDelimitedEnumArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + SpaceDelimitedEnumArrayProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(SpaceDelimitedEnumArrayProperty spaceDelimitedEnumArrayProperty) => throw null; + + public static explicit operator SpaceDelimitedEnumArrayProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + SpaceDelimitedEnumArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual SpaceDelimitedEnumArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/SpaceDelimitedEnumArrayProperty.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/SpaceDelimitedEnumArrayProperty.cs new file mode 100644 index 00000000000..520bfd7e402 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/SpaceDelimitedEnumArrayProperty.cs @@ -0,0 +1,15 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Encode._Array +{ + public partial class SpaceDelimitedEnumArrayProperty + { + public SpaceDelimitedEnumArrayProperty(IEnumerable value) => throw null; + + public IList Value => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/SpaceDelimitedExtensibleEnumArrayProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/SpaceDelimitedExtensibleEnumArrayProperty.Serialization.cs new file mode 100644 index 00000000000..bdb973671d6 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/SpaceDelimitedExtensibleEnumArrayProperty.Serialization.cs @@ -0,0 +1,38 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Text.Json; + +namespace Encode._Array +{ + public partial class SpaceDelimitedExtensibleEnumArrayProperty : IJsonModel + { + internal SpaceDelimitedExtensibleEnumArrayProperty() => throw null; + + protected virtual SpaceDelimitedExtensibleEnumArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + SpaceDelimitedExtensibleEnumArrayProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(SpaceDelimitedExtensibleEnumArrayProperty spaceDelimitedExtensibleEnumArrayProperty) => throw null; + + public static explicit operator SpaceDelimitedExtensibleEnumArrayProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + SpaceDelimitedExtensibleEnumArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual SpaceDelimitedExtensibleEnumArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/SpaceDelimitedExtensibleEnumArrayProperty.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/SpaceDelimitedExtensibleEnumArrayProperty.cs new file mode 100644 index 00000000000..d3caeafb5e1 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/SpaceDelimitedExtensibleEnumArrayProperty.cs @@ -0,0 +1,15 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Encode._Array +{ + public partial class SpaceDelimitedExtensibleEnumArrayProperty + { + public SpaceDelimitedExtensibleEnumArrayProperty(IEnumerable value) => throw null; + + public IList Value => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Property.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Property.cs index e50400b6ee6..cca72b3496d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Property.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Property.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -14,6 +15,8 @@ public partial class Property { protected Property() => throw null; + internal Property(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult CommaDelimited(BinaryContent content, RequestOptions options = null) => throw null; @@ -47,5 +50,69 @@ public partial class Property public virtual ClientResult NewlineDelimited(NewlineDelimitedArrayProperty body, CancellationToken cancellationToken = default) => throw null; public virtual Task> NewlineDelimitedAsync(NewlineDelimitedArrayProperty body, CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult EnumCommaDelimited(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task EnumCommaDelimitedAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult EnumCommaDelimited(CommaDelimitedEnumArrayProperty body, CancellationToken cancellationToken = default) => throw null; + + public virtual Task> EnumCommaDelimitedAsync(CommaDelimitedEnumArrayProperty body, CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult EnumSpaceDelimited(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task EnumSpaceDelimitedAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult EnumSpaceDelimited(SpaceDelimitedEnumArrayProperty body, CancellationToken cancellationToken = default) => throw null; + + public virtual Task> EnumSpaceDelimitedAsync(SpaceDelimitedEnumArrayProperty body, CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult EnumPipeDelimited(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task EnumPipeDelimitedAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult EnumPipeDelimited(PipeDelimitedEnumArrayProperty body, CancellationToken cancellationToken = default) => throw null; + + public virtual Task> EnumPipeDelimitedAsync(PipeDelimitedEnumArrayProperty body, CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult EnumNewlineDelimited(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task EnumNewlineDelimitedAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult EnumNewlineDelimited(NewlineDelimitedEnumArrayProperty body, CancellationToken cancellationToken = default) => throw null; + + public virtual Task> EnumNewlineDelimitedAsync(NewlineDelimitedEnumArrayProperty body, CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult ExtensibleEnumCommaDelimited(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task ExtensibleEnumCommaDelimitedAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult ExtensibleEnumCommaDelimited(CommaDelimitedExtensibleEnumArrayProperty body, CancellationToken cancellationToken = default) => throw null; + + public virtual Task> ExtensibleEnumCommaDelimitedAsync(CommaDelimitedExtensibleEnumArrayProperty body, CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult ExtensibleEnumSpaceDelimited(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task ExtensibleEnumSpaceDelimitedAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult ExtensibleEnumSpaceDelimited(SpaceDelimitedExtensibleEnumArrayProperty body, CancellationToken cancellationToken = default) => throw null; + + public virtual Task> ExtensibleEnumSpaceDelimitedAsync(SpaceDelimitedExtensibleEnumArrayProperty body, CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult ExtensibleEnumPipeDelimited(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task ExtensibleEnumPipeDelimitedAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult ExtensibleEnumPipeDelimited(PipeDelimitedExtensibleEnumArrayProperty body, CancellationToken cancellationToken = default) => throw null; + + public virtual Task> ExtensibleEnumPipeDelimitedAsync(PipeDelimitedExtensibleEnumArrayProperty body, CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult ExtensibleEnumNewlineDelimited(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task ExtensibleEnumNewlineDelimitedAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult ExtensibleEnumNewlineDelimited(NewlineDelimitedExtensibleEnumArrayProperty body, CancellationToken cancellationToken = default) => throw null; + + public virtual Task> ExtensibleEnumNewlineDelimitedAsync(NewlineDelimitedExtensibleEnumArrayProperty body, CancellationToken cancellationToken = default) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..daafccb5cfb --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "ArrayClient": { + "type": "object", + "description": "Configuration for ArrayClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/arrayClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "arrayClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/tspCodeModel.json index cd6f63d67de..858cc8f026f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/tspCodeModel.json @@ -1,16 +1,135 @@ { "name": "Encode.Array", "apiVersions": [], - "enums": [], - "constants": [ + "enums": [ { "$id": "1", + "kind": "enum", + "name": "Colors", + "crossLanguageDefinitionId": "Encode.Array.Colors", + "valueType": { + "$id": "2", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "values": [ + { + "$id": "3", + "kind": "enumvalue", + "name": "Blue", + "value": "blue", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "4", + "kind": "enumvalue", + "name": "Red", + "value": "red", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "5", + "kind": "enumvalue", + "name": "Green", + "value": "green", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + } + ], + "namespace": "Encode.Array", + "isFixed": true, + "isFlags": false, + "usage": "Input,Output,Json", + "decorators": [] + }, + { + "$id": "6", + "kind": "enum", + "name": "ColorsExtensibleEnum", + "crossLanguageDefinitionId": "Encode.Array.ColorsExtensibleEnum", + "valueType": { + "$id": "7", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "values": [ + { + "$id": "8", + "kind": "enumvalue", + "name": "Blue", + "value": "blue", + "valueType": { + "$ref": "7" + }, + "enumType": { + "$ref": "6" + }, + "decorators": [] + }, + { + "$id": "9", + "kind": "enumvalue", + "name": "Red", + "value": "red", + "valueType": { + "$ref": "7" + }, + "enumType": { + "$ref": "6" + }, + "decorators": [] + }, + { + "$id": "10", + "kind": "enumvalue", + "name": "Green", + "value": "green", + "valueType": { + "$ref": "7" + }, + "enumType": { + "$ref": "6" + }, + "decorators": [] + } + ], + "namespace": "Encode.Array", + "isFixed": false, + "isFlags": false, + "usage": "Input,Output,Json", + "decorators": [] + } + ], + "constants": [ + { + "$id": "11", "kind": "constant", "name": "commaDelimitedContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "2", + "$id": "12", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -20,13 +139,13 @@ "decorators": [] }, { - "$id": "3", + "$id": "13", "kind": "constant", "name": "commaDelimitedContentType1", "namespace": "", "usage": "None", "valueType": { - "$id": "4", + "$id": "14", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -36,13 +155,13 @@ "decorators": [] }, { - "$id": "5", + "$id": "15", "kind": "constant", "name": "spaceDelimitedContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "6", + "$id": "16", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -52,13 +171,13 @@ "decorators": [] }, { - "$id": "7", + "$id": "17", "kind": "constant", "name": "spaceDelimitedContentType1", "namespace": "", "usage": "None", "valueType": { - "$id": "8", + "$id": "18", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -68,13 +187,13 @@ "decorators": [] }, { - "$id": "9", + "$id": "19", "kind": "constant", "name": "pipeDelimitedContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "10", + "$id": "20", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -84,13 +203,13 @@ "decorators": [] }, { - "$id": "11", + "$id": "21", "kind": "constant", "name": "pipeDelimitedContentType1", "namespace": "", "usage": "None", "valueType": { - "$id": "12", + "$id": "22", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -100,13 +219,13 @@ "decorators": [] }, { - "$id": "13", + "$id": "23", "kind": "constant", "name": "newlineDelimitedContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "14", + "$id": "24", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -116,13 +235,13 @@ "decorators": [] }, { - "$id": "15", + "$id": "25", "kind": "constant", "name": "newlineDelimitedContentType1", "namespace": "", "usage": "None", "valueType": { - "$id": "16", + "$id": "26", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -130,244 +249,1850 @@ }, "value": "application/json", "decorators": [] - } - ], - "models": [ + }, { - "$id": "17", - "kind": "model", - "name": "CommaDelimitedArrayProperty", - "namespace": "Encode.Array", - "crossLanguageDefinitionId": "Encode.Array.CommaDelimitedArrayProperty", - "usage": "Input,Output,Json", - "decorators": [], - "serializationOptions": { - "json": { - "name": "CommaDelimitedArrayProperty" - } + "$id": "27", + "kind": "constant", + "name": "enumCommaDelimitedContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "28", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, - "properties": [ - { - "$id": "18", - "kind": "property", - "name": "value", - "serializedName": "value", - "type": { - "$id": "19", - "kind": "array", - "name": "Array", - "valueType": { - "$id": "20", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.Array", - "decorators": [] - }, - "optional": false, - "readOnly": false, - "discriminator": false, - "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "Encode.Array.CommaDelimitedArrayProperty.value", - "serializationOptions": { - "json": { - "name": "value" - } - }, - "isHttpMetadata": false, - "encode": "commaDelimited" - } - ] + "value": "application/json", + "decorators": [] }, { - "$id": "21", - "kind": "model", - "name": "SpaceDelimitedArrayProperty", - "namespace": "Encode.Array", - "crossLanguageDefinitionId": "Encode.Array.SpaceDelimitedArrayProperty", - "usage": "Input,Output,Json", - "decorators": [], - "serializationOptions": { - "json": { - "name": "SpaceDelimitedArrayProperty" - } + "$id": "29", + "kind": "constant", + "name": "enumCommaDelimitedContentType1", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "30", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, - "properties": [ - { - "$id": "22", - "kind": "property", - "name": "value", - "serializedName": "value", - "type": { - "$ref": "19" - }, - "optional": false, - "readOnly": false, - "discriminator": false, - "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "Encode.Array.SpaceDelimitedArrayProperty.value", - "serializationOptions": { - "json": { - "name": "value" - } - }, - "isHttpMetadata": false, - "encode": "spaceDelimited" - } - ] + "value": "application/json", + "decorators": [] }, { - "$id": "23", - "kind": "model", - "name": "PipeDelimitedArrayProperty", - "namespace": "Encode.Array", - "crossLanguageDefinitionId": "Encode.Array.PipeDelimitedArrayProperty", - "usage": "Input,Output,Json", - "decorators": [], - "serializationOptions": { - "json": { - "name": "PipeDelimitedArrayProperty" - } + "$id": "31", + "kind": "constant", + "name": "enumSpaceDelimitedContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "32", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, - "properties": [ - { - "$id": "24", - "kind": "property", - "name": "value", - "serializedName": "value", - "type": { - "$ref": "19" - }, - "optional": false, - "readOnly": false, - "discriminator": false, - "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "Encode.Array.PipeDelimitedArrayProperty.value", - "serializationOptions": { - "json": { - "name": "value" - } - }, - "isHttpMetadata": false, - "encode": "pipeDelimited" - } - ] + "value": "application/json", + "decorators": [] }, { - "$id": "25", - "kind": "model", - "name": "NewlineDelimitedArrayProperty", - "namespace": "Encode.Array", - "crossLanguageDefinitionId": "Encode.Array.NewlineDelimitedArrayProperty", - "usage": "Input,Output,Json", - "decorators": [], - "serializationOptions": { - "json": { - "name": "NewlineDelimitedArrayProperty" - } + "$id": "33", + "kind": "constant", + "name": "enumSpaceDelimitedContentType1", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "34", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, - "properties": [ - { - "$id": "26", - "kind": "property", - "name": "value", - "serializedName": "value", - "type": { - "$ref": "19" - }, - "optional": false, - "readOnly": false, - "discriminator": false, - "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "Encode.Array.NewlineDelimitedArrayProperty.value", - "serializationOptions": { - "json": { - "name": "value" - } - }, - "isHttpMetadata": false, - "encode": "newlineDelimited" - } - ] - } - ], - "clients": [ + "value": "application/json", + "decorators": [] + }, { - "$id": "27", - "kind": "client", - "name": "ArrayClient", + "$id": "35", + "kind": "constant", + "name": "enumPipeDelimitedContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "36", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "37", + "kind": "constant", + "name": "enumPipeDelimitedContentType1", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "38", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "39", + "kind": "constant", + "name": "enumNewlineDelimitedContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "40", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "41", + "kind": "constant", + "name": "enumNewlineDelimitedContentType1", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "42", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "43", + "kind": "constant", + "name": "extensibleEnumCommaDelimitedContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "44", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "45", + "kind": "constant", + "name": "extensibleEnumCommaDelimitedContentType1", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "46", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "47", + "kind": "constant", + "name": "extensibleEnumSpaceDelimitedContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "48", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "49", + "kind": "constant", + "name": "extensibleEnumSpaceDelimitedContentType1", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "50", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "51", + "kind": "constant", + "name": "extensibleEnumPipeDelimitedContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "52", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "53", + "kind": "constant", + "name": "extensibleEnumPipeDelimitedContentType1", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "54", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "55", + "kind": "constant", + "name": "extensibleEnumNewlineDelimitedContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "56", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "57", + "kind": "constant", + "name": "extensibleEnumNewlineDelimitedContentType1", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "58", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + } + ], + "models": [ + { + "$id": "59", + "kind": "model", + "name": "CommaDelimitedArrayProperty", "namespace": "Encode.Array", - "doc": "Test for encode decorator on array.", - "methods": [], - "parameters": [ + "crossLanguageDefinitionId": "Encode.Array.CommaDelimitedArrayProperty", + "usage": "Input,Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "CommaDelimitedArrayProperty" + } + }, + "properties": [ { - "$id": "28", - "kind": "endpoint", - "name": "endpoint", - "serializedName": "endpoint", - "doc": "Service host", + "$id": "60", + "kind": "property", + "name": "value", + "serializedName": "value", "type": { - "$id": "29", - "kind": "url", - "name": "endpoint", - "crossLanguageDefinitionId": "TypeSpec.url" - }, - "isApiVersion": false, - "optional": false, - "scope": "Client", - "isEndpoint": true, - "defaultValue": { - "type": { - "$id": "30", + "$id": "61", + "kind": "array", + "name": "Array", + "valueType": { + "$id": "62", "kind": "string", "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string" + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, - "value": "http://localhost:3000" + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] }, - "serverUrlTemplate": "{endpoint}", - "skipUrlEncoding": false, + "optional": false, "readOnly": false, - "crossLanguageDefinitionId": "Encode.Array.endpoint" + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.CommaDelimitedArrayProperty.value", + "serializationOptions": { + "json": { + "name": "value" + } + }, + "isHttpMetadata": false, + "encode": "commaDelimited" } - ], - "initializedBy": 1, + ] + }, + { + "$id": "63", + "kind": "model", + "name": "SpaceDelimitedArrayProperty", + "namespace": "Encode.Array", + "crossLanguageDefinitionId": "Encode.Array.SpaceDelimitedArrayProperty", + "usage": "Input,Output,Json", "decorators": [], - "crossLanguageDefinitionId": "Encode.Array", - "apiVersions": [], - "children": [ + "serializationOptions": { + "json": { + "name": "SpaceDelimitedArrayProperty" + } + }, + "properties": [ { - "$id": "31", - "kind": "client", - "name": "Property", - "namespace": "Encode.Array.Property", - "methods": [ + "$id": "64", + "kind": "property", + "name": "value", + "serializedName": "value", + "type": { + "$ref": "61" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.SpaceDelimitedArrayProperty.value", + "serializationOptions": { + "json": { + "name": "value" + } + }, + "isHttpMetadata": false, + "encode": "spaceDelimited" + } + ] + }, + { + "$id": "65", + "kind": "model", + "name": "PipeDelimitedArrayProperty", + "namespace": "Encode.Array", + "crossLanguageDefinitionId": "Encode.Array.PipeDelimitedArrayProperty", + "usage": "Input,Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "PipeDelimitedArrayProperty" + } + }, + "properties": [ + { + "$id": "66", + "kind": "property", + "name": "value", + "serializedName": "value", + "type": { + "$ref": "61" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.PipeDelimitedArrayProperty.value", + "serializationOptions": { + "json": { + "name": "value" + } + }, + "isHttpMetadata": false, + "encode": "pipeDelimited" + } + ] + }, + { + "$id": "67", + "kind": "model", + "name": "NewlineDelimitedArrayProperty", + "namespace": "Encode.Array", + "crossLanguageDefinitionId": "Encode.Array.NewlineDelimitedArrayProperty", + "usage": "Input,Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "NewlineDelimitedArrayProperty" + } + }, + "properties": [ + { + "$id": "68", + "kind": "property", + "name": "value", + "serializedName": "value", + "type": { + "$ref": "61" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.NewlineDelimitedArrayProperty.value", + "serializationOptions": { + "json": { + "name": "value" + } + }, + "isHttpMetadata": false, + "encode": "newlineDelimited" + } + ] + }, + { + "$id": "69", + "kind": "model", + "name": "CommaDelimitedEnumArrayProperty", + "namespace": "Encode.Array", + "crossLanguageDefinitionId": "Encode.Array.CommaDelimitedEnumArrayProperty", + "usage": "Input,Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "CommaDelimitedEnumArrayProperty" + } + }, + "properties": [ + { + "$id": "70", + "kind": "property", + "name": "value", + "serializedName": "value", + "type": { + "$id": "71", + "kind": "array", + "name": "ArrayColors", + "valueType": { + "$ref": "1" + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.CommaDelimitedEnumArrayProperty.value", + "serializationOptions": { + "json": { + "name": "value" + } + }, + "isHttpMetadata": false, + "encode": "commaDelimited" + } + ] + }, + { + "$id": "72", + "kind": "model", + "name": "SpaceDelimitedEnumArrayProperty", + "namespace": "Encode.Array", + "crossLanguageDefinitionId": "Encode.Array.SpaceDelimitedEnumArrayProperty", + "usage": "Input,Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "SpaceDelimitedEnumArrayProperty" + } + }, + "properties": [ + { + "$id": "73", + "kind": "property", + "name": "value", + "serializedName": "value", + "type": { + "$ref": "71" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.SpaceDelimitedEnumArrayProperty.value", + "serializationOptions": { + "json": { + "name": "value" + } + }, + "isHttpMetadata": false, + "encode": "spaceDelimited" + } + ] + }, + { + "$id": "74", + "kind": "model", + "name": "PipeDelimitedEnumArrayProperty", + "namespace": "Encode.Array", + "crossLanguageDefinitionId": "Encode.Array.PipeDelimitedEnumArrayProperty", + "usage": "Input,Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "PipeDelimitedEnumArrayProperty" + } + }, + "properties": [ + { + "$id": "75", + "kind": "property", + "name": "value", + "serializedName": "value", + "type": { + "$ref": "71" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.PipeDelimitedEnumArrayProperty.value", + "serializationOptions": { + "json": { + "name": "value" + } + }, + "isHttpMetadata": false, + "encode": "pipeDelimited" + } + ] + }, + { + "$id": "76", + "kind": "model", + "name": "NewlineDelimitedEnumArrayProperty", + "namespace": "Encode.Array", + "crossLanguageDefinitionId": "Encode.Array.NewlineDelimitedEnumArrayProperty", + "usage": "Input,Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "NewlineDelimitedEnumArrayProperty" + } + }, + "properties": [ + { + "$id": "77", + "kind": "property", + "name": "value", + "serializedName": "value", + "type": { + "$ref": "71" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.NewlineDelimitedEnumArrayProperty.value", + "serializationOptions": { + "json": { + "name": "value" + } + }, + "isHttpMetadata": false, + "encode": "newlineDelimited" + } + ] + }, + { + "$id": "78", + "kind": "model", + "name": "CommaDelimitedExtensibleEnumArrayProperty", + "namespace": "Encode.Array", + "crossLanguageDefinitionId": "Encode.Array.CommaDelimitedExtensibleEnumArrayProperty", + "usage": "Input,Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "CommaDelimitedExtensibleEnumArrayProperty" + } + }, + "properties": [ + { + "$id": "79", + "kind": "property", + "name": "value", + "serializedName": "value", + "type": { + "$id": "80", + "kind": "array", + "name": "ArrayColorsExtensibleEnum", + "valueType": { + "$ref": "6" + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.CommaDelimitedExtensibleEnumArrayProperty.value", + "serializationOptions": { + "json": { + "name": "value" + } + }, + "isHttpMetadata": false, + "encode": "commaDelimited" + } + ] + }, + { + "$id": "81", + "kind": "model", + "name": "SpaceDelimitedExtensibleEnumArrayProperty", + "namespace": "Encode.Array", + "crossLanguageDefinitionId": "Encode.Array.SpaceDelimitedExtensibleEnumArrayProperty", + "usage": "Input,Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "SpaceDelimitedExtensibleEnumArrayProperty" + } + }, + "properties": [ + { + "$id": "82", + "kind": "property", + "name": "value", + "serializedName": "value", + "type": { + "$ref": "80" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.SpaceDelimitedExtensibleEnumArrayProperty.value", + "serializationOptions": { + "json": { + "name": "value" + } + }, + "isHttpMetadata": false, + "encode": "spaceDelimited" + } + ] + }, + { + "$id": "83", + "kind": "model", + "name": "PipeDelimitedExtensibleEnumArrayProperty", + "namespace": "Encode.Array", + "crossLanguageDefinitionId": "Encode.Array.PipeDelimitedExtensibleEnumArrayProperty", + "usage": "Input,Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "PipeDelimitedExtensibleEnumArrayProperty" + } + }, + "properties": [ + { + "$id": "84", + "kind": "property", + "name": "value", + "serializedName": "value", + "type": { + "$ref": "80" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.PipeDelimitedExtensibleEnumArrayProperty.value", + "serializationOptions": { + "json": { + "name": "value" + } + }, + "isHttpMetadata": false, + "encode": "pipeDelimited" + } + ] + }, + { + "$id": "85", + "kind": "model", + "name": "NewlineDelimitedExtensibleEnumArrayProperty", + "namespace": "Encode.Array", + "crossLanguageDefinitionId": "Encode.Array.NewlineDelimitedExtensibleEnumArrayProperty", + "usage": "Input,Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "NewlineDelimitedExtensibleEnumArrayProperty" + } + }, + "properties": [ + { + "$id": "86", + "kind": "property", + "name": "value", + "serializedName": "value", + "type": { + "$ref": "80" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.NewlineDelimitedExtensibleEnumArrayProperty.value", + "serializationOptions": { + "json": { + "name": "value" + } + }, + "isHttpMetadata": false, + "encode": "newlineDelimited" + } + ] + } + ], + "clients": [ + { + "$id": "87", + "kind": "client", + "name": "ArrayClient", + "namespace": "Encode.Array", + "doc": "Test for encode decorator on array.", + "methods": [], + "parameters": [ + { + "$id": "88", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "89", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "90", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Encode.Array.endpoint" + } + ], + "initializedBy": 1, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array", + "apiVersions": [], + "children": [ + { + "$id": "91", + "kind": "client", + "name": "Property", + "namespace": "Encode.Array.Property", + "methods": [ + { + "$id": "92", + "kind": "basic", + "name": "commaDelimited", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "93", + "name": "commaDelimited", + "resourceName": "Property", + "accessibility": "public", + "parameters": [ + { + "$id": "94", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "11" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.Property.commaDelimited.contentType", + "methodParameterSegments": [ + { + "$id": "95", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "11" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.commaDelimited.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "96", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "13" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.Property.commaDelimited.accept", + "methodParameterSegments": [ + { + "$id": "97", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "13" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.commaDelimited.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "98", + "kind": "body", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "59" + }, + "isApiVersion": false, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Encode.Array.Property.commaDelimited.body", + "methodParameterSegments": [ + { + "$id": "99", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "59" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Array.Property.commaDelimited.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "59" + }, + "headers": [], + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] + } + ], + "httpMethod": "POST", + "uri": "{endpoint}", + "path": "/encode/array/property/comma-delimited", + "requestMediaTypes": [ + "application/json" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Encode.Array.Property.commaDelimited", + "decorators": [], + "namespace": "Encode.Array.Property" + }, + "parameters": [ + { + "$ref": "99" + }, + { + "$ref": "95" + }, + { + "$ref": "97" + } + ], + "response": { + "type": { + "$ref": "59" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Encode.Array.Property.commaDelimited" + }, + { + "$id": "100", + "kind": "basic", + "name": "spaceDelimited", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "101", + "name": "spaceDelimited", + "resourceName": "Property", + "accessibility": "public", + "parameters": [ + { + "$id": "102", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "15" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.Property.spaceDelimited.contentType", + "methodParameterSegments": [ + { + "$id": "103", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "15" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.spaceDelimited.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "104", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "17" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.Property.spaceDelimited.accept", + "methodParameterSegments": [ + { + "$id": "105", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.spaceDelimited.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "106", + "kind": "body", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "63" + }, + "isApiVersion": false, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Encode.Array.Property.spaceDelimited.body", + "methodParameterSegments": [ + { + "$id": "107", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "63" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Array.Property.spaceDelimited.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "63" + }, + "headers": [], + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] + } + ], + "httpMethod": "POST", + "uri": "{endpoint}", + "path": "/encode/array/property/space-delimited", + "requestMediaTypes": [ + "application/json" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Encode.Array.Property.spaceDelimited", + "decorators": [], + "namespace": "Encode.Array.Property" + }, + "parameters": [ + { + "$ref": "107" + }, + { + "$ref": "103" + }, + { + "$ref": "105" + } + ], + "response": { + "type": { + "$ref": "63" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Encode.Array.Property.spaceDelimited" + }, + { + "$id": "108", + "kind": "basic", + "name": "pipeDelimited", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "109", + "name": "pipeDelimited", + "resourceName": "Property", + "accessibility": "public", + "parameters": [ + { + "$id": "110", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "19" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.Property.pipeDelimited.contentType", + "methodParameterSegments": [ + { + "$id": "111", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "19" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.pipeDelimited.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "112", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "21" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.Property.pipeDelimited.accept", + "methodParameterSegments": [ + { + "$id": "113", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "21" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.pipeDelimited.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "114", + "kind": "body", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "65" + }, + "isApiVersion": false, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Encode.Array.Property.pipeDelimited.body", + "methodParameterSegments": [ + { + "$id": "115", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "65" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Array.Property.pipeDelimited.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "65" + }, + "headers": [], + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] + } + ], + "httpMethod": "POST", + "uri": "{endpoint}", + "path": "/encode/array/property/pipe-delimited", + "requestMediaTypes": [ + "application/json" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Encode.Array.Property.pipeDelimited", + "decorators": [], + "namespace": "Encode.Array.Property" + }, + "parameters": [ + { + "$ref": "115" + }, + { + "$ref": "111" + }, + { + "$ref": "113" + } + ], + "response": { + "type": { + "$ref": "65" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Encode.Array.Property.pipeDelimited" + }, + { + "$id": "116", + "kind": "basic", + "name": "newlineDelimited", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "117", + "name": "newlineDelimited", + "resourceName": "Property", + "accessibility": "public", + "parameters": [ + { + "$id": "118", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "23" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.Property.newlineDelimited.contentType", + "methodParameterSegments": [ + { + "$id": "119", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "23" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.newlineDelimited.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "120", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "25" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.Property.newlineDelimited.accept", + "methodParameterSegments": [ + { + "$id": "121", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "25" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.newlineDelimited.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "122", + "kind": "body", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "67" + }, + "isApiVersion": false, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Encode.Array.Property.newlineDelimited.body", + "methodParameterSegments": [ + { + "$id": "123", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "67" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Array.Property.newlineDelimited.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "67" + }, + "headers": [], + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] + } + ], + "httpMethod": "POST", + "uri": "{endpoint}", + "path": "/encode/array/property/newline-delimited", + "requestMediaTypes": [ + "application/json" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Encode.Array.Property.newlineDelimited", + "decorators": [], + "namespace": "Encode.Array.Property" + }, + "parameters": [ + { + "$ref": "123" + }, + { + "$ref": "119" + }, + { + "$ref": "121" + } + ], + "response": { + "type": { + "$ref": "67" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Encode.Array.Property.newlineDelimited" + }, + { + "$id": "124", + "kind": "basic", + "name": "enumCommaDelimited", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "125", + "name": "enumCommaDelimited", + "resourceName": "Property", + "accessibility": "public", + "parameters": [ + { + "$id": "126", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "27" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.Property.enumCommaDelimited.contentType", + "methodParameterSegments": [ + { + "$id": "127", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "27" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.enumCommaDelimited.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "128", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "29" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.Property.enumCommaDelimited.accept", + "methodParameterSegments": [ + { + "$id": "129", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "29" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.enumCommaDelimited.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "130", + "kind": "body", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "69" + }, + "isApiVersion": false, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Encode.Array.Property.enumCommaDelimited.body", + "methodParameterSegments": [ + { + "$id": "131", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "69" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Array.Property.enumCommaDelimited.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "69" + }, + "headers": [], + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] + } + ], + "httpMethod": "POST", + "uri": "{endpoint}", + "path": "/encode/array/property/enum/comma-delimited", + "requestMediaTypes": [ + "application/json" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Encode.Array.Property.enumCommaDelimited", + "decorators": [], + "namespace": "Encode.Array.Property" + }, + "parameters": [ + { + "$ref": "131" + }, + { + "$ref": "127" + }, + { + "$ref": "129" + } + ], + "response": { + "type": { + "$ref": "69" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Encode.Array.Property.enumCommaDelimited" + }, + { + "$id": "132", + "kind": "basic", + "name": "enumSpaceDelimited", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "133", + "name": "enumSpaceDelimited", + "resourceName": "Property", + "accessibility": "public", + "parameters": [ + { + "$id": "134", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "31" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.Property.enumSpaceDelimited.contentType", + "methodParameterSegments": [ + { + "$id": "135", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "31" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.enumSpaceDelimited.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "136", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "33" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.Property.enumSpaceDelimited.accept", + "methodParameterSegments": [ + { + "$id": "137", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "33" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.enumSpaceDelimited.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "138", + "kind": "body", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "72" + }, + "isApiVersion": false, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Encode.Array.Property.enumSpaceDelimited.body", + "methodParameterSegments": [ + { + "$id": "139", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "72" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Array.Property.enumSpaceDelimited.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "72" + }, + "headers": [], + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] + } + ], + "httpMethod": "POST", + "uri": "{endpoint}", + "path": "/encode/array/property/enum/space-delimited", + "requestMediaTypes": [ + "application/json" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Encode.Array.Property.enumSpaceDelimited", + "decorators": [], + "namespace": "Encode.Array.Property" + }, + "parameters": [ + { + "$ref": "139" + }, + { + "$ref": "135" + }, + { + "$ref": "137" + } + ], + "response": { + "type": { + "$ref": "72" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Encode.Array.Property.enumSpaceDelimited" + }, { - "$id": "32", + "$id": "140", "kind": "basic", - "name": "commaDelimited", + "name": "enumPipeDelimited", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "33", - "name": "commaDelimited", + "$id": "141", + "name": "enumPipeDelimited", "resourceName": "Property", "accessibility": "public", "parameters": [ { - "$id": "34", + "$id": "142", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "1" + "$ref": "35" }, "isApiVersion": false, "optional": false, @@ -375,15 +2100,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Array.Property.commaDelimited.contentType" + "crossLanguageDefinitionId": "Encode.Array.Property.enumPipeDelimited.contentType", + "methodParameterSegments": [ + { + "$id": "143", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "35" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.enumPipeDelimited.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "35", + "$id": "144", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "3" + "$ref": "37" }, "isApiVersion": false, "optional": false, @@ -391,15 +2136,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Array.Property.commaDelimited.accept" + "crossLanguageDefinitionId": "Encode.Array.Property.enumPipeDelimited.accept", + "methodParameterSegments": [ + { + "$id": "145", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "37" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.enumPipeDelimited.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "36", + "$id": "146", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "17" + "$ref": "74" }, "isApiVersion": false, "contentTypes": [ @@ -410,7 +2174,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Array.Property.commaDelimited.body" + "crossLanguageDefinitionId": "Encode.Array.Property.enumPipeDelimited.body", + "methodParameterSegments": [ + { + "$id": "147", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "74" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Array.Property.enumPipeDelimited.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -419,7 +2202,7 @@ 200 ], "bodyType": { - "$ref": "17" + "$ref": "74" }, "headers": [], "isErrorResponse": false, @@ -430,101 +2213,58 @@ ], "httpMethod": "POST", "uri": "{endpoint}", - "path": "/encode/array/property/comma-delimited", + "path": "/encode/array/property/enum/pipe-delimited", "requestMediaTypes": [ "application/json" ], "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Encode.Array.Property.commaDelimited", + "crossLanguageDefinitionId": "Encode.Array.Property.enumPipeDelimited", "decorators": [], "namespace": "Encode.Array.Property" }, "parameters": [ { - "$id": "37", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "17" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Array.Property.commaDelimited.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "147" }, { - "$id": "38", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Array.Property.commaDelimited.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "143" }, { - "$id": "39", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Array.Property.commaDelimited.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "145" } ], "response": { "type": { - "$ref": "17" + "$ref": "74" } }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "Encode.Array.Property.commaDelimited" + "crossLanguageDefinitionId": "Encode.Array.Property.enumPipeDelimited" }, { - "$id": "40", + "$id": "148", "kind": "basic", - "name": "spaceDelimited", + "name": "enumNewlineDelimited", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "41", - "name": "spaceDelimited", + "$id": "149", + "name": "enumNewlineDelimited", "resourceName": "Property", "accessibility": "public", "parameters": [ { - "$id": "42", + "$id": "150", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "5" + "$ref": "39" }, "isApiVersion": false, "optional": false, @@ -532,15 +2272,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Array.Property.spaceDelimited.contentType" + "crossLanguageDefinitionId": "Encode.Array.Property.enumNewlineDelimited.contentType", + "methodParameterSegments": [ + { + "$id": "151", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "39" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.enumNewlineDelimited.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "43", + "$id": "152", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "7" + "$ref": "41" }, "isApiVersion": false, "optional": false, @@ -548,15 +2308,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Array.Property.spaceDelimited.accept" + "crossLanguageDefinitionId": "Encode.Array.Property.enumNewlineDelimited.accept", + "methodParameterSegments": [ + { + "$id": "153", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "41" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.enumNewlineDelimited.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "44", + "$id": "154", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "21" + "$ref": "76" }, "isApiVersion": false, "contentTypes": [ @@ -567,7 +2346,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Array.Property.spaceDelimited.body" + "crossLanguageDefinitionId": "Encode.Array.Property.enumNewlineDelimited.body", + "methodParameterSegments": [ + { + "$id": "155", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "76" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Array.Property.enumNewlineDelimited.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -576,7 +2374,7 @@ 200 ], "bodyType": { - "$ref": "21" + "$ref": "76" }, "headers": [], "isErrorResponse": false, @@ -587,101 +2385,58 @@ ], "httpMethod": "POST", "uri": "{endpoint}", - "path": "/encode/array/property/space-delimited", + "path": "/encode/array/property/enum/newline-delimited", "requestMediaTypes": [ "application/json" ], "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Encode.Array.Property.spaceDelimited", + "crossLanguageDefinitionId": "Encode.Array.Property.enumNewlineDelimited", "decorators": [], "namespace": "Encode.Array.Property" }, "parameters": [ { - "$id": "45", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "21" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Array.Property.spaceDelimited.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "155" }, { - "$id": "46", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Array.Property.spaceDelimited.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "151" }, { - "$id": "47", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Array.Property.spaceDelimited.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "153" } ], "response": { "type": { - "$ref": "21" + "$ref": "76" } }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "Encode.Array.Property.spaceDelimited" + "crossLanguageDefinitionId": "Encode.Array.Property.enumNewlineDelimited" }, { - "$id": "48", + "$id": "156", "kind": "basic", - "name": "pipeDelimited", + "name": "extensibleEnumCommaDelimited", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "49", - "name": "pipeDelimited", + "$id": "157", + "name": "extensibleEnumCommaDelimited", "resourceName": "Property", "accessibility": "public", "parameters": [ { - "$id": "50", + "$id": "158", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "9" + "$ref": "43" }, "isApiVersion": false, "optional": false, @@ -689,15 +2444,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Array.Property.pipeDelimited.contentType" + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumCommaDelimited.contentType", + "methodParameterSegments": [ + { + "$id": "159", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "43" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumCommaDelimited.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "51", + "$id": "160", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "11" + "$ref": "45" }, "isApiVersion": false, "optional": false, @@ -705,15 +2480,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Array.Property.pipeDelimited.accept" + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumCommaDelimited.accept", + "methodParameterSegments": [ + { + "$id": "161", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "45" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumCommaDelimited.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "52", + "$id": "162", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "23" + "$ref": "78" }, "isApiVersion": false, "contentTypes": [ @@ -724,7 +2518,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Array.Property.pipeDelimited.body" + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumCommaDelimited.body", + "methodParameterSegments": [ + { + "$id": "163", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "78" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumCommaDelimited.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -733,7 +2546,7 @@ 200 ], "bodyType": { - "$ref": "23" + "$ref": "78" }, "headers": [], "isErrorResponse": false, @@ -744,101 +2557,58 @@ ], "httpMethod": "POST", "uri": "{endpoint}", - "path": "/encode/array/property/pipe-delimited", + "path": "/encode/array/property/extensible-enum/comma-delimited", "requestMediaTypes": [ "application/json" ], "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Encode.Array.Property.pipeDelimited", + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumCommaDelimited", "decorators": [], "namespace": "Encode.Array.Property" }, "parameters": [ { - "$id": "53", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "23" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Array.Property.pipeDelimited.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "163" }, { - "$id": "54", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Array.Property.pipeDelimited.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "159" }, { - "$id": "55", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Array.Property.pipeDelimited.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "161" } ], "response": { "type": { - "$ref": "23" + "$ref": "78" } }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "Encode.Array.Property.pipeDelimited" + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumCommaDelimited" }, { - "$id": "56", + "$id": "164", "kind": "basic", - "name": "newlineDelimited", + "name": "extensibleEnumSpaceDelimited", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "57", - "name": "newlineDelimited", + "$id": "165", + "name": "extensibleEnumSpaceDelimited", "resourceName": "Property", "accessibility": "public", "parameters": [ { - "$id": "58", + "$id": "166", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "13" + "$ref": "47" }, "isApiVersion": false, "optional": false, @@ -846,15 +2616,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Array.Property.newlineDelimited.contentType" + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumSpaceDelimited.contentType", + "methodParameterSegments": [ + { + "$id": "167", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "47" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumSpaceDelimited.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "59", + "$id": "168", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "15" + "$ref": "49" }, "isApiVersion": false, "optional": false, @@ -862,15 +2652,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Array.Property.newlineDelimited.accept" + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumSpaceDelimited.accept", + "methodParameterSegments": [ + { + "$id": "169", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "49" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumSpaceDelimited.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "60", + "$id": "170", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "25" + "$ref": "81" }, "isApiVersion": false, "contentTypes": [ @@ -881,7 +2690,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Array.Property.newlineDelimited.body" + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumSpaceDelimited.body", + "methodParameterSegments": [ + { + "$id": "171", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "81" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumSpaceDelimited.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -890,7 +2718,7 @@ 200 ], "bodyType": { - "$ref": "25" + "$ref": "81" }, "headers": [], "isErrorResponse": false, @@ -901,91 +2729,392 @@ ], "httpMethod": "POST", "uri": "{endpoint}", - "path": "/encode/array/property/newline-delimited", + "path": "/encode/array/property/extensible-enum/space-delimited", "requestMediaTypes": [ "application/json" ], "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Encode.Array.Property.newlineDelimited", + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumSpaceDelimited", "decorators": [], "namespace": "Encode.Array.Property" }, "parameters": [ { - "$id": "61", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "25" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Array.Property.newlineDelimited.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "171" + }, + { + "$ref": "167" }, { - "$id": "62", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "13" + "$ref": "169" + } + ], + "response": { + "type": { + "$ref": "81" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumSpaceDelimited" + }, + { + "$id": "172", + "kind": "basic", + "name": "extensibleEnumPipeDelimited", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "173", + "name": "extensibleEnumPipeDelimited", + "resourceName": "Property", + "accessibility": "public", + "parameters": [ + { + "$id": "174", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "51" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumPipeDelimited.contentType", + "methodParameterSegments": [ + { + "$id": "175", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "51" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumPipeDelimited.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "176", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "53" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumPipeDelimited.accept", + "methodParameterSegments": [ + { + "$id": "177", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "53" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumPipeDelimited.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Array.Property.newlineDelimited.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + { + "$id": "178", + "kind": "body", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "83" + }, + "isApiVersion": false, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumPipeDelimited.body", + "methodParameterSegments": [ + { + "$id": "179", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "83" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumPipeDelimited.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "83" + }, + "headers": [], + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] + } + ], + "httpMethod": "POST", + "uri": "{endpoint}", + "path": "/encode/array/property/extensible-enum/pipe-delimited", + "requestMediaTypes": [ + "application/json" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumPipeDelimited", + "decorators": [], + "namespace": "Encode.Array.Property" + }, + "parameters": [ + { + "$ref": "179" + }, + { + "$ref": "175" }, { - "$id": "63", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "15" + "$ref": "177" + } + ], + "response": { + "type": { + "$ref": "83" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumPipeDelimited" + }, + { + "$id": "180", + "kind": "basic", + "name": "extensibleEnumNewlineDelimited", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "181", + "name": "extensibleEnumNewlineDelimited", + "resourceName": "Property", + "accessibility": "public", + "parameters": [ + { + "$id": "182", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "55" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumNewlineDelimited.contentType", + "methodParameterSegments": [ + { + "$id": "183", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "55" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumNewlineDelimited.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Array.Property.newlineDelimited.accept", - "readOnly": false, - "access": "public", - "decorators": [] + { + "$id": "184", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "57" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumNewlineDelimited.accept", + "methodParameterSegments": [ + { + "$id": "185", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "57" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumNewlineDelimited.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "186", + "kind": "body", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "85" + }, + "isApiVersion": false, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumNewlineDelimited.body", + "methodParameterSegments": [ + { + "$id": "187", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "85" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumNewlineDelimited.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "85" + }, + "headers": [], + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] + } + ], + "httpMethod": "POST", + "uri": "{endpoint}", + "path": "/encode/array/property/extensible-enum/newline-delimited", + "requestMediaTypes": [ + "application/json" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumNewlineDelimited", + "decorators": [], + "namespace": "Encode.Array.Property" + }, + "parameters": [ + { + "$ref": "187" + }, + { + "$ref": "183" + }, + { + "$ref": "185" } ], "response": { "type": { - "$ref": "25" + "$ref": "85" } }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "Encode.Array.Property.newlineDelimited" + "crossLanguageDefinitionId": "Encode.Array.Property.extensibleEnumNewlineDelimited" } ], "parameters": [ { - "$id": "64", + "$id": "188", "kind": "endpoint", "name": "endpoint", "serializedName": "endpoint", "doc": "Service host", "type": { - "$id": "65", + "$id": "189", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -996,7 +3125,7 @@ "isEndpoint": true, "defaultValue": { "type": { - "$id": "66", + "$id": "190", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string" @@ -1014,7 +3143,7 @@ "crossLanguageDefinitionId": "Encode.Array.Property", "apiVersions": [], "parent": { - "$ref": "27" + "$ref": "87" }, "isMultiServiceClient": false } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/Encode.Bytes.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/Encode.Bytes.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/Encode.Bytes.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/Encode.Bytes.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/Encode.Bytes.sln deleted file mode 100644 index 1b47aa31652..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/Encode.Bytes.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Encode.Bytes", "src\Encode.Bytes.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/Encode.Bytes.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/Encode.Bytes.slnx new file mode 100644 index 00000000000..1d7f655df01 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/Encode.Bytes.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Encode.Bytes.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Encode.Bytes.csproj index d923c122c85..e1b3d2e4c6c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Encode.Bytes.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Encode.Bytes.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/BytesClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/BytesClient.cs index 9f869034eb7..66889ea19e6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/BytesClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/BytesClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using Encode.Bytes._Header; using Encode.Bytes._Property; using Encode.Bytes._Query; @@ -16,7 +17,12 @@ public partial class BytesClient { public BytesClient() : this(new Uri("http://localhost:3000"), new BytesClientOptions()) => throw null; - public BytesClient(Uri endpoint, BytesClientOptions options) => throw null; + internal BytesClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, BytesClientOptions options) => throw null; + + public BytesClient(Uri endpoint, BytesClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public BytesClient(BytesClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/BytesClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/BytesClientOptions.cs index cd5fed986b7..9e4ed241a12 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/BytesClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/BytesClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Encode.Bytes { public partial class BytesClientOptions : ClientPipelineOptions { + public BytesClientOptions() => throw null; + + [Experimental("SCME0002")] + internal BytesClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/BytesClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/BytesClientSettings.cs new file mode 100644 index 00000000000..a6033329a11 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/BytesClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Encode.Bytes +{ + [Experimental("SCME0002")] + public partial class BytesClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public BytesClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Header.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Header.cs index 04f54e9db06..fd23134b48c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Header.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Header.cs @@ -15,6 +15,8 @@ public partial class Header { protected Header() => throw null; + internal Header(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Default(BinaryData value, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Models/Base64BytesProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Models/Base64BytesProperty.Serialization.cs index 91223205d1c..928c0bcbacb 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Models/Base64BytesProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Models/Base64BytesProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class Base64BytesProperty : IJsonModel { internal Base64BytesProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Base64BytesProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Base64BytesProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Base64BytesProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Base64BytesProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Base64BytesProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Base64BytesProperty base64BytesProperty) => throw null; public static explicit operator Base64BytesProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Base64BytesProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Base64BytesProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Models/Base64urlArrayBytesProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Models/Base64urlArrayBytesProperty.Serialization.cs index 1787e536dbf..865b8bb8643 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Models/Base64urlArrayBytesProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Models/Base64urlArrayBytesProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class Base64urlArrayBytesProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Base64urlArrayBytesProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Base64urlArrayBytesProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Base64urlArrayBytesProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Base64urlArrayBytesProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Base64urlArrayBytesProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Base64urlArrayBytesProperty base64urlArrayBytesProperty) => throw null; public static explicit operator Base64urlArrayBytesProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Base64urlArrayBytesProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Base64urlArrayBytesProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Models/Base64urlBytesProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Models/Base64urlBytesProperty.Serialization.cs index 39544a8f73c..0c753403755 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Models/Base64urlBytesProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Models/Base64urlBytesProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class Base64urlBytesProperty : IJsonModel { internal Base64urlBytesProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Base64urlBytesProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Base64urlBytesProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Base64urlBytesProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Base64urlBytesProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Base64urlBytesProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Base64urlBytesProperty base64urlBytesProperty) => throw null; public static explicit operator Base64urlBytesProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Base64urlBytesProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Base64urlBytesProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Models/DefaultBytesProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Models/DefaultBytesProperty.Serialization.cs index 692412e09fa..6d442b33824 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Models/DefaultBytesProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Models/DefaultBytesProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class DefaultBytesProperty : IJsonModel { internal DefaultBytesProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DefaultBytesProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual DefaultBytesProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DefaultBytesProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DefaultBytesProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DefaultBytesProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(DefaultBytesProperty defaultBytesProperty) => throw null; public static explicit operator DefaultBytesProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DefaultBytesProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual DefaultBytesProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Property.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Property.cs index cd447f162f2..98856cd5b6c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Property.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Property.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -14,6 +15,8 @@ public partial class Property { protected Property() => throw null; + internal Property(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Default(BinaryContent content, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Query.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Query.cs index e833cb0b334..a4bdf915ccf 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Query.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/Query.cs @@ -15,6 +15,8 @@ public partial class Query { protected Query() => throw null; + internal Query(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Default(BinaryData value, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/RequestBody.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/RequestBody.cs index 8f2b981bd11..11350490a12 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/RequestBody.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/RequestBody.cs @@ -14,6 +14,8 @@ public partial class RequestBody { protected RequestBody() => throw null; + internal RequestBody(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Default(BinaryContent content, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/ResponseBody.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/ResponseBody.cs index d61d52ae44f..2ccbb28aadf 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/ResponseBody.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/ResponseBody.cs @@ -14,6 +14,8 @@ public partial class ResponseBody { protected ResponseBody() => throw null; + internal ResponseBody(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Default(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..120cc0e01aa --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "BytesClient": { + "type": "object", + "description": "Configuration for BytesClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/bytesClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "bytesClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/tspCodeModel.json index bf92ec111b2..18d687d929a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/tspCodeModel.json @@ -687,7 +687,31 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Bytes.Query.default.value", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "76", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "77", + "kind": "bytes", + "name": "bytes", + "encode": "base64", + "crossLanguageDefinitionId": "TypeSpec.bytes", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Bytes.Query.default.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -711,26 +735,7 @@ }, "parameters": [ { - "$id": "76", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "77", - "kind": "bytes", - "name": "bytes", - "encode": "base64", - "crossLanguageDefinitionId": "TypeSpec.bytes", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Bytes.Query.default.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "76" } ], "response": {}, @@ -770,7 +775,31 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Bytes.Query.base64.value", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "82", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "83", + "kind": "bytes", + "name": "bytes", + "encode": "base64", + "crossLanguageDefinitionId": "TypeSpec.bytes", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Bytes.Query.base64.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -794,26 +823,7 @@ }, "parameters": [ { - "$id": "82", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "83", - "kind": "bytes", - "name": "bytes", - "encode": "base64", - "crossLanguageDefinitionId": "TypeSpec.bytes", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Bytes.Query.base64.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "82" } ], "response": {}, @@ -853,7 +863,31 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Bytes.Query.base64url.value", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "88", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "89", + "kind": "bytes", + "name": "bytes", + "encode": "base64url", + "crossLanguageDefinitionId": "TypeSpec.bytes", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Bytes.Query.base64url.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -877,26 +911,7 @@ }, "parameters": [ { - "$id": "88", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "89", - "kind": "bytes", - "name": "bytes", - "encode": "base64url", - "crossLanguageDefinitionId": "TypeSpec.bytes", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Bytes.Query.base64url.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "88" } ], "response": {}, @@ -932,7 +947,26 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Bytes.Query.base64urlArray.value", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "93", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$ref": "64" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Bytes.Query.base64urlArray.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -956,21 +990,7 @@ }, "parameters": [ { - "$id": "93", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$ref": "64" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Bytes.Query.base64urlArray.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "93" } ], "response": {}, @@ -1054,10 +1074,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.Property.default.contentType" + "crossLanguageDefinitionId": "Encode.Bytes.Property.default.contentType", + "methodParameterSegments": [ + { + "$id": "101", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Bytes.Property.default.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "101", + "$id": "102", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -1070,10 +1110,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.Property.default.accept" + "crossLanguageDefinitionId": "Encode.Bytes.Property.default.accept", + "methodParameterSegments": [ + { + "$id": "103", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "3" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Bytes.Property.default.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "102", + "$id": "104", "kind": "body", "name": "body", "serializedName": "body", @@ -1089,7 +1148,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Bytes.Property.default.body" + "crossLanguageDefinitionId": "Encode.Bytes.Property.default.body", + "methodParameterSegments": [ + { + "$id": "105", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "53" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Bytes.Property.default.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1122,56 +1200,13 @@ }, "parameters": [ { - "$id": "103", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "53" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Bytes.Property.default.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "105" }, { - "$id": "104", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Bytes.Property.default.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "101" }, { - "$id": "105", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Bytes.Property.default.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "103" } ], "response": { @@ -1211,10 +1246,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.Property.base64.contentType" + "crossLanguageDefinitionId": "Encode.Bytes.Property.base64.contentType", + "methodParameterSegments": [ + { + "$id": "109", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Bytes.Property.base64.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "109", + "$id": "110", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -1227,10 +1282,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.Property.base64.accept" + "crossLanguageDefinitionId": "Encode.Bytes.Property.base64.accept", + "methodParameterSegments": [ + { + "$id": "111", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Bytes.Property.base64.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "110", + "$id": "112", "kind": "body", "name": "body", "serializedName": "body", @@ -1246,7 +1320,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Bytes.Property.base64.body" + "crossLanguageDefinitionId": "Encode.Bytes.Property.base64.body", + "methodParameterSegments": [ + { + "$id": "113", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "56" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Bytes.Property.base64.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1279,56 +1372,13 @@ }, "parameters": [ { - "$id": "111", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "56" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Bytes.Property.base64.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "113" }, { - "$id": "112", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Bytes.Property.base64.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "109" }, { - "$id": "113", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Bytes.Property.base64.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "111" } ], "response": { @@ -1368,10 +1418,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.Property.base64url.contentType" + "crossLanguageDefinitionId": "Encode.Bytes.Property.base64url.contentType", + "methodParameterSegments": [ + { + "$id": "117", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Bytes.Property.base64url.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "117", + "$id": "118", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -1384,10 +1454,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.Property.base64url.accept" + "crossLanguageDefinitionId": "Encode.Bytes.Property.base64url.accept", + "methodParameterSegments": [ + { + "$id": "119", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "11" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Bytes.Property.base64url.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "118", + "$id": "120", "kind": "body", "name": "body", "serializedName": "body", @@ -1403,7 +1492,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Bytes.Property.base64url.body" + "crossLanguageDefinitionId": "Encode.Bytes.Property.base64url.body", + "methodParameterSegments": [ + { + "$id": "121", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "59" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Bytes.Property.base64url.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1436,56 +1544,13 @@ }, "parameters": [ { - "$id": "119", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "59" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Bytes.Property.base64url.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "121" }, { - "$id": "120", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Bytes.Property.base64url.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "117" }, { - "$id": "121", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Bytes.Property.base64url.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "119" } ], "response": { @@ -1525,10 +1590,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.Property.base64urlArray.contentType" + "crossLanguageDefinitionId": "Encode.Bytes.Property.base64urlArray.contentType", + "methodParameterSegments": [ + { + "$id": "125", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "13" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Bytes.Property.base64urlArray.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "125", + "$id": "126", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -1541,10 +1626,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.Property.base64urlArray.accept" + "crossLanguageDefinitionId": "Encode.Bytes.Property.base64urlArray.accept", + "methodParameterSegments": [ + { + "$id": "127", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "15" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Bytes.Property.base64urlArray.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "126", + "$id": "128", "kind": "body", "name": "body", "serializedName": "body", @@ -1560,7 +1664,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Bytes.Property.base64urlArray.body" + "crossLanguageDefinitionId": "Encode.Bytes.Property.base64urlArray.body", + "methodParameterSegments": [ + { + "$id": "129", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "62" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Bytes.Property.base64urlArray.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1593,56 +1716,13 @@ }, "parameters": [ { - "$id": "127", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "62" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Bytes.Property.base64urlArray.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "129" }, { - "$id": "128", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Bytes.Property.base64urlArray.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "125" }, { - "$id": "129", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Bytes.Property.base64urlArray.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "127" } ], "response": { @@ -1734,7 +1814,31 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.Header.default.value" + "crossLanguageDefinitionId": "Encode.Bytes.Header.default.value", + "methodParameterSegments": [ + { + "$id": "138", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "139", + "kind": "bytes", + "name": "bytes", + "encode": "base64", + "crossLanguageDefinitionId": "TypeSpec.bytes", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Bytes.Header.default.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1758,26 +1862,7 @@ }, "parameters": [ { - "$id": "138", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "139", - "kind": "bytes", - "name": "bytes", - "encode": "base64", - "crossLanguageDefinitionId": "TypeSpec.bytes", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Bytes.Header.default.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "138" } ], "response": {}, @@ -1817,7 +1902,31 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.Header.base64.value" + "crossLanguageDefinitionId": "Encode.Bytes.Header.base64.value", + "methodParameterSegments": [ + { + "$id": "144", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "145", + "kind": "bytes", + "name": "bytes", + "encode": "base64", + "crossLanguageDefinitionId": "TypeSpec.bytes", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Bytes.Header.base64.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1841,26 +1950,7 @@ }, "parameters": [ { - "$id": "144", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "145", - "kind": "bytes", - "name": "bytes", - "encode": "base64", - "crossLanguageDefinitionId": "TypeSpec.bytes", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Bytes.Header.base64.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "144" } ], "response": {}, @@ -1900,7 +1990,31 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.Header.base64url.value" + "crossLanguageDefinitionId": "Encode.Bytes.Header.base64url.value", + "methodParameterSegments": [ + { + "$id": "150", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "151", + "kind": "bytes", + "name": "bytes", + "encode": "base64url", + "crossLanguageDefinitionId": "TypeSpec.bytes", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Bytes.Header.base64url.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1924,26 +2038,7 @@ }, "parameters": [ { - "$id": "150", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "151", - "kind": "bytes", - "name": "bytes", - "encode": "base64url", - "crossLanguageDefinitionId": "TypeSpec.bytes", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Bytes.Header.base64url.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "150" } ], "response": {}, @@ -1980,7 +2075,26 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.Header.base64urlArray.value" + "crossLanguageDefinitionId": "Encode.Bytes.Header.base64urlArray.value", + "methodParameterSegments": [ + { + "$id": "155", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$ref": "64" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Bytes.Header.base64urlArray.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2004,21 +2118,7 @@ }, "parameters": [ { - "$id": "155", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$ref": "64" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Bytes.Header.base64urlArray.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "155" } ], "response": {}, @@ -2102,15 +2202,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.default.contentType" + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.default.contentType", + "methodParameterSegments": [ + { + "$id": "163", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/octet-stream", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.default.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "163", + "$id": "164", "kind": "body", "name": "value", "serializedName": "value", "type": { - "$id": "164", + "$id": "165", "kind": "bytes", "name": "bytes", "crossLanguageDefinitionId": "TypeSpec.bytes", @@ -2125,7 +2245,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.default.value" + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.default.value", + "methodParameterSegments": [ + { + "$id": "166", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "167", + "kind": "bytes", + "name": "bytes", + "crossLanguageDefinitionId": "TypeSpec.bytes", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.default.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2152,43 +2295,10 @@ }, "parameters": [ { - "$id": "165", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "166", - "kind": "bytes", - "name": "bytes", - "crossLanguageDefinitionId": "TypeSpec.bytes", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.default.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "166" }, { - "$id": "167", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/octet-stream", - "type": { - "$ref": "17" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.default.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "163" } ], "response": {}, @@ -2223,15 +2333,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.octetStream.contentType" + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.octetStream.contentType", + "methodParameterSegments": [ + { + "$id": "171", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "19" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.octetStream.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "171", + "$id": "172", "kind": "body", "name": "value", "serializedName": "value", "type": { - "$id": "172", + "$id": "173", "kind": "bytes", "name": "bytes", "crossLanguageDefinitionId": "TypeSpec.bytes", @@ -2246,7 +2375,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.octetStream.value" + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.octetStream.value", + "methodParameterSegments": [ + { + "$id": "174", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "175", + "kind": "bytes", + "name": "bytes", + "crossLanguageDefinitionId": "TypeSpec.bytes", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.octetStream.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2273,42 +2425,10 @@ }, "parameters": [ { - "$id": "173", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "21" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.octetStream.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "171" }, { - "$id": "174", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "175", - "kind": "bytes", - "name": "bytes", - "crossLanguageDefinitionId": "TypeSpec.bytes", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.octetStream.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "174" } ], "response": {}, @@ -2343,15 +2463,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.customContentType.contentType" + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.customContentType.contentType", + "methodParameterSegments": [ + { + "$id": "179", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "23" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.customContentType.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "179", + "$id": "180", "kind": "body", "name": "value", "serializedName": "value", "type": { - "$id": "180", + "$id": "181", "kind": "bytes", "name": "bytes", "crossLanguageDefinitionId": "TypeSpec.bytes", @@ -2366,7 +2505,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.customContentType.value" + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.customContentType.value", + "methodParameterSegments": [ + { + "$id": "182", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "183", + "kind": "bytes", + "name": "bytes", + "crossLanguageDefinitionId": "TypeSpec.bytes", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.customContentType.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2393,42 +2555,10 @@ }, "parameters": [ { - "$id": "181", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "25" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.customContentType.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "179" }, { - "$id": "182", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "183", - "kind": "bytes", - "name": "bytes", - "crossLanguageDefinitionId": "TypeSpec.bytes", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.customContentType.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "182" } ], "response": {}, @@ -2463,15 +2593,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.base64.contentType" + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.base64.contentType", + "methodParameterSegments": [ + { + "$id": "187", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "27" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.base64.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "187", + "$id": "188", "kind": "body", "name": "value", "serializedName": "value", "type": { - "$id": "188", + "$id": "189", "kind": "bytes", "name": "bytes", "encode": "base64", @@ -2487,7 +2636,31 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.base64.value" + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.base64.value", + "methodParameterSegments": [ + { + "$id": "190", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "191", + "kind": "bytes", + "name": "bytes", + "encode": "base64", + "crossLanguageDefinitionId": "TypeSpec.bytes", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.base64.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2514,43 +2687,10 @@ }, "parameters": [ { - "$id": "189", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "29" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.base64.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "187" }, { - "$id": "190", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "191", - "kind": "bytes", - "name": "bytes", - "encode": "base64", - "crossLanguageDefinitionId": "TypeSpec.bytes", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.base64.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "190" } ], "response": {}, @@ -2585,15 +2725,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.base64url.contentType" + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.base64url.contentType", + "methodParameterSegments": [ + { + "$id": "195", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "31" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.base64url.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "195", + "$id": "196", "kind": "body", "name": "value", "serializedName": "value", "type": { - "$id": "196", + "$id": "197", "kind": "bytes", "name": "bytes", "encode": "base64url", @@ -2609,7 +2768,31 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.base64url.value" + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.base64url.value", + "methodParameterSegments": [ + { + "$id": "198", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "199", + "kind": "bytes", + "name": "bytes", + "encode": "base64url", + "crossLanguageDefinitionId": "TypeSpec.bytes", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.base64url.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2636,43 +2819,10 @@ }, "parameters": [ { - "$id": "197", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "33" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.base64url.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "195" }, { - "$id": "198", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "199", - "kind": "bytes", - "name": "bytes", - "encode": "base64url", - "crossLanguageDefinitionId": "TypeSpec.bytes", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Bytes.RequestBody.base64url.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "198" } ], "response": {}, @@ -2755,7 +2905,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.default.accept" + "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.default.accept", + "methodParameterSegments": [ + { + "$id": "207", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "35" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.default.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2764,7 +2933,7 @@ 200 ], "bodyType": { - "$id": "207", + "$id": "208", "kind": "bytes", "name": "bytes", "crossLanguageDefinitionId": "TypeSpec.bytes", @@ -2789,26 +2958,12 @@ }, "parameters": [ { - "$id": "208", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "35" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.default.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "207" } ], "response": { "type": { - "$ref": "207" + "$ref": "208" } }, "isOverride": false, @@ -2842,7 +2997,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.octetStream.accept" + "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.octetStream.accept", + "methodParameterSegments": [ + { + "$id": "212", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "37" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.octetStream.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2851,7 +3025,7 @@ 200 ], "bodyType": { - "$id": "212", + "$id": "213", "kind": "bytes", "name": "bytes", "crossLanguageDefinitionId": "TypeSpec.bytes", @@ -2884,26 +3058,12 @@ }, "parameters": [ { - "$id": "213", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "37" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.octetStream.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "212" } ], "response": { "type": { - "$ref": "212" + "$ref": "213" } }, "isOverride": false, @@ -2937,7 +3097,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.customContentType.accept" + "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.customContentType.accept", + "methodParameterSegments": [ + { + "$id": "217", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "41" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.customContentType.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2946,7 +3125,7 @@ 200 ], "bodyType": { - "$id": "217", + "$id": "218", "kind": "bytes", "name": "bytes", "crossLanguageDefinitionId": "TypeSpec.bytes", @@ -2979,26 +3158,12 @@ }, "parameters": [ { - "$id": "218", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "41" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.customContentType.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "217" } ], "response": { "type": { - "$ref": "217" + "$ref": "218" } }, "isOverride": false, @@ -3032,7 +3197,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.base64.accept" + "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.base64.accept", + "methodParameterSegments": [ + { + "$id": "222", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "45" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.base64.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3041,7 +3225,7 @@ 200 ], "bodyType": { - "$id": "222", + "$id": "223", "kind": "bytes", "name": "bytes", "encode": "base64", @@ -3075,26 +3259,12 @@ }, "parameters": [ { - "$id": "223", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "45" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.base64.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "222" } ], "response": { "type": { - "$ref": "222" + "$ref": "223" } }, "isOverride": false, @@ -3128,7 +3298,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.base64url.accept" + "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.base64url.accept", + "methodParameterSegments": [ + { + "$id": "227", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "49" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.base64url.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3137,13 +3326,13 @@ 200 ], "bodyType": { - "$id": "227", + "$id": "228", "kind": "bytes", "name": "base64urlBytes", "encode": "base64url", "crossLanguageDefinitionId": "Encode.Bytes.base64urlBytes", "baseType": { - "$id": "228", + "$id": "229", "kind": "bytes", "name": "bytes", "encode": "base64", @@ -3179,26 +3368,12 @@ }, "parameters": [ { - "$id": "229", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "49" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Bytes.ResponseBody.base64url.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "227" } ], "response": { "type": { - "$ref": "227" + "$ref": "228" } }, "isOverride": false, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/Encode.Datetime.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/Encode.Datetime.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/Encode.Datetime.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/Encode.Datetime.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/Encode.Datetime.sln deleted file mode 100644 index 1cec2da2d45..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/Encode.Datetime.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Encode.Datetime", "src\Encode.Datetime.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/Encode.Datetime.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/Encode.Datetime.slnx new file mode 100644 index 00000000000..355f5abdd4b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/Encode.Datetime.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Encode.Datetime.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Encode.Datetime.csproj index 795c9fcc605..3066c05859d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Encode.Datetime.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Encode.Datetime.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/DatetimeClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/DatetimeClient.cs index 99b7355986c..52989bc8104 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/DatetimeClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/DatetimeClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using Encode.Datetime._Header; using Encode.Datetime._Property; using Encode.Datetime._Query; @@ -15,7 +16,12 @@ public partial class DatetimeClient { public DatetimeClient() : this(new Uri("http://localhost:3000"), new DatetimeClientOptions()) => throw null; - public DatetimeClient(Uri endpoint, DatetimeClientOptions options) => throw null; + internal DatetimeClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, DatetimeClientOptions options) => throw null; + + public DatetimeClient(Uri endpoint, DatetimeClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public DatetimeClient(DatetimeClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/DatetimeClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/DatetimeClientOptions.cs index 698cb7d64f1..39b0653f0a2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/DatetimeClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/DatetimeClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Encode.Datetime { public partial class DatetimeClientOptions : ClientPipelineOptions { + public DatetimeClientOptions() => throw null; + + [Experimental("SCME0002")] + internal DatetimeClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/DatetimeClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/DatetimeClientSettings.cs new file mode 100644 index 00000000000..9924fa8a904 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/DatetimeClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Encode.Datetime +{ + [Experimental("SCME0002")] + public partial class DatetimeClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public DatetimeClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Header.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Header.cs index 5fb8d90bc90..73e83a93a8d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Header.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Header.cs @@ -15,6 +15,8 @@ public partial class Header { protected Header() => throw null; + internal Header(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Default(DateTimeOffset value, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/DefaultDatetimeProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/DefaultDatetimeProperty.Serialization.cs index 38fc4ed08d1..2b24f7a9b36 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/DefaultDatetimeProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/DefaultDatetimeProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class DefaultDatetimeProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DefaultDatetimeProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual DefaultDatetimeProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DefaultDatetimeProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DefaultDatetimeProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DefaultDatetimeProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(DefaultDatetimeProperty defaultDatetimeProperty) => throw null; public static explicit operator DefaultDatetimeProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DefaultDatetimeProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual DefaultDatetimeProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/Rfc3339DatetimeProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/Rfc3339DatetimeProperty.Serialization.cs index e192c6fe9e2..00fbe26540e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/Rfc3339DatetimeProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/Rfc3339DatetimeProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class Rfc3339DatetimeProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Rfc3339DatetimeProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Rfc3339DatetimeProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Rfc3339DatetimeProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Rfc3339DatetimeProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Rfc3339DatetimeProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Rfc3339DatetimeProperty rfc3339DatetimeProperty) => throw null; public static explicit operator Rfc3339DatetimeProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Rfc3339DatetimeProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Rfc3339DatetimeProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/Rfc7231DatetimeProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/Rfc7231DatetimeProperty.Serialization.cs index e7d1a8be715..0e69b861a61 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/Rfc7231DatetimeProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/Rfc7231DatetimeProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class Rfc7231DatetimeProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Rfc7231DatetimeProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Rfc7231DatetimeProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Rfc7231DatetimeProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Rfc7231DatetimeProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Rfc7231DatetimeProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Rfc7231DatetimeProperty rfc7231DatetimeProperty) => throw null; public static explicit operator Rfc7231DatetimeProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Rfc7231DatetimeProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Rfc7231DatetimeProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/UnixTimestampArrayDatetimeProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/UnixTimestampArrayDatetimeProperty.Serialization.cs index c04c8a5d8bf..ca023b2de36 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/UnixTimestampArrayDatetimeProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/UnixTimestampArrayDatetimeProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class UnixTimestampArrayDatetimeProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - UnixTimestampArrayDatetimeProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual UnixTimestampArrayDatetimeProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnixTimestampArrayDatetimeProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - UnixTimestampArrayDatetimeProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnixTimestampArrayDatetimeProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(UnixTimestampArrayDatetimeProperty unixTimestampArrayDatetimeProperty) => throw null; public static explicit operator UnixTimestampArrayDatetimeProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + UnixTimestampArrayDatetimeProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual UnixTimestampArrayDatetimeProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/UnixTimestampDatetimeProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/UnixTimestampDatetimeProperty.Serialization.cs index 69bf04eac0e..5e0f6970ea6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/UnixTimestampDatetimeProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Models/UnixTimestampDatetimeProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class UnixTimestampDatetimeProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - UnixTimestampDatetimeProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual UnixTimestampDatetimeProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnixTimestampDatetimeProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - UnixTimestampDatetimeProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnixTimestampDatetimeProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(UnixTimestampDatetimeProperty unixTimestampDatetimeProperty) => throw null; public static explicit operator UnixTimestampDatetimeProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + UnixTimestampDatetimeProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual UnixTimestampDatetimeProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Property.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Property.cs index 2a05e4eb487..178a86cf0b2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Property.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Property.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -14,6 +15,8 @@ public partial class Property { protected Property() => throw null; + internal Property(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Default(BinaryContent content, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Query.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Query.cs index 797db67529f..2e39c63316f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Query.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/Query.cs @@ -15,6 +15,8 @@ public partial class Query { protected Query() => throw null; + internal Query(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Default(DateTimeOffset value, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/ResponseHeader.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/ResponseHeader.cs index 01d39032c85..0f6c15d6f9e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/ResponseHeader.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/ResponseHeader.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class ResponseHeader { protected ResponseHeader() => throw null; + internal ResponseHeader(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Default(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..f13d4ed3b76 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "DatetimeClient": { + "type": "object", + "description": "Configuration for DatetimeClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/datetimeClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "datetimeClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/tspCodeModel.json index 8094bd11bc3..4d963b254ef 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/tspCodeModel.json @@ -522,7 +522,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Datetime.Query.default.value", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "54", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "55", + "kind": "utcDateTime", + "name": "utcDateTime", + "encode": "rfc3339", + "wireType": { + "$id": "56", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.utcDateTime", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Datetime.Query.default.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -546,33 +577,7 @@ }, "parameters": [ { - "$id": "54", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "55", - "kind": "utcDateTime", - "name": "utcDateTime", - "encode": "rfc3339", - "wireType": { - "$id": "56", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.utcDateTime", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Datetime.Query.default.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "54" } ], "response": {}, @@ -619,7 +624,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Datetime.Query.rfc3339.value", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "62", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "63", + "kind": "utcDateTime", + "name": "utcDateTime", + "encode": "rfc3339", + "wireType": { + "$id": "64", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.utcDateTime", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Datetime.Query.rfc3339.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -643,33 +679,7 @@ }, "parameters": [ { - "$id": "62", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "63", - "kind": "utcDateTime", - "name": "utcDateTime", - "encode": "rfc3339", - "wireType": { - "$id": "64", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.utcDateTime", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Datetime.Query.rfc3339.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "62" } ], "response": {}, @@ -716,7 +726,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Datetime.Query.rfc7231.value", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "70", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "71", + "kind": "utcDateTime", + "name": "utcDateTime", + "encode": "rfc7231", + "wireType": { + "$id": "72", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.utcDateTime", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Datetime.Query.rfc7231.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -740,33 +781,7 @@ }, "parameters": [ { - "$id": "70", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "71", - "kind": "utcDateTime", - "name": "utcDateTime", - "encode": "rfc7231", - "wireType": { - "$id": "72", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.utcDateTime", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Datetime.Query.rfc7231.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "70" } ], "response": {}, @@ -813,7 +828,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Datetime.Query.unixTimestamp.value", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "78", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "79", + "kind": "utcDateTime", + "name": "utcDateTime", + "encode": "unixTimestamp", + "wireType": { + "$id": "80", + "kind": "int64", + "name": "int64", + "crossLanguageDefinitionId": "TypeSpec.int64", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.utcDateTime", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Datetime.Query.unixTimestamp.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -837,33 +883,7 @@ }, "parameters": [ { - "$id": "78", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "79", - "kind": "utcDateTime", - "name": "utcDateTime", - "encode": "unixTimestamp", - "wireType": { - "$id": "80", - "kind": "int64", - "name": "int64", - "crossLanguageDefinitionId": "TypeSpec.int64", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.utcDateTime", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Datetime.Query.unixTimestamp.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "78" } ], "response": {}, @@ -899,7 +919,26 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Datetime.Query.unixTimestampArray.value", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "84", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$ref": "39" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Datetime.Query.unixTimestampArray.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -923,21 +962,7 @@ }, "parameters": [ { - "$id": "84", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$ref": "39" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Datetime.Query.unixTimestampArray.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "84" } ], "response": {}, @@ -1021,10 +1046,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Datetime.Property.default.contentType" + "crossLanguageDefinitionId": "Encode.Datetime.Property.default.contentType", + "methodParameterSegments": [ + { + "$id": "92", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Datetime.Property.default.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "92", + "$id": "93", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -1037,10 +1082,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Datetime.Property.default.accept" + "crossLanguageDefinitionId": "Encode.Datetime.Property.default.accept", + "methodParameterSegments": [ + { + "$id": "94", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "3" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Datetime.Property.default.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "93", + "$id": "95", "kind": "body", "name": "body", "serializedName": "body", @@ -1056,7 +1120,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Datetime.Property.default.body" + "crossLanguageDefinitionId": "Encode.Datetime.Property.default.body", + "methodParameterSegments": [ + { + "$id": "96", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "21" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Datetime.Property.default.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1089,56 +1172,13 @@ }, "parameters": [ { - "$id": "94", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "21" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Datetime.Property.default.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "96" }, { - "$id": "95", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Datetime.Property.default.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "92" }, { - "$id": "96", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Datetime.Property.default.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "94" } ], "response": { @@ -1178,10 +1218,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc3339.contentType" + "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc3339.contentType", + "methodParameterSegments": [ + { + "$id": "100", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc3339.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "100", + "$id": "101", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -1194,10 +1254,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc3339.accept" + "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc3339.accept", + "methodParameterSegments": [ + { + "$id": "102", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc3339.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "101", + "$id": "103", "kind": "body", "name": "body", "serializedName": "body", @@ -1213,7 +1292,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc3339.body" + "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc3339.body", + "methodParameterSegments": [ + { + "$id": "104", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "25" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc3339.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1246,56 +1344,13 @@ }, "parameters": [ { - "$id": "102", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "25" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc3339.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "104" }, { - "$id": "103", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc3339.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "100" }, { - "$id": "104", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc3339.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "102" } ], "response": { @@ -1335,10 +1390,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc7231.contentType" + "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc7231.contentType", + "methodParameterSegments": [ + { + "$id": "108", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc7231.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "108", + "$id": "109", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -1351,10 +1426,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc7231.accept" + "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc7231.accept", + "methodParameterSegments": [ + { + "$id": "110", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "11" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc7231.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "109", + "$id": "111", "kind": "body", "name": "body", "serializedName": "body", @@ -1370,7 +1464,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc7231.body" + "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc7231.body", + "methodParameterSegments": [ + { + "$id": "112", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "29" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc7231.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1403,56 +1516,13 @@ }, "parameters": [ { - "$id": "110", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "29" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc7231.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "112" }, { - "$id": "111", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc7231.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "108" }, { - "$id": "112", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Datetime.Property.rfc7231.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "110" } ], "response": { @@ -1492,10 +1562,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestamp.contentType" + "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestamp.contentType", + "methodParameterSegments": [ + { + "$id": "116", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "13" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestamp.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "116", + "$id": "117", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -1508,10 +1598,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestamp.accept" + "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestamp.accept", + "methodParameterSegments": [ + { + "$id": "118", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "15" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestamp.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "117", + "$id": "119", "kind": "body", "name": "body", "serializedName": "body", @@ -1527,7 +1636,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestamp.body" + "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestamp.body", + "methodParameterSegments": [ + { + "$id": "120", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "33" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestamp.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1560,56 +1688,13 @@ }, "parameters": [ { - "$id": "118", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "33" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestamp.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "120" }, { - "$id": "119", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestamp.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "116" }, { - "$id": "120", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestamp.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "118" } ], "response": { @@ -1649,10 +1734,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestampArray.contentType" + "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestampArray.contentType", + "methodParameterSegments": [ + { + "$id": "124", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestampArray.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "124", + "$id": "125", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -1665,10 +1770,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestampArray.accept" + "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestampArray.accept", + "methodParameterSegments": [ + { + "$id": "126", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "19" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestampArray.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "125", + "$id": "127", "kind": "body", "name": "body", "serializedName": "body", @@ -1684,7 +1808,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestampArray.body" + "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestampArray.body", + "methodParameterSegments": [ + { + "$id": "128", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "37" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestampArray.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1717,56 +1860,13 @@ }, "parameters": [ { - "$id": "126", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "37" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestampArray.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "128" }, { - "$id": "127", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "17" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestampArray.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "124" }, { - "$id": "128", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "19" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Datetime.Property.unixTimestampArray.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "126" } ], "response": { @@ -1865,7 +1965,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Datetime.Header.default.value" + "crossLanguageDefinitionId": "Encode.Datetime.Header.default.value", + "methodParameterSegments": [ + { + "$id": "138", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "139", + "kind": "utcDateTime", + "name": "utcDateTime", + "encode": "rfc7231", + "wireType": { + "$id": "140", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.utcDateTime", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Datetime.Header.default.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1889,33 +2020,7 @@ }, "parameters": [ { - "$id": "138", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "139", - "kind": "utcDateTime", - "name": "utcDateTime", - "encode": "rfc7231", - "wireType": { - "$id": "140", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.utcDateTime", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Datetime.Header.default.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "138" } ], "response": {}, @@ -1962,7 +2067,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Datetime.Header.rfc3339.value" + "crossLanguageDefinitionId": "Encode.Datetime.Header.rfc3339.value", + "methodParameterSegments": [ + { + "$id": "146", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "147", + "kind": "utcDateTime", + "name": "utcDateTime", + "encode": "rfc3339", + "wireType": { + "$id": "148", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.utcDateTime", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Datetime.Header.rfc3339.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1986,33 +2122,7 @@ }, "parameters": [ { - "$id": "146", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "147", - "kind": "utcDateTime", - "name": "utcDateTime", - "encode": "rfc3339", - "wireType": { - "$id": "148", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.utcDateTime", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Datetime.Header.rfc3339.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "146" } ], "response": {}, @@ -2059,7 +2169,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Datetime.Header.rfc7231.value" + "crossLanguageDefinitionId": "Encode.Datetime.Header.rfc7231.value", + "methodParameterSegments": [ + { + "$id": "154", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "155", + "kind": "utcDateTime", + "name": "utcDateTime", + "encode": "rfc7231", + "wireType": { + "$id": "156", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.utcDateTime", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Datetime.Header.rfc7231.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2083,33 +2224,7 @@ }, "parameters": [ { - "$id": "154", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "155", - "kind": "utcDateTime", - "name": "utcDateTime", - "encode": "rfc7231", - "wireType": { - "$id": "156", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.utcDateTime", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Datetime.Header.rfc7231.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "154" } ], "response": {}, @@ -2156,7 +2271,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Datetime.Header.unixTimestamp.value" + "crossLanguageDefinitionId": "Encode.Datetime.Header.unixTimestamp.value", + "methodParameterSegments": [ + { + "$id": "162", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "163", + "kind": "utcDateTime", + "name": "utcDateTime", + "encode": "unixTimestamp", + "wireType": { + "$id": "164", + "kind": "int64", + "name": "int64", + "crossLanguageDefinitionId": "TypeSpec.int64", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.utcDateTime", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Datetime.Header.unixTimestamp.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2180,33 +2326,7 @@ }, "parameters": [ { - "$id": "162", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "163", - "kind": "utcDateTime", - "name": "utcDateTime", - "encode": "unixTimestamp", - "wireType": { - "$id": "164", - "kind": "int64", - "name": "int64", - "crossLanguageDefinitionId": "TypeSpec.int64", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.utcDateTime", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Datetime.Header.unixTimestamp.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "162" } ], "response": {}, @@ -2243,7 +2363,26 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Datetime.Header.unixTimestampArray.value" + "crossLanguageDefinitionId": "Encode.Datetime.Header.unixTimestampArray.value", + "methodParameterSegments": [ + { + "$id": "168", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$ref": "39" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Datetime.Header.unixTimestampArray.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2267,21 +2406,7 @@ }, "parameters": [ { - "$id": "168", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$ref": "39" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Datetime.Header.unixTimestampArray.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "168" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/Encode.Duration.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/Encode.Duration.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/Encode.Duration.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/Encode.Duration.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/Encode.Duration.sln deleted file mode 100644 index b31430b6a51..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/Encode.Duration.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Encode.Duration", "src\Encode.Duration.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/Encode.Duration.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/Encode.Duration.slnx new file mode 100644 index 00000000000..b1e7a69c214 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/Encode.Duration.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Encode.Duration.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Encode.Duration.csproj index 6d861d25c81..0ec2ef16ca4 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Encode.Duration.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Encode.Duration.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/DurationClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/DurationClient.cs index 5f2a93cce5a..efdd9208ab4 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/DurationClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/DurationClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using Encode.Duration._Header; using Encode.Duration._Property; using Encode.Duration._Query; @@ -14,7 +15,12 @@ public partial class DurationClient { public DurationClient() : this(new Uri("http://localhost:3000"), new DurationClientOptions()) => throw null; - public DurationClient(Uri endpoint, DurationClientOptions options) => throw null; + internal DurationClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, DurationClientOptions options) => throw null; + + public DurationClient(Uri endpoint, DurationClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public DurationClient(DurationClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/DurationClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/DurationClientOptions.cs index a78e11b5410..a3259a567ec 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/DurationClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/DurationClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Encode.Duration { public partial class DurationClientOptions : ClientPipelineOptions { + public DurationClientOptions() => throw null; + + [Experimental("SCME0002")] + internal DurationClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/DurationClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/DurationClientSettings.cs new file mode 100644 index 00000000000..d5794c77d32 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/DurationClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Encode.Duration +{ + [Experimental("SCME0002")] + public partial class DurationClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public DurationClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Header.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Header.cs index f8b13ad6053..60aaa9d639d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Header.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Header.cs @@ -15,6 +15,8 @@ public partial class Header { protected Header() => throw null; + internal Header(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Default(TimeSpan duration, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/DefaultDurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/DefaultDurationProperty.Serialization.cs index 2fa89291594..7475d930283 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/DefaultDurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/DefaultDurationProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class DefaultDurationProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DefaultDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual DefaultDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DefaultDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DefaultDurationProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DefaultDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(DefaultDurationProperty defaultDurationProperty) => throw null; public static explicit operator DefaultDurationProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DefaultDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual DefaultDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Float64MillisecondsDurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Float64MillisecondsDurationProperty.Serialization.cs index 176242ed975..b2ae71724d1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Float64MillisecondsDurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Float64MillisecondsDurationProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class Float64MillisecondsDurationProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Float64MillisecondsDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Float64MillisecondsDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Float64MillisecondsDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Float64MillisecondsDurationProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Float64MillisecondsDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Float64MillisecondsDurationProperty float64MillisecondsDurationProperty) => throw null; public static explicit operator Float64MillisecondsDurationProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Float64MillisecondsDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Float64MillisecondsDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Float64SecondsDurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Float64SecondsDurationProperty.Serialization.cs index 19d5e04fa04..5278fe4d8d0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Float64SecondsDurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Float64SecondsDurationProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class Float64SecondsDurationProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Float64SecondsDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Float64SecondsDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Float64SecondsDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Float64SecondsDurationProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Float64SecondsDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Float64SecondsDurationProperty float64SecondsDurationProperty) => throw null; public static explicit operator Float64SecondsDurationProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Float64SecondsDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Float64SecondsDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatMillisecondsDurationArrayProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatMillisecondsDurationArrayProperty.Serialization.cs index 4a654d731ee..e7c2cf62ba0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatMillisecondsDurationArrayProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatMillisecondsDurationArrayProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class FloatMillisecondsDurationArrayProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - FloatMillisecondsDurationArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual FloatMillisecondsDurationArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual FloatMillisecondsDurationArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - FloatMillisecondsDurationArrayProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual FloatMillisecondsDurationArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(FloatMillisecondsDurationArrayProperty floatMillisecondsDurationArrayProperty) => throw null; public static explicit operator FloatMillisecondsDurationArrayProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + FloatMillisecondsDurationArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual FloatMillisecondsDurationArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatMillisecondsDurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatMillisecondsDurationProperty.Serialization.cs index 6272d9a5545..7cfe769402e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatMillisecondsDurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatMillisecondsDurationProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class FloatMillisecondsDurationProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - FloatMillisecondsDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual FloatMillisecondsDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual FloatMillisecondsDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - FloatMillisecondsDurationProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual FloatMillisecondsDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(FloatMillisecondsDurationProperty floatMillisecondsDurationProperty) => throw null; public static explicit operator FloatMillisecondsDurationProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + FloatMillisecondsDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual FloatMillisecondsDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatMillisecondsLargerUnitDurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatMillisecondsLargerUnitDurationProperty.Serialization.cs index 1e114e45b49..cabb488e6df 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatMillisecondsLargerUnitDurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatMillisecondsLargerUnitDurationProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class FloatMillisecondsLargerUnitDurationProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - FloatMillisecondsLargerUnitDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual FloatMillisecondsLargerUnitDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual FloatMillisecondsLargerUnitDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - FloatMillisecondsLargerUnitDurationProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual FloatMillisecondsLargerUnitDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(FloatMillisecondsLargerUnitDurationProperty floatMillisecondsLargerUnitDurationProperty) => throw null; public static explicit operator FloatMillisecondsLargerUnitDurationProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + FloatMillisecondsLargerUnitDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual FloatMillisecondsLargerUnitDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatSecondsDurationArrayProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatSecondsDurationArrayProperty.Serialization.cs index 41c55fb41c5..4c96ef805d1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatSecondsDurationArrayProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatSecondsDurationArrayProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class FloatSecondsDurationArrayProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - FloatSecondsDurationArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual FloatSecondsDurationArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual FloatSecondsDurationArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - FloatSecondsDurationArrayProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual FloatSecondsDurationArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(FloatSecondsDurationArrayProperty floatSecondsDurationArrayProperty) => throw null; public static explicit operator FloatSecondsDurationArrayProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + FloatSecondsDurationArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual FloatSecondsDurationArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatSecondsDurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatSecondsDurationProperty.Serialization.cs index 83556e042c6..e0dd6a22516 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatSecondsDurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatSecondsDurationProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class FloatSecondsDurationProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - FloatSecondsDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual FloatSecondsDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual FloatSecondsDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - FloatSecondsDurationProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual FloatSecondsDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(FloatSecondsDurationProperty floatSecondsDurationProperty) => throw null; public static explicit operator FloatSecondsDurationProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + FloatSecondsDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual FloatSecondsDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatSecondsLargerUnitDurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatSecondsLargerUnitDurationProperty.Serialization.cs index bc5b740cd40..6da047bac28 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatSecondsLargerUnitDurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/FloatSecondsLargerUnitDurationProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class FloatSecondsLargerUnitDurationProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - FloatSecondsLargerUnitDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual FloatSecondsLargerUnitDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual FloatSecondsLargerUnitDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - FloatSecondsLargerUnitDurationProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual FloatSecondsLargerUnitDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(FloatSecondsLargerUnitDurationProperty floatSecondsLargerUnitDurationProperty) => throw null; public static explicit operator FloatSecondsLargerUnitDurationProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + FloatSecondsLargerUnitDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual FloatSecondsLargerUnitDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/ISO8601DurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/ISO8601DurationProperty.Serialization.cs index 71a515fe079..ddd7e8c8ca2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/ISO8601DurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/ISO8601DurationProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class ISO8601DurationProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ISO8601DurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ISO8601DurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ISO8601DurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ISO8601DurationProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ISO8601DurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ISO8601DurationProperty isO8601DurationProperty) => throw null; public static explicit operator ISO8601DurationProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ISO8601DurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ISO8601DurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Int32MillisecondsDurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Int32MillisecondsDurationProperty.Serialization.cs index 565190c9f67..2049f8c571d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Int32MillisecondsDurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Int32MillisecondsDurationProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class Int32MillisecondsDurationProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Int32MillisecondsDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Int32MillisecondsDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Int32MillisecondsDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Int32MillisecondsDurationProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Int32MillisecondsDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Int32MillisecondsDurationProperty int32MillisecondsDurationProperty) => throw null; public static explicit operator Int32MillisecondsDurationProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Int32MillisecondsDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Int32MillisecondsDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Int32MillisecondsLargerUnitDurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Int32MillisecondsLargerUnitDurationProperty.Serialization.cs index 883e10bde6e..5b735330693 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Int32MillisecondsLargerUnitDurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Int32MillisecondsLargerUnitDurationProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class Int32MillisecondsLargerUnitDurationProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Int32MillisecondsLargerUnitDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Int32MillisecondsLargerUnitDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Int32MillisecondsLargerUnitDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Int32MillisecondsLargerUnitDurationProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Int32MillisecondsLargerUnitDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Int32MillisecondsLargerUnitDurationProperty int32MillisecondsLargerUnitDurationProperty) => throw null; public static explicit operator Int32MillisecondsLargerUnitDurationProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Int32MillisecondsLargerUnitDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Int32MillisecondsLargerUnitDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Int32SecondsDurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Int32SecondsDurationProperty.Serialization.cs index 2e7fbffe5cc..2ec9e709a1e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Int32SecondsDurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Int32SecondsDurationProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class Int32SecondsDurationProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Int32SecondsDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Int32SecondsDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Int32SecondsDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Int32SecondsDurationProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Int32SecondsDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Int32SecondsDurationProperty int32SecondsDurationProperty) => throw null; public static explicit operator Int32SecondsDurationProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Int32SecondsDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Int32SecondsDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Int32SecondsLargerUnitDurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Int32SecondsLargerUnitDurationProperty.Serialization.cs index d2ce36089c8..500b0a562cc 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Int32SecondsLargerUnitDurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Models/Int32SecondsLargerUnitDurationProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class Int32SecondsLargerUnitDurationProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Int32SecondsLargerUnitDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Int32SecondsLargerUnitDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Int32SecondsLargerUnitDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Int32SecondsLargerUnitDurationProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Int32SecondsLargerUnitDurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Int32SecondsLargerUnitDurationProperty int32SecondsLargerUnitDurationProperty) => throw null; public static explicit operator Int32SecondsLargerUnitDurationProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Int32SecondsLargerUnitDurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Int32SecondsLargerUnitDurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Property.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Property.cs index 68a98785695..5932c8916b1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Property.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Property.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Property { protected Property() => throw null; + internal Property(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Default(BinaryContent content, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Query.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Query.cs index ab8d0db30f9..3389d4bc03c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Query.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/Query.cs @@ -15,6 +15,8 @@ public partial class Query { protected Query() => throw null; + internal Query(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Default(TimeSpan input, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..f0eec9c5ae3 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "DurationClient": { + "type": "object", + "description": "Configuration for DurationClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/durationClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "durationClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/tspCodeModel.json index b13798c6782..095d006abef 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/tspCodeModel.json @@ -1273,7 +1273,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Duration.Query.default.input", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "129", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$id": "130", + "kind": "duration", + "name": "duration", + "encode": "ISO8601", + "wireType": { + "$id": "131", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Query.default.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1297,33 +1328,7 @@ }, "parameters": [ { - "$id": "129", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$id": "130", - "kind": "duration", - "name": "duration", - "encode": "ISO8601", - "wireType": { - "$id": "131", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Query.default.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "129" } ], "response": {}, @@ -1370,7 +1375,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Duration.Query.iso8601.input", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "137", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$id": "138", + "kind": "duration", + "name": "duration", + "encode": "ISO8601", + "wireType": { + "$id": "139", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Query.iso8601.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1394,33 +1430,7 @@ }, "parameters": [ { - "$id": "137", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$id": "138", - "kind": "duration", - "name": "duration", - "encode": "ISO8601", - "wireType": { - "$id": "139", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Query.iso8601.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "137" } ], "response": {}, @@ -1467,7 +1477,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Duration.Query.int32Seconds.input", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "145", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$id": "146", + "kind": "duration", + "name": "duration", + "encode": "seconds", + "wireType": { + "$id": "147", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Query.int32Seconds.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1491,33 +1532,7 @@ }, "parameters": [ { - "$id": "145", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$id": "146", - "kind": "duration", - "name": "duration", - "encode": "seconds", - "wireType": { - "$id": "147", - "kind": "int32", - "name": "int32", - "crossLanguageDefinitionId": "TypeSpec.int32", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Query.int32Seconds.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "145" } ], "response": {}, @@ -1564,7 +1579,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Duration.Query.int32SecondsLargerUnit.input", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "153", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$id": "154", + "kind": "duration", + "name": "duration", + "encode": "seconds", + "wireType": { + "$id": "155", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Query.int32SecondsLargerUnit.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1588,33 +1634,7 @@ }, "parameters": [ { - "$id": "153", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$id": "154", - "kind": "duration", - "name": "duration", - "encode": "seconds", - "wireType": { - "$id": "155", - "kind": "int32", - "name": "int32", - "crossLanguageDefinitionId": "TypeSpec.int32", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Query.int32SecondsLargerUnit.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "153" } ], "response": {}, @@ -1661,7 +1681,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Duration.Query.floatSeconds.input", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "161", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$id": "162", + "kind": "duration", + "name": "duration", + "encode": "seconds", + "wireType": { + "$id": "163", + "kind": "float", + "name": "float", + "crossLanguageDefinitionId": "TypeSpec.float", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Query.floatSeconds.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1685,33 +1736,7 @@ }, "parameters": [ { - "$id": "161", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$id": "162", - "kind": "duration", - "name": "duration", - "encode": "seconds", - "wireType": { - "$id": "163", - "kind": "float", - "name": "float", - "crossLanguageDefinitionId": "TypeSpec.float", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Query.floatSeconds.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "161" } ], "response": {}, @@ -1758,7 +1783,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Duration.Query.floatSecondsLargerUnit.input", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "169", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$id": "170", + "kind": "duration", + "name": "duration", + "encode": "seconds", + "wireType": { + "$id": "171", + "kind": "float", + "name": "float", + "crossLanguageDefinitionId": "TypeSpec.float", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Query.floatSecondsLargerUnit.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1782,33 +1838,7 @@ }, "parameters": [ { - "$id": "169", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$id": "170", - "kind": "duration", - "name": "duration", - "encode": "seconds", - "wireType": { - "$id": "171", - "kind": "float", - "name": "float", - "crossLanguageDefinitionId": "TypeSpec.float", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Query.floatSecondsLargerUnit.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "169" } ], "response": {}, @@ -1855,7 +1885,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Duration.Query.float64Seconds.input", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "177", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$id": "178", + "kind": "duration", + "name": "duration", + "encode": "seconds", + "wireType": { + "$id": "179", + "kind": "float64", + "name": "float64", + "crossLanguageDefinitionId": "TypeSpec.float64", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Query.float64Seconds.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1879,33 +1940,7 @@ }, "parameters": [ { - "$id": "177", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$id": "178", - "kind": "duration", - "name": "duration", - "encode": "seconds", - "wireType": { - "$id": "179", - "kind": "float64", - "name": "float64", - "crossLanguageDefinitionId": "TypeSpec.float64", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Query.float64Seconds.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "177" } ], "response": {}, @@ -1952,7 +1987,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Duration.Query.int32Milliseconds.input", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "185", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$id": "186", + "kind": "duration", + "name": "duration", + "encode": "milliseconds", + "wireType": { + "$id": "187", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Query.int32Milliseconds.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1976,33 +2042,7 @@ }, "parameters": [ { - "$id": "185", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$id": "186", - "kind": "duration", - "name": "duration", - "encode": "milliseconds", - "wireType": { - "$id": "187", - "kind": "int32", - "name": "int32", - "crossLanguageDefinitionId": "TypeSpec.int32", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Query.int32Milliseconds.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "185" } ], "response": {}, @@ -2049,7 +2089,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Duration.Query.int32MillisecondsLargerUnit.input", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "193", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$id": "194", + "kind": "duration", + "name": "duration", + "encode": "milliseconds", + "wireType": { + "$id": "195", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Query.int32MillisecondsLargerUnit.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2073,33 +2144,7 @@ }, "parameters": [ { - "$id": "193", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$id": "194", - "kind": "duration", - "name": "duration", - "encode": "milliseconds", - "wireType": { - "$id": "195", - "kind": "int32", - "name": "int32", - "crossLanguageDefinitionId": "TypeSpec.int32", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Query.int32MillisecondsLargerUnit.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "193" } ], "response": {}, @@ -2146,7 +2191,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Duration.Query.floatMilliseconds.input", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "201", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$id": "202", + "kind": "duration", + "name": "duration", + "encode": "milliseconds", + "wireType": { + "$id": "203", + "kind": "float", + "name": "float", + "crossLanguageDefinitionId": "TypeSpec.float", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Query.floatMilliseconds.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2170,33 +2246,7 @@ }, "parameters": [ { - "$id": "201", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$id": "202", - "kind": "duration", - "name": "duration", - "encode": "milliseconds", - "wireType": { - "$id": "203", - "kind": "float", - "name": "float", - "crossLanguageDefinitionId": "TypeSpec.float", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Query.floatMilliseconds.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "201" } ], "response": {}, @@ -2243,7 +2293,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Duration.Query.floatMillisecondsLargerUnit.input", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "209", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$id": "210", + "kind": "duration", + "name": "duration", + "encode": "milliseconds", + "wireType": { + "$id": "211", + "kind": "float", + "name": "float", + "crossLanguageDefinitionId": "TypeSpec.float", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Query.floatMillisecondsLargerUnit.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2267,33 +2348,7 @@ }, "parameters": [ { - "$id": "209", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$id": "210", - "kind": "duration", - "name": "duration", - "encode": "milliseconds", - "wireType": { - "$id": "211", - "kind": "float", - "name": "float", - "crossLanguageDefinitionId": "TypeSpec.float", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Query.floatMillisecondsLargerUnit.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "209" } ], "response": {}, @@ -2340,7 +2395,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Duration.Query.float64Milliseconds.input", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "217", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$id": "218", + "kind": "duration", + "name": "duration", + "encode": "milliseconds", + "wireType": { + "$id": "219", + "kind": "float64", + "name": "float64", + "crossLanguageDefinitionId": "TypeSpec.float64", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Query.float64Milliseconds.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2364,33 +2450,7 @@ }, "parameters": [ { - "$id": "217", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$id": "218", - "kind": "duration", - "name": "duration", - "encode": "milliseconds", - "wireType": { - "$id": "219", - "kind": "float64", - "name": "float64", - "crossLanguageDefinitionId": "TypeSpec.float64", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Query.float64Milliseconds.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "217" } ], "response": {}, @@ -2460,7 +2520,26 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Duration.Query.int32SecondsArray.input", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "228", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "223" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Query.int32SecondsArray.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2484,21 +2563,7 @@ }, "parameters": [ { - "$id": "228", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "223" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Query.int32SecondsArray.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "228" } ], "response": {}, @@ -2568,7 +2633,26 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Encode.Duration.Query.int32MillisecondsArray.input", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "237", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "232" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Query.int32MillisecondsArray.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2592,21 +2676,7 @@ }, "parameters": [ { - "$id": "237", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "232" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Query.int32MillisecondsArray.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "237" } ], "response": {}, @@ -2690,10 +2760,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.default.contentType" + "crossLanguageDefinitionId": "Encode.Duration.Property.default.contentType", + "methodParameterSegments": [ + { + "$id": "245", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.default.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "245", + "$id": "246", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -2706,10 +2796,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.default.accept" + "crossLanguageDefinitionId": "Encode.Duration.Property.default.accept", + "methodParameterSegments": [ + { + "$id": "247", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "3" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.default.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "246", + "$id": "248", "kind": "body", "name": "body", "serializedName": "body", @@ -2725,7 +2834,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Duration.Property.default.body" + "crossLanguageDefinitionId": "Encode.Duration.Property.default.body", + "methodParameterSegments": [ + { + "$id": "249", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "57" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Property.default.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2758,56 +2886,13 @@ }, "parameters": [ { - "$id": "247", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "57" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Property.default.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "249" }, { - "$id": "248", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.default.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "245" }, { - "$id": "249", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.default.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "247" } ], "response": { @@ -2847,10 +2932,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.iso8601.contentType" + "crossLanguageDefinitionId": "Encode.Duration.Property.iso8601.contentType", + "methodParameterSegments": [ + { + "$id": "253", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.iso8601.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "253", + "$id": "254", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -2863,10 +2968,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.iso8601.accept" + "crossLanguageDefinitionId": "Encode.Duration.Property.iso8601.accept", + "methodParameterSegments": [ + { + "$id": "255", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.iso8601.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "254", + "$id": "256", "kind": "body", "name": "body", "serializedName": "body", @@ -2882,7 +3006,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Duration.Property.iso8601.body" + "crossLanguageDefinitionId": "Encode.Duration.Property.iso8601.body", + "methodParameterSegments": [ + { + "$id": "257", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "61" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Property.iso8601.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2915,56 +3058,13 @@ }, "parameters": [ { - "$id": "255", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "61" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Property.iso8601.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "257" }, { - "$id": "256", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.iso8601.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "253" }, { - "$id": "257", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.iso8601.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "255" } ], "response": { @@ -3004,10 +3104,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.int32Seconds.contentType" + "crossLanguageDefinitionId": "Encode.Duration.Property.int32Seconds.contentType", + "methodParameterSegments": [ + { + "$id": "261", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.int32Seconds.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "261", + "$id": "262", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -3020,10 +3140,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.int32Seconds.accept" + "crossLanguageDefinitionId": "Encode.Duration.Property.int32Seconds.accept", + "methodParameterSegments": [ + { + "$id": "263", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "11" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.int32Seconds.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "262", + "$id": "264", "kind": "body", "name": "body", "serializedName": "body", @@ -3039,7 +3178,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Duration.Property.int32Seconds.body" + "crossLanguageDefinitionId": "Encode.Duration.Property.int32Seconds.body", + "methodParameterSegments": [ + { + "$id": "265", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "65" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Property.int32Seconds.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3072,56 +3230,13 @@ }, "parameters": [ { - "$id": "263", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "65" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Property.int32Seconds.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "265" }, { - "$id": "264", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.int32Seconds.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "261" }, { - "$id": "265", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.int32Seconds.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "263" } ], "response": { @@ -3161,10 +3276,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.floatSeconds.contentType" + "crossLanguageDefinitionId": "Encode.Duration.Property.floatSeconds.contentType", + "methodParameterSegments": [ + { + "$id": "269", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "13" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.floatSeconds.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "269", + "$id": "270", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -3177,10 +3312,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.floatSeconds.accept" + "crossLanguageDefinitionId": "Encode.Duration.Property.floatSeconds.accept", + "methodParameterSegments": [ + { + "$id": "271", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "15" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.floatSeconds.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "270", + "$id": "272", "kind": "body", "name": "body", "serializedName": "body", @@ -3196,7 +3350,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Duration.Property.floatSeconds.body" + "crossLanguageDefinitionId": "Encode.Duration.Property.floatSeconds.body", + "methodParameterSegments": [ + { + "$id": "273", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "69" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Property.floatSeconds.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3229,56 +3402,13 @@ }, "parameters": [ { - "$id": "271", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "69" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Property.floatSeconds.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "273" }, { - "$id": "272", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.floatSeconds.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "269" }, { - "$id": "273", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.floatSeconds.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "271" } ], "response": { @@ -3318,10 +3448,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.float64Seconds.contentType" + "crossLanguageDefinitionId": "Encode.Duration.Property.float64Seconds.contentType", + "methodParameterSegments": [ + { + "$id": "277", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.float64Seconds.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "277", + "$id": "278", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -3334,10 +3484,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.float64Seconds.accept" + "crossLanguageDefinitionId": "Encode.Duration.Property.float64Seconds.accept", + "methodParameterSegments": [ + { + "$id": "279", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "19" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.float64Seconds.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "278", + "$id": "280", "kind": "body", "name": "body", "serializedName": "body", @@ -3353,7 +3522,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Duration.Property.float64Seconds.body" + "crossLanguageDefinitionId": "Encode.Duration.Property.float64Seconds.body", + "methodParameterSegments": [ + { + "$id": "281", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "73" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Property.float64Seconds.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3386,56 +3574,13 @@ }, "parameters": [ { - "$id": "279", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "73" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Property.float64Seconds.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "281" }, { - "$id": "280", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "17" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.float64Seconds.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "277" }, { - "$id": "281", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "19" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.float64Seconds.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "279" } ], "response": { @@ -3475,10 +3620,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.int32Milliseconds.contentType" + "crossLanguageDefinitionId": "Encode.Duration.Property.int32Milliseconds.contentType", + "methodParameterSegments": [ + { + "$id": "285", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "21" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.int32Milliseconds.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "285", + "$id": "286", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -3491,10 +3656,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.int32Milliseconds.accept" + "crossLanguageDefinitionId": "Encode.Duration.Property.int32Milliseconds.accept", + "methodParameterSegments": [ + { + "$id": "287", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "23" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.int32Milliseconds.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "286", + "$id": "288", "kind": "body", "name": "body", "serializedName": "body", @@ -3510,7 +3694,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Duration.Property.int32Milliseconds.body" + "crossLanguageDefinitionId": "Encode.Duration.Property.int32Milliseconds.body", + "methodParameterSegments": [ + { + "$id": "289", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "77" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Property.int32Milliseconds.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3543,56 +3746,13 @@ }, "parameters": [ { - "$id": "287", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "77" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Property.int32Milliseconds.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "289" }, { - "$id": "288", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "21" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.int32Milliseconds.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "285" }, { - "$id": "289", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "23" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.int32Milliseconds.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "287" } ], "response": { @@ -3632,10 +3792,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.floatMilliseconds.contentType" + "crossLanguageDefinitionId": "Encode.Duration.Property.floatMilliseconds.contentType", + "methodParameterSegments": [ + { + "$id": "293", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "25" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.floatMilliseconds.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "293", + "$id": "294", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -3648,10 +3828,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.floatMilliseconds.accept" + "crossLanguageDefinitionId": "Encode.Duration.Property.floatMilliseconds.accept", + "methodParameterSegments": [ + { + "$id": "295", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "27" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.floatMilliseconds.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "294", + "$id": "296", "kind": "body", "name": "body", "serializedName": "body", @@ -3667,7 +3866,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Duration.Property.floatMilliseconds.body" + "crossLanguageDefinitionId": "Encode.Duration.Property.floatMilliseconds.body", + "methodParameterSegments": [ + { + "$id": "297", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "81" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Property.floatMilliseconds.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3700,56 +3918,13 @@ }, "parameters": [ { - "$id": "295", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "81" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Property.floatMilliseconds.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "297" }, { - "$id": "296", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "25" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.floatMilliseconds.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "293" }, { - "$id": "297", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "27" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.floatMilliseconds.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "295" } ], "response": { @@ -3789,10 +3964,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.float64Milliseconds.contentType" + "crossLanguageDefinitionId": "Encode.Duration.Property.float64Milliseconds.contentType", + "methodParameterSegments": [ + { + "$id": "301", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "29" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.float64Milliseconds.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "301", + "$id": "302", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -3805,10 +4000,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.float64Milliseconds.accept" + "crossLanguageDefinitionId": "Encode.Duration.Property.float64Milliseconds.accept", + "methodParameterSegments": [ + { + "$id": "303", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "31" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.float64Milliseconds.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "302", + "$id": "304", "kind": "body", "name": "body", "serializedName": "body", @@ -3824,7 +4038,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Duration.Property.float64Milliseconds.body" + "crossLanguageDefinitionId": "Encode.Duration.Property.float64Milliseconds.body", + "methodParameterSegments": [ + { + "$id": "305", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "85" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Property.float64Milliseconds.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3857,56 +4090,13 @@ }, "parameters": [ { - "$id": "303", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "85" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Property.float64Milliseconds.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "305" }, { - "$id": "304", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "29" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.float64Milliseconds.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "301" }, { - "$id": "305", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "31" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.float64Milliseconds.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "303" } ], "response": { @@ -3946,10 +4136,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsArray.contentType" + "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsArray.contentType", + "methodParameterSegments": [ + { + "$id": "309", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "33" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsArray.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "309", + "$id": "310", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -3962,10 +4172,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsArray.accept" + "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsArray.accept", + "methodParameterSegments": [ + { + "$id": "311", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "35" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsArray.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "310", + "$id": "312", "kind": "body", "name": "body", "serializedName": "body", @@ -3981,7 +4210,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsArray.body" + "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsArray.body", + "methodParameterSegments": [ + { + "$id": "313", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "89" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsArray.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4014,56 +4262,13 @@ }, "parameters": [ { - "$id": "311", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "89" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsArray.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "313" }, { - "$id": "312", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "33" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsArray.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "309" }, { - "$id": "313", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "35" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsArray.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "311" } ], "response": { @@ -4103,10 +4308,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsArray.contentType" + "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsArray.contentType", + "methodParameterSegments": [ + { + "$id": "317", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "37" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsArray.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "317", + "$id": "318", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -4119,10 +4344,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsArray.accept" + "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsArray.accept", + "methodParameterSegments": [ + { + "$id": "319", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "39" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsArray.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "318", + "$id": "320", "kind": "body", "name": "body", "serializedName": "body", @@ -4138,7 +4382,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsArray.body" + "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsArray.body", + "methodParameterSegments": [ + { + "$id": "321", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "96" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsArray.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4171,56 +4434,13 @@ }, "parameters": [ { - "$id": "319", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "96" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsArray.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "321" }, { - "$id": "320", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "37" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsArray.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "317" }, { - "$id": "321", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "39" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsArray.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "319" } ], "response": { @@ -4260,10 +4480,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.int32SecondsLargerUnit.contentType" + "crossLanguageDefinitionId": "Encode.Duration.Property.int32SecondsLargerUnit.contentType", + "methodParameterSegments": [ + { + "$id": "325", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "41" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.int32SecondsLargerUnit.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "325", + "$id": "326", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -4276,10 +4516,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.int32SecondsLargerUnit.accept" + "crossLanguageDefinitionId": "Encode.Duration.Property.int32SecondsLargerUnit.accept", + "methodParameterSegments": [ + { + "$id": "327", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "43" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.int32SecondsLargerUnit.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "326", + "$id": "328", "kind": "body", "name": "body", "serializedName": "body", @@ -4295,7 +4554,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Duration.Property.int32SecondsLargerUnit.body" + "crossLanguageDefinitionId": "Encode.Duration.Property.int32SecondsLargerUnit.body", + "methodParameterSegments": [ + { + "$id": "329", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "103" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Property.int32SecondsLargerUnit.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4328,56 +4606,13 @@ }, "parameters": [ { - "$id": "327", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "103" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Property.int32SecondsLargerUnit.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "329" }, { - "$id": "328", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "41" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.int32SecondsLargerUnit.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "325" }, { - "$id": "329", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "43" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.int32SecondsLargerUnit.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "327" } ], "response": { @@ -4417,10 +4652,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsLargerUnit.contentType" + "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsLargerUnit.contentType", + "methodParameterSegments": [ + { + "$id": "333", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "45" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsLargerUnit.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "333", + "$id": "334", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -4433,10 +4688,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsLargerUnit.accept" + "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsLargerUnit.accept", + "methodParameterSegments": [ + { + "$id": "335", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "47" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsLargerUnit.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "334", + "$id": "336", "kind": "body", "name": "body", "serializedName": "body", @@ -4452,7 +4726,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsLargerUnit.body" + "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsLargerUnit.body", + "methodParameterSegments": [ + { + "$id": "337", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "107" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsLargerUnit.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4485,56 +4778,13 @@ }, "parameters": [ { - "$id": "335", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "107" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsLargerUnit.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "337" }, { - "$id": "336", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "45" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsLargerUnit.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "333" }, { - "$id": "337", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "47" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.floatSecondsLargerUnit.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "335" } ], "response": { @@ -4574,10 +4824,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.int32MillisecondsLargerUnit.contentType" + "crossLanguageDefinitionId": "Encode.Duration.Property.int32MillisecondsLargerUnit.contentType", + "methodParameterSegments": [ + { + "$id": "341", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "49" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.int32MillisecondsLargerUnit.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "341", + "$id": "342", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -4590,10 +4860,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.int32MillisecondsLargerUnit.accept" + "crossLanguageDefinitionId": "Encode.Duration.Property.int32MillisecondsLargerUnit.accept", + "methodParameterSegments": [ + { + "$id": "343", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "51" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.int32MillisecondsLargerUnit.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "342", + "$id": "344", "kind": "body", "name": "body", "serializedName": "body", @@ -4609,7 +4898,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Duration.Property.int32MillisecondsLargerUnit.body" + "crossLanguageDefinitionId": "Encode.Duration.Property.int32MillisecondsLargerUnit.body", + "methodParameterSegments": [ + { + "$id": "345", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "111" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Property.int32MillisecondsLargerUnit.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4642,56 +4950,13 @@ }, "parameters": [ { - "$id": "343", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "111" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Property.int32MillisecondsLargerUnit.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "345" }, { - "$id": "344", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "49" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.int32MillisecondsLargerUnit.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "341" }, { - "$id": "345", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "51" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.int32MillisecondsLargerUnit.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "343" } ], "response": { @@ -4731,10 +4996,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsLargerUnit.contentType" + "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsLargerUnit.contentType", + "methodParameterSegments": [ + { + "$id": "349", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "53" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsLargerUnit.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "349", + "$id": "350", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -4747,10 +5032,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsLargerUnit.accept" + "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsLargerUnit.accept", + "methodParameterSegments": [ + { + "$id": "351", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "55" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsLargerUnit.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "350", + "$id": "352", "kind": "body", "name": "body", "serializedName": "body", @@ -4766,7 +5070,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsLargerUnit.body" + "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsLargerUnit.body", + "methodParameterSegments": [ + { + "$id": "353", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "115" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsLargerUnit.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4799,56 +5122,13 @@ }, "parameters": [ { - "$id": "351", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "115" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsLargerUnit.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "353" }, { - "$id": "352", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "53" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsLargerUnit.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "349" }, { - "$id": "353", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "55" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Duration.Property.floatMillisecondsLargerUnit.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "351" } ], "response": { @@ -4947,7 +5227,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Header.default.duration" + "crossLanguageDefinitionId": "Encode.Duration.Header.default.duration", + "methodParameterSegments": [ + { + "$id": "363", + "kind": "method", + "name": "duration", + "serializedName": "duration", + "type": { + "$id": "364", + "kind": "duration", + "name": "duration", + "encode": "ISO8601", + "wireType": { + "$id": "365", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Header.default.duration", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4971,33 +5282,7 @@ }, "parameters": [ { - "$id": "363", - "kind": "method", - "name": "duration", - "serializedName": "duration", - "type": { - "$id": "364", - "kind": "duration", - "name": "duration", - "encode": "ISO8601", - "wireType": { - "$id": "365", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Header.default.duration", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "363" } ], "response": {}, @@ -5044,7 +5329,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Header.iso8601.duration" + "crossLanguageDefinitionId": "Encode.Duration.Header.iso8601.duration", + "methodParameterSegments": [ + { + "$id": "371", + "kind": "method", + "name": "duration", + "serializedName": "duration", + "type": { + "$id": "372", + "kind": "duration", + "name": "duration", + "encode": "ISO8601", + "wireType": { + "$id": "373", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Header.iso8601.duration", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5068,33 +5384,7 @@ }, "parameters": [ { - "$id": "371", - "kind": "method", - "name": "duration", - "serializedName": "duration", - "type": { - "$id": "372", - "kind": "duration", - "name": "duration", - "encode": "ISO8601", - "wireType": { - "$id": "373", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Header.iso8601.duration", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "371" } ], "response": {}, @@ -5165,7 +5455,26 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Header.iso8601Array.duration" + "crossLanguageDefinitionId": "Encode.Duration.Header.iso8601Array.duration", + "methodParameterSegments": [ + { + "$id": "382", + "kind": "method", + "name": "duration", + "serializedName": "duration", + "type": { + "$ref": "377" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Header.iso8601Array.duration", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5189,21 +5498,7 @@ }, "parameters": [ { - "$id": "382", - "kind": "method", - "name": "duration", - "serializedName": "duration", - "type": { - "$ref": "377" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Header.iso8601Array.duration", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "382" } ], "response": {}, @@ -5250,7 +5545,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Header.int32Seconds.duration" + "crossLanguageDefinitionId": "Encode.Duration.Header.int32Seconds.duration", + "methodParameterSegments": [ + { + "$id": "388", + "kind": "method", + "name": "duration", + "serializedName": "duration", + "type": { + "$id": "389", + "kind": "duration", + "name": "duration", + "encode": "seconds", + "wireType": { + "$id": "390", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Header.int32Seconds.duration", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5274,33 +5600,7 @@ }, "parameters": [ { - "$id": "388", - "kind": "method", - "name": "duration", - "serializedName": "duration", - "type": { - "$id": "389", - "kind": "duration", - "name": "duration", - "encode": "seconds", - "wireType": { - "$id": "390", - "kind": "int32", - "name": "int32", - "crossLanguageDefinitionId": "TypeSpec.int32", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Header.int32Seconds.duration", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "388" } ], "response": {}, @@ -5347,7 +5647,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Header.int32SecondsLargerUnit.duration" + "crossLanguageDefinitionId": "Encode.Duration.Header.int32SecondsLargerUnit.duration", + "methodParameterSegments": [ + { + "$id": "396", + "kind": "method", + "name": "duration", + "serializedName": "duration", + "type": { + "$id": "397", + "kind": "duration", + "name": "duration", + "encode": "seconds", + "wireType": { + "$id": "398", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Header.int32SecondsLargerUnit.duration", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5371,33 +5702,7 @@ }, "parameters": [ { - "$id": "396", - "kind": "method", - "name": "duration", - "serializedName": "duration", - "type": { - "$id": "397", - "kind": "duration", - "name": "duration", - "encode": "seconds", - "wireType": { - "$id": "398", - "kind": "int32", - "name": "int32", - "crossLanguageDefinitionId": "TypeSpec.int32", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Header.int32SecondsLargerUnit.duration", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "396" } ], "response": {}, @@ -5444,7 +5749,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Header.floatSeconds.duration" + "crossLanguageDefinitionId": "Encode.Duration.Header.floatSeconds.duration", + "methodParameterSegments": [ + { + "$id": "404", + "kind": "method", + "name": "duration", + "serializedName": "duration", + "type": { + "$id": "405", + "kind": "duration", + "name": "duration", + "encode": "seconds", + "wireType": { + "$id": "406", + "kind": "float", + "name": "float", + "crossLanguageDefinitionId": "TypeSpec.float", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Header.floatSeconds.duration", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5468,33 +5804,7 @@ }, "parameters": [ { - "$id": "404", - "kind": "method", - "name": "duration", - "serializedName": "duration", - "type": { - "$id": "405", - "kind": "duration", - "name": "duration", - "encode": "seconds", - "wireType": { - "$id": "406", - "kind": "float", - "name": "float", - "crossLanguageDefinitionId": "TypeSpec.float", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Header.floatSeconds.duration", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "404" } ], "response": {}, @@ -5541,7 +5851,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Header.floatSecondsLargerUnit.duration" + "crossLanguageDefinitionId": "Encode.Duration.Header.floatSecondsLargerUnit.duration", + "methodParameterSegments": [ + { + "$id": "412", + "kind": "method", + "name": "duration", + "serializedName": "duration", + "type": { + "$id": "413", + "kind": "duration", + "name": "duration", + "encode": "seconds", + "wireType": { + "$id": "414", + "kind": "float", + "name": "float", + "crossLanguageDefinitionId": "TypeSpec.float", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Header.floatSecondsLargerUnit.duration", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5565,33 +5906,7 @@ }, "parameters": [ { - "$id": "412", - "kind": "method", - "name": "duration", - "serializedName": "duration", - "type": { - "$id": "413", - "kind": "duration", - "name": "duration", - "encode": "seconds", - "wireType": { - "$id": "414", - "kind": "float", - "name": "float", - "crossLanguageDefinitionId": "TypeSpec.float", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Header.floatSecondsLargerUnit.duration", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "412" } ], "response": {}, @@ -5638,7 +5953,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Header.float64Seconds.duration" + "crossLanguageDefinitionId": "Encode.Duration.Header.float64Seconds.duration", + "methodParameterSegments": [ + { + "$id": "420", + "kind": "method", + "name": "duration", + "serializedName": "duration", + "type": { + "$id": "421", + "kind": "duration", + "name": "duration", + "encode": "seconds", + "wireType": { + "$id": "422", + "kind": "float64", + "name": "float64", + "crossLanguageDefinitionId": "TypeSpec.float64", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Header.float64Seconds.duration", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5662,33 +6008,7 @@ }, "parameters": [ { - "$id": "420", - "kind": "method", - "name": "duration", - "serializedName": "duration", - "type": { - "$id": "421", - "kind": "duration", - "name": "duration", - "encode": "seconds", - "wireType": { - "$id": "422", - "kind": "float64", - "name": "float64", - "crossLanguageDefinitionId": "TypeSpec.float64", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Header.float64Seconds.duration", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "420" } ], "response": {}, @@ -5735,7 +6055,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Header.int32Milliseconds.duration" + "crossLanguageDefinitionId": "Encode.Duration.Header.int32Milliseconds.duration", + "methodParameterSegments": [ + { + "$id": "428", + "kind": "method", + "name": "duration", + "serializedName": "duration", + "type": { + "$id": "429", + "kind": "duration", + "name": "duration", + "encode": "milliseconds", + "wireType": { + "$id": "430", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Header.int32Milliseconds.duration", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5759,33 +6110,7 @@ }, "parameters": [ { - "$id": "428", - "kind": "method", - "name": "duration", - "serializedName": "duration", - "type": { - "$id": "429", - "kind": "duration", - "name": "duration", - "encode": "milliseconds", - "wireType": { - "$id": "430", - "kind": "int32", - "name": "int32", - "crossLanguageDefinitionId": "TypeSpec.int32", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Header.int32Milliseconds.duration", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "428" } ], "response": {}, @@ -5832,7 +6157,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Header.int32MillisecondsLargerUnit.duration" + "crossLanguageDefinitionId": "Encode.Duration.Header.int32MillisecondsLargerUnit.duration", + "methodParameterSegments": [ + { + "$id": "436", + "kind": "method", + "name": "duration", + "serializedName": "duration", + "type": { + "$id": "437", + "kind": "duration", + "name": "duration", + "encode": "milliseconds", + "wireType": { + "$id": "438", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Header.int32MillisecondsLargerUnit.duration", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5856,33 +6212,7 @@ }, "parameters": [ { - "$id": "436", - "kind": "method", - "name": "duration", - "serializedName": "duration", - "type": { - "$id": "437", - "kind": "duration", - "name": "duration", - "encode": "milliseconds", - "wireType": { - "$id": "438", - "kind": "int32", - "name": "int32", - "crossLanguageDefinitionId": "TypeSpec.int32", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Header.int32MillisecondsLargerUnit.duration", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "436" } ], "response": {}, @@ -5929,7 +6259,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Header.floatMilliseconds.duration" + "crossLanguageDefinitionId": "Encode.Duration.Header.floatMilliseconds.duration", + "methodParameterSegments": [ + { + "$id": "444", + "kind": "method", + "name": "duration", + "serializedName": "duration", + "type": { + "$id": "445", + "kind": "duration", + "name": "duration", + "encode": "milliseconds", + "wireType": { + "$id": "446", + "kind": "float", + "name": "float", + "crossLanguageDefinitionId": "TypeSpec.float", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Header.floatMilliseconds.duration", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5953,33 +6314,7 @@ }, "parameters": [ { - "$id": "444", - "kind": "method", - "name": "duration", - "serializedName": "duration", - "type": { - "$id": "445", - "kind": "duration", - "name": "duration", - "encode": "milliseconds", - "wireType": { - "$id": "446", - "kind": "float", - "name": "float", - "crossLanguageDefinitionId": "TypeSpec.float", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Header.floatMilliseconds.duration", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "444" } ], "response": {}, @@ -6026,7 +6361,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Header.floatMillisecondsLargerUnit.duration" + "crossLanguageDefinitionId": "Encode.Duration.Header.floatMillisecondsLargerUnit.duration", + "methodParameterSegments": [ + { + "$id": "452", + "kind": "method", + "name": "duration", + "serializedName": "duration", + "type": { + "$id": "453", + "kind": "duration", + "name": "duration", + "encode": "milliseconds", + "wireType": { + "$id": "454", + "kind": "float", + "name": "float", + "crossLanguageDefinitionId": "TypeSpec.float", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Header.floatMillisecondsLargerUnit.duration", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6050,33 +6416,7 @@ }, "parameters": [ { - "$id": "452", - "kind": "method", - "name": "duration", - "serializedName": "duration", - "type": { - "$id": "453", - "kind": "duration", - "name": "duration", - "encode": "milliseconds", - "wireType": { - "$id": "454", - "kind": "float", - "name": "float", - "crossLanguageDefinitionId": "TypeSpec.float", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Header.floatMillisecondsLargerUnit.duration", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "452" } ], "response": {}, @@ -6123,7 +6463,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Header.float64Milliseconds.duration" + "crossLanguageDefinitionId": "Encode.Duration.Header.float64Milliseconds.duration", + "methodParameterSegments": [ + { + "$id": "460", + "kind": "method", + "name": "duration", + "serializedName": "duration", + "type": { + "$id": "461", + "kind": "duration", + "name": "duration", + "encode": "milliseconds", + "wireType": { + "$id": "462", + "kind": "float64", + "name": "float64", + "crossLanguageDefinitionId": "TypeSpec.float64", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.duration", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Header.float64Milliseconds.duration", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6147,33 +6518,7 @@ }, "parameters": [ { - "$id": "460", - "kind": "method", - "name": "duration", - "serializedName": "duration", - "type": { - "$id": "461", - "kind": "duration", - "name": "duration", - "encode": "milliseconds", - "wireType": { - "$id": "462", - "kind": "float64", - "name": "float64", - "crossLanguageDefinitionId": "TypeSpec.float64", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.duration", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Header.float64Milliseconds.duration", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "460" } ], "response": {}, @@ -6244,7 +6589,26 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Duration.Header.int32MillisecondsArray.duration" + "crossLanguageDefinitionId": "Encode.Duration.Header.int32MillisecondsArray.duration", + "methodParameterSegments": [ + { + "$id": "471", + "kind": "method", + "name": "duration", + "serializedName": "duration", + "type": { + "$ref": "466" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Duration.Header.int32MillisecondsArray.duration", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6268,21 +6632,7 @@ }, "parameters": [ { - "$id": "471", - "kind": "method", - "name": "duration", - "serializedName": "duration", - "type": { - "$ref": "466" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Duration.Header.int32MillisecondsArray.duration", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "471" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/Encode.Numeric.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/Encode.Numeric.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/Encode.Numeric.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/Encode.Numeric.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/Encode.Numeric.sln deleted file mode 100644 index 755f896ca0c..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/Encode.Numeric.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Encode.Numeric", "src\Encode.Numeric.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/Encode.Numeric.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/Encode.Numeric.slnx new file mode 100644 index 00000000000..c1542e1650e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/Encode.Numeric.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Encode.Numeric.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Encode.Numeric.csproj index 63a8d810f00..a33e02214f9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Encode.Numeric.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Encode.Numeric.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.Serialization.cs index ee7e5a2837c..a0518773c07 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class SafeintAsStringProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - SafeintAsStringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual SafeintAsStringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SafeintAsStringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - SafeintAsStringProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SafeintAsStringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(SafeintAsStringProperty safeintAsStringProperty) => throw null; public static explicit operator SafeintAsStringProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + SafeintAsStringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual SafeintAsStringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.Serialization.cs index 1a5dccee8f2..2917d2a1082 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace Encode.Numeric._Property { public partial class Uint32AsStringProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Uint32AsStringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Uint32AsStringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Uint32AsStringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Uint32AsStringProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Uint32AsStringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Uint32AsStringProperty uint32AsStringProperty) => throw null; public static explicit operator Uint32AsStringProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Uint32AsStringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Uint32AsStringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.Serialization.cs index c49f541a169..228d8bd4f91 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class Uint8AsStringProperty : IJsonModel { internal Uint8AsStringProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Uint8AsStringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Uint8AsStringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Uint8AsStringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Uint8AsStringProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Uint8AsStringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Uint8AsStringProperty uint8AsStringProperty) => throw null; public static explicit operator Uint8AsStringProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Uint8AsStringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Uint8AsStringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/NumericClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/NumericClient.cs index a43095cc1bc..62c37a7e84d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/NumericClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/NumericClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using Encode.Numeric._Property; namespace Encode.Numeric @@ -12,7 +13,12 @@ public partial class NumericClient { public NumericClient() : this(new Uri("http://localhost:3000"), new NumericClientOptions()) => throw null; - public NumericClient(Uri endpoint, NumericClientOptions options) => throw null; + internal NumericClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, NumericClientOptions options) => throw null; + + public NumericClient(Uri endpoint, NumericClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public NumericClient(NumericClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/NumericClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/NumericClientOptions.cs index 94e681301bf..678f0fd0618 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/NumericClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/NumericClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Encode.Numeric { public partial class NumericClientOptions : ClientPipelineOptions { + public NumericClientOptions() => throw null; + + [Experimental("SCME0002")] + internal NumericClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/NumericClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/NumericClientSettings.cs new file mode 100644 index 00000000000..1eb21a455d6 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/NumericClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Encode.Numeric +{ + [Experimental("SCME0002")] + public partial class NumericClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public NumericClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Property.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Property.cs index 49349a4add9..a24512ae6df 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Property.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Property.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Property { protected Property() => throw null; + internal Property(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult SafeintAsString(BinaryContent content, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..4917a18de1d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "NumericClient": { + "type": "object", + "description": "Configuration for NumericClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/numericClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "numericClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/tspCodeModel.json index 51117d86c2e..4099142d893 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/tspCodeModel.json @@ -306,10 +306,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Numeric.Property.safeintAsString.contentType" + "crossLanguageDefinitionId": "Encode.Numeric.Property.safeintAsString.contentType", + "methodParameterSegments": [ + { + "$id": "30", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Numeric.Property.safeintAsString.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "30", + "$id": "31", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -322,10 +342,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Numeric.Property.safeintAsString.accept" + "crossLanguageDefinitionId": "Encode.Numeric.Property.safeintAsString.accept", + "methodParameterSegments": [ + { + "$id": "32", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "3" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Numeric.Property.safeintAsString.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "31", + "$id": "33", "kind": "body", "name": "value", "serializedName": "value", @@ -341,7 +380,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Numeric.Property.safeintAsString.value" + "crossLanguageDefinitionId": "Encode.Numeric.Property.safeintAsString.value", + "methodParameterSegments": [ + { + "$id": "34", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$ref": "13" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Numeric.Property.safeintAsString.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -374,56 +432,13 @@ }, "parameters": [ { - "$id": "32", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$ref": "13" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Numeric.Property.safeintAsString.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "34" }, { - "$id": "33", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Numeric.Property.safeintAsString.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "30" }, { - "$id": "34", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Numeric.Property.safeintAsString.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "32" } ], "response": { @@ -463,10 +478,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Numeric.Property.uint32AsStringOptional.contentType" + "crossLanguageDefinitionId": "Encode.Numeric.Property.uint32AsStringOptional.contentType", + "methodParameterSegments": [ + { + "$id": "38", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Numeric.Property.uint32AsStringOptional.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "38", + "$id": "39", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -479,10 +514,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Numeric.Property.uint32AsStringOptional.accept" + "crossLanguageDefinitionId": "Encode.Numeric.Property.uint32AsStringOptional.accept", + "methodParameterSegments": [ + { + "$id": "40", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Numeric.Property.uint32AsStringOptional.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "39", + "$id": "41", "kind": "body", "name": "value", "serializedName": "value", @@ -498,7 +552,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Numeric.Property.uint32AsStringOptional.value" + "crossLanguageDefinitionId": "Encode.Numeric.Property.uint32AsStringOptional.value", + "methodParameterSegments": [ + { + "$id": "42", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$ref": "16" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Numeric.Property.uint32AsStringOptional.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -531,56 +604,13 @@ }, "parameters": [ { - "$id": "40", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$ref": "16" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Numeric.Property.uint32AsStringOptional.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "42" }, { - "$id": "41", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Numeric.Property.uint32AsStringOptional.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "38" }, { - "$id": "42", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Numeric.Property.uint32AsStringOptional.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "40" } ], "response": { @@ -620,10 +650,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Numeric.Property.uint8AsString.contentType" + "crossLanguageDefinitionId": "Encode.Numeric.Property.uint8AsString.contentType", + "methodParameterSegments": [ + { + "$id": "46", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Numeric.Property.uint8AsString.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "46", + "$id": "47", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -636,10 +686,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Encode.Numeric.Property.uint8AsString.accept" + "crossLanguageDefinitionId": "Encode.Numeric.Property.uint8AsString.accept", + "methodParameterSegments": [ + { + "$id": "48", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "11" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Encode.Numeric.Property.uint8AsString.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "47", + "$id": "49", "kind": "body", "name": "value", "serializedName": "value", @@ -655,7 +724,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Encode.Numeric.Property.uint8AsString.value" + "crossLanguageDefinitionId": "Encode.Numeric.Property.uint8AsString.value", + "methodParameterSegments": [ + { + "$id": "50", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$ref": "19" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Encode.Numeric.Property.uint8AsString.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -688,56 +776,13 @@ }, "parameters": [ { - "$id": "48", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$ref": "19" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Encode.Numeric.Property.uint8AsString.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "50" }, { - "$id": "49", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Numeric.Property.uint8AsString.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "46" }, { - "$id": "50", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Encode.Numeric.Property.uint8AsString.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "48" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/Parameters.Basic.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/Parameters.Basic.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/Parameters.Basic.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/Parameters.Basic.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/Parameters.Basic.sln deleted file mode 100644 index 4cc7745bdf9..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/Parameters.Basic.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parameters.Basic", "src\Parameters.Basic.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/Parameters.Basic.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/Parameters.Basic.slnx new file mode 100644 index 00000000000..1b90195ecbe --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/Parameters.Basic.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/BasicClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/BasicClient.cs index dfb24ed2a43..14502febffd 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/BasicClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/BasicClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using Parameters.Basic._ExplicitBody; using Parameters.Basic._ImplicitBody; @@ -13,7 +14,12 @@ public partial class BasicClient { public BasicClient() : this(new Uri("http://localhost:3000"), new BasicClientOptions()) => throw null; - public BasicClient(Uri endpoint, BasicClientOptions options) => throw null; + internal BasicClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, BasicClientOptions options) => throw null; + + public BasicClient(Uri endpoint, BasicClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public BasicClient(BasicClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/BasicClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/BasicClientOptions.cs index 8739650ee13..a537b38f60a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/BasicClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/BasicClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Parameters.Basic { public partial class BasicClientOptions : ClientPipelineOptions { + public BasicClientOptions() => throw null; + + [Experimental("SCME0002")] + internal BasicClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/BasicClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/BasicClientSettings.cs new file mode 100644 index 00000000000..51e2b9e6c0f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/BasicClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Parameters.Basic +{ + [Experimental("SCME0002")] + public partial class BasicClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public BasicClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/ExplicitBody.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/ExplicitBody.cs index 383030dc1bf..d9157b03926 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/ExplicitBody.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/ExplicitBody.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class ExplicitBody { protected ExplicitBody() => throw null; + internal ExplicitBody(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Simple(BinaryContent content, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/ImplicitBody.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/ImplicitBody.cs index 478ec3b4e2e..8d46cf80d63 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/ImplicitBody.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/ImplicitBody.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class ImplicitBody { protected ImplicitBody() => throw null; + internal ImplicitBody(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Simple(BinaryContent content, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/Models/User.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/Models/User.Serialization.cs index 4a4cdc3bac1..50075e1738b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/Models/User.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/Models/User.Serialization.cs @@ -13,24 +13,24 @@ public partial class User : IJsonModel { internal User() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - User IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual User PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual User JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - User IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual User PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(User user) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + User IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual User JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..4c45381dee2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "BasicClient": { + "type": "object", + "description": "Configuration for BasicClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/basicClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "basicClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Parameters.Basic.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Parameters.Basic.csproj index b2dc7977f26..c4bcd1cc26e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Parameters.Basic.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Parameters.Basic.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/tspCodeModel.json index 93cff8e300e..89cde1390c3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/tspCodeModel.json @@ -199,10 +199,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.Basic.ExplicitBody.simple.contentType" + "crossLanguageDefinitionId": "Parameters.Basic.ExplicitBody.simple.contentType", + "methodParameterSegments": [ + { + "$id": "19", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Parameters.Basic.ExplicitBody.simple.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "19", + "$id": "20", "kind": "body", "name": "body", "serializedName": "body", @@ -218,7 +238,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Basic.ExplicitBody.simple.body" + "crossLanguageDefinitionId": "Parameters.Basic.ExplicitBody.simple.body", + "methodParameterSegments": [ + { + "$id": "21", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "5" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Basic.ExplicitBody.simple.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -245,39 +284,10 @@ }, "parameters": [ { - "$id": "20", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "5" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Basic.ExplicitBody.simple.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "21" }, { - "$id": "21", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Parameters.Basic.ExplicitBody.simple.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "19" } ], "response": {}, @@ -361,10 +371,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.Basic.ImplicitBody.simple.contentType" + "crossLanguageDefinitionId": "Parameters.Basic.ImplicitBody.simple.contentType", + "methodParameterSegments": [ + { + "$id": "29", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "3" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Parameters.Basic.ImplicitBody.simple.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "29", + "$id": "30", "kind": "body", "name": "simpleRequest", "serializedName": "simpleRequest", @@ -380,7 +410,30 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Basic.ImplicitBody.simple.body" + "crossLanguageDefinitionId": "Parameters.Basic.ImplicitBody.simple.body", + "methodParameterSegments": [ + { + "$id": "31", + "kind": "method", + "name": "name", + "serializedName": "name", + "type": { + "$id": "32", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Basic.ImplicitBody.simple.name", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -407,43 +460,10 @@ }, "parameters": [ { - "$id": "30", - "kind": "method", - "name": "name", - "serializedName": "name", - "type": { - "$id": "31", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Basic.ImplicitBody.simple.name", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "31" }, { - "$id": "32", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Parameters.Basic.ImplicitBody.simple.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "29" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/Parameters.BodyOptionality.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/Parameters.BodyOptionality.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/Parameters.BodyOptionality.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/Parameters.BodyOptionality.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/Parameters.BodyOptionality.sln deleted file mode 100644 index 0f3a5dd3928..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/Parameters.BodyOptionality.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parameters.BodyOptionality", "src\Parameters.BodyOptionality.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/Parameters.BodyOptionality.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/Parameters.BodyOptionality.slnx new file mode 100644 index 00000000000..4049d5a4bb3 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/Parameters.BodyOptionality.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/BodyOptionalityClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/BodyOptionalityClient.cs index 3c77de1b7fe..457b49eac2f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/BodyOptionalityClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/BodyOptionalityClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; using Parameters.BodyOptionality._OptionalExplicit; @@ -15,7 +16,12 @@ public partial class BodyOptionalityClient { public BodyOptionalityClient() : this(new Uri("http://localhost:3000"), new BodyOptionalityClientOptions()) => throw null; - public BodyOptionalityClient(Uri endpoint, BodyOptionalityClientOptions options) => throw null; + internal BodyOptionalityClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, BodyOptionalityClientOptions options) => throw null; + + public BodyOptionalityClient(Uri endpoint, BodyOptionalityClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public BodyOptionalityClient(BodyOptionalityClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/BodyOptionalityClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/BodyOptionalityClientOptions.cs index 80f4405292a..33804b10acc 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/BodyOptionalityClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/BodyOptionalityClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Parameters.BodyOptionality { public partial class BodyOptionalityClientOptions : ClientPipelineOptions { + public BodyOptionalityClientOptions() => throw null; + + [Experimental("SCME0002")] + internal BodyOptionalityClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/BodyOptionalityClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/BodyOptionalityClientSettings.cs new file mode 100644 index 00000000000..137094caec7 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/BodyOptionalityClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Parameters.BodyOptionality +{ + [Experimental("SCME0002")] + public partial class BodyOptionalityClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public BodyOptionalityClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/Models/BodyModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/Models/BodyModel.Serialization.cs index 1deb6a7b587..7f142275b66 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/Models/BodyModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/Models/BodyModel.Serialization.cs @@ -13,24 +13,24 @@ public partial class BodyModel : IJsonModel { internal BodyModel() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - BodyModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BodyModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual BodyModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - BodyModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual BodyModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(BodyModel bodyModel) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + BodyModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual BodyModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/OptionalExplicit.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/OptionalExplicit.cs index ffa4809571b..5d4de240634 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/OptionalExplicit.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/OptionalExplicit.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -14,6 +15,8 @@ public partial class OptionalExplicit { protected OptionalExplicit() => throw null; + internal OptionalExplicit(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Set(BinaryContent content, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..d4e43983069 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "BodyOptionalityClient": { + "type": "object", + "description": "Configuration for BodyOptionalityClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/bodyOptionalityClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "bodyOptionalityClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Parameters.BodyOptionality.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Parameters.BodyOptionality.csproj index 03fd1bb4c50..632267956e9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Parameters.BodyOptionality.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Parameters.BodyOptionality.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/tspCodeModel.json index 924d4493fb3..fb1198f36e9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/tspCodeModel.json @@ -146,10 +146,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.BodyOptionality.requiredExplicit.contentType" + "crossLanguageDefinitionId": "Parameters.BodyOptionality.requiredExplicit.contentType", + "methodParameterSegments": [ + { + "$id": "16", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Parameters.BodyOptionality.requiredExplicit.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "16", + "$id": "17", "kind": "body", "name": "body", "serializedName": "body", @@ -165,7 +185,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.BodyOptionality.requiredExplicit.body" + "crossLanguageDefinitionId": "Parameters.BodyOptionality.requiredExplicit.body", + "methodParameterSegments": [ + { + "$id": "18", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "9" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.BodyOptionality.requiredExplicit.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -192,39 +231,10 @@ }, "parameters": [ { - "$id": "17", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "9" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.BodyOptionality.requiredExplicit.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "18" }, { - "$id": "18", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Parameters.BodyOptionality.requiredExplicit.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "16" } ], "response": {}, @@ -260,10 +270,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.BodyOptionality.requiredImplicit.contentType" + "crossLanguageDefinitionId": "Parameters.BodyOptionality.requiredImplicit.contentType", + "methodParameterSegments": [ + { + "$id": "22", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "3" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Parameters.BodyOptionality.requiredImplicit.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "22", + "$id": "23", "kind": "body", "name": "bodyModel", "serializedName": "bodyModel", @@ -279,7 +309,30 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.BodyOptionality.requiredImplicit.body" + "crossLanguageDefinitionId": "Parameters.BodyOptionality.requiredImplicit.body", + "methodParameterSegments": [ + { + "$id": "24", + "kind": "method", + "name": "name", + "serializedName": "name", + "type": { + "$id": "25", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.BodyOptionality.requiredImplicit.name", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -306,43 +359,10 @@ }, "parameters": [ { - "$id": "23", - "kind": "method", - "name": "name", - "serializedName": "name", - "type": { - "$id": "24", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.BodyOptionality.requiredImplicit.name", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "24" }, { - "$id": "25", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Parameters.BodyOptionality.requiredImplicit.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "22" } ], "response": {}, @@ -422,10 +442,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.BodyOptionality.OptionalExplicit.set.contentType" + "crossLanguageDefinitionId": "Parameters.BodyOptionality.OptionalExplicit.set.contentType", + "methodParameterSegments": [ + { + "$id": "33", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": true, + "scope": "Constant", + "crossLanguageDefinitionId": "Parameters.BodyOptionality.OptionalExplicit.set.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "33", + "$id": "34", "kind": "body", "name": "body", "serializedName": "body", @@ -441,7 +481,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.BodyOptionality.OptionalExplicit.set.body" + "crossLanguageDefinitionId": "Parameters.BodyOptionality.OptionalExplicit.set.body", + "methodParameterSegments": [ + { + "$id": "35", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "9" + }, + "location": "Body", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.BodyOptionality.OptionalExplicit.set.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -468,39 +527,10 @@ }, "parameters": [ { - "$id": "34", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "9" - }, - "location": "Body", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.BodyOptionality.OptionalExplicit.set.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "35" }, { - "$id": "35", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": true, - "scope": "Constant", - "crossLanguageDefinitionId": "Parameters.BodyOptionality.OptionalExplicit.set.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "33" } ], "response": {}, @@ -536,10 +566,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.BodyOptionality.OptionalExplicit.omit.contentType" + "crossLanguageDefinitionId": "Parameters.BodyOptionality.OptionalExplicit.omit.contentType", + "methodParameterSegments": [ + { + "$id": "39", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": true, + "scope": "Constant", + "crossLanguageDefinitionId": "Parameters.BodyOptionality.OptionalExplicit.omit.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "39", + "$id": "40", "kind": "body", "name": "body", "serializedName": "body", @@ -555,7 +605,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.BodyOptionality.OptionalExplicit.omit.body" + "crossLanguageDefinitionId": "Parameters.BodyOptionality.OptionalExplicit.omit.body", + "methodParameterSegments": [ + { + "$id": "41", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "9" + }, + "location": "Body", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.BodyOptionality.OptionalExplicit.omit.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -582,39 +651,10 @@ }, "parameters": [ { - "$id": "40", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "9" - }, - "location": "Body", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.BodyOptionality.OptionalExplicit.omit.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "41" }, { - "$id": "41", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": true, - "scope": "Constant", - "crossLanguageDefinitionId": "Parameters.BodyOptionality.OptionalExplicit.omit.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "39" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/Parameters.CollectionFormat.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/Parameters.CollectionFormat.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/Parameters.CollectionFormat.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/Parameters.CollectionFormat.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/Parameters.CollectionFormat.sln deleted file mode 100644 index 3180281a954..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/Parameters.CollectionFormat.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parameters.CollectionFormat", "src\Parameters.CollectionFormat.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/Parameters.CollectionFormat.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/Parameters.CollectionFormat.slnx new file mode 100644 index 00000000000..8d2926d4bf2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/Parameters.CollectionFormat.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/CollectionFormatClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/CollectionFormatClient.cs index c75beeba0ad..cfac396e5f9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/CollectionFormatClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/CollectionFormatClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using Parameters.CollectionFormat._Header; using Parameters.CollectionFormat._Query; @@ -13,7 +14,12 @@ public partial class CollectionFormatClient { public CollectionFormatClient() : this(new Uri("http://localhost:3000"), new CollectionFormatClientOptions()) => throw null; - public CollectionFormatClient(Uri endpoint, CollectionFormatClientOptions options) => throw null; + internal CollectionFormatClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, CollectionFormatClientOptions options) => throw null; + + public CollectionFormatClient(Uri endpoint, CollectionFormatClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public CollectionFormatClient(CollectionFormatClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/CollectionFormatClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/CollectionFormatClientOptions.cs index 31d6176ffa4..227d9ffd344 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/CollectionFormatClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/CollectionFormatClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Parameters.CollectionFormat { public partial class CollectionFormatClientOptions : ClientPipelineOptions { + public CollectionFormatClientOptions() => throw null; + + [Experimental("SCME0002")] + internal CollectionFormatClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/CollectionFormatClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/CollectionFormatClientSettings.cs new file mode 100644 index 00000000000..ae7b80aa260 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/CollectionFormatClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Parameters.CollectionFormat +{ + [Experimental("SCME0002")] + public partial class CollectionFormatClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public CollectionFormatClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/Header.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/Header.cs index 6188a2785ea..e29a1876bcd 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/Header.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/Header.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class Header { protected Header() => throw null; + internal Header(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Csv(IEnumerable colors, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/Query.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/Query.cs index c54d95436b6..f0d37525882 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/Query.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/Query.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class Query { protected Query() => throw null; + internal Query(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Multi(IEnumerable colors, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..dca8a061f73 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "CollectionFormatClient": { + "type": "object", + "description": "Configuration for CollectionFormatClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/collectionFormatClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "collectionFormatClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Parameters.CollectionFormat.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Parameters.CollectionFormat.csproj index 3e172169ca7..4c2c2e53c53 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Parameters.CollectionFormat.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Parameters.CollectionFormat.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/tspCodeModel.json index d490958ad80..fcf95d26b71 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/tspCodeModel.json @@ -93,7 +93,27 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Parameters.CollectionFormat.Query.multi.colors", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "11", + "kind": "method", + "name": "colors", + "serializedName": "colors", + "doc": "Possible values for colors are [blue,red,green]", + "type": { + "$ref": "9" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.CollectionFormat.Query.multi.colors", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -117,22 +137,7 @@ }, "parameters": [ { - "$id": "11", - "kind": "method", - "name": "colors", - "serializedName": "colors", - "doc": "Possible values for colors are [blue,red,green]", - "type": { - "$ref": "9" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.CollectionFormat.Query.multi.colors", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "11" } ], "response": {}, @@ -169,7 +174,27 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Parameters.CollectionFormat.Query.ssv.colors", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "15", + "kind": "method", + "name": "colors", + "serializedName": "colors", + "doc": "Possible values for colors are [blue,red,green]", + "type": { + "$ref": "9" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.CollectionFormat.Query.ssv.colors", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -193,22 +218,7 @@ }, "parameters": [ { - "$id": "15", - "kind": "method", - "name": "colors", - "serializedName": "colors", - "doc": "Possible values for colors are [blue,red,green]", - "type": { - "$ref": "9" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.CollectionFormat.Query.ssv.colors", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "15" } ], "response": {}, @@ -245,7 +255,27 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Parameters.CollectionFormat.Query.pipes.colors", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "19", + "kind": "method", + "name": "colors", + "serializedName": "colors", + "doc": "Possible values for colors are [blue,red,green]", + "type": { + "$ref": "9" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.CollectionFormat.Query.pipes.colors", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -269,22 +299,7 @@ }, "parameters": [ { - "$id": "19", - "kind": "method", - "name": "colors", - "serializedName": "colors", - "doc": "Possible values for colors are [blue,red,green]", - "type": { - "$ref": "9" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.CollectionFormat.Query.pipes.colors", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "19" } ], "response": {}, @@ -321,7 +336,27 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Parameters.CollectionFormat.Query.csv.colors", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "23", + "kind": "method", + "name": "colors", + "serializedName": "colors", + "doc": "Possible values for colors are [blue,red,green]", + "type": { + "$ref": "9" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.CollectionFormat.Query.csv.colors", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -345,22 +380,7 @@ }, "parameters": [ { - "$id": "23", - "kind": "method", - "name": "colors", - "serializedName": "colors", - "doc": "Possible values for colors are [blue,red,green]", - "type": { - "$ref": "9" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.CollectionFormat.Query.csv.colors", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "23" } ], "response": {}, @@ -446,7 +466,27 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.CollectionFormat.Header.csv.colors" + "crossLanguageDefinitionId": "Parameters.CollectionFormat.Header.csv.colors", + "methodParameterSegments": [ + { + "$id": "31", + "kind": "method", + "name": "colors", + "serializedName": "colors", + "doc": "Possible values for colors are [blue,red,green]", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.CollectionFormat.Header.csv.colors", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -470,22 +510,7 @@ }, "parameters": [ { - "$id": "31", - "kind": "method", - "name": "colors", - "serializedName": "colors", - "doc": "Possible values for colors are [blue,red,green]", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.CollectionFormat.Header.csv.colors", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "31" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/Parameters.Path.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/Parameters.Path.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/Parameters.Path.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/Parameters.Path.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/Parameters.Path.sln deleted file mode 100644 index e4fcfa10861..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/Parameters.Path.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parameters.Path", "src\Parameters.Path.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/Parameters.Path.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/Parameters.Path.slnx new file mode 100644 index 00000000000..8b6313ad547 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/Parameters.Path.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Generated/PathClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Generated/PathClient.cs index d4db42a991a..d0563f49bda 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Generated/PathClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Generated/PathClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -14,7 +15,12 @@ public partial class PathClient { public PathClient() : this(new Uri("http://localhost:3000"), new PathClientOptions()) => throw null; - public PathClient(Uri endpoint, PathClientOptions options) => throw null; + internal PathClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, PathClientOptions options) => throw null; + + public PathClient(Uri endpoint, PathClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public PathClient(PathClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Generated/PathClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Generated/PathClientOptions.cs index 9a352e9e917..b544589353f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Generated/PathClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Generated/PathClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Parameters.Path { public partial class PathClientOptions : ClientPipelineOptions { + public PathClientOptions() => throw null; + + [Experimental("SCME0002")] + internal PathClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Generated/PathClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Generated/PathClientSettings.cs new file mode 100644 index 00000000000..a5fa1a1373e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Generated/PathClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Parameters.Path +{ + [Experimental("SCME0002")] + public partial class PathClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public PathClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..18b9a87440a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "PathClient": { + "type": "object", + "description": "Configuration for PathClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/pathClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "pathClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Parameters.Path.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Parameters.Path.csproj index 761c08fd25c..20eae8bd239 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Parameters.Path.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Parameters.Path.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/tspCodeModel.json index 7406e83a78f..2b3553358f4 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/tspCodeModel.json @@ -45,7 +45,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Path.normal.name" + "crossLanguageDefinitionId": "Parameters.Path.normal.name", + "methodParameterSegments": [ + { + "$id": "6", + "kind": "method", + "name": "name", + "serializedName": "name", + "type": { + "$id": "7", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Path.normal.name", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -69,25 +92,7 @@ }, "parameters": [ { - "$id": "6", - "kind": "method", - "name": "name", - "serializedName": "name", - "type": { - "$id": "7", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Path.normal.name", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "6" } ], "response": {}, @@ -129,7 +134,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Path.optional.name" + "crossLanguageDefinitionId": "Parameters.Path.optional.name", + "methodParameterSegments": [ + { + "$id": "12", + "kind": "method", + "name": "name", + "serializedName": "name", + "type": { + "$id": "13", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Path.optional.name", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -153,25 +181,7 @@ }, "parameters": [ { - "$id": "12", - "kind": "method", - "name": "name", - "serializedName": "name", - "type": { - "$id": "13", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Path.optional.name", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "12" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/Parameters.Query.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/Parameters.Query.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/Parameters.Query.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/Parameters.Query.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/Parameters.Query.sln deleted file mode 100644 index ce1fb45f8d5..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/Parameters.Query.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parameters.Query", "src\Parameters.Query.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/Parameters.Query.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/Parameters.Query.slnx new file mode 100644 index 00000000000..dc721626af8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/Parameters.Query.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/Constant.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/Constant.cs index b1be965f2d8..3545cccf023 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/Constant.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/Constant.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Constant { protected Constant() => throw null; + internal Constant(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Post(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/QueryClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/QueryClient.cs index c3ed5f02aab..6a4be8cbeed 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/QueryClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/QueryClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; namespace Parameters.Query { @@ -11,7 +12,12 @@ public partial class QueryClient { public QueryClient() : this(new Uri("http://localhost:3000"), new QueryClientOptions()) => throw null; - public QueryClient(Uri endpoint, QueryClientOptions options) => throw null; + internal QueryClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, QueryClientOptions options) => throw null; + + public QueryClient(Uri endpoint, QueryClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public QueryClient(QueryClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/QueryClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/QueryClientOptions.cs index a625c60f864..a785237dffc 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/QueryClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/QueryClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Parameters.Query { public partial class QueryClientOptions : ClientPipelineOptions { + public QueryClientOptions() => throw null; + + [Experimental("SCME0002")] + internal QueryClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/QueryClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/QueryClientSettings.cs new file mode 100644 index 00000000000..d41690bb4e7 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/QueryClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Parameters.Query +{ + [Experimental("SCME0002")] + public partial class QueryClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public QueryClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..91b3c185344 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "QueryClient": { + "type": "object", + "description": "Configuration for QueryClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/queryClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "queryClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Parameters.Query.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Parameters.Query.csproj index 36929bde8c7..0a3522afdb2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Parameters.Query.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Parameters.Query.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/tspCodeModel.json index afba2ef5612..18811ea4a20 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/tspCodeModel.json @@ -117,7 +117,26 @@ "scope": "Constant", "decorators": [], "crossLanguageDefinitionId": "Parameters.Query.Constant.post.queryParam", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "13", + "kind": "method", + "name": "queryParam", + "serializedName": "queryParam", + "type": { + "$ref": "3" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Parameters.Query.Constant.post.queryParam", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -141,21 +160,7 @@ }, "parameters": [ { - "$id": "13", - "kind": "method", - "name": "queryParam", - "serializedName": "queryParam", - "type": { - "$ref": "3" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Parameters.Query.Constant.post.queryParam", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "13" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/Parameters.Spread.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/Parameters.Spread.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/Parameters.Spread.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/Parameters.Spread.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/Parameters.Spread.sln deleted file mode 100644 index b922bd22011..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/Parameters.Spread.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parameters.Spread", "src\Parameters.Spread.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/Parameters.Spread.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/Parameters.Spread.slnx new file mode 100644 index 00000000000..652b0f80504 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/Parameters.Spread.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Alias.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Alias.cs index ec8be6a9570..201900b0bc1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Alias.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Alias.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class Alias { protected Alias() => throw null; + internal Alias(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult SpreadAsRequestBody(BinaryContent content, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Model.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Model.cs index 31ca1bfeab4..792e9511624 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Model.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Model.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Model { protected Model() => throw null; + internal Model(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult SpreadAsRequestBody(BinaryContent content, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Models/BodyParameter.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Models/BodyParameter.Serialization.cs index ca7f6d81e03..4526e4ff05b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Models/BodyParameter.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Models/BodyParameter.Serialization.cs @@ -13,24 +13,24 @@ public partial class BodyParameter : IJsonModel { internal BodyParameter() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - BodyParameter IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BodyParameter PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual BodyParameter JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - BodyParameter IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual BodyParameter PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(BodyParameter bodyParameter) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + BodyParameter IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual BodyParameter JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/SpreadClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/SpreadClient.cs index 310ea3031c4..5367a1359ab 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/SpreadClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/SpreadClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using Parameters.Spread._Alias; using Parameters.Spread._Model; @@ -13,7 +14,12 @@ public partial class SpreadClient { public SpreadClient() : this(new Uri("http://localhost:3000"), new SpreadClientOptions()) => throw null; - public SpreadClient(Uri endpoint, SpreadClientOptions options) => throw null; + internal SpreadClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, SpreadClientOptions options) => throw null; + + public SpreadClient(Uri endpoint, SpreadClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public SpreadClient(SpreadClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/SpreadClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/SpreadClientOptions.cs index c738d114fae..27baba6242d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/SpreadClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/SpreadClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Parameters.Spread { public partial class SpreadClientOptions : ClientPipelineOptions { + public SpreadClientOptions() => throw null; + + [Experimental("SCME0002")] + internal SpreadClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/SpreadClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/SpreadClientSettings.cs new file mode 100644 index 00000000000..1ca4f6c34d8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/SpreadClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Parameters.Spread +{ + [Experimental("SCME0002")] + public partial class SpreadClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public SpreadClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..15ae497a4ca --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "SpreadClient": { + "type": "object", + "description": "Configuration for SpreadClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/spreadClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "spreadClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Parameters.Spread.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Parameters.Spread.csproj index ae8693b5c1a..3f5f69e6179 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Parameters.Spread.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Parameters.Spread.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/tspCodeModel.json index 3f9fbc8f469..af620e7ec68 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/tspCodeModel.json @@ -636,10 +636,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadAsRequestBody.contentType" + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadAsRequestBody.contentType", + "methodParameterSegments": [ + { + "$id": "58", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadAsRequestBody.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "58", + "$id": "59", "kind": "body", "name": "bodyParameter", "serializedName": "bodyParameter", @@ -655,7 +675,30 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadAsRequestBody.body" + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadAsRequestBody.body", + "methodParameterSegments": [ + { + "$id": "60", + "kind": "method", + "name": "name", + "serializedName": "name", + "type": { + "$id": "61", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadAsRequestBody.name", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -682,43 +725,10 @@ }, "parameters": [ { - "$id": "59", - "kind": "method", - "name": "name", - "serializedName": "name", - "type": { - "$id": "60", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadAsRequestBody.name", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "60" }, { - "$id": "61", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadAsRequestBody.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "58" } ], "response": {}, @@ -754,10 +764,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody.contentType" + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody.contentType", + "methodParameterSegments": [ + { + "$id": "65", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "3" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "65", + "$id": "66", "kind": "body", "name": "body", "serializedName": "body", @@ -773,7 +803,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody.body" + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody.body", + "methodParameterSegments": [ + { + "$id": "67", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "19" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -800,39 +849,10 @@ }, "parameters": [ { - "$id": "66", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "19" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "67" }, { - "$id": "67", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "65" } ], "response": {}, @@ -874,15 +894,38 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestWithoutBody.name" + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestWithoutBody.name", + "methodParameterSegments": [ + { + "$id": "72", + "kind": "method", + "name": "name", + "serializedName": "name", + "type": { + "$id": "73", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestWithoutBody.name", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "72", + "$id": "74", "kind": "header", "name": "testHeader", "serializedName": "test-header", "type": { - "$id": "73", + "$id": "75", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -894,7 +937,30 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestWithoutBody.testHeader" + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestWithoutBody.testHeader", + "methodParameterSegments": [ + { + "$id": "76", + "kind": "method", + "name": "testHeader", + "serializedName": "test-header", + "type": { + "$id": "77", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestWithoutBody.testHeader", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -918,46 +984,10 @@ }, "parameters": [ { - "$id": "74", - "kind": "method", - "name": "name", - "serializedName": "name", - "type": { - "$id": "75", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestWithoutBody.name", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "72" }, { - "$id": "76", - "kind": "method", - "name": "testHeader", - "serializedName": "test-header", - "type": { - "$id": "77", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestWithoutBody.testHeader", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "76" } ], "response": {}, @@ -999,15 +1029,38 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequest.name" + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequest.name", + "methodParameterSegments": [ + { + "$id": "82", + "kind": "method", + "name": "name", + "serializedName": "name", + "type": { + "$id": "83", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequest.name", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "82", + "$id": "84", "kind": "header", "name": "testHeader", "serializedName": "test-header", "type": { - "$id": "83", + "$id": "85", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1019,10 +1072,33 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequest.testHeader" + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequest.testHeader", + "methodParameterSegments": [ + { + "$id": "86", + "kind": "method", + "name": "testHeader", + "serializedName": "test-header", + "type": { + "$id": "87", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequest.testHeader", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "84", + "$id": "88", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -1036,10 +1112,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequest.contentType" + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequest.contentType", + "methodParameterSegments": [ + { + "$id": "89", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequest.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "85", + "$id": "90", "kind": "body", "name": "body", "serializedName": "body", @@ -1055,7 +1151,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequest.body" + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequest.body", + "methodParameterSegments": [ + { + "$id": "91", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "19" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequest.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1082,81 +1197,16 @@ }, "parameters": [ { - "$id": "86", - "kind": "method", - "name": "name", - "serializedName": "name", - "type": { - "$id": "87", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequest.name", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "82" }, { - "$id": "88", - "kind": "method", - "name": "testHeader", - "serializedName": "test-header", - "type": { - "$id": "89", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequest.testHeader", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "86" }, { - "$id": "90", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "19" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequest.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "91" }, { - "$id": "91", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequest.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "89" } ], "response": {}, @@ -1198,15 +1248,38 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestMix.name" + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestMix.name", + "methodParameterSegments": [ + { + "$id": "96", + "kind": "method", + "name": "name", + "serializedName": "name", + "type": { + "$id": "97", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestMix.name", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "96", + "$id": "98", "kind": "header", "name": "testHeader", "serializedName": "test-header", "type": { - "$id": "97", + "$id": "99", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1218,10 +1291,33 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestMix.testHeader" + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestMix.testHeader", + "methodParameterSegments": [ + { + "$id": "100", + "kind": "method", + "name": "testHeader", + "serializedName": "test-header", + "type": { + "$id": "101", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestMix.testHeader", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "98", + "$id": "102", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -1235,10 +1331,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestMix.contentType" + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestMix.contentType", + "methodParameterSegments": [ + { + "$id": "103", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestMix.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "99", + "$id": "104", "kind": "body", "name": "spreadCompositeRequestMixRequest", "serializedName": "spreadCompositeRequestMixRequest", @@ -1254,7 +1370,30 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestMix.body" + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestMix.body", + "methodParameterSegments": [ + { + "$id": "105", + "kind": "method", + "name": "prop", + "serializedName": "prop", + "type": { + "$id": "106", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestMix.prop", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1281,85 +1420,16 @@ }, "parameters": [ { - "$id": "100", - "kind": "method", - "name": "name", - "serializedName": "name", - "type": { - "$id": "101", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestMix.name", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "96" }, { - "$id": "102", - "kind": "method", - "name": "testHeader", - "serializedName": "test-header", - "type": { - "$id": "103", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestMix.testHeader", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "100" }, { - "$id": "104", - "kind": "method", - "name": "prop", - "serializedName": "prop", - "type": { - "$id": "105", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestMix.prop", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "105" }, { - "$id": "106", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestMix.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "103" } ], "response": {}, @@ -1443,10 +1513,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestBody.contentType" + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestBody.contentType", + "methodParameterSegments": [ + { + "$id": "114", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestBody.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "114", + "$id": "115", "kind": "body", "name": "spreadAsRequestBodyRequest", "serializedName": "spreadAsRequestBodyRequest", @@ -1462,7 +1552,30 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestBody.body" + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestBody.body", + "methodParameterSegments": [ + { + "$id": "116", + "kind": "method", + "name": "name", + "serializedName": "name", + "type": { + "$id": "117", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestBody.name", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1489,43 +1602,10 @@ }, "parameters": [ { - "$id": "115", - "kind": "method", - "name": "name", - "serializedName": "name", - "type": { - "$id": "116", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestBody.name", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "116" }, { - "$id": "117", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestBody.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "114" } ], "response": {}, @@ -1567,15 +1647,38 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerModel.id" + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerModel.id", + "methodParameterSegments": [ + { + "$id": "122", + "kind": "method", + "name": "id", + "serializedName": "id", + "type": { + "$id": "123", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerModel.id", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "122", + "$id": "124", "kind": "header", "name": "x-ms-test-header", "serializedName": "x-ms-test-header", "type": { - "$id": "123", + "$id": "125", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1587,10 +1690,33 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerModel.x-ms-test-header" + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerModel.x-ms-test-header", + "methodParameterSegments": [ + { + "$id": "126", + "kind": "method", + "name": "x-ms-test-header", + "serializedName": "x-ms-test-header", + "type": { + "$id": "127", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerModel.x-ms-test-header", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "124", + "$id": "128", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -1604,10 +1730,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerModel.contentType" + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerModel.contentType", + "methodParameterSegments": [ + { + "$id": "129", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "11" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "125", + "$id": "130", "kind": "body", "name": "spreadParameterWithInnerModelRequest", "serializedName": "spreadParameterWithInnerModelRequest", @@ -1623,7 +1769,30 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerModel.body" + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerModel.body", + "methodParameterSegments": [ + { + "$id": "131", + "kind": "method", + "name": "name", + "serializedName": "name", + "type": { + "$id": "132", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerModel.name", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1650,85 +1819,16 @@ }, "parameters": [ { - "$id": "126", - "kind": "method", - "name": "id", - "serializedName": "id", - "type": { - "$id": "127", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerModel.id", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "122" }, { - "$id": "128", - "kind": "method", - "name": "name", - "serializedName": "name", - "type": { - "$id": "129", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerModel.name", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "131" }, { - "$id": "130", - "kind": "method", - "name": "x-ms-test-header", - "serializedName": "x-ms-test-header", - "type": { - "$id": "131", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerModel.x-ms-test-header", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "126" }, { - "$id": "132", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "129" } ], "response": {}, @@ -1770,15 +1870,38 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestParameter.id" + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestParameter.id", + "methodParameterSegments": [ + { + "$id": "137", + "kind": "method", + "name": "id", + "serializedName": "id", + "type": { + "$id": "138", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestParameter.id", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "137", + "$id": "139", "kind": "header", "name": "x-ms-test-header", "serializedName": "x-ms-test-header", "type": { - "$id": "138", + "$id": "140", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1790,10 +1913,33 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestParameter.x-ms-test-header" + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestParameter.x-ms-test-header", + "methodParameterSegments": [ + { + "$id": "141", + "kind": "method", + "name": "x-ms-test-header", + "serializedName": "x-ms-test-header", + "type": { + "$id": "142", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestParameter.x-ms-test-header", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "139", + "$id": "143", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -1807,10 +1953,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestParameter.contentType" + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestParameter.contentType", + "methodParameterSegments": [ + { + "$id": "144", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "13" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestParameter.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "140", + "$id": "145", "kind": "body", "name": "spreadAsRequestParameterRequest", "serializedName": "spreadAsRequestParameterRequest", @@ -1826,7 +1992,30 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestParameter.body" + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestParameter.body", + "methodParameterSegments": [ + { + "$id": "146", + "kind": "method", + "name": "name", + "serializedName": "name", + "type": { + "$id": "147", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestParameter.name", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1853,85 +2042,16 @@ }, "parameters": [ { - "$id": "141", - "kind": "method", - "name": "id", - "serializedName": "id", - "type": { - "$id": "142", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestParameter.id", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "137" }, { - "$id": "143", - "kind": "method", - "name": "x-ms-test-header", - "serializedName": "x-ms-test-header", - "type": { - "$id": "144", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestParameter.x-ms-test-header", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "141" }, { - "$id": "145", - "kind": "method", - "name": "name", - "serializedName": "name", - "type": { - "$id": "146", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestParameter.name", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "146" }, { - "$id": "147", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestParameter.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "144" } ], "response": {}, @@ -1973,15 +2093,38 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadWithMultipleParameters.id" + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadWithMultipleParameters.id", + "methodParameterSegments": [ + { + "$id": "152", + "kind": "method", + "name": "id", + "serializedName": "id", + "type": { + "$id": "153", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadWithMultipleParameters.id", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "152", + "$id": "154", "kind": "header", "name": "x-ms-test-header", "serializedName": "x-ms-test-header", "type": { - "$id": "153", + "$id": "155", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1993,10 +2136,33 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadWithMultipleParameters.x-ms-test-header" + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadWithMultipleParameters.x-ms-test-header", + "methodParameterSegments": [ + { + "$id": "156", + "kind": "method", + "name": "x-ms-test-header", + "serializedName": "x-ms-test-header", + "type": { + "$id": "157", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadWithMultipleParameters.x-ms-test-header", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "154", + "$id": "158", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -2010,10 +2176,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadWithMultipleParameters.contentType" + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadWithMultipleParameters.contentType", + "methodParameterSegments": [ + { + "$id": "159", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "15" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadWithMultipleParameters.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "155", + "$id": "160", "kind": "body", "name": "spreadWithMultipleParametersRequest", "serializedName": "spreadWithMultipleParametersRequest", @@ -2029,7 +2215,31 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadWithMultipleParameters.body" + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadWithMultipleParameters.body", + "methodParameterSegments": [ + { + "$id": "161", + "kind": "method", + "name": "requiredString", + "serializedName": "requiredString", + "doc": "required string", + "type": { + "$id": "162", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadWithMultipleParameters.requiredString", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2056,77 +2266,22 @@ }, "parameters": [ { - "$id": "156", - "kind": "method", - "name": "id", - "serializedName": "id", - "type": { - "$id": "157", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadWithMultipleParameters.id", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "152" }, { - "$id": "158", - "kind": "method", - "name": "x-ms-test-header", - "serializedName": "x-ms-test-header", - "type": { - "$id": "159", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadWithMultipleParameters.x-ms-test-header", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "156" }, { - "$id": "160", - "kind": "method", - "name": "requiredString", - "serializedName": "requiredString", - "doc": "required string", - "type": { - "$id": "161", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadWithMultipleParameters.requiredString", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "161" }, { - "$id": "162", + "$id": "163", "kind": "method", "name": "optionalInt", "serializedName": "optionalInt", "doc": "optional int", "type": { - "$id": "163", + "$id": "164", "kind": "int32", "name": "int32", "crossLanguageDefinitionId": "TypeSpec.int32", @@ -2142,7 +2297,7 @@ "decorators": [] }, { - "$id": "164", + "$id": "165", "kind": "method", "name": "requiredIntList", "serializedName": "requiredIntList", @@ -2160,7 +2315,7 @@ "decorators": [] }, { - "$id": "165", + "$id": "166", "kind": "method", "name": "optionalStringList", "serializedName": "optionalStringList", @@ -2178,22 +2333,7 @@ "decorators": [] }, { - "$id": "166", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadWithMultipleParameters.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "159" } ], "response": {}, @@ -2237,15 +2377,38 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.id" + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.id", + "methodParameterSegments": [ + { + "$id": "171", + "kind": "method", + "name": "id", + "serializedName": "id", + "type": { + "$id": "172", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.id", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "171", + "$id": "173", "kind": "header", "name": "x-ms-test-header", "serializedName": "x-ms-test-header", "type": { - "$id": "172", + "$id": "174", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2257,10 +2420,33 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.x-ms-test-header" + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.x-ms-test-header", + "methodParameterSegments": [ + { + "$id": "175", + "kind": "method", + "name": "x-ms-test-header", + "serializedName": "x-ms-test-header", + "type": { + "$id": "176", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.x-ms-test-header", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "173", + "$id": "177", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -2274,10 +2460,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.contentType" + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.contentType", + "methodParameterSegments": [ + { + "$id": "178", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "174", + "$id": "179", "kind": "body", "name": "spreadParameterWithInnerAliasRequest", "serializedName": "spreadParameterWithInnerAliasRequest", @@ -2293,7 +2499,31 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.body" + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.body", + "methodParameterSegments": [ + { + "$id": "180", + "kind": "method", + "name": "name", + "serializedName": "name", + "doc": "name of the Thing", + "type": { + "$id": "181", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.name", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2320,56 +2550,19 @@ }, "parameters": [ { - "$id": "175", - "kind": "method", - "name": "id", - "serializedName": "id", - "type": { - "$id": "176", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.id", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "171" }, { - "$id": "177", - "kind": "method", - "name": "name", - "serializedName": "name", - "doc": "name of the Thing", - "type": { - "$id": "178", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.name", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "180" }, { - "$id": "179", + "$id": "182", "kind": "method", "name": "age", "serializedName": "age", "doc": "age of the Thing", "type": { - "$id": "180", + "$id": "183", "kind": "int32", "name": "int32", "crossLanguageDefinitionId": "TypeSpec.int32", @@ -2385,43 +2578,10 @@ "decorators": [] }, { - "$id": "181", - "kind": "method", - "name": "x-ms-test-header", - "serializedName": "x-ms-test-header", - "type": { - "$id": "182", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.x-ms-test-header", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "175" }, { - "$id": "183", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "17" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "178" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/Payload.ContentNegotiation.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/Payload.ContentNegotiation.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/Payload.ContentNegotiation.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/Payload.ContentNegotiation.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/Payload.ContentNegotiation.sln deleted file mode 100644 index afbaa59c842..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/Payload.ContentNegotiation.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Payload.ContentNegotiation", "src\Payload.ContentNegotiation.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/Payload.ContentNegotiation.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/Payload.ContentNegotiation.slnx new file mode 100644 index 00000000000..c7370661d8b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/Payload.ContentNegotiation.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/ContentNegotiationClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/ContentNegotiationClient.cs index 3632bd3895d..919000580c5 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/ContentNegotiationClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/ContentNegotiationClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using Payload.ContentNegotiation._DifferentBody; using Payload.ContentNegotiation._SameBody; @@ -13,7 +14,12 @@ public partial class ContentNegotiationClient { public ContentNegotiationClient() : this(new Uri("http://localhost:3000"), new ContentNegotiationClientOptions()) => throw null; - public ContentNegotiationClient(Uri endpoint, ContentNegotiationClientOptions options) => throw null; + internal ContentNegotiationClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, ContentNegotiationClientOptions options) => throw null; + + public ContentNegotiationClient(Uri endpoint, ContentNegotiationClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public ContentNegotiationClient(ContentNegotiationClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/ContentNegotiationClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/ContentNegotiationClientOptions.cs index b35052fa447..c6e914d7f4c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/ContentNegotiationClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/ContentNegotiationClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Payload.ContentNegotiation { public partial class ContentNegotiationClientOptions : ClientPipelineOptions { + public ContentNegotiationClientOptions() => throw null; + + [Experimental("SCME0002")] + internal ContentNegotiationClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/ContentNegotiationClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/ContentNegotiationClientSettings.cs new file mode 100644 index 00000000000..518fbf6fb65 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/ContentNegotiationClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Payload.ContentNegotiation +{ + [Experimental("SCME0002")] + public partial class ContentNegotiationClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public ContentNegotiationClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/DifferentBody.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/DifferentBody.cs index 76ada7bada7..765ef0cc721 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/DifferentBody.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/DifferentBody.cs @@ -14,6 +14,8 @@ public partial class DifferentBody { protected DifferentBody() => throw null; + internal DifferentBody(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetAvatarAsPng(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.Serialization.cs index f5484c1a88c..3da46a34d5f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.Serialization.cs @@ -13,24 +13,24 @@ public partial class PngImageAsJson : IJsonModel { internal PngImageAsJson() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - PngImageAsJson IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual PngImageAsJson PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual PngImageAsJson JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - PngImageAsJson IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual PngImageAsJson PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator PngImageAsJson(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + PngImageAsJson IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual PngImageAsJson JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/SameBody.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/SameBody.cs index fd6ad96379d..57af2a77ab4 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/SameBody.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/SameBody.cs @@ -14,6 +14,8 @@ public partial class SameBody { protected SameBody() => throw null; + internal SameBody(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetAvatarAsPng(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..429fa759986 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "ContentNegotiationClient": { + "type": "object", + "description": "Configuration for ContentNegotiationClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/contentNegotiationClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "contentNegotiationClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Payload.ContentNegotiation.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Payload.ContentNegotiation.csproj index 7e4886ecf67..5afd4c7323c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Payload.ContentNegotiation.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Payload.ContentNegotiation.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/tspCodeModel.json index 1b074c0e509..7fbd3aebb6f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/tspCodeModel.json @@ -22,7 +22,7 @@ { "$id": "3", "kind": "constant", - "name": "PngImageContentType", + "name": "GetAvatarAsPngRequestAccept", "namespace": "", "usage": "None", "valueType": { @@ -38,7 +38,7 @@ { "$id": "5", "kind": "constant", - "name": "PngImageContentType1", + "name": "GetAvatarAsPngRequestAccept1", "namespace": "", "usage": "None", "valueType": { @@ -54,7 +54,7 @@ { "$id": "7", "kind": "constant", - "name": "PngImageContentType2", + "name": "GetAvatarAsPngRequestAccept2", "namespace": "", "usage": "None", "valueType": { @@ -70,7 +70,7 @@ { "$id": "9", "kind": "constant", - "name": "JpegImageContentType", + "name": "GetAvatarAsJpegRequestAccept", "namespace": "", "usage": "None", "valueType": { @@ -86,7 +86,7 @@ { "$id": "11", "kind": "constant", - "name": "JpegImageContentType1", + "name": "GetAvatarAsJpegRequestAccept1", "namespace": "", "usage": "None", "valueType": { @@ -102,7 +102,7 @@ { "$id": "13", "kind": "constant", - "name": "JpegImageContentType2", + "name": "GetAvatarAsJpegRequestAccept2", "namespace": "", "usage": "None", "valueType": { @@ -118,7 +118,7 @@ { "$id": "15", "kind": "constant", - "name": "PngImageContentType3", + "name": "GetAvatarAsPngRequestAccept3", "namespace": "", "usage": "None", "valueType": { @@ -134,7 +134,7 @@ { "$id": "17", "kind": "constant", - "name": "PngImageContentType4", + "name": "GetAvatarAsPngRequestAccept4", "namespace": "", "usage": "None", "valueType": { @@ -150,7 +150,7 @@ { "$id": "19", "kind": "constant", - "name": "PngImageContentType5", + "name": "GetAvatarAsPngRequestAccept5", "namespace": "", "usage": "None", "valueType": { @@ -166,7 +166,7 @@ { "$id": "21", "kind": "constant", - "name": "PngImageAsJsonContentType1", + "name": "GetAvatarAsJsonRequestAccept", "namespace": "", "usage": "None", "valueType": { @@ -182,7 +182,7 @@ { "$id": "23", "kind": "constant", - "name": "PngImageAsJsonContentType2", + "name": "GetAvatarAsJsonRequestAccept1", "namespace": "", "usage": "None", "valueType": { @@ -198,7 +198,7 @@ { "$id": "25", "kind": "constant", - "name": "PngImageAsJsonContentType3", + "name": "GetAvatarAsJsonRequestAccept2", "namespace": "", "usage": "None", "valueType": { @@ -354,7 +354,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.ContentNegotiation.SameBody.getAvatarAsPng.accept" + "crossLanguageDefinitionId": "Payload.ContentNegotiation.SameBody.getAvatarAsPng.accept", + "methodParameterSegments": [ + { + "$id": "39", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.ContentNegotiation.SameBody.getAvatarAsPng.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -363,7 +382,7 @@ 200 ], "bodyType": { - "$id": "39", + "$id": "40", "kind": "bytes", "name": "bytes", "crossLanguageDefinitionId": "TypeSpec.bytes", @@ -374,7 +393,7 @@ "name": "contentType", "nameInResponse": "content-type", "type": { - "$ref": "5" + "$ref": "7" } } ], @@ -396,26 +415,12 @@ }, "parameters": [ { - "$id": "40", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.ContentNegotiation.SameBody.getAvatarAsPng.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "39" } ], "response": { "type": { - "$ref": "39" + "$ref": "40" } }, "isOverride": false, @@ -449,7 +454,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.ContentNegotiation.SameBody.getAvatarAsJpeg.accept" + "crossLanguageDefinitionId": "Payload.ContentNegotiation.SameBody.getAvatarAsJpeg.accept", + "methodParameterSegments": [ + { + "$id": "44", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "11" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.ContentNegotiation.SameBody.getAvatarAsJpeg.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -458,7 +482,7 @@ 200 ], "bodyType": { - "$id": "44", + "$id": "45", "kind": "bytes", "name": "bytes", "crossLanguageDefinitionId": "TypeSpec.bytes", @@ -469,7 +493,7 @@ "name": "contentType", "nameInResponse": "content-type", "type": { - "$ref": "11" + "$ref": "13" } } ], @@ -491,26 +515,12 @@ }, "parameters": [ { - "$id": "45", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.ContentNegotiation.SameBody.getAvatarAsJpeg.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "44" } ], "response": { "type": { - "$ref": "44" + "$ref": "45" } }, "isOverride": false, @@ -592,7 +602,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.ContentNegotiation.DifferentBody.getAvatarAsPng.accept" + "crossLanguageDefinitionId": "Payload.ContentNegotiation.DifferentBody.getAvatarAsPng.accept", + "methodParameterSegments": [ + { + "$id": "53", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.ContentNegotiation.DifferentBody.getAvatarAsPng.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -601,7 +630,7 @@ 200 ], "bodyType": { - "$id": "53", + "$id": "54", "kind": "bytes", "name": "bytes", "crossLanguageDefinitionId": "TypeSpec.bytes", @@ -612,7 +641,7 @@ "name": "contentType", "nameInResponse": "content-type", "type": { - "$ref": "17" + "$ref": "19" } } ], @@ -634,26 +663,12 @@ }, "parameters": [ { - "$id": "54", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "19" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.ContentNegotiation.DifferentBody.getAvatarAsPng.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "53" } ], "response": { "type": { - "$ref": "53" + "$ref": "54" } }, "isOverride": false, @@ -687,7 +702,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.ContentNegotiation.DifferentBody.getAvatarAsJson.accept" + "crossLanguageDefinitionId": "Payload.ContentNegotiation.DifferentBody.getAvatarAsJson.accept", + "methodParameterSegments": [ + { + "$id": "58", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "23" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.ContentNegotiation.DifferentBody.getAvatarAsJson.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -703,7 +737,7 @@ "name": "contentType", "nameInResponse": "content-type", "type": { - "$ref": "23" + "$ref": "25" } } ], @@ -725,21 +759,7 @@ }, "parameters": [ { - "$id": "58", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "25" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.ContentNegotiation.DifferentBody.getAvatarAsJson.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "58" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/Payload.JsonMergePatch.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/Payload.JsonMergePatch.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/Payload.JsonMergePatch.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/Payload.JsonMergePatch.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/Payload.JsonMergePatch.sln deleted file mode 100644 index c1e0b0ab64f..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/Payload.JsonMergePatch.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Payload.JsonMergePatch", "src\Payload.JsonMergePatch.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/Payload.JsonMergePatch.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/Payload.JsonMergePatch.slnx new file mode 100644 index 00000000000..2f60720e485 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/Payload.JsonMergePatch.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/JsonMergePatchClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/JsonMergePatchClient.cs index 06f7a37dced..878bd2ed9bd 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/JsonMergePatchClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/JsonMergePatchClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -14,7 +15,12 @@ public partial class JsonMergePatchClient { public JsonMergePatchClient() : this(new Uri("http://localhost:3000"), new JsonMergePatchClientOptions()) => throw null; - public JsonMergePatchClient(Uri endpoint, JsonMergePatchClientOptions options) => throw null; + internal JsonMergePatchClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, JsonMergePatchClientOptions options) => throw null; + + public JsonMergePatchClient(Uri endpoint, JsonMergePatchClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public JsonMergePatchClient(JsonMergePatchClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/JsonMergePatchClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/JsonMergePatchClientOptions.cs index 044a4f35fb3..c64a14e0ec1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/JsonMergePatchClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/JsonMergePatchClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Payload.JsonMergePatch { public partial class JsonMergePatchClientOptions : ClientPipelineOptions { + public JsonMergePatchClientOptions() => throw null; + + [Experimental("SCME0002")] + internal JsonMergePatchClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/JsonMergePatchClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/JsonMergePatchClientSettings.cs new file mode 100644 index 00000000000..53e5788c5d5 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/JsonMergePatchClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Payload.JsonMergePatch +{ + [Experimental("SCME0002")] + public partial class JsonMergePatchClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public JsonMergePatchClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/Models/InnerModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/Models/InnerModel.Serialization.cs index 9a8d4578a0e..6a3e37bac09 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/Models/InnerModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/Models/InnerModel.Serialization.cs @@ -10,22 +10,22 @@ namespace Payload.JsonMergePatch { public partial class InnerModel : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual InnerModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - InnerModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual InnerModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + InnerModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - InnerModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual InnerModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + InnerModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual InnerModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/Models/Resource.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/Models/Resource.Serialization.cs index d27998488f7..f6b85fb7dde 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/Models/Resource.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/Models/Resource.Serialization.cs @@ -13,26 +13,26 @@ public partial class Resource : IJsonModel { internal Resource() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Resource IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Resource PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Resource JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Resource IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Resource PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Resource resource) => throw null; public static explicit operator Resource(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Resource IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Resource JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..7f9ceee34ff --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "JsonMergePatchClient": { + "type": "object", + "description": "Configuration for JsonMergePatchClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/jsonMergePatchClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "jsonMergePatchClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Payload.JsonMergePatch.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Payload.JsonMergePatch.csproj index 6bbf49f66df..b1f07e8bb25 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Payload.JsonMergePatch.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Payload.JsonMergePatch.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/tspCodeModel.json index 950f7f2562f..6ec9a581c32 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/tspCodeModel.json @@ -54,7 +54,7 @@ { "$id": "7", "kind": "constant", - "name": "updateResourceContentType", + "name": "UpdateResourceRequestContentType1", "namespace": "", "usage": "None", "valueType": { @@ -64,13 +64,13 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "application/json", + "value": "application/merge-patch+json", "decorators": [] }, { "$id": "9", "kind": "constant", - "name": "UpdateResourceRequestContentType1", + "name": "updateResourceContentType", "namespace": "", "usage": "None", "valueType": { @@ -80,7 +80,7 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "application/merge-patch+json", + "value": "application/json", "decorators": [] }, { @@ -102,7 +102,7 @@ { "$id": "13", "kind": "constant", - "name": "updateOptionalResourceContentType", + "name": "UpdateResourceRequestContentType3", "namespace": "", "usage": "None", "valueType": { @@ -112,13 +112,13 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "application/json", + "value": "application/merge-patch+json", "decorators": [] }, { "$id": "15", "kind": "constant", - "name": "UpdateResourceRequestContentType3", + "name": "updateOptionalResourceContentType", "namespace": "", "usage": "None", "valueType": { @@ -128,7 +128,7 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "application/merge-patch+json", + "value": "application/json", "decorators": [] } ], @@ -645,10 +645,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.JsonMergePatch.createResource.contentType" + "crossLanguageDefinitionId": "Payload.JsonMergePatch.createResource.contentType", + "methodParameterSegments": [ + { + "$id": "55", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.JsonMergePatch.createResource.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "55", + "$id": "56", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -661,10 +681,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.JsonMergePatch.createResource.accept" + "crossLanguageDefinitionId": "Payload.JsonMergePatch.createResource.accept", + "methodParameterSegments": [ + { + "$id": "57", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "3" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.JsonMergePatch.createResource.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "56", + "$id": "58", "kind": "body", "name": "body", "serializedName": "body", @@ -680,7 +719,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.JsonMergePatch.createResource.body" + "crossLanguageDefinitionId": "Payload.JsonMergePatch.createResource.body", + "methodParameterSegments": [ + { + "$id": "59", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "17" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.JsonMergePatch.createResource.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -713,56 +771,13 @@ }, "parameters": [ { - "$id": "57", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "17" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.JsonMergePatch.createResource.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "59" }, { - "$id": "58", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.JsonMergePatch.createResource.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "55" }, { - "$id": "59", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.JsonMergePatch.createResource.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "57" } ], "response": { @@ -803,15 +818,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateResource.contentType" + "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateResource.contentType", + "methodParameterSegments": [ + { + "$id": "63", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateResource.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "63", + "$id": "64", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "7" + "$ref": "9" }, "isApiVersion": false, "optional": false, @@ -819,10 +853,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateResource.accept" + "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateResource.accept", + "methodParameterSegments": [ + { + "$id": "65", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateResource.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "64", + "$id": "66", "kind": "body", "name": "body", "serializedName": "body", @@ -838,7 +891,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateResource.body" + "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateResource.body", + "methodParameterSegments": [ + { + "$id": "67", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "40" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateResource.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -871,55 +943,13 @@ }, "parameters": [ { - "$id": "65", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateResource.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "63" }, { - "$id": "66", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "40" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateResource.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "67" }, { - "$id": "67", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateResource.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "65" } ], "response": { @@ -960,15 +990,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateOptionalResource.contentType" + "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateOptionalResource.contentType", + "methodParameterSegments": [ + { + "$id": "71", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "11" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateOptionalResource.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "71", + "$id": "72", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "13" + "$ref": "15" }, "isApiVersion": false, "optional": false, @@ -976,10 +1025,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateOptionalResource.accept" + "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateOptionalResource.accept", + "methodParameterSegments": [ + { + "$id": "73", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "15" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateOptionalResource.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "72", + "$id": "74", "kind": "body", "name": "body", "serializedName": "body", @@ -995,7 +1063,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateOptionalResource.body" + "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateOptionalResource.body", + "methodParameterSegments": [ + { + "$id": "75", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "40" + }, + "location": "Body", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateOptionalResource.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1028,55 +1115,13 @@ }, "parameters": [ { - "$id": "73", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateOptionalResource.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "71" }, { - "$id": "74", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "40" - }, - "location": "Body", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateOptionalResource.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "75" }, { - "$id": "75", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.JsonMergePatch.updateOptionalResource.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "73" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/Payload.MediaType.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/Payload.MediaType.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/Payload.MediaType.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/Payload.MediaType.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/Payload.MediaType.sln deleted file mode 100644 index 358e7e915d9..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/Payload.MediaType.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Payload.MediaType", "src\Payload.MediaType.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/Payload.MediaType.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/Payload.MediaType.slnx new file mode 100644 index 00000000000..1bd1638398d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/Payload.MediaType.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/MediaTypeClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/MediaTypeClient.cs index 6e34839a39c..dbfd6a68c4c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/MediaTypeClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/MediaTypeClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using Payload.MediaType._StringBody; namespace Payload.MediaType @@ -12,7 +13,12 @@ public partial class MediaTypeClient { public MediaTypeClient() : this(new Uri("http://localhost:3000"), new MediaTypeClientOptions()) => throw null; - public MediaTypeClient(Uri endpoint, MediaTypeClientOptions options) => throw null; + internal MediaTypeClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, MediaTypeClientOptions options) => throw null; + + public MediaTypeClient(Uri endpoint, MediaTypeClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public MediaTypeClient(MediaTypeClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/MediaTypeClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/MediaTypeClientOptions.cs index 34c7b715a6f..eb36f49a44c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/MediaTypeClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/MediaTypeClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Payload.MediaType { public partial class MediaTypeClientOptions : ClientPipelineOptions { + public MediaTypeClientOptions() => throw null; + + [Experimental("SCME0002")] + internal MediaTypeClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/MediaTypeClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/MediaTypeClientSettings.cs new file mode 100644 index 00000000000..2d7404eca4e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/MediaTypeClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Payload.MediaType +{ + [Experimental("SCME0002")] + public partial class MediaTypeClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public MediaTypeClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/StringBody.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/StringBody.cs index f31c4875707..3efbadabb94 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/StringBody.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/StringBody.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class StringBody { protected StringBody() => throw null; + internal StringBody(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult SendAsText(BinaryContent content, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..4341d641115 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "MediaTypeClient": { + "type": "object", + "description": "Configuration for MediaTypeClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/mediaTypeClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "mediaTypeClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Payload.MediaType.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Payload.MediaType.csproj index 75ed27a3fcf..b52b73c19fd 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Payload.MediaType.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Payload.MediaType.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/tspCodeModel.json index 18576b03aa8..b726a3e1173 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/tspCodeModel.json @@ -210,15 +210,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MediaType.StringBody.sendAsText.contentType" + "crossLanguageDefinitionId": "Payload.MediaType.StringBody.sendAsText.contentType", + "methodParameterSegments": [ + { + "$id": "25", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MediaType.StringBody.sendAsText.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "25", + "$id": "26", "kind": "body", "name": "text", "serializedName": "text", "type": { - "$id": "26", + "$id": "27", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -233,7 +252,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.MediaType.StringBody.sendAsText.text" + "crossLanguageDefinitionId": "Payload.MediaType.StringBody.sendAsText.text", + "methodParameterSegments": [ + { + "$id": "28", + "kind": "method", + "name": "text", + "serializedName": "text", + "type": { + "$id": "29", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MediaType.StringBody.sendAsText.text", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -260,42 +302,10 @@ }, "parameters": [ { - "$id": "27", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.MediaType.StringBody.sendAsText.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "25" }, { - "$id": "28", - "kind": "method", - "name": "text", - "serializedName": "text", - "type": { - "$id": "29", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.MediaType.StringBody.sendAsText.text", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "28" } ], "response": {}, @@ -330,7 +340,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MediaType.StringBody.getAsText.accept" + "crossLanguageDefinitionId": "Payload.MediaType.StringBody.getAsText.accept", + "methodParameterSegments": [ + { + "$id": "33", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MediaType.StringBody.getAsText.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -339,7 +368,7 @@ 200 ], "bodyType": { - "$id": "33", + "$id": "34", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -372,26 +401,12 @@ }, "parameters": [ { - "$id": "34", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.MediaType.StringBody.getAsText.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "33" } ], "response": { "type": { - "$ref": "33" + "$ref": "34" } }, "isOverride": false, @@ -425,15 +440,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MediaType.StringBody.sendAsJson.contentType" + "crossLanguageDefinitionId": "Payload.MediaType.StringBody.sendAsJson.contentType", + "methodParameterSegments": [ + { + "$id": "38", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MediaType.StringBody.sendAsJson.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "38", + "$id": "39", "kind": "body", "name": "text", "serializedName": "text", "type": { - "$id": "39", + "$id": "40", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -448,7 +482,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.MediaType.StringBody.sendAsJson.text" + "crossLanguageDefinitionId": "Payload.MediaType.StringBody.sendAsJson.text", + "methodParameterSegments": [ + { + "$id": "41", + "kind": "method", + "name": "text", + "serializedName": "text", + "type": { + "$id": "42", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MediaType.StringBody.sendAsJson.text", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -475,42 +532,10 @@ }, "parameters": [ { - "$id": "40", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.MediaType.StringBody.sendAsJson.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "38" }, { - "$id": "41", - "kind": "method", - "name": "text", - "serializedName": "text", - "type": { - "$id": "42", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.MediaType.StringBody.sendAsJson.text", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "41" } ], "response": {}, @@ -545,7 +570,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MediaType.StringBody.getAsJson.accept" + "crossLanguageDefinitionId": "Payload.MediaType.StringBody.getAsJson.accept", + "methodParameterSegments": [ + { + "$id": "46", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "13" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MediaType.StringBody.getAsJson.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -554,7 +598,7 @@ 200 ], "bodyType": { - "$id": "46", + "$id": "47", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -587,26 +631,12 @@ }, "parameters": [ { - "$id": "47", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.MediaType.StringBody.getAsJson.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "46" } ], "response": { "type": { - "$ref": "46" + "$ref": "47" } }, "isOverride": false, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/Payload.MultiPart.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/Payload.MultiPart.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/Payload.MultiPart.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/Payload.MultiPart.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/Payload.MultiPart.sln deleted file mode 100644 index 0c86188ef15..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/Payload.MultiPart.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Payload.MultiPart", "src\Payload.MultiPart.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/Payload.MultiPart.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/Payload.MultiPart.slnx new file mode 100644 index 00000000000..821526f7e5d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/Payload.MultiPart.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormData.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormData.cs index d543051acc1..7af85b26e37 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormData.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormData.cs @@ -2,9 +2,11 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading.Tasks; +using Payload.MultiPart._FormData.File; using Payload.MultiPart._FormData.HttpParts; namespace Payload.MultiPart._FormData @@ -13,6 +15,8 @@ public partial class FormData { protected FormData() => throw null; + internal FormData(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Basic(BinaryContent content, string contentType, RequestOptions options = null) => throw null; @@ -52,5 +56,7 @@ public partial class FormData public virtual Task AnonymousModelAsync(BinaryContent content, string contentType, RequestOptions options = null) => throw null; public virtual FormDataHttpParts GetFormDataHttpPartsClient() => throw null; + + public virtual FormDataFile GetFormDataFileClient() => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormDataFile.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormDataFile.cs new file mode 100644 index 00000000000..af3b92422ad --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormDataFile.cs @@ -0,0 +1,32 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading.Tasks; + +namespace Payload.MultiPart._FormData.File +{ + public partial class FormDataFile + { + protected FormDataFile() => throw null; + + internal FormDataFile(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult UploadFileSpecificContentType(BinaryContent content, string contentType, RequestOptions options = null) => throw null; + + public virtual Task UploadFileSpecificContentTypeAsync(BinaryContent content, string contentType, RequestOptions options = null) => throw null; + + public virtual ClientResult UploadFileRequiredFilename(BinaryContent content, string contentType, RequestOptions options = null) => throw null; + + public virtual Task UploadFileRequiredFilenameAsync(BinaryContent content, string contentType, RequestOptions options = null) => throw null; + + public virtual ClientResult UploadFileArray(BinaryContent content, string contentType, RequestOptions options = null) => throw null; + + public virtual Task UploadFileArrayAsync(BinaryContent content, string contentType, RequestOptions options = null) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormDataHttpParts.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormDataHttpParts.cs index 033e295e92d..53b236c7af8 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormDataHttpParts.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormDataHttpParts.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading.Tasks; @@ -14,6 +15,8 @@ public partial class FormDataHttpParts { protected FormDataHttpParts() => throw null; + internal FormDataHttpParts(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult JsonArrayAndFileArray(BinaryContent content, string contentType, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormDataHttpPartsContentType.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormDataHttpPartsContentType.cs index 32cb80df3d0..971ee6ad114 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormDataHttpPartsContentType.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormDataHttpPartsContentType.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading.Tasks; @@ -12,6 +13,8 @@ public partial class FormDataHttpPartsContentType { protected FormDataHttpPartsContentType() => throw null; + internal FormDataHttpPartsContentType(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult ImageJpegContentType(BinaryContent content, string contentType, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormDataHttpPartsNonString.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormDataHttpPartsNonString.cs index 47557d7876b..cfb735ba1c8 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormDataHttpPartsNonString.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/FormDataHttpPartsNonString.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading.Tasks; @@ -12,6 +13,8 @@ public partial class FormDataHttpPartsNonString { protected FormDataHttpPartsNonString() => throw null; + internal FormDataHttpPartsNonString(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Float(BinaryContent content, string contentType, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/Models/PayloadMultiPartContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/Models/PayloadMultiPartContext.cs index 390c801869d..860a01ecc93 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/Models/PayloadMultiPartContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/Models/PayloadMultiPartContext.cs @@ -4,6 +4,7 @@ using System.ClientModel.Primitives; using Payload.MultiPart._FormData; +using Payload.MultiPart._FormData.File; using Payload.MultiPart._FormData.HttpParts.NonString; namespace Payload.MultiPart diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/MultiPartClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/MultiPartClient.cs index cd0cceb3f85..882e5cd3826 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/MultiPartClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/MultiPartClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using Payload.MultiPart._FormData; namespace Payload.MultiPart @@ -12,7 +13,12 @@ public partial class MultiPartClient { public MultiPartClient() : this(new Uri("http://localhost:3000"), new MultiPartClientOptions()) => throw null; - public MultiPartClient(Uri endpoint, MultiPartClientOptions options) => throw null; + internal MultiPartClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, MultiPartClientOptions options) => throw null; + + public MultiPartClient(Uri endpoint, MultiPartClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public MultiPartClient(MultiPartClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/MultiPartClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/MultiPartClientOptions.cs index 637c71f86aa..8c4e0bdd9bc 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/MultiPartClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/MultiPartClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Payload.MultiPart { public partial class MultiPartClientOptions : ClientPipelineOptions { + public MultiPartClientOptions() => throw null; + + [Experimental("SCME0002")] + internal MultiPartClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/MultiPartClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/MultiPartClientSettings.cs new file mode 100644 index 00000000000..4952a597b64 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/MultiPartClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Payload.MultiPart +{ + [Experimental("SCME0002")] + public partial class MultiPartClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public MultiPartClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..1e8e4a7a060 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "MultiPartClient": { + "type": "object", + "description": "Configuration for MultiPartClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/multiPartClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "multiPartClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Payload.MultiPart.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Payload.MultiPart.csproj index 3354b884925..578b3219500 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Payload.MultiPart.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Payload.MultiPart.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/tspCodeModel.json index 4732c4fe160..cef69d74b7f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/tspCodeModel.json @@ -1,14 +1,12 @@ { "name": "Payload.MultiPart", "apiVersions": [], - "enums": [], - "constants": [ + "enums": [ { "$id": "1", - "kind": "constant", - "name": "FileSpecificContentTypeContentType", - "namespace": "Payload.MultiPart", - "usage": "Input", + "kind": "enum", + "name": "File1ContentType", + "crossLanguageDefinitionId": "", "valueType": { "$id": "2", "kind": "string", @@ -16,31 +14,40 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "image/jpg", - "decorators": [] - }, - { - "$id": "3", - "kind": "constant", - "name": "BasicRequestContentType", - "namespace": "", - "usage": "None", - "valueType": { - "$id": "4", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "value": "multipart/form-data", + "values": [ + { + "$id": "3", + "kind": "enumvalue", + "name": "image/png", + "value": "image/png", + "valueType": { + "$id": "4", + "kind": "string", + "decorators": [], + "doc": "A sequence of textual characters.", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + } + ], + "namespace": "TypeSpec.Http", + "isFixed": false, + "isFlags": false, + "usage": "Input", "decorators": [] - }, + } + ], + "constants": [ { "$id": "5", "kind": "constant", - "name": "BasicRequestContentType1", - "namespace": "", - "usage": "None", + "name": "FileSpecificContentTypeContentType", + "namespace": "Payload.MultiPart", + "usage": "Input", "valueType": { "$id": "6", "kind": "string", @@ -48,13 +55,13 @@ "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "value": "multipart/form-data", + "value": "image/jpg", "decorators": [] }, { "$id": "7", "kind": "constant", - "name": "BasicRequestContentType2", + "name": "BasicRequestContentType", "namespace": "", "usage": "None", "valueType": { @@ -70,7 +77,7 @@ { "$id": "9", "kind": "constant", - "name": "BasicRequestContentType3", + "name": "BasicRequestContentType1", "namespace": "", "usage": "None", "valueType": { @@ -86,7 +93,7 @@ { "$id": "11", "kind": "constant", - "name": "BasicRequestContentType4", + "name": "BasicRequestContentType2", "namespace": "", "usage": "None", "valueType": { @@ -102,7 +109,7 @@ { "$id": "13", "kind": "constant", - "name": "BasicRequestContentType5", + "name": "BasicRequestContentType3", "namespace": "", "usage": "None", "valueType": { @@ -118,7 +125,7 @@ { "$id": "15", "kind": "constant", - "name": "BasicRequestContentType6", + "name": "BasicRequestContentType4", "namespace": "", "usage": "None", "valueType": { @@ -134,7 +141,7 @@ { "$id": "17", "kind": "constant", - "name": "BasicRequestContentType7", + "name": "BasicRequestContentType5", "namespace": "", "usage": "None", "valueType": { @@ -150,7 +157,7 @@ { "$id": "19", "kind": "constant", - "name": "BasicRequestContentType8", + "name": "BasicRequestContentType6", "namespace": "", "usage": "None", "valueType": { @@ -166,7 +173,7 @@ { "$id": "21", "kind": "constant", - "name": "BasicRequestContentType9", + "name": "BasicRequestContentType7", "namespace": "", "usage": "None", "valueType": { @@ -182,7 +189,7 @@ { "$id": "23", "kind": "constant", - "name": "BasicRequestContentType10", + "name": "BasicRequestContentType8", "namespace": "", "usage": "None", "valueType": { @@ -198,7 +205,7 @@ { "$id": "25", "kind": "constant", - "name": "BasicRequestContentType11", + "name": "BasicRequestContentType9", "namespace": "", "usage": "None", "valueType": { @@ -214,7 +221,7 @@ { "$id": "27", "kind": "constant", - "name": "BasicRequestContentType12", + "name": "BasicRequestContentType10", "namespace": "", "usage": "None", "valueType": { @@ -230,7 +237,7 @@ { "$id": "29", "kind": "constant", - "name": "BasicRequestContentType13", + "name": "BasicRequestContentType11", "namespace": "", "usage": "None", "valueType": { @@ -246,7 +253,7 @@ { "$id": "31", "kind": "constant", - "name": "BasicRequestContentType14", + "name": "BasicRequestContentType12", "namespace": "", "usage": "None", "valueType": { @@ -262,7 +269,7 @@ { "$id": "33", "kind": "constant", - "name": "BasicRequestContentType15", + "name": "BasicRequestContentType13", "namespace": "", "usage": "None", "valueType": { @@ -278,7 +285,7 @@ { "$id": "35", "kind": "constant", - "name": "BasicRequestContentType16", + "name": "BasicRequestContentType14", "namespace": "", "usage": "None", "valueType": { @@ -294,7 +301,7 @@ { "$id": "37", "kind": "constant", - "name": "BasicRequestContentType17", + "name": "BasicRequestContentType15", "namespace": "", "usage": "None", "valueType": { @@ -310,7 +317,7 @@ { "$id": "39", "kind": "constant", - "name": "BasicRequestContentType18", + "name": "BasicRequestContentType16", "namespace": "", "usage": "None", "valueType": { @@ -326,7 +333,7 @@ { "$id": "41", "kind": "constant", - "name": "BasicRequestContentType19", + "name": "BasicRequestContentType17", "namespace": "", "usage": "None", "valueType": { @@ -342,7 +349,7 @@ { "$id": "43", "kind": "constant", - "name": "BasicRequestContentType20", + "name": "BasicRequestContentType18", "namespace": "", "usage": "None", "valueType": { @@ -358,7 +365,7 @@ { "$id": "45", "kind": "constant", - "name": "BasicRequestContentType21", + "name": "BasicRequestContentType19", "namespace": "", "usage": "None", "valueType": { @@ -374,7 +381,7 @@ { "$id": "47", "kind": "constant", - "name": "BasicRequestContentType22", + "name": "BasicRequestContentType20", "namespace": "", "usage": "None", "valueType": { @@ -390,7 +397,7 @@ { "$id": "49", "kind": "constant", - "name": "BasicRequestContentType23", + "name": "BasicRequestContentType21", "namespace": "", "usage": "None", "valueType": { @@ -406,7 +413,7 @@ { "$id": "51", "kind": "constant", - "name": "BasicRequestContentType24", + "name": "BasicRequestContentType22", "namespace": "", "usage": "None", "valueType": { @@ -422,7 +429,7 @@ { "$id": "53", "kind": "constant", - "name": "BasicRequestContentType25", + "name": "BasicRequestContentType23", "namespace": "", "usage": "None", "valueType": { @@ -438,7 +445,7 @@ { "$id": "55", "kind": "constant", - "name": "BasicRequestContentType26", + "name": "BasicRequestContentType24", "namespace": "", "usage": "None", "valueType": { @@ -454,7 +461,7 @@ { "$id": "57", "kind": "constant", - "name": "BasicRequestContentType27", + "name": "BasicRequestContentType25", "namespace": "", "usage": "None", "valueType": { @@ -466,11 +473,139 @@ }, "value": "multipart/form-data", "decorators": [] + }, + { + "$id": "59", + "kind": "constant", + "name": "BasicRequestContentType26", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "60", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "multipart/form-data", + "decorators": [] + }, + { + "$id": "61", + "kind": "constant", + "name": "BasicRequestContentType27", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "62", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "multipart/form-data", + "decorators": [] + }, + { + "$id": "63", + "kind": "constant", + "name": "BasicRequestContentType28", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "64", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "multipart/form-data", + "decorators": [] + }, + { + "$id": "65", + "kind": "constant", + "name": "BasicRequestContentType29", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "66", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "multipart/form-data", + "decorators": [] + }, + { + "$id": "67", + "kind": "constant", + "name": "BasicRequestContentType30", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "68", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "multipart/form-data", + "decorators": [] + }, + { + "$id": "69", + "kind": "constant", + "name": "BasicRequestContentType31", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "70", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "multipart/form-data", + "decorators": [] + }, + { + "$id": "71", + "kind": "constant", + "name": "BasicRequestContentType32", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "72", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "multipart/form-data", + "decorators": [] + }, + { + "$id": "73", + "kind": "constant", + "name": "BasicRequestContentType33", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "74", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "multipart/form-data", + "decorators": [] } ], "models": [ { - "$id": "59", + "$id": "75", "kind": "model", "name": "MultiPartRequest", "namespace": "Payload.MultiPart", @@ -480,12 +615,12 @@ "serializationOptions": {}, "properties": [ { - "$id": "60", + "$id": "76", "kind": "property", "name": "id", "serializedName": "id", "type": { - "$id": "61", + "$id": "77", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -511,12 +646,12 @@ "isHttpMetadata": false }, { - "$id": "62", + "$id": "78", "kind": "property", "name": "profileImage", "serializedName": "profileImage", "type": { - "$id": "63", + "$id": "79", "kind": "bytes", "name": "bytes", "encode": "base64", @@ -545,7 +680,7 @@ ] }, { - "$id": "64", + "$id": "80", "kind": "model", "name": "MultiPartRequestWithWireName", "namespace": "Payload.MultiPart", @@ -555,12 +690,12 @@ "serializationOptions": {}, "properties": [ { - "$id": "65", + "$id": "81", "kind": "property", "name": "identifier", "serializedName": "id", "type": { - "$id": "66", + "$id": "82", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -586,12 +721,12 @@ "isHttpMetadata": false }, { - "$id": "67", + "$id": "83", "kind": "property", "name": "image", "serializedName": "profileImage", "type": { - "$id": "68", + "$id": "84", "kind": "bytes", "name": "bytes", "encode": "base64", @@ -620,7 +755,7 @@ ] }, { - "$id": "69", + "$id": "85", "kind": "model", "name": "MultiPartOptionalRequest", "namespace": "Payload.MultiPart", @@ -630,12 +765,12 @@ "serializationOptions": {}, "properties": [ { - "$id": "70", + "$id": "86", "kind": "property", "name": "id", "serializedName": "id", "type": { - "$id": "71", + "$id": "87", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -661,12 +796,12 @@ "isHttpMetadata": false }, { - "$id": "72", + "$id": "88", "kind": "property", "name": "profileImage", "serializedName": "profileImage", "type": { - "$id": "73", + "$id": "89", "kind": "bytes", "name": "bytes", "encode": "base64", @@ -695,7 +830,7 @@ ] }, { - "$id": "74", + "$id": "90", "kind": "model", "name": "ComplexPartsRequest", "namespace": "Payload.MultiPart", @@ -705,12 +840,12 @@ "serializationOptions": {}, "properties": [ { - "$id": "75", + "$id": "91", "kind": "property", "name": "id", "serializedName": "id", "type": { - "$id": "76", + "$id": "92", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -736,12 +871,12 @@ "isHttpMetadata": false }, { - "$id": "77", + "$id": "93", "kind": "property", "name": "address", "serializedName": "address", "type": { - "$id": "78", + "$id": "94", "kind": "model", "name": "Address", "namespace": "Payload.MultiPart", @@ -751,12 +886,12 @@ "serializationOptions": {}, "properties": [ { - "$id": "79", + "$id": "95", "kind": "property", "name": "city", "serializedName": "city", "type": { - "$id": "80", + "$id": "96", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -797,12 +932,12 @@ "isHttpMetadata": false }, { - "$id": "81", + "$id": "97", "kind": "property", "name": "profileImage", "serializedName": "profileImage", "type": { - "$id": "82", + "$id": "98", "kind": "bytes", "name": "bytes", "encode": "base64", @@ -829,16 +964,16 @@ "isHttpMetadata": false }, { - "$id": "83", + "$id": "99", "kind": "property", "name": "pictures", "serializedName": "pictures", "type": { - "$id": "84", + "$id": "100", "kind": "array", "name": "ArrayHttpPart", "valueType": { - "$id": "85", + "$id": "101", "kind": "bytes", "name": "bytes", "encode": "base64", @@ -870,10 +1005,10 @@ ] }, { - "$ref": "78" + "$ref": "94" }, { - "$id": "86", + "$id": "102", "kind": "model", "name": "JsonPartRequest", "namespace": "Payload.MultiPart", @@ -883,12 +1018,12 @@ "serializationOptions": {}, "properties": [ { - "$id": "87", + "$id": "103", "kind": "property", "name": "address", "serializedName": "address", "type": { - "$ref": "78" + "$ref": "94" }, "optional": false, "readOnly": false, @@ -910,12 +1045,12 @@ "isHttpMetadata": false }, { - "$id": "88", + "$id": "104", "kind": "property", "name": "profileImage", "serializedName": "profileImage", "type": { - "$id": "89", + "$id": "105", "kind": "bytes", "name": "bytes", "encode": "base64", @@ -944,7 +1079,7 @@ ] }, { - "$id": "90", + "$id": "106", "kind": "model", "name": "BinaryArrayPartsRequest", "namespace": "Payload.MultiPart", @@ -954,12 +1089,12 @@ "serializationOptions": {}, "properties": [ { - "$id": "91", + "$id": "107", "kind": "property", "name": "id", "serializedName": "id", "type": { - "$id": "92", + "$id": "108", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -985,16 +1120,16 @@ "isHttpMetadata": false }, { - "$id": "93", + "$id": "109", "kind": "property", "name": "pictures", "serializedName": "pictures", "type": { - "$id": "94", + "$id": "110", "kind": "array", "name": "ArrayHttpPart1", "valueType": { - "$id": "95", + "$id": "111", "kind": "bytes", "name": "bytes", "encode": "base64", @@ -1026,7 +1161,7 @@ ] }, { - "$id": "96", + "$id": "112", "kind": "model", "name": "MultiBinaryPartsRequest", "namespace": "Payload.MultiPart", @@ -1036,12 +1171,12 @@ "serializationOptions": {}, "properties": [ { - "$id": "97", + "$id": "113", "kind": "property", "name": "profileImage", "serializedName": "profileImage", "type": { - "$id": "98", + "$id": "114", "kind": "bytes", "name": "bytes", "encode": "base64", @@ -1068,12 +1203,12 @@ "isHttpMetadata": false }, { - "$id": "99", + "$id": "115", "kind": "property", "name": "picture", "serializedName": "picture", "type": { - "$id": "100", + "$id": "116", "kind": "bytes", "name": "bytes", "encode": "base64", @@ -1102,7 +1237,7 @@ ] }, { - "$id": "101", + "$id": "117", "kind": "model", "name": "AnonymousModelRequest", "namespace": "Payload.MultiPart.FormData", @@ -1112,12 +1247,12 @@ "serializationOptions": {}, "properties": [ { - "$id": "102", + "$id": "118", "kind": "property", "name": "profileImage", "serializedName": "profileImage", "type": { - "$id": "103", + "$id": "119", "kind": "bytes", "name": "bytes", "encode": "base64", @@ -1146,7 +1281,7 @@ ] }, { - "$id": "104", + "$id": "120", "kind": "model", "name": "ComplexHttpPartsModelRequest", "namespace": "Payload.MultiPart", @@ -1156,12 +1291,12 @@ "serializationOptions": {}, "properties": [ { - "$id": "105", + "$id": "121", "kind": "property", "name": "id", "serializedName": "id", "type": { - "$id": "106", + "$id": "122", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1187,12 +1322,12 @@ "isHttpMetadata": false }, { - "$id": "107", + "$id": "123", "kind": "property", "name": "address", "serializedName": "address", "type": { - "$ref": "78" + "$ref": "94" }, "optional": false, "readOnly": false, @@ -1214,12 +1349,12 @@ "isHttpMetadata": false }, { - "$id": "108", + "$id": "124", "kind": "property", "name": "profileImage", "serializedName": "profileImage", "type": { - "$id": "109", + "$id": "125", "kind": "model", "name": "FileRequiredMetaData", "namespace": "Payload.MultiPart", @@ -1228,7 +1363,7 @@ "decorators": [], "serializationOptions": {}, "baseModel": { - "$id": "110", + "$id": "126", "kind": "model", "name": "File", "namespace": "TypeSpec.Http", @@ -1240,13 +1375,13 @@ "serializationOptions": {}, "properties": [ { - "$id": "111", + "$id": "127", "kind": "property", "name": "contentType", "summary": "The allowed media (MIME) types of the file contents.", "doc": "The allowed media (MIME) types of the file contents.\n\nIn file bodies, this value comes from the `Content-Type` header of the request or response. In JSON bodies,\nthis value is serialized as a field in the response.\n\nNOTE: this is not _necessarily_ the same as the `Content-Type` header of the request or response, but\nit will be for file bodies. It may be different if the file is serialized as a JSON object. It always refers to the\n_contents_ of the file, and not necessarily the way the file itself is transmitted or serialized.", "type": { - "$id": "112", + "$id": "128", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1262,13 +1397,13 @@ "isHttpMetadata": false }, { - "$id": "113", + "$id": "129", "kind": "property", "name": "filename", "summary": "The name of the file, if any.", "doc": "The name of the file, if any.\n\nIn file bodies, this value comes from the `filename` parameter of the `Content-Disposition` header of the response\nor multipart payload. In JSON bodies, this value is serialized as a field in the response.\n\nNOTE: By default, `filename` cannot be sent in request payloads and can only be sent in responses and multipart\npayloads, as the `Content-Disposition` header is not valid in requests. If you want to send the `filename` in a request,\nyou must extend the `File` model and override the `filename` property with a different location defined by HTTP metadata\ndecorators.", "type": { - "$id": "114", + "$id": "130", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1284,13 +1419,13 @@ "isHttpMetadata": false }, { - "$id": "115", + "$id": "131", "kind": "property", "name": "contents", "summary": "The contents of the file.", "doc": "The contents of the file.\n\nIn file bodies, this value comes from the body of the request, response, or multipart payload. In JSON bodies,\nthis value is serialized as a field in the response.", "type": { - "$id": "116", + "$id": "132", "kind": "bytes", "name": "bytes", "encode": "base64", @@ -1310,11 +1445,11 @@ }, "properties": [ { - "$id": "117", + "$id": "133", "kind": "property", "name": "filename", "type": { - "$id": "118", + "$id": "134", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1330,11 +1465,11 @@ "isHttpMetadata": false }, { - "$id": "119", + "$id": "135", "kind": "property", "name": "contentType", "type": { - "$id": "120", + "$id": "136", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1362,10 +1497,10 @@ "isFilePart": true, "isMulti": false, "filename": { - "$id": "121", + "$id": "137", "apiVersions": [], "type": { - "$id": "122", + "$id": "138", "kind": "string", "decorators": [], "doc": "A sequence of textual characters.", @@ -1395,10 +1530,10 @@ "serializationOptions": {} }, "contentType": { - "$id": "123", + "$id": "139", "apiVersions": [], "type": { - "$id": "124", + "$id": "140", "kind": "string", "decorators": [], "doc": "A sequence of textual characters.", @@ -1437,16 +1572,16 @@ "isHttpMetadata": false }, { - "$id": "125", + "$id": "141", "kind": "property", "name": "previousAddresses", "serializedName": "previousAddresses", "type": { - "$id": "126", + "$id": "142", "kind": "array", "name": "ArrayAddress", "valueType": { - "$ref": "78" + "$ref": "94" }, "crossLanguageDefinitionId": "TypeSpec.Array", "decorators": [] @@ -1471,16 +1606,16 @@ "isHttpMetadata": false }, { - "$id": "127", + "$id": "143", "kind": "property", "name": "pictures", "serializedName": "pictures", "type": { - "$id": "128", + "$id": "144", "kind": "array", "name": "ArrayHttpPart2", "valueType": { - "$ref": "109" + "$ref": "125" }, "crossLanguageDefinitionId": "TypeSpec.Array", "decorators": [] @@ -1496,10 +1631,10 @@ "isFilePart": true, "isMulti": true, "filename": { - "$ref": "121" + "$ref": "137" }, "contentType": { - "$ref": "123" + "$ref": "139" }, "defaultContentTypes": [ "*/*" @@ -1513,72 +1648,98 @@ ] }, { - "$ref": "109" + "$ref": "125" }, { - "$ref": "110" + "$ref": "126" }, { - "$id": "129", + "$id": "145", "kind": "model", - "name": "FileWithHttpPartSpecificContentTypeRequest", - "namespace": "Payload.MultiPart", - "crossLanguageDefinitionId": "Payload.MultiPart.FileWithHttpPartSpecificContentTypeRequest", + "name": "UploadFileSpecificContentTypeRequest", + "namespace": "Payload.MultiPart.FormData.File", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileSpecificContentType.Request.anonymous", "usage": "Input,MultipartFormData", "decorators": [], "serializationOptions": {}, "properties": [ { - "$id": "130", + "$id": "146", "kind": "property", - "name": "profileImage", - "serializedName": "profileImage", + "name": "file", + "serializedName": "file", "type": { - "$id": "131", + "$id": "147", "kind": "model", - "name": "FileSpecificContentType", - "namespace": "Payload.MultiPart", - "crossLanguageDefinitionId": "Payload.MultiPart.FileSpecificContentType", + "name": "File1", + "namespace": "TypeSpec.Http", + "crossLanguageDefinitionId": "TypeSpec.Http.File", "usage": "Input", + "doc": "A file in an HTTP request, response, or multipart payload.\n\nFiles have a special meaning that the HTTP library understands. When the body of an HTTP request, response,\nor multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the\noperation is treated as a file upload or download.\n\nWhen using file bodies, the fields of the file model are defined to come from particular locations by default:\n\n- `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload\n(MAY be overridden or changed).\n\nA File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit\n`Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON payload,\nit will have a structure like:\n\n```\n{\n \"contentType\": ,\n \"filename\": ,\n \"contents\": \n}\n```\n\nThe `contentType` _within_ the file defines what media types the data inside the file can be, but if the specification\ndefines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is\nserialized_. See the examples below for more information.\n\nNOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename`\n(`Content-Disposition: ; filename=`) is only valid in HTTP responses and multipart payloads. If\nyou wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the\n`filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` location\nis overridden, as shown in the examples below.", + "summary": "A file in an HTTP request, response, or multipart payload.", "decorators": [], "serializationOptions": {}, - "baseModel": { - "$ref": "110" - }, "properties": [ { - "$id": "132", + "$id": "148", "kind": "property", - "name": "filename", + "name": "contentType", + "summary": "The allowed media (MIME) types of the file contents.", + "doc": "The allowed media (MIME) types of the file contents.\n\nIn file bodies, this value comes from the `Content-Type` header of the request or response. In JSON bodies,\nthis value is serialized as a field in the response.\n\nNOTE: this is not _necessarily_ the same as the `Content-Type` header of the request or response, but\nit will be for file bodies. It may be different if the file is serialized as a JSON object. It always refers to the\n_contents_ of the file, and not necessarily the way the file itself is transmitted or serialized.", "type": { - "$id": "133", + "$ref": "1" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "TypeSpec.Http.File.contentType", + "serializationOptions": {}, + "isHttpMetadata": false + }, + { + "$id": "149", + "kind": "property", + "name": "filename", + "summary": "The name of the file, if any.", + "doc": "The name of the file, if any.\n\nIn file bodies, this value comes from the `filename` parameter of the `Content-Disposition` header of the response\nor multipart payload. In JSON bodies, this value is serialized as a field in the response.\n\nNOTE: By default, `filename` cannot be sent in request payloads and can only be sent in responses and multipart\npayloads, as the `Content-Disposition` header is not valid in requests. If you want to send the `filename` in a request,\nyou must extend the `File` model and override the `filename` property with a different location defined by HTTP metadata\ndecorators.", + "type": { + "$id": "150", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, - "optional": false, + "optional": true, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FileSpecificContentType.filename", + "crossLanguageDefinitionId": "TypeSpec.Http.File.filename", "serializationOptions": {}, "isHttpMetadata": false }, { - "$id": "134", + "$id": "151", "kind": "property", - "name": "contentType", + "name": "contents", + "summary": "The contents of the file.", + "doc": "The contents of the file.\n\nIn file bodies, this value comes from the body of the request, response, or multipart payload. In JSON bodies,\nthis value is serialized as a field in the response.", "type": { - "$ref": "1" + "$id": "152", + "kind": "bytes", + "name": "bytes", + "encode": "base64", + "crossLanguageDefinitionId": "TypeSpec.bytes", + "decorators": [] }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FileSpecificContentType.contentType", + "crossLanguageDefinitionId": "TypeSpec.Http.File.contents", "serializationOptions": {}, "isHttpMetadata": false } @@ -1589,16 +1750,18 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FileWithHttpPartSpecificContentTypeRequest.profileImage", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileSpecificContentType.Request.anonymous.file", "serializationOptions": { "multipart": { "isFilePart": true, "isMulti": false, "filename": { - "$id": "135", + "$id": "153", + "doc": "The name of the file, if any.\n\nIn file bodies, this value comes from the `filename` parameter of the `Content-Disposition` header of the response\nor multipart payload. In JSON bodies, this value is serialized as a field in the response.\n\nNOTE: By default, `filename` cannot be sent in request payloads and can only be sent in responses and multipart\npayloads, as the `Content-Disposition` header is not valid in requests. If you want to send the `filename` in a request,\nyou must extend the `File` model and override the `filename` property with a different location defined by HTTP metadata\ndecorators.", + "summary": "The name of the file, if any.", "apiVersions": [], "type": { - "$id": "136", + "$id": "154", "kind": "string", "decorators": [], "doc": "A sequence of textual characters.", @@ -1607,10 +1770,10 @@ }, "name": "filename", "isGeneratedName": false, - "optional": false, + "optional": true, "isApiVersionParam": false, "onClient": false, - "crossLanguageDefinitionId": "Payload.MultiPart.FileSpecificContentType.filename", + "crossLanguageDefinitionId": "TypeSpec.Http.File.filename", "decorators": [], "visibility": [ 1, @@ -1628,30 +1791,27 @@ "serializationOptions": {} }, "contentType": { - "$id": "137", + "$id": "155", + "doc": "The allowed media (MIME) types of the file contents.\n\nIn file bodies, this value comes from the `Content-Type` header of the request or response. In JSON bodies,\nthis value is serialized as a field in the response.\n\nNOTE: this is not _necessarily_ the same as the `Content-Type` header of the request or response, but\nit will be for file bodies. It may be different if the file is serialized as a JSON object. It always refers to the\n_contents_ of the file, and not necessarily the way the file itself is transmitted or serialized.", + "summary": "The allowed media (MIME) types of the file contents.", "apiVersions": [], "type": { - "$id": "138", + "$id": "156", "kind": "constant", "decorators": [], - "value": "image/jpg", + "value": "image/png", "valueType": { - "$id": "139", - "kind": "string", - "decorators": [], - "doc": "A sequence of textual characters.", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string" + "$ref": "4" }, - "name": "FileSpecificContentTypeContentType", + "name": "FileContentType", "isGeneratedName": true }, "name": "contentType", "isGeneratedName": false, - "optional": false, + "optional": true, "isApiVersionParam": false, "onClient": false, - "crossLanguageDefinitionId": "Payload.MultiPart.FileSpecificContentType.contentType", + "crossLanguageDefinitionId": "TypeSpec.Http.File.contentType", "decorators": [], "visibility": [ 1, @@ -1669,9 +1829,9 @@ "serializationOptions": {} }, "defaultContentTypes": [ - "image/jpg" + "image/png" ], - "name": "profileImage", + "name": "file", "headers": [] } }, @@ -1680,46 +1840,108 @@ ] }, { - "$ref": "131" + "$ref": "147" }, { - "$id": "140", + "$id": "157", "kind": "model", - "name": "FileWithHttpPartRequiredContentTypeRequest", - "namespace": "Payload.MultiPart", - "crossLanguageDefinitionId": "Payload.MultiPart.FileWithHttpPartRequiredContentTypeRequest", + "name": "UploadFileRequiredFilenameRequest", + "namespace": "Payload.MultiPart.FormData.File", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileRequiredFilename.Request.anonymous", "usage": "Input,MultipartFormData", "decorators": [], "serializationOptions": {}, "properties": [ { - "$id": "141", + "$id": "158", "kind": "property", - "name": "profileImage", - "serializedName": "profileImage", + "name": "file", + "serializedName": "file", "type": { - "$ref": "109" + "$id": "159", + "kind": "model", + "name": "FileWithRequiredFilename", + "namespace": "Payload.MultiPart.FormData.File", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.FileWithRequiredFilename", + "usage": "Input", + "decorators": [], + "serializationOptions": {}, + "baseModel": { + "$ref": "147" + }, + "properties": [ + { + "$id": "160", + "kind": "property", + "name": "filename", + "type": { + "$id": "161", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.FileWithRequiredFilename.filename", + "serializationOptions": {}, + "isHttpMetadata": false + } + ] }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FileWithHttpPartRequiredContentTypeRequest.profileImage", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileRequiredFilename.Request.anonymous.file", "serializationOptions": { "multipart": { "isFilePart": true, "isMulti": false, "filename": { - "$ref": "121" + "$id": "162", + "apiVersions": [], + "type": { + "$id": "163", + "kind": "string", + "decorators": [], + "doc": "A sequence of textual characters.", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "name": "filename", + "isGeneratedName": false, + "optional": false, + "isApiVersionParam": false, + "onClient": false, + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.FileWithRequiredFilename.filename", + "decorators": [], + "visibility": [ + 1, + 2, + 4, + 8, + 16 + ], + "access": "public", + "flatten": false, + "kind": "property", + "discriminator": false, + "serializedName": "filename", + "isMultipartFileInput": false, + "serializationOptions": {} }, "contentType": { - "$ref": "123" + "$ref": "155" }, "defaultContentTypes": [ - "*/*" + "image/png" ], - "name": "profileImage", + "name": "file", "headers": [] } }, @@ -1728,39 +1950,94 @@ ] }, { - "$id": "142", + "$ref": "159" + }, + { + "$id": "164", "kind": "model", - "name": "FileWithHttpPartOptionalContentTypeRequest", + "name": "UploadFileArrayRequest", + "namespace": "Payload.MultiPart.FormData.File", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileArray.Request.anonymous", + "usage": "Input,MultipartFormData", + "decorators": [], + "serializationOptions": {}, + "properties": [ + { + "$id": "165", + "kind": "property", + "name": "files", + "serializedName": "files", + "type": { + "$id": "166", + "kind": "array", + "name": "ArrayHttpPart3", + "valueType": { + "$ref": "147" + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileArray.Request.anonymous.files", + "serializationOptions": { + "multipart": { + "isFilePart": true, + "isMulti": true, + "filename": { + "$ref": "153" + }, + "contentType": { + "$ref": "155" + }, + "defaultContentTypes": [ + "image/png" + ], + "name": "files", + "headers": [] + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "167", + "kind": "model", + "name": "FileWithHttpPartSpecificContentTypeRequest", "namespace": "Payload.MultiPart", - "crossLanguageDefinitionId": "Payload.MultiPart.FileWithHttpPartOptionalContentTypeRequest", + "crossLanguageDefinitionId": "Payload.MultiPart.FileWithHttpPartSpecificContentTypeRequest", "usage": "Input,MultipartFormData", "decorators": [], "serializationOptions": {}, "properties": [ { - "$id": "143", + "$id": "168", "kind": "property", "name": "profileImage", "serializedName": "profileImage", "type": { - "$id": "144", + "$id": "169", "kind": "model", - "name": "FileOptionalContentType", + "name": "FileSpecificContentType", "namespace": "Payload.MultiPart", - "crossLanguageDefinitionId": "Payload.MultiPart.FileOptionalContentType", + "crossLanguageDefinitionId": "Payload.MultiPart.FileSpecificContentType", "usage": "Input", "decorators": [], "serializationOptions": {}, "baseModel": { - "$ref": "110" + "$ref": "126" }, "properties": [ { - "$id": "145", + "$id": "170", "kind": "property", "name": "filename", "type": { - "$id": "146", + "$id": "171", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1771,7 +2048,23 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FileOptionalContentType.filename", + "crossLanguageDefinitionId": "Payload.MultiPart.FileSpecificContentType.filename", + "serializationOptions": {}, + "isHttpMetadata": false + }, + { + "$id": "172", + "kind": "property", + "name": "contentType", + "type": { + "$ref": "5" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.MultiPart.FileSpecificContentType.contentType", "serializationOptions": {}, "isHttpMetadata": false } @@ -1782,16 +2075,16 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FileWithHttpPartOptionalContentTypeRequest.profileImage", + "crossLanguageDefinitionId": "Payload.MultiPart.FileWithHttpPartSpecificContentTypeRequest.profileImage", "serializationOptions": { "multipart": { "isFilePart": true, "isMulti": false, "filename": { - "$id": "147", + "$id": "173", "apiVersions": [], "type": { - "$id": "148", + "$id": "174", "kind": "string", "decorators": [], "doc": "A sequence of textual characters.", @@ -1803,7 +2096,7 @@ "optional": false, "isApiVersionParam": false, "onClient": false, - "crossLanguageDefinitionId": "Payload.MultiPart.FileOptionalContentType.filename", + "crossLanguageDefinitionId": "Payload.MultiPart.FileSpecificContentType.filename", "decorators": [], "visibility": [ 1, @@ -1821,24 +2114,30 @@ "serializationOptions": {} }, "contentType": { - "$id": "149", - "doc": "The allowed media (MIME) types of the file contents.\n\nIn file bodies, this value comes from the `Content-Type` header of the request or response. In JSON bodies,\nthis value is serialized as a field in the response.\n\nNOTE: this is not _necessarily_ the same as the `Content-Type` header of the request or response, but\nit will be for file bodies. It may be different if the file is serialized as a JSON object. It always refers to the\n_contents_ of the file, and not necessarily the way the file itself is transmitted or serialized.", - "summary": "The allowed media (MIME) types of the file contents.", + "$id": "175", "apiVersions": [], "type": { - "$id": "150", - "kind": "string", + "$id": "176", + "kind": "constant", "decorators": [], - "doc": "A sequence of textual characters.", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string" + "value": "image/jpg", + "valueType": { + "$id": "177", + "kind": "string", + "decorators": [], + "doc": "A sequence of textual characters.", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "name": "FileSpecificContentTypeContentType", + "isGeneratedName": true }, "name": "contentType", "isGeneratedName": false, - "optional": true, + "optional": false, "isApiVersionParam": false, "onClient": false, - "crossLanguageDefinitionId": "TypeSpec.Http.File.contentType", + "crossLanguageDefinitionId": "Payload.MultiPart.FileSpecificContentType.contentType", "decorators": [], "visibility": [ 1, @@ -1856,7 +2155,7 @@ "serializationOptions": {} }, "defaultContentTypes": [ - "*/*" + "image/jpg" ], "name": "profileImage", "headers": [] @@ -1867,72 +2166,259 @@ ] }, { - "$ref": "144" + "$ref": "169" }, { - "$id": "151", + "$id": "178", "kind": "model", - "name": "FloatRequest", - "namespace": "Payload.MultiPart.FormData.HttpParts.NonString", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.NonString.float.Request.anonymous", + "name": "FileWithHttpPartRequiredContentTypeRequest", + "namespace": "Payload.MultiPart", + "crossLanguageDefinitionId": "Payload.MultiPart.FileWithHttpPartRequiredContentTypeRequest", "usage": "Input,MultipartFormData", "decorators": [], "serializationOptions": {}, "properties": [ { - "$id": "152", + "$id": "179", "kind": "property", - "name": "temperature", - "serializedName": "temperature", + "name": "profileImage", + "serializedName": "profileImage", "type": { - "$id": "153", - "kind": "float64", - "name": "float64", - "crossLanguageDefinitionId": "TypeSpec.float64", - "decorators": [] + "$ref": "125" }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.NonString.float.Request.anonymous.temperature", + "crossLanguageDefinitionId": "Payload.MultiPart.FileWithHttpPartRequiredContentTypeRequest.profileImage", "serializationOptions": { "multipart": { - "isFilePart": false, + "isFilePart": true, "isMulti": false, + "filename": { + "$ref": "137" + }, "contentType": { - "$id": "154", - "apiVersions": [], - "type": { - "$id": "155", - "kind": "constant", - "decorators": [], - "value": "text/plain", - "valueType": { - "$id": "156", - "kind": "string", - "decorators": [], - "doc": "A sequence of textual characters.", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string" - }, - "name": "FloatRequestTemperatureContentType", - "isGeneratedName": true - }, - "name": "contentType", - "isGeneratedName": false, - "optional": false, - "isApiVersionParam": false, - "onClient": false, - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.NonString.float.Request.temperature.anonymous.contentType", - "decorators": [], - "visibility": [ - 1, - 2, - 4, - 8, - 16 + "$ref": "139" + }, + "defaultContentTypes": [ + "*/*" + ], + "name": "profileImage", + "headers": [] + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "180", + "kind": "model", + "name": "FileWithHttpPartOptionalContentTypeRequest", + "namespace": "Payload.MultiPart", + "crossLanguageDefinitionId": "Payload.MultiPart.FileWithHttpPartOptionalContentTypeRequest", + "usage": "Input,MultipartFormData", + "decorators": [], + "serializationOptions": {}, + "properties": [ + { + "$id": "181", + "kind": "property", + "name": "profileImage", + "serializedName": "profileImage", + "type": { + "$id": "182", + "kind": "model", + "name": "FileOptionalContentType", + "namespace": "Payload.MultiPart", + "crossLanguageDefinitionId": "Payload.MultiPart.FileOptionalContentType", + "usage": "Input", + "decorators": [], + "serializationOptions": {}, + "baseModel": { + "$ref": "126" + }, + "properties": [ + { + "$id": "183", + "kind": "property", + "name": "filename", + "type": { + "$id": "184", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.MultiPart.FileOptionalContentType.filename", + "serializationOptions": {}, + "isHttpMetadata": false + } + ] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.MultiPart.FileWithHttpPartOptionalContentTypeRequest.profileImage", + "serializationOptions": { + "multipart": { + "isFilePart": true, + "isMulti": false, + "filename": { + "$id": "185", + "apiVersions": [], + "type": { + "$id": "186", + "kind": "string", + "decorators": [], + "doc": "A sequence of textual characters.", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "name": "filename", + "isGeneratedName": false, + "optional": false, + "isApiVersionParam": false, + "onClient": false, + "crossLanguageDefinitionId": "Payload.MultiPart.FileOptionalContentType.filename", + "decorators": [], + "visibility": [ + 1, + 2, + 4, + 8, + 16 + ], + "access": "public", + "flatten": false, + "kind": "property", + "discriminator": false, + "serializedName": "filename", + "isMultipartFileInput": false, + "serializationOptions": {} + }, + "contentType": { + "$id": "187", + "doc": "The allowed media (MIME) types of the file contents.\n\nIn file bodies, this value comes from the `Content-Type` header of the request or response. In JSON bodies,\nthis value is serialized as a field in the response.\n\nNOTE: this is not _necessarily_ the same as the `Content-Type` header of the request or response, but\nit will be for file bodies. It may be different if the file is serialized as a JSON object. It always refers to the\n_contents_ of the file, and not necessarily the way the file itself is transmitted or serialized.", + "summary": "The allowed media (MIME) types of the file contents.", + "apiVersions": [], + "type": { + "$id": "188", + "kind": "string", + "decorators": [], + "doc": "A sequence of textual characters.", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "name": "contentType", + "isGeneratedName": false, + "optional": true, + "isApiVersionParam": false, + "onClient": false, + "crossLanguageDefinitionId": "TypeSpec.Http.File.contentType", + "decorators": [], + "visibility": [ + 1, + 2, + 4, + 8, + 16 + ], + "access": "public", + "flatten": false, + "kind": "property", + "discriminator": false, + "serializedName": "contentType", + "isMultipartFileInput": false, + "serializationOptions": {} + }, + "defaultContentTypes": [ + "*/*" + ], + "name": "profileImage", + "headers": [] + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$ref": "182" + }, + { + "$id": "189", + "kind": "model", + "name": "FloatRequest", + "namespace": "Payload.MultiPart.FormData.HttpParts.NonString", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.NonString.float.Request.anonymous", + "usage": "Input,MultipartFormData", + "decorators": [], + "serializationOptions": {}, + "properties": [ + { + "$id": "190", + "kind": "property", + "name": "temperature", + "serializedName": "temperature", + "type": { + "$id": "191", + "kind": "float64", + "name": "float64", + "crossLanguageDefinitionId": "TypeSpec.float64", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.NonString.float.Request.anonymous.temperature", + "serializationOptions": { + "multipart": { + "isFilePart": false, + "isMulti": false, + "contentType": { + "$id": "192", + "apiVersions": [], + "type": { + "$id": "193", + "kind": "constant", + "decorators": [], + "value": "text/plain", + "valueType": { + "$id": "194", + "kind": "string", + "decorators": [], + "doc": "A sequence of textual characters.", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "name": "FloatRequestTemperatureContentType", + "isGeneratedName": true + }, + "name": "contentType", + "isGeneratedName": false, + "optional": false, + "isApiVersionParam": false, + "onClient": false, + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.NonString.float.Request.temperature.anonymous.contentType", + "decorators": [], + "visibility": [ + 1, + 2, + 4, + 8, + 16 ], "access": "public", "flatten": false, @@ -1956,7 +2442,7 @@ ], "clients": [ { - "$id": "157", + "$id": "195", "kind": "client", "name": "MultiPartClient", "namespace": "Payload.MultiPart", @@ -1964,13 +2450,13 @@ "methods": [], "parameters": [ { - "$id": "158", + "$id": "196", "kind": "endpoint", "name": "endpoint", "serializedName": "endpoint", "doc": "Service host", "type": { - "$id": "159", + "$id": "197", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -1981,7 +2467,7 @@ "isEndpoint": true, "defaultValue": { "type": { - "$id": "160", + "$id": "198", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string" @@ -2000,32 +2486,32 @@ "apiVersions": [], "children": [ { - "$id": "161", + "$id": "199", "kind": "client", "name": "FormData", "namespace": "Payload.MultiPart.FormData", "methods": [ { - "$id": "162", + "$id": "200", "kind": "basic", "name": "basic", "accessibility": "public", "apiVersions": [], "doc": "Test content-type: multipart/form-data", "operation": { - "$id": "163", + "$id": "201", "name": "basic", "resourceName": "FormData", "doc": "Test content-type: multipart/form-data", "accessibility": "public", "parameters": [ { - "$id": "164", + "$id": "202", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "type": { - "$ref": "3" + "$ref": "7" }, "isApiVersion": false, "optional": false, @@ -2033,15 +2519,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.basic.contentType" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.basic.contentType", + "methodParameterSegments": [ + { + "$id": "203", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.basic.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "165", + "$id": "204", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "59" + "$ref": "75" }, "isApiVersion": false, "contentTypes": [ @@ -2052,7 +2557,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.basic.body" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.basic.body", + "methodParameterSegments": [ + { + "$id": "205", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "75" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.basic.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2079,38 +2603,10 @@ }, "parameters": [ { - "$id": "166", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.basic.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "203" }, { - "$id": "167", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "59" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.basic.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "205" } ], "response": {}, @@ -2120,26 +2616,26 @@ "crossLanguageDefinitionId": "Payload.MultiPart.FormData.basic" }, { - "$id": "168", + "$id": "206", "kind": "basic", "name": "withWireName", "accessibility": "public", "apiVersions": [], "doc": "Test content-type: multipart/form-data with wire names", "operation": { - "$id": "169", + "$id": "207", "name": "withWireName", "resourceName": "FormData", "doc": "Test content-type: multipart/form-data with wire names", "accessibility": "public", "parameters": [ { - "$id": "170", + "$id": "208", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "type": { - "$ref": "7" + "$ref": "11" }, "isApiVersion": false, "optional": false, @@ -2147,15 +2643,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.withWireName.contentType" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.withWireName.contentType", + "methodParameterSegments": [ + { + "$id": "209", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "11" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.withWireName.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "171", + "$id": "210", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "64" + "$ref": "80" }, "isApiVersion": false, "contentTypes": [ @@ -2166,9 +2681,28 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.withWireName.body" - } - ], + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.withWireName.body", + "methodParameterSegments": [ + { + "$id": "211", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "80" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.withWireName.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], "responses": [ { "statusCodes": [ @@ -2193,38 +2727,10 @@ }, "parameters": [ { - "$id": "172", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.withWireName.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "209" }, { - "$id": "173", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "64" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.withWireName.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "211" } ], "response": {}, @@ -2234,26 +2740,26 @@ "crossLanguageDefinitionId": "Payload.MultiPart.FormData.withWireName" }, { - "$id": "174", + "$id": "212", "kind": "basic", "name": "optionalParts", "accessibility": "public", "apiVersions": [], "doc": "Test content-type: multipart/form-data with optional parts", "operation": { - "$id": "175", + "$id": "213", "name": "optionalParts", "resourceName": "FormData", "doc": "Test content-type: multipart/form-data with optional parts", "accessibility": "public", "parameters": [ { - "$id": "176", + "$id": "214", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "type": { - "$ref": "11" + "$ref": "15" }, "isApiVersion": false, "optional": false, @@ -2261,15 +2767,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.optionalParts.contentType" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.optionalParts.contentType", + "methodParameterSegments": [ + { + "$id": "215", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "15" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.optionalParts.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "177", + "$id": "216", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "69" + "$ref": "85" }, "isApiVersion": false, "contentTypes": [ @@ -2280,7 +2805,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.optionalParts.body" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.optionalParts.body", + "methodParameterSegments": [ + { + "$id": "217", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "85" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.optionalParts.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2307,38 +2851,10 @@ }, "parameters": [ { - "$id": "178", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.optionalParts.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "215" }, { - "$id": "179", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "69" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.optionalParts.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "217" } ], "response": {}, @@ -2348,26 +2864,26 @@ "crossLanguageDefinitionId": "Payload.MultiPart.FormData.optionalParts" }, { - "$id": "180", + "$id": "218", "kind": "basic", "name": "fileArrayAndBasic", "accessibility": "public", "apiVersions": [], "doc": "Test content-type: multipart/form-data for mixed scenarios", "operation": { - "$id": "181", + "$id": "219", "name": "fileArrayAndBasic", "resourceName": "FormData", "doc": "Test content-type: multipart/form-data for mixed scenarios", "accessibility": "public", "parameters": [ { - "$id": "182", + "$id": "220", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "type": { - "$ref": "15" + "$ref": "19" }, "isApiVersion": false, "optional": false, @@ -2375,15 +2891,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.fileArrayAndBasic.contentType" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.fileArrayAndBasic.contentType", + "methodParameterSegments": [ + { + "$id": "221", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "19" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.fileArrayAndBasic.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "183", + "$id": "222", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "74" + "$ref": "90" }, "isApiVersion": false, "contentTypes": [ @@ -2394,7 +2929,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.fileArrayAndBasic.body" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.fileArrayAndBasic.body", + "methodParameterSegments": [ + { + "$id": "223", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "90" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.fileArrayAndBasic.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2421,38 +2975,10 @@ }, "parameters": [ { - "$id": "184", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "17" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.fileArrayAndBasic.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "221" }, { - "$id": "185", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "74" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.fileArrayAndBasic.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "223" } ], "response": {}, @@ -2462,26 +2988,26 @@ "crossLanguageDefinitionId": "Payload.MultiPart.FormData.fileArrayAndBasic" }, { - "$id": "186", + "$id": "224", "kind": "basic", "name": "jsonPart", "accessibility": "public", "apiVersions": [], "doc": "Test content-type: multipart/form-data for scenario contains json part and binary part ", "operation": { - "$id": "187", + "$id": "225", "name": "jsonPart", "resourceName": "FormData", "doc": "Test content-type: multipart/form-data for scenario contains json part and binary part ", "accessibility": "public", "parameters": [ { - "$id": "188", + "$id": "226", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "type": { - "$ref": "19" + "$ref": "23" }, "isApiVersion": false, "optional": false, @@ -2489,15 +3015,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.jsonPart.contentType" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.jsonPart.contentType", + "methodParameterSegments": [ + { + "$id": "227", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "23" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.jsonPart.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "189", + "$id": "228", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "86" + "$ref": "102" }, "isApiVersion": false, "contentTypes": [ @@ -2508,7 +3053,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.jsonPart.body" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.jsonPart.body", + "methodParameterSegments": [ + { + "$id": "229", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "102" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.jsonPart.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2535,38 +3099,10 @@ }, "parameters": [ { - "$id": "190", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "21" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.jsonPart.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "227" }, { - "$id": "191", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "86" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.jsonPart.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "229" } ], "response": {}, @@ -2576,26 +3112,26 @@ "crossLanguageDefinitionId": "Payload.MultiPart.FormData.jsonPart" }, { - "$id": "192", + "$id": "230", "kind": "basic", "name": "binaryArrayParts", "accessibility": "public", "apiVersions": [], "doc": "Test content-type: multipart/form-data for scenario contains multi binary parts", "operation": { - "$id": "193", + "$id": "231", "name": "binaryArrayParts", "resourceName": "FormData", "doc": "Test content-type: multipart/form-data for scenario contains multi binary parts", "accessibility": "public", "parameters": [ { - "$id": "194", + "$id": "232", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "type": { - "$ref": "23" + "$ref": "27" }, "isApiVersion": false, "optional": false, @@ -2603,15 +3139,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.binaryArrayParts.contentType" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.binaryArrayParts.contentType", + "methodParameterSegments": [ + { + "$id": "233", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "27" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.binaryArrayParts.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "195", + "$id": "234", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "90" + "$ref": "106" }, "isApiVersion": false, "contentTypes": [ @@ -2622,7 +3177,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.binaryArrayParts.body" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.binaryArrayParts.body", + "methodParameterSegments": [ + { + "$id": "235", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "106" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.binaryArrayParts.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2649,38 +3223,10 @@ }, "parameters": [ { - "$id": "196", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "25" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.binaryArrayParts.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "233" }, { - "$id": "197", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "90" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.binaryArrayParts.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "235" } ], "response": {}, @@ -2690,26 +3236,26 @@ "crossLanguageDefinitionId": "Payload.MultiPart.FormData.binaryArrayParts" }, { - "$id": "198", + "$id": "236", "kind": "basic", "name": "multiBinaryParts", "accessibility": "public", "apiVersions": [], "doc": "Test content-type: multipart/form-data for scenario contains multi binary parts", "operation": { - "$id": "199", + "$id": "237", "name": "multiBinaryParts", "resourceName": "FormData", "doc": "Test content-type: multipart/form-data for scenario contains multi binary parts", "accessibility": "public", "parameters": [ { - "$id": "200", + "$id": "238", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "type": { - "$ref": "27" + "$ref": "31" }, "isApiVersion": false, "optional": false, @@ -2717,15 +3263,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.multiBinaryParts.contentType" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.multiBinaryParts.contentType", + "methodParameterSegments": [ + { + "$id": "239", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "31" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.multiBinaryParts.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "201", + "$id": "240", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "96" + "$ref": "112" }, "isApiVersion": false, "contentTypes": [ @@ -2736,7 +3301,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.multiBinaryParts.body" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.multiBinaryParts.body", + "methodParameterSegments": [ + { + "$id": "241", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "112" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.multiBinaryParts.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2763,38 +3347,10 @@ }, "parameters": [ { - "$id": "202", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "29" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.multiBinaryParts.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "239" }, { - "$id": "203", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "96" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.multiBinaryParts.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "241" } ], "response": {}, @@ -2804,26 +3360,26 @@ "crossLanguageDefinitionId": "Payload.MultiPart.FormData.multiBinaryParts" }, { - "$id": "204", + "$id": "242", "kind": "basic", "name": "checkFileNameAndContentType", "accessibility": "public", "apiVersions": [], "doc": "Test content-type: multipart/form-data", "operation": { - "$id": "205", + "$id": "243", "name": "checkFileNameAndContentType", "resourceName": "FormData", "doc": "Test content-type: multipart/form-data", "accessibility": "public", "parameters": [ { - "$id": "206", + "$id": "244", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "type": { - "$ref": "31" + "$ref": "35" }, "isApiVersion": false, "optional": false, @@ -2831,15 +3387,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.checkFileNameAndContentType.contentType" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.checkFileNameAndContentType.contentType", + "methodParameterSegments": [ + { + "$id": "245", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "35" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.checkFileNameAndContentType.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "207", + "$id": "246", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "59" + "$ref": "75" }, "isApiVersion": false, "contentTypes": [ @@ -2850,7 +3425,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.checkFileNameAndContentType.body" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.checkFileNameAndContentType.body", + "methodParameterSegments": [ + { + "$id": "247", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "75" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.checkFileNameAndContentType.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2877,38 +3471,10 @@ }, "parameters": [ { - "$id": "208", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "33" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.checkFileNameAndContentType.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "245" }, { - "$id": "209", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "59" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.checkFileNameAndContentType.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "247" } ], "response": {}, @@ -2918,26 +3484,26 @@ "crossLanguageDefinitionId": "Payload.MultiPart.FormData.checkFileNameAndContentType" }, { - "$id": "210", + "$id": "248", "kind": "basic", "name": "anonymousModel", "accessibility": "public", "apiVersions": [], "doc": "Test content-type: multipart/form-data", "operation": { - "$id": "211", + "$id": "249", "name": "anonymousModel", "resourceName": "FormData", "doc": "Test content-type: multipart/form-data", "accessibility": "public", "parameters": [ { - "$id": "212", + "$id": "250", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "type": { - "$ref": "35" + "$ref": "39" }, "isApiVersion": false, "optional": false, @@ -2945,15 +3511,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.anonymousModel.contentType" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.anonymousModel.contentType", + "methodParameterSegments": [ + { + "$id": "251", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "39" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.anonymousModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "213", + "$id": "252", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "101" + "$ref": "117" }, "isApiVersion": false, "contentTypes": [ @@ -2964,7 +3549,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.anonymousModel.body" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.anonymousModel.body", + "methodParameterSegments": [ + { + "$id": "253", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "117" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.anonymousModel.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2991,38 +3595,10 @@ }, "parameters": [ { - "$id": "214", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "37" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.anonymousModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "251" }, { - "$id": "215", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "101" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.anonymousModel.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "253" } ], "response": {}, @@ -3034,13 +3610,13 @@ ], "parameters": [ { - "$id": "216", + "$id": "254", "kind": "endpoint", "name": "endpoint", "serializedName": "endpoint", "doc": "Service host", "type": { - "$id": "217", + "$id": "255", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -3051,7 +3627,7 @@ "isEndpoint": true, "defaultValue": { "type": { - "$id": "218", + "$id": "256", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string" @@ -3069,36 +3645,36 @@ "crossLanguageDefinitionId": "Payload.MultiPart.FormData", "apiVersions": [], "parent": { - "$ref": "157" + "$ref": "195" }, "children": [ { - "$id": "219", + "$id": "257", "kind": "client", "name": "HttpParts", "namespace": "Payload.MultiPart.FormData.HttpParts", "methods": [ { - "$id": "220", + "$id": "258", "kind": "basic", "name": "jsonArrayAndFileArray", "accessibility": "public", "apiVersions": [], "doc": "Test content-type: multipart/form-data for mixed scenarios", "operation": { - "$id": "221", + "$id": "259", "name": "jsonArrayAndFileArray", "resourceName": "HttpParts", "doc": "Test content-type: multipart/form-data for mixed scenarios", "accessibility": "public", "parameters": [ { - "$id": "222", + "$id": "260", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "type": { - "$ref": "39" + "$ref": "43" }, "isApiVersion": false, "optional": false, @@ -3106,15 +3682,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray.contentType" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray.contentType", + "methodParameterSegments": [ + { + "$id": "261", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "43" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "223", + "$id": "262", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "104" + "$ref": "120" }, "isApiVersion": false, "contentTypes": [ @@ -3125,7 +3720,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray.body" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray.body", + "methodParameterSegments": [ + { + "$id": "263", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "120" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3152,38 +3766,10 @@ }, "parameters": [ { - "$id": "224", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "41" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "261" }, { - "$id": "225", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "104" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "263" } ], "response": {}, @@ -3195,13 +3781,13 @@ ], "parameters": [ { - "$id": "226", + "$id": "264", "kind": "endpoint", "name": "endpoint", "serializedName": "endpoint", "doc": "Service host", "type": { - "$id": "227", + "$id": "265", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -3212,7 +3798,7 @@ "isEndpoint": true, "defaultValue": { "type": { - "$id": "228", + "$id": "266", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string" @@ -3230,36 +3816,36 @@ "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts", "apiVersions": [], "parent": { - "$ref": "161" + "$ref": "199" }, "children": [ { - "$id": "229", + "$id": "267", "kind": "client", "name": "ContentType", "namespace": "Payload.MultiPart.FormData.HttpParts.ContentType", "methods": [ { - "$id": "230", + "$id": "268", "kind": "basic", "name": "imageJpegContentType", "accessibility": "public", "apiVersions": [], "doc": "Test content-type: multipart/form-data", "operation": { - "$id": "231", + "$id": "269", "name": "imageJpegContentType", "resourceName": "ContentType", "doc": "Test content-type: multipart/form-data", "accessibility": "public", "parameters": [ { - "$id": "232", + "$id": "270", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "type": { - "$ref": "43" + "$ref": "47" }, "isApiVersion": false, "optional": false, @@ -3267,15 +3853,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType.contentType" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType.contentType", + "methodParameterSegments": [ + { + "$id": "271", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "47" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "233", + "$id": "272", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "129" + "$ref": "167" }, "isApiVersion": false, "contentTypes": [ @@ -3286,7 +3891,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType.body" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType.body", + "methodParameterSegments": [ + { + "$id": "273", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "167" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3313,38 +3937,10 @@ }, "parameters": [ { - "$id": "234", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "45" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "271" }, { - "$id": "235", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "129" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "273" } ], "response": {}, @@ -3354,26 +3950,26 @@ "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType" }, { - "$id": "236", + "$id": "274", "kind": "basic", "name": "requiredContentType", "accessibility": "public", "apiVersions": [], "doc": "Test content-type: multipart/form-data", "operation": { - "$id": "237", + "$id": "275", "name": "requiredContentType", "resourceName": "ContentType", "doc": "Test content-type: multipart/form-data", "accessibility": "public", "parameters": [ { - "$id": "238", + "$id": "276", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "type": { - "$ref": "47" + "$ref": "51" }, "isApiVersion": false, "optional": false, @@ -3381,15 +3977,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType.contentType" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType.contentType", + "methodParameterSegments": [ + { + "$id": "277", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "51" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "239", + "$id": "278", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "140" + "$ref": "178" }, "isApiVersion": false, "contentTypes": [ @@ -3400,7 +4015,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType.body" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType.body", + "methodParameterSegments": [ + { + "$id": "279", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "178" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3427,38 +4061,10 @@ }, "parameters": [ { - "$id": "240", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "49" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "277" }, { - "$id": "241", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "140" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "279" } ], "response": {}, @@ -3468,26 +4074,26 @@ "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType" }, { - "$id": "242", + "$id": "280", "kind": "basic", "name": "optionalContentType", "accessibility": "public", "apiVersions": [], "doc": "Test content-type: multipart/form-data for optional content type", "operation": { - "$id": "243", + "$id": "281", "name": "optionalContentType", "resourceName": "ContentType", "doc": "Test content-type: multipart/form-data for optional content type", "accessibility": "public", "parameters": [ { - "$id": "244", + "$id": "282", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "type": { - "$ref": "51" + "$ref": "55" }, "isApiVersion": false, "optional": false, @@ -3495,15 +4101,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType.contentType" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType.contentType", + "methodParameterSegments": [ + { + "$id": "283", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "55" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "245", + "$id": "284", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "142" + "$ref": "180" }, "isApiVersion": false, "contentTypes": [ @@ -3514,7 +4139,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType.body" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType.body", + "methodParameterSegments": [ + { + "$id": "285", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "180" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3541,38 +4185,10 @@ }, "parameters": [ { - "$id": "246", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "53" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "283" }, { - "$id": "247", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "142" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "285" } ], "response": {}, @@ -3584,13 +4200,13 @@ ], "parameters": [ { - "$id": "248", + "$id": "286", "kind": "endpoint", "name": "endpoint", "serializedName": "endpoint", "doc": "Service host", "type": { - "$id": "249", + "$id": "287", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -3601,7 +4217,7 @@ "isEndpoint": true, "defaultValue": { "type": { - "$id": "250", + "$id": "288", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string" @@ -3619,37 +4235,37 @@ "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.ContentType", "apiVersions": [], "parent": { - "$ref": "219" + "$ref": "257" }, "isMultiServiceClient": false }, { - "$id": "251", + "$id": "289", "kind": "client", "name": "NonString", "namespace": "Payload.MultiPart.FormData.HttpParts.NonString", "methods": [ { - "$id": "252", + "$id": "290", "kind": "basic", "name": "float", "accessibility": "public", "apiVersions": [], "doc": "Test content-type: multipart/form-data for non string", "operation": { - "$id": "253", + "$id": "291", "name": "float", "resourceName": "NonString", "doc": "Test content-type: multipart/form-data for non string", "accessibility": "public", "parameters": [ { - "$id": "254", + "$id": "292", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "type": { - "$ref": "55" + "$ref": "59" }, "isApiVersion": false, "optional": false, @@ -3657,15 +4273,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.NonString.float.contentType" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.NonString.float.contentType", + "methodParameterSegments": [ + { + "$id": "293", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "59" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.NonString.float.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "255", + "$id": "294", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "151" + "$ref": "189" }, "isApiVersion": false, "contentTypes": [ @@ -3676,7 +4311,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.NonString.float.body" + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.NonString.float.body", + "methodParameterSegments": [ + { + "$id": "295", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "189" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.NonString.float.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3703,38 +4357,10 @@ }, "parameters": [ { - "$id": "256", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "57" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.NonString.float.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "293" }, { - "$id": "257", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "151" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.NonString.float.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "295" } ], "response": {}, @@ -3746,13 +4372,13 @@ ], "parameters": [ { - "$id": "258", + "$id": "296", "kind": "endpoint", "name": "endpoint", "serializedName": "endpoint", "doc": "Service host", "type": { - "$id": "259", + "$id": "297", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -3763,7 +4389,7 @@ "isEndpoint": true, "defaultValue": { "type": { - "$id": "260", + "$id": "298", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string" @@ -3781,12 +4407,426 @@ "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.NonString", "apiVersions": [], "parent": { - "$ref": "219" + "$ref": "257" }, "isMultiServiceClient": false } ], "isMultiServiceClient": false + }, + { + "$id": "299", + "kind": "client", + "name": "File", + "namespace": "Payload.MultiPart.FormData.File", + "methods": [ + { + "$id": "300", + "kind": "basic", + "name": "uploadFileSpecificContentType", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "301", + "name": "uploadFileSpecificContentType", + "resourceName": "File", + "accessibility": "public", + "parameters": [ + { + "$id": "302", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "63" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileSpecificContentType.contentType", + "methodParameterSegments": [ + { + "$id": "303", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "63" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileSpecificContentType.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "304", + "kind": "body", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "145" + }, + "isApiVersion": false, + "contentTypes": [ + "multipart/form-data" + ], + "defaultContentType": "multipart/form-data", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileSpecificContentType.body", + "methodParameterSegments": [ + { + "$id": "305", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "145" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileSpecificContentType.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "POST", + "uri": "{endpoint}", + "path": "/multipart/form-data/file/specific-content-type", + "requestMediaTypes": [ + "multipart/form-data" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileSpecificContentType", + "decorators": [], + "namespace": "Payload.MultiPart.FormData.File" + }, + "parameters": [ + { + "$ref": "303" + }, + { + "$ref": "305" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileSpecificContentType" + }, + { + "$id": "306", + "kind": "basic", + "name": "uploadFileRequiredFilename", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "307", + "name": "uploadFileRequiredFilename", + "resourceName": "File", + "accessibility": "public", + "parameters": [ + { + "$id": "308", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "67" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileRequiredFilename.contentType", + "methodParameterSegments": [ + { + "$id": "309", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "67" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileRequiredFilename.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "310", + "kind": "body", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "157" + }, + "isApiVersion": false, + "contentTypes": [ + "multipart/form-data" + ], + "defaultContentType": "multipart/form-data", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileRequiredFilename.body", + "methodParameterSegments": [ + { + "$id": "311", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "157" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileRequiredFilename.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "POST", + "uri": "{endpoint}", + "path": "/multipart/form-data/file/required-filename", + "requestMediaTypes": [ + "multipart/form-data" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileRequiredFilename", + "decorators": [], + "namespace": "Payload.MultiPart.FormData.File" + }, + "parameters": [ + { + "$ref": "309" + }, + { + "$ref": "311" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileRequiredFilename" + }, + { + "$id": "312", + "kind": "basic", + "name": "uploadFileArray", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "313", + "name": "uploadFileArray", + "resourceName": "File", + "accessibility": "public", + "parameters": [ + { + "$id": "314", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "71" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileArray.contentType", + "methodParameterSegments": [ + { + "$id": "315", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "71" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileArray.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "316", + "kind": "body", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "164" + }, + "isApiVersion": false, + "contentTypes": [ + "multipart/form-data" + ], + "defaultContentType": "multipart/form-data", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileArray.body", + "methodParameterSegments": [ + { + "$id": "317", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "164" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileArray.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "POST", + "uri": "{endpoint}", + "path": "/multipart/form-data/file/file-array", + "requestMediaTypes": [ + "multipart/form-data" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileArray", + "decorators": [], + "namespace": "Payload.MultiPart.FormData.File" + }, + "parameters": [ + { + "$ref": "315" + }, + { + "$ref": "317" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.uploadFileArray" + } + ], + "parameters": [ + { + "$id": "318", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "319", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "320", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.MultiPart.FormData.File", + "apiVersions": [], + "parent": { + "$ref": "199" + }, + "isMultiServiceClient": false } ], "isMultiServiceClient": false diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/Payload.Pageable.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/Payload.Pageable.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/Payload.Pageable.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/Payload.Pageable.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/Payload.Pageable.sln deleted file mode 100644 index c8bee499191..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/Payload.Pageable.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Payload.Pageable", "src\Payload.Pageable.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/Payload.Pageable.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/Payload.Pageable.slnx new file mode 100644 index 00000000000..be24ae8e74d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/Payload.Pageable.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/Filter.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/Filter.Serialization.cs new file mode 100644 index 00000000000..a9b312823ee --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/Filter.Serialization.cs @@ -0,0 +1,36 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Text.Json; + +namespace Payload.Pageable._ServerDrivenPagination.AlternateInitialVerb +{ + public partial class Filter : IJsonModel + { + internal Filter() => throw null; + + protected virtual Filter PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + Filter IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(Filter filter) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Filter IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Filter JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/Filter.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/Filter.cs new file mode 100644 index 00000000000..fdfc6047811 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/Filter.cs @@ -0,0 +1,13 @@ +// + +#nullable disable + +namespace Payload.Pageable._ServerDrivenPagination.AlternateInitialVerb +{ + public partial class Filter + { + public Filter(string filterProperty) => throw null; + + public string FilterProperty => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/PayloadPageableContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/PayloadPageableContext.cs index 16ab1269624..347e4c01fa3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/PayloadPageableContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/PayloadPageableContext.cs @@ -5,11 +5,14 @@ using System.ClientModel.Primitives; using Payload.Pageable._PageSize; using Payload.Pageable._ServerDrivenPagination; +using Payload.Pageable._ServerDrivenPagination.AlternateInitialVerb; using Payload.Pageable._ServerDrivenPagination.ContinuationToken; namespace Payload.Pageable { + [ModelReaderWriterBuildable(typeof(Filter))] [ModelReaderWriterBuildable(typeof(Pet))] + [ModelReaderWriterBuildable(typeof(XmlPet))] public partial class PayloadPageableContext : ModelReaderWriterContext { } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/Pet.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/Pet.Serialization.cs index 7f26f9a9876..05717e21831 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/Pet.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/Pet.Serialization.cs @@ -12,22 +12,22 @@ public partial class Pet : IJsonModel { internal Pet() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual Pet PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Pet IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual Pet JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Pet IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Pet IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual Pet PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Pet IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual Pet JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/XmlPet.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/XmlPet.Serialization.cs new file mode 100644 index 00000000000..159d4616768 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/XmlPet.Serialization.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; + +namespace Payload.Pageable +{ + public partial class XmlPet : IPersistableModel + { + internal XmlPet() => throw null; + + protected virtual XmlPet PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + XmlPet IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/XmlPet.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/XmlPet.cs new file mode 100644 index 00000000000..c5d4938028d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/Models/XmlPet.cs @@ -0,0 +1,13 @@ +// + +#nullable disable + +namespace Payload.Pageable +{ + public partial class XmlPet + { + public string Id => throw null; + + public string Name => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PageSize.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PageSize.cs index aa4b7b3ce6a..1ba387d0819 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PageSize.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PageSize.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class PageSize { protected PageSize() => throw null; + internal PageSize(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual CollectionResult GetWithoutContinuation(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PageableClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PageableClient.cs index 61121f24241..3b78a1ed79c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PageableClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PageableClient.cs @@ -4,8 +4,10 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using Payload.Pageable._PageSize; using Payload.Pageable._ServerDrivenPagination; +using Payload.Pageable._XmlPagination; namespace Payload.Pageable { @@ -13,12 +15,19 @@ public partial class PageableClient { public PageableClient() : this(new Uri("http://localhost:3000"), new PageableClientOptions()) => throw null; - public PageableClient(Uri endpoint, PageableClientOptions options) => throw null; + internal PageableClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, PageableClientOptions options) => throw null; + + public PageableClient(Uri endpoint, PageableClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public PageableClient(PageableClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; public virtual ServerDrivenPagination GetServerDrivenPaginationClient() => throw null; public virtual PageSize GetPageSizeClient() => throw null; + + public virtual XmlPagination GetXmlPaginationClient() => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PageableClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PageableClientOptions.cs index a852c495b1e..42a316d9908 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PageableClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PageableClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Payload.Pageable { public partial class PageableClientOptions : ClientPipelineOptions { + public PageableClientOptions() => throw null; + + [Experimental("SCME0002")] + internal PageableClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PageableClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PageableClientSettings.cs new file mode 100644 index 00000000000..f1e6a9393e2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PageableClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Payload.Pageable +{ + [Experimental("SCME0002")] + public partial class PageableClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public PageableClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PayloadPageableModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PayloadPageableModelFactory.cs index a49e5ee7889..0b66e798a05 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PayloadPageableModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/PayloadPageableModelFactory.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using Payload.Pageable._PageSize; using Payload.Pageable._ServerDrivenPagination; +using Payload.Pageable._ServerDrivenPagination.AlternateInitialVerb; using Payload.Pageable._ServerDrivenPagination.ContinuationToken; namespace Payload.Pageable @@ -14,5 +15,9 @@ public static partial class PayloadPageableModelFactory { public static Pet Pet(string id = default, string name = default) => throw null; + + public static XmlPet XmlPet(string id = default, string name = default) => throw null; + + public static Filter Filter(string filterProperty = default) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/ServerDrivenPagination.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/ServerDrivenPagination.cs index b611ba4910d..3d0c9d66977 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/ServerDrivenPagination.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/ServerDrivenPagination.cs @@ -2,10 +2,12 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; using Payload.Pageable; +using Payload.Pageable._ServerDrivenPagination.AlternateInitialVerb; using Payload.Pageable._ServerDrivenPagination.ContinuationToken; namespace Payload.Pageable._ServerDrivenPagination @@ -14,6 +16,8 @@ public partial class ServerDrivenPagination { protected ServerDrivenPagination() => throw null; + internal ServerDrivenPagination(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual CollectionResult Link(RequestOptions options) => throw null; @@ -40,6 +44,8 @@ public partial class ServerDrivenPagination public virtual AsyncCollectionResult NestedLinkAsync(CancellationToken cancellationToken = default) => throw null; + public virtual ServerDrivenPaginationAlternateInitialVerb GetServerDrivenPaginationAlternateInitialVerbClient() => throw null; + public virtual ServerDrivenPaginationContinuationToken GetServerDrivenPaginationContinuationTokenClient() => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/ServerDrivenPaginationAlternateInitialVerb.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/ServerDrivenPaginationAlternateInitialVerb.cs new file mode 100644 index 00000000000..29706308ee7 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/ServerDrivenPaginationAlternateInitialVerb.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using Payload.Pageable; + +namespace Payload.Pageable._ServerDrivenPagination.AlternateInitialVerb +{ + public partial class ServerDrivenPaginationAlternateInitialVerb + { + protected ServerDrivenPaginationAlternateInitialVerb() => throw null; + + internal ServerDrivenPaginationAlternateInitialVerb(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual CollectionResult Post(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual AsyncCollectionResult PostAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual CollectionResult Post(Filter body, CancellationToken cancellationToken = default) => throw null; + + public virtual AsyncCollectionResult PostAsync(Filter body, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/ServerDrivenPaginationContinuationToken.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/ServerDrivenPaginationContinuationToken.cs index 5c48d40f9b3..928eaab911f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/ServerDrivenPaginationContinuationToken.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/ServerDrivenPaginationContinuationToken.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class ServerDrivenPaginationContinuationToken { protected ServerDrivenPaginationContinuationToken() => throw null; + internal ServerDrivenPaginationContinuationToken(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual CollectionResult RequestQueryResponseBody(string token, string foo, string bar, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/XmlPagination.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/XmlPagination.cs new file mode 100644 index 00000000000..edbc61168f7 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/XmlPagination.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using Payload.Pageable; + +namespace Payload.Pageable._XmlPagination +{ + public partial class XmlPagination + { + protected XmlPagination() => throw null; + + internal XmlPagination(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual CollectionResult GetWithContinuation(string marker, RequestOptions options) => throw null; + + public virtual AsyncCollectionResult GetWithContinuationAsync(string marker, RequestOptions options) => throw null; + + public virtual CollectionResult GetWithContinuation(string marker = default, CancellationToken cancellationToken = default) => throw null; + + public virtual AsyncCollectionResult GetWithContinuationAsync(string marker = default, CancellationToken cancellationToken = default) => throw null; + + public virtual CollectionResult GetWithNextLink(RequestOptions options) => throw null; + + public virtual AsyncCollectionResult GetWithNextLinkAsync(RequestOptions options) => throw null; + + public virtual CollectionResult GetWithNextLink(CancellationToken cancellationToken = default) => throw null; + + public virtual AsyncCollectionResult GetWithNextLinkAsync(CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..52a7a7fb073 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "PageableClient": { + "type": "object", + "description": "Configuration for PageableClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/pageableClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "pageableClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Payload.Pageable.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Payload.Pageable.csproj index 17be1ba87e5..9fdeae7e0a8 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Payload.Pageable.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Payload.Pageable.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/tspCodeModel.json index d988694b345..8295c355212 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/tspCodeModel.json @@ -54,7 +54,7 @@ { "$id": "7", "kind": "constant", - "name": "requestQueryResponseBodyContentType", + "name": "postContentType", "namespace": "", "usage": "None", "valueType": { @@ -70,7 +70,7 @@ { "$id": "9", "kind": "constant", - "name": "requestHeaderResponseBodyContentType", + "name": "postContentType1", "namespace": "", "usage": "None", "valueType": { @@ -86,7 +86,7 @@ { "$id": "11", "kind": "constant", - "name": "requestQueryResponseHeaderContentType", + "name": "requestQueryResponseBodyContentType", "namespace": "", "usage": "None", "valueType": { @@ -102,7 +102,7 @@ { "$id": "13", "kind": "constant", - "name": "requestHeaderResponseHeaderContentType", + "name": "requestHeaderResponseBodyContentType", "namespace": "", "usage": "None", "valueType": { @@ -118,7 +118,7 @@ { "$id": "15", "kind": "constant", - "name": "requestQueryNestedResponseBodyContentType", + "name": "requestQueryResponseHeaderContentType", "namespace": "", "usage": "None", "valueType": { @@ -134,7 +134,7 @@ { "$id": "17", "kind": "constant", - "name": "requestHeaderNestedResponseBodyContentType", + "name": "requestHeaderResponseHeaderContentType", "namespace": "", "usage": "None", "valueType": { @@ -150,7 +150,7 @@ { "$id": "19", "kind": "constant", - "name": "listWithoutContinuationContentType", + "name": "requestQueryNestedResponseBodyContentType", "namespace": "", "usage": "None", "valueType": { @@ -166,7 +166,7 @@ { "$id": "21", "kind": "constant", - "name": "listWithPageSizeContentType", + "name": "requestHeaderNestedResponseBodyContentType", "namespace": "", "usage": "None", "valueType": { @@ -178,11 +178,107 @@ }, "value": "application/json", "decorators": [] + }, + { + "$id": "23", + "kind": "constant", + "name": "listWithoutContinuationContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "24", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "25", + "kind": "constant", + "name": "listWithPageSizeContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "26", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "27", + "kind": "constant", + "name": "listWithContinuationContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "28", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "29", + "kind": "constant", + "name": "ListWithContinuationResponseContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "30", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "31", + "kind": "constant", + "name": "listWithNextLinkContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "32", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "33", + "kind": "constant", + "name": "ListWithContinuationResponseContentType1", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "34", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] } ], "models": [ { - "$id": "23", + "$id": "35", "kind": "model", "name": "LinkResponse", "namespace": "Payload.Pageable.ServerDrivenPagination", @@ -196,16 +292,16 @@ }, "properties": [ { - "$id": "24", + "$id": "36", "kind": "property", "name": "pets", "serializedName": "pets", "type": { - "$id": "25", + "$id": "37", "kind": "array", "name": "ArrayPet", "valueType": { - "$id": "26", + "$id": "38", "kind": "model", "name": "Pet", "namespace": "Payload.Pageable", @@ -219,12 +315,12 @@ }, "properties": [ { - "$id": "27", + "$id": "39", "kind": "property", "name": "id", "serializedName": "id", "type": { - "$id": "28", + "$id": "40", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -244,12 +340,12 @@ "isHttpMetadata": false }, { - "$id": "29", + "$id": "41", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "30", + "$id": "42", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -287,12 +383,12 @@ "isHttpMetadata": false }, { - "$id": "31", + "$id": "43", "kind": "property", "name": "next", "serializedName": "next", "type": { - "$id": "32", + "$id": "44", "kind": "url", "name": "url", "crossLanguageDefinitionId": "TypeSpec.url", @@ -314,10 +410,10 @@ ] }, { - "$ref": "26" + "$ref": "38" }, { - "$id": "33", + "$id": "45", "kind": "model", "name": "LinkStringResponse", "namespace": "Payload.Pageable.ServerDrivenPagination", @@ -331,12 +427,12 @@ }, "properties": [ { - "$id": "34", + "$id": "46", "kind": "property", "name": "pets", "serializedName": "pets", "type": { - "$ref": "25" + "$ref": "37" }, "optional": false, "readOnly": false, @@ -352,12 +448,12 @@ "isHttpMetadata": false }, { - "$id": "35", + "$id": "47", "kind": "property", "name": "next", "serializedName": "next", "type": { - "$id": "36", + "$id": "48", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -379,7 +475,7 @@ ] }, { - "$id": "37", + "$id": "49", "kind": "model", "name": "NestedLinkResponse", "namespace": "Payload.Pageable.ServerDrivenPagination", @@ -393,12 +489,12 @@ }, "properties": [ { - "$id": "38", + "$id": "50", "kind": "property", "name": "nestedItems", "serializedName": "nestedItems", "type": { - "$id": "39", + "$id": "51", "kind": "model", "name": "NestedLinkResponseNestedItems", "namespace": "Payload.Pageable.ServerDrivenPagination", @@ -412,12 +508,12 @@ }, "properties": [ { - "$id": "40", + "$id": "52", "kind": "property", "name": "pets", "serializedName": "pets", "type": { - "$ref": "25" + "$ref": "37" }, "optional": false, "readOnly": false, @@ -448,12 +544,12 @@ "isHttpMetadata": false }, { - "$id": "41", + "$id": "53", "kind": "property", "name": "nestedNext", "serializedName": "nestedNext", "type": { - "$id": "42", + "$id": "54", "kind": "model", "name": "NestedLinkResponseNestedNext", "namespace": "Payload.Pageable.ServerDrivenPagination", @@ -467,12 +563,12 @@ }, "properties": [ { - "$id": "43", + "$id": "55", "kind": "property", "name": "next", "serializedName": "next", "type": { - "$id": "44", + "$id": "56", "kind": "url", "name": "url", "crossLanguageDefinitionId": "TypeSpec.url", @@ -509,13 +605,13 @@ ] }, { - "$ref": "39" + "$ref": "51" }, { - "$ref": "42" + "$ref": "54" }, { - "$id": "45", + "$id": "57", "kind": "model", "name": "ListWithoutContinuationResponse", "namespace": "Payload.Pageable.PageSize", @@ -529,12 +625,12 @@ }, "properties": [ { - "$id": "46", + "$id": "58", "kind": "property", "name": "pets", "serializedName": "pets", "type": { - "$ref": "25" + "$ref": "37" }, "optional": false, "readOnly": false, @@ -552,7 +648,7 @@ ] }, { - "$id": "47", + "$id": "59", "kind": "model", "name": "ListWithPageSizeResponse", "namespace": "Payload.Pageable.PageSize", @@ -566,12 +662,12 @@ }, "properties": [ { - "$id": "48", + "$id": "60", "kind": "property", "name": "pets", "serializedName": "pets", "type": { - "$ref": "25" + "$ref": "37" }, "optional": false, "readOnly": false, @@ -589,47 +685,165 @@ ] }, { - "$id": "49", + "$id": "61", "kind": "model", - "name": "RequestQueryResponseBodyResponse", - "namespace": "Payload.Pageable.ServerDrivenPagination.ContinuationToken", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.Response.anonymous", - "usage": "Output,Json", - "decorators": [], + "name": "XmlPetListResult", + "namespace": "Payload.Pageable", + "crossLanguageDefinitionId": "Payload.Pageable.XmlPetListResult", + "usage": "Output,Xml", + "doc": "The XML response for listing pets.", + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "PetListResult" + } + } + ], "serializationOptions": { - "json": { - "name": "" + "xml": { + "name": "PetListResult", + "attribute": false, + "unwrapped": false } }, "properties": [ { - "$id": "50", + "$id": "62", "kind": "property", "name": "pets", - "serializedName": "pets", + "serializedName": "Pets", "type": { - "$ref": "25" + "$id": "63", + "kind": "array", + "name": "ArrayXmlPet", + "valueType": { + "$id": "64", + "kind": "model", + "name": "XmlPet", + "namespace": "Payload.Pageable", + "crossLanguageDefinitionId": "Payload.Pageable.XmlPet", + "usage": "Output,Xml", + "doc": "An XML pet item.", + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "Pet" + } + } + ], + "serializationOptions": { + "xml": { + "name": "Pet", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "65", + "kind": "property", + "name": "id", + "serializedName": "Id", + "type": { + "$id": "66", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "Id" + } + } + ], + "crossLanguageDefinitionId": "Payload.Pageable.XmlPet.id", + "serializationOptions": { + "xml": { + "name": "Id", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "67", + "kind": "property", + "name": "name", + "serializedName": "Name", + "type": { + "$id": "68", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "Name" + } + } + ], + "crossLanguageDefinitionId": "Payload.Pageable.XmlPet.name", + "serializationOptions": { + "xml": { + "name": "Name", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.Response.anonymous.pets", + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "Pets" + } + } + ], + "crossLanguageDefinitionId": "Payload.Pageable.XmlPetListResult.pets", "serializationOptions": { - "json": { - "name": "pets" + "xml": { + "name": "Pets", + "attribute": false, + "unwrapped": false, + "itemsName": "Pet" } }, "isHttpMetadata": false }, { - "$id": "51", + "$id": "69", "kind": "property", - "name": "nextToken", - "serializedName": "nextToken", + "name": "nextMarker", + "serializedName": "NextMarker", "type": { - "$id": "52", + "$id": "70", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -639,11 +853,20 @@ "readOnly": false, "discriminator": false, "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.Response.anonymous.nextToken", + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "NextMarker" + } + } + ], + "crossLanguageDefinitionId": "Payload.Pageable.XmlPetListResult.nextMarker", "serializationOptions": { - "json": { - "name": "nextToken" + "xml": { + "name": "NextMarker", + "attribute": false, + "unwrapped": false } }, "isHttpMetadata": false @@ -651,61 +874,93 @@ ] }, { - "$id": "53", + "$ref": "64" + }, + { + "$id": "71", "kind": "model", - "name": "RequestHeaderResponseBodyResponse", - "namespace": "Payload.Pageable.ServerDrivenPagination.ContinuationToken", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.Response.anonymous", - "usage": "Output,Json", - "decorators": [], + "name": "XmlPetListResultWithNextLink", + "namespace": "Payload.Pageable", + "crossLanguageDefinitionId": "Payload.Pageable.XmlPetListResultWithNextLink", + "usage": "Output,Xml", + "doc": "The XML response for listing pets with next link.", + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "PetListResult" + } + } + ], "serializationOptions": { - "json": { - "name": "" + "xml": { + "name": "PetListResult", + "attribute": false, + "unwrapped": false } }, "properties": [ { - "$id": "54", + "$id": "72", "kind": "property", "name": "pets", - "serializedName": "pets", + "serializedName": "Pets", "type": { - "$ref": "25" + "$ref": "63" }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.Response.anonymous.pets", + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "Pets" + } + } + ], + "crossLanguageDefinitionId": "Payload.Pageable.XmlPetListResultWithNextLink.pets", "serializationOptions": { - "json": { - "name": "pets" + "xml": { + "name": "Pets", + "attribute": false, + "unwrapped": false, + "itemsName": "Pet" } }, "isHttpMetadata": false }, { - "$id": "55", + "$id": "73", "kind": "property", - "name": "nextToken", - "serializedName": "nextToken", + "name": "nextLink", + "serializedName": "NextLink", "type": { - "$id": "56", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", + "$id": "74", + "kind": "url", + "name": "url", + "crossLanguageDefinitionId": "TypeSpec.url", "decorators": [] }, "optional": true, "readOnly": false, "discriminator": false, "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.Response.anonymous.nextToken", + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "NextLink" + } + } + ], + "crossLanguageDefinitionId": "Payload.Pageable.XmlPetListResultWithNextLink.nextLink", "serializationOptions": { - "json": { - "name": "nextToken" + "xml": { + "name": "NextLink", + "attribute": false, + "unwrapped": false } }, "isHttpMetadata": false @@ -713,36 +968,40 @@ ] }, { - "$id": "57", + "$id": "75", "kind": "model", - "name": "RequestQueryResponseHeaderResponse", - "namespace": "", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.Response.anonymous", - "usage": "Output,Json", + "name": "Filter", + "namespace": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.Filter", + "usage": "Input,Json", "decorators": [], "serializationOptions": { "json": { - "name": "" + "name": "Filter" } }, "properties": [ { - "$id": "58", + "$id": "76", "kind": "property", - "name": "pets", - "serializedName": "pets", + "name": "filter", + "serializedName": "filter", "type": { - "$ref": "25" + "$id": "77", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] }, "optional": false, "readOnly": false, "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "requestQueryResponseHeader.Response.anonymous.pets", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.Filter.filter", "serializationOptions": { "json": { - "name": "pets" + "name": "filter" } }, "isHttpMetadata": false @@ -750,9 +1009,232 @@ ] }, { - "$id": "59", + "$id": "78", "kind": "model", - "name": "RequestHeaderResponseHeaderResponse", + "name": "PostResponse", + "namespace": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post.Response.anonymous", + "usage": "Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "" + } + }, + "properties": [ + { + "$id": "79", + "kind": "property", + "name": "pets", + "serializedName": "pets", + "type": { + "$ref": "37" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post.Response.anonymous.pets", + "serializationOptions": { + "json": { + "name": "pets" + } + }, + "isHttpMetadata": false + }, + { + "$id": "80", + "kind": "property", + "name": "next", + "serializedName": "next", + "type": { + "$id": "81", + "kind": "url", + "name": "url", + "crossLanguageDefinitionId": "TypeSpec.url", + "decorators": [] + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post.Response.anonymous.next", + "serializationOptions": { + "json": { + "name": "next" + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "82", + "kind": "model", + "name": "RequestQueryResponseBodyResponse", + "namespace": "Payload.Pageable.ServerDrivenPagination.ContinuationToken", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.Response.anonymous", + "usage": "Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "" + } + }, + "properties": [ + { + "$id": "83", + "kind": "property", + "name": "pets", + "serializedName": "pets", + "type": { + "$ref": "37" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.Response.anonymous.pets", + "serializationOptions": { + "json": { + "name": "pets" + } + }, + "isHttpMetadata": false + }, + { + "$id": "84", + "kind": "property", + "name": "nextToken", + "serializedName": "nextToken", + "type": { + "$id": "85", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.Response.anonymous.nextToken", + "serializationOptions": { + "json": { + "name": "nextToken" + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "86", + "kind": "model", + "name": "RequestHeaderResponseBodyResponse", + "namespace": "Payload.Pageable.ServerDrivenPagination.ContinuationToken", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.Response.anonymous", + "usage": "Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "" + } + }, + "properties": [ + { + "$id": "87", + "kind": "property", + "name": "pets", + "serializedName": "pets", + "type": { + "$ref": "37" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.Response.anonymous.pets", + "serializationOptions": { + "json": { + "name": "pets" + } + }, + "isHttpMetadata": false + }, + { + "$id": "88", + "kind": "property", + "name": "nextToken", + "serializedName": "nextToken", + "type": { + "$id": "89", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.Response.anonymous.nextToken", + "serializationOptions": { + "json": { + "name": "nextToken" + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "90", + "kind": "model", + "name": "RequestQueryResponseHeaderResponse", + "namespace": "", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.Response.anonymous", + "usage": "Output,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "" + } + }, + "properties": [ + { + "$id": "91", + "kind": "property", + "name": "pets", + "serializedName": "pets", + "type": { + "$ref": "37" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "requestQueryResponseHeader.Response.anonymous.pets", + "serializationOptions": { + "json": { + "name": "pets" + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "92", + "kind": "model", + "name": "RequestHeaderResponseHeaderResponse", "namespace": "", "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.Response.anonymous", "usage": "Output,Json", @@ -764,12 +1246,12 @@ }, "properties": [ { - "$id": "60", + "$id": "93", "kind": "property", "name": "pets", "serializedName": "pets", "type": { - "$ref": "25" + "$ref": "37" }, "optional": false, "readOnly": false, @@ -787,7 +1269,7 @@ ] }, { - "$id": "61", + "$id": "94", "kind": "model", "name": "RequestQueryNestedResponseBodyResponse", "namespace": "Payload.Pageable.ServerDrivenPagination.ContinuationToken", @@ -801,12 +1283,12 @@ }, "properties": [ { - "$id": "62", + "$id": "95", "kind": "property", "name": "nestedItems", "serializedName": "nestedItems", "type": { - "$id": "63", + "$id": "96", "kind": "model", "name": "RequestQueryNestedResponseBodyResponseNestedItems", "namespace": "Payload.Pageable.ServerDrivenPagination.ContinuationToken", @@ -820,12 +1302,12 @@ }, "properties": [ { - "$id": "64", + "$id": "97", "kind": "property", "name": "pets", "serializedName": "pets", "type": { - "$ref": "25" + "$ref": "37" }, "optional": false, "readOnly": false, @@ -856,12 +1338,12 @@ "isHttpMetadata": false }, { - "$id": "65", + "$id": "98", "kind": "property", "name": "nestedNext", "serializedName": "nestedNext", "type": { - "$id": "66", + "$id": "99", "kind": "model", "name": "RequestQueryNestedResponseBodyResponseNestedNext", "namespace": "Payload.Pageable.ServerDrivenPagination.ContinuationToken", @@ -875,12 +1357,12 @@ }, "properties": [ { - "$id": "67", + "$id": "100", "kind": "property", "name": "nextToken", "serializedName": "nextToken", "type": { - "$id": "68", + "$id": "101", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -917,13 +1399,13 @@ ] }, { - "$ref": "63" + "$ref": "96" }, { - "$ref": "66" + "$ref": "99" }, { - "$id": "69", + "$id": "102", "kind": "model", "name": "RequestHeaderNestedResponseBodyResponse", "namespace": "Payload.Pageable.ServerDrivenPagination.ContinuationToken", @@ -937,12 +1419,12 @@ }, "properties": [ { - "$id": "70", + "$id": "103", "kind": "property", "name": "nestedItems", "serializedName": "nestedItems", "type": { - "$id": "71", + "$id": "104", "kind": "model", "name": "RequestHeaderNestedResponseBodyResponseNestedItems", "namespace": "Payload.Pageable.ServerDrivenPagination.ContinuationToken", @@ -956,12 +1438,12 @@ }, "properties": [ { - "$id": "72", + "$id": "105", "kind": "property", "name": "pets", "serializedName": "pets", "type": { - "$ref": "25" + "$ref": "37" }, "optional": false, "readOnly": false, @@ -992,12 +1474,12 @@ "isHttpMetadata": false }, { - "$id": "73", + "$id": "106", "kind": "property", "name": "nestedNext", "serializedName": "nestedNext", "type": { - "$id": "74", + "$id": "107", "kind": "model", "name": "RequestHeaderNestedResponseBodyResponseNestedNext", "namespace": "Payload.Pageable.ServerDrivenPagination.ContinuationToken", @@ -1011,12 +1493,12 @@ }, "properties": [ { - "$id": "75", + "$id": "108", "kind": "property", "name": "nextToken", "serializedName": "nextToken", "type": { - "$id": "76", + "$id": "109", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1053,15 +1535,15 @@ ] }, { - "$ref": "71" + "$ref": "104" }, { - "$ref": "74" + "$ref": "107" } ], "clients": [ { - "$id": "77", + "$id": "110", "kind": "client", "name": "PageableClient", "namespace": "Payload.Pageable", @@ -1069,13 +1551,13 @@ "methods": [], "parameters": [ { - "$id": "78", + "$id": "111", "kind": "endpoint", "name": "endpoint", "serializedName": "endpoint", "doc": "Service host", "type": { - "$id": "79", + "$id": "112", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -1086,7 +1568,7 @@ "isEndpoint": true, "defaultValue": { "type": { - "$id": "80", + "$id": "113", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string" @@ -1105,25 +1587,25 @@ "apiVersions": [], "children": [ { - "$id": "81", + "$id": "114", "kind": "client", "name": "ServerDrivenPagination", "namespace": "Payload.Pageable.ServerDrivenPagination", "methods": [ { - "$id": "82", + "$id": "115", "kind": "paging", "name": "link", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "83", + "$id": "116", "name": "link", "resourceName": "ServerDrivenPagination", "accessibility": "public", "parameters": [ { - "$id": "84", + "$id": "117", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -1136,7 +1618,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.link.accept" + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.link.accept", + "methodParameterSegments": [ + { + "$id": "118", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.link.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1145,7 +1646,7 @@ 200 ], "bodyType": { - "$ref": "23" + "$ref": "35" }, "headers": [], "isErrorResponse": false, @@ -1166,26 +1667,12 @@ }, "parameters": [ { - "$id": "85", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.link.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "118" } ], "response": { "type": { - "$ref": "25" + "$ref": "37" }, "resultSegments": [ "pets" @@ -1209,19 +1696,19 @@ } }, { - "$id": "86", + "$id": "119", "kind": "paging", "name": "linkString", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "87", + "$id": "120", "name": "linkString", "resourceName": "ServerDrivenPagination", "accessibility": "public", "parameters": [ { - "$id": "88", + "$id": "121", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -1234,7 +1721,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.linkString.accept" + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.linkString.accept", + "methodParameterSegments": [ + { + "$id": "122", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "3" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.linkString.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1243,7 +1749,7 @@ 200 ], "bodyType": { - "$ref": "33" + "$ref": "45" }, "headers": [], "isErrorResponse": false, @@ -1264,26 +1770,12 @@ }, "parameters": [ { - "$id": "89", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.linkString.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "122" } ], "response": { "type": { - "$ref": "25" + "$ref": "37" }, "resultSegments": [ "pets" @@ -1307,19 +1799,19 @@ } }, { - "$id": "90", + "$id": "123", "kind": "paging", "name": "nestedLink", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "91", + "$id": "124", "name": "nestedLink", "resourceName": "ServerDrivenPagination", "accessibility": "public", "parameters": [ { - "$id": "92", + "$id": "125", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -1332,16 +1824,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.nestedLink.accept" - } - ], - "responses": [ - { - "statusCodes": [ - 200 - ], - "bodyType": { - "$ref": "37" + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.nestedLink.accept", + "methodParameterSegments": [ + { + "$id": "126", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.nestedLink.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "49" }, "headers": [], "isErrorResponse": false, @@ -1362,26 +1873,12 @@ }, "parameters": [ { - "$id": "93", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.nestedLink.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "126" } ], "response": { "type": { - "$ref": "25" + "$ref": "37" }, "resultSegments": [ "nestedItems", @@ -1410,13 +1907,13 @@ ], "parameters": [ { - "$id": "94", + "$id": "127", "kind": "endpoint", "name": "endpoint", "serializedName": "endpoint", "doc": "Service host", "type": { - "$id": "95", + "$id": "128", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -1427,7 +1924,7 @@ "isEndpoint": true, "defaultValue": { "type": { - "$id": "96", + "$id": "129", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string" @@ -1445,102 +1942,137 @@ "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination", "apiVersions": [], "parent": { - "$ref": "77" + "$ref": "110" }, "children": [ { - "$id": "97", + "$id": "130", "kind": "client", - "name": "ContinuationToken", - "namespace": "Payload.Pageable.ServerDrivenPagination.ContinuationToken", + "name": "AlternateInitialVerb", + "namespace": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb", + "doc": "Scenario where the initial request is not a GET request. However following the next link always result in a GET request.", "methods": [ { - "$id": "98", + "$id": "131", "kind": "paging", - "name": "requestQueryResponseBody", + "name": "post", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "99", - "name": "requestQueryResponseBody", - "resourceName": "ContinuationToken", + "$id": "132", + "name": "post", + "resourceName": "AlternateInitialVerb", "accessibility": "public", "parameters": [ { - "$id": "100", - "kind": "query", - "name": "token", - "serializedName": "token", + "$id": "133", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", "type": { - "$id": "101", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] + "$ref": "7" }, "isApiVersion": false, - "explode": false, - "optional": true, - "scope": "Method", + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.token", - "readOnly": false + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post.contentType", + "methodParameterSegments": [ + { + "$id": "134", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "102", + "$id": "135", "kind": "header", - "name": "foo", - "serializedName": "foo", + "name": "accept", + "serializedName": "Accept", "type": { - "$id": "103", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] + "$ref": "9" }, "isApiVersion": false, - "optional": true, + "optional": false, "isContentType": false, - "scope": "Method", + "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.foo" + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post.accept", + "methodParameterSegments": [ + { + "$id": "136", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "104", - "kind": "query", - "name": "bar", - "serializedName": "bar", + "$id": "137", + "kind": "body", + "name": "body", + "serializedName": "body", "type": { - "$id": "105", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] + "$ref": "75" }, "isApiVersion": false, - "explode": false, - "optional": true, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", + "optional": false, "scope": "Method", "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.bar", - "readOnly": false - }, - { - "$id": "106", - "kind": "header", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "7" - }, - "isApiVersion": false, - "optional": false, - "isContentType": false, - "scope": "Constant", "readOnly": false, - "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.accept" + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post.body", + "methodParameterSegments": [ + { + "$id": "138", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "75" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1549,7 +2081,7 @@ 200 ], "bodyType": { - "$ref": "49" + "$ref": "78" }, "headers": [], "isErrorResponse": false, @@ -1558,101 +2090,33 @@ ] } ], - "httpMethod": "GET", + "httpMethod": "POST", "uri": "{endpoint}", - "path": "/payload/pageable/server-driven-pagination/continuationtoken/request-query-response-body", + "path": "/payload/pageable/server-driven-pagination/link/initial-post", + "requestMediaTypes": [ + "application/json" + ], "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post", "decorators": [], - "namespace": "Payload.Pageable.ServerDrivenPagination.ContinuationToken" + "namespace": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb" }, "parameters": [ { - "$id": "107", - "kind": "method", - "name": "token", - "serializedName": "token", - "type": { - "$id": "108", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.token", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "109", - "kind": "method", - "name": "foo", - "serializedName": "foo", - "type": { - "$id": "110", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.foo", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "138" }, { - "$id": "111", - "kind": "method", - "name": "bar", - "serializedName": "bar", - "type": { - "$id": "112", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.bar", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "134" }, { - "$id": "113", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "136" } ], "response": { "type": { - "$ref": "25" + "$ref": "37" }, "resultSegments": [ "pets" @@ -1661,62 +2125,130 @@ "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post", "pagingMetadata": { "itemPropertySegments": [ "pets" ], - "continuationToken": { - "parameter": { - "$ref": "100" - }, + "nextLink": { "responseSegments": [ - "nextToken" + "next" ], "responseLocation": "Body" }, "pageSizeParameterSegments": [] } - }, + } + ], + "parameters": [ + { + "$id": "139", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "140", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "141", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb", + "apiVersions": [], + "parent": { + "$ref": "114" + }, + "isMultiServiceClient": false + }, + { + "$id": "142", + "kind": "client", + "name": "ContinuationToken", + "namespace": "Payload.Pageable.ServerDrivenPagination.ContinuationToken", + "methods": [ { - "$id": "114", + "$id": "143", "kind": "paging", - "name": "requestHeaderResponseBody", + "name": "requestQueryResponseBody", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "115", - "name": "requestHeaderResponseBody", + "$id": "144", + "name": "requestQueryResponseBody", "resourceName": "ContinuationToken", "accessibility": "public", "parameters": [ { - "$id": "116", - "kind": "header", + "$id": "145", + "kind": "query", "name": "token", "serializedName": "token", "type": { - "$id": "117", + "$id": "146", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "isApiVersion": false, + "explode": false, "optional": true, - "isContentType": false, "scope": "Method", - "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.token" + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.token", + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "147", + "kind": "method", + "name": "token", + "serializedName": "token", + "type": { + "$id": "148", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.token", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "118", + "$id": "149", "kind": "header", "name": "foo", "serializedName": "foo", "type": { - "$id": "119", + "$id": "150", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1728,15 +2260,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.foo" + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.foo", + "methodParameterSegments": [ + { + "$id": "151", + "kind": "method", + "name": "foo", + "serializedName": "foo", + "type": { + "$id": "152", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.foo", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "120", + "$id": "153", "kind": "query", "name": "bar", "serializedName": "bar", "type": { - "$id": "121", + "$id": "154", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1747,16 +2302,39 @@ "optional": true, "scope": "Method", "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.bar", - "readOnly": false + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.bar", + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "155", + "kind": "method", + "name": "bar", + "serializedName": "bar", + "type": { + "$id": "156", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.bar", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "122", + "$id": "157", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "9" + "$ref": "11" }, "isApiVersion": false, "optional": false, @@ -1764,7 +2342,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.accept" + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.accept", + "methodParameterSegments": [ + { + "$id": "158", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "11" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1773,7 +2370,7 @@ 200 ], "bodyType": { - "$ref": "53" + "$ref": "82" }, "headers": [], "isErrorResponse": false, @@ -1784,99 +2381,31 @@ ], "httpMethod": "GET", "uri": "{endpoint}", - "path": "/payload/pageable/server-driven-pagination/continuationtoken/request-header-response-body", + "path": "/payload/pageable/server-driven-pagination/continuationtoken/request-query-response-body", "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody", "decorators": [], "namespace": "Payload.Pageable.ServerDrivenPagination.ContinuationToken" }, "parameters": [ { - "$id": "123", - "kind": "method", - "name": "token", - "serializedName": "token", - "type": { - "$id": "124", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.token", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "147" }, { - "$id": "125", - "kind": "method", - "name": "foo", - "serializedName": "foo", - "type": { - "$id": "126", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.foo", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "151" }, { - "$id": "127", - "kind": "method", - "name": "bar", - "serializedName": "bar", - "type": { - "$id": "128", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.bar", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "155" }, { - "$id": "129", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "158" } ], "response": { "type": { - "$ref": "25" + "$ref": "37" }, "resultSegments": [ "pets" @@ -1885,14 +2414,14 @@ "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody", "pagingMetadata": { "itemPropertySegments": [ "pets" ], "continuationToken": { "parameter": { - "$ref": "116" + "$ref": "145" }, "responseSegments": [ "nextToken" @@ -1903,44 +2432,67 @@ } }, { - "$id": "130", + "$id": "159", "kind": "paging", - "name": "requestQueryResponseHeader", + "name": "requestHeaderResponseBody", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "131", - "name": "requestQueryResponseHeader", + "$id": "160", + "name": "requestHeaderResponseBody", "resourceName": "ContinuationToken", "accessibility": "public", "parameters": [ { - "$id": "132", - "kind": "query", + "$id": "161", + "kind": "header", "name": "token", "serializedName": "token", "type": { - "$id": "133", + "$id": "162", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "isApiVersion": false, - "explode": false, "optional": true, + "isContentType": false, "scope": "Method", + "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.token", - "readOnly": false - }, - { - "$id": "134", - "kind": "header", - "name": "foo", - "serializedName": "foo", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.token", + "methodParameterSegments": [ + { + "$id": "163", + "kind": "method", + "name": "token", + "serializedName": "token", + "type": { + "$id": "164", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.token", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "165", + "kind": "header", + "name": "foo", + "serializedName": "foo", "type": { - "$id": "135", + "$id": "166", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1952,15 +2504,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.foo" + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.foo", + "methodParameterSegments": [ + { + "$id": "167", + "kind": "method", + "name": "foo", + "serializedName": "foo", + "type": { + "$id": "168", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.foo", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "136", + "$id": "169", "kind": "query", "name": "bar", "serializedName": "bar", "type": { - "$id": "137", + "$id": "170", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1971,16 +2546,39 @@ "optional": true, "scope": "Method", "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.bar", - "readOnly": false + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.bar", + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "171", + "kind": "method", + "name": "bar", + "serializedName": "bar", + "type": { + "$id": "172", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.bar", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "138", + "$id": "173", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "11" + "$ref": "13" }, "isApiVersion": false, "optional": false, @@ -1988,7 +2586,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.accept" + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.accept", + "methodParameterSegments": [ + { + "$id": "174", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "13" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1997,21 +2614,9 @@ 200 ], "bodyType": { - "$ref": "57" + "$ref": "86" }, - "headers": [ - { - "name": "nextToken", - "nameInResponse": "next-token", - "type": { - "$id": "139", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - } - } - ], + "headers": [], "isErrorResponse": false, "contentTypes": [ "application/json" @@ -2020,99 +2625,31 @@ ], "httpMethod": "GET", "uri": "{endpoint}", - "path": "/payload/pageable/server-driven-pagination/continuationtoken/request-query-response-header", + "path": "/payload/pageable/server-driven-pagination/continuationtoken/request-header-response-body", "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody", "decorators": [], "namespace": "Payload.Pageable.ServerDrivenPagination.ContinuationToken" }, "parameters": [ { - "$id": "140", - "kind": "method", - "name": "token", - "serializedName": "token", - "type": { - "$id": "141", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.token", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "163" }, { - "$id": "142", - "kind": "method", - "name": "foo", - "serializedName": "foo", - "type": { - "$id": "143", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.foo", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "167" }, { - "$id": "144", - "kind": "method", - "name": "bar", - "serializedName": "bar", - "type": { - "$id": "145", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.bar", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "171" }, { - "$id": "146", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "174" } ], "response": { "type": { - "$ref": "25" + "$ref": "37" }, "resultSegments": [ "pets" @@ -2121,62 +2658,85 @@ "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody", "pagingMetadata": { "itemPropertySegments": [ "pets" ], "continuationToken": { "parameter": { - "$ref": "132" + "$ref": "161" }, "responseSegments": [ - "next-token" + "nextToken" ], - "responseLocation": "Header" + "responseLocation": "Body" }, "pageSizeParameterSegments": [] } }, { - "$id": "147", + "$id": "175", "kind": "paging", - "name": "requestHeaderResponseHeader", + "name": "requestQueryResponseHeader", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "148", - "name": "requestHeaderResponseHeader", + "$id": "176", + "name": "requestQueryResponseHeader", "resourceName": "ContinuationToken", "accessibility": "public", "parameters": [ { - "$id": "149", - "kind": "header", + "$id": "177", + "kind": "query", "name": "token", "serializedName": "token", "type": { - "$id": "150", + "$id": "178", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "isApiVersion": false, + "explode": false, "optional": true, - "isContentType": false, "scope": "Method", - "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.token" + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.token", + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "179", + "kind": "method", + "name": "token", + "serializedName": "token", + "type": { + "$id": "180", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.token", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "151", + "$id": "181", "kind": "header", "name": "foo", "serializedName": "foo", "type": { - "$id": "152", + "$id": "182", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2188,15 +2748,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.foo" + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.foo", + "methodParameterSegments": [ + { + "$id": "183", + "kind": "method", + "name": "foo", + "serializedName": "foo", + "type": { + "$id": "184", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.foo", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "153", + "$id": "185", "kind": "query", "name": "bar", "serializedName": "bar", "type": { - "$id": "154", + "$id": "186", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2207,16 +2790,39 @@ "optional": true, "scope": "Method", "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.bar", - "readOnly": false + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.bar", + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "187", + "kind": "method", + "name": "bar", + "serializedName": "bar", + "type": { + "$id": "188", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.bar", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "155", + "$id": "189", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "13" + "$ref": "15" }, "isApiVersion": false, "optional": false, @@ -2224,7 +2830,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.accept" + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.accept", + "methodParameterSegments": [ + { + "$id": "190", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "15" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2233,14 +2858,14 @@ 200 ], "bodyType": { - "$ref": "59" + "$ref": "90" }, "headers": [ { "name": "nextToken", "nameInResponse": "next-token", "type": { - "$id": "156", + "$id": "191", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2256,99 +2881,31 @@ ], "httpMethod": "GET", "uri": "{endpoint}", - "path": "/payload/pageable/server-driven-pagination/continuationtoken/request-header-response-header", + "path": "/payload/pageable/server-driven-pagination/continuationtoken/request-query-response-header", "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader", "decorators": [], "namespace": "Payload.Pageable.ServerDrivenPagination.ContinuationToken" }, "parameters": [ { - "$id": "157", - "kind": "method", - "name": "token", - "serializedName": "token", - "type": { - "$id": "158", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.token", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "179" }, { - "$id": "159", - "kind": "method", - "name": "foo", - "serializedName": "foo", - "type": { - "$id": "160", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.foo", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "183" }, { - "$id": "161", - "kind": "method", - "name": "bar", - "serializedName": "bar", - "type": { - "$id": "162", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.bar", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "187" }, { - "$id": "163", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "190" } ], "response": { "type": { - "$ref": "25" + "$ref": "37" }, "resultSegments": [ "pets" @@ -2357,14 +2914,14 @@ "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader", "pagingMetadata": { "itemPropertySegments": [ "pets" ], "continuationToken": { "parameter": { - "$ref": "149" + "$ref": "177" }, "responseSegments": [ "next-token" @@ -2375,44 +2932,67 @@ } }, { - "$id": "164", + "$id": "192", "kind": "paging", - "name": "requestQueryNestedResponseBody", + "name": "requestHeaderResponseHeader", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "165", - "name": "requestQueryNestedResponseBody", + "$id": "193", + "name": "requestHeaderResponseHeader", "resourceName": "ContinuationToken", "accessibility": "public", "parameters": [ { - "$id": "166", - "kind": "query", + "$id": "194", + "kind": "header", "name": "token", "serializedName": "token", "type": { - "$id": "167", + "$id": "195", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "isApiVersion": false, - "explode": false, "optional": true, + "isContentType": false, "scope": "Method", + "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.token", - "readOnly": false + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.token", + "methodParameterSegments": [ + { + "$id": "196", + "kind": "method", + "name": "token", + "serializedName": "token", + "type": { + "$id": "197", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.token", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "168", + "$id": "198", "kind": "header", "name": "foo", "serializedName": "foo", "type": { - "$id": "169", + "$id": "199", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2424,15 +3004,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.foo" + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.foo", + "methodParameterSegments": [ + { + "$id": "200", + "kind": "method", + "name": "foo", + "serializedName": "foo", + "type": { + "$id": "201", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.foo", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "170", + "$id": "202", "kind": "query", "name": "bar", "serializedName": "bar", "type": { - "$id": "171", + "$id": "203", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2443,16 +3046,39 @@ "optional": true, "scope": "Method", "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.bar", - "readOnly": false + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.bar", + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "204", + "kind": "method", + "name": "bar", + "serializedName": "bar", + "type": { + "$id": "205", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.bar", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "172", + "$id": "206", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "15" + "$ref": "17" }, "isApiVersion": false, "optional": false, @@ -2460,7 +3086,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.accept" + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.accept", + "methodParameterSegments": [ + { + "$id": "207", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2469,9 +3114,21 @@ 200 ], "bodyType": { - "$ref": "61" + "$ref": "92" }, - "headers": [], + "headers": [ + { + "name": "nextToken", + "nameInResponse": "next-token", + "type": { + "$id": "208", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + } + } + ], "isErrorResponse": false, "contentTypes": [ "application/json" @@ -2480,166 +3137,118 @@ ], "httpMethod": "GET", "uri": "{endpoint}", - "path": "/payload/pageable/server-driven-pagination/continuationtoken/request-query-nested-response-body", + "path": "/payload/pageable/server-driven-pagination/continuationtoken/request-header-response-header", "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader", "decorators": [], "namespace": "Payload.Pageable.ServerDrivenPagination.ContinuationToken" }, "parameters": [ { - "$id": "173", - "kind": "method", - "name": "token", - "serializedName": "token", - "type": { - "$id": "174", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.token", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "196" }, { - "$id": "175", - "kind": "method", - "name": "foo", - "serializedName": "foo", - "type": { - "$id": "176", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.foo", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "200" }, { - "$id": "177", - "kind": "method", - "name": "bar", - "serializedName": "bar", - "type": { - "$id": "178", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.bar", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "204" }, { - "$id": "179", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "207" } ], "response": { "type": { - "$ref": "25" + "$ref": "37" }, "resultSegments": [ - "nestedItems", "pets" ] }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader", "pagingMetadata": { "itemPropertySegments": [ - "nestedItems", "pets" ], "continuationToken": { "parameter": { - "$ref": "166" + "$ref": "194" }, "responseSegments": [ - "nestedNext", - "nextToken" + "next-token" ], - "responseLocation": "Body" + "responseLocation": "Header" }, "pageSizeParameterSegments": [] } }, { - "$id": "180", + "$id": "209", "kind": "paging", - "name": "requestHeaderNestedResponseBody", + "name": "requestQueryNestedResponseBody", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "181", - "name": "requestHeaderNestedResponseBody", + "$id": "210", + "name": "requestQueryNestedResponseBody", "resourceName": "ContinuationToken", "accessibility": "public", "parameters": [ { - "$id": "182", - "kind": "header", + "$id": "211", + "kind": "query", "name": "token", "serializedName": "token", "type": { - "$id": "183", + "$id": "212", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "isApiVersion": false, + "explode": false, "optional": true, - "isContentType": false, "scope": "Method", - "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.token" + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.token", + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "213", + "kind": "method", + "name": "token", + "serializedName": "token", + "type": { + "$id": "214", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.token", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "184", + "$id": "215", "kind": "header", "name": "foo", "serializedName": "foo", "type": { - "$id": "185", + "$id": "216", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2651,15 +3260,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.foo" + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.foo", + "methodParameterSegments": [ + { + "$id": "217", + "kind": "method", + "name": "foo", + "serializedName": "foo", + "type": { + "$id": "218", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.foo", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "186", + "$id": "219", "kind": "query", "name": "bar", "serializedName": "bar", "type": { - "$id": "187", + "$id": "220", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2670,16 +3302,39 @@ "optional": true, "scope": "Method", "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.bar", - "readOnly": false + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.bar", + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "221", + "kind": "method", + "name": "bar", + "serializedName": "bar", + "type": { + "$id": "222", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.bar", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "188", + "$id": "223", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "17" + "$ref": "19" }, "isApiVersion": false, "optional": false, @@ -2687,7 +3342,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.accept" + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.accept", + "methodParameterSegments": [ + { + "$id": "224", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "19" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2696,7 +3370,254 @@ 200 ], "bodyType": { - "$ref": "69" + "$ref": "94" + }, + "headers": [], + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/pageable/server-driven-pagination/continuationtoken/request-query-nested-response-body", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody", + "decorators": [], + "namespace": "Payload.Pageable.ServerDrivenPagination.ContinuationToken" + }, + "parameters": [ + { + "$ref": "213" + }, + { + "$ref": "217" + }, + { + "$ref": "221" + }, + { + "$ref": "224" + } + ], + "response": { + "type": { + "$ref": "37" + }, + "resultSegments": [ + "nestedItems", + "pets" + ] + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody", + "pagingMetadata": { + "itemPropertySegments": [ + "nestedItems", + "pets" + ], + "continuationToken": { + "parameter": { + "$ref": "211" + }, + "responseSegments": [ + "nestedNext", + "nextToken" + ], + "responseLocation": "Body" + }, + "pageSizeParameterSegments": [] + } + }, + { + "$id": "225", + "kind": "paging", + "name": "requestHeaderNestedResponseBody", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "226", + "name": "requestHeaderNestedResponseBody", + "resourceName": "ContinuationToken", + "accessibility": "public", + "parameters": [ + { + "$id": "227", + "kind": "header", + "name": "token", + "serializedName": "token", + "type": { + "$id": "228", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "isApiVersion": false, + "optional": true, + "isContentType": false, + "scope": "Method", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.token", + "methodParameterSegments": [ + { + "$id": "229", + "kind": "method", + "name": "token", + "serializedName": "token", + "type": { + "$id": "230", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.token", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "231", + "kind": "header", + "name": "foo", + "serializedName": "foo", + "type": { + "$id": "232", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "isApiVersion": false, + "optional": true, + "isContentType": false, + "scope": "Method", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.foo", + "methodParameterSegments": [ + { + "$id": "233", + "kind": "method", + "name": "foo", + "serializedName": "foo", + "type": { + "$id": "234", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.foo", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "235", + "kind": "query", + "name": "bar", + "serializedName": "bar", + "type": { + "$id": "236", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "isApiVersion": false, + "explode": false, + "optional": true, + "scope": "Method", + "decorators": [], + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.bar", + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "237", + "kind": "method", + "name": "bar", + "serializedName": "bar", + "type": { + "$id": "238", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.bar", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "239", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "21" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.accept", + "methodParameterSegments": [ + { + "$id": "240", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "21" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "102" }, "headers": [], "isErrorResponse": false, @@ -2717,89 +3638,21 @@ }, "parameters": [ { - "$id": "189", - "kind": "method", - "name": "token", - "serializedName": "token", - "type": { - "$id": "190", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.token", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "229" }, { - "$id": "191", - "kind": "method", - "name": "foo", - "serializedName": "foo", - "type": { - "$id": "192", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.foo", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "233" }, { - "$id": "193", - "kind": "method", - "name": "bar", - "serializedName": "bar", - "type": { - "$id": "194", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.bar", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "237" }, { - "$id": "195", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "17" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "240" } ], "response": { "type": { - "$ref": "25" + "$ref": "37" }, "resultSegments": [ "nestedItems", @@ -2817,7 +3670,7 @@ ], "continuationToken": { "parameter": { - "$ref": "182" + "$ref": "227" }, "responseSegments": [ "nestedNext", @@ -2831,13 +3684,13 @@ ], "parameters": [ { - "$id": "196", + "$id": "241", "kind": "endpoint", "name": "endpoint", "serializedName": "endpoint", "doc": "Service host", "type": { - "$id": "197", + "$id": "242", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -2848,7 +3701,7 @@ "isEndpoint": true, "defaultValue": { "type": { - "$id": "198", + "$id": "243", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string" @@ -2866,7 +3719,7 @@ "crossLanguageDefinitionId": "Payload.Pageable.ServerDrivenPagination.ContinuationToken", "apiVersions": [], "parent": { - "$ref": "81" + "$ref": "114" }, "isMultiServiceClient": false } @@ -2874,30 +3727,30 @@ "isMultiServiceClient": false }, { - "$id": "199", + "$id": "244", "kind": "client", "name": "PageSize", "namespace": "Payload.Pageable.PageSize", "methods": [ { - "$id": "200", + "$id": "245", "kind": "paging", "name": "listWithoutContinuation", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "201", + "$id": "246", "name": "listWithoutContinuation", "resourceName": "PageSize", "accessibility": "public", "parameters": [ { - "$id": "202", + "$id": "247", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "19" + "$ref": "23" }, "isApiVersion": false, "optional": false, @@ -2905,7 +3758,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.PageSize.listWithoutContinuation.accept" + "crossLanguageDefinitionId": "Payload.Pageable.PageSize.listWithoutContinuation.accept", + "methodParameterSegments": [ + { + "$id": "248", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "23" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Pageable.PageSize.listWithoutContinuation.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2914,7 +3786,7 @@ 200 ], "bodyType": { - "$ref": "45" + "$ref": "57" }, "headers": [], "isErrorResponse": false, @@ -2935,26 +3807,12 @@ }, "parameters": [ { - "$id": "203", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "19" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.Pageable.PageSize.listWithoutContinuation.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "248" } ], "response": { "type": { - "$ref": "25" + "$ref": "37" }, "resultSegments": [ "pets" @@ -2972,24 +3830,24 @@ } }, { - "$id": "204", + "$id": "249", "kind": "paging", "name": "listWithPageSize", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "205", + "$id": "250", "name": "listWithPageSize", "resourceName": "PageSize", "accessibility": "public", "parameters": [ { - "$id": "206", + "$id": "251", "kind": "query", "name": "pageSize", "serializedName": "pageSize", "type": { - "$id": "207", + "$id": "252", "kind": "int32", "name": "int32", "crossLanguageDefinitionId": "TypeSpec.int32", @@ -3001,15 +3859,38 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Payload.Pageable.PageSize.listWithPageSize.pageSize", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "253", + "kind": "method", + "name": "pageSize", + "serializedName": "pageSize", + "type": { + "$id": "254", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.PageSize.listWithPageSize.pageSize", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "208", + "$id": "255", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "21" + "$ref": "25" }, "isApiVersion": false, "optional": false, @@ -3017,7 +3898,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Payload.Pageable.PageSize.listWithPageSize.accept" + "crossLanguageDefinitionId": "Payload.Pageable.PageSize.listWithPageSize.accept", + "methodParameterSegments": [ + { + "$id": "256", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "25" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Pageable.PageSize.listWithPageSize.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3026,7 +3926,7 @@ 200 ], "bodyType": { - "$ref": "47" + "$ref": "59" }, "headers": [], "isErrorResponse": false, @@ -3047,47 +3947,15 @@ }, "parameters": [ { - "$id": "209", - "kind": "method", - "name": "pageSize", - "serializedName": "pageSize", - "type": { - "$id": "210", - "kind": "int32", - "name": "int32", - "crossLanguageDefinitionId": "TypeSpec.int32", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Payload.Pageable.PageSize.listWithPageSize.pageSize", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "253" }, { - "$id": "211", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "21" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Payload.Pageable.PageSize.listWithPageSize.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "256" } ], "response": { "type": { - "$ref": "25" + "$ref": "37" }, "resultSegments": [ "pets" @@ -3109,13 +3977,13 @@ ], "parameters": [ { - "$id": "212", + "$id": "257", "kind": "endpoint", "name": "endpoint", "serializedName": "endpoint", "doc": "Service host", "type": { - "$id": "213", + "$id": "258", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -3126,7 +3994,7 @@ "isEndpoint": true, "defaultValue": { "type": { - "$id": "214", + "$id": "259", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string" @@ -3144,7 +4012,326 @@ "crossLanguageDefinitionId": "Payload.Pageable.PageSize", "apiVersions": [], "parent": { - "$ref": "77" + "$ref": "110" + }, + "isMultiServiceClient": false + }, + { + "$id": "260", + "kind": "client", + "name": "XmlPagination", + "namespace": "Payload.Pageable.XmlPagination", + "methods": [ + { + "$id": "261", + "kind": "paging", + "name": "listWithContinuation", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "262", + "name": "listWithContinuation", + "resourceName": "XmlPagination", + "accessibility": "public", + "parameters": [ + { + "$id": "263", + "kind": "query", + "name": "marker", + "serializedName": "marker", + "type": { + "$id": "264", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "isApiVersion": false, + "explode": false, + "optional": true, + "scope": "Method", + "decorators": [], + "crossLanguageDefinitionId": "Payload.Pageable.XmlPagination.listWithContinuation.marker", + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "265", + "kind": "method", + "name": "marker", + "serializedName": "marker", + "type": { + "$id": "266", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Pageable.XmlPagination.listWithContinuation.marker", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "267", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "27" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Pageable.XmlPagination.listWithContinuation.accept", + "methodParameterSegments": [ + { + "$id": "268", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "27" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Pageable.XmlPagination.listWithContinuation.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "61" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "29" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/pageable/xml/list-with-continuation", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Pageable.XmlPagination.listWithContinuation", + "decorators": [], + "namespace": "Payload.Pageable.XmlPagination" + }, + "parameters": [ + { + "$ref": "265" + }, + { + "$ref": "268" + } + ], + "response": { + "type": { + "$ref": "63" + }, + "resultSegments": [ + "Pets" + ] + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Pageable.XmlPagination.listWithContinuation", + "pagingMetadata": { + "itemPropertySegments": [ + "Pets" + ], + "continuationToken": { + "parameter": { + "$ref": "263" + }, + "responseSegments": [ + "NextMarker" + ], + "responseLocation": "Body" + }, + "pageSizeParameterSegments": [] + } + }, + { + "$id": "269", + "kind": "paging", + "name": "listWithNextLink", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "270", + "name": "listWithNextLink", + "resourceName": "XmlPagination", + "accessibility": "public", + "parameters": [ + { + "$id": "271", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "31" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Pageable.XmlPagination.listWithNextLink.accept", + "methodParameterSegments": [ + { + "$id": "272", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "31" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Pageable.XmlPagination.listWithNextLink.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "71" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "33" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/pageable/xml/list-with-next-link", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Pageable.XmlPagination.listWithNextLink", + "decorators": [], + "namespace": "Payload.Pageable.XmlPagination" + }, + "parameters": [ + { + "$ref": "272" + } + ], + "response": { + "type": { + "$ref": "63" + }, + "resultSegments": [ + "Pets" + ] + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Pageable.XmlPagination.listWithNextLink", + "pagingMetadata": { + "itemPropertySegments": [ + "Pets" + ], + "nextLink": { + "responseSegments": [ + "NextLink" + ], + "responseLocation": "Body" + }, + "pageSizeParameterSegments": [] + } + } + ], + "parameters": [ + { + "$id": "273", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "274", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "275", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Pageable.XmlPagination.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Pageable.XmlPagination", + "apiVersions": [], + "parent": { + "$ref": "110" }, "isMultiServiceClient": false } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/Configuration.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/Configuration.json new file mode 100644 index 00000000000..a7354dd1925 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/Configuration.json @@ -0,0 +1,3 @@ +{ + "package-name": "Payload.Xml" +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/Payload.Xml.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/Payload.Xml.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/Payload.Xml.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/Payload.Xml.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/Payload.Xml.slnx new file mode 100644 index 00000000000..7839c50e16c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/Payload.Xml.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithArrayOfModelValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithArrayOfModelValue.cs new file mode 100644 index 00000000000..f1cfe2710d1 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithArrayOfModelValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithArrayOfModelValue + { + protected ModelWithArrayOfModelValue() => throw null; + + internal ModelWithArrayOfModelValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithArrayOfModel input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithArrayOfModel input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithAttributesValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithAttributesValue.cs new file mode 100644 index 00000000000..283cfb4c443 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithAttributesValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithAttributesValue + { + protected ModelWithAttributesValue() => throw null; + + internal ModelWithAttributesValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithAttributes input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithAttributes input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithDatetimeValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithDatetimeValue.cs new file mode 100644 index 00000000000..f986467c432 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithDatetimeValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithDatetimeValue + { + protected ModelWithDatetimeValue() => throw null; + + internal ModelWithDatetimeValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithDatetime input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithDatetime input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithDictionaryValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithDictionaryValue.cs new file mode 100644 index 00000000000..0c0df435c8a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithDictionaryValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithDictionaryValue + { + protected ModelWithDictionaryValue() => throw null; + + internal ModelWithDictionaryValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithDictionary input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithDictionary input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithEmptyArrayValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithEmptyArrayValue.cs new file mode 100644 index 00000000000..bad31fbc8cc --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithEmptyArrayValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithEmptyArrayValue + { + protected ModelWithEmptyArrayValue() => throw null; + + internal ModelWithEmptyArrayValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithEmptyArray input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithEmptyArray input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithEncodedNamesValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithEncodedNamesValue.cs new file mode 100644 index 00000000000..6b6a02b751f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithEncodedNamesValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithEncodedNamesValue + { + protected ModelWithEncodedNamesValue() => throw null; + + internal ModelWithEncodedNamesValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithEncodedNames input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithEncodedNames input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithEnumValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithEnumValue.cs new file mode 100644 index 00000000000..92f3738b2ec --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithEnumValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithEnumValue + { + protected ModelWithEnumValue() => throw null; + + internal ModelWithEnumValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithEnum input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithEnum input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithNamespaceOnPropertiesValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithNamespaceOnPropertiesValue.cs new file mode 100644 index 00000000000..879ead4fe76 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithNamespaceOnPropertiesValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithNamespaceOnPropertiesValue + { + protected ModelWithNamespaceOnPropertiesValue() => throw null; + + internal ModelWithNamespaceOnPropertiesValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithNamespaceOnProperties input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithNamespaceOnProperties input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithNamespaceValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithNamespaceValue.cs new file mode 100644 index 00000000000..d643648ed49 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithNamespaceValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithNamespaceValue + { + protected ModelWithNamespaceValue() => throw null; + + internal ModelWithNamespaceValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithNamespace input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithNamespace input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithNestedModelValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithNestedModelValue.cs new file mode 100644 index 00000000000..d41a92de547 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithNestedModelValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithNestedModelValue + { + protected ModelWithNestedModelValue() => throw null; + + internal ModelWithNestedModelValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithNestedModel input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithNestedModel input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithOptionalFieldValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithOptionalFieldValue.cs new file mode 100644 index 00000000000..e2bbd2a0fe9 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithOptionalFieldValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithOptionalFieldValue + { + protected ModelWithOptionalFieldValue() => throw null; + + internal ModelWithOptionalFieldValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithOptionalField input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithOptionalField input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedArraysValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedArraysValue.cs new file mode 100644 index 00000000000..f387ba00d47 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedArraysValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedArraysValue + { + protected ModelWithRenamedArraysValue() => throw null; + + internal ModelWithRenamedArraysValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithRenamedArrays input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithRenamedArrays input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedAttributeValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedAttributeValue.cs new file mode 100644 index 00000000000..3b8eb46d813 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedAttributeValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedAttributeValue + { + protected ModelWithRenamedAttributeValue() => throw null; + + internal ModelWithRenamedAttributeValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithRenamedAttribute input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithRenamedAttribute input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedFieldsValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedFieldsValue.cs new file mode 100644 index 00000000000..291ca0113d2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedFieldsValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedFieldsValue + { + protected ModelWithRenamedFieldsValue() => throw null; + + internal ModelWithRenamedFieldsValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithRenamedFields input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithRenamedFields input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedNestedModelValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedNestedModelValue.cs new file mode 100644 index 00000000000..664f8f440cf --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedNestedModelValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedNestedModelValue + { + protected ModelWithRenamedNestedModelValue() => throw null; + + internal ModelWithRenamedNestedModelValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithRenamedNestedModel input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithRenamedNestedModel input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedPropertyValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedPropertyValue.cs new file mode 100644 index 00000000000..365d16e26d8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedPropertyValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedPropertyValue + { + protected ModelWithRenamedPropertyValue() => throw null; + + internal ModelWithRenamedPropertyValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithRenamedProperty input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithRenamedProperty input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedUnwrappedModelArrayValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedUnwrappedModelArrayValue.cs new file mode 100644 index 00000000000..28d556f7ca6 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedUnwrappedModelArrayValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedUnwrappedModelArrayValue + { + protected ModelWithRenamedUnwrappedModelArrayValue() => throw null; + + internal ModelWithRenamedUnwrappedModelArrayValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithRenamedUnwrappedModelArray input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithRenamedUnwrappedModelArray input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedWrappedAndItemModelArrayValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedWrappedAndItemModelArrayValue.cs new file mode 100644 index 00000000000..5115f8cdb99 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedWrappedAndItemModelArrayValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedWrappedAndItemModelArrayValue + { + protected ModelWithRenamedWrappedAndItemModelArrayValue() => throw null; + + internal ModelWithRenamedWrappedAndItemModelArrayValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithRenamedWrappedAndItemModelArray input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithRenamedWrappedAndItemModelArray input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedWrappedModelArrayValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedWrappedModelArrayValue.cs new file mode 100644 index 00000000000..63eeecf6fc5 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithRenamedWrappedModelArrayValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedWrappedModelArrayValue + { + protected ModelWithRenamedWrappedModelArrayValue() => throw null; + + internal ModelWithRenamedWrappedModelArrayValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithRenamedWrappedModelArray input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithRenamedWrappedModelArray input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithSimpleArraysValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithSimpleArraysValue.cs new file mode 100644 index 00000000000..ef168252ce1 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithSimpleArraysValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithSimpleArraysValue + { + protected ModelWithSimpleArraysValue() => throw null; + + internal ModelWithSimpleArraysValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithSimpleArrays input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithSimpleArrays input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithTextValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithTextValue.cs new file mode 100644 index 00000000000..273515d228e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithTextValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithTextValue + { + protected ModelWithTextValue() => throw null; + + internal ModelWithTextValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithText input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithText input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithUnwrappedArrayValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithUnwrappedArrayValue.cs new file mode 100644 index 00000000000..319bba5194c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithUnwrappedArrayValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithUnwrappedArrayValue + { + protected ModelWithUnwrappedArrayValue() => throw null; + + internal ModelWithUnwrappedArrayValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithUnwrappedArray input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithUnwrappedArray input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithUnwrappedModelArrayValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithUnwrappedModelArrayValue.cs new file mode 100644 index 00000000000..6de34a4cfd2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithUnwrappedModelArrayValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithUnwrappedModelArrayValue + { + protected ModelWithUnwrappedModelArrayValue() => throw null; + + internal ModelWithUnwrappedModelArrayValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithUnwrappedModelArray input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithUnwrappedModelArray input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithWrappedPrimitiveCustomItemNamesValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithWrappedPrimitiveCustomItemNamesValue.cs new file mode 100644 index 00000000000..324e75cf8ef --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/ModelWithWrappedPrimitiveCustomItemNamesValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class ModelWithWrappedPrimitiveCustomItemNamesValue + { + protected ModelWithWrappedPrimitiveCustomItemNamesValue() => throw null; + + internal ModelWithWrappedPrimitiveCustomItemNamesValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(ModelWithWrappedPrimitiveCustomItemNames input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(ModelWithWrappedPrimitiveCustomItemNames input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/Author.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/Author.Serialization.cs new file mode 100644 index 00000000000..259dd9a06b9 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/Author.Serialization.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class Author : IPersistableModel + { + internal Author() => throw null; + + protected virtual Author PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + Author IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/Author.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/Author.cs new file mode 100644 index 00000000000..b0fa288fa0e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/Author.cs @@ -0,0 +1,17 @@ +// + +#nullable disable + +namespace Payload.Xml +{ + public partial class Author + { + public Author(string name) => throw null; + + public string Name + { + get => throw null; + set => throw null; + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/Book.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/Book.Serialization.cs new file mode 100644 index 00000000000..63764dad022 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/Book.Serialization.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class Book : IPersistableModel + { + internal Book() => throw null; + + protected virtual Book PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + Book IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/Book.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/Book.cs new file mode 100644 index 00000000000..e78000e4799 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/Book.cs @@ -0,0 +1,17 @@ +// + +#nullable disable + +namespace Payload.Xml +{ + public partial class Book + { + public Book(string title) => throw null; + + public string Title + { + get => throw null; + set => throw null; + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithArrayOfModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithArrayOfModel.Serialization.cs new file mode 100644 index 00000000000..7cb0c085797 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithArrayOfModel.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithArrayOfModel : IPersistableModel + { + internal ModelWithArrayOfModel() => throw null; + + protected virtual ModelWithArrayOfModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithArrayOfModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithArrayOfModel modelWithArrayOfModel) => throw null; + + public static explicit operator ModelWithArrayOfModel(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithArrayOfModel.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithArrayOfModel.cs new file mode 100644 index 00000000000..a90d1d02e68 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithArrayOfModel.cs @@ -0,0 +1,15 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Payload.Xml +{ + public partial class ModelWithArrayOfModel + { + public ModelWithArrayOfModel(IEnumerable items) => throw null; + + public IList Items => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithAttributes.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithAttributes.Serialization.cs new file mode 100644 index 00000000000..1a63b39e76b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithAttributes.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithAttributes : IPersistableModel + { + internal ModelWithAttributes() => throw null; + + protected virtual ModelWithAttributes PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithAttributes IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithAttributes modelWithAttributes) => throw null; + + public static explicit operator ModelWithAttributes(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithAttributes.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithAttributes.cs new file mode 100644 index 00000000000..53dcc5f82c5 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithAttributes.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +namespace Payload.Xml +{ + public partial class ModelWithAttributes + { + public ModelWithAttributes(int id1, string id2, bool enabled) => throw null; + + public int Id1 + { + get => throw null; + set => throw null; + } + + public string Id2 + { + get => throw null; + set => throw null; + } + + public bool Enabled + { + get => throw null; + set => throw null; + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithDatetime.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithDatetime.Serialization.cs new file mode 100644 index 00000000000..9476977b8eb --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithDatetime.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithDatetime : IPersistableModel + { + internal ModelWithDatetime() => throw null; + + protected virtual ModelWithDatetime PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithDatetime IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithDatetime modelWithDatetime) => throw null; + + public static explicit operator ModelWithDatetime(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithDatetime.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithDatetime.cs new file mode 100644 index 00000000000..f6bfcb035e2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithDatetime.cs @@ -0,0 +1,25 @@ +// + +#nullable disable + +using System; + +namespace Payload.Xml +{ + public partial class ModelWithDatetime + { + public ModelWithDatetime(DateTimeOffset rfc3339, DateTimeOffset rfc7231) => throw null; + + public DateTimeOffset Rfc3339 + { + get => throw null; + set => throw null; + } + + public DateTimeOffset Rfc7231 + { + get => throw null; + set => throw null; + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithDictionary.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithDictionary.Serialization.cs new file mode 100644 index 00000000000..d8523ecf098 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithDictionary.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithDictionary : IPersistableModel + { + internal ModelWithDictionary() => throw null; + + protected virtual ModelWithDictionary PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithDictionary IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithDictionary modelWithDictionary) => throw null; + + public static explicit operator ModelWithDictionary(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithDictionary.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithDictionary.cs new file mode 100644 index 00000000000..cf6e7a57b50 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithDictionary.cs @@ -0,0 +1,15 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Payload.Xml +{ + public partial class ModelWithDictionary + { + public ModelWithDictionary(IDictionary metadata) => throw null; + + public IDictionary Metadata => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithEmptyArray.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithEmptyArray.Serialization.cs new file mode 100644 index 00000000000..f4312daaa1b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithEmptyArray.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithEmptyArray : IPersistableModel + { + internal ModelWithEmptyArray() => throw null; + + protected virtual ModelWithEmptyArray PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithEmptyArray IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithEmptyArray modelWithEmptyArray) => throw null; + + public static explicit operator ModelWithEmptyArray(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithEmptyArray.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithEmptyArray.cs new file mode 100644 index 00000000000..4d2a6ad600e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithEmptyArray.cs @@ -0,0 +1,15 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Payload.Xml +{ + public partial class ModelWithEmptyArray + { + public ModelWithEmptyArray(IEnumerable items) => throw null; + + public IList Items => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithEncodedNames.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithEncodedNames.Serialization.cs new file mode 100644 index 00000000000..c478cbfc1af --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithEncodedNames.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithEncodedNames : IPersistableModel + { + internal ModelWithEncodedNames() => throw null; + + protected virtual ModelWithEncodedNames PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithEncodedNames IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithEncodedNames modelWithEncodedNames) => throw null; + + public static explicit operator ModelWithEncodedNames(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithEncodedNames.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithEncodedNames.cs new file mode 100644 index 00000000000..5f1535e658a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithEncodedNames.cs @@ -0,0 +1,21 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Payload.Xml +{ + public partial class ModelWithEncodedNames + { + public ModelWithEncodedNames(SimpleModel modelData, IEnumerable colors) => throw null; + + public SimpleModel ModelData + { + get => throw null; + set => throw null; + } + + public IList Colors => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithEnum.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithEnum.Serialization.cs new file mode 100644 index 00000000000..8544bd0f849 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithEnum.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithEnum : IPersistableModel + { + internal ModelWithEnum() => throw null; + + protected virtual ModelWithEnum PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithEnum IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithEnum modelWithEnum) => throw null; + + public static explicit operator ModelWithEnum(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithEnum.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithEnum.cs new file mode 100644 index 00000000000..49f67b403ee --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithEnum.cs @@ -0,0 +1,17 @@ +// + +#nullable disable + +namespace Payload.Xml +{ + public partial class ModelWithEnum + { + public ModelWithEnum(Status status) => throw null; + + public Status Status + { + get => throw null; + set => throw null; + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithNamespace.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithNamespace.Serialization.cs new file mode 100644 index 00000000000..2868683e87a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithNamespace.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithNamespace : IPersistableModel + { + internal ModelWithNamespace() => throw null; + + protected virtual ModelWithNamespace PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithNamespace IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithNamespace modelWithNamespace) => throw null; + + public static explicit operator ModelWithNamespace(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithNamespace.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithNamespace.cs new file mode 100644 index 00000000000..c366b528de0 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithNamespace.cs @@ -0,0 +1,23 @@ +// + +#nullable disable + +namespace Payload.Xml +{ + public partial class ModelWithNamespace + { + public ModelWithNamespace(int id, string title) => throw null; + + public int Id + { + get => throw null; + set => throw null; + } + + public string Title + { + get => throw null; + set => throw null; + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithNamespaceOnProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithNamespaceOnProperties.Serialization.cs new file mode 100644 index 00000000000..07073e90e6a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithNamespaceOnProperties.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithNamespaceOnProperties : IPersistableModel + { + internal ModelWithNamespaceOnProperties() => throw null; + + protected virtual ModelWithNamespaceOnProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithNamespaceOnProperties IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithNamespaceOnProperties modelWithNamespaceOnProperties) => throw null; + + public static explicit operator ModelWithNamespaceOnProperties(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithNamespaceOnProperties.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithNamespaceOnProperties.cs new file mode 100644 index 00000000000..d9798be6862 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithNamespaceOnProperties.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +namespace Payload.Xml +{ + public partial class ModelWithNamespaceOnProperties + { + public ModelWithNamespaceOnProperties(int id, string title, string author) => throw null; + + public int Id + { + get => throw null; + set => throw null; + } + + public string Title + { + get => throw null; + set => throw null; + } + + public string Author + { + get => throw null; + set => throw null; + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithNestedModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithNestedModel.Serialization.cs new file mode 100644 index 00000000000..ca33900b650 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithNestedModel.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithNestedModel : IPersistableModel + { + internal ModelWithNestedModel() => throw null; + + protected virtual ModelWithNestedModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithNestedModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithNestedModel modelWithNestedModel) => throw null; + + public static explicit operator ModelWithNestedModel(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithNestedModel.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithNestedModel.cs new file mode 100644 index 00000000000..0e3c4723525 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithNestedModel.cs @@ -0,0 +1,17 @@ +// + +#nullable disable + +namespace Payload.Xml +{ + public partial class ModelWithNestedModel + { + public ModelWithNestedModel(SimpleModel nested) => throw null; + + public SimpleModel Nested + { + get => throw null; + set => throw null; + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithOptionalField.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithOptionalField.Serialization.cs new file mode 100644 index 00000000000..4c203caa62e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithOptionalField.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithOptionalField : IPersistableModel + { + internal ModelWithOptionalField() => throw null; + + protected virtual ModelWithOptionalField PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithOptionalField IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithOptionalField modelWithOptionalField) => throw null; + + public static explicit operator ModelWithOptionalField(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithOptionalField.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithOptionalField.cs new file mode 100644 index 00000000000..95045ffe8cd --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithOptionalField.cs @@ -0,0 +1,23 @@ +// + +#nullable disable + +namespace Payload.Xml +{ + public partial class ModelWithOptionalField + { + public ModelWithOptionalField(string item) => throw null; + + public string Item + { + get => throw null; + set => throw null; + } + + public int? Value + { + get => throw null; + set => throw null; + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedArrays.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedArrays.Serialization.cs new file mode 100644 index 00000000000..1320a372055 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedArrays.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedArrays : IPersistableModel + { + internal ModelWithRenamedArrays() => throw null; + + protected virtual ModelWithRenamedArrays PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithRenamedArrays IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithRenamedArrays modelWithRenamedArrays) => throw null; + + public static explicit operator ModelWithRenamedArrays(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedArrays.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedArrays.cs new file mode 100644 index 00000000000..a5144155c64 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedArrays.cs @@ -0,0 +1,17 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedArrays + { + public ModelWithRenamedArrays(IEnumerable colors, IEnumerable counts) => throw null; + + public IList Colors => throw null; + + public IList Counts => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedAttribute.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedAttribute.Serialization.cs new file mode 100644 index 00000000000..ed5e2b18e4f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedAttribute.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedAttribute : IPersistableModel + { + internal ModelWithRenamedAttribute() => throw null; + + protected virtual ModelWithRenamedAttribute PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithRenamedAttribute IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithRenamedAttribute modelWithRenamedAttribute) => throw null; + + public static explicit operator ModelWithRenamedAttribute(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedAttribute.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedAttribute.cs new file mode 100644 index 00000000000..ebf468e413d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedAttribute.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +namespace Payload.Xml +{ + public partial class ModelWithRenamedAttribute + { + public ModelWithRenamedAttribute(int id, string title, string author) => throw null; + + public int Id + { + get => throw null; + set => throw null; + } + + public string Title + { + get => throw null; + set => throw null; + } + + public string Author + { + get => throw null; + set => throw null; + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedFields.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedFields.Serialization.cs new file mode 100644 index 00000000000..c2286aa52be --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedFields.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedFields : IPersistableModel + { + internal ModelWithRenamedFields() => throw null; + + protected virtual ModelWithRenamedFields PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithRenamedFields IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithRenamedFields modelWithRenamedFields) => throw null; + + public static explicit operator ModelWithRenamedFields(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedFields.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedFields.cs new file mode 100644 index 00000000000..7970d9ac7d9 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedFields.cs @@ -0,0 +1,23 @@ +// + +#nullable disable + +namespace Payload.Xml +{ + public partial class ModelWithRenamedFields + { + public ModelWithRenamedFields(SimpleModel inputData, SimpleModel outputData) => throw null; + + public SimpleModel InputData + { + get => throw null; + set => throw null; + } + + public SimpleModel OutputData + { + get => throw null; + set => throw null; + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedNestedModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedNestedModel.Serialization.cs new file mode 100644 index 00000000000..bcf2e97bc59 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedNestedModel.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedNestedModel : IPersistableModel + { + internal ModelWithRenamedNestedModel() => throw null; + + protected virtual ModelWithRenamedNestedModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithRenamedNestedModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithRenamedNestedModel modelWithRenamedNestedModel) => throw null; + + public static explicit operator ModelWithRenamedNestedModel(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedNestedModel.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedNestedModel.cs new file mode 100644 index 00000000000..4cb880d2bb0 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedNestedModel.cs @@ -0,0 +1,17 @@ +// + +#nullable disable + +namespace Payload.Xml +{ + public partial class ModelWithRenamedNestedModel + { + public ModelWithRenamedNestedModel(Author author) => throw null; + + public Author Author + { + get => throw null; + set => throw null; + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedProperty.Serialization.cs new file mode 100644 index 00000000000..e01f7a9482e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedProperty.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedProperty : IPersistableModel + { + internal ModelWithRenamedProperty() => throw null; + + protected virtual ModelWithRenamedProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithRenamedProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithRenamedProperty modelWithRenamedProperty) => throw null; + + public static explicit operator ModelWithRenamedProperty(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedProperty.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedProperty.cs new file mode 100644 index 00000000000..f26cd56e51c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedProperty.cs @@ -0,0 +1,23 @@ +// + +#nullable disable + +namespace Payload.Xml +{ + public partial class ModelWithRenamedProperty + { + public ModelWithRenamedProperty(string title, string author) => throw null; + + public string Title + { + get => throw null; + set => throw null; + } + + public string Author + { + get => throw null; + set => throw null; + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedUnwrappedModelArray.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedUnwrappedModelArray.Serialization.cs new file mode 100644 index 00000000000..f7936acf90a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedUnwrappedModelArray.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedUnwrappedModelArray : IPersistableModel + { + internal ModelWithRenamedUnwrappedModelArray() => throw null; + + protected virtual ModelWithRenamedUnwrappedModelArray PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithRenamedUnwrappedModelArray IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithRenamedUnwrappedModelArray modelWithRenamedUnwrappedModelArray) => throw null; + + public static explicit operator ModelWithRenamedUnwrappedModelArray(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedUnwrappedModelArray.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedUnwrappedModelArray.cs new file mode 100644 index 00000000000..15653a1f1c6 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedUnwrappedModelArray.cs @@ -0,0 +1,15 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedUnwrappedModelArray + { + public ModelWithRenamedUnwrappedModelArray(IEnumerable items) => throw null; + + public IList Items => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedWrappedAndItemModelArray.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedWrappedAndItemModelArray.Serialization.cs new file mode 100644 index 00000000000..91e5fb31b10 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedWrappedAndItemModelArray.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedWrappedAndItemModelArray : IPersistableModel + { + internal ModelWithRenamedWrappedAndItemModelArray() => throw null; + + protected virtual ModelWithRenamedWrappedAndItemModelArray PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithRenamedWrappedAndItemModelArray IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithRenamedWrappedAndItemModelArray modelWithRenamedWrappedAndItemModelArray) => throw null; + + public static explicit operator ModelWithRenamedWrappedAndItemModelArray(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedWrappedAndItemModelArray.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedWrappedAndItemModelArray.cs new file mode 100644 index 00000000000..d0cffdcb68e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedWrappedAndItemModelArray.cs @@ -0,0 +1,15 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedWrappedAndItemModelArray + { + public ModelWithRenamedWrappedAndItemModelArray(IEnumerable books) => throw null; + + public IList Books => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedWrappedModelArray.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedWrappedModelArray.Serialization.cs new file mode 100644 index 00000000000..69135a16420 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedWrappedModelArray.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedWrappedModelArray : IPersistableModel + { + internal ModelWithRenamedWrappedModelArray() => throw null; + + protected virtual ModelWithRenamedWrappedModelArray PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithRenamedWrappedModelArray IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithRenamedWrappedModelArray modelWithRenamedWrappedModelArray) => throw null; + + public static explicit operator ModelWithRenamedWrappedModelArray(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedWrappedModelArray.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedWrappedModelArray.cs new file mode 100644 index 00000000000..d882d0cd027 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithRenamedWrappedModelArray.cs @@ -0,0 +1,15 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Payload.Xml +{ + public partial class ModelWithRenamedWrappedModelArray + { + public ModelWithRenamedWrappedModelArray(IEnumerable items) => throw null; + + public IList Items => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithSimpleArrays.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithSimpleArrays.Serialization.cs new file mode 100644 index 00000000000..28e56aff94c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithSimpleArrays.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithSimpleArrays : IPersistableModel + { + internal ModelWithSimpleArrays() => throw null; + + protected virtual ModelWithSimpleArrays PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithSimpleArrays IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithSimpleArrays modelWithSimpleArrays) => throw null; + + public static explicit operator ModelWithSimpleArrays(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithSimpleArrays.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithSimpleArrays.cs new file mode 100644 index 00000000000..2c6b049b891 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithSimpleArrays.cs @@ -0,0 +1,17 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Payload.Xml +{ + public partial class ModelWithSimpleArrays + { + public ModelWithSimpleArrays(IEnumerable colors, IEnumerable counts) => throw null; + + public IList Colors => throw null; + + public IList Counts => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithText.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithText.Serialization.cs new file mode 100644 index 00000000000..2aafc54c7ea --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithText.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithText : IPersistableModel + { + internal ModelWithText() => throw null; + + protected virtual ModelWithText PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithText IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithText modelWithText) => throw null; + + public static explicit operator ModelWithText(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithText.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithText.cs new file mode 100644 index 00000000000..e6df57e8108 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithText.cs @@ -0,0 +1,23 @@ +// + +#nullable disable + +namespace Payload.Xml +{ + public partial class ModelWithText + { + public ModelWithText(string language, string content) => throw null; + + public string Language + { + get => throw null; + set => throw null; + } + + public string Content + { + get => throw null; + set => throw null; + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithUnwrappedArray.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithUnwrappedArray.Serialization.cs new file mode 100644 index 00000000000..4d60f57676a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithUnwrappedArray.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithUnwrappedArray : IPersistableModel + { + internal ModelWithUnwrappedArray() => throw null; + + protected virtual ModelWithUnwrappedArray PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithUnwrappedArray IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithUnwrappedArray modelWithUnwrappedArray) => throw null; + + public static explicit operator ModelWithUnwrappedArray(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithUnwrappedArray.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithUnwrappedArray.cs new file mode 100644 index 00000000000..7abeee6f923 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithUnwrappedArray.cs @@ -0,0 +1,17 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Payload.Xml +{ + public partial class ModelWithUnwrappedArray + { + public ModelWithUnwrappedArray(IEnumerable colors, IEnumerable counts) => throw null; + + public IList Colors => throw null; + + public IList Counts => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithUnwrappedModelArray.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithUnwrappedModelArray.Serialization.cs new file mode 100644 index 00000000000..97e092bf180 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithUnwrappedModelArray.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithUnwrappedModelArray : IPersistableModel + { + internal ModelWithUnwrappedModelArray() => throw null; + + protected virtual ModelWithUnwrappedModelArray PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithUnwrappedModelArray IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithUnwrappedModelArray modelWithUnwrappedModelArray) => throw null; + + public static explicit operator ModelWithUnwrappedModelArray(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithUnwrappedModelArray.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithUnwrappedModelArray.cs new file mode 100644 index 00000000000..50fcbe6ed4f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithUnwrappedModelArray.cs @@ -0,0 +1,15 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Payload.Xml +{ + public partial class ModelWithUnwrappedModelArray + { + public ModelWithUnwrappedModelArray(IEnumerable items) => throw null; + + public IList Items => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithWrappedPrimitiveCustomItemNames.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithWrappedPrimitiveCustomItemNames.Serialization.cs new file mode 100644 index 00000000000..9a050e120fe --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithWrappedPrimitiveCustomItemNames.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class ModelWithWrappedPrimitiveCustomItemNames : IPersistableModel + { + internal ModelWithWrappedPrimitiveCustomItemNames() => throw null; + + protected virtual ModelWithWrappedPrimitiveCustomItemNames PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithWrappedPrimitiveCustomItemNames IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithWrappedPrimitiveCustomItemNames modelWithWrappedPrimitiveCustomItemNames) => throw null; + + public static explicit operator ModelWithWrappedPrimitiveCustomItemNames(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithWrappedPrimitiveCustomItemNames.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithWrappedPrimitiveCustomItemNames.cs new file mode 100644 index 00000000000..4c17ff45b9f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/ModelWithWrappedPrimitiveCustomItemNames.cs @@ -0,0 +1,15 @@ +// + +#nullable disable + +using System.Collections.Generic; + +namespace Payload.Xml +{ + public partial class ModelWithWrappedPrimitiveCustomItemNames + { + public ModelWithWrappedPrimitiveCustomItemNames(IEnumerable tags) => throw null; + + public IList Tags => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/PayloadXmlContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/PayloadXmlContext.cs new file mode 100644 index 00000000000..7c86a43f73b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/PayloadXmlContext.cs @@ -0,0 +1,39 @@ +// + +#nullable disable + +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + [ModelReaderWriterBuildable(typeof(Author))] + [ModelReaderWriterBuildable(typeof(Book))] + [ModelReaderWriterBuildable(typeof(ModelWithArrayOfModel))] + [ModelReaderWriterBuildable(typeof(ModelWithAttributes))] + [ModelReaderWriterBuildable(typeof(ModelWithDatetime))] + [ModelReaderWriterBuildable(typeof(ModelWithDictionary))] + [ModelReaderWriterBuildable(typeof(ModelWithEmptyArray))] + [ModelReaderWriterBuildable(typeof(ModelWithEncodedNames))] + [ModelReaderWriterBuildable(typeof(ModelWithEnum))] + [ModelReaderWriterBuildable(typeof(ModelWithNamespace))] + [ModelReaderWriterBuildable(typeof(ModelWithNamespaceOnProperties))] + [ModelReaderWriterBuildable(typeof(ModelWithNestedModel))] + [ModelReaderWriterBuildable(typeof(ModelWithOptionalField))] + [ModelReaderWriterBuildable(typeof(ModelWithRenamedArrays))] + [ModelReaderWriterBuildable(typeof(ModelWithRenamedAttribute))] + [ModelReaderWriterBuildable(typeof(ModelWithRenamedFields))] + [ModelReaderWriterBuildable(typeof(ModelWithRenamedNestedModel))] + [ModelReaderWriterBuildable(typeof(ModelWithRenamedProperty))] + [ModelReaderWriterBuildable(typeof(ModelWithRenamedUnwrappedModelArray))] + [ModelReaderWriterBuildable(typeof(ModelWithRenamedWrappedAndItemModelArray))] + [ModelReaderWriterBuildable(typeof(ModelWithRenamedWrappedModelArray))] + [ModelReaderWriterBuildable(typeof(ModelWithSimpleArrays))] + [ModelReaderWriterBuildable(typeof(ModelWithText))] + [ModelReaderWriterBuildable(typeof(ModelWithUnwrappedArray))] + [ModelReaderWriterBuildable(typeof(ModelWithUnwrappedModelArray))] + [ModelReaderWriterBuildable(typeof(ModelWithWrappedPrimitiveCustomItemNames))] + [ModelReaderWriterBuildable(typeof(SimpleModel))] + public partial class PayloadXmlContext : ModelReaderWriterContext + { + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/SimpleModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/SimpleModel.Serialization.cs new file mode 100644 index 00000000000..5a8279740c9 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/SimpleModel.Serialization.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; + +namespace Payload.Xml +{ + public partial class SimpleModel : IPersistableModel + { + internal SimpleModel() => throw null; + + protected virtual SimpleModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + SimpleModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(SimpleModel simpleModel) => throw null; + + public static explicit operator SimpleModel(ClientResult result) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/SimpleModel.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/SimpleModel.cs new file mode 100644 index 00000000000..1121bbc100f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/SimpleModel.cs @@ -0,0 +1,23 @@ +// + +#nullable disable + +namespace Payload.Xml +{ + public partial class SimpleModel + { + public SimpleModel(string name, int age) => throw null; + + public string Name + { + get => throw null; + set => throw null; + } + + public int Age + { + get => throw null; + set => throw null; + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/Status.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/Status.cs new file mode 100644 index 00000000000..e4ba0db6c4e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/Models/Status.cs @@ -0,0 +1,38 @@ +// + +#nullable disable + +using System; +using System.ComponentModel; + +namespace Payload.Xml +{ + public readonly partial struct Status : IEquatable + { + public Status(string value) => throw null; + + public static Status Pending => throw null; + + public static Status Success => throw null; + + public static Status Error => throw null; + + public static bool operator ==(Status left, Status right) => throw null; + + public static bool operator !=(Status left, Status right) => throw null; + + public static implicit operator Status(string value) => throw null; + + public static implicit operator Status?(string value) => throw null; + + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object obj) => throw null; + + public bool Equals(Status other) => throw null; + + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => throw null; + + public override string ToString() => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/PayloadXmlModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/PayloadXmlModelFactory.cs new file mode 100644 index 00000000000..41c63322f3b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/PayloadXmlModelFactory.cs @@ -0,0 +1,66 @@ +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace Payload.Xml +{ + public static partial class PayloadXmlModelFactory + { + public static SimpleModel SimpleModel(string name = default, int age = default) => throw null; + + public static ModelWithRenamedProperty ModelWithRenamedProperty(string title = default, string author = default) => throw null; + + public static ModelWithRenamedFields ModelWithRenamedFields(SimpleModel inputData = default, SimpleModel outputData = default) => throw null; + + public static ModelWithNestedModel ModelWithNestedModel(SimpleModel nested = default) => throw null; + + public static ModelWithRenamedNestedModel ModelWithRenamedNestedModel(Author author = default) => throw null; + + public static Author Author(string name = default) => throw null; + + public static ModelWithSimpleArrays ModelWithSimpleArrays(IEnumerable colors = default, IEnumerable counts = default) => throw null; + + public static ModelWithUnwrappedArray ModelWithUnwrappedArray(IEnumerable colors = default, IEnumerable counts = default) => throw null; + + public static ModelWithRenamedArrays ModelWithRenamedArrays(IEnumerable colors = default, IEnumerable counts = default) => throw null; + + public static ModelWithWrappedPrimitiveCustomItemNames ModelWithWrappedPrimitiveCustomItemNames(IEnumerable tags = default) => throw null; + + public static ModelWithArrayOfModel ModelWithArrayOfModel(IEnumerable items = default) => throw null; + + public static ModelWithUnwrappedModelArray ModelWithUnwrappedModelArray(IEnumerable items = default) => throw null; + + public static ModelWithRenamedWrappedModelArray ModelWithRenamedWrappedModelArray(IEnumerable items = default) => throw null; + + public static ModelWithRenamedUnwrappedModelArray ModelWithRenamedUnwrappedModelArray(IEnumerable items = default) => throw null; + + public static ModelWithRenamedWrappedAndItemModelArray ModelWithRenamedWrappedAndItemModelArray(IEnumerable books = default) => throw null; + + public static Book Book(string title = default) => throw null; + + public static ModelWithAttributes ModelWithAttributes(int id1 = default, string id2 = default, bool enabled = default) => throw null; + + public static ModelWithRenamedAttribute ModelWithRenamedAttribute(int id = default, string title = default, string author = default) => throw null; + + public static ModelWithNamespace ModelWithNamespace(int id = default, string title = default) => throw null; + + public static ModelWithNamespaceOnProperties ModelWithNamespaceOnProperties(int id = default, string title = default, string author = default) => throw null; + + public static ModelWithText ModelWithText(string language = default, string content = default) => throw null; + + public static ModelWithOptionalField ModelWithOptionalField(string item = default, int? value = default) => throw null; + + public static ModelWithEmptyArray ModelWithEmptyArray(IEnumerable items = default) => throw null; + + public static ModelWithDictionary ModelWithDictionary(IDictionary metadata = default) => throw null; + + public static ModelWithEncodedNames ModelWithEncodedNames(SimpleModel modelData = default, IEnumerable colors = default) => throw null; + + public static ModelWithEnum ModelWithEnum(Status status = default) => throw null; + + public static ModelWithDatetime ModelWithDatetime(DateTimeOffset rfc3339 = default, DateTimeOffset rfc7231 = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/SimpleModelValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/SimpleModelValue.cs new file mode 100644 index 00000000000..0ca41673678 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/SimpleModelValue.cs @@ -0,0 +1,37 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class SimpleModelValue + { + protected SimpleModelValue() => throw null; + + internal SimpleModelValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult Put(SimpleModel input, CancellationToken cancellationToken = default) => throw null; + + public virtual Task PutAsync(SimpleModel input, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/XmlClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/XmlClient.cs new file mode 100644 index 00000000000..84b5a3eacf2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/XmlClient.cs @@ -0,0 +1,76 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; + +namespace Payload.Xml +{ + public partial class XmlClient + { + public XmlClient() : this(new Uri("http://localhost:3000"), new XmlClientOptions()) => throw null; + + internal XmlClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, XmlClientOptions options) => throw null; + + public XmlClient(Uri endpoint, XmlClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public XmlClient(XmlClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual SimpleModelValue GetSimpleModelValueClient() => throw null; + + public virtual ModelWithRenamedPropertyValue GetModelWithRenamedPropertyValueClient() => throw null; + + public virtual ModelWithRenamedFieldsValue GetModelWithRenamedFieldsValueClient() => throw null; + + public virtual ModelWithNestedModelValue GetModelWithNestedModelValueClient() => throw null; + + public virtual ModelWithRenamedNestedModelValue GetModelWithRenamedNestedModelValueClient() => throw null; + + public virtual ModelWithSimpleArraysValue GetModelWithSimpleArraysValueClient() => throw null; + + public virtual ModelWithUnwrappedArrayValue GetModelWithUnwrappedArrayValueClient() => throw null; + + public virtual ModelWithRenamedArraysValue GetModelWithRenamedArraysValueClient() => throw null; + + public virtual ModelWithWrappedPrimitiveCustomItemNamesValue GetModelWithWrappedPrimitiveCustomItemNamesValueClient() => throw null; + + public virtual ModelWithArrayOfModelValue GetModelWithArrayOfModelValueClient() => throw null; + + public virtual ModelWithUnwrappedModelArrayValue GetModelWithUnwrappedModelArrayValueClient() => throw null; + + public virtual ModelWithRenamedWrappedModelArrayValue GetModelWithRenamedWrappedModelArrayValueClient() => throw null; + + public virtual ModelWithRenamedUnwrappedModelArrayValue GetModelWithRenamedUnwrappedModelArrayValueClient() => throw null; + + public virtual ModelWithRenamedWrappedAndItemModelArrayValue GetModelWithRenamedWrappedAndItemModelArrayValueClient() => throw null; + + public virtual ModelWithAttributesValue GetModelWithAttributesValueClient() => throw null; + + public virtual ModelWithRenamedAttributeValue GetModelWithRenamedAttributeValueClient() => throw null; + + public virtual ModelWithNamespaceValue GetModelWithNamespaceValueClient() => throw null; + + public virtual ModelWithNamespaceOnPropertiesValue GetModelWithNamespaceOnPropertiesValueClient() => throw null; + + public virtual ModelWithTextValue GetModelWithTextValueClient() => throw null; + + public virtual ModelWithOptionalFieldValue GetModelWithOptionalFieldValueClient() => throw null; + + public virtual ModelWithEmptyArrayValue GetModelWithEmptyArrayValueClient() => throw null; + + public virtual ModelWithDictionaryValue GetModelWithDictionaryValueClient() => throw null; + + public virtual ModelWithEncodedNamesValue GetModelWithEncodedNamesValueClient() => throw null; + + public virtual ModelWithEnumValue GetModelWithEnumValueClient() => throw null; + + public virtual ModelWithDatetimeValue GetModelWithDatetimeValueClient() => throw null; + + public virtual XmlErrorValue GetXmlErrorValueClient() => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/XmlClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/XmlClientOptions.cs new file mode 100644 index 00000000000..8969f41eb08 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/XmlClientOptions.cs @@ -0,0 +1,18 @@ +// + +#nullable disable + +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Payload.Xml +{ + public partial class XmlClientOptions : ClientPipelineOptions + { + public XmlClientOptions() => throw null; + + [Experimental("SCME0002")] + internal XmlClientOptions(IConfigurationSection section) : base(section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/XmlClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/XmlClientSettings.cs new file mode 100644 index 00000000000..57bc9f1bbc8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/XmlClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Payload.Xml +{ + [Experimental("SCME0002")] + public partial class XmlClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public XmlClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/XmlErrorValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/XmlErrorValue.cs new file mode 100644 index 00000000000..cf37b300967 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/XmlErrorValue.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace Payload.Xml +{ + public partial class XmlErrorValue + { + protected XmlErrorValue() => throw null; + + internal XmlErrorValue(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult Get(RequestOptions options) => throw null; + + public virtual Task GetAsync(RequestOptions options) => throw null; + + public virtual ClientResult Get(CancellationToken cancellationToken = default) => throw null; + + public virtual Task> GetAsync(CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..c6bdafb54b6 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "XmlClient": { + "type": "object", + "description": "Configuration for XmlClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/xmlClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "xmlClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Payload.Xml.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Payload.Xml.csproj new file mode 100644 index 00000000000..7031abad3e7 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Payload.Xml.csproj @@ -0,0 +1,20 @@ + + + This is the Payload.Xml client library for developing .NET applications with rich experience. + SDK Code Generation Payload.Xml + 1.0.0-beta.1 + Payload.Xml + netstandard2.0;net8.0 + latest + true + + + + + + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/tspCodeModel.json new file mode 100644 index 00000000000..5742dc41388 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/tspCodeModel.json @@ -0,0 +1,10658 @@ +{ + "name": "Payload.Xml", + "apiVersions": [], + "enums": [ + { + "$id": "1", + "kind": "enum", + "name": "Status", + "crossLanguageDefinitionId": "Payload.Xml.Status", + "valueType": { + "$id": "2", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "values": [ + { + "$id": "3", + "kind": "enumvalue", + "name": "pending", + "value": "pending", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "doc": "Pending status.", + "decorators": [] + }, + { + "$id": "4", + "kind": "enumvalue", + "name": "success", + "value": "success", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "doc": "Success status.", + "decorators": [] + }, + { + "$id": "5", + "kind": "enumvalue", + "name": "error", + "value": "error", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "doc": "Error status.", + "decorators": [] + } + ], + "namespace": "Payload.Xml", + "doc": "Status values for the model with enum.", + "isFixed": false, + "isFlags": false, + "usage": "Input,Output,Xml", + "decorators": [] + } + ], + "constants": [ + { + "$id": "6", + "kind": "constant", + "name": "getContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "7", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "8", + "kind": "constant", + "name": "GetResponseContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "9", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "10", + "kind": "constant", + "name": "GetResponseContentType1", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "11", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "12", + "kind": "constant", + "name": "GetResponseContentType2", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "13", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "14", + "kind": "constant", + "name": "getContentType1", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "15", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "16", + "kind": "constant", + "name": "GetResponseContentType3", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "17", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "18", + "kind": "constant", + "name": "GetResponseContentType4", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "19", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "20", + "kind": "constant", + "name": "GetResponseContentType5", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "21", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "22", + "kind": "constant", + "name": "getContentType2", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "23", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "24", + "kind": "constant", + "name": "GetResponseContentType6", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "25", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "26", + "kind": "constant", + "name": "GetResponseContentType7", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "27", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "28", + "kind": "constant", + "name": "GetResponseContentType8", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "29", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "30", + "kind": "constant", + "name": "getContentType3", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "31", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "32", + "kind": "constant", + "name": "GetResponseContentType9", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "33", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "34", + "kind": "constant", + "name": "GetResponseContentType10", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "35", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "36", + "kind": "constant", + "name": "GetResponseContentType11", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "37", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "38", + "kind": "constant", + "name": "getContentType4", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "39", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "40", + "kind": "constant", + "name": "GetResponseContentType12", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "41", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "42", + "kind": "constant", + "name": "GetResponseContentType13", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "43", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "44", + "kind": "constant", + "name": "GetResponseContentType14", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "45", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "46", + "kind": "constant", + "name": "getContentType5", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "47", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "48", + "kind": "constant", + "name": "GetResponseContentType15", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "49", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "50", + "kind": "constant", + "name": "GetResponseContentType16", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "51", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "52", + "kind": "constant", + "name": "GetResponseContentType17", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "53", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "54", + "kind": "constant", + "name": "getContentType6", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "55", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "56", + "kind": "constant", + "name": "GetResponseContentType18", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "57", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "58", + "kind": "constant", + "name": "GetResponseContentType19", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "59", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "60", + "kind": "constant", + "name": "GetResponseContentType20", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "61", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "62", + "kind": "constant", + "name": "getContentType7", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "63", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "64", + "kind": "constant", + "name": "GetResponseContentType21", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "65", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "66", + "kind": "constant", + "name": "GetResponseContentType22", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "67", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "68", + "kind": "constant", + "name": "GetResponseContentType23", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "69", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "70", + "kind": "constant", + "name": "getContentType8", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "71", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "72", + "kind": "constant", + "name": "GetResponseContentType24", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "73", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "74", + "kind": "constant", + "name": "GetResponseContentType25", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "75", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "76", + "kind": "constant", + "name": "GetResponseContentType26", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "77", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "78", + "kind": "constant", + "name": "getContentType9", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "79", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "80", + "kind": "constant", + "name": "GetResponseContentType27", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "81", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "82", + "kind": "constant", + "name": "GetResponseContentType28", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "83", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "84", + "kind": "constant", + "name": "GetResponseContentType29", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "85", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "86", + "kind": "constant", + "name": "getContentType10", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "87", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "88", + "kind": "constant", + "name": "GetResponseContentType30", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "89", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "90", + "kind": "constant", + "name": "GetResponseContentType31", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "91", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "92", + "kind": "constant", + "name": "GetResponseContentType32", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "93", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "94", + "kind": "constant", + "name": "getContentType11", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "95", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "96", + "kind": "constant", + "name": "GetResponseContentType33", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "97", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "98", + "kind": "constant", + "name": "GetResponseContentType34", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "99", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "100", + "kind": "constant", + "name": "GetResponseContentType35", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "101", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "102", + "kind": "constant", + "name": "getContentType12", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "103", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "104", + "kind": "constant", + "name": "GetResponseContentType36", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "105", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "106", + "kind": "constant", + "name": "GetResponseContentType37", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "107", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "108", + "kind": "constant", + "name": "GetResponseContentType38", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "109", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "110", + "kind": "constant", + "name": "getContentType13", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "111", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "112", + "kind": "constant", + "name": "GetResponseContentType39", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "113", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "114", + "kind": "constant", + "name": "GetResponseContentType40", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "115", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "116", + "kind": "constant", + "name": "GetResponseContentType41", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "117", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "118", + "kind": "constant", + "name": "getContentType14", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "119", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "120", + "kind": "constant", + "name": "GetResponseContentType42", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "121", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "122", + "kind": "constant", + "name": "GetResponseContentType43", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "123", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "124", + "kind": "constant", + "name": "GetResponseContentType44", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "125", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "126", + "kind": "constant", + "name": "getContentType15", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "127", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "128", + "kind": "constant", + "name": "GetResponseContentType45", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "129", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "130", + "kind": "constant", + "name": "GetResponseContentType46", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "131", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "132", + "kind": "constant", + "name": "GetResponseContentType47", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "133", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "134", + "kind": "constant", + "name": "getContentType16", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "135", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "136", + "kind": "constant", + "name": "GetResponseContentType48", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "137", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "138", + "kind": "constant", + "name": "GetResponseContentType49", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "139", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "140", + "kind": "constant", + "name": "GetResponseContentType50", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "141", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "142", + "kind": "constant", + "name": "getContentType17", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "143", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "144", + "kind": "constant", + "name": "GetResponseContentType51", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "145", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "146", + "kind": "constant", + "name": "GetResponseContentType52", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "147", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "148", + "kind": "constant", + "name": "GetResponseContentType53", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "149", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "150", + "kind": "constant", + "name": "getContentType18", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "151", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "152", + "kind": "constant", + "name": "GetResponseContentType54", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "153", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "154", + "kind": "constant", + "name": "GetResponseContentType55", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "155", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "156", + "kind": "constant", + "name": "GetResponseContentType56", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "157", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "158", + "kind": "constant", + "name": "getContentType19", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "159", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "160", + "kind": "constant", + "name": "GetResponseContentType57", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "161", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "162", + "kind": "constant", + "name": "GetResponseContentType58", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "163", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "164", + "kind": "constant", + "name": "GetResponseContentType59", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "165", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "166", + "kind": "constant", + "name": "getContentType20", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "167", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "168", + "kind": "constant", + "name": "GetResponseContentType60", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "169", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "170", + "kind": "constant", + "name": "GetResponseContentType61", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "171", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "172", + "kind": "constant", + "name": "GetResponseContentType62", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "173", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "174", + "kind": "constant", + "name": "getContentType21", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "175", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "176", + "kind": "constant", + "name": "GetResponseContentType63", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "177", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "178", + "kind": "constant", + "name": "GetResponseContentType64", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "179", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "180", + "kind": "constant", + "name": "GetResponseContentType65", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "181", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "182", + "kind": "constant", + "name": "getContentType22", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "183", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "184", + "kind": "constant", + "name": "GetResponseContentType66", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "185", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "186", + "kind": "constant", + "name": "GetResponseContentType67", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "187", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "188", + "kind": "constant", + "name": "GetResponseContentType68", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "189", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "190", + "kind": "constant", + "name": "getContentType23", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "191", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "192", + "kind": "constant", + "name": "GetResponseContentType69", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "193", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "194", + "kind": "constant", + "name": "GetResponseContentType70", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "195", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "196", + "kind": "constant", + "name": "GetResponseContentType71", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "197", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "198", + "kind": "constant", + "name": "getContentType24", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "199", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "200", + "kind": "constant", + "name": "GetResponseContentType72", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "201", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "202", + "kind": "constant", + "name": "GetResponseContentType73", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "203", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "204", + "kind": "constant", + "name": "GetResponseContentType74", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "205", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "206", + "kind": "constant", + "name": "getContentType25", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "207", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + }, + { + "$id": "208", + "kind": "constant", + "name": "GetResponseContentType75", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "209", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/xml", + "decorators": [] + } + ], + "models": [ + { + "$id": "210", + "kind": "model", + "name": "SimpleModel", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.SimpleModel", + "usage": "Input,Output,Xml", + "doc": "§1.1 — Contains fields of primitive types.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "SimpleModel", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "211", + "kind": "property", + "name": "name", + "serializedName": "name", + "type": { + "$id": "212", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.SimpleModel.name", + "serializationOptions": { + "xml": { + "name": "name", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "213", + "kind": "property", + "name": "age", + "serializedName": "age", + "type": { + "$id": "214", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.SimpleModel.age", + "serializationOptions": { + "xml": { + "name": "age", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "215", + "kind": "model", + "name": "ModelWithRenamedProperty", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedProperty", + "usage": "Input,Output,Xml", + "doc": "§1.2 — Contains a scalar property with a custom XML name.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithRenamedProperty", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "216", + "kind": "property", + "name": "title", + "serializedName": "renamedTitle", + "type": { + "$id": "217", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "renamedTitle" + } + } + ], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedProperty.title", + "serializationOptions": { + "xml": { + "name": "renamedTitle", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "218", + "kind": "property", + "name": "author", + "serializedName": "author", + "type": { + "$id": "219", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedProperty.author", + "serializationOptions": { + "xml": { + "name": "author", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "220", + "kind": "model", + "name": "ModelWithRenamedFields", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedFields", + "usage": "Input,Output,Xml", + "doc": "§1.3, §2.3 — Contains fields of the same type that have different XML representation.", + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "ModelWithRenamedFieldsSrc" + } + } + ], + "serializationOptions": { + "xml": { + "name": "ModelWithRenamedFieldsSrc", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "221", + "kind": "property", + "name": "inputData", + "serializedName": "InputData", + "type": { + "$ref": "210" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "InputData" + } + } + ], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedFields.inputData", + "serializationOptions": { + "xml": { + "name": "InputData", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "222", + "kind": "property", + "name": "outputData", + "serializedName": "OutputData", + "type": { + "$ref": "210" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "OutputData" + } + } + ], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedFields.outputData", + "serializationOptions": { + "xml": { + "name": "OutputData", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "223", + "kind": "model", + "name": "ModelWithNestedModel", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNestedModel", + "usage": "Input,Output,Xml", + "doc": "§2.1 — Contains a property that references another model.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithNestedModel", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "224", + "kind": "property", + "name": "nested", + "serializedName": "nested", + "type": { + "$ref": "210" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNestedModel.nested", + "serializationOptions": { + "xml": { + "name": "nested", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "225", + "kind": "model", + "name": "ModelWithRenamedNestedModel", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedNestedModel", + "usage": "Input,Output,Xml", + "doc": "§2.2 — Contains a property whose type has", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithRenamedNestedModel", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "226", + "kind": "property", + "name": "author", + "serializedName": "author", + "type": { + "$id": "227", + "kind": "model", + "name": "Author", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.Author", + "usage": "Input,Output,Xml", + "doc": "Author model with a custom XML name.", + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "XmlAuthor" + } + } + ], + "serializationOptions": { + "xml": { + "name": "XmlAuthor", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "228", + "kind": "property", + "name": "name", + "serializedName": "name", + "type": { + "$id": "229", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.Author.name", + "serializationOptions": { + "xml": { + "name": "name", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedNestedModel.author", + "serializationOptions": { + "xml": { + "name": "author", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$ref": "227" + }, + { + "$id": "230", + "kind": "model", + "name": "ModelWithSimpleArrays", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithSimpleArrays", + "usage": "Input,Output,Xml", + "doc": "§3.1 — Contains fields of arrays of primitive types.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithSimpleArrays", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "231", + "kind": "property", + "name": "colors", + "serializedName": "colors", + "type": { + "$id": "232", + "kind": "array", + "name": "Array", + "valueType": { + "$id": "233", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithSimpleArrays.colors", + "serializationOptions": { + "xml": { + "name": "colors", + "attribute": false, + "unwrapped": false, + "itemsName": "string" + } + }, + "isHttpMetadata": false + }, + { + "$id": "234", + "kind": "property", + "name": "counts", + "serializedName": "counts", + "type": { + "$id": "235", + "kind": "array", + "name": "Array1", + "valueType": { + "$id": "236", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithSimpleArrays.counts", + "serializationOptions": { + "xml": { + "name": "counts", + "attribute": false, + "unwrapped": false, + "itemsName": "int32" + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "237", + "kind": "model", + "name": "ModelWithUnwrappedArray", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedArray", + "usage": "Input,Output,Xml", + "doc": "§3.2 — Contains fields of wrapped and unwrapped arrays of primitive types.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithUnwrappedArray", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "238", + "kind": "property", + "name": "colors", + "serializedName": "colors", + "type": { + "$ref": "232" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@unwrapped", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedArray.colors", + "serializationOptions": { + "xml": { + "name": "colors", + "attribute": false, + "unwrapped": true, + "itemsName": "colors" + } + }, + "isHttpMetadata": false + }, + { + "$id": "239", + "kind": "property", + "name": "counts", + "serializedName": "counts", + "type": { + "$ref": "235" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedArray.counts", + "serializationOptions": { + "xml": { + "name": "counts", + "attribute": false, + "unwrapped": false, + "itemsName": "int32" + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "240", + "kind": "model", + "name": "ModelWithRenamedArrays", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedArrays", + "usage": "Input,Output,Xml", + "doc": "§3.3, §3.4 — Contains fields of wrapped and unwrapped arrays of primitive types that have different XML representations.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithRenamedArrays", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "241", + "kind": "property", + "name": "colors", + "serializedName": "Colors", + "type": { + "$ref": "232" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@unwrapped", + "arguments": {} + }, + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "Colors" + } + } + ], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedArrays.colors", + "serializationOptions": { + "xml": { + "name": "Colors", + "attribute": false, + "unwrapped": true, + "itemsName": "Colors" + } + }, + "isHttpMetadata": false + }, + { + "$id": "242", + "kind": "property", + "name": "counts", + "serializedName": "Counts", + "type": { + "$ref": "235" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "Counts" + } + } + ], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedArrays.counts", + "serializationOptions": { + "xml": { + "name": "Counts", + "attribute": false, + "unwrapped": false, + "itemsName": "int32" + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "243", + "kind": "model", + "name": "ModelWithWrappedPrimitiveCustomItemNames", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNames", + "usage": "Input,Output,Xml", + "doc": "§3.5 — Contains a wrapped primitive array with custom wrapper and item names.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithWrappedPrimitiveCustomItemNames", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "244", + "kind": "property", + "name": "tags", + "serializedName": "ItemsTags", + "type": { + "$id": "245", + "kind": "array", + "name": "Array2", + "valueType": { + "$id": "246", + "kind": "string", + "name": "tag", + "crossLanguageDefinitionId": "Payload.Xml.tag", + "baseType": { + "$id": "247", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "ItemName" + } + } + ] + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "ItemsTags" + } + } + ], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNames.tags", + "serializationOptions": { + "xml": { + "name": "ItemsTags", + "attribute": false, + "unwrapped": false, + "itemsName": "ItemName" + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "248", + "kind": "model", + "name": "ModelWithArrayOfModel", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithArrayOfModel", + "usage": "Input,Output,Xml", + "doc": "§4.1 — Contains an array of models.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithArrayOfModel", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "249", + "kind": "property", + "name": "items", + "serializedName": "items", + "type": { + "$id": "250", + "kind": "array", + "name": "ArraySimpleModel", + "valueType": { + "$ref": "210" + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithArrayOfModel.items", + "serializationOptions": { + "xml": { + "name": "items", + "attribute": false, + "unwrapped": false, + "itemsName": "SimpleModel" + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "251", + "kind": "model", + "name": "ModelWithUnwrappedModelArray", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedModelArray", + "usage": "Input,Output,Xml", + "doc": "§4.2 — Contains an unwrapped array of models.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithUnwrappedModelArray", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "252", + "kind": "property", + "name": "items", + "serializedName": "items", + "type": { + "$ref": "250" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@unwrapped", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedModelArray.items", + "serializationOptions": { + "xml": { + "name": "items", + "attribute": false, + "unwrapped": true, + "itemsName": "items" + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "253", + "kind": "model", + "name": "ModelWithRenamedWrappedModelArray", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedModelArray", + "usage": "Input,Output,Xml", + "doc": "§4.3 — Contains a wrapped array of models with a custom wrapper name.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithRenamedWrappedModelArray", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "254", + "kind": "property", + "name": "items", + "serializedName": "AllItems", + "type": { + "$ref": "250" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "AllItems" + } + } + ], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedModelArray.items", + "serializationOptions": { + "xml": { + "name": "AllItems", + "attribute": false, + "unwrapped": false, + "itemsName": "SimpleModel" + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "255", + "kind": "model", + "name": "ModelWithRenamedUnwrappedModelArray", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedUnwrappedModelArray", + "usage": "Input,Output,Xml", + "doc": "§4.4 — Contains an unwrapped array of models with a custom item name.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithRenamedUnwrappedModelArray", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "256", + "kind": "property", + "name": "items", + "serializedName": "ModelItem", + "type": { + "$ref": "250" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@unwrapped", + "arguments": {} + }, + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "ModelItem" + } + } + ], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedUnwrappedModelArray.items", + "serializationOptions": { + "xml": { + "name": "ModelItem", + "attribute": false, + "unwrapped": true, + "itemsName": "ModelItem" + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "257", + "kind": "model", + "name": "ModelWithRenamedWrappedAndItemModelArray", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedAndItemModelArray", + "usage": "Input,Output,Xml", + "doc": "§4.5 — Contains a wrapped array of models with custom wrapper and item names.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithRenamedWrappedAndItemModelArray", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "258", + "kind": "property", + "name": "books", + "serializedName": "AllBooks", + "type": { + "$id": "259", + "kind": "array", + "name": "ArrayBook", + "valueType": { + "$id": "260", + "kind": "model", + "name": "Book", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.Book", + "usage": "Input,Output,Xml", + "doc": "Book model with a custom XML name.", + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "XmlBook" + } + } + ], + "serializationOptions": { + "xml": { + "name": "XmlBook", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "261", + "kind": "property", + "name": "title", + "serializedName": "title", + "type": { + "$id": "262", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.Book.title", + "serializationOptions": { + "xml": { + "name": "title", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + }, + "crossLanguageDefinitionId": "TypeSpec.Array", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "AllBooks" + } + } + ], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedAndItemModelArray.books", + "serializationOptions": { + "xml": { + "name": "AllBooks", + "attribute": false, + "unwrapped": false, + "itemsName": "XmlBook" + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$ref": "260" + }, + { + "$id": "263", + "kind": "model", + "name": "ModelWithAttributes", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithAttributes", + "usage": "Input,Output,Xml", + "doc": "§5.1 — Contains fields that are XML attributes.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithAttributes", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "264", + "kind": "property", + "name": "id1", + "serializedName": "id1", + "type": { + "$id": "265", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@attribute", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithAttributes.id1", + "serializationOptions": { + "xml": { + "name": "id1", + "attribute": true, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "266", + "kind": "property", + "name": "id2", + "serializedName": "id2", + "type": { + "$id": "267", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@attribute", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithAttributes.id2", + "serializationOptions": { + "xml": { + "name": "id2", + "attribute": true, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "268", + "kind": "property", + "name": "enabled", + "serializedName": "enabled", + "type": { + "$id": "269", + "kind": "boolean", + "name": "boolean", + "crossLanguageDefinitionId": "TypeSpec.boolean", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithAttributes.enabled", + "serializationOptions": { + "xml": { + "name": "enabled", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "270", + "kind": "model", + "name": "ModelWithRenamedAttribute", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedAttribute", + "usage": "Input,Output,Xml", + "doc": "§5.2 — Contains a renamed XML attribute.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithRenamedAttribute", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "271", + "kind": "property", + "name": "id", + "serializedName": "xml-id", + "type": { + "$id": "272", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@name", + "arguments": { + "name": "xml-id" + } + }, + { + "name": "TypeSpec.Xml.@attribute", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedAttribute.id", + "serializationOptions": { + "xml": { + "name": "xml-id", + "attribute": true, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "273", + "kind": "property", + "name": "title", + "serializedName": "title", + "type": { + "$id": "274", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedAttribute.title", + "serializationOptions": { + "xml": { + "name": "title", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "275", + "kind": "property", + "name": "author", + "serializedName": "author", + "type": { + "$id": "276", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedAttribute.author", + "serializationOptions": { + "xml": { + "name": "author", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "277", + "kind": "model", + "name": "ModelWithNamespace", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespace", + "usage": "Input,Output,Xml", + "doc": "§6.1, §7.1 — Contains fields with XML namespace on the model.", + "decorators": [ + { + "name": "TypeSpec.Xml.@ns", + "arguments": { + "ns": { + "$id": "278", + "kind": "enumvalue", + "decorators": [], + "name": "smp", + "value": "http://example.com/schema", + "enumType": { + "$id": "279", + "kind": "enum", + "decorators": [ + { + "name": "TypeSpec.Xml.@nsDeclarations", + "arguments": {} + } + ], + "name": "Namespaces", + "isGeneratedName": false, + "namespace": "Payload.Xml", + "valueType": { + "$id": "280", + "kind": "string", + "decorators": [], + "doc": "A sequence of textual characters.", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "values": [ + { + "$id": "281", + "kind": "enumvalue", + "decorators": [], + "name": "smp", + "value": "http://example.com/schema", + "enumType": { + "$ref": "279" + }, + "valueType": { + "$ref": "280" + }, + "crossLanguageDefinitionId": "Payload.Xml.Namespaces.smp" + }, + { + "$id": "282", + "kind": "enumvalue", + "decorators": [], + "name": "ns2", + "value": "http://example.com/ns2", + "enumType": { + "$ref": "279" + }, + "valueType": { + "$ref": "280" + }, + "crossLanguageDefinitionId": "Payload.Xml.Namespaces.ns2" + } + ], + "isFixed": true, + "isFlags": false, + "usage": "None", + "access": "public", + "crossLanguageDefinitionId": "Payload.Xml.Namespaces", + "apiVersions": [], + "isUnionAsEnum": false, + "__accessSet": true + }, + "valueType": { + "$ref": "280" + }, + "crossLanguageDefinitionId": "Payload.Xml.Namespaces.smp" + } + } + } + ], + "serializationOptions": { + "xml": { + "name": "ModelWithNamespace", + "attribute": false, + "ns": { + "namespace": "http://example.com/schema", + "prefix": "smp" + }, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "283", + "kind": "property", + "name": "id", + "serializedName": "id", + "type": { + "$id": "284", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespace.id", + "serializationOptions": { + "xml": { + "name": "id", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "285", + "kind": "property", + "name": "title", + "serializedName": "title", + "type": { + "$id": "286", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespace.title", + "serializationOptions": { + "xml": { + "name": "title", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "287", + "kind": "model", + "name": "ModelWithNamespaceOnProperties", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceOnProperties", + "usage": "Input,Output,Xml", + "doc": "§6.2, §7.2 — Contains fields with different XML namespaces on individual properties.", + "decorators": [ + { + "name": "TypeSpec.Xml.@ns", + "arguments": { + "ns": { + "$id": "288", + "kind": "enumvalue", + "decorators": [], + "name": "smp", + "value": "http://example.com/schema", + "enumType": { + "$ref": "279" + }, + "valueType": { + "$ref": "280" + }, + "crossLanguageDefinitionId": "Payload.Xml.Namespaces.smp" + } + } + } + ], + "serializationOptions": { + "xml": { + "name": "ModelWithNamespaceOnProperties", + "attribute": false, + "ns": { + "namespace": "http://example.com/schema", + "prefix": "smp" + }, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "289", + "kind": "property", + "name": "id", + "serializedName": "id", + "type": { + "$id": "290", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceOnProperties.id", + "serializationOptions": { + "xml": { + "name": "id", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "291", + "kind": "property", + "name": "title", + "serializedName": "title", + "type": { + "$id": "292", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@ns", + "arguments": { + "ns": { + "$id": "293", + "kind": "enumvalue", + "decorators": [], + "name": "smp", + "value": "http://example.com/schema", + "enumType": { + "$ref": "279" + }, + "valueType": { + "$ref": "280" + }, + "crossLanguageDefinitionId": "Payload.Xml.Namespaces.smp" + } + } + } + ], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceOnProperties.title", + "serializationOptions": { + "xml": { + "name": "title", + "attribute": false, + "ns": { + "namespace": "http://example.com/schema", + "prefix": "smp" + }, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "294", + "kind": "property", + "name": "author", + "serializedName": "author", + "type": { + "$id": "295", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@ns", + "arguments": { + "ns": { + "$id": "296", + "kind": "enumvalue", + "decorators": [], + "name": "ns2", + "value": "http://example.com/ns2", + "enumType": { + "$ref": "279" + }, + "valueType": { + "$ref": "280" + }, + "crossLanguageDefinitionId": "Payload.Xml.Namespaces.ns2" + } + } + } + ], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceOnProperties.author", + "serializationOptions": { + "xml": { + "name": "author", + "attribute": false, + "ns": { + "namespace": "http://example.com/ns2", + "prefix": "ns2" + }, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "297", + "kind": "model", + "name": "ModelWithText", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithText", + "usage": "Input,Output,Xml", + "doc": "§8.1 — Contains an attribute and text.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithText", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "298", + "kind": "property", + "name": "language", + "serializedName": "language", + "type": { + "$id": "299", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@attribute", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithText.language", + "serializationOptions": { + "xml": { + "name": "language", + "attribute": true, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "300", + "kind": "property", + "name": "content", + "serializedName": "content", + "type": { + "$id": "301", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [ + { + "name": "TypeSpec.Xml.@unwrapped", + "arguments": {} + } + ], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithText.content", + "serializationOptions": { + "xml": { + "name": "content", + "attribute": false, + "unwrapped": true + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "302", + "kind": "model", + "name": "ModelWithOptionalField", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithOptionalField", + "usage": "Input,Output,Xml", + "doc": "Contains an optional field.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithOptionalField", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "303", + "kind": "property", + "name": "item", + "serializedName": "item", + "type": { + "$id": "304", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithOptionalField.item", + "serializationOptions": { + "xml": { + "name": "item", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "305", + "kind": "property", + "name": "value", + "serializedName": "value", + "type": { + "$id": "306", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithOptionalField.value", + "serializationOptions": { + "xml": { + "name": "value", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "307", + "kind": "model", + "name": "ModelWithEmptyArray", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEmptyArray", + "usage": "Input,Output,Xml", + "doc": "Contains an array of models that's supposed to be sent/received as an empty XML element.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithEmptyArray", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "308", + "kind": "property", + "name": "items", + "serializedName": "items", + "type": { + "$ref": "250" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEmptyArray.items", + "serializationOptions": { + "xml": { + "name": "items", + "attribute": false, + "unwrapped": false, + "itemsName": "SimpleModel" + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "309", + "kind": "model", + "name": "ModelWithDictionary", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDictionary", + "usage": "Input,Output,Xml", + "doc": "Contains a dictionary of key value pairs.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithDictionary", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "310", + "kind": "property", + "name": "metadata", + "serializedName": "metadata", + "type": { + "$id": "311", + "kind": "dict", + "keyType": { + "$id": "312", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "valueType": { + "$id": "313", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDictionary.metadata", + "serializationOptions": { + "xml": { + "name": "metadata", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "314", + "kind": "model", + "name": "ModelWithEncodedNames", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEncodedNames", + "usage": "Input,Output,Xml", + "doc": "Uses encodedName instead of Xml.Name which is functionally equivalent.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithEncodedNamesSrc", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "315", + "kind": "property", + "name": "modelData", + "serializedName": "SimpleModelData", + "type": { + "$ref": "210" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEncodedNames.modelData", + "serializationOptions": { + "xml": { + "name": "SimpleModelData", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "316", + "kind": "property", + "name": "colors", + "serializedName": "PossibleColors", + "type": { + "$ref": "232" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEncodedNames.colors", + "serializationOptions": { + "xml": { + "name": "PossibleColors", + "attribute": false, + "unwrapped": false, + "itemsName": "string" + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "317", + "kind": "model", + "name": "ModelWithEnum", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEnum", + "usage": "Input,Output,Xml", + "doc": "Contains a single property with an enum value.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithEnum", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "318", + "kind": "property", + "name": "status", + "serializedName": "status", + "type": { + "$ref": "1" + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEnum.status", + "serializationOptions": { + "xml": { + "name": "status", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "319", + "kind": "model", + "name": "ModelWithDatetime", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDatetime", + "usage": "Input,Output,Xml", + "doc": "Contains datetime properties with different encodings.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "ModelWithDatetime", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "320", + "kind": "property", + "name": "rfc3339", + "serializedName": "rfc3339", + "doc": "DateTime value with rfc3339 encoding.", + "type": { + "$id": "321", + "kind": "utcDateTime", + "name": "utcDateTime", + "encode": "rfc3339", + "wireType": { + "$id": "322", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.utcDateTime", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDatetime.rfc3339", + "serializationOptions": { + "xml": { + "name": "rfc3339", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "323", + "kind": "property", + "name": "rfc7231", + "serializedName": "rfc7231", + "doc": "DateTime value with rfc7231 encoding.", + "type": { + "$id": "324", + "kind": "utcDateTime", + "name": "utcDateTime", + "encode": "rfc7231", + "wireType": { + "$id": "325", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.utcDateTime", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDatetime.rfc7231", + "serializationOptions": { + "xml": { + "name": "rfc7231", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + }, + { + "$id": "326", + "kind": "model", + "name": "XmlErrorBody", + "namespace": "Payload.Xml", + "crossLanguageDefinitionId": "Payload.Xml.XmlErrorBody", + "usage": "Output,Xml", + "doc": "The body of an XML error response.", + "decorators": [], + "serializationOptions": { + "xml": { + "name": "XmlErrorBody", + "attribute": false, + "unwrapped": false + } + }, + "properties": [ + { + "$id": "327", + "kind": "property", + "name": "message", + "serializedName": "message", + "type": { + "$id": "328", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.XmlErrorBody.message", + "serializationOptions": { + "xml": { + "name": "message", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + }, + { + "$id": "329", + "kind": "property", + "name": "code", + "serializedName": "code", + "type": { + "$id": "330", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.XmlErrorBody.code", + "serializationOptions": { + "xml": { + "name": "code", + "attribute": false, + "unwrapped": false + } + }, + "isHttpMetadata": false + } + ] + } + ], + "clients": [ + { + "$id": "331", + "kind": "client", + "name": "XmlClient", + "namespace": "Payload.Xml", + "doc": "Sends and receives bodies in XML format.", + "methods": [], + "parameters": [ + { + "$id": "332", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "333", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "334", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.endpoint" + } + ], + "initializedBy": 1, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml", + "apiVersions": [], + "children": [ + { + "$id": "335", + "kind": "client", + "name": "SimpleModelValue", + "namespace": "Payload.Xml", + "doc": "§1.1 — Operations for the SimpleModel type.", + "methods": [ + { + "$id": "336", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "337", + "name": "get", + "resourceName": "SimpleModelValue", + "accessibility": "public", + "parameters": [ + { + "$id": "338", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "6" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.SimpleModelValue.get.accept", + "methodParameterSegments": [ + { + "$id": "339", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "6" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.SimpleModelValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "210" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "8" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/simpleModel", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.SimpleModelValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "339" + } + ], + "response": { + "type": { + "$ref": "210" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.SimpleModelValue.get" + }, + { + "$id": "340", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "341", + "name": "put", + "resourceName": "SimpleModelValue", + "accessibility": "public", + "parameters": [ + { + "$id": "342", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "10" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.SimpleModelValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "343", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "10" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.SimpleModelValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "344", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "210" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.SimpleModelValue.put.input", + "methodParameterSegments": [ + { + "$id": "345", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "210" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.SimpleModelValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/simpleModel", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.SimpleModelValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "343" + }, + { + "$ref": "345" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.SimpleModelValue.put" + } + ], + "parameters": [ + { + "$id": "346", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "347", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "348", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.SimpleModelValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.SimpleModelValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "349", + "kind": "client", + "name": "ModelWithRenamedPropertyValue", + "namespace": "Payload.Xml", + "doc": "§1.2 — Operations for the ModelWithRenamedProperty type.", + "methods": [ + { + "$id": "350", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "351", + "name": "get", + "resourceName": "ModelWithRenamedPropertyValue", + "accessibility": "public", + "parameters": [ + { + "$id": "352", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "14" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedPropertyValue.get.accept", + "methodParameterSegments": [ + { + "$id": "353", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "14" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedPropertyValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "215" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "16" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithRenamedProperty", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedPropertyValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "353" + } + ], + "response": { + "type": { + "$ref": "215" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedPropertyValue.get" + }, + { + "$id": "354", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "355", + "name": "put", + "resourceName": "ModelWithRenamedPropertyValue", + "accessibility": "public", + "parameters": [ + { + "$id": "356", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "18" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedPropertyValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "357", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "18" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedPropertyValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "358", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "215" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedPropertyValue.put.input", + "methodParameterSegments": [ + { + "$id": "359", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "215" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedPropertyValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithRenamedProperty", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedPropertyValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "357" + }, + { + "$ref": "359" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedPropertyValue.put" + } + ], + "parameters": [ + { + "$id": "360", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "361", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "362", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedPropertyValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedPropertyValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "363", + "kind": "client", + "name": "ModelWithRenamedFieldsValue", + "namespace": "Payload.Xml", + "doc": "§1.3, §2.3 — Operations for the ModelWithRenamedFields type.", + "methods": [ + { + "$id": "364", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "365", + "name": "get", + "resourceName": "ModelWithRenamedFieldsValue", + "accessibility": "public", + "parameters": [ + { + "$id": "366", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "22" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedFieldsValue.get.accept", + "methodParameterSegments": [ + { + "$id": "367", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "22" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedFieldsValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "220" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "24" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithRenamedFields", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedFieldsValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "367" + } + ], + "response": { + "type": { + "$ref": "220" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedFieldsValue.get" + }, + { + "$id": "368", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "369", + "name": "put", + "resourceName": "ModelWithRenamedFieldsValue", + "accessibility": "public", + "parameters": [ + { + "$id": "370", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "26" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedFieldsValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "371", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "26" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedFieldsValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "372", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "220" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedFieldsValue.put.input", + "methodParameterSegments": [ + { + "$id": "373", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "220" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedFieldsValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithRenamedFields", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedFieldsValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "371" + }, + { + "$ref": "373" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedFieldsValue.put" + } + ], + "parameters": [ + { + "$id": "374", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "375", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "376", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedFieldsValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedFieldsValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "377", + "kind": "client", + "name": "ModelWithNestedModelValue", + "namespace": "Payload.Xml", + "doc": "§2.1 — Operations for the ModelWithNestedModel type.", + "methods": [ + { + "$id": "378", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "379", + "name": "get", + "resourceName": "ModelWithNestedModelValue", + "accessibility": "public", + "parameters": [ + { + "$id": "380", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "30" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNestedModelValue.get.accept", + "methodParameterSegments": [ + { + "$id": "381", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "30" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNestedModelValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "223" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "32" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithNestedModel", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNestedModelValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "381" + } + ], + "response": { + "type": { + "$ref": "223" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNestedModelValue.get" + }, + { + "$id": "382", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "383", + "name": "put", + "resourceName": "ModelWithNestedModelValue", + "accessibility": "public", + "parameters": [ + { + "$id": "384", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "34" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNestedModelValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "385", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "34" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNestedModelValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "386", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "223" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNestedModelValue.put.input", + "methodParameterSegments": [ + { + "$id": "387", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "223" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNestedModelValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithNestedModel", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNestedModelValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "385" + }, + { + "$ref": "387" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNestedModelValue.put" + } + ], + "parameters": [ + { + "$id": "388", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "389", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "390", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNestedModelValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNestedModelValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "391", + "kind": "client", + "name": "ModelWithRenamedNestedModelValue", + "namespace": "Payload.Xml", + "doc": "§2.2 — Operations for the ModelWithRenamedNestedModel type.", + "methods": [ + { + "$id": "392", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "393", + "name": "get", + "resourceName": "ModelWithRenamedNestedModelValue", + "accessibility": "public", + "parameters": [ + { + "$id": "394", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "38" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedNestedModelValue.get.accept", + "methodParameterSegments": [ + { + "$id": "395", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "38" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedNestedModelValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "225" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "40" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithRenamedNestedModel", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedNestedModelValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "395" + } + ], + "response": { + "type": { + "$ref": "225" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedNestedModelValue.get" + }, + { + "$id": "396", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "397", + "name": "put", + "resourceName": "ModelWithRenamedNestedModelValue", + "accessibility": "public", + "parameters": [ + { + "$id": "398", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "42" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedNestedModelValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "399", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "42" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedNestedModelValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "400", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "225" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedNestedModelValue.put.input", + "methodParameterSegments": [ + { + "$id": "401", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "225" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedNestedModelValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithRenamedNestedModel", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedNestedModelValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "399" + }, + { + "$ref": "401" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedNestedModelValue.put" + } + ], + "parameters": [ + { + "$id": "402", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "403", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "404", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedNestedModelValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedNestedModelValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "405", + "kind": "client", + "name": "ModelWithSimpleArraysValue", + "namespace": "Payload.Xml", + "doc": "§3.1 — Operations for the ModelWithSimpleArrays type.", + "methods": [ + { + "$id": "406", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "407", + "name": "get", + "resourceName": "ModelWithSimpleArraysValue", + "accessibility": "public", + "parameters": [ + { + "$id": "408", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "46" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithSimpleArraysValue.get.accept", + "methodParameterSegments": [ + { + "$id": "409", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "46" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithSimpleArraysValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "230" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "48" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithSimpleArrays", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithSimpleArraysValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "409" + } + ], + "response": { + "type": { + "$ref": "230" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithSimpleArraysValue.get" + }, + { + "$id": "410", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "411", + "name": "put", + "resourceName": "ModelWithSimpleArraysValue", + "accessibility": "public", + "parameters": [ + { + "$id": "412", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "50" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithSimpleArraysValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "413", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "50" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithSimpleArraysValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "414", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "230" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithSimpleArraysValue.put.input", + "methodParameterSegments": [ + { + "$id": "415", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "230" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithSimpleArraysValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithSimpleArrays", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithSimpleArraysValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "413" + }, + { + "$ref": "415" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithSimpleArraysValue.put" + } + ], + "parameters": [ + { + "$id": "416", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "417", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "418", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithSimpleArraysValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithSimpleArraysValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "419", + "kind": "client", + "name": "ModelWithUnwrappedArrayValue", + "namespace": "Payload.Xml", + "doc": "§3.2 — Operations for the ModelWithUnwrappedArray type.", + "methods": [ + { + "$id": "420", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "421", + "name": "get", + "resourceName": "ModelWithUnwrappedArrayValue", + "accessibility": "public", + "parameters": [ + { + "$id": "422", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "54" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedArrayValue.get.accept", + "methodParameterSegments": [ + { + "$id": "423", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "54" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedArrayValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "237" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "56" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithUnwrappedArray", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedArrayValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "423" + } + ], + "response": { + "type": { + "$ref": "237" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedArrayValue.get" + }, + { + "$id": "424", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "425", + "name": "put", + "resourceName": "ModelWithUnwrappedArrayValue", + "accessibility": "public", + "parameters": [ + { + "$id": "426", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "58" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedArrayValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "427", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "58" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedArrayValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "428", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "237" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedArrayValue.put.input", + "methodParameterSegments": [ + { + "$id": "429", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "237" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedArrayValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithUnwrappedArray", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedArrayValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "427" + }, + { + "$ref": "429" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedArrayValue.put" + } + ], + "parameters": [ + { + "$id": "430", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "431", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "432", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedArrayValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedArrayValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "433", + "kind": "client", + "name": "ModelWithRenamedArraysValue", + "namespace": "Payload.Xml", + "doc": "§3.3, §3.4 — Operations for the ModelWithRenamedArrays type.", + "methods": [ + { + "$id": "434", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "435", + "name": "get", + "resourceName": "ModelWithRenamedArraysValue", + "accessibility": "public", + "parameters": [ + { + "$id": "436", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "62" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedArraysValue.get.accept", + "methodParameterSegments": [ + { + "$id": "437", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "62" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedArraysValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "240" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "64" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithRenamedArrays", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedArraysValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "437" + } + ], + "response": { + "type": { + "$ref": "240" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedArraysValue.get" + }, + { + "$id": "438", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "439", + "name": "put", + "resourceName": "ModelWithRenamedArraysValue", + "accessibility": "public", + "parameters": [ + { + "$id": "440", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "66" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedArraysValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "441", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "66" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedArraysValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "442", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "240" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedArraysValue.put.input", + "methodParameterSegments": [ + { + "$id": "443", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "240" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedArraysValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithRenamedArrays", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedArraysValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "441" + }, + { + "$ref": "443" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedArraysValue.put" + } + ], + "parameters": [ + { + "$id": "444", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "445", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "446", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedArraysValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedArraysValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "447", + "kind": "client", + "name": "ModelWithWrappedPrimitiveCustomItemNamesValue", + "namespace": "Payload.Xml", + "doc": "§3.5 — Operations for the ModelWithWrappedPrimitiveCustomItemNames type.", + "methods": [ + { + "$id": "448", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "449", + "name": "get", + "resourceName": "ModelWithWrappedPrimitiveCustomItemNamesValue", + "accessibility": "public", + "parameters": [ + { + "$id": "450", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "70" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.get.accept", + "methodParameterSegments": [ + { + "$id": "451", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "70" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "243" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "72" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithWrappedPrimitiveCustomItemNames", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "451" + } + ], + "response": { + "type": { + "$ref": "243" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.get" + }, + { + "$id": "452", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "453", + "name": "put", + "resourceName": "ModelWithWrappedPrimitiveCustomItemNamesValue", + "accessibility": "public", + "parameters": [ + { + "$id": "454", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "74" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "455", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "74" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "456", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "243" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.put.input", + "methodParameterSegments": [ + { + "$id": "457", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "243" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithWrappedPrimitiveCustomItemNames", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "455" + }, + { + "$ref": "457" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.put" + } + ], + "parameters": [ + { + "$id": "458", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "459", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "460", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "461", + "kind": "client", + "name": "ModelWithArrayOfModelValue", + "namespace": "Payload.Xml", + "doc": "§4.1 — Operations for the ModelWithArrayOfModel type.", + "methods": [ + { + "$id": "462", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "463", + "name": "get", + "resourceName": "ModelWithArrayOfModelValue", + "accessibility": "public", + "parameters": [ + { + "$id": "464", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "78" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithArrayOfModelValue.get.accept", + "methodParameterSegments": [ + { + "$id": "465", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "78" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithArrayOfModelValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "248" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "80" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithArrayOfModel", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithArrayOfModelValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "465" + } + ], + "response": { + "type": { + "$ref": "248" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithArrayOfModelValue.get" + }, + { + "$id": "466", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "467", + "name": "put", + "resourceName": "ModelWithArrayOfModelValue", + "accessibility": "public", + "parameters": [ + { + "$id": "468", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "82" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithArrayOfModelValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "469", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "82" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithArrayOfModelValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "470", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "248" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithArrayOfModelValue.put.input", + "methodParameterSegments": [ + { + "$id": "471", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "248" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithArrayOfModelValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithArrayOfModel", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithArrayOfModelValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "469" + }, + { + "$ref": "471" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithArrayOfModelValue.put" + } + ], + "parameters": [ + { + "$id": "472", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "473", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "474", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithArrayOfModelValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithArrayOfModelValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "475", + "kind": "client", + "name": "ModelWithUnwrappedModelArrayValue", + "namespace": "Payload.Xml", + "doc": "§4.2 — Operations for the ModelWithUnwrappedModelArray type.", + "methods": [ + { + "$id": "476", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "477", + "name": "get", + "resourceName": "ModelWithUnwrappedModelArrayValue", + "accessibility": "public", + "parameters": [ + { + "$id": "478", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "86" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedModelArrayValue.get.accept", + "methodParameterSegments": [ + { + "$id": "479", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "86" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedModelArrayValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "251" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "88" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithUnwrappedModelArray", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedModelArrayValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "479" + } + ], + "response": { + "type": { + "$ref": "251" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedModelArrayValue.get" + }, + { + "$id": "480", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "481", + "name": "put", + "resourceName": "ModelWithUnwrappedModelArrayValue", + "accessibility": "public", + "parameters": [ + { + "$id": "482", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "90" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedModelArrayValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "483", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "90" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedModelArrayValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "484", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "251" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedModelArrayValue.put.input", + "methodParameterSegments": [ + { + "$id": "485", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "251" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedModelArrayValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithUnwrappedModelArray", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedModelArrayValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "483" + }, + { + "$ref": "485" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedModelArrayValue.put" + } + ], + "parameters": [ + { + "$id": "486", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "487", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "488", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedModelArrayValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithUnwrappedModelArrayValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "489", + "kind": "client", + "name": "ModelWithRenamedWrappedModelArrayValue", + "namespace": "Payload.Xml", + "doc": "§4.3 — Operations for the ModelWithRenamedWrappedModelArray type.", + "methods": [ + { + "$id": "490", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "491", + "name": "get", + "resourceName": "ModelWithRenamedWrappedModelArrayValue", + "accessibility": "public", + "parameters": [ + { + "$id": "492", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "94" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedModelArrayValue.get.accept", + "methodParameterSegments": [ + { + "$id": "493", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "94" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedModelArrayValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "253" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "96" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithRenamedWrappedModelArray", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedModelArrayValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "493" + } + ], + "response": { + "type": { + "$ref": "253" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedModelArrayValue.get" + }, + { + "$id": "494", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "495", + "name": "put", + "resourceName": "ModelWithRenamedWrappedModelArrayValue", + "accessibility": "public", + "parameters": [ + { + "$id": "496", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "98" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedModelArrayValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "497", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "98" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedModelArrayValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "498", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "253" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedModelArrayValue.put.input", + "methodParameterSegments": [ + { + "$id": "499", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "253" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedModelArrayValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithRenamedWrappedModelArray", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedModelArrayValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "497" + }, + { + "$ref": "499" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedModelArrayValue.put" + } + ], + "parameters": [ + { + "$id": "500", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "501", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "502", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedModelArrayValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedModelArrayValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "503", + "kind": "client", + "name": "ModelWithRenamedUnwrappedModelArrayValue", + "namespace": "Payload.Xml", + "doc": "§4.4 — Operations for the ModelWithRenamedUnwrappedModelArray type.", + "methods": [ + { + "$id": "504", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "505", + "name": "get", + "resourceName": "ModelWithRenamedUnwrappedModelArrayValue", + "accessibility": "public", + "parameters": [ + { + "$id": "506", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "102" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.get.accept", + "methodParameterSegments": [ + { + "$id": "507", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "102" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "255" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "104" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithRenamedUnwrappedModelArray", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "507" + } + ], + "response": { + "type": { + "$ref": "255" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.get" + }, + { + "$id": "508", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "509", + "name": "put", + "resourceName": "ModelWithRenamedUnwrappedModelArrayValue", + "accessibility": "public", + "parameters": [ + { + "$id": "510", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "106" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "511", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "106" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "512", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "255" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.put.input", + "methodParameterSegments": [ + { + "$id": "513", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "255" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithRenamedUnwrappedModelArray", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "511" + }, + { + "$ref": "513" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.put" + } + ], + "parameters": [ + { + "$id": "514", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "515", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "516", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "517", + "kind": "client", + "name": "ModelWithRenamedWrappedAndItemModelArrayValue", + "namespace": "Payload.Xml", + "doc": "§4.5 — Operations for the ModelWithRenamedWrappedAndItemModelArray type.", + "methods": [ + { + "$id": "518", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "519", + "name": "get", + "resourceName": "ModelWithRenamedWrappedAndItemModelArrayValue", + "accessibility": "public", + "parameters": [ + { + "$id": "520", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "110" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.get.accept", + "methodParameterSegments": [ + { + "$id": "521", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "110" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "257" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "112" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithRenamedWrappedAndItemModelArray", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "521" + } + ], + "response": { + "type": { + "$ref": "257" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.get" + }, + { + "$id": "522", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "523", + "name": "put", + "resourceName": "ModelWithRenamedWrappedAndItemModelArrayValue", + "accessibility": "public", + "parameters": [ + { + "$id": "524", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "114" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "525", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "114" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "526", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "257" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.put.input", + "methodParameterSegments": [ + { + "$id": "527", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "257" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithRenamedWrappedAndItemModelArray", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "525" + }, + { + "$ref": "527" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.put" + } + ], + "parameters": [ + { + "$id": "528", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "529", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "530", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "531", + "kind": "client", + "name": "ModelWithAttributesValue", + "namespace": "Payload.Xml", + "doc": "§5.1 — Operations for the ModelWithAttributes type.", + "methods": [ + { + "$id": "532", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "533", + "name": "get", + "resourceName": "ModelWithAttributesValue", + "accessibility": "public", + "parameters": [ + { + "$id": "534", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "118" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithAttributesValue.get.accept", + "methodParameterSegments": [ + { + "$id": "535", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "118" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithAttributesValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "263" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "120" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithAttributes", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithAttributesValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "535" + } + ], + "response": { + "type": { + "$ref": "263" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithAttributesValue.get" + }, + { + "$id": "536", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "537", + "name": "put", + "resourceName": "ModelWithAttributesValue", + "accessibility": "public", + "parameters": [ + { + "$id": "538", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "122" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithAttributesValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "539", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "122" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithAttributesValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "540", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "263" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithAttributesValue.put.input", + "methodParameterSegments": [ + { + "$id": "541", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "263" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithAttributesValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithAttributes", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithAttributesValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "539" + }, + { + "$ref": "541" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithAttributesValue.put" + } + ], + "parameters": [ + { + "$id": "542", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "543", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "544", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithAttributesValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithAttributesValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "545", + "kind": "client", + "name": "ModelWithRenamedAttributeValue", + "namespace": "Payload.Xml", + "doc": "§5.2 — Operations for the ModelWithRenamedAttribute type.", + "methods": [ + { + "$id": "546", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "547", + "name": "get", + "resourceName": "ModelWithRenamedAttributeValue", + "accessibility": "public", + "parameters": [ + { + "$id": "548", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "126" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedAttributeValue.get.accept", + "methodParameterSegments": [ + { + "$id": "549", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "126" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedAttributeValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "270" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "128" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithRenamedAttribute", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedAttributeValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "549" + } + ], + "response": { + "type": { + "$ref": "270" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedAttributeValue.get" + }, + { + "$id": "550", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "551", + "name": "put", + "resourceName": "ModelWithRenamedAttributeValue", + "accessibility": "public", + "parameters": [ + { + "$id": "552", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "130" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedAttributeValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "553", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "130" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedAttributeValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "554", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "270" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedAttributeValue.put.input", + "methodParameterSegments": [ + { + "$id": "555", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "270" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedAttributeValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithRenamedAttribute", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedAttributeValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "553" + }, + { + "$ref": "555" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedAttributeValue.put" + } + ], + "parameters": [ + { + "$id": "556", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "557", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "558", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedAttributeValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithRenamedAttributeValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "559", + "kind": "client", + "name": "ModelWithNamespaceValue", + "namespace": "Payload.Xml", + "doc": "§6.1, §7.1 — Operations for the ModelWithNamespace type.", + "methods": [ + { + "$id": "560", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "561", + "name": "get", + "resourceName": "ModelWithNamespaceValue", + "accessibility": "public", + "parameters": [ + { + "$id": "562", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "134" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceValue.get.accept", + "methodParameterSegments": [ + { + "$id": "563", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "134" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "277" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "136" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithNamespace", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "563" + } + ], + "response": { + "type": { + "$ref": "277" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceValue.get" + }, + { + "$id": "564", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "565", + "name": "put", + "resourceName": "ModelWithNamespaceValue", + "accessibility": "public", + "parameters": [ + { + "$id": "566", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "138" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "567", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "138" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "568", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "277" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceValue.put.input", + "methodParameterSegments": [ + { + "$id": "569", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "277" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithNamespace", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "567" + }, + { + "$ref": "569" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceValue.put" + } + ], + "parameters": [ + { + "$id": "570", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "571", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "572", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "573", + "kind": "client", + "name": "ModelWithNamespaceOnPropertiesValue", + "namespace": "Payload.Xml", + "doc": "§6.2, §7.2 — Operations for the ModelWithNamespaceOnProperties type.", + "methods": [ + { + "$id": "574", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "575", + "name": "get", + "resourceName": "ModelWithNamespaceOnPropertiesValue", + "accessibility": "public", + "parameters": [ + { + "$id": "576", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "142" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceOnPropertiesValue.get.accept", + "methodParameterSegments": [ + { + "$id": "577", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "142" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceOnPropertiesValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "287" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "144" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithNamespaceOnProperties", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceOnPropertiesValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "577" + } + ], + "response": { + "type": { + "$ref": "287" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceOnPropertiesValue.get" + }, + { + "$id": "578", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "579", + "name": "put", + "resourceName": "ModelWithNamespaceOnPropertiesValue", + "accessibility": "public", + "parameters": [ + { + "$id": "580", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "146" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceOnPropertiesValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "581", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "146" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceOnPropertiesValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "582", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "287" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceOnPropertiesValue.put.input", + "methodParameterSegments": [ + { + "$id": "583", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "287" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceOnPropertiesValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithNamespaceOnProperties", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceOnPropertiesValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "581" + }, + { + "$ref": "583" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceOnPropertiesValue.put" + } + ], + "parameters": [ + { + "$id": "584", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "585", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "586", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceOnPropertiesValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithNamespaceOnPropertiesValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "587", + "kind": "client", + "name": "ModelWithTextValue", + "namespace": "Payload.Xml", + "doc": "§8.1 — Operations for the ModelWithText type.", + "methods": [ + { + "$id": "588", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "589", + "name": "get", + "resourceName": "ModelWithTextValue", + "accessibility": "public", + "parameters": [ + { + "$id": "590", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "150" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithTextValue.get.accept", + "methodParameterSegments": [ + { + "$id": "591", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "150" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithTextValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "297" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "152" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithText", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithTextValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "591" + } + ], + "response": { + "type": { + "$ref": "297" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithTextValue.get" + }, + { + "$id": "592", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "593", + "name": "put", + "resourceName": "ModelWithTextValue", + "accessibility": "public", + "parameters": [ + { + "$id": "594", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "154" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithTextValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "595", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "154" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithTextValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "596", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "297" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithTextValue.put.input", + "methodParameterSegments": [ + { + "$id": "597", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "297" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithTextValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithText", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithTextValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "595" + }, + { + "$ref": "597" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithTextValue.put" + } + ], + "parameters": [ + { + "$id": "598", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "599", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "600", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithTextValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithTextValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "601", + "kind": "client", + "name": "ModelWithOptionalFieldValue", + "namespace": "Payload.Xml", + "doc": "Operations for the ModelWithOptionalField type.", + "methods": [ + { + "$id": "602", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "603", + "name": "get", + "resourceName": "ModelWithOptionalFieldValue", + "accessibility": "public", + "parameters": [ + { + "$id": "604", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "158" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithOptionalFieldValue.get.accept", + "methodParameterSegments": [ + { + "$id": "605", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "158" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithOptionalFieldValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "302" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "160" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithOptionalField", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithOptionalFieldValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "605" + } + ], + "response": { + "type": { + "$ref": "302" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithOptionalFieldValue.get" + }, + { + "$id": "606", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "607", + "name": "put", + "resourceName": "ModelWithOptionalFieldValue", + "accessibility": "public", + "parameters": [ + { + "$id": "608", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "162" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithOptionalFieldValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "609", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "162" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithOptionalFieldValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "610", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "302" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithOptionalFieldValue.put.input", + "methodParameterSegments": [ + { + "$id": "611", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "302" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithOptionalFieldValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithOptionalField", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithOptionalFieldValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "609" + }, + { + "$ref": "611" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithOptionalFieldValue.put" + } + ], + "parameters": [ + { + "$id": "612", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "613", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "614", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithOptionalFieldValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithOptionalFieldValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "615", + "kind": "client", + "name": "ModelWithEmptyArrayValue", + "namespace": "Payload.Xml", + "doc": "Operations for the ModelWithEmptyArray type.", + "methods": [ + { + "$id": "616", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "617", + "name": "get", + "resourceName": "ModelWithEmptyArrayValue", + "accessibility": "public", + "parameters": [ + { + "$id": "618", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "166" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEmptyArrayValue.get.accept", + "methodParameterSegments": [ + { + "$id": "619", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "166" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEmptyArrayValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "307" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "168" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithEmptyArray", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEmptyArrayValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "619" + } + ], + "response": { + "type": { + "$ref": "307" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEmptyArrayValue.get" + }, + { + "$id": "620", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "621", + "name": "put", + "resourceName": "ModelWithEmptyArrayValue", + "accessibility": "public", + "parameters": [ + { + "$id": "622", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "170" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEmptyArrayValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "623", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "170" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEmptyArrayValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "624", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "307" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEmptyArrayValue.put.input", + "methodParameterSegments": [ + { + "$id": "625", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "307" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEmptyArrayValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithEmptyArray", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEmptyArrayValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "623" + }, + { + "$ref": "625" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEmptyArrayValue.put" + } + ], + "parameters": [ + { + "$id": "626", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "627", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "628", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEmptyArrayValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEmptyArrayValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "629", + "kind": "client", + "name": "ModelWithDictionaryValue", + "namespace": "Payload.Xml", + "doc": "Operations for the ModelWithDictionary type.", + "methods": [ + { + "$id": "630", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "631", + "name": "get", + "resourceName": "ModelWithDictionaryValue", + "accessibility": "public", + "parameters": [ + { + "$id": "632", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "174" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDictionaryValue.get.accept", + "methodParameterSegments": [ + { + "$id": "633", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "174" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDictionaryValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "309" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "176" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithDictionary", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDictionaryValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "633" + } + ], + "response": { + "type": { + "$ref": "309" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDictionaryValue.get" + }, + { + "$id": "634", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "635", + "name": "put", + "resourceName": "ModelWithDictionaryValue", + "accessibility": "public", + "parameters": [ + { + "$id": "636", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "178" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDictionaryValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "637", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "178" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDictionaryValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "638", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "309" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDictionaryValue.put.input", + "methodParameterSegments": [ + { + "$id": "639", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "309" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDictionaryValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithDictionary", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDictionaryValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "637" + }, + { + "$ref": "639" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDictionaryValue.put" + } + ], + "parameters": [ + { + "$id": "640", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "641", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "642", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDictionaryValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDictionaryValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "643", + "kind": "client", + "name": "ModelWithEncodedNamesValue", + "namespace": "Payload.Xml", + "doc": "Operations for the ModelWithEncodedNames type.", + "methods": [ + { + "$id": "644", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "645", + "name": "get", + "resourceName": "ModelWithEncodedNamesValue", + "accessibility": "public", + "parameters": [ + { + "$id": "646", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "182" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEncodedNamesValue.get.accept", + "methodParameterSegments": [ + { + "$id": "647", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "182" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEncodedNamesValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "314" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "184" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithEncodedNames", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEncodedNamesValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "647" + } + ], + "response": { + "type": { + "$ref": "314" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEncodedNamesValue.get" + }, + { + "$id": "648", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "649", + "name": "put", + "resourceName": "ModelWithEncodedNamesValue", + "accessibility": "public", + "parameters": [ + { + "$id": "650", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "186" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEncodedNamesValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "651", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "186" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEncodedNamesValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "652", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "314" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEncodedNamesValue.put.input", + "methodParameterSegments": [ + { + "$id": "653", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "314" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEncodedNamesValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithEncodedNames", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEncodedNamesValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "651" + }, + { + "$ref": "653" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEncodedNamesValue.put" + } + ], + "parameters": [ + { + "$id": "654", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "655", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "656", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEncodedNamesValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEncodedNamesValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "657", + "kind": "client", + "name": "ModelWithEnumValue", + "namespace": "Payload.Xml", + "doc": "Operations for the ModelWithEnum type.", + "methods": [ + { + "$id": "658", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "659", + "name": "get", + "resourceName": "ModelWithEnumValue", + "accessibility": "public", + "parameters": [ + { + "$id": "660", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "190" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEnumValue.get.accept", + "methodParameterSegments": [ + { + "$id": "661", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "190" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEnumValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "317" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "192" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithEnum", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEnumValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "661" + } + ], + "response": { + "type": { + "$ref": "317" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEnumValue.get" + }, + { + "$id": "662", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "663", + "name": "put", + "resourceName": "ModelWithEnumValue", + "accessibility": "public", + "parameters": [ + { + "$id": "664", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "194" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEnumValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "665", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "194" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEnumValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "666", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "317" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEnumValue.put.input", + "methodParameterSegments": [ + { + "$id": "667", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "317" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEnumValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithEnum", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEnumValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "665" + }, + { + "$ref": "667" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEnumValue.put" + } + ], + "parameters": [ + { + "$id": "668", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "669", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "670", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEnumValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithEnumValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "671", + "kind": "client", + "name": "ModelWithDatetimeValue", + "namespace": "Payload.Xml", + "doc": "Operations for the ModelWithDatetime type.", + "methods": [ + { + "$id": "672", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "673", + "name": "get", + "resourceName": "ModelWithDatetimeValue", + "accessibility": "public", + "parameters": [ + { + "$id": "674", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "198" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDatetimeValue.get.accept", + "methodParameterSegments": [ + { + "$id": "675", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "198" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDatetimeValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "319" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "200" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithDatetime", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDatetimeValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "675" + } + ], + "response": { + "type": { + "$ref": "319" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDatetimeValue.get" + }, + { + "$id": "676", + "kind": "basic", + "name": "put", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "677", + "name": "put", + "resourceName": "ModelWithDatetimeValue", + "accessibility": "public", + "parameters": [ + { + "$id": "678", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "202" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDatetimeValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "679", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "202" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDatetimeValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "680", + "kind": "body", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "319" + }, + "isApiVersion": false, + "contentTypes": [ + "application/xml" + ], + "defaultContentType": "application/xml", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDatetimeValue.put.input", + "methodParameterSegments": [ + { + "$id": "681", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "319" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDatetimeValue.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "PUT", + "uri": "{endpoint}", + "path": "/payload/xml/modelWithDatetime", + "requestMediaTypes": [ + "application/xml" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDatetimeValue.put", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "679" + }, + { + "$ref": "681" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDatetimeValue.put" + } + ], + "parameters": [ + { + "$id": "682", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "683", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "684", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDatetimeValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.ModelWithDatetimeValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + }, + { + "$id": "685", + "kind": "client", + "name": "XmlErrorValue", + "namespace": "Payload.Xml", + "doc": "Operations that return an error response in XML format.", + "methods": [ + { + "$id": "686", + "kind": "basic", + "name": "get", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "687", + "name": "get", + "resourceName": "XmlErrorValue", + "accessibility": "public", + "parameters": [ + { + "$id": "688", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "206" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.XmlErrorValue.get.accept", + "methodParameterSegments": [ + { + "$id": "689", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "206" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Payload.Xml.XmlErrorValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "210" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "208" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/xml" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/payload/xml/error", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Payload.Xml.XmlErrorValue.get", + "decorators": [], + "namespace": "Payload.Xml" + }, + "parameters": [ + { + "$ref": "689" + } + ], + "response": { + "type": { + "$ref": "210" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Payload.Xml.XmlErrorValue.get" + } + ], + "parameters": [ + { + "$id": "690", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "691", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "692", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Payload.Xml.XmlErrorValue.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Payload.Xml.XmlErrorValue", + "apiVersions": [], + "parent": { + "$ref": "331" + }, + "isMultiServiceClient": false + } + ], + "isMultiServiceClient": false + } + ] +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/Resiliency.SrvDriven.V1.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/Resiliency.SrvDriven.V1.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/Resiliency.SrvDriven.V1.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/Resiliency.SrvDriven.V1.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/Resiliency.SrvDriven.V1.sln deleted file mode 100644 index e9fab3c679c..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/Resiliency.SrvDriven.V1.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Resiliency.SrvDriven.V1", "src\Resiliency.SrvDriven.V1.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/Resiliency.SrvDriven.V1.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/Resiliency.SrvDriven.V1.slnx new file mode 100644 index 00000000000..8a99e532600 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/Resiliency.SrvDriven.V1.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClient.cs index d5a954479be..0d010ec8ea0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class ResiliencyServiceDrivenClient public ResiliencyServiceDrivenClient(Uri endpoint, string serviceDeploymentVersion) : this(endpoint, serviceDeploymentVersion, new ResiliencyServiceDrivenClientOptions()) => throw null; - public ResiliencyServiceDrivenClient(Uri endpoint, string serviceDeploymentVersion, ResiliencyServiceDrivenClientOptions options) => throw null; + internal ResiliencyServiceDrivenClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, string serviceDeploymentVersion, ResiliencyServiceDrivenClientOptions options) => throw null; + + public ResiliencyServiceDrivenClient(Uri endpoint, string serviceDeploymentVersion, ResiliencyServiceDrivenClientOptions options) : this(null, endpoint, serviceDeploymentVersion, options) => throw null; + + [Experimental("SCME0002")] + public ResiliencyServiceDrivenClient(ResiliencyServiceDrivenClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.ServiceDeploymentVersion, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClientOptions.cs index d5dd7cc38e0..2612bc02b39 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClientOptions.cs @@ -3,6 +3,8 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Resiliency.ServiceDriven { @@ -12,6 +14,9 @@ public partial class ResiliencyServiceDrivenClientOptions : ClientPipelineOption public ResiliencyServiceDrivenClientOptions(ServiceVersion version = LatestVersion) => throw null; + [Experimental("SCME0002")] + internal ResiliencyServiceDrivenClientOptions(IConfigurationSection section) : base(section) => throw null; + public enum ServiceVersion { /// Version 1. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClientSettings.cs new file mode 100644 index 00000000000..dd1dd517226 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClientSettings.cs @@ -0,0 +1,35 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Resiliency.ServiceDriven +{ + [Experimental("SCME0002")] + public partial class ResiliencyServiceDrivenClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public string ServiceDeploymentVersion + { + get => throw null; + set => throw null; + } + + public ResiliencyServiceDrivenClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..f57ef66baf2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,43 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "ResiliencyServiceDrivenClient": { + "type": "object", + "description": "Configuration for ResiliencyServiceDrivenClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "ServiceDeploymentVersion": { + "type": "string" + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/resiliencyServiceDrivenClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "resiliencyServiceDrivenClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Resiliency.SrvDriven.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Resiliency.SrvDriven.V1.csproj index e4cec94ef68..6a9176b7e73 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Resiliency.SrvDriven.V1.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Resiliency.SrvDriven.V1.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/tspCodeModel.json index 35bc92dce91..c8f8d765f2d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/tspCodeModel.json @@ -127,7 +127,31 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired.parameter", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "11", + "kind": "method", + "name": "parameter", + "serializedName": "parameter", + "doc": "I am a required parameter", + "type": { + "$id": "12", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired.parameter", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -151,26 +175,7 @@ }, "parameters": [ { - "$id": "11", - "kind": "method", - "name": "parameter", - "serializedName": "parameter", - "doc": "I am a required parameter", - "type": { - "$id": "12", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired.parameter", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "11" } ], "response": {}, @@ -214,7 +219,31 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional.parameter", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "17", + "kind": "method", + "name": "parameter", + "serializedName": "parameter", + "doc": "I am an optional parameter", + "type": { + "$id": "18", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional.parameter", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -238,26 +267,7 @@ }, "parameters": [ { - "$id": "17", - "kind": "method", - "name": "parameter", - "serializedName": "parameter", - "doc": "I am an optional parameter", - "type": { - "$id": "18", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional.parameter", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "17" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/Resiliency.SrvDriven.V2.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/Resiliency.SrvDriven.V2.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/Resiliency.SrvDriven.V2.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/Resiliency.SrvDriven.V2.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/Resiliency.SrvDriven.V2.sln deleted file mode 100644 index 0524ea8139f..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/Resiliency.SrvDriven.V2.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Resiliency.SrvDriven.V2", "src\Resiliency.SrvDriven.V2.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/Resiliency.SrvDriven.V2.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/Resiliency.SrvDriven.V2.slnx new file mode 100644 index 00000000000..22a4587ba66 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/Resiliency.SrvDriven.V2.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClient.cs index d99259d205c..59d7160e347 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class ResiliencyServiceDrivenClient public ResiliencyServiceDrivenClient(Uri endpoint, string serviceDeploymentVersion) : this(endpoint, serviceDeploymentVersion, new ResiliencyServiceDrivenClientOptions()) => throw null; - public ResiliencyServiceDrivenClient(Uri endpoint, string serviceDeploymentVersion, ResiliencyServiceDrivenClientOptions options) => throw null; + internal ResiliencyServiceDrivenClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, string serviceDeploymentVersion, ResiliencyServiceDrivenClientOptions options) => throw null; + + public ResiliencyServiceDrivenClient(Uri endpoint, string serviceDeploymentVersion, ResiliencyServiceDrivenClientOptions options) : this(null, endpoint, serviceDeploymentVersion, options) => throw null; + + [Experimental("SCME0002")] + public ResiliencyServiceDrivenClient(ResiliencyServiceDrivenClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.ServiceDeploymentVersion, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClientOptions.cs index 233945b82e3..b4d13f3a8f5 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClientOptions.cs @@ -3,6 +3,8 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Resiliency.ServiceDriven { @@ -12,6 +14,9 @@ public partial class ResiliencyServiceDrivenClientOptions : ClientPipelineOption public ResiliencyServiceDrivenClientOptions(ServiceVersion version = LatestVersion) => throw null; + [Experimental("SCME0002")] + internal ResiliencyServiceDrivenClientOptions(IConfigurationSection section) : base(section) => throw null; + public enum ServiceVersion { /// Version 1. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClientSettings.cs new file mode 100644 index 00000000000..dd1dd517226 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClientSettings.cs @@ -0,0 +1,35 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Resiliency.ServiceDriven +{ + [Experimental("SCME0002")] + public partial class ResiliencyServiceDrivenClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public string ServiceDeploymentVersion + { + get => throw null; + set => throw null; + } + + public ResiliencyServiceDrivenClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..f57ef66baf2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,43 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "ResiliencyServiceDrivenClient": { + "type": "object", + "description": "Configuration for ResiliencyServiceDrivenClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "ServiceDeploymentVersion": { + "type": "string" + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/resiliencyServiceDrivenClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "resiliencyServiceDrivenClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Resiliency.SrvDriven.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Resiliency.SrvDriven.V2.csproj index f75c3d5e0d3..b7f9308e5b7 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Resiliency.SrvDriven.V2.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Resiliency.SrvDriven.V2.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/tspCodeModel.json index d3d412f4ffa..23f33f2848b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/tspCodeModel.json @@ -143,7 +143,31 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromNone.new-parameter", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "12", + "kind": "method", + "name": "new-parameter", + "serializedName": "new-parameter", + "doc": "I'm a new input optional parameter", + "type": { + "$id": "13", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromNone.new-parameter", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -167,26 +191,7 @@ }, "parameters": [ { - "$id": "12", - "kind": "method", - "name": "new-parameter", - "serializedName": "new-parameter", - "doc": "I'm a new input optional parameter", - "type": { - "$id": "13", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromNone.new-parameter", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "12" } ], "response": {}, @@ -231,16 +236,40 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired.parameter", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "18", + "kind": "method", + "name": "parameter", + "serializedName": "parameter", + "doc": "I am a required parameter", + "type": { + "$id": "19", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired.parameter", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "18", + "$id": "20", "kind": "query", "name": "new-parameter", "serializedName": "new-parameter", "doc": "I'm a new input optional parameter", "type": { - "$id": "19", + "$id": "21", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -252,7 +281,31 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired.new-parameter", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "22", + "kind": "method", + "name": "new-parameter", + "serializedName": "new-parameter", + "doc": "I'm a new input optional parameter", + "type": { + "$id": "23", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired.new-parameter", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -276,48 +329,10 @@ }, "parameters": [ { - "$id": "20", - "kind": "method", - "name": "parameter", - "serializedName": "parameter", - "doc": "I am a required parameter", - "type": { - "$id": "21", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired.parameter", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "18" }, { - "$id": "22", - "kind": "method", - "name": "new-parameter", - "serializedName": "new-parameter", - "doc": "I'm a new input optional parameter", - "type": { - "$id": "23", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired.new-parameter", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "22" } ], "response": {}, @@ -362,16 +377,40 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional.parameter", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "28", + "kind": "method", + "name": "parameter", + "serializedName": "parameter", + "doc": "I am an optional parameter", + "type": { + "$id": "29", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional.parameter", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "28", + "$id": "30", "kind": "query", "name": "new-parameter", "serializedName": "new-parameter", "doc": "I'm a new input optional parameter", "type": { - "$id": "29", + "$id": "31", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -383,7 +422,31 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional.new-parameter", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "32", + "kind": "method", + "name": "new-parameter", + "serializedName": "new-parameter", + "doc": "I'm a new input optional parameter", + "type": { + "$id": "33", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional.new-parameter", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -407,48 +470,10 @@ }, "parameters": [ { - "$id": "30", - "kind": "method", - "name": "parameter", - "serializedName": "parameter", - "doc": "I am an optional parameter", - "type": { - "$id": "31", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional.parameter", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "28" }, { - "$id": "32", - "kind": "method", - "name": "new-parameter", - "serializedName": "new-parameter", - "doc": "I'm a new input optional parameter", - "type": { - "$id": "33", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional.new-parameter", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "32" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/Response.StatusCodeRange.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/Response.StatusCodeRange.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/Response.StatusCodeRange.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/Response.StatusCodeRange.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/Response.StatusCodeRange.sln deleted file mode 100644 index 7327ca20d74..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/Response.StatusCodeRange.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Response.StatusCodeRange", "src\Response.StatusCodeRange.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/Response.StatusCodeRange.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/Response.StatusCodeRange.slnx new file mode 100644 index 00000000000..4f4983b95e6 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/Response.StatusCodeRange.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/Models/ErrorInRange.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/Models/ErrorInRange.Serialization.cs index fe4c49694dd..379c51de55c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/Models/ErrorInRange.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/Models/ErrorInRange.Serialization.cs @@ -12,22 +12,22 @@ public partial class ErrorInRange : IJsonModel { internal ErrorInRange() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual ErrorInRange PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ErrorInRange IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual ErrorInRange JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + ErrorInRange IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - ErrorInRange IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual ErrorInRange PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + ErrorInRange IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual ErrorInRange JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/Models/NotFoundError.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/Models/NotFoundError.Serialization.cs index 5b3f8a1e790..8d76c0e8281 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/Models/NotFoundError.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/Models/NotFoundError.Serialization.cs @@ -12,22 +12,22 @@ public partial class NotFoundError : IJsonModel { internal NotFoundError() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual NotFoundError PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - NotFoundError IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual NotFoundError JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + NotFoundError IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - NotFoundError IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual NotFoundError PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + NotFoundError IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual NotFoundError JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/StatusCodeRangeClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/StatusCodeRangeClient.cs index 68220900e03..1cf6258e804 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/StatusCodeRangeClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/StatusCodeRangeClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -14,7 +15,12 @@ public partial class StatusCodeRangeClient { public StatusCodeRangeClient() : this(new Uri("http://localhost:3000"), new StatusCodeRangeClientOptions()) => throw null; - public StatusCodeRangeClient(Uri endpoint, StatusCodeRangeClientOptions options) => throw null; + internal StatusCodeRangeClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, StatusCodeRangeClientOptions options) => throw null; + + public StatusCodeRangeClient(Uri endpoint, StatusCodeRangeClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public StatusCodeRangeClient(StatusCodeRangeClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/StatusCodeRangeClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/StatusCodeRangeClientOptions.cs index 2433a12ddfd..6c81e4b3cb9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/StatusCodeRangeClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/StatusCodeRangeClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Response.StatusCodeRange { public partial class StatusCodeRangeClientOptions : ClientPipelineOptions { + public StatusCodeRangeClientOptions() => throw null; + + [Experimental("SCME0002")] + internal StatusCodeRangeClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/StatusCodeRangeClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/StatusCodeRangeClientSettings.cs new file mode 100644 index 00000000000..c08b681519a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/StatusCodeRangeClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Response.StatusCodeRange +{ + [Experimental("SCME0002")] + public partial class StatusCodeRangeClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public StatusCodeRangeClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..7afeb875915 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "StatusCodeRangeClient": { + "type": "object", + "description": "Configuration for StatusCodeRangeClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/statusCodeRangeClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "statusCodeRangeClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Response.StatusCodeRange.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Response.StatusCodeRange.csproj index 9f14a610115..1fbee0dd12b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Response.StatusCodeRange.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Response.StatusCodeRange.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/Routes.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/Routes.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/Routes.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/Routes.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/Routes.sln deleted file mode 100644 index 8f7573992ed..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/Routes.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Routes", "src\Routes.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/Routes.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/Routes.slnx new file mode 100644 index 00000000000..317f63fd630 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/Routes.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/InInterface.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/InInterface.cs index 2c68d8281b8..934018fdcc3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/InInterface.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/InInterface.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class InInterface { protected InInterface() => throw null; + internal InInterface(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Fixed(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParameters.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParameters.cs index 3e17767b7d8..305a607546a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParameters.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParameters.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -18,6 +19,8 @@ public partial class PathParameters { protected PathParameters() => throw null; + internal PathParameters(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult TemplateOnly(string @param, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersLabelExpansion.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersLabelExpansion.cs index b7d6a6cbc7c..a3daa8878cb 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersLabelExpansion.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersLabelExpansion.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel.Primitives; using Routes._PathParameters.LabelExpansion.Explode; using Routes._PathParameters.LabelExpansion.Standard; @@ -12,6 +13,8 @@ public partial class PathParametersLabelExpansion { protected PathParametersLabelExpansion() => throw null; + internal PathParametersLabelExpansion(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual PathParametersLabelExpansionStandard GetPathParametersLabelExpansionStandardClient() => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersLabelExpansionExplode.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersLabelExpansionExplode.cs index 79470e680e1..d032c33fc38 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersLabelExpansionExplode.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersLabelExpansionExplode.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class PathParametersLabelExpansionExplode { protected PathParametersLabelExpansionExplode() => throw null; + internal PathParametersLabelExpansionExplode(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Primitive(string @param, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersLabelExpansionStandard.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersLabelExpansionStandard.cs index 0b742d05724..f18f1e516cc 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersLabelExpansionStandard.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersLabelExpansionStandard.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class PathParametersLabelExpansionStandard { protected PathParametersLabelExpansionStandard() => throw null; + internal PathParametersLabelExpansionStandard(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Primitive(string @param, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersMatrixExpansion.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersMatrixExpansion.cs index 6bf98190256..5c60d18f7bb 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersMatrixExpansion.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersMatrixExpansion.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel.Primitives; using Routes._PathParameters.MatrixExpansion.Explode; using Routes._PathParameters.MatrixExpansion.Standard; @@ -12,6 +13,8 @@ public partial class PathParametersMatrixExpansion { protected PathParametersMatrixExpansion() => throw null; + internal PathParametersMatrixExpansion(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual PathParametersMatrixExpansionStandard GetPathParametersMatrixExpansionStandardClient() => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersMatrixExpansionExplode.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersMatrixExpansionExplode.cs index b92df406571..bf3f3e88d58 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersMatrixExpansionExplode.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersMatrixExpansionExplode.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class PathParametersMatrixExpansionExplode { protected PathParametersMatrixExpansionExplode() => throw null; + internal PathParametersMatrixExpansionExplode(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Primitive(string @param, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersMatrixExpansionStandard.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersMatrixExpansionStandard.cs index d40c1696d15..165a76d190f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersMatrixExpansionStandard.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersMatrixExpansionStandard.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class PathParametersMatrixExpansionStandard { protected PathParametersMatrixExpansionStandard() => throw null; + internal PathParametersMatrixExpansionStandard(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Primitive(string @param, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersPathExpansion.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersPathExpansion.cs index ec2f665c1a2..11bd31de479 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersPathExpansion.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersPathExpansion.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel.Primitives; using Routes._PathParameters.PathExpansion.Explode; using Routes._PathParameters.PathExpansion.Standard; @@ -12,6 +13,8 @@ public partial class PathParametersPathExpansion { protected PathParametersPathExpansion() => throw null; + internal PathParametersPathExpansion(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual PathParametersPathExpansionStandard GetPathParametersPathExpansionStandardClient() => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersPathExpansionExplode.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersPathExpansionExplode.cs index b7f10f1c6d4..e2368337641 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersPathExpansionExplode.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersPathExpansionExplode.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class PathParametersPathExpansionExplode { protected PathParametersPathExpansionExplode() => throw null; + internal PathParametersPathExpansionExplode(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Primitive(string @param, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersPathExpansionStandard.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersPathExpansionStandard.cs index d58ca6fbc4d..8c63b0829fb 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersPathExpansionStandard.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersPathExpansionStandard.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class PathParametersPathExpansionStandard { protected PathParametersPathExpansionStandard() => throw null; + internal PathParametersPathExpansionStandard(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Primitive(string @param, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersReservedExpansion.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersReservedExpansion.cs index 3becc3ca8f2..60f78bfde07 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersReservedExpansion.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersReservedExpansion.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class PathParametersReservedExpansion { protected PathParametersReservedExpansion() => throw null; + internal PathParametersReservedExpansion(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Template(string @param, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersSimpleExpansion.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersSimpleExpansion.cs index cb3b2ce1c3a..87724df6d6d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersSimpleExpansion.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersSimpleExpansion.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel.Primitives; using Routes._PathParameters.SimpleExpansion.Explode; using Routes._PathParameters.SimpleExpansion.Standard; @@ -12,6 +13,8 @@ public partial class PathParametersSimpleExpansion { protected PathParametersSimpleExpansion() => throw null; + internal PathParametersSimpleExpansion(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual PathParametersSimpleExpansionStandard GetPathParametersSimpleExpansionStandardClient() => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersSimpleExpansionExplode.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersSimpleExpansionExplode.cs index 00c4d218a1c..2abcc233d4b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersSimpleExpansionExplode.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersSimpleExpansionExplode.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class PathParametersSimpleExpansionExplode { protected PathParametersSimpleExpansionExplode() => throw null; + internal PathParametersSimpleExpansionExplode(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Primitive(string @param, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersSimpleExpansionStandard.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersSimpleExpansionStandard.cs index 63477a318ae..21f896bcdb3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersSimpleExpansionStandard.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/PathParametersSimpleExpansionStandard.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class PathParametersSimpleExpansionStandard { protected PathParametersSimpleExpansionStandard() => throw null; + internal PathParametersSimpleExpansionStandard(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Primitive(string @param, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParameters.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParameters.cs index 4ccfde73030..50f707d2cf0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParameters.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParameters.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -15,6 +16,8 @@ public partial class QueryParameters { protected QueryParameters() => throw null; + internal QueryParameters(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult TemplateOnly(string @param, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryContinuation.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryContinuation.cs index c1e1821e791..3aa640a00e5 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryContinuation.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryContinuation.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel.Primitives; using Routes._QueryParameters.QueryContinuation.Explode; using Routes._QueryParameters.QueryContinuation.Standard; @@ -12,6 +13,8 @@ public partial class QueryParametersQueryContinuation { protected QueryParametersQueryContinuation() => throw null; + internal QueryParametersQueryContinuation(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual QueryParametersQueryContinuationStandard GetQueryParametersQueryContinuationStandardClient() => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryContinuationExplode.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryContinuationExplode.cs index b9a3cb696d4..ca911b55cb3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryContinuationExplode.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryContinuationExplode.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class QueryParametersQueryContinuationExplode { protected QueryParametersQueryContinuationExplode() => throw null; + internal QueryParametersQueryContinuationExplode(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Primitive(string @param, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryContinuationStandard.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryContinuationStandard.cs index 679ca546a46..828f03e49f2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryContinuationStandard.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryContinuationStandard.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class QueryParametersQueryContinuationStandard { protected QueryParametersQueryContinuationStandard() => throw null; + internal QueryParametersQueryContinuationStandard(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Primitive(string @param, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryExpansion.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryExpansion.cs index 7038262cc30..4d2b16565c0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryExpansion.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryExpansion.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel.Primitives; using Routes._QueryParameters.QueryExpansion.Explode; using Routes._QueryParameters.QueryExpansion.Standard; @@ -12,6 +13,8 @@ public partial class QueryParametersQueryExpansion { protected QueryParametersQueryExpansion() => throw null; + internal QueryParametersQueryExpansion(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual QueryParametersQueryExpansionStandard GetQueryParametersQueryExpansionStandardClient() => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryExpansionExplode.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryExpansionExplode.cs index cedde7fe6aa..e8989434a9d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryExpansionExplode.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryExpansionExplode.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class QueryParametersQueryExpansionExplode { protected QueryParametersQueryExpansionExplode() => throw null; + internal QueryParametersQueryExpansionExplode(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Primitive(string @param, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryExpansionStandard.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryExpansionStandard.cs index dd88da3b509..9566e4d25f8 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryExpansionStandard.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/QueryParametersQueryExpansionStandard.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class QueryParametersQueryExpansionStandard { protected QueryParametersQueryExpansionStandard() => throw null; + internal QueryParametersQueryExpansionStandard(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Primitive(string @param, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/RoutesClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/RoutesClient.cs index 7b3edc83edf..8e156cfd6b7 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/RoutesClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/RoutesClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; using Routes._PathParameters; @@ -16,7 +17,12 @@ public partial class RoutesClient { public RoutesClient() : this(new Uri("http://localhost:3000"), new RoutesClientOptions()) => throw null; - public RoutesClient(Uri endpoint, RoutesClientOptions options) => throw null; + internal RoutesClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, RoutesClientOptions options) => throw null; + + public RoutesClient(Uri endpoint, RoutesClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public RoutesClient(RoutesClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/RoutesClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/RoutesClientOptions.cs index f81efdb4ab9..7baddfceeb4 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/RoutesClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/RoutesClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Routes { public partial class RoutesClientOptions : ClientPipelineOptions { + public RoutesClientOptions() => throw null; + + [Experimental("SCME0002")] + internal RoutesClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/RoutesClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/RoutesClientSettings.cs new file mode 100644 index 00000000000..8b389ba6227 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/RoutesClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Routes +{ + [Experimental("SCME0002")] + public partial class RoutesClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public RoutesClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..ff6cfbbd27c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "RoutesClient": { + "type": "object", + "description": "Configuration for RoutesClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/routesClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "routesClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Routes.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Routes.csproj index 4ed2ba74989..16938248707 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Routes.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Routes.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/tspCodeModel.json index 2ff6a987e8f..6ffd4eec8d4 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/tspCodeModel.json @@ -127,7 +127,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.templateOnly.param" + "crossLanguageDefinitionId": "Routes.PathParameters.templateOnly.param", + "methodParameterSegments": [ + { + "$id": "12", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "13", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.templateOnly.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -151,25 +174,7 @@ }, "parameters": [ { - "$id": "12", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "13", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.templateOnly.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "12" } ], "response": {}, @@ -211,7 +216,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.explicit.param" + "crossLanguageDefinitionId": "Routes.PathParameters.explicit.param", + "methodParameterSegments": [ + { + "$id": "18", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "19", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.explicit.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -235,25 +263,7 @@ }, "parameters": [ { - "$id": "18", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "19", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.explicit.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "18" } ], "response": {}, @@ -295,7 +305,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.annotationOnly.param" + "crossLanguageDefinitionId": "Routes.PathParameters.annotationOnly.param", + "methodParameterSegments": [ + { + "$id": "24", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "25", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.annotationOnly.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -319,25 +352,7 @@ }, "parameters": [ { - "$id": "24", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "25", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.annotationOnly.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "24" } ], "response": {}, @@ -426,7 +441,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.ReservedExpansion.template.param" + "crossLanguageDefinitionId": "Routes.PathParameters.ReservedExpansion.template.param", + "methodParameterSegments": [ + { + "$id": "34", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "35", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.ReservedExpansion.template.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -450,25 +488,7 @@ }, "parameters": [ { - "$id": "34", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "35", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.ReservedExpansion.template.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "34" } ], "response": {}, @@ -510,7 +530,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.ReservedExpansion.annotation.param" + "crossLanguageDefinitionId": "Routes.PathParameters.ReservedExpansion.annotation.param", + "methodParameterSegments": [ + { + "$id": "40", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "41", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.ReservedExpansion.annotation.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -534,25 +577,7 @@ }, "parameters": [ { - "$id": "40", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "41", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.ReservedExpansion.annotation.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "40" } ], "response": {}, @@ -688,7 +713,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Standard.primitive.param" + "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Standard.primitive.param", + "methodParameterSegments": [ + { + "$id": "54", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "55", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Standard.primitive.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -712,25 +760,7 @@ }, "parameters": [ { - "$id": "54", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "55", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Standard.primitive.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "54" } ], "response": {}, @@ -779,7 +809,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Standard.array.param" + "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Standard.array.param", + "methodParameterSegments": [ + { + "$id": "61", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "59" + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Standard.array.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -803,21 +852,7 @@ }, "parameters": [ { - "$id": "61", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "59" - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Standard.array.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "61" } ], "response": {}, @@ -871,7 +906,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Standard.record.param" + "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Standard.record.param", + "methodParameterSegments": [ + { + "$id": "68", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "65" + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Standard.record.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -895,21 +949,7 @@ }, "parameters": [ { - "$id": "68", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "65" - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Standard.record.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "68" } ], "response": {}, @@ -999,7 +1039,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Explode.primitive.param" + "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Explode.primitive.param", + "methodParameterSegments": [ + { + "$id": "77", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "78", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Explode.primitive.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1023,25 +1086,7 @@ }, "parameters": [ { - "$id": "77", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "78", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Explode.primitive.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "77" } ], "response": {}, @@ -1079,7 +1124,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Explode.array.param" + "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Explode.array.param", + "methodParameterSegments": [ + { + "$id": "82", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "59" + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Explode.array.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1103,21 +1167,7 @@ }, "parameters": [ { - "$id": "82", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "59" - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Explode.array.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "82" } ], "response": {}, @@ -1155,7 +1205,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Explode.record.param" + "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Explode.record.param", + "methodParameterSegments": [ + { + "$id": "86", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "65" + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Explode.record.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1179,21 +1248,7 @@ }, "parameters": [ { - "$id": "86", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "65" - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.SimpleExpansion.Explode.record.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "86" } ], "response": {}, @@ -1332,7 +1387,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Standard.primitive.param" + "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Standard.primitive.param", + "methodParameterSegments": [ + { + "$id": "99", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "100", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Standard.primitive.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1356,25 +1434,7 @@ }, "parameters": [ { - "$id": "99", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "100", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Standard.primitive.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "99" } ], "response": {}, @@ -1412,7 +1472,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Standard.array.param" + "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Standard.array.param", + "methodParameterSegments": [ + { + "$id": "104", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "59" + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Standard.array.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1436,21 +1515,7 @@ }, "parameters": [ { - "$id": "104", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "59" - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Standard.array.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "104" } ], "response": {}, @@ -1488,7 +1553,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Standard.record.param" + "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Standard.record.param", + "methodParameterSegments": [ + { + "$id": "108", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "65" + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Standard.record.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1512,21 +1596,7 @@ }, "parameters": [ { - "$id": "108", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "65" - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Standard.record.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "108" } ], "response": {}, @@ -1616,7 +1686,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Explode.primitive.param" + "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Explode.primitive.param", + "methodParameterSegments": [ + { + "$id": "117", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "118", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Explode.primitive.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1640,25 +1733,7 @@ }, "parameters": [ { - "$id": "117", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "118", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Explode.primitive.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "117" } ], "response": {}, @@ -1696,7 +1771,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Explode.array.param" + "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Explode.array.param", + "methodParameterSegments": [ + { + "$id": "122", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "59" + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Explode.array.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1720,21 +1814,7 @@ }, "parameters": [ { - "$id": "122", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "59" - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Explode.array.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "122" } ], "response": {}, @@ -1772,7 +1852,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Explode.record.param" + "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Explode.record.param", + "methodParameterSegments": [ + { + "$id": "126", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "65" + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Explode.record.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1796,21 +1895,7 @@ }, "parameters": [ { - "$id": "126", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "65" - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.PathExpansion.Explode.record.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "126" } ], "response": {}, @@ -1949,7 +2034,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Standard.primitive.param" + "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Standard.primitive.param", + "methodParameterSegments": [ + { + "$id": "139", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "140", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Standard.primitive.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1973,25 +2081,7 @@ }, "parameters": [ { - "$id": "139", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "140", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Standard.primitive.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "139" } ], "response": {}, @@ -2029,7 +2119,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Standard.array.param" + "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Standard.array.param", + "methodParameterSegments": [ + { + "$id": "144", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "59" + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Standard.array.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2053,21 +2162,7 @@ }, "parameters": [ { - "$id": "144", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "59" - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Standard.array.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "144" } ], "response": {}, @@ -2105,7 +2200,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Standard.record.param" + "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Standard.record.param", + "methodParameterSegments": [ + { + "$id": "148", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "65" + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Standard.record.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2129,21 +2243,7 @@ }, "parameters": [ { - "$id": "148", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "65" - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Standard.record.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "148" } ], "response": {}, @@ -2233,7 +2333,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Explode.primitive.param" + "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Explode.primitive.param", + "methodParameterSegments": [ + { + "$id": "157", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "158", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Explode.primitive.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2257,25 +2380,7 @@ }, "parameters": [ { - "$id": "157", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "158", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Explode.primitive.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "157" } ], "response": {}, @@ -2313,7 +2418,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Explode.array.param" + "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Explode.array.param", + "methodParameterSegments": [ + { + "$id": "162", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "59" + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Explode.array.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2337,21 +2461,7 @@ }, "parameters": [ { - "$id": "162", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "59" - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Explode.array.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "162" } ], "response": {}, @@ -2389,7 +2499,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Explode.record.param" + "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Explode.record.param", + "methodParameterSegments": [ + { + "$id": "166", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "65" + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Explode.record.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2413,21 +2542,7 @@ }, "parameters": [ { - "$id": "166", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "65" - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.LabelExpansion.Explode.record.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "166" } ], "response": {}, @@ -2566,7 +2681,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Standard.primitive.param" + "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Standard.primitive.param", + "methodParameterSegments": [ + { + "$id": "179", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "180", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Standard.primitive.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2590,25 +2728,7 @@ }, "parameters": [ { - "$id": "179", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "180", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Standard.primitive.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "179" } ], "response": {}, @@ -2646,7 +2766,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Standard.array.param" + "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Standard.array.param", + "methodParameterSegments": [ + { + "$id": "184", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "59" + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Standard.array.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2670,21 +2809,7 @@ }, "parameters": [ { - "$id": "184", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "59" - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Standard.array.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "184" } ], "response": {}, @@ -2722,7 +2847,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Standard.record.param" + "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Standard.record.param", + "methodParameterSegments": [ + { + "$id": "188", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "65" + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Standard.record.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2746,21 +2890,7 @@ }, "parameters": [ { - "$id": "188", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "65" - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Standard.record.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "188" } ], "response": {}, @@ -2850,7 +2980,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Explode.primitive.param" + "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Explode.primitive.param", + "methodParameterSegments": [ + { + "$id": "197", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "198", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Explode.primitive.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2874,25 +3027,7 @@ }, "parameters": [ { - "$id": "197", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "198", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Explode.primitive.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "197" } ], "response": {}, @@ -2930,7 +3065,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Explode.array.param" + "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Explode.array.param", + "methodParameterSegments": [ + { + "$id": "202", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "59" + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Explode.array.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2954,21 +3108,7 @@ }, "parameters": [ { - "$id": "202", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "59" - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Explode.array.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "202" } ], "response": {}, @@ -3006,7 +3146,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Explode.record.param" + "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Explode.record.param", + "methodParameterSegments": [ + { + "$id": "206", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "65" + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Explode.record.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3030,21 +3189,7 @@ }, "parameters": [ { - "$id": "206", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "65" - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.PathParameters.MatrixExpansion.Explode.record.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "206" } ], "response": {}, @@ -3137,7 +3282,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Routes.QueryParameters.templateOnly.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "215", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "216", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.QueryParameters.templateOnly.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3161,25 +3329,7 @@ }, "parameters": [ { - "$id": "215", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "216", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.QueryParameters.templateOnly.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "215" } ], "response": {}, @@ -3218,7 +3368,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Routes.QueryParameters.explicit.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "221", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "222", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.QueryParameters.explicit.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3242,25 +3415,7 @@ }, "parameters": [ { - "$id": "221", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "222", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.QueryParameters.explicit.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "221" } ], "response": {}, @@ -3299,7 +3454,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Routes.QueryParameters.annotationOnly.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "227", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "228", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.QueryParameters.annotationOnly.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3323,25 +3501,7 @@ }, "parameters": [ { - "$id": "227", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "228", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.QueryParameters.annotationOnly.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "227" } ], "response": {}, @@ -3473,7 +3633,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Routes.QueryParameters.QueryExpansion.Standard.primitive.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "241", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "242", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.QueryParameters.QueryExpansion.Standard.primitive.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3497,25 +3680,7 @@ }, "parameters": [ { - "$id": "241", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "242", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.QueryParameters.QueryExpansion.Standard.primitive.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "241" } ], "response": {}, @@ -3550,7 +3715,26 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Routes.QueryParameters.QueryExpansion.Standard.array.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "246", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "59" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.QueryParameters.QueryExpansion.Standard.array.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3574,21 +3758,7 @@ }, "parameters": [ { - "$id": "246", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "59" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.QueryParameters.QueryExpansion.Standard.array.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "246" } ], "response": {}, @@ -3623,7 +3793,26 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Routes.QueryParameters.QueryExpansion.Standard.record.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "250", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "65" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.QueryParameters.QueryExpansion.Standard.record.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3647,21 +3836,7 @@ }, "parameters": [ { - "$id": "250", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "65" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.QueryParameters.QueryExpansion.Standard.record.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "250" } ], "response": {}, @@ -3748,7 +3923,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Routes.QueryParameters.QueryExpansion.Explode.primitive.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "259", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "260", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.QueryParameters.QueryExpansion.Explode.primitive.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3772,25 +3970,7 @@ }, "parameters": [ { - "$id": "259", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "260", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.QueryParameters.QueryExpansion.Explode.primitive.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "259" } ], "response": {}, @@ -3825,7 +4005,26 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Routes.QueryParameters.QueryExpansion.Explode.array.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "264", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "59" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.QueryParameters.QueryExpansion.Explode.array.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3849,21 +4048,7 @@ }, "parameters": [ { - "$id": "264", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "59" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.QueryParameters.QueryExpansion.Explode.array.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "264" } ], "response": {}, @@ -3898,7 +4083,26 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Routes.QueryParameters.QueryExpansion.Explode.record.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "268", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "65" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.QueryParameters.QueryExpansion.Explode.record.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3922,21 +4126,7 @@ }, "parameters": [ { - "$id": "268", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "65" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.QueryParameters.QueryExpansion.Explode.record.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "268" } ], "response": {}, @@ -4072,7 +4262,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Routes.QueryParameters.QueryContinuation.Standard.primitive.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "281", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "282", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.QueryParameters.QueryContinuation.Standard.primitive.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4096,25 +4309,7 @@ }, "parameters": [ { - "$id": "281", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "282", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.QueryParameters.QueryContinuation.Standard.primitive.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "281" } ], "response": {}, @@ -4149,7 +4344,26 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Routes.QueryParameters.QueryContinuation.Standard.array.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "286", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "59" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.QueryParameters.QueryContinuation.Standard.array.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4173,21 +4387,7 @@ }, "parameters": [ { - "$id": "286", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "59" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.QueryParameters.QueryContinuation.Standard.array.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "286" } ], "response": {}, @@ -4222,7 +4422,26 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Routes.QueryParameters.QueryContinuation.Standard.record.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "290", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "65" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.QueryParameters.QueryContinuation.Standard.record.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4246,21 +4465,7 @@ }, "parameters": [ { - "$id": "290", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "65" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.QueryParameters.QueryContinuation.Standard.record.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "290" } ], "response": {}, @@ -4347,7 +4552,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Routes.QueryParameters.QueryContinuation.Explode.primitive.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "299", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "300", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.QueryParameters.QueryContinuation.Explode.primitive.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4371,25 +4599,7 @@ }, "parameters": [ { - "$id": "299", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "300", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.QueryParameters.QueryContinuation.Explode.primitive.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "299" } ], "response": {}, @@ -4424,7 +4634,26 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Routes.QueryParameters.QueryContinuation.Explode.array.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "304", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "59" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.QueryParameters.QueryContinuation.Explode.array.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4448,21 +4677,7 @@ }, "parameters": [ { - "$id": "304", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "59" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.QueryParameters.QueryContinuation.Explode.array.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "304" } ], "response": {}, @@ -4497,7 +4712,26 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Routes.QueryParameters.QueryContinuation.Explode.record.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "308", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$ref": "65" + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Routes.QueryParameters.QueryContinuation.Explode.record.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4521,21 +4755,7 @@ }, "parameters": [ { - "$id": "308", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$ref": "65" - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Routes.QueryParameters.QueryContinuation.Explode.record.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "308" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/Serialization.EncodedName.Json.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/Serialization.EncodedName.Json.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/Serialization.EncodedName.Json.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/Serialization.EncodedName.Json.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/Serialization.EncodedName.Json.sln deleted file mode 100644 index 54a1151dc1c..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/Serialization.EncodedName.Json.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serialization.EncodedName.Json", "src\Serialization.EncodedName.Json.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/Serialization.EncodedName.Json.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/Serialization.EncodedName.Json.slnx new file mode 100644 index 00000000000..4b092c1b83b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/Serialization.EncodedName.Json.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/JsonClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/JsonClient.cs index 0e13b569cc6..5501186e310 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/JsonClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/JsonClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using Serialization.EncodedName.Json._Property; namespace Serialization.EncodedName.Json @@ -12,7 +13,12 @@ public partial class JsonClient { public JsonClient() : this(new Uri("http://localhost:3000"), new JsonClientOptions()) => throw null; - public JsonClient(Uri endpoint, JsonClientOptions options) => throw null; + internal JsonClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, JsonClientOptions options) => throw null; + + public JsonClient(Uri endpoint, JsonClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public JsonClient(JsonClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/JsonClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/JsonClientOptions.cs index bc3159f77db..9ecf64e286d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/JsonClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/JsonClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Serialization.EncodedName.Json { public partial class JsonClientOptions : ClientPipelineOptions { + public JsonClientOptions() => throw null; + + [Experimental("SCME0002")] + internal JsonClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/JsonClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/JsonClientSettings.cs new file mode 100644 index 00000000000..ae2ecca1041 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/JsonClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Serialization.EncodedName.Json +{ + [Experimental("SCME0002")] + public partial class JsonClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public JsonClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.Serialization.cs index b6d7b8705c5..dc49df3629f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.Serialization.cs @@ -13,26 +13,26 @@ public partial class JsonEncodedNameModel : IJsonModel { internal JsonEncodedNameModel() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - JsonEncodedNameModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual JsonEncodedNameModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual JsonEncodedNameModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - JsonEncodedNameModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual JsonEncodedNameModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(JsonEncodedNameModel jsonEncodedNameModel) => throw null; public static explicit operator JsonEncodedNameModel(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + JsonEncodedNameModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual JsonEncodedNameModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/Property.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/Property.cs index 2a1aea1756d..67558d68030 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/Property.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/Property.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Property { protected Property() => throw null; + internal Property(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Send(BinaryContent content, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..9410b7bf43e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "JsonClient": { + "type": "object", + "description": "Configuration for JsonClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/jsonClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "jsonClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Serialization.EncodedName.Json.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Serialization.EncodedName.Json.csproj index 1109271f253..2fe228069b3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Serialization.EncodedName.Json.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Serialization.EncodedName.Json.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/tspCodeModel.json index 0d65fbcd241..e5913b8cadc 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/tspCodeModel.json @@ -158,10 +158,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Serialization.EncodedName.Json.Property.send.contentType" + "crossLanguageDefinitionId": "Serialization.EncodedName.Json.Property.send.contentType", + "methodParameterSegments": [ + { + "$id": "16", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Serialization.EncodedName.Json.Property.send.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "16", + "$id": "17", "kind": "body", "name": "body", "serializedName": "body", @@ -177,7 +197,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Serialization.EncodedName.Json.Property.send.body" + "crossLanguageDefinitionId": "Serialization.EncodedName.Json.Property.send.body", + "methodParameterSegments": [ + { + "$id": "18", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "5" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Serialization.EncodedName.Json.Property.send.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -204,39 +243,10 @@ }, "parameters": [ { - "$id": "17", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "5" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Serialization.EncodedName.Json.Property.send.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "18" }, { - "$id": "18", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Serialization.EncodedName.Json.Property.send.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "16" } ], "response": {}, @@ -271,7 +281,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Serialization.EncodedName.Json.Property.get.accept" + "crossLanguageDefinitionId": "Serialization.EncodedName.Json.Property.get.accept", + "methodParameterSegments": [ + { + "$id": "22", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "3" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Serialization.EncodedName.Json.Property.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -301,21 +330,7 @@ }, "parameters": [ { - "$id": "22", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Serialization.EncodedName.Json.Property.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "22" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/Server.Endpoint.NotDefined.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/Server.Endpoint.NotDefined.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/Server.Endpoint.NotDefined.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/Server.Endpoint.NotDefined.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/Server.Endpoint.NotDefined.sln deleted file mode 100644 index 9a546ba5674..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/Server.Endpoint.NotDefined.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Endpoint.NotDefined", "src\Server.Endpoint.NotDefined.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/Server.Endpoint.NotDefined.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/Server.Endpoint.NotDefined.slnx new file mode 100644 index 00000000000..4bfd714b902 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/Server.Endpoint.NotDefined.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/NotDefinedClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/NotDefinedClient.cs index c9b371e3911..a503b59d200 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/NotDefinedClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/NotDefinedClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class NotDefinedClient public NotDefinedClient(Uri endpoint) : this(endpoint, new NotDefinedClientOptions()) => throw null; - public NotDefinedClient(Uri endpoint, NotDefinedClientOptions options) => throw null; + internal NotDefinedClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, NotDefinedClientOptions options) => throw null; + + public NotDefinedClient(Uri endpoint, NotDefinedClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public NotDefinedClient(NotDefinedClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/NotDefinedClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/NotDefinedClientOptions.cs index 7621f589fdc..4b087e11457 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/NotDefinedClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/NotDefinedClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Server.Endpoint.NotDefined { public partial class NotDefinedClientOptions : ClientPipelineOptions { + public NotDefinedClientOptions() => throw null; + + [Experimental("SCME0002")] + internal NotDefinedClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/NotDefinedClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/NotDefinedClientSettings.cs new file mode 100644 index 00000000000..fd6f73d8ae7 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/NotDefinedClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Server.Endpoint.NotDefined +{ + [Experimental("SCME0002")] + public partial class NotDefinedClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public NotDefinedClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..7d107613b60 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "NotDefinedClient": { + "type": "object", + "description": "Configuration for NotDefinedClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/notDefinedClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "notDefinedClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Server.Endpoint.NotDefined.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Server.Endpoint.NotDefined.csproj index e5fc04dddb4..eda2fb6f3aa 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Server.Endpoint.NotDefined.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Server.Endpoint.NotDefined.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/Server.Path.Multiple.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/Server.Path.Multiple.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/Server.Path.Multiple.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/Server.Path.Multiple.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/Server.Path.Multiple.sln deleted file mode 100644 index dad077f1c7b..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/Server.Path.Multiple.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Path.Multiple", "src\Server.Path.Multiple.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/Server.Path.Multiple.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/Server.Path.Multiple.slnx new file mode 100644 index 00000000000..3857b2d71ee --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/Server.Path.Multiple.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Generated/MultipleClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Generated/MultipleClient.cs index cfb066bf912..10ba60fb3a1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Generated/MultipleClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Generated/MultipleClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class MultipleClient public MultipleClient(Uri endpoint) : this(endpoint, new MultipleClientOptions()) => throw null; - public MultipleClient(Uri endpoint, MultipleClientOptions options) => throw null; + internal MultipleClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, MultipleClientOptions options) => throw null; + + public MultipleClient(Uri endpoint, MultipleClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public MultipleClient(MultipleClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Generated/MultipleClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Generated/MultipleClientOptions.cs index 3c63332cfb3..caa3e5d7a43 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Generated/MultipleClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Generated/MultipleClientOptions.cs @@ -3,6 +3,8 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Server.Path.Multiple { @@ -12,6 +14,9 @@ public partial class MultipleClientOptions : ClientPipelineOptions public MultipleClientOptions(ServiceVersion version = LatestVersion) => throw null; + [Experimental("SCME0002")] + internal MultipleClientOptions(IConfigurationSection section) : base(section) => throw null; + public enum ServiceVersion { /// Version 1.0. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Generated/MultipleClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Generated/MultipleClientSettings.cs new file mode 100644 index 00000000000..6f63f3d49bd --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Generated/MultipleClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Server.Path.Multiple +{ + [Experimental("SCME0002")] + public partial class MultipleClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public MultipleClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..b1cb57736dd --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "MultipleClient": { + "type": "object", + "description": "Configuration for MultipleClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/multipleClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "multipleClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Server.Path.Multiple.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Server.Path.Multiple.csproj index 76a9c5f0f75..4da67dc2ac1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Server.Path.Multiple.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Server.Path.Multiple.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/tspCodeModel.json index 7665b061685..5b35e3dfecf 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/tspCodeModel.json @@ -124,7 +124,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Server.Path.Multiple.withOperationPathParam.keyword" + "crossLanguageDefinitionId": "Server.Path.Multiple.withOperationPathParam.keyword", + "methodParameterSegments": [ + { + "$id": "11", + "kind": "method", + "name": "keyword", + "serializedName": "keyword", + "type": { + "$id": "12", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Server.Path.Multiple.withOperationPathParam.keyword", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -148,25 +171,7 @@ }, "parameters": [ { - "$id": "11", - "kind": "method", - "name": "keyword", - "serializedName": "keyword", - "type": { - "$id": "12", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Server.Path.Multiple.withOperationPathParam.keyword", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "11" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/Server.Path.Single.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/Server.Path.Single.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/Server.Path.Single.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/Server.Path.Single.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/Server.Path.Single.sln deleted file mode 100644 index 1cf6ef80cdd..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/Server.Path.Single.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Path.Single", "src\Server.Path.Single.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/Server.Path.Single.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/Server.Path.Single.slnx new file mode 100644 index 00000000000..ca2f1c2ef32 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/Server.Path.Single.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/SingleClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/SingleClient.cs index 25d2f13eb10..3bc250e9775 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/SingleClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/SingleClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class SingleClient public SingleClient(Uri endpoint) : this(endpoint, new SingleClientOptions()) => throw null; - public SingleClient(Uri endpoint, SingleClientOptions options) => throw null; + internal SingleClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, SingleClientOptions options) => throw null; + + public SingleClient(Uri endpoint, SingleClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public SingleClient(SingleClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/SingleClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/SingleClientOptions.cs index 2bf92e1e4dd..2437f3efb2e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/SingleClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/SingleClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Server.Path.Single { public partial class SingleClientOptions : ClientPipelineOptions { + public SingleClientOptions() => throw null; + + [Experimental("SCME0002")] + internal SingleClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/SingleClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/SingleClientSettings.cs new file mode 100644 index 00000000000..62fc1c47174 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/SingleClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Server.Path.Single +{ + [Experimental("SCME0002")] + public partial class SingleClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public SingleClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..8aaa89bcb3d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "SingleClient": { + "type": "object", + "description": "Configuration for SingleClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/singleClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "singleClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Server.Path.Single.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Server.Path.Single.csproj index 8b61759c74d..efb0c0d431e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Server.Path.Single.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Server.Path.Single.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/Server.Versions.NotVersioned.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/Server.Versions.NotVersioned.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/Server.Versions.NotVersioned.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/Server.Versions.NotVersioned.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/Server.Versions.NotVersioned.sln deleted file mode 100644 index e1f93613c0e..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/Server.Versions.NotVersioned.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Versions.NotVersioned", "src\Server.Versions.NotVersioned.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/Server.Versions.NotVersioned.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/Server.Versions.NotVersioned.slnx new file mode 100644 index 00000000000..8fa9882721d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/Server.Versions.NotVersioned.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/NotVersionedClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/NotVersionedClient.cs index 6fb0abe3bce..66b8752fa2d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/NotVersionedClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/NotVersionedClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class NotVersionedClient public NotVersionedClient(Uri endpoint) : this(endpoint, new NotVersionedClientOptions()) => throw null; - public NotVersionedClient(Uri endpoint, NotVersionedClientOptions options) => throw null; + internal NotVersionedClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, NotVersionedClientOptions options) => throw null; + + public NotVersionedClient(Uri endpoint, NotVersionedClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public NotVersionedClient(NotVersionedClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/NotVersionedClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/NotVersionedClientOptions.cs index f08093acac4..d799204f298 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/NotVersionedClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/NotVersionedClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Server.Versions.NotVersioned { public partial class NotVersionedClientOptions : ClientPipelineOptions { + public NotVersionedClientOptions() => throw null; + + [Experimental("SCME0002")] + internal NotVersionedClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/NotVersionedClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/NotVersionedClientSettings.cs new file mode 100644 index 00000000000..f090470d82a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/NotVersionedClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Server.Versions.NotVersioned +{ + [Experimental("SCME0002")] + public partial class NotVersionedClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public NotVersionedClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..d6bfe467432 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "NotVersionedClient": { + "type": "object", + "description": "Configuration for NotVersionedClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/notVersionedClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "notVersionedClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Server.Versions.NotVersioned.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Server.Versions.NotVersioned.csproj index d7cc34212bd..2e7f7d36f4b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Server.Versions.NotVersioned.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Server.Versions.NotVersioned.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/tspCodeModel.json index 6c22fb5504c..848d63daa02 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/tspCodeModel.json @@ -80,7 +80,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Server.Versions.NotVersioned.withQueryApiVersion.apiVersion", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "8", + "kind": "method", + "name": "apiVersion", + "serializedName": "api-version", + "type": { + "$id": "9", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Server.Versions.NotVersioned.withQueryApiVersion.apiVersion", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -104,25 +127,7 @@ }, "parameters": [ { - "$id": "8", - "kind": "method", - "name": "apiVersion", - "serializedName": "api-version", - "type": { - "$id": "9", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Server.Versions.NotVersioned.withQueryApiVersion.apiVersion", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "8" } ], "response": {}, @@ -164,7 +169,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Server.Versions.NotVersioned.withPathApiVersion.apiVersion" + "crossLanguageDefinitionId": "Server.Versions.NotVersioned.withPathApiVersion.apiVersion", + "methodParameterSegments": [ + { + "$id": "14", + "kind": "method", + "name": "apiVersion", + "serializedName": "apiVersion", + "type": { + "$id": "15", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Path", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Server.Versions.NotVersioned.withPathApiVersion.apiVersion", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -188,25 +216,7 @@ }, "parameters": [ { - "$id": "14", - "kind": "method", - "name": "apiVersion", - "serializedName": "apiVersion", - "type": { - "$id": "15", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Path", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Server.Versions.NotVersioned.withPathApiVersion.apiVersion", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "14" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/Server.Versions.Versioned.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/Server.Versions.Versioned.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/Server.Versions.Versioned.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/Server.Versions.Versioned.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/Server.Versions.Versioned.sln deleted file mode 100644 index d42b1f59e79..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/Server.Versions.Versioned.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Versions.Versioned", "src\Server.Versions.Versioned.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/Server.Versions.Versioned.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/Server.Versions.Versioned.slnx new file mode 100644 index 00000000000..06f6ae715c8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/Server.Versions.Versioned.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Generated/VersionedClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Generated/VersionedClient.cs index 01e9d2e3224..fc5d889c517 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Generated/VersionedClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Generated/VersionedClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class VersionedClient public VersionedClient(Uri endpoint) : this(endpoint, new VersionedClientOptions()) => throw null; - public VersionedClient(Uri endpoint, VersionedClientOptions options) => throw null; + internal VersionedClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, VersionedClientOptions options) => throw null; + + public VersionedClient(Uri endpoint, VersionedClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public VersionedClient(VersionedClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Generated/VersionedClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Generated/VersionedClientOptions.cs index 6caa7e3df01..ad90f69c8ee 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Generated/VersionedClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Generated/VersionedClientOptions.cs @@ -3,6 +3,8 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Server.Versions.Versioned { @@ -12,6 +14,9 @@ public partial class VersionedClientOptions : ClientPipelineOptions public VersionedClientOptions(ServiceVersion version = LatestVersion) => throw null; + [Experimental("SCME0002")] + internal VersionedClientOptions(IConfigurationSection section) : base(section) => throw null; + public enum ServiceVersion { /// The version 2022-12-01-preview. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Generated/VersionedClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Generated/VersionedClientSettings.cs new file mode 100644 index 00000000000..b9d2f526719 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Generated/VersionedClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Server.Versions.Versioned +{ + [Experimental("SCME0002")] + public partial class VersionedClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public VersionedClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..d12452e9f66 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "VersionedClient": { + "type": "object", + "description": "Configuration for VersionedClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/versionedClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "versionedClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Server.Versions.Versioned.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Server.Versions.Versioned.csproj index 53926118c32..78e39157df2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Server.Versions.Versioned.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Server.Versions.Versioned.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/tspCodeModel.json index 82c57e30027..f377693334f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/tspCodeModel.json @@ -148,7 +148,39 @@ "scope": "Client", "decorators": [], "crossLanguageDefinitionId": "Server.Versions.Versioned.withQueryApiVersion.apiVersion", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "13", + "kind": "method", + "name": "apiVersion", + "serializedName": "apiVersion", + "type": { + "$id": "14", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "", + "isApiVersion": true, + "defaultValue": { + "type": { + "$id": "15", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "2022-12-01-preview" + }, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Server.Versions.Versioned.withQueryApiVersion.apiVersion", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -178,7 +210,7 @@ "crossLanguageDefinitionId": "Server.Versions.Versioned.withQueryApiVersion" }, { - "$id": "13", + "$id": "16", "kind": "basic", "name": "withPathApiVersion", "accessibility": "public", @@ -187,18 +219,18 @@ "2022-12-01-preview" ], "operation": { - "$id": "14", + "$id": "17", "name": "withPathApiVersion", "resourceName": "Versioned", "accessibility": "public", "parameters": [ { - "$id": "15", + "$id": "18", "kind": "path", "name": "apiVersion", "serializedName": "apiVersion", "type": { - "$id": "16", + "$id": "19", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -211,7 +243,7 @@ "skipUrlEncoding": false, "defaultValue": { "type": { - "$id": "17", + "$id": "20", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string" @@ -222,7 +254,12 @@ "scope": "Client", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Server.Versions.Versioned.withPathApiVersion.apiVersion" + "crossLanguageDefinitionId": "Server.Versions.Versioned.withPathApiVersion.apiVersion", + "methodParameterSegments": [ + { + "$ref": "13" + } + ] } ], "responses": [ @@ -252,7 +289,7 @@ "crossLanguageDefinitionId": "Server.Versions.Versioned.withPathApiVersion" }, { - "$id": "18", + "$id": "21", "kind": "basic", "name": "withQueryOldApiVersion", "accessibility": "public", @@ -261,18 +298,18 @@ "2022-12-01-preview" ], "operation": { - "$id": "19", + "$id": "22", "name": "withQueryOldApiVersion", "resourceName": "Versioned", "accessibility": "public", "parameters": [ { - "$id": "20", + "$id": "23", "kind": "query", "name": "apiVersion", "serializedName": "api-version", "type": { - "$id": "21", + "$id": "24", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -282,7 +319,7 @@ "explode": false, "defaultValue": { "type": { - "$id": "22", + "$id": "25", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string" @@ -293,7 +330,12 @@ "scope": "Client", "decorators": [], "crossLanguageDefinitionId": "Server.Versions.Versioned.withQueryOldApiVersion.apiVersion", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$ref": "13" + } + ] } ], "responses": [ @@ -325,13 +367,13 @@ ], "parameters": [ { - "$id": "23", + "$id": "26", "kind": "endpoint", "name": "endpoint", "serializedName": "endpoint", "doc": "Need to be set as 'http://localhost:3000' in client.", "type": { - "$id": "24", + "$id": "27", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -346,34 +388,7 @@ "crossLanguageDefinitionId": "Server.Versions.Versioned.endpoint" }, { - "$id": "25", - "kind": "method", - "name": "apiVersion", - "serializedName": "apiVersion", - "type": { - "$id": "26", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "", - "isApiVersion": true, - "defaultValue": { - "type": { - "$id": "27", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string" - }, - "value": "2022-12-01-preview" - }, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Server.Versions.Versioned.withQueryApiVersion.apiVersion", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "13" } ], "initializedBy": 1, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/SpecialHeaders.ConditionalRequest.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/SpecialHeaders.ConditionalRequest.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/SpecialHeaders.ConditionalRequest.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/SpecialHeaders.ConditionalRequest.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/SpecialHeaders.ConditionalRequest.sln deleted file mode 100644 index 4138b4362b7..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/SpecialHeaders.ConditionalRequest.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialHeaders.ConditionalRequest", "src\SpecialHeaders.ConditionalRequest.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/SpecialHeaders.ConditionalRequest.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/SpecialHeaders.ConditionalRequest.slnx new file mode 100644 index 00000000000..0f86a29d581 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/SpecialHeaders.ConditionalRequest.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/ConditionalRequestClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/ConditionalRequestClient.cs index 0e54b80f164..cac754cfedb 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/ConditionalRequestClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/ConditionalRequestClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -14,7 +15,12 @@ public partial class ConditionalRequestClient { public ConditionalRequestClient() : this(new Uri("http://localhost:3000"), new ConditionalRequestClientOptions()) => throw null; - public ConditionalRequestClient(Uri endpoint, ConditionalRequestClientOptions options) => throw null; + internal ConditionalRequestClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, ConditionalRequestClientOptions options) => throw null; + + public ConditionalRequestClient(Uri endpoint, ConditionalRequestClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public ConditionalRequestClient(ConditionalRequestClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/ConditionalRequestClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/ConditionalRequestClientOptions.cs index 924fd0111b6..95d658caefb 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/ConditionalRequestClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/ConditionalRequestClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace SpecialHeaders.ConditionalRequest { public partial class ConditionalRequestClientOptions : ClientPipelineOptions { + public ConditionalRequestClientOptions() => throw null; + + [Experimental("SCME0002")] + internal ConditionalRequestClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/ConditionalRequestClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/ConditionalRequestClientSettings.cs new file mode 100644 index 00000000000..875c80b7101 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/ConditionalRequestClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace SpecialHeaders.ConditionalRequest +{ + [Experimental("SCME0002")] + public partial class ConditionalRequestClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public ConditionalRequestClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..830040d350d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "ConditionalRequestClient": { + "type": "object", + "description": "Configuration for ConditionalRequestClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/conditionalRequestClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "conditionalRequestClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/SpecialHeaders.ConditionalRequest.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/SpecialHeaders.ConditionalRequest.csproj index 85c62ee0300..4e67efb0ab7 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/SpecialHeaders.ConditionalRequest.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/SpecialHeaders.ConditionalRequest.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/tspCodeModel.json index e0ac37b763e..3c5cb500508 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/tspCodeModel.json @@ -45,7 +45,31 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialHeaders.ConditionalRequest.postIfMatch.ifMatch" + "crossLanguageDefinitionId": "SpecialHeaders.ConditionalRequest.postIfMatch.ifMatch", + "methodParameterSegments": [ + { + "$id": "6", + "kind": "method", + "name": "ifMatch", + "serializedName": "If-Match", + "doc": "The request should only proceed if an entity matches this string.", + "type": { + "$id": "7", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialHeaders.ConditionalRequest.postIfMatch.ifMatch", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -69,26 +93,7 @@ }, "parameters": [ { - "$id": "6", - "kind": "method", - "name": "ifMatch", - "serializedName": "If-Match", - "doc": "The request should only proceed if an entity matches this string.", - "type": { - "$id": "7", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialHeaders.ConditionalRequest.postIfMatch.ifMatch", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "6" } ], "response": {}, @@ -130,7 +135,31 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialHeaders.ConditionalRequest.postIfNoneMatch.ifNoneMatch" + "crossLanguageDefinitionId": "SpecialHeaders.ConditionalRequest.postIfNoneMatch.ifNoneMatch", + "methodParameterSegments": [ + { + "$id": "12", + "kind": "method", + "name": "ifNoneMatch", + "serializedName": "If-None-Match", + "doc": "The request should only proceed if no entity matches this string.", + "type": { + "$id": "13", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialHeaders.ConditionalRequest.postIfNoneMatch.ifNoneMatch", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -154,26 +183,7 @@ }, "parameters": [ { - "$id": "12", - "kind": "method", - "name": "ifNoneMatch", - "serializedName": "If-None-Match", - "doc": "The request should only proceed if no entity matches this string.", - "type": { - "$id": "13", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialHeaders.ConditionalRequest.postIfNoneMatch.ifNoneMatch", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "12" } ], "response": {}, @@ -223,7 +233,39 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialHeaders.ConditionalRequest.headIfModifiedSince.ifModifiedSince" + "crossLanguageDefinitionId": "SpecialHeaders.ConditionalRequest.headIfModifiedSince.ifModifiedSince", + "methodParameterSegments": [ + { + "$id": "19", + "kind": "method", + "name": "ifModifiedSince", + "serializedName": "If-Modified-Since", + "doc": "A timestamp indicating the last modified time of the resource known to the\nclient. The operation will be performed only if the resource on the service has\nbeen modified since the specified time.", + "type": { + "$id": "20", + "kind": "utcDateTime", + "name": "utcDateTime", + "encode": "rfc7231", + "wireType": { + "$id": "21", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.utcDateTime", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialHeaders.ConditionalRequest.headIfModifiedSince.ifModifiedSince", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -247,34 +289,7 @@ }, "parameters": [ { - "$id": "19", - "kind": "method", - "name": "ifModifiedSince", - "serializedName": "If-Modified-Since", - "doc": "A timestamp indicating the last modified time of the resource known to the\nclient. The operation will be performed only if the resource on the service has\nbeen modified since the specified time.", - "type": { - "$id": "20", - "kind": "utcDateTime", - "name": "utcDateTime", - "encode": "rfc7231", - "wireType": { - "$id": "21", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.utcDateTime", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialHeaders.ConditionalRequest.headIfModifiedSince.ifModifiedSince", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "19" } ], "response": {}, @@ -324,7 +339,39 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince.ifUnmodifiedSince" + "crossLanguageDefinitionId": "SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince.ifUnmodifiedSince", + "methodParameterSegments": [ + { + "$id": "27", + "kind": "method", + "name": "ifUnmodifiedSince", + "serializedName": "If-Unmodified-Since", + "doc": "A timestamp indicating the last modified time of the resource known to the\nclient. The operation will be performed only if the resource on the service has\nnot been modified since the specified time.", + "type": { + "$id": "28", + "kind": "utcDateTime", + "name": "utcDateTime", + "encode": "rfc7231", + "wireType": { + "$id": "29", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.utcDateTime", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince.ifUnmodifiedSince", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -348,34 +395,7 @@ }, "parameters": [ { - "$id": "27", - "kind": "method", - "name": "ifUnmodifiedSince", - "serializedName": "If-Unmodified-Since", - "doc": "A timestamp indicating the last modified time of the resource known to the\nclient. The operation will be performed only if the resource on the service has\nnot been modified since the specified time.", - "type": { - "$id": "28", - "kind": "utcDateTime", - "name": "utcDateTime", - "encode": "rfc7231", - "wireType": { - "$id": "29", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.utcDateTime", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince.ifUnmodifiedSince", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "27" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/SpecialHeaders.Repeatability.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/SpecialHeaders.Repeatability.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/SpecialHeaders.Repeatability.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/SpecialHeaders.Repeatability.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/SpecialHeaders.Repeatability.sln deleted file mode 100644 index 9d1e65f4868..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/SpecialHeaders.Repeatability.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialHeaders.Repeatability", "src\SpecialHeaders.Repeatability.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/SpecialHeaders.Repeatability.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/SpecialHeaders.Repeatability.slnx new file mode 100644 index 00000000000..9ea335e275f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/SpecialHeaders.Repeatability.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/RepeatabilityClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/RepeatabilityClient.cs index 325865ab679..cff3310bcef 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/RepeatabilityClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/RepeatabilityClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -14,7 +15,12 @@ public partial class RepeatabilityClient { public RepeatabilityClient() : this(new Uri("http://localhost:3000"), new RepeatabilityClientOptions()) => throw null; - public RepeatabilityClient(Uri endpoint, RepeatabilityClientOptions options) => throw null; + internal RepeatabilityClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, RepeatabilityClientOptions options) => throw null; + + public RepeatabilityClient(Uri endpoint, RepeatabilityClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public RepeatabilityClient(RepeatabilityClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/RepeatabilityClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/RepeatabilityClientOptions.cs index e41461a9acc..fb088f71dbb 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/RepeatabilityClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/RepeatabilityClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace SpecialHeaders.Repeatability { public partial class RepeatabilityClientOptions : ClientPipelineOptions { + public RepeatabilityClientOptions() => throw null; + + [Experimental("SCME0002")] + internal RepeatabilityClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/RepeatabilityClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/RepeatabilityClientSettings.cs new file mode 100644 index 00000000000..3a295325198 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/RepeatabilityClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace SpecialHeaders.Repeatability +{ + [Experimental("SCME0002")] + public partial class RepeatabilityClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public RepeatabilityClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..f19ad45f5ae --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "RepeatabilityClient": { + "type": "object", + "description": "Configuration for RepeatabilityClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/repeatabilityClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "repeatabilityClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/SpecialHeaders.Repeatability.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/SpecialHeaders.Repeatability.csproj index 2e8d9d974d3..b003c39b4b7 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/SpecialHeaders.Repeatability.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/SpecialHeaders.Repeatability.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/tspCodeModel.json index 77b5b5f9b5d..bf8222f35a3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/tspCodeModel.json @@ -91,20 +91,43 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialHeaders.Repeatability.immediateSuccess.repeatabilityRequestID" + "crossLanguageDefinitionId": "SpecialHeaders.Repeatability.immediateSuccess.repeatabilityRequestID", + "methodParameterSegments": [ + { + "$id": "10", + "kind": "method", + "name": "repeatabilityRequestID", + "serializedName": "Repeatability-Request-ID", + "type": { + "$id": "11", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialHeaders.Repeatability.immediateSuccess.repeatabilityRequestID", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "10", + "$id": "12", "kind": "header", "name": "repeatabilityFirstSent", "serializedName": "Repeatability-First-Sent", "type": { - "$id": "11", + "$id": "13", "kind": "utcDateTime", "name": "utcDateTime", "encode": "rfc7231", "wireType": { - "$id": "12", + "$id": "14", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -119,7 +142,38 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialHeaders.Repeatability.immediateSuccess.repeatabilityFirstSent" + "crossLanguageDefinitionId": "SpecialHeaders.Repeatability.immediateSuccess.repeatabilityFirstSent", + "methodParameterSegments": [ + { + "$id": "15", + "kind": "method", + "name": "repeatabilityFirstSent", + "serializedName": "Repeatability-First-Sent", + "type": { + "$id": "16", + "kind": "utcDateTime", + "name": "utcDateTime", + "encode": "rfc7231", + "wireType": { + "$id": "17", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "crossLanguageDefinitionId": "TypeSpec.utcDateTime", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialHeaders.Repeatability.immediateSuccess.repeatabilityFirstSent", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -152,54 +206,10 @@ }, "parameters": [ { - "$id": "13", - "kind": "method", - "name": "repeatabilityRequestID", - "serializedName": "Repeatability-Request-ID", - "type": { - "$id": "14", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialHeaders.Repeatability.immediateSuccess.repeatabilityRequestID", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "10" }, { - "$id": "15", - "kind": "method", - "name": "repeatabilityFirstSent", - "serializedName": "Repeatability-First-Sent", - "type": { - "$id": "16", - "kind": "utcDateTime", - "name": "utcDateTime", - "encode": "rfc7231", - "wireType": { - "$id": "17", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "crossLanguageDefinitionId": "TypeSpec.utcDateTime", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialHeaders.Repeatability.immediateSuccess.repeatabilityFirstSent", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "15" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/SpecialWords.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/SpecialWords.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/SpecialWords.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/SpecialWords.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/SpecialWords.sln deleted file mode 100644 index c9813083010..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/SpecialWords.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialWords", "src\SpecialWords.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/SpecialWords.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/SpecialWords.slnx new file mode 100644 index 00000000000..66df7c8c010 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/SpecialWords.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/ExtensibleStrings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/ExtensibleStrings.cs new file mode 100644 index 00000000000..e3eccdf112f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/ExtensibleStrings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Threading; +using System.Threading.Tasks; + +namespace SpecialWords._ExtensibleStrings +{ + public partial class ExtensibleStrings + { + protected ExtensibleStrings() => throw null; + + internal ExtensibleStrings(ClientPipeline pipeline, Uri endpoint) => throw null; + + public ClientPipeline Pipeline => throw null; + + public virtual ClientResult PutExtensibleStringValue(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task PutExtensibleStringValueAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult PutExtensibleStringValue(ExtensibleString body, CancellationToken cancellationToken = default) => throw null; + + public virtual Task> PutExtensibleStringValueAsync(ExtensibleString body, CancellationToken cancellationToken = default) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/ModelProperties.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/ModelProperties.cs index 0fed89ca4f3..145be0ededd 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/ModelProperties.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/ModelProperties.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class ModelProperties { protected ModelProperties() => throw null; + internal ModelProperties(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult SameAsModel(BinaryContent content, RequestOptions options = null) => throw null; @@ -30,5 +33,13 @@ public partial class ModelProperties public virtual ClientResult DictMethods(DictMethods body, CancellationToken cancellationToken = default) => throw null; public virtual Task DictMethodsAsync(DictMethods body, CancellationToken cancellationToken = default) => throw null; + + public virtual ClientResult WithList(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual Task WithListAsync(BinaryContent content, RequestOptions options = null) => throw null; + + public virtual ClientResult WithList(ModelWithList body, CancellationToken cancellationToken = default) => throw null; + + public virtual Task WithListAsync(ModelWithList body, CancellationToken cancellationToken = default) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models.cs index af9e99fa778..ec89fe4d3f7 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Models { protected Models() => throw null; + internal Models(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult WithAnd(BinaryContent content, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/And.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/And.Serialization.cs index 741c5848e44..a4c3532c249 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/And.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/And.Serialization.cs @@ -13,24 +13,24 @@ public partial class And : IJsonModel { internal And() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - And IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual And PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual And JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - And IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual And PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(And @and) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + And IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual And JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/As.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/As.Serialization.cs index 5ce79b3d4bc..0e923315ff8 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/As.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/As.Serialization.cs @@ -13,24 +13,24 @@ public partial class As : IJsonModel { internal As() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - As IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual As PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual As JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - As IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual As PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(As @as) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + As IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual As JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Assert.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Assert.Serialization.cs index c0af74f30f4..5777e6f6524 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Assert.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Assert.Serialization.cs @@ -13,24 +13,24 @@ public partial class Assert : IJsonModel { internal Assert() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Assert IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Assert PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Assert JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Assert IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Assert PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Assert assert) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Assert IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Assert JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Async.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Async.Serialization.cs index 884fc81c002..8dced72e7f7 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Async.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Async.Serialization.cs @@ -13,24 +13,24 @@ public partial class Async : IJsonModel { internal Async() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Async IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Async PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Async JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Async IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Async PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Async @async) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Async IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Async JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Await.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Await.Serialization.cs index fbdf54adc95..5e0a3030a75 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Await.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Await.Serialization.cs @@ -13,24 +13,24 @@ public partial class Await : IJsonModel { internal Await() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Await IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Await PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Await JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Await IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Await PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Await @await) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Await IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Await JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Break.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Break.Serialization.cs index 4db3379c011..337d1f843f2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Break.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Break.Serialization.cs @@ -13,24 +13,24 @@ public partial class Break : IJsonModel { internal Break() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Break IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Break PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Break JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Break IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Break PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Break @break) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Break IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Break JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Class.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Class.Serialization.cs index f535a3bf85c..75813d27d19 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Class.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Class.Serialization.cs @@ -13,24 +13,24 @@ public partial class Class : IJsonModel { internal Class() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Class IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Class PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Class JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Class IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Class PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Class @class) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Class IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Class JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Constructor.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Constructor.Serialization.cs index 3be1d4e130f..c9670717c32 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Constructor.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Constructor.Serialization.cs @@ -13,24 +13,24 @@ public partial class Constructor : IJsonModel { internal Constructor() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Constructor IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Constructor PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Constructor JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Constructor IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Constructor PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Constructor constructor) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Constructor IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Constructor JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Continue.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Continue.Serialization.cs index f0907af0548..27c543a6ba7 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Continue.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Continue.Serialization.cs @@ -13,24 +13,24 @@ public partial class Continue : IJsonModel { internal Continue() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Continue IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Continue PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Continue JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Continue IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Continue PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Continue @continue) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Continue IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Continue JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Def.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Def.Serialization.cs index 8feca0df8ef..fffe60458c6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Def.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Def.Serialization.cs @@ -13,24 +13,24 @@ public partial class Def : IJsonModel { internal Def() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Def IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Def PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Def JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Def IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Def PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Def def) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Def IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Def JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Del.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Del.Serialization.cs index 05ac79eda47..91486bc6b22 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Del.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Del.Serialization.cs @@ -13,24 +13,24 @@ public partial class Del : IJsonModel { internal Del() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Del IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Del PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Del JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Del IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Del PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Del del) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Del IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Del JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/DictMethods.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/DictMethods.Serialization.cs index f445a94dfb9..2c4187d1f19 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/DictMethods.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/DictMethods.Serialization.cs @@ -13,24 +13,24 @@ public partial class DictMethods : IJsonModel { internal DictMethods() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DictMethods IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual DictMethods PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DictMethods JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DictMethods IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DictMethods PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(DictMethods dictMethods) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DictMethods IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual DictMethods JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Elif.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Elif.Serialization.cs index 40637b6c94f..6e3a7d5254b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Elif.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Elif.Serialization.cs @@ -13,24 +13,24 @@ public partial class Elif : IJsonModel { internal Elif() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Elif IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Elif PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Elif JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Elif IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Elif PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Elif elif) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Elif IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Elif JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Else.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Else.Serialization.cs index 2e621f4975d..cd411260dc9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Else.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Else.Serialization.cs @@ -13,24 +13,24 @@ public partial class Else : IJsonModel { internal Else() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Else IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Else PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Else JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Else IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Else PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Else @else) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Else IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Else JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Except.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Except.Serialization.cs index 3ab2a790c2d..4131dd1f71b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Except.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Except.Serialization.cs @@ -13,24 +13,24 @@ public partial class Except : IJsonModel { internal Except() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Except IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Except PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Except JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Except IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Except PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Except except) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Except IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Except JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Exec.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Exec.Serialization.cs index 1f252a9d1f7..765473ba59e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Exec.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Exec.Serialization.cs @@ -13,24 +13,24 @@ public partial class Exec : IJsonModel { internal Exec() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Exec IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Exec PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Exec JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Exec IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Exec PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Exec exec) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Exec IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Exec JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/ExtensibleString.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/ExtensibleString.cs new file mode 100644 index 00000000000..624c939fe34 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/ExtensibleString.cs @@ -0,0 +1,98 @@ +// + +#nullable disable + +using System; +using System.ComponentModel; + +namespace SpecialWords._ExtensibleStrings +{ + public readonly partial struct ExtensibleString : IEquatable + { + public ExtensibleString(string value) => throw null; + + public static ExtensibleString And => throw null; + + public static ExtensibleString As => throw null; + + public static ExtensibleString Assert => throw null; + + public static ExtensibleString Async => throw null; + + public static ExtensibleString Await => throw null; + + public static ExtensibleString Break => throw null; + + public static ExtensibleString Class => throw null; + + public static ExtensibleString Constructor => throw null; + + public static ExtensibleString Continue => throw null; + + public static ExtensibleString Def => throw null; + + public static ExtensibleString Del => throw null; + + public static ExtensibleString Elif => throw null; + + public static ExtensibleString Else => throw null; + + public static ExtensibleString Except => throw null; + + public static ExtensibleString Exec => throw null; + + public static ExtensibleString Finally => throw null; + + public static ExtensibleString For => throw null; + + public static ExtensibleString From => throw null; + + public static ExtensibleString Global => throw null; + + public static ExtensibleString If => throw null; + + public static ExtensibleString Import => throw null; + + public static ExtensibleString In => throw null; + + public static ExtensibleString Is => throw null; + + public static ExtensibleString Lambda => throw null; + + public static ExtensibleString Not => throw null; + + public static ExtensibleString Or => throw null; + + public static ExtensibleString Pass => throw null; + + public static ExtensibleString Raise => throw null; + + public static ExtensibleString Return => throw null; + + public static ExtensibleString Try => throw null; + + public static ExtensibleString While => throw null; + + public static ExtensibleString With => throw null; + + public static ExtensibleString Yield => throw null; + + public static bool operator ==(ExtensibleString left, ExtensibleString right) => throw null; + + public static bool operator !=(ExtensibleString left, ExtensibleString right) => throw null; + + public static implicit operator ExtensibleString(string value) => throw null; + + public static implicit operator ExtensibleString?(string value) => throw null; + + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object obj) => throw null; + + public bool Equals(ExtensibleString other) => throw null; + + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => throw null; + + public override string ToString() => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Finally.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Finally.Serialization.cs index a7fd189d52c..7b9e5b61281 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Finally.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Finally.Serialization.cs @@ -13,24 +13,24 @@ public partial class Finally : IJsonModel { internal Finally() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Finally IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Finally PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Finally JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Finally IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Finally PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Finally @finally) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Finally IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Finally JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/For.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/For.Serialization.cs index e1f658aac40..811740ad044 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/For.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/For.Serialization.cs @@ -13,24 +13,24 @@ public partial class For : IJsonModel { internal For() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - For IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual For PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual For JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - For IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual For PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(For @for) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + For IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual For JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/From.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/From.Serialization.cs index 359c3927d70..db0d8b3b5e2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/From.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/From.Serialization.cs @@ -13,24 +13,24 @@ public partial class From : IJsonModel { internal From() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - From IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual From PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual From JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - From IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual From PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(From @from) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + From IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual From JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Global.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Global.Serialization.cs index c4b82c5aede..eaed10f5180 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Global.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Global.Serialization.cs @@ -13,24 +13,24 @@ public partial class Global : IJsonModel { internal Global() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Global IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Global PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Global JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Global IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Global PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Global @global) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Global IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Global JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/If.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/If.Serialization.cs index efa84058b15..59e0448578f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/If.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/If.Serialization.cs @@ -13,24 +13,24 @@ public partial class If : IJsonModel { internal If() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - If IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual If PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual If JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - If IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual If PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(If @if) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + If IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual If JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Import.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Import.Serialization.cs index fd7f89d4e4c..2261809a785 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Import.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Import.Serialization.cs @@ -13,24 +13,24 @@ public partial class Import : IJsonModel { internal Import() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Import IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Import PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Import JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Import IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Import PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Import import) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Import IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Import JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/In.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/In.Serialization.cs index 69fee54fbc2..a9e84ada899 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/In.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/In.Serialization.cs @@ -13,24 +13,24 @@ public partial class In : IJsonModel { internal In() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - In IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual In PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual In JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - In IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual In PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(In @in) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + In IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual In JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Is.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Is.Serialization.cs index 4cf792af6b3..5933442e979 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Is.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Is.Serialization.cs @@ -13,24 +13,24 @@ public partial class Is : IJsonModel { internal Is() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Is IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Is PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Is JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Is IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Is PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Is @is) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Is IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Is JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Lambda.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Lambda.Serialization.cs index 981100fa908..e4610b9c861 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Lambda.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Lambda.Serialization.cs @@ -13,24 +13,24 @@ public partial class Lambda : IJsonModel { internal Lambda() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Lambda IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Lambda PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Lambda JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Lambda IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Lambda PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Lambda lambda) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Lambda IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Lambda JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/ModelWithList.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/ModelWithList.Serialization.cs new file mode 100644 index 00000000000..8b9c3b6b646 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/ModelWithList.Serialization.cs @@ -0,0 +1,36 @@ +// + +#nullable disable + +using System; +using System.ClientModel; +using System.ClientModel.Primitives; +using System.Text.Json; + +namespace SpecialWords._ModelProperties +{ + public partial class ModelWithList : IJsonModel + { + internal ModelWithList() => throw null; + + protected virtual ModelWithList PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + + ModelWithList IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + + public static implicit operator BinaryContent(ModelWithList modelWithList) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ModelWithList IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ModelWithList JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/ModelWithList.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/ModelWithList.cs new file mode 100644 index 00000000000..2aa63c0a18b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/ModelWithList.cs @@ -0,0 +1,13 @@ +// + +#nullable disable + +namespace SpecialWords._ModelProperties +{ + public partial class ModelWithList + { + public ModelWithList(string list) => throw null; + + public string List => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Not.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Not.Serialization.cs index 4481d173ce5..e11bf34c379 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Not.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Not.Serialization.cs @@ -13,24 +13,24 @@ public partial class Not : IJsonModel { internal Not() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Not IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Not PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Not JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Not IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Not PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Not @not) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Not IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Not JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Or.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Or.Serialization.cs index c03ff0a6527..ed1e52bf20e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Or.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Or.Serialization.cs @@ -13,24 +13,24 @@ public partial class Or : IJsonModel { internal Or() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Or IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Or PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Or JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Or IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Or PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Or @or) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Or IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Or JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Pass.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Pass.Serialization.cs index e95aada1289..4266117956a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Pass.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Pass.Serialization.cs @@ -13,24 +13,24 @@ public partial class Pass : IJsonModel { internal Pass() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Pass IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Pass PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Pass JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Pass IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Pass PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Pass pass) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Pass IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Pass JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Raise.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Raise.Serialization.cs index 7553ae84aaf..db092a2dc01 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Raise.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Raise.Serialization.cs @@ -13,24 +13,24 @@ public partial class Raise : IJsonModel { internal Raise() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Raise IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Raise PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Raise JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Raise IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Raise PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Raise raise) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Raise IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Raise JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Return.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Return.Serialization.cs index 79db2322860..e9f39d23bf0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Return.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Return.Serialization.cs @@ -13,24 +13,24 @@ public partial class Return : IJsonModel { internal Return() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Return IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Return PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Return JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Return IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Return PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Return @return) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Return IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Return JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/SameAsModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/SameAsModel.Serialization.cs index 3c217e03e2a..639decacd8e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/SameAsModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/SameAsModel.Serialization.cs @@ -13,24 +13,24 @@ public partial class SameAsModel : IJsonModel { internal SameAsModel() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - SameAsModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual SameAsModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SameAsModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - SameAsModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SameAsModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(SameAsModel sameAsModel) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + SameAsModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual SameAsModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/SpecialWordsContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/SpecialWordsContext.cs index d04f06a1fa5..9469e8aa953 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/SpecialWordsContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/SpecialWordsContext.cs @@ -33,6 +33,7 @@ namespace SpecialWords [ModelReaderWriterBuildable(typeof(In))] [ModelReaderWriterBuildable(typeof(Is))] [ModelReaderWriterBuildable(typeof(Lambda))] + [ModelReaderWriterBuildable(typeof(ModelWithList))] [ModelReaderWriterBuildable(typeof(Not))] [ModelReaderWriterBuildable(typeof(Or))] [ModelReaderWriterBuildable(typeof(Pass))] diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Try.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Try.Serialization.cs index b71c136483d..154e3418085 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Try.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Try.Serialization.cs @@ -13,24 +13,24 @@ public partial class Try : IJsonModel { internal Try() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Try IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Try PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Try JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Try IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Try PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Try @try) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Try IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Try JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/While.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/While.Serialization.cs index 2251f7817ef..745486466f6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/While.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/While.Serialization.cs @@ -13,24 +13,24 @@ public partial class While : IJsonModel { internal While() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - While IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual While PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual While JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - While IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual While PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(While @while) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + While IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual While JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/With.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/With.Serialization.cs index a47c801e5b3..a84fed86fda 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/With.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/With.Serialization.cs @@ -13,24 +13,24 @@ public partial class With : IJsonModel { internal With() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - With IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual With PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual With JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - With IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual With PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(With @with) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + With IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual With JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Yield.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Yield.Serialization.cs index ab9d32f240d..510f2244d5d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Yield.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Yield.Serialization.cs @@ -13,24 +13,24 @@ public partial class Yield : IJsonModel { internal Yield() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Yield IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Yield PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Yield JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Yield IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Yield PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Yield @yield) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Yield IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Yield JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Operations.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Operations.cs index bb367d9e0e7..1dfa7cdcfbe 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Operations.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Operations.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Operations { protected Operations() => throw null; + internal Operations(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult And(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Parameters.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Parameters.cs index a489749d1a9..fb1b60d7ad1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Parameters.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Parameters.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Parameters { protected Parameters() => throw null; + internal Parameters(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult WithAnd(string @and, RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsClient.cs index 7d18528a04e..03609a93376 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsClient.cs @@ -4,6 +4,8 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using SpecialWords._ExtensibleStrings; using SpecialWords._ModelProperties; using SpecialWords._Models; @@ -13,7 +15,12 @@ public partial class SpecialWordsClient { public SpecialWordsClient() : this(new Uri("http://localhost:3000"), new SpecialWordsClientOptions()) => throw null; - public SpecialWordsClient(Uri endpoint, SpecialWordsClientOptions options) => throw null; + internal SpecialWordsClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, SpecialWordsClientOptions options) => throw null; + + public SpecialWordsClient(Uri endpoint, SpecialWordsClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public SpecialWordsClient(SpecialWordsClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; @@ -21,6 +28,8 @@ public partial class SpecialWordsClient public virtual ModelProperties GetModelPropertiesClient() => throw null; + public virtual ExtensibleStrings GetExtensibleStringsClient() => throw null; + public virtual Operations GetOperationsClient() => throw null; public virtual Parameters GetParametersClient() => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsClientOptions.cs index 51d0271c810..62880034a3c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace SpecialWords { public partial class SpecialWordsClientOptions : ClientPipelineOptions { + public SpecialWordsClientOptions() => throw null; + + [Experimental("SCME0002")] + internal SpecialWordsClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsClientSettings.cs new file mode 100644 index 00000000000..28c09cdfd51 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace SpecialWords +{ + [Experimental("SCME0002")] + public partial class SpecialWordsClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public SpecialWordsClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsModelFactory.cs index 9b130273a61..43aca8db259 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsModelFactory.cs @@ -78,5 +78,7 @@ public static partial class SpecialWordsModelFactory public static SameAsModel SameAsModel(string sameAsModelProperty = default) => throw null; public static DictMethods DictMethods(string keys = default, string items = default, string values = default, string popitem = default, string clear = default, string update = default, string setdefault = default, string pop = default, string @get = default, string copy = default) => throw null; + + public static ModelWithList ModelWithList(string list = default) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..dc19afb58df --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "SpecialWordsClient": { + "type": "object", + "description": "Configuration for SpecialWordsClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/specialWordsClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "specialWordsClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/SpecialWords.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/SpecialWords.csproj index dcda0f46983..b72f8dce443 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/SpecialWords.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/SpecialWords.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/tspCodeModel.json index 1422540a9de..faf70c73089 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/tspCodeModel.json @@ -1,16 +1,467 @@ { "name": "SpecialWords", "apiVersions": [], - "enums": [], - "constants": [ + "enums": [ { "$id": "1", + "kind": "enum", + "name": "ExtensibleString", + "crossLanguageDefinitionId": "SpecialWords.ExtensibleStrings.ExtensibleString", + "valueType": { + "$id": "2", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "values": [ + { + "$id": "3", + "kind": "enumvalue", + "name": "and", + "value": "and", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "4", + "kind": "enumvalue", + "name": "as", + "value": "as", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "5", + "kind": "enumvalue", + "name": "assert", + "value": "assert", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "6", + "kind": "enumvalue", + "name": "async", + "value": "async", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "7", + "kind": "enumvalue", + "name": "await", + "value": "await", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "8", + "kind": "enumvalue", + "name": "break", + "value": "break", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "9", + "kind": "enumvalue", + "name": "class", + "value": "class", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "10", + "kind": "enumvalue", + "name": "constructor", + "value": "constructor", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "11", + "kind": "enumvalue", + "name": "continue", + "value": "continue", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "12", + "kind": "enumvalue", + "name": "def", + "value": "def", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "13", + "kind": "enumvalue", + "name": "del", + "value": "del", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "14", + "kind": "enumvalue", + "name": "elif", + "value": "elif", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "15", + "kind": "enumvalue", + "name": "else", + "value": "else", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "16", + "kind": "enumvalue", + "name": "except", + "value": "except", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "17", + "kind": "enumvalue", + "name": "exec", + "value": "exec", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "18", + "kind": "enumvalue", + "name": "finally", + "value": "finally", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "19", + "kind": "enumvalue", + "name": "for", + "value": "for", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "20", + "kind": "enumvalue", + "name": "from", + "value": "from", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "21", + "kind": "enumvalue", + "name": "global", + "value": "global", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "22", + "kind": "enumvalue", + "name": "if", + "value": "if", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "23", + "kind": "enumvalue", + "name": "import", + "value": "import", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "24", + "kind": "enumvalue", + "name": "in", + "value": "in", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "25", + "kind": "enumvalue", + "name": "is", + "value": "is", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "26", + "kind": "enumvalue", + "name": "lambda", + "value": "lambda", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "27", + "kind": "enumvalue", + "name": "not", + "value": "not", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "28", + "kind": "enumvalue", + "name": "or", + "value": "or", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "29", + "kind": "enumvalue", + "name": "pass", + "value": "pass", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "30", + "kind": "enumvalue", + "name": "raise", + "value": "raise", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "31", + "kind": "enumvalue", + "name": "return", + "value": "return", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "32", + "kind": "enumvalue", + "name": "try", + "value": "try", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "33", + "kind": "enumvalue", + "name": "while", + "value": "while", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "34", + "kind": "enumvalue", + "name": "with", + "value": "with", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + }, + { + "$id": "35", + "kind": "enumvalue", + "name": "yield", + "value": "yield", + "valueType": { + "$ref": "2" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + } + ], + "namespace": "SpecialWords.ExtensibleStrings", + "doc": "Verify enum member names that are special words using extensible enum (union).", + "isFixed": false, + "isFlags": false, + "usage": "Input,Output,Json", + "decorators": [] + } + ], + "constants": [ + { + "$id": "36", "kind": "constant", "name": "withAndContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "2", + "$id": "37", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -20,13 +471,13 @@ "decorators": [] }, { - "$id": "3", + "$id": "38", "kind": "constant", "name": "withAsContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "4", + "$id": "39", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -36,13 +487,13 @@ "decorators": [] }, { - "$id": "5", + "$id": "40", "kind": "constant", "name": "withAssertContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "6", + "$id": "41", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -52,13 +503,13 @@ "decorators": [] }, { - "$id": "7", + "$id": "42", "kind": "constant", "name": "withAsyncContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "8", + "$id": "43", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -68,13 +519,13 @@ "decorators": [] }, { - "$id": "9", + "$id": "44", "kind": "constant", "name": "withAwaitContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "10", + "$id": "45", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -84,13 +535,13 @@ "decorators": [] }, { - "$id": "11", + "$id": "46", "kind": "constant", "name": "withBreakContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "12", + "$id": "47", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -100,13 +551,13 @@ "decorators": [] }, { - "$id": "13", + "$id": "48", "kind": "constant", "name": "withClassContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "14", + "$id": "49", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -116,13 +567,13 @@ "decorators": [] }, { - "$id": "15", + "$id": "50", "kind": "constant", "name": "withConstructorContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "16", + "$id": "51", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -132,13 +583,13 @@ "decorators": [] }, { - "$id": "17", + "$id": "52", "kind": "constant", "name": "withContinueContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "18", + "$id": "53", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -148,13 +599,13 @@ "decorators": [] }, { - "$id": "19", + "$id": "54", "kind": "constant", "name": "withDefContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "20", + "$id": "55", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -164,13 +615,13 @@ "decorators": [] }, { - "$id": "21", + "$id": "56", "kind": "constant", "name": "withDelContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "22", + "$id": "57", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -180,13 +631,13 @@ "decorators": [] }, { - "$id": "23", + "$id": "58", "kind": "constant", "name": "withElifContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "24", + "$id": "59", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -196,13 +647,13 @@ "decorators": [] }, { - "$id": "25", + "$id": "60", "kind": "constant", "name": "withElseContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "26", + "$id": "61", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -212,13 +663,13 @@ "decorators": [] }, { - "$id": "27", + "$id": "62", "kind": "constant", "name": "withExceptContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "28", + "$id": "63", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -228,13 +679,13 @@ "decorators": [] }, { - "$id": "29", + "$id": "64", "kind": "constant", "name": "withExecContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "30", + "$id": "65", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -244,13 +695,13 @@ "decorators": [] }, { - "$id": "31", + "$id": "66", "kind": "constant", "name": "withFinallyContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "32", + "$id": "67", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -260,13 +711,13 @@ "decorators": [] }, { - "$id": "33", + "$id": "68", "kind": "constant", "name": "withForContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "34", + "$id": "69", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -276,13 +727,13 @@ "decorators": [] }, { - "$id": "35", + "$id": "70", "kind": "constant", "name": "withFromContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "36", + "$id": "71", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -292,13 +743,13 @@ "decorators": [] }, { - "$id": "37", + "$id": "72", "kind": "constant", "name": "withGlobalContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "38", + "$id": "73", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -308,13 +759,13 @@ "decorators": [] }, { - "$id": "39", + "$id": "74", "kind": "constant", "name": "withIfContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "40", + "$id": "75", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -324,13 +775,13 @@ "decorators": [] }, { - "$id": "41", + "$id": "76", "kind": "constant", "name": "withImportContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "42", + "$id": "77", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -340,13 +791,13 @@ "decorators": [] }, { - "$id": "43", + "$id": "78", "kind": "constant", "name": "withInContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "44", + "$id": "79", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -356,13 +807,13 @@ "decorators": [] }, { - "$id": "45", + "$id": "80", "kind": "constant", "name": "withIsContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "46", + "$id": "81", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -372,13 +823,13 @@ "decorators": [] }, { - "$id": "47", + "$id": "82", "kind": "constant", "name": "withLambdaContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "48", + "$id": "83", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -388,13 +839,13 @@ "decorators": [] }, { - "$id": "49", + "$id": "84", "kind": "constant", "name": "withNotContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "50", + "$id": "85", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -404,13 +855,13 @@ "decorators": [] }, { - "$id": "51", + "$id": "86", "kind": "constant", "name": "withOrContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "52", + "$id": "87", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -420,13 +871,13 @@ "decorators": [] }, { - "$id": "53", + "$id": "88", "kind": "constant", "name": "withPassContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "54", + "$id": "89", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -436,13 +887,13 @@ "decorators": [] }, { - "$id": "55", + "$id": "90", "kind": "constant", "name": "withRaiseContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "56", + "$id": "91", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -452,13 +903,13 @@ "decorators": [] }, { - "$id": "57", + "$id": "92", "kind": "constant", "name": "withReturnContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "58", + "$id": "93", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -468,13 +919,13 @@ "decorators": [] }, { - "$id": "59", + "$id": "94", "kind": "constant", "name": "withTryContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "60", + "$id": "95", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -484,13 +935,13 @@ "decorators": [] }, { - "$id": "61", + "$id": "96", "kind": "constant", "name": "withWhileContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "62", + "$id": "97", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -500,13 +951,13 @@ "decorators": [] }, { - "$id": "63", + "$id": "98", "kind": "constant", "name": "withWithContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "64", + "$id": "99", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -516,13 +967,13 @@ "decorators": [] }, { - "$id": "65", + "$id": "100", "kind": "constant", "name": "withYieldContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "66", + "$id": "101", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -532,13 +983,13 @@ "decorators": [] }, { - "$id": "67", + "$id": "102", "kind": "constant", "name": "sameAsModelContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "68", + "$id": "103", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -548,13 +999,93 @@ "decorators": [] }, { - "$id": "69", + "$id": "104", "kind": "constant", "name": "dictMethodsContentType", "namespace": "", "usage": "None", "valueType": { - "$id": "70", + "$id": "105", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "106", + "kind": "constant", + "name": "withListContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "107", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "108", + "kind": "constant", + "name": "PutExtensibleStringValueRequestContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "109", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "110", + "kind": "constant", + "name": "PutExtensibleStringValueRequestContentType1", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "111", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "112", + "kind": "constant", + "name": "putExtensibleStringValueContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "113", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "114", + "kind": "constant", + "name": "PutExtensibleStringValueRequestContentType2", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "115", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -566,7 +1097,7 @@ ], "models": [ { - "$id": "71", + "$id": "116", "kind": "model", "name": "and", "namespace": "SpecialWords.Models", @@ -580,12 +1111,12 @@ }, "properties": [ { - "$id": "72", + "$id": "117", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "73", + "$id": "118", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -607,7 +1138,7 @@ ] }, { - "$id": "74", + "$id": "119", "kind": "model", "name": "as", "namespace": "SpecialWords.Models", @@ -621,12 +1152,12 @@ }, "properties": [ { - "$id": "75", + "$id": "120", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "76", + "$id": "121", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -648,7 +1179,7 @@ ] }, { - "$id": "77", + "$id": "122", "kind": "model", "name": "assert", "namespace": "SpecialWords.Models", @@ -662,12 +1193,12 @@ }, "properties": [ { - "$id": "78", + "$id": "123", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "79", + "$id": "124", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -689,7 +1220,7 @@ ] }, { - "$id": "80", + "$id": "125", "kind": "model", "name": "async", "namespace": "SpecialWords.Models", @@ -703,12 +1234,12 @@ }, "properties": [ { - "$id": "81", + "$id": "126", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "82", + "$id": "127", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -730,7 +1261,7 @@ ] }, { - "$id": "83", + "$id": "128", "kind": "model", "name": "await", "namespace": "SpecialWords.Models", @@ -744,12 +1275,12 @@ }, "properties": [ { - "$id": "84", + "$id": "129", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "85", + "$id": "130", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -771,7 +1302,7 @@ ] }, { - "$id": "86", + "$id": "131", "kind": "model", "name": "break", "namespace": "SpecialWords.Models", @@ -785,12 +1316,12 @@ }, "properties": [ { - "$id": "87", + "$id": "132", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "88", + "$id": "133", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -812,7 +1343,7 @@ ] }, { - "$id": "89", + "$id": "134", "kind": "model", "name": "class", "namespace": "SpecialWords.Models", @@ -826,12 +1357,12 @@ }, "properties": [ { - "$id": "90", + "$id": "135", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "91", + "$id": "136", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -853,7 +1384,7 @@ ] }, { - "$id": "92", + "$id": "137", "kind": "model", "name": "constructor", "namespace": "SpecialWords.Models", @@ -867,12 +1398,12 @@ }, "properties": [ { - "$id": "93", + "$id": "138", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "94", + "$id": "139", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -894,7 +1425,7 @@ ] }, { - "$id": "95", + "$id": "140", "kind": "model", "name": "continue", "namespace": "SpecialWords.Models", @@ -908,12 +1439,12 @@ }, "properties": [ { - "$id": "96", + "$id": "141", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "97", + "$id": "142", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -935,7 +1466,7 @@ ] }, { - "$id": "98", + "$id": "143", "kind": "model", "name": "def", "namespace": "SpecialWords.Models", @@ -949,12 +1480,12 @@ }, "properties": [ { - "$id": "99", + "$id": "144", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "100", + "$id": "145", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -976,7 +1507,7 @@ ] }, { - "$id": "101", + "$id": "146", "kind": "model", "name": "del", "namespace": "SpecialWords.Models", @@ -990,12 +1521,12 @@ }, "properties": [ { - "$id": "102", + "$id": "147", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "103", + "$id": "148", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1017,7 +1548,7 @@ ] }, { - "$id": "104", + "$id": "149", "kind": "model", "name": "elif", "namespace": "SpecialWords.Models", @@ -1031,12 +1562,12 @@ }, "properties": [ { - "$id": "105", + "$id": "150", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "106", + "$id": "151", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1058,7 +1589,7 @@ ] }, { - "$id": "107", + "$id": "152", "kind": "model", "name": "else", "namespace": "SpecialWords.Models", @@ -1072,12 +1603,12 @@ }, "properties": [ { - "$id": "108", + "$id": "153", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "109", + "$id": "154", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1099,7 +1630,7 @@ ] }, { - "$id": "110", + "$id": "155", "kind": "model", "name": "except", "namespace": "SpecialWords.Models", @@ -1113,12 +1644,12 @@ }, "properties": [ { - "$id": "111", + "$id": "156", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "112", + "$id": "157", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1140,7 +1671,7 @@ ] }, { - "$id": "113", + "$id": "158", "kind": "model", "name": "exec", "namespace": "SpecialWords.Models", @@ -1154,12 +1685,12 @@ }, "properties": [ { - "$id": "114", + "$id": "159", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "115", + "$id": "160", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1181,7 +1712,7 @@ ] }, { - "$id": "116", + "$id": "161", "kind": "model", "name": "finally", "namespace": "SpecialWords.Models", @@ -1195,12 +1726,12 @@ }, "properties": [ { - "$id": "117", + "$id": "162", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "118", + "$id": "163", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1222,7 +1753,7 @@ ] }, { - "$id": "119", + "$id": "164", "kind": "model", "name": "for", "namespace": "SpecialWords.Models", @@ -1236,12 +1767,12 @@ }, "properties": [ { - "$id": "120", + "$id": "165", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "121", + "$id": "166", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1263,7 +1794,7 @@ ] }, { - "$id": "122", + "$id": "167", "kind": "model", "name": "from", "namespace": "SpecialWords.Models", @@ -1277,12 +1808,12 @@ }, "properties": [ { - "$id": "123", + "$id": "168", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "124", + "$id": "169", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1304,7 +1835,7 @@ ] }, { - "$id": "125", + "$id": "170", "kind": "model", "name": "global", "namespace": "SpecialWords.Models", @@ -1318,12 +1849,12 @@ }, "properties": [ { - "$id": "126", + "$id": "171", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "127", + "$id": "172", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1345,7 +1876,7 @@ ] }, { - "$id": "128", + "$id": "173", "kind": "model", "name": "if", "namespace": "SpecialWords.Models", @@ -1359,12 +1890,12 @@ }, "properties": [ { - "$id": "129", + "$id": "174", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "130", + "$id": "175", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1386,7 +1917,7 @@ ] }, { - "$id": "131", + "$id": "176", "kind": "model", "name": "import", "namespace": "SpecialWords.Models", @@ -1400,12 +1931,12 @@ }, "properties": [ { - "$id": "132", + "$id": "177", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "133", + "$id": "178", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1427,7 +1958,7 @@ ] }, { - "$id": "134", + "$id": "179", "kind": "model", "name": "in", "namespace": "SpecialWords.Models", @@ -1441,12 +1972,12 @@ }, "properties": [ { - "$id": "135", + "$id": "180", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "136", + "$id": "181", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1468,7 +1999,7 @@ ] }, { - "$id": "137", + "$id": "182", "kind": "model", "name": "is", "namespace": "SpecialWords.Models", @@ -1482,12 +2013,12 @@ }, "properties": [ { - "$id": "138", + "$id": "183", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "139", + "$id": "184", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1509,7 +2040,7 @@ ] }, { - "$id": "140", + "$id": "185", "kind": "model", "name": "lambda", "namespace": "SpecialWords.Models", @@ -1523,12 +2054,12 @@ }, "properties": [ { - "$id": "141", + "$id": "186", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "142", + "$id": "187", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1550,7 +2081,7 @@ ] }, { - "$id": "143", + "$id": "188", "kind": "model", "name": "not", "namespace": "SpecialWords.Models", @@ -1564,12 +2095,12 @@ }, "properties": [ { - "$id": "144", + "$id": "189", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "145", + "$id": "190", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1591,7 +2122,7 @@ ] }, { - "$id": "146", + "$id": "191", "kind": "model", "name": "or", "namespace": "SpecialWords.Models", @@ -1605,12 +2136,12 @@ }, "properties": [ { - "$id": "147", + "$id": "192", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "148", + "$id": "193", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1632,7 +2163,7 @@ ] }, { - "$id": "149", + "$id": "194", "kind": "model", "name": "pass", "namespace": "SpecialWords.Models", @@ -1646,12 +2177,12 @@ }, "properties": [ { - "$id": "150", + "$id": "195", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "151", + "$id": "196", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1673,7 +2204,7 @@ ] }, { - "$id": "152", + "$id": "197", "kind": "model", "name": "raise", "namespace": "SpecialWords.Models", @@ -1687,12 +2218,12 @@ }, "properties": [ { - "$id": "153", + "$id": "198", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "154", + "$id": "199", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1714,7 +2245,7 @@ ] }, { - "$id": "155", + "$id": "200", "kind": "model", "name": "return", "namespace": "SpecialWords.Models", @@ -1728,12 +2259,12 @@ }, "properties": [ { - "$id": "156", + "$id": "201", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "157", + "$id": "202", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1755,7 +2286,7 @@ ] }, { - "$id": "158", + "$id": "203", "kind": "model", "name": "try", "namespace": "SpecialWords.Models", @@ -1769,12 +2300,12 @@ }, "properties": [ { - "$id": "159", + "$id": "204", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "160", + "$id": "205", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1796,7 +2327,7 @@ ] }, { - "$id": "161", + "$id": "206", "kind": "model", "name": "while", "namespace": "SpecialWords.Models", @@ -1810,12 +2341,12 @@ }, "properties": [ { - "$id": "162", + "$id": "207", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "163", + "$id": "208", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1837,7 +2368,7 @@ ] }, { - "$id": "164", + "$id": "209", "kind": "model", "name": "with", "namespace": "SpecialWords.Models", @@ -1851,12 +2382,12 @@ }, "properties": [ { - "$id": "165", + "$id": "210", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "166", + "$id": "211", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1878,7 +2409,7 @@ ] }, { - "$id": "167", + "$id": "212", "kind": "model", "name": "yield", "namespace": "SpecialWords.Models", @@ -1892,12 +2423,12 @@ }, "properties": [ { - "$id": "168", + "$id": "213", "kind": "property", "name": "name", "serializedName": "name", "type": { - "$id": "169", + "$id": "214", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1919,7 +2450,7 @@ ] }, { - "$id": "170", + "$id": "215", "kind": "model", "name": "SameAsModel", "namespace": "SpecialWords.ModelProperties", @@ -1933,12 +2464,12 @@ }, "properties": [ { - "$id": "171", + "$id": "216", "kind": "property", "name": "SameAsModel", "serializedName": "SameAsModel", "type": { - "$id": "172", + "$id": "217", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1960,7 +2491,7 @@ ] }, { - "$id": "173", + "$id": "218", "kind": "model", "name": "DictMethods", "namespace": "SpecialWords.ModelProperties", @@ -1974,12 +2505,12 @@ }, "properties": [ { - "$id": "174", + "$id": "219", "kind": "property", "name": "keys", "serializedName": "keys", "type": { - "$id": "175", + "$id": "220", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1999,12 +2530,12 @@ "isHttpMetadata": false }, { - "$id": "176", + "$id": "221", "kind": "property", "name": "items", "serializedName": "items", "type": { - "$id": "177", + "$id": "222", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2024,12 +2555,12 @@ "isHttpMetadata": false }, { - "$id": "178", + "$id": "223", "kind": "property", "name": "values", "serializedName": "values", "type": { - "$id": "179", + "$id": "224", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2049,12 +2580,12 @@ "isHttpMetadata": false }, { - "$id": "180", + "$id": "225", "kind": "property", "name": "popitem", "serializedName": "popitem", "type": { - "$id": "181", + "$id": "226", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2074,12 +2605,12 @@ "isHttpMetadata": false }, { - "$id": "182", + "$id": "227", "kind": "property", "name": "clear", "serializedName": "clear", "type": { - "$id": "183", + "$id": "228", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2099,12 +2630,12 @@ "isHttpMetadata": false }, { - "$id": "184", + "$id": "229", "kind": "property", "name": "update", "serializedName": "update", "type": { - "$id": "185", + "$id": "230", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2124,12 +2655,12 @@ "isHttpMetadata": false }, { - "$id": "186", + "$id": "231", "kind": "property", "name": "setdefault", "serializedName": "setdefault", "type": { - "$id": "187", + "$id": "232", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2149,12 +2680,12 @@ "isHttpMetadata": false }, { - "$id": "188", + "$id": "233", "kind": "property", "name": "pop", "serializedName": "pop", "type": { - "$id": "189", + "$id": "234", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2174,12 +2705,12 @@ "isHttpMetadata": false }, { - "$id": "190", + "$id": "235", "kind": "property", "name": "get", "serializedName": "get", "type": { - "$id": "191", + "$id": "236", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2199,12 +2730,12 @@ "isHttpMetadata": false }, { - "$id": "192", + "$id": "237", "kind": "property", "name": "copy", "serializedName": "copy", "type": { - "$id": "193", + "$id": "238", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2224,25 +2755,66 @@ "isHttpMetadata": false } ] + }, + { + "$id": "239", + "kind": "model", + "name": "ModelWithList", + "namespace": "SpecialWords.ModelProperties", + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.ModelWithList", + "usage": "Input,Json", + "decorators": [], + "serializationOptions": { + "json": { + "name": "ModelWithList" + } + }, + "properties": [ + { + "$id": "240", + "kind": "property", + "name": "list", + "serializedName": "list", + "type": { + "$id": "241", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.ModelWithList.list", + "serializationOptions": { + "json": { + "name": "list" + } + }, + "isHttpMetadata": false + } + ] } ], "clients": [ { - "$id": "194", + "$id": "242", "kind": "client", "name": "SpecialWordsClient", "namespace": "SpecialWords", - "doc": "Scenarios to verify that reserved words can be used in service and generators will handle it appropriately.\n\nCurrent list of special words\n```txt\nand\nas\nassert\nasync\nawait\nbreak\nclass\nconstructor\ncontinue\ndef\ndel\nelif\nelse\nexcept\nexec\nfinally\nfor\nfrom\nglobal\nif\nimport\nin\nis\nlambda\nnot\nor\npass\nraise\nreturn\ntry\nwhile\nwith\nyield\n```", + "doc": "Scenarios to verify that reserved words can be used in service and generators will handle it appropriately.\n\nCurrent list of special words\n```txt\nand\nas\nassert\nasync\nawait\nbreak\nclass\nconstructor\ncontinue\ndef\ndel\nelif\nelse\nexcept\nexec\nfinally\nfor\nfrom\nglobal\nif\nimport\nin\nis\nlambda\nlist\nnot\nor\npass\nraise\nreturn\ntry\nwhile\nwith\nyield\n```", "methods": [], "parameters": [ { - "$id": "195", + "$id": "243", "kind": "endpoint", "name": "endpoint", "serializedName": "endpoint", "doc": "Service host", "type": { - "$id": "196", + "$id": "244", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -2253,7 +2825,7 @@ "isEndpoint": true, "defaultValue": { "type": { - "$id": "197", + "$id": "245", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string" @@ -2272,32 +2844,32 @@ "apiVersions": [], "children": [ { - "$id": "198", + "$id": "246", "kind": "client", "name": "Models", "namespace": "SpecialWords.Models", "doc": "Verify model names", "methods": [ { - "$id": "199", + "$id": "247", "kind": "basic", "name": "withAnd", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "200", + "$id": "248", "name": "withAnd", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "201", + "$id": "249", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "1" + "$ref": "36" }, "isApiVersion": false, "optional": false, @@ -2305,15 +2877,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withAnd.contentType" - }, - { - "$id": "202", + "crossLanguageDefinitionId": "SpecialWords.Models.withAnd.contentType", + "methodParameterSegments": [ + { + "$id": "250", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "36" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withAnd.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "251", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "71" + "$ref": "116" }, "isApiVersion": false, "contentTypes": [ @@ -2324,7 +2916,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withAnd.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withAnd.body", + "methodParameterSegments": [ + { + "$id": "252", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "116" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withAnd.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2351,39 +2962,10 @@ }, "parameters": [ { - "$id": "203", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "71" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withAnd.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "252" }, { - "$id": "204", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withAnd.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "250" } ], "response": {}, @@ -2393,25 +2975,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withAnd" }, { - "$id": "205", + "$id": "253", "kind": "basic", "name": "withAs", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "206", + "$id": "254", "name": "withAs", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "207", + "$id": "255", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "3" + "$ref": "38" }, "isApiVersion": false, "optional": false, @@ -2419,15 +3001,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withAs.contentType" - }, - { - "$id": "208", + "crossLanguageDefinitionId": "SpecialWords.Models.withAs.contentType", + "methodParameterSegments": [ + { + "$id": "256", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "38" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withAs.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "257", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "74" + "$ref": "119" }, "isApiVersion": false, "contentTypes": [ @@ -2438,7 +3040,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withAs.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withAs.body", + "methodParameterSegments": [ + { + "$id": "258", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "119" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withAs.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2465,39 +3086,10 @@ }, "parameters": [ { - "$id": "209", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "74" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withAs.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "258" }, { - "$id": "210", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withAs.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "256" } ], "response": {}, @@ -2507,25 +3099,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withAs" }, { - "$id": "211", + "$id": "259", "kind": "basic", "name": "withAssert", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "212", + "$id": "260", "name": "withAssert", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "213", + "$id": "261", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "5" + "$ref": "40" }, "isApiVersion": false, "optional": false, @@ -2533,15 +3125,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withAssert.contentType" - }, - { - "$id": "214", + "crossLanguageDefinitionId": "SpecialWords.Models.withAssert.contentType", + "methodParameterSegments": [ + { + "$id": "262", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "40" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withAssert.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "263", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "77" + "$ref": "122" }, "isApiVersion": false, "contentTypes": [ @@ -2552,7 +3164,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withAssert.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withAssert.body", + "methodParameterSegments": [ + { + "$id": "264", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "122" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withAssert.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2579,39 +3210,10 @@ }, "parameters": [ { - "$id": "215", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "77" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withAssert.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "264" }, { - "$id": "216", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withAssert.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "262" } ], "response": {}, @@ -2621,25 +3223,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withAssert" }, { - "$id": "217", + "$id": "265", "kind": "basic", "name": "withAsync", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "218", + "$id": "266", "name": "withAsync", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "219", + "$id": "267", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "7" + "$ref": "42" }, "isApiVersion": false, "optional": false, @@ -2647,15 +3249,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withAsync.contentType" - }, - { - "$id": "220", + "crossLanguageDefinitionId": "SpecialWords.Models.withAsync.contentType", + "methodParameterSegments": [ + { + "$id": "268", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "42" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withAsync.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "269", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "80" + "$ref": "125" }, "isApiVersion": false, "contentTypes": [ @@ -2666,7 +3288,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withAsync.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withAsync.body", + "methodParameterSegments": [ + { + "$id": "270", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "125" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withAsync.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2693,39 +3334,10 @@ }, "parameters": [ { - "$id": "221", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "80" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withAsync.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "270" }, { - "$id": "222", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withAsync.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "268" } ], "response": {}, @@ -2735,25 +3347,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withAsync" }, { - "$id": "223", + "$id": "271", "kind": "basic", "name": "withAwait", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "224", + "$id": "272", "name": "withAwait", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "225", + "$id": "273", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "9" + "$ref": "44" }, "isApiVersion": false, "optional": false, @@ -2761,15 +3373,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withAwait.contentType" - }, - { - "$id": "226", + "crossLanguageDefinitionId": "SpecialWords.Models.withAwait.contentType", + "methodParameterSegments": [ + { + "$id": "274", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "44" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withAwait.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "275", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "83" + "$ref": "128" }, "isApiVersion": false, "contentTypes": [ @@ -2780,7 +3412,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withAwait.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withAwait.body", + "methodParameterSegments": [ + { + "$id": "276", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "128" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withAwait.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2807,39 +3458,10 @@ }, "parameters": [ { - "$id": "227", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "83" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withAwait.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "276" }, { - "$id": "228", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withAwait.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "274" } ], "response": {}, @@ -2849,25 +3471,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withAwait" }, { - "$id": "229", + "$id": "277", "kind": "basic", "name": "withBreak", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "230", + "$id": "278", "name": "withBreak", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "231", + "$id": "279", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "11" + "$ref": "46" }, "isApiVersion": false, "optional": false, @@ -2875,15 +3497,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withBreak.contentType" - }, - { - "$id": "232", + "crossLanguageDefinitionId": "SpecialWords.Models.withBreak.contentType", + "methodParameterSegments": [ + { + "$id": "280", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "46" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withBreak.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "281", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "86" + "$ref": "131" }, "isApiVersion": false, "contentTypes": [ @@ -2894,7 +3536,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withBreak.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withBreak.body", + "methodParameterSegments": [ + { + "$id": "282", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "131" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withBreak.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2921,39 +3582,10 @@ }, "parameters": [ { - "$id": "233", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "86" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withBreak.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "282" }, { - "$id": "234", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withBreak.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "280" } ], "response": {}, @@ -2963,25 +3595,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withBreak" }, { - "$id": "235", + "$id": "283", "kind": "basic", "name": "withClass", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "236", + "$id": "284", "name": "withClass", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "237", + "$id": "285", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "13" + "$ref": "48" }, "isApiVersion": false, "optional": false, @@ -2989,15 +3621,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withClass.contentType" - }, - { - "$id": "238", + "crossLanguageDefinitionId": "SpecialWords.Models.withClass.contentType", + "methodParameterSegments": [ + { + "$id": "286", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "48" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withClass.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "287", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "89" + "$ref": "134" }, "isApiVersion": false, "contentTypes": [ @@ -3008,7 +3660,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withClass.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withClass.body", + "methodParameterSegments": [ + { + "$id": "288", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "134" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withClass.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3035,39 +3706,10 @@ }, "parameters": [ { - "$id": "239", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "89" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withClass.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "288" }, { - "$id": "240", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withClass.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "286" } ], "response": {}, @@ -3077,25 +3719,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withClass" }, { - "$id": "241", + "$id": "289", "kind": "basic", "name": "withConstructor", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "242", + "$id": "290", "name": "withConstructor", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "243", + "$id": "291", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "15" + "$ref": "50" }, "isApiVersion": false, "optional": false, @@ -3103,15 +3745,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withConstructor.contentType" - }, - { - "$id": "244", + "crossLanguageDefinitionId": "SpecialWords.Models.withConstructor.contentType", + "methodParameterSegments": [ + { + "$id": "292", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "50" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withConstructor.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "293", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "92" + "$ref": "137" }, "isApiVersion": false, "contentTypes": [ @@ -3122,7 +3784,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withConstructor.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withConstructor.body", + "methodParameterSegments": [ + { + "$id": "294", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "137" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withConstructor.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3149,39 +3830,10 @@ }, "parameters": [ { - "$id": "245", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "92" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withConstructor.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "294" }, { - "$id": "246", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withConstructor.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "292" } ], "response": {}, @@ -3191,25 +3843,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withConstructor" }, { - "$id": "247", + "$id": "295", "kind": "basic", "name": "withContinue", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "248", + "$id": "296", "name": "withContinue", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "249", + "$id": "297", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "17" + "$ref": "52" }, "isApiVersion": false, "optional": false, @@ -3217,15 +3869,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withContinue.contentType" - }, - { - "$id": "250", + "crossLanguageDefinitionId": "SpecialWords.Models.withContinue.contentType", + "methodParameterSegments": [ + { + "$id": "298", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "52" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withContinue.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "299", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "95" + "$ref": "140" }, "isApiVersion": false, "contentTypes": [ @@ -3236,7 +3908,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withContinue.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withContinue.body", + "methodParameterSegments": [ + { + "$id": "300", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "140" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withContinue.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3263,39 +3954,10 @@ }, "parameters": [ { - "$id": "251", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "95" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withContinue.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "300" }, { - "$id": "252", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "17" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withContinue.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "298" } ], "response": {}, @@ -3305,25 +3967,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withContinue" }, { - "$id": "253", + "$id": "301", "kind": "basic", "name": "withDef", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "254", + "$id": "302", "name": "withDef", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "255", + "$id": "303", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "19" + "$ref": "54" }, "isApiVersion": false, "optional": false, @@ -3331,15 +3993,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withDef.contentType" - }, - { - "$id": "256", + "crossLanguageDefinitionId": "SpecialWords.Models.withDef.contentType", + "methodParameterSegments": [ + { + "$id": "304", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "54" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withDef.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "305", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "98" + "$ref": "143" }, "isApiVersion": false, "contentTypes": [ @@ -3350,7 +4032,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withDef.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withDef.body", + "methodParameterSegments": [ + { + "$id": "306", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "143" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withDef.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3377,39 +4078,10 @@ }, "parameters": [ { - "$id": "257", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "98" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withDef.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "306" }, { - "$id": "258", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "19" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withDef.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "304" } ], "response": {}, @@ -3419,25 +4091,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withDef" }, { - "$id": "259", + "$id": "307", "kind": "basic", "name": "withDel", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "260", + "$id": "308", "name": "withDel", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "261", + "$id": "309", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "21" + "$ref": "56" }, "isApiVersion": false, "optional": false, @@ -3445,15 +4117,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withDel.contentType" - }, - { - "$id": "262", + "crossLanguageDefinitionId": "SpecialWords.Models.withDel.contentType", + "methodParameterSegments": [ + { + "$id": "310", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "56" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withDel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "311", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "101" + "$ref": "146" }, "isApiVersion": false, "contentTypes": [ @@ -3464,7 +4156,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withDel.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withDel.body", + "methodParameterSegments": [ + { + "$id": "312", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "146" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withDel.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3491,39 +4202,10 @@ }, "parameters": [ { - "$id": "263", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "101" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withDel.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "312" }, { - "$id": "264", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "21" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withDel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "310" } ], "response": {}, @@ -3533,25 +4215,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withDel" }, { - "$id": "265", + "$id": "313", "kind": "basic", "name": "withElif", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "266", + "$id": "314", "name": "withElif", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "267", + "$id": "315", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "23" + "$ref": "58" }, "isApiVersion": false, "optional": false, @@ -3559,15 +4241,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withElif.contentType" - }, - { - "$id": "268", + "crossLanguageDefinitionId": "SpecialWords.Models.withElif.contentType", + "methodParameterSegments": [ + { + "$id": "316", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "58" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withElif.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "317", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "104" + "$ref": "149" }, "isApiVersion": false, "contentTypes": [ @@ -3578,7 +4280,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withElif.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withElif.body", + "methodParameterSegments": [ + { + "$id": "318", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "149" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withElif.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3605,39 +4326,10 @@ }, "parameters": [ { - "$id": "269", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "104" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withElif.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "318" }, { - "$id": "270", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "23" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withElif.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "316" } ], "response": {}, @@ -3647,25 +4339,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withElif" }, { - "$id": "271", + "$id": "319", "kind": "basic", "name": "withElse", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "272", + "$id": "320", "name": "withElse", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "273", + "$id": "321", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "25" + "$ref": "60" }, "isApiVersion": false, "optional": false, @@ -3673,15 +4365,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withElse.contentType" - }, - { - "$id": "274", + "crossLanguageDefinitionId": "SpecialWords.Models.withElse.contentType", + "methodParameterSegments": [ + { + "$id": "322", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "60" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withElse.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "323", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "107" + "$ref": "152" }, "isApiVersion": false, "contentTypes": [ @@ -3692,7 +4404,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withElse.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withElse.body", + "methodParameterSegments": [ + { + "$id": "324", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "152" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withElse.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3719,39 +4450,10 @@ }, "parameters": [ { - "$id": "275", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "107" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withElse.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "324" }, { - "$id": "276", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "25" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withElse.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "322" } ], "response": {}, @@ -3761,25 +4463,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withElse" }, { - "$id": "277", + "$id": "325", "kind": "basic", "name": "withExcept", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "278", + "$id": "326", "name": "withExcept", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "279", + "$id": "327", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "27" + "$ref": "62" }, "isApiVersion": false, "optional": false, @@ -3787,15 +4489,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withExcept.contentType" - }, - { - "$id": "280", + "crossLanguageDefinitionId": "SpecialWords.Models.withExcept.contentType", + "methodParameterSegments": [ + { + "$id": "328", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "62" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withExcept.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "329", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "110" + "$ref": "155" }, "isApiVersion": false, "contentTypes": [ @@ -3806,7 +4528,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withExcept.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withExcept.body", + "methodParameterSegments": [ + { + "$id": "330", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "155" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withExcept.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3833,39 +4574,10 @@ }, "parameters": [ { - "$id": "281", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "110" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withExcept.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "330" }, { - "$id": "282", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "27" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withExcept.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "328" } ], "response": {}, @@ -3875,25 +4587,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withExcept" }, { - "$id": "283", + "$id": "331", "kind": "basic", "name": "withExec", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "284", + "$id": "332", "name": "withExec", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "285", + "$id": "333", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "29" + "$ref": "64" }, "isApiVersion": false, "optional": false, @@ -3901,15 +4613,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withExec.contentType" - }, - { - "$id": "286", + "crossLanguageDefinitionId": "SpecialWords.Models.withExec.contentType", + "methodParameterSegments": [ + { + "$id": "334", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "64" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withExec.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "335", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "113" + "$ref": "158" }, "isApiVersion": false, "contentTypes": [ @@ -3920,7 +4652,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withExec.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withExec.body", + "methodParameterSegments": [ + { + "$id": "336", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "158" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withExec.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3947,39 +4698,10 @@ }, "parameters": [ { - "$id": "287", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "113" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withExec.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "336" }, { - "$id": "288", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "29" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withExec.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "334" } ], "response": {}, @@ -3989,25 +4711,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withExec" }, { - "$id": "289", + "$id": "337", "kind": "basic", "name": "withFinally", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "290", + "$id": "338", "name": "withFinally", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "291", + "$id": "339", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "31" + "$ref": "66" }, "isApiVersion": false, "optional": false, @@ -4015,15 +4737,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withFinally.contentType" - }, - { - "$id": "292", + "crossLanguageDefinitionId": "SpecialWords.Models.withFinally.contentType", + "methodParameterSegments": [ + { + "$id": "340", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "66" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withFinally.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "341", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "116" + "$ref": "161" }, "isApiVersion": false, "contentTypes": [ @@ -4034,7 +4776,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withFinally.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withFinally.body", + "methodParameterSegments": [ + { + "$id": "342", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "161" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withFinally.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4061,39 +4822,10 @@ }, "parameters": [ { - "$id": "293", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "116" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withFinally.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "342" }, { - "$id": "294", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "31" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withFinally.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "340" } ], "response": {}, @@ -4103,25 +4835,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withFinally" }, { - "$id": "295", + "$id": "343", "kind": "basic", "name": "withFor", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "296", + "$id": "344", "name": "withFor", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "297", + "$id": "345", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "33" + "$ref": "68" }, "isApiVersion": false, "optional": false, @@ -4129,15 +4861,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withFor.contentType" - }, - { - "$id": "298", + "crossLanguageDefinitionId": "SpecialWords.Models.withFor.contentType", + "methodParameterSegments": [ + { + "$id": "346", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "68" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withFor.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "347", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "119" + "$ref": "164" }, "isApiVersion": false, "contentTypes": [ @@ -4148,7 +4900,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withFor.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withFor.body", + "methodParameterSegments": [ + { + "$id": "348", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "164" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withFor.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4175,39 +4946,10 @@ }, "parameters": [ { - "$id": "299", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "119" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withFor.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "348" }, { - "$id": "300", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "33" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withFor.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "346" } ], "response": {}, @@ -4217,25 +4959,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withFor" }, { - "$id": "301", + "$id": "349", "kind": "basic", "name": "withFrom", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "302", + "$id": "350", "name": "withFrom", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "303", + "$id": "351", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "35" + "$ref": "70" }, "isApiVersion": false, "optional": false, @@ -4243,15 +4985,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withFrom.contentType" - }, - { - "$id": "304", + "crossLanguageDefinitionId": "SpecialWords.Models.withFrom.contentType", + "methodParameterSegments": [ + { + "$id": "352", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "70" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withFrom.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "353", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "122" + "$ref": "167" }, "isApiVersion": false, "contentTypes": [ @@ -4262,7 +5024,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withFrom.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withFrom.body", + "methodParameterSegments": [ + { + "$id": "354", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "167" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withFrom.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4289,39 +5070,10 @@ }, "parameters": [ { - "$id": "305", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "122" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withFrom.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "354" }, { - "$id": "306", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "35" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withFrom.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "352" } ], "response": {}, @@ -4331,25 +5083,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withFrom" }, { - "$id": "307", + "$id": "355", "kind": "basic", "name": "withGlobal", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "308", + "$id": "356", "name": "withGlobal", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "309", + "$id": "357", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "37" + "$ref": "72" }, "isApiVersion": false, "optional": false, @@ -4357,15 +5109,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withGlobal.contentType" - }, - { - "$id": "310", + "crossLanguageDefinitionId": "SpecialWords.Models.withGlobal.contentType", + "methodParameterSegments": [ + { + "$id": "358", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "72" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withGlobal.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "359", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "125" + "$ref": "170" }, "isApiVersion": false, "contentTypes": [ @@ -4376,7 +5148,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withGlobal.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withGlobal.body", + "methodParameterSegments": [ + { + "$id": "360", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "170" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withGlobal.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4403,39 +5194,10 @@ }, "parameters": [ { - "$id": "311", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "125" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withGlobal.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "360" }, { - "$id": "312", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "37" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withGlobal.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "358" } ], "response": {}, @@ -4445,25 +5207,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withGlobal" }, { - "$id": "313", + "$id": "361", "kind": "basic", "name": "withIf", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "314", + "$id": "362", "name": "withIf", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "315", + "$id": "363", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "39" + "$ref": "74" }, "isApiVersion": false, "optional": false, @@ -4471,15 +5233,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withIf.contentType" - }, - { - "$id": "316", + "crossLanguageDefinitionId": "SpecialWords.Models.withIf.contentType", + "methodParameterSegments": [ + { + "$id": "364", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "74" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withIf.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "365", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "128" + "$ref": "173" }, "isApiVersion": false, "contentTypes": [ @@ -4490,7 +5272,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withIf.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withIf.body", + "methodParameterSegments": [ + { + "$id": "366", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "173" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withIf.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4517,39 +5318,10 @@ }, "parameters": [ { - "$id": "317", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "128" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withIf.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "366" }, { - "$id": "318", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "39" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withIf.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "364" } ], "response": {}, @@ -4559,25 +5331,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withIf" }, { - "$id": "319", + "$id": "367", "kind": "basic", "name": "withImport", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "320", + "$id": "368", "name": "withImport", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "321", + "$id": "369", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "41" + "$ref": "76" }, "isApiVersion": false, "optional": false, @@ -4585,15 +5357,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withImport.contentType" - }, - { - "$id": "322", + "crossLanguageDefinitionId": "SpecialWords.Models.withImport.contentType", + "methodParameterSegments": [ + { + "$id": "370", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "76" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withImport.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "371", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "131" + "$ref": "176" }, "isApiVersion": false, "contentTypes": [ @@ -4604,7 +5396,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withImport.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withImport.body", + "methodParameterSegments": [ + { + "$id": "372", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "176" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withImport.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4631,39 +5442,10 @@ }, "parameters": [ { - "$id": "323", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "131" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withImport.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "372" }, { - "$id": "324", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "41" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withImport.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "370" } ], "response": {}, @@ -4673,25 +5455,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withImport" }, { - "$id": "325", + "$id": "373", "kind": "basic", "name": "withIn", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "326", + "$id": "374", "name": "withIn", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "327", + "$id": "375", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "43" + "$ref": "78" }, "isApiVersion": false, "optional": false, @@ -4699,15 +5481,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withIn.contentType" - }, - { - "$id": "328", + "crossLanguageDefinitionId": "SpecialWords.Models.withIn.contentType", + "methodParameterSegments": [ + { + "$id": "376", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "78" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withIn.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "377", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "134" + "$ref": "179" }, "isApiVersion": false, "contentTypes": [ @@ -4718,7 +5520,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withIn.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withIn.body", + "methodParameterSegments": [ + { + "$id": "378", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "179" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withIn.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4745,39 +5566,10 @@ }, "parameters": [ { - "$id": "329", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "134" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withIn.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "378" }, { - "$id": "330", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "43" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withIn.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "376" } ], "response": {}, @@ -4787,25 +5579,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withIn" }, { - "$id": "331", + "$id": "379", "kind": "basic", "name": "withIs", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "332", + "$id": "380", "name": "withIs", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "333", + "$id": "381", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "45" + "$ref": "80" }, "isApiVersion": false, "optional": false, @@ -4813,15 +5605,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withIs.contentType" - }, - { - "$id": "334", + "crossLanguageDefinitionId": "SpecialWords.Models.withIs.contentType", + "methodParameterSegments": [ + { + "$id": "382", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "80" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withIs.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "383", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "137" + "$ref": "182" }, "isApiVersion": false, "contentTypes": [ @@ -4832,7 +5644,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withIs.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withIs.body", + "methodParameterSegments": [ + { + "$id": "384", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "182" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withIs.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4859,39 +5690,10 @@ }, "parameters": [ { - "$id": "335", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "137" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withIs.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "384" }, { - "$id": "336", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "45" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withIs.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "382" } ], "response": {}, @@ -4901,25 +5703,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withIs" }, { - "$id": "337", + "$id": "385", "kind": "basic", "name": "withLambda", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "338", + "$id": "386", "name": "withLambda", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "339", + "$id": "387", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "47" + "$ref": "82" }, "isApiVersion": false, "optional": false, @@ -4927,15 +5729,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withLambda.contentType" - }, - { - "$id": "340", + "crossLanguageDefinitionId": "SpecialWords.Models.withLambda.contentType", + "methodParameterSegments": [ + { + "$id": "388", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "82" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withLambda.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "389", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "140" + "$ref": "185" }, "isApiVersion": false, "contentTypes": [ @@ -4946,7 +5768,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withLambda.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withLambda.body", + "methodParameterSegments": [ + { + "$id": "390", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "185" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withLambda.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4973,39 +5814,10 @@ }, "parameters": [ { - "$id": "341", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "140" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withLambda.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "390" }, { - "$id": "342", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "47" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withLambda.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "388" } ], "response": {}, @@ -5015,25 +5827,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withLambda" }, { - "$id": "343", + "$id": "391", "kind": "basic", "name": "withNot", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "344", + "$id": "392", "name": "withNot", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "345", + "$id": "393", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "49" + "$ref": "84" }, "isApiVersion": false, "optional": false, @@ -5041,15 +5853,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withNot.contentType" - }, - { - "$id": "346", + "crossLanguageDefinitionId": "SpecialWords.Models.withNot.contentType", + "methodParameterSegments": [ + { + "$id": "394", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "84" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withNot.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "395", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "143" + "$ref": "188" }, "isApiVersion": false, "contentTypes": [ @@ -5060,7 +5892,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withNot.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withNot.body", + "methodParameterSegments": [ + { + "$id": "396", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "188" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withNot.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5087,39 +5938,10 @@ }, "parameters": [ { - "$id": "347", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "143" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withNot.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "396" }, { - "$id": "348", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "49" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withNot.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "394" } ], "response": {}, @@ -5129,25 +5951,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withNot" }, { - "$id": "349", + "$id": "397", "kind": "basic", "name": "withOr", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "350", + "$id": "398", "name": "withOr", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "351", + "$id": "399", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "51" + "$ref": "86" }, "isApiVersion": false, "optional": false, @@ -5155,15 +5977,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withOr.contentType" - }, - { - "$id": "352", + "crossLanguageDefinitionId": "SpecialWords.Models.withOr.contentType", + "methodParameterSegments": [ + { + "$id": "400", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "86" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withOr.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "401", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "146" + "$ref": "191" }, "isApiVersion": false, "contentTypes": [ @@ -5174,7 +6016,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withOr.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withOr.body", + "methodParameterSegments": [ + { + "$id": "402", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "191" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withOr.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5201,39 +6062,10 @@ }, "parameters": [ { - "$id": "353", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "146" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withOr.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "402" }, { - "$id": "354", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "51" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withOr.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "400" } ], "response": {}, @@ -5243,25 +6075,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withOr" }, { - "$id": "355", + "$id": "403", "kind": "basic", "name": "withPass", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "356", + "$id": "404", "name": "withPass", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "357", + "$id": "405", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "53" + "$ref": "88" }, "isApiVersion": false, "optional": false, @@ -5269,15 +6101,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withPass.contentType" - }, - { - "$id": "358", + "crossLanguageDefinitionId": "SpecialWords.Models.withPass.contentType", + "methodParameterSegments": [ + { + "$id": "406", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "88" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withPass.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "407", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "149" + "$ref": "194" }, "isApiVersion": false, "contentTypes": [ @@ -5288,7 +6140,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withPass.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withPass.body", + "methodParameterSegments": [ + { + "$id": "408", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "194" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withPass.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5315,39 +6186,10 @@ }, "parameters": [ { - "$id": "359", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "149" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withPass.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "408" }, { - "$id": "360", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "53" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withPass.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "406" } ], "response": {}, @@ -5357,25 +6199,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withPass" }, { - "$id": "361", + "$id": "409", "kind": "basic", "name": "withRaise", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "362", + "$id": "410", "name": "withRaise", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "363", + "$id": "411", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "55" + "$ref": "90" }, "isApiVersion": false, "optional": false, @@ -5383,15 +6225,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withRaise.contentType" - }, - { - "$id": "364", + "crossLanguageDefinitionId": "SpecialWords.Models.withRaise.contentType", + "methodParameterSegments": [ + { + "$id": "412", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "90" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withRaise.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "413", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "152" + "$ref": "197" }, "isApiVersion": false, "contentTypes": [ @@ -5402,7 +6264,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withRaise.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withRaise.body", + "methodParameterSegments": [ + { + "$id": "414", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "197" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withRaise.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5429,39 +6310,10 @@ }, "parameters": [ { - "$id": "365", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "152" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withRaise.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "414" }, { - "$id": "366", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "55" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withRaise.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "412" } ], "response": {}, @@ -5471,25 +6323,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withRaise" }, { - "$id": "367", + "$id": "415", "kind": "basic", "name": "withReturn", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "368", + "$id": "416", "name": "withReturn", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "369", + "$id": "417", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "57" + "$ref": "92" }, "isApiVersion": false, "optional": false, @@ -5497,15 +6349,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withReturn.contentType" - }, - { - "$id": "370", + "crossLanguageDefinitionId": "SpecialWords.Models.withReturn.contentType", + "methodParameterSegments": [ + { + "$id": "418", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "92" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withReturn.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "419", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "155" + "$ref": "200" }, "isApiVersion": false, "contentTypes": [ @@ -5516,7 +6388,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withReturn.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withReturn.body", + "methodParameterSegments": [ + { + "$id": "420", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "200" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withReturn.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5543,39 +6434,10 @@ }, "parameters": [ { - "$id": "371", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "155" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withReturn.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "420" }, { - "$id": "372", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "57" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withReturn.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "418" } ], "response": {}, @@ -5585,25 +6447,25 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withReturn" }, { - "$id": "373", + "$id": "421", "kind": "basic", "name": "withTry", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "374", + "$id": "422", "name": "withTry", "resourceName": "Models", "accessibility": "public", "parameters": [ { - "$id": "375", + "$id": "423", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "59" + "$ref": "94" }, "isApiVersion": false, "optional": false, @@ -5611,15 +6473,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withTry.contentType" - }, - { - "$id": "376", + "crossLanguageDefinitionId": "SpecialWords.Models.withTry.contentType", + "methodParameterSegments": [ + { + "$id": "424", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "94" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withTry.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "425", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "158" + "$ref": "203" }, "isApiVersion": false, "contentTypes": [ @@ -5630,7 +6512,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withTry.body" + "crossLanguageDefinitionId": "SpecialWords.Models.withTry.body", + "methodParameterSegments": [ + { + "$id": "426", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "203" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withTry.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5657,39 +6558,10 @@ }, "parameters": [ { - "$id": "377", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "158" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withTry.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "426" }, { - "$id": "378", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "59" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withTry.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "424" } ], "response": {}, @@ -5699,25 +6571,446 @@ "crossLanguageDefinitionId": "SpecialWords.Models.withTry" }, { - "$id": "379", + "$id": "427", + "kind": "basic", + "name": "withWhile", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "428", + "name": "withWhile", + "resourceName": "Models", + "accessibility": "public", + "parameters": [ + { + "$id": "429", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "96" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "SpecialWords.Models.withWhile.contentType", + "methodParameterSegments": [ + { + "$id": "430", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "96" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withWhile.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "431", + "kind": "body", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "206" + }, + "isApiVersion": false, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "SpecialWords.Models.withWhile.body", + "methodParameterSegments": [ + { + "$id": "432", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "206" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withWhile.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "POST", + "uri": "{endpoint}", + "path": "/special-words/models/while", + "requestMediaTypes": [ + "application/json" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "SpecialWords.Models.withWhile", + "decorators": [], + "namespace": "SpecialWords.Models" + }, + "parameters": [ + { + "$ref": "432" + }, + { + "$ref": "430" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "SpecialWords.Models.withWhile" + }, + { + "$id": "433", + "kind": "basic", + "name": "withWith", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "434", + "name": "withWith", + "resourceName": "Models", + "accessibility": "public", + "parameters": [ + { + "$id": "435", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "98" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "SpecialWords.Models.withWith.contentType", + "methodParameterSegments": [ + { + "$id": "436", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "98" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withWith.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "437", + "kind": "body", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "209" + }, + "isApiVersion": false, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "SpecialWords.Models.withWith.body", + "methodParameterSegments": [ + { + "$id": "438", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "209" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withWith.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "POST", + "uri": "{endpoint}", + "path": "/special-words/models/with", + "requestMediaTypes": [ + "application/json" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "SpecialWords.Models.withWith", + "decorators": [], + "namespace": "SpecialWords.Models" + }, + "parameters": [ + { + "$ref": "438" + }, + { + "$ref": "436" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "SpecialWords.Models.withWith" + }, + { + "$id": "439", + "kind": "basic", + "name": "withYield", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "440", + "name": "withYield", + "resourceName": "Models", + "accessibility": "public", + "parameters": [ + { + "$id": "441", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "100" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "SpecialWords.Models.withYield.contentType", + "methodParameterSegments": [ + { + "$id": "442", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "100" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.Models.withYield.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "443", + "kind": "body", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "212" + }, + "isApiVersion": false, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "SpecialWords.Models.withYield.body", + "methodParameterSegments": [ + { + "$id": "444", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "212" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Models.withYield.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "POST", + "uri": "{endpoint}", + "path": "/special-words/models/yield", + "requestMediaTypes": [ + "application/json" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "SpecialWords.Models.withYield", + "decorators": [], + "namespace": "SpecialWords.Models" + }, + "parameters": [ + { + "$ref": "444" + }, + { + "$ref": "442" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "SpecialWords.Models.withYield" + } + ], + "parameters": [ + { + "$id": "445", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "446", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "447", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "SpecialWords.Models.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "SpecialWords.Models", + "apiVersions": [], + "parent": { + "$ref": "242" + }, + "isMultiServiceClient": false + }, + { + "$id": "448", + "kind": "client", + "name": "ModelProperties", + "namespace": "SpecialWords.ModelProperties", + "doc": "Verify model names", + "methods": [ + { + "$id": "449", "kind": "basic", - "name": "withWhile", + "name": "sameAsModel", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "380", - "name": "withWhile", - "resourceName": "Models", + "$id": "450", + "name": "sameAsModel", + "resourceName": "ModelProperties", "accessibility": "public", "parameters": [ { - "$id": "381", + "$id": "451", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "61" + "$ref": "102" }, "isApiVersion": false, "optional": false, @@ -5725,15 +7018,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withWhile.contentType" - }, - { - "$id": "382", + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.sameAsModel.contentType", + "methodParameterSegments": [ + { + "$id": "452", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "102" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.sameAsModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "453", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "161" + "$ref": "215" }, "isApiVersion": false, "contentTypes": [ @@ -5744,7 +7057,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withWhile.body" + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.sameAsModel.body", + "methodParameterSegments": [ + { + "$id": "454", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "215" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.sameAsModel.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5758,80 +7090,51 @@ ], "httpMethod": "POST", "uri": "{endpoint}", - "path": "/special-words/models/while", + "path": "/special-words/model-properties/same-as-model", "requestMediaTypes": [ "application/json" ], "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SpecialWords.Models.withWhile", + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.sameAsModel", "decorators": [], - "namespace": "SpecialWords.Models" + "namespace": "SpecialWords.ModelProperties" }, "parameters": [ { - "$id": "383", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "161" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withWhile.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "454" }, { - "$id": "384", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "61" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withWhile.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "452" } ], "response": {}, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SpecialWords.Models.withWhile" + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.sameAsModel" }, { - "$id": "385", + "$id": "455", "kind": "basic", - "name": "withWith", + "name": "dictMethods", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "386", - "name": "withWith", - "resourceName": "Models", + "$id": "456", + "name": "dictMethods", + "resourceName": "ModelProperties", "accessibility": "public", "parameters": [ { - "$id": "387", + "$id": "457", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "63" + "$ref": "104" }, "isApiVersion": false, "optional": false, @@ -5839,15 +7142,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withWith.contentType" - }, - { - "$id": "388", + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.dictMethods.contentType", + "methodParameterSegments": [ + { + "$id": "458", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "104" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.dictMethods.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "459", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "164" + "$ref": "218" }, "isApiVersion": false, "contentTypes": [ @@ -5858,7 +7181,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withWith.body" + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.dictMethods.body", + "methodParameterSegments": [ + { + "$id": "460", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "218" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.dictMethods.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5872,80 +7214,51 @@ ], "httpMethod": "POST", "uri": "{endpoint}", - "path": "/special-words/models/with", + "path": "/special-words/model-properties/dict-methods", "requestMediaTypes": [ "application/json" ], "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SpecialWords.Models.withWith", + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.dictMethods", "decorators": [], - "namespace": "SpecialWords.Models" + "namespace": "SpecialWords.ModelProperties" }, "parameters": [ { - "$id": "389", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "164" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withWith.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "460" }, { - "$id": "390", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "63" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withWith.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "458" } ], "response": {}, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SpecialWords.Models.withWith" + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.dictMethods" }, { - "$id": "391", + "$id": "461", "kind": "basic", - "name": "withYield", + "name": "withList", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "392", - "name": "withYield", - "resourceName": "Models", + "$id": "462", + "name": "withList", + "resourceName": "ModelProperties", "accessibility": "public", "parameters": [ { - "$id": "393", + "$id": "463", "kind": "header", "name": "contentType", "serializedName": "Content-Type", "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "65" + "$ref": "106" }, "isApiVersion": false, "optional": false, @@ -5953,15 +7266,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models.withYield.contentType" - }, - { - "$id": "394", + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.withList.contentType", + "methodParameterSegments": [ + { + "$id": "464", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "106" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.withList.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "465", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "167" + "$ref": "239" }, "isApiVersion": false, "contentTypes": [ @@ -5972,7 +7305,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.withYield.body" + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.withList.body", + "methodParameterSegments": [ + { + "$id": "466", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "239" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.withList.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5986,70 +7338,41 @@ ], "httpMethod": "POST", "uri": "{endpoint}", - "path": "/special-words/models/yield", + "path": "/special-words/model-properties/list", "requestMediaTypes": [ "application/json" ], "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SpecialWords.Models.withYield", + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.withList", "decorators": [], - "namespace": "SpecialWords.Models" + "namespace": "SpecialWords.ModelProperties" }, "parameters": [ { - "$id": "395", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "167" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Models.withYield.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "466" }, { - "$id": "396", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "65" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.Models.withYield.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "464" } ], "response": {}, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SpecialWords.Models.withYield" + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.withList" } ], "parameters": [ { - "$id": "397", + "$id": "467", "kind": "endpoint", "name": "endpoint", "serializedName": "endpoint", "doc": "Service host", "type": { - "$id": "398", + "$id": "468", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -6060,7 +7383,7 @@ "isEndpoint": true, "defaultValue": { "type": { - "$id": "399", + "$id": "469", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string" @@ -6070,45 +7393,44 @@ "serverUrlTemplate": "{endpoint}", "skipUrlEncoding": false, "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.Models.endpoint" + "crossLanguageDefinitionId": "SpecialWords.ModelProperties.endpoint" } ], "initializedBy": 0, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.Models", + "crossLanguageDefinitionId": "SpecialWords.ModelProperties", "apiVersions": [], "parent": { - "$ref": "194" + "$ref": "242" }, "isMultiServiceClient": false }, { - "$id": "400", + "$id": "470", "kind": "client", - "name": "ModelProperties", - "namespace": "SpecialWords.ModelProperties", - "doc": "Verify model names", + "name": "ExtensibleStrings", + "namespace": "SpecialWords.ExtensibleStrings", + "doc": "Verify enum member names that are special words.", "methods": [ { - "$id": "401", + "$id": "471", "kind": "basic", - "name": "sameAsModel", + "name": "putExtensibleStringValue", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "402", - "name": "sameAsModel", - "resourceName": "ModelProperties", + "$id": "472", + "name": "putExtensibleStringValue", + "resourceName": "ExtensibleStrings", "accessibility": "public", "parameters": [ { - "$id": "403", + "$id": "473", "kind": "header", "name": "contentType", "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", "type": { - "$ref": "67" + "$ref": "108" }, "isApiVersion": false, "optional": false, @@ -6116,129 +7438,69 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.ModelProperties.sameAsModel.contentType" - }, - { - "$id": "404", - "kind": "body", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "170" - }, - "isApiVersion": false, - "contentTypes": [ - "application/json" - ], - "defaultContentType": "application/json", - "optional": false, - "scope": "Method", - "decorators": [], - "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.ModelProperties.sameAsModel.body" - } - ], - "responses": [ - { - "statusCodes": [ - 204 - ], - "headers": [], - "isErrorResponse": false - } - ], - "httpMethod": "POST", - "uri": "{endpoint}", - "path": "/special-words/model-properties/same-as-model", - "requestMediaTypes": [ - "application/json" - ], - "bufferResponse": true, - "generateProtocolMethod": true, - "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SpecialWords.ModelProperties.sameAsModel", - "decorators": [], - "namespace": "SpecialWords.ModelProperties" - }, - "parameters": [ - { - "$id": "405", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "170" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.ModelProperties.sameAsModel.body", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "406", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "67" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.ModelProperties.sameAsModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] - } - ], - "response": {}, - "isOverride": false, - "generateConvenient": true, - "generateProtocol": true, - "crossLanguageDefinitionId": "SpecialWords.ModelProperties.sameAsModel" - }, - { - "$id": "407", - "kind": "basic", - "name": "dictMethods", - "accessibility": "public", - "apiVersions": [], - "operation": { - "$id": "408", - "name": "dictMethods", - "resourceName": "ModelProperties", - "accessibility": "public", - "parameters": [ - { - "$id": "409", + "crossLanguageDefinitionId": "SpecialWords.ExtensibleStrings.putExtensibleStringValue.contentType", + "methodParameterSegments": [ + { + "$id": "474", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "108" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.ExtensibleStrings.putExtensibleStringValue.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "475", "kind": "header", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", + "name": "accept", + "serializedName": "Accept", "type": { - "$ref": "69" + "$ref": "112" }, "isApiVersion": false, "optional": false, - "isContentType": true, + "isContentType": false, "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.ModelProperties.dictMethods.contentType" - }, - { - "$id": "410", + "crossLanguageDefinitionId": "SpecialWords.ExtensibleStrings.putExtensibleStringValue.accept", + "methodParameterSegments": [ + { + "$id": "476", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "112" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "SpecialWords.ExtensibleStrings.putExtensibleStringValue.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "477", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "173" + "$ref": "1" }, "isApiVersion": false, "contentTypes": [ @@ -6249,84 +7511,95 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.ModelProperties.dictMethods.body" + "crossLanguageDefinitionId": "SpecialWords.ExtensibleStrings.putExtensibleStringValue.body", + "methodParameterSegments": [ + { + "$id": "478", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "1" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.ExtensibleStrings.putExtensibleStringValue.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ { "statusCodes": [ - 204 + 200 ], - "headers": [], - "isErrorResponse": false + "bodyType": { + "$ref": "1" + }, + "headers": [ + { + "name": "contentType", + "nameInResponse": "content-type", + "type": { + "$ref": "114" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] } ], - "httpMethod": "POST", + "httpMethod": "PUT", "uri": "{endpoint}", - "path": "/special-words/model-properties/dict-methods", + "path": "/special-words/extensible-strings/string", "requestMediaTypes": [ "application/json" ], "bufferResponse": true, "generateProtocolMethod": true, "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "SpecialWords.ModelProperties.dictMethods", + "crossLanguageDefinitionId": "SpecialWords.ExtensibleStrings.putExtensibleStringValue", "decorators": [], - "namespace": "SpecialWords.ModelProperties" + "namespace": "SpecialWords.ExtensibleStrings" }, "parameters": [ { - "$id": "411", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "173" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.ModelProperties.dictMethods.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "474" }, { - "$id": "412", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "69" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "SpecialWords.ModelProperties.dictMethods.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "478" + }, + { + "$ref": "476" } ], - "response": {}, + "response": { + "type": { + "$ref": "1" + } + }, "isOverride": false, "generateConvenient": true, "generateProtocol": true, - "crossLanguageDefinitionId": "SpecialWords.ModelProperties.dictMethods" + "crossLanguageDefinitionId": "SpecialWords.ExtensibleStrings.putExtensibleStringValue" } ], "parameters": [ { - "$id": "413", + "$id": "479", "kind": "endpoint", "name": "endpoint", "serializedName": "endpoint", "doc": "Service host", "type": { - "$id": "414", + "$id": "480", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -6337,7 +7610,7 @@ "isEndpoint": true, "defaultValue": { "type": { - "$id": "415", + "$id": "481", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string" @@ -6347,33 +7620,33 @@ "serverUrlTemplate": "{endpoint}", "skipUrlEncoding": false, "readOnly": false, - "crossLanguageDefinitionId": "SpecialWords.ModelProperties.endpoint" + "crossLanguageDefinitionId": "SpecialWords.ExtensibleStrings.endpoint" } ], "initializedBy": 0, "decorators": [], - "crossLanguageDefinitionId": "SpecialWords.ModelProperties", + "crossLanguageDefinitionId": "SpecialWords.ExtensibleStrings", "apiVersions": [], "parent": { - "$ref": "194" + "$ref": "242" }, "isMultiServiceClient": false }, { - "$id": "416", + "$id": "482", "kind": "client", "name": "Operations", "namespace": "SpecialWords", "doc": "Test reserved words as operation name.", "methods": [ { - "$id": "417", + "$id": "483", "kind": "basic", "name": "and", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "418", + "$id": "484", "name": "and", "resourceName": "Operations", "accessibility": "public", @@ -6405,13 +7678,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.and" }, { - "$id": "419", + "$id": "485", "kind": "basic", "name": "as", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "420", + "$id": "486", "name": "as", "resourceName": "Operations", "accessibility": "public", @@ -6443,13 +7716,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.as" }, { - "$id": "421", + "$id": "487", "kind": "basic", "name": "assert", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "422", + "$id": "488", "name": "assert", "resourceName": "Operations", "accessibility": "public", @@ -6481,13 +7754,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.assert" }, { - "$id": "423", + "$id": "489", "kind": "basic", "name": "async", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "424", + "$id": "490", "name": "async", "resourceName": "Operations", "accessibility": "public", @@ -6519,13 +7792,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.async" }, { - "$id": "425", + "$id": "491", "kind": "basic", "name": "await", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "426", + "$id": "492", "name": "await", "resourceName": "Operations", "accessibility": "public", @@ -6557,13 +7830,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.await" }, { - "$id": "427", + "$id": "493", "kind": "basic", "name": "break", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "428", + "$id": "494", "name": "break", "resourceName": "Operations", "accessibility": "public", @@ -6595,13 +7868,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.break" }, { - "$id": "429", + "$id": "495", "kind": "basic", "name": "class", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "430", + "$id": "496", "name": "class", "resourceName": "Operations", "accessibility": "public", @@ -6633,13 +7906,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.class" }, { - "$id": "431", + "$id": "497", "kind": "basic", "name": "constructor", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "432", + "$id": "498", "name": "constructor", "resourceName": "Operations", "accessibility": "public", @@ -6671,13 +7944,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.constructor" }, { - "$id": "433", + "$id": "499", "kind": "basic", "name": "continue", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "434", + "$id": "500", "name": "continue", "resourceName": "Operations", "accessibility": "public", @@ -6709,13 +7982,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.continue" }, { - "$id": "435", + "$id": "501", "kind": "basic", "name": "def", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "436", + "$id": "502", "name": "def", "resourceName": "Operations", "accessibility": "public", @@ -6747,13 +8020,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.def" }, { - "$id": "437", + "$id": "503", "kind": "basic", "name": "del", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "438", + "$id": "504", "name": "del", "resourceName": "Operations", "accessibility": "public", @@ -6785,13 +8058,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.del" }, { - "$id": "439", + "$id": "505", "kind": "basic", "name": "elif", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "440", + "$id": "506", "name": "elif", "resourceName": "Operations", "accessibility": "public", @@ -6823,13 +8096,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.elif" }, { - "$id": "441", + "$id": "507", "kind": "basic", "name": "else", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "442", + "$id": "508", "name": "else", "resourceName": "Operations", "accessibility": "public", @@ -6861,13 +8134,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.else" }, { - "$id": "443", + "$id": "509", "kind": "basic", "name": "except", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "444", + "$id": "510", "name": "except", "resourceName": "Operations", "accessibility": "public", @@ -6899,13 +8172,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.except" }, { - "$id": "445", + "$id": "511", "kind": "basic", "name": "exec", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "446", + "$id": "512", "name": "exec", "resourceName": "Operations", "accessibility": "public", @@ -6937,13 +8210,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.exec" }, { - "$id": "447", + "$id": "513", "kind": "basic", "name": "finally", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "448", + "$id": "514", "name": "finally", "resourceName": "Operations", "accessibility": "public", @@ -6975,13 +8248,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.finally" }, { - "$id": "449", + "$id": "515", "kind": "basic", "name": "for", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "450", + "$id": "516", "name": "for", "resourceName": "Operations", "accessibility": "public", @@ -7013,13 +8286,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.for" }, { - "$id": "451", + "$id": "517", "kind": "basic", "name": "from", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "452", + "$id": "518", "name": "from", "resourceName": "Operations", "accessibility": "public", @@ -7051,13 +8324,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.from" }, { - "$id": "453", + "$id": "519", "kind": "basic", "name": "global", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "454", + "$id": "520", "name": "global", "resourceName": "Operations", "accessibility": "public", @@ -7089,13 +8362,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.global" }, { - "$id": "455", + "$id": "521", "kind": "basic", "name": "if", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "456", + "$id": "522", "name": "if", "resourceName": "Operations", "accessibility": "public", @@ -7127,13 +8400,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.if" }, { - "$id": "457", + "$id": "523", "kind": "basic", "name": "import", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "458", + "$id": "524", "name": "import", "resourceName": "Operations", "accessibility": "public", @@ -7165,13 +8438,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.import" }, { - "$id": "459", + "$id": "525", "kind": "basic", "name": "in", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "460", + "$id": "526", "name": "in", "resourceName": "Operations", "accessibility": "public", @@ -7203,13 +8476,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.in" }, { - "$id": "461", + "$id": "527", "kind": "basic", "name": "is", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "462", + "$id": "528", "name": "is", "resourceName": "Operations", "accessibility": "public", @@ -7241,13 +8514,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.is" }, { - "$id": "463", + "$id": "529", "kind": "basic", "name": "lambda", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "464", + "$id": "530", "name": "lambda", "resourceName": "Operations", "accessibility": "public", @@ -7279,13 +8552,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.lambda" }, { - "$id": "465", + "$id": "531", "kind": "basic", "name": "not", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "466", + "$id": "532", "name": "not", "resourceName": "Operations", "accessibility": "public", @@ -7317,13 +8590,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.not" }, { - "$id": "467", + "$id": "533", "kind": "basic", "name": "or", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "468", + "$id": "534", "name": "or", "resourceName": "Operations", "accessibility": "public", @@ -7355,13 +8628,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.or" }, { - "$id": "469", + "$id": "535", "kind": "basic", "name": "pass", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "470", + "$id": "536", "name": "pass", "resourceName": "Operations", "accessibility": "public", @@ -7393,13 +8666,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.pass" }, { - "$id": "471", + "$id": "537", "kind": "basic", "name": "raise", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "472", + "$id": "538", "name": "raise", "resourceName": "Operations", "accessibility": "public", @@ -7431,13 +8704,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.raise" }, { - "$id": "473", + "$id": "539", "kind": "basic", "name": "return", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "474", + "$id": "540", "name": "return", "resourceName": "Operations", "accessibility": "public", @@ -7469,13 +8742,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.return" }, { - "$id": "475", + "$id": "541", "kind": "basic", "name": "try", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "476", + "$id": "542", "name": "try", "resourceName": "Operations", "accessibility": "public", @@ -7507,13 +8780,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.try" }, { - "$id": "477", + "$id": "543", "kind": "basic", "name": "while", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "478", + "$id": "544", "name": "while", "resourceName": "Operations", "accessibility": "public", @@ -7545,13 +8818,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.while" }, { - "$id": "479", + "$id": "545", "kind": "basic", "name": "with", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "480", + "$id": "546", "name": "with", "resourceName": "Operations", "accessibility": "public", @@ -7583,13 +8856,13 @@ "crossLanguageDefinitionId": "SpecialWords.Operations.with" }, { - "$id": "481", + "$id": "547", "kind": "basic", "name": "yield", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "482", + "$id": "548", "name": "yield", "resourceName": "Operations", "accessibility": "public", @@ -7623,13 +8896,13 @@ ], "parameters": [ { - "$id": "483", + "$id": "549", "kind": "endpoint", "name": "endpoint", "serializedName": "endpoint", "doc": "Service host", "type": { - "$id": "484", + "$id": "550", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -7640,7 +8913,7 @@ "isEndpoint": true, "defaultValue": { "type": { - "$id": "485", + "$id": "551", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string" @@ -7658,36 +8931,36 @@ "crossLanguageDefinitionId": "SpecialWords.Operations", "apiVersions": [], "parent": { - "$ref": "194" + "$ref": "242" }, "isMultiServiceClient": false }, { - "$id": "486", + "$id": "552", "kind": "client", "name": "Parameters", "namespace": "SpecialWords", "doc": "Verify reserved words as parameter name.", "methods": [ { - "$id": "487", + "$id": "553", "kind": "basic", "name": "withAnd", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "488", + "$id": "554", "name": "withAnd", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "489", + "$id": "555", "kind": "query", "name": "and", "serializedName": "and", "type": { - "$id": "490", + "$id": "556", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -7699,7 +8972,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withAnd.and", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "557", + "kind": "method", + "name": "and", + "serializedName": "and", + "type": { + "$id": "558", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withAnd.and", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7723,25 +9019,7 @@ }, "parameters": [ { - "$id": "491", - "kind": "method", - "name": "and", - "serializedName": "and", - "type": { - "$id": "492", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withAnd.and", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "557" } ], "response": {}, @@ -7751,24 +9029,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withAnd" }, { - "$id": "493", + "$id": "559", "kind": "basic", "name": "withAs", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "494", + "$id": "560", "name": "withAs", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "495", + "$id": "561", "kind": "query", "name": "as", "serializedName": "as", "type": { - "$id": "496", + "$id": "562", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -7780,7 +9058,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withAs.as", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "563", + "kind": "method", + "name": "as", + "serializedName": "as", + "type": { + "$id": "564", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withAs.as", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7804,25 +9105,7 @@ }, "parameters": [ { - "$id": "497", - "kind": "method", - "name": "as", - "serializedName": "as", - "type": { - "$id": "498", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withAs.as", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "563" } ], "response": {}, @@ -7832,24 +9115,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withAs" }, { - "$id": "499", + "$id": "565", "kind": "basic", "name": "withAssert", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "500", + "$id": "566", "name": "withAssert", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "501", + "$id": "567", "kind": "query", "name": "assert", "serializedName": "assert", "type": { - "$id": "502", + "$id": "568", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -7861,7 +9144,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withAssert.assert", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "569", + "kind": "method", + "name": "assert", + "serializedName": "assert", + "type": { + "$id": "570", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withAssert.assert", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7885,25 +9191,7 @@ }, "parameters": [ { - "$id": "503", - "kind": "method", - "name": "assert", - "serializedName": "assert", - "type": { - "$id": "504", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withAssert.assert", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "569" } ], "response": {}, @@ -7913,24 +9201,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withAssert" }, { - "$id": "505", + "$id": "571", "kind": "basic", "name": "withAsync", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "506", + "$id": "572", "name": "withAsync", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "507", + "$id": "573", "kind": "query", "name": "async", "serializedName": "async", "type": { - "$id": "508", + "$id": "574", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -7942,7 +9230,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withAsync.async", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "575", + "kind": "method", + "name": "async", + "serializedName": "async", + "type": { + "$id": "576", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withAsync.async", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7966,25 +9277,7 @@ }, "parameters": [ { - "$id": "509", - "kind": "method", - "name": "async", - "serializedName": "async", - "type": { - "$id": "510", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withAsync.async", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "575" } ], "response": {}, @@ -7994,24 +9287,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withAsync" }, { - "$id": "511", + "$id": "577", "kind": "basic", "name": "withAwait", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "512", + "$id": "578", "name": "withAwait", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "513", + "$id": "579", "kind": "query", "name": "await", "serializedName": "await", "type": { - "$id": "514", + "$id": "580", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -8023,7 +9316,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withAwait.await", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "581", + "kind": "method", + "name": "await", + "serializedName": "await", + "type": { + "$id": "582", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withAwait.await", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8047,25 +9363,7 @@ }, "parameters": [ { - "$id": "515", - "kind": "method", - "name": "await", - "serializedName": "await", - "type": { - "$id": "516", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withAwait.await", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "581" } ], "response": {}, @@ -8075,24 +9373,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withAwait" }, { - "$id": "517", + "$id": "583", "kind": "basic", "name": "withBreak", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "518", + "$id": "584", "name": "withBreak", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "519", + "$id": "585", "kind": "query", "name": "break", "serializedName": "break", "type": { - "$id": "520", + "$id": "586", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -8104,7 +9402,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withBreak.break", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "587", + "kind": "method", + "name": "break", + "serializedName": "break", + "type": { + "$id": "588", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withBreak.break", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8128,25 +9449,7 @@ }, "parameters": [ { - "$id": "521", - "kind": "method", - "name": "break", - "serializedName": "break", - "type": { - "$id": "522", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withBreak.break", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "587" } ], "response": {}, @@ -8156,24 +9459,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withBreak" }, { - "$id": "523", + "$id": "589", "kind": "basic", "name": "withClass", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "524", + "$id": "590", "name": "withClass", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "525", + "$id": "591", "kind": "query", "name": "class", "serializedName": "class", "type": { - "$id": "526", + "$id": "592", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -8185,7 +9488,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withClass.class", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "593", + "kind": "method", + "name": "class", + "serializedName": "class", + "type": { + "$id": "594", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withClass.class", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8209,25 +9535,7 @@ }, "parameters": [ { - "$id": "527", - "kind": "method", - "name": "class", - "serializedName": "class", - "type": { - "$id": "528", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withClass.class", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "593" } ], "response": {}, @@ -8237,24 +9545,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withClass" }, { - "$id": "529", + "$id": "595", "kind": "basic", "name": "withConstructor", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "530", + "$id": "596", "name": "withConstructor", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "531", + "$id": "597", "kind": "query", "name": "constructor", "serializedName": "constructor", "type": { - "$id": "532", + "$id": "598", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -8266,7 +9574,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withConstructor.constructor", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "599", + "kind": "method", + "name": "constructor", + "serializedName": "constructor", + "type": { + "$id": "600", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withConstructor.constructor", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8290,25 +9621,7 @@ }, "parameters": [ { - "$id": "533", - "kind": "method", - "name": "constructor", - "serializedName": "constructor", - "type": { - "$id": "534", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withConstructor.constructor", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "599" } ], "response": {}, @@ -8318,24 +9631,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withConstructor" }, { - "$id": "535", + "$id": "601", "kind": "basic", "name": "withContinue", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "536", + "$id": "602", "name": "withContinue", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "537", + "$id": "603", "kind": "query", "name": "continue", "serializedName": "continue", "type": { - "$id": "538", + "$id": "604", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -8347,7 +9660,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withContinue.continue", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "605", + "kind": "method", + "name": "continue", + "serializedName": "continue", + "type": { + "$id": "606", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withContinue.continue", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8371,25 +9707,7 @@ }, "parameters": [ { - "$id": "539", - "kind": "method", - "name": "continue", - "serializedName": "continue", - "type": { - "$id": "540", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withContinue.continue", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "605" } ], "response": {}, @@ -8399,24 +9717,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withContinue" }, { - "$id": "541", + "$id": "607", "kind": "basic", "name": "withDef", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "542", + "$id": "608", "name": "withDef", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "543", + "$id": "609", "kind": "query", "name": "def", "serializedName": "def", "type": { - "$id": "544", + "$id": "610", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -8428,7 +9746,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withDef.def", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "611", + "kind": "method", + "name": "def", + "serializedName": "def", + "type": { + "$id": "612", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withDef.def", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8452,25 +9793,7 @@ }, "parameters": [ { - "$id": "545", - "kind": "method", - "name": "def", - "serializedName": "def", - "type": { - "$id": "546", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withDef.def", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "611" } ], "response": {}, @@ -8480,24 +9803,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withDef" }, { - "$id": "547", + "$id": "613", "kind": "basic", "name": "withDel", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "548", + "$id": "614", "name": "withDel", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "549", + "$id": "615", "kind": "query", "name": "del", "serializedName": "del", "type": { - "$id": "550", + "$id": "616", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -8509,7 +9832,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withDel.del", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "617", + "kind": "method", + "name": "del", + "serializedName": "del", + "type": { + "$id": "618", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withDel.del", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8533,25 +9879,7 @@ }, "parameters": [ { - "$id": "551", - "kind": "method", - "name": "del", - "serializedName": "del", - "type": { - "$id": "552", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withDel.del", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "617" } ], "response": {}, @@ -8561,24 +9889,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withDel" }, { - "$id": "553", + "$id": "619", "kind": "basic", "name": "withElif", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "554", + "$id": "620", "name": "withElif", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "555", + "$id": "621", "kind": "query", "name": "elif", "serializedName": "elif", "type": { - "$id": "556", + "$id": "622", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -8590,7 +9918,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withElif.elif", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "623", + "kind": "method", + "name": "elif", + "serializedName": "elif", + "type": { + "$id": "624", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withElif.elif", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8614,25 +9965,7 @@ }, "parameters": [ { - "$id": "557", - "kind": "method", - "name": "elif", - "serializedName": "elif", - "type": { - "$id": "558", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withElif.elif", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "623" } ], "response": {}, @@ -8642,24 +9975,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withElif" }, { - "$id": "559", + "$id": "625", "kind": "basic", "name": "withElse", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "560", + "$id": "626", "name": "withElse", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "561", + "$id": "627", "kind": "query", "name": "else", "serializedName": "else", "type": { - "$id": "562", + "$id": "628", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -8671,7 +10004,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withElse.else", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "629", + "kind": "method", + "name": "else", + "serializedName": "else", + "type": { + "$id": "630", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withElse.else", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8695,25 +10051,7 @@ }, "parameters": [ { - "$id": "563", - "kind": "method", - "name": "else", - "serializedName": "else", - "type": { - "$id": "564", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withElse.else", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "629" } ], "response": {}, @@ -8723,24 +10061,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withElse" }, { - "$id": "565", + "$id": "631", "kind": "basic", "name": "withExcept", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "566", + "$id": "632", "name": "withExcept", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "567", + "$id": "633", "kind": "query", "name": "except", "serializedName": "except", "type": { - "$id": "568", + "$id": "634", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -8752,7 +10090,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withExcept.except", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "635", + "kind": "method", + "name": "except", + "serializedName": "except", + "type": { + "$id": "636", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withExcept.except", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8776,25 +10137,7 @@ }, "parameters": [ { - "$id": "569", - "kind": "method", - "name": "except", - "serializedName": "except", - "type": { - "$id": "570", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withExcept.except", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "635" } ], "response": {}, @@ -8804,24 +10147,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withExcept" }, { - "$id": "571", + "$id": "637", "kind": "basic", "name": "withExec", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "572", + "$id": "638", "name": "withExec", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "573", + "$id": "639", "kind": "query", "name": "exec", "serializedName": "exec", "type": { - "$id": "574", + "$id": "640", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -8833,7 +10176,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withExec.exec", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "641", + "kind": "method", + "name": "exec", + "serializedName": "exec", + "type": { + "$id": "642", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withExec.exec", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8857,25 +10223,7 @@ }, "parameters": [ { - "$id": "575", - "kind": "method", - "name": "exec", - "serializedName": "exec", - "type": { - "$id": "576", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withExec.exec", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "641" } ], "response": {}, @@ -8885,24 +10233,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withExec" }, { - "$id": "577", + "$id": "643", "kind": "basic", "name": "withFinally", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "578", + "$id": "644", "name": "withFinally", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "579", + "$id": "645", "kind": "query", "name": "finally", "serializedName": "finally", "type": { - "$id": "580", + "$id": "646", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -8914,7 +10262,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withFinally.finally", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "647", + "kind": "method", + "name": "finally", + "serializedName": "finally", + "type": { + "$id": "648", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withFinally.finally", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8938,25 +10309,7 @@ }, "parameters": [ { - "$id": "581", - "kind": "method", - "name": "finally", - "serializedName": "finally", - "type": { - "$id": "582", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withFinally.finally", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "647" } ], "response": {}, @@ -8966,24 +10319,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withFinally" }, { - "$id": "583", + "$id": "649", "kind": "basic", "name": "withFor", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "584", + "$id": "650", "name": "withFor", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "585", + "$id": "651", "kind": "query", "name": "for", "serializedName": "for", "type": { - "$id": "586", + "$id": "652", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -8995,7 +10348,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withFor.for", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "653", + "kind": "method", + "name": "for", + "serializedName": "for", + "type": { + "$id": "654", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withFor.for", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9019,25 +10395,7 @@ }, "parameters": [ { - "$id": "587", - "kind": "method", - "name": "for", - "serializedName": "for", - "type": { - "$id": "588", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withFor.for", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "653" } ], "response": {}, @@ -9047,24 +10405,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withFor" }, { - "$id": "589", + "$id": "655", "kind": "basic", "name": "withFrom", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "590", + "$id": "656", "name": "withFrom", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "591", + "$id": "657", "kind": "query", "name": "from", "serializedName": "from", "type": { - "$id": "592", + "$id": "658", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -9076,7 +10434,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withFrom.from", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "659", + "kind": "method", + "name": "from", + "serializedName": "from", + "type": { + "$id": "660", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withFrom.from", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9100,25 +10481,7 @@ }, "parameters": [ { - "$id": "593", - "kind": "method", - "name": "from", - "serializedName": "from", - "type": { - "$id": "594", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withFrom.from", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "659" } ], "response": {}, @@ -9128,24 +10491,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withFrom" }, { - "$id": "595", + "$id": "661", "kind": "basic", "name": "withGlobal", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "596", + "$id": "662", "name": "withGlobal", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "597", + "$id": "663", "kind": "query", "name": "global", "serializedName": "global", "type": { - "$id": "598", + "$id": "664", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -9157,7 +10520,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withGlobal.global", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "665", + "kind": "method", + "name": "global", + "serializedName": "global", + "type": { + "$id": "666", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withGlobal.global", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9181,25 +10567,7 @@ }, "parameters": [ { - "$id": "599", - "kind": "method", - "name": "global", - "serializedName": "global", - "type": { - "$id": "600", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withGlobal.global", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "665" } ], "response": {}, @@ -9209,24 +10577,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withGlobal" }, { - "$id": "601", + "$id": "667", "kind": "basic", "name": "withIf", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "602", + "$id": "668", "name": "withIf", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "603", + "$id": "669", "kind": "query", "name": "if", "serializedName": "if", "type": { - "$id": "604", + "$id": "670", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -9238,7 +10606,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withIf.if", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "671", + "kind": "method", + "name": "if", + "serializedName": "if", + "type": { + "$id": "672", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withIf.if", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9262,25 +10653,7 @@ }, "parameters": [ { - "$id": "605", - "kind": "method", - "name": "if", - "serializedName": "if", - "type": { - "$id": "606", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withIf.if", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "671" } ], "response": {}, @@ -9290,24 +10663,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withIf" }, { - "$id": "607", + "$id": "673", "kind": "basic", "name": "withImport", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "608", + "$id": "674", "name": "withImport", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "609", + "$id": "675", "kind": "query", "name": "import", "serializedName": "import", "type": { - "$id": "610", + "$id": "676", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -9319,7 +10692,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withImport.import", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "677", + "kind": "method", + "name": "import", + "serializedName": "import", + "type": { + "$id": "678", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withImport.import", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9343,25 +10739,7 @@ }, "parameters": [ { - "$id": "611", - "kind": "method", - "name": "import", - "serializedName": "import", - "type": { - "$id": "612", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withImport.import", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "677" } ], "response": {}, @@ -9371,24 +10749,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withImport" }, { - "$id": "613", + "$id": "679", "kind": "basic", "name": "withIn", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "614", + "$id": "680", "name": "withIn", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "615", + "$id": "681", "kind": "query", "name": "in", "serializedName": "in", "type": { - "$id": "616", + "$id": "682", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -9400,7 +10778,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withIn.in", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "683", + "kind": "method", + "name": "in", + "serializedName": "in", + "type": { + "$id": "684", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withIn.in", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9424,25 +10825,7 @@ }, "parameters": [ { - "$id": "617", - "kind": "method", - "name": "in", - "serializedName": "in", - "type": { - "$id": "618", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withIn.in", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "683" } ], "response": {}, @@ -9452,24 +10835,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withIn" }, { - "$id": "619", + "$id": "685", "kind": "basic", "name": "withIs", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "620", + "$id": "686", "name": "withIs", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "621", + "$id": "687", "kind": "query", "name": "is", "serializedName": "is", "type": { - "$id": "622", + "$id": "688", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -9481,7 +10864,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withIs.is", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "689", + "kind": "method", + "name": "is", + "serializedName": "is", + "type": { + "$id": "690", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withIs.is", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9505,25 +10911,7 @@ }, "parameters": [ { - "$id": "623", - "kind": "method", - "name": "is", - "serializedName": "is", - "type": { - "$id": "624", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withIs.is", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "689" } ], "response": {}, @@ -9533,24 +10921,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withIs" }, { - "$id": "625", + "$id": "691", "kind": "basic", "name": "withLambda", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "626", + "$id": "692", "name": "withLambda", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "627", + "$id": "693", "kind": "query", "name": "lambda", "serializedName": "lambda", "type": { - "$id": "628", + "$id": "694", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -9562,7 +10950,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withLambda.lambda", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "695", + "kind": "method", + "name": "lambda", + "serializedName": "lambda", + "type": { + "$id": "696", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withLambda.lambda", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9586,25 +10997,7 @@ }, "parameters": [ { - "$id": "629", - "kind": "method", - "name": "lambda", - "serializedName": "lambda", - "type": { - "$id": "630", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withLambda.lambda", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "695" } ], "response": {}, @@ -9614,24 +11007,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withLambda" }, { - "$id": "631", + "$id": "697", "kind": "basic", "name": "withNot", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "632", + "$id": "698", "name": "withNot", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "633", + "$id": "699", "kind": "query", "name": "not", "serializedName": "not", "type": { - "$id": "634", + "$id": "700", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -9643,7 +11036,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withNot.not", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "701", + "kind": "method", + "name": "not", + "serializedName": "not", + "type": { + "$id": "702", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withNot.not", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9667,25 +11083,7 @@ }, "parameters": [ { - "$id": "635", - "kind": "method", - "name": "not", - "serializedName": "not", - "type": { - "$id": "636", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withNot.not", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "701" } ], "response": {}, @@ -9695,24 +11093,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withNot" }, { - "$id": "637", + "$id": "703", "kind": "basic", "name": "withOr", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "638", + "$id": "704", "name": "withOr", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "639", + "$id": "705", "kind": "query", "name": "or", "serializedName": "or", "type": { - "$id": "640", + "$id": "706", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -9724,7 +11122,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withOr.or", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "707", + "kind": "method", + "name": "or", + "serializedName": "or", + "type": { + "$id": "708", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withOr.or", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9748,25 +11169,7 @@ }, "parameters": [ { - "$id": "641", - "kind": "method", - "name": "or", - "serializedName": "or", - "type": { - "$id": "642", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withOr.or", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "707" } ], "response": {}, @@ -9776,24 +11179,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withOr" }, { - "$id": "643", + "$id": "709", "kind": "basic", "name": "withPass", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "644", + "$id": "710", "name": "withPass", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "645", + "$id": "711", "kind": "query", "name": "pass", "serializedName": "pass", "type": { - "$id": "646", + "$id": "712", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -9805,7 +11208,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withPass.pass", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "713", + "kind": "method", + "name": "pass", + "serializedName": "pass", + "type": { + "$id": "714", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withPass.pass", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9829,25 +11255,7 @@ }, "parameters": [ { - "$id": "647", - "kind": "method", - "name": "pass", - "serializedName": "pass", - "type": { - "$id": "648", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withPass.pass", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "713" } ], "response": {}, @@ -9857,24 +11265,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withPass" }, { - "$id": "649", + "$id": "715", "kind": "basic", "name": "withRaise", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "650", + "$id": "716", "name": "withRaise", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "651", + "$id": "717", "kind": "query", "name": "raise", "serializedName": "raise", "type": { - "$id": "652", + "$id": "718", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -9886,7 +11294,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withRaise.raise", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "719", + "kind": "method", + "name": "raise", + "serializedName": "raise", + "type": { + "$id": "720", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withRaise.raise", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9910,25 +11341,7 @@ }, "parameters": [ { - "$id": "653", - "kind": "method", - "name": "raise", - "serializedName": "raise", - "type": { - "$id": "654", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withRaise.raise", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "719" } ], "response": {}, @@ -9938,24 +11351,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withRaise" }, { - "$id": "655", + "$id": "721", "kind": "basic", "name": "withReturn", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "656", + "$id": "722", "name": "withReturn", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "657", + "$id": "723", "kind": "query", "name": "return", "serializedName": "return", "type": { - "$id": "658", + "$id": "724", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -9967,7 +11380,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withReturn.return", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "725", + "kind": "method", + "name": "return", + "serializedName": "return", + "type": { + "$id": "726", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withReturn.return", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9991,25 +11427,7 @@ }, "parameters": [ { - "$id": "659", - "kind": "method", - "name": "return", - "serializedName": "return", - "type": { - "$id": "660", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withReturn.return", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "725" } ], "response": {}, @@ -10019,24 +11437,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withReturn" }, { - "$id": "661", + "$id": "727", "kind": "basic", "name": "withTry", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "662", + "$id": "728", "name": "withTry", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "663", + "$id": "729", "kind": "query", "name": "try", "serializedName": "try", "type": { - "$id": "664", + "$id": "730", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -10048,7 +11466,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withTry.try", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "731", + "kind": "method", + "name": "try", + "serializedName": "try", + "type": { + "$id": "732", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withTry.try", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -10072,25 +11513,7 @@ }, "parameters": [ { - "$id": "665", - "kind": "method", - "name": "try", - "serializedName": "try", - "type": { - "$id": "666", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withTry.try", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "731" } ], "response": {}, @@ -10100,24 +11523,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withTry" }, { - "$id": "667", + "$id": "733", "kind": "basic", "name": "withWhile", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "668", + "$id": "734", "name": "withWhile", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "669", + "$id": "735", "kind": "query", "name": "while", "serializedName": "while", "type": { - "$id": "670", + "$id": "736", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -10129,7 +11552,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withWhile.while", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "737", + "kind": "method", + "name": "while", + "serializedName": "while", + "type": { + "$id": "738", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withWhile.while", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -10153,25 +11599,7 @@ }, "parameters": [ { - "$id": "671", - "kind": "method", - "name": "while", - "serializedName": "while", - "type": { - "$id": "672", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withWhile.while", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "737" } ], "response": {}, @@ -10181,24 +11609,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withWhile" }, { - "$id": "673", + "$id": "739", "kind": "basic", "name": "withWith", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "674", + "$id": "740", "name": "withWith", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "675", + "$id": "741", "kind": "query", "name": "with", "serializedName": "with", "type": { - "$id": "676", + "$id": "742", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -10210,7 +11638,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withWith.with", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "743", + "kind": "method", + "name": "with", + "serializedName": "with", + "type": { + "$id": "744", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withWith.with", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -10234,25 +11685,7 @@ }, "parameters": [ { - "$id": "677", - "kind": "method", - "name": "with", - "serializedName": "with", - "type": { - "$id": "678", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withWith.with", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "743" } ], "response": {}, @@ -10262,24 +11695,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withWith" }, { - "$id": "679", + "$id": "745", "kind": "basic", "name": "withYield", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "680", + "$id": "746", "name": "withYield", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "681", + "$id": "747", "kind": "query", "name": "yield", "serializedName": "yield", "type": { - "$id": "682", + "$id": "748", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -10291,7 +11724,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withYield.yield", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "749", + "kind": "method", + "name": "yield", + "serializedName": "yield", + "type": { + "$id": "750", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withYield.yield", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -10315,25 +11771,7 @@ }, "parameters": [ { - "$id": "683", - "kind": "method", - "name": "yield", - "serializedName": "yield", - "type": { - "$id": "684", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withYield.yield", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "749" } ], "response": {}, @@ -10343,24 +11781,24 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters.withYield" }, { - "$id": "685", + "$id": "751", "kind": "basic", "name": "withCancellationToken", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "686", + "$id": "752", "name": "withCancellationToken", "resourceName": "Parameters", "accessibility": "public", "parameters": [ { - "$id": "687", + "$id": "753", "kind": "query", "name": "cancellationToken", "serializedName": "cancellationToken", "type": { - "$id": "688", + "$id": "754", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -10372,7 +11810,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "SpecialWords.Parameters.withCancellationToken.cancellationToken", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "755", + "kind": "method", + "name": "cancellationToken", + "serializedName": "cancellationToken", + "type": { + "$id": "756", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "SpecialWords.Parameters.withCancellationToken.cancellationToken", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -10396,25 +11857,7 @@ }, "parameters": [ { - "$id": "689", - "kind": "method", - "name": "cancellationToken", - "serializedName": "cancellationToken", - "type": { - "$id": "690", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "SpecialWords.Parameters.withCancellationToken.cancellationToken", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "755" } ], "response": {}, @@ -10426,13 +11869,13 @@ ], "parameters": [ { - "$id": "691", + "$id": "757", "kind": "endpoint", "name": "endpoint", "serializedName": "endpoint", "doc": "Service host", "type": { - "$id": "692", + "$id": "758", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -10443,7 +11886,7 @@ "isEndpoint": true, "defaultValue": { "type": { - "$id": "693", + "$id": "759", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string" @@ -10461,7 +11904,7 @@ "crossLanguageDefinitionId": "SpecialWords.Parameters", "apiVersions": [], "parent": { - "$ref": "194" + "$ref": "242" }, "isMultiServiceClient": false } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/Type.Array.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/Type.Array.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/Type.Array.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/Type.Array.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/Type.Array.sln deleted file mode 100644 index e4d804fecd2..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/Type.Array.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Array", "src\Type.Array.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/Type.Array.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/Type.Array.slnx new file mode 100644 index 00000000000..5204f8c2b08 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/Type.Array.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/ArrayClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/ArrayClient.cs index 515ecb8abaa..1597bfe32fb 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/ArrayClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/ArrayClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; namespace _Type._Array { @@ -11,7 +12,12 @@ public partial class ArrayClient { public ArrayClient() : this(new Uri("http://localhost:3000"), new ArrayClientOptions()) => throw null; - public ArrayClient(Uri endpoint, ArrayClientOptions options) => throw null; + internal ArrayClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, ArrayClientOptions options) => throw null; + + public ArrayClient(Uri endpoint, ArrayClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public ArrayClient(ArrayClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/ArrayClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/ArrayClientOptions.cs index 90179926109..dc7837266e1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/ArrayClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/ArrayClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace _Type._Array { public partial class ArrayClientOptions : ClientPipelineOptions { + public ArrayClientOptions() => throw null; + + [Experimental("SCME0002")] + internal ArrayClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/ArrayClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/ArrayClientSettings.cs new file mode 100644 index 00000000000..c315edcc62d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/ArrayClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace _Type._Array +{ + [Experimental("SCME0002")] + public partial class ArrayClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public ArrayClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/BooleanValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/BooleanValue.cs index 01b3af52309..d290fed4d03 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/BooleanValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/BooleanValue.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class BooleanValue { protected BooleanValue() => throw null; + internal BooleanValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/DatetimeValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/DatetimeValue.cs index 720dc85c07b..c7cd4718045 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/DatetimeValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/DatetimeValue.cs @@ -15,6 +15,8 @@ public partial class DatetimeValue { protected DatetimeValue() => throw null; + internal DatetimeValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/DurationValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/DurationValue.cs index 2b2696da40c..d41e7956ded 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/DurationValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/DurationValue.cs @@ -15,6 +15,8 @@ public partial class DurationValue { protected DurationValue() => throw null; + internal DurationValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Float32Value.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Float32Value.cs index 56b5ffb2f95..139091b980e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Float32Value.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Float32Value.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class Float32Value { protected Float32Value() => throw null; + internal Float32Value(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Int32Value.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Int32Value.cs index 7babbc0f8f9..b38525f6496 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Int32Value.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Int32Value.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class Int32Value { protected Int32Value() => throw null; + internal Int32Value(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Int64Value.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Int64Value.cs index ba6f600bae1..952fb96e4cc 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Int64Value.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Int64Value.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class Int64Value { protected Int64Value() => throw null; + internal Int64Value(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/ModelValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/ModelValue.cs index d842b2c8829..333dfabdcff 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/ModelValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/ModelValue.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class ModelValue { protected ModelValue() => throw null; + internal ModelValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Models/InnerModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Models/InnerModel.Serialization.cs index 98c068f1ebc..5892e2c8c5e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Models/InnerModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Models/InnerModel.Serialization.cs @@ -12,22 +12,22 @@ public partial class InnerModel : IJsonModel { internal InnerModel() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual InnerModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - InnerModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual InnerModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + InnerModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - InnerModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual InnerModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + InnerModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual InnerModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableBooleanValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableBooleanValue.cs index 21c9ed002fe..eb0177c832a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableBooleanValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableBooleanValue.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class NullableBooleanValue { protected NullableBooleanValue() => throw null; + internal NullableBooleanValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableFloatValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableFloatValue.cs index dcfe8553721..ab401bf7739 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableFloatValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableFloatValue.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class NullableFloatValue { protected NullableFloatValue() => throw null; + internal NullableFloatValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableInt32Value.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableInt32Value.cs index 6aae5a6a603..df168f64ea3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableInt32Value.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableInt32Value.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class NullableInt32Value { protected NullableInt32Value() => throw null; + internal NullableInt32Value(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableModelValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableModelValue.cs index bb14d5e8e9d..336d4186bd1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableModelValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableModelValue.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class NullableModelValue { protected NullableModelValue() => throw null; + internal NullableModelValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableStringValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableStringValue.cs index 490dd4aad6e..f22d0fb8493 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableStringValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/NullableStringValue.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class NullableStringValue { protected NullableStringValue() => throw null; + internal NullableStringValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/StringValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/StringValue.cs index 7d61138920c..e330fa6ffa4 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/StringValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/StringValue.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class StringValue { protected StringValue() => throw null; + internal StringValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/UnknownValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/UnknownValue.cs index 0fcbbd28461..a049ca8e8b3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/UnknownValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/UnknownValue.cs @@ -15,6 +15,8 @@ public partial class UnknownValue { protected UnknownValue() => throw null; + internal UnknownValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..daafccb5cfb --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "ArrayClient": { + "type": "object", + "description": "Configuration for ArrayClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/arrayClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "arrayClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Type.Array.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Type.Array.csproj index 93155a5610c..ac0d5102a0f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Type.Array.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Type.Array.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/tspCodeModel.json index af8ed45b7da..64ede2f251a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/tspCodeModel.json @@ -603,7 +603,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.Int32Value.get.accept" + "crossLanguageDefinitionId": "Type.Array.Int32Value.get.accept", + "methodParameterSegments": [ + { + "$id": "70", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.Int32Value.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -612,11 +631,11 @@ 200 ], "bodyType": { - "$id": "70", + "$id": "71", "kind": "array", "name": "Array", "valueType": { - "$id": "71", + "$id": "72", "kind": "int32", "name": "int32", "crossLanguageDefinitionId": "TypeSpec.int32", @@ -644,26 +663,12 @@ }, "parameters": [ { - "$id": "72", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.Int32Value.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "70" } ], "response": { "type": { - "$ref": "70" + "$ref": "71" } }, "isOverride": false, @@ -698,15 +703,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.Int32Value.put.contentType" + "crossLanguageDefinitionId": "Type.Array.Int32Value.put.contentType", + "methodParameterSegments": [ + { + "$id": "76", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "3" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.Int32Value.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "76", + "$id": "77", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "70" + "$ref": "71" }, "isApiVersion": false, "contentTypes": [ @@ -717,7 +742,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Array.Int32Value.put.body" + "crossLanguageDefinitionId": "Type.Array.Int32Value.put.body", + "methodParameterSegments": [ + { + "$id": "78", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "71" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Array.Int32Value.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -744,39 +788,10 @@ }, "parameters": [ { - "$id": "77", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "70" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Array.Int32Value.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "78" }, { - "$id": "78", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.Int32Value.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "76" } ], "response": {}, @@ -860,7 +875,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.Int64Value.get.accept" + "crossLanguageDefinitionId": "Type.Array.Int64Value.get.accept", + "methodParameterSegments": [ + { + "$id": "86", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.Int64Value.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -869,11 +903,11 @@ 200 ], "bodyType": { - "$id": "86", + "$id": "87", "kind": "array", "name": "Array1", "valueType": { - "$id": "87", + "$id": "88", "kind": "int64", "name": "int64", "crossLanguageDefinitionId": "TypeSpec.int64", @@ -901,26 +935,12 @@ }, "parameters": [ { - "$id": "88", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.Int64Value.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "86" } ], "response": { "type": { - "$ref": "86" + "$ref": "87" } }, "isOverride": false, @@ -955,15 +975,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.Int64Value.put.contentType" + "crossLanguageDefinitionId": "Type.Array.Int64Value.put.contentType", + "methodParameterSegments": [ + { + "$id": "92", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.Int64Value.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "92", + "$id": "93", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "86" + "$ref": "87" }, "isApiVersion": false, "contentTypes": [ @@ -974,7 +1014,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Array.Int64Value.put.body" + "crossLanguageDefinitionId": "Type.Array.Int64Value.put.body", + "methodParameterSegments": [ + { + "$id": "94", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "87" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Array.Int64Value.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1001,39 +1060,10 @@ }, "parameters": [ { - "$id": "93", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "86" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Array.Int64Value.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "94" }, { - "$id": "94", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.Int64Value.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "92" } ], "response": {}, @@ -1117,7 +1147,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.BooleanValue.get.accept" + "crossLanguageDefinitionId": "Type.Array.BooleanValue.get.accept", + "methodParameterSegments": [ + { + "$id": "102", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.BooleanValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1126,11 +1175,11 @@ 200 ], "bodyType": { - "$id": "102", + "$id": "103", "kind": "array", "name": "Array2", "valueType": { - "$id": "103", + "$id": "104", "kind": "boolean", "name": "boolean", "crossLanguageDefinitionId": "TypeSpec.boolean", @@ -1158,26 +1207,12 @@ }, "parameters": [ { - "$id": "104", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.BooleanValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "102" } ], "response": { "type": { - "$ref": "102" + "$ref": "103" } }, "isOverride": false, @@ -1212,15 +1247,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.BooleanValue.put.contentType" + "crossLanguageDefinitionId": "Type.Array.BooleanValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "108", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "11" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.BooleanValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "108", + "$id": "109", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "102" + "$ref": "103" }, "isApiVersion": false, "contentTypes": [ @@ -1231,7 +1286,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Array.BooleanValue.put.body" + "crossLanguageDefinitionId": "Type.Array.BooleanValue.put.body", + "methodParameterSegments": [ + { + "$id": "110", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "103" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Array.BooleanValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1258,39 +1332,10 @@ }, "parameters": [ { - "$id": "109", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "102" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Array.BooleanValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "110" }, { - "$id": "110", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.BooleanValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "108" } ], "response": {}, @@ -1374,7 +1419,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.StringValue.get.accept" + "crossLanguageDefinitionId": "Type.Array.StringValue.get.accept", + "methodParameterSegments": [ + { + "$id": "118", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "13" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.StringValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1383,11 +1447,11 @@ 200 ], "bodyType": { - "$id": "118", + "$id": "119", "kind": "array", "name": "Array3", "valueType": { - "$id": "119", + "$id": "120", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1415,26 +1479,12 @@ }, "parameters": [ { - "$id": "120", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.StringValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "118" } ], "response": { "type": { - "$ref": "118" + "$ref": "119" } }, "isOverride": false, @@ -1469,15 +1519,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.StringValue.put.contentType" + "crossLanguageDefinitionId": "Type.Array.StringValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "124", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "15" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.StringValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "124", + "$id": "125", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "118" + "$ref": "119" }, "isApiVersion": false, "contentTypes": [ @@ -1488,7 +1558,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Array.StringValue.put.body" + "crossLanguageDefinitionId": "Type.Array.StringValue.put.body", + "methodParameterSegments": [ + { + "$id": "126", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "119" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Array.StringValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1515,39 +1604,10 @@ }, "parameters": [ { - "$id": "125", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "118" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Array.StringValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "126" }, { - "$id": "126", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.StringValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "124" } ], "response": {}, @@ -1631,7 +1691,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.Float32Value.get.accept" + "crossLanguageDefinitionId": "Type.Array.Float32Value.get.accept", + "methodParameterSegments": [ + { + "$id": "134", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.Float32Value.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1640,11 +1719,11 @@ 200 ], "bodyType": { - "$id": "134", + "$id": "135", "kind": "array", "name": "Array4", "valueType": { - "$id": "135", + "$id": "136", "kind": "float32", "name": "float32", "crossLanguageDefinitionId": "TypeSpec.float32", @@ -1672,26 +1751,12 @@ }, "parameters": [ { - "$id": "136", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "17" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.Float32Value.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "134" } ], "response": { "type": { - "$ref": "134" + "$ref": "135" } }, "isOverride": false, @@ -1726,15 +1791,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.Float32Value.put.contentType" + "crossLanguageDefinitionId": "Type.Array.Float32Value.put.contentType", + "methodParameterSegments": [ + { + "$id": "140", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "19" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.Float32Value.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "140", + "$id": "141", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "134" + "$ref": "135" }, "isApiVersion": false, "contentTypes": [ @@ -1745,7 +1830,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Array.Float32Value.put.body" + "crossLanguageDefinitionId": "Type.Array.Float32Value.put.body", + "methodParameterSegments": [ + { + "$id": "142", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "135" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Array.Float32Value.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1772,39 +1876,10 @@ }, "parameters": [ { - "$id": "141", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "134" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Array.Float32Value.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "142" }, { - "$id": "142", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "19" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.Float32Value.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "140" } ], "response": {}, @@ -1888,7 +1963,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.DatetimeValue.get.accept" + "crossLanguageDefinitionId": "Type.Array.DatetimeValue.get.accept", + "methodParameterSegments": [ + { + "$id": "150", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "21" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.DatetimeValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1897,16 +1991,16 @@ 200 ], "bodyType": { - "$id": "150", + "$id": "151", "kind": "array", "name": "Array5", "valueType": { - "$id": "151", + "$id": "152", "kind": "utcDateTime", "name": "utcDateTime", "encode": "rfc3339", "wireType": { - "$id": "152", + "$id": "153", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1937,26 +2031,12 @@ }, "parameters": [ { - "$id": "153", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "21" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.DatetimeValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "150" } ], "response": { "type": { - "$ref": "150" + "$ref": "151" } }, "isOverride": false, @@ -1991,15 +2071,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.DatetimeValue.put.contentType" + "crossLanguageDefinitionId": "Type.Array.DatetimeValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "157", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "23" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.DatetimeValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "157", + "$id": "158", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "150" + "$ref": "151" }, "isApiVersion": false, "contentTypes": [ @@ -2010,7 +2110,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Array.DatetimeValue.put.body" + "crossLanguageDefinitionId": "Type.Array.DatetimeValue.put.body", + "methodParameterSegments": [ + { + "$id": "159", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "151" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Array.DatetimeValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2037,39 +2156,10 @@ }, "parameters": [ { - "$id": "158", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "150" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Array.DatetimeValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "159" }, { - "$id": "159", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "23" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.DatetimeValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "157" } ], "response": {}, @@ -2153,7 +2243,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.DurationValue.get.accept" + "crossLanguageDefinitionId": "Type.Array.DurationValue.get.accept", + "methodParameterSegments": [ + { + "$id": "167", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "25" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.DurationValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2162,16 +2271,16 @@ 200 ], "bodyType": { - "$id": "167", + "$id": "168", "kind": "array", "name": "Array6", "valueType": { - "$id": "168", + "$id": "169", "kind": "duration", "name": "duration", "encode": "ISO8601", "wireType": { - "$id": "169", + "$id": "170", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2202,26 +2311,12 @@ }, "parameters": [ { - "$id": "170", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "25" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.DurationValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "167" } ], "response": { "type": { - "$ref": "167" + "$ref": "168" } }, "isOverride": false, @@ -2256,15 +2351,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.DurationValue.put.contentType" + "crossLanguageDefinitionId": "Type.Array.DurationValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "174", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "27" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.DurationValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "174", + "$id": "175", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "167" + "$ref": "168" }, "isApiVersion": false, "contentTypes": [ @@ -2275,7 +2390,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Array.DurationValue.put.body" + "crossLanguageDefinitionId": "Type.Array.DurationValue.put.body", + "methodParameterSegments": [ + { + "$id": "176", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "168" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Array.DurationValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2302,39 +2436,10 @@ }, "parameters": [ { - "$id": "175", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "167" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Array.DurationValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "176" }, { - "$id": "176", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "27" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.DurationValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "174" } ], "response": {}, @@ -2418,7 +2523,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.UnknownValue.get.accept" + "crossLanguageDefinitionId": "Type.Array.UnknownValue.get.accept", + "methodParameterSegments": [ + { + "$id": "184", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "29" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.UnknownValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2427,11 +2551,11 @@ 200 ], "bodyType": { - "$id": "184", + "$id": "185", "kind": "array", "name": "Array7", "valueType": { - "$id": "185", + "$id": "186", "kind": "unknown", "name": "unknown", "crossLanguageDefinitionId": "", @@ -2459,26 +2583,12 @@ }, "parameters": [ { - "$id": "186", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "29" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.UnknownValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "184" } ], "response": { "type": { - "$ref": "184" + "$ref": "185" } }, "isOverride": false, @@ -2513,15 +2623,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.UnknownValue.put.contentType" + "crossLanguageDefinitionId": "Type.Array.UnknownValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "190", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "31" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.UnknownValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "190", + "$id": "191", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "184" + "$ref": "185" }, "isApiVersion": false, "contentTypes": [ @@ -2532,7 +2662,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Array.UnknownValue.put.body" + "crossLanguageDefinitionId": "Type.Array.UnknownValue.put.body", + "methodParameterSegments": [ + { + "$id": "192", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "185" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Array.UnknownValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2559,39 +2708,10 @@ }, "parameters": [ { - "$id": "191", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "184" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Array.UnknownValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "192" }, { - "$id": "192", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "31" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.UnknownValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "190" } ], "response": {}, @@ -2675,7 +2795,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.ModelValue.get.accept" + "crossLanguageDefinitionId": "Type.Array.ModelValue.get.accept", + "methodParameterSegments": [ + { + "$id": "200", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "33" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.ModelValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2705,21 +2844,7 @@ }, "parameters": [ { - "$id": "200", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "33" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.ModelValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "200" } ], "response": { @@ -2759,10 +2884,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.ModelValue.put.contentType" + "crossLanguageDefinitionId": "Type.Array.ModelValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "204", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "35" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.ModelValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "204", + "$id": "205", "kind": "body", "name": "body", "serializedName": "body", @@ -2778,7 +2923,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Array.ModelValue.put.body" + "crossLanguageDefinitionId": "Type.Array.ModelValue.put.body", + "methodParameterSegments": [ + { + "$id": "206", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "61" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Array.ModelValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2805,39 +2969,10 @@ }, "parameters": [ { - "$id": "205", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "61" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Array.ModelValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "206" }, { - "$id": "206", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "35" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.ModelValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "204" } ], "response": {}, @@ -2921,7 +3056,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.NullableFloatValue.get.accept" + "crossLanguageDefinitionId": "Type.Array.NullableFloatValue.get.accept", + "methodParameterSegments": [ + { + "$id": "214", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "37" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.NullableFloatValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2930,14 +3084,14 @@ 200 ], "bodyType": { - "$id": "214", + "$id": "215", "kind": "array", "name": "Array8", "valueType": { - "$id": "215", + "$id": "216", "kind": "nullable", "type": { - "$id": "216", + "$id": "217", "kind": "float32", "name": "float32", "crossLanguageDefinitionId": "TypeSpec.float32", @@ -2967,26 +3121,12 @@ }, "parameters": [ { - "$id": "217", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "37" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.NullableFloatValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "214" } ], "response": { "type": { - "$ref": "214" + "$ref": "215" } }, "isOverride": false, @@ -3021,15 +3161,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.NullableFloatValue.put.contentType" + "crossLanguageDefinitionId": "Type.Array.NullableFloatValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "221", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "39" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.NullableFloatValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "221", + "$id": "222", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "214" + "$ref": "215" }, "isApiVersion": false, "contentTypes": [ @@ -3040,7 +3200,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Array.NullableFloatValue.put.body" + "crossLanguageDefinitionId": "Type.Array.NullableFloatValue.put.body", + "methodParameterSegments": [ + { + "$id": "223", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "215" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Array.NullableFloatValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3067,39 +3246,10 @@ }, "parameters": [ { - "$id": "222", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "214" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Array.NullableFloatValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "223" }, { - "$id": "223", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "39" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.NullableFloatValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "221" } ], "response": {}, @@ -3183,7 +3333,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.NullableInt32Value.get.accept" + "crossLanguageDefinitionId": "Type.Array.NullableInt32Value.get.accept", + "methodParameterSegments": [ + { + "$id": "231", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "41" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.NullableInt32Value.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3192,14 +3361,14 @@ 200 ], "bodyType": { - "$id": "231", + "$id": "232", "kind": "array", "name": "Array9", "valueType": { - "$id": "232", + "$id": "233", "kind": "nullable", "type": { - "$id": "233", + "$id": "234", "kind": "int32", "name": "int32", "crossLanguageDefinitionId": "TypeSpec.int32", @@ -3229,26 +3398,12 @@ }, "parameters": [ { - "$id": "234", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "41" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.NullableInt32Value.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "231" } ], "response": { "type": { - "$ref": "231" + "$ref": "232" } }, "isOverride": false, @@ -3283,15 +3438,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.NullableInt32Value.put.contentType" + "crossLanguageDefinitionId": "Type.Array.NullableInt32Value.put.contentType", + "methodParameterSegments": [ + { + "$id": "238", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "43" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.NullableInt32Value.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "238", + "$id": "239", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "231" + "$ref": "232" }, "isApiVersion": false, "contentTypes": [ @@ -3302,7 +3477,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Array.NullableInt32Value.put.body" + "crossLanguageDefinitionId": "Type.Array.NullableInt32Value.put.body", + "methodParameterSegments": [ + { + "$id": "240", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "232" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Array.NullableInt32Value.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3329,39 +3523,10 @@ }, "parameters": [ { - "$id": "239", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "231" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Array.NullableInt32Value.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "240" }, { - "$id": "240", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "43" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.NullableInt32Value.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "238" } ], "response": {}, @@ -3445,7 +3610,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.NullableBooleanValue.get.accept" + "crossLanguageDefinitionId": "Type.Array.NullableBooleanValue.get.accept", + "methodParameterSegments": [ + { + "$id": "248", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "45" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.NullableBooleanValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3454,14 +3638,14 @@ 200 ], "bodyType": { - "$id": "248", + "$id": "249", "kind": "array", "name": "Array10", "valueType": { - "$id": "249", + "$id": "250", "kind": "nullable", "type": { - "$id": "250", + "$id": "251", "kind": "boolean", "name": "boolean", "crossLanguageDefinitionId": "TypeSpec.boolean", @@ -3491,26 +3675,12 @@ }, "parameters": [ { - "$id": "251", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "45" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.NullableBooleanValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "248" } ], "response": { "type": { - "$ref": "248" + "$ref": "249" } }, "isOverride": false, @@ -3545,15 +3715,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.NullableBooleanValue.put.contentType" + "crossLanguageDefinitionId": "Type.Array.NullableBooleanValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "255", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "47" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.NullableBooleanValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "255", + "$id": "256", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "248" + "$ref": "249" }, "isApiVersion": false, "contentTypes": [ @@ -3564,7 +3754,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Array.NullableBooleanValue.put.body" + "crossLanguageDefinitionId": "Type.Array.NullableBooleanValue.put.body", + "methodParameterSegments": [ + { + "$id": "257", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "249" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Array.NullableBooleanValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3591,39 +3800,10 @@ }, "parameters": [ { - "$id": "256", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "248" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Array.NullableBooleanValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "257" }, { - "$id": "257", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "47" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.NullableBooleanValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "255" } ], "response": {}, @@ -3707,7 +3887,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.NullableStringValue.get.accept" + "crossLanguageDefinitionId": "Type.Array.NullableStringValue.get.accept", + "methodParameterSegments": [ + { + "$id": "265", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "49" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.NullableStringValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3716,14 +3915,14 @@ 200 ], "bodyType": { - "$id": "265", + "$id": "266", "kind": "array", "name": "Array11", "valueType": { - "$id": "266", + "$id": "267", "kind": "nullable", "type": { - "$id": "267", + "$id": "268", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -3753,26 +3952,12 @@ }, "parameters": [ { - "$id": "268", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "49" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.NullableStringValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "265" } ], "response": { "type": { - "$ref": "265" + "$ref": "266" } }, "isOverride": false, @@ -3807,15 +3992,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.NullableStringValue.put.contentType" + "crossLanguageDefinitionId": "Type.Array.NullableStringValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "272", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "51" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.NullableStringValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "272", + "$id": "273", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "265" + "$ref": "266" }, "isApiVersion": false, "contentTypes": [ @@ -3826,7 +4031,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Array.NullableStringValue.put.body" + "crossLanguageDefinitionId": "Type.Array.NullableStringValue.put.body", + "methodParameterSegments": [ + { + "$id": "274", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "266" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Array.NullableStringValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3853,39 +4077,10 @@ }, "parameters": [ { - "$id": "273", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "265" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Array.NullableStringValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "274" }, { - "$id": "274", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "51" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.NullableStringValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "272" } ], "response": {}, @@ -3969,7 +4164,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.NullableModelValue.get.accept" + "crossLanguageDefinitionId": "Type.Array.NullableModelValue.get.accept", + "methodParameterSegments": [ + { + "$id": "282", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "53" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.NullableModelValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3978,11 +4192,11 @@ 200 ], "bodyType": { - "$id": "282", + "$id": "283", "kind": "array", "name": "Array12", "valueType": { - "$id": "283", + "$id": "284", "kind": "nullable", "type": { "$ref": "57" @@ -4011,26 +4225,12 @@ }, "parameters": [ { - "$id": "284", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "53" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.NullableModelValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "282" } ], "response": { "type": { - "$ref": "282" + "$ref": "283" } }, "isOverride": false, @@ -4065,15 +4265,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Array.NullableModelValue.put.contentType" + "crossLanguageDefinitionId": "Type.Array.NullableModelValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "288", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "55" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Array.NullableModelValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "288", + "$id": "289", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "282" + "$ref": "283" }, "isApiVersion": false, "contentTypes": [ @@ -4084,7 +4304,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Array.NullableModelValue.put.body" + "crossLanguageDefinitionId": "Type.Array.NullableModelValue.put.body", + "methodParameterSegments": [ + { + "$id": "290", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "283" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Array.NullableModelValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4111,39 +4350,10 @@ }, "parameters": [ { - "$id": "289", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "282" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Array.NullableModelValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "290" }, { - "$id": "290", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "55" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Array.NullableModelValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "288" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/Type.Dictionary.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/Type.Dictionary.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/Type.Dictionary.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/Type.Dictionary.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/Type.Dictionary.sln deleted file mode 100644 index 2dee9227e1a..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/Type.Dictionary.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Dictionary", "src\Type.Dictionary.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/Type.Dictionary.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/Type.Dictionary.slnx new file mode 100644 index 00000000000..f39cd73dad0 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/Type.Dictionary.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/BooleanValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/BooleanValue.cs index 8e54e093f42..f4727e78b82 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/BooleanValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/BooleanValue.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class BooleanValue { protected BooleanValue() => throw null; + internal BooleanValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DatetimeValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DatetimeValue.cs index 1063eabc942..03241999bc4 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DatetimeValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DatetimeValue.cs @@ -15,6 +15,8 @@ public partial class DatetimeValue { protected DatetimeValue() => throw null; + internal DatetimeValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DictionaryClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DictionaryClient.cs index ce6ad9364b3..54d7b564602 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DictionaryClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DictionaryClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; namespace _Type.Dictionary { @@ -11,7 +12,12 @@ public partial class DictionaryClient { public DictionaryClient() : this(new Uri("http://localhost:3000"), new DictionaryClientOptions()) => throw null; - public DictionaryClient(Uri endpoint, DictionaryClientOptions options) => throw null; + internal DictionaryClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, DictionaryClientOptions options) => throw null; + + public DictionaryClient(Uri endpoint, DictionaryClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public DictionaryClient(DictionaryClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DictionaryClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DictionaryClientOptions.cs index 7cb91a10843..ffc737d6134 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DictionaryClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DictionaryClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace _Type.Dictionary { public partial class DictionaryClientOptions : ClientPipelineOptions { + public DictionaryClientOptions() => throw null; + + [Experimental("SCME0002")] + internal DictionaryClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DictionaryClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DictionaryClientSettings.cs new file mode 100644 index 00000000000..2e51cfc2467 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DictionaryClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace _Type.Dictionary +{ + [Experimental("SCME0002")] + public partial class DictionaryClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public DictionaryClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DurationValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DurationValue.cs index 677f6e3c69f..025fb9260d0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DurationValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/DurationValue.cs @@ -15,6 +15,8 @@ public partial class DurationValue { protected DurationValue() => throw null; + internal DurationValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Float32Value.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Float32Value.cs index 89e188a1dfa..bb5152ac021 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Float32Value.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Float32Value.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class Float32Value { protected Float32Value() => throw null; + internal Float32Value(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Int32Value.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Int32Value.cs index 1746503b91b..943b687f046 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Int32Value.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Int32Value.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class Int32Value { protected Int32Value() => throw null; + internal Int32Value(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Int64Value.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Int64Value.cs index a86d59c62e2..7963141ea14 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Int64Value.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Int64Value.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class Int64Value { protected Int64Value() => throw null; + internal Int64Value(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/ModelValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/ModelValue.cs index becd3b219d2..58bd7395fb9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/ModelValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/ModelValue.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class ModelValue { protected ModelValue() => throw null; + internal ModelValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Models/InnerModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Models/InnerModel.Serialization.cs index 29ebdeedd57..1053979e308 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Models/InnerModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Models/InnerModel.Serialization.cs @@ -12,22 +12,22 @@ public partial class InnerModel : IJsonModel { internal InnerModel() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual InnerModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - InnerModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual InnerModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + InnerModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - InnerModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual InnerModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + InnerModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual InnerModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/NullableFloatValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/NullableFloatValue.cs index bf6a1626799..b1b16591b20 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/NullableFloatValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/NullableFloatValue.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class NullableFloatValue { protected NullableFloatValue() => throw null; + internal NullableFloatValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/RecursiveModelValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/RecursiveModelValue.cs index 83cced869b4..eb4eac17013 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/RecursiveModelValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/RecursiveModelValue.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class RecursiveModelValue { protected RecursiveModelValue() => throw null; + internal RecursiveModelValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/StringValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/StringValue.cs index 66b9650148f..7fe039c683c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/StringValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/StringValue.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class StringValue { protected StringValue() => throw null; + internal StringValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/UnknownValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/UnknownValue.cs index 4106f860d0b..f91e8911853 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/UnknownValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/UnknownValue.cs @@ -15,6 +15,8 @@ public partial class UnknownValue { protected UnknownValue() => throw null; + internal UnknownValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..62c0abb0cf9 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "DictionaryClient": { + "type": "object", + "description": "Configuration for DictionaryClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/dictionaryClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "dictionaryClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Type.Dictionary.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Type.Dictionary.csproj index 11bf42a6ee9..947968bf333 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Type.Dictionary.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Type.Dictionary.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/tspCodeModel.json index 84df9ea4255..14afff5a0b1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/tspCodeModel.json @@ -512,7 +512,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.Int32Value.get.accept" + "crossLanguageDefinitionId": "Type.Dictionary.Int32Value.get.accept", + "methodParameterSegments": [ + { + "$id": "59", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.Int32Value.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -521,17 +540,17 @@ 200 ], "bodyType": { - "$id": "59", + "$id": "60", "kind": "dict", "keyType": { - "$id": "60", + "$id": "61", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "valueType": { - "$id": "61", + "$id": "62", "kind": "int32", "name": "int32", "crossLanguageDefinitionId": "TypeSpec.int32", @@ -558,26 +577,12 @@ }, "parameters": [ { - "$id": "62", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.Int32Value.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "59" } ], "response": { "type": { - "$ref": "59" + "$ref": "60" } }, "isOverride": false, @@ -612,15 +617,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.Int32Value.put.contentType" + "crossLanguageDefinitionId": "Type.Dictionary.Int32Value.put.contentType", + "methodParameterSegments": [ + { + "$id": "66", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "3" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.Int32Value.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "66", + "$id": "67", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "59" + "$ref": "60" }, "isApiVersion": false, "contentTypes": [ @@ -631,7 +656,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Dictionary.Int32Value.put.body" + "crossLanguageDefinitionId": "Type.Dictionary.Int32Value.put.body", + "methodParameterSegments": [ + { + "$id": "68", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "60" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Dictionary.Int32Value.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -658,39 +702,10 @@ }, "parameters": [ { - "$id": "67", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "59" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Dictionary.Int32Value.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "68" }, { - "$id": "68", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.Int32Value.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "66" } ], "response": {}, @@ -774,7 +789,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.Int64Value.get.accept" + "crossLanguageDefinitionId": "Type.Dictionary.Int64Value.get.accept", + "methodParameterSegments": [ + { + "$id": "76", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.Int64Value.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -783,17 +817,17 @@ 200 ], "bodyType": { - "$id": "76", + "$id": "77", "kind": "dict", "keyType": { - "$id": "77", + "$id": "78", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "valueType": { - "$id": "78", + "$id": "79", "kind": "int64", "name": "int64", "crossLanguageDefinitionId": "TypeSpec.int64", @@ -820,26 +854,12 @@ }, "parameters": [ { - "$id": "79", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.Int64Value.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "76" } ], "response": { "type": { - "$ref": "76" + "$ref": "77" } }, "isOverride": false, @@ -874,15 +894,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.Int64Value.put.contentType" + "crossLanguageDefinitionId": "Type.Dictionary.Int64Value.put.contentType", + "methodParameterSegments": [ + { + "$id": "83", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.Int64Value.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "83", + "$id": "84", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "76" + "$ref": "77" }, "isApiVersion": false, "contentTypes": [ @@ -893,7 +933,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Dictionary.Int64Value.put.body" + "crossLanguageDefinitionId": "Type.Dictionary.Int64Value.put.body", + "methodParameterSegments": [ + { + "$id": "85", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "77" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Dictionary.Int64Value.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -920,39 +979,10 @@ }, "parameters": [ { - "$id": "84", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "76" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Dictionary.Int64Value.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "85" }, { - "$id": "85", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.Int64Value.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "83" } ], "response": {}, @@ -1036,7 +1066,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.BooleanValue.get.accept" + "crossLanguageDefinitionId": "Type.Dictionary.BooleanValue.get.accept", + "methodParameterSegments": [ + { + "$id": "93", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.BooleanValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1045,17 +1094,17 @@ 200 ], "bodyType": { - "$id": "93", + "$id": "94", "kind": "dict", "keyType": { - "$id": "94", + "$id": "95", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "valueType": { - "$id": "95", + "$id": "96", "kind": "boolean", "name": "boolean", "crossLanguageDefinitionId": "TypeSpec.boolean", @@ -1082,26 +1131,12 @@ }, "parameters": [ { - "$id": "96", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.BooleanValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "93" } ], "response": { "type": { - "$ref": "93" + "$ref": "94" } }, "isOverride": false, @@ -1136,15 +1171,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.BooleanValue.put.contentType" + "crossLanguageDefinitionId": "Type.Dictionary.BooleanValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "100", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "11" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.BooleanValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "100", + "$id": "101", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "93" + "$ref": "94" }, "isApiVersion": false, "contentTypes": [ @@ -1155,7 +1210,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Dictionary.BooleanValue.put.body" + "crossLanguageDefinitionId": "Type.Dictionary.BooleanValue.put.body", + "methodParameterSegments": [ + { + "$id": "102", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "94" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Dictionary.BooleanValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1182,39 +1256,10 @@ }, "parameters": [ { - "$id": "101", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "93" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Dictionary.BooleanValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "102" }, { - "$id": "102", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.BooleanValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "100" } ], "response": {}, @@ -1298,7 +1343,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.StringValue.get.accept" + "crossLanguageDefinitionId": "Type.Dictionary.StringValue.get.accept", + "methodParameterSegments": [ + { + "$id": "110", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "13" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.StringValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1307,17 +1371,17 @@ 200 ], "bodyType": { - "$id": "110", + "$id": "111", "kind": "dict", "keyType": { - "$id": "111", + "$id": "112", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "valueType": { - "$id": "112", + "$id": "113", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1344,26 +1408,12 @@ }, "parameters": [ { - "$id": "113", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.StringValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "110" } ], "response": { "type": { - "$ref": "110" + "$ref": "111" } }, "isOverride": false, @@ -1398,15 +1448,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.StringValue.put.contentType" + "crossLanguageDefinitionId": "Type.Dictionary.StringValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "117", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "15" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.StringValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "117", + "$id": "118", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "110" + "$ref": "111" }, "isApiVersion": false, "contentTypes": [ @@ -1417,7 +1487,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Dictionary.StringValue.put.body" + "crossLanguageDefinitionId": "Type.Dictionary.StringValue.put.body", + "methodParameterSegments": [ + { + "$id": "119", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "111" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Dictionary.StringValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1444,39 +1533,10 @@ }, "parameters": [ { - "$id": "118", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "110" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Dictionary.StringValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "119" }, { - "$id": "119", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.StringValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "117" } ], "response": {}, @@ -1560,7 +1620,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.Float32Value.get.accept" + "crossLanguageDefinitionId": "Type.Dictionary.Float32Value.get.accept", + "methodParameterSegments": [ + { + "$id": "127", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.Float32Value.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1569,17 +1648,17 @@ 200 ], "bodyType": { - "$id": "127", + "$id": "128", "kind": "dict", "keyType": { - "$id": "128", + "$id": "129", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "valueType": { - "$id": "129", + "$id": "130", "kind": "float32", "name": "float32", "crossLanguageDefinitionId": "TypeSpec.float32", @@ -1606,26 +1685,12 @@ }, "parameters": [ { - "$id": "130", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "17" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.Float32Value.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "127" } ], "response": { "type": { - "$ref": "127" + "$ref": "128" } }, "isOverride": false, @@ -1660,15 +1725,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.Float32Value.put.contentType" + "crossLanguageDefinitionId": "Type.Dictionary.Float32Value.put.contentType", + "methodParameterSegments": [ + { + "$id": "134", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "19" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.Float32Value.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "134", + "$id": "135", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "127" + "$ref": "128" }, "isApiVersion": false, "contentTypes": [ @@ -1679,7 +1764,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Dictionary.Float32Value.put.body" + "crossLanguageDefinitionId": "Type.Dictionary.Float32Value.put.body", + "methodParameterSegments": [ + { + "$id": "136", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "128" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Dictionary.Float32Value.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1706,39 +1810,10 @@ }, "parameters": [ { - "$id": "135", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "127" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Dictionary.Float32Value.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "136" }, { - "$id": "136", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "19" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.Float32Value.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "134" } ], "response": {}, @@ -1822,7 +1897,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.DatetimeValue.get.accept" + "crossLanguageDefinitionId": "Type.Dictionary.DatetimeValue.get.accept", + "methodParameterSegments": [ + { + "$id": "144", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "21" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.DatetimeValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1831,22 +1925,22 @@ 200 ], "bodyType": { - "$id": "144", + "$id": "145", "kind": "dict", "keyType": { - "$id": "145", + "$id": "146", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "valueType": { - "$id": "146", + "$id": "147", "kind": "utcDateTime", "name": "utcDateTime", "encode": "rfc3339", "wireType": { - "$id": "147", + "$id": "148", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -1876,26 +1970,12 @@ }, "parameters": [ { - "$id": "148", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "21" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.DatetimeValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "144" } ], "response": { "type": { - "$ref": "144" + "$ref": "145" } }, "isOverride": false, @@ -1930,15 +2010,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.DatetimeValue.put.contentType" + "crossLanguageDefinitionId": "Type.Dictionary.DatetimeValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "152", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "23" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.DatetimeValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "152", + "$id": "153", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "144" + "$ref": "145" }, "isApiVersion": false, "contentTypes": [ @@ -1949,7 +2049,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Dictionary.DatetimeValue.put.body" + "crossLanguageDefinitionId": "Type.Dictionary.DatetimeValue.put.body", + "methodParameterSegments": [ + { + "$id": "154", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "145" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Dictionary.DatetimeValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1976,39 +2095,10 @@ }, "parameters": [ { - "$id": "153", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "144" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Dictionary.DatetimeValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "154" }, { - "$id": "154", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "23" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.DatetimeValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "152" } ], "response": {}, @@ -2092,7 +2182,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.DurationValue.get.accept" + "crossLanguageDefinitionId": "Type.Dictionary.DurationValue.get.accept", + "methodParameterSegments": [ + { + "$id": "162", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "25" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.DurationValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2101,22 +2210,22 @@ 200 ], "bodyType": { - "$id": "162", + "$id": "163", "kind": "dict", "keyType": { - "$id": "163", + "$id": "164", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "valueType": { - "$id": "164", + "$id": "165", "kind": "duration", "name": "duration", "encode": "ISO8601", "wireType": { - "$id": "165", + "$id": "166", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -2146,26 +2255,12 @@ }, "parameters": [ { - "$id": "166", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "25" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.DurationValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "162" } ], "response": { "type": { - "$ref": "162" + "$ref": "163" } }, "isOverride": false, @@ -2200,15 +2295,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.DurationValue.put.contentType" + "crossLanguageDefinitionId": "Type.Dictionary.DurationValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "170", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "27" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.DurationValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "170", + "$id": "171", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "162" + "$ref": "163" }, "isApiVersion": false, "contentTypes": [ @@ -2219,7 +2334,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Dictionary.DurationValue.put.body" + "crossLanguageDefinitionId": "Type.Dictionary.DurationValue.put.body", + "methodParameterSegments": [ + { + "$id": "172", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "163" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Dictionary.DurationValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2246,39 +2380,10 @@ }, "parameters": [ { - "$id": "171", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "162" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Dictionary.DurationValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "172" }, { - "$id": "172", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "27" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.DurationValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "170" } ], "response": {}, @@ -2362,7 +2467,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.UnknownValue.get.accept" + "crossLanguageDefinitionId": "Type.Dictionary.UnknownValue.get.accept", + "methodParameterSegments": [ + { + "$id": "180", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "29" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.UnknownValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2371,17 +2495,17 @@ 200 ], "bodyType": { - "$id": "180", + "$id": "181", "kind": "dict", "keyType": { - "$id": "181", + "$id": "182", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "valueType": { - "$id": "182", + "$id": "183", "kind": "unknown", "name": "unknown", "crossLanguageDefinitionId": "", @@ -2408,26 +2532,12 @@ }, "parameters": [ { - "$id": "183", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "29" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.UnknownValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "180" } ], "response": { "type": { - "$ref": "180" + "$ref": "181" } }, "isOverride": false, @@ -2462,15 +2572,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.UnknownValue.put.contentType" + "crossLanguageDefinitionId": "Type.Dictionary.UnknownValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "187", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "31" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.UnknownValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "187", + "$id": "188", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "180" + "$ref": "181" }, "isApiVersion": false, "contentTypes": [ @@ -2481,7 +2611,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Dictionary.UnknownValue.put.body" + "crossLanguageDefinitionId": "Type.Dictionary.UnknownValue.put.body", + "methodParameterSegments": [ + { + "$id": "189", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "181" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Dictionary.UnknownValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2508,39 +2657,10 @@ }, "parameters": [ { - "$id": "188", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "180" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Dictionary.UnknownValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "189" }, { - "$id": "189", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "31" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.UnknownValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "187" } ], "response": {}, @@ -2624,7 +2744,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.ModelValue.get.accept" + "crossLanguageDefinitionId": "Type.Dictionary.ModelValue.get.accept", + "methodParameterSegments": [ + { + "$id": "197", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "33" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.ModelValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2654,21 +2793,7 @@ }, "parameters": [ { - "$id": "197", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "33" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.ModelValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "197" } ], "response": { @@ -2708,10 +2833,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.ModelValue.put.contentType" + "crossLanguageDefinitionId": "Type.Dictionary.ModelValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "201", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "35" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.ModelValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "201", + "$id": "202", "kind": "body", "name": "body", "serializedName": "body", @@ -2727,7 +2872,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Dictionary.ModelValue.put.body" + "crossLanguageDefinitionId": "Type.Dictionary.ModelValue.put.body", + "methodParameterSegments": [ + { + "$id": "203", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "49" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Dictionary.ModelValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2754,39 +2918,10 @@ }, "parameters": [ { - "$id": "202", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "49" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Dictionary.ModelValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "203" }, { - "$id": "203", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "35" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.ModelValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "201" } ], "response": {}, @@ -2870,7 +3005,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.RecursiveModelValue.get.accept" + "crossLanguageDefinitionId": "Type.Dictionary.RecursiveModelValue.get.accept", + "methodParameterSegments": [ + { + "$id": "211", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "37" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.RecursiveModelValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2900,21 +3054,7 @@ }, "parameters": [ { - "$id": "211", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "37" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.RecursiveModelValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "211" } ], "response": { @@ -2954,10 +3094,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.RecursiveModelValue.put.contentType" + "crossLanguageDefinitionId": "Type.Dictionary.RecursiveModelValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "215", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "39" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.RecursiveModelValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "215", + "$id": "216", "kind": "body", "name": "body", "serializedName": "body", @@ -2973,7 +3133,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Dictionary.RecursiveModelValue.put.body" + "crossLanguageDefinitionId": "Type.Dictionary.RecursiveModelValue.put.body", + "methodParameterSegments": [ + { + "$id": "217", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "49" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Dictionary.RecursiveModelValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3000,39 +3179,10 @@ }, "parameters": [ { - "$id": "216", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "49" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Dictionary.RecursiveModelValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "217" }, { - "$id": "217", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "39" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.RecursiveModelValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "215" } ], "response": {}, @@ -3116,7 +3266,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.NullableFloatValue.get.accept" + "crossLanguageDefinitionId": "Type.Dictionary.NullableFloatValue.get.accept", + "methodParameterSegments": [ + { + "$id": "225", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "41" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.NullableFloatValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3125,20 +3294,20 @@ 200 ], "bodyType": { - "$id": "225", + "$id": "226", "kind": "dict", "keyType": { - "$id": "226", + "$id": "227", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] }, "valueType": { - "$id": "227", + "$id": "228", "kind": "nullable", "type": { - "$id": "228", + "$id": "229", "kind": "float32", "name": "float32", "crossLanguageDefinitionId": "TypeSpec.float32", @@ -3167,26 +3336,12 @@ }, "parameters": [ { - "$id": "229", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "41" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.NullableFloatValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "225" } ], "response": { "type": { - "$ref": "225" + "$ref": "226" } }, "isOverride": false, @@ -3221,15 +3376,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Dictionary.NullableFloatValue.put.contentType" + "crossLanguageDefinitionId": "Type.Dictionary.NullableFloatValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "233", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "43" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Dictionary.NullableFloatValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "233", + "$id": "234", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$ref": "225" + "$ref": "226" }, "isApiVersion": false, "contentTypes": [ @@ -3240,7 +3415,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Dictionary.NullableFloatValue.put.body" + "crossLanguageDefinitionId": "Type.Dictionary.NullableFloatValue.put.body", + "methodParameterSegments": [ + { + "$id": "235", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "226" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Dictionary.NullableFloatValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3267,39 +3461,10 @@ }, "parameters": [ { - "$id": "234", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "225" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Dictionary.NullableFloatValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "235" }, { - "$id": "235", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "43" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Dictionary.NullableFloatValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "233" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/Type.Enum.Extensible.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/Type.Enum.Extensible.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/Type.Enum.Extensible.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/Type.Enum.Extensible.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/Type.Enum.Extensible.sln deleted file mode 100644 index d5cc5c282de..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/Type.Enum.Extensible.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Enum.Extensible", "src\Type.Enum.Extensible.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/Type.Enum.Extensible.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/Type.Enum.Extensible.slnx new file mode 100644 index 00000000000..8b20959efc7 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/Type.Enum.Extensible.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/ExtensibleClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/ExtensibleClient.cs index 2d82a8caeb9..25a7ff8aa60 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/ExtensibleClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/ExtensibleClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; namespace _Type._Enum.Extensible { @@ -11,7 +12,12 @@ public partial class ExtensibleClient { public ExtensibleClient() : this(new Uri("http://localhost:3000"), new ExtensibleClientOptions()) => throw null; - public ExtensibleClient(Uri endpoint, ExtensibleClientOptions options) => throw null; + internal ExtensibleClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, ExtensibleClientOptions options) => throw null; + + public ExtensibleClient(Uri endpoint, ExtensibleClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public ExtensibleClient(ExtensibleClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/ExtensibleClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/ExtensibleClientOptions.cs index 525ccf06c11..8abce3f7be1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/ExtensibleClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/ExtensibleClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace _Type._Enum.Extensible { public partial class ExtensibleClientOptions : ClientPipelineOptions { + public ExtensibleClientOptions() => throw null; + + [Experimental("SCME0002")] + internal ExtensibleClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/ExtensibleClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/ExtensibleClientSettings.cs new file mode 100644 index 00000000000..feadb885bf8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/ExtensibleClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace _Type._Enum.Extensible +{ + [Experimental("SCME0002")] + public partial class ExtensibleClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public ExtensibleClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/String.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/String.cs index c4aadc25dce..30632b37530 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/String.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/String.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class String { protected String() => throw null; + internal String(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetKnownValue(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..0fc3d20c2e0 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "ExtensibleClient": { + "type": "object", + "description": "Configuration for ExtensibleClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/extensibleClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "extensibleClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Type.Enum.Extensible.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Type.Enum.Extensible.csproj index 4d62e98e5aa..2d84f4c83eb 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Type.Enum.Extensible.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Type.Enum.Extensible.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/tspCodeModel.json index 5c38b68e159..a65fc452d37 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/tspCodeModel.json @@ -329,7 +329,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Enum.Extensible.String.getKnownValue.accept" + "crossLanguageDefinitionId": "Type.Enum.Extensible.String.getKnownValue.accept", + "methodParameterSegments": [ + { + "$id": "34", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "10" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Enum.Extensible.String.getKnownValue.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -367,21 +386,7 @@ }, "parameters": [ { - "$id": "34", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "10" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Enum.Extensible.String.getKnownValue.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "34" } ], "response": { @@ -420,7 +425,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Enum.Extensible.String.getUnknownValue.accept" + "crossLanguageDefinitionId": "Type.Enum.Extensible.String.getUnknownValue.accept", + "methodParameterSegments": [ + { + "$id": "38", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "14" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Enum.Extensible.String.getUnknownValue.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -458,21 +482,7 @@ }, "parameters": [ { - "$id": "38", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "14" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Enum.Extensible.String.getUnknownValue.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "38" } ], "response": { @@ -511,10 +521,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Enum.Extensible.String.putKnownValue.contentType" + "crossLanguageDefinitionId": "Type.Enum.Extensible.String.putKnownValue.contentType", + "methodParameterSegments": [ + { + "$id": "42", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "18" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Enum.Extensible.String.putKnownValue.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "42", + "$id": "43", "kind": "body", "name": "body", "serializedName": "body", @@ -530,7 +559,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Enum.Extensible.String.putKnownValue.body" + "crossLanguageDefinitionId": "Type.Enum.Extensible.String.putKnownValue.body", + "methodParameterSegments": [ + { + "$id": "44", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "1" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Enum.Extensible.String.putKnownValue.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -557,38 +605,10 @@ }, "parameters": [ { - "$id": "43", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "20" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Enum.Extensible.String.putKnownValue.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "42" }, { - "$id": "44", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "1" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Enum.Extensible.String.putKnownValue.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "44" } ], "response": {}, @@ -623,10 +643,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Enum.Extensible.String.putUnknownValue.contentType" + "crossLanguageDefinitionId": "Type.Enum.Extensible.String.putUnknownValue.contentType", + "methodParameterSegments": [ + { + "$id": "48", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "22" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Enum.Extensible.String.putUnknownValue.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "48", + "$id": "49", "kind": "body", "name": "body", "serializedName": "body", @@ -642,7 +681,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Enum.Extensible.String.putUnknownValue.body" + "crossLanguageDefinitionId": "Type.Enum.Extensible.String.putUnknownValue.body", + "methodParameterSegments": [ + { + "$id": "50", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "1" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Enum.Extensible.String.putUnknownValue.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -669,38 +727,10 @@ }, "parameters": [ { - "$id": "49", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "24" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Enum.Extensible.String.putUnknownValue.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "48" }, { - "$id": "50", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "1" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Enum.Extensible.String.putUnknownValue.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "50" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/Type.Enum.Fixed.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/Type.Enum.Fixed.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/Type.Enum.Fixed.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/Type.Enum.Fixed.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/Type.Enum.Fixed.sln deleted file mode 100644 index 90d62f1d16c..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/Type.Enum.Fixed.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Enum.Fixed", "src\Type.Enum.Fixed.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/Type.Enum.Fixed.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/Type.Enum.Fixed.slnx new file mode 100644 index 00000000000..94afc01e8e8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/Type.Enum.Fixed.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/FixedClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/FixedClient.cs index 3c72b867393..b111aa81947 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/FixedClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/FixedClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; namespace _Type._Enum.Fixed { @@ -11,7 +12,12 @@ public partial class FixedClient { public FixedClient() : this(new Uri("http://localhost:3000"), new FixedClientOptions()) => throw null; - public FixedClient(Uri endpoint, FixedClientOptions options) => throw null; + internal FixedClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, FixedClientOptions options) => throw null; + + public FixedClient(Uri endpoint, FixedClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public FixedClient(FixedClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/FixedClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/FixedClientOptions.cs index b3e1ebf26c3..5aa2c9da80c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/FixedClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/FixedClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace _Type._Enum.Fixed { public partial class FixedClientOptions : ClientPipelineOptions { + public FixedClientOptions() => throw null; + + [Experimental("SCME0002")] + internal FixedClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/FixedClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/FixedClientSettings.cs new file mode 100644 index 00000000000..4e365e6f6c5 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/FixedClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace _Type._Enum.Fixed +{ + [Experimental("SCME0002")] + public partial class FixedClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public FixedClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/String.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/String.cs index 65c6edb1c24..056c892aa72 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/String.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/String.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class String { protected String() => throw null; + internal String(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetKnownValue(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..3e27428990e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "FixedClient": { + "type": "object", + "description": "Configuration for FixedClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/fixedClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "fixedClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Type.Enum.Fixed.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Type.Enum.Fixed.csproj index 7a0f3b184b1..c3b7f3fcfa0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Type.Enum.Fixed.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Type.Enum.Fixed.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/tspCodeModel.json index 81294dfe614..5ed79814651 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/tspCodeModel.json @@ -299,7 +299,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Enum.Fixed.String.getKnownValue.accept" + "crossLanguageDefinitionId": "Type.Enum.Fixed.String.getKnownValue.accept", + "methodParameterSegments": [ + { + "$id": "30", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "10" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Enum.Fixed.String.getKnownValue.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -337,21 +356,7 @@ }, "parameters": [ { - "$id": "30", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "10" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Enum.Fixed.String.getKnownValue.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "30" } ], "response": { @@ -392,10 +397,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Enum.Fixed.String.putKnownValue.contentType" + "crossLanguageDefinitionId": "Type.Enum.Fixed.String.putKnownValue.contentType", + "methodParameterSegments": [ + { + "$id": "34", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "14" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Enum.Fixed.String.putKnownValue.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "34", + "$id": "35", "kind": "body", "name": "body", "serializedName": "body", @@ -412,7 +436,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Enum.Fixed.String.putKnownValue.body" + "crossLanguageDefinitionId": "Type.Enum.Fixed.String.putKnownValue.body", + "methodParameterSegments": [ + { + "$id": "36", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "_", + "type": { + "$ref": "1" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Enum.Fixed.String.putKnownValue.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -439,39 +483,10 @@ }, "parameters": [ { - "$id": "35", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "16" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Enum.Fixed.String.putKnownValue.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "34" }, { - "$id": "36", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "_", - "type": { - "$ref": "1" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Enum.Fixed.String.putKnownValue.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "36" } ], "response": {}, @@ -508,10 +523,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Enum.Fixed.String.putUnknownValue.contentType" + "crossLanguageDefinitionId": "Type.Enum.Fixed.String.putUnknownValue.contentType", + "methodParameterSegments": [ + { + "$id": "40", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "18" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Enum.Fixed.String.putUnknownValue.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "40", + "$id": "41", "kind": "body", "name": "body", "serializedName": "body", @@ -528,7 +562,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Enum.Fixed.String.putUnknownValue.body" + "crossLanguageDefinitionId": "Type.Enum.Fixed.String.putUnknownValue.body", + "methodParameterSegments": [ + { + "$id": "42", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "_", + "type": { + "$ref": "1" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Enum.Fixed.String.putUnknownValue.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -555,39 +609,10 @@ }, "parameters": [ { - "$id": "41", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "20" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Enum.Fixed.String.putUnknownValue.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "40" }, { - "$id": "42", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "_", - "type": { - "$ref": "1" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Enum.Fixed.String.putUnknownValue.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "42" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/file/Configuration.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/file/Configuration.json new file mode 100644 index 00000000000..0d23dae137b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/file/Configuration.json @@ -0,0 +1,3 @@ +{ + "package-name": "Type.File" +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/file/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/file/tspCodeModel.json new file mode 100644 index 00000000000..9f39cffeab2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/file/tspCodeModel.json @@ -0,0 +1,51127 @@ +{ + "name": "Type.File", + "apiVersions": [], + "enums": [ + { + "$id": "1", + "kind": "enum", + "name": "FileContentType", + "crossLanguageDefinitionId": "", + "valueType": { + "$id": "2", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "values": [ + { + "$id": "3", + "kind": "enumvalue", + "name": "image/png", + "value": "image/png", + "valueType": { + "$id": "4", + "kind": "string", + "decorators": [], + "doc": "A sequence of textual characters.", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "enumType": { + "$ref": "1" + }, + "decorators": [] + } + ], + "namespace": "TypeSpec.Http", + "isFixed": false, + "isFlags": false, + "usage": "Input,Output", + "decorators": [] + }, + { + "$id": "5", + "kind": "enum", + "name": "File1ContentType", + "crossLanguageDefinitionId": "", + "valueType": { + "$id": "6", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "values": [ + { + "$id": "7", + "kind": "enumvalue", + "name": "application/json", + "value": "application/json", + "valueType": { + "$id": "8", + "kind": "string", + "decorators": [], + "doc": "A sequence of textual characters.", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "enumType": { + "$ref": "5" + }, + "decorators": [] + } + ], + "namespace": "TypeSpec.Http", + "isFixed": false, + "isFlags": false, + "usage": "Input,Output,Json", + "decorators": [] + }, + { + "$id": "9", + "kind": "enum", + "name": "FileContentType2", + "crossLanguageDefinitionId": "TypeSpec.Http.File.contentType.anonymous", + "valueType": { + "$id": "10", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "values": [ + { + "$id": "11", + "kind": "enumvalue", + "name": "image/png", + "value": "image/png", + "valueType": { + "$ref": "10" + }, + "enumType": { + "$ref": "9" + }, + "decorators": [] + }, + { + "$id": "12", + "kind": "enumvalue", + "name": "image/jpeg", + "value": "image/jpeg", + "valueType": { + "$ref": "10" + }, + "enumType": { + "$ref": "9" + }, + "decorators": [] + } + ], + "namespace": "Type.File.Body", + "isFixed": true, + "isFlags": false, + "usage": "Input", + "decorators": [] + }, + { + "$id": "13", + "kind": "enum", + "name": "FileContentType3", + "crossLanguageDefinitionId": "TypeSpec.Http.File.contentType.anonymous", + "valueType": { + "$id": "14", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "values": [ + { + "$id": "15", + "kind": "enumvalue", + "name": "image/png", + "value": "image/png", + "valueType": { + "$ref": "14" + }, + "enumType": { + "$ref": "13" + }, + "decorators": [] + }, + { + "$id": "16", + "kind": "enumvalue", + "name": "image/jpeg", + "value": "image/jpeg", + "valueType": { + "$ref": "14" + }, + "enumType": { + "$ref": "13" + }, + "decorators": [] + } + ], + "namespace": "Type.File.Body", + "isFixed": true, + "isFlags": false, + "usage": "Output", + "decorators": [] + } + ], + "constants": [ + { + "$id": "17", + "kind": "constant", + "name": "uploadFileJsonContentTypeContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "18", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "19", + "kind": "constant", + "name": "downloadFileJsonContentTypeContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "20", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "21", + "kind": "constant", + "name": "FileContentType1", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "22", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "application/json", + "decorators": [] + }, + { + "$id": "23", + "kind": "constant", + "name": "downloadFileSpecificContentTypeContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "24", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "image/png", + "decorators": [] + }, + { + "$id": "25", + "kind": "constant", + "name": "FileContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "26", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "image/png", + "decorators": [] + }, + { + "$id": "27", + "kind": "constant", + "name": "downloadFileDefaultContentTypeContentType", + "namespace": "", + "usage": "None", + "valueType": { + "$id": "28", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "value": "*/*", + "decorators": [] + } + ], + "models": [ + { + "$id": "29", + "kind": "model", + "name": "File", + "namespace": "TypeSpec.Http", + "crossLanguageDefinitionId": "TypeSpec.Http.File", + "usage": "Input,Output", + "doc": "A file in an HTTP request, response, or multipart payload.\n\nFiles have a special meaning that the HTTP library understands. When the body of an HTTP request, response,\nor multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the\noperation is treated as a file upload or download.\n\nWhen using file bodies, the fields of the file model are defined to come from particular locations by default:\n\n- `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload\n(MAY be overridden or changed).\n\nA File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit\n`Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON payload,\nit will have a structure like:\n\n```\n{\n \"contentType\": ,\n \"filename\": ,\n \"contents\": \n}\n```\n\nThe `contentType` _within_ the file defines what media types the data inside the file can be, but if the specification\ndefines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is\nserialized_. See the examples below for more information.\n\nNOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename`\n(`Content-Disposition: ; filename=`) is only valid in HTTP responses and multipart payloads. If\nyou wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the\n`filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` location\nis overridden, as shown in the examples below.", + "summary": "A file in an HTTP request, response, or multipart payload.", + "decorators": [], + "serializationOptions": { + "binary": { + "isFile": true, + "isText": false, + "contentTypes": [ + "image/png" + ], + "filename": { + "$id": "30", + "kind": "ModelProperty", + "name": "filename", + "node": { + "$id": "31", + "kind": 15, + "id": { + "$id": "32", + "kind": 3, + "sv": "filename", + "pos": 8679, + "end": 8687, + "flags": 0, + "parent": { + "$ref": "31" + }, + "_id": 931 + }, + "decorators": [ + { + "$id": "33", + "kind": 5, + "arguments": [ + { + "$id": "34", + "kind": 32, + "value": "The name of the file, if any.", + "pos": 8644, + "end": 8675, + "flags": 0, + "parent": { + "$ref": "33" + } + } + ], + "target": { + "$id": "35", + "kind": 3, + "sv": "summary", + "pos": 8636, + "end": 8643, + "flags": 1, + "parent": { + "$ref": "33" + }, + "_id": 932 + }, + "pos": 8635, + "end": 8676, + "flags": 0, + "parent": { + "$ref": "31" + } + } + ], + "value": { + "$id": "36", + "kind": 45, + "target": { + "$id": "37", + "kind": 3, + "sv": "string", + "pos": 8690, + "end": 8696, + "flags": 1, + "parent": { + "$ref": "36" + }, + "_id": 934 + }, + "arguments": [], + "pos": 8690, + "end": 8696, + "flags": 1, + "parent": { + "$ref": "31" + }, + "_id": 933 + }, + "optional": true, + "pos": 7976, + "end": 8696, + "flags": 0, + "docs": [ + { + "$id": "38", + "kind": 51, + "content": [ + { + "$id": "39", + "kind": 52, + "text": "The name of the file, if any.\n\nIn file bodies, this value comes from the `filename` parameter of the `Content-Disposition` header of the response\nor multipart payload. In JSON bodies, this value is serialized as a field in the response.\n\nNOTE: By default, `filename` cannot be sent in request payloads and can only be sent in responses and multipart\npayloads, as the `Content-Disposition` header is not valid in requests. If you want to send the `filename` in a request,\nyou must extend the `File` model and override the `filename` property with a different location defined by HTTP metadata\ndecorators.", + "pos": 7979, + "end": 8630, + "flags": 0, + "parent": { + "$ref": "38" + } + } + ], + "tags": [], + "pos": 7976, + "end": 8632, + "flags": 0, + "parent": { + "$ref": "31" + } + } + ], + "directives": [], + "parent": { + "$id": "40", + "kind": 13, + "id": { + "$id": "41", + "kind": 3, + "sv": "File", + "pos": 7210, + "end": 7214, + "flags": 0, + "parent": { + "$ref": "40" + }, + "_id": 902 + }, + "templateParameters": [ + { + "$id": "42", + "kind": 46, + "id": { + "$id": "43", + "kind": 3, + "sv": "ContentType", + "pos": 7215, + "end": 7226, + "flags": 0, + "parent": { + "$ref": "42" + }, + "_id": 915 + }, + "constraint": { + "$id": "44", + "kind": 45, + "target": { + "$id": "45", + "kind": 3, + "sv": "string", + "pos": 7235, + "end": 7241, + "flags": 1, + "parent": { + "$ref": "44" + }, + "_id": 917 + }, + "arguments": [], + "pos": 7235, + "end": 7241, + "flags": 1, + "parent": { + "$ref": "42" + }, + "_id": 916 + }, + "default": { + "$id": "46", + "kind": 45, + "target": { + "$id": "47", + "kind": 3, + "sv": "string", + "pos": 7244, + "end": 7250, + "flags": 1, + "parent": { + "$ref": "46" + }, + "_id": 919 + }, + "arguments": [], + "pos": 7244, + "end": 7250, + "flags": 1, + "parent": { + "$ref": "42" + }, + "_id": 918 + }, + "pos": 7215, + "end": 7250, + "flags": 0, + "parent": { + "$ref": "40" + }, + "symbol": { + "declarations": [ + { + "$ref": "42" + } + ], + "name": "ContentType", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "40" + } + ], + "name": "File", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$id": "48", + "kind": 8, + "decorators": [], + "docs": [], + "id": { + "$id": "49", + "kind": 3, + "sv": "Http", + "pos": 138, + "end": 142, + "flags": 0, + "parent": { + "$ref": "48" + }, + "_id": 1036 + }, + "locals": { + "duplicates": {} + }, + "directives": [], + "pos": 119, + "end": 143, + "flags": 0, + "parent": { + "$id": "50", + "kind": 8, + "decorators": [], + "directives": [], + "id": { + "$id": "51", + "kind": 3, + "sv": "TypeSpec", + "pos": 129, + "end": 137, + "flags": 0, + "parent": { + "$ref": "50" + }, + "_id": 1035 + }, + "statements": { + "$ref": "48" + }, + "locals": { + "duplicates": {} + }, + "pos": 119, + "end": 143, + "flags": 0, + "parent": { + "$id": "52", + "kind": 0, + "statements": [ + { + "$id": "53", + "kind": 2, + "path": { + "$id": "54", + "kind": 32, + "value": "../dist/src/tsp-index.js", + "pos": 7, + "end": 33, + "flags": 0, + "parent": { + "$ref": "53" + } + }, + "pos": 0, + "end": 34, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "52" + } + }, + { + "$id": "55", + "kind": 2, + "path": { + "$id": "56", + "kind": 32, + "value": "./decorators.tsp", + "pos": 42, + "end": 60, + "flags": 0, + "parent": { + "$ref": "55" + } + }, + "pos": 35, + "end": 61, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "52" + } + }, + { + "$id": "57", + "kind": 2, + "path": { + "$id": "58", + "kind": 32, + "value": "./private.decorators.tsp", + "pos": 69, + "end": 95, + "flags": 0, + "parent": { + "$ref": "57" + } + }, + "pos": 62, + "end": 96, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "52" + } + }, + { + "$id": "59", + "kind": 2, + "path": { + "$id": "60", + "kind": 32, + "value": "./auth.tsp", + "pos": 104, + "end": 116, + "flags": 0, + "parent": { + "$ref": "59" + } + }, + "pos": 97, + "end": 117, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "52" + } + }, + { + "$ref": "50" + }, + { + "$id": "61", + "kind": 9, + "name": { + "$id": "62", + "kind": 3, + "sv": "Private", + "pos": 151, + "end": 158, + "flags": 1, + "parent": { + "$ref": "61" + }, + "_id": 8 + }, + "pos": 145, + "end": 159, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "52" + } + }, + { + "$id": "63", + "kind": 13, + "id": { + "$id": "64", + "kind": 3, + "sv": "Response", + "pos": 271, + "end": 279, + "flags": 0, + "parent": { + "$ref": "63" + }, + "_id": 944 + }, + "templateParameters": [ + { + "$id": "65", + "kind": 46, + "id": { + "$id": "66", + "kind": 3, + "sv": "Status", + "pos": 280, + "end": 286, + "flags": 0, + "parent": { + "$ref": "65" + }, + "_id": 946 + }, + "pos": 280, + "end": 286, + "flags": 0, + "parent": { + "$ref": "63" + }, + "symbol": { + "declarations": [ + { + "$ref": "65" + } + ], + "name": "Status", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "63" + } + ], + "name": "Response", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 101 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 102 + } + } + ], + "templateParametersRange": { + "pos": 279, + "end": 287 + }, + "decorators": [ + { + "$id": "67", + "kind": 5, + "arguments": [ + { + "$id": "68", + "kind": 32, + "value": "", + "pos": 261, + "end": 263, + "flags": 0, + "parent": { + "$ref": "67" + } + } + ], + "target": { + "$id": "69", + "kind": 3, + "sv": "doc", + "pos": 257, + "end": 260, + "flags": 1, + "parent": { + "$ref": "67" + }, + "_id": 945 + }, + "pos": 256, + "end": 264, + "flags": 0, + "parent": { + "$ref": "63" + } + } + ], + "properties": [ + { + "$id": "70", + "kind": 15, + "id": { + "$id": "71", + "kind": 3, + "sv": "statusCode", + "pos": 333, + "end": 343, + "flags": 0, + "parent": { + "$ref": "70" + }, + "_id": 947 + }, + "decorators": [ + { + "$id": "72", + "kind": 5, + "arguments": [ + { + "$id": "73", + "kind": 32, + "value": "The status code.", + "pos": 297, + "end": 315, + "flags": 0, + "parent": { + "$ref": "72" + } + } + ], + "target": { + "$id": "74", + "kind": 3, + "sv": "doc", + "pos": 293, + "end": 296, + "flags": 1, + "parent": { + "$ref": "72" + }, + "_id": 948 + }, + "pos": 292, + "end": 316, + "flags": 0, + "parent": { + "$ref": "70" + } + }, + { + "$id": "75", + "kind": 5, + "arguments": [], + "target": { + "$id": "76", + "kind": 3, + "sv": "statusCode", + "pos": 320, + "end": 330, + "flags": 1, + "parent": { + "$ref": "75" + }, + "_id": 949 + }, + "pos": 319, + "end": 330, + "flags": 0, + "parent": { + "$ref": "70" + } + } + ], + "value": { + "$id": "77", + "kind": 45, + "target": { + "$id": "78", + "kind": 3, + "sv": "Status", + "pos": 345, + "end": 351, + "flags": 1, + "parent": { + "$ref": "77" + }, + "_id": 955 + }, + "arguments": [], + "pos": 345, + "end": 351, + "flags": 1, + "parent": { + "$ref": "70" + }, + "_id": 954 + }, + "optional": false, + "pos": 292, + "end": 351, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "63" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "70" + }, + "name": "statusCode", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "63" + } + ], + "name": "Response", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 101 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 288, + "end": 354 + }, + "pos": 161, + "end": 354, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "79", + "kind": 51, + "content": [ + { + "$id": "80", + "kind": 52, + "text": "Describes an HTTP response.", + "pos": 164, + "end": 202, + "flags": 0, + "parent": { + "$ref": "79" + } + } + ], + "tags": [ + { + "$id": "81", + "kind": 57, + "tagName": { + "$id": "82", + "kind": 3, + "sv": "template", + "pos": 203, + "end": 211, + "flags": 0, + "parent": { + "$ref": "81" + } + }, + "paramName": { + "$id": "83", + "kind": 3, + "sv": "Status", + "pos": 212, + "end": 218, + "flags": 0, + "parent": { + "$ref": "81" + } + }, + "content": [ + { + "$id": "84", + "kind": 52, + "text": "The status code of the response.", + "pos": 219, + "end": 253, + "flags": 0, + "parent": { + "$ref": "81" + } + } + ], + "pos": 202, + "end": 253, + "flags": 0, + "parent": { + "$ref": "79" + } + } + ], + "pos": 161, + "end": 255, + "flags": 0, + "parent": { + "$ref": "63" + } + } + ], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "63" + } + ], + "name": "Response", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 101 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "85", + "kind": 13, + "id": { + "$id": "86", + "kind": 3, + "sv": "Body", + "pos": 647, + "end": 651, + "flags": 0, + "parent": { + "$ref": "85" + }, + "_id": 1037 + }, + "templateParameters": [ + { + "$id": "87", + "kind": 46, + "id": { + "$id": "88", + "kind": 3, + "sv": "Type", + "pos": 652, + "end": 656, + "flags": 0, + "parent": { + "$ref": "87" + }, + "_id": 1039 + }, + "pos": 652, + "end": 656, + "flags": 0, + "parent": { + "$ref": "85" + }, + "symbol": { + "declarations": [ + { + "$ref": "87" + } + ], + "name": "Type", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "85" + } + ], + "name": "Body", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 110 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 111 + } + } + ], + "templateParametersRange": { + "pos": 651, + "end": 657 + }, + "decorators": [ + { + "$id": "89", + "kind": 5, + "arguments": [ + { + "$id": "90", + "kind": 32, + "value": "", + "pos": 637, + "end": 639, + "flags": 0, + "parent": { + "$ref": "89" + } + } + ], + "target": { + "$id": "91", + "kind": 3, + "sv": "doc", + "pos": 633, + "end": 636, + "flags": 1, + "parent": { + "$ref": "89" + }, + "_id": 1038 + }, + "pos": 632, + "end": 640, + "flags": 0, + "parent": { + "$ref": "85" + } + } + ], + "properties": [ + { + "$id": "92", + "kind": 15, + "id": { + "$id": "93", + "kind": 3, + "sv": "body", + "pos": 732, + "end": 736, + "flags": 0, + "parent": { + "$ref": "92" + }, + "_id": 1040 + }, + "decorators": [ + { + "$id": "94", + "kind": 5, + "arguments": [], + "target": { + "$id": "95", + "kind": 3, + "sv": "body", + "pos": 663, + "end": 667, + "flags": 1, + "parent": { + "$ref": "94" + }, + "_id": 1041 + }, + "pos": 662, + "end": 667, + "flags": 0, + "parent": { + "$ref": "92" + } + }, + { + "$id": "96", + "kind": 5, + "arguments": [ + { + "$id": "97", + "kind": 32, + "value": "The body type of the operation request or response.", + "pos": 675, + "end": 728, + "flags": 0, + "parent": { + "$ref": "96" + } + } + ], + "target": { + "$id": "98", + "kind": 3, + "sv": "doc", + "pos": 671, + "end": 674, + "flags": 1, + "parent": { + "$ref": "96" + }, + "_id": 1046 + }, + "pos": 670, + "end": 729, + "flags": 0, + "parent": { + "$ref": "92" + } + } + ], + "value": { + "$id": "99", + "kind": 45, + "target": { + "$id": "100", + "kind": 3, + "sv": "Type", + "pos": 738, + "end": 742, + "flags": 1, + "parent": { + "$ref": "99" + }, + "_id": 1048 + }, + "arguments": [], + "pos": 738, + "end": 742, + "flags": 1, + "parent": { + "$ref": "92" + }, + "_id": 1047 + }, + "optional": false, + "pos": 662, + "end": 742, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "85" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "92" + }, + "name": "body", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "85" + } + ], + "name": "Body", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 110 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 658, + "end": 745 + }, + "pos": 356, + "end": 745, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "101", + "kind": 51, + "content": [ + { + "$id": "102", + "kind": 52, + "text": "Defines a model with a single property of the given type, marked with `@body`.\n\nThis can be useful in situations where you cannot use a bare type as the body\nand it is awkward to add a property.", + "pos": 359, + "end": 572, + "flags": 0, + "parent": { + "$ref": "101" + } + } + ], + "tags": [ + { + "$id": "103", + "kind": 57, + "tagName": { + "$id": "104", + "kind": 3, + "sv": "template", + "pos": 573, + "end": 581, + "flags": 0, + "parent": { + "$ref": "103" + } + }, + "paramName": { + "$id": "105", + "kind": 3, + "sv": "Type", + "pos": 582, + "end": 586, + "flags": 0, + "parent": { + "$ref": "103" + } + }, + "content": [ + { + "$id": "106", + "kind": 52, + "text": "The type of the model's `body` property.", + "pos": 587, + "end": 629, + "flags": 0, + "parent": { + "$ref": "103" + } + } + ], + "pos": 572, + "end": 629, + "flags": 0, + "parent": { + "$ref": "101" + } + } + ], + "pos": 356, + "end": 631, + "flags": 0, + "parent": { + "$ref": "85" + } + } + ], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "85" + } + ], + "name": "Body", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 110 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "107", + "kind": 13, + "id": { + "$id": "108", + "kind": 3, + "sv": "LocationHeader", + "pos": 864, + "end": 878, + "flags": 0, + "parent": { + "$ref": "107" + }, + "_id": 1049 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [ + { + "$id": "109", + "kind": 15, + "id": { + "$id": "110", + "kind": 3, + "sv": "location", + "pos": 1003, + "end": 1011, + "flags": 0, + "parent": { + "$ref": "109" + }, + "_id": 1050 + }, + "decorators": [ + { + "$id": "111", + "kind": 5, + "arguments": [ + { + "$id": "112", + "kind": 32, + "value": "The Location header contains the URL where the status of the long running operation can be checked.", + "pos": 888, + "end": 989, + "flags": 0, + "parent": { + "$ref": "111" + } + } + ], + "target": { + "$id": "113", + "kind": 3, + "sv": "doc", + "pos": 884, + "end": 887, + "flags": 1, + "parent": { + "$ref": "111" + }, + "_id": 1051 + }, + "pos": 883, + "end": 990, + "flags": 0, + "parent": { + "$ref": "109" + } + }, + { + "$id": "114", + "kind": 5, + "arguments": [], + "target": { + "$id": "115", + "kind": 3, + "sv": "header", + "pos": 994, + "end": 1000, + "flags": 1, + "parent": { + "$ref": "114" + }, + "_id": 1052 + }, + "pos": 993, + "end": 1000, + "flags": 0, + "parent": { + "$ref": "109" + } + } + ], + "value": { + "$id": "116", + "kind": 45, + "target": { + "$id": "117", + "kind": 3, + "sv": "string", + "pos": 1013, + "end": 1019, + "flags": 1, + "parent": { + "$ref": "116" + }, + "_id": 1070 + }, + "arguments": [], + "pos": 1013, + "end": 1019, + "flags": 1, + "parent": { + "$ref": "109" + }, + "_id": 1069 + }, + "optional": false, + "pos": 883, + "end": 1019, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "107" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "109" + }, + "name": "location", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "107" + } + ], + "name": "LocationHeader", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 112 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 879, + "end": 1022 + }, + "pos": 747, + "end": 1022, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "118", + "kind": 51, + "content": [ + { + "$id": "119", + "kind": 52, + "text": "The Location header contains the URL where the status of the long running operation can be checked.", + "pos": 750, + "end": 855, + "flags": 0, + "parent": { + "$ref": "118" + } + } + ], + "tags": [], + "pos": 747, + "end": 857, + "flags": 0, + "parent": { + "$ref": "107" + } + } + ], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "107" + } + ], + "name": "LocationHeader", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 112 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "120", + "kind": 13, + "id": { + "$id": "121", + "kind": 3, + "sv": "OkResponse", + "pos": 1319, + "end": 1329, + "flags": 0, + "parent": { + "$ref": "120" + }, + "_id": 1071 + }, + "is": { + "$id": "122", + "kind": 45, + "target": { + "$id": "123", + "kind": 3, + "sv": "Response", + "pos": 1333, + "end": 1341, + "flags": 1, + "parent": { + "$ref": "122" + }, + "_id": 1073 + }, + "arguments": [ + { + "$id": "124", + "kind": 61, + "argument": { + "$id": "125", + "kind": 33, + "value": 200, + "valueAsString": "200", + "pos": 1342, + "end": 1345, + "flags": 1, + "parent": { + "$ref": "124" + } + }, + "pos": 1342, + "end": 1345, + "flags": 1, + "parent": { + "$ref": "122" + } + } + ], + "pos": 1333, + "end": 1346, + "flags": 1, + "parent": { + "$ref": "120" + }, + "_id": 1072 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "pos": 1275, + "end": 1347, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "126", + "kind": 51, + "content": [ + { + "$id": "127", + "kind": 52, + "text": "The request has succeeded.", + "pos": 1278, + "end": 1310, + "flags": 0, + "parent": { + "$ref": "126" + } + } + ], + "tags": [], + "pos": 1275, + "end": 1312, + "flags": 0, + "parent": { + "$ref": "120" + } + } + ], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "120" + } + ], + "name": "OkResponse", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 114 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "128", + "kind": 13, + "id": { + "$id": "129", + "kind": 3, + "sv": "CreatedResponse", + "pos": 1440, + "end": 1455, + "flags": 0, + "parent": { + "$ref": "128" + }, + "_id": 1074 + }, + "is": { + "$id": "130", + "kind": 45, + "target": { + "$id": "131", + "kind": 3, + "sv": "Response", + "pos": 1459, + "end": 1467, + "flags": 1, + "parent": { + "$ref": "130" + }, + "_id": 1076 + }, + "arguments": [ + { + "$id": "132", + "kind": 61, + "argument": { + "$id": "133", + "kind": 33, + "value": 201, + "valueAsString": "201", + "pos": 1468, + "end": 1471, + "flags": 1, + "parent": { + "$ref": "132" + } + }, + "pos": 1468, + "end": 1471, + "flags": 1, + "parent": { + "$ref": "130" + } + } + ], + "pos": 1459, + "end": 1472, + "flags": 1, + "parent": { + "$ref": "128" + }, + "_id": 1075 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "pos": 1348, + "end": 1473, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "134", + "kind": 51, + "content": [ + { + "$id": "135", + "kind": 52, + "text": "The request has succeeded and a new resource has been created as a result.", + "pos": 1351, + "end": 1431, + "flags": 0, + "parent": { + "$ref": "134" + } + } + ], + "tags": [], + "pos": 1348, + "end": 1433, + "flags": 0, + "parent": { + "$ref": "128" + } + } + ], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "128" + } + ], + "name": "CreatedResponse", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 115 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "136", + "kind": 13, + "id": { + "$id": "137", + "kind": 3, + "sv": "AcceptedResponse", + "pos": 1575, + "end": 1591, + "flags": 0, + "parent": { + "$ref": "136" + }, + "_id": 1077 + }, + "is": { + "$id": "138", + "kind": 45, + "target": { + "$id": "139", + "kind": 3, + "sv": "Response", + "pos": 1595, + "end": 1603, + "flags": 1, + "parent": { + "$ref": "138" + }, + "_id": 1079 + }, + "arguments": [ + { + "$id": "140", + "kind": 61, + "argument": { + "$id": "141", + "kind": 33, + "value": 202, + "valueAsString": "202", + "pos": 1604, + "end": 1607, + "flags": 1, + "parent": { + "$ref": "140" + } + }, + "pos": 1604, + "end": 1607, + "flags": 1, + "parent": { + "$ref": "138" + } + } + ], + "pos": 1595, + "end": 1608, + "flags": 1, + "parent": { + "$ref": "136" + }, + "_id": 1078 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "pos": 1474, + "end": 1609, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "142", + "kind": 51, + "content": [ + { + "$id": "143", + "kind": 52, + "text": "The request has been accepted for processing, but processing has not yet completed.", + "pos": 1477, + "end": 1566, + "flags": 0, + "parent": { + "$ref": "142" + } + } + ], + "tags": [], + "pos": 1474, + "end": 1568, + "flags": 0, + "parent": { + "$ref": "136" + } + } + ], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "136" + } + ], + "name": "AcceptedResponse", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 116 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "144", + "kind": 13, + "id": { + "$id": "145", + "kind": 3, + "sv": "NoContentResponse", + "pos": 1704, + "end": 1721, + "flags": 0, + "parent": { + "$ref": "144" + }, + "_id": 941 + }, + "is": { + "$id": "146", + "kind": 45, + "target": { + "$id": "147", + "kind": 3, + "sv": "Response", + "pos": 1725, + "end": 1733, + "flags": 1, + "parent": { + "$ref": "146" + }, + "_id": 943 + }, + "arguments": [ + { + "$id": "148", + "kind": 61, + "argument": { + "$id": "149", + "kind": 33, + "value": 204, + "valueAsString": "204", + "pos": 1734, + "end": 1737, + "flags": 1, + "parent": { + "$ref": "148" + } + }, + "pos": 1734, + "end": 1737, + "flags": 1, + "parent": { + "$ref": "146" + } + } + ], + "pos": 1725, + "end": 1738, + "flags": 1, + "parent": { + "$ref": "144" + }, + "_id": 942 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "pos": 1610, + "end": 1739, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "150", + "kind": 51, + "content": [ + { + "$id": "151", + "kind": 52, + "text": "There is no content to send for this request, but the headers may be useful.", + "pos": 1613, + "end": 1695, + "flags": 0, + "parent": { + "$ref": "150" + } + } + ], + "tags": [], + "pos": 1610, + "end": 1697, + "flags": 0, + "parent": { + "$ref": "144" + } + } + ], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "144" + } + ], + "name": "NoContentResponse", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 100 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "152", + "kind": 13, + "id": { + "$id": "153", + "kind": 3, + "sv": "MovedResponse", + "pos": 1859, + "end": 1872, + "flags": 0, + "parent": { + "$ref": "152" + }, + "_id": 1080 + }, + "is": { + "$id": "154", + "kind": 45, + "target": { + "$id": "155", + "kind": 3, + "sv": "Response", + "pos": 1876, + "end": 1884, + "flags": 1, + "parent": { + "$ref": "154" + }, + "_id": 1082 + }, + "arguments": [ + { + "$id": "156", + "kind": 61, + "argument": { + "$id": "157", + "kind": 33, + "value": 301, + "valueAsString": "301", + "pos": 1885, + "end": 1888, + "flags": 1, + "parent": { + "$ref": "156" + } + }, + "pos": 1885, + "end": 1888, + "flags": 1, + "parent": { + "$ref": "154" + } + } + ], + "pos": 1876, + "end": 1889, + "flags": 1, + "parent": { + "$ref": "152" + }, + "_id": 1081 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [ + { + "$id": "158", + "kind": 16, + "target": { + "$id": "159", + "kind": 45, + "target": { + "$id": "160", + "kind": 3, + "sv": "LocationHeader", + "pos": 1897, + "end": 1911, + "flags": 1, + "parent": { + "$ref": "159" + }, + "_id": 1084 + }, + "arguments": [], + "pos": 1897, + "end": 1911, + "flags": 1, + "parent": { + "$ref": "158" + }, + "_id": 1083 + }, + "pos": 1894, + "end": 1911, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "152" + } + } + ], + "bodyRange": { + "pos": 1890, + "end": 1914 + }, + "pos": 1740, + "end": 1914, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "161", + "kind": 51, + "content": [ + { + "$id": "162", + "kind": 52, + "text": "The URL of the requested resource has been changed permanently. The new URL is given in the response.", + "pos": 1743, + "end": 1850, + "flags": 0, + "parent": { + "$ref": "161" + } + } + ], + "tags": [], + "pos": 1740, + "end": 1852, + "flags": 0, + "parent": { + "$ref": "152" + } + } + ], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "152" + } + ], + "name": "MovedResponse", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 117 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "163", + "kind": 13, + "id": { + "$id": "164", + "kind": 3, + "sv": "NotModifiedResponse", + "pos": 2014, + "end": 2033, + "flags": 0, + "parent": { + "$ref": "163" + }, + "_id": 1085 + }, + "is": { + "$id": "165", + "kind": 45, + "target": { + "$id": "166", + "kind": 3, + "sv": "Response", + "pos": 2037, + "end": 2045, + "flags": 1, + "parent": { + "$ref": "165" + }, + "_id": 1087 + }, + "arguments": [ + { + "$id": "167", + "kind": 61, + "argument": { + "$id": "168", + "kind": 33, + "value": 304, + "valueAsString": "304", + "pos": 2046, + "end": 2049, + "flags": 1, + "parent": { + "$ref": "167" + } + }, + "pos": 2046, + "end": 2049, + "flags": 1, + "parent": { + "$ref": "165" + } + } + ], + "pos": 2037, + "end": 2050, + "flags": 1, + "parent": { + "$ref": "163" + }, + "_id": 1086 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "pos": 1915, + "end": 2051, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "169", + "kind": 51, + "content": [ + { + "$id": "170", + "kind": 52, + "text": "The client has made a conditional request and the resource has not been modified.", + "pos": 1918, + "end": 2005, + "flags": 0, + "parent": { + "$ref": "169" + } + } + ], + "tags": [], + "pos": 1915, + "end": 2007, + "flags": 0, + "parent": { + "$ref": "163" + } + } + ], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "163" + } + ], + "name": "NotModifiedResponse", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 118 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "171", + "kind": 13, + "id": { + "$id": "172", + "kind": 3, + "sv": "BadRequestResponse", + "pos": 2136, + "end": 2154, + "flags": 0, + "parent": { + "$ref": "171" + }, + "_id": 1088 + }, + "is": { + "$id": "173", + "kind": 45, + "target": { + "$id": "174", + "kind": 3, + "sv": "Response", + "pos": 2158, + "end": 2166, + "flags": 1, + "parent": { + "$ref": "173" + }, + "_id": 1090 + }, + "arguments": [ + { + "$id": "175", + "kind": 61, + "argument": { + "$id": "176", + "kind": 33, + "value": 400, + "valueAsString": "400", + "pos": 2167, + "end": 2170, + "flags": 1, + "parent": { + "$ref": "175" + } + }, + "pos": 2167, + "end": 2170, + "flags": 1, + "parent": { + "$ref": "173" + } + } + ], + "pos": 2158, + "end": 2171, + "flags": 1, + "parent": { + "$ref": "171" + }, + "_id": 1089 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "pos": 2052, + "end": 2172, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "177", + "kind": 51, + "content": [ + { + "$id": "178", + "kind": 52, + "text": "The server could not understand the request due to invalid syntax.", + "pos": 2055, + "end": 2127, + "flags": 0, + "parent": { + "$ref": "177" + } + } + ], + "tags": [], + "pos": 2052, + "end": 2129, + "flags": 0, + "parent": { + "$ref": "171" + } + } + ], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "171" + } + ], + "name": "BadRequestResponse", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 119 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "179", + "kind": 13, + "id": { + "$id": "180", + "kind": 3, + "sv": "UnauthorizedResponse", + "pos": 2214, + "end": 2234, + "flags": 0, + "parent": { + "$ref": "179" + }, + "_id": 1091 + }, + "is": { + "$id": "181", + "kind": 45, + "target": { + "$id": "182", + "kind": 3, + "sv": "Response", + "pos": 2238, + "end": 2246, + "flags": 1, + "parent": { + "$ref": "181" + }, + "_id": 1093 + }, + "arguments": [ + { + "$id": "183", + "kind": 61, + "argument": { + "$id": "184", + "kind": 33, + "value": 401, + "valueAsString": "401", + "pos": 2247, + "end": 2250, + "flags": 1, + "parent": { + "$ref": "183" + } + }, + "pos": 2247, + "end": 2250, + "flags": 1, + "parent": { + "$ref": "181" + } + } + ], + "pos": 2238, + "end": 2251, + "flags": 1, + "parent": { + "$ref": "179" + }, + "_id": 1092 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "pos": 2173, + "end": 2252, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "185", + "kind": 51, + "content": [ + { + "$id": "186", + "kind": 52, + "text": "Access is unauthorized.", + "pos": 2176, + "end": 2205, + "flags": 0, + "parent": { + "$ref": "185" + } + } + ], + "tags": [], + "pos": 2173, + "end": 2207, + "flags": 0, + "parent": { + "$ref": "179" + } + } + ], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "179" + } + ], + "name": "UnauthorizedResponse", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 120 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "187", + "kind": 13, + "id": { + "$id": "188", + "kind": 3, + "sv": "ForbiddenResponse", + "pos": 2291, + "end": 2308, + "flags": 0, + "parent": { + "$ref": "187" + }, + "_id": 1094 + }, + "is": { + "$id": "189", + "kind": 45, + "target": { + "$id": "190", + "kind": 3, + "sv": "Response", + "pos": 2312, + "end": 2320, + "flags": 1, + "parent": { + "$ref": "189" + }, + "_id": 1096 + }, + "arguments": [ + { + "$id": "191", + "kind": 61, + "argument": { + "$id": "192", + "kind": 33, + "value": 403, + "valueAsString": "403", + "pos": 2321, + "end": 2324, + "flags": 1, + "parent": { + "$ref": "191" + } + }, + "pos": 2321, + "end": 2324, + "flags": 1, + "parent": { + "$ref": "189" + } + } + ], + "pos": 2312, + "end": 2325, + "flags": 1, + "parent": { + "$ref": "187" + }, + "_id": 1095 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "pos": 2253, + "end": 2326, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "193", + "kind": 51, + "content": [ + { + "$id": "194", + "kind": 52, + "text": "Access is forbidden.", + "pos": 2256, + "end": 2282, + "flags": 0, + "parent": { + "$ref": "193" + } + } + ], + "tags": [], + "pos": 2253, + "end": 2284, + "flags": 0, + "parent": { + "$ref": "187" + } + } + ], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "187" + } + ], + "name": "ForbiddenResponse", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 121 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "195", + "kind": 13, + "id": { + "$id": "196", + "kind": 3, + "sv": "NotFoundResponse", + "pos": 2391, + "end": 2407, + "flags": 0, + "parent": { + "$ref": "195" + }, + "_id": 1097 + }, + "is": { + "$id": "197", + "kind": 45, + "target": { + "$id": "198", + "kind": 3, + "sv": "Response", + "pos": 2411, + "end": 2419, + "flags": 1, + "parent": { + "$ref": "197" + }, + "_id": 1099 + }, + "arguments": [ + { + "$id": "199", + "kind": 61, + "argument": { + "$id": "200", + "kind": 33, + "value": 404, + "valueAsString": "404", + "pos": 2420, + "end": 2423, + "flags": 1, + "parent": { + "$ref": "199" + } + }, + "pos": 2420, + "end": 2423, + "flags": 1, + "parent": { + "$ref": "197" + } + } + ], + "pos": 2411, + "end": 2424, + "flags": 1, + "parent": { + "$ref": "195" + }, + "_id": 1098 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "pos": 2327, + "end": 2425, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "201", + "kind": 51, + "content": [ + { + "$id": "202", + "kind": 52, + "text": "The server cannot find the requested resource.", + "pos": 2330, + "end": 2382, + "flags": 0, + "parent": { + "$ref": "201" + } + } + ], + "tags": [], + "pos": 2327, + "end": 2384, + "flags": 0, + "parent": { + "$ref": "195" + } + } + ], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "195" + } + ], + "name": "NotFoundResponse", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 122 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "203", + "kind": 13, + "id": { + "$id": "204", + "kind": 3, + "sv": "ConflictResponse", + "pos": 2503, + "end": 2519, + "flags": 0, + "parent": { + "$ref": "203" + }, + "_id": 1100 + }, + "is": { + "$id": "205", + "kind": 45, + "target": { + "$id": "206", + "kind": 3, + "sv": "Response", + "pos": 2523, + "end": 2531, + "flags": 1, + "parent": { + "$ref": "205" + }, + "_id": 1102 + }, + "arguments": [ + { + "$id": "207", + "kind": 61, + "argument": { + "$id": "208", + "kind": 33, + "value": 409, + "valueAsString": "409", + "pos": 2532, + "end": 2535, + "flags": 1, + "parent": { + "$ref": "207" + } + }, + "pos": 2532, + "end": 2535, + "flags": 1, + "parent": { + "$ref": "205" + } + } + ], + "pos": 2523, + "end": 2536, + "flags": 1, + "parent": { + "$ref": "203" + }, + "_id": 1101 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "pos": 2426, + "end": 2537, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "209", + "kind": 51, + "content": [ + { + "$id": "210", + "kind": 52, + "text": "The request conflicts with the current state of the server.", + "pos": 2429, + "end": 2494, + "flags": 0, + "parent": { + "$ref": "209" + } + } + ], + "tags": [], + "pos": 2426, + "end": 2496, + "flags": 0, + "parent": { + "$ref": "203" + } + } + ], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "203" + } + ], + "name": "ConflictResponse", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 123 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "211", + "kind": 13, + "id": { + "$id": "212", + "kind": 3, + "sv": "PlainData", + "pos": 2773, + "end": 2782, + "flags": 0, + "parent": { + "$ref": "211" + }, + "_id": 1103 + }, + "templateParameters": [ + { + "$id": "213", + "kind": 46, + "id": { + "$id": "214", + "kind": 3, + "sv": "Data", + "pos": 2783, + "end": 2787, + "flags": 0, + "parent": { + "$ref": "213" + }, + "_id": 1106 + }, + "pos": 2783, + "end": 2787, + "flags": 0, + "parent": { + "$ref": "211" + }, + "symbol": { + "declarations": [ + { + "$ref": "213" + } + ], + "name": "Data", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "211" + } + ], + "name": "PlainData", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 124 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 125 + } + } + ], + "templateParametersRange": { + "pos": 2782, + "end": 2788 + }, + "decorators": [ + { + "$id": "215", + "kind": 5, + "arguments": [], + "target": { + "$id": "216", + "kind": 3, + "sv": "plainData", + "pos": 2757, + "end": 2766, + "flags": 1, + "parent": { + "$ref": "215" + }, + "_id": 1107 + }, + "pos": 2756, + "end": 2766, + "flags": 0, + "parent": { + "$ref": "211" + } + } + ], + "properties": [ + { + "$id": "217", + "kind": 16, + "target": { + "$id": "218", + "kind": 45, + "target": { + "$id": "219", + "kind": 3, + "sv": "Data", + "pos": 2796, + "end": 2800, + "flags": 1, + "parent": { + "$ref": "218" + }, + "_id": 1105 + }, + "arguments": [], + "pos": 2796, + "end": 2800, + "flags": 1, + "parent": { + "$ref": "217" + }, + "_id": 1104 + }, + "pos": 2793, + "end": 2800, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "211" + } + } + ], + "bodyRange": { + "pos": 2789, + "end": 2803 + }, + "pos": 2539, + "end": 2803, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "220", + "kind": 51, + "content": [ + { + "$id": "221", + "kind": 52, + "text": "Produces a new model with the same properties as T, but with `@query`,\n`@header`, `@body`, and `@path` decorators removed from all properties.", + "pos": 2542, + "end": 2698, + "flags": 0, + "parent": { + "$ref": "220" + } + } + ], + "tags": [ + { + "$id": "222", + "kind": 57, + "tagName": { + "$id": "223", + "kind": 3, + "sv": "template", + "pos": 2699, + "end": 2707, + "flags": 0, + "parent": { + "$ref": "222" + } + }, + "paramName": { + "$id": "224", + "kind": 3, + "sv": "Data", + "pos": 2708, + "end": 2712, + "flags": 0, + "parent": { + "$ref": "222" + } + }, + "content": [ + { + "$id": "225", + "kind": 52, + "text": "The model to spread as the plain data.", + "pos": 2713, + "end": 2753, + "flags": 0, + "parent": { + "$ref": "222" + } + } + ], + "pos": 2698, + "end": 2753, + "flags": 0, + "parent": { + "$ref": "220" + } + } + ], + "pos": 2539, + "end": 2755, + "flags": 0, + "parent": { + "$ref": "211" + } + } + ], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "211" + } + ], + "name": "PlainData", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 124 + }, + "locals": { + "duplicates": {} + } + }, + { + "$ref": "40" + }, + { + "$id": "226", + "kind": 13, + "id": { + "$id": "227", + "kind": 3, + "sv": "HttpPartOptions", + "pos": 8992, + "end": 9007, + "flags": 0, + "parent": { + "$ref": "226" + }, + "_id": 1116 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [ + { + "$id": "228", + "kind": 15, + "id": { + "$id": "229", + "kind": 3, + "sv": "name", + "pos": 9065, + "end": 9069, + "flags": 0, + "parent": { + "$ref": "228" + }, + "_id": 1117 + }, + "decorators": [], + "value": { + "$id": "230", + "kind": 45, + "target": { + "$id": "231", + "kind": 3, + "sv": "string", + "pos": 9072, + "end": 9078, + "flags": 1, + "parent": { + "$ref": "230" + }, + "_id": 1119 + }, + "arguments": [], + "pos": 9072, + "end": 9078, + "flags": 1, + "parent": { + "$ref": "228" + }, + "_id": 1118 + }, + "optional": true, + "pos": 9012, + "end": 9078, + "flags": 0, + "docs": [ + { + "$id": "232", + "kind": 51, + "content": [ + { + "$id": "233", + "kind": 52, + "text": "Name of the part when using the array form.", + "pos": 9015, + "end": 9060, + "flags": 0, + "parent": { + "$ref": "232" + } + } + ], + "tags": [], + "pos": 9012, + "end": 9062, + "flags": 0, + "parent": { + "$ref": "228" + } + } + ], + "directives": [], + "parent": { + "$ref": "226" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "228" + }, + "name": "name", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "226" + } + ], + "name": "HttpPartOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 126 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 9008, + "end": 9081 + }, + "pos": 8986, + "end": 9081, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "226" + } + ], + "name": "HttpPartOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 126 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "234", + "kind": 13, + "id": { + "$id": "235", + "kind": 3, + "sv": "HttpPart", + "pos": 9122, + "end": 9130, + "flags": 0, + "parent": { + "$ref": "234" + }, + "_id": 1120 + }, + "templateParameters": [ + { + "$id": "236", + "kind": 46, + "id": { + "$id": "237", + "kind": 3, + "sv": "Type", + "pos": 9131, + "end": 9135, + "flags": 0, + "parent": { + "$ref": "236" + }, + "_id": 1138 + }, + "pos": 9131, + "end": 9135, + "flags": 0, + "parent": { + "$ref": "234" + }, + "symbol": { + "declarations": [ + { + "$ref": "236" + } + ], + "name": "Type", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "234" + } + ], + "name": "HttpPart", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 127 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 128 + } + }, + { + "$id": "238", + "kind": 46, + "id": { + "$id": "239", + "kind": 3, + "sv": "Options", + "pos": 9137, + "end": 9144, + "flags": 0, + "parent": { + "$ref": "238" + }, + "_id": 1141 + }, + "constraint": { + "$id": "240", + "kind": 44, + "target": { + "$id": "241", + "kind": 45, + "target": { + "$id": "242", + "kind": 3, + "sv": "HttpPartOptions", + "pos": 9161, + "end": 9176, + "flags": 1, + "parent": { + "$ref": "241" + }, + "_id": 1143 + }, + "arguments": [], + "pos": 9161, + "end": 9176, + "flags": 1, + "parent": { + "$ref": "240" + }, + "_id": 1142 + }, + "pos": 9153, + "end": 9176, + "flags": 0, + "parent": { + "$ref": "238" + } + }, + "default": { + "$id": "243", + "kind": 63, + "properties": [], + "bodyRange": { + "pos": 9179, + "end": 9182 + }, + "pos": 9179, + "end": 9182, + "flags": 0, + "parent": { + "$ref": "238" + } + }, + "pos": 9137, + "end": 9182, + "flags": 0, + "parent": { + "$ref": "234" + }, + "symbol": { + "declarations": [ + { + "$ref": "238" + } + ], + "name": "Options", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "234" + } + ], + "name": "HttpPart", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 127 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 129 + } + } + ], + "templateParametersRange": { + "pos": 9130, + "end": 9183 + }, + "decorators": [ + { + "$id": "244", + "kind": 5, + "arguments": [ + { + "$id": "245", + "kind": 45, + "target": { + "$id": "246", + "kind": 3, + "sv": "Type", + "pos": 9101, + "end": 9105, + "flags": 1, + "parent": { + "$ref": "245" + }, + "_id": 1137 + }, + "arguments": [], + "pos": 9101, + "end": 9105, + "flags": 1, + "parent": { + "$ref": "244" + }, + "_id": 1136 + }, + { + "$id": "247", + "kind": 45, + "target": { + "$id": "248", + "kind": 3, + "sv": "Options", + "pos": 9107, + "end": 9114, + "flags": 1, + "parent": { + "$ref": "247" + }, + "_id": 1140 + }, + "arguments": [], + "pos": 9107, + "end": 9114, + "flags": 1, + "parent": { + "$ref": "244" + }, + "_id": 1139 + } + ], + "target": { + "$id": "249", + "kind": 7, + "base": { + "$id": "250", + "kind": 3, + "sv": "Private", + "pos": 9084, + "end": 9091, + "flags": 1, + "parent": { + "$ref": "249" + }, + "_id": 1122 + }, + "id": { + "$id": "251", + "kind": 3, + "sv": "httpPart", + "pos": 9092, + "end": 9100, + "flags": 1, + "parent": { + "$ref": "249" + }, + "_id": 1123 + }, + "selector": ".", + "pos": 9084, + "end": 9100, + "flags": 1, + "parent": { + "$ref": "244" + }, + "_id": 1121 + }, + "pos": 9083, + "end": 9115, + "flags": 0, + "parent": { + "$ref": "234" + } + } + ], + "properties": [], + "bodyRange": { + "pos": 9184, + "end": 9186 + }, + "pos": 9083, + "end": 9186, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "234" + } + ], + "name": "HttpPart", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 127 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "252", + "kind": 13, + "id": { + "$id": "253", + "kind": 3, + "sv": "Link", + "pos": 9194, + "end": 9198, + "flags": 0, + "parent": { + "$ref": "252" + }, + "_id": 1144 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [ + { + "$id": "254", + "kind": 15, + "id": { + "$id": "255", + "kind": 3, + "sv": "target", + "pos": 9203, + "end": 9209, + "flags": 0, + "parent": { + "$ref": "254" + }, + "_id": 1145 + }, + "decorators": [], + "value": { + "$id": "256", + "kind": 45, + "target": { + "$id": "257", + "kind": 3, + "sv": "url", + "pos": 9211, + "end": 9214, + "flags": 1, + "parent": { + "$ref": "256" + }, + "_id": 1147 + }, + "arguments": [], + "pos": 9211, + "end": 9214, + "flags": 1, + "parent": { + "$ref": "254" + }, + "_id": 1146 + }, + "optional": false, + "pos": 9203, + "end": 9214, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "252" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "254" + }, + "name": "target", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "252" + } + ], + "name": "Link", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 130 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "258", + "kind": 15, + "id": { + "$id": "259", + "kind": 3, + "sv": "rel", + "pos": 9218, + "end": 9221, + "flags": 0, + "parent": { + "$ref": "258" + }, + "_id": 1148 + }, + "decorators": [], + "value": { + "$id": "260", + "kind": 45, + "target": { + "$id": "261", + "kind": 3, + "sv": "string", + "pos": 9223, + "end": 9229, + "flags": 1, + "parent": { + "$ref": "260" + }, + "_id": 1150 + }, + "arguments": [], + "pos": 9223, + "end": 9229, + "flags": 1, + "parent": { + "$ref": "258" + }, + "_id": 1149 + }, + "optional": false, + "pos": 9218, + "end": 9229, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "252" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "258" + }, + "name": "rel", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "252" + } + ], + "name": "Link", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 130 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "262", + "kind": 15, + "id": { + "$id": "263", + "kind": 3, + "sv": "attributes", + "pos": 9233, + "end": 9243, + "flags": 0, + "parent": { + "$ref": "262" + }, + "_id": 1151 + }, + "decorators": [], + "value": { + "$id": "264", + "kind": 45, + "target": { + "$id": "265", + "kind": 3, + "sv": "Record", + "pos": 9246, + "end": 9252, + "flags": 1, + "parent": { + "$ref": "264" + }, + "_id": 1153 + }, + "arguments": [ + { + "$id": "266", + "kind": 61, + "argument": { + "$id": "267", + "kind": 43, + "pos": 9253, + "end": 9260, + "flags": 1, + "parent": { + "$ref": "266" + } + }, + "pos": 9253, + "end": 9260, + "flags": 1, + "parent": { + "$ref": "264" + } + } + ], + "pos": 9246, + "end": 9261, + "flags": 1, + "parent": { + "$ref": "262" + }, + "_id": 1152 + }, + "optional": true, + "pos": 9233, + "end": 9261, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "252" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "262" + }, + "name": "attributes", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "252" + } + ], + "name": "Link", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 130 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 9199, + "end": 9264 + }, + "pos": 9188, + "end": 9264, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "252" + } + ], + "name": "Link", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 130 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "268", + "kind": 17, + "id": { + "$id": "269", + "kind": 3, + "sv": "LinkHeader", + "pos": 9273, + "end": 9283, + "flags": 0, + "parent": { + "$ref": "268" + }, + "_id": 1154 + }, + "templateParameters": [ + { + "$id": "270", + "kind": 46, + "id": { + "$id": "271", + "kind": 3, + "sv": "T", + "pos": 9284, + "end": 9285, + "flags": 0, + "parent": { + "$ref": "270" + }, + "_id": 1157 + }, + "constraint": { + "$id": "272", + "kind": 28, + "options": [ + { + "$id": "273", + "kind": 45, + "target": { + "$id": "274", + "kind": 3, + "sv": "Record", + "pos": 9294, + "end": 9300, + "flags": 1, + "parent": { + "$ref": "273" + }, + "_id": 1159 + }, + "arguments": [ + { + "$id": "275", + "kind": 61, + "argument": { + "$id": "276", + "kind": 45, + "target": { + "$id": "277", + "kind": 3, + "sv": "url", + "pos": 9301, + "end": 9304, + "flags": 1, + "parent": { + "$ref": "276" + }, + "_id": 1161 + }, + "arguments": [], + "pos": 9301, + "end": 9304, + "flags": 1, + "parent": { + "$ref": "275" + }, + "_id": 1160 + }, + "pos": 9301, + "end": 9304, + "flags": 1, + "parent": { + "$ref": "273" + } + } + ], + "pos": 9294, + "end": 9305, + "flags": 1, + "parent": { + "$ref": "272" + }, + "_id": 1158 + }, + { + "$id": "278", + "kind": 31, + "elementType": { + "$id": "279", + "kind": 45, + "target": { + "$id": "280", + "kind": 3, + "sv": "Link", + "pos": 9308, + "end": 9312, + "flags": 1, + "parent": { + "$ref": "279" + }, + "_id": 1163 + }, + "arguments": [], + "pos": 9308, + "end": 9312, + "flags": 1, + "parent": { + "$ref": "278" + }, + "_id": 1162 + }, + "pos": 9308, + "end": 9314, + "flags": 0, + "parent": { + "$ref": "272" + } + } + ], + "pos": 9294, + "end": 9314, + "flags": 0, + "parent": { + "$ref": "270" + } + }, + "pos": 9284, + "end": 9314, + "flags": 0, + "parent": { + "$ref": "268" + }, + "symbol": { + "declarations": [ + { + "$ref": "270" + } + ], + "name": "T", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "268" + } + ], + "name": "LinkHeader", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "metatypeMembers": { + "duplicates": {} + }, + "id": 131 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 132 + } + } + ], + "templateParametersRange": { + "pos": 9283, + "end": 9315 + }, + "extends": { + "$id": "281", + "kind": 45, + "target": { + "$id": "282", + "kind": 3, + "sv": "string", + "pos": 9324, + "end": 9330, + "flags": 1, + "parent": { + "$ref": "281" + }, + "_id": 1156 + }, + "arguments": [], + "pos": 9324, + "end": 9330, + "flags": 1, + "parent": { + "$ref": "268" + }, + "_id": 1155 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 9266, + "end": 9331, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "268" + } + ], + "name": "LinkHeader", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "metatypeMembers": { + "duplicates": {} + }, + "id": 131 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "283", + "kind": 13, + "id": { + "$id": "284", + "kind": 3, + "sv": "MergePatchUpdate", + "pos": 11019, + "end": 11035, + "flags": 0, + "parent": { + "$ref": "283" + }, + "_id": 1164 + }, + "templateParameters": [ + { + "$id": "285", + "kind": 46, + "id": { + "$id": "286", + "kind": 3, + "sv": "T", + "pos": 11039, + "end": 11040, + "flags": 0, + "parent": { + "$ref": "285" + }, + "_id": 1178 + }, + "constraint": { + "$id": "287", + "kind": 45, + "target": { + "$id": "288", + "kind": 7, + "base": { + "$id": "289", + "kind": 3, + "sv": "Reflection", + "pos": 11049, + "end": 11059, + "flags": 1, + "parent": { + "$ref": "288" + }, + "_id": 1176 + }, + "id": { + "$id": "290", + "kind": 3, + "sv": "Model", + "pos": 11060, + "end": 11065, + "flags": 1, + "parent": { + "$ref": "288" + }, + "_id": 1177 + }, + "selector": ".", + "pos": 11049, + "end": 11065, + "flags": 1, + "parent": { + "$ref": "287" + }, + "_id": 1175 + }, + "arguments": [], + "pos": 11049, + "end": 11065, + "flags": 1, + "parent": { + "$ref": "285" + }, + "_id": 1174 + }, + "pos": 11039, + "end": 11065, + "flags": 0, + "parent": { + "$ref": "283" + }, + "symbol": { + "declarations": [ + { + "$ref": "285" + } + ], + "name": "T", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "283" + } + ], + "name": "MergePatchUpdate", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 133 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 135 + } + }, + { + "$id": "291", + "kind": 46, + "id": { + "$id": "292", + "kind": 3, + "sv": "NameTemplate", + "pos": 11069, + "end": 11081, + "flags": 0, + "parent": { + "$ref": "291" + }, + "_id": 1169 + }, + "constraint": { + "$id": "293", + "kind": 44, + "target": { + "$id": "294", + "kind": 45, + "target": { + "$id": "295", + "kind": 3, + "sv": "string", + "pos": 11098, + "end": 11104, + "flags": 1, + "parent": { + "$ref": "294" + }, + "_id": 1171 + }, + "arguments": [], + "pos": 11098, + "end": 11104, + "flags": 1, + "parent": { + "$ref": "293" + }, + "_id": 1170 + }, + "pos": 11090, + "end": 11104, + "flags": 0, + "parent": { + "$ref": "291" + } + }, + "default": { + "$id": "296", + "kind": 32, + "value": "{name}MergePatchUpdate", + "pos": 11107, + "end": 11131, + "flags": 0, + "parent": { + "$ref": "291" + } + }, + "pos": 11069, + "end": 11131, + "flags": 0, + "parent": { + "$ref": "283" + }, + "symbol": { + "declarations": [ + { + "$ref": "291" + } + ], + "name": "NameTemplate", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "283" + } + ], + "name": "MergePatchUpdate", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 133 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 134 + } + } + ], + "templateParametersRange": { + "pos": 11035, + "end": 11133 + }, + "decorators": [ + { + "$id": "297", + "kind": 5, + "arguments": [ + { + "$id": "298", + "kind": 32, + "value": "", + "pos": 10835, + "end": 10837, + "flags": 0, + "parent": { + "$ref": "297" + } + } + ], + "target": { + "$id": "299", + "kind": 3, + "sv": "doc", + "pos": 10831, + "end": 10834, + "flags": 1, + "parent": { + "$ref": "297" + }, + "_id": 1165 + }, + "pos": 10830, + "end": 10838, + "flags": 0, + "parent": { + "$ref": "283" + } + }, + { + "$id": "300", + "kind": 5, + "arguments": [ + { + "$id": "301", + "kind": 45, + "target": { + "$id": "302", + "kind": 3, + "sv": "NameTemplate", + "pos": 10853, + "end": 10865, + "flags": 1, + "parent": { + "$ref": "301" + }, + "_id": 1168 + }, + "arguments": [], + "pos": 10853, + "end": 10865, + "flags": 1, + "parent": { + "$ref": "300" + }, + "_id": 1167 + }, + { + "$id": "303", + "kind": 45, + "target": { + "$id": "304", + "kind": 3, + "sv": "T", + "pos": 10867, + "end": 10868, + "flags": 1, + "parent": { + "$ref": "303" + }, + "_id": 1173 + }, + "arguments": [], + "pos": 10867, + "end": 10868, + "flags": 1, + "parent": { + "$ref": "300" + }, + "_id": 1172 + } + ], + "target": { + "$id": "305", + "kind": 3, + "sv": "friendlyName", + "pos": 10840, + "end": 10852, + "flags": 1, + "parent": { + "$ref": "300" + }, + "_id": 1166 + }, + "pos": 10839, + "end": 10869, + "flags": 0, + "parent": { + "$ref": "283" + } + }, + { + "$id": "306", + "kind": 5, + "arguments": [ + { + "$id": "307", + "kind": 32, + "value": "application/merge-patch+json", + "pos": 10885, + "end": 10915, + "flags": 0, + "parent": { + "$ref": "306" + } + } + ], + "target": { + "$id": "308", + "kind": 3, + "sv": "mediaTypeHint", + "pos": 10871, + "end": 10884, + "flags": 1, + "parent": { + "$ref": "306" + }, + "_id": 1179 + }, + "pos": 10870, + "end": 10916, + "flags": 0, + "parent": { + "$ref": "283" + } + }, + { + "$id": "309", + "kind": 5, + "arguments": [ + { + "$id": "310", + "kind": 45, + "target": { + "$id": "311", + "kind": 3, + "sv": "T", + "pos": 10934, + "end": 10935, + "flags": 1, + "parent": { + "$ref": "310" + }, + "_id": 1206 + }, + "arguments": [], + "pos": 10934, + "end": 10935, + "flags": 1, + "parent": { + "$ref": "309" + }, + "_id": 1205 + }, + { + "$id": "312", + "kind": 45, + "target": { + "$id": "313", + "kind": 3, + "sv": "NameTemplate", + "pos": 10937, + "end": 10949, + "flags": 1, + "parent": { + "$ref": "312" + }, + "_id": 1208 + }, + "arguments": [], + "pos": 10937, + "end": 10949, + "flags": 1, + "parent": { + "$ref": "309" + }, + "_id": 1207 + }, + { + "$id": "314", + "kind": 63, + "properties": [ + { + "$id": "315", + "kind": 64, + "id": { + "$id": "316", + "kind": 3, + "sv": "visibilityMode", + "pos": 10954, + "end": 10968, + "flags": 0, + "parent": { + "$ref": "315" + }, + "_id": 1209 + }, + "value": { + "$id": "317", + "kind": 45, + "target": { + "$id": "318", + "kind": 7, + "base": { + "$id": "319", + "kind": 7, + "base": { + "$id": "320", + "kind": 3, + "sv": "Private", + "pos": 10970, + "end": 10977, + "flags": 1, + "parent": { + "$ref": "319" + }, + "_id": 1213 + }, + "id": { + "$id": "321", + "kind": 3, + "sv": "MergePatchVisibilityMode", + "pos": 10978, + "end": 11002, + "flags": 1, + "parent": { + "$ref": "319" + }, + "_id": 1214 + }, + "selector": ".", + "pos": 10970, + "end": 11002, + "flags": 1, + "parent": { + "$ref": "318" + }, + "_id": 1212 + }, + "id": { + "$id": "322", + "kind": 3, + "sv": "Update", + "pos": 11003, + "end": 11009, + "flags": 1, + "parent": { + "$ref": "318" + }, + "_id": 1215 + }, + "selector": ".", + "pos": 10970, + "end": 11009, + "flags": 1, + "parent": { + "$ref": "317" + }, + "_id": 1211 + }, + "arguments": [], + "pos": 10970, + "end": 11009, + "flags": 1, + "parent": { + "$ref": "315" + }, + "_id": 1210 + }, + "pos": 10954, + "end": 11009, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "314" + } + } + ], + "bodyRange": { + "pos": 10951, + "end": 11011 + }, + "pos": 10951, + "end": 11011, + "flags": 0, + "parent": { + "$ref": "309" + } + } + ], + "target": { + "$id": "323", + "kind": 3, + "sv": "applyMergePatch", + "pos": 10918, + "end": 10933, + "flags": 1, + "parent": { + "$ref": "309" + }, + "_id": 1180 + }, + "pos": 10917, + "end": 11012, + "flags": 0, + "parent": { + "$ref": "283" + } + } + ], + "properties": [], + "bodyRange": { + "pos": 11134, + "end": 11136 + }, + "pos": 9333, + "end": 11136, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "324", + "kind": 51, + "content": [ + { + "$id": "325", + "kind": 52, + "text": "Create a MergePatch Request body for updating the given resource Model.\nThe MergePatch request created by this template provides a TypeSpec description of a\nJSON MergePatch request that can successfully update the given resource.\nThe transformation follows the definition of JSON MergePatch requests in\nrfc 7396: https://www.rfc-editor.org/rfc/rfc7396,\napplying the merge-patch transform recursively to keyed types in the resource Model.\n\nUsing this template in a PATCH request body overrides the `implicitOptionality`\nsetting for PATCH operations and sets `application/merge-patch+json` as the request\ncontent-type.", + "pos": 9336, + "end": 9989, + "flags": 0, + "parent": { + "$ref": "324" + } + } + ], + "tags": [ + { + "$id": "326", + "kind": 57, + "tagName": { + "$id": "327", + "kind": 3, + "sv": "template", + "pos": 9990, + "end": 9998, + "flags": 0, + "parent": { + "$ref": "326" + } + }, + "paramName": { + "$id": "328", + "kind": 3, + "sv": "T", + "pos": 9999, + "end": 10000, + "flags": 0, + "parent": { + "$ref": "326" + } + }, + "content": [ + { + "$id": "329", + "kind": 52, + "text": "The type of the resource to create a MergePatch update request body for.", + "pos": 10001, + "end": 10077, + "flags": 0, + "parent": { + "$ref": "326" + } + } + ], + "pos": 9989, + "end": 10077, + "flags": 0, + "parent": { + "$ref": "324" + } + }, + { + "$id": "330", + "kind": 57, + "tagName": { + "$id": "331", + "kind": 3, + "sv": "template", + "pos": 10078, + "end": 10086, + "flags": 0, + "parent": { + "$ref": "330" + } + }, + "paramName": { + "$id": "332", + "kind": 3, + "sv": "NameTemplate", + "pos": 10087, + "end": 10099, + "flags": 0, + "parent": { + "$ref": "330" + } + }, + "content": [ + { + "$id": "333", + "kind": 52, + "text": "A StringTemplate used to name any models created by applying\nthe merge-patch transform to the resource. The default name template is `{name}MergePatchUpdate`,\nfor example, the merge patch transform of model `Widget` is named `WidgetMergePatchUpdate`.", + "pos": 10100, + "end": 10363, + "flags": 0, + "parent": { + "$ref": "330" + } + } + ], + "pos": 10077, + "end": 10363, + "flags": 0, + "parent": { + "$ref": "324" + } + }, + { + "$id": "334", + "kind": 58, + "tagName": { + "$id": "335", + "kind": 3, + "sv": "example", + "pos": 10364, + "end": 10371, + "flags": 0, + "parent": { + "$ref": "334" + } + }, + "content": [ + { + "$id": "336", + "kind": 52, + "text": "```tsp\n// An operation updating a 'Widget' using merge-patch\n@patch op update(@body request: MergePatchUpdate): Widget;\n```", + "pos": 10371, + "end": 10522, + "flags": 0, + "parent": { + "$ref": "334" + } + } + ], + "pos": 10363, + "end": 10522, + "flags": 0, + "parent": { + "$ref": "324" + } + }, + { + "$id": "337", + "kind": 58, + "tagName": { + "$id": "338", + "kind": 3, + "sv": "example", + "pos": 10523, + "end": 10530, + "flags": 0, + "parent": { + "$ref": "337" + } + }, + "content": [ + { + "$id": "339", + "kind": 52, + "text": "```tsp\n// An operation updating a 'Widget' using merge-patch\n@patch op update(@bodyRoot request: MergePatchUpdate): Widget;\n```", + "pos": 10530, + "end": 10685, + "flags": 0, + "parent": { + "$ref": "337" + } + } + ], + "pos": 10522, + "end": 10685, + "flags": 0, + "parent": { + "$ref": "324" + } + }, + { + "$id": "340", + "kind": 58, + "tagName": { + "$id": "341", + "kind": 3, + "sv": "example", + "pos": 10686, + "end": 10693, + "flags": 0, + "parent": { + "$ref": "340" + } + }, + "content": [ + { + "$id": "342", + "kind": 52, + "text": "```tsp\n// An operation updating a 'Widget' using merge-patch\n@patch op update(...MergePatchUpdate): Widget;\n```", + "pos": 10693, + "end": 10827, + "flags": 0, + "parent": { + "$ref": "340" + } + } + ], + "pos": 10685, + "end": 10827, + "flags": 0, + "parent": { + "$ref": "324" + } + } + ], + "pos": 9333, + "end": 10829, + "flags": 0, + "parent": { + "$ref": "283" + } + } + ], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "283" + } + ], + "name": "MergePatchUpdate", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 133 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "343", + "kind": 13, + "id": { + "$id": "344", + "kind": 3, + "sv": "MergePatchCreateOrUpdate", + "pos": 12902, + "end": 12926, + "flags": 0, + "parent": { + "$ref": "343" + }, + "_id": 1216 + }, + "templateParameters": [ + { + "$id": "345", + "kind": 46, + "id": { + "$id": "346", + "kind": 3, + "sv": "T", + "pos": 12930, + "end": 12931, + "flags": 0, + "parent": { + "$ref": "345" + }, + "_id": 1230 + }, + "constraint": { + "$id": "347", + "kind": 45, + "target": { + "$id": "348", + "kind": 7, + "base": { + "$id": "349", + "kind": 3, + "sv": "Reflection", + "pos": 12940, + "end": 12950, + "flags": 1, + "parent": { + "$ref": "348" + }, + "_id": 1228 + }, + "id": { + "$id": "350", + "kind": 3, + "sv": "Model", + "pos": 12951, + "end": 12956, + "flags": 1, + "parent": { + "$ref": "348" + }, + "_id": 1229 + }, + "selector": ".", + "pos": 12940, + "end": 12956, + "flags": 1, + "parent": { + "$ref": "347" + }, + "_id": 1227 + }, + "arguments": [], + "pos": 12940, + "end": 12956, + "flags": 1, + "parent": { + "$ref": "345" + }, + "_id": 1226 + }, + "pos": 12930, + "end": 12956, + "flags": 0, + "parent": { + "$ref": "343" + }, + "symbol": { + "declarations": [ + { + "$ref": "345" + } + ], + "name": "T", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "343" + } + ], + "name": "MergePatchCreateOrUpdate", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 138 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 140 + } + }, + { + "$id": "351", + "kind": 46, + "id": { + "$id": "352", + "kind": 3, + "sv": "NameTemplate", + "pos": 12960, + "end": 12972, + "flags": 0, + "parent": { + "$ref": "351" + }, + "_id": 1221 + }, + "constraint": { + "$id": "353", + "kind": 44, + "target": { + "$id": "354", + "kind": 45, + "target": { + "$id": "355", + "kind": 3, + "sv": "string", + "pos": 12989, + "end": 12995, + "flags": 1, + "parent": { + "$ref": "354" + }, + "_id": 1223 + }, + "arguments": [], + "pos": 12989, + "end": 12995, + "flags": 1, + "parent": { + "$ref": "353" + }, + "_id": 1222 + }, + "pos": 12981, + "end": 12995, + "flags": 0, + "parent": { + "$ref": "351" + } + }, + "default": { + "$id": "356", + "kind": 32, + "value": "{name}MergePatchCreateOrUpdate", + "pos": 12998, + "end": 13030, + "flags": 0, + "parent": { + "$ref": "351" + } + }, + "pos": 12960, + "end": 13030, + "flags": 0, + "parent": { + "$ref": "343" + }, + "symbol": { + "declarations": [ + { + "$ref": "351" + } + ], + "name": "NameTemplate", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "343" + } + ], + "name": "MergePatchCreateOrUpdate", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 138 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 139 + } + } + ], + "templateParametersRange": { + "pos": 12926, + "end": 13032 + }, + "decorators": [ + { + "$id": "357", + "kind": 5, + "arguments": [ + { + "$id": "358", + "kind": 32, + "value": "", + "pos": 12702, + "end": 12704, + "flags": 0, + "parent": { + "$ref": "357" + } + } + ], + "target": { + "$id": "359", + "kind": 3, + "sv": "doc", + "pos": 12698, + "end": 12701, + "flags": 1, + "parent": { + "$ref": "357" + }, + "_id": 1217 + }, + "pos": 12697, + "end": 12705, + "flags": 0, + "parent": { + "$ref": "343" + } + }, + { + "$id": "360", + "kind": 5, + "arguments": [ + { + "$id": "361", + "kind": 45, + "target": { + "$id": "362", + "kind": 3, + "sv": "NameTemplate", + "pos": 12720, + "end": 12732, + "flags": 1, + "parent": { + "$ref": "361" + }, + "_id": 1220 + }, + "arguments": [], + "pos": 12720, + "end": 12732, + "flags": 1, + "parent": { + "$ref": "360" + }, + "_id": 1219 + }, + { + "$id": "363", + "kind": 45, + "target": { + "$id": "364", + "kind": 3, + "sv": "T", + "pos": 12734, + "end": 12735, + "flags": 1, + "parent": { + "$ref": "363" + }, + "_id": 1225 + }, + "arguments": [], + "pos": 12734, + "end": 12735, + "flags": 1, + "parent": { + "$ref": "360" + }, + "_id": 1224 + } + ], + "target": { + "$id": "365", + "kind": 3, + "sv": "friendlyName", + "pos": 12707, + "end": 12719, + "flags": 1, + "parent": { + "$ref": "360" + }, + "_id": 1218 + }, + "pos": 12706, + "end": 12736, + "flags": 0, + "parent": { + "$ref": "343" + } + }, + { + "$id": "366", + "kind": 5, + "arguments": [ + { + "$id": "367", + "kind": 32, + "value": "application/merge-patch+json", + "pos": 12752, + "end": 12782, + "flags": 0, + "parent": { + "$ref": "366" + } + } + ], + "target": { + "$id": "368", + "kind": 3, + "sv": "mediaTypeHint", + "pos": 12738, + "end": 12751, + "flags": 1, + "parent": { + "$ref": "366" + }, + "_id": 1231 + }, + "pos": 12737, + "end": 12783, + "flags": 0, + "parent": { + "$ref": "343" + } + }, + { + "$id": "369", + "kind": 5, + "arguments": [ + { + "$id": "370", + "kind": 45, + "target": { + "$id": "371", + "kind": 3, + "sv": "T", + "pos": 12804, + "end": 12805, + "flags": 1, + "parent": { + "$ref": "370" + }, + "_id": 1234 + }, + "arguments": [], + "pos": 12804, + "end": 12805, + "flags": 1, + "parent": { + "$ref": "369" + }, + "_id": 1233 + }, + { + "$id": "372", + "kind": 45, + "target": { + "$id": "373", + "kind": 3, + "sv": "NameTemplate", + "pos": 12809, + "end": 12821, + "flags": 1, + "parent": { + "$ref": "372" + }, + "_id": 1236 + }, + "arguments": [], + "pos": 12809, + "end": 12821, + "flags": 1, + "parent": { + "$ref": "369" + }, + "_id": 1235 + }, + { + "$id": "374", + "kind": 63, + "properties": [ + { + "$id": "375", + "kind": 64, + "id": { + "$id": "376", + "kind": 3, + "sv": "visibilityMode", + "pos": 12828, + "end": 12842, + "flags": 0, + "parent": { + "$ref": "375" + }, + "_id": 1237 + }, + "value": { + "$id": "377", + "kind": 45, + "target": { + "$id": "378", + "kind": 7, + "base": { + "$id": "379", + "kind": 7, + "base": { + "$id": "380", + "kind": 3, + "sv": "Private", + "pos": 12844, + "end": 12851, + "flags": 1, + "parent": { + "$ref": "379" + }, + "_id": 1241 + }, + "id": { + "$id": "381", + "kind": 3, + "sv": "MergePatchVisibilityMode", + "pos": 12852, + "end": 12876, + "flags": 1, + "parent": { + "$ref": "379" + }, + "_id": 1242 + }, + "selector": ".", + "pos": 12844, + "end": 12876, + "flags": 1, + "parent": { + "$ref": "378" + }, + "_id": 1240 + }, + "id": { + "$id": "382", + "kind": 3, + "sv": "CreateOrUpdate", + "pos": 12877, + "end": 12891, + "flags": 1, + "parent": { + "$ref": "378" + }, + "_id": 1243 + }, + "selector": ".", + "pos": 12844, + "end": 12891, + "flags": 1, + "parent": { + "$ref": "377" + }, + "_id": 1239 + }, + "arguments": [], + "pos": 12844, + "end": 12891, + "flags": 1, + "parent": { + "$ref": "375" + }, + "_id": 1238 + }, + "pos": 12828, + "end": 12891, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "374" + } + } + ], + "bodyRange": { + "pos": 12825, + "end": 12893 + }, + "pos": 12825, + "end": 12893, + "flags": 0, + "parent": { + "$ref": "369" + } + } + ], + "target": { + "$id": "383", + "kind": 3, + "sv": "applyMergePatch", + "pos": 12785, + "end": 12800, + "flags": 1, + "parent": { + "$ref": "369" + }, + "_id": 1232 + }, + "pos": 12784, + "end": 12895, + "flags": 0, + "parent": { + "$ref": "343" + } + } + ], + "properties": [], + "bodyRange": { + "pos": 13033, + "end": 13035 + }, + "pos": 11138, + "end": 13035, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "384", + "kind": 51, + "content": [ + { + "$id": "385", + "kind": 52, + "text": "Create a MergePatch Request body for creating or updating the given resource Model.\nThe MergePatch request created by this template provides a TypeSpec description of a\nJSON MergePatch request that can successfully create or update the given resource.\nThe transformation follows the definition of JSON MergePatch requests in\nrfc 7396: https://www.rfc-editor.org/rfc/rfc7396,\napplying the merge-patch transform recursively to keyed types in the resource Model.\n\nUsing this template in a PATCH request body overrides the `implicitOptionality`\nsetting for PATCH operations and sets `application/merge-patch+json` as the request\ncontent-type.", + "pos": 11141, + "end": 11816, + "flags": 0, + "parent": { + "$ref": "384" + } + } + ], + "tags": [ + { + "$id": "386", + "kind": 57, + "tagName": { + "$id": "387", + "kind": 3, + "sv": "template", + "pos": 11817, + "end": 11825, + "flags": 0, + "parent": { + "$ref": "386" + } + }, + "paramName": { + "$id": "388", + "kind": 3, + "sv": "T", + "pos": 11826, + "end": 11827, + "flags": 0, + "parent": { + "$ref": "386" + } + }, + "content": [ + { + "$id": "389", + "kind": 52, + "text": "The type of the resource to create a MergePatch update request body for.", + "pos": 11828, + "end": 11904, + "flags": 0, + "parent": { + "$ref": "386" + } + } + ], + "pos": 11816, + "end": 11904, + "flags": 0, + "parent": { + "$ref": "384" + } + }, + { + "$id": "390", + "kind": 57, + "tagName": { + "$id": "391", + "kind": 3, + "sv": "template", + "pos": 11905, + "end": 11913, + "flags": 0, + "parent": { + "$ref": "390" + } + }, + "paramName": { + "$id": "392", + "kind": 3, + "sv": "NameTemplate", + "pos": 11914, + "end": 11926, + "flags": 0, + "parent": { + "$ref": "390" + } + }, + "content": [ + { + "$id": "393", + "kind": 52, + "text": "A StringTemplate used to name any models created by applying\nthe merge-patch transform to the resource. The default name template is `{name}MergePatchCreateOrUpdate`,\nfor example, the merge patch transform of model `Widget` is named `WidgetMergePatchCreateOrUpdate`.", + "pos": 11927, + "end": 12206, + "flags": 0, + "parent": { + "$ref": "390" + } + } + ], + "pos": 11904, + "end": 12206, + "flags": 0, + "parent": { + "$ref": "384" + } + }, + { + "$id": "394", + "kind": 58, + "tagName": { + "$id": "395", + "kind": 3, + "sv": "example", + "pos": 12207, + "end": 12214, + "flags": 0, + "parent": { + "$ref": "394" + } + }, + "content": [ + { + "$id": "396", + "kind": 52, + "text": "```tsp\n// An operation updating a 'Widget' using merge-patch\n@patch op update(@body request: MergePatchCreateOrUpdate): Widget;\n```", + "pos": 12214, + "end": 12373, + "flags": 0, + "parent": { + "$ref": "394" + } + } + ], + "pos": 12206, + "end": 12373, + "flags": 0, + "parent": { + "$ref": "384" + } + }, + { + "$id": "397", + "kind": 58, + "tagName": { + "$id": "398", + "kind": 3, + "sv": "example", + "pos": 12374, + "end": 12381, + "flags": 0, + "parent": { + "$ref": "397" + } + }, + "content": [ + { + "$id": "399", + "kind": 52, + "text": "```tsp\n// An operation updating a 'Widget' using merge-patch\n@patch op update(@bodyRoot request: MergePatchCreateOrUpdate): Widget;\n```", + "pos": 12381, + "end": 12544, + "flags": 0, + "parent": { + "$ref": "397" + } + } + ], + "pos": 12373, + "end": 12544, + "flags": 0, + "parent": { + "$ref": "384" + } + }, + { + "$id": "400", + "kind": 58, + "tagName": { + "$id": "401", + "kind": 3, + "sv": "example", + "pos": 12545, + "end": 12552, + "flags": 0, + "parent": { + "$ref": "400" + } + }, + "content": [ + { + "$id": "402", + "kind": 52, + "text": "```tsp\n// An operation updating a 'Widget' using merge-patch\n@patch op update(...MergePatchCreateOrUpdate): Widget;\n```", + "pos": 12552, + "end": 12694, + "flags": 0, + "parent": { + "$ref": "400" + } + } + ], + "pos": 12544, + "end": 12694, + "flags": 0, + "parent": { + "$ref": "384" + } + } + ], + "pos": 11138, + "end": 12696, + "flags": 0, + "parent": { + "$ref": "343" + } + } + ], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "343" + } + ], + "name": "MergePatchCreateOrUpdate", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 138 + }, + "locals": { + "duplicates": {} + } + } + ], + "file": { + "text": "import \"../dist/src/tsp-index.js\";\nimport \"./decorators.tsp\";\nimport \"./private.decorators.tsp\";\nimport \"./auth.tsp\";\n\nnamespace TypeSpec.Http;\n\nusing Private;\n\n/**\n * Describes an HTTP response.\n *\n * @template Status The status code of the response.\n */\n@doc(\"\")\nmodel Response {\n @doc(\"The status code.\")\n @statusCode\n statusCode: Status;\n}\n\n/**\n * Defines a model with a single property of the given type, marked with `@body`.\n *\n * This can be useful in situations where you cannot use a bare type as the body\n * and it is awkward to add a property.\n *\n * @template Type The type of the model's `body` property.\n */\n@doc(\"\")\nmodel Body {\n @body\n @doc(\"The body type of the operation request or response.\")\n body: Type;\n}\n\n/**\n * The Location header contains the URL where the status of the long running operation can be checked.\n */\nmodel LocationHeader {\n @doc(\"The Location header contains the URL where the status of the long running operation can be checked.\")\n @header\n location: string;\n}\n\n// Don't put @doc on these, change `getStatusCodeDescription` implementation\n// to update the default descriptions for these status codes. This ensures\n// that we get consistent emit between different ways to spell the same\n// responses in TypeSpec.\n\n/**\n * The request has succeeded.\n */\nmodel OkResponse is Response<200>;\n/**\n * The request has succeeded and a new resource has been created as a result.\n */\nmodel CreatedResponse is Response<201>;\n/**\n * The request has been accepted for processing, but processing has not yet completed.\n */\nmodel AcceptedResponse is Response<202>;\n/**\n * There is no content to send for this request, but the headers may be useful.\n */\nmodel NoContentResponse is Response<204>;\n/**\n * The URL of the requested resource has been changed permanently. The new URL is given in the response.\n */\nmodel MovedResponse is Response<301> {\n ...LocationHeader;\n}\n/**\n * The client has made a conditional request and the resource has not been modified.\n */\nmodel NotModifiedResponse is Response<304>;\n/**\n * The server could not understand the request due to invalid syntax.\n */\nmodel BadRequestResponse is Response<400>;\n/**\n * Access is unauthorized.\n */\nmodel UnauthorizedResponse is Response<401>;\n/**\n * Access is forbidden.\n */\nmodel ForbiddenResponse is Response<403>;\n/**\n * The server cannot find the requested resource.\n */\nmodel NotFoundResponse is Response<404>;\n/**\n * The request conflicts with the current state of the server.\n */\nmodel ConflictResponse is Response<409>;\n\n/**\n * Produces a new model with the same properties as T, but with `@query`,\n * `@header`, `@body`, and `@path` decorators removed from all properties.\n *\n * @template Data The model to spread as the plain data.\n */\n@plainData\nmodel PlainData {\n ...Data;\n}\n\n/**\n * A file in an HTTP request, response, or multipart payload.\n *\n * Files have a special meaning that the HTTP library understands. When the body of an HTTP request, response,\n * or multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the\n * operation is treated as a file upload or download.\n *\n * When using file bodies, the fields of the file model are defined to come from particular locations by default:\n *\n * - `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or changed).\n * - `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed).\n * - `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload\n * (MAY be overridden or changed).\n *\n * A File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit\n * `Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON payload,\n * it will have a structure like:\n *\n * ```\n * {\n * \"contentType\": ,\n * \"filename\": ,\n * \"contents\": \n * }\n * ```\n *\n * The `contentType` _within_ the file defines what media types the data inside the file can be, but if the specification\n * defines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is\n * serialized_. See the examples below for more information.\n *\n * NOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename`\n * (`Content-Disposition: ; filename=`) is only valid in HTTP responses and multipart payloads. If\n * you wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the\n * `filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` location\n * is overridden, as shown in the examples below.\n *\n * @template ContentType The allowed media (MIME) types of the file contents.\n * @template Contents The type of the file contents. This can be `string`, `bytes`, or any scalar that extends them.\n *\n * @example\n * ```tsp\n * // Download a file\n * @get op download(): File;\n *\n * // Upload a file\n * @post op upload(@bodyRoot file: File): void;\n * ```\n *\n * @example\n * ```tsp\n * // Upload and download files in a multipart payload\n * op multipartFormDataUpload(\n * @multipartBody fields: {\n * files: HttpPart[];\n * },\n * ): void;\n *\n * op multipartFormDataDownload(): {\n * @multipartBody formFields: {\n * files: HttpPart[];\n * }\n * };\n * ```\n *\n * @example\n * ```tsp\n * // Declare a custom type of text file, where the filename goes in the path\n * // in requests.\n * model SpecFile extends File<\"application/json\" | \"application/yaml\", string> {\n * // Provide a header that contains the name of the file when created or updated\n * @header(\"x-filename\")\n * @path filename: string;\n * }\n *\n * @get op downloadSpec(@path name: string): SpecFile;\n *\n * @post op uploadSpec(@bodyRoot spec: SpecFile): void;\n * ```\n *\n * @example\n * ```tsp\n * // Declare a custom type of binary file\n * model ImageFile extends File {\n * contentType: \"image/png\" | \"image/jpeg\";\n * @path filename: string;\n * }\n *\n * @get op downloadImage(@path name: string): ImageFile;\n *\n * @post op uploadImage(@bodyRoot image: ImageFile): void;\n * ```\n *\n * @example\n * ```tsp\n * // Use a File as a structured JSON object. The HTTP library will warn you that the File will be serialized as JSON,\n * // so you should suppress the warning if it's really what you want instead of a binary file upload/download.\n *\n * // The response body is a JSON object like `{\"contentType\":,\"filename\":,\"contents\":}`\n * @get op downloadTextFileJson(): {\n * @header contentType: \"application/json\",\n * @body file: File<\"text/plain\", string>,\n * };\n *\n * // The request body is a JSON object like `{\"contentType\":,\"filename\":,\"contents\":}`\n * @post op uploadBinaryFileJson(\n * @header contentType: \"application/json\",\n * @body file: File<\"image/png\", bytes>,\n * ): void;\n *\n */\n@summary(\"A file in an HTTP request, response, or multipart payload.\")\n@Private.httpFile\nmodel File {\n /**\n * The allowed media (MIME) types of the file contents.\n *\n * In file bodies, this value comes from the `Content-Type` header of the request or response. In JSON bodies,\n * this value is serialized as a field in the response.\n *\n * NOTE: this is not _necessarily_ the same as the `Content-Type` header of the request or response, but\n * it will be for file bodies. It may be different if the file is serialized as a JSON object. It always refers to the\n * _contents_ of the file, and not necessarily the way the file itself is transmitted or serialized.\n */\n @summary(\"The allowed media (MIME) types of the file contents.\")\n contentType?: ContentType;\n\n /**\n * The name of the file, if any.\n *\n * In file bodies, this value comes from the `filename` parameter of the `Content-Disposition` header of the response\n * or multipart payload. In JSON bodies, this value is serialized as a field in the response.\n *\n * NOTE: By default, `filename` cannot be sent in request payloads and can only be sent in responses and multipart\n * payloads, as the `Content-Disposition` header is not valid in requests. If you want to send the `filename` in a request,\n * you must extend the `File` model and override the `filename` property with a different location defined by HTTP metadata\n * decorators.\n */\n @summary(\"The name of the file, if any.\")\n filename?: string;\n\n /**\n * The contents of the file.\n *\n * In file bodies, this value comes from the body of the request, response, or multipart payload. In JSON bodies,\n * this value is serialized as a field in the response.\n */\n @summary(\"The contents of the file.\")\n contents: Contents;\n}\n\nmodel HttpPartOptions {\n /** Name of the part when using the array form. */\n name?: string;\n}\n\n@Private.httpPart(Type, Options)\nmodel HttpPart {}\n\nmodel Link {\n target: url;\n rel: string;\n attributes?: Record;\n}\n\nscalar LinkHeader | Link[]> extends string;\n\n/**\n * Create a MergePatch Request body for updating the given resource Model.\n * The MergePatch request created by this template provides a TypeSpec description of a\n * JSON MergePatch request that can successfully update the given resource.\n * The transformation follows the definition of JSON MergePatch requests in\n * rfc 7396: https://www.rfc-editor.org/rfc/rfc7396,\n * applying the merge-patch transform recursively to keyed types in the resource Model.\n *\n * Using this template in a PATCH request body overrides the `implicitOptionality`\n * setting for PATCH operations and sets `application/merge-patch+json` as the request\n * content-type.\n *\n * @template T The type of the resource to create a MergePatch update request body for.\n * @template NameTemplate A StringTemplate used to name any models created by applying\n * the merge-patch transform to the resource. The default name template is `{name}MergePatchUpdate`,\n * for example, the merge patch transform of model `Widget` is named `WidgetMergePatchUpdate`.\n *\n * @example\n * ```tsp\n * // An operation updating a 'Widget' using merge-patch\n * @patch op update(@body request: MergePatchUpdate): Widget;\n * ```\n *\n * @example\n * ```tsp\n * // An operation updating a 'Widget' using merge-patch\n * @patch op update(@bodyRoot request: MergePatchUpdate): Widget;\n * ```\n *\n * @example\n * ```tsp\n * // An operation updating a 'Widget' using merge-patch\n * @patch op update(...MergePatchUpdate): Widget;\n * ```\n */\n@doc(\"\")\n@friendlyName(NameTemplate, T)\n@mediaTypeHint(\"application/merge-patch+json\")\n@applyMergePatch(T, NameTemplate, #{ visibilityMode: Private.MergePatchVisibilityMode.Update })\nmodel MergePatchUpdate<\n T extends Reflection.Model,\n NameTemplate extends valueof string = \"{name}MergePatchUpdate\"\n> {}\n\n/**\n * Create a MergePatch Request body for creating or updating the given resource Model.\n * The MergePatch request created by this template provides a TypeSpec description of a\n * JSON MergePatch request that can successfully create or update the given resource.\n * The transformation follows the definition of JSON MergePatch requests in\n * rfc 7396: https://www.rfc-editor.org/rfc/rfc7396,\n * applying the merge-patch transform recursively to keyed types in the resource Model.\n *\n * Using this template in a PATCH request body overrides the `implicitOptionality`\n * setting for PATCH operations and sets `application/merge-patch+json` as the request\n * content-type.\n *\n * @template T The type of the resource to create a MergePatch update request body for.\n * @template NameTemplate A StringTemplate used to name any models created by applying\n * the merge-patch transform to the resource. The default name template is `{name}MergePatchCreateOrUpdate`,\n * for example, the merge patch transform of model `Widget` is named `WidgetMergePatchCreateOrUpdate`.\n *\n * @example\n * ```tsp\n * // An operation updating a 'Widget' using merge-patch\n * @patch op update(@body request: MergePatchCreateOrUpdate): Widget;\n * ```\n *\n * @example\n * ```tsp\n * // An operation updating a 'Widget' using merge-patch\n * @patch op update(@bodyRoot request: MergePatchCreateOrUpdate): Widget;\n * ```\n *\n * @example\n * ```tsp\n * // An operation updating a 'Widget' using merge-patch\n * @patch op update(...MergePatchCreateOrUpdate): Widget;\n * ```\n */\n@doc(\"\")\n@friendlyName(NameTemplate, T)\n@mediaTypeHint(\"application/merge-patch+json\")\n@applyMergePatch(\n T,\n NameTemplate,\n #{ visibilityMode: Private.MergePatchVisibilityMode.CreateOrUpdate }\n)\nmodel MergePatchCreateOrUpdate<\n T extends Reflection.Model,\n NameTemplate extends valueof string = \"{name}MergePatchCreateOrUpdate\"\n> {}\n", + "path": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/http/lib/main.tsp" + }, + "id": { + "$id": "403", + "kind": 3, + "sv": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/http/lib/main.tsp", + "pos": 0, + "end": 0, + "flags": 8, + "parent": { + "$ref": "52" + } + }, + "namespaces": [ + { + "$ref": "50" + }, + { + "$ref": "48" + } + ], + "usings": [ + { + "$ref": "61" + } + ], + "locals": { + "duplicates": {} + }, + "inScopeNamespaces": [ + { + "$ref": "48" + }, + { + "$ref": "50" + } + ], + "parseDiagnostics": [], + "comments": [], + "printable": true, + "parseOptions": {}, + "pos": 0, + "end": 13035, + "flags": 0, + "symbol": { + "declarations": [], + "node": { + "$ref": "52" + }, + "name": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/http/lib/main.tsp", + "exports": { + "duplicates": {} + }, + "flags": 32768, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "symbol": { + "declarations": [ + { + "$ref": "50" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + } + } + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "50" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 97 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 98 + } + }, + { + "$id": "404", + "kind": 46, + "id": { + "$id": "405", + "kind": 3, + "sv": "Contents", + "pos": 7252, + "end": 7260, + "flags": 0, + "parent": { + "$ref": "404" + }, + "_id": 920 + }, + "constraint": { + "$id": "406", + "kind": 28, + "options": [ + { + "$id": "407", + "kind": 45, + "target": { + "$id": "408", + "kind": 3, + "sv": "bytes", + "pos": 7269, + "end": 7274, + "flags": 1, + "parent": { + "$ref": "407" + }, + "_id": 922 + }, + "arguments": [], + "pos": 7269, + "end": 7274, + "flags": 1, + "parent": { + "$ref": "406" + }, + "_id": 921 + }, + { + "$id": "409", + "kind": 45, + "target": { + "$id": "410", + "kind": 3, + "sv": "string", + "pos": 7277, + "end": 7283, + "flags": 1, + "parent": { + "$ref": "409" + }, + "_id": 924 + }, + "arguments": [], + "pos": 7277, + "end": 7283, + "flags": 1, + "parent": { + "$ref": "406" + }, + "_id": 923 + } + ], + "pos": 7269, + "end": 7283, + "flags": 0, + "parent": { + "$ref": "404" + } + }, + "default": { + "$id": "411", + "kind": 45, + "target": { + "$id": "412", + "kind": 3, + "sv": "bytes", + "pos": 7286, + "end": 7291, + "flags": 1, + "parent": { + "$ref": "411" + }, + "_id": 926 + }, + "arguments": [], + "pos": 7286, + "end": 7291, + "flags": 1, + "parent": { + "$ref": "404" + }, + "_id": 925 + }, + "pos": 7252, + "end": 7291, + "flags": 0, + "parent": { + "$ref": "40" + }, + "symbol": { + "declarations": [ + { + "$ref": "404" + } + ], + "name": "Contents", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "40" + } + ], + "name": "File", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "48" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "50" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 97 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 99 + } + } + ], + "templateParametersRange": { + "pos": 7214, + "end": 7292 + }, + "decorators": [ + { + "$id": "413", + "kind": 5, + "arguments": [ + { + "$id": "414", + "kind": 32, + "value": "A file in an HTTP request, response, or multipart payload.", + "pos": 7124, + "end": 7184, + "flags": 0, + "parent": { + "$ref": "413" + } + } + ], + "target": { + "$id": "415", + "kind": 3, + "sv": "summary", + "pos": 7116, + "end": 7123, + "flags": 1, + "parent": { + "$ref": "413" + }, + "_id": 903 + }, + "pos": 7115, + "end": 7185, + "flags": 0, + "parent": { + "$ref": "40" + } + }, + { + "$id": "416", + "kind": 5, + "arguments": [], + "target": { + "$id": "417", + "kind": 7, + "base": { + "$id": "418", + "kind": 3, + "sv": "Private", + "pos": 7187, + "end": 7194, + "flags": 1, + "parent": { + "$ref": "417" + }, + "_id": 905 + }, + "id": { + "$id": "419", + "kind": 3, + "sv": "httpFile", + "pos": 7195, + "end": 7203, + "flags": 1, + "parent": { + "$ref": "417" + }, + "_id": 906 + }, + "selector": ".", + "pos": 7187, + "end": 7203, + "flags": 1, + "parent": { + "$ref": "416" + }, + "_id": 904 + }, + "pos": 7186, + "end": 7203, + "flags": 0, + "parent": { + "$ref": "40" + } + } + ], + "properties": [ + { + "$id": "420", + "kind": 15, + "id": { + "$id": "421", + "kind": 3, + "sv": "contentType", + "pos": 7946, + "end": 7957, + "flags": 0, + "parent": { + "$ref": "420" + }, + "_id": 927 + }, + "decorators": [ + { + "$id": "422", + "kind": 5, + "arguments": [ + { + "$id": "423", + "kind": 32, + "value": "The allowed media (MIME) types of the file contents.", + "pos": 7888, + "end": 7942, + "flags": 0, + "parent": { + "$ref": "422" + } + } + ], + "target": { + "$id": "424", + "kind": 3, + "sv": "summary", + "pos": 7880, + "end": 7887, + "flags": 1, + "parent": { + "$ref": "422" + }, + "_id": 928 + }, + "pos": 7879, + "end": 7943, + "flags": 0, + "parent": { + "$ref": "420" + } + } + ], + "value": { + "$id": "425", + "kind": 45, + "target": { + "$id": "426", + "kind": 3, + "sv": "ContentType", + "pos": 7960, + "end": 7971, + "flags": 1, + "parent": { + "$ref": "425" + }, + "_id": 930 + }, + "arguments": [], + "pos": 7960, + "end": 7971, + "flags": 1, + "parent": { + "$ref": "420" + }, + "_id": 929 + }, + "optional": true, + "pos": 7297, + "end": 7971, + "flags": 0, + "docs": [ + { + "$id": "427", + "kind": 51, + "content": [ + { + "$id": "428", + "kind": 52, + "text": "The allowed media (MIME) types of the file contents.\n\nIn file bodies, this value comes from the `Content-Type` header of the request or response. In JSON bodies,\nthis value is serialized as a field in the response.\n\nNOTE: this is not _necessarily_ the same as the `Content-Type` header of the request or response, but\nit will be for file bodies. It may be different if the file is serialized as a JSON object. It always refers to the\n_contents_ of the file, and not necessarily the way the file itself is transmitted or serialized.", + "pos": 7300, + "end": 7874, + "flags": 0, + "parent": { + "$ref": "427" + } + } + ], + "tags": [], + "pos": 7297, + "end": 7876, + "flags": 0, + "parent": { + "$ref": "420" + } + } + ], + "directives": [], + "parent": { + "$ref": "40" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "420" + }, + "name": "contentType", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "40" + } + ], + "name": "File", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "48" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "50" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 97 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$ref": "31" + }, + { + "$id": "429", + "kind": 15, + "id": { + "$id": "430", + "kind": 3, + "sv": "contents", + "pos": 8963, + "end": 8971, + "flags": 0, + "parent": { + "$ref": "429" + }, + "_id": 935 + }, + "decorators": [ + { + "$id": "431", + "kind": 5, + "arguments": [ + { + "$id": "432", + "kind": 32, + "value": "The contents of the file.", + "pos": 8932, + "end": 8959, + "flags": 0, + "parent": { + "$ref": "431" + } + } + ], + "target": { + "$id": "433", + "kind": 3, + "sv": "summary", + "pos": 8924, + "end": 8931, + "flags": 1, + "parent": { + "$ref": "431" + }, + "_id": 936 + }, + "pos": 8923, + "end": 8960, + "flags": 0, + "parent": { + "$ref": "429" + } + } + ], + "value": { + "$id": "434", + "kind": 45, + "target": { + "$id": "435", + "kind": 3, + "sv": "Contents", + "pos": 8973, + "end": 8981, + "flags": 1, + "parent": { + "$ref": "434" + }, + "_id": 938 + }, + "arguments": [], + "pos": 8973, + "end": 8981, + "flags": 1, + "parent": { + "$ref": "429" + }, + "_id": 937 + }, + "optional": false, + "pos": 8701, + "end": 8981, + "flags": 0, + "docs": [ + { + "$id": "436", + "kind": 51, + "content": [ + { + "$id": "437", + "kind": 52, + "text": "The contents of the file.\n\nIn file bodies, this value comes from the body of the request, response, or multipart payload. In JSON bodies,\nthis value is serialized as a field in the response.", + "pos": 8704, + "end": 8918, + "flags": 0, + "parent": { + "$ref": "436" + } + } + ], + "tags": [], + "pos": 8701, + "end": 8920, + "flags": 0, + "parent": { + "$ref": "429" + } + } + ], + "directives": [], + "parent": { + "$ref": "40" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "429" + }, + "name": "contents", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "40" + } + ], + "name": "File", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "48" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "50" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 97 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 7293, + "end": 8984 + }, + "pos": 2805, + "end": 8984, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "438", + "kind": 51, + "content": [ + { + "$id": "439", + "kind": 52, + "text": "A file in an HTTP request, response, or multipart payload.\n\nFiles have a special meaning that the HTTP library understands. When the body of an HTTP request, response,\nor multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the\noperation is treated as a file upload or download.\n\nWhen using file bodies, the fields of the file model are defined to come from particular locations by default:\n\n- `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload\n(MAY be overridden or changed).\n\nA File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit\n`Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON payload,\nit will have a structure like:\n\n```\n{\n \"contentType\": ,\n \"filename\": ,\n \"contents\": \n}\n```\n\nThe `contentType` _within_ the file defines what media types the data inside the file can be, but if the specification\ndefines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is\nserialized_. See the examples below for more information.\n\nNOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename`\n(`Content-Disposition: ; filename=`) is only valid in HTTP responses and multipart payloads. If\nyou wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the\n`filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` location\nis overridden, as shown in the examples below.", + "pos": 2808, + "end": 4899, + "flags": 0, + "parent": { + "$ref": "438" + } + } + ], + "tags": [ + { + "$id": "440", + "kind": 57, + "tagName": { + "$id": "441", + "kind": 3, + "sv": "template", + "pos": 4900, + "end": 4908, + "flags": 0, + "parent": { + "$ref": "440" + } + }, + "paramName": { + "$id": "442", + "kind": 3, + "sv": "ContentType", + "pos": 4909, + "end": 4920, + "flags": 0, + "parent": { + "$ref": "440" + } + }, + "content": [ + { + "$id": "443", + "kind": 52, + "text": "The allowed media (MIME) types of the file contents.", + "pos": 4921, + "end": 4977, + "flags": 0, + "parent": { + "$ref": "440" + } + } + ], + "pos": 4899, + "end": 4977, + "flags": 0, + "parent": { + "$ref": "438" + } + }, + { + "$id": "444", + "kind": 57, + "tagName": { + "$id": "445", + "kind": 3, + "sv": "template", + "pos": 4978, + "end": 4986, + "flags": 0, + "parent": { + "$ref": "444" + } + }, + "paramName": { + "$id": "446", + "kind": 3, + "sv": "Contents", + "pos": 4987, + "end": 4995, + "flags": 0, + "parent": { + "$ref": "444" + } + }, + "content": [ + { + "$id": "447", + "kind": 52, + "text": "The type of the file contents. This can be `string`, `bytes`, or any scalar that extends them.", + "pos": 4996, + "end": 5097, + "flags": 0, + "parent": { + "$ref": "444" + } + } + ], + "pos": 4977, + "end": 5097, + "flags": 0, + "parent": { + "$ref": "438" + } + }, + { + "$id": "448", + "kind": 58, + "tagName": { + "$id": "449", + "kind": 3, + "sv": "example", + "pos": 5098, + "end": 5105, + "flags": 0, + "parent": { + "$ref": "448" + } + }, + "content": [ + { + "$id": "450", + "kind": 52, + "text": "```tsp\n// Download a file\n@get op download(): File;\n\n// Upload a file\n@post op upload(@bodyRoot file: File): void;\n```", + "pos": 5105, + "end": 5251, + "flags": 0, + "parent": { + "$ref": "448" + } + } + ], + "pos": 5097, + "end": 5251, + "flags": 0, + "parent": { + "$ref": "438" + } + }, + { + "$id": "451", + "kind": 58, + "tagName": { + "$id": "452", + "kind": 3, + "sv": "example", + "pos": 5252, + "end": 5259, + "flags": 0, + "parent": { + "$ref": "451" + } + }, + "content": [ + { + "$id": "453", + "kind": 52, + "text": "```tsp\n// Upload and download files in a multipart payload\nop multipartFormDataUpload(\n @multipartBody fields: {\n files: HttpPart[];\n },\n): void;\n\nop multipartFormDataDownload(): {\n @multipartBody formFields: {\n files: HttpPart[];\n }\n};\n```", + "pos": 5259, + "end": 5570, + "flags": 0, + "parent": { + "$ref": "451" + } + } + ], + "pos": 5251, + "end": 5570, + "flags": 0, + "parent": { + "$ref": "438" + } + }, + { + "$id": "454", + "kind": 58, + "tagName": { + "$id": "455", + "kind": 3, + "sv": "example", + "pos": 5571, + "end": 5578, + "flags": 0, + "parent": { + "$ref": "454" + } + }, + "content": [ + { + "$id": "456", + "kind": 52, + "text": "```tsp\n// Declare a custom type of text file, where the filename goes in the path\n// in requests.\nmodel SpecFile extends File<\"application/json\" | \"application/yaml\", string> {\n // Provide a header that contains the name of the file when created or updated\n @header(\"x-filename\")\n @path filename: string;\n}\n\n@get op downloadSpec(@path name: string): SpecFile;\n\n@post op uploadSpec(@bodyRoot spec: SpecFile): void;\n```", + "pos": 5578, + "end": 6043, + "flags": 0, + "parent": { + "$ref": "454" + } + } + ], + "pos": 5570, + "end": 6043, + "flags": 0, + "parent": { + "$ref": "438" + } + }, + { + "$id": "457", + "kind": 58, + "tagName": { + "$id": "458", + "kind": 3, + "sv": "example", + "pos": 6044, + "end": 6051, + "flags": 0, + "parent": { + "$ref": "457" + } + }, + "content": [ + { + "$id": "459", + "kind": 52, + "text": "```tsp\n// Declare a custom type of binary file\nmodel ImageFile extends File {\n contentType: \"image/png\" | \"image/jpeg\";\n @path filename: string;\n}\n\n@get op downloadImage(@path name: string): ImageFile;\n\n@post op uploadImage(@bodyRoot image: ImageFile): void;\n```", + "pos": 6051, + "end": 6354, + "flags": 0, + "parent": { + "$ref": "457" + } + } + ], + "pos": 6043, + "end": 6354, + "flags": 0, + "parent": { + "$ref": "438" + } + }, + { + "$id": "460", + "kind": 58, + "tagName": { + "$id": "461", + "kind": 3, + "sv": "example", + "pos": 6355, + "end": 6362, + "flags": 0, + "parent": { + "$ref": "460" + } + }, + "content": [ + { + "$id": "462", + "kind": 52, + "text": "```tsp\n// Use a File as a structured JSON object. The HTTP library will warn you that the File will be serialized as JSON,\n// so you should suppress the warning if it's really what you want instead of a binary file upload/download.\n\n// The response body is a JSON object like `{\"contentType\":,\"filename\":,\"contents\":}`\n@get op downloadTextFileJson(): {\n @header contentType: \"application/json\",\n @body file: File<\"text/plain\", string>,\n};\n\n// The request body is a JSON object like `{\"contentType\":,\"filename\":,\"contents\":}`\n@post op uploadBinaryFileJson(\n @header contentType: \"application/json\",\n @body file: File<\"image/png\", bytes>,\n): void;", + "pos": 6362, + "end": 7112, + "flags": 0, + "parent": { + "$ref": "460" + } + } + ], + "pos": 6354, + "end": 7112, + "flags": 0, + "parent": { + "$ref": "438" + } + } + ], + "pos": 2805, + "end": 7114, + "flags": 0, + "parent": { + "$ref": "40" + } + } + ], + "parent": { + "$ref": "52" + }, + "symbol": { + "declarations": [ + { + "$ref": "40" + } + ], + "name": "File", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "48" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "50" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 97 + }, + "locals": { + "duplicates": {} + } + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "31" + }, + "name": "filename", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "40" + } + ], + "name": "File", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "48" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "50" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 97 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "optional": true, + "type": { + "$id": "463", + "kind": "Scalar", + "name": "string", + "node": { + "$id": "464", + "kind": 17, + "id": { + "$id": "465", + "kind": 3, + "sv": "string", + "pos": 1973, + "end": 1979, + "flags": 0, + "parent": { + "$ref": "464" + }, + "_id": 63 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 1921, + "end": 1980, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "466", + "kind": 51, + "content": [ + { + "$id": "467", + "kind": 52, + "text": "A sequence of textual characters.", + "pos": 1924, + "end": 1963, + "flags": 0, + "parent": { + "$ref": "466" + } + } + ], + "tags": [], + "pos": 1921, + "end": 1965, + "flags": 0, + "parent": { + "$ref": "464" + } + } + ], + "parent": { + "$id": "468", + "kind": 0, + "statements": [ + { + "$id": "469", + "kind": 2, + "path": { + "$id": "470", + "kind": 32, + "value": "../dist/src/lib/intrinsic/tsp-index.js", + "pos": 7, + "end": 47, + "flags": 0, + "parent": { + "$ref": "469" + } + }, + "pos": 0, + "end": 48, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "468" + } + }, + { + "$id": "471", + "kind": 2, + "path": { + "$id": "472", + "kind": 32, + "value": "./prototypes.tsp", + "pos": 56, + "end": 74, + "flags": 0, + "parent": { + "$ref": "471" + } + }, + "pos": 49, + "end": 75, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "468" + } + }, + { + "$id": "473", + "kind": 8, + "decorators": [], + "docs": [], + "id": { + "$id": "474", + "kind": 3, + "sv": "TypeSpec", + "pos": 184, + "end": 192, + "flags": 0, + "parent": { + "$ref": "473" + }, + "_id": 15 + }, + "locals": { + "duplicates": {} + }, + "directives": [], + "pos": 174, + "end": 193, + "flags": 0, + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "475", + "kind": 17, + "id": { + "$id": "476", + "kind": 3, + "sv": "bytes", + "pos": 236, + "end": 241, + "flags": 0, + "parent": { + "$ref": "475" + }, + "_id": 16 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 195, + "end": 242, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "477", + "kind": 51, + "content": [ + { + "$id": "478", + "kind": 52, + "text": "Represent a byte array", + "pos": 198, + "end": 226, + "flags": 0, + "parent": { + "$ref": "477" + } + } + ], + "tags": [], + "pos": 195, + "end": 228, + "flags": 0, + "parent": { + "$ref": "475" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "475" + } + ], + "name": "bytes", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 0 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "479", + "kind": 17, + "id": { + "$id": "480", + "kind": 3, + "sv": "numeric", + "pos": 277, + "end": 284, + "flags": 0, + "parent": { + "$ref": "479" + }, + "_id": 17 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 244, + "end": 285, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "481", + "kind": 51, + "content": [ + { + "$id": "482", + "kind": 52, + "text": "A numeric type", + "pos": 247, + "end": 267, + "flags": 0, + "parent": { + "$ref": "481" + } + } + ], + "tags": [], + "pos": 244, + "end": 269, + "flags": 0, + "parent": { + "$ref": "479" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "479" + } + ], + "name": "numeric", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 1 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "483", + "kind": 17, + "id": { + "$id": "484", + "kind": 3, + "sv": "integer", + "pos": 431, + "end": 438, + "flags": 0, + "parent": { + "$ref": "483" + }, + "_id": 18 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "extends": { + "$id": "485", + "kind": 45, + "target": { + "$id": "486", + "kind": 3, + "sv": "numeric", + "pos": 447, + "end": 454, + "flags": 1, + "parent": { + "$ref": "485" + }, + "_id": 20 + }, + "arguments": [], + "pos": 447, + "end": 454, + "flags": 1, + "parent": { + "$ref": "483" + }, + "_id": 19 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 287, + "end": 455, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "487", + "kind": 51, + "content": [ + { + "$id": "488", + "kind": 52, + "text": "A whole number. This represent any `integer` value possible.\nIt is commonly represented as `BigInteger` in some languages.", + "pos": 290, + "end": 421, + "flags": 0, + "parent": { + "$ref": "487" + } + } + ], + "tags": [], + "pos": 287, + "end": 423, + "flags": 0, + "parent": { + "$ref": "483" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "483" + } + ], + "name": "integer", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 2 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "489", + "kind": 17, + "id": { + "$id": "490", + "kind": 3, + "sv": "float", + "pos": 503, + "end": 508, + "flags": 0, + "parent": { + "$ref": "489" + }, + "_id": 21 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "extends": { + "$id": "491", + "kind": 45, + "target": { + "$id": "492", + "kind": 3, + "sv": "numeric", + "pos": 517, + "end": 524, + "flags": 1, + "parent": { + "$ref": "491" + }, + "_id": 23 + }, + "arguments": [], + "pos": 517, + "end": 524, + "flags": 1, + "parent": { + "$ref": "489" + }, + "_id": 22 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 457, + "end": 525, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "493", + "kind": 51, + "content": [ + { + "$id": "494", + "kind": 52, + "text": "A number with decimal value", + "pos": 460, + "end": 493, + "flags": 0, + "parent": { + "$ref": "493" + } + } + ], + "tags": [], + "pos": 457, + "end": 495, + "flags": 0, + "parent": { + "$ref": "489" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "489" + } + ], + "name": "float", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 3 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "495", + "kind": 17, + "id": { + "$id": "496", + "kind": 3, + "sv": "int64", + "pos": 625, + "end": 630, + "flags": 0, + "parent": { + "$ref": "495" + }, + "_id": 24 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "extends": { + "$id": "497", + "kind": 45, + "target": { + "$id": "498", + "kind": 3, + "sv": "integer", + "pos": 639, + "end": 646, + "flags": 1, + "parent": { + "$ref": "497" + }, + "_id": 26 + }, + "arguments": [], + "pos": 639, + "end": 646, + "flags": 1, + "parent": { + "$ref": "495" + }, + "_id": 25 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 527, + "end": 647, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "499", + "kind": 51, + "content": [ + { + "$id": "500", + "kind": 52, + "text": "A 64-bit integer. (`-9,223,372,036,854,775,808` to `9,223,372,036,854,775,807`)", + "pos": 530, + "end": 615, + "flags": 0, + "parent": { + "$ref": "499" + } + } + ], + "tags": [], + "pos": 527, + "end": 617, + "flags": 0, + "parent": { + "$ref": "495" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "495" + } + ], + "name": "int64", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 4 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "501", + "kind": 17, + "id": { + "$id": "502", + "kind": 3, + "sv": "int32", + "pos": 723, + "end": 728, + "flags": 0, + "parent": { + "$ref": "501" + }, + "_id": 27 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "extends": { + "$id": "503", + "kind": 45, + "target": { + "$id": "504", + "kind": 3, + "sv": "int64", + "pos": 737, + "end": 742, + "flags": 1, + "parent": { + "$ref": "503" + }, + "_id": 29 + }, + "arguments": [], + "pos": 737, + "end": 742, + "flags": 1, + "parent": { + "$ref": "501" + }, + "_id": 28 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 649, + "end": 743, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "505", + "kind": 51, + "content": [ + { + "$id": "506", + "kind": 52, + "text": "A 32-bit integer. (`-2,147,483,648` to `2,147,483,647`)", + "pos": 652, + "end": 713, + "flags": 0, + "parent": { + "$ref": "505" + } + } + ], + "tags": [], + "pos": 649, + "end": 715, + "flags": 0, + "parent": { + "$ref": "501" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "501" + } + ], + "name": "int32", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 5 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "507", + "kind": 17, + "id": { + "$id": "508", + "kind": 3, + "sv": "int16", + "pos": 805, + "end": 810, + "flags": 0, + "parent": { + "$ref": "507" + }, + "_id": 30 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "extends": { + "$id": "509", + "kind": 45, + "target": { + "$id": "510", + "kind": 3, + "sv": "int32", + "pos": 819, + "end": 824, + "flags": 1, + "parent": { + "$ref": "509" + }, + "_id": 32 + }, + "arguments": [], + "pos": 819, + "end": 824, + "flags": 1, + "parent": { + "$ref": "507" + }, + "_id": 31 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 745, + "end": 825, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "511", + "kind": 51, + "content": [ + { + "$id": "512", + "kind": 52, + "text": "A 16-bit integer. (`-32,768` to `32,767`)", + "pos": 748, + "end": 795, + "flags": 0, + "parent": { + "$ref": "511" + } + } + ], + "tags": [], + "pos": 745, + "end": 797, + "flags": 0, + "parent": { + "$ref": "507" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "507" + } + ], + "name": "int16", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 6 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "513", + "kind": 17, + "id": { + "$id": "514", + "kind": 3, + "sv": "int8", + "pos": 880, + "end": 884, + "flags": 0, + "parent": { + "$ref": "513" + }, + "_id": 33 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "extends": { + "$id": "515", + "kind": 45, + "target": { + "$id": "516", + "kind": 3, + "sv": "int16", + "pos": 893, + "end": 898, + "flags": 1, + "parent": { + "$ref": "515" + }, + "_id": 35 + }, + "arguments": [], + "pos": 893, + "end": 898, + "flags": 1, + "parent": { + "$ref": "513" + }, + "_id": 34 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 827, + "end": 899, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "517", + "kind": 51, + "content": [ + { + "$id": "518", + "kind": 52, + "text": "A 8-bit integer. (`-128` to `127`)", + "pos": 830, + "end": 870, + "flags": 0, + "parent": { + "$ref": "517" + } + } + ], + "tags": [], + "pos": 827, + "end": 872, + "flags": 0, + "parent": { + "$ref": "513" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "513" + } + ], + "name": "int8", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 7 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "519", + "kind": 17, + "id": { + "$id": "520", + "kind": 3, + "sv": "uint64", + "pos": 983, + "end": 989, + "flags": 0, + "parent": { + "$ref": "519" + }, + "_id": 36 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "extends": { + "$id": "521", + "kind": 45, + "target": { + "$id": "522", + "kind": 3, + "sv": "integer", + "pos": 998, + "end": 1005, + "flags": 1, + "parent": { + "$ref": "521" + }, + "_id": 38 + }, + "arguments": [], + "pos": 998, + "end": 1005, + "flags": 1, + "parent": { + "$ref": "519" + }, + "_id": 37 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 901, + "end": 1006, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "523", + "kind": 51, + "content": [ + { + "$id": "524", + "kind": 52, + "text": "A 64-bit unsigned integer (`0` to `18,446,744,073,709,551,615`)", + "pos": 904, + "end": 973, + "flags": 0, + "parent": { + "$ref": "523" + } + } + ], + "tags": [], + "pos": 901, + "end": 975, + "flags": 0, + "parent": { + "$ref": "519" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "519" + } + ], + "name": "uint64", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 8 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "525", + "kind": 17, + "id": { + "$id": "526", + "kind": 3, + "sv": "uint32", + "pos": 1077, + "end": 1083, + "flags": 0, + "parent": { + "$ref": "525" + }, + "_id": 39 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "extends": { + "$id": "527", + "kind": 45, + "target": { + "$id": "528", + "kind": 3, + "sv": "uint64", + "pos": 1092, + "end": 1098, + "flags": 1, + "parent": { + "$ref": "527" + }, + "_id": 41 + }, + "arguments": [], + "pos": 1092, + "end": 1098, + "flags": 1, + "parent": { + "$ref": "525" + }, + "_id": 40 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 1008, + "end": 1099, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "529", + "kind": 51, + "content": [ + { + "$id": "530", + "kind": 52, + "text": "A 32-bit unsigned integer (`0` to `4,294,967,295`)", + "pos": 1011, + "end": 1067, + "flags": 0, + "parent": { + "$ref": "529" + } + } + ], + "tags": [], + "pos": 1008, + "end": 1069, + "flags": 0, + "parent": { + "$ref": "525" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "525" + } + ], + "name": "uint32", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 9 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "531", + "kind": 17, + "id": { + "$id": "532", + "kind": 3, + "sv": "uint16", + "pos": 1163, + "end": 1169, + "flags": 0, + "parent": { + "$ref": "531" + }, + "_id": 42 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "extends": { + "$id": "533", + "kind": 45, + "target": { + "$id": "534", + "kind": 3, + "sv": "uint32", + "pos": 1178, + "end": 1184, + "flags": 1, + "parent": { + "$ref": "533" + }, + "_id": 44 + }, + "arguments": [], + "pos": 1178, + "end": 1184, + "flags": 1, + "parent": { + "$ref": "531" + }, + "_id": 43 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 1101, + "end": 1185, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "535", + "kind": 51, + "content": [ + { + "$id": "536", + "kind": 52, + "text": "A 16-bit unsigned integer (`0` to `65,535`)", + "pos": 1104, + "end": 1153, + "flags": 0, + "parent": { + "$ref": "535" + } + } + ], + "tags": [], + "pos": 1101, + "end": 1155, + "flags": 0, + "parent": { + "$ref": "531" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "531" + } + ], + "name": "uint16", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 10 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "537", + "kind": 17, + "id": { + "$id": "538", + "kind": 3, + "sv": "uint8", + "pos": 1245, + "end": 1250, + "flags": 0, + "parent": { + "$ref": "537" + }, + "_id": 45 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "extends": { + "$id": "539", + "kind": 45, + "target": { + "$id": "540", + "kind": 3, + "sv": "uint16", + "pos": 1259, + "end": 1265, + "flags": 1, + "parent": { + "$ref": "539" + }, + "_id": 47 + }, + "arguments": [], + "pos": 1259, + "end": 1265, + "flags": 1, + "parent": { + "$ref": "537" + }, + "_id": 46 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 1187, + "end": 1266, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "541", + "kind": 51, + "content": [ + { + "$id": "542", + "kind": 52, + "text": "A 8-bit unsigned integer (`0` to `255`)", + "pos": 1190, + "end": 1235, + "flags": 0, + "parent": { + "$ref": "541" + } + } + ], + "tags": [], + "pos": 1187, + "end": 1237, + "flags": 0, + "parent": { + "$ref": "537" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "537" + } + ], + "name": "uint8", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 11 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "543", + "kind": 17, + "id": { + "$id": "544", + "kind": 3, + "sv": "safeint", + "pos": 1398, + "end": 1405, + "flags": 0, + "parent": { + "$ref": "543" + }, + "_id": 48 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "extends": { + "$id": "545", + "kind": 45, + "target": { + "$id": "546", + "kind": 3, + "sv": "int64", + "pos": 1414, + "end": 1419, + "flags": 1, + "parent": { + "$ref": "545" + }, + "_id": 50 + }, + "arguments": [], + "pos": 1414, + "end": 1419, + "flags": 1, + "parent": { + "$ref": "543" + }, + "_id": 49 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 1268, + "end": 1420, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "547", + "kind": 51, + "content": [ + { + "$id": "548", + "kind": 52, + "text": "An integer that can be serialized to JSON (`−9007199254740991 (−(2^53 − 1))` to `9007199254740991 (2^53 − 1)` )", + "pos": 1271, + "end": 1388, + "flags": 0, + "parent": { + "$ref": "547" + } + } + ], + "tags": [], + "pos": 1268, + "end": 1390, + "flags": 0, + "parent": { + "$ref": "543" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "543" + } + ], + "name": "safeint", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 12 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "549", + "kind": 17, + "id": { + "$id": "550", + "kind": 3, + "sv": "float64", + "pos": 1510, + "end": 1517, + "flags": 0, + "parent": { + "$ref": "549" + }, + "_id": 51 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "extends": { + "$id": "551", + "kind": 45, + "target": { + "$id": "552", + "kind": 3, + "sv": "float", + "pos": 1526, + "end": 1531, + "flags": 1, + "parent": { + "$ref": "551" + }, + "_id": 53 + }, + "arguments": [], + "pos": 1526, + "end": 1531, + "flags": 1, + "parent": { + "$ref": "549" + }, + "_id": 52 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 1422, + "end": 1532, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "553", + "kind": 51, + "content": [ + { + "$id": "554", + "kind": 52, + "text": "A 64 bit floating point number. (`±5.0 × 10^−324` to `±1.7 × 10^308`)", + "pos": 1425, + "end": 1500, + "flags": 0, + "parent": { + "$ref": "553" + } + } + ], + "tags": [], + "pos": 1422, + "end": 1502, + "flags": 0, + "parent": { + "$ref": "549" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "549" + } + ], + "name": "float64", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 13 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "555", + "kind": 17, + "id": { + "$id": "556", + "kind": 3, + "sv": "float32", + "pos": 1620, + "end": 1627, + "flags": 0, + "parent": { + "$ref": "555" + }, + "_id": 54 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "extends": { + "$id": "557", + "kind": 45, + "target": { + "$id": "558", + "kind": 3, + "sv": "float64", + "pos": 1636, + "end": 1643, + "flags": 1, + "parent": { + "$ref": "557" + }, + "_id": 56 + }, + "arguments": [], + "pos": 1636, + "end": 1643, + "flags": 1, + "parent": { + "$ref": "555" + }, + "_id": 55 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 1534, + "end": 1644, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "559", + "kind": 51, + "content": [ + { + "$id": "560", + "kind": 52, + "text": "A 32 bit floating point number. (`±1.5 x 10^−45` to `±3.4 x 10^38`)", + "pos": 1537, + "end": 1610, + "flags": 0, + "parent": { + "$ref": "559" + } + } + ], + "tags": [], + "pos": 1534, + "end": 1612, + "flags": 0, + "parent": { + "$ref": "555" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "555" + } + ], + "name": "float32", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 14 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "561", + "kind": 17, + "id": { + "$id": "562", + "kind": 3, + "sv": "decimal", + "pos": 1822, + "end": 1829, + "flags": 0, + "parent": { + "$ref": "561" + }, + "_id": 57 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "extends": { + "$id": "563", + "kind": 45, + "target": { + "$id": "564", + "kind": 3, + "sv": "numeric", + "pos": 1838, + "end": 1845, + "flags": 1, + "parent": { + "$ref": "563" + }, + "_id": 59 + }, + "arguments": [], + "pos": 1838, + "end": 1845, + "flags": 1, + "parent": { + "$ref": "561" + }, + "_id": 58 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 1646, + "end": 1846, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "565", + "kind": 51, + "content": [ + { + "$id": "566", + "kind": 52, + "text": "A decimal number with any length and precision. This represent any `decimal` value possible.\nIt is commonly represented as `BigDecimal` in some languages.", + "pos": 1649, + "end": 1812, + "flags": 0, + "parent": { + "$ref": "565" + } + } + ], + "tags": [], + "pos": 1646, + "end": 1814, + "flags": 0, + "parent": { + "$ref": "561" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "561" + } + ], + "name": "decimal", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 15 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "567", + "kind": 17, + "id": { + "$id": "568", + "kind": 3, + "sv": "decimal128", + "pos": 1892, + "end": 1902, + "flags": 0, + "parent": { + "$ref": "567" + }, + "_id": 60 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "extends": { + "$id": "569", + "kind": 45, + "target": { + "$id": "570", + "kind": 3, + "sv": "decimal", + "pos": 1911, + "end": 1918, + "flags": 1, + "parent": { + "$ref": "569" + }, + "_id": 62 + }, + "arguments": [], + "pos": 1911, + "end": 1918, + "flags": 1, + "parent": { + "$ref": "567" + }, + "_id": 61 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 1848, + "end": 1919, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "571", + "kind": 51, + "content": [ + { + "$id": "572", + "kind": 52, + "text": "A 128-bit decimal number.", + "pos": 1851, + "end": 1882, + "flags": 0, + "parent": { + "$ref": "571" + } + } + ], + "tags": [], + "pos": 1848, + "end": 1884, + "flags": 0, + "parent": { + "$ref": "567" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "567" + } + ], + "name": "decimal128", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 16 + }, + "locals": { + "duplicates": {} + } + }, + { + "$ref": "464" + }, + { + "$id": "573", + "kind": 17, + "id": { + "$id": "574", + "kind": 3, + "sv": "plainDate", + "pos": 2060, + "end": 2069, + "flags": 0, + "parent": { + "$ref": "573" + }, + "_id": 64 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "members": [ + { + "$id": "575", + "kind": 69, + "id": { + "$id": "576", + "kind": 3, + "sv": "fromISO", + "pos": 2232, + "end": 2239, + "flags": 0, + "parent": { + "$ref": "575" + }, + "_id": 65 + }, + "parameters": [ + { + "$id": "577", + "kind": 27, + "id": { + "$id": "578", + "kind": 3, + "sv": "value", + "pos": 2240, + "end": 2245, + "flags": 0, + "parent": { + "$ref": "577" + }, + "_id": 66 + }, + "type": { + "$id": "579", + "kind": 45, + "target": { + "$id": "580", + "kind": 3, + "sv": "string", + "pos": 2247, + "end": 2253, + "flags": 1, + "parent": { + "$ref": "579" + }, + "_id": 68 + }, + "arguments": [], + "pos": 2247, + "end": 2253, + "flags": 1, + "parent": { + "$ref": "577" + }, + "_id": 67 + }, + "optional": false, + "rest": false, + "pos": 2240, + "end": 2253, + "flags": 0, + "parent": { + "$ref": "575" + }, + "symbol": { + "declarations": [ + { + "$ref": "577" + } + ], + "name": "value", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "573" + } + ], + "name": "plainDate", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 18 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 194 + } + } + ], + "pos": 2074, + "end": 2254, + "flags": 0, + "docs": [ + { + "$id": "581", + "kind": 51, + "content": [ + { + "$id": "582", + "kind": 52, + "text": "Create a plain date from an ISO 8601 string.", + "pos": 2077, + "end": 2133, + "flags": 0, + "parent": { + "$ref": "581" + } + } + ], + "tags": [ + { + "$id": "583", + "kind": 58, + "tagName": { + "$id": "584", + "kind": 3, + "sv": "example", + "pos": 2134, + "end": 2141, + "flags": 0, + "parent": { + "$ref": "583" + } + }, + "content": [ + { + "$id": "585", + "kind": 52, + "text": "```tsp\nconst date = plainDate.fromISO(\"2024-05-06\");\n```", + "pos": 2141, + "end": 2222, + "flags": 0, + "parent": { + "$ref": "583" + } + } + ], + "pos": 2133, + "end": 2222, + "flags": 0, + "parent": { + "$ref": "581" + } + } + ], + "pos": 2074, + "end": 2224, + "flags": 0, + "parent": { + "$ref": "575" + } + } + ], + "directives": [], + "parent": { + "$ref": "573" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "575" + }, + "name": "fromISO", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "573" + } + ], + "name": "plainDate", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 18 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "586", + "kind": 69, + "id": { + "$id": "587", + "kind": 3, + "sv": "now", + "pos": 2407, + "end": 2410, + "flags": 0, + "parent": { + "$ref": "586" + }, + "_id": 69 + }, + "parameters": [], + "pos": 2259, + "end": 2412, + "flags": 0, + "docs": [ + { + "$id": "588", + "kind": 51, + "content": [ + { + "$id": "589", + "kind": 52, + "text": "Create a plain date representing the current date.", + "pos": 2262, + "end": 2324, + "flags": 0, + "parent": { + "$ref": "588" + } + } + ], + "tags": [ + { + "$id": "590", + "kind": 58, + "tagName": { + "$id": "591", + "kind": 3, + "sv": "example", + "pos": 2325, + "end": 2332, + "flags": 0, + "parent": { + "$ref": "590" + } + }, + "content": [ + { + "$id": "592", + "kind": 52, + "text": "```tsp\nconst date = plainDate.now();\n```", + "pos": 2332, + "end": 2397, + "flags": 0, + "parent": { + "$ref": "590" + } + } + ], + "pos": 2324, + "end": 2397, + "flags": 0, + "parent": { + "$ref": "588" + } + } + ], + "pos": 2259, + "end": 2399, + "flags": 0, + "parent": { + "$ref": "586" + } + } + ], + "directives": [], + "parent": { + "$ref": "573" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "586" + }, + "name": "now", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "573" + } + ], + "name": "plainDate", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 18 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 2070, + "end": 2415 + }, + "decorators": [], + "pos": 1982, + "end": 2415, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "593", + "kind": 51, + "content": [ + { + "$id": "594", + "kind": 52, + "text": "A date on a calendar without a time zone, e.g. \"April 10th\"", + "pos": 1985, + "end": 2050, + "flags": 0, + "parent": { + "$ref": "593" + } + } + ], + "tags": [], + "pos": 1982, + "end": 2052, + "flags": 0, + "parent": { + "$ref": "573" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "573" + } + ], + "name": "plainDate", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 18 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "595", + "kind": 17, + "id": { + "$id": "596", + "kind": 3, + "sv": "plainTime", + "pos": 2489, + "end": 2498, + "flags": 0, + "parent": { + "$ref": "595" + }, + "_id": 70 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "members": [ + { + "$id": "597", + "kind": 69, + "id": { + "$id": "598", + "kind": 3, + "sv": "fromISO", + "pos": 2656, + "end": 2663, + "flags": 0, + "parent": { + "$ref": "597" + }, + "_id": 71 + }, + "parameters": [ + { + "$id": "599", + "kind": 27, + "id": { + "$id": "600", + "kind": 3, + "sv": "value", + "pos": 2664, + "end": 2669, + "flags": 0, + "parent": { + "$ref": "599" + }, + "_id": 72 + }, + "type": { + "$id": "601", + "kind": 45, + "target": { + "$id": "602", + "kind": 3, + "sv": "string", + "pos": 2671, + "end": 2677, + "flags": 1, + "parent": { + "$ref": "601" + }, + "_id": 74 + }, + "arguments": [], + "pos": 2671, + "end": 2677, + "flags": 1, + "parent": { + "$ref": "599" + }, + "_id": 73 + }, + "optional": false, + "rest": false, + "pos": 2664, + "end": 2677, + "flags": 0, + "parent": { + "$ref": "597" + }, + "symbol": { + "declarations": [ + { + "$ref": "599" + } + ], + "name": "value", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "595" + } + ], + "name": "plainTime", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 19 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 197 + } + } + ], + "pos": 2503, + "end": 2678, + "flags": 0, + "docs": [ + { + "$id": "603", + "kind": 51, + "content": [ + { + "$id": "604", + "kind": 52, + "text": "Create a plain time from an ISO 8601 string.", + "pos": 2506, + "end": 2562, + "flags": 0, + "parent": { + "$ref": "603" + } + } + ], + "tags": [ + { + "$id": "605", + "kind": 58, + "tagName": { + "$id": "606", + "kind": 3, + "sv": "example", + "pos": 2563, + "end": 2570, + "flags": 0, + "parent": { + "$ref": "605" + } + }, + "content": [ + { + "$id": "607", + "kind": 52, + "text": "```tsp\nconst time = plainTime.fromISO(\"12:34\");\n```", + "pos": 2570, + "end": 2646, + "flags": 0, + "parent": { + "$ref": "605" + } + } + ], + "pos": 2562, + "end": 2646, + "flags": 0, + "parent": { + "$ref": "603" + } + } + ], + "pos": 2503, + "end": 2648, + "flags": 0, + "parent": { + "$ref": "597" + } + } + ], + "directives": [], + "parent": { + "$ref": "595" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "597" + }, + "name": "fromISO", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "595" + } + ], + "name": "plainTime", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 19 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "608", + "kind": 69, + "id": { + "$id": "609", + "kind": 3, + "sv": "now", + "pos": 2831, + "end": 2834, + "flags": 0, + "parent": { + "$ref": "608" + }, + "_id": 75 + }, + "parameters": [], + "pos": 2683, + "end": 2836, + "flags": 0, + "docs": [ + { + "$id": "610", + "kind": 51, + "content": [ + { + "$id": "611", + "kind": 52, + "text": "Create a plain time representing the current time.", + "pos": 2686, + "end": 2748, + "flags": 0, + "parent": { + "$ref": "610" + } + } + ], + "tags": [ + { + "$id": "612", + "kind": 58, + "tagName": { + "$id": "613", + "kind": 3, + "sv": "example", + "pos": 2749, + "end": 2756, + "flags": 0, + "parent": { + "$ref": "612" + } + }, + "content": [ + { + "$id": "614", + "kind": 52, + "text": "```tsp\nconst time = plainTime.now();\n```", + "pos": 2756, + "end": 2821, + "flags": 0, + "parent": { + "$ref": "612" + } + } + ], + "pos": 2748, + "end": 2821, + "flags": 0, + "parent": { + "$ref": "610" + } + } + ], + "pos": 2683, + "end": 2823, + "flags": 0, + "parent": { + "$ref": "608" + } + } + ], + "directives": [], + "parent": { + "$ref": "595" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "608" + }, + "name": "now", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "595" + } + ], + "name": "plainTime", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 19 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 2499, + "end": 2839 + }, + "decorators": [], + "pos": 2417, + "end": 2839, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "615", + "kind": 51, + "content": [ + { + "$id": "616", + "kind": 52, + "text": "A time on a clock without a time zone, e.g. \"3:00 am\"", + "pos": 2420, + "end": 2479, + "flags": 0, + "parent": { + "$ref": "615" + } + } + ], + "tags": [], + "pos": 2417, + "end": 2481, + "flags": 0, + "parent": { + "$ref": "595" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "595" + } + ], + "name": "plainTime", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 19 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "617", + "kind": 17, + "id": { + "$id": "618", + "kind": 3, + "sv": "utcDateTime", + "pos": 2907, + "end": 2918, + "flags": 0, + "parent": { + "$ref": "617" + }, + "_id": 76 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "members": [ + { + "$id": "619", + "kind": 69, + "id": { + "$id": "620", + "kind": 3, + "sv": "fromISO", + "pos": 3087, + "end": 3094, + "flags": 0, + "parent": { + "$ref": "619" + }, + "_id": 77 + }, + "parameters": [ + { + "$id": "621", + "kind": 27, + "id": { + "$id": "622", + "kind": 3, + "sv": "value", + "pos": 3095, + "end": 3100, + "flags": 0, + "parent": { + "$ref": "621" + }, + "_id": 78 + }, + "type": { + "$id": "623", + "kind": 45, + "target": { + "$id": "624", + "kind": 3, + "sv": "string", + "pos": 3102, + "end": 3108, + "flags": 1, + "parent": { + "$ref": "623" + }, + "_id": 80 + }, + "arguments": [], + "pos": 3102, + "end": 3108, + "flags": 1, + "parent": { + "$ref": "621" + }, + "_id": 79 + }, + "optional": false, + "rest": false, + "pos": 3095, + "end": 3108, + "flags": 0, + "parent": { + "$ref": "619" + }, + "symbol": { + "declarations": [ + { + "$ref": "621" + } + ], + "name": "value", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "617" + } + ], + "name": "utcDateTime", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 20 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 200 + } + } + ], + "pos": 2923, + "end": 3109, + "flags": 0, + "docs": [ + { + "$id": "625", + "kind": 51, + "content": [ + { + "$id": "626", + "kind": 52, + "text": "Create a date from an ISO 8601 string.", + "pos": 2926, + "end": 2976, + "flags": 0, + "parent": { + "$ref": "625" + } + } + ], + "tags": [ + { + "$id": "627", + "kind": 58, + "tagName": { + "$id": "628", + "kind": 3, + "sv": "example", + "pos": 2977, + "end": 2984, + "flags": 0, + "parent": { + "$ref": "627" + } + }, + "content": [ + { + "$id": "629", + "kind": 52, + "text": "```tsp\nconst time = utcDateTime.fromISO(\"2024-05-06T12:20-12Z\");\n```", + "pos": 2984, + "end": 3077, + "flags": 0, + "parent": { + "$ref": "627" + } + } + ], + "pos": 2976, + "end": 3077, + "flags": 0, + "parent": { + "$ref": "625" + } + } + ], + "pos": 2923, + "end": 3079, + "flags": 0, + "parent": { + "$ref": "619" + } + } + ], + "directives": [], + "parent": { + "$ref": "617" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "619" + }, + "name": "fromISO", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "617" + } + ], + "name": "utcDateTime", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 20 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "630", + "kind": 69, + "id": { + "$id": "631", + "kind": 3, + "sv": "now", + "pos": 3274, + "end": 3277, + "flags": 0, + "parent": { + "$ref": "630" + }, + "_id": 81 + }, + "parameters": [], + "pos": 3114, + "end": 3279, + "flags": 0, + "docs": [ + { + "$id": "632", + "kind": 51, + "content": [ + { + "$id": "633", + "kind": 52, + "text": "Create a date representing the current date and time in UTC.", + "pos": 3117, + "end": 3189, + "flags": 0, + "parent": { + "$ref": "632" + } + } + ], + "tags": [ + { + "$id": "634", + "kind": 58, + "tagName": { + "$id": "635", + "kind": 3, + "sv": "example", + "pos": 3190, + "end": 3197, + "flags": 0, + "parent": { + "$ref": "634" + } + }, + "content": [ + { + "$id": "636", + "kind": 52, + "text": "```tsp\nconst time = utcDateTime.now();\n```", + "pos": 3197, + "end": 3264, + "flags": 0, + "parent": { + "$ref": "634" + } + } + ], + "pos": 3189, + "end": 3264, + "flags": 0, + "parent": { + "$ref": "632" + } + } + ], + "pos": 3114, + "end": 3266, + "flags": 0, + "parent": { + "$ref": "630" + } + } + ], + "directives": [], + "parent": { + "$ref": "617" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "630" + }, + "name": "now", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "617" + } + ], + "name": "utcDateTime", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 20 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 2919, + "end": 3282 + }, + "decorators": [], + "pos": 2841, + "end": 3282, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "637", + "kind": 51, + "content": [ + { + "$id": "638", + "kind": 52, + "text": "An instant in coordinated universal time (UTC)\"", + "pos": 2844, + "end": 2897, + "flags": 0, + "parent": { + "$ref": "637" + } + } + ], + "tags": [], + "pos": 2841, + "end": 2899, + "flags": 0, + "parent": { + "$ref": "617" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "617" + } + ], + "name": "utcDateTime", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 20 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "639", + "kind": 17, + "id": { + "$id": "640", + "kind": 3, + "sv": "offsetDateTime", + "pos": 3380, + "end": 3394, + "flags": 0, + "parent": { + "$ref": "639" + }, + "_id": 82 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "members": [ + { + "$id": "641", + "kind": 69, + "id": { + "$id": "642", + "kind": 3, + "sv": "fromISO", + "pos": 3570, + "end": 3577, + "flags": 0, + "parent": { + "$ref": "641" + }, + "_id": 83 + }, + "parameters": [ + { + "$id": "643", + "kind": 27, + "id": { + "$id": "644", + "kind": 3, + "sv": "value", + "pos": 3578, + "end": 3583, + "flags": 0, + "parent": { + "$ref": "643" + }, + "_id": 84 + }, + "type": { + "$id": "645", + "kind": 45, + "target": { + "$id": "646", + "kind": 3, + "sv": "string", + "pos": 3585, + "end": 3591, + "flags": 1, + "parent": { + "$ref": "645" + }, + "_id": 86 + }, + "arguments": [], + "pos": 3585, + "end": 3591, + "flags": 1, + "parent": { + "$ref": "643" + }, + "_id": 85 + }, + "optional": false, + "rest": false, + "pos": 3578, + "end": 3591, + "flags": 0, + "parent": { + "$ref": "641" + }, + "symbol": { + "declarations": [ + { + "$ref": "643" + } + ], + "name": "value", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "639" + } + ], + "name": "offsetDateTime", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 21 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 203 + } + } + ], + "pos": 3399, + "end": 3592, + "flags": 0, + "docs": [ + { + "$id": "647", + "kind": 51, + "content": [ + { + "$id": "648", + "kind": 52, + "text": "Create a date from an ISO 8601 string.", + "pos": 3402, + "end": 3452, + "flags": 0, + "parent": { + "$ref": "647" + } + } + ], + "tags": [ + { + "$id": "649", + "kind": 58, + "tagName": { + "$id": "650", + "kind": 3, + "sv": "example", + "pos": 3453, + "end": 3460, + "flags": 0, + "parent": { + "$ref": "649" + } + }, + "content": [ + { + "$id": "651", + "kind": 52, + "text": "```tsp\nconst time = offsetDateTime.fromISO(\"2024-05-06T12:20-12-0700\");\n```", + "pos": 3460, + "end": 3560, + "flags": 0, + "parent": { + "$ref": "649" + } + } + ], + "pos": 3452, + "end": 3560, + "flags": 0, + "parent": { + "$ref": "647" + } + } + ], + "pos": 3399, + "end": 3562, + "flags": 0, + "parent": { + "$ref": "641" + } + } + ], + "directives": [], + "parent": { + "$ref": "639" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "641" + }, + "name": "fromISO", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "639" + } + ], + "name": "offsetDateTime", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 21 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "652", + "kind": 69, + "id": { + "$id": "653", + "kind": 3, + "sv": "now", + "pos": 3765, + "end": 3768, + "flags": 0, + "parent": { + "$ref": "652" + }, + "_id": 87 + }, + "parameters": [], + "pos": 3597, + "end": 3770, + "flags": 0, + "docs": [ + { + "$id": "654", + "kind": 51, + "content": [ + { + "$id": "655", + "kind": 52, + "text": "Create a date representing the current date and time with offset.", + "pos": 3600, + "end": 3677, + "flags": 0, + "parent": { + "$ref": "654" + } + } + ], + "tags": [ + { + "$id": "656", + "kind": 58, + "tagName": { + "$id": "657", + "kind": 3, + "sv": "example", + "pos": 3678, + "end": 3685, + "flags": 0, + "parent": { + "$ref": "656" + } + }, + "content": [ + { + "$id": "658", + "kind": 52, + "text": "```tsp\nconst time = offsetDateTime.now();\n```", + "pos": 3685, + "end": 3755, + "flags": 0, + "parent": { + "$ref": "656" + } + } + ], + "pos": 3677, + "end": 3755, + "flags": 0, + "parent": { + "$ref": "654" + } + } + ], + "pos": 3597, + "end": 3757, + "flags": 0, + "parent": { + "$ref": "652" + } + } + ], + "directives": [], + "parent": { + "$ref": "639" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "652" + }, + "name": "now", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "639" + } + ], + "name": "offsetDateTime", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 21 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 3395, + "end": 3773 + }, + "decorators": [], + "pos": 3284, + "end": 3773, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "659", + "kind": 51, + "content": [ + { + "$id": "660", + "kind": 52, + "text": "A date and time in a particular time zone, e.g. \"April 10th at 3:00am in PST\"", + "pos": 3287, + "end": 3370, + "flags": 0, + "parent": { + "$ref": "659" + } + } + ], + "tags": [], + "pos": 3284, + "end": 3372, + "flags": 0, + "parent": { + "$ref": "639" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "639" + } + ], + "name": "offsetDateTime", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 21 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "661", + "kind": 17, + "id": { + "$id": "662", + "kind": 3, + "sv": "duration", + "pos": 3829, + "end": 3837, + "flags": 0, + "parent": { + "$ref": "661" + }, + "_id": 88 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "members": [ + { + "$id": "663", + "kind": 69, + "id": { + "$id": "664", + "kind": 3, + "sv": "fromISO", + "pos": 3992, + "end": 3999, + "flags": 0, + "parent": { + "$ref": "663" + }, + "_id": 89 + }, + "parameters": [ + { + "$id": "665", + "kind": 27, + "id": { + "$id": "666", + "kind": 3, + "sv": "value", + "pos": 4000, + "end": 4005, + "flags": 0, + "parent": { + "$ref": "665" + }, + "_id": 90 + }, + "type": { + "$id": "667", + "kind": 45, + "target": { + "$id": "668", + "kind": 3, + "sv": "string", + "pos": 4007, + "end": 4013, + "flags": 1, + "parent": { + "$ref": "667" + }, + "_id": 92 + }, + "arguments": [], + "pos": 4007, + "end": 4013, + "flags": 1, + "parent": { + "$ref": "665" + }, + "_id": 91 + }, + "optional": false, + "rest": false, + "pos": 4000, + "end": 4013, + "flags": 0, + "parent": { + "$ref": "663" + }, + "symbol": { + "declarations": [ + { + "$ref": "665" + } + ], + "name": "value", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "661" + } + ], + "name": "duration", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 22 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 206 + } + } + ], + "pos": 3842, + "end": 4014, + "flags": 0, + "docs": [ + { + "$id": "669", + "kind": 51, + "content": [ + { + "$id": "670", + "kind": 52, + "text": "Create a duration from an ISO 8601 string.", + "pos": 3845, + "end": 3899, + "flags": 0, + "parent": { + "$ref": "669" + } + } + ], + "tags": [ + { + "$id": "671", + "kind": 58, + "tagName": { + "$id": "672", + "kind": 3, + "sv": "example", + "pos": 3900, + "end": 3907, + "flags": 0, + "parent": { + "$ref": "671" + } + }, + "content": [ + { + "$id": "673", + "kind": 52, + "text": "```tsp\nconst time = duration.fromISO(\"P1Y1D\");\n```", + "pos": 3907, + "end": 3982, + "flags": 0, + "parent": { + "$ref": "671" + } + } + ], + "pos": 3899, + "end": 3982, + "flags": 0, + "parent": { + "$ref": "669" + } + } + ], + "pos": 3842, + "end": 3984, + "flags": 0, + "parent": { + "$ref": "663" + } + } + ], + "directives": [], + "parent": { + "$ref": "661" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "663" + }, + "name": "fromISO", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "661" + } + ], + "name": "duration", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 22 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 3838, + "end": 4017 + }, + "decorators": [], + "pos": 3775, + "end": 4017, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "674", + "kind": 51, + "content": [ + { + "$id": "675", + "kind": 52, + "text": "A duration/time period. e.g 5s, 10h", + "pos": 3778, + "end": 3819, + "flags": 0, + "parent": { + "$ref": "674" + } + } + ], + "tags": [], + "pos": 3775, + "end": 3821, + "flags": 0, + "parent": { + "$ref": "661" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "661" + } + ], + "name": "duration", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 22 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "676", + "kind": 17, + "id": { + "$id": "677", + "kind": 3, + "sv": "boolean", + "pos": 4077, + "end": 4084, + "flags": 0, + "parent": { + "$ref": "676" + }, + "_id": 93 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 4019, + "end": 4085, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "678", + "kind": 51, + "content": [ + { + "$id": "679", + "kind": 52, + "text": "Boolean with `true` and `false` values.", + "pos": 4022, + "end": 4067, + "flags": 0, + "parent": { + "$ref": "678" + } + } + ], + "tags": [], + "pos": 4019, + "end": 4069, + "flags": 0, + "parent": { + "$ref": "676" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "676" + } + ], + "name": "boolean", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 23 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "680", + "kind": 13, + "id": { + "$id": "681", + "kind": 3, + "sv": "Array", + "pos": 4232, + "end": 4237, + "flags": 0, + "parent": { + "$ref": "680" + }, + "_id": 94 + }, + "templateParameters": [ + { + "$id": "682", + "kind": 46, + "id": { + "$id": "683", + "kind": 3, + "sv": "Element", + "pos": 4238, + "end": 4245, + "flags": 0, + "parent": { + "$ref": "682" + }, + "_id": 100 + }, + "pos": 4238, + "end": 4245, + "flags": 0, + "parent": { + "$ref": "680" + }, + "symbol": { + "declarations": [ + { + "$ref": "682" + } + ], + "name": "Element", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "680" + } + ], + "name": "Array", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 24 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 25 + } + } + ], + "templateParametersRange": { + "pos": 4237, + "end": 4246 + }, + "decorators": [ + { + "$id": "684", + "kind": 5, + "arguments": [ + { + "$id": "685", + "kind": 45, + "target": { + "$id": "686", + "kind": 3, + "sv": "integer", + "pos": 4208, + "end": 4215, + "flags": 1, + "parent": { + "$ref": "685" + }, + "_id": 97 + }, + "arguments": [], + "pos": 4208, + "end": 4215, + "flags": 1, + "parent": { + "$ref": "684" + }, + "_id": 96 + }, + { + "$id": "687", + "kind": 45, + "target": { + "$id": "688", + "kind": 3, + "sv": "Element", + "pos": 4217, + "end": 4224, + "flags": 1, + "parent": { + "$ref": "687" + }, + "_id": 99 + }, + "arguments": [], + "pos": 4217, + "end": 4224, + "flags": 1, + "parent": { + "$ref": "684" + }, + "_id": 98 + } + ], + "target": { + "$id": "689", + "kind": 3, + "sv": "indexer", + "pos": 4200, + "end": 4207, + "flags": 1, + "parent": { + "$ref": "684" + }, + "_id": 95 + }, + "pos": 4199, + "end": 4225, + "flags": 0, + "parent": { + "$ref": "680" + } + } + ], + "properties": [], + "bodyRange": { + "pos": 4247, + "end": 4249 + }, + "pos": 4087, + "end": 4249, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "690", + "kind": 51, + "content": [ + { + "$id": "691", + "kind": 52, + "text": "\n", + "pos": 4090, + "end": 4094, + "flags": 0, + "parent": { + "$ref": "690" + } + } + ], + "tags": [ + { + "$id": "692", + "kind": 58, + "tagName": { + "$id": "693", + "kind": 3, + "sv": "dev", + "pos": 4095, + "end": 4098, + "flags": 0, + "parent": { + "$ref": "692" + } + }, + "content": [ + { + "$id": "694", + "kind": 52, + "text": "Array model type, equivalent to `Element[]`", + "pos": 4098, + "end": 4146, + "flags": 0, + "parent": { + "$ref": "692" + } + } + ], + "pos": 4094, + "end": 4146, + "flags": 0, + "parent": { + "$ref": "690" + } + }, + { + "$id": "695", + "kind": 57, + "tagName": { + "$id": "696", + "kind": 3, + "sv": "template", + "pos": 4147, + "end": 4155, + "flags": 0, + "parent": { + "$ref": "695" + } + }, + "paramName": { + "$id": "697", + "kind": 3, + "sv": "Element", + "pos": 4156, + "end": 4163, + "flags": 0, + "parent": { + "$ref": "695" + } + }, + "content": [ + { + "$id": "698", + "kind": 52, + "text": "The type of the array elements", + "pos": 4164, + "end": 4196, + "flags": 0, + "parent": { + "$ref": "695" + } + } + ], + "pos": 4146, + "end": 4196, + "flags": 0, + "parent": { + "$ref": "690" + } + } + ], + "pos": 4087, + "end": 4198, + "flags": 0, + "parent": { + "$ref": "680" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "680" + } + ], + "name": "Array", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 24 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "699", + "kind": 13, + "id": { + "$id": "700", + "kind": 3, + "sv": "Record", + "pos": 4422, + "end": 4428, + "flags": 0, + "parent": { + "$ref": "699" + }, + "_id": 101 + }, + "templateParameters": [ + { + "$id": "701", + "kind": 46, + "id": { + "$id": "702", + "kind": 3, + "sv": "Element", + "pos": 4429, + "end": 4436, + "flags": 0, + "parent": { + "$ref": "701" + }, + "_id": 107 + }, + "pos": 4429, + "end": 4436, + "flags": 0, + "parent": { + "$ref": "699" + }, + "symbol": { + "declarations": [ + { + "$ref": "701" + } + ], + "name": "Element", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "699" + } + ], + "name": "Record", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 26 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 27 + } + } + ], + "templateParametersRange": { + "pos": 4428, + "end": 4437 + }, + "decorators": [ + { + "$id": "703", + "kind": 5, + "arguments": [ + { + "$id": "704", + "kind": 45, + "target": { + "$id": "705", + "kind": 3, + "sv": "string", + "pos": 4399, + "end": 4405, + "flags": 1, + "parent": { + "$ref": "704" + }, + "_id": 104 + }, + "arguments": [], + "pos": 4399, + "end": 4405, + "flags": 1, + "parent": { + "$ref": "703" + }, + "_id": 103 + }, + { + "$id": "706", + "kind": 45, + "target": { + "$id": "707", + "kind": 3, + "sv": "Element", + "pos": 4407, + "end": 4414, + "flags": 1, + "parent": { + "$ref": "706" + }, + "_id": 106 + }, + "arguments": [], + "pos": 4407, + "end": 4414, + "flags": 1, + "parent": { + "$ref": "703" + }, + "_id": 105 + } + ], + "target": { + "$id": "708", + "kind": 3, + "sv": "indexer", + "pos": 4391, + "end": 4398, + "flags": 1, + "parent": { + "$ref": "703" + }, + "_id": 102 + }, + "pos": 4390, + "end": 4415, + "flags": 0, + "parent": { + "$ref": "699" + } + } + ], + "properties": [], + "bodyRange": { + "pos": 4438, + "end": 4440 + }, + "pos": 4251, + "end": 4440, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "709", + "kind": 51, + "content": [ + { + "$id": "710", + "kind": 52, + "text": "\n", + "pos": 4254, + "end": 4258, + "flags": 0, + "parent": { + "$ref": "709" + } + } + ], + "tags": [ + { + "$id": "711", + "kind": 58, + "tagName": { + "$id": "712", + "kind": 3, + "sv": "dev", + "pos": 4259, + "end": 4262, + "flags": 0, + "parent": { + "$ref": "711" + } + }, + "content": [ + { + "$id": "713", + "kind": 52, + "text": "Model with string properties where all the properties have type `Property`", + "pos": 4262, + "end": 4341, + "flags": 0, + "parent": { + "$ref": "711" + } + } + ], + "pos": 4258, + "end": 4341, + "flags": 0, + "parent": { + "$ref": "709" + } + }, + { + "$id": "714", + "kind": 57, + "tagName": { + "$id": "715", + "kind": 3, + "sv": "template", + "pos": 4342, + "end": 4350, + "flags": 0, + "parent": { + "$ref": "714" + } + }, + "paramName": { + "$id": "716", + "kind": 3, + "sv": "Element", + "pos": 4351, + "end": 4358, + "flags": 0, + "parent": { + "$ref": "714" + } + }, + "content": [ + { + "$id": "717", + "kind": 52, + "text": "The type of the properties", + "pos": 4359, + "end": 4387, + "flags": 0, + "parent": { + "$ref": "714" + } + } + ], + "pos": 4341, + "end": 4387, + "flags": 0, + "parent": { + "$ref": "709" + } + } + ], + "pos": 4251, + "end": 4389, + "flags": 0, + "parent": { + "$ref": "699" + } + } + ], + "parent": { + "$ref": "468" + }, + "symbol": { + "declarations": [ + { + "$ref": "699" + } + ], + "name": "Record", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 26 + }, + "locals": { + "duplicates": {} + } + } + ], + "file": { + "text": "import \"../dist/src/lib/intrinsic/tsp-index.js\";\nimport \"./prototypes.tsp\";\n\n// This file contains all the intrinsic types of typespec. Everything here will always be loaded\nnamespace TypeSpec;\n\n/**\n * Represent a byte array\n */\nscalar bytes;\n\n/**\n * A numeric type\n */\nscalar numeric;\n\n/**\n * A whole number. This represent any `integer` value possible.\n * It is commonly represented as `BigInteger` in some languages.\n */\nscalar integer extends numeric;\n\n/**\n * A number with decimal value\n */\nscalar float extends numeric;\n\n/**\n * A 64-bit integer. (`-9,223,372,036,854,775,808` to `9,223,372,036,854,775,807`)\n */\nscalar int64 extends integer;\n\n/**\n * A 32-bit integer. (`-2,147,483,648` to `2,147,483,647`)\n */\nscalar int32 extends int64;\n\n/**\n * A 16-bit integer. (`-32,768` to `32,767`)\n */\nscalar int16 extends int32;\n\n/**\n * A 8-bit integer. (`-128` to `127`)\n */\nscalar int8 extends int16;\n\n/**\n * A 64-bit unsigned integer (`0` to `18,446,744,073,709,551,615`)\n */\nscalar uint64 extends integer;\n\n/**\n * A 32-bit unsigned integer (`0` to `4,294,967,295`)\n */\nscalar uint32 extends uint64;\n\n/**\n * A 16-bit unsigned integer (`0` to `65,535`)\n */\nscalar uint16 extends uint32;\n\n/**\n * A 8-bit unsigned integer (`0` to `255`)\n */\nscalar uint8 extends uint16;\n\n/**\n * An integer that can be serialized to JSON (`−9007199254740991 (−(2^53 − 1))` to `9007199254740991 (2^53 − 1)` )\n */\nscalar safeint extends int64;\n\n/**\n * A 64 bit floating point number. (`±5.0 × 10^−324` to `±1.7 × 10^308`)\n */\nscalar float64 extends float;\n\n/**\n * A 32 bit floating point number. (`±1.5 x 10^−45` to `±3.4 x 10^38`)\n */\nscalar float32 extends float64;\n\n/**\n * A decimal number with any length and precision. This represent any `decimal` value possible.\n * It is commonly represented as `BigDecimal` in some languages.\n */\nscalar decimal extends numeric;\n\n/**\n * A 128-bit decimal number.\n */\nscalar decimal128 extends decimal;\n\n/**\n * A sequence of textual characters.\n */\nscalar string;\n\n/**\n * A date on a calendar without a time zone, e.g. \"April 10th\"\n */\nscalar plainDate {\n /**\n * Create a plain date from an ISO 8601 string.\n * @example\n *\n * ```tsp\n * const date = plainDate.fromISO(\"2024-05-06\");\n * ```\n */\n init fromISO(value: string);\n\n /**\n * Create a plain date representing the current date.\n * @example\n *\n * ```tsp\n * const date = plainDate.now();\n * ```\n */\n init now();\n}\n\n/**\n * A time on a clock without a time zone, e.g. \"3:00 am\"\n */\nscalar plainTime {\n /**\n * Create a plain time from an ISO 8601 string.\n * @example\n *\n * ```tsp\n * const time = plainTime.fromISO(\"12:34\");\n * ```\n */\n init fromISO(value: string);\n\n /**\n * Create a plain time representing the current time.\n * @example\n *\n * ```tsp\n * const time = plainTime.now();\n * ```\n */\n init now();\n}\n\n/**\n * An instant in coordinated universal time (UTC)\"\n */\nscalar utcDateTime {\n /**\n * Create a date from an ISO 8601 string.\n * @example\n *\n * ```tsp\n * const time = utcDateTime.fromISO(\"2024-05-06T12:20-12Z\");\n * ```\n */\n init fromISO(value: string);\n\n /**\n * Create a date representing the current date and time in UTC.\n * @example\n *\n * ```tsp\n * const time = utcDateTime.now();\n * ```\n */\n init now();\n}\n\n/**\n * A date and time in a particular time zone, e.g. \"April 10th at 3:00am in PST\"\n */\nscalar offsetDateTime {\n /**\n * Create a date from an ISO 8601 string.\n * @example\n *\n * ```tsp\n * const time = offsetDateTime.fromISO(\"2024-05-06T12:20-12-0700\");\n * ```\n */\n init fromISO(value: string);\n\n /**\n * Create a date representing the current date and time with offset.\n * @example\n *\n * ```tsp\n * const time = offsetDateTime.now();\n * ```\n */\n init now();\n}\n\n/**\n * A duration/time period. e.g 5s, 10h\n */\nscalar duration {\n /**\n * Create a duration from an ISO 8601 string.\n * @example\n *\n * ```tsp\n * const time = duration.fromISO(\"P1Y1D\");\n * ```\n */\n init fromISO(value: string);\n}\n\n/**\n * Boolean with `true` and `false` values.\n */\nscalar boolean;\n\n/**\n * @dev Array model type, equivalent to `Element[]`\n * @template Element The type of the array elements\n */\n@indexer(integer, Element)\nmodel Array {}\n\n/**\n * @dev Model with string properties where all the properties have type `Property`\n * @template Element The type of the properties\n */\n@indexer(string, Element)\nmodel Record {}\n", + "path": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/compiler/lib/intrinsics.tsp" + }, + "id": { + "$id": "718", + "kind": 3, + "sv": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/compiler/lib/intrinsics.tsp", + "pos": 0, + "end": 0, + "flags": 8, + "parent": { + "$ref": "468" + } + }, + "namespaces": [ + { + "$ref": "473" + } + ], + "usings": [], + "locals": { + "duplicates": {} + }, + "inScopeNamespaces": [ + { + "$ref": "473" + } + ], + "parseDiagnostics": [], + "comments": [], + "printable": true, + "parseOptions": {}, + "pos": 0, + "end": 4440, + "flags": 0, + "symbol": { + "declarations": [], + "node": { + "$ref": "468" + }, + "name": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/compiler/lib/intrinsics.tsp", + "exports": { + "duplicates": {} + }, + "flags": 32768, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "symbol": { + "declarations": [ + { + "$ref": "464" + } + ], + "name": "string", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "473" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 17 + }, + "locals": { + "duplicates": {} + } + }, + "constructors": {}, + "namespace": { + "$id": "719", + "kind": "Namespace", + "name": "TypeSpec", + "namespace": { + "$id": "720", + "kind": "Namespace", + "name": "", + "node": { + "$id": "721", + "kind": 8, + "decorators": [], + "pos": 0, + "end": 0, + "id": { + "$id": "722", + "kind": 3, + "pos": 0, + "end": 0, + "sv": "global", + "flags": 8 + }, + "symbol": { + "declarations": [ + { + "$ref": "721" + } + ], + "name": "global", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + }, + "id": 166 + }, + "locals": { + "duplicates": {} + }, + "flags": 8 + }, + "models": {}, + "scalars": {}, + "operations": {}, + "namespaces": {}, + "interfaces": {}, + "unions": {}, + "enums": {}, + "decoratorDeclarations": {}, + "functionDeclarations": {}, + "decorators": [], + "isFinished": true, + "entityKind": "Type" + }, + "node": { + "$ref": "473" + }, + "models": {}, + "scalars": {}, + "operations": {}, + "namespaces": {}, + "interfaces": {}, + "unions": {}, + "enums": {}, + "decoratorDeclarations": {}, + "functionDeclarations": {}, + "decorators": [], + "isFinished": true, + "entityKind": "Type" + }, + "decorators": [ + { + "args": [ + { + "value": { + "$id": "723", + "kind": "String", + "value": "self", + "isFinished": true, + "entityKind": "Type" + }, + "jsValue": "self" + }, + { + "value": { + "$id": "724", + "kind": "String", + "value": "A sequence of textual characters.", + "isFinished": true, + "entityKind": "Type" + }, + "jsValue": "A sequence of textual characters." + } + ] + } + ], + "derivedScalars": [ + { + "$id": "725", + "kind": "Scalar", + "name": "url", + "node": { + "$id": "726", + "kind": 17, + "id": { + "$id": "727", + "kind": 3, + "sv": "url", + "pos": 363, + "end": 366, + "flags": 0, + "parent": { + "$ref": "726" + }, + "_id": 153 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "extends": { + "$id": "728", + "kind": 45, + "target": { + "$id": "729", + "kind": 3, + "sv": "string", + "pos": 375, + "end": 381, + "flags": 1, + "parent": { + "$ref": "728" + }, + "_id": 155 + }, + "arguments": [], + "pos": 375, + "end": 381, + "flags": 1, + "parent": { + "$ref": "726" + }, + "_id": 154 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "pos": 277, + "end": 382, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "730", + "kind": 51, + "content": [ + { + "$id": "731", + "kind": 52, + "text": "Represent a URL string as described by https://url.spec.whatwg.org/", + "pos": 280, + "end": 353, + "flags": 0, + "parent": { + "$ref": "730" + } + } + ], + "tags": [], + "pos": 277, + "end": 355, + "flags": 0, + "parent": { + "$ref": "726" + } + } + ], + "parent": { + "$id": "732", + "kind": 0, + "statements": [ + { + "$id": "733", + "kind": 8, + "decorators": [], + "docs": [], + "id": { + "$id": "734", + "kind": 3, + "sv": "TypeSpec", + "pos": 10, + "end": 18, + "flags": 0, + "parent": { + "$ref": "733" + }, + "_id": 127 + }, + "locals": { + "duplicates": {} + }, + "directives": [], + "pos": 0, + "end": 19, + "flags": 0, + "parent": { + "$ref": "732" + }, + "symbol": { + "declarations": [ + { + "$ref": "733" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "735", + "kind": 17, + "id": { + "$id": "736", + "kind": 3, + "sv": "unixTimestamp32", + "pos": 239, + "end": 254, + "flags": 0, + "parent": { + "$ref": "735" + }, + "_id": 128 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "extends": { + "$id": "737", + "kind": 45, + "target": { + "$id": "738", + "kind": 3, + "sv": "utcDateTime", + "pos": 263, + "end": 274, + "flags": 1, + "parent": { + "$ref": "737" + }, + "_id": 130 + }, + "arguments": [], + "pos": 263, + "end": 274, + "flags": 1, + "parent": { + "$ref": "735" + }, + "_id": 129 + }, + "members": [], + "bodyRange": { + "pos": -1, + "end": -1 + }, + "decorators": [ + { + "$id": "739", + "kind": 5, + "arguments": [ + { + "$id": "740", + "kind": 32, + "value": "unixTimestamp", + "pos": 208, + "end": 223, + "flags": 0, + "parent": { + "$ref": "739" + } + }, + { + "$id": "741", + "kind": 45, + "target": { + "$id": "742", + "kind": 3, + "sv": "int32", + "pos": 225, + "end": 230, + "flags": 1, + "parent": { + "$ref": "741" + }, + "_id": 152 + }, + "arguments": [], + "pos": 225, + "end": 230, + "flags": 1, + "parent": { + "$ref": "739" + }, + "_id": 151 + } + ], + "target": { + "$id": "743", + "kind": 3, + "sv": "encode", + "pos": 201, + "end": 207, + "flags": 1, + "parent": { + "$ref": "739" + }, + "_id": 131 + }, + "pos": 200, + "end": 231, + "flags": 0, + "parent": { + "$ref": "735" + } + } + ], + "pos": 21, + "end": 275, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "744", + "kind": 51, + "content": [ + { + "$id": "745", + "kind": 52, + "text": "Represent a 32-bit unix timestamp datetime with 1s of granularity.\nIt measures time by the number of seconds that have elapsed since 00:00:00 UTC on 1 January 1970.", + "pos": 24, + "end": 197, + "flags": 0, + "parent": { + "$ref": "744" + } + } + ], + "tags": [], + "pos": 21, + "end": 199, + "flags": 0, + "parent": { + "$ref": "735" + } + } + ], + "parent": { + "$ref": "732" + }, + "symbol": { + "declarations": [ + { + "$ref": "735" + } + ], + "name": "unixTimestamp32", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "733" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 36 + }, + "locals": { + "duplicates": {} + } + }, + { + "$ref": "726" + }, + { + "$id": "746", + "kind": 13, + "id": { + "$id": "747", + "kind": 3, + "sv": "OptionalProperties", + "pos": 601, + "end": 619, + "flags": 0, + "parent": { + "$ref": "746" + }, + "_id": 156 + }, + "templateParameters": [ + { + "$id": "748", + "kind": 46, + "id": { + "$id": "749", + "kind": 3, + "sv": "Source", + "pos": 620, + "end": 626, + "flags": 0, + "parent": { + "$ref": "748" + }, + "_id": 159 + }, + "pos": 620, + "end": 626, + "flags": 0, + "parent": { + "$ref": "746" + }, + "symbol": { + "declarations": [ + { + "$ref": "748" + } + ], + "name": "Source", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "746" + } + ], + "name": "OptionalProperties", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "733" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 41 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 42 + } + } + ], + "templateParametersRange": { + "pos": 619, + "end": 627 + }, + "decorators": [ + { + "$id": "750", + "kind": 5, + "arguments": [ + { + "$id": "751", + "kind": 32, + "value": "The template for adding optional properties.", + "pos": 523, + "end": 569, + "flags": 0, + "parent": { + "$ref": "750" + } + } + ], + "target": { + "$id": "752", + "kind": 3, + "sv": "doc", + "pos": 519, + "end": 522, + "flags": 1, + "parent": { + "$ref": "750" + }, + "_id": 160 + }, + "pos": 518, + "end": 570, + "flags": 0, + "parent": { + "$ref": "746" + } + }, + { + "$id": "753", + "kind": 5, + "arguments": [], + "target": { + "$id": "754", + "kind": 3, + "sv": "withOptionalProperties", + "pos": 572, + "end": 594, + "flags": 1, + "parent": { + "$ref": "753" + }, + "_id": 167 + }, + "pos": 571, + "end": 594, + "flags": 0, + "parent": { + "$ref": "746" + } + } + ], + "properties": [ + { + "$id": "755", + "kind": 16, + "target": { + "$id": "756", + "kind": 45, + "target": { + "$id": "757", + "kind": 3, + "sv": "Source", + "pos": 635, + "end": 641, + "flags": 1, + "parent": { + "$ref": "756" + }, + "_id": 158 + }, + "arguments": [], + "pos": 635, + "end": 641, + "flags": 1, + "parent": { + "$ref": "755" + }, + "_id": 157 + }, + "pos": 632, + "end": 641, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "746" + } + } + ], + "bodyRange": { + "pos": 628, + "end": 644 + }, + "pos": 384, + "end": 644, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "758", + "kind": 51, + "content": [ + { + "$id": "759", + "kind": 52, + "text": "Represents a collection of optional properties.", + "pos": 387, + "end": 445, + "flags": 0, + "parent": { + "$ref": "758" + } + } + ], + "tags": [ + { + "$id": "760", + "kind": 57, + "tagName": { + "$id": "761", + "kind": 3, + "sv": "template", + "pos": 446, + "end": 454, + "flags": 0, + "parent": { + "$ref": "760" + } + }, + "paramName": { + "$id": "762", + "kind": 3, + "sv": "Source", + "pos": 455, + "end": 461, + "flags": 0, + "parent": { + "$ref": "760" + } + }, + "content": [ + { + "$id": "763", + "kind": 52, + "text": "An object whose spread properties are all optional.", + "pos": 462, + "end": 515, + "flags": 0, + "parent": { + "$ref": "760" + } + } + ], + "pos": 445, + "end": 515, + "flags": 0, + "parent": { + "$ref": "758" + } + } + ], + "pos": 384, + "end": 517, + "flags": 0, + "parent": { + "$ref": "746" + } + } + ], + "parent": { + "$ref": "732" + }, + "symbol": { + "declarations": [ + { + "$ref": "746" + } + ], + "name": "OptionalProperties", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "733" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 41 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "764", + "kind": 13, + "id": { + "$id": "765", + "kind": 3, + "sv": "UpdateableProperties", + "pos": 871, + "end": 891, + "flags": 0, + "parent": { + "$ref": "764" + }, + "_id": 173 + }, + "templateParameters": [ + { + "$id": "766", + "kind": 46, + "id": { + "$id": "767", + "kind": 3, + "sv": "Source", + "pos": 892, + "end": 898, + "flags": 0, + "parent": { + "$ref": "766" + }, + "_id": 176 + }, + "pos": 892, + "end": 898, + "flags": 0, + "parent": { + "$ref": "764" + }, + "symbol": { + "declarations": [ + { + "$ref": "766" + } + ], + "name": "Source", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "764" + } + ], + "name": "UpdateableProperties", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "733" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 45 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 46 + } + } + ], + "templateParametersRange": { + "pos": 891, + "end": 899 + }, + "decorators": [ + { + "$id": "768", + "kind": 5, + "arguments": [ + { + "$id": "769", + "kind": 32, + "value": "The template for adding updateable properties.", + "pos": 789, + "end": 837, + "flags": 0, + "parent": { + "$ref": "768" + } + } + ], + "target": { + "$id": "770", + "kind": 3, + "sv": "doc", + "pos": 785, + "end": 788, + "flags": 1, + "parent": { + "$ref": "768" + }, + "_id": 177 + }, + "pos": 784, + "end": 838, + "flags": 0, + "parent": { + "$ref": "764" + } + }, + { + "$id": "771", + "kind": 5, + "arguments": [], + "target": { + "$id": "772", + "kind": 3, + "sv": "withUpdateableProperties", + "pos": 840, + "end": 864, + "flags": 1, + "parent": { + "$ref": "771" + }, + "_id": 178 + }, + "pos": 839, + "end": 864, + "flags": 0, + "parent": { + "$ref": "764" + } + } + ], + "properties": [ + { + "$id": "773", + "kind": 16, + "target": { + "$id": "774", + "kind": 45, + "target": { + "$id": "775", + "kind": 3, + "sv": "Source", + "pos": 907, + "end": 913, + "flags": 1, + "parent": { + "$ref": "774" + }, + "_id": 175 + }, + "arguments": [], + "pos": 907, + "end": 913, + "flags": 1, + "parent": { + "$ref": "773" + }, + "_id": 174 + }, + "pos": 904, + "end": 913, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "764" + } + } + ], + "bodyRange": { + "pos": 900, + "end": 916 + }, + "pos": 646, + "end": 916, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "776", + "kind": 51, + "content": [ + { + "$id": "777", + "kind": 52, + "text": "Represents a collection of updateable properties.", + "pos": 649, + "end": 709, + "flags": 0, + "parent": { + "$ref": "776" + } + } + ], + "tags": [ + { + "$id": "778", + "kind": 57, + "tagName": { + "$id": "779", + "kind": 3, + "sv": "template", + "pos": 710, + "end": 718, + "flags": 0, + "parent": { + "$ref": "778" + } + }, + "paramName": { + "$id": "780", + "kind": 3, + "sv": "Source", + "pos": 719, + "end": 725, + "flags": 0, + "parent": { + "$ref": "778" + } + }, + "content": [ + { + "$id": "781", + "kind": 52, + "text": "An object whose spread properties are all updateable.", + "pos": 726, + "end": 781, + "flags": 0, + "parent": { + "$ref": "778" + } + } + ], + "pos": 709, + "end": 781, + "flags": 0, + "parent": { + "$ref": "776" + } + } + ], + "pos": 646, + "end": 783, + "flags": 0, + "parent": { + "$ref": "764" + } + } + ], + "parent": { + "$ref": "732" + }, + "symbol": { + "declarations": [ + { + "$ref": "764" + } + ], + "name": "UpdateableProperties", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "733" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 45 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "782", + "kind": 13, + "id": { + "$id": "783", + "kind": 3, + "sv": "OmitProperties", + "pos": 1167, + "end": 1181, + "flags": 0, + "parent": { + "$ref": "782" + }, + "_id": 183 + }, + "templateParameters": [ + { + "$id": "784", + "kind": 46, + "id": { + "$id": "785", + "kind": 3, + "sv": "Source", + "pos": 1182, + "end": 1188, + "flags": 0, + "parent": { + "$ref": "784" + }, + "_id": 186 + }, + "pos": 1182, + "end": 1188, + "flags": 0, + "parent": { + "$ref": "782" + }, + "symbol": { + "declarations": [ + { + "$ref": "784" + } + ], + "name": "Source", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "782" + } + ], + "name": "OmitProperties", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "733" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 47 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 48 + } + }, + { + "$id": "786", + "kind": 46, + "id": { + "$id": "787", + "kind": 3, + "sv": "Keys", + "pos": 1190, + "end": 1194, + "flags": 0, + "parent": { + "$ref": "786" + }, + "_id": 203 + }, + "constraint": { + "$id": "788", + "kind": 45, + "target": { + "$id": "789", + "kind": 3, + "sv": "string", + "pos": 1203, + "end": 1209, + "flags": 1, + "parent": { + "$ref": "788" + }, + "_id": 202 + }, + "arguments": [], + "pos": 1203, + "end": 1209, + "flags": 1, + "parent": { + "$ref": "786" + }, + "_id": 201 + }, + "pos": 1190, + "end": 1209, + "flags": 0, + "parent": { + "$ref": "782" + }, + "symbol": { + "declarations": [ + { + "$ref": "786" + } + ], + "name": "Keys", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "782" + } + ], + "name": "OmitProperties", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "733" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 47 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 50 + } + } + ], + "templateParametersRange": { + "pos": 1181, + "end": 1210 + }, + "decorators": [ + { + "$id": "790", + "kind": 5, + "arguments": [ + { + "$id": "791", + "kind": 32, + "value": "The template for omitting properties.", + "pos": 1088, + "end": 1127, + "flags": 0, + "parent": { + "$ref": "790" + } + } + ], + "target": { + "$id": "792", + "kind": 3, + "sv": "doc", + "pos": 1084, + "end": 1087, + "flags": 1, + "parent": { + "$ref": "790" + }, + "_id": 187 + }, + "pos": 1083, + "end": 1128, + "flags": 0, + "parent": { + "$ref": "782" + } + }, + { + "$id": "793", + "kind": 5, + "arguments": [ + { + "$id": "794", + "kind": 45, + "target": { + "$id": "795", + "kind": 3, + "sv": "Keys", + "pos": 1155, + "end": 1159, + "flags": 1, + "parent": { + "$ref": "794" + }, + "_id": 200 + }, + "arguments": [], + "pos": 1155, + "end": 1159, + "flags": 1, + "parent": { + "$ref": "793" + }, + "_id": 199 + } + ], + "target": { + "$id": "796", + "kind": 3, + "sv": "withoutOmittedProperties", + "pos": 1130, + "end": 1154, + "flags": 1, + "parent": { + "$ref": "793" + }, + "_id": 188 + }, + "pos": 1129, + "end": 1160, + "flags": 0, + "parent": { + "$ref": "782" + } + } + ], + "properties": [ + { + "$id": "797", + "kind": 16, + "target": { + "$id": "798", + "kind": 45, + "target": { + "$id": "799", + "kind": 3, + "sv": "Source", + "pos": 1218, + "end": 1224, + "flags": 1, + "parent": { + "$ref": "798" + }, + "_id": 185 + }, + "arguments": [], + "pos": 1218, + "end": 1224, + "flags": 1, + "parent": { + "$ref": "797" + }, + "_id": 184 + }, + "pos": 1215, + "end": 1224, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "782" + } + } + ], + "bodyRange": { + "pos": 1211, + "end": 1227 + }, + "pos": 918, + "end": 1227, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "800", + "kind": 51, + "content": [ + { + "$id": "801", + "kind": 52, + "text": "Represents a collection of omitted properties.", + "pos": 921, + "end": 978, + "flags": 0, + "parent": { + "$ref": "800" + } + } + ], + "tags": [ + { + "$id": "802", + "kind": 57, + "tagName": { + "$id": "803", + "kind": 3, + "sv": "template", + "pos": 979, + "end": 987, + "flags": 0, + "parent": { + "$ref": "802" + } + }, + "paramName": { + "$id": "804", + "kind": 3, + "sv": "Source", + "pos": 988, + "end": 994, + "flags": 0, + "parent": { + "$ref": "802" + } + }, + "content": [ + { + "$id": "805", + "kind": 52, + "text": "An object whose properties are spread.", + "pos": 995, + "end": 1037, + "flags": 0, + "parent": { + "$ref": "802" + } + } + ], + "pos": 978, + "end": 1037, + "flags": 0, + "parent": { + "$ref": "800" + } + }, + { + "$id": "806", + "kind": 57, + "tagName": { + "$id": "807", + "kind": 3, + "sv": "template", + "pos": 1038, + "end": 1046, + "flags": 0, + "parent": { + "$ref": "806" + } + }, + "paramName": { + "$id": "808", + "kind": 3, + "sv": "Keys", + "pos": 1047, + "end": 1051, + "flags": 0, + "parent": { + "$ref": "806" + } + }, + "content": [ + { + "$id": "809", + "kind": 52, + "text": "The property keys to omit.", + "pos": 1052, + "end": 1080, + "flags": 0, + "parent": { + "$ref": "806" + } + } + ], + "pos": 1037, + "end": 1080, + "flags": 0, + "parent": { + "$ref": "800" + } + } + ], + "pos": 918, + "end": 1082, + "flags": 0, + "parent": { + "$ref": "782" + } + } + ], + "parent": { + "$ref": "732" + }, + "symbol": { + "declarations": [ + { + "$ref": "782" + } + ], + "name": "OmitProperties", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "733" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 47 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "810", + "kind": 13, + "id": { + "$id": "811", + "kind": 3, + "sv": "PickProperties", + "pos": 1506, + "end": 1520, + "flags": 0, + "parent": { + "$ref": "810" + }, + "_id": 204 + }, + "templateParameters": [ + { + "$id": "812", + "kind": 46, + "id": { + "$id": "813", + "kind": 3, + "sv": "Source", + "pos": 1521, + "end": 1527, + "flags": 0, + "parent": { + "$ref": "812" + }, + "_id": 207 + }, + "pos": 1521, + "end": 1527, + "flags": 0, + "parent": { + "$ref": "810" + }, + "symbol": { + "declarations": [ + { + "$ref": "812" + } + ], + "name": "Source", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "810" + } + ], + "name": "PickProperties", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "733" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 51 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 52 + } + }, + { + "$id": "814", + "kind": 46, + "id": { + "$id": "815", + "kind": 3, + "sv": "Keys", + "pos": 1529, + "end": 1533, + "flags": 0, + "parent": { + "$ref": "814" + }, + "_id": 223 + }, + "constraint": { + "$id": "816", + "kind": 45, + "target": { + "$id": "817", + "kind": 3, + "sv": "string", + "pos": 1542, + "end": 1548, + "flags": 1, + "parent": { + "$ref": "816" + }, + "_id": 222 + }, + "arguments": [], + "pos": 1542, + "end": 1548, + "flags": 1, + "parent": { + "$ref": "814" + }, + "_id": 221 + }, + "pos": 1529, + "end": 1548, + "flags": 0, + "parent": { + "$ref": "810" + }, + "symbol": { + "declarations": [ + { + "$ref": "814" + } + ], + "name": "Keys", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "810" + } + ], + "name": "PickProperties", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "733" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 51 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 53 + } + } + ], + "templateParametersRange": { + "pos": 1520, + "end": 1549 + }, + "decorators": [ + { + "$id": "818", + "kind": 5, + "arguments": [ + { + "$id": "819", + "kind": 32, + "value": "The template for picking properties.", + "pos": 1432, + "end": 1470, + "flags": 0, + "parent": { + "$ref": "818" + } + } + ], + "target": { + "$id": "820", + "kind": 3, + "sv": "doc", + "pos": 1428, + "end": 1431, + "flags": 1, + "parent": { + "$ref": "818" + }, + "_id": 208 + }, + "pos": 1427, + "end": 1471, + "flags": 0, + "parent": { + "$ref": "810" + } + }, + { + "$id": "821", + "kind": 5, + "arguments": [ + { + "$id": "822", + "kind": 45, + "target": { + "$id": "823", + "kind": 3, + "sv": "Keys", + "pos": 1494, + "end": 1498, + "flags": 1, + "parent": { + "$ref": "822" + }, + "_id": 220 + }, + "arguments": [], + "pos": 1494, + "end": 1498, + "flags": 1, + "parent": { + "$ref": "821" + }, + "_id": 219 + } + ], + "target": { + "$id": "824", + "kind": 3, + "sv": "withPickedProperties", + "pos": 1473, + "end": 1493, + "flags": 1, + "parent": { + "$ref": "821" + }, + "_id": 209 + }, + "pos": 1472, + "end": 1499, + "flags": 0, + "parent": { + "$ref": "810" + } + } + ], + "properties": [ + { + "$id": "825", + "kind": 16, + "target": { + "$id": "826", + "kind": 45, + "target": { + "$id": "827", + "kind": 3, + "sv": "Source", + "pos": 1557, + "end": 1563, + "flags": 1, + "parent": { + "$ref": "826" + }, + "_id": 206 + }, + "arguments": [], + "pos": 1557, + "end": 1563, + "flags": 1, + "parent": { + "$ref": "825" + }, + "_id": 205 + }, + "pos": 1554, + "end": 1563, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "810" + } + } + ], + "bodyRange": { + "pos": 1550, + "end": 1566 + }, + "pos": 1229, + "end": 1566, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "828", + "kind": 51, + "content": [ + { + "$id": "829", + "kind": 52, + "text": "Represents a collection of properties with only the specified keys included.", + "pos": 1232, + "end": 1319, + "flags": 0, + "parent": { + "$ref": "828" + } + } + ], + "tags": [ + { + "$id": "830", + "kind": 57, + "tagName": { + "$id": "831", + "kind": 3, + "sv": "template", + "pos": 1320, + "end": 1328, + "flags": 0, + "parent": { + "$ref": "830" + } + }, + "paramName": { + "$id": "832", + "kind": 3, + "sv": "Source", + "pos": 1329, + "end": 1335, + "flags": 0, + "parent": { + "$ref": "830" + } + }, + "content": [ + { + "$id": "833", + "kind": 52, + "text": "An object whose properties are spread.", + "pos": 1336, + "end": 1378, + "flags": 0, + "parent": { + "$ref": "830" + } + } + ], + "pos": 1319, + "end": 1378, + "flags": 0, + "parent": { + "$ref": "828" + } + }, + { + "$id": "834", + "kind": 57, + "tagName": { + "$id": "835", + "kind": 3, + "sv": "template", + "pos": 1379, + "end": 1387, + "flags": 0, + "parent": { + "$ref": "834" + } + }, + "paramName": { + "$id": "836", + "kind": 3, + "sv": "Keys", + "pos": 1388, + "end": 1392, + "flags": 0, + "parent": { + "$ref": "834" + } + }, + "content": [ + { + "$id": "837", + "kind": 52, + "text": "The property keys to include.", + "pos": 1393, + "end": 1424, + "flags": 0, + "parent": { + "$ref": "834" + } + } + ], + "pos": 1378, + "end": 1424, + "flags": 0, + "parent": { + "$ref": "828" + } + } + ], + "pos": 1229, + "end": 1426, + "flags": 0, + "parent": { + "$ref": "810" + } + } + ], + "parent": { + "$ref": "732" + }, + "symbol": { + "declarations": [ + { + "$ref": "810" + } + ], + "name": "PickProperties", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "733" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 51 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "838", + "kind": 13, + "id": { + "$id": "839", + "kind": 3, + "sv": "OmitDefaults", + "pos": 1755, + "end": 1767, + "flags": 0, + "parent": { + "$ref": "838" + }, + "_id": 224 + }, + "templateParameters": [ + { + "$id": "840", + "kind": 46, + "id": { + "$id": "841", + "kind": 3, + "sv": "Source", + "pos": 1768, + "end": 1774, + "flags": 0, + "parent": { + "$ref": "840" + }, + "_id": 227 + }, + "pos": 1768, + "end": 1774, + "flags": 0, + "parent": { + "$ref": "838" + }, + "symbol": { + "declarations": [ + { + "$ref": "840" + } + ], + "name": "Source", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "838" + } + ], + "name": "OmitDefaults", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "733" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 54 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 55 + } + } + ], + "templateParametersRange": { + "pos": 1767, + "end": 1775 + }, + "decorators": [ + { + "$id": "842", + "kind": 5, + "arguments": [], + "target": { + "$id": "843", + "kind": 3, + "sv": "withoutDefaultValues", + "pos": 1728, + "end": 1748, + "flags": 1, + "parent": { + "$ref": "842" + }, + "_id": 228 + }, + "pos": 1727, + "end": 1748, + "flags": 0, + "parent": { + "$ref": "838" + } + } + ], + "properties": [ + { + "$id": "844", + "kind": 16, + "target": { + "$id": "845", + "kind": 45, + "target": { + "$id": "846", + "kind": 3, + "sv": "Source", + "pos": 1783, + "end": 1789, + "flags": 1, + "parent": { + "$ref": "845" + }, + "_id": 226 + }, + "arguments": [], + "pos": 1783, + "end": 1789, + "flags": 1, + "parent": { + "$ref": "844" + }, + "_id": 225 + }, + "pos": 1780, + "end": 1789, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "838" + } + } + ], + "bodyRange": { + "pos": 1776, + "end": 1792 + }, + "pos": 1568, + "end": 1792, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "847", + "kind": 51, + "content": [ + { + "$id": "848", + "kind": 52, + "text": "Represents a collection of properties with default values omitted.", + "pos": 1571, + "end": 1648, + "flags": 0, + "parent": { + "$ref": "847" + } + } + ], + "tags": [ + { + "$id": "849", + "kind": 57, + "tagName": { + "$id": "850", + "kind": 3, + "sv": "template", + "pos": 1649, + "end": 1657, + "flags": 0, + "parent": { + "$ref": "849" + } + }, + "paramName": { + "$id": "851", + "kind": 3, + "sv": "Source", + "pos": 1658, + "end": 1664, + "flags": 0, + "parent": { + "$ref": "849" + } + }, + "content": [ + { + "$id": "852", + "kind": 52, + "text": "An object whose spread property defaults are all omitted.", + "pos": 1665, + "end": 1724, + "flags": 0, + "parent": { + "$ref": "849" + } + } + ], + "pos": 1648, + "end": 1724, + "flags": 0, + "parent": { + "$ref": "847" + } + } + ], + "pos": 1568, + "end": 1726, + "flags": 0, + "parent": { + "$ref": "838" + } + } + ], + "parent": { + "$ref": "732" + }, + "symbol": { + "declarations": [ + { + "$ref": "838" + } + ], + "name": "OmitDefaults", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "733" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 54 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "853", + "kind": 13, + "id": { + "$id": "854", + "kind": 3, + "sv": "DefaultKeyVisibility", + "pos": 2113, + "end": 2133, + "flags": 0, + "parent": { + "$ref": "853" + }, + "_id": 233 + }, + "templateParameters": [ + { + "$id": "855", + "kind": 46, + "id": { + "$id": "856", + "kind": 3, + "sv": "Source", + "pos": 2134, + "end": 2140, + "flags": 0, + "parent": { + "$ref": "855" + }, + "_id": 236 + }, + "pos": 2134, + "end": 2140, + "flags": 0, + "parent": { + "$ref": "853" + }, + "symbol": { + "declarations": [ + { + "$ref": "855" + } + ], + "name": "Source", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "853" + } + ], + "name": "DefaultKeyVisibility", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "733" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 56 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 57 + } + }, + { + "$id": "857", + "kind": 46, + "id": { + "$id": "858", + "kind": 3, + "sv": "Visibility", + "pos": 2142, + "end": 2152, + "flags": 0, + "parent": { + "$ref": "857" + }, + "_id": 248 + }, + "constraint": { + "$id": "859", + "kind": 44, + "target": { + "$id": "860", + "kind": 45, + "target": { + "$id": "861", + "kind": 7, + "base": { + "$id": "862", + "kind": 3, + "sv": "Reflection", + "pos": 2169, + "end": 2179, + "flags": 1, + "parent": { + "$ref": "861" + }, + "_id": 251 + }, + "id": { + "$id": "863", + "kind": 3, + "sv": "EnumMember", + "pos": 2180, + "end": 2190, + "flags": 1, + "parent": { + "$ref": "861" + }, + "_id": 252 + }, + "selector": ".", + "pos": 2169, + "end": 2190, + "flags": 1, + "parent": { + "$ref": "860" + }, + "_id": 250 + }, + "arguments": [], + "pos": 2169, + "end": 2190, + "flags": 1, + "parent": { + "$ref": "859" + }, + "_id": 249 + }, + "pos": 2161, + "end": 2190, + "flags": 0, + "parent": { + "$ref": "857" + } + }, + "pos": 2142, + "end": 2190, + "flags": 0, + "parent": { + "$ref": "853" + }, + "symbol": { + "declarations": [ + { + "$ref": "857" + } + ], + "name": "Visibility", + "flags": 1049600, + "parent": { + "declarations": [ + { + "$ref": "853" + } + ], + "name": "DefaultKeyVisibility", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "733" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 56 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 58 + } + } + ], + "templateParametersRange": { + "pos": 2133, + "end": 2191 + }, + "decorators": [ + { + "$id": "864", + "kind": 5, + "arguments": [ + { + "$id": "865", + "kind": 32, + "value": "The template for setting the default visibility of key properties.", + "pos": 1999, + "end": 2067, + "flags": 0, + "parent": { + "$ref": "864" + } + } + ], + "target": { + "$id": "866", + "kind": 3, + "sv": "doc", + "pos": 1995, + "end": 1998, + "flags": 1, + "parent": { + "$ref": "864" + }, + "_id": 237 + }, + "pos": 1994, + "end": 2068, + "flags": 0, + "parent": { + "$ref": "853" + } + }, + { + "$id": "867", + "kind": 5, + "arguments": [ + { + "$id": "868", + "kind": 45, + "target": { + "$id": "869", + "kind": 3, + "sv": "Visibility", + "pos": 2095, + "end": 2105, + "flags": 1, + "parent": { + "$ref": "868" + }, + "_id": 247 + }, + "arguments": [], + "pos": 2095, + "end": 2105, + "flags": 1, + "parent": { + "$ref": "867" + }, + "_id": 246 + } + ], + "target": { + "$id": "870", + "kind": 3, + "sv": "withDefaultKeyVisibility", + "pos": 2070, + "end": 2094, + "flags": 1, + "parent": { + "$ref": "867" + }, + "_id": 238 + }, + "pos": 2069, + "end": 2106, + "flags": 0, + "parent": { + "$ref": "853" + } + } + ], + "properties": [ + { + "$id": "871", + "kind": 16, + "target": { + "$id": "872", + "kind": 45, + "target": { + "$id": "873", + "kind": 3, + "sv": "Source", + "pos": 2199, + "end": 2205, + "flags": 1, + "parent": { + "$ref": "872" + }, + "_id": 235 + }, + "arguments": [], + "pos": 2199, + "end": 2205, + "flags": 1, + "parent": { + "$ref": "871" + }, + "_id": 234 + }, + "pos": 2196, + "end": 2205, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "853" + } + } + ], + "bodyRange": { + "pos": 2192, + "end": 2208 + }, + "pos": 1794, + "end": 2208, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "874", + "kind": 51, + "content": [ + { + "$id": "875", + "kind": 52, + "text": "Applies a visibility setting to a collection of properties.", + "pos": 1797, + "end": 1867, + "flags": 0, + "parent": { + "$ref": "874" + } + } + ], + "tags": [ + { + "$id": "876", + "kind": 57, + "tagName": { + "$id": "877", + "kind": 3, + "sv": "template", + "pos": 1868, + "end": 1876, + "flags": 0, + "parent": { + "$ref": "876" + } + }, + "paramName": { + "$id": "878", + "kind": 3, + "sv": "Source", + "pos": 1877, + "end": 1883, + "flags": 0, + "parent": { + "$ref": "876" + } + }, + "content": [ + { + "$id": "879", + "kind": 52, + "text": "An object whose properties are spread.", + "pos": 1884, + "end": 1926, + "flags": 0, + "parent": { + "$ref": "876" + } + } + ], + "pos": 1867, + "end": 1926, + "flags": 0, + "parent": { + "$ref": "874" + } + }, + { + "$id": "880", + "kind": 57, + "tagName": { + "$id": "881", + "kind": 3, + "sv": "template", + "pos": 1927, + "end": 1935, + "flags": 0, + "parent": { + "$ref": "880" + } + }, + "paramName": { + "$id": "882", + "kind": 3, + "sv": "Visibility", + "pos": 1936, + "end": 1946, + "flags": 0, + "parent": { + "$ref": "880" + } + }, + "content": [ + { + "$id": "883", + "kind": 52, + "text": "The visibility to apply to all properties.", + "pos": 1947, + "end": 1991, + "flags": 0, + "parent": { + "$ref": "880" + } + } + ], + "pos": 1926, + "end": 1991, + "flags": 0, + "parent": { + "$ref": "874" + } + } + ], + "pos": 1794, + "end": 1993, + "flags": 0, + "parent": { + "$ref": "853" + } + } + ], + "parent": { + "$ref": "732" + }, + "symbol": { + "declarations": [ + { + "$ref": "853" + } + ], + "name": "DefaultKeyVisibility", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "733" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 56 + }, + "locals": { + "duplicates": {} + } + } + ], + "file": { + "text": "namespace TypeSpec;\n\n/**\n * Represent a 32-bit unix timestamp datetime with 1s of granularity.\n * It measures time by the number of seconds that have elapsed since 00:00:00 UTC on 1 January 1970.\n */\n@encode(\"unixTimestamp\", int32)\nscalar unixTimestamp32 extends utcDateTime;\n\n/**\n * Represent a URL string as described by https://url.spec.whatwg.org/\n */\nscalar url extends string;\n\n/**\n * Represents a collection of optional properties.\n *\n * @template Source An object whose spread properties are all optional.\n */\n@doc(\"The template for adding optional properties.\")\n@withOptionalProperties\nmodel OptionalProperties {\n ...Source;\n}\n\n/**\n * Represents a collection of updateable properties.\n *\n * @template Source An object whose spread properties are all updateable.\n */\n@doc(\"The template for adding updateable properties.\")\n@withUpdateableProperties\nmodel UpdateableProperties {\n ...Source;\n}\n\n/**\n * Represents a collection of omitted properties.\n *\n * @template Source An object whose properties are spread.\n * @template Keys The property keys to omit.\n */\n@doc(\"The template for omitting properties.\")\n@withoutOmittedProperties(Keys)\nmodel OmitProperties {\n ...Source;\n}\n\n/**\n * Represents a collection of properties with only the specified keys included.\n *\n * @template Source An object whose properties are spread.\n * @template Keys The property keys to include.\n */\n@doc(\"The template for picking properties.\")\n@withPickedProperties(Keys)\nmodel PickProperties {\n ...Source;\n}\n\n/**\n * Represents a collection of properties with default values omitted.\n *\n * @template Source An object whose spread property defaults are all omitted.\n */\n@withoutDefaultValues\nmodel OmitDefaults {\n ...Source;\n}\n\n/**\n * Applies a visibility setting to a collection of properties.\n *\n * @template Source An object whose properties are spread.\n * @template Visibility The visibility to apply to all properties.\n */\n@doc(\"The template for setting the default visibility of key properties.\")\n@withDefaultKeyVisibility(Visibility)\nmodel DefaultKeyVisibility {\n ...Source;\n}\n", + "path": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/compiler/lib/std/types.tsp" + }, + "id": { + "$id": "884", + "kind": 3, + "sv": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/compiler/lib/std/types.tsp", + "pos": 0, + "end": 0, + "flags": 8, + "parent": { + "$ref": "732" + } + }, + "namespaces": [ + { + "$ref": "733" + } + ], + "usings": [], + "locals": { + "duplicates": {} + }, + "inScopeNamespaces": [ + { + "$ref": "733" + } + ], + "parseDiagnostics": [], + "comments": [], + "printable": true, + "parseOptions": {}, + "pos": 0, + "end": 2208, + "flags": 0, + "symbol": { + "declarations": [], + "node": { + "$ref": "732" + }, + "name": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/compiler/lib/std/types.tsp", + "exports": { + "duplicates": {} + }, + "flags": 32768, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "symbol": { + "declarations": [ + { + "$ref": "726" + } + ], + "name": "url", + "members": { + "duplicates": {} + }, + "flags": 1048580, + "parent": { + "declarations": [ + { + "$ref": "733" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 40 + }, + "locals": { + "duplicates": {} + } + }, + "constructors": {}, + "namespace": { + "$ref": "719" + }, + "decorators": [ + { + "args": [ + { + "value": { + "$ref": "723" + }, + "jsValue": "self" + }, + { + "value": { + "$id": "885", + "kind": "String", + "value": "Represent a URL string as described by https://url.spec.whatwg.org/", + "isFinished": true, + "entityKind": "Type" + }, + "jsValue": "Represent a URL string as described by https://url.spec.whatwg.org/" + } + ] + } + ], + "derivedScalars": [], + "isFinished": true, + "entityKind": "Type", + "baseScalar": { + "$ref": "463" + } + }, + { + "$id": "886", + "kind": "Scalar", + "name": "LinkHeader", + "node": { + "$ref": "268" + }, + "constructors": {}, + "namespace": { + "$id": "887", + "kind": "Namespace", + "name": "Http", + "namespace": { + "$ref": "719" + }, + "node": { + "$id": "888", + "kind": 60, + "id": { + "$id": "889", + "kind": 3, + "sv": "Http", + "pos": 0, + "end": 0, + "flags": 0 + }, + "pos": 0, + "end": 0, + "parent": { + "$id": "890", + "kind": 1, + "id": { + "$id": "891", + "kind": 3, + "sv": "", + "pos": 0, + "end": 0, + "flags": 8 + }, + "esmExports": { + "$decorators": { + "TypeSpec.Http": {}, + "TypeSpec.Http.Private": {} + }, + "$lib": { + "name": "@typespec/http", + "diagnostics": { + "http-verb-duplicate": { + "severity": "error", + "messages": {} + }, + "missing-uri-param": { + "severity": "error", + "messages": {} + }, + "incompatible-uri-param": { + "severity": "error", + "messages": {} + }, + "use-uri-template": { + "severity": "error", + "messages": {} + }, + "double-slash": { + "severity": "warning", + "messages": {} + }, + "missing-server-param": { + "severity": "error", + "messages": {} + }, + "duplicate-body": { + "severity": "error", + "messages": { + "default": "Operation has multiple @body parameters declared", + "duplicateUnannotated": "Operation has multiple unannotated parameters. There can only be one representing the body", + "bodyAndUnannotated": "Operation has a @body and an unannotated parameter. There can only be one representing the body" + } + }, + "duplicate-route-decorator": { + "severity": "error", + "messages": { + "namespace": "@route was defined twice on this namespace and has different values." + } + }, + "operation-param-duplicate-type": { + "severity": "error", + "messages": {} + }, + "duplicate-operation": { + "severity": "error", + "messages": {} + }, + "multiple-status-codes": { + "severity": "error", + "messages": { + "default": "Multiple `@statusCode` decorators defined for this operation response." + } + }, + "status-code-invalid": { + "severity": "error", + "messages": { + "default": "statusCode value must be a numeric or string literal or union of numeric or string literals", + "value": "statusCode value must be a three digit code between 100 and 599" + } + }, + "content-type-string": { + "severity": "error", + "messages": { + "default": "contentType parameter must be a string literal or union of string literals" + } + }, + "content-type-ignored": { + "severity": "warning", + "messages": { + "default": "`Content-Type` header ignored because there is no body." + } + }, + "metadata-ignored": { + "severity": "warning", + "messages": {} + }, + "response-cookie-not-supported": { + "severity": "warning", + "messages": {} + }, + "no-service-found": { + "severity": "warning", + "messages": {} + }, + "invalid-type-for-auth": { + "severity": "error", + "messages": {} + }, + "shared-inconsistency": { + "severity": "error", + "messages": {} + }, + "multipart-invalid-content-type": { + "severity": "error", + "messages": {} + }, + "multipart-model": { + "severity": "error", + "messages": { + "default": "Multipart request body must be a model or a tuple of http parts." + } + }, + "no-implicit-multipart": { + "severity": "error", + "messages": { + "default": "Using multipart payloads requires the use of @multipartBody and HttpPart models." + } + }, + "multipart-part": { + "severity": "error", + "messages": { + "default": "Expect item to be an HttpPart model." + } + }, + "multipart-nested": { + "severity": "error", + "messages": { + "default": "Cannot use @multipartBody inside of an HttpPart" + } + }, + "http-file-extra-property": { + "severity": "error", + "messages": {} + }, + "http-file-disallowed-metadata": { + "severity": "error", + "messages": {} + }, + "formdata-no-part-name": { + "severity": "error", + "messages": { + "default": "Part used in multipart/form-data must have a name." + } + }, + "http-file-structured": { + "severity": "warning", + "messages": { + "union": "An HTTP File in a union is serialized as a structured model instead of being treated as the contents of a file. Declare a separate operation using `@sharedRoute` that has only the File model as the body type to treat it as a file, or suppress this warning if you intend to serialize the File as a model." + } + }, + "http-file-content-type-not-string": { + "severity": "error", + "messages": {} + }, + "http-file-contents-not-scalar": { + "severity": "error", + "messages": {} + }, + "patch-implicit-optional": { + "severity": "warning", + "messages": { + "default": "Patch operation stopped applying an implicit optional transform to the body in 1.0.0. Use @patch(#{implicitOptionality: true}) to restore the old behavior." + } + }, + "merge-patch-contains-null": { + "severity": "error", + "messages": { + "default": "Cannot convert model to a merge-patch compatible shape because it contains the 'null' intrinsic type." + } + }, + "merge-patch-content-type": { + "severity": "warning", + "messages": {} + }, + "merge-patch-contains-metadata": { + "severity": "error", + "messages": {} + } + }, + "state": { + "authentication": { + "description": "State for the @auth decorator" + }, + "header": { + "description": "State for the @header decorator" + }, + "cookie": { + "description": "State for the @cookie decorator" + }, + "query": { + "description": "State for the @query decorator" + }, + "path": { + "description": "State for the @path decorator" + }, + "body": { + "description": "State for the @body decorator" + }, + "bodyRoot": { + "description": "State for the @bodyRoot decorator" + }, + "bodyIgnore": { + "description": "State for the @bodyIgnore decorator" + }, + "multipartBody": { + "description": "State for the @bodyIgnore decorator" + }, + "statusCode": { + "description": "State for the @statusCode decorator" + }, + "verbs": { + "description": "State for the verb decorators (@get, @post, @put, etc.)" + }, + "patchOptions": { + "description": "State for the options of the @patch decorator" + }, + "servers": { + "description": "State for the @server decorator" + }, + "includeInapplicableMetadataInPayload": { + "description": "State for the @includeInapplicableMetadataInPayload decorator" + }, + "externalInterfaces": {}, + "routeProducer": {}, + "routes": {}, + "sharedRoutes": { + "description": "State for the @sharedRoute decorator" + }, + "routeOptions": {}, + "file": { + "description": "State for the @Private.file decorator" + }, + "httpPart": { + "description": "State for the @Private.httpPart decorator" + }, + "mergePatchModel": { + "description": "State marking mergePatch models " + }, + "mergePatchProperty": { + "description": "State marking merge path model property source" + }, + "mergePatchPropertyOptions": { + "description": "Override options for a property in a merge patch transform" + } + }, + "stateKeys": {} + } + }, + "file": { + "text": "", + "path": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/http/dist/src/tsp-index.js" + }, + "namespaceSymbols": [], + "symbol": { + "declarations": [ + { + "$ref": "890" + } + ], + "name": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/http/dist/src/tsp-index.js", + "exports": { + "duplicates": {} + }, + "flags": 1081344, + "metatypeMembers": { + "duplicates": {} + } + }, + "pos": 0, + "end": 0, + "flags": 0 + }, + "flags": 0, + "symbol": { + "declarations": [ + { + "$ref": "888" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$id": "892", + "kind": 60, + "id": { + "$id": "893", + "kind": 3, + "sv": "TypeSpec", + "pos": 0, + "end": 0, + "flags": 0 + }, + "pos": 0, + "end": 0, + "parent": { + "$ref": "890" + }, + "flags": 0 + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "890" + } + ], + "name": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/http/dist/src/tsp-index.js", + "exports": { + "duplicates": {} + }, + "flags": 1081344, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "models": {}, + "scalars": {}, + "operations": {}, + "namespaces": {}, + "interfaces": {}, + "unions": {}, + "enums": {}, + "decoratorDeclarations": {}, + "functionDeclarations": {}, + "decorators": [], + "isFinished": true, + "entityKind": "Type" + }, + "decorators": [], + "derivedScalars": [], + "isFinished": false, + "entityKind": "Type", + "baseScalar": { + "$ref": "463" + } + } + ], + "isFinished": true, + "entityKind": "Type" + }, + "decorators": [ + { + "args": [ + { + "value": { + "$ref": "723" + }, + "jsValue": "self" + }, + { + "value": { + "$id": "894", + "kind": "String", + "value": "The name of the file, if any.\n\nIn file bodies, this value comes from the `filename` parameter of the `Content-Disposition` header of the response\nor multipart payload. In JSON bodies, this value is serialized as a field in the response.\n\nNOTE: By default, `filename` cannot be sent in request payloads and can only be sent in responses and multipart\npayloads, as the `Content-Disposition` header is not valid in requests. If you want to send the `filename` in a request,\nyou must extend the `File` model and override the `filename` property with a different location defined by HTTP metadata\ndecorators.", + "isFinished": true, + "entityKind": "Type" + }, + "jsValue": "The name of the file, if any.\n\nIn file bodies, this value comes from the `filename` parameter of the `Content-Disposition` header of the response\nor multipart payload. In JSON bodies, this value is serialized as a field in the response.\n\nNOTE: By default, `filename` cannot be sent in request payloads and can only be sent in responses and multipart\npayloads, as the `Content-Disposition` header is not valid in requests. If you want to send the `filename` in a request,\nyou must extend the `File` model and override the `filename` property with a different location defined by HTTP metadata\ndecorators." + } + ] + }, + { + "definition": { + "$id": "895", + "kind": "Decorator", + "name": "@summary", + "namespace": { + "$ref": "719" + }, + "node": { + "$id": "896", + "kind": 25, + "modifiers": [ + { + "$id": "897", + "kind": 40, + "pos": 263, + "end": 269, + "flags": 0, + "parent": { + "$ref": "896" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "898", + "kind": 3, + "sv": "summary", + "pos": 274, + "end": 281, + "flags": 0, + "parent": { + "$ref": "896" + }, + "_id": 254 + }, + "target": { + "$id": "899", + "kind": 27, + "id": { + "$id": "900", + "kind": 3, + "sv": "target", + "pos": 282, + "end": 288, + "flags": 0, + "parent": { + "$ref": "899" + }, + "_id": 255 + }, + "type": { + "$id": "901", + "kind": 43, + "pos": 290, + "end": 297, + "flags": 0, + "parent": { + "$ref": "899" + } + }, + "optional": false, + "rest": false, + "pos": 282, + "end": 297, + "flags": 0, + "parent": { + "$ref": "896" + }, + "symbol": { + "declarations": [ + { + "$ref": "899" + } + ], + "name": "target", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$id": "902", + "kind": 8, + "decorators": [], + "docs": [], + "id": { + "$id": "903", + "kind": 3, + "sv": "TypeSpec", + "pos": 81, + "end": 89, + "flags": 0, + "parent": { + "$ref": "902" + }, + "_id": 253 + }, + "locals": { + "duplicates": {} + }, + "directives": [], + "pos": 71, + "end": 90, + "flags": 0, + "parent": { + "$id": "904", + "kind": 0, + "statements": [ + { + "$id": "905", + "kind": 2, + "path": { + "$id": "906", + "kind": 32, + "value": "../../dist/src/lib/tsp-index.js", + "pos": 7, + "end": 40, + "flags": 0, + "parent": { + "$ref": "905" + } + }, + "pos": 0, + "end": 41, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "904" + } + }, + { + "$id": "907", + "kind": 9, + "name": { + "$id": "908", + "kind": 7, + "base": { + "$id": "909", + "kind": 3, + "sv": "TypeSpec", + "pos": 49, + "end": 57, + "flags": 1, + "parent": { + "$ref": "908" + }, + "_id": 1 + }, + "id": { + "$id": "910", + "kind": 3, + "sv": "Reflection", + "pos": 58, + "end": 68, + "flags": 1, + "parent": { + "$ref": "908" + }, + "_id": 2 + }, + "selector": ".", + "pos": 49, + "end": 68, + "flags": 1, + "parent": { + "$ref": "907" + }, + "_id": 0 + }, + "pos": 43, + "end": 69, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "904" + } + }, + { + "$ref": "902" + }, + { + "$ref": "896" + }, + { + "$id": "911", + "kind": 25, + "modifiers": [ + { + "$id": "912", + "kind": 40, + "pos": 642, + "end": 648, + "flags": 0, + "parent": { + "$ref": "911" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "913", + "kind": 3, + "sv": "doc", + "pos": 653, + "end": 656, + "flags": 0, + "parent": { + "$ref": "911" + }, + "_id": 161 + }, + "target": { + "$id": "914", + "kind": 27, + "id": { + "$id": "915", + "kind": 3, + "sv": "target", + "pos": 657, + "end": 663, + "flags": 0, + "parent": { + "$ref": "914" + }, + "_id": 162 + }, + "type": { + "$id": "916", + "kind": 43, + "pos": 665, + "end": 672, + "flags": 0, + "parent": { + "$ref": "914" + } + }, + "optional": false, + "rest": false, + "pos": 657, + "end": 672, + "flags": 0, + "parent": { + "$ref": "911" + }, + "symbol": { + "declarations": [ + { + "$ref": "914" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 175 + } + }, + "parameters": [ + { + "$id": "917", + "kind": 27, + "id": { + "$id": "918", + "kind": 3, + "sv": "doc", + "pos": 674, + "end": 677, + "flags": 0, + "parent": { + "$ref": "917" + }, + "_id": 163 + }, + "type": { + "$id": "919", + "kind": 44, + "target": { + "$id": "920", + "kind": 45, + "target": { + "$id": "921", + "kind": 3, + "sv": "string", + "pos": 687, + "end": 693, + "flags": 1, + "parent": { + "$ref": "920" + }, + "_id": 165 + }, + "arguments": [], + "pos": 687, + "end": 693, + "flags": 1, + "parent": { + "$ref": "919" + }, + "_id": 164 + }, + "pos": 679, + "end": 693, + "flags": 0, + "parent": { + "$ref": "917" + } + }, + "optional": false, + "rest": false, + "pos": 674, + "end": 693, + "flags": 0, + "parent": { + "$ref": "911" + }, + "symbol": { + "declarations": [ + { + "$ref": "917" + } + ], + "name": "doc", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 176 + } + }, + { + "$id": "922", + "kind": 27, + "id": { + "$id": "923", + "kind": 3, + "sv": "formatArgs", + "pos": 695, + "end": 705, + "flags": 0, + "parent": { + "$ref": "922" + }, + "_id": 166 + }, + "type": { + "$id": "924", + "kind": 14, + "properties": [], + "bodyRange": { + "pos": 708, + "end": 710 + }, + "pos": 708, + "end": 710, + "flags": 0, + "parent": { + "$ref": "922" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "924" + }, + "name": "-", + "members": { + "duplicates": {} + }, + "flags": 2, + "metatypeMembers": { + "duplicates": {} + }, + "id": 43 + } + }, + "optional": true, + "rest": false, + "pos": 695, + "end": 710, + "flags": 0, + "parent": { + "$ref": "911" + }, + "symbol": { + "declarations": [ + { + "$ref": "922" + } + ], + "name": "formatArgs", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 177 + } + } + ], + "pos": 326, + "end": 712, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "925", + "kind": 51, + "content": [ + { + "$id": "926", + "kind": 52, + "text": "Attach a documentation string. Content support CommonMark markdown formatting.", + "pos": 329, + "end": 415, + "flags": 0, + "parent": { + "$ref": "925" + } + } + ], + "tags": [ + { + "$id": "927", + "kind": 53, + "tagName": { + "$id": "928", + "kind": 3, + "sv": "param", + "pos": 416, + "end": 421, + "flags": 0, + "parent": { + "$ref": "927" + } + }, + "paramName": { + "$id": "929", + "kind": 3, + "sv": "doc", + "pos": 422, + "end": 425, + "flags": 0, + "parent": { + "$ref": "927" + } + }, + "content": [ + { + "$id": "930", + "kind": 52, + "text": "Documentation string", + "pos": 426, + "end": 450, + "flags": 0, + "parent": { + "$ref": "927" + } + } + ], + "pos": 415, + "end": 450, + "flags": 0, + "parent": { + "$ref": "925" + } + }, + { + "$id": "931", + "kind": 53, + "tagName": { + "$id": "932", + "kind": 3, + "sv": "param", + "pos": 451, + "end": 456, + "flags": 0, + "parent": { + "$ref": "931" + } + }, + "paramName": { + "$id": "933", + "kind": 3, + "sv": "formatArgs", + "pos": 457, + "end": 467, + "flags": 0, + "parent": { + "$ref": "931" + } + }, + "content": [ + { + "$id": "934", + "kind": 52, + "text": "Record with key value pair that can be interpolated in the doc.", + "pos": 468, + "end": 538, + "flags": 0, + "parent": { + "$ref": "931" + } + } + ], + "pos": 450, + "end": 538, + "flags": 0, + "parent": { + "$ref": "925" + } + }, + { + "$id": "935", + "kind": 58, + "tagName": { + "$id": "936", + "kind": 3, + "sv": "example", + "pos": 539, + "end": 546, + "flags": 0, + "parent": { + "$ref": "935" + } + }, + "content": [ + { + "$id": "937", + "kind": 52, + "text": "```typespec\n@doc(\"Represent a Pet available in the PetStore\")\nmodel Pet {}\n```", + "pos": 546, + "end": 639, + "flags": 0, + "parent": { + "$ref": "935" + } + } + ], + "pos": 538, + "end": 639, + "flags": 0, + "parent": { + "$ref": "925" + } + } + ], + "pos": 326, + "end": 641, + "flags": 0, + "parent": { + "$ref": "911" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "911" + } + ], + "name": "@doc", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "938", + "kind": 25, + "modifiers": [ + { + "$id": "939", + "kind": 40, + "pos": 1073, + "end": 1079, + "flags": 0, + "parent": { + "$ref": "938" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "940", + "kind": 3, + "sv": "returnsDoc", + "pos": 1084, + "end": 1094, + "flags": 0, + "parent": { + "$ref": "938" + }, + "_id": 259 + }, + "target": { + "$id": "941", + "kind": 27, + "id": { + "$id": "942", + "kind": 3, + "sv": "target", + "pos": 1095, + "end": 1101, + "flags": 0, + "parent": { + "$ref": "941" + }, + "_id": 260 + }, + "type": { + "$id": "943", + "kind": 45, + "target": { + "$id": "944", + "kind": 3, + "sv": "Operation", + "pos": 1103, + "end": 1112, + "flags": 1, + "parent": { + "$ref": "943" + }, + "_id": 262 + }, + "arguments": [], + "pos": 1103, + "end": 1112, + "flags": 1, + "parent": { + "$ref": "941" + }, + "_id": 261 + }, + "optional": false, + "rest": false, + "pos": 1095, + "end": 1112, + "flags": 0, + "parent": { + "$ref": "938" + }, + "symbol": { + "declarations": [ + { + "$ref": "941" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 239 + } + }, + "parameters": [ + { + "$id": "945", + "kind": 27, + "id": { + "$id": "946", + "kind": 3, + "sv": "doc", + "pos": 1114, + "end": 1117, + "flags": 0, + "parent": { + "$ref": "945" + }, + "_id": 264 + }, + "type": { + "$id": "947", + "kind": 44, + "target": { + "$id": "948", + "kind": 45, + "target": { + "$id": "949", + "kind": 3, + "sv": "string", + "pos": 1127, + "end": 1133, + "flags": 1, + "parent": { + "$ref": "948" + }, + "_id": 266 + }, + "arguments": [], + "pos": 1127, + "end": 1133, + "flags": 1, + "parent": { + "$ref": "947" + }, + "_id": 265 + }, + "pos": 1119, + "end": 1133, + "flags": 0, + "parent": { + "$ref": "945" + } + }, + "optional": false, + "rest": false, + "pos": 1114, + "end": 1133, + "flags": 0, + "parent": { + "$ref": "938" + }, + "symbol": { + "declarations": [ + { + "$ref": "945" + } + ], + "name": "doc", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 240 + } + } + ], + "pos": 714, + "end": 1135, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "950", + "kind": 51, + "content": [ + { + "$id": "951", + "kind": 52, + "text": "Attach a documentation string to describe the successful return types of an operation.\nIf an operation returns a union of success and errors it only describes the success. See `@errorsDoc` for error documentation.", + "pos": 717, + "end": 941, + "flags": 0, + "parent": { + "$ref": "950" + } + } + ], + "tags": [ + { + "$id": "952", + "kind": 53, + "tagName": { + "$id": "953", + "kind": 3, + "sv": "param", + "pos": 942, + "end": 947, + "flags": 0, + "parent": { + "$ref": "952" + } + }, + "paramName": { + "$id": "954", + "kind": 3, + "sv": "doc", + "pos": 948, + "end": 951, + "flags": 0, + "parent": { + "$ref": "952" + } + }, + "content": [ + { + "$id": "955", + "kind": 52, + "text": "Documentation string", + "pos": 952, + "end": 979, + "flags": 0, + "parent": { + "$ref": "952" + } + } + ], + "pos": 941, + "end": 979, + "flags": 0, + "parent": { + "$ref": "950" + } + }, + { + "$id": "956", + "kind": 58, + "tagName": { + "$id": "957", + "kind": 3, + "sv": "example", + "pos": 980, + "end": 987, + "flags": 0, + "parent": { + "$ref": "956" + } + }, + "content": [ + { + "$id": "958", + "kind": 52, + "text": "```typespec\n@returnsDoc(\"Returns doc\")\nop get(): Pet | NotFound;\n```", + "pos": 987, + "end": 1070, + "flags": 0, + "parent": { + "$ref": "956" + } + } + ], + "pos": 979, + "end": 1070, + "flags": 0, + "parent": { + "$ref": "950" + } + } + ], + "pos": 714, + "end": 1072, + "flags": 0, + "parent": { + "$ref": "938" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "938" + } + ], + "name": "@returnsDoc", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "959", + "kind": 25, + "modifiers": [ + { + "$id": "960", + "kind": 40, + "pos": 1491, + "end": 1497, + "flags": 0, + "parent": { + "$ref": "959" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "961", + "kind": 3, + "sv": "errorsDoc", + "pos": 1502, + "end": 1511, + "flags": 0, + "parent": { + "$ref": "959" + }, + "_id": 267 + }, + "target": { + "$id": "962", + "kind": 27, + "id": { + "$id": "963", + "kind": 3, + "sv": "target", + "pos": 1512, + "end": 1518, + "flags": 0, + "parent": { + "$ref": "962" + }, + "_id": 268 + }, + "type": { + "$id": "964", + "kind": 45, + "target": { + "$id": "965", + "kind": 3, + "sv": "Operation", + "pos": 1520, + "end": 1529, + "flags": 1, + "parent": { + "$ref": "964" + }, + "_id": 270 + }, + "arguments": [], + "pos": 1520, + "end": 1529, + "flags": 1, + "parent": { + "$ref": "962" + }, + "_id": 269 + }, + "optional": false, + "rest": false, + "pos": 1512, + "end": 1529, + "flags": 0, + "parent": { + "$ref": "959" + }, + "symbol": { + "declarations": [ + { + "$ref": "962" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 242 + } + }, + "parameters": [ + { + "$id": "966", + "kind": 27, + "id": { + "$id": "967", + "kind": 3, + "sv": "doc", + "pos": 1531, + "end": 1534, + "flags": 0, + "parent": { + "$ref": "966" + }, + "_id": 271 + }, + "type": { + "$id": "968", + "kind": 44, + "target": { + "$id": "969", + "kind": 45, + "target": { + "$id": "970", + "kind": 3, + "sv": "string", + "pos": 1544, + "end": 1550, + "flags": 1, + "parent": { + "$ref": "969" + }, + "_id": 273 + }, + "arguments": [], + "pos": 1544, + "end": 1550, + "flags": 1, + "parent": { + "$ref": "968" + }, + "_id": 272 + }, + "pos": 1536, + "end": 1550, + "flags": 0, + "parent": { + "$ref": "966" + } + }, + "optional": false, + "rest": false, + "pos": 1531, + "end": 1550, + "flags": 0, + "parent": { + "$ref": "959" + }, + "symbol": { + "declarations": [ + { + "$ref": "966" + } + ], + "name": "doc", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 243 + } + } + ], + "pos": 1137, + "end": 1552, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "971", + "kind": 51, + "content": [ + { + "$id": "972", + "kind": 52, + "text": "Attach a documentation string to describe the error return types of an operation.\nIf an operation returns a union of success and errors it only describes the errors. See `@returnsDoc` for success documentation.", + "pos": 1140, + "end": 1361, + "flags": 0, + "parent": { + "$ref": "971" + } + } + ], + "tags": [ + { + "$id": "973", + "kind": 53, + "tagName": { + "$id": "974", + "kind": 3, + "sv": "param", + "pos": 1362, + "end": 1367, + "flags": 0, + "parent": { + "$ref": "973" + } + }, + "paramName": { + "$id": "975", + "kind": 3, + "sv": "doc", + "pos": 1368, + "end": 1371, + "flags": 0, + "parent": { + "$ref": "973" + } + }, + "content": [ + { + "$id": "976", + "kind": 52, + "text": "Documentation string", + "pos": 1372, + "end": 1399, + "flags": 0, + "parent": { + "$ref": "973" + } + } + ], + "pos": 1361, + "end": 1399, + "flags": 0, + "parent": { + "$ref": "971" + } + }, + { + "$id": "977", + "kind": 58, + "tagName": { + "$id": "978", + "kind": 3, + "sv": "example", + "pos": 1400, + "end": 1407, + "flags": 0, + "parent": { + "$ref": "977" + } + }, + "content": [ + { + "$id": "979", + "kind": 52, + "text": "```typespec\n@errorsDoc(\"Errors doc\")\nop get(): Pet | NotFound;\n```", + "pos": 1407, + "end": 1488, + "flags": 0, + "parent": { + "$ref": "977" + } + } + ], + "pos": 1399, + "end": 1488, + "flags": 0, + "parent": { + "$ref": "971" + } + } + ], + "pos": 1137, + "end": 1490, + "flags": 0, + "parent": { + "$ref": "959" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "959" + } + ], + "name": "@errorsDoc", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "980", + "kind": 13, + "id": { + "$id": "981", + "kind": 3, + "sv": "ServiceOptions", + "pos": 1588, + "end": 1602, + "flags": 0, + "parent": { + "$ref": "980" + }, + "_id": 274 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [ + { + "$id": "982", + "kind": 15, + "id": { + "$id": "983", + "kind": 3, + "sv": "title", + "pos": 1646, + "end": 1651, + "flags": 0, + "parent": { + "$ref": "982" + }, + "_id": 275 + }, + "decorators": [], + "value": { + "$id": "984", + "kind": 45, + "target": { + "$id": "985", + "kind": 3, + "sv": "string", + "pos": 1654, + "end": 1660, + "flags": 1, + "parent": { + "$ref": "984" + }, + "_id": 277 + }, + "arguments": [], + "pos": 1654, + "end": 1660, + "flags": 1, + "parent": { + "$ref": "982" + }, + "_id": 276 + }, + "optional": true, + "pos": 1607, + "end": 1660, + "flags": 0, + "docs": [ + { + "$id": "986", + "kind": 51, + "content": [ + { + "$id": "987", + "kind": 52, + "text": "Title of the service.", + "pos": 1610, + "end": 1641, + "flags": 0, + "parent": { + "$ref": "986" + } + } + ], + "tags": [], + "pos": 1607, + "end": 1643, + "flags": 0, + "parent": { + "$ref": "982" + } + } + ], + "directives": [], + "parent": { + "$ref": "980" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "982" + }, + "name": "title", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "980" + } + ], + "name": "ServiceOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 60 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 1603, + "end": 1663 + }, + "pos": 1554, + "end": 1663, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "988", + "kind": 51, + "content": [ + { + "$id": "989", + "kind": 52, + "text": "Service options.", + "pos": 1557, + "end": 1579, + "flags": 0, + "parent": { + "$ref": "988" + } + } + ], + "tags": [], + "pos": 1554, + "end": 1581, + "flags": 0, + "parent": { + "$ref": "980" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "980" + } + ], + "name": "ServiceOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 60 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "990", + "kind": 25, + "modifiers": [ + { + "$id": "991", + "kind": 40, + "pos": 2001, + "end": 2007, + "flags": 0, + "parent": { + "$ref": "990" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "992", + "kind": 3, + "sv": "service", + "pos": 2012, + "end": 2019, + "flags": 0, + "parent": { + "$ref": "990" + }, + "_id": 278 + }, + "target": { + "$id": "993", + "kind": 27, + "id": { + "$id": "994", + "kind": 3, + "sv": "target", + "pos": 2020, + "end": 2026, + "flags": 0, + "parent": { + "$ref": "993" + }, + "_id": 279 + }, + "type": { + "$id": "995", + "kind": 45, + "target": { + "$id": "996", + "kind": 3, + "sv": "Namespace", + "pos": 2028, + "end": 2037, + "flags": 1, + "parent": { + "$ref": "995" + }, + "_id": 281 + }, + "arguments": [], + "pos": 2028, + "end": 2037, + "flags": 1, + "parent": { + "$ref": "993" + }, + "_id": 280 + }, + "optional": false, + "rest": false, + "pos": 2020, + "end": 2037, + "flags": 0, + "parent": { + "$ref": "990" + }, + "symbol": { + "declarations": [ + { + "$ref": "993" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 246 + } + }, + "parameters": [ + { + "$id": "997", + "kind": 27, + "id": { + "$id": "998", + "kind": 3, + "sv": "options", + "pos": 2039, + "end": 2046, + "flags": 0, + "parent": { + "$ref": "997" + }, + "_id": 283 + }, + "type": { + "$id": "999", + "kind": 44, + "target": { + "$id": "1000", + "kind": 45, + "target": { + "$id": "1001", + "kind": 3, + "sv": "ServiceOptions", + "pos": 2057, + "end": 2071, + "flags": 1, + "parent": { + "$ref": "1000" + }, + "_id": 285 + }, + "arguments": [], + "pos": 2057, + "end": 2071, + "flags": 1, + "parent": { + "$ref": "999" + }, + "_id": 284 + }, + "pos": 2049, + "end": 2071, + "flags": 0, + "parent": { + "$ref": "997" + } + }, + "optional": true, + "rest": false, + "pos": 2039, + "end": 2071, + "flags": 0, + "parent": { + "$ref": "990" + }, + "symbol": { + "declarations": [ + { + "$ref": "997" + } + ], + "name": "options", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 247 + } + } + ], + "pos": 1665, + "end": 2073, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1002", + "kind": 51, + "content": [ + { + "$id": "1003", + "kind": 52, + "text": "Mark this namespace as describing a service and configure service properties.", + "pos": 1668, + "end": 1753, + "flags": 0, + "parent": { + "$ref": "1002" + } + } + ], + "tags": [ + { + "$id": "1004", + "kind": 53, + "tagName": { + "$id": "1005", + "kind": 3, + "sv": "param", + "pos": 1754, + "end": 1759, + "flags": 0, + "parent": { + "$ref": "1004" + } + }, + "paramName": { + "$id": "1006", + "kind": 3, + "sv": "options", + "pos": 1760, + "end": 1767, + "flags": 0, + "parent": { + "$ref": "1004" + } + }, + "content": [ + { + "$id": "1007", + "kind": 52, + "text": "Optional configuration for the service.", + "pos": 1768, + "end": 1814, + "flags": 0, + "parent": { + "$ref": "1004" + } + } + ], + "pos": 1753, + "end": 1814, + "flags": 0, + "parent": { + "$ref": "1002" + } + }, + { + "$id": "1008", + "kind": 58, + "tagName": { + "$id": "1009", + "kind": 3, + "sv": "example", + "pos": 1815, + "end": 1822, + "flags": 0, + "parent": { + "$ref": "1008" + } + }, + "content": [ + { + "$id": "1010", + "kind": 52, + "text": "```typespec\n@service\nnamespace PetStore;\n```", + "pos": 1822, + "end": 1886, + "flags": 0, + "parent": { + "$ref": "1008" + } + } + ], + "pos": 1814, + "end": 1886, + "flags": 0, + "parent": { + "$ref": "1002" + } + }, + { + "$id": "1011", + "kind": 58, + "tagName": { + "$id": "1012", + "kind": 3, + "sv": "example", + "pos": 1887, + "end": 1894, + "flags": 0, + "parent": { + "$ref": "1011" + } + }, + "content": [ + { + "$id": "1013", + "kind": 52, + "text": "Setting service title\n```typespec\n@service(#{title: \"Pet store\"})\nnamespace PetStore;\n```", + "pos": 1894, + "end": 1998, + "flags": 0, + "parent": { + "$ref": "1011" + } + } + ], + "pos": 1886, + "end": 1998, + "flags": 0, + "parent": { + "$ref": "1002" + } + } + ], + "pos": 1665, + "end": 2000, + "flags": 0, + "parent": { + "$ref": "990" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "990" + } + ], + "name": "@service", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1014", + "kind": 25, + "modifiers": [ + { + "$id": "1015", + "kind": 40, + "pos": 2307, + "end": 2313, + "flags": 0, + "parent": { + "$ref": "1014" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1016", + "kind": 3, + "sv": "error", + "pos": 2318, + "end": 2323, + "flags": 0, + "parent": { + "$ref": "1014" + }, + "_id": 286 + }, + "target": { + "$id": "1017", + "kind": 27, + "id": { + "$id": "1018", + "kind": 3, + "sv": "target", + "pos": 2324, + "end": 2330, + "flags": 0, + "parent": { + "$ref": "1017" + }, + "_id": 287 + }, + "type": { + "$id": "1019", + "kind": 45, + "target": { + "$id": "1020", + "kind": 3, + "sv": "Model", + "pos": 2332, + "end": 2337, + "flags": 1, + "parent": { + "$ref": "1019" + }, + "_id": 289 + }, + "arguments": [], + "pos": 2332, + "end": 2337, + "flags": 1, + "parent": { + "$ref": "1017" + }, + "_id": 288 + }, + "optional": false, + "rest": false, + "pos": 2324, + "end": 2337, + "flags": 0, + "parent": { + "$ref": "1014" + }, + "symbol": { + "declarations": [ + { + "$ref": "1017" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 249 + } + }, + "parameters": [], + "pos": 2075, + "end": 2339, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1021", + "kind": 51, + "content": [ + { + "$id": "1022", + "kind": 52, + "text": "Specify that this model is an error type. Operations return error types when the operation has failed.", + "pos": 2078, + "end": 2191, + "flags": 0, + "parent": { + "$ref": "1021" + } + } + ], + "tags": [ + { + "$id": "1023", + "kind": 58, + "tagName": { + "$id": "1024", + "kind": 3, + "sv": "example", + "pos": 2192, + "end": 2199, + "flags": 0, + "parent": { + "$ref": "1023" + } + }, + "content": [ + { + "$id": "1025", + "kind": 52, + "text": "```typespec\n@error\nmodel PetStoreError {\n code: string;\n message: string;\n}\n```", + "pos": 2199, + "end": 2304, + "flags": 0, + "parent": { + "$ref": "1023" + } + } + ], + "pos": 2191, + "end": 2304, + "flags": 0, + "parent": { + "$ref": "1021" + } + } + ], + "pos": 2075, + "end": 2306, + "flags": 0, + "parent": { + "$ref": "1014" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1014" + } + ], + "name": "@error", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1026", + "kind": 25, + "modifiers": [ + { + "$id": "1027", + "kind": 40, + "pos": 3478, + "end": 3484, + "flags": 0, + "parent": { + "$ref": "1026" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1028", + "kind": 3, + "sv": "mediaTypeHint", + "pos": 3489, + "end": 3502, + "flags": 0, + "parent": { + "$ref": "1026" + }, + "_id": 290 + }, + "target": { + "$id": "1029", + "kind": 27, + "id": { + "$id": "1030", + "kind": 3, + "sv": "target", + "pos": 3503, + "end": 3509, + "flags": 0, + "parent": { + "$ref": "1029" + }, + "_id": 291 + }, + "type": { + "$id": "1031", + "kind": 28, + "options": [ + { + "$id": "1032", + "kind": 45, + "target": { + "$id": "1033", + "kind": 3, + "sv": "Model", + "pos": 3511, + "end": 3516, + "flags": 1, + "parent": { + "$ref": "1032" + }, + "_id": 293 + }, + "arguments": [], + "pos": 3511, + "end": 3516, + "flags": 1, + "parent": { + "$ref": "1031" + }, + "_id": 292 + }, + { + "$id": "1034", + "kind": 45, + "target": { + "$id": "1035", + "kind": 3, + "sv": "Scalar", + "pos": 3519, + "end": 3525, + "flags": 1, + "parent": { + "$ref": "1034" + }, + "_id": 295 + }, + "arguments": [], + "pos": 3519, + "end": 3525, + "flags": 1, + "parent": { + "$ref": "1031" + }, + "_id": 294 + }, + { + "$id": "1036", + "kind": 45, + "target": { + "$id": "1037", + "kind": 3, + "sv": "Enum", + "pos": 3528, + "end": 3532, + "flags": 1, + "parent": { + "$ref": "1036" + }, + "_id": 297 + }, + "arguments": [], + "pos": 3528, + "end": 3532, + "flags": 1, + "parent": { + "$ref": "1031" + }, + "_id": 296 + }, + { + "$id": "1038", + "kind": 45, + "target": { + "$id": "1039", + "kind": 3, + "sv": "Union", + "pos": 3535, + "end": 3540, + "flags": 1, + "parent": { + "$ref": "1038" + }, + "_id": 300 + }, + "arguments": [], + "pos": 3535, + "end": 3540, + "flags": 1, + "parent": { + "$ref": "1031" + }, + "_id": 299 + } + ], + "pos": 3511, + "end": 3540, + "flags": 0, + "parent": { + "$ref": "1029" + } + }, + "optional": false, + "rest": false, + "pos": 3503, + "end": 3540, + "flags": 0, + "parent": { + "$ref": "1026" + }, + "symbol": { + "declarations": [ + { + "$ref": "1029" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 191 + } + }, + "parameters": [ + { + "$id": "1040", + "kind": 27, + "id": { + "$id": "1041", + "kind": 3, + "sv": "mediaType", + "pos": 3542, + "end": 3551, + "flags": 0, + "parent": { + "$ref": "1040" + }, + "_id": 301 + }, + "type": { + "$id": "1042", + "kind": 44, + "target": { + "$id": "1043", + "kind": 45, + "target": { + "$id": "1044", + "kind": 3, + "sv": "string", + "pos": 3561, + "end": 3567, + "flags": 1, + "parent": { + "$ref": "1043" + }, + "_id": 303 + }, + "arguments": [], + "pos": 3561, + "end": 3567, + "flags": 1, + "parent": { + "$ref": "1042" + }, + "_id": 302 + }, + "pos": 3553, + "end": 3567, + "flags": 0, + "parent": { + "$ref": "1040" + } + }, + "optional": false, + "rest": false, + "pos": 3542, + "end": 3567, + "flags": 0, + "parent": { + "$ref": "1026" + }, + "symbol": { + "declarations": [ + { + "$ref": "1040" + } + ], + "name": "mediaType", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 192 + } + } + ], + "pos": 2341, + "end": 3569, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1045", + "kind": 51, + "content": [ + { + "$id": "1046", + "kind": 52, + "text": "Applies a media type hint to a TypeSpec type. Emitters and libraries may choose to use this hint to determine how a\ntype should be serialized. For example, the `@typespec/http` library will use the media type hint of the response\nbody type as a default `Content-Type` if one is not explicitly specified in the operation.\n\nMedia types (also known as MIME types) are defined by RFC 6838. The media type hint should be a valid media type\nstring as defined by the RFC, but the decorator does not enforce or validate this constraint.\n\nNotes: the applied media type is _only_ a hint. It may be overridden or not used at all. Media type hints are\ninherited by subtypes. If a media type hint is applied to a model, it will be inherited by all other models that\n`extend` it unless they delcare their own media type hint.", + "pos": 2344, + "end": 3191, + "flags": 0, + "parent": { + "$ref": "1045" + } + } + ], + "tags": [ + { + "$id": "1047", + "kind": 53, + "tagName": { + "$id": "1048", + "kind": 3, + "sv": "param", + "pos": 3192, + "end": 3197, + "flags": 0, + "parent": { + "$ref": "1047" + } + }, + "paramName": { + "$id": "1049", + "kind": 3, + "sv": "mediaType", + "pos": 3198, + "end": 3207, + "flags": 0, + "parent": { + "$ref": "1047" + } + }, + "content": [ + { + "$id": "1050", + "kind": 52, + "text": "The media type hint to apply to the target type.", + "pos": 3208, + "end": 3263, + "flags": 0, + "parent": { + "$ref": "1047" + } + } + ], + "pos": 3191, + "end": 3263, + "flags": 0, + "parent": { + "$ref": "1045" + } + }, + { + "$id": "1051", + "kind": 58, + "tagName": { + "$id": "1052", + "kind": 3, + "sv": "example", + "pos": 3264, + "end": 3271, + "flags": 0, + "parent": { + "$ref": "1051" + } + }, + "content": [ + { + "$id": "1053", + "kind": 52, + "text": "create a model that serializes as XML by default\n\n```tsp\n@mediaTypeHint(\"application/xml\")\nmodel Example {\n @visibility(Lifecycle.Read)\n id: string;\n\n name: string;\n}\n```", + "pos": 3271, + "end": 3475, + "flags": 0, + "parent": { + "$ref": "1051" + } + } + ], + "pos": 3263, + "end": 3475, + "flags": 0, + "parent": { + "$ref": "1045" + } + } + ], + "pos": 2341, + "end": 3477, + "flags": 0, + "parent": { + "$ref": "1026" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1026" + } + ], + "name": "@mediaTypeHint", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1054", + "kind": 4, + "target": { + "$id": "1055", + "kind": 3, + "sv": "mediaTypeHint", + "pos": 3683, + "end": 3696, + "flags": 1, + "parent": { + "$ref": "1054" + }, + "_id": 304 + }, + "targetType": { + "$id": "1056", + "kind": 45, + "target": { + "$id": "1057", + "kind": 7, + "base": { + "$id": "1058", + "kind": 3, + "sv": "TypeSpec", + "pos": 3697, + "end": 3705, + "flags": 1, + "parent": { + "$ref": "1057" + }, + "_id": 307 + }, + "id": { + "$id": "1059", + "kind": 3, + "sv": "bytes", + "pos": 3706, + "end": 3711, + "flags": 1, + "parent": { + "$ref": "1057" + }, + "_id": 308 + }, + "selector": ".", + "pos": 3697, + "end": 3711, + "flags": 1, + "parent": { + "$ref": "1056" + }, + "_id": 306 + }, + "arguments": [], + "pos": 3697, + "end": 3711, + "flags": 1, + "parent": { + "$ref": "1054" + }, + "_id": 305 + }, + "arguments": [ + { + "$id": "1060", + "kind": 32, + "value": "application/octet-stream", + "pos": 3713, + "end": 3739, + "flags": 0, + "parent": { + "$ref": "1054" + } + } + ], + "pos": 3681, + "end": 3741, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "904" + } + }, + { + "$id": "1061", + "kind": 25, + "modifiers": [ + { + "$id": "1062", + "kind": 40, + "pos": 4407, + "end": 4413, + "flags": 0, + "parent": { + "$ref": "1061" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1063", + "kind": 3, + "sv": "format", + "pos": 4418, + "end": 4424, + "flags": 0, + "parent": { + "$ref": "1061" + }, + "_id": 309 + }, + "target": { + "$id": "1064", + "kind": 27, + "id": { + "$id": "1065", + "kind": 3, + "sv": "target", + "pos": 4425, + "end": 4431, + "flags": 0, + "parent": { + "$ref": "1064" + }, + "_id": 310 + }, + "type": { + "$id": "1066", + "kind": 28, + "options": [ + { + "$id": "1067", + "kind": 45, + "target": { + "$id": "1068", + "kind": 3, + "sv": "string", + "pos": 4433, + "end": 4439, + "flags": 1, + "parent": { + "$ref": "1067" + }, + "_id": 312 + }, + "arguments": [], + "pos": 4433, + "end": 4439, + "flags": 1, + "parent": { + "$ref": "1066" + }, + "_id": 311 + }, + { + "$id": "1069", + "kind": 45, + "target": { + "$id": "1070", + "kind": 3, + "sv": "ModelProperty", + "pos": 4442, + "end": 4455, + "flags": 1, + "parent": { + "$ref": "1069" + }, + "_id": 314 + }, + "arguments": [], + "pos": 4442, + "end": 4455, + "flags": 1, + "parent": { + "$ref": "1066" + }, + "_id": 313 + } + ], + "pos": 4433, + "end": 4455, + "flags": 0, + "parent": { + "$ref": "1064" + } + }, + "optional": false, + "rest": false, + "pos": 4425, + "end": 4455, + "flags": 0, + "parent": { + "$ref": "1061" + }, + "symbol": { + "declarations": [ + { + "$ref": "1064" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 251 + } + }, + "parameters": [ + { + "$id": "1071", + "kind": 27, + "id": { + "$id": "1072", + "kind": 3, + "sv": "format", + "pos": 4457, + "end": 4463, + "flags": 0, + "parent": { + "$ref": "1071" + }, + "_id": 315 + }, + "type": { + "$id": "1073", + "kind": 44, + "target": { + "$id": "1074", + "kind": 45, + "target": { + "$id": "1075", + "kind": 3, + "sv": "string", + "pos": 4473, + "end": 4479, + "flags": 1, + "parent": { + "$ref": "1074" + }, + "_id": 317 + }, + "arguments": [], + "pos": 4473, + "end": 4479, + "flags": 1, + "parent": { + "$ref": "1073" + }, + "_id": 316 + }, + "pos": 4465, + "end": 4479, + "flags": 0, + "parent": { + "$ref": "1071" + } + }, + "optional": false, + "rest": false, + "pos": 4457, + "end": 4479, + "flags": 0, + "parent": { + "$ref": "1061" + }, + "symbol": { + "declarations": [ + { + "$ref": "1071" + } + ], + "name": "format", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 252 + } + } + ], + "pos": 3978, + "end": 4481, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1076", + "kind": 51, + "content": [ + { + "$id": "1077", + "kind": 52, + "text": "Specify a known data format hint for this string type. For example `uuid`, `uri`, etc.\nThis differs from the `@pattern` decorator which is meant to specify a regular expression while `@format` accepts a known format name.\nThe format names are open ended and are left to emitter to interpret.", + "pos": 3981, + "end": 4289, + "flags": 0, + "parent": { + "$ref": "1076" + } + } + ], + "tags": [ + { + "$id": "1078", + "kind": 53, + "tagName": { + "$id": "1079", + "kind": 3, + "sv": "param", + "pos": 4290, + "end": 4295, + "flags": 0, + "parent": { + "$ref": "1078" + } + }, + "paramName": { + "$id": "1080", + "kind": 3, + "sv": "format", + "pos": 4296, + "end": 4302, + "flags": 0, + "parent": { + "$ref": "1078" + } + }, + "content": [ + { + "$id": "1081", + "kind": 52, + "text": "format name.", + "pos": 4303, + "end": 4322, + "flags": 0, + "parent": { + "$ref": "1078" + } + } + ], + "pos": 4289, + "end": 4322, + "flags": 0, + "parent": { + "$ref": "1076" + } + }, + { + "$id": "1082", + "kind": 58, + "tagName": { + "$id": "1083", + "kind": 3, + "sv": "example", + "pos": 4323, + "end": 4330, + "flags": 0, + "parent": { + "$ref": "1082" + } + }, + "content": [ + { + "$id": "1084", + "kind": 52, + "text": "```typespec\n@format(\"uuid\")\nscalar uuid extends string;\n```", + "pos": 4330, + "end": 4404, + "flags": 0, + "parent": { + "$ref": "1082" + } + } + ], + "pos": 4322, + "end": 4404, + "flags": 0, + "parent": { + "$ref": "1076" + } + } + ], + "pos": 3978, + "end": 4406, + "flags": 0, + "parent": { + "$ref": "1061" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1061" + } + ], + "name": "@format", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1085", + "kind": 25, + "modifiers": [ + { + "$id": "1086", + "kind": 40, + "pos": 5584, + "end": 5590, + "flags": 0, + "parent": { + "$ref": "1085" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1087", + "kind": 3, + "sv": "pattern", + "pos": 5595, + "end": 5602, + "flags": 0, + "parent": { + "$ref": "1085" + }, + "_id": 318 + }, + "target": { + "$id": "1088", + "kind": 27, + "id": { + "$id": "1089", + "kind": 3, + "sv": "target", + "pos": 5606, + "end": 5612, + "flags": 0, + "parent": { + "$ref": "1088" + }, + "_id": 319 + }, + "type": { + "$id": "1090", + "kind": 28, + "options": [ + { + "$id": "1091", + "kind": 45, + "target": { + "$id": "1092", + "kind": 3, + "sv": "string", + "pos": 5614, + "end": 5620, + "flags": 1, + "parent": { + "$ref": "1091" + }, + "_id": 321 + }, + "arguments": [], + "pos": 5614, + "end": 5620, + "flags": 1, + "parent": { + "$ref": "1090" + }, + "_id": 320 + }, + { + "$id": "1093", + "kind": 45, + "target": { + "$id": "1094", + "kind": 3, + "sv": "bytes", + "pos": 5623, + "end": 5628, + "flags": 1, + "parent": { + "$ref": "1093" + }, + "_id": 323 + }, + "arguments": [], + "pos": 5623, + "end": 5628, + "flags": 1, + "parent": { + "$ref": "1090" + }, + "_id": 322 + }, + { + "$id": "1095", + "kind": 45, + "target": { + "$id": "1096", + "kind": 3, + "sv": "ModelProperty", + "pos": 5631, + "end": 5644, + "flags": 1, + "parent": { + "$ref": "1095" + }, + "_id": 325 + }, + "arguments": [], + "pos": 5631, + "end": 5644, + "flags": 1, + "parent": { + "$ref": "1090" + }, + "_id": 324 + } + ], + "pos": 5614, + "end": 5644, + "flags": 0, + "parent": { + "$ref": "1088" + } + }, + "optional": false, + "rest": false, + "pos": 5606, + "end": 5644, + "flags": 0, + "parent": { + "$ref": "1085" + }, + "symbol": { + "declarations": [ + { + "$ref": "1088" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 254 + } + }, + "parameters": [ + { + "$id": "1097", + "kind": 27, + "id": { + "$id": "1098", + "kind": 3, + "sv": "pattern", + "pos": 5648, + "end": 5655, + "flags": 0, + "parent": { + "$ref": "1097" + }, + "_id": 326 + }, + "type": { + "$id": "1099", + "kind": 44, + "target": { + "$id": "1100", + "kind": 45, + "target": { + "$id": "1101", + "kind": 3, + "sv": "string", + "pos": 5665, + "end": 5671, + "flags": 1, + "parent": { + "$ref": "1100" + }, + "_id": 328 + }, + "arguments": [], + "pos": 5665, + "end": 5671, + "flags": 1, + "parent": { + "$ref": "1099" + }, + "_id": 327 + }, + "pos": 5657, + "end": 5671, + "flags": 0, + "parent": { + "$ref": "1097" + } + }, + "optional": false, + "rest": false, + "pos": 5648, + "end": 5671, + "flags": 0, + "parent": { + "$ref": "1085" + }, + "symbol": { + "declarations": [ + { + "$ref": "1097" + } + ], + "name": "pattern", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 255 + } + }, + { + "$id": "1102", + "kind": 27, + "id": { + "$id": "1103", + "kind": 3, + "sv": "validationMessage", + "pos": 5675, + "end": 5692, + "flags": 0, + "parent": { + "$ref": "1102" + }, + "_id": 329 + }, + "type": { + "$id": "1104", + "kind": 44, + "target": { + "$id": "1105", + "kind": 45, + "target": { + "$id": "1106", + "kind": 3, + "sv": "string", + "pos": 5703, + "end": 5709, + "flags": 1, + "parent": { + "$ref": "1105" + }, + "_id": 331 + }, + "arguments": [], + "pos": 5703, + "end": 5709, + "flags": 1, + "parent": { + "$ref": "1104" + }, + "_id": 330 + }, + "pos": 5695, + "end": 5709, + "flags": 0, + "parent": { + "$ref": "1102" + } + }, + "optional": true, + "rest": false, + "pos": 5675, + "end": 5709, + "flags": 0, + "parent": { + "$ref": "1085" + }, + "symbol": { + "declarations": [ + { + "$ref": "1102" + } + ], + "name": "validationMessage", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 256 + } + } + ], + "pos": 4483, + "end": 5712, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1107", + "kind": 51, + "content": [ + { + "$id": "1108", + "kind": 52, + "text": "Specify the the pattern this string should respect using simple regular expression syntax.\nThe following syntax is allowed: alternations (`|`), quantifiers (`?`, `*`, `+`, and `{ }`), wildcard (`.`), and grouping parentheses.\nAdvanced features like look-around, capture groups, and references are not supported.\n\nThis decorator may optionally provide a custom validation _message_. Emitters may choose to use the message to provide\ncontext when pattern validation fails. For the sake of consistency, the message should be a phrase that describes in\nplain language what sort of content the pattern attempts to validate. For example, a complex regular expression that\nvalidates a GUID string might have a message like \"Must be a valid GUID.\"", + "pos": 4486, + "end": 5256, + "flags": 0, + "parent": { + "$ref": "1107" + } + } + ], + "tags": [ + { + "$id": "1109", + "kind": 53, + "tagName": { + "$id": "1110", + "kind": 3, + "sv": "param", + "pos": 5257, + "end": 5262, + "flags": 0, + "parent": { + "$ref": "1109" + } + }, + "paramName": { + "$id": "1111", + "kind": 3, + "sv": "pattern", + "pos": 5263, + "end": 5270, + "flags": 0, + "parent": { + "$ref": "1109" + } + }, + "content": [ + { + "$id": "1112", + "kind": 52, + "text": "Regular expression.", + "pos": 5271, + "end": 5294, + "flags": 0, + "parent": { + "$ref": "1109" + } + } + ], + "pos": 5256, + "end": 5294, + "flags": 0, + "parent": { + "$ref": "1107" + } + }, + { + "$id": "1113", + "kind": 53, + "tagName": { + "$id": "1114", + "kind": 3, + "sv": "param", + "pos": 5295, + "end": 5300, + "flags": 0, + "parent": { + "$ref": "1113" + } + }, + "paramName": { + "$id": "1115", + "kind": 3, + "sv": "validationMessage", + "pos": 5301, + "end": 5318, + "flags": 0, + "parent": { + "$ref": "1113" + } + }, + "content": [ + { + "$id": "1116", + "kind": 52, + "text": "Optional validation message that may provide context when validation fails.", + "pos": 5319, + "end": 5401, + "flags": 0, + "parent": { + "$ref": "1113" + } + } + ], + "pos": 5294, + "end": 5401, + "flags": 0, + "parent": { + "$ref": "1107" + } + }, + { + "$id": "1117", + "kind": 58, + "tagName": { + "$id": "1118", + "kind": 3, + "sv": "example", + "pos": 5402, + "end": 5409, + "flags": 0, + "parent": { + "$ref": "1117" + } + }, + "content": [ + { + "$id": "1119", + "kind": 52, + "text": "```typespec\n@pattern(\"[a-z]+\", \"Must be a string consisting of only lower case letters and of at least one character.\")\nscalar LowerAlpha extends string;\n```", + "pos": 5409, + "end": 5581, + "flags": 0, + "parent": { + "$ref": "1117" + } + } + ], + "pos": 5401, + "end": 5581, + "flags": 0, + "parent": { + "$ref": "1107" + } + } + ], + "pos": 4483, + "end": 5583, + "flags": 0, + "parent": { + "$ref": "1085" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1085" + } + ], + "name": "@pattern", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1120", + "kind": 25, + "modifiers": [ + { + "$id": "1121", + "kind": 40, + "pos": 5900, + "end": 5906, + "flags": 0, + "parent": { + "$ref": "1120" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1122", + "kind": 3, + "sv": "minLength", + "pos": 5911, + "end": 5920, + "flags": 0, + "parent": { + "$ref": "1120" + }, + "_id": 332 + }, + "target": { + "$id": "1123", + "kind": 27, + "id": { + "$id": "1124", + "kind": 3, + "sv": "target", + "pos": 5921, + "end": 5927, + "flags": 0, + "parent": { + "$ref": "1123" + }, + "_id": 333 + }, + "type": { + "$id": "1125", + "kind": 28, + "options": [ + { + "$id": "1126", + "kind": 45, + "target": { + "$id": "1127", + "kind": 3, + "sv": "string", + "pos": 5929, + "end": 5935, + "flags": 1, + "parent": { + "$ref": "1126" + }, + "_id": 335 + }, + "arguments": [], + "pos": 5929, + "end": 5935, + "flags": 1, + "parent": { + "$ref": "1125" + }, + "_id": 334 + }, + { + "$id": "1128", + "kind": 45, + "target": { + "$id": "1129", + "kind": 3, + "sv": "ModelProperty", + "pos": 5938, + "end": 5951, + "flags": 1, + "parent": { + "$ref": "1128" + }, + "_id": 337 + }, + "arguments": [], + "pos": 5938, + "end": 5951, + "flags": 1, + "parent": { + "$ref": "1125" + }, + "_id": 336 + } + ], + "pos": 5929, + "end": 5951, + "flags": 0, + "parent": { + "$ref": "1123" + } + }, + "optional": false, + "rest": false, + "pos": 5921, + "end": 5951, + "flags": 0, + "parent": { + "$ref": "1120" + }, + "symbol": { + "declarations": [ + { + "$ref": "1123" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 258 + } + }, + "parameters": [ + { + "$id": "1130", + "kind": 27, + "id": { + "$id": "1131", + "kind": 3, + "sv": "value", + "pos": 5953, + "end": 5958, + "flags": 0, + "parent": { + "$ref": "1130" + }, + "_id": 338 + }, + "type": { + "$id": "1132", + "kind": 44, + "target": { + "$id": "1133", + "kind": 45, + "target": { + "$id": "1134", + "kind": 3, + "sv": "integer", + "pos": 5968, + "end": 5975, + "flags": 1, + "parent": { + "$ref": "1133" + }, + "_id": 340 + }, + "arguments": [], + "pos": 5968, + "end": 5975, + "flags": 1, + "parent": { + "$ref": "1132" + }, + "_id": 339 + }, + "pos": 5960, + "end": 5975, + "flags": 0, + "parent": { + "$ref": "1130" + } + }, + "optional": false, + "rest": false, + "pos": 5953, + "end": 5975, + "flags": 0, + "parent": { + "$ref": "1120" + }, + "symbol": { + "declarations": [ + { + "$ref": "1130" + } + ], + "name": "value", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 259 + } + } + ], + "pos": 5714, + "end": 5977, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1135", + "kind": 51, + "content": [ + { + "$id": "1136", + "kind": 52, + "text": "Specify the minimum length this string type should be.", + "pos": 5717, + "end": 5779, + "flags": 0, + "parent": { + "$ref": "1135" + } + } + ], + "tags": [ + { + "$id": "1137", + "kind": 53, + "tagName": { + "$id": "1138", + "kind": 3, + "sv": "param", + "pos": 5780, + "end": 5785, + "flags": 0, + "parent": { + "$ref": "1137" + } + }, + "paramName": { + "$id": "1139", + "kind": 3, + "sv": "value", + "pos": 5786, + "end": 5791, + "flags": 0, + "parent": { + "$ref": "1137" + } + }, + "content": [ + { + "$id": "1140", + "kind": 52, + "text": "Minimum length", + "pos": 5792, + "end": 5813, + "flags": 0, + "parent": { + "$ref": "1137" + } + } + ], + "pos": 5779, + "end": 5813, + "flags": 0, + "parent": { + "$ref": "1135" + } + }, + { + "$id": "1141", + "kind": 58, + "tagName": { + "$id": "1142", + "kind": 3, + "sv": "example", + "pos": 5814, + "end": 5821, + "flags": 0, + "parent": { + "$ref": "1141" + } + }, + "content": [ + { + "$id": "1143", + "kind": 52, + "text": "```typespec\n@minLength(2)\nscalar Username extends string;\n```", + "pos": 5821, + "end": 5897, + "flags": 0, + "parent": { + "$ref": "1141" + } + } + ], + "pos": 5813, + "end": 5897, + "flags": 0, + "parent": { + "$ref": "1135" + } + } + ], + "pos": 5714, + "end": 5899, + "flags": 0, + "parent": { + "$ref": "1120" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1120" + } + ], + "name": "@minLength", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1144", + "kind": 25, + "modifiers": [ + { + "$id": "1145", + "kind": 40, + "pos": 6166, + "end": 6172, + "flags": 0, + "parent": { + "$ref": "1144" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1146", + "kind": 3, + "sv": "maxLength", + "pos": 6177, + "end": 6186, + "flags": 0, + "parent": { + "$ref": "1144" + }, + "_id": 341 + }, + "target": { + "$id": "1147", + "kind": 27, + "id": { + "$id": "1148", + "kind": 3, + "sv": "target", + "pos": 6187, + "end": 6193, + "flags": 0, + "parent": { + "$ref": "1147" + }, + "_id": 342 + }, + "type": { + "$id": "1149", + "kind": 28, + "options": [ + { + "$id": "1150", + "kind": 45, + "target": { + "$id": "1151", + "kind": 3, + "sv": "string", + "pos": 6195, + "end": 6201, + "flags": 1, + "parent": { + "$ref": "1150" + }, + "_id": 344 + }, + "arguments": [], + "pos": 6195, + "end": 6201, + "flags": 1, + "parent": { + "$ref": "1149" + }, + "_id": 343 + }, + { + "$id": "1152", + "kind": 45, + "target": { + "$id": "1153", + "kind": 3, + "sv": "ModelProperty", + "pos": 6204, + "end": 6217, + "flags": 1, + "parent": { + "$ref": "1152" + }, + "_id": 346 + }, + "arguments": [], + "pos": 6204, + "end": 6217, + "flags": 1, + "parent": { + "$ref": "1149" + }, + "_id": 345 + } + ], + "pos": 6195, + "end": 6217, + "flags": 0, + "parent": { + "$ref": "1147" + } + }, + "optional": false, + "rest": false, + "pos": 6187, + "end": 6217, + "flags": 0, + "parent": { + "$ref": "1144" + }, + "symbol": { + "declarations": [ + { + "$ref": "1147" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 261 + } + }, + "parameters": [ + { + "$id": "1154", + "kind": 27, + "id": { + "$id": "1155", + "kind": 3, + "sv": "value", + "pos": 6219, + "end": 6224, + "flags": 0, + "parent": { + "$ref": "1154" + }, + "_id": 347 + }, + "type": { + "$id": "1156", + "kind": 44, + "target": { + "$id": "1157", + "kind": 45, + "target": { + "$id": "1158", + "kind": 3, + "sv": "integer", + "pos": 6234, + "end": 6241, + "flags": 1, + "parent": { + "$ref": "1157" + }, + "_id": 349 + }, + "arguments": [], + "pos": 6234, + "end": 6241, + "flags": 1, + "parent": { + "$ref": "1156" + }, + "_id": 348 + }, + "pos": 6226, + "end": 6241, + "flags": 0, + "parent": { + "$ref": "1154" + } + }, + "optional": false, + "rest": false, + "pos": 6219, + "end": 6241, + "flags": 0, + "parent": { + "$ref": "1144" + }, + "symbol": { + "declarations": [ + { + "$ref": "1154" + } + ], + "name": "value", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 262 + } + } + ], + "pos": 5979, + "end": 6243, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1159", + "kind": 51, + "content": [ + { + "$id": "1160", + "kind": 52, + "text": "Specify the maximum length this string type should be.", + "pos": 5982, + "end": 6044, + "flags": 0, + "parent": { + "$ref": "1159" + } + } + ], + "tags": [ + { + "$id": "1161", + "kind": 53, + "tagName": { + "$id": "1162", + "kind": 3, + "sv": "param", + "pos": 6045, + "end": 6050, + "flags": 0, + "parent": { + "$ref": "1161" + } + }, + "paramName": { + "$id": "1163", + "kind": 3, + "sv": "value", + "pos": 6051, + "end": 6056, + "flags": 0, + "parent": { + "$ref": "1161" + } + }, + "content": [ + { + "$id": "1164", + "kind": 52, + "text": "Maximum length", + "pos": 6057, + "end": 6078, + "flags": 0, + "parent": { + "$ref": "1161" + } + } + ], + "pos": 6044, + "end": 6078, + "flags": 0, + "parent": { + "$ref": "1159" + } + }, + { + "$id": "1165", + "kind": 58, + "tagName": { + "$id": "1166", + "kind": 3, + "sv": "example", + "pos": 6079, + "end": 6086, + "flags": 0, + "parent": { + "$ref": "1165" + } + }, + "content": [ + { + "$id": "1167", + "kind": 52, + "text": "```typespec\n@maxLength(20)\nscalar Username extends string;\n```", + "pos": 6086, + "end": 6163, + "flags": 0, + "parent": { + "$ref": "1165" + } + } + ], + "pos": 6078, + "end": 6163, + "flags": 0, + "parent": { + "$ref": "1159" + } + } + ], + "pos": 5979, + "end": 6165, + "flags": 0, + "parent": { + "$ref": "1144" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1144" + } + ], + "name": "@maxLength", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1168", + "kind": 24, + "id": { + "$id": "1169", + "kind": 3, + "sv": "RangeLimitableTypes", + "pos": 6291, + "end": 6310, + "flags": 0, + "parent": { + "$ref": "1168" + }, + "_id": 350 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "value": { + "$id": "1170", + "kind": 28, + "options": [ + { + "$id": "1171", + "kind": 45, + "target": { + "$id": "1172", + "kind": 3, + "sv": "numeric", + "pos": 6317, + "end": 6324, + "flags": 1, + "parent": { + "$ref": "1171" + }, + "_id": 352 + }, + "arguments": [], + "pos": 6317, + "end": 6324, + "flags": 1, + "parent": { + "$ref": "1170" + }, + "_id": 351 + }, + { + "$id": "1173", + "kind": 45, + "target": { + "$id": "1174", + "kind": 3, + "sv": "utcDateTime", + "pos": 6329, + "end": 6340, + "flags": 1, + "parent": { + "$ref": "1173" + }, + "_id": 354 + }, + "arguments": [], + "pos": 6329, + "end": 6340, + "flags": 1, + "parent": { + "$ref": "1170" + }, + "_id": 353 + }, + { + "$id": "1175", + "kind": 45, + "target": { + "$id": "1176", + "kind": 3, + "sv": "offsetDateTime", + "pos": 6345, + "end": 6359, + "flags": 1, + "parent": { + "$ref": "1175" + }, + "_id": 356 + }, + "arguments": [], + "pos": 6345, + "end": 6359, + "flags": 1, + "parent": { + "$ref": "1170" + }, + "_id": 355 + }, + { + "$id": "1177", + "kind": 45, + "target": { + "$id": "1178", + "kind": 3, + "sv": "plainDate", + "pos": 6364, + "end": 6373, + "flags": 1, + "parent": { + "$ref": "1177" + }, + "_id": 358 + }, + "arguments": [], + "pos": 6364, + "end": 6373, + "flags": 1, + "parent": { + "$ref": "1170" + }, + "_id": 357 + }, + { + "$id": "1179", + "kind": 45, + "target": { + "$id": "1180", + "kind": 3, + "sv": "plainTime", + "pos": 6378, + "end": 6387, + "flags": 1, + "parent": { + "$ref": "1179" + }, + "_id": 360 + }, + "arguments": [], + "pos": 6378, + "end": 6387, + "flags": 1, + "parent": { + "$ref": "1170" + }, + "_id": 359 + }, + { + "$id": "1181", + "kind": 45, + "target": { + "$id": "1182", + "kind": 3, + "sv": "duration", + "pos": 6392, + "end": 6400, + "flags": 1, + "parent": { + "$ref": "1181" + }, + "_id": 362 + }, + "arguments": [], + "pos": 6392, + "end": 6400, + "flags": 1, + "parent": { + "$ref": "1170" + }, + "_id": 361 + } + ], + "pos": 6315, + "end": 6400, + "flags": 0, + "parent": { + "$ref": "1168" + } + }, + "pos": 6245, + "end": 6401, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1183", + "kind": 51, + "content": [ + { + "$id": "1184", + "kind": 52, + "text": "Types that can have range limits", + "pos": 6248, + "end": 6282, + "flags": 0, + "parent": { + "$ref": "1183" + } + } + ], + "tags": [], + "pos": 6245, + "end": 6284, + "flags": 0, + "parent": { + "$ref": "1168" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1168" + } + ], + "name": "RangeLimitableTypes", + "flags": 1048704, + "metatypeMembers": { + "duplicates": {} + }, + "id": 63 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "1185", + "kind": 25, + "modifiers": [ + { + "$id": "1186", + "kind": 40, + "pos": 6590, + "end": 6596, + "flags": 0, + "parent": { + "$ref": "1185" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1187", + "kind": 3, + "sv": "minItems", + "pos": 6601, + "end": 6609, + "flags": 0, + "parent": { + "$ref": "1185" + }, + "_id": 363 + }, + "target": { + "$id": "1188", + "kind": 27, + "id": { + "$id": "1189", + "kind": 3, + "sv": "target", + "pos": 6610, + "end": 6616, + "flags": 0, + "parent": { + "$ref": "1188" + }, + "_id": 364 + }, + "type": { + "$id": "1190", + "kind": 28, + "options": [ + { + "$id": "1191", + "kind": 31, + "elementType": { + "$id": "1192", + "kind": 43, + "pos": 6618, + "end": 6625, + "flags": 0, + "parent": { + "$ref": "1191" + } + }, + "pos": 6618, + "end": 6627, + "flags": 0, + "parent": { + "$ref": "1190" + } + }, + { + "$id": "1193", + "kind": 45, + "target": { + "$id": "1194", + "kind": 3, + "sv": "ModelProperty", + "pos": 6630, + "end": 6643, + "flags": 1, + "parent": { + "$ref": "1193" + }, + "_id": 366 + }, + "arguments": [], + "pos": 6630, + "end": 6643, + "flags": 1, + "parent": { + "$ref": "1190" + }, + "_id": 365 + } + ], + "pos": 6618, + "end": 6643, + "flags": 0, + "parent": { + "$ref": "1188" + } + }, + "optional": false, + "rest": false, + "pos": 6610, + "end": 6643, + "flags": 0, + "parent": { + "$ref": "1185" + }, + "symbol": { + "declarations": [ + { + "$ref": "1188" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 264 + } + }, + "parameters": [ + { + "$id": "1195", + "kind": 27, + "id": { + "$id": "1196", + "kind": 3, + "sv": "value", + "pos": 6645, + "end": 6650, + "flags": 0, + "parent": { + "$ref": "1195" + }, + "_id": 367 + }, + "type": { + "$id": "1197", + "kind": 44, + "target": { + "$id": "1198", + "kind": 45, + "target": { + "$id": "1199", + "kind": 3, + "sv": "integer", + "pos": 6660, + "end": 6667, + "flags": 1, + "parent": { + "$ref": "1198" + }, + "_id": 369 + }, + "arguments": [], + "pos": 6660, + "end": 6667, + "flags": 1, + "parent": { + "$ref": "1197" + }, + "_id": 368 + }, + "pos": 6652, + "end": 6667, + "flags": 0, + "parent": { + "$ref": "1195" + } + }, + "optional": false, + "rest": false, + "pos": 6645, + "end": 6667, + "flags": 0, + "parent": { + "$ref": "1185" + }, + "symbol": { + "declarations": [ + { + "$ref": "1195" + } + ], + "name": "value", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 265 + } + } + ], + "pos": 6403, + "end": 6669, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1200", + "kind": 51, + "content": [ + { + "$id": "1201", + "kind": 52, + "text": "Specify the minimum number of items this array should have.", + "pos": 6406, + "end": 6473, + "flags": 0, + "parent": { + "$ref": "1200" + } + } + ], + "tags": [ + { + "$id": "1202", + "kind": 53, + "tagName": { + "$id": "1203", + "kind": 3, + "sv": "param", + "pos": 6474, + "end": 6479, + "flags": 0, + "parent": { + "$ref": "1202" + } + }, + "paramName": { + "$id": "1204", + "kind": 3, + "sv": "value", + "pos": 6480, + "end": 6485, + "flags": 0, + "parent": { + "$ref": "1202" + } + }, + "content": [ + { + "$id": "1205", + "kind": 52, + "text": "Minimum number", + "pos": 6486, + "end": 6507, + "flags": 0, + "parent": { + "$ref": "1202" + } + } + ], + "pos": 6473, + "end": 6507, + "flags": 0, + "parent": { + "$ref": "1200" + } + }, + { + "$id": "1206", + "kind": 58, + "tagName": { + "$id": "1207", + "kind": 3, + "sv": "example", + "pos": 6508, + "end": 6515, + "flags": 0, + "parent": { + "$ref": "1206" + } + }, + "content": [ + { + "$id": "1208", + "kind": 52, + "text": "```typespec\n@minItems(1)\nmodel Endpoints is string[];\n```", + "pos": 6515, + "end": 6587, + "flags": 0, + "parent": { + "$ref": "1206" + } + } + ], + "pos": 6507, + "end": 6587, + "flags": 0, + "parent": { + "$ref": "1200" + } + } + ], + "pos": 6403, + "end": 6589, + "flags": 0, + "parent": { + "$ref": "1185" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1185" + } + ], + "name": "@minItems", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1209", + "kind": 25, + "modifiers": [ + { + "$id": "1210", + "kind": 40, + "pos": 6858, + "end": 6864, + "flags": 0, + "parent": { + "$ref": "1209" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1211", + "kind": 3, + "sv": "maxItems", + "pos": 6869, + "end": 6877, + "flags": 0, + "parent": { + "$ref": "1209" + }, + "_id": 370 + }, + "target": { + "$id": "1212", + "kind": 27, + "id": { + "$id": "1213", + "kind": 3, + "sv": "target", + "pos": 6878, + "end": 6884, + "flags": 0, + "parent": { + "$ref": "1212" + }, + "_id": 371 + }, + "type": { + "$id": "1214", + "kind": 28, + "options": [ + { + "$id": "1215", + "kind": 31, + "elementType": { + "$id": "1216", + "kind": 43, + "pos": 6886, + "end": 6893, + "flags": 0, + "parent": { + "$ref": "1215" + } + }, + "pos": 6886, + "end": 6895, + "flags": 0, + "parent": { + "$ref": "1214" + } + }, + { + "$id": "1217", + "kind": 45, + "target": { + "$id": "1218", + "kind": 3, + "sv": "ModelProperty", + "pos": 6898, + "end": 6911, + "flags": 1, + "parent": { + "$ref": "1217" + }, + "_id": 373 + }, + "arguments": [], + "pos": 6898, + "end": 6911, + "flags": 1, + "parent": { + "$ref": "1214" + }, + "_id": 372 + } + ], + "pos": 6886, + "end": 6911, + "flags": 0, + "parent": { + "$ref": "1212" + } + }, + "optional": false, + "rest": false, + "pos": 6878, + "end": 6911, + "flags": 0, + "parent": { + "$ref": "1209" + }, + "symbol": { + "declarations": [ + { + "$ref": "1212" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 267 + } + }, + "parameters": [ + { + "$id": "1219", + "kind": 27, + "id": { + "$id": "1220", + "kind": 3, + "sv": "value", + "pos": 6913, + "end": 6918, + "flags": 0, + "parent": { + "$ref": "1219" + }, + "_id": 374 + }, + "type": { + "$id": "1221", + "kind": 44, + "target": { + "$id": "1222", + "kind": 45, + "target": { + "$id": "1223", + "kind": 3, + "sv": "integer", + "pos": 6928, + "end": 6935, + "flags": 1, + "parent": { + "$ref": "1222" + }, + "_id": 376 + }, + "arguments": [], + "pos": 6928, + "end": 6935, + "flags": 1, + "parent": { + "$ref": "1221" + }, + "_id": 375 + }, + "pos": 6920, + "end": 6935, + "flags": 0, + "parent": { + "$ref": "1219" + } + }, + "optional": false, + "rest": false, + "pos": 6913, + "end": 6935, + "flags": 0, + "parent": { + "$ref": "1209" + }, + "symbol": { + "declarations": [ + { + "$ref": "1219" + } + ], + "name": "value", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 268 + } + } + ], + "pos": 6671, + "end": 6937, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1224", + "kind": 51, + "content": [ + { + "$id": "1225", + "kind": 52, + "text": "Specify the maximum number of items this array should have.", + "pos": 6674, + "end": 6741, + "flags": 0, + "parent": { + "$ref": "1224" + } + } + ], + "tags": [ + { + "$id": "1226", + "kind": 53, + "tagName": { + "$id": "1227", + "kind": 3, + "sv": "param", + "pos": 6742, + "end": 6747, + "flags": 0, + "parent": { + "$ref": "1226" + } + }, + "paramName": { + "$id": "1228", + "kind": 3, + "sv": "value", + "pos": 6748, + "end": 6753, + "flags": 0, + "parent": { + "$ref": "1226" + } + }, + "content": [ + { + "$id": "1229", + "kind": 52, + "text": "Maximum number", + "pos": 6754, + "end": 6775, + "flags": 0, + "parent": { + "$ref": "1226" + } + } + ], + "pos": 6741, + "end": 6775, + "flags": 0, + "parent": { + "$ref": "1224" + } + }, + { + "$id": "1230", + "kind": 58, + "tagName": { + "$id": "1231", + "kind": 3, + "sv": "example", + "pos": 6776, + "end": 6783, + "flags": 0, + "parent": { + "$ref": "1230" + } + }, + "content": [ + { + "$id": "1232", + "kind": 52, + "text": "```typespec\n@maxItems(5)\nmodel Endpoints is string[];\n```", + "pos": 6783, + "end": 6855, + "flags": 0, + "parent": { + "$ref": "1230" + } + } + ], + "pos": 6775, + "end": 6855, + "flags": 0, + "parent": { + "$ref": "1224" + } + } + ], + "pos": 6671, + "end": 6857, + "flags": 0, + "parent": { + "$ref": "1209" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1209" + } + ], + "name": "@maxItems", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1233", + "kind": 25, + "modifiers": [ + { + "$id": "1234", + "kind": 40, + "pos": 7113, + "end": 7119, + "flags": 0, + "parent": { + "$ref": "1233" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1235", + "kind": 3, + "sv": "minValue", + "pos": 7124, + "end": 7132, + "flags": 0, + "parent": { + "$ref": "1233" + }, + "_id": 377 + }, + "target": { + "$id": "1236", + "kind": 27, + "id": { + "$id": "1237", + "kind": 3, + "sv": "target", + "pos": 7136, + "end": 7142, + "flags": 0, + "parent": { + "$ref": "1236" + }, + "_id": 378 + }, + "type": { + "$id": "1238", + "kind": 28, + "options": [ + { + "$id": "1239", + "kind": 45, + "target": { + "$id": "1240", + "kind": 3, + "sv": "RangeLimitableTypes", + "pos": 7144, + "end": 7163, + "flags": 1, + "parent": { + "$ref": "1239" + }, + "_id": 380 + }, + "arguments": [], + "pos": 7144, + "end": 7163, + "flags": 1, + "parent": { + "$ref": "1238" + }, + "_id": 379 + }, + { + "$id": "1241", + "kind": 45, + "target": { + "$id": "1242", + "kind": 3, + "sv": "ModelProperty", + "pos": 7166, + "end": 7179, + "flags": 1, + "parent": { + "$ref": "1241" + }, + "_id": 382 + }, + "arguments": [], + "pos": 7166, + "end": 7179, + "flags": 1, + "parent": { + "$ref": "1238" + }, + "_id": 381 + } + ], + "pos": 7144, + "end": 7179, + "flags": 0, + "parent": { + "$ref": "1236" + } + }, + "optional": false, + "rest": false, + "pos": 7136, + "end": 7179, + "flags": 0, + "parent": { + "$ref": "1233" + }, + "symbol": { + "declarations": [ + { + "$ref": "1236" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 270 + } + }, + "parameters": [ + { + "$id": "1243", + "kind": 27, + "id": { + "$id": "1244", + "kind": 3, + "sv": "value", + "pos": 7183, + "end": 7188, + "flags": 0, + "parent": { + "$ref": "1243" + }, + "_id": 383 + }, + "type": { + "$id": "1245", + "kind": 44, + "target": { + "$id": "1246", + "kind": 45, + "target": { + "$id": "1247", + "kind": 3, + "sv": "RangeLimitableTypes", + "pos": 7198, + "end": 7217, + "flags": 1, + "parent": { + "$ref": "1246" + }, + "_id": 385 + }, + "arguments": [], + "pos": 7198, + "end": 7217, + "flags": 1, + "parent": { + "$ref": "1245" + }, + "_id": 384 + }, + "pos": 7190, + "end": 7217, + "flags": 0, + "parent": { + "$ref": "1243" + } + }, + "optional": false, + "rest": false, + "pos": 7183, + "end": 7217, + "flags": 0, + "parent": { + "$ref": "1233" + }, + "symbol": { + "declarations": [ + { + "$ref": "1243" + } + ], + "name": "value", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 271 + } + } + ], + "pos": 6939, + "end": 7220, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1248", + "kind": 51, + "content": [ + { + "$id": "1249", + "kind": 52, + "text": "Specify the minimum value this numeric type should be.", + "pos": 6942, + "end": 7004, + "flags": 0, + "parent": { + "$ref": "1248" + } + } + ], + "tags": [ + { + "$id": "1250", + "kind": 53, + "tagName": { + "$id": "1251", + "kind": 3, + "sv": "param", + "pos": 7005, + "end": 7010, + "flags": 0, + "parent": { + "$ref": "1250" + } + }, + "paramName": { + "$id": "1252", + "kind": 3, + "sv": "value", + "pos": 7011, + "end": 7016, + "flags": 0, + "parent": { + "$ref": "1250" + } + }, + "content": [ + { + "$id": "1253", + "kind": 52, + "text": "Minimum value", + "pos": 7017, + "end": 7037, + "flags": 0, + "parent": { + "$ref": "1250" + } + } + ], + "pos": 7004, + "end": 7037, + "flags": 0, + "parent": { + "$ref": "1248" + } + }, + { + "$id": "1254", + "kind": 58, + "tagName": { + "$id": "1255", + "kind": 3, + "sv": "example", + "pos": 7038, + "end": 7045, + "flags": 0, + "parent": { + "$ref": "1254" + } + }, + "content": [ + { + "$id": "1256", + "kind": 52, + "text": "```typespec\n@minValue(18)\nscalar Age is int32;\n```", + "pos": 7045, + "end": 7110, + "flags": 0, + "parent": { + "$ref": "1254" + } + } + ], + "pos": 7037, + "end": 7110, + "flags": 0, + "parent": { + "$ref": "1248" + } + } + ], + "pos": 6939, + "end": 7112, + "flags": 0, + "parent": { + "$ref": "1233" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1233" + } + ], + "name": "@minValue", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1257", + "kind": 25, + "modifiers": [ + { + "$id": "1258", + "kind": 40, + "pos": 7397, + "end": 7403, + "flags": 0, + "parent": { + "$ref": "1257" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1259", + "kind": 3, + "sv": "maxValue", + "pos": 7408, + "end": 7416, + "flags": 0, + "parent": { + "$ref": "1257" + }, + "_id": 386 + }, + "target": { + "$id": "1260", + "kind": 27, + "id": { + "$id": "1261", + "kind": 3, + "sv": "target", + "pos": 7420, + "end": 7426, + "flags": 0, + "parent": { + "$ref": "1260" + }, + "_id": 387 + }, + "type": { + "$id": "1262", + "kind": 28, + "options": [ + { + "$id": "1263", + "kind": 45, + "target": { + "$id": "1264", + "kind": 3, + "sv": "RangeLimitableTypes", + "pos": 7428, + "end": 7447, + "flags": 1, + "parent": { + "$ref": "1263" + }, + "_id": 389 + }, + "arguments": [], + "pos": 7428, + "end": 7447, + "flags": 1, + "parent": { + "$ref": "1262" + }, + "_id": 388 + }, + { + "$id": "1265", + "kind": 45, + "target": { + "$id": "1266", + "kind": 3, + "sv": "ModelProperty", + "pos": 7450, + "end": 7463, + "flags": 1, + "parent": { + "$ref": "1265" + }, + "_id": 391 + }, + "arguments": [], + "pos": 7450, + "end": 7463, + "flags": 1, + "parent": { + "$ref": "1262" + }, + "_id": 390 + } + ], + "pos": 7428, + "end": 7463, + "flags": 0, + "parent": { + "$ref": "1260" + } + }, + "optional": false, + "rest": false, + "pos": 7420, + "end": 7463, + "flags": 0, + "parent": { + "$ref": "1257" + }, + "symbol": { + "declarations": [ + { + "$ref": "1260" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 273 + } + }, + "parameters": [ + { + "$id": "1267", + "kind": 27, + "id": { + "$id": "1268", + "kind": 3, + "sv": "value", + "pos": 7467, + "end": 7472, + "flags": 0, + "parent": { + "$ref": "1267" + }, + "_id": 392 + }, + "type": { + "$id": "1269", + "kind": 44, + "target": { + "$id": "1270", + "kind": 45, + "target": { + "$id": "1271", + "kind": 3, + "sv": "RangeLimitableTypes", + "pos": 7482, + "end": 7501, + "flags": 1, + "parent": { + "$ref": "1270" + }, + "_id": 394 + }, + "arguments": [], + "pos": 7482, + "end": 7501, + "flags": 1, + "parent": { + "$ref": "1269" + }, + "_id": 393 + }, + "pos": 7474, + "end": 7501, + "flags": 0, + "parent": { + "$ref": "1267" + } + }, + "optional": false, + "rest": false, + "pos": 7467, + "end": 7501, + "flags": 0, + "parent": { + "$ref": "1257" + }, + "symbol": { + "declarations": [ + { + "$ref": "1267" + } + ], + "name": "value", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 274 + } + } + ], + "pos": 7222, + "end": 7504, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1272", + "kind": 51, + "content": [ + { + "$id": "1273", + "kind": 52, + "text": "Specify the maximum value this numeric type should be.", + "pos": 7225, + "end": 7287, + "flags": 0, + "parent": { + "$ref": "1272" + } + } + ], + "tags": [ + { + "$id": "1274", + "kind": 53, + "tagName": { + "$id": "1275", + "kind": 3, + "sv": "param", + "pos": 7288, + "end": 7293, + "flags": 0, + "parent": { + "$ref": "1274" + } + }, + "paramName": { + "$id": "1276", + "kind": 3, + "sv": "value", + "pos": 7294, + "end": 7299, + "flags": 0, + "parent": { + "$ref": "1274" + } + }, + "content": [ + { + "$id": "1277", + "kind": 52, + "text": "Maximum value", + "pos": 7300, + "end": 7320, + "flags": 0, + "parent": { + "$ref": "1274" + } + } + ], + "pos": 7287, + "end": 7320, + "flags": 0, + "parent": { + "$ref": "1272" + } + }, + { + "$id": "1278", + "kind": 58, + "tagName": { + "$id": "1279", + "kind": 3, + "sv": "example", + "pos": 7321, + "end": 7328, + "flags": 0, + "parent": { + "$ref": "1278" + } + }, + "content": [ + { + "$id": "1280", + "kind": 52, + "text": "```typespec\n@maxValue(200)\nscalar Age is int32;\n```", + "pos": 7328, + "end": 7394, + "flags": 0, + "parent": { + "$ref": "1278" + } + } + ], + "pos": 7320, + "end": 7394, + "flags": 0, + "parent": { + "$ref": "1272" + } + } + ], + "pos": 7222, + "end": 7396, + "flags": 0, + "parent": { + "$ref": "1257" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1257" + } + ], + "name": "@maxValue", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1281", + "kind": 25, + "modifiers": [ + { + "$id": "1282", + "kind": 40, + "pos": 7728, + "end": 7734, + "flags": 0, + "parent": { + "$ref": "1281" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1283", + "kind": 3, + "sv": "minValueExclusive", + "pos": 7739, + "end": 7756, + "flags": 0, + "parent": { + "$ref": "1281" + }, + "_id": 395 + }, + "target": { + "$id": "1284", + "kind": 27, + "id": { + "$id": "1285", + "kind": 3, + "sv": "target", + "pos": 7760, + "end": 7766, + "flags": 0, + "parent": { + "$ref": "1284" + }, + "_id": 396 + }, + "type": { + "$id": "1286", + "kind": 28, + "options": [ + { + "$id": "1287", + "kind": 45, + "target": { + "$id": "1288", + "kind": 3, + "sv": "RangeLimitableTypes", + "pos": 7768, + "end": 7787, + "flags": 1, + "parent": { + "$ref": "1287" + }, + "_id": 398 + }, + "arguments": [], + "pos": 7768, + "end": 7787, + "flags": 1, + "parent": { + "$ref": "1286" + }, + "_id": 397 + }, + { + "$id": "1289", + "kind": 45, + "target": { + "$id": "1290", + "kind": 3, + "sv": "ModelProperty", + "pos": 7790, + "end": 7803, + "flags": 1, + "parent": { + "$ref": "1289" + }, + "_id": 400 + }, + "arguments": [], + "pos": 7790, + "end": 7803, + "flags": 1, + "parent": { + "$ref": "1286" + }, + "_id": 399 + } + ], + "pos": 7768, + "end": 7803, + "flags": 0, + "parent": { + "$ref": "1284" + } + }, + "optional": false, + "rest": false, + "pos": 7760, + "end": 7803, + "flags": 0, + "parent": { + "$ref": "1281" + }, + "symbol": { + "declarations": [ + { + "$ref": "1284" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 276 + } + }, + "parameters": [ + { + "$id": "1291", + "kind": 27, + "id": { + "$id": "1292", + "kind": 3, + "sv": "value", + "pos": 7807, + "end": 7812, + "flags": 0, + "parent": { + "$ref": "1291" + }, + "_id": 401 + }, + "type": { + "$id": "1293", + "kind": 44, + "target": { + "$id": "1294", + "kind": 45, + "target": { + "$id": "1295", + "kind": 3, + "sv": "RangeLimitableTypes", + "pos": 7822, + "end": 7841, + "flags": 1, + "parent": { + "$ref": "1294" + }, + "_id": 403 + }, + "arguments": [], + "pos": 7822, + "end": 7841, + "flags": 1, + "parent": { + "$ref": "1293" + }, + "_id": 402 + }, + "pos": 7814, + "end": 7841, + "flags": 0, + "parent": { + "$ref": "1291" + } + }, + "optional": false, + "rest": false, + "pos": 7807, + "end": 7841, + "flags": 0, + "parent": { + "$ref": "1281" + }, + "symbol": { + "declarations": [ + { + "$ref": "1291" + } + ], + "name": "value", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 277 + } + } + ], + "pos": 7506, + "end": 7844, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1296", + "kind": 51, + "content": [ + { + "$id": "1297", + "kind": 52, + "text": "Specify the minimum value this numeric type should be, exclusive of the given\nvalue.", + "pos": 7509, + "end": 7604, + "flags": 0, + "parent": { + "$ref": "1296" + } + } + ], + "tags": [ + { + "$id": "1298", + "kind": 53, + "tagName": { + "$id": "1299", + "kind": 3, + "sv": "param", + "pos": 7605, + "end": 7610, + "flags": 0, + "parent": { + "$ref": "1298" + } + }, + "paramName": { + "$id": "1300", + "kind": 3, + "sv": "value", + "pos": 7611, + "end": 7616, + "flags": 0, + "parent": { + "$ref": "1298" + } + }, + "content": [ + { + "$id": "1301", + "kind": 52, + "text": "Minimum value", + "pos": 7617, + "end": 7637, + "flags": 0, + "parent": { + "$ref": "1298" + } + } + ], + "pos": 7604, + "end": 7637, + "flags": 0, + "parent": { + "$ref": "1296" + } + }, + { + "$id": "1302", + "kind": 58, + "tagName": { + "$id": "1303", + "kind": 3, + "sv": "example", + "pos": 7638, + "end": 7645, + "flags": 0, + "parent": { + "$ref": "1302" + } + }, + "content": [ + { + "$id": "1304", + "kind": 52, + "text": "```typespec\n@minValueExclusive(0)\nscalar distance is float64;\n```", + "pos": 7645, + "end": 7725, + "flags": 0, + "parent": { + "$ref": "1302" + } + } + ], + "pos": 7637, + "end": 7725, + "flags": 0, + "parent": { + "$ref": "1296" + } + } + ], + "pos": 7506, + "end": 7727, + "flags": 0, + "parent": { + "$ref": "1281" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1281" + } + ], + "name": "@minValueExclusive", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1305", + "kind": 25, + "modifiers": [ + { + "$id": "1306", + "kind": 40, + "pos": 8069, + "end": 8075, + "flags": 0, + "parent": { + "$ref": "1305" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1307", + "kind": 3, + "sv": "maxValueExclusive", + "pos": 8080, + "end": 8097, + "flags": 0, + "parent": { + "$ref": "1305" + }, + "_id": 404 + }, + "target": { + "$id": "1308", + "kind": 27, + "id": { + "$id": "1309", + "kind": 3, + "sv": "target", + "pos": 8101, + "end": 8107, + "flags": 0, + "parent": { + "$ref": "1308" + }, + "_id": 405 + }, + "type": { + "$id": "1310", + "kind": 28, + "options": [ + { + "$id": "1311", + "kind": 45, + "target": { + "$id": "1312", + "kind": 3, + "sv": "RangeLimitableTypes", + "pos": 8109, + "end": 8128, + "flags": 1, + "parent": { + "$ref": "1311" + }, + "_id": 407 + }, + "arguments": [], + "pos": 8109, + "end": 8128, + "flags": 1, + "parent": { + "$ref": "1310" + }, + "_id": 406 + }, + { + "$id": "1313", + "kind": 45, + "target": { + "$id": "1314", + "kind": 3, + "sv": "ModelProperty", + "pos": 8131, + "end": 8144, + "flags": 1, + "parent": { + "$ref": "1313" + }, + "_id": 409 + }, + "arguments": [], + "pos": 8131, + "end": 8144, + "flags": 1, + "parent": { + "$ref": "1310" + }, + "_id": 408 + } + ], + "pos": 8109, + "end": 8144, + "flags": 0, + "parent": { + "$ref": "1308" + } + }, + "optional": false, + "rest": false, + "pos": 8101, + "end": 8144, + "flags": 0, + "parent": { + "$ref": "1305" + }, + "symbol": { + "declarations": [ + { + "$ref": "1308" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 279 + } + }, + "parameters": [ + { + "$id": "1315", + "kind": 27, + "id": { + "$id": "1316", + "kind": 3, + "sv": "value", + "pos": 8148, + "end": 8153, + "flags": 0, + "parent": { + "$ref": "1315" + }, + "_id": 410 + }, + "type": { + "$id": "1317", + "kind": 44, + "target": { + "$id": "1318", + "kind": 45, + "target": { + "$id": "1319", + "kind": 3, + "sv": "RangeLimitableTypes", + "pos": 8163, + "end": 8182, + "flags": 1, + "parent": { + "$ref": "1318" + }, + "_id": 412 + }, + "arguments": [], + "pos": 8163, + "end": 8182, + "flags": 1, + "parent": { + "$ref": "1317" + }, + "_id": 411 + }, + "pos": 8155, + "end": 8182, + "flags": 0, + "parent": { + "$ref": "1315" + } + }, + "optional": false, + "rest": false, + "pos": 8148, + "end": 8182, + "flags": 0, + "parent": { + "$ref": "1305" + }, + "symbol": { + "declarations": [ + { + "$ref": "1315" + } + ], + "name": "value", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 280 + } + } + ], + "pos": 7846, + "end": 8185, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1320", + "kind": 51, + "content": [ + { + "$id": "1321", + "kind": 52, + "text": "Specify the maximum value this numeric type should be, exclusive of the given\nvalue.", + "pos": 7849, + "end": 7944, + "flags": 0, + "parent": { + "$ref": "1320" + } + } + ], + "tags": [ + { + "$id": "1322", + "kind": 53, + "tagName": { + "$id": "1323", + "kind": 3, + "sv": "param", + "pos": 7945, + "end": 7950, + "flags": 0, + "parent": { + "$ref": "1322" + } + }, + "paramName": { + "$id": "1324", + "kind": 3, + "sv": "value", + "pos": 7951, + "end": 7956, + "flags": 0, + "parent": { + "$ref": "1322" + } + }, + "content": [ + { + "$id": "1325", + "kind": 52, + "text": "Maximum value", + "pos": 7957, + "end": 7977, + "flags": 0, + "parent": { + "$ref": "1322" + } + } + ], + "pos": 7944, + "end": 7977, + "flags": 0, + "parent": { + "$ref": "1320" + } + }, + { + "$id": "1326", + "kind": 58, + "tagName": { + "$id": "1327", + "kind": 3, + "sv": "example", + "pos": 7978, + "end": 7985, + "flags": 0, + "parent": { + "$ref": "1326" + } + }, + "content": [ + { + "$id": "1328", + "kind": 52, + "text": "```typespec\n@maxValueExclusive(50)\nscalar distance is float64;\n```", + "pos": 7985, + "end": 8066, + "flags": 0, + "parent": { + "$ref": "1326" + } + } + ], + "pos": 7977, + "end": 8066, + "flags": 0, + "parent": { + "$ref": "1320" + } + } + ], + "pos": 7846, + "end": 8068, + "flags": 0, + "parent": { + "$ref": "1305" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1305" + } + ], + "name": "@maxValueExclusive", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1329", + "kind": 25, + "modifiers": [ + { + "$id": "1330", + "kind": 40, + "pos": 8361, + "end": 8367, + "flags": 0, + "parent": { + "$ref": "1329" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1331", + "kind": 3, + "sv": "secret", + "pos": 8372, + "end": 8378, + "flags": 0, + "parent": { + "$ref": "1329" + }, + "_id": 413 + }, + "target": { + "$id": "1332", + "kind": 27, + "id": { + "$id": "1333", + "kind": 3, + "sv": "target", + "pos": 8379, + "end": 8385, + "flags": 0, + "parent": { + "$ref": "1332" + }, + "_id": 414 + }, + "type": { + "$id": "1334", + "kind": 28, + "options": [ + { + "$id": "1335", + "kind": 45, + "target": { + "$id": "1336", + "kind": 3, + "sv": "Scalar", + "pos": 8387, + "end": 8393, + "flags": 1, + "parent": { + "$ref": "1335" + }, + "_id": 416 + }, + "arguments": [], + "pos": 8387, + "end": 8393, + "flags": 1, + "parent": { + "$ref": "1334" + }, + "_id": 415 + }, + { + "$id": "1337", + "kind": 45, + "target": { + "$id": "1338", + "kind": 3, + "sv": "ModelProperty", + "pos": 8396, + "end": 8409, + "flags": 1, + "parent": { + "$ref": "1337" + }, + "_id": 418 + }, + "arguments": [], + "pos": 8396, + "end": 8409, + "flags": 1, + "parent": { + "$ref": "1334" + }, + "_id": 417 + }, + { + "$id": "1339", + "kind": 45, + "target": { + "$id": "1340", + "kind": 3, + "sv": "Model", + "pos": 8412, + "end": 8417, + "flags": 1, + "parent": { + "$ref": "1339" + }, + "_id": 420 + }, + "arguments": [], + "pos": 8412, + "end": 8417, + "flags": 1, + "parent": { + "$ref": "1334" + }, + "_id": 419 + }, + { + "$id": "1341", + "kind": 45, + "target": { + "$id": "1342", + "kind": 3, + "sv": "Union", + "pos": 8420, + "end": 8425, + "flags": 1, + "parent": { + "$ref": "1341" + }, + "_id": 422 + }, + "arguments": [], + "pos": 8420, + "end": 8425, + "flags": 1, + "parent": { + "$ref": "1334" + }, + "_id": 421 + }, + { + "$id": "1343", + "kind": 45, + "target": { + "$id": "1344", + "kind": 3, + "sv": "Enum", + "pos": 8428, + "end": 8432, + "flags": 1, + "parent": { + "$ref": "1343" + }, + "_id": 424 + }, + "arguments": [], + "pos": 8428, + "end": 8432, + "flags": 1, + "parent": { + "$ref": "1334" + }, + "_id": 423 + } + ], + "pos": 8387, + "end": 8432, + "flags": 0, + "parent": { + "$ref": "1332" + } + }, + "optional": false, + "rest": false, + "pos": 8379, + "end": 8432, + "flags": 0, + "parent": { + "$ref": "1329" + }, + "symbol": { + "declarations": [ + { + "$ref": "1332" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 282 + } + }, + "parameters": [], + "pos": 8187, + "end": 8434, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1345", + "kind": 51, + "content": [ + { + "$id": "1346", + "kind": 52, + "text": "Mark this value as a secret value that should be treated carefully to avoid exposure", + "pos": 8190, + "end": 8285, + "flags": 0, + "parent": { + "$ref": "1345" + } + } + ], + "tags": [ + { + "$id": "1347", + "kind": 58, + "tagName": { + "$id": "1348", + "kind": 3, + "sv": "example", + "pos": 8286, + "end": 8293, + "flags": 0, + "parent": { + "$ref": "1347" + } + }, + "content": [ + { + "$id": "1349", + "kind": 52, + "text": "```typespec\n@secret\nscalar Password is string;\n```", + "pos": 8293, + "end": 8358, + "flags": 0, + "parent": { + "$ref": "1347" + } + } + ], + "pos": 8285, + "end": 8358, + "flags": 0, + "parent": { + "$ref": "1345" + } + } + ], + "pos": 8187, + "end": 8360, + "flags": 0, + "parent": { + "$ref": "1329" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1329" + } + ], + "name": "@secret", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1350", + "kind": 25, + "modifiers": [ + { + "$id": "1351", + "kind": 40, + "pos": 8619, + "end": 8625, + "flags": 0, + "parent": { + "$ref": "1350" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1352", + "kind": 3, + "sv": "tag", + "pos": 8630, + "end": 8633, + "flags": 0, + "parent": { + "$ref": "1350" + }, + "_id": 425 + }, + "target": { + "$id": "1353", + "kind": 27, + "id": { + "$id": "1354", + "kind": 3, + "sv": "target", + "pos": 8634, + "end": 8640, + "flags": 0, + "parent": { + "$ref": "1353" + }, + "_id": 426 + }, + "type": { + "$id": "1355", + "kind": 28, + "options": [ + { + "$id": "1356", + "kind": 45, + "target": { + "$id": "1357", + "kind": 3, + "sv": "Namespace", + "pos": 8642, + "end": 8651, + "flags": 1, + "parent": { + "$ref": "1356" + }, + "_id": 428 + }, + "arguments": [], + "pos": 8642, + "end": 8651, + "flags": 1, + "parent": { + "$ref": "1355" + }, + "_id": 427 + }, + { + "$id": "1358", + "kind": 45, + "target": { + "$id": "1359", + "kind": 3, + "sv": "Interface", + "pos": 8654, + "end": 8663, + "flags": 1, + "parent": { + "$ref": "1358" + }, + "_id": 430 + }, + "arguments": [], + "pos": 8654, + "end": 8663, + "flags": 1, + "parent": { + "$ref": "1355" + }, + "_id": 429 + }, + { + "$id": "1360", + "kind": 45, + "target": { + "$id": "1361", + "kind": 3, + "sv": "Operation", + "pos": 8666, + "end": 8675, + "flags": 1, + "parent": { + "$ref": "1360" + }, + "_id": 433 + }, + "arguments": [], + "pos": 8666, + "end": 8675, + "flags": 1, + "parent": { + "$ref": "1355" + }, + "_id": 432 + } + ], + "pos": 8642, + "end": 8675, + "flags": 0, + "parent": { + "$ref": "1353" + } + }, + "optional": false, + "rest": false, + "pos": 8634, + "end": 8675, + "flags": 0, + "parent": { + "$ref": "1350" + }, + "symbol": { + "declarations": [ + { + "$ref": "1353" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 284 + } + }, + "parameters": [ + { + "$id": "1362", + "kind": 27, + "id": { + "$id": "1363", + "kind": 3, + "sv": "tag", + "pos": 8677, + "end": 8680, + "flags": 0, + "parent": { + "$ref": "1362" + }, + "_id": 434 + }, + "type": { + "$id": "1364", + "kind": 44, + "target": { + "$id": "1365", + "kind": 45, + "target": { + "$id": "1366", + "kind": 3, + "sv": "string", + "pos": 8690, + "end": 8696, + "flags": 1, + "parent": { + "$ref": "1365" + }, + "_id": 436 + }, + "arguments": [], + "pos": 8690, + "end": 8696, + "flags": 1, + "parent": { + "$ref": "1364" + }, + "_id": 435 + }, + "pos": 8682, + "end": 8696, + "flags": 0, + "parent": { + "$ref": "1362" + } + }, + "optional": false, + "rest": false, + "pos": 8677, + "end": 8696, + "flags": 0, + "parent": { + "$ref": "1350" + }, + "symbol": { + "declarations": [ + { + "$ref": "1362" + } + ], + "name": "tag", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 285 + } + } + ], + "pos": 8436, + "end": 8698, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1367", + "kind": 51, + "content": [ + { + "$id": "1368", + "kind": 52, + "text": "Attaches a tag to an operation, interface, or namespace. Multiple `@tag` decorators can be specified to attach multiple tags to a TypeSpec element.", + "pos": 8439, + "end": 8594, + "flags": 0, + "parent": { + "$ref": "1367" + } + } + ], + "tags": [ + { + "$id": "1369", + "kind": 53, + "tagName": { + "$id": "1370", + "kind": 3, + "sv": "param", + "pos": 8595, + "end": 8600, + "flags": 0, + "parent": { + "$ref": "1369" + } + }, + "paramName": { + "$id": "1371", + "kind": 3, + "sv": "tag", + "pos": 8601, + "end": 8604, + "flags": 0, + "parent": { + "$ref": "1369" + } + }, + "content": [ + { + "$id": "1372", + "kind": 52, + "text": "Tag value", + "pos": 8605, + "end": 8616, + "flags": 0, + "parent": { + "$ref": "1369" + } + } + ], + "pos": 8594, + "end": 8616, + "flags": 0, + "parent": { + "$ref": "1367" + } + } + ], + "pos": 8436, + "end": 8618, + "flags": 0, + "parent": { + "$ref": "1350" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1350" + } + ], + "name": "@tag", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1373", + "kind": 25, + "modifiers": [ + { + "$id": "1374", + "kind": 40, + "pos": 9037, + "end": 9043, + "flags": 0, + "parent": { + "$ref": "1373" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1375", + "kind": 3, + "sv": "friendlyName", + "pos": 9048, + "end": 9060, + "flags": 0, + "parent": { + "$ref": "1373" + }, + "_id": 437 + }, + "target": { + "$id": "1376", + "kind": 27, + "id": { + "$id": "1377", + "kind": 3, + "sv": "target", + "pos": 9061, + "end": 9067, + "flags": 0, + "parent": { + "$ref": "1376" + }, + "_id": 438 + }, + "type": { + "$id": "1378", + "kind": 43, + "pos": 9069, + "end": 9076, + "flags": 0, + "parent": { + "$ref": "1376" + } + }, + "optional": false, + "rest": false, + "pos": 9061, + "end": 9076, + "flags": 0, + "parent": { + "$ref": "1373" + }, + "symbol": { + "declarations": [ + { + "$ref": "1376" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 287 + } + }, + "parameters": [ + { + "$id": "1379", + "kind": 27, + "id": { + "$id": "1380", + "kind": 3, + "sv": "name", + "pos": 9078, + "end": 9082, + "flags": 0, + "parent": { + "$ref": "1379" + }, + "_id": 439 + }, + "type": { + "$id": "1381", + "kind": 44, + "target": { + "$id": "1382", + "kind": 45, + "target": { + "$id": "1383", + "kind": 3, + "sv": "string", + "pos": 9092, + "end": 9098, + "flags": 1, + "parent": { + "$ref": "1382" + }, + "_id": 441 + }, + "arguments": [], + "pos": 9092, + "end": 9098, + "flags": 1, + "parent": { + "$ref": "1381" + }, + "_id": 440 + }, + "pos": 9084, + "end": 9098, + "flags": 0, + "parent": { + "$ref": "1379" + } + }, + "optional": false, + "rest": false, + "pos": 9078, + "end": 9098, + "flags": 0, + "parent": { + "$ref": "1373" + }, + "symbol": { + "declarations": [ + { + "$ref": "1379" + } + ], + "name": "name", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 288 + } + }, + { + "$id": "1384", + "kind": 27, + "id": { + "$id": "1385", + "kind": 3, + "sv": "formatArgs", + "pos": 9100, + "end": 9110, + "flags": 0, + "parent": { + "$ref": "1384" + }, + "_id": 442 + }, + "type": { + "$id": "1386", + "kind": 43, + "pos": 9113, + "end": 9120, + "flags": 0, + "parent": { + "$ref": "1384" + } + }, + "optional": true, + "rest": false, + "pos": 9100, + "end": 9120, + "flags": 0, + "parent": { + "$ref": "1373" + }, + "symbol": { + "declarations": [ + { + "$ref": "1384" + } + ], + "name": "formatArgs", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 289 + } + } + ], + "pos": 8700, + "end": 9122, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1387", + "kind": 51, + "content": [ + { + "$id": "1388", + "kind": 52, + "text": "Specifies how a templated type should name their instances.", + "pos": 8703, + "end": 8770, + "flags": 0, + "parent": { + "$ref": "1387" + } + } + ], + "tags": [ + { + "$id": "1389", + "kind": 53, + "tagName": { + "$id": "1390", + "kind": 3, + "sv": "param", + "pos": 8771, + "end": 8776, + "flags": 0, + "parent": { + "$ref": "1389" + } + }, + "paramName": { + "$id": "1391", + "kind": 3, + "sv": "name", + "pos": 8777, + "end": 8781, + "flags": 0, + "parent": { + "$ref": "1389" + } + }, + "content": [ + { + "$id": "1392", + "kind": 52, + "text": "name the template instance should take", + "pos": 8782, + "end": 8824, + "flags": 0, + "parent": { + "$ref": "1389" + } + } + ], + "pos": 8770, + "end": 8824, + "flags": 0, + "parent": { + "$ref": "1387" + } + }, + { + "$id": "1393", + "kind": 53, + "tagName": { + "$id": "1394", + "kind": 3, + "sv": "param", + "pos": 8825, + "end": 8830, + "flags": 0, + "parent": { + "$ref": "1393" + } + }, + "paramName": { + "$id": "1395", + "kind": 3, + "sv": "formatArgs", + "pos": 8831, + "end": 8841, + "flags": 0, + "parent": { + "$ref": "1393" + } + }, + "content": [ + { + "$id": "1396", + "kind": 52, + "text": "Model with key value used to interpolate the name", + "pos": 8842, + "end": 8898, + "flags": 0, + "parent": { + "$ref": "1393" + } + } + ], + "pos": 8824, + "end": 8898, + "flags": 0, + "parent": { + "$ref": "1387" + } + }, + { + "$id": "1397", + "kind": 58, + "tagName": { + "$id": "1398", + "kind": 3, + "sv": "example", + "pos": 8899, + "end": 8906, + "flags": 0, + "parent": { + "$ref": "1397" + } + }, + "content": [ + { + "$id": "1399", + "kind": 52, + "text": "```typespec\n@friendlyName(\"{name}List\", T)\nmodel List {\n value: Item[];\n nextLink: string;\n}\n```", + "pos": 8906, + "end": 9034, + "flags": 0, + "parent": { + "$ref": "1397" + } + } + ], + "pos": 8898, + "end": 9034, + "flags": 0, + "parent": { + "$ref": "1387" + } + } + ], + "pos": 8700, + "end": 9036, + "flags": 0, + "parent": { + "$ref": "1373" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1373" + } + ], + "name": "@friendlyName", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1400", + "kind": 25, + "modifiers": [ + { + "$id": "1401", + "kind": 40, + "pos": 9377, + "end": 9383, + "flags": 0, + "parent": { + "$ref": "1400" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1402", + "kind": 3, + "sv": "key", + "pos": 9388, + "end": 9391, + "flags": 0, + "parent": { + "$ref": "1400" + }, + "_id": 443 + }, + "target": { + "$id": "1403", + "kind": 27, + "id": { + "$id": "1404", + "kind": 3, + "sv": "target", + "pos": 9392, + "end": 9398, + "flags": 0, + "parent": { + "$ref": "1403" + }, + "_id": 444 + }, + "type": { + "$id": "1405", + "kind": 45, + "target": { + "$id": "1406", + "kind": 3, + "sv": "ModelProperty", + "pos": 9400, + "end": 9413, + "flags": 1, + "parent": { + "$ref": "1405" + }, + "_id": 446 + }, + "arguments": [], + "pos": 9400, + "end": 9413, + "flags": 1, + "parent": { + "$ref": "1403" + }, + "_id": 445 + }, + "optional": false, + "rest": false, + "pos": 9392, + "end": 9413, + "flags": 0, + "parent": { + "$ref": "1400" + }, + "symbol": { + "declarations": [ + { + "$ref": "1403" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 291 + } + }, + "parameters": [ + { + "$id": "1407", + "kind": 27, + "id": { + "$id": "1408", + "kind": 3, + "sv": "altName", + "pos": 9415, + "end": 9422, + "flags": 0, + "parent": { + "$ref": "1407" + }, + "_id": 447 + }, + "type": { + "$id": "1409", + "kind": 44, + "target": { + "$id": "1410", + "kind": 45, + "target": { + "$id": "1411", + "kind": 3, + "sv": "string", + "pos": 9433, + "end": 9439, + "flags": 1, + "parent": { + "$ref": "1410" + }, + "_id": 449 + }, + "arguments": [], + "pos": 9433, + "end": 9439, + "flags": 1, + "parent": { + "$ref": "1409" + }, + "_id": 448 + }, + "pos": 9425, + "end": 9439, + "flags": 0, + "parent": { + "$ref": "1407" + } + }, + "optional": true, + "rest": false, + "pos": 9415, + "end": 9439, + "flags": 0, + "parent": { + "$ref": "1400" + }, + "symbol": { + "declarations": [ + { + "$ref": "1407" + } + ], + "name": "altName", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 292 + } + } + ], + "pos": 9124, + "end": 9441, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1412", + "kind": 51, + "content": [ + { + "$id": "1413", + "kind": 52, + "text": "Mark a model property as the key to identify instances of that type", + "pos": 9127, + "end": 9202, + "flags": 0, + "parent": { + "$ref": "1412" + } + } + ], + "tags": [ + { + "$id": "1414", + "kind": 53, + "tagName": { + "$id": "1415", + "kind": 3, + "sv": "param", + "pos": 9203, + "end": 9208, + "flags": 0, + "parent": { + "$ref": "1414" + } + }, + "paramName": { + "$id": "1416", + "kind": 3, + "sv": "altName", + "pos": 9209, + "end": 9216, + "flags": 0, + "parent": { + "$ref": "1414" + } + }, + "content": [ + { + "$id": "1417", + "kind": 52, + "text": "Name of the property. If not specified, the decorated property name is used.", + "pos": 9217, + "end": 9300, + "flags": 0, + "parent": { + "$ref": "1414" + } + } + ], + "pos": 9202, + "end": 9300, + "flags": 0, + "parent": { + "$ref": "1412" + } + }, + { + "$id": "1418", + "kind": 58, + "tagName": { + "$id": "1419", + "kind": 3, + "sv": "example", + "pos": 9301, + "end": 9308, + "flags": 0, + "parent": { + "$ref": "1418" + } + }, + "content": [ + { + "$id": "1420", + "kind": 52, + "text": "```typespec\nmodel Pet {\n @key id: string;\n}\n```", + "pos": 9308, + "end": 9374, + "flags": 0, + "parent": { + "$ref": "1418" + } + } + ], + "pos": 9300, + "end": 9374, + "flags": 0, + "parent": { + "$ref": "1412" + } + } + ], + "pos": 9124, + "end": 9376, + "flags": 0, + "parent": { + "$ref": "1400" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1400" + } + ], + "name": "@key", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1421", + "kind": 25, + "modifiers": [ + { + "$id": "1422", + "kind": 40, + "pos": 9942, + "end": 9948, + "flags": 0, + "parent": { + "$ref": "1421" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1423", + "kind": 3, + "sv": "overload", + "pos": 9953, + "end": 9961, + "flags": 0, + "parent": { + "$ref": "1421" + }, + "_id": 450 + }, + "target": { + "$id": "1424", + "kind": 27, + "id": { + "$id": "1425", + "kind": 3, + "sv": "target", + "pos": 9962, + "end": 9968, + "flags": 0, + "parent": { + "$ref": "1424" + }, + "_id": 451 + }, + "type": { + "$id": "1426", + "kind": 45, + "target": { + "$id": "1427", + "kind": 3, + "sv": "Operation", + "pos": 9970, + "end": 9979, + "flags": 1, + "parent": { + "$ref": "1426" + }, + "_id": 453 + }, + "arguments": [], + "pos": 9970, + "end": 9979, + "flags": 1, + "parent": { + "$ref": "1424" + }, + "_id": 452 + }, + "optional": false, + "rest": false, + "pos": 9962, + "end": 9979, + "flags": 0, + "parent": { + "$ref": "1421" + }, + "symbol": { + "declarations": [ + { + "$ref": "1424" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 294 + } + }, + "parameters": [ + { + "$id": "1428", + "kind": 27, + "id": { + "$id": "1429", + "kind": 3, + "sv": "overloadbase", + "pos": 9981, + "end": 9993, + "flags": 0, + "parent": { + "$ref": "1428" + }, + "_id": 454 + }, + "type": { + "$id": "1430", + "kind": 45, + "target": { + "$id": "1431", + "kind": 3, + "sv": "Operation", + "pos": 9995, + "end": 10004, + "flags": 1, + "parent": { + "$ref": "1430" + }, + "_id": 456 + }, + "arguments": [], + "pos": 9995, + "end": 10004, + "flags": 1, + "parent": { + "$ref": "1428" + }, + "_id": 455 + }, + "optional": false, + "rest": false, + "pos": 9981, + "end": 10004, + "flags": 0, + "parent": { + "$ref": "1421" + }, + "symbol": { + "declarations": [ + { + "$ref": "1428" + } + ], + "name": "overloadbase", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 295 + } + } + ], + "pos": 9443, + "end": 10006, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1432", + "kind": 51, + "content": [ + { + "$id": "1433", + "kind": 52, + "text": "Specify this operation is an overload of the given operation.", + "pos": 9446, + "end": 9515, + "flags": 0, + "parent": { + "$ref": "1432" + } + } + ], + "tags": [ + { + "$id": "1434", + "kind": 53, + "tagName": { + "$id": "1435", + "kind": 3, + "sv": "param", + "pos": 9516, + "end": 9521, + "flags": 0, + "parent": { + "$ref": "1434" + } + }, + "paramName": { + "$id": "1436", + "kind": 3, + "sv": "overloadbase", + "pos": 9522, + "end": 9534, + "flags": 0, + "parent": { + "$ref": "1434" + } + }, + "content": [ + { + "$id": "1437", + "kind": 52, + "text": "Base operation that should be a union of all overloads", + "pos": 9535, + "end": 9596, + "flags": 0, + "parent": { + "$ref": "1434" + } + } + ], + "pos": 9515, + "end": 9596, + "flags": 0, + "parent": { + "$ref": "1432" + } + }, + { + "$id": "1438", + "kind": 58, + "tagName": { + "$id": "1439", + "kind": 3, + "sv": "example", + "pos": 9597, + "end": 9604, + "flags": 0, + "parent": { + "$ref": "1438" + } + }, + "content": [ + { + "$id": "1440", + "kind": 52, + "text": "```typespec\nop upload(data: string | bytes, @header contentType: \"text/plain\" | \"application/octet-stream\"): void;\n@overload(upload)\nop uploadString(data: string, @header contentType: \"text/plain\" ): void;\n@overload(upload)\nop uploadBytes(data: bytes, @header contentType: \"application/octet-stream\"): void;\n```", + "pos": 9604, + "end": 9939, + "flags": 0, + "parent": { + "$ref": "1438" + } + } + ], + "pos": 9596, + "end": 9939, + "flags": 0, + "parent": { + "$ref": "1432" + } + } + ], + "pos": 9443, + "end": 9941, + "flags": 0, + "parent": { + "$ref": "1421" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1421" + } + ], + "name": "@overload", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1441", + "kind": 25, + "modifiers": [ + { + "$id": "1442", + "kind": 40, + "pos": 10702, + "end": 10708, + "flags": 0, + "parent": { + "$ref": "1441" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1443", + "kind": 3, + "sv": "encodedName", + "pos": 10713, + "end": 10724, + "flags": 0, + "parent": { + "$ref": "1441" + }, + "_id": 457 + }, + "target": { + "$id": "1444", + "kind": 27, + "id": { + "$id": "1445", + "kind": 3, + "sv": "target", + "pos": 10725, + "end": 10731, + "flags": 0, + "parent": { + "$ref": "1444" + }, + "_id": 458 + }, + "type": { + "$id": "1446", + "kind": 43, + "pos": 10733, + "end": 10740, + "flags": 0, + "parent": { + "$ref": "1444" + } + }, + "optional": false, + "rest": false, + "pos": 10725, + "end": 10740, + "flags": 0, + "parent": { + "$ref": "1441" + }, + "symbol": { + "declarations": [ + { + "$ref": "1444" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 297 + } + }, + "parameters": [ + { + "$id": "1447", + "kind": 27, + "id": { + "$id": "1448", + "kind": 3, + "sv": "mimeType", + "pos": 10742, + "end": 10750, + "flags": 0, + "parent": { + "$ref": "1447" + }, + "_id": 459 + }, + "type": { + "$id": "1449", + "kind": 44, + "target": { + "$id": "1450", + "kind": 45, + "target": { + "$id": "1451", + "kind": 3, + "sv": "string", + "pos": 10760, + "end": 10766, + "flags": 1, + "parent": { + "$ref": "1450" + }, + "_id": 461 + }, + "arguments": [], + "pos": 10760, + "end": 10766, + "flags": 1, + "parent": { + "$ref": "1449" + }, + "_id": 460 + }, + "pos": 10752, + "end": 10766, + "flags": 0, + "parent": { + "$ref": "1447" + } + }, + "optional": false, + "rest": false, + "pos": 10742, + "end": 10766, + "flags": 0, + "parent": { + "$ref": "1441" + }, + "symbol": { + "declarations": [ + { + "$ref": "1447" + } + ], + "name": "mimeType", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 298 + } + }, + { + "$id": "1452", + "kind": 27, + "id": { + "$id": "1453", + "kind": 3, + "sv": "name", + "pos": 10768, + "end": 10772, + "flags": 0, + "parent": { + "$ref": "1452" + }, + "_id": 462 + }, + "type": { + "$id": "1454", + "kind": 44, + "target": { + "$id": "1455", + "kind": 45, + "target": { + "$id": "1456", + "kind": 3, + "sv": "string", + "pos": 10782, + "end": 10788, + "flags": 1, + "parent": { + "$ref": "1455" + }, + "_id": 464 + }, + "arguments": [], + "pos": 10782, + "end": 10788, + "flags": 1, + "parent": { + "$ref": "1454" + }, + "_id": 463 + }, + "pos": 10774, + "end": 10788, + "flags": 0, + "parent": { + "$ref": "1452" + } + }, + "optional": false, + "rest": false, + "pos": 10768, + "end": 10788, + "flags": 0, + "parent": { + "$ref": "1441" + }, + "symbol": { + "declarations": [ + { + "$ref": "1452" + } + ], + "name": "name", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 299 + } + } + ], + "pos": 10008, + "end": 10790, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1457", + "kind": 51, + "content": [ + { + "$id": "1458", + "kind": 52, + "text": "Provide an alternative name for this type when serialized to the given mime type.", + "pos": 10011, + "end": 10100, + "flags": 0, + "parent": { + "$ref": "1457" + } + } + ], + "tags": [ + { + "$id": "1459", + "kind": 53, + "tagName": { + "$id": "1460", + "kind": 3, + "sv": "param", + "pos": 10101, + "end": 10106, + "flags": 0, + "parent": { + "$ref": "1459" + } + }, + "paramName": { + "$id": "1461", + "kind": 3, + "sv": "mimeType", + "pos": 10107, + "end": 10115, + "flags": 0, + "parent": { + "$ref": "1459" + } + }, + "content": [ + { + "$id": "1462", + "kind": 52, + "text": "Mime type this should apply to. The mime type should be a known mime type as described here https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types without any suffix (e.g. `+json`)", + "pos": 10116, + "end": 10334, + "flags": 0, + "parent": { + "$ref": "1459" + } + } + ], + "pos": 10100, + "end": 10334, + "flags": 0, + "parent": { + "$ref": "1457" + } + }, + { + "$id": "1463", + "kind": 53, + "tagName": { + "$id": "1464", + "kind": 3, + "sv": "param", + "pos": 10335, + "end": 10340, + "flags": 0, + "parent": { + "$ref": "1463" + } + }, + "paramName": { + "$id": "1465", + "kind": 3, + "sv": "name", + "pos": 10341, + "end": 10345, + "flags": 0, + "parent": { + "$ref": "1463" + } + }, + "content": [ + { + "$id": "1466", + "kind": 52, + "text": "Alternative name", + "pos": 10346, + "end": 10369, + "flags": 0, + "parent": { + "$ref": "1463" + } + } + ], + "pos": 10334, + "end": 10369, + "flags": 0, + "parent": { + "$ref": "1457" + } + }, + { + "$id": "1467", + "kind": 58, + "tagName": { + "$id": "1468", + "kind": 3, + "sv": "example", + "pos": 10370, + "end": 10377, + "flags": 0, + "parent": { + "$ref": "1467" + } + }, + "content": [ + { + "$id": "1469", + "kind": 52, + "text": "```typespec\nmodel Certificate {\n @encodedName(\"application/json\", \"exp\")\n @encodedName(\"application/xml\", \"expiry\")\n expireAt: int32;\n}\n```", + "pos": 10377, + "end": 10551, + "flags": 0, + "parent": { + "$ref": "1467" + } + } + ], + "pos": 10369, + "end": 10551, + "flags": 0, + "parent": { + "$ref": "1457" + } + }, + { + "$id": "1470", + "kind": 58, + "tagName": { + "$id": "1471", + "kind": 3, + "sv": "example", + "pos": 10552, + "end": 10559, + "flags": 0, + "parent": { + "$ref": "1470" + } + }, + "content": [ + { + "$id": "1472", + "kind": 52, + "text": "Invalid values\n\n```typespec\n@encodedName(\"application/merge-patch+json\", \"exp\")\n ^ error cannot use subtype\n```", + "pos": 10559, + "end": 10699, + "flags": 0, + "parent": { + "$ref": "1470" + } + } + ], + "pos": 10551, + "end": 10699, + "flags": 0, + "parent": { + "$ref": "1457" + } + } + ], + "pos": 10008, + "end": 10701, + "flags": 0, + "parent": { + "$ref": "1441" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1441" + } + ], + "name": "@encodedName", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1473", + "kind": 13, + "id": { + "$id": "1474", + "kind": 3, + "sv": "DiscriminatedOptions", + "pos": 10849, + "end": 10869, + "flags": 0, + "parent": { + "$ref": "1473" + }, + "_id": 465 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [ + { + "$id": "1475", + "kind": 15, + "id": { + "$id": "1476", + "kind": 3, + "sv": "envelope", + "pos": 10955, + "end": 10963, + "flags": 0, + "parent": { + "$ref": "1475" + }, + "_id": 466 + }, + "decorators": [], + "value": { + "$id": "1477", + "kind": 28, + "options": [ + { + "$id": "1478", + "kind": 32, + "value": "object", + "pos": 10966, + "end": 10974, + "flags": 0, + "parent": { + "$ref": "1477" + } + }, + { + "$id": "1479", + "kind": 32, + "value": "none", + "pos": 10977, + "end": 10983, + "flags": 0, + "parent": { + "$ref": "1477" + } + } + ], + "pos": 10966, + "end": 10983, + "flags": 0, + "parent": { + "$ref": "1475" + } + }, + "optional": true, + "pos": 10874, + "end": 10983, + "flags": 0, + "docs": [ + { + "$id": "1480", + "kind": 51, + "content": [ + { + "$id": "1481", + "kind": 52, + "text": "How is the discriminated union serialized.", + "pos": 10877, + "end": 10931, + "flags": 0, + "parent": { + "$ref": "1480" + } + } + ], + "tags": [ + { + "$id": "1482", + "kind": 58, + "tagName": { + "$id": "1483", + "kind": 3, + "sv": "default", + "pos": 10932, + "end": 10939, + "flags": 0, + "parent": { + "$ref": "1482" + } + }, + "content": [ + { + "$id": "1484", + "kind": 52, + "text": "object", + "pos": 10939, + "end": 10950, + "flags": 0, + "parent": { + "$ref": "1482" + } + } + ], + "pos": 10931, + "end": 10950, + "flags": 0, + "parent": { + "$ref": "1480" + } + } + ], + "pos": 10874, + "end": 10952, + "flags": 0, + "parent": { + "$ref": "1475" + } + } + ], + "directives": [], + "parent": { + "$ref": "1473" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1475" + }, + "name": "envelope", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1473" + } + ], + "name": "DiscriminatedOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 65 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1485", + "kind": 15, + "id": { + "$id": "1486", + "kind": 3, + "sv": "discriminatorPropertyName", + "pos": 11032, + "end": 11057, + "flags": 0, + "parent": { + "$ref": "1485" + }, + "_id": 467 + }, + "decorators": [], + "value": { + "$id": "1487", + "kind": 45, + "target": { + "$id": "1488", + "kind": 3, + "sv": "string", + "pos": 11060, + "end": 11066, + "flags": 1, + "parent": { + "$ref": "1487" + }, + "_id": 469 + }, + "arguments": [], + "pos": 11060, + "end": 11066, + "flags": 1, + "parent": { + "$ref": "1485" + }, + "_id": 468 + }, + "optional": true, + "pos": 10988, + "end": 11066, + "flags": 0, + "docs": [ + { + "$id": "1489", + "kind": 51, + "content": [ + { + "$id": "1490", + "kind": 52, + "text": "Name of the discriminator property", + "pos": 10991, + "end": 11027, + "flags": 0, + "parent": { + "$ref": "1489" + } + } + ], + "tags": [], + "pos": 10988, + "end": 11029, + "flags": 0, + "parent": { + "$ref": "1485" + } + } + ], + "directives": [], + "parent": { + "$ref": "1473" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1485" + }, + "name": "discriminatorPropertyName", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1473" + } + ], + "name": "DiscriminatedOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 65 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1491", + "kind": 15, + "id": { + "$id": "1492", + "kind": 3, + "sv": "envelopePropertyName", + "pos": 11122, + "end": 11142, + "flags": 0, + "parent": { + "$ref": "1491" + }, + "_id": 470 + }, + "decorators": [], + "value": { + "$id": "1493", + "kind": 45, + "target": { + "$id": "1494", + "kind": 3, + "sv": "string", + "pos": 11145, + "end": 11151, + "flags": 1, + "parent": { + "$ref": "1493" + }, + "_id": 472 + }, + "arguments": [], + "pos": 11145, + "end": 11151, + "flags": 1, + "parent": { + "$ref": "1491" + }, + "_id": 471 + }, + "optional": true, + "pos": 11071, + "end": 11151, + "flags": 0, + "docs": [ + { + "$id": "1495", + "kind": 51, + "content": [ + { + "$id": "1496", + "kind": 52, + "text": "Name of the property envelopping the data", + "pos": 11074, + "end": 11117, + "flags": 0, + "parent": { + "$ref": "1495" + } + } + ], + "tags": [], + "pos": 11071, + "end": 11119, + "flags": 0, + "parent": { + "$ref": "1491" + } + } + ], + "directives": [], + "parent": { + "$ref": "1473" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1491" + }, + "name": "envelopePropertyName", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1473" + } + ], + "name": "DiscriminatedOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 65 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 10870, + "end": 11154 + }, + "pos": 10792, + "end": 11154, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1497", + "kind": 51, + "content": [ + { + "$id": "1498", + "kind": 52, + "text": "Options for `@discriminated` decorator.", + "pos": 10795, + "end": 10840, + "flags": 0, + "parent": { + "$ref": "1497" + } + } + ], + "tags": [], + "pos": 10792, + "end": 10842, + "flags": 0, + "parent": { + "$ref": "1473" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1473" + } + ], + "name": "DiscriminatedOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 65 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "1499", + "kind": 25, + "modifiers": [ + { + "$id": "1500", + "kind": 40, + "pos": 12232, + "end": 12238, + "flags": 0, + "parent": { + "$ref": "1499" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1501", + "kind": 3, + "sv": "discriminated", + "pos": 12243, + "end": 12256, + "flags": 0, + "parent": { + "$ref": "1499" + }, + "_id": 473 + }, + "target": { + "$id": "1502", + "kind": 27, + "id": { + "$id": "1503", + "kind": 3, + "sv": "target", + "pos": 12257, + "end": 12263, + "flags": 0, + "parent": { + "$ref": "1502" + }, + "_id": 474 + }, + "type": { + "$id": "1504", + "kind": 45, + "target": { + "$id": "1505", + "kind": 3, + "sv": "Union", + "pos": 12265, + "end": 12270, + "flags": 1, + "parent": { + "$ref": "1504" + }, + "_id": 476 + }, + "arguments": [], + "pos": 12265, + "end": 12270, + "flags": 1, + "parent": { + "$ref": "1502" + }, + "_id": 475 + }, + "optional": false, + "rest": false, + "pos": 12257, + "end": 12270, + "flags": 0, + "parent": { + "$ref": "1499" + }, + "symbol": { + "declarations": [ + { + "$ref": "1502" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 304 + } + }, + "parameters": [ + { + "$id": "1506", + "kind": 27, + "id": { + "$id": "1507", + "kind": 3, + "sv": "options", + "pos": 12272, + "end": 12279, + "flags": 0, + "parent": { + "$ref": "1506" + }, + "_id": 477 + }, + "type": { + "$id": "1508", + "kind": 44, + "target": { + "$id": "1509", + "kind": 45, + "target": { + "$id": "1510", + "kind": 3, + "sv": "DiscriminatedOptions", + "pos": 12290, + "end": 12310, + "flags": 1, + "parent": { + "$ref": "1509" + }, + "_id": 479 + }, + "arguments": [], + "pos": 12290, + "end": 12310, + "flags": 1, + "parent": { + "$ref": "1508" + }, + "_id": 478 + }, + "pos": 12282, + "end": 12310, + "flags": 0, + "parent": { + "$ref": "1506" + } + }, + "optional": true, + "rest": false, + "pos": 12272, + "end": 12310, + "flags": 0, + "parent": { + "$ref": "1499" + }, + "symbol": { + "declarations": [ + { + "$ref": "1506" + } + ], + "name": "options", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 305 + } + } + ], + "pos": 11156, + "end": 12312, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1511", + "kind": 51, + "content": [ + { + "$id": "1512", + "kind": 52, + "text": "Specify that this union is discriminated.", + "pos": 11159, + "end": 11208, + "flags": 0, + "parent": { + "$ref": "1511" + } + } + ], + "tags": [ + { + "$id": "1513", + "kind": 53, + "tagName": { + "$id": "1514", + "kind": 3, + "sv": "param", + "pos": 11209, + "end": 11214, + "flags": 0, + "parent": { + "$ref": "1513" + } + }, + "paramName": { + "$id": "1515", + "kind": 3, + "sv": "options", + "pos": 11215, + "end": 11222, + "flags": 0, + "parent": { + "$ref": "1513" + } + }, + "content": [ + { + "$id": "1516", + "kind": 52, + "text": "Options to configure the serialization of the discriminated union.", + "pos": 11223, + "end": 11296, + "flags": 0, + "parent": { + "$ref": "1513" + } + } + ], + "pos": 11208, + "end": 11296, + "flags": 0, + "parent": { + "$ref": "1511" + } + }, + { + "$id": "1517", + "kind": 58, + "tagName": { + "$id": "1518", + "kind": 3, + "sv": "example", + "pos": 11297, + "end": 11304, + "flags": 0, + "parent": { + "$ref": "1517" + } + }, + "content": [ + { + "$id": "1519", + "kind": 52, + "text": "```typespec\n@discriminated\nunion Pet{ cat: Cat, dog: Dog }\n\nmodel Cat { name: string, meow: boolean }\nmodel Dog { name: string, bark: boolean }\n```\nSerialized as:\n```json\n{\n \"kind\": \"cat\",\n \"value\": {\n \"name\": \"Whiskers\",\n \"meow\": true\n }\n},\n{\n \"kind\": \"dog\",\n \"value\": {\n \"name\": \"Rex\",\n \"bark\": false\n }\n}\n```", + "pos": 11304, + "end": 11715, + "flags": 0, + "parent": { + "$ref": "1517" + } + } + ], + "pos": 11296, + "end": 11715, + "flags": 0, + "parent": { + "$ref": "1511" + } + }, + { + "$id": "1520", + "kind": 58, + "tagName": { + "$id": "1521", + "kind": 3, + "sv": "example", + "pos": 11716, + "end": 11723, + "flags": 0, + "parent": { + "$ref": "1520" + } + }, + "content": [ + { + "$id": "1522", + "kind": 52, + "text": "Custom property names\n\n```typespec\n@discriminated(#{discriminatorPropertyName: \"dataKind\", envelopePropertyName: \"data\"})\nunion Pet{ cat: Cat, dog: Dog }\n\nmodel Cat { name: string, meow: boolean }\nmodel Dog { name: string, bark: boolean }\n```\nSerialized as:\n```json\n{\n \"dataKind\": \"cat\",\n \"data\": {\n \"name\": \"Whiskers\",\n \"meow\": true\n }\n},\n{\n \"dataKind\": \"dog\",\n \"data\": {\n \"name\": \"Rex\",\n \"bark\": false\n }\n}\n```", + "pos": 11723, + "end": 12229, + "flags": 0, + "parent": { + "$ref": "1520" + } + } + ], + "pos": 11715, + "end": 12229, + "flags": 0, + "parent": { + "$ref": "1511" + } + } + ], + "pos": 11156, + "end": 12231, + "flags": 0, + "parent": { + "$ref": "1499" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1499" + } + ], + "name": "@discriminated", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1523", + "kind": 25, + "modifiers": [ + { + "$id": "1524", + "kind": 40, + "pos": 12658, + "end": 12664, + "flags": 0, + "parent": { + "$ref": "1523" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1525", + "kind": 3, + "sv": "discriminator", + "pos": 12669, + "end": 12682, + "flags": 0, + "parent": { + "$ref": "1523" + }, + "_id": 480 + }, + "target": { + "$id": "1526", + "kind": 27, + "id": { + "$id": "1527", + "kind": 3, + "sv": "target", + "pos": 12683, + "end": 12689, + "flags": 0, + "parent": { + "$ref": "1526" + }, + "_id": 481 + }, + "type": { + "$id": "1528", + "kind": 45, + "target": { + "$id": "1529", + "kind": 3, + "sv": "Model", + "pos": 12691, + "end": 12696, + "flags": 1, + "parent": { + "$ref": "1528" + }, + "_id": 483 + }, + "arguments": [], + "pos": 12691, + "end": 12696, + "flags": 1, + "parent": { + "$ref": "1526" + }, + "_id": 482 + }, + "optional": false, + "rest": false, + "pos": 12683, + "end": 12696, + "flags": 0, + "parent": { + "$ref": "1523" + }, + "symbol": { + "declarations": [ + { + "$ref": "1526" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 307 + } + }, + "parameters": [ + { + "$id": "1530", + "kind": 27, + "id": { + "$id": "1531", + "kind": 3, + "sv": "propertyName", + "pos": 12698, + "end": 12710, + "flags": 0, + "parent": { + "$ref": "1530" + }, + "_id": 484 + }, + "type": { + "$id": "1532", + "kind": 44, + "target": { + "$id": "1533", + "kind": 45, + "target": { + "$id": "1534", + "kind": 3, + "sv": "string", + "pos": 12720, + "end": 12726, + "flags": 1, + "parent": { + "$ref": "1533" + }, + "_id": 486 + }, + "arguments": [], + "pos": 12720, + "end": 12726, + "flags": 1, + "parent": { + "$ref": "1532" + }, + "_id": 485 + }, + "pos": 12712, + "end": 12726, + "flags": 0, + "parent": { + "$ref": "1530" + } + }, + "optional": false, + "rest": false, + "pos": 12698, + "end": 12726, + "flags": 0, + "parent": { + "$ref": "1523" + }, + "symbol": { + "declarations": [ + { + "$ref": "1530" + } + ], + "name": "propertyName", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 308 + } + } + ], + "pos": 12314, + "end": 12728, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1535", + "kind": 51, + "content": [ + { + "$id": "1536", + "kind": 52, + "text": "Specify the property to be used to discriminate this type.", + "pos": 12317, + "end": 12383, + "flags": 0, + "parent": { + "$ref": "1535" + } + } + ], + "tags": [ + { + "$id": "1537", + "kind": 53, + "tagName": { + "$id": "1538", + "kind": 3, + "sv": "param", + "pos": 12384, + "end": 12389, + "flags": 0, + "parent": { + "$ref": "1537" + } + }, + "paramName": { + "$id": "1539", + "kind": 3, + "sv": "propertyName", + "pos": 12390, + "end": 12402, + "flags": 0, + "parent": { + "$ref": "1537" + } + }, + "content": [ + { + "$id": "1540", + "kind": 52, + "text": "The property name to use for discrimination", + "pos": 12403, + "end": 12453, + "flags": 0, + "parent": { + "$ref": "1537" + } + } + ], + "pos": 12383, + "end": 12453, + "flags": 0, + "parent": { + "$ref": "1535" + } + }, + { + "$id": "1541", + "kind": 58, + "tagName": { + "$id": "1542", + "kind": 3, + "sv": "example", + "pos": 12454, + "end": 12461, + "flags": 0, + "parent": { + "$ref": "1541" + } + }, + "content": [ + { + "$id": "1543", + "kind": 52, + "text": "```typespec\n@discriminator(\"kind\")\nmodel Pet{ kind: string }\n\nmodel Cat extends Pet {kind: \"cat\", meow: boolean}\nmodel Dog extends Pet {kind: \"dog\", bark: boolean}\n```", + "pos": 12461, + "end": 12655, + "flags": 0, + "parent": { + "$ref": "1541" + } + } + ], + "pos": 12453, + "end": 12655, + "flags": 0, + "parent": { + "$ref": "1535" + } + } + ], + "pos": 12314, + "end": 12657, + "flags": 0, + "parent": { + "$ref": "1523" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1523" + } + ], + "name": "@discriminator", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1544", + "kind": 21, + "id": { + "$id": "1545", + "kind": 3, + "sv": "DateTimeKnownEncoding", + "pos": 12801, + "end": 12822, + "flags": 0, + "parent": { + "$ref": "1544" + }, + "_id": 487 + }, + "decorators": [], + "members": [ + { + "$id": "1546", + "kind": 22, + "id": { + "$id": "1547", + "kind": 3, + "sv": "rfc3339", + "pos": 12923, + "end": 12930, + "flags": 0, + "parent": { + "$ref": "1546" + }, + "_id": 488 + }, + "value": { + "$id": "1548", + "kind": 32, + "value": "rfc3339", + "pos": 12932, + "end": 12941, + "flags": 0, + "parent": { + "$ref": "1546" + } + }, + "decorators": [], + "pos": 12827, + "end": 12941, + "flags": 0, + "docs": [ + { + "$id": "1549", + "kind": 51, + "content": [ + { + "$id": "1550", + "kind": 52, + "text": "RFC 3339 standard. https://www.ietf.org/rfc/rfc3339.txt\nEncode to string.", + "pos": 12830, + "end": 12918, + "flags": 0, + "parent": { + "$ref": "1549" + } + } + ], + "tags": [], + "pos": 12827, + "end": 12920, + "flags": 0, + "parent": { + "$ref": "1546" + } + } + ], + "directives": [], + "parent": { + "$ref": "1544" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1546" + }, + "name": "rfc3339", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1544" + } + ], + "name": "DateTimeKnownEncoding", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "metatypeMembers": { + "duplicates": {} + }, + "id": 66 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1551", + "kind": 22, + "id": { + "$id": "1552", + "kind": 3, + "sv": "rfc7231", + "pos": 13042, + "end": 13049, + "flags": 0, + "parent": { + "$ref": "1551" + }, + "_id": 489 + }, + "value": { + "$id": "1553", + "kind": 32, + "value": "rfc7231", + "pos": 13051, + "end": 13060, + "flags": 0, + "parent": { + "$ref": "1551" + } + }, + "decorators": [], + "pos": 12946, + "end": 13060, + "flags": 0, + "docs": [ + { + "$id": "1554", + "kind": 51, + "content": [ + { + "$id": "1555", + "kind": 52, + "text": "RFC 7231 standard. https://www.ietf.org/rfc/rfc7231.txt\nEncode to string.", + "pos": 12949, + "end": 13037, + "flags": 0, + "parent": { + "$ref": "1554" + } + } + ], + "tags": [], + "pos": 12946, + "end": 13039, + "flags": 0, + "parent": { + "$ref": "1551" + } + } + ], + "directives": [], + "parent": { + "$ref": "1544" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1551" + }, + "name": "rfc7231", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1544" + } + ], + "name": "DateTimeKnownEncoding", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "metatypeMembers": { + "duplicates": {} + }, + "id": 66 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1556", + "kind": 22, + "id": { + "$id": "1557", + "kind": 3, + "sv": "unixTimestamp", + "pos": 13244, + "end": 13257, + "flags": 0, + "parent": { + "$ref": "1556" + }, + "_id": 490 + }, + "value": { + "$id": "1558", + "kind": 32, + "value": "unixTimestamp", + "pos": 13259, + "end": 13274, + "flags": 0, + "parent": { + "$ref": "1556" + } + }, + "decorators": [], + "pos": 13065, + "end": 13274, + "flags": 0, + "docs": [ + { + "$id": "1559", + "kind": 51, + "content": [ + { + "$id": "1560", + "kind": 52, + "text": "Encode a datetime to a unix timestamp.\nUnix timestamps are represented as an integer number of seconds since the Unix epoch and usually encoded as an int32.", + "pos": 13068, + "end": 13239, + "flags": 0, + "parent": { + "$ref": "1559" + } + } + ], + "tags": [], + "pos": 13065, + "end": 13241, + "flags": 0, + "parent": { + "$ref": "1556" + } + } + ], + "directives": [], + "parent": { + "$ref": "1544" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1556" + }, + "name": "unixTimestamp", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1544" + } + ], + "name": "DateTimeKnownEncoding", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "metatypeMembers": { + "duplicates": {} + }, + "id": 66 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "pos": 12730, + "end": 13277, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1561", + "kind": 51, + "content": [ + { + "$id": "1562", + "kind": 52, + "text": "Known encoding to use on utcDateTime or offsetDateTime", + "pos": 12733, + "end": 12793, + "flags": 0, + "parent": { + "$ref": "1561" + } + } + ], + "tags": [], + "pos": 12730, + "end": 12795, + "flags": 0, + "parent": { + "$ref": "1544" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1544" + } + ], + "name": "DateTimeKnownEncoding", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "metatypeMembers": { + "duplicates": {} + }, + "id": 66 + } + }, + { + "$id": "1563", + "kind": 21, + "id": { + "$id": "1564", + "kind": 3, + "sv": "DurationKnownEncoding", + "pos": 13329, + "end": 13350, + "flags": 0, + "parent": { + "$ref": "1563" + }, + "_id": 491 + }, + "decorators": [], + "members": [ + { + "$id": "1565", + "kind": 22, + "id": { + "$id": "1566", + "kind": 3, + "sv": "ISO8601", + "pos": 13389, + "end": 13396, + "flags": 0, + "parent": { + "$ref": "1565" + }, + "_id": 492 + }, + "value": { + "$id": "1567", + "kind": 32, + "value": "ISO8601", + "pos": 13398, + "end": 13407, + "flags": 0, + "parent": { + "$ref": "1565" + } + }, + "decorators": [], + "pos": 13355, + "end": 13407, + "flags": 0, + "docs": [ + { + "$id": "1568", + "kind": 51, + "content": [ + { + "$id": "1569", + "kind": 52, + "text": "ISO8601 duration", + "pos": 13358, + "end": 13384, + "flags": 0, + "parent": { + "$ref": "1568" + } + } + ], + "tags": [], + "pos": 13355, + "end": 13386, + "flags": 0, + "parent": { + "$ref": "1565" + } + } + ], + "directives": [], + "parent": { + "$ref": "1563" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1565" + }, + "name": "ISO8601", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1563" + } + ], + "name": "DurationKnownEncoding", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "metatypeMembers": { + "duplicates": {} + }, + "id": 67 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1570", + "kind": 22, + "id": { + "$id": "1571", + "kind": 3, + "sv": "seconds", + "pos": 13467, + "end": 13474, + "flags": 0, + "parent": { + "$ref": "1570" + }, + "_id": 493 + }, + "value": { + "$id": "1572", + "kind": 32, + "value": "seconds", + "pos": 13476, + "end": 13485, + "flags": 0, + "parent": { + "$ref": "1570" + } + }, + "decorators": [], + "pos": 13412, + "end": 13485, + "flags": 0, + "docs": [ + { + "$id": "1573", + "kind": 51, + "content": [ + { + "$id": "1574", + "kind": 52, + "text": "Encode to integer or float as seconds", + "pos": 13415, + "end": 13462, + "flags": 0, + "parent": { + "$ref": "1573" + } + } + ], + "tags": [], + "pos": 13412, + "end": 13464, + "flags": 0, + "parent": { + "$ref": "1570" + } + } + ], + "directives": [], + "parent": { + "$ref": "1563" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1570" + }, + "name": "seconds", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1563" + } + ], + "name": "DurationKnownEncoding", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "metatypeMembers": { + "duplicates": {} + }, + "id": 67 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1575", + "kind": 22, + "id": { + "$id": "1576", + "kind": 3, + "sv": "milliseconds", + "pos": 13550, + "end": 13562, + "flags": 0, + "parent": { + "$ref": "1575" + }, + "_id": 494 + }, + "value": { + "$id": "1577", + "kind": 32, + "value": "milliseconds", + "pos": 13564, + "end": 13578, + "flags": 0, + "parent": { + "$ref": "1575" + } + }, + "decorators": [], + "pos": 13490, + "end": 13578, + "flags": 0, + "docs": [ + { + "$id": "1578", + "kind": 51, + "content": [ + { + "$id": "1579", + "kind": 52, + "text": "Encode to integer or float as milliseconds", + "pos": 13493, + "end": 13545, + "flags": 0, + "parent": { + "$ref": "1578" + } + } + ], + "tags": [], + "pos": 13490, + "end": 13547, + "flags": 0, + "parent": { + "$ref": "1575" + } + } + ], + "directives": [], + "parent": { + "$ref": "1563" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1575" + }, + "name": "milliseconds", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1563" + } + ], + "name": "DurationKnownEncoding", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "metatypeMembers": { + "duplicates": {} + }, + "id": 67 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "pos": 13279, + "end": 13581, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1580", + "kind": 51, + "content": [ + { + "$id": "1581", + "kind": 52, + "text": "Known encoding to use on duration", + "pos": 13282, + "end": 13321, + "flags": 0, + "parent": { + "$ref": "1580" + } + } + ], + "tags": [], + "pos": 13279, + "end": 13323, + "flags": 0, + "parent": { + "$ref": "1563" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1563" + } + ], + "name": "DurationKnownEncoding", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "metatypeMembers": { + "duplicates": {} + }, + "id": 67 + } + }, + { + "$id": "1582", + "kind": 21, + "id": { + "$id": "1583", + "kind": 3, + "sv": "BytesKnownEncoding", + "pos": 13630, + "end": 13648, + "flags": 0, + "parent": { + "$ref": "1582" + }, + "_id": 495 + }, + "decorators": [], + "members": [ + { + "$id": "1584", + "kind": 22, + "id": { + "$id": "1585", + "kind": 3, + "sv": "base64", + "pos": 13687, + "end": 13693, + "flags": 0, + "parent": { + "$ref": "1584" + }, + "_id": 496 + }, + "value": { + "$id": "1586", + "kind": 32, + "value": "base64", + "pos": 13695, + "end": 13703, + "flags": 0, + "parent": { + "$ref": "1584" + } + }, + "decorators": [], + "pos": 13653, + "end": 13703, + "flags": 0, + "docs": [ + { + "$id": "1587", + "kind": 51, + "content": [ + { + "$id": "1588", + "kind": 52, + "text": "Encode to Base64", + "pos": 13656, + "end": 13682, + "flags": 0, + "parent": { + "$ref": "1587" + } + } + ], + "tags": [], + "pos": 13653, + "end": 13684, + "flags": 0, + "parent": { + "$ref": "1584" + } + } + ], + "directives": [], + "parent": { + "$ref": "1582" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1584" + }, + "name": "base64", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1582" + } + ], + "name": "BytesKnownEncoding", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "metatypeMembers": { + "duplicates": {} + }, + "id": 68 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1589", + "kind": 22, + "id": { + "$id": "1590", + "kind": 3, + "sv": "base64url", + "pos": 13746, + "end": 13755, + "flags": 0, + "parent": { + "$ref": "1589" + }, + "_id": 497 + }, + "value": { + "$id": "1591", + "kind": 32, + "value": "base64url", + "pos": 13757, + "end": 13768, + "flags": 0, + "parent": { + "$ref": "1589" + } + }, + "decorators": [], + "pos": 13708, + "end": 13768, + "flags": 0, + "docs": [ + { + "$id": "1592", + "kind": 51, + "content": [ + { + "$id": "1593", + "kind": 52, + "text": "Encode to Base64 Url", + "pos": 13711, + "end": 13741, + "flags": 0, + "parent": { + "$ref": "1592" + } + } + ], + "tags": [], + "pos": 13708, + "end": 13743, + "flags": 0, + "parent": { + "$ref": "1589" + } + } + ], + "directives": [], + "parent": { + "$ref": "1582" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1589" + }, + "name": "base64url", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1582" + } + ], + "name": "BytesKnownEncoding", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "metatypeMembers": { + "duplicates": {} + }, + "id": 68 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "pos": 13583, + "end": 13771, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1594", + "kind": 51, + "content": [ + { + "$id": "1595", + "kind": 52, + "text": "Known encoding to use on bytes", + "pos": 13586, + "end": 13622, + "flags": 0, + "parent": { + "$ref": "1594" + } + } + ], + "tags": [], + "pos": 13583, + "end": 13624, + "flags": 0, + "parent": { + "$ref": "1582" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1582" + } + ], + "name": "BytesKnownEncoding", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "metatypeMembers": { + "duplicates": {} + }, + "id": 68 + } + }, + { + "$id": "1596", + "kind": 21, + "id": { + "$id": "1597", + "kind": 3, + "sv": "ArrayEncoding", + "pos": 13821, + "end": 13834, + "flags": 0, + "parent": { + "$ref": "1596" + }, + "_id": 498 + }, + "decorators": [], + "members": [ + { + "$id": "1598", + "kind": 22, + "id": { + "$id": "1599", + "kind": 3, + "sv": "pipeDelimited", + "pos": 14040, + "end": 14053, + "flags": 0, + "parent": { + "$ref": "1598" + }, + "_id": 499 + }, + "decorators": [], + "pos": 13839, + "end": 14053, + "flags": 0, + "docs": [ + { + "$id": "1600", + "kind": 51, + "content": [ + { + "$id": "1601", + "kind": 52, + "text": "Each value of the array is separated by a pipe character (|).\nValues can only contain | if the underlying protocol supports encoding them.\n- json -> error\n- http -> %7C", + "pos": 13842, + "end": 14035, + "flags": 0, + "parent": { + "$ref": "1600" + } + } + ], + "tags": [], + "pos": 13839, + "end": 14037, + "flags": 0, + "parent": { + "$ref": "1598" + } + } + ], + "directives": [], + "parent": { + "$ref": "1596" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1598" + }, + "name": "pipeDelimited", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1596" + } + ], + "name": "ArrayEncoding", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "metatypeMembers": { + "duplicates": {} + }, + "id": 69 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1602", + "kind": 22, + "id": { + "$id": "1603", + "kind": 3, + "sv": "spaceDelimited", + "pos": 14261, + "end": 14275, + "flags": 0, + "parent": { + "$ref": "1602" + }, + "_id": 500 + }, + "decorators": [], + "pos": 14058, + "end": 14275, + "flags": 0, + "docs": [ + { + "$id": "1604", + "kind": 51, + "content": [ + { + "$id": "1605", + "kind": 52, + "text": "Each value of the array is separated by a space character.\nValues can only contain spaces if the underlying protocol supports encoding them.\n- json -> error\n- http -> %20", + "pos": 14061, + "end": 14256, + "flags": 0, + "parent": { + "$ref": "1604" + } + } + ], + "tags": [], + "pos": 14058, + "end": 14258, + "flags": 0, + "parent": { + "$ref": "1602" + } + } + ], + "directives": [], + "parent": { + "$ref": "1596" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1602" + }, + "name": "spaceDelimited", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1596" + } + ], + "name": "ArrayEncoding", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "metatypeMembers": { + "duplicates": {} + }, + "id": 69 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1606", + "kind": 22, + "id": { + "$id": "1607", + "kind": 3, + "sv": "commaDelimited", + "pos": 14477, + "end": 14491, + "flags": 0, + "parent": { + "$ref": "1606" + }, + "_id": 501 + }, + "decorators": [], + "pos": 14280, + "end": 14491, + "flags": 0, + "docs": [ + { + "$id": "1608", + "kind": 51, + "content": [ + { + "$id": "1609", + "kind": 52, + "text": "Each value of the array is separated by a comma (,).\nValues can only contain commas if the underlying protocol supports encoding them.\n- json -> error\n- http -> %2C", + "pos": 14283, + "end": 14472, + "flags": 0, + "parent": { + "$ref": "1608" + } + } + ], + "tags": [], + "pos": 14280, + "end": 14474, + "flags": 0, + "parent": { + "$ref": "1606" + } + } + ], + "directives": [], + "parent": { + "$ref": "1596" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1606" + }, + "name": "commaDelimited", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1596" + } + ], + "name": "ArrayEncoding", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "metatypeMembers": { + "duplicates": {} + }, + "id": 69 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1610", + "kind": 22, + "id": { + "$id": "1611", + "kind": 3, + "sv": "newlineDelimited", + "pos": 14708, + "end": 14724, + "flags": 0, + "parent": { + "$ref": "1610" + }, + "_id": 502 + }, + "decorators": [], + "pos": 14496, + "end": 14724, + "flags": 0, + "docs": [ + { + "$id": "1612", + "kind": 51, + "content": [ + { + "$id": "1613", + "kind": 52, + "text": "Each value of the array is separated by a newline character (\\n).\nValues can only contain newlines if the underlying protocol supports encoding them.\n- json -> error\n- http -> %0A", + "pos": 14499, + "end": 14703, + "flags": 0, + "parent": { + "$ref": "1612" + } + } + ], + "tags": [], + "pos": 14496, + "end": 14705, + "flags": 0, + "parent": { + "$ref": "1610" + } + } + ], + "directives": [], + "parent": { + "$ref": "1596" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1610" + }, + "name": "newlineDelimited", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1596" + } + ], + "name": "ArrayEncoding", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "metatypeMembers": { + "duplicates": {} + }, + "id": 69 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "pos": 13773, + "end": 14727, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1614", + "kind": 51, + "content": [ + { + "$id": "1615", + "kind": 52, + "text": "Encoding for serializing arrays", + "pos": 13776, + "end": 13813, + "flags": 0, + "parent": { + "$ref": "1614" + } + } + ], + "tags": [], + "pos": 13773, + "end": 13815, + "flags": 0, + "parent": { + "$ref": "1596" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1596" + } + ], + "name": "ArrayEncoding", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "metatypeMembers": { + "duplicates": {} + }, + "id": 69 + } + }, + { + "$id": "1616", + "kind": 25, + "modifiers": [ + { + "$id": "1617", + "kind": 40, + "pos": 15399, + "end": 15405, + "flags": 0, + "parent": { + "$ref": "1616" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1618", + "kind": 3, + "sv": "encode", + "pos": 15410, + "end": 15416, + "flags": 0, + "parent": { + "$ref": "1616" + }, + "_id": 132 + }, + "target": { + "$id": "1619", + "kind": 27, + "id": { + "$id": "1620", + "kind": 3, + "sv": "target", + "pos": 15420, + "end": 15426, + "flags": 0, + "parent": { + "$ref": "1619" + }, + "_id": 133 + }, + "type": { + "$id": "1621", + "kind": 28, + "options": [ + { + "$id": "1622", + "kind": 45, + "target": { + "$id": "1623", + "kind": 3, + "sv": "Scalar", + "pos": 15428, + "end": 15434, + "flags": 1, + "parent": { + "$ref": "1622" + }, + "_id": 135 + }, + "arguments": [], + "pos": 15428, + "end": 15434, + "flags": 1, + "parent": { + "$ref": "1621" + }, + "_id": 134 + }, + { + "$id": "1624", + "kind": 45, + "target": { + "$id": "1625", + "kind": 3, + "sv": "ModelProperty", + "pos": 15437, + "end": 15450, + "flags": 1, + "parent": { + "$ref": "1624" + }, + "_id": 138 + }, + "arguments": [], + "pos": 15437, + "end": 15450, + "flags": 1, + "parent": { + "$ref": "1621" + }, + "_id": 137 + } + ], + "pos": 15428, + "end": 15450, + "flags": 0, + "parent": { + "$ref": "1619" + } + }, + "optional": false, + "rest": false, + "pos": 15420, + "end": 15450, + "flags": 0, + "parent": { + "$ref": "1616" + }, + "symbol": { + "declarations": [ + { + "$ref": "1619" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 217 + } + }, + "parameters": [ + { + "$id": "1626", + "kind": 27, + "id": { + "$id": "1627", + "kind": 3, + "sv": "encodingOrEncodeAs", + "pos": 15454, + "end": 15472, + "flags": 0, + "parent": { + "$ref": "1626" + }, + "_id": 140 + }, + "type": { + "$id": "1628", + "kind": 28, + "options": [ + { + "$id": "1629", + "kind": 44, + "target": { + "$id": "1630", + "kind": 28, + "options": [ + { + "$id": "1631", + "kind": 45, + "target": { + "$id": "1632", + "kind": 3, + "sv": "string", + "pos": 15483, + "end": 15489, + "flags": 1, + "parent": { + "$ref": "1631" + }, + "_id": 142 + }, + "arguments": [], + "pos": 15483, + "end": 15489, + "flags": 1, + "parent": { + "$ref": "1630" + }, + "_id": 141 + }, + { + "$id": "1633", + "kind": 45, + "target": { + "$id": "1634", + "kind": 3, + "sv": "EnumMember", + "pos": 15492, + "end": 15502, + "flags": 1, + "parent": { + "$ref": "1633" + }, + "_id": 144 + }, + "arguments": [], + "pos": 15492, + "end": 15502, + "flags": 1, + "parent": { + "$ref": "1630" + }, + "_id": 143 + } + ], + "pos": 15483, + "end": 15502, + "flags": 0, + "parent": { + "$ref": "1629" + } + }, + "pos": 15475, + "end": 15502, + "flags": 0, + "parent": { + "$ref": "1628" + } + }, + { + "$id": "1635", + "kind": 45, + "target": { + "$id": "1636", + "kind": 3, + "sv": "Scalar", + "pos": 15506, + "end": 15512, + "flags": 1, + "parent": { + "$ref": "1635" + }, + "_id": 147 + }, + "arguments": [], + "pos": 15506, + "end": 15512, + "flags": 1, + "parent": { + "$ref": "1628" + }, + "_id": 146 + } + ], + "pos": 15474, + "end": 15512, + "flags": 0, + "parent": { + "$ref": "1626" + } + }, + "optional": false, + "rest": false, + "pos": 15454, + "end": 15512, + "flags": 0, + "parent": { + "$ref": "1616" + }, + "symbol": { + "declarations": [ + { + "$ref": "1626" + } + ], + "name": "encodingOrEncodeAs", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 218 + } + }, + { + "$id": "1637", + "kind": 27, + "id": { + "$id": "1638", + "kind": 3, + "sv": "encodedAs", + "pos": 15516, + "end": 15525, + "flags": 0, + "parent": { + "$ref": "1637" + }, + "_id": 148 + }, + "type": { + "$id": "1639", + "kind": 45, + "target": { + "$id": "1640", + "kind": 3, + "sv": "Scalar", + "pos": 15528, + "end": 15534, + "flags": 1, + "parent": { + "$ref": "1639" + }, + "_id": 150 + }, + "arguments": [], + "pos": 15528, + "end": 15534, + "flags": 1, + "parent": { + "$ref": "1637" + }, + "_id": 149 + }, + "optional": true, + "rest": false, + "pos": 15516, + "end": 15534, + "flags": 0, + "parent": { + "$ref": "1616" + }, + "symbol": { + "declarations": [ + { + "$ref": "1637" + } + ], + "name": "encodedAs", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 219 + } + } + ], + "pos": 14729, + "end": 15537, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1641", + "kind": 51, + "content": [ + { + "$id": "1642", + "kind": 52, + "text": "Specify how to encode the target type.", + "pos": 14732, + "end": 14778, + "flags": 0, + "parent": { + "$ref": "1641" + } + } + ], + "tags": [ + { + "$id": "1643", + "kind": 53, + "tagName": { + "$id": "1644", + "kind": 3, + "sv": "param", + "pos": 14779, + "end": 14784, + "flags": 0, + "parent": { + "$ref": "1643" + } + }, + "paramName": { + "$id": "1645", + "kind": 3, + "sv": "encodingOrEncodeAs", + "pos": 14785, + "end": 14803, + "flags": 0, + "parent": { + "$ref": "1643" + } + }, + "content": [ + { + "$id": "1646", + "kind": 52, + "text": "Known name of an encoding or a scalar type to encode as(Only for numeric types to encode as string).", + "pos": 14804, + "end": 14908, + "flags": 0, + "parent": { + "$ref": "1643" + } + } + ], + "pos": 14778, + "end": 14908, + "flags": 0, + "parent": { + "$ref": "1641" + } + }, + { + "$id": "1647", + "kind": 53, + "tagName": { + "$id": "1648", + "kind": 3, + "sv": "param", + "pos": 14909, + "end": 14914, + "flags": 0, + "parent": { + "$ref": "1647" + } + }, + "paramName": { + "$id": "1649", + "kind": 3, + "sv": "encodedAs", + "pos": 14915, + "end": 14924, + "flags": 0, + "parent": { + "$ref": "1647" + } + }, + "content": [ + { + "$id": "1650", + "kind": 52, + "text": "What target type is this being encoded as. Default to string.", + "pos": 14925, + "end": 14993, + "flags": 0, + "parent": { + "$ref": "1647" + } + } + ], + "pos": 14908, + "end": 14993, + "flags": 0, + "parent": { + "$ref": "1641" + } + }, + { + "$id": "1651", + "kind": 58, + "tagName": { + "$id": "1652", + "kind": 3, + "sv": "example", + "pos": 14994, + "end": 15001, + "flags": 0, + "parent": { + "$ref": "1651" + } + }, + "content": [ + { + "$id": "1653", + "kind": 52, + "text": "offsetDateTime encoded with rfc7231\n\n```tsp\n@encode(\"rfc7231\")\nscalar myDateTime extends offsetDateTime;\n```", + "pos": 15001, + "end": 15131, + "flags": 0, + "parent": { + "$ref": "1651" + } + } + ], + "pos": 14993, + "end": 15131, + "flags": 0, + "parent": { + "$ref": "1641" + } + }, + { + "$id": "1654", + "kind": 58, + "tagName": { + "$id": "1655", + "kind": 3, + "sv": "example", + "pos": 15132, + "end": 15139, + "flags": 0, + "parent": { + "$ref": "1654" + } + }, + "content": [ + { + "$id": "1656", + "kind": 52, + "text": "utcDateTime encoded with unixTimestamp\n\n```tsp\n@encode(\"unixTimestamp\", int32)\nscalar myDateTime extends unixTimestamp;\n```", + "pos": 15139, + "end": 15284, + "flags": 0, + "parent": { + "$ref": "1654" + } + } + ], + "pos": 15131, + "end": 15284, + "flags": 0, + "parent": { + "$ref": "1641" + } + }, + { + "$id": "1657", + "kind": 58, + "tagName": { + "$id": "1658", + "kind": 3, + "sv": "example", + "pos": 15285, + "end": 15292, + "flags": 0, + "parent": { + "$ref": "1657" + } + }, + "content": [ + { + "$id": "1659", + "kind": 52, + "text": "encode numeric type to string\n\n```tsp\nmodel Pet {\n @encode(string) id: int64;\n}\n```", + "pos": 15292, + "end": 15396, + "flags": 0, + "parent": { + "$ref": "1657" + } + } + ], + "pos": 15284, + "end": 15396, + "flags": 0, + "parent": { + "$ref": "1641" + } + } + ], + "pos": 14729, + "end": 15398, + "flags": 0, + "parent": { + "$ref": "1616" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1616" + } + ], + "name": "@encode", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1660", + "kind": 13, + "id": { + "$id": "1661", + "kind": 3, + "sv": "ExampleOptions", + "pos": 15583, + "end": 15597, + "flags": 0, + "parent": { + "$ref": "1660" + }, + "_id": 503 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [ + { + "$id": "1662", + "kind": 15, + "id": { + "$id": "1663", + "kind": 3, + "sv": "title", + "pos": 15636, + "end": 15641, + "flags": 0, + "parent": { + "$ref": "1662" + }, + "_id": 504 + }, + "decorators": [], + "value": { + "$id": "1664", + "kind": 45, + "target": { + "$id": "1665", + "kind": 3, + "sv": "string", + "pos": 15644, + "end": 15650, + "flags": 1, + "parent": { + "$ref": "1664" + }, + "_id": 506 + }, + "arguments": [], + "pos": 15644, + "end": 15650, + "flags": 1, + "parent": { + "$ref": "1662" + }, + "_id": 505 + }, + "optional": true, + "pos": 15602, + "end": 15650, + "flags": 0, + "docs": [ + { + "$id": "1666", + "kind": 51, + "content": [ + { + "$id": "1667", + "kind": 52, + "text": "The title of the example", + "pos": 15605, + "end": 15631, + "flags": 0, + "parent": { + "$ref": "1666" + } + } + ], + "tags": [], + "pos": 15602, + "end": 15633, + "flags": 0, + "parent": { + "$ref": "1662" + } + } + ], + "directives": [], + "parent": { + "$ref": "1660" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1662" + }, + "name": "title", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1660" + } + ], + "name": "ExampleOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 70 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1668", + "kind": 15, + "id": { + "$id": "1669", + "kind": 3, + "sv": "description", + "pos": 15691, + "end": 15702, + "flags": 0, + "parent": { + "$ref": "1668" + }, + "_id": 507 + }, + "decorators": [], + "value": { + "$id": "1670", + "kind": 45, + "target": { + "$id": "1671", + "kind": 3, + "sv": "string", + "pos": 15705, + "end": 15711, + "flags": 1, + "parent": { + "$ref": "1670" + }, + "_id": 509 + }, + "arguments": [], + "pos": 15705, + "end": 15711, + "flags": 1, + "parent": { + "$ref": "1668" + }, + "_id": 508 + }, + "optional": true, + "pos": 15655, + "end": 15711, + "flags": 0, + "docs": [ + { + "$id": "1672", + "kind": 51, + "content": [ + { + "$id": "1673", + "kind": 52, + "text": "Description of the example", + "pos": 15658, + "end": 15686, + "flags": 0, + "parent": { + "$ref": "1672" + } + } + ], + "tags": [], + "pos": 15655, + "end": 15688, + "flags": 0, + "parent": { + "$ref": "1668" + } + } + ], + "directives": [], + "parent": { + "$ref": "1660" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1668" + }, + "name": "description", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1660" + } + ], + "name": "ExampleOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 70 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 15598, + "end": 15714 + }, + "pos": 15539, + "end": 15714, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1674", + "kind": 51, + "content": [ + { + "$id": "1675", + "kind": 52, + "text": "Options for example decorators", + "pos": 15542, + "end": 15574, + "flags": 0, + "parent": { + "$ref": "1674" + } + } + ], + "tags": [], + "pos": 15539, + "end": 15576, + "flags": 0, + "parent": { + "$ref": "1660" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1660" + } + ], + "name": "ExampleOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 70 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "1676", + "kind": 25, + "modifiers": [ + { + "$id": "1677", + "kind": 40, + "pos": 15986, + "end": 15992, + "flags": 0, + "parent": { + "$ref": "1676" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1678", + "kind": 3, + "sv": "example", + "pos": 15997, + "end": 16004, + "flags": 0, + "parent": { + "$ref": "1676" + }, + "_id": 510 + }, + "target": { + "$id": "1679", + "kind": 27, + "id": { + "$id": "1680", + "kind": 3, + "sv": "target", + "pos": 16008, + "end": 16014, + "flags": 0, + "parent": { + "$ref": "1679" + }, + "_id": 511 + }, + "type": { + "$id": "1681", + "kind": 28, + "options": [ + { + "$id": "1682", + "kind": 45, + "target": { + "$id": "1683", + "kind": 3, + "sv": "Model", + "pos": 16016, + "end": 16021, + "flags": 1, + "parent": { + "$ref": "1682" + }, + "_id": 513 + }, + "arguments": [], + "pos": 16016, + "end": 16021, + "flags": 1, + "parent": { + "$ref": "1681" + }, + "_id": 512 + }, + { + "$id": "1684", + "kind": 45, + "target": { + "$id": "1685", + "kind": 3, + "sv": "Enum", + "pos": 16024, + "end": 16028, + "flags": 1, + "parent": { + "$ref": "1684" + }, + "_id": 515 + }, + "arguments": [], + "pos": 16024, + "end": 16028, + "flags": 1, + "parent": { + "$ref": "1681" + }, + "_id": 514 + }, + { + "$id": "1686", + "kind": 45, + "target": { + "$id": "1687", + "kind": 3, + "sv": "Scalar", + "pos": 16031, + "end": 16037, + "flags": 1, + "parent": { + "$ref": "1686" + }, + "_id": 517 + }, + "arguments": [], + "pos": 16031, + "end": 16037, + "flags": 1, + "parent": { + "$ref": "1681" + }, + "_id": 516 + }, + { + "$id": "1688", + "kind": 45, + "target": { + "$id": "1689", + "kind": 3, + "sv": "Union", + "pos": 16040, + "end": 16045, + "flags": 1, + "parent": { + "$ref": "1688" + }, + "_id": 519 + }, + "arguments": [], + "pos": 16040, + "end": 16045, + "flags": 1, + "parent": { + "$ref": "1681" + }, + "_id": 518 + }, + { + "$id": "1690", + "kind": 45, + "target": { + "$id": "1691", + "kind": 3, + "sv": "ModelProperty", + "pos": 16048, + "end": 16061, + "flags": 1, + "parent": { + "$ref": "1690" + }, + "_id": 521 + }, + "arguments": [], + "pos": 16048, + "end": 16061, + "flags": 1, + "parent": { + "$ref": "1681" + }, + "_id": 520 + }, + { + "$id": "1692", + "kind": 45, + "target": { + "$id": "1693", + "kind": 3, + "sv": "UnionVariant", + "pos": 16064, + "end": 16076, + "flags": 1, + "parent": { + "$ref": "1692" + }, + "_id": 523 + }, + "arguments": [], + "pos": 16064, + "end": 16076, + "flags": 1, + "parent": { + "$ref": "1681" + }, + "_id": 522 + } + ], + "pos": 16016, + "end": 16076, + "flags": 0, + "parent": { + "$ref": "1679" + } + }, + "optional": false, + "rest": false, + "pos": 16008, + "end": 16076, + "flags": 0, + "parent": { + "$ref": "1676" + }, + "symbol": { + "declarations": [ + { + "$ref": "1679" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 324 + } + }, + "parameters": [ + { + "$id": "1694", + "kind": 27, + "id": { + "$id": "1695", + "kind": 3, + "sv": "example", + "pos": 16080, + "end": 16087, + "flags": 0, + "parent": { + "$ref": "1694" + }, + "_id": 525 + }, + "type": { + "$id": "1696", + "kind": 44, + "target": { + "$id": "1697", + "kind": 43, + "pos": 16097, + "end": 16104, + "flags": 0, + "parent": { + "$ref": "1696" + } + }, + "pos": 16089, + "end": 16104, + "flags": 0, + "parent": { + "$ref": "1694" + } + }, + "optional": false, + "rest": false, + "pos": 16080, + "end": 16104, + "flags": 0, + "parent": { + "$ref": "1676" + }, + "symbol": { + "declarations": [ + { + "$ref": "1694" + } + ], + "name": "example", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 325 + } + }, + { + "$id": "1698", + "kind": 27, + "id": { + "$id": "1699", + "kind": 3, + "sv": "options", + "pos": 16108, + "end": 16115, + "flags": 0, + "parent": { + "$ref": "1698" + }, + "_id": 526 + }, + "type": { + "$id": "1700", + "kind": 44, + "target": { + "$id": "1701", + "kind": 45, + "target": { + "$id": "1702", + "kind": 3, + "sv": "ExampleOptions", + "pos": 16126, + "end": 16140, + "flags": 1, + "parent": { + "$ref": "1701" + }, + "_id": 528 + }, + "arguments": [], + "pos": 16126, + "end": 16140, + "flags": 1, + "parent": { + "$ref": "1700" + }, + "_id": 527 + }, + "pos": 16118, + "end": 16140, + "flags": 0, + "parent": { + "$ref": "1698" + } + }, + "optional": true, + "rest": false, + "pos": 16108, + "end": 16140, + "flags": 0, + "parent": { + "$ref": "1676" + }, + "symbol": { + "declarations": [ + { + "$ref": "1698" + } + ], + "name": "options", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 326 + } + } + ], + "pos": 15716, + "end": 16143, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1703", + "kind": 51, + "content": [ + { + "$id": "1704", + "kind": 52, + "text": "Provide an example value for a data type.", + "pos": 15719, + "end": 15771, + "flags": 0, + "parent": { + "$ref": "1703" + } + } + ], + "tags": [ + { + "$id": "1705", + "kind": 53, + "tagName": { + "$id": "1706", + "kind": 3, + "sv": "param", + "pos": 15772, + "end": 15777, + "flags": 0, + "parent": { + "$ref": "1705" + } + }, + "paramName": { + "$id": "1707", + "kind": 3, + "sv": "example", + "pos": 15778, + "end": 15785, + "flags": 0, + "parent": { + "$ref": "1705" + } + }, + "content": [ + { + "$id": "1708", + "kind": 52, + "text": "Example value.", + "pos": 15786, + "end": 15804, + "flags": 0, + "parent": { + "$ref": "1705" + } + } + ], + "pos": 15771, + "end": 15804, + "flags": 0, + "parent": { + "$ref": "1703" + } + }, + { + "$id": "1709", + "kind": 53, + "tagName": { + "$id": "1710", + "kind": 3, + "sv": "param", + "pos": 15805, + "end": 15810, + "flags": 0, + "parent": { + "$ref": "1709" + } + }, + "paramName": { + "$id": "1711", + "kind": 3, + "sv": "options", + "pos": 15811, + "end": 15818, + "flags": 0, + "parent": { + "$ref": "1709" + } + }, + "content": [ + { + "$id": "1712", + "kind": 52, + "text": "Optional metadata for the example.", + "pos": 15819, + "end": 15860, + "flags": 0, + "parent": { + "$ref": "1709" + } + } + ], + "pos": 15804, + "end": 15860, + "flags": 0, + "parent": { + "$ref": "1703" + } + }, + { + "$id": "1713", + "kind": 58, + "tagName": { + "$id": "1714", + "kind": 3, + "sv": "example", + "pos": 15861, + "end": 15868, + "flags": 0, + "parent": { + "$ref": "1713" + } + }, + "content": [ + { + "$id": "1715", + "kind": 52, + "text": "```tsp\n@example(#{name: \"Fluffy\", age: 2})\nmodel Pet {\n name: string;\n age: int32;\n}\n```", + "pos": 15868, + "end": 15983, + "flags": 0, + "parent": { + "$ref": "1713" + } + } + ], + "pos": 15860, + "end": 15983, + "flags": 0, + "parent": { + "$ref": "1703" + } + } + ], + "pos": 15716, + "end": 15985, + "flags": 0, + "parent": { + "$ref": "1676" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1676" + } + ], + "name": "@example", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1716", + "kind": 13, + "id": { + "$id": "1717", + "kind": 3, + "sv": "OperationExample", + "pos": 16195, + "end": 16211, + "flags": 0, + "parent": { + "$ref": "1716" + }, + "_id": 529 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [ + { + "$id": "1718", + "kind": 15, + "id": { + "$id": "1719", + "kind": 3, + "sv": "parameters", + "pos": 16247, + "end": 16257, + "flags": 0, + "parent": { + "$ref": "1718" + }, + "_id": 530 + }, + "decorators": [], + "value": { + "$id": "1720", + "kind": 43, + "pos": 16260, + "end": 16267, + "flags": 0, + "parent": { + "$ref": "1718" + } + }, + "optional": true, + "pos": 16216, + "end": 16267, + "flags": 0, + "docs": [ + { + "$id": "1721", + "kind": 51, + "content": [ + { + "$id": "1722", + "kind": 52, + "text": "Example request body.", + "pos": 16219, + "end": 16242, + "flags": 0, + "parent": { + "$ref": "1721" + } + } + ], + "tags": [], + "pos": 16216, + "end": 16244, + "flags": 0, + "parent": { + "$ref": "1718" + } + } + ], + "directives": [], + "parent": { + "$ref": "1716" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1718" + }, + "name": "parameters", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1716" + } + ], + "name": "OperationExample", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 72 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1723", + "kind": 15, + "id": { + "$id": "1724", + "kind": 3, + "sv": "returnType", + "pos": 16304, + "end": 16314, + "flags": 0, + "parent": { + "$ref": "1723" + }, + "_id": 531 + }, + "decorators": [], + "value": { + "$id": "1725", + "kind": 43, + "pos": 16317, + "end": 16324, + "flags": 0, + "parent": { + "$ref": "1723" + } + }, + "optional": true, + "pos": 16272, + "end": 16324, + "flags": 0, + "docs": [ + { + "$id": "1726", + "kind": 51, + "content": [ + { + "$id": "1727", + "kind": 52, + "text": "Example response body.", + "pos": 16275, + "end": 16299, + "flags": 0, + "parent": { + "$ref": "1726" + } + } + ], + "tags": [], + "pos": 16272, + "end": 16301, + "flags": 0, + "parent": { + "$ref": "1723" + } + } + ], + "directives": [], + "parent": { + "$ref": "1716" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "1723" + }, + "name": "returnType", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "1716" + } + ], + "name": "OperationExample", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 72 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 16212, + "end": 16327 + }, + "pos": 16145, + "end": 16327, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1728", + "kind": 51, + "content": [ + { + "$id": "1729", + "kind": 52, + "text": "Operation example configuration.", + "pos": 16148, + "end": 16186, + "flags": 0, + "parent": { + "$ref": "1728" + } + } + ], + "tags": [], + "pos": 16145, + "end": 16188, + "flags": 0, + "parent": { + "$ref": "1716" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1716" + } + ], + "name": "OperationExample", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 72 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "1730", + "kind": 25, + "modifiers": [ + { + "$id": "1731", + "kind": 40, + "pos": 16685, + "end": 16691, + "flags": 0, + "parent": { + "$ref": "1730" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1732", + "kind": 3, + "sv": "opExample", + "pos": 16696, + "end": 16705, + "flags": 0, + "parent": { + "$ref": "1730" + }, + "_id": 532 + }, + "target": { + "$id": "1733", + "kind": 27, + "id": { + "$id": "1734", + "kind": 3, + "sv": "target", + "pos": 16709, + "end": 16715, + "flags": 0, + "parent": { + "$ref": "1733" + }, + "_id": 533 + }, + "type": { + "$id": "1735", + "kind": 45, + "target": { + "$id": "1736", + "kind": 3, + "sv": "Operation", + "pos": 16717, + "end": 16726, + "flags": 1, + "parent": { + "$ref": "1735" + }, + "_id": 535 + }, + "arguments": [], + "pos": 16717, + "end": 16726, + "flags": 1, + "parent": { + "$ref": "1733" + }, + "_id": 534 + }, + "optional": false, + "rest": false, + "pos": 16709, + "end": 16726, + "flags": 0, + "parent": { + "$ref": "1730" + }, + "symbol": { + "declarations": [ + { + "$ref": "1733" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 330 + } + }, + "parameters": [ + { + "$id": "1737", + "kind": 27, + "id": { + "$id": "1738", + "kind": 3, + "sv": "example", + "pos": 16730, + "end": 16737, + "flags": 0, + "parent": { + "$ref": "1737" + }, + "_id": 536 + }, + "type": { + "$id": "1739", + "kind": 44, + "target": { + "$id": "1740", + "kind": 45, + "target": { + "$id": "1741", + "kind": 3, + "sv": "OperationExample", + "pos": 16747, + "end": 16763, + "flags": 1, + "parent": { + "$ref": "1740" + }, + "_id": 538 + }, + "arguments": [], + "pos": 16747, + "end": 16763, + "flags": 1, + "parent": { + "$ref": "1739" + }, + "_id": 537 + }, + "pos": 16739, + "end": 16763, + "flags": 0, + "parent": { + "$ref": "1737" + } + }, + "optional": false, + "rest": false, + "pos": 16730, + "end": 16763, + "flags": 0, + "parent": { + "$ref": "1730" + }, + "symbol": { + "declarations": [ + { + "$ref": "1737" + } + ], + "name": "example", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 331 + } + }, + { + "$id": "1742", + "kind": 27, + "id": { + "$id": "1743", + "kind": 3, + "sv": "options", + "pos": 16767, + "end": 16774, + "flags": 0, + "parent": { + "$ref": "1742" + }, + "_id": 539 + }, + "type": { + "$id": "1744", + "kind": 44, + "target": { + "$id": "1745", + "kind": 45, + "target": { + "$id": "1746", + "kind": 3, + "sv": "ExampleOptions", + "pos": 16785, + "end": 16799, + "flags": 1, + "parent": { + "$ref": "1745" + }, + "_id": 541 + }, + "arguments": [], + "pos": 16785, + "end": 16799, + "flags": 1, + "parent": { + "$ref": "1744" + }, + "_id": 540 + }, + "pos": 16777, + "end": 16799, + "flags": 0, + "parent": { + "$ref": "1742" + } + }, + "optional": true, + "rest": false, + "pos": 16767, + "end": 16799, + "flags": 0, + "parent": { + "$ref": "1730" + }, + "symbol": { + "declarations": [ + { + "$ref": "1742" + } + ], + "name": "options", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 332 + } + } + ], + "pos": 16329, + "end": 16802, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1747", + "kind": 51, + "content": [ + { + "$id": "1748", + "kind": 52, + "text": "Provide example values for an operation's parameters and corresponding return type.", + "pos": 16332, + "end": 16426, + "flags": 0, + "parent": { + "$ref": "1747" + } + } + ], + "tags": [ + { + "$id": "1749", + "kind": 53, + "tagName": { + "$id": "1750", + "kind": 3, + "sv": "param", + "pos": 16427, + "end": 16432, + "flags": 0, + "parent": { + "$ref": "1749" + } + }, + "paramName": { + "$id": "1751", + "kind": 3, + "sv": "example", + "pos": 16433, + "end": 16440, + "flags": 0, + "parent": { + "$ref": "1749" + } + }, + "content": [ + { + "$id": "1752", + "kind": 52, + "text": "Example value.", + "pos": 16441, + "end": 16459, + "flags": 0, + "parent": { + "$ref": "1749" + } + } + ], + "pos": 16426, + "end": 16459, + "flags": 0, + "parent": { + "$ref": "1747" + } + }, + { + "$id": "1753", + "kind": 53, + "tagName": { + "$id": "1754", + "kind": 3, + "sv": "param", + "pos": 16460, + "end": 16465, + "flags": 0, + "parent": { + "$ref": "1753" + } + }, + "paramName": { + "$id": "1755", + "kind": 3, + "sv": "options", + "pos": 16466, + "end": 16473, + "flags": 0, + "parent": { + "$ref": "1753" + } + }, + "content": [ + { + "$id": "1756", + "kind": 52, + "text": "Optional metadata for the example.", + "pos": 16474, + "end": 16515, + "flags": 0, + "parent": { + "$ref": "1753" + } + } + ], + "pos": 16459, + "end": 16515, + "flags": 0, + "parent": { + "$ref": "1747" + } + }, + { + "$id": "1757", + "kind": 58, + "tagName": { + "$id": "1758", + "kind": 3, + "sv": "example", + "pos": 16516, + "end": 16523, + "flags": 0, + "parent": { + "$ref": "1757" + } + }, + "content": [ + { + "$id": "1759", + "kind": 52, + "text": "```tsp\n@opExample(#{parameters: #{name: \"Fluffy\", age: 2}, returnType: #{name: \"Fluffy\", age: 2, id: \"abc\"})\nop createPet(pet: Pet): Pet;\n```", + "pos": 16523, + "end": 16682, + "flags": 0, + "parent": { + "$ref": "1757" + } + } + ], + "pos": 16515, + "end": 16682, + "flags": 0, + "parent": { + "$ref": "1747" + } + } + ], + "pos": 16329, + "end": 16684, + "flags": 0, + "parent": { + "$ref": "1730" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1730" + } + ], + "name": "@opExample", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1760", + "kind": 25, + "modifiers": [ + { + "$id": "1761", + "kind": 40, + "pos": 16867, + "end": 16873, + "flags": 0, + "parent": { + "$ref": "1760" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1762", + "kind": 3, + "sv": "withOptionalProperties", + "pos": 16878, + "end": 16900, + "flags": 0, + "parent": { + "$ref": "1760" + }, + "_id": 168 + }, + "target": { + "$id": "1763", + "kind": 27, + "id": { + "$id": "1764", + "kind": 3, + "sv": "target", + "pos": 16901, + "end": 16907, + "flags": 0, + "parent": { + "$ref": "1763" + }, + "_id": 169 + }, + "type": { + "$id": "1765", + "kind": 45, + "target": { + "$id": "1766", + "kind": 3, + "sv": "Model", + "pos": 16909, + "end": 16914, + "flags": 1, + "parent": { + "$ref": "1765" + }, + "_id": 171 + }, + "arguments": [], + "pos": 16909, + "end": 16914, + "flags": 1, + "parent": { + "$ref": "1763" + }, + "_id": 170 + }, + "optional": false, + "rest": false, + "pos": 16901, + "end": 16914, + "flags": 0, + "parent": { + "$ref": "1760" + }, + "symbol": { + "declarations": [ + { + "$ref": "1763" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 221 + } + }, + "parameters": [], + "pos": 16804, + "end": 16916, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1767", + "kind": 51, + "content": [ + { + "$id": "1768", + "kind": 52, + "text": "Returns the model with required properties removed.", + "pos": 16807, + "end": 16864, + "flags": 0, + "parent": { + "$ref": "1767" + } + } + ], + "tags": [], + "pos": 16804, + "end": 16866, + "flags": 0, + "parent": { + "$ref": "1760" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1760" + } + ], + "name": "@withOptionalProperties", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1769", + "kind": 25, + "modifiers": [ + { + "$id": "1770", + "kind": 40, + "pos": 16980, + "end": 16986, + "flags": 0, + "parent": { + "$ref": "1769" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1771", + "kind": 3, + "sv": "withoutDefaultValues", + "pos": 16991, + "end": 17011, + "flags": 0, + "parent": { + "$ref": "1769" + }, + "_id": 229 + }, + "target": { + "$id": "1772", + "kind": 27, + "id": { + "$id": "1773", + "kind": 3, + "sv": "target", + "pos": 17012, + "end": 17018, + "flags": 0, + "parent": { + "$ref": "1772" + }, + "_id": 230 + }, + "type": { + "$id": "1774", + "kind": 45, + "target": { + "$id": "1775", + "kind": 3, + "sv": "Model", + "pos": 17020, + "end": 17025, + "flags": 1, + "parent": { + "$ref": "1774" + }, + "_id": 232 + }, + "arguments": [], + "pos": 17020, + "end": 17025, + "flags": 1, + "parent": { + "$ref": "1772" + }, + "_id": 231 + }, + "optional": false, + "rest": false, + "pos": 17012, + "end": 17025, + "flags": 0, + "parent": { + "$ref": "1769" + }, + "symbol": { + "declarations": [ + { + "$ref": "1772" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 231 + } + }, + "parameters": [], + "pos": 16918, + "end": 17027, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1776", + "kind": 51, + "content": [ + { + "$id": "1777", + "kind": 52, + "text": "Returns the model with any default values removed.", + "pos": 16921, + "end": 16977, + "flags": 0, + "parent": { + "$ref": "1776" + } + } + ], + "tags": [], + "pos": 16918, + "end": 16979, + "flags": 0, + "parent": { + "$ref": "1769" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1769" + } + ], + "name": "@withoutDefaultValues", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1778", + "kind": 25, + "modifiers": [ + { + "$id": "1779", + "kind": 40, + "pos": 17135, + "end": 17141, + "flags": 0, + "parent": { + "$ref": "1778" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1780", + "kind": 3, + "sv": "withoutOmittedProperties", + "pos": 17146, + "end": 17170, + "flags": 0, + "parent": { + "$ref": "1778" + }, + "_id": 189 + }, + "target": { + "$id": "1781", + "kind": 27, + "id": { + "$id": "1782", + "kind": 3, + "sv": "target", + "pos": 17171, + "end": 17177, + "flags": 0, + "parent": { + "$ref": "1781" + }, + "_id": 190 + }, + "type": { + "$id": "1783", + "kind": 45, + "target": { + "$id": "1784", + "kind": 3, + "sv": "Model", + "pos": 17179, + "end": 17184, + "flags": 1, + "parent": { + "$ref": "1783" + }, + "_id": 192 + }, + "arguments": [], + "pos": 17179, + "end": 17184, + "flags": 1, + "parent": { + "$ref": "1781" + }, + "_id": 191 + }, + "optional": false, + "rest": false, + "pos": 17171, + "end": 17184, + "flags": 0, + "parent": { + "$ref": "1778" + }, + "symbol": { + "declarations": [ + { + "$ref": "1781" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 225 + } + }, + "parameters": [ + { + "$id": "1785", + "kind": 27, + "id": { + "$id": "1786", + "kind": 3, + "sv": "omit", + "pos": 17186, + "end": 17190, + "flags": 0, + "parent": { + "$ref": "1785" + }, + "_id": 193 + }, + "type": { + "$id": "1787", + "kind": 28, + "options": [ + { + "$id": "1788", + "kind": 45, + "target": { + "$id": "1789", + "kind": 3, + "sv": "string", + "pos": 17192, + "end": 17198, + "flags": 1, + "parent": { + "$ref": "1788" + }, + "_id": 195 + }, + "arguments": [], + "pos": 17192, + "end": 17198, + "flags": 1, + "parent": { + "$ref": "1787" + }, + "_id": 194 + }, + { + "$id": "1790", + "kind": 45, + "target": { + "$id": "1791", + "kind": 3, + "sv": "Union", + "pos": 17201, + "end": 17206, + "flags": 1, + "parent": { + "$ref": "1790" + }, + "_id": 197 + }, + "arguments": [], + "pos": 17201, + "end": 17206, + "flags": 1, + "parent": { + "$ref": "1787" + }, + "_id": 196 + } + ], + "pos": 17192, + "end": 17206, + "flags": 0, + "parent": { + "$ref": "1785" + } + }, + "optional": false, + "rest": false, + "pos": 17186, + "end": 17206, + "flags": 0, + "parent": { + "$ref": "1778" + }, + "symbol": { + "declarations": [ + { + "$ref": "1785" + } + ], + "name": "omit", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 226 + } + } + ], + "pos": 17029, + "end": 17208, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1792", + "kind": 51, + "content": [ + { + "$id": "1793", + "kind": 52, + "text": "Returns the model with the given properties omitted.", + "pos": 17032, + "end": 17092, + "flags": 0, + "parent": { + "$ref": "1792" + } + } + ], + "tags": [ + { + "$id": "1794", + "kind": 53, + "tagName": { + "$id": "1795", + "kind": 3, + "sv": "param", + "pos": 17093, + "end": 17098, + "flags": 0, + "parent": { + "$ref": "1794" + } + }, + "paramName": { + "$id": "1796", + "kind": 3, + "sv": "omit", + "pos": 17099, + "end": 17103, + "flags": 0, + "parent": { + "$ref": "1794" + } + }, + "content": [ + { + "$id": "1797", + "kind": 52, + "text": "List of properties to omit", + "pos": 17104, + "end": 17132, + "flags": 0, + "parent": { + "$ref": "1794" + } + } + ], + "pos": 17092, + "end": 17132, + "flags": 0, + "parent": { + "$ref": "1792" + } + } + ], + "pos": 17029, + "end": 17134, + "flags": 0, + "parent": { + "$ref": "1778" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1778" + } + ], + "name": "@withoutOmittedProperties", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1798", + "kind": 25, + "modifiers": [ + { + "$id": "1799", + "kind": 40, + "pos": 17325, + "end": 17331, + "flags": 0, + "parent": { + "$ref": "1798" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1800", + "kind": 3, + "sv": "withPickedProperties", + "pos": 17336, + "end": 17356, + "flags": 0, + "parent": { + "$ref": "1798" + }, + "_id": 210 + }, + "target": { + "$id": "1801", + "kind": 27, + "id": { + "$id": "1802", + "kind": 3, + "sv": "target", + "pos": 17357, + "end": 17363, + "flags": 0, + "parent": { + "$ref": "1801" + }, + "_id": 211 + }, + "type": { + "$id": "1803", + "kind": 45, + "target": { + "$id": "1804", + "kind": 3, + "sv": "Model", + "pos": 17365, + "end": 17370, + "flags": 1, + "parent": { + "$ref": "1803" + }, + "_id": 213 + }, + "arguments": [], + "pos": 17365, + "end": 17370, + "flags": 1, + "parent": { + "$ref": "1801" + }, + "_id": 212 + }, + "optional": false, + "rest": false, + "pos": 17357, + "end": 17370, + "flags": 0, + "parent": { + "$ref": "1798" + }, + "symbol": { + "declarations": [ + { + "$ref": "1801" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 228 + } + }, + "parameters": [ + { + "$id": "1805", + "kind": 27, + "id": { + "$id": "1806", + "kind": 3, + "sv": "pick", + "pos": 17372, + "end": 17376, + "flags": 0, + "parent": { + "$ref": "1805" + }, + "_id": 214 + }, + "type": { + "$id": "1807", + "kind": 28, + "options": [ + { + "$id": "1808", + "kind": 45, + "target": { + "$id": "1809", + "kind": 3, + "sv": "string", + "pos": 17378, + "end": 17384, + "flags": 1, + "parent": { + "$ref": "1808" + }, + "_id": 216 + }, + "arguments": [], + "pos": 17378, + "end": 17384, + "flags": 1, + "parent": { + "$ref": "1807" + }, + "_id": 215 + }, + { + "$id": "1810", + "kind": 45, + "target": { + "$id": "1811", + "kind": 3, + "sv": "Union", + "pos": 17387, + "end": 17392, + "flags": 1, + "parent": { + "$ref": "1810" + }, + "_id": 218 + }, + "arguments": [], + "pos": 17387, + "end": 17392, + "flags": 1, + "parent": { + "$ref": "1807" + }, + "_id": 217 + } + ], + "pos": 17378, + "end": 17392, + "flags": 0, + "parent": { + "$ref": "1805" + } + }, + "optional": false, + "rest": false, + "pos": 17372, + "end": 17392, + "flags": 0, + "parent": { + "$ref": "1798" + }, + "symbol": { + "declarations": [ + { + "$ref": "1805" + } + ], + "name": "pick", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 229 + } + } + ], + "pos": 17210, + "end": 17394, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1812", + "kind": 51, + "content": [ + { + "$id": "1813", + "kind": 52, + "text": "Returns the model with only the given properties included.", + "pos": 17213, + "end": 17279, + "flags": 0, + "parent": { + "$ref": "1812" + } + } + ], + "tags": [ + { + "$id": "1814", + "kind": 53, + "tagName": { + "$id": "1815", + "kind": 3, + "sv": "param", + "pos": 17280, + "end": 17285, + "flags": 0, + "parent": { + "$ref": "1814" + } + }, + "paramName": { + "$id": "1816", + "kind": 3, + "sv": "pick", + "pos": 17286, + "end": 17290, + "flags": 0, + "parent": { + "$ref": "1814" + } + }, + "content": [ + { + "$id": "1817", + "kind": 52, + "text": "List of properties to include", + "pos": 17291, + "end": 17322, + "flags": 0, + "parent": { + "$ref": "1814" + } + } + ], + "pos": 17279, + "end": 17322, + "flags": 0, + "parent": { + "$ref": "1812" + } + } + ], + "pos": 17210, + "end": 17324, + "flags": 0, + "parent": { + "$ref": "1798" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1798" + } + ], + "name": "@withPickedProperties", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1818", + "kind": 25, + "modifiers": [ + { + "$id": "1819", + "kind": 40, + "pos": 17656, + "end": 17662, + "flags": 0, + "parent": { + "$ref": "1818" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1820", + "kind": 3, + "sv": "list", + "pos": 17667, + "end": 17671, + "flags": 0, + "parent": { + "$ref": "1818" + }, + "_id": 542 + }, + "target": { + "$id": "1821", + "kind": 27, + "id": { + "$id": "1822", + "kind": 3, + "sv": "target", + "pos": 17672, + "end": 17678, + "flags": 0, + "parent": { + "$ref": "1821" + }, + "_id": 543 + }, + "type": { + "$id": "1823", + "kind": 45, + "target": { + "$id": "1824", + "kind": 3, + "sv": "Operation", + "pos": 17680, + "end": 17689, + "flags": 1, + "parent": { + "$ref": "1823" + }, + "_id": 545 + }, + "arguments": [], + "pos": 17680, + "end": 17689, + "flags": 1, + "parent": { + "$ref": "1821" + }, + "_id": 544 + }, + "optional": false, + "rest": false, + "pos": 17672, + "end": 17689, + "flags": 0, + "parent": { + "$ref": "1818" + }, + "symbol": { + "declarations": [ + { + "$ref": "1821" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 334 + } + }, + "parameters": [], + "pos": 17563, + "end": 17691, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1825", + "kind": 51, + "content": [ + { + "$id": "1826", + "kind": 52, + "text": "Mark this operation as a `list` operation that returns a paginated list of items.", + "pos": 17566, + "end": 17653, + "flags": 0, + "parent": { + "$ref": "1825" + } + } + ], + "tags": [], + "pos": 17563, + "end": 17655, + "flags": 0, + "parent": { + "$ref": "1818" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1818" + } + ], + "name": "@list", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1827", + "kind": 25, + "modifiers": [ + { + "$id": "1828", + "kind": 40, + "pos": 17923, + "end": 17929, + "flags": 0, + "parent": { + "$ref": "1827" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1829", + "kind": 3, + "sv": "offset", + "pos": 17934, + "end": 17940, + "flags": 0, + "parent": { + "$ref": "1827" + }, + "_id": 546 + }, + "target": { + "$id": "1830", + "kind": 27, + "id": { + "$id": "1831", + "kind": 3, + "sv": "target", + "pos": 17941, + "end": 17947, + "flags": 0, + "parent": { + "$ref": "1830" + }, + "_id": 547 + }, + "type": { + "$id": "1832", + "kind": 45, + "target": { + "$id": "1833", + "kind": 3, + "sv": "ModelProperty", + "pos": 17949, + "end": 17962, + "flags": 1, + "parent": { + "$ref": "1832" + }, + "_id": 549 + }, + "arguments": [], + "pos": 17949, + "end": 17962, + "flags": 1, + "parent": { + "$ref": "1830" + }, + "_id": 548 + }, + "optional": false, + "rest": false, + "pos": 17941, + "end": 17962, + "flags": 0, + "parent": { + "$ref": "1827" + }, + "symbol": { + "declarations": [ + { + "$ref": "1830" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 336 + } + }, + "parameters": [], + "pos": 17693, + "end": 17964, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1834", + "kind": 51, + "content": [ + { + "$id": "1835", + "kind": 52, + "text": "Pagination property defining the number of items to skip.", + "pos": 17696, + "end": 17761, + "flags": 0, + "parent": { + "$ref": "1834" + } + } + ], + "tags": [ + { + "$id": "1836", + "kind": 58, + "tagName": { + "$id": "1837", + "kind": 3, + "sv": "example", + "pos": 17762, + "end": 17769, + "flags": 0, + "parent": { + "$ref": "1836" + } + }, + "content": [ + { + "$id": "1838", + "kind": 52, + "text": "```tsp\nmodel Page {\n @pageItems items: T[];\n}\n@list op listPets(@offset skip: int32, @pageSize pageSize: int8): Page;\n```", + "pos": 17769, + "end": 17920, + "flags": 0, + "parent": { + "$ref": "1836" + } + } + ], + "pos": 17761, + "end": 17920, + "flags": 0, + "parent": { + "$ref": "1834" + } + } + ], + "pos": 17693, + "end": 17922, + "flags": 0, + "parent": { + "$ref": "1827" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1827" + } + ], + "name": "@offset", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1839", + "kind": 25, + "modifiers": [ + { + "$id": "1840", + "kind": 40, + "pos": 18189, + "end": 18195, + "flags": 0, + "parent": { + "$ref": "1839" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1841", + "kind": 3, + "sv": "pageIndex", + "pos": 18200, + "end": 18209, + "flags": 0, + "parent": { + "$ref": "1839" + }, + "_id": 550 + }, + "target": { + "$id": "1842", + "kind": 27, + "id": { + "$id": "1843", + "kind": 3, + "sv": "target", + "pos": 18210, + "end": 18216, + "flags": 0, + "parent": { + "$ref": "1842" + }, + "_id": 551 + }, + "type": { + "$id": "1844", + "kind": 45, + "target": { + "$id": "1845", + "kind": 3, + "sv": "ModelProperty", + "pos": 18218, + "end": 18231, + "flags": 1, + "parent": { + "$ref": "1844" + }, + "_id": 553 + }, + "arguments": [], + "pos": 18218, + "end": 18231, + "flags": 1, + "parent": { + "$ref": "1842" + }, + "_id": 552 + }, + "optional": false, + "rest": false, + "pos": 18210, + "end": 18231, + "flags": 0, + "parent": { + "$ref": "1839" + }, + "symbol": { + "declarations": [ + { + "$ref": "1842" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 338 + } + }, + "parameters": [], + "pos": 17966, + "end": 18233, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1846", + "kind": 51, + "content": [ + { + "$id": "1847", + "kind": 52, + "text": "Pagination property defining the page index.", + "pos": 17969, + "end": 18024, + "flags": 0, + "parent": { + "$ref": "1846" + } + } + ], + "tags": [ + { + "$id": "1848", + "kind": 58, + "tagName": { + "$id": "1849", + "kind": 3, + "sv": "example", + "pos": 18025, + "end": 18032, + "flags": 0, + "parent": { + "$ref": "1848" + } + }, + "content": [ + { + "$id": "1850", + "kind": 52, + "text": "```tsp\nmodel Page {\n @pageItems items: T[];\n}\n@list op listPets(@pageIndex page: int32, @pageSize pageSize: int8): Page;\n```", + "pos": 18032, + "end": 18186, + "flags": 0, + "parent": { + "$ref": "1848" + } + } + ], + "pos": 18024, + "end": 18186, + "flags": 0, + "parent": { + "$ref": "1846" + } + } + ], + "pos": 17966, + "end": 18188, + "flags": 0, + "parent": { + "$ref": "1839" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1839" + } + ], + "name": "@pageIndex", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1851", + "kind": 25, + "modifiers": [ + { + "$id": "1852", + "kind": 40, + "pos": 18510, + "end": 18516, + "flags": 0, + "parent": { + "$ref": "1851" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1853", + "kind": 3, + "sv": "pageSize", + "pos": 18521, + "end": 18529, + "flags": 0, + "parent": { + "$ref": "1851" + }, + "_id": 554 + }, + "target": { + "$id": "1854", + "kind": 27, + "id": { + "$id": "1855", + "kind": 3, + "sv": "target", + "pos": 18530, + "end": 18536, + "flags": 0, + "parent": { + "$ref": "1854" + }, + "_id": 555 + }, + "type": { + "$id": "1856", + "kind": 45, + "target": { + "$id": "1857", + "kind": 3, + "sv": "ModelProperty", + "pos": 18538, + "end": 18551, + "flags": 1, + "parent": { + "$ref": "1856" + }, + "_id": 557 + }, + "arguments": [], + "pos": 18538, + "end": 18551, + "flags": 1, + "parent": { + "$ref": "1854" + }, + "_id": 556 + }, + "optional": false, + "rest": false, + "pos": 18530, + "end": 18551, + "flags": 0, + "parent": { + "$ref": "1851" + }, + "symbol": { + "declarations": [ + { + "$ref": "1854" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 340 + } + }, + "parameters": [], + "pos": 18235, + "end": 18553, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1858", + "kind": 51, + "content": [ + { + "$id": "1859", + "kind": 52, + "text": "Specify the pagination parameter that controls the maximum number of items to include in a page.", + "pos": 18238, + "end": 18345, + "flags": 0, + "parent": { + "$ref": "1858" + } + } + ], + "tags": [ + { + "$id": "1860", + "kind": 58, + "tagName": { + "$id": "1861", + "kind": 3, + "sv": "example", + "pos": 18346, + "end": 18353, + "flags": 0, + "parent": { + "$ref": "1860" + } + }, + "content": [ + { + "$id": "1862", + "kind": 52, + "text": "```tsp\nmodel Page {\n @pageItems items: T[];\n}\n@list op listPets(@pageIndex page: int32, @pageSize pageSize: int8): Page;\n```", + "pos": 18353, + "end": 18507, + "flags": 0, + "parent": { + "$ref": "1860" + } + } + ], + "pos": 18345, + "end": 18507, + "flags": 0, + "parent": { + "$ref": "1858" + } + } + ], + "pos": 18235, + "end": 18509, + "flags": 0, + "parent": { + "$ref": "1851" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1851" + } + ], + "name": "@pageSize", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1863", + "kind": 25, + "modifiers": [ + { + "$id": "1864", + "kind": 40, + "pos": 18797, + "end": 18803, + "flags": 0, + "parent": { + "$ref": "1863" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1865", + "kind": 3, + "sv": "pageItems", + "pos": 18808, + "end": 18817, + "flags": 0, + "parent": { + "$ref": "1863" + }, + "_id": 558 + }, + "target": { + "$id": "1866", + "kind": 27, + "id": { + "$id": "1867", + "kind": 3, + "sv": "target", + "pos": 18818, + "end": 18824, + "flags": 0, + "parent": { + "$ref": "1866" + }, + "_id": 559 + }, + "type": { + "$id": "1868", + "kind": 45, + "target": { + "$id": "1869", + "kind": 3, + "sv": "ModelProperty", + "pos": 18826, + "end": 18839, + "flags": 1, + "parent": { + "$ref": "1868" + }, + "_id": 561 + }, + "arguments": [], + "pos": 18826, + "end": 18839, + "flags": 1, + "parent": { + "$ref": "1866" + }, + "_id": 560 + }, + "optional": false, + "rest": false, + "pos": 18818, + "end": 18839, + "flags": 0, + "parent": { + "$ref": "1863" + }, + "symbol": { + "declarations": [ + { + "$ref": "1866" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 342 + } + }, + "parameters": [], + "pos": 18555, + "end": 18841, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1870", + "kind": 51, + "content": [ + { + "$id": "1871", + "kind": 52, + "text": "Specify the the property that contains the array of page items.", + "pos": 18558, + "end": 18632, + "flags": 0, + "parent": { + "$ref": "1870" + } + } + ], + "tags": [ + { + "$id": "1872", + "kind": 58, + "tagName": { + "$id": "1873", + "kind": 3, + "sv": "example", + "pos": 18633, + "end": 18640, + "flags": 0, + "parent": { + "$ref": "1872" + } + }, + "content": [ + { + "$id": "1874", + "kind": 52, + "text": "```tsp\nmodel Page {\n @pageItems items: T[];\n}\n@list op listPets(@pageIndex page: int32, @pageSize pageSize: int8): Page;\n```", + "pos": 18640, + "end": 18794, + "flags": 0, + "parent": { + "$ref": "1872" + } + } + ], + "pos": 18632, + "end": 18794, + "flags": 0, + "parent": { + "$ref": "1870" + } + } + ], + "pos": 18555, + "end": 18796, + "flags": 0, + "parent": { + "$ref": "1863" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1863" + } + ], + "name": "@pageItems", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1875", + "kind": 25, + "modifiers": [ + { + "$id": "1876", + "kind": 40, + "pos": 19204, + "end": 19210, + "flags": 0, + "parent": { + "$ref": "1875" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1877", + "kind": 3, + "sv": "continuationToken", + "pos": 19215, + "end": 19232, + "flags": 0, + "parent": { + "$ref": "1875" + }, + "_id": 562 + }, + "target": { + "$id": "1878", + "kind": 27, + "id": { + "$id": "1879", + "kind": 3, + "sv": "target", + "pos": 19233, + "end": 19239, + "flags": 0, + "parent": { + "$ref": "1878" + }, + "_id": 563 + }, + "type": { + "$id": "1880", + "kind": 45, + "target": { + "$id": "1881", + "kind": 3, + "sv": "ModelProperty", + "pos": 19241, + "end": 19254, + "flags": 1, + "parent": { + "$ref": "1880" + }, + "_id": 565 + }, + "arguments": [], + "pos": 19241, + "end": 19254, + "flags": 1, + "parent": { + "$ref": "1878" + }, + "_id": 564 + }, + "optional": false, + "rest": false, + "pos": 19233, + "end": 19254, + "flags": 0, + "parent": { + "$ref": "1875" + }, + "symbol": { + "declarations": [ + { + "$ref": "1878" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 344 + } + }, + "parameters": [], + "pos": 18843, + "end": 19256, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1882", + "kind": 51, + "content": [ + { + "$id": "1883", + "kind": 52, + "text": "Pagination property defining the token to get to the next page.\nIt MUST be specified both on the request parameter and the response.", + "pos": 18846, + "end": 18992, + "flags": 0, + "parent": { + "$ref": "1882" + } + } + ], + "tags": [ + { + "$id": "1884", + "kind": 58, + "tagName": { + "$id": "1885", + "kind": 3, + "sv": "example", + "pos": 18993, + "end": 19000, + "flags": 0, + "parent": { + "$ref": "1884" + } + }, + "content": [ + { + "$id": "1886", + "kind": 52, + "text": "```tsp\nmodel Page {\n @pageItems items: T[];\n @continuationToken continuationToken: string;\n}\n@list op listPets(@continuationToken continuationToken: string): Page;\n```", + "pos": 19000, + "end": 19201, + "flags": 0, + "parent": { + "$ref": "1884" + } + } + ], + "pos": 18992, + "end": 19201, + "flags": 0, + "parent": { + "$ref": "1882" + } + } + ], + "pos": 18843, + "end": 19203, + "flags": 0, + "parent": { + "$ref": "1875" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1875" + } + ], + "name": "@continuationToken", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1887", + "kind": 25, + "modifiers": [ + { + "$id": "1888", + "kind": 40, + "pos": 19684, + "end": 19690, + "flags": 0, + "parent": { + "$ref": "1887" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1889", + "kind": 3, + "sv": "nextLink", + "pos": 19695, + "end": 19703, + "flags": 0, + "parent": { + "$ref": "1887" + }, + "_id": 566 + }, + "target": { + "$id": "1890", + "kind": 27, + "id": { + "$id": "1891", + "kind": 3, + "sv": "target", + "pos": 19704, + "end": 19710, + "flags": 0, + "parent": { + "$ref": "1890" + }, + "_id": 567 + }, + "type": { + "$id": "1892", + "kind": 45, + "target": { + "$id": "1893", + "kind": 3, + "sv": "ModelProperty", + "pos": 19712, + "end": 19725, + "flags": 1, + "parent": { + "$ref": "1892" + }, + "_id": 569 + }, + "arguments": [], + "pos": 19712, + "end": 19725, + "flags": 1, + "parent": { + "$ref": "1890" + }, + "_id": 568 + }, + "optional": false, + "rest": false, + "pos": 19704, + "end": 19725, + "flags": 0, + "parent": { + "$ref": "1887" + }, + "symbol": { + "declarations": [ + { + "$ref": "1890" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 346 + } + }, + "parameters": [], + "pos": 19258, + "end": 19727, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1894", + "kind": 51, + "content": [ + { + "$id": "1895", + "kind": 52, + "text": "Pagination property defining a link to the next page.\n\nIt is expected that navigating to the link will return the same set of responses as the operation that returned the current page.", + "pos": 19261, + "end": 19461, + "flags": 0, + "parent": { + "$ref": "1894" + } + } + ], + "tags": [ + { + "$id": "1896", + "kind": 58, + "tagName": { + "$id": "1897", + "kind": 3, + "sv": "example", + "pos": 19462, + "end": 19469, + "flags": 0, + "parent": { + "$ref": "1896" + } + }, + "content": [ + { + "$id": "1898", + "kind": 52, + "text": "```tsp\nmodel Page {\n @pageItems items: T[];\n @nextLink next: url;\n @prevLink prev: url;\n @firstLink first: url;\n @lastLink last: url;\n}\n@list op listPets(): Page;\n```", + "pos": 19469, + "end": 19681, + "flags": 0, + "parent": { + "$ref": "1896" + } + } + ], + "pos": 19461, + "end": 19681, + "flags": 0, + "parent": { + "$ref": "1894" + } + } + ], + "pos": 19258, + "end": 19683, + "flags": 0, + "parent": { + "$ref": "1887" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1887" + } + ], + "name": "@nextLink", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1899", + "kind": 25, + "modifiers": [ + { + "$id": "1900", + "kind": 40, + "pos": 20159, + "end": 20165, + "flags": 0, + "parent": { + "$ref": "1899" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1901", + "kind": 3, + "sv": "prevLink", + "pos": 20170, + "end": 20178, + "flags": 0, + "parent": { + "$ref": "1899" + }, + "_id": 570 + }, + "target": { + "$id": "1902", + "kind": 27, + "id": { + "$id": "1903", + "kind": 3, + "sv": "target", + "pos": 20179, + "end": 20185, + "flags": 0, + "parent": { + "$ref": "1902" + }, + "_id": 571 + }, + "type": { + "$id": "1904", + "kind": 45, + "target": { + "$id": "1905", + "kind": 3, + "sv": "ModelProperty", + "pos": 20187, + "end": 20200, + "flags": 1, + "parent": { + "$ref": "1904" + }, + "_id": 573 + }, + "arguments": [], + "pos": 20187, + "end": 20200, + "flags": 1, + "parent": { + "$ref": "1902" + }, + "_id": 572 + }, + "optional": false, + "rest": false, + "pos": 20179, + "end": 20200, + "flags": 0, + "parent": { + "$ref": "1899" + }, + "symbol": { + "declarations": [ + { + "$ref": "1902" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 348 + } + }, + "parameters": [], + "pos": 19729, + "end": 20202, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1906", + "kind": 51, + "content": [ + { + "$id": "1907", + "kind": 52, + "text": "Pagination property defining a link to the previous page.\n\nIt is expected that navigating to the link will return the same set of responses as the operation that returned the current page.", + "pos": 19732, + "end": 19936, + "flags": 0, + "parent": { + "$ref": "1906" + } + } + ], + "tags": [ + { + "$id": "1908", + "kind": 58, + "tagName": { + "$id": "1909", + "kind": 3, + "sv": "example", + "pos": 19937, + "end": 19944, + "flags": 0, + "parent": { + "$ref": "1908" + } + }, + "content": [ + { + "$id": "1910", + "kind": 52, + "text": "```tsp\nmodel Page {\n @pageItems items: T[];\n @nextLink next: url;\n @prevLink prev: url;\n @firstLink first: url;\n @lastLink last: url;\n}\n@list op listPets(): Page;\n```", + "pos": 19944, + "end": 20156, + "flags": 0, + "parent": { + "$ref": "1908" + } + } + ], + "pos": 19936, + "end": 20156, + "flags": 0, + "parent": { + "$ref": "1906" + } + } + ], + "pos": 19729, + "end": 20158, + "flags": 0, + "parent": { + "$ref": "1899" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1899" + } + ], + "name": "@prevLink", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1911", + "kind": 25, + "modifiers": [ + { + "$id": "1912", + "kind": 40, + "pos": 20631, + "end": 20637, + "flags": 0, + "parent": { + "$ref": "1911" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1913", + "kind": 3, + "sv": "firstLink", + "pos": 20642, + "end": 20651, + "flags": 0, + "parent": { + "$ref": "1911" + }, + "_id": 574 + }, + "target": { + "$id": "1914", + "kind": 27, + "id": { + "$id": "1915", + "kind": 3, + "sv": "target", + "pos": 20652, + "end": 20658, + "flags": 0, + "parent": { + "$ref": "1914" + }, + "_id": 575 + }, + "type": { + "$id": "1916", + "kind": 45, + "target": { + "$id": "1917", + "kind": 3, + "sv": "ModelProperty", + "pos": 20660, + "end": 20673, + "flags": 1, + "parent": { + "$ref": "1916" + }, + "_id": 577 + }, + "arguments": [], + "pos": 20660, + "end": 20673, + "flags": 1, + "parent": { + "$ref": "1914" + }, + "_id": 576 + }, + "optional": false, + "rest": false, + "pos": 20652, + "end": 20673, + "flags": 0, + "parent": { + "$ref": "1911" + }, + "symbol": { + "declarations": [ + { + "$ref": "1914" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 350 + } + }, + "parameters": [], + "pos": 20204, + "end": 20675, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1918", + "kind": 51, + "content": [ + { + "$id": "1919", + "kind": 52, + "text": "Pagination property defining a link to the first page.\n\nIt is expected that navigating to the link will return the same set of responses as the operation that returned the current page.", + "pos": 20207, + "end": 20408, + "flags": 0, + "parent": { + "$ref": "1918" + } + } + ], + "tags": [ + { + "$id": "1920", + "kind": 58, + "tagName": { + "$id": "1921", + "kind": 3, + "sv": "example", + "pos": 20409, + "end": 20416, + "flags": 0, + "parent": { + "$ref": "1920" + } + }, + "content": [ + { + "$id": "1922", + "kind": 52, + "text": "```tsp\nmodel Page {\n @pageItems items: T[];\n @nextLink next: url;\n @prevLink prev: url;\n @firstLink first: url;\n @lastLink last: url;\n}\n@list op listPets(): Page;\n```", + "pos": 20416, + "end": 20628, + "flags": 0, + "parent": { + "$ref": "1920" + } + } + ], + "pos": 20408, + "end": 20628, + "flags": 0, + "parent": { + "$ref": "1918" + } + } + ], + "pos": 20204, + "end": 20630, + "flags": 0, + "parent": { + "$ref": "1911" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1911" + } + ], + "name": "@firstLink", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1923", + "kind": 25, + "modifiers": [ + { + "$id": "1924", + "kind": 40, + "pos": 21103, + "end": 21109, + "flags": 0, + "parent": { + "$ref": "1923" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1925", + "kind": 3, + "sv": "lastLink", + "pos": 21114, + "end": 21122, + "flags": 0, + "parent": { + "$ref": "1923" + }, + "_id": 578 + }, + "target": { + "$id": "1926", + "kind": 27, + "id": { + "$id": "1927", + "kind": 3, + "sv": "target", + "pos": 21123, + "end": 21129, + "flags": 0, + "parent": { + "$ref": "1926" + }, + "_id": 579 + }, + "type": { + "$id": "1928", + "kind": 45, + "target": { + "$id": "1929", + "kind": 3, + "sv": "ModelProperty", + "pos": 21131, + "end": 21144, + "flags": 1, + "parent": { + "$ref": "1928" + }, + "_id": 581 + }, + "arguments": [], + "pos": 21131, + "end": 21144, + "flags": 1, + "parent": { + "$ref": "1926" + }, + "_id": 580 + }, + "optional": false, + "rest": false, + "pos": 21123, + "end": 21144, + "flags": 0, + "parent": { + "$ref": "1923" + }, + "symbol": { + "declarations": [ + { + "$ref": "1926" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 352 + } + }, + "parameters": [], + "pos": 20677, + "end": 21146, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1930", + "kind": 51, + "content": [ + { + "$id": "1931", + "kind": 52, + "text": "Pagination property defining a link to the last page.\n\nIt is expected that navigating to the link will return the same set of responses as the operation that returned the current page.", + "pos": 20680, + "end": 20880, + "flags": 0, + "parent": { + "$ref": "1930" + } + } + ], + "tags": [ + { + "$id": "1932", + "kind": 58, + "tagName": { + "$id": "1933", + "kind": 3, + "sv": "example", + "pos": 20881, + "end": 20888, + "flags": 0, + "parent": { + "$ref": "1932" + } + }, + "content": [ + { + "$id": "1934", + "kind": 52, + "text": "```tsp\nmodel Page {\n @pageItems items: T[];\n @nextLink next: url;\n @prevLink prev: url;\n @firstLink first: url;\n @lastLink last: url;\n}\n@list op listPets(): Page;\n```", + "pos": 20888, + "end": 21100, + "flags": 0, + "parent": { + "$ref": "1932" + } + } + ], + "pos": 20880, + "end": 21100, + "flags": 0, + "parent": { + "$ref": "1930" + } + } + ], + "pos": 20677, + "end": 21102, + "flags": 0, + "parent": { + "$ref": "1923" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1923" + } + ], + "name": "@lastLink", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1935", + "kind": 25, + "modifiers": [ + { + "$id": "1936", + "kind": 40, + "pos": 21409, + "end": 21415, + "flags": 0, + "parent": { + "$ref": "1935" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1937", + "kind": 3, + "sv": "inspectType", + "pos": 21420, + "end": 21431, + "flags": 0, + "parent": { + "$ref": "1935" + }, + "_id": 582 + }, + "target": { + "$id": "1938", + "kind": 27, + "id": { + "$id": "1939", + "kind": 3, + "sv": "target", + "pos": 21432, + "end": 21438, + "flags": 0, + "parent": { + "$ref": "1938" + }, + "_id": 583 + }, + "type": { + "$id": "1940", + "kind": 43, + "pos": 21440, + "end": 21447, + "flags": 0, + "parent": { + "$ref": "1938" + } + }, + "optional": false, + "rest": false, + "pos": 21432, + "end": 21447, + "flags": 0, + "parent": { + "$ref": "1935" + }, + "symbol": { + "declarations": [ + { + "$ref": "1938" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 354 + } + }, + "parameters": [ + { + "$id": "1941", + "kind": 27, + "id": { + "$id": "1942", + "kind": 3, + "sv": "text", + "pos": 21449, + "end": 21453, + "flags": 0, + "parent": { + "$ref": "1941" + }, + "_id": 584 + }, + "type": { + "$id": "1943", + "kind": 44, + "target": { + "$id": "1944", + "kind": 45, + "target": { + "$id": "1945", + "kind": 3, + "sv": "string", + "pos": 21463, + "end": 21469, + "flags": 1, + "parent": { + "$ref": "1944" + }, + "_id": 586 + }, + "arguments": [], + "pos": 21463, + "end": 21469, + "flags": 1, + "parent": { + "$ref": "1943" + }, + "_id": 585 + }, + "pos": 21455, + "end": 21469, + "flags": 0, + "parent": { + "$ref": "1941" + } + }, + "optional": false, + "rest": false, + "pos": 21449, + "end": 21469, + "flags": 0, + "parent": { + "$ref": "1935" + }, + "symbol": { + "declarations": [ + { + "$ref": "1941" + } + ], + "name": "text", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 355 + } + } + ], + "pos": 21318, + "end": 21471, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1946", + "kind": 51, + "content": [ + { + "$id": "1947", + "kind": 52, + "text": "A debugging decorator used to inspect a type.", + "pos": 21321, + "end": 21374, + "flags": 0, + "parent": { + "$ref": "1946" + } + } + ], + "tags": [ + { + "$id": "1948", + "kind": 53, + "tagName": { + "$id": "1949", + "kind": 3, + "sv": "param", + "pos": 21375, + "end": 21380, + "flags": 0, + "parent": { + "$ref": "1948" + } + }, + "paramName": { + "$id": "1950", + "kind": 3, + "sv": "text", + "pos": 21381, + "end": 21385, + "flags": 0, + "parent": { + "$ref": "1948" + } + }, + "content": [ + { + "$id": "1951", + "kind": 52, + "text": "Custom text to log", + "pos": 21386, + "end": 21406, + "flags": 0, + "parent": { + "$ref": "1948" + } + } + ], + "pos": 21374, + "end": 21406, + "flags": 0, + "parent": { + "$ref": "1946" + } + } + ], + "pos": 21318, + "end": 21408, + "flags": 0, + "parent": { + "$ref": "1935" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1935" + } + ], + "name": "@inspectType", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "1952", + "kind": 25, + "modifiers": [ + { + "$id": "1953", + "kind": 40, + "pos": 21569, + "end": 21575, + "flags": 0, + "parent": { + "$ref": "1952" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "1954", + "kind": 3, + "sv": "inspectTypeName", + "pos": 21580, + "end": 21595, + "flags": 0, + "parent": { + "$ref": "1952" + }, + "_id": 587 + }, + "target": { + "$id": "1955", + "kind": 27, + "id": { + "$id": "1956", + "kind": 3, + "sv": "target", + "pos": 21596, + "end": 21602, + "flags": 0, + "parent": { + "$ref": "1955" + }, + "_id": 588 + }, + "type": { + "$id": "1957", + "kind": 43, + "pos": 21604, + "end": 21611, + "flags": 0, + "parent": { + "$ref": "1955" + } + }, + "optional": false, + "rest": false, + "pos": 21596, + "end": 21611, + "flags": 0, + "parent": { + "$ref": "1952" + }, + "symbol": { + "declarations": [ + { + "$ref": "1955" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 357 + } + }, + "parameters": [ + { + "$id": "1958", + "kind": 27, + "id": { + "$id": "1959", + "kind": 3, + "sv": "text", + "pos": 21613, + "end": 21617, + "flags": 0, + "parent": { + "$ref": "1958" + }, + "_id": 589 + }, + "type": { + "$id": "1960", + "kind": 44, + "target": { + "$id": "1961", + "kind": 45, + "target": { + "$id": "1962", + "kind": 3, + "sv": "string", + "pos": 21627, + "end": 21633, + "flags": 1, + "parent": { + "$ref": "1961" + }, + "_id": 591 + }, + "arguments": [], + "pos": 21627, + "end": 21633, + "flags": 1, + "parent": { + "$ref": "1960" + }, + "_id": 590 + }, + "pos": 21619, + "end": 21633, + "flags": 0, + "parent": { + "$ref": "1958" + } + }, + "optional": false, + "rest": false, + "pos": 21613, + "end": 21633, + "flags": 0, + "parent": { + "$ref": "1952" + }, + "symbol": { + "declarations": [ + { + "$ref": "1958" + } + ], + "name": "text", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 358 + } + } + ], + "pos": 21473, + "end": 21635, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1963", + "kind": 51, + "content": [ + { + "$id": "1964", + "kind": 52, + "text": "A debugging decorator used to inspect a type name.", + "pos": 21476, + "end": 21534, + "flags": 0, + "parent": { + "$ref": "1963" + } + } + ], + "tags": [ + { + "$id": "1965", + "kind": 53, + "tagName": { + "$id": "1966", + "kind": 3, + "sv": "param", + "pos": 21535, + "end": 21540, + "flags": 0, + "parent": { + "$ref": "1965" + } + }, + "paramName": { + "$id": "1967", + "kind": 3, + "sv": "text", + "pos": 21541, + "end": 21545, + "flags": 0, + "parent": { + "$ref": "1965" + } + }, + "content": [ + { + "$id": "1968", + "kind": 52, + "text": "Custom text to log", + "pos": 21546, + "end": 21566, + "flags": 0, + "parent": { + "$ref": "1965" + } + } + ], + "pos": 21534, + "end": 21566, + "flags": 0, + "parent": { + "$ref": "1963" + } + } + ], + "pos": 21473, + "end": 21568, + "flags": 0, + "parent": { + "$ref": "1952" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "1952" + } + ], + "name": "@inspectTypeName", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "file": { + "text": "import \"../../dist/src/lib/tsp-index.js\";\n\nusing TypeSpec.Reflection;\n\nnamespace TypeSpec;\n\n/**\n * Typically a short, single-line description.\n * @param summary Summary string.\n *\n * @example\n * ```typespec\n * @summary(\"This is a pet\")\n * model Pet {}\n * ```\n */\nextern dec summary(target: unknown, summary: valueof string);\n\n/**\n * Attach a documentation string. Content support CommonMark markdown formatting.\n * @param doc Documentation string\n * @param formatArgs Record with key value pair that can be interpolated in the doc.\n *\n * @example\n * ```typespec\n * @doc(\"Represent a Pet available in the PetStore\")\n * model Pet {}\n * ```\n */\nextern dec doc(target: unknown, doc: valueof string, formatArgs?: {});\n\n/**\n * Attach a documentation string to describe the successful return types of an operation.\n * If an operation returns a union of success and errors it only describes the success. See `@errorsDoc` for error documentation.\n * @param doc Documentation string\n *\n * @example\n * ```typespec\n * @returnsDoc(\"Returns doc\")\n * op get(): Pet | NotFound;\n * ```\n */\nextern dec returnsDoc(target: Operation, doc: valueof string);\n\n/**\n * Attach a documentation string to describe the error return types of an operation.\n * If an operation returns a union of success and errors it only describes the errors. See `@returnsDoc` for success documentation.\n * @param doc Documentation string\n *\n * @example\n * ```typespec\n * @errorsDoc(\"Errors doc\")\n * op get(): Pet | NotFound;\n * ```\n */\nextern dec errorsDoc(target: Operation, doc: valueof string);\n\n/**\n * Service options.\n */\nmodel ServiceOptions {\n /**\n * Title of the service.\n */\n title?: string;\n}\n\n/**\n * Mark this namespace as describing a service and configure service properties.\n * @param options Optional configuration for the service.\n *\n * @example\n * ```typespec\n * @service\n * namespace PetStore;\n * ```\n *\n * @example Setting service title\n * ```typespec\n * @service(#{title: \"Pet store\"})\n * namespace PetStore;\n * ```\n */\nextern dec service(target: Namespace, options?: valueof ServiceOptions);\n\n/**\n * Specify that this model is an error type. Operations return error types when the operation has failed.\n *\n * @example\n * ```typespec\n * @error\n * model PetStoreError {\n * code: string;\n * message: string;\n * }\n * ```\n */\nextern dec error(target: Model);\n\n/**\n * Applies a media type hint to a TypeSpec type. Emitters and libraries may choose to use this hint to determine how a\n * type should be serialized. For example, the `@typespec/http` library will use the media type hint of the response\n * body type as a default `Content-Type` if one is not explicitly specified in the operation.\n *\n * Media types (also known as MIME types) are defined by RFC 6838. The media type hint should be a valid media type\n * string as defined by the RFC, but the decorator does not enforce or validate this constraint.\n *\n * Notes: the applied media type is _only_ a hint. It may be overridden or not used at all. Media type hints are\n * inherited by subtypes. If a media type hint is applied to a model, it will be inherited by all other models that\n * `extend` it unless they delcare their own media type hint.\n *\n * @param mediaType The media type hint to apply to the target type.\n *\n * @example create a model that serializes as XML by default\n *\n * ```tsp\n * @mediaTypeHint(\"application/xml\")\n * model Example {\n * @visibility(Lifecycle.Read)\n * id: string;\n *\n * name: string;\n * }\n * ```\n */\nextern dec mediaTypeHint(target: Model | Scalar | Enum | Union, mediaType: valueof string);\n\n// Cannot apply this to the scalar itself. Needs to be applied here so that we don't crash nostdlib scenarios\n@@mediaTypeHint(TypeSpec.bytes, \"application/octet-stream\");\n\n// @@mediaTypeHint(TypeSpec.string \"text/plain\") -- This is hardcoded in the compiler to avoid circularity\n// between the initialization of the string scalar and the `valueof string` required to call the\n// `mediaTypeHint` decorator.\n\n/**\n * Specify a known data format hint for this string type. For example `uuid`, `uri`, etc.\n * This differs from the `@pattern` decorator which is meant to specify a regular expression while `@format` accepts a known format name.\n * The format names are open ended and are left to emitter to interpret.\n *\n * @param format format name.\n *\n * @example\n * ```typespec\n * @format(\"uuid\")\n * scalar uuid extends string;\n * ```\n */\nextern dec format(target: string | ModelProperty, format: valueof string);\n\n/**\n * Specify the the pattern this string should respect using simple regular expression syntax.\n * The following syntax is allowed: alternations (`|`), quantifiers (`?`, `*`, `+`, and `{ }`), wildcard (`.`), and grouping parentheses.\n * Advanced features like look-around, capture groups, and references are not supported.\n *\n * This decorator may optionally provide a custom validation _message_. Emitters may choose to use the message to provide\n * context when pattern validation fails. For the sake of consistency, the message should be a phrase that describes in\n * plain language what sort of content the pattern attempts to validate. For example, a complex regular expression that\n * validates a GUID string might have a message like \"Must be a valid GUID.\"\n *\n * @param pattern Regular expression.\n * @param validationMessage Optional validation message that may provide context when validation fails.\n *\n * @example\n * ```typespec\n * @pattern(\"[a-z]+\", \"Must be a string consisting of only lower case letters and of at least one character.\")\n * scalar LowerAlpha extends string;\n * ```\n */\nextern dec pattern(\n target: string | bytes | ModelProperty,\n pattern: valueof string,\n validationMessage?: valueof string\n);\n\n/**\n * Specify the minimum length this string type should be.\n * @param value Minimum length\n *\n * @example\n * ```typespec\n * @minLength(2)\n * scalar Username extends string;\n * ```\n */\nextern dec minLength(target: string | ModelProperty, value: valueof integer);\n\n/**\n * Specify the maximum length this string type should be.\n * @param value Maximum length\n *\n * @example\n * ```typespec\n * @maxLength(20)\n * scalar Username extends string;\n * ```\n */\nextern dec maxLength(target: string | ModelProperty, value: valueof integer);\n\n/** Types that can have range limits */\nalias RangeLimitableTypes =\n | numeric\n | utcDateTime\n | offsetDateTime\n | plainDate\n | plainTime\n | duration;\n\n/**\n * Specify the minimum number of items this array should have.\n * @param value Minimum number\n *\n * @example\n * ```typespec\n * @minItems(1)\n * model Endpoints is string[];\n * ```\n */\nextern dec minItems(target: unknown[] | ModelProperty, value: valueof integer);\n\n/**\n * Specify the maximum number of items this array should have.\n * @param value Maximum number\n *\n * @example\n * ```typespec\n * @maxItems(5)\n * model Endpoints is string[];\n * ```\n */\nextern dec maxItems(target: unknown[] | ModelProperty, value: valueof integer);\n\n/**\n * Specify the minimum value this numeric type should be.\n * @param value Minimum value\n *\n * @example\n * ```typespec\n * @minValue(18)\n * scalar Age is int32;\n * ```\n */\nextern dec minValue(\n target: RangeLimitableTypes | ModelProperty,\n value: valueof RangeLimitableTypes\n);\n\n/**\n * Specify the maximum value this numeric type should be.\n * @param value Maximum value\n *\n * @example\n * ```typespec\n * @maxValue(200)\n * scalar Age is int32;\n * ```\n */\nextern dec maxValue(\n target: RangeLimitableTypes | ModelProperty,\n value: valueof RangeLimitableTypes\n);\n\n/**\n * Specify the minimum value this numeric type should be, exclusive of the given\n * value.\n * @param value Minimum value\n *\n * @example\n * ```typespec\n * @minValueExclusive(0)\n * scalar distance is float64;\n * ```\n */\nextern dec minValueExclusive(\n target: RangeLimitableTypes | ModelProperty,\n value: valueof RangeLimitableTypes\n);\n\n/**\n * Specify the maximum value this numeric type should be, exclusive of the given\n * value.\n * @param value Maximum value\n *\n * @example\n * ```typespec\n * @maxValueExclusive(50)\n * scalar distance is float64;\n * ```\n */\nextern dec maxValueExclusive(\n target: RangeLimitableTypes | ModelProperty,\n value: valueof RangeLimitableTypes\n);\n\n/**\n * Mark this value as a secret value that should be treated carefully to avoid exposure\n *\n * @example\n * ```typespec\n * @secret\n * scalar Password is string;\n * ```\n */\nextern dec secret(target: Scalar | ModelProperty | Model | Union | Enum);\n\n/**\n * Attaches a tag to an operation, interface, or namespace. Multiple `@tag` decorators can be specified to attach multiple tags to a TypeSpec element.\n * @param tag Tag value\n */\nextern dec tag(target: Namespace | Interface | Operation, tag: valueof string);\n\n/**\n * Specifies how a templated type should name their instances.\n * @param name name the template instance should take\n * @param formatArgs Model with key value used to interpolate the name\n *\n * @example\n * ```typespec\n * @friendlyName(\"{name}List\", T)\n * model List {\n * value: Item[];\n * nextLink: string;\n * }\n * ```\n */\nextern dec friendlyName(target: unknown, name: valueof string, formatArgs?: unknown);\n\n/**\n * Mark a model property as the key to identify instances of that type\n * @param altName Name of the property. If not specified, the decorated property name is used.\n *\n * @example\n * ```typespec\n * model Pet {\n * @key id: string;\n * }\n * ```\n */\nextern dec key(target: ModelProperty, altName?: valueof string);\n\n/**\n * Specify this operation is an overload of the given operation.\n * @param overloadbase Base operation that should be a union of all overloads\n *\n * @example\n * ```typespec\n * op upload(data: string | bytes, @header contentType: \"text/plain\" | \"application/octet-stream\"): void;\n * @overload(upload)\n * op uploadString(data: string, @header contentType: \"text/plain\" ): void;\n * @overload(upload)\n * op uploadBytes(data: bytes, @header contentType: \"application/octet-stream\"): void;\n * ```\n */\nextern dec overload(target: Operation, overloadbase: Operation);\n\n/**\n * Provide an alternative name for this type when serialized to the given mime type.\n * @param mimeType Mime type this should apply to. The mime type should be a known mime type as described here https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types without any suffix (e.g. `+json`)\n * @param name Alternative name\n *\n * @example\n *\n * ```typespec\n * model Certificate {\n * @encodedName(\"application/json\", \"exp\")\n * @encodedName(\"application/xml\", \"expiry\")\n * expireAt: int32;\n * }\n * ```\n *\n * @example Invalid values\n *\n * ```typespec\n * @encodedName(\"application/merge-patch+json\", \"exp\")\n * ^ error cannot use subtype\n * ```\n */\nextern dec encodedName(target: unknown, mimeType: valueof string, name: valueof string);\n\n/**\n * Options for `@discriminated` decorator.\n */\nmodel DiscriminatedOptions {\n /**\n * How is the discriminated union serialized.\n * @default object\n */\n envelope?: \"object\" | \"none\";\n\n /** Name of the discriminator property */\n discriminatorPropertyName?: string;\n\n /** Name of the property envelopping the data */\n envelopePropertyName?: string;\n}\n\n/**\n * Specify that this union is discriminated.\n * @param options Options to configure the serialization of the discriminated union.\n *\n * @example\n *\n * ```typespec\n * @discriminated\n * union Pet{ cat: Cat, dog: Dog }\n *\n * model Cat { name: string, meow: boolean }\n * model Dog { name: string, bark: boolean }\n * ```\n * Serialized as:\n * ```json\n * {\n * \"kind\": \"cat\",\n * \"value\": {\n * \"name\": \"Whiskers\",\n * \"meow\": true\n * }\n * },\n * {\n * \"kind\": \"dog\",\n * \"value\": {\n * \"name\": \"Rex\",\n * \"bark\": false\n * }\n * }\n * ```\n *\n * @example Custom property names\n *\n * ```typespec\n * @discriminated(#{discriminatorPropertyName: \"dataKind\", envelopePropertyName: \"data\"})\n * union Pet{ cat: Cat, dog: Dog }\n *\n * model Cat { name: string, meow: boolean }\n * model Dog { name: string, bark: boolean }\n * ```\n * Serialized as:\n * ```json\n * {\n * \"dataKind\": \"cat\",\n * \"data\": {\n * \"name\": \"Whiskers\",\n * \"meow\": true\n * }\n * },\n * {\n * \"dataKind\": \"dog\",\n * \"data\": {\n * \"name\": \"Rex\",\n * \"bark\": false\n * }\n * }\n * ```\n */\nextern dec discriminated(target: Union, options?: valueof DiscriminatedOptions);\n\n/**\n * Specify the property to be used to discriminate this type.\n * @param propertyName The property name to use for discrimination\n *\n * @example\n *\n * ```typespec\n * @discriminator(\"kind\")\n * model Pet{ kind: string }\n *\n * model Cat extends Pet {kind: \"cat\", meow: boolean}\n * model Dog extends Pet {kind: \"dog\", bark: boolean}\n * ```\n */\nextern dec discriminator(target: Model, propertyName: valueof string);\n\n/**\n * Known encoding to use on utcDateTime or offsetDateTime\n */\nenum DateTimeKnownEncoding {\n /**\n * RFC 3339 standard. https://www.ietf.org/rfc/rfc3339.txt\n * Encode to string.\n */\n rfc3339: \"rfc3339\",\n\n /**\n * RFC 7231 standard. https://www.ietf.org/rfc/rfc7231.txt\n * Encode to string.\n */\n rfc7231: \"rfc7231\",\n\n /**\n * Encode a datetime to a unix timestamp.\n * Unix timestamps are represented as an integer number of seconds since the Unix epoch and usually encoded as an int32.\n */\n unixTimestamp: \"unixTimestamp\",\n}\n\n/**\n * Known encoding to use on duration\n */\nenum DurationKnownEncoding {\n /**\n * ISO8601 duration\n */\n ISO8601: \"ISO8601\",\n\n /**\n * Encode to integer or float as seconds\n */\n seconds: \"seconds\",\n\n /**\n * Encode to integer or float as milliseconds\n */\n milliseconds: \"milliseconds\",\n}\n\n/**\n * Known encoding to use on bytes\n */\nenum BytesKnownEncoding {\n /**\n * Encode to Base64\n */\n base64: \"base64\",\n\n /**\n * Encode to Base64 Url\n */\n base64url: \"base64url\",\n}\n\n/**\n * Encoding for serializing arrays\n */\nenum ArrayEncoding {\n /**\n * Each value of the array is separated by a pipe character (|).\n * Values can only contain | if the underlying protocol supports encoding them.\n * - json -> error\n * - http -> %7C\n */\n pipeDelimited,\n\n /**\n * Each value of the array is separated by a space character.\n * Values can only contain spaces if the underlying protocol supports encoding them.\n * - json -> error\n * - http -> %20\n */\n spaceDelimited,\n\n /**\n * Each value of the array is separated by a comma (,).\n * Values can only contain commas if the underlying protocol supports encoding them.\n * - json -> error\n * - http -> %2C\n */\n commaDelimited,\n\n /**\n * Each value of the array is separated by a newline character (\\n).\n * Values can only contain newlines if the underlying protocol supports encoding them.\n * - json -> error\n * - http -> %0A\n */\n newlineDelimited,\n}\n\n/**\n * Specify how to encode the target type.\n * @param encodingOrEncodeAs Known name of an encoding or a scalar type to encode as(Only for numeric types to encode as string).\n * @param encodedAs What target type is this being encoded as. Default to string.\n *\n * @example offsetDateTime encoded with rfc7231\n *\n * ```tsp\n * @encode(\"rfc7231\")\n * scalar myDateTime extends offsetDateTime;\n * ```\n *\n * @example utcDateTime encoded with unixTimestamp\n *\n * ```tsp\n * @encode(\"unixTimestamp\", int32)\n * scalar myDateTime extends unixTimestamp;\n * ```\n *\n * @example encode numeric type to string\n *\n * ```tsp\n * model Pet {\n * @encode(string) id: int64;\n * }\n * ```\n */\nextern dec encode(\n target: Scalar | ModelProperty,\n encodingOrEncodeAs: (valueof string | EnumMember) | Scalar,\n encodedAs?: Scalar\n);\n\n/** Options for example decorators */\nmodel ExampleOptions {\n /** The title of the example */\n title?: string;\n\n /** Description of the example */\n description?: string;\n}\n\n/**\n * Provide an example value for a data type.\n *\n * @param example Example value.\n * @param options Optional metadata for the example.\n *\n * @example\n *\n * ```tsp\n * @example(#{name: \"Fluffy\", age: 2})\n * model Pet {\n * name: string;\n * age: int32;\n * }\n * ```\n */\nextern dec example(\n target: Model | Enum | Scalar | Union | ModelProperty | UnionVariant,\n example: valueof unknown,\n options?: valueof ExampleOptions\n);\n\n/**\n * Operation example configuration.\n */\nmodel OperationExample {\n /** Example request body. */\n parameters?: unknown;\n\n /** Example response body. */\n returnType?: unknown;\n}\n\n/**\n * Provide example values for an operation's parameters and corresponding return type.\n *\n * @param example Example value.\n * @param options Optional metadata for the example.\n *\n * @example\n *\n * ```tsp\n * @opExample(#{parameters: #{name: \"Fluffy\", age: 2}, returnType: #{name: \"Fluffy\", age: 2, id: \"abc\"})\n * op createPet(pet: Pet): Pet;\n * ```\n */\nextern dec opExample(\n target: Operation,\n example: valueof OperationExample,\n options?: valueof ExampleOptions\n);\n\n/**\n * Returns the model with required properties removed.\n */\nextern dec withOptionalProperties(target: Model);\n\n/**\n * Returns the model with any default values removed.\n */\nextern dec withoutDefaultValues(target: Model);\n\n/**\n * Returns the model with the given properties omitted.\n * @param omit List of properties to omit\n */\nextern dec withoutOmittedProperties(target: Model, omit: string | Union);\n\n/**\n * Returns the model with only the given properties included.\n * @param pick List of properties to include\n */\nextern dec withPickedProperties(target: Model, pick: string | Union);\n\n//---------------------------------------------------------------------------\n// Paging\n//---------------------------------------------------------------------------\n\n/**\n * Mark this operation as a `list` operation that returns a paginated list of items.\n */\nextern dec list(target: Operation);\n\n/**\n * Pagination property defining the number of items to skip.\n * @example\n * ```tsp\n * model Page {\n * @pageItems items: T[];\n * }\n * @list op listPets(@offset skip: int32, @pageSize pageSize: int8): Page;\n * ```\n */\nextern dec offset(target: ModelProperty);\n\n/**\n * Pagination property defining the page index.\n *\n * @example\n * ```tsp\n * model Page {\n * @pageItems items: T[];\n * }\n * @list op listPets(@pageIndex page: int32, @pageSize pageSize: int8): Page;\n * ```\n */\nextern dec pageIndex(target: ModelProperty);\n\n/**\n * Specify the pagination parameter that controls the maximum number of items to include in a page.\n *\n * @example\n * ```tsp\n * model Page {\n * @pageItems items: T[];\n * }\n * @list op listPets(@pageIndex page: int32, @pageSize pageSize: int8): Page;\n * ```\n */\nextern dec pageSize(target: ModelProperty);\n\n/**\n * Specify the the property that contains the array of page items.\n *\n * @example\n * ```tsp\n * model Page {\n * @pageItems items: T[];\n * }\n * @list op listPets(@pageIndex page: int32, @pageSize pageSize: int8): Page;\n * ```\n */\nextern dec pageItems(target: ModelProperty);\n\n/**\n * Pagination property defining the token to get to the next page.\n * It MUST be specified both on the request parameter and the response.\n *\n * @example\n * ```tsp\n * model Page {\n * @pageItems items: T[];\n * @continuationToken continuationToken: string;\n * }\n * @list op listPets(@continuationToken continuationToken: string): Page;\n * ```\n */\nextern dec continuationToken(target: ModelProperty);\n\n/**\n * Pagination property defining a link to the next page.\n *\n * It is expected that navigating to the link will return the same set of responses as the operation that returned the current page.\n *\n * @example\n * ```tsp\n * model Page {\n * @pageItems items: T[];\n * @nextLink next: url;\n * @prevLink prev: url;\n * @firstLink first: url;\n * @lastLink last: url;\n * }\n * @list op listPets(): Page;\n * ```\n */\nextern dec nextLink(target: ModelProperty);\n\n/**\n * Pagination property defining a link to the previous page.\n *\n * It is expected that navigating to the link will return the same set of responses as the operation that returned the current page.\n *\n * @example\n * ```tsp\n * model Page {\n * @pageItems items: T[];\n * @nextLink next: url;\n * @prevLink prev: url;\n * @firstLink first: url;\n * @lastLink last: url;\n * }\n * @list op listPets(): Page;\n * ```\n */\nextern dec prevLink(target: ModelProperty);\n\n/**\n * Pagination property defining a link to the first page.\n *\n * It is expected that navigating to the link will return the same set of responses as the operation that returned the current page.\n *\n * @example\n * ```tsp\n * model Page {\n * @pageItems items: T[];\n * @nextLink next: url;\n * @prevLink prev: url;\n * @firstLink first: url;\n * @lastLink last: url;\n * }\n * @list op listPets(): Page;\n * ```\n */\nextern dec firstLink(target: ModelProperty);\n\n/**\n * Pagination property defining a link to the last page.\n *\n * It is expected that navigating to the link will return the same set of responses as the operation that returned the current page.\n *\n * @example\n * ```tsp\n * model Page {\n * @pageItems items: T[];\n * @nextLink next: url;\n * @prevLink prev: url;\n * @firstLink first: url;\n * @lastLink last: url;\n * }\n * @list op listPets(): Page;\n * ```\n */\nextern dec lastLink(target: ModelProperty);\n\n//---------------------------------------------------------------------------\n// Debugging\n//---------------------------------------------------------------------------\n\n/**\n * A debugging decorator used to inspect a type.\n * @param text Custom text to log\n */\nextern dec inspectType(target: unknown, text: valueof string);\n\n/**\n * A debugging decorator used to inspect a type name.\n * @param text Custom text to log\n */\nextern dec inspectTypeName(target: unknown, text: valueof string);\n", + "path": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/compiler/lib/std/decorators.tsp" + }, + "id": { + "$id": "1969", + "kind": 3, + "sv": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/compiler/lib/std/decorators.tsp", + "pos": 0, + "end": 0, + "flags": 8, + "parent": { + "$ref": "904" + } + }, + "namespaces": [ + { + "$ref": "902" + } + ], + "usings": [ + { + "$ref": "907" + } + ], + "locals": { + "duplicates": {} + }, + "inScopeNamespaces": [ + { + "$ref": "902" + } + ], + "parseDiagnostics": [], + "comments": [], + "printable": true, + "parseOptions": {}, + "pos": 0, + "end": 21635, + "flags": 0, + "symbol": { + "declarations": [], + "node": { + "$ref": "904" + }, + "name": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/compiler/lib/std/decorators.tsp", + "exports": { + "duplicates": {} + }, + "flags": 32768, + "metatypeMembers": { + "duplicates": {} + } + } + } + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 236 + } + }, + "parameters": [ + { + "$id": "1970", + "kind": 27, + "id": { + "$id": "1971", + "kind": 3, + "sv": "summary", + "pos": 299, + "end": 306, + "flags": 0, + "parent": { + "$ref": "1970" + }, + "_id": 256 + }, + "type": { + "$id": "1972", + "kind": 44, + "target": { + "$id": "1973", + "kind": 45, + "target": { + "$id": "1974", + "kind": 3, + "sv": "string", + "pos": 316, + "end": 322, + "flags": 1, + "parent": { + "$ref": "1973" + }, + "_id": 258 + }, + "arguments": [], + "pos": 316, + "end": 322, + "flags": 1, + "parent": { + "$ref": "1972" + }, + "_id": 257 + }, + "pos": 308, + "end": 322, + "flags": 0, + "parent": { + "$ref": "1970" + } + }, + "optional": false, + "rest": false, + "pos": 299, + "end": 322, + "flags": 0, + "parent": { + "$ref": "896" + }, + "symbol": { + "declarations": [ + { + "$ref": "1970" + } + ], + "name": "summary", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "902" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 237 + } + } + ], + "pos": 92, + "end": 324, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "1975", + "kind": 51, + "content": [ + { + "$id": "1976", + "kind": 52, + "text": "Typically a short, single-line description.", + "pos": 95, + "end": 146, + "flags": 0, + "parent": { + "$ref": "1975" + } + } + ], + "tags": [ + { + "$id": "1977", + "kind": 53, + "tagName": { + "$id": "1978", + "kind": 3, + "sv": "param", + "pos": 147, + "end": 152, + "flags": 0, + "parent": { + "$ref": "1977" + } + }, + "paramName": { + "$id": "1979", + "kind": 3, + "sv": "summary", + "pos": 153, + "end": 160, + "flags": 0, + "parent": { + "$ref": "1977" + } + }, + "content": [ + { + "$id": "1980", + "kind": 52, + "text": "Summary string.", + "pos": 161, + "end": 183, + "flags": 0, + "parent": { + "$ref": "1977" + } + } + ], + "pos": 146, + "end": 183, + "flags": 0, + "parent": { + "$ref": "1975" + } + }, + { + "$id": "1981", + "kind": 58, + "tagName": { + "$id": "1982", + "kind": 3, + "sv": "example", + "pos": 184, + "end": 191, + "flags": 0, + "parent": { + "$ref": "1981" + } + }, + "content": [ + { + "$id": "1983", + "kind": 52, + "text": "```typespec\n@summary(\"This is a pet\")\nmodel Pet {}\n```", + "pos": 191, + "end": 260, + "flags": 0, + "parent": { + "$ref": "1981" + } + } + ], + "pos": 183, + "end": 260, + "flags": 0, + "parent": { + "$ref": "1975" + } + } + ], + "pos": 92, + "end": 262, + "flags": 0, + "parent": { + "$ref": "896" + } + } + ], + "parent": { + "$ref": "904" + }, + "symbol": { + "declarations": [ + { + "$ref": "896" + } + ], + "name": "@summary", + "flags": 1049088, + "parent": { + "declarations": [ + { + "$ref": "902" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "target": { + "$id": "1984", + "kind": "FunctionParameter", + "node": { + "$ref": "899" + }, + "name": "target", + "optional": false, + "rest": false, + "type": { + "entityKind": "MixedParameterConstraint", + "node": { + "$ref": "901" + }, + "type": { + "$id": "1985", + "kind": "Intrinsic", + "name": "unknown", + "isFinished": true, + "entityKind": "Type" + } + }, + "mixed": true, + "isFinished": false, + "creating": true, + "entityKind": "Type" + }, + "parameters": [ + { + "$id": "1986", + "kind": "FunctionParameter", + "node": { + "$ref": "1970" + }, + "name": "summary", + "optional": false, + "rest": false, + "type": { + "entityKind": "MixedParameterConstraint", + "node": { + "$ref": "1972" + }, + "valueType": { + "$ref": "463" + } + }, + "mixed": true, + "isFinished": false, + "creating": true, + "entityKind": "Type" + } + ], + "isFinished": false, + "creating": true, + "entityKind": "Type" + }, + "node": { + "$ref": "33" + }, + "args": [ + { + "value": { + "entityKind": "Value", + "valueKind": "StringValue", + "value": "The name of the file, if any.", + "type": { + "$ref": "463" + }, + "scalar": { + "$ref": "463" + } + }, + "node": { + "$ref": "34" + }, + "jsValue": "The name of the file, if any." + } + ] + } + ], + "isFinished": true, + "entityKind": "Type", + "templateMapper": { + "partial": false, + "args": [ + { + "entityKind": "Indeterminate", + "type": { + "$id": "1987", + "kind": "String", + "value": "image/png", + "isFinished": true, + "entityKind": "Type" + } + }, + { + "$id": "1988", + "kind": "Scalar", + "name": "bytes", + "node": { + "$ref": "475" + }, + "constructors": {}, + "namespace": { + "$ref": "719" + }, + "decorators": [ + { + "args": [ + { + "value": { + "$ref": "723" + }, + "jsValue": "self" + }, + { + "value": { + "$id": "1989", + "kind": "String", + "value": "Represent a byte array", + "isFinished": true, + "entityKind": "Type" + }, + "jsValue": "Represent a byte array" + } + ] + }, + { + "definition": { + "$id": "1990", + "kind": "Decorator", + "name": "@mediaTypeHint", + "namespace": { + "$ref": "719" + }, + "node": { + "$ref": "1026" + }, + "target": { + "$id": "1991", + "kind": "FunctionParameter", + "node": { + "$ref": "1029" + }, + "name": "target", + "optional": false, + "rest": false, + "type": { + "entityKind": "MixedParameterConstraint", + "node": { + "$ref": "1031" + }, + "type": { + "$id": "1992", + "kind": "Union", + "node": { + "$ref": "1031" + }, + "options": [ + { + "$id": "1993", + "kind": "Model", + "name": "Model", + "node": { + "$id": "1994", + "kind": 13, + "id": { + "$id": "1995", + "kind": 3, + "sv": "Model", + "pos": 91, + "end": 96, + "flags": 0, + "parent": { + "$ref": "1994" + }, + "_id": 172 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": 97, + "end": 99 + }, + "pos": 85, + "end": 99, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$id": "1996", + "kind": 0, + "statements": [ + { + "$id": "1997", + "kind": 8, + "decorators": [], + "directives": [], + "id": { + "$id": "1998", + "kind": 3, + "sv": "TypeSpec", + "pos": 10, + "end": 18, + "flags": 0, + "parent": { + "$ref": "1997" + }, + "_id": 592 + }, + "statements": { + "$id": "1999", + "kind": 8, + "decorators": [], + "docs": [], + "id": { + "$id": "2000", + "kind": 3, + "sv": "Reflection", + "pos": 19, + "end": 29, + "flags": 0, + "parent": { + "$ref": "1999" + }, + "_id": 593 + }, + "locals": { + "duplicates": {} + }, + "directives": [], + "pos": 0, + "end": 30, + "flags": 0, + "parent": { + "$ref": "1997" + }, + "symbol": { + "declarations": [ + { + "$ref": "1999" + } + ], + "name": "Reflection", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "1997" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "locals": { + "duplicates": {} + }, + "pos": 0, + "end": 30, + "flags": 0, + "parent": { + "$ref": "1996" + }, + "symbol": { + "declarations": [ + { + "$ref": "1997" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2001", + "kind": 13, + "id": { + "$id": "2002", + "kind": 3, + "sv": "Enum", + "pos": 38, + "end": 42, + "flags": 0, + "parent": { + "$ref": "2001" + }, + "_id": 298 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": 43, + "end": 45 + }, + "pos": 32, + "end": 45, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "1996" + }, + "symbol": { + "declarations": [ + { + "$ref": "2001" + } + ], + "name": "Enum", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "1999" + } + ], + "name": "Reflection", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "1997" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 62 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2003", + "kind": 13, + "id": { + "$id": "2004", + "kind": 3, + "sv": "EnumMember", + "pos": 52, + "end": 62, + "flags": 0, + "parent": { + "$ref": "2003" + }, + "_id": 145 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": 63, + "end": 65 + }, + "pos": 46, + "end": 65, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "1996" + }, + "symbol": { + "declarations": [ + { + "$ref": "2003" + } + ], + "name": "EnumMember", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "1999" + } + ], + "name": "Reflection", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "1997" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 39 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2005", + "kind": 13, + "id": { + "$id": "2006", + "kind": 3, + "sv": "Interface", + "pos": 72, + "end": 81, + "flags": 0, + "parent": { + "$ref": "2005" + }, + "_id": 431 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": 82, + "end": 84 + }, + "pos": 66, + "end": 84, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "1996" + }, + "symbol": { + "declarations": [ + { + "$ref": "2005" + } + ], + "name": "Interface", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "1999" + } + ], + "name": "Reflection", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "1997" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 64 + }, + "locals": { + "duplicates": {} + } + }, + { + "$ref": "1994" + }, + { + "$id": "2007", + "kind": 13, + "id": { + "$id": "2008", + "kind": 3, + "sv": "ModelProperty", + "pos": 106, + "end": 119, + "flags": 0, + "parent": { + "$ref": "2007" + }, + "_id": 139 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": 120, + "end": 122 + }, + "pos": 100, + "end": 122, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "1996" + }, + "symbol": { + "declarations": [ + { + "$ref": "2007" + } + ], + "name": "ModelProperty", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "1999" + } + ], + "name": "Reflection", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "1997" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 38 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2009", + "kind": 13, + "id": { + "$id": "2010", + "kind": 3, + "sv": "Namespace", + "pos": 129, + "end": 138, + "flags": 0, + "parent": { + "$ref": "2009" + }, + "_id": 282 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": 139, + "end": 141 + }, + "pos": 123, + "end": 141, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "1996" + }, + "symbol": { + "declarations": [ + { + "$ref": "2009" + } + ], + "name": "Namespace", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "1999" + } + ], + "name": "Reflection", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "1997" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 61 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2011", + "kind": 13, + "id": { + "$id": "2012", + "kind": 3, + "sv": "Operation", + "pos": 148, + "end": 157, + "flags": 0, + "parent": { + "$ref": "2011" + }, + "_id": 263 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": 158, + "end": 160 + }, + "pos": 142, + "end": 160, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "1996" + }, + "symbol": { + "declarations": [ + { + "$ref": "2011" + } + ], + "name": "Operation", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "1999" + } + ], + "name": "Reflection", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "1997" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 59 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2013", + "kind": 13, + "id": { + "$id": "2014", + "kind": 3, + "sv": "Scalar", + "pos": 167, + "end": 173, + "flags": 0, + "parent": { + "$ref": "2013" + }, + "_id": 136 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": 174, + "end": 176 + }, + "pos": 161, + "end": 176, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "1996" + }, + "symbol": { + "declarations": [ + { + "$ref": "2013" + } + ], + "name": "Scalar", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "1999" + } + ], + "name": "Reflection", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "1997" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 37 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2015", + "kind": 13, + "id": { + "$id": "2016", + "kind": 3, + "sv": "Union", + "pos": 183, + "end": 188, + "flags": 0, + "parent": { + "$ref": "2015" + }, + "_id": 198 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": 189, + "end": 191 + }, + "pos": 177, + "end": 191, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "1996" + }, + "symbol": { + "declarations": [ + { + "$ref": "2015" + } + ], + "name": "Union", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "1999" + } + ], + "name": "Reflection", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "1997" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 49 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2017", + "kind": 13, + "id": { + "$id": "2018", + "kind": 3, + "sv": "UnionVariant", + "pos": 198, + "end": 210, + "flags": 0, + "parent": { + "$ref": "2017" + }, + "_id": 524 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": 211, + "end": 213 + }, + "pos": 192, + "end": 213, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "1996" + }, + "symbol": { + "declarations": [ + { + "$ref": "2017" + } + ], + "name": "UnionVariant", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "1999" + } + ], + "name": "Reflection", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "1997" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 71 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2019", + "kind": 13, + "id": { + "$id": "2020", + "kind": 3, + "sv": "StringTemplate", + "pos": 220, + "end": 234, + "flags": 0, + "parent": { + "$ref": "2019" + }, + "_id": 594 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [], + "bodyRange": { + "pos": 235, + "end": 237 + }, + "pos": 214, + "end": 237, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "1996" + }, + "symbol": { + "declarations": [ + { + "$ref": "2019" + } + ], + "name": "StringTemplate", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "1999" + } + ], + "name": "Reflection", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "1997" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 73 + }, + "locals": { + "duplicates": {} + } + } + ], + "file": { + "text": "namespace TypeSpec.Reflection;\n\nmodel Enum {}\nmodel EnumMember {}\nmodel Interface {}\nmodel Model {}\nmodel ModelProperty {}\nmodel Namespace {}\nmodel Operation {}\nmodel Scalar {}\nmodel Union {}\nmodel UnionVariant {}\nmodel StringTemplate {}\n", + "path": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/compiler/lib/std/reflection.tsp" + }, + "id": { + "$id": "2021", + "kind": 3, + "sv": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/compiler/lib/std/reflection.tsp", + "pos": 0, + "end": 0, + "flags": 8, + "parent": { + "$ref": "1996" + } + }, + "namespaces": [ + { + "$ref": "1997" + }, + { + "$ref": "1999" + } + ], + "usings": [], + "locals": { + "duplicates": {} + }, + "inScopeNamespaces": [ + { + "$ref": "1999" + }, + { + "$ref": "1997" + } + ], + "parseDiagnostics": [], + "comments": [], + "printable": true, + "parseOptions": {}, + "pos": 0, + "end": 237, + "flags": 0, + "symbol": { + "declarations": [], + "node": { + "$ref": "1996" + }, + "name": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/compiler/lib/std/reflection.tsp", + "exports": { + "duplicates": {} + }, + "flags": 32768, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "symbol": { + "declarations": [ + { + "$ref": "1994" + } + ], + "name": "Model", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "1999" + } + ], + "name": "Reflection", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "1997" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 44 + }, + "locals": { + "duplicates": {} + } + }, + "properties": {}, + "namespace": { + "$id": "2022", + "kind": "Namespace", + "name": "Reflection", + "namespace": { + "$ref": "719" + }, + "node": { + "$ref": "1999" + }, + "models": {}, + "scalars": {}, + "operations": {}, + "namespaces": {}, + "interfaces": {}, + "unions": {}, + "enums": {}, + "decoratorDeclarations": {}, + "functionDeclarations": {}, + "decorators": [], + "isFinished": true, + "entityKind": "Type" + }, + "decorators": [], + "sourceModels": [], + "derivedModels": [], + "isFinished": true, + "entityKind": "Type", + "symbol": { + "declarations": [], + "node": { + "$ref": "1994" + }, + "name": "Model", + "members": { + "duplicates": {} + }, + "flags": 4194306, + "metatypeMembers": { + "duplicates": {} + }, + "type": { + "$ref": "1993" + } + } + }, + { + "$id": "2023", + "kind": "Model", + "name": "Scalar", + "node": { + "$ref": "2013" + }, + "properties": {}, + "namespace": { + "$ref": "2022" + }, + "decorators": [], + "sourceModels": [], + "derivedModels": [], + "isFinished": true, + "entityKind": "Type", + "symbol": { + "declarations": [], + "node": { + "$ref": "2013" + }, + "name": "Scalar", + "members": { + "duplicates": {} + }, + "flags": 4194306, + "metatypeMembers": { + "duplicates": {} + }, + "type": { + "$ref": "2023" + } + } + }, + { + "$id": "2024", + "kind": "Model", + "name": "Enum", + "node": { + "$ref": "2001" + }, + "properties": {}, + "namespace": { + "$ref": "2022" + }, + "decorators": [], + "sourceModels": [], + "derivedModels": [], + "isFinished": true, + "entityKind": "Type", + "symbol": { + "declarations": [], + "node": { + "$ref": "2001" + }, + "name": "Enum", + "members": { + "duplicates": {} + }, + "flags": 4194306, + "metatypeMembers": { + "duplicates": {} + }, + "type": { + "$ref": "2024" + } + } + }, + { + "$id": "2025", + "kind": "Model", + "name": "Union", + "node": { + "$ref": "2015" + }, + "properties": {}, + "namespace": { + "$ref": "2022" + }, + "decorators": [], + "sourceModels": [], + "derivedModels": [], + "isFinished": true, + "entityKind": "Type", + "symbol": { + "declarations": [], + "node": { + "$ref": "2015" + }, + "name": "Union", + "members": { + "duplicates": {} + }, + "flags": 4194306, + "metatypeMembers": { + "duplicates": {} + }, + "type": { + "$ref": "2025" + } + } + } + ], + "decorators": [], + "variants": {}, + "expression": true, + "isFinished": true, + "entityKind": "Type" + } + }, + "mixed": true, + "isFinished": false, + "creating": true, + "entityKind": "Type" + }, + "parameters": [ + { + "$id": "2026", + "kind": "FunctionParameter", + "node": { + "$ref": "1040" + }, + "name": "mediaType", + "optional": false, + "rest": false, + "type": { + "entityKind": "MixedParameterConstraint", + "node": { + "$ref": "1042" + }, + "valueType": { + "$ref": "463" + } + }, + "mixed": true, + "isFinished": false, + "creating": true, + "entityKind": "Type" + } + ], + "isFinished": false, + "creating": true, + "entityKind": "Type" + }, + "node": { + "$ref": "1054" + }, + "args": [ + { + "value": { + "entityKind": "Value", + "valueKind": "StringValue", + "value": "application/octet-stream", + "type": { + "$ref": "463" + }, + "scalar": { + "$ref": "463" + } + }, + "node": { + "$ref": "1060" + }, + "jsValue": "application/octet-stream" + } + ] + } + ], + "derivedScalars": [], + "isFinished": true, + "entityKind": "Type" + } + ], + "source": { + "node": { + "$id": "2027", + "kind": 45, + "target": { + "$id": "2028", + "kind": 7, + "base": { + "$id": "2029", + "kind": 3, + "sv": "Http", + "pos": 646, + "end": 650, + "flags": 1, + "parent": { + "$ref": "2028" + }, + "_id": 900 + }, + "id": { + "$id": "2030", + "kind": 3, + "sv": "File", + "pos": 651, + "end": 655, + "flags": 1, + "parent": { + "$ref": "2028" + }, + "_id": 901 + }, + "selector": ".", + "pos": 646, + "end": 655, + "flags": 1, + "parent": { + "$ref": "2027" + }, + "_id": 899 + }, + "arguments": [ + { + "$id": "2031", + "kind": 61, + "argument": { + "$id": "2032", + "kind": 32, + "value": "image/png", + "pos": 656, + "end": 667, + "flags": 1, + "parent": { + "$ref": "2031" + } + }, + "pos": 656, + "end": 667, + "flags": 1, + "parent": { + "$ref": "2027" + } + } + ], + "pos": 646, + "end": 668, + "flags": 1, + "parent": { + "$id": "2033", + "kind": 15, + "id": { + "$id": "2034", + "kind": 3, + "sv": "file", + "pos": 640, + "end": 644, + "flags": 0, + "parent": { + "$ref": "2033" + }, + "_id": 892 + }, + "decorators": [ + { + "$id": "2035", + "kind": 5, + "arguments": [], + "target": { + "$id": "2036", + "kind": 3, + "sv": "bodyRoot", + "pos": 631, + "end": 639, + "flags": 1, + "parent": { + "$ref": "2035" + }, + "_id": 893 + }, + "pos": 630, + "end": 639, + "flags": 0, + "parent": { + "$ref": "2033" + } + } + ], + "value": { + "$ref": "2027" + }, + "optional": false, + "pos": 630, + "end": 668, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$id": "2037", + "kind": 14, + "properties": [ + { + "$ref": "2033" + } + ], + "bodyRange": { + "pos": 629, + "end": 669 + }, + "pos": 629, + "end": 669, + "flags": 0, + "parent": { + "$id": "2038", + "kind": 11, + "parameters": { + "$ref": "2037" + }, + "returnType": { + "$id": "2039", + "kind": 45, + "target": { + "$id": "2040", + "kind": 3, + "sv": "NoContentResponse", + "pos": 671, + "end": 688, + "flags": 1, + "parent": { + "$ref": "2039" + }, + "_id": 940 + }, + "arguments": [], + "pos": 671, + "end": 688, + "flags": 1, + "parent": { + "$ref": "2038" + }, + "_id": 939 + }, + "pos": 629, + "end": 688, + "flags": 0, + "parent": { + "$id": "2041", + "kind": 10, + "id": { + "$id": "2042", + "kind": 3, + "sv": "uploadFileSpecificContentType", + "pos": 600, + "end": 629, + "flags": 0, + "parent": { + "$ref": "2041" + }, + "_id": 858 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "signature": { + "$ref": "2038" + }, + "decorators": [ + { + "$id": "2043", + "kind": 5, + "arguments": [], + "target": { + "$id": "2044", + "kind": 3, + "sv": "scenario", + "pos": 312, + "end": 320, + "flags": 1, + "parent": { + "$ref": "2043" + }, + "_id": 859 + }, + "pos": 311, + "end": 320, + "flags": 0, + "parent": { + "$ref": "2041" + } + }, + { + "$id": "2045", + "kind": 5, + "arguments": [ + { + "$id": "2046", + "kind": 32, + "value": "Test File type as request body with specific content type.\nExpected request:\n- Content-Type header: image/png\n- Body: binary content matching packages/http-specs/assets/image.png", + "pos": 336, + "end": 542, + "flags": 0, + "parent": { + "$ref": "2045" + } + } + ], + "target": { + "$id": "2047", + "kind": 3, + "sv": "scenarioDoc", + "pos": 324, + "end": 335, + "flags": 1, + "parent": { + "$ref": "2045" + }, + "_id": 871 + }, + "pos": 323, + "end": 543, + "flags": 0, + "parent": { + "$ref": "2041" + } + }, + { + "$id": "2048", + "kind": 5, + "arguments": [], + "target": { + "$id": "2049", + "kind": 3, + "sv": "post", + "pos": 547, + "end": 551, + "flags": 1, + "parent": { + "$ref": "2048" + }, + "_id": 886 + }, + "pos": 546, + "end": 551, + "flags": 0, + "parent": { + "$ref": "2041" + } + }, + { + "$id": "2050", + "kind": 5, + "arguments": [ + { + "$id": "2051", + "kind": 32, + "value": "/request/specific-content-type", + "pos": 561, + "end": 593, + "flags": 0, + "parent": { + "$ref": "2050" + } + } + ], + "target": { + "$id": "2052", + "kind": 3, + "sv": "route", + "pos": 555, + "end": 560, + "flags": 1, + "parent": { + "$ref": "2050" + }, + "_id": 891 + }, + "pos": 554, + "end": 594, + "flags": 0, + "parent": { + "$ref": "2041" + } + } + ], + "pos": 311, + "end": 689, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$id": "2053", + "kind": 8, + "decorators": [ + { + "$id": "2054", + "kind": 5, + "arguments": [ + { + "$id": "2055", + "kind": 32, + "value": "/body", + "pos": 283, + "end": 290, + "flags": 0, + "parent": { + "$ref": "2054" + } + } + ], + "target": { + "$id": "2056", + "kind": 3, + "sv": "route", + "pos": 277, + "end": 282, + "flags": 1, + "parent": { + "$ref": "2054" + }, + "_id": 846 + }, + "pos": 276, + "end": 291, + "flags": 0, + "parent": { + "$ref": "2053" + } + } + ], + "docs": [ + { + "$id": "2057", + "kind": 51, + "content": [ + { + "$id": "2058", + "kind": 52, + "text": "Test File as request and response body with specific content type", + "pos": 202, + "end": 273, + "flags": 0, + "parent": { + "$ref": "2057" + } + } + ], + "tags": [], + "pos": 199, + "end": 275, + "flags": 0, + "parent": { + "$ref": "2053" + } + } + ], + "id": { + "$id": "2059", + "kind": 3, + "sv": "Body", + "pos": 302, + "end": 306, + "flags": 0, + "parent": { + "$ref": "2053" + }, + "_id": 845 + }, + "locals": { + "duplicates": {} + }, + "statements": [ + { + "$ref": "2041" + }, + { + "$id": "2060", + "kind": 10, + "id": { + "$id": "2061", + "kind": 3, + "sv": "uploadFileJsonContentType", + "pos": 948, + "end": 973, + "flags": 0, + "parent": { + "$ref": "2060" + }, + "_id": 956 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "signature": { + "$id": "2062", + "kind": 11, + "parameters": { + "$id": "2063", + "kind": 14, + "properties": [ + { + "$id": "2064", + "kind": 15, + "id": { + "$id": "2065", + "kind": 3, + "sv": "file", + "pos": 984, + "end": 988, + "flags": 0, + "parent": { + "$ref": "2064" + }, + "_id": 961 + }, + "decorators": [ + { + "$id": "2066", + "kind": 5, + "arguments": [], + "target": { + "$id": "2067", + "kind": 3, + "sv": "bodyRoot", + "pos": 975, + "end": 983, + "flags": 1, + "parent": { + "$ref": "2066" + }, + "_id": 962 + }, + "pos": 974, + "end": 983, + "flags": 0, + "parent": { + "$ref": "2064" + } + } + ], + "value": { + "$id": "2068", + "kind": 45, + "target": { + "$id": "2069", + "kind": 7, + "base": { + "$id": "2070", + "kind": 3, + "sv": "Http", + "pos": 990, + "end": 994, + "flags": 1, + "parent": { + "$ref": "2069" + }, + "_id": 965 + }, + "id": { + "$id": "2071", + "kind": 3, + "sv": "File", + "pos": 995, + "end": 999, + "flags": 1, + "parent": { + "$ref": "2069" + }, + "_id": 966 + }, + "selector": ".", + "pos": 990, + "end": 999, + "flags": 1, + "parent": { + "$ref": "2068" + }, + "_id": 964 + }, + "arguments": [ + { + "$id": "2072", + "kind": 61, + "argument": { + "$id": "2073", + "kind": 32, + "value": "application/json", + "pos": 1000, + "end": 1018, + "flags": 1, + "parent": { + "$ref": "2072" + } + }, + "pos": 1000, + "end": 1018, + "flags": 1, + "parent": { + "$ref": "2068" + } + } + ], + "pos": 990, + "end": 1019, + "flags": 1, + "parent": { + "$ref": "2064" + }, + "_id": 963 + }, + "optional": false, + "pos": 974, + "end": 1019, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "2063" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2064" + }, + "name": "file", + "flags": 65536, + "parent": { + "declarations": [], + "node": { + "$ref": "2063" + }, + "name": "-", + "members": { + "duplicates": {} + }, + "flags": 2, + "parent": { + "declarations": [ + { + "$ref": "2060" + } + ], + "name": "uploadFileJsonContentType", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$id": "2074", + "kind": 8, + "decorators": [ + { + "$id": "2075", + "kind": 5, + "arguments": [ + { + "$id": "2076", + "kind": 32, + "value": "Test for File type usage in request and response bodies", + "pos": 87, + "end": 144, + "flags": 0, + "parent": { + "$ref": "2075" + } + } + ], + "target": { + "$id": "2077", + "kind": 3, + "sv": "doc", + "pos": 83, + "end": 86, + "flags": 1, + "parent": { + "$ref": "2075" + }, + "_id": 829 + }, + "pos": 82, + "end": 145, + "flags": 0, + "parent": { + "$ref": "2074" + } + }, + { + "$id": "2078", + "kind": 5, + "arguments": [ + { + "$id": "2079", + "kind": 32, + "value": "/type/file", + "pos": 163, + "end": 175, + "flags": 0, + "parent": { + "$ref": "2078" + } + } + ], + "target": { + "$id": "2080", + "kind": 3, + "sv": "scenarioService", + "pos": 147, + "end": 162, + "flags": 1, + "parent": { + "$ref": "2078" + }, + "_id": 830 + }, + "pos": 146, + "end": 176, + "flags": 0, + "parent": { + "$ref": "2074" + } + } + ], + "docs": [], + "id": { + "$id": "2081", + "kind": 3, + "sv": "File", + "pos": 192, + "end": 196, + "flags": 0, + "parent": { + "$ref": "2074" + }, + "_id": 828 + }, + "locals": { + "duplicates": {} + }, + "directives": [], + "pos": 82, + "end": 197, + "flags": 0, + "parent": { + "$id": "2082", + "kind": 8, + "decorators": [], + "directives": [], + "id": { + "$id": "2083", + "kind": 3, + "sv": "Type", + "pos": 187, + "end": 191, + "flags": 0, + "parent": { + "$ref": "2082" + }, + "_id": 827 + }, + "statements": { + "$ref": "2074" + }, + "locals": { + "duplicates": {} + }, + "pos": 82, + "end": 197, + "flags": 0, + "parent": { + "$id": "2084", + "kind": 0, + "statements": [ + { + "$id": "2085", + "kind": 2, + "path": { + "$id": "2086", + "kind": 32, + "value": "@typespec/http", + "pos": 7, + "end": 23, + "flags": 0, + "parent": { + "$ref": "2085" + } + }, + "pos": 0, + "end": 24, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2084" + } + }, + { + "$id": "2087", + "kind": 2, + "path": { + "$id": "2088", + "kind": 32, + "value": "@typespec/spector", + "pos": 32, + "end": 51, + "flags": 0, + "parent": { + "$ref": "2087" + } + }, + "pos": 25, + "end": 52, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2084" + } + }, + { + "$id": "2089", + "kind": 9, + "name": { + "$id": "2090", + "kind": 3, + "sv": "Http", + "pos": 60, + "end": 64, + "flags": 1, + "parent": { + "$ref": "2089" + }, + "_id": 6 + }, + "pos": 54, + "end": 65, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2084" + } + }, + { + "$id": "2091", + "kind": 9, + "name": { + "$id": "2092", + "kind": 3, + "sv": "Spector", + "pos": 72, + "end": 79, + "flags": 1, + "parent": { + "$ref": "2091" + }, + "_id": 7 + }, + "pos": 66, + "end": 80, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2084" + } + }, + { + "$ref": "2082" + }, + { + "$ref": "2053" + } + ], + "file": { + "text": "import \"@typespec/http\";\nimport \"@typespec/spector\";\n\nusing Http;\nusing Spector;\n\n@doc(\"Test for File type usage in request and response bodies\")\n@scenarioService(\"/type/file\")\nnamespace Type.File;\n\n/**\n * Test File as request and response body with specific content type\n */\n@route(\"/body\")\nnamespace Body {\n @scenario\n @scenarioDoc(\"\"\"\n Test File type as request body with specific content type.\n Expected request:\n - Content-Type header: image/png\n - Body: binary content matching packages/http-specs/assets/image.png\n \"\"\")\n @post\n @route(\"/request/specific-content-type\")\n op uploadFileSpecificContentType(@bodyRoot file: Http.File<\"image/png\">): NoContentResponse;\n\n @scenario\n @scenarioDoc(\"\"\"\n Test File type as request body with JSON content type.\n Expected request:\n - Content-Type header: application/json\n - Body: JSON content with file data\n \"\"\")\n @post\n @route(\"/request/json-content-type\")\n op uploadFileJsonContentType(@bodyRoot file: Http.File<\"application/json\">): NoContentResponse;\n\n @scenario\n @scenarioDoc(\"\"\"\n Test File type as response body with JSON content type.\n Expected response:\n - Content-Type header: application/json\n - Body: JSON content with file data\n \"\"\")\n @get\n @route(\"/response/json-content-type\")\n op downloadFileJsonContentType(): Http.File<\"application/json\">;\n\n @scenario\n @scenarioDoc(\"\"\"\n Test File type as response body with specific content type.\n Expected response:\n - Content-Type header: image/png\n - Body: binary content matching packages/http-specs/assets/image.png\n \"\"\")\n @get\n @route(\"/response/specific-content-type\")\n op downloadFileSpecificContentType(): Http.File<\"image/png\">;\n\n @scenario\n @scenarioDoc(\"\"\"\n Test File type as request body with multiple allowed content types (image/png or image/jpeg).\n Client should send image/png.\n Expected request:\n - Content-Type header: image/png\n - Body: binary content matching packages/http-specs/assets/image.png\n \"\"\")\n @post\n @route(\"/request/multiple-content-types\")\n op uploadFileMultipleContentTypes(\n @bodyRoot file: Http.File<\"image/png\" | \"image/jpeg\">,\n ): NoContentResponse;\n\n @scenario\n @scenarioDoc(\"\"\"\n Test File type as response body with multiple allowed content types.\n Service will return image/png.\n Expected response:\n - Content-Type header: image/png\n - Body: binary content matching packages/http-specs/assets/image.png\n \"\"\")\n @get\n @route(\"/response/multiple-content-types\")\n op downloadFileMultipleContentTypes(): Http.File<\"image/png\" | \"image/jpeg\">;\n\n @scenario\n @scenarioDoc(\"\"\"\n Test File type as request body with unspecified content type.\n The File type accepts any content type. For testing, sender will use image/png.\n Expected request:\n - Content-Type header: image/png\n - Body: binary content matching packages/http-specs/assets/image.png\n \"\"\")\n @post\n @route(\"/request/default-content-type\")\n op uploadFileDefaultContentType(@bodyRoot file: Http.File): NoContentResponse;\n\n @scenario\n @scenarioDoc(\"\"\"\n Test File type as response body with unspecified content type.\n The File type accepts any content type. For testing, server will return image/png.\n Expected response:\n - Content-Type header: image/png\n - Body: binary content matching packages/http-specs/assets/image.png\n \"\"\")\n @get\n @route(\"/response/default-content-type\")\n op downloadFileDefaultContentType(): Http.File;\n}\n", + "path": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/http-specs/specs/type/file/main.tsp" + }, + "id": { + "$id": "2093", + "kind": 3, + "sv": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/http-specs/specs/type/file/main.tsp", + "pos": 0, + "end": 0, + "flags": 8, + "parent": { + "$ref": "2084" + } + }, + "namespaces": [ + { + "$ref": "2082" + }, + { + "$ref": "2074" + }, + { + "$ref": "2053" + } + ], + "usings": [ + { + "$ref": "2089" + }, + { + "$ref": "2091" + } + ], + "locals": { + "duplicates": {} + }, + "inScopeNamespaces": [ + { + "$ref": "2074" + }, + { + "$ref": "2082" + } + ], + "parseDiagnostics": [], + "comments": [], + "printable": true, + "parseOptions": {}, + "pos": 0, + "end": 3490, + "flags": 0, + "symbol": { + "declarations": [], + "node": { + "$ref": "2084" + }, + "name": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/http-specs/specs/type/file/main.tsp", + "exports": { + "duplicates": {} + }, + "flags": 32768, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "symbol": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + } + } + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 417 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 103 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 973, + "end": 1020 + }, + "pos": 973, + "end": 1020, + "flags": 0, + "parent": { + "$ref": "2062" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2063" + }, + "name": "-", + "members": { + "duplicates": {} + }, + "flags": 2, + "parent": { + "declarations": [ + { + "$ref": "2060" + } + ], + "name": "uploadFileJsonContentType", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 417 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 103 + } + }, + "returnType": { + "$id": "2094", + "kind": 45, + "target": { + "$id": "2095", + "kind": 3, + "sv": "NoContentResponse", + "pos": 1022, + "end": 1039, + "flags": 1, + "parent": { + "$ref": "2094" + }, + "_id": 968 + }, + "arguments": [], + "pos": 1022, + "end": 1039, + "flags": 1, + "parent": { + "$ref": "2062" + }, + "_id": 967 + }, + "pos": 973, + "end": 1039, + "flags": 0, + "parent": { + "$ref": "2060" + } + }, + "decorators": [ + { + "$id": "2096", + "kind": 5, + "arguments": [], + "target": { + "$id": "2097", + "kind": 3, + "sv": "scenario", + "pos": 694, + "end": 702, + "flags": 1, + "parent": { + "$ref": "2096" + }, + "_id": 957 + }, + "pos": 693, + "end": 702, + "flags": 0, + "parent": { + "$ref": "2060" + } + }, + { + "$id": "2098", + "kind": 5, + "arguments": [ + { + "$id": "2099", + "kind": 32, + "value": "Test File type as request body with JSON content type.\nExpected request:\n- Content-Type header: application/json\n- Body: JSON content with file data", + "pos": 718, + "end": 894, + "flags": 0, + "parent": { + "$ref": "2098" + } + } + ], + "target": { + "$id": "2100", + "kind": 3, + "sv": "scenarioDoc", + "pos": 706, + "end": 717, + "flags": 1, + "parent": { + "$ref": "2098" + }, + "_id": 958 + }, + "pos": 705, + "end": 895, + "flags": 0, + "parent": { + "$ref": "2060" + } + }, + { + "$id": "2101", + "kind": 5, + "arguments": [], + "target": { + "$id": "2102", + "kind": 3, + "sv": "post", + "pos": 899, + "end": 903, + "flags": 1, + "parent": { + "$ref": "2101" + }, + "_id": 959 + }, + "pos": 898, + "end": 903, + "flags": 0, + "parent": { + "$ref": "2060" + } + }, + { + "$id": "2103", + "kind": 5, + "arguments": [ + { + "$id": "2104", + "kind": 32, + "value": "/request/json-content-type", + "pos": 913, + "end": 941, + "flags": 0, + "parent": { + "$ref": "2103" + } + } + ], + "target": { + "$id": "2105", + "kind": 3, + "sv": "route", + "pos": 907, + "end": 912, + "flags": 1, + "parent": { + "$ref": "2103" + }, + "_id": 960 + }, + "pos": 906, + "end": 942, + "flags": 0, + "parent": { + "$ref": "2060" + } + } + ], + "pos": 693, + "end": 1040, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2053" + }, + "symbol": { + "declarations": [ + { + "$ref": "2060" + } + ], + "name": "uploadFileJsonContentType", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 417 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2106", + "kind": 10, + "id": { + "$id": "2107", + "kind": 3, + "sv": "downloadFileJsonContentType", + "pos": 1301, + "end": 1328, + "flags": 0, + "parent": { + "$ref": "2106" + }, + "_id": 969 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "signature": { + "$id": "2108", + "kind": 11, + "parameters": { + "$id": "2109", + "kind": 14, + "properties": [], + "bodyRange": { + "pos": 1328, + "end": 1330 + }, + "pos": 1328, + "end": 1330, + "flags": 0, + "parent": { + "$ref": "2108" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2109" + }, + "name": "-", + "members": { + "duplicates": {} + }, + "flags": 2, + "parent": { + "declarations": [ + { + "$ref": "2106" + } + ], + "name": "downloadFileJsonContentType", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 419 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 104 + } + }, + "returnType": { + "$id": "2110", + "kind": 45, + "target": { + "$id": "2111", + "kind": 7, + "base": { + "$id": "2112", + "kind": 3, + "sv": "Http", + "pos": 1332, + "end": 1336, + "flags": 1, + "parent": { + "$ref": "2111" + }, + "_id": 980 + }, + "id": { + "$id": "2113", + "kind": 3, + "sv": "File", + "pos": 1337, + "end": 1341, + "flags": 1, + "parent": { + "$ref": "2111" + }, + "_id": 981 + }, + "selector": ".", + "pos": 1332, + "end": 1341, + "flags": 1, + "parent": { + "$ref": "2110" + }, + "_id": 979 + }, + "arguments": [ + { + "$id": "2114", + "kind": 61, + "argument": { + "$id": "2115", + "kind": 32, + "value": "application/json", + "pos": 1342, + "end": 1360, + "flags": 1, + "parent": { + "$ref": "2114" + } + }, + "pos": 1342, + "end": 1360, + "flags": 1, + "parent": { + "$ref": "2110" + } + } + ], + "pos": 1332, + "end": 1361, + "flags": 1, + "parent": { + "$ref": "2108" + }, + "_id": 978 + }, + "pos": 1328, + "end": 1361, + "flags": 0, + "parent": { + "$ref": "2106" + } + }, + "decorators": [ + { + "$id": "2116", + "kind": 5, + "arguments": [], + "target": { + "$id": "2117", + "kind": 3, + "sv": "scenario", + "pos": 1045, + "end": 1053, + "flags": 1, + "parent": { + "$ref": "2116" + }, + "_id": 970 + }, + "pos": 1044, + "end": 1053, + "flags": 0, + "parent": { + "$ref": "2106" + } + }, + { + "$id": "2118", + "kind": 5, + "arguments": [ + { + "$id": "2119", + "kind": 32, + "value": "Test File type as response body with JSON content type.\nExpected response:\n- Content-Type header: application/json\n- Body: JSON content with file data", + "pos": 1069, + "end": 1247, + "flags": 0, + "parent": { + "$ref": "2118" + } + } + ], + "target": { + "$id": "2120", + "kind": 3, + "sv": "scenarioDoc", + "pos": 1057, + "end": 1068, + "flags": 1, + "parent": { + "$ref": "2118" + }, + "_id": 971 + }, + "pos": 1056, + "end": 1248, + "flags": 0, + "parent": { + "$ref": "2106" + } + }, + { + "$id": "2121", + "kind": 5, + "arguments": [], + "target": { + "$id": "2122", + "kind": 3, + "sv": "get", + "pos": 1252, + "end": 1255, + "flags": 1, + "parent": { + "$ref": "2121" + }, + "_id": 972 + }, + "pos": 1251, + "end": 1255, + "flags": 0, + "parent": { + "$ref": "2106" + } + }, + { + "$id": "2123", + "kind": 5, + "arguments": [ + { + "$id": "2124", + "kind": 32, + "value": "/response/json-content-type", + "pos": 1265, + "end": 1294, + "flags": 0, + "parent": { + "$ref": "2123" + } + } + ], + "target": { + "$id": "2125", + "kind": 3, + "sv": "route", + "pos": 1259, + "end": 1264, + "flags": 1, + "parent": { + "$ref": "2123" + }, + "_id": 977 + }, + "pos": 1258, + "end": 1295, + "flags": 0, + "parent": { + "$ref": "2106" + } + } + ], + "pos": 1044, + "end": 1362, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2053" + }, + "symbol": { + "declarations": [ + { + "$ref": "2106" + } + ], + "name": "downloadFileJsonContentType", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 419 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2126", + "kind": 10, + "id": { + "$id": "2127", + "kind": 3, + "sv": "downloadFileSpecificContentType", + "pos": 1657, + "end": 1688, + "flags": 0, + "parent": { + "$ref": "2126" + }, + "_id": 982 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "signature": { + "$id": "2128", + "kind": 11, + "parameters": { + "$id": "2129", + "kind": 14, + "properties": [], + "bodyRange": { + "pos": 1688, + "end": 1690 + }, + "pos": 1688, + "end": 1690, + "flags": 0, + "parent": { + "$ref": "2128" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2129" + }, + "name": "-", + "members": { + "duplicates": {} + }, + "flags": 2, + "parent": { + "declarations": [ + { + "$ref": "2126" + } + ], + "name": "downloadFileSpecificContentType", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 422 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 105 + } + }, + "returnType": { + "$id": "2130", + "kind": 45, + "target": { + "$id": "2131", + "kind": 7, + "base": { + "$id": "2132", + "kind": 3, + "sv": "Http", + "pos": 1692, + "end": 1696, + "flags": 1, + "parent": { + "$ref": "2131" + }, + "_id": 989 + }, + "id": { + "$id": "2133", + "kind": 3, + "sv": "File", + "pos": 1697, + "end": 1701, + "flags": 1, + "parent": { + "$ref": "2131" + }, + "_id": 990 + }, + "selector": ".", + "pos": 1692, + "end": 1701, + "flags": 1, + "parent": { + "$ref": "2130" + }, + "_id": 988 + }, + "arguments": [ + { + "$id": "2134", + "kind": 61, + "argument": { + "$id": "2135", + "kind": 32, + "value": "image/png", + "pos": 1702, + "end": 1713, + "flags": 1, + "parent": { + "$ref": "2134" + } + }, + "pos": 1702, + "end": 1713, + "flags": 1, + "parent": { + "$ref": "2130" + } + } + ], + "pos": 1692, + "end": 1714, + "flags": 1, + "parent": { + "$ref": "2128" + }, + "_id": 987 + }, + "pos": 1688, + "end": 1714, + "flags": 0, + "parent": { + "$ref": "2126" + } + }, + "decorators": [ + { + "$id": "2136", + "kind": 5, + "arguments": [], + "target": { + "$id": "2137", + "kind": 3, + "sv": "scenario", + "pos": 1367, + "end": 1375, + "flags": 1, + "parent": { + "$ref": "2136" + }, + "_id": 983 + }, + "pos": 1366, + "end": 1375, + "flags": 0, + "parent": { + "$ref": "2126" + } + }, + { + "$id": "2138", + "kind": 5, + "arguments": [ + { + "$id": "2139", + "kind": 32, + "value": "Test File type as response body with specific content type.\nExpected response:\n- Content-Type header: image/png\n- Body: binary content matching packages/http-specs/assets/image.png", + "pos": 1391, + "end": 1599, + "flags": 0, + "parent": { + "$ref": "2138" + } + } + ], + "target": { + "$id": "2140", + "kind": 3, + "sv": "scenarioDoc", + "pos": 1379, + "end": 1390, + "flags": 1, + "parent": { + "$ref": "2138" + }, + "_id": 984 + }, + "pos": 1378, + "end": 1600, + "flags": 0, + "parent": { + "$ref": "2126" + } + }, + { + "$id": "2141", + "kind": 5, + "arguments": [], + "target": { + "$id": "2142", + "kind": 3, + "sv": "get", + "pos": 1604, + "end": 1607, + "flags": 1, + "parent": { + "$ref": "2141" + }, + "_id": 985 + }, + "pos": 1603, + "end": 1607, + "flags": 0, + "parent": { + "$ref": "2126" + } + }, + { + "$id": "2143", + "kind": 5, + "arguments": [ + { + "$id": "2144", + "kind": 32, + "value": "/response/specific-content-type", + "pos": 1617, + "end": 1650, + "flags": 0, + "parent": { + "$ref": "2143" + } + } + ], + "target": { + "$id": "2145", + "kind": 3, + "sv": "route", + "pos": 1611, + "end": 1616, + "flags": 1, + "parent": { + "$ref": "2143" + }, + "_id": 986 + }, + "pos": 1610, + "end": 1651, + "flags": 0, + "parent": { + "$ref": "2126" + } + } + ], + "pos": 1366, + "end": 1715, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2053" + }, + "symbol": { + "declarations": [ + { + "$ref": "2126" + } + ], + "name": "downloadFileSpecificContentType", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 422 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2146", + "kind": 10, + "id": { + "$id": "2147", + "kind": 3, + "sv": "uploadFileMultipleContentTypes", + "pos": 2078, + "end": 2108, + "flags": 0, + "parent": { + "$ref": "2146" + }, + "_id": 991 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "signature": { + "$id": "2148", + "kind": 11, + "parameters": { + "$id": "2149", + "kind": 14, + "properties": [ + { + "$id": "2150", + "kind": 15, + "id": { + "$id": "2151", + "kind": 3, + "sv": "file", + "pos": 2124, + "end": 2128, + "flags": 0, + "parent": { + "$ref": "2150" + }, + "_id": 996 + }, + "decorators": [ + { + "$id": "2152", + "kind": 5, + "arguments": [], + "target": { + "$id": "2153", + "kind": 3, + "sv": "bodyRoot", + "pos": 2115, + "end": 2123, + "flags": 1, + "parent": { + "$ref": "2152" + }, + "_id": 997 + }, + "pos": 2114, + "end": 2123, + "flags": 0, + "parent": { + "$ref": "2150" + } + } + ], + "value": { + "$id": "2154", + "kind": 45, + "target": { + "$id": "2155", + "kind": 7, + "base": { + "$id": "2156", + "kind": 3, + "sv": "Http", + "pos": 2130, + "end": 2134, + "flags": 1, + "parent": { + "$ref": "2155" + }, + "_id": 1000 + }, + "id": { + "$id": "2157", + "kind": 3, + "sv": "File", + "pos": 2135, + "end": 2139, + "flags": 1, + "parent": { + "$ref": "2155" + }, + "_id": 1001 + }, + "selector": ".", + "pos": 2130, + "end": 2139, + "flags": 1, + "parent": { + "$ref": "2154" + }, + "_id": 999 + }, + "arguments": [ + { + "$id": "2158", + "kind": 61, + "argument": { + "$id": "2159", + "kind": 28, + "options": [ + { + "$id": "2160", + "kind": 32, + "value": "image/png", + "pos": 2140, + "end": 2151, + "flags": 1, + "parent": { + "$ref": "2159" + } + }, + { + "$id": "2161", + "kind": 32, + "value": "image/jpeg", + "pos": 2154, + "end": 2166, + "flags": 1, + "parent": { + "$ref": "2159" + } + } + ], + "pos": 2140, + "end": 2166, + "flags": 1, + "parent": { + "$ref": "2158" + } + }, + "pos": 2140, + "end": 2166, + "flags": 1, + "parent": { + "$ref": "2154" + } + } + ], + "pos": 2130, + "end": 2167, + "flags": 1, + "parent": { + "$ref": "2150" + }, + "_id": 998 + }, + "optional": false, + "pos": 2114, + "end": 2167, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "2149" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2150" + }, + "name": "file", + "flags": 65536, + "parent": { + "declarations": [], + "node": { + "$ref": "2149" + }, + "name": "-", + "members": { + "duplicates": {} + }, + "flags": 2, + "parent": { + "declarations": [ + { + "$ref": "2146" + } + ], + "name": "uploadFileMultipleContentTypes", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 423 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 106 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 2108, + "end": 2172 + }, + "pos": 2108, + "end": 2172, + "flags": 0, + "parent": { + "$ref": "2148" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2149" + }, + "name": "-", + "members": { + "duplicates": {} + }, + "flags": 2, + "parent": { + "declarations": [ + { + "$ref": "2146" + } + ], + "name": "uploadFileMultipleContentTypes", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 423 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 106 + } + }, + "returnType": { + "$id": "2162", + "kind": 45, + "target": { + "$id": "2163", + "kind": 3, + "sv": "NoContentResponse", + "pos": 2174, + "end": 2191, + "flags": 1, + "parent": { + "$ref": "2162" + }, + "_id": 1003 + }, + "arguments": [], + "pos": 2174, + "end": 2191, + "flags": 1, + "parent": { + "$ref": "2148" + }, + "_id": 1002 + }, + "pos": 2108, + "end": 2191, + "flags": 0, + "parent": { + "$ref": "2146" + } + }, + "decorators": [ + { + "$id": "2164", + "kind": 5, + "arguments": [], + "target": { + "$id": "2165", + "kind": 3, + "sv": "scenario", + "pos": 1720, + "end": 1728, + "flags": 1, + "parent": { + "$ref": "2164" + }, + "_id": 992 + }, + "pos": 1719, + "end": 1728, + "flags": 0, + "parent": { + "$ref": "2146" + } + }, + { + "$id": "2166", + "kind": 5, + "arguments": [ + { + "$id": "2167", + "kind": 32, + "value": "Test File type as request body with multiple allowed content types (image/png or image/jpeg).\nClient should send image/png.\nExpected request:\n- Content-Type header: image/png\n- Body: binary content matching packages/http-specs/assets/image.png", + "pos": 1744, + "end": 2019, + "flags": 0, + "parent": { + "$ref": "2166" + } + } + ], + "target": { + "$id": "2168", + "kind": 3, + "sv": "scenarioDoc", + "pos": 1732, + "end": 1743, + "flags": 1, + "parent": { + "$ref": "2166" + }, + "_id": 993 + }, + "pos": 1731, + "end": 2020, + "flags": 0, + "parent": { + "$ref": "2146" + } + }, + { + "$id": "2169", + "kind": 5, + "arguments": [], + "target": { + "$id": "2170", + "kind": 3, + "sv": "post", + "pos": 2024, + "end": 2028, + "flags": 1, + "parent": { + "$ref": "2169" + }, + "_id": 994 + }, + "pos": 2023, + "end": 2028, + "flags": 0, + "parent": { + "$ref": "2146" + } + }, + { + "$id": "2171", + "kind": 5, + "arguments": [ + { + "$id": "2172", + "kind": 32, + "value": "/request/multiple-content-types", + "pos": 2038, + "end": 2071, + "flags": 0, + "parent": { + "$ref": "2171" + } + } + ], + "target": { + "$id": "2173", + "kind": 3, + "sv": "route", + "pos": 2032, + "end": 2037, + "flags": 1, + "parent": { + "$ref": "2171" + }, + "_id": 995 + }, + "pos": 2031, + "end": 2072, + "flags": 0, + "parent": { + "$ref": "2146" + } + } + ], + "pos": 1719, + "end": 2192, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2053" + }, + "symbol": { + "declarations": [ + { + "$ref": "2146" + } + ], + "name": "uploadFileMultipleContentTypes", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 423 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2174", + "kind": 10, + "id": { + "$id": "2175", + "kind": 3, + "sv": "downloadFileMultipleContentTypes", + "pos": 2532, + "end": 2564, + "flags": 0, + "parent": { + "$ref": "2174" + }, + "_id": 1004 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "signature": { + "$id": "2176", + "kind": 11, + "parameters": { + "$id": "2177", + "kind": 14, + "properties": [], + "bodyRange": { + "pos": 2564, + "end": 2566 + }, + "pos": 2564, + "end": 2566, + "flags": 0, + "parent": { + "$ref": "2176" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2177" + }, + "name": "-", + "members": { + "duplicates": {} + }, + "flags": 2, + "parent": { + "declarations": [ + { + "$ref": "2174" + } + ], + "name": "downloadFileMultipleContentTypes", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 425 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 107 + } + }, + "returnType": { + "$id": "2178", + "kind": 45, + "target": { + "$id": "2179", + "kind": 7, + "base": { + "$id": "2180", + "kind": 3, + "sv": "Http", + "pos": 2568, + "end": 2572, + "flags": 1, + "parent": { + "$ref": "2179" + }, + "_id": 1011 + }, + "id": { + "$id": "2181", + "kind": 3, + "sv": "File", + "pos": 2573, + "end": 2577, + "flags": 1, + "parent": { + "$ref": "2179" + }, + "_id": 1012 + }, + "selector": ".", + "pos": 2568, + "end": 2577, + "flags": 1, + "parent": { + "$ref": "2178" + }, + "_id": 1010 + }, + "arguments": [ + { + "$id": "2182", + "kind": 61, + "argument": { + "$id": "2183", + "kind": 28, + "options": [ + { + "$id": "2184", + "kind": 32, + "value": "image/png", + "pos": 2578, + "end": 2589, + "flags": 1, + "parent": { + "$ref": "2183" + } + }, + { + "$id": "2185", + "kind": 32, + "value": "image/jpeg", + "pos": 2592, + "end": 2604, + "flags": 1, + "parent": { + "$ref": "2183" + } + } + ], + "pos": 2578, + "end": 2604, + "flags": 1, + "parent": { + "$ref": "2182" + } + }, + "pos": 2578, + "end": 2604, + "flags": 1, + "parent": { + "$ref": "2178" + } + } + ], + "pos": 2568, + "end": 2605, + "flags": 1, + "parent": { + "$ref": "2176" + }, + "_id": 1009 + }, + "pos": 2564, + "end": 2605, + "flags": 0, + "parent": { + "$ref": "2174" + } + }, + "decorators": [ + { + "$id": "2186", + "kind": 5, + "arguments": [], + "target": { + "$id": "2187", + "kind": 3, + "sv": "scenario", + "pos": 2197, + "end": 2205, + "flags": 1, + "parent": { + "$ref": "2186" + }, + "_id": 1005 + }, + "pos": 2196, + "end": 2205, + "flags": 0, + "parent": { + "$ref": "2174" + } + }, + { + "$id": "2188", + "kind": 5, + "arguments": [ + { + "$id": "2189", + "kind": 32, + "value": "Test File type as response body with multiple allowed content types.\nService will return image/png.\nExpected response:\n- Content-Type header: image/png\n- Body: binary content matching packages/http-specs/assets/image.png", + "pos": 2221, + "end": 2473, + "flags": 0, + "parent": { + "$ref": "2188" + } + } + ], + "target": { + "$id": "2190", + "kind": 3, + "sv": "scenarioDoc", + "pos": 2209, + "end": 2220, + "flags": 1, + "parent": { + "$ref": "2188" + }, + "_id": 1006 + }, + "pos": 2208, + "end": 2474, + "flags": 0, + "parent": { + "$ref": "2174" + } + }, + { + "$id": "2191", + "kind": 5, + "arguments": [], + "target": { + "$id": "2192", + "kind": 3, + "sv": "get", + "pos": 2478, + "end": 2481, + "flags": 1, + "parent": { + "$ref": "2191" + }, + "_id": 1007 + }, + "pos": 2477, + "end": 2481, + "flags": 0, + "parent": { + "$ref": "2174" + } + }, + { + "$id": "2193", + "kind": 5, + "arguments": [ + { + "$id": "2194", + "kind": 32, + "value": "/response/multiple-content-types", + "pos": 2491, + "end": 2525, + "flags": 0, + "parent": { + "$ref": "2193" + } + } + ], + "target": { + "$id": "2195", + "kind": 3, + "sv": "route", + "pos": 2485, + "end": 2490, + "flags": 1, + "parent": { + "$ref": "2193" + }, + "_id": 1008 + }, + "pos": 2484, + "end": 2526, + "flags": 0, + "parent": { + "$ref": "2174" + } + } + ], + "pos": 2196, + "end": 2606, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2053" + }, + "symbol": { + "declarations": [ + { + "$ref": "2174" + } + ], + "name": "downloadFileMultipleContentTypes", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 425 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2196", + "kind": 10, + "id": { + "$id": "2197", + "kind": 3, + "sv": "uploadFileDefaultContentType", + "pos": 2985, + "end": 3013, + "flags": 0, + "parent": { + "$ref": "2196" + }, + "_id": 1013 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "signature": { + "$id": "2198", + "kind": 11, + "parameters": { + "$id": "2199", + "kind": 14, + "properties": [ + { + "$id": "2200", + "kind": 15, + "id": { + "$id": "2201", + "kind": 3, + "sv": "file", + "pos": 3024, + "end": 3028, + "flags": 0, + "parent": { + "$ref": "2200" + }, + "_id": 1018 + }, + "decorators": [ + { + "$id": "2202", + "kind": 5, + "arguments": [], + "target": { + "$id": "2203", + "kind": 3, + "sv": "bodyRoot", + "pos": 3015, + "end": 3023, + "flags": 1, + "parent": { + "$ref": "2202" + }, + "_id": 1019 + }, + "pos": 3014, + "end": 3023, + "flags": 0, + "parent": { + "$ref": "2200" + } + } + ], + "value": { + "$id": "2204", + "kind": 45, + "target": { + "$id": "2205", + "kind": 7, + "base": { + "$id": "2206", + "kind": 3, + "sv": "Http", + "pos": 3030, + "end": 3034, + "flags": 1, + "parent": { + "$ref": "2205" + }, + "_id": 1022 + }, + "id": { + "$id": "2207", + "kind": 3, + "sv": "File", + "pos": 3035, + "end": 3039, + "flags": 1, + "parent": { + "$ref": "2205" + }, + "_id": 1023 + }, + "selector": ".", + "pos": 3030, + "end": 3039, + "flags": 1, + "parent": { + "$ref": "2204" + }, + "_id": 1021 + }, + "arguments": [], + "pos": 3030, + "end": 3039, + "flags": 1, + "parent": { + "$ref": "2200" + }, + "_id": 1020 + }, + "optional": false, + "pos": 3014, + "end": 3039, + "flags": 0, + "docs": [], + "directives": [], + "parent": { + "$ref": "2199" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2200" + }, + "name": "file", + "flags": 65536, + "parent": { + "declarations": [], + "node": { + "$ref": "2199" + }, + "name": "-", + "members": { + "duplicates": {} + }, + "flags": 2, + "parent": { + "declarations": [ + { + "$ref": "2196" + } + ], + "name": "uploadFileDefaultContentType", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 426 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 108 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 3013, + "end": 3040 + }, + "pos": 3013, + "end": 3040, + "flags": 0, + "parent": { + "$ref": "2198" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2199" + }, + "name": "-", + "members": { + "duplicates": {} + }, + "flags": 2, + "parent": { + "declarations": [ + { + "$ref": "2196" + } + ], + "name": "uploadFileDefaultContentType", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 426 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 108 + } + }, + "returnType": { + "$id": "2208", + "kind": 45, + "target": { + "$id": "2209", + "kind": 3, + "sv": "NoContentResponse", + "pos": 3042, + "end": 3059, + "flags": 1, + "parent": { + "$ref": "2208" + }, + "_id": 1025 + }, + "arguments": [], + "pos": 3042, + "end": 3059, + "flags": 1, + "parent": { + "$ref": "2198" + }, + "_id": 1024 + }, + "pos": 3013, + "end": 3059, + "flags": 0, + "parent": { + "$ref": "2196" + } + }, + "decorators": [ + { + "$id": "2210", + "kind": 5, + "arguments": [], + "target": { + "$id": "2211", + "kind": 3, + "sv": "scenario", + "pos": 2611, + "end": 2619, + "flags": 1, + "parent": { + "$ref": "2210" + }, + "_id": 1014 + }, + "pos": 2610, + "end": 2619, + "flags": 0, + "parent": { + "$ref": "2196" + } + }, + { + "$id": "2212", + "kind": 5, + "arguments": [ + { + "$id": "2213", + "kind": 32, + "value": "Test File type as request body with unspecified content type.\nThe File type accepts any content type. For testing, sender will use image/png.\nExpected request:\n- Content-Type header: image/png\n- Body: binary content matching packages/http-specs/assets/image.png", + "pos": 2635, + "end": 2928, + "flags": 0, + "parent": { + "$ref": "2212" + } + } + ], + "target": { + "$id": "2214", + "kind": 3, + "sv": "scenarioDoc", + "pos": 2623, + "end": 2634, + "flags": 1, + "parent": { + "$ref": "2212" + }, + "_id": 1015 + }, + "pos": 2622, + "end": 2929, + "flags": 0, + "parent": { + "$ref": "2196" + } + }, + { + "$id": "2215", + "kind": 5, + "arguments": [], + "target": { + "$id": "2216", + "kind": 3, + "sv": "post", + "pos": 2933, + "end": 2937, + "flags": 1, + "parent": { + "$ref": "2215" + }, + "_id": 1016 + }, + "pos": 2932, + "end": 2937, + "flags": 0, + "parent": { + "$ref": "2196" + } + }, + { + "$id": "2217", + "kind": 5, + "arguments": [ + { + "$id": "2218", + "kind": 32, + "value": "/request/default-content-type", + "pos": 2947, + "end": 2978, + "flags": 0, + "parent": { + "$ref": "2217" + } + } + ], + "target": { + "$id": "2219", + "kind": 3, + "sv": "route", + "pos": 2941, + "end": 2946, + "flags": 1, + "parent": { + "$ref": "2217" + }, + "_id": 1017 + }, + "pos": 2940, + "end": 2979, + "flags": 0, + "parent": { + "$ref": "2196" + } + } + ], + "pos": 2610, + "end": 3060, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2053" + }, + "symbol": { + "declarations": [ + { + "$ref": "2196" + } + ], + "name": "uploadFileDefaultContentType", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 426 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2220", + "kind": 10, + "id": { + "$id": "2221", + "kind": 3, + "sv": "downloadFileDefaultContentType", + "pos": 3444, + "end": 3474, + "flags": 0, + "parent": { + "$ref": "2220" + }, + "_id": 1026 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "signature": { + "$id": "2222", + "kind": 11, + "parameters": { + "$id": "2223", + "kind": 14, + "properties": [], + "bodyRange": { + "pos": 3474, + "end": 3476 + }, + "pos": 3474, + "end": 3476, + "flags": 0, + "parent": { + "$ref": "2222" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2223" + }, + "name": "-", + "members": { + "duplicates": {} + }, + "flags": 2, + "parent": { + "declarations": [ + { + "$ref": "2220" + } + ], + "name": "downloadFileDefaultContentType", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 428 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 109 + } + }, + "returnType": { + "$id": "2224", + "kind": 45, + "target": { + "$id": "2225", + "kind": 7, + "base": { + "$id": "2226", + "kind": 3, + "sv": "Http", + "pos": 3478, + "end": 3482, + "flags": 1, + "parent": { + "$ref": "2225" + }, + "_id": 1033 + }, + "id": { + "$id": "2227", + "kind": 3, + "sv": "File", + "pos": 3483, + "end": 3487, + "flags": 1, + "parent": { + "$ref": "2225" + }, + "_id": 1034 + }, + "selector": ".", + "pos": 3478, + "end": 3487, + "flags": 1, + "parent": { + "$ref": "2224" + }, + "_id": 1032 + }, + "arguments": [], + "pos": 3478, + "end": 3487, + "flags": 1, + "parent": { + "$ref": "2222" + }, + "_id": 1031 + }, + "pos": 3474, + "end": 3487, + "flags": 0, + "parent": { + "$ref": "2220" + } + }, + "decorators": [ + { + "$id": "2228", + "kind": 5, + "arguments": [], + "target": { + "$id": "2229", + "kind": 3, + "sv": "scenario", + "pos": 3065, + "end": 3073, + "flags": 1, + "parent": { + "$ref": "2228" + }, + "_id": 1027 + }, + "pos": 3064, + "end": 3073, + "flags": 0, + "parent": { + "$ref": "2220" + } + }, + { + "$id": "2230", + "kind": 5, + "arguments": [ + { + "$id": "2231", + "kind": 32, + "value": "Test File type as response body with unspecified content type.\nThe File type accepts any content type. For testing, server will return image/png.\nExpected response:\n- Content-Type header: image/png\n- Body: binary content matching packages/http-specs/assets/image.png", + "pos": 3089, + "end": 3387, + "flags": 0, + "parent": { + "$ref": "2230" + } + } + ], + "target": { + "$id": "2232", + "kind": 3, + "sv": "scenarioDoc", + "pos": 3077, + "end": 3088, + "flags": 1, + "parent": { + "$ref": "2230" + }, + "_id": 1028 + }, + "pos": 3076, + "end": 3388, + "flags": 0, + "parent": { + "$ref": "2220" + } + }, + { + "$id": "2233", + "kind": 5, + "arguments": [], + "target": { + "$id": "2234", + "kind": 3, + "sv": "get", + "pos": 3392, + "end": 3395, + "flags": 1, + "parent": { + "$ref": "2233" + }, + "_id": 1029 + }, + "pos": 3391, + "end": 3395, + "flags": 0, + "parent": { + "$ref": "2220" + } + }, + { + "$id": "2235", + "kind": 5, + "arguments": [ + { + "$id": "2236", + "kind": 32, + "value": "/response/default-content-type", + "pos": 3405, + "end": 3437, + "flags": 0, + "parent": { + "$ref": "2235" + } + } + ], + "target": { + "$id": "2237", + "kind": 3, + "sv": "route", + "pos": 3399, + "end": 3404, + "flags": 1, + "parent": { + "$ref": "2235" + }, + "_id": 1030 + }, + "pos": 3398, + "end": 3438, + "flags": 0, + "parent": { + "$ref": "2220" + } + } + ], + "pos": 3064, + "end": 3488, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2053" + }, + "symbol": { + "declarations": [ + { + "$ref": "2220" + } + ], + "name": "downloadFileDefaultContentType", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 428 + }, + "locals": { + "duplicates": {} + } + } + ], + "directives": [], + "pos": 199, + "end": 3490, + "flags": 0, + "parent": { + "$ref": "2084" + }, + "symbol": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "symbol": { + "declarations": [ + { + "$ref": "2041" + } + ], + "name": "uploadFileSpecificContentType", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 395 + }, + "locals": { + "duplicates": {} + } + } + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2037" + }, + "name": "-", + "members": { + "duplicates": {} + }, + "flags": 2, + "parent": { + "declarations": [ + { + "$ref": "2041" + } + ], + "name": "uploadFileSpecificContentType", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 395 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 96 + } + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2033" + }, + "name": "file", + "flags": 65536, + "parent": { + "declarations": [], + "node": { + "$ref": "2037" + }, + "name": "-", + "members": { + "duplicates": {} + }, + "flags": 2, + "parent": { + "declarations": [ + { + "$ref": "2041" + } + ], + "name": "uploadFileSpecificContentType", + "flags": 1048584, + "parent": { + "declarations": [ + { + "$ref": "2053" + } + ], + "name": "Body", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2074" + } + ], + "name": "File", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2082" + } + ], + "name": "Type", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 395 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 96 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "_id": 898 + } + }, + "map": {} + }, + "model": { + "$id": "2238", + "kind": "Model", + "name": "File", + "node": { + "$ref": "40" + }, + "properties": {}, + "namespace": { + "$ref": "887" + }, + "decorators": [ + { + "args": [ + { + "value": { + "$ref": "723" + }, + "jsValue": "self" + }, + { + "value": { + "$id": "2239", + "kind": "String", + "value": "A file in an HTTP request, response, or multipart payload.\n\nFiles have a special meaning that the HTTP library understands. When the body of an HTTP request, response,\nor multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the\noperation is treated as a file upload or download.\n\nWhen using file bodies, the fields of the file model are defined to come from particular locations by default:\n\n- `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload\n(MAY be overridden or changed).\n\nA File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit\n`Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON payload,\nit will have a structure like:\n\n```\n{\n \"contentType\": ,\n \"filename\": ,\n \"contents\": \n}\n```\n\nThe `contentType` _within_ the file defines what media types the data inside the file can be, but if the specification\ndefines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is\nserialized_. See the examples below for more information.\n\nNOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename`\n(`Content-Disposition: ; filename=`) is only valid in HTTP responses and multipart payloads. If\nyou wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the\n`filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` location\nis overridden, as shown in the examples below.", + "isFinished": true, + "entityKind": "Type" + }, + "jsValue": "A file in an HTTP request, response, or multipart payload.\n\nFiles have a special meaning that the HTTP library understands. When the body of an HTTP request, response,\nor multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the\noperation is treated as a file upload or download.\n\nWhen using file bodies, the fields of the file model are defined to come from particular locations by default:\n\n- `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload\n(MAY be overridden or changed).\n\nA File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit\n`Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON payload,\nit will have a structure like:\n\n```\n{\n \"contentType\": ,\n \"filename\": ,\n \"contents\": \n}\n```\n\nThe `contentType` _within_ the file defines what media types the data inside the file can be, but if the specification\ndefines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is\nserialized_. See the examples below for more information.\n\nNOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename`\n(`Content-Disposition: ; filename=`) is only valid in HTTP responses and multipart payloads. If\nyou wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the\n`filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` location\nis overridden, as shown in the examples below." + } + ] + }, + { + "definition": { + "$id": "2240", + "kind": "Decorator", + "name": "@httpFile", + "namespace": { + "$id": "2241", + "kind": "Namespace", + "name": "Private", + "namespace": { + "$ref": "887" + }, + "node": { + "$id": "2242", + "kind": 8, + "decorators": [], + "docs": [ + { + "$id": "2243", + "kind": 51, + "content": [ + { + "$id": "2244", + "kind": 52, + "text": "Private decorators. Those are meant for internal use inside Http types only.", + "pos": 3, + "end": 85, + "flags": 0, + "parent": { + "$ref": "2243" + } + } + ], + "tags": [], + "pos": 0, + "end": 87, + "flags": 0, + "parent": { + "$ref": "2242" + } + } + ], + "id": { + "$id": "2245", + "kind": 3, + "sv": "Private", + "pos": 112, + "end": 119, + "flags": 0, + "parent": { + "$ref": "2242" + }, + "_id": 1356 + }, + "locals": { + "duplicates": {} + }, + "directives": [], + "pos": 0, + "end": 120, + "flags": 0, + "parent": { + "$id": "2246", + "kind": 8, + "decorators": [], + "directives": [], + "id": { + "$id": "2247", + "kind": 3, + "sv": "Http", + "pos": 107, + "end": 111, + "flags": 0, + "parent": { + "$ref": "2246" + }, + "_id": 1355 + }, + "statements": { + "$ref": "2242" + }, + "locals": { + "duplicates": {} + }, + "pos": 0, + "end": 120, + "flags": 0, + "parent": { + "$id": "2248", + "kind": 8, + "decorators": [], + "directives": [], + "id": { + "$id": "2249", + "kind": 3, + "sv": "TypeSpec", + "pos": 98, + "end": 106, + "flags": 0, + "parent": { + "$ref": "2248" + }, + "_id": 1354 + }, + "statements": { + "$ref": "2246" + }, + "locals": { + "duplicates": {} + }, + "pos": 0, + "end": 120, + "flags": 0, + "parent": { + "$id": "2250", + "kind": 0, + "statements": [ + { + "$ref": "2248" + }, + { + "$id": "2251", + "kind": 25, + "modifiers": [ + { + "$id": "2252", + "kind": 40, + "pos": 122, + "end": 128, + "flags": 0, + "parent": { + "$ref": "2251" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2253", + "kind": 3, + "sv": "plainData", + "pos": 133, + "end": 142, + "flags": 0, + "parent": { + "$ref": "2251" + }, + "_id": 1108 + }, + "target": { + "$id": "2254", + "kind": 27, + "id": { + "$id": "2255", + "kind": 3, + "sv": "target", + "pos": 143, + "end": 149, + "flags": 0, + "parent": { + "$ref": "2254" + }, + "_id": 1109 + }, + "type": { + "$id": "2256", + "kind": 45, + "target": { + "$id": "2257", + "kind": 7, + "base": { + "$id": "2258", + "kind": 7, + "base": { + "$id": "2259", + "kind": 3, + "sv": "TypeSpec", + "pos": 151, + "end": 159, + "flags": 1, + "parent": { + "$ref": "2258" + }, + "_id": 1113 + }, + "id": { + "$id": "2260", + "kind": 3, + "sv": "Reflection", + "pos": 160, + "end": 170, + "flags": 1, + "parent": { + "$ref": "2258" + }, + "_id": 1114 + }, + "selector": ".", + "pos": 151, + "end": 170, + "flags": 1, + "parent": { + "$ref": "2257" + }, + "_id": 1112 + }, + "id": { + "$id": "2261", + "kind": 3, + "sv": "Model", + "pos": 171, + "end": 176, + "flags": 1, + "parent": { + "$ref": "2257" + }, + "_id": 1115 + }, + "selector": ".", + "pos": 151, + "end": 176, + "flags": 1, + "parent": { + "$ref": "2256" + }, + "_id": 1111 + }, + "arguments": [], + "pos": 151, + "end": 176, + "flags": 1, + "parent": { + "$ref": "2254" + }, + "_id": 1110 + }, + "optional": false, + "rest": false, + "pos": 143, + "end": 176, + "flags": 0, + "parent": { + "$ref": "2251" + }, + "symbol": { + "declarations": [ + { + "$ref": "2254" + } + ], + "name": "target", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 450 + } + }, + "parameters": [], + "pos": 122, + "end": 178, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2250" + }, + "symbol": { + "declarations": [ + { + "$ref": "2251" + } + ], + "name": "@plainData", + "flags": 1049088, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2262", + "kind": 25, + "modifiers": [ + { + "$id": "2263", + "kind": 40, + "pos": 179, + "end": 185, + "flags": 0, + "parent": { + "$ref": "2262" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2264", + "kind": 3, + "sv": "httpFile", + "pos": 190, + "end": 198, + "flags": 0, + "parent": { + "$ref": "2262" + }, + "_id": 907 + }, + "target": { + "$id": "2265", + "kind": 27, + "id": { + "$id": "2266", + "kind": 3, + "sv": "target", + "pos": 199, + "end": 205, + "flags": 0, + "parent": { + "$ref": "2265" + }, + "_id": 908 + }, + "type": { + "$id": "2267", + "kind": 45, + "target": { + "$id": "2268", + "kind": 7, + "base": { + "$id": "2269", + "kind": 7, + "base": { + "$id": "2270", + "kind": 3, + "sv": "TypeSpec", + "pos": 207, + "end": 215, + "flags": 1, + "parent": { + "$ref": "2269" + }, + "_id": 912 + }, + "id": { + "$id": "2271", + "kind": 3, + "sv": "Reflection", + "pos": 216, + "end": 226, + "flags": 1, + "parent": { + "$ref": "2269" + }, + "_id": 913 + }, + "selector": ".", + "pos": 207, + "end": 226, + "flags": 1, + "parent": { + "$ref": "2268" + }, + "_id": 911 + }, + "id": { + "$id": "2272", + "kind": 3, + "sv": "Model", + "pos": 227, + "end": 232, + "flags": 1, + "parent": { + "$ref": "2268" + }, + "_id": 914 + }, + "selector": ".", + "pos": 207, + "end": 232, + "flags": 1, + "parent": { + "$ref": "2267" + }, + "_id": 910 + }, + "arguments": [], + "pos": 207, + "end": 232, + "flags": 1, + "parent": { + "$ref": "2265" + }, + "_id": 909 + }, + "optional": false, + "rest": false, + "pos": 199, + "end": 232, + "flags": 0, + "parent": { + "$ref": "2262" + }, + "symbol": { + "declarations": [ + { + "$ref": "2265" + } + ], + "name": "target", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 401 + } + }, + "parameters": [], + "pos": 179, + "end": 234, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2250" + }, + "symbol": { + "declarations": [ + { + "$ref": "2262" + } + ], + "name": "@httpFile", + "flags": 1049088, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2273", + "kind": 25, + "modifiers": [ + { + "$id": "2274", + "kind": 40, + "pos": 235, + "end": 241, + "flags": 0, + "parent": { + "$ref": "2273" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2275", + "kind": 3, + "sv": "httpPart", + "pos": 246, + "end": 254, + "flags": 0, + "parent": { + "$ref": "2273" + }, + "_id": 1124 + }, + "target": { + "$id": "2276", + "kind": 27, + "id": { + "$id": "2277", + "kind": 3, + "sv": "target", + "pos": 258, + "end": 264, + "flags": 0, + "parent": { + "$ref": "2276" + }, + "_id": 1125 + }, + "type": { + "$id": "2278", + "kind": 45, + "target": { + "$id": "2279", + "kind": 7, + "base": { + "$id": "2280", + "kind": 7, + "base": { + "$id": "2281", + "kind": 3, + "sv": "TypeSpec", + "pos": 266, + "end": 274, + "flags": 1, + "parent": { + "$ref": "2280" + }, + "_id": 1129 + }, + "id": { + "$id": "2282", + "kind": 3, + "sv": "Reflection", + "pos": 275, + "end": 285, + "flags": 1, + "parent": { + "$ref": "2280" + }, + "_id": 1130 + }, + "selector": ".", + "pos": 266, + "end": 285, + "flags": 1, + "parent": { + "$ref": "2279" + }, + "_id": 1128 + }, + "id": { + "$id": "2283", + "kind": 3, + "sv": "Model", + "pos": 286, + "end": 291, + "flags": 1, + "parent": { + "$ref": "2279" + }, + "_id": 1131 + }, + "selector": ".", + "pos": 266, + "end": 291, + "flags": 1, + "parent": { + "$ref": "2278" + }, + "_id": 1127 + }, + "arguments": [], + "pos": 266, + "end": 291, + "flags": 1, + "parent": { + "$ref": "2276" + }, + "_id": 1126 + }, + "optional": false, + "rest": false, + "pos": 258, + "end": 291, + "flags": 0, + "parent": { + "$ref": "2273" + }, + "symbol": { + "declarations": [ + { + "$ref": "2276" + } + ], + "name": "target", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 453 + } + }, + "parameters": [ + { + "$id": "2284", + "kind": 27, + "id": { + "$id": "2285", + "kind": 3, + "sv": "type", + "pos": 295, + "end": 299, + "flags": 0, + "parent": { + "$ref": "2284" + }, + "_id": 1132 + }, + "type": { + "$id": "2286", + "kind": 43, + "pos": 301, + "end": 308, + "flags": 0, + "parent": { + "$ref": "2284" + } + }, + "optional": false, + "rest": false, + "pos": 295, + "end": 308, + "flags": 0, + "parent": { + "$ref": "2273" + }, + "symbol": { + "declarations": [ + { + "$ref": "2284" + } + ], + "name": "type", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 454 + } + }, + { + "$id": "2287", + "kind": 27, + "id": { + "$id": "2288", + "kind": 3, + "sv": "options", + "pos": 312, + "end": 319, + "flags": 0, + "parent": { + "$ref": "2287" + }, + "_id": 1133 + }, + "type": { + "$id": "2289", + "kind": 44, + "target": { + "$id": "2290", + "kind": 45, + "target": { + "$id": "2291", + "kind": 3, + "sv": "HttpPartOptions", + "pos": 329, + "end": 344, + "flags": 1, + "parent": { + "$ref": "2290" + }, + "_id": 1135 + }, + "arguments": [], + "pos": 329, + "end": 344, + "flags": 1, + "parent": { + "$ref": "2289" + }, + "_id": 1134 + }, + "pos": 321, + "end": 344, + "flags": 0, + "parent": { + "$ref": "2287" + } + }, + "optional": false, + "rest": false, + "pos": 312, + "end": 344, + "flags": 0, + "parent": { + "$ref": "2273" + }, + "symbol": { + "declarations": [ + { + "$ref": "2287" + } + ], + "name": "options", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 455 + } + } + ], + "pos": 235, + "end": 347, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2250" + }, + "symbol": { + "declarations": [ + { + "$ref": "2273" + } + ], + "name": "@httpPart", + "flags": 1049088, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2292", + "kind": 25, + "modifiers": [ + { + "$id": "2293", + "kind": 40, + "pos": 529, + "end": 535, + "flags": 0, + "parent": { + "$ref": "2292" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2294", + "kind": 3, + "sv": "includeInapplicableMetadataInPayload", + "pos": 540, + "end": 576, + "flags": 0, + "parent": { + "$ref": "2292" + }, + "_id": 1357 + }, + "target": { + "$id": "2295", + "kind": 27, + "id": { + "$id": "2296", + "kind": 3, + "sv": "target", + "pos": 577, + "end": 583, + "flags": 0, + "parent": { + "$ref": "2295" + }, + "_id": 1358 + }, + "type": { + "$id": "2297", + "kind": 43, + "pos": 585, + "end": 592, + "flags": 0, + "parent": { + "$ref": "2295" + } + }, + "optional": false, + "rest": false, + "pos": 577, + "end": 592, + "flags": 0, + "parent": { + "$ref": "2292" + }, + "symbol": { + "declarations": [ + { + "$ref": "2295" + } + ], + "name": "target", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 508 + } + }, + "parameters": [ + { + "$id": "2298", + "kind": 27, + "id": { + "$id": "2299", + "kind": 3, + "sv": "value", + "pos": 594, + "end": 599, + "flags": 0, + "parent": { + "$ref": "2298" + }, + "_id": 1359 + }, + "type": { + "$id": "2300", + "kind": 44, + "target": { + "$id": "2301", + "kind": 45, + "target": { + "$id": "2302", + "kind": 3, + "sv": "boolean", + "pos": 609, + "end": 616, + "flags": 1, + "parent": { + "$ref": "2301" + }, + "_id": 1361 + }, + "arguments": [], + "pos": 609, + "end": 616, + "flags": 1, + "parent": { + "$ref": "2300" + }, + "_id": 1360 + }, + "pos": 601, + "end": 616, + "flags": 0, + "parent": { + "$ref": "2298" + } + }, + "optional": false, + "rest": false, + "pos": 594, + "end": 616, + "flags": 0, + "parent": { + "$ref": "2292" + }, + "symbol": { + "declarations": [ + { + "$ref": "2298" + } + ], + "name": "value", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 509 + } + } + ], + "pos": 349, + "end": 618, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2303", + "kind": 51, + "content": [ + { + "$id": "2304", + "kind": 52, + "text": "Specify if inapplicable metadata should be included in the payload for the given entity.", + "pos": 352, + "end": 448, + "flags": 0, + "parent": { + "$ref": "2303" + } + } + ], + "tags": [ + { + "$id": "2305", + "kind": 53, + "tagName": { + "$id": "2306", + "kind": 3, + "sv": "param", + "pos": 449, + "end": 454, + "flags": 0, + "parent": { + "$ref": "2305" + } + }, + "paramName": { + "$id": "2307", + "kind": 3, + "sv": "value", + "pos": 455, + "end": 460, + "flags": 0, + "parent": { + "$ref": "2305" + } + }, + "content": [ + { + "$id": "2308", + "kind": 52, + "text": "If true, inapplicable metadata will be included in the payload.", + "pos": 461, + "end": 526, + "flags": 0, + "parent": { + "$ref": "2305" + } + } + ], + "pos": 448, + "end": 526, + "flags": 0, + "parent": { + "$ref": "2303" + } + } + ], + "pos": 349, + "end": 528, + "flags": 0, + "parent": { + "$ref": "2292" + } + } + ], + "parent": { + "$ref": "2250" + }, + "symbol": { + "declarations": [ + { + "$ref": "2292" + } + ], + "name": "@includeInapplicableMetadataInPayload", + "flags": 1049088, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2309", + "kind": 21, + "id": { + "$id": "2310", + "kind": 3, + "sv": "MergePatchVisibilityMode", + "pos": 687, + "end": 711, + "flags": 0, + "parent": { + "$ref": "2309" + }, + "_id": 1202 + }, + "decorators": [], + "members": [ + { + "$id": "2311", + "kind": 22, + "id": { + "$id": "2312", + "kind": 3, + "sv": "Update", + "pos": 818, + "end": 824, + "flags": 0, + "parent": { + "$ref": "2311" + }, + "_id": 1203 + }, + "decorators": [], + "pos": 716, + "end": 824, + "flags": 0, + "docs": [ + { + "$id": "2313", + "kind": 51, + "content": [ + { + "$id": "2314", + "kind": 52, + "text": "The Update mode. This is used when a resource can be updated but must already exist.", + "pos": 719, + "end": 813, + "flags": 0, + "parent": { + "$ref": "2313" + } + } + ], + "tags": [], + "pos": 716, + "end": 815, + "flags": 0, + "parent": { + "$ref": "2311" + } + } + ], + "directives": [], + "parent": { + "$ref": "2309" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2311" + }, + "name": "Update", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "2309" + } + ], + "name": "MergePatchVisibilityMode", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 137 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2315", + "kind": 22, + "id": { + "$id": "2316", + "kind": 3, + "sv": "CreateOrUpdate", + "pos": 951, + "end": 965, + "flags": 0, + "parent": { + "$ref": "2315" + }, + "_id": 1204 + }, + "decorators": [], + "pos": 829, + "end": 965, + "flags": 0, + "docs": [ + { + "$id": "2317", + "kind": 51, + "content": [ + { + "$id": "2318", + "kind": 52, + "text": "The Create or Update mode. This is used when a resource can be created OR updated in a single operation.", + "pos": 832, + "end": 946, + "flags": 0, + "parent": { + "$ref": "2317" + } + } + ], + "tags": [], + "pos": 829, + "end": 948, + "flags": 0, + "parent": { + "$ref": "2315" + } + } + ], + "directives": [], + "parent": { + "$ref": "2309" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2315" + }, + "name": "CreateOrUpdate", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "2309" + } + ], + "name": "MergePatchVisibilityMode", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 137 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "pos": 620, + "end": 968, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2319", + "kind": 51, + "content": [ + { + "$id": "2320", + "kind": 52, + "text": "The visibility mode for the merge patch transform.", + "pos": 623, + "end": 679, + "flags": 0, + "parent": { + "$ref": "2319" + } + } + ], + "tags": [], + "pos": 620, + "end": 681, + "flags": 0, + "parent": { + "$ref": "2309" + } + } + ], + "parent": { + "$ref": "2250" + }, + "symbol": { + "declarations": [ + { + "$ref": "2309" + } + ], + "name": "MergePatchVisibilityMode", + "members": { + "duplicates": {} + }, + "flags": 1048592, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 137 + } + }, + { + "$id": "2321", + "kind": 13, + "id": { + "$id": "2322", + "kind": 3, + "sv": "ApplyMergePatchOptions", + "pos": 1033, + "end": 1055, + "flags": 0, + "parent": { + "$ref": "2321" + }, + "_id": 1198 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [ + { + "$id": "2323", + "kind": 15, + "id": { + "$id": "2324", + "kind": 3, + "sv": "visibilityMode", + "pos": 1105, + "end": 1119, + "flags": 0, + "parent": { + "$ref": "2323" + }, + "_id": 1199 + }, + "decorators": [], + "value": { + "$id": "2325", + "kind": 45, + "target": { + "$id": "2326", + "kind": 3, + "sv": "MergePatchVisibilityMode", + "pos": 1121, + "end": 1145, + "flags": 1, + "parent": { + "$ref": "2325" + }, + "_id": 1201 + }, + "arguments": [], + "pos": 1121, + "end": 1145, + "flags": 1, + "parent": { + "$ref": "2323" + }, + "_id": 1200 + }, + "optional": false, + "pos": 1060, + "end": 1145, + "flags": 0, + "docs": [ + { + "$id": "2327", + "kind": 51, + "content": [ + { + "$id": "2328", + "kind": 52, + "text": "The visibility mode to use.", + "pos": 1063, + "end": 1100, + "flags": 0, + "parent": { + "$ref": "2327" + } + } + ], + "tags": [], + "pos": 1060, + "end": 1102, + "flags": 0, + "parent": { + "$ref": "2323" + } + } + ], + "directives": [], + "parent": { + "$ref": "2321" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2323" + }, + "name": "visibilityMode", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "2321" + } + ], + "name": "ApplyMergePatchOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 136 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 1056, + "end": 1148 + }, + "pos": 970, + "end": 1148, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2329", + "kind": 51, + "content": [ + { + "$id": "2330", + "kind": 52, + "text": "Options for the `@applyMergePatch` decorator.", + "pos": 973, + "end": 1024, + "flags": 0, + "parent": { + "$ref": "2329" + } + } + ], + "tags": [], + "pos": 970, + "end": 1026, + "flags": 0, + "parent": { + "$ref": "2321" + } + } + ], + "parent": { + "$ref": "2250" + }, + "symbol": { + "declarations": [ + { + "$ref": "2321" + } + ], + "name": "ApplyMergePatchOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 136 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2331", + "kind": 25, + "modifiers": [ + { + "$id": "2332", + "kind": 40, + "pos": 1289, + "end": 1295, + "flags": 0, + "parent": { + "$ref": "2331" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2333", + "kind": 3, + "sv": "applyMergePatch", + "pos": 1300, + "end": 1315, + "flags": 0, + "parent": { + "$ref": "2331" + }, + "_id": 1181 + }, + "target": { + "$id": "2334", + "kind": 27, + "id": { + "$id": "2335", + "kind": 3, + "sv": "target", + "pos": 1319, + "end": 1325, + "flags": 0, + "parent": { + "$ref": "2334" + }, + "_id": 1182 + }, + "type": { + "$id": "2336", + "kind": 45, + "target": { + "$id": "2337", + "kind": 7, + "base": { + "$id": "2338", + "kind": 3, + "sv": "Reflection", + "pos": 1327, + "end": 1337, + "flags": 1, + "parent": { + "$ref": "2337" + }, + "_id": 1185 + }, + "id": { + "$id": "2339", + "kind": 3, + "sv": "Model", + "pos": 1338, + "end": 1343, + "flags": 1, + "parent": { + "$ref": "2337" + }, + "_id": 1186 + }, + "selector": ".", + "pos": 1327, + "end": 1343, + "flags": 1, + "parent": { + "$ref": "2336" + }, + "_id": 1184 + }, + "arguments": [], + "pos": 1327, + "end": 1343, + "flags": 1, + "parent": { + "$ref": "2334" + }, + "_id": 1183 + }, + "optional": false, + "rest": false, + "pos": 1319, + "end": 1343, + "flags": 0, + "parent": { + "$ref": "2331" + }, + "symbol": { + "declarations": [ + { + "$ref": "2334" + } + ], + "name": "target", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 460 + } + }, + "parameters": [ + { + "$id": "2340", + "kind": 27, + "id": { + "$id": "2341", + "kind": 3, + "sv": "source", + "pos": 1347, + "end": 1353, + "flags": 0, + "parent": { + "$ref": "2340" + }, + "_id": 1187 + }, + "type": { + "$id": "2342", + "kind": 45, + "target": { + "$id": "2343", + "kind": 7, + "base": { + "$id": "2344", + "kind": 3, + "sv": "Reflection", + "pos": 1355, + "end": 1365, + "flags": 1, + "parent": { + "$ref": "2343" + }, + "_id": 1190 + }, + "id": { + "$id": "2345", + "kind": 3, + "sv": "Model", + "pos": 1366, + "end": 1371, + "flags": 1, + "parent": { + "$ref": "2343" + }, + "_id": 1191 + }, + "selector": ".", + "pos": 1355, + "end": 1371, + "flags": 1, + "parent": { + "$ref": "2342" + }, + "_id": 1189 + }, + "arguments": [], + "pos": 1355, + "end": 1371, + "flags": 1, + "parent": { + "$ref": "2340" + }, + "_id": 1188 + }, + "optional": false, + "rest": false, + "pos": 1347, + "end": 1371, + "flags": 0, + "parent": { + "$ref": "2331" + }, + "symbol": { + "declarations": [ + { + "$ref": "2340" + } + ], + "name": "source", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 461 + } + }, + { + "$id": "2346", + "kind": 27, + "id": { + "$id": "2347", + "kind": 3, + "sv": "nameTemplate", + "pos": 1375, + "end": 1387, + "flags": 0, + "parent": { + "$ref": "2346" + }, + "_id": 1192 + }, + "type": { + "$id": "2348", + "kind": 44, + "target": { + "$id": "2349", + "kind": 45, + "target": { + "$id": "2350", + "kind": 3, + "sv": "string", + "pos": 1397, + "end": 1403, + "flags": 1, + "parent": { + "$ref": "2349" + }, + "_id": 1194 + }, + "arguments": [], + "pos": 1397, + "end": 1403, + "flags": 1, + "parent": { + "$ref": "2348" + }, + "_id": 1193 + }, + "pos": 1389, + "end": 1403, + "flags": 0, + "parent": { + "$ref": "2346" + } + }, + "optional": false, + "rest": false, + "pos": 1375, + "end": 1403, + "flags": 0, + "parent": { + "$ref": "2331" + }, + "symbol": { + "declarations": [ + { + "$ref": "2346" + } + ], + "name": "nameTemplate", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 462 + } + }, + { + "$id": "2351", + "kind": 27, + "id": { + "$id": "2352", + "kind": 3, + "sv": "options", + "pos": 1407, + "end": 1414, + "flags": 0, + "parent": { + "$ref": "2351" + }, + "_id": 1195 + }, + "type": { + "$id": "2353", + "kind": 44, + "target": { + "$id": "2354", + "kind": 45, + "target": { + "$id": "2355", + "kind": 3, + "sv": "ApplyMergePatchOptions", + "pos": 1424, + "end": 1446, + "flags": 1, + "parent": { + "$ref": "2354" + }, + "_id": 1197 + }, + "arguments": [], + "pos": 1424, + "end": 1446, + "flags": 1, + "parent": { + "$ref": "2353" + }, + "_id": 1196 + }, + "pos": 1416, + "end": 1446, + "flags": 0, + "parent": { + "$ref": "2351" + } + }, + "optional": false, + "rest": false, + "pos": 1407, + "end": 1446, + "flags": 0, + "parent": { + "$ref": "2331" + }, + "symbol": { + "declarations": [ + { + "$ref": "2351" + } + ], + "name": "options", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 463 + } + } + ], + "pos": 1150, + "end": 1449, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2356", + "kind": 51, + "content": [ + { + "$id": "2357", + "kind": 52, + "text": "Performs the canonical merge-patch transformation on the given model and injects its\ntransformed properties into the target.", + "pos": 1153, + "end": 1286, + "flags": 0, + "parent": { + "$ref": "2356" + } + } + ], + "tags": [], + "pos": 1150, + "end": 1288, + "flags": 0, + "parent": { + "$ref": "2331" + } + } + ], + "parent": { + "$ref": "2250" + }, + "symbol": { + "declarations": [ + { + "$ref": "2331" + } + ], + "name": "@applyMergePatch", + "flags": 1049088, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2358", + "kind": 25, + "modifiers": [ + { + "$id": "2359", + "kind": 40, + "pos": 1565, + "end": 1571, + "flags": 0, + "parent": { + "$ref": "2358" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2360", + "kind": 3, + "sv": "mergePatchModel", + "pos": 1576, + "end": 1591, + "flags": 0, + "parent": { + "$ref": "2358" + }, + "_id": 1362 + }, + "target": { + "$id": "2361", + "kind": 27, + "id": { + "$id": "2362", + "kind": 3, + "sv": "target", + "pos": 1592, + "end": 1598, + "flags": 0, + "parent": { + "$ref": "2361" + }, + "_id": 1363 + }, + "type": { + "$id": "2363", + "kind": 45, + "target": { + "$id": "2364", + "kind": 7, + "base": { + "$id": "2365", + "kind": 3, + "sv": "Reflection", + "pos": 1600, + "end": 1610, + "flags": 1, + "parent": { + "$ref": "2364" + }, + "_id": 1366 + }, + "id": { + "$id": "2366", + "kind": 3, + "sv": "Model", + "pos": 1611, + "end": 1616, + "flags": 1, + "parent": { + "$ref": "2364" + }, + "_id": 1367 + }, + "selector": ".", + "pos": 1600, + "end": 1616, + "flags": 1, + "parent": { + "$ref": "2363" + }, + "_id": 1365 + }, + "arguments": [], + "pos": 1600, + "end": 1616, + "flags": 1, + "parent": { + "$ref": "2361" + }, + "_id": 1364 + }, + "optional": false, + "rest": false, + "pos": 1592, + "end": 1616, + "flags": 0, + "parent": { + "$ref": "2358" + }, + "symbol": { + "declarations": [ + { + "$ref": "2361" + } + ], + "name": "target", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 511 + } + }, + "parameters": [ + { + "$id": "2367", + "kind": 27, + "id": { + "$id": "2368", + "kind": 3, + "sv": "source", + "pos": 1618, + "end": 1624, + "flags": 0, + "parent": { + "$ref": "2367" + }, + "_id": 1368 + }, + "type": { + "$id": "2369", + "kind": 45, + "target": { + "$id": "2370", + "kind": 7, + "base": { + "$id": "2371", + "kind": 3, + "sv": "Reflection", + "pos": 1626, + "end": 1636, + "flags": 1, + "parent": { + "$ref": "2370" + }, + "_id": 1371 + }, + "id": { + "$id": "2372", + "kind": 3, + "sv": "Model", + "pos": 1637, + "end": 1642, + "flags": 1, + "parent": { + "$ref": "2370" + }, + "_id": 1372 + }, + "selector": ".", + "pos": 1626, + "end": 1642, + "flags": 1, + "parent": { + "$ref": "2369" + }, + "_id": 1370 + }, + "arguments": [], + "pos": 1626, + "end": 1642, + "flags": 1, + "parent": { + "$ref": "2367" + }, + "_id": 1369 + }, + "optional": false, + "rest": false, + "pos": 1618, + "end": 1642, + "flags": 0, + "parent": { + "$ref": "2358" + }, + "symbol": { + "declarations": [ + { + "$ref": "2367" + } + ], + "name": "source", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 512 + } + } + ], + "pos": 1451, + "end": 1644, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2373", + "kind": 51, + "content": [ + { + "$id": "2374", + "kind": 52, + "text": "Marks a model that was generated by applying the MergePatch\ntransform and links to its source model", + "pos": 1454, + "end": 1562, + "flags": 0, + "parent": { + "$ref": "2373" + } + } + ], + "tags": [], + "pos": 1451, + "end": 1564, + "flags": 0, + "parent": { + "$ref": "2358" + } + } + ], + "parent": { + "$ref": "2250" + }, + "symbol": { + "declarations": [ + { + "$ref": "2358" + } + ], + "name": "@mergePatchModel", + "flags": 1049088, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2375", + "kind": 25, + "modifiers": [ + { + "$id": "2376", + "kind": 40, + "pos": 1748, + "end": 1754, + "flags": 0, + "parent": { + "$ref": "2375" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2377", + "kind": 3, + "sv": "mergePatchProperty", + "pos": 1759, + "end": 1777, + "flags": 0, + "parent": { + "$ref": "2375" + }, + "_id": 1373 + }, + "target": { + "$id": "2378", + "kind": 27, + "id": { + "$id": "2379", + "kind": 3, + "sv": "target", + "pos": 1778, + "end": 1784, + "flags": 0, + "parent": { + "$ref": "2378" + }, + "_id": 1374 + }, + "type": { + "$id": "2380", + "kind": 45, + "target": { + "$id": "2381", + "kind": 7, + "base": { + "$id": "2382", + "kind": 3, + "sv": "Reflection", + "pos": 1786, + "end": 1796, + "flags": 1, + "parent": { + "$ref": "2381" + }, + "_id": 1377 + }, + "id": { + "$id": "2383", + "kind": 3, + "sv": "ModelProperty", + "pos": 1797, + "end": 1810, + "flags": 1, + "parent": { + "$ref": "2381" + }, + "_id": 1378 + }, + "selector": ".", + "pos": 1786, + "end": 1810, + "flags": 1, + "parent": { + "$ref": "2380" + }, + "_id": 1376 + }, + "arguments": [], + "pos": 1786, + "end": 1810, + "flags": 1, + "parent": { + "$ref": "2378" + }, + "_id": 1375 + }, + "optional": false, + "rest": false, + "pos": 1778, + "end": 1810, + "flags": 0, + "parent": { + "$ref": "2375" + }, + "symbol": { + "declarations": [ + { + "$ref": "2378" + } + ], + "name": "target", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 514 + } + }, + "parameters": [ + { + "$id": "2384", + "kind": 27, + "id": { + "$id": "2385", + "kind": 3, + "sv": "source", + "pos": 1812, + "end": 1818, + "flags": 0, + "parent": { + "$ref": "2384" + }, + "_id": 1379 + }, + "type": { + "$id": "2386", + "kind": 45, + "target": { + "$id": "2387", + "kind": 7, + "base": { + "$id": "2388", + "kind": 3, + "sv": "Reflection", + "pos": 1820, + "end": 1830, + "flags": 1, + "parent": { + "$ref": "2387" + }, + "_id": 1382 + }, + "id": { + "$id": "2389", + "kind": 3, + "sv": "ModelProperty", + "pos": 1831, + "end": 1844, + "flags": 1, + "parent": { + "$ref": "2387" + }, + "_id": 1383 + }, + "selector": ".", + "pos": 1820, + "end": 1844, + "flags": 1, + "parent": { + "$ref": "2386" + }, + "_id": 1381 + }, + "arguments": [], + "pos": 1820, + "end": 1844, + "flags": 1, + "parent": { + "$ref": "2384" + }, + "_id": 1380 + }, + "optional": false, + "rest": false, + "pos": 1812, + "end": 1844, + "flags": 0, + "parent": { + "$ref": "2375" + }, + "symbol": { + "declarations": [ + { + "$ref": "2384" + } + ], + "name": "source", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 515 + } + } + ], + "pos": 1646, + "end": 1846, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2390", + "kind": 51, + "content": [ + { + "$id": "2391", + "kind": 52, + "text": "Links a modelProperty mutated as part of a mergePatch transform to\nits source property;", + "pos": 1649, + "end": 1745, + "flags": 0, + "parent": { + "$ref": "2390" + } + } + ], + "tags": [], + "pos": 1646, + "end": 1747, + "flags": 0, + "parent": { + "$ref": "2375" + } + } + ], + "parent": { + "$ref": "2250" + }, + "symbol": { + "declarations": [ + { + "$ref": "2375" + } + ], + "name": "@mergePatchProperty", + "flags": 1049088, + "parent": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "file": { + "text": "/**\n * Private decorators. Those are meant for internal use inside Http types only.\n */\nnamespace TypeSpec.Http.Private;\n\nextern dec plainData(target: TypeSpec.Reflection.Model);\nextern dec httpFile(target: TypeSpec.Reflection.Model);\nextern dec httpPart(\n target: TypeSpec.Reflection.Model,\n type: unknown,\n options: valueof HttpPartOptions\n);\n\n/**\n * Specify if inapplicable metadata should be included in the payload for the given entity.\n * @param value If true, inapplicable metadata will be included in the payload.\n */\nextern dec includeInapplicableMetadataInPayload(target: unknown, value: valueof boolean);\n\n/**\n * The visibility mode for the merge patch transform.\n */\nenum MergePatchVisibilityMode {\n /**\n * The Update mode. This is used when a resource can be updated but must already exist.\n */\n Update,\n\n /**\n * The Create or Update mode. This is used when a resource can be created OR updated in a single operation.\n */\n CreateOrUpdate,\n}\n\n/**\n * Options for the `@applyMergePatch` decorator.\n */\nmodel ApplyMergePatchOptions {\n /**\n * The visibility mode to use.\n */\n visibilityMode: MergePatchVisibilityMode;\n}\n\n/**\n * Performs the canonical merge-patch transformation on the given model and injects its\n * transformed properties into the target.\n */\nextern dec applyMergePatch(\n target: Reflection.Model,\n source: Reflection.Model,\n nameTemplate: valueof string,\n options: valueof ApplyMergePatchOptions\n);\n\n/**\n * Marks a model that was generated by applying the MergePatch\n * transform and links to its source model\n */\nextern dec mergePatchModel(target: Reflection.Model, source: Reflection.Model);\n\n/**\n * Links a modelProperty mutated as part of a mergePatch transform to\n * its source property;\n */\nextern dec mergePatchProperty(target: Reflection.ModelProperty, source: Reflection.ModelProperty);\n", + "path": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/http/lib/private.decorators.tsp" + }, + "id": { + "$id": "2392", + "kind": 3, + "sv": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/http/lib/private.decorators.tsp", + "pos": 0, + "end": 0, + "flags": 8, + "parent": { + "$ref": "2250" + } + }, + "namespaces": [ + { + "$ref": "2248" + }, + { + "$ref": "2246" + }, + { + "$ref": "2242" + } + ], + "usings": [], + "locals": { + "duplicates": {} + }, + "inScopeNamespaces": [ + { + "$ref": "2242" + }, + { + "$ref": "2246" + }, + { + "$ref": "2248" + } + ], + "parseDiagnostics": [], + "comments": [], + "printable": true, + "parseOptions": {}, + "pos": 0, + "end": 1846, + "flags": 0, + "symbol": { + "declarations": [], + "node": { + "$ref": "2250" + }, + "name": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/http/lib/private.decorators.tsp", + "exports": { + "duplicates": {} + }, + "flags": 32768, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "symbol": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "symbol": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "symbol": { + "declarations": [ + { + "$ref": "2242" + } + ], + "name": "Private", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2246" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2248" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "models": {}, + "scalars": {}, + "operations": {}, + "namespaces": {}, + "interfaces": {}, + "unions": {}, + "enums": {}, + "decoratorDeclarations": {}, + "functionDeclarations": {}, + "decorators": [ + { + "args": [ + { + "value": { + "$ref": "723" + }, + "jsValue": "self" + }, + { + "value": { + "$id": "2393", + "kind": "String", + "value": "Private decorators. Those are meant for internal use inside Http types only.", + "isFinished": true, + "entityKind": "Type" + }, + "jsValue": "Private decorators. Those are meant for internal use inside Http types only." + } + ] + } + ], + "isFinished": true, + "entityKind": "Type" + }, + "node": { + "$ref": "2262" + }, + "target": { + "$id": "2394", + "kind": "FunctionParameter", + "node": { + "$ref": "2265" + }, + "name": "target", + "optional": false, + "rest": false, + "type": { + "entityKind": "MixedParameterConstraint", + "node": { + "$ref": "2267" + }, + "type": { + "$ref": "1993" + } + }, + "mixed": true, + "isFinished": false, + "creating": true, + "entityKind": "Type" + }, + "parameters": [], + "isFinished": false, + "creating": true, + "entityKind": "Type" + }, + "node": { + "$ref": "416" + }, + "args": [] + }, + { + "definition": { + "$ref": "895" + }, + "node": { + "$ref": "413" + }, + "args": [ + { + "value": { + "entityKind": "Value", + "valueKind": "StringValue", + "value": "A file in an HTTP request, response, or multipart payload.", + "type": { + "$ref": "463" + }, + "scalar": { + "$ref": "463" + } + }, + "node": { + "$ref": "414" + }, + "jsValue": "A file in an HTTP request, response, or multipart payload." + } + ] + } + ], + "sourceModels": [], + "derivedModels": [], + "isFinished": true, + "entityKind": "Type", + "templateMapper": { + "partial": false, + "args": [ + { + "entityKind": "Indeterminate", + "type": { + "$ref": "1987" + } + }, + { + "$ref": "1988" + } + ], + "source": { + "node": { + "$ref": "2027" + } + }, + "map": {} + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "40" + }, + "name": "File", + "members": { + "duplicates": {} + }, + "flags": 4194306, + "metatypeMembers": { + "duplicates": {} + }, + "type": { + "$ref": "2238" + } + }, + "templateNode": { + "$ref": "40" + } + } + } + } + }, + "properties": [ + { + "$id": "2395", + "kind": "property", + "name": "contentType", + "summary": "The allowed media (MIME) types of the file contents.", + "doc": "The allowed media (MIME) types of the file contents.\n\nIn file bodies, this value comes from the `Content-Type` header of the request or response. In JSON bodies,\nthis value is serialized as a field in the response.\n\nNOTE: this is not _necessarily_ the same as the `Content-Type` header of the request or response, but\nit will be for file bodies. It may be different if the file is serialized as a JSON object. It always refers to the\n_contents_ of the file, and not necessarily the way the file itself is transmitted or serialized.", + "type": { + "$ref": "1" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "TypeSpec.Http.File.contentType", + "serializationOptions": {}, + "isHttpMetadata": false + }, + { + "$id": "2396", + "kind": "property", + "name": "filename", + "summary": "The name of the file, if any.", + "doc": "The name of the file, if any.\n\nIn file bodies, this value comes from the `filename` parameter of the `Content-Disposition` header of the response\nor multipart payload. In JSON bodies, this value is serialized as a field in the response.\n\nNOTE: By default, `filename` cannot be sent in request payloads and can only be sent in responses and multipart\npayloads, as the `Content-Disposition` header is not valid in requests. If you want to send the `filename` in a request,\nyou must extend the `File` model and override the `filename` property with a different location defined by HTTP metadata\ndecorators.", + "type": { + "$id": "2397", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "TypeSpec.Http.File.filename", + "serializationOptions": {}, + "isHttpMetadata": false + }, + { + "$id": "2398", + "kind": "property", + "name": "contents", + "summary": "The contents of the file.", + "doc": "The contents of the file.\n\nIn file bodies, this value comes from the body of the request, response, or multipart payload. In JSON bodies,\nthis value is serialized as a field in the response.", + "type": { + "$id": "2399", + "kind": "bytes", + "name": "bytes", + "encode": "base64", + "crossLanguageDefinitionId": "TypeSpec.bytes", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "TypeSpec.Http.File.contents", + "serializationOptions": {}, + "isHttpMetadata": false + } + ] + }, + { + "$id": "2400", + "kind": "model", + "name": "File1", + "namespace": "TypeSpec.Http", + "crossLanguageDefinitionId": "TypeSpec.Http.File", + "usage": "Input,Output,Json", + "doc": "A file in an HTTP request, response, or multipart payload.\n\nFiles have a special meaning that the HTTP library understands. When the body of an HTTP request, response,\nor multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the\noperation is treated as a file upload or download.\n\nWhen using file bodies, the fields of the file model are defined to come from particular locations by default:\n\n- `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload\n(MAY be overridden or changed).\n\nA File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit\n`Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON payload,\nit will have a structure like:\n\n```\n{\n \"contentType\": ,\n \"filename\": ,\n \"contents\": \n}\n```\n\nThe `contentType` _within_ the file defines what media types the data inside the file can be, but if the specification\ndefines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is\nserialized_. See the examples below for more information.\n\nNOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename`\n(`Content-Disposition: ; filename=`) is only valid in HTTP responses and multipart payloads. If\nyou wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the\n`filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` location\nis overridden, as shown in the examples below.", + "summary": "A file in an HTTP request, response, or multipart payload.", + "decorators": [], + "serializationOptions": { + "binary": { + "isFile": true, + "isText": false, + "contentTypes": [ + "application/json" + ], + "filename": { + "$id": "2401", + "kind": "ModelProperty", + "name": "filename", + "node": { + "$ref": "31" + }, + "optional": true, + "type": { + "$ref": "463" + }, + "decorators": [ + { + "args": [ + { + "value": { + "$ref": "723" + }, + "jsValue": "self" + }, + { + "value": { + "$ref": "894" + }, + "jsValue": "The name of the file, if any.\n\nIn file bodies, this value comes from the `filename` parameter of the `Content-Disposition` header of the response\nor multipart payload. In JSON bodies, this value is serialized as a field in the response.\n\nNOTE: By default, `filename` cannot be sent in request payloads and can only be sent in responses and multipart\npayloads, as the `Content-Disposition` header is not valid in requests. If you want to send the `filename` in a request,\nyou must extend the `File` model and override the `filename` property with a different location defined by HTTP metadata\ndecorators." + } + ] + }, + { + "definition": { + "$ref": "895" + }, + "node": { + "$ref": "33" + }, + "args": [ + { + "value": { + "entityKind": "Value", + "valueKind": "StringValue", + "value": "The name of the file, if any.", + "type": { + "$ref": "463" + }, + "scalar": { + "$ref": "463" + } + }, + "node": { + "$ref": "34" + }, + "jsValue": "The name of the file, if any." + } + ] + } + ], + "isFinished": true, + "entityKind": "Type", + "templateMapper": { + "partial": false, + "args": [ + { + "entityKind": "Indeterminate", + "type": { + "$id": "2402", + "kind": "String", + "value": "application/json", + "isFinished": true, + "entityKind": "Type" + } + }, + { + "$ref": "1988" + } + ], + "source": { + "node": { + "$ref": "2068" + } + }, + "map": {} + }, + "model": { + "$id": "2403", + "kind": "Model", + "name": "File", + "node": { + "$ref": "40" + }, + "properties": {}, + "namespace": { + "$ref": "887" + }, + "decorators": [ + { + "args": [ + { + "value": { + "$ref": "723" + }, + "jsValue": "self" + }, + { + "value": { + "$ref": "2239" + }, + "jsValue": "A file in an HTTP request, response, or multipart payload.\n\nFiles have a special meaning that the HTTP library understands. When the body of an HTTP request, response,\nor multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the\noperation is treated as a file upload or download.\n\nWhen using file bodies, the fields of the file model are defined to come from particular locations by default:\n\n- `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload\n(MAY be overridden or changed).\n\nA File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit\n`Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON payload,\nit will have a structure like:\n\n```\n{\n \"contentType\": ,\n \"filename\": ,\n \"contents\": \n}\n```\n\nThe `contentType` _within_ the file defines what media types the data inside the file can be, but if the specification\ndefines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is\nserialized_. See the examples below for more information.\n\nNOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename`\n(`Content-Disposition: ; filename=`) is only valid in HTTP responses and multipart payloads. If\nyou wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the\n`filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` location\nis overridden, as shown in the examples below." + } + ] + }, + { + "definition": { + "$ref": "2240" + }, + "node": { + "$ref": "416" + }, + "args": [] + }, + { + "definition": { + "$ref": "895" + }, + "node": { + "$ref": "413" + }, + "args": [ + { + "value": { + "entityKind": "Value", + "valueKind": "StringValue", + "value": "A file in an HTTP request, response, or multipart payload.", + "type": { + "$ref": "463" + }, + "scalar": { + "$ref": "463" + } + }, + "node": { + "$ref": "414" + }, + "jsValue": "A file in an HTTP request, response, or multipart payload." + } + ] + } + ], + "sourceModels": [], + "derivedModels": [], + "isFinished": true, + "entityKind": "Type", + "templateMapper": { + "partial": false, + "args": [ + { + "entityKind": "Indeterminate", + "type": { + "$ref": "2402" + } + }, + { + "$ref": "1988" + } + ], + "source": { + "node": { + "$ref": "2068" + } + }, + "map": {} + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "40" + }, + "name": "File", + "members": { + "duplicates": {} + }, + "flags": 4194306, + "metatypeMembers": { + "duplicates": {} + }, + "type": { + "$ref": "2403" + } + }, + "templateNode": { + "$ref": "40" + } + } + } + } + }, + "properties": [ + { + "$id": "2404", + "kind": "property", + "name": "contentType", + "summary": "The allowed media (MIME) types of the file contents.", + "doc": "The allowed media (MIME) types of the file contents.\n\nIn file bodies, this value comes from the `Content-Type` header of the request or response. In JSON bodies,\nthis value is serialized as a field in the response.\n\nNOTE: this is not _necessarily_ the same as the `Content-Type` header of the request or response, but\nit will be for file bodies. It may be different if the file is serialized as a JSON object. It always refers to the\n_contents_ of the file, and not necessarily the way the file itself is transmitted or serialized.", + "type": { + "$ref": "5" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "TypeSpec.Http.File.contentType", + "serializationOptions": {}, + "isHttpMetadata": false + }, + { + "$id": "2405", + "kind": "property", + "name": "filename", + "summary": "The name of the file, if any.", + "doc": "The name of the file, if any.\n\nIn file bodies, this value comes from the `filename` parameter of the `Content-Disposition` header of the response\nor multipart payload. In JSON bodies, this value is serialized as a field in the response.\n\nNOTE: By default, `filename` cannot be sent in request payloads and can only be sent in responses and multipart\npayloads, as the `Content-Disposition` header is not valid in requests. If you want to send the `filename` in a request,\nyou must extend the `File` model and override the `filename` property with a different location defined by HTTP metadata\ndecorators.", + "type": { + "$id": "2406", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "TypeSpec.Http.File.filename", + "serializationOptions": {}, + "isHttpMetadata": false + }, + { + "$id": "2407", + "kind": "property", + "name": "contents", + "summary": "The contents of the file.", + "doc": "The contents of the file.\n\nIn file bodies, this value comes from the body of the request, response, or multipart payload. In JSON bodies,\nthis value is serialized as a field in the response.", + "type": { + "$id": "2408", + "kind": "bytes", + "name": "bytes", + "encode": "base64", + "crossLanguageDefinitionId": "TypeSpec.bytes", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "TypeSpec.Http.File.contents", + "serializationOptions": {}, + "isHttpMetadata": false + } + ] + }, + { + "$id": "2409", + "kind": "model", + "name": "File2", + "namespace": "TypeSpec.Http", + "crossLanguageDefinitionId": "TypeSpec.Http.File", + "usage": "Input", + "doc": "A file in an HTTP request, response, or multipart payload.\n\nFiles have a special meaning that the HTTP library understands. When the body of an HTTP request, response,\nor multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the\noperation is treated as a file upload or download.\n\nWhen using file bodies, the fields of the file model are defined to come from particular locations by default:\n\n- `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload\n(MAY be overridden or changed).\n\nA File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit\n`Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON payload,\nit will have a structure like:\n\n```\n{\n \"contentType\": ,\n \"filename\": ,\n \"contents\": \n}\n```\n\nThe `contentType` _within_ the file defines what media types the data inside the file can be, but if the specification\ndefines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is\nserialized_. See the examples below for more information.\n\nNOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename`\n(`Content-Disposition: ; filename=`) is only valid in HTTP responses and multipart payloads. If\nyou wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the\n`filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` location\nis overridden, as shown in the examples below.", + "summary": "A file in an HTTP request, response, or multipart payload.", + "decorators": [], + "serializationOptions": { + "binary": { + "isFile": true, + "isText": false, + "contentTypes": [ + "image/png", + "image/jpeg" + ], + "filename": { + "$id": "2410", + "kind": "ModelProperty", + "name": "filename", + "node": { + "$ref": "31" + }, + "optional": true, + "type": { + "$ref": "463" + }, + "decorators": [ + { + "args": [ + { + "value": { + "$ref": "723" + }, + "jsValue": "self" + }, + { + "value": { + "$ref": "894" + }, + "jsValue": "The name of the file, if any.\n\nIn file bodies, this value comes from the `filename` parameter of the `Content-Disposition` header of the response\nor multipart payload. In JSON bodies, this value is serialized as a field in the response.\n\nNOTE: By default, `filename` cannot be sent in request payloads and can only be sent in responses and multipart\npayloads, as the `Content-Disposition` header is not valid in requests. If you want to send the `filename` in a request,\nyou must extend the `File` model and override the `filename` property with a different location defined by HTTP metadata\ndecorators." + } + ] + }, + { + "definition": { + "$ref": "895" + }, + "node": { + "$ref": "33" + }, + "args": [ + { + "value": { + "entityKind": "Value", + "valueKind": "StringValue", + "value": "The name of the file, if any.", + "type": { + "$ref": "463" + }, + "scalar": { + "$ref": "463" + } + }, + "node": { + "$ref": "34" + }, + "jsValue": "The name of the file, if any." + } + ] + } + ], + "isFinished": true, + "entityKind": "Type", + "templateMapper": { + "partial": false, + "args": [ + { + "$id": "2411", + "kind": "Union", + "node": { + "$ref": "2159" + }, + "options": [ + { + "$ref": "1987" + }, + { + "$id": "2412", + "kind": "String", + "value": "image/jpeg", + "isFinished": true, + "entityKind": "Type" + } + ], + "expression": true, + "namespace": { + "$id": "2413", + "kind": "Namespace", + "name": "Body", + "namespace": { + "$id": "2414", + "kind": "Namespace", + "name": "File", + "namespace": { + "$id": "2415", + "kind": "Namespace", + "name": "Type", + "namespace": { + "$ref": "720" + }, + "node": { + "$ref": "2082" + }, + "models": {}, + "scalars": {}, + "operations": {}, + "namespaces": {}, + "interfaces": {}, + "unions": {}, + "enums": {}, + "decoratorDeclarations": {}, + "functionDeclarations": {}, + "decorators": [], + "isFinished": true, + "entityKind": "Type" + }, + "node": { + "$ref": "2074" + }, + "models": {}, + "scalars": {}, + "operations": {}, + "namespaces": {}, + "interfaces": {}, + "unions": {}, + "enums": {}, + "decoratorDeclarations": {}, + "functionDeclarations": {}, + "decorators": [ + { + "definition": { + "$id": "2416", + "kind": "Decorator", + "name": "@scenarioService", + "namespace": { + "$id": "2417", + "kind": "Namespace", + "name": "Spector", + "namespace": { + "$ref": "719" + }, + "node": { + "$id": "2418", + "kind": 60, + "id": { + "$id": "2419", + "kind": 3, + "sv": "Spector", + "pos": 0, + "end": 0, + "flags": 0 + }, + "pos": 0, + "end": 0, + "parent": { + "$id": "2420", + "kind": 1, + "id": { + "$id": "2421", + "kind": 3, + "sv": "", + "pos": 0, + "end": 0, + "flags": 8 + }, + "esmExports": { + "$decorators": { + "TypeSpec.Spector": {} + }, + "$lib": { + "name": "@typespec/spector", + "diagnostics": { + "category-invalid": { + "severity": "error", + "messages": {} + }, + "missing-scenario": { + "severity": "warning", + "messages": { + "default": "Operation doesn't belong to a scenario. Use @scenario(name?: string) to mark it as a scenario. See https://github.com/Azure/cadl-ranch/blob/main/docs/decorators.md#scenario" + } + }, + "missing-scenario-doc": { + "severity": "warning", + "messages": { + "default": "Operation is missing a scenario doc. Use @scenarioDoc to provide the name of the scenario. See https://github.com/Azure/cadl-ranch/blob/main/docs/decorators.md#scenariodoc" + } + } + }, + "state": { + "Scenario": { + "description": "Mark a scenario to be executed" + }, + "ScenarioDoc": { + "description": "Mark a scenario documentation" + }, + "ScenarioService": { + "description": "Mark a scenario service to be executed" + } + }, + "stateKeys": {} + } + }, + "file": { + "text": "", + "path": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/spector/dist/src/lib/tsp-index.js" + }, + "namespaceSymbols": [], + "symbol": { + "declarations": [ + { + "$ref": "2420" + } + ], + "name": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/spector/dist/src/lib/tsp-index.js", + "exports": { + "duplicates": {} + }, + "flags": 1081344, + "metatypeMembers": { + "duplicates": {} + } + }, + "pos": 0, + "end": 0, + "flags": 0 + }, + "flags": 0, + "symbol": { + "declarations": [ + { + "$ref": "2418" + } + ], + "name": "Spector", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$id": "2422", + "kind": 60, + "id": { + "$id": "2423", + "kind": 3, + "sv": "TypeSpec", + "pos": 0, + "end": 0, + "flags": 0 + }, + "pos": 0, + "end": 0, + "parent": { + "$ref": "2420" + }, + "flags": 0 + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2420" + } + ], + "name": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/spector/dist/src/lib/tsp-index.js", + "exports": { + "duplicates": {} + }, + "flags": 1081344, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "models": {}, + "scalars": {}, + "operations": {}, + "namespaces": {}, + "interfaces": {}, + "unions": {}, + "enums": {}, + "decoratorDeclarations": {}, + "functionDeclarations": {}, + "decorators": [], + "isFinished": true, + "entityKind": "Type" + }, + "node": { + "$id": "2424", + "kind": 25, + "modifiers": [ + { + "$id": "2425", + "kind": 40, + "pos": 310, + "end": 316, + "flags": 0, + "parent": { + "$ref": "2424" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2426", + "kind": 3, + "sv": "scenarioService", + "pos": 321, + "end": 336, + "flags": 0, + "parent": { + "$ref": "2424" + }, + "_id": 831 + }, + "target": { + "$id": "2427", + "kind": 27, + "id": { + "$id": "2428", + "kind": 3, + "sv": "target", + "pos": 340, + "end": 346, + "flags": 0, + "parent": { + "$ref": "2427" + }, + "_id": 832 + }, + "type": { + "$id": "2429", + "kind": 45, + "target": { + "$id": "2430", + "kind": 3, + "sv": "Namespace", + "pos": 348, + "end": 357, + "flags": 1, + "parent": { + "$ref": "2429" + }, + "_id": 834 + }, + "arguments": [], + "pos": 348, + "end": 357, + "flags": 1, + "parent": { + "$ref": "2427" + }, + "_id": 833 + }, + "optional": false, + "rest": false, + "pos": 340, + "end": 357, + "flags": 0, + "parent": { + "$ref": "2424" + }, + "symbol": { + "declarations": [ + { + "$ref": "2427" + } + ], + "name": "target", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$id": "2431", + "kind": 8, + "decorators": [], + "docs": [], + "id": { + "$id": "2432", + "kind": 3, + "sv": "Spector", + "pos": 87, + "end": 94, + "flags": 0, + "parent": { + "$ref": "2431" + }, + "_id": 1593 + }, + "locals": { + "duplicates": {} + }, + "directives": [], + "pos": 68, + "end": 95, + "flags": 0, + "parent": { + "$id": "2433", + "kind": 8, + "decorators": [], + "directives": [], + "id": { + "$id": "2434", + "kind": 3, + "sv": "TypeSpec", + "pos": 78, + "end": 86, + "flags": 0, + "parent": { + "$ref": "2433" + }, + "_id": 1592 + }, + "statements": { + "$ref": "2431" + }, + "locals": { + "duplicates": {} + }, + "pos": 68, + "end": 95, + "flags": 0, + "parent": { + "$id": "2435", + "kind": 0, + "statements": [ + { + "$id": "2436", + "kind": 2, + "path": { + "$id": "2437", + "kind": 32, + "value": "../dist/src/lib/tsp-index.js", + "pos": 7, + "end": 37, + "flags": 0, + "parent": { + "$ref": "2436" + } + }, + "pos": 0, + "end": 38, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2435" + } + }, + { + "$id": "2438", + "kind": 9, + "name": { + "$id": "2439", + "kind": 7, + "base": { + "$id": "2440", + "kind": 3, + "sv": "TypeSpec", + "pos": 46, + "end": 54, + "flags": 1, + "parent": { + "$ref": "2439" + }, + "_id": 13 + }, + "id": { + "$id": "2441", + "kind": 3, + "sv": "Reflection", + "pos": 55, + "end": 65, + "flags": 1, + "parent": { + "$ref": "2439" + }, + "_id": 14 + }, + "selector": ".", + "pos": 46, + "end": 65, + "flags": 1, + "parent": { + "$ref": "2438" + }, + "_id": 12 + }, + "pos": 40, + "end": 66, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2435" + } + }, + { + "$ref": "2433" + }, + { + "$id": "2442", + "kind": 24, + "id": { + "$id": "2443", + "kind": 3, + "sv": "ScenarioServiceOptions", + "pos": 103, + "end": 125, + "flags": 0, + "parent": { + "$ref": "2442" + }, + "_id": 841 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "value": { + "$id": "2444", + "kind": 14, + "properties": [ + { + "$id": "2445", + "kind": 15, + "id": { + "$id": "2446", + "kind": 3, + "sv": "versioned", + "pos": 209, + "end": 218, + "flags": 0, + "parent": { + "$ref": "2445" + }, + "_id": 842 + }, + "decorators": [], + "value": { + "$id": "2447", + "kind": 45, + "target": { + "$id": "2448", + "kind": 3, + "sv": "Enum", + "pos": 221, + "end": 225, + "flags": 1, + "parent": { + "$ref": "2447" + }, + "_id": 844 + }, + "arguments": [], + "pos": 221, + "end": 225, + "flags": 1, + "parent": { + "$ref": "2445" + }, + "_id": 843 + }, + "optional": true, + "pos": 132, + "end": 225, + "flags": 0, + "docs": [ + { + "$id": "2449", + "kind": 51, + "content": [ + { + "$id": "2450", + "kind": 52, + "text": "Version enum that would be used on the $versioned decorator", + "pos": 135, + "end": 204, + "flags": 0, + "parent": { + "$ref": "2449" + } + } + ], + "tags": [], + "pos": 132, + "end": 206, + "flags": 0, + "parent": { + "$ref": "2445" + } + } + ], + "directives": [], + "parent": { + "$ref": "2444" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2445" + }, + "name": "versioned", + "flags": 65536, + "parent": { + "declarations": [], + "node": { + "$ref": "2444" + }, + "name": "-", + "members": { + "duplicates": {} + }, + "flags": 2, + "parent": { + "declarations": [ + { + "$ref": "2442" + } + ], + "name": "ScenarioServiceOptions", + "flags": 1048704, + "metatypeMembers": { + "duplicates": {} + }, + "id": 94 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 95 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 128, + "end": 228 + }, + "pos": 128, + "end": 228, + "flags": 0, + "parent": { + "$ref": "2442" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2444" + }, + "name": "-", + "members": { + "duplicates": {} + }, + "flags": 2, + "parent": { + "declarations": [ + { + "$ref": "2442" + } + ], + "name": "ScenarioServiceOptions", + "flags": 1048704, + "metatypeMembers": { + "duplicates": {} + }, + "id": 94 + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 95 + } + }, + "pos": 97, + "end": 229, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2435" + }, + "symbol": { + "declarations": [ + { + "$ref": "2442" + } + ], + "name": "ScenarioServiceOptions", + "flags": 1048704, + "metatypeMembers": { + "duplicates": {} + }, + "id": 94 + }, + "locals": { + "duplicates": {} + } + }, + { + "$ref": "2424" + }, + { + "$id": "2451", + "kind": 25, + "modifiers": [ + { + "$id": "2452", + "kind": 40, + "pos": 552, + "end": 558, + "flags": 0, + "parent": { + "$ref": "2451" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2453", + "kind": 3, + "sv": "scenario", + "pos": 563, + "end": 573, + "flags": 0, + "parent": { + "$ref": "2451" + }, + "_id": 860 + }, + "target": { + "$id": "2454", + "kind": 27, + "id": { + "$id": "2455", + "kind": 3, + "sv": "target", + "pos": 574, + "end": 580, + "flags": 0, + "parent": { + "$ref": "2454" + }, + "_id": 861 + }, + "type": { + "$id": "2456", + "kind": 28, + "options": [ + { + "$id": "2457", + "kind": 45, + "target": { + "$id": "2458", + "kind": 3, + "sv": "Namespace", + "pos": 582, + "end": 591, + "flags": 1, + "parent": { + "$ref": "2457" + }, + "_id": 863 + }, + "arguments": [], + "pos": 582, + "end": 591, + "flags": 1, + "parent": { + "$ref": "2456" + }, + "_id": 862 + }, + { + "$id": "2459", + "kind": 45, + "target": { + "$id": "2460", + "kind": 3, + "sv": "Interface", + "pos": 594, + "end": 603, + "flags": 1, + "parent": { + "$ref": "2459" + }, + "_id": 865 + }, + "arguments": [], + "pos": 594, + "end": 603, + "flags": 1, + "parent": { + "$ref": "2456" + }, + "_id": 864 + }, + { + "$id": "2461", + "kind": 45, + "target": { + "$id": "2462", + "kind": 3, + "sv": "Operation", + "pos": 606, + "end": 615, + "flags": 1, + "parent": { + "$ref": "2461" + }, + "_id": 867 + }, + "arguments": [], + "pos": 606, + "end": 615, + "flags": 1, + "parent": { + "$ref": "2456" + }, + "_id": 866 + } + ], + "pos": 582, + "end": 615, + "flags": 0, + "parent": { + "$ref": "2454" + } + }, + "optional": false, + "rest": false, + "pos": 574, + "end": 615, + "flags": 0, + "parent": { + "$ref": "2451" + }, + "symbol": { + "declarations": [ + { + "$ref": "2454" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 409 + } + }, + "parameters": [ + { + "$id": "2463", + "kind": 27, + "id": { + "$id": "2464", + "kind": 3, + "sv": "name", + "pos": 617, + "end": 621, + "flags": 0, + "parent": { + "$ref": "2463" + }, + "_id": 868 + }, + "type": { + "$id": "2465", + "kind": 44, + "target": { + "$id": "2466", + "kind": 45, + "target": { + "$id": "2467", + "kind": 3, + "sv": "string", + "pos": 632, + "end": 638, + "flags": 1, + "parent": { + "$ref": "2466" + }, + "_id": 870 + }, + "arguments": [], + "pos": 632, + "end": 638, + "flags": 1, + "parent": { + "$ref": "2465" + }, + "_id": 869 + }, + "pos": 624, + "end": 638, + "flags": 0, + "parent": { + "$ref": "2463" + } + }, + "optional": true, + "rest": false, + "pos": 617, + "end": 638, + "flags": 0, + "parent": { + "$ref": "2451" + }, + "symbol": { + "declarations": [ + { + "$ref": "2463" + } + ], + "name": "name", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 410 + } + } + ], + "pos": 423, + "end": 640, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2468", + "kind": 51, + "content": [ + { + "$id": "2469", + "kind": 52, + "text": "Mark an operation, interface or namespace as a scenario. All containing operations will be part of the same scenario.", + "pos": 426, + "end": 549, + "flags": 0, + "parent": { + "$ref": "2468" + } + } + ], + "tags": [], + "pos": 423, + "end": 551, + "flags": 0, + "parent": { + "$ref": "2451" + } + } + ], + "parent": { + "$ref": "2435" + }, + "symbol": { + "declarations": [ + { + "$ref": "2451" + } + ], + "name": "@scenario", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2470", + "kind": 25, + "modifiers": [ + { + "$id": "2471", + "kind": 40, + "pos": 776, + "end": 782, + "flags": 0, + "parent": { + "$ref": "2470" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2472", + "kind": 3, + "sv": "scenarioDoc", + "pos": 787, + "end": 798, + "flags": 0, + "parent": { + "$ref": "2470" + }, + "_id": 872 + }, + "target": { + "$id": "2473", + "kind": 27, + "id": { + "$id": "2474", + "kind": 3, + "sv": "target", + "pos": 802, + "end": 808, + "flags": 0, + "parent": { + "$ref": "2473" + }, + "_id": 873 + }, + "type": { + "$id": "2475", + "kind": 28, + "options": [ + { + "$id": "2476", + "kind": 45, + "target": { + "$id": "2477", + "kind": 3, + "sv": "Namespace", + "pos": 810, + "end": 819, + "flags": 1, + "parent": { + "$ref": "2476" + }, + "_id": 875 + }, + "arguments": [], + "pos": 810, + "end": 819, + "flags": 1, + "parent": { + "$ref": "2475" + }, + "_id": 874 + }, + { + "$id": "2478", + "kind": 45, + "target": { + "$id": "2479", + "kind": 3, + "sv": "Interface", + "pos": 822, + "end": 831, + "flags": 1, + "parent": { + "$ref": "2478" + }, + "_id": 877 + }, + "arguments": [], + "pos": 822, + "end": 831, + "flags": 1, + "parent": { + "$ref": "2475" + }, + "_id": 876 + }, + { + "$id": "2480", + "kind": 45, + "target": { + "$id": "2481", + "kind": 3, + "sv": "Operation", + "pos": 834, + "end": 843, + "flags": 1, + "parent": { + "$ref": "2480" + }, + "_id": 879 + }, + "arguments": [], + "pos": 834, + "end": 843, + "flags": 1, + "parent": { + "$ref": "2475" + }, + "_id": 878 + } + ], + "pos": 810, + "end": 843, + "flags": 0, + "parent": { + "$ref": "2473" + } + }, + "optional": false, + "rest": false, + "pos": 802, + "end": 843, + "flags": 0, + "parent": { + "$ref": "2470" + }, + "symbol": { + "declarations": [ + { + "$ref": "2473" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 412 + } + }, + "parameters": [ + { + "$id": "2482", + "kind": 27, + "id": { + "$id": "2483", + "kind": 3, + "sv": "doc", + "pos": 847, + "end": 850, + "flags": 0, + "parent": { + "$ref": "2482" + }, + "_id": 880 + }, + "type": { + "$id": "2484", + "kind": 44, + "target": { + "$id": "2485", + "kind": 45, + "target": { + "$id": "2486", + "kind": 3, + "sv": "string", + "pos": 860, + "end": 866, + "flags": 1, + "parent": { + "$ref": "2485" + }, + "_id": 882 + }, + "arguments": [], + "pos": 860, + "end": 866, + "flags": 1, + "parent": { + "$ref": "2484" + }, + "_id": 881 + }, + "pos": 852, + "end": 866, + "flags": 0, + "parent": { + "$ref": "2482" + } + }, + "optional": false, + "rest": false, + "pos": 847, + "end": 866, + "flags": 0, + "parent": { + "$ref": "2470" + }, + "symbol": { + "declarations": [ + { + "$ref": "2482" + } + ], + "name": "doc", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 413 + } + }, + { + "$id": "2487", + "kind": 27, + "id": { + "$id": "2488", + "kind": 3, + "sv": "formatArgs", + "pos": 870, + "end": 880, + "flags": 0, + "parent": { + "$ref": "2487" + }, + "_id": 883 + }, + "type": { + "$id": "2489", + "kind": 45, + "target": { + "$id": "2490", + "kind": 3, + "sv": "Model", + "pos": 883, + "end": 888, + "flags": 1, + "parent": { + "$ref": "2489" + }, + "_id": 885 + }, + "arguments": [], + "pos": 883, + "end": 888, + "flags": 1, + "parent": { + "$ref": "2487" + }, + "_id": 884 + }, + "optional": true, + "rest": false, + "pos": 870, + "end": 888, + "flags": 0, + "parent": { + "$ref": "2470" + }, + "symbol": { + "declarations": [ + { + "$ref": "2487" + } + ], + "name": "formatArgs", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 414 + } + } + ], + "pos": 642, + "end": 891, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2491", + "kind": 51, + "content": [ + { + "$id": "2492", + "kind": 52, + "text": "Specify documentation on how to implement this scenario.", + "pos": 645, + "end": 709, + "flags": 0, + "parent": { + "$ref": "2491" + } + } + ], + "tags": [ + { + "$id": "2493", + "kind": 53, + "tagName": { + "$id": "2494", + "kind": 3, + "sv": "param", + "pos": 710, + "end": 715, + "flags": 0, + "parent": { + "$ref": "2493" + } + }, + "paramName": { + "$id": "2495", + "kind": 3, + "sv": "doc", + "pos": 716, + "end": 719, + "flags": 0, + "parent": { + "$ref": "2493" + } + }, + "content": [ + { + "$id": "2496", + "kind": 52, + "text": "Documentation", + "pos": 720, + "end": 737, + "flags": 0, + "parent": { + "$ref": "2493" + } + } + ], + "pos": 709, + "end": 737, + "flags": 0, + "parent": { + "$ref": "2491" + } + }, + { + "$id": "2497", + "kind": 53, + "tagName": { + "$id": "2498", + "kind": 3, + "sv": "param", + "pos": 738, + "end": 743, + "flags": 0, + "parent": { + "$ref": "2497" + } + }, + "paramName": { + "$id": "2499", + "kind": 3, + "sv": "formatArgs", + "pos": 744, + "end": 754, + "flags": 0, + "parent": { + "$ref": "2497" + } + }, + "content": [ + { + "$id": "2500", + "kind": 52, + "text": "Format arguments", + "pos": 755, + "end": 773, + "flags": 0, + "parent": { + "$ref": "2497" + } + } + ], + "pos": 737, + "end": 773, + "flags": 0, + "parent": { + "$ref": "2491" + } + } + ], + "pos": 642, + "end": 775, + "flags": 0, + "parent": { + "$ref": "2470" + } + } + ], + "parent": { + "$ref": "2435" + }, + "symbol": { + "declarations": [ + { + "$ref": "2470" + } + ], + "name": "@scenarioDoc", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "file": { + "text": "import \"../dist/src/lib/tsp-index.js\";\n\nusing TypeSpec.Reflection;\n\nnamespace TypeSpec.Spector;\n\nalias ScenarioServiceOptions = {\n /**\n * Version enum that would be used on the $versioned decorator\n */\n versioned?: Enum;\n};\n\n/**\n * Setup the boilerplate for a scenario service(server endpoint, etc.)\n */\nextern dec scenarioService(\n target: Namespace,\n route: valueof string,\n options?: ScenarioServiceOptions\n);\n\n/**\n * Mark an operation, interface or namespace as a scenario. All containing operations will be part of the same scenario.\n */\nextern dec `scenario`(target: Namespace | Interface | Operation, name?: valueof string);\n\n/**\n * Specify documentation on how to implement this scenario.\n * @param doc Documentation\n * @param formatArgs Format arguments\n */\nextern dec scenarioDoc(\n target: Namespace | Interface | Operation,\n doc: valueof string,\n formatArgs?: Model\n);\n", + "path": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/spector/lib/main.tsp" + }, + "id": { + "$id": "2501", + "kind": 3, + "sv": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/spector/lib/main.tsp", + "pos": 0, + "end": 0, + "flags": 8, + "parent": { + "$ref": "2435" + } + }, + "namespaces": [ + { + "$ref": "2433" + }, + { + "$ref": "2431" + } + ], + "usings": [ + { + "$ref": "2438" + } + ], + "locals": { + "duplicates": {} + }, + "inScopeNamespaces": [ + { + "$ref": "2431" + }, + { + "$ref": "2433" + } + ], + "parseDiagnostics": [], + "comments": [], + "printable": true, + "parseOptions": {}, + "pos": 0, + "end": 891, + "flags": 0, + "symbol": { + "declarations": [], + "node": { + "$ref": "2435" + }, + "name": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/spector/lib/main.tsp", + "exports": { + "duplicates": {} + }, + "flags": 32768, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "symbol": { + "declarations": [ + { + "$ref": "2433" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + } + } + } + ], + "name": "Spector", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2433" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 180 + } + }, + "parameters": [ + { + "$id": "2502", + "kind": 27, + "id": { + "$id": "2503", + "kind": 3, + "sv": "route", + "pos": 361, + "end": 366, + "flags": 0, + "parent": { + "$ref": "2502" + }, + "_id": 835 + }, + "type": { + "$id": "2504", + "kind": 44, + "target": { + "$id": "2505", + "kind": 45, + "target": { + "$id": "2506", + "kind": 3, + "sv": "string", + "pos": 376, + "end": 382, + "flags": 1, + "parent": { + "$ref": "2505" + }, + "_id": 837 + }, + "arguments": [], + "pos": 376, + "end": 382, + "flags": 1, + "parent": { + "$ref": "2504" + }, + "_id": 836 + }, + "pos": 368, + "end": 382, + "flags": 0, + "parent": { + "$ref": "2502" + } + }, + "optional": false, + "rest": false, + "pos": 361, + "end": 382, + "flags": 0, + "parent": { + "$ref": "2424" + }, + "symbol": { + "declarations": [ + { + "$ref": "2502" + } + ], + "name": "route", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "2431" + } + ], + "name": "Spector", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2433" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 181 + } + }, + { + "$id": "2507", + "kind": 27, + "id": { + "$id": "2508", + "kind": 3, + "sv": "options", + "pos": 386, + "end": 393, + "flags": 0, + "parent": { + "$ref": "2507" + }, + "_id": 838 + }, + "type": { + "$id": "2509", + "kind": 45, + "target": { + "$id": "2510", + "kind": 3, + "sv": "ScenarioServiceOptions", + "pos": 396, + "end": 418, + "flags": 1, + "parent": { + "$ref": "2509" + }, + "_id": 840 + }, + "arguments": [], + "pos": 396, + "end": 418, + "flags": 1, + "parent": { + "$ref": "2507" + }, + "_id": 839 + }, + "optional": true, + "rest": false, + "pos": 386, + "end": 418, + "flags": 0, + "parent": { + "$ref": "2424" + }, + "symbol": { + "declarations": [ + { + "$ref": "2507" + } + ], + "name": "options", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "2431" + } + ], + "name": "Spector", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2433" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 182 + } + } + ], + "pos": 231, + "end": 421, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2511", + "kind": 51, + "content": [ + { + "$id": "2512", + "kind": 52, + "text": "Setup the boilerplate for a scenario service(server endpoint, etc.)", + "pos": 234, + "end": 307, + "flags": 0, + "parent": { + "$ref": "2511" + } + } + ], + "tags": [], + "pos": 231, + "end": 309, + "flags": 0, + "parent": { + "$ref": "2424" + } + } + ], + "parent": { + "$ref": "2435" + }, + "symbol": { + "declarations": [ + { + "$ref": "2424" + } + ], + "name": "@scenarioService", + "flags": 1049088, + "parent": { + "declarations": [ + { + "$ref": "2431" + } + ], + "name": "Spector", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2433" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "target": { + "$id": "2513", + "kind": "FunctionParameter", + "node": { + "$ref": "2427" + }, + "name": "target", + "optional": false, + "rest": false, + "type": { + "entityKind": "MixedParameterConstraint", + "node": { + "$ref": "2429" + }, + "type": { + "$id": "2514", + "kind": "Model", + "name": "Namespace", + "node": { + "$ref": "2009" + }, + "properties": {}, + "namespace": { + "$ref": "2022" + }, + "decorators": [], + "sourceModels": [], + "derivedModels": [], + "isFinished": true, + "entityKind": "Type", + "symbol": { + "declarations": [], + "node": { + "$ref": "2009" + }, + "name": "Namespace", + "members": { + "duplicates": {} + }, + "flags": 4194306, + "metatypeMembers": { + "duplicates": {} + }, + "type": { + "$ref": "2514" + } + } + } + }, + "mixed": true, + "isFinished": false, + "creating": true, + "entityKind": "Type" + }, + "parameters": [ + { + "$id": "2515", + "kind": "FunctionParameter", + "node": { + "$ref": "2502" + }, + "name": "route", + "optional": false, + "rest": false, + "type": { + "entityKind": "MixedParameterConstraint", + "node": { + "$ref": "2504" + }, + "valueType": { + "$ref": "463" + } + }, + "mixed": true, + "isFinished": false, + "creating": true, + "entityKind": "Type" + }, + { + "$id": "2516", + "kind": "FunctionParameter", + "node": { + "$ref": "2507" + }, + "name": "options", + "optional": true, + "rest": false, + "type": { + "entityKind": "MixedParameterConstraint", + "node": { + "$ref": "2509" + }, + "type": { + "$id": "2517", + "kind": "Model", + "node": { + "$ref": "2444" + }, + "name": "", + "namespace": { + "$ref": "2417" + }, + "properties": {}, + "decorators": [], + "derivedModels": [], + "sourceModels": [], + "isFinished": true, + "entityKind": "Type" + } + }, + "mixed": true, + "isFinished": false, + "creating": true, + "entityKind": "Type" + } + ], + "isFinished": false, + "creating": true, + "entityKind": "Type" + }, + "node": { + "$ref": "2078" + }, + "args": [ + { + "value": { + "entityKind": "Value", + "valueKind": "StringValue", + "value": "/type/file", + "type": { + "$ref": "463" + }, + "scalar": { + "$ref": "463" + } + }, + "node": { + "$ref": "2079" + }, + "jsValue": "/type/file" + } + ] + }, + { + "definition": { + "$id": "2518", + "kind": "Decorator", + "name": "@doc", + "namespace": { + "$ref": "719" + }, + "node": { + "$ref": "911" + }, + "target": { + "$id": "2519", + "kind": "FunctionParameter", + "node": { + "$ref": "914" + }, + "name": "target", + "optional": false, + "rest": false, + "type": { + "entityKind": "MixedParameterConstraint", + "node": { + "$ref": "916" + }, + "type": { + "$ref": "1985" + } + }, + "mixed": true, + "isFinished": false, + "creating": true, + "entityKind": "Type" + }, + "parameters": [ + { + "$id": "2520", + "kind": "FunctionParameter", + "node": { + "$ref": "917" + }, + "name": "doc", + "optional": false, + "rest": false, + "type": { + "entityKind": "MixedParameterConstraint", + "node": { + "$ref": "919" + }, + "valueType": { + "$ref": "463" + } + }, + "mixed": true, + "isFinished": false, + "creating": true, + "entityKind": "Type" + }, + { + "$id": "2521", + "kind": "FunctionParameter", + "node": { + "$ref": "922" + }, + "name": "formatArgs", + "optional": true, + "rest": false, + "type": { + "entityKind": "MixedParameterConstraint", + "node": { + "$ref": "924" + }, + "type": { + "$id": "2522", + "kind": "Model", + "node": { + "$ref": "924" + }, + "name": "", + "properties": {}, + "decorators": [], + "derivedModels": [], + "sourceModels": [], + "isFinished": true, + "entityKind": "Type" + } + }, + "mixed": true, + "isFinished": false, + "creating": true, + "entityKind": "Type" + } + ], + "isFinished": false, + "creating": true, + "entityKind": "Type" + }, + "node": { + "$ref": "2075" + }, + "args": [ + { + "value": { + "entityKind": "Value", + "valueKind": "StringValue", + "value": "Test for File type usage in request and response bodies", + "type": { + "$ref": "463" + }, + "scalar": { + "$ref": "463" + } + }, + "node": { + "$ref": "2076" + }, + "jsValue": "Test for File type usage in request and response bodies" + } + ] + } + ], + "isFinished": true, + "entityKind": "Type" + }, + "node": { + "$ref": "2053" + }, + "models": {}, + "scalars": {}, + "operations": {}, + "namespaces": {}, + "interfaces": {}, + "unions": {}, + "enums": {}, + "decoratorDeclarations": {}, + "functionDeclarations": {}, + "decorators": [ + { + "args": [ + { + "value": { + "$ref": "723" + }, + "jsValue": "self" + }, + { + "value": { + "$id": "2523", + "kind": "String", + "value": "Test File as request and response body with specific content type", + "isFinished": true, + "entityKind": "Type" + }, + "jsValue": "Test File as request and response body with specific content type" + } + ] + }, + { + "definition": { + "$id": "2524", + "kind": "Decorator", + "name": "@route", + "namespace": { + "$ref": "887" + }, + "node": { + "$id": "2525", + "kind": 25, + "modifiers": [ + { + "$id": "2526", + "kind": 40, + "pos": 11406, + "end": 11412, + "flags": 0, + "parent": { + "$ref": "2525" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2527", + "kind": 3, + "sv": "route", + "pos": 11417, + "end": 11422, + "flags": 0, + "parent": { + "$ref": "2525" + }, + "_id": 847 + }, + "target": { + "$id": "2528", + "kind": 27, + "id": { + "$id": "2529", + "kind": 3, + "sv": "target", + "pos": 11423, + "end": 11429, + "flags": 0, + "parent": { + "$ref": "2528" + }, + "_id": 848 + }, + "type": { + "$id": "2530", + "kind": 28, + "options": [ + { + "$id": "2531", + "kind": 45, + "target": { + "$id": "2532", + "kind": 3, + "sv": "Namespace", + "pos": 11431, + "end": 11440, + "flags": 1, + "parent": { + "$ref": "2531" + }, + "_id": 850 + }, + "arguments": [], + "pos": 11431, + "end": 11440, + "flags": 1, + "parent": { + "$ref": "2530" + }, + "_id": 849 + }, + { + "$id": "2533", + "kind": 45, + "target": { + "$id": "2534", + "kind": 3, + "sv": "Interface", + "pos": 11443, + "end": 11452, + "flags": 1, + "parent": { + "$ref": "2533" + }, + "_id": 852 + }, + "arguments": [], + "pos": 11443, + "end": 11452, + "flags": 1, + "parent": { + "$ref": "2530" + }, + "_id": 851 + }, + { + "$id": "2535", + "kind": 45, + "target": { + "$id": "2536", + "kind": 3, + "sv": "Operation", + "pos": 11455, + "end": 11464, + "flags": 1, + "parent": { + "$ref": "2535" + }, + "_id": 854 + }, + "arguments": [], + "pos": 11455, + "end": 11464, + "flags": 1, + "parent": { + "$ref": "2530" + }, + "_id": 853 + } + ], + "pos": 11431, + "end": 11464, + "flags": 0, + "parent": { + "$ref": "2528" + } + }, + "optional": false, + "rest": false, + "pos": 11423, + "end": 11464, + "flags": 0, + "parent": { + "$ref": "2525" + }, + "symbol": { + "declarations": [ + { + "$ref": "2528" + } + ], + "name": "target", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$id": "2537", + "kind": 8, + "decorators": [], + "docs": [], + "id": { + "$id": "2538", + "kind": 3, + "sv": "Http", + "pos": 19, + "end": 23, + "flags": 0, + "parent": { + "$ref": "2537" + }, + "_id": 1245 + }, + "locals": { + "duplicates": {} + }, + "directives": [], + "pos": 0, + "end": 24, + "flags": 0, + "parent": { + "$id": "2539", + "kind": 8, + "decorators": [], + "directives": [], + "id": { + "$id": "2540", + "kind": 3, + "sv": "TypeSpec", + "pos": 10, + "end": 18, + "flags": 0, + "parent": { + "$ref": "2539" + }, + "_id": 1244 + }, + "statements": { + "$ref": "2537" + }, + "locals": { + "duplicates": {} + }, + "pos": 0, + "end": 24, + "flags": 0, + "parent": { + "$id": "2541", + "kind": 0, + "statements": [ + { + "$ref": "2539" + }, + { + "$id": "2542", + "kind": 9, + "name": { + "$id": "2543", + "kind": 7, + "base": { + "$id": "2544", + "kind": 3, + "sv": "TypeSpec", + "pos": 32, + "end": 40, + "flags": 1, + "parent": { + "$ref": "2543" + }, + "_id": 10 + }, + "id": { + "$id": "2545", + "kind": 3, + "sv": "Reflection", + "pos": 41, + "end": 51, + "flags": 1, + "parent": { + "$ref": "2543" + }, + "_id": 11 + }, + "selector": ".", + "pos": 32, + "end": 51, + "flags": 1, + "parent": { + "$ref": "2542" + }, + "_id": 9 + }, + "pos": 26, + "end": 52, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2541" + } + }, + { + "$id": "2546", + "kind": 13, + "id": { + "$id": "2547", + "kind": 3, + "sv": "HeaderOptions", + "pos": 87, + "end": 100, + "flags": 0, + "parent": { + "$ref": "2546" + }, + "_id": 1062 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [ + { + "$id": "2548", + "kind": 15, + "id": { + "$id": "2549", + "kind": 3, + "sv": "name", + "pos": 162, + "end": 166, + "flags": 0, + "parent": { + "$ref": "2548" + }, + "_id": 1063 + }, + "decorators": [], + "value": { + "$id": "2550", + "kind": 45, + "target": { + "$id": "2551", + "kind": 3, + "sv": "string", + "pos": 169, + "end": 175, + "flags": 1, + "parent": { + "$ref": "2550" + }, + "_id": 1065 + }, + "arguments": [], + "pos": 169, + "end": 175, + "flags": 1, + "parent": { + "$ref": "2548" + }, + "_id": 1064 + }, + "optional": true, + "pos": 105, + "end": 175, + "flags": 0, + "docs": [ + { + "$id": "2552", + "kind": 51, + "content": [ + { + "$id": "2553", + "kind": 52, + "text": "Name of the header when sent over HTTP.", + "pos": 108, + "end": 157, + "flags": 0, + "parent": { + "$ref": "2552" + } + } + ], + "tags": [], + "pos": 105, + "end": 159, + "flags": 0, + "parent": { + "$ref": "2548" + } + } + ], + "directives": [], + "parent": { + "$ref": "2546" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2548" + }, + "name": "name", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "2546" + } + ], + "name": "HeaderOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 113 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2554", + "kind": 15, + "id": { + "$id": "2555", + "kind": 3, + "sv": "explode", + "pos": 809, + "end": 816, + "flags": 0, + "parent": { + "$ref": "2554" + }, + "_id": 1066 + }, + "decorators": [], + "value": { + "$id": "2556", + "kind": 45, + "target": { + "$id": "2557", + "kind": 3, + "sv": "boolean", + "pos": 819, + "end": 826, + "flags": 1, + "parent": { + "$ref": "2556" + }, + "_id": 1068 + }, + "arguments": [], + "pos": 819, + "end": 826, + "flags": 1, + "parent": { + "$ref": "2554" + }, + "_id": 1067 + }, + "optional": true, + "pos": 180, + "end": 826, + "flags": 0, + "docs": [ + { + "$id": "2558", + "kind": 51, + "content": [ + { + "$id": "2559", + "kind": 52, + "text": "Equivalent of adding `*` in the path parameter as per [RFC-6570](https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.3)\n\n| Style | Explode | Primitive value = 5 | Array = [3, 4, 5] | Object = {\"role\": \"admin\", \"firstName\": \"Alex\"} |\n| ------ | ------- | ------------------- | ----------------- | ----------------------------------------------- |\n| simple | false | `5 ` | `3,4,5` | `role,admin,firstName,Alex` |\n| simple | true | `5` | `3,4,5` | `role=admin,firstName=Alex` |", + "pos": 183, + "end": 804, + "flags": 0, + "parent": { + "$ref": "2558" + } + } + ], + "tags": [], + "pos": 180, + "end": 806, + "flags": 0, + "parent": { + "$ref": "2554" + } + } + ], + "directives": [], + "parent": { + "$ref": "2546" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2554" + }, + "name": "explode", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "2546" + } + ], + "name": "HeaderOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 113 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 101, + "end": 829 + }, + "pos": 54, + "end": 829, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2560", + "kind": 51, + "content": [ + { + "$id": "2561", + "kind": 52, + "text": "Header options.", + "pos": 57, + "end": 78, + "flags": 0, + "parent": { + "$ref": "2560" + } + } + ], + "tags": [], + "pos": 54, + "end": 80, + "flags": 0, + "parent": { + "$ref": "2546" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2546" + } + ], + "name": "HeaderOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 113 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2562", + "kind": 25, + "modifiers": [ + { + "$id": "2563", + "kind": 40, + "pos": 1536, + "end": 1542, + "flags": 0, + "parent": { + "$ref": "2562" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2564", + "kind": 3, + "sv": "header", + "pos": 1547, + "end": 1553, + "flags": 0, + "parent": { + "$ref": "2562" + }, + "_id": 1053 + }, + "target": { + "$id": "2565", + "kind": 27, + "id": { + "$id": "2566", + "kind": 3, + "sv": "target", + "pos": 1554, + "end": 1560, + "flags": 0, + "parent": { + "$ref": "2565" + }, + "_id": 1054 + }, + "type": { + "$id": "2567", + "kind": 45, + "target": { + "$id": "2568", + "kind": 3, + "sv": "ModelProperty", + "pos": 1562, + "end": 1575, + "flags": 1, + "parent": { + "$ref": "2567" + }, + "_id": 1056 + }, + "arguments": [], + "pos": 1562, + "end": 1575, + "flags": 1, + "parent": { + "$ref": "2565" + }, + "_id": 1055 + }, + "optional": false, + "rest": false, + "pos": 1554, + "end": 1575, + "flags": 0, + "parent": { + "$ref": "2562" + }, + "symbol": { + "declarations": [ + { + "$ref": "2565" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 434 + } + }, + "parameters": [ + { + "$id": "2569", + "kind": 27, + "id": { + "$id": "2570", + "kind": 3, + "sv": "headerNameOrOptions", + "pos": 1577, + "end": 1596, + "flags": 0, + "parent": { + "$ref": "2569" + }, + "_id": 1057 + }, + "type": { + "$id": "2571", + "kind": 44, + "target": { + "$id": "2572", + "kind": 28, + "options": [ + { + "$id": "2573", + "kind": 45, + "target": { + "$id": "2574", + "kind": 3, + "sv": "string", + "pos": 1607, + "end": 1613, + "flags": 1, + "parent": { + "$ref": "2573" + }, + "_id": 1059 + }, + "arguments": [], + "pos": 1607, + "end": 1613, + "flags": 1, + "parent": { + "$ref": "2572" + }, + "_id": 1058 + }, + { + "$id": "2575", + "kind": 45, + "target": { + "$id": "2576", + "kind": 3, + "sv": "HeaderOptions", + "pos": 1616, + "end": 1629, + "flags": 1, + "parent": { + "$ref": "2575" + }, + "_id": 1061 + }, + "arguments": [], + "pos": 1616, + "end": 1629, + "flags": 1, + "parent": { + "$ref": "2572" + }, + "_id": 1060 + } + ], + "pos": 1607, + "end": 1629, + "flags": 0, + "parent": { + "$ref": "2571" + } + }, + "pos": 1599, + "end": 1629, + "flags": 0, + "parent": { + "$ref": "2569" + } + }, + "optional": true, + "rest": false, + "pos": 1577, + "end": 1629, + "flags": 0, + "parent": { + "$ref": "2562" + }, + "symbol": { + "declarations": [ + { + "$ref": "2569" + } + ], + "name": "headerNameOrOptions", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 435 + } + } + ], + "pos": 831, + "end": 1631, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2577", + "kind": 51, + "content": [ + { + "$id": "2578", + "kind": 52, + "text": "Specify this property is to be sent or received as an HTTP header.", + "pos": 834, + "end": 911, + "flags": 0, + "parent": { + "$ref": "2577" + } + } + ], + "tags": [ + { + "$id": "2579", + "kind": 53, + "tagName": { + "$id": "2580", + "kind": 3, + "sv": "param", + "pos": 912, + "end": 917, + "flags": 0, + "parent": { + "$ref": "2579" + } + }, + "paramName": { + "$id": "2581", + "kind": 3, + "sv": "headerNameOrOptions", + "pos": 918, + "end": 937, + "flags": 0, + "parent": { + "$ref": "2579" + } + }, + "content": [ + { + "$id": "2582", + "kind": 52, + "text": "Optional name of the header when sent over HTTP or header options.\nBy default the header name will be the property name converted from camelCase to kebab-case. (e.g. `contentType` -> `content-type`)", + "pos": 938, + "end": 1147, + "flags": 0, + "parent": { + "$ref": "2579" + } + } + ], + "pos": 911, + "end": 1147, + "flags": 0, + "parent": { + "$ref": "2577" + } + }, + { + "$id": "2583", + "kind": 58, + "tagName": { + "$id": "2584", + "kind": 3, + "sv": "example", + "pos": 1148, + "end": 1155, + "flags": 0, + "parent": { + "$ref": "2583" + } + }, + "content": [ + { + "$id": "2585", + "kind": 52, + "text": "```typespec\nop read(@header accept: string): {@header(\"ETag\") eTag: string};\nop create(@header({name: \"X-Color\", format: \"csv\"}) colors: string[]): void;\n```", + "pos": 1155, + "end": 1335, + "flags": 0, + "parent": { + "$ref": "2583" + } + } + ], + "pos": 1147, + "end": 1335, + "flags": 0, + "parent": { + "$ref": "2577" + } + }, + { + "$id": "2586", + "kind": 58, + "tagName": { + "$id": "2587", + "kind": 3, + "sv": "example", + "pos": 1336, + "end": 1343, + "flags": 0, + "parent": { + "$ref": "2586" + } + }, + "content": [ + { + "$id": "2588", + "kind": 52, + "text": "Implicit header name\n\n```typespec\nop read(): {@header contentType: string}; // headerName: content-type\nop update(@header ifMatch: string): void; // headerName: if-match\n```", + "pos": 1343, + "end": 1533, + "flags": 0, + "parent": { + "$ref": "2586" + } + } + ], + "pos": 1335, + "end": 1533, + "flags": 0, + "parent": { + "$ref": "2577" + } + } + ], + "pos": 831, + "end": 1535, + "flags": 0, + "parent": { + "$ref": "2562" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2562" + } + ], + "name": "@header", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2589", + "kind": 13, + "id": { + "$id": "2590", + "kind": 3, + "sv": "CookieOptions", + "pos": 1666, + "end": 1679, + "flags": 0, + "parent": { + "$ref": "2589" + }, + "_id": 1246 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [ + { + "$id": "2591", + "kind": 15, + "id": { + "$id": "2592", + "kind": 3, + "sv": "name", + "pos": 1721, + "end": 1725, + "flags": 0, + "parent": { + "$ref": "2591" + }, + "_id": 1247 + }, + "decorators": [], + "value": { + "$id": "2593", + "kind": 45, + "target": { + "$id": "2594", + "kind": 3, + "sv": "string", + "pos": 1728, + "end": 1734, + "flags": 1, + "parent": { + "$ref": "2593" + }, + "_id": 1249 + }, + "arguments": [], + "pos": 1728, + "end": 1734, + "flags": 1, + "parent": { + "$ref": "2591" + }, + "_id": 1248 + }, + "optional": true, + "pos": 1684, + "end": 1734, + "flags": 0, + "docs": [ + { + "$id": "2595", + "kind": 51, + "content": [ + { + "$id": "2596", + "kind": 52, + "text": "Name in the cookie.", + "pos": 1687, + "end": 1716, + "flags": 0, + "parent": { + "$ref": "2595" + } + } + ], + "tags": [], + "pos": 1684, + "end": 1718, + "flags": 0, + "parent": { + "$ref": "2591" + } + } + ], + "directives": [], + "parent": { + "$ref": "2589" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2591" + }, + "name": "name", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "2589" + } + ], + "name": "CookieOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 141 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 1680, + "end": 1737 + }, + "pos": 1633, + "end": 1737, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2597", + "kind": 51, + "content": [ + { + "$id": "2598", + "kind": 52, + "text": "Cookie Options.", + "pos": 1636, + "end": 1657, + "flags": 0, + "parent": { + "$ref": "2597" + } + } + ], + "tags": [], + "pos": 1633, + "end": 1659, + "flags": 0, + "parent": { + "$ref": "2589" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2589" + } + ], + "name": "CookieOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 141 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2599", + "kind": 25, + "modifiers": [ + { + "$id": "2600", + "kind": 40, + "pos": 2401, + "end": 2407, + "flags": 0, + "parent": { + "$ref": "2599" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2601", + "kind": 3, + "sv": "cookie", + "pos": 2412, + "end": 2418, + "flags": 0, + "parent": { + "$ref": "2599" + }, + "_id": 1250 + }, + "target": { + "$id": "2602", + "kind": 27, + "id": { + "$id": "2603", + "kind": 3, + "sv": "target", + "pos": 2419, + "end": 2425, + "flags": 0, + "parent": { + "$ref": "2602" + }, + "_id": 1251 + }, + "type": { + "$id": "2604", + "kind": 45, + "target": { + "$id": "2605", + "kind": 3, + "sv": "ModelProperty", + "pos": 2427, + "end": 2440, + "flags": 1, + "parent": { + "$ref": "2604" + }, + "_id": 1253 + }, + "arguments": [], + "pos": 2427, + "end": 2440, + "flags": 1, + "parent": { + "$ref": "2602" + }, + "_id": 1252 + }, + "optional": false, + "rest": false, + "pos": 2419, + "end": 2440, + "flags": 0, + "parent": { + "$ref": "2599" + }, + "symbol": { + "declarations": [ + { + "$ref": "2602" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 469 + } + }, + "parameters": [ + { + "$id": "2606", + "kind": 27, + "id": { + "$id": "2607", + "kind": 3, + "sv": "cookieNameOrOptions", + "pos": 2442, + "end": 2461, + "flags": 0, + "parent": { + "$ref": "2606" + }, + "_id": 1254 + }, + "type": { + "$id": "2608", + "kind": 44, + "target": { + "$id": "2609", + "kind": 28, + "options": [ + { + "$id": "2610", + "kind": 45, + "target": { + "$id": "2611", + "kind": 3, + "sv": "string", + "pos": 2472, + "end": 2478, + "flags": 1, + "parent": { + "$ref": "2610" + }, + "_id": 1256 + }, + "arguments": [], + "pos": 2472, + "end": 2478, + "flags": 1, + "parent": { + "$ref": "2609" + }, + "_id": 1255 + }, + { + "$id": "2612", + "kind": 45, + "target": { + "$id": "2613", + "kind": 3, + "sv": "CookieOptions", + "pos": 2481, + "end": 2494, + "flags": 1, + "parent": { + "$ref": "2612" + }, + "_id": 1258 + }, + "arguments": [], + "pos": 2481, + "end": 2494, + "flags": 1, + "parent": { + "$ref": "2609" + }, + "_id": 1257 + } + ], + "pos": 2472, + "end": 2494, + "flags": 0, + "parent": { + "$ref": "2608" + } + }, + "pos": 2464, + "end": 2494, + "flags": 0, + "parent": { + "$ref": "2606" + } + }, + "optional": true, + "rest": false, + "pos": 2442, + "end": 2494, + "flags": 0, + "parent": { + "$ref": "2599" + }, + "symbol": { + "declarations": [ + { + "$ref": "2606" + } + ], + "name": "cookieNameOrOptions", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 470 + } + } + ], + "pos": 1739, + "end": 2496, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2614", + "kind": 51, + "content": [ + { + "$id": "2615", + "kind": 52, + "text": "Specify this property is to be sent or received in the cookie.", + "pos": 1742, + "end": 1815, + "flags": 0, + "parent": { + "$ref": "2614" + } + } + ], + "tags": [ + { + "$id": "2616", + "kind": 53, + "tagName": { + "$id": "2617", + "kind": 3, + "sv": "param", + "pos": 1816, + "end": 1821, + "flags": 0, + "parent": { + "$ref": "2616" + } + }, + "paramName": { + "$id": "2618", + "kind": 3, + "sv": "cookieNameOrOptions", + "pos": 1822, + "end": 1841, + "flags": 0, + "parent": { + "$ref": "2616" + } + }, + "content": [ + { + "$id": "2619", + "kind": 52, + "text": "Optional name of the cookie in the cookie or cookie options.\nBy default the cookie name will be the property name converted from camelCase to snake_case. (e.g. `authToken` -> `auth_token`)", + "pos": 1842, + "end": 2041, + "flags": 0, + "parent": { + "$ref": "2616" + } + } + ], + "pos": 1815, + "end": 2041, + "flags": 0, + "parent": { + "$ref": "2614" + } + }, + { + "$id": "2620", + "kind": 58, + "tagName": { + "$id": "2621", + "kind": 3, + "sv": "example", + "pos": 2042, + "end": 2049, + "flags": 0, + "parent": { + "$ref": "2620" + } + }, + "content": [ + { + "$id": "2622", + "kind": 52, + "text": "```typespec\nop read(@cookie token: string): {data: string[]};\nop create(@cookie({name: \"auth_token\"}) data: string[]): void;\n```", + "pos": 2049, + "end": 2200, + "flags": 0, + "parent": { + "$ref": "2620" + } + } + ], + "pos": 2041, + "end": 2200, + "flags": 0, + "parent": { + "$ref": "2614" + } + }, + { + "$id": "2623", + "kind": 58, + "tagName": { + "$id": "2624", + "kind": 3, + "sv": "example", + "pos": 2201, + "end": 2208, + "flags": 0, + "parent": { + "$ref": "2623" + } + }, + "content": [ + { + "$id": "2625", + "kind": 52, + "text": "Implicit header name\n\n```typespec\nop read(): {@cookie authToken: string}; // headerName: auth_token\nop update(@cookie AuthToken: string): void; // headerName: auth_token\n```", + "pos": 2208, + "end": 2398, + "flags": 0, + "parent": { + "$ref": "2623" + } + } + ], + "pos": 2200, + "end": 2398, + "flags": 0, + "parent": { + "$ref": "2614" + } + } + ], + "pos": 1739, + "end": 2400, + "flags": 0, + "parent": { + "$ref": "2599" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2599" + } + ], + "name": "@cookie", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2626", + "kind": 13, + "id": { + "$id": "2627", + "kind": 3, + "sv": "QueryOptions", + "pos": 2540, + "end": 2552, + "flags": 0, + "parent": { + "$ref": "2626" + }, + "_id": 1259 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [ + { + "$id": "2628", + "kind": 15, + "id": { + "$id": "2629", + "kind": 3, + "sv": "name", + "pos": 2618, + "end": 2622, + "flags": 0, + "parent": { + "$ref": "2628" + }, + "_id": 1260 + }, + "decorators": [], + "value": { + "$id": "2630", + "kind": 45, + "target": { + "$id": "2631", + "kind": 3, + "sv": "string", + "pos": 2625, + "end": 2631, + "flags": 1, + "parent": { + "$ref": "2630" + }, + "_id": 1262 + }, + "arguments": [], + "pos": 2625, + "end": 2631, + "flags": 1, + "parent": { + "$ref": "2628" + }, + "_id": 1261 + }, + "optional": true, + "pos": 2557, + "end": 2631, + "flags": 0, + "docs": [ + { + "$id": "2632", + "kind": 51, + "content": [ + { + "$id": "2633", + "kind": 52, + "text": "Name of the query when included in the url.", + "pos": 2560, + "end": 2613, + "flags": 0, + "parent": { + "$ref": "2632" + } + } + ], + "tags": [], + "pos": 2557, + "end": 2615, + "flags": 0, + "parent": { + "$ref": "2628" + } + } + ], + "directives": [], + "parent": { + "$ref": "2626" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2628" + }, + "name": "name", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "2626" + } + ], + "name": "QueryOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 142 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2634", + "kind": 15, + "id": { + "$id": "2635", + "kind": 3, + "sv": "explode", + "pos": 3461, + "end": 3468, + "flags": 0, + "parent": { + "$ref": "2634" + }, + "_id": 1263 + }, + "decorators": [], + "value": { + "$id": "2636", + "kind": 45, + "target": { + "$id": "2637", + "kind": 3, + "sv": "boolean", + "pos": 3471, + "end": 3478, + "flags": 1, + "parent": { + "$ref": "2636" + }, + "_id": 1265 + }, + "arguments": [], + "pos": 3471, + "end": 3478, + "flags": 1, + "parent": { + "$ref": "2634" + }, + "_id": 1264 + }, + "optional": true, + "pos": 2636, + "end": 3478, + "flags": 0, + "docs": [ + { + "$id": "2638", + "kind": 51, + "content": [ + { + "$id": "2639", + "kind": 52, + "text": "If true send each value in the array/object as a separate query parameter.\nEquivalent of adding `*` in the path parameter as per [RFC-6570](https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.3)\n\n| Style | Explode | Uri Template | Primitive value id = 5 | Array id = [3, 4, 5] | Object id = {\"role\": \"admin\", \"firstName\": \"Alex\"} |\n| ------ | ------- | -------------- | ---------------------- | ----------------------- | -------------------------------------------------- |\n| simple | false | `/users{?id}` | `/users?id=5` | `/users?id=3,4,5` | `/users?id=role,admin,firstName,Alex` |\n| simple | true | `/users{?id*}` | `/users?id=5` | `/users?id=3&id=4&id=5` | `/users?role=admin&firstName=Alex` |", + "pos": 2639, + "end": 3456, + "flags": 0, + "parent": { + "$ref": "2638" + } + } + ], + "tags": [], + "pos": 2636, + "end": 3458, + "flags": 0, + "parent": { + "$ref": "2634" + } + } + ], + "directives": [], + "parent": { + "$ref": "2626" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2634" + }, + "name": "explode", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "2626" + } + ], + "name": "QueryOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 142 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 2553, + "end": 3481 + }, + "pos": 2498, + "end": 3481, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2640", + "kind": 51, + "content": [ + { + "$id": "2641", + "kind": 52, + "text": "Query parameter options.", + "pos": 2501, + "end": 2531, + "flags": 0, + "parent": { + "$ref": "2640" + } + } + ], + "tags": [], + "pos": 2498, + "end": 2533, + "flags": 0, + "parent": { + "$ref": "2626" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2626" + } + ], + "name": "QueryOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 142 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2642", + "kind": 25, + "modifiers": [ + { + "$id": "2643", + "kind": 40, + "pos": 3851, + "end": 3857, + "flags": 0, + "parent": { + "$ref": "2642" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2644", + "kind": 3, + "sv": "query", + "pos": 3862, + "end": 3867, + "flags": 0, + "parent": { + "$ref": "2642" + }, + "_id": 1266 + }, + "target": { + "$id": "2645", + "kind": 27, + "id": { + "$id": "2646", + "kind": 3, + "sv": "target", + "pos": 3868, + "end": 3874, + "flags": 0, + "parent": { + "$ref": "2645" + }, + "_id": 1267 + }, + "type": { + "$id": "2647", + "kind": 45, + "target": { + "$id": "2648", + "kind": 3, + "sv": "ModelProperty", + "pos": 3876, + "end": 3889, + "flags": 1, + "parent": { + "$ref": "2647" + }, + "_id": 1269 + }, + "arguments": [], + "pos": 3876, + "end": 3889, + "flags": 1, + "parent": { + "$ref": "2645" + }, + "_id": 1268 + }, + "optional": false, + "rest": false, + "pos": 3868, + "end": 3889, + "flags": 0, + "parent": { + "$ref": "2642" + }, + "symbol": { + "declarations": [ + { + "$ref": "2645" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 474 + } + }, + "parameters": [ + { + "$id": "2649", + "kind": 27, + "id": { + "$id": "2650", + "kind": 3, + "sv": "queryNameOrOptions", + "pos": 3891, + "end": 3909, + "flags": 0, + "parent": { + "$ref": "2649" + }, + "_id": 1270 + }, + "type": { + "$id": "2651", + "kind": 44, + "target": { + "$id": "2652", + "kind": 28, + "options": [ + { + "$id": "2653", + "kind": 45, + "target": { + "$id": "2654", + "kind": 3, + "sv": "string", + "pos": 3920, + "end": 3926, + "flags": 1, + "parent": { + "$ref": "2653" + }, + "_id": 1272 + }, + "arguments": [], + "pos": 3920, + "end": 3926, + "flags": 1, + "parent": { + "$ref": "2652" + }, + "_id": 1271 + }, + { + "$id": "2655", + "kind": 45, + "target": { + "$id": "2656", + "kind": 3, + "sv": "QueryOptions", + "pos": 3929, + "end": 3941, + "flags": 1, + "parent": { + "$ref": "2655" + }, + "_id": 1274 + }, + "arguments": [], + "pos": 3929, + "end": 3941, + "flags": 1, + "parent": { + "$ref": "2652" + }, + "_id": 1273 + } + ], + "pos": 3920, + "end": 3941, + "flags": 0, + "parent": { + "$ref": "2651" + } + }, + "pos": 3912, + "end": 3941, + "flags": 0, + "parent": { + "$ref": "2649" + } + }, + "optional": true, + "rest": false, + "pos": 3891, + "end": 3941, + "flags": 0, + "parent": { + "$ref": "2642" + }, + "symbol": { + "declarations": [ + { + "$ref": "2649" + } + ], + "name": "queryNameOrOptions", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 475 + } + } + ], + "pos": 3483, + "end": 3943, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2657", + "kind": 51, + "content": [ + { + "$id": "2658", + "kind": 52, + "text": "Specify this property is to be sent as a query parameter.", + "pos": 3486, + "end": 3554, + "flags": 0, + "parent": { + "$ref": "2657" + } + } + ], + "tags": [ + { + "$id": "2659", + "kind": 53, + "tagName": { + "$id": "2660", + "kind": 3, + "sv": "param", + "pos": 3555, + "end": 3560, + "flags": 0, + "parent": { + "$ref": "2659" + } + }, + "paramName": { + "$id": "2661", + "kind": 3, + "sv": "queryNameOrOptions", + "pos": 3561, + "end": 3579, + "flags": 0, + "parent": { + "$ref": "2659" + } + }, + "content": [ + { + "$id": "2662", + "kind": 52, + "text": "Optional name of the query when included in the url or query parameter options.", + "pos": 3580, + "end": 3666, + "flags": 0, + "parent": { + "$ref": "2659" + } + } + ], + "pos": 3554, + "end": 3666, + "flags": 0, + "parent": { + "$ref": "2657" + } + }, + { + "$id": "2663", + "kind": 58, + "tagName": { + "$id": "2664", + "kind": 3, + "sv": "example", + "pos": 3667, + "end": 3674, + "flags": 0, + "parent": { + "$ref": "2663" + } + }, + "content": [ + { + "$id": "2665", + "kind": 52, + "text": "```typespec\nop read(@query select: string, @query(\"order-by\") orderBy: string): void;\nop list(@query(#{name: \"id\", explode: true}) ids: string[]): void;\n```", + "pos": 3674, + "end": 3848, + "flags": 0, + "parent": { + "$ref": "2663" + } + } + ], + "pos": 3666, + "end": 3848, + "flags": 0, + "parent": { + "$ref": "2657" + } + } + ], + "pos": 3483, + "end": 3850, + "flags": 0, + "parent": { + "$ref": "2642" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2642" + } + ], + "name": "@query", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2666", + "kind": 13, + "id": { + "$id": "2667", + "kind": 3, + "sv": "PathOptions", + "pos": 3951, + "end": 3962, + "flags": 0, + "parent": { + "$ref": "2666" + }, + "_id": 1275 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [ + { + "$id": "2668", + "kind": 15, + "id": { + "$id": "2669", + "kind": 3, + "sv": "name", + "pos": 4019, + "end": 4023, + "flags": 0, + "parent": { + "$ref": "2668" + }, + "_id": 1276 + }, + "decorators": [], + "value": { + "$id": "2670", + "kind": 45, + "target": { + "$id": "2671", + "kind": 3, + "sv": "string", + "pos": 4026, + "end": 4032, + "flags": 1, + "parent": { + "$ref": "2670" + }, + "_id": 1278 + }, + "arguments": [], + "pos": 4026, + "end": 4032, + "flags": 1, + "parent": { + "$ref": "2668" + }, + "_id": 1277 + }, + "optional": true, + "pos": 3967, + "end": 4032, + "flags": 0, + "docs": [ + { + "$id": "2672", + "kind": 51, + "content": [ + { + "$id": "2673", + "kind": 52, + "text": "Name of the parameter in the uri template.", + "pos": 3970, + "end": 4014, + "flags": 0, + "parent": { + "$ref": "2672" + } + } + ], + "tags": [], + "pos": 3967, + "end": 4016, + "flags": 0, + "parent": { + "$ref": "2668" + } + } + ], + "directives": [], + "parent": { + "$ref": "2666" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2668" + }, + "name": "name", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "2666" + } + ], + "name": "PathOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 143 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2674", + "kind": 15, + "id": { + "$id": "2675", + "kind": 3, + "sv": "explode", + "pos": 4291, + "end": 4298, + "flags": 0, + "parent": { + "$ref": "2674" + }, + "_id": 1279 + }, + "decorators": [], + "value": { + "$id": "2676", + "kind": 45, + "target": { + "$id": "2677", + "kind": 3, + "sv": "boolean", + "pos": 4301, + "end": 4308, + "flags": 1, + "parent": { + "$ref": "2676" + }, + "_id": 1281 + }, + "arguments": [], + "pos": 4301, + "end": 4308, + "flags": 1, + "parent": { + "$ref": "2674" + }, + "_id": 1280 + }, + "optional": true, + "pos": 4037, + "end": 4308, + "flags": 0, + "docs": [ + { + "$id": "2678", + "kind": 51, + "content": [ + { + "$id": "2679", + "kind": 52, + "text": "When interpolating this parameter in the case of array or object expand each value using the given style.\nEquivalent of adding `*` in the path parameter as per [RFC-6570](https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.3)", + "pos": 4040, + "end": 4286, + "flags": 0, + "parent": { + "$ref": "2678" + } + } + ], + "tags": [], + "pos": 4037, + "end": 4288, + "flags": 0, + "parent": { + "$ref": "2674" + } + } + ], + "directives": [], + "parent": { + "$ref": "2666" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2674" + }, + "name": "explode", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "2666" + } + ], + "name": "PathOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 143 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2680", + "kind": 15, + "id": { + "$id": "2681", + "kind": 3, + "sv": "style", + "pos": 4565, + "end": 4570, + "flags": 0, + "parent": { + "$ref": "2680" + }, + "_id": 1282 + }, + "decorators": [], + "value": { + "$id": "2682", + "kind": 28, + "options": [ + { + "$id": "2683", + "kind": 32, + "value": "simple", + "pos": 4573, + "end": 4581, + "flags": 0, + "parent": { + "$ref": "2682" + } + }, + { + "$id": "2684", + "kind": 32, + "value": "label", + "pos": 4584, + "end": 4591, + "flags": 0, + "parent": { + "$ref": "2682" + } + }, + { + "$id": "2685", + "kind": 32, + "value": "matrix", + "pos": 4594, + "end": 4602, + "flags": 0, + "parent": { + "$ref": "2682" + } + }, + { + "$id": "2686", + "kind": 32, + "value": "fragment", + "pos": 4605, + "end": 4615, + "flags": 0, + "parent": { + "$ref": "2682" + } + }, + { + "$id": "2687", + "kind": 32, + "value": "path", + "pos": 4618, + "end": 4624, + "flags": 0, + "parent": { + "$ref": "2682" + } + } + ], + "pos": 4573, + "end": 4624, + "flags": 0, + "parent": { + "$ref": "2680" + } + }, + "optional": true, + "pos": 4313, + "end": 4624, + "flags": 0, + "docs": [ + { + "$id": "2688", + "kind": 51, + "content": [ + { + "$id": "2689", + "kind": 52, + "text": "Different interpolating styles for the path parameter.\n- `simple`: No special encoding.\n- `label`: Using `.` separator.\n- `matrix`: `;` as separator.\n- `fragment`: `#` as separator.\n- `path`: `/` as separator.", + "pos": 4316, + "end": 4560, + "flags": 0, + "parent": { + "$ref": "2688" + } + } + ], + "tags": [], + "pos": 4313, + "end": 4562, + "flags": 0, + "parent": { + "$ref": "2680" + } + } + ], + "directives": [], + "parent": { + "$ref": "2666" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2680" + }, + "name": "style", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "2666" + } + ], + "name": "PathOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 143 + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2690", + "kind": 15, + "id": { + "$id": "2691", + "kind": 3, + "sv": "allowReserved", + "pos": 4846, + "end": 4859, + "flags": 0, + "parent": { + "$ref": "2690" + }, + "_id": 1283 + }, + "decorators": [], + "value": { + "$id": "2692", + "kind": 45, + "target": { + "$id": "2693", + "kind": 3, + "sv": "boolean", + "pos": 4862, + "end": 4869, + "flags": 1, + "parent": { + "$ref": "2692" + }, + "_id": 1285 + }, + "arguments": [], + "pos": 4862, + "end": 4869, + "flags": 1, + "parent": { + "$ref": "2690" + }, + "_id": 1284 + }, + "optional": true, + "pos": 4629, + "end": 4869, + "flags": 0, + "docs": [ + { + "$id": "2694", + "kind": 51, + "content": [ + { + "$id": "2695", + "kind": 52, + "text": "When interpolating this parameter do not encode reserved characters.\nEquivalent of adding `+` in the path parameter as per [RFC-6570](https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.3)", + "pos": 4632, + "end": 4841, + "flags": 0, + "parent": { + "$ref": "2694" + } + } + ], + "tags": [], + "pos": 4629, + "end": 4843, + "flags": 0, + "parent": { + "$ref": "2690" + } + } + ], + "directives": [], + "parent": { + "$ref": "2666" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2690" + }, + "name": "allowReserved", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "2666" + } + ], + "name": "PathOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 143 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 3963, + "end": 4872 + }, + "pos": 3945, + "end": 4872, + "flags": 0, + "directives": [], + "docs": [], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2666" + } + ], + "name": "PathOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 143 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2696", + "kind": 25, + "modifiers": [ + { + "$id": "2697", + "kind": 40, + "pos": 5209, + "end": 5215, + "flags": 0, + "parent": { + "$ref": "2696" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2698", + "kind": 3, + "sv": "path", + "pos": 5220, + "end": 5224, + "flags": 0, + "parent": { + "$ref": "2696" + }, + "_id": 1286 + }, + "target": { + "$id": "2699", + "kind": 27, + "id": { + "$id": "2700", + "kind": 3, + "sv": "target", + "pos": 5225, + "end": 5231, + "flags": 0, + "parent": { + "$ref": "2699" + }, + "_id": 1287 + }, + "type": { + "$id": "2701", + "kind": 45, + "target": { + "$id": "2702", + "kind": 3, + "sv": "ModelProperty", + "pos": 5233, + "end": 5246, + "flags": 1, + "parent": { + "$ref": "2701" + }, + "_id": 1289 + }, + "arguments": [], + "pos": 5233, + "end": 5246, + "flags": 1, + "parent": { + "$ref": "2699" + }, + "_id": 1288 + }, + "optional": false, + "rest": false, + "pos": 5225, + "end": 5246, + "flags": 0, + "parent": { + "$ref": "2696" + }, + "symbol": { + "declarations": [ + { + "$ref": "2699" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 481 + } + }, + "parameters": [ + { + "$id": "2703", + "kind": 27, + "id": { + "$id": "2704", + "kind": 3, + "sv": "paramNameOrOptions", + "pos": 5248, + "end": 5266, + "flags": 0, + "parent": { + "$ref": "2703" + }, + "_id": 1290 + }, + "type": { + "$id": "2705", + "kind": 44, + "target": { + "$id": "2706", + "kind": 28, + "options": [ + { + "$id": "2707", + "kind": 45, + "target": { + "$id": "2708", + "kind": 3, + "sv": "string", + "pos": 5277, + "end": 5283, + "flags": 1, + "parent": { + "$ref": "2707" + }, + "_id": 1292 + }, + "arguments": [], + "pos": 5277, + "end": 5283, + "flags": 1, + "parent": { + "$ref": "2706" + }, + "_id": 1291 + }, + { + "$id": "2709", + "kind": 45, + "target": { + "$id": "2710", + "kind": 3, + "sv": "PathOptions", + "pos": 5286, + "end": 5297, + "flags": 1, + "parent": { + "$ref": "2709" + }, + "_id": 1294 + }, + "arguments": [], + "pos": 5286, + "end": 5297, + "flags": 1, + "parent": { + "$ref": "2706" + }, + "_id": 1293 + } + ], + "pos": 5277, + "end": 5297, + "flags": 0, + "parent": { + "$ref": "2705" + } + }, + "pos": 5269, + "end": 5297, + "flags": 0, + "parent": { + "$ref": "2703" + } + }, + "optional": true, + "rest": false, + "pos": 5248, + "end": 5297, + "flags": 0, + "parent": { + "$ref": "2696" + }, + "symbol": { + "declarations": [ + { + "$ref": "2703" + } + ], + "name": "paramNameOrOptions", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 482 + } + } + ], + "pos": 4874, + "end": 5299, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2711", + "kind": 51, + "content": [ + { + "$id": "2712", + "kind": 52, + "text": "Explicitly specify that this property is to be interpolated as a path parameter.", + "pos": 4877, + "end": 4968, + "flags": 0, + "parent": { + "$ref": "2711" + } + } + ], + "tags": [ + { + "$id": "2713", + "kind": 53, + "tagName": { + "$id": "2714", + "kind": 3, + "sv": "param", + "pos": 4969, + "end": 4974, + "flags": 0, + "parent": { + "$ref": "2713" + } + }, + "paramName": { + "$id": "2715", + "kind": 3, + "sv": "paramNameOrOptions", + "pos": 4975, + "end": 4993, + "flags": 0, + "parent": { + "$ref": "2713" + } + }, + "content": [ + { + "$id": "2716", + "kind": 52, + "text": "Optional name of the parameter in the uri template or options.", + "pos": 4994, + "end": 5063, + "flags": 0, + "parent": { + "$ref": "2713" + } + } + ], + "pos": 4968, + "end": 5063, + "flags": 0, + "parent": { + "$ref": "2711" + } + }, + { + "$id": "2717", + "kind": 58, + "tagName": { + "$id": "2718", + "kind": 3, + "sv": "example", + "pos": 5064, + "end": 5071, + "flags": 0, + "parent": { + "$ref": "2717" + } + }, + "content": [ + { + "$id": "2719", + "kind": 52, + "text": "```typespec\n@route(\"/read/{explicit}/things/{implicit}\")\nop read(@path explicit: string, implicit: string): void;\n```", + "pos": 5071, + "end": 5206, + "flags": 0, + "parent": { + "$ref": "2717" + } + } + ], + "pos": 5063, + "end": 5206, + "flags": 0, + "parent": { + "$ref": "2711" + } + } + ], + "pos": 4874, + "end": 5208, + "flags": 0, + "parent": { + "$ref": "2696" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2696" + } + ], + "name": "@path", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2720", + "kind": 25, + "modifiers": [ + { + "$id": "2721", + "kind": 40, + "pos": 5718, + "end": 5724, + "flags": 0, + "parent": { + "$ref": "2720" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2722", + "kind": 3, + "sv": "body", + "pos": 5729, + "end": 5733, + "flags": 0, + "parent": { + "$ref": "2720" + }, + "_id": 1042 + }, + "target": { + "$id": "2723", + "kind": 27, + "id": { + "$id": "2724", + "kind": 3, + "sv": "target", + "pos": 5734, + "end": 5740, + "flags": 0, + "parent": { + "$ref": "2723" + }, + "_id": 1043 + }, + "type": { + "$id": "2725", + "kind": 45, + "target": { + "$id": "2726", + "kind": 3, + "sv": "ModelProperty", + "pos": 5742, + "end": 5755, + "flags": 1, + "parent": { + "$ref": "2725" + }, + "_id": 1045 + }, + "arguments": [], + "pos": 5742, + "end": 5755, + "flags": 1, + "parent": { + "$ref": "2723" + }, + "_id": 1044 + }, + "optional": false, + "rest": false, + "pos": 5734, + "end": 5755, + "flags": 0, + "parent": { + "$ref": "2720" + }, + "symbol": { + "declarations": [ + { + "$ref": "2723" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 431 + } + }, + "parameters": [], + "pos": 5301, + "end": 5757, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2727", + "kind": 51, + "content": [ + { + "$id": "2728", + "kind": 52, + "text": "Explicitly specify that this property type will be exactly the HTTP body.\n\nThis means that any properties under `@body` cannot be marked as headers, query parameters, or path parameters.\nIf wanting to change the resolution of the body but still mix parameters, use `@bodyRoot`.", + "pos": 5304, + "end": 5600, + "flags": 0, + "parent": { + "$ref": "2727" + } + } + ], + "tags": [ + { + "$id": "2729", + "kind": 58, + "tagName": { + "$id": "2730", + "kind": 3, + "sv": "example", + "pos": 5601, + "end": 5608, + "flags": 0, + "parent": { + "$ref": "2729" + } + }, + "content": [ + { + "$id": "2731", + "kind": 52, + "text": "```typespec\nop upload(@body image: bytes): void;\nop download(): {@body image: bytes};\n```", + "pos": 5608, + "end": 5715, + "flags": 0, + "parent": { + "$ref": "2729" + } + } + ], + "pos": 5600, + "end": 5715, + "flags": 0, + "parent": { + "$ref": "2727" + } + } + ], + "pos": 5301, + "end": 5717, + "flags": 0, + "parent": { + "$ref": "2720" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2720" + } + ], + "name": "@body", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2732", + "kind": 25, + "modifiers": [ + { + "$id": "2733", + "kind": 40, + "pos": 6286, + "end": 6292, + "flags": 0, + "parent": { + "$ref": "2732" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2734", + "kind": 3, + "sv": "bodyRoot", + "pos": 6297, + "end": 6305, + "flags": 0, + "parent": { + "$ref": "2732" + }, + "_id": 894 + }, + "target": { + "$id": "2735", + "kind": 27, + "id": { + "$id": "2736", + "kind": 3, + "sv": "target", + "pos": 6306, + "end": 6312, + "flags": 0, + "parent": { + "$ref": "2735" + }, + "_id": 895 + }, + "type": { + "$id": "2737", + "kind": 45, + "target": { + "$id": "2738", + "kind": 3, + "sv": "ModelProperty", + "pos": 6314, + "end": 6327, + "flags": 1, + "parent": { + "$ref": "2737" + }, + "_id": 897 + }, + "arguments": [], + "pos": 6314, + "end": 6327, + "flags": 1, + "parent": { + "$ref": "2735" + }, + "_id": 896 + }, + "optional": false, + "rest": false, + "pos": 6306, + "end": 6327, + "flags": 0, + "parent": { + "$ref": "2732" + }, + "symbol": { + "declarations": [ + { + "$ref": "2735" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 403 + } + }, + "parameters": [], + "pos": 5759, + "end": 6329, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2739", + "kind": 51, + "content": [ + { + "$id": "2740", + "kind": 52, + "text": "Specify that the body resolution should be resolved from that property.\nBy default the body is resolved by including all properties in the operation request/response that are not metadata.\nThis allows to nest the body in a property while still allowing to use headers, query parameters, and path parameters in the same model.", + "pos": 5762, + "end": 6104, + "flags": 0, + "parent": { + "$ref": "2739" + } + } + ], + "tags": [ + { + "$id": "2741", + "kind": 58, + "tagName": { + "$id": "2742", + "kind": 3, + "sv": "example", + "pos": 6105, + "end": 6112, + "flags": 0, + "parent": { + "$ref": "2741" + } + }, + "content": [ + { + "$id": "2743", + "kind": 52, + "text": "```typespec\nop upload(@bodyRoot user: {name: string, @header id: string}): void;\nop download(): {@bodyRoot user: {name: string, @header id: string}};\n```", + "pos": 6112, + "end": 6283, + "flags": 0, + "parent": { + "$ref": "2741" + } + } + ], + "pos": 6104, + "end": 6283, + "flags": 0, + "parent": { + "$ref": "2739" + } + } + ], + "pos": 5759, + "end": 6285, + "flags": 0, + "parent": { + "$ref": "2732" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2732" + } + ], + "name": "@bodyRoot", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2744", + "kind": 25, + "modifiers": [ + { + "$id": "2745", + "kind": 40, + "pos": 6646, + "end": 6652, + "flags": 0, + "parent": { + "$ref": "2744" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2746", + "kind": 3, + "sv": "bodyIgnore", + "pos": 6657, + "end": 6667, + "flags": 0, + "parent": { + "$ref": "2744" + }, + "_id": 1295 + }, + "target": { + "$id": "2747", + "kind": 27, + "id": { + "$id": "2748", + "kind": 3, + "sv": "target", + "pos": 6668, + "end": 6674, + "flags": 0, + "parent": { + "$ref": "2747" + }, + "_id": 1296 + }, + "type": { + "$id": "2749", + "kind": 45, + "target": { + "$id": "2750", + "kind": 3, + "sv": "ModelProperty", + "pos": 6676, + "end": 6689, + "flags": 1, + "parent": { + "$ref": "2749" + }, + "_id": 1298 + }, + "arguments": [], + "pos": 6676, + "end": 6689, + "flags": 1, + "parent": { + "$ref": "2747" + }, + "_id": 1297 + }, + "optional": false, + "rest": false, + "pos": 6668, + "end": 6689, + "flags": 0, + "parent": { + "$ref": "2744" + }, + "symbol": { + "declarations": [ + { + "$ref": "2747" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 484 + } + }, + "parameters": [], + "pos": 6330, + "end": 6691, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2751", + "kind": 51, + "content": [ + { + "$id": "2752", + "kind": 52, + "text": "Specify that this property shouldn't be included in the HTTP body.\nThis can be useful when bundling metadata together that would result in an empty property to be included in the body.", + "pos": 6333, + "end": 6531, + "flags": 0, + "parent": { + "$ref": "2751" + } + } + ], + "tags": [ + { + "$id": "2753", + "kind": 58, + "tagName": { + "$id": "2754", + "kind": 3, + "sv": "example", + "pos": 6532, + "end": 6539, + "flags": 0, + "parent": { + "$ref": "2753" + } + }, + "content": [ + { + "$id": "2755", + "kind": 52, + "text": "```typespec\nop upload(name: string, @bodyIgnore headers: {@header id: string}): void;\n```", + "pos": 6539, + "end": 6643, + "flags": 0, + "parent": { + "$ref": "2753" + } + } + ], + "pos": 6531, + "end": 6643, + "flags": 0, + "parent": { + "$ref": "2751" + } + } + ], + "pos": 6330, + "end": 6645, + "flags": 0, + "parent": { + "$ref": "2744" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2744" + } + ], + "name": "@bodyIgnore", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2756", + "kind": 25, + "modifiers": [ + { + "$id": "2757", + "kind": 40, + "pos": 6917, + "end": 6923, + "flags": 0, + "parent": { + "$ref": "2756" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2758", + "kind": 3, + "sv": "multipartBody", + "pos": 6928, + "end": 6941, + "flags": 0, + "parent": { + "$ref": "2756" + }, + "_id": 1299 + }, + "target": { + "$id": "2759", + "kind": 27, + "id": { + "$id": "2760", + "kind": 3, + "sv": "target", + "pos": 6942, + "end": 6948, + "flags": 0, + "parent": { + "$ref": "2759" + }, + "_id": 1300 + }, + "type": { + "$id": "2761", + "kind": 45, + "target": { + "$id": "2762", + "kind": 3, + "sv": "ModelProperty", + "pos": 6950, + "end": 6963, + "flags": 1, + "parent": { + "$ref": "2761" + }, + "_id": 1302 + }, + "arguments": [], + "pos": 6950, + "end": 6963, + "flags": 1, + "parent": { + "$ref": "2759" + }, + "_id": 1301 + }, + "optional": false, + "rest": false, + "pos": 6942, + "end": 6963, + "flags": 0, + "parent": { + "$ref": "2756" + }, + "symbol": { + "declarations": [ + { + "$ref": "2759" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 486 + } + }, + "parameters": [], + "pos": 6693, + "end": 6965, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2763", + "kind": 51, + "content": [ + { + "$id": "2764", + "kind": 52, + "text": "\n", + "pos": 6696, + "end": 6700, + "flags": 0, + "parent": { + "$ref": "2763" + } + } + ], + "tags": [ + { + "$id": "2765", + "kind": 58, + "tagName": { + "$id": "2766", + "kind": 3, + "sv": "example", + "pos": 6701, + "end": 6708, + "flags": 0, + "parent": { + "$ref": "2765" + } + }, + "content": [ + { + "$id": "2767", + "kind": 52, + "text": "```tsp\nop upload(\n @header `content-type`: \"multipart/form-data\",\n @multipartBody body: {\n fullName: HttpPart,\n headShots: HttpPart[]\n }\n): void;\n```", + "pos": 6708, + "end": 6914, + "flags": 0, + "parent": { + "$ref": "2765" + } + } + ], + "pos": 6700, + "end": 6914, + "flags": 0, + "parent": { + "$ref": "2763" + } + } + ], + "pos": 6693, + "end": 6916, + "flags": 0, + "parent": { + "$ref": "2756" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2756" + } + ], + "name": "@multipartBody", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2768", + "kind": 25, + "modifiers": [ + { + "$id": "2769", + "kind": 40, + "pos": 7263, + "end": 7269, + "flags": 0, + "parent": { + "$ref": "2768" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2770", + "kind": 3, + "sv": "statusCode", + "pos": 7274, + "end": 7284, + "flags": 0, + "parent": { + "$ref": "2768" + }, + "_id": 950 + }, + "target": { + "$id": "2771", + "kind": 27, + "id": { + "$id": "2772", + "kind": 3, + "sv": "target", + "pos": 7285, + "end": 7291, + "flags": 0, + "parent": { + "$ref": "2771" + }, + "_id": 951 + }, + "type": { + "$id": "2773", + "kind": 45, + "target": { + "$id": "2774", + "kind": 3, + "sv": "ModelProperty", + "pos": 7293, + "end": 7306, + "flags": 1, + "parent": { + "$ref": "2773" + }, + "_id": 953 + }, + "arguments": [], + "pos": 7293, + "end": 7306, + "flags": 1, + "parent": { + "$ref": "2771" + }, + "_id": 952 + }, + "optional": false, + "rest": false, + "pos": 7285, + "end": 7306, + "flags": 0, + "parent": { + "$ref": "2768" + }, + "symbol": { + "declarations": [ + { + "$ref": "2771" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 406 + } + }, + "parameters": [], + "pos": 6967, + "end": 7308, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2775", + "kind": 51, + "content": [ + { + "$id": "2776", + "kind": 52, + "text": "Specify the status code for this response. Property type must be a status code integer or a union of status code integer.", + "pos": 6970, + "end": 7102, + "flags": 0, + "parent": { + "$ref": "2775" + } + } + ], + "tags": [ + { + "$id": "2777", + "kind": 58, + "tagName": { + "$id": "2778", + "kind": 3, + "sv": "example", + "pos": 7103, + "end": 7110, + "flags": 0, + "parent": { + "$ref": "2777" + } + }, + "content": [ + { + "$id": "2779", + "kind": 52, + "text": "```typespec\nop read(): {\n @statusCode _: 200;\n @body pet: Pet;\n};\nop create(): {\n @statusCode _: 201 | 202;\n};\n```", + "pos": 7110, + "end": 7260, + "flags": 0, + "parent": { + "$ref": "2777" + } + } + ], + "pos": 7102, + "end": 7260, + "flags": 0, + "parent": { + "$ref": "2775" + } + } + ], + "pos": 6967, + "end": 7262, + "flags": 0, + "parent": { + "$ref": "2768" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2768" + } + ], + "name": "@statusCode", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2780", + "kind": 25, + "modifiers": [ + { + "$id": "2781", + "kind": 40, + "pos": 7447, + "end": 7453, + "flags": 0, + "parent": { + "$ref": "2780" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2782", + "kind": 3, + "sv": "get", + "pos": 7458, + "end": 7461, + "flags": 0, + "parent": { + "$ref": "2780" + }, + "_id": 973 + }, + "target": { + "$id": "2783", + "kind": 27, + "id": { + "$id": "2784", + "kind": 3, + "sv": "target", + "pos": 7462, + "end": 7468, + "flags": 0, + "parent": { + "$ref": "2783" + }, + "_id": 974 + }, + "type": { + "$id": "2785", + "kind": 45, + "target": { + "$id": "2786", + "kind": 3, + "sv": "Operation", + "pos": 7470, + "end": 7479, + "flags": 1, + "parent": { + "$ref": "2785" + }, + "_id": 976 + }, + "arguments": [], + "pos": 7470, + "end": 7479, + "flags": 1, + "parent": { + "$ref": "2783" + }, + "_id": 975 + }, + "optional": false, + "rest": false, + "pos": 7462, + "end": 7479, + "flags": 0, + "parent": { + "$ref": "2780" + }, + "symbol": { + "declarations": [ + { + "$ref": "2783" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 421 + } + }, + "parameters": [], + "pos": 7310, + "end": 7481, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2787", + "kind": 51, + "content": [ + { + "$id": "2788", + "kind": 52, + "text": "Specify the HTTP verb for the target operation to be `GET`.", + "pos": 7313, + "end": 7383, + "flags": 0, + "parent": { + "$ref": "2787" + } + } + ], + "tags": [ + { + "$id": "2789", + "kind": 58, + "tagName": { + "$id": "2790", + "kind": 3, + "sv": "example", + "pos": 7384, + "end": 7391, + "flags": 0, + "parent": { + "$ref": "2789" + } + }, + "content": [ + { + "$id": "2791", + "kind": 52, + "text": "```typespec\n@get op read(): string\n```", + "pos": 7391, + "end": 7444, + "flags": 0, + "parent": { + "$ref": "2789" + } + } + ], + "pos": 7383, + "end": 7444, + "flags": 0, + "parent": { + "$ref": "2787" + } + } + ], + "pos": 7310, + "end": 7446, + "flags": 0, + "parent": { + "$ref": "2780" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2780" + } + ], + "name": "@get", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2792", + "kind": 25, + "modifiers": [ + { + "$id": "2793", + "kind": 40, + "pos": 7625, + "end": 7631, + "flags": 0, + "parent": { + "$ref": "2792" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2794", + "kind": 3, + "sv": "put", + "pos": 7636, + "end": 7639, + "flags": 0, + "parent": { + "$ref": "2792" + }, + "_id": 1303 + }, + "target": { + "$id": "2795", + "kind": 27, + "id": { + "$id": "2796", + "kind": 3, + "sv": "target", + "pos": 7640, + "end": 7646, + "flags": 0, + "parent": { + "$ref": "2795" + }, + "_id": 1304 + }, + "type": { + "$id": "2797", + "kind": 45, + "target": { + "$id": "2798", + "kind": 3, + "sv": "Operation", + "pos": 7648, + "end": 7657, + "flags": 1, + "parent": { + "$ref": "2797" + }, + "_id": 1306 + }, + "arguments": [], + "pos": 7648, + "end": 7657, + "flags": 1, + "parent": { + "$ref": "2795" + }, + "_id": 1305 + }, + "optional": false, + "rest": false, + "pos": 7640, + "end": 7657, + "flags": 0, + "parent": { + "$ref": "2792" + }, + "symbol": { + "declarations": [ + { + "$ref": "2795" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 488 + } + }, + "parameters": [], + "pos": 7483, + "end": 7659, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2799", + "kind": 51, + "content": [ + { + "$id": "2800", + "kind": 52, + "text": "Specify the HTTP verb for the target operation to be `PUT`.", + "pos": 7486, + "end": 7556, + "flags": 0, + "parent": { + "$ref": "2799" + } + } + ], + "tags": [ + { + "$id": "2801", + "kind": 58, + "tagName": { + "$id": "2802", + "kind": 3, + "sv": "example", + "pos": 7557, + "end": 7564, + "flags": 0, + "parent": { + "$ref": "2801" + } + }, + "content": [ + { + "$id": "2803", + "kind": 52, + "text": "```typespec\n@put op set(pet: Pet): void\n```", + "pos": 7564, + "end": 7622, + "flags": 0, + "parent": { + "$ref": "2801" + } + } + ], + "pos": 7556, + "end": 7622, + "flags": 0, + "parent": { + "$ref": "2799" + } + } + ], + "pos": 7483, + "end": 7624, + "flags": 0, + "parent": { + "$ref": "2792" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2792" + } + ], + "name": "@put", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2804", + "kind": 25, + "modifiers": [ + { + "$id": "2805", + "kind": 40, + "pos": 7808, + "end": 7814, + "flags": 0, + "parent": { + "$ref": "2804" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2806", + "kind": 3, + "sv": "post", + "pos": 7819, + "end": 7823, + "flags": 0, + "parent": { + "$ref": "2804" + }, + "_id": 887 + }, + "target": { + "$id": "2807", + "kind": 27, + "id": { + "$id": "2808", + "kind": 3, + "sv": "target", + "pos": 7824, + "end": 7830, + "flags": 0, + "parent": { + "$ref": "2807" + }, + "_id": 888 + }, + "type": { + "$id": "2809", + "kind": 45, + "target": { + "$id": "2810", + "kind": 3, + "sv": "Operation", + "pos": 7832, + "end": 7841, + "flags": 1, + "parent": { + "$ref": "2809" + }, + "_id": 890 + }, + "arguments": [], + "pos": 7832, + "end": 7841, + "flags": 1, + "parent": { + "$ref": "2807" + }, + "_id": 889 + }, + "optional": false, + "rest": false, + "pos": 7824, + "end": 7841, + "flags": 0, + "parent": { + "$ref": "2804" + }, + "symbol": { + "declarations": [ + { + "$ref": "2807" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 416 + } + }, + "parameters": [], + "pos": 7661, + "end": 7843, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2811", + "kind": 51, + "content": [ + { + "$id": "2812", + "kind": 52, + "text": "Specify the HTTP verb for the target operation to be `POST`.", + "pos": 7664, + "end": 7735, + "flags": 0, + "parent": { + "$ref": "2811" + } + } + ], + "tags": [ + { + "$id": "2813", + "kind": 58, + "tagName": { + "$id": "2814", + "kind": 3, + "sv": "example", + "pos": 7736, + "end": 7743, + "flags": 0, + "parent": { + "$ref": "2813" + } + }, + "content": [ + { + "$id": "2815", + "kind": 52, + "text": "```typespec\n@post op create(pet: Pet): void\n```", + "pos": 7743, + "end": 7805, + "flags": 0, + "parent": { + "$ref": "2813" + } + } + ], + "pos": 7735, + "end": 7805, + "flags": 0, + "parent": { + "$ref": "2811" + } + } + ], + "pos": 7661, + "end": 7807, + "flags": 0, + "parent": { + "$ref": "2804" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2804" + } + ], + "name": "@post", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2816", + "kind": 13, + "id": { + "$id": "2817", + "kind": 3, + "sv": "PatchOptions", + "pos": 7892, + "end": 7904, + "flags": 0, + "parent": { + "$ref": "2816" + }, + "_id": 1307 + }, + "templateParameters": [], + "templateParametersRange": { + "pos": -1, + "end": -1 + }, + "decorators": [], + "properties": [ + { + "$id": "2818", + "kind": 15, + "id": { + "$id": "2819", + "kind": 3, + "sv": "implicitOptionality", + "pos": 8040, + "end": 8059, + "flags": 0, + "parent": { + "$ref": "2818" + }, + "_id": 1308 + }, + "decorators": [], + "value": { + "$id": "2820", + "kind": 45, + "target": { + "$id": "2821", + "kind": 3, + "sv": "boolean", + "pos": 8062, + "end": 8069, + "flags": 1, + "parent": { + "$ref": "2820" + }, + "_id": 1310 + }, + "arguments": [], + "pos": 8062, + "end": 8069, + "flags": 1, + "parent": { + "$ref": "2818" + }, + "_id": 1309 + }, + "optional": true, + "pos": 7909, + "end": 8069, + "flags": 0, + "docs": [ + { + "$id": "2822", + "kind": 51, + "content": [ + { + "$id": "2823", + "kind": 52, + "text": "If set to `false`, disables the implicit transform that makes the body of a\nPATCH operation deeply optional.", + "pos": 7912, + "end": 8035, + "flags": 0, + "parent": { + "$ref": "2822" + } + } + ], + "tags": [], + "pos": 7909, + "end": 8037, + "flags": 0, + "parent": { + "$ref": "2818" + } + } + ], + "directives": [], + "parent": { + "$ref": "2816" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2818" + }, + "name": "implicitOptionality", + "flags": 65536, + "parent": { + "declarations": [ + { + "$ref": "2816" + } + ], + "name": "PatchOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 144 + }, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "bodyRange": { + "pos": 7905, + "end": 8072 + }, + "pos": 7845, + "end": 8072, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2824", + "kind": 51, + "content": [ + { + "$id": "2825", + "kind": 52, + "text": "Options for PATCH operations.", + "pos": 7848, + "end": 7883, + "flags": 0, + "parent": { + "$ref": "2824" + } + } + ], + "tags": [], + "pos": 7845, + "end": 7885, + "flags": 0, + "parent": { + "$ref": "2816" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2816" + } + ], + "name": "PatchOptions", + "members": { + "duplicates": {} + }, + "flags": 1048578, + "metatypeMembers": { + "duplicates": {} + }, + "id": 144 + }, + "locals": { + "duplicates": {} + } + }, + { + "$id": "2826", + "kind": 25, + "modifiers": [ + { + "$id": "2827", + "kind": 40, + "pos": 8520, + "end": 8526, + "flags": 0, + "parent": { + "$ref": "2826" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2828", + "kind": 3, + "sv": "patch", + "pos": 8531, + "end": 8536, + "flags": 0, + "parent": { + "$ref": "2826" + }, + "_id": 1311 + }, + "target": { + "$id": "2829", + "kind": 27, + "id": { + "$id": "2830", + "kind": 3, + "sv": "target", + "pos": 8537, + "end": 8543, + "flags": 0, + "parent": { + "$ref": "2829" + }, + "_id": 1312 + }, + "type": { + "$id": "2831", + "kind": 45, + "target": { + "$id": "2832", + "kind": 3, + "sv": "Operation", + "pos": 8545, + "end": 8554, + "flags": 1, + "parent": { + "$ref": "2831" + }, + "_id": 1314 + }, + "arguments": [], + "pos": 8545, + "end": 8554, + "flags": 1, + "parent": { + "$ref": "2829" + }, + "_id": 1313 + }, + "optional": false, + "rest": false, + "pos": 8537, + "end": 8554, + "flags": 0, + "parent": { + "$ref": "2826" + }, + "symbol": { + "declarations": [ + { + "$ref": "2829" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 491 + } + }, + "parameters": [ + { + "$id": "2833", + "kind": 27, + "id": { + "$id": "2834", + "kind": 3, + "sv": "options", + "pos": 8556, + "end": 8563, + "flags": 0, + "parent": { + "$ref": "2833" + }, + "_id": 1315 + }, + "type": { + "$id": "2835", + "kind": 44, + "target": { + "$id": "2836", + "kind": 45, + "target": { + "$id": "2837", + "kind": 3, + "sv": "PatchOptions", + "pos": 8574, + "end": 8586, + "flags": 1, + "parent": { + "$ref": "2836" + }, + "_id": 1317 + }, + "arguments": [], + "pos": 8574, + "end": 8586, + "flags": 1, + "parent": { + "$ref": "2835" + }, + "_id": 1316 + }, + "pos": 8566, + "end": 8586, + "flags": 0, + "parent": { + "$ref": "2833" + } + }, + "optional": true, + "rest": false, + "pos": 8556, + "end": 8586, + "flags": 0, + "parent": { + "$ref": "2826" + }, + "symbol": { + "declarations": [ + { + "$ref": "2833" + } + ], + "name": "options", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 492 + } + } + ], + "pos": 8074, + "end": 8588, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2838", + "kind": 51, + "content": [ + { + "$id": "2839", + "kind": 52, + "text": "Specify the HTTP verb for the target operation to be `PATCH`.", + "pos": 8077, + "end": 8149, + "flags": 0, + "parent": { + "$ref": "2838" + } + } + ], + "tags": [ + { + "$id": "2840", + "kind": 53, + "tagName": { + "$id": "2841", + "kind": 3, + "sv": "param", + "pos": 8150, + "end": 8155, + "flags": 0, + "parent": { + "$ref": "2840" + } + }, + "paramName": { + "$id": "2842", + "kind": 3, + "sv": "options", + "pos": 8156, + "end": 8163, + "flags": 0, + "parent": { + "$ref": "2840" + } + }, + "content": [ + { + "$id": "2843", + "kind": 52, + "text": "Options for the PATCH operation.", + "pos": 8164, + "end": 8203, + "flags": 0, + "parent": { + "$ref": "2840" + } + } + ], + "pos": 8149, + "end": 8203, + "flags": 0, + "parent": { + "$ref": "2838" + } + }, + { + "$id": "2844", + "kind": 58, + "tagName": { + "$id": "2845", + "kind": 3, + "sv": "example", + "pos": 8204, + "end": 8211, + "flags": 0, + "parent": { + "$ref": "2844" + } + }, + "content": [ + { + "$id": "2846", + "kind": 52, + "text": "```typespec\n@patch op update(pet: Pet): void;\n```", + "pos": 8211, + "end": 8280, + "flags": 0, + "parent": { + "$ref": "2844" + } + } + ], + "pos": 8203, + "end": 8280, + "flags": 0, + "parent": { + "$ref": "2838" + } + }, + { + "$id": "2847", + "kind": 58, + "tagName": { + "$id": "2848", + "kind": 3, + "sv": "example", + "pos": 8281, + "end": 8288, + "flags": 0, + "parent": { + "$ref": "2847" + } + }, + "content": [ + { + "$id": "2849", + "kind": 52, + "text": "```typespec\n// Disable implicit optionality, making the body of the PATCH operation use the\n// optionality as defined in the `Pet` model.\n@patch(#{ implicitOptionality: false })\nop update(pet: Pet): void;\n```", + "pos": 8288, + "end": 8517, + "flags": 0, + "parent": { + "$ref": "2847" + } + } + ], + "pos": 8280, + "end": 8517, + "flags": 0, + "parent": { + "$ref": "2838" + } + } + ], + "pos": 8074, + "end": 8519, + "flags": 0, + "parent": { + "$ref": "2826" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2826" + } + ], + "name": "@patch", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2850", + "kind": 25, + "modifiers": [ + { + "$id": "2851", + "kind": 40, + "pos": 8743, + "end": 8749, + "flags": 0, + "parent": { + "$ref": "2850" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2852", + "kind": 3, + "sv": "delete", + "pos": 8754, + "end": 8760, + "flags": 0, + "parent": { + "$ref": "2850" + }, + "_id": 1318 + }, + "target": { + "$id": "2853", + "kind": 27, + "id": { + "$id": "2854", + "kind": 3, + "sv": "target", + "pos": 8761, + "end": 8767, + "flags": 0, + "parent": { + "$ref": "2853" + }, + "_id": 1319 + }, + "type": { + "$id": "2855", + "kind": 45, + "target": { + "$id": "2856", + "kind": 3, + "sv": "Operation", + "pos": 8769, + "end": 8778, + "flags": 1, + "parent": { + "$ref": "2855" + }, + "_id": 1321 + }, + "arguments": [], + "pos": 8769, + "end": 8778, + "flags": 1, + "parent": { + "$ref": "2853" + }, + "_id": 1320 + }, + "optional": false, + "rest": false, + "pos": 8761, + "end": 8778, + "flags": 0, + "parent": { + "$ref": "2850" + }, + "symbol": { + "declarations": [ + { + "$ref": "2853" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 494 + } + }, + "parameters": [], + "pos": 8590, + "end": 8780, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2857", + "kind": 51, + "content": [ + { + "$id": "2858", + "kind": 52, + "text": "Specify the HTTP verb for the target operation to be `DELETE`.", + "pos": 8593, + "end": 8666, + "flags": 0, + "parent": { + "$ref": "2857" + } + } + ], + "tags": [ + { + "$id": "2859", + "kind": 58, + "tagName": { + "$id": "2860", + "kind": 3, + "sv": "example", + "pos": 8667, + "end": 8674, + "flags": 0, + "parent": { + "$ref": "2859" + } + }, + "content": [ + { + "$id": "2861", + "kind": 52, + "text": "```typespec\n@delete op set(petId: string): void\n```", + "pos": 8674, + "end": 8740, + "flags": 0, + "parent": { + "$ref": "2859" + } + } + ], + "pos": 8666, + "end": 8740, + "flags": 0, + "parent": { + "$ref": "2857" + } + } + ], + "pos": 8590, + "end": 8742, + "flags": 0, + "parent": { + "$ref": "2850" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2850" + } + ], + "name": "@delete", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2862", + "kind": 25, + "modifiers": [ + { + "$id": "2863", + "kind": 40, + "pos": 8929, + "end": 8935, + "flags": 0, + "parent": { + "$ref": "2862" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2864", + "kind": 3, + "sv": "head", + "pos": 8940, + "end": 8944, + "flags": 0, + "parent": { + "$ref": "2862" + }, + "_id": 1322 + }, + "target": { + "$id": "2865", + "kind": 27, + "id": { + "$id": "2866", + "kind": 3, + "sv": "target", + "pos": 8945, + "end": 8951, + "flags": 0, + "parent": { + "$ref": "2865" + }, + "_id": 1323 + }, + "type": { + "$id": "2867", + "kind": 45, + "target": { + "$id": "2868", + "kind": 3, + "sv": "Operation", + "pos": 8953, + "end": 8962, + "flags": 1, + "parent": { + "$ref": "2867" + }, + "_id": 1325 + }, + "arguments": [], + "pos": 8953, + "end": 8962, + "flags": 1, + "parent": { + "$ref": "2865" + }, + "_id": 1324 + }, + "optional": false, + "rest": false, + "pos": 8945, + "end": 8962, + "flags": 0, + "parent": { + "$ref": "2862" + }, + "symbol": { + "declarations": [ + { + "$ref": "2865" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 496 + } + }, + "parameters": [], + "pos": 8782, + "end": 8964, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2869", + "kind": 51, + "content": [ + { + "$id": "2870", + "kind": 52, + "text": "Specify the HTTP verb for the target operation to be `HEAD`.", + "pos": 8785, + "end": 8853, + "flags": 0, + "parent": { + "$ref": "2869" + } + } + ], + "tags": [ + { + "$id": "2871", + "kind": 58, + "tagName": { + "$id": "2872", + "kind": 3, + "sv": "example", + "pos": 8854, + "end": 8861, + "flags": 0, + "parent": { + "$ref": "2871" + } + }, + "content": [ + { + "$id": "2873", + "kind": 52, + "text": "```typespec\n@head op ping(petId: string): void\n```", + "pos": 8861, + "end": 8926, + "flags": 0, + "parent": { + "$ref": "2871" + } + } + ], + "pos": 8853, + "end": 8926, + "flags": 0, + "parent": { + "$ref": "2869" + } + } + ], + "pos": 8782, + "end": 8928, + "flags": 0, + "parent": { + "$ref": "2862" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2862" + } + ], + "name": "@head", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2874", + "kind": 25, + "modifiers": [ + { + "$id": "2875", + "kind": 40, + "pos": 9943, + "end": 9949, + "flags": 0, + "parent": { + "$ref": "2874" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2876", + "kind": 3, + "sv": "server", + "pos": 9954, + "end": 9960, + "flags": 0, + "parent": { + "$ref": "2874" + }, + "_id": 1326 + }, + "target": { + "$id": "2877", + "kind": 27, + "id": { + "$id": "2878", + "kind": 3, + "sv": "target", + "pos": 9964, + "end": 9970, + "flags": 0, + "parent": { + "$ref": "2877" + }, + "_id": 1327 + }, + "type": { + "$id": "2879", + "kind": 45, + "target": { + "$id": "2880", + "kind": 3, + "sv": "Namespace", + "pos": 9972, + "end": 9981, + "flags": 1, + "parent": { + "$ref": "2879" + }, + "_id": 1329 + }, + "arguments": [], + "pos": 9972, + "end": 9981, + "flags": 1, + "parent": { + "$ref": "2877" + }, + "_id": 1328 + }, + "optional": false, + "rest": false, + "pos": 9964, + "end": 9981, + "flags": 0, + "parent": { + "$ref": "2874" + }, + "symbol": { + "declarations": [ + { + "$ref": "2877" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 498 + } + }, + "parameters": [ + { + "$id": "2881", + "kind": 27, + "id": { + "$id": "2882", + "kind": 3, + "sv": "url", + "pos": 9985, + "end": 9988, + "flags": 0, + "parent": { + "$ref": "2881" + }, + "_id": 1330 + }, + "type": { + "$id": "2883", + "kind": 44, + "target": { + "$id": "2884", + "kind": 45, + "target": { + "$id": "2885", + "kind": 3, + "sv": "string", + "pos": 9998, + "end": 10004, + "flags": 1, + "parent": { + "$ref": "2884" + }, + "_id": 1332 + }, + "arguments": [], + "pos": 9998, + "end": 10004, + "flags": 1, + "parent": { + "$ref": "2883" + }, + "_id": 1331 + }, + "pos": 9990, + "end": 10004, + "flags": 0, + "parent": { + "$ref": "2881" + } + }, + "optional": false, + "rest": false, + "pos": 9985, + "end": 10004, + "flags": 0, + "parent": { + "$ref": "2874" + }, + "symbol": { + "declarations": [ + { + "$ref": "2881" + } + ], + "name": "url", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 499 + } + }, + { + "$id": "2886", + "kind": 27, + "id": { + "$id": "2887", + "kind": 3, + "sv": "description", + "pos": 10008, + "end": 10019, + "flags": 0, + "parent": { + "$ref": "2886" + }, + "_id": 1333 + }, + "type": { + "$id": "2888", + "kind": 44, + "target": { + "$id": "2889", + "kind": 45, + "target": { + "$id": "2890", + "kind": 3, + "sv": "string", + "pos": 10030, + "end": 10036, + "flags": 1, + "parent": { + "$ref": "2889" + }, + "_id": 1335 + }, + "arguments": [], + "pos": 10030, + "end": 10036, + "flags": 1, + "parent": { + "$ref": "2888" + }, + "_id": 1334 + }, + "pos": 10022, + "end": 10036, + "flags": 0, + "parent": { + "$ref": "2886" + } + }, + "optional": true, + "rest": false, + "pos": 10008, + "end": 10036, + "flags": 0, + "parent": { + "$ref": "2874" + }, + "symbol": { + "declarations": [ + { + "$ref": "2886" + } + ], + "name": "description", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 500 + } + }, + { + "$id": "2891", + "kind": 27, + "id": { + "$id": "2892", + "kind": 3, + "sv": "parameters", + "pos": 10040, + "end": 10050, + "flags": 0, + "parent": { + "$ref": "2891" + }, + "_id": 1336 + }, + "type": { + "$id": "2893", + "kind": 45, + "target": { + "$id": "2894", + "kind": 3, + "sv": "Record", + "pos": 10053, + "end": 10059, + "flags": 1, + "parent": { + "$ref": "2893" + }, + "_id": 1338 + }, + "arguments": [ + { + "$id": "2895", + "kind": 61, + "argument": { + "$id": "2896", + "kind": 43, + "pos": 10060, + "end": 10067, + "flags": 1, + "parent": { + "$ref": "2895" + } + }, + "pos": 10060, + "end": 10067, + "flags": 1, + "parent": { + "$ref": "2893" + } + } + ], + "pos": 10053, + "end": 10068, + "flags": 1, + "parent": { + "$ref": "2891" + }, + "_id": 1337 + }, + "optional": true, + "rest": false, + "pos": 10040, + "end": 10068, + "flags": 0, + "parent": { + "$ref": "2874" + }, + "symbol": { + "declarations": [ + { + "$ref": "2891" + } + ], + "name": "parameters", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 501 + } + } + ], + "pos": 8966, + "end": 10071, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2897", + "kind": 51, + "content": [ + { + "$id": "2898", + "kind": 52, + "text": "Specify an endpoint for this service. Multiple `@server` decorators can be used to specify multiple endpoints.", + "pos": 8969, + "end": 9091, + "flags": 0, + "parent": { + "$ref": "2897" + } + } + ], + "tags": [ + { + "$id": "2899", + "kind": 53, + "tagName": { + "$id": "2900", + "kind": 3, + "sv": "param", + "pos": 9092, + "end": 9097, + "flags": 0, + "parent": { + "$ref": "2899" + } + }, + "paramName": { + "$id": "2901", + "kind": 3, + "sv": "url", + "pos": 9098, + "end": 9101, + "flags": 0, + "parent": { + "$ref": "2899" + } + }, + "content": [ + { + "$id": "2902", + "kind": 52, + "text": "Server endpoint", + "pos": 9102, + "end": 9122, + "flags": 0, + "parent": { + "$ref": "2899" + } + } + ], + "pos": 9091, + "end": 9122, + "flags": 0, + "parent": { + "$ref": "2897" + } + }, + { + "$id": "2903", + "kind": 53, + "tagName": { + "$id": "2904", + "kind": 3, + "sv": "param", + "pos": 9123, + "end": 9128, + "flags": 0, + "parent": { + "$ref": "2903" + } + }, + "paramName": { + "$id": "2905", + "kind": 3, + "sv": "description", + "pos": 9129, + "end": 9140, + "flags": 0, + "parent": { + "$ref": "2903" + } + }, + "content": [ + { + "$id": "2906", + "kind": 52, + "text": "Description of the endpoint", + "pos": 9141, + "end": 9173, + "flags": 0, + "parent": { + "$ref": "2903" + } + } + ], + "pos": 9122, + "end": 9173, + "flags": 0, + "parent": { + "$ref": "2897" + } + }, + { + "$id": "2907", + "kind": 53, + "tagName": { + "$id": "2908", + "kind": 3, + "sv": "param", + "pos": 9174, + "end": 9179, + "flags": 0, + "parent": { + "$ref": "2907" + } + }, + "paramName": { + "$id": "2909", + "kind": 3, + "sv": "parameters", + "pos": 9180, + "end": 9190, + "flags": 0, + "parent": { + "$ref": "2907" + } + }, + "content": [ + { + "$id": "2910", + "kind": 52, + "text": "Optional set of parameters used to interpolate the url.", + "pos": 9191, + "end": 9253, + "flags": 0, + "parent": { + "$ref": "2907" + } + } + ], + "pos": 9173, + "end": 9253, + "flags": 0, + "parent": { + "$ref": "2897" + } + }, + { + "$id": "2911", + "kind": 58, + "tagName": { + "$id": "2912", + "kind": 3, + "sv": "example", + "pos": 9254, + "end": 9261, + "flags": 0, + "parent": { + "$ref": "2911" + } + }, + "content": [ + { + "$id": "2913", + "kind": 52, + "text": "```typespec\n@service\n@server(\"https://example.com\")\nnamespace PetStore;\n```", + "pos": 9261, + "end": 9362, + "flags": 0, + "parent": { + "$ref": "2911" + } + } + ], + "pos": 9253, + "end": 9362, + "flags": 0, + "parent": { + "$ref": "2897" + } + }, + { + "$id": "2914", + "kind": 58, + "tagName": { + "$id": "2915", + "kind": 3, + "sv": "example", + "pos": 9363, + "end": 9370, + "flags": 0, + "parent": { + "$ref": "2914" + } + }, + "content": [ + { + "$id": "2916", + "kind": 52, + "text": "With a description\n\n```typespec\n@service\n@server(\"https://example.com\", \"Single server endpoint\")\nnamespace PetStore;\n```", + "pos": 9370, + "end": 9516, + "flags": 0, + "parent": { + "$ref": "2914" + } + } + ], + "pos": 9362, + "end": 9516, + "flags": 0, + "parent": { + "$ref": "2897" + } + }, + { + "$id": "2917", + "kind": 58, + "tagName": { + "$id": "2918", + "kind": 3, + "sv": "example", + "pos": 9517, + "end": 9524, + "flags": 0, + "parent": { + "$ref": "2917" + } + }, + "content": [ + { + "$id": "2919", + "kind": 52, + "text": "Parameterized\n\n```typespec\n@server(\"https://{region}.foo.com\", \"Regional endpoint\", {\n @doc(\"Region name\")\n region?: string = \"westus\",\n})\n```", + "pos": 9524, + "end": 9696, + "flags": 0, + "parent": { + "$ref": "2917" + } + } + ], + "pos": 9516, + "end": 9696, + "flags": 0, + "parent": { + "$ref": "2897" + } + }, + { + "$id": "2920", + "kind": 58, + "tagName": { + "$id": "2921", + "kind": 3, + "sv": "example", + "pos": 9697, + "end": 9704, + "flags": 0, + "parent": { + "$ref": "2920" + } + }, + "content": [ + { + "$id": "2922", + "kind": 52, + "text": "Multiple\n```typespec\n@service\n@server(\"https://example.com\", \"Standard endpoint\")\n@server(\"https://{project}.private.example.com\", \"Private project endpoint\", {\n project: string;\n})\nnamespace PetStore;\n```", + "pos": 9704, + "end": 9940, + "flags": 0, + "parent": { + "$ref": "2920" + } + } + ], + "pos": 9696, + "end": 9940, + "flags": 0, + "parent": { + "$ref": "2897" + } + } + ], + "pos": 8966, + "end": 9942, + "flags": 0, + "parent": { + "$ref": "2874" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2874" + } + ], + "name": "@server", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$id": "2923", + "kind": 25, + "modifiers": [ + { + "$id": "2924", + "kind": 40, + "pos": 10539, + "end": 10545, + "flags": 0, + "parent": { + "$ref": "2923" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2925", + "kind": 3, + "sv": "useAuth", + "pos": 10550, + "end": 10557, + "flags": 0, + "parent": { + "$ref": "2923" + }, + "_id": 1339 + }, + "target": { + "$id": "2926", + "kind": 27, + "id": { + "$id": "2927", + "kind": 3, + "sv": "target", + "pos": 10558, + "end": 10564, + "flags": 0, + "parent": { + "$ref": "2926" + }, + "_id": 1340 + }, + "type": { + "$id": "2928", + "kind": 28, + "options": [ + { + "$id": "2929", + "kind": 45, + "target": { + "$id": "2930", + "kind": 3, + "sv": "Namespace", + "pos": 10566, + "end": 10575, + "flags": 1, + "parent": { + "$ref": "2929" + }, + "_id": 1342 + }, + "arguments": [], + "pos": 10566, + "end": 10575, + "flags": 1, + "parent": { + "$ref": "2928" + }, + "_id": 1341 + }, + { + "$id": "2931", + "kind": 45, + "target": { + "$id": "2932", + "kind": 3, + "sv": "Interface", + "pos": 10578, + "end": 10587, + "flags": 1, + "parent": { + "$ref": "2931" + }, + "_id": 1344 + }, + "arguments": [], + "pos": 10578, + "end": 10587, + "flags": 1, + "parent": { + "$ref": "2928" + }, + "_id": 1343 + }, + { + "$id": "2933", + "kind": 45, + "target": { + "$id": "2934", + "kind": 3, + "sv": "Operation", + "pos": 10590, + "end": 10599, + "flags": 1, + "parent": { + "$ref": "2933" + }, + "_id": 1346 + }, + "arguments": [], + "pos": 10590, + "end": 10599, + "flags": 1, + "parent": { + "$ref": "2928" + }, + "_id": 1345 + } + ], + "pos": 10566, + "end": 10599, + "flags": 0, + "parent": { + "$ref": "2926" + } + }, + "optional": false, + "rest": false, + "pos": 10558, + "end": 10599, + "flags": 0, + "parent": { + "$ref": "2923" + }, + "symbol": { + "declarations": [ + { + "$ref": "2926" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 503 + } + }, + "parameters": [ + { + "$id": "2935", + "kind": 27, + "id": { + "$id": "2936", + "kind": 3, + "sv": "auth", + "pos": 10601, + "end": 10605, + "flags": 0, + "parent": { + "$ref": "2935" + }, + "_id": 1347 + }, + "type": { + "$id": "2937", + "kind": 28, + "options": [ + { + "$id": "2938", + "kind": 14, + "properties": [], + "bodyRange": { + "pos": 10607, + "end": 10609 + }, + "pos": 10607, + "end": 10609, + "flags": 0, + "parent": { + "$ref": "2937" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2938" + }, + "name": "-", + "members": { + "duplicates": {} + }, + "flags": 2, + "metatypeMembers": { + "duplicates": {} + }, + "id": 145 + } + }, + { + "$id": "2939", + "kind": 45, + "target": { + "$id": "2940", + "kind": 3, + "sv": "Union", + "pos": 10612, + "end": 10617, + "flags": 1, + "parent": { + "$ref": "2939" + }, + "_id": 1349 + }, + "arguments": [], + "pos": 10612, + "end": 10617, + "flags": 1, + "parent": { + "$ref": "2937" + }, + "_id": 1348 + }, + { + "$id": "2941", + "kind": 31, + "elementType": { + "$id": "2942", + "kind": 14, + "properties": [], + "bodyRange": { + "pos": 10620, + "end": 10622 + }, + "pos": 10620, + "end": 10622, + "flags": 0, + "parent": { + "$ref": "2941" + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "2942" + }, + "name": "-", + "members": { + "duplicates": {} + }, + "flags": 2, + "metatypeMembers": { + "duplicates": {} + }, + "id": 146 + } + }, + "pos": 10620, + "end": 10624, + "flags": 0, + "parent": { + "$ref": "2937" + } + } + ], + "pos": 10607, + "end": 10624, + "flags": 0, + "parent": { + "$ref": "2935" + } + }, + "optional": false, + "rest": false, + "pos": 10601, + "end": 10624, + "flags": 0, + "parent": { + "$ref": "2923" + }, + "symbol": { + "declarations": [ + { + "$ref": "2935" + } + ], + "name": "auth", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 504 + } + } + ], + "pos": 10073, + "end": 10626, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2943", + "kind": 51, + "content": [ + { + "$id": "2944", + "kind": 52, + "text": "Specify authentication for a whole service or specific methods. See the [documentation in the Http library](https://typespec.io/docs/libraries/http/authentication) for full details.", + "pos": 10076, + "end": 10268, + "flags": 0, + "parent": { + "$ref": "2943" + } + } + ], + "tags": [ + { + "$id": "2945", + "kind": 53, + "tagName": { + "$id": "2946", + "kind": 3, + "sv": "param", + "pos": 10269, + "end": 10274, + "flags": 0, + "parent": { + "$ref": "2945" + } + }, + "paramName": { + "$id": "2947", + "kind": 3, + "sv": "auth", + "pos": 10275, + "end": 10279, + "flags": 0, + "parent": { + "$ref": "2945" + } + }, + "content": [ + { + "$id": "2948", + "kind": 52, + "text": "Authentication configuration. Can be a single security scheme, a union(either option is valid authentication) or a tuple (must use all authentication together)", + "pos": 10280, + "end": 10443, + "flags": 0, + "parent": { + "$ref": "2945" + } + } + ], + "pos": 10268, + "end": 10443, + "flags": 0, + "parent": { + "$ref": "2943" + } + }, + { + "$id": "2949", + "kind": 58, + "tagName": { + "$id": "2950", + "kind": 3, + "sv": "example", + "pos": 10444, + "end": 10451, + "flags": 0, + "parent": { + "$ref": "2949" + } + }, + "content": [ + { + "$id": "2951", + "kind": 52, + "text": "```typespec\n@service\n@useAuth(BasicAuth)\nnamespace PetStore;\n```", + "pos": 10451, + "end": 10536, + "flags": 0, + "parent": { + "$ref": "2949" + } + } + ], + "pos": 10443, + "end": 10536, + "flags": 0, + "parent": { + "$ref": "2943" + } + } + ], + "pos": 10073, + "end": 10538, + "flags": 0, + "parent": { + "$ref": "2923" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2923" + } + ], + "name": "@useAuth", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + }, + { + "$ref": "2525" + }, + { + "$id": "2952", + "kind": 25, + "modifiers": [ + { + "$id": "2953", + "kind": 40, + "pos": 11934, + "end": 11940, + "flags": 0, + "parent": { + "$ref": "2952" + } + } + ], + "modifierFlags": 2, + "id": { + "$id": "2954", + "kind": 3, + "sv": "sharedRoute", + "pos": 11945, + "end": 11956, + "flags": 0, + "parent": { + "$ref": "2952" + }, + "_id": 1350 + }, + "target": { + "$id": "2955", + "kind": 27, + "id": { + "$id": "2956", + "kind": 3, + "sv": "target", + "pos": 11957, + "end": 11963, + "flags": 0, + "parent": { + "$ref": "2955" + }, + "_id": 1351 + }, + "type": { + "$id": "2957", + "kind": 45, + "target": { + "$id": "2958", + "kind": 3, + "sv": "Operation", + "pos": 11965, + "end": 11974, + "flags": 1, + "parent": { + "$ref": "2957" + }, + "_id": 1353 + }, + "arguments": [], + "pos": 11965, + "end": 11974, + "flags": 1, + "parent": { + "$ref": "2955" + }, + "_id": 1352 + }, + "optional": false, + "rest": false, + "pos": 11957, + "end": 11974, + "flags": 0, + "parent": { + "$ref": "2952" + }, + "symbol": { + "declarations": [ + { + "$ref": "2955" + } + ], + "name": "target", + "flags": 1052672, + "metatypeMembers": { + "duplicates": {} + }, + "id": 506 + } + }, + "parameters": [], + "pos": 11490, + "end": 11976, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2959", + "kind": 51, + "content": [ + { + "$id": "2960", + "kind": 52, + "text": "`@sharedRoute` marks the operation as sharing a route path with other operations.\n\nWhen an operation is marked with `@sharedRoute`, it enables other operations to share the same\nroute path as long as those operations are also marked with `@sharedRoute`.\n\n`@sharedRoute` can only be applied directly to operations.\n\n```typespec\n@sharedRoute\n@route(\"/widgets\")\nop getWidget(@path id: string): Widget;\n```", + "pos": 11493, + "end": 11931, + "flags": 0, + "parent": { + "$ref": "2959" + } + } + ], + "tags": [], + "pos": 11490, + "end": 11933, + "flags": 0, + "parent": { + "$ref": "2952" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2952" + } + ], + "name": "@sharedRoute", + "flags": 1049088, + "metatypeMembers": { + "duplicates": {} + } + } + } + ], + "file": { + "text": "namespace TypeSpec.Http;\n\nusing TypeSpec.Reflection;\n\n/**\n * Header options.\n */\nmodel HeaderOptions {\n /**\n * Name of the header when sent over HTTP.\n */\n name?: string;\n\n /**\n * Equivalent of adding `*` in the path parameter as per [RFC-6570](https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.3)\n *\n * | Style | Explode | Primitive value = 5 | Array = [3, 4, 5] | Object = {\"role\": \"admin\", \"firstName\": \"Alex\"} |\n * | ------ | ------- | ------------------- | ----------------- | ----------------------------------------------- |\n * | simple | false | `5 ` | `3,4,5` | `role,admin,firstName,Alex` |\n * | simple | true | `5` | `3,4,5` | `role=admin,firstName=Alex` |\n *\n */\n explode?: boolean;\n}\n\n/**\n * Specify this property is to be sent or received as an HTTP header.\n *\n * @param headerNameOrOptions Optional name of the header when sent over HTTP or header options.\n * By default the header name will be the property name converted from camelCase to kebab-case. (e.g. `contentType` -> `content-type`)\n *\n * @example\n *\n * ```typespec\n * op read(@header accept: string): {@header(\"ETag\") eTag: string};\n * op create(@header({name: \"X-Color\", format: \"csv\"}) colors: string[]): void;\n * ```\n *\n * @example Implicit header name\n *\n * ```typespec\n * op read(): {@header contentType: string}; // headerName: content-type\n * op update(@header ifMatch: string): void; // headerName: if-match\n * ```\n */\nextern dec header(target: ModelProperty, headerNameOrOptions?: valueof string | HeaderOptions);\n\n/**\n * Cookie Options.\n */\nmodel CookieOptions {\n /**\n * Name in the cookie.\n */\n name?: string;\n}\n\n/**\n * Specify this property is to be sent or received in the cookie.\n *\n * @param cookieNameOrOptions Optional name of the cookie in the cookie or cookie options.\n * By default the cookie name will be the property name converted from camelCase to snake_case. (e.g. `authToken` -> `auth_token`)\n *\n * @example\n *\n * ```typespec\n * op read(@cookie token: string): {data: string[]};\n * op create(@cookie({name: \"auth_token\"}) data: string[]): void;\n * ```\n *\n * @example Implicit header name\n *\n * ```typespec\n * op read(): {@cookie authToken: string}; // headerName: auth_token\n * op update(@cookie AuthToken: string): void; // headerName: auth_token\n * ```\n */\nextern dec cookie(target: ModelProperty, cookieNameOrOptions?: valueof string | CookieOptions);\n\n/**\n * Query parameter options.\n */\nmodel QueryOptions {\n /**\n * Name of the query when included in the url.\n */\n name?: string;\n\n /**\n * If true send each value in the array/object as a separate query parameter.\n * Equivalent of adding `*` in the path parameter as per [RFC-6570](https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.3)\n *\n * | Style | Explode | Uri Template | Primitive value id = 5 | Array id = [3, 4, 5] | Object id = {\"role\": \"admin\", \"firstName\": \"Alex\"} |\n * | ------ | ------- | -------------- | ---------------------- | ----------------------- | -------------------------------------------------- |\n * | simple | false | `/users{?id}` | `/users?id=5` | `/users?id=3,4,5` | `/users?id=role,admin,firstName,Alex` |\n * | simple | true | `/users{?id*}` | `/users?id=5` | `/users?id=3&id=4&id=5` | `/users?role=admin&firstName=Alex` |\n *\n */\n explode?: boolean;\n}\n\n/**\n * Specify this property is to be sent as a query parameter.\n *\n * @param queryNameOrOptions Optional name of the query when included in the url or query parameter options.\n *\n * @example\n *\n * ```typespec\n * op read(@query select: string, @query(\"order-by\") orderBy: string): void;\n * op list(@query(#{name: \"id\", explode: true}) ids: string[]): void;\n * ```\n */\nextern dec query(target: ModelProperty, queryNameOrOptions?: valueof string | QueryOptions);\n\nmodel PathOptions {\n /** Name of the parameter in the uri template. */\n name?: string;\n\n /**\n * When interpolating this parameter in the case of array or object expand each value using the given style.\n * Equivalent of adding `*` in the path parameter as per [RFC-6570](https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.3)\n */\n explode?: boolean;\n\n /**\n * Different interpolating styles for the path parameter.\n * - `simple`: No special encoding.\n * - `label`: Using `.` separator.\n * - `matrix`: `;` as separator.\n * - `fragment`: `#` as separator.\n * - `path`: `/` as separator.\n */\n style?: \"simple\" | \"label\" | \"matrix\" | \"fragment\" | \"path\";\n\n /**\n * When interpolating this parameter do not encode reserved characters.\n * Equivalent of adding `+` in the path parameter as per [RFC-6570](https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.3)\n */\n allowReserved?: boolean;\n}\n\n/**\n * Explicitly specify that this property is to be interpolated as a path parameter.\n *\n * @param paramNameOrOptions Optional name of the parameter in the uri template or options.\n *\n * @example\n *\n * ```typespec\n * @route(\"/read/{explicit}/things/{implicit}\")\n * op read(@path explicit: string, implicit: string): void;\n * ```\n */\nextern dec path(target: ModelProperty, paramNameOrOptions?: valueof string | PathOptions);\n\n/**\n * Explicitly specify that this property type will be exactly the HTTP body.\n *\n * This means that any properties under `@body` cannot be marked as headers, query parameters, or path parameters.\n * If wanting to change the resolution of the body but still mix parameters, use `@bodyRoot`.\n *\n * @example\n *\n * ```typespec\n * op upload(@body image: bytes): void;\n * op download(): {@body image: bytes};\n * ```\n */\nextern dec body(target: ModelProperty);\n\n/**\n * Specify that the body resolution should be resolved from that property.\n * By default the body is resolved by including all properties in the operation request/response that are not metadata.\n * This allows to nest the body in a property while still allowing to use headers, query parameters, and path parameters in the same model.\n *\n * @example\n *\n * ```typespec\n * op upload(@bodyRoot user: {name: string, @header id: string}): void;\n * op download(): {@bodyRoot user: {name: string, @header id: string}};\n * ```\n */\nextern dec bodyRoot(target: ModelProperty);\n/**\n * Specify that this property shouldn't be included in the HTTP body.\n * This can be useful when bundling metadata together that would result in an empty property to be included in the body.\n *\n * @example\n *\n * ```typespec\n * op upload(name: string, @bodyIgnore headers: {@header id: string}): void;\n * ```\n */\nextern dec bodyIgnore(target: ModelProperty);\n\n/**\n * @example\n *\n * ```tsp\n * op upload(\n * @header `content-type`: \"multipart/form-data\",\n * @multipartBody body: {\n * fullName: HttpPart,\n * headShots: HttpPart[]\n * }\n * ): void;\n * ```\n */\nextern dec multipartBody(target: ModelProperty);\n\n/**\n * Specify the status code for this response. Property type must be a status code integer or a union of status code integer.\n *\n * @example\n *\n * ```typespec\n * op read(): {\n * @statusCode _: 200;\n * @body pet: Pet;\n * };\n * op create(): {\n * @statusCode _: 201 | 202;\n * };\n * ```\n */\nextern dec statusCode(target: ModelProperty);\n\n/**\n * Specify the HTTP verb for the target operation to be `GET`.\n *\n * @example\n *\n * ```typespec\n * @get op read(): string\n * ```\n */\nextern dec get(target: Operation);\n\n/**\n * Specify the HTTP verb for the target operation to be `PUT`.\n *\n * @example\n *\n * ```typespec\n * @put op set(pet: Pet): void\n * ```\n */\nextern dec put(target: Operation);\n\n/**\n * Specify the HTTP verb for the target operation to be `POST`.\n *\n * @example\n *\n * ```typespec\n * @post op create(pet: Pet): void\n * ```\n */\nextern dec post(target: Operation);\n\n/**\n * Options for PATCH operations.\n */\nmodel PatchOptions {\n /**\n * If set to `false`, disables the implicit transform that makes the body of a\n * PATCH operation deeply optional.\n */\n implicitOptionality?: boolean;\n}\n\n/**\n * Specify the HTTP verb for the target operation to be `PATCH`.\n *\n * @param options Options for the PATCH operation.\n *\n * @example\n *\n * ```typespec\n * @patch op update(pet: Pet): void;\n * ```\n *\n * @example\n * ```typespec\n * // Disable implicit optionality, making the body of the PATCH operation use the\n * // optionality as defined in the `Pet` model.\n * @patch(#{ implicitOptionality: false })\n * op update(pet: Pet): void;\n * ```\n */\nextern dec patch(target: Operation, options?: valueof PatchOptions);\n\n/**\n * Specify the HTTP verb for the target operation to be `DELETE`.\n *\n * @example\n *\n * ```typespec\n * @delete op set(petId: string): void\n * ```\n */\nextern dec delete(target: Operation);\n\n/**\n * Specify the HTTP verb for the target operation to be `HEAD`.\n * @example\n *\n * ```typespec\n * @head op ping(petId: string): void\n * ```\n */\nextern dec head(target: Operation);\n\n/**\n * Specify an endpoint for this service. Multiple `@server` decorators can be used to specify multiple endpoints.\n *\n * @param url Server endpoint\n * @param description Description of the endpoint\n * @param parameters Optional set of parameters used to interpolate the url.\n *\n * @example\n *\n * ```typespec\n * @service\n * @server(\"https://example.com\")\n * namespace PetStore;\n * ```\n *\n * @example With a description\n *\n * ```typespec\n * @service\n * @server(\"https://example.com\", \"Single server endpoint\")\n * namespace PetStore;\n * ```\n *\n * @example Parameterized\n *\n * ```typespec\n * @server(\"https://{region}.foo.com\", \"Regional endpoint\", {\n * @doc(\"Region name\")\n * region?: string = \"westus\",\n * })\n * ```\n *\n * @example Multiple\n * ```typespec\n * @service\n * @server(\"https://example.com\", \"Standard endpoint\")\n * @server(\"https://{project}.private.example.com\", \"Private project endpoint\", {\n * project: string;\n * })\n * namespace PetStore;\n * ```\n *\n */\nextern dec server(\n target: Namespace,\n url: valueof string,\n description?: valueof string,\n parameters?: Record\n);\n\n/**\n * Specify authentication for a whole service or specific methods. See the [documentation in the Http library](https://typespec.io/docs/libraries/http/authentication) for full details.\n *\n * @param auth Authentication configuration. Can be a single security scheme, a union(either option is valid authentication) or a tuple (must use all authentication together)\n * @example\n *\n * ```typespec\n * @service\n * @useAuth(BasicAuth)\n * namespace PetStore;\n * ```\n */\nextern dec useAuth(target: Namespace | Interface | Operation, auth: {} | Union | {}[]);\n\n/**\n * Defines the relative route URI template for the target operation as defined by [RFC 6570](https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.3)\n *\n * `@route` can only be applied to operations, namespaces, and interfaces.\n *\n * @param uriTemplate Uri template for this operation.\n *\n * @example Simple path parameter\n *\n * ```typespec\n * @route(\"/widgets/{id}\") op getWidget(@path id: string): Widget;\n * ```\n *\n * @example Reserved characters\n * ```typespec\n * @route(\"/files{+path}\") op getFile(@path path: string): bytes;\n * ```\n *\n * @example Query parameter\n * ```typespec\n * @route(\"/files\") op list(select?: string, filter?: string): Files[];\n * @route(\"/files{?select,filter}\") op listFullUriTemplate(select?: string, filter?: string): Files[];\n * ```\n */\nextern dec route(target: Namespace | Interface | Operation, path: valueof string);\n\n/**\n * `@sharedRoute` marks the operation as sharing a route path with other operations.\n *\n * When an operation is marked with `@sharedRoute`, it enables other operations to share the same\n * route path as long as those operations are also marked with `@sharedRoute`.\n *\n * `@sharedRoute` can only be applied directly to operations.\n *\n * ```typespec\n * @sharedRoute\n * @route(\"/widgets\")\n * op getWidget(@path id: string): Widget;\n * ```\n */\nextern dec sharedRoute(target: Operation);\n", + "path": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/http/lib/decorators.tsp" + }, + "id": { + "$id": "2961", + "kind": 3, + "sv": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/http/lib/decorators.tsp", + "pos": 0, + "end": 0, + "flags": 8, + "parent": { + "$ref": "2541" + } + }, + "namespaces": [ + { + "$ref": "2539" + }, + { + "$ref": "2537" + } + ], + "usings": [ + { + "$ref": "2542" + } + ], + "locals": { + "duplicates": {} + }, + "inScopeNamespaces": [ + { + "$ref": "2537" + }, + { + "$ref": "2539" + } + ], + "parseDiagnostics": [], + "comments": [], + "printable": true, + "parseOptions": {}, + "pos": 0, + "end": 11976, + "flags": 0, + "symbol": { + "declarations": [], + "node": { + "$ref": "2541" + }, + "name": "/home/runner/work/typespec/typespec/packages/http-client-csharp/node_modules/@typespec/http/lib/decorators.tsp", + "exports": { + "duplicates": {} + }, + "flags": 32768, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "symbol": { + "declarations": [ + { + "$ref": "2539" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + } + } + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2539" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 187 + } + }, + "parameters": [ + { + "$id": "2962", + "kind": 27, + "id": { + "$id": "2963", + "kind": 3, + "sv": "path", + "pos": 11466, + "end": 11470, + "flags": 0, + "parent": { + "$ref": "2962" + }, + "_id": 855 + }, + "type": { + "$id": "2964", + "kind": 44, + "target": { + "$id": "2965", + "kind": 45, + "target": { + "$id": "2966", + "kind": 3, + "sv": "string", + "pos": 11480, + "end": 11486, + "flags": 1, + "parent": { + "$ref": "2965" + }, + "_id": 857 + }, + "arguments": [], + "pos": 11480, + "end": 11486, + "flags": 1, + "parent": { + "$ref": "2964" + }, + "_id": 856 + }, + "pos": 11472, + "end": 11486, + "flags": 0, + "parent": { + "$ref": "2962" + } + }, + "optional": false, + "rest": false, + "pos": 11466, + "end": 11486, + "flags": 0, + "parent": { + "$ref": "2525" + }, + "symbol": { + "declarations": [ + { + "$ref": "2962" + } + ], + "name": "path", + "flags": 1052672, + "parent": { + "declarations": [ + { + "$ref": "2537" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2539" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + }, + "id": 188 + } + } + ], + "pos": 10628, + "end": 11488, + "flags": 0, + "directives": [], + "docs": [ + { + "$id": "2967", + "kind": 51, + "content": [ + { + "$id": "2968", + "kind": 52, + "text": "Defines the relative route URI template for the target operation as defined by [RFC 6570](https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.3)\n\n`@route` can only be applied to operations, namespaces, and interfaces.", + "pos": 10631, + "end": 10870, + "flags": 0, + "parent": { + "$ref": "2967" + } + } + ], + "tags": [ + { + "$id": "2969", + "kind": 53, + "tagName": { + "$id": "2970", + "kind": 3, + "sv": "param", + "pos": 10871, + "end": 10876, + "flags": 0, + "parent": { + "$ref": "2969" + } + }, + "paramName": { + "$id": "2971", + "kind": 3, + "sv": "uriTemplate", + "pos": 10877, + "end": 10888, + "flags": 0, + "parent": { + "$ref": "2969" + } + }, + "content": [ + { + "$id": "2972", + "kind": 52, + "text": "Uri template for this operation.", + "pos": 10889, + "end": 10928, + "flags": 0, + "parent": { + "$ref": "2969" + } + } + ], + "pos": 10870, + "end": 10928, + "flags": 0, + "parent": { + "$ref": "2967" + } + }, + { + "$id": "2973", + "kind": 58, + "tagName": { + "$id": "2974", + "kind": 3, + "sv": "example", + "pos": 10929, + "end": 10936, + "flags": 0, + "parent": { + "$ref": "2973" + } + }, + "content": [ + { + "$id": "2975", + "kind": 52, + "text": "Simple path parameter\n\n```typespec\n@route(\"/widgets/{id}\") op getWidget(@path id: string): Widget;\n```", + "pos": 10936, + "end": 11057, + "flags": 0, + "parent": { + "$ref": "2973" + } + } + ], + "pos": 10928, + "end": 11057, + "flags": 0, + "parent": { + "$ref": "2967" + } + }, + { + "$id": "2976", + "kind": 58, + "tagName": { + "$id": "2977", + "kind": 3, + "sv": "example", + "pos": 11058, + "end": 11065, + "flags": 0, + "parent": { + "$ref": "2976" + } + }, + "content": [ + { + "$id": "2978", + "kind": 52, + "text": "Reserved characters\n```typespec\n@route(\"/files{+path}\") op getFile(@path path: string): bytes;\n```", + "pos": 11065, + "end": 11180, + "flags": 0, + "parent": { + "$ref": "2976" + } + } + ], + "pos": 11057, + "end": 11180, + "flags": 0, + "parent": { + "$ref": "2967" + } + }, + { + "$id": "2979", + "kind": 58, + "tagName": { + "$id": "2980", + "kind": 3, + "sv": "example", + "pos": 11181, + "end": 11188, + "flags": 0, + "parent": { + "$ref": "2979" + } + }, + "content": [ + { + "$id": "2981", + "kind": 52, + "text": "Query parameter\n```typespec\n@route(\"/files\") op list(select?: string, filter?: string): Files[];\n@route(\"/files{?select,filter}\") op listFullUriTemplate(select?: string, filter?: string): Files[];\n```", + "pos": 11188, + "end": 11403, + "flags": 0, + "parent": { + "$ref": "2979" + } + } + ], + "pos": 11180, + "end": 11403, + "flags": 0, + "parent": { + "$ref": "2967" + } + } + ], + "pos": 10628, + "end": 11405, + "flags": 0, + "parent": { + "$ref": "2525" + } + } + ], + "parent": { + "$ref": "2541" + }, + "symbol": { + "declarations": [ + { + "$ref": "2525" + } + ], + "name": "@route", + "flags": 1049088, + "parent": { + "declarations": [ + { + "$ref": "2537" + } + ], + "name": "Http", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "parent": { + "declarations": [ + { + "$ref": "2539" + } + ], + "name": "TypeSpec", + "exports": { + "duplicates": {} + }, + "flags": 1048832, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + }, + "metatypeMembers": { + "duplicates": {} + } + } + }, + "target": { + "$id": "2982", + "kind": "FunctionParameter", + "node": { + "$ref": "2528" + }, + "name": "target", + "optional": false, + "rest": false, + "type": { + "entityKind": "MixedParameterConstraint", + "node": { + "$ref": "2530" + }, + "type": { + "$id": "2983", + "kind": "Union", + "node": { + "$ref": "2530" + }, + "options": [ + { + "$ref": "2514" + }, + { + "$id": "2984", + "kind": "Model", + "name": "Interface", + "node": { + "$ref": "2005" + }, + "properties": {}, + "namespace": { + "$ref": "2022" + }, + "decorators": [], + "sourceModels": [], + "derivedModels": [], + "isFinished": true, + "entityKind": "Type", + "symbol": { + "declarations": [], + "node": { + "$ref": "2005" + }, + "name": "Interface", + "members": { + "duplicates": {} + }, + "flags": 4194306, + "metatypeMembers": { + "duplicates": {} + }, + "type": { + "$ref": "2984" + } + } + }, + { + "$id": "2985", + "kind": "Model", + "name": "Operation", + "node": { + "$ref": "2011" + }, + "properties": {}, + "namespace": { + "$ref": "2022" + }, + "decorators": [], + "sourceModels": [], + "derivedModels": [], + "isFinished": true, + "entityKind": "Type", + "symbol": { + "declarations": [], + "node": { + "$ref": "2011" + }, + "name": "Operation", + "members": { + "duplicates": {} + }, + "flags": 4194306, + "metatypeMembers": { + "duplicates": {} + }, + "type": { + "$ref": "2985" + } + } + } + ], + "decorators": [], + "variants": {}, + "expression": true, + "isFinished": true, + "entityKind": "Type" + } + }, + "mixed": true, + "isFinished": false, + "creating": true, + "entityKind": "Type" + }, + "parameters": [ + { + "$id": "2986", + "kind": "FunctionParameter", + "node": { + "$ref": "2962" + }, + "name": "path", + "optional": false, + "rest": false, + "type": { + "entityKind": "MixedParameterConstraint", + "node": { + "$ref": "2964" + }, + "valueType": { + "$ref": "463" + } + }, + "mixed": true, + "isFinished": false, + "creating": true, + "entityKind": "Type" + } + ], + "isFinished": false, + "creating": true, + "entityKind": "Type" + }, + "node": { + "$ref": "2054" + }, + "args": [ + { + "value": { + "entityKind": "Value", + "valueKind": "StringValue", + "value": "/body", + "type": { + "$ref": "463" + }, + "scalar": { + "$ref": "463" + } + }, + "node": { + "$ref": "2055" + }, + "jsValue": "/body" + } + ] + } + ], + "isFinished": true, + "entityKind": "Type" + }, + "variants": {}, + "decorators": [], + "isFinished": true, + "entityKind": "Type" + }, + { + "$ref": "1988" + } + ], + "source": { + "node": { + "$ref": "2154" + } + }, + "map": {} + }, + "model": { + "$id": "2987", + "kind": "Model", + "name": "File", + "node": { + "$ref": "40" + }, + "properties": {}, + "namespace": { + "$ref": "887" + }, + "decorators": [ + { + "args": [ + { + "value": { + "$ref": "723" + }, + "jsValue": "self" + }, + { + "value": { + "$ref": "2239" + }, + "jsValue": "A file in an HTTP request, response, or multipart payload.\n\nFiles have a special meaning that the HTTP library understands. When the body of an HTTP request, response,\nor multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the\noperation is treated as a file upload or download.\n\nWhen using file bodies, the fields of the file model are defined to come from particular locations by default:\n\n- `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload\n(MAY be overridden or changed).\n\nA File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit\n`Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON payload,\nit will have a structure like:\n\n```\n{\n \"contentType\": ,\n \"filename\": ,\n \"contents\": \n}\n```\n\nThe `contentType` _within_ the file defines what media types the data inside the file can be, but if the specification\ndefines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is\nserialized_. See the examples below for more information.\n\nNOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename`\n(`Content-Disposition: ; filename=`) is only valid in HTTP responses and multipart payloads. If\nyou wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the\n`filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` location\nis overridden, as shown in the examples below." + } + ] + }, + { + "definition": { + "$ref": "2240" + }, + "node": { + "$ref": "416" + }, + "args": [] + }, + { + "definition": { + "$ref": "895" + }, + "node": { + "$ref": "413" + }, + "args": [ + { + "value": { + "entityKind": "Value", + "valueKind": "StringValue", + "value": "A file in an HTTP request, response, or multipart payload.", + "type": { + "$ref": "463" + }, + "scalar": { + "$ref": "463" + } + }, + "node": { + "$ref": "414" + }, + "jsValue": "A file in an HTTP request, response, or multipart payload." + } + ] + } + ], + "sourceModels": [], + "derivedModels": [], + "isFinished": true, + "entityKind": "Type", + "templateMapper": { + "partial": false, + "args": [ + { + "$ref": "2411" + }, + { + "$ref": "1988" + } + ], + "source": { + "node": { + "$ref": "2154" + } + }, + "map": {} + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "40" + }, + "name": "File", + "members": { + "duplicates": {} + }, + "flags": 4194306, + "metatypeMembers": { + "duplicates": {} + }, + "type": { + "$ref": "2987" + } + }, + "templateNode": { + "$ref": "40" + } + } + } + } + }, + "properties": [ + { + "$id": "2988", + "kind": "property", + "name": "contentType", + "summary": "The allowed media (MIME) types of the file contents.", + "doc": "The allowed media (MIME) types of the file contents.\n\nIn file bodies, this value comes from the `Content-Type` header of the request or response. In JSON bodies,\nthis value is serialized as a field in the response.\n\nNOTE: this is not _necessarily_ the same as the `Content-Type` header of the request or response, but\nit will be for file bodies. It may be different if the file is serialized as a JSON object. It always refers to the\n_contents_ of the file, and not necessarily the way the file itself is transmitted or serialized.", + "type": { + "$ref": "9" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "TypeSpec.Http.File.contentType", + "serializationOptions": {}, + "isHttpMetadata": false + }, + { + "$id": "2989", + "kind": "property", + "name": "filename", + "summary": "The name of the file, if any.", + "doc": "The name of the file, if any.\n\nIn file bodies, this value comes from the `filename` parameter of the `Content-Disposition` header of the response\nor multipart payload. In JSON bodies, this value is serialized as a field in the response.\n\nNOTE: By default, `filename` cannot be sent in request payloads and can only be sent in responses and multipart\npayloads, as the `Content-Disposition` header is not valid in requests. If you want to send the `filename` in a request,\nyou must extend the `File` model and override the `filename` property with a different location defined by HTTP metadata\ndecorators.", + "type": { + "$id": "2990", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "TypeSpec.Http.File.filename", + "serializationOptions": {}, + "isHttpMetadata": false + }, + { + "$id": "2991", + "kind": "property", + "name": "contents", + "summary": "The contents of the file.", + "doc": "The contents of the file.\n\nIn file bodies, this value comes from the body of the request, response, or multipart payload. In JSON bodies,\nthis value is serialized as a field in the response.", + "type": { + "$id": "2992", + "kind": "bytes", + "name": "bytes", + "encode": "base64", + "crossLanguageDefinitionId": "TypeSpec.bytes", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "TypeSpec.Http.File.contents", + "serializationOptions": {}, + "isHttpMetadata": false + } + ] + }, + { + "$id": "2993", + "kind": "model", + "name": "File3", + "namespace": "TypeSpec.Http", + "crossLanguageDefinitionId": "TypeSpec.Http.File", + "usage": "Output", + "doc": "A file in an HTTP request, response, or multipart payload.\n\nFiles have a special meaning that the HTTP library understands. When the body of an HTTP request, response,\nor multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the\noperation is treated as a file upload or download.\n\nWhen using file bodies, the fields of the file model are defined to come from particular locations by default:\n\n- `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload\n(MAY be overridden or changed).\n\nA File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit\n`Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON payload,\nit will have a structure like:\n\n```\n{\n \"contentType\": ,\n \"filename\": ,\n \"contents\": \n}\n```\n\nThe `contentType` _within_ the file defines what media types the data inside the file can be, but if the specification\ndefines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is\nserialized_. See the examples below for more information.\n\nNOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename`\n(`Content-Disposition: ; filename=`) is only valid in HTTP responses and multipart payloads. If\nyou wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the\n`filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` location\nis overridden, as shown in the examples below.", + "summary": "A file in an HTTP request, response, or multipart payload.", + "decorators": [], + "serializationOptions": { + "binary": { + "isFile": true, + "isText": false, + "contentTypes": [ + "image/png", + "image/jpeg" + ], + "filename": { + "$id": "2994", + "kind": "ModelProperty", + "name": "filename", + "node": { + "$ref": "31" + }, + "optional": true, + "type": { + "$ref": "463" + }, + "decorators": [ + { + "args": [ + { + "value": { + "$ref": "723" + }, + "jsValue": "self" + }, + { + "value": { + "$ref": "894" + }, + "jsValue": "The name of the file, if any.\n\nIn file bodies, this value comes from the `filename` parameter of the `Content-Disposition` header of the response\nor multipart payload. In JSON bodies, this value is serialized as a field in the response.\n\nNOTE: By default, `filename` cannot be sent in request payloads and can only be sent in responses and multipart\npayloads, as the `Content-Disposition` header is not valid in requests. If you want to send the `filename` in a request,\nyou must extend the `File` model and override the `filename` property with a different location defined by HTTP metadata\ndecorators." + } + ] + }, + { + "definition": { + "$ref": "895" + }, + "node": { + "$ref": "33" + }, + "args": [ + { + "value": { + "entityKind": "Value", + "valueKind": "StringValue", + "value": "The name of the file, if any.", + "type": { + "$ref": "463" + }, + "scalar": { + "$ref": "463" + } + }, + "node": { + "$ref": "34" + }, + "jsValue": "The name of the file, if any." + } + ] + } + ], + "isFinished": true, + "entityKind": "Type", + "templateMapper": { + "partial": false, + "args": [ + { + "$id": "2995", + "kind": "Union", + "node": { + "$ref": "2183" + }, + "options": [ + { + "$ref": "1987" + }, + { + "$ref": "2412" + } + ], + "expression": true, + "namespace": { + "$ref": "2413" + }, + "variants": {}, + "decorators": [], + "isFinished": true, + "entityKind": "Type" + }, + { + "$ref": "1988" + } + ], + "source": { + "node": { + "$ref": "2178" + } + }, + "map": {} + }, + "model": { + "$id": "2996", + "kind": "Model", + "name": "File", + "node": { + "$ref": "40" + }, + "properties": {}, + "namespace": { + "$ref": "887" + }, + "decorators": [ + { + "args": [ + { + "value": { + "$ref": "723" + }, + "jsValue": "self" + }, + { + "value": { + "$ref": "2239" + }, + "jsValue": "A file in an HTTP request, response, or multipart payload.\n\nFiles have a special meaning that the HTTP library understands. When the body of an HTTP request, response,\nor multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the\noperation is treated as a file upload or download.\n\nWhen using file bodies, the fields of the file model are defined to come from particular locations by default:\n\n- `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload\n(MAY be overridden or changed).\n\nA File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit\n`Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON payload,\nit will have a structure like:\n\n```\n{\n \"contentType\": ,\n \"filename\": ,\n \"contents\": \n}\n```\n\nThe `contentType` _within_ the file defines what media types the data inside the file can be, but if the specification\ndefines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is\nserialized_. See the examples below for more information.\n\nNOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename`\n(`Content-Disposition: ; filename=`) is only valid in HTTP responses and multipart payloads. If\nyou wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the\n`filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` location\nis overridden, as shown in the examples below." + } + ] + }, + { + "definition": { + "$ref": "2240" + }, + "node": { + "$ref": "416" + }, + "args": [] + }, + { + "definition": { + "$ref": "895" + }, + "node": { + "$ref": "413" + }, + "args": [ + { + "value": { + "entityKind": "Value", + "valueKind": "StringValue", + "value": "A file in an HTTP request, response, or multipart payload.", + "type": { + "$ref": "463" + }, + "scalar": { + "$ref": "463" + } + }, + "node": { + "$ref": "414" + }, + "jsValue": "A file in an HTTP request, response, or multipart payload." + } + ] + } + ], + "sourceModels": [], + "derivedModels": [], + "isFinished": true, + "entityKind": "Type", + "templateMapper": { + "partial": false, + "args": [ + { + "$ref": "2995" + }, + { + "$ref": "1988" + } + ], + "source": { + "node": { + "$ref": "2178" + } + }, + "map": {} + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "40" + }, + "name": "File", + "members": { + "duplicates": {} + }, + "flags": 4194306, + "metatypeMembers": { + "duplicates": {} + }, + "type": { + "$ref": "2996" + } + }, + "templateNode": { + "$ref": "40" + } + } + } + } + }, + "properties": [ + { + "$id": "2997", + "kind": "property", + "name": "contentType", + "summary": "The allowed media (MIME) types of the file contents.", + "doc": "The allowed media (MIME) types of the file contents.\n\nIn file bodies, this value comes from the `Content-Type` header of the request or response. In JSON bodies,\nthis value is serialized as a field in the response.\n\nNOTE: this is not _necessarily_ the same as the `Content-Type` header of the request or response, but\nit will be for file bodies. It may be different if the file is serialized as a JSON object. It always refers to the\n_contents_ of the file, and not necessarily the way the file itself is transmitted or serialized.", + "type": { + "$ref": "13" + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "TypeSpec.Http.File.contentType", + "serializationOptions": {}, + "isHttpMetadata": false + }, + { + "$id": "2998", + "kind": "property", + "name": "filename", + "summary": "The name of the file, if any.", + "doc": "The name of the file, if any.\n\nIn file bodies, this value comes from the `filename` parameter of the `Content-Disposition` header of the response\nor multipart payload. In JSON bodies, this value is serialized as a field in the response.\n\nNOTE: By default, `filename` cannot be sent in request payloads and can only be sent in responses and multipart\npayloads, as the `Content-Disposition` header is not valid in requests. If you want to send the `filename` in a request,\nyou must extend the `File` model and override the `filename` property with a different location defined by HTTP metadata\ndecorators.", + "type": { + "$id": "2999", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "TypeSpec.Http.File.filename", + "serializationOptions": {}, + "isHttpMetadata": false + }, + { + "$id": "3000", + "kind": "property", + "name": "contents", + "summary": "The contents of the file.", + "doc": "The contents of the file.\n\nIn file bodies, this value comes from the body of the request, response, or multipart payload. In JSON bodies,\nthis value is serialized as a field in the response.", + "type": { + "$id": "3001", + "kind": "bytes", + "name": "bytes", + "encode": "base64", + "crossLanguageDefinitionId": "TypeSpec.bytes", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "TypeSpec.Http.File.contents", + "serializationOptions": {}, + "isHttpMetadata": false + } + ] + }, + { + "$id": "3002", + "kind": "model", + "name": "File4", + "namespace": "TypeSpec.Http", + "crossLanguageDefinitionId": "TypeSpec.Http.File", + "usage": "Input,Output", + "doc": "A file in an HTTP request, response, or multipart payload.\n\nFiles have a special meaning that the HTTP library understands. When the body of an HTTP request, response,\nor multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the\noperation is treated as a file upload or download.\n\nWhen using file bodies, the fields of the file model are defined to come from particular locations by default:\n\n- `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload\n(MAY be overridden or changed).\n\nA File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit\n`Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON payload,\nit will have a structure like:\n\n```\n{\n \"contentType\": ,\n \"filename\": ,\n \"contents\": \n}\n```\n\nThe `contentType` _within_ the file defines what media types the data inside the file can be, but if the specification\ndefines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is\nserialized_. See the examples below for more information.\n\nNOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename`\n(`Content-Disposition: ; filename=`) is only valid in HTTP responses and multipart payloads. If\nyou wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the\n`filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` location\nis overridden, as shown in the examples below.", + "summary": "A file in an HTTP request, response, or multipart payload.", + "decorators": [], + "serializationOptions": { + "binary": { + "isFile": true, + "isText": false, + "contentTypes": [ + "*/*" + ], + "filename": { + "$id": "3003", + "kind": "ModelProperty", + "name": "filename", + "node": { + "$ref": "31" + }, + "optional": true, + "type": { + "$ref": "463" + }, + "decorators": [ + { + "args": [ + { + "value": { + "$ref": "723" + }, + "jsValue": "self" + }, + { + "value": { + "$ref": "894" + }, + "jsValue": "The name of the file, if any.\n\nIn file bodies, this value comes from the `filename` parameter of the `Content-Disposition` header of the response\nor multipart payload. In JSON bodies, this value is serialized as a field in the response.\n\nNOTE: By default, `filename` cannot be sent in request payloads and can only be sent in responses and multipart\npayloads, as the `Content-Disposition` header is not valid in requests. If you want to send the `filename` in a request,\nyou must extend the `File` model and override the `filename` property with a different location defined by HTTP metadata\ndecorators." + } + ] + }, + { + "definition": { + "$ref": "895" + }, + "node": { + "$ref": "33" + }, + "args": [ + { + "value": { + "entityKind": "Value", + "valueKind": "StringValue", + "value": "The name of the file, if any.", + "type": { + "$ref": "463" + }, + "scalar": { + "$ref": "463" + } + }, + "node": { + "$ref": "34" + }, + "jsValue": "The name of the file, if any." + } + ] + } + ], + "isFinished": true, + "entityKind": "Type", + "templateMapper": { + "partial": false, + "args": [ + { + "$ref": "463" + }, + { + "$ref": "1988" + } + ], + "source": { + "node": { + "$ref": "2204" + } + }, + "map": {} + }, + "model": { + "$id": "3004", + "kind": "Model", + "name": "File", + "node": { + "$ref": "40" + }, + "properties": {}, + "namespace": { + "$ref": "887" + }, + "decorators": [ + { + "args": [ + { + "value": { + "$ref": "723" + }, + "jsValue": "self" + }, + { + "value": { + "$ref": "2239" + }, + "jsValue": "A file in an HTTP request, response, or multipart payload.\n\nFiles have a special meaning that the HTTP library understands. When the body of an HTTP request, response,\nor multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the\noperation is treated as a file upload or download.\n\nWhen using file bodies, the fields of the file model are defined to come from particular locations by default:\n\n- `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed).\n- `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload\n(MAY be overridden or changed).\n\nA File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit\n`Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON payload,\nit will have a structure like:\n\n```\n{\n \"contentType\": ,\n \"filename\": ,\n \"contents\": \n}\n```\n\nThe `contentType` _within_ the file defines what media types the data inside the file can be, but if the specification\ndefines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is\nserialized_. See the examples below for more information.\n\nNOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename`\n(`Content-Disposition: ; filename=`) is only valid in HTTP responses and multipart payloads. If\nyou wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the\n`filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` location\nis overridden, as shown in the examples below." + } + ] + }, + { + "definition": { + "$ref": "2240" + }, + "node": { + "$ref": "416" + }, + "args": [] + }, + { + "definition": { + "$ref": "895" + }, + "node": { + "$ref": "413" + }, + "args": [ + { + "value": { + "entityKind": "Value", + "valueKind": "StringValue", + "value": "A file in an HTTP request, response, or multipart payload.", + "type": { + "$ref": "463" + }, + "scalar": { + "$ref": "463" + } + }, + "node": { + "$ref": "414" + }, + "jsValue": "A file in an HTTP request, response, or multipart payload." + } + ] + } + ], + "sourceModels": [], + "derivedModels": [], + "isFinished": true, + "entityKind": "Type", + "templateMapper": { + "partial": false, + "args": [ + { + "$ref": "463" + }, + { + "$ref": "1988" + } + ], + "source": { + "node": { + "$ref": "2204" + } + }, + "map": {} + }, + "symbol": { + "declarations": [], + "node": { + "$ref": "40" + }, + "name": "File", + "members": { + "duplicates": {} + }, + "flags": 4194306, + "metatypeMembers": { + "duplicates": {} + }, + "type": { + "$ref": "3004" + } + }, + "templateNode": { + "$ref": "40" + } + } + } + } + }, + "properties": [ + { + "$id": "3005", + "kind": "property", + "name": "contentType", + "summary": "The allowed media (MIME) types of the file contents.", + "doc": "The allowed media (MIME) types of the file contents.\n\nIn file bodies, this value comes from the `Content-Type` header of the request or response. In JSON bodies,\nthis value is serialized as a field in the response.\n\nNOTE: this is not _necessarily_ the same as the `Content-Type` header of the request or response, but\nit will be for file bodies. It may be different if the file is serialized as a JSON object. It always refers to the\n_contents_ of the file, and not necessarily the way the file itself is transmitted or serialized.", + "type": { + "$id": "3006", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "TypeSpec.Http.File.contentType", + "serializationOptions": {}, + "isHttpMetadata": false + }, + { + "$id": "3007", + "kind": "property", + "name": "filename", + "summary": "The name of the file, if any.", + "doc": "The name of the file, if any.\n\nIn file bodies, this value comes from the `filename` parameter of the `Content-Disposition` header of the response\nor multipart payload. In JSON bodies, this value is serialized as a field in the response.\n\nNOTE: By default, `filename` cannot be sent in request payloads and can only be sent in responses and multipart\npayloads, as the `Content-Disposition` header is not valid in requests. If you want to send the `filename` in a request,\nyou must extend the `File` model and override the `filename` property with a different location defined by HTTP metadata\ndecorators.", + "type": { + "$id": "3008", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "optional": true, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "TypeSpec.Http.File.filename", + "serializationOptions": {}, + "isHttpMetadata": false + }, + { + "$id": "3009", + "kind": "property", + "name": "contents", + "summary": "The contents of the file.", + "doc": "The contents of the file.\n\nIn file bodies, this value comes from the body of the request, response, or multipart payload. In JSON bodies,\nthis value is serialized as a field in the response.", + "type": { + "$id": "3010", + "kind": "bytes", + "name": "bytes", + "encode": "base64", + "crossLanguageDefinitionId": "TypeSpec.bytes", + "decorators": [] + }, + "optional": false, + "readOnly": false, + "discriminator": false, + "flatten": false, + "decorators": [], + "crossLanguageDefinitionId": "TypeSpec.Http.File.contents", + "serializationOptions": {}, + "isHttpMetadata": false + } + ] + } + ], + "clients": [ + { + "$id": "3011", + "kind": "client", + "name": "FileClient", + "namespace": "Type.File", + "doc": "Test for File type usage in request and response bodies", + "methods": [], + "parameters": [ + { + "$id": "3012", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "3013", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "3014", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Type.File.endpoint" + } + ], + "initializedBy": 1, + "decorators": [], + "crossLanguageDefinitionId": "Type.File", + "apiVersions": [], + "children": [ + { + "$id": "3015", + "kind": "client", + "name": "Body", + "namespace": "Type.File.Body", + "doc": "Test File as request and response body with specific content type", + "methods": [ + { + "$id": "3016", + "kind": "basic", + "name": "uploadFileSpecificContentType", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "3017", + "name": "uploadFileSpecificContentType", + "resourceName": "Body", + "accessibility": "public", + "parameters": [ + { + "$id": "3018", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are image/png", + "type": { + "$id": "3019", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Method", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Type.File.Body.uploadFileSpecificContentType.contentType", + "methodParameterSegments": [ + { + "$id": "3020", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are image/png", + "type": { + "$ref": "3019" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.File.Body.uploadFileSpecificContentType.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "3021", + "kind": "body", + "name": "file", + "serializedName": "file", + "type": { + "$ref": "29" + }, + "isApiVersion": false, + "contentTypes": [ + "image/png" + ], + "defaultContentType": "image/png", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Type.File.Body.uploadFileSpecificContentType.file", + "methodParameterSegments": [ + { + "$id": "3022", + "kind": "method", + "name": "file", + "serializedName": "file", + "type": { + "$ref": "29" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.File.Body.uploadFileSpecificContentType.file", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "POST", + "uri": "{endpoint}", + "path": "/type/file/body/request/specific-content-type", + "requestMediaTypes": [], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Type.File.Body.uploadFileSpecificContentType", + "decorators": [], + "namespace": "Type.File.Body" + }, + "parameters": [ + { + "$ref": "3022" + }, + { + "$ref": "3020" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Type.File.Body.uploadFileSpecificContentType" + }, + { + "$id": "3023", + "kind": "basic", + "name": "uploadFileJsonContentType", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "3024", + "name": "uploadFileJsonContentType", + "resourceName": "Body", + "accessibility": "public", + "parameters": [ + { + "$id": "3025", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "17" + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Type.File.Body.uploadFileJsonContentType.contentType", + "methodParameterSegments": [ + { + "$id": "3026", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.File.Body.uploadFileJsonContentType.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "3027", + "kind": "body", + "name": "file", + "serializedName": "file", + "type": { + "$ref": "2400" + }, + "isApiVersion": false, + "contentTypes": [ + "application/json" + ], + "defaultContentType": "application/json", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Type.File.Body.uploadFileJsonContentType.file", + "methodParameterSegments": [ + { + "$id": "3028", + "kind": "method", + "name": "file", + "serializedName": "file", + "type": { + "$ref": "2400" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.File.Body.uploadFileJsonContentType.file", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "POST", + "uri": "{endpoint}", + "path": "/type/file/body/request/json-content-type", + "requestMediaTypes": [ + "application/json" + ], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Type.File.Body.uploadFileJsonContentType", + "decorators": [], + "namespace": "Type.File.Body" + }, + "parameters": [ + { + "$ref": "3028" + }, + { + "$ref": "3026" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Type.File.Body.uploadFileJsonContentType" + }, + { + "$id": "3029", + "kind": "basic", + "name": "downloadFileJsonContentType", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "3030", + "name": "downloadFileJsonContentType", + "resourceName": "Body", + "accessibility": "public", + "parameters": [ + { + "$id": "3031", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "19" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Type.File.Body.downloadFileJsonContentType.accept", + "methodParameterSegments": [ + { + "$id": "3032", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "19" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.File.Body.downloadFileJsonContentType.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "2400" + }, + "headers": [ + { + "name": "contentType", + "summary": "The allowed media (MIME) types of the file contents.", + "doc": "The allowed media (MIME) types of the file contents.\n\nIn file bodies, this value comes from the `Content-Type` header of the request or response. In JSON bodies,\nthis value is serialized as a field in the response.\n\nNOTE: this is not _necessarily_ the same as the `Content-Type` header of the request or response, but\nit will be for file bodies. It may be different if the file is serialized as a JSON object. It always refers to the\n_contents_ of the file, and not necessarily the way the file itself is transmitted or serialized.", + "type": { + "$ref": "21" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "application/json" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/type/file/body/response/json-content-type", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Type.File.Body.downloadFileJsonContentType", + "decorators": [], + "namespace": "Type.File.Body" + }, + "parameters": [ + { + "$ref": "3032" + } + ], + "response": { + "type": { + "$ref": "2400" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Type.File.Body.downloadFileJsonContentType" + }, + { + "$id": "3033", + "kind": "basic", + "name": "downloadFileSpecificContentType", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "3034", + "name": "downloadFileSpecificContentType", + "resourceName": "Body", + "accessibility": "public", + "parameters": [ + { + "$id": "3035", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "23" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Type.File.Body.downloadFileSpecificContentType.accept", + "methodParameterSegments": [ + { + "$id": "3036", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "23" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.File.Body.downloadFileSpecificContentType.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "29" + }, + "headers": [ + { + "name": "contentType", + "summary": "The allowed media (MIME) types of the file contents.", + "doc": "The allowed media (MIME) types of the file contents.\n\nIn file bodies, this value comes from the `Content-Type` header of the request or response. In JSON bodies,\nthis value is serialized as a field in the response.\n\nNOTE: this is not _necessarily_ the same as the `Content-Type` header of the request or response, but\nit will be for file bodies. It may be different if the file is serialized as a JSON object. It always refers to the\n_contents_ of the file, and not necessarily the way the file itself is transmitted or serialized.", + "type": { + "$ref": "25" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "image/png" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/type/file/body/response/specific-content-type", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Type.File.Body.downloadFileSpecificContentType", + "decorators": [], + "namespace": "Type.File.Body" + }, + "parameters": [ + { + "$ref": "3036" + } + ], + "response": { + "type": { + "$ref": "29" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Type.File.Body.downloadFileSpecificContentType" + }, + { + "$id": "3037", + "kind": "basic", + "name": "uploadFileMultipleContentTypes", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "3038", + "name": "uploadFileMultipleContentTypes", + "resourceName": "Body", + "accessibility": "public", + "parameters": [ + { + "$id": "3039", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are image/png,image/jpeg", + "type": { + "$id": "3040", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Method", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Type.File.Body.uploadFileMultipleContentTypes.contentType", + "methodParameterSegments": [ + { + "$id": "3041", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are image/png,image/jpeg", + "type": { + "$ref": "3040" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.File.Body.uploadFileMultipleContentTypes.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "3042", + "kind": "body", + "name": "file", + "serializedName": "file", + "type": { + "$ref": "2409" + }, + "isApiVersion": false, + "contentTypes": [ + "image/png", + "image/jpeg" + ], + "defaultContentType": "image/png", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Type.File.Body.uploadFileMultipleContentTypes.file", + "methodParameterSegments": [ + { + "$id": "3043", + "kind": "method", + "name": "file", + "serializedName": "file", + "type": { + "$ref": "2409" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.File.Body.uploadFileMultipleContentTypes.file", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "POST", + "uri": "{endpoint}", + "path": "/type/file/body/request/multiple-content-types", + "requestMediaTypes": [], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Type.File.Body.uploadFileMultipleContentTypes", + "decorators": [], + "namespace": "Type.File.Body" + }, + "parameters": [ + { + "$ref": "3043" + }, + { + "$ref": "3041" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Type.File.Body.uploadFileMultipleContentTypes" + }, + { + "$id": "3044", + "kind": "basic", + "name": "downloadFileMultipleContentTypes", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "3045", + "name": "downloadFileMultipleContentTypes", + "resourceName": "Body", + "accessibility": "public", + "parameters": [ + { + "$id": "3046", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$id": "3047", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Method", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Type.File.Body.downloadFileMultipleContentTypes.accept", + "methodParameterSegments": [ + { + "$id": "3048", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "3047" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.File.Body.downloadFileMultipleContentTypes.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "2993" + }, + "headers": [ + { + "name": "contentType", + "summary": "The allowed media (MIME) types of the file contents.", + "doc": "The allowed media (MIME) types of the file contents.\n\nIn file bodies, this value comes from the `Content-Type` header of the request or response. In JSON bodies,\nthis value is serialized as a field in the response.\n\nNOTE: this is not _necessarily_ the same as the `Content-Type` header of the request or response, but\nit will be for file bodies. It may be different if the file is serialized as a JSON object. It always refers to the\n_contents_ of the file, and not necessarily the way the file itself is transmitted or serialized.", + "type": { + "$ref": "13" + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "image/png", + "image/jpeg" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/type/file/body/response/multiple-content-types", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Type.File.Body.downloadFileMultipleContentTypes", + "decorators": [], + "namespace": "Type.File.Body" + }, + "parameters": [ + { + "$ref": "3048" + } + ], + "response": { + "type": { + "$ref": "2993" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Type.File.Body.downloadFileMultipleContentTypes" + }, + { + "$id": "3049", + "kind": "basic", + "name": "uploadFileDefaultContentType", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "3050", + "name": "uploadFileDefaultContentType", + "resourceName": "Body", + "accessibility": "public", + "parameters": [ + { + "$id": "3051", + "kind": "header", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are */*", + "type": { + "$id": "3052", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "isApiVersion": false, + "optional": false, + "isContentType": true, + "scope": "Method", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Type.File.Body.uploadFileDefaultContentType.contentType", + "methodParameterSegments": [ + { + "$id": "3053", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are */*", + "type": { + "$ref": "3052" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.File.Body.uploadFileDefaultContentType.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + }, + { + "$id": "3054", + "kind": "body", + "name": "file", + "serializedName": "file", + "type": { + "$ref": "3002" + }, + "isApiVersion": false, + "contentTypes": [ + "*/*" + ], + "defaultContentType": "*/*", + "optional": false, + "scope": "Method", + "decorators": [], + "readOnly": false, + "crossLanguageDefinitionId": "Type.File.Body.uploadFileDefaultContentType.file", + "methodParameterSegments": [ + { + "$id": "3055", + "kind": "method", + "name": "file", + "serializedName": "file", + "type": { + "$ref": "3002" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.File.Body.uploadFileDefaultContentType.file", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 204 + ], + "headers": [], + "isErrorResponse": false + } + ], + "httpMethod": "POST", + "uri": "{endpoint}", + "path": "/type/file/body/request/default-content-type", + "requestMediaTypes": [], + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Type.File.Body.uploadFileDefaultContentType", + "decorators": [], + "namespace": "Type.File.Body" + }, + "parameters": [ + { + "$ref": "3055" + }, + { + "$ref": "3053" + } + ], + "response": {}, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Type.File.Body.uploadFileDefaultContentType" + }, + { + "$id": "3056", + "kind": "basic", + "name": "downloadFileDefaultContentType", + "accessibility": "public", + "apiVersions": [], + "operation": { + "$id": "3057", + "name": "downloadFileDefaultContentType", + "resourceName": "Body", + "accessibility": "public", + "parameters": [ + { + "$id": "3058", + "kind": "header", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "27" + }, + "isApiVersion": false, + "optional": false, + "isContentType": false, + "scope": "Constant", + "readOnly": false, + "decorators": [], + "crossLanguageDefinitionId": "Type.File.Body.downloadFileDefaultContentType.accept", + "methodParameterSegments": [ + { + "$id": "3059", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "27" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.File.Body.downloadFileDefaultContentType.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] + } + ], + "responses": [ + { + "statusCodes": [ + 200 + ], + "bodyType": { + "$ref": "3002" + }, + "headers": [ + { + "name": "contentType", + "summary": "The allowed media (MIME) types of the file contents.", + "doc": "The allowed media (MIME) types of the file contents.\n\nIn file bodies, this value comes from the `Content-Type` header of the request or response. In JSON bodies,\nthis value is serialized as a field in the response.\n\nNOTE: this is not _necessarily_ the same as the `Content-Type` header of the request or response, but\nit will be for file bodies. It may be different if the file is serialized as a JSON object. It always refers to the\n_contents_ of the file, and not necessarily the way the file itself is transmitted or serialized.", + "type": { + "$id": "3060", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + } + } + ], + "isErrorResponse": false, + "contentTypes": [ + "*/*" + ] + } + ], + "httpMethod": "GET", + "uri": "{endpoint}", + "path": "/type/file/body/response/default-content-type", + "bufferResponse": true, + "generateProtocolMethod": true, + "generateConvenienceMethod": true, + "crossLanguageDefinitionId": "Type.File.Body.downloadFileDefaultContentType", + "decorators": [], + "namespace": "Type.File.Body" + }, + "parameters": [ + { + "$ref": "3059" + } + ], + "response": { + "type": { + "$ref": "3002" + } + }, + "isOverride": false, + "generateConvenient": true, + "generateProtocol": true, + "crossLanguageDefinitionId": "Type.File.Body.downloadFileDefaultContentType" + } + ], + "parameters": [ + { + "$id": "3061", + "kind": "endpoint", + "name": "endpoint", + "serializedName": "endpoint", + "doc": "Service host", + "type": { + "$id": "3062", + "kind": "url", + "name": "endpoint", + "crossLanguageDefinitionId": "TypeSpec.url" + }, + "isApiVersion": false, + "optional": false, + "scope": "Client", + "isEndpoint": true, + "defaultValue": { + "type": { + "$id": "3063", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string" + }, + "value": "http://localhost:3000" + }, + "serverUrlTemplate": "{endpoint}", + "skipUrlEncoding": false, + "readOnly": false, + "crossLanguageDefinitionId": "Type.File.Body.endpoint" + } + ], + "initializedBy": 0, + "decorators": [], + "crossLanguageDefinitionId": "Type.File.Body", + "apiVersions": [], + "parent": { + "$ref": "3011" + }, + "isMultiServiceClient": false + } + ], + "isMultiServiceClient": false + } + ] +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/Type.Model.Empty.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/Type.Model.Empty.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/Type.Model.Empty.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/Type.Model.Empty.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/Type.Model.Empty.sln deleted file mode 100644 index 5f25ff5e3f4..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/Type.Model.Empty.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Model.Empty", "src\Type.Model.Empty.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/Type.Model.Empty.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/Type.Model.Empty.slnx new file mode 100644 index 00000000000..217f62d0756 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/Type.Model.Empty.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/EmptyClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/EmptyClient.cs index 70d8023048c..00f7325cbd9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/EmptyClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/EmptyClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -14,7 +15,12 @@ public partial class EmptyClient { public EmptyClient() : this(new Uri("http://localhost:3000"), new EmptyClientOptions()) => throw null; - public EmptyClient(Uri endpoint, EmptyClientOptions options) => throw null; + internal EmptyClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, EmptyClientOptions options) => throw null; + + public EmptyClient(Uri endpoint, EmptyClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public EmptyClient(EmptyClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/EmptyClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/EmptyClientOptions.cs index 56e786c637d..624ba0c0143 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/EmptyClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/EmptyClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace _Type.Model.Empty { public partial class EmptyClientOptions : ClientPipelineOptions { + public EmptyClientOptions() => throw null; + + [Experimental("SCME0002")] + internal EmptyClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/EmptyClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/EmptyClientSettings.cs new file mode 100644 index 00000000000..8635789555e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/EmptyClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace _Type.Model.Empty +{ + [Experimental("SCME0002")] + public partial class EmptyClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public EmptyClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyInput.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyInput.Serialization.cs index d707c02e6fa..9691ae42ce7 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyInput.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyInput.Serialization.cs @@ -11,24 +11,24 @@ namespace _Type.Model.Empty { public partial class EmptyInput : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - EmptyInput IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual EmptyInput PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual EmptyInput JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - EmptyInput IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual EmptyInput PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(EmptyInput emptyInput) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + EmptyInput IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual EmptyInput JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyInputOutput.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyInputOutput.Serialization.cs index c42f9caf13c..52a4b7905be 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyInputOutput.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyInputOutput.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Model.Empty { public partial class EmptyInputOutput : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - EmptyInputOutput IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual EmptyInputOutput PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual EmptyInputOutput JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - EmptyInputOutput IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual EmptyInputOutput PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(EmptyInputOutput emptyInputOutput) => throw null; public static explicit operator EmptyInputOutput(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + EmptyInputOutput IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual EmptyInputOutput JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyOutput.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyOutput.Serialization.cs index b5d563f24ab..0f42e15ceb7 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyOutput.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyOutput.Serialization.cs @@ -11,24 +11,24 @@ namespace _Type.Model.Empty { public partial class EmptyOutput : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - EmptyOutput IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual EmptyOutput PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual EmptyOutput JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - EmptyOutput IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual EmptyOutput PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator EmptyOutput(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + EmptyOutput IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual EmptyOutput JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..ee38e5032d5 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "EmptyClient": { + "type": "object", + "description": "Configuration for EmptyClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/emptyClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "emptyClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Type.Model.Empty.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Type.Model.Empty.csproj index a7f9887b0be..3b980895832 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Type.Model.Empty.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Type.Model.Empty.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/tspCodeModel.json index 2e8c0cbc1b7..2912ee63507 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/tspCodeModel.json @@ -153,10 +153,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Empty.putEmpty.contentType" + "crossLanguageDefinitionId": "Type.Model.Empty.putEmpty.contentType", + "methodParameterSegments": [ + { + "$id": "16", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Empty.putEmpty.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "16", + "$id": "17", "kind": "body", "name": "input", "serializedName": "input", @@ -172,7 +192,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Empty.putEmpty.input" + "crossLanguageDefinitionId": "Type.Model.Empty.putEmpty.input", + "methodParameterSegments": [ + { + "$id": "18", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "9" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Empty.putEmpty.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -199,39 +238,10 @@ }, "parameters": [ { - "$id": "17", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "9" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Empty.putEmpty.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "18" }, { - "$id": "18", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Empty.putEmpty.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "16" } ], "response": {}, @@ -266,7 +276,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Empty.getEmpty.accept" + "crossLanguageDefinitionId": "Type.Model.Empty.getEmpty.accept", + "methodParameterSegments": [ + { + "$id": "22", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "3" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Empty.getEmpty.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -296,21 +325,7 @@ }, "parameters": [ { - "$id": "22", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Empty.getEmpty.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "22" } ], "response": { @@ -350,10 +365,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Empty.postRoundTripEmpty.contentType" + "crossLanguageDefinitionId": "Type.Model.Empty.postRoundTripEmpty.contentType", + "methodParameterSegments": [ + { + "$id": "26", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Empty.postRoundTripEmpty.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "26", + "$id": "27", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -366,10 +401,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Empty.postRoundTripEmpty.accept" + "crossLanguageDefinitionId": "Type.Model.Empty.postRoundTripEmpty.accept", + "methodParameterSegments": [ + { + "$id": "28", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Empty.postRoundTripEmpty.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "27", + "$id": "29", "kind": "body", "name": "body", "serializedName": "body", @@ -385,7 +439,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Empty.postRoundTripEmpty.body" + "crossLanguageDefinitionId": "Type.Model.Empty.postRoundTripEmpty.body", + "methodParameterSegments": [ + { + "$id": "30", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "11" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Empty.postRoundTripEmpty.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -418,56 +491,13 @@ }, "parameters": [ { - "$id": "28", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "11" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Empty.postRoundTripEmpty.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "30" }, { - "$id": "29", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Empty.postRoundTripEmpty.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "26" }, { - "$id": "30", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Empty.postRoundTripEmpty.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "28" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/Type.Model.Inheritance.EnumDiscriminator.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/Type.Model.Inheritance.EnumDiscriminator.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/Type.Model.Inheritance.EnumDiscriminator.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/Type.Model.Inheritance.EnumDiscriminator.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/Type.Model.Inheritance.EnumDiscriminator.sln deleted file mode 100644 index dcef5e7a9f6..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/Type.Model.Inheritance.EnumDiscriminator.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Model.Inheritance.EnumDiscriminator", "src\Type.Model.Inheritance.EnumDiscriminator.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/Type.Model.Inheritance.EnumDiscriminator.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/Type.Model.Inheritance.EnumDiscriminator.slnx new file mode 100644 index 00000000000..c65075500c0 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/Type.Model.Inheritance.EnumDiscriminator.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/EnumDiscriminatorClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/EnumDiscriminatorClient.cs index 2eec9f2f047..ca37716df88 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/EnumDiscriminatorClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/EnumDiscriminatorClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -14,7 +15,12 @@ public partial class EnumDiscriminatorClient { public EnumDiscriminatorClient() : this(new Uri("http://localhost:3000"), new EnumDiscriminatorClientOptions()) => throw null; - public EnumDiscriminatorClient(Uri endpoint, EnumDiscriminatorClientOptions options) => throw null; + internal EnumDiscriminatorClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, EnumDiscriminatorClientOptions options) => throw null; + + public EnumDiscriminatorClient(Uri endpoint, EnumDiscriminatorClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public EnumDiscriminatorClient(EnumDiscriminatorClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/EnumDiscriminatorClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/EnumDiscriminatorClientOptions.cs index fc64fcba766..3945cd829b8 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/EnumDiscriminatorClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/EnumDiscriminatorClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace _Type.Model.Inheritance.EnumDiscriminator { public partial class EnumDiscriminatorClientOptions : ClientPipelineOptions { + public EnumDiscriminatorClientOptions() => throw null; + + [Experimental("SCME0002")] + internal EnumDiscriminatorClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/EnumDiscriminatorClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/EnumDiscriminatorClientSettings.cs new file mode 100644 index 00000000000..fd5914814bd --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/EnumDiscriminatorClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace _Type.Model.Inheritance.EnumDiscriminator +{ + [Experimental("SCME0002")] + public partial class EnumDiscriminatorClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public EnumDiscriminatorClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Cobra.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Cobra.Serialization.cs index 72cdf200a6c..e6ef51c0e6e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Cobra.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Cobra.Serialization.cs @@ -12,22 +12,22 @@ public partial class Cobra : Snake, IJsonModel { internal Cobra() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override Snake PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Cobra IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override Snake JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Cobra IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Cobra IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override Snake PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Cobra IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override Snake JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Dog.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Dog.Serialization.cs index f56d5d5949f..d7b2b79211e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Dog.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Dog.Serialization.cs @@ -14,26 +14,26 @@ public abstract partial class Dog : IJsonModel { internal Dog() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Dog IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Dog PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Dog JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Dog IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Dog PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Dog dog) => throw null; public static explicit operator Dog(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Dog IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Dog JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Golden.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Golden.Serialization.cs index 408bb5e23ec..30ceb8e3262 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Golden.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Golden.Serialization.cs @@ -12,22 +12,22 @@ public partial class Golden : Dog, IJsonModel { internal Golden() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override Dog PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Golden IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override Dog JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Golden IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Golden IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override Dog PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Golden IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override Dog JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Snake.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Snake.Serialization.cs index b94feb2a34e..4ab44000848 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Snake.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Snake.Serialization.cs @@ -14,26 +14,26 @@ public abstract partial class Snake : IJsonModel { internal Snake() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Snake IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Snake PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Snake JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Snake IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Snake PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Snake snake) => throw null; public static explicit operator Snake(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Snake IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Snake JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownDog.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownDog.Serialization.cs index 6317cc18417..311634096f6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownDog.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownDog.Serialization.cs @@ -12,22 +12,22 @@ internal partial class UnknownDog : Dog, IJsonModel { internal UnknownDog() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override Dog PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Dog IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override Dog JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Dog IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Dog IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override Dog PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Dog IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override Dog JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownSnake.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownSnake.Serialization.cs index 147154bfc5a..b6a052adeb6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownSnake.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownSnake.Serialization.cs @@ -12,22 +12,22 @@ internal partial class UnknownSnake : Snake, IJsonModel { internal UnknownSnake() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override Snake PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Snake IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override Snake JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Snake IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Snake IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override Snake PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Snake IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override Snake JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..7591f16230a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "EnumDiscriminatorClient": { + "type": "object", + "description": "Configuration for EnumDiscriminatorClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/enumDiscriminatorClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "enumDiscriminatorClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Type.Model.Inheritance.EnumDiscriminator.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Type.Model.Inheritance.EnumDiscriminator.csproj index 35612789efc..2a13b66e119 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Type.Model.Inheritance.EnumDiscriminator.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Type.Model.Inheritance.EnumDiscriminator.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/tspCodeModel.json index 7252d578d83..c87ce4ed9f8 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/tspCodeModel.json @@ -334,7 +334,8 @@ }, "enumType": { "$ref": "30" - } + }, + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.DogKind.Golden" } ], "isFixed": false, @@ -499,7 +500,8 @@ }, "valueType": { "$ref": "41" - } + }, + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.SnakeKind.Cobra" } ], "isFixed": true, @@ -571,7 +573,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModel.accept" + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModel.accept", + "methodParameterSegments": [ + { + "$id": "47", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModel.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -601,21 +622,7 @@ }, "parameters": [ { - "$id": "47", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModel.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "47" } ], "response": { @@ -657,10 +664,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel.contentType" + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel.contentType", + "methodParameterSegments": [ + { + "$id": "51", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "51", + "$id": "52", "kind": "body", "name": "input", "serializedName": "input", @@ -677,7 +704,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel.input" + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel.input", + "methodParameterSegments": [ + { + "$id": "53", + "kind": "method", + "name": "input", + "serializedName": "input", + "doc": "Dog to create", + "type": { + "$ref": "23" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -704,40 +751,10 @@ }, "parameters": [ { - "$id": "52", - "kind": "method", - "name": "input", - "serializedName": "input", - "doc": "Dog to create", - "type": { - "$ref": "23" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "53" }, { - "$id": "53", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "51" } ], "response": {}, @@ -774,7 +791,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelMissingDiscriminator.accept" + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelMissingDiscriminator.accept", + "methodParameterSegments": [ + { + "$id": "57", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "11" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelMissingDiscriminator.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -804,21 +840,7 @@ }, "parameters": [ { - "$id": "57", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelMissingDiscriminator.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "57" } ], "response": { @@ -859,7 +881,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelWrongDiscriminator.accept" + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelWrongDiscriminator.accept", + "methodParameterSegments": [ + { + "$id": "61", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "13" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelWrongDiscriminator.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -889,21 +930,7 @@ }, "parameters": [ { - "$id": "61", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelWrongDiscriminator.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "61" } ], "response": { @@ -944,7 +971,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getFixedModel.accept" + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getFixedModel.accept", + "methodParameterSegments": [ + { + "$id": "65", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "15" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getFixedModel.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -974,21 +1020,7 @@ }, "parameters": [ { - "$id": "65", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getFixedModel.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "65" } ], "response": { @@ -1030,10 +1062,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.putFixedModel.contentType" + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.putFixedModel.contentType", + "methodParameterSegments": [ + { + "$id": "69", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.putFixedModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "69", + "$id": "70", "kind": "body", "name": "input", "serializedName": "input", @@ -1050,7 +1102,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.putFixedModel.input" + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.putFixedModel.input", + "methodParameterSegments": [ + { + "$id": "71", + "kind": "method", + "name": "input", + "serializedName": "input", + "doc": "Snake to create", + "type": { + "$ref": "33" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.putFixedModel.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1077,40 +1149,10 @@ }, "parameters": [ { - "$id": "70", - "kind": "method", - "name": "input", - "serializedName": "input", - "doc": "Snake to create", - "type": { - "$ref": "33" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.putFixedModel.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "71" }, { - "$id": "71", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "17" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.putFixedModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "69" } ], "response": {}, @@ -1147,7 +1189,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelMissingDiscriminator.accept" + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelMissingDiscriminator.accept", + "methodParameterSegments": [ + { + "$id": "75", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "19" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelMissingDiscriminator.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1177,21 +1238,7 @@ }, "parameters": [ { - "$id": "75", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "19" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelMissingDiscriminator.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "75" } ], "response": { @@ -1232,7 +1279,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator.accept" + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator.accept", + "methodParameterSegments": [ + { + "$id": "79", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "21" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1262,21 +1328,7 @@ }, "parameters": [ { - "$id": "79", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "21" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "79" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/Type.Model.Inheritance.NestedDiscriminator.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/Type.Model.Inheritance.NestedDiscriminator.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/Type.Model.Inheritance.NestedDiscriminator.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/Type.Model.Inheritance.NestedDiscriminator.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/Type.Model.Inheritance.NestedDiscriminator.sln deleted file mode 100644 index a2e743aa191..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/Type.Model.Inheritance.NestedDiscriminator.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Model.Inheritance.NestedDiscriminator", "src\Type.Model.Inheritance.NestedDiscriminator.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/Type.Model.Inheritance.NestedDiscriminator.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/Type.Model.Inheritance.NestedDiscriminator.slnx new file mode 100644 index 00000000000..1014b701db6 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/Type.Model.Inheritance.NestedDiscriminator.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.Serialization.cs index 815c2485173..2ff7dcfba56 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.Serialization.cs @@ -14,26 +14,26 @@ public abstract partial class Fish : IJsonModel { internal Fish() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Fish IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Fish PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Fish JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Fish IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Fish PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Fish fish) => throw null; public static explicit operator Fish(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Fish IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Fish JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.Serialization.cs index 5e5e28ed5b7..ddb997c63ec 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.Serialization.cs @@ -12,22 +12,22 @@ public partial class GoblinShark : Shark, IJsonModel { internal GoblinShark() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override Fish PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - GoblinShark IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override Fish JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + GoblinShark IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - GoblinShark IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override Fish PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + GoblinShark IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override Fish JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.Serialization.cs index 3187f9521d6..1715ec57b83 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.Serialization.cs @@ -12,22 +12,22 @@ public partial class Salmon : Fish, IJsonModel { internal Salmon() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override Fish PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Salmon IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override Fish JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Salmon IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Salmon IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override Fish PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Salmon IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override Fish JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.Serialization.cs index 4ea7c0a2a22..5af6bb401b4 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.Serialization.cs @@ -12,22 +12,22 @@ public partial class SawShark : Shark, IJsonModel { internal SawShark() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override Fish PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - SawShark IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override Fish JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + SawShark IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - SawShark IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override Fish PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + SawShark IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override Fish JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.Serialization.cs index a5c15c1f547..012d4199490 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.Serialization.cs @@ -12,22 +12,22 @@ public partial class Shark : Fish, IJsonModel { internal Shark() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override Fish PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Shark IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override Fish JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Shark IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Shark IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override Fish PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Shark IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override Fish JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.Serialization.cs index bbe6b10278b..0d3efbbeb76 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.Serialization.cs @@ -12,22 +12,22 @@ internal partial class UnknownFish : Fish, IJsonModel { internal UnknownFish() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override Fish PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Fish IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override Fish JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Fish IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Fish IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override Fish PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Fish IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override Fish JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.Serialization.cs index 1ea2523d905..82553601131 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.Serialization.cs @@ -12,22 +12,22 @@ internal partial class UnknownShark : Shark, IJsonModel { internal UnknownShark() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override Fish PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Shark IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override Fish JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Shark IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Shark IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override Fish PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Shark IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override Fish JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClient.cs index 677ad5ba4f3..7e5536731ab 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -14,7 +15,12 @@ public partial class NestedDiscriminatorClient { public NestedDiscriminatorClient() : this(new Uri("http://localhost:3000"), new NestedDiscriminatorClientOptions()) => throw null; - public NestedDiscriminatorClient(Uri endpoint, NestedDiscriminatorClientOptions options) => throw null; + internal NestedDiscriminatorClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, NestedDiscriminatorClientOptions options) => throw null; + + public NestedDiscriminatorClient(Uri endpoint, NestedDiscriminatorClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public NestedDiscriminatorClient(NestedDiscriminatorClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClientOptions.cs index 000960d84d9..f6c8cb646ab 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace _Type.Model.Inheritance.NestedDiscriminator { public partial class NestedDiscriminatorClientOptions : ClientPipelineOptions { + public NestedDiscriminatorClientOptions() => throw null; + + [Experimental("SCME0002")] + internal NestedDiscriminatorClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClientSettings.cs new file mode 100644 index 00000000000..ebb7fd9e0c8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace _Type.Model.Inheritance.NestedDiscriminator +{ + [Experimental("SCME0002")] + public partial class NestedDiscriminatorClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public NestedDiscriminatorClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..6b466ad2b16 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "NestedDiscriminatorClient": { + "type": "object", + "description": "Configuration for NestedDiscriminatorClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/nestedDiscriminatorClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "nestedDiscriminatorClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Type.Model.Inheritance.NestedDiscriminator.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Type.Model.Inheritance.NestedDiscriminator.csproj index dc43dde34f4..316846b25f2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Type.Model.Inheritance.NestedDiscriminator.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Type.Model.Inheritance.NestedDiscriminator.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/tspCodeModel.json index aa5a2a9490e..d307b65ceef 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/tspCodeModel.json @@ -565,7 +565,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.getModel.accept" + "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.getModel.accept", + "methodParameterSegments": [ + { + "$id": "46", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.getModel.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -595,21 +614,7 @@ }, "parameters": [ { - "$id": "46", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.getModel.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "46" } ], "response": { @@ -649,10 +654,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.putModel.contentType" + "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.putModel.contentType", + "methodParameterSegments": [ + { + "$id": "50", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "11" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.putModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "50", + "$id": "51", "kind": "body", "name": "input", "serializedName": "input", @@ -668,7 +693,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.putModel.input" + "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.putModel.input", + "methodParameterSegments": [ + { + "$id": "52", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "21" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.putModel.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -695,39 +739,10 @@ }, "parameters": [ { - "$id": "51", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "21" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.putModel.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "52" }, { - "$id": "52", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.putModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "50" } ], "response": {}, @@ -762,7 +777,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.getRecursiveModel.accept" + "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.getRecursiveModel.accept", + "methodParameterSegments": [ + { + "$id": "56", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "13" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.getRecursiveModel.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -792,21 +826,7 @@ }, "parameters": [ { - "$id": "56", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.getRecursiveModel.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "56" } ], "response": { @@ -846,10 +866,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel.contentType" + "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel.contentType", + "methodParameterSegments": [ + { + "$id": "60", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "15" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "60", + "$id": "61", "kind": "body", "name": "input", "serializedName": "input", @@ -865,7 +905,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel.input" + "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel.input", + "methodParameterSegments": [ + { + "$id": "62", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "21" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -892,39 +951,10 @@ }, "parameters": [ { - "$id": "61", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "21" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "62" }, { - "$id": "62", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "60" } ], "response": {}, @@ -959,7 +989,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.getMissingDiscriminator.accept" + "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.getMissingDiscriminator.accept", + "methodParameterSegments": [ + { + "$id": "66", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.getMissingDiscriminator.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -989,21 +1038,7 @@ }, "parameters": [ { - "$id": "66", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "17" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.getMissingDiscriminator.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "66" } ], "response": { @@ -1042,7 +1077,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator.accept" + "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator.accept", + "methodParameterSegments": [ + { + "$id": "70", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "19" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1072,21 +1126,7 @@ }, "parameters": [ { - "$id": "70", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "19" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "70" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/Type.Model.Inheritance.NotDiscriminated.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/Type.Model.Inheritance.NotDiscriminated.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/Type.Model.Inheritance.NotDiscriminated.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/Type.Model.Inheritance.NotDiscriminated.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/Type.Model.Inheritance.NotDiscriminated.sln deleted file mode 100644 index e69774eeed0..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/Type.Model.Inheritance.NotDiscriminated.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Model.Inheritance.NotDiscriminated", "src\Type.Model.Inheritance.NotDiscriminated.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/Type.Model.Inheritance.NotDiscriminated.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/Type.Model.Inheritance.NotDiscriminated.slnx new file mode 100644 index 00000000000..75a77e17068 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/Type.Model.Inheritance.NotDiscriminated.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.Serialization.cs index 0131663d009..549199c4ee8 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.Serialization.cs @@ -12,22 +12,22 @@ public partial class Cat : Pet, IJsonModel { internal Cat() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override Pet PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Cat IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override Pet JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Cat IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Cat IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override Pet PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Cat IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override Pet JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.Serialization.cs index 2b3fd8a3d40..784d523623d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.Serialization.cs @@ -12,22 +12,22 @@ public partial class Pet : IJsonModel { internal Pet() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual Pet PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Pet IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual Pet JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Pet IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Pet IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual Pet PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Pet IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual Pet JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.Serialization.cs index 5171f3e688c..05d51acddf2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.Serialization.cs @@ -13,26 +13,26 @@ public partial class Siamese : Cat, IJsonModel { internal Siamese() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Siamese IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected override Pet PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override Pet JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Siamese IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override Pet PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Siamese siamese) => throw null; public static explicit operator Siamese(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Siamese IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected override Pet JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClient.cs index e573655283f..4a7e240071e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -14,7 +15,12 @@ public partial class NotDiscriminatedClient { public NotDiscriminatedClient() : this(new Uri("http://localhost:3000"), new NotDiscriminatedClientOptions()) => throw null; - public NotDiscriminatedClient(Uri endpoint, NotDiscriminatedClientOptions options) => throw null; + internal NotDiscriminatedClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, NotDiscriminatedClientOptions options) => throw null; + + public NotDiscriminatedClient(Uri endpoint, NotDiscriminatedClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public NotDiscriminatedClient(NotDiscriminatedClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClientOptions.cs index c727712c1f8..7b39c39bee2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace _Type.Model.Inheritance.NotDiscriminated { public partial class NotDiscriminatedClientOptions : ClientPipelineOptions { + public NotDiscriminatedClientOptions() => throw null; + + [Experimental("SCME0002")] + internal NotDiscriminatedClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClientSettings.cs new file mode 100644 index 00000000000..eab881e66bc --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace _Type.Model.Inheritance.NotDiscriminated +{ + [Experimental("SCME0002")] + public partial class NotDiscriminatedClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public NotDiscriminatedClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..3ef39b513d4 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "NotDiscriminatedClient": { + "type": "object", + "description": "Configuration for NotDiscriminatedClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/notDiscriminatedClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "notDiscriminatedClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Type.Model.Inheritance.NotDiscriminated.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Type.Model.Inheritance.NotDiscriminated.csproj index c3f4519509b..bce1c6453e4 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Type.Model.Inheritance.NotDiscriminated.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Type.Model.Inheritance.NotDiscriminated.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/tspCodeModel.json index f6b350ad159..3e2ff9c1a62 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/tspCodeModel.json @@ -237,10 +237,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.postValid.contentType" + "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.postValid.contentType", + "methodParameterSegments": [ + { + "$id": "22", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.postValid.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "22", + "$id": "23", "kind": "body", "name": "input", "serializedName": "input", @@ -256,7 +276,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.postValid.input" + "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.postValid.input", + "methodParameterSegments": [ + { + "$id": "24", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "9" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.postValid.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -283,39 +322,10 @@ }, "parameters": [ { - "$id": "23", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "9" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.postValid.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "24" }, { - "$id": "24", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.postValid.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "22" } ], "response": {}, @@ -350,7 +360,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.getValid.accept" + "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.getValid.accept", + "methodParameterSegments": [ + { + "$id": "28", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "3" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.getValid.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -380,21 +409,7 @@ }, "parameters": [ { - "$id": "28", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.getValid.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "28" } ], "response": { @@ -434,10 +449,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.putValid.contentType" + "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.putValid.contentType", + "methodParameterSegments": [ + { + "$id": "32", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.putValid.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "32", + "$id": "33", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -450,10 +485,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.putValid.accept" + "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.putValid.accept", + "methodParameterSegments": [ + { + "$id": "34", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.putValid.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "33", + "$id": "35", "kind": "body", "name": "input", "serializedName": "input", @@ -469,7 +523,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.putValid.input" + "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.putValid.input", + "methodParameterSegments": [ + { + "$id": "36", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "9" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.putValid.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -502,56 +575,13 @@ }, "parameters": [ { - "$id": "34", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "9" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.putValid.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "36" }, { - "$id": "35", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.putValid.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "32" }, { - "$id": "36", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.putValid.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "34" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/Type.Model.Inheritance.Recursive.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/Type.Model.Inheritance.Recursive.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/Type.Model.Inheritance.Recursive.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/Type.Model.Inheritance.Recursive.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/Type.Model.Inheritance.Recursive.sln deleted file mode 100644 index f0cfad269e1..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/Type.Model.Inheritance.Recursive.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Model.Inheritance.Recursive", "src\Type.Model.Inheritance.Recursive.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/Type.Model.Inheritance.Recursive.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/Type.Model.Inheritance.Recursive.slnx new file mode 100644 index 00000000000..0db6d8ed208 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/Type.Model.Inheritance.Recursive.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/Element.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/Element.Serialization.cs index 8b2489ead1f..c654e388b39 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/Element.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/Element.Serialization.cs @@ -10,22 +10,22 @@ namespace _Type.Model.Inheritance.Recursive { public partial class Element : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual Element PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Element IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual Element JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Element IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Element IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual Element PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Element IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual Element JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/Extension.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/Extension.Serialization.cs index 73a0668535d..557add43e07 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/Extension.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/Extension.Serialization.cs @@ -13,26 +13,26 @@ public partial class Extension : Element, IJsonModel { internal Extension() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Extension IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected override Element PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override Element JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Extension IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override Element PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Extension extension) => throw null; public static explicit operator Extension(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Extension IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected override Element JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/RecursiveClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/RecursiveClient.cs index 50140c50d04..1f429a7f058 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/RecursiveClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/RecursiveClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -14,7 +15,12 @@ public partial class RecursiveClient { public RecursiveClient() : this(new Uri("http://localhost:3000"), new RecursiveClientOptions()) => throw null; - public RecursiveClient(Uri endpoint, RecursiveClientOptions options) => throw null; + internal RecursiveClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, RecursiveClientOptions options) => throw null; + + public RecursiveClient(Uri endpoint, RecursiveClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public RecursiveClient(RecursiveClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/RecursiveClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/RecursiveClientOptions.cs index cf994ec31db..3d72ed64ff1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/RecursiveClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/RecursiveClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace _Type.Model.Inheritance.Recursive { public partial class RecursiveClientOptions : ClientPipelineOptions { + public RecursiveClientOptions() => throw null; + + [Experimental("SCME0002")] + internal RecursiveClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/RecursiveClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/RecursiveClientSettings.cs new file mode 100644 index 00000000000..deaa4e1f167 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/RecursiveClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace _Type.Model.Inheritance.Recursive +{ + [Experimental("SCME0002")] + public partial class RecursiveClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public RecursiveClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..5433e73d760 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "RecursiveClient": { + "type": "object", + "description": "Configuration for RecursiveClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/recursiveClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "recursiveClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Type.Model.Inheritance.Recursive.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Type.Model.Inheritance.Recursive.csproj index 8a71cad9164..20400292b1b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Type.Model.Inheritance.Recursive.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Type.Model.Inheritance.Recursive.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/tspCodeModel.json index 9a8c123dcbc..5abbda8b209 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/tspCodeModel.json @@ -163,10 +163,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.Recursive.put.contentType" + "crossLanguageDefinitionId": "Type.Model.Inheritance.Recursive.put.contentType", + "methodParameterSegments": [ + { + "$id": "15", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.Recursive.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "15", + "$id": "16", "kind": "body", "name": "input", "serializedName": "input", @@ -182,7 +202,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Inheritance.Recursive.put.input" + "crossLanguageDefinitionId": "Type.Model.Inheritance.Recursive.put.input", + "methodParameterSegments": [ + { + "$id": "17", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "5" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Inheritance.Recursive.put.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -209,39 +248,10 @@ }, "parameters": [ { - "$id": "16", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "5" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Inheritance.Recursive.put.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "17" }, { - "$id": "17", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.Recursive.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "15" } ], "response": {}, @@ -276,7 +286,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.Recursive.get.accept" + "crossLanguageDefinitionId": "Type.Model.Inheritance.Recursive.get.accept", + "methodParameterSegments": [ + { + "$id": "21", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "3" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.Recursive.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -306,21 +335,7 @@ }, "parameters": [ { - "$id": "21", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.Recursive.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "21" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/Type.Model.Inheritance.SingleDiscriminator.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/Type.Model.Inheritance.SingleDiscriminator.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/Type.Model.Inheritance.SingleDiscriminator.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/Type.Model.Inheritance.SingleDiscriminator.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/Type.Model.Inheritance.SingleDiscriminator.sln deleted file mode 100644 index a5bec840080..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/Type.Model.Inheritance.SingleDiscriminator.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Model.Inheritance.SingleDiscriminator", "src\Type.Model.Inheritance.SingleDiscriminator.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/Type.Model.Inheritance.SingleDiscriminator.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/Type.Model.Inheritance.SingleDiscriminator.slnx new file mode 100644 index 00000000000..f95722ec83a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/Type.Model.Inheritance.SingleDiscriminator.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.Serialization.cs index 46c4f020cb3..3c62ae4bc65 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.Serialization.cs @@ -14,26 +14,26 @@ public abstract partial class Bird : IJsonModel { internal Bird() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Bird IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Bird PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Bird JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Bird IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Bird PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Bird bird) => throw null; public static explicit operator Bird(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Bird IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Bird JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.Serialization.cs index 8b16e7d19e6..f843ed50fbc 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.Serialization.cs @@ -14,24 +14,24 @@ public abstract partial class Dinosaur : IJsonModel { internal Dinosaur() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Dinosaur IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Dinosaur PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Dinosaur JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Dinosaur IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Dinosaur PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator Dinosaur(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Dinosaur IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Dinosaur JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.Serialization.cs index f219ec4189c..edfbcabed7c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.Serialization.cs @@ -12,22 +12,22 @@ public partial class Eagle : Bird, IJsonModel { internal Eagle() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override Bird PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Eagle IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override Bird JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Eagle IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Eagle IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override Bird PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Eagle IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override Bird JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.Serialization.cs index c97b3fde61a..c54c1f10a78 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.Serialization.cs @@ -12,22 +12,22 @@ public partial class Goose : Bird, IJsonModel { internal Goose() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override Bird PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Goose IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override Bird JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Goose IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Goose IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override Bird PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Goose IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override Bird JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.Serialization.cs index eee0eb736d5..ac92d3697f9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.Serialization.cs @@ -12,22 +12,22 @@ public partial class SeaGull : Bird, IJsonModel { internal SeaGull() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override Bird PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - SeaGull IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override Bird JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + SeaGull IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - SeaGull IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override Bird PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + SeaGull IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override Bird JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.Serialization.cs index bfaa7af613d..ff21640bf92 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.Serialization.cs @@ -12,22 +12,22 @@ public partial class Sparrow : Bird, IJsonModel { internal Sparrow() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override Bird PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Sparrow IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override Bird JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Sparrow IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Sparrow IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override Bird PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Sparrow IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override Bird JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.Serialization.cs index b366efaa923..e7eaa25db00 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.Serialization.cs @@ -12,22 +12,22 @@ public partial class TRex : Dinosaur, IJsonModel { internal TRex() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override Dinosaur PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - TRex IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override Dinosaur JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + TRex IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - TRex IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override Dinosaur PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + TRex IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override Dinosaur JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.Serialization.cs index 6a604894ed0..69c3bb5be9e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.Serialization.cs @@ -12,22 +12,22 @@ internal partial class UnknownBird : Bird, IJsonModel { internal UnknownBird() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override Bird PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Bird IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override Bird JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Bird IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Bird IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override Bird PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Bird IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override Bird JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.Serialization.cs index bff5bbdca5d..492099b9aad 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.Serialization.cs @@ -12,22 +12,22 @@ internal partial class UnknownDinosaur : Dinosaur, IJsonModel { internal UnknownDinosaur() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override Dinosaur PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Dinosaur IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override Dinosaur JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Dinosaur IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Dinosaur IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override Dinosaur PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Dinosaur IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override Dinosaur JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClient.cs index 261b93c7665..d6a1a0eb170 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -14,7 +15,12 @@ public partial class SingleDiscriminatorClient { public SingleDiscriminatorClient() : this(new Uri("http://localhost:3000"), new SingleDiscriminatorClientOptions()) => throw null; - public SingleDiscriminatorClient(Uri endpoint, SingleDiscriminatorClientOptions options) => throw null; + internal SingleDiscriminatorClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, SingleDiscriminatorClientOptions options) => throw null; + + public SingleDiscriminatorClient(Uri endpoint, SingleDiscriminatorClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public SingleDiscriminatorClient(SingleDiscriminatorClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClientOptions.cs index ab3b42d7150..2b4f31e4023 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace _Type.Model.Inheritance.SingleDiscriminator { public partial class SingleDiscriminatorClientOptions : ClientPipelineOptions { + public SingleDiscriminatorClientOptions() => throw null; + + [Experimental("SCME0002")] + internal SingleDiscriminatorClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClientSettings.cs new file mode 100644 index 00000000000..ab187bd8d92 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace _Type.Model.Inheritance.SingleDiscriminator +{ + [Experimental("SCME0002")] + public partial class SingleDiscriminatorClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public SingleDiscriminatorClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..d4c2f8f2c9e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "SingleDiscriminatorClient": { + "type": "object", + "description": "Configuration for SingleDiscriminatorClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/singleDiscriminatorClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "singleDiscriminatorClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Type.Model.Inheritance.SingleDiscriminator.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Type.Model.Inheritance.SingleDiscriminator.csproj index 9595f93156b..d3717581700 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Type.Model.Inheritance.SingleDiscriminator.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Type.Model.Inheritance.SingleDiscriminator.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/tspCodeModel.json index 746fa3c0fbd..b0dd918ac2e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/tspCodeModel.json @@ -684,7 +684,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getModel.accept" + "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getModel.accept", + "methodParameterSegments": [ + { + "$id": "55", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "11" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getModel.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -714,21 +733,7 @@ }, "parameters": [ { - "$id": "55", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getModel.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "55" } ], "response": { @@ -768,10 +773,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.putModel.contentType" + "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.putModel.contentType", + "methodParameterSegments": [ + { + "$id": "59", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "13" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.putModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "59", + "$id": "60", "kind": "body", "name": "input", "serializedName": "input", @@ -787,7 +812,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.putModel.input" + "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.putModel.input", + "methodParameterSegments": [ + { + "$id": "61", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "25" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.putModel.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -814,39 +858,10 @@ }, "parameters": [ { - "$id": "60", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "25" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.putModel.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "61" }, { - "$id": "61", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.putModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "59" } ], "response": {}, @@ -881,7 +896,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getRecursiveModel.accept" + "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getRecursiveModel.accept", + "methodParameterSegments": [ + { + "$id": "65", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "15" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getRecursiveModel.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -911,21 +945,7 @@ }, "parameters": [ { - "$id": "65", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getRecursiveModel.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "65" } ], "response": { @@ -965,10 +985,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel.contentType" + "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel.contentType", + "methodParameterSegments": [ + { + "$id": "69", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "69", + "$id": "70", "kind": "body", "name": "input", "serializedName": "input", @@ -984,7 +1024,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel.input" + "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel.input", + "methodParameterSegments": [ + { + "$id": "71", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "25" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1011,39 +1070,10 @@ }, "parameters": [ { - "$id": "70", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "25" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "71" }, { - "$id": "71", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "17" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "69" } ], "response": {}, @@ -1078,7 +1108,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getMissingDiscriminator.accept" + "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getMissingDiscriminator.accept", + "methodParameterSegments": [ + { + "$id": "75", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "19" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getMissingDiscriminator.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1108,21 +1157,7 @@ }, "parameters": [ { - "$id": "75", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "19" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getMissingDiscriminator.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "75" } ], "response": { @@ -1161,7 +1196,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getWrongDiscriminator.accept" + "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getWrongDiscriminator.accept", + "methodParameterSegments": [ + { + "$id": "79", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "21" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getWrongDiscriminator.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1191,21 +1245,7 @@ }, "parameters": [ { - "$id": "79", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "21" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getWrongDiscriminator.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "79" } ], "response": { @@ -1244,7 +1284,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getLegacyModel.accept" + "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getLegacyModel.accept", + "methodParameterSegments": [ + { + "$id": "83", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "23" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getLegacyModel.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1274,21 +1333,7 @@ }, "parameters": [ { - "$id": "83", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "23" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.getLegacyModel.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "83" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/Type.Model.Usage.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/Type.Model.Usage.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/Type.Model.Usage.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/Type.Model.Usage.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/Type.Model.Usage.sln deleted file mode 100644 index 7acf3dee947..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/Type.Model.Usage.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Model.Usage", "src\Type.Model.Usage.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/Type.Model.Usage.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/Type.Model.Usage.slnx new file mode 100644 index 00000000000..32287f749b3 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/Type.Model.Usage.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/InputOutputRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/InputOutputRecord.Serialization.cs index a766864620e..f6736632d78 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/InputOutputRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/InputOutputRecord.Serialization.cs @@ -13,26 +13,26 @@ public partial class InputOutputRecord : IJsonModel { internal InputOutputRecord() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - InputOutputRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual InputOutputRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual InputOutputRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - InputOutputRecord IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual InputOutputRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(InputOutputRecord inputOutputRecord) => throw null; public static explicit operator InputOutputRecord(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + InputOutputRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual InputOutputRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/InputRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/InputRecord.Serialization.cs index 4e9c680b601..0f4cc4dbb5d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/InputRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/InputRecord.Serialization.cs @@ -13,24 +13,24 @@ public partial class InputRecord : IJsonModel { internal InputRecord() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - InputRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual InputRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual InputRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - InputRecord IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual InputRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(InputRecord inputRecord) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + InputRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual InputRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/OutputRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/OutputRecord.Serialization.cs index e3baec6e180..5e02f50a12b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/OutputRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/OutputRecord.Serialization.cs @@ -13,24 +13,24 @@ public partial class OutputRecord : IJsonModel { internal OutputRecord() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - OutputRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual OutputRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual OutputRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - OutputRecord IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual OutputRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator OutputRecord(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + OutputRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual OutputRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/UsageClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/UsageClient.cs index cd3f6b4c23d..b1571ae1df5 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/UsageClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/UsageClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -14,7 +15,12 @@ public partial class UsageClient { public UsageClient() : this(new Uri("http://localhost:3000"), new UsageClientOptions()) => throw null; - public UsageClient(Uri endpoint, UsageClientOptions options) => throw null; + internal UsageClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, UsageClientOptions options) => throw null; + + public UsageClient(Uri endpoint, UsageClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public UsageClient(UsageClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/UsageClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/UsageClientOptions.cs index 307a5173a35..d5df51bba00 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/UsageClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/UsageClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace _Type.Model.Usage { public partial class UsageClientOptions : ClientPipelineOptions { + public UsageClientOptions() => throw null; + + [Experimental("SCME0002")] + internal UsageClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/UsageClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/UsageClientSettings.cs new file mode 100644 index 00000000000..1d813163af2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/UsageClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace _Type.Model.Usage +{ + [Experimental("SCME0002")] + public partial class UsageClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public UsageClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..e442e4b354e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "UsageClient": { + "type": "object", + "description": "Configuration for UsageClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/usageClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "usageClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Type.Model.Usage.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Type.Model.Usage.csproj index e2ed8c43863..4f096461b3d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Type.Model.Usage.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Type.Model.Usage.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/tspCodeModel.json index 5c8712ee703..597af5f4e4d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/tspCodeModel.json @@ -231,10 +231,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Usage.input.contentType" + "crossLanguageDefinitionId": "Type.Model.Usage.input.contentType", + "methodParameterSegments": [ + { + "$id": "22", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Usage.input.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "22", + "$id": "23", "kind": "body", "name": "input", "serializedName": "input", @@ -250,7 +270,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Usage.input.input" + "crossLanguageDefinitionId": "Type.Model.Usage.input.input", + "methodParameterSegments": [ + { + "$id": "24", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "9" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Usage.input.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -277,39 +316,10 @@ }, "parameters": [ { - "$id": "23", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "9" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Usage.input.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "24" }, { - "$id": "24", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Usage.input.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "22" } ], "response": {}, @@ -344,7 +354,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Usage.output.accept" + "crossLanguageDefinitionId": "Type.Model.Usage.output.accept", + "methodParameterSegments": [ + { + "$id": "28", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "3" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Usage.output.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -374,21 +403,7 @@ }, "parameters": [ { - "$id": "28", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Usage.output.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "28" } ], "response": { @@ -428,10 +443,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Usage.inputAndOutput.contentType" + "crossLanguageDefinitionId": "Type.Model.Usage.inputAndOutput.contentType", + "methodParameterSegments": [ + { + "$id": "32", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Usage.inputAndOutput.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "32", + "$id": "33", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -444,10 +479,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Usage.inputAndOutput.accept" + "crossLanguageDefinitionId": "Type.Model.Usage.inputAndOutput.accept", + "methodParameterSegments": [ + { + "$id": "34", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Usage.inputAndOutput.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "33", + "$id": "35", "kind": "body", "name": "body", "serializedName": "body", @@ -463,7 +517,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Usage.inputAndOutput.body" + "crossLanguageDefinitionId": "Type.Model.Usage.inputAndOutput.body", + "methodParameterSegments": [ + { + "$id": "36", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "15" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Usage.inputAndOutput.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -496,56 +569,13 @@ }, "parameters": [ { - "$id": "34", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "15" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Usage.inputAndOutput.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "36" }, { - "$id": "35", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Usage.inputAndOutput.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "32" }, { - "$id": "36", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Usage.inputAndOutput.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "34" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/Type.Model.Visibility.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/Type.Model.Visibility.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/Type.Model.Visibility.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/Type.Model.Visibility.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/Type.Model.Visibility.sln deleted file mode 100644 index 98f2d813153..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/Type.Model.Visibility.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Model.Visibility", "src\Type.Model.Visibility.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/Type.Model.Visibility.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/Type.Model.Visibility.slnx new file mode 100644 index 00000000000..840af6aeb5f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/Type.Model.Visibility.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.Serialization.cs index 1abf3f920fb..0a9702996b1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Model.Visibility { public partial class ReadOnlyModel : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ReadOnlyModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ReadOnlyModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ReadOnlyModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ReadOnlyModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ReadOnlyModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ReadOnlyModel readOnlyModel) => throw null; public static explicit operator ReadOnlyModel(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ReadOnlyModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ReadOnlyModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/VisibilityModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/VisibilityModel.Serialization.cs index 54cac8d0aed..c783c787fd6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/VisibilityModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/VisibilityModel.Serialization.cs @@ -13,26 +13,26 @@ public partial class VisibilityModel : IJsonModel { internal VisibilityModel() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - VisibilityModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual VisibilityModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual VisibilityModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - VisibilityModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual VisibilityModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(VisibilityModel visibilityModel) => throw null; public static explicit operator VisibilityModel(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + VisibilityModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual VisibilityModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/VisibilityClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/VisibilityClient.cs index 901d82e4098..dfb167036d6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/VisibilityClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/VisibilityClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -14,7 +15,12 @@ public partial class VisibilityClient { public VisibilityClient() : this(new Uri("http://localhost:3000"), new VisibilityClientOptions()) => throw null; - public VisibilityClient(Uri endpoint, VisibilityClientOptions options) => throw null; + internal VisibilityClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, VisibilityClientOptions options) => throw null; + + public VisibilityClient(Uri endpoint, VisibilityClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public VisibilityClient(VisibilityClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/VisibilityClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/VisibilityClientOptions.cs index a32153c9626..520f19501ba 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/VisibilityClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/VisibilityClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace _Type.Model.Visibility { public partial class VisibilityClientOptions : ClientPipelineOptions { + public VisibilityClientOptions() => throw null; + + [Experimental("SCME0002")] + internal VisibilityClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/VisibilityClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/VisibilityClientSettings.cs new file mode 100644 index 00000000000..75f60f4f199 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/VisibilityClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace _Type.Model.Visibility +{ + [Experimental("SCME0002")] + public partial class VisibilityClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public VisibilityClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..f8b38a4807e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "VisibilityClient": { + "type": "object", + "description": "Configuration for VisibilityClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/visibilityClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "visibilityClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Type.Model.Visibility.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Type.Model.Visibility.csproj index 92cf919ec3a..11c124b9364 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Type.Model.Visibility.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Type.Model.Visibility.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/tspCodeModel.json index 6262ae644a5..3173d004c54 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/tspCodeModel.json @@ -432,10 +432,47 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Type.Model.Visibility.VisibilityModel.queryProp", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "44", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "19" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Visibility.getModel.input", + "readOnly": false, + "access": "public", + "decorators": [] + }, + { + "$id": "45", + "kind": "method", + "name": "queryProp", + "serializedName": "queryProp", + "doc": "Required int32, illustrating a query property.", + "type": { + "$ref": "23" + }, + "location": "", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Visibility.VisibilityModel.queryProp", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "44", + "$id": "46", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -449,10 +486,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Visibility.getModel.contentType" + "crossLanguageDefinitionId": "Type.Model.Visibility.getModel.contentType", + "methodParameterSegments": [ + { + "$id": "47", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Visibility.getModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "45", + "$id": "48", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -465,10 +522,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Visibility.getModel.accept" + "crossLanguageDefinitionId": "Type.Model.Visibility.getModel.accept", + "methodParameterSegments": [ + { + "$id": "49", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "3" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Visibility.getModel.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "46", + "$id": "50", "kind": "body", "name": "input", "serializedName": "input", @@ -484,7 +560,12 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Visibility.getModel.input" + "crossLanguageDefinitionId": "Type.Model.Visibility.getModel.input", + "methodParameterSegments": [ + { + "$ref": "44" + } + ] } ], "responses": [ @@ -517,56 +598,13 @@ }, "parameters": [ { - "$id": "47", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "19" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Visibility.getModel.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "44" }, { - "$id": "48", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Visibility.getModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "47" }, { - "$id": "49", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Visibility.getModel.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "49" } ], "response": { @@ -580,25 +618,25 @@ "crossLanguageDefinitionId": "Type.Model.Visibility.getModel" }, { - "$id": "50", + "$id": "51", "kind": "basic", "name": "headModel", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "51", + "$id": "52", "name": "headModel", "resourceName": "Visibility", "accessibility": "public", "parameters": [ { - "$id": "52", + "$id": "53", "kind": "query", "name": "queryProp", "serializedName": "queryProp", "doc": "Required int32, illustrating a query property.", "type": { - "$id": "53", + "$id": "54", "kind": "int32", "name": "int32", "crossLanguageDefinitionId": "TypeSpec.int32", @@ -610,10 +648,32 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Type.Model.Visibility.VisibilityModel.queryProp", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "55", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "19" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Visibility.headModel.input", + "readOnly": false, + "access": "public", + "decorators": [] + }, + { + "$ref": "45" + } + ] }, { - "$id": "54", + "$id": "56", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -627,10 +687,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Visibility.headModel.contentType" + "crossLanguageDefinitionId": "Type.Model.Visibility.headModel.contentType", + "methodParameterSegments": [ + { + "$id": "57", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Visibility.headModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "55", + "$id": "58", "kind": "body", "name": "input", "serializedName": "input", @@ -646,7 +726,12 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Visibility.headModel.input" + "crossLanguageDefinitionId": "Type.Model.Visibility.headModel.input", + "methodParameterSegments": [ + { + "$ref": "55" + } + ] } ], "responses": [ @@ -673,39 +758,10 @@ }, "parameters": [ { - "$id": "56", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "19" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Visibility.headModel.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "55" }, { - "$id": "57", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Visibility.headModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "57" } ], "response": {}, @@ -715,19 +771,19 @@ "crossLanguageDefinitionId": "Type.Model.Visibility.headModel" }, { - "$id": "58", + "$id": "59", "kind": "basic", "name": "putModel", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "59", + "$id": "60", "name": "putModel", "resourceName": "Visibility", "accessibility": "public", "parameters": [ { - "$id": "60", + "$id": "61", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -741,10 +797,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Visibility.putModel.contentType" + "crossLanguageDefinitionId": "Type.Model.Visibility.putModel.contentType", + "methodParameterSegments": [ + { + "$id": "62", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Visibility.putModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "61", + "$id": "63", "kind": "body", "name": "input", "serializedName": "input", @@ -760,7 +836,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Visibility.putModel.input" + "crossLanguageDefinitionId": "Type.Model.Visibility.putModel.input", + "methodParameterSegments": [ + { + "$id": "64", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "19" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Visibility.putModel.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -787,39 +882,10 @@ }, "parameters": [ { - "$id": "62", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "19" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Visibility.putModel.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "64" }, { - "$id": "63", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Visibility.putModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "62" } ], "response": {}, @@ -829,19 +895,19 @@ "crossLanguageDefinitionId": "Type.Model.Visibility.putModel" }, { - "$id": "64", + "$id": "65", "kind": "basic", "name": "patchModel", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "65", + "$id": "66", "name": "patchModel", "resourceName": "Visibility", "accessibility": "public", "parameters": [ { - "$id": "66", + "$id": "67", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -855,10 +921,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Visibility.patchModel.contentType" + "crossLanguageDefinitionId": "Type.Model.Visibility.patchModel.contentType", + "methodParameterSegments": [ + { + "$id": "68", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Visibility.patchModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "67", + "$id": "69", "kind": "body", "name": "input", "serializedName": "input", @@ -874,7 +960,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Visibility.patchModel.input" + "crossLanguageDefinitionId": "Type.Model.Visibility.patchModel.input", + "methodParameterSegments": [ + { + "$id": "70", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "19" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Visibility.patchModel.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -901,39 +1006,10 @@ }, "parameters": [ { - "$id": "68", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "19" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Visibility.patchModel.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "70" }, { - "$id": "69", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Visibility.patchModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "68" } ], "response": {}, @@ -943,19 +1019,19 @@ "crossLanguageDefinitionId": "Type.Model.Visibility.patchModel" }, { - "$id": "70", + "$id": "71", "kind": "basic", "name": "postModel", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "71", + "$id": "72", "name": "postModel", "resourceName": "Visibility", "accessibility": "public", "parameters": [ { - "$id": "72", + "$id": "73", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -969,10 +1045,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Visibility.postModel.contentType" + "crossLanguageDefinitionId": "Type.Model.Visibility.postModel.contentType", + "methodParameterSegments": [ + { + "$id": "74", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "11" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Visibility.postModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "73", + "$id": "75", "kind": "body", "name": "input", "serializedName": "input", @@ -988,7 +1084,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Visibility.postModel.input" + "crossLanguageDefinitionId": "Type.Model.Visibility.postModel.input", + "methodParameterSegments": [ + { + "$id": "76", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "19" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Visibility.postModel.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1015,39 +1130,10 @@ }, "parameters": [ { - "$id": "74", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "19" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Visibility.postModel.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "76" }, { - "$id": "75", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Visibility.postModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "74" } ], "response": {}, @@ -1057,19 +1143,19 @@ "crossLanguageDefinitionId": "Type.Model.Visibility.postModel" }, { - "$id": "76", + "$id": "77", "kind": "basic", "name": "deleteModel", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "77", + "$id": "78", "name": "deleteModel", "resourceName": "Visibility", "accessibility": "public", "parameters": [ { - "$id": "78", + "$id": "79", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -1083,10 +1169,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Visibility.deleteModel.contentType" + "crossLanguageDefinitionId": "Type.Model.Visibility.deleteModel.contentType", + "methodParameterSegments": [ + { + "$id": "80", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "13" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Visibility.deleteModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "79", + "$id": "81", "kind": "body", "name": "input", "serializedName": "input", @@ -1102,7 +1208,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Visibility.deleteModel.input" + "crossLanguageDefinitionId": "Type.Model.Visibility.deleteModel.input", + "methodParameterSegments": [ + { + "$id": "82", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "19" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Visibility.deleteModel.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1129,39 +1254,10 @@ }, "parameters": [ { - "$id": "80", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "19" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Visibility.deleteModel.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "82" }, { - "$id": "81", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Visibility.deleteModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "80" } ], "response": {}, @@ -1171,19 +1267,19 @@ "crossLanguageDefinitionId": "Type.Model.Visibility.deleteModel" }, { - "$id": "82", + "$id": "83", "kind": "basic", "name": "putReadOnlyModel", "accessibility": "public", "apiVersions": [], "operation": { - "$id": "83", + "$id": "84", "name": "putReadOnlyModel", "resourceName": "Visibility", "accessibility": "public", "parameters": [ { - "$id": "84", + "$id": "85", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -1197,10 +1293,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Visibility.putReadOnlyModel.contentType" + "crossLanguageDefinitionId": "Type.Model.Visibility.putReadOnlyModel.contentType", + "methodParameterSegments": [ + { + "$id": "86", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "15" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Visibility.putReadOnlyModel.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "85", + "$id": "87", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -1213,10 +1329,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Model.Visibility.putReadOnlyModel.accept" + "crossLanguageDefinitionId": "Type.Model.Visibility.putReadOnlyModel.accept", + "methodParameterSegments": [ + { + "$id": "88", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Model.Visibility.putReadOnlyModel.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "86", + "$id": "89", "kind": "body", "name": "input", "serializedName": "input", @@ -1232,7 +1367,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Model.Visibility.putReadOnlyModel.input" + "crossLanguageDefinitionId": "Type.Model.Visibility.putReadOnlyModel.input", + "methodParameterSegments": [ + { + "$id": "90", + "kind": "method", + "name": "input", + "serializedName": "input", + "type": { + "$ref": "32" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Model.Visibility.putReadOnlyModel.input", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1265,56 +1419,13 @@ }, "parameters": [ { - "$id": "87", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "32" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Model.Visibility.putReadOnlyModel.input", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "90" }, { - "$id": "88", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Visibility.putReadOnlyModel.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "86" }, { - "$id": "89", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "17" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Model.Visibility.putReadOnlyModel.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "88" } ], "response": { @@ -1330,13 +1441,13 @@ ], "parameters": [ { - "$id": "90", + "$id": "91", "kind": "endpoint", "name": "endpoint", "serializedName": "endpoint", "doc": "Service host", "type": { - "$id": "91", + "$id": "92", "kind": "url", "name": "endpoint", "crossLanguageDefinitionId": "TypeSpec.url" @@ -1347,7 +1458,7 @@ "isEndpoint": true, "defaultValue": { "type": { - "$id": "92", + "$id": "93", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string" diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/Type.Property.AdditionalProperties.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/Type.Property.AdditionalProperties.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/Type.Property.AdditionalProperties.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/Type.Property.AdditionalProperties.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/Type.Property.AdditionalProperties.sln deleted file mode 100644 index 7f833d99500..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/Type.Property.AdditionalProperties.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Property.AdditionalProperties", "src\Type.Property.AdditionalProperties.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/Type.Property.AdditionalProperties.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/Type.Property.AdditionalProperties.slnx new file mode 100644 index 00000000000..d263e695090 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/Type.Property.AdditionalProperties.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/AdditionalPropertiesClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/AdditionalPropertiesClient.cs index 86b144da674..237007e44d6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/AdditionalPropertiesClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/AdditionalPropertiesClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; namespace _Type.Property.AdditionalProperties { @@ -11,7 +12,12 @@ public partial class AdditionalPropertiesClient { public AdditionalPropertiesClient() : this(new Uri("http://localhost:3000"), new AdditionalPropertiesClientOptions()) => throw null; - public AdditionalPropertiesClient(Uri endpoint, AdditionalPropertiesClientOptions options) => throw null; + internal AdditionalPropertiesClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, AdditionalPropertiesClientOptions options) => throw null; + + public AdditionalPropertiesClient(Uri endpoint, AdditionalPropertiesClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public AdditionalPropertiesClient(AdditionalPropertiesClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/AdditionalPropertiesClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/AdditionalPropertiesClientOptions.cs index 131277df71b..6564b4c3c8b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/AdditionalPropertiesClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/AdditionalPropertiesClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace _Type.Property.AdditionalProperties { public partial class AdditionalPropertiesClientOptions : ClientPipelineOptions { + public AdditionalPropertiesClientOptions() => throw null; + + [Experimental("SCME0002")] + internal AdditionalPropertiesClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/AdditionalPropertiesClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/AdditionalPropertiesClientSettings.cs new file mode 100644 index 00000000000..2ecc0cb99b0 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/AdditionalPropertiesClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace _Type.Property.AdditionalProperties +{ + [Experimental("SCME0002")] + public partial class AdditionalPropertiesClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public AdditionalPropertiesClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadFloat.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadFloat.cs index 3711caec903..aa298158cb9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadFloat.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadFloat.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class ExtendsDifferentSpreadFloat { protected ExtendsDifferentSpreadFloat() => throw null; + internal ExtendsDifferentSpreadFloat(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadModel.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadModel.cs index 16952422f03..eaf913f4276 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadModel.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class ExtendsDifferentSpreadModel { protected ExtendsDifferentSpreadModel() => throw null; + internal ExtendsDifferentSpreadModel(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadModelArray.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadModelArray.cs index cafdfaa177b..2aacfeb2d02 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadModelArray.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadModelArray.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class ExtendsDifferentSpreadModelArray { protected ExtendsDifferentSpreadModelArray() => throw null; + internal ExtendsDifferentSpreadModelArray(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadString.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadString.cs index 14de43be0c4..3ee0ddc45c5 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadString.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadString.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class ExtendsDifferentSpreadString { protected ExtendsDifferentSpreadString() => throw null; + internal ExtendsDifferentSpreadString(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsFloat.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsFloat.cs index db8c90aa883..6f55bee1976 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsFloat.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsFloat.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class ExtendsFloat { protected ExtendsFloat() => throw null; + internal ExtendsFloat(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsModel.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsModel.cs index fc3605496dc..a3e6a49c40f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsModel.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class ExtendsModel { protected ExtendsModel() => throw null; + internal ExtendsModel(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsModelArray.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsModelArray.cs index 9fac072dc49..1da8aae31d1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsModelArray.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsModelArray.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class ExtendsModelArray { protected ExtendsModelArray() => throw null; + internal ExtendsModelArray(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsString.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsString.cs index 25a8bce5e84..13a5fbf8c13 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsString.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsString.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class ExtendsString { protected ExtendsString() => throw null; + internal ExtendsString(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsUnknown.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsUnknown.cs index 3beb5baea3f..6e539221d9b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsUnknown.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsUnknown.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class ExtendsUnknown { protected ExtendsUnknown() => throw null; + internal ExtendsUnknown(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsUnknownDerived.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsUnknownDerived.cs index 1ba9e2819a5..f1636a68905 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsUnknownDerived.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsUnknownDerived.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class ExtendsUnknownDerived { protected ExtendsUnknownDerived() => throw null; + internal ExtendsUnknownDerived(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsUnknownDiscriminated.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsUnknownDiscriminated.cs index dddd20125ee..261d9de0a04 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsUnknownDiscriminated.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/ExtendsUnknownDiscriminated.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class ExtendsUnknownDiscriminated { protected ExtendsUnknownDiscriminated() => throw null; + internal ExtendsUnknownDiscriminated(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsFloat.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsFloat.cs index 74284e4cd58..8be79e2ef26 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsFloat.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsFloat.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class IsFloat { protected IsFloat() => throw null; + internal IsFloat(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsModel.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsModel.cs index 035ee852f98..65a3fa72022 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsModel.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class IsModel { protected IsModel() => throw null; + internal IsModel(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsModelArray.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsModelArray.cs index cb2785116e5..a4a639ee799 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsModelArray.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsModelArray.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class IsModelArray { protected IsModelArray() => throw null; + internal IsModelArray(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsString.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsString.cs index 6281cebe5bc..10718fca333 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsString.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsString.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class IsString { protected IsString() => throw null; + internal IsString(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsUnknown.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsUnknown.cs index 756f70c38ba..19c46424094 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsUnknown.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsUnknown.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class IsUnknown { protected IsUnknown() => throw null; + internal IsUnknown(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsUnknownDerived.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsUnknownDerived.cs index c60981109bc..50e217613ef 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsUnknownDerived.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsUnknownDerived.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class IsUnknownDerived { protected IsUnknownDerived() => throw null; + internal IsUnknownDerived(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsUnknownDiscriminated.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsUnknownDiscriminated.cs index 3686c8c898c..f6470550016 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsUnknownDiscriminated.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/IsUnknownDiscriminated.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class IsUnknownDiscriminated { protected IsUnknownDiscriminated() => throw null; + internal IsUnknownDiscriminated(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatDerived.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatDerived.Serialization.cs index eaef1b45572..ff8198a73e3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatDerived.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatDerived.Serialization.cs @@ -13,26 +13,26 @@ public partial class DifferentSpreadFloatDerived : DifferentSpreadFloatRecord, I { internal DifferentSpreadFloatDerived() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DifferentSpreadFloatDerived IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected override DifferentSpreadFloatRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override DifferentSpreadFloatRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DifferentSpreadFloatDerived IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override DifferentSpreadFloatRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(DifferentSpreadFloatDerived differentSpreadFloatDerived) => throw null; public static explicit operator DifferentSpreadFloatDerived(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DifferentSpreadFloatDerived IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected override DifferentSpreadFloatRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatRecord.Serialization.cs index eaf93aaba7a..92f59f51ba5 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatRecord.Serialization.cs @@ -13,26 +13,26 @@ public partial class DifferentSpreadFloatRecord : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DifferentSpreadFloatRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual DifferentSpreadFloatRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DifferentSpreadFloatRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DifferentSpreadFloatRecord IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DifferentSpreadFloatRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(DifferentSpreadFloatRecord differentSpreadFloatRecord) => throw null; public static explicit operator DifferentSpreadFloatRecord(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DifferentSpreadFloatRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual DifferentSpreadFloatRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayDerived.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayDerived.Serialization.cs index 0b86fcaea14..36924510096 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayDerived.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayDerived.Serialization.cs @@ -13,26 +13,26 @@ public partial class DifferentSpreadModelArrayDerived : DifferentSpreadModelArra { internal DifferentSpreadModelArrayDerived() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DifferentSpreadModelArrayDerived IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected override DifferentSpreadModelArrayRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override DifferentSpreadModelArrayRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DifferentSpreadModelArrayDerived IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override DifferentSpreadModelArrayRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(DifferentSpreadModelArrayDerived differentSpreadModelArrayDerived) => throw null; public static explicit operator DifferentSpreadModelArrayDerived(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DifferentSpreadModelArrayDerived IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected override DifferentSpreadModelArrayRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayRecord.Serialization.cs index 91174ac15ea..56f9b3c0040 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayRecord.Serialization.cs @@ -13,26 +13,26 @@ public partial class DifferentSpreadModelArrayRecord : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DifferentSpreadModelArrayRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual DifferentSpreadModelArrayRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DifferentSpreadModelArrayRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DifferentSpreadModelArrayRecord IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DifferentSpreadModelArrayRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(DifferentSpreadModelArrayRecord differentSpreadModelArrayRecord) => throw null; public static explicit operator DifferentSpreadModelArrayRecord(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DifferentSpreadModelArrayRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual DifferentSpreadModelArrayRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelDerived.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelDerived.Serialization.cs index 280d9aba49f..56c34d9b7d0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelDerived.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelDerived.Serialization.cs @@ -13,26 +13,26 @@ public partial class DifferentSpreadModelDerived : DifferentSpreadModelRecord, I { internal DifferentSpreadModelDerived() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DifferentSpreadModelDerived IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected override DifferentSpreadModelRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override DifferentSpreadModelRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DifferentSpreadModelDerived IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override DifferentSpreadModelRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(DifferentSpreadModelDerived differentSpreadModelDerived) => throw null; public static explicit operator DifferentSpreadModelDerived(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DifferentSpreadModelDerived IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected override DifferentSpreadModelRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelRecord.Serialization.cs index 391e66a36d4..73ba35dba68 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelRecord.Serialization.cs @@ -13,26 +13,26 @@ public partial class DifferentSpreadModelRecord : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DifferentSpreadModelRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual DifferentSpreadModelRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DifferentSpreadModelRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DifferentSpreadModelRecord IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DifferentSpreadModelRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(DifferentSpreadModelRecord differentSpreadModelRecord) => throw null; public static explicit operator DifferentSpreadModelRecord(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DifferentSpreadModelRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual DifferentSpreadModelRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringDerived.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringDerived.Serialization.cs index 0c2c993a5c8..db2400735a5 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringDerived.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringDerived.Serialization.cs @@ -13,26 +13,26 @@ public partial class DifferentSpreadStringDerived : DifferentSpreadStringRecord, { internal DifferentSpreadStringDerived() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DifferentSpreadStringDerived IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected override DifferentSpreadStringRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override DifferentSpreadStringRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DifferentSpreadStringDerived IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override DifferentSpreadStringRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(DifferentSpreadStringDerived differentSpreadStringDerived) => throw null; public static explicit operator DifferentSpreadStringDerived(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DifferentSpreadStringDerived IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected override DifferentSpreadStringRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringRecord.Serialization.cs index d0ac52ded6a..c91434cc14d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringRecord.Serialization.cs @@ -13,26 +13,26 @@ public partial class DifferentSpreadStringRecord : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DifferentSpreadStringRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual DifferentSpreadStringRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DifferentSpreadStringRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DifferentSpreadStringRecord IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DifferentSpreadStringRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(DifferentSpreadStringRecord differentSpreadStringRecord) => throw null; public static explicit operator DifferentSpreadStringRecord(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DifferentSpreadStringRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual DifferentSpreadStringRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsFloatAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsFloatAdditionalProperties.Serialization.cs index 4614973d480..9806562350f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsFloatAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsFloatAdditionalProperties.Serialization.cs @@ -13,26 +13,26 @@ public partial class ExtendsFloatAdditionalProperties : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ExtendsFloatAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ExtendsFloatAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ExtendsFloatAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ExtendsFloatAdditionalProperties IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ExtendsFloatAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ExtendsFloatAdditionalProperties extendsFloatAdditionalProperties) => throw null; public static explicit operator ExtendsFloatAdditionalProperties(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ExtendsFloatAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ExtendsFloatAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsModelAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsModelAdditionalProperties.Serialization.cs index 36a69105e96..c9d3b70f944 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsModelAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsModelAdditionalProperties.Serialization.cs @@ -13,26 +13,26 @@ public partial class ExtendsModelAdditionalProperties : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ExtendsModelAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ExtendsModelAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ExtendsModelAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ExtendsModelAdditionalProperties IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ExtendsModelAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ExtendsModelAdditionalProperties extendsModelAdditionalProperties) => throw null; public static explicit operator ExtendsModelAdditionalProperties(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ExtendsModelAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ExtendsModelAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsModelArrayAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsModelArrayAdditionalProperties.Serialization.cs index 9070a0fd91d..e6be3392724 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsModelArrayAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsModelArrayAdditionalProperties.Serialization.cs @@ -13,26 +13,26 @@ public partial class ExtendsModelArrayAdditionalProperties : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ExtendsModelArrayAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ExtendsModelArrayAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ExtendsModelArrayAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ExtendsModelArrayAdditionalProperties IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ExtendsModelArrayAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ExtendsModelArrayAdditionalProperties extendsModelArrayAdditionalProperties) => throw null; public static explicit operator ExtendsModelArrayAdditionalProperties(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ExtendsModelArrayAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ExtendsModelArrayAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsStringAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsStringAdditionalProperties.Serialization.cs index 7f0ec403a5a..7f0407f8879 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsStringAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsStringAdditionalProperties.Serialization.cs @@ -13,26 +13,26 @@ public partial class ExtendsStringAdditionalProperties : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ExtendsStringAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ExtendsStringAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ExtendsStringAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ExtendsStringAdditionalProperties IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ExtendsStringAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ExtendsStringAdditionalProperties extendsStringAdditionalProperties) => throw null; public static explicit operator ExtendsStringAdditionalProperties(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ExtendsStringAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ExtendsStringAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalProperties.Serialization.cs index 1a148d686b5..80dc14ce52e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalProperties.Serialization.cs @@ -13,26 +13,26 @@ public partial class ExtendsUnknownAdditionalProperties : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ExtendsUnknownAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ExtendsUnknownAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ExtendsUnknownAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ExtendsUnknownAdditionalProperties IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ExtendsUnknownAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ExtendsUnknownAdditionalProperties extendsUnknownAdditionalProperties) => throw null; public static explicit operator ExtendsUnknownAdditionalProperties(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ExtendsUnknownAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ExtendsUnknownAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDerived.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDerived.Serialization.cs index 6e2c9167757..82777d84ade 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDerived.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDerived.Serialization.cs @@ -13,26 +13,26 @@ public partial class ExtendsUnknownAdditionalPropertiesDerived : ExtendsUnknownA { internal ExtendsUnknownAdditionalPropertiesDerived() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ExtendsUnknownAdditionalPropertiesDerived IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected override ExtendsUnknownAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override ExtendsUnknownAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ExtendsUnknownAdditionalPropertiesDerived IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override ExtendsUnknownAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ExtendsUnknownAdditionalPropertiesDerived extendsUnknownAdditionalPropertiesDerived) => throw null; public static explicit operator ExtendsUnknownAdditionalPropertiesDerived(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ExtendsUnknownAdditionalPropertiesDerived IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected override ExtendsUnknownAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminated.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminated.Serialization.cs index f7e9f72a561..6bda000f175 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminated.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminated.Serialization.cs @@ -14,26 +14,26 @@ public abstract partial class ExtendsUnknownAdditionalPropertiesDiscriminated : { internal ExtendsUnknownAdditionalPropertiesDiscriminated() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ExtendsUnknownAdditionalPropertiesDiscriminated IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ExtendsUnknownAdditionalPropertiesDiscriminated PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ExtendsUnknownAdditionalPropertiesDiscriminated JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ExtendsUnknownAdditionalPropertiesDiscriminated IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ExtendsUnknownAdditionalPropertiesDiscriminated PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ExtendsUnknownAdditionalPropertiesDiscriminated extendsUnknownAdditionalPropertiesDiscriminated) => throw null; public static explicit operator ExtendsUnknownAdditionalPropertiesDiscriminated(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ExtendsUnknownAdditionalPropertiesDiscriminated IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ExtendsUnknownAdditionalPropertiesDiscriminated JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminatedDerived.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminatedDerived.Serialization.cs index 1f1701606d7..78a943e7ca9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminatedDerived.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminatedDerived.Serialization.cs @@ -12,22 +12,22 @@ public partial class ExtendsUnknownAdditionalPropertiesDiscriminatedDerived : Ex { internal ExtendsUnknownAdditionalPropertiesDiscriminatedDerived() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override ExtendsUnknownAdditionalPropertiesDiscriminated PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ExtendsUnknownAdditionalPropertiesDiscriminatedDerived IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override ExtendsUnknownAdditionalPropertiesDiscriminated JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + ExtendsUnknownAdditionalPropertiesDiscriminatedDerived IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - ExtendsUnknownAdditionalPropertiesDiscriminatedDerived IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override ExtendsUnknownAdditionalPropertiesDiscriminated PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + ExtendsUnknownAdditionalPropertiesDiscriminatedDerived IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override ExtendsUnknownAdditionalPropertiesDiscriminated JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsFloatAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsFloatAdditionalProperties.Serialization.cs index decb02492c4..2274e5cbcf4 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsFloatAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsFloatAdditionalProperties.Serialization.cs @@ -13,26 +13,26 @@ public partial class IsFloatAdditionalProperties : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - IsFloatAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual IsFloatAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual IsFloatAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - IsFloatAdditionalProperties IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual IsFloatAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(IsFloatAdditionalProperties isFloatAdditionalProperties) => throw null; public static explicit operator IsFloatAdditionalProperties(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + IsFloatAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual IsFloatAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsModelAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsModelAdditionalProperties.Serialization.cs index 98a7f03e5fb..8ab936e3e88 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsModelAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsModelAdditionalProperties.Serialization.cs @@ -13,26 +13,26 @@ public partial class IsModelAdditionalProperties : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - IsModelAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual IsModelAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual IsModelAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - IsModelAdditionalProperties IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual IsModelAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(IsModelAdditionalProperties isModelAdditionalProperties) => throw null; public static explicit operator IsModelAdditionalProperties(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + IsModelAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual IsModelAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsModelArrayAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsModelArrayAdditionalProperties.Serialization.cs index dc3813f7179..c3ccdbc7470 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsModelArrayAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsModelArrayAdditionalProperties.Serialization.cs @@ -13,26 +13,26 @@ public partial class IsModelArrayAdditionalProperties : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - IsModelArrayAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual IsModelArrayAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual IsModelArrayAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - IsModelArrayAdditionalProperties IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual IsModelArrayAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(IsModelArrayAdditionalProperties isModelArrayAdditionalProperties) => throw null; public static explicit operator IsModelArrayAdditionalProperties(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + IsModelArrayAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual IsModelArrayAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsStringAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsStringAdditionalProperties.Serialization.cs index 25edcd1fdcb..df0c3ae96e7 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsStringAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsStringAdditionalProperties.Serialization.cs @@ -13,26 +13,26 @@ public partial class IsStringAdditionalProperties : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - IsStringAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual IsStringAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual IsStringAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - IsStringAdditionalProperties IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual IsStringAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(IsStringAdditionalProperties isStringAdditionalProperties) => throw null; public static explicit operator IsStringAdditionalProperties(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + IsStringAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual IsStringAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalProperties.Serialization.cs index 5ecce4649dc..d07273fb430 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalProperties.Serialization.cs @@ -13,26 +13,26 @@ public partial class IsUnknownAdditionalProperties : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - IsUnknownAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual IsUnknownAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual IsUnknownAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - IsUnknownAdditionalProperties IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual IsUnknownAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(IsUnknownAdditionalProperties isUnknownAdditionalProperties) => throw null; public static explicit operator IsUnknownAdditionalProperties(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + IsUnknownAdditionalProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual IsUnknownAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDerived.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDerived.Serialization.cs index 1d7eba1e220..62b739c3e81 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDerived.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDerived.Serialization.cs @@ -13,26 +13,26 @@ public partial class IsUnknownAdditionalPropertiesDerived : IsUnknownAdditionalP { internal IsUnknownAdditionalPropertiesDerived() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - IsUnknownAdditionalPropertiesDerived IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected override IsUnknownAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override IsUnknownAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - IsUnknownAdditionalPropertiesDerived IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override IsUnknownAdditionalProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(IsUnknownAdditionalPropertiesDerived isUnknownAdditionalPropertiesDerived) => throw null; public static explicit operator IsUnknownAdditionalPropertiesDerived(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + IsUnknownAdditionalPropertiesDerived IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected override IsUnknownAdditionalProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminated.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminated.Serialization.cs index 3a7409587b3..3e510918510 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminated.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminated.Serialization.cs @@ -14,26 +14,26 @@ public abstract partial class IsUnknownAdditionalPropertiesDiscriminated : IJson { internal IsUnknownAdditionalPropertiesDiscriminated() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - IsUnknownAdditionalPropertiesDiscriminated IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual IsUnknownAdditionalPropertiesDiscriminated PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual IsUnknownAdditionalPropertiesDiscriminated JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - IsUnknownAdditionalPropertiesDiscriminated IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual IsUnknownAdditionalPropertiesDiscriminated PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(IsUnknownAdditionalPropertiesDiscriminated isUnknownAdditionalPropertiesDiscriminated) => throw null; public static explicit operator IsUnknownAdditionalPropertiesDiscriminated(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + IsUnknownAdditionalPropertiesDiscriminated IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual IsUnknownAdditionalPropertiesDiscriminated JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminatedDerived.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminatedDerived.Serialization.cs index 502a4de22d3..5fea9bba282 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminatedDerived.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminatedDerived.Serialization.cs @@ -12,22 +12,22 @@ public partial class IsUnknownAdditionalPropertiesDiscriminatedDerived : IsUnkno { internal IsUnknownAdditionalPropertiesDiscriminatedDerived() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override IsUnknownAdditionalPropertiesDiscriminated PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - IsUnknownAdditionalPropertiesDiscriminatedDerived IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override IsUnknownAdditionalPropertiesDiscriminated JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + IsUnknownAdditionalPropertiesDiscriminatedDerived IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - IsUnknownAdditionalPropertiesDiscriminatedDerived IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override IsUnknownAdditionalPropertiesDiscriminated PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + IsUnknownAdditionalPropertiesDiscriminatedDerived IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override IsUnknownAdditionalPropertiesDiscriminated JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ModelForRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ModelForRecord.Serialization.cs index 76e0713aeca..46910b6173b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ModelForRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/ModelForRecord.Serialization.cs @@ -12,22 +12,22 @@ public partial class ModelForRecord : IJsonModel { internal ModelForRecord() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual ModelForRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ModelForRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual ModelForRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + ModelForRecord IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - ModelForRecord IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual ModelForRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + ModelForRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual ModelForRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/MultipleSpreadRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/MultipleSpreadRecord.Serialization.cs index 30bdb8666e2..691248e0126 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/MultipleSpreadRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/MultipleSpreadRecord.Serialization.cs @@ -13,26 +13,26 @@ public partial class MultipleSpreadRecord : IJsonModel { internal MultipleSpreadRecord() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - MultipleSpreadRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual MultipleSpreadRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual MultipleSpreadRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - MultipleSpreadRecord IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual MultipleSpreadRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(MultipleSpreadRecord multipleSpreadRecord) => throw null; public static explicit operator MultipleSpreadRecord(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + MultipleSpreadRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual MultipleSpreadRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadFloatRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadFloatRecord.Serialization.cs index 83c04f36743..8a9e155cc6a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadFloatRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadFloatRecord.Serialization.cs @@ -13,26 +13,26 @@ public partial class SpreadFloatRecord : IJsonModel { internal SpreadFloatRecord() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - SpreadFloatRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual SpreadFloatRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SpreadFloatRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - SpreadFloatRecord IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SpreadFloatRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(SpreadFloatRecord spreadFloatRecord) => throw null; public static explicit operator SpreadFloatRecord(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + SpreadFloatRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual SpreadFloatRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadModelArrayRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadModelArrayRecord.Serialization.cs index 336af688961..262b3ab1f96 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadModelArrayRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadModelArrayRecord.Serialization.cs @@ -13,26 +13,26 @@ public partial class SpreadModelArrayRecord : IJsonModel { internal SpreadModelArrayRecord() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - SpreadModelArrayRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual SpreadModelArrayRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SpreadModelArrayRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - SpreadModelArrayRecord IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SpreadModelArrayRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(SpreadModelArrayRecord spreadModelArrayRecord) => throw null; public static explicit operator SpreadModelArrayRecord(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + SpreadModelArrayRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual SpreadModelArrayRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadModelRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadModelRecord.Serialization.cs index ca4e8b35b0c..5d55eed7095 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadModelRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadModelRecord.Serialization.cs @@ -13,26 +13,26 @@ public partial class SpreadModelRecord : IJsonModel { internal SpreadModelRecord() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - SpreadModelRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual SpreadModelRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SpreadModelRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - SpreadModelRecord IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SpreadModelRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(SpreadModelRecord spreadModelRecord) => throw null; public static explicit operator SpreadModelRecord(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + SpreadModelRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual SpreadModelRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion.Serialization.cs index efc7aaf9e5c..c5c994edc82 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion.Serialization.cs @@ -13,26 +13,26 @@ public partial class SpreadRecordForNonDiscriminatedUnion : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - SpreadRecordForNonDiscriminatedUnion IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual SpreadRecordForNonDiscriminatedUnion PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SpreadRecordForNonDiscriminatedUnion JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - SpreadRecordForNonDiscriminatedUnion IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SpreadRecordForNonDiscriminatedUnion PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(SpreadRecordForNonDiscriminatedUnion spreadRecordForNonDiscriminatedUnion) => throw null; public static explicit operator SpreadRecordForNonDiscriminatedUnion(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + SpreadRecordForNonDiscriminatedUnion IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual SpreadRecordForNonDiscriminatedUnion JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion2.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion2.Serialization.cs index 2269f0dce71..11bd26f637d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion2.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion2.Serialization.cs @@ -13,26 +13,26 @@ public partial class SpreadRecordForNonDiscriminatedUnion2 : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - SpreadRecordForNonDiscriminatedUnion2 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual SpreadRecordForNonDiscriminatedUnion2 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SpreadRecordForNonDiscriminatedUnion2 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - SpreadRecordForNonDiscriminatedUnion2 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SpreadRecordForNonDiscriminatedUnion2 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(SpreadRecordForNonDiscriminatedUnion2 spreadRecordForNonDiscriminatedUnion2) => throw null; public static explicit operator SpreadRecordForNonDiscriminatedUnion2(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + SpreadRecordForNonDiscriminatedUnion2 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual SpreadRecordForNonDiscriminatedUnion2 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion3.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion3.Serialization.cs index f6a6cf51b52..24a018e7435 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion3.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion3.Serialization.cs @@ -13,26 +13,26 @@ public partial class SpreadRecordForNonDiscriminatedUnion3 : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - SpreadRecordForNonDiscriminatedUnion3 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual SpreadRecordForNonDiscriminatedUnion3 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SpreadRecordForNonDiscriminatedUnion3 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - SpreadRecordForNonDiscriminatedUnion3 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SpreadRecordForNonDiscriminatedUnion3 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(SpreadRecordForNonDiscriminatedUnion3 spreadRecordForNonDiscriminatedUnion3) => throw null; public static explicit operator SpreadRecordForNonDiscriminatedUnion3(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + SpreadRecordForNonDiscriminatedUnion3 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual SpreadRecordForNonDiscriminatedUnion3 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForUnion.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForUnion.Serialization.cs index 766c0366879..50debebc321 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForUnion.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForUnion.Serialization.cs @@ -13,26 +13,26 @@ public partial class SpreadRecordForUnion : IJsonModel { internal SpreadRecordForUnion() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - SpreadRecordForUnion IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual SpreadRecordForUnion PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SpreadRecordForUnion JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - SpreadRecordForUnion IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SpreadRecordForUnion PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(SpreadRecordForUnion spreadRecordForUnion) => throw null; public static explicit operator SpreadRecordForUnion(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + SpreadRecordForUnion IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual SpreadRecordForUnion JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadStringRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadStringRecord.Serialization.cs index aca21bb09ca..0cf1c082603 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadStringRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/SpreadStringRecord.Serialization.cs @@ -13,26 +13,26 @@ public partial class SpreadStringRecord : IJsonModel { internal SpreadStringRecord() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - SpreadStringRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual SpreadStringRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SpreadStringRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - SpreadStringRecord IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual SpreadStringRecord PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(SpreadStringRecord spreadStringRecord) => throw null; public static explicit operator SpreadStringRecord(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + SpreadStringRecord IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual SpreadStringRecord JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/UnknownExtendsUnknownAdditionalPropertiesDiscriminated.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/UnknownExtendsUnknownAdditionalPropertiesDiscriminated.Serialization.cs index 0e68f160635..d74c05de6f3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/UnknownExtendsUnknownAdditionalPropertiesDiscriminated.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/UnknownExtendsUnknownAdditionalPropertiesDiscriminated.Serialization.cs @@ -12,22 +12,22 @@ internal partial class UnknownExtendsUnknownAdditionalPropertiesDiscriminated : { internal UnknownExtendsUnknownAdditionalPropertiesDiscriminated() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override ExtendsUnknownAdditionalPropertiesDiscriminated PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ExtendsUnknownAdditionalPropertiesDiscriminated IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override ExtendsUnknownAdditionalPropertiesDiscriminated JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + ExtendsUnknownAdditionalPropertiesDiscriminated IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - ExtendsUnknownAdditionalPropertiesDiscriminated IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override ExtendsUnknownAdditionalPropertiesDiscriminated PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + ExtendsUnknownAdditionalPropertiesDiscriminated IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override ExtendsUnknownAdditionalPropertiesDiscriminated JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/UnknownIsUnknownAdditionalPropertiesDiscriminated.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/UnknownIsUnknownAdditionalPropertiesDiscriminated.Serialization.cs index 1ed061fff68..c65a14a26e0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/UnknownIsUnknownAdditionalPropertiesDiscriminated.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/UnknownIsUnknownAdditionalPropertiesDiscriminated.Serialization.cs @@ -12,22 +12,22 @@ internal partial class UnknownIsUnknownAdditionalPropertiesDiscriminated : IsUnk { internal UnknownIsUnknownAdditionalPropertiesDiscriminated() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override IsUnknownAdditionalPropertiesDiscriminated PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - IsUnknownAdditionalPropertiesDiscriminated IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected override IsUnknownAdditionalPropertiesDiscriminated JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + IsUnknownAdditionalPropertiesDiscriminated IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - IsUnknownAdditionalPropertiesDiscriminated IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected override IsUnknownAdditionalPropertiesDiscriminated PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + IsUnknownAdditionalPropertiesDiscriminated IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected override IsUnknownAdditionalPropertiesDiscriminated JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/WidgetData0.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/WidgetData0.Serialization.cs index 8297f076137..06c9f9fb62b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/WidgetData0.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/WidgetData0.Serialization.cs @@ -12,22 +12,22 @@ public partial class WidgetData0 : IJsonModel { internal WidgetData0() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual WidgetData0 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - WidgetData0 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual WidgetData0 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + WidgetData0 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - WidgetData0 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual WidgetData0 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + WidgetData0 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual WidgetData0 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/WidgetData1.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/WidgetData1.Serialization.cs index cbee0dac8d6..a0dcd4d84a1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/WidgetData1.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/WidgetData1.Serialization.cs @@ -12,22 +12,22 @@ public partial class WidgetData1 : IJsonModel { internal WidgetData1() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual WidgetData1 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - WidgetData1 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual WidgetData1 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + WidgetData1 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - WidgetData1 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual WidgetData1 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + WidgetData1 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual WidgetData1 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/WidgetData2.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/WidgetData2.Serialization.cs index 1c7a2bb2e5b..ab2572f0c22 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/WidgetData2.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/WidgetData2.Serialization.cs @@ -12,22 +12,22 @@ public partial class WidgetData2 : IJsonModel { internal WidgetData2() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual WidgetData2 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - WidgetData2 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual WidgetData2 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + WidgetData2 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - WidgetData2 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual WidgetData2 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + WidgetData2 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual WidgetData2 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/MultipleSpread.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/MultipleSpread.cs index 9b081a1a362..47355266fd2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/MultipleSpread.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/MultipleSpread.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class MultipleSpread { protected MultipleSpread() => throw null; + internal MultipleSpread(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadDifferentFloat.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadDifferentFloat.cs index f86ae0c3e6e..33d2e052e33 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadDifferentFloat.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadDifferentFloat.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class SpreadDifferentFloat { protected SpreadDifferentFloat() => throw null; + internal SpreadDifferentFloat(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadDifferentModel.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadDifferentModel.cs index 0ba5c6d4854..a69132c7526 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadDifferentModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadDifferentModel.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class SpreadDifferentModel { protected SpreadDifferentModel() => throw null; + internal SpreadDifferentModel(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadDifferentModelArray.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadDifferentModelArray.cs index 0d1cd493e84..5c6d809aa7c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadDifferentModelArray.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadDifferentModelArray.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class SpreadDifferentModelArray { protected SpreadDifferentModelArray() => throw null; + internal SpreadDifferentModelArray(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadDifferentString.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadDifferentString.cs index d990d8ba2c3..4123898a1ec 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadDifferentString.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadDifferentString.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class SpreadDifferentString { protected SpreadDifferentString() => throw null; + internal SpreadDifferentString(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadFloat.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadFloat.cs index a97ea7ff831..a529e2b406f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadFloat.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadFloat.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class SpreadFloat { protected SpreadFloat() => throw null; + internal SpreadFloat(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadModel.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadModel.cs index 3db2515a716..002a15917bc 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadModel.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class SpreadModel { protected SpreadModel() => throw null; + internal SpreadModel(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadModelArray.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadModelArray.cs index aec0c659e11..bdc347b9941 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadModelArray.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadModelArray.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class SpreadModelArray { protected SpreadModelArray() => throw null; + internal SpreadModelArray(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion.cs index 89de049334c..dfd6786a0ab 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class SpreadRecordNonDiscriminatedUnion { protected SpreadRecordNonDiscriminatedUnion() => throw null; + internal SpreadRecordNonDiscriminatedUnion(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion2.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion2.cs index e78b2929cd9..d33e1a547dc 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion2.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion2.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class SpreadRecordNonDiscriminatedUnion2 { protected SpreadRecordNonDiscriminatedUnion2() => throw null; + internal SpreadRecordNonDiscriminatedUnion2(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion3.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion3.cs index ecb9285fa4e..76b3cf8b1fe 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion3.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion3.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class SpreadRecordNonDiscriminatedUnion3 { protected SpreadRecordNonDiscriminatedUnion3() => throw null; + internal SpreadRecordNonDiscriminatedUnion3(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadRecordUnion.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadRecordUnion.cs index 7cc11db7439..97de92c85f4 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadRecordUnion.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadRecordUnion.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class SpreadRecordUnion { protected SpreadRecordUnion() => throw null; + internal SpreadRecordUnion(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadString.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadString.cs index 2c4d33288de..4864d532e5a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadString.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/SpreadString.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class SpreadString { protected SpreadString() => throw null; + internal SpreadString(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..97c6be67bb3 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "AdditionalPropertiesClient": { + "type": "object", + "description": "Configuration for AdditionalPropertiesClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/additionalPropertiesClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "additionalPropertiesClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Type.Property.AdditionalProperties.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Type.Property.AdditionalProperties.csproj index 0d612975af4..03d3fb00134 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Type.Property.AdditionalProperties.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Type.Property.AdditionalProperties.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/tspCodeModel.json index b55638a8b28..47fa09be329 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/tspCodeModel.json @@ -3254,7 +3254,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknown.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknown.get.accept", + "methodParameterSegments": [ + { + "$id": "289", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "11" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknown.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3284,21 +3303,7 @@ }, "parameters": [ { - "$id": "289", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknown.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "289" } ], "response": { @@ -3340,10 +3345,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknown.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknown.put.contentType", + "methodParameterSegments": [ + { + "$id": "293", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "13" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknown.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "293", + "$id": "294", "kind": "body", "name": "body", "serializedName": "body", @@ -3360,7 +3385,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknown.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknown.put.body", + "methodParameterSegments": [ + { + "$id": "295", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "135" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknown.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3387,40 +3432,10 @@ }, "parameters": [ { - "$id": "294", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "135" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknown.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "295" }, { - "$id": "295", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknown.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "293" } ], "response": {}, @@ -3505,7 +3520,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.get.accept", + "methodParameterSegments": [ + { + "$id": "303", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "15" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3535,21 +3569,7 @@ }, "parameters": [ { - "$id": "303", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "303" } ], "response": { @@ -3591,10 +3611,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.put.contentType", + "methodParameterSegments": [ + { + "$id": "307", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "307", + "$id": "308", "kind": "body", "name": "body", "serializedName": "body", @@ -3611,7 +3651,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.put.body", + "methodParameterSegments": [ + { + "$id": "309", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "139" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3638,40 +3698,10 @@ }, "parameters": [ { - "$id": "308", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "139" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "309" }, { - "$id": "309", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "17" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "307" } ], "response": {}, @@ -3756,7 +3786,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get.accept", + "methodParameterSegments": [ + { + "$id": "317", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "19" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3786,21 +3835,7 @@ }, "parameters": [ { - "$id": "317", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "19" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "317" } ], "response": { @@ -3842,10 +3877,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put.contentType", + "methodParameterSegments": [ + { + "$id": "321", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "21" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "321", + "$id": "322", "kind": "body", "name": "body", "serializedName": "body", @@ -3862,7 +3917,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put.body", + "methodParameterSegments": [ + { + "$id": "323", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "144" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3889,40 +3964,10 @@ }, "parameters": [ { - "$id": "322", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "144" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "323" }, { - "$id": "323", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "21" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "321" } ], "response": {}, @@ -4007,7 +4052,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknown.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknown.get.accept", + "methodParameterSegments": [ + { + "$id": "331", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "23" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknown.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4037,21 +4101,7 @@ }, "parameters": [ { - "$id": "331", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "23" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknown.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "331" } ], "response": { @@ -4093,10 +4143,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknown.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknown.put.contentType", + "methodParameterSegments": [ + { + "$id": "335", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "25" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknown.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "335", + "$id": "336", "kind": "body", "name": "body", "serializedName": "body", @@ -4113,7 +4183,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknown.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknown.put.body", + "methodParameterSegments": [ + { + "$id": "337", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "155" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknown.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4140,40 +4230,10 @@ }, "parameters": [ { - "$id": "336", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "155" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknown.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "337" }, { - "$id": "337", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "25" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknown.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "335" } ], "response": {}, @@ -4258,7 +4318,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDerived.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDerived.get.accept", + "methodParameterSegments": [ + { + "$id": "345", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "27" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDerived.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4288,21 +4367,7 @@ }, "parameters": [ { - "$id": "345", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "27" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDerived.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "345" } ], "response": { @@ -4344,10 +4409,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDerived.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDerived.put.contentType", + "methodParameterSegments": [ + { + "$id": "349", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "29" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDerived.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "349", + "$id": "350", "kind": "body", "name": "body", "serializedName": "body", @@ -4364,7 +4449,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDerived.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDerived.put.body", + "methodParameterSegments": [ + { + "$id": "351", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "159" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDerived.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4391,40 +4496,10 @@ }, "parameters": [ { - "$id": "350", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "159" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDerived.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "351" }, { - "$id": "351", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "29" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDerived.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "349" } ], "response": {}, @@ -4509,7 +4584,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.get.accept", + "methodParameterSegments": [ + { + "$id": "359", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "31" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4539,21 +4633,7 @@ }, "parameters": [ { - "$id": "359", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "31" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "359" } ], "response": { @@ -4595,10 +4675,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.put.contentType", + "methodParameterSegments": [ + { + "$id": "363", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "33" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "363", + "$id": "364", "kind": "body", "name": "body", "serializedName": "body", @@ -4615,7 +4715,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.put.body", + "methodParameterSegments": [ + { + "$id": "365", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "164" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4642,40 +4762,10 @@ }, "parameters": [ { - "$id": "364", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "164" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "365" }, { - "$id": "365", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "33" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "363" } ], "response": {}, @@ -4760,7 +4850,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsString.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsString.get.accept", + "methodParameterSegments": [ + { + "$id": "373", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "35" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsString.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4790,21 +4899,7 @@ }, "parameters": [ { - "$id": "373", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "35" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsString.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "373" } ], "response": { @@ -4846,10 +4941,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsString.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsString.put.contentType", + "methodParameterSegments": [ + { + "$id": "377", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "37" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsString.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "377", + "$id": "378", "kind": "body", "name": "body", "serializedName": "body", @@ -4866,7 +4981,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsString.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsString.put.body", + "methodParameterSegments": [ + { + "$id": "379", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "176" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsString.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4893,40 +5028,10 @@ }, "parameters": [ { - "$id": "378", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "176" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsString.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "379" }, { - "$id": "379", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "37" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsString.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "377" } ], "response": {}, @@ -5011,7 +5116,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsString.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsString.get.accept", + "methodParameterSegments": [ + { + "$id": "387", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "39" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsString.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5041,21 +5165,7 @@ }, "parameters": [ { - "$id": "387", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "39" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsString.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "387" } ], "response": { @@ -5097,10 +5207,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsString.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsString.put.contentType", + "methodParameterSegments": [ + { + "$id": "391", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "41" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsString.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "391", + "$id": "392", "kind": "body", "name": "body", "serializedName": "body", @@ -5117,7 +5247,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsString.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsString.put.body", + "methodParameterSegments": [ + { + "$id": "393", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "180" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsString.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5144,40 +5294,10 @@ }, "parameters": [ { - "$id": "392", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "180" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsString.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "393" }, { - "$id": "393", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "41" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsString.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "391" } ], "response": {}, @@ -5262,7 +5382,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadString.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadString.get.accept", + "methodParameterSegments": [ + { + "$id": "401", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "43" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadString.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5292,21 +5431,7 @@ }, "parameters": [ { - "$id": "401", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "43" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadString.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "401" } ], "response": { @@ -5348,10 +5473,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadString.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadString.put.contentType", + "methodParameterSegments": [ + { + "$id": "405", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "45" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadString.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "405", + "$id": "406", "kind": "body", "name": "body", "serializedName": "body", @@ -5368,7 +5513,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadString.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadString.put.body", + "methodParameterSegments": [ + { + "$id": "407", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "184" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadString.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5395,40 +5560,10 @@ }, "parameters": [ { - "$id": "406", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "184" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadString.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "407" }, { - "$id": "407", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "45" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadString.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "405" } ], "response": {}, @@ -5513,7 +5648,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsFloat.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsFloat.get.accept", + "methodParameterSegments": [ + { + "$id": "415", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "47" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsFloat.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5543,21 +5697,7 @@ }, "parameters": [ { - "$id": "415", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "47" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsFloat.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "415" } ], "response": { @@ -5599,10 +5739,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsFloat.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsFloat.put.contentType", + "methodParameterSegments": [ + { + "$id": "419", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "49" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsFloat.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "419", + "$id": "420", "kind": "body", "name": "body", "serializedName": "body", @@ -5619,7 +5779,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsFloat.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsFloat.put.body", + "methodParameterSegments": [ + { + "$id": "421", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "188" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsFloat.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5646,40 +5826,10 @@ }, "parameters": [ { - "$id": "420", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "188" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsFloat.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "421" }, { - "$id": "421", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "49" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsFloat.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "419" } ], "response": {}, @@ -5764,7 +5914,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsFloat.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsFloat.get.accept", + "methodParameterSegments": [ + { + "$id": "429", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "51" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsFloat.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5794,21 +5963,7 @@ }, "parameters": [ { - "$id": "429", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "51" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsFloat.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "429" } ], "response": { @@ -5850,10 +6005,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsFloat.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsFloat.put.contentType", + "methodParameterSegments": [ + { + "$id": "433", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "53" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsFloat.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "433", + "$id": "434", "kind": "body", "name": "body", "serializedName": "body", @@ -5870,7 +6045,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsFloat.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsFloat.put.body", + "methodParameterSegments": [ + { + "$id": "435", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "192" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsFloat.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5897,40 +6092,10 @@ }, "parameters": [ { - "$id": "434", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "192" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsFloat.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "435" }, { - "$id": "435", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "53" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsFloat.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "433" } ], "response": {}, @@ -6015,7 +6180,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadFloat.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadFloat.get.accept", + "methodParameterSegments": [ + { + "$id": "443", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "55" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadFloat.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6045,21 +6229,7 @@ }, "parameters": [ { - "$id": "443", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "55" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadFloat.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "443" } ], "response": { @@ -6101,10 +6271,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadFloat.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadFloat.put.contentType", + "methodParameterSegments": [ + { + "$id": "447", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "57" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadFloat.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "447", + "$id": "448", "kind": "body", "name": "body", "serializedName": "body", @@ -6121,7 +6311,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadFloat.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadFloat.put.body", + "methodParameterSegments": [ + { + "$id": "449", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "196" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadFloat.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6148,40 +6358,10 @@ }, "parameters": [ { - "$id": "448", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "196" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadFloat.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "449" }, { - "$id": "449", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "57" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadFloat.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "447" } ], "response": {}, @@ -6266,7 +6446,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModel.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModel.get.accept", + "methodParameterSegments": [ + { + "$id": "457", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "59" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModel.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6296,21 +6495,7 @@ }, "parameters": [ { - "$id": "457", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "59" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModel.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "457" } ], "response": { @@ -6352,10 +6537,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModel.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModel.put.contentType", + "methodParameterSegments": [ + { + "$id": "461", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "61" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModel.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "461", + "$id": "462", "kind": "body", "name": "body", "serializedName": "body", @@ -6372,7 +6577,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModel.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModel.put.body", + "methodParameterSegments": [ + { + "$id": "463", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "200" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModel.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6399,40 +6624,10 @@ }, "parameters": [ { - "$id": "462", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "200" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModel.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "463" }, { - "$id": "463", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "61" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModel.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "461" } ], "response": {}, @@ -6517,7 +6712,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModel.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModel.get.accept", + "methodParameterSegments": [ + { + "$id": "471", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "63" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModel.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6547,21 +6761,7 @@ }, "parameters": [ { - "$id": "471", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "63" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModel.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "471" } ], "response": { @@ -6603,10 +6803,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModel.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModel.put.contentType", + "methodParameterSegments": [ + { + "$id": "475", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "65" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModel.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "475", + "$id": "476", "kind": "body", "name": "body", "serializedName": "body", @@ -6623,7 +6843,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModel.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModel.put.body", + "methodParameterSegments": [ + { + "$id": "477", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "205" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModel.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6650,40 +6890,10 @@ }, "parameters": [ { - "$id": "476", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "205" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModel.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "477" }, { - "$id": "477", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "65" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModel.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "475" } ], "response": {}, @@ -6768,7 +6978,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModel.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModel.get.accept", + "methodParameterSegments": [ + { + "$id": "485", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "67" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModel.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6798,21 +7027,7 @@ }, "parameters": [ { - "$id": "485", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "67" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModel.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "485" } ], "response": { @@ -6854,10 +7069,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModel.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModel.put.contentType", + "methodParameterSegments": [ + { + "$id": "489", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "69" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModel.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "489", + "$id": "490", "kind": "body", "name": "body", "serializedName": "body", @@ -6874,7 +7109,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModel.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModel.put.body", + "methodParameterSegments": [ + { + "$id": "491", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "207" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModel.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6901,40 +7156,10 @@ }, "parameters": [ { - "$id": "490", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "207" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModel.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "491" }, { - "$id": "491", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "69" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModel.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "489" } ], "response": {}, @@ -7019,7 +7244,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModelArray.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModelArray.get.accept", + "methodParameterSegments": [ + { + "$id": "499", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "71" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModelArray.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7049,21 +7293,7 @@ }, "parameters": [ { - "$id": "499", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "71" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModelArray.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "499" } ], "response": { @@ -7105,10 +7335,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModelArray.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModelArray.put.contentType", + "methodParameterSegments": [ + { + "$id": "503", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "73" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModelArray.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "503", + "$id": "504", "kind": "body", "name": "body", "serializedName": "body", @@ -7125,7 +7375,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModelArray.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModelArray.put.body", + "methodParameterSegments": [ + { + "$id": "505", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "209" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModelArray.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7152,40 +7422,10 @@ }, "parameters": [ { - "$id": "504", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "209" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModelArray.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "505" }, { - "$id": "505", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "73" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModelArray.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "503" } ], "response": {}, @@ -7270,7 +7510,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModelArray.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModelArray.get.accept", + "methodParameterSegments": [ + { + "$id": "513", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "75" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModelArray.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7300,21 +7559,7 @@ }, "parameters": [ { - "$id": "513", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "75" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModelArray.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "513" } ], "response": { @@ -7356,10 +7601,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModelArray.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModelArray.put.contentType", + "methodParameterSegments": [ + { + "$id": "517", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "77" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModelArray.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "517", + "$id": "518", "kind": "body", "name": "body", "serializedName": "body", @@ -7376,7 +7641,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModelArray.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModelArray.put.body", + "methodParameterSegments": [ + { + "$id": "519", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "212" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModelArray.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7403,40 +7688,10 @@ }, "parameters": [ { - "$id": "518", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "212" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModelArray.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "519" }, { - "$id": "519", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "77" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModelArray.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "517" } ], "response": {}, @@ -7521,7 +7776,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModelArray.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModelArray.get.accept", + "methodParameterSegments": [ + { + "$id": "527", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "79" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModelArray.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7551,21 +7825,7 @@ }, "parameters": [ { - "$id": "527", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "79" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModelArray.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "527" } ], "response": { @@ -7607,10 +7867,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModelArray.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModelArray.put.contentType", + "methodParameterSegments": [ + { + "$id": "531", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "81" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModelArray.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "531", + "$id": "532", "kind": "body", "name": "body", "serializedName": "body", @@ -7627,7 +7907,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModelArray.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModelArray.put.body", + "methodParameterSegments": [ + { + "$id": "533", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "214" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModelArray.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7654,40 +7954,10 @@ }, "parameters": [ { - "$id": "532", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "214" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModelArray.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "533" }, { - "$id": "533", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "81" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModelArray.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "531" } ], "response": {}, @@ -7772,7 +8042,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentString.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentString.get.accept", + "methodParameterSegments": [ + { + "$id": "541", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "83" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentString.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7802,21 +8091,7 @@ }, "parameters": [ { - "$id": "541", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "83" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentString.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "541" } ], "response": { @@ -7858,10 +8133,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentString.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentString.put.contentType", + "methodParameterSegments": [ + { + "$id": "545", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "85" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentString.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "545", + "$id": "546", "kind": "body", "name": "body", "serializedName": "body", @@ -7878,7 +8173,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentString.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentString.put.body", + "methodParameterSegments": [ + { + "$id": "547", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "216" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentString.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7905,40 +8220,10 @@ }, "parameters": [ { - "$id": "546", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "216" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentString.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "547" }, { - "$id": "547", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "85" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentString.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "545" } ], "response": {}, @@ -8023,7 +8308,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentFloat.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentFloat.get.accept", + "methodParameterSegments": [ + { + "$id": "555", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "87" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentFloat.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8053,21 +8357,7 @@ }, "parameters": [ { - "$id": "555", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "87" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentFloat.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "555" } ], "response": { @@ -8109,10 +8399,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentFloat.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentFloat.put.contentType", + "methodParameterSegments": [ + { + "$id": "559", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "89" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentFloat.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "559", + "$id": "560", "kind": "body", "name": "body", "serializedName": "body", @@ -8129,7 +8439,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentFloat.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentFloat.put.body", + "methodParameterSegments": [ + { + "$id": "561", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "220" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentFloat.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8156,40 +8486,10 @@ }, "parameters": [ { - "$id": "560", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "220" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentFloat.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "561" }, { - "$id": "561", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "89" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentFloat.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "559" } ], "response": {}, @@ -8274,7 +8574,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModel.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModel.get.accept", + "methodParameterSegments": [ + { + "$id": "569", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "91" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModel.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8304,21 +8623,7 @@ }, "parameters": [ { - "$id": "569", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "91" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModel.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "569" } ], "response": { @@ -8360,10 +8665,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModel.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModel.put.contentType", + "methodParameterSegments": [ + { + "$id": "573", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "93" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModel.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "573", + "$id": "574", "kind": "body", "name": "body", "serializedName": "body", @@ -8380,7 +8705,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModel.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModel.put.body", + "methodParameterSegments": [ + { + "$id": "575", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "224" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModel.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8407,40 +8752,10 @@ }, "parameters": [ { - "$id": "574", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "224" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModel.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "575" }, { - "$id": "575", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "93" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModel.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "573" } ], "response": {}, @@ -8525,7 +8840,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.get.accept", + "methodParameterSegments": [ + { + "$id": "583", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "95" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8555,21 +8889,7 @@ }, "parameters": [ { - "$id": "583", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "95" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "583" } ], "response": { @@ -8611,10 +8931,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.put.contentType", + "methodParameterSegments": [ + { + "$id": "587", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "97" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "587", + "$id": "588", "kind": "body", "name": "body", "serializedName": "body", @@ -8631,7 +8971,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.put.body", + "methodParameterSegments": [ + { + "$id": "589", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "227" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8658,40 +9018,10 @@ }, "parameters": [ { - "$id": "588", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "227" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "589" }, { - "$id": "589", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "97" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "587" } ], "response": {}, @@ -8776,7 +9106,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get.accept", + "methodParameterSegments": [ + { + "$id": "597", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "99" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8806,21 +9155,7 @@ }, "parameters": [ { - "$id": "597", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "99" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "597" } ], "response": { @@ -8862,10 +9197,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put.contentType", + "methodParameterSegments": [ + { + "$id": "601", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "101" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "601", + "$id": "602", "kind": "body", "name": "body", "serializedName": "body", @@ -8882,7 +9237,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put.body", + "methodParameterSegments": [ + { + "$id": "603", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "230" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8909,40 +9284,10 @@ }, "parameters": [ { - "$id": "602", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "230" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "603" }, { - "$id": "603", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "101" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "601" } ], "response": {}, @@ -9027,7 +9372,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get.accept", + "methodParameterSegments": [ + { + "$id": "611", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "103" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9057,21 +9421,7 @@ }, "parameters": [ { - "$id": "611", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "103" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "611" } ], "response": { @@ -9113,10 +9463,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put.contentType", + "methodParameterSegments": [ + { + "$id": "615", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "105" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "615", + "$id": "616", "kind": "body", "name": "body", "serializedName": "body", @@ -9133,7 +9503,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put.body", + "methodParameterSegments": [ + { + "$id": "617", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "233" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9160,40 +9550,10 @@ }, "parameters": [ { - "$id": "616", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "233" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "617" }, { - "$id": "617", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "105" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "615" } ], "response": {}, @@ -9278,7 +9638,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get.accept", + "methodParameterSegments": [ + { + "$id": "625", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "107" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9308,21 +9687,7 @@ }, "parameters": [ { - "$id": "625", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "107" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "625" } ], "response": { @@ -9364,10 +9729,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put.contentType", + "methodParameterSegments": [ + { + "$id": "629", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "109" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "629", + "$id": "630", "kind": "body", "name": "body", "serializedName": "body", @@ -9384,7 +9769,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put.body", + "methodParameterSegments": [ + { + "$id": "631", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "236" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9411,40 +9816,10 @@ }, "parameters": [ { - "$id": "630", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "236" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "631" }, { - "$id": "631", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "109" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "629" } ], "response": {}, @@ -9529,7 +9904,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get.accept", + "methodParameterSegments": [ + { + "$id": "639", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "111" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9559,21 +9953,7 @@ }, "parameters": [ { - "$id": "639", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "111" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "639" } ], "response": { @@ -9615,10 +9995,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put.contentType", + "methodParameterSegments": [ + { + "$id": "643", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "113" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "643", + "$id": "644", "kind": "body", "name": "body", "serializedName": "body", @@ -9635,7 +10035,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put.body", + "methodParameterSegments": [ + { + "$id": "645", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "238" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9662,40 +10082,10 @@ }, "parameters": [ { - "$id": "644", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "238" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "645" }, { - "$id": "645", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "113" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "643" } ], "response": {}, @@ -9780,7 +10170,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.MultipleSpread.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.MultipleSpread.get.accept", + "methodParameterSegments": [ + { + "$id": "653", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "115" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.MultipleSpread.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9810,21 +10219,7 @@ }, "parameters": [ { - "$id": "653", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "115" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.MultipleSpread.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "653" } ], "response": { @@ -9866,10 +10261,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.MultipleSpread.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.MultipleSpread.put.contentType", + "methodParameterSegments": [ + { + "$id": "657", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "117" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.MultipleSpread.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "657", + "$id": "658", "kind": "body", "name": "body", "serializedName": "body", @@ -9886,7 +10301,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.MultipleSpread.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.MultipleSpread.put.body", + "methodParameterSegments": [ + { + "$id": "659", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "240" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.MultipleSpread.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9913,40 +10348,10 @@ }, "parameters": [ { - "$id": "658", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "240" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.MultipleSpread.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "659" }, { - "$id": "659", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "117" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.MultipleSpread.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "657" } ], "response": {}, @@ -10031,7 +10436,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordUnion.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordUnion.get.accept", + "methodParameterSegments": [ + { + "$id": "667", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "119" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordUnion.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -10061,21 +10485,7 @@ }, "parameters": [ { - "$id": "667", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "119" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordUnion.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "667" } ], "response": { @@ -10117,10 +10527,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordUnion.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordUnion.put.contentType", + "methodParameterSegments": [ + { + "$id": "671", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "121" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordUnion.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "671", + "$id": "672", "kind": "body", "name": "body", "serializedName": "body", @@ -10137,7 +10567,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordUnion.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordUnion.put.body", + "methodParameterSegments": [ + { + "$id": "673", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "246" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordUnion.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -10164,40 +10614,10 @@ }, "parameters": [ { - "$id": "672", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "246" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordUnion.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "673" }, { - "$id": "673", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "121" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordUnion.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "671" } ], "response": {}, @@ -10282,7 +10702,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get.accept", + "methodParameterSegments": [ + { + "$id": "681", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "123" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -10312,21 +10751,7 @@ }, "parameters": [ { - "$id": "681", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "123" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "681" } ], "response": { @@ -10368,10 +10793,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put.contentType", + "methodParameterSegments": [ + { + "$id": "685", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "125" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "685", + "$id": "686", "kind": "body", "name": "body", "serializedName": "body", @@ -10388,7 +10833,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put.body", + "methodParameterSegments": [ + { + "$id": "687", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "252" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -10415,40 +10880,10 @@ }, "parameters": [ { - "$id": "686", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "252" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "687" }, { - "$id": "687", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "125" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "685" } ], "response": {}, @@ -10533,7 +10968,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get.accept", + "methodParameterSegments": [ + { + "$id": "695", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "127" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -10563,21 +11017,7 @@ }, "parameters": [ { - "$id": "695", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "127" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "695" } ], "response": { @@ -10619,10 +11059,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put.contentType", + "methodParameterSegments": [ + { + "$id": "699", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "129" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "699", + "$id": "700", "kind": "body", "name": "body", "serializedName": "body", @@ -10639,7 +11099,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put.body", + "methodParameterSegments": [ + { + "$id": "701", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "268" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -10666,40 +11146,10 @@ }, "parameters": [ { - "$id": "700", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "268" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "701" }, { - "$id": "701", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "129" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "699" } ], "response": {}, @@ -10784,7 +11234,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get.accept" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get.accept", + "methodParameterSegments": [ + { + "$id": "709", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "131" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -10814,21 +11283,7 @@ }, "parameters": [ { - "$id": "709", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "131" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "709" } ], "response": { @@ -10870,10 +11325,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put.contentType" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put.contentType", + "methodParameterSegments": [ + { + "$id": "713", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "133" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "713", + "$id": "714", "kind": "body", "name": "body", "serializedName": "body", @@ -10890,7 +11365,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put.body" + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put.body", + "methodParameterSegments": [ + { + "$id": "715", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "276" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -10917,40 +11412,10 @@ }, "parameters": [ { - "$id": "714", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "276" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "715" }, { - "$id": "715", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "133" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "713" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/Type.Property.Nullable.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/Type.Property.Nullable.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/Type.Property.Nullable.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/Type.Property.Nullable.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/Type.Property.Nullable.sln deleted file mode 100644 index eb4002143d4..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/Type.Property.Nullable.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Property.Nullable", "src\Type.Property.Nullable.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/Type.Property.Nullable.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/Type.Property.Nullable.slnx new file mode 100644 index 00000000000..73d3f6f47c2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/Type.Property.Nullable.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Bytes.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Bytes.cs index eacf8814b15..4e6ff0b6f10 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Bytes.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Bytes.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Bytes { protected Bytes() => throw null; + internal Bytes(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetNonNull(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/CollectionsByte.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/CollectionsByte.cs index ad2cd996943..147ed22adef 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/CollectionsByte.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/CollectionsByte.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class CollectionsByte { protected CollectionsByte() => throw null; + internal CollectionsByte(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetNonNull(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/CollectionsModel.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/CollectionsModel.cs index a424dcc6309..a2cb3752dd3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/CollectionsModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/CollectionsModel.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class CollectionsModel { protected CollectionsModel() => throw null; + internal CollectionsModel(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetNonNull(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/CollectionsString.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/CollectionsString.cs index 3481b5221d5..9ebdb4ed447 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/CollectionsString.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/CollectionsString.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class CollectionsString { protected CollectionsString() => throw null; + internal CollectionsString(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetNonNull(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Datetime.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Datetime.cs index 2d316f989b4..65fd66ab449 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Datetime.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Datetime.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Datetime { protected Datetime() => throw null; + internal Datetime(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetNonNull(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Duration.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Duration.cs index 5436a4fda27..d1091acfe3d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Duration.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Duration.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Duration { protected Duration() => throw null; + internal Duration(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetNonNull(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/BytesProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/BytesProperty.Serialization.cs index 33b2b5d6498..696f506869f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/BytesProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/BytesProperty.Serialization.cs @@ -13,24 +13,24 @@ public partial class BytesProperty : IJsonModel { internal BytesProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - BytesProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BytesProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual BytesProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - BytesProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual BytesProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator BytesProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + BytesProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual BytesProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.Serialization.cs index 74b7dba809c..070d98dd4fe 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.Serialization.cs @@ -13,24 +13,24 @@ public partial class CollectionsByteProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - CollectionsByteProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual CollectionsByteProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual CollectionsByteProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - CollectionsByteProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual CollectionsByteProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator CollectionsByteProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + CollectionsByteProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual CollectionsByteProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.Serialization.cs index 74c829203ec..0f77035a8ea 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.Serialization.cs @@ -13,24 +13,24 @@ public partial class CollectionsModelProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - CollectionsModelProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual CollectionsModelProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual CollectionsModelProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - CollectionsModelProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual CollectionsModelProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator CollectionsModelProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + CollectionsModelProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual CollectionsModelProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.Serialization.cs index 9856a6c9dfc..30929aa4983 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.Serialization.cs @@ -13,24 +13,24 @@ public partial class CollectionsStringProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - CollectionsStringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual CollectionsStringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual CollectionsStringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - CollectionsStringProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual CollectionsStringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator CollectionsStringProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + CollectionsStringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual CollectionsStringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/DatetimeProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/DatetimeProperty.Serialization.cs index 442c22e9a35..60a5e8729fa 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/DatetimeProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/DatetimeProperty.Serialization.cs @@ -13,24 +13,24 @@ public partial class DatetimeProperty : IJsonModel { internal DatetimeProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DatetimeProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual DatetimeProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DatetimeProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DatetimeProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DatetimeProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator DatetimeProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DatetimeProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual DatetimeProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/DurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/DurationProperty.Serialization.cs index c370acb1538..37dd2c4a601 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/DurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/DurationProperty.Serialization.cs @@ -13,24 +13,24 @@ public partial class DurationProperty : IJsonModel { internal DurationProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual DurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DurationProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator DurationProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual DurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/InnerModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/InnerModel.Serialization.cs index d588f68c894..9f3d99193b6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/InnerModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/InnerModel.Serialization.cs @@ -12,22 +12,22 @@ public partial class InnerModel : IJsonModel { internal InnerModel() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual InnerModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - InnerModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual InnerModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + InnerModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - InnerModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual InnerModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + InnerModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual InnerModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/StringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/StringProperty.Serialization.cs index 4f732194abd..3599daf1050 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/StringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/StringProperty.Serialization.cs @@ -13,24 +13,24 @@ public partial class StringProperty : IJsonModel { internal StringProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - StringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual StringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual StringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - StringProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual StringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator StringProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + StringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual StringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/NullableClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/NullableClient.cs index 96329118412..af9921af400 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/NullableClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/NullableClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; namespace _Type.Property.Nullable { @@ -11,7 +12,12 @@ public partial class NullableClient { public NullableClient() : this(new Uri("http://localhost:3000"), new NullableClientOptions()) => throw null; - public NullableClient(Uri endpoint, NullableClientOptions options) => throw null; + internal NullableClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, NullableClientOptions options) => throw null; + + public NullableClient(Uri endpoint, NullableClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public NullableClient(NullableClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/NullableClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/NullableClientOptions.cs index d4939dbbb1f..4e33d510c38 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/NullableClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/NullableClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace _Type.Property.Nullable { public partial class NullableClientOptions : ClientPipelineOptions { + public NullableClientOptions() => throw null; + + [Experimental("SCME0002")] + internal NullableClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/NullableClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/NullableClientSettings.cs new file mode 100644 index 00000000000..738504eba24 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/NullableClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace _Type.Property.Nullable +{ + [Experimental("SCME0002")] + public partial class NullableClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public NullableClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/String.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/String.cs index 461ad9d615b..786c381fb0b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/String.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/String.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class String { protected String() => throw null; + internal String(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetNonNull(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..706088c678c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "NullableClient": { + "type": "object", + "description": "Configuration for NullableClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/nullableClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "nullableClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Type.Property.Nullable.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Type.Property.Nullable.csproj index 1b4cc3f50c5..fc1f5e51702 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Type.Property.Nullable.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Type.Property.Nullable.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/tspCodeModel.json index 606d8272703..698359c7ce6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/tspCodeModel.json @@ -1353,7 +1353,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.String.getNonNull.accept" + "crossLanguageDefinitionId": "Type.Property.Nullable.String.getNonNull.accept", + "methodParameterSegments": [ + { + "$id": "142", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.String.getNonNull.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1383,21 +1402,7 @@ }, "parameters": [ { - "$id": "142", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.String.getNonNull.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "142" } ], "response": { @@ -1438,7 +1443,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.String.getNull.accept" + "crossLanguageDefinitionId": "Type.Property.Nullable.String.getNull.accept", + "methodParameterSegments": [ + { + "$id": "146", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "3" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.String.getNull.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1468,21 +1492,7 @@ }, "parameters": [ { - "$id": "146", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.String.getNull.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "146" } ], "response": { @@ -1524,10 +1534,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.String.patchNonNull.contentType" + "crossLanguageDefinitionId": "Type.Property.Nullable.String.patchNonNull.contentType", + "methodParameterSegments": [ + { + "$id": "150", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "content-type is application/merge-patch+json", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.String.patchNonNull.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "150", + "$id": "151", "kind": "body", "name": "body", "serializedName": "body", @@ -1543,7 +1573,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Nullable.String.patchNonNull.body" + "crossLanguageDefinitionId": "Type.Property.Nullable.String.patchNonNull.body", + "methodParameterSegments": [ + { + "$id": "152", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "85" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Nullable.String.patchNonNull.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1570,39 +1619,10 @@ }, "parameters": [ { - "$id": "151", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "content-type is application/merge-patch+json", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.String.patchNonNull.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "150" }, { - "$id": "152", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "85" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Nullable.String.patchNonNull.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "152" } ], "response": {}, @@ -1640,10 +1660,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.String.patchNull.contentType" + "crossLanguageDefinitionId": "Type.Property.Nullable.String.patchNull.contentType", + "methodParameterSegments": [ + { + "$id": "156", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "content-type is application/merge-patch+json", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.String.patchNull.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "156", + "$id": "157", "kind": "body", "name": "body", "serializedName": "body", @@ -1659,7 +1699,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Nullable.String.patchNull.body" + "crossLanguageDefinitionId": "Type.Property.Nullable.String.patchNull.body", + "methodParameterSegments": [ + { + "$id": "158", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "85" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Nullable.String.patchNull.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1686,39 +1745,10 @@ }, "parameters": [ { - "$id": "157", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "content-type is application/merge-patch+json", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.String.patchNull.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "156" }, { - "$id": "158", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "85" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Nullable.String.patchNull.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "158" } ], "response": {}, @@ -1803,7 +1833,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.getNonNull.accept" + "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.getNonNull.accept", + "methodParameterSegments": [ + { + "$id": "166", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "13" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.getNonNull.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1833,21 +1882,7 @@ }, "parameters": [ { - "$id": "166", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.getNonNull.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "166" } ], "response": { @@ -1888,7 +1923,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.getNull.accept" + "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.getNull.accept", + "methodParameterSegments": [ + { + "$id": "170", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "15" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.getNull.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1918,21 +1972,7 @@ }, "parameters": [ { - "$id": "170", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.getNull.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "170" } ], "response": { @@ -1974,10 +2014,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.patchNonNull.contentType" + "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.patchNonNull.contentType", + "methodParameterSegments": [ + { + "$id": "174", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "content-type is application/merge-patch+json", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.patchNonNull.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "174", + "$id": "175", "kind": "body", "name": "body", "serializedName": "body", @@ -1993,7 +2053,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.patchNonNull.body" + "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.patchNonNull.body", + "methodParameterSegments": [ + { + "$id": "176", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "91" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.patchNonNull.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2020,39 +2099,10 @@ }, "parameters": [ { - "$id": "175", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "content-type is application/merge-patch+json", - "type": { - "$ref": "19" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.patchNonNull.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "174" }, { - "$id": "176", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "91" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.patchNonNull.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "176" } ], "response": {}, @@ -2090,10 +2140,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.patchNull.contentType" + "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.patchNull.contentType", + "methodParameterSegments": [ + { + "$id": "180", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "content-type is application/merge-patch+json", + "type": { + "$ref": "21" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.patchNull.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "180", + "$id": "181", "kind": "body", "name": "body", "serializedName": "body", @@ -2109,7 +2179,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.patchNull.body" + "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.patchNull.body", + "methodParameterSegments": [ + { + "$id": "182", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "91" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.patchNull.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2136,39 +2225,10 @@ }, "parameters": [ { - "$id": "181", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "content-type is application/merge-patch+json", - "type": { - "$ref": "23" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.patchNull.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "180" }, { - "$id": "182", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "91" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Nullable.Bytes.patchNull.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "182" } ], "response": {}, @@ -2253,7 +2313,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.getNonNull.accept" + "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.getNonNull.accept", + "methodParameterSegments": [ + { + "$id": "190", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "25" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.getNonNull.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2283,21 +2362,7 @@ }, "parameters": [ { - "$id": "190", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "25" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.getNonNull.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "190" } ], "response": { @@ -2338,7 +2403,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.getNull.accept" + "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.getNull.accept", + "methodParameterSegments": [ + { + "$id": "194", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "27" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.getNull.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2368,21 +2452,7 @@ }, "parameters": [ { - "$id": "194", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "27" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.getNull.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "194" } ], "response": { @@ -2424,10 +2494,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.patchNonNull.contentType" + "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.patchNonNull.contentType", + "methodParameterSegments": [ + { + "$id": "198", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "content-type is application/merge-patch+json", + "type": { + "$ref": "29" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.patchNonNull.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "198", + "$id": "199", "kind": "body", "name": "body", "serializedName": "body", @@ -2443,7 +2533,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.patchNonNull.body" + "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.patchNonNull.body", + "methodParameterSegments": [ + { + "$id": "200", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "97" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.patchNonNull.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2470,39 +2579,10 @@ }, "parameters": [ { - "$id": "199", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "content-type is application/merge-patch+json", - "type": { - "$ref": "31" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.patchNonNull.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "198" }, { - "$id": "200", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "97" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.patchNonNull.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "200" } ], "response": {}, @@ -2540,10 +2620,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.patchNull.contentType" + "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.patchNull.contentType", + "methodParameterSegments": [ + { + "$id": "204", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "content-type is application/merge-patch+json", + "type": { + "$ref": "33" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.patchNull.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "204", + "$id": "205", "kind": "body", "name": "body", "serializedName": "body", @@ -2559,7 +2659,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.patchNull.body" + "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.patchNull.body", + "methodParameterSegments": [ + { + "$id": "206", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "97" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.patchNull.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2586,39 +2705,10 @@ }, "parameters": [ { - "$id": "205", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "content-type is application/merge-patch+json", - "type": { - "$ref": "35" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.patchNull.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "204" }, { - "$id": "206", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "97" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Nullable.Datetime.patchNull.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "206" } ], "response": {}, @@ -2703,7 +2793,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.getNonNull.accept" + "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.getNonNull.accept", + "methodParameterSegments": [ + { + "$id": "214", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "37" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.getNonNull.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2733,21 +2842,7 @@ }, "parameters": [ { - "$id": "214", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "37" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.getNonNull.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "214" } ], "response": { @@ -2788,7 +2883,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.getNull.accept" + "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.getNull.accept", + "methodParameterSegments": [ + { + "$id": "218", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "39" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.getNull.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2818,21 +2932,7 @@ }, "parameters": [ { - "$id": "218", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "39" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.getNull.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "218" } ], "response": { @@ -2874,10 +2974,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.patchNonNull.contentType" + "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.patchNonNull.contentType", + "methodParameterSegments": [ + { + "$id": "222", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "content-type is application/merge-patch+json", + "type": { + "$ref": "41" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.patchNonNull.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "222", + "$id": "223", "kind": "body", "name": "body", "serializedName": "body", @@ -2893,7 +3013,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.patchNonNull.body" + "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.patchNonNull.body", + "methodParameterSegments": [ + { + "$id": "224", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "104" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.patchNonNull.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2920,39 +3059,10 @@ }, "parameters": [ { - "$id": "223", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "content-type is application/merge-patch+json", - "type": { - "$ref": "43" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.patchNonNull.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "222" }, { - "$id": "224", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "104" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.patchNonNull.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "224" } ], "response": {}, @@ -2990,10 +3100,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.patchNull.contentType" + "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.patchNull.contentType", + "methodParameterSegments": [ + { + "$id": "228", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "content-type is application/merge-patch+json", + "type": { + "$ref": "45" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.patchNull.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "228", + "$id": "229", "kind": "body", "name": "body", "serializedName": "body", @@ -3009,7 +3139,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.patchNull.body" + "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.patchNull.body", + "methodParameterSegments": [ + { + "$id": "230", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "104" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.patchNull.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3036,39 +3185,10 @@ }, "parameters": [ { - "$id": "229", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "content-type is application/merge-patch+json", - "type": { - "$ref": "47" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.patchNull.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "228" }, { - "$id": "230", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "104" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Nullable.Duration.patchNull.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "230" } ], "response": {}, @@ -3153,7 +3273,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.getNonNull.accept" + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.getNonNull.accept", + "methodParameterSegments": [ + { + "$id": "238", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "49" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.getNonNull.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3183,21 +3322,7 @@ }, "parameters": [ { - "$id": "238", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "49" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.getNonNull.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "238" } ], "response": { @@ -3238,7 +3363,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.getNull.accept" + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.getNull.accept", + "methodParameterSegments": [ + { + "$id": "242", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "51" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.getNull.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3268,21 +3412,7 @@ }, "parameters": [ { - "$id": "242", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "51" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.getNull.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "242" } ], "response": { @@ -3324,10 +3454,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.patchNonNull.contentType" + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.patchNonNull.contentType", + "methodParameterSegments": [ + { + "$id": "246", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "content-type is application/merge-patch+json", + "type": { + "$ref": "53" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.patchNonNull.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "246", + "$id": "247", "kind": "body", "name": "body", "serializedName": "body", @@ -3343,7 +3493,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.patchNonNull.body" + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.patchNonNull.body", + "methodParameterSegments": [ + { + "$id": "248", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "111" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.patchNonNull.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3370,39 +3539,10 @@ }, "parameters": [ { - "$id": "247", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "content-type is application/merge-patch+json", - "type": { - "$ref": "55" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.patchNonNull.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "246" }, { - "$id": "248", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "111" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.patchNonNull.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "248" } ], "response": {}, @@ -3440,10 +3580,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.patchNull.contentType" + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.patchNull.contentType", + "methodParameterSegments": [ + { + "$id": "252", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "content-type is application/merge-patch+json", + "type": { + "$ref": "57" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.patchNull.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "252", + "$id": "253", "kind": "body", "name": "body", "serializedName": "body", @@ -3459,7 +3619,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.patchNull.body" + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.patchNull.body", + "methodParameterSegments": [ + { + "$id": "254", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "111" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.patchNull.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3486,39 +3665,10 @@ }, "parameters": [ { - "$id": "253", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "content-type is application/merge-patch+json", - "type": { - "$ref": "59" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.patchNull.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "252" }, { - "$id": "254", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "111" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByte.patchNull.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "254" } ], "response": {}, @@ -3603,7 +3753,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.getNonNull.accept" + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.getNonNull.accept", + "methodParameterSegments": [ + { + "$id": "262", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "61" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.getNonNull.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3633,21 +3802,7 @@ }, "parameters": [ { - "$id": "262", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "61" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.getNonNull.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "262" } ], "response": { @@ -3688,7 +3843,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.getNull.accept" + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.getNull.accept", + "methodParameterSegments": [ + { + "$id": "266", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "63" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.getNull.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3718,21 +3892,7 @@ }, "parameters": [ { - "$id": "266", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "63" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.getNull.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "266" } ], "response": { @@ -3774,10 +3934,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.patchNonNull.contentType" + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.patchNonNull.contentType", + "methodParameterSegments": [ + { + "$id": "270", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "content-type is application/merge-patch+json", + "type": { + "$ref": "65" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.patchNonNull.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "270", + "$id": "271", "kind": "body", "name": "body", "serializedName": "body", @@ -3793,7 +3973,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.patchNonNull.body" + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.patchNonNull.body", + "methodParameterSegments": [ + { + "$id": "272", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "118" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.patchNonNull.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3820,39 +4019,10 @@ }, "parameters": [ { - "$id": "271", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "content-type is application/merge-patch+json", - "type": { - "$ref": "67" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.patchNonNull.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "270" }, { - "$id": "272", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "118" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.patchNonNull.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "272" } ], "response": {}, @@ -3890,10 +4060,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.patchNull.contentType" + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.patchNull.contentType", + "methodParameterSegments": [ + { + "$id": "276", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "content-type is application/merge-patch+json", + "type": { + "$ref": "69" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.patchNull.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "276", + "$id": "277", "kind": "body", "name": "body", "serializedName": "body", @@ -3909,7 +4099,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.patchNull.body" + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.patchNull.body", + "methodParameterSegments": [ + { + "$id": "278", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "118" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.patchNull.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3936,39 +4145,10 @@ }, "parameters": [ { - "$id": "277", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "content-type is application/merge-patch+json", - "type": { - "$ref": "71" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.patchNull.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "276" }, { - "$id": "278", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "118" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModel.patchNull.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "278" } ], "response": {}, @@ -4053,7 +4233,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.getNonNull.accept" + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.getNonNull.accept", + "methodParameterSegments": [ + { + "$id": "286", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "73" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.getNonNull.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4083,21 +4282,7 @@ }, "parameters": [ { - "$id": "286", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "73" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.getNonNull.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "286" } ], "response": { @@ -4138,7 +4323,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.getNull.accept" + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.getNull.accept", + "methodParameterSegments": [ + { + "$id": "290", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "75" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.getNull.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4168,21 +4372,7 @@ }, "parameters": [ { - "$id": "290", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "75" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.getNull.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "290" } ], "response": { @@ -4224,10 +4414,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.patchNonNull.contentType" + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.patchNonNull.contentType", + "methodParameterSegments": [ + { + "$id": "294", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "content-type is application/merge-patch+json", + "type": { + "$ref": "77" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.patchNonNull.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "294", + "$id": "295", "kind": "body", "name": "body", "serializedName": "body", @@ -4243,7 +4453,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.patchNonNull.body" + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.patchNonNull.body", + "methodParameterSegments": [ + { + "$id": "296", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "127" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.patchNonNull.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4270,39 +4499,10 @@ }, "parameters": [ { - "$id": "295", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "content-type is application/merge-patch+json", - "type": { - "$ref": "79" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.patchNonNull.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "294" }, { - "$id": "296", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "127" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.patchNonNull.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "296" } ], "response": {}, @@ -4340,10 +4540,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.patchNull.contentType" + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.patchNull.contentType", + "methodParameterSegments": [ + { + "$id": "300", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "content-type is application/merge-patch+json", + "type": { + "$ref": "81" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.patchNull.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "300", + "$id": "301", "kind": "body", "name": "body", "serializedName": "body", @@ -4359,7 +4579,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.patchNull.body" + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.patchNull.body", + "methodParameterSegments": [ + { + "$id": "302", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "127" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.patchNull.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4386,39 +4625,10 @@ }, "parameters": [ { - "$id": "301", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "content-type is application/merge-patch+json", - "type": { - "$ref": "83" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.patchNull.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "300" }, { - "$id": "302", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "127" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsString.patchNull.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "302" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/Type.Property.Optional.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/Type.Property.Optional.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/Type.Property.Optional.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/Type.Property.Optional.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/Type.Property.Optional.sln deleted file mode 100644 index 4ef05d27fbe..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/Type.Property.Optional.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Property.Optional", "src\Type.Property.Optional.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/Type.Property.Optional.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/Type.Property.Optional.slnx new file mode 100644 index 00000000000..dae13b0c873 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/Type.Property.Optional.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/BooleanLiteral.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/BooleanLiteral.cs index 593e92d4244..6dca0711f46 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/BooleanLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/BooleanLiteral.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class BooleanLiteral { protected BooleanLiteral() => throw null; + internal BooleanLiteral(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetAll(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Bytes.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Bytes.cs index b4d7e3788e8..44c535cc253 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Bytes.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Bytes.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Bytes { protected Bytes() => throw null; + internal Bytes(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetAll(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/CollectionsByte.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/CollectionsByte.cs index 706f6515fc5..808a6ca8b49 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/CollectionsByte.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/CollectionsByte.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class CollectionsByte { protected CollectionsByte() => throw null; + internal CollectionsByte(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetAll(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/CollectionsModel.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/CollectionsModel.cs index dfe28feac96..00be1dcec43 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/CollectionsModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/CollectionsModel.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class CollectionsModel { protected CollectionsModel() => throw null; + internal CollectionsModel(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetAll(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Datetime.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Datetime.cs index 5e578c2da19..3b2e4f0017b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Datetime.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Datetime.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Datetime { protected Datetime() => throw null; + internal Datetime(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetAll(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Duration.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Duration.cs index 03d2758ff8a..9a9c63ae762 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Duration.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Duration.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Duration { protected Duration() => throw null; + internal Duration(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetAll(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/FloatLiteral.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/FloatLiteral.cs index 7d71a102cd8..f7504a61cf2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/FloatLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/FloatLiteral.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class FloatLiteral { protected FloatLiteral() => throw null; + internal FloatLiteral(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetAll(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/IntLiteral.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/IntLiteral.cs index 5f5db298391..3309e35bfe2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/IntLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/IntLiteral.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class IntLiteral { protected IntLiteral() => throw null; + internal IntLiteral(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetAll(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/BooleanLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/BooleanLiteralProperty.Serialization.cs index bcd8ec31f08..bd6c3a3bc39 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/BooleanLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/BooleanLiteralProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.Optional { public partial class BooleanLiteralProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - BooleanLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BooleanLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual BooleanLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - BooleanLiteralProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual BooleanLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(BooleanLiteralProperty booleanLiteralProperty) => throw null; public static explicit operator BooleanLiteralProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + BooleanLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual BooleanLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/BytesProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/BytesProperty.Serialization.cs index 6dfdd868d21..43b631b12e5 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/BytesProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/BytesProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.Optional { public partial class BytesProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - BytesProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BytesProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual BytesProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - BytesProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual BytesProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(BytesProperty bytesProperty) => throw null; public static explicit operator BytesProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + BytesProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual BytesProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/CollectionsByteProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/CollectionsByteProperty.Serialization.cs index 2219cf836bd..8eddcd7cfce 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/CollectionsByteProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/CollectionsByteProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.Optional { public partial class CollectionsByteProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - CollectionsByteProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual CollectionsByteProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual CollectionsByteProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - CollectionsByteProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual CollectionsByteProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(CollectionsByteProperty collectionsByteProperty) => throw null; public static explicit operator CollectionsByteProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + CollectionsByteProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual CollectionsByteProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/CollectionsModelProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/CollectionsModelProperty.Serialization.cs index 00b37679c73..b77d7fbb159 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/CollectionsModelProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/CollectionsModelProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.Optional { public partial class CollectionsModelProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - CollectionsModelProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual CollectionsModelProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual CollectionsModelProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - CollectionsModelProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual CollectionsModelProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(CollectionsModelProperty collectionsModelProperty) => throw null; public static explicit operator CollectionsModelProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + CollectionsModelProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual CollectionsModelProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/DatetimeProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/DatetimeProperty.Serialization.cs index 1fa31738297..a3b4ba6bc9e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/DatetimeProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/DatetimeProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.Optional { public partial class DatetimeProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DatetimeProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual DatetimeProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DatetimeProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DatetimeProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DatetimeProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(DatetimeProperty datetimeProperty) => throw null; public static explicit operator DatetimeProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DatetimeProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual DatetimeProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/DurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/DurationProperty.Serialization.cs index af3d3d06fde..5538b9547b0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/DurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/DurationProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.Optional { public partial class DurationProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual DurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DurationProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(DurationProperty durationProperty) => throw null; public static explicit operator DurationProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual DurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/FloatLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/FloatLiteralProperty.Serialization.cs index 33387e66beb..9e9e37c92d3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/FloatLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/FloatLiteralProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.Optional { public partial class FloatLiteralProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - FloatLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual FloatLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual FloatLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - FloatLiteralProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual FloatLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(FloatLiteralProperty floatLiteralProperty) => throw null; public static explicit operator FloatLiteralProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + FloatLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual FloatLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/IntLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/IntLiteralProperty.Serialization.cs index 2fd347b7cb3..2d9e8311444 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/IntLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/IntLiteralProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.Optional { public partial class IntLiteralProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - IntLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual IntLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual IntLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - IntLiteralProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual IntLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(IntLiteralProperty intLiteralProperty) => throw null; public static explicit operator IntLiteralProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + IntLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual IntLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/PlainDateProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/PlainDateProperty.Serialization.cs index cc7f6a5cddc..b4955e54c3e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/PlainDateProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/PlainDateProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.Optional { public partial class PlainDateProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - PlainDateProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual PlainDateProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual PlainDateProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - PlainDateProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual PlainDateProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(PlainDateProperty plainDateProperty) => throw null; public static explicit operator PlainDateProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + PlainDateProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual PlainDateProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/PlainTimeProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/PlainTimeProperty.Serialization.cs index 87390794833..43ccbece0dd 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/PlainTimeProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/PlainTimeProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.Optional { public partial class PlainTimeProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - PlainTimeProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual PlainTimeProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual PlainTimeProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - PlainTimeProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual PlainTimeProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(PlainTimeProperty plainTimeProperty) => throw null; public static explicit operator PlainTimeProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + PlainTimeProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual PlainTimeProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/RequiredAndOptionalProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/RequiredAndOptionalProperty.Serialization.cs index 722ded5b66f..610ae3ba622 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/RequiredAndOptionalProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/RequiredAndOptionalProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class RequiredAndOptionalProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - RequiredAndOptionalProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual RequiredAndOptionalProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual RequiredAndOptionalProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - RequiredAndOptionalProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual RequiredAndOptionalProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(RequiredAndOptionalProperty requiredAndOptionalProperty) => throw null; public static explicit operator RequiredAndOptionalProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + RequiredAndOptionalProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual RequiredAndOptionalProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/StringLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/StringLiteralProperty.Serialization.cs index 510e4a37e28..2b17af69381 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/StringLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/StringLiteralProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.Optional { public partial class StringLiteralProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - StringLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual StringLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual StringLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - StringLiteralProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual StringLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(StringLiteralProperty stringLiteralProperty) => throw null; public static explicit operator StringLiteralProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + StringLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual StringLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/StringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/StringProperty.Serialization.cs index ef570da8929..7b3973cbf53 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/StringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/StringProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.Optional { public partial class StringProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - StringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual StringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual StringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - StringProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual StringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(StringProperty stringProperty) => throw null; public static explicit operator StringProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + StringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual StringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/UnionFloatLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/UnionFloatLiteralProperty.Serialization.cs index c5916501982..bb772d1a26a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/UnionFloatLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/UnionFloatLiteralProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.Optional { public partial class UnionFloatLiteralProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - UnionFloatLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual UnionFloatLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnionFloatLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - UnionFloatLiteralProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnionFloatLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(UnionFloatLiteralProperty unionFloatLiteralProperty) => throw null; public static explicit operator UnionFloatLiteralProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + UnionFloatLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual UnionFloatLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/UnionIntLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/UnionIntLiteralProperty.Serialization.cs index c19e8f23b6c..7805682a543 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/UnionIntLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/UnionIntLiteralProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.Optional { public partial class UnionIntLiteralProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - UnionIntLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual UnionIntLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnionIntLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - UnionIntLiteralProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnionIntLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(UnionIntLiteralProperty unionIntLiteralProperty) => throw null; public static explicit operator UnionIntLiteralProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + UnionIntLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual UnionIntLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/UnionStringLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/UnionStringLiteralProperty.Serialization.cs index 92528bcb933..eba2bd1a034 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/UnionStringLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/UnionStringLiteralProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.Optional { public partial class UnionStringLiteralProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - UnionStringLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual UnionStringLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnionStringLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - UnionStringLiteralProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnionStringLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(UnionStringLiteralProperty unionStringLiteralProperty) => throw null; public static explicit operator UnionStringLiteralProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + UnionStringLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual UnionStringLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/OptionalClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/OptionalClient.cs index 6f67bdc1b3a..359640c4a3f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/OptionalClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/OptionalClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; namespace _Type.Property.Optional { @@ -11,7 +12,12 @@ public partial class OptionalClient { public OptionalClient() : this(new Uri("http://localhost:3000"), new OptionalClientOptions()) => throw null; - public OptionalClient(Uri endpoint, OptionalClientOptions options) => throw null; + internal OptionalClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, OptionalClientOptions options) => throw null; + + public OptionalClient(Uri endpoint, OptionalClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public OptionalClient(OptionalClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/OptionalClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/OptionalClientOptions.cs index a9ffaadfe8f..822e91c77df 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/OptionalClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/OptionalClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace _Type.Property.Optional { public partial class OptionalClientOptions : ClientPipelineOptions { + public OptionalClientOptions() => throw null; + + [Experimental("SCME0002")] + internal OptionalClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/OptionalClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/OptionalClientSettings.cs new file mode 100644 index 00000000000..b6de9fdd7d6 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/OptionalClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace _Type.Property.Optional +{ + [Experimental("SCME0002")] + public partial class OptionalClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public OptionalClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/PlainDate.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/PlainDate.cs index 27c9d8c861b..f95ec369404 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/PlainDate.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/PlainDate.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class PlainDate { protected PlainDate() => throw null; + internal PlainDate(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetAll(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/PlainTime.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/PlainTime.cs index 733f618e280..91c30419caf 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/PlainTime.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/PlainTime.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class PlainTime { protected PlainTime() => throw null; + internal PlainTime(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetAll(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/RequiredAndOptional.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/RequiredAndOptional.cs index 94bf40cd0f3..3253e5b109d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/RequiredAndOptional.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/RequiredAndOptional.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class RequiredAndOptional { protected RequiredAndOptional() => throw null; + internal RequiredAndOptional(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetAll(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/String.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/String.cs index 223187bfb1e..def30985883 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/String.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/String.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class String { protected String() => throw null; + internal String(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetAll(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/StringLiteral.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/StringLiteral.cs index d6fca1040c1..a60ba46a07e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/StringLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/StringLiteral.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class StringLiteral { protected StringLiteral() => throw null; + internal StringLiteral(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetAll(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/UnionFloatLiteral.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/UnionFloatLiteral.cs index aa088f014e9..9471446beff 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/UnionFloatLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/UnionFloatLiteral.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class UnionFloatLiteral { protected UnionFloatLiteral() => throw null; + internal UnionFloatLiteral(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetAll(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/UnionIntLiteral.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/UnionIntLiteral.cs index 65a65dc54ce..45324fc4c4d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/UnionIntLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/UnionIntLiteral.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class UnionIntLiteral { protected UnionIntLiteral() => throw null; + internal UnionIntLiteral(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetAll(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/UnionStringLiteral.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/UnionStringLiteral.cs index 1041ae1cf99..4a44db8c460 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/UnionStringLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/UnionStringLiteral.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class UnionStringLiteral { protected UnionStringLiteral() => throw null; + internal UnionStringLiteral(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult GetAll(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..0bc6d6dae33 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "OptionalClient": { + "type": "object", + "description": "Configuration for OptionalClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/optionalClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "optionalClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Type.Property.Optional.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Type.Property.Optional.csproj index 67f8b6664e2..c265b27d2b3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Type.Property.Optional.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Type.Property.Optional.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/tspCodeModel.json index 4b2dec8bbd4..729792586e3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/tspCodeModel.json @@ -2092,7 +2092,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.String.getAll.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.String.getAll.accept", + "methodParameterSegments": [ + { + "$id": "209", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "27" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.String.getAll.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2122,21 +2141,7 @@ }, "parameters": [ { - "$id": "209", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "27" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.String.getAll.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "209" } ], "response": { @@ -2177,7 +2182,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.String.getDefault.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.String.getDefault.accept", + "methodParameterSegments": [ + { + "$id": "213", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "29" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.String.getDefault.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2207,21 +2231,7 @@ }, "parameters": [ { - "$id": "213", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "29" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.String.getDefault.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "213" } ], "response": { @@ -2263,10 +2273,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.String.putAll.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.String.putAll.contentType", + "methodParameterSegments": [ + { + "$id": "217", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "31" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.String.putAll.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "217", + "$id": "218", "kind": "body", "name": "body", "serializedName": "body", @@ -2282,7 +2312,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.String.putAll.body" + "crossLanguageDefinitionId": "Type.Property.Optional.String.putAll.body", + "methodParameterSegments": [ + { + "$id": "219", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "155" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.String.putAll.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2309,39 +2358,10 @@ }, "parameters": [ { - "$id": "218", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "155" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.String.putAll.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "219" }, { - "$id": "219", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "31" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.String.putAll.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "217" } ], "response": {}, @@ -2379,10 +2399,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.String.putDefault.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.String.putDefault.contentType", + "methodParameterSegments": [ + { + "$id": "223", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "33" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.String.putDefault.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "223", + "$id": "224", "kind": "body", "name": "body", "serializedName": "body", @@ -2398,7 +2438,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.String.putDefault.body" + "crossLanguageDefinitionId": "Type.Property.Optional.String.putDefault.body", + "methodParameterSegments": [ + { + "$id": "225", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "155" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.String.putDefault.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2425,39 +2484,10 @@ }, "parameters": [ { - "$id": "224", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "155" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.String.putDefault.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "225" }, { - "$id": "225", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "33" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.String.putDefault.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "223" } ], "response": {}, @@ -2542,7 +2572,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.getAll.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.getAll.accept", + "methodParameterSegments": [ + { + "$id": "233", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "35" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.getAll.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2572,21 +2621,7 @@ }, "parameters": [ { - "$id": "233", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "35" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.getAll.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "233" } ], "response": { @@ -2627,7 +2662,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.getDefault.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.getDefault.accept", + "methodParameterSegments": [ + { + "$id": "237", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "37" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.getDefault.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2657,21 +2711,7 @@ }, "parameters": [ { - "$id": "237", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "37" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.getDefault.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "237" } ], "response": { @@ -2713,10 +2753,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.putAll.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.putAll.contentType", + "methodParameterSegments": [ + { + "$id": "241", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "39" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.putAll.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "241", + "$id": "242", "kind": "body", "name": "body", "serializedName": "body", @@ -2732,7 +2792,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.putAll.body" + "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.putAll.body", + "methodParameterSegments": [ + { + "$id": "243", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "158" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.putAll.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2759,39 +2838,10 @@ }, "parameters": [ { - "$id": "242", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "158" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.putAll.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "243" }, { - "$id": "243", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "39" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.putAll.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "241" } ], "response": {}, @@ -2829,10 +2879,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.putDefault.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.putDefault.contentType", + "methodParameterSegments": [ + { + "$id": "247", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "41" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.putDefault.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "247", + "$id": "248", "kind": "body", "name": "body", "serializedName": "body", @@ -2848,7 +2918,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.putDefault.body" + "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.putDefault.body", + "methodParameterSegments": [ + { + "$id": "249", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "158" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.putDefault.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2875,39 +2964,10 @@ }, "parameters": [ { - "$id": "248", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "158" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.putDefault.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "249" }, { - "$id": "249", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "41" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.Bytes.putDefault.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "247" } ], "response": {}, @@ -2992,7 +3052,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.getAll.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.getAll.accept", + "methodParameterSegments": [ + { + "$id": "257", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "43" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.getAll.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3022,21 +3101,7 @@ }, "parameters": [ { - "$id": "257", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "43" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.getAll.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "257" } ], "response": { @@ -3077,7 +3142,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.getDefault.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.getDefault.accept", + "methodParameterSegments": [ + { + "$id": "261", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "45" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.getDefault.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3107,21 +3191,7 @@ }, "parameters": [ { - "$id": "261", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "45" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.getDefault.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "261" } ], "response": { @@ -3163,10 +3233,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.putAll.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.putAll.contentType", + "methodParameterSegments": [ + { + "$id": "265", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "47" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.putAll.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "265", + "$id": "266", "kind": "body", "name": "body", "serializedName": "body", @@ -3182,7 +3272,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.putAll.body" + "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.putAll.body", + "methodParameterSegments": [ + { + "$id": "267", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "161" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.putAll.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3209,39 +3318,10 @@ }, "parameters": [ { - "$id": "266", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "161" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.putAll.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "267" }, { - "$id": "267", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "47" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.putAll.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "265" } ], "response": {}, @@ -3279,10 +3359,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.putDefault.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.putDefault.contentType", + "methodParameterSegments": [ + { + "$id": "271", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "49" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.putDefault.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "271", + "$id": "272", "kind": "body", "name": "body", "serializedName": "body", @@ -3298,7 +3398,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.putDefault.body" + "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.putDefault.body", + "methodParameterSegments": [ + { + "$id": "273", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "161" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.putDefault.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3325,39 +3444,10 @@ }, "parameters": [ { - "$id": "272", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "161" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.putDefault.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "273" }, { - "$id": "273", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "49" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.Datetime.putDefault.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "271" } ], "response": {}, @@ -3442,7 +3532,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.Duration.getAll.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.Duration.getAll.accept", + "methodParameterSegments": [ + { + "$id": "281", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "51" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.Duration.getAll.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3472,21 +3581,7 @@ }, "parameters": [ { - "$id": "281", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "51" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.Duration.getAll.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "281" } ], "response": { @@ -3527,7 +3622,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.Duration.getDefault.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.Duration.getDefault.accept", + "methodParameterSegments": [ + { + "$id": "285", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "53" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.Duration.getDefault.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3557,21 +3671,7 @@ }, "parameters": [ { - "$id": "285", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "53" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.Duration.getDefault.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "285" } ], "response": { @@ -3613,10 +3713,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.Duration.putAll.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.Duration.putAll.contentType", + "methodParameterSegments": [ + { + "$id": "289", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "55" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.Duration.putAll.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "289", + "$id": "290", "kind": "body", "name": "body", "serializedName": "body", @@ -3632,7 +3752,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.Duration.putAll.body" + "crossLanguageDefinitionId": "Type.Property.Optional.Duration.putAll.body", + "methodParameterSegments": [ + { + "$id": "291", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "165" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.Duration.putAll.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3659,39 +3798,10 @@ }, "parameters": [ { - "$id": "290", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "165" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.Duration.putAll.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "291" }, { - "$id": "291", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "55" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.Duration.putAll.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "289" } ], "response": {}, @@ -3729,10 +3839,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.Duration.putDefault.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.Duration.putDefault.contentType", + "methodParameterSegments": [ + { + "$id": "295", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "57" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.Duration.putDefault.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "295", + "$id": "296", "kind": "body", "name": "body", "serializedName": "body", @@ -3748,7 +3878,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.Duration.putDefault.body" + "crossLanguageDefinitionId": "Type.Property.Optional.Duration.putDefault.body", + "methodParameterSegments": [ + { + "$id": "297", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "165" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.Duration.putDefault.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3775,39 +3924,10 @@ }, "parameters": [ { - "$id": "296", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "165" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.Duration.putDefault.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "297" }, { - "$id": "297", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "57" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.Duration.putDefault.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "295" } ], "response": {}, @@ -3892,7 +4012,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.getAll.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.getAll.accept", + "methodParameterSegments": [ + { + "$id": "305", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "59" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.getAll.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3922,21 +4061,7 @@ }, "parameters": [ { - "$id": "305", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "59" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.getAll.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "305" } ], "response": { @@ -3977,7 +4102,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.getDefault.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.getDefault.accept", + "methodParameterSegments": [ + { + "$id": "309", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "61" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.getDefault.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4007,21 +4151,7 @@ }, "parameters": [ { - "$id": "309", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "61" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.getDefault.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "309" } ], "response": { @@ -4063,10 +4193,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.putAll.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.putAll.contentType", + "methodParameterSegments": [ + { + "$id": "313", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "63" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.putAll.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "313", + "$id": "314", "kind": "body", "name": "body", "serializedName": "body", @@ -4082,7 +4232,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.putAll.body" + "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.putAll.body", + "methodParameterSegments": [ + { + "$id": "315", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "169" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.putAll.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4109,39 +4278,10 @@ }, "parameters": [ { - "$id": "314", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "169" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.putAll.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "315" }, { - "$id": "315", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "63" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.putAll.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "313" } ], "response": {}, @@ -4179,10 +4319,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.putDefault.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.putDefault.contentType", + "methodParameterSegments": [ + { + "$id": "319", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "65" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.putDefault.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "319", + "$id": "320", "kind": "body", "name": "body", "serializedName": "body", @@ -4198,7 +4358,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.putDefault.body" + "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.putDefault.body", + "methodParameterSegments": [ + { + "$id": "321", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "169" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.putDefault.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4225,39 +4404,10 @@ }, "parameters": [ { - "$id": "320", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "169" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.putDefault.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "321" }, { - "$id": "321", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "65" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.PlainDate.putDefault.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "319" } ], "response": {}, @@ -4342,7 +4492,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.getAll.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.getAll.accept", + "methodParameterSegments": [ + { + "$id": "329", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "67" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.getAll.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4372,21 +4541,7 @@ }, "parameters": [ { - "$id": "329", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "67" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.getAll.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "329" } ], "response": { @@ -4427,7 +4582,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.getDefault.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.getDefault.accept", + "methodParameterSegments": [ + { + "$id": "333", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "69" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.getDefault.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4457,21 +4631,7 @@ }, "parameters": [ { - "$id": "333", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "69" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.getDefault.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "333" } ], "response": { @@ -4513,10 +4673,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.putAll.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.putAll.contentType", + "methodParameterSegments": [ + { + "$id": "337", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "71" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.putAll.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "337", + "$id": "338", "kind": "body", "name": "body", "serializedName": "body", @@ -4532,7 +4712,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.putAll.body" + "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.putAll.body", + "methodParameterSegments": [ + { + "$id": "339", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "172" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.putAll.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4559,39 +4758,10 @@ }, "parameters": [ { - "$id": "338", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "172" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.putAll.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "339" }, { - "$id": "339", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "71" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.putAll.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "337" } ], "response": {}, @@ -4629,10 +4799,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.putDefault.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.putDefault.contentType", + "methodParameterSegments": [ + { + "$id": "343", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "73" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.putDefault.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "343", + "$id": "344", "kind": "body", "name": "body", "serializedName": "body", @@ -4648,7 +4838,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.putDefault.body" + "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.putDefault.body", + "methodParameterSegments": [ + { + "$id": "345", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "172" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.putDefault.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4675,39 +4884,10 @@ }, "parameters": [ { - "$id": "344", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "172" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.putDefault.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "345" }, { - "$id": "345", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "73" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.PlainTime.putDefault.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "343" } ], "response": {}, @@ -4792,7 +4972,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.getAll.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.getAll.accept", + "methodParameterSegments": [ + { + "$id": "353", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "75" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.getAll.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4822,21 +5021,7 @@ }, "parameters": [ { - "$id": "353", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "75" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.getAll.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "353" } ], "response": { @@ -4877,7 +5062,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.getDefault.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.getDefault.accept", + "methodParameterSegments": [ + { + "$id": "357", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "77" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.getDefault.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4907,21 +5111,7 @@ }, "parameters": [ { - "$id": "357", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "77" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.getDefault.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "357" } ], "response": { @@ -4963,10 +5153,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.putAll.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.putAll.contentType", + "methodParameterSegments": [ + { + "$id": "361", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "79" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.putAll.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "361", + "$id": "362", "kind": "body", "name": "body", "serializedName": "body", @@ -4982,7 +5192,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.putAll.body" + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.putAll.body", + "methodParameterSegments": [ + { + "$id": "363", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "175" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.putAll.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5009,39 +5238,10 @@ }, "parameters": [ { - "$id": "362", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "175" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.putAll.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "363" }, { - "$id": "363", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "79" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.putAll.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "361" } ], "response": {}, @@ -5079,10 +5279,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.putDefault.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.putDefault.contentType", + "methodParameterSegments": [ + { + "$id": "367", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "81" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.putDefault.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "367", + "$id": "368", "kind": "body", "name": "body", "serializedName": "body", @@ -5098,7 +5318,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.putDefault.body" + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.putDefault.body", + "methodParameterSegments": [ + { + "$id": "369", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "175" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.putDefault.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5125,39 +5364,10 @@ }, "parameters": [ { - "$id": "368", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "175" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.putDefault.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "369" }, { - "$id": "369", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "81" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByte.putDefault.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "367" } ], "response": {}, @@ -5242,7 +5452,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.getAll.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.getAll.accept", + "methodParameterSegments": [ + { + "$id": "377", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "83" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.getAll.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5272,21 +5501,7 @@ }, "parameters": [ { - "$id": "377", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "83" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.getAll.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "377" } ], "response": { @@ -5327,7 +5542,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.getDefault.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.getDefault.accept", + "methodParameterSegments": [ + { + "$id": "381", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "85" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.getDefault.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5357,21 +5591,7 @@ }, "parameters": [ { - "$id": "381", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "85" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.getDefault.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "381" } ], "response": { @@ -5413,10 +5633,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.putAll.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.putAll.contentType", + "methodParameterSegments": [ + { + "$id": "385", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "87" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.putAll.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "385", + "$id": "386", "kind": "body", "name": "body", "serializedName": "body", @@ -5432,7 +5672,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.putAll.body" + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.putAll.body", + "methodParameterSegments": [ + { + "$id": "387", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "179" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.putAll.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5459,39 +5718,10 @@ }, "parameters": [ { - "$id": "386", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "179" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.putAll.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "387" }, { - "$id": "387", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "87" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.putAll.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "385" } ], "response": {}, @@ -5529,10 +5759,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.putDefault.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.putDefault.contentType", + "methodParameterSegments": [ + { + "$id": "391", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "89" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.putDefault.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "391", + "$id": "392", "kind": "body", "name": "body", "serializedName": "body", @@ -5548,7 +5798,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.putDefault.body" + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.putDefault.body", + "methodParameterSegments": [ + { + "$id": "393", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "179" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.putDefault.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5575,39 +5844,10 @@ }, "parameters": [ { - "$id": "392", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "179" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.putDefault.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "393" }, { - "$id": "393", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "89" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModel.putDefault.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "391" } ], "response": {}, @@ -5692,7 +5932,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.getAll.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.getAll.accept", + "methodParameterSegments": [ + { + "$id": "401", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "91" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.getAll.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5722,21 +5981,7 @@ }, "parameters": [ { - "$id": "401", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "91" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.getAll.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "401" } ], "response": { @@ -5777,7 +6022,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.getDefault.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.getDefault.accept", + "methodParameterSegments": [ + { + "$id": "405", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "93" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.getDefault.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5807,21 +6071,7 @@ }, "parameters": [ { - "$id": "405", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "93" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.getDefault.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "405" } ], "response": { @@ -5863,10 +6113,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.putAll.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.putAll.contentType", + "methodParameterSegments": [ + { + "$id": "409", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "95" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.putAll.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "409", + "$id": "410", "kind": "body", "name": "body", "serializedName": "body", @@ -5882,7 +6152,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.putAll.body" + "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.putAll.body", + "methodParameterSegments": [ + { + "$id": "411", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "182" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.putAll.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5909,39 +6198,10 @@ }, "parameters": [ { - "$id": "410", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "182" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.putAll.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "411" }, { - "$id": "411", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "95" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.putAll.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "409" } ], "response": {}, @@ -5979,10 +6239,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.putDefault.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.putDefault.contentType", + "methodParameterSegments": [ + { + "$id": "415", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "97" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.putDefault.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "415", + "$id": "416", "kind": "body", "name": "body", "serializedName": "body", @@ -5998,7 +6278,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.putDefault.body" + "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.putDefault.body", + "methodParameterSegments": [ + { + "$id": "417", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "182" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.putDefault.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6025,39 +6324,10 @@ }, "parameters": [ { - "$id": "416", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "182" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.putDefault.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "417" }, { - "$id": "417", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "97" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteral.putDefault.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "415" } ], "response": {}, @@ -6142,7 +6412,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.getAll.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.getAll.accept", + "methodParameterSegments": [ + { + "$id": "425", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "99" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.getAll.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6172,21 +6461,7 @@ }, "parameters": [ { - "$id": "425", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "99" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.getAll.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "425" } ], "response": { @@ -6227,7 +6502,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.getDefault.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.getDefault.accept", + "methodParameterSegments": [ + { + "$id": "429", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "101" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.getDefault.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6257,21 +6551,7 @@ }, "parameters": [ { - "$id": "429", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "101" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.getDefault.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "429" } ], "response": { @@ -6313,10 +6593,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.putAll.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.putAll.contentType", + "methodParameterSegments": [ + { + "$id": "433", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "103" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.putAll.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "433", + "$id": "434", "kind": "body", "name": "body", "serializedName": "body", @@ -6332,7 +6632,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.putAll.body" + "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.putAll.body", + "methodParameterSegments": [ + { + "$id": "435", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "184" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.putAll.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6359,39 +6678,10 @@ }, "parameters": [ { - "$id": "434", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "184" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.putAll.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "435" }, { - "$id": "435", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "103" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.putAll.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "433" } ], "response": {}, @@ -6429,10 +6719,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.putDefault.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.putDefault.contentType", + "methodParameterSegments": [ + { + "$id": "439", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "105" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.putDefault.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "439", + "$id": "440", "kind": "body", "name": "body", "serializedName": "body", @@ -6448,7 +6758,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.putDefault.body" + "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.putDefault.body", + "methodParameterSegments": [ + { + "$id": "441", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "184" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.putDefault.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6475,39 +6804,10 @@ }, "parameters": [ { - "$id": "440", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "184" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.putDefault.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "441" }, { - "$id": "441", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "105" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteral.putDefault.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "439" } ], "response": {}, @@ -6592,7 +6892,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.getAll.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.getAll.accept", + "methodParameterSegments": [ + { + "$id": "449", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "107" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.getAll.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6622,21 +6941,7 @@ }, "parameters": [ { - "$id": "449", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "107" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.getAll.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "449" } ], "response": { @@ -6677,7 +6982,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.getDefault.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.getDefault.accept", + "methodParameterSegments": [ + { + "$id": "453", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "109" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.getDefault.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6707,21 +7031,7 @@ }, "parameters": [ { - "$id": "453", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "109" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.getDefault.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "453" } ], "response": { @@ -6763,10 +7073,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.putAll.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.putAll.contentType", + "methodParameterSegments": [ + { + "$id": "457", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "111" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.putAll.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "457", + "$id": "458", "kind": "body", "name": "body", "serializedName": "body", @@ -6782,7 +7112,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.putAll.body" + "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.putAll.body", + "methodParameterSegments": [ + { + "$id": "459", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "186" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.putAll.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6809,39 +7158,10 @@ }, "parameters": [ { - "$id": "458", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "186" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.putAll.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "459" }, { - "$id": "459", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "111" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.putAll.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "457" } ], "response": {}, @@ -6879,10 +7199,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.putDefault.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.putDefault.contentType", + "methodParameterSegments": [ + { + "$id": "463", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "113" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.putDefault.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "463", + "$id": "464", "kind": "body", "name": "body", "serializedName": "body", @@ -6898,7 +7238,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.putDefault.body" + "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.putDefault.body", + "methodParameterSegments": [ + { + "$id": "465", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "186" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.putDefault.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6925,39 +7284,10 @@ }, "parameters": [ { - "$id": "464", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "186" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.putDefault.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "465" }, { - "$id": "465", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "113" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteral.putDefault.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "463" } ], "response": {}, @@ -7042,7 +7372,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.getAll.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.getAll.accept", + "methodParameterSegments": [ + { + "$id": "473", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "115" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.getAll.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7072,21 +7421,7 @@ }, "parameters": [ { - "$id": "473", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "115" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.getAll.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "473" } ], "response": { @@ -7127,7 +7462,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.getDefault.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.getDefault.accept", + "methodParameterSegments": [ + { + "$id": "477", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "117" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.getDefault.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7157,21 +7511,7 @@ }, "parameters": [ { - "$id": "477", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "117" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.getDefault.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "477" } ], "response": { @@ -7213,10 +7553,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.putAll.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.putAll.contentType", + "methodParameterSegments": [ + { + "$id": "481", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "119" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.putAll.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "481", + "$id": "482", "kind": "body", "name": "body", "serializedName": "body", @@ -7232,7 +7592,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.putAll.body" + "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.putAll.body", + "methodParameterSegments": [ + { + "$id": "483", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "188" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.putAll.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7259,39 +7638,10 @@ }, "parameters": [ { - "$id": "482", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "188" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.putAll.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "483" }, { - "$id": "483", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "119" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.putAll.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "481" } ], "response": {}, @@ -7329,10 +7679,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.putDefault.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.putDefault.contentType", + "methodParameterSegments": [ + { + "$id": "487", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "121" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.putDefault.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "487", + "$id": "488", "kind": "body", "name": "body", "serializedName": "body", @@ -7348,7 +7718,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.putDefault.body" + "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.putDefault.body", + "methodParameterSegments": [ + { + "$id": "489", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "188" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.putDefault.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7375,39 +7764,10 @@ }, "parameters": [ { - "$id": "488", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "188" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.putDefault.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "489" }, { - "$id": "489", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "121" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteral.putDefault.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "487" } ], "response": {}, @@ -7492,7 +7852,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.getAll.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.getAll.accept", + "methodParameterSegments": [ + { + "$id": "497", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "123" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.getAll.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7522,21 +7901,7 @@ }, "parameters": [ { - "$id": "497", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "123" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.getAll.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "497" } ], "response": { @@ -7577,7 +7942,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.getDefault.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.getDefault.accept", + "methodParameterSegments": [ + { + "$id": "501", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "125" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.getDefault.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7607,21 +7991,7 @@ }, "parameters": [ { - "$id": "501", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "125" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.getDefault.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "501" } ], "response": { @@ -7663,10 +8033,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.putAll.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.putAll.contentType", + "methodParameterSegments": [ + { + "$id": "505", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "127" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.putAll.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "505", + "$id": "506", "kind": "body", "name": "body", "serializedName": "body", @@ -7682,7 +8072,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.putAll.body" + "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.putAll.body", + "methodParameterSegments": [ + { + "$id": "507", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "190" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.putAll.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7709,39 +8118,10 @@ }, "parameters": [ { - "$id": "506", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "190" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.putAll.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "507" }, { - "$id": "507", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "127" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.putAll.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "505" } ], "response": {}, @@ -7779,10 +8159,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.putDefault.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.putDefault.contentType", + "methodParameterSegments": [ + { + "$id": "511", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "129" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.putDefault.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "511", + "$id": "512", "kind": "body", "name": "body", "serializedName": "body", @@ -7798,7 +8198,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.putDefault.body" + "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.putDefault.body", + "methodParameterSegments": [ + { + "$id": "513", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "190" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.putDefault.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7825,39 +8244,10 @@ }, "parameters": [ { - "$id": "512", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "190" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.putDefault.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "513" }, { - "$id": "513", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "129" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteral.putDefault.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "511" } ], "response": {}, @@ -7942,7 +8332,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.getAll.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.getAll.accept", + "methodParameterSegments": [ + { + "$id": "521", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "131" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.getAll.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7972,21 +8381,7 @@ }, "parameters": [ { - "$id": "521", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "131" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.getAll.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "521" } ], "response": { @@ -8027,7 +8422,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.getDefault.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.getDefault.accept", + "methodParameterSegments": [ + { + "$id": "525", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "133" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.getDefault.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8057,21 +8471,7 @@ }, "parameters": [ { - "$id": "525", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "133" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.getDefault.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "525" } ], "response": { @@ -8113,10 +8513,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.putAll.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.putAll.contentType", + "methodParameterSegments": [ + { + "$id": "529", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "135" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.putAll.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "529", + "$id": "530", "kind": "body", "name": "body", "serializedName": "body", @@ -8132,7 +8552,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.putAll.body" + "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.putAll.body", + "methodParameterSegments": [ + { + "$id": "531", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "192" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.putAll.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8159,39 +8598,10 @@ }, "parameters": [ { - "$id": "530", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "192" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.putAll.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "531" }, { - "$id": "531", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "135" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.putAll.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "529" } ], "response": {}, @@ -8229,10 +8639,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.putDefault.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.putDefault.contentType", + "methodParameterSegments": [ + { + "$id": "535", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "137" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.putDefault.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "535", + "$id": "536", "kind": "body", "name": "body", "serializedName": "body", @@ -8248,7 +8678,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.putDefault.body" + "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.putDefault.body", + "methodParameterSegments": [ + { + "$id": "537", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "192" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.putDefault.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8275,39 +8724,10 @@ }, "parameters": [ { - "$id": "536", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "192" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.putDefault.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "537" }, { - "$id": "537", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "137" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteral.putDefault.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "535" } ], "response": {}, @@ -8392,7 +8812,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.getAll.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.getAll.accept", + "methodParameterSegments": [ + { + "$id": "545", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "139" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.getAll.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8422,21 +8861,7 @@ }, "parameters": [ { - "$id": "545", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "139" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.getAll.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "545" } ], "response": { @@ -8477,7 +8902,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.getDefault.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.getDefault.accept", + "methodParameterSegments": [ + { + "$id": "549", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "141" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.getDefault.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8507,21 +8951,7 @@ }, "parameters": [ { - "$id": "549", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "141" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.getDefault.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "549" } ], "response": { @@ -8563,10 +8993,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.putAll.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.putAll.contentType", + "methodParameterSegments": [ + { + "$id": "553", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "143" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.putAll.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "553", + "$id": "554", "kind": "body", "name": "body", "serializedName": "body", @@ -8582,7 +9032,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.putAll.body" + "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.putAll.body", + "methodParameterSegments": [ + { + "$id": "555", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "194" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.putAll.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8609,39 +9078,10 @@ }, "parameters": [ { - "$id": "554", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "194" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.putAll.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "555" }, { - "$id": "555", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "143" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.putAll.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "553" } ], "response": {}, @@ -8679,10 +9119,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.putDefault.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.putDefault.contentType", + "methodParameterSegments": [ + { + "$id": "559", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "145" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.putDefault.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "559", + "$id": "560", "kind": "body", "name": "body", "serializedName": "body", @@ -8698,7 +9158,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.putDefault.body" + "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.putDefault.body", + "methodParameterSegments": [ + { + "$id": "561", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "194" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.putDefault.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8725,39 +9204,10 @@ }, "parameters": [ { - "$id": "560", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "194" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.putDefault.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "561" }, { - "$id": "561", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "145" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteral.putDefault.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "559" } ], "response": {}, @@ -8843,7 +9293,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.getAll.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.getAll.accept", + "methodParameterSegments": [ + { + "$id": "569", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "147" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.getAll.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8873,21 +9342,7 @@ }, "parameters": [ { - "$id": "569", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "147" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.getAll.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "569" } ], "response": { @@ -8928,7 +9383,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.getRequiredOnly.accept" + "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.getRequiredOnly.accept", + "methodParameterSegments": [ + { + "$id": "573", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "149" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.getRequiredOnly.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8958,21 +9432,7 @@ }, "parameters": [ { - "$id": "573", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "149" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.getRequiredOnly.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "573" } ], "response": { @@ -9014,10 +9474,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.putAll.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.putAll.contentType", + "methodParameterSegments": [ + { + "$id": "577", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "151" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.putAll.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "577", + "$id": "578", "kind": "body", "name": "body", "serializedName": "body", @@ -9033,7 +9513,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.putAll.body" + "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.putAll.body", + "methodParameterSegments": [ + { + "$id": "579", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "196" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.putAll.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9060,39 +9559,10 @@ }, "parameters": [ { - "$id": "578", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "196" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.putAll.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "579" }, { - "$id": "579", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "151" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.putAll.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "577" } ], "response": {}, @@ -9130,10 +9600,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.putRequiredOnly.contentType" + "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.putRequiredOnly.contentType", + "methodParameterSegments": [ + { + "$id": "583", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "153" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.putRequiredOnly.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "583", + "$id": "584", "kind": "body", "name": "body", "serializedName": "body", @@ -9149,7 +9639,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.putRequiredOnly.body" + "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.putRequiredOnly.body", + "methodParameterSegments": [ + { + "$id": "585", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "196" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.putRequiredOnly.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9176,39 +9685,10 @@ }, "parameters": [ { - "$id": "584", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "196" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.putRequiredOnly.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "585" }, { - "$id": "585", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "153" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptional.putRequiredOnly.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "583" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/Type.Property.ValueTypes.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/Type.Property.ValueTypes.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/Type.Property.ValueTypes.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/Type.Property.ValueTypes.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/Type.Property.ValueTypes.sln deleted file mode 100644 index f87a00fca3f..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/Type.Property.ValueTypes.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Property.ValueTypes", "src\Type.Property.ValueTypes.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/Type.Property.ValueTypes.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/Type.Property.ValueTypes.slnx new file mode 100644 index 00000000000..7dbff4fb3b1 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/Type.Property.ValueTypes.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Boolean.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Boolean.cs index 3f6b9d2df7c..f4e93d97aa5 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Boolean.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Boolean.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Boolean { protected Boolean() => throw null; + internal Boolean(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/BooleanLiteral.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/BooleanLiteral.cs index 679f7a738e3..e2bdc72c983 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/BooleanLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/BooleanLiteral.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class BooleanLiteral { protected BooleanLiteral() => throw null; + internal BooleanLiteral(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Bytes.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Bytes.cs index b0a807a9c6d..428e3397974 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Bytes.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Bytes.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Bytes { protected Bytes() => throw null; + internal Bytes(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/CollectionsInt.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/CollectionsInt.cs index 3e6cc227cf5..f49bb79df44 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/CollectionsInt.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/CollectionsInt.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class CollectionsInt { protected CollectionsInt() => throw null; + internal CollectionsInt(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/CollectionsModel.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/CollectionsModel.cs index 2a9ffb958a8..e40359c230c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/CollectionsModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/CollectionsModel.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class CollectionsModel { protected CollectionsModel() => throw null; + internal CollectionsModel(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/CollectionsString.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/CollectionsString.cs index c1dd5d23c45..18a7083e450 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/CollectionsString.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/CollectionsString.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class CollectionsString { protected CollectionsString() => throw null; + internal CollectionsString(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Datetime.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Datetime.cs index b8f6983712b..9b6385a11da 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Datetime.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Datetime.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Datetime { protected Datetime() => throw null; + internal Datetime(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Decimal.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Decimal.cs index cfc5fa3fc48..90ac68ab77b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Decimal.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Decimal.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Decimal { protected Decimal() => throw null; + internal Decimal(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Decimal128.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Decimal128.cs index 553501b9bdd..06b87e33722 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Decimal128.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Decimal128.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Decimal128 { protected Decimal128() => throw null; + internal Decimal128(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/DictionaryString.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/DictionaryString.cs index 0da288b589b..d1d5dc8e06e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/DictionaryString.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/DictionaryString.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class DictionaryString { protected DictionaryString() => throw null; + internal DictionaryString(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Duration.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Duration.cs index fb81d1ff2de..304ea7ce05e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Duration.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Duration.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Duration { protected Duration() => throw null; + internal Duration(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Enum.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Enum.cs index 082585a6b1b..6ee002b6a38 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Enum.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Enum.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Enum { protected Enum() => throw null; + internal Enum(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/ExtensibleEnum.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/ExtensibleEnum.cs index 1d39d6232b2..05e0b19b4c5 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/ExtensibleEnum.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/ExtensibleEnum.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class ExtensibleEnum { protected ExtensibleEnum() => throw null; + internal ExtensibleEnum(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Float.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Float.cs index 89917bd0d67..31ca39d2378 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Float.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Float.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Float { protected Float() => throw null; + internal Float(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/FloatLiteral.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/FloatLiteral.cs index 89f86508d9d..272147c3f79 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/FloatLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/FloatLiteral.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class FloatLiteral { protected FloatLiteral() => throw null; + internal FloatLiteral(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Int.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Int.cs index e4e359014ea..42d5cab9109 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Int.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Int.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Int { protected Int() => throw null; + internal Int(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/IntLiteral.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/IntLiteral.cs index 75851545805..1504957189f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/IntLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/IntLiteral.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class IntLiteral { protected IntLiteral() => throw null; + internal IntLiteral(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Model.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Model.cs index 83467e85608..1c306e46d07 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Model.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Model.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Model { protected Model() => throw null; + internal Model(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/BooleanLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/BooleanLiteralProperty.Serialization.cs index 4f3a5e7c639..be89b9110e2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/BooleanLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/BooleanLiteralProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.ValueTypes { public partial class BooleanLiteralProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - BooleanLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BooleanLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual BooleanLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - BooleanLiteralProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual BooleanLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(BooleanLiteralProperty booleanLiteralProperty) => throw null; public static explicit operator BooleanLiteralProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + BooleanLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual BooleanLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/BooleanProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/BooleanProperty.Serialization.cs index 1c6c7152eae..5c96128b102 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/BooleanProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/BooleanProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class BooleanProperty : IJsonModel { internal BooleanProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - BooleanProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BooleanProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual BooleanProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - BooleanProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual BooleanProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(BooleanProperty booleanProperty) => throw null; public static explicit operator BooleanProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + BooleanProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual BooleanProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/BytesProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/BytesProperty.Serialization.cs index bf47b824ac1..4fe44f5871e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/BytesProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/BytesProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class BytesProperty : IJsonModel { internal BytesProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - BytesProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BytesProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual BytesProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - BytesProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual BytesProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(BytesProperty bytesProperty) => throw null; public static explicit operator BytesProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + BytesProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual BytesProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/CollectionsIntProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/CollectionsIntProperty.Serialization.cs index fdd2cbb61cc..9085fd8fee1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/CollectionsIntProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/CollectionsIntProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class CollectionsIntProperty : IJsonModel { internal CollectionsIntProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - CollectionsIntProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual CollectionsIntProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual CollectionsIntProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - CollectionsIntProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual CollectionsIntProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(CollectionsIntProperty collectionsIntProperty) => throw null; public static explicit operator CollectionsIntProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + CollectionsIntProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual CollectionsIntProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/CollectionsModelProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/CollectionsModelProperty.Serialization.cs index 02fe1ce5969..1a9b84e752b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/CollectionsModelProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/CollectionsModelProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class CollectionsModelProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - CollectionsModelProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual CollectionsModelProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual CollectionsModelProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - CollectionsModelProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual CollectionsModelProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(CollectionsModelProperty collectionsModelProperty) => throw null; public static explicit operator CollectionsModelProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + CollectionsModelProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual CollectionsModelProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/CollectionsStringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/CollectionsStringProperty.Serialization.cs index 7ca64592fc4..ab7c5909aff 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/CollectionsStringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/CollectionsStringProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class CollectionsStringProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - CollectionsStringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual CollectionsStringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual CollectionsStringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - CollectionsStringProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual CollectionsStringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(CollectionsStringProperty collectionsStringProperty) => throw null; public static explicit operator CollectionsStringProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + CollectionsStringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual CollectionsStringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/DatetimeProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/DatetimeProperty.Serialization.cs index d8f4aff7899..3d49ba191f9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/DatetimeProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/DatetimeProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class DatetimeProperty : IJsonModel { internal DatetimeProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DatetimeProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual DatetimeProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DatetimeProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DatetimeProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DatetimeProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(DatetimeProperty datetimeProperty) => throw null; public static explicit operator DatetimeProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DatetimeProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual DatetimeProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/Decimal128Property.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/Decimal128Property.Serialization.cs index d8c2c19cddb..25c7a38d333 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/Decimal128Property.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/Decimal128Property.Serialization.cs @@ -13,26 +13,26 @@ public partial class Decimal128Property : IJsonModel { internal Decimal128Property() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Decimal128Property IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual Decimal128Property PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Decimal128Property JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Decimal128Property IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual Decimal128Property PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(Decimal128Property decimal128Property) => throw null; public static explicit operator Decimal128Property(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + Decimal128Property IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual Decimal128Property JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/DecimalProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/DecimalProperty.Serialization.cs index 40671b3eb79..29b0e12869f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/DecimalProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/DecimalProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class DecimalProperty : IJsonModel { internal DecimalProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DecimalProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual DecimalProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DecimalProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DecimalProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DecimalProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(DecimalProperty decimalProperty) => throw null; public static explicit operator DecimalProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DecimalProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual DecimalProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/DictionaryStringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/DictionaryStringProperty.Serialization.cs index abfcd0244ae..af4b258b909 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/DictionaryStringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/DictionaryStringProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class DictionaryStringProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DictionaryStringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual DictionaryStringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DictionaryStringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DictionaryStringProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DictionaryStringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(DictionaryStringProperty dictionaryStringProperty) => throw null; public static explicit operator DictionaryStringProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DictionaryStringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual DictionaryStringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/DurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/DurationProperty.Serialization.cs index eabf5d87702..85e47df2a7c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/DurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/DurationProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class DurationProperty : IJsonModel { internal DurationProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - DurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual DurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - DurationProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual DurationProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(DurationProperty durationProperty) => throw null; public static explicit operator DurationProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + DurationProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual DurationProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/EnumProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/EnumProperty.Serialization.cs index ef4e7869af9..1b53d1f9614 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/EnumProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/EnumProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class EnumProperty : IJsonModel { internal EnumProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - EnumProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual EnumProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual EnumProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - EnumProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual EnumProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(EnumProperty enumProperty) => throw null; public static explicit operator EnumProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + EnumProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual EnumProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/ExtensibleEnumProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/ExtensibleEnumProperty.Serialization.cs index 6baf23e4d46..f7102aa1b02 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/ExtensibleEnumProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/ExtensibleEnumProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class ExtensibleEnumProperty : IJsonModel { internal ExtensibleEnumProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ExtensibleEnumProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ExtensibleEnumProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ExtensibleEnumProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ExtensibleEnumProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ExtensibleEnumProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ExtensibleEnumProperty extensibleEnumProperty) => throw null; public static explicit operator ExtensibleEnumProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ExtensibleEnumProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ExtensibleEnumProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/FloatLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/FloatLiteralProperty.Serialization.cs index e0b386903a8..734a8ccd6d4 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/FloatLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/FloatLiteralProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.ValueTypes { public partial class FloatLiteralProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - FloatLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual FloatLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual FloatLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - FloatLiteralProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual FloatLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(FloatLiteralProperty floatLiteralProperty) => throw null; public static explicit operator FloatLiteralProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + FloatLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual FloatLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/FloatProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/FloatProperty.Serialization.cs index 0ac97ba2203..dd56a166264 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/FloatProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/FloatProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class FloatProperty : IJsonModel { internal FloatProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - FloatProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual FloatProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual FloatProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - FloatProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual FloatProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(FloatProperty floatProperty) => throw null; public static explicit operator FloatProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + FloatProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual FloatProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/InnerModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/InnerModel.Serialization.cs index 3aa3579541f..e3c2e9f9a28 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/InnerModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/InnerModel.Serialization.cs @@ -12,22 +12,22 @@ public partial class InnerModel : IJsonModel { internal InnerModel() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual InnerModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - InnerModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual InnerModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + InnerModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - InnerModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual InnerModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + InnerModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual InnerModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/IntLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/IntLiteralProperty.Serialization.cs index d43ff85edbb..2fcac4c554b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/IntLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/IntLiteralProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.ValueTypes { public partial class IntLiteralProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - IntLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual IntLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual IntLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - IntLiteralProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual IntLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(IntLiteralProperty intLiteralProperty) => throw null; public static explicit operator IntLiteralProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + IntLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual IntLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/IntProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/IntProperty.Serialization.cs index 70d609a4efb..f0308fc363c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/IntProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/IntProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class IntProperty : IJsonModel { internal IntProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - IntProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual IntProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual IntProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - IntProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual IntProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(IntProperty intProperty) => throw null; public static explicit operator IntProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + IntProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual IntProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/ModelProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/ModelProperty.Serialization.cs index c82c471f710..cd013fccb91 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/ModelProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/ModelProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class ModelProperty : IJsonModel { internal ModelProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ModelProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ModelProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ModelProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ModelProperty modelProperty) => throw null; public static explicit operator ModelProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ModelProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ModelProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/NeverProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/NeverProperty.Serialization.cs index 652ae9a8eec..8ed2760ba4e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/NeverProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/NeverProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.ValueTypes { public partial class NeverProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - NeverProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual NeverProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual NeverProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - NeverProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual NeverProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(NeverProperty neverProperty) => throw null; public static explicit operator NeverProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + NeverProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual NeverProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/StringLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/StringLiteralProperty.Serialization.cs index cf7e5b50bc7..a215b8d3d40 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/StringLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/StringLiteralProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.ValueTypes { public partial class StringLiteralProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - StringLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual StringLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual StringLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - StringLiteralProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual StringLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(StringLiteralProperty stringLiteralProperty) => throw null; public static explicit operator StringLiteralProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + StringLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual StringLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/StringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/StringProperty.Serialization.cs index 71cc339fef3..e35f0ffd9c1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/StringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/StringProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class StringProperty : IJsonModel { internal StringProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - StringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual StringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual StringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - StringProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual StringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(StringProperty stringProperty) => throw null; public static explicit operator StringProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + StringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual StringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnionEnumValueProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnionEnumValueProperty.Serialization.cs index 74328d17d32..41d03fe2336 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnionEnumValueProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnionEnumValueProperty.Serialization.cs @@ -11,26 +11,26 @@ namespace _Type.Property.ValueTypes { public partial class UnionEnumValueProperty : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - UnionEnumValueProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual UnionEnumValueProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnionEnumValueProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - UnionEnumValueProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnionEnumValueProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(UnionEnumValueProperty unionEnumValueProperty) => throw null; public static explicit operator UnionEnumValueProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + UnionEnumValueProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual UnionEnumValueProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnionFloatLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnionFloatLiteralProperty.Serialization.cs index 55374ac6d0b..ea177be2fe5 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnionFloatLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnionFloatLiteralProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class UnionFloatLiteralProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - UnionFloatLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual UnionFloatLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnionFloatLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - UnionFloatLiteralProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnionFloatLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(UnionFloatLiteralProperty unionFloatLiteralProperty) => throw null; public static explicit operator UnionFloatLiteralProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + UnionFloatLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual UnionFloatLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnionIntLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnionIntLiteralProperty.Serialization.cs index 0f7fcede169..f95f7045adc 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnionIntLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnionIntLiteralProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class UnionIntLiteralProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - UnionIntLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual UnionIntLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnionIntLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - UnionIntLiteralProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnionIntLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(UnionIntLiteralProperty unionIntLiteralProperty) => throw null; public static explicit operator UnionIntLiteralProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + UnionIntLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual UnionIntLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnionStringLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnionStringLiteralProperty.Serialization.cs index d59653b84e9..adf1b29643a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnionStringLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnionStringLiteralProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class UnionStringLiteralProperty : IJsonModel throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - UnionStringLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual UnionStringLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnionStringLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - UnionStringLiteralProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnionStringLiteralProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(UnionStringLiteralProperty unionStringLiteralProperty) => throw null; public static explicit operator UnionStringLiteralProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + UnionStringLiteralProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual UnionStringLiteralProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnknownArrayProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnknownArrayProperty.Serialization.cs index 1656b612297..6916a1ac9ea 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnknownArrayProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnknownArrayProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class UnknownArrayProperty : IJsonModel { internal UnknownArrayProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - UnknownArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual UnknownArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnknownArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - UnknownArrayProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnknownArrayProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(UnknownArrayProperty unknownArrayProperty) => throw null; public static explicit operator UnknownArrayProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + UnknownArrayProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual UnknownArrayProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnknownDictProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnknownDictProperty.Serialization.cs index 79c238dc366..b37453c1ad0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnknownDictProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnknownDictProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class UnknownDictProperty : IJsonModel { internal UnknownDictProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - UnknownDictProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual UnknownDictProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnknownDictProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - UnknownDictProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnknownDictProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(UnknownDictProperty unknownDictProperty) => throw null; public static explicit operator UnknownDictProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + UnknownDictProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual UnknownDictProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnknownIntProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnknownIntProperty.Serialization.cs index 68efa52c0c3..1793a8c2915 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnknownIntProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnknownIntProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class UnknownIntProperty : IJsonModel { internal UnknownIntProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - UnknownIntProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual UnknownIntProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnknownIntProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - UnknownIntProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnknownIntProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(UnknownIntProperty unknownIntProperty) => throw null; public static explicit operator UnknownIntProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + UnknownIntProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual UnknownIntProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnknownStringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnknownStringProperty.Serialization.cs index 65f6e34af2f..21457fe5794 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnknownStringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/UnknownStringProperty.Serialization.cs @@ -13,26 +13,26 @@ public partial class UnknownStringProperty : IJsonModel { internal UnknownStringProperty() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - UnknownStringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual UnknownStringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnknownStringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - UnknownStringProperty IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual UnknownStringProperty PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(UnknownStringProperty unknownStringProperty) => throw null; public static explicit operator UnknownStringProperty(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + UnknownStringProperty IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual UnknownStringProperty JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Never.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Never.cs index 92ff671d14a..8e08e0fa31e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Never.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Never.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Never { protected Never() => throw null; + internal Never(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/String.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/String.cs index 750373bbcfc..c49f8856b95 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/String.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/String.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class String { protected String() => throw null; + internal String(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/StringLiteral.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/StringLiteral.cs index d02b76d3dd6..4e4108e032f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/StringLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/StringLiteral.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class StringLiteral { protected StringLiteral() => throw null; + internal StringLiteral(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnionEnumValue.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnionEnumValue.cs index 69962b5cd3f..bc5592782ce 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnionEnumValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnionEnumValue.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class UnionEnumValue { protected UnionEnumValue() => throw null; + internal UnionEnumValue(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnionFloatLiteral.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnionFloatLiteral.cs index 620ccef7d9d..b722ec14e86 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnionFloatLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnionFloatLiteral.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class UnionFloatLiteral { protected UnionFloatLiteral() => throw null; + internal UnionFloatLiteral(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnionIntLiteral.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnionIntLiteral.cs index 64b2d1651f8..32e42a85f40 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnionIntLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnionIntLiteral.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class UnionIntLiteral { protected UnionIntLiteral() => throw null; + internal UnionIntLiteral(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnionStringLiteral.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnionStringLiteral.cs index 8dbaa7dec43..fde1c748c4d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnionStringLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnionStringLiteral.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class UnionStringLiteral { protected UnionStringLiteral() => throw null; + internal UnionStringLiteral(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnknownArray.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnknownArray.cs index b8e85f2c700..f40c76b820a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnknownArray.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnknownArray.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class UnknownArray { protected UnknownArray() => throw null; + internal UnknownArray(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnknownDict.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnknownDict.cs index 6c050d94eff..81fdff22645 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnknownDict.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnknownDict.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class UnknownDict { protected UnknownDict() => throw null; + internal UnknownDict(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnknownInt.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnknownInt.cs index 222c28277e7..fb2f59c1cc5 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnknownInt.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnknownInt.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class UnknownInt { protected UnknownInt() => throw null; + internal UnknownInt(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnknownString.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnknownString.cs index 2af9c5e7276..bb587ae7036 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnknownString.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/UnknownString.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class UnknownString { protected UnknownString() => throw null; + internal UnknownString(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/ValueTypesClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/ValueTypesClient.cs index 2d928c3bb26..f0d9d59fb35 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/ValueTypesClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/ValueTypesClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; namespace _Type.Property.ValueTypes { @@ -11,7 +12,12 @@ public partial class ValueTypesClient { public ValueTypesClient() : this(new Uri("http://localhost:3000"), new ValueTypesClientOptions()) => throw null; - public ValueTypesClient(Uri endpoint, ValueTypesClientOptions options) => throw null; + internal ValueTypesClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, ValueTypesClientOptions options) => throw null; + + public ValueTypesClient(Uri endpoint, ValueTypesClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public ValueTypesClient(ValueTypesClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/ValueTypesClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/ValueTypesClientOptions.cs index ecfa4e24e2a..2a908e1bd20 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/ValueTypesClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/ValueTypesClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace _Type.Property.ValueTypes { public partial class ValueTypesClientOptions : ClientPipelineOptions { + public ValueTypesClientOptions() => throw null; + + [Experimental("SCME0002")] + internal ValueTypesClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/ValueTypesClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/ValueTypesClientSettings.cs new file mode 100644 index 00000000000..804ef7bdb0c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/ValueTypesClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace _Type.Property.ValueTypes +{ + [Experimental("SCME0002")] + public partial class ValueTypesClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public ValueTypesClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..ac2ba5078ef --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "ValueTypesClient": { + "type": "object", + "description": "Configuration for ValueTypesClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/valueTypesClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "valueTypesClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Type.Property.ValueTypes.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Type.Property.ValueTypes.csproj index baf7b168641..bf34932ff9e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Type.Property.ValueTypes.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Type.Property.ValueTypes.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/tspCodeModel.json index ee363bfbb50..f7b9b580f4d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/tspCodeModel.json @@ -2549,7 +2549,8 @@ }, "enumType": { "$ref": "232" - } + }, + "crossLanguageDefinitionId": "Type.Property.ValueTypes.ExtendedEnum.EnumValue2" } ], "isFixed": false, @@ -2658,7 +2659,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Boolean.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Boolean.get.accept", + "methodParameterSegments": [ + { + "$id": "243", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "32" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Boolean.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2688,21 +2708,7 @@ }, "parameters": [ { - "$id": "243", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "32" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Boolean.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "243" } ], "response": { @@ -2744,10 +2750,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Boolean.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Boolean.put.contentType", + "methodParameterSegments": [ + { + "$id": "247", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "34" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Boolean.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "247", + "$id": "248", "kind": "body", "name": "body", "serializedName": "body", @@ -2764,7 +2790,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Boolean.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Boolean.put.body", + "methodParameterSegments": [ + { + "$id": "249", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "148" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Boolean.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2791,40 +2837,10 @@ }, "parameters": [ { - "$id": "248", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "148" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Boolean.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "249" }, { - "$id": "249", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "34" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Boolean.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "247" } ], "response": {}, @@ -2909,7 +2925,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.String.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.String.get.accept", + "methodParameterSegments": [ + { + "$id": "257", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "36" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.String.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2939,21 +2974,7 @@ }, "parameters": [ { - "$id": "257", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "36" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.String.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "257" } ], "response": { @@ -2995,10 +3016,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.String.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.String.put.contentType", + "methodParameterSegments": [ + { + "$id": "261", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "38" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.String.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "261", + "$id": "262", "kind": "body", "name": "body", "serializedName": "body", @@ -3015,7 +3056,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.String.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.String.put.body", + "methodParameterSegments": [ + { + "$id": "263", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "151" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.String.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3042,40 +3103,10 @@ }, "parameters": [ { - "$id": "262", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "151" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.String.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "263" }, { - "$id": "263", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "38" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.String.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "261" } ], "response": {}, @@ -3160,7 +3191,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Bytes.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Bytes.get.accept", + "methodParameterSegments": [ + { + "$id": "271", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "40" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Bytes.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3190,21 +3240,7 @@ }, "parameters": [ { - "$id": "271", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "40" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Bytes.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "271" } ], "response": { @@ -3246,10 +3282,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Bytes.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Bytes.put.contentType", + "methodParameterSegments": [ + { + "$id": "275", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "42" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Bytes.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "275", + "$id": "276", "kind": "body", "name": "body", "serializedName": "body", @@ -3266,7 +3322,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Bytes.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Bytes.put.body", + "methodParameterSegments": [ + { + "$id": "277", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "154" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Bytes.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3293,40 +3369,10 @@ }, "parameters": [ { - "$id": "276", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "154" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Bytes.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "277" }, { - "$id": "277", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "42" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Bytes.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "275" } ], "response": {}, @@ -3411,7 +3457,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Int.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Int.get.accept", + "methodParameterSegments": [ + { + "$id": "285", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "44" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Int.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3441,21 +3506,7 @@ }, "parameters": [ { - "$id": "285", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "44" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Int.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "285" } ], "response": { @@ -3497,10 +3548,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Int.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Int.put.contentType", + "methodParameterSegments": [ + { + "$id": "289", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "46" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Int.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "289", + "$id": "290", "kind": "body", "name": "body", "serializedName": "body", @@ -3517,7 +3588,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Int.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Int.put.body", + "methodParameterSegments": [ + { + "$id": "291", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "157" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Int.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3544,40 +3635,10 @@ }, "parameters": [ { - "$id": "290", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "157" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Int.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "291" }, { - "$id": "291", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "46" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Int.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "289" } ], "response": {}, @@ -3662,7 +3723,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Float.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Float.get.accept", + "methodParameterSegments": [ + { + "$id": "299", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "48" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Float.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3692,21 +3772,7 @@ }, "parameters": [ { - "$id": "299", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "48" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Float.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "299" } ], "response": { @@ -3748,10 +3814,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Float.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Float.put.contentType", + "methodParameterSegments": [ + { + "$id": "303", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "50" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Float.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "303", + "$id": "304", "kind": "body", "name": "body", "serializedName": "body", @@ -3768,7 +3854,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Float.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Float.put.body", + "methodParameterSegments": [ + { + "$id": "305", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "160" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Float.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3795,40 +3901,10 @@ }, "parameters": [ { - "$id": "304", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "160" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Float.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "305" }, { - "$id": "305", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "50" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Float.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "303" } ], "response": {}, @@ -3913,7 +3989,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal.get.accept", + "methodParameterSegments": [ + { + "$id": "313", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "52" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3943,21 +4038,7 @@ }, "parameters": [ { - "$id": "313", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "52" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "313" } ], "response": { @@ -3999,10 +4080,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal.put.contentType", + "methodParameterSegments": [ + { + "$id": "317", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "54" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "317", + "$id": "318", "kind": "body", "name": "body", "serializedName": "body", @@ -4019,7 +4120,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal.put.body", + "methodParameterSegments": [ + { + "$id": "319", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "163" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4046,40 +4167,10 @@ }, "parameters": [ { - "$id": "318", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "163" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "319" }, { - "$id": "319", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "54" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "317" } ], "response": {}, @@ -4164,7 +4255,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal128.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal128.get.accept", + "methodParameterSegments": [ + { + "$id": "327", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "56" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal128.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4194,21 +4304,7 @@ }, "parameters": [ { - "$id": "327", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "56" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal128.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "327" } ], "response": { @@ -4250,10 +4346,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal128.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal128.put.contentType", + "methodParameterSegments": [ + { + "$id": "331", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "58" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal128.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "331", + "$id": "332", "kind": "body", "name": "body", "serializedName": "body", @@ -4270,7 +4386,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal128.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal128.put.body", + "methodParameterSegments": [ + { + "$id": "333", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "166" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal128.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4297,40 +4433,10 @@ }, "parameters": [ { - "$id": "332", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "166" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal128.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "333" }, { - "$id": "333", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "58" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal128.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "331" } ], "response": {}, @@ -4415,7 +4521,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Datetime.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Datetime.get.accept", + "methodParameterSegments": [ + { + "$id": "341", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "60" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Datetime.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4445,21 +4570,7 @@ }, "parameters": [ { - "$id": "341", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "60" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Datetime.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "341" } ], "response": { @@ -4501,10 +4612,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Datetime.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Datetime.put.contentType", + "methodParameterSegments": [ + { + "$id": "345", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "62" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Datetime.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "345", + "$id": "346", "kind": "body", "name": "body", "serializedName": "body", @@ -4521,7 +4652,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Datetime.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Datetime.put.body", + "methodParameterSegments": [ + { + "$id": "347", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "169" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Datetime.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4548,40 +4699,10 @@ }, "parameters": [ { - "$id": "346", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "169" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Datetime.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "347" }, { - "$id": "347", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "62" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Datetime.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "345" } ], "response": {}, @@ -4666,7 +4787,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Duration.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Duration.get.accept", + "methodParameterSegments": [ + { + "$id": "355", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "64" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Duration.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4696,21 +4836,7 @@ }, "parameters": [ { - "$id": "355", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "64" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Duration.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "355" } ], "response": { @@ -4752,10 +4878,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Duration.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Duration.put.contentType", + "methodParameterSegments": [ + { + "$id": "359", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "66" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Duration.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "359", + "$id": "360", "kind": "body", "name": "body", "serializedName": "body", @@ -4772,7 +4918,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Duration.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Duration.put.body", + "methodParameterSegments": [ + { + "$id": "361", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "173" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Duration.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4799,40 +4965,10 @@ }, "parameters": [ { - "$id": "360", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "173" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Duration.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "361" }, { - "$id": "361", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "66" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Duration.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "359" } ], "response": {}, @@ -4917,7 +5053,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Enum.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Enum.get.accept", + "methodParameterSegments": [ + { + "$id": "369", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "68" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Enum.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4947,21 +5102,7 @@ }, "parameters": [ { - "$id": "369", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "68" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Enum.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "369" } ], "response": { @@ -5003,10 +5144,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Enum.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Enum.put.contentType", + "methodParameterSegments": [ + { + "$id": "373", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "70" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Enum.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "373", + "$id": "374", "kind": "body", "name": "body", "serializedName": "body", @@ -5023,7 +5184,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Enum.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Enum.put.body", + "methodParameterSegments": [ + { + "$id": "375", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "177" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Enum.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5050,40 +5231,10 @@ }, "parameters": [ { - "$id": "374", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "177" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Enum.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "375" }, { - "$id": "375", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "70" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Enum.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "373" } ], "response": {}, @@ -5168,7 +5319,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.ExtensibleEnum.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.ExtensibleEnum.get.accept", + "methodParameterSegments": [ + { + "$id": "383", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "72" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.ExtensibleEnum.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5198,21 +5368,7 @@ }, "parameters": [ { - "$id": "383", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "72" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.ExtensibleEnum.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "383" } ], "response": { @@ -5254,10 +5410,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.ExtensibleEnum.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.ExtensibleEnum.put.contentType", + "methodParameterSegments": [ + { + "$id": "387", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "74" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.ExtensibleEnum.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "387", + "$id": "388", "kind": "body", "name": "body", "serializedName": "body", @@ -5274,7 +5450,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.ExtensibleEnum.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.ExtensibleEnum.put.body", + "methodParameterSegments": [ + { + "$id": "389", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "179" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.ExtensibleEnum.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5301,40 +5497,10 @@ }, "parameters": [ { - "$id": "388", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "179" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.ExtensibleEnum.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "389" }, { - "$id": "389", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "74" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.ExtensibleEnum.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "387" } ], "response": {}, @@ -5419,7 +5585,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Model.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Model.get.accept", + "methodParameterSegments": [ + { + "$id": "397", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "76" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Model.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5449,21 +5634,7 @@ }, "parameters": [ { - "$id": "397", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "76" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Model.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "397" } ], "response": { @@ -5505,10 +5676,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Model.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Model.put.contentType", + "methodParameterSegments": [ + { + "$id": "401", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "78" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Model.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "401", + "$id": "402", "kind": "body", "name": "body", "serializedName": "body", @@ -5525,7 +5716,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Model.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Model.put.body", + "methodParameterSegments": [ + { + "$id": "403", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "181" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Model.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5552,40 +5763,10 @@ }, "parameters": [ { - "$id": "402", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "181" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Model.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "403" }, { - "$id": "403", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "78" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Model.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "401" } ], "response": {}, @@ -5670,7 +5851,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsString.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsString.get.accept", + "methodParameterSegments": [ + { + "$id": "411", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "80" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsString.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5700,21 +5900,7 @@ }, "parameters": [ { - "$id": "411", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "80" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsString.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "411" } ], "response": { @@ -5756,10 +5942,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsString.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsString.put.contentType", + "methodParameterSegments": [ + { + "$id": "415", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "82" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsString.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "415", + "$id": "416", "kind": "body", "name": "body", "serializedName": "body", @@ -5776,7 +5982,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsString.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsString.put.body", + "methodParameterSegments": [ + { + "$id": "417", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "186" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsString.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5803,40 +6029,10 @@ }, "parameters": [ { - "$id": "416", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "186" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsString.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "417" }, { - "$id": "417", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "82" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsString.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "415" } ], "response": {}, @@ -5921,7 +6117,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsInt.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsInt.get.accept", + "methodParameterSegments": [ + { + "$id": "425", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "84" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsInt.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -5951,21 +6166,7 @@ }, "parameters": [ { - "$id": "425", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "84" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsInt.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "425" } ], "response": { @@ -6007,10 +6208,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsInt.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsInt.put.contentType", + "methodParameterSegments": [ + { + "$id": "429", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "86" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsInt.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "429", + "$id": "430", "kind": "body", "name": "body", "serializedName": "body", @@ -6027,7 +6248,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsInt.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsInt.put.body", + "methodParameterSegments": [ + { + "$id": "431", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "190" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsInt.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6054,40 +6295,10 @@ }, "parameters": [ { - "$id": "430", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "190" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsInt.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "431" }, { - "$id": "431", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "86" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsInt.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "429" } ], "response": {}, @@ -6172,7 +6383,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsModel.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsModel.get.accept", + "methodParameterSegments": [ + { + "$id": "439", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "88" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsModel.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6202,21 +6432,7 @@ }, "parameters": [ { - "$id": "439", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "88" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsModel.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "439" } ], "response": { @@ -6258,10 +6474,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsModel.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsModel.put.contentType", + "methodParameterSegments": [ + { + "$id": "443", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "90" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsModel.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "443", + "$id": "444", "kind": "body", "name": "body", "serializedName": "body", @@ -6278,7 +6514,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsModel.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsModel.put.body", + "methodParameterSegments": [ + { + "$id": "445", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "194" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsModel.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6305,40 +6561,10 @@ }, "parameters": [ { - "$id": "444", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "194" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsModel.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "445" }, { - "$id": "445", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "90" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsModel.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "443" } ], "response": {}, @@ -6423,7 +6649,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.DictionaryString.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.DictionaryString.get.accept", + "methodParameterSegments": [ + { + "$id": "453", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "92" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.DictionaryString.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6453,21 +6698,7 @@ }, "parameters": [ { - "$id": "453", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "92" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.DictionaryString.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "453" } ], "response": { @@ -6509,10 +6740,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.DictionaryString.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.DictionaryString.put.contentType", + "methodParameterSegments": [ + { + "$id": "457", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "94" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.DictionaryString.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "457", + "$id": "458", "kind": "body", "name": "body", "serializedName": "body", @@ -6529,7 +6780,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.DictionaryString.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.DictionaryString.put.body", + "methodParameterSegments": [ + { + "$id": "459", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "197" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.DictionaryString.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6556,40 +6827,10 @@ }, "parameters": [ { - "$id": "458", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "197" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.DictionaryString.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "459" }, { - "$id": "459", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "94" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.DictionaryString.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "457" } ], "response": {}, @@ -6674,7 +6915,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Never.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Never.get.accept", + "methodParameterSegments": [ + { + "$id": "467", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "96" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Never.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6704,21 +6964,7 @@ }, "parameters": [ { - "$id": "467", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "96" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Never.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "467" } ], "response": { @@ -6760,10 +7006,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Never.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Never.put.contentType", + "methodParameterSegments": [ + { + "$id": "471", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "98" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Never.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "471", + "$id": "472", "kind": "body", "name": "body", "serializedName": "body", @@ -6780,7 +7046,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Never.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Never.put.body", + "methodParameterSegments": [ + { + "$id": "473", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "202" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.Never.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6807,40 +7093,10 @@ }, "parameters": [ { - "$id": "472", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "202" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Never.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "473" }, { - "$id": "473", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "98" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.Never.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "471" } ], "response": {}, @@ -6925,7 +7181,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownString.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownString.get.accept", + "methodParameterSegments": [ + { + "$id": "481", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "100" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownString.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -6955,21 +7230,7 @@ }, "parameters": [ { - "$id": "481", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "100" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownString.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "481" } ], "response": { @@ -7011,10 +7272,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownString.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownString.put.contentType", + "methodParameterSegments": [ + { + "$id": "485", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "102" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownString.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "485", + "$id": "486", "kind": "body", "name": "body", "serializedName": "body", @@ -7031,7 +7312,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownString.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownString.put.body", + "methodParameterSegments": [ + { + "$id": "487", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "203" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownString.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7058,40 +7359,10 @@ }, "parameters": [ { - "$id": "486", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "203" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownString.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "487" }, { - "$id": "487", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "102" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownString.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "485" } ], "response": {}, @@ -7176,7 +7447,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownInt.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownInt.get.accept", + "methodParameterSegments": [ + { + "$id": "495", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "104" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownInt.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7206,21 +7496,7 @@ }, "parameters": [ { - "$id": "495", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "104" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownInt.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "495" } ], "response": { @@ -7262,10 +7538,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownInt.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownInt.put.contentType", + "methodParameterSegments": [ + { + "$id": "499", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "106" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownInt.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "499", + "$id": "500", "kind": "body", "name": "body", "serializedName": "body", @@ -7282,7 +7578,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownInt.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownInt.put.body", + "methodParameterSegments": [ + { + "$id": "501", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "206" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownInt.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7309,40 +7625,10 @@ }, "parameters": [ { - "$id": "500", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "206" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownInt.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "501" }, { - "$id": "501", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "106" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownInt.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "499" } ], "response": {}, @@ -7427,7 +7713,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownDict.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownDict.get.accept", + "methodParameterSegments": [ + { + "$id": "509", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "108" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownDict.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7457,21 +7762,7 @@ }, "parameters": [ { - "$id": "509", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "108" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownDict.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "509" } ], "response": { @@ -7513,10 +7804,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownDict.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownDict.put.contentType", + "methodParameterSegments": [ + { + "$id": "513", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "110" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownDict.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "513", + "$id": "514", "kind": "body", "name": "body", "serializedName": "body", @@ -7533,7 +7844,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownDict.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownDict.put.body", + "methodParameterSegments": [ + { + "$id": "515", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "209" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownDict.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7560,40 +7891,10 @@ }, "parameters": [ { - "$id": "514", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "209" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownDict.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "515" }, { - "$id": "515", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "110" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownDict.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "513" } ], "response": {}, @@ -7678,7 +7979,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownArray.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownArray.get.accept", + "methodParameterSegments": [ + { + "$id": "523", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "112" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownArray.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7708,21 +8028,7 @@ }, "parameters": [ { - "$id": "523", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "112" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownArray.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "523" } ], "response": { @@ -7764,10 +8070,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownArray.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownArray.put.contentType", + "methodParameterSegments": [ + { + "$id": "527", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "114" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownArray.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "527", + "$id": "528", "kind": "body", "name": "body", "serializedName": "body", @@ -7784,7 +8110,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownArray.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownArray.put.body", + "methodParameterSegments": [ + { + "$id": "529", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "212" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownArray.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7811,40 +8157,10 @@ }, "parameters": [ { - "$id": "528", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "212" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownArray.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "529" }, { - "$id": "529", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "114" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownArray.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "527" } ], "response": {}, @@ -7929,7 +8245,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.StringLiteral.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.StringLiteral.get.accept", + "methodParameterSegments": [ + { + "$id": "537", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "116" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.StringLiteral.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -7959,21 +8294,7 @@ }, "parameters": [ { - "$id": "537", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "116" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.StringLiteral.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "537" } ], "response": { @@ -8015,10 +8336,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.StringLiteral.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.StringLiteral.put.contentType", + "methodParameterSegments": [ + { + "$id": "541", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "118" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.StringLiteral.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "541", + "$id": "542", "kind": "body", "name": "body", "serializedName": "body", @@ -8035,7 +8376,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.StringLiteral.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.StringLiteral.put.body", + "methodParameterSegments": [ + { + "$id": "543", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "215" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.StringLiteral.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8062,40 +8423,10 @@ }, "parameters": [ { - "$id": "542", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "215" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.StringLiteral.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "543" }, { - "$id": "543", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "118" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.StringLiteral.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "541" } ], "response": {}, @@ -8180,7 +8511,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.IntLiteral.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.IntLiteral.get.accept", + "methodParameterSegments": [ + { + "$id": "551", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "120" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.IntLiteral.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8210,21 +8560,7 @@ }, "parameters": [ { - "$id": "551", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "120" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.IntLiteral.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "551" } ], "response": { @@ -8266,10 +8602,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.IntLiteral.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.IntLiteral.put.contentType", + "methodParameterSegments": [ + { + "$id": "555", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "122" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.IntLiteral.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "555", + "$id": "556", "kind": "body", "name": "body", "serializedName": "body", @@ -8286,7 +8642,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.IntLiteral.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.IntLiteral.put.body", + "methodParameterSegments": [ + { + "$id": "557", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "217" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.IntLiteral.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8313,40 +8689,10 @@ }, "parameters": [ { - "$id": "556", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "217" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.IntLiteral.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "557" }, { - "$id": "557", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "122" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.IntLiteral.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "555" } ], "response": {}, @@ -8431,7 +8777,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.FloatLiteral.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.FloatLiteral.get.accept", + "methodParameterSegments": [ + { + "$id": "565", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "124" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.FloatLiteral.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8461,21 +8826,7 @@ }, "parameters": [ { - "$id": "565", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "124" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.FloatLiteral.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "565" } ], "response": { @@ -8517,10 +8868,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.FloatLiteral.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.FloatLiteral.put.contentType", + "methodParameterSegments": [ + { + "$id": "569", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "126" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.FloatLiteral.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "569", + "$id": "570", "kind": "body", "name": "body", "serializedName": "body", @@ -8537,7 +8908,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.FloatLiteral.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.FloatLiteral.put.body", + "methodParameterSegments": [ + { + "$id": "571", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "219" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.FloatLiteral.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8564,40 +8955,10 @@ }, "parameters": [ { - "$id": "570", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "219" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.FloatLiteral.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "571" }, { - "$id": "571", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "126" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.FloatLiteral.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "569" } ], "response": {}, @@ -8682,7 +9043,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.BooleanLiteral.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.BooleanLiteral.get.accept", + "methodParameterSegments": [ + { + "$id": "579", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "128" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.BooleanLiteral.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8712,21 +9092,7 @@ }, "parameters": [ { - "$id": "579", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "128" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.BooleanLiteral.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "579" } ], "response": { @@ -8768,10 +9134,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.BooleanLiteral.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.BooleanLiteral.put.contentType", + "methodParameterSegments": [ + { + "$id": "583", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "130" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.BooleanLiteral.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "583", + "$id": "584", "kind": "body", "name": "body", "serializedName": "body", @@ -8788,7 +9174,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.BooleanLiteral.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.BooleanLiteral.put.body", + "methodParameterSegments": [ + { + "$id": "585", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "221" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.BooleanLiteral.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8815,40 +9221,10 @@ }, "parameters": [ { - "$id": "584", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "221" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.BooleanLiteral.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "585" }, { - "$id": "585", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "130" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.BooleanLiteral.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "583" } ], "response": {}, @@ -8933,7 +9309,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionStringLiteral.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionStringLiteral.get.accept", + "methodParameterSegments": [ + { + "$id": "593", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "132" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionStringLiteral.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -8963,21 +9358,7 @@ }, "parameters": [ { - "$id": "593", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "132" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionStringLiteral.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "593" } ], "response": { @@ -9019,10 +9400,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionStringLiteral.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionStringLiteral.put.contentType", + "methodParameterSegments": [ + { + "$id": "597", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "134" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionStringLiteral.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "597", + "$id": "598", "kind": "body", "name": "body", "serializedName": "body", @@ -9039,7 +9440,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionStringLiteral.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionStringLiteral.put.body", + "methodParameterSegments": [ + { + "$id": "599", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "223" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionStringLiteral.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9066,40 +9487,10 @@ }, "parameters": [ { - "$id": "598", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "223" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionStringLiteral.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "599" }, { - "$id": "599", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "134" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionStringLiteral.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "597" } ], "response": {}, @@ -9184,7 +9575,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionIntLiteral.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionIntLiteral.get.accept", + "methodParameterSegments": [ + { + "$id": "607", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "136" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionIntLiteral.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9214,21 +9624,7 @@ }, "parameters": [ { - "$id": "607", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "136" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionIntLiteral.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "607" } ], "response": { @@ -9270,10 +9666,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionIntLiteral.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionIntLiteral.put.contentType", + "methodParameterSegments": [ + { + "$id": "611", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "138" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionIntLiteral.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "611", + "$id": "612", "kind": "body", "name": "body", "serializedName": "body", @@ -9290,7 +9706,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionIntLiteral.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionIntLiteral.put.body", + "methodParameterSegments": [ + { + "$id": "613", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "225" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionIntLiteral.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9317,40 +9753,10 @@ }, "parameters": [ { - "$id": "612", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "225" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionIntLiteral.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "613" }, { - "$id": "613", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "138" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionIntLiteral.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "611" } ], "response": {}, @@ -9435,7 +9841,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionFloatLiteral.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionFloatLiteral.get.accept", + "methodParameterSegments": [ + { + "$id": "621", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "140" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionFloatLiteral.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9465,21 +9890,7 @@ }, "parameters": [ { - "$id": "621", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "140" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionFloatLiteral.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "621" } ], "response": { @@ -9521,10 +9932,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionFloatLiteral.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionFloatLiteral.put.contentType", + "methodParameterSegments": [ + { + "$id": "625", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "142" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionFloatLiteral.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "625", + "$id": "626", "kind": "body", "name": "body", "serializedName": "body", @@ -9541,7 +9972,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionFloatLiteral.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionFloatLiteral.put.body", + "methodParameterSegments": [ + { + "$id": "627", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "227" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionFloatLiteral.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9568,40 +10019,10 @@ }, "parameters": [ { - "$id": "626", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "227" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionFloatLiteral.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "627" }, { - "$id": "627", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "142" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionFloatLiteral.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "625" } ], "response": {}, @@ -9686,7 +10107,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionEnumValue.get.accept" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionEnumValue.get.accept", + "methodParameterSegments": [ + { + "$id": "635", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "144" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionEnumValue.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9716,21 +10156,7 @@ }, "parameters": [ { - "$id": "635", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "144" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionEnumValue.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "635" } ], "response": { @@ -9772,10 +10198,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionEnumValue.put.contentType" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionEnumValue.put.contentType", + "methodParameterSegments": [ + { + "$id": "639", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "146" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionEnumValue.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "639", + "$id": "640", "kind": "body", "name": "body", "serializedName": "body", @@ -9792,7 +10238,27 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionEnumValue.put.body" + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionEnumValue.put.body", + "methodParameterSegments": [ + { + "$id": "641", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "body", + "type": { + "$ref": "229" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionEnumValue.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -9819,40 +10285,10 @@ }, "parameters": [ { - "$id": "640", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "body", - "type": { - "$ref": "229" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionEnumValue.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "641" }, { - "$id": "641", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "146" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionEnumValue.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "639" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/Type.Scalar.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/Type.Scalar.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/Type.Scalar.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/Type.Scalar.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/Type.Scalar.sln deleted file mode 100644 index 6b75b4bfc6f..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/Type.Scalar.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Scalar", "src\Type.Scalar.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/Type.Scalar.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/Type.Scalar.slnx new file mode 100644 index 00000000000..c37a1edc879 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/Type.Scalar.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Boolean.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Boolean.cs index 12a173aba7d..f3a074a4c57 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Boolean.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Boolean.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Boolean { protected Boolean() => throw null; + internal Boolean(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Decimal128Type.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Decimal128Type.cs index 941ee7e41dc..6e3566ea66a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Decimal128Type.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Decimal128Type.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class Decimal128Type { protected Decimal128Type() => throw null; + internal Decimal128Type(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult ResponseBody(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Decimal128Verify.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Decimal128Verify.cs index 01200f453d3..11e138c5ac3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Decimal128Verify.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Decimal128Verify.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class Decimal128Verify { protected Decimal128Verify() => throw null; + internal Decimal128Verify(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult PrepareVerify(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/DecimalType.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/DecimalType.cs index 281338de6ca..c225451e654 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/DecimalType.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/DecimalType.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class DecimalType { protected DecimalType() => throw null; + internal DecimalType(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult ResponseBody(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/DecimalVerify.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/DecimalVerify.cs index 3c38a946f65..6b00b6964ac 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/DecimalVerify.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/DecimalVerify.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Collections.Generic; @@ -14,6 +15,8 @@ public partial class DecimalVerify { protected DecimalVerify() => throw null; + internal DecimalVerify(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult PrepareVerify(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/ScalarClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/ScalarClient.cs index 7a2ab78771c..c446fb20afc 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/ScalarClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/ScalarClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; namespace _Type.Scalar { @@ -11,7 +12,12 @@ public partial class ScalarClient { public ScalarClient() : this(new Uri("http://localhost:3000"), new ScalarClientOptions()) => throw null; - public ScalarClient(Uri endpoint, ScalarClientOptions options) => throw null; + internal ScalarClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, ScalarClientOptions options) => throw null; + + public ScalarClient(Uri endpoint, ScalarClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public ScalarClient(ScalarClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/ScalarClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/ScalarClientOptions.cs index 315778f0dfa..16a42e8a09c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/ScalarClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/ScalarClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace _Type.Scalar { public partial class ScalarClientOptions : ClientPipelineOptions { + public ScalarClientOptions() => throw null; + + [Experimental("SCME0002")] + internal ScalarClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/ScalarClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/ScalarClientSettings.cs new file mode 100644 index 00000000000..c16448023ec --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/ScalarClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace _Type.Scalar +{ + [Experimental("SCME0002")] + public partial class ScalarClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public ScalarClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/String.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/String.cs index b1b7388d369..e58e6a99949 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/String.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/String.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class String { protected String() => throw null; + internal String(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Unknown.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Unknown.cs index 39e08fd7025..ad255b77e27 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Unknown.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Unknown.cs @@ -14,6 +14,8 @@ public partial class Unknown { protected Unknown() => throw null; + internal Unknown(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..a5186dcd3fe --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "ScalarClient": { + "type": "object", + "description": "Configuration for ScalarClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/scalarClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "scalarClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Type.Scalar.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Type.Scalar.csproj index 133ae6e4c0b..611ec9217f9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Type.Scalar.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Type.Scalar.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/tspCodeModel.json index 7755a14604f..35f3093689a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/tspCodeModel.json @@ -483,7 +483,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Scalar.String.get.accept" + "crossLanguageDefinitionId": "Type.Scalar.String.get.accept", + "methodParameterSegments": [ + { + "$id": "59", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "1" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Scalar.String.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -492,7 +511,7 @@ 200 ], "bodyType": { - "$id": "59", + "$id": "60", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -525,26 +544,12 @@ }, "parameters": [ { - "$id": "60", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Scalar.String.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "59" } ], "response": { "type": { - "$ref": "59" + "$ref": "60" } }, "isOverride": false, @@ -580,16 +585,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Scalar.String.put.contentType" + "crossLanguageDefinitionId": "Type.Scalar.String.put.contentType", + "methodParameterSegments": [ + { + "$id": "64", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Scalar.String.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "64", + "$id": "65", "kind": "body", "name": "body", "serializedName": "body", "doc": "_", "type": { - "$id": "65", + "$id": "66", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -604,7 +628,31 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Scalar.String.put.body" + "crossLanguageDefinitionId": "Type.Scalar.String.put.body", + "methodParameterSegments": [ + { + "$id": "67", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "_", + "type": { + "$id": "68", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Scalar.String.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -631,43 +679,10 @@ }, "parameters": [ { - "$id": "66", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Scalar.String.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "64" }, { - "$id": "67", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "_", - "type": { - "$id": "68", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Scalar.String.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "67" } ], "response": {}, @@ -752,7 +767,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Scalar.Boolean.get.accept" + "crossLanguageDefinitionId": "Type.Scalar.Boolean.get.accept", + "methodParameterSegments": [ + { + "$id": "76", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Scalar.Boolean.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -761,7 +795,7 @@ 200 ], "bodyType": { - "$id": "76", + "$id": "77", "kind": "boolean", "name": "boolean", "crossLanguageDefinitionId": "TypeSpec.boolean", @@ -794,26 +828,12 @@ }, "parameters": [ { - "$id": "77", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Scalar.Boolean.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "76" } ], "response": { "type": { - "$ref": "76" + "$ref": "77" } }, "isOverride": false, @@ -849,16 +869,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Scalar.Boolean.put.contentType" + "crossLanguageDefinitionId": "Type.Scalar.Boolean.put.contentType", + "methodParameterSegments": [ + { + "$id": "81", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "13" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Scalar.Boolean.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "81", + "$id": "82", "kind": "body", "name": "body", "serializedName": "body", "doc": "_", "type": { - "$id": "82", + "$id": "83", "kind": "boolean", "name": "boolean", "crossLanguageDefinitionId": "TypeSpec.boolean", @@ -873,7 +912,31 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Scalar.Boolean.put.body" + "crossLanguageDefinitionId": "Type.Scalar.Boolean.put.body", + "methodParameterSegments": [ + { + "$id": "84", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "_", + "type": { + "$id": "85", + "kind": "boolean", + "name": "boolean", + "crossLanguageDefinitionId": "TypeSpec.boolean", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Scalar.Boolean.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -900,43 +963,10 @@ }, "parameters": [ { - "$id": "83", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Scalar.Boolean.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "81" }, { - "$id": "84", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "_", - "type": { - "$id": "85", - "kind": "boolean", - "name": "boolean", - "crossLanguageDefinitionId": "TypeSpec.boolean", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Scalar.Boolean.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "84" } ], "response": {}, @@ -1021,7 +1051,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Scalar.Unknown.get.accept" + "crossLanguageDefinitionId": "Type.Scalar.Unknown.get.accept", + "methodParameterSegments": [ + { + "$id": "93", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Scalar.Unknown.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1030,7 +1079,7 @@ 200 ], "bodyType": { - "$id": "93", + "$id": "94", "kind": "unknown", "name": "unknown", "crossLanguageDefinitionId": "", @@ -1063,26 +1112,12 @@ }, "parameters": [ { - "$id": "94", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "17" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Scalar.Unknown.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "93" } ], "response": { "type": { - "$ref": "93" + "$ref": "94" } }, "isOverride": false, @@ -1118,16 +1153,35 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Scalar.Unknown.put.contentType" + "crossLanguageDefinitionId": "Type.Scalar.Unknown.put.contentType", + "methodParameterSegments": [ + { + "$id": "98", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "21" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Scalar.Unknown.put.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "98", + "$id": "99", "kind": "body", "name": "body", "serializedName": "body", "doc": "_", "type": { - "$id": "99", + "$id": "100", "kind": "unknown", "name": "unknown", "crossLanguageDefinitionId": "", @@ -1142,7 +1196,31 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Scalar.Unknown.put.body" + "crossLanguageDefinitionId": "Type.Scalar.Unknown.put.body", + "methodParameterSegments": [ + { + "$id": "101", + "kind": "method", + "name": "body", + "serializedName": "body", + "doc": "_", + "type": { + "$id": "102", + "kind": "unknown", + "name": "unknown", + "crossLanguageDefinitionId": "", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Scalar.Unknown.put.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1169,43 +1247,10 @@ }, "parameters": [ { - "$id": "100", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "23" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Scalar.Unknown.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "98" }, { - "$id": "101", - "kind": "method", - "name": "body", - "serializedName": "body", - "doc": "_", - "type": { - "$id": "102", - "kind": "unknown", - "name": "unknown", - "crossLanguageDefinitionId": "", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Scalar.Unknown.put.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "101" } ], "response": {}, @@ -1289,7 +1334,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Scalar.DecimalType.responseBody.accept" + "crossLanguageDefinitionId": "Type.Scalar.DecimalType.responseBody.accept", + "methodParameterSegments": [ + { + "$id": "110", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "25" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Scalar.DecimalType.responseBody.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1298,7 +1362,7 @@ 200 ], "bodyType": { - "$id": "110", + "$id": "111", "kind": "decimal", "name": "decimal", "crossLanguageDefinitionId": "TypeSpec.decimal", @@ -1331,26 +1395,12 @@ }, "parameters": [ { - "$id": "111", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "25" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Scalar.DecimalType.responseBody.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "110" } ], "response": { "type": { - "$ref": "110" + "$ref": "111" } }, "isOverride": false, @@ -1384,15 +1434,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Scalar.DecimalType.requestBody.contentType" + "crossLanguageDefinitionId": "Type.Scalar.DecimalType.requestBody.contentType", + "methodParameterSegments": [ + { + "$id": "115", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "29" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Scalar.DecimalType.requestBody.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "115", + "$id": "116", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$id": "116", + "$id": "117", "kind": "decimal", "name": "decimal", "crossLanguageDefinitionId": "TypeSpec.decimal", @@ -1407,7 +1476,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Scalar.DecimalType.requestBody.body" + "crossLanguageDefinitionId": "Type.Scalar.DecimalType.requestBody.body", + "methodParameterSegments": [ + { + "$id": "118", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$id": "119", + "kind": "decimal", + "name": "decimal", + "crossLanguageDefinitionId": "TypeSpec.decimal", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Scalar.DecimalType.requestBody.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1434,42 +1526,10 @@ }, "parameters": [ { - "$id": "117", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "31" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Scalar.DecimalType.requestBody.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "115" }, { - "$id": "118", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$id": "119", - "kind": "decimal", - "name": "decimal", - "crossLanguageDefinitionId": "TypeSpec.decimal", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Scalar.DecimalType.requestBody.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "118" } ], "response": {}, @@ -1508,7 +1568,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Type.Scalar.DecimalType.requestParameter.value", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "124", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "125", + "kind": "decimal", + "name": "decimal", + "crossLanguageDefinitionId": "TypeSpec.decimal", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Scalar.DecimalType.requestParameter.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1532,25 +1615,7 @@ }, "parameters": [ { - "$id": "124", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "125", - "kind": "decimal", - "name": "decimal", - "crossLanguageDefinitionId": "TypeSpec.decimal", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Scalar.DecimalType.requestParameter.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "124" } ], "response": {}, @@ -1634,7 +1699,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Scalar.Decimal128Type.responseBody.accept" + "crossLanguageDefinitionId": "Type.Scalar.Decimal128Type.responseBody.accept", + "methodParameterSegments": [ + { + "$id": "133", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "33" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Scalar.Decimal128Type.responseBody.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1643,7 +1727,7 @@ 200 ], "bodyType": { - "$id": "133", + "$id": "134", "kind": "decimal128", "name": "decimal128", "crossLanguageDefinitionId": "TypeSpec.decimal128", @@ -1676,26 +1760,12 @@ }, "parameters": [ { - "$id": "134", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "33" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Scalar.Decimal128Type.responseBody.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "133" } ], "response": { "type": { - "$ref": "133" + "$ref": "134" } }, "isOverride": false, @@ -1729,15 +1799,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Scalar.Decimal128Type.requestBody.contentType" + "crossLanguageDefinitionId": "Type.Scalar.Decimal128Type.requestBody.contentType", + "methodParameterSegments": [ + { + "$id": "138", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "37" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Scalar.Decimal128Type.requestBody.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "138", + "$id": "139", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$id": "139", + "$id": "140", "kind": "decimal128", "name": "decimal128", "crossLanguageDefinitionId": "TypeSpec.decimal128", @@ -1752,7 +1841,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Scalar.Decimal128Type.requestBody.body" + "crossLanguageDefinitionId": "Type.Scalar.Decimal128Type.requestBody.body", + "methodParameterSegments": [ + { + "$id": "141", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$id": "142", + "kind": "decimal128", + "name": "decimal128", + "crossLanguageDefinitionId": "TypeSpec.decimal128", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Scalar.Decimal128Type.requestBody.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1779,42 +1891,10 @@ }, "parameters": [ { - "$id": "140", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "39" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Scalar.Decimal128Type.requestBody.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "138" }, { - "$id": "141", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$id": "142", - "kind": "decimal128", - "name": "decimal128", - "crossLanguageDefinitionId": "TypeSpec.decimal128", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Scalar.Decimal128Type.requestBody.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "141" } ], "response": {}, @@ -1853,7 +1933,30 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Type.Scalar.Decimal128Type.requestParameter.value", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "147", + "kind": "method", + "name": "value", + "serializedName": "value", + "type": { + "$id": "148", + "kind": "decimal128", + "name": "decimal128", + "crossLanguageDefinitionId": "TypeSpec.decimal128", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Scalar.Decimal128Type.requestParameter.value", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1877,25 +1980,7 @@ }, "parameters": [ { - "$id": "147", - "kind": "method", - "name": "value", - "serializedName": "value", - "type": { - "$id": "148", - "kind": "decimal128", - "name": "decimal128", - "crossLanguageDefinitionId": "TypeSpec.decimal128", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Scalar.Decimal128Type.requestParameter.value", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "147" } ], "response": {}, @@ -1979,7 +2064,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Scalar.DecimalVerify.prepareVerify.accept" + "crossLanguageDefinitionId": "Type.Scalar.DecimalVerify.prepareVerify.accept", + "methodParameterSegments": [ + { + "$id": "156", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "41" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Scalar.DecimalVerify.prepareVerify.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1988,11 +2092,11 @@ 200 ], "bodyType": { - "$id": "156", + "$id": "157", "kind": "array", "name": "Array", "valueType": { - "$id": "157", + "$id": "158", "kind": "decimal", "name": "decimal", "crossLanguageDefinitionId": "TypeSpec.decimal", @@ -2020,26 +2124,12 @@ }, "parameters": [ { - "$id": "158", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "41" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Scalar.DecimalVerify.prepareVerify.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "156" } ], "response": { "type": { - "$ref": "156" + "$ref": "157" } }, "isOverride": false, @@ -2073,15 +2163,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Scalar.DecimalVerify.verify.contentType" + "crossLanguageDefinitionId": "Type.Scalar.DecimalVerify.verify.contentType", + "methodParameterSegments": [ + { + "$id": "162", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "49" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Scalar.DecimalVerify.verify.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "162", + "$id": "163", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$id": "163", + "$id": "164", "kind": "decimal", "name": "decimal", "crossLanguageDefinitionId": "TypeSpec.decimal", @@ -2096,7 +2205,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Scalar.DecimalVerify.verify.body" + "crossLanguageDefinitionId": "Type.Scalar.DecimalVerify.verify.body", + "methodParameterSegments": [ + { + "$id": "165", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$id": "166", + "kind": "decimal", + "name": "decimal", + "crossLanguageDefinitionId": "TypeSpec.decimal", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Scalar.DecimalVerify.verify.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2123,42 +2255,10 @@ }, "parameters": [ { - "$id": "164", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "45" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Scalar.DecimalVerify.verify.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "162" }, { - "$id": "165", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$id": "166", - "kind": "decimal", - "name": "decimal", - "crossLanguageDefinitionId": "TypeSpec.decimal", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Scalar.DecimalVerify.verify.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "165" } ], "response": {}, @@ -2242,7 +2342,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Scalar.Decimal128Verify.prepareVerify.accept" + "crossLanguageDefinitionId": "Type.Scalar.Decimal128Verify.prepareVerify.accept", + "methodParameterSegments": [ + { + "$id": "174", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "47" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Scalar.Decimal128Verify.prepareVerify.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2251,7 +2370,7 @@ 200 ], "bodyType": { - "$ref": "156" + "$ref": "157" }, "headers": [], "isErrorResponse": false, @@ -2272,26 +2391,12 @@ }, "parameters": [ { - "$id": "174", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "47" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Scalar.Decimal128Verify.prepareVerify.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "174" } ], "response": { "type": { - "$ref": "156" + "$ref": "157" } }, "isOverride": false, @@ -2325,7 +2430,12 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Scalar.Decimal128Verify.verify.contentType" + "crossLanguageDefinitionId": "Type.Scalar.Decimal128Verify.verify.contentType", + "methodParameterSegments": [ + { + "$ref": "162" + } + ] }, { "$id": "178", @@ -2348,7 +2458,12 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Scalar.Decimal128Verify.verify.body" + "crossLanguageDefinitionId": "Type.Scalar.Decimal128Verify.verify.body", + "methodParameterSegments": [ + { + "$ref": "165" + } + ] } ], "responses": [ @@ -2375,7 +2490,7 @@ }, "parameters": [ { - "$ref": "164" + "$ref": "162" }, { "$ref": "165" diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/Type.Union.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/Type.Union.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/Type.Union.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/Type.Union.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/Type.Union.sln deleted file mode 100644 index 6a26d957b85..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/Type.Union.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Union", "src\Type.Union.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/Type.Union.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/Type.Union.slnx new file mode 100644 index 00000000000..3af9089ff0d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/Type.Union.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/Configuration.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/Configuration.json deleted file mode 100644 index 610ff671f9d..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/Configuration.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "package-name": "Type.Union.Discriminated" -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/Type.Union.Discriminated.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/Type.Union.Discriminated.sln deleted file mode 100644 index 656e7887d91..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/Type.Union.Discriminated.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Union.Discriminated", "src\Type.Union.Discriminated.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/DiscriminatedClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/DiscriminatedClient.cs deleted file mode 100644 index e9d690ec141..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/DiscriminatedClient.cs +++ /dev/null @@ -1,24 +0,0 @@ -// - -#nullable disable - -using System; -using System.ClientModel.Primitives; -using _Type.Union.Discriminated._Envelope; -using _Type.Union.Discriminated._NoEnvelope; - -namespace _Type.Union.Discriminated -{ - public partial class DiscriminatedClient - { - public DiscriminatedClient() : this(new Uri("http://localhost:3000"), new DiscriminatedClientOptions()) => throw null; - - public DiscriminatedClient(Uri endpoint, DiscriminatedClientOptions options) => throw null; - - public ClientPipeline Pipeline => throw null; - - public virtual Envelope GetEnvelopeClient() => throw null; - - public virtual NoEnvelope GetNoEnvelopeClient() => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/DiscriminatedClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/DiscriminatedClientOptions.cs deleted file mode 100644 index 9ade4bd3cbb..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/DiscriminatedClientOptions.cs +++ /dev/null @@ -1,12 +0,0 @@ -// - -#nullable disable - -using System.ClientModel.Primitives; - -namespace _Type.Union.Discriminated -{ - public partial class DiscriminatedClientOptions : ClientPipelineOptions - { - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Envelope.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Envelope.cs deleted file mode 100644 index a86ea7c0260..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Envelope.cs +++ /dev/null @@ -1,18 +0,0 @@ -// - -#nullable disable - -using System.ClientModel.Primitives; -using _Type.Union.Discriminated._Envelope.Object; - -namespace _Type.Union.Discriminated._Envelope -{ - public partial class Envelope - { - protected Envelope() => throw null; - - public ClientPipeline Pipeline => throw null; - - public virtual EnvelopeObject GetEnvelopeObjectClient() => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/EnvelopeObject.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/EnvelopeObject.cs deleted file mode 100644 index 49ca04b6adf..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/EnvelopeObject.cs +++ /dev/null @@ -1,19 +0,0 @@ -// - -#nullable disable - -using System.ClientModel.Primitives; - -namespace _Type.Union.Discriminated._Envelope.Object -{ - public partial class EnvelopeObject - { - protected EnvelopeObject() => throw null; - - public ClientPipeline Pipeline => throw null; - - public virtual EnvelopeObjectDefault GetEnvelopeObjectDefaultClient() => throw null; - - public virtual EnvelopeObjectCustomProperties GetEnvelopeObjectCustomPropertiesClient() => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/EnvelopeObjectCustomProperties.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/EnvelopeObjectCustomProperties.cs deleted file mode 100644 index c4d83be06c8..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/EnvelopeObjectCustomProperties.cs +++ /dev/null @@ -1,35 +0,0 @@ -// - -#nullable disable - -using System; -using System.ClientModel; -using System.ClientModel.Primitives; -using System.Threading; -using System.Threading.Tasks; - -namespace _Type.Union.Discriminated._Envelope.Object -{ - public partial class EnvelopeObjectCustomProperties - { - protected EnvelopeObjectCustomProperties() => throw null; - - public ClientPipeline Pipeline => throw null; - - public virtual ClientResult Get(string petType, RequestOptions options) => throw null; - - public virtual Task GetAsync(string petType, RequestOptions options) => throw null; - - public virtual ClientResult Get(string petType = default, CancellationToken cancellationToken = default) => throw null; - - public virtual Task> GetAsync(string petType = default, CancellationToken cancellationToken = default) => throw null; - - public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual ClientResult Put(BinaryData input, CancellationToken cancellationToken = default) => throw null; - - public virtual Task> PutAsync(BinaryData input, CancellationToken cancellationToken = default) => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/EnvelopeObjectDefault.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/EnvelopeObjectDefault.cs deleted file mode 100644 index e115dc0a563..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/EnvelopeObjectDefault.cs +++ /dev/null @@ -1,35 +0,0 @@ -// - -#nullable disable - -using System; -using System.ClientModel; -using System.ClientModel.Primitives; -using System.Threading; -using System.Threading.Tasks; - -namespace _Type.Union.Discriminated._Envelope.Object -{ - public partial class EnvelopeObjectDefault - { - protected EnvelopeObjectDefault() => throw null; - - public ClientPipeline Pipeline => throw null; - - public virtual ClientResult Get(string kind, RequestOptions options) => throw null; - - public virtual Task GetAsync(string kind, RequestOptions options) => throw null; - - public virtual ClientResult Get(string kind = default, CancellationToken cancellationToken = default) => throw null; - - public virtual Task> GetAsync(string kind = default, CancellationToken cancellationToken = default) => throw null; - - public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual ClientResult Put(BinaryData input, CancellationToken cancellationToken = default) => throw null; - - public virtual Task> PutAsync(BinaryData input, CancellationToken cancellationToken = default) => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/Cat.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/Cat.Serialization.cs deleted file mode 100644 index 0838b576ce8..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/Cat.Serialization.cs +++ /dev/null @@ -1,36 +0,0 @@ -// - -#nullable disable - -using System; -using System.ClientModel; -using System.ClientModel.Primitives; -using System.Text.Json; - -namespace _Type.Union.Discriminated -{ - public partial class Cat : IJsonModel - { - internal Cat() => throw null; - - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Cat IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - - protected virtual Cat JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - - Cat IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - - protected virtual Cat PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - - public static explicit operator Cat(ClientResult result) => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/Cat.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/Cat.cs deleted file mode 100644 index 133fee715aa..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/Cat.cs +++ /dev/null @@ -1,23 +0,0 @@ -// - -#nullable disable - -namespace _Type.Union.Discriminated -{ - public partial class Cat - { - public Cat(string name, bool meow) => throw null; - - public string Name - { - get => throw null; - set => throw null; - } - - public bool Meow - { - get => throw null; - set => throw null; - } - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/Dog.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/Dog.Serialization.cs deleted file mode 100644 index b3e6e5b6d22..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/Dog.Serialization.cs +++ /dev/null @@ -1,36 +0,0 @@ -// - -#nullable disable - -using System; -using System.ClientModel; -using System.ClientModel.Primitives; -using System.Text.Json; - -namespace _Type.Union.Discriminated -{ - public partial class Dog : IJsonModel - { - internal Dog() => throw null; - - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - Dog IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - - protected virtual Dog JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - - Dog IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - - protected virtual Dog PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - - public static explicit operator Dog(ClientResult result) => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/Dog.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/Dog.cs deleted file mode 100644 index d3d6ec2cc59..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/Dog.cs +++ /dev/null @@ -1,23 +0,0 @@ -// - -#nullable disable - -namespace _Type.Union.Discriminated -{ - public partial class Dog - { - public Dog(string name, bool bark) => throw null; - - public string Name - { - get => throw null; - set => throw null; - } - - public bool Bark - { - get => throw null; - set => throw null; - } - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/_TypeUnionDiscriminatedContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/_TypeUnionDiscriminatedContext.cs deleted file mode 100644 index 78a47c274e1..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/_TypeUnionDiscriminatedContext.cs +++ /dev/null @@ -1,14 +0,0 @@ -// - -#nullable disable - -using System.ClientModel.Primitives; - -namespace _Type.Union.Discriminated -{ - [ModelReaderWriterBuildable(typeof(Cat))] - [ModelReaderWriterBuildable(typeof(Dog))] - public partial class _TypeUnionDiscriminatedContext : ModelReaderWriterContext - { - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/NoEnvelope.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/NoEnvelope.cs deleted file mode 100644 index 3a85f8b2270..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/NoEnvelope.cs +++ /dev/null @@ -1,19 +0,0 @@ -// - -#nullable disable - -using System.ClientModel.Primitives; - -namespace _Type.Union.Discriminated._NoEnvelope -{ - public partial class NoEnvelope - { - protected NoEnvelope() => throw null; - - public ClientPipeline Pipeline => throw null; - - public virtual NoEnvelopeDefault GetNoEnvelopeDefaultClient() => throw null; - - public virtual NoEnvelopeCustomDiscriminator GetNoEnvelopeCustomDiscriminatorClient() => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/NoEnvelopeCustomDiscriminator.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/NoEnvelopeCustomDiscriminator.cs deleted file mode 100644 index 547f601e173..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/NoEnvelopeCustomDiscriminator.cs +++ /dev/null @@ -1,35 +0,0 @@ -// - -#nullable disable - -using System; -using System.ClientModel; -using System.ClientModel.Primitives; -using System.Threading; -using System.Threading.Tasks; - -namespace _Type.Union.Discriminated._NoEnvelope -{ - public partial class NoEnvelopeCustomDiscriminator - { - protected NoEnvelopeCustomDiscriminator() => throw null; - - public ClientPipeline Pipeline => throw null; - - public virtual ClientResult Get(string @type, RequestOptions options) => throw null; - - public virtual Task GetAsync(string @type, RequestOptions options) => throw null; - - public virtual ClientResult Get(string @type = default, CancellationToken cancellationToken = default) => throw null; - - public virtual Task> GetAsync(string @type = default, CancellationToken cancellationToken = default) => throw null; - - public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual ClientResult Put(BinaryData input, CancellationToken cancellationToken = default) => throw null; - - public virtual Task> PutAsync(BinaryData input, CancellationToken cancellationToken = default) => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/NoEnvelopeDefault.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/NoEnvelopeDefault.cs deleted file mode 100644 index d4374ad75e4..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/NoEnvelopeDefault.cs +++ /dev/null @@ -1,35 +0,0 @@ -// - -#nullable disable - -using System; -using System.ClientModel; -using System.ClientModel.Primitives; -using System.Threading; -using System.Threading.Tasks; - -namespace _Type.Union.Discriminated._NoEnvelope -{ - public partial class NoEnvelopeDefault - { - protected NoEnvelopeDefault() => throw null; - - public ClientPipeline Pipeline => throw null; - - public virtual ClientResult Get(string kind, RequestOptions options) => throw null; - - public virtual Task GetAsync(string kind, RequestOptions options) => throw null; - - public virtual ClientResult Get(string kind = default, CancellationToken cancellationToken = default) => throw null; - - public virtual Task> GetAsync(string kind = default, CancellationToken cancellationToken = default) => throw null; - - public virtual ClientResult Put(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual Task PutAsync(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual ClientResult Put(BinaryData input, CancellationToken cancellationToken = default) => throw null; - - public virtual Task> PutAsync(BinaryData input, CancellationToken cancellationToken = default) => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/TypeUnionDiscriminatedModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/TypeUnionDiscriminatedModelFactory.cs deleted file mode 100644 index 36687b6bf98..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/TypeUnionDiscriminatedModelFactory.cs +++ /dev/null @@ -1,13 +0,0 @@ -// - -#nullable disable - -namespace _Type.Union.Discriminated -{ - public static partial class TypeUnionDiscriminatedModelFactory - { - public static Cat Cat(string name = default, bool meow = default) => throw null; - - public static Dog Dog(string name = default, bool bark = default) => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Type.Union.Discriminated.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Type.Union.Discriminated.csproj deleted file mode 100644 index 5eaf80b2981..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Type.Union.Discriminated.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - This is the Type.Union.Discriminated client library for developing .NET applications with rich experience. - SDK Code Generation Type.Union.Discriminated - 1.0.0-beta.1 - Type.Union.Discriminated - netstandard2.0;net8.0 - latest - true - - - - - - diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/tspCodeModel.json deleted file mode 100644 index 846dab9a573..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/tspCodeModel.json +++ /dev/null @@ -1,1893 +0,0 @@ -{ - "name": "Type.Union.Discriminated", - "apiVersions": [], - "enums": [], - "constants": [ - { - "$id": "1", - "kind": "constant", - "name": "getContentType", - "namespace": "", - "usage": "None", - "valueType": { - "$id": "2", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "value": "application/json", - "decorators": [] - }, - { - "$id": "3", - "kind": "constant", - "name": "putContentType", - "namespace": "", - "usage": "None", - "valueType": { - "$id": "4", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "value": "application/json", - "decorators": [] - }, - { - "$id": "5", - "kind": "constant", - "name": "putContentType1", - "namespace": "", - "usage": "None", - "valueType": { - "$id": "6", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "value": "application/json", - "decorators": [] - }, - { - "$id": "7", - "kind": "constant", - "name": "getContentType1", - "namespace": "", - "usage": "None", - "valueType": { - "$id": "8", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "value": "application/json", - "decorators": [] - }, - { - "$id": "9", - "kind": "constant", - "name": "putContentType2", - "namespace": "", - "usage": "None", - "valueType": { - "$id": "10", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "value": "application/json", - "decorators": [] - }, - { - "$id": "11", - "kind": "constant", - "name": "putContentType3", - "namespace": "", - "usage": "None", - "valueType": { - "$id": "12", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "value": "application/json", - "decorators": [] - }, - { - "$id": "13", - "kind": "constant", - "name": "getContentType2", - "namespace": "", - "usage": "None", - "valueType": { - "$id": "14", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "value": "application/json", - "decorators": [] - }, - { - "$id": "15", - "kind": "constant", - "name": "putContentType4", - "namespace": "", - "usage": "None", - "valueType": { - "$id": "16", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "value": "application/json", - "decorators": [] - }, - { - "$id": "17", - "kind": "constant", - "name": "putContentType5", - "namespace": "", - "usage": "None", - "valueType": { - "$id": "18", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "value": "application/json", - "decorators": [] - }, - { - "$id": "19", - "kind": "constant", - "name": "getContentType3", - "namespace": "", - "usage": "None", - "valueType": { - "$id": "20", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "value": "application/json", - "decorators": [] - }, - { - "$id": "21", - "kind": "constant", - "name": "putContentType6", - "namespace": "", - "usage": "None", - "valueType": { - "$id": "22", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "value": "application/json", - "decorators": [] - }, - { - "$id": "23", - "kind": "constant", - "name": "putContentType7", - "namespace": "", - "usage": "None", - "valueType": { - "$id": "24", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "value": "application/json", - "decorators": [] - } - ], - "models": [ - { - "$id": "25", - "kind": "model", - "name": "Cat", - "namespace": "Type.Union.Discriminated", - "crossLanguageDefinitionId": "Type.Union.Discriminated.Cat", - "usage": "Input,Output,Json", - "decorators": [], - "serializationOptions": { - "json": { - "name": "Cat" - } - }, - "properties": [ - { - "$id": "26", - "kind": "property", - "name": "name", - "serializedName": "name", - "type": { - "$id": "27", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "optional": false, - "readOnly": false, - "discriminator": false, - "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.Cat.name", - "serializationOptions": { - "json": { - "name": "name" - } - }, - "isHttpMetadata": false - }, - { - "$id": "28", - "kind": "property", - "name": "meow", - "serializedName": "meow", - "type": { - "$id": "29", - "kind": "boolean", - "name": "boolean", - "crossLanguageDefinitionId": "TypeSpec.boolean", - "decorators": [] - }, - "optional": false, - "readOnly": false, - "discriminator": false, - "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.Cat.meow", - "serializationOptions": { - "json": { - "name": "meow" - } - }, - "isHttpMetadata": false - } - ] - }, - { - "$id": "30", - "kind": "model", - "name": "Dog", - "namespace": "Type.Union.Discriminated", - "crossLanguageDefinitionId": "Type.Union.Discriminated.Dog", - "usage": "Input,Output,Json", - "decorators": [], - "serializationOptions": { - "json": { - "name": "Dog" - } - }, - "properties": [ - { - "$id": "31", - "kind": "property", - "name": "name", - "serializedName": "name", - "type": { - "$id": "32", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "optional": false, - "readOnly": false, - "discriminator": false, - "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.Dog.name", - "serializationOptions": { - "json": { - "name": "name" - } - }, - "isHttpMetadata": false - }, - { - "$id": "33", - "kind": "property", - "name": "bark", - "serializedName": "bark", - "type": { - "$id": "34", - "kind": "boolean", - "name": "boolean", - "crossLanguageDefinitionId": "TypeSpec.boolean", - "decorators": [] - }, - "optional": false, - "readOnly": false, - "discriminator": false, - "flatten": false, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.Dog.bark", - "serializationOptions": { - "json": { - "name": "bark" - } - }, - "isHttpMetadata": false - } - ] - } - ], - "clients": [ - { - "$id": "35", - "kind": "client", - "name": "DiscriminatedClient", - "namespace": "Type.Union.Discriminated", - "doc": "Describe scenarios for discriminated unions.", - "methods": [], - "parameters": [ - { - "$id": "36", - "kind": "endpoint", - "name": "endpoint", - "serializedName": "endpoint", - "doc": "Service host", - "type": { - "$id": "37", - "kind": "url", - "name": "endpoint", - "crossLanguageDefinitionId": "TypeSpec.url" - }, - "isApiVersion": false, - "optional": false, - "scope": "Client", - "isEndpoint": true, - "defaultValue": { - "type": { - "$id": "38", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string" - }, - "value": "http://localhost:3000" - }, - "serverUrlTemplate": "{endpoint}", - "skipUrlEncoding": false, - "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.Discriminated.endpoint" - } - ], - "initializedBy": 1, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated", - "apiVersions": [], - "children": [ - { - "$id": "39", - "kind": "client", - "name": "Envelope", - "namespace": "Type.Union.Discriminated.Envelope", - "methods": [], - "parameters": [ - { - "$id": "40", - "kind": "endpoint", - "name": "endpoint", - "serializedName": "endpoint", - "doc": "Service host", - "type": { - "$id": "41", - "kind": "url", - "name": "endpoint", - "crossLanguageDefinitionId": "TypeSpec.url" - }, - "isApiVersion": false, - "optional": false, - "scope": "Client", - "isEndpoint": true, - "defaultValue": { - "type": { - "$id": "42", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string" - }, - "value": "http://localhost:3000" - }, - "serverUrlTemplate": "{endpoint}", - "skipUrlEncoding": false, - "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.endpoint" - } - ], - "initializedBy": 0, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope", - "apiVersions": [], - "parent": { - "$ref": "35" - }, - "children": [ - { - "$id": "43", - "kind": "client", - "name": "Object", - "namespace": "Type.Union.Discriminated.Envelope.Object", - "methods": [], - "parameters": [ - { - "$id": "44", - "kind": "endpoint", - "name": "endpoint", - "serializedName": "endpoint", - "doc": "Service host", - "type": { - "$id": "45", - "kind": "url", - "name": "endpoint", - "crossLanguageDefinitionId": "TypeSpec.url" - }, - "isApiVersion": false, - "optional": false, - "scope": "Client", - "isEndpoint": true, - "defaultValue": { - "type": { - "$id": "46", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string" - }, - "value": "http://localhost:3000" - }, - "serverUrlTemplate": "{endpoint}", - "skipUrlEncoding": false, - "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.endpoint" - } - ], - "initializedBy": 0, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object", - "apiVersions": [], - "parent": { - "$ref": "39" - }, - "children": [ - { - "$id": "47", - "kind": "client", - "name": "Default", - "namespace": "Type.Union.Discriminated.Envelope.Object", - "methods": [ - { - "$id": "48", - "kind": "basic", - "name": "get", - "accessibility": "public", - "apiVersions": [], - "operation": { - "$id": "49", - "name": "get", - "resourceName": "Default", - "accessibility": "public", - "parameters": [ - { - "$id": "50", - "kind": "query", - "name": "kind", - "serializedName": "kind", - "type": { - "$id": "51", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "isApiVersion": false, - "explode": false, - "optional": true, - "scope": "Method", - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.Default.get.kind", - "readOnly": false - }, - { - "$id": "52", - "kind": "header", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "1" - }, - "isApiVersion": false, - "optional": false, - "isContentType": false, - "scope": "Constant", - "readOnly": false, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.Default.get.accept" - } - ], - "responses": [ - { - "statusCodes": [ - 200 - ], - "bodyType": { - "$id": "53", - "kind": "union", - "name": "PetWithEnvelope", - "variantTypes": [ - { - "$ref": "25" - }, - { - "$ref": "30" - } - ], - "namespace": "Type.Union.Discriminated", - "decorators": [] - }, - "headers": [], - "isErrorResponse": false, - "contentTypes": [ - "application/json" - ] - } - ], - "httpMethod": "GET", - "uri": "{endpoint}", - "path": "/type/union/discriminated/envelope/object/default", - "bufferResponse": true, - "generateProtocolMethod": true, - "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.Default.get", - "decorators": [], - "namespace": "Type.Union.Discriminated.Envelope.Object" - }, - "parameters": [ - { - "$id": "54", - "kind": "method", - "name": "kind", - "serializedName": "kind", - "type": { - "$id": "55", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.Default.get.kind", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "56", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "1" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.Default.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] - } - ], - "response": { - "type": { - "$ref": "53" - } - }, - "isOverride": false, - "generateConvenient": true, - "generateProtocol": true, - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.Default.get" - }, - { - "$id": "57", - "kind": "basic", - "name": "put", - "accessibility": "public", - "apiVersions": [], - "operation": { - "$id": "58", - "name": "put", - "resourceName": "Default", - "accessibility": "public", - "parameters": [ - { - "$id": "59", - "kind": "header", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "3" - }, - "isApiVersion": false, - "optional": false, - "isContentType": true, - "scope": "Constant", - "readOnly": false, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.Default.put.contentType" - }, - { - "$id": "60", - "kind": "header", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "5" - }, - "isApiVersion": false, - "optional": false, - "isContentType": false, - "scope": "Constant", - "readOnly": false, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.Default.put.accept" - }, - { - "$id": "61", - "kind": "body", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "53" - }, - "isApiVersion": false, - "contentTypes": [ - "application/json" - ], - "defaultContentType": "application/json", - "optional": false, - "scope": "Method", - "decorators": [], - "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.Default.put.input" - } - ], - "responses": [ - { - "statusCodes": [ - 200 - ], - "bodyType": { - "$ref": "53" - }, - "headers": [], - "isErrorResponse": false, - "contentTypes": [ - "application/json" - ] - } - ], - "httpMethod": "PUT", - "uri": "{endpoint}", - "path": "/type/union/discriminated/envelope/object/default", - "requestMediaTypes": [ - "application/json" - ], - "bufferResponse": true, - "generateProtocolMethod": true, - "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.Default.put", - "decorators": [], - "namespace": "Type.Union.Discriminated.Envelope.Object" - }, - "parameters": [ - { - "$id": "62", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "53" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.Default.put.input", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "63", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "3" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.Default.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "64", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.Default.put.accept", - "readOnly": false, - "access": "public", - "decorators": [] - } - ], - "response": { - "type": { - "$ref": "53" - } - }, - "isOverride": false, - "generateConvenient": true, - "generateProtocol": true, - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.Default.put" - } - ], - "parameters": [ - { - "$id": "65", - "kind": "endpoint", - "name": "endpoint", - "serializedName": "endpoint", - "doc": "Service host", - "type": { - "$id": "66", - "kind": "url", - "name": "endpoint", - "crossLanguageDefinitionId": "TypeSpec.url" - }, - "isApiVersion": false, - "optional": false, - "scope": "Client", - "isEndpoint": true, - "defaultValue": { - "type": { - "$id": "67", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string" - }, - "value": "http://localhost:3000" - }, - "serverUrlTemplate": "{endpoint}", - "skipUrlEncoding": false, - "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.Default.endpoint" - } - ], - "initializedBy": 0, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.Default", - "apiVersions": [], - "parent": { - "$ref": "43" - }, - "isMultiServiceClient": false - }, - { - "$id": "68", - "kind": "client", - "name": "CustomProperties", - "namespace": "Type.Union.Discriminated.Envelope.Object", - "methods": [ - { - "$id": "69", - "kind": "basic", - "name": "get", - "accessibility": "public", - "apiVersions": [], - "operation": { - "$id": "70", - "name": "get", - "resourceName": "CustomProperties", - "accessibility": "public", - "parameters": [ - { - "$id": "71", - "kind": "query", - "name": "petType", - "serializedName": "petType", - "type": { - "$id": "72", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "isApiVersion": false, - "explode": false, - "optional": true, - "scope": "Method", - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.CustomProperties.get.petType", - "readOnly": false - }, - { - "$id": "73", - "kind": "header", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "7" - }, - "isApiVersion": false, - "optional": false, - "isContentType": false, - "scope": "Constant", - "readOnly": false, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.CustomProperties.get.accept" - } - ], - "responses": [ - { - "statusCodes": [ - 200 - ], - "bodyType": { - "$id": "74", - "kind": "union", - "name": "PetWithCustomNames", - "variantTypes": [ - { - "$ref": "25" - }, - { - "$ref": "30" - } - ], - "namespace": "Type.Union.Discriminated", - "decorators": [] - }, - "headers": [], - "isErrorResponse": false, - "contentTypes": [ - "application/json" - ] - } - ], - "httpMethod": "GET", - "uri": "{endpoint}", - "path": "/type/union/discriminated/envelope/object/custom-properties", - "bufferResponse": true, - "generateProtocolMethod": true, - "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.CustomProperties.get", - "decorators": [], - "namespace": "Type.Union.Discriminated.Envelope.Object" - }, - "parameters": [ - { - "$id": "75", - "kind": "method", - "name": "petType", - "serializedName": "petType", - "type": { - "$id": "76", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.CustomProperties.get.petType", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "77", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.CustomProperties.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] - } - ], - "response": { - "type": { - "$ref": "74" - } - }, - "isOverride": false, - "generateConvenient": true, - "generateProtocol": true, - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.CustomProperties.get" - }, - { - "$id": "78", - "kind": "basic", - "name": "put", - "accessibility": "public", - "apiVersions": [], - "operation": { - "$id": "79", - "name": "put", - "resourceName": "CustomProperties", - "accessibility": "public", - "parameters": [ - { - "$id": "80", - "kind": "header", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "9" - }, - "isApiVersion": false, - "optional": false, - "isContentType": true, - "scope": "Constant", - "readOnly": false, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.CustomProperties.put.contentType" - }, - { - "$id": "81", - "kind": "header", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "11" - }, - "isApiVersion": false, - "optional": false, - "isContentType": false, - "scope": "Constant", - "readOnly": false, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.CustomProperties.put.accept" - }, - { - "$id": "82", - "kind": "body", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "74" - }, - "isApiVersion": false, - "contentTypes": [ - "application/json" - ], - "defaultContentType": "application/json", - "optional": false, - "scope": "Method", - "decorators": [], - "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.CustomProperties.put.input" - } - ], - "responses": [ - { - "statusCodes": [ - 200 - ], - "bodyType": { - "$ref": "74" - }, - "headers": [], - "isErrorResponse": false, - "contentTypes": [ - "application/json" - ] - } - ], - "httpMethod": "PUT", - "uri": "{endpoint}", - "path": "/type/union/discriminated/envelope/object/custom-properties", - "requestMediaTypes": [ - "application/json" - ], - "bufferResponse": true, - "generateProtocolMethod": true, - "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.CustomProperties.put", - "decorators": [], - "namespace": "Type.Union.Discriminated.Envelope.Object" - }, - "parameters": [ - { - "$id": "83", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "74" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.CustomProperties.put.input", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "84", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.CustomProperties.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "85", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.CustomProperties.put.accept", - "readOnly": false, - "access": "public", - "decorators": [] - } - ], - "response": { - "type": { - "$ref": "74" - } - }, - "isOverride": false, - "generateConvenient": true, - "generateProtocol": true, - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.CustomProperties.put" - } - ], - "parameters": [ - { - "$id": "86", - "kind": "endpoint", - "name": "endpoint", - "serializedName": "endpoint", - "doc": "Service host", - "type": { - "$id": "87", - "kind": "url", - "name": "endpoint", - "crossLanguageDefinitionId": "TypeSpec.url" - }, - "isApiVersion": false, - "optional": false, - "scope": "Client", - "isEndpoint": true, - "defaultValue": { - "type": { - "$id": "88", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string" - }, - "value": "http://localhost:3000" - }, - "serverUrlTemplate": "{endpoint}", - "skipUrlEncoding": false, - "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.CustomProperties.endpoint" - } - ], - "initializedBy": 0, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.Envelope.Object.CustomProperties", - "apiVersions": [], - "parent": { - "$ref": "43" - }, - "isMultiServiceClient": false - } - ], - "isMultiServiceClient": false - } - ], - "isMultiServiceClient": false - }, - { - "$id": "89", - "kind": "client", - "name": "NoEnvelope", - "namespace": "Type.Union.Discriminated.NoEnvelope", - "methods": [], - "parameters": [ - { - "$id": "90", - "kind": "endpoint", - "name": "endpoint", - "serializedName": "endpoint", - "doc": "Service host", - "type": { - "$id": "91", - "kind": "url", - "name": "endpoint", - "crossLanguageDefinitionId": "TypeSpec.url" - }, - "isApiVersion": false, - "optional": false, - "scope": "Client", - "isEndpoint": true, - "defaultValue": { - "type": { - "$id": "92", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string" - }, - "value": "http://localhost:3000" - }, - "serverUrlTemplate": "{endpoint}", - "skipUrlEncoding": false, - "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.endpoint" - } - ], - "initializedBy": 0, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope", - "apiVersions": [], - "parent": { - "$ref": "35" - }, - "children": [ - { - "$id": "93", - "kind": "client", - "name": "Default", - "namespace": "Type.Union.Discriminated.NoEnvelope", - "methods": [ - { - "$id": "94", - "kind": "basic", - "name": "get", - "accessibility": "public", - "apiVersions": [], - "operation": { - "$id": "95", - "name": "get", - "resourceName": "Default", - "accessibility": "public", - "parameters": [ - { - "$id": "96", - "kind": "query", - "name": "kind", - "serializedName": "kind", - "type": { - "$id": "97", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "isApiVersion": false, - "explode": false, - "optional": true, - "scope": "Method", - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.Default.get.kind", - "readOnly": false - }, - { - "$id": "98", - "kind": "header", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "13" - }, - "isApiVersion": false, - "optional": false, - "isContentType": false, - "scope": "Constant", - "readOnly": false, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.Default.get.accept" - } - ], - "responses": [ - { - "statusCodes": [ - 200 - ], - "bodyType": { - "$id": "99", - "kind": "union", - "name": "PetInline", - "variantTypes": [ - { - "$ref": "25" - }, - { - "$ref": "30" - } - ], - "namespace": "Type.Union.Discriminated", - "decorators": [] - }, - "headers": [], - "isErrorResponse": false, - "contentTypes": [ - "application/json" - ] - } - ], - "httpMethod": "GET", - "uri": "{endpoint}", - "path": "/type/union/discriminated/no-envelope/default", - "bufferResponse": true, - "generateProtocolMethod": true, - "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.Default.get", - "decorators": [], - "namespace": "Type.Union.Discriminated.NoEnvelope" - }, - "parameters": [ - { - "$id": "100", - "kind": "method", - "name": "kind", - "serializedName": "kind", - "type": { - "$id": "101", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.Default.get.kind", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "102", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.Default.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] - } - ], - "response": { - "type": { - "$ref": "99" - } - }, - "isOverride": false, - "generateConvenient": true, - "generateProtocol": true, - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.Default.get" - }, - { - "$id": "103", - "kind": "basic", - "name": "put", - "accessibility": "public", - "apiVersions": [], - "operation": { - "$id": "104", - "name": "put", - "resourceName": "Default", - "accessibility": "public", - "parameters": [ - { - "$id": "105", - "kind": "header", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "15" - }, - "isApiVersion": false, - "optional": false, - "isContentType": true, - "scope": "Constant", - "readOnly": false, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.Default.put.contentType" - }, - { - "$id": "106", - "kind": "header", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "17" - }, - "isApiVersion": false, - "optional": false, - "isContentType": false, - "scope": "Constant", - "readOnly": false, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.Default.put.accept" - }, - { - "$id": "107", - "kind": "body", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "99" - }, - "isApiVersion": false, - "contentTypes": [ - "application/json" - ], - "defaultContentType": "application/json", - "optional": false, - "scope": "Method", - "decorators": [], - "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.Default.put.input" - } - ], - "responses": [ - { - "statusCodes": [ - 200 - ], - "bodyType": { - "$ref": "99" - }, - "headers": [], - "isErrorResponse": false, - "contentTypes": [ - "application/json" - ] - } - ], - "httpMethod": "PUT", - "uri": "{endpoint}", - "path": "/type/union/discriminated/no-envelope/default", - "requestMediaTypes": [ - "application/json" - ], - "bufferResponse": true, - "generateProtocolMethod": true, - "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.Default.put", - "decorators": [], - "namespace": "Type.Union.Discriminated.NoEnvelope" - }, - "parameters": [ - { - "$id": "108", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "99" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.Default.put.input", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "109", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.Default.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "110", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "17" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.Default.put.accept", - "readOnly": false, - "access": "public", - "decorators": [] - } - ], - "response": { - "type": { - "$ref": "99" - } - }, - "isOverride": false, - "generateConvenient": true, - "generateProtocol": true, - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.Default.put" - } - ], - "parameters": [ - { - "$id": "111", - "kind": "endpoint", - "name": "endpoint", - "serializedName": "endpoint", - "doc": "Service host", - "type": { - "$id": "112", - "kind": "url", - "name": "endpoint", - "crossLanguageDefinitionId": "TypeSpec.url" - }, - "isApiVersion": false, - "optional": false, - "scope": "Client", - "isEndpoint": true, - "defaultValue": { - "type": { - "$id": "113", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string" - }, - "value": "http://localhost:3000" - }, - "serverUrlTemplate": "{endpoint}", - "skipUrlEncoding": false, - "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.Default.endpoint" - } - ], - "initializedBy": 0, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.Default", - "apiVersions": [], - "parent": { - "$ref": "89" - }, - "isMultiServiceClient": false - }, - { - "$id": "114", - "kind": "client", - "name": "CustomDiscriminator", - "namespace": "Type.Union.Discriminated.NoEnvelope", - "methods": [ - { - "$id": "115", - "kind": "basic", - "name": "get", - "accessibility": "public", - "apiVersions": [], - "operation": { - "$id": "116", - "name": "get", - "resourceName": "CustomDiscriminator", - "accessibility": "public", - "parameters": [ - { - "$id": "117", - "kind": "query", - "name": "type", - "serializedName": "type", - "type": { - "$id": "118", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "isApiVersion": false, - "explode": false, - "optional": true, - "scope": "Method", - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.get.type", - "readOnly": false - }, - { - "$id": "119", - "kind": "header", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "19" - }, - "isApiVersion": false, - "optional": false, - "isContentType": false, - "scope": "Constant", - "readOnly": false, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.get.accept" - } - ], - "responses": [ - { - "statusCodes": [ - 200 - ], - "bodyType": { - "$id": "120", - "kind": "union", - "name": "PetInlineWithCustomDiscriminator", - "variantTypes": [ - { - "$ref": "25" - }, - { - "$ref": "30" - } - ], - "namespace": "Type.Union.Discriminated", - "decorators": [] - }, - "headers": [], - "isErrorResponse": false, - "contentTypes": [ - "application/json" - ] - } - ], - "httpMethod": "GET", - "uri": "{endpoint}", - "path": "/type/union/discriminated/no-envelope/custom-discriminator", - "bufferResponse": true, - "generateProtocolMethod": true, - "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.get", - "decorators": [], - "namespace": "Type.Union.Discriminated.NoEnvelope" - }, - "parameters": [ - { - "$id": "121", - "kind": "method", - "name": "type", - "serializedName": "type", - "type": { - "$id": "122", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.get.type", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "123", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "19" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] - } - ], - "response": { - "type": { - "$ref": "120" - } - }, - "isOverride": false, - "generateConvenient": true, - "generateProtocol": true, - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.get" - }, - { - "$id": "124", - "kind": "basic", - "name": "put", - "accessibility": "public", - "apiVersions": [], - "operation": { - "$id": "125", - "name": "put", - "resourceName": "CustomDiscriminator", - "accessibility": "public", - "parameters": [ - { - "$id": "126", - "kind": "header", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "21" - }, - "isApiVersion": false, - "optional": false, - "isContentType": true, - "scope": "Constant", - "readOnly": false, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put.contentType" - }, - { - "$id": "127", - "kind": "header", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "23" - }, - "isApiVersion": false, - "optional": false, - "isContentType": false, - "scope": "Constant", - "readOnly": false, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put.accept" - }, - { - "$id": "128", - "kind": "body", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "120" - }, - "isApiVersion": false, - "contentTypes": [ - "application/json" - ], - "defaultContentType": "application/json", - "optional": false, - "scope": "Method", - "decorators": [], - "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put.input" - } - ], - "responses": [ - { - "statusCodes": [ - 200 - ], - "bodyType": { - "$ref": "120" - }, - "headers": [], - "isErrorResponse": false, - "contentTypes": [ - "application/json" - ] - } - ], - "httpMethod": "PUT", - "uri": "{endpoint}", - "path": "/type/union/discriminated/no-envelope/custom-discriminator", - "requestMediaTypes": [ - "application/json" - ], - "bufferResponse": true, - "generateProtocolMethod": true, - "generateConvenienceMethod": true, - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put", - "decorators": [], - "namespace": "Type.Union.Discriminated.NoEnvelope" - }, - "parameters": [ - { - "$id": "129", - "kind": "method", - "name": "input", - "serializedName": "input", - "type": { - "$ref": "120" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put.input", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "130", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "21" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put.contentType", - "readOnly": false, - "access": "public", - "decorators": [] - }, - { - "$id": "131", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "23" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put.accept", - "readOnly": false, - "access": "public", - "decorators": [] - } - ], - "response": { - "type": { - "$ref": "120" - } - }, - "isOverride": false, - "generateConvenient": true, - "generateProtocol": true, - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put" - } - ], - "parameters": [ - { - "$id": "132", - "kind": "endpoint", - "name": "endpoint", - "serializedName": "endpoint", - "doc": "Service host", - "type": { - "$id": "133", - "kind": "url", - "name": "endpoint", - "crossLanguageDefinitionId": "TypeSpec.url" - }, - "isApiVersion": false, - "optional": false, - "scope": "Client", - "isEndpoint": true, - "defaultValue": { - "type": { - "$id": "134", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string" - }, - "value": "http://localhost:3000" - }, - "serverUrlTemplate": "{endpoint}", - "skipUrlEncoding": false, - "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.endpoint" - } - ], - "initializedBy": 0, - "decorators": [], - "crossLanguageDefinitionId": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator", - "apiVersions": [], - "parent": { - "$ref": "89" - }, - "isMultiServiceClient": false - } - ], - "isMultiServiceClient": false - } - ], - "isMultiServiceClient": false - } - ] -} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/EnumsOnly.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/EnumsOnly.cs index 5ea24aef091..326e87184ee 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/EnumsOnly.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/EnumsOnly.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class EnumsOnly { protected EnumsOnly() => throw null; + internal EnumsOnly(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/FloatsOnly.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/FloatsOnly.cs index 6165e15eb36..687ca26b9d4 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/FloatsOnly.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/FloatsOnly.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class FloatsOnly { protected FloatsOnly() => throw null; + internal FloatsOnly(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/IntsOnly.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/IntsOnly.cs index abb9c25fba4..d9e64843d11 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/IntsOnly.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/IntsOnly.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class IntsOnly { protected IntsOnly() => throw null; + internal IntsOnly(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/MixedLiterals.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/MixedLiterals.cs index dc60eb0f3ab..7ee7a6ee49c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/MixedLiterals.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/MixedLiterals.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class MixedLiterals { protected MixedLiterals() => throw null; + internal MixedLiterals(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/MixedTypes.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/MixedTypes.cs index 72608045240..b7ae1cff2e4 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/MixedTypes.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/MixedTypes.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class MixedTypes { protected MixedTypes() => throw null; + internal MixedTypes(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/Cat.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/Cat.Serialization.cs index 70aebc2b7ba..376f80256c6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/Cat.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/Cat.Serialization.cs @@ -12,22 +12,22 @@ public partial class Cat : IJsonModel { internal Cat() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual Cat PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Cat IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual Cat JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Cat IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Cat IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual Cat PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Cat IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual Cat JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/Dog.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/Dog.Serialization.cs index 3d697fb32e3..1391a71d84b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/Dog.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/Dog.Serialization.cs @@ -12,22 +12,22 @@ public partial class Dog : IJsonModel { internal Dog() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual Dog PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - Dog IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual Dog JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + Dog IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - Dog IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual Dog PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + Dog IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual Dog JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/EnumsOnlyCases.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/EnumsOnlyCases.Serialization.cs index 95f7bd4f26d..ff9d24c1364 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/EnumsOnlyCases.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/EnumsOnlyCases.Serialization.cs @@ -12,22 +12,22 @@ public partial class EnumsOnlyCases : IJsonModel { internal EnumsOnlyCases() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual EnumsOnlyCases PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - EnumsOnlyCases IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual EnumsOnlyCases JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + EnumsOnlyCases IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - EnumsOnlyCases IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual EnumsOnlyCases PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + EnumsOnlyCases IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual EnumsOnlyCases JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse.Serialization.cs index 47a7a8b6ad8..9d2744ca516 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse.Serialization.cs @@ -13,24 +13,24 @@ public partial class GetResponse : IJsonModel { internal GetResponse() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - GetResponse IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual GetResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - GetResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator GetResponse(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + GetResponse IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual GetResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse1.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse1.Serialization.cs index 29e918815f4..a8892f65c6f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse1.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse1.Serialization.cs @@ -13,24 +13,24 @@ public partial class GetResponse1 : IJsonModel { internal GetResponse1() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - GetResponse1 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual GetResponse1 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse1 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - GetResponse1 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse1 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator GetResponse1(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + GetResponse1 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual GetResponse1 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse2.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse2.Serialization.cs index 658737ebefd..95f5cd6f4f6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse2.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse2.Serialization.cs @@ -13,24 +13,24 @@ public partial class GetResponse2 : IJsonModel { internal GetResponse2() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - GetResponse2 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual GetResponse2 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse2 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - GetResponse2 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse2 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator GetResponse2(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + GetResponse2 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual GetResponse2 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse3.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse3.Serialization.cs index 8752f54d663..9b5d45f0680 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse3.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse3.Serialization.cs @@ -13,24 +13,24 @@ public partial class GetResponse3 : IJsonModel { internal GetResponse3() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - GetResponse3 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual GetResponse3 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse3 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - GetResponse3 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse3 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator GetResponse3(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + GetResponse3 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual GetResponse3 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse4.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse4.Serialization.cs index 148f20583fe..e33960ba0be 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse4.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse4.Serialization.cs @@ -13,24 +13,24 @@ public partial class GetResponse4 : IJsonModel { internal GetResponse4() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - GetResponse4 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual GetResponse4 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse4 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - GetResponse4 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse4 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator GetResponse4(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + GetResponse4 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual GetResponse4 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse5.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse5.Serialization.cs index 31328738dbf..9ef18e2e1e0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse5.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse5.Serialization.cs @@ -13,24 +13,24 @@ public partial class GetResponse5 : IJsonModel { internal GetResponse5() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - GetResponse5 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual GetResponse5 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse5 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - GetResponse5 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse5 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator GetResponse5(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + GetResponse5 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual GetResponse5 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse6.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse6.Serialization.cs index 64acb026c18..d8d40f051ac 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse6.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse6.Serialization.cs @@ -13,24 +13,24 @@ public partial class GetResponse6 : IJsonModel { internal GetResponse6() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - GetResponse6 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual GetResponse6 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse6 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - GetResponse6 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse6 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator GetResponse6(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + GetResponse6 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual GetResponse6 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse7.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse7.Serialization.cs index 4ac51ee1a1e..7fef9678a03 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse7.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse7.Serialization.cs @@ -13,24 +13,24 @@ public partial class GetResponse7 : IJsonModel { internal GetResponse7() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - GetResponse7 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual GetResponse7 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse7 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - GetResponse7 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse7 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator GetResponse7(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + GetResponse7 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual GetResponse7 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse8.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse8.Serialization.cs index 0cacdba0f72..85c826e7d9e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse8.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse8.Serialization.cs @@ -13,24 +13,24 @@ public partial class GetResponse8 : IJsonModel { internal GetResponse8() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - GetResponse8 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual GetResponse8 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse8 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - GetResponse8 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse8 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator GetResponse8(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + GetResponse8 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual GetResponse8 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse9.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse9.Serialization.cs index bf542bba52f..c6c7a43fdf1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse9.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/GetResponse9.Serialization.cs @@ -13,24 +13,24 @@ public partial class GetResponse9 : IJsonModel { internal GetResponse9() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - GetResponse9 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual GetResponse9 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse9 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - GetResponse9 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual GetResponse9 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static explicit operator GetResponse9(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + GetResponse9 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual GetResponse9 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/MixedLiteralsCases.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/MixedLiteralsCases.Serialization.cs index 155b5c328ad..8115f8b6175 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/MixedLiteralsCases.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/MixedLiteralsCases.Serialization.cs @@ -12,22 +12,22 @@ public partial class MixedLiteralsCases : IJsonModel { internal MixedLiteralsCases() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual MixedLiteralsCases PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - MixedLiteralsCases IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual MixedLiteralsCases JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + MixedLiteralsCases IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - MixedLiteralsCases IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual MixedLiteralsCases PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + MixedLiteralsCases IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual MixedLiteralsCases JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/MixedTypesCases.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/MixedTypesCases.Serialization.cs index f97a36e196d..f2ffbc26a5b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/MixedTypesCases.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/MixedTypesCases.Serialization.cs @@ -12,22 +12,22 @@ public partial class MixedTypesCases : IJsonModel { internal MixedTypesCases() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual MixedTypesCases PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - MixedTypesCases IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual MixedTypesCases JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + MixedTypesCases IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - MixedTypesCases IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual MixedTypesCases PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + MixedTypesCases IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual MixedTypesCases JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/StringAndArrayCases.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/StringAndArrayCases.Serialization.cs index 0069a78020c..cfe41e6c340 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/StringAndArrayCases.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/StringAndArrayCases.Serialization.cs @@ -12,22 +12,22 @@ public partial class StringAndArrayCases : IJsonModel { internal StringAndArrayCases() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual StringAndArrayCases PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - StringAndArrayCases IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual StringAndArrayCases JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + StringAndArrayCases IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - StringAndArrayCases IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - protected virtual StringAndArrayCases PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; + StringAndArrayCases IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; + protected virtual StringAndArrayCases JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/ModelsOnly.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/ModelsOnly.cs index 9d638303f32..ebb37812dc0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/ModelsOnly.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/ModelsOnly.cs @@ -14,6 +14,8 @@ public partial class ModelsOnly { protected ModelsOnly() => throw null; + internal ModelsOnly(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/StringAndArray.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/StringAndArray.cs index 914985be3eb..0a470dd358d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/StringAndArray.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/StringAndArray.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class StringAndArray { protected StringAndArray() => throw null; + internal StringAndArray(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/StringExtensible.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/StringExtensible.cs index 04035a679a9..c6d886ad068 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/StringExtensible.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/StringExtensible.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class StringExtensible { protected StringExtensible() => throw null; + internal StringExtensible(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/StringExtensibleNamed.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/StringExtensibleNamed.cs index e4299a80a88..85a4d399263 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/StringExtensibleNamed.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/StringExtensibleNamed.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class StringExtensibleNamed { protected StringExtensibleNamed() => throw null; + internal StringExtensibleNamed(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/StringsOnly.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/StringsOnly.cs index e94cb73e42f..fb8ec122f24 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/StringsOnly.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/StringsOnly.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class StringsOnly { protected StringsOnly() => throw null; + internal StringsOnly(ClientPipeline pipeline, Uri endpoint) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult Get(RequestOptions options) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/UnionClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/UnionClient.cs index d8169c7677e..48df18bf7cc 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/UnionClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/UnionClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; namespace _Type.Union { @@ -11,7 +12,12 @@ public partial class UnionClient { public UnionClient() : this(new Uri("http://localhost:3000"), new UnionClientOptions()) => throw null; - public UnionClient(Uri endpoint, UnionClientOptions options) => throw null; + internal UnionClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, UnionClientOptions options) => throw null; + + public UnionClient(Uri endpoint, UnionClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public UnionClient(UnionClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/UnionClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/UnionClientOptions.cs index e5f6e387e74..9352bd0c9c3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/UnionClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/UnionClientOptions.cs @@ -3,10 +3,16 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace _Type.Union { public partial class UnionClientOptions : ClientPipelineOptions { + public UnionClientOptions() => throw null; + + [Experimental("SCME0002")] + internal UnionClientOptions(IConfigurationSection section) : base(section) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/UnionClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/UnionClientSettings.cs new file mode 100644 index 00000000000..71defed8463 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/UnionClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace _Type.Union +{ + [Experimental("SCME0002")] + public partial class UnionClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public UnionClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..370dae5b9f1 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "UnionClient": { + "type": "object", + "description": "Configuration for UnionClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/unionClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "unionClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Type.Union.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Type.Union.csproj index f429a3e55fe..200bd190b8b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Type.Union.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Type.Union.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/tspCodeModel.json index 2f02bc4094c..2c21b31efe3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/tspCodeModel.json @@ -394,7 +394,7 @@ { "$id": "34", "kind": "constant", - "name": "MixedLiteralsCasesStringLiteral1", + "name": "GetResponseProp5", "namespace": "", "usage": "None", "valueType": { @@ -410,7 +410,7 @@ { "$id": "36", "kind": "constant", - "name": "MixedLiteralsCasesStringLiteral2", + "name": "GetResponseProp6", "namespace": "", "usage": "None", "valueType": { @@ -426,7 +426,7 @@ { "$id": "38", "kind": "constant", - "name": "MixedLiteralsCasesStringLiteral3", + "name": "GetResponseProp7", "namespace": "", "usage": "None", "valueType": { @@ -442,7 +442,7 @@ { "$id": "40", "kind": "constant", - "name": "MixedLiteralsCasesStringLiteral4", + "name": "MixedLiteralsCasesStringLiteral1", "namespace": "", "usage": "None", "valueType": { @@ -458,7 +458,7 @@ { "$id": "42", "kind": "constant", - "name": "MixedLiteralsCasesStringLiteral11", + "name": "GetResponseProp51", "namespace": "", "usage": "None", "valueType": { @@ -2150,7 +2150,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.StringsOnly.get.accept" + "crossLanguageDefinitionId": "Type.Union.StringsOnly.get.accept", + "methodParameterSegments": [ + { + "$id": "167", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "44" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.StringsOnly.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2180,21 +2199,7 @@ }, "parameters": [ { - "$id": "167", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "44" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.StringsOnly.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "167" } ], "response": { @@ -2234,10 +2239,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.StringsOnly.send.contentType" + "crossLanguageDefinitionId": "Type.Union.StringsOnly.send.contentType", + "methodParameterSegments": [ + { + "$id": "171", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "46" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.StringsOnly.send.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "171", + "$id": "172", "kind": "body", "name": "sendRequest", "serializedName": "sendRequest", @@ -2253,7 +2278,26 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.StringsOnly.send.body" + "crossLanguageDefinitionId": "Type.Union.StringsOnly.send.body", + "methodParameterSegments": [ + { + "$id": "173", + "kind": "method", + "name": "prop", + "serializedName": "prop", + "type": { + "$ref": "1" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Union.StringsOnly.send.prop", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2280,39 +2324,10 @@ }, "parameters": [ { - "$id": "172", - "kind": "method", - "name": "prop", - "serializedName": "prop", - "type": { - "$ref": "1" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Union.StringsOnly.send.prop", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "173" }, { - "$id": "173", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "46" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.StringsOnly.send.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "171" } ], "response": {}, @@ -2396,7 +2411,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.StringExtensible.get.accept" + "crossLanguageDefinitionId": "Type.Union.StringExtensible.get.accept", + "methodParameterSegments": [ + { + "$id": "181", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "48" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.StringExtensible.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2426,21 +2460,7 @@ }, "parameters": [ { - "$id": "181", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "48" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.StringExtensible.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "181" } ], "response": { @@ -2480,10 +2500,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.StringExtensible.send.contentType" + "crossLanguageDefinitionId": "Type.Union.StringExtensible.send.contentType", + "methodParameterSegments": [ + { + "$id": "185", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "50" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.StringExtensible.send.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "185", + "$id": "186", "kind": "body", "name": "sendRequest1", "serializedName": "sendRequest1", @@ -2499,7 +2539,26 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.StringExtensible.send.body" + "crossLanguageDefinitionId": "Type.Union.StringExtensible.send.body", + "methodParameterSegments": [ + { + "$id": "187", + "kind": "method", + "name": "prop", + "serializedName": "prop", + "type": { + "$ref": "6" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Union.StringExtensible.send.prop", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2526,39 +2585,10 @@ }, "parameters": [ { - "$id": "186", - "kind": "method", - "name": "prop", - "serializedName": "prop", - "type": { - "$ref": "6" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Union.StringExtensible.send.prop", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "187" }, { - "$id": "187", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "50" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.StringExtensible.send.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "185" } ], "response": {}, @@ -2642,7 +2672,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.StringExtensibleNamed.get.accept" + "crossLanguageDefinitionId": "Type.Union.StringExtensibleNamed.get.accept", + "methodParameterSegments": [ + { + "$id": "195", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "52" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.StringExtensibleNamed.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2672,21 +2721,7 @@ }, "parameters": [ { - "$id": "195", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "52" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.StringExtensibleNamed.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "195" } ], "response": { @@ -2726,10 +2761,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.StringExtensibleNamed.send.contentType" + "crossLanguageDefinitionId": "Type.Union.StringExtensibleNamed.send.contentType", + "methodParameterSegments": [ + { + "$id": "199", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "54" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.StringExtensibleNamed.send.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "199", + "$id": "200", "kind": "body", "name": "sendRequest2", "serializedName": "sendRequest2", @@ -2745,7 +2800,26 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.StringExtensibleNamed.send.body" + "crossLanguageDefinitionId": "Type.Union.StringExtensibleNamed.send.body", + "methodParameterSegments": [ + { + "$id": "201", + "kind": "method", + "name": "prop", + "serializedName": "prop", + "type": { + "$ref": "10" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Union.StringExtensibleNamed.send.prop", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2772,39 +2846,10 @@ }, "parameters": [ { - "$id": "200", - "kind": "method", - "name": "prop", - "serializedName": "prop", - "type": { - "$ref": "10" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Union.StringExtensibleNamed.send.prop", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "201" }, { - "$id": "201", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "54" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.StringExtensibleNamed.send.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "199" } ], "response": {}, @@ -2888,7 +2933,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.IntsOnly.get.accept" + "crossLanguageDefinitionId": "Type.Union.IntsOnly.get.accept", + "methodParameterSegments": [ + { + "$id": "209", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "56" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.IntsOnly.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -2918,21 +2982,7 @@ }, "parameters": [ { - "$id": "209", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "56" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.IntsOnly.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "209" } ], "response": { @@ -2972,10 +3022,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.IntsOnly.send.contentType" + "crossLanguageDefinitionId": "Type.Union.IntsOnly.send.contentType", + "methodParameterSegments": [ + { + "$id": "213", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "58" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.IntsOnly.send.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "213", + "$id": "214", "kind": "body", "name": "sendRequest3", "serializedName": "sendRequest3", @@ -2991,7 +3061,26 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.IntsOnly.send.body" + "crossLanguageDefinitionId": "Type.Union.IntsOnly.send.body", + "methodParameterSegments": [ + { + "$id": "215", + "kind": "method", + "name": "prop", + "serializedName": "prop", + "type": { + "$ref": "14" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Union.IntsOnly.send.prop", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3018,39 +3107,10 @@ }, "parameters": [ { - "$id": "214", - "kind": "method", - "name": "prop", - "serializedName": "prop", - "type": { - "$ref": "14" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Union.IntsOnly.send.prop", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "215" }, { - "$id": "215", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "58" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.IntsOnly.send.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "213" } ], "response": {}, @@ -3134,7 +3194,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.FloatsOnly.get.accept" + "crossLanguageDefinitionId": "Type.Union.FloatsOnly.get.accept", + "methodParameterSegments": [ + { + "$id": "223", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "60" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.FloatsOnly.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3164,21 +3243,7 @@ }, "parameters": [ { - "$id": "223", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "60" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.FloatsOnly.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "223" } ], "response": { @@ -3218,10 +3283,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.FloatsOnly.send.contentType" + "crossLanguageDefinitionId": "Type.Union.FloatsOnly.send.contentType", + "methodParameterSegments": [ + { + "$id": "227", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "62" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.FloatsOnly.send.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "227", + "$id": "228", "kind": "body", "name": "sendRequest4", "serializedName": "sendRequest4", @@ -3237,7 +3322,26 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.FloatsOnly.send.body" + "crossLanguageDefinitionId": "Type.Union.FloatsOnly.send.body", + "methodParameterSegments": [ + { + "$id": "229", + "kind": "method", + "name": "prop", + "serializedName": "prop", + "type": { + "$ref": "19" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Union.FloatsOnly.send.prop", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3264,39 +3368,10 @@ }, "parameters": [ { - "$id": "228", - "kind": "method", - "name": "prop", - "serializedName": "prop", - "type": { - "$ref": "19" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Union.FloatsOnly.send.prop", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "229" }, { - "$id": "229", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "62" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.FloatsOnly.send.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "227" } ], "response": {}, @@ -3380,7 +3455,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.ModelsOnly.get.accept" + "crossLanguageDefinitionId": "Type.Union.ModelsOnly.get.accept", + "methodParameterSegments": [ + { + "$id": "237", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "64" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.ModelsOnly.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3410,21 +3504,7 @@ }, "parameters": [ { - "$id": "237", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "64" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.ModelsOnly.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "237" } ], "response": { @@ -3464,10 +3544,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.ModelsOnly.send.contentType" + "crossLanguageDefinitionId": "Type.Union.ModelsOnly.send.contentType", + "methodParameterSegments": [ + { + "$id": "241", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "66" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.ModelsOnly.send.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "241", + "$id": "242", "kind": "body", "name": "sendRequest5", "serializedName": "sendRequest5", @@ -3483,7 +3583,26 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.ModelsOnly.send.body" + "crossLanguageDefinitionId": "Type.Union.ModelsOnly.send.body", + "methodParameterSegments": [ + { + "$id": "243", + "kind": "method", + "name": "prop", + "serializedName": "prop", + "type": { + "$ref": "106" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Union.ModelsOnly.send.prop", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3510,39 +3629,10 @@ }, "parameters": [ { - "$id": "242", - "kind": "method", - "name": "prop", - "serializedName": "prop", - "type": { - "$ref": "106" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Union.ModelsOnly.send.prop", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "243" }, { - "$id": "243", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "66" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.ModelsOnly.send.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "241" } ], "response": {}, @@ -3626,7 +3716,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.EnumsOnly.get.accept" + "crossLanguageDefinitionId": "Type.Union.EnumsOnly.get.accept", + "methodParameterSegments": [ + { + "$id": "251", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "68" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.EnumsOnly.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3656,21 +3765,7 @@ }, "parameters": [ { - "$id": "251", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "68" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.EnumsOnly.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "251" } ], "response": { @@ -3710,10 +3805,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.EnumsOnly.send.contentType" + "crossLanguageDefinitionId": "Type.Union.EnumsOnly.send.contentType", + "methodParameterSegments": [ + { + "$id": "255", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "70" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.EnumsOnly.send.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "255", + "$id": "256", "kind": "body", "name": "sendRequest6", "serializedName": "sendRequest6", @@ -3729,7 +3844,26 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.EnumsOnly.send.body" + "crossLanguageDefinitionId": "Type.Union.EnumsOnly.send.body", + "methodParameterSegments": [ + { + "$id": "257", + "kind": "method", + "name": "prop", + "serializedName": "prop", + "type": { + "$ref": "117" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Union.EnumsOnly.send.prop", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3756,39 +3890,10 @@ }, "parameters": [ { - "$id": "256", - "kind": "method", - "name": "prop", - "serializedName": "prop", - "type": { - "$ref": "117" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Union.EnumsOnly.send.prop", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "257" }, { - "$id": "257", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "70" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.EnumsOnly.send.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "255" } ], "response": {}, @@ -3872,7 +3977,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.StringAndArray.get.accept" + "crossLanguageDefinitionId": "Type.Union.StringAndArray.get.accept", + "methodParameterSegments": [ + { + "$id": "265", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "72" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.StringAndArray.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -3902,21 +4026,7 @@ }, "parameters": [ { - "$id": "265", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "72" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.StringAndArray.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "265" } ], "response": { @@ -3956,10 +4066,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.StringAndArray.send.contentType" + "crossLanguageDefinitionId": "Type.Union.StringAndArray.send.contentType", + "methodParameterSegments": [ + { + "$id": "269", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "74" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.StringAndArray.send.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "269", + "$id": "270", "kind": "body", "name": "sendRequest7", "serializedName": "sendRequest7", @@ -3975,7 +4105,26 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.StringAndArray.send.body" + "crossLanguageDefinitionId": "Type.Union.StringAndArray.send.body", + "methodParameterSegments": [ + { + "$id": "271", + "kind": "method", + "name": "prop", + "serializedName": "prop", + "type": { + "$ref": "124" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Union.StringAndArray.send.prop", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4002,39 +4151,10 @@ }, "parameters": [ { - "$id": "270", - "kind": "method", - "name": "prop", - "serializedName": "prop", - "type": { - "$ref": "124" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Union.StringAndArray.send.prop", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "271" }, { - "$id": "271", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "74" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.StringAndArray.send.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "269" } ], "response": {}, @@ -4118,7 +4238,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.MixedLiterals.get.accept" + "crossLanguageDefinitionId": "Type.Union.MixedLiterals.get.accept", + "methodParameterSegments": [ + { + "$id": "279", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "76" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.MixedLiterals.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4148,21 +4287,7 @@ }, "parameters": [ { - "$id": "279", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "76" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.MixedLiterals.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "279" } ], "response": { @@ -4202,10 +4327,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.MixedLiterals.send.contentType" + "crossLanguageDefinitionId": "Type.Union.MixedLiterals.send.contentType", + "methodParameterSegments": [ + { + "$id": "283", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "78" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.MixedLiterals.send.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "283", + "$id": "284", "kind": "body", "name": "sendRequest8", "serializedName": "sendRequest8", @@ -4221,7 +4366,26 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.MixedLiterals.send.body" + "crossLanguageDefinitionId": "Type.Union.MixedLiterals.send.body", + "methodParameterSegments": [ + { + "$id": "285", + "kind": "method", + "name": "prop", + "serializedName": "prop", + "type": { + "$ref": "137" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Union.MixedLiterals.send.prop", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4248,39 +4412,10 @@ }, "parameters": [ { - "$id": "284", - "kind": "method", - "name": "prop", - "serializedName": "prop", - "type": { - "$ref": "137" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Union.MixedLiterals.send.prop", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "285" }, { - "$id": "285", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "78" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.MixedLiterals.send.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "283" } ], "response": {}, @@ -4364,7 +4499,26 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.MixedTypes.get.accept" + "crossLanguageDefinitionId": "Type.Union.MixedTypes.get.accept", + "methodParameterSegments": [ + { + "$id": "293", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "80" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.MixedTypes.get.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4394,21 +4548,7 @@ }, "parameters": [ { - "$id": "293", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "80" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.MixedTypes.get.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "293" } ], "response": { @@ -4448,10 +4588,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Type.Union.MixedTypes.send.contentType" + "crossLanguageDefinitionId": "Type.Union.MixedTypes.send.contentType", + "methodParameterSegments": [ + { + "$id": "297", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "82" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Type.Union.MixedTypes.send.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "297", + "$id": "298", "kind": "body", "name": "sendRequest9", "serializedName": "sendRequest9", @@ -4467,7 +4627,26 @@ "scope": "Spread", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Type.Union.MixedTypes.send.body" + "crossLanguageDefinitionId": "Type.Union.MixedTypes.send.body", + "methodParameterSegments": [ + { + "$id": "299", + "kind": "method", + "name": "prop", + "serializedName": "prop", + "type": { + "$ref": "147" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Type.Union.MixedTypes.send.prop", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -4494,39 +4673,10 @@ }, "parameters": [ { - "$id": "298", - "kind": "method", - "name": "prop", - "serializedName": "prop", - "type": { - "$ref": "147" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Type.Union.MixedTypes.send.prop", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "299" }, { - "$id": "299", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "82" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Type.Union.MixedTypes.send.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "297" } ], "response": {}, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/Versioning.Added.V1.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/Versioning.Added.V1.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/Versioning.Added.V1.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/Versioning.Added.V1.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/Versioning.Added.V1.sln deleted file mode 100644 index 9f918bb4c53..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/Versioning.Added.V1.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Versioning.Added.V1", "src\Versioning.Added.V1.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/Versioning.Added.V1.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/Versioning.Added.V1.slnx new file mode 100644 index 00000000000..34f1a37e4f0 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/Versioning.Added.V1.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/AddedClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/AddedClient.cs index 4f240a760b1..d3cfcb5aa70 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/AddedClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/AddedClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class AddedClient public AddedClient(Uri endpoint) : this(endpoint, new AddedClientOptions()) => throw null; - public AddedClient(Uri endpoint, AddedClientOptions options) => throw null; + internal AddedClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, AddedClientOptions options) => throw null; + + public AddedClient(Uri endpoint, AddedClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public AddedClient(AddedClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/AddedClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/AddedClientOptions.cs index 773ddd6c34e..b7fbe47ed89 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/AddedClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/AddedClientOptions.cs @@ -3,6 +3,8 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Versioning.Added { @@ -12,6 +14,9 @@ public partial class AddedClientOptions : ClientPipelineOptions public AddedClientOptions(ServiceVersion version = LatestVersion) => throw null; + [Experimental("SCME0002")] + internal AddedClientOptions(IConfigurationSection section) : base(section) => throw null; + public enum ServiceVersion { /// The version v1. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/AddedClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/AddedClientSettings.cs new file mode 100644 index 00000000000..de45b556cb9 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/AddedClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Versioning.Added +{ + [Experimental("SCME0002")] + public partial class AddedClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public AddedClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/Models/ModelV1.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/Models/ModelV1.Serialization.cs index f994dc369db..a7b30317271 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/Models/ModelV1.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/Models/ModelV1.Serialization.cs @@ -13,26 +13,26 @@ public partial class ModelV1 : IJsonModel { internal ModelV1() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ModelV1 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ModelV1 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV1 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ModelV1 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV1 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ModelV1 modelV1) => throw null; public static explicit operator ModelV1(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ModelV1 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ModelV1 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..d1b35cb7f82 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "AddedClient": { + "type": "object", + "description": "Configuration for AddedClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/addedClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "addedClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Versioning.Added.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Versioning.Added.V1.csproj index b471f07704f..1451c8c51bb 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Versioning.Added.V1.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Versioning.Added.V1.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/tspCodeModel.json index 1892fcd7a4b..b6875ca2371 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/tspCodeModel.json @@ -208,10 +208,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Added.v1.contentType" + "crossLanguageDefinitionId": "Versioning.Added.v1.contentType", + "methodParameterSegments": [ + { + "$id": "19", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Added.v1.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "19", + "$id": "20", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -224,10 +244,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Added.v1.accept" + "crossLanguageDefinitionId": "Versioning.Added.v1.accept", + "methodParameterSegments": [ + { + "$id": "21", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Added.v1.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "20", + "$id": "22", "kind": "body", "name": "body", "serializedName": "body", @@ -243,7 +282,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.Added.v1.body" + "crossLanguageDefinitionId": "Versioning.Added.v1.body", + "methodParameterSegments": [ + { + "$id": "23", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "11" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.Added.v1.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -276,56 +334,13 @@ }, "parameters": [ { - "$id": "21", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "11" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.Added.v1.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "23" }, { - "$id": "22", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Added.v1.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "19" }, { - "$id": "23", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Added.v1.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "21" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/Versioning.Added.V2.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/Versioning.Added.V2.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/Versioning.Added.V2.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/Versioning.Added.V2.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/Versioning.Added.V2.sln deleted file mode 100644 index 9545f9dc8da..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/Versioning.Added.V2.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Versioning.Added.V2", "src\Versioning.Added.V2.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/Versioning.Added.V2.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/Versioning.Added.V2.slnx new file mode 100644 index 00000000000..4d49e20ef6c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/Versioning.Added.V2.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/AddedClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/AddedClient.cs index 15c9f8e666d..6f27070b32e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/AddedClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/AddedClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class AddedClient public AddedClient(Uri endpoint) : this(endpoint, new AddedClientOptions()) => throw null; - public AddedClient(Uri endpoint, AddedClientOptions options) => throw null; + internal AddedClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, AddedClientOptions options) => throw null; + + public AddedClient(Uri endpoint, AddedClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public AddedClient(AddedClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/AddedClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/AddedClientOptions.cs index e2f29f0a557..9719d90a137 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/AddedClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/AddedClientOptions.cs @@ -3,6 +3,8 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Versioning.Added { @@ -12,6 +14,9 @@ public partial class AddedClientOptions : ClientPipelineOptions public AddedClientOptions(ServiceVersion version = LatestVersion) => throw null; + [Experimental("SCME0002")] + internal AddedClientOptions(IConfigurationSection section) : base(section) => throw null; + public enum ServiceVersion { /// The version v1. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/AddedClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/AddedClientSettings.cs new file mode 100644 index 00000000000..de45b556cb9 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/AddedClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Versioning.Added +{ + [Experimental("SCME0002")] + public partial class AddedClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public AddedClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/InterfaceV2.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/InterfaceV2.cs index cef6e78f45d..09e38898e24 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/InterfaceV2.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/InterfaceV2.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class InterfaceV2 { protected InterfaceV2() => throw null; + internal InterfaceV2(ClientPipeline pipeline, Uri endpoint, string version) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult V2InInterface(BinaryContent content, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/Models/ModelV1.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/Models/ModelV1.Serialization.cs index f994dc369db..a7b30317271 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/Models/ModelV1.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/Models/ModelV1.Serialization.cs @@ -13,26 +13,26 @@ public partial class ModelV1 : IJsonModel { internal ModelV1() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ModelV1 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ModelV1 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV1 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ModelV1 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV1 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ModelV1 modelV1) => throw null; public static explicit operator ModelV1(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ModelV1 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ModelV1 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/Models/ModelV2.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/Models/ModelV2.Serialization.cs index 9cb4c48477d..44d6633ce65 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/Models/ModelV2.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/Models/ModelV2.Serialization.cs @@ -13,26 +13,26 @@ public partial class ModelV2 : IJsonModel { internal ModelV2() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ModelV2 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ModelV2 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV2 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ModelV2 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV2 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ModelV2 modelV2) => throw null; public static explicit operator ModelV2(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ModelV2 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ModelV2 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..d1b35cb7f82 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "AddedClient": { + "type": "object", + "description": "Configuration for AddedClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/addedClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "addedClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Versioning.Added.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Versioning.Added.V2.csproj index 49a8c9fd26c..dd7d592b56e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Versioning.Added.V2.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Versioning.Added.V2.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/tspCodeModel.json index f2403c714dd..40ce1b6b2e3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/tspCodeModel.json @@ -488,10 +488,33 @@ "scope": "Method", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Added.v1.headerV2" + "crossLanguageDefinitionId": "Versioning.Added.v1.headerV2", + "methodParameterSegments": [ + { + "$id": "46", + "kind": "method", + "name": "headerV2", + "serializedName": "header-v2", + "type": { + "$id": "47", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.Added.v1.headerV2", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "46", + "$id": "48", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -505,10 +528,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Added.v1.contentType" + "crossLanguageDefinitionId": "Versioning.Added.v1.contentType", + "methodParameterSegments": [ + { + "$id": "49", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "12" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Added.v1.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "47", + "$id": "50", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -521,10 +564,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Added.v1.accept" + "crossLanguageDefinitionId": "Versioning.Added.v1.accept", + "methodParameterSegments": [ + { + "$id": "51", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "14" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Added.v1.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "48", + "$id": "52", "kind": "body", "name": "body", "serializedName": "body", @@ -540,7 +602,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.Added.v1.body" + "crossLanguageDefinitionId": "Versioning.Added.v1.body", + "methodParameterSegments": [ + { + "$id": "53", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "24" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.Added.v1.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -573,77 +654,16 @@ }, "parameters": [ { - "$id": "49", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "24" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.Added.v1.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "53" }, { - "$id": "50", - "kind": "method", - "name": "headerV2", - "serializedName": "header-v2", - "type": { - "$id": "51", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.Added.v1.headerV2", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "46" }, { - "$id": "52", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "12" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Added.v1.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "49" }, { - "$id": "53", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "14" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Added.v1.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "51" } ], "response": { @@ -685,10 +705,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Added.v2.contentType" + "crossLanguageDefinitionId": "Versioning.Added.v2.contentType", + "methodParameterSegments": [ + { + "$id": "57", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "16" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Added.v2.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "57", + "$id": "58", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -701,10 +741,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Added.v2.accept" + "crossLanguageDefinitionId": "Versioning.Added.v2.accept", + "methodParameterSegments": [ + { + "$id": "59", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "18" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Added.v2.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "58", + "$id": "60", "kind": "body", "name": "body", "serializedName": "body", @@ -720,7 +779,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.Added.v2.body" + "crossLanguageDefinitionId": "Versioning.Added.v2.body", + "methodParameterSegments": [ + { + "$id": "61", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "33" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.Added.v2.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -753,56 +831,13 @@ }, "parameters": [ { - "$id": "59", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "33" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.Added.v2.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "61" }, { - "$id": "60", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "16" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Added.v2.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "57" }, { - "$id": "61", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "18" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Added.v2.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "59" } ], "response": { @@ -909,10 +944,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Added.InterfaceV2.v2InInterface.contentType" + "crossLanguageDefinitionId": "Versioning.Added.InterfaceV2.v2InInterface.contentType", + "methodParameterSegments": [ + { + "$id": "70", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "20" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Added.InterfaceV2.v2InInterface.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "70", + "$id": "71", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -925,10 +980,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Added.InterfaceV2.v2InInterface.accept" + "crossLanguageDefinitionId": "Versioning.Added.InterfaceV2.v2InInterface.accept", + "methodParameterSegments": [ + { + "$id": "72", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "22" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Added.InterfaceV2.v2InInterface.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "71", + "$id": "73", "kind": "body", "name": "body", "serializedName": "body", @@ -944,7 +1018,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.Added.InterfaceV2.v2InInterface.body" + "crossLanguageDefinitionId": "Versioning.Added.InterfaceV2.v2InInterface.body", + "methodParameterSegments": [ + { + "$id": "74", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "33" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.Added.InterfaceV2.v2InInterface.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -977,56 +1070,13 @@ }, "parameters": [ { - "$id": "72", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "33" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.Added.InterfaceV2.v2InInterface.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "74" }, { - "$id": "73", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "20" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Added.InterfaceV2.v2InInterface.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "70" }, { - "$id": "74", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "22" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Added.InterfaceV2.v2InInterface.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "72" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/Versioning.MadeOptional.V1.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/Versioning.MadeOptional.V1.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/Versioning.MadeOptional.V1.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/Versioning.MadeOptional.V1.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/Versioning.MadeOptional.V1.sln deleted file mode 100644 index e1a07648f71..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/Versioning.MadeOptional.V1.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Versioning.MadeOptional.V1", "src\Versioning.MadeOptional.V1.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/Versioning.MadeOptional.V1.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/Versioning.MadeOptional.V1.slnx new file mode 100644 index 00000000000..f7f84b366c1 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/Versioning.MadeOptional.V1.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClient.cs index 8594bc90f75..d78e1fe494b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class MadeOptionalClient public MadeOptionalClient(Uri endpoint) : this(endpoint, new MadeOptionalClientOptions()) => throw null; - public MadeOptionalClient(Uri endpoint, MadeOptionalClientOptions options) => throw null; + internal MadeOptionalClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, MadeOptionalClientOptions options) => throw null; + + public MadeOptionalClient(Uri endpoint, MadeOptionalClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public MadeOptionalClient(MadeOptionalClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClientOptions.cs index 3eefb1ff588..d26fc936f07 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClientOptions.cs @@ -3,6 +3,8 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Versioning.MadeOptional { @@ -12,6 +14,9 @@ public partial class MadeOptionalClientOptions : ClientPipelineOptions public MadeOptionalClientOptions(ServiceVersion version = LatestVersion) => throw null; + [Experimental("SCME0002")] + internal MadeOptionalClientOptions(IConfigurationSection section) : base(section) => throw null; + public enum ServiceVersion { /// The version v1. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClientSettings.cs new file mode 100644 index 00000000000..4773765707d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Versioning.MadeOptional +{ + [Experimental("SCME0002")] + public partial class MadeOptionalClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public MadeOptionalClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/Models/TestModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/Models/TestModel.Serialization.cs index 520d9fd8a20..331346c4851 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/Models/TestModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/Models/TestModel.Serialization.cs @@ -13,26 +13,26 @@ public partial class TestModel : IJsonModel { internal TestModel() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - TestModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual TestModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual TestModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - TestModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual TestModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(TestModel testModel) => throw null; public static explicit operator TestModel(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + TestModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual TestModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..a54478f80e9 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "MadeOptionalClient": { + "type": "object", + "description": "Configuration for MadeOptionalClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/madeOptionalClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "madeOptionalClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Versioning.MadeOptional.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Versioning.MadeOptional.V1.csproj index 10434fd7525..994bc1f36a3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Versioning.MadeOptional.V1.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Versioning.MadeOptional.V1.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/tspCodeModel.json index 810f8726b13..aaec274fb67 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/tspCodeModel.json @@ -182,10 +182,33 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Versioning.MadeOptional.test.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "18", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "19", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.MadeOptional.test.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "18", + "$id": "20", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -199,10 +222,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.MadeOptional.test.contentType" + "crossLanguageDefinitionId": "Versioning.MadeOptional.test.contentType", + "methodParameterSegments": [ + { + "$id": "21", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "4" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.MadeOptional.test.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "19", + "$id": "22", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -215,10 +258,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.MadeOptional.test.accept" + "crossLanguageDefinitionId": "Versioning.MadeOptional.test.accept", + "methodParameterSegments": [ + { + "$id": "23", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "6" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.MadeOptional.test.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "20", + "$id": "24", "kind": "body", "name": "body", "serializedName": "body", @@ -234,7 +296,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.MadeOptional.test.body" + "crossLanguageDefinitionId": "Versioning.MadeOptional.test.body", + "methodParameterSegments": [ + { + "$id": "25", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "8" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.MadeOptional.test.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -267,77 +348,16 @@ }, "parameters": [ { - "$id": "21", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "8" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.MadeOptional.test.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "25" }, { - "$id": "22", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "23", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.MadeOptional.test.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "18" }, { - "$id": "24", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "4" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.MadeOptional.test.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "21" }, { - "$id": "25", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "6" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.MadeOptional.test.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "23" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/Versioning.MadeOptional.V2.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/Versioning.MadeOptional.V2.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/Versioning.MadeOptional.V2.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/Versioning.MadeOptional.V2.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/Versioning.MadeOptional.V2.sln deleted file mode 100644 index c4c66349611..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/Versioning.MadeOptional.V2.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Versioning.MadeOptional.V2", "src\Versioning.MadeOptional.V2.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/Versioning.MadeOptional.V2.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/Versioning.MadeOptional.V2.slnx new file mode 100644 index 00000000000..ad75744b54b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/Versioning.MadeOptional.V2.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClient.cs index a78a2f47210..a7c5df86c22 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class MadeOptionalClient public MadeOptionalClient(Uri endpoint) : this(endpoint, new MadeOptionalClientOptions()) => throw null; - public MadeOptionalClient(Uri endpoint, MadeOptionalClientOptions options) => throw null; + internal MadeOptionalClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, MadeOptionalClientOptions options) => throw null; + + public MadeOptionalClient(Uri endpoint, MadeOptionalClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public MadeOptionalClient(MadeOptionalClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClientOptions.cs index f328701bf0d..61493a2cdce 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClientOptions.cs @@ -3,6 +3,8 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Versioning.MadeOptional { @@ -12,6 +14,9 @@ public partial class MadeOptionalClientOptions : ClientPipelineOptions public MadeOptionalClientOptions(ServiceVersion version = LatestVersion) => throw null; + [Experimental("SCME0002")] + internal MadeOptionalClientOptions(IConfigurationSection section) : base(section) => throw null; + public enum ServiceVersion { /// The version v1. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClientSettings.cs new file mode 100644 index 00000000000..4773765707d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Versioning.MadeOptional +{ + [Experimental("SCME0002")] + public partial class MadeOptionalClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public MadeOptionalClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/Models/TestModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/Models/TestModel.Serialization.cs index 520d9fd8a20..331346c4851 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/Models/TestModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/Models/TestModel.Serialization.cs @@ -13,26 +13,26 @@ public partial class TestModel : IJsonModel { internal TestModel() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - TestModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual TestModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual TestModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - TestModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual TestModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(TestModel testModel) => throw null; public static explicit operator TestModel(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + TestModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual TestModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..a54478f80e9 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "MadeOptionalClient": { + "type": "object", + "description": "Configuration for MadeOptionalClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/madeOptionalClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "madeOptionalClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Versioning.MadeOptional.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Versioning.MadeOptional.V2.csproj index a2e225d396b..9a5dfc75b2f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Versioning.MadeOptional.V2.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Versioning.MadeOptional.V2.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/tspCodeModel.json index 8aac19b5cda..9e0f2cd71d0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/tspCodeModel.json @@ -198,10 +198,33 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Versioning.MadeOptional.test.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "19", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "20", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": true, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.MadeOptional.test.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "19", + "$id": "21", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -215,10 +238,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.MadeOptional.test.contentType" + "crossLanguageDefinitionId": "Versioning.MadeOptional.test.contentType", + "methodParameterSegments": [ + { + "$id": "22", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.MadeOptional.test.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "20", + "$id": "23", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -231,10 +274,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.MadeOptional.test.accept" + "crossLanguageDefinitionId": "Versioning.MadeOptional.test.accept", + "methodParameterSegments": [ + { + "$id": "24", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.MadeOptional.test.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "21", + "$id": "25", "kind": "body", "name": "body", "serializedName": "body", @@ -250,7 +312,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.MadeOptional.test.body" + "crossLanguageDefinitionId": "Versioning.MadeOptional.test.body", + "methodParameterSegments": [ + { + "$id": "26", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "9" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.MadeOptional.test.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -283,77 +364,16 @@ }, "parameters": [ { - "$id": "22", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "9" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.MadeOptional.test.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "26" }, { - "$id": "23", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "24", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": true, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.MadeOptional.test.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "19" }, { - "$id": "25", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.MadeOptional.test.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "22" }, { - "$id": "26", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.MadeOptional.test.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "24" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/Versioning.Removed.V1.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/Versioning.Removed.V1.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/Versioning.Removed.V1.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/Versioning.Removed.V1.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/Versioning.Removed.V1.sln deleted file mode 100644 index 271032d847a..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/Versioning.Removed.V1.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Versioning.Removed.V1", "src\Versioning.Removed.V1.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/Versioning.Removed.V1.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/Versioning.Removed.V1.slnx new file mode 100644 index 00000000000..645702050b4 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/Versioning.Removed.V1.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/InterfaceV1.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/InterfaceV1.cs index d3656e7c8d6..65f7690e6d9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/InterfaceV1.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/InterfaceV1.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class InterfaceV1 { protected InterfaceV1() => throw null; + internal InterfaceV1(ClientPipeline pipeline, Uri endpoint, string version) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult V1InInterface(BinaryContent content, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/Models/ModelV1.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/Models/ModelV1.Serialization.cs index 275ab0651ab..59796331c4f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/Models/ModelV1.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/Models/ModelV1.Serialization.cs @@ -13,26 +13,26 @@ public partial class ModelV1 : IJsonModel { internal ModelV1() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ModelV1 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ModelV1 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV1 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ModelV1 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV1 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ModelV1 modelV1) => throw null; public static explicit operator ModelV1(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ModelV1 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ModelV1 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/Models/ModelV2.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/Models/ModelV2.Serialization.cs index 2150cb75bfb..92d5381c707 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/Models/ModelV2.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/Models/ModelV2.Serialization.cs @@ -13,26 +13,26 @@ public partial class ModelV2 : IJsonModel { internal ModelV2() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ModelV2 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ModelV2 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV2 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ModelV2 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV2 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ModelV2 modelV2) => throw null; public static explicit operator ModelV2(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ModelV2 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ModelV2 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/Models/ModelV3.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/Models/ModelV3.Serialization.cs index 3a8f4557100..f50afa53a25 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/Models/ModelV3.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/Models/ModelV3.Serialization.cs @@ -13,26 +13,26 @@ public partial class ModelV3 : IJsonModel { internal ModelV3() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ModelV3 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ModelV3 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV3 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ModelV3 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV3 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ModelV3 modelV3) => throw null; public static explicit operator ModelV3(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ModelV3 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ModelV3 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/RemovedClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/RemovedClient.cs index 9d7b39f1c89..3dfd35529a9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/RemovedClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/RemovedClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class RemovedClient public RemovedClient(Uri endpoint) : this(endpoint, new RemovedClientOptions()) => throw null; - public RemovedClient(Uri endpoint, RemovedClientOptions options) => throw null; + internal RemovedClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, RemovedClientOptions options) => throw null; + + public RemovedClient(Uri endpoint, RemovedClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public RemovedClient(RemovedClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/RemovedClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/RemovedClientOptions.cs index 6389ac97d10..e72954e373d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/RemovedClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/RemovedClientOptions.cs @@ -3,6 +3,8 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Versioning.Removed { @@ -12,6 +14,9 @@ public partial class RemovedClientOptions : ClientPipelineOptions public RemovedClientOptions(ServiceVersion version = LatestVersion) => throw null; + [Experimental("SCME0002")] + internal RemovedClientOptions(IConfigurationSection section) : base(section) => throw null; + public enum ServiceVersion { /// The version v1. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/RemovedClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/RemovedClientSettings.cs new file mode 100644 index 00000000000..ff06e89e8df --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/RemovedClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Versioning.Removed +{ + [Experimental("SCME0002")] + public partial class RemovedClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public RemovedClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..b634f506a23 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "RemovedClient": { + "type": "object", + "description": "Configuration for RemovedClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/removedClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "removedClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Versioning.Removed.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Versioning.Removed.V1.csproj index 5162390039b..17b578c2766 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Versioning.Removed.V1.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Versioning.Removed.V1.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/tspCodeModel.json index 2d2f1189837..7a76a93d5bb 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/tspCodeModel.json @@ -643,10 +643,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.v1.contentType" + "crossLanguageDefinitionId": "Versioning.Removed.v1.contentType", + "methodParameterSegments": [ + { + "$id": "59", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "15" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.v1.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "59", + "$id": "60", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -659,10 +679,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.v1.accept" + "crossLanguageDefinitionId": "Versioning.Removed.v1.accept", + "methodParameterSegments": [ + { + "$id": "61", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.v1.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "60", + "$id": "62", "kind": "body", "name": "body", "serializedName": "body", @@ -678,7 +717,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.Removed.v1.body" + "crossLanguageDefinitionId": "Versioning.Removed.v1.body", + "methodParameterSegments": [ + { + "$id": "63", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "31" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.Removed.v1.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -711,56 +769,13 @@ }, "parameters": [ { - "$id": "61", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "31" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.Removed.v1.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "63" }, { - "$id": "62", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.v1.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "59" }, { - "$id": "63", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "17" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.v1.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "61" } ], "response": { @@ -805,10 +820,33 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Versioning.Removed.v2.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "68", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "69", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.Removed.v2.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "68", + "$id": "70", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -822,10 +860,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.v2.contentType" + "crossLanguageDefinitionId": "Versioning.Removed.v2.contentType", + "methodParameterSegments": [ + { + "$id": "71", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "19" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.v2.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "69", + "$id": "72", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -838,10 +896,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.v2.accept" + "crossLanguageDefinitionId": "Versioning.Removed.v2.accept", + "methodParameterSegments": [ + { + "$id": "73", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "21" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.v2.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "70", + "$id": "74", "kind": "body", "name": "body", "serializedName": "body", @@ -857,7 +934,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.Removed.v2.body" + "crossLanguageDefinitionId": "Versioning.Removed.v2.body", + "methodParameterSegments": [ + { + "$id": "75", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "39" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.Removed.v2.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -890,77 +986,16 @@ }, "parameters": [ { - "$id": "71", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "39" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.Removed.v2.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "75" }, { - "$id": "72", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "73", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.Removed.v2.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "68" }, { - "$id": "74", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "19" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.v2.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "71" }, { - "$id": "75", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "21" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.v2.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "73" } ], "response": { @@ -1004,10 +1039,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.modelV3.contentType" + "crossLanguageDefinitionId": "Versioning.Removed.modelV3.contentType", + "methodParameterSegments": [ + { + "$id": "79", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "23" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.modelV3.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "79", + "$id": "80", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -1020,10 +1075,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.modelV3.accept" + "crossLanguageDefinitionId": "Versioning.Removed.modelV3.accept", + "methodParameterSegments": [ + { + "$id": "81", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "25" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.modelV3.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "80", + "$id": "82", "kind": "body", "name": "body", "serializedName": "body", @@ -1039,7 +1113,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.Removed.modelV3.body" + "crossLanguageDefinitionId": "Versioning.Removed.modelV3.body", + "methodParameterSegments": [ + { + "$id": "83", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "51" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.Removed.modelV3.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1072,56 +1165,13 @@ }, "parameters": [ { - "$id": "81", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "51" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.Removed.modelV3.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "83" }, { - "$id": "82", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "23" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.modelV3.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "79" }, { - "$id": "83", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "25" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.modelV3.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "81" } ], "response": { @@ -1228,10 +1278,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.contentType" + "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.contentType", + "methodParameterSegments": [ + { + "$id": "92", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "27" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "92", + "$id": "93", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -1244,10 +1314,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.accept" + "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.accept", + "methodParameterSegments": [ + { + "$id": "94", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "29" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "93", + "$id": "95", "kind": "body", "name": "body", "serializedName": "body", @@ -1263,7 +1352,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.body" + "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.body", + "methodParameterSegments": [ + { + "$id": "96", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "31" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1296,56 +1404,13 @@ }, "parameters": [ { - "$id": "94", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "31" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "96" }, { - "$id": "95", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "27" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "92" }, { - "$id": "96", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "29" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "94" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/Versioning.Removed.V2.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/Versioning.Removed.V2.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/Versioning.Removed.V2.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/Versioning.Removed.V2.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/Versioning.Removed.V2.sln deleted file mode 100644 index d256a70bfb1..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/Versioning.Removed.V2.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Versioning.Removed.V2", "src\Versioning.Removed.V2.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/Versioning.Removed.V2.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/Versioning.Removed.V2.slnx new file mode 100644 index 00000000000..643f91c5758 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/Versioning.Removed.V2.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/Models/ModelV2.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/Models/ModelV2.Serialization.cs index 2150cb75bfb..92d5381c707 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/Models/ModelV2.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/Models/ModelV2.Serialization.cs @@ -13,26 +13,26 @@ public partial class ModelV2 : IJsonModel { internal ModelV2() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ModelV2 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ModelV2 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV2 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ModelV2 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV2 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ModelV2 modelV2) => throw null; public static explicit operator ModelV2(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ModelV2 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ModelV2 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/Models/ModelV3.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/Models/ModelV3.Serialization.cs index 3a8f4557100..f50afa53a25 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/Models/ModelV3.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/Models/ModelV3.Serialization.cs @@ -13,26 +13,26 @@ public partial class ModelV3 : IJsonModel { internal ModelV3() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ModelV3 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ModelV3 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV3 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ModelV3 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV3 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ModelV3 modelV3) => throw null; public static explicit operator ModelV3(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ModelV3 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ModelV3 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/RemovedClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/RemovedClient.cs index febf2295a42..d07a44fd254 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/RemovedClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/RemovedClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class RemovedClient public RemovedClient(Uri endpoint) : this(endpoint, new RemovedClientOptions()) => throw null; - public RemovedClient(Uri endpoint, RemovedClientOptions options) => throw null; + internal RemovedClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, RemovedClientOptions options) => throw null; + + public RemovedClient(Uri endpoint, RemovedClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public RemovedClient(RemovedClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/RemovedClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/RemovedClientOptions.cs index 4925a16b6eb..f2256cfd36c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/RemovedClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/RemovedClientOptions.cs @@ -3,6 +3,8 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Versioning.Removed { @@ -12,6 +14,9 @@ public partial class RemovedClientOptions : ClientPipelineOptions public RemovedClientOptions(ServiceVersion version = LatestVersion) => throw null; + [Experimental("SCME0002")] + internal RemovedClientOptions(IConfigurationSection section) : base(section) => throw null; + public enum ServiceVersion { /// The version v1. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/RemovedClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/RemovedClientSettings.cs new file mode 100644 index 00000000000..ff06e89e8df --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/RemovedClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Versioning.Removed +{ + [Experimental("SCME0002")] + public partial class RemovedClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public RemovedClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..b634f506a23 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "RemovedClient": { + "type": "object", + "description": "Configuration for RemovedClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/removedClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "removedClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Versioning.Removed.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Versioning.Removed.V2.csproj index 6930b51c625..dc31849d11f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Versioning.Removed.V2.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Versioning.Removed.V2.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/tspCodeModel.json index 9b8832713a2..18d13e7be30 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/tspCodeModel.json @@ -421,10 +421,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.v2.contentType" + "crossLanguageDefinitionId": "Versioning.Removed.v2.contentType", + "methodParameterSegments": [ + { + "$id": "37", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "13" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.v2.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "37", + "$id": "38", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -437,10 +457,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.v2.accept" + "crossLanguageDefinitionId": "Versioning.Removed.v2.accept", + "methodParameterSegments": [ + { + "$id": "39", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "15" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.v2.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "38", + "$id": "40", "kind": "body", "name": "body", "serializedName": "body", @@ -456,7 +495,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.Removed.v2.body" + "crossLanguageDefinitionId": "Versioning.Removed.v2.body", + "methodParameterSegments": [ + { + "$id": "41", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "21" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.Removed.v2.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -489,56 +547,13 @@ }, "parameters": [ { - "$id": "39", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "21" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.Removed.v2.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "41" }, { - "$id": "40", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.v2.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "37" }, { - "$id": "41", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "15" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.v2.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "39" } ], "response": { @@ -584,10 +599,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.modelV3.contentType" + "crossLanguageDefinitionId": "Versioning.Removed.modelV3.contentType", + "methodParameterSegments": [ + { + "$id": "45", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "17" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.modelV3.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "45", + "$id": "46", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -600,10 +635,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.modelV3.accept" + "crossLanguageDefinitionId": "Versioning.Removed.modelV3.accept", + "methodParameterSegments": [ + { + "$id": "47", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "19" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.modelV3.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "46", + "$id": "48", "kind": "body", "name": "body", "serializedName": "body", @@ -619,7 +673,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.Removed.modelV3.body" + "crossLanguageDefinitionId": "Versioning.Removed.modelV3.body", + "methodParameterSegments": [ + { + "$id": "49", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "29" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.Removed.modelV3.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -652,56 +725,13 @@ }, "parameters": [ { - "$id": "47", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "29" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.Removed.modelV3.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "49" }, { - "$id": "48", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "17" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.modelV3.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "45" }, { - "$id": "49", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "19" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.modelV3.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "47" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/Versioning.Removed.V2Preview.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/Versioning.Removed.V2Preview.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/Versioning.Removed.V2Preview.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/Versioning.Removed.V2Preview.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/Versioning.Removed.V2Preview.sln deleted file mode 100644 index af3ab49c7c6..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/Versioning.Removed.V2Preview.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Versioning.Removed.V2Preview", "src\Versioning.Removed.V2Preview.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/Versioning.Removed.V2Preview.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/Versioning.Removed.V2Preview.slnx new file mode 100644 index 00000000000..eb46aa2d13c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/Versioning.Removed.V2Preview.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/InterfaceV1.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/InterfaceV1.cs index d3656e7c8d6..65f7690e6d9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/InterfaceV1.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/InterfaceV1.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class InterfaceV1 { protected InterfaceV1() => throw null; + internal InterfaceV1(ClientPipeline pipeline, Uri endpoint, string version) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult V1InInterface(BinaryContent content, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/Models/ModelV1.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/Models/ModelV1.Serialization.cs index 275ab0651ab..59796331c4f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/Models/ModelV1.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/Models/ModelV1.Serialization.cs @@ -13,26 +13,26 @@ public partial class ModelV1 : IJsonModel { internal ModelV1() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ModelV1 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ModelV1 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV1 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ModelV1 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV1 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ModelV1 modelV1) => throw null; public static explicit operator ModelV1(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ModelV1 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ModelV1 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/Models/ModelV2.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/Models/ModelV2.Serialization.cs index 2150cb75bfb..92d5381c707 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/Models/ModelV2.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/Models/ModelV2.Serialization.cs @@ -13,26 +13,26 @@ public partial class ModelV2 : IJsonModel { internal ModelV2() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ModelV2 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ModelV2 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV2 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ModelV2 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV2 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ModelV2 modelV2) => throw null; public static explicit operator ModelV2(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ModelV2 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ModelV2 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/Models/ModelV3.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/Models/ModelV3.Serialization.cs index 3a8f4557100..f50afa53a25 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/Models/ModelV3.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/Models/ModelV3.Serialization.cs @@ -13,26 +13,26 @@ public partial class ModelV3 : IJsonModel { internal ModelV3() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ModelV3 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual ModelV3 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV3 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - ModelV3 IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual ModelV3 PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(ModelV3 modelV3) => throw null; public static explicit operator ModelV3(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + ModelV3 IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual ModelV3 JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/RemovedClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/RemovedClient.cs index 9d7b39f1c89..3dfd35529a9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/RemovedClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/RemovedClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class RemovedClient public RemovedClient(Uri endpoint) : this(endpoint, new RemovedClientOptions()) => throw null; - public RemovedClient(Uri endpoint, RemovedClientOptions options) => throw null; + internal RemovedClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, RemovedClientOptions options) => throw null; + + public RemovedClient(Uri endpoint, RemovedClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public RemovedClient(RemovedClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/RemovedClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/RemovedClientOptions.cs index 43faac8d671..f7d8d97afa9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/RemovedClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/RemovedClientOptions.cs @@ -3,6 +3,8 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Versioning.Removed { @@ -12,6 +14,9 @@ public partial class RemovedClientOptions : ClientPipelineOptions public RemovedClientOptions(ServiceVersion version = LatestVersion) => throw null; + [Experimental("SCME0002")] + internal RemovedClientOptions(IConfigurationSection section) : base(section) => throw null; + public enum ServiceVersion { /// The version v1. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/RemovedClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/RemovedClientSettings.cs new file mode 100644 index 00000000000..ff06e89e8df --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/RemovedClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Versioning.Removed +{ + [Experimental("SCME0002")] + public partial class RemovedClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public RemovedClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..b634f506a23 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "RemovedClient": { + "type": "object", + "description": "Configuration for RemovedClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/removedClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "removedClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Versioning.Removed.V2Preview.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Versioning.Removed.V2Preview.csproj index ff8716ad107..c0a3b349fda 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Versioning.Removed.V2Preview.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Versioning.Removed.V2Preview.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/tspCodeModel.json index 2d3141ed58e..1b998c81356 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/tspCodeModel.json @@ -592,10 +592,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.v1.contentType" + "crossLanguageDefinitionId": "Versioning.Removed.v1.contentType", + "methodParameterSegments": [ + { + "$id": "55", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "12" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.v1.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "55", + "$id": "56", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -608,10 +628,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.v1.accept" + "crossLanguageDefinitionId": "Versioning.Removed.v1.accept", + "methodParameterSegments": [ + { + "$id": "57", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "14" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.v1.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "56", + "$id": "58", "kind": "body", "name": "body", "serializedName": "body", @@ -627,7 +666,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.Removed.v1.body" + "crossLanguageDefinitionId": "Versioning.Removed.v1.body", + "methodParameterSegments": [ + { + "$id": "59", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "28" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.Removed.v1.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -660,56 +718,13 @@ }, "parameters": [ { - "$id": "57", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "28" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.Removed.v1.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "59" }, { - "$id": "58", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "12" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.v1.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "55" }, { - "$id": "59", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "14" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.v1.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "57" } ], "response": { @@ -755,10 +770,33 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Versioning.Removed.v2.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "64", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "65", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.Removed.v2.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "64", + "$id": "66", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -772,10 +810,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.v2.contentType" + "crossLanguageDefinitionId": "Versioning.Removed.v2.contentType", + "methodParameterSegments": [ + { + "$id": "67", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "16" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.v2.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "65", + "$id": "68", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -788,10 +846,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.v2.accept" + "crossLanguageDefinitionId": "Versioning.Removed.v2.accept", + "methodParameterSegments": [ + { + "$id": "69", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "18" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.v2.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "66", + "$id": "70", "kind": "body", "name": "body", "serializedName": "body", @@ -807,7 +884,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.Removed.v2.body" + "crossLanguageDefinitionId": "Versioning.Removed.v2.body", + "methodParameterSegments": [ + { + "$id": "71", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "36" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.Removed.v2.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -840,77 +936,16 @@ }, "parameters": [ { - "$id": "67", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "36" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.Removed.v2.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "71" }, { - "$id": "68", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "69", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.Removed.v2.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "64" }, { - "$id": "70", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "16" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.v2.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "67" }, { - "$id": "71", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "18" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.v2.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "69" } ], "response": { @@ -955,10 +990,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.modelV3.contentType" + "crossLanguageDefinitionId": "Versioning.Removed.modelV3.contentType", + "methodParameterSegments": [ + { + "$id": "75", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "20" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.modelV3.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "75", + "$id": "76", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -971,10 +1026,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.modelV3.accept" + "crossLanguageDefinitionId": "Versioning.Removed.modelV3.accept", + "methodParameterSegments": [ + { + "$id": "77", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "22" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.modelV3.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "76", + "$id": "78", "kind": "body", "name": "body", "serializedName": "body", @@ -990,7 +1064,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.Removed.modelV3.body" + "crossLanguageDefinitionId": "Versioning.Removed.modelV3.body", + "methodParameterSegments": [ + { + "$id": "79", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "48" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.Removed.modelV3.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1023,56 +1116,13 @@ }, "parameters": [ { - "$id": "77", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "48" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.Removed.modelV3.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "79" }, { - "$id": "78", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "20" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.modelV3.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "75" }, { - "$id": "79", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "22" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.modelV3.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "77" } ], "response": { @@ -1181,10 +1231,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.contentType" + "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.contentType", + "methodParameterSegments": [ + { + "$id": "88", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "24" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "88", + "$id": "89", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -1197,10 +1267,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.accept" + "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.accept", + "methodParameterSegments": [ + { + "$id": "90", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "26" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "89", + "$id": "91", "kind": "body", "name": "body", "serializedName": "body", @@ -1216,7 +1305,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.body" + "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.body", + "methodParameterSegments": [ + { + "$id": "92", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "28" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -1249,56 +1357,13 @@ }, "parameters": [ { - "$id": "90", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "28" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "92" }, { - "$id": "91", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "24" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "88" }, { - "$id": "92", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "26" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.Removed.InterfaceV1.v1InInterface.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "90" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/Versioning.RenamedFrom.V1.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/Versioning.RenamedFrom.V1.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/Versioning.RenamedFrom.V1.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/Versioning.RenamedFrom.V1.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/Versioning.RenamedFrom.V1.sln deleted file mode 100644 index dcf64ffbfc5..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/Versioning.RenamedFrom.V1.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Versioning.RenamedFrom.V1", "src\Versioning.RenamedFrom.V1.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/Versioning.RenamedFrom.V1.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/Versioning.RenamedFrom.V1.slnx new file mode 100644 index 00000000000..0d8d20dc2c7 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/Versioning.RenamedFrom.V1.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/Models/OldModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/Models/OldModel.Serialization.cs index bc3a20837a8..4f4c471295a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/Models/OldModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/Models/OldModel.Serialization.cs @@ -13,26 +13,26 @@ public partial class OldModel : IJsonModel { internal OldModel() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - OldModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual OldModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual OldModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - OldModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual OldModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(OldModel oldModel) => throw null; public static explicit operator OldModel(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + OldModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual OldModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/OldInterface.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/OldInterface.cs index 27d6fdcc629..165af44a376 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/OldInterface.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/OldInterface.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class OldInterface { protected OldInterface() => throw null; + internal OldInterface(ClientPipeline pipeline, Uri endpoint, string version) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult NewOpInNewInterface(BinaryContent content, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClient.cs index d65af3f3675..936e395e08f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class RenamedFromClient public RenamedFromClient(Uri endpoint) : this(endpoint, new RenamedFromClientOptions()) => throw null; - public RenamedFromClient(Uri endpoint, RenamedFromClientOptions options) => throw null; + internal RenamedFromClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, RenamedFromClientOptions options) => throw null; + + public RenamedFromClient(Uri endpoint, RenamedFromClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public RenamedFromClient(RenamedFromClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClientOptions.cs index 079e9e380f8..3119ae73302 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClientOptions.cs @@ -3,6 +3,8 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Versioning.RenamedFrom { @@ -12,6 +14,9 @@ public partial class RenamedFromClientOptions : ClientPipelineOptions public RenamedFromClientOptions(ServiceVersion version = LatestVersion) => throw null; + [Experimental("SCME0002")] + internal RenamedFromClientOptions(IConfigurationSection section) : base(section) => throw null; + public enum ServiceVersion { /// The version v1. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClientSettings.cs new file mode 100644 index 00000000000..da511564820 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Versioning.RenamedFrom +{ + [Experimental("SCME0002")] + public partial class RenamedFromClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public RenamedFromClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..6eacb332a72 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "RenamedFromClient": { + "type": "object", + "description": "Configuration for RenamedFromClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/renamedFromClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "renamedFromClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Versioning.RenamedFrom.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Versioning.RenamedFrom.V1.csproj index 6d4c62fae46..83f01b3744f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Versioning.RenamedFrom.V1.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Versioning.RenamedFrom.V1.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/tspCodeModel.json index f441bfe465b..8a3f1402426 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/tspCodeModel.json @@ -291,10 +291,33 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Versioning.RenamedFrom.oldOp.oldQuery", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "29", + "kind": "method", + "name": "oldQuery", + "serializedName": "oldQuery", + "type": { + "$id": "30", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.RenamedFrom.oldOp.oldQuery", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "29", + "$id": "31", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -308,10 +331,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.RenamedFrom.oldOp.contentType" + "crossLanguageDefinitionId": "Versioning.RenamedFrom.oldOp.contentType", + "methodParameterSegments": [ + { + "$id": "32", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.RenamedFrom.oldOp.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "30", + "$id": "33", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -324,10 +367,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.RenamedFrom.oldOp.accept" + "crossLanguageDefinitionId": "Versioning.RenamedFrom.oldOp.accept", + "methodParameterSegments": [ + { + "$id": "34", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.RenamedFrom.oldOp.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "31", + "$id": "35", "kind": "body", "name": "body", "serializedName": "body", @@ -343,7 +405,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.RenamedFrom.oldOp.body" + "crossLanguageDefinitionId": "Versioning.RenamedFrom.oldOp.body", + "methodParameterSegments": [ + { + "$id": "36", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "15" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.RenamedFrom.oldOp.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -376,77 +457,16 @@ }, "parameters": [ { - "$id": "32", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "15" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.RenamedFrom.oldOp.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "36" }, { - "$id": "33", - "kind": "method", - "name": "oldQuery", - "serializedName": "oldQuery", - "type": { - "$id": "34", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.RenamedFrom.oldOp.oldQuery", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "29" }, { - "$id": "35", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.RenamedFrom.oldOp.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "32" }, { - "$id": "36", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "9" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.RenamedFrom.oldOp.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "34" } ], "response": { @@ -552,10 +572,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.RenamedFrom.OldInterface.newOpInNewInterface.contentType" + "crossLanguageDefinitionId": "Versioning.RenamedFrom.OldInterface.newOpInNewInterface.contentType", + "methodParameterSegments": [ + { + "$id": "45", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "11" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.RenamedFrom.OldInterface.newOpInNewInterface.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "45", + "$id": "46", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -568,10 +608,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.RenamedFrom.OldInterface.newOpInNewInterface.accept" + "crossLanguageDefinitionId": "Versioning.RenamedFrom.OldInterface.newOpInNewInterface.accept", + "methodParameterSegments": [ + { + "$id": "47", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "13" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.RenamedFrom.OldInterface.newOpInNewInterface.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "46", + "$id": "48", "kind": "body", "name": "body", "serializedName": "body", @@ -587,7 +646,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.RenamedFrom.OldInterface.newOpInNewInterface.body" + "crossLanguageDefinitionId": "Versioning.RenamedFrom.OldInterface.newOpInNewInterface.body", + "methodParameterSegments": [ + { + "$id": "49", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "15" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.RenamedFrom.OldInterface.newOpInNewInterface.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -620,56 +698,13 @@ }, "parameters": [ { - "$id": "47", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "15" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.RenamedFrom.OldInterface.newOpInNewInterface.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "49" }, { - "$id": "48", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.RenamedFrom.OldInterface.newOpInNewInterface.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "45" }, { - "$id": "49", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "13" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.RenamedFrom.OldInterface.newOpInNewInterface.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "47" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/Versioning.RenamedFrom.V2.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/Versioning.RenamedFrom.V2.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/Versioning.RenamedFrom.V2.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/Versioning.RenamedFrom.V2.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/Versioning.RenamedFrom.V2.sln deleted file mode 100644 index 7e7c7e72c2a..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/Versioning.RenamedFrom.V2.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Versioning.RenamedFrom.V2", "src\Versioning.RenamedFrom.V2.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/Versioning.RenamedFrom.V2.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/Versioning.RenamedFrom.V2.slnx new file mode 100644 index 00000000000..ded3a89e3e2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/Versioning.RenamedFrom.V2.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/Models/NewModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/Models/NewModel.Serialization.cs index 9ceff58e94d..8923c13b125 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/Models/NewModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/Models/NewModel.Serialization.cs @@ -13,26 +13,26 @@ public partial class NewModel : IJsonModel { internal NewModel() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - NewModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual NewModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual NewModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - NewModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual NewModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(NewModel newModel) => throw null; public static explicit operator NewModel(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + NewModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual NewModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/NewInterface.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/NewInterface.cs index 959c7a48106..5a2e1c3333e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/NewInterface.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/NewInterface.cs @@ -2,6 +2,7 @@ #nullable disable +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Threading; @@ -13,6 +14,8 @@ public partial class NewInterface { protected NewInterface() => throw null; + internal NewInterface(ClientPipeline pipeline, Uri endpoint, string version) => throw null; + public ClientPipeline Pipeline => throw null; public virtual ClientResult NewOpInNewInterface(BinaryContent content, RequestOptions options = null) => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClient.cs index 6c6eb4de56b..18dab03d399 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class RenamedFromClient public RenamedFromClient(Uri endpoint) : this(endpoint, new RenamedFromClientOptions()) => throw null; - public RenamedFromClient(Uri endpoint, RenamedFromClientOptions options) => throw null; + internal RenamedFromClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, RenamedFromClientOptions options) => throw null; + + public RenamedFromClient(Uri endpoint, RenamedFromClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public RenamedFromClient(RenamedFromClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClientOptions.cs index 7d99ad1eb2f..6079b82ab55 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClientOptions.cs @@ -3,6 +3,8 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Versioning.RenamedFrom { @@ -12,6 +14,9 @@ public partial class RenamedFromClientOptions : ClientPipelineOptions public RenamedFromClientOptions(ServiceVersion version = LatestVersion) => throw null; + [Experimental("SCME0002")] + internal RenamedFromClientOptions(IConfigurationSection section) : base(section) => throw null; + public enum ServiceVersion { /// The version v1. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClientSettings.cs new file mode 100644 index 00000000000..da511564820 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Versioning.RenamedFrom +{ + [Experimental("SCME0002")] + public partial class RenamedFromClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public RenamedFromClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..6eacb332a72 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "RenamedFromClient": { + "type": "object", + "description": "Configuration for RenamedFromClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/renamedFromClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "renamedFromClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Versioning.RenamedFrom.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Versioning.RenamedFrom.V2.csproj index eda07072a69..af79e6056da 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Versioning.RenamedFrom.V2.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Versioning.RenamedFrom.V2.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/tspCodeModel.json index dcc844a9d1b..7cc5956c1fb 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/tspCodeModel.json @@ -307,10 +307,33 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Versioning.RenamedFrom.newOp.newQuery", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "30", + "kind": "method", + "name": "newQuery", + "serializedName": "newQuery", + "type": { + "$id": "31", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.RenamedFrom.newOp.newQuery", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "30", + "$id": "32", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -324,10 +347,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.RenamedFrom.newOp.contentType" + "crossLanguageDefinitionId": "Versioning.RenamedFrom.newOp.contentType", + "methodParameterSegments": [ + { + "$id": "33", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "8" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.RenamedFrom.newOp.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "31", + "$id": "34", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -340,10 +383,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.RenamedFrom.newOp.accept" + "crossLanguageDefinitionId": "Versioning.RenamedFrom.newOp.accept", + "methodParameterSegments": [ + { + "$id": "35", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "10" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.RenamedFrom.newOp.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "32", + "$id": "36", "kind": "body", "name": "body", "serializedName": "body", @@ -359,7 +421,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.RenamedFrom.newOp.body" + "crossLanguageDefinitionId": "Versioning.RenamedFrom.newOp.body", + "methodParameterSegments": [ + { + "$id": "37", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "16" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.RenamedFrom.newOp.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -392,77 +473,16 @@ }, "parameters": [ { - "$id": "33", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "16" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.RenamedFrom.newOp.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "37" }, { - "$id": "34", - "kind": "method", - "name": "newQuery", - "serializedName": "newQuery", - "type": { - "$id": "35", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.RenamedFrom.newOp.newQuery", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "30" }, { - "$id": "36", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "8" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.RenamedFrom.newOp.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "33" }, { - "$id": "37", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "10" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.RenamedFrom.newOp.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "35" } ], "response": { @@ -570,10 +590,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface.contentType" + "crossLanguageDefinitionId": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface.contentType", + "methodParameterSegments": [ + { + "$id": "46", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "12" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "46", + "$id": "47", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -586,10 +626,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface.accept" + "crossLanguageDefinitionId": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface.accept", + "methodParameterSegments": [ + { + "$id": "48", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "14" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "47", + "$id": "49", "kind": "body", "name": "body", "serializedName": "body", @@ -605,7 +664,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface.body" + "crossLanguageDefinitionId": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface.body", + "methodParameterSegments": [ + { + "$id": "50", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "16" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -638,56 +716,13 @@ }, "parameters": [ { - "$id": "48", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "16" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "50" }, { - "$id": "49", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "12" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "46" }, { - "$id": "50", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "14" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "48" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/Versioning.ReturnTypeChangedFrom.V1.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/Versioning.ReturnTypeChangedFrom.V1.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/Versioning.ReturnTypeChangedFrom.V1.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/Versioning.ReturnTypeChangedFrom.V1.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/Versioning.ReturnTypeChangedFrom.V1.sln deleted file mode 100644 index f9b4ad8b7f4..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/Versioning.ReturnTypeChangedFrom.V1.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Versioning.ReturnTypeChangedFrom.V1", "src\Versioning.ReturnTypeChangedFrom.V1.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/Versioning.ReturnTypeChangedFrom.V1.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/Versioning.ReturnTypeChangedFrom.V1.slnx new file mode 100644 index 00000000000..6078ea41cbb --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/Versioning.ReturnTypeChangedFrom.V1.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClient.cs index aa02fb0c6aa..60b54b0ab97 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class ReturnTypeChangedFromClient public ReturnTypeChangedFromClient(Uri endpoint) : this(endpoint, new ReturnTypeChangedFromClientOptions()) => throw null; - public ReturnTypeChangedFromClient(Uri endpoint, ReturnTypeChangedFromClientOptions options) => throw null; + internal ReturnTypeChangedFromClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, ReturnTypeChangedFromClientOptions options) => throw null; + + public ReturnTypeChangedFromClient(Uri endpoint, ReturnTypeChangedFromClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public ReturnTypeChangedFromClient(ReturnTypeChangedFromClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClientOptions.cs index e8bee0a6323..fd2f1ec452c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClientOptions.cs @@ -3,6 +3,8 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Versioning.ReturnTypeChangedFrom { @@ -12,6 +14,9 @@ public partial class ReturnTypeChangedFromClientOptions : ClientPipelineOptions public ReturnTypeChangedFromClientOptions(ServiceVersion version = LatestVersion) => throw null; + [Experimental("SCME0002")] + internal ReturnTypeChangedFromClientOptions(IConfigurationSection section) : base(section) => throw null; + public enum ServiceVersion { /// The version v1. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClientSettings.cs new file mode 100644 index 00000000000..d8b043ada18 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Versioning.ReturnTypeChangedFrom +{ + [Experimental("SCME0002")] + public partial class ReturnTypeChangedFromClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public ReturnTypeChangedFromClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..4a3087ec9b7 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "ReturnTypeChangedFromClient": { + "type": "object", + "description": "Configuration for ReturnTypeChangedFromClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/returnTypeChangedFromClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "returnTypeChangedFromClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Versioning.ReturnTypeChangedFrom.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Versioning.ReturnTypeChangedFrom.V1.csproj index da2e5ca050a..4b9773d29e9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Versioning.ReturnTypeChangedFrom.V1.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Versioning.ReturnTypeChangedFrom.V1.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/tspCodeModel.json index eafb3020517..37ee429a970 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/tspCodeModel.json @@ -60,7 +60,7 @@ { "$id": "6", "kind": "constant", - "name": "testContentType", + "name": "TestRequestContentType1", "namespace": "", "usage": "None", "valueType": { @@ -76,7 +76,7 @@ { "$id": "8", "kind": "constant", - "name": "TestRequestContentType1", + "name": "testContentType", "namespace": "", "usage": "None", "valueType": { @@ -143,15 +143,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.contentType" + "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.contentType", + "methodParameterSegments": [ + { + "$id": "16", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "4" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "16", + "$id": "17", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "6" + "$ref": "8" }, "isApiVersion": false, "optional": false, @@ -159,15 +178,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.accept" + "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.accept", + "methodParameterSegments": [ + { + "$id": "18", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "8" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "17", + "$id": "19", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$id": "18", + "$id": "20", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -182,7 +220,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.body" + "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.body", + "methodParameterSegments": [ + { + "$id": "21", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$id": "22", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -191,7 +252,7 @@ 200 ], "bodyType": { - "$id": "19", + "$id": "23", "kind": "int32", "name": "int32", "crossLanguageDefinitionId": "TypeSpec.int32", @@ -202,7 +263,7 @@ "name": "contentType", "nameInResponse": "content-type", "type": { - "$ref": "8" + "$ref": "10" } } ], @@ -227,64 +288,18 @@ }, "parameters": [ { - "$id": "20", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "10" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "16" }, { - "$id": "21", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$id": "22", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "21" }, { - "$id": "23", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "6" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "18" } ], "response": { "type": { - "$ref": "19" + "$ref": "23" } }, "isOverride": false, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/Versioning.ReturnTypeChangedFrom.V2.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/Versioning.ReturnTypeChangedFrom.V2.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/Versioning.ReturnTypeChangedFrom.V2.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/Versioning.ReturnTypeChangedFrom.V2.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/Versioning.ReturnTypeChangedFrom.V2.sln deleted file mode 100644 index 2691b9cbaa2..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/Versioning.ReturnTypeChangedFrom.V2.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Versioning.ReturnTypeChangedFrom.V2", "src\Versioning.ReturnTypeChangedFrom.V2.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/Versioning.ReturnTypeChangedFrom.V2.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/Versioning.ReturnTypeChangedFrom.V2.slnx new file mode 100644 index 00000000000..fa160d9edb0 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/Versioning.ReturnTypeChangedFrom.V2.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClient.cs index 59f110a0c55..5a20ae37bc3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class ReturnTypeChangedFromClient public ReturnTypeChangedFromClient(Uri endpoint) : this(endpoint, new ReturnTypeChangedFromClientOptions()) => throw null; - public ReturnTypeChangedFromClient(Uri endpoint, ReturnTypeChangedFromClientOptions options) => throw null; + internal ReturnTypeChangedFromClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, ReturnTypeChangedFromClientOptions options) => throw null; + + public ReturnTypeChangedFromClient(Uri endpoint, ReturnTypeChangedFromClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public ReturnTypeChangedFromClient(ReturnTypeChangedFromClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClientOptions.cs index b6d5d3ef543..6c62310339f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClientOptions.cs @@ -3,6 +3,8 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Versioning.ReturnTypeChangedFrom { @@ -12,6 +14,9 @@ public partial class ReturnTypeChangedFromClientOptions : ClientPipelineOptions public ReturnTypeChangedFromClientOptions(ServiceVersion version = LatestVersion) => throw null; + [Experimental("SCME0002")] + internal ReturnTypeChangedFromClientOptions(IConfigurationSection section) : base(section) => throw null; + public enum ServiceVersion { /// The version v1. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClientSettings.cs new file mode 100644 index 00000000000..d8b043ada18 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Versioning.ReturnTypeChangedFrom +{ + [Experimental("SCME0002")] + public partial class ReturnTypeChangedFromClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public ReturnTypeChangedFromClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..4a3087ec9b7 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "ReturnTypeChangedFromClient": { + "type": "object", + "description": "Configuration for ReturnTypeChangedFromClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/returnTypeChangedFromClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "returnTypeChangedFromClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Versioning.ReturnTypeChangedFrom.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Versioning.ReturnTypeChangedFrom.V2.csproj index 72f0f79253b..f4f80ff657d 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Versioning.ReturnTypeChangedFrom.V2.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Versioning.ReturnTypeChangedFrom.V2.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/tspCodeModel.json index b3c71751fc8..ff3a26e64a5 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/tspCodeModel.json @@ -75,7 +75,7 @@ { "$id": "7", "kind": "constant", - "name": "testContentType", + "name": "TestRequestContentType1", "namespace": "", "usage": "None", "valueType": { @@ -91,7 +91,7 @@ { "$id": "9", "kind": "constant", - "name": "TestRequestContentType1", + "name": "testContentType", "namespace": "", "usage": "None", "valueType": { @@ -159,15 +159,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.contentType" + "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.contentType", + "methodParameterSegments": [ + { + "$id": "17", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "17", + "$id": "18", "kind": "header", "name": "accept", "serializedName": "Accept", "type": { - "$ref": "7" + "$ref": "9" }, "isApiVersion": false, "optional": false, @@ -175,15 +194,34 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.accept" + "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.accept", + "methodParameterSegments": [ + { + "$id": "19", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "9" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "18", + "$id": "20", "kind": "body", "name": "body", "serializedName": "body", "type": { - "$id": "19", + "$id": "21", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -198,7 +236,30 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.body" + "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.body", + "methodParameterSegments": [ + { + "$id": "22", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$id": "23", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -207,7 +268,7 @@ 200 ], "bodyType": { - "$id": "20", + "$id": "24", "kind": "string", "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", @@ -218,7 +279,7 @@ "name": "contentType", "nameInResponse": "content-type", "type": { - "$ref": "9" + "$ref": "11" } } ], @@ -243,64 +304,18 @@ }, "parameters": [ { - "$id": "21", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "type": { - "$ref": "11" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "17" }, { - "$id": "22", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$id": "23", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "22" }, { - "$id": "24", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.ReturnTypeChangedFrom.test.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "19" } ], "response": { "type": { - "$ref": "20" + "$ref": "24" } }, "isOverride": false, diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/Versioning.TypeChangedFrom.V1.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/Versioning.TypeChangedFrom.V1.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/Versioning.TypeChangedFrom.V1.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/Versioning.TypeChangedFrom.V1.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/Versioning.TypeChangedFrom.V1.sln deleted file mode 100644 index bb3e53b2816..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/Versioning.TypeChangedFrom.V1.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Versioning.TypeChangedFrom.V1", "src\Versioning.TypeChangedFrom.V1.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/Versioning.TypeChangedFrom.V1.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/Versioning.TypeChangedFrom.V1.slnx new file mode 100644 index 00000000000..b0cd20c890f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/Versioning.TypeChangedFrom.V1.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/Models/TestModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/Models/TestModel.Serialization.cs index 8e35ea12a0b..5e37a7585a0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/Models/TestModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/Models/TestModel.Serialization.cs @@ -13,26 +13,26 @@ public partial class TestModel : IJsonModel { internal TestModel() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - TestModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual TestModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual TestModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - TestModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual TestModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(TestModel testModel) => throw null; public static explicit operator TestModel(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + TestModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual TestModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClient.cs index cd3284b715d..fc0dde04309 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class TypeChangedFromClient public TypeChangedFromClient(Uri endpoint) : this(endpoint, new TypeChangedFromClientOptions()) => throw null; - public TypeChangedFromClient(Uri endpoint, TypeChangedFromClientOptions options) => throw null; + internal TypeChangedFromClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, TypeChangedFromClientOptions options) => throw null; + + public TypeChangedFromClient(Uri endpoint, TypeChangedFromClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public TypeChangedFromClient(TypeChangedFromClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClientOptions.cs index e335851e9c0..2fd14057077 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClientOptions.cs @@ -3,6 +3,8 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Versioning.TypeChangedFrom { @@ -12,6 +14,9 @@ public partial class TypeChangedFromClientOptions : ClientPipelineOptions public TypeChangedFromClientOptions(ServiceVersion version = LatestVersion) => throw null; + [Experimental("SCME0002")] + internal TypeChangedFromClientOptions(IConfigurationSection section) : base(section) => throw null; + public enum ServiceVersion { /// The version v1. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClientSettings.cs new file mode 100644 index 00000000000..51180632a28 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Versioning.TypeChangedFrom +{ + [Experimental("SCME0002")] + public partial class TypeChangedFromClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public TypeChangedFromClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..7ff9d4a9b8a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "TypeChangedFromClient": { + "type": "object", + "description": "Configuration for TypeChangedFromClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/typeChangedFromClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "typeChangedFromClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Versioning.TypeChangedFrom.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Versioning.TypeChangedFrom.V1.csproj index 76f51f1faa3..7302fcce58a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Versioning.TypeChangedFrom.V1.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Versioning.TypeChangedFrom.V1.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/tspCodeModel.json index 0a69f0e1074..4a9349e21dc 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/tspCodeModel.json @@ -182,10 +182,33 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "18", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "19", + "kind": "int32", + "name": "int32", + "crossLanguageDefinitionId": "TypeSpec.int32", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "18", + "$id": "20", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -199,10 +222,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.contentType" + "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.contentType", + "methodParameterSegments": [ + { + "$id": "21", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "4" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "19", + "$id": "22", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -215,10 +258,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.accept" + "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.accept", + "methodParameterSegments": [ + { + "$id": "23", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "6" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "20", + "$id": "24", "kind": "body", "name": "body", "serializedName": "body", @@ -234,7 +296,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.body" + "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.body", + "methodParameterSegments": [ + { + "$id": "25", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "8" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -267,77 +348,16 @@ }, "parameters": [ { - "$id": "21", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "8" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "25" }, { - "$id": "22", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "23", - "kind": "int32", - "name": "int32", - "crossLanguageDefinitionId": "TypeSpec.int32", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "18" }, { - "$id": "24", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "4" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "21" }, { - "$id": "25", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "6" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "23" } ], "response": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/Versioning.TypeChangedFrom.V2.NuGet.targets b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/Versioning.TypeChangedFrom.V2.NuGet.targets new file mode 100644 index 00000000000..9df53f09f6f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/Versioning.TypeChangedFrom.V2.NuGet.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/Versioning.TypeChangedFrom.V2.sln b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/Versioning.TypeChangedFrom.V2.sln deleted file mode 100644 index a1763d2d4e3..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/Versioning.TypeChangedFrom.V2.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Versioning.TypeChangedFrom.V2", "src\Versioning.TypeChangedFrom.V2.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/Versioning.TypeChangedFrom.V2.slnx b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/Versioning.TypeChangedFrom.V2.slnx new file mode 100644 index 00000000000..eb4a2969b02 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/Versioning.TypeChangedFrom.V2.slnx @@ -0,0 +1,3 @@ + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/Models/TestModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/Models/TestModel.Serialization.cs index 8e35ea12a0b..5e37a7585a0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/Models/TestModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/Models/TestModel.Serialization.cs @@ -13,26 +13,26 @@ public partial class TestModel : IJsonModel { internal TestModel() => throw null; - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - TestModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual TestModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual TestModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - TestModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - protected virtual TestModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; public static implicit operator BinaryContent(TestModel testModel) => throw null; public static explicit operator TestModel(ClientResult result) => throw null; + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; + + TestModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; + + protected virtual TestModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClient.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClient.cs index 4ac83f56d47..bbb62a54e1a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClient.cs @@ -5,6 +5,7 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -16,7 +17,12 @@ public partial class TypeChangedFromClient public TypeChangedFromClient(Uri endpoint) : this(endpoint, new TypeChangedFromClientOptions()) => throw null; - public TypeChangedFromClient(Uri endpoint, TypeChangedFromClientOptions options) => throw null; + internal TypeChangedFromClient(AuthenticationPolicy authenticationPolicy, Uri endpoint, TypeChangedFromClientOptions options) => throw null; + + public TypeChangedFromClient(Uri endpoint, TypeChangedFromClientOptions options) : this(null, endpoint, options) => throw null; + + [Experimental("SCME0002")] + public TypeChangedFromClient(TypeChangedFromClientSettings settings) : this(AuthenticationPolicy.Create(settings), settings?.Endpoint, settings?.Options) => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClientOptions.cs index bd3fa375597..7ecdd66c06b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClientOptions.cs @@ -3,6 +3,8 @@ #nullable disable using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; namespace Versioning.TypeChangedFrom { @@ -12,6 +14,9 @@ public partial class TypeChangedFromClientOptions : ClientPipelineOptions public TypeChangedFromClientOptions(ServiceVersion version = LatestVersion) => throw null; + [Experimental("SCME0002")] + internal TypeChangedFromClientOptions(IConfigurationSection section) : base(section) => throw null; + public enum ServiceVersion { /// The version v1. diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClientSettings.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClientSettings.cs new file mode 100644 index 00000000000..51180632a28 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClientSettings.cs @@ -0,0 +1,29 @@ +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.Configuration; + +namespace Versioning.TypeChangedFrom +{ + [Experimental("SCME0002")] + public partial class TypeChangedFromClientSettings : ClientSettings + { + public Uri Endpoint + { + get => throw null; + set => throw null; + } + + public TypeChangedFromClientOptions Options + { + get => throw null; + set => throw null; + } + + protected override void BindCore(IConfigurationSection section) => throw null; + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/schema/ConfigurationSchema.json new file mode 100644 index 00000000000..7ff9d4a9b8a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/schema/ConfigurationSchema.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "properties": { + "Clients": { + "type": "object", + "properties": { + "TypeChangedFromClient": { + "type": "object", + "description": "Configuration for TypeChangedFromClient.", + "properties": { + "Endpoint": { + "type": "string", + "format": "uri", + "description": "Gets or sets the Endpoint." + }, + "Credential": { + "$ref": "#/definitions/credential" + }, + "Options": { + "$ref": "#/definitions/typeChangedFromClientOptions" + } + } + } + }, + "additionalProperties": { + "type": "object", + "description": "Configuration for a named client instance." + } + } + }, + "definitions": { + "typeChangedFromClientOptions": { + "allOf": [ + { + "$ref": "#/definitions/options" + } + ] + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Versioning.TypeChangedFrom.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Versioning.TypeChangedFrom.V2.csproj index 62153305eab..865911c2952 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Versioning.TypeChangedFrom.V2.csproj +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Versioning.TypeChangedFrom.V2.csproj @@ -10,6 +10,11 @@ - + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/tspCodeModel.json index b14a7a2b324..db3010f6d2a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/tspCodeModel.json @@ -198,10 +198,33 @@ "scope": "Method", "decorators": [], "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.param", - "readOnly": false + "readOnly": false, + "methodParameterSegments": [ + { + "$id": "19", + "kind": "method", + "name": "param", + "serializedName": "param", + "type": { + "$id": "20", + "kind": "string", + "name": "string", + "crossLanguageDefinitionId": "TypeSpec.string", + "decorators": [] + }, + "location": "Query", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.param", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "19", + "$id": "21", "kind": "header", "name": "contentType", "serializedName": "Content-Type", @@ -215,10 +238,30 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.contentType" + "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.contentType", + "methodParameterSegments": [ + { + "$id": "22", + "kind": "method", + "name": "contentType", + "serializedName": "Content-Type", + "doc": "Body parameter's content type. Known values are application/json", + "type": { + "$ref": "5" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.contentType", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "20", + "$id": "23", "kind": "header", "name": "accept", "serializedName": "Accept", @@ -231,10 +274,29 @@ "scope": "Constant", "readOnly": false, "decorators": [], - "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.accept" + "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.accept", + "methodParameterSegments": [ + { + "$id": "24", + "kind": "method", + "name": "accept", + "serializedName": "Accept", + "type": { + "$ref": "7" + }, + "location": "Header", + "isApiVersion": false, + "optional": false, + "scope": "Constant", + "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.accept", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] }, { - "$id": "21", + "$id": "25", "kind": "body", "name": "body", "serializedName": "body", @@ -250,7 +312,26 @@ "scope": "Method", "decorators": [], "readOnly": false, - "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.body" + "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.body", + "methodParameterSegments": [ + { + "$id": "26", + "kind": "method", + "name": "body", + "serializedName": "body", + "type": { + "$ref": "9" + }, + "location": "Body", + "isApiVersion": false, + "optional": false, + "scope": "Method", + "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.body", + "readOnly": false, + "access": "public", + "decorators": [] + } + ] } ], "responses": [ @@ -283,77 +364,16 @@ }, "parameters": [ { - "$id": "22", - "kind": "method", - "name": "body", - "serializedName": "body", - "type": { - "$ref": "9" - }, - "location": "Body", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.body", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "26" }, { - "$id": "23", - "kind": "method", - "name": "param", - "serializedName": "param", - "type": { - "$id": "24", - "kind": "string", - "name": "string", - "crossLanguageDefinitionId": "TypeSpec.string", - "decorators": [] - }, - "location": "Query", - "isApiVersion": false, - "optional": false, - "scope": "Method", - "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.param", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "19" }, { - "$id": "25", - "kind": "method", - "name": "contentType", - "serializedName": "Content-Type", - "doc": "Body parameter's content type. Known values are application/json", - "type": { - "$ref": "5" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.contentType", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "22" }, { - "$id": "26", - "kind": "method", - "name": "accept", - "serializedName": "Accept", - "type": { - "$ref": "7" - }, - "location": "Header", - "isApiVersion": false, - "optional": false, - "scope": "Constant", - "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.test.accept", - "readOnly": false, - "access": "public", - "decorators": [] + "$ref": "24" } ], "response": { diff --git a/packages/http-client-csharp/generator/docs/backward-compatibility.md b/packages/http-client-csharp/generator/docs/backward-compatibility.md index 10a5ebd15b1..6858d0ba88d 100644 --- a/packages/http-client-csharp/generator/docs/backward-compatibility.md +++ b/packages/http-client-csharp/generator/docs/backward-compatibility.md @@ -11,6 +11,9 @@ - [API Version Enum](#api-version-enum) - [Non-abstract Base Models](#non-abstract-base-models) - [Model Constructors](#model-constructors) + - [Parameter Naming](#parameter-naming) + - [Page Size Parameter Casing Correction](#scenario-page-size-parameter-casing-correction) + - [Top Parameter Conversion to MaxCount](#scenario-top-parameter-conversion-to-maxcount) ## Overview @@ -359,3 +362,231 @@ public abstract partial class SearchIndexerDataIdentity - The constructor must have matching parameters (same count, types, and names) - The modifier is changed from `private protected` to `public` - No additional constructors are generated; only the accessibility is adjusted + +### Parameter Naming + +The generator maintains backward compatibility for parameter names to ensure that existing code continues to compile when parameter names are corrected, standardized, or converted to follow naming conventions. + +#### Scenario: Page Size Parameter Casing Correction + +**Description:** When a paging parameter name has incorrect casing in the TypeSpec (e.g., `maxpagesize` instead of `maxPageSize`), the generator handles it in two ways: + +1. **If the parameter exists in LastContractView**: The generator uses the exact casing from the previous version to maintain backward compatibility +2. **If the parameter does NOT exist in LastContractView**: The generator normalizes common badly-cased variants to proper camelCase (e.g., `maxpagesize` → `maxPageSize`) + +This commonly occurs when: + +- TypeSpec defines a paging parameter with non-standard casing (e.g., all lowercase) +- The generator needs to maintain API consistency while respecting the wire format +- New paging operations need standardized parameter naming + +**Example:** + +**Case 1: Parameter exists in LastContractView - badly-cased is preserved (backward compatibility)** + +Previous version had badly-cased parameter name: + +```csharp +public virtual AsyncPageable GetItemsAsync(int? maxpagesize = null, CancellationToken cancellationToken = default) +{ + HttpMessage CreateRequest() + { + var message = pipeline.CreateMessage(); + var request = message.Request; + request.Method = RequestMethod.Get; + var uri = new RequestUriBuilder(); + uri.Reset(endpoint); + uri.AppendPath("/items", false); + if (maxpagesize != null) + { + uri.AppendQuery("maxpagesize", maxpagesize.Value, true); // Serialized name from spec + } + // ... + } + // ... +} +``` + +Current TypeSpec still defines parameter with bad casing: + +```typespec +@query maxpagesize?: int32; // Lowercase in spec +``` + +**Generated Compatibility Result:** + +The generator detects the parameter in LastContractView and preserves its exact badly-cased name to maintain backward compatibility: + +```csharp +public virtual AsyncPageable GetItemsAsync(int? maxpagesize = null, CancellationToken cancellationToken = default) +{ + HttpMessage CreateRequest() + { + var message = pipeline.CreateMessage(); + var request = message.Request; + request.Method = RequestMethod.Get; + var uri = new RequestUriBuilder(); + uri.Reset(endpoint); + uri.AppendPath("/items", false); + if (maxpagesize != null) + { + uri.AppendQuery("maxpagesize", maxpagesize.Value, true); // Still badly-cased for backward compatibility + } + // ... + } + // ... +} +``` + +**Case 2: Parameter does NOT exist in LastContractView - badly-cased is normalized** + +New paging operation with badly-cased parameter (no previous version): + +```typespec +@query maxpagesize?: int32; // Lowercase in spec +``` + +**Generated Result:** + +The generator normalizes the parameter name to proper camelCase since there's no previous version to maintain compatibility with: + +```csharp +public virtual AsyncPageable GetItemsAsync(int? maxPageSize = null, CancellationToken cancellationToken = default) +{ + HttpMessage CreateRequest() + { + var message = pipeline.CreateMessage(); + var request = message.Request; + request.Method = RequestMethod.Get; + var uri = new RequestUriBuilder(); + uri.Reset(endpoint); + uri.AppendPath("/items", false); + if (maxPageSize != null) + { + uri.AppendQuery("maxpagesize", maxPageSize.Value, true); // Serialized name still uses spec's casing + } + // ... + } + // ... +} +``` + +**Key Points:** + +- **Case 1 (Backward compatibility)**: If the parameter exists in LastContractView, its exact casing is preserved - even if badly-cased +- **Case 2 (Normalization)**: If the parameter does NOT exist in LastContractView, badly-cased variants are normalized to proper camelCase +- The HTTP query parameter always uses the original serialized name from the spec (e.g., `maxpagesize`) +- Existing client code continues to compile without changes + +#### Scenario: Top Parameter Conversion to MaxCount + +**Description:** For paging operations, the generator converts the `top` parameter to `maxCount` to follow standard naming conventions. However, backward compatibility is maintained in two ways: + +1. **If the `top` parameter exists in LastContractView**: The generator preserves the `top` parameter name (with its exact casing) to maintain backward compatibility +2. **If the `top` parameter does NOT exist in LastContractView**: The generator converts `top` to the standardized `maxCount` parameter name + +This commonly occurs when: + +- Migrating from an older API version or generator that used `top` for pagination limits +- TypeSpec defines paging operations with a `top` parameter +- The generator needs to standardize on `maxCount` while maintaining backward compatibility + +**Example:** + +**Case 1: Top parameter exists in LastContractView - preserved for backward compatibility** + +Previous version had `top` parameter: + +```csharp +public virtual AsyncPageable GetItemsAsync(int? top = null, CancellationToken cancellationToken = default) +{ + HttpMessage CreateRequest() + { + var message = pipeline.CreateMessage(); + var request = message.Request; + request.Method = RequestMethod.Get; + var uri = new RequestUriBuilder(); + uri.Reset(endpoint); + uri.AppendPath("/items", false); + if (top != null) + { + uri.AppendQuery("top", top.Value, true); // Serialized name from spec + } + // ... + } + // ... +} +``` + +Current TypeSpec still defines `top` parameter: + +```typespec +op getItems(@query top?: int32): Page; +``` + +**Generated Compatibility Result:** + +The generator detects the `top` parameter in LastContractView and preserves it exactly to maintain backward compatibility: + +```csharp +public virtual AsyncPageable GetItemsAsync(int? top = null, CancellationToken cancellationToken = default) +{ + HttpMessage CreateRequest() + { + var message = pipeline.CreateMessage(); + var request = message.Request; + request.Method = RequestMethod.Get; + var uri = new RequestUriBuilder(); + uri.Reset(endpoint); + uri.AppendPath("/items", false); + if (top != null) + { + uri.AppendQuery("top", top.Value, true); // Still uses "top" for backward compatibility + } + // ... + } + // ... +} +``` + +**Case 2: Top parameter does NOT exist in LastContractView - converted to maxCount** + +New paging operation with `top` parameter (no previous version): + +```typespec +op getItems(@query top?: int32): Page; +``` + +**Generated Result:** + +The generator converts the parameter name to standardized `maxCount` since there's no previous version to maintain compatibility with: + +```csharp +public virtual AsyncPageable GetItemsAsync(int? maxCount = null, CancellationToken cancellationToken = default) +{ + HttpMessage CreateRequest() + { + var message = pipeline.CreateMessage(); + var request = message.Request; + request.Method = RequestMethod.Get; + var uri = new RequestUriBuilder(); + uri.Reset(endpoint); + uri.AppendPath("/items", false); + if (maxCount != null) + { + uri.AppendQuery("top", maxCount.Value, true); // Serialized name still uses "top" from spec + } + // ... + } + // ... +} +``` + +**Key Points:** + +- **Case 1 (Backward compatibility)**: If `top` parameter exists in LastContractView, its exact name and casing are preserved +- **Case 2 (Standardization)**: If `top` parameter does NOT exist in LastContractView, it is converted to `maxCount` for consistency +- The HTTP query parameter always uses the original serialized name from the spec (e.g., `top`) +- This conversion is specific to paging operations only +- Existing client code with `top` continues to compile without changes +- New code benefits from the standardized `maxCount` naming convention diff --git a/packages/http-client-csharp/global.json b/packages/http-client-csharp/global.json index 10d86daabda..311edc2181a 100644 --- a/packages/http-client-csharp/global.json +++ b/packages/http-client-csharp/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100", + "version": "10.0.103", "rollForward": "feature" } } diff --git a/packages/http-client-csharp/package-lock.json b/packages/http-client-csharp/package-lock.json index 9cae75a57f2..0291e11aba4 100644 --- a/packages/http-client-csharp/package-lock.json +++ b/packages/http-client-csharp/package-lock.json @@ -9,22 +9,24 @@ "version": "1.0.0", "license": "MIT", "devDependencies": { - "@azure-tools/azure-http-specs": "0.1.0-alpha.35", - "@azure-tools/typespec-client-generator-core": "0.64.4", + "@azure-tools/azure-http-specs": "0.1.0-alpha.38", + "@azure-tools/typespec-azure-core": "0.66.0", + "@azure-tools/typespec-client-generator-core": "0.66.3", "@microsoft/api-extractor": "^7.52.2", "@types/node": "~22.12.0", - "@typespec/compiler": "1.8.0", - "@typespec/http": "1.8.0", - "@typespec/http-specs": "0.1.0-alpha.30", - "@typespec/json-schema": "1.8.0", - "@typespec/library-linter": "0.78.0", - "@typespec/openapi": "1.8.0", - "@typespec/rest": "0.78.0", - "@typespec/spector": "0.1.0-alpha.20", - "@typespec/streams": "0.78.0", - "@typespec/tspd": "0.73.1", - "@typespec/versioning": "0.78.0", - "@typespec/xml": "0.78.0", + "@typespec/compiler": "1.10.0", + "@typespec/http": "1.10.0", + "@typespec/http-specs": "0.1.0-alpha.35", + "@typespec/json-schema": "1.10.0", + "@typespec/library-linter": "0.80.0", + "@typespec/openapi": "1.10.0", + "@typespec/rest": "0.80.0", + "@typespec/spector": "0.1.0-alpha.24", + "@typespec/sse": "0.80.0", + "@typespec/streams": "0.80.0", + "@typespec/tspd": "0.74.1", + "@typespec/versioning": "0.80.0", + "@typespec/xml": "0.80.0", "@vitest/coverage-v8": "^3.0.5", "@vitest/ui": "^3.0.5", "c8": "^10.1.2", @@ -33,19 +35,20 @@ "vitest": "^3.0.5" }, "peerDependencies": { - "@azure-tools/typespec-client-generator-core": ">=0.64.3 < 0.65.0 || ~0.65.0-0", - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/openapi": "^1.8.0", - "@typespec/rest": ">=0.78.0 <0.79.0 || ~0.79.0-0", - "@typespec/streams": ">=0.78.0 <0.79.0 || ~0.79.0-0", - "@typespec/versioning": ">=0.78.0 <0.79.0 || ~0.79.0-0" + "@azure-tools/typespec-client-generator-core": ">=0.66.3 <0.67.0 || ~0.67.0-0", + "@typespec/compiler": "^1.10.0", + "@typespec/http": "^1.10.0", + "@typespec/openapi": "^1.10.0", + "@typespec/rest": ">=0.80.0 <0.81.0 || ~0.81.0-0", + "@typespec/sse": ">=0.80.0 <0.81.0 || ~0.81.0-0", + "@typespec/streams": ">=0.80.0 <0.81.0 || ~0.81.0-0", + "@typespec/versioning": ">=0.80.0 <0.81.0 || ~0.81.0-0" } }, "node_modules/@alloy-js/core": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@alloy-js/core/-/core-0.21.0.tgz", - "integrity": "sha512-eIBllm+Lgk/AcV6QdipZAVlYPIp6RHmgz046GXBQeXZnTZXmPHURVFI18/FVuaK7K+uUt0eriPXIYXs4/Ja5rQ==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@alloy-js/core/-/core-0.22.0.tgz", + "integrity": "sha512-cqa6CL2m3zfPXF64Zr7WIqOpSWyqFi7ojQJVzpMjOsb1zJhoQzKt28/FCI6++Na4QDeSynOmWGEvHZ7CDYXn4w==", "dev": true, "license": "MIT", "dependencies": { @@ -57,24 +60,24 @@ } }, "node_modules/@alloy-js/markdown": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@alloy-js/markdown/-/markdown-0.21.0.tgz", - "integrity": "sha512-Er2aqWdolajWUrHxeqZoiK/Grdet2zaEr8ZtIbvv/M0sMz975p0ltijZNF3OnMde0wFlk1Jg14hkiitI9wFVgQ==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@alloy-js/markdown/-/markdown-0.22.0.tgz", + "integrity": "sha512-VslLzyk9780MaEAKH/9LE7dPcxIxHEx/V3+MsoZ8nHK+rvpmnTblxFJpbkLvmhUf8Oq2hmgsvfv7jIauBGI0rQ==", "dev": true, "license": "MIT", "dependencies": { - "@alloy-js/core": "~0.21.0", + "@alloy-js/core": "~0.22.0", "yaml": "^2.7.1" } }, "node_modules/@alloy-js/typescript": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@alloy-js/typescript/-/typescript-0.21.0.tgz", - "integrity": "sha512-SsxdYkXhrP8jjO2gENav9bHPHaonNrreW469RaOot3cRqhsHPA1RmBrzNPJov37YknzTg4Wlk0JsEFT4Qibgfg==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@alloy-js/typescript/-/typescript-0.22.0.tgz", + "integrity": "sha512-jARBNxAA5aEhysleFFd7cGfjckkEXLCH9kDaJSH5xBOu4cU0v7q5TvAqgPlEIkhfOh2983XLX0nVtZu01p0UjQ==", "dev": true, "license": "MIT", "dependencies": { - "@alloy-js/core": "~0.21.0", + "@alloy-js/core": "~0.22.0", "change-case": "^5.4.4", "pathe": "^2.0.3" } @@ -94,99 +97,46 @@ } }, "node_modules/@azure-tools/azure-http-specs": { - "version": "0.1.0-alpha.35", - "resolved": "https://registry.npmjs.org/@azure-tools/azure-http-specs/-/azure-http-specs-0.1.0-alpha.35.tgz", - "integrity": "sha512-ECvGts/kO4+5vpDVwZayk3RGhzsX5Ouwctjhv16Gd/jmKY6S9voGWqR23IfD9QjrsLCyoUVwljIZQrOfqv4HwQ==", + "version": "0.1.0-alpha.38", + "resolved": "https://registry.npmjs.org/@azure-tools/azure-http-specs/-/azure-http-specs-0.1.0-alpha.38.tgz", + "integrity": "sha512-OkwmMhmSNOV4PO4UA4Tm4ufyA0UPcOrWgZuhybQjWzUq0bbryW9y5ODyknvUV0Z0IOAInW1dUJQ2wRX9pLqNCA==", "dev": true, "license": "MIT", "dependencies": { - "@typespec/spec-api": "^0.1.0-alpha.12", - "@typespec/spector": "^0.1.0-alpha.22" + "@typespec/spec-api": "^0.1.0-alpha.13", + "@typespec/spector": "^0.1.0-alpha.24" }, "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": "^0.64.0", - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/rest": "^0.78.0", - "@typespec/versioning": "^0.78.0", - "@typespec/xml": "^0.78.0" - } - }, - "node_modules/@azure-tools/azure-http-specs/node_modules/@typespec/spector": { - "version": "0.1.0-alpha.22", - "resolved": "https://registry.npmjs.org/@typespec/spector/-/spector-0.1.0-alpha.22.tgz", - "integrity": "sha512-oxdJjoHcYdsschi1DYr8jOxFKHoiuI4Y2CX1tfCikSzijFg6iTd4GRr2qusGoVfgaTduHKrXOfsdSWc8ukFE/w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@azure/identity": "~4.13.0", - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/rest": "^0.78.0", - "@typespec/spec-api": "^0.1.0-alpha.12", - "@typespec/spec-coverage-sdk": "^0.1.0-alpha.14", - "@typespec/versioning": "^0.78.0", - "ajv": "~8.17.1", - "body-parser": "^2.2.0", - "deep-equal": "^2.2.0", - "express": "^5.2.1", - "globby": "~16.0.0", - "micromatch": "^4.0.8", - "morgan": "^1.10.0", - "multer": "^2.0.1", - "picocolors": "~1.1.1", - "source-map-support": "~0.5.21", - "xml2js": "^0.6.2", - "yaml": "~2.8.2", - "yargs": "~18.0.0" - }, - "bin": { - "tsp-spector": "cmd/cli.mjs" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@azure-tools/azure-http-specs/node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" + "@azure-tools/typespec-azure-core": "^0.66.0", + "@typespec/compiler": "^1.10.0", + "@typespec/http": "^1.10.0", + "@typespec/rest": "^0.80.0", + "@typespec/versioning": "^0.80.0", + "@typespec/xml": "^0.80.0" } }, "node_modules/@azure-tools/typespec-azure-core": { - "version": "0.64.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.64.0.tgz", - "integrity": "sha512-BXiHc5oayhMsG1dHFU1aFK/ZQX2Gl0dKB0FAFceapaFV9093J2obbsdhIDR3Tl0qei9g3Ha+iWKZ4KgnLdhv4w==", + "version": "0.66.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.66.0.tgz", + "integrity": "sha512-OBKxRN7AucK3snh+GtLKSDdcZTz08IgcSZlIO3c4KSlmcR5twT1NMyqf1+V8SAhyOdZimndb+ikzrkkgab+GpA==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/rest": "^0.78.0" + "@typespec/compiler": "^1.10.0", + "@typespec/http": "^1.10.0", + "@typespec/rest": "^0.80.0" } }, "node_modules/@azure-tools/typespec-client-generator-core": { - "version": "0.64.4", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.64.4.tgz", - "integrity": "sha512-ZAYdbTe47VVff3MarJTXXiu/xg4iIilipJbjbqROIYbNkXcnIyZSC1IYDkzKHU3qgYrEyHuBjoVZc7rkxAtOLA==", + "version": "0.66.3", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.66.3.tgz", + "integrity": "sha512-sNetQ6igxAp/vL6X2kEIy715ToDTqoJeb+OL59GEUtOW/3KBSi5tsxvDdCwSfEoaNEmv/FYjh/gJDwAWCJdFJg==", "dev": true, "license": "MIT", "dependencies": { @@ -198,16 +148,16 @@ "node": ">=20.0.0" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": "^0.64.0", - "@typespec/compiler": "^1.8.0", - "@typespec/events": "^0.78.0", - "@typespec/http": "^1.8.0", - "@typespec/openapi": "^1.8.0", - "@typespec/rest": "^0.78.0", - "@typespec/sse": "^0.78.0", - "@typespec/streams": "^0.78.0", - "@typespec/versioning": "^0.78.0", - "@typespec/xml": "^0.78.0" + "@azure-tools/typespec-azure-core": "^0.66.0", + "@typespec/compiler": "^1.10.0", + "@typespec/events": "^0.80.0", + "@typespec/http": "^1.10.0", + "@typespec/openapi": "^1.10.0", + "@typespec/rest": "^0.80.0", + "@typespec/sse": "^0.80.0", + "@typespec/streams": "^0.80.0", + "@typespec/versioning": "^0.80.0", + "@typespec/xml": "^0.80.0" } }, "node_modules/@azure/abort-controller": { @@ -258,18 +208,20 @@ } }, "node_modules/@azure/core-http-compat": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@azure/core-http-compat/-/core-http-compat-2.3.1.tgz", - "integrity": "sha512-az9BkXND3/d5VgdRRQVkiJb2gOmDU8Qcq4GvjtBmDICNiQ9udFmDk4ZpSB5Qq1OmtDJGlQAfBaS4palFsazQ5g==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@azure/core-http-compat/-/core-http-compat-2.3.2.tgz", + "integrity": "sha512-Tf6ltdKzOJEgxZeWLCjMxrxbodB/ZeCbzzA1A2qHbhzAjzjHoBVSUeSl/baT/oHAxhc4qdqVaDKnc2+iE932gw==", "dev": true, "license": "MIT", "dependencies": { - "@azure/abort-controller": "^2.1.2", - "@azure/core-client": "^1.10.0", - "@azure/core-rest-pipeline": "^1.22.0" + "@azure/abort-controller": "^2.1.2" }, "engines": { "node": ">=20.0.0" + }, + "peerDependencies": { + "@azure/core-client": "^1.10.0", + "@azure/core-rest-pipeline": "^1.22.0" } }, "node_modules/@azure/core-lro": { @@ -302,9 +254,9 @@ } }, "node_modules/@azure/core-rest-pipeline": { - "version": "1.22.2", - "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.22.2.tgz", - "integrity": "sha512-MzHym+wOi8CLUlKCQu12de0nwcq9k9Kuv43j4Wa++CsCpJwps2eeBQwD2Bu8snkxTtDKDx4GwjuR9E8yC8LNrg==", + "version": "1.23.0", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.23.0.tgz", + "integrity": "sha512-Evs1INHo+jUjwHi1T6SG6Ua/LHOQBCLuKEEE6efIpt4ZOoNonaT1kP32GoOcdNDbfqsD2445CPri3MubBy5DEQ==", "dev": true, "license": "MIT", "dependencies": { @@ -313,7 +265,7 @@ "@azure/core-tracing": "^1.3.0", "@azure/core-util": "^1.13.0", "@azure/logger": "^1.3.0", - "@typespec/ts-http-runtime": "^0.3.0", + "@typespec/ts-http-runtime": "^0.3.4", "tslib": "^2.6.2" }, "engines": { @@ -400,22 +352,22 @@ } }, "node_modules/@azure/msal-browser": { - "version": "4.27.0", - "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-4.27.0.tgz", - "integrity": "sha512-bZ8Pta6YAbdd0o0PEaL1/geBsPrLEnyY/RDWqvF1PP9RUH8EMLvUMGoZFYS6jSlUan6KZ9IMTLCnwpWWpQRK/w==", + "version": "4.29.0", + "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-4.29.0.tgz", + "integrity": "sha512-/f3eHkSNUTl6DLQHm+bKecjBKcRQxbd/XLx8lvSYp8Nl/HRyPuIPOijt9Dt0sH50/SxOwQ62RnFCmFlGK+bR/w==", "dev": true, "license": "MIT", "dependencies": { - "@azure/msal-common": "15.13.3" + "@azure/msal-common": "15.15.0" }, "engines": { "node": ">=0.8.0" } }, "node_modules/@azure/msal-common": { - "version": "15.13.3", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.13.3.tgz", - "integrity": "sha512-shSDU7Ioecya+Aob5xliW9IGq1Ui8y4EVSdWGyI1Gbm4Vg61WpP95LuzcY214/wEjSn6w4PZYD4/iVldErHayQ==", + "version": "15.15.0", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.15.0.tgz", + "integrity": "sha512-/n+bN0AKlVa+AOcETkJSKj38+bvFs78BaP4rNtv3MJCmPH0YrHiskMRe74OhyZ5DZjGISlFyxqvf9/4QVEi2tw==", "dev": true, "license": "MIT", "engines": { @@ -423,13 +375,13 @@ } }, "node_modules/@azure/msal-node": { - "version": "3.8.4", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.4.tgz", - "integrity": "sha512-lvuAwsDpPDE/jSuVQOBMpLbXuVuLsPNRwWCyK3/6bPlBk0fGWegqoZ0qjZclMWyQ2JNvIY3vHY7hoFmFmFQcOw==", + "version": "3.8.8", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.8.tgz", + "integrity": "sha512-+f1VrJH1iI517t4zgmuhqORja0bL6LDQXfBqkjuMmfTYXTQQnh1EvwwxO3UbKLT05N0obF72SRHFrC1RBDv5Gg==", "dev": true, "license": "MIT", "dependencies": { - "@azure/msal-common": "15.13.3", + "@azure/msal-common": "15.15.0", "jsonwebtoken": "^9.0.0", "uuid": "^8.3.0" }, @@ -438,9 +390,9 @@ } }, "node_modules/@azure/storage-blob": { - "version": "12.29.1", - "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.29.1.tgz", - "integrity": "sha512-7ktyY0rfTM0vo7HvtK6E3UvYnI9qfd6Oz6z/+92VhGRveWng3kJwMKeUpqmW/NmwcDNbxHpSlldG+vsUnRFnBg==", + "version": "12.31.0", + "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.31.0.tgz", + "integrity": "sha512-DBgNv10aCSxopt92DkTDD0o9xScXeBqPKGmR50FPZQaEcH4JLQ+GEOGEDv19V5BMkB7kxr+m4h6il/cCDPvmHg==", "dev": true, "license": "MIT", "dependencies": { @@ -455,7 +407,7 @@ "@azure/core-util": "^1.11.0", "@azure/core-xml": "^1.4.5", "@azure/logger": "^1.1.4", - "@azure/storage-common": "^12.1.1", + "@azure/storage-common": "^12.3.0", "events": "^3.0.0", "tslib": "^2.8.1" }, @@ -464,9 +416,9 @@ } }, "node_modules/@azure/storage-common": { - "version": "12.1.1", - "resolved": "https://registry.npmjs.org/@azure/storage-common/-/storage-common-12.1.1.tgz", - "integrity": "sha512-eIOH1pqFwI6UmVNnDQvmFeSg0XppuzDLFeUNO/Xht7ODAzRLgGDh7h550pSxoA+lPDxBl1+D2m/KG3jWzCUjTg==", + "version": "12.3.0", + "resolved": "https://registry.npmjs.org/@azure/storage-common/-/storage-common-12.3.0.tgz", + "integrity": "sha512-/OFHhy86aG5Pe8dP5tsp+BuJ25JOAl9yaMU3WZbkeoiFMHFtJ7tu5ili7qEdBXNW9G5lDB19trwyI6V49F/8iQ==", "dev": true, "license": "MIT", "dependencies": { @@ -485,13 +437,13 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", - "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz", + "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.27.1", + "@babel/helper-validator-identifier": "^7.28.5", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" }, @@ -520,13 +472,13 @@ } }, "node_modules/@babel/parser": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.6.tgz", - "integrity": "sha512-TeR9zWR18BvbfPmGbLampPMW+uW1NZnJlRuuHso8i87QZNq2JRF9i6RgxRqtEq+wQGsS19NNTWr2duhnE49mfQ==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz", + "integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.28.6" + "@babel/types": "^7.29.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -536,9 +488,9 @@ } }, "node_modules/@babel/types": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.6.tgz", - "integrity": "sha512-0ZrskXVEHSWIqZM/sQZ4EV3jZJXRkio/WCxaqKZP1g//CEWEPSfeZFcms4XeKBCHU0ZKnIkdJeU/kF+eRp5lBg==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz", + "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==", "dev": true, "license": "MIT", "dependencies": { @@ -571,9 +523,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz", - "integrity": "sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.3.tgz", + "integrity": "sha512-9fJMTNFTWZMh5qwrBItuziu834eOCUcEqymSH7pY+zoMVEZg3gcPuBNxH1EvfVYe9h0x/Ptw8KBzv7qxb7l8dg==", "cpu": [ "ppc64" ], @@ -588,9 +540,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.2.tgz", - "integrity": "sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.3.tgz", + "integrity": "sha512-i5D1hPY7GIQmXlXhs2w8AWHhenb00+GxjxRncS2ZM7YNVGNfaMxgzSGuO8o8SJzRc/oZwU2bcScvVERk03QhzA==", "cpu": [ "arm" ], @@ -605,9 +557,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.2.tgz", - "integrity": "sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.3.tgz", + "integrity": "sha512-YdghPYUmj/FX2SYKJ0OZxf+iaKgMsKHVPF1MAq/P8WirnSpCStzKJFjOjzsW0QQ7oIAiccHdcqjbHmJxRb/dmg==", "cpu": [ "arm64" ], @@ -622,9 +574,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.2.tgz", - "integrity": "sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.3.tgz", + "integrity": "sha512-IN/0BNTkHtk8lkOM8JWAYFg4ORxBkZQf9zXiEOfERX/CzxW3Vg1ewAhU7QSWQpVIzTW+b8Xy+lGzdYXV6UZObQ==", "cpu": [ "x64" ], @@ -639,9 +591,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.2.tgz", - "integrity": "sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.3.tgz", + "integrity": "sha512-Re491k7ByTVRy0t3EKWajdLIr0gz2kKKfzafkth4Q8A5n1xTHrkqZgLLjFEHVD+AXdUGgQMq+Godfq45mGpCKg==", "cpu": [ "arm64" ], @@ -656,9 +608,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.2.tgz", - "integrity": "sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.3.tgz", + "integrity": "sha512-vHk/hA7/1AckjGzRqi6wbo+jaShzRowYip6rt6q7VYEDX4LEy1pZfDpdxCBnGtl+A5zq8iXDcyuxwtv3hNtHFg==", "cpu": [ "x64" ], @@ -673,9 +625,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.2.tgz", - "integrity": "sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.3.tgz", + "integrity": "sha512-ipTYM2fjt3kQAYOvo6vcxJx3nBYAzPjgTCk7QEgZG8AUO3ydUhvelmhrbOheMnGOlaSFUoHXB6un+A7q4ygY9w==", "cpu": [ "arm64" ], @@ -690,9 +642,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.2.tgz", - "integrity": "sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.3.tgz", + "integrity": "sha512-dDk0X87T7mI6U3K9VjWtHOXqwAMJBNN2r7bejDsc+j03SEjtD9HrOl8gVFByeM0aJksoUuUVU9TBaZa2rgj0oA==", "cpu": [ "x64" ], @@ -707,9 +659,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.2.tgz", - "integrity": "sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.3.tgz", + "integrity": "sha512-s6nPv2QkSupJwLYyfS+gwdirm0ukyTFNl3KTgZEAiJDd+iHZcbTPPcWCcRYH+WlNbwChgH2QkE9NSlNrMT8Gfw==", "cpu": [ "arm" ], @@ -724,9 +676,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.2.tgz", - "integrity": "sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.3.tgz", + "integrity": "sha512-sZOuFz/xWnZ4KH3YfFrKCf1WyPZHakVzTiqji3WDc0BCl2kBwiJLCXpzLzUBLgmp4veFZdvN5ChW4Eq/8Fc2Fg==", "cpu": [ "arm64" ], @@ -741,9 +693,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.2.tgz", - "integrity": "sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.3.tgz", + "integrity": "sha512-yGlQYjdxtLdh0a3jHjuwOrxQjOZYD/C9PfdbgJJF3TIZWnm/tMd/RcNiLngiu4iwcBAOezdnSLAwQDPqTmtTYg==", "cpu": [ "ia32" ], @@ -758,9 +710,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.2.tgz", - "integrity": "sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.3.tgz", + "integrity": "sha512-WO60Sn8ly3gtzhyjATDgieJNet/KqsDlX5nRC5Y3oTFcS1l0KWba+SEa9Ja1GfDqSF1z6hif/SkpQJbL63cgOA==", "cpu": [ "loong64" ], @@ -775,9 +727,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.2.tgz", - "integrity": "sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.3.tgz", + "integrity": "sha512-APsymYA6sGcZ4pD6k+UxbDjOFSvPWyZhjaiPyl/f79xKxwTnrn5QUnXR5prvetuaSMsb4jgeHewIDCIWljrSxw==", "cpu": [ "mips64el" ], @@ -792,9 +744,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.2.tgz", - "integrity": "sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.3.tgz", + "integrity": "sha512-eizBnTeBefojtDb9nSh4vvVQ3V9Qf9Df01PfawPcRzJH4gFSgrObw+LveUyDoKU3kxi5+9RJTCWlj4FjYXVPEA==", "cpu": [ "ppc64" ], @@ -809,9 +761,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.2.tgz", - "integrity": "sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.3.tgz", + "integrity": "sha512-3Emwh0r5wmfm3ssTWRQSyVhbOHvqegUDRd0WhmXKX2mkHJe1SFCMJhagUleMq+Uci34wLSipf8Lagt4LlpRFWQ==", "cpu": [ "riscv64" ], @@ -826,9 +778,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.2.tgz", - "integrity": "sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.3.tgz", + "integrity": "sha512-pBHUx9LzXWBc7MFIEEL0yD/ZVtNgLytvx60gES28GcWMqil8ElCYR4kvbV2BDqsHOvVDRrOxGySBM9Fcv744hw==", "cpu": [ "s390x" ], @@ -843,9 +795,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.2.tgz", - "integrity": "sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.3.tgz", + "integrity": "sha512-Czi8yzXUWIQYAtL/2y6vogER8pvcsOsk5cpwL4Gk5nJqH5UZiVByIY8Eorm5R13gq+DQKYg0+JyQoytLQas4dA==", "cpu": [ "x64" ], @@ -860,9 +812,9 @@ } }, "node_modules/@esbuild/netbsd-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.2.tgz", - "integrity": "sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.3.tgz", + "integrity": "sha512-sDpk0RgmTCR/5HguIZa9n9u+HVKf40fbEUt+iTzSnCaGvY9kFP0YKBWZtJaraonFnqef5SlJ8/TiPAxzyS+UoA==", "cpu": [ "arm64" ], @@ -877,9 +829,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.2.tgz", - "integrity": "sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.3.tgz", + "integrity": "sha512-P14lFKJl/DdaE00LItAukUdZO5iqNH7+PjoBm+fLQjtxfcfFE20Xf5CrLsmZdq5LFFZzb5JMZ9grUwvtVYzjiA==", "cpu": [ "x64" ], @@ -894,9 +846,9 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.2.tgz", - "integrity": "sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.3.tgz", + "integrity": "sha512-AIcMP77AvirGbRl/UZFTq5hjXK+2wC7qFRGoHSDrZ5v5b8DK/GYpXW3CPRL53NkvDqb9D+alBiC/dV0Fb7eJcw==", "cpu": [ "arm64" ], @@ -911,9 +863,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.2.tgz", - "integrity": "sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.3.tgz", + "integrity": "sha512-DnW2sRrBzA+YnE70LKqnM3P+z8vehfJWHXECbwBmH/CU51z6FiqTQTHFenPlHmo3a8UgpLyH3PT+87OViOh1AQ==", "cpu": [ "x64" ], @@ -928,9 +880,9 @@ } }, "node_modules/@esbuild/openharmony-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.2.tgz", - "integrity": "sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.3.tgz", + "integrity": "sha512-NinAEgr/etERPTsZJ7aEZQvvg/A6IsZG/LgZy+81wON2huV7SrK3e63dU0XhyZP4RKGyTm7aOgmQk0bGp0fy2g==", "cpu": [ "arm64" ], @@ -945,9 +897,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.2.tgz", - "integrity": "sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.3.tgz", + "integrity": "sha512-PanZ+nEz+eWoBJ8/f8HKxTTD172SKwdXebZ0ndd953gt1HRBbhMsaNqjTyYLGLPdoWHy4zLU7bDVJztF5f3BHA==", "cpu": [ "x64" ], @@ -962,9 +914,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.2.tgz", - "integrity": "sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.3.tgz", + "integrity": "sha512-B2t59lWWYrbRDw/tjiWOuzSsFh1Y/E95ofKz7rIVYSQkUYBjfSgf6oeYPNWHToFRr2zx52JKApIcAS/D5TUBnA==", "cpu": [ "arm64" ], @@ -979,9 +931,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.2.tgz", - "integrity": "sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.3.tgz", + "integrity": "sha512-QLKSFeXNS8+tHW7tZpMtjlNb7HKau0QDpwm49u0vUp9y1WOF+PEzkU84y9GqYaAVW8aH8f3GcBck26jh54cX4Q==", "cpu": [ "ia32" ], @@ -996,9 +948,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz", - "integrity": "sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.3.tgz", + "integrity": "sha512-4uJGhsxuptu3OcpVAzli+/gWusVGwZZHTlS63hh++ehExkVT8SgiEf7/uC/PclrPPkLhZqGgCTjd0VWLo6xMqA==", "cpu": [ "x64" ], @@ -1013,16 +965,16 @@ } }, "node_modules/@gerrit0/mini-shiki": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/@gerrit0/mini-shiki/-/mini-shiki-3.21.0.tgz", - "integrity": "sha512-9PrsT5DjZA+w3lur/aOIx3FlDeHdyCEFlv9U+fmsVyjPZh61G5SYURQ/1ebe2U63KbDmI2V8IhIUegWb8hjOyg==", + "version": "3.22.0", + "resolved": "https://registry.npmjs.org/@gerrit0/mini-shiki/-/mini-shiki-3.22.0.tgz", + "integrity": "sha512-jMpciqEVUBKE1QwU64S4saNMzpsSza6diNCk4MWAeCxO2+LFi2FIFmL2S0VDLzEJCxuvCbU783xi8Hp/gkM5CQ==", "dev": true, "license": "MIT", "dependencies": { - "@shikijs/engine-oniguruma": "^3.21.0", - "@shikijs/langs": "^3.21.0", - "@shikijs/themes": "^3.21.0", - "@shikijs/types": "^3.21.0", + "@shikijs/engine-oniguruma": "^3.22.0", + "@shikijs/langs": "^3.22.0", + "@shikijs/themes": "^3.22.0", + "@shikijs/types": "^3.22.0", "@shikijs/vscode-textmate": "^10.0.2" } }, @@ -1370,88 +1322,14 @@ } } }, - "node_modules/@isaacs/balanced-match": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", - "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/@isaacs/brace-expansion": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz", - "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@isaacs/balanced-match": "^4.0.1" - }, - "engines": { - "node": "20 || >=22" - } - }, "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@isaacs/cliui/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-9.0.0.tgz", + "integrity": "sha512-AokJm4tuBHillT+FpMtxQ60n8ObyXBatq7jD2/JA9dxbDDokKQm8KMht5ibGzLVU9IJDIKK4TPKgMHEYMn3lMg==", "dev": true, - "license": "MIT" - }, - "node_modules/@isaacs/cliui/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, + "license": "BlueOak-1.0.0", "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + "node": ">=18" } }, "node_modules/@isaacs/fs-minipass": { @@ -1517,22 +1395,22 @@ } }, "node_modules/@microsoft/api-extractor": { - "version": "7.55.2", - "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.55.2.tgz", - "integrity": "sha512-1jlWO4qmgqYoVUcyh+oXYRztZde/pAi7cSVzBz/rc+S7CoVzDasy8QE13dx6sLG4VRo8SfkkLbFORR6tBw4uGQ==", + "version": "7.57.7", + "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.57.7.tgz", + "integrity": "sha512-kmnmVs32MFWbV5X6BInC1/TfCs7y1ugwxv1xHsAIj/DyUfoe7vtO0alRUgbQa57+yRGHBBjlNcEk33SCAt5/dA==", "dev": true, "license": "MIT", "dependencies": { - "@microsoft/api-extractor-model": "7.32.2", + "@microsoft/api-extractor-model": "7.33.4", "@microsoft/tsdoc": "~0.16.0", - "@microsoft/tsdoc-config": "~0.18.0", - "@rushstack/node-core-library": "5.19.1", - "@rushstack/rig-package": "0.6.0", - "@rushstack/terminal": "0.19.5", - "@rushstack/ts-command-line": "5.1.5", + "@microsoft/tsdoc-config": "~0.18.1", + "@rushstack/node-core-library": "5.20.3", + "@rushstack/rig-package": "0.7.2", + "@rushstack/terminal": "0.22.3", + "@rushstack/ts-command-line": "5.3.3", "diff": "~8.0.2", - "lodash": "~4.17.15", - "minimatch": "10.0.3", + "lodash": "~4.17.23", + "minimatch": "10.2.3", "resolve": "~1.22.1", "semver": "~7.5.4", "source-map": "~0.6.1", @@ -1543,15 +1421,15 @@ } }, "node_modules/@microsoft/api-extractor-model": { - "version": "7.32.2", - "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.32.2.tgz", - "integrity": "sha512-Ussc25rAalc+4JJs9HNQE7TuO9y6jpYQX9nWD1DhqUzYPBr3Lr7O9intf+ZY8kD5HnIqeIRJX7ccCT0QyBy2Ww==", + "version": "7.33.4", + "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.33.4.tgz", + "integrity": "sha512-u1LTaNTikZAQ9uK6KG1Ms7nvNedsnODnspq/gH2dcyETWvH4hVNGNDvRAEutH66kAmxA4/necElqGNs1FggC8w==", "dev": true, "license": "MIT", "dependencies": { "@microsoft/tsdoc": "~0.16.0", - "@microsoft/tsdoc-config": "~0.18.0", - "@rushstack/node-core-library": "5.19.1" + "@microsoft/tsdoc-config": "~0.18.1", + "@rushstack/node-core-library": "5.20.3" } }, "node_modules/@microsoft/api-extractor/node_modules/typescript": { @@ -1576,14 +1454,14 @@ "license": "MIT" }, "node_modules/@microsoft/tsdoc-config": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.18.0.tgz", - "integrity": "sha512-8N/vClYyfOH+l4fLkkr9+myAoR6M7akc8ntBJ4DJdWH2b09uVfr71+LTMpNyG19fNqWDg8KEDZhx5wxuqHyGjw==", + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.18.1.tgz", + "integrity": "sha512-9brPoVdfN9k9g0dcWkFeA7IH9bbcttzDJlXvkf8b2OBzd5MueR1V2wkKBL0abn0otvmkHJC6aapBOTJDDeMCZg==", "dev": true, "license": "MIT", "dependencies": { "@microsoft/tsdoc": "0.16.0", - "ajv": "~8.12.0", + "ajv": "~8.18.0", "jju": "~1.4.0", "resolve": "~1.22.2" } @@ -1645,9 +1523,9 @@ "license": "MIT" }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.55.1.tgz", - "integrity": "sha512-9R0DM/ykwfGIlNu6+2U09ga0WXeZ9MRC2Ter8jnz8415VbuIykVuc6bhdrbORFZANDmTDvq26mJrEVTl8TdnDg==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.57.1.tgz", + "integrity": "sha512-A6ehUVSiSaaliTxai040ZpZ2zTevHYbvu/lDoeAteHI8QnaosIzm4qwtezfRg1jOYaUmnzLX1AOD6Z+UJjtifg==", "cpu": [ "arm" ], @@ -1659,9 +1537,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.55.1.tgz", - "integrity": "sha512-eFZCb1YUqhTysgW3sj/55du5cG57S7UTNtdMjCW7LwVcj3dTTcowCsC8p7uBdzKsZYa8J7IDE8lhMI+HX1vQvg==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.57.1.tgz", + "integrity": "sha512-dQaAddCY9YgkFHZcFNS/606Exo8vcLHwArFZ7vxXq4rigo2bb494/xKMMwRRQW6ug7Js6yXmBZhSBRuBvCCQ3w==", "cpu": [ "arm64" ], @@ -1673,9 +1551,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.55.1.tgz", - "integrity": "sha512-p3grE2PHcQm2e8PSGZdzIhCKbMCw/xi9XvMPErPhwO17vxtvCN5FEA2mSLgmKlCjHGMQTP6phuQTYWUnKewwGg==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.57.1.tgz", + "integrity": "sha512-crNPrwJOrRxagUYeMn/DZwqN88SDmwaJ8Cvi/TN1HnWBU7GwknckyosC2gd0IqYRsHDEnXf328o9/HC6OkPgOg==", "cpu": [ "arm64" ], @@ -1687,9 +1565,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.55.1.tgz", - "integrity": "sha512-rDUjG25C9qoTm+e02Esi+aqTKSBYwVTaoS1wxcN47/Luqef57Vgp96xNANwt5npq9GDxsH7kXxNkJVEsWEOEaQ==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.57.1.tgz", + "integrity": "sha512-Ji8g8ChVbKrhFtig5QBV7iMaJrGtpHelkB3lsaKzadFBe58gmjfGXAOfI5FV0lYMH8wiqsxKQ1C9B0YTRXVy4w==", "cpu": [ "x64" ], @@ -1701,9 +1579,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.55.1.tgz", - "integrity": "sha512-+JiU7Jbp5cdxekIgdte0jfcu5oqw4GCKr6i3PJTlXTCU5H5Fvtkpbs4XJHRmWNXF+hKmn4v7ogI5OQPaupJgOg==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.57.1.tgz", + "integrity": "sha512-R+/WwhsjmwodAcz65guCGFRkMb4gKWTcIeLy60JJQbXrJ97BOXHxnkPFrP+YwFlaS0m+uWJTstrUA9o+UchFug==", "cpu": [ "arm64" ], @@ -1715,9 +1593,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.55.1.tgz", - "integrity": "sha512-V5xC1tOVWtLLmr3YUk2f6EJK4qksksOYiz/TCsFHu/R+woubcLWdC9nZQmwjOAbmExBIVKsm1/wKmEy4z4u4Bw==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.57.1.tgz", + "integrity": "sha512-IEQTCHeiTOnAUC3IDQdzRAGj3jOAYNr9kBguI7MQAAZK3caezRrg0GxAb6Hchg4lxdZEI5Oq3iov/w/hnFWY9Q==", "cpu": [ "x64" ], @@ -1729,9 +1607,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.55.1.tgz", - "integrity": "sha512-Rn3n+FUk2J5VWx+ywrG/HGPTD9jXNbicRtTM11e/uorplArnXZYsVifnPPqNNP5BsO3roI4n8332ukpY/zN7rQ==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.57.1.tgz", + "integrity": "sha512-F8sWbhZ7tyuEfsmOxwc2giKDQzN3+kuBLPwwZGyVkLlKGdV1nvnNwYD0fKQ8+XS6hp9nY7B+ZeK01EBUE7aHaw==", "cpu": [ "arm" ], @@ -1743,9 +1621,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.55.1.tgz", - "integrity": "sha512-grPNWydeKtc1aEdrJDWk4opD7nFtQbMmV7769hiAaYyUKCT1faPRm2av8CX1YJsZ4TLAZcg9gTR1KvEzoLjXkg==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.57.1.tgz", + "integrity": "sha512-rGfNUfn0GIeXtBP1wL5MnzSj98+PZe/AXaGBCRmT0ts80lU5CATYGxXukeTX39XBKsxzFpEeK+Mrp9faXOlmrw==", "cpu": [ "arm" ], @@ -1757,9 +1635,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.55.1.tgz", - "integrity": "sha512-a59mwd1k6x8tXKcUxSyISiquLwB5pX+fJW9TkWU46lCqD/GRDe9uDN31jrMmVP3feI3mhAdvcCClhV8V5MhJFQ==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.57.1.tgz", + "integrity": "sha512-MMtej3YHWeg/0klK2Qodf3yrNzz6CGjo2UntLvk2RSPlhzgLvYEB3frRvbEF2wRKh1Z2fDIg9KRPe1fawv7C+g==", "cpu": [ "arm64" ], @@ -1771,9 +1649,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.55.1.tgz", - "integrity": "sha512-puS1MEgWX5GsHSoiAsF0TYrpomdvkaXm0CofIMG5uVkP6IBV+ZO9xhC5YEN49nsgYo1DuuMquF9+7EDBVYu4uA==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.57.1.tgz", + "integrity": "sha512-1a/qhaaOXhqXGpMFMET9VqwZakkljWHLmZOX48R0I/YLbhdxr1m4gtG1Hq7++VhVUmf+L3sTAf9op4JlhQ5u1Q==", "cpu": [ "arm64" ], @@ -1785,9 +1663,9 @@ ] }, "node_modules/@rollup/rollup-linux-loong64-gnu": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.55.1.tgz", - "integrity": "sha512-r3Wv40in+lTsULSb6nnoudVbARdOwb2u5fpeoOAZjFLznp6tDU8kd+GTHmJoqZ9lt6/Sys33KdIHUaQihFcu7g==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.57.1.tgz", + "integrity": "sha512-QWO6RQTZ/cqYtJMtxhkRkidoNGXc7ERPbZN7dVW5SdURuLeVU7lwKMpo18XdcmpWYd0qsP1bwKPf7DNSUinhvA==", "cpu": [ "loong64" ], @@ -1799,9 +1677,9 @@ ] }, "node_modules/@rollup/rollup-linux-loong64-musl": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.55.1.tgz", - "integrity": "sha512-MR8c0+UxAlB22Fq4R+aQSPBayvYa3+9DrwG/i1TKQXFYEaoW3B5b/rkSRIypcZDdWjWnpcvxbNaAJDcSbJU3Lw==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.57.1.tgz", + "integrity": "sha512-xpObYIf+8gprgWaPP32xiN5RVTi/s5FCR+XMXSKmhfoJjrpRAjCuuqQXyxUa/eJTdAE6eJ+KDKaoEqjZQxh3Gw==", "cpu": [ "loong64" ], @@ -1813,9 +1691,9 @@ ] }, "node_modules/@rollup/rollup-linux-ppc64-gnu": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.55.1.tgz", - "integrity": "sha512-3KhoECe1BRlSYpMTeVrD4sh2Pw2xgt4jzNSZIIPLFEsnQn9gAnZagW9+VqDqAHgm1Xc77LzJOo2LdigS5qZ+gw==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.57.1.tgz", + "integrity": "sha512-4BrCgrpZo4hvzMDKRqEaW1zeecScDCR+2nZ86ATLhAoJ5FQ+lbHVD3ttKe74/c7tNT9c6F2viwB3ufwp01Oh2w==", "cpu": [ "ppc64" ], @@ -1827,9 +1705,9 @@ ] }, "node_modules/@rollup/rollup-linux-ppc64-musl": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.55.1.tgz", - "integrity": "sha512-ziR1OuZx0vdYZZ30vueNZTg73alF59DicYrPViG0NEgDVN8/Jl87zkAPu4u6VjZST2llgEUjaiNl9JM6HH1Vdw==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.57.1.tgz", + "integrity": "sha512-NOlUuzesGauESAyEYFSe3QTUguL+lvrN1HtwEEsU2rOwdUDeTMJdO5dUYl/2hKf9jWydJrO9OL/XSSf65R5+Xw==", "cpu": [ "ppc64" ], @@ -1841,9 +1719,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.55.1.tgz", - "integrity": "sha512-uW0Y12ih2XJRERZ4jAfKamTyIHVMPQnTZcQjme2HMVDAHY4amf5u414OqNYC+x+LzRdRcnIG1YodLrrtA8xsxw==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.57.1.tgz", + "integrity": "sha512-ptA88htVp0AwUUqhVghwDIKlvJMD/fmL/wrQj99PRHFRAG6Z5nbWoWG4o81Nt9FT+IuqUQi+L31ZKAFeJ5Is+A==", "cpu": [ "riscv64" ], @@ -1855,9 +1733,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.55.1.tgz", - "integrity": "sha512-u9yZ0jUkOED1BFrqu3BwMQoixvGHGZ+JhJNkNKY/hyoEgOwlqKb62qu+7UjbPSHYjiVy8kKJHvXKv5coH4wDeg==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.57.1.tgz", + "integrity": "sha512-S51t7aMMTNdmAMPpBg7OOsTdn4tySRQvklmL3RpDRyknk87+Sp3xaumlatU+ppQ+5raY7sSTcC2beGgvhENfuw==", "cpu": [ "riscv64" ], @@ -1869,9 +1747,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.55.1.tgz", - "integrity": "sha512-/0PenBCmqM4ZUd0190j7J0UsQ/1nsi735iPRakO8iPciE7BQ495Y6msPzaOmvx0/pn+eJVVlZrNrSh4WSYLxNg==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.57.1.tgz", + "integrity": "sha512-Bl00OFnVFkL82FHbEqy3k5CUCKH6OEJL54KCyx2oqsmZnFTR8IoNqBF+mjQVcRCT5sB6yOvK8A37LNm/kPJiZg==", "cpu": [ "s390x" ], @@ -1883,9 +1761,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.55.1.tgz", - "integrity": "sha512-a8G4wiQxQG2BAvo+gU6XrReRRqj+pLS2NGXKm8io19goR+K8lw269eTrPkSdDTALwMmJp4th2Uh0D8J9bEV1vg==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.57.1.tgz", + "integrity": "sha512-ABca4ceT4N+Tv/GtotnWAeXZUZuM/9AQyCyKYyKnpk4yoA7QIAuBt6Hkgpw8kActYlew2mvckXkvx0FfoInnLg==", "cpu": [ "x64" ], @@ -1897,9 +1775,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.55.1.tgz", - "integrity": "sha512-bD+zjpFrMpP/hqkfEcnjXWHMw5BIghGisOKPj+2NaNDuVT+8Ds4mPf3XcPHuat1tz89WRL+1wbcxKY3WSbiT7w==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.57.1.tgz", + "integrity": "sha512-HFps0JeGtuOR2convgRRkHCekD7j+gdAuXM+/i6kGzQtFhlCtQkpwtNzkNj6QhCDp7DRJ7+qC/1Vg2jt5iSOFw==", "cpu": [ "x64" ], @@ -1911,9 +1789,9 @@ ] }, "node_modules/@rollup/rollup-openbsd-x64": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.55.1.tgz", - "integrity": "sha512-eLXw0dOiqE4QmvikfQ6yjgkg/xDM+MdU9YJuP4ySTibXU0oAvnEWXt7UDJmD4UkYialMfOGFPJnIHSe/kdzPxg==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.57.1.tgz", + "integrity": "sha512-H+hXEv9gdVQuDTgnqD+SQffoWoc0Of59AStSzTEj/feWTBAnSfSD3+Dql1ZruJQxmykT/JVY0dE8Ka7z0DH1hw==", "cpu": [ "x64" ], @@ -1925,9 +1803,9 @@ ] }, "node_modules/@rollup/rollup-openharmony-arm64": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.55.1.tgz", - "integrity": "sha512-xzm44KgEP11te3S2HCSyYf5zIzWmx3n8HDCc7EE59+lTcswEWNpvMLfd9uJvVX8LCg9QWG67Xt75AuHn4vgsXw==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.57.1.tgz", + "integrity": "sha512-4wYoDpNg6o/oPximyc/NG+mYUejZrCU2q+2w6YZqrAs2UcNUChIZXjtafAiiZSUc7On8v5NyNj34Kzj/Ltk6dQ==", "cpu": [ "arm64" ], @@ -1939,9 +1817,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.55.1.tgz", - "integrity": "sha512-yR6Bl3tMC/gBok5cz/Qi0xYnVbIxGx5Fcf/ca0eB6/6JwOY+SRUcJfI0OpeTpPls7f194as62thCt/2BjxYN8g==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.57.1.tgz", + "integrity": "sha512-O54mtsV/6LW3P8qdTcamQmuC990HDfR71lo44oZMZlXU4tzLrbvTii87Ni9opq60ds0YzuAlEr/GNwuNluZyMQ==", "cpu": [ "arm64" ], @@ -1953,9 +1831,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.55.1.tgz", - "integrity": "sha512-3fZBidchE0eY0oFZBnekYCfg+5wAB0mbpCBuofh5mZuzIU/4jIVkbESmd2dOsFNS78b53CYv3OAtwqkZZmU5nA==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.57.1.tgz", + "integrity": "sha512-P3dLS+IerxCT/7D2q2FYcRdWRl22dNbrbBEtxdWhXrfIMPP9lQhb5h4Du04mdl5Woq05jVCDPCMF7Ub0NAjIew==", "cpu": [ "ia32" ], @@ -1967,9 +1845,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-gnu": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.55.1.tgz", - "integrity": "sha512-xGGY5pXj69IxKb4yv/POoocPy/qmEGhimy/FoTpTSVju3FYXUQQMFCaZZXJVidsmGxRioZAwpThl/4zX41gRKg==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.57.1.tgz", + "integrity": "sha512-VMBH2eOOaKGtIJYleXsi2B8CPVADrh+TyNxJ4mWPnKfLB/DBUmzW+5m1xUrcwWoMfSLagIRpjUFeW5CO5hyciQ==", "cpu": [ "x64" ], @@ -1981,9 +1859,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.55.1.tgz", - "integrity": "sha512-SPEpaL6DX4rmcXtnhdrQYgzQ5W2uW3SCJch88lB2zImhJRhIIK44fkUrgIV/Q8yUNfw5oyZ5vkeQsZLhCb06lw==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.57.1.tgz", + "integrity": "sha512-mxRFDdHIWRxg3UfIIAwCm6NzvxG0jDX/wBN6KsQFTvKFqqg9vTrWUE68qEjHt19A5wwx5X5aUi2zuZT7YR0jrA==", "cpu": [ "x64" ], @@ -1995,13 +1873,13 @@ ] }, "node_modules/@rushstack/node-core-library": { - "version": "5.19.1", - "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.19.1.tgz", - "integrity": "sha512-ESpb2Tajlatgbmzzukg6zyAhH+sICqJR2CNXNhXcEbz6UGCQfrKCtkxOpJTftWc8RGouroHG0Nud1SJAszvpmA==", + "version": "5.20.3", + "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.20.3.tgz", + "integrity": "sha512-95JgEPq2k7tHxhF9/OJnnyHDXfC9cLhhta0An/6MlkDsX2A6dTzDrTUG18vx4vjc280V0fi0xDH9iQczpSuWsw==", "dev": true, "license": "MIT", "dependencies": { - "ajv": "~8.13.0", + "ajv": "~8.18.0", "ajv-draft-04": "~1.0.0", "ajv-formats": "~3.0.1", "fs-extra": "~11.3.0", @@ -2019,27 +1897,10 @@ } } }, - "node_modules/@rushstack/node-core-library/node_modules/ajv": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz", - "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.3", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.4.1" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, "node_modules/@rushstack/problem-matcher": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@rushstack/problem-matcher/-/problem-matcher-0.1.1.tgz", - "integrity": "sha512-Fm5XtS7+G8HLcJHCWpES5VmeMyjAKaWeyZU5qPzZC+22mPlJzAsOxymHiWIfuirtPckX3aptWws+K2d0BzniJA==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@rushstack/problem-matcher/-/problem-matcher-0.2.1.tgz", + "integrity": "sha512-gulfhBs6n+I5b7DvjKRfhMGyUejtSgOHTclF/eONr8hcgF1APEDjhxIsfdUYYMzC3rvLwGluqLjbwCFZ8nxrog==", "dev": true, "license": "MIT", "peerDependencies": { @@ -2052,9 +1913,9 @@ } }, "node_modules/@rushstack/rig-package": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.6.0.tgz", - "integrity": "sha512-ZQmfzsLE2+Y91GF15c65L/slMRVhF6Hycq04D4TwtdGaUAbIXXg9c5pKA5KFU7M4QMaihoobp9JJYpYcaY3zOw==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.7.2.tgz", + "integrity": "sha512-9XbFWuqMYcHUso4mnETfhGVUSaADBRj6HUAAEYk50nMPn8WRICmBuCphycQGNB3duIR6EEZX3Xj3SYc2XiP+9A==", "dev": true, "license": "MIT", "dependencies": { @@ -2063,14 +1924,14 @@ } }, "node_modules/@rushstack/terminal": { - "version": "0.19.5", - "resolved": "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.19.5.tgz", - "integrity": "sha512-6k5tpdB88G0K7QrH/3yfKO84HK9ggftfUZ51p7fePyCE7+RLLHkWZbID9OFWbXuna+eeCFE7AkKnRMHMxNbz7Q==", + "version": "0.22.3", + "resolved": "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.22.3.tgz", + "integrity": "sha512-gHC9pIMrUPzAbBiI4VZMU7Q+rsCzb8hJl36lFIulIzoceKotyKL3Rd76AZ2CryCTKEg+0bnTj406HE5YY5OQvw==", "dev": true, "license": "MIT", "dependencies": { - "@rushstack/node-core-library": "5.19.1", - "@rushstack/problem-matcher": "0.1.1", + "@rushstack/node-core-library": "5.20.3", + "@rushstack/problem-matcher": "0.2.1", "supports-color": "~8.1.1" }, "peerDependencies": { @@ -2083,53 +1944,53 @@ } }, "node_modules/@rushstack/ts-command-line": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-5.1.5.tgz", - "integrity": "sha512-YmrFTFUdHXblYSa+Xc9OO9FsL/XFcckZy0ycQ6q7VSBsVs5P0uD9vcges5Q9vctGlVdu27w+Ct6IuJ458V0cTQ==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-5.3.3.tgz", + "integrity": "sha512-c+ltdcvC7ym+10lhwR/vWiOhsrm/bP3By2VsFcs5qTKv+6tTmxgbVrtJ5NdNjANiV5TcmOZgUN+5KYQ4llsvEw==", "dev": true, "license": "MIT", "dependencies": { - "@rushstack/terminal": "0.19.5", + "@rushstack/terminal": "0.22.3", "@types/argparse": "1.0.38", "argparse": "~1.0.9", "string-argv": "~0.3.1" } }, "node_modules/@shikijs/engine-oniguruma": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-3.21.0.tgz", - "integrity": "sha512-OYknTCct6qiwpQDqDdf3iedRdzj6hFlOPv5hMvI+hkWfCKs5mlJ4TXziBG9nyabLwGulrUjHiCq3xCspSzErYQ==", + "version": "3.22.0", + "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-3.22.0.tgz", + "integrity": "sha512-DyXsOG0vGtNtl7ygvabHd7Mt5EY8gCNqR9Y7Lpbbd/PbJvgWrqaKzH1JW6H6qFkuUa8aCxoiYVv8/YfFljiQxA==", "dev": true, "license": "MIT", "dependencies": { - "@shikijs/types": "3.21.0", + "@shikijs/types": "3.22.0", "@shikijs/vscode-textmate": "^10.0.2" } }, "node_modules/@shikijs/langs": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-3.21.0.tgz", - "integrity": "sha512-g6mn5m+Y6GBJ4wxmBYqalK9Sp0CFkUqfNzUy2pJglUginz6ZpWbaWjDB4fbQ/8SHzFjYbtU6Ddlp1pc+PPNDVA==", + "version": "3.22.0", + "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-3.22.0.tgz", + "integrity": "sha512-x/42TfhWmp6H00T6uwVrdTJGKgNdFbrEdhaDwSR5fd5zhQ1Q46bHq9EO61SCEWJR0HY7z2HNDMaBZp8JRmKiIA==", "dev": true, "license": "MIT", "dependencies": { - "@shikijs/types": "3.21.0" + "@shikijs/types": "3.22.0" } }, "node_modules/@shikijs/themes": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-3.21.0.tgz", - "integrity": "sha512-BAE4cr9EDiZyYzwIHEk7JTBJ9CzlPuM4PchfcA5ao1dWXb25nv6hYsoDiBq2aZK9E3dlt3WB78uI96UESD+8Mw==", + "version": "3.22.0", + "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-3.22.0.tgz", + "integrity": "sha512-o+tlOKqsr6FE4+mYJG08tfCFDS+3CG20HbldXeVoyP+cYSUxDhrFf3GPjE60U55iOkkjbpY2uC3It/eeja35/g==", "dev": true, "license": "MIT", "dependencies": { - "@shikijs/types": "3.21.0" + "@shikijs/types": "3.22.0" } }, "node_modules/@shikijs/types": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.21.0.tgz", - "integrity": "sha512-zGrWOxZ0/+0ovPY7PvBU2gIS9tmhSUUt30jAcNV0Bq0gb2S98gwfjIs1vxlmH5zM7/4YxLamT6ChlqqAJmPPjA==", + "version": "3.22.0", + "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.22.0.tgz", + "integrity": "sha512-491iAekgKDBFE67z70Ok5a8KBMsQ2IJwOWw3us/7ffQkIBCyOQfm/aNwVMBUriP02QshIfgHCBSIYAl3u2eWjg==", "dev": true, "license": "MIT", "dependencies": { @@ -2206,13 +2067,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/js-yaml": { - "version": "4.0.9", - "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.9.tgz", - "integrity": "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/node": { "version": "22.12.0", "resolved": "https://registry.npmjs.org/@types/node/-/node-22.12.0.tgz", @@ -2223,6 +2077,13 @@ "undici-types": "~6.20.0" } }, + "node_modules/@types/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/unist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", @@ -2231,35 +2092,35 @@ "license": "MIT" }, "node_modules/@typespec/asset-emitter": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/asset-emitter/-/asset-emitter-0.78.0.tgz", - "integrity": "sha512-TA9MzNI+SJEYKNWdbSsWXhjnVOL+2VvsBqzExXKQmoN6zxu3dAImqrMG/oTA6FS4pbCU4vmWgLUiOmikvjm22Q==", + "version": "0.79.1", + "resolved": "https://registry.npmjs.org/@typespec/asset-emitter/-/asset-emitter-0.79.1.tgz", + "integrity": "sha512-53s3GLu5BwNkl7Itr/OizfhymTV2u7k5/cwjUOAt03AUDfiKlwbsp+iCIsq1vccJuoDOiXOceJOfL8rAf4/9LQ==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0" + "@typespec/compiler": "^1.10.0" } }, "node_modules/@typespec/compiler": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-1.8.0.tgz", - "integrity": "sha512-FeLb7Q0z6Bh5dDpqtnU2RlWiIWWWF7rujx2xGMta5dcTuIOZ4jbdyz1hVdxk4iM4qadvaSV4ey/qrSuffNoh3w==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-1.10.0.tgz", + "integrity": "sha512-R6BATDkughntPpaxeESJF+wxma5PEjgmnnKvH0/ByqUH8VyhIckQWE9kkP0Uc/EJ0o0VYhe8qCwWQvV70k5lTw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "~7.27.1", + "@babel/code-frame": "~7.29.0", "@inquirer/prompts": "^8.0.1", - "ajv": "~8.17.1", + "ajv": "~8.18.0", "change-case": "~5.4.4", - "env-paths": "^3.0.0", - "globby": "~16.0.0", + "env-paths": "^4.0.0", + "globby": "~16.1.0", "is-unicode-supported": "^2.1.0", "mustache": "~4.2.0", "picocolors": "~1.1.1", - "prettier": "~3.7.4", + "prettier": "~3.8.0", "semver": "^7.7.1", "tar": "^7.5.2", "temporal-polyfill": "^0.3.0", @@ -2276,27 +2137,10 @@ "node": ">=20.0.0" } }, - "node_modules/@typespec/compiler/node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, "node_modules/@typespec/compiler/node_modules/semver": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", - "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", + "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", "dev": true, "license": "ISC", "bin": { @@ -2307,9 +2151,9 @@ } }, "node_modules/@typespec/events": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/events/-/events-0.78.0.tgz", - "integrity": "sha512-gSI4rAexxfYyZX0ZqYNRWQyuMb1UeakjAjOeh/2ntmxWCdYc+wSbJjxrxIArsZC+LwzTxq5WpdtD7+7OWzG4yw==", + "version": "0.80.0", + "resolved": "https://registry.npmjs.org/@typespec/events/-/events-0.80.0.tgz", + "integrity": "sha512-FrWEUwxhDNbE2YN4fyqV5Qrz9qFJbvPoiKrJM7dexkb7eyhepq3dbc5zZgAm/qFBQ+XxGQQVJ4swXxKT+338fw==", "dev": true, "license": "MIT", "peer": true, @@ -2317,21 +2161,21 @@ "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0" + "@typespec/compiler": "^1.10.0" } }, "node_modules/@typespec/http": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@typespec/http/-/http-1.8.0.tgz", - "integrity": "sha512-ZKa4RISabwL8cUAmE3BkoNmtCYRjerO0+1Ba6XdDJKG+vJC5EGM2hkDf+ZmYsYZgrX0cvbhPXUKKh28zBV60hw==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@typespec/http/-/http-1.10.0.tgz", + "integrity": "sha512-/fj55fmUj4m/FmNdfH0V52menVrmS2r5Xj9d1H+pnjQbxvvaxS906RSRcoF8kbg3PvlibP/Py5u82TAk53AyqA==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0", - "@typespec/streams": "^0.78.0" + "@typespec/compiler": "^1.10.0", + "@typespec/streams": "^0.80.0" }, "peerDependenciesMeta": { "@typespec/streams": { @@ -2340,141 +2184,89 @@ } }, "node_modules/@typespec/http-specs": { - "version": "0.1.0-alpha.30", - "resolved": "https://registry.npmjs.org/@typespec/http-specs/-/http-specs-0.1.0-alpha.30.tgz", - "integrity": "sha512-9c/npRHmX+IL4iAuXcDw5Jyy/exTu7IEp4i+JxYj43e+/g8gzFKFRMtJhcrH2xaABMFtrDW5oxXz0mh8PJaIjg==", + "version": "0.1.0-alpha.35", + "resolved": "https://registry.npmjs.org/@typespec/http-specs/-/http-specs-0.1.0-alpha.35.tgz", + "integrity": "sha512-xLQUmldKvO0TTOf/wpYLbj2dIuXiQfw3gGKN0ZblD3Q3VGHOXEYEALdQ7lQWn3l2lV33cKgEfC3fX/q/p9N/ug==", "dev": true, "license": "MIT", "dependencies": { - "@typespec/spec-api": "^0.1.0-alpha.12", - "@typespec/spector": "^0.1.0-alpha.22", - "deep-equal": "^2.2.0" + "@typespec/spec-api": "^0.1.0-alpha.13", + "@typespec/spector": "^0.1.0-alpha.24", + "deep-equal": "^2.2.3" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/rest": "^0.78.0", - "@typespec/versioning": "^0.78.0", - "@typespec/xml": "^0.78.0" - } - }, - "node_modules/@typespec/http-specs/node_modules/@typespec/spector": { - "version": "0.1.0-alpha.22", - "resolved": "https://registry.npmjs.org/@typespec/spector/-/spector-0.1.0-alpha.22.tgz", - "integrity": "sha512-oxdJjoHcYdsschi1DYr8jOxFKHoiuI4Y2CX1tfCikSzijFg6iTd4GRr2qusGoVfgaTduHKrXOfsdSWc8ukFE/w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@azure/identity": "~4.13.0", - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/rest": "^0.78.0", - "@typespec/spec-api": "^0.1.0-alpha.12", - "@typespec/spec-coverage-sdk": "^0.1.0-alpha.14", - "@typespec/versioning": "^0.78.0", - "ajv": "~8.17.1", - "body-parser": "^2.2.0", - "deep-equal": "^2.2.0", - "express": "^5.2.1", - "globby": "~16.0.0", - "micromatch": "^4.0.8", - "morgan": "^1.10.0", - "multer": "^2.0.1", - "picocolors": "~1.1.1", - "source-map-support": "~0.5.21", - "xml2js": "^0.6.2", - "yaml": "~2.8.2", - "yargs": "~18.0.0" - }, - "bin": { - "tsp-spector": "cmd/cli.mjs" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@typespec/http-specs/node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" + "@typespec/compiler": "^1.10.0", + "@typespec/http": "^1.10.0", + "@typespec/rest": "^0.80.0", + "@typespec/versioning": "^0.80.0", + "@typespec/xml": "^0.80.0" } }, "node_modules/@typespec/json-schema": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@typespec/json-schema/-/json-schema-1.8.0.tgz", - "integrity": "sha512-FEcU2A/POu+cMuJE0mZrzGL/6ONUlbuOWbZZK2NSUfcMCpN0kHtKwEwui3fw3KaSIUqOaAJX9vE8vE47CT3bAA==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@typespec/json-schema/-/json-schema-1.10.0.tgz", + "integrity": "sha512-FZTJvZoIqMbe/4qi17e8q3KF/2VDSyXiiF8QYwH4lar5dtEDGgwrw9ShLeLNiEZh8Ph3GjrQQV5qdpheDFJJvw==", "dev": true, "license": "MIT", "dependencies": { - "@typespec/asset-emitter": "^0.78.0", + "@typespec/asset-emitter": "^0.79.1", "yaml": "~2.8.2" }, "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0" + "@typespec/compiler": "^1.10.0" } }, "node_modules/@typespec/library-linter": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/library-linter/-/library-linter-0.78.0.tgz", - "integrity": "sha512-fpiQDM7pDtE6TZVEz1Y3Pk5RMI0LW0sXFA9GaNXwdiYivWJVp/bYB/hc3OIG47T68tJ651FdgF3HV2FJ4MkLFA==", + "version": "0.80.0", + "resolved": "https://registry.npmjs.org/@typespec/library-linter/-/library-linter-0.80.0.tgz", + "integrity": "sha512-7J0jkd6v3360nP/WS9xOPaLIwanaJH/YRkUja7FoOIPyCYem6qnjd/kaCHPo2tV5yZUwvlgE0OkvKTuUHvF/tw==", "dev": true, "license": "MIT", "engines": { "node": ">=14.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0" + "@typespec/compiler": "^1.10.0" } }, "node_modules/@typespec/openapi": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-1.8.0.tgz", - "integrity": "sha512-v+RIJpx7vALBSGQmnUWemvXjnrk50HAVqJeg0RbaF3VUnh66Z4itsoNJJmIIc+HmBJng8Ie0V7xv3l02ek6HWA==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-1.10.0.tgz", + "integrity": "sha512-tukmyp+c9CFlA2FdF61XfT9eTe5WXWz6J8pOrJ9+IYg0BcBwhJkvDj6BYpDD6SjxbRr1wO5ZL2Whe6MequsyVw==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0" + "@typespec/compiler": "^1.10.0", + "@typespec/http": "^1.10.0" } }, "node_modules/@typespec/rest": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.78.0.tgz", - "integrity": "sha512-1clnDw1JbBvjLcfFvEvHdIrnsQuQI5/Cl6mRIrzWWX0pKJ+R89rCdZD1KpidEXw4B4qscD48LsssyrEIFLtuPg==", + "version": "0.80.0", + "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.80.0.tgz", + "integrity": "sha512-xczXLoB2akSIDner41gQYTS9CG6TdCN0QHYvXBT6ZrYEnBh+pMvdymW//5CSOTamZLOGo9AOJVJaFfwbFA4vQQ==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0" + "@typespec/compiler": "^1.10.0", + "@typespec/http": "^1.10.0" } }, "node_modules/@typespec/spec-api": { - "version": "0.1.0-alpha.12", - "resolved": "https://registry.npmjs.org/@typespec/spec-api/-/spec-api-0.1.0-alpha.12.tgz", - "integrity": "sha512-cAJ1vj6qk2Vw5g1uesohBItA6fl8KqrTRIwj0DdpPaBtQeaUS7yRJZgGQQz/JLeqDj2B+8z2pooLuvEBtnS+jA==", + "version": "0.1.0-alpha.13", + "resolved": "https://registry.npmjs.org/@typespec/spec-api/-/spec-api-0.1.0-alpha.13.tgz", + "integrity": "sha512-ed0qqGM92vKuangmENUYMeDQZpSlsEMYdeH7+wMl+bIgXzfZ7yv07fNwcmROzSEJd0CzdCTgz+Hp+ifmR4USNQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2487,64 +2279,78 @@ } }, "node_modules/@typespec/spec-coverage-sdk": { - "version": "0.1.0-alpha.14", - "resolved": "https://registry.npmjs.org/@typespec/spec-coverage-sdk/-/spec-coverage-sdk-0.1.0-alpha.14.tgz", - "integrity": "sha512-e3DiPyccHwDf7Nhccu3pnP93hR5ggtmsTsIA54KzwmdDucqHS7rPjPi0vZnvsy3ufB2B8PpyNAHBB7vVSM+tpg==", + "version": "0.1.0-alpha.16", + "resolved": "https://registry.npmjs.org/@typespec/spec-coverage-sdk/-/spec-coverage-sdk-0.1.0-alpha.16.tgz", + "integrity": "sha512-qwSnuE+CXjv4mn2uhioTVlaO4GjypR4ZtbkSoLmWA677ggYmoAjIDpyNgT1tjsc1lDKVtSiPvGhM9XFKExVmbQ==", "dev": true, "license": "MIT", "dependencies": { "@azure/identity": "~4.13.0", - "@azure/storage-blob": "~12.29.1", - "@types/node": "~25.0.2" + "@azure/storage-blob": "~12.31.0", + "@types/node": "~25.3.0", + "@types/semver": "^7.5.8", + "semver": "^7.7.1" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@typespec/spec-coverage-sdk/node_modules/@types/node": { - "version": "25.0.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz", - "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==", + "version": "25.3.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.5.tgz", + "integrity": "sha512-oX8xrhvpiyRCQkG1MFchB09f+cXftgIXb3a7UUa4Y3wpmZPw5tyZGTLWhlESOLq1Rq6oDlc8npVU2/9xiCuXMA==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~7.16.0" + "undici-types": "~7.18.0" + } + }, + "node_modules/@typespec/spec-coverage-sdk/node_modules/semver": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", + "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" } }, "node_modules/@typespec/spec-coverage-sdk/node_modules/undici-types": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", - "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", + "version": "7.18.2", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz", + "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==", "dev": true, "license": "MIT" }, "node_modules/@typespec/spector": { - "version": "0.1.0-alpha.20", - "resolved": "https://registry.npmjs.org/@typespec/spector/-/spector-0.1.0-alpha.20.tgz", - "integrity": "sha512-qnR3NizzYu8e7TNcXY+CFp/FkXk8DJCtk3lpWPC3bNaNjxtuUjZ6Miix0gCPjDBCGOv8iquT7mLux103kMKLWQ==", + "version": "0.1.0-alpha.24", + "resolved": "https://registry.npmjs.org/@typespec/spector/-/spector-0.1.0-alpha.24.tgz", + "integrity": "sha512-POUSFunRZ4UbPEs+YLz0vE9tDoc6chQ/61moyiWO/k4hD2R1KTH0qlRHhuKW8/Y2wa8Jbuex39Ft/O3reHZSTQ==", "dev": true, "license": "MIT", "dependencies": { "@azure/identity": "~4.13.0", - "@types/js-yaml": "^4.0.5", - "@typespec/compiler": "^1.6.0", - "@typespec/http": "^1.6.0", - "@typespec/rest": "^0.76.0", - "@typespec/spec-api": "^0.1.0-alpha.10", - "@typespec/spec-coverage-sdk": "^0.1.0-alpha.12", - "@typespec/versioning": "^0.76.0", - "ajv": "~8.17.1", + "@typespec/compiler": "^1.10.0", + "@typespec/http": "^1.10.0", + "@typespec/rest": "^0.80.0", + "@typespec/spec-api": "^0.1.0-alpha.13", + "@typespec/spec-coverage-sdk": "^0.1.0-alpha.16", + "@typespec/versioning": "^0.80.0", + "ajv": "~8.18.0", "body-parser": "^2.2.0", "deep-equal": "^2.2.0", - "express": "^5.1.0", - "globby": "~15.0.0", - "js-yaml": "^4.1.0", + "express": "^5.2.1", + "globby": "~16.1.0", "micromatch": "^4.0.8", "morgan": "^1.10.0", "multer": "^2.0.1", "picocolors": "~1.1.1", "source-map-support": "~0.5.21", "xml2js": "^0.6.2", + "yaml": "~2.8.2", "yargs": "~18.0.0" }, "bin": { @@ -2554,118 +2360,39 @@ "node": ">=16.0.0" } }, - "node_modules/@typespec/spector/node_modules/@typespec/rest": { - "version": "0.76.0", - "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.76.0.tgz", - "integrity": "sha512-6jtQWdcmuKyG9cmqWsJjaq64f6N5B/1DS4X3ZoTNgYhHA27Hnsxo1HZWXcpv7Wl+MxLAZM6kgpML0ugDEZcrYQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=20.0.0" - }, - "peerDependencies": { - "@typespec/compiler": "^1.6.0", - "@typespec/http": "^1.6.0" - } - }, - "node_modules/@typespec/spector/node_modules/@typespec/versioning": { - "version": "0.76.0", - "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.76.0.tgz", - "integrity": "sha512-dguO/B+mwlCyenWGG+M+16cMQuGHSTJbU5Z0pyUou1uyWrB1px//s4pW7PKD14S+fPutJE0wTMQm+CctOq6quA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=20.0.0" - }, - "peerDependencies": { - "@typespec/compiler": "^1.6.0" - } - }, - "node_modules/@typespec/spector/node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/@typespec/spector/node_modules/globby": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-15.0.0.tgz", - "integrity": "sha512-oB4vkQGqlMl682wL1IlWd02tXCbquGWM4voPEI85QmNKCaw8zGTm1f1rubFgkg3Eli2PtKlFgrnmUqasbQWlkw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sindresorhus/merge-streams": "^4.0.0", - "fast-glob": "^3.3.3", - "ignore": "^7.0.5", - "path-type": "^6.0.0", - "slash": "^5.1.0", - "unicorn-magic": "^0.3.0" - }, - "engines": { - "node": ">=20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@typespec/spector/node_modules/unicorn-magic": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz", - "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/@typespec/sse": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/sse/-/sse-0.78.0.tgz", - "integrity": "sha512-jPARl+e1e/nsDW/1uVsGTzvKmjqezVMyUa13igXxk5nV2ScMdFpH1HhBwTmAhUeaZgY3J81dFHNUnIY67HCrmw==", + "version": "0.80.0", + "resolved": "https://registry.npmjs.org/@typespec/sse/-/sse-0.80.0.tgz", + "integrity": "sha512-/lxYgMaxgEcjBVhep9tf/VnFD2wnkZlkmjUHLeZL8Cuf+qip61Ren6Ml91YtNnnIFYsuuymDzRclrA073ZBR6Q==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0", - "@typespec/events": "^0.78.0", - "@typespec/http": "^1.8.0", - "@typespec/streams": "^0.78.0" + "@typespec/compiler": "^1.10.0", + "@typespec/events": "^0.80.0", + "@typespec/http": "^1.10.0", + "@typespec/streams": "^0.80.0" } }, "node_modules/@typespec/streams": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/streams/-/streams-0.78.0.tgz", - "integrity": "sha512-wzh5bVdzh+K+pFQFs/EZkVsTH5TQGi12XwhjxJS0UKRwaW2UwSZeY1HqX07oMMPdYESTbjgMrXcxtn89AlzjvQ==", + "version": "0.80.0", + "resolved": "https://registry.npmjs.org/@typespec/streams/-/streams-0.80.0.tgz", + "integrity": "sha512-lNvzrvX/ZRIxRpxIBZu90XNsT+uWsMbLtxHd9edspHAiID3c9WKZbl2fnLcPqdR/60odqKve4yGzB9gF58GUDQ==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0" + "@typespec/compiler": "^1.10.0" } }, "node_modules/@typespec/ts-http-runtime": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@typespec/ts-http-runtime/-/ts-http-runtime-0.3.2.tgz", - "integrity": "sha512-IlqQ/Gv22xUC1r/WQm4StLkYQmaaTsXAhUVsNE0+xiyf0yRFiH5++q78U3bw6bLKDCTmh0uqKB9eG9+Bt75Dkg==", + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/@typespec/ts-http-runtime/-/ts-http-runtime-0.3.4.tgz", + "integrity": "sha512-CI0NhTrz4EBaa0U+HaaUZrJhPoso8sG7ZFya8uQoBA57fjzrjRSv87ekCjLZOFExN+gXE/z0xuN2QfH4H2HrLQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2678,25 +2405,25 @@ } }, "node_modules/@typespec/tspd": { - "version": "0.73.1", - "resolved": "https://registry.npmjs.org/@typespec/tspd/-/tspd-0.73.1.tgz", - "integrity": "sha512-Dh6iVxLNGvYObj4x8hhL9bkSHFG7ijwLjisUmcV3EaLjEPD4nc2yV1j/H2fNe3a0TpiZQ0F6c6uogzaKwAk2kg==", + "version": "0.74.1", + "resolved": "https://registry.npmjs.org/@typespec/tspd/-/tspd-0.74.1.tgz", + "integrity": "sha512-0padEJ3gQNkhYtihA+NVZwjiRfJuZDlj7dy4pofoeBcBPRQtb+7Rr3ejSadhOT2kp7+GwhlXzcfMxOw6hRildA==", "dev": true, "license": "MIT", "dependencies": { - "@alloy-js/core": "^0.21.0", - "@alloy-js/markdown": "^0.21.0", - "@alloy-js/typescript": "^0.21.0", - "@microsoft/api-extractor": "^7.52.1", - "@microsoft/api-extractor-model": "^7.30.6", - "@microsoft/tsdoc": "^0.15.1", - "@microsoft/tsdoc-config": "^0.17.1", - "@typespec/compiler": "^1.6.0", + "@alloy-js/core": "^0.22.0", + "@alloy-js/markdown": "^0.22.0", + "@alloy-js/typescript": "^0.22.0", + "@microsoft/api-extractor": "^7.57.4", + "@microsoft/api-extractor-model": "^7.33.2", + "@microsoft/tsdoc": "^0.16.0", + "@microsoft/tsdoc-config": "^0.18.0", + "@typespec/compiler": "^1.10.0", "picocolors": "~1.1.1", - "prettier": "~3.6.2", + "prettier": "~3.8.0", "typedoc": "^0.28.1", "typedoc-plugin-markdown": "^4.5.2", - "yaml": "~2.8.0", + "yaml": "~2.8.2", "yargs": "~18.0.0" }, "bin": { @@ -2706,66 +2433,30 @@ "node": ">=20.0.0" } }, - "node_modules/@typespec/tspd/node_modules/@microsoft/tsdoc": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.15.1.tgz", - "integrity": "sha512-4aErSrCR/On/e5G2hDP0wjooqDdauzEbIq8hIkIe5pXV0rtWJZvdCEKL0ykZxex+IxIwBp0eGeV48hQN07dXtw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@typespec/tspd/node_modules/@microsoft/tsdoc-config": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.17.1.tgz", - "integrity": "sha512-UtjIFe0C6oYgTnad4q1QP4qXwLhe6tIpNTRStJ2RZEPIkqQPREAwE5spzVxsdn9UaEMUqhh0AqSx3X4nWAKXWw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@microsoft/tsdoc": "0.15.1", - "ajv": "~8.12.0", - "jju": "~1.4.0", - "resolve": "~1.22.2" - } - }, - "node_modules/@typespec/tspd/node_modules/prettier": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz", - "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==", - "dev": true, - "license": "MIT", - "bin": { - "prettier": "bin/prettier.cjs" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, "node_modules/@typespec/versioning": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.78.0.tgz", - "integrity": "sha512-I14X6+IMd0wFMNI8oMFSeFBi2nD4idub+geSO34vuCs4rwuEj3FNzy+rkNkDDvf0+gIUGxeyg7s+YDUcNyiqOA==", + "version": "0.80.0", + "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.80.0.tgz", + "integrity": "sha512-WQCT0jN2lSRfwOy+Cd1KUYzenpKR5TdoX0uW6zQdvxQ9nQZIXoaSaReh9/ldhmSV4xv3p2dqF9oq1cdbVGfJTg==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0" + "@typespec/compiler": "^1.10.0" } }, "node_modules/@typespec/xml": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/xml/-/xml-0.78.0.tgz", - "integrity": "sha512-KSDhJX6A/Onsu9FKVZtR/xSy5va3k0y9/U4eiZUn91V/LQyMZNwmResPDHEVYk6JqaIH8bbd6ANWPu3nMd7mmw==", + "version": "0.80.0", + "resolved": "https://registry.npmjs.org/@typespec/xml/-/xml-0.80.0.tgz", + "integrity": "sha512-Qfy5eyCcOF3xYOU/dejhpmmeY75U1Q9C8XBE+GvSZ3lakRfKBIpT+X6Q07qmKSAbGYJZKYLWCIAy/dgCuu/OAA==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0" + "@typespec/compiler": "^1.10.0" } }, "node_modules/@vitest/coverage-v8": { @@ -2940,19 +2631,19 @@ } }, "node_modules/@vue/reactivity": { - "version": "3.5.26", - "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.26.tgz", - "integrity": "sha512-9EnYB1/DIiUYYnzlnUBgwU32NNvLp/nhxLXeWRhHUEeWNTn1ECxX8aGO7RTXeX6PPcxe3LLuNBFoJbV4QZ+CFQ==", + "version": "3.5.30", + "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.30.tgz", + "integrity": "sha512-179YNgKATuwj9gB+66snskRDOitDiuOZqkYia7mHKJaidOMo/WJxHKF8DuGc4V4XbYTJANlfEKb0yxTQotnx4Q==", "dev": true, "license": "MIT", "dependencies": { - "@vue/shared": "3.5.26" + "@vue/shared": "3.5.30" } }, "node_modules/@vue/shared": { - "version": "3.5.26", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.26.tgz", - "integrity": "sha512-7Z6/y3uFI5PRoKeorTOSXKcDj0MSasfNNltcslbFrPpcw6aXRUALq4IfJlaTRspiWIUOEZbrpM+iQGmCOiWe4A==", + "version": "3.5.30", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.30.tgz", + "integrity": "sha512-YXgQ7JjaO18NeK2K9VTbDHaFy62WrObMa6XERNfNOkAhD1F1oDSf3ZJ7K6GqabZ0BvSDHajp8qfS5Sa2I9n8uQ==", "dev": true, "license": "MIT" }, @@ -2981,16 +2672,16 @@ } }, "node_modules/ajv": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", - "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "dev": true, "license": "MIT", "dependencies": { - "fast-deep-equal": "^3.1.1", + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" + "require-from-string": "^2.0.2" }, "funding": { "type": "github", @@ -3031,16 +2722,13 @@ } }, "node_modules/ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, "license": "MIT", "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" + "node": ">=8" } }, "node_modules/ansi-styles": { @@ -3101,21 +2789,21 @@ } }, "node_modules/ast-v8-to-istanbul": { - "version": "0.3.10", - "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.10.tgz", - "integrity": "sha512-p4K7vMz2ZSk3wN8l5o3y2bJAoZXT3VuJI5OLTATY/01CYWumWvwkUw0SqDBnNq6IiTO3qDa1eSQDibAV8g7XOQ==", + "version": "0.3.11", + "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.11.tgz", + "integrity": "sha512-Qya9fkoofMjCBNVdWINMjB5KZvkYfaO9/anwkWnjxibpWUxo5iHl2sOdP7/uAqaRuUYuoo8rDwnbaaKVFxoUvw==", "dev": true, "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.31", "estree-walker": "^3.0.3", - "js-tokens": "^9.0.1" + "js-tokens": "^10.0.0" } }, "node_modules/ast-v8-to-istanbul/node_modules/js-tokens": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz", - "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", + "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", "dev": true, "license": "MIT" }, @@ -3296,16 +2984,6 @@ } } }, - "node_modules/c8/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/c8/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -3337,19 +3015,6 @@ "node": ">=12" } }, - "node_modules/c8/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/c8/node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -3539,6 +3204,19 @@ "node": ">=20" } }, + "node_modules/cliui/node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, "node_modules/cliui/node_modules/emoji-regex": { "version": "10.6.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", @@ -3564,6 +3242,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/cliui/node_modules/strip-ansi": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -3728,9 +3422,9 @@ } }, "node_modules/default-browser": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.4.0.tgz", - "integrity": "sha512-XDuvSq38Hr1MdN47EDvYtx3U0MTqpCEn+F6ft8z2vYDzMrvQhVp0ui9oQdqW3MvK3vqUETglt1tVGgjLuJ5izg==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.5.0.tgz", + "integrity": "sha512-H9LMLr5zwIbSxrmvikGuI/5KGhZ8E2zH3stkMgM5LpOWDutGM2JZaj460Udnf1a+946zc7YBgrqEWwbk7zHvGw==", "dev": true, "license": "MIT", "dependencies": { @@ -3896,13 +3590,16 @@ } }, "node_modules/env-paths": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz", - "integrity": "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-4.0.0.tgz", + "integrity": "sha512-pxP8eL2SwwaTRi/KHYwLYXinDs7gL3jxFcBYmEdYfZmZXbaVDvdppd0XBU8qVz03rDfKZMXg1omHCbsJjZrMsw==", "dev": true, "license": "MIT", + "dependencies": { + "is-safe-filename": "^0.1.0" + }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=20" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -3970,9 +3667,9 @@ } }, "node_modules/esbuild": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.2.tgz", - "integrity": "sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.3.tgz", + "integrity": "sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -3983,32 +3680,32 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.27.2", - "@esbuild/android-arm": "0.27.2", - "@esbuild/android-arm64": "0.27.2", - "@esbuild/android-x64": "0.27.2", - "@esbuild/darwin-arm64": "0.27.2", - "@esbuild/darwin-x64": "0.27.2", - "@esbuild/freebsd-arm64": "0.27.2", - "@esbuild/freebsd-x64": "0.27.2", - "@esbuild/linux-arm": "0.27.2", - "@esbuild/linux-arm64": "0.27.2", - "@esbuild/linux-ia32": "0.27.2", - "@esbuild/linux-loong64": "0.27.2", - "@esbuild/linux-mips64el": "0.27.2", - "@esbuild/linux-ppc64": "0.27.2", - "@esbuild/linux-riscv64": "0.27.2", - "@esbuild/linux-s390x": "0.27.2", - "@esbuild/linux-x64": "0.27.2", - "@esbuild/netbsd-arm64": "0.27.2", - "@esbuild/netbsd-x64": "0.27.2", - "@esbuild/openbsd-arm64": "0.27.2", - "@esbuild/openbsd-x64": "0.27.2", - "@esbuild/openharmony-arm64": "0.27.2", - "@esbuild/sunos-x64": "0.27.2", - "@esbuild/win32-arm64": "0.27.2", - "@esbuild/win32-ia32": "0.27.2", - "@esbuild/win32-x64": "0.27.2" + "@esbuild/aix-ppc64": "0.27.3", + "@esbuild/android-arm": "0.27.3", + "@esbuild/android-arm64": "0.27.3", + "@esbuild/android-x64": "0.27.3", + "@esbuild/darwin-arm64": "0.27.3", + "@esbuild/darwin-x64": "0.27.3", + "@esbuild/freebsd-arm64": "0.27.3", + "@esbuild/freebsd-x64": "0.27.3", + "@esbuild/linux-arm": "0.27.3", + "@esbuild/linux-arm64": "0.27.3", + "@esbuild/linux-ia32": "0.27.3", + "@esbuild/linux-loong64": "0.27.3", + "@esbuild/linux-mips64el": "0.27.3", + "@esbuild/linux-ppc64": "0.27.3", + "@esbuild/linux-riscv64": "0.27.3", + "@esbuild/linux-s390x": "0.27.3", + "@esbuild/linux-x64": "0.27.3", + "@esbuild/netbsd-arm64": "0.27.3", + "@esbuild/netbsd-x64": "0.27.3", + "@esbuild/openbsd-arm64": "0.27.3", + "@esbuild/openbsd-x64": "0.27.3", + "@esbuild/openharmony-arm64": "0.27.3", + "@esbuild/sunos-x64": "0.27.3", + "@esbuild/win32-arm64": "0.27.3", + "@esbuild/win32-ia32": "0.27.3", + "@esbuild/win32-x64": "0.27.3" } }, "node_modules/escalade": { @@ -4153,10 +3850,26 @@ ], "license": "BSD-3-Clause" }, + "node_modules/fast-xml-builder": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.4.tgz", + "integrity": "sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], + "license": "MIT", + "dependencies": { + "path-expression-matcher": "^1.1.3" + } + }, "node_modules/fast-xml-parser": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.3.3.tgz", - "integrity": "sha512-2O3dkPAAC6JavuMm8+4+pgTk+5hoAs+CjZ+sWcQLkX9+/tHRuTkQh/Oaifr8qDmZ8iEHb771Ea6G8CdwkrgvYA==", + "version": "5.5.7", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.7.tgz", + "integrity": "sha512-LteOsISQ2GEiDHZch6L9hB0+MLoYVLToR7xotrzU0opCICBkxOPgHAy1HxAvtxfJNXDJpgAsQN30mkrfpO2Prg==", "dev": true, "funding": [ { @@ -4166,7 +3879,9 @@ ], "license": "MIT", "dependencies": { - "strnum": "^2.1.0" + "fast-xml-builder": "^1.1.4", + "path-expression-matcher": "^1.1.3", + "strnum": "^2.2.0" }, "bin": { "fxparser": "src/cli/cli.js" @@ -4302,9 +4017,9 @@ } }, "node_modules/fs-extra": { - "version": "11.3.3", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.3.tgz", - "integrity": "sha512-VWSRii4t0AFm6ixFFmLLx1t7wS1gh+ckoa84aOeapGum0h+EZd1EhEumSB+ZdDLnEPuucsVB9oB7cxJHap6Afg==", + "version": "11.3.4", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.4.tgz", + "integrity": "sha512-CTXd6rk/M3/ULNQj8FBqBWHYBVYybQ3VPBw0xGKFe3tuH7ytT6ACnvzpIQ3UZtB8yvUKC2cXn1a+x+5EVQLovA==", "dev": true, "license": "MIT", "dependencies": { @@ -4417,6 +4132,7 @@ "version": "11.1.0", "resolved": "https://registry.npmjs.org/glob/-/glob-11.1.0.tgz", "integrity": "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==", + "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -4450,26 +4166,10 @@ "node": ">= 6" } }, - "node_modules/glob/node_modules/minimatch": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz", - "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "@isaacs/brace-expansion": "^5.0.0" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/globby": { - "version": "16.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-16.0.0.tgz", - "integrity": "sha512-ejy4TJFga99yW6Q0uhM3pFawKWZmtZzZD/v/GwI5+9bCV5Ew+D2pSND6W7fUes5UykqSsJkUfxFVdRh7Q1+P3Q==", + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-16.1.0.tgz", + "integrity": "sha512-+A4Hq7m7Ze592k9gZRy4gJ27DrXRNnC1vPjxTt1qQxEY8RxagBkBxivkCwg7FxSTG0iLLEMaUx13oOr0R2/qcQ==", "dev": true, "license": "MIT", "dependencies": { @@ -4971,6 +4671,19 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-safe-filename": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-safe-filename/-/is-safe-filename-0.1.1.tgz", + "integrity": "sha512-4SrR7AdnY11LHfDKTZY1u6Ga3RuxZdl3YKWWShO5iyuG5h8QS4GD2tOb04peBJ5I7pXbR+CGBNEhTcwK+FzN3g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-set": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", @@ -5079,9 +4792,9 @@ } }, "node_modules/is-wsl": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz", - "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.1.tgz", + "integrity": "sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==", "dev": true, "license": "MIT", "dependencies": { @@ -5176,13 +4889,13 @@ } }, "node_modules/jackspeak": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.1.tgz", - "integrity": "sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.2.3.tgz", + "integrity": "sha512-ykkVRwrYvFm1nb2AJfKKYPr0emF6IiXDYUaFx4Zn9ZuIH7MrzEZ3sD5RlqGXNRpHtvUHJyOnCEFxOlNDtGo7wg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "@isaacs/cliui": "^8.0.2" + "@isaacs/cliui": "^9.0.0" }, "engines": { "node": "20 || >=22" @@ -5205,26 +4918,6 @@ "dev": true, "license": "MIT" }, - "node_modules/js-yaml": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", - "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", - "dev": true, - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/js-yaml/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true, - "license": "Python-2.0" - }, "node_modules/json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", @@ -5381,9 +5074,9 @@ "license": "MIT" }, "node_modules/lru-cache": { - "version": "11.2.4", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz", - "integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==", + "version": "11.2.6", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz", + "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==", "dev": true, "license": "BlueOak-1.0.0", "engines": { @@ -5552,29 +5245,42 @@ } }, "node_modules/minimatch": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz", - "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==", + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.3.tgz", + "integrity": "sha512-Rwi3pnapEqirPSbWbrZaa6N3nmqq4Xer/2XooiOKyV3q12ML06f7MOuc5DVH8ONZIFhwIYQ3yzPH4nt7iWHaTg==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "dependencies": { - "@isaacs/brace-expansion": "^5.0.0" + "brace-expansion": "^5.0.2" }, "engines": { - "node": "20 || >=22" + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "node_modules/minimatch/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", "dev": true, "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/minimatch/node_modules/brace-expansion": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz", + "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" } }, "node_modules/minipass": { @@ -5600,19 +5306,6 @@ "node": ">= 18" } }, - "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "license": "MIT", - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, "node_modules/morgan": { "version": "1.10.1", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.1.tgz", @@ -5678,22 +5371,23 @@ "license": "MIT" }, "node_modules/multer": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.2.tgz", - "integrity": "sha512-u7f2xaZ/UG8oLXHvtF/oWTRvT44p9ecwBBqTwgJVq0+4BW1g8OW01TyMEGWBHbyMOYVHXslaut7qEQ1meATXgw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/multer/-/multer-2.1.1.tgz", + "integrity": "sha512-mo+QTzKlx8R7E5ylSXxWzGoXoZbOsRMpyitcht8By2KHvMbf3tjwosZ/Mu/XYU6UuJ3VZnODIrak5ZrPiPyB6A==", "dev": true, "license": "MIT", "dependencies": { "append-field": "^1.0.0", "busboy": "^1.6.0", "concat-stream": "^2.0.0", - "mkdirp": "^0.5.6", - "object-assign": "^4.1.1", - "type-is": "^1.6.18", - "xtend": "^4.0.2" + "type-is": "^1.6.18" }, "engines": { "node": ">= 10.16.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/multer/node_modules/media-typer": { @@ -5792,16 +5486,6 @@ "node": ">= 0.6" } }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/object-inspect": { "version": "1.13.4", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", @@ -5974,6 +5658,22 @@ "node": ">=8" } }, + "node_modules/path-expression-matcher": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.1.3.tgz", + "integrity": "sha512-qdVgY8KXmVdJZRSS1JdEPOKPdTiEK/pi0RkcT2sw1RhXxohdujUlJFPuS1TSkevZ9vzd3ZlL7ULl1MHGTApKzQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -6019,19 +5719,6 @@ "url": "https://opencollective.com/express" } }, - "node_modules/path-type": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-6.0.0.tgz", - "integrity": "sha512-Vj7sf++t5pBD637NSfkxpHSMfWaeig5+DKWLhcqIYx6mWQz5hdJTGDVMQiJcw1ZYkhs7AazKDGpRVji1LJCZUQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/pathe": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", @@ -6057,9 +5744,9 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", "dev": true, "license": "MIT", "engines": { @@ -6119,9 +5806,9 @@ } }, "node_modules/prettier": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.7.4.tgz", - "integrity": "sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==", + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz", + "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==", "dev": true, "license": "MIT", "bin": { @@ -6148,16 +5835,6 @@ "node": ">= 0.10" } }, - "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/punycode.js": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", @@ -6169,9 +5846,9 @@ } }, "node_modules/qs": { - "version": "6.14.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz", - "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.0.tgz", + "integrity": "sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -6340,9 +6017,9 @@ } }, "node_modules/rollup": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.55.1.tgz", - "integrity": "sha512-wDv/Ht1BNHB4upNbK74s9usvl7hObDnvVzknxqY/E/O3X6rW1U1rV1aENEfJ54eFZDTNo7zv1f5N4edCluH7+A==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.57.1.tgz", + "integrity": "sha512-oQL6lgK3e2QZeQ7gcgIkS2YZPg5slw37hYufJ3edKlfQSGGm8ICoxswK15ntSzF/a8+h7ekRy7k7oWc3BQ7y8A==", "dev": true, "license": "MIT", "dependencies": { @@ -6356,31 +6033,31 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.55.1", - "@rollup/rollup-android-arm64": "4.55.1", - "@rollup/rollup-darwin-arm64": "4.55.1", - "@rollup/rollup-darwin-x64": "4.55.1", - "@rollup/rollup-freebsd-arm64": "4.55.1", - "@rollup/rollup-freebsd-x64": "4.55.1", - "@rollup/rollup-linux-arm-gnueabihf": "4.55.1", - "@rollup/rollup-linux-arm-musleabihf": "4.55.1", - "@rollup/rollup-linux-arm64-gnu": "4.55.1", - "@rollup/rollup-linux-arm64-musl": "4.55.1", - "@rollup/rollup-linux-loong64-gnu": "4.55.1", - "@rollup/rollup-linux-loong64-musl": "4.55.1", - "@rollup/rollup-linux-ppc64-gnu": "4.55.1", - "@rollup/rollup-linux-ppc64-musl": "4.55.1", - "@rollup/rollup-linux-riscv64-gnu": "4.55.1", - "@rollup/rollup-linux-riscv64-musl": "4.55.1", - "@rollup/rollup-linux-s390x-gnu": "4.55.1", - "@rollup/rollup-linux-x64-gnu": "4.55.1", - "@rollup/rollup-linux-x64-musl": "4.55.1", - "@rollup/rollup-openbsd-x64": "4.55.1", - "@rollup/rollup-openharmony-arm64": "4.55.1", - "@rollup/rollup-win32-arm64-msvc": "4.55.1", - "@rollup/rollup-win32-ia32-msvc": "4.55.1", - "@rollup/rollup-win32-x64-gnu": "4.55.1", - "@rollup/rollup-win32-x64-msvc": "4.55.1", + "@rollup/rollup-android-arm-eabi": "4.57.1", + "@rollup/rollup-android-arm64": "4.57.1", + "@rollup/rollup-darwin-arm64": "4.57.1", + "@rollup/rollup-darwin-x64": "4.57.1", + "@rollup/rollup-freebsd-arm64": "4.57.1", + "@rollup/rollup-freebsd-x64": "4.57.1", + "@rollup/rollup-linux-arm-gnueabihf": "4.57.1", + "@rollup/rollup-linux-arm-musleabihf": "4.57.1", + "@rollup/rollup-linux-arm64-gnu": "4.57.1", + "@rollup/rollup-linux-arm64-musl": "4.57.1", + "@rollup/rollup-linux-loong64-gnu": "4.57.1", + "@rollup/rollup-linux-loong64-musl": "4.57.1", + "@rollup/rollup-linux-ppc64-gnu": "4.57.1", + "@rollup/rollup-linux-ppc64-musl": "4.57.1", + "@rollup/rollup-linux-riscv64-gnu": "4.57.1", + "@rollup/rollup-linux-riscv64-musl": "4.57.1", + "@rollup/rollup-linux-s390x-gnu": "4.57.1", + "@rollup/rollup-linux-x64-gnu": "4.57.1", + "@rollup/rollup-linux-x64-musl": "4.57.1", + "@rollup/rollup-openbsd-x64": "4.57.1", + "@rollup/rollup-openharmony-arm64": "4.57.1", + "@rollup/rollup-win32-arm64-msvc": "4.57.1", + "@rollup/rollup-win32-ia32-msvc": "4.57.1", + "@rollup/rollup-win32-x64-gnu": "4.57.1", + "@rollup/rollup-win32-x64-msvc": "4.57.1", "fsevents": "~2.3.2" } }, @@ -6485,9 +6162,9 @@ "license": "MIT" }, "node_modules/sax": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.4.tgz", - "integrity": "sha512-1n3r/tGXO6b6VXMdFT54SHzT9ytu9yr7TaELowdYpMqY/Ao7EnlQGmAQ1+RatX7Tkkdm6hONI2owqNx2aZj5Sw==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.5.0.tgz", + "integrity": "sha512-21IYA3Q5cQf089Z6tgaUTr7lDAyzoTPx5HRtbhsME8Udispad8dC/+sziTNugOEx54ilvatQ9YCzl4KQLPcRHA==", "dev": true, "license": "BlueOak-1.0.0", "engines": { @@ -6901,40 +6578,7 @@ "node": ">=8" } }, - "node_modules/string-width-cjs/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width-cjs/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width/node_modules/strip-ansi": { + "node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", @@ -6947,22 +6591,6 @@ "node": ">=8" } }, - "node_modules/strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/strip-ansi-cjs": { "name": "strip-ansi", "version": "6.0.1", @@ -6977,16 +6605,6 @@ "node": ">=8" } }, - "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", @@ -7021,9 +6639,9 @@ "license": "MIT" }, "node_modules/strnum": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.2.tgz", - "integrity": "sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.0.tgz", + "integrity": "sha512-Y7Bj8XyJxnPAORMZj/xltsfo55uOiyHcU2tnAVzHUnSJR/KsEX+9RoDeXEnsXtl/CX4fAcrt64gZ13aGaWPeBg==", "dev": true, "funding": [ { @@ -7063,9 +6681,9 @@ } }, "node_modules/tar": { - "version": "7.5.7", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.7.tgz", - "integrity": "sha512-fov56fJiRuThVFXD6o6/Q354S7pnWMJIVlDBYijsTNx6jKSE4pvrDTs6lUnmGvNyfJwFQQwWy3owKz1ucIhveQ==", + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.9.tgz", + "integrity": "sha512-BTLcK0xsDh2+PUe9F6c2TlRp4zOOBMTkoQHQIWSIzI0R7KG46uEwq4OPk2W7bZcprBMsuaeFsqwYr7pjh6CuHg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -7111,10 +6729,49 @@ "node": ">=18" } }, + "node_modules/test-exclude/node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/test-exclude/node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/test-exclude/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true, + "license": "MIT" + }, "node_modules/test-exclude/node_modules/glob": { "version": "10.5.0", "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", + "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", "dev": true, "license": "ISC", "dependencies": { @@ -7188,6 +6845,58 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/test-exclude/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/test-exclude/node_modules/strip-ansi": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/test-exclude/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/tinybench": { "version": "2.9.0", "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", @@ -7238,9 +6947,9 @@ } }, "node_modules/tinyglobby/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", "engines": { @@ -7367,9 +7076,9 @@ } }, "node_modules/typedoc-plugin-markdown": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-4.9.0.tgz", - "integrity": "sha512-9Uu4WR9L7ZBgAl60N/h+jqmPxxvnC9nQAlnnO/OujtG2ubjnKTVUFY1XDhcMY+pCqlX3N2HsQM2QTYZIU9tJuw==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-4.10.0.tgz", + "integrity": "sha512-psrg8Rtnv4HPWCsoxId+MzEN8TVK5jeKCnTbnGAbTBqcDapR9hM41bJT/9eAyKn9C2MDG9Qjh3MkltAYuLDoXg==", "dev": true, "license": "MIT", "engines": { @@ -7456,16 +7165,6 @@ "node": ">= 0.8" } }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "punycode": "^2.1.0" - } - }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -7625,9 +7324,9 @@ } }, "node_modules/vite/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", "engines": { @@ -7711,9 +7410,9 @@ } }, "node_modules/vitest/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", "engines": { @@ -7827,9 +7526,9 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.19", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", - "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", + "version": "1.1.20", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.20.tgz", + "integrity": "sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==", "dev": true, "license": "MIT", "dependencies": { @@ -7902,16 +7601,6 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -7928,17 +7617,17 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "node_modules/wrap-ansi/node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", "dev": true, "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, "node_modules/wrap-ansi/node_modules/emoji-regex": { @@ -7966,6 +7655,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/wrap-ansi/node_modules/strip-ansi": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -8013,16 +7718,6 @@ "node": ">=4.0" } }, - "node_modules/xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4" - } - }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", @@ -8087,6 +7782,19 @@ "node": ">=12" } }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, "node_modules/yargs/node_modules/emoji-regex": { "version": "10.6.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", @@ -8112,6 +7820,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, "node_modules/yargs/node_modules/yargs-parser": { "version": "22.0.0", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-22.0.0.tgz", diff --git a/packages/http-client-csharp/package.json b/packages/http-client-csharp/package.json index c234336a297..d7e2d7198c4 100644 --- a/packages/http-client-csharp/package.json +++ b/packages/http-client-csharp/package.json @@ -43,7 +43,7 @@ "lint:fix": "eslint . --fix", "format": "pnpm -w format:dir packages/http-client-csharp", "extract-api": "npx api-extractor run --local --verbose", - "regen-docs": "npm run build:emitter && tspd doc . --enable-experimental --output-dir ../../website/src/content/docs/docs/emitters/clients/http-client-csharp/reference --skip-js" + "regen-docs": "npm run build:emitter && tspd doc . --enable-experimental --output-dir ../../website/src/content/docs/docs/emitters/clients/http-client-csharp/reference --skip-js && npx prettier --write docs/ readme.md ../../website/src/content/docs/docs/emitters/clients/http-client-csharp/reference/" }, "files": [ "dist/emitter/src/**", @@ -52,31 +52,34 @@ "emitter/lib/*.tsp" ], "peerDependencies": { - "@azure-tools/typespec-client-generator-core": ">=0.64.3 < 0.65.0 || ~0.65.0-0", - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/openapi": "^1.8.0", - "@typespec/rest": ">=0.78.0 <0.79.0 || ~0.79.0-0", - "@typespec/streams": ">=0.78.0 <0.79.0 || ~0.79.0-0", - "@typespec/versioning": ">=0.78.0 <0.79.0 || ~0.79.0-0" + "@azure-tools/typespec-client-generator-core": ">=0.66.3 <0.67.0 || ~0.67.0-0", + "@typespec/compiler": "^1.10.0", + "@typespec/http": "^1.10.0", + "@typespec/openapi": "^1.10.0", + "@typespec/rest": ">=0.80.0 <0.81.0 || ~0.81.0-0", + "@typespec/sse": ">=0.80.0 <0.81.0 || ~0.81.0-0", + "@typespec/streams": ">=0.80.0 <0.81.0 || ~0.81.0-0", + "@typespec/versioning": ">=0.80.0 <0.81.0 || ~0.81.0-0" }, "devDependencies": { - "@azure-tools/azure-http-specs": "0.1.0-alpha.35", - "@azure-tools/typespec-client-generator-core": "0.64.4", + "@azure-tools/azure-http-specs": "0.1.0-alpha.38", + "@azure-tools/typespec-azure-core": "0.66.0", + "@azure-tools/typespec-client-generator-core": "0.66.3", "@microsoft/api-extractor": "^7.52.2", "@types/node": "~22.12.0", - "@typespec/compiler": "1.8.0", - "@typespec/http": "1.8.0", - "@typespec/http-specs": "0.1.0-alpha.30", - "@typespec/json-schema": "1.8.0", - "@typespec/library-linter": "0.78.0", - "@typespec/openapi": "1.8.0", - "@typespec/rest": "0.78.0", - "@typespec/spector": "0.1.0-alpha.20", - "@typespec/streams": "0.78.0", - "@typespec/tspd": "0.73.1", - "@typespec/versioning": "0.78.0", - "@typespec/xml": "0.78.0", + "@typespec/compiler": "1.10.0", + "@typespec/http": "1.10.0", + "@typespec/http-specs": "0.1.0-alpha.35", + "@typespec/json-schema": "1.10.0", + "@typespec/library-linter": "0.80.0", + "@typespec/openapi": "1.10.0", + "@typespec/rest": "0.80.0", + "@typespec/spector": "0.1.0-alpha.24", + "@typespec/sse": "0.80.0", + "@typespec/streams": "0.80.0", + "@typespec/tspd": "0.74.1", + "@typespec/versioning": "0.80.0", + "@typespec/xml": "0.80.0", "@vitest/coverage-v8": "^3.0.5", "@vitest/ui": "^3.0.5", "c8": "^10.1.2", diff --git a/packages/http-client-csharp/readme.md b/packages/http-client-csharp/readme.md index 77f8efc84b9..2acc3d7cbaf 100644 --- a/packages/http-client-csharp/readme.md +++ b/packages/http-client-csharp/readme.md @@ -125,11 +125,11 @@ The name of the generator. By default this is set to `ScmCodeModelGenerator`. Ge Allows emitter authors to specify the path to a custom emitter package, allowing you to extend the emitter behavior. This should be set to `import.meta.url` if you are using a custom emitter. -### `update-code-model` +### `plugins` -**Type:** `object` +**Type:** `array` -Allows emitter authors to specify a custom function to modify the generated code model before emitting. This is useful for modifying the code model before it is passed to the generator. +Paths to generator plugin assemblies (DLLs) or directories containing plugin assemblies. Each plugin must contain a class that extends GeneratorPlugin. ### `license` diff --git a/packages/http-client-java/CHANGELOG.md b/packages/http-client-java/CHANGELOG.md new file mode 100644 index 00000000000..fa215f1924e --- /dev/null +++ b/packages/http-client-java/CHANGELOG.md @@ -0,0 +1,24 @@ +# Changelog - @typespec/http-client-java + +## 0.7.0 + +### Features + +- [#9530](https://github.com/microsoft/typespec/pull/9530) Support File from TypeSpec. +- [#9602](https://github.com/microsoft/typespec/pull/9602) Support File in multipart and request body. + +### Bump dependencies + +- [#9698](https://github.com/microsoft/typespec/pull/9698) Update @azure-tools/typespec-client-generator-core to 0.65.1 +- [#9447](https://github.com/microsoft/typespec/pull/9447) Upgrade TCGC +- [#9677](https://github.com/microsoft/typespec/pull/9677) Update Node.js dependencies to latest versions +- [#9591](https://github.com/microsoft/typespec/pull/9591) Update @azure-tools/typespec-client-generator-core to 0.64.6 and @microsoft/api-extractor to 7.56.2 +- [#9472](https://github.com/microsoft/typespec/pull/9472) Update @azure-tools/typespec-client-generator-core to 0.64.4 + +### Bug Fixes + +- [#9677](https://github.com/microsoft/typespec/pull/9677) Fix incorrect variable name of continuationToken +- [#9527](https://github.com/microsoft/typespec/pull/9527) Missing example value for BinaryData type in mock test. +- [#9639](https://github.com/microsoft/typespec/pull/9639) Fix mock data for BinaryData. +- [#9751](https://github.com/microsoft/typespec/pull/9751) Use `LinkedHashMap` and `LinkedHashSet` to ensure consistent + iterating order. diff --git a/packages/http-client-java/emitter/src/code-model-builder.ts b/packages/http-client-java/emitter/src/code-model-builder.ts index b44735600d2..041cfadac19 100644 --- a/packages/http-client-java/emitter/src/code-model-builder.ts +++ b/packages/http-client-java/emitter/src/code-model-builder.ts @@ -313,6 +313,13 @@ export class CodeModelBuilder { this.sdkContext = await createSdkContext(this.emitterContext, LIB_NAME, sdkContextOptions); this.program.reportDiagnostics(this.sdkContext.diagnostics); + // metadata + if (this.sdkContext.sdkPackage.metadata.apiVersions) { + this.codeModel.apiVersionMap = Object.fromEntries( + this.sdkContext.sdkPackage.metadata.apiVersions, + ); + } + // license if (this.sdkContext.sdkPackage.licenseInfo) { this.codeModel.info.license = new License(this.sdkContext.sdkPackage.licenseInfo.name, { @@ -499,6 +506,14 @@ export class CodeModelBuilder { this.trackSchemaUsage(schema, { usage: [SchemaContext.Public], }); + if (schema instanceof ObjectSchema && schema.usage) { + const schemaUsage: SchemaContext[] | undefined = schema.usage; + // And, remove the Paged, as we assume customer explicitly asks Public + const index = schemaUsage.indexOf(SchemaContext.Paged); + if (index >= 0) { + schemaUsage.splice(index, 1); + } + } } else if (access === "internal") { const schema = this.processSchema(model, model.name); @@ -926,7 +941,7 @@ export class CodeModelBuilder { let generateProtocolApi: boolean = sdkMethod.generateProtocol; let diagnostic = undefined; - if (generateConvenienceApi) { + if (generateConvenienceApi && this.isAzureV1()) { // check if the convenience API need to be disabled for some special cases if (operationIsMultipart(httpOperation)) { // do not generate protocol method for multipart/form-data, as it be very hard for user to prepare the request body as BinaryData @@ -1706,7 +1721,7 @@ export class CodeModelBuilder { name: string, description: string | undefined = undefined, ): GroupSchema { - // the "GroupSchema" is simliar to "ObjectSchema", but the process is different + // the "GroupSchema" is similar to "ObjectSchema", but the process is different if (type && this.schemaCache.has(type)) { return this.schemaCache.get(type) as GroupSchema; @@ -1879,7 +1894,7 @@ export class CodeModelBuilder { // group schema - let coreNamespace = this.namespace; + let coreNamespace; if (this.isAzureV1()) { coreNamespace = "com.azure.core.http"; } else { @@ -1982,19 +1997,49 @@ export class CodeModelBuilder { // set contentTypes to mediaTypes op.requests![0].protocol.http!.mediaTypes = sdkBody.contentTypes; - const unknownRequestBody = - op.requests![0].protocol.http!.mediaTypes && - op.requests![0].protocol.http!.mediaTypes.length > 0 && - !isKnownContentType(op.requests![0].protocol.http!.mediaTypes); - const sdkType: SdkType = sdkBody.type; + let requestBodyIsFile: boolean = false; + if ( + sdkType && + sdkType.kind === "model" && + sdkType.serializationOptions.binary && + sdkType.serializationOptions.binary.isFile + ) { + // check for File + requestBodyIsFile = true; + } else if (sdkType && sdkType.kind === "bytes") { + // check for bytes + unknown content-type + const mediaTypes = op.requests![0].protocol.http!.mediaTypes; + const unknownRequestBody = + mediaTypes && mediaTypes.length > 0 && !isKnownContentType(mediaTypes); + requestBodyIsFile = Boolean(unknownRequestBody); + } + let schema: Schema; - if (unknownRequestBody && sdkType.kind === "bytes") { - // if it's unknown request body, handle binary request body + if (requestBodyIsFile) { + // binary/file schema = this.processBinarySchema(sdkType); } else { - schema = this.processSchema(getNonNullSdkType(sdkType), sdkBody.name); + if ( + !requestBodyIsFile && + sdkBody.contentTypes.length === 1 && + sdkBody.contentTypes[0] === "text/plain" && + sdkType.kind === "enum" + ) { + // handle a common definition error of string based scalar type as body, without content-type + reportDiagnostic(this.program, { + code: "type-not-supported-on-text-plain", + format: { + operationName: op.language.default.name, + payloadKind: "request body", + }, + target: sdkMethod.__raw ?? NoTarget, + }); + schema = this.stringSchema; + } else { + schema = this.processSchema(getNonNullSdkType(sdkType), sdkBody.name); + } } const parameterName = sdkBody.name; @@ -2058,6 +2103,11 @@ export class CodeModelBuilder { if (jsonMergePatch) { // skip model flatten, if "application/merge-patch+json" + reportDiagnostic(this.program, { + code: "spread-json-merge-patch-payload-not-supported", + target: sdkMethod.__raw ?? NoTarget, + }); + if (sdkType.isGeneratedName) { schema.language.default.name = pascalCase(op.language.default.name) + "PatchRequest"; } @@ -2189,10 +2239,8 @@ export class CodeModelBuilder { // TODO: what to do if more than 1 response? // It happens when the response type is Union, on one status code. // let response: Response; - let headers: Array | undefined = undefined; + const headers: Array = []; - // headers - headers = []; if (sdkResponse.headers) { for (const header of sdkResponse.headers) { const schema = this.processSchema(header.type, header.name); @@ -2226,7 +2274,7 @@ export class CodeModelBuilder { const bodyType: SdkType | undefined = sdkResponse.type; let trackConvenienceApi: boolean = Boolean(op.convenienceApi); - let responseIsFile: boolean = false; + let responseBodyIsFile: boolean = false; if ( bodyType && bodyType.kind === "model" && @@ -2234,18 +2282,18 @@ export class CodeModelBuilder { bodyType.serializationOptions.binary.isFile ) { // check for File - responseIsFile = true; + responseBodyIsFile = true; } else if (bodyType && bodyType.kind === "bytes") { // check for bytes + unknown content-type const unknownResponseBody = sdkResponse.contentTypes && sdkResponse.contentTypes.length > 0 && !isKnownContentType(sdkResponse.contentTypes); - responseIsFile = Boolean(unknownResponseBody); + responseBodyIsFile = Boolean(unknownResponseBody); } let response: Response; - if (responseIsFile) { + if (responseBodyIsFile) { // binary/file response = new BinaryResponse({ protocol: { @@ -2264,13 +2312,32 @@ export class CodeModelBuilder { }, }); } else if (bodyType) { - // schema (usually JSON) - let schema: Schema | undefined = undefined; if (longRunning) { // LRO uses the LroMetadata for poll/final result, not the response of activation request + // hence the schema below is not tracked for convenience API trackConvenienceApi = false; } - if (!schema) { + + // schema (usually JSON) + let schema: Schema | undefined; + if ( + !responseBodyIsFile && + sdkResponse.contentTypes && + sdkResponse.contentTypes.length === 1 && + sdkResponse.contentTypes[0] === "text/plain" && + bodyType?.kind === "enum" + ) { + // handle a common definition error of string based scalar type as body, without content-type + reportDiagnostic(this.program, { + code: "type-not-supported-on-text-plain", + format: { + operationName: op.language.default.name, + payloadKind: "response body", + }, + target: NoTarget, + }); + schema = this.stringSchema; + } else { schema = this.processSchema(bodyType, op.language.default.name + "Response"); } response = new SchemaResponse(schema, { @@ -2637,6 +2704,11 @@ export class CodeModelBuilder { // java name schema.language.java = schema.language.java ?? new Language(); schema.language.java.name = getExternalJavaClassName(type); + + // add external to usage + this.trackSchemaUsage(schema, { + usage: [SchemaContext.External], + }); } schema.language.default.crossLanguageDefinitionId = type.crossLanguageDefinitionId; return this.codeModel.schemas.add(schema); @@ -2765,13 +2837,15 @@ export class CodeModelBuilder { } // discriminator - if (type.discriminatedSubtypes && type.discriminatorProperty) { + if (type.discriminatorProperty) { objectSchema.discriminator = new Discriminator( this.processModelProperty(type.discriminatorProperty), ); - for (const discriminatorValue in type.discriminatedSubtypes) { - const subType = type.discriminatedSubtypes[discriminatorValue]; - this.processSchema(subType, subType.name); + if (type.discriminatedSubtypes) { + for (const discriminatorValue in type.discriminatedSubtypes) { + const subType = type.discriminatedSubtypes[discriminatorValue]; + this.processSchema(subType, subType.name); + } } } @@ -2978,7 +3052,7 @@ export class CodeModelBuilder { return this.codeModel.schemas.add(unionSchema); } - private processBinarySchema(type: SdkBuiltInType): BinarySchema { + private processBinarySchema(type: SdkType): BinarySchema { return this.codeModel.schemas.add( new BinarySchema(type.doc ?? "", { summary: type.summary, @@ -3013,14 +3087,14 @@ export class CodeModelBuilder { case "Enum": return pascalCase(type.name); case "Model": - if (isArrayModelType(this.program, type)) { + if (isArrayModelType(type)) { ++option.depth; if (option.depth === 1) { return this.getUnionVariantName(type.indexer.value, option) + "List"; } else { return "ListOf" + this.getUnionVariantName(type.indexer.value, option); } - } else if (isRecordModelType(this.program, type)) { + } else if (isRecordModelType(type)) { ++option.depth; if (option.depth === 1) { return this.getUnionVariantName(type.indexer.value, option) + "Map"; diff --git a/packages/http-client-java/emitter/src/common/client.ts b/packages/http-client-java/emitter/src/common/client.ts index d5d26f13963..6536c438dba 100644 --- a/packages/http-client-java/emitter/src/common/client.ts +++ b/packages/http-client-java/emitter/src/common/client.ts @@ -20,7 +20,7 @@ export interface Client extends Aspect { security: Security; - serviceVersion?: ServiceVersion; // apiVersions is in + serviceVersion?: ServiceVersion; // for ServiceVersion class /** * Parent client of this client, if exists. diff --git a/packages/http-client-java/emitter/src/common/code-model.ts b/packages/http-client-java/emitter/src/common/code-model.ts index 62a0c8b7518..1e0d70dad9d 100644 --- a/packages/http-client-java/emitter/src/common/code-model.ts +++ b/packages/http-client-java/emitter/src/common/code-model.ts @@ -22,6 +22,8 @@ export interface CodeModel extends Metadata { clients: Array; arm?: boolean; + + apiVersionMap?: Record; } export class CodeModel extends Metadata implements CodeModel { diff --git a/packages/http-client-java/emitter/src/common/formats/xml.ts b/packages/http-client-java/emitter/src/common/formats/xml.ts index 0a6c16bda73..4b05d8cc1ec 100644 --- a/packages/http-client-java/emitter/src/common/formats/xml.ts +++ b/packages/http-client-java/emitter/src/common/formats/xml.ts @@ -7,4 +7,8 @@ export interface XmlSerializationFormat extends SerializationFormat { attribute: boolean; wrapped: boolean; text: boolean; + // name/namespace/prefix on items, when wrapped=true (this type is an array) + itemsName?: string; + itemsNamespace?: string; + itemsPrefix?: string; } diff --git a/packages/http-client-java/emitter/src/common/schemas/time.ts b/packages/http-client-java/emitter/src/common/schemas/time.ts index d893cf444ff..d31935122a5 100644 --- a/packages/http-client-java/emitter/src/common/schemas/time.ts +++ b/packages/http-client-java/emitter/src/common/schemas/time.ts @@ -7,7 +7,12 @@ export interface DurationSchema extends PrimitiveSchema { /** the schema type */ type: SchemaType.Duration; - format: "duration-rfc3339" | "seconds-integer" | "seconds-number"; + format: + | "duration-rfc3339" + | "seconds-integer" + | "seconds-number" + | "milliseconds-integer" + | "milliseconds-number"; } export class DurationSchema extends PrimitiveSchema implements DurationSchema { diff --git a/packages/http-client-java/emitter/src/emitter.ts b/packages/http-client-java/emitter/src/emitter.ts index 4e75b7d4bf0..5efbb6b138e 100644 --- a/packages/http-client-java/emitter/src/emitter.ts +++ b/packages/http-client-java/emitter/src/emitter.ts @@ -185,20 +185,23 @@ function reportJarOutput(program: Program, jarOutput: string) { } // trace or report the logs, according to log level + const typeSpecPluginPrefix = "com.microsoft.typespec.http.client.generator."; + const errorPrefix = "ERROR " + typeSpecPluginPrefix; + const warnPrefix = "WARN " + typeSpecPluginPrefix; for (const log of logs) { - if (log.startsWith("ERROR ")) { + if (log.startsWith(errorPrefix)) { reportDiagnostic(program, { code: "generator-error", format: { - errorMessage: log.substring(6), + errorMessage: log.substring(errorPrefix.length), }, target: NoTarget, }); - } else if (log.startsWith("WARN ")) { + } else if (log.startsWith(warnPrefix)) { reportDiagnostic(program, { code: "generator-warning", format: { - warningMessage: log.substring(5), + warningMessage: log.substring(warnPrefix.length), }, target: NoTarget, }); diff --git a/packages/http-client-java/emitter/src/external-schemas.ts b/packages/http-client-java/emitter/src/external-schemas.ts index a4506b0a53d..df28619749d 100644 --- a/packages/http-client-java/emitter/src/external-schemas.ts +++ b/packages/http-client-java/emitter/src/external-schemas.ts @@ -194,7 +194,7 @@ const fileDetailsMap: Map = new Map(); function getFileSchemaName(baseName: string, sdkModelType?: SdkModelType): string { // If the TypeSpec Model exists and is not TypeSpec.Http.File, directly use its name if (sdkModelType && sdkModelType.crossLanguageDefinitionId !== "TypeSpec.Http.File") { - return baseName; + return sdkModelType.name; } // make sure suffix "FileDetails" @@ -250,17 +250,21 @@ function addFilenameProperty( filenameProperty?: SdkModelPropertyType, processSchemaFunc?: (type: SdkType) => Schema, ) { + const isRequired = filenameProperty ? !filenameProperty.optional : false; + const isConstant = filenameProperty?.type.kind === "constant" && isRequired; + // If the type is constant but not required, treat the type as non-constant String but its value as the default. + const clientDefaultValue = + filenameProperty?.type.kind === "constant" ? String(filenameProperty.type.value) : undefined; fileDetailsSchema.addProperty( new Property( "filename", "The filename of the file.", - filenameProperty?.type.kind === "constant" && processSchemaFunc - ? processSchemaFunc(filenameProperty.type) - : stringSchema, + isConstant && processSchemaFunc ? processSchemaFunc(filenameProperty.type) : stringSchema, { - required: filenameProperty ? !filenameProperty.optional : false, + required: isRequired, nullable: false, readOnly: false, + clientDefaultValue: clientDefaultValue, }, ), ); @@ -272,19 +276,27 @@ function addContentTypeProperty( contentTypeProperty?: SdkModelPropertyType, processSchemaFunc?: (type: SdkType) => Schema, ) { + const isRequired = contentTypeProperty ? !contentTypeProperty.optional : false; + const isConstant = contentTypeProperty?.type.kind === "constant" && isRequired; + // If the type is constant but not required, treat the type as non-constant String but its value as the default. + /* + * TypeSpec 'TypeSpec.Http.File<"image/png">' is such case. + * Feels that it is not user-friendly to create a single value enum for FileContentType that user probably had to set for the request. + */ + const clientDefaultValue = + contentTypeProperty?.type.kind === "constant" + ? String(contentTypeProperty.type.value) + : "application/octet-stream"; fileDetailsSchema.addProperty( new Property( "contentType", "The content-type of the file.", - contentTypeProperty?.type.kind === "constant" && processSchemaFunc - ? processSchemaFunc(contentTypeProperty.type) - : stringSchema, + isConstant && processSchemaFunc ? processSchemaFunc(contentTypeProperty.type) : stringSchema, { - required: contentTypeProperty ? !contentTypeProperty.optional : false, + required: isRequired, nullable: false, readOnly: false, - clientDefaultValue: - contentTypeProperty?.type.kind === "constant" ? undefined : "application/octet-stream", + clientDefaultValue: clientDefaultValue, }, ), ); @@ -317,8 +329,7 @@ export function getFileDetailsSchema( - Allow required for "filename" and "contentType" */ const filePropertyName = property.name; - const fileSchemaName = fileSdkType.name; - const schemaName = getFileSchemaName(fileSchemaName, fileSdkType); + const schemaName = getFileSchemaName(filePropertyName, fileSdkType); let fileDetailsSchema = fileDetailsMap.get(schemaName); if (!fileDetailsSchema) { const typeNamespace = getNamespace(property.type.__raw) ?? namespace; diff --git a/packages/http-client-java/emitter/src/lib.ts b/packages/http-client-java/emitter/src/lib.ts index a7e5491c184..9c0aff4db7b 100644 --- a/packages/http-client-java/emitter/src/lib.ts +++ b/packages/http-client-java/emitter/src/lib.ts @@ -119,6 +119,19 @@ export const $lib = createTypeSpecLibrary({ default: paramMessage`Constant header '${"headerName"}' is removed from response headers.`, }, }, + "spread-json-merge-patch-payload-not-supported": { + severity: "warning", + messages: { + default: + "Spread JSON merge-patch payload is not supported. The reason is that a property in JSON merge-patch payload class can: set a value; not set so that value does not change; set to null to remove the value. A parameter on method cannot distinguish the latter 2 cases.", + }, + }, + "type-not-supported-on-text-plain": { + severity: "warning", + messages: { + default: paramMessage`Complex SDK type is not supported for "text/plain" content-type. Emitter would use string type on '${"operationName"}' ${"payloadKind"}.`, + }, + }, }, emitter: { options: EmitterOptionsSchema, diff --git a/packages/http-client-java/emitter/src/operation-utils.ts b/packages/http-client-java/emitter/src/operation-utils.ts index 38c4d532b09..1b130748324 100644 --- a/packages/http-client-java/emitter/src/operation-utils.ts +++ b/packages/http-client-java/emitter/src/operation-utils.ts @@ -224,6 +224,13 @@ export function findResponsePropertySegments( const propertyArray: Property[] = []; let currentSchemaProperties: Property[] | undefined = schema.properties; + if (currentSchemaProperties && schema.parents && schema.parents.all) { + for (const parent of schema.parents.all) { + if (parent instanceof ObjectSchema && parent.properties) { + currentSchemaProperties = currentSchemaProperties.concat(parent.properties); + } + } + } for (const propertySegment of propertySegments) { // abort if no properties in current schema. this should not happen though if (!currentSchemaProperties) { diff --git a/packages/http-client-java/emitter/src/type-utils.ts b/packages/http-client-java/emitter/src/type-utils.ts index 4289608773a..e9df7d9cbfd 100644 --- a/packages/http-client-java/emitter/src/type-utils.ts +++ b/packages/http-client-java/emitter/src/type-utils.ts @@ -34,7 +34,7 @@ import { DurationSchema } from "./common/schemas/time.js"; import { SchemaContext } from "./common/schemas/usage.js"; import { getNamespace } from "./utils.js"; -export const DURATION_KNOWN_ENCODING = ["ISO8601", "seconds"]; +export const DURATION_KNOWN_ENCODING = ["ISO8601", "seconds", "milliseconds"]; export const DATETIME_KNOWN_ENCODING = ["rfc3339", "rfc7231", "unixTimestamp"]; export const BYTES_KNOWN_ENCODING = ["base64", "base64url"]; @@ -139,6 +139,16 @@ export function getDurationFormat(type: SdkDurationType): DurationSchema["format `Unrecognized scalar type used by duration encoded as seconds: '${type.kind}'.`, ); } + } else if (type.encode === "milliseconds") { + if (isSdkIntKind(type.wireType.kind)) { + format = "milliseconds-integer"; + } else if (isSdkFloatKind(type.wireType.kind)) { + format = "milliseconds-number"; + } else { + throw new Error( + `Unrecognized scalar type used by duration encoded as milliseconds: '${type.kind}'.`, + ); + } } return format; } @@ -393,6 +403,9 @@ export function getXmlSerializationFormat( attribute: type.serializationOptions.xml.attribute ?? false, wrapped: propertyTypeIsArray ? !(type.serializationOptions.xml.unwrapped ?? true) : false, text: propertyTypeIsText ? (type.serializationOptions.xml.unwrapped ?? false) : false, + itemsName: type.serializationOptions.xml.itemsName ?? undefined, + itemsNamespace: type.serializationOptions.xml.itemsNs?.namespace ?? undefined, + itemsPrefix: type.serializationOptions.xml.itemsNs?.prefix ?? undefined, }; } diff --git a/packages/http-client-java/emitter/src/versioning-utils.ts b/packages/http-client-java/emitter/src/versioning-utils.ts index 0497a7d9869..02e0c98f424 100644 --- a/packages/http-client-java/emitter/src/versioning-utils.ts +++ b/packages/http-client-java/emitter/src/versioning-utils.ts @@ -34,15 +34,19 @@ export function getServiceApiVersions( ): Version[] | InconsistentVersions { // TODO: use client.apiVersions + const rawServices: Namespace | Namespace[] | undefined = + client.__raw.services ?? (client.__raw as any).service; + const serviceList = Array.isArray(rawServices) ? rawServices : rawServices ? [rawServices] : []; + let apiVersions: Version[] | InconsistentVersions; // TCGC 0.63+ supports multiple api-version in a single client - if (Array.isArray(client.__raw.service)) { + if (serviceList.length > 1) { // here, we treat a versioned client with multiple service as client of mixed versions apiVersions = isSdkClientVersioned(client) ? InconsistentVersions.MixedVersions : InconsistentVersions.NotVersioned; - } else { - const serviceNamespace = client.__raw.service; + } else if (serviceList.length === 1) { + const serviceNamespace = serviceList[0]; const versionedNamespace: Namespace | undefined = findVersionedNamespace( program, serviceNamespace, @@ -54,6 +58,8 @@ export function getServiceApiVersions( } else { apiVersions = InconsistentVersions.NotVersioned; } + } else { + apiVersions = InconsistentVersions.NotVersioned; } return apiVersions; } diff --git a/packages/http-client-java/eng/scripts/Build-Packages.ps1 b/packages/http-client-java/eng/scripts/Build-Packages.ps1 index d2063811459..1a2e3172bf2 100644 --- a/packages/http-client-java/eng/scripts/Build-Packages.ps1 +++ b/packages/http-client-java/eng/scripts/Build-Packages.ps1 @@ -93,7 +93,7 @@ finally { } if ($PublishType -eq "internal") { - $feedUrl = "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js-test-autorest/npm/registry" + $feedUrl = "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js/npm/registry" $overrides = @{ "@typespec/http-client-java" = "$feedUrl/@typespec/http-client-java/-/http-client-java-$emitterVersion.tgz" diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/package.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/package.json index 0803594ba64..17cf247da27 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/package.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/package.json @@ -12,27 +12,27 @@ "spector-stop": "tsp-spector server stop" }, "dependencies": { - "@typespec/spector": "0.1.0-alpha.22", - "@typespec/spec-api": "0.1.0-alpha.12", - "@typespec/http-specs": "0.1.0-alpha.31", - "@typespec/json-schema": "1.8.0", - "@typespec/http-client-java": "file:../../typespec-http-client-java-0.6.1.tgz", + "@typespec/spector": "0.1.0-alpha.25", + "@typespec/spec-api": "0.1.0-alpha.14", + "@typespec/http-specs": "0.1.0-alpha.36", + "@typespec/json-schema": "1.11.0", + "@typespec/http-client-java": "file:../../typespec-http-client-java-0.7.0.tgz", "@typespec/http-client-java-tests": "file:" }, "overrides": { - "@typespec/compiler": "1.8.0", - "@typespec/http": "1.8.0", - "@typespec/rest": "0.78.0", - "@typespec/versioning": "0.78.0", - "@typespec/openapi": "1.8.0", - "@typespec/xml": "0.78.0", - "@typespec/events": "0.78.0", - "@typespec/sse": "0.78.0", - "@typespec/streams": "0.78.0", - "@azure-tools/typespec-azure-core": "0.64.0", - "@azure-tools/typespec-client-generator-core": "0.64.5", - "@azure-tools/typespec-azure-resource-manager": "0.64.1", - "@azure-tools/typespec-autorest": "0.64.1" + "@typespec/compiler": "1.11.0", + "@typespec/http": "1.11.0", + "@typespec/rest": "0.81.0", + "@typespec/versioning": "0.81.0", + "@typespec/openapi": "1.11.0", + "@typespec/xml": "0.81.0", + "@typespec/events": "0.81.0", + "@typespec/sse": "0.81.0", + "@typespec/streams": "0.81.0", + "@azure-tools/typespec-azure-core": "0.67.0", + "@azure-tools/typespec-client-generator-core": "0.67.1", + "@azure-tools/typespec-azure-resource-manager": "0.67.0", + "@azure-tools/typespec-autorest": "0.67.0" }, "private": true } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/ArrayClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/ArrayClient.java index 98178901867..22cd36d4d3c 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/ArrayClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/ArrayClient.java @@ -164,4 +164,276 @@ public Response newlineDelimitedWithResponse(Newl public NewlineDelimitedArrayProperty newlineDelimited(NewlineDelimitedArrayProperty body) { return newlineDelimitedWithResponse(body, RequestContext.none()).getValue(); } + + /** + * The enumCommaDelimited operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response + enumCommaDelimitedWithResponse(CommaDelimitedEnumArrayProperty body, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Encode.Array.Property.enumCommaDelimited", requestContext, + updatedContext -> this.serviceClient.enumCommaDelimitedWithResponse(body, updatedContext)); + } + + /** + * The enumCommaDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public CommaDelimitedEnumArrayProperty enumCommaDelimited(CommaDelimitedEnumArrayProperty body) { + return enumCommaDelimitedWithResponse(body, RequestContext.none()).getValue(); + } + + /** + * The enumSpaceDelimited operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response + enumSpaceDelimitedWithResponse(SpaceDelimitedEnumArrayProperty body, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Encode.Array.Property.enumSpaceDelimited", requestContext, + updatedContext -> this.serviceClient.enumSpaceDelimitedWithResponse(body, updatedContext)); + } + + /** + * The enumSpaceDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public SpaceDelimitedEnumArrayProperty enumSpaceDelimited(SpaceDelimitedEnumArrayProperty body) { + return enumSpaceDelimitedWithResponse(body, RequestContext.none()).getValue(); + } + + /** + * The enumPipeDelimited operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response enumPipeDelimitedWithResponse(PipeDelimitedEnumArrayProperty body, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Encode.Array.Property.enumPipeDelimited", requestContext, + updatedContext -> this.serviceClient.enumPipeDelimitedWithResponse(body, updatedContext)); + } + + /** + * The enumPipeDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public PipeDelimitedEnumArrayProperty enumPipeDelimited(PipeDelimitedEnumArrayProperty body) { + return enumPipeDelimitedWithResponse(body, RequestContext.none()).getValue(); + } + + /** + * The enumNewlineDelimited operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response + enumNewlineDelimitedWithResponse(NewlineDelimitedEnumArrayProperty body, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Encode.Array.Property.enumNewlineDelimited", requestContext, + updatedContext -> this.serviceClient.enumNewlineDelimitedWithResponse(body, updatedContext)); + } + + /** + * The enumNewlineDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public NewlineDelimitedEnumArrayProperty enumNewlineDelimited(NewlineDelimitedEnumArrayProperty body) { + return enumNewlineDelimitedWithResponse(body, RequestContext.none()).getValue(); + } + + /** + * The extensibleEnumCommaDelimited operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response extensibleEnumCommaDelimitedWithResponse( + CommaDelimitedExtensibleEnumArrayProperty body, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Encode.Array.Property.extensibleEnumCommaDelimited", + requestContext, + updatedContext -> this.serviceClient.extensibleEnumCommaDelimitedWithResponse(body, updatedContext)); + } + + /** + * The extensibleEnumCommaDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public CommaDelimitedExtensibleEnumArrayProperty + extensibleEnumCommaDelimited(CommaDelimitedExtensibleEnumArrayProperty body) { + return extensibleEnumCommaDelimitedWithResponse(body, RequestContext.none()).getValue(); + } + + /** + * The extensibleEnumSpaceDelimited operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response extensibleEnumSpaceDelimitedWithResponse( + SpaceDelimitedExtensibleEnumArrayProperty body, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Encode.Array.Property.extensibleEnumSpaceDelimited", + requestContext, + updatedContext -> this.serviceClient.extensibleEnumSpaceDelimitedWithResponse(body, updatedContext)); + } + + /** + * The extensibleEnumSpaceDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public SpaceDelimitedExtensibleEnumArrayProperty + extensibleEnumSpaceDelimited(SpaceDelimitedExtensibleEnumArrayProperty body) { + return extensibleEnumSpaceDelimitedWithResponse(body, RequestContext.none()).getValue(); + } + + /** + * The extensibleEnumPipeDelimited operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response extensibleEnumPipeDelimitedWithResponse( + PipeDelimitedExtensibleEnumArrayProperty body, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Encode.Array.Property.extensibleEnumPipeDelimited", + requestContext, + updatedContext -> this.serviceClient.extensibleEnumPipeDelimitedWithResponse(body, updatedContext)); + } + + /** + * The extensibleEnumPipeDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public PipeDelimitedExtensibleEnumArrayProperty + extensibleEnumPipeDelimited(PipeDelimitedExtensibleEnumArrayProperty body) { + return extensibleEnumPipeDelimitedWithResponse(body, RequestContext.none()).getValue(); + } + + /** + * The extensibleEnumNewlineDelimited operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response extensibleEnumNewlineDelimitedWithResponse( + NewlineDelimitedExtensibleEnumArrayProperty body, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Encode.Array.Property.extensibleEnumNewlineDelimited", + requestContext, + updatedContext -> this.serviceClient.extensibleEnumNewlineDelimitedWithResponse(body, updatedContext)); + } + + /** + * The extensibleEnumNewlineDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public NewlineDelimitedExtensibleEnumArrayProperty + extensibleEnumNewlineDelimited(NewlineDelimitedExtensibleEnumArrayProperty body) { + return extensibleEnumNewlineDelimitedWithResponse(body, RequestContext.none()).getValue(); + } } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/Colors.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/Colors.java new file mode 100644 index 00000000000..3ee3a935b87 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/Colors.java @@ -0,0 +1,57 @@ +package encode.array; + +/** + * Defines values for Colors. + */ +public enum Colors { + /** + * Enum value blue. + */ + BLUE("blue"), + + /** + * Enum value red. + */ + RED("red"), + + /** + * Enum value green. + */ + GREEN("green"); + + /** + * The actual serialized value for a Colors instance. + */ + private final String value; + + Colors(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a Colors instance. + * + * @param value the serialized value to parse. + * @return the parsed Colors object, or null if unable to parse. + */ + public static Colors fromString(String value) { + if (value == null) { + return null; + } + Colors[] items = Colors.values(); + for (Colors item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.value; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/ColorsExtensibleEnum.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/ColorsExtensibleEnum.java new file mode 100644 index 00000000000..10e282fa0bf --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/ColorsExtensibleEnum.java @@ -0,0 +1,134 @@ +package encode.array; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.json.JsonReader; +import io.clientcore.core.serialization.json.JsonSerializable; +import io.clientcore.core.serialization.json.JsonToken; +import io.clientcore.core.serialization.json.JsonWriter; +import io.clientcore.core.utils.ExpandableEnum; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; + +/** + * Defines values for ColorsExtensibleEnum. + */ +public final class ColorsExtensibleEnum implements ExpandableEnum, JsonSerializable { + private static final Map VALUES = new ConcurrentHashMap<>(); + + private static final Function NEW_INSTANCE = ColorsExtensibleEnum::new; + + /** + * Static value blue for ColorsExtensibleEnum. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ColorsExtensibleEnum BLUE = fromValue("blue"); + + /** + * Static value red for ColorsExtensibleEnum. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ColorsExtensibleEnum RED = fromValue("red"); + + /** + * Static value green for ColorsExtensibleEnum. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ColorsExtensibleEnum GREEN = fromValue("green"); + + private final String value; + + private ColorsExtensibleEnum(String value) { + this.value = value; + } + + /** + * Creates or finds a ColorsExtensibleEnum. + * + * @param value a value to look for. + * @return the corresponding ColorsExtensibleEnum. + * @throws IllegalArgumentException if value is null. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ColorsExtensibleEnum fromValue(String value) { + if (value == null) { + throw new IllegalArgumentException("'value' cannot be null."); + } + return VALUES.computeIfAbsent(value, NEW_INSTANCE); + } + + /** + * Gets known ColorsExtensibleEnum values. + * + * @return Known ColorsExtensibleEnum values. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static Collection values() { + return new ArrayList<>(VALUES.values()); + } + + /** + * Gets the value of the ColorsExtensibleEnum instance. + * + * @return the value of the ColorsExtensibleEnum instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public String getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + return jsonWriter.writeString(getValue()); + } + + /** + * Reads an instance of ColorsExtensibleEnum from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ColorsExtensibleEnum if the JsonReader was pointing to an instance of it, or null if the + * JsonReader was pointing to JSON null. + * @throws IOException If an error occurs while reading the ColorsExtensibleEnum. + * @throws IllegalStateException If unexpected JSON token is found. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ColorsExtensibleEnum fromJson(JsonReader jsonReader) throws IOException { + JsonToken nextToken = jsonReader.nextToken(); + if (nextToken == JsonToken.NULL) { + return null; + } + if (nextToken != JsonToken.STRING) { + throw new IllegalStateException( + String.format("Unexpected JSON token for %s deserialization: %s", JsonToken.STRING, nextToken)); + } + return ColorsExtensibleEnum.fromValue(jsonReader.getString()); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public String toString() { + return Objects.toString(this.value); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public boolean equals(Object obj) { + return this == obj; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public int hashCode() { + return Objects.hashCode(this.value); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/CommaDelimitedEnumArrayProperty.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/CommaDelimitedEnumArrayProperty.java new file mode 100644 index 00000000000..fa95134aad2 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/CommaDelimitedEnumArrayProperty.java @@ -0,0 +1,95 @@ +package encode.array; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.json.JsonReader; +import io.clientcore.core.serialization.json.JsonSerializable; +import io.clientcore.core.serialization.json.JsonToken; +import io.clientcore.core.serialization.json.JsonWriter; +import java.io.IOException; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * The CommaDelimitedEnumArrayProperty model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class CommaDelimitedEnumArrayProperty implements JsonSerializable { + /* + * The value property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List value; + + /** + * Creates an instance of CommaDelimitedEnumArrayProperty class. + * + * @param value the value value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public CommaDelimitedEnumArrayProperty(List value) { + this.value = value; + } + + /** + * Get the value property: The value property. + * + * @return the value value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + if (this.value != null) { + jsonWriter.writeStringField("value", + this.value.stream() + .map(element -> element == null ? null : element.toString()) + .collect(Collectors.joining(","))); + } + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of CommaDelimitedEnumArrayProperty from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of CommaDelimitedEnumArrayProperty if the JsonReader was pointing to an instance of it, or + * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the CommaDelimitedEnumArrayProperty. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static CommaDelimitedEnumArrayProperty fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + List value = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("value".equals(fieldName)) { + value = reader.getNullable(nonNullReader -> { + String valueEncodedAsString = nonNullReader.getString(); + return valueEncodedAsString.isEmpty() + ? new LinkedList<>() + : new LinkedList<>(Arrays.stream(valueEncodedAsString.split(",", -1)) + .map(valueAsString -> valueAsString == null ? null : Colors.fromString(valueAsString)) + .collect(Collectors.toList())); + }); + } else { + reader.skipChildren(); + } + } + return new CommaDelimitedEnumArrayProperty(value); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/CommaDelimitedExtensibleEnumArrayProperty.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/CommaDelimitedExtensibleEnumArrayProperty.java new file mode 100644 index 00000000000..6d84c584454 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/CommaDelimitedExtensibleEnumArrayProperty.java @@ -0,0 +1,98 @@ +package encode.array; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.json.JsonReader; +import io.clientcore.core.serialization.json.JsonSerializable; +import io.clientcore.core.serialization.json.JsonToken; +import io.clientcore.core.serialization.json.JsonWriter; +import java.io.IOException; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * The CommaDelimitedExtensibleEnumArrayProperty model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class CommaDelimitedExtensibleEnumArrayProperty + implements JsonSerializable { + /* + * The value property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List value; + + /** + * Creates an instance of CommaDelimitedExtensibleEnumArrayProperty class. + * + * @param value the value value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public CommaDelimitedExtensibleEnumArrayProperty(List value) { + this.value = value; + } + + /** + * Get the value property: The value property. + * + * @return the value value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + if (this.value != null) { + jsonWriter.writeStringField("value", + this.value.stream() + .map(element -> element == null ? null : element.getValue()) + .collect(Collectors.joining(","))); + } + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of CommaDelimitedExtensibleEnumArrayProperty from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of CommaDelimitedExtensibleEnumArrayProperty if the JsonReader was pointing to an instance of + * it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the CommaDelimitedExtensibleEnumArrayProperty. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static CommaDelimitedExtensibleEnumArrayProperty fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + List value = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("value".equals(fieldName)) { + value = reader.getNullable(nonNullReader -> { + String valueEncodedAsString = nonNullReader.getString(); + return valueEncodedAsString.isEmpty() + ? new LinkedList<>() + : new LinkedList<>(Arrays.stream(valueEncodedAsString.split(",", -1)) + .map(valueAsString -> valueAsString == null + ? null + : ColorsExtensibleEnum.fromValue(valueAsString)) + .collect(Collectors.toList())); + }); + } else { + reader.skipChildren(); + } + } + return new CommaDelimitedExtensibleEnumArrayProperty(value); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/NewlineDelimitedEnumArrayProperty.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/NewlineDelimitedEnumArrayProperty.java new file mode 100644 index 00000000000..2cb16afee07 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/NewlineDelimitedEnumArrayProperty.java @@ -0,0 +1,95 @@ +package encode.array; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.json.JsonReader; +import io.clientcore.core.serialization.json.JsonSerializable; +import io.clientcore.core.serialization.json.JsonToken; +import io.clientcore.core.serialization.json.JsonWriter; +import java.io.IOException; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * The NewlineDelimitedEnumArrayProperty model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class NewlineDelimitedEnumArrayProperty implements JsonSerializable { + /* + * The value property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List value; + + /** + * Creates an instance of NewlineDelimitedEnumArrayProperty class. + * + * @param value the value value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public NewlineDelimitedEnumArrayProperty(List value) { + this.value = value; + } + + /** + * Get the value property: The value property. + * + * @return the value value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + if (this.value != null) { + jsonWriter.writeStringField("value", + this.value.stream() + .map(element -> element == null ? null : element.toString()) + .collect(Collectors.joining("\n"))); + } + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of NewlineDelimitedEnumArrayProperty from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of NewlineDelimitedEnumArrayProperty if the JsonReader was pointing to an instance of it, or + * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the NewlineDelimitedEnumArrayProperty. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static NewlineDelimitedEnumArrayProperty fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + List value = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("value".equals(fieldName)) { + value = reader.getNullable(nonNullReader -> { + String valueEncodedAsString = nonNullReader.getString(); + return valueEncodedAsString.isEmpty() + ? new LinkedList<>() + : new LinkedList<>(Arrays.stream(valueEncodedAsString.split("\n", -1)) + .map(valueAsString -> valueAsString == null ? null : Colors.fromString(valueAsString)) + .collect(Collectors.toList())); + }); + } else { + reader.skipChildren(); + } + } + return new NewlineDelimitedEnumArrayProperty(value); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/NewlineDelimitedExtensibleEnumArrayProperty.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/NewlineDelimitedExtensibleEnumArrayProperty.java new file mode 100644 index 00000000000..8e6b96b7b43 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/NewlineDelimitedExtensibleEnumArrayProperty.java @@ -0,0 +1,98 @@ +package encode.array; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.json.JsonReader; +import io.clientcore.core.serialization.json.JsonSerializable; +import io.clientcore.core.serialization.json.JsonToken; +import io.clientcore.core.serialization.json.JsonWriter; +import java.io.IOException; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * The NewlineDelimitedExtensibleEnumArrayProperty model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class NewlineDelimitedExtensibleEnumArrayProperty + implements JsonSerializable { + /* + * The value property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List value; + + /** + * Creates an instance of NewlineDelimitedExtensibleEnumArrayProperty class. + * + * @param value the value value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public NewlineDelimitedExtensibleEnumArrayProperty(List value) { + this.value = value; + } + + /** + * Get the value property: The value property. + * + * @return the value value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + if (this.value != null) { + jsonWriter.writeStringField("value", + this.value.stream() + .map(element -> element == null ? null : element.getValue()) + .collect(Collectors.joining("\n"))); + } + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of NewlineDelimitedExtensibleEnumArrayProperty from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of NewlineDelimitedExtensibleEnumArrayProperty if the JsonReader was pointing to an instance + * of it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the NewlineDelimitedExtensibleEnumArrayProperty. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static NewlineDelimitedExtensibleEnumArrayProperty fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + List value = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("value".equals(fieldName)) { + value = reader.getNullable(nonNullReader -> { + String valueEncodedAsString = nonNullReader.getString(); + return valueEncodedAsString.isEmpty() + ? new LinkedList<>() + : new LinkedList<>(Arrays.stream(valueEncodedAsString.split("\n", -1)) + .map(valueAsString -> valueAsString == null + ? null + : ColorsExtensibleEnum.fromValue(valueAsString)) + .collect(Collectors.toList())); + }); + } else { + reader.skipChildren(); + } + } + return new NewlineDelimitedExtensibleEnumArrayProperty(value); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/PipeDelimitedEnumArrayProperty.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/PipeDelimitedEnumArrayProperty.java new file mode 100644 index 00000000000..15aa7e5db3b --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/PipeDelimitedEnumArrayProperty.java @@ -0,0 +1,95 @@ +package encode.array; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.json.JsonReader; +import io.clientcore.core.serialization.json.JsonSerializable; +import io.clientcore.core.serialization.json.JsonToken; +import io.clientcore.core.serialization.json.JsonWriter; +import java.io.IOException; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * The PipeDelimitedEnumArrayProperty model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class PipeDelimitedEnumArrayProperty implements JsonSerializable { + /* + * The value property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List value; + + /** + * Creates an instance of PipeDelimitedEnumArrayProperty class. + * + * @param value the value value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public PipeDelimitedEnumArrayProperty(List value) { + this.value = value; + } + + /** + * Get the value property: The value property. + * + * @return the value value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + if (this.value != null) { + jsonWriter.writeStringField("value", + this.value.stream() + .map(element -> element == null ? null : element.toString()) + .collect(Collectors.joining("|"))); + } + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of PipeDelimitedEnumArrayProperty from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of PipeDelimitedEnumArrayProperty if the JsonReader was pointing to an instance of it, or + * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the PipeDelimitedEnumArrayProperty. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static PipeDelimitedEnumArrayProperty fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + List value = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("value".equals(fieldName)) { + value = reader.getNullable(nonNullReader -> { + String valueEncodedAsString = nonNullReader.getString(); + return valueEncodedAsString.isEmpty() + ? new LinkedList<>() + : new LinkedList<>(Arrays.stream(valueEncodedAsString.split("\\|", -1)) + .map(valueAsString -> valueAsString == null ? null : Colors.fromString(valueAsString)) + .collect(Collectors.toList())); + }); + } else { + reader.skipChildren(); + } + } + return new PipeDelimitedEnumArrayProperty(value); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/PipeDelimitedExtensibleEnumArrayProperty.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/PipeDelimitedExtensibleEnumArrayProperty.java new file mode 100644 index 00000000000..7f3f20a53cd --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/PipeDelimitedExtensibleEnumArrayProperty.java @@ -0,0 +1,98 @@ +package encode.array; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.json.JsonReader; +import io.clientcore.core.serialization.json.JsonSerializable; +import io.clientcore.core.serialization.json.JsonToken; +import io.clientcore.core.serialization.json.JsonWriter; +import java.io.IOException; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * The PipeDelimitedExtensibleEnumArrayProperty model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class PipeDelimitedExtensibleEnumArrayProperty + implements JsonSerializable { + /* + * The value property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List value; + + /** + * Creates an instance of PipeDelimitedExtensibleEnumArrayProperty class. + * + * @param value the value value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public PipeDelimitedExtensibleEnumArrayProperty(List value) { + this.value = value; + } + + /** + * Get the value property: The value property. + * + * @return the value value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + if (this.value != null) { + jsonWriter.writeStringField("value", + this.value.stream() + .map(element -> element == null ? null : element.getValue()) + .collect(Collectors.joining("|"))); + } + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of PipeDelimitedExtensibleEnumArrayProperty from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of PipeDelimitedExtensibleEnumArrayProperty if the JsonReader was pointing to an instance of + * it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the PipeDelimitedExtensibleEnumArrayProperty. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static PipeDelimitedExtensibleEnumArrayProperty fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + List value = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("value".equals(fieldName)) { + value = reader.getNullable(nonNullReader -> { + String valueEncodedAsString = nonNullReader.getString(); + return valueEncodedAsString.isEmpty() + ? new LinkedList<>() + : new LinkedList<>(Arrays.stream(valueEncodedAsString.split("\\|", -1)) + .map(valueAsString -> valueAsString == null + ? null + : ColorsExtensibleEnum.fromValue(valueAsString)) + .collect(Collectors.toList())); + }); + } else { + reader.skipChildren(); + } + } + return new PipeDelimitedExtensibleEnumArrayProperty(value); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/SpaceDelimitedEnumArrayProperty.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/SpaceDelimitedEnumArrayProperty.java new file mode 100644 index 00000000000..8a929a79a07 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/SpaceDelimitedEnumArrayProperty.java @@ -0,0 +1,95 @@ +package encode.array; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.json.JsonReader; +import io.clientcore.core.serialization.json.JsonSerializable; +import io.clientcore.core.serialization.json.JsonToken; +import io.clientcore.core.serialization.json.JsonWriter; +import java.io.IOException; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * The SpaceDelimitedEnumArrayProperty model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class SpaceDelimitedEnumArrayProperty implements JsonSerializable { + /* + * The value property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List value; + + /** + * Creates an instance of SpaceDelimitedEnumArrayProperty class. + * + * @param value the value value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public SpaceDelimitedEnumArrayProperty(List value) { + this.value = value; + } + + /** + * Get the value property: The value property. + * + * @return the value value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + if (this.value != null) { + jsonWriter.writeStringField("value", + this.value.stream() + .map(element -> element == null ? null : element.toString()) + .collect(Collectors.joining(" "))); + } + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of SpaceDelimitedEnumArrayProperty from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of SpaceDelimitedEnumArrayProperty if the JsonReader was pointing to an instance of it, or + * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the SpaceDelimitedEnumArrayProperty. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static SpaceDelimitedEnumArrayProperty fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + List value = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("value".equals(fieldName)) { + value = reader.getNullable(nonNullReader -> { + String valueEncodedAsString = nonNullReader.getString(); + return valueEncodedAsString.isEmpty() + ? new LinkedList<>() + : new LinkedList<>(Arrays.stream(valueEncodedAsString.split(" ", -1)) + .map(valueAsString -> valueAsString == null ? null : Colors.fromString(valueAsString)) + .collect(Collectors.toList())); + }); + } else { + reader.skipChildren(); + } + } + return new SpaceDelimitedEnumArrayProperty(value); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/SpaceDelimitedExtensibleEnumArrayProperty.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/SpaceDelimitedExtensibleEnumArrayProperty.java new file mode 100644 index 00000000000..fcc44027d14 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/SpaceDelimitedExtensibleEnumArrayProperty.java @@ -0,0 +1,98 @@ +package encode.array; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.json.JsonReader; +import io.clientcore.core.serialization.json.JsonSerializable; +import io.clientcore.core.serialization.json.JsonToken; +import io.clientcore.core.serialization.json.JsonWriter; +import java.io.IOException; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * The SpaceDelimitedExtensibleEnumArrayProperty model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class SpaceDelimitedExtensibleEnumArrayProperty + implements JsonSerializable { + /* + * The value property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List value; + + /** + * Creates an instance of SpaceDelimitedExtensibleEnumArrayProperty class. + * + * @param value the value value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public SpaceDelimitedExtensibleEnumArrayProperty(List value) { + this.value = value; + } + + /** + * Get the value property: The value property. + * + * @return the value value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + if (this.value != null) { + jsonWriter.writeStringField("value", + this.value.stream() + .map(element -> element == null ? null : element.getValue()) + .collect(Collectors.joining(" "))); + } + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of SpaceDelimitedExtensibleEnumArrayProperty from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of SpaceDelimitedExtensibleEnumArrayProperty if the JsonReader was pointing to an instance of + * it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the SpaceDelimitedExtensibleEnumArrayProperty. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static SpaceDelimitedExtensibleEnumArrayProperty fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + List value = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("value".equals(fieldName)) { + value = reader.getNullable(nonNullReader -> { + String valueEncodedAsString = nonNullReader.getString(); + return valueEncodedAsString.isEmpty() + ? new LinkedList<>() + : new LinkedList<>(Arrays.stream(valueEncodedAsString.split(" ", -1)) + .map(valueAsString -> valueAsString == null + ? null + : ColorsExtensibleEnum.fromValue(valueAsString)) + .collect(Collectors.toList())); + }); + } else { + reader.skipChildren(); + } + } + return new SpaceDelimitedExtensibleEnumArrayProperty(value); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/implementation/PropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/implementation/PropertiesImpl.java index c87416a9952..c7c1dfdecd5 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/implementation/PropertiesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/implementation/PropertiesImpl.java @@ -1,9 +1,17 @@ package encode.array.implementation; import encode.array.CommaDelimitedArrayProperty; +import encode.array.CommaDelimitedEnumArrayProperty; +import encode.array.CommaDelimitedExtensibleEnumArrayProperty; import encode.array.NewlineDelimitedArrayProperty; +import encode.array.NewlineDelimitedEnumArrayProperty; +import encode.array.NewlineDelimitedExtensibleEnumArrayProperty; import encode.array.PipeDelimitedArrayProperty; +import encode.array.PipeDelimitedEnumArrayProperty; +import encode.array.PipeDelimitedExtensibleEnumArrayProperty; import encode.array.SpaceDelimitedArrayProperty; +import encode.array.SpaceDelimitedEnumArrayProperty; +import encode.array.SpaceDelimitedExtensibleEnumArrayProperty; import io.clientcore.core.annotations.ReturnType; import io.clientcore.core.annotations.ServiceInterface; import io.clientcore.core.annotations.ServiceMethod; @@ -102,6 +110,86 @@ Response pipeDelimited(@HostParam("endpoint") String Response newlineDelimited(@HostParam("endpoint") String endpoint, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") NewlineDelimitedArrayProperty body, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.POST, + path = "/encode/array/property/enum/comma-delimited", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response enumCommaDelimited(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") CommaDelimitedEnumArrayProperty body, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.POST, + path = "/encode/array/property/enum/space-delimited", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response enumSpaceDelimited(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") SpaceDelimitedEnumArrayProperty body, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.POST, + path = "/encode/array/property/enum/pipe-delimited", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response enumPipeDelimited(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") PipeDelimitedEnumArrayProperty body, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.POST, + path = "/encode/array/property/enum/newline-delimited", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response enumNewlineDelimited(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") NewlineDelimitedEnumArrayProperty body, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.POST, + path = "/encode/array/property/extensible-enum/comma-delimited", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response extensibleEnumCommaDelimited( + @HostParam("endpoint") String endpoint, @HeaderParam("Content-Type") String contentType, + @HeaderParam("Accept") String accept, + @BodyParam("application/json") CommaDelimitedExtensibleEnumArrayProperty body, + RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.POST, + path = "/encode/array/property/extensible-enum/space-delimited", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response extensibleEnumSpaceDelimited( + @HostParam("endpoint") String endpoint, @HeaderParam("Content-Type") String contentType, + @HeaderParam("Accept") String accept, + @BodyParam("application/json") SpaceDelimitedExtensibleEnumArrayProperty body, + RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.POST, + path = "/encode/array/property/extensible-enum/pipe-delimited", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response extensibleEnumPipeDelimited( + @HostParam("endpoint") String endpoint, @HeaderParam("Content-Type") String contentType, + @HeaderParam("Accept") String accept, + @BodyParam("application/json") PipeDelimitedExtensibleEnumArrayProperty body, + RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.POST, + path = "/encode/array/property/extensible-enum/newline-delimited", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response extensibleEnumNewlineDelimited( + @HostParam("endpoint") String endpoint, @HeaderParam("Content-Type") String contentType, + @HeaderParam("Accept") String accept, + @BodyParam("application/json") NewlineDelimitedExtensibleEnumArrayProperty body, + RequestContext requestContext); } /** @@ -187,4 +275,177 @@ public Response newlineDelimitedWithResponse(Newl return service.newlineDelimited(this.client.getEndpoint(), contentType, accept, body, updatedContext); }); } + + /** + * The enumCommaDelimited operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response + enumCommaDelimitedWithResponse(CommaDelimitedEnumArrayProperty body, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Encode.Array.Property.enumCommaDelimited", requestContext, + updatedContext -> { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.enumCommaDelimited(this.client.getEndpoint(), contentType, accept, body, updatedContext); + }); + } + + /** + * The enumSpaceDelimited operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response + enumSpaceDelimitedWithResponse(SpaceDelimitedEnumArrayProperty body, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Encode.Array.Property.enumSpaceDelimited", requestContext, + updatedContext -> { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.enumSpaceDelimited(this.client.getEndpoint(), contentType, accept, body, updatedContext); + }); + } + + /** + * The enumPipeDelimited operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response enumPipeDelimitedWithResponse(PipeDelimitedEnumArrayProperty body, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Encode.Array.Property.enumPipeDelimited", requestContext, + updatedContext -> { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.enumPipeDelimited(this.client.getEndpoint(), contentType, accept, body, updatedContext); + }); + } + + /** + * The enumNewlineDelimited operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response + enumNewlineDelimitedWithResponse(NewlineDelimitedEnumArrayProperty body, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Encode.Array.Property.enumNewlineDelimited", requestContext, + updatedContext -> { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.enumNewlineDelimited(this.client.getEndpoint(), contentType, accept, body, + updatedContext); + }); + } + + /** + * The extensibleEnumCommaDelimited operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response extensibleEnumCommaDelimitedWithResponse( + CommaDelimitedExtensibleEnumArrayProperty body, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Encode.Array.Property.extensibleEnumCommaDelimited", + requestContext, updatedContext -> { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.extensibleEnumCommaDelimited(this.client.getEndpoint(), contentType, accept, body, + updatedContext); + }); + } + + /** + * The extensibleEnumSpaceDelimited operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response extensibleEnumSpaceDelimitedWithResponse( + SpaceDelimitedExtensibleEnumArrayProperty body, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Encode.Array.Property.extensibleEnumSpaceDelimited", + requestContext, updatedContext -> { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.extensibleEnumSpaceDelimited(this.client.getEndpoint(), contentType, accept, body, + updatedContext); + }); + } + + /** + * The extensibleEnumPipeDelimited operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response extensibleEnumPipeDelimitedWithResponse( + PipeDelimitedExtensibleEnumArrayProperty body, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Encode.Array.Property.extensibleEnumPipeDelimited", + requestContext, updatedContext -> { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.extensibleEnumPipeDelimited(this.client.getEndpoint(), contentType, accept, body, + updatedContext); + }); + } + + /** + * The extensibleEnumNewlineDelimited operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response extensibleEnumNewlineDelimitedWithResponse( + NewlineDelimitedExtensibleEnumArrayProperty body, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Encode.Array.Property.extensibleEnumNewlineDelimited", + requestContext, updatedContext -> { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.extensibleEnumNewlineDelimited(this.client.getEndpoint(), contentType, accept, body, + updatedContext); + }); + } } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/HeaderClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/HeaderClient.java index aff03feded3..6380c9ac961 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/HeaderClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/HeaderClient.java @@ -297,7 +297,7 @@ public void float64Seconds(Duration duration) { */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsWithResponse(int duration, RequestContext requestContext) { + public Response int32MillisecondsWithResponse(Duration duration, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Header.int32Milliseconds", requestContext, updatedContext -> this.serviceClient.int32MillisecondsWithResponse(duration, updatedContext)); } @@ -312,7 +312,7 @@ public Response int32MillisecondsWithResponse(int duration, RequestContext */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public void int32Milliseconds(int duration) { + public void int32Milliseconds(Duration duration) { int32MillisecondsWithResponse(duration, RequestContext.none()); } @@ -328,7 +328,7 @@ public void int32Milliseconds(int duration) { */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsLargerUnitWithResponse(int duration, RequestContext requestContext) { + public Response int32MillisecondsLargerUnitWithResponse(Duration duration, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Header.int32MillisecondsLargerUnit", requestContext, updatedContext -> this.serviceClient.int32MillisecondsLargerUnitWithResponse(duration, updatedContext)); @@ -344,7 +344,7 @@ public Response int32MillisecondsLargerUnitWithResponse(int duration, Requ */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public void int32MillisecondsLargerUnit(int duration) { + public void int32MillisecondsLargerUnit(Duration duration) { int32MillisecondsLargerUnitWithResponse(duration, RequestContext.none()); } @@ -360,7 +360,7 @@ public void int32MillisecondsLargerUnit(int duration) { */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsWithResponse(double duration, RequestContext requestContext) { + public Response floatMillisecondsWithResponse(Duration duration, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Header.floatMilliseconds", requestContext, updatedContext -> this.serviceClient.floatMillisecondsWithResponse(duration, updatedContext)); } @@ -375,7 +375,7 @@ public Response floatMillisecondsWithResponse(double duration, RequestCont */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public void floatMilliseconds(double duration) { + public void floatMilliseconds(Duration duration) { floatMillisecondsWithResponse(duration, RequestContext.none()); } @@ -391,7 +391,7 @@ public void floatMilliseconds(double duration) { */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsLargerUnitWithResponse(double duration, RequestContext requestContext) { + public Response floatMillisecondsLargerUnitWithResponse(Duration duration, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Header.floatMillisecondsLargerUnit", requestContext, updatedContext -> this.serviceClient.floatMillisecondsLargerUnitWithResponse(duration, updatedContext)); @@ -407,7 +407,7 @@ public Response floatMillisecondsLargerUnitWithResponse(double duration, R */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public void floatMillisecondsLargerUnit(double duration) { + public void floatMillisecondsLargerUnit(Duration duration) { floatMillisecondsLargerUnitWithResponse(duration, RequestContext.none()); } @@ -423,7 +423,7 @@ public void floatMillisecondsLargerUnit(double duration) { */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public Response float64MillisecondsWithResponse(double duration, RequestContext requestContext) { + public Response float64MillisecondsWithResponse(Duration duration, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Header.float64Milliseconds", requestContext, updatedContext -> this.serviceClient.float64MillisecondsWithResponse(duration, updatedContext)); } @@ -438,7 +438,7 @@ public Response float64MillisecondsWithResponse(double duration, RequestCo */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public void float64Milliseconds(double duration) { + public void float64Milliseconds(Duration duration) { float64MillisecondsWithResponse(duration, RequestContext.none()); } @@ -454,7 +454,7 @@ public void float64Milliseconds(double duration) { */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsArrayWithResponse(List duration, RequestContext requestContext) { + public Response int32MillisecondsArrayWithResponse(List duration, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Header.int32MillisecondsArray", requestContext, updatedContext -> this.serviceClient.int32MillisecondsArrayWithResponse(duration, updatedContext)); @@ -470,7 +470,7 @@ public Response int32MillisecondsArrayWithResponse(List duration, */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public void int32MillisecondsArray(List duration) { + public void int32MillisecondsArray(List duration) { int32MillisecondsArrayWithResponse(duration, RequestContext.none()); } } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/QueryClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/QueryClient.java index 1bbcff5e36d..4ece02607ed 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/QueryClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/QueryClient.java @@ -266,7 +266,7 @@ public void float64Seconds(Duration input) { */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsWithResponse(int input, RequestContext requestContext) { + public Response int32MillisecondsWithResponse(Duration input, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Query.int32Milliseconds", requestContext, updatedContext -> this.serviceClient.int32MillisecondsWithResponse(input, updatedContext)); } @@ -281,7 +281,7 @@ public Response int32MillisecondsWithResponse(int input, RequestContext re */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public void int32Milliseconds(int input) { + public void int32Milliseconds(Duration input) { int32MillisecondsWithResponse(input, RequestContext.none()); } @@ -297,7 +297,7 @@ public void int32Milliseconds(int input) { */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsLargerUnitWithResponse(int input, RequestContext requestContext) { + public Response int32MillisecondsLargerUnitWithResponse(Duration input, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Query.int32MillisecondsLargerUnit", requestContext, updatedContext -> this.serviceClient.int32MillisecondsLargerUnitWithResponse(input, updatedContext)); @@ -313,7 +313,7 @@ public Response int32MillisecondsLargerUnitWithResponse(int input, Request */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public void int32MillisecondsLargerUnit(int input) { + public void int32MillisecondsLargerUnit(Duration input) { int32MillisecondsLargerUnitWithResponse(input, RequestContext.none()); } @@ -329,7 +329,7 @@ public void int32MillisecondsLargerUnit(int input) { */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsWithResponse(double input, RequestContext requestContext) { + public Response floatMillisecondsWithResponse(Duration input, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Query.floatMilliseconds", requestContext, updatedContext -> this.serviceClient.floatMillisecondsWithResponse(input, updatedContext)); } @@ -344,7 +344,7 @@ public Response floatMillisecondsWithResponse(double input, RequestContext */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public void floatMilliseconds(double input) { + public void floatMilliseconds(Duration input) { floatMillisecondsWithResponse(input, RequestContext.none()); } @@ -360,7 +360,7 @@ public void floatMilliseconds(double input) { */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsLargerUnitWithResponse(double input, RequestContext requestContext) { + public Response floatMillisecondsLargerUnitWithResponse(Duration input, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Query.floatMillisecondsLargerUnit", requestContext, updatedContext -> this.serviceClient.floatMillisecondsLargerUnitWithResponse(input, updatedContext)); @@ -376,7 +376,7 @@ public Response floatMillisecondsLargerUnitWithResponse(double input, Requ */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public void floatMillisecondsLargerUnit(double input) { + public void floatMillisecondsLargerUnit(Duration input) { floatMillisecondsLargerUnitWithResponse(input, RequestContext.none()); } @@ -392,7 +392,7 @@ public void floatMillisecondsLargerUnit(double input) { */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public Response float64MillisecondsWithResponse(double input, RequestContext requestContext) { + public Response float64MillisecondsWithResponse(Duration input, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Query.float64Milliseconds", requestContext, updatedContext -> this.serviceClient.float64MillisecondsWithResponse(input, updatedContext)); } @@ -407,7 +407,7 @@ public Response float64MillisecondsWithResponse(double input, RequestConte */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public void float64Milliseconds(double input) { + public void float64Milliseconds(Duration input) { float64MillisecondsWithResponse(input, RequestContext.none()); } @@ -454,7 +454,7 @@ public void int32SecondsArray(List input) { */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsArrayWithResponse(List input, RequestContext requestContext) { + public Response int32MillisecondsArrayWithResponse(List input, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Query.int32MillisecondsArray", requestContext, updatedContext -> this.serviceClient.int32MillisecondsArrayWithResponse(input, updatedContext)); @@ -470,7 +470,7 @@ public Response int32MillisecondsArrayWithResponse(List input, Re */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) - public void int32MillisecondsArray(List input) { + public void int32MillisecondsArray(List input) { int32MillisecondsArrayWithResponse(input, RequestContext.none()); } } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/implementation/HeadersImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/implementation/HeadersImpl.java index ec07d4d7479..aebf57bc18d 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/implementation/HeadersImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/implementation/HeadersImpl.java @@ -135,7 +135,7 @@ Response float64Seconds(@HostParam("endpoint") String endpoint, @HeaderPar path = "/encode/duration/header/int32-milliseconds", expectedStatusCodes = { 204 }) @UnexpectedResponseExceptionDetail - Response int32Milliseconds(@HostParam("endpoint") String endpoint, @HeaderParam("duration") int duration, + Response int32Milliseconds(@HostParam("endpoint") String endpoint, @HeaderParam("duration") long duration, RequestContext requestContext); @HttpRequestInformation( @@ -144,7 +144,7 @@ Response int32Milliseconds(@HostParam("endpoint") String endpoint, @Header expectedStatusCodes = { 204 }) @UnexpectedResponseExceptionDetail Response int32MillisecondsLargerUnit(@HostParam("endpoint") String endpoint, - @HeaderParam("duration") int duration, RequestContext requestContext); + @HeaderParam("duration") long duration, RequestContext requestContext); @HttpRequestInformation( method = HttpMethod.GET, @@ -366,10 +366,11 @@ public Response float64SecondsWithResponse(Duration duration, RequestConte * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsWithResponse(int duration, RequestContext requestContext) { + public Response int32MillisecondsWithResponse(Duration duration, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Header.int32Milliseconds", requestContext, updatedContext -> { - return service.int32Milliseconds(this.client.getEndpoint(), duration, updatedContext); + long durationConverted = duration.toMillis(); + return service.int32Milliseconds(this.client.getEndpoint(), durationConverted, updatedContext); }); } @@ -384,10 +385,12 @@ public Response int32MillisecondsWithResponse(int duration, RequestContext * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsLargerUnitWithResponse(int duration, RequestContext requestContext) { + public Response int32MillisecondsLargerUnitWithResponse(Duration duration, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Header.int32MillisecondsLargerUnit", requestContext, updatedContext -> { - return service.int32MillisecondsLargerUnit(this.client.getEndpoint(), duration, updatedContext); + long durationConverted = duration.toMillis(); + return service.int32MillisecondsLargerUnit(this.client.getEndpoint(), durationConverted, + updatedContext); }); } @@ -402,10 +405,11 @@ public Response int32MillisecondsLargerUnitWithResponse(int duration, Requ * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsWithResponse(double duration, RequestContext requestContext) { + public Response floatMillisecondsWithResponse(Duration duration, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Header.floatMilliseconds", requestContext, updatedContext -> { - return service.floatMilliseconds(this.client.getEndpoint(), duration, updatedContext); + double durationConverted = (double) duration.toNanos() / 1000_000L; + return service.floatMilliseconds(this.client.getEndpoint(), durationConverted, updatedContext); }); } @@ -420,10 +424,12 @@ public Response floatMillisecondsWithResponse(double duration, RequestCont * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsLargerUnitWithResponse(double duration, RequestContext requestContext) { + public Response floatMillisecondsLargerUnitWithResponse(Duration duration, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Header.floatMillisecondsLargerUnit", requestContext, updatedContext -> { - return service.floatMillisecondsLargerUnit(this.client.getEndpoint(), duration, updatedContext); + double durationConverted = (double) duration.toNanos() / 1000_000L; + return service.floatMillisecondsLargerUnit(this.client.getEndpoint(), durationConverted, + updatedContext); }); } @@ -438,10 +444,11 @@ public Response floatMillisecondsLargerUnitWithResponse(double duration, R * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response float64MillisecondsWithResponse(double duration, RequestContext requestContext) { + public Response float64MillisecondsWithResponse(Duration duration, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Header.float64Milliseconds", requestContext, updatedContext -> { - return service.float64Milliseconds(this.client.getEndpoint(), duration, updatedContext); + double durationConverted = (double) duration.toNanos() / 1000_000L; + return service.float64Milliseconds(this.client.getEndpoint(), durationConverted, updatedContext); }); } @@ -456,36 +463,41 @@ public Response float64MillisecondsWithResponse(double duration, RequestCo * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsArrayWithResponse(List duration, RequestContext requestContext) { + public Response int32MillisecondsArrayWithResponse(List duration, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Header.int32MillisecondsArray", requestContext, updatedContext -> { - String durationConverted = duration.stream().map(paramItemValue -> { - if (paramItemValue == null) { - return ""; - } else { - String itemValueString = BinaryData.fromObject(paramItemValue).toString(); - int strLength = itemValueString.length(); - int startOffset = 0; - while (startOffset < strLength) { - if (itemValueString.charAt(startOffset) != '"') { - break; - } - startOffset++; - } - if (startOffset == strLength) { + String durationConverted = duration.stream() + .map(paramItemValue -> paramItemValue.toMillis()) + .collect(Collectors.toList()) + .stream() + .map(paramItemValue -> { + if (paramItemValue == null) { return ""; - } - int endOffset = strLength - 1; - while (endOffset >= 0) { - if (itemValueString.charAt(endOffset) != '"') { - break; + } else { + String itemValueString = BinaryData.fromObject(paramItemValue).toString(); + int strLength = itemValueString.length(); + int startOffset = 0; + while (startOffset < strLength) { + if (itemValueString.charAt(startOffset) != '"') { + break; + } + startOffset++; } + if (startOffset == strLength) { + return ""; + } + int endOffset = strLength - 1; + while (endOffset >= 0) { + if (itemValueString.charAt(endOffset) != '"') { + break; + } - endOffset--; + endOffset--; + } + return itemValueString.substring(startOffset, endOffset + 1); } - return itemValueString.substring(startOffset, endOffset + 1); - } - }).collect(Collectors.joining(",")); + }) + .collect(Collectors.joining(",")); return service.int32MillisecondsArray(this.client.getEndpoint(), durationConverted, updatedContext); }); } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/implementation/QueriesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/implementation/QueriesImpl.java index daf915045be..e99d644ce8b 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/implementation/QueriesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/implementation/QueriesImpl.java @@ -127,7 +127,7 @@ Response float64Seconds(@HostParam("endpoint") String endpoint, @QueryPara path = "/encode/duration/query/int32-milliseconds", expectedStatusCodes = { 204 }) @UnexpectedResponseExceptionDetail - Response int32Milliseconds(@HostParam("endpoint") String endpoint, @QueryParam("input") int input, + Response int32Milliseconds(@HostParam("endpoint") String endpoint, @QueryParam("input") long input, RequestContext requestContext); @HttpRequestInformation( @@ -136,7 +136,7 @@ Response int32Milliseconds(@HostParam("endpoint") String endpoint, @QueryP expectedStatusCodes = { 204 }) @UnexpectedResponseExceptionDetail Response int32MillisecondsLargerUnit(@HostParam("endpoint") String endpoint, - @QueryParam("input") int input, RequestContext requestContext); + @QueryParam("input") long input, RequestContext requestContext); @HttpRequestInformation( method = HttpMethod.GET, @@ -321,10 +321,11 @@ public Response float64SecondsWithResponse(Duration input, RequestContext * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsWithResponse(int input, RequestContext requestContext) { + public Response int32MillisecondsWithResponse(Duration input, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Query.int32Milliseconds", requestContext, updatedContext -> { - return service.int32Milliseconds(this.client.getEndpoint(), input, updatedContext); + long inputConverted = input.toMillis(); + return service.int32Milliseconds(this.client.getEndpoint(), inputConverted, updatedContext); }); } @@ -339,10 +340,11 @@ public Response int32MillisecondsWithResponse(int input, RequestContext re * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsLargerUnitWithResponse(int input, RequestContext requestContext) { + public Response int32MillisecondsLargerUnitWithResponse(Duration input, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Query.int32MillisecondsLargerUnit", requestContext, updatedContext -> { - return service.int32MillisecondsLargerUnit(this.client.getEndpoint(), input, updatedContext); + long inputConverted = input.toMillis(); + return service.int32MillisecondsLargerUnit(this.client.getEndpoint(), inputConverted, updatedContext); }); } @@ -357,10 +359,11 @@ public Response int32MillisecondsLargerUnitWithResponse(int input, Request * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsWithResponse(double input, RequestContext requestContext) { + public Response floatMillisecondsWithResponse(Duration input, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Query.floatMilliseconds", requestContext, updatedContext -> { - return service.floatMilliseconds(this.client.getEndpoint(), input, updatedContext); + double inputConverted = (double) input.toNanos() / 1000_000L; + return service.floatMilliseconds(this.client.getEndpoint(), inputConverted, updatedContext); }); } @@ -375,10 +378,11 @@ public Response floatMillisecondsWithResponse(double input, RequestContext * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsLargerUnitWithResponse(double input, RequestContext requestContext) { + public Response floatMillisecondsLargerUnitWithResponse(Duration input, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Query.floatMillisecondsLargerUnit", requestContext, updatedContext -> { - return service.floatMillisecondsLargerUnit(this.client.getEndpoint(), input, updatedContext); + double inputConverted = (double) input.toNanos() / 1000_000L; + return service.floatMillisecondsLargerUnit(this.client.getEndpoint(), inputConverted, updatedContext); }); } @@ -393,10 +397,11 @@ public Response floatMillisecondsLargerUnitWithResponse(double input, Requ * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response float64MillisecondsWithResponse(double input, RequestContext requestContext) { + public Response float64MillisecondsWithResponse(Duration input, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Query.float64Milliseconds", requestContext, updatedContext -> { - return service.float64Milliseconds(this.client.getEndpoint(), input, updatedContext); + double inputConverted = (double) input.toNanos() / 1000_000L; + return service.float64Milliseconds(this.client.getEndpoint(), inputConverted, updatedContext); }); } @@ -461,36 +466,41 @@ public Response int32SecondsArrayWithResponse(List input, Reques * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsArrayWithResponse(List input, RequestContext requestContext) { + public Response int32MillisecondsArrayWithResponse(List input, RequestContext requestContext) { return this.instrumentation.instrumentWithResponse("Encode.Duration.Query.int32MillisecondsArray", requestContext, updatedContext -> { - String inputConverted = input.stream().map(paramItemValue -> { - if (paramItemValue == null) { - return ""; - } else { - String itemValueString = BinaryData.fromObject(paramItemValue).toString(); - int strLength = itemValueString.length(); - int startOffset = 0; - while (startOffset < strLength) { - if (itemValueString.charAt(startOffset) != '"') { - break; - } - startOffset++; - } - if (startOffset == strLength) { + String inputConverted = input.stream() + .map(paramItemValue -> paramItemValue.toMillis()) + .collect(Collectors.toList()) + .stream() + .map(paramItemValue -> { + if (paramItemValue == null) { return ""; - } - int endOffset = strLength - 1; - while (endOffset >= 0) { - if (itemValueString.charAt(endOffset) != '"') { - break; + } else { + String itemValueString = BinaryData.fromObject(paramItemValue).toString(); + int strLength = itemValueString.length(); + int startOffset = 0; + while (startOffset < strLength) { + if (itemValueString.charAt(startOffset) != '"') { + break; + } + startOffset++; + } + if (startOffset == strLength) { + return ""; } + int endOffset = strLength - 1; + while (endOffset >= 0) { + if (itemValueString.charAt(endOffset) != '"') { + break; + } - endOffset--; + endOffset--; + } + return itemValueString.substring(startOffset, endOffset + 1); } - return itemValueString.substring(startOffset, endOffset + 1); - } - }).collect(Collectors.joining(",")); + }) + .collect(Collectors.joining(",")); return service.int32MillisecondsArray(this.client.getEndpoint(), inputConverted, updatedContext); }); } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/Float64MillisecondsDurationProperty.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/Float64MillisecondsDurationProperty.java index ed32669b271..015e5e8961f 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/Float64MillisecondsDurationProperty.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/Float64MillisecondsDurationProperty.java @@ -7,6 +7,7 @@ import io.clientcore.core.serialization.json.JsonToken; import io.clientcore.core.serialization.json.JsonWriter; import java.io.IOException; +import java.time.Duration; /** * The Float64MillisecondsDurationProperty model. @@ -26,8 +27,12 @@ public final class Float64MillisecondsDurationProperty * @param value the value value to set. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public Float64MillisecondsDurationProperty(double value) { - this.value = value; + public Float64MillisecondsDurationProperty(Duration value) { + if (value == null) { + this.value = 0.0; + } else { + this.value = (double) value.toNanos() / 1000_000L; + } } /** @@ -36,8 +41,8 @@ public Float64MillisecondsDurationProperty(double value) { * @return the value value. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public double getValue() { - return this.value; + public Duration getValue() { + return Duration.ofNanos((long) (this.value * 1000_000L)); } /** @@ -63,13 +68,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Metadata(properties = { MetadataProperties.GENERATED }) public static Float64MillisecondsDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - double value = 0.0; + Duration value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.getDouble(); + value = Duration.ofNanos((long) (reader.getDouble() * 1000_000L)); } else { reader.skipChildren(); } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/FloatMillisecondsDurationArrayProperty.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/FloatMillisecondsDurationArrayProperty.java index 74c8ff960b7..8874de904d6 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/FloatMillisecondsDurationArrayProperty.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/FloatMillisecondsDurationArrayProperty.java @@ -7,6 +7,7 @@ import io.clientcore.core.serialization.json.JsonToken; import io.clientcore.core.serialization.json.JsonWriter; import java.io.IOException; +import java.time.Duration; import java.util.List; /** @@ -27,8 +28,14 @@ public final class FloatMillisecondsDurationArrayProperty * @param value the value value to set. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public FloatMillisecondsDurationArrayProperty(List value) { - this.value = value; + public FloatMillisecondsDurationArrayProperty(List value) { + if (value == null) { + this.value = null; + } else { + this.value = value.stream() + .map(el -> (double) el.toNanos() / 1000_000L) + .collect(java.util.stream.Collectors.toList()); + } } /** @@ -37,8 +44,13 @@ public FloatMillisecondsDurationArrayProperty(List value) { * @return the value value. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public List getValue() { - return this.value; + public List getValue() { + if (this.value == null) { + return null; + } + return this.value.stream() + .map(el -> Duration.ofNanos((long) (el * 1000_000L))) + .collect(java.util.stream.Collectors.toList()); } /** @@ -64,13 +76,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Metadata(properties = { MetadataProperties.GENERATED }) public static FloatMillisecondsDurationArrayProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - List value = null; + List value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.readArray(reader1 -> reader1.getDouble()); + value = reader.readArray(reader1 -> Duration.ofNanos((long) (reader1.getDouble() * 1000_000L))); } else { reader.skipChildren(); } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/FloatMillisecondsDurationProperty.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/FloatMillisecondsDurationProperty.java index 6b1ee6808ef..2ef2a6de246 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/FloatMillisecondsDurationProperty.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/FloatMillisecondsDurationProperty.java @@ -7,6 +7,7 @@ import io.clientcore.core.serialization.json.JsonToken; import io.clientcore.core.serialization.json.JsonWriter; import java.io.IOException; +import java.time.Duration; /** * The FloatMillisecondsDurationProperty model. @@ -25,8 +26,12 @@ public final class FloatMillisecondsDurationProperty implements JsonSerializable * @param value the value value to set. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public FloatMillisecondsDurationProperty(double value) { - this.value = value; + public FloatMillisecondsDurationProperty(Duration value) { + if (value == null) { + this.value = 0.0; + } else { + this.value = (double) value.toNanos() / 1000_000L; + } } /** @@ -35,8 +40,8 @@ public FloatMillisecondsDurationProperty(double value) { * @return the value value. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public double getValue() { - return this.value; + public Duration getValue() { + return Duration.ofNanos((long) (this.value * 1000_000L)); } /** @@ -62,13 +67,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Metadata(properties = { MetadataProperties.GENERATED }) public static FloatMillisecondsDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - double value = 0.0; + Duration value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.getDouble(); + value = Duration.ofNanos((long) (reader.getDouble() * 1000_000L)); } else { reader.skipChildren(); } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/FloatMillisecondsLargerUnitDurationProperty.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/FloatMillisecondsLargerUnitDurationProperty.java index b2bc3088861..b09806c6ef4 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/FloatMillisecondsLargerUnitDurationProperty.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/FloatMillisecondsLargerUnitDurationProperty.java @@ -7,6 +7,7 @@ import io.clientcore.core.serialization.json.JsonToken; import io.clientcore.core.serialization.json.JsonWriter; import java.io.IOException; +import java.time.Duration; /** * The FloatMillisecondsLargerUnitDurationProperty model. @@ -26,8 +27,12 @@ public final class FloatMillisecondsLargerUnitDurationProperty * @param value the value value to set. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public FloatMillisecondsLargerUnitDurationProperty(double value) { - this.value = value; + public FloatMillisecondsLargerUnitDurationProperty(Duration value) { + if (value == null) { + this.value = 0.0; + } else { + this.value = (double) value.toNanos() / 1000_000L; + } } /** @@ -36,8 +41,8 @@ public FloatMillisecondsLargerUnitDurationProperty(double value) { * @return the value value. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public double getValue() { - return this.value; + public Duration getValue() { + return Duration.ofNanos((long) (this.value * 1000_000L)); } /** @@ -63,13 +68,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Metadata(properties = { MetadataProperties.GENERATED }) public static FloatMillisecondsLargerUnitDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - double value = 0.0; + Duration value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.getDouble(); + value = Duration.ofNanos((long) (reader.getDouble() * 1000_000L)); } else { reader.skipChildren(); } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/Int32MillisecondsDurationProperty.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/Int32MillisecondsDurationProperty.java index 1229891cc91..56dd58232e2 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/Int32MillisecondsDurationProperty.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/Int32MillisecondsDurationProperty.java @@ -7,6 +7,7 @@ import io.clientcore.core.serialization.json.JsonToken; import io.clientcore.core.serialization.json.JsonWriter; import java.io.IOException; +import java.time.Duration; /** * The Int32MillisecondsDurationProperty model. @@ -17,7 +18,7 @@ public final class Int32MillisecondsDurationProperty implements JsonSerializable * The value property. */ @Metadata(properties = { MetadataProperties.GENERATED }) - private final int value; + private final long value; /** * Creates an instance of Int32MillisecondsDurationProperty class. @@ -25,8 +26,12 @@ public final class Int32MillisecondsDurationProperty implements JsonSerializable * @param value the value value to set. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public Int32MillisecondsDurationProperty(int value) { - this.value = value; + public Int32MillisecondsDurationProperty(Duration value) { + if (value == null) { + this.value = 0L; + } else { + this.value = value.toMillis(); + } } /** @@ -35,8 +40,8 @@ public Int32MillisecondsDurationProperty(int value) { * @return the value value. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public int getValue() { - return this.value; + public Duration getValue() { + return Duration.ofMillis(this.value); } /** @@ -46,7 +51,7 @@ public int getValue() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeIntField("value", this.value); + jsonWriter.writeLongField("value", this.value); return jsonWriter.writeEndObject(); } @@ -62,13 +67,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Metadata(properties = { MetadataProperties.GENERATED }) public static Int32MillisecondsDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - int value = 0; + Duration value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.getInt(); + value = Duration.ofMillis(reader.getLong()); } else { reader.skipChildren(); } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/Int32MillisecondsLargerUnitDurationProperty.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/Int32MillisecondsLargerUnitDurationProperty.java index 944efe71ef6..20e0dc2c8b4 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/Int32MillisecondsLargerUnitDurationProperty.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/duration/property/Int32MillisecondsLargerUnitDurationProperty.java @@ -7,6 +7,7 @@ import io.clientcore.core.serialization.json.JsonToken; import io.clientcore.core.serialization.json.JsonWriter; import java.io.IOException; +import java.time.Duration; /** * The Int32MillisecondsLargerUnitDurationProperty model. @@ -18,7 +19,7 @@ public final class Int32MillisecondsLargerUnitDurationProperty * The value property. */ @Metadata(properties = { MetadataProperties.GENERATED }) - private final int value; + private final long value; /** * Creates an instance of Int32MillisecondsLargerUnitDurationProperty class. @@ -26,8 +27,12 @@ public final class Int32MillisecondsLargerUnitDurationProperty * @param value the value value to set. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public Int32MillisecondsLargerUnitDurationProperty(int value) { - this.value = value; + public Int32MillisecondsLargerUnitDurationProperty(Duration value) { + if (value == null) { + this.value = 0L; + } else { + this.value = value.toMillis(); + } } /** @@ -36,8 +41,8 @@ public Int32MillisecondsLargerUnitDurationProperty(int value) { * @return the value value. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public int getValue() { - return this.value; + public Duration getValue() { + return Duration.ofMillis(this.value); } /** @@ -47,7 +52,7 @@ public int getValue() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeIntField("value", this.value); + jsonWriter.writeLongField("value", this.value); return jsonWriter.writeEndObject(); } @@ -63,13 +68,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Metadata(properties = { MetadataProperties.GENERATED }) public static Int32MillisecondsLargerUnitDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - int value = 0; + Duration value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.getInt(); + value = Duration.ofMillis(reader.getLong()); } else { reader.skipChildren(); } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FileDetails.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FileDetails.java new file mode 100644 index 00000000000..bd0bcc8cfc3 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FileDetails.java @@ -0,0 +1,133 @@ +package payload.multipart; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.models.binarydata.BinaryData; + +/** + * A file in an HTTP request, response, or multipart payload. + * + * A file in an HTTP request, response, or multipart payload. + * + * Files have a special meaning that the HTTP library understands. When the body of an HTTP request, response, + * or multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the + * operation is treated as a file upload or download. + * + * When using file bodies, the fields of the file model are defined to come from particular locations by default: + * + * - `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or + * changed). + * - `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed). + * - `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload + * (MAY be overridden or changed). + * + * A File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit + * `Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON + * payload, + * it will have a structure like: + * + * ``` + * { + * "contentType": <string?>, + * "filename": <string?>, + * "contents": <string, base64> + * } + * ``` + * + * The `contentType` _within_ the file defines what media types the data inside the file can be, but if the + * specification + * defines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is + * serialized_. See the examples below for more information. + * + * NOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename` + * (`Content-Disposition: <disposition>; filename=<filename>`) is only valid in HTTP responses and multipart + * payloads. If + * you wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the + * `filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` + * location + * is overridden, as shown in the examples below. + */ +@Metadata(properties = { MetadataProperties.FLUENT }) +public final class FileDetails { + /* + * The content of the file. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final BinaryData content; + + /* + * The filename of the file. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private String filename; + + /* + * The content-type of the file. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private String contentType = "image/png"; + + /** + * Creates an instance of FileDetails class. + * + * @param content the content value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public FileDetails(BinaryData content) { + this.content = content; + } + + /** + * Get the content property: The content of the file. + * + * @return the content value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public BinaryData getContent() { + return this.content; + } + + /** + * Get the filename property: The filename of the file. + * + * @return the filename value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getFilename() { + return this.filename; + } + + /** + * Set the filename property: The filename of the file. + * + * @param filename the filename value to set. + * @return the FileDetails object itself. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public FileDetails setFilename(String filename) { + this.filename = filename; + return this; + } + + /** + * Get the contentType property: The content-type of the file. + * + * @return the contentType value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getContentType() { + return this.contentType; + } + + /** + * Set the contentType property: The content-type of the file. + * + * @param contentType the contentType value to set. + * @return the FileDetails object itself. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public FileDetails setContentType(String contentType) { + this.contentType = contentType; + return this; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FilesFileDetails.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FilesFileDetails.java new file mode 100644 index 00000000000..1fd47148f3f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FilesFileDetails.java @@ -0,0 +1,133 @@ +package payload.multipart; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.models.binarydata.BinaryData; + +/** + * A file in an HTTP request, response, or multipart payload. + * + * A file in an HTTP request, response, or multipart payload. + * + * Files have a special meaning that the HTTP library understands. When the body of an HTTP request, response, + * or multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the + * operation is treated as a file upload or download. + * + * When using file bodies, the fields of the file model are defined to come from particular locations by default: + * + * - `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or + * changed). + * - `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed). + * - `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload + * (MAY be overridden or changed). + * + * A File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit + * `Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON + * payload, + * it will have a structure like: + * + * ``` + * { + * "contentType": <string?>, + * "filename": <string?>, + * "contents": <string, base64> + * } + * ``` + * + * The `contentType` _within_ the file defines what media types the data inside the file can be, but if the + * specification + * defines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is + * serialized_. See the examples below for more information. + * + * NOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename` + * (`Content-Disposition: <disposition>; filename=<filename>`) is only valid in HTTP responses and multipart + * payloads. If + * you wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the + * `filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` + * location + * is overridden, as shown in the examples below. + */ +@Metadata(properties = { MetadataProperties.FLUENT }) +public final class FilesFileDetails { + /* + * The content of the file. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final BinaryData content; + + /* + * The filename of the file. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private String filename; + + /* + * The content-type of the file. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private String contentType = "image/png"; + + /** + * Creates an instance of FilesFileDetails class. + * + * @param content the content value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public FilesFileDetails(BinaryData content) { + this.content = content; + } + + /** + * Get the content property: The content of the file. + * + * @return the content value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public BinaryData getContent() { + return this.content; + } + + /** + * Get the filename property: The filename of the file. + * + * @return the filename value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getFilename() { + return this.filename; + } + + /** + * Set the filename property: The filename of the file. + * + * @param filename the filename value to set. + * @return the FilesFileDetails object itself. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public FilesFileDetails setFilename(String filename) { + this.filename = filename; + return this; + } + + /** + * Get the contentType property: The content-type of the file. + * + * @return the contentType value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getContentType() { + return this.contentType; + } + + /** + * Set the contentType property: The content-type of the file. + * + * @param contentType the contentType value to set. + * @return the FilesFileDetails object itself. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public FilesFileDetails setContentType(String contentType) { + this.contentType = contentType; + return this; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataClient.java index 737dff85a49..adbb54ce0dc 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataClient.java @@ -47,8 +47,6 @@ public final class FormDataClient { @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) public Response basicWithResponse(MultiPartRequest body, RequestContext requestContext) { - // Operation 'basic' is of content-type 'multipart/form-data'. Protocol API is not usable and hence not - // generated. return this.instrumentation.instrumentWithResponse("Payload.MultiPart.FormData.basic", requestContext, updatedContext -> this.serviceClient.basicWithResponse(body, updatedContext)); } @@ -80,8 +78,6 @@ public void basic(MultiPartRequest body) { @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) public Response withWireNameWithResponse(MultiPartRequestWithWireName body, RequestContext requestContext) { - // Operation 'withWireName' is of content-type 'multipart/form-data'. Protocol API is not usable and hence not - // generated. return this.instrumentation.instrumentWithResponse("Payload.MultiPart.FormData.withWireName", requestContext, updatedContext -> this.serviceClient.withWireNameWithResponse(body, updatedContext)); } @@ -113,8 +109,6 @@ public void withWireName(MultiPartRequestWithWireName body) { @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) public Response optionalPartsWithResponse(MultiPartOptionalRequest body, RequestContext requestContext) { - // Operation 'optionalParts' is of content-type 'multipart/form-data'. Protocol API is not usable and hence not - // generated. return this.instrumentation.instrumentWithResponse("Payload.MultiPart.FormData.optionalParts", requestContext, updatedContext -> this.serviceClient.optionalPartsWithResponse(body, updatedContext)); } @@ -146,8 +140,6 @@ public void optionalParts(MultiPartOptionalRequest body) { @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) public Response fileArrayAndBasicWithResponse(ComplexPartsRequest body, RequestContext requestContext) { - // Operation 'fileArrayAndBasic' is of content-type 'multipart/form-data'. Protocol API is not usable and hence - // not generated. return this.instrumentation.instrumentWithResponse("Payload.MultiPart.FormData.fileArrayAndBasic", requestContext, updatedContext -> this.serviceClient.fileArrayAndBasicWithResponse(body, updatedContext)); } @@ -179,8 +171,6 @@ public void fileArrayAndBasic(ComplexPartsRequest body) { @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) public Response jsonPartWithResponse(JsonPartRequest body, RequestContext requestContext) { - // Operation 'jsonPart' is of content-type 'multipart/form-data'. Protocol API is not usable and hence not - // generated. return this.instrumentation.instrumentWithResponse("Payload.MultiPart.FormData.jsonPart", requestContext, updatedContext -> this.serviceClient.jsonPartWithResponse(body, updatedContext)); } @@ -212,8 +202,6 @@ public void jsonPart(JsonPartRequest body) { @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) public Response binaryArrayPartsWithResponse(BinaryArrayPartsRequest body, RequestContext requestContext) { - // Operation 'binaryArrayParts' is of content-type 'multipart/form-data'. Protocol API is not usable and hence - // not generated. return this.instrumentation.instrumentWithResponse("Payload.MultiPart.FormData.binaryArrayParts", requestContext, updatedContext -> this.serviceClient.binaryArrayPartsWithResponse(body, updatedContext)); } @@ -245,8 +233,6 @@ public void binaryArrayParts(BinaryArrayPartsRequest body) { @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) public Response multiBinaryPartsWithResponse(MultiBinaryPartsRequest body, RequestContext requestContext) { - // Operation 'multiBinaryParts' is of content-type 'multipart/form-data'. Protocol API is not usable and hence - // not generated. return this.instrumentation.instrumentWithResponse("Payload.MultiPart.FormData.multiBinaryParts", requestContext, updatedContext -> this.serviceClient.multiBinaryPartsWithResponse(body, updatedContext)); } @@ -279,8 +265,6 @@ public void multiBinaryParts(MultiBinaryPartsRequest body) { @ServiceMethod(returns = ReturnType.SINGLE) public Response checkFileNameAndContentTypeWithResponse(MultiPartRequest body, RequestContext requestContext) { - // Operation 'checkFileNameAndContentType' is of content-type 'multipart/form-data'. Protocol API is not usable - // and hence not generated. return this.instrumentation.instrumentWithResponse("Payload.MultiPart.FormData.checkFileNameAndContentType", requestContext, updatedContext -> this.serviceClient.checkFileNameAndContentTypeWithResponse(body, updatedContext)); @@ -313,8 +297,6 @@ public void checkFileNameAndContentType(MultiPartRequest body) { @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) public Response anonymousModelWithResponse(AnonymousModelRequest body, RequestContext requestContext) { - // Operation 'anonymousModel' is of content-type 'multipart/form-data'. Protocol API is not usable and hence not - // generated. return this.instrumentation.instrumentWithResponse("Payload.MultiPart.FormData.anonymousModel", requestContext, updatedContext -> this.serviceClient.anonymousModelWithResponse(body, updatedContext)); } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataFileClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataFileClient.java new file mode 100644 index 00000000000..bc7651ad466 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataFileClient.java @@ -0,0 +1,135 @@ +package payload.multipart; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.multipart.formdata.file.UploadFileArrayRequest; +import payload.multipart.formdata.file.UploadFileRequiredFilenameRequest; +import payload.multipart.formdata.file.UploadFileSpecificContentTypeRequest; +import payload.multipart.implementation.FormDataFilesImpl; + +/** + * Initializes a new instance of the synchronous MultiPartClient type. + */ +@ServiceClient(builder = MultiPartClientBuilder.class) +public final class FormDataFileClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final FormDataFilesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of FormDataFileClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + FormDataFileClient(FormDataFilesImpl serviceClient, Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The uploadFileSpecificContentType operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileSpecificContentTypeWithResponse(UploadFileSpecificContentTypeRequest body, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.MultiPart.FormData.File.uploadFileSpecificContentType", requestContext, + updatedContext -> this.serviceClient.uploadFileSpecificContentTypeWithResponse(body, updatedContext)); + } + + /** + * The uploadFileSpecificContentType operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void uploadFileSpecificContentType(UploadFileSpecificContentTypeRequest body) { + uploadFileSpecificContentTypeWithResponse(body, RequestContext.none()); + } + + /** + * The uploadFileRequiredFilename operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileRequiredFilenameWithResponse(UploadFileRequiredFilenameRequest body, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.MultiPart.FormData.File.uploadFileRequiredFilename", + requestContext, + updatedContext -> this.serviceClient.uploadFileRequiredFilenameWithResponse(body, updatedContext)); + } + + /** + * The uploadFileRequiredFilename operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void uploadFileRequiredFilename(UploadFileRequiredFilenameRequest body) { + uploadFileRequiredFilenameWithResponse(body, RequestContext.none()); + } + + /** + * The uploadFileArray operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileArrayWithResponse(UploadFileArrayRequest body, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.MultiPart.FormData.File.uploadFileArray", + requestContext, updatedContext -> this.serviceClient.uploadFileArrayWithResponse(body, updatedContext)); + } + + /** + * The uploadFileArray operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void uploadFileArray(UploadFileArrayRequest body) { + uploadFileArrayWithResponse(body, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataHttpPartsClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataHttpPartsClient.java index ee0e965ab8f..8644a85f16c 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataHttpPartsClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataHttpPartsClient.java @@ -47,8 +47,6 @@ public final class FormDataHttpPartsClient { @ServiceMethod(returns = ReturnType.SINGLE) public Response jsonArrayAndFileArrayWithResponse(ComplexHttpPartsModelRequest body, RequestContext requestContext) { - // Operation 'jsonArrayAndFileArray' is of content-type 'multipart/form-data'. Protocol API is not usable and - // hence not generated. return this.instrumentation.instrumentWithResponse("Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray", requestContext, updatedContext -> this.serviceClient.jsonArrayAndFileArrayWithResponse(body, updatedContext)); diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeClient.java index d7a42c96f3a..f02258501e6 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeClient.java @@ -48,8 +48,6 @@ public final class FormDataHttpPartsContentTypeClient { @ServiceMethod(returns = ReturnType.SINGLE) public Response imageJpegContentTypeWithResponse(FileWithHttpPartSpecificContentTypeRequest body, RequestContext requestContext) { - // Operation 'imageJpegContentType' is of content-type 'multipart/form-data'. Protocol API is not usable and - // hence not generated. return this.instrumentation.instrumentWithResponse( "Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType", requestContext, updatedContext -> this.serviceClient.imageJpegContentTypeWithResponse(body, updatedContext)); @@ -83,8 +81,6 @@ public void imageJpegContentType(FileWithHttpPartSpecificContentTypeRequest body @ServiceMethod(returns = ReturnType.SINGLE) public Response requiredContentTypeWithResponse(FileWithHttpPartRequiredContentTypeRequest body, RequestContext requestContext) { - // Operation 'requiredContentType' is of content-type 'multipart/form-data'. Protocol API is not usable and - // hence not generated. return this.instrumentation.instrumentWithResponse( "Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType", requestContext, updatedContext -> this.serviceClient.requiredContentTypeWithResponse(body, updatedContext)); @@ -118,8 +114,6 @@ public void requiredContentType(FileWithHttpPartRequiredContentTypeRequest body) @ServiceMethod(returns = ReturnType.SINGLE) public Response optionalContentTypeWithResponse(FileWithHttpPartOptionalContentTypeRequest body, RequestContext requestContext) { - // Operation 'optionalContentType' is of content-type 'multipart/form-data'. Protocol API is not usable and - // hence not generated. return this.instrumentation.instrumentWithResponse( "Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType", requestContext, updatedContext -> this.serviceClient.optionalContentTypeWithResponse(body, updatedContext)); diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataHttpPartsNonStringClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataHttpPartsNonStringClient.java index d0dff51efbb..2e44da87da6 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataHttpPartsNonStringClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/FormDataHttpPartsNonStringClient.java @@ -47,8 +47,6 @@ public final class FormDataHttpPartsNonStringClient { @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) public Response floatMethodWithResponse(FloatRequest body, RequestContext requestContext) { - // Operation 'float' is of content-type 'multipart/form-data'. Protocol API is not usable and hence not - // generated. return this.instrumentation.instrumentWithResponse("Payload.MultiPart.FormData.HttpParts.NonString.float", requestContext, updatedContext -> this.serviceClient.floatMethodWithResponse(body, updatedContext)); } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/MultiPartClientBuilder.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/MultiPartClientBuilder.java index 15bf5a0a5c7..641ac5aee63 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/MultiPartClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/MultiPartClientBuilder.java @@ -36,7 +36,8 @@ FormDataClient.class, FormDataHttpPartsClient.class, FormDataHttpPartsContentTypeClient.class, - FormDataHttpPartsNonStringClient.class }) + FormDataHttpPartsNonStringClient.class, + FormDataFileClient.class }) public final class MultiPartClientBuilder implements HttpTrait, ProxyTrait, ConfigurationTrait, EndpointTrait { @@ -273,4 +274,15 @@ public FormDataHttpPartsNonStringClient buildFormDataHttpPartsNonStringClient() return new FormDataHttpPartsNonStringClient(innerClient.getFormDataHttpPartsNonStrings(), innerClient.getInstrumentation()); } + + /** + * Builds an instance of FormDataFileClient class. + * + * @return an instance of FormDataFileClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public FormDataFileClient buildFormDataFileClient() { + MultiPartClientImpl innerClient = buildInnerClient(); + return new FormDataFileClient(innerClient.getFormDataFiles(), innerClient.getInstrumentation()); + } } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/formdata/file/FileWithRequiredFilename.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/formdata/file/FileWithRequiredFilename.java new file mode 100644 index 00000000000..78fd5d06f61 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/formdata/file/FileWithRequiredFilename.java @@ -0,0 +1,83 @@ +package payload.multipart.formdata.file; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.models.binarydata.BinaryData; + +/** + * The file details for the "file" field. + */ +@Metadata(properties = { MetadataProperties.FLUENT }) +public final class FileWithRequiredFilename { + /* + * The content of the file. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final BinaryData content; + + /* + * The filename of the file. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String filename; + + /* + * The content-type of the file. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private String contentType = "image/png"; + + /** + * Creates an instance of FileWithRequiredFilename class. + * + * @param content the content value to set. + * @param filename the filename value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public FileWithRequiredFilename(BinaryData content, String filename) { + this.content = content; + this.filename = filename; + } + + /** + * Get the content property: The content of the file. + * + * @return the content value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public BinaryData getContent() { + return this.content; + } + + /** + * Get the filename property: The filename of the file. + * + * @return the filename value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getFilename() { + return this.filename; + } + + /** + * Get the contentType property: The content-type of the file. + * + * @return the contentType value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getContentType() { + return this.contentType; + } + + /** + * Set the contentType property: The content-type of the file. + * + * @param contentType the contentType value to set. + * @return the FileWithRequiredFilename object itself. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public FileWithRequiredFilename setContentType(String contentType) { + this.contentType = contentType; + return this; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/formdata/file/UploadFileArrayRequest.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/formdata/file/UploadFileArrayRequest.java new file mode 100644 index 00000000000..37e92e16ed0 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/formdata/file/UploadFileArrayRequest.java @@ -0,0 +1,38 @@ +package payload.multipart.formdata.file; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import java.util.List; +import payload.multipart.FilesFileDetails; + +/** + * The UploadFileArrayRequest model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class UploadFileArrayRequest { + /* + * The files property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List files; + + /** + * Creates an instance of UploadFileArrayRequest class. + * + * @param files the files value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public UploadFileArrayRequest(List files) { + this.files = files; + } + + /** + * Get the files property: The files property. + * + * @return the files value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getFiles() { + return this.files; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/formdata/file/UploadFileRequiredFilenameRequest.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/formdata/file/UploadFileRequiredFilenameRequest.java new file mode 100644 index 00000000000..09df2544e60 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/formdata/file/UploadFileRequiredFilenameRequest.java @@ -0,0 +1,36 @@ +package payload.multipart.formdata.file; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; + +/** + * The UploadFileRequiredFilenameRequest model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class UploadFileRequiredFilenameRequest { + /* + * The file property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final FileWithRequiredFilename file; + + /** + * Creates an instance of UploadFileRequiredFilenameRequest class. + * + * @param file the file value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public UploadFileRequiredFilenameRequest(FileWithRequiredFilename file) { + this.file = file; + } + + /** + * Get the file property: The file property. + * + * @return the file value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public FileWithRequiredFilename getFile() { + return this.file; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/formdata/file/UploadFileSpecificContentTypeRequest.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/formdata/file/UploadFileSpecificContentTypeRequest.java new file mode 100644 index 00000000000..bcc4e2a24f9 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/formdata/file/UploadFileSpecificContentTypeRequest.java @@ -0,0 +1,37 @@ +package payload.multipart.formdata.file; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import payload.multipart.FileDetails; + +/** + * The UploadFileSpecificContentTypeRequest model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class UploadFileSpecificContentTypeRequest { + /* + * The file property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final FileDetails file; + + /** + * Creates an instance of UploadFileSpecificContentTypeRequest class. + * + * @param file the file value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public UploadFileSpecificContentTypeRequest(FileDetails file) { + this.file = file; + } + + /** + * Get the file property: The file property. + * + * @return the file value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public FileDetails getFile() { + return this.file; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/formdata/file/package-info.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/formdata/file/package-info.java new file mode 100644 index 00000000000..a47031926c9 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/formdata/file/package-info.java @@ -0,0 +1,5 @@ +/** + * Package containing the data models for MultiPart. + * Test for multipart. + */ +package payload.multipart.formdata.file; diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/implementation/FormDataFilesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/implementation/FormDataFilesImpl.java new file mode 100644 index 00000000000..be4950cff90 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/implementation/FormDataFilesImpl.java @@ -0,0 +1,160 @@ +package payload.multipart.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.multipart.formdata.file.UploadFileArrayRequest; +import payload.multipart.formdata.file.UploadFileRequiredFilenameRequest; +import payload.multipart.formdata.file.UploadFileSpecificContentTypeRequest; + +/** + * An instance of this class provides access to all the operations defined in FormDataFiles. + */ +public final class FormDataFilesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final FormDataFilesService service; + + /** + * The service client containing this operation class. + */ + private final MultiPartClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of FormDataFilesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + FormDataFilesImpl(MultiPartClientImpl client) { + this.service = FormDataFilesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for MultiPartClientFormDataFiles to be used by the proxy service to + * perform REST calls. + */ + @ServiceInterface(name = "MultiPartClientFormDataFiles", host = "{endpoint}") + public interface FormDataFilesService { + static FormDataFilesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class.forName("payload.multipart.implementation.FormDataFilesServiceImpl"); + return (FormDataFilesService) clazz.getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + // @Multipart not supported by RestProxy + @HttpRequestInformation( + method = HttpMethod.POST, + path = "/multipart/form-data/file/specific-content-type", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response uploadFileSpecificContentType(@HostParam("endpoint") String endpoint, + @HeaderParam("content-type") String contentType, + @BodyParam("multipart/form-data") UploadFileSpecificContentTypeRequest body, RequestContext requestContext); + + // @Multipart not supported by RestProxy + @HttpRequestInformation( + method = HttpMethod.POST, + path = "/multipart/form-data/file/required-filename", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response uploadFileRequiredFilename(@HostParam("endpoint") String endpoint, + @HeaderParam("content-type") String contentType, + @BodyParam("multipart/form-data") UploadFileRequiredFilenameRequest body, RequestContext requestContext); + + // @Multipart not supported by RestProxy + @HttpRequestInformation( + method = HttpMethod.POST, + path = "/multipart/form-data/file/file-array", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response uploadFileArray(@HostParam("endpoint") String endpoint, + @HeaderParam("content-type") String contentType, + @BodyParam("multipart/form-data") UploadFileArrayRequest body, RequestContext requestContext); + } + + /** + * The uploadFileSpecificContentType operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileSpecificContentTypeWithResponse(UploadFileSpecificContentTypeRequest body, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.MultiPart.FormData.File.uploadFileSpecificContentType", requestContext, updatedContext -> { + final String contentType = "multipart/form-data"; + return service.uploadFileSpecificContentType(this.client.getEndpoint(), contentType, body, + updatedContext); + }); + } + + /** + * The uploadFileRequiredFilename operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileRequiredFilenameWithResponse(UploadFileRequiredFilenameRequest body, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.MultiPart.FormData.File.uploadFileRequiredFilename", + requestContext, updatedContext -> { + final String contentType = "multipart/form-data"; + return service.uploadFileRequiredFilename(this.client.getEndpoint(), contentType, body, updatedContext); + }); + } + + /** + * The uploadFileArray operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileArrayWithResponse(UploadFileArrayRequest body, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.MultiPart.FormData.File.uploadFileArray", + requestContext, updatedContext -> { + final String contentType = "multipart/form-data"; + return service.uploadFileArray(this.client.getEndpoint(), contentType, body, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/implementation/MultiPartClientImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/implementation/MultiPartClientImpl.java index 23d53b923b4..abd7bf161e7 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/implementation/MultiPartClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/multipart/implementation/MultiPartClientImpl.java @@ -105,6 +105,20 @@ public FormDataHttpPartsNonStringsImpl getFormDataHttpPartsNonStrings() { return this.formDataHttpPartsNonStrings; } + /** + * The FormDataFilesImpl object to access its operations. + */ + private final FormDataFilesImpl formDataFiles; + + /** + * Gets the FormDataFilesImpl object to access its operations. + * + * @return the FormDataFilesImpl object. + */ + public FormDataFilesImpl getFormDataFiles() { + return this.formDataFiles; + } + /** * Initializes an instance of MultiPartClient client. * @@ -120,5 +134,6 @@ public MultiPartClientImpl(HttpPipeline httpPipeline, Instrumentation instrument this.formDataHttpParts = new FormDataHttpPartsImpl(this); this.formDataHttpPartsContentTypes = new FormDataHttpPartsContentTypesImpl(this); this.formDataHttpPartsNonStrings = new FormDataHttpPartsNonStringsImpl(this); + this.formDataFiles = new FormDataFilesImpl(this); } } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/PageableClientBuilder.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/PageableClientBuilder.java index 4e7aaa3c0d4..5685b81069d 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/PageableClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/PageableClientBuilder.java @@ -34,8 +34,10 @@ @ServiceClientBuilder( serviceClients = { ServerDrivenPaginationClient.class, + ServerDrivenPaginationAlternateInitialVerbClient.class, ServerDrivenPaginationContinuationTokenClient.class, - PageSizeClient.class }) + PageSizeClient.class, + XmlPaginationClient.class }) public final class PageableClientBuilder implements HttpTrait, ProxyTrait, ConfigurationTrait, EndpointTrait { @Metadata(properties = { MetadataProperties.GENERATED }) @@ -238,6 +240,18 @@ public ServerDrivenPaginationClient buildServerDrivenPaginationClient() { innerClient.getInstrumentation()); } + /** + * Builds an instance of ServerDrivenPaginationAlternateInitialVerbClient class. + * + * @return an instance of ServerDrivenPaginationAlternateInitialVerbClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ServerDrivenPaginationAlternateInitialVerbClient buildServerDrivenPaginationAlternateInitialVerbClient() { + PageableClientImpl innerClient = buildInnerClient(); + return new ServerDrivenPaginationAlternateInitialVerbClient( + innerClient.getServerDrivenPaginationAlternateInitialVerbs(), innerClient.getInstrumentation()); + } + /** * Builds an instance of ServerDrivenPaginationContinuationTokenClient class. * @@ -260,4 +274,15 @@ public PageSizeClient buildPageSizeClient() { PageableClientImpl innerClient = buildInnerClient(); return new PageSizeClient(innerClient.getPageSizes(), innerClient.getInstrumentation()); } + + /** + * Builds an instance of XmlPaginationClient class. + * + * @return an instance of XmlPaginationClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public XmlPaginationClient buildXmlPaginationClient() { + PageableClientImpl innerClient = buildInnerClient(); + return new XmlPaginationClient(innerClient.getXmlPaginations(), innerClient.getInstrumentation()); + } } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/ServerDrivenPaginationAlternateInitialVerbClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/ServerDrivenPaginationAlternateInitialVerbClient.java new file mode 100644 index 00000000000..bd88c989471 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/ServerDrivenPaginationAlternateInitialVerbClient.java @@ -0,0 +1,68 @@ +package payload.pageable; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.paging.PagedIterable; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.pageable.implementation.ServerDrivenPaginationAlternateInitialVerbsImpl; +import payload.pageable.serverdrivenpagination.alternateinitialverb.Filter; + +/** + * Initializes a new instance of the synchronous PageableClient type. + */ +@ServiceClient(builder = PageableClientBuilder.class) +public final class ServerDrivenPaginationAlternateInitialVerbClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ServerDrivenPaginationAlternateInitialVerbsImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ServerDrivenPaginationAlternateInitialVerbClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ServerDrivenPaginationAlternateInitialVerbClient(ServerDrivenPaginationAlternateInitialVerbsImpl serviceClient, + Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The post operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable post(Filter body) { + return post(body, RequestContext.none()); + } + + /** + * The post operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable post(Filter body, RequestContext requestContext) { + return this.serviceClient.post(body, requestContext); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/XmlPaginationClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/XmlPaginationClient.java new file mode 100644 index 00000000000..8f9e30a8dd0 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/XmlPaginationClient.java @@ -0,0 +1,91 @@ +package payload.pageable; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.paging.PagedIterable; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.pageable.implementation.XmlPaginationsImpl; + +/** + * Initializes a new instance of the synchronous PageableClient type. + */ +@ServiceClient(builder = PageableClientBuilder.class) +public final class XmlPaginationClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final XmlPaginationsImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of XmlPaginationClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + XmlPaginationClient(XmlPaginationsImpl serviceClient, Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The listWithContinuation operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the XML response for listing pets as paginated response with {@link PagedIterable}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable listWithContinuation() { + return listWithContinuation(RequestContext.none()); + } + + /** + * The listWithContinuation operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the XML response for listing pets as paginated response with {@link PagedIterable}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable listWithContinuation(RequestContext requestContext) { + return this.serviceClient.listWithContinuation(requestContext); + } + + /** + * The listWithNextLink operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the XML response for listing pets with next link as paginated response with {@link PagedIterable}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable listWithNextLink() { + return listWithNextLink(RequestContext.none()); + } + + /** + * The listWithNextLink operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the XML response for listing pets with next link as paginated response with {@link PagedIterable}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable listWithNextLink(RequestContext requestContext) { + return this.serviceClient.listWithNextLink(requestContext); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/XmlPet.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/XmlPet.java new file mode 100644 index 00000000000..900e0255ee7 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/XmlPet.java @@ -0,0 +1,122 @@ +package payload.pageable; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * An XML pet item. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class XmlPet implements XmlSerializable { + /* + * The Id property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String id; + + /* + * The Name property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String name; + + /** + * Creates an instance of XmlPet class. + * + * @param id the id value to set. + * @param name the name value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private XmlPet(String id, String name) { + this.id = id; + this.name = name; + } + + /** + * Get the id property: The Id property. + * + * @return the id value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getId() { + return this.id; + } + + /** + * Get the name property: The Name property. + * + * @return the name value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getName() { + return this.name; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() ? "Pet" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeStringElement("Id", this.id); + xmlWriter.writeStringElement("Name", this.name); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of XmlPet from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of XmlPet if the XmlReader was pointing to an instance of it, or null if it was pointing to + * XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the XmlPet. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static XmlPet fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of XmlPet from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of XmlPet if the XmlReader was pointing to an instance of it, or null if it was pointing to + * XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the XmlPet. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static XmlPet fromXml(XmlReader xmlReader, String rootElementName) throws XMLStreamException { + String finalRootElementName = rootElementName == null || rootElementName.isEmpty() ? "Pet" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + String id = null; + String name = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("Id".equals(elementName.getLocalPart())) { + id = reader.getStringElement(); + } else if ("Name".equals(elementName.getLocalPart())) { + name = reader.getStringElement(); + } else { + reader.skipElement(); + } + } + return new XmlPet(id, name); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/PageableClientImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/PageableClientImpl.java index 81162044c2b..5daf053a968 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/PageableClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/PageableClientImpl.java @@ -63,6 +63,20 @@ public ServerDrivenPaginationsImpl getServerDrivenPaginations() { return this.serverDrivenPaginations; } + /** + * The ServerDrivenPaginationAlternateInitialVerbsImpl object to access its operations. + */ + private final ServerDrivenPaginationAlternateInitialVerbsImpl serverDrivenPaginationAlternateInitialVerbs; + + /** + * Gets the ServerDrivenPaginationAlternateInitialVerbsImpl object to access its operations. + * + * @return the ServerDrivenPaginationAlternateInitialVerbsImpl object. + */ + public ServerDrivenPaginationAlternateInitialVerbsImpl getServerDrivenPaginationAlternateInitialVerbs() { + return this.serverDrivenPaginationAlternateInitialVerbs; + } + /** * The ServerDrivenPaginationContinuationTokensImpl object to access its operations. */ @@ -91,6 +105,20 @@ public PageSizesImpl getPageSizes() { return this.pageSizes; } + /** + * The XmlPaginationsImpl object to access its operations. + */ + private final XmlPaginationsImpl xmlPaginations; + + /** + * Gets the XmlPaginationsImpl object to access its operations. + * + * @return the XmlPaginationsImpl object. + */ + public XmlPaginationsImpl getXmlPaginations() { + return this.xmlPaginations; + } + /** * Initializes an instance of PageableClient client. * @@ -103,7 +131,9 @@ public PageableClientImpl(HttpPipeline httpPipeline, Instrumentation instrumenta this.instrumentation = instrumentation; this.endpoint = endpoint; this.serverDrivenPaginations = new ServerDrivenPaginationsImpl(this); + this.serverDrivenPaginationAlternateInitialVerbs = new ServerDrivenPaginationAlternateInitialVerbsImpl(this); this.serverDrivenPaginationContinuationTokens = new ServerDrivenPaginationContinuationTokensImpl(this); this.pageSizes = new PageSizesImpl(this); + this.xmlPaginations = new XmlPaginationsImpl(this); } } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationAlternateInitialVerbsImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationAlternateInitialVerbsImpl.java new file mode 100644 index 00000000000..6b712ffdde3 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationAlternateInitialVerbsImpl.java @@ -0,0 +1,265 @@ +package payload.pageable.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.PathParam; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.paging.PagedIterable; +import io.clientcore.core.http.paging.PagedResponse; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import io.clientcore.core.instrumentation.logging.ClientLogger; +import java.lang.reflect.InvocationTargetException; +import payload.pageable.Pet; +import payload.pageable.serverdrivenpagination.alternateinitialverb.Filter; +import payload.pageable.serverdrivenpagination.alternateinitialverb.implementation.PostResponse; + +/** + * An instance of this class provides access to all the operations defined in + * ServerDrivenPaginationAlternateInitialVerbs. + */ +public final class ServerDrivenPaginationAlternateInitialVerbsImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ServerDrivenPaginationAlternateInitialVerbsService service; + + /** + * The service client containing this operation class. + */ + private final PageableClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ServerDrivenPaginationAlternateInitialVerbsImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ServerDrivenPaginationAlternateInitialVerbsImpl(PageableClientImpl client) { + this.service = ServerDrivenPaginationAlternateInitialVerbsService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for PageableClientServerDrivenPaginationAlternateInitialVerbs to be used + * by the proxy service to perform REST calls. + */ + @ServiceInterface(name = "PageableClientServerDrivenPaginationAlternateInitialVerbs", host = "{endpoint}") + public interface ServerDrivenPaginationAlternateInitialVerbsService { + static ServerDrivenPaginationAlternateInitialVerbsService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class + .forName("payload.pageable.implementation.ServerDrivenPaginationAlternateInitialVerbsServiceImpl"); + return (ServerDrivenPaginationAlternateInitialVerbsService) clazz + .getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.POST, + path = "/payload/pageable/server-driven-pagination/link/initial-post", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response post(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + @BodyParam("application/json") Filter body, RequestContext requestContext); + + @HttpRequestInformation(method = HttpMethod.GET, path = "{nextLink}", expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response postNext(@PathParam(value = "nextLink", encoded = true) String nextLink, + @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + RequestContext requestContext); + } + + /** + * The post operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PagedResponse postSinglePage(Filter body) { + return this.instrumentation.instrumentWithResponse( + "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post", RequestContext.none(), + updatedContext -> { + final String accept = "application/json"; + Response res = service.post(this.client.getEndpoint(), accept, body, updatedContext); + return new PagedResponse<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + res.getValue().getPets(), null, res.getValue().getNext() != null ? res.getValue().getNext() : null, + null, null, null); + }); + } + + /** + * The post operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PagedResponse postSinglePage(Filter body, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post", requestContext, updatedContext -> { + final String accept = "application/json"; + Response res = service.post(this.client.getEndpoint(), accept, body, updatedContext); + return new PagedResponse<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + res.getValue().getPets(), null, res.getValue().getNext() != null ? res.getValue().getNext() : null, + null, null, null); + }); + } + + /** + * The post operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable post(Filter body) { + return new PagedIterable<>((pagingOptions) -> { + if (pagingOptions.getOffset() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "offset") + .addKeyValue("methodName", "post") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getPageSize() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "pageSize") + .addKeyValue("methodName", "post") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getPageIndex() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "pageIndex") + .addKeyValue("methodName", "post") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getContinuationToken() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "continuationToken") + .addKeyValue("methodName", "post") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + return postSinglePage(body); + }, (pagingOptions, nextLink) -> postNextSinglePage(nextLink)); + } + + /** + * The post operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable post(Filter body, RequestContext requestContext) { + RequestContext requestContextForNextPage = requestContext != null ? requestContext : RequestContext.none(); + return new PagedIterable<>((pagingOptions) -> { + if (pagingOptions.getOffset() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "offset") + .addKeyValue("methodName", "post") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getPageSize() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "pageSize") + .addKeyValue("methodName", "post") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getPageIndex() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "pageIndex") + .addKeyValue("methodName", "post") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getContinuationToken() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "continuationToken") + .addKeyValue("methodName", "post") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + return postSinglePage(body, requestContext); + }, (pagingOptions, nextLink) -> postNextSinglePage(nextLink, requestContextForNextPage)); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PagedResponse postNextSinglePage(String nextLink) { + return this.instrumentation.instrumentWithResponse( + "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post", RequestContext.none(), + updatedContext -> { + final String accept = "application/json"; + Response res + = service.postNext(nextLink, this.client.getEndpoint(), accept, updatedContext); + return new PagedResponse<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + res.getValue().getPets(), null, res.getValue().getNext() != null ? res.getValue().getNext() : null, + null, null, null); + }); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PagedResponse postNextSinglePage(String nextLink, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post", requestContext, updatedContext -> { + final String accept = "application/json"; + Response res + = service.postNext(nextLink, this.client.getEndpoint(), accept, updatedContext); + return new PagedResponse<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + res.getValue().getPets(), null, res.getValue().getNext() != null ? res.getValue().getNext() : null, + null, null, null); + }); + } + + private static final ClientLogger LOGGER = new ClientLogger(ServerDrivenPaginationAlternateInitialVerbsImpl.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/XmlPaginationsImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/XmlPaginationsImpl.java new file mode 100644 index 00000000000..fb93662a0b0 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/XmlPaginationsImpl.java @@ -0,0 +1,341 @@ +package payload.pageable.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.PathParam; +import io.clientcore.core.http.annotations.QueryParam; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.paging.PagedIterable; +import io.clientcore.core.http.paging.PagedResponse; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import io.clientcore.core.instrumentation.logging.ClientLogger; +import java.lang.reflect.InvocationTargetException; +import payload.pageable.XmlPet; + +/** + * An instance of this class provides access to all the operations defined in XmlPaginations. + */ +public final class XmlPaginationsImpl { + /** + * The proxy service used to perform REST calls. + */ + private final XmlPaginationsService service; + + /** + * The service client containing this operation class. + */ + private final PageableClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of XmlPaginationsImpl. + * + * @param client the instance of the service client containing this operation class. + */ + XmlPaginationsImpl(PageableClientImpl client) { + this.service = XmlPaginationsService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for PageableClientXmlPaginations to be used by the proxy service to + * perform REST calls. + */ + @ServiceInterface(name = "PageableClientXmlPaginations", host = "{endpoint}") + public interface XmlPaginationsService { + static XmlPaginationsService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class.forName("payload.pageable.implementation.XmlPaginationsServiceImpl"); + return (XmlPaginationsService) clazz.getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/pageable/xml/list-with-continuation", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response listWithContinuation(@HostParam("endpoint") String endpoint, + @QueryParam("marker") String marker, @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/pageable/xml/list-with-next-link", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response listWithNextLink(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation(method = HttpMethod.GET, path = "{nextLink}", expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response listWithNextLinkNext( + @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + } + + /** + * The listWithContinuation operation. + * + * @param marker The marker parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the XML response for listing pets along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PagedResponse listWithContinuationSinglePage(String marker) { + return this.instrumentation.instrumentWithResponse("Payload.Pageable.XmlPagination.listWithContinuation", + RequestContext.none(), updatedContext -> { + final String accept = "application/xml"; + Response res + = service.listWithContinuation(this.client.getEndpoint(), marker, accept, updatedContext); + return new PagedResponse<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + res.getValue().getPets(), + res.getValue().getNextMarker() != null ? res.getValue().getNextMarker() : null, null, null, null, + null); + }); + } + + /** + * The listWithContinuation operation. + * + * @param marker The marker parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the XML response for listing pets along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PagedResponse listWithContinuationSinglePage(String marker, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Pageable.XmlPagination.listWithContinuation", + requestContext, updatedContext -> { + final String accept = "application/xml"; + Response res + = service.listWithContinuation(this.client.getEndpoint(), marker, accept, updatedContext); + return new PagedResponse<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + res.getValue().getPets(), + res.getValue().getNextMarker() != null ? res.getValue().getNextMarker() : null, null, null, null, + null); + }); + } + + /** + * The listWithContinuation operation. + * + * @param marker The marker parameter. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the XML response for listing pets as paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable listWithContinuation() { + return new PagedIterable<>((pagingOptions) -> { + if (pagingOptions.getOffset() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "offset") + .addKeyValue("methodName", "listWithContinuation") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getPageSize() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "pageSize") + .addKeyValue("methodName", "listWithContinuation") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getPageIndex() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "pageIndex") + .addKeyValue("methodName", "listWithContinuation") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + String marker = pagingOptions.getContinuationToken(); + return listWithContinuationSinglePage(marker); + }); + } + + /** + * The listWithContinuation operation. + * + * @param marker The marker parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the XML response for listing pets as paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable listWithContinuation(RequestContext requestContext) { + return new PagedIterable<>((pagingOptions) -> { + if (pagingOptions.getOffset() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "offset") + .addKeyValue("methodName", "listWithContinuation") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getPageSize() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "pageSize") + .addKeyValue("methodName", "listWithContinuation") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getPageIndex() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "pageIndex") + .addKeyValue("methodName", "listWithContinuation") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + String marker = pagingOptions.getContinuationToken(); + return listWithContinuationSinglePage(marker, requestContext); + }); + } + + /** + * The listWithNextLink operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the XML response for listing pets with next link along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PagedResponse listWithNextLinkSinglePage() { + return this.instrumentation.instrumentWithResponse("Payload.Pageable.XmlPagination.listWithNextLink", + RequestContext.none(), updatedContext -> { + final String accept = "application/xml"; + Response res + = service.listWithNextLink(this.client.getEndpoint(), accept, updatedContext); + return new PagedResponse<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + res.getValue().getPets(), null, + res.getValue().getNextLink() != null ? res.getValue().getNextLink() : null, null, null, null); + }); + } + + /** + * The listWithNextLink operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the XML response for listing pets with next link along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PagedResponse listWithNextLinkSinglePage(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Pageable.XmlPagination.listWithNextLink", + requestContext, updatedContext -> { + final String accept = "application/xml"; + Response res + = service.listWithNextLink(this.client.getEndpoint(), accept, updatedContext); + return new PagedResponse<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + res.getValue().getPets(), null, + res.getValue().getNextLink() != null ? res.getValue().getNextLink() : null, null, null, null); + }); + } + + /** + * The listWithNextLink operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the XML response for listing pets with next link as paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable listWithNextLink(RequestContext requestContext) { + RequestContext requestContextForNextPage = requestContext != null ? requestContext : RequestContext.none(); + return new PagedIterable<>((pagingOptions) -> { + if (pagingOptions.getOffset() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "offset") + .addKeyValue("methodName", "listWithNextLink") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getPageSize() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "pageSize") + .addKeyValue("methodName", "listWithNextLink") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getPageIndex() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "pageIndex") + .addKeyValue("methodName", "listWithNextLink") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getContinuationToken() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "continuationToken") + .addKeyValue("methodName", "listWithNextLink") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + return listWithNextLinkSinglePage(requestContext); + }, (pagingOptions, nextLink) -> listWithNextLinkNextSinglePage(nextLink, requestContextForNextPage)); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the XML response for listing pets with next link along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PagedResponse listWithNextLinkNextSinglePage(String nextLink) { + return this.instrumentation.instrumentWithResponse("Payload.Pageable.XmlPagination.listWithNextLink", + RequestContext.none(), updatedContext -> { + final String accept = "application/xml"; + Response res + = service.listWithNextLinkNext(nextLink, this.client.getEndpoint(), accept, updatedContext); + return new PagedResponse<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + res.getValue().getPets(), null, + res.getValue().getNextLink() != null ? res.getValue().getNextLink() : null, null, null, null); + }); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the XML response for listing pets with next link along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PagedResponse listWithNextLinkNextSinglePage(String nextLink, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Pageable.XmlPagination.listWithNextLink", + requestContext, updatedContext -> { + final String accept = "application/xml"; + Response res + = service.listWithNextLinkNext(nextLink, this.client.getEndpoint(), accept, updatedContext); + return new PagedResponse<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + res.getValue().getPets(), null, + res.getValue().getNextLink() != null ? res.getValue().getNextLink() : null, null, null, null); + }); + } + + private static final ClientLogger LOGGER = new ClientLogger(XmlPaginationsImpl.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/XmlPetListResult.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/XmlPetListResult.java new file mode 100644 index 00000000000..7304ad3848a --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/XmlPetListResult.java @@ -0,0 +1,143 @@ +package payload.pageable.implementation; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import java.util.ArrayList; +import java.util.List; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; +import payload.pageable.XmlPet; + +/** + * The XML response for listing pets. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class XmlPetListResult implements XmlSerializable { + /* + * The Pets property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List pets; + + /* + * The NextMarker property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private String nextMarker; + + /** + * Creates an instance of XmlPetListResult class. + * + * @param pets the pets value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private XmlPetListResult(List pets) { + this.pets = pets; + } + + /** + * Get the pets property: The Pets property. + * + * @return the pets value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getPets() { + return this.pets; + } + + /** + * Get the nextMarker property: The NextMarker property. + * + * @return the nextMarker value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getNextMarker() { + return this.nextMarker; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() ? "PetListResult" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + if (this.pets != null) { + xmlWriter.writeStartElement("Pets"); + for (XmlPet element : this.pets) { + xmlWriter.writeXml(element, "Pet"); + } + xmlWriter.writeEndElement(); + } + xmlWriter.writeStringElement("NextMarker", this.nextMarker); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of XmlPetListResult from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of XmlPetListResult if the XmlReader was pointing to an instance of it, or null if it was + * pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the XmlPetListResult. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static XmlPetListResult fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of XmlPetListResult from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of XmlPetListResult if the XmlReader was pointing to an instance of it, or null if it was + * pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the XmlPetListResult. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static XmlPetListResult fromXml(XmlReader xmlReader, String rootElementName) throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "PetListResult" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + List pets = null; + String nextMarker = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("Pets".equals(elementName.getLocalPart())) { + while (reader.nextElement() != XmlToken.END_ELEMENT) { + elementName = reader.getElementName(); + if ("Pet".equals(elementName.getLocalPart())) { + if (pets == null) { + pets = new ArrayList<>(); + } + pets.add(XmlPet.fromXml(reader, "Pet")); + } else { + reader.skipElement(); + } + } + } else if ("NextMarker".equals(elementName.getLocalPart())) { + nextMarker = reader.getStringElement(); + } else { + reader.skipElement(); + } + } + XmlPetListResult deserializedXmlPetListResult = new XmlPetListResult(pets); + deserializedXmlPetListResult.nextMarker = nextMarker; + + return deserializedXmlPetListResult; + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/XmlPetListResultWithNextLink.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/XmlPetListResultWithNextLink.java new file mode 100644 index 00000000000..448e04e37f5 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/XmlPetListResultWithNextLink.java @@ -0,0 +1,145 @@ +package payload.pageable.implementation; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import java.util.ArrayList; +import java.util.List; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; +import payload.pageable.XmlPet; + +/** + * The XML response for listing pets with next link. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class XmlPetListResultWithNextLink implements XmlSerializable { + /* + * The Pets property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List pets; + + /* + * The NextLink property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private String nextLink; + + /** + * Creates an instance of XmlPetListResultWithNextLink class. + * + * @param pets the pets value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private XmlPetListResultWithNextLink(List pets) { + this.pets = pets; + } + + /** + * Get the pets property: The Pets property. + * + * @return the pets value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getPets() { + return this.pets; + } + + /** + * Get the nextLink property: The NextLink property. + * + * @return the nextLink value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getNextLink() { + return this.nextLink; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() ? "PetListResult" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + if (this.pets != null) { + xmlWriter.writeStartElement("Pets"); + for (XmlPet element : this.pets) { + xmlWriter.writeXml(element, "Pet"); + } + xmlWriter.writeEndElement(); + } + xmlWriter.writeStringElement("NextLink", this.nextLink); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of XmlPetListResultWithNextLink from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of XmlPetListResultWithNextLink if the XmlReader was pointing to an instance of it, or null + * if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the XmlPetListResultWithNextLink. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static XmlPetListResultWithNextLink fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of XmlPetListResultWithNextLink from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of XmlPetListResultWithNextLink if the XmlReader was pointing to an instance of it, or null + * if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the XmlPetListResultWithNextLink. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static XmlPetListResultWithNextLink fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "PetListResult" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + List pets = null; + String nextLink = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("Pets".equals(elementName.getLocalPart())) { + while (reader.nextElement() != XmlToken.END_ELEMENT) { + elementName = reader.getElementName(); + if ("Pet".equals(elementName.getLocalPart())) { + if (pets == null) { + pets = new ArrayList<>(); + } + pets.add(XmlPet.fromXml(reader, "Pet")); + } else { + reader.skipElement(); + } + } + } else if ("NextLink".equals(elementName.getLocalPart())) { + nextLink = reader.getStringElement(); + } else { + reader.skipElement(); + } + } + XmlPetListResultWithNextLink deserializedXmlPetListResultWithNextLink + = new XmlPetListResultWithNextLink(pets); + deserializedXmlPetListResultWithNextLink.nextLink = nextLink; + + return deserializedXmlPetListResultWithNextLink; + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/Filter.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/Filter.java new file mode 100644 index 00000000000..968e10461af --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/Filter.java @@ -0,0 +1,79 @@ +package payload.pageable.serverdrivenpagination.alternateinitialverb; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.json.JsonReader; +import io.clientcore.core.serialization.json.JsonSerializable; +import io.clientcore.core.serialization.json.JsonToken; +import io.clientcore.core.serialization.json.JsonWriter; +import java.io.IOException; + +/** + * The Filter model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class Filter implements JsonSerializable { + /* + * The filter property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String filter; + + /** + * Creates an instance of Filter class. + * + * @param filter the filter value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public Filter(String filter) { + this.filter = filter; + } + + /** + * Get the filter property: The filter property. + * + * @return the filter value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getFilter() { + return this.filter; + } + + /** + * {@inheritDoc} + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("filter", this.filter); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of Filter from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of Filter if the JsonReader was pointing to an instance of it, or null if it was pointing to + * JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the Filter. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static Filter fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + String filter = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("filter".equals(fieldName)) { + filter = reader.getString(); + } else { + reader.skipChildren(); + } + } + return new Filter(filter); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/implementation/PostResponse.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/implementation/PostResponse.java new file mode 100644 index 00000000000..bd2013d7d53 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/implementation/PostResponse.java @@ -0,0 +1,104 @@ +package payload.pageable.serverdrivenpagination.alternateinitialverb.implementation; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.json.JsonReader; +import io.clientcore.core.serialization.json.JsonSerializable; +import io.clientcore.core.serialization.json.JsonToken; +import io.clientcore.core.serialization.json.JsonWriter; +import java.io.IOException; +import java.util.List; +import payload.pageable.Pet; + +/** + * The PostResponse model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class PostResponse implements JsonSerializable { + /* + * The pets property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List pets; + + /* + * The next property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private String next; + + /** + * Creates an instance of PostResponse class. + * + * @param pets the pets value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private PostResponse(List pets) { + this.pets = pets; + } + + /** + * Get the pets property: The pets property. + * + * @return the pets value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getPets() { + return this.pets; + } + + /** + * Get the next property: The next property. + * + * @return the next value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getNext() { + return this.next; + } + + /** + * {@inheritDoc} + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeArrayField("pets", this.pets, (writer, element) -> writer.writeJson(element)); + jsonWriter.writeStringField("next", this.next); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of PostResponse from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of PostResponse if the JsonReader was pointing to an instance of it, or null if it was + * pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the PostResponse. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static PostResponse fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + List pets = null; + String next = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("pets".equals(fieldName)) { + pets = reader.readArray(reader1 -> Pet.fromJson(reader1)); + } else if ("next".equals(fieldName)) { + next = reader.getString(); + } else { + reader.skipChildren(); + } + } + PostResponse deserializedPostResponse = new PostResponse(pets); + deserializedPostResponse.next = next; + + return deserializedPostResponse; + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/implementation/package-info.java new file mode 100644 index 00000000000..f3483f4acde --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/implementation/package-info.java @@ -0,0 +1,5 @@ +/** + * Package containing the data models for Pageable. + * Test for pageable payload. + */ +package payload.pageable.serverdrivenpagination.alternateinitialverb.implementation; diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/package-info.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/package-info.java new file mode 100644 index 00000000000..e18e01d730d --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/package-info.java @@ -0,0 +1,5 @@ +/** + * Package containing the data models for Pageable. + * Test for pageable payload. + */ +package payload.pageable.serverdrivenpagination.alternateinitialverb; diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/Author.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/Author.java new file mode 100644 index 00000000000..2abf05a5e9d --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/Author.java @@ -0,0 +1,101 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * Author model with a custom XML name. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class Author implements XmlSerializable { + /* + * The name property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String name; + + /** + * Creates an instance of Author class. + * + * @param name the name value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public Author(String name) { + this.name = name; + } + + /** + * Get the name property: The name property. + * + * @return the name value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getName() { + return this.name; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() ? "XmlAuthor" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeStringElement("name", this.name); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of Author from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of Author if the XmlReader was pointing to an instance of it, or null if it was pointing to + * XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the Author. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static Author fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of Author from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of Author if the XmlReader was pointing to an instance of it, or null if it was pointing to + * XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the Author. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static Author fromXml(XmlReader xmlReader, String rootElementName) throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "XmlAuthor" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + String name = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("name".equals(elementName.getLocalPart())) { + name = reader.getStringElement(); + } else { + reader.skipElement(); + } + } + return new Author(name); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/Book.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/Book.java new file mode 100644 index 00000000000..b6a1b07592d --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/Book.java @@ -0,0 +1,101 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * Book model with a custom XML name. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class Book implements XmlSerializable { + /* + * The title property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String title; + + /** + * Creates an instance of Book class. + * + * @param title the title value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public Book(String title) { + this.title = title; + } + + /** + * Get the title property: The title property. + * + * @return the title value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getTitle() { + return this.title; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() ? "XmlBook" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeStringElement("title", this.title); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of Book from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of Book if the XmlReader was pointing to an instance of it, or null if it was pointing to XML + * null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the Book. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static Book fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of Book from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of Book if the XmlReader was pointing to an instance of it, or null if it was pointing to XML + * null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the Book. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static Book fromXml(XmlReader xmlReader, String rootElementName) throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "XmlBook" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + String title = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("title".equals(elementName.getLocalPart())) { + title = reader.getStringElement(); + } else { + reader.skipElement(); + } + } + return new Book(title); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithArrayOfModel.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithArrayOfModel.java index 9a7272bf216..c47976a3e00 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithArrayOfModel.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithArrayOfModel.java @@ -12,7 +12,7 @@ import javax.xml.stream.XMLStreamException; /** - * Contains an array of models. + * §4.1 — Contains an array of models. */ @Metadata(properties = { MetadataProperties.IMMUTABLE }) public final class ModelWithArrayOfModel implements XmlSerializable { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithArrayOfModelValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithArrayOfModelValueClient.java index ceed78c57ef..50e8096cf0d 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithArrayOfModelValueClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithArrayOfModelValueClient.java @@ -40,7 +40,7 @@ public final class ModelWithArrayOfModelValueClient { * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains an array of models along with {@link Response}. + * @return §4.1 — Contains an array of models along with {@link Response}. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) @@ -54,7 +54,7 @@ public Response getWithResponse(RequestContext requestCon * * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains an array of models. + * @return §4.1 — Contains an array of models. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithAttributes.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithAttributes.java index c584856a910..3dc261eb287 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithAttributes.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithAttributes.java @@ -10,7 +10,7 @@ import javax.xml.stream.XMLStreamException; /** - * Contains fields that are XML attributes. + * §5.1 — Contains fields that are XML attributes. */ @Metadata(properties = { MetadataProperties.IMMUTABLE }) public final class ModelWithAttributes implements XmlSerializable { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithAttributesValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithAttributesValueClient.java index 55f0f798d96..211384df9f0 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithAttributesValueClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithAttributesValueClient.java @@ -40,7 +40,7 @@ public final class ModelWithAttributesValueClient { * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields that are XML attributes along with {@link Response}. + * @return §5.1 — Contains fields that are XML attributes along with {@link Response}. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) @@ -54,7 +54,7 @@ public Response getWithResponse(RequestContext requestConte * * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields that are XML attributes. + * @return §5.1 — Contains fields that are XML attributes. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithDatetime.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithDatetime.java new file mode 100644 index 00000000000..5c0cabd0e8c --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithDatetime.java @@ -0,0 +1,138 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import io.clientcore.core.utils.DateTimeRfc1123; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Objects; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * Contains datetime properties with different encodings. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithDatetime implements XmlSerializable { + /* + * DateTime value with rfc3339 encoding. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final OffsetDateTime rfc3339; + + /* + * DateTime value with rfc7231 encoding. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final DateTimeRfc1123 rfc7231; + + /** + * Creates an instance of ModelWithDatetime class. + * + * @param rfc3339 the rfc3339 value to set. + * @param rfc7231 the rfc7231 value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithDatetime(OffsetDateTime rfc3339, OffsetDateTime rfc7231) { + this.rfc3339 = rfc3339; + if (rfc7231 == null) { + this.rfc7231 = null; + } else { + this.rfc7231 = new DateTimeRfc1123(rfc7231); + } + } + + /** + * Get the rfc3339 property: DateTime value with rfc3339 encoding. + * + * @return the rfc3339 value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public OffsetDateTime getRfc3339() { + return this.rfc3339; + } + + /** + * Get the rfc7231 property: DateTime value with rfc7231 encoding. + * + * @return the rfc7231 value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public OffsetDateTime getRfc7231() { + if (this.rfc7231 == null) { + return null; + } + return this.rfc7231.getDateTime(); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() ? "ModelWithDatetime" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeStringElement("rfc3339", + this.rfc3339 == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.rfc3339)); + xmlWriter.writeStringElement("rfc7231", Objects.toString(this.rfc7231, null)); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithDatetime from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithDatetime if the XmlReader was pointing to an instance of it, or null if it was + * pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithDatetime. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithDatetime fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithDatetime from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithDatetime if the XmlReader was pointing to an instance of it, or null if it was + * pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithDatetime. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithDatetime fromXml(XmlReader xmlReader, String rootElementName) throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithDatetime" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + OffsetDateTime rfc3339 = null; + OffsetDateTime rfc7231 = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("rfc3339".equals(elementName.getLocalPart())) { + rfc3339 = reader.getNullableElement(dateString -> OffsetDateTime.parse(dateString)); + } else if ("rfc7231".equals(elementName.getLocalPart())) { + DateTimeRfc1123 rfc7231Holder = reader.getNullableElement(DateTimeRfc1123::new); + if (rfc7231Holder != null) { + rfc7231 = rfc7231Holder.getDateTime(); + } + } else { + reader.skipElement(); + } + } + return new ModelWithDatetime(rfc3339, rfc7231); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithDatetimeValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithDatetimeValueClient.java new file mode 100644 index 00000000000..7800490c498 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithDatetimeValueClient.java @@ -0,0 +1,95 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithDatetimeValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithDatetimeValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithDatetimeValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithDatetimeValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithDatetimeValueClient(ModelWithDatetimeValuesImpl serviceClient, Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return contains datetime properties with different encodings along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithDatetimeValue.get", requestContext, + updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return contains datetime properties with different encodings. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithDatetime get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithDatetime input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithDatetimeValue.put", requestContext, + updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithDatetime input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithEnum.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithEnum.java new file mode 100644 index 00000000000..176301e6f79 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithEnum.java @@ -0,0 +1,101 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * Contains a single property with an enum value. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithEnum implements XmlSerializable { + /* + * The status property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final Status status; + + /** + * Creates an instance of ModelWithEnum class. + * + * @param status the status value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithEnum(Status status) { + this.status = status; + } + + /** + * Get the status property: The status property. + * + * @return the status value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public Status getStatus() { + return this.status; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() ? "ModelWithEnum" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeStringElement("status", this.status == null ? null : this.status.getValue()); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithEnum from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithEnum if the XmlReader was pointing to an instance of it, or null if it was + * pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithEnum. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithEnum fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithEnum from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithEnum if the XmlReader was pointing to an instance of it, or null if it was + * pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithEnum. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithEnum fromXml(XmlReader xmlReader, String rootElementName) throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithEnum" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + Status status = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("status".equals(elementName.getLocalPart())) { + status = Status.fromValue(reader.getStringElement()); + } else { + reader.skipElement(); + } + } + return new ModelWithEnum(status); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithEnumValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithEnumValueClient.java new file mode 100644 index 00000000000..a0fe35c3f8e --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithEnumValueClient.java @@ -0,0 +1,95 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithEnumValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithEnumValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithEnumValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithEnumValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithEnumValueClient(ModelWithEnumValuesImpl serviceClient, Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return contains a single property with an enum value along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithEnumValue.get", requestContext, + updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return contains a single property with an enum value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithEnum get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithEnum input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithEnumValue.put", requestContext, + updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithEnum input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespace.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespace.java new file mode 100644 index 00000000000..6cd2cb14061 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespace.java @@ -0,0 +1,126 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §6.1, §7.1 — Contains fields with XML namespace on the model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithNamespace implements XmlSerializable { + private static final String EXAMPLE_COM__SCHEMA = "http://example.com/schema"; + + /* + * The id property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final int id; + + /* + * The title property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String title; + + /** + * Creates an instance of ModelWithNamespace class. + * + * @param id the id value to set. + * @param title the title value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithNamespace(int id, String title) { + this.id = id; + this.title = title; + } + + /** + * Get the id property: The id property. + * + * @return the id value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public int getId() { + return this.id; + } + + /** + * Get the title property: The title property. + * + * @return the title value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getTitle() { + return this.title; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() ? "ModelWithNamespace" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeNamespace(EXAMPLE_COM__SCHEMA); + xmlWriter.writeIntElement("id", this.id); + xmlWriter.writeStringElement("title", this.title); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithNamespace from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithNamespace if the XmlReader was pointing to an instance of it, or null if it was + * pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithNamespace. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithNamespace fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithNamespace from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithNamespace if the XmlReader was pointing to an instance of it, or null if it was + * pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithNamespace. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithNamespace fromXml(XmlReader xmlReader, String rootElementName) throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithNamespace" : rootElementName; + return xmlReader.readObject(EXAMPLE_COM__SCHEMA, finalRootElementName, reader -> { + int id = 0; + String title = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("id".equals(elementName.getLocalPart())) { + id = reader.getIntElement(); + } else if ("title".equals(elementName.getLocalPart())) { + title = reader.getStringElement(); + } else { + reader.skipElement(); + } + } + return new ModelWithNamespace(id, title); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceOnProperties.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceOnProperties.java new file mode 100644 index 00000000000..a463536c8a8 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceOnProperties.java @@ -0,0 +1,156 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §6.2, §7.2 — Contains fields with different XML namespaces on individual properties. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithNamespaceOnProperties implements XmlSerializable { + private static final String EXAMPLE_COM__SCHEMA = "http://example.com/schema"; + + private static final String EXAMPLE_COM__NS2 = "http://example.com/ns2"; + + /* + * The id property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final int id; + + /* + * The title property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String title; + + /* + * The author property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String author; + + /** + * Creates an instance of ModelWithNamespaceOnProperties class. + * + * @param id the id value to set. + * @param title the title value to set. + * @param author the author value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithNamespaceOnProperties(int id, String title, String author) { + this.id = id; + this.title = title; + this.author = author; + } + + /** + * Get the id property: The id property. + * + * @return the id value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public int getId() { + return this.id; + } + + /** + * Get the title property: The title property. + * + * @return the title value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getTitle() { + return this.title; + } + + /** + * Get the author property: The author property. + * + * @return the author value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getAuthor() { + return this.author; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithNamespaceOnProperties" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeNamespace(EXAMPLE_COM__SCHEMA); + xmlWriter.writeNamespace("smp", EXAMPLE_COM__SCHEMA); + xmlWriter.writeNamespace("ns2", EXAMPLE_COM__NS2); + xmlWriter.writeIntElement("id", this.id); + xmlWriter.writeStringElement(EXAMPLE_COM__SCHEMA, "title", this.title); + xmlWriter.writeStringElement(EXAMPLE_COM__NS2, "author", this.author); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithNamespaceOnProperties from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithNamespaceOnProperties if the XmlReader was pointing to an instance of it, or null + * if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithNamespaceOnProperties. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithNamespaceOnProperties fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithNamespaceOnProperties from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithNamespaceOnProperties if the XmlReader was pointing to an instance of it, or null + * if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithNamespaceOnProperties. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithNamespaceOnProperties fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithNamespaceOnProperties" : rootElementName; + return xmlReader.readObject(EXAMPLE_COM__SCHEMA, finalRootElementName, reader -> { + int id = 0; + String title = null; + String author = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("id".equals(elementName.getLocalPart())) { + id = reader.getIntElement(); + } else if ("title".equals(elementName.getLocalPart()) + && EXAMPLE_COM__SCHEMA.equals(elementName.getNamespaceURI())) { + title = reader.getStringElement(); + } else if ("author".equals(elementName.getLocalPart()) + && EXAMPLE_COM__NS2.equals(elementName.getNamespaceURI())) { + author = reader.getStringElement(); + } else { + reader.skipElement(); + } + } + return new ModelWithNamespaceOnProperties(id, title, author); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceOnPropertiesValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceOnPropertiesValueClient.java new file mode 100644 index 00000000000..a1406378bef --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceOnPropertiesValueClient.java @@ -0,0 +1,97 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithNamespaceOnPropertiesValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithNamespaceOnPropertiesValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithNamespaceOnPropertiesValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithNamespaceOnPropertiesValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithNamespaceOnPropertiesValueClient(ModelWithNamespaceOnPropertiesValuesImpl serviceClient, + Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §6.2, §7.2 — Contains fields with different XML namespaces on individual properties along with + * {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNamespaceOnPropertiesValue.get", + requestContext, updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §6.2, §7.2 — Contains fields with different XML namespaces on individual properties. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithNamespaceOnProperties get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithNamespaceOnProperties input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNamespaceOnPropertiesValue.put", + requestContext, updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithNamespaceOnProperties input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceValueClient.java new file mode 100644 index 00000000000..7252d78891f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceValueClient.java @@ -0,0 +1,95 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithNamespaceValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithNamespaceValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithNamespaceValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithNamespaceValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithNamespaceValueClient(ModelWithNamespaceValuesImpl serviceClient, Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §6.1, §7.1 — Contains fields with XML namespace on the model along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNamespaceValue.get", requestContext, + updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §6.1, §7.1 — Contains fields with XML namespace on the model. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithNamespace get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithNamespace input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNamespaceValue.put", requestContext, + updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithNamespace input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNestedModel.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNestedModel.java new file mode 100644 index 00000000000..abd318497dd --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNestedModel.java @@ -0,0 +1,102 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §2.1 — Contains a property that references another model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithNestedModel implements XmlSerializable { + /* + * The nested property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final SimpleModel nested; + + /** + * Creates an instance of ModelWithNestedModel class. + * + * @param nested the nested value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithNestedModel(SimpleModel nested) { + this.nested = nested; + } + + /** + * Get the nested property: The nested property. + * + * @return the nested value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public SimpleModel getNested() { + return this.nested; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithNestedModel" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeXml(this.nested, "nested"); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithNestedModel from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithNestedModel if the XmlReader was pointing to an instance of it, or null if it was + * pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithNestedModel. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithNestedModel fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithNestedModel from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithNestedModel if the XmlReader was pointing to an instance of it, or null if it was + * pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithNestedModel. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithNestedModel fromXml(XmlReader xmlReader, String rootElementName) throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithNestedModel" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + SimpleModel nested = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("nested".equals(elementName.getLocalPart())) { + nested = SimpleModel.fromXml(reader, "nested"); + } else { + reader.skipElement(); + } + } + return new ModelWithNestedModel(nested); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNestedModelValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNestedModelValueClient.java new file mode 100644 index 00000000000..f1e1387ed15 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNestedModelValueClient.java @@ -0,0 +1,95 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithNestedModelValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithNestedModelValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithNestedModelValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithNestedModelValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithNestedModelValueClient(ModelWithNestedModelValuesImpl serviceClient, Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §2.1 — Contains a property that references another model along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNestedModelValue.get", requestContext, + updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §2.1 — Contains a property that references another model. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithNestedModel get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithNestedModel input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNestedModelValue.put", requestContext, + updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithNestedModel input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedArrays.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedArrays.java index 89b759092b7..bfb82143e26 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedArrays.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedArrays.java @@ -12,7 +12,8 @@ import javax.xml.stream.XMLStreamException; /** - * Contains fields of wrapped and unwrapped arrays of primitive types that have different XML representations. + * §3.3, §3.4 — Contains fields of wrapped and unwrapped arrays of primitive types that have different XML + * representations. */ @Metadata(properties = { MetadataProperties.IMMUTABLE }) public final class ModelWithRenamedArrays implements XmlSerializable { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedArraysValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedArraysValueClient.java index fccb3ac22d6..cce36a3476b 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedArraysValueClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedArraysValueClient.java @@ -40,7 +40,7 @@ public final class ModelWithRenamedArraysValueClient { * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of wrapped and unwrapped arrays of primitive types that have different XML + * @return §3.3, §3.4 — Contains fields of wrapped and unwrapped arrays of primitive types that have different XML * representations along with {@link Response}. */ @Metadata(properties = { MetadataProperties.GENERATED }) @@ -55,7 +55,7 @@ public Response getWithResponse(RequestContext requestCo * * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of wrapped and unwrapped arrays of primitive types that have different XML + * @return §3.3, §3.4 — Contains fields of wrapped and unwrapped arrays of primitive types that have different XML * representations. */ @Metadata(properties = { MetadataProperties.GENERATED }) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedAttribute.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedAttribute.java new file mode 100644 index 00000000000..6454b86dcaa --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedAttribute.java @@ -0,0 +1,145 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §5.2 — Contains a renamed XML attribute. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithRenamedAttribute implements XmlSerializable { + /* + * The xml-id property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final int id; + + /* + * The title property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String title; + + /* + * The author property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String author; + + /** + * Creates an instance of ModelWithRenamedAttribute class. + * + * @param id the id value to set. + * @param title the title value to set. + * @param author the author value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedAttribute(int id, String title, String author) { + this.id = id; + this.title = title; + this.author = author; + } + + /** + * Get the id property: The xml-id property. + * + * @return the id value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public int getId() { + return this.id; + } + + /** + * Get the title property: The title property. + * + * @return the title value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getTitle() { + return this.title; + } + + /** + * Get the author property: The author property. + * + * @return the author value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getAuthor() { + return this.author; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithRenamedAttribute" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeIntAttribute("xml-id", this.id); + xmlWriter.writeStringElement("title", this.title); + xmlWriter.writeStringElement("author", this.author); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithRenamedAttribute from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithRenamedAttribute if the XmlReader was pointing to an instance of it, or null if + * it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedAttribute. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedAttribute fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithRenamedAttribute from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithRenamedAttribute if the XmlReader was pointing to an instance of it, or null if + * it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedAttribute. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedAttribute fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithRenamedAttribute" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + String title = null; + String author = null; + int id = reader.getIntAttribute(null, "xml-id"); + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("title".equals(elementName.getLocalPart())) { + title = reader.getStringElement(); + } else if ("author".equals(elementName.getLocalPart())) { + author = reader.getStringElement(); + } else { + reader.skipElement(); + } + } + return new ModelWithRenamedAttribute(id, title, author); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedAttributeValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedAttributeValueClient.java new file mode 100644 index 00000000000..6ea54457ea9 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedAttributeValueClient.java @@ -0,0 +1,96 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithRenamedAttributeValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithRenamedAttributeValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithRenamedAttributeValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedAttributeValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithRenamedAttributeValueClient(ModelWithRenamedAttributeValuesImpl serviceClient, + Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §5.2 — Contains a renamed XML attribute along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedAttributeValue.get", + requestContext, updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §5.2 — Contains a renamed XML attribute. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithRenamedAttribute get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedAttribute input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedAttributeValue.put", + requestContext, updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithRenamedAttribute input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedFields.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedFields.java index f2060abcd17..9d2ed599206 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedFields.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedFields.java @@ -10,7 +10,7 @@ import javax.xml.stream.XMLStreamException; /** - * Contains fields of the same type that have different XML representation. + * §1.3, §2.3 — Contains fields of the same type that have different XML representation. */ @Metadata(properties = { MetadataProperties.IMMUTABLE }) public final class ModelWithRenamedFields implements XmlSerializable { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedFieldsValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedFieldsValueClient.java index 33e7e3d1b47..f4d5e7de357 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedFieldsValueClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedFieldsValueClient.java @@ -40,7 +40,8 @@ public final class ModelWithRenamedFieldsValueClient { * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of the same type that have different XML representation along with {@link Response}. + * @return §1.3, §2.3 — Contains fields of the same type that have different XML representation along with + * {@link Response}. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) @@ -54,7 +55,7 @@ public Response getWithResponse(RequestContext requestCo * * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of the same type that have different XML representation. + * @return §1.3, §2.3 — Contains fields of the same type that have different XML representation. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedNestedModel.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedNestedModel.java new file mode 100644 index 00000000000..5358504684b --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedNestedModel.java @@ -0,0 +1,103 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §2.2 — Contains a property whose type has. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithRenamedNestedModel implements XmlSerializable { + /* + * The author property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final Author author; + + /** + * Creates an instance of ModelWithRenamedNestedModel class. + * + * @param author the author value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedNestedModel(Author author) { + this.author = author; + } + + /** + * Get the author property: The author property. + * + * @return the author value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public Author getAuthor() { + return this.author; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithRenamedNestedModel" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeXml(this.author, "author"); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithRenamedNestedModel from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithRenamedNestedModel if the XmlReader was pointing to an instance of it, or null if + * it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedNestedModel. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedNestedModel fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithRenamedNestedModel from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithRenamedNestedModel if the XmlReader was pointing to an instance of it, or null if + * it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedNestedModel. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedNestedModel fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithRenamedNestedModel" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + Author author = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("author".equals(elementName.getLocalPart())) { + author = Author.fromXml(reader, "author"); + } else { + reader.skipElement(); + } + } + return new ModelWithRenamedNestedModel(author); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedNestedModelValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedNestedModelValueClient.java new file mode 100644 index 00000000000..7919e9ba426 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedNestedModelValueClient.java @@ -0,0 +1,96 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithRenamedNestedModelValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithRenamedNestedModelValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithRenamedNestedModelValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedNestedModelValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithRenamedNestedModelValueClient(ModelWithRenamedNestedModelValuesImpl serviceClient, + Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §2.2 — Contains a property whose type has along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedNestedModelValue.get", + requestContext, updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §2.2 — Contains a property whose type has. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithRenamedNestedModel get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedNestedModel input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedNestedModelValue.put", + requestContext, updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithRenamedNestedModel input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedProperty.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedProperty.java new file mode 100644 index 00000000000..de93892e28e --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedProperty.java @@ -0,0 +1,125 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §1.2 — Contains a scalar property with a custom XML name. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithRenamedProperty implements XmlSerializable { + /* + * The renamedTitle property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String title; + + /* + * The author property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String author; + + /** + * Creates an instance of ModelWithRenamedProperty class. + * + * @param title the title value to set. + * @param author the author value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedProperty(String title, String author) { + this.title = title; + this.author = author; + } + + /** + * Get the title property: The renamedTitle property. + * + * @return the title value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getTitle() { + return this.title; + } + + /** + * Get the author property: The author property. + * + * @return the author value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getAuthor() { + return this.author; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithRenamedProperty" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeStringElement("renamedTitle", this.title); + xmlWriter.writeStringElement("author", this.author); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithRenamedProperty from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithRenamedProperty if the XmlReader was pointing to an instance of it, or null if it + * was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedProperty. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedProperty fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithRenamedProperty from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithRenamedProperty if the XmlReader was pointing to an instance of it, or null if it + * was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedProperty. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedProperty fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithRenamedProperty" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + String title = null; + String author = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("renamedTitle".equals(elementName.getLocalPart())) { + title = reader.getStringElement(); + } else if ("author".equals(elementName.getLocalPart())) { + author = reader.getStringElement(); + } else { + reader.skipElement(); + } + } + return new ModelWithRenamedProperty(title, author); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedPropertyValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedPropertyValueClient.java new file mode 100644 index 00000000000..536ac10f25a --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedPropertyValueClient.java @@ -0,0 +1,96 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithRenamedPropertyValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithRenamedPropertyValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithRenamedPropertyValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedPropertyValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithRenamedPropertyValueClient(ModelWithRenamedPropertyValuesImpl serviceClient, + Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §1.2 — Contains a scalar property with a custom XML name along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedPropertyValue.get", + requestContext, updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §1.2 — Contains a scalar property with a custom XML name. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithRenamedProperty get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedProperty input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedPropertyValue.put", + requestContext, updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithRenamedProperty input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArray.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArray.java new file mode 100644 index 00000000000..f563c908deb --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArray.java @@ -0,0 +1,114 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import java.util.ArrayList; +import java.util.List; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §4.4 — Contains an unwrapped array of models with a custom item name. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithRenamedUnwrappedModelArray implements XmlSerializable { + /* + * The ModelItem property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List items; + + /** + * Creates an instance of ModelWithRenamedUnwrappedModelArray class. + * + * @param items the items value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedUnwrappedModelArray(List items) { + this.items = items; + } + + /** + * Get the items property: The ModelItem property. + * + * @return the items value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getItems() { + return this.items; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() + ? "ModelWithRenamedUnwrappedModelArray" + : rootElementName; + xmlWriter.writeStartElement(rootElementName); + if (this.items != null) { + for (SimpleModel element : this.items) { + xmlWriter.writeXml(element, "ModelItem"); + } + } + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithRenamedUnwrappedModelArray from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithRenamedUnwrappedModelArray if the XmlReader was pointing to an instance of it, or + * null if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedUnwrappedModelArray. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedUnwrappedModelArray fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithRenamedUnwrappedModelArray from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithRenamedUnwrappedModelArray if the XmlReader was pointing to an instance of it, or + * null if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedUnwrappedModelArray. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedUnwrappedModelArray fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName = rootElementName == null || rootElementName.isEmpty() + ? "ModelWithRenamedUnwrappedModelArray" + : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + List items = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("ModelItem".equals(elementName.getLocalPart())) { + if (items == null) { + items = new ArrayList<>(); + } + items.add(SimpleModel.fromXml(reader, "ModelItem")); + } else { + reader.skipElement(); + } + } + return new ModelWithRenamedUnwrappedModelArray(items); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArrayValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArrayValueClient.java new file mode 100644 index 00000000000..9dbb46316fa --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArrayValueClient.java @@ -0,0 +1,96 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithRenamedUnwrappedModelArrayValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithRenamedUnwrappedModelArrayValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithRenamedUnwrappedModelArrayValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedUnwrappedModelArrayValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithRenamedUnwrappedModelArrayValueClient(ModelWithRenamedUnwrappedModelArrayValuesImpl serviceClient, + Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.4 — Contains an unwrapped array of models with a custom item name along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.get", + requestContext, updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.4 — Contains an unwrapped array of models with a custom item name. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithRenamedUnwrappedModelArray get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedUnwrappedModelArray input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.put", + requestContext, updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithRenamedUnwrappedModelArray input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArray.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArray.java new file mode 100644 index 00000000000..59d3a6ddedb --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArray.java @@ -0,0 +1,124 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import java.util.ArrayList; +import java.util.List; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §4.5 — Contains a wrapped array of models with custom wrapper and item names. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithRenamedWrappedAndItemModelArray + implements XmlSerializable { + /* + * The AllBooks property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List books; + + /** + * Creates an instance of ModelWithRenamedWrappedAndItemModelArray class. + * + * @param books the books value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedWrappedAndItemModelArray(List books) { + this.books = books; + } + + /** + * Get the books property: The AllBooks property. + * + * @return the books value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getBooks() { + return this.books; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() + ? "ModelWithRenamedWrappedAndItemModelArray" + : rootElementName; + xmlWriter.writeStartElement(rootElementName); + if (this.books != null) { + xmlWriter.writeStartElement("AllBooks"); + for (Book element : this.books) { + xmlWriter.writeXml(element, "XmlBook"); + } + xmlWriter.writeEndElement(); + } + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithRenamedWrappedAndItemModelArray from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithRenamedWrappedAndItemModelArray if the XmlReader was pointing to an instance of + * it, or null if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedWrappedAndItemModelArray. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedWrappedAndItemModelArray fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithRenamedWrappedAndItemModelArray from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithRenamedWrappedAndItemModelArray if the XmlReader was pointing to an instance of + * it, or null if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedWrappedAndItemModelArray. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedWrappedAndItemModelArray fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName = rootElementName == null || rootElementName.isEmpty() + ? "ModelWithRenamedWrappedAndItemModelArray" + : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + List books = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("AllBooks".equals(elementName.getLocalPart())) { + while (reader.nextElement() != XmlToken.END_ELEMENT) { + elementName = reader.getElementName(); + if ("XmlBook".equals(elementName.getLocalPart())) { + if (books == null) { + books = new ArrayList<>(); + } + books.add(Book.fromXml(reader, "XmlBook")); + } else { + reader.skipElement(); + } + } + } else { + reader.skipElement(); + } + } + return new ModelWithRenamedWrappedAndItemModelArray(books); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArrayValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArrayValueClient.java new file mode 100644 index 00000000000..36ff0eafdbc --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArrayValueClient.java @@ -0,0 +1,99 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithRenamedWrappedAndItemModelArrayValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithRenamedWrappedAndItemModelArrayValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithRenamedWrappedAndItemModelArrayValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedWrappedAndItemModelArrayValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithRenamedWrappedAndItemModelArrayValueClient( + ModelWithRenamedWrappedAndItemModelArrayValuesImpl serviceClient, Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.5 — Contains a wrapped array of models with custom wrapper and item names along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.get", requestContext, + updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.5 — Contains a wrapped array of models with custom wrapper and item names. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithRenamedWrappedAndItemModelArray get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedWrappedAndItemModelArray input, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.put", requestContext, + updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithRenamedWrappedAndItemModelArray input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArray.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArray.java new file mode 100644 index 00000000000..2ce1cab47f3 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArray.java @@ -0,0 +1,123 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import java.util.ArrayList; +import java.util.List; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §4.3 — Contains a wrapped array of models with a custom wrapper name. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithRenamedWrappedModelArray implements XmlSerializable { + /* + * The AllItems property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List items; + + /** + * Creates an instance of ModelWithRenamedWrappedModelArray class. + * + * @param items the items value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedWrappedModelArray(List items) { + this.items = items; + } + + /** + * Get the items property: The AllItems property. + * + * @return the items value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getItems() { + return this.items; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() + ? "ModelWithRenamedWrappedModelArray" + : rootElementName; + xmlWriter.writeStartElement(rootElementName); + if (this.items != null) { + xmlWriter.writeStartElement("AllItems"); + for (SimpleModel element : this.items) { + xmlWriter.writeXml(element, "SimpleModel"); + } + xmlWriter.writeEndElement(); + } + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithRenamedWrappedModelArray from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithRenamedWrappedModelArray if the XmlReader was pointing to an instance of it, or + * null if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedWrappedModelArray. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedWrappedModelArray fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithRenamedWrappedModelArray from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithRenamedWrappedModelArray if the XmlReader was pointing to an instance of it, or + * null if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedWrappedModelArray. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedWrappedModelArray fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName = rootElementName == null || rootElementName.isEmpty() + ? "ModelWithRenamedWrappedModelArray" + : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + List items = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("AllItems".equals(elementName.getLocalPart())) { + while (reader.nextElement() != XmlToken.END_ELEMENT) { + elementName = reader.getElementName(); + if ("SimpleModel".equals(elementName.getLocalPart())) { + if (items == null) { + items = new ArrayList<>(); + } + items.add(SimpleModel.fromXml(reader, "SimpleModel")); + } else { + reader.skipElement(); + } + } + } else { + reader.skipElement(); + } + } + return new ModelWithRenamedWrappedModelArray(items); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArrayValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArrayValueClient.java new file mode 100644 index 00000000000..1c3c92dfd57 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArrayValueClient.java @@ -0,0 +1,96 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithRenamedWrappedModelArrayValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithRenamedWrappedModelArrayValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithRenamedWrappedModelArrayValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedWrappedModelArrayValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithRenamedWrappedModelArrayValueClient(ModelWithRenamedWrappedModelArrayValuesImpl serviceClient, + Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.3 — Contains a wrapped array of models with a custom wrapper name along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedWrappedModelArrayValue.get", + requestContext, updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.3 — Contains a wrapped array of models with a custom wrapper name. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithRenamedWrappedModelArray get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedWrappedModelArray input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedWrappedModelArrayValue.put", + requestContext, updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithRenamedWrappedModelArray input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithSimpleArrays.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithSimpleArrays.java index a3d2b3669d8..cbec66fd52b 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithSimpleArrays.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithSimpleArrays.java @@ -12,7 +12,7 @@ import javax.xml.stream.XMLStreamException; /** - * Contains fields of arrays of primitive types. + * §3.1 — Contains fields of arrays of primitive types. */ @Metadata(properties = { MetadataProperties.IMMUTABLE }) public final class ModelWithSimpleArrays implements XmlSerializable { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithSimpleArraysValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithSimpleArraysValueClient.java index b25f0743b9d..8dcae65d81f 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithSimpleArraysValueClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithSimpleArraysValueClient.java @@ -40,7 +40,7 @@ public final class ModelWithSimpleArraysValueClient { * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of arrays of primitive types along with {@link Response}. + * @return §3.1 — Contains fields of arrays of primitive types along with {@link Response}. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) @@ -54,7 +54,7 @@ public Response getWithResponse(RequestContext requestCon * * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of arrays of primitive types. + * @return §3.1 — Contains fields of arrays of primitive types. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithText.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithText.java index eb280d52f35..3b31c344b70 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithText.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithText.java @@ -8,7 +8,7 @@ import javax.xml.stream.XMLStreamException; /** - * Contains an attribute and text. + * §8.1 — Contains an attribute and text. */ @Metadata(properties = { MetadataProperties.IMMUTABLE }) public final class ModelWithText implements XmlSerializable { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithTextValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithTextValueClient.java index 717763ff547..5b3219ec202 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithTextValueClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithTextValueClient.java @@ -40,7 +40,7 @@ public final class ModelWithTextValueClient { * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains an attribute and text along with {@link Response}. + * @return §8.1 — Contains an attribute and text along with {@link Response}. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) @@ -54,7 +54,7 @@ public Response getWithResponse(RequestContext requestContext) { * * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains an attribute and text. + * @return §8.1 — Contains an attribute and text. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedArray.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedArray.java index d06eceeb6ed..ad440a001b1 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedArray.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedArray.java @@ -12,7 +12,7 @@ import javax.xml.stream.XMLStreamException; /** - * Contains fields of wrapped and unwrapped arrays of primitive types. + * §3.2 — Contains fields of wrapped and unwrapped arrays of primitive types. */ @Metadata(properties = { MetadataProperties.IMMUTABLE }) public final class ModelWithUnwrappedArray implements XmlSerializable { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedArrayValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedArrayValueClient.java index 8c8a81ca835..1c6d3825c88 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedArrayValueClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedArrayValueClient.java @@ -41,7 +41,7 @@ public final class ModelWithUnwrappedArrayValueClient { * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of wrapped and unwrapped arrays of primitive types along with {@link Response}. + * @return §3.2 — Contains fields of wrapped and unwrapped arrays of primitive types along with {@link Response}. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) @@ -55,7 +55,7 @@ public Response getWithResponse(RequestContext requestC * * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of wrapped and unwrapped arrays of primitive types. + * @return §3.2 — Contains fields of wrapped and unwrapped arrays of primitive types. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedModelArray.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedModelArray.java new file mode 100644 index 00000000000..4481d088563 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedModelArray.java @@ -0,0 +1,112 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import java.util.ArrayList; +import java.util.List; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §4.2 — Contains an unwrapped array of models. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithUnwrappedModelArray implements XmlSerializable { + /* + * The items property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List items; + + /** + * Creates an instance of ModelWithUnwrappedModelArray class. + * + * @param items the items value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithUnwrappedModelArray(List items) { + this.items = items; + } + + /** + * Get the items property: The items property. + * + * @return the items value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getItems() { + return this.items; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithUnwrappedModelArray" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + if (this.items != null) { + for (SimpleModel element : this.items) { + xmlWriter.writeXml(element, "items"); + } + } + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithUnwrappedModelArray from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithUnwrappedModelArray if the XmlReader was pointing to an instance of it, or null + * if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithUnwrappedModelArray. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithUnwrappedModelArray fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithUnwrappedModelArray from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithUnwrappedModelArray if the XmlReader was pointing to an instance of it, or null + * if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithUnwrappedModelArray. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithUnwrappedModelArray fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithUnwrappedModelArray" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + List items = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("items".equals(elementName.getLocalPart())) { + if (items == null) { + items = new ArrayList<>(); + } + items.add(SimpleModel.fromXml(reader, "items")); + } else { + reader.skipElement(); + } + } + return new ModelWithUnwrappedModelArray(items); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedModelArrayValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedModelArrayValueClient.java new file mode 100644 index 00000000000..01a719743dd --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedModelArrayValueClient.java @@ -0,0 +1,96 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithUnwrappedModelArrayValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithUnwrappedModelArrayValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithUnwrappedModelArrayValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithUnwrappedModelArrayValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithUnwrappedModelArrayValueClient(ModelWithUnwrappedModelArrayValuesImpl serviceClient, + Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.2 — Contains an unwrapped array of models along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithUnwrappedModelArrayValue.get", + requestContext, updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.2 — Contains an unwrapped array of models. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithUnwrappedModelArray get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithUnwrappedModelArray input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithUnwrappedModelArrayValue.put", + requestContext, updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithUnwrappedModelArray input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNames.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNames.java new file mode 100644 index 00000000000..f4ca638a6ee --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNames.java @@ -0,0 +1,124 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import java.util.ArrayList; +import java.util.List; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §3.5 — Contains a wrapped primitive array with custom wrapper and item names. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithWrappedPrimitiveCustomItemNames + implements XmlSerializable { + /* + * The ItemsTags property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List tags; + + /** + * Creates an instance of ModelWithWrappedPrimitiveCustomItemNames class. + * + * @param tags the tags value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithWrappedPrimitiveCustomItemNames(List tags) { + this.tags = tags; + } + + /** + * Get the tags property: The ItemsTags property. + * + * @return the tags value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getTags() { + return this.tags; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() + ? "ModelWithWrappedPrimitiveCustomItemNames" + : rootElementName; + xmlWriter.writeStartElement(rootElementName); + if (this.tags != null) { + xmlWriter.writeStartElement("ItemsTags"); + for (String element : this.tags) { + xmlWriter.writeStringElement("ItemName", element); + } + xmlWriter.writeEndElement(); + } + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithWrappedPrimitiveCustomItemNames from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithWrappedPrimitiveCustomItemNames if the XmlReader was pointing to an instance of + * it, or null if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithWrappedPrimitiveCustomItemNames. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithWrappedPrimitiveCustomItemNames fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithWrappedPrimitiveCustomItemNames from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithWrappedPrimitiveCustomItemNames if the XmlReader was pointing to an instance of + * it, or null if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithWrappedPrimitiveCustomItemNames. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithWrappedPrimitiveCustomItemNames fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName = rootElementName == null || rootElementName.isEmpty() + ? "ModelWithWrappedPrimitiveCustomItemNames" + : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + List tags = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("ItemsTags".equals(elementName.getLocalPart())) { + while (reader.nextElement() != XmlToken.END_ELEMENT) { + elementName = reader.getElementName(); + if ("ItemName".equals(elementName.getLocalPart())) { + if (tags == null) { + tags = new ArrayList<>(); + } + tags.add(reader.getStringElement()); + } else { + reader.skipElement(); + } + } + } else { + reader.skipElement(); + } + } + return new ModelWithWrappedPrimitiveCustomItemNames(tags); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNamesValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNamesValueClient.java new file mode 100644 index 00000000000..f0317b4b75f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNamesValueClient.java @@ -0,0 +1,99 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithWrappedPrimitiveCustomItemNamesValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithWrappedPrimitiveCustomItemNamesValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithWrappedPrimitiveCustomItemNamesValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithWrappedPrimitiveCustomItemNamesValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithWrappedPrimitiveCustomItemNamesValueClient( + ModelWithWrappedPrimitiveCustomItemNamesValuesImpl serviceClient, Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §3.5 — Contains a wrapped primitive array with custom wrapper and item names along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.get", requestContext, + updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §3.5 — Contains a wrapped primitive array with custom wrapper and item names. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithWrappedPrimitiveCustomItemNames get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithWrappedPrimitiveCustomItemNames input, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.put", requestContext, + updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithWrappedPrimitiveCustomItemNames input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/SimpleModel.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/SimpleModel.java index 81402ee227d..743885da2f6 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/SimpleModel.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/SimpleModel.java @@ -10,7 +10,7 @@ import javax.xml.stream.XMLStreamException; /** - * Contains fields of primitive types. + * §1.1 — Contains fields of primitive types. */ @Metadata(properties = { MetadataProperties.IMMUTABLE }) public final class SimpleModel implements XmlSerializable { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/SimpleModelValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/SimpleModelValueClient.java index 58548f34b11..14194ac8a3d 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/SimpleModelValueClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/SimpleModelValueClient.java @@ -40,7 +40,7 @@ public final class SimpleModelValueClient { * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of primitive types along with {@link Response}. + * @return §1.1 — Contains fields of primitive types along with {@link Response}. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) @@ -54,7 +54,7 @@ public Response getWithResponse(RequestContext requestContext) { * * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of primitive types. + * @return §1.1 — Contains fields of primitive types. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/Status.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/Status.java new file mode 100644 index 00000000000..9344aeeeb6a --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/Status.java @@ -0,0 +1,134 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.json.JsonReader; +import io.clientcore.core.serialization.json.JsonSerializable; +import io.clientcore.core.serialization.json.JsonToken; +import io.clientcore.core.serialization.json.JsonWriter; +import io.clientcore.core.utils.ExpandableEnum; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; + +/** + * Status values for the model with enum. + */ +public final class Status implements ExpandableEnum, JsonSerializable { + private static final Map VALUES = new ConcurrentHashMap<>(); + + private static final Function NEW_INSTANCE = Status::new; + + /** + * Pending status. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final Status PENDING = fromValue("pending"); + + /** + * Success status. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final Status SUCCESS = fromValue("success"); + + /** + * Error status. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final Status ERROR = fromValue("error"); + + private final String value; + + private Status(String value) { + this.value = value; + } + + /** + * Creates or finds a Status. + * + * @param value a value to look for. + * @return the corresponding Status. + * @throws IllegalArgumentException if value is null. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static Status fromValue(String value) { + if (value == null) { + throw new IllegalArgumentException("'value' cannot be null."); + } + return VALUES.computeIfAbsent(value, NEW_INSTANCE); + } + + /** + * Gets known Status values. + * + * @return Known Status values. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static Collection values() { + return new ArrayList<>(VALUES.values()); + } + + /** + * Gets the value of the Status instance. + * + * @return the value of the Status instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public String getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + return jsonWriter.writeString(getValue()); + } + + /** + * Reads an instance of Status from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of Status if the JsonReader was pointing to an instance of it, or null if the JsonReader was + * pointing to JSON null. + * @throws IOException If an error occurs while reading the Status. + * @throws IllegalStateException If unexpected JSON token is found. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static Status fromJson(JsonReader jsonReader) throws IOException { + JsonToken nextToken = jsonReader.nextToken(); + if (nextToken == JsonToken.NULL) { + return null; + } + if (nextToken != JsonToken.STRING) { + throw new IllegalStateException( + String.format("Unexpected JSON token for %s deserialization: %s", JsonToken.STRING, nextToken)); + } + return Status.fromValue(jsonReader.getString()); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public String toString() { + return Objects.toString(this.value); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public boolean equals(Object obj) { + return this == obj; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public int hashCode() { + return Objects.hashCode(this.value); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/XmlClientBuilder.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/XmlClientBuilder.java index 1483ae2236d..859fd9979dc 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/XmlClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/XmlClientBuilder.java @@ -34,17 +34,31 @@ @ServiceClientBuilder( serviceClients = { SimpleModelValueClient.class, + ModelWithRenamedPropertyValueClient.class, + ModelWithRenamedFieldsValueClient.class, + ModelWithNestedModelValueClient.class, + ModelWithRenamedNestedModelValueClient.class, ModelWithSimpleArraysValueClient.class, - ModelWithArrayOfModelValueClient.class, - ModelWithOptionalFieldValueClient.class, - ModelWithAttributesValueClient.class, ModelWithUnwrappedArrayValueClient.class, ModelWithRenamedArraysValueClient.class, - ModelWithRenamedFieldsValueClient.class, - ModelWithEmptyArrayValueClient.class, + ModelWithWrappedPrimitiveCustomItemNamesValueClient.class, + ModelWithArrayOfModelValueClient.class, + ModelWithUnwrappedModelArrayValueClient.class, + ModelWithRenamedWrappedModelArrayValueClient.class, + ModelWithRenamedUnwrappedModelArrayValueClient.class, + ModelWithRenamedWrappedAndItemModelArrayValueClient.class, + ModelWithAttributesValueClient.class, + ModelWithRenamedAttributeValueClient.class, + ModelWithNamespaceValueClient.class, + ModelWithNamespaceOnPropertiesValueClient.class, ModelWithTextValueClient.class, + ModelWithOptionalFieldValueClient.class, + ModelWithEmptyArrayValueClient.class, ModelWithDictionaryValueClient.class, - ModelWithEncodedNamesValueClient.class }) + ModelWithEncodedNamesValueClient.class, + ModelWithEnumValueClient.class, + ModelWithDatetimeValueClient.class, + XmlErrorValueClient.class }) public final class XmlClientBuilder implements HttpTrait, ProxyTrait, ConfigurationTrait, EndpointTrait { @Metadata(properties = { MetadataProperties.GENERATED }) @@ -247,50 +261,62 @@ public SimpleModelValueClient buildSimpleModelValueClient() { } /** - * Builds an instance of ModelWithSimpleArraysValueClient class. + * Builds an instance of ModelWithRenamedPropertyValueClient class. * - * @return an instance of ModelWithSimpleArraysValueClient. + * @return an instance of ModelWithRenamedPropertyValueClient. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public ModelWithSimpleArraysValueClient buildModelWithSimpleArraysValueClient() { + public ModelWithRenamedPropertyValueClient buildModelWithRenamedPropertyValueClient() { XmlClientImpl innerClient = buildInnerClient(); - return new ModelWithSimpleArraysValueClient(innerClient.getModelWithSimpleArraysValues(), + return new ModelWithRenamedPropertyValueClient(innerClient.getModelWithRenamedPropertyValues(), innerClient.getInstrumentation()); } /** - * Builds an instance of ModelWithArrayOfModelValueClient class. + * Builds an instance of ModelWithRenamedFieldsValueClient class. * - * @return an instance of ModelWithArrayOfModelValueClient. + * @return an instance of ModelWithRenamedFieldsValueClient. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public ModelWithArrayOfModelValueClient buildModelWithArrayOfModelValueClient() { + public ModelWithRenamedFieldsValueClient buildModelWithRenamedFieldsValueClient() { XmlClientImpl innerClient = buildInnerClient(); - return new ModelWithArrayOfModelValueClient(innerClient.getModelWithArrayOfModelValues(), + return new ModelWithRenamedFieldsValueClient(innerClient.getModelWithRenamedFieldsValues(), innerClient.getInstrumentation()); } /** - * Builds an instance of ModelWithOptionalFieldValueClient class. + * Builds an instance of ModelWithNestedModelValueClient class. * - * @return an instance of ModelWithOptionalFieldValueClient. + * @return an instance of ModelWithNestedModelValueClient. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public ModelWithOptionalFieldValueClient buildModelWithOptionalFieldValueClient() { + public ModelWithNestedModelValueClient buildModelWithNestedModelValueClient() { XmlClientImpl innerClient = buildInnerClient(); - return new ModelWithOptionalFieldValueClient(innerClient.getModelWithOptionalFieldValues(), + return new ModelWithNestedModelValueClient(innerClient.getModelWithNestedModelValues(), innerClient.getInstrumentation()); } /** - * Builds an instance of ModelWithAttributesValueClient class. + * Builds an instance of ModelWithRenamedNestedModelValueClient class. * - * @return an instance of ModelWithAttributesValueClient. + * @return an instance of ModelWithRenamedNestedModelValueClient. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public ModelWithAttributesValueClient buildModelWithAttributesValueClient() { + public ModelWithRenamedNestedModelValueClient buildModelWithRenamedNestedModelValueClient() { XmlClientImpl innerClient = buildInnerClient(); - return new ModelWithAttributesValueClient(innerClient.getModelWithAttributesValues(), + return new ModelWithRenamedNestedModelValueClient(innerClient.getModelWithRenamedNestedModelValues(), + innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithSimpleArraysValueClient class. + * + * @return an instance of ModelWithSimpleArraysValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithSimpleArraysValueClient buildModelWithSimpleArraysValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithSimpleArraysValueClient(innerClient.getModelWithSimpleArraysValues(), innerClient.getInstrumentation()); } @@ -319,26 +345,124 @@ public ModelWithRenamedArraysValueClient buildModelWithRenamedArraysValueClient( } /** - * Builds an instance of ModelWithRenamedFieldsValueClient class. + * Builds an instance of ModelWithWrappedPrimitiveCustomItemNamesValueClient class. * - * @return an instance of ModelWithRenamedFieldsValueClient. + * @return an instance of ModelWithWrappedPrimitiveCustomItemNamesValueClient. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public ModelWithRenamedFieldsValueClient buildModelWithRenamedFieldsValueClient() { + public ModelWithWrappedPrimitiveCustomItemNamesValueClient + buildModelWithWrappedPrimitiveCustomItemNamesValueClient() { XmlClientImpl innerClient = buildInnerClient(); - return new ModelWithRenamedFieldsValueClient(innerClient.getModelWithRenamedFieldsValues(), + return new ModelWithWrappedPrimitiveCustomItemNamesValueClient( + innerClient.getModelWithWrappedPrimitiveCustomItemNamesValues(), innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithArrayOfModelValueClient class. + * + * @return an instance of ModelWithArrayOfModelValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithArrayOfModelValueClient buildModelWithArrayOfModelValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithArrayOfModelValueClient(innerClient.getModelWithArrayOfModelValues(), innerClient.getInstrumentation()); } /** - * Builds an instance of ModelWithEmptyArrayValueClient class. + * Builds an instance of ModelWithUnwrappedModelArrayValueClient class. * - * @return an instance of ModelWithEmptyArrayValueClient. + * @return an instance of ModelWithUnwrappedModelArrayValueClient. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public ModelWithEmptyArrayValueClient buildModelWithEmptyArrayValueClient() { + public ModelWithUnwrappedModelArrayValueClient buildModelWithUnwrappedModelArrayValueClient() { XmlClientImpl innerClient = buildInnerClient(); - return new ModelWithEmptyArrayValueClient(innerClient.getModelWithEmptyArrayValues(), + return new ModelWithUnwrappedModelArrayValueClient(innerClient.getModelWithUnwrappedModelArrayValues(), + innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithRenamedWrappedModelArrayValueClient class. + * + * @return an instance of ModelWithRenamedWrappedModelArrayValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedWrappedModelArrayValueClient buildModelWithRenamedWrappedModelArrayValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithRenamedWrappedModelArrayValueClient( + innerClient.getModelWithRenamedWrappedModelArrayValues(), innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithRenamedUnwrappedModelArrayValueClient class. + * + * @return an instance of ModelWithRenamedUnwrappedModelArrayValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedUnwrappedModelArrayValueClient buildModelWithRenamedUnwrappedModelArrayValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithRenamedUnwrappedModelArrayValueClient( + innerClient.getModelWithRenamedUnwrappedModelArrayValues(), innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithRenamedWrappedAndItemModelArrayValueClient class. + * + * @return an instance of ModelWithRenamedWrappedAndItemModelArrayValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedWrappedAndItemModelArrayValueClient + buildModelWithRenamedWrappedAndItemModelArrayValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithRenamedWrappedAndItemModelArrayValueClient( + innerClient.getModelWithRenamedWrappedAndItemModelArrayValues(), innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithAttributesValueClient class. + * + * @return an instance of ModelWithAttributesValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithAttributesValueClient buildModelWithAttributesValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithAttributesValueClient(innerClient.getModelWithAttributesValues(), + innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithRenamedAttributeValueClient class. + * + * @return an instance of ModelWithRenamedAttributeValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedAttributeValueClient buildModelWithRenamedAttributeValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithRenamedAttributeValueClient(innerClient.getModelWithRenamedAttributeValues(), + innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithNamespaceValueClient class. + * + * @return an instance of ModelWithNamespaceValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithNamespaceValueClient buildModelWithNamespaceValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithNamespaceValueClient(innerClient.getModelWithNamespaceValues(), + innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithNamespaceOnPropertiesValueClient class. + * + * @return an instance of ModelWithNamespaceOnPropertiesValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithNamespaceOnPropertiesValueClient buildModelWithNamespaceOnPropertiesValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithNamespaceOnPropertiesValueClient(innerClient.getModelWithNamespaceOnPropertiesValues(), innerClient.getInstrumentation()); } @@ -353,6 +477,30 @@ public ModelWithTextValueClient buildModelWithTextValueClient() { return new ModelWithTextValueClient(innerClient.getModelWithTextValues(), innerClient.getInstrumentation()); } + /** + * Builds an instance of ModelWithOptionalFieldValueClient class. + * + * @return an instance of ModelWithOptionalFieldValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithOptionalFieldValueClient buildModelWithOptionalFieldValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithOptionalFieldValueClient(innerClient.getModelWithOptionalFieldValues(), + innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithEmptyArrayValueClient class. + * + * @return an instance of ModelWithEmptyArrayValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithEmptyArrayValueClient buildModelWithEmptyArrayValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithEmptyArrayValueClient(innerClient.getModelWithEmptyArrayValues(), + innerClient.getInstrumentation()); + } + /** * Builds an instance of ModelWithDictionaryValueClient class. * @@ -376,4 +524,38 @@ public ModelWithEncodedNamesValueClient buildModelWithEncodedNamesValueClient() return new ModelWithEncodedNamesValueClient(innerClient.getModelWithEncodedNamesValues(), innerClient.getInstrumentation()); } + + /** + * Builds an instance of ModelWithEnumValueClient class. + * + * @return an instance of ModelWithEnumValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithEnumValueClient buildModelWithEnumValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithEnumValueClient(innerClient.getModelWithEnumValues(), innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithDatetimeValueClient class. + * + * @return an instance of ModelWithDatetimeValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithDatetimeValueClient buildModelWithDatetimeValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithDatetimeValueClient(innerClient.getModelWithDatetimeValues(), + innerClient.getInstrumentation()); + } + + /** + * Builds an instance of XmlErrorValueClient class. + * + * @return an instance of XmlErrorValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public XmlErrorValueClient buildXmlErrorValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new XmlErrorValueClient(innerClient.getXmlErrorValues(), innerClient.getInstrumentation()); + } } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/XmlErrorBody.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/XmlErrorBody.java new file mode 100644 index 00000000000..6d4eb1f02dc --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/XmlErrorBody.java @@ -0,0 +1,123 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * The body of an XML error response. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class XmlErrorBody implements XmlSerializable { + /* + * The message property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String message; + + /* + * The code property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final int code; + + /** + * Creates an instance of XmlErrorBody class. + * + * @param message the message value to set. + * @param code the code value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private XmlErrorBody(String message, int code) { + this.message = message; + this.code = code; + } + + /** + * Get the message property: The message property. + * + * @return the message value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getMessage() { + return this.message; + } + + /** + * Get the code property: The code property. + * + * @return the code value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public int getCode() { + return this.code; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() ? "XmlErrorBody" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeStringElement("message", this.message); + xmlWriter.writeIntElement("code", this.code); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of XmlErrorBody from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of XmlErrorBody if the XmlReader was pointing to an instance of it, or null if it was + * pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the XmlErrorBody. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static XmlErrorBody fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of XmlErrorBody from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of XmlErrorBody if the XmlReader was pointing to an instance of it, or null if it was + * pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the XmlErrorBody. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static XmlErrorBody fromXml(XmlReader xmlReader, String rootElementName) throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "XmlErrorBody" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + String message = null; + int code = 0; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("message".equals(elementName.getLocalPart())) { + message = reader.getStringElement(); + } else if ("code".equals(elementName.getLocalPart())) { + code = reader.getIntElement(); + } else { + reader.skipElement(); + } + } + return new XmlErrorBody(message, code); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/XmlErrorValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/XmlErrorValueClient.java new file mode 100644 index 00000000000..8c26f598105 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/XmlErrorValueClient.java @@ -0,0 +1,64 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.XmlErrorValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class XmlErrorValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final XmlErrorValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of XmlErrorValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + XmlErrorValueClient(XmlErrorValuesImpl serviceClient, Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §1.1 — Contains fields of primitive types along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.XmlErrorValue.get", requestContext, + updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §1.1 — Contains fields of primitive types. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public SimpleModel get() { + return getWithResponse(RequestContext.none()).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithArrayOfModelValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithArrayOfModelValuesImpl.java index 87ef41426e2..933e90f228b 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithArrayOfModelValuesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithArrayOfModelValuesImpl.java @@ -89,7 +89,7 @@ Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains an array of models along with {@link Response}. + * @return §4.1 — Contains an array of models along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) public Response getWithResponse(RequestContext requestContext) { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithAttributesValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithAttributesValuesImpl.java index 2fef01461fc..5a76bf14cfd 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithAttributesValuesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithAttributesValuesImpl.java @@ -89,7 +89,7 @@ Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields that are XML attributes along with {@link Response}. + * @return §5.1 — Contains fields that are XML attributes along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) public Response getWithResponse(RequestContext requestContext) { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithDatetimeValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithDatetimeValuesImpl.java new file mode 100644 index 00000000000..cfc0382ef6b --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithDatetimeValuesImpl.java @@ -0,0 +1,121 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithDatetime; + +/** + * An instance of this class provides access to all the operations defined in ModelWithDatetimeValues. + */ +public final class ModelWithDatetimeValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithDatetimeValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithDatetimeValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithDatetimeValuesImpl(XmlClientImpl client) { + this.service = ModelWithDatetimeValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithDatetimeValues to be used by the proxy service to + * perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithDatetimeValues", host = "{endpoint}") + public interface ModelWithDatetimeValuesService { + static ModelWithDatetimeValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class.forName("payload.xml.implementation.ModelWithDatetimeValuesServiceImpl"); + return (ModelWithDatetimeValuesService) clazz.getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithDatetime", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithDatetime", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithDatetime input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return contains datetime properties with different encodings along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithDatetimeValue.get", requestContext, + updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithDatetime input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithDatetimeValue.put", requestContext, + updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithEnumValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithEnumValuesImpl.java new file mode 100644 index 00000000000..5455261977f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithEnumValuesImpl.java @@ -0,0 +1,121 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithEnum; + +/** + * An instance of this class provides access to all the operations defined in ModelWithEnumValues. + */ +public final class ModelWithEnumValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithEnumValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithEnumValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithEnumValuesImpl(XmlClientImpl client) { + this.service = ModelWithEnumValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithEnumValues to be used by the proxy service to + * perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithEnumValues", host = "{endpoint}") + public interface ModelWithEnumValuesService { + static ModelWithEnumValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class.forName("payload.xml.implementation.ModelWithEnumValuesServiceImpl"); + return (ModelWithEnumValuesService) clazz.getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithEnum", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithEnum", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithEnum input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return contains a single property with an enum value along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithEnumValue.get", requestContext, + updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithEnum input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithEnumValue.put", requestContext, + updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNamespaceOnPropertiesValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNamespaceOnPropertiesValuesImpl.java new file mode 100644 index 00000000000..6954b9b693c --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNamespaceOnPropertiesValuesImpl.java @@ -0,0 +1,124 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithNamespaceOnProperties; + +/** + * An instance of this class provides access to all the operations defined in ModelWithNamespaceOnPropertiesValues. + */ +public final class ModelWithNamespaceOnPropertiesValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithNamespaceOnPropertiesValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithNamespaceOnPropertiesValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithNamespaceOnPropertiesValuesImpl(XmlClientImpl client) { + this.service = ModelWithNamespaceOnPropertiesValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithNamespaceOnPropertiesValues to be used by the proxy + * service to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithNamespaceOnPropertiesValues", host = "{endpoint}") + public interface ModelWithNamespaceOnPropertiesValuesService { + static ModelWithNamespaceOnPropertiesValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz + = Class.forName("payload.xml.implementation.ModelWithNamespaceOnPropertiesValuesServiceImpl"); + return (ModelWithNamespaceOnPropertiesValuesService) clazz + .getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithNamespaceOnProperties", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithNamespaceOnProperties", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithNamespaceOnProperties input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §6.2, §7.2 — Contains fields with different XML namespaces on individual properties along with + * {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNamespaceOnPropertiesValue.get", + requestContext, updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithNamespaceOnProperties input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNamespaceOnPropertiesValue.put", + requestContext, updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNamespaceValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNamespaceValuesImpl.java new file mode 100644 index 00000000000..d92e3a74134 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNamespaceValuesImpl.java @@ -0,0 +1,121 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithNamespace; + +/** + * An instance of this class provides access to all the operations defined in ModelWithNamespaceValues. + */ +public final class ModelWithNamespaceValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithNamespaceValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithNamespaceValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithNamespaceValuesImpl(XmlClientImpl client) { + this.service = ModelWithNamespaceValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithNamespaceValues to be used by the proxy service to + * perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithNamespaceValues", host = "{endpoint}") + public interface ModelWithNamespaceValuesService { + static ModelWithNamespaceValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class.forName("payload.xml.implementation.ModelWithNamespaceValuesServiceImpl"); + return (ModelWithNamespaceValuesService) clazz.getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithNamespace", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithNamespace", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithNamespace input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §6.1, §7.1 — Contains fields with XML namespace on the model along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNamespaceValue.get", requestContext, + updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithNamespace input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNamespaceValue.put", requestContext, + updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNestedModelValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNestedModelValuesImpl.java new file mode 100644 index 00000000000..d8b0049ab67 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNestedModelValuesImpl.java @@ -0,0 +1,121 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithNestedModel; + +/** + * An instance of this class provides access to all the operations defined in ModelWithNestedModelValues. + */ +public final class ModelWithNestedModelValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithNestedModelValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithNestedModelValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithNestedModelValuesImpl(XmlClientImpl client) { + this.service = ModelWithNestedModelValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithNestedModelValues to be used by the proxy service + * to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithNestedModelValues", host = "{endpoint}") + public interface ModelWithNestedModelValuesService { + static ModelWithNestedModelValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class.forName("payload.xml.implementation.ModelWithNestedModelValuesServiceImpl"); + return (ModelWithNestedModelValuesService) clazz.getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithNestedModel", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithNestedModel", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithNestedModel input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §2.1 — Contains a property that references another model along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNestedModelValue.get", requestContext, + updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithNestedModel input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNestedModelValue.put", requestContext, + updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedArraysValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedArraysValuesImpl.java index bbf57985249..1a3d6ebd070 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedArraysValuesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedArraysValuesImpl.java @@ -89,7 +89,7 @@ Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of wrapped and unwrapped arrays of primitive types that have different XML + * @return §3.3, §3.4 — Contains fields of wrapped and unwrapped arrays of primitive types that have different XML * representations along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedAttributeValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedAttributeValuesImpl.java new file mode 100644 index 00000000000..409a8cc4521 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedAttributeValuesImpl.java @@ -0,0 +1,121 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithRenamedAttribute; + +/** + * An instance of this class provides access to all the operations defined in ModelWithRenamedAttributeValues. + */ +public final class ModelWithRenamedAttributeValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithRenamedAttributeValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedAttributeValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithRenamedAttributeValuesImpl(XmlClientImpl client) { + this.service = ModelWithRenamedAttributeValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithRenamedAttributeValues to be used by the proxy + * service to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithRenamedAttributeValues", host = "{endpoint}") + public interface ModelWithRenamedAttributeValuesService { + static ModelWithRenamedAttributeValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class.forName("payload.xml.implementation.ModelWithRenamedAttributeValuesServiceImpl"); + return (ModelWithRenamedAttributeValuesService) clazz.getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithRenamedAttribute", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithRenamedAttribute", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithRenamedAttribute input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §5.2 — Contains a renamed XML attribute along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedAttributeValue.get", + requestContext, updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedAttribute input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedAttributeValue.put", + requestContext, updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedFieldsValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedFieldsValuesImpl.java index 26c6ad661f7..92d4c20b7da 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedFieldsValuesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedFieldsValuesImpl.java @@ -89,7 +89,8 @@ Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of the same type that have different XML representation along with {@link Response}. + * @return §1.3, §2.3 — Contains fields of the same type that have different XML representation along with + * {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) public Response getWithResponse(RequestContext requestContext) { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedNestedModelValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedNestedModelValuesImpl.java new file mode 100644 index 00000000000..d0972aeaf97 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedNestedModelValuesImpl.java @@ -0,0 +1,122 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithRenamedNestedModel; + +/** + * An instance of this class provides access to all the operations defined in ModelWithRenamedNestedModelValues. + */ +public final class ModelWithRenamedNestedModelValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithRenamedNestedModelValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedNestedModelValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithRenamedNestedModelValuesImpl(XmlClientImpl client) { + this.service = ModelWithRenamedNestedModelValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithRenamedNestedModelValues to be used by the proxy + * service to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithRenamedNestedModelValues", host = "{endpoint}") + public interface ModelWithRenamedNestedModelValuesService { + static ModelWithRenamedNestedModelValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz + = Class.forName("payload.xml.implementation.ModelWithRenamedNestedModelValuesServiceImpl"); + return (ModelWithRenamedNestedModelValuesService) clazz.getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithRenamedNestedModel", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithRenamedNestedModel", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithRenamedNestedModel input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §2.2 — Contains a property whose type has along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedNestedModelValue.get", + requestContext, updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedNestedModel input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedNestedModelValue.put", + requestContext, updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedPropertyValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedPropertyValuesImpl.java new file mode 100644 index 00000000000..ecb76372770 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedPropertyValuesImpl.java @@ -0,0 +1,121 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithRenamedProperty; + +/** + * An instance of this class provides access to all the operations defined in ModelWithRenamedPropertyValues. + */ +public final class ModelWithRenamedPropertyValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithRenamedPropertyValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedPropertyValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithRenamedPropertyValuesImpl(XmlClientImpl client) { + this.service = ModelWithRenamedPropertyValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithRenamedPropertyValues to be used by the proxy + * service to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithRenamedPropertyValues", host = "{endpoint}") + public interface ModelWithRenamedPropertyValuesService { + static ModelWithRenamedPropertyValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class.forName("payload.xml.implementation.ModelWithRenamedPropertyValuesServiceImpl"); + return (ModelWithRenamedPropertyValuesService) clazz.getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithRenamedProperty", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithRenamedProperty", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithRenamedProperty input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §1.2 — Contains a scalar property with a custom XML name along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedPropertyValue.get", + requestContext, updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedProperty input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedPropertyValue.put", + requestContext, updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedUnwrappedModelArrayValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedUnwrappedModelArrayValuesImpl.java new file mode 100644 index 00000000000..70b0c0a2dbd --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedUnwrappedModelArrayValuesImpl.java @@ -0,0 +1,123 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithRenamedUnwrappedModelArray; + +/** + * An instance of this class provides access to all the operations defined in ModelWithRenamedUnwrappedModelArrayValues. + */ +public final class ModelWithRenamedUnwrappedModelArrayValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithRenamedUnwrappedModelArrayValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedUnwrappedModelArrayValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithRenamedUnwrappedModelArrayValuesImpl(XmlClientImpl client) { + this.service = ModelWithRenamedUnwrappedModelArrayValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithRenamedUnwrappedModelArrayValues to be used by the + * proxy service to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithRenamedUnwrappedModelArrayValues", host = "{endpoint}") + public interface ModelWithRenamedUnwrappedModelArrayValuesService { + static ModelWithRenamedUnwrappedModelArrayValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz + = Class.forName("payload.xml.implementation.ModelWithRenamedUnwrappedModelArrayValuesServiceImpl"); + return (ModelWithRenamedUnwrappedModelArrayValuesService) clazz + .getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithRenamedUnwrappedModelArray", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithRenamedUnwrappedModelArray", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithRenamedUnwrappedModelArray input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.4 — Contains an unwrapped array of models with a custom item name along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.get", + requestContext, updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedUnwrappedModelArray input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.put", + requestContext, updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedAndItemModelArrayValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedAndItemModelArrayValuesImpl.java new file mode 100644 index 00000000000..25696709af9 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedAndItemModelArrayValuesImpl.java @@ -0,0 +1,126 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithRenamedWrappedAndItemModelArray; + +/** + * An instance of this class provides access to all the operations defined in + * ModelWithRenamedWrappedAndItemModelArrayValues. + */ +public final class ModelWithRenamedWrappedAndItemModelArrayValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithRenamedWrappedAndItemModelArrayValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedWrappedAndItemModelArrayValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithRenamedWrappedAndItemModelArrayValuesImpl(XmlClientImpl client) { + this.service = ModelWithRenamedWrappedAndItemModelArrayValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithRenamedWrappedAndItemModelArrayValues to be used by + * the proxy service to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithRenamedWrappedAndItemModelArrayValues", host = "{endpoint}") + public interface ModelWithRenamedWrappedAndItemModelArrayValuesService { + static ModelWithRenamedWrappedAndItemModelArrayValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class + .forName("payload.xml.implementation.ModelWithRenamedWrappedAndItemModelArrayValuesServiceImpl"); + return (ModelWithRenamedWrappedAndItemModelArrayValuesService) clazz + .getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithRenamedWrappedAndItemModelArray", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithRenamedWrappedAndItemModelArray", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithRenamedWrappedAndItemModelArray input, + RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.5 — Contains a wrapped array of models with custom wrapper and item names along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.get", requestContext, updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedWrappedAndItemModelArray input, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.put", requestContext, updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedModelArrayValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedModelArrayValuesImpl.java new file mode 100644 index 00000000000..f5243db600b --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedModelArrayValuesImpl.java @@ -0,0 +1,123 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithRenamedWrappedModelArray; + +/** + * An instance of this class provides access to all the operations defined in ModelWithRenamedWrappedModelArrayValues. + */ +public final class ModelWithRenamedWrappedModelArrayValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithRenamedWrappedModelArrayValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedWrappedModelArrayValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithRenamedWrappedModelArrayValuesImpl(XmlClientImpl client) { + this.service = ModelWithRenamedWrappedModelArrayValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithRenamedWrappedModelArrayValues to be used by the + * proxy service to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithRenamedWrappedModelArrayValues", host = "{endpoint}") + public interface ModelWithRenamedWrappedModelArrayValuesService { + static ModelWithRenamedWrappedModelArrayValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz + = Class.forName("payload.xml.implementation.ModelWithRenamedWrappedModelArrayValuesServiceImpl"); + return (ModelWithRenamedWrappedModelArrayValuesService) clazz + .getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithRenamedWrappedModelArray", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithRenamedWrappedModelArray", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithRenamedWrappedModelArray input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.3 — Contains a wrapped array of models with a custom wrapper name along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedWrappedModelArrayValue.get", + requestContext, updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedWrappedModelArray input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedWrappedModelArrayValue.put", + requestContext, updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithSimpleArraysValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithSimpleArraysValuesImpl.java index 6aa61a08313..7b6b8734f48 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithSimpleArraysValuesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithSimpleArraysValuesImpl.java @@ -89,7 +89,7 @@ Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of arrays of primitive types along with {@link Response}. + * @return §3.1 — Contains fields of arrays of primitive types along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) public Response getWithResponse(RequestContext requestContext) { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithTextValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithTextValuesImpl.java index 6b6197f02da..6c874932fa8 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithTextValuesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithTextValuesImpl.java @@ -89,7 +89,7 @@ Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains an attribute and text along with {@link Response}. + * @return §8.1 — Contains an attribute and text along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) public Response getWithResponse(RequestContext requestContext) { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedArrayValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedArrayValuesImpl.java index cf0a4a5e998..448d98ceb97 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedArrayValuesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedArrayValuesImpl.java @@ -89,7 +89,7 @@ Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of wrapped and unwrapped arrays of primitive types along with {@link Response}. + * @return §3.2 — Contains fields of wrapped and unwrapped arrays of primitive types along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) public Response getWithResponse(RequestContext requestContext) { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedModelArrayValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedModelArrayValuesImpl.java new file mode 100644 index 00000000000..9dbcdc7f1aa --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedModelArrayValuesImpl.java @@ -0,0 +1,122 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithUnwrappedModelArray; + +/** + * An instance of this class provides access to all the operations defined in ModelWithUnwrappedModelArrayValues. + */ +public final class ModelWithUnwrappedModelArrayValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithUnwrappedModelArrayValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithUnwrappedModelArrayValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithUnwrappedModelArrayValuesImpl(XmlClientImpl client) { + this.service = ModelWithUnwrappedModelArrayValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithUnwrappedModelArrayValues to be used by the proxy + * service to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithUnwrappedModelArrayValues", host = "{endpoint}") + public interface ModelWithUnwrappedModelArrayValuesService { + static ModelWithUnwrappedModelArrayValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz + = Class.forName("payload.xml.implementation.ModelWithUnwrappedModelArrayValuesServiceImpl"); + return (ModelWithUnwrappedModelArrayValuesService) clazz.getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithUnwrappedModelArray", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithUnwrappedModelArray", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithUnwrappedModelArray input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.2 — Contains an unwrapped array of models along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithUnwrappedModelArrayValue.get", + requestContext, updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithUnwrappedModelArray input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithUnwrappedModelArrayValue.put", + requestContext, updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithWrappedPrimitiveCustomItemNamesValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithWrappedPrimitiveCustomItemNamesValuesImpl.java new file mode 100644 index 00000000000..796c5801467 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithWrappedPrimitiveCustomItemNamesValuesImpl.java @@ -0,0 +1,126 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithWrappedPrimitiveCustomItemNames; + +/** + * An instance of this class provides access to all the operations defined in + * ModelWithWrappedPrimitiveCustomItemNamesValues. + */ +public final class ModelWithWrappedPrimitiveCustomItemNamesValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithWrappedPrimitiveCustomItemNamesValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithWrappedPrimitiveCustomItemNamesValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithWrappedPrimitiveCustomItemNamesValuesImpl(XmlClientImpl client) { + this.service = ModelWithWrappedPrimitiveCustomItemNamesValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithWrappedPrimitiveCustomItemNamesValues to be used by + * the proxy service to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithWrappedPrimitiveCustomItemNamesValues", host = "{endpoint}") + public interface ModelWithWrappedPrimitiveCustomItemNamesValuesService { + static ModelWithWrappedPrimitiveCustomItemNamesValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class + .forName("payload.xml.implementation.ModelWithWrappedPrimitiveCustomItemNamesValuesServiceImpl"); + return (ModelWithWrappedPrimitiveCustomItemNamesValuesService) clazz + .getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithWrappedPrimitiveCustomItemNames", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithWrappedPrimitiveCustomItemNames", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithWrappedPrimitiveCustomItemNames input, + RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §3.5 — Contains a wrapped primitive array with custom wrapper and item names along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.get", requestContext, updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithWrappedPrimitiveCustomItemNames input, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.put", requestContext, updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/SimpleModelValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/SimpleModelValuesImpl.java index 4ae27fc8b63..f0fbdbe02f1 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/SimpleModelValuesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/SimpleModelValuesImpl.java @@ -89,7 +89,7 @@ Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of primitive types along with {@link Response}. + * @return §1.1 — Contains fields of primitive types along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) public Response getWithResponse(RequestContext requestContext) { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/XmlClientImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/XmlClientImpl.java index 22e65b09dcb..aab486db195 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/XmlClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/XmlClientImpl.java @@ -64,59 +64,73 @@ public SimpleModelValuesImpl getSimpleModelValues() { } /** - * The ModelWithSimpleArraysValuesImpl object to access its operations. + * The ModelWithRenamedPropertyValuesImpl object to access its operations. */ - private final ModelWithSimpleArraysValuesImpl modelWithSimpleArraysValues; + private final ModelWithRenamedPropertyValuesImpl modelWithRenamedPropertyValues; /** - * Gets the ModelWithSimpleArraysValuesImpl object to access its operations. + * Gets the ModelWithRenamedPropertyValuesImpl object to access its operations. * - * @return the ModelWithSimpleArraysValuesImpl object. + * @return the ModelWithRenamedPropertyValuesImpl object. */ - public ModelWithSimpleArraysValuesImpl getModelWithSimpleArraysValues() { - return this.modelWithSimpleArraysValues; + public ModelWithRenamedPropertyValuesImpl getModelWithRenamedPropertyValues() { + return this.modelWithRenamedPropertyValues; } /** - * The ModelWithArrayOfModelValuesImpl object to access its operations. + * The ModelWithRenamedFieldsValuesImpl object to access its operations. */ - private final ModelWithArrayOfModelValuesImpl modelWithArrayOfModelValues; + private final ModelWithRenamedFieldsValuesImpl modelWithRenamedFieldsValues; /** - * Gets the ModelWithArrayOfModelValuesImpl object to access its operations. + * Gets the ModelWithRenamedFieldsValuesImpl object to access its operations. * - * @return the ModelWithArrayOfModelValuesImpl object. + * @return the ModelWithRenamedFieldsValuesImpl object. */ - public ModelWithArrayOfModelValuesImpl getModelWithArrayOfModelValues() { - return this.modelWithArrayOfModelValues; + public ModelWithRenamedFieldsValuesImpl getModelWithRenamedFieldsValues() { + return this.modelWithRenamedFieldsValues; } /** - * The ModelWithOptionalFieldValuesImpl object to access its operations. + * The ModelWithNestedModelValuesImpl object to access its operations. */ - private final ModelWithOptionalFieldValuesImpl modelWithOptionalFieldValues; + private final ModelWithNestedModelValuesImpl modelWithNestedModelValues; /** - * Gets the ModelWithOptionalFieldValuesImpl object to access its operations. + * Gets the ModelWithNestedModelValuesImpl object to access its operations. * - * @return the ModelWithOptionalFieldValuesImpl object. + * @return the ModelWithNestedModelValuesImpl object. */ - public ModelWithOptionalFieldValuesImpl getModelWithOptionalFieldValues() { - return this.modelWithOptionalFieldValues; + public ModelWithNestedModelValuesImpl getModelWithNestedModelValues() { + return this.modelWithNestedModelValues; } /** - * The ModelWithAttributesValuesImpl object to access its operations. + * The ModelWithRenamedNestedModelValuesImpl object to access its operations. */ - private final ModelWithAttributesValuesImpl modelWithAttributesValues; + private final ModelWithRenamedNestedModelValuesImpl modelWithRenamedNestedModelValues; /** - * Gets the ModelWithAttributesValuesImpl object to access its operations. + * Gets the ModelWithRenamedNestedModelValuesImpl object to access its operations. * - * @return the ModelWithAttributesValuesImpl object. + * @return the ModelWithRenamedNestedModelValuesImpl object. */ - public ModelWithAttributesValuesImpl getModelWithAttributesValues() { - return this.modelWithAttributesValues; + public ModelWithRenamedNestedModelValuesImpl getModelWithRenamedNestedModelValues() { + return this.modelWithRenamedNestedModelValues; + } + + /** + * The ModelWithSimpleArraysValuesImpl object to access its operations. + */ + private final ModelWithSimpleArraysValuesImpl modelWithSimpleArraysValues; + + /** + * Gets the ModelWithSimpleArraysValuesImpl object to access its operations. + * + * @return the ModelWithSimpleArraysValuesImpl object. + */ + public ModelWithSimpleArraysValuesImpl getModelWithSimpleArraysValues() { + return this.modelWithSimpleArraysValues; } /** @@ -148,31 +162,143 @@ public ModelWithRenamedArraysValuesImpl getModelWithRenamedArraysValues() { } /** - * The ModelWithRenamedFieldsValuesImpl object to access its operations. + * The ModelWithWrappedPrimitiveCustomItemNamesValuesImpl object to access its operations. */ - private final ModelWithRenamedFieldsValuesImpl modelWithRenamedFieldsValues; + private final ModelWithWrappedPrimitiveCustomItemNamesValuesImpl modelWithWrappedPrimitiveCustomItemNamesValues; /** - * Gets the ModelWithRenamedFieldsValuesImpl object to access its operations. + * Gets the ModelWithWrappedPrimitiveCustomItemNamesValuesImpl object to access its operations. * - * @return the ModelWithRenamedFieldsValuesImpl object. + * @return the ModelWithWrappedPrimitiveCustomItemNamesValuesImpl object. */ - public ModelWithRenamedFieldsValuesImpl getModelWithRenamedFieldsValues() { - return this.modelWithRenamedFieldsValues; + public ModelWithWrappedPrimitiveCustomItemNamesValuesImpl getModelWithWrappedPrimitiveCustomItemNamesValues() { + return this.modelWithWrappedPrimitiveCustomItemNamesValues; } /** - * The ModelWithEmptyArrayValuesImpl object to access its operations. + * The ModelWithArrayOfModelValuesImpl object to access its operations. */ - private final ModelWithEmptyArrayValuesImpl modelWithEmptyArrayValues; + private final ModelWithArrayOfModelValuesImpl modelWithArrayOfModelValues; /** - * Gets the ModelWithEmptyArrayValuesImpl object to access its operations. + * Gets the ModelWithArrayOfModelValuesImpl object to access its operations. * - * @return the ModelWithEmptyArrayValuesImpl object. + * @return the ModelWithArrayOfModelValuesImpl object. */ - public ModelWithEmptyArrayValuesImpl getModelWithEmptyArrayValues() { - return this.modelWithEmptyArrayValues; + public ModelWithArrayOfModelValuesImpl getModelWithArrayOfModelValues() { + return this.modelWithArrayOfModelValues; + } + + /** + * The ModelWithUnwrappedModelArrayValuesImpl object to access its operations. + */ + private final ModelWithUnwrappedModelArrayValuesImpl modelWithUnwrappedModelArrayValues; + + /** + * Gets the ModelWithUnwrappedModelArrayValuesImpl object to access its operations. + * + * @return the ModelWithUnwrappedModelArrayValuesImpl object. + */ + public ModelWithUnwrappedModelArrayValuesImpl getModelWithUnwrappedModelArrayValues() { + return this.modelWithUnwrappedModelArrayValues; + } + + /** + * The ModelWithRenamedWrappedModelArrayValuesImpl object to access its operations. + */ + private final ModelWithRenamedWrappedModelArrayValuesImpl modelWithRenamedWrappedModelArrayValues; + + /** + * Gets the ModelWithRenamedWrappedModelArrayValuesImpl object to access its operations. + * + * @return the ModelWithRenamedWrappedModelArrayValuesImpl object. + */ + public ModelWithRenamedWrappedModelArrayValuesImpl getModelWithRenamedWrappedModelArrayValues() { + return this.modelWithRenamedWrappedModelArrayValues; + } + + /** + * The ModelWithRenamedUnwrappedModelArrayValuesImpl object to access its operations. + */ + private final ModelWithRenamedUnwrappedModelArrayValuesImpl modelWithRenamedUnwrappedModelArrayValues; + + /** + * Gets the ModelWithRenamedUnwrappedModelArrayValuesImpl object to access its operations. + * + * @return the ModelWithRenamedUnwrappedModelArrayValuesImpl object. + */ + public ModelWithRenamedUnwrappedModelArrayValuesImpl getModelWithRenamedUnwrappedModelArrayValues() { + return this.modelWithRenamedUnwrappedModelArrayValues; + } + + /** + * The ModelWithRenamedWrappedAndItemModelArrayValuesImpl object to access its operations. + */ + private final ModelWithRenamedWrappedAndItemModelArrayValuesImpl modelWithRenamedWrappedAndItemModelArrayValues; + + /** + * Gets the ModelWithRenamedWrappedAndItemModelArrayValuesImpl object to access its operations. + * + * @return the ModelWithRenamedWrappedAndItemModelArrayValuesImpl object. + */ + public ModelWithRenamedWrappedAndItemModelArrayValuesImpl getModelWithRenamedWrappedAndItemModelArrayValues() { + return this.modelWithRenamedWrappedAndItemModelArrayValues; + } + + /** + * The ModelWithAttributesValuesImpl object to access its operations. + */ + private final ModelWithAttributesValuesImpl modelWithAttributesValues; + + /** + * Gets the ModelWithAttributesValuesImpl object to access its operations. + * + * @return the ModelWithAttributesValuesImpl object. + */ + public ModelWithAttributesValuesImpl getModelWithAttributesValues() { + return this.modelWithAttributesValues; + } + + /** + * The ModelWithRenamedAttributeValuesImpl object to access its operations. + */ + private final ModelWithRenamedAttributeValuesImpl modelWithRenamedAttributeValues; + + /** + * Gets the ModelWithRenamedAttributeValuesImpl object to access its operations. + * + * @return the ModelWithRenamedAttributeValuesImpl object. + */ + public ModelWithRenamedAttributeValuesImpl getModelWithRenamedAttributeValues() { + return this.modelWithRenamedAttributeValues; + } + + /** + * The ModelWithNamespaceValuesImpl object to access its operations. + */ + private final ModelWithNamespaceValuesImpl modelWithNamespaceValues; + + /** + * Gets the ModelWithNamespaceValuesImpl object to access its operations. + * + * @return the ModelWithNamespaceValuesImpl object. + */ + public ModelWithNamespaceValuesImpl getModelWithNamespaceValues() { + return this.modelWithNamespaceValues; + } + + /** + * The ModelWithNamespaceOnPropertiesValuesImpl object to access its operations. + */ + private final ModelWithNamespaceOnPropertiesValuesImpl modelWithNamespaceOnPropertiesValues; + + /** + * Gets the ModelWithNamespaceOnPropertiesValuesImpl object to access its operations. + * + * @return the ModelWithNamespaceOnPropertiesValuesImpl object. + */ + public ModelWithNamespaceOnPropertiesValuesImpl getModelWithNamespaceOnPropertiesValues() { + return this.modelWithNamespaceOnPropertiesValues; } /** @@ -189,6 +315,34 @@ public ModelWithTextValuesImpl getModelWithTextValues() { return this.modelWithTextValues; } + /** + * The ModelWithOptionalFieldValuesImpl object to access its operations. + */ + private final ModelWithOptionalFieldValuesImpl modelWithOptionalFieldValues; + + /** + * Gets the ModelWithOptionalFieldValuesImpl object to access its operations. + * + * @return the ModelWithOptionalFieldValuesImpl object. + */ + public ModelWithOptionalFieldValuesImpl getModelWithOptionalFieldValues() { + return this.modelWithOptionalFieldValues; + } + + /** + * The ModelWithEmptyArrayValuesImpl object to access its operations. + */ + private final ModelWithEmptyArrayValuesImpl modelWithEmptyArrayValues; + + /** + * Gets the ModelWithEmptyArrayValuesImpl object to access its operations. + * + * @return the ModelWithEmptyArrayValuesImpl object. + */ + public ModelWithEmptyArrayValuesImpl getModelWithEmptyArrayValues() { + return this.modelWithEmptyArrayValues; + } + /** * The ModelWithDictionaryValuesImpl object to access its operations. */ @@ -217,6 +371,48 @@ public ModelWithEncodedNamesValuesImpl getModelWithEncodedNamesValues() { return this.modelWithEncodedNamesValues; } + /** + * The ModelWithEnumValuesImpl object to access its operations. + */ + private final ModelWithEnumValuesImpl modelWithEnumValues; + + /** + * Gets the ModelWithEnumValuesImpl object to access its operations. + * + * @return the ModelWithEnumValuesImpl object. + */ + public ModelWithEnumValuesImpl getModelWithEnumValues() { + return this.modelWithEnumValues; + } + + /** + * The ModelWithDatetimeValuesImpl object to access its operations. + */ + private final ModelWithDatetimeValuesImpl modelWithDatetimeValues; + + /** + * Gets the ModelWithDatetimeValuesImpl object to access its operations. + * + * @return the ModelWithDatetimeValuesImpl object. + */ + public ModelWithDatetimeValuesImpl getModelWithDatetimeValues() { + return this.modelWithDatetimeValues; + } + + /** + * The XmlErrorValuesImpl object to access its operations. + */ + private final XmlErrorValuesImpl xmlErrorValues; + + /** + * Gets the XmlErrorValuesImpl object to access its operations. + * + * @return the XmlErrorValuesImpl object. + */ + public XmlErrorValuesImpl getXmlErrorValues() { + return this.xmlErrorValues; + } + /** * Initializes an instance of XmlClient client. * @@ -229,16 +425,32 @@ public XmlClientImpl(HttpPipeline httpPipeline, Instrumentation instrumentation, this.instrumentation = instrumentation; this.endpoint = endpoint; this.simpleModelValues = new SimpleModelValuesImpl(this); + this.modelWithRenamedPropertyValues = new ModelWithRenamedPropertyValuesImpl(this); + this.modelWithRenamedFieldsValues = new ModelWithRenamedFieldsValuesImpl(this); + this.modelWithNestedModelValues = new ModelWithNestedModelValuesImpl(this); + this.modelWithRenamedNestedModelValues = new ModelWithRenamedNestedModelValuesImpl(this); this.modelWithSimpleArraysValues = new ModelWithSimpleArraysValuesImpl(this); - this.modelWithArrayOfModelValues = new ModelWithArrayOfModelValuesImpl(this); - this.modelWithOptionalFieldValues = new ModelWithOptionalFieldValuesImpl(this); - this.modelWithAttributesValues = new ModelWithAttributesValuesImpl(this); this.modelWithUnwrappedArrayValues = new ModelWithUnwrappedArrayValuesImpl(this); this.modelWithRenamedArraysValues = new ModelWithRenamedArraysValuesImpl(this); - this.modelWithRenamedFieldsValues = new ModelWithRenamedFieldsValuesImpl(this); - this.modelWithEmptyArrayValues = new ModelWithEmptyArrayValuesImpl(this); + this.modelWithWrappedPrimitiveCustomItemNamesValues + = new ModelWithWrappedPrimitiveCustomItemNamesValuesImpl(this); + this.modelWithArrayOfModelValues = new ModelWithArrayOfModelValuesImpl(this); + this.modelWithUnwrappedModelArrayValues = new ModelWithUnwrappedModelArrayValuesImpl(this); + this.modelWithRenamedWrappedModelArrayValues = new ModelWithRenamedWrappedModelArrayValuesImpl(this); + this.modelWithRenamedUnwrappedModelArrayValues = new ModelWithRenamedUnwrappedModelArrayValuesImpl(this); + this.modelWithRenamedWrappedAndItemModelArrayValues + = new ModelWithRenamedWrappedAndItemModelArrayValuesImpl(this); + this.modelWithAttributesValues = new ModelWithAttributesValuesImpl(this); + this.modelWithRenamedAttributeValues = new ModelWithRenamedAttributeValuesImpl(this); + this.modelWithNamespaceValues = new ModelWithNamespaceValuesImpl(this); + this.modelWithNamespaceOnPropertiesValues = new ModelWithNamespaceOnPropertiesValuesImpl(this); this.modelWithTextValues = new ModelWithTextValuesImpl(this); + this.modelWithOptionalFieldValues = new ModelWithOptionalFieldValuesImpl(this); + this.modelWithEmptyArrayValues = new ModelWithEmptyArrayValuesImpl(this); this.modelWithDictionaryValues = new ModelWithDictionaryValuesImpl(this); this.modelWithEncodedNamesValues = new ModelWithEncodedNamesValuesImpl(this); + this.modelWithEnumValues = new ModelWithEnumValuesImpl(this); + this.modelWithDatetimeValues = new ModelWithDatetimeValuesImpl(this); + this.xmlErrorValues = new XmlErrorValuesImpl(this); } } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/XmlErrorValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/XmlErrorValuesImpl.java new file mode 100644 index 00000000000..78d41aa2ed9 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/XmlErrorValuesImpl.java @@ -0,0 +1,92 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.SimpleModel; +import payload.xml.XmlErrorBody; + +/** + * An instance of this class provides access to all the operations defined in XmlErrorValues. + */ +public final class XmlErrorValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final XmlErrorValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of XmlErrorValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + XmlErrorValuesImpl(XmlClientImpl client) { + this.service = XmlErrorValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientXmlErrorValues to be used by the proxy service to perform + * REST calls. + */ + @ServiceInterface(name = "XmlClientXmlErrorValues", host = "{endpoint}") + public interface XmlErrorValuesService { + static XmlErrorValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class.forName("payload.xml.implementation.XmlErrorValuesServiceImpl"); + return (XmlErrorValuesService) clazz.getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation(method = HttpMethod.GET, path = "/payload/xml/error", expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail(statusCode = { 400 }, exceptionBodyClass = XmlErrorBody.class) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §1.1 — Contains fields of primitive types along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.XmlErrorValue.get", requestContext, + updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/ExtensibleStringsClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/ExtensibleStringsClient.java new file mode 100644 index 00000000000..db4f4aabd98 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/ExtensibleStringsClient.java @@ -0,0 +1,71 @@ +package specialwords; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import specialwords.extensiblestrings.ExtensibleString; +import specialwords.implementation.ExtensibleStringsImpl; + +/** + * Initializes a new instance of the synchronous SpecialWordsClient type. + */ +@ServiceClient(builder = SpecialWordsClientBuilder.class) +public final class ExtensibleStringsClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ExtensibleStringsImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ExtensibleStringsClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ExtensibleStringsClient(ExtensibleStringsImpl serviceClient, Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The putExtensibleStringValue operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return verify enum member names that are special words using extensible enum (union) along with + * {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putExtensibleStringValueWithResponse(ExtensibleString body, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("SpecialWords.ExtensibleStrings.putExtensibleStringValue", + requestContext, + updatedContext -> this.serviceClient.putExtensibleStringValueWithResponse(body, updatedContext)); + } + + /** + * The putExtensibleStringValue operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return verify enum member names that are special words using extensible enum (union). + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ExtensibleString putExtensibleStringValue(ExtensibleString body) { + return putExtensibleStringValueWithResponse(body, RequestContext.none()).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/SpecialWordsClientBuilder.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/SpecialWordsClientBuilder.java index a33fb43e6b6..10709dd4f15 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/SpecialWordsClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/SpecialWordsClientBuilder.java @@ -35,6 +35,7 @@ serviceClients = { ModelsClient.class, ModelPropertiesClient.class, + ExtensibleStringsClient.class, OperationsClient.class, ParametersClient.class }) public final class SpecialWordsClientBuilder @@ -251,6 +252,17 @@ public ModelPropertiesClient buildModelPropertiesClient() { return new ModelPropertiesClient(innerClient.getModelProperties(), innerClient.getInstrumentation()); } + /** + * Builds an instance of ExtensibleStringsClient class. + * + * @return an instance of ExtensibleStringsClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ExtensibleStringsClient buildExtensibleStringsClient() { + SpecialWordsClientImpl innerClient = buildInnerClient(); + return new ExtensibleStringsClient(innerClient.getExtensibleStrings(), innerClient.getInstrumentation()); + } + /** * Builds an instance of OperationsClient class. * diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/extensiblestrings/ExtensibleString.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/extensiblestrings/ExtensibleString.java new file mode 100644 index 00000000000..2e22657b438 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/extensiblestrings/ExtensibleString.java @@ -0,0 +1,314 @@ +package specialwords.extensiblestrings; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.json.JsonReader; +import io.clientcore.core.serialization.json.JsonSerializable; +import io.clientcore.core.serialization.json.JsonToken; +import io.clientcore.core.serialization.json.JsonWriter; +import io.clientcore.core.utils.ExpandableEnum; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; + +/** + * Verify enum member names that are special words using extensible enum (union). + */ +public final class ExtensibleString implements ExpandableEnum, JsonSerializable { + private static final Map VALUES = new ConcurrentHashMap<>(); + + private static final Function NEW_INSTANCE = ExtensibleString::new; + + /** + * Static value and for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString AND = fromValue("and"); + + /** + * Static value as for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString AS = fromValue("as"); + + /** + * Static value assert for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString ASSERT = fromValue("assert"); + + /** + * Static value async for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString ASYNC = fromValue("async"); + + /** + * Static value await for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString AWAIT = fromValue("await"); + + /** + * Static value break for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString BREAK = fromValue("break"); + + /** + * Static value class for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString CLASS = fromValue("class"); + + /** + * Static value constructor for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString CONSTRUCTOR = fromValue("constructor"); + + /** + * Static value continue for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString CONTINUE = fromValue("continue"); + + /** + * Static value def for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString DEF = fromValue("def"); + + /** + * Static value del for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString DEL = fromValue("del"); + + /** + * Static value elif for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString ELIF = fromValue("elif"); + + /** + * Static value else for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString ELSE = fromValue("else"); + + /** + * Static value except for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString EXCEPT = fromValue("except"); + + /** + * Static value exec for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString EXEC = fromValue("exec"); + + /** + * Static value finally for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString FINALLY = fromValue("finally"); + + /** + * Static value for for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString FOR = fromValue("for"); + + /** + * Static value from for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString FROM = fromValue("from"); + + /** + * Static value global for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString GLOBAL = fromValue("global"); + + /** + * Static value if for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString IF = fromValue("if"); + + /** + * Static value import for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString IMPORT = fromValue("import"); + + /** + * Static value in for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString IN = fromValue("in"); + + /** + * Static value is for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString IS = fromValue("is"); + + /** + * Static value lambda for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString LAMBDA = fromValue("lambda"); + + /** + * Static value not for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString NOT = fromValue("not"); + + /** + * Static value or for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString OR = fromValue("or"); + + /** + * Static value pass for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString PASS = fromValue("pass"); + + /** + * Static value raise for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString RAISE = fromValue("raise"); + + /** + * Static value return for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString RETURN = fromValue("return"); + + /** + * Static value try for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString TRY = fromValue("try"); + + /** + * Static value while for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString WHILE = fromValue("while"); + + /** + * Static value with for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString WITH = fromValue("with"); + + /** + * Static value yield for ExtensibleString. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static final ExtensibleString YIELD = fromValue("yield"); + + private final String value; + + private ExtensibleString(String value) { + this.value = value; + } + + /** + * Creates or finds a ExtensibleString. + * + * @param value a value to look for. + * @return the corresponding ExtensibleString. + * @throws IllegalArgumentException if value is null. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ExtensibleString fromValue(String value) { + if (value == null) { + throw new IllegalArgumentException("'value' cannot be null."); + } + return VALUES.computeIfAbsent(value, NEW_INSTANCE); + } + + /** + * Gets known ExtensibleString values. + * + * @return Known ExtensibleString values. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static Collection values() { + return new ArrayList<>(VALUES.values()); + } + + /** + * Gets the value of the ExtensibleString instance. + * + * @return the value of the ExtensibleString instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public String getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + return jsonWriter.writeString(getValue()); + } + + /** + * Reads an instance of ExtensibleString from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ExtensibleString if the JsonReader was pointing to an instance of it, or null if the + * JsonReader was pointing to JSON null. + * @throws IOException If an error occurs while reading the ExtensibleString. + * @throws IllegalStateException If unexpected JSON token is found. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ExtensibleString fromJson(JsonReader jsonReader) throws IOException { + JsonToken nextToken = jsonReader.nextToken(); + if (nextToken == JsonToken.NULL) { + return null; + } + if (nextToken != JsonToken.STRING) { + throw new IllegalStateException( + String.format("Unexpected JSON token for %s deserialization: %s", JsonToken.STRING, nextToken)); + } + return ExtensibleString.fromValue(jsonReader.getString()); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public String toString() { + return Objects.toString(this.value); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public boolean equals(Object obj) { + return this == obj; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public int hashCode() { + return Objects.hashCode(this.value); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/extensiblestrings/package-info.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/extensiblestrings/package-info.java new file mode 100644 index 00000000000..c376a9c3a3c --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/extensiblestrings/package-info.java @@ -0,0 +1,43 @@ +/** + * Package containing the data models for SpecialWords. + * Scenarios to verify that reserved words can be used in service and generators will handle it appropriately. + * + * Current list of special words + * ```txt + * and + * as + * assert + * async + * await + * break + * class + * constructor + * continue + * def + * del + * elif + * else + * except + * exec + * finally + * for + * from + * global + * if + * import + * in + * is + * lambda + * list + * not + * or + * pass + * raise + * return + * try + * while + * with + * yield + * ```. + */ +package specialwords.extensiblestrings; diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/implementation/ExtensibleStringsImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/implementation/ExtensibleStringsImpl.java new file mode 100644 index 00000000000..5443917a20c --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/implementation/ExtensibleStringsImpl.java @@ -0,0 +1,100 @@ +package specialwords.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import specialwords.extensiblestrings.ExtensibleString; + +/** + * An instance of this class provides access to all the operations defined in ExtensibleStrings. + */ +public final class ExtensibleStringsImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ExtensibleStringsService service; + + /** + * The service client containing this operation class. + */ + private final SpecialWordsClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ExtensibleStringsImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ExtensibleStringsImpl(SpecialWordsClientImpl client) { + this.service = ExtensibleStringsService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for SpecialWordsClientExtensibleStrings to be used by the proxy service + * to perform REST calls. + */ + @ServiceInterface(name = "SpecialWordsClientExtensibleStrings", host = "{endpoint}") + public interface ExtensibleStringsService { + static ExtensibleStringsService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class.forName("specialwords.implementation.ExtensibleStringsServiceImpl"); + return (ExtensibleStringsService) clazz.getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/special-words/extensible-strings/string", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response putExtensibleStringValue(@HostParam("endpoint") String endpoint, + @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") ExtensibleString body, RequestContext requestContext); + } + + /** + * The putExtensibleStringValue operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return verify enum member names that are special words using extensible enum (union) along with + * {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putExtensibleStringValueWithResponse(ExtensibleString body, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("SpecialWords.ExtensibleStrings.putExtensibleStringValue", + requestContext, updatedContext -> { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.putExtensibleStringValue(this.client.getEndpoint(), contentType, accept, body, + updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/implementation/SpecialWordsClientImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/implementation/SpecialWordsClientImpl.java index 22e2c1f3e5e..b793f324cf7 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/implementation/SpecialWordsClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/specialwords/implementation/SpecialWordsClientImpl.java @@ -77,6 +77,20 @@ public ModelPropertiesImpl getModelProperties() { return this.modelProperties; } + /** + * The ExtensibleStringsImpl object to access its operations. + */ + private final ExtensibleStringsImpl extensibleStrings; + + /** + * Gets the ExtensibleStringsImpl object to access its operations. + * + * @return the ExtensibleStringsImpl object. + */ + public ExtensibleStringsImpl getExtensibleStrings() { + return this.extensibleStrings; + } + /** * The OperationsImpl object to access its operations. */ @@ -118,6 +132,7 @@ public SpecialWordsClientImpl(HttpPipeline httpPipeline, Instrumentation instrum this.endpoint = endpoint; this.models = new ModelsImpl(this); this.modelProperties = new ModelPropertiesImpl(this); + this.extensibleStrings = new ExtensibleStringsImpl(this); this.operations = new OperationsImpl(this); this.parameters = new ParametersImpl(this); } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/DownloadFileMultipleContentTypesContentType.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/DownloadFileMultipleContentTypesContentType.java new file mode 100644 index 00000000000..2f1d4a2a657 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/DownloadFileMultipleContentTypesContentType.java @@ -0,0 +1,52 @@ +package type.file; + +/** + * Defines values for DownloadFileMultipleContentTypesContentType. + */ +public enum DownloadFileMultipleContentTypesContentType { + /** + * Enum value image/png. + */ + IMAGE_PNG("image/png"), + + /** + * Enum value image/jpeg. + */ + IMAGE_JPEG("image/jpeg"); + + /** + * The actual serialized value for a DownloadFileMultipleContentTypesContentType instance. + */ + private final String value; + + DownloadFileMultipleContentTypesContentType(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a DownloadFileMultipleContentTypesContentType instance. + * + * @param value the serialized value to parse. + * @return the parsed DownloadFileMultipleContentTypesContentType object, or null if unable to parse. + */ + public static DownloadFileMultipleContentTypesContentType fromString(String value) { + if (value == null) { + return null; + } + DownloadFileMultipleContentTypesContentType[] items = DownloadFileMultipleContentTypesContentType.values(); + for (DownloadFileMultipleContentTypesContentType item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.value; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/FileClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/FileClient.java new file mode 100644 index 00000000000..12037753ba9 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/FileClient.java @@ -0,0 +1,303 @@ +package type.file; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import io.clientcore.core.models.binarydata.BinaryData; +import type.file.implementation.BodiesImpl; + +/** + * Initializes a new instance of the synchronous FileClient type. + */ +@ServiceClient(builder = FileClientBuilder.class) +public final class FileClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final BodiesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of FileClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + FileClient(BodiesImpl serviceClient, Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The uploadFileSpecificContentType operation. + * + * @param file The file parameter. + * @param contentLength The Content-Length header for the request. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileSpecificContentTypeWithResponse(BinaryData file, long contentLength, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Type.File.Body.uploadFileSpecificContentType", + requestContext, updatedContext -> this.serviceClient.uploadFileSpecificContentTypeWithResponse(file, + contentLength, updatedContext)); + } + + /** + * The uploadFileSpecificContentType operation. + * + * @param file The file parameter. + * @param contentLength The Content-Length header for the request. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void uploadFileSpecificContentType(BinaryData file, long contentLength) { + uploadFileSpecificContentTypeWithResponse(file, contentLength, RequestContext.none()); + } + + /** + * The uploadFileJsonContentType operation. + * + * @param file The file parameter. + * @param contentLength The Content-Length header for the request. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileJsonContentTypeWithResponse(BinaryData file, long contentLength, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Type.File.Body.uploadFileJsonContentType", requestContext, + updatedContext -> this.serviceClient.uploadFileJsonContentTypeWithResponse(file, contentLength, + updatedContext)); + } + + /** + * The uploadFileJsonContentType operation. + * + * @param file The file parameter. + * @param contentLength The Content-Length header for the request. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void uploadFileJsonContentType(BinaryData file, long contentLength) { + uploadFileJsonContentTypeWithResponse(file, contentLength, RequestContext.none()); + } + + /** + * The downloadFileJsonContentType operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response downloadFileJsonContentTypeWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Type.File.Body.downloadFileJsonContentType", requestContext, + updatedContext -> this.serviceClient.downloadFileJsonContentTypeWithResponse(updatedContext)); + } + + /** + * The downloadFileJsonContentType operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public BinaryData downloadFileJsonContentType() { + return downloadFileJsonContentTypeWithResponse(RequestContext.none()).getValue(); + } + + /** + * The downloadFileSpecificContentType operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response downloadFileSpecificContentTypeWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Type.File.Body.downloadFileSpecificContentType", + requestContext, + updatedContext -> this.serviceClient.downloadFileSpecificContentTypeWithResponse(updatedContext)); + } + + /** + * The downloadFileSpecificContentType operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public BinaryData downloadFileSpecificContentType() { + return downloadFileSpecificContentTypeWithResponse(RequestContext.none()).getValue(); + } + + /** + * The uploadFileMultipleContentTypes operation. + * + * @param contentType Body parameter's content type. Known values are image/png,image/jpeg. + * @param file The file parameter. + * @param contentLength The Content-Length header for the request. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileMultipleContentTypesWithResponse( + UploadFileMultipleContentTypesContentType contentType, BinaryData file, long contentLength, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Type.File.Body.uploadFileMultipleContentTypes", + requestContext, updatedContext -> this.serviceClient.uploadFileMultipleContentTypesWithResponse(contentType, + file, contentLength, updatedContext)); + } + + /** + * The uploadFileMultipleContentTypes operation. + * + * @param contentType Body parameter's content type. Known values are image/png,image/jpeg. + * @param file The file parameter. + * @param contentLength The Content-Length header for the request. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void uploadFileMultipleContentTypes(UploadFileMultipleContentTypesContentType contentType, BinaryData file, + long contentLength) { + uploadFileMultipleContentTypesWithResponse(contentType, file, contentLength, RequestContext.none()); + } + + /** + * The downloadFileMultipleContentTypes operation. + * + * @param accept The accept parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response downloadFileMultipleContentTypesWithResponse( + DownloadFileMultipleContentTypesContentType accept, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Type.File.Body.downloadFileMultipleContentTypes", + requestContext, + updatedContext -> this.serviceClient.downloadFileMultipleContentTypesWithResponse(accept, updatedContext)); + } + + /** + * The downloadFileMultipleContentTypes operation. + * + * @param accept The accept parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public BinaryData downloadFileMultipleContentTypes(DownloadFileMultipleContentTypesContentType accept) { + return downloadFileMultipleContentTypesWithResponse(accept, RequestContext.none()).getValue(); + } + + /** + * The uploadFileDefaultContentType operation. + * + * @param file The file parameter. + * @param contentLength The Content-Length header for the request. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileDefaultContentTypeWithResponse(BinaryData file, long contentLength, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Type.File.Body.uploadFileDefaultContentType", + requestContext, updatedContext -> this.serviceClient.uploadFileDefaultContentTypeWithResponse(file, + contentLength, updatedContext)); + } + + /** + * The uploadFileDefaultContentType operation. + * + * @param file The file parameter. + * @param contentLength The Content-Length header for the request. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void uploadFileDefaultContentType(BinaryData file, long contentLength) { + uploadFileDefaultContentTypeWithResponse(file, contentLength, RequestContext.none()); + } + + /** + * The downloadFileDefaultContentType operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response downloadFileDefaultContentTypeWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Type.File.Body.downloadFileDefaultContentType", + requestContext, + updatedContext -> this.serviceClient.downloadFileDefaultContentTypeWithResponse(updatedContext)); + } + + /** + * The downloadFileDefaultContentType operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public BinaryData downloadFileDefaultContentType() { + return downloadFileDefaultContentTypeWithResponse(RequestContext.none()).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/FileClientBuilder.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/FileClientBuilder.java new file mode 100644 index 00000000000..4499e4f8ac7 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/FileClientBuilder.java @@ -0,0 +1,235 @@ +package type.file; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ServiceClientBuilder; +import io.clientcore.core.http.client.HttpClient; +import io.clientcore.core.http.models.ProxyOptions; +import io.clientcore.core.http.pipeline.HttpInstrumentationOptions; +import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.http.pipeline.HttpPipelineBuilder; +import io.clientcore.core.http.pipeline.HttpPipelinePolicy; +import io.clientcore.core.http.pipeline.HttpRedirectOptions; +import io.clientcore.core.http.pipeline.HttpRedirectPolicy; +import io.clientcore.core.http.pipeline.HttpRetryOptions; +import io.clientcore.core.http.pipeline.HttpRetryPolicy; +import io.clientcore.core.instrumentation.Instrumentation; +import io.clientcore.core.instrumentation.SdkInstrumentationOptions; +import io.clientcore.core.traits.ConfigurationTrait; +import io.clientcore.core.traits.EndpointTrait; +import io.clientcore.core.traits.HttpTrait; +import io.clientcore.core.traits.ProxyTrait; +import io.clientcore.core.utils.CoreUtils; +import io.clientcore.core.utils.configuration.Configuration; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import type.file.implementation.FileClientImpl; + +/** + * A builder for creating a new instance of the FileClient type. + */ +@ServiceClientBuilder(serviceClients = { FileClient.class }) +public final class FileClientBuilder implements HttpTrait, ProxyTrait, + ConfigurationTrait, EndpointTrait { + @Metadata(properties = { MetadataProperties.GENERATED }) + private static final String SDK_NAME = "name"; + + @Metadata(properties = { MetadataProperties.GENERATED }) + private static final String SDK_VERSION = "version"; + + @Metadata(properties = { MetadataProperties.GENERATED }) + private static final Map PROPERTIES = CoreUtils.getProperties("type-file.properties"); + + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List pipelinePolicies; + + /** + * Create an instance of the FileClientBuilder. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public FileClientBuilder() { + this.pipelinePolicies = new ArrayList<>(); + } + + /* + * The HTTP client used to send the request. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private HttpClient httpClient; + + /** + * {@inheritDoc}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public FileClientBuilder httpClient(HttpClient httpClient) { + this.httpClient = httpClient; + return this; + } + + /* + * The retry options to configure retry policy for failed requests. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private HttpRetryOptions retryOptions; + + /** + * {@inheritDoc}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public FileClientBuilder httpRetryOptions(HttpRetryOptions retryOptions) { + this.retryOptions = retryOptions; + return this; + } + + /** + * {@inheritDoc}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public FileClientBuilder addHttpPipelinePolicy(HttpPipelinePolicy customPolicy) { + Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); + pipelinePolicies.add(customPolicy); + return this; + } + + /* + * The redirect options to configure redirect policy + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private HttpRedirectOptions redirectOptions; + + /** + * {@inheritDoc}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public FileClientBuilder httpRedirectOptions(HttpRedirectOptions redirectOptions) { + this.redirectOptions = redirectOptions; + return this; + } + + /* + * The instrumentation configuration for HTTP requests and responses. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private HttpInstrumentationOptions httpInstrumentationOptions; + + /** + * {@inheritDoc}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public FileClientBuilder httpInstrumentationOptions(HttpInstrumentationOptions httpInstrumentationOptions) { + this.httpInstrumentationOptions = httpInstrumentationOptions; + return this; + } + + /* + * The proxy options used during construction of the service client. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private ProxyOptions proxyOptions; + + /** + * {@inheritDoc}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public FileClientBuilder proxyOptions(ProxyOptions proxyOptions) { + this.proxyOptions = proxyOptions; + return this; + } + + /* + * The configuration store that is used during construction of the service client. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private Configuration configuration; + + /** + * {@inheritDoc}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public FileClientBuilder configuration(Configuration configuration) { + this.configuration = configuration; + return this; + } + + /* + * The service endpoint + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private String endpoint; + + /** + * {@inheritDoc}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public FileClientBuilder endpoint(String endpoint) { + this.endpoint = endpoint; + return this; + } + + /** + * Builds an instance of FileClientImpl with the provided parameters. + * + * @return an instance of FileClientImpl. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private FileClientImpl buildInnerClient() { + this.validateClient(); + String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000"; + HttpInstrumentationOptions localHttpInstrumentationOptions = this.httpInstrumentationOptions == null + ? new HttpInstrumentationOptions() + : this.httpInstrumentationOptions; + SdkInstrumentationOptions sdkInstrumentationOptions + = new SdkInstrumentationOptions(PROPERTIES.getOrDefault(SDK_NAME, "UnknownName")) + .setSdkVersion(PROPERTIES.get(SDK_VERSION)) + .setEndpoint(localEndpoint); + Instrumentation instrumentation + = Instrumentation.create(localHttpInstrumentationOptions, sdkInstrumentationOptions); + FileClientImpl client = new FileClientImpl(createHttpPipeline(), instrumentation, localEndpoint); + return client; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + private void validateClient() { + // This method is invoked from 'buildInnerClient'/'buildClient' method. + // Developer can customize this method, to validate that the necessary conditions are met for the new client. + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + private HttpPipeline createHttpPipeline() { + Configuration buildConfiguration + = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; + HttpInstrumentationOptions localHttpInstrumentationOptions = this.httpInstrumentationOptions == null + ? new HttpInstrumentationOptions() + : this.httpInstrumentationOptions; + HttpPipelineBuilder httpPipelineBuilder = new HttpPipelineBuilder(); + List policies = new ArrayList<>(); + policies.add(redirectOptions == null ? new HttpRedirectPolicy() : new HttpRedirectPolicy(redirectOptions)); + policies.add(retryOptions == null ? new HttpRetryPolicy() : new HttpRetryPolicy(retryOptions)); + this.pipelinePolicies.stream().forEach(p -> policies.add(p)); + policies.add(new HttpInstrumentationPolicy(localHttpInstrumentationOptions)); + policies.forEach(httpPipelineBuilder::addPolicy); + return httpPipelineBuilder.httpClient(httpClient).build(); + } + + /** + * Builds an instance of FileClient class. + * + * @return an instance of FileClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public FileClient buildFileClient() { + FileClientImpl innerClient = buildInnerClient(); + return new FileClient(innerClient.getBodies(), innerClient.getInstrumentation()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/UploadFileMultipleContentTypesContentType.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/UploadFileMultipleContentTypesContentType.java new file mode 100644 index 00000000000..23fda08060e --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/UploadFileMultipleContentTypesContentType.java @@ -0,0 +1,52 @@ +package type.file; + +/** + * Defines values for UploadFileMultipleContentTypesContentType. + */ +public enum UploadFileMultipleContentTypesContentType { + /** + * Enum value image/png. + */ + IMAGE_PNG("image/png"), + + /** + * Enum value image/jpeg. + */ + IMAGE_JPEG("image/jpeg"); + + /** + * The actual serialized value for a UploadFileMultipleContentTypesContentType instance. + */ + private final String value; + + UploadFileMultipleContentTypesContentType(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a UploadFileMultipleContentTypesContentType instance. + * + * @param value the serialized value to parse. + * @return the parsed UploadFileMultipleContentTypesContentType object, or null if unable to parse. + */ + public static UploadFileMultipleContentTypesContentType fromString(String value) { + if (value == null) { + return null; + } + UploadFileMultipleContentTypesContentType[] items = UploadFileMultipleContentTypesContentType.values(); + for (UploadFileMultipleContentTypesContentType item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.value; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/implementation/BodiesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/implementation/BodiesImpl.java new file mode 100644 index 00000000000..0a64d3c3b55 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/implementation/BodiesImpl.java @@ -0,0 +1,300 @@ +package type.file.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import io.clientcore.core.models.binarydata.BinaryData; +import java.lang.reflect.InvocationTargetException; +import type.file.DownloadFileMultipleContentTypesContentType; +import type.file.UploadFileMultipleContentTypesContentType; + +/** + * An instance of this class provides access to all the operations defined in Bodies. + */ +public final class BodiesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final BodiesService service; + + /** + * The service client containing this operation class. + */ + private final FileClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of BodiesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + BodiesImpl(FileClientImpl client) { + this.service = BodiesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for FileClientBodies to be used by the proxy service to perform REST + * calls. + */ + @ServiceInterface(name = "FileClientBodies", host = "{endpoint}") + public interface BodiesService { + static BodiesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class.forName("type.file.implementation.BodiesServiceImpl"); + return (BodiesService) clazz.getMethod("getNewInstance", HttpPipeline.class).invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.POST, + path = "/type/file/body/request/specific-content-type", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response uploadFileSpecificContentType(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("image/png") BinaryData file, + @HeaderParam("Content-Length") long contentLength, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.POST, + path = "/type/file/body/request/json-content-type", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response uploadFileJsonContentType(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData file, + @HeaderParam("Content-Length") long contentLength, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/type/file/body/response/json-content-type", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response downloadFileJsonContentType(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/type/file/body/response/specific-content-type", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response downloadFileSpecificContentType(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.POST, + path = "/type/file/body/request/multiple-content-types", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response uploadFileMultipleContentTypes(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") UploadFileMultipleContentTypesContentType contentType, + @BodyParam("application/json") BinaryData file, @HeaderParam("Content-Length") long contentLength, + RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/type/file/body/response/multiple-content-types", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response downloadFileMultipleContentTypes(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") DownloadFileMultipleContentTypesContentType accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.POST, + path = "/type/file/body/request/default-content-type", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response uploadFileDefaultContentType(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("*/*") BinaryData file, + @HeaderParam("Content-Length") long contentLength, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/type/file/body/response/default-content-type", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response downloadFileDefaultContentType(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + } + + /** + * The uploadFileSpecificContentType operation. + * + * @param file The file parameter. + * @param contentLength The Content-Length header for the request. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileSpecificContentTypeWithResponse(BinaryData file, long contentLength, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Type.File.Body.uploadFileSpecificContentType", + requestContext, updatedContext -> { + final String contentType = "image/png"; + return service.uploadFileSpecificContentType(this.client.getEndpoint(), contentType, file, + contentLength, updatedContext); + }); + } + + /** + * The uploadFileJsonContentType operation. + * + * @param file The file parameter. + * @param contentLength The Content-Length header for the request. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileJsonContentTypeWithResponse(BinaryData file, long contentLength, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Type.File.Body.uploadFileJsonContentType", requestContext, + updatedContext -> { + final String contentType = "application/json"; + return service.uploadFileJsonContentType(this.client.getEndpoint(), contentType, file, contentLength, + updatedContext); + }); + } + + /** + * The downloadFileJsonContentType operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response downloadFileJsonContentTypeWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Type.File.Body.downloadFileJsonContentType", requestContext, + updatedContext -> { + final String accept = "application/json"; + return service.downloadFileJsonContentType(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The downloadFileSpecificContentType operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response downloadFileSpecificContentTypeWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Type.File.Body.downloadFileSpecificContentType", + requestContext, updatedContext -> { + final String accept = "image/png"; + return service.downloadFileSpecificContentType(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The uploadFileMultipleContentTypes operation. + * + * @param contentType Body parameter's content type. Known values are image/png,image/jpeg. + * @param file The file parameter. + * @param contentLength The Content-Length header for the request. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileMultipleContentTypesWithResponse( + UploadFileMultipleContentTypesContentType contentType, BinaryData file, long contentLength, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Type.File.Body.uploadFileMultipleContentTypes", + requestContext, updatedContext -> { + return service.uploadFileMultipleContentTypes(this.client.getEndpoint(), contentType, file, + contentLength, updatedContext); + }); + } + + /** + * The downloadFileMultipleContentTypes operation. + * + * @param accept The accept parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response downloadFileMultipleContentTypesWithResponse( + DownloadFileMultipleContentTypesContentType accept, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Type.File.Body.downloadFileMultipleContentTypes", + requestContext, updatedContext -> { + return service.downloadFileMultipleContentTypes(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The uploadFileDefaultContentType operation. + * + * @param file The file parameter. + * @param contentLength The Content-Length header for the request. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileDefaultContentTypeWithResponse(BinaryData file, long contentLength, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Type.File.Body.uploadFileDefaultContentType", + requestContext, updatedContext -> { + final String contentType = "*/*"; + return service.uploadFileDefaultContentType(this.client.getEndpoint(), contentType, file, contentLength, + updatedContext); + }); + } + + /** + * The downloadFileDefaultContentType operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response downloadFileDefaultContentTypeWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Type.File.Body.downloadFileDefaultContentType", + requestContext, updatedContext -> { + final String accept = "*/*"; + return service.downloadFileDefaultContentType(this.client.getEndpoint(), accept, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/implementation/FileClientImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/implementation/FileClientImpl.java new file mode 100644 index 00000000000..7e2dad6de7f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/implementation/FileClientImpl.java @@ -0,0 +1,79 @@ +package type.file.implementation; + +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; + +/** + * Initializes a new instance of the FileClient type. + */ +public final class FileClientImpl { + /** + * Service host. + */ + private final String endpoint; + + /** + * Gets Service host. + * + * @return the endpoint value. + */ + public String getEndpoint() { + return this.endpoint; + } + + /** + * The HTTP pipeline to send requests through. + */ + private final HttpPipeline httpPipeline; + + /** + * Gets The HTTP pipeline to send requests through. + * + * @return the httpPipeline value. + */ + public HttpPipeline getHttpPipeline() { + return this.httpPipeline; + } + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Gets The instance of instrumentation to report telemetry. + * + * @return the instrumentation value. + */ + public Instrumentation getInstrumentation() { + return this.instrumentation; + } + + /** + * The BodiesImpl object to access its operations. + */ + private final BodiesImpl bodies; + + /** + * Gets the BodiesImpl object to access its operations. + * + * @return the BodiesImpl object. + */ + public BodiesImpl getBodies() { + return this.bodies; + } + + /** + * Initializes an instance of FileClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param instrumentation The instance of instrumentation to report telemetry. + * @param endpoint Service host. + */ + public FileClientImpl(HttpPipeline httpPipeline, Instrumentation instrumentation, String endpoint) { + this.httpPipeline = httpPipeline; + this.instrumentation = instrumentation; + this.endpoint = endpoint; + this.bodies = new BodiesImpl(this); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/implementation/package-info.java new file mode 100644 index 00000000000..c5fc2ab932b --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/implementation/package-info.java @@ -0,0 +1,5 @@ +/** + * Package containing the implementations for File. + * Test for File type usage in request and response bodies. + */ +package type.file.implementation; diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/package-info.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/package-info.java new file mode 100644 index 00000000000..12be8ba2ed6 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/file/package-info.java @@ -0,0 +1,5 @@ +/** + * Package containing the classes for File. + * Test for File type usage in request and response bodies. + */ +package type.file; diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/union/MixedTypesCases.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/union/MixedTypesCases.java index 7f29429d680..ab22bd28590 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/union/MixedTypesCases.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/union/MixedTypesCases.java @@ -129,8 +129,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { this.intProperty.writeTo(jsonWriter); jsonWriter.writeFieldName("boolean"); this.booleanProperty.writeTo(jsonWriter); - jsonWriter.writeArrayField("array", this.array, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeArrayField("array", this.array, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-apikey_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-apikey_apiview_properties.json deleted file mode 100644 index c5ef92663cf..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-apikey_apiview_properties.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "authentication.apikey.ApiKeyClient": "Authentication.ApiKey", - "authentication.apikey.ApiKeyClientBuilder": "Authentication.ApiKey", - "authentication.apikey.InvalidAuth": "Authentication.ApiKey.InvalidAuth" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-apikey_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-apikey_metadata.json index 0038d5fc078..2ecbd141e04 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-apikey_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-apikey_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"authentication.apikey.ApiKeyClient":"Authentication.ApiKey","authentication.apikey.ApiKeyClientBuilder":"Authentication.ApiKey","authentication.apikey.InvalidAuth":"Authentication.ApiKey.InvalidAuth"},"generatedFiles":["src/main/java/authentication/apikey/ApiKeyClient.java","src/main/java/authentication/apikey/ApiKeyClientBuilder.java","src/main/java/authentication/apikey/InvalidAuth.java","src/main/java/authentication/apikey/implementation/ApiKeyClientImpl.java","src/main/java/authentication/apikey/implementation/package-info.java","src/main/java/authentication/apikey/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"authentication.apikey.ApiKeyClient":"Authentication.ApiKey","authentication.apikey.ApiKeyClientBuilder":"Authentication.ApiKey","authentication.apikey.InvalidAuth":"Authentication.ApiKey.InvalidAuth"},"generatedFiles":["src/main/java/authentication/apikey/ApiKeyClient.java","src/main/java/authentication/apikey/ApiKeyClientBuilder.java","src/main/java/authentication/apikey/InvalidAuth.java","src/main/java/authentication/apikey/implementation/ApiKeyClientImpl.java","src/main/java/authentication/apikey/implementation/package-info.java","src/main/java/authentication/apikey/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-http-custom_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-http-custom_apiview_properties.json deleted file mode 100644 index 1ea619f5bb0..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-http-custom_apiview_properties.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "authentication.http.custom.CustomClient": "Authentication.Http.Custom", - "authentication.http.custom.CustomClientBuilder": "Authentication.Http.Custom", - "authentication.http.custom.InvalidAuth": "Authentication.Http.Custom.InvalidAuth" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-http-custom_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-http-custom_metadata.json index 719716516be..129dd8b9d5c 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-http-custom_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-http-custom_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"authentication.http.custom.CustomClient":"Authentication.Http.Custom","authentication.http.custom.CustomClientBuilder":"Authentication.Http.Custom","authentication.http.custom.InvalidAuth":"Authentication.Http.Custom.InvalidAuth"},"generatedFiles":["src/main/java/authentication/http/custom/CustomClient.java","src/main/java/authentication/http/custom/CustomClientBuilder.java","src/main/java/authentication/http/custom/InvalidAuth.java","src/main/java/authentication/http/custom/implementation/CustomClientImpl.java","src/main/java/authentication/http/custom/implementation/package-info.java","src/main/java/authentication/http/custom/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"authentication.http.custom.CustomClient":"Authentication.Http.Custom","authentication.http.custom.CustomClientBuilder":"Authentication.Http.Custom","authentication.http.custom.InvalidAuth":"Authentication.Http.Custom.InvalidAuth"},"generatedFiles":["src/main/java/authentication/http/custom/CustomClient.java","src/main/java/authentication/http/custom/CustomClientBuilder.java","src/main/java/authentication/http/custom/InvalidAuth.java","src/main/java/authentication/http/custom/implementation/CustomClientImpl.java","src/main/java/authentication/http/custom/implementation/package-info.java","src/main/java/authentication/http/custom/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-noauth-union_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-noauth-union_apiview_properties.json deleted file mode 100644 index 6a7444bd15d..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-noauth-union_apiview_properties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "authentication.noauth.union.UnionClient": "Authentication.Noauth.Union", - "authentication.noauth.union.UnionClientBuilder": "Authentication.Noauth.Union" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-noauth-union_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-noauth-union_metadata.json index 524d71f1d82..05560a8ce80 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-noauth-union_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-noauth-union_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"authentication.noauth.union.UnionClient":"Authentication.Noauth.Union","authentication.noauth.union.UnionClientBuilder":"Authentication.Noauth.Union"},"generatedFiles":["src/main/java/authentication/noauth/union/UnionClient.java","src/main/java/authentication/noauth/union/UnionClientBuilder.java","src/main/java/authentication/noauth/union/implementation/UnionClientImpl.java","src/main/java/authentication/noauth/union/implementation/package-info.java","src/main/java/authentication/noauth/union/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"authentication.noauth.union.UnionClient":"Authentication.Noauth.Union","authentication.noauth.union.UnionClientBuilder":"Authentication.Noauth.Union"},"generatedFiles":["src/main/java/authentication/noauth/union/UnionClient.java","src/main/java/authentication/noauth/union/UnionClientBuilder.java","src/main/java/authentication/noauth/union/implementation/UnionClientImpl.java","src/main/java/authentication/noauth/union/implementation/package-info.java","src/main/java/authentication/noauth/union/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-oauth2_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-oauth2_apiview_properties.json deleted file mode 100644 index 1644061cf14..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-oauth2_apiview_properties.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "authentication.oauth2.InvalidAuth": "Authentication.OAuth2.InvalidAuth", - "authentication.oauth2.OAuth2Client": "Authentication.OAuth2", - "authentication.oauth2.OAuth2ClientBuilder": "Authentication.OAuth2" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-oauth2_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-oauth2_metadata.json index 21794dd0ea4..b9680ef0028 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-oauth2_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-oauth2_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"authentication.oauth2.InvalidAuth":"Authentication.OAuth2.InvalidAuth","authentication.oauth2.OAuth2Client":"Authentication.OAuth2","authentication.oauth2.OAuth2ClientBuilder":"Authentication.OAuth2"},"generatedFiles":["src/main/java/authentication/oauth2/InvalidAuth.java","src/main/java/authentication/oauth2/OAuth2Client.java","src/main/java/authentication/oauth2/OAuth2ClientBuilder.java","src/main/java/authentication/oauth2/implementation/OAuth2ClientImpl.java","src/main/java/authentication/oauth2/implementation/package-info.java","src/main/java/authentication/oauth2/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"authentication.oauth2.InvalidAuth":"Authentication.OAuth2.InvalidAuth","authentication.oauth2.OAuth2Client":"Authentication.OAuth2","authentication.oauth2.OAuth2ClientBuilder":"Authentication.OAuth2"},"generatedFiles":["src/main/java/authentication/oauth2/InvalidAuth.java","src/main/java/authentication/oauth2/OAuth2Client.java","src/main/java/authentication/oauth2/OAuth2ClientBuilder.java","src/main/java/authentication/oauth2/implementation/OAuth2ClientImpl.java","src/main/java/authentication/oauth2/implementation/package-info.java","src/main/java/authentication/oauth2/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-union_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-union_apiview_properties.json deleted file mode 100644 index 18e783979b7..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-union_apiview_properties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "authentication.union.UnionClient": "Authentication.Union", - "authentication.union.UnionClientBuilder": "Authentication.Union" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-union_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-union_metadata.json index 07894898bb0..6aa5c987298 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-union_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/authentication-union_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"authentication.union.UnionClient":"Authentication.Union","authentication.union.UnionClientBuilder":"Authentication.Union"},"generatedFiles":["src/main/java/authentication/union/UnionClient.java","src/main/java/authentication/union/UnionClientBuilder.java","src/main/java/authentication/union/implementation/UnionClientImpl.java","src/main/java/authentication/union/implementation/package-info.java","src/main/java/authentication/union/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"authentication.union.UnionClient":"Authentication.Union","authentication.union.UnionClientBuilder":"Authentication.Union"},"generatedFiles":["src/main/java/authentication/union/UnionClient.java","src/main/java/authentication/union/UnionClientBuilder.java","src/main/java/authentication/union/implementation/UnionClientImpl.java","src/main/java/authentication/union/implementation/package-info.java","src/main/java/authentication/union/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/documentation_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/documentation_apiview_properties.json deleted file mode 100644 index 4e7018f5979..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/documentation_apiview_properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "documentation.DocumentationClientBuilder": "Documentation", - "documentation.ListsClient": "Documentation.Lists", - "documentation.TextFormattingClient": "Documentation.TextFormatting", - "documentation.lists.BulletPointsEnum": "Documentation.Lists.BulletPointsEnum", - "documentation.lists.BulletPointsModel": "Documentation.Lists.BulletPointsModel", - "documentation.lists.implementation.BulletPointsModelRequest": "Documentation.Lists.bulletPointsModel.Request.anonymous" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/documentation_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/documentation_metadata.json index e80af789b53..85e8a933897 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/documentation_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/documentation_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"documentation.DocumentationClientBuilder":"Documentation","documentation.ListsClient":"Documentation.Lists","documentation.TextFormattingClient":"Documentation.TextFormatting","documentation.lists.BulletPointsEnum":"Documentation.Lists.BulletPointsEnum","documentation.lists.BulletPointsModel":"Documentation.Lists.BulletPointsModel","documentation.lists.implementation.BulletPointsModelRequest":"Documentation.Lists.bulletPointsModel.Request.anonymous"},"generatedFiles":["src/main/java/documentation/DocumentationClientBuilder.java","src/main/java/documentation/ListsClient.java","src/main/java/documentation/TextFormattingClient.java","src/main/java/documentation/implementation/DocumentationClientImpl.java","src/main/java/documentation/implementation/ListsImpl.java","src/main/java/documentation/implementation/TextFormattingsImpl.java","src/main/java/documentation/implementation/package-info.java","src/main/java/documentation/lists/BulletPointsEnum.java","src/main/java/documentation/lists/BulletPointsModel.java","src/main/java/documentation/lists/implementation/BulletPointsModelRequest.java","src/main/java/documentation/lists/implementation/package-info.java","src/main/java/documentation/lists/package-info.java","src/main/java/documentation/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"documentation.DocumentationClientBuilder":"Documentation","documentation.ListsClient":"Documentation.Lists","documentation.TextFormattingClient":"Documentation.TextFormatting","documentation.lists.BulletPointsEnum":"Documentation.Lists.BulletPointsEnum","documentation.lists.BulletPointsModel":"Documentation.Lists.BulletPointsModel","documentation.lists.implementation.BulletPointsModelRequest":"Documentation.Lists.bulletPointsModel.Request.anonymous"},"generatedFiles":["src/main/java/documentation/DocumentationClientBuilder.java","src/main/java/documentation/ListsClient.java","src/main/java/documentation/TextFormattingClient.java","src/main/java/documentation/implementation/DocumentationClientImpl.java","src/main/java/documentation/implementation/ListsImpl.java","src/main/java/documentation/implementation/TextFormattingsImpl.java","src/main/java/documentation/implementation/package-info.java","src/main/java/documentation/lists/BulletPointsEnum.java","src/main/java/documentation/lists/BulletPointsModel.java","src/main/java/documentation/lists/implementation/BulletPointsModelRequest.java","src/main/java/documentation/lists/implementation/package-info.java","src/main/java/documentation/lists/package-info.java","src/main/java/documentation/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-array_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-array_apiview_properties.json deleted file mode 100644 index 196e528b2b2..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-array_apiview_properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "encode.array.ArrayClient": "Encode.Array.Property", - "encode.array.ArrayClientBuilder": "Encode.Array", - "encode.array.CommaDelimitedArrayProperty": "Encode.Array.CommaDelimitedArrayProperty", - "encode.array.NewlineDelimitedArrayProperty": "Encode.Array.NewlineDelimitedArrayProperty", - "encode.array.PipeDelimitedArrayProperty": "Encode.Array.PipeDelimitedArrayProperty", - "encode.array.SpaceDelimitedArrayProperty": "Encode.Array.SpaceDelimitedArrayProperty" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-array_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-array_metadata.json index 7ded8c90498..057ec7b0b3c 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-array_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-array_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"encode.array.ArrayClient":"Encode.Array.Property","encode.array.ArrayClientBuilder":"Encode.Array","encode.array.CommaDelimitedArrayProperty":"Encode.Array.CommaDelimitedArrayProperty","encode.array.NewlineDelimitedArrayProperty":"Encode.Array.NewlineDelimitedArrayProperty","encode.array.PipeDelimitedArrayProperty":"Encode.Array.PipeDelimitedArrayProperty","encode.array.SpaceDelimitedArrayProperty":"Encode.Array.SpaceDelimitedArrayProperty"},"generatedFiles":["src/main/java/encode/array/ArrayClient.java","src/main/java/encode/array/ArrayClientBuilder.java","src/main/java/encode/array/CommaDelimitedArrayProperty.java","src/main/java/encode/array/NewlineDelimitedArrayProperty.java","src/main/java/encode/array/PipeDelimitedArrayProperty.java","src/main/java/encode/array/SpaceDelimitedArrayProperty.java","src/main/java/encode/array/implementation/ArrayClientImpl.java","src/main/java/encode/array/implementation/PropertiesImpl.java","src/main/java/encode/array/implementation/package-info.java","src/main/java/encode/array/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"encode.array.ArrayClient":"Encode.Array.Property","encode.array.ArrayClientBuilder":"Encode.Array","encode.array.Colors":"Encode.Array.Colors","encode.array.ColorsExtensibleEnum":"Encode.Array.ColorsExtensibleEnum","encode.array.CommaDelimitedArrayProperty":"Encode.Array.CommaDelimitedArrayProperty","encode.array.CommaDelimitedEnumArrayProperty":"Encode.Array.CommaDelimitedEnumArrayProperty","encode.array.CommaDelimitedExtensibleEnumArrayProperty":"Encode.Array.CommaDelimitedExtensibleEnumArrayProperty","encode.array.NewlineDelimitedArrayProperty":"Encode.Array.NewlineDelimitedArrayProperty","encode.array.NewlineDelimitedEnumArrayProperty":"Encode.Array.NewlineDelimitedEnumArrayProperty","encode.array.NewlineDelimitedExtensibleEnumArrayProperty":"Encode.Array.NewlineDelimitedExtensibleEnumArrayProperty","encode.array.PipeDelimitedArrayProperty":"Encode.Array.PipeDelimitedArrayProperty","encode.array.PipeDelimitedEnumArrayProperty":"Encode.Array.PipeDelimitedEnumArrayProperty","encode.array.PipeDelimitedExtensibleEnumArrayProperty":"Encode.Array.PipeDelimitedExtensibleEnumArrayProperty","encode.array.SpaceDelimitedArrayProperty":"Encode.Array.SpaceDelimitedArrayProperty","encode.array.SpaceDelimitedEnumArrayProperty":"Encode.Array.SpaceDelimitedEnumArrayProperty","encode.array.SpaceDelimitedExtensibleEnumArrayProperty":"Encode.Array.SpaceDelimitedExtensibleEnumArrayProperty"},"generatedFiles":["src/main/java/encode/array/ArrayClient.java","src/main/java/encode/array/ArrayClientBuilder.java","src/main/java/encode/array/Colors.java","src/main/java/encode/array/ColorsExtensibleEnum.java","src/main/java/encode/array/CommaDelimitedArrayProperty.java","src/main/java/encode/array/CommaDelimitedEnumArrayProperty.java","src/main/java/encode/array/CommaDelimitedExtensibleEnumArrayProperty.java","src/main/java/encode/array/NewlineDelimitedArrayProperty.java","src/main/java/encode/array/NewlineDelimitedEnumArrayProperty.java","src/main/java/encode/array/NewlineDelimitedExtensibleEnumArrayProperty.java","src/main/java/encode/array/PipeDelimitedArrayProperty.java","src/main/java/encode/array/PipeDelimitedEnumArrayProperty.java","src/main/java/encode/array/PipeDelimitedExtensibleEnumArrayProperty.java","src/main/java/encode/array/SpaceDelimitedArrayProperty.java","src/main/java/encode/array/SpaceDelimitedEnumArrayProperty.java","src/main/java/encode/array/SpaceDelimitedExtensibleEnumArrayProperty.java","src/main/java/encode/array/implementation/ArrayClientImpl.java","src/main/java/encode/array/implementation/PropertiesImpl.java","src/main/java/encode/array/implementation/package-info.java","src/main/java/encode/array/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-bytes_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-bytes_apiview_properties.json deleted file mode 100644 index fdbad4941bc..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-bytes_apiview_properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "encode.bytes.Base64BytesProperty": "Encode.Bytes.Base64BytesProperty", - "encode.bytes.Base64urlArrayBytesProperty": "Encode.Bytes.Base64urlArrayBytesProperty", - "encode.bytes.Base64urlBytesProperty": "Encode.Bytes.Base64urlBytesProperty", - "encode.bytes.BytesClientBuilder": "Encode.Bytes", - "encode.bytes.DefaultBytesProperty": "Encode.Bytes.DefaultBytesProperty", - "encode.bytes.HeaderClient": "Encode.Bytes.Header", - "encode.bytes.PropertyClient": "Encode.Bytes.Property", - "encode.bytes.QueryClient": "Encode.Bytes.Query", - "encode.bytes.RequestBodyClient": "Encode.Bytes.RequestBody", - "encode.bytes.ResponseBodyClient": "Encode.Bytes.ResponseBody" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-bytes_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-bytes_metadata.json index f5b5a625671..c3eb06029cf 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-bytes_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-bytes_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"encode.bytes.Base64BytesProperty":"Encode.Bytes.Base64BytesProperty","encode.bytes.Base64urlArrayBytesProperty":"Encode.Bytes.Base64urlArrayBytesProperty","encode.bytes.Base64urlBytesProperty":"Encode.Bytes.Base64urlBytesProperty","encode.bytes.BytesClientBuilder":"Encode.Bytes","encode.bytes.DefaultBytesProperty":"Encode.Bytes.DefaultBytesProperty","encode.bytes.HeaderClient":"Encode.Bytes.Header","encode.bytes.PropertyClient":"Encode.Bytes.Property","encode.bytes.QueryClient":"Encode.Bytes.Query","encode.bytes.RequestBodyClient":"Encode.Bytes.RequestBody","encode.bytes.ResponseBodyClient":"Encode.Bytes.ResponseBody"},"generatedFiles":["src/main/java/encode/bytes/Base64BytesProperty.java","src/main/java/encode/bytes/Base64urlArrayBytesProperty.java","src/main/java/encode/bytes/Base64urlBytesProperty.java","src/main/java/encode/bytes/BytesClientBuilder.java","src/main/java/encode/bytes/DefaultBytesProperty.java","src/main/java/encode/bytes/HeaderClient.java","src/main/java/encode/bytes/PropertyClient.java","src/main/java/encode/bytes/QueryClient.java","src/main/java/encode/bytes/RequestBodyClient.java","src/main/java/encode/bytes/ResponseBodyClient.java","src/main/java/encode/bytes/implementation/BytesClientImpl.java","src/main/java/encode/bytes/implementation/HeadersImpl.java","src/main/java/encode/bytes/implementation/PropertiesImpl.java","src/main/java/encode/bytes/implementation/QueriesImpl.java","src/main/java/encode/bytes/implementation/RequestBodiesImpl.java","src/main/java/encode/bytes/implementation/ResponseBodiesImpl.java","src/main/java/encode/bytes/implementation/package-info.java","src/main/java/encode/bytes/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"encode.bytes.Base64BytesProperty":"Encode.Bytes.Base64BytesProperty","encode.bytes.Base64urlArrayBytesProperty":"Encode.Bytes.Base64urlArrayBytesProperty","encode.bytes.Base64urlBytesProperty":"Encode.Bytes.Base64urlBytesProperty","encode.bytes.BytesClientBuilder":"Encode.Bytes","encode.bytes.DefaultBytesProperty":"Encode.Bytes.DefaultBytesProperty","encode.bytes.HeaderClient":"Encode.Bytes.Header","encode.bytes.PropertyClient":"Encode.Bytes.Property","encode.bytes.QueryClient":"Encode.Bytes.Query","encode.bytes.RequestBodyClient":"Encode.Bytes.RequestBody","encode.bytes.ResponseBodyClient":"Encode.Bytes.ResponseBody"},"generatedFiles":["src/main/java/encode/bytes/Base64BytesProperty.java","src/main/java/encode/bytes/Base64urlArrayBytesProperty.java","src/main/java/encode/bytes/Base64urlBytesProperty.java","src/main/java/encode/bytes/BytesClientBuilder.java","src/main/java/encode/bytes/DefaultBytesProperty.java","src/main/java/encode/bytes/HeaderClient.java","src/main/java/encode/bytes/PropertyClient.java","src/main/java/encode/bytes/QueryClient.java","src/main/java/encode/bytes/RequestBodyClient.java","src/main/java/encode/bytes/ResponseBodyClient.java","src/main/java/encode/bytes/implementation/BytesClientImpl.java","src/main/java/encode/bytes/implementation/HeadersImpl.java","src/main/java/encode/bytes/implementation/PropertiesImpl.java","src/main/java/encode/bytes/implementation/QueriesImpl.java","src/main/java/encode/bytes/implementation/RequestBodiesImpl.java","src/main/java/encode/bytes/implementation/ResponseBodiesImpl.java","src/main/java/encode/bytes/implementation/package-info.java","src/main/java/encode/bytes/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-datetime_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-datetime_apiview_properties.json deleted file mode 100644 index 5de69be5375..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-datetime_apiview_properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "encode.datetime.DatetimeClientBuilder": "Encode.Datetime", - "encode.datetime.DefaultDatetimeProperty": "Encode.Datetime.DefaultDatetimeProperty", - "encode.datetime.HeaderClient": "Encode.Datetime.Header", - "encode.datetime.PropertyClient": "Encode.Datetime.Property", - "encode.datetime.QueryClient": "Encode.Datetime.Query", - "encode.datetime.ResponseHeaderClient": "Encode.Datetime.ResponseHeader", - "encode.datetime.Rfc3339DatetimeProperty": "Encode.Datetime.Rfc3339DatetimeProperty", - "encode.datetime.Rfc7231DatetimeProperty": "Encode.Datetime.Rfc7231DatetimeProperty", - "encode.datetime.UnixTimestampArrayDatetimeProperty": "Encode.Datetime.UnixTimestampArrayDatetimeProperty", - "encode.datetime.UnixTimestampDatetimeProperty": "Encode.Datetime.UnixTimestampDatetimeProperty" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-datetime_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-datetime_metadata.json index bc60439592f..fa5384ca3cc 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-datetime_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-datetime_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"encode.datetime.DatetimeClientBuilder":"Encode.Datetime","encode.datetime.DefaultDatetimeProperty":"Encode.Datetime.DefaultDatetimeProperty","encode.datetime.HeaderClient":"Encode.Datetime.Header","encode.datetime.PropertyClient":"Encode.Datetime.Property","encode.datetime.QueryClient":"Encode.Datetime.Query","encode.datetime.ResponseHeaderClient":"Encode.Datetime.ResponseHeader","encode.datetime.Rfc3339DatetimeProperty":"Encode.Datetime.Rfc3339DatetimeProperty","encode.datetime.Rfc7231DatetimeProperty":"Encode.Datetime.Rfc7231DatetimeProperty","encode.datetime.UnixTimestampArrayDatetimeProperty":"Encode.Datetime.UnixTimestampArrayDatetimeProperty","encode.datetime.UnixTimestampDatetimeProperty":"Encode.Datetime.UnixTimestampDatetimeProperty"},"generatedFiles":["src/main/java/encode/datetime/DatetimeClientBuilder.java","src/main/java/encode/datetime/DefaultDatetimeProperty.java","src/main/java/encode/datetime/HeaderClient.java","src/main/java/encode/datetime/PropertyClient.java","src/main/java/encode/datetime/QueryClient.java","src/main/java/encode/datetime/ResponseHeaderClient.java","src/main/java/encode/datetime/Rfc3339DatetimeProperty.java","src/main/java/encode/datetime/Rfc7231DatetimeProperty.java","src/main/java/encode/datetime/UnixTimestampArrayDatetimeProperty.java","src/main/java/encode/datetime/UnixTimestampDatetimeProperty.java","src/main/java/encode/datetime/implementation/DatetimeClientImpl.java","src/main/java/encode/datetime/implementation/HeadersImpl.java","src/main/java/encode/datetime/implementation/PropertiesImpl.java","src/main/java/encode/datetime/implementation/QueriesImpl.java","src/main/java/encode/datetime/implementation/ResponseHeadersImpl.java","src/main/java/encode/datetime/implementation/package-info.java","src/main/java/encode/datetime/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"encode.datetime.DatetimeClientBuilder":"Encode.Datetime","encode.datetime.DefaultDatetimeProperty":"Encode.Datetime.DefaultDatetimeProperty","encode.datetime.HeaderClient":"Encode.Datetime.Header","encode.datetime.PropertyClient":"Encode.Datetime.Property","encode.datetime.QueryClient":"Encode.Datetime.Query","encode.datetime.ResponseHeaderClient":"Encode.Datetime.ResponseHeader","encode.datetime.Rfc3339DatetimeProperty":"Encode.Datetime.Rfc3339DatetimeProperty","encode.datetime.Rfc7231DatetimeProperty":"Encode.Datetime.Rfc7231DatetimeProperty","encode.datetime.UnixTimestampArrayDatetimeProperty":"Encode.Datetime.UnixTimestampArrayDatetimeProperty","encode.datetime.UnixTimestampDatetimeProperty":"Encode.Datetime.UnixTimestampDatetimeProperty"},"generatedFiles":["src/main/java/encode/datetime/DatetimeClientBuilder.java","src/main/java/encode/datetime/DefaultDatetimeProperty.java","src/main/java/encode/datetime/HeaderClient.java","src/main/java/encode/datetime/PropertyClient.java","src/main/java/encode/datetime/QueryClient.java","src/main/java/encode/datetime/ResponseHeaderClient.java","src/main/java/encode/datetime/Rfc3339DatetimeProperty.java","src/main/java/encode/datetime/Rfc7231DatetimeProperty.java","src/main/java/encode/datetime/UnixTimestampArrayDatetimeProperty.java","src/main/java/encode/datetime/UnixTimestampDatetimeProperty.java","src/main/java/encode/datetime/implementation/DatetimeClientImpl.java","src/main/java/encode/datetime/implementation/HeadersImpl.java","src/main/java/encode/datetime/implementation/PropertiesImpl.java","src/main/java/encode/datetime/implementation/QueriesImpl.java","src/main/java/encode/datetime/implementation/ResponseHeadersImpl.java","src/main/java/encode/datetime/implementation/package-info.java","src/main/java/encode/datetime/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-duration_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-duration_apiview_properties.json deleted file mode 100644 index 500a90e2446..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-duration_apiview_properties.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "encode.duration.DurationClientBuilder": "Encode.Duration", - "encode.duration.HeaderClient": "Encode.Duration.Header", - "encode.duration.PropertyClient": "Encode.Duration.Property", - "encode.duration.QueryClient": "Encode.Duration.Query", - "encode.duration.property.DefaultDurationProperty": "Encode.Duration.Property.DefaultDurationProperty", - "encode.duration.property.Float64MillisecondsDurationProperty": "Encode.Duration.Property.Float64MillisecondsDurationProperty", - "encode.duration.property.Float64SecondsDurationProperty": "Encode.Duration.Property.Float64SecondsDurationProperty", - "encode.duration.property.FloatMillisecondsDurationArrayProperty": "Encode.Duration.Property.FloatMillisecondsDurationArrayProperty", - "encode.duration.property.FloatMillisecondsDurationProperty": "Encode.Duration.Property.FloatMillisecondsDurationProperty", - "encode.duration.property.FloatMillisecondsLargerUnitDurationProperty": "Encode.Duration.Property.FloatMillisecondsLargerUnitDurationProperty", - "encode.duration.property.FloatSecondsDurationArrayProperty": "Encode.Duration.Property.FloatSecondsDurationArrayProperty", - "encode.duration.property.FloatSecondsDurationProperty": "Encode.Duration.Property.FloatSecondsDurationProperty", - "encode.duration.property.FloatSecondsLargerUnitDurationProperty": "Encode.Duration.Property.FloatSecondsLargerUnitDurationProperty", - "encode.duration.property.ISO8601DurationProperty": "Encode.Duration.Property.ISO8601DurationProperty", - "encode.duration.property.Int32MillisecondsDurationProperty": "Encode.Duration.Property.Int32MillisecondsDurationProperty", - "encode.duration.property.Int32MillisecondsLargerUnitDurationProperty": "Encode.Duration.Property.Int32MillisecondsLargerUnitDurationProperty", - "encode.duration.property.Int32SecondsDurationProperty": "Encode.Duration.Property.Int32SecondsDurationProperty", - "encode.duration.property.Int32SecondsLargerUnitDurationProperty": "Encode.Duration.Property.Int32SecondsLargerUnitDurationProperty" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-duration_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-duration_metadata.json index 23e2a387e26..3856c1ebd4d 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-duration_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-duration_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"encode.duration.DurationClientBuilder":"Encode.Duration","encode.duration.HeaderClient":"Encode.Duration.Header","encode.duration.PropertyClient":"Encode.Duration.Property","encode.duration.QueryClient":"Encode.Duration.Query","encode.duration.property.DefaultDurationProperty":"Encode.Duration.Property.DefaultDurationProperty","encode.duration.property.Float64MillisecondsDurationProperty":"Encode.Duration.Property.Float64MillisecondsDurationProperty","encode.duration.property.Float64SecondsDurationProperty":"Encode.Duration.Property.Float64SecondsDurationProperty","encode.duration.property.FloatMillisecondsDurationArrayProperty":"Encode.Duration.Property.FloatMillisecondsDurationArrayProperty","encode.duration.property.FloatMillisecondsDurationProperty":"Encode.Duration.Property.FloatMillisecondsDurationProperty","encode.duration.property.FloatMillisecondsLargerUnitDurationProperty":"Encode.Duration.Property.FloatMillisecondsLargerUnitDurationProperty","encode.duration.property.FloatSecondsDurationArrayProperty":"Encode.Duration.Property.FloatSecondsDurationArrayProperty","encode.duration.property.FloatSecondsDurationProperty":"Encode.Duration.Property.FloatSecondsDurationProperty","encode.duration.property.FloatSecondsLargerUnitDurationProperty":"Encode.Duration.Property.FloatSecondsLargerUnitDurationProperty","encode.duration.property.ISO8601DurationProperty":"Encode.Duration.Property.ISO8601DurationProperty","encode.duration.property.Int32MillisecondsDurationProperty":"Encode.Duration.Property.Int32MillisecondsDurationProperty","encode.duration.property.Int32MillisecondsLargerUnitDurationProperty":"Encode.Duration.Property.Int32MillisecondsLargerUnitDurationProperty","encode.duration.property.Int32SecondsDurationProperty":"Encode.Duration.Property.Int32SecondsDurationProperty","encode.duration.property.Int32SecondsLargerUnitDurationProperty":"Encode.Duration.Property.Int32SecondsLargerUnitDurationProperty"},"generatedFiles":["src/main/java/encode/duration/DurationClientBuilder.java","src/main/java/encode/duration/HeaderClient.java","src/main/java/encode/duration/PropertyClient.java","src/main/java/encode/duration/QueryClient.java","src/main/java/encode/duration/implementation/DurationClientImpl.java","src/main/java/encode/duration/implementation/HeadersImpl.java","src/main/java/encode/duration/implementation/PropertiesImpl.java","src/main/java/encode/duration/implementation/QueriesImpl.java","src/main/java/encode/duration/implementation/package-info.java","src/main/java/encode/duration/package-info.java","src/main/java/encode/duration/property/DefaultDurationProperty.java","src/main/java/encode/duration/property/Float64MillisecondsDurationProperty.java","src/main/java/encode/duration/property/Float64SecondsDurationProperty.java","src/main/java/encode/duration/property/FloatMillisecondsDurationArrayProperty.java","src/main/java/encode/duration/property/FloatMillisecondsDurationProperty.java","src/main/java/encode/duration/property/FloatMillisecondsLargerUnitDurationProperty.java","src/main/java/encode/duration/property/FloatSecondsDurationArrayProperty.java","src/main/java/encode/duration/property/FloatSecondsDurationProperty.java","src/main/java/encode/duration/property/FloatSecondsLargerUnitDurationProperty.java","src/main/java/encode/duration/property/ISO8601DurationProperty.java","src/main/java/encode/duration/property/Int32MillisecondsDurationProperty.java","src/main/java/encode/duration/property/Int32MillisecondsLargerUnitDurationProperty.java","src/main/java/encode/duration/property/Int32SecondsDurationProperty.java","src/main/java/encode/duration/property/Int32SecondsLargerUnitDurationProperty.java","src/main/java/encode/duration/property/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"encode.duration.DurationClientBuilder":"Encode.Duration","encode.duration.HeaderClient":"Encode.Duration.Header","encode.duration.PropertyClient":"Encode.Duration.Property","encode.duration.QueryClient":"Encode.Duration.Query","encode.duration.property.DefaultDurationProperty":"Encode.Duration.Property.DefaultDurationProperty","encode.duration.property.Float64MillisecondsDurationProperty":"Encode.Duration.Property.Float64MillisecondsDurationProperty","encode.duration.property.Float64SecondsDurationProperty":"Encode.Duration.Property.Float64SecondsDurationProperty","encode.duration.property.FloatMillisecondsDurationArrayProperty":"Encode.Duration.Property.FloatMillisecondsDurationArrayProperty","encode.duration.property.FloatMillisecondsDurationProperty":"Encode.Duration.Property.FloatMillisecondsDurationProperty","encode.duration.property.FloatMillisecondsLargerUnitDurationProperty":"Encode.Duration.Property.FloatMillisecondsLargerUnitDurationProperty","encode.duration.property.FloatSecondsDurationArrayProperty":"Encode.Duration.Property.FloatSecondsDurationArrayProperty","encode.duration.property.FloatSecondsDurationProperty":"Encode.Duration.Property.FloatSecondsDurationProperty","encode.duration.property.FloatSecondsLargerUnitDurationProperty":"Encode.Duration.Property.FloatSecondsLargerUnitDurationProperty","encode.duration.property.ISO8601DurationProperty":"Encode.Duration.Property.ISO8601DurationProperty","encode.duration.property.Int32MillisecondsDurationProperty":"Encode.Duration.Property.Int32MillisecondsDurationProperty","encode.duration.property.Int32MillisecondsLargerUnitDurationProperty":"Encode.Duration.Property.Int32MillisecondsLargerUnitDurationProperty","encode.duration.property.Int32SecondsDurationProperty":"Encode.Duration.Property.Int32SecondsDurationProperty","encode.duration.property.Int32SecondsLargerUnitDurationProperty":"Encode.Duration.Property.Int32SecondsLargerUnitDurationProperty"},"generatedFiles":["src/main/java/encode/duration/DurationClientBuilder.java","src/main/java/encode/duration/HeaderClient.java","src/main/java/encode/duration/PropertyClient.java","src/main/java/encode/duration/QueryClient.java","src/main/java/encode/duration/implementation/DurationClientImpl.java","src/main/java/encode/duration/implementation/HeadersImpl.java","src/main/java/encode/duration/implementation/PropertiesImpl.java","src/main/java/encode/duration/implementation/QueriesImpl.java","src/main/java/encode/duration/implementation/package-info.java","src/main/java/encode/duration/package-info.java","src/main/java/encode/duration/property/DefaultDurationProperty.java","src/main/java/encode/duration/property/Float64MillisecondsDurationProperty.java","src/main/java/encode/duration/property/Float64SecondsDurationProperty.java","src/main/java/encode/duration/property/FloatMillisecondsDurationArrayProperty.java","src/main/java/encode/duration/property/FloatMillisecondsDurationProperty.java","src/main/java/encode/duration/property/FloatMillisecondsLargerUnitDurationProperty.java","src/main/java/encode/duration/property/FloatSecondsDurationArrayProperty.java","src/main/java/encode/duration/property/FloatSecondsDurationProperty.java","src/main/java/encode/duration/property/FloatSecondsLargerUnitDurationProperty.java","src/main/java/encode/duration/property/ISO8601DurationProperty.java","src/main/java/encode/duration/property/Int32MillisecondsDurationProperty.java","src/main/java/encode/duration/property/Int32MillisecondsLargerUnitDurationProperty.java","src/main/java/encode/duration/property/Int32SecondsDurationProperty.java","src/main/java/encode/duration/property/Int32SecondsLargerUnitDurationProperty.java","src/main/java/encode/duration/property/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-numeric_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-numeric_apiview_properties.json deleted file mode 100644 index 27d6c38c51f..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-numeric_apiview_properties.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "encode.numeric.NumericClient": "Encode.Numeric.Property", - "encode.numeric.NumericClientBuilder": "Encode.Numeric", - "encode.numeric.property.SafeintAsStringProperty": "Encode.Numeric.Property.SafeintAsStringProperty", - "encode.numeric.property.Uint32AsStringProperty": "Encode.Numeric.Property.Uint32AsStringProperty", - "encode.numeric.property.Uint8AsStringProperty": "Encode.Numeric.Property.Uint8AsStringProperty" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-numeric_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-numeric_metadata.json index aee1f3c3435..300083da86c 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-numeric_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/encode-numeric_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"encode.numeric.NumericClient":"Encode.Numeric.Property","encode.numeric.NumericClientBuilder":"Encode.Numeric","encode.numeric.property.SafeintAsStringProperty":"Encode.Numeric.Property.SafeintAsStringProperty","encode.numeric.property.Uint32AsStringProperty":"Encode.Numeric.Property.Uint32AsStringProperty","encode.numeric.property.Uint8AsStringProperty":"Encode.Numeric.Property.Uint8AsStringProperty"},"generatedFiles":["src/main/java/encode/numeric/NumericClient.java","src/main/java/encode/numeric/NumericClientBuilder.java","src/main/java/encode/numeric/implementation/NumericClientImpl.java","src/main/java/encode/numeric/implementation/PropertiesImpl.java","src/main/java/encode/numeric/implementation/package-info.java","src/main/java/encode/numeric/package-info.java","src/main/java/encode/numeric/property/SafeintAsStringProperty.java","src/main/java/encode/numeric/property/Uint32AsStringProperty.java","src/main/java/encode/numeric/property/Uint8AsStringProperty.java","src/main/java/encode/numeric/property/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"encode.numeric.NumericClient":"Encode.Numeric.Property","encode.numeric.NumericClientBuilder":"Encode.Numeric","encode.numeric.property.SafeintAsStringProperty":"Encode.Numeric.Property.SafeintAsStringProperty","encode.numeric.property.Uint32AsStringProperty":"Encode.Numeric.Property.Uint32AsStringProperty","encode.numeric.property.Uint8AsStringProperty":"Encode.Numeric.Property.Uint8AsStringProperty"},"generatedFiles":["src/main/java/encode/numeric/NumericClient.java","src/main/java/encode/numeric/NumericClientBuilder.java","src/main/java/encode/numeric/implementation/NumericClientImpl.java","src/main/java/encode/numeric/implementation/PropertiesImpl.java","src/main/java/encode/numeric/implementation/package-info.java","src/main/java/encode/numeric/package-info.java","src/main/java/encode/numeric/property/SafeintAsStringProperty.java","src/main/java/encode/numeric/property/Uint32AsStringProperty.java","src/main/java/encode/numeric/property/Uint8AsStringProperty.java","src/main/java/encode/numeric/property/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-basic_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-basic_apiview_properties.json deleted file mode 100644 index f83689de539..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-basic_apiview_properties.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "parameters.basic.BasicClientBuilder": "Parameters.Basic", - "parameters.basic.ExplicitBodyClient": "Parameters.Basic.ExplicitBody", - "parameters.basic.ImplicitBodyClient": "Parameters.Basic.ImplicitBody", - "parameters.basic.explicitbody.User": "Parameters.Basic.ExplicitBody.User", - "parameters.basic.implicitbody.implementation.SimpleRequest": "Parameters.Basic.ImplicitBody.simple.Request.anonymous" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-basic_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-basic_metadata.json index 8b9e8653e2c..82461c71ec7 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-basic_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-basic_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"parameters.basic.BasicClientBuilder":"Parameters.Basic","parameters.basic.ExplicitBodyClient":"Parameters.Basic.ExplicitBody","parameters.basic.ImplicitBodyClient":"Parameters.Basic.ImplicitBody","parameters.basic.explicitbody.User":"Parameters.Basic.ExplicitBody.User","parameters.basic.implicitbody.implementation.SimpleRequest":"Parameters.Basic.ImplicitBody.simple.Request.anonymous"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/basic/BasicClientBuilder.java","src/main/java/parameters/basic/ExplicitBodyClient.java","src/main/java/parameters/basic/ImplicitBodyClient.java","src/main/java/parameters/basic/explicitbody/User.java","src/main/java/parameters/basic/explicitbody/package-info.java","src/main/java/parameters/basic/implementation/BasicClientImpl.java","src/main/java/parameters/basic/implementation/ExplicitBodiesImpl.java","src/main/java/parameters/basic/implementation/ImplicitBodiesImpl.java","src/main/java/parameters/basic/implementation/package-info.java","src/main/java/parameters/basic/implicitbody/implementation/SimpleRequest.java","src/main/java/parameters/basic/implicitbody/implementation/package-info.java","src/main/java/parameters/basic/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"parameters.basic.BasicClientBuilder":"Parameters.Basic","parameters.basic.ExplicitBodyClient":"Parameters.Basic.ExplicitBody","parameters.basic.ImplicitBodyClient":"Parameters.Basic.ImplicitBody","parameters.basic.explicitbody.User":"Parameters.Basic.ExplicitBody.User","parameters.basic.implicitbody.implementation.SimpleRequest":"Parameters.Basic.ImplicitBody.simple.Request.anonymous"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/basic/BasicClientBuilder.java","src/main/java/parameters/basic/ExplicitBodyClient.java","src/main/java/parameters/basic/ImplicitBodyClient.java","src/main/java/parameters/basic/explicitbody/User.java","src/main/java/parameters/basic/explicitbody/package-info.java","src/main/java/parameters/basic/implementation/BasicClientImpl.java","src/main/java/parameters/basic/implementation/ExplicitBodiesImpl.java","src/main/java/parameters/basic/implementation/ImplicitBodiesImpl.java","src/main/java/parameters/basic/implementation/package-info.java","src/main/java/parameters/basic/implicitbody/implementation/SimpleRequest.java","src/main/java/parameters/basic/implicitbody/implementation/package-info.java","src/main/java/parameters/basic/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-bodyoptionality_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-bodyoptionality_apiview_properties.json deleted file mode 100644 index 6d7ecb2ca35..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-bodyoptionality_apiview_properties.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "parameters.bodyoptionality.BodyModel": "Parameters.BodyOptionality.BodyModel", - "parameters.bodyoptionality.BodyOptionalityClient": "Parameters.BodyOptionality", - "parameters.bodyoptionality.BodyOptionalityClientBuilder": "Parameters.BodyOptionality", - "parameters.bodyoptionality.OptionalExplicitClient": "Parameters.BodyOptionality.OptionalExplicit" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-bodyoptionality_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-bodyoptionality_metadata.json index e655ccac348..6ae1fa634bb 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-bodyoptionality_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-bodyoptionality_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"parameters.bodyoptionality.BodyModel":"Parameters.BodyOptionality.BodyModel","parameters.bodyoptionality.BodyOptionalityClient":"Parameters.BodyOptionality","parameters.bodyoptionality.BodyOptionalityClientBuilder":"Parameters.BodyOptionality","parameters.bodyoptionality.OptionalExplicitClient":"Parameters.BodyOptionality.OptionalExplicit"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/bodyoptionality/BodyModel.java","src/main/java/parameters/bodyoptionality/BodyOptionalityClient.java","src/main/java/parameters/bodyoptionality/BodyOptionalityClientBuilder.java","src/main/java/parameters/bodyoptionality/OptionalExplicitClient.java","src/main/java/parameters/bodyoptionality/implementation/BodyOptionalityClientImpl.java","src/main/java/parameters/bodyoptionality/implementation/OptionalExplicitsImpl.java","src/main/java/parameters/bodyoptionality/implementation/package-info.java","src/main/java/parameters/bodyoptionality/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"parameters.bodyoptionality.BodyModel":"Parameters.BodyOptionality.BodyModel","parameters.bodyoptionality.BodyOptionalityClient":"Parameters.BodyOptionality","parameters.bodyoptionality.BodyOptionalityClientBuilder":"Parameters.BodyOptionality","parameters.bodyoptionality.OptionalExplicitClient":"Parameters.BodyOptionality.OptionalExplicit"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/bodyoptionality/BodyModel.java","src/main/java/parameters/bodyoptionality/BodyOptionalityClient.java","src/main/java/parameters/bodyoptionality/BodyOptionalityClientBuilder.java","src/main/java/parameters/bodyoptionality/OptionalExplicitClient.java","src/main/java/parameters/bodyoptionality/implementation/BodyOptionalityClientImpl.java","src/main/java/parameters/bodyoptionality/implementation/OptionalExplicitsImpl.java","src/main/java/parameters/bodyoptionality/implementation/package-info.java","src/main/java/parameters/bodyoptionality/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-collectionformat_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-collectionformat_apiview_properties.json deleted file mode 100644 index 7d9054960bc..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-collectionformat_apiview_properties.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "parameters.collectionformat.CollectionFormatClientBuilder": "Parameters.CollectionFormat", - "parameters.collectionformat.HeaderClient": "Parameters.CollectionFormat.Header", - "parameters.collectionformat.QueryClient": "Parameters.CollectionFormat.Query" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-collectionformat_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-collectionformat_metadata.json index ffe22323e51..69bfdd83027 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-collectionformat_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-collectionformat_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"parameters.collectionformat.CollectionFormatClientBuilder":"Parameters.CollectionFormat","parameters.collectionformat.HeaderClient":"Parameters.CollectionFormat.Header","parameters.collectionformat.QueryClient":"Parameters.CollectionFormat.Query"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/collectionformat/CollectionFormatClientBuilder.java","src/main/java/parameters/collectionformat/HeaderClient.java","src/main/java/parameters/collectionformat/QueryClient.java","src/main/java/parameters/collectionformat/implementation/CollectionFormatClientImpl.java","src/main/java/parameters/collectionformat/implementation/HeadersImpl.java","src/main/java/parameters/collectionformat/implementation/QueriesImpl.java","src/main/java/parameters/collectionformat/implementation/package-info.java","src/main/java/parameters/collectionformat/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"parameters.collectionformat.CollectionFormatClientBuilder":"Parameters.CollectionFormat","parameters.collectionformat.HeaderClient":"Parameters.CollectionFormat.Header","parameters.collectionformat.QueryClient":"Parameters.CollectionFormat.Query"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/collectionformat/CollectionFormatClientBuilder.java","src/main/java/parameters/collectionformat/HeaderClient.java","src/main/java/parameters/collectionformat/QueryClient.java","src/main/java/parameters/collectionformat/implementation/CollectionFormatClientImpl.java","src/main/java/parameters/collectionformat/implementation/HeadersImpl.java","src/main/java/parameters/collectionformat/implementation/QueriesImpl.java","src/main/java/parameters/collectionformat/implementation/package-info.java","src/main/java/parameters/collectionformat/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-path_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-path_apiview_properties.json deleted file mode 100644 index 7d600704101..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-path_apiview_properties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "parameters.path.PathClient": "Parameters.Path", - "parameters.path.PathClientBuilder": "Parameters.Path" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-path_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-path_metadata.json index 6c151a5c148..a00461af7c6 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-path_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-path_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"parameters.path.PathClient":"Parameters.Path","parameters.path.PathClientBuilder":"Parameters.Path"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/path/PathClient.java","src/main/java/parameters/path/PathClientBuilder.java","src/main/java/parameters/path/implementation/PathClientImpl.java","src/main/java/parameters/path/implementation/package-info.java","src/main/java/parameters/path/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"parameters.path.PathClient":"Parameters.Path","parameters.path.PathClientBuilder":"Parameters.Path"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/path/PathClient.java","src/main/java/parameters/path/PathClientBuilder.java","src/main/java/parameters/path/implementation/PathClientImpl.java","src/main/java/parameters/path/implementation/package-info.java","src/main/java/parameters/path/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-query_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-query_apiview_properties.json deleted file mode 100644 index 6321c24dce3..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-query_apiview_properties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "parameters.query.QueryClient": "Parameters.Query.Constant", - "parameters.query.QueryClientBuilder": "Parameters.Query" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-query_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-query_metadata.json index 8c468539c3e..eb765367cd6 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-query_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-query_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"parameters.query.QueryClient":"Parameters.Query.Constant","parameters.query.QueryClientBuilder":"Parameters.Query"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/query/QueryClient.java","src/main/java/parameters/query/QueryClientBuilder.java","src/main/java/parameters/query/implementation/ConstantsImpl.java","src/main/java/parameters/query/implementation/QueryClientImpl.java","src/main/java/parameters/query/implementation/package-info.java","src/main/java/parameters/query/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"parameters.query.QueryClient":"Parameters.Query.Constant","parameters.query.QueryClientBuilder":"Parameters.Query"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/query/QueryClient.java","src/main/java/parameters/query/QueryClientBuilder.java","src/main/java/parameters/query/implementation/ConstantsImpl.java","src/main/java/parameters/query/implementation/QueryClientImpl.java","src/main/java/parameters/query/implementation/package-info.java","src/main/java/parameters/query/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-spread_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-spread_apiview_properties.json deleted file mode 100644 index 0f6328c9299..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-spread_apiview_properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "parameters.spread.AliasClient": "Parameters.Spread.Alias", - "parameters.spread.ModelClient": "Parameters.Spread.Model", - "parameters.spread.SpreadClientBuilder": "Parameters.Spread", - "parameters.spread.alias.implementation.SpreadAsRequestBodyRequest": "Parameters.Spread.Alias.spreadAsRequestBody.Request.anonymous", - "parameters.spread.implementation.SpreadAsRequestParameterRequest": "Parameters.Spread.Alias.spreadAsRequestParameter.Request.anonymous", - "parameters.spread.implementation.SpreadCompositeRequestMixRequest": "Parameters.Spread.Model.spreadCompositeRequestMix.Request.anonymous", - "parameters.spread.implementation.SpreadParameterWithInnerAliasRequest": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.Request.anonymous", - "parameters.spread.implementation.SpreadParameterWithInnerModelRequest": "Parameters.Spread.Alias.spreadParameterWithInnerModel.Request.anonymous", - "parameters.spread.implementation.SpreadWithMultipleParametersRequest": "Parameters.Spread.Alias.spreadWithMultipleParameters.Request.anonymous", - "parameters.spread.model.BodyParameter": "Parameters.Spread.Model.BodyParameter" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-spread_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-spread_metadata.json index ac84de032d8..ecac17cd6c9 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-spread_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/parameters-spread_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"parameters.spread.AliasClient":"Parameters.Spread.Alias","parameters.spread.ModelClient":"Parameters.Spread.Model","parameters.spread.SpreadClientBuilder":"Parameters.Spread","parameters.spread.alias.implementation.SpreadAsRequestBodyRequest":"Parameters.Spread.Alias.spreadAsRequestBody.Request.anonymous","parameters.spread.implementation.SpreadAsRequestParameterRequest":"Parameters.Spread.Alias.spreadAsRequestParameter.Request.anonymous","parameters.spread.implementation.SpreadCompositeRequestMixRequest":"Parameters.Spread.Model.spreadCompositeRequestMix.Request.anonymous","parameters.spread.implementation.SpreadParameterWithInnerAliasRequest":"Parameters.Spread.Alias.spreadParameterWithInnerAlias.Request.anonymous","parameters.spread.implementation.SpreadParameterWithInnerModelRequest":"Parameters.Spread.Alias.spreadParameterWithInnerModel.Request.anonymous","parameters.spread.implementation.SpreadWithMultipleParametersRequest":"Parameters.Spread.Alias.spreadWithMultipleParameters.Request.anonymous","parameters.spread.model.BodyParameter":"Parameters.Spread.Model.BodyParameter"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/spread/AliasClient.java","src/main/java/parameters/spread/ModelClient.java","src/main/java/parameters/spread/SpreadClientBuilder.java","src/main/java/parameters/spread/alias/implementation/SpreadAsRequestBodyRequest.java","src/main/java/parameters/spread/alias/implementation/package-info.java","src/main/java/parameters/spread/implementation/AliasImpl.java","src/main/java/parameters/spread/implementation/ModelsImpl.java","src/main/java/parameters/spread/implementation/SpreadAsRequestParameterRequest.java","src/main/java/parameters/spread/implementation/SpreadClientImpl.java","src/main/java/parameters/spread/implementation/SpreadCompositeRequestMixRequest.java","src/main/java/parameters/spread/implementation/SpreadParameterWithInnerAliasRequest.java","src/main/java/parameters/spread/implementation/SpreadParameterWithInnerModelRequest.java","src/main/java/parameters/spread/implementation/SpreadWithMultipleParametersRequest.java","src/main/java/parameters/spread/implementation/package-info.java","src/main/java/parameters/spread/model/BodyParameter.java","src/main/java/parameters/spread/model/package-info.java","src/main/java/parameters/spread/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"parameters.spread.AliasClient":"Parameters.Spread.Alias","parameters.spread.ModelClient":"Parameters.Spread.Model","parameters.spread.SpreadClientBuilder":"Parameters.Spread","parameters.spread.alias.implementation.SpreadAsRequestBodyRequest":"Parameters.Spread.Alias.spreadAsRequestBody.Request.anonymous","parameters.spread.implementation.SpreadAsRequestParameterRequest":"Parameters.Spread.Alias.spreadAsRequestParameter.Request.anonymous","parameters.spread.implementation.SpreadCompositeRequestMixRequest":"Parameters.Spread.Model.spreadCompositeRequestMix.Request.anonymous","parameters.spread.implementation.SpreadParameterWithInnerAliasRequest":"Parameters.Spread.Alias.spreadParameterWithInnerAlias.Request.anonymous","parameters.spread.implementation.SpreadParameterWithInnerModelRequest":"Parameters.Spread.Alias.spreadParameterWithInnerModel.Request.anonymous","parameters.spread.implementation.SpreadWithMultipleParametersRequest":"Parameters.Spread.Alias.spreadWithMultipleParameters.Request.anonymous","parameters.spread.model.BodyParameter":"Parameters.Spread.Model.BodyParameter"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/spread/AliasClient.java","src/main/java/parameters/spread/ModelClient.java","src/main/java/parameters/spread/SpreadClientBuilder.java","src/main/java/parameters/spread/alias/implementation/SpreadAsRequestBodyRequest.java","src/main/java/parameters/spread/alias/implementation/package-info.java","src/main/java/parameters/spread/implementation/AliasImpl.java","src/main/java/parameters/spread/implementation/ModelsImpl.java","src/main/java/parameters/spread/implementation/SpreadAsRequestParameterRequest.java","src/main/java/parameters/spread/implementation/SpreadClientImpl.java","src/main/java/parameters/spread/implementation/SpreadCompositeRequestMixRequest.java","src/main/java/parameters/spread/implementation/SpreadParameterWithInnerAliasRequest.java","src/main/java/parameters/spread/implementation/SpreadParameterWithInnerModelRequest.java","src/main/java/parameters/spread/implementation/SpreadWithMultipleParametersRequest.java","src/main/java/parameters/spread/implementation/package-info.java","src/main/java/parameters/spread/model/BodyParameter.java","src/main/java/parameters/spread/model/package-info.java","src/main/java/parameters/spread/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-contentnegotiation_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-contentnegotiation_apiview_properties.json deleted file mode 100644 index 0455247d9b9..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-contentnegotiation_apiview_properties.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "payload.contentnegotiation.ContentNegotiationClientBuilder": "Payload.ContentNegotiation", - "payload.contentnegotiation.DifferentBodyClient": "Payload.ContentNegotiation.DifferentBody", - "payload.contentnegotiation.SameBodyClient": "Payload.ContentNegotiation.SameBody", - "payload.contentnegotiation.differentbody.PngImageAsJson": "Payload.ContentNegotiation.DifferentBody.PngImageAsJson" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-contentnegotiation_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-contentnegotiation_metadata.json index cdbf7b020fb..759f6dc2182 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-contentnegotiation_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-contentnegotiation_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"payload.contentnegotiation.ContentNegotiationClientBuilder":"Payload.ContentNegotiation","payload.contentnegotiation.DifferentBodyClient":"Payload.ContentNegotiation.DifferentBody","payload.contentnegotiation.SameBodyClient":"Payload.ContentNegotiation.SameBody","payload.contentnegotiation.differentbody.PngImageAsJson":"Payload.ContentNegotiation.DifferentBody.PngImageAsJson"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/contentnegotiation/ContentNegotiationClientBuilder.java","src/main/java/payload/contentnegotiation/DifferentBodyClient.java","src/main/java/payload/contentnegotiation/SameBodyClient.java","src/main/java/payload/contentnegotiation/differentbody/PngImageAsJson.java","src/main/java/payload/contentnegotiation/differentbody/package-info.java","src/main/java/payload/contentnegotiation/implementation/ContentNegotiationClientImpl.java","src/main/java/payload/contentnegotiation/implementation/DifferentBodiesImpl.java","src/main/java/payload/contentnegotiation/implementation/SameBodiesImpl.java","src/main/java/payload/contentnegotiation/implementation/package-info.java","src/main/java/payload/contentnegotiation/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"payload.contentnegotiation.ContentNegotiationClientBuilder":"Payload.ContentNegotiation","payload.contentnegotiation.DifferentBodyClient":"Payload.ContentNegotiation.DifferentBody","payload.contentnegotiation.SameBodyClient":"Payload.ContentNegotiation.SameBody","payload.contentnegotiation.differentbody.PngImageAsJson":"Payload.ContentNegotiation.DifferentBody.PngImageAsJson"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/contentnegotiation/ContentNegotiationClientBuilder.java","src/main/java/payload/contentnegotiation/DifferentBodyClient.java","src/main/java/payload/contentnegotiation/SameBodyClient.java","src/main/java/payload/contentnegotiation/differentbody/PngImageAsJson.java","src/main/java/payload/contentnegotiation/differentbody/package-info.java","src/main/java/payload/contentnegotiation/implementation/ContentNegotiationClientImpl.java","src/main/java/payload/contentnegotiation/implementation/DifferentBodiesImpl.java","src/main/java/payload/contentnegotiation/implementation/SameBodiesImpl.java","src/main/java/payload/contentnegotiation/implementation/package-info.java","src/main/java/payload/contentnegotiation/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-jsonmergepatch_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-jsonmergepatch_apiview_properties.json deleted file mode 100644 index c5100fb1da7..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-jsonmergepatch_apiview_properties.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "payload.jsonmergepatch.InnerModel": "Payload.JsonMergePatch.InnerModel", - "payload.jsonmergepatch.JsonMergePatchClient": "Payload.JsonMergePatch", - "payload.jsonmergepatch.JsonMergePatchClientBuilder": "Payload.JsonMergePatch", - "payload.jsonmergepatch.Resource": "Payload.JsonMergePatch.Resource", - "payload.jsonmergepatch.ResourcePatch": "Payload.JsonMergePatch.ResourcePatch" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-jsonmergepatch_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-jsonmergepatch_metadata.json index be9712d903d..5337015ff00 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-jsonmergepatch_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-jsonmergepatch_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"payload.jsonmergepatch.InnerModel":"Payload.JsonMergePatch.InnerModel","payload.jsonmergepatch.JsonMergePatchClient":"Payload.JsonMergePatch","payload.jsonmergepatch.JsonMergePatchClientBuilder":"Payload.JsonMergePatch","payload.jsonmergepatch.Resource":"Payload.JsonMergePatch.Resource","payload.jsonmergepatch.ResourcePatch":"Payload.JsonMergePatch.ResourcePatch"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/jsonmergepatch/InnerModel.java","src/main/java/payload/jsonmergepatch/JsonMergePatchClient.java","src/main/java/payload/jsonmergepatch/JsonMergePatchClientBuilder.java","src/main/java/payload/jsonmergepatch/Resource.java","src/main/java/payload/jsonmergepatch/ResourcePatch.java","src/main/java/payload/jsonmergepatch/implementation/JsonMergePatchClientImpl.java","src/main/java/payload/jsonmergepatch/implementation/JsonMergePatchHelper.java","src/main/java/payload/jsonmergepatch/implementation/package-info.java","src/main/java/payload/jsonmergepatch/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"payload.jsonmergepatch.InnerModel":"Payload.JsonMergePatch.InnerModel","payload.jsonmergepatch.JsonMergePatchClient":"Payload.JsonMergePatch","payload.jsonmergepatch.JsonMergePatchClientBuilder":"Payload.JsonMergePatch","payload.jsonmergepatch.Resource":"Payload.JsonMergePatch.Resource","payload.jsonmergepatch.ResourcePatch":"Payload.JsonMergePatch.ResourcePatch"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/jsonmergepatch/InnerModel.java","src/main/java/payload/jsonmergepatch/JsonMergePatchClient.java","src/main/java/payload/jsonmergepatch/JsonMergePatchClientBuilder.java","src/main/java/payload/jsonmergepatch/Resource.java","src/main/java/payload/jsonmergepatch/ResourcePatch.java","src/main/java/payload/jsonmergepatch/implementation/JsonMergePatchClientImpl.java","src/main/java/payload/jsonmergepatch/implementation/JsonMergePatchHelper.java","src/main/java/payload/jsonmergepatch/implementation/package-info.java","src/main/java/payload/jsonmergepatch/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-mediatype_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-mediatype_apiview_properties.json deleted file mode 100644 index fda724810b8..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-mediatype_apiview_properties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "payload.mediatype.MediaTypeClient": "Payload.MediaType.StringBody", - "payload.mediatype.MediaTypeClientBuilder": "Payload.MediaType" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-mediatype_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-mediatype_metadata.json index 0e07e5814dd..1b3712b3565 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-mediatype_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-mediatype_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"payload.mediatype.MediaTypeClient":"Payload.MediaType.StringBody","payload.mediatype.MediaTypeClientBuilder":"Payload.MediaType"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/mediatype/MediaTypeClient.java","src/main/java/payload/mediatype/MediaTypeClientBuilder.java","src/main/java/payload/mediatype/implementation/MediaTypeClientImpl.java","src/main/java/payload/mediatype/implementation/StringBodiesImpl.java","src/main/java/payload/mediatype/implementation/package-info.java","src/main/java/payload/mediatype/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"payload.mediatype.MediaTypeClient":"Payload.MediaType.StringBody","payload.mediatype.MediaTypeClientBuilder":"Payload.MediaType"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/mediatype/MediaTypeClient.java","src/main/java/payload/mediatype/MediaTypeClientBuilder.java","src/main/java/payload/mediatype/implementation/MediaTypeClientImpl.java","src/main/java/payload/mediatype/implementation/StringBodiesImpl.java","src/main/java/payload/mediatype/implementation/package-info.java","src/main/java/payload/mediatype/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-multipart_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-multipart_apiview_properties.json deleted file mode 100644 index 714b0488219..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-multipart_apiview_properties.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "payload.multipart.Address": "Payload.MultiPart.Address", - "payload.multipart.BinaryArrayPartsRequest": "Payload.MultiPart.BinaryArrayPartsRequest", - "payload.multipart.ComplexHttpPartsModelRequest": "Payload.MultiPart.ComplexHttpPartsModelRequest", - "payload.multipart.ComplexPartsRequest": "Payload.MultiPart.ComplexPartsRequest", - "payload.multipart.FileOptionalContentType": "Payload.MultiPart.FileOptionalContentType", - "payload.multipart.FileRequiredMetaData": "Payload.MultiPart.FileRequiredMetaData", - "payload.multipart.FileSpecificContentType": "Payload.MultiPart.FileSpecificContentType", - "payload.multipart.FileWithHttpPartOptionalContentTypeRequest": "Payload.MultiPart.FileWithHttpPartOptionalContentTypeRequest", - "payload.multipart.FileWithHttpPartRequiredContentTypeRequest": "Payload.MultiPart.FileWithHttpPartRequiredContentTypeRequest", - "payload.multipart.FileWithHttpPartSpecificContentTypeRequest": "Payload.MultiPart.FileWithHttpPartSpecificContentTypeRequest", - "payload.multipart.FormDataClient": "Payload.MultiPart.FormData", - "payload.multipart.FormDataHttpPartsClient": "Payload.MultiPart.FormData.HttpParts", - "payload.multipart.FormDataHttpPartsContentTypeClient": "Payload.MultiPart.FormData.HttpParts.ContentType", - "payload.multipart.FormDataHttpPartsNonStringClient": "Payload.MultiPart.FormData.HttpParts.NonString", - "payload.multipart.ImageFileDetails": null, - "payload.multipart.JsonPartRequest": "Payload.MultiPart.JsonPartRequest", - "payload.multipart.MultiBinaryPartsRequest": "Payload.MultiPart.MultiBinaryPartsRequest", - "payload.multipart.MultiPartClientBuilder": "Payload.MultiPart", - "payload.multipart.MultiPartOptionalRequest": "Payload.MultiPart.MultiPartOptionalRequest", - "payload.multipart.MultiPartRequest": "Payload.MultiPart.MultiPartRequest", - "payload.multipart.MultiPartRequestWithWireName": "Payload.MultiPart.MultiPartRequestWithWireName", - "payload.multipart.PictureFileDetails": null, - "payload.multipart.PicturesFileDetails": null, - "payload.multipart.ProfileImageFileDetails": null, - "payload.multipart.formdata.AnonymousModelRequest": "Payload.MultiPart.FormData.anonymousModel.Request.anonymous", - "payload.multipart.formdata.httpparts.nonstring.FloatRequest": "Payload.MultiPart.FormData.HttpParts.NonString.float.Request.anonymous" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-multipart_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-multipart_metadata.json index 18bd4a9a0e3..0781fed58d7 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-multipart_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-multipart_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"payload.multipart.Address":"Payload.MultiPart.Address","payload.multipart.BinaryArrayPartsRequest":"Payload.MultiPart.BinaryArrayPartsRequest","payload.multipart.ComplexHttpPartsModelRequest":"Payload.MultiPart.ComplexHttpPartsModelRequest","payload.multipart.ComplexPartsRequest":"Payload.MultiPart.ComplexPartsRequest","payload.multipart.FileOptionalContentType":"Payload.MultiPart.FileOptionalContentType","payload.multipart.FileRequiredMetaData":"Payload.MultiPart.FileRequiredMetaData","payload.multipart.FileSpecificContentType":"Payload.MultiPart.FileSpecificContentType","payload.multipart.FileWithHttpPartOptionalContentTypeRequest":"Payload.MultiPart.FileWithHttpPartOptionalContentTypeRequest","payload.multipart.FileWithHttpPartRequiredContentTypeRequest":"Payload.MultiPart.FileWithHttpPartRequiredContentTypeRequest","payload.multipart.FileWithHttpPartSpecificContentTypeRequest":"Payload.MultiPart.FileWithHttpPartSpecificContentTypeRequest","payload.multipart.FormDataClient":"Payload.MultiPart.FormData","payload.multipart.FormDataHttpPartsClient":"Payload.MultiPart.FormData.HttpParts","payload.multipart.FormDataHttpPartsContentTypeClient":"Payload.MultiPart.FormData.HttpParts.ContentType","payload.multipart.FormDataHttpPartsNonStringClient":"Payload.MultiPart.FormData.HttpParts.NonString","payload.multipart.ImageFileDetails":null,"payload.multipart.JsonPartRequest":"Payload.MultiPart.JsonPartRequest","payload.multipart.MultiBinaryPartsRequest":"Payload.MultiPart.MultiBinaryPartsRequest","payload.multipart.MultiPartClientBuilder":"Payload.MultiPart","payload.multipart.MultiPartOptionalRequest":"Payload.MultiPart.MultiPartOptionalRequest","payload.multipart.MultiPartRequest":"Payload.MultiPart.MultiPartRequest","payload.multipart.MultiPartRequestWithWireName":"Payload.MultiPart.MultiPartRequestWithWireName","payload.multipart.PictureFileDetails":null,"payload.multipart.PicturesFileDetails":null,"payload.multipart.ProfileImageFileDetails":null,"payload.multipart.formdata.AnonymousModelRequest":"Payload.MultiPart.FormData.anonymousModel.Request.anonymous","payload.multipart.formdata.httpparts.nonstring.FloatRequest":"Payload.MultiPart.FormData.HttpParts.NonString.float.Request.anonymous"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/multipart/Address.java","src/main/java/payload/multipart/BinaryArrayPartsRequest.java","src/main/java/payload/multipart/ComplexHttpPartsModelRequest.java","src/main/java/payload/multipart/ComplexPartsRequest.java","src/main/java/payload/multipart/FileOptionalContentType.java","src/main/java/payload/multipart/FileRequiredMetaData.java","src/main/java/payload/multipart/FileSpecificContentType.java","src/main/java/payload/multipart/FileWithHttpPartOptionalContentTypeRequest.java","src/main/java/payload/multipart/FileWithHttpPartRequiredContentTypeRequest.java","src/main/java/payload/multipart/FileWithHttpPartSpecificContentTypeRequest.java","src/main/java/payload/multipart/FormDataClient.java","src/main/java/payload/multipart/FormDataHttpPartsClient.java","src/main/java/payload/multipart/FormDataHttpPartsContentTypeClient.java","src/main/java/payload/multipart/FormDataHttpPartsNonStringClient.java","src/main/java/payload/multipart/ImageFileDetails.java","src/main/java/payload/multipart/JsonPartRequest.java","src/main/java/payload/multipart/MultiBinaryPartsRequest.java","src/main/java/payload/multipart/MultiPartClientBuilder.java","src/main/java/payload/multipart/MultiPartOptionalRequest.java","src/main/java/payload/multipart/MultiPartRequest.java","src/main/java/payload/multipart/MultiPartRequestWithWireName.java","src/main/java/payload/multipart/PictureFileDetails.java","src/main/java/payload/multipart/PicturesFileDetails.java","src/main/java/payload/multipart/ProfileImageFileDetails.java","src/main/java/payload/multipart/formdata/AnonymousModelRequest.java","src/main/java/payload/multipart/formdata/httpparts/nonstring/FloatRequest.java","src/main/java/payload/multipart/formdata/httpparts/nonstring/package-info.java","src/main/java/payload/multipart/formdata/package-info.java","src/main/java/payload/multipart/implementation/FormDataHttpPartsContentTypesImpl.java","src/main/java/payload/multipart/implementation/FormDataHttpPartsImpl.java","src/main/java/payload/multipart/implementation/FormDataHttpPartsNonStringsImpl.java","src/main/java/payload/multipart/implementation/FormDatasImpl.java","src/main/java/payload/multipart/implementation/MultiPartClientImpl.java","src/main/java/payload/multipart/implementation/MultipartFormDataHelper.java","src/main/java/payload/multipart/implementation/package-info.java","src/main/java/payload/multipart/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"payload.multipart.Address":"Payload.MultiPart.Address","payload.multipart.BinaryArrayPartsRequest":"Payload.MultiPart.BinaryArrayPartsRequest","payload.multipart.ComplexHttpPartsModelRequest":"Payload.MultiPart.ComplexHttpPartsModelRequest","payload.multipart.ComplexPartsRequest":"Payload.MultiPart.ComplexPartsRequest","payload.multipart.FileDetails":"TypeSpec.Http.File","payload.multipart.FileOptionalContentType":"Payload.MultiPart.FileOptionalContentType","payload.multipart.FileRequiredMetaData":"Payload.MultiPart.FileRequiredMetaData","payload.multipart.FileSpecificContentType":"Payload.MultiPart.FileSpecificContentType","payload.multipart.FileWithHttpPartOptionalContentTypeRequest":"Payload.MultiPart.FileWithHttpPartOptionalContentTypeRequest","payload.multipart.FileWithHttpPartRequiredContentTypeRequest":"Payload.MultiPart.FileWithHttpPartRequiredContentTypeRequest","payload.multipart.FileWithHttpPartSpecificContentTypeRequest":"Payload.MultiPart.FileWithHttpPartSpecificContentTypeRequest","payload.multipart.FilesFileDetails":"TypeSpec.Http.File","payload.multipart.FormDataClient":"Payload.MultiPart.FormData","payload.multipart.FormDataFileClient":"Payload.MultiPart.FormData.File","payload.multipart.FormDataHttpPartsClient":"Payload.MultiPart.FormData.HttpParts","payload.multipart.FormDataHttpPartsContentTypeClient":"Payload.MultiPart.FormData.HttpParts.ContentType","payload.multipart.FormDataHttpPartsNonStringClient":"Payload.MultiPart.FormData.HttpParts.NonString","payload.multipart.ImageFileDetails":null,"payload.multipart.JsonPartRequest":"Payload.MultiPart.JsonPartRequest","payload.multipart.MultiBinaryPartsRequest":"Payload.MultiPart.MultiBinaryPartsRequest","payload.multipart.MultiPartClientBuilder":"Payload.MultiPart","payload.multipart.MultiPartOptionalRequest":"Payload.MultiPart.MultiPartOptionalRequest","payload.multipart.MultiPartRequest":"Payload.MultiPart.MultiPartRequest","payload.multipart.MultiPartRequestWithWireName":"Payload.MultiPart.MultiPartRequestWithWireName","payload.multipart.PictureFileDetails":null,"payload.multipart.PicturesFileDetails":null,"payload.multipart.ProfileImageFileDetails":null,"payload.multipart.formdata.AnonymousModelRequest":"Payload.MultiPart.FormData.anonymousModel.Request.anonymous","payload.multipart.formdata.file.FileWithRequiredFilename":"Payload.MultiPart.FormData.File.FileWithRequiredFilename","payload.multipart.formdata.file.UploadFileArrayRequest":"Payload.MultiPart.FormData.File.uploadFileArray.Request.anonymous","payload.multipart.formdata.file.UploadFileRequiredFilenameRequest":"Payload.MultiPart.FormData.File.uploadFileRequiredFilename.Request.anonymous","payload.multipart.formdata.file.UploadFileSpecificContentTypeRequest":"Payload.MultiPart.FormData.File.uploadFileSpecificContentType.Request.anonymous","payload.multipart.formdata.httpparts.nonstring.FloatRequest":"Payload.MultiPart.FormData.HttpParts.NonString.float.Request.anonymous"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/multipart/Address.java","src/main/java/payload/multipart/BinaryArrayPartsRequest.java","src/main/java/payload/multipart/ComplexHttpPartsModelRequest.java","src/main/java/payload/multipart/ComplexPartsRequest.java","src/main/java/payload/multipart/FileDetails.java","src/main/java/payload/multipart/FileOptionalContentType.java","src/main/java/payload/multipart/FileRequiredMetaData.java","src/main/java/payload/multipart/FileSpecificContentType.java","src/main/java/payload/multipart/FileWithHttpPartOptionalContentTypeRequest.java","src/main/java/payload/multipart/FileWithHttpPartRequiredContentTypeRequest.java","src/main/java/payload/multipart/FileWithHttpPartSpecificContentTypeRequest.java","src/main/java/payload/multipart/FilesFileDetails.java","src/main/java/payload/multipart/FormDataClient.java","src/main/java/payload/multipart/FormDataFileClient.java","src/main/java/payload/multipart/FormDataHttpPartsClient.java","src/main/java/payload/multipart/FormDataHttpPartsContentTypeClient.java","src/main/java/payload/multipart/FormDataHttpPartsNonStringClient.java","src/main/java/payload/multipart/ImageFileDetails.java","src/main/java/payload/multipart/JsonPartRequest.java","src/main/java/payload/multipart/MultiBinaryPartsRequest.java","src/main/java/payload/multipart/MultiPartClientBuilder.java","src/main/java/payload/multipart/MultiPartOptionalRequest.java","src/main/java/payload/multipart/MultiPartRequest.java","src/main/java/payload/multipart/MultiPartRequestWithWireName.java","src/main/java/payload/multipart/PictureFileDetails.java","src/main/java/payload/multipart/PicturesFileDetails.java","src/main/java/payload/multipart/ProfileImageFileDetails.java","src/main/java/payload/multipart/formdata/AnonymousModelRequest.java","src/main/java/payload/multipart/formdata/file/FileWithRequiredFilename.java","src/main/java/payload/multipart/formdata/file/UploadFileArrayRequest.java","src/main/java/payload/multipart/formdata/file/UploadFileRequiredFilenameRequest.java","src/main/java/payload/multipart/formdata/file/UploadFileSpecificContentTypeRequest.java","src/main/java/payload/multipart/formdata/file/package-info.java","src/main/java/payload/multipart/formdata/httpparts/nonstring/FloatRequest.java","src/main/java/payload/multipart/formdata/httpparts/nonstring/package-info.java","src/main/java/payload/multipart/formdata/package-info.java","src/main/java/payload/multipart/implementation/FormDataFilesImpl.java","src/main/java/payload/multipart/implementation/FormDataHttpPartsContentTypesImpl.java","src/main/java/payload/multipart/implementation/FormDataHttpPartsImpl.java","src/main/java/payload/multipart/implementation/FormDataHttpPartsNonStringsImpl.java","src/main/java/payload/multipart/implementation/FormDatasImpl.java","src/main/java/payload/multipart/implementation/MultiPartClientImpl.java","src/main/java/payload/multipart/implementation/MultipartFormDataHelper.java","src/main/java/payload/multipart/implementation/package-info.java","src/main/java/payload/multipart/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-pageable_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-pageable_apiview_properties.json deleted file mode 100644 index aff81f64569..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-pageable_apiview_properties.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "payload.pageable.PageSizeClient": "Payload.Pageable.PageSize", - "payload.pageable.PageableClientBuilder": "Payload.Pageable", - "payload.pageable.Pet": "Payload.Pageable.Pet", - "payload.pageable.ServerDrivenPaginationClient": "Payload.Pageable.ServerDrivenPagination", - "payload.pageable.ServerDrivenPaginationContinuationTokenClient": "Payload.Pageable.ServerDrivenPagination.ContinuationToken", - "payload.pageable.implementation.RequestHeaderResponseHeaderResponse": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.Response.anonymous", - "payload.pageable.implementation.RequestQueryResponseHeaderResponse": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.Response.anonymous", - "payload.pageable.pagesize.implementation.ListWithPageSizeResponse": "Payload.Pageable.PageSize.listWithPageSize.Response.anonymous", - "payload.pageable.pagesize.implementation.ListWithoutContinuationResponse": "Payload.Pageable.PageSize.listWithoutContinuation.Response.anonymous", - "payload.pageable.serverdrivenpagination.NestedLinkResponseNestedItems": "Payload.Pageable.ServerDrivenPagination.nestedLink.Response.nestedItems.anonymous", - "payload.pageable.serverdrivenpagination.NestedLinkResponseNestedNext": "Payload.Pageable.ServerDrivenPagination.nestedLink.Response.nestedNext.anonymous", - "payload.pageable.serverdrivenpagination.continuationtoken.RequestHeaderNestedResponseBodyResponseNestedItems": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.Response.nestedItems.anonymous", - "payload.pageable.serverdrivenpagination.continuationtoken.RequestHeaderNestedResponseBodyResponseNestedNext": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.Response.nestedNext.anonymous", - "payload.pageable.serverdrivenpagination.continuationtoken.RequestQueryNestedResponseBodyResponseNestedItems": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.Response.nestedItems.anonymous", - "payload.pageable.serverdrivenpagination.continuationtoken.RequestQueryNestedResponseBodyResponseNestedNext": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.Response.nestedNext.anonymous", - "payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestHeaderNestedResponseBodyResponse": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.Response.anonymous", - "payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestHeaderResponseBodyResponse": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.Response.anonymous", - "payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestQueryNestedResponseBodyResponse": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.Response.anonymous", - "payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestQueryResponseBodyResponse": "Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.Response.anonymous", - "payload.pageable.serverdrivenpagination.implementation.LinkResponse": "Payload.Pageable.ServerDrivenPagination.link.Response.anonymous", - "payload.pageable.serverdrivenpagination.implementation.LinkStringResponse": "Payload.Pageable.ServerDrivenPagination.linkString.Response.anonymous", - "payload.pageable.serverdrivenpagination.implementation.NestedLinkResponse": "Payload.Pageable.ServerDrivenPagination.nestedLink.Response.anonymous" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-pageable_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-pageable_metadata.json index 1364b0def3c..367e49c6fad 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-pageable_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-pageable_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"payload.pageable.PageSizeClient":"Payload.Pageable.PageSize","payload.pageable.PageableClientBuilder":"Payload.Pageable","payload.pageable.Pet":"Payload.Pageable.Pet","payload.pageable.ServerDrivenPaginationClient":"Payload.Pageable.ServerDrivenPagination","payload.pageable.ServerDrivenPaginationContinuationTokenClient":"Payload.Pageable.ServerDrivenPagination.ContinuationToken","payload.pageable.implementation.RequestHeaderResponseHeaderResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.Response.anonymous","payload.pageable.implementation.RequestQueryResponseHeaderResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.Response.anonymous","payload.pageable.pagesize.implementation.ListWithPageSizeResponse":"Payload.Pageable.PageSize.listWithPageSize.Response.anonymous","payload.pageable.pagesize.implementation.ListWithoutContinuationResponse":"Payload.Pageable.PageSize.listWithoutContinuation.Response.anonymous","payload.pageable.serverdrivenpagination.NestedLinkResponseNestedItems":"Payload.Pageable.ServerDrivenPagination.nestedLink.Response.nestedItems.anonymous","payload.pageable.serverdrivenpagination.NestedLinkResponseNestedNext":"Payload.Pageable.ServerDrivenPagination.nestedLink.Response.nestedNext.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.RequestHeaderNestedResponseBodyResponseNestedItems":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.Response.nestedItems.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.RequestHeaderNestedResponseBodyResponseNestedNext":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.Response.nestedNext.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.RequestQueryNestedResponseBodyResponseNestedItems":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.Response.nestedItems.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.RequestQueryNestedResponseBodyResponseNestedNext":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.Response.nestedNext.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestHeaderNestedResponseBodyResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.Response.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestHeaderResponseBodyResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.Response.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestQueryNestedResponseBodyResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.Response.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestQueryResponseBodyResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.Response.anonymous","payload.pageable.serverdrivenpagination.implementation.LinkResponse":"Payload.Pageable.ServerDrivenPagination.link.Response.anonymous","payload.pageable.serverdrivenpagination.implementation.LinkStringResponse":"Payload.Pageable.ServerDrivenPagination.linkString.Response.anonymous","payload.pageable.serverdrivenpagination.implementation.NestedLinkResponse":"Payload.Pageable.ServerDrivenPagination.nestedLink.Response.anonymous"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/pageable/PageSizeClient.java","src/main/java/payload/pageable/PageableClientBuilder.java","src/main/java/payload/pageable/Pet.java","src/main/java/payload/pageable/ServerDrivenPaginationClient.java","src/main/java/payload/pageable/ServerDrivenPaginationContinuationTokenClient.java","src/main/java/payload/pageable/implementation/PageSizesImpl.java","src/main/java/payload/pageable/implementation/PageableClientImpl.java","src/main/java/payload/pageable/implementation/RequestHeaderResponseHeaderResponse.java","src/main/java/payload/pageable/implementation/RequestQueryResponseHeaderResponse.java","src/main/java/payload/pageable/implementation/ServerDrivenPaginationContinuationTokensImpl.java","src/main/java/payload/pageable/implementation/ServerDrivenPaginationsImpl.java","src/main/java/payload/pageable/implementation/package-info.java","src/main/java/payload/pageable/package-info.java","src/main/java/payload/pageable/pagesize/implementation/ListWithPageSizeResponse.java","src/main/java/payload/pageable/pagesize/implementation/ListWithoutContinuationResponse.java","src/main/java/payload/pageable/pagesize/implementation/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/NestedLinkResponseNestedItems.java","src/main/java/payload/pageable/serverdrivenpagination/NestedLinkResponseNestedNext.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/RequestHeaderNestedResponseBodyResponseNestedItems.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/RequestHeaderNestedResponseBodyResponseNestedNext.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/RequestQueryNestedResponseBodyResponseNestedItems.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/RequestQueryNestedResponseBodyResponseNestedNext.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/RequestHeaderNestedResponseBodyResponse.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/RequestHeaderResponseBodyResponse.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/RequestQueryNestedResponseBodyResponse.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/RequestQueryResponseBodyResponse.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/implementation/LinkResponse.java","src/main/java/payload/pageable/serverdrivenpagination/implementation/LinkStringResponse.java","src/main/java/payload/pageable/serverdrivenpagination/implementation/NestedLinkResponse.java","src/main/java/payload/pageable/serverdrivenpagination/implementation/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"payload.pageable.PageSizeClient":"Payload.Pageable.PageSize","payload.pageable.PageableClientBuilder":"Payload.Pageable","payload.pageable.Pet":"Payload.Pageable.Pet","payload.pageable.ServerDrivenPaginationAlternateInitialVerbClient":"Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb","payload.pageable.ServerDrivenPaginationClient":"Payload.Pageable.ServerDrivenPagination","payload.pageable.ServerDrivenPaginationContinuationTokenClient":"Payload.Pageable.ServerDrivenPagination.ContinuationToken","payload.pageable.XmlPaginationClient":"Payload.Pageable.XmlPagination","payload.pageable.XmlPet":"Payload.Pageable.XmlPet","payload.pageable.implementation.RequestHeaderResponseHeaderResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.Response.anonymous","payload.pageable.implementation.RequestQueryResponseHeaderResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.Response.anonymous","payload.pageable.implementation.XmlPetListResult":"Payload.Pageable.XmlPetListResult","payload.pageable.implementation.XmlPetListResultWithNextLink":"Payload.Pageable.XmlPetListResultWithNextLink","payload.pageable.pagesize.implementation.ListWithPageSizeResponse":"Payload.Pageable.PageSize.listWithPageSize.Response.anonymous","payload.pageable.pagesize.implementation.ListWithoutContinuationResponse":"Payload.Pageable.PageSize.listWithoutContinuation.Response.anonymous","payload.pageable.serverdrivenpagination.NestedLinkResponseNestedItems":"Payload.Pageable.ServerDrivenPagination.nestedLink.Response.nestedItems.anonymous","payload.pageable.serverdrivenpagination.NestedLinkResponseNestedNext":"Payload.Pageable.ServerDrivenPagination.nestedLink.Response.nestedNext.anonymous","payload.pageable.serverdrivenpagination.alternateinitialverb.Filter":"Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.Filter","payload.pageable.serverdrivenpagination.alternateinitialverb.implementation.PostResponse":"Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post.Response.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.RequestHeaderNestedResponseBodyResponseNestedItems":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.Response.nestedItems.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.RequestHeaderNestedResponseBodyResponseNestedNext":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.Response.nestedNext.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.RequestQueryNestedResponseBodyResponseNestedItems":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.Response.nestedItems.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.RequestQueryNestedResponseBodyResponseNestedNext":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.Response.nestedNext.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestHeaderNestedResponseBodyResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.Response.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestHeaderResponseBodyResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.Response.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestQueryNestedResponseBodyResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.Response.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestQueryResponseBodyResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.Response.anonymous","payload.pageable.serverdrivenpagination.implementation.LinkResponse":"Payload.Pageable.ServerDrivenPagination.link.Response.anonymous","payload.pageable.serverdrivenpagination.implementation.LinkStringResponse":"Payload.Pageable.ServerDrivenPagination.linkString.Response.anonymous","payload.pageable.serverdrivenpagination.implementation.NestedLinkResponse":"Payload.Pageable.ServerDrivenPagination.nestedLink.Response.anonymous"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/pageable/PageSizeClient.java","src/main/java/payload/pageable/PageableClientBuilder.java","src/main/java/payload/pageable/Pet.java","src/main/java/payload/pageable/ServerDrivenPaginationAlternateInitialVerbClient.java","src/main/java/payload/pageable/ServerDrivenPaginationClient.java","src/main/java/payload/pageable/ServerDrivenPaginationContinuationTokenClient.java","src/main/java/payload/pageable/XmlPaginationClient.java","src/main/java/payload/pageable/XmlPet.java","src/main/java/payload/pageable/implementation/PageSizesImpl.java","src/main/java/payload/pageable/implementation/PageableClientImpl.java","src/main/java/payload/pageable/implementation/RequestHeaderResponseHeaderResponse.java","src/main/java/payload/pageable/implementation/RequestQueryResponseHeaderResponse.java","src/main/java/payload/pageable/implementation/ServerDrivenPaginationAlternateInitialVerbsImpl.java","src/main/java/payload/pageable/implementation/ServerDrivenPaginationContinuationTokensImpl.java","src/main/java/payload/pageable/implementation/ServerDrivenPaginationsImpl.java","src/main/java/payload/pageable/implementation/XmlPaginationsImpl.java","src/main/java/payload/pageable/implementation/XmlPetListResult.java","src/main/java/payload/pageable/implementation/XmlPetListResultWithNextLink.java","src/main/java/payload/pageable/implementation/package-info.java","src/main/java/payload/pageable/package-info.java","src/main/java/payload/pageable/pagesize/implementation/ListWithPageSizeResponse.java","src/main/java/payload/pageable/pagesize/implementation/ListWithoutContinuationResponse.java","src/main/java/payload/pageable/pagesize/implementation/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/NestedLinkResponseNestedItems.java","src/main/java/payload/pageable/serverdrivenpagination/NestedLinkResponseNestedNext.java","src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/Filter.java","src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/implementation/PostResponse.java","src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/implementation/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/RequestHeaderNestedResponseBodyResponseNestedItems.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/RequestHeaderNestedResponseBodyResponseNestedNext.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/RequestQueryNestedResponseBodyResponseNestedItems.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/RequestQueryNestedResponseBodyResponseNestedNext.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/RequestHeaderNestedResponseBodyResponse.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/RequestHeaderResponseBodyResponse.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/RequestQueryNestedResponseBodyResponse.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/RequestQueryResponseBodyResponse.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/implementation/LinkResponse.java","src/main/java/payload/pageable/serverdrivenpagination/implementation/LinkStringResponse.java","src/main/java/payload/pageable/serverdrivenpagination/implementation/NestedLinkResponse.java","src/main/java/payload/pageable/serverdrivenpagination/implementation/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-xml_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-xml_apiview_properties.json deleted file mode 100644 index f1b33e885f7..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-xml_apiview_properties.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "payload.xml.ModelWithArrayOfModel": "Payload.Xml.ModelWithArrayOfModel", - "payload.xml.ModelWithArrayOfModelValueClient": "Payload.Xml.ModelWithArrayOfModelValue", - "payload.xml.ModelWithAttributes": "Payload.Xml.ModelWithAttributes", - "payload.xml.ModelWithAttributesValueClient": "Payload.Xml.ModelWithAttributesValue", - "payload.xml.ModelWithDictionary": "Payload.Xml.ModelWithDictionary", - "payload.xml.ModelWithDictionaryValueClient": "Payload.Xml.ModelWithDictionaryValue", - "payload.xml.ModelWithEmptyArray": "Payload.Xml.ModelWithEmptyArray", - "payload.xml.ModelWithEmptyArrayValueClient": "Payload.Xml.ModelWithEmptyArrayValue", - "payload.xml.ModelWithEncodedNames": "Payload.Xml.ModelWithEncodedNames", - "payload.xml.ModelWithEncodedNamesValueClient": "Payload.Xml.ModelWithEncodedNamesValue", - "payload.xml.ModelWithOptionalField": "Payload.Xml.ModelWithOptionalField", - "payload.xml.ModelWithOptionalFieldValueClient": "Payload.Xml.ModelWithOptionalFieldValue", - "payload.xml.ModelWithRenamedArrays": "Payload.Xml.ModelWithRenamedArrays", - "payload.xml.ModelWithRenamedArraysValueClient": "Payload.Xml.ModelWithRenamedArraysValue", - "payload.xml.ModelWithRenamedFields": "Payload.Xml.ModelWithRenamedFields", - "payload.xml.ModelWithRenamedFieldsValueClient": "Payload.Xml.ModelWithRenamedFieldsValue", - "payload.xml.ModelWithSimpleArrays": "Payload.Xml.ModelWithSimpleArrays", - "payload.xml.ModelWithSimpleArraysValueClient": "Payload.Xml.ModelWithSimpleArraysValue", - "payload.xml.ModelWithText": "Payload.Xml.ModelWithText", - "payload.xml.ModelWithTextValueClient": "Payload.Xml.ModelWithTextValue", - "payload.xml.ModelWithUnwrappedArray": "Payload.Xml.ModelWithUnwrappedArray", - "payload.xml.ModelWithUnwrappedArrayValueClient": "Payload.Xml.ModelWithUnwrappedArrayValue", - "payload.xml.SimpleModel": "Payload.Xml.SimpleModel", - "payload.xml.SimpleModelValueClient": "Payload.Xml.SimpleModelValue", - "payload.xml.XmlClientBuilder": "Payload.Xml" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-xml_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-xml_metadata.json index 97758add39b..51d86e9ae61 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-xml_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-xml_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"payload.xml.ModelWithArrayOfModel":"Payload.Xml.ModelWithArrayOfModel","payload.xml.ModelWithArrayOfModelValueClient":"Payload.Xml.ModelWithArrayOfModelValue","payload.xml.ModelWithAttributes":"Payload.Xml.ModelWithAttributes","payload.xml.ModelWithAttributesValueClient":"Payload.Xml.ModelWithAttributesValue","payload.xml.ModelWithDictionary":"Payload.Xml.ModelWithDictionary","payload.xml.ModelWithDictionaryValueClient":"Payload.Xml.ModelWithDictionaryValue","payload.xml.ModelWithEmptyArray":"Payload.Xml.ModelWithEmptyArray","payload.xml.ModelWithEmptyArrayValueClient":"Payload.Xml.ModelWithEmptyArrayValue","payload.xml.ModelWithEncodedNames":"Payload.Xml.ModelWithEncodedNames","payload.xml.ModelWithEncodedNamesValueClient":"Payload.Xml.ModelWithEncodedNamesValue","payload.xml.ModelWithOptionalField":"Payload.Xml.ModelWithOptionalField","payload.xml.ModelWithOptionalFieldValueClient":"Payload.Xml.ModelWithOptionalFieldValue","payload.xml.ModelWithRenamedArrays":"Payload.Xml.ModelWithRenamedArrays","payload.xml.ModelWithRenamedArraysValueClient":"Payload.Xml.ModelWithRenamedArraysValue","payload.xml.ModelWithRenamedFields":"Payload.Xml.ModelWithRenamedFields","payload.xml.ModelWithRenamedFieldsValueClient":"Payload.Xml.ModelWithRenamedFieldsValue","payload.xml.ModelWithSimpleArrays":"Payload.Xml.ModelWithSimpleArrays","payload.xml.ModelWithSimpleArraysValueClient":"Payload.Xml.ModelWithSimpleArraysValue","payload.xml.ModelWithText":"Payload.Xml.ModelWithText","payload.xml.ModelWithTextValueClient":"Payload.Xml.ModelWithTextValue","payload.xml.ModelWithUnwrappedArray":"Payload.Xml.ModelWithUnwrappedArray","payload.xml.ModelWithUnwrappedArrayValueClient":"Payload.Xml.ModelWithUnwrappedArrayValue","payload.xml.SimpleModel":"Payload.Xml.SimpleModel","payload.xml.SimpleModelValueClient":"Payload.Xml.SimpleModelValue","payload.xml.XmlClientBuilder":"Payload.Xml"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/xml/ModelWithArrayOfModel.java","src/main/java/payload/xml/ModelWithArrayOfModelValueClient.java","src/main/java/payload/xml/ModelWithAttributes.java","src/main/java/payload/xml/ModelWithAttributesValueClient.java","src/main/java/payload/xml/ModelWithDictionary.java","src/main/java/payload/xml/ModelWithDictionaryValueClient.java","src/main/java/payload/xml/ModelWithEmptyArray.java","src/main/java/payload/xml/ModelWithEmptyArrayValueClient.java","src/main/java/payload/xml/ModelWithEncodedNames.java","src/main/java/payload/xml/ModelWithEncodedNamesValueClient.java","src/main/java/payload/xml/ModelWithOptionalField.java","src/main/java/payload/xml/ModelWithOptionalFieldValueClient.java","src/main/java/payload/xml/ModelWithRenamedArrays.java","src/main/java/payload/xml/ModelWithRenamedArraysValueClient.java","src/main/java/payload/xml/ModelWithRenamedFields.java","src/main/java/payload/xml/ModelWithRenamedFieldsValueClient.java","src/main/java/payload/xml/ModelWithSimpleArrays.java","src/main/java/payload/xml/ModelWithSimpleArraysValueClient.java","src/main/java/payload/xml/ModelWithText.java","src/main/java/payload/xml/ModelWithTextValueClient.java","src/main/java/payload/xml/ModelWithUnwrappedArray.java","src/main/java/payload/xml/ModelWithUnwrappedArrayValueClient.java","src/main/java/payload/xml/SimpleModel.java","src/main/java/payload/xml/SimpleModelValueClient.java","src/main/java/payload/xml/XmlClientBuilder.java","src/main/java/payload/xml/implementation/ModelWithArrayOfModelValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithAttributesValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithDictionaryValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithEmptyArrayValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithEncodedNamesValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithOptionalFieldValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedArraysValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedFieldsValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithSimpleArraysValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithTextValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithUnwrappedArrayValuesImpl.java","src/main/java/payload/xml/implementation/SimpleModelValuesImpl.java","src/main/java/payload/xml/implementation/XmlClientImpl.java","src/main/java/payload/xml/implementation/package-info.java","src/main/java/payload/xml/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"payload.xml.Author":"Payload.Xml.Author","payload.xml.Book":"Payload.Xml.Book","payload.xml.ModelWithArrayOfModel":"Payload.Xml.ModelWithArrayOfModel","payload.xml.ModelWithArrayOfModelValueClient":"Payload.Xml.ModelWithArrayOfModelValue","payload.xml.ModelWithAttributes":"Payload.Xml.ModelWithAttributes","payload.xml.ModelWithAttributesValueClient":"Payload.Xml.ModelWithAttributesValue","payload.xml.ModelWithDatetime":"Payload.Xml.ModelWithDatetime","payload.xml.ModelWithDatetimeValueClient":"Payload.Xml.ModelWithDatetimeValue","payload.xml.ModelWithDictionary":"Payload.Xml.ModelWithDictionary","payload.xml.ModelWithDictionaryValueClient":"Payload.Xml.ModelWithDictionaryValue","payload.xml.ModelWithEmptyArray":"Payload.Xml.ModelWithEmptyArray","payload.xml.ModelWithEmptyArrayValueClient":"Payload.Xml.ModelWithEmptyArrayValue","payload.xml.ModelWithEncodedNames":"Payload.Xml.ModelWithEncodedNames","payload.xml.ModelWithEncodedNamesValueClient":"Payload.Xml.ModelWithEncodedNamesValue","payload.xml.ModelWithEnum":"Payload.Xml.ModelWithEnum","payload.xml.ModelWithEnumValueClient":"Payload.Xml.ModelWithEnumValue","payload.xml.ModelWithNamespace":"Payload.Xml.ModelWithNamespace","payload.xml.ModelWithNamespaceOnProperties":"Payload.Xml.ModelWithNamespaceOnProperties","payload.xml.ModelWithNamespaceOnPropertiesValueClient":"Payload.Xml.ModelWithNamespaceOnPropertiesValue","payload.xml.ModelWithNamespaceValueClient":"Payload.Xml.ModelWithNamespaceValue","payload.xml.ModelWithNestedModel":"Payload.Xml.ModelWithNestedModel","payload.xml.ModelWithNestedModelValueClient":"Payload.Xml.ModelWithNestedModelValue","payload.xml.ModelWithOptionalField":"Payload.Xml.ModelWithOptionalField","payload.xml.ModelWithOptionalFieldValueClient":"Payload.Xml.ModelWithOptionalFieldValue","payload.xml.ModelWithRenamedArrays":"Payload.Xml.ModelWithRenamedArrays","payload.xml.ModelWithRenamedArraysValueClient":"Payload.Xml.ModelWithRenamedArraysValue","payload.xml.ModelWithRenamedAttribute":"Payload.Xml.ModelWithRenamedAttribute","payload.xml.ModelWithRenamedAttributeValueClient":"Payload.Xml.ModelWithRenamedAttributeValue","payload.xml.ModelWithRenamedFields":"Payload.Xml.ModelWithRenamedFields","payload.xml.ModelWithRenamedFieldsValueClient":"Payload.Xml.ModelWithRenamedFieldsValue","payload.xml.ModelWithRenamedNestedModel":"Payload.Xml.ModelWithRenamedNestedModel","payload.xml.ModelWithRenamedNestedModelValueClient":"Payload.Xml.ModelWithRenamedNestedModelValue","payload.xml.ModelWithRenamedProperty":"Payload.Xml.ModelWithRenamedProperty","payload.xml.ModelWithRenamedPropertyValueClient":"Payload.Xml.ModelWithRenamedPropertyValue","payload.xml.ModelWithRenamedUnwrappedModelArray":"Payload.Xml.ModelWithRenamedUnwrappedModelArray","payload.xml.ModelWithRenamedUnwrappedModelArrayValueClient":"Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue","payload.xml.ModelWithRenamedWrappedAndItemModelArray":"Payload.Xml.ModelWithRenamedWrappedAndItemModelArray","payload.xml.ModelWithRenamedWrappedAndItemModelArrayValueClient":"Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue","payload.xml.ModelWithRenamedWrappedModelArray":"Payload.Xml.ModelWithRenamedWrappedModelArray","payload.xml.ModelWithRenamedWrappedModelArrayValueClient":"Payload.Xml.ModelWithRenamedWrappedModelArrayValue","payload.xml.ModelWithSimpleArrays":"Payload.Xml.ModelWithSimpleArrays","payload.xml.ModelWithSimpleArraysValueClient":"Payload.Xml.ModelWithSimpleArraysValue","payload.xml.ModelWithText":"Payload.Xml.ModelWithText","payload.xml.ModelWithTextValueClient":"Payload.Xml.ModelWithTextValue","payload.xml.ModelWithUnwrappedArray":"Payload.Xml.ModelWithUnwrappedArray","payload.xml.ModelWithUnwrappedArrayValueClient":"Payload.Xml.ModelWithUnwrappedArrayValue","payload.xml.ModelWithUnwrappedModelArray":"Payload.Xml.ModelWithUnwrappedModelArray","payload.xml.ModelWithUnwrappedModelArrayValueClient":"Payload.Xml.ModelWithUnwrappedModelArrayValue","payload.xml.ModelWithWrappedPrimitiveCustomItemNames":"Payload.Xml.ModelWithWrappedPrimitiveCustomItemNames","payload.xml.ModelWithWrappedPrimitiveCustomItemNamesValueClient":"Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue","payload.xml.SimpleModel":"Payload.Xml.SimpleModel","payload.xml.SimpleModelValueClient":"Payload.Xml.SimpleModelValue","payload.xml.Status":"Payload.Xml.Status","payload.xml.XmlClientBuilder":"Payload.Xml","payload.xml.XmlErrorBody":"Payload.Xml.XmlErrorBody","payload.xml.XmlErrorValueClient":"Payload.Xml.XmlErrorValue"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/xml/Author.java","src/main/java/payload/xml/Book.java","src/main/java/payload/xml/ModelWithArrayOfModel.java","src/main/java/payload/xml/ModelWithArrayOfModelValueClient.java","src/main/java/payload/xml/ModelWithAttributes.java","src/main/java/payload/xml/ModelWithAttributesValueClient.java","src/main/java/payload/xml/ModelWithDatetime.java","src/main/java/payload/xml/ModelWithDatetimeValueClient.java","src/main/java/payload/xml/ModelWithDictionary.java","src/main/java/payload/xml/ModelWithDictionaryValueClient.java","src/main/java/payload/xml/ModelWithEmptyArray.java","src/main/java/payload/xml/ModelWithEmptyArrayValueClient.java","src/main/java/payload/xml/ModelWithEncodedNames.java","src/main/java/payload/xml/ModelWithEncodedNamesValueClient.java","src/main/java/payload/xml/ModelWithEnum.java","src/main/java/payload/xml/ModelWithEnumValueClient.java","src/main/java/payload/xml/ModelWithNamespace.java","src/main/java/payload/xml/ModelWithNamespaceOnProperties.java","src/main/java/payload/xml/ModelWithNamespaceOnPropertiesValueClient.java","src/main/java/payload/xml/ModelWithNamespaceValueClient.java","src/main/java/payload/xml/ModelWithNestedModel.java","src/main/java/payload/xml/ModelWithNestedModelValueClient.java","src/main/java/payload/xml/ModelWithOptionalField.java","src/main/java/payload/xml/ModelWithOptionalFieldValueClient.java","src/main/java/payload/xml/ModelWithRenamedArrays.java","src/main/java/payload/xml/ModelWithRenamedArraysValueClient.java","src/main/java/payload/xml/ModelWithRenamedAttribute.java","src/main/java/payload/xml/ModelWithRenamedAttributeValueClient.java","src/main/java/payload/xml/ModelWithRenamedFields.java","src/main/java/payload/xml/ModelWithRenamedFieldsValueClient.java","src/main/java/payload/xml/ModelWithRenamedNestedModel.java","src/main/java/payload/xml/ModelWithRenamedNestedModelValueClient.java","src/main/java/payload/xml/ModelWithRenamedProperty.java","src/main/java/payload/xml/ModelWithRenamedPropertyValueClient.java","src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArray.java","src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArrayValueClient.java","src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArray.java","src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArrayValueClient.java","src/main/java/payload/xml/ModelWithRenamedWrappedModelArray.java","src/main/java/payload/xml/ModelWithRenamedWrappedModelArrayValueClient.java","src/main/java/payload/xml/ModelWithSimpleArrays.java","src/main/java/payload/xml/ModelWithSimpleArraysValueClient.java","src/main/java/payload/xml/ModelWithText.java","src/main/java/payload/xml/ModelWithTextValueClient.java","src/main/java/payload/xml/ModelWithUnwrappedArray.java","src/main/java/payload/xml/ModelWithUnwrappedArrayValueClient.java","src/main/java/payload/xml/ModelWithUnwrappedModelArray.java","src/main/java/payload/xml/ModelWithUnwrappedModelArrayValueClient.java","src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNames.java","src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNamesValueClient.java","src/main/java/payload/xml/SimpleModel.java","src/main/java/payload/xml/SimpleModelValueClient.java","src/main/java/payload/xml/Status.java","src/main/java/payload/xml/XmlClientBuilder.java","src/main/java/payload/xml/XmlErrorBody.java","src/main/java/payload/xml/XmlErrorValueClient.java","src/main/java/payload/xml/implementation/ModelWithArrayOfModelValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithAttributesValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithDatetimeValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithDictionaryValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithEmptyArrayValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithEncodedNamesValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithEnumValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithNamespaceOnPropertiesValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithNamespaceValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithNestedModelValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithOptionalFieldValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedArraysValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedAttributeValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedFieldsValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedNestedModelValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedPropertyValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedUnwrappedModelArrayValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedWrappedAndItemModelArrayValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedWrappedModelArrayValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithSimpleArraysValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithTextValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithUnwrappedArrayValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithUnwrappedModelArrayValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithWrappedPrimitiveCustomItemNamesValuesImpl.java","src/main/java/payload/xml/implementation/SimpleModelValuesImpl.java","src/main/java/payload/xml/implementation/XmlClientImpl.java","src/main/java/payload/xml/implementation/XmlErrorValuesImpl.java","src/main/java/payload/xml/implementation/package-info.java","src/main/java/payload/xml/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/response-statuscoderange_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/response-statuscoderange_apiview_properties.json deleted file mode 100644 index 9580539bebf..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/response-statuscoderange_apiview_properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "response.statuscoderange.DefaultError": "Response.StatusCodeRange.DefaultError", - "response.statuscoderange.ErrorInRange": "Response.StatusCodeRange.ErrorInRange", - "response.statuscoderange.NotFoundError": "Response.StatusCodeRange.NotFoundError", - "response.statuscoderange.Standard4XXError": "Response.StatusCodeRange.Standard4XXError", - "response.statuscoderange.StatusCodeRangeClient": "Response.StatusCodeRange", - "response.statuscoderange.StatusCodeRangeClientBuilder": "Response.StatusCodeRange" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/response-statuscoderange_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/response-statuscoderange_metadata.json index ba2b15e791d..9126293b7e4 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/response-statuscoderange_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/response-statuscoderange_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"response.statuscoderange.DefaultError":"Response.StatusCodeRange.DefaultError","response.statuscoderange.ErrorInRange":"Response.StatusCodeRange.ErrorInRange","response.statuscoderange.NotFoundError":"Response.StatusCodeRange.NotFoundError","response.statuscoderange.Standard4XXError":"Response.StatusCodeRange.Standard4XXError","response.statuscoderange.StatusCodeRangeClient":"Response.StatusCodeRange","response.statuscoderange.StatusCodeRangeClientBuilder":"Response.StatusCodeRange"},"generatedFiles":["src/main/java/module-info.java","src/main/java/response/statuscoderange/DefaultError.java","src/main/java/response/statuscoderange/ErrorInRange.java","src/main/java/response/statuscoderange/NotFoundError.java","src/main/java/response/statuscoderange/Standard4XXError.java","src/main/java/response/statuscoderange/StatusCodeRangeClient.java","src/main/java/response/statuscoderange/StatusCodeRangeClientBuilder.java","src/main/java/response/statuscoderange/implementation/StatusCodeRangeClientImpl.java","src/main/java/response/statuscoderange/implementation/package-info.java","src/main/java/response/statuscoderange/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"response.statuscoderange.DefaultError":"Response.StatusCodeRange.DefaultError","response.statuscoderange.ErrorInRange":"Response.StatusCodeRange.ErrorInRange","response.statuscoderange.NotFoundError":"Response.StatusCodeRange.NotFoundError","response.statuscoderange.Standard4XXError":"Response.StatusCodeRange.Standard4XXError","response.statuscoderange.StatusCodeRangeClient":"Response.StatusCodeRange","response.statuscoderange.StatusCodeRangeClientBuilder":"Response.StatusCodeRange"},"generatedFiles":["src/main/java/module-info.java","src/main/java/response/statuscoderange/DefaultError.java","src/main/java/response/statuscoderange/ErrorInRange.java","src/main/java/response/statuscoderange/NotFoundError.java","src/main/java/response/statuscoderange/Standard4XXError.java","src/main/java/response/statuscoderange/StatusCodeRangeClient.java","src/main/java/response/statuscoderange/StatusCodeRangeClientBuilder.java","src/main/java/response/statuscoderange/implementation/StatusCodeRangeClientImpl.java","src/main/java/response/statuscoderange/implementation/package-info.java","src/main/java/response/statuscoderange/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/routes_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/routes_apiview_properties.json deleted file mode 100644 index 592345af146..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/routes_apiview_properties.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "routes.InInterfaceClient": "Routes.InInterface", - "routes.PathParametersClient": "Routes.PathParameters", - "routes.PathParametersLabelExpansionExplodeClient": "Routes.PathParameters.LabelExpansion.Explode", - "routes.PathParametersLabelExpansionStandardClient": "Routes.PathParameters.LabelExpansion.Standard", - "routes.PathParametersMatrixExpansionExplodeClient": "Routes.PathParameters.MatrixExpansion.Explode", - "routes.PathParametersMatrixExpansionStandardClient": "Routes.PathParameters.MatrixExpansion.Standard", - "routes.PathParametersPathExpansionExplodeClient": "Routes.PathParameters.PathExpansion.Explode", - "routes.PathParametersPathExpansionStandardClient": "Routes.PathParameters.PathExpansion.Standard", - "routes.PathParametersReservedExpansionClient": "Routes.PathParameters.ReservedExpansion", - "routes.PathParametersSimpleExpansionExplodeClient": "Routes.PathParameters.SimpleExpansion.Explode", - "routes.PathParametersSimpleExpansionStandardClient": "Routes.PathParameters.SimpleExpansion.Standard", - "routes.QueryParametersClient": "Routes.QueryParameters", - "routes.QueryParametersQueryContinuationExplodeClient": "Routes.QueryParameters.QueryContinuation.Explode", - "routes.QueryParametersQueryContinuationStandardClient": "Routes.QueryParameters.QueryContinuation.Standard", - "routes.QueryParametersQueryExpansionExplodeClient": "Routes.QueryParameters.QueryExpansion.Explode", - "routes.QueryParametersQueryExpansionStandardClient": "Routes.QueryParameters.QueryExpansion.Standard", - "routes.RoutesClient": "Routes", - "routes.RoutesClientBuilder": "Routes" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/routes_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/routes_metadata.json index 102bd4a9499..6eebaf8d784 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/routes_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/routes_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"routes.InInterfaceClient":"Routes.InInterface","routes.PathParametersClient":"Routes.PathParameters","routes.PathParametersLabelExpansionExplodeClient":"Routes.PathParameters.LabelExpansion.Explode","routes.PathParametersLabelExpansionStandardClient":"Routes.PathParameters.LabelExpansion.Standard","routes.PathParametersMatrixExpansionExplodeClient":"Routes.PathParameters.MatrixExpansion.Explode","routes.PathParametersMatrixExpansionStandardClient":"Routes.PathParameters.MatrixExpansion.Standard","routes.PathParametersPathExpansionExplodeClient":"Routes.PathParameters.PathExpansion.Explode","routes.PathParametersPathExpansionStandardClient":"Routes.PathParameters.PathExpansion.Standard","routes.PathParametersReservedExpansionClient":"Routes.PathParameters.ReservedExpansion","routes.PathParametersSimpleExpansionExplodeClient":"Routes.PathParameters.SimpleExpansion.Explode","routes.PathParametersSimpleExpansionStandardClient":"Routes.PathParameters.SimpleExpansion.Standard","routes.QueryParametersClient":"Routes.QueryParameters","routes.QueryParametersQueryContinuationExplodeClient":"Routes.QueryParameters.QueryContinuation.Explode","routes.QueryParametersQueryContinuationStandardClient":"Routes.QueryParameters.QueryContinuation.Standard","routes.QueryParametersQueryExpansionExplodeClient":"Routes.QueryParameters.QueryExpansion.Explode","routes.QueryParametersQueryExpansionStandardClient":"Routes.QueryParameters.QueryExpansion.Standard","routes.RoutesClient":"Routes","routes.RoutesClientBuilder":"Routes"},"generatedFiles":["src/main/java/module-info.java","src/main/java/routes/InInterfaceClient.java","src/main/java/routes/PathParametersClient.java","src/main/java/routes/PathParametersLabelExpansionExplodeClient.java","src/main/java/routes/PathParametersLabelExpansionStandardClient.java","src/main/java/routes/PathParametersMatrixExpansionExplodeClient.java","src/main/java/routes/PathParametersMatrixExpansionStandardClient.java","src/main/java/routes/PathParametersPathExpansionExplodeClient.java","src/main/java/routes/PathParametersPathExpansionStandardClient.java","src/main/java/routes/PathParametersReservedExpansionClient.java","src/main/java/routes/PathParametersSimpleExpansionExplodeClient.java","src/main/java/routes/PathParametersSimpleExpansionStandardClient.java","src/main/java/routes/QueryParametersClient.java","src/main/java/routes/QueryParametersQueryContinuationExplodeClient.java","src/main/java/routes/QueryParametersQueryContinuationStandardClient.java","src/main/java/routes/QueryParametersQueryExpansionExplodeClient.java","src/main/java/routes/QueryParametersQueryExpansionStandardClient.java","src/main/java/routes/RoutesClient.java","src/main/java/routes/RoutesClientBuilder.java","src/main/java/routes/implementation/InInterfacesImpl.java","src/main/java/routes/implementation/PathParametersImpl.java","src/main/java/routes/implementation/PathParametersLabelExpansionExplodesImpl.java","src/main/java/routes/implementation/PathParametersLabelExpansionStandardsImpl.java","src/main/java/routes/implementation/PathParametersMatrixExpansionExplodesImpl.java","src/main/java/routes/implementation/PathParametersMatrixExpansionStandardsImpl.java","src/main/java/routes/implementation/PathParametersPathExpansionExplodesImpl.java","src/main/java/routes/implementation/PathParametersPathExpansionStandardsImpl.java","src/main/java/routes/implementation/PathParametersReservedExpansionsImpl.java","src/main/java/routes/implementation/PathParametersSimpleExpansionExplodesImpl.java","src/main/java/routes/implementation/PathParametersSimpleExpansionStandardsImpl.java","src/main/java/routes/implementation/QueryParametersImpl.java","src/main/java/routes/implementation/QueryParametersQueryContinuationExplodesImpl.java","src/main/java/routes/implementation/QueryParametersQueryContinuationStandardsImpl.java","src/main/java/routes/implementation/QueryParametersQueryExpansionExplodesImpl.java","src/main/java/routes/implementation/QueryParametersQueryExpansionStandardsImpl.java","src/main/java/routes/implementation/RoutesClientImpl.java","src/main/java/routes/implementation/package-info.java","src/main/java/routes/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"routes.InInterfaceClient":"Routes.InInterface","routes.PathParametersClient":"Routes.PathParameters","routes.PathParametersLabelExpansionExplodeClient":"Routes.PathParameters.LabelExpansion.Explode","routes.PathParametersLabelExpansionStandardClient":"Routes.PathParameters.LabelExpansion.Standard","routes.PathParametersMatrixExpansionExplodeClient":"Routes.PathParameters.MatrixExpansion.Explode","routes.PathParametersMatrixExpansionStandardClient":"Routes.PathParameters.MatrixExpansion.Standard","routes.PathParametersPathExpansionExplodeClient":"Routes.PathParameters.PathExpansion.Explode","routes.PathParametersPathExpansionStandardClient":"Routes.PathParameters.PathExpansion.Standard","routes.PathParametersReservedExpansionClient":"Routes.PathParameters.ReservedExpansion","routes.PathParametersSimpleExpansionExplodeClient":"Routes.PathParameters.SimpleExpansion.Explode","routes.PathParametersSimpleExpansionStandardClient":"Routes.PathParameters.SimpleExpansion.Standard","routes.QueryParametersClient":"Routes.QueryParameters","routes.QueryParametersQueryContinuationExplodeClient":"Routes.QueryParameters.QueryContinuation.Explode","routes.QueryParametersQueryContinuationStandardClient":"Routes.QueryParameters.QueryContinuation.Standard","routes.QueryParametersQueryExpansionExplodeClient":"Routes.QueryParameters.QueryExpansion.Explode","routes.QueryParametersQueryExpansionStandardClient":"Routes.QueryParameters.QueryExpansion.Standard","routes.RoutesClient":"Routes","routes.RoutesClientBuilder":"Routes"},"generatedFiles":["src/main/java/module-info.java","src/main/java/routes/InInterfaceClient.java","src/main/java/routes/PathParametersClient.java","src/main/java/routes/PathParametersLabelExpansionExplodeClient.java","src/main/java/routes/PathParametersLabelExpansionStandardClient.java","src/main/java/routes/PathParametersMatrixExpansionExplodeClient.java","src/main/java/routes/PathParametersMatrixExpansionStandardClient.java","src/main/java/routes/PathParametersPathExpansionExplodeClient.java","src/main/java/routes/PathParametersPathExpansionStandardClient.java","src/main/java/routes/PathParametersReservedExpansionClient.java","src/main/java/routes/PathParametersSimpleExpansionExplodeClient.java","src/main/java/routes/PathParametersSimpleExpansionStandardClient.java","src/main/java/routes/QueryParametersClient.java","src/main/java/routes/QueryParametersQueryContinuationExplodeClient.java","src/main/java/routes/QueryParametersQueryContinuationStandardClient.java","src/main/java/routes/QueryParametersQueryExpansionExplodeClient.java","src/main/java/routes/QueryParametersQueryExpansionStandardClient.java","src/main/java/routes/RoutesClient.java","src/main/java/routes/RoutesClientBuilder.java","src/main/java/routes/implementation/InInterfacesImpl.java","src/main/java/routes/implementation/PathParametersImpl.java","src/main/java/routes/implementation/PathParametersLabelExpansionExplodesImpl.java","src/main/java/routes/implementation/PathParametersLabelExpansionStandardsImpl.java","src/main/java/routes/implementation/PathParametersMatrixExpansionExplodesImpl.java","src/main/java/routes/implementation/PathParametersMatrixExpansionStandardsImpl.java","src/main/java/routes/implementation/PathParametersPathExpansionExplodesImpl.java","src/main/java/routes/implementation/PathParametersPathExpansionStandardsImpl.java","src/main/java/routes/implementation/PathParametersReservedExpansionsImpl.java","src/main/java/routes/implementation/PathParametersSimpleExpansionExplodesImpl.java","src/main/java/routes/implementation/PathParametersSimpleExpansionStandardsImpl.java","src/main/java/routes/implementation/QueryParametersImpl.java","src/main/java/routes/implementation/QueryParametersQueryContinuationExplodesImpl.java","src/main/java/routes/implementation/QueryParametersQueryContinuationStandardsImpl.java","src/main/java/routes/implementation/QueryParametersQueryExpansionExplodesImpl.java","src/main/java/routes/implementation/QueryParametersQueryExpansionStandardsImpl.java","src/main/java/routes/implementation/RoutesClientImpl.java","src/main/java/routes/implementation/package-info.java","src/main/java/routes/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/serialization-encodedname-json_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/serialization-encodedname-json_apiview_properties.json deleted file mode 100644 index cea41475b7c..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/serialization-encodedname-json_apiview_properties.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "serialization.encodedname.json.JsonClient": "Serialization.EncodedName.Json.Property", - "serialization.encodedname.json.JsonClientBuilder": "Serialization.EncodedName.Json", - "serialization.encodedname.json.property.JsonEncodedNameModel": "Serialization.EncodedName.Json.Property.JsonEncodedNameModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/serialization-encodedname-json_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/serialization-encodedname-json_metadata.json index 62b8db0955c..104880c1aea 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/serialization-encodedname-json_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/serialization-encodedname-json_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"serialization.encodedname.json.JsonClient":"Serialization.EncodedName.Json.Property","serialization.encodedname.json.JsonClientBuilder":"Serialization.EncodedName.Json","serialization.encodedname.json.property.JsonEncodedNameModel":"Serialization.EncodedName.Json.Property.JsonEncodedNameModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/serialization/encodedname/json/JsonClient.java","src/main/java/serialization/encodedname/json/JsonClientBuilder.java","src/main/java/serialization/encodedname/json/implementation/JsonClientImpl.java","src/main/java/serialization/encodedname/json/implementation/PropertiesImpl.java","src/main/java/serialization/encodedname/json/implementation/package-info.java","src/main/java/serialization/encodedname/json/package-info.java","src/main/java/serialization/encodedname/json/property/JsonEncodedNameModel.java","src/main/java/serialization/encodedname/json/property/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"serialization.encodedname.json.JsonClient":"Serialization.EncodedName.Json.Property","serialization.encodedname.json.JsonClientBuilder":"Serialization.EncodedName.Json","serialization.encodedname.json.property.JsonEncodedNameModel":"Serialization.EncodedName.Json.Property.JsonEncodedNameModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/serialization/encodedname/json/JsonClient.java","src/main/java/serialization/encodedname/json/JsonClientBuilder.java","src/main/java/serialization/encodedname/json/implementation/JsonClientImpl.java","src/main/java/serialization/encodedname/json/implementation/PropertiesImpl.java","src/main/java/serialization/encodedname/json/implementation/package-info.java","src/main/java/serialization/encodedname/json/package-info.java","src/main/java/serialization/encodedname/json/property/JsonEncodedNameModel.java","src/main/java/serialization/encodedname/json/property/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-endpoint-notdefined_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-endpoint-notdefined_apiview_properties.json deleted file mode 100644 index 2c9d8db782e..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-endpoint-notdefined_apiview_properties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "server.endpoint.notdefined.NotDefinedClient": "Server.Endpoint.NotDefined", - "server.endpoint.notdefined.NotDefinedClientBuilder": "Server.Endpoint.NotDefined" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-endpoint-notdefined_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-endpoint-notdefined_metadata.json index 11756ff0c14..719d13786b8 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-endpoint-notdefined_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-endpoint-notdefined_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"server.endpoint.notdefined.NotDefinedClient":"Server.Endpoint.NotDefined","server.endpoint.notdefined.NotDefinedClientBuilder":"Server.Endpoint.NotDefined"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/endpoint/notdefined/NotDefinedClient.java","src/main/java/server/endpoint/notdefined/NotDefinedClientBuilder.java","src/main/java/server/endpoint/notdefined/implementation/NotDefinedClientImpl.java","src/main/java/server/endpoint/notdefined/implementation/package-info.java","src/main/java/server/endpoint/notdefined/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"server.endpoint.notdefined.NotDefinedClient":"Server.Endpoint.NotDefined","server.endpoint.notdefined.NotDefinedClientBuilder":"Server.Endpoint.NotDefined"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/endpoint/notdefined/NotDefinedClient.java","src/main/java/server/endpoint/notdefined/NotDefinedClientBuilder.java","src/main/java/server/endpoint/notdefined/implementation/NotDefinedClientImpl.java","src/main/java/server/endpoint/notdefined/implementation/package-info.java","src/main/java/server/endpoint/notdefined/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-path-multiple_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-path-multiple_apiview_properties.json deleted file mode 100644 index b1e5c2d4af1..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-path-multiple_apiview_properties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "server.path.multiple.MultipleClient": "Server.Path.Multiple", - "server.path.multiple.MultipleClientBuilder": "Server.Path.Multiple" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-path-multiple_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-path-multiple_metadata.json index d6a128d08d6..395f0debfdc 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-path-multiple_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-path-multiple_metadata.json @@ -1 +1 @@ -{"flavor":"generic","apiVersion":"v1.0","crossLanguageDefinitions":{"server.path.multiple.MultipleClient":"Server.Path.Multiple","server.path.multiple.MultipleClientBuilder":"Server.Path.Multiple"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/path/multiple/MultipleClient.java","src/main/java/server/path/multiple/MultipleClientBuilder.java","src/main/java/server/path/multiple/MultipleServiceVersion.java","src/main/java/server/path/multiple/implementation/MultipleClientImpl.java","src/main/java/server/path/multiple/implementation/package-info.java","src/main/java/server/path/multiple/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{"Server.Path.Multiple":"v1.0"},"crossLanguageDefinitions":{"server.path.multiple.MultipleClient":"Server.Path.Multiple","server.path.multiple.MultipleClientBuilder":"Server.Path.Multiple"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/path/multiple/MultipleClient.java","src/main/java/server/path/multiple/MultipleClientBuilder.java","src/main/java/server/path/multiple/MultipleServiceVersion.java","src/main/java/server/path/multiple/implementation/MultipleClientImpl.java","src/main/java/server/path/multiple/implementation/package-info.java","src/main/java/server/path/multiple/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-path-single_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-path-single_apiview_properties.json deleted file mode 100644 index ca137cb067c..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-path-single_apiview_properties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "server.path.single.SingleClient": "Server.Path.Single", - "server.path.single.SingleClientBuilder": "Server.Path.Single" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-path-single_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-path-single_metadata.json index aed2425d95b..f1ed719662d 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-path-single_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-path-single_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"server.path.single.SingleClient":"Server.Path.Single","server.path.single.SingleClientBuilder":"Server.Path.Single"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/path/single/SingleClient.java","src/main/java/server/path/single/SingleClientBuilder.java","src/main/java/server/path/single/implementation/SingleClientImpl.java","src/main/java/server/path/single/implementation/package-info.java","src/main/java/server/path/single/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"server.path.single.SingleClient":"Server.Path.Single","server.path.single.SingleClientBuilder":"Server.Path.Single"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/path/single/SingleClient.java","src/main/java/server/path/single/SingleClientBuilder.java","src/main/java/server/path/single/implementation/SingleClientImpl.java","src/main/java/server/path/single/implementation/package-info.java","src/main/java/server/path/single/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-versions-notversioned_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-versions-notversioned_apiview_properties.json deleted file mode 100644 index c2c819d41f8..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-versions-notversioned_apiview_properties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "server.versions.notversioned.NotVersionedClient": "Server.Versions.NotVersioned", - "server.versions.notversioned.NotVersionedClientBuilder": "Server.Versions.NotVersioned" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-versions-notversioned_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-versions-notversioned_metadata.json index cf83534a3a4..bb2eefa1945 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-versions-notversioned_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-versions-notversioned_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"server.versions.notversioned.NotVersionedClient":"Server.Versions.NotVersioned","server.versions.notversioned.NotVersionedClientBuilder":"Server.Versions.NotVersioned"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/versions/notversioned/NotVersionedClient.java","src/main/java/server/versions/notversioned/NotVersionedClientBuilder.java","src/main/java/server/versions/notversioned/implementation/NotVersionedClientImpl.java","src/main/java/server/versions/notversioned/implementation/package-info.java","src/main/java/server/versions/notversioned/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"server.versions.notversioned.NotVersionedClient":"Server.Versions.NotVersioned","server.versions.notversioned.NotVersionedClientBuilder":"Server.Versions.NotVersioned"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/versions/notversioned/NotVersionedClient.java","src/main/java/server/versions/notversioned/NotVersionedClientBuilder.java","src/main/java/server/versions/notversioned/implementation/NotVersionedClientImpl.java","src/main/java/server/versions/notversioned/implementation/package-info.java","src/main/java/server/versions/notversioned/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-versions-versioned_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-versions-versioned_apiview_properties.json deleted file mode 100644 index e324ed27733..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-versions-versioned_apiview_properties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "server.versions.versioned.VersionedClient": "Server.Versions.Versioned", - "server.versions.versioned.VersionedClientBuilder": "Server.Versions.Versioned" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-versions-versioned_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-versions-versioned_metadata.json index 0b038f4903a..632c28ddd6f 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-versions-versioned_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/server-versions-versioned_metadata.json @@ -1 +1 @@ -{"flavor":"generic","apiVersion":"2022-12-01-preview","crossLanguageDefinitions":{"server.versions.versioned.VersionedClient":"Server.Versions.Versioned","server.versions.versioned.VersionedClientBuilder":"Server.Versions.Versioned"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/versions/versioned/VersionedClient.java","src/main/java/server/versions/versioned/VersionedClientBuilder.java","src/main/java/server/versions/versioned/VersionedServiceVersion.java","src/main/java/server/versions/versioned/implementation/VersionedClientImpl.java","src/main/java/server/versions/versioned/implementation/package-info.java","src/main/java/server/versions/versioned/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{"Server.Versions.Versioned":"2022-12-01-preview"},"crossLanguageDefinitions":{"server.versions.versioned.VersionedClient":"Server.Versions.Versioned","server.versions.versioned.VersionedClientBuilder":"Server.Versions.Versioned"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/versions/versioned/VersionedClient.java","src/main/java/server/versions/versioned/VersionedClientBuilder.java","src/main/java/server/versions/versioned/VersionedServiceVersion.java","src/main/java/server/versions/versioned/implementation/VersionedClientImpl.java","src/main/java/server/versions/versioned/implementation/package-info.java","src/main/java/server/versions/versioned/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialheaders-conditionalrequest_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialheaders-conditionalrequest_apiview_properties.json deleted file mode 100644 index 23150a81943..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialheaders-conditionalrequest_apiview_properties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "specialheaders.conditionalrequest.ConditionalRequestClient": "SpecialHeaders.ConditionalRequest", - "specialheaders.conditionalrequest.ConditionalRequestClientBuilder": "SpecialHeaders.ConditionalRequest" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialheaders-conditionalrequest_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialheaders-conditionalrequest_metadata.json index f40d6586c15..0849f9cae47 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialheaders-conditionalrequest_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialheaders-conditionalrequest_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"specialheaders.conditionalrequest.ConditionalRequestClient":"SpecialHeaders.ConditionalRequest","specialheaders.conditionalrequest.ConditionalRequestClientBuilder":"SpecialHeaders.ConditionalRequest"},"generatedFiles":["src/main/java/module-info.java","src/main/java/specialheaders/conditionalrequest/ConditionalRequestClient.java","src/main/java/specialheaders/conditionalrequest/ConditionalRequestClientBuilder.java","src/main/java/specialheaders/conditionalrequest/implementation/ConditionalRequestClientImpl.java","src/main/java/specialheaders/conditionalrequest/implementation/package-info.java","src/main/java/specialheaders/conditionalrequest/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"specialheaders.conditionalrequest.ConditionalRequestClient":"SpecialHeaders.ConditionalRequest","specialheaders.conditionalrequest.ConditionalRequestClientBuilder":"SpecialHeaders.ConditionalRequest"},"generatedFiles":["src/main/java/module-info.java","src/main/java/specialheaders/conditionalrequest/ConditionalRequestClient.java","src/main/java/specialheaders/conditionalrequest/ConditionalRequestClientBuilder.java","src/main/java/specialheaders/conditionalrequest/implementation/ConditionalRequestClientImpl.java","src/main/java/specialheaders/conditionalrequest/implementation/package-info.java","src/main/java/specialheaders/conditionalrequest/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialheaders-repeatability_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialheaders-repeatability_apiview_properties.json deleted file mode 100644 index c5ea90fd03a..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialheaders-repeatability_apiview_properties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "specialheaders.repeatability.RepeatabilityClient": "SpecialHeaders.Repeatability", - "specialheaders.repeatability.RepeatabilityClientBuilder": "SpecialHeaders.Repeatability" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialheaders-repeatability_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialheaders-repeatability_metadata.json index a75b1ea099f..c77054d03ac 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialheaders-repeatability_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialheaders-repeatability_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"specialheaders.repeatability.RepeatabilityClient":"SpecialHeaders.Repeatability","specialheaders.repeatability.RepeatabilityClientBuilder":"SpecialHeaders.Repeatability"},"generatedFiles":["src/main/java/module-info.java","src/main/java/specialheaders/repeatability/RepeatabilityClient.java","src/main/java/specialheaders/repeatability/RepeatabilityClientBuilder.java","src/main/java/specialheaders/repeatability/implementation/RepeatabilityClientImpl.java","src/main/java/specialheaders/repeatability/implementation/package-info.java","src/main/java/specialheaders/repeatability/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"specialheaders.repeatability.RepeatabilityClient":"SpecialHeaders.Repeatability","specialheaders.repeatability.RepeatabilityClientBuilder":"SpecialHeaders.Repeatability"},"generatedFiles":["src/main/java/module-info.java","src/main/java/specialheaders/repeatability/RepeatabilityClient.java","src/main/java/specialheaders/repeatability/RepeatabilityClientBuilder.java","src/main/java/specialheaders/repeatability/implementation/RepeatabilityClientImpl.java","src/main/java/specialheaders/repeatability/implementation/package-info.java","src/main/java/specialheaders/repeatability/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialwords_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialwords_apiview_properties.json deleted file mode 100644 index c7d49cd5883..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialwords_apiview_properties.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "specialwords.ModelPropertiesClient": "SpecialWords.ModelProperties", - "specialwords.ModelsClient": "SpecialWords.Models", - "specialwords.OperationsClient": "SpecialWords.Operations", - "specialwords.ParametersClient": "SpecialWords.Parameters", - "specialwords.SpecialWordsClientBuilder": "SpecialWords", - "specialwords.modelproperties.DictMethods": "SpecialWords.ModelProperties.DictMethods", - "specialwords.modelproperties.ModelWithList": "SpecialWords.ModelProperties.ModelWithList", - "specialwords.modelproperties.SameAsModel": "SpecialWords.ModelProperties.SameAsModel", - "specialwords.models.And": "SpecialWords.Models.and", - "specialwords.models.As": "SpecialWords.Models.as", - "specialwords.models.Assert": "SpecialWords.Models.assert", - "specialwords.models.Async": "SpecialWords.Models.async", - "specialwords.models.Await": "SpecialWords.Models.await", - "specialwords.models.Break": "SpecialWords.Models.break", - "specialwords.models.ClassModel": "SpecialWords.Models.class", - "specialwords.models.Constructor": "SpecialWords.Models.constructor", - "specialwords.models.Continue": "SpecialWords.Models.continue", - "specialwords.models.Def": "SpecialWords.Models.def", - "specialwords.models.Del": "SpecialWords.Models.del", - "specialwords.models.Elif": "SpecialWords.Models.elif", - "specialwords.models.Else": "SpecialWords.Models.else", - "specialwords.models.Except": "SpecialWords.Models.except", - "specialwords.models.Exec": "SpecialWords.Models.exec", - "specialwords.models.Finally": "SpecialWords.Models.finally", - "specialwords.models.For": "SpecialWords.Models.for", - "specialwords.models.From": "SpecialWords.Models.from", - "specialwords.models.Global": "SpecialWords.Models.global", - "specialwords.models.If": "SpecialWords.Models.if", - "specialwords.models.Import": "SpecialWords.Models.import", - "specialwords.models.In": "SpecialWords.Models.in", - "specialwords.models.Is": "SpecialWords.Models.is", - "specialwords.models.Lambda": "SpecialWords.Models.lambda", - "specialwords.models.Not": "SpecialWords.Models.not", - "specialwords.models.Or": "SpecialWords.Models.or", - "specialwords.models.Pass": "SpecialWords.Models.pass", - "specialwords.models.Raise": "SpecialWords.Models.raise", - "specialwords.models.Return": "SpecialWords.Models.return", - "specialwords.models.Try": "SpecialWords.Models.try", - "specialwords.models.While": "SpecialWords.Models.while", - "specialwords.models.With": "SpecialWords.Models.with", - "specialwords.models.Yield": "SpecialWords.Models.yield" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialwords_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialwords_metadata.json index 79ef2f76b07..c711b843ef0 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialwords_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/specialwords_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"specialwords.ModelPropertiesClient":"SpecialWords.ModelProperties","specialwords.ModelsClient":"SpecialWords.Models","specialwords.OperationsClient":"SpecialWords.Operations","specialwords.ParametersClient":"SpecialWords.Parameters","specialwords.SpecialWordsClientBuilder":"SpecialWords","specialwords.modelproperties.DictMethods":"SpecialWords.ModelProperties.DictMethods","specialwords.modelproperties.ModelWithList":"SpecialWords.ModelProperties.ModelWithList","specialwords.modelproperties.SameAsModel":"SpecialWords.ModelProperties.SameAsModel","specialwords.models.And":"SpecialWords.Models.and","specialwords.models.As":"SpecialWords.Models.as","specialwords.models.Assert":"SpecialWords.Models.assert","specialwords.models.Async":"SpecialWords.Models.async","specialwords.models.Await":"SpecialWords.Models.await","specialwords.models.Break":"SpecialWords.Models.break","specialwords.models.ClassModel":"SpecialWords.Models.class","specialwords.models.Constructor":"SpecialWords.Models.constructor","specialwords.models.Continue":"SpecialWords.Models.continue","specialwords.models.Def":"SpecialWords.Models.def","specialwords.models.Del":"SpecialWords.Models.del","specialwords.models.Elif":"SpecialWords.Models.elif","specialwords.models.Else":"SpecialWords.Models.else","specialwords.models.Except":"SpecialWords.Models.except","specialwords.models.Exec":"SpecialWords.Models.exec","specialwords.models.Finally":"SpecialWords.Models.finally","specialwords.models.For":"SpecialWords.Models.for","specialwords.models.From":"SpecialWords.Models.from","specialwords.models.Global":"SpecialWords.Models.global","specialwords.models.If":"SpecialWords.Models.if","specialwords.models.Import":"SpecialWords.Models.import","specialwords.models.In":"SpecialWords.Models.in","specialwords.models.Is":"SpecialWords.Models.is","specialwords.models.Lambda":"SpecialWords.Models.lambda","specialwords.models.Not":"SpecialWords.Models.not","specialwords.models.Or":"SpecialWords.Models.or","specialwords.models.Pass":"SpecialWords.Models.pass","specialwords.models.Raise":"SpecialWords.Models.raise","specialwords.models.Return":"SpecialWords.Models.return","specialwords.models.Try":"SpecialWords.Models.try","specialwords.models.While":"SpecialWords.Models.while","specialwords.models.With":"SpecialWords.Models.with","specialwords.models.Yield":"SpecialWords.Models.yield"},"generatedFiles":["src/main/java/module-info.java","src/main/java/specialwords/ModelPropertiesClient.java","src/main/java/specialwords/ModelsClient.java","src/main/java/specialwords/OperationsClient.java","src/main/java/specialwords/ParametersClient.java","src/main/java/specialwords/SpecialWordsClientBuilder.java","src/main/java/specialwords/implementation/ModelPropertiesImpl.java","src/main/java/specialwords/implementation/ModelsImpl.java","src/main/java/specialwords/implementation/OperationsImpl.java","src/main/java/specialwords/implementation/ParametersImpl.java","src/main/java/specialwords/implementation/SpecialWordsClientImpl.java","src/main/java/specialwords/implementation/package-info.java","src/main/java/specialwords/modelproperties/DictMethods.java","src/main/java/specialwords/modelproperties/ModelWithList.java","src/main/java/specialwords/modelproperties/SameAsModel.java","src/main/java/specialwords/modelproperties/package-info.java","src/main/java/specialwords/models/And.java","src/main/java/specialwords/models/As.java","src/main/java/specialwords/models/Assert.java","src/main/java/specialwords/models/Async.java","src/main/java/specialwords/models/Await.java","src/main/java/specialwords/models/Break.java","src/main/java/specialwords/models/ClassModel.java","src/main/java/specialwords/models/Constructor.java","src/main/java/specialwords/models/Continue.java","src/main/java/specialwords/models/Def.java","src/main/java/specialwords/models/Del.java","src/main/java/specialwords/models/Elif.java","src/main/java/specialwords/models/Else.java","src/main/java/specialwords/models/Except.java","src/main/java/specialwords/models/Exec.java","src/main/java/specialwords/models/Finally.java","src/main/java/specialwords/models/For.java","src/main/java/specialwords/models/From.java","src/main/java/specialwords/models/Global.java","src/main/java/specialwords/models/If.java","src/main/java/specialwords/models/Import.java","src/main/java/specialwords/models/In.java","src/main/java/specialwords/models/Is.java","src/main/java/specialwords/models/Lambda.java","src/main/java/specialwords/models/Not.java","src/main/java/specialwords/models/Or.java","src/main/java/specialwords/models/Pass.java","src/main/java/specialwords/models/Raise.java","src/main/java/specialwords/models/Return.java","src/main/java/specialwords/models/Try.java","src/main/java/specialwords/models/While.java","src/main/java/specialwords/models/With.java","src/main/java/specialwords/models/Yield.java","src/main/java/specialwords/models/package-info.java","src/main/java/specialwords/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"specialwords.ExtensibleStringsClient":"SpecialWords.ExtensibleStrings","specialwords.ModelPropertiesClient":"SpecialWords.ModelProperties","specialwords.ModelsClient":"SpecialWords.Models","specialwords.OperationsClient":"SpecialWords.Operations","specialwords.ParametersClient":"SpecialWords.Parameters","specialwords.SpecialWordsClientBuilder":"SpecialWords","specialwords.extensiblestrings.ExtensibleString":"SpecialWords.ExtensibleStrings.ExtensibleString","specialwords.modelproperties.DictMethods":"SpecialWords.ModelProperties.DictMethods","specialwords.modelproperties.ModelWithList":"SpecialWords.ModelProperties.ModelWithList","specialwords.modelproperties.SameAsModel":"SpecialWords.ModelProperties.SameAsModel","specialwords.models.And":"SpecialWords.Models.and","specialwords.models.As":"SpecialWords.Models.as","specialwords.models.Assert":"SpecialWords.Models.assert","specialwords.models.Async":"SpecialWords.Models.async","specialwords.models.Await":"SpecialWords.Models.await","specialwords.models.Break":"SpecialWords.Models.break","specialwords.models.ClassModel":"SpecialWords.Models.class","specialwords.models.Constructor":"SpecialWords.Models.constructor","specialwords.models.Continue":"SpecialWords.Models.continue","specialwords.models.Def":"SpecialWords.Models.def","specialwords.models.Del":"SpecialWords.Models.del","specialwords.models.Elif":"SpecialWords.Models.elif","specialwords.models.Else":"SpecialWords.Models.else","specialwords.models.Except":"SpecialWords.Models.except","specialwords.models.Exec":"SpecialWords.Models.exec","specialwords.models.Finally":"SpecialWords.Models.finally","specialwords.models.For":"SpecialWords.Models.for","specialwords.models.From":"SpecialWords.Models.from","specialwords.models.Global":"SpecialWords.Models.global","specialwords.models.If":"SpecialWords.Models.if","specialwords.models.Import":"SpecialWords.Models.import","specialwords.models.In":"SpecialWords.Models.in","specialwords.models.Is":"SpecialWords.Models.is","specialwords.models.Lambda":"SpecialWords.Models.lambda","specialwords.models.Not":"SpecialWords.Models.not","specialwords.models.Or":"SpecialWords.Models.or","specialwords.models.Pass":"SpecialWords.Models.pass","specialwords.models.Raise":"SpecialWords.Models.raise","specialwords.models.Return":"SpecialWords.Models.return","specialwords.models.Try":"SpecialWords.Models.try","specialwords.models.While":"SpecialWords.Models.while","specialwords.models.With":"SpecialWords.Models.with","specialwords.models.Yield":"SpecialWords.Models.yield"},"generatedFiles":["src/main/java/module-info.java","src/main/java/specialwords/ExtensibleStringsClient.java","src/main/java/specialwords/ModelPropertiesClient.java","src/main/java/specialwords/ModelsClient.java","src/main/java/specialwords/OperationsClient.java","src/main/java/specialwords/ParametersClient.java","src/main/java/specialwords/SpecialWordsClientBuilder.java","src/main/java/specialwords/extensiblestrings/ExtensibleString.java","src/main/java/specialwords/extensiblestrings/package-info.java","src/main/java/specialwords/implementation/ExtensibleStringsImpl.java","src/main/java/specialwords/implementation/ModelPropertiesImpl.java","src/main/java/specialwords/implementation/ModelsImpl.java","src/main/java/specialwords/implementation/OperationsImpl.java","src/main/java/specialwords/implementation/ParametersImpl.java","src/main/java/specialwords/implementation/SpecialWordsClientImpl.java","src/main/java/specialwords/implementation/package-info.java","src/main/java/specialwords/modelproperties/DictMethods.java","src/main/java/specialwords/modelproperties/ModelWithList.java","src/main/java/specialwords/modelproperties/SameAsModel.java","src/main/java/specialwords/modelproperties/package-info.java","src/main/java/specialwords/models/And.java","src/main/java/specialwords/models/As.java","src/main/java/specialwords/models/Assert.java","src/main/java/specialwords/models/Async.java","src/main/java/specialwords/models/Await.java","src/main/java/specialwords/models/Break.java","src/main/java/specialwords/models/ClassModel.java","src/main/java/specialwords/models/Constructor.java","src/main/java/specialwords/models/Continue.java","src/main/java/specialwords/models/Def.java","src/main/java/specialwords/models/Del.java","src/main/java/specialwords/models/Elif.java","src/main/java/specialwords/models/Else.java","src/main/java/specialwords/models/Except.java","src/main/java/specialwords/models/Exec.java","src/main/java/specialwords/models/Finally.java","src/main/java/specialwords/models/For.java","src/main/java/specialwords/models/From.java","src/main/java/specialwords/models/Global.java","src/main/java/specialwords/models/If.java","src/main/java/specialwords/models/Import.java","src/main/java/specialwords/models/In.java","src/main/java/specialwords/models/Is.java","src/main/java/specialwords/models/Lambda.java","src/main/java/specialwords/models/Not.java","src/main/java/specialwords/models/Or.java","src/main/java/specialwords/models/Pass.java","src/main/java/specialwords/models/Raise.java","src/main/java/specialwords/models/Return.java","src/main/java/specialwords/models/Try.java","src/main/java/specialwords/models/While.java","src/main/java/specialwords/models/With.java","src/main/java/specialwords/models/Yield.java","src/main/java/specialwords/models/package-info.java","src/main/java/specialwords/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/streaming-jsonl_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/streaming-jsonl_apiview_properties.json deleted file mode 100644 index 1061f33663f..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/streaming-jsonl_apiview_properties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "streaming.jsonl.JsonlClient": "Streaming.Jsonl.Basic", - "streaming.jsonl.JsonlClientBuilder": "Streaming.Jsonl" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/streaming-jsonl_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/streaming-jsonl_metadata.json index 6049f936906..0a0b07dbc2f 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/streaming-jsonl_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/streaming-jsonl_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"streaming.jsonl.JsonlClient":"Streaming.Jsonl.Basic","streaming.jsonl.JsonlClientBuilder":"Streaming.Jsonl"},"generatedFiles":["src/main/java/module-info.java","src/main/java/streaming/jsonl/JsonlClient.java","src/main/java/streaming/jsonl/JsonlClientBuilder.java","src/main/java/streaming/jsonl/implementation/BasicsImpl.java","src/main/java/streaming/jsonl/implementation/JsonlClientImpl.java","src/main/java/streaming/jsonl/implementation/package-info.java","src/main/java/streaming/jsonl/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"streaming.jsonl.JsonlClient":"Streaming.Jsonl.Basic","streaming.jsonl.JsonlClientBuilder":"Streaming.Jsonl"},"generatedFiles":["src/main/java/module-info.java","src/main/java/streaming/jsonl/JsonlClient.java","src/main/java/streaming/jsonl/JsonlClientBuilder.java","src/main/java/streaming/jsonl/implementation/BasicsImpl.java","src/main/java/streaming/jsonl/implementation/JsonlClientImpl.java","src/main/java/streaming/jsonl/implementation/package-info.java","src/main/java/streaming/jsonl/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-array_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-array_apiview_properties.json deleted file mode 100644 index a9028cf96f9..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-array_apiview_properties.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.array.ArrayClientBuilder": "Type.Array", - "type.array.BooleanValueClient": "Type.Array.BooleanValue", - "type.array.DatetimeValueClient": "Type.Array.DatetimeValue", - "type.array.DurationValueClient": "Type.Array.DurationValue", - "type.array.Float32ValueClient": "Type.Array.Float32Value", - "type.array.InnerModel": "Type.Array.InnerModel", - "type.array.Int32ValueClient": "Type.Array.Int32Value", - "type.array.Int64ValueClient": "Type.Array.Int64Value", - "type.array.ModelValueClient": "Type.Array.ModelValue", - "type.array.NullableBooleanValueClient": "Type.Array.NullableBooleanValue", - "type.array.NullableFloatValueClient": "Type.Array.NullableFloatValue", - "type.array.NullableInt32ValueClient": "Type.Array.NullableInt32Value", - "type.array.NullableModelValueClient": "Type.Array.NullableModelValue", - "type.array.NullableStringValueClient": "Type.Array.NullableStringValue", - "type.array.StringValueClient": "Type.Array.StringValue", - "type.array.UnknownValueClient": "Type.Array.UnknownValue" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-array_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-array_metadata.json index f32eaa43878..0fa166b1351 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-array_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-array_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.array.ArrayClientBuilder":"Type.Array","type.array.BooleanValueClient":"Type.Array.BooleanValue","type.array.DatetimeValueClient":"Type.Array.DatetimeValue","type.array.DurationValueClient":"Type.Array.DurationValue","type.array.Float32ValueClient":"Type.Array.Float32Value","type.array.InnerModel":"Type.Array.InnerModel","type.array.Int32ValueClient":"Type.Array.Int32Value","type.array.Int64ValueClient":"Type.Array.Int64Value","type.array.ModelValueClient":"Type.Array.ModelValue","type.array.NullableBooleanValueClient":"Type.Array.NullableBooleanValue","type.array.NullableFloatValueClient":"Type.Array.NullableFloatValue","type.array.NullableInt32ValueClient":"Type.Array.NullableInt32Value","type.array.NullableModelValueClient":"Type.Array.NullableModelValue","type.array.NullableStringValueClient":"Type.Array.NullableStringValue","type.array.StringValueClient":"Type.Array.StringValue","type.array.UnknownValueClient":"Type.Array.UnknownValue"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/array/ArrayClientBuilder.java","src/main/java/type/array/BooleanValueClient.java","src/main/java/type/array/DatetimeValueClient.java","src/main/java/type/array/DurationValueClient.java","src/main/java/type/array/Float32ValueClient.java","src/main/java/type/array/InnerModel.java","src/main/java/type/array/Int32ValueClient.java","src/main/java/type/array/Int64ValueClient.java","src/main/java/type/array/ModelValueClient.java","src/main/java/type/array/NullableBooleanValueClient.java","src/main/java/type/array/NullableFloatValueClient.java","src/main/java/type/array/NullableInt32ValueClient.java","src/main/java/type/array/NullableModelValueClient.java","src/main/java/type/array/NullableStringValueClient.java","src/main/java/type/array/StringValueClient.java","src/main/java/type/array/UnknownValueClient.java","src/main/java/type/array/implementation/ArrayClientImpl.java","src/main/java/type/array/implementation/BooleanValuesImpl.java","src/main/java/type/array/implementation/DatetimeValuesImpl.java","src/main/java/type/array/implementation/DurationValuesImpl.java","src/main/java/type/array/implementation/Float32ValuesImpl.java","src/main/java/type/array/implementation/Int32ValuesImpl.java","src/main/java/type/array/implementation/Int64ValuesImpl.java","src/main/java/type/array/implementation/ModelValuesImpl.java","src/main/java/type/array/implementation/NullableBooleanValuesImpl.java","src/main/java/type/array/implementation/NullableFloatValuesImpl.java","src/main/java/type/array/implementation/NullableInt32ValuesImpl.java","src/main/java/type/array/implementation/NullableModelValuesImpl.java","src/main/java/type/array/implementation/NullableStringValuesImpl.java","src/main/java/type/array/implementation/StringValuesImpl.java","src/main/java/type/array/implementation/UnknownValuesImpl.java","src/main/java/type/array/implementation/package-info.java","src/main/java/type/array/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.array.ArrayClientBuilder":"Type.Array","type.array.BooleanValueClient":"Type.Array.BooleanValue","type.array.DatetimeValueClient":"Type.Array.DatetimeValue","type.array.DurationValueClient":"Type.Array.DurationValue","type.array.Float32ValueClient":"Type.Array.Float32Value","type.array.InnerModel":"Type.Array.InnerModel","type.array.Int32ValueClient":"Type.Array.Int32Value","type.array.Int64ValueClient":"Type.Array.Int64Value","type.array.ModelValueClient":"Type.Array.ModelValue","type.array.NullableBooleanValueClient":"Type.Array.NullableBooleanValue","type.array.NullableFloatValueClient":"Type.Array.NullableFloatValue","type.array.NullableInt32ValueClient":"Type.Array.NullableInt32Value","type.array.NullableModelValueClient":"Type.Array.NullableModelValue","type.array.NullableStringValueClient":"Type.Array.NullableStringValue","type.array.StringValueClient":"Type.Array.StringValue","type.array.UnknownValueClient":"Type.Array.UnknownValue"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/array/ArrayClientBuilder.java","src/main/java/type/array/BooleanValueClient.java","src/main/java/type/array/DatetimeValueClient.java","src/main/java/type/array/DurationValueClient.java","src/main/java/type/array/Float32ValueClient.java","src/main/java/type/array/InnerModel.java","src/main/java/type/array/Int32ValueClient.java","src/main/java/type/array/Int64ValueClient.java","src/main/java/type/array/ModelValueClient.java","src/main/java/type/array/NullableBooleanValueClient.java","src/main/java/type/array/NullableFloatValueClient.java","src/main/java/type/array/NullableInt32ValueClient.java","src/main/java/type/array/NullableModelValueClient.java","src/main/java/type/array/NullableStringValueClient.java","src/main/java/type/array/StringValueClient.java","src/main/java/type/array/UnknownValueClient.java","src/main/java/type/array/implementation/ArrayClientImpl.java","src/main/java/type/array/implementation/BooleanValuesImpl.java","src/main/java/type/array/implementation/DatetimeValuesImpl.java","src/main/java/type/array/implementation/DurationValuesImpl.java","src/main/java/type/array/implementation/Float32ValuesImpl.java","src/main/java/type/array/implementation/Int32ValuesImpl.java","src/main/java/type/array/implementation/Int64ValuesImpl.java","src/main/java/type/array/implementation/ModelValuesImpl.java","src/main/java/type/array/implementation/NullableBooleanValuesImpl.java","src/main/java/type/array/implementation/NullableFloatValuesImpl.java","src/main/java/type/array/implementation/NullableInt32ValuesImpl.java","src/main/java/type/array/implementation/NullableModelValuesImpl.java","src/main/java/type/array/implementation/NullableStringValuesImpl.java","src/main/java/type/array/implementation/StringValuesImpl.java","src/main/java/type/array/implementation/UnknownValuesImpl.java","src/main/java/type/array/implementation/package-info.java","src/main/java/type/array/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-dictionary_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-dictionary_apiview_properties.json deleted file mode 100644 index 19828212119..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-dictionary_apiview_properties.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.dictionary.BooleanValueClient": "Type.Dictionary.BooleanValue", - "type.dictionary.DatetimeValueClient": "Type.Dictionary.DatetimeValue", - "type.dictionary.DictionaryClientBuilder": "Type.Dictionary", - "type.dictionary.DurationValueClient": "Type.Dictionary.DurationValue", - "type.dictionary.Float32ValueClient": "Type.Dictionary.Float32Value", - "type.dictionary.InnerModel": "Type.Dictionary.InnerModel", - "type.dictionary.Int32ValueClient": "Type.Dictionary.Int32Value", - "type.dictionary.Int64ValueClient": "Type.Dictionary.Int64Value", - "type.dictionary.ModelValueClient": "Type.Dictionary.ModelValue", - "type.dictionary.NullableFloatValueClient": "Type.Dictionary.NullableFloatValue", - "type.dictionary.RecursiveModelValueClient": "Type.Dictionary.RecursiveModelValue", - "type.dictionary.StringValueClient": "Type.Dictionary.StringValue", - "type.dictionary.UnknownValueClient": "Type.Dictionary.UnknownValue" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-dictionary_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-dictionary_metadata.json index 7bd5291e50c..de86d4c322c 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-dictionary_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-dictionary_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.dictionary.BooleanValueClient":"Type.Dictionary.BooleanValue","type.dictionary.DatetimeValueClient":"Type.Dictionary.DatetimeValue","type.dictionary.DictionaryClientBuilder":"Type.Dictionary","type.dictionary.DurationValueClient":"Type.Dictionary.DurationValue","type.dictionary.Float32ValueClient":"Type.Dictionary.Float32Value","type.dictionary.InnerModel":"Type.Dictionary.InnerModel","type.dictionary.Int32ValueClient":"Type.Dictionary.Int32Value","type.dictionary.Int64ValueClient":"Type.Dictionary.Int64Value","type.dictionary.ModelValueClient":"Type.Dictionary.ModelValue","type.dictionary.NullableFloatValueClient":"Type.Dictionary.NullableFloatValue","type.dictionary.RecursiveModelValueClient":"Type.Dictionary.RecursiveModelValue","type.dictionary.StringValueClient":"Type.Dictionary.StringValue","type.dictionary.UnknownValueClient":"Type.Dictionary.UnknownValue"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/dictionary/BooleanValueClient.java","src/main/java/type/dictionary/DatetimeValueClient.java","src/main/java/type/dictionary/DictionaryClientBuilder.java","src/main/java/type/dictionary/DurationValueClient.java","src/main/java/type/dictionary/Float32ValueClient.java","src/main/java/type/dictionary/InnerModel.java","src/main/java/type/dictionary/Int32ValueClient.java","src/main/java/type/dictionary/Int64ValueClient.java","src/main/java/type/dictionary/ModelValueClient.java","src/main/java/type/dictionary/NullableFloatValueClient.java","src/main/java/type/dictionary/RecursiveModelValueClient.java","src/main/java/type/dictionary/StringValueClient.java","src/main/java/type/dictionary/UnknownValueClient.java","src/main/java/type/dictionary/implementation/BooleanValuesImpl.java","src/main/java/type/dictionary/implementation/DatetimeValuesImpl.java","src/main/java/type/dictionary/implementation/DictionaryClientImpl.java","src/main/java/type/dictionary/implementation/DurationValuesImpl.java","src/main/java/type/dictionary/implementation/Float32ValuesImpl.java","src/main/java/type/dictionary/implementation/Int32ValuesImpl.java","src/main/java/type/dictionary/implementation/Int64ValuesImpl.java","src/main/java/type/dictionary/implementation/ModelValuesImpl.java","src/main/java/type/dictionary/implementation/NullableFloatValuesImpl.java","src/main/java/type/dictionary/implementation/RecursiveModelValuesImpl.java","src/main/java/type/dictionary/implementation/StringValuesImpl.java","src/main/java/type/dictionary/implementation/UnknownValuesImpl.java","src/main/java/type/dictionary/implementation/package-info.java","src/main/java/type/dictionary/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.dictionary.BooleanValueClient":"Type.Dictionary.BooleanValue","type.dictionary.DatetimeValueClient":"Type.Dictionary.DatetimeValue","type.dictionary.DictionaryClientBuilder":"Type.Dictionary","type.dictionary.DurationValueClient":"Type.Dictionary.DurationValue","type.dictionary.Float32ValueClient":"Type.Dictionary.Float32Value","type.dictionary.InnerModel":"Type.Dictionary.InnerModel","type.dictionary.Int32ValueClient":"Type.Dictionary.Int32Value","type.dictionary.Int64ValueClient":"Type.Dictionary.Int64Value","type.dictionary.ModelValueClient":"Type.Dictionary.ModelValue","type.dictionary.NullableFloatValueClient":"Type.Dictionary.NullableFloatValue","type.dictionary.RecursiveModelValueClient":"Type.Dictionary.RecursiveModelValue","type.dictionary.StringValueClient":"Type.Dictionary.StringValue","type.dictionary.UnknownValueClient":"Type.Dictionary.UnknownValue"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/dictionary/BooleanValueClient.java","src/main/java/type/dictionary/DatetimeValueClient.java","src/main/java/type/dictionary/DictionaryClientBuilder.java","src/main/java/type/dictionary/DurationValueClient.java","src/main/java/type/dictionary/Float32ValueClient.java","src/main/java/type/dictionary/InnerModel.java","src/main/java/type/dictionary/Int32ValueClient.java","src/main/java/type/dictionary/Int64ValueClient.java","src/main/java/type/dictionary/ModelValueClient.java","src/main/java/type/dictionary/NullableFloatValueClient.java","src/main/java/type/dictionary/RecursiveModelValueClient.java","src/main/java/type/dictionary/StringValueClient.java","src/main/java/type/dictionary/UnknownValueClient.java","src/main/java/type/dictionary/implementation/BooleanValuesImpl.java","src/main/java/type/dictionary/implementation/DatetimeValuesImpl.java","src/main/java/type/dictionary/implementation/DictionaryClientImpl.java","src/main/java/type/dictionary/implementation/DurationValuesImpl.java","src/main/java/type/dictionary/implementation/Float32ValuesImpl.java","src/main/java/type/dictionary/implementation/Int32ValuesImpl.java","src/main/java/type/dictionary/implementation/Int64ValuesImpl.java","src/main/java/type/dictionary/implementation/ModelValuesImpl.java","src/main/java/type/dictionary/implementation/NullableFloatValuesImpl.java","src/main/java/type/dictionary/implementation/RecursiveModelValuesImpl.java","src/main/java/type/dictionary/implementation/StringValuesImpl.java","src/main/java/type/dictionary/implementation/UnknownValuesImpl.java","src/main/java/type/dictionary/implementation/package-info.java","src/main/java/type/dictionary/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-enumnamespace-extensible_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-enumnamespace-extensible_apiview_properties.json deleted file mode 100644 index 1a662f780ac..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-enumnamespace-extensible_apiview_properties.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.enumnamespace.extensible.DaysOfWeekExtensibleEnum": "Type.Enum.Extensible.DaysOfWeekExtensibleEnum", - "type.enumnamespace.extensible.ExtensibleClient": "Type.Enum.Extensible.String", - "type.enumnamespace.extensible.ExtensibleClientBuilder": "Type.Enum.Extensible" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-enumnamespace-extensible_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-enumnamespace-extensible_metadata.json index f785a6ebe17..8b43b319f70 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-enumnamespace-extensible_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-enumnamespace-extensible_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.enumnamespace.extensible.DaysOfWeekExtensibleEnum":"Type.Enum.Extensible.DaysOfWeekExtensibleEnum","type.enumnamespace.extensible.ExtensibleClient":"Type.Enum.Extensible.String","type.enumnamespace.extensible.ExtensibleClientBuilder":"Type.Enum.Extensible"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/enumnamespace/extensible/DaysOfWeekExtensibleEnum.java","src/main/java/type/enumnamespace/extensible/ExtensibleClient.java","src/main/java/type/enumnamespace/extensible/ExtensibleClientBuilder.java","src/main/java/type/enumnamespace/extensible/implementation/ExtensibleClientImpl.java","src/main/java/type/enumnamespace/extensible/implementation/StringOperationsImpl.java","src/main/java/type/enumnamespace/extensible/implementation/package-info.java","src/main/java/type/enumnamespace/extensible/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.enumnamespace.extensible.DaysOfWeekExtensibleEnum":"Type.Enum.Extensible.DaysOfWeekExtensibleEnum","type.enumnamespace.extensible.ExtensibleClient":"Type.Enum.Extensible.String","type.enumnamespace.extensible.ExtensibleClientBuilder":"Type.Enum.Extensible"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/enumnamespace/extensible/DaysOfWeekExtensibleEnum.java","src/main/java/type/enumnamespace/extensible/ExtensibleClient.java","src/main/java/type/enumnamespace/extensible/ExtensibleClientBuilder.java","src/main/java/type/enumnamespace/extensible/implementation/ExtensibleClientImpl.java","src/main/java/type/enumnamespace/extensible/implementation/StringOperationsImpl.java","src/main/java/type/enumnamespace/extensible/implementation/package-info.java","src/main/java/type/enumnamespace/extensible/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-enumnamespace-fixed_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-enumnamespace-fixed_apiview_properties.json deleted file mode 100644 index 6797287cd70..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-enumnamespace-fixed_apiview_properties.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.enumnamespace.fixed.DaysOfWeekEnum": "Type.Enum.Fixed.DaysOfWeekEnum", - "type.enumnamespace.fixed.FixedClient": "Type.Enum.Fixed.String", - "type.enumnamespace.fixed.FixedClientBuilder": "Type.Enum.Fixed" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-enumnamespace-fixed_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-enumnamespace-fixed_metadata.json index 1a7b565680d..fab99950256 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-enumnamespace-fixed_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-enumnamespace-fixed_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.enumnamespace.fixed.DaysOfWeekEnum":"Type.Enum.Fixed.DaysOfWeekEnum","type.enumnamespace.fixed.FixedClient":"Type.Enum.Fixed.String","type.enumnamespace.fixed.FixedClientBuilder":"Type.Enum.Fixed"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/enumnamespace/fixed/DaysOfWeekEnum.java","src/main/java/type/enumnamespace/fixed/FixedClient.java","src/main/java/type/enumnamespace/fixed/FixedClientBuilder.java","src/main/java/type/enumnamespace/fixed/implementation/FixedClientImpl.java","src/main/java/type/enumnamespace/fixed/implementation/StringOperationsImpl.java","src/main/java/type/enumnamespace/fixed/implementation/package-info.java","src/main/java/type/enumnamespace/fixed/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.enumnamespace.fixed.DaysOfWeekEnum":"Type.Enum.Fixed.DaysOfWeekEnum","type.enumnamespace.fixed.FixedClient":"Type.Enum.Fixed.String","type.enumnamespace.fixed.FixedClientBuilder":"Type.Enum.Fixed"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/enumnamespace/fixed/DaysOfWeekEnum.java","src/main/java/type/enumnamespace/fixed/FixedClient.java","src/main/java/type/enumnamespace/fixed/FixedClientBuilder.java","src/main/java/type/enumnamespace/fixed/implementation/FixedClientImpl.java","src/main/java/type/enumnamespace/fixed/implementation/StringOperationsImpl.java","src/main/java/type/enumnamespace/fixed/implementation/package-info.java","src/main/java/type/enumnamespace/fixed/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-file_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-file_metadata.json new file mode 100644 index 00000000000..4483830b659 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-file_metadata.json @@ -0,0 +1 @@ +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.file.DownloadFileMultipleContentTypesContentType":"Type.File.Body.downloadFileMultipleContentTypes.accept","type.file.FileClient":"Type.File.Body","type.file.FileClientBuilder":"Type.File","type.file.UploadFileMultipleContentTypesContentType":"Type.File.Body.uploadFileMultipleContentTypes.contentType"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/file/DownloadFileMultipleContentTypesContentType.java","src/main/java/type/file/FileClient.java","src/main/java/type/file/FileClientBuilder.java","src/main/java/type/file/UploadFileMultipleContentTypesContentType.java","src/main/java/type/file/implementation/BodiesImpl.java","src/main/java/type/file/implementation/FileClientImpl.java","src/main/java/type/file/implementation/package-info.java","src/main/java/type/file/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-empty_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-empty_apiview_properties.json deleted file mode 100644 index 992bd1205e5..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-empty_apiview_properties.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.model.empty.EmptyClient": "Type.Model.Empty", - "type.model.empty.EmptyClientBuilder": "Type.Model.Empty", - "type.model.empty.EmptyInput": "Type.Model.Empty.EmptyInput", - "type.model.empty.EmptyInputOutput": "Type.Model.Empty.EmptyInputOutput", - "type.model.empty.EmptyOutput": "Type.Model.Empty.EmptyOutput" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-empty_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-empty_metadata.json index aec4080b291..9914f550fc7 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-empty_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-empty_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.model.empty.EmptyClient":"Type.Model.Empty","type.model.empty.EmptyClientBuilder":"Type.Model.Empty","type.model.empty.EmptyInput":"Type.Model.Empty.EmptyInput","type.model.empty.EmptyInputOutput":"Type.Model.Empty.EmptyInputOutput","type.model.empty.EmptyOutput":"Type.Model.Empty.EmptyOutput"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/empty/EmptyClient.java","src/main/java/type/model/empty/EmptyClientBuilder.java","src/main/java/type/model/empty/EmptyInput.java","src/main/java/type/model/empty/EmptyInputOutput.java","src/main/java/type/model/empty/EmptyOutput.java","src/main/java/type/model/empty/implementation/EmptyClientImpl.java","src/main/java/type/model/empty/implementation/package-info.java","src/main/java/type/model/empty/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.model.empty.EmptyClient":"Type.Model.Empty","type.model.empty.EmptyClientBuilder":"Type.Model.Empty","type.model.empty.EmptyInput":"Type.Model.Empty.EmptyInput","type.model.empty.EmptyInputOutput":"Type.Model.Empty.EmptyInputOutput","type.model.empty.EmptyOutput":"Type.Model.Empty.EmptyOutput"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/empty/EmptyClient.java","src/main/java/type/model/empty/EmptyClientBuilder.java","src/main/java/type/model/empty/EmptyInput.java","src/main/java/type/model/empty/EmptyInputOutput.java","src/main/java/type/model/empty/EmptyOutput.java","src/main/java/type/model/empty/implementation/EmptyClientImpl.java","src/main/java/type/model/empty/implementation/package-info.java","src/main/java/type/model/empty/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-enumdiscriminator_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-enumdiscriminator_apiview_properties.json deleted file mode 100644 index 7b2bbc1fc3b..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-enumdiscriminator_apiview_properties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.model.inheritance.enumdiscriminator.Cobra": "Type.Model.Inheritance.EnumDiscriminator.Cobra", - "type.model.inheritance.enumdiscriminator.Dog": "Type.Model.Inheritance.EnumDiscriminator.Dog", - "type.model.inheritance.enumdiscriminator.DogKind": "Type.Model.Inheritance.EnumDiscriminator.DogKind", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient": "Type.Model.Inheritance.EnumDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClientBuilder": "Type.Model.Inheritance.EnumDiscriminator", - "type.model.inheritance.enumdiscriminator.Golden": "Type.Model.Inheritance.EnumDiscriminator.Golden", - "type.model.inheritance.enumdiscriminator.Snake": "Type.Model.Inheritance.EnumDiscriminator.Snake", - "type.model.inheritance.enumdiscriminator.SnakeKind": "Type.Model.Inheritance.EnumDiscriminator.SnakeKind" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-enumdiscriminator_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-enumdiscriminator_metadata.json index 3259f72c1c9..5db94ee4bb2 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-enumdiscriminator_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-enumdiscriminator_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.model.inheritance.enumdiscriminator.Cobra":"Type.Model.Inheritance.EnumDiscriminator.Cobra","type.model.inheritance.enumdiscriminator.Dog":"Type.Model.Inheritance.EnumDiscriminator.Dog","type.model.inheritance.enumdiscriminator.DogKind":"Type.Model.Inheritance.EnumDiscriminator.DogKind","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient":"Type.Model.Inheritance.EnumDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClientBuilder":"Type.Model.Inheritance.EnumDiscriminator","type.model.inheritance.enumdiscriminator.Golden":"Type.Model.Inheritance.EnumDiscriminator.Golden","type.model.inheritance.enumdiscriminator.Snake":"Type.Model.Inheritance.EnumDiscriminator.Snake","type.model.inheritance.enumdiscriminator.SnakeKind":"Type.Model.Inheritance.EnumDiscriminator.SnakeKind"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/enumdiscriminator/Cobra.java","src/main/java/type/model/inheritance/enumdiscriminator/Dog.java","src/main/java/type/model/inheritance/enumdiscriminator/DogKind.java","src/main/java/type/model/inheritance/enumdiscriminator/EnumDiscriminatorClient.java","src/main/java/type/model/inheritance/enumdiscriminator/EnumDiscriminatorClientBuilder.java","src/main/java/type/model/inheritance/enumdiscriminator/Golden.java","src/main/java/type/model/inheritance/enumdiscriminator/Snake.java","src/main/java/type/model/inheritance/enumdiscriminator/SnakeKind.java","src/main/java/type/model/inheritance/enumdiscriminator/implementation/EnumDiscriminatorClientImpl.java","src/main/java/type/model/inheritance/enumdiscriminator/implementation/package-info.java","src/main/java/type/model/inheritance/enumdiscriminator/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.model.inheritance.enumdiscriminator.Cobra":"Type.Model.Inheritance.EnumDiscriminator.Cobra","type.model.inheritance.enumdiscriminator.Dog":"Type.Model.Inheritance.EnumDiscriminator.Dog","type.model.inheritance.enumdiscriminator.DogKind":"Type.Model.Inheritance.EnumDiscriminator.DogKind","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient":"Type.Model.Inheritance.EnumDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClientBuilder":"Type.Model.Inheritance.EnumDiscriminator","type.model.inheritance.enumdiscriminator.Golden":"Type.Model.Inheritance.EnumDiscriminator.Golden","type.model.inheritance.enumdiscriminator.Snake":"Type.Model.Inheritance.EnumDiscriminator.Snake","type.model.inheritance.enumdiscriminator.SnakeKind":"Type.Model.Inheritance.EnumDiscriminator.SnakeKind"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/enumdiscriminator/Cobra.java","src/main/java/type/model/inheritance/enumdiscriminator/Dog.java","src/main/java/type/model/inheritance/enumdiscriminator/DogKind.java","src/main/java/type/model/inheritance/enumdiscriminator/EnumDiscriminatorClient.java","src/main/java/type/model/inheritance/enumdiscriminator/EnumDiscriminatorClientBuilder.java","src/main/java/type/model/inheritance/enumdiscriminator/Golden.java","src/main/java/type/model/inheritance/enumdiscriminator/Snake.java","src/main/java/type/model/inheritance/enumdiscriminator/SnakeKind.java","src/main/java/type/model/inheritance/enumdiscriminator/implementation/EnumDiscriminatorClientImpl.java","src/main/java/type/model/inheritance/enumdiscriminator/implementation/package-info.java","src/main/java/type/model/inheritance/enumdiscriminator/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-nesteddiscriminator_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-nesteddiscriminator_apiview_properties.json deleted file mode 100644 index fa2bd479fca..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-nesteddiscriminator_apiview_properties.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.model.inheritance.nesteddiscriminator.Fish": "Type.Model.Inheritance.NestedDiscriminator.Fish", - "type.model.inheritance.nesteddiscriminator.GoblinShark": "Type.Model.Inheritance.NestedDiscriminator.GoblinShark", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient": "Type.Model.Inheritance.NestedDiscriminator", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClientBuilder": "Type.Model.Inheritance.NestedDiscriminator", - "type.model.inheritance.nesteddiscriminator.Salmon": "Type.Model.Inheritance.NestedDiscriminator.Salmon", - "type.model.inheritance.nesteddiscriminator.SawShark": "Type.Model.Inheritance.NestedDiscriminator.SawShark", - "type.model.inheritance.nesteddiscriminator.Shark": "Type.Model.Inheritance.NestedDiscriminator.Shark" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-nesteddiscriminator_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-nesteddiscriminator_metadata.json index 41e1cfd9423..bda8c03dc8d 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-nesteddiscriminator_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-nesteddiscriminator_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.model.inheritance.nesteddiscriminator.Fish":"Type.Model.Inheritance.NestedDiscriminator.Fish","type.model.inheritance.nesteddiscriminator.GoblinShark":"Type.Model.Inheritance.NestedDiscriminator.GoblinShark","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient":"Type.Model.Inheritance.NestedDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClientBuilder":"Type.Model.Inheritance.NestedDiscriminator","type.model.inheritance.nesteddiscriminator.Salmon":"Type.Model.Inheritance.NestedDiscriminator.Salmon","type.model.inheritance.nesteddiscriminator.SawShark":"Type.Model.Inheritance.NestedDiscriminator.SawShark","type.model.inheritance.nesteddiscriminator.Shark":"Type.Model.Inheritance.NestedDiscriminator.Shark"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/nesteddiscriminator/Fish.java","src/main/java/type/model/inheritance/nesteddiscriminator/GoblinShark.java","src/main/java/type/model/inheritance/nesteddiscriminator/NestedDiscriminatorClient.java","src/main/java/type/model/inheritance/nesteddiscriminator/NestedDiscriminatorClientBuilder.java","src/main/java/type/model/inheritance/nesteddiscriminator/Salmon.java","src/main/java/type/model/inheritance/nesteddiscriminator/SawShark.java","src/main/java/type/model/inheritance/nesteddiscriminator/Shark.java","src/main/java/type/model/inheritance/nesteddiscriminator/implementation/NestedDiscriminatorClientImpl.java","src/main/java/type/model/inheritance/nesteddiscriminator/implementation/package-info.java","src/main/java/type/model/inheritance/nesteddiscriminator/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.model.inheritance.nesteddiscriminator.Fish":"Type.Model.Inheritance.NestedDiscriminator.Fish","type.model.inheritance.nesteddiscriminator.GoblinShark":"Type.Model.Inheritance.NestedDiscriminator.GoblinShark","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient":"Type.Model.Inheritance.NestedDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClientBuilder":"Type.Model.Inheritance.NestedDiscriminator","type.model.inheritance.nesteddiscriminator.Salmon":"Type.Model.Inheritance.NestedDiscriminator.Salmon","type.model.inheritance.nesteddiscriminator.SawShark":"Type.Model.Inheritance.NestedDiscriminator.SawShark","type.model.inheritance.nesteddiscriminator.Shark":"Type.Model.Inheritance.NestedDiscriminator.Shark"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/nesteddiscriminator/Fish.java","src/main/java/type/model/inheritance/nesteddiscriminator/GoblinShark.java","src/main/java/type/model/inheritance/nesteddiscriminator/NestedDiscriminatorClient.java","src/main/java/type/model/inheritance/nesteddiscriminator/NestedDiscriminatorClientBuilder.java","src/main/java/type/model/inheritance/nesteddiscriminator/Salmon.java","src/main/java/type/model/inheritance/nesteddiscriminator/SawShark.java","src/main/java/type/model/inheritance/nesteddiscriminator/Shark.java","src/main/java/type/model/inheritance/nesteddiscriminator/implementation/NestedDiscriminatorClientImpl.java","src/main/java/type/model/inheritance/nesteddiscriminator/implementation/package-info.java","src/main/java/type/model/inheritance/nesteddiscriminator/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-notdiscriminated_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-notdiscriminated_apiview_properties.json deleted file mode 100644 index 3087c8228df..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-notdiscriminated_apiview_properties.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.model.inheritance.notdiscriminated.Cat": "Type.Model.Inheritance.NotDiscriminated.Cat", - "type.model.inheritance.notdiscriminated.NotDiscriminatedClient": "Type.Model.Inheritance.NotDiscriminated", - "type.model.inheritance.notdiscriminated.NotDiscriminatedClientBuilder": "Type.Model.Inheritance.NotDiscriminated", - "type.model.inheritance.notdiscriminated.Pet": "Type.Model.Inheritance.NotDiscriminated.Pet", - "type.model.inheritance.notdiscriminated.Siamese": "Type.Model.Inheritance.NotDiscriminated.Siamese" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-notdiscriminated_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-notdiscriminated_metadata.json index fc9318795a2..9f571d0ffc1 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-notdiscriminated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-notdiscriminated_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.model.inheritance.notdiscriminated.Cat":"Type.Model.Inheritance.NotDiscriminated.Cat","type.model.inheritance.notdiscriminated.NotDiscriminatedClient":"Type.Model.Inheritance.NotDiscriminated","type.model.inheritance.notdiscriminated.NotDiscriminatedClientBuilder":"Type.Model.Inheritance.NotDiscriminated","type.model.inheritance.notdiscriminated.Pet":"Type.Model.Inheritance.NotDiscriminated.Pet","type.model.inheritance.notdiscriminated.Siamese":"Type.Model.Inheritance.NotDiscriminated.Siamese"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/notdiscriminated/Cat.java","src/main/java/type/model/inheritance/notdiscriminated/NotDiscriminatedClient.java","src/main/java/type/model/inheritance/notdiscriminated/NotDiscriminatedClientBuilder.java","src/main/java/type/model/inheritance/notdiscriminated/Pet.java","src/main/java/type/model/inheritance/notdiscriminated/Siamese.java","src/main/java/type/model/inheritance/notdiscriminated/implementation/NotDiscriminatedClientImpl.java","src/main/java/type/model/inheritance/notdiscriminated/implementation/package-info.java","src/main/java/type/model/inheritance/notdiscriminated/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.model.inheritance.notdiscriminated.Cat":"Type.Model.Inheritance.NotDiscriminated.Cat","type.model.inheritance.notdiscriminated.NotDiscriminatedClient":"Type.Model.Inheritance.NotDiscriminated","type.model.inheritance.notdiscriminated.NotDiscriminatedClientBuilder":"Type.Model.Inheritance.NotDiscriminated","type.model.inheritance.notdiscriminated.Pet":"Type.Model.Inheritance.NotDiscriminated.Pet","type.model.inheritance.notdiscriminated.Siamese":"Type.Model.Inheritance.NotDiscriminated.Siamese"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/notdiscriminated/Cat.java","src/main/java/type/model/inheritance/notdiscriminated/NotDiscriminatedClient.java","src/main/java/type/model/inheritance/notdiscriminated/NotDiscriminatedClientBuilder.java","src/main/java/type/model/inheritance/notdiscriminated/Pet.java","src/main/java/type/model/inheritance/notdiscriminated/Siamese.java","src/main/java/type/model/inheritance/notdiscriminated/implementation/NotDiscriminatedClientImpl.java","src/main/java/type/model/inheritance/notdiscriminated/implementation/package-info.java","src/main/java/type/model/inheritance/notdiscriminated/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-recursive_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-recursive_apiview_properties.json deleted file mode 100644 index 9cf65e91e3c..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-recursive_apiview_properties.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.model.inheritance.recursive.Element": "Type.Model.Inheritance.Recursive.Element", - "type.model.inheritance.recursive.Extension": "Type.Model.Inheritance.Recursive.Extension", - "type.model.inheritance.recursive.RecursiveClient": "Type.Model.Inheritance.Recursive", - "type.model.inheritance.recursive.RecursiveClientBuilder": "Type.Model.Inheritance.Recursive" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-recursive_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-recursive_metadata.json index c8ff48ddb67..bcad631545e 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-recursive_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-recursive_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.model.inheritance.recursive.Element":"Type.Model.Inheritance.Recursive.Element","type.model.inheritance.recursive.Extension":"Type.Model.Inheritance.Recursive.Extension","type.model.inheritance.recursive.RecursiveClient":"Type.Model.Inheritance.Recursive","type.model.inheritance.recursive.RecursiveClientBuilder":"Type.Model.Inheritance.Recursive"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/recursive/Element.java","src/main/java/type/model/inheritance/recursive/Extension.java","src/main/java/type/model/inheritance/recursive/RecursiveClient.java","src/main/java/type/model/inheritance/recursive/RecursiveClientBuilder.java","src/main/java/type/model/inheritance/recursive/implementation/RecursiveClientImpl.java","src/main/java/type/model/inheritance/recursive/implementation/package-info.java","src/main/java/type/model/inheritance/recursive/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.model.inheritance.recursive.Element":"Type.Model.Inheritance.Recursive.Element","type.model.inheritance.recursive.Extension":"Type.Model.Inheritance.Recursive.Extension","type.model.inheritance.recursive.RecursiveClient":"Type.Model.Inheritance.Recursive","type.model.inheritance.recursive.RecursiveClientBuilder":"Type.Model.Inheritance.Recursive"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/recursive/Element.java","src/main/java/type/model/inheritance/recursive/Extension.java","src/main/java/type/model/inheritance/recursive/RecursiveClient.java","src/main/java/type/model/inheritance/recursive/RecursiveClientBuilder.java","src/main/java/type/model/inheritance/recursive/implementation/RecursiveClientImpl.java","src/main/java/type/model/inheritance/recursive/implementation/package-info.java","src/main/java/type/model/inheritance/recursive/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-singlediscriminator_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-singlediscriminator_apiview_properties.json deleted file mode 100644 index f252007f31f..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-singlediscriminator_apiview_properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.model.inheritance.singlediscriminator.Bird": "Type.Model.Inheritance.SingleDiscriminator.Bird", - "type.model.inheritance.singlediscriminator.Dinosaur": "Type.Model.Inheritance.SingleDiscriminator.Dinosaur", - "type.model.inheritance.singlediscriminator.Eagle": "Type.Model.Inheritance.SingleDiscriminator.Eagle", - "type.model.inheritance.singlediscriminator.Goose": "Type.Model.Inheritance.SingleDiscriminator.Goose", - "type.model.inheritance.singlediscriminator.SeaGull": "Type.Model.Inheritance.SingleDiscriminator.SeaGull", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorClient": "Type.Model.Inheritance.SingleDiscriminator", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorClientBuilder": "Type.Model.Inheritance.SingleDiscriminator", - "type.model.inheritance.singlediscriminator.Sparrow": "Type.Model.Inheritance.SingleDiscriminator.Sparrow", - "type.model.inheritance.singlediscriminator.TRex": "Type.Model.Inheritance.SingleDiscriminator.TRex" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-singlediscriminator_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-singlediscriminator_metadata.json index d3897d5e992..273d84f0ee9 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-singlediscriminator_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-inheritance-singlediscriminator_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.model.inheritance.singlediscriminator.Bird":"Type.Model.Inheritance.SingleDiscriminator.Bird","type.model.inheritance.singlediscriminator.Dinosaur":"Type.Model.Inheritance.SingleDiscriminator.Dinosaur","type.model.inheritance.singlediscriminator.Eagle":"Type.Model.Inheritance.SingleDiscriminator.Eagle","type.model.inheritance.singlediscriminator.Goose":"Type.Model.Inheritance.SingleDiscriminator.Goose","type.model.inheritance.singlediscriminator.SeaGull":"Type.Model.Inheritance.SingleDiscriminator.SeaGull","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient":"Type.Model.Inheritance.SingleDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorClientBuilder":"Type.Model.Inheritance.SingleDiscriminator","type.model.inheritance.singlediscriminator.Sparrow":"Type.Model.Inheritance.SingleDiscriminator.Sparrow","type.model.inheritance.singlediscriminator.TRex":"Type.Model.Inheritance.SingleDiscriminator.TRex"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/singlediscriminator/Bird.java","src/main/java/type/model/inheritance/singlediscriminator/Dinosaur.java","src/main/java/type/model/inheritance/singlediscriminator/Eagle.java","src/main/java/type/model/inheritance/singlediscriminator/Goose.java","src/main/java/type/model/inheritance/singlediscriminator/SeaGull.java","src/main/java/type/model/inheritance/singlediscriminator/SingleDiscriminatorClient.java","src/main/java/type/model/inheritance/singlediscriminator/SingleDiscriminatorClientBuilder.java","src/main/java/type/model/inheritance/singlediscriminator/Sparrow.java","src/main/java/type/model/inheritance/singlediscriminator/TRex.java","src/main/java/type/model/inheritance/singlediscriminator/implementation/SingleDiscriminatorClientImpl.java","src/main/java/type/model/inheritance/singlediscriminator/implementation/package-info.java","src/main/java/type/model/inheritance/singlediscriminator/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.model.inheritance.singlediscriminator.Bird":"Type.Model.Inheritance.SingleDiscriminator.Bird","type.model.inheritance.singlediscriminator.Dinosaur":"Type.Model.Inheritance.SingleDiscriminator.Dinosaur","type.model.inheritance.singlediscriminator.Eagle":"Type.Model.Inheritance.SingleDiscriminator.Eagle","type.model.inheritance.singlediscriminator.Goose":"Type.Model.Inheritance.SingleDiscriminator.Goose","type.model.inheritance.singlediscriminator.SeaGull":"Type.Model.Inheritance.SingleDiscriminator.SeaGull","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient":"Type.Model.Inheritance.SingleDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorClientBuilder":"Type.Model.Inheritance.SingleDiscriminator","type.model.inheritance.singlediscriminator.Sparrow":"Type.Model.Inheritance.SingleDiscriminator.Sparrow","type.model.inheritance.singlediscriminator.TRex":"Type.Model.Inheritance.SingleDiscriminator.TRex"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/singlediscriminator/Bird.java","src/main/java/type/model/inheritance/singlediscriminator/Dinosaur.java","src/main/java/type/model/inheritance/singlediscriminator/Eagle.java","src/main/java/type/model/inheritance/singlediscriminator/Goose.java","src/main/java/type/model/inheritance/singlediscriminator/SeaGull.java","src/main/java/type/model/inheritance/singlediscriminator/SingleDiscriminatorClient.java","src/main/java/type/model/inheritance/singlediscriminator/SingleDiscriminatorClientBuilder.java","src/main/java/type/model/inheritance/singlediscriminator/Sparrow.java","src/main/java/type/model/inheritance/singlediscriminator/TRex.java","src/main/java/type/model/inheritance/singlediscriminator/implementation/SingleDiscriminatorClientImpl.java","src/main/java/type/model/inheritance/singlediscriminator/implementation/package-info.java","src/main/java/type/model/inheritance/singlediscriminator/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-usage_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-usage_apiview_properties.json deleted file mode 100644 index 67f2463b468..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-usage_apiview_properties.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.model.usage.InputOutputRecord": "Type.Model.Usage.InputOutputRecord", - "type.model.usage.InputRecord": "Type.Model.Usage.InputRecord", - "type.model.usage.OutputRecord": "Type.Model.Usage.OutputRecord", - "type.model.usage.UsageClient": "Type.Model.Usage", - "type.model.usage.UsageClientBuilder": "Type.Model.Usage" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-usage_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-usage_metadata.json index b06c8a56a87..88a80d0dae6 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-usage_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-usage_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.model.usage.InputOutputRecord":"Type.Model.Usage.InputOutputRecord","type.model.usage.InputRecord":"Type.Model.Usage.InputRecord","type.model.usage.OutputRecord":"Type.Model.Usage.OutputRecord","type.model.usage.UsageClient":"Type.Model.Usage","type.model.usage.UsageClientBuilder":"Type.Model.Usage"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/usage/InputOutputRecord.java","src/main/java/type/model/usage/InputRecord.java","src/main/java/type/model/usage/OutputRecord.java","src/main/java/type/model/usage/UsageClient.java","src/main/java/type/model/usage/UsageClientBuilder.java","src/main/java/type/model/usage/implementation/UsageClientImpl.java","src/main/java/type/model/usage/implementation/package-info.java","src/main/java/type/model/usage/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.model.usage.InputOutputRecord":"Type.Model.Usage.InputOutputRecord","type.model.usage.InputRecord":"Type.Model.Usage.InputRecord","type.model.usage.OutputRecord":"Type.Model.Usage.OutputRecord","type.model.usage.UsageClient":"Type.Model.Usage","type.model.usage.UsageClientBuilder":"Type.Model.Usage"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/usage/InputOutputRecord.java","src/main/java/type/model/usage/InputRecord.java","src/main/java/type/model/usage/OutputRecord.java","src/main/java/type/model/usage/UsageClient.java","src/main/java/type/model/usage/UsageClientBuilder.java","src/main/java/type/model/usage/implementation/UsageClientImpl.java","src/main/java/type/model/usage/implementation/package-info.java","src/main/java/type/model/usage/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-visibility_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-visibility_apiview_properties.json deleted file mode 100644 index 2040d57e455..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-visibility_apiview_properties.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.model.visibility.ReadOnlyModel": "Type.Model.Visibility.ReadOnlyModel", - "type.model.visibility.VisibilityClient": "Type.Model.Visibility", - "type.model.visibility.VisibilityClientBuilder": "Type.Model.Visibility", - "type.model.visibility.VisibilityModel": "Type.Model.Visibility.VisibilityModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-visibility_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-visibility_metadata.json index e1bb30b03b3..1ef6d5591b3 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-visibility_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-model-visibility_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.model.visibility.ReadOnlyModel":"Type.Model.Visibility.ReadOnlyModel","type.model.visibility.VisibilityClient":"Type.Model.Visibility","type.model.visibility.VisibilityClientBuilder":"Type.Model.Visibility","type.model.visibility.VisibilityModel":"Type.Model.Visibility.VisibilityModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/visibility/ReadOnlyModel.java","src/main/java/type/model/visibility/VisibilityClient.java","src/main/java/type/model/visibility/VisibilityClientBuilder.java","src/main/java/type/model/visibility/VisibilityModel.java","src/main/java/type/model/visibility/implementation/VisibilityClientImpl.java","src/main/java/type/model/visibility/implementation/package-info.java","src/main/java/type/model/visibility/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.model.visibility.ReadOnlyModel":"Type.Model.Visibility.ReadOnlyModel","type.model.visibility.VisibilityClient":"Type.Model.Visibility","type.model.visibility.VisibilityClientBuilder":"Type.Model.Visibility","type.model.visibility.VisibilityModel":"Type.Model.Visibility.VisibilityModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/visibility/ReadOnlyModel.java","src/main/java/type/model/visibility/VisibilityClient.java","src/main/java/type/model/visibility/VisibilityClientBuilder.java","src/main/java/type/model/visibility/VisibilityModel.java","src/main/java/type/model/visibility/implementation/VisibilityClientImpl.java","src/main/java/type/model/visibility/implementation/package-info.java","src/main/java/type/model/visibility/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-additionalproperties_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-additionalproperties_apiview_properties.json deleted file mode 100644 index f78c0139675..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-additionalproperties_apiview_properties.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.property.additionalproperties.AdditionalPropertiesClientBuilder": "Type.Property.AdditionalProperties", - "type.property.additionalproperties.DifferentSpreadFloatDerived": "Type.Property.AdditionalProperties.DifferentSpreadFloatDerived", - "type.property.additionalproperties.DifferentSpreadFloatRecord": "Type.Property.AdditionalProperties.DifferentSpreadFloatRecord", - "type.property.additionalproperties.DifferentSpreadModelArrayDerived": "Type.Property.AdditionalProperties.DifferentSpreadModelArrayDerived", - "type.property.additionalproperties.DifferentSpreadModelArrayRecord": "Type.Property.AdditionalProperties.DifferentSpreadModelArrayRecord", - "type.property.additionalproperties.DifferentSpreadModelDerived": "Type.Property.AdditionalProperties.DifferentSpreadModelDerived", - "type.property.additionalproperties.DifferentSpreadModelRecord": "Type.Property.AdditionalProperties.DifferentSpreadModelRecord", - "type.property.additionalproperties.DifferentSpreadStringDerived": "Type.Property.AdditionalProperties.DifferentSpreadStringDerived", - "type.property.additionalproperties.DifferentSpreadStringRecord": "Type.Property.AdditionalProperties.DifferentSpreadStringRecord", - "type.property.additionalproperties.ExtendsDifferentSpreadFloatClient": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat", - "type.property.additionalproperties.ExtendsDifferentSpreadModelArrayClient": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray", - "type.property.additionalproperties.ExtendsDifferentSpreadModelClient": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel", - "type.property.additionalproperties.ExtendsDifferentSpreadStringClient": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString", - "type.property.additionalproperties.ExtendsFloatAdditionalProperties": "Type.Property.AdditionalProperties.ExtendsFloatAdditionalProperties", - "type.property.additionalproperties.ExtendsFloatClient": "Type.Property.AdditionalProperties.ExtendsFloat", - "type.property.additionalproperties.ExtendsModelAdditionalProperties": "Type.Property.AdditionalProperties.ExtendsModelAdditionalProperties", - "type.property.additionalproperties.ExtendsModelArrayAdditionalProperties": "Type.Property.AdditionalProperties.ExtendsModelArrayAdditionalProperties", - "type.property.additionalproperties.ExtendsModelArrayClient": "Type.Property.AdditionalProperties.ExtendsModelArray", - "type.property.additionalproperties.ExtendsModelClient": "Type.Property.AdditionalProperties.ExtendsModel", - "type.property.additionalproperties.ExtendsStringAdditionalProperties": "Type.Property.AdditionalProperties.ExtendsStringAdditionalProperties", - "type.property.additionalproperties.ExtendsStringClient": "Type.Property.AdditionalProperties.ExtendsString", - "type.property.additionalproperties.ExtendsUnknownAdditionalProperties": "Type.Property.AdditionalProperties.ExtendsUnknownAdditionalProperties", - "type.property.additionalproperties.ExtendsUnknownAdditionalPropertiesDerived": "Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDerived", - "type.property.additionalproperties.ExtendsUnknownAdditionalPropertiesDiscriminated": "Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDiscriminated", - "type.property.additionalproperties.ExtendsUnknownAdditionalPropertiesDiscriminatedDerived": "Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDiscriminatedDerived", - "type.property.additionalproperties.ExtendsUnknownClient": "Type.Property.AdditionalProperties.ExtendsUnknown", - "type.property.additionalproperties.ExtendsUnknownDerivedClient": "Type.Property.AdditionalProperties.ExtendsUnknownDerived", - "type.property.additionalproperties.ExtendsUnknownDiscriminatedClient": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated", - "type.property.additionalproperties.IsFloatAdditionalProperties": "Type.Property.AdditionalProperties.IsFloatAdditionalProperties", - "type.property.additionalproperties.IsFloatClient": "Type.Property.AdditionalProperties.IsFloat", - "type.property.additionalproperties.IsModelAdditionalProperties": "Type.Property.AdditionalProperties.IsModelAdditionalProperties", - "type.property.additionalproperties.IsModelArrayAdditionalProperties": "Type.Property.AdditionalProperties.IsModelArrayAdditionalProperties", - "type.property.additionalproperties.IsModelArrayClient": "Type.Property.AdditionalProperties.IsModelArray", - "type.property.additionalproperties.IsModelClient": "Type.Property.AdditionalProperties.IsModel", - "type.property.additionalproperties.IsStringAdditionalProperties": "Type.Property.AdditionalProperties.IsStringAdditionalProperties", - "type.property.additionalproperties.IsStringClient": "Type.Property.AdditionalProperties.IsString", - "type.property.additionalproperties.IsUnknownAdditionalProperties": "Type.Property.AdditionalProperties.IsUnknownAdditionalProperties", - "type.property.additionalproperties.IsUnknownAdditionalPropertiesDerived": "Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDerived", - "type.property.additionalproperties.IsUnknownAdditionalPropertiesDiscriminated": "Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDiscriminated", - "type.property.additionalproperties.IsUnknownAdditionalPropertiesDiscriminatedDerived": "Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDiscriminatedDerived", - "type.property.additionalproperties.IsUnknownClient": "Type.Property.AdditionalProperties.IsUnknown", - "type.property.additionalproperties.IsUnknownDerivedClient": "Type.Property.AdditionalProperties.IsUnknownDerived", - "type.property.additionalproperties.IsUnknownDiscriminatedClient": "Type.Property.AdditionalProperties.IsUnknownDiscriminated", - "type.property.additionalproperties.ModelForRecord": "Type.Property.AdditionalProperties.ModelForRecord", - "type.property.additionalproperties.MultipleSpreadClient": "Type.Property.AdditionalProperties.MultipleSpread", - "type.property.additionalproperties.MultipleSpreadRecord": "Type.Property.AdditionalProperties.MultipleSpreadRecord", - "type.property.additionalproperties.SpreadDifferentFloatClient": "Type.Property.AdditionalProperties.SpreadDifferentFloat", - "type.property.additionalproperties.SpreadDifferentModelArrayClient": "Type.Property.AdditionalProperties.SpreadDifferentModelArray", - "type.property.additionalproperties.SpreadDifferentModelClient": "Type.Property.AdditionalProperties.SpreadDifferentModel", - "type.property.additionalproperties.SpreadDifferentStringClient": "Type.Property.AdditionalProperties.SpreadDifferentString", - "type.property.additionalproperties.SpreadFloatClient": "Type.Property.AdditionalProperties.SpreadFloat", - "type.property.additionalproperties.SpreadFloatRecord": "Type.Property.AdditionalProperties.SpreadFloatRecord", - "type.property.additionalproperties.SpreadModelArrayClient": "Type.Property.AdditionalProperties.SpreadModelArray", - "type.property.additionalproperties.SpreadModelArrayRecord": "Type.Property.AdditionalProperties.SpreadModelArrayRecord", - "type.property.additionalproperties.SpreadModelClient": "Type.Property.AdditionalProperties.SpreadModel", - "type.property.additionalproperties.SpreadModelRecord": "Type.Property.AdditionalProperties.SpreadModelRecord", - "type.property.additionalproperties.SpreadRecordForNonDiscriminatedUnion": "Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion", - "type.property.additionalproperties.SpreadRecordForNonDiscriminatedUnion2": "Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion2", - "type.property.additionalproperties.SpreadRecordForNonDiscriminatedUnion3": "Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion3", - "type.property.additionalproperties.SpreadRecordForUnion": "Type.Property.AdditionalProperties.SpreadRecordForUnion", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2Client": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3Client": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionClient": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion", - "type.property.additionalproperties.SpreadRecordUnionClient": "Type.Property.AdditionalProperties.SpreadRecordUnion", - "type.property.additionalproperties.SpreadStringClient": "Type.Property.AdditionalProperties.SpreadString", - "type.property.additionalproperties.SpreadStringRecord": "Type.Property.AdditionalProperties.SpreadStringRecord", - "type.property.additionalproperties.WidgetData0": "Type.Property.AdditionalProperties.WidgetData0", - "type.property.additionalproperties.WidgetData1": "Type.Property.AdditionalProperties.WidgetData1", - "type.property.additionalproperties.WidgetData2": "Type.Property.AdditionalProperties.WidgetData2" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-additionalproperties_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-additionalproperties_metadata.json index a5fd3fefb84..38f31b3576d 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-additionalproperties_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-additionalproperties_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.property.additionalproperties.AdditionalPropertiesClientBuilder":"Type.Property.AdditionalProperties","type.property.additionalproperties.DifferentSpreadFloatDerived":"Type.Property.AdditionalProperties.DifferentSpreadFloatDerived","type.property.additionalproperties.DifferentSpreadFloatRecord":"Type.Property.AdditionalProperties.DifferentSpreadFloatRecord","type.property.additionalproperties.DifferentSpreadModelArrayDerived":"Type.Property.AdditionalProperties.DifferentSpreadModelArrayDerived","type.property.additionalproperties.DifferentSpreadModelArrayRecord":"Type.Property.AdditionalProperties.DifferentSpreadModelArrayRecord","type.property.additionalproperties.DifferentSpreadModelDerived":"Type.Property.AdditionalProperties.DifferentSpreadModelDerived","type.property.additionalproperties.DifferentSpreadModelRecord":"Type.Property.AdditionalProperties.DifferentSpreadModelRecord","type.property.additionalproperties.DifferentSpreadStringDerived":"Type.Property.AdditionalProperties.DifferentSpreadStringDerived","type.property.additionalproperties.DifferentSpreadStringRecord":"Type.Property.AdditionalProperties.DifferentSpreadStringRecord","type.property.additionalproperties.ExtendsDifferentSpreadFloatClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray","type.property.additionalproperties.ExtendsDifferentSpreadModelClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel","type.property.additionalproperties.ExtendsDifferentSpreadStringClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString","type.property.additionalproperties.ExtendsFloatAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsFloatAdditionalProperties","type.property.additionalproperties.ExtendsFloatClient":"Type.Property.AdditionalProperties.ExtendsFloat","type.property.additionalproperties.ExtendsModelAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsModelAdditionalProperties","type.property.additionalproperties.ExtendsModelArrayAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsModelArrayAdditionalProperties","type.property.additionalproperties.ExtendsModelArrayClient":"Type.Property.AdditionalProperties.ExtendsModelArray","type.property.additionalproperties.ExtendsModelClient":"Type.Property.AdditionalProperties.ExtendsModel","type.property.additionalproperties.ExtendsStringAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsStringAdditionalProperties","type.property.additionalproperties.ExtendsStringClient":"Type.Property.AdditionalProperties.ExtendsString","type.property.additionalproperties.ExtendsUnknownAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsUnknownAdditionalProperties","type.property.additionalproperties.ExtendsUnknownAdditionalPropertiesDerived":"Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDerived","type.property.additionalproperties.ExtendsUnknownAdditionalPropertiesDiscriminated":"Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDiscriminated","type.property.additionalproperties.ExtendsUnknownAdditionalPropertiesDiscriminatedDerived":"Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDiscriminatedDerived","type.property.additionalproperties.ExtendsUnknownClient":"Type.Property.AdditionalProperties.ExtendsUnknown","type.property.additionalproperties.ExtendsUnknownDerivedClient":"Type.Property.AdditionalProperties.ExtendsUnknownDerived","type.property.additionalproperties.ExtendsUnknownDiscriminatedClient":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated","type.property.additionalproperties.IsFloatAdditionalProperties":"Type.Property.AdditionalProperties.IsFloatAdditionalProperties","type.property.additionalproperties.IsFloatClient":"Type.Property.AdditionalProperties.IsFloat","type.property.additionalproperties.IsModelAdditionalProperties":"Type.Property.AdditionalProperties.IsModelAdditionalProperties","type.property.additionalproperties.IsModelArrayAdditionalProperties":"Type.Property.AdditionalProperties.IsModelArrayAdditionalProperties","type.property.additionalproperties.IsModelArrayClient":"Type.Property.AdditionalProperties.IsModelArray","type.property.additionalproperties.IsModelClient":"Type.Property.AdditionalProperties.IsModel","type.property.additionalproperties.IsStringAdditionalProperties":"Type.Property.AdditionalProperties.IsStringAdditionalProperties","type.property.additionalproperties.IsStringClient":"Type.Property.AdditionalProperties.IsString","type.property.additionalproperties.IsUnknownAdditionalProperties":"Type.Property.AdditionalProperties.IsUnknownAdditionalProperties","type.property.additionalproperties.IsUnknownAdditionalPropertiesDerived":"Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDerived","type.property.additionalproperties.IsUnknownAdditionalPropertiesDiscriminated":"Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDiscriminated","type.property.additionalproperties.IsUnknownAdditionalPropertiesDiscriminatedDerived":"Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDiscriminatedDerived","type.property.additionalproperties.IsUnknownClient":"Type.Property.AdditionalProperties.IsUnknown","type.property.additionalproperties.IsUnknownDerivedClient":"Type.Property.AdditionalProperties.IsUnknownDerived","type.property.additionalproperties.IsUnknownDiscriminatedClient":"Type.Property.AdditionalProperties.IsUnknownDiscriminated","type.property.additionalproperties.ModelForRecord":"Type.Property.AdditionalProperties.ModelForRecord","type.property.additionalproperties.MultipleSpreadClient":"Type.Property.AdditionalProperties.MultipleSpread","type.property.additionalproperties.MultipleSpreadRecord":"Type.Property.AdditionalProperties.MultipleSpreadRecord","type.property.additionalproperties.SpreadDifferentFloatClient":"Type.Property.AdditionalProperties.SpreadDifferentFloat","type.property.additionalproperties.SpreadDifferentModelArrayClient":"Type.Property.AdditionalProperties.SpreadDifferentModelArray","type.property.additionalproperties.SpreadDifferentModelClient":"Type.Property.AdditionalProperties.SpreadDifferentModel","type.property.additionalproperties.SpreadDifferentStringClient":"Type.Property.AdditionalProperties.SpreadDifferentString","type.property.additionalproperties.SpreadFloatClient":"Type.Property.AdditionalProperties.SpreadFloat","type.property.additionalproperties.SpreadFloatRecord":"Type.Property.AdditionalProperties.SpreadFloatRecord","type.property.additionalproperties.SpreadModelArrayClient":"Type.Property.AdditionalProperties.SpreadModelArray","type.property.additionalproperties.SpreadModelArrayRecord":"Type.Property.AdditionalProperties.SpreadModelArrayRecord","type.property.additionalproperties.SpreadModelClient":"Type.Property.AdditionalProperties.SpreadModel","type.property.additionalproperties.SpreadModelRecord":"Type.Property.AdditionalProperties.SpreadModelRecord","type.property.additionalproperties.SpreadRecordForNonDiscriminatedUnion":"Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion","type.property.additionalproperties.SpreadRecordForNonDiscriminatedUnion2":"Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion2","type.property.additionalproperties.SpreadRecordForNonDiscriminatedUnion3":"Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion3","type.property.additionalproperties.SpreadRecordForUnion":"Type.Property.AdditionalProperties.SpreadRecordForUnion","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2Client":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3Client":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionClient":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion","type.property.additionalproperties.SpreadRecordUnionClient":"Type.Property.AdditionalProperties.SpreadRecordUnion","type.property.additionalproperties.SpreadStringClient":"Type.Property.AdditionalProperties.SpreadString","type.property.additionalproperties.SpreadStringRecord":"Type.Property.AdditionalProperties.SpreadStringRecord","type.property.additionalproperties.WidgetData0":"Type.Property.AdditionalProperties.WidgetData0","type.property.additionalproperties.WidgetData1":"Type.Property.AdditionalProperties.WidgetData1","type.property.additionalproperties.WidgetData2":"Type.Property.AdditionalProperties.WidgetData2"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/property/additionalproperties/AdditionalPropertiesClientBuilder.java","src/main/java/type/property/additionalproperties/DifferentSpreadFloatDerived.java","src/main/java/type/property/additionalproperties/DifferentSpreadFloatRecord.java","src/main/java/type/property/additionalproperties/DifferentSpreadModelArrayDerived.java","src/main/java/type/property/additionalproperties/DifferentSpreadModelArrayRecord.java","src/main/java/type/property/additionalproperties/DifferentSpreadModelDerived.java","src/main/java/type/property/additionalproperties/DifferentSpreadModelRecord.java","src/main/java/type/property/additionalproperties/DifferentSpreadStringDerived.java","src/main/java/type/property/additionalproperties/DifferentSpreadStringRecord.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadFloatClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelArrayClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadStringClient.java","src/main/java/type/property/additionalproperties/ExtendsFloatAdditionalProperties.java","src/main/java/type/property/additionalproperties/ExtendsFloatClient.java","src/main/java/type/property/additionalproperties/ExtendsModelAdditionalProperties.java","src/main/java/type/property/additionalproperties/ExtendsModelArrayAdditionalProperties.java","src/main/java/type/property/additionalproperties/ExtendsModelArrayClient.java","src/main/java/type/property/additionalproperties/ExtendsModelClient.java","src/main/java/type/property/additionalproperties/ExtendsStringAdditionalProperties.java","src/main/java/type/property/additionalproperties/ExtendsStringClient.java","src/main/java/type/property/additionalproperties/ExtendsUnknownAdditionalProperties.java","src/main/java/type/property/additionalproperties/ExtendsUnknownAdditionalPropertiesDerived.java","src/main/java/type/property/additionalproperties/ExtendsUnknownAdditionalPropertiesDiscriminated.java","src/main/java/type/property/additionalproperties/ExtendsUnknownAdditionalPropertiesDiscriminatedDerived.java","src/main/java/type/property/additionalproperties/ExtendsUnknownClient.java","src/main/java/type/property/additionalproperties/ExtendsUnknownDerivedClient.java","src/main/java/type/property/additionalproperties/ExtendsUnknownDiscriminatedClient.java","src/main/java/type/property/additionalproperties/IsFloatAdditionalProperties.java","src/main/java/type/property/additionalproperties/IsFloatClient.java","src/main/java/type/property/additionalproperties/IsModelAdditionalProperties.java","src/main/java/type/property/additionalproperties/IsModelArrayAdditionalProperties.java","src/main/java/type/property/additionalproperties/IsModelArrayClient.java","src/main/java/type/property/additionalproperties/IsModelClient.java","src/main/java/type/property/additionalproperties/IsStringAdditionalProperties.java","src/main/java/type/property/additionalproperties/IsStringClient.java","src/main/java/type/property/additionalproperties/IsUnknownAdditionalProperties.java","src/main/java/type/property/additionalproperties/IsUnknownAdditionalPropertiesDerived.java","src/main/java/type/property/additionalproperties/IsUnknownAdditionalPropertiesDiscriminated.java","src/main/java/type/property/additionalproperties/IsUnknownAdditionalPropertiesDiscriminatedDerived.java","src/main/java/type/property/additionalproperties/IsUnknownClient.java","src/main/java/type/property/additionalproperties/IsUnknownDerivedClient.java","src/main/java/type/property/additionalproperties/IsUnknownDiscriminatedClient.java","src/main/java/type/property/additionalproperties/ModelForRecord.java","src/main/java/type/property/additionalproperties/MultipleSpreadClient.java","src/main/java/type/property/additionalproperties/MultipleSpreadRecord.java","src/main/java/type/property/additionalproperties/SpreadDifferentFloatClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentModelArrayClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentModelClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentStringClient.java","src/main/java/type/property/additionalproperties/SpreadFloatClient.java","src/main/java/type/property/additionalproperties/SpreadFloatRecord.java","src/main/java/type/property/additionalproperties/SpreadModelArrayClient.java","src/main/java/type/property/additionalproperties/SpreadModelArrayRecord.java","src/main/java/type/property/additionalproperties/SpreadModelClient.java","src/main/java/type/property/additionalproperties/SpreadModelRecord.java","src/main/java/type/property/additionalproperties/SpreadRecordForNonDiscriminatedUnion.java","src/main/java/type/property/additionalproperties/SpreadRecordForNonDiscriminatedUnion2.java","src/main/java/type/property/additionalproperties/SpreadRecordForNonDiscriminatedUnion3.java","src/main/java/type/property/additionalproperties/SpreadRecordForUnion.java","src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion2Client.java","src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion3Client.java","src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnionClient.java","src/main/java/type/property/additionalproperties/SpreadRecordUnionClient.java","src/main/java/type/property/additionalproperties/SpreadStringClient.java","src/main/java/type/property/additionalproperties/SpreadStringRecord.java","src/main/java/type/property/additionalproperties/WidgetData0.java","src/main/java/type/property/additionalproperties/WidgetData1.java","src/main/java/type/property/additionalproperties/WidgetData2.java","src/main/java/type/property/additionalproperties/implementation/AdditionalPropertiesClientImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownDerivedsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownDiscriminatedsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/IsModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsUnknownDerivedsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsUnknownDiscriminatedsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsUnknownsImpl.java","src/main/java/type/property/additionalproperties/implementation/MultipleSpreadsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadDifferentFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadDifferentModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadDifferentModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadDifferentStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnion2sImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnion3sImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnionsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadRecordUnionsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/package-info.java","src/main/java/type/property/additionalproperties/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.property.additionalproperties.AdditionalPropertiesClientBuilder":"Type.Property.AdditionalProperties","type.property.additionalproperties.DifferentSpreadFloatDerived":"Type.Property.AdditionalProperties.DifferentSpreadFloatDerived","type.property.additionalproperties.DifferentSpreadFloatRecord":"Type.Property.AdditionalProperties.DifferentSpreadFloatRecord","type.property.additionalproperties.DifferentSpreadModelArrayDerived":"Type.Property.AdditionalProperties.DifferentSpreadModelArrayDerived","type.property.additionalproperties.DifferentSpreadModelArrayRecord":"Type.Property.AdditionalProperties.DifferentSpreadModelArrayRecord","type.property.additionalproperties.DifferentSpreadModelDerived":"Type.Property.AdditionalProperties.DifferentSpreadModelDerived","type.property.additionalproperties.DifferentSpreadModelRecord":"Type.Property.AdditionalProperties.DifferentSpreadModelRecord","type.property.additionalproperties.DifferentSpreadStringDerived":"Type.Property.AdditionalProperties.DifferentSpreadStringDerived","type.property.additionalproperties.DifferentSpreadStringRecord":"Type.Property.AdditionalProperties.DifferentSpreadStringRecord","type.property.additionalproperties.ExtendsDifferentSpreadFloatClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray","type.property.additionalproperties.ExtendsDifferentSpreadModelClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel","type.property.additionalproperties.ExtendsDifferentSpreadStringClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString","type.property.additionalproperties.ExtendsFloatAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsFloatAdditionalProperties","type.property.additionalproperties.ExtendsFloatClient":"Type.Property.AdditionalProperties.ExtendsFloat","type.property.additionalproperties.ExtendsModelAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsModelAdditionalProperties","type.property.additionalproperties.ExtendsModelArrayAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsModelArrayAdditionalProperties","type.property.additionalproperties.ExtendsModelArrayClient":"Type.Property.AdditionalProperties.ExtendsModelArray","type.property.additionalproperties.ExtendsModelClient":"Type.Property.AdditionalProperties.ExtendsModel","type.property.additionalproperties.ExtendsStringAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsStringAdditionalProperties","type.property.additionalproperties.ExtendsStringClient":"Type.Property.AdditionalProperties.ExtendsString","type.property.additionalproperties.ExtendsUnknownAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsUnknownAdditionalProperties","type.property.additionalproperties.ExtendsUnknownAdditionalPropertiesDerived":"Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDerived","type.property.additionalproperties.ExtendsUnknownAdditionalPropertiesDiscriminated":"Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDiscriminated","type.property.additionalproperties.ExtendsUnknownAdditionalPropertiesDiscriminatedDerived":"Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDiscriminatedDerived","type.property.additionalproperties.ExtendsUnknownClient":"Type.Property.AdditionalProperties.ExtendsUnknown","type.property.additionalproperties.ExtendsUnknownDerivedClient":"Type.Property.AdditionalProperties.ExtendsUnknownDerived","type.property.additionalproperties.ExtendsUnknownDiscriminatedClient":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated","type.property.additionalproperties.IsFloatAdditionalProperties":"Type.Property.AdditionalProperties.IsFloatAdditionalProperties","type.property.additionalproperties.IsFloatClient":"Type.Property.AdditionalProperties.IsFloat","type.property.additionalproperties.IsModelAdditionalProperties":"Type.Property.AdditionalProperties.IsModelAdditionalProperties","type.property.additionalproperties.IsModelArrayAdditionalProperties":"Type.Property.AdditionalProperties.IsModelArrayAdditionalProperties","type.property.additionalproperties.IsModelArrayClient":"Type.Property.AdditionalProperties.IsModelArray","type.property.additionalproperties.IsModelClient":"Type.Property.AdditionalProperties.IsModel","type.property.additionalproperties.IsStringAdditionalProperties":"Type.Property.AdditionalProperties.IsStringAdditionalProperties","type.property.additionalproperties.IsStringClient":"Type.Property.AdditionalProperties.IsString","type.property.additionalproperties.IsUnknownAdditionalProperties":"Type.Property.AdditionalProperties.IsUnknownAdditionalProperties","type.property.additionalproperties.IsUnknownAdditionalPropertiesDerived":"Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDerived","type.property.additionalproperties.IsUnknownAdditionalPropertiesDiscriminated":"Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDiscriminated","type.property.additionalproperties.IsUnknownAdditionalPropertiesDiscriminatedDerived":"Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDiscriminatedDerived","type.property.additionalproperties.IsUnknownClient":"Type.Property.AdditionalProperties.IsUnknown","type.property.additionalproperties.IsUnknownDerivedClient":"Type.Property.AdditionalProperties.IsUnknownDerived","type.property.additionalproperties.IsUnknownDiscriminatedClient":"Type.Property.AdditionalProperties.IsUnknownDiscriminated","type.property.additionalproperties.ModelForRecord":"Type.Property.AdditionalProperties.ModelForRecord","type.property.additionalproperties.MultipleSpreadClient":"Type.Property.AdditionalProperties.MultipleSpread","type.property.additionalproperties.MultipleSpreadRecord":"Type.Property.AdditionalProperties.MultipleSpreadRecord","type.property.additionalproperties.SpreadDifferentFloatClient":"Type.Property.AdditionalProperties.SpreadDifferentFloat","type.property.additionalproperties.SpreadDifferentModelArrayClient":"Type.Property.AdditionalProperties.SpreadDifferentModelArray","type.property.additionalproperties.SpreadDifferentModelClient":"Type.Property.AdditionalProperties.SpreadDifferentModel","type.property.additionalproperties.SpreadDifferentStringClient":"Type.Property.AdditionalProperties.SpreadDifferentString","type.property.additionalproperties.SpreadFloatClient":"Type.Property.AdditionalProperties.SpreadFloat","type.property.additionalproperties.SpreadFloatRecord":"Type.Property.AdditionalProperties.SpreadFloatRecord","type.property.additionalproperties.SpreadModelArrayClient":"Type.Property.AdditionalProperties.SpreadModelArray","type.property.additionalproperties.SpreadModelArrayRecord":"Type.Property.AdditionalProperties.SpreadModelArrayRecord","type.property.additionalproperties.SpreadModelClient":"Type.Property.AdditionalProperties.SpreadModel","type.property.additionalproperties.SpreadModelRecord":"Type.Property.AdditionalProperties.SpreadModelRecord","type.property.additionalproperties.SpreadRecordForNonDiscriminatedUnion":"Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion","type.property.additionalproperties.SpreadRecordForNonDiscriminatedUnion2":"Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion2","type.property.additionalproperties.SpreadRecordForNonDiscriminatedUnion3":"Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion3","type.property.additionalproperties.SpreadRecordForUnion":"Type.Property.AdditionalProperties.SpreadRecordForUnion","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2Client":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3Client":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionClient":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion","type.property.additionalproperties.SpreadRecordUnionClient":"Type.Property.AdditionalProperties.SpreadRecordUnion","type.property.additionalproperties.SpreadStringClient":"Type.Property.AdditionalProperties.SpreadString","type.property.additionalproperties.SpreadStringRecord":"Type.Property.AdditionalProperties.SpreadStringRecord","type.property.additionalproperties.WidgetData0":"Type.Property.AdditionalProperties.WidgetData0","type.property.additionalproperties.WidgetData1":"Type.Property.AdditionalProperties.WidgetData1","type.property.additionalproperties.WidgetData2":"Type.Property.AdditionalProperties.WidgetData2"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/property/additionalproperties/AdditionalPropertiesClientBuilder.java","src/main/java/type/property/additionalproperties/DifferentSpreadFloatDerived.java","src/main/java/type/property/additionalproperties/DifferentSpreadFloatRecord.java","src/main/java/type/property/additionalproperties/DifferentSpreadModelArrayDerived.java","src/main/java/type/property/additionalproperties/DifferentSpreadModelArrayRecord.java","src/main/java/type/property/additionalproperties/DifferentSpreadModelDerived.java","src/main/java/type/property/additionalproperties/DifferentSpreadModelRecord.java","src/main/java/type/property/additionalproperties/DifferentSpreadStringDerived.java","src/main/java/type/property/additionalproperties/DifferentSpreadStringRecord.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadFloatClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelArrayClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadStringClient.java","src/main/java/type/property/additionalproperties/ExtendsFloatAdditionalProperties.java","src/main/java/type/property/additionalproperties/ExtendsFloatClient.java","src/main/java/type/property/additionalproperties/ExtendsModelAdditionalProperties.java","src/main/java/type/property/additionalproperties/ExtendsModelArrayAdditionalProperties.java","src/main/java/type/property/additionalproperties/ExtendsModelArrayClient.java","src/main/java/type/property/additionalproperties/ExtendsModelClient.java","src/main/java/type/property/additionalproperties/ExtendsStringAdditionalProperties.java","src/main/java/type/property/additionalproperties/ExtendsStringClient.java","src/main/java/type/property/additionalproperties/ExtendsUnknownAdditionalProperties.java","src/main/java/type/property/additionalproperties/ExtendsUnknownAdditionalPropertiesDerived.java","src/main/java/type/property/additionalproperties/ExtendsUnknownAdditionalPropertiesDiscriminated.java","src/main/java/type/property/additionalproperties/ExtendsUnknownAdditionalPropertiesDiscriminatedDerived.java","src/main/java/type/property/additionalproperties/ExtendsUnknownClient.java","src/main/java/type/property/additionalproperties/ExtendsUnknownDerivedClient.java","src/main/java/type/property/additionalproperties/ExtendsUnknownDiscriminatedClient.java","src/main/java/type/property/additionalproperties/IsFloatAdditionalProperties.java","src/main/java/type/property/additionalproperties/IsFloatClient.java","src/main/java/type/property/additionalproperties/IsModelAdditionalProperties.java","src/main/java/type/property/additionalproperties/IsModelArrayAdditionalProperties.java","src/main/java/type/property/additionalproperties/IsModelArrayClient.java","src/main/java/type/property/additionalproperties/IsModelClient.java","src/main/java/type/property/additionalproperties/IsStringAdditionalProperties.java","src/main/java/type/property/additionalproperties/IsStringClient.java","src/main/java/type/property/additionalproperties/IsUnknownAdditionalProperties.java","src/main/java/type/property/additionalproperties/IsUnknownAdditionalPropertiesDerived.java","src/main/java/type/property/additionalproperties/IsUnknownAdditionalPropertiesDiscriminated.java","src/main/java/type/property/additionalproperties/IsUnknownAdditionalPropertiesDiscriminatedDerived.java","src/main/java/type/property/additionalproperties/IsUnknownClient.java","src/main/java/type/property/additionalproperties/IsUnknownDerivedClient.java","src/main/java/type/property/additionalproperties/IsUnknownDiscriminatedClient.java","src/main/java/type/property/additionalproperties/ModelForRecord.java","src/main/java/type/property/additionalproperties/MultipleSpreadClient.java","src/main/java/type/property/additionalproperties/MultipleSpreadRecord.java","src/main/java/type/property/additionalproperties/SpreadDifferentFloatClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentModelArrayClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentModelClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentStringClient.java","src/main/java/type/property/additionalproperties/SpreadFloatClient.java","src/main/java/type/property/additionalproperties/SpreadFloatRecord.java","src/main/java/type/property/additionalproperties/SpreadModelArrayClient.java","src/main/java/type/property/additionalproperties/SpreadModelArrayRecord.java","src/main/java/type/property/additionalproperties/SpreadModelClient.java","src/main/java/type/property/additionalproperties/SpreadModelRecord.java","src/main/java/type/property/additionalproperties/SpreadRecordForNonDiscriminatedUnion.java","src/main/java/type/property/additionalproperties/SpreadRecordForNonDiscriminatedUnion2.java","src/main/java/type/property/additionalproperties/SpreadRecordForNonDiscriminatedUnion3.java","src/main/java/type/property/additionalproperties/SpreadRecordForUnion.java","src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion2Client.java","src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion3Client.java","src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnionClient.java","src/main/java/type/property/additionalproperties/SpreadRecordUnionClient.java","src/main/java/type/property/additionalproperties/SpreadStringClient.java","src/main/java/type/property/additionalproperties/SpreadStringRecord.java","src/main/java/type/property/additionalproperties/WidgetData0.java","src/main/java/type/property/additionalproperties/WidgetData1.java","src/main/java/type/property/additionalproperties/WidgetData2.java","src/main/java/type/property/additionalproperties/implementation/AdditionalPropertiesClientImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownDerivedsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownDiscriminatedsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/IsModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsUnknownDerivedsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsUnknownDiscriminatedsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsUnknownsImpl.java","src/main/java/type/property/additionalproperties/implementation/MultipleSpreadsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadDifferentFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadDifferentModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadDifferentModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadDifferentStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnion2sImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnion3sImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnionsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadRecordUnionsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/package-info.java","src/main/java/type/property/additionalproperties/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-nullable_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-nullable_apiview_properties.json deleted file mode 100644 index 6947d5e1261..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-nullable_apiview_properties.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.property.nullable.BytesClient": "Type.Property.Nullable.Bytes", - "type.property.nullable.BytesProperty": "Type.Property.Nullable.BytesProperty", - "type.property.nullable.CollectionsByteClient": "Type.Property.Nullable.CollectionsByte", - "type.property.nullable.CollectionsByteProperty": "Type.Property.Nullable.CollectionsByteProperty", - "type.property.nullable.CollectionsModelClient": "Type.Property.Nullable.CollectionsModel", - "type.property.nullable.CollectionsModelProperty": "Type.Property.Nullable.CollectionsModelProperty", - "type.property.nullable.CollectionsStringClient": "Type.Property.Nullable.CollectionsString", - "type.property.nullable.CollectionsStringProperty": "Type.Property.Nullable.CollectionsStringProperty", - "type.property.nullable.DatetimeOperationClient": "Type.Property.Nullable.Datetime", - "type.property.nullable.DatetimeProperty": "Type.Property.Nullable.DatetimeProperty", - "type.property.nullable.DurationOperationClient": "Type.Property.Nullable.Duration", - "type.property.nullable.DurationProperty": "Type.Property.Nullable.DurationProperty", - "type.property.nullable.InnerModel": "Type.Property.Nullable.InnerModel", - "type.property.nullable.NullableClientBuilder": "Type.Property.Nullable", - "type.property.nullable.StringOperationClient": "Type.Property.Nullable.String", - "type.property.nullable.StringProperty": "Type.Property.Nullable.StringProperty" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-nullable_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-nullable_metadata.json index 502382ca422..a24ce2f2725 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-nullable_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-nullable_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.property.nullable.BytesClient":"Type.Property.Nullable.Bytes","type.property.nullable.BytesProperty":"Type.Property.Nullable.BytesProperty","type.property.nullable.CollectionsByteClient":"Type.Property.Nullable.CollectionsByte","type.property.nullable.CollectionsByteProperty":"Type.Property.Nullable.CollectionsByteProperty","type.property.nullable.CollectionsModelClient":"Type.Property.Nullable.CollectionsModel","type.property.nullable.CollectionsModelProperty":"Type.Property.Nullable.CollectionsModelProperty","type.property.nullable.CollectionsStringClient":"Type.Property.Nullable.CollectionsString","type.property.nullable.CollectionsStringProperty":"Type.Property.Nullable.CollectionsStringProperty","type.property.nullable.DatetimeOperationClient":"Type.Property.Nullable.Datetime","type.property.nullable.DatetimeProperty":"Type.Property.Nullable.DatetimeProperty","type.property.nullable.DurationOperationClient":"Type.Property.Nullable.Duration","type.property.nullable.DurationProperty":"Type.Property.Nullable.DurationProperty","type.property.nullable.InnerModel":"Type.Property.Nullable.InnerModel","type.property.nullable.NullableClientBuilder":"Type.Property.Nullable","type.property.nullable.StringOperationClient":"Type.Property.Nullable.String","type.property.nullable.StringProperty":"Type.Property.Nullable.StringProperty"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/property/nullable/BytesClient.java","src/main/java/type/property/nullable/BytesProperty.java","src/main/java/type/property/nullable/CollectionsByteClient.java","src/main/java/type/property/nullable/CollectionsByteProperty.java","src/main/java/type/property/nullable/CollectionsModelClient.java","src/main/java/type/property/nullable/CollectionsModelProperty.java","src/main/java/type/property/nullable/CollectionsStringClient.java","src/main/java/type/property/nullable/CollectionsStringProperty.java","src/main/java/type/property/nullable/DatetimeOperationClient.java","src/main/java/type/property/nullable/DatetimeProperty.java","src/main/java/type/property/nullable/DurationOperationClient.java","src/main/java/type/property/nullable/DurationProperty.java","src/main/java/type/property/nullable/InnerModel.java","src/main/java/type/property/nullable/NullableClientBuilder.java","src/main/java/type/property/nullable/StringOperationClient.java","src/main/java/type/property/nullable/StringProperty.java","src/main/java/type/property/nullable/implementation/BytesImpl.java","src/main/java/type/property/nullable/implementation/CollectionsBytesImpl.java","src/main/java/type/property/nullable/implementation/CollectionsModelsImpl.java","src/main/java/type/property/nullable/implementation/CollectionsStringsImpl.java","src/main/java/type/property/nullable/implementation/DatetimeOperationsImpl.java","src/main/java/type/property/nullable/implementation/DurationOperationsImpl.java","src/main/java/type/property/nullable/implementation/JsonMergePatchHelper.java","src/main/java/type/property/nullable/implementation/NullableClientImpl.java","src/main/java/type/property/nullable/implementation/StringOperationsImpl.java","src/main/java/type/property/nullable/implementation/package-info.java","src/main/java/type/property/nullable/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.property.nullable.BytesClient":"Type.Property.Nullable.Bytes","type.property.nullable.BytesProperty":"Type.Property.Nullable.BytesProperty","type.property.nullable.CollectionsByteClient":"Type.Property.Nullable.CollectionsByte","type.property.nullable.CollectionsByteProperty":"Type.Property.Nullable.CollectionsByteProperty","type.property.nullable.CollectionsModelClient":"Type.Property.Nullable.CollectionsModel","type.property.nullable.CollectionsModelProperty":"Type.Property.Nullable.CollectionsModelProperty","type.property.nullable.CollectionsStringClient":"Type.Property.Nullable.CollectionsString","type.property.nullable.CollectionsStringProperty":"Type.Property.Nullable.CollectionsStringProperty","type.property.nullable.DatetimeOperationClient":"Type.Property.Nullable.Datetime","type.property.nullable.DatetimeProperty":"Type.Property.Nullable.DatetimeProperty","type.property.nullable.DurationOperationClient":"Type.Property.Nullable.Duration","type.property.nullable.DurationProperty":"Type.Property.Nullable.DurationProperty","type.property.nullable.InnerModel":"Type.Property.Nullable.InnerModel","type.property.nullable.NullableClientBuilder":"Type.Property.Nullable","type.property.nullable.StringOperationClient":"Type.Property.Nullable.String","type.property.nullable.StringProperty":"Type.Property.Nullable.StringProperty"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/property/nullable/BytesClient.java","src/main/java/type/property/nullable/BytesProperty.java","src/main/java/type/property/nullable/CollectionsByteClient.java","src/main/java/type/property/nullable/CollectionsByteProperty.java","src/main/java/type/property/nullable/CollectionsModelClient.java","src/main/java/type/property/nullable/CollectionsModelProperty.java","src/main/java/type/property/nullable/CollectionsStringClient.java","src/main/java/type/property/nullable/CollectionsStringProperty.java","src/main/java/type/property/nullable/DatetimeOperationClient.java","src/main/java/type/property/nullable/DatetimeProperty.java","src/main/java/type/property/nullable/DurationOperationClient.java","src/main/java/type/property/nullable/DurationProperty.java","src/main/java/type/property/nullable/InnerModel.java","src/main/java/type/property/nullable/NullableClientBuilder.java","src/main/java/type/property/nullable/StringOperationClient.java","src/main/java/type/property/nullable/StringProperty.java","src/main/java/type/property/nullable/implementation/BytesImpl.java","src/main/java/type/property/nullable/implementation/CollectionsBytesImpl.java","src/main/java/type/property/nullable/implementation/CollectionsModelsImpl.java","src/main/java/type/property/nullable/implementation/CollectionsStringsImpl.java","src/main/java/type/property/nullable/implementation/DatetimeOperationsImpl.java","src/main/java/type/property/nullable/implementation/DurationOperationsImpl.java","src/main/java/type/property/nullable/implementation/JsonMergePatchHelper.java","src/main/java/type/property/nullable/implementation/NullableClientImpl.java","src/main/java/type/property/nullable/implementation/StringOperationsImpl.java","src/main/java/type/property/nullable/implementation/package-info.java","src/main/java/type/property/nullable/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-optional_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-optional_apiview_properties.json deleted file mode 100644 index 6b950193284..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-optional_apiview_properties.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.property.optional.BooleanLiteralClient": "Type.Property.Optional.BooleanLiteral", - "type.property.optional.BooleanLiteralProperty": "Type.Property.Optional.BooleanLiteralProperty", - "type.property.optional.BooleanLiteralPropertyProperty": null, - "type.property.optional.BytesClient": "Type.Property.Optional.Bytes", - "type.property.optional.BytesProperty": "Type.Property.Optional.BytesProperty", - "type.property.optional.CollectionsByteClient": "Type.Property.Optional.CollectionsByte", - "type.property.optional.CollectionsByteProperty": "Type.Property.Optional.CollectionsByteProperty", - "type.property.optional.CollectionsModelClient": "Type.Property.Optional.CollectionsModel", - "type.property.optional.CollectionsModelProperty": "Type.Property.Optional.CollectionsModelProperty", - "type.property.optional.DatetimeOperationClient": "Type.Property.Optional.Datetime", - "type.property.optional.DatetimeProperty": "Type.Property.Optional.DatetimeProperty", - "type.property.optional.DurationOperationClient": "Type.Property.Optional.Duration", - "type.property.optional.DurationProperty": "Type.Property.Optional.DurationProperty", - "type.property.optional.FloatLiteralClient": "Type.Property.Optional.FloatLiteral", - "type.property.optional.FloatLiteralProperty": "Type.Property.Optional.FloatLiteralProperty", - "type.property.optional.FloatLiteralPropertyProperty": null, - "type.property.optional.IntLiteralClient": "Type.Property.Optional.IntLiteral", - "type.property.optional.IntLiteralProperty": "Type.Property.Optional.IntLiteralProperty", - "type.property.optional.IntLiteralPropertyProperty": null, - "type.property.optional.OptionalClientBuilder": "Type.Property.Optional", - "type.property.optional.PlainDateClient": "Type.Property.Optional.PlainDate", - "type.property.optional.PlainDateProperty": "Type.Property.Optional.PlainDateProperty", - "type.property.optional.PlainTimeClient": "Type.Property.Optional.PlainTime", - "type.property.optional.PlainTimeProperty": "Type.Property.Optional.PlainTimeProperty", - "type.property.optional.RequiredAndOptionalClient": "Type.Property.Optional.RequiredAndOptional", - "type.property.optional.RequiredAndOptionalProperty": "Type.Property.Optional.RequiredAndOptionalProperty", - "type.property.optional.StringLiteralClient": "Type.Property.Optional.StringLiteral", - "type.property.optional.StringLiteralProperty": "Type.Property.Optional.StringLiteralProperty", - "type.property.optional.StringLiteralPropertyProperty": null, - "type.property.optional.StringOperationClient": "Type.Property.Optional.String", - "type.property.optional.StringProperty": "Type.Property.Optional.StringProperty", - "type.property.optional.UnionFloatLiteralClient": "Type.Property.Optional.UnionFloatLiteral", - "type.property.optional.UnionFloatLiteralProperty": "Type.Property.Optional.UnionFloatLiteralProperty", - "type.property.optional.UnionFloatLiteralPropertyProperty": "Type.Property.Optional.UnionFloatLiteralProperty.property.anonymous", - "type.property.optional.UnionIntLiteralClient": "Type.Property.Optional.UnionIntLiteral", - "type.property.optional.UnionIntLiteralProperty": "Type.Property.Optional.UnionIntLiteralProperty", - "type.property.optional.UnionIntLiteralPropertyProperty": "Type.Property.Optional.UnionIntLiteralProperty.property.anonymous", - "type.property.optional.UnionStringLiteralClient": "Type.Property.Optional.UnionStringLiteral", - "type.property.optional.UnionStringLiteralProperty": "Type.Property.Optional.UnionStringLiteralProperty", - "type.property.optional.UnionStringLiteralPropertyProperty": "Type.Property.Optional.UnionStringLiteralProperty.property.anonymous" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-optional_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-optional_metadata.json index a8edba46835..f362c05ec63 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-optional_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-optional_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.property.optional.BooleanLiteralClient":"Type.Property.Optional.BooleanLiteral","type.property.optional.BooleanLiteralProperty":"Type.Property.Optional.BooleanLiteralProperty","type.property.optional.BooleanLiteralPropertyProperty":null,"type.property.optional.BytesClient":"Type.Property.Optional.Bytes","type.property.optional.BytesProperty":"Type.Property.Optional.BytesProperty","type.property.optional.CollectionsByteClient":"Type.Property.Optional.CollectionsByte","type.property.optional.CollectionsByteProperty":"Type.Property.Optional.CollectionsByteProperty","type.property.optional.CollectionsModelClient":"Type.Property.Optional.CollectionsModel","type.property.optional.CollectionsModelProperty":"Type.Property.Optional.CollectionsModelProperty","type.property.optional.DatetimeOperationClient":"Type.Property.Optional.Datetime","type.property.optional.DatetimeProperty":"Type.Property.Optional.DatetimeProperty","type.property.optional.DurationOperationClient":"Type.Property.Optional.Duration","type.property.optional.DurationProperty":"Type.Property.Optional.DurationProperty","type.property.optional.FloatLiteralClient":"Type.Property.Optional.FloatLiteral","type.property.optional.FloatLiteralProperty":"Type.Property.Optional.FloatLiteralProperty","type.property.optional.FloatLiteralPropertyProperty":null,"type.property.optional.IntLiteralClient":"Type.Property.Optional.IntLiteral","type.property.optional.IntLiteralProperty":"Type.Property.Optional.IntLiteralProperty","type.property.optional.IntLiteralPropertyProperty":null,"type.property.optional.OptionalClientBuilder":"Type.Property.Optional","type.property.optional.PlainDateClient":"Type.Property.Optional.PlainDate","type.property.optional.PlainDateProperty":"Type.Property.Optional.PlainDateProperty","type.property.optional.PlainTimeClient":"Type.Property.Optional.PlainTime","type.property.optional.PlainTimeProperty":"Type.Property.Optional.PlainTimeProperty","type.property.optional.RequiredAndOptionalClient":"Type.Property.Optional.RequiredAndOptional","type.property.optional.RequiredAndOptionalProperty":"Type.Property.Optional.RequiredAndOptionalProperty","type.property.optional.StringLiteralClient":"Type.Property.Optional.StringLiteral","type.property.optional.StringLiteralProperty":"Type.Property.Optional.StringLiteralProperty","type.property.optional.StringLiteralPropertyProperty":null,"type.property.optional.StringOperationClient":"Type.Property.Optional.String","type.property.optional.StringProperty":"Type.Property.Optional.StringProperty","type.property.optional.UnionFloatLiteralClient":"Type.Property.Optional.UnionFloatLiteral","type.property.optional.UnionFloatLiteralProperty":"Type.Property.Optional.UnionFloatLiteralProperty","type.property.optional.UnionFloatLiteralPropertyProperty":"Type.Property.Optional.UnionFloatLiteralProperty.property.anonymous","type.property.optional.UnionIntLiteralClient":"Type.Property.Optional.UnionIntLiteral","type.property.optional.UnionIntLiteralProperty":"Type.Property.Optional.UnionIntLiteralProperty","type.property.optional.UnionIntLiteralPropertyProperty":"Type.Property.Optional.UnionIntLiteralProperty.property.anonymous","type.property.optional.UnionStringLiteralClient":"Type.Property.Optional.UnionStringLiteral","type.property.optional.UnionStringLiteralProperty":"Type.Property.Optional.UnionStringLiteralProperty","type.property.optional.UnionStringLiteralPropertyProperty":"Type.Property.Optional.UnionStringLiteralProperty.property.anonymous"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/property/optional/BooleanLiteralClient.java","src/main/java/type/property/optional/BooleanLiteralProperty.java","src/main/java/type/property/optional/BooleanLiteralPropertyProperty.java","src/main/java/type/property/optional/BytesClient.java","src/main/java/type/property/optional/BytesProperty.java","src/main/java/type/property/optional/CollectionsByteClient.java","src/main/java/type/property/optional/CollectionsByteProperty.java","src/main/java/type/property/optional/CollectionsModelClient.java","src/main/java/type/property/optional/CollectionsModelProperty.java","src/main/java/type/property/optional/DatetimeOperationClient.java","src/main/java/type/property/optional/DatetimeProperty.java","src/main/java/type/property/optional/DurationOperationClient.java","src/main/java/type/property/optional/DurationProperty.java","src/main/java/type/property/optional/FloatLiteralClient.java","src/main/java/type/property/optional/FloatLiteralProperty.java","src/main/java/type/property/optional/FloatLiteralPropertyProperty.java","src/main/java/type/property/optional/IntLiteralClient.java","src/main/java/type/property/optional/IntLiteralProperty.java","src/main/java/type/property/optional/IntLiteralPropertyProperty.java","src/main/java/type/property/optional/OptionalClientBuilder.java","src/main/java/type/property/optional/PlainDateClient.java","src/main/java/type/property/optional/PlainDateProperty.java","src/main/java/type/property/optional/PlainTimeClient.java","src/main/java/type/property/optional/PlainTimeProperty.java","src/main/java/type/property/optional/RequiredAndOptionalClient.java","src/main/java/type/property/optional/RequiredAndOptionalProperty.java","src/main/java/type/property/optional/StringLiteralClient.java","src/main/java/type/property/optional/StringLiteralProperty.java","src/main/java/type/property/optional/StringLiteralPropertyProperty.java","src/main/java/type/property/optional/StringOperationClient.java","src/main/java/type/property/optional/StringProperty.java","src/main/java/type/property/optional/UnionFloatLiteralClient.java","src/main/java/type/property/optional/UnionFloatLiteralProperty.java","src/main/java/type/property/optional/UnionFloatLiteralPropertyProperty.java","src/main/java/type/property/optional/UnionIntLiteralClient.java","src/main/java/type/property/optional/UnionIntLiteralProperty.java","src/main/java/type/property/optional/UnionIntLiteralPropertyProperty.java","src/main/java/type/property/optional/UnionStringLiteralClient.java","src/main/java/type/property/optional/UnionStringLiteralProperty.java","src/main/java/type/property/optional/UnionStringLiteralPropertyProperty.java","src/main/java/type/property/optional/implementation/BooleanLiteralsImpl.java","src/main/java/type/property/optional/implementation/BytesImpl.java","src/main/java/type/property/optional/implementation/CollectionsBytesImpl.java","src/main/java/type/property/optional/implementation/CollectionsModelsImpl.java","src/main/java/type/property/optional/implementation/DatetimeOperationsImpl.java","src/main/java/type/property/optional/implementation/DurationOperationsImpl.java","src/main/java/type/property/optional/implementation/FloatLiteralsImpl.java","src/main/java/type/property/optional/implementation/IntLiteralsImpl.java","src/main/java/type/property/optional/implementation/OptionalClientImpl.java","src/main/java/type/property/optional/implementation/PlainDatesImpl.java","src/main/java/type/property/optional/implementation/PlainTimesImpl.java","src/main/java/type/property/optional/implementation/RequiredAndOptionalsImpl.java","src/main/java/type/property/optional/implementation/StringLiteralsImpl.java","src/main/java/type/property/optional/implementation/StringOperationsImpl.java","src/main/java/type/property/optional/implementation/UnionFloatLiteralsImpl.java","src/main/java/type/property/optional/implementation/UnionIntLiteralsImpl.java","src/main/java/type/property/optional/implementation/UnionStringLiteralsImpl.java","src/main/java/type/property/optional/implementation/package-info.java","src/main/java/type/property/optional/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.property.optional.BooleanLiteralClient":"Type.Property.Optional.BooleanLiteral","type.property.optional.BooleanLiteralProperty":"Type.Property.Optional.BooleanLiteralProperty","type.property.optional.BooleanLiteralPropertyProperty":null,"type.property.optional.BytesClient":"Type.Property.Optional.Bytes","type.property.optional.BytesProperty":"Type.Property.Optional.BytesProperty","type.property.optional.CollectionsByteClient":"Type.Property.Optional.CollectionsByte","type.property.optional.CollectionsByteProperty":"Type.Property.Optional.CollectionsByteProperty","type.property.optional.CollectionsModelClient":"Type.Property.Optional.CollectionsModel","type.property.optional.CollectionsModelProperty":"Type.Property.Optional.CollectionsModelProperty","type.property.optional.DatetimeOperationClient":"Type.Property.Optional.Datetime","type.property.optional.DatetimeProperty":"Type.Property.Optional.DatetimeProperty","type.property.optional.DurationOperationClient":"Type.Property.Optional.Duration","type.property.optional.DurationProperty":"Type.Property.Optional.DurationProperty","type.property.optional.FloatLiteralClient":"Type.Property.Optional.FloatLiteral","type.property.optional.FloatLiteralProperty":"Type.Property.Optional.FloatLiteralProperty","type.property.optional.FloatLiteralPropertyProperty":null,"type.property.optional.IntLiteralClient":"Type.Property.Optional.IntLiteral","type.property.optional.IntLiteralProperty":"Type.Property.Optional.IntLiteralProperty","type.property.optional.IntLiteralPropertyProperty":null,"type.property.optional.OptionalClientBuilder":"Type.Property.Optional","type.property.optional.PlainDateClient":"Type.Property.Optional.PlainDate","type.property.optional.PlainDateProperty":"Type.Property.Optional.PlainDateProperty","type.property.optional.PlainTimeClient":"Type.Property.Optional.PlainTime","type.property.optional.PlainTimeProperty":"Type.Property.Optional.PlainTimeProperty","type.property.optional.RequiredAndOptionalClient":"Type.Property.Optional.RequiredAndOptional","type.property.optional.RequiredAndOptionalProperty":"Type.Property.Optional.RequiredAndOptionalProperty","type.property.optional.StringLiteralClient":"Type.Property.Optional.StringLiteral","type.property.optional.StringLiteralProperty":"Type.Property.Optional.StringLiteralProperty","type.property.optional.StringLiteralPropertyProperty":null,"type.property.optional.StringOperationClient":"Type.Property.Optional.String","type.property.optional.StringProperty":"Type.Property.Optional.StringProperty","type.property.optional.UnionFloatLiteralClient":"Type.Property.Optional.UnionFloatLiteral","type.property.optional.UnionFloatLiteralProperty":"Type.Property.Optional.UnionFloatLiteralProperty","type.property.optional.UnionFloatLiteralPropertyProperty":"Type.Property.Optional.UnionFloatLiteralProperty.property.anonymous","type.property.optional.UnionIntLiteralClient":"Type.Property.Optional.UnionIntLiteral","type.property.optional.UnionIntLiteralProperty":"Type.Property.Optional.UnionIntLiteralProperty","type.property.optional.UnionIntLiteralPropertyProperty":"Type.Property.Optional.UnionIntLiteralProperty.property.anonymous","type.property.optional.UnionStringLiteralClient":"Type.Property.Optional.UnionStringLiteral","type.property.optional.UnionStringLiteralProperty":"Type.Property.Optional.UnionStringLiteralProperty","type.property.optional.UnionStringLiteralPropertyProperty":"Type.Property.Optional.UnionStringLiteralProperty.property.anonymous"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/property/optional/BooleanLiteralClient.java","src/main/java/type/property/optional/BooleanLiteralProperty.java","src/main/java/type/property/optional/BooleanLiteralPropertyProperty.java","src/main/java/type/property/optional/BytesClient.java","src/main/java/type/property/optional/BytesProperty.java","src/main/java/type/property/optional/CollectionsByteClient.java","src/main/java/type/property/optional/CollectionsByteProperty.java","src/main/java/type/property/optional/CollectionsModelClient.java","src/main/java/type/property/optional/CollectionsModelProperty.java","src/main/java/type/property/optional/DatetimeOperationClient.java","src/main/java/type/property/optional/DatetimeProperty.java","src/main/java/type/property/optional/DurationOperationClient.java","src/main/java/type/property/optional/DurationProperty.java","src/main/java/type/property/optional/FloatLiteralClient.java","src/main/java/type/property/optional/FloatLiteralProperty.java","src/main/java/type/property/optional/FloatLiteralPropertyProperty.java","src/main/java/type/property/optional/IntLiteralClient.java","src/main/java/type/property/optional/IntLiteralProperty.java","src/main/java/type/property/optional/IntLiteralPropertyProperty.java","src/main/java/type/property/optional/OptionalClientBuilder.java","src/main/java/type/property/optional/PlainDateClient.java","src/main/java/type/property/optional/PlainDateProperty.java","src/main/java/type/property/optional/PlainTimeClient.java","src/main/java/type/property/optional/PlainTimeProperty.java","src/main/java/type/property/optional/RequiredAndOptionalClient.java","src/main/java/type/property/optional/RequiredAndOptionalProperty.java","src/main/java/type/property/optional/StringLiteralClient.java","src/main/java/type/property/optional/StringLiteralProperty.java","src/main/java/type/property/optional/StringLiteralPropertyProperty.java","src/main/java/type/property/optional/StringOperationClient.java","src/main/java/type/property/optional/StringProperty.java","src/main/java/type/property/optional/UnionFloatLiteralClient.java","src/main/java/type/property/optional/UnionFloatLiteralProperty.java","src/main/java/type/property/optional/UnionFloatLiteralPropertyProperty.java","src/main/java/type/property/optional/UnionIntLiteralClient.java","src/main/java/type/property/optional/UnionIntLiteralProperty.java","src/main/java/type/property/optional/UnionIntLiteralPropertyProperty.java","src/main/java/type/property/optional/UnionStringLiteralClient.java","src/main/java/type/property/optional/UnionStringLiteralProperty.java","src/main/java/type/property/optional/UnionStringLiteralPropertyProperty.java","src/main/java/type/property/optional/implementation/BooleanLiteralsImpl.java","src/main/java/type/property/optional/implementation/BytesImpl.java","src/main/java/type/property/optional/implementation/CollectionsBytesImpl.java","src/main/java/type/property/optional/implementation/CollectionsModelsImpl.java","src/main/java/type/property/optional/implementation/DatetimeOperationsImpl.java","src/main/java/type/property/optional/implementation/DurationOperationsImpl.java","src/main/java/type/property/optional/implementation/FloatLiteralsImpl.java","src/main/java/type/property/optional/implementation/IntLiteralsImpl.java","src/main/java/type/property/optional/implementation/OptionalClientImpl.java","src/main/java/type/property/optional/implementation/PlainDatesImpl.java","src/main/java/type/property/optional/implementation/PlainTimesImpl.java","src/main/java/type/property/optional/implementation/RequiredAndOptionalsImpl.java","src/main/java/type/property/optional/implementation/StringLiteralsImpl.java","src/main/java/type/property/optional/implementation/StringOperationsImpl.java","src/main/java/type/property/optional/implementation/UnionFloatLiteralsImpl.java","src/main/java/type/property/optional/implementation/UnionIntLiteralsImpl.java","src/main/java/type/property/optional/implementation/UnionStringLiteralsImpl.java","src/main/java/type/property/optional/implementation/package-info.java","src/main/java/type/property/optional/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-valuetypes_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-valuetypes_apiview_properties.json deleted file mode 100644 index 19500118b9e..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-valuetypes_apiview_properties.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.property.valuetypes.BooleanLiteralClient": "Type.Property.ValueTypes.BooleanLiteral", - "type.property.valuetypes.BooleanLiteralProperty": "Type.Property.ValueTypes.BooleanLiteralProperty", - "type.property.valuetypes.BooleanOperationClient": "Type.Property.ValueTypes.Boolean", - "type.property.valuetypes.BooleanProperty": "Type.Property.ValueTypes.BooleanProperty", - "type.property.valuetypes.BytesClient": "Type.Property.ValueTypes.Bytes", - "type.property.valuetypes.BytesProperty": "Type.Property.ValueTypes.BytesProperty", - "type.property.valuetypes.CollectionsIntClient": "Type.Property.ValueTypes.CollectionsInt", - "type.property.valuetypes.CollectionsIntProperty": "Type.Property.ValueTypes.CollectionsIntProperty", - "type.property.valuetypes.CollectionsModelClient": "Type.Property.ValueTypes.CollectionsModel", - "type.property.valuetypes.CollectionsModelProperty": "Type.Property.ValueTypes.CollectionsModelProperty", - "type.property.valuetypes.CollectionsStringClient": "Type.Property.ValueTypes.CollectionsString", - "type.property.valuetypes.CollectionsStringProperty": "Type.Property.ValueTypes.CollectionsStringProperty", - "type.property.valuetypes.DatetimeOperationClient": "Type.Property.ValueTypes.Datetime", - "type.property.valuetypes.DatetimeProperty": "Type.Property.ValueTypes.DatetimeProperty", - "type.property.valuetypes.Decimal128Client": "Type.Property.ValueTypes.Decimal128", - "type.property.valuetypes.Decimal128Property": "Type.Property.ValueTypes.Decimal128Property", - "type.property.valuetypes.DecimalClient": "Type.Property.ValueTypes.Decimal", - "type.property.valuetypes.DecimalProperty": "Type.Property.ValueTypes.DecimalProperty", - "type.property.valuetypes.DictionaryStringClient": "Type.Property.ValueTypes.DictionaryString", - "type.property.valuetypes.DictionaryStringProperty": "Type.Property.ValueTypes.DictionaryStringProperty", - "type.property.valuetypes.DurationOperationClient": "Type.Property.ValueTypes.Duration", - "type.property.valuetypes.DurationProperty": "Type.Property.ValueTypes.DurationProperty", - "type.property.valuetypes.EnumClient": "Type.Property.ValueTypes.Enum", - "type.property.valuetypes.EnumProperty": "Type.Property.ValueTypes.EnumProperty", - "type.property.valuetypes.ExtendedEnum": "Type.Property.ValueTypes.ExtendedEnum", - "type.property.valuetypes.ExtensibleEnumClient": "Type.Property.ValueTypes.ExtensibleEnum", - "type.property.valuetypes.ExtensibleEnumProperty": "Type.Property.ValueTypes.ExtensibleEnumProperty", - "type.property.valuetypes.FixedInnerEnum": "Type.Property.ValueTypes.FixedInnerEnum", - "type.property.valuetypes.FloatLiteralClient": "Type.Property.ValueTypes.FloatLiteral", - "type.property.valuetypes.FloatLiteralProperty": "Type.Property.ValueTypes.FloatLiteralProperty", - "type.property.valuetypes.FloatOperationClient": "Type.Property.ValueTypes.Float", - "type.property.valuetypes.FloatProperty": "Type.Property.ValueTypes.FloatProperty", - "type.property.valuetypes.InnerEnum": "Type.Property.ValueTypes.InnerEnum", - "type.property.valuetypes.InnerModel": "Type.Property.ValueTypes.InnerModel", - "type.property.valuetypes.IntClient": "Type.Property.ValueTypes.Int", - "type.property.valuetypes.IntLiteralClient": "Type.Property.ValueTypes.IntLiteral", - "type.property.valuetypes.IntLiteralProperty": "Type.Property.ValueTypes.IntLiteralProperty", - "type.property.valuetypes.IntProperty": "Type.Property.ValueTypes.IntProperty", - "type.property.valuetypes.ModelClient": "Type.Property.ValueTypes.Model", - "type.property.valuetypes.ModelProperty": "Type.Property.ValueTypes.ModelProperty", - "type.property.valuetypes.NeverClient": "Type.Property.ValueTypes.Never", - "type.property.valuetypes.NeverProperty": "Type.Property.ValueTypes.NeverProperty", - "type.property.valuetypes.StringLiteralClient": "Type.Property.ValueTypes.StringLiteral", - "type.property.valuetypes.StringLiteralProperty": "Type.Property.ValueTypes.StringLiteralProperty", - "type.property.valuetypes.StringOperationClient": "Type.Property.ValueTypes.String", - "type.property.valuetypes.StringProperty": "Type.Property.ValueTypes.StringProperty", - "type.property.valuetypes.UnionEnumValueClient": "Type.Property.ValueTypes.UnionEnumValue", - "type.property.valuetypes.UnionEnumValueProperty": "Type.Property.ValueTypes.UnionEnumValueProperty", - "type.property.valuetypes.UnionFloatLiteralClient": "Type.Property.ValueTypes.UnionFloatLiteral", - "type.property.valuetypes.UnionFloatLiteralProperty": "Type.Property.ValueTypes.UnionFloatLiteralProperty", - "type.property.valuetypes.UnionFloatLiteralPropertyProperty": "Type.Property.ValueTypes.UnionFloatLiteralProperty.property.anonymous", - "type.property.valuetypes.UnionIntLiteralClient": "Type.Property.ValueTypes.UnionIntLiteral", - "type.property.valuetypes.UnionIntLiteralProperty": "Type.Property.ValueTypes.UnionIntLiteralProperty", - "type.property.valuetypes.UnionIntLiteralPropertyProperty": "Type.Property.ValueTypes.UnionIntLiteralProperty.property.anonymous", - "type.property.valuetypes.UnionStringLiteralClient": "Type.Property.ValueTypes.UnionStringLiteral", - "type.property.valuetypes.UnionStringLiteralProperty": "Type.Property.ValueTypes.UnionStringLiteralProperty", - "type.property.valuetypes.UnionStringLiteralPropertyProperty": "Type.Property.ValueTypes.UnionStringLiteralProperty.property.anonymous", - "type.property.valuetypes.UnknownArrayClient": "Type.Property.ValueTypes.UnknownArray", - "type.property.valuetypes.UnknownArrayProperty": "Type.Property.ValueTypes.UnknownArrayProperty", - "type.property.valuetypes.UnknownDictClient": "Type.Property.ValueTypes.UnknownDict", - "type.property.valuetypes.UnknownDictProperty": "Type.Property.ValueTypes.UnknownDictProperty", - "type.property.valuetypes.UnknownIntClient": "Type.Property.ValueTypes.UnknownInt", - "type.property.valuetypes.UnknownIntProperty": "Type.Property.ValueTypes.UnknownIntProperty", - "type.property.valuetypes.UnknownStringClient": "Type.Property.ValueTypes.UnknownString", - "type.property.valuetypes.UnknownStringProperty": "Type.Property.ValueTypes.UnknownStringProperty", - "type.property.valuetypes.ValueTypesClientBuilder": "Type.Property.ValueTypes" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-valuetypes_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-valuetypes_metadata.json index edf18bc38ba..f032bc369a9 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-valuetypes_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-property-valuetypes_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.property.valuetypes.BooleanLiteralClient":"Type.Property.ValueTypes.BooleanLiteral","type.property.valuetypes.BooleanLiteralProperty":"Type.Property.ValueTypes.BooleanLiteralProperty","type.property.valuetypes.BooleanOperationClient":"Type.Property.ValueTypes.Boolean","type.property.valuetypes.BooleanProperty":"Type.Property.ValueTypes.BooleanProperty","type.property.valuetypes.BytesClient":"Type.Property.ValueTypes.Bytes","type.property.valuetypes.BytesProperty":"Type.Property.ValueTypes.BytesProperty","type.property.valuetypes.CollectionsIntClient":"Type.Property.ValueTypes.CollectionsInt","type.property.valuetypes.CollectionsIntProperty":"Type.Property.ValueTypes.CollectionsIntProperty","type.property.valuetypes.CollectionsModelClient":"Type.Property.ValueTypes.CollectionsModel","type.property.valuetypes.CollectionsModelProperty":"Type.Property.ValueTypes.CollectionsModelProperty","type.property.valuetypes.CollectionsStringClient":"Type.Property.ValueTypes.CollectionsString","type.property.valuetypes.CollectionsStringProperty":"Type.Property.ValueTypes.CollectionsStringProperty","type.property.valuetypes.DatetimeOperationClient":"Type.Property.ValueTypes.Datetime","type.property.valuetypes.DatetimeProperty":"Type.Property.ValueTypes.DatetimeProperty","type.property.valuetypes.Decimal128Client":"Type.Property.ValueTypes.Decimal128","type.property.valuetypes.Decimal128Property":"Type.Property.ValueTypes.Decimal128Property","type.property.valuetypes.DecimalClient":"Type.Property.ValueTypes.Decimal","type.property.valuetypes.DecimalProperty":"Type.Property.ValueTypes.DecimalProperty","type.property.valuetypes.DictionaryStringClient":"Type.Property.ValueTypes.DictionaryString","type.property.valuetypes.DictionaryStringProperty":"Type.Property.ValueTypes.DictionaryStringProperty","type.property.valuetypes.DurationOperationClient":"Type.Property.ValueTypes.Duration","type.property.valuetypes.DurationProperty":"Type.Property.ValueTypes.DurationProperty","type.property.valuetypes.EnumClient":"Type.Property.ValueTypes.Enum","type.property.valuetypes.EnumProperty":"Type.Property.ValueTypes.EnumProperty","type.property.valuetypes.ExtendedEnum":"Type.Property.ValueTypes.ExtendedEnum","type.property.valuetypes.ExtensibleEnumClient":"Type.Property.ValueTypes.ExtensibleEnum","type.property.valuetypes.ExtensibleEnumProperty":"Type.Property.ValueTypes.ExtensibleEnumProperty","type.property.valuetypes.FixedInnerEnum":"Type.Property.ValueTypes.FixedInnerEnum","type.property.valuetypes.FloatLiteralClient":"Type.Property.ValueTypes.FloatLiteral","type.property.valuetypes.FloatLiteralProperty":"Type.Property.ValueTypes.FloatLiteralProperty","type.property.valuetypes.FloatOperationClient":"Type.Property.ValueTypes.Float","type.property.valuetypes.FloatProperty":"Type.Property.ValueTypes.FloatProperty","type.property.valuetypes.InnerEnum":"Type.Property.ValueTypes.InnerEnum","type.property.valuetypes.InnerModel":"Type.Property.ValueTypes.InnerModel","type.property.valuetypes.IntClient":"Type.Property.ValueTypes.Int","type.property.valuetypes.IntLiteralClient":"Type.Property.ValueTypes.IntLiteral","type.property.valuetypes.IntLiteralProperty":"Type.Property.ValueTypes.IntLiteralProperty","type.property.valuetypes.IntProperty":"Type.Property.ValueTypes.IntProperty","type.property.valuetypes.ModelClient":"Type.Property.ValueTypes.Model","type.property.valuetypes.ModelProperty":"Type.Property.ValueTypes.ModelProperty","type.property.valuetypes.NeverClient":"Type.Property.ValueTypes.Never","type.property.valuetypes.NeverProperty":"Type.Property.ValueTypes.NeverProperty","type.property.valuetypes.StringLiteralClient":"Type.Property.ValueTypes.StringLiteral","type.property.valuetypes.StringLiteralProperty":"Type.Property.ValueTypes.StringLiteralProperty","type.property.valuetypes.StringOperationClient":"Type.Property.ValueTypes.String","type.property.valuetypes.StringProperty":"Type.Property.ValueTypes.StringProperty","type.property.valuetypes.UnionEnumValueClient":"Type.Property.ValueTypes.UnionEnumValue","type.property.valuetypes.UnionEnumValueProperty":"Type.Property.ValueTypes.UnionEnumValueProperty","type.property.valuetypes.UnionFloatLiteralClient":"Type.Property.ValueTypes.UnionFloatLiteral","type.property.valuetypes.UnionFloatLiteralProperty":"Type.Property.ValueTypes.UnionFloatLiteralProperty","type.property.valuetypes.UnionFloatLiteralPropertyProperty":"Type.Property.ValueTypes.UnionFloatLiteralProperty.property.anonymous","type.property.valuetypes.UnionIntLiteralClient":"Type.Property.ValueTypes.UnionIntLiteral","type.property.valuetypes.UnionIntLiteralProperty":"Type.Property.ValueTypes.UnionIntLiteralProperty","type.property.valuetypes.UnionIntLiteralPropertyProperty":"Type.Property.ValueTypes.UnionIntLiteralProperty.property.anonymous","type.property.valuetypes.UnionStringLiteralClient":"Type.Property.ValueTypes.UnionStringLiteral","type.property.valuetypes.UnionStringLiteralProperty":"Type.Property.ValueTypes.UnionStringLiteralProperty","type.property.valuetypes.UnionStringLiteralPropertyProperty":"Type.Property.ValueTypes.UnionStringLiteralProperty.property.anonymous","type.property.valuetypes.UnknownArrayClient":"Type.Property.ValueTypes.UnknownArray","type.property.valuetypes.UnknownArrayProperty":"Type.Property.ValueTypes.UnknownArrayProperty","type.property.valuetypes.UnknownDictClient":"Type.Property.ValueTypes.UnknownDict","type.property.valuetypes.UnknownDictProperty":"Type.Property.ValueTypes.UnknownDictProperty","type.property.valuetypes.UnknownIntClient":"Type.Property.ValueTypes.UnknownInt","type.property.valuetypes.UnknownIntProperty":"Type.Property.ValueTypes.UnknownIntProperty","type.property.valuetypes.UnknownStringClient":"Type.Property.ValueTypes.UnknownString","type.property.valuetypes.UnknownStringProperty":"Type.Property.ValueTypes.UnknownStringProperty","type.property.valuetypes.ValueTypesClientBuilder":"Type.Property.ValueTypes"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/property/valuetypes/BooleanLiteralClient.java","src/main/java/type/property/valuetypes/BooleanLiteralProperty.java","src/main/java/type/property/valuetypes/BooleanOperationClient.java","src/main/java/type/property/valuetypes/BooleanProperty.java","src/main/java/type/property/valuetypes/BytesClient.java","src/main/java/type/property/valuetypes/BytesProperty.java","src/main/java/type/property/valuetypes/CollectionsIntClient.java","src/main/java/type/property/valuetypes/CollectionsIntProperty.java","src/main/java/type/property/valuetypes/CollectionsModelClient.java","src/main/java/type/property/valuetypes/CollectionsModelProperty.java","src/main/java/type/property/valuetypes/CollectionsStringClient.java","src/main/java/type/property/valuetypes/CollectionsStringProperty.java","src/main/java/type/property/valuetypes/DatetimeOperationClient.java","src/main/java/type/property/valuetypes/DatetimeProperty.java","src/main/java/type/property/valuetypes/Decimal128Client.java","src/main/java/type/property/valuetypes/Decimal128Property.java","src/main/java/type/property/valuetypes/DecimalClient.java","src/main/java/type/property/valuetypes/DecimalProperty.java","src/main/java/type/property/valuetypes/DictionaryStringClient.java","src/main/java/type/property/valuetypes/DictionaryStringProperty.java","src/main/java/type/property/valuetypes/DurationOperationClient.java","src/main/java/type/property/valuetypes/DurationProperty.java","src/main/java/type/property/valuetypes/EnumClient.java","src/main/java/type/property/valuetypes/EnumProperty.java","src/main/java/type/property/valuetypes/ExtendedEnum.java","src/main/java/type/property/valuetypes/ExtensibleEnumClient.java","src/main/java/type/property/valuetypes/ExtensibleEnumProperty.java","src/main/java/type/property/valuetypes/FixedInnerEnum.java","src/main/java/type/property/valuetypes/FloatLiteralClient.java","src/main/java/type/property/valuetypes/FloatLiteralProperty.java","src/main/java/type/property/valuetypes/FloatOperationClient.java","src/main/java/type/property/valuetypes/FloatProperty.java","src/main/java/type/property/valuetypes/InnerEnum.java","src/main/java/type/property/valuetypes/InnerModel.java","src/main/java/type/property/valuetypes/IntClient.java","src/main/java/type/property/valuetypes/IntLiteralClient.java","src/main/java/type/property/valuetypes/IntLiteralProperty.java","src/main/java/type/property/valuetypes/IntProperty.java","src/main/java/type/property/valuetypes/ModelClient.java","src/main/java/type/property/valuetypes/ModelProperty.java","src/main/java/type/property/valuetypes/NeverClient.java","src/main/java/type/property/valuetypes/NeverProperty.java","src/main/java/type/property/valuetypes/StringLiteralClient.java","src/main/java/type/property/valuetypes/StringLiteralProperty.java","src/main/java/type/property/valuetypes/StringOperationClient.java","src/main/java/type/property/valuetypes/StringProperty.java","src/main/java/type/property/valuetypes/UnionEnumValueClient.java","src/main/java/type/property/valuetypes/UnionEnumValueProperty.java","src/main/java/type/property/valuetypes/UnionFloatLiteralClient.java","src/main/java/type/property/valuetypes/UnionFloatLiteralProperty.java","src/main/java/type/property/valuetypes/UnionFloatLiteralPropertyProperty.java","src/main/java/type/property/valuetypes/UnionIntLiteralClient.java","src/main/java/type/property/valuetypes/UnionIntLiteralProperty.java","src/main/java/type/property/valuetypes/UnionIntLiteralPropertyProperty.java","src/main/java/type/property/valuetypes/UnionStringLiteralClient.java","src/main/java/type/property/valuetypes/UnionStringLiteralProperty.java","src/main/java/type/property/valuetypes/UnionStringLiteralPropertyProperty.java","src/main/java/type/property/valuetypes/UnknownArrayClient.java","src/main/java/type/property/valuetypes/UnknownArrayProperty.java","src/main/java/type/property/valuetypes/UnknownDictClient.java","src/main/java/type/property/valuetypes/UnknownDictProperty.java","src/main/java/type/property/valuetypes/UnknownIntClient.java","src/main/java/type/property/valuetypes/UnknownIntProperty.java","src/main/java/type/property/valuetypes/UnknownStringClient.java","src/main/java/type/property/valuetypes/UnknownStringProperty.java","src/main/java/type/property/valuetypes/ValueTypesClientBuilder.java","src/main/java/type/property/valuetypes/implementation/BooleanLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/BooleanOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/BytesImpl.java","src/main/java/type/property/valuetypes/implementation/CollectionsIntsImpl.java","src/main/java/type/property/valuetypes/implementation/CollectionsModelsImpl.java","src/main/java/type/property/valuetypes/implementation/CollectionsStringsImpl.java","src/main/java/type/property/valuetypes/implementation/DatetimeOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/Decimal128sImpl.java","src/main/java/type/property/valuetypes/implementation/DecimalsImpl.java","src/main/java/type/property/valuetypes/implementation/DictionaryStringsImpl.java","src/main/java/type/property/valuetypes/implementation/DurationOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/EnumsImpl.java","src/main/java/type/property/valuetypes/implementation/ExtensibleEnumsImpl.java","src/main/java/type/property/valuetypes/implementation/FloatLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/FloatOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/IntLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/IntsImpl.java","src/main/java/type/property/valuetypes/implementation/ModelsImpl.java","src/main/java/type/property/valuetypes/implementation/NeversImpl.java","src/main/java/type/property/valuetypes/implementation/StringLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/StringOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/UnionEnumValuesImpl.java","src/main/java/type/property/valuetypes/implementation/UnionFloatLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/UnionIntLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/UnionStringLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/UnknownArraysImpl.java","src/main/java/type/property/valuetypes/implementation/UnknownDictsImpl.java","src/main/java/type/property/valuetypes/implementation/UnknownIntsImpl.java","src/main/java/type/property/valuetypes/implementation/UnknownStringsImpl.java","src/main/java/type/property/valuetypes/implementation/ValueTypesClientImpl.java","src/main/java/type/property/valuetypes/implementation/package-info.java","src/main/java/type/property/valuetypes/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.property.valuetypes.BooleanLiteralClient":"Type.Property.ValueTypes.BooleanLiteral","type.property.valuetypes.BooleanLiteralProperty":"Type.Property.ValueTypes.BooleanLiteralProperty","type.property.valuetypes.BooleanOperationClient":"Type.Property.ValueTypes.Boolean","type.property.valuetypes.BooleanProperty":"Type.Property.ValueTypes.BooleanProperty","type.property.valuetypes.BytesClient":"Type.Property.ValueTypes.Bytes","type.property.valuetypes.BytesProperty":"Type.Property.ValueTypes.BytesProperty","type.property.valuetypes.CollectionsIntClient":"Type.Property.ValueTypes.CollectionsInt","type.property.valuetypes.CollectionsIntProperty":"Type.Property.ValueTypes.CollectionsIntProperty","type.property.valuetypes.CollectionsModelClient":"Type.Property.ValueTypes.CollectionsModel","type.property.valuetypes.CollectionsModelProperty":"Type.Property.ValueTypes.CollectionsModelProperty","type.property.valuetypes.CollectionsStringClient":"Type.Property.ValueTypes.CollectionsString","type.property.valuetypes.CollectionsStringProperty":"Type.Property.ValueTypes.CollectionsStringProperty","type.property.valuetypes.DatetimeOperationClient":"Type.Property.ValueTypes.Datetime","type.property.valuetypes.DatetimeProperty":"Type.Property.ValueTypes.DatetimeProperty","type.property.valuetypes.Decimal128Client":"Type.Property.ValueTypes.Decimal128","type.property.valuetypes.Decimal128Property":"Type.Property.ValueTypes.Decimal128Property","type.property.valuetypes.DecimalClient":"Type.Property.ValueTypes.Decimal","type.property.valuetypes.DecimalProperty":"Type.Property.ValueTypes.DecimalProperty","type.property.valuetypes.DictionaryStringClient":"Type.Property.ValueTypes.DictionaryString","type.property.valuetypes.DictionaryStringProperty":"Type.Property.ValueTypes.DictionaryStringProperty","type.property.valuetypes.DurationOperationClient":"Type.Property.ValueTypes.Duration","type.property.valuetypes.DurationProperty":"Type.Property.ValueTypes.DurationProperty","type.property.valuetypes.EnumClient":"Type.Property.ValueTypes.Enum","type.property.valuetypes.EnumProperty":"Type.Property.ValueTypes.EnumProperty","type.property.valuetypes.ExtendedEnum":"Type.Property.ValueTypes.ExtendedEnum","type.property.valuetypes.ExtensibleEnumClient":"Type.Property.ValueTypes.ExtensibleEnum","type.property.valuetypes.ExtensibleEnumProperty":"Type.Property.ValueTypes.ExtensibleEnumProperty","type.property.valuetypes.FixedInnerEnum":"Type.Property.ValueTypes.FixedInnerEnum","type.property.valuetypes.FloatLiteralClient":"Type.Property.ValueTypes.FloatLiteral","type.property.valuetypes.FloatLiteralProperty":"Type.Property.ValueTypes.FloatLiteralProperty","type.property.valuetypes.FloatOperationClient":"Type.Property.ValueTypes.Float","type.property.valuetypes.FloatProperty":"Type.Property.ValueTypes.FloatProperty","type.property.valuetypes.InnerEnum":"Type.Property.ValueTypes.InnerEnum","type.property.valuetypes.InnerModel":"Type.Property.ValueTypes.InnerModel","type.property.valuetypes.IntClient":"Type.Property.ValueTypes.Int","type.property.valuetypes.IntLiteralClient":"Type.Property.ValueTypes.IntLiteral","type.property.valuetypes.IntLiteralProperty":"Type.Property.ValueTypes.IntLiteralProperty","type.property.valuetypes.IntProperty":"Type.Property.ValueTypes.IntProperty","type.property.valuetypes.ModelClient":"Type.Property.ValueTypes.Model","type.property.valuetypes.ModelProperty":"Type.Property.ValueTypes.ModelProperty","type.property.valuetypes.NeverClient":"Type.Property.ValueTypes.Never","type.property.valuetypes.NeverProperty":"Type.Property.ValueTypes.NeverProperty","type.property.valuetypes.StringLiteralClient":"Type.Property.ValueTypes.StringLiteral","type.property.valuetypes.StringLiteralProperty":"Type.Property.ValueTypes.StringLiteralProperty","type.property.valuetypes.StringOperationClient":"Type.Property.ValueTypes.String","type.property.valuetypes.StringProperty":"Type.Property.ValueTypes.StringProperty","type.property.valuetypes.UnionEnumValueClient":"Type.Property.ValueTypes.UnionEnumValue","type.property.valuetypes.UnionEnumValueProperty":"Type.Property.ValueTypes.UnionEnumValueProperty","type.property.valuetypes.UnionFloatLiteralClient":"Type.Property.ValueTypes.UnionFloatLiteral","type.property.valuetypes.UnionFloatLiteralProperty":"Type.Property.ValueTypes.UnionFloatLiteralProperty","type.property.valuetypes.UnionFloatLiteralPropertyProperty":"Type.Property.ValueTypes.UnionFloatLiteralProperty.property.anonymous","type.property.valuetypes.UnionIntLiteralClient":"Type.Property.ValueTypes.UnionIntLiteral","type.property.valuetypes.UnionIntLiteralProperty":"Type.Property.ValueTypes.UnionIntLiteralProperty","type.property.valuetypes.UnionIntLiteralPropertyProperty":"Type.Property.ValueTypes.UnionIntLiteralProperty.property.anonymous","type.property.valuetypes.UnionStringLiteralClient":"Type.Property.ValueTypes.UnionStringLiteral","type.property.valuetypes.UnionStringLiteralProperty":"Type.Property.ValueTypes.UnionStringLiteralProperty","type.property.valuetypes.UnionStringLiteralPropertyProperty":"Type.Property.ValueTypes.UnionStringLiteralProperty.property.anonymous","type.property.valuetypes.UnknownArrayClient":"Type.Property.ValueTypes.UnknownArray","type.property.valuetypes.UnknownArrayProperty":"Type.Property.ValueTypes.UnknownArrayProperty","type.property.valuetypes.UnknownDictClient":"Type.Property.ValueTypes.UnknownDict","type.property.valuetypes.UnknownDictProperty":"Type.Property.ValueTypes.UnknownDictProperty","type.property.valuetypes.UnknownIntClient":"Type.Property.ValueTypes.UnknownInt","type.property.valuetypes.UnknownIntProperty":"Type.Property.ValueTypes.UnknownIntProperty","type.property.valuetypes.UnknownStringClient":"Type.Property.ValueTypes.UnknownString","type.property.valuetypes.UnknownStringProperty":"Type.Property.ValueTypes.UnknownStringProperty","type.property.valuetypes.ValueTypesClientBuilder":"Type.Property.ValueTypes"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/property/valuetypes/BooleanLiteralClient.java","src/main/java/type/property/valuetypes/BooleanLiteralProperty.java","src/main/java/type/property/valuetypes/BooleanOperationClient.java","src/main/java/type/property/valuetypes/BooleanProperty.java","src/main/java/type/property/valuetypes/BytesClient.java","src/main/java/type/property/valuetypes/BytesProperty.java","src/main/java/type/property/valuetypes/CollectionsIntClient.java","src/main/java/type/property/valuetypes/CollectionsIntProperty.java","src/main/java/type/property/valuetypes/CollectionsModelClient.java","src/main/java/type/property/valuetypes/CollectionsModelProperty.java","src/main/java/type/property/valuetypes/CollectionsStringClient.java","src/main/java/type/property/valuetypes/CollectionsStringProperty.java","src/main/java/type/property/valuetypes/DatetimeOperationClient.java","src/main/java/type/property/valuetypes/DatetimeProperty.java","src/main/java/type/property/valuetypes/Decimal128Client.java","src/main/java/type/property/valuetypes/Decimal128Property.java","src/main/java/type/property/valuetypes/DecimalClient.java","src/main/java/type/property/valuetypes/DecimalProperty.java","src/main/java/type/property/valuetypes/DictionaryStringClient.java","src/main/java/type/property/valuetypes/DictionaryStringProperty.java","src/main/java/type/property/valuetypes/DurationOperationClient.java","src/main/java/type/property/valuetypes/DurationProperty.java","src/main/java/type/property/valuetypes/EnumClient.java","src/main/java/type/property/valuetypes/EnumProperty.java","src/main/java/type/property/valuetypes/ExtendedEnum.java","src/main/java/type/property/valuetypes/ExtensibleEnumClient.java","src/main/java/type/property/valuetypes/ExtensibleEnumProperty.java","src/main/java/type/property/valuetypes/FixedInnerEnum.java","src/main/java/type/property/valuetypes/FloatLiteralClient.java","src/main/java/type/property/valuetypes/FloatLiteralProperty.java","src/main/java/type/property/valuetypes/FloatOperationClient.java","src/main/java/type/property/valuetypes/FloatProperty.java","src/main/java/type/property/valuetypes/InnerEnum.java","src/main/java/type/property/valuetypes/InnerModel.java","src/main/java/type/property/valuetypes/IntClient.java","src/main/java/type/property/valuetypes/IntLiteralClient.java","src/main/java/type/property/valuetypes/IntLiteralProperty.java","src/main/java/type/property/valuetypes/IntProperty.java","src/main/java/type/property/valuetypes/ModelClient.java","src/main/java/type/property/valuetypes/ModelProperty.java","src/main/java/type/property/valuetypes/NeverClient.java","src/main/java/type/property/valuetypes/NeverProperty.java","src/main/java/type/property/valuetypes/StringLiteralClient.java","src/main/java/type/property/valuetypes/StringLiteralProperty.java","src/main/java/type/property/valuetypes/StringOperationClient.java","src/main/java/type/property/valuetypes/StringProperty.java","src/main/java/type/property/valuetypes/UnionEnumValueClient.java","src/main/java/type/property/valuetypes/UnionEnumValueProperty.java","src/main/java/type/property/valuetypes/UnionFloatLiteralClient.java","src/main/java/type/property/valuetypes/UnionFloatLiteralProperty.java","src/main/java/type/property/valuetypes/UnionFloatLiteralPropertyProperty.java","src/main/java/type/property/valuetypes/UnionIntLiteralClient.java","src/main/java/type/property/valuetypes/UnionIntLiteralProperty.java","src/main/java/type/property/valuetypes/UnionIntLiteralPropertyProperty.java","src/main/java/type/property/valuetypes/UnionStringLiteralClient.java","src/main/java/type/property/valuetypes/UnionStringLiteralProperty.java","src/main/java/type/property/valuetypes/UnionStringLiteralPropertyProperty.java","src/main/java/type/property/valuetypes/UnknownArrayClient.java","src/main/java/type/property/valuetypes/UnknownArrayProperty.java","src/main/java/type/property/valuetypes/UnknownDictClient.java","src/main/java/type/property/valuetypes/UnknownDictProperty.java","src/main/java/type/property/valuetypes/UnknownIntClient.java","src/main/java/type/property/valuetypes/UnknownIntProperty.java","src/main/java/type/property/valuetypes/UnknownStringClient.java","src/main/java/type/property/valuetypes/UnknownStringProperty.java","src/main/java/type/property/valuetypes/ValueTypesClientBuilder.java","src/main/java/type/property/valuetypes/implementation/BooleanLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/BooleanOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/BytesImpl.java","src/main/java/type/property/valuetypes/implementation/CollectionsIntsImpl.java","src/main/java/type/property/valuetypes/implementation/CollectionsModelsImpl.java","src/main/java/type/property/valuetypes/implementation/CollectionsStringsImpl.java","src/main/java/type/property/valuetypes/implementation/DatetimeOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/Decimal128sImpl.java","src/main/java/type/property/valuetypes/implementation/DecimalsImpl.java","src/main/java/type/property/valuetypes/implementation/DictionaryStringsImpl.java","src/main/java/type/property/valuetypes/implementation/DurationOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/EnumsImpl.java","src/main/java/type/property/valuetypes/implementation/ExtensibleEnumsImpl.java","src/main/java/type/property/valuetypes/implementation/FloatLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/FloatOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/IntLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/IntsImpl.java","src/main/java/type/property/valuetypes/implementation/ModelsImpl.java","src/main/java/type/property/valuetypes/implementation/NeversImpl.java","src/main/java/type/property/valuetypes/implementation/StringLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/StringOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/UnionEnumValuesImpl.java","src/main/java/type/property/valuetypes/implementation/UnionFloatLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/UnionIntLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/UnionStringLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/UnknownArraysImpl.java","src/main/java/type/property/valuetypes/implementation/UnknownDictsImpl.java","src/main/java/type/property/valuetypes/implementation/UnknownIntsImpl.java","src/main/java/type/property/valuetypes/implementation/UnknownStringsImpl.java","src/main/java/type/property/valuetypes/implementation/ValueTypesClientImpl.java","src/main/java/type/property/valuetypes/implementation/package-info.java","src/main/java/type/property/valuetypes/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-scalar_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-scalar_apiview_properties.json deleted file mode 100644 index 479acfe8b06..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-scalar_apiview_properties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.scalar.BooleanOperationClient": "Type.Scalar.Boolean", - "type.scalar.Decimal128TypeClient": "Type.Scalar.Decimal128Type", - "type.scalar.Decimal128VerifyClient": "Type.Scalar.Decimal128Verify", - "type.scalar.DecimalTypeClient": "Type.Scalar.DecimalType", - "type.scalar.DecimalVerifyClient": "Type.Scalar.DecimalVerify", - "type.scalar.ScalarClientBuilder": "Type.Scalar", - "type.scalar.StringOperationClient": "Type.Scalar.String", - "type.scalar.UnknownClient": "Type.Scalar.Unknown" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-scalar_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-scalar_metadata.json index 089ca8b270a..deb3bf6d988 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-scalar_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-scalar_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.scalar.BooleanOperationClient":"Type.Scalar.Boolean","type.scalar.Decimal128TypeClient":"Type.Scalar.Decimal128Type","type.scalar.Decimal128VerifyClient":"Type.Scalar.Decimal128Verify","type.scalar.DecimalTypeClient":"Type.Scalar.DecimalType","type.scalar.DecimalVerifyClient":"Type.Scalar.DecimalVerify","type.scalar.ScalarClientBuilder":"Type.Scalar","type.scalar.StringOperationClient":"Type.Scalar.String","type.scalar.UnknownClient":"Type.Scalar.Unknown"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/scalar/BooleanOperationClient.java","src/main/java/type/scalar/Decimal128TypeClient.java","src/main/java/type/scalar/Decimal128VerifyClient.java","src/main/java/type/scalar/DecimalTypeClient.java","src/main/java/type/scalar/DecimalVerifyClient.java","src/main/java/type/scalar/ScalarClientBuilder.java","src/main/java/type/scalar/StringOperationClient.java","src/main/java/type/scalar/UnknownClient.java","src/main/java/type/scalar/implementation/BooleanOperationsImpl.java","src/main/java/type/scalar/implementation/Decimal128TypesImpl.java","src/main/java/type/scalar/implementation/Decimal128VerifiesImpl.java","src/main/java/type/scalar/implementation/DecimalTypesImpl.java","src/main/java/type/scalar/implementation/DecimalVerifiesImpl.java","src/main/java/type/scalar/implementation/ScalarClientImpl.java","src/main/java/type/scalar/implementation/StringOperationsImpl.java","src/main/java/type/scalar/implementation/UnknownsImpl.java","src/main/java/type/scalar/implementation/package-info.java","src/main/java/type/scalar/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.scalar.BooleanOperationClient":"Type.Scalar.Boolean","type.scalar.Decimal128TypeClient":"Type.Scalar.Decimal128Type","type.scalar.Decimal128VerifyClient":"Type.Scalar.Decimal128Verify","type.scalar.DecimalTypeClient":"Type.Scalar.DecimalType","type.scalar.DecimalVerifyClient":"Type.Scalar.DecimalVerify","type.scalar.ScalarClientBuilder":"Type.Scalar","type.scalar.StringOperationClient":"Type.Scalar.String","type.scalar.UnknownClient":"Type.Scalar.Unknown"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/scalar/BooleanOperationClient.java","src/main/java/type/scalar/Decimal128TypeClient.java","src/main/java/type/scalar/Decimal128VerifyClient.java","src/main/java/type/scalar/DecimalTypeClient.java","src/main/java/type/scalar/DecimalVerifyClient.java","src/main/java/type/scalar/ScalarClientBuilder.java","src/main/java/type/scalar/StringOperationClient.java","src/main/java/type/scalar/UnknownClient.java","src/main/java/type/scalar/implementation/BooleanOperationsImpl.java","src/main/java/type/scalar/implementation/Decimal128TypesImpl.java","src/main/java/type/scalar/implementation/Decimal128VerifiesImpl.java","src/main/java/type/scalar/implementation/DecimalTypesImpl.java","src/main/java/type/scalar/implementation/DecimalVerifiesImpl.java","src/main/java/type/scalar/implementation/ScalarClientImpl.java","src/main/java/type/scalar/implementation/StringOperationsImpl.java","src/main/java/type/scalar/implementation/UnknownsImpl.java","src/main/java/type/scalar/implementation/package-info.java","src/main/java/type/scalar/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-union-discriminated_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-union-discriminated_apiview_properties.json deleted file mode 100644 index 415f4fe48d3..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-union-discriminated_apiview_properties.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.union.discriminated.DiscriminatedClientBuilder": "Type.Union.Discriminated", - "type.union.discriminated.EnvelopeObjectCustomPropertiesClient": "Type.Union.Discriminated.Envelope.Object.CustomProperties", - "type.union.discriminated.EnvelopeObjectDefaultClient": "Type.Union.Discriminated.Envelope.Object.Default", - "type.union.discriminated.NoEnvelopeCustomDiscriminatorClient": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator", - "type.union.discriminated.NoEnvelopeDefaultClient": "Type.Union.Discriminated.NoEnvelope.Default" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-union-discriminated_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-union-discriminated_metadata.json index 471057dd45a..2fc7f3cd114 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-union-discriminated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-union-discriminated_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.union.discriminated.DiscriminatedClientBuilder":"Type.Union.Discriminated","type.union.discriminated.EnvelopeObjectCustomPropertiesClient":"Type.Union.Discriminated.Envelope.Object.CustomProperties","type.union.discriminated.EnvelopeObjectDefaultClient":"Type.Union.Discriminated.Envelope.Object.Default","type.union.discriminated.NoEnvelopeCustomDiscriminatorClient":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator","type.union.discriminated.NoEnvelopeDefaultClient":"Type.Union.Discriminated.NoEnvelope.Default"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/union/discriminated/DiscriminatedClientBuilder.java","src/main/java/type/union/discriminated/EnvelopeObjectCustomPropertiesClient.java","src/main/java/type/union/discriminated/EnvelopeObjectDefaultClient.java","src/main/java/type/union/discriminated/NoEnvelopeCustomDiscriminatorClient.java","src/main/java/type/union/discriminated/NoEnvelopeDefaultClient.java","src/main/java/type/union/discriminated/implementation/DiscriminatedClientImpl.java","src/main/java/type/union/discriminated/implementation/EnvelopeObjectCustomPropertiesImpl.java","src/main/java/type/union/discriminated/implementation/EnvelopeObjectDefaultsImpl.java","src/main/java/type/union/discriminated/implementation/NoEnvelopeCustomDiscriminatorsImpl.java","src/main/java/type/union/discriminated/implementation/NoEnvelopeDefaultsImpl.java","src/main/java/type/union/discriminated/implementation/package-info.java","src/main/java/type/union/discriminated/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.union.discriminated.DiscriminatedClientBuilder":"Type.Union.Discriminated","type.union.discriminated.EnvelopeObjectCustomPropertiesClient":"Type.Union.Discriminated.Envelope.Object.CustomProperties","type.union.discriminated.EnvelopeObjectDefaultClient":"Type.Union.Discriminated.Envelope.Object.Default","type.union.discriminated.NoEnvelopeCustomDiscriminatorClient":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator","type.union.discriminated.NoEnvelopeDefaultClient":"Type.Union.Discriminated.NoEnvelope.Default"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/union/discriminated/DiscriminatedClientBuilder.java","src/main/java/type/union/discriminated/EnvelopeObjectCustomPropertiesClient.java","src/main/java/type/union/discriminated/EnvelopeObjectDefaultClient.java","src/main/java/type/union/discriminated/NoEnvelopeCustomDiscriminatorClient.java","src/main/java/type/union/discriminated/NoEnvelopeDefaultClient.java","src/main/java/type/union/discriminated/implementation/DiscriminatedClientImpl.java","src/main/java/type/union/discriminated/implementation/EnvelopeObjectCustomPropertiesImpl.java","src/main/java/type/union/discriminated/implementation/EnvelopeObjectDefaultsImpl.java","src/main/java/type/union/discriminated/implementation/NoEnvelopeCustomDiscriminatorsImpl.java","src/main/java/type/union/discriminated/implementation/NoEnvelopeDefaultsImpl.java","src/main/java/type/union/discriminated/implementation/package-info.java","src/main/java/type/union/discriminated/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-union_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-union_apiview_properties.json deleted file mode 100644 index 16c8bc3dcc0..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-union_apiview_properties.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "type.union.Cat": "Type.Union.Cat", - "type.union.Dog": "Type.Union.Dog", - "type.union.EnumsOnlyCases": "Type.Union.EnumsOnlyCases", - "type.union.EnumsOnlyCasesLr": "Type.Union.EnumsOnlyCases.lr.anonymous", - "type.union.EnumsOnlyCasesUd": "Type.Union.EnumsOnlyCases.ud.anonymous", - "type.union.EnumsOnlyClient": "Type.Union.EnumsOnly", - "type.union.FloatsOnlyClient": "Type.Union.FloatsOnly", - "type.union.GetResponse": "Type.Union.get.Response.anonymous", - "type.union.GetResponse1": "Type.Union.get.Response.anonymous", - "type.union.GetResponse2": "Type.Union.get.Response.anonymous", - "type.union.GetResponse3": "Type.Union.get.Response.anonymous", - "type.union.GetResponse4": "Type.Union.get.Response.anonymous", - "type.union.GetResponse5": "Type.Union.get.Response.anonymous", - "type.union.GetResponse6": "Type.Union.get.Response.anonymous", - "type.union.GetResponse7": "Type.Union.get.Response.anonymous", - "type.union.GetResponse8": "Type.Union.get.Response.anonymous", - "type.union.GetResponse9": "Type.Union.get.Response.anonymous", - "type.union.GetResponseProp": "Type.Union.get.Response.prop.anonymous", - "type.union.GetResponseProp1": "Type.Union.get.Response.prop.anonymous", - "type.union.GetResponseProp2": "Type.Union.get.Response.prop.anonymous", - "type.union.GetResponseProp3": "Type.Union.get.Response.prop.anonymous", - "type.union.IntsOnlyClient": "Type.Union.IntsOnly", - "type.union.MixedLiteralsCases": "Type.Union.MixedLiteralsCases", - "type.union.MixedLiteralsClient": "Type.Union.MixedLiterals", - "type.union.MixedTypesCases": "Type.Union.MixedTypesCases", - "type.union.MixedTypesClient": "Type.Union.MixedTypes", - "type.union.ModelsOnlyClient": "Type.Union.ModelsOnly", - "type.union.StringAndArrayCases": "Type.Union.StringAndArrayCases", - "type.union.StringAndArrayClient": "Type.Union.StringAndArray", - "type.union.StringExtensibleClient": "Type.Union.StringExtensible", - "type.union.StringExtensibleNamedClient": "Type.Union.StringExtensibleNamed", - "type.union.StringExtensibleNamedUnion": "Type.Union.StringExtensibleNamedUnion", - "type.union.StringsOnlyClient": "Type.Union.StringsOnly", - "type.union.UnionClientBuilder": "Type.Union", - "type.union.implementation.SendRequest": "Type.Union.send.Request.anonymous", - "type.union.implementation.SendRequest1": "Type.Union.send.Request.anonymous", - "type.union.implementation.SendRequest2": "Type.Union.send.Request.anonymous", - "type.union.implementation.SendRequest3": "Type.Union.send.Request.anonymous", - "type.union.implementation.SendRequest4": "Type.Union.send.Request.anonymous", - "type.union.implementation.SendRequest5": "Type.Union.send.Request.anonymous", - "type.union.implementation.SendRequest6": "Type.Union.send.Request.anonymous", - "type.union.implementation.SendRequest7": "Type.Union.send.Request.anonymous", - "type.union.implementation.SendRequest8": "Type.Union.send.Request.anonymous", - "type.union.implementation.SendRequest9": "Type.Union.send.Request.anonymous" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-union_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-union_metadata.json index ec4b0b93a54..503a7c80c61 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-union_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/type-union_metadata.json @@ -1 +1 @@ -{"flavor":"generic","crossLanguageDefinitions":{"type.union.Cat":"Type.Union.Cat","type.union.Dog":"Type.Union.Dog","type.union.EnumsOnlyCases":"Type.Union.EnumsOnlyCases","type.union.EnumsOnlyCasesLr":"Type.Union.EnumsOnlyCases.lr.anonymous","type.union.EnumsOnlyCasesUd":"Type.Union.EnumsOnlyCases.ud.anonymous","type.union.EnumsOnlyClient":"Type.Union.EnumsOnly","type.union.FloatsOnlyClient":"Type.Union.FloatsOnly","type.union.GetResponse":"Type.Union.get.Response.anonymous","type.union.GetResponse1":"Type.Union.get.Response.anonymous","type.union.GetResponse2":"Type.Union.get.Response.anonymous","type.union.GetResponse3":"Type.Union.get.Response.anonymous","type.union.GetResponse4":"Type.Union.get.Response.anonymous","type.union.GetResponse5":"Type.Union.get.Response.anonymous","type.union.GetResponse6":"Type.Union.get.Response.anonymous","type.union.GetResponse7":"Type.Union.get.Response.anonymous","type.union.GetResponse8":"Type.Union.get.Response.anonymous","type.union.GetResponse9":"Type.Union.get.Response.anonymous","type.union.GetResponseProp":"Type.Union.get.Response.prop.anonymous","type.union.GetResponseProp1":"Type.Union.get.Response.prop.anonymous","type.union.GetResponseProp2":"Type.Union.get.Response.prop.anonymous","type.union.GetResponseProp3":"Type.Union.get.Response.prop.anonymous","type.union.IntsOnlyClient":"Type.Union.IntsOnly","type.union.MixedLiteralsCases":"Type.Union.MixedLiteralsCases","type.union.MixedLiteralsClient":"Type.Union.MixedLiterals","type.union.MixedTypesCases":"Type.Union.MixedTypesCases","type.union.MixedTypesClient":"Type.Union.MixedTypes","type.union.ModelsOnlyClient":"Type.Union.ModelsOnly","type.union.StringAndArrayCases":"Type.Union.StringAndArrayCases","type.union.StringAndArrayClient":"Type.Union.StringAndArray","type.union.StringExtensibleClient":"Type.Union.StringExtensible","type.union.StringExtensibleNamedClient":"Type.Union.StringExtensibleNamed","type.union.StringExtensibleNamedUnion":"Type.Union.StringExtensibleNamedUnion","type.union.StringsOnlyClient":"Type.Union.StringsOnly","type.union.UnionClientBuilder":"Type.Union","type.union.implementation.SendRequest":"Type.Union.send.Request.anonymous","type.union.implementation.SendRequest1":"Type.Union.send.Request.anonymous","type.union.implementation.SendRequest2":"Type.Union.send.Request.anonymous","type.union.implementation.SendRequest3":"Type.Union.send.Request.anonymous","type.union.implementation.SendRequest4":"Type.Union.send.Request.anonymous","type.union.implementation.SendRequest5":"Type.Union.send.Request.anonymous","type.union.implementation.SendRequest6":"Type.Union.send.Request.anonymous","type.union.implementation.SendRequest7":"Type.Union.send.Request.anonymous","type.union.implementation.SendRequest8":"Type.Union.send.Request.anonymous","type.union.implementation.SendRequest9":"Type.Union.send.Request.anonymous"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/union/Cat.java","src/main/java/type/union/Dog.java","src/main/java/type/union/EnumsOnlyCases.java","src/main/java/type/union/EnumsOnlyCasesLr.java","src/main/java/type/union/EnumsOnlyCasesUd.java","src/main/java/type/union/EnumsOnlyClient.java","src/main/java/type/union/FloatsOnlyClient.java","src/main/java/type/union/GetResponse.java","src/main/java/type/union/GetResponse1.java","src/main/java/type/union/GetResponse2.java","src/main/java/type/union/GetResponse3.java","src/main/java/type/union/GetResponse4.java","src/main/java/type/union/GetResponse5.java","src/main/java/type/union/GetResponse6.java","src/main/java/type/union/GetResponse7.java","src/main/java/type/union/GetResponse8.java","src/main/java/type/union/GetResponse9.java","src/main/java/type/union/GetResponseProp.java","src/main/java/type/union/GetResponseProp1.java","src/main/java/type/union/GetResponseProp2.java","src/main/java/type/union/GetResponseProp3.java","src/main/java/type/union/IntsOnlyClient.java","src/main/java/type/union/MixedLiteralsCases.java","src/main/java/type/union/MixedLiteralsClient.java","src/main/java/type/union/MixedTypesCases.java","src/main/java/type/union/MixedTypesClient.java","src/main/java/type/union/ModelsOnlyClient.java","src/main/java/type/union/StringAndArrayCases.java","src/main/java/type/union/StringAndArrayClient.java","src/main/java/type/union/StringExtensibleClient.java","src/main/java/type/union/StringExtensibleNamedClient.java","src/main/java/type/union/StringExtensibleNamedUnion.java","src/main/java/type/union/StringsOnlyClient.java","src/main/java/type/union/UnionClientBuilder.java","src/main/java/type/union/implementation/EnumsOnliesImpl.java","src/main/java/type/union/implementation/FloatsOnliesImpl.java","src/main/java/type/union/implementation/IntsOnliesImpl.java","src/main/java/type/union/implementation/MixedLiteralsImpl.java","src/main/java/type/union/implementation/MixedTypesImpl.java","src/main/java/type/union/implementation/ModelsOnliesImpl.java","src/main/java/type/union/implementation/SendRequest.java","src/main/java/type/union/implementation/SendRequest1.java","src/main/java/type/union/implementation/SendRequest2.java","src/main/java/type/union/implementation/SendRequest3.java","src/main/java/type/union/implementation/SendRequest4.java","src/main/java/type/union/implementation/SendRequest5.java","src/main/java/type/union/implementation/SendRequest6.java","src/main/java/type/union/implementation/SendRequest7.java","src/main/java/type/union/implementation/SendRequest8.java","src/main/java/type/union/implementation/SendRequest9.java","src/main/java/type/union/implementation/StringAndArraysImpl.java","src/main/java/type/union/implementation/StringExtensibleNamedsImpl.java","src/main/java/type/union/implementation/StringExtensiblesImpl.java","src/main/java/type/union/implementation/StringsOnliesImpl.java","src/main/java/type/union/implementation/UnionClientImpl.java","src/main/java/type/union/implementation/package-info.java","src/main/java/type/union/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"type.union.Cat":"Type.Union.Cat","type.union.Dog":"Type.Union.Dog","type.union.EnumsOnlyCases":"Type.Union.EnumsOnlyCases","type.union.EnumsOnlyCasesLr":"Type.Union.EnumsOnlyCases.lr.anonymous","type.union.EnumsOnlyCasesUd":"Type.Union.EnumsOnlyCases.ud.anonymous","type.union.EnumsOnlyClient":"Type.Union.EnumsOnly","type.union.FloatsOnlyClient":"Type.Union.FloatsOnly","type.union.GetResponse":"Type.Union.get.Response.anonymous","type.union.GetResponse1":"Type.Union.get.Response.anonymous","type.union.GetResponse2":"Type.Union.get.Response.anonymous","type.union.GetResponse3":"Type.Union.get.Response.anonymous","type.union.GetResponse4":"Type.Union.get.Response.anonymous","type.union.GetResponse5":"Type.Union.get.Response.anonymous","type.union.GetResponse6":"Type.Union.get.Response.anonymous","type.union.GetResponse7":"Type.Union.get.Response.anonymous","type.union.GetResponse8":"Type.Union.get.Response.anonymous","type.union.GetResponse9":"Type.Union.get.Response.anonymous","type.union.GetResponseProp":"Type.Union.get.Response.prop.anonymous","type.union.GetResponseProp1":"Type.Union.get.Response.prop.anonymous","type.union.GetResponseProp2":"Type.Union.get.Response.prop.anonymous","type.union.GetResponseProp3":"Type.Union.get.Response.prop.anonymous","type.union.IntsOnlyClient":"Type.Union.IntsOnly","type.union.MixedLiteralsCases":"Type.Union.MixedLiteralsCases","type.union.MixedLiteralsClient":"Type.Union.MixedLiterals","type.union.MixedTypesCases":"Type.Union.MixedTypesCases","type.union.MixedTypesClient":"Type.Union.MixedTypes","type.union.ModelsOnlyClient":"Type.Union.ModelsOnly","type.union.StringAndArrayCases":"Type.Union.StringAndArrayCases","type.union.StringAndArrayClient":"Type.Union.StringAndArray","type.union.StringExtensibleClient":"Type.Union.StringExtensible","type.union.StringExtensibleNamedClient":"Type.Union.StringExtensibleNamed","type.union.StringExtensibleNamedUnion":"Type.Union.StringExtensibleNamedUnion","type.union.StringsOnlyClient":"Type.Union.StringsOnly","type.union.UnionClientBuilder":"Type.Union","type.union.implementation.SendRequest":"Type.Union.send.Request.anonymous","type.union.implementation.SendRequest1":"Type.Union.send.Request.anonymous","type.union.implementation.SendRequest2":"Type.Union.send.Request.anonymous","type.union.implementation.SendRequest3":"Type.Union.send.Request.anonymous","type.union.implementation.SendRequest4":"Type.Union.send.Request.anonymous","type.union.implementation.SendRequest5":"Type.Union.send.Request.anonymous","type.union.implementation.SendRequest6":"Type.Union.send.Request.anonymous","type.union.implementation.SendRequest7":"Type.Union.send.Request.anonymous","type.union.implementation.SendRequest8":"Type.Union.send.Request.anonymous","type.union.implementation.SendRequest9":"Type.Union.send.Request.anonymous"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/union/Cat.java","src/main/java/type/union/Dog.java","src/main/java/type/union/EnumsOnlyCases.java","src/main/java/type/union/EnumsOnlyCasesLr.java","src/main/java/type/union/EnumsOnlyCasesUd.java","src/main/java/type/union/EnumsOnlyClient.java","src/main/java/type/union/FloatsOnlyClient.java","src/main/java/type/union/GetResponse.java","src/main/java/type/union/GetResponse1.java","src/main/java/type/union/GetResponse2.java","src/main/java/type/union/GetResponse3.java","src/main/java/type/union/GetResponse4.java","src/main/java/type/union/GetResponse5.java","src/main/java/type/union/GetResponse6.java","src/main/java/type/union/GetResponse7.java","src/main/java/type/union/GetResponse8.java","src/main/java/type/union/GetResponse9.java","src/main/java/type/union/GetResponseProp.java","src/main/java/type/union/GetResponseProp1.java","src/main/java/type/union/GetResponseProp2.java","src/main/java/type/union/GetResponseProp3.java","src/main/java/type/union/IntsOnlyClient.java","src/main/java/type/union/MixedLiteralsCases.java","src/main/java/type/union/MixedLiteralsClient.java","src/main/java/type/union/MixedTypesCases.java","src/main/java/type/union/MixedTypesClient.java","src/main/java/type/union/ModelsOnlyClient.java","src/main/java/type/union/StringAndArrayCases.java","src/main/java/type/union/StringAndArrayClient.java","src/main/java/type/union/StringExtensibleClient.java","src/main/java/type/union/StringExtensibleNamedClient.java","src/main/java/type/union/StringExtensibleNamedUnion.java","src/main/java/type/union/StringsOnlyClient.java","src/main/java/type/union/UnionClientBuilder.java","src/main/java/type/union/implementation/EnumsOnliesImpl.java","src/main/java/type/union/implementation/FloatsOnliesImpl.java","src/main/java/type/union/implementation/IntsOnliesImpl.java","src/main/java/type/union/implementation/MixedLiteralsImpl.java","src/main/java/type/union/implementation/MixedTypesImpl.java","src/main/java/type/union/implementation/ModelsOnliesImpl.java","src/main/java/type/union/implementation/SendRequest.java","src/main/java/type/union/implementation/SendRequest1.java","src/main/java/type/union/implementation/SendRequest2.java","src/main/java/type/union/implementation/SendRequest3.java","src/main/java/type/union/implementation/SendRequest4.java","src/main/java/type/union/implementation/SendRequest5.java","src/main/java/type/union/implementation/SendRequest6.java","src/main/java/type/union/implementation/SendRequest7.java","src/main/java/type/union/implementation/SendRequest8.java","src/main/java/type/union/implementation/SendRequest9.java","src/main/java/type/union/implementation/StringAndArraysImpl.java","src/main/java/type/union/implementation/StringExtensibleNamedsImpl.java","src/main/java/type/union/implementation/StringExtensiblesImpl.java","src/main/java/type/union/implementation/StringsOnliesImpl.java","src/main/java/type/union/implementation/UnionClientImpl.java","src/main/java/type/union/implementation/package-info.java","src/main/java/type/union/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-added_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-added_apiview_properties.json deleted file mode 100644 index 37ba52d6152..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-added_apiview_properties.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "versioning.added.AddedClient": "Versioning.Added", - "versioning.added.AddedClientBuilder": "Versioning.Added", - "versioning.added.EnumV1": "Versioning.Added.EnumV1", - "versioning.added.EnumV2": "Versioning.Added.EnumV2", - "versioning.added.InterfaceV2Client": "Versioning.Added.InterfaceV2", - "versioning.added.ModelV1": "Versioning.Added.ModelV1", - "versioning.added.ModelV2": "Versioning.Added.ModelV2" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-added_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-added_metadata.json index 3b3117074d6..056ec08f94f 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-added_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-added_metadata.json @@ -1 +1 @@ -{"flavor":"generic","apiVersion":"v2","crossLanguageDefinitions":{"versioning.added.AddedClient":"Versioning.Added","versioning.added.AddedClientBuilder":"Versioning.Added","versioning.added.EnumV1":"Versioning.Added.EnumV1","versioning.added.EnumV2":"Versioning.Added.EnumV2","versioning.added.InterfaceV2Client":"Versioning.Added.InterfaceV2","versioning.added.ModelV1":"Versioning.Added.ModelV1","versioning.added.ModelV2":"Versioning.Added.ModelV2"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/added/AddedClient.java","src/main/java/versioning/added/AddedClientBuilder.java","src/main/java/versioning/added/AddedServiceVersion.java","src/main/java/versioning/added/EnumV1.java","src/main/java/versioning/added/EnumV2.java","src/main/java/versioning/added/InterfaceV2Client.java","src/main/java/versioning/added/ModelV1.java","src/main/java/versioning/added/ModelV2.java","src/main/java/versioning/added/implementation/AddedClientImpl.java","src/main/java/versioning/added/implementation/InterfaceV2sImpl.java","src/main/java/versioning/added/implementation/package-info.java","src/main/java/versioning/added/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{"Versioning.Added":"v2"},"crossLanguageDefinitions":{"versioning.added.AddedClient":"Versioning.Added","versioning.added.AddedClientBuilder":"Versioning.Added","versioning.added.EnumV1":"Versioning.Added.EnumV1","versioning.added.EnumV2":"Versioning.Added.EnumV2","versioning.added.InterfaceV2Client":"Versioning.Added.InterfaceV2","versioning.added.ModelV1":"Versioning.Added.ModelV1","versioning.added.ModelV2":"Versioning.Added.ModelV2"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/added/AddedClient.java","src/main/java/versioning/added/AddedClientBuilder.java","src/main/java/versioning/added/AddedServiceVersion.java","src/main/java/versioning/added/EnumV1.java","src/main/java/versioning/added/EnumV2.java","src/main/java/versioning/added/InterfaceV2Client.java","src/main/java/versioning/added/ModelV1.java","src/main/java/versioning/added/ModelV2.java","src/main/java/versioning/added/implementation/AddedClientImpl.java","src/main/java/versioning/added/implementation/InterfaceV2sImpl.java","src/main/java/versioning/added/implementation/package-info.java","src/main/java/versioning/added/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-madeoptional_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-madeoptional_apiview_properties.json deleted file mode 100644 index 5baffdfb5a3..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-madeoptional_apiview_properties.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "versioning.madeoptional.MadeOptionalClient": "Versioning.MadeOptional", - "versioning.madeoptional.MadeOptionalClientBuilder": "Versioning.MadeOptional", - "versioning.madeoptional.TestModel": "Versioning.MadeOptional.TestModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-madeoptional_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-madeoptional_metadata.json index 697bd5f2c0d..02af0856248 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-madeoptional_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-madeoptional_metadata.json @@ -1 +1 @@ -{"flavor":"generic","apiVersion":"v2","crossLanguageDefinitions":{"versioning.madeoptional.MadeOptionalClient":"Versioning.MadeOptional","versioning.madeoptional.MadeOptionalClientBuilder":"Versioning.MadeOptional","versioning.madeoptional.TestModel":"Versioning.MadeOptional.TestModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/madeoptional/MadeOptionalClient.java","src/main/java/versioning/madeoptional/MadeOptionalClientBuilder.java","src/main/java/versioning/madeoptional/MadeOptionalServiceVersion.java","src/main/java/versioning/madeoptional/TestModel.java","src/main/java/versioning/madeoptional/implementation/MadeOptionalClientImpl.java","src/main/java/versioning/madeoptional/implementation/package-info.java","src/main/java/versioning/madeoptional/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{"Versioning.MadeOptional":"v2"},"crossLanguageDefinitions":{"versioning.madeoptional.MadeOptionalClient":"Versioning.MadeOptional","versioning.madeoptional.MadeOptionalClientBuilder":"Versioning.MadeOptional","versioning.madeoptional.TestModel":"Versioning.MadeOptional.TestModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/madeoptional/MadeOptionalClient.java","src/main/java/versioning/madeoptional/MadeOptionalClientBuilder.java","src/main/java/versioning/madeoptional/MadeOptionalServiceVersion.java","src/main/java/versioning/madeoptional/TestModel.java","src/main/java/versioning/madeoptional/implementation/MadeOptionalClientImpl.java","src/main/java/versioning/madeoptional/implementation/package-info.java","src/main/java/versioning/madeoptional/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json deleted file mode 100644 index ca832aaa168..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "versioning.removed.EnumV2": "Versioning.Removed.EnumV2", - "versioning.removed.EnumV3": "Versioning.Removed.EnumV3", - "versioning.removed.ModelV2": "Versioning.Removed.ModelV2", - "versioning.removed.ModelV3": "Versioning.Removed.ModelV3", - "versioning.removed.RemovedClient": "Versioning.Removed", - "versioning.removed.RemovedClientBuilder": "Versioning.Removed" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-removed_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-removed_metadata.json index 435f080d5d5..633ee353df2 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-removed_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-removed_metadata.json @@ -1 +1 @@ -{"flavor":"generic","apiVersion":"v2","crossLanguageDefinitions":{"versioning.removed.EnumV2":"Versioning.Removed.EnumV2","versioning.removed.EnumV3":"Versioning.Removed.EnumV3","versioning.removed.ModelV2":"Versioning.Removed.ModelV2","versioning.removed.ModelV3":"Versioning.Removed.ModelV3","versioning.removed.RemovedClient":"Versioning.Removed","versioning.removed.RemovedClientBuilder":"Versioning.Removed"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/removed/EnumV2.java","src/main/java/versioning/removed/EnumV3.java","src/main/java/versioning/removed/ModelV2.java","src/main/java/versioning/removed/ModelV3.java","src/main/java/versioning/removed/RemovedClient.java","src/main/java/versioning/removed/RemovedClientBuilder.java","src/main/java/versioning/removed/RemovedServiceVersion.java","src/main/java/versioning/removed/implementation/RemovedClientImpl.java","src/main/java/versioning/removed/implementation/package-info.java","src/main/java/versioning/removed/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{"Versioning.Removed":"v2"},"crossLanguageDefinitions":{"versioning.removed.EnumV2":"Versioning.Removed.EnumV2","versioning.removed.EnumV3":"Versioning.Removed.EnumV3","versioning.removed.ModelV2":"Versioning.Removed.ModelV2","versioning.removed.ModelV3":"Versioning.Removed.ModelV3","versioning.removed.RemovedClient":"Versioning.Removed","versioning.removed.RemovedClientBuilder":"Versioning.Removed"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/removed/EnumV2.java","src/main/java/versioning/removed/EnumV3.java","src/main/java/versioning/removed/ModelV2.java","src/main/java/versioning/removed/ModelV3.java","src/main/java/versioning/removed/RemovedClient.java","src/main/java/versioning/removed/RemovedClientBuilder.java","src/main/java/versioning/removed/RemovedServiceVersion.java","src/main/java/versioning/removed/implementation/RemovedClientImpl.java","src/main/java/versioning/removed/implementation/package-info.java","src/main/java/versioning/removed/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-renamedfrom_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-renamedfrom_apiview_properties.json deleted file mode 100644 index d90379b8fef..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-renamedfrom_apiview_properties.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "versioning.renamedfrom.NewEnum": "Versioning.RenamedFrom.NewEnum", - "versioning.renamedfrom.NewInterfaceClient": "Versioning.RenamedFrom.NewInterface", - "versioning.renamedfrom.NewModel": "Versioning.RenamedFrom.NewModel", - "versioning.renamedfrom.RenamedFromClient": "Versioning.RenamedFrom", - "versioning.renamedfrom.RenamedFromClientBuilder": "Versioning.RenamedFrom" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-renamedfrom_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-renamedfrom_metadata.json index f9893672619..365130e4cbf 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-renamedfrom_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-renamedfrom_metadata.json @@ -1 +1 @@ -{"flavor":"generic","apiVersion":"v2","crossLanguageDefinitions":{"versioning.renamedfrom.NewEnum":"Versioning.RenamedFrom.NewEnum","versioning.renamedfrom.NewInterfaceClient":"Versioning.RenamedFrom.NewInterface","versioning.renamedfrom.NewModel":"Versioning.RenamedFrom.NewModel","versioning.renamedfrom.RenamedFromClient":"Versioning.RenamedFrom","versioning.renamedfrom.RenamedFromClientBuilder":"Versioning.RenamedFrom"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/renamedfrom/NewEnum.java","src/main/java/versioning/renamedfrom/NewInterfaceClient.java","src/main/java/versioning/renamedfrom/NewModel.java","src/main/java/versioning/renamedfrom/RenamedFromClient.java","src/main/java/versioning/renamedfrom/RenamedFromClientBuilder.java","src/main/java/versioning/renamedfrom/RenamedFromServiceVersion.java","src/main/java/versioning/renamedfrom/implementation/NewInterfacesImpl.java","src/main/java/versioning/renamedfrom/implementation/RenamedFromClientImpl.java","src/main/java/versioning/renamedfrom/implementation/package-info.java","src/main/java/versioning/renamedfrom/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{"Versioning.RenamedFrom":"v2"},"crossLanguageDefinitions":{"versioning.renamedfrom.NewEnum":"Versioning.RenamedFrom.NewEnum","versioning.renamedfrom.NewInterfaceClient":"Versioning.RenamedFrom.NewInterface","versioning.renamedfrom.NewModel":"Versioning.RenamedFrom.NewModel","versioning.renamedfrom.RenamedFromClient":"Versioning.RenamedFrom","versioning.renamedfrom.RenamedFromClientBuilder":"Versioning.RenamedFrom"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/renamedfrom/NewEnum.java","src/main/java/versioning/renamedfrom/NewInterfaceClient.java","src/main/java/versioning/renamedfrom/NewModel.java","src/main/java/versioning/renamedfrom/RenamedFromClient.java","src/main/java/versioning/renamedfrom/RenamedFromClientBuilder.java","src/main/java/versioning/renamedfrom/RenamedFromServiceVersion.java","src/main/java/versioning/renamedfrom/implementation/NewInterfacesImpl.java","src/main/java/versioning/renamedfrom/implementation/RenamedFromClientImpl.java","src/main/java/versioning/renamedfrom/implementation/package-info.java","src/main/java/versioning/renamedfrom/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-returntypechangedfrom_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-returntypechangedfrom_apiview_properties.json deleted file mode 100644 index 12989df0046..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-returntypechangedfrom_apiview_properties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "versioning.returntypechangedfrom.ReturnTypeChangedFromClient": "Versioning.ReturnTypeChangedFrom", - "versioning.returntypechangedfrom.ReturnTypeChangedFromClientBuilder": "Versioning.ReturnTypeChangedFrom" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-returntypechangedfrom_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-returntypechangedfrom_metadata.json index 9ad2a32a730..af0c6f96fe5 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-returntypechangedfrom_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-returntypechangedfrom_metadata.json @@ -1 +1 @@ -{"flavor":"generic","apiVersion":"v2","crossLanguageDefinitions":{"versioning.returntypechangedfrom.ReturnTypeChangedFromClient":"Versioning.ReturnTypeChangedFrom","versioning.returntypechangedfrom.ReturnTypeChangedFromClientBuilder":"Versioning.ReturnTypeChangedFrom"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClient.java","src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClientBuilder.java","src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromServiceVersion.java","src/main/java/versioning/returntypechangedfrom/implementation/ReturnTypeChangedFromClientImpl.java","src/main/java/versioning/returntypechangedfrom/implementation/package-info.java","src/main/java/versioning/returntypechangedfrom/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{"Versioning.ReturnTypeChangedFrom":"v2"},"crossLanguageDefinitions":{"versioning.returntypechangedfrom.ReturnTypeChangedFromClient":"Versioning.ReturnTypeChangedFrom","versioning.returntypechangedfrom.ReturnTypeChangedFromClientBuilder":"Versioning.ReturnTypeChangedFrom"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClient.java","src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClientBuilder.java","src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromServiceVersion.java","src/main/java/versioning/returntypechangedfrom/implementation/ReturnTypeChangedFromClientImpl.java","src/main/java/versioning/returntypechangedfrom/implementation/package-info.java","src/main/java/versioning/returntypechangedfrom/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-typechangedfrom_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-typechangedfrom_apiview_properties.json deleted file mode 100644 index 447831e726c..00000000000 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-typechangedfrom_apiview_properties.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "flavor": "generic", - "CrossLanguageDefinitionId": { - "versioning.typechangedfrom.TestModel": "Versioning.TypeChangedFrom.TestModel", - "versioning.typechangedfrom.TypeChangedFromClient": "Versioning.TypeChangedFrom", - "versioning.typechangedfrom.TypeChangedFromClientBuilder": "Versioning.TypeChangedFrom" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-typechangedfrom_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-typechangedfrom_metadata.json index 3294fceaf6b..46b2071732f 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-typechangedfrom_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/versioning-typechangedfrom_metadata.json @@ -1 +1 @@ -{"flavor":"generic","apiVersion":"v2","crossLanguageDefinitions":{"versioning.typechangedfrom.TestModel":"Versioning.TypeChangedFrom.TestModel","versioning.typechangedfrom.TypeChangedFromClient":"Versioning.TypeChangedFrom","versioning.typechangedfrom.TypeChangedFromClientBuilder":"Versioning.TypeChangedFrom"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/typechangedfrom/TestModel.java","src/main/java/versioning/typechangedfrom/TypeChangedFromClient.java","src/main/java/versioning/typechangedfrom/TypeChangedFromClientBuilder.java","src/main/java/versioning/typechangedfrom/TypeChangedFromServiceVersion.java","src/main/java/versioning/typechangedfrom/implementation/TypeChangedFromClientImpl.java","src/main/java/versioning/typechangedfrom/implementation/package-info.java","src/main/java/versioning/typechangedfrom/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{"Versioning.TypeChangedFrom":"v2"},"crossLanguageDefinitions":{"versioning.typechangedfrom.TestModel":"Versioning.TypeChangedFrom.TestModel","versioning.typechangedfrom.TypeChangedFromClient":"Versioning.TypeChangedFrom","versioning.typechangedfrom.TypeChangedFromClientBuilder":"Versioning.TypeChangedFrom"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/typechangedfrom/TestModel.java","src/main/java/versioning/typechangedfrom/TypeChangedFromClient.java","src/main/java/versioning/typechangedfrom/TypeChangedFromClientBuilder.java","src/main/java/versioning/typechangedfrom/TypeChangedFromServiceVersion.java","src/main/java/versioning/typechangedfrom/implementation/TypeChangedFromClientImpl.java","src/main/java/versioning/typechangedfrom/implementation/package-info.java","src/main/java/versioning/typechangedfrom/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/encode/array/EncodeArrayTests.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/encode/array/EncodeArrayTests.java index fb616b74df7..fdfb9f5caa7 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/encode/array/EncodeArrayTests.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/encode/array/EncodeArrayTests.java @@ -10,6 +10,9 @@ public final class EncodeArrayTests { private static final List COLORS = List.of("blue", "red", "green"); + private static final List ENUM_COLORS = List.of(Colors.BLUE, Colors.RED, Colors.GREEN); + private static final List EXTENSIBLE_ENUM_COLORS + = List.of(ColorsExtensibleEnum.BLUE, ColorsExtensibleEnum.RED, ColorsExtensibleEnum.GREEN); private final ArrayClient client = new ArrayClientBuilder().buildArrayClient(); @@ -36,4 +39,60 @@ public void newlineDelimitedProperty() { NewlineDelimitedArrayProperty response = client.newlineDelimited(new NewlineDelimitedArrayProperty(COLORS)); Assertions.assertEquals(COLORS, response.getValue()); } + + @Test + public void enumCommaDelimitedProperty() { + CommaDelimitedEnumArrayProperty response + = client.enumCommaDelimited(new CommaDelimitedEnumArrayProperty(ENUM_COLORS)); + Assertions.assertEquals(ENUM_COLORS, response.getValue()); + } + + @Test + public void enumSpaceDelimitedProperty() { + SpaceDelimitedEnumArrayProperty response + = client.enumSpaceDelimited(new SpaceDelimitedEnumArrayProperty(ENUM_COLORS)); + Assertions.assertEquals(ENUM_COLORS, response.getValue()); + } + + @Test + public void enumPipeDelimitedProperty() { + PipeDelimitedEnumArrayProperty response + = client.enumPipeDelimited(new PipeDelimitedEnumArrayProperty(ENUM_COLORS)); + Assertions.assertEquals(ENUM_COLORS, response.getValue()); + } + + @Test + public void enumNewlineDelimitedProperty() { + NewlineDelimitedEnumArrayProperty response + = client.enumNewlineDelimited(new NewlineDelimitedEnumArrayProperty(ENUM_COLORS)); + Assertions.assertEquals(ENUM_COLORS, response.getValue()); + } + + @Test + public void extensibleEnumCommaDelimitedProperty() { + CommaDelimitedExtensibleEnumArrayProperty response = client + .extensibleEnumCommaDelimited(new CommaDelimitedExtensibleEnumArrayProperty(EXTENSIBLE_ENUM_COLORS)); + Assertions.assertEquals(EXTENSIBLE_ENUM_COLORS, response.getValue()); + } + + @Test + public void extensibleEnumSpaceDelimitedProperty() { + SpaceDelimitedExtensibleEnumArrayProperty response = client + .extensibleEnumSpaceDelimited(new SpaceDelimitedExtensibleEnumArrayProperty(EXTENSIBLE_ENUM_COLORS)); + Assertions.assertEquals(EXTENSIBLE_ENUM_COLORS, response.getValue()); + } + + @Test + public void extensibleEnumPipeDelimitedProperty() { + PipeDelimitedExtensibleEnumArrayProperty response + = client.extensibleEnumPipeDelimited(new PipeDelimitedExtensibleEnumArrayProperty(EXTENSIBLE_ENUM_COLORS)); + Assertions.assertEquals(EXTENSIBLE_ENUM_COLORS, response.getValue()); + } + + @Test + public void extensibleEnumNewlineDelimitedProperty() { + NewlineDelimitedExtensibleEnumArrayProperty response = client + .extensibleEnumNewlineDelimited(new NewlineDelimitedExtensibleEnumArrayProperty(EXTENSIBLE_ENUM_COLORS)); + Assertions.assertEquals(EXTENSIBLE_ENUM_COLORS, response.getValue()); + } } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/encode/duration/EncodeDurationTests.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/encode/duration/EncodeDurationTests.java index 90732f08cf5..041109a5b23 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/encode/duration/EncodeDurationTests.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/encode/duration/EncodeDurationTests.java @@ -3,10 +3,18 @@ package encode.duration; +import encode.duration.property.Float64MillisecondsDurationProperty; import encode.duration.property.Float64SecondsDurationProperty; +import encode.duration.property.FloatMillisecondsDurationArrayProperty; +import encode.duration.property.FloatMillisecondsDurationProperty; +import encode.duration.property.FloatMillisecondsLargerUnitDurationProperty; import encode.duration.property.FloatSecondsDurationArrayProperty; import encode.duration.property.FloatSecondsDurationProperty; +import encode.duration.property.FloatSecondsLargerUnitDurationProperty; +import encode.duration.property.Int32MillisecondsDurationProperty; +import encode.duration.property.Int32MillisecondsLargerUnitDurationProperty; import encode.duration.property.Int32SecondsDurationProperty; +import encode.duration.property.Int32SecondsLargerUnitDurationProperty; import java.time.Duration; import java.util.Arrays; import java.util.List; @@ -22,6 +30,8 @@ public class EncodeDurationTests { private static final Duration DAY40 = Duration.ofDays(40); private static final Duration SECOND35 = Duration.ofSeconds(35, 625_000_000); private static final Duration SECOND36 = Duration.ofSeconds(36); + private static final Duration MILLIS35625 = Duration.ofMillis(35625); + private static final Duration MILLIS36000 = Duration.ofMillis(36000); // TODO: "Duration.ofDays" is disabled, as the serialization be "PT960H" instead of "PT40D" @@ -35,9 +45,26 @@ public void testQuery() { queryClient.int32Seconds(SECOND36); + queryClient.int32SecondsLargerUnit(Duration.ofMinutes(2)); + // queryClient.iso8601(DAY40); + queryClient.floatSecondsLargerUnit(Duration.ofMinutes(2).plusSeconds(30)); + queryClient.int32SecondsArray(Arrays.asList(SECOND36, Duration.ofSeconds(47))); + + queryClient.int32Milliseconds(MILLIS36000); + + queryClient.int32MillisecondsLargerUnit(Duration.ofMinutes(3)); + +// TODO: floatMilliseconds/float64Milliseconds send 35625.0 instead of 35625 as query param +// queryClient.floatMilliseconds(MILLIS35625); +// +// queryClient.floatMillisecondsLargerUnit(Duration.ofMinutes(3).plusSeconds(30)); +// +// queryClient.float64Milliseconds(MILLIS35625); + + queryClient.int32MillisecondsArray(Arrays.asList(MILLIS36000, Duration.ofMillis(47000))); } @Test @@ -50,9 +77,26 @@ public void testHeader() { headerClient.int32Seconds(SECOND36); + headerClient.int32SecondsLargerUnit(Duration.ofMinutes(2)); + // headerClient.iso8601(DAY40); // headerClient.iso8601Array(Arrays.asList(DAY40, Duration.ofDays(50))); + + headerClient.floatSecondsLargerUnit(Duration.ofMinutes(2).plusSeconds(30)); + + headerClient.int32Milliseconds(MILLIS36000); + + headerClient.int32MillisecondsLargerUnit(Duration.ofMinutes(3)); + +// TODO: floatMilliseconds/float64Milliseconds send 35625.0 instead of 35625 as header value +// headerClient.floatMilliseconds(MILLIS35625); +// +// headerClient.floatMillisecondsLargerUnit(Duration.ofMinutes(3).plusSeconds(30)); +// +// headerClient.float64Milliseconds(MILLIS35625); + + headerClient.int32MillisecondsArray(Arrays.asList(MILLIS36000, Duration.ofMillis(47000))); } @Test @@ -68,11 +112,46 @@ public void testProperty() { Assertions.assertEquals(SECOND36, propertyClient.int32Seconds(new Int32SecondsDurationProperty(SECOND36)).getValue()); + Assertions.assertEquals(Duration.ofMinutes(2), + propertyClient.int32SecondsLargerUnit(new Int32SecondsLargerUnitDurationProperty(Duration.ofMinutes(2))) + .getValue()); + + Assertions.assertEquals(Duration.ofMinutes(2).plusSeconds(30), + propertyClient + .floatSecondsLargerUnit( + new FloatSecondsLargerUnitDurationProperty(Duration.ofMinutes(2).plusSeconds(30))) + .getValue()); + // propertyClient.iso8601(new ISO8601DurationProperty(DAY40)); List array = Arrays.asList(SECOND35, Duration.ofSeconds(46, 750_000_000)); FloatSecondsDurationArrayProperty ret = propertyClient.floatSecondsArray(new FloatSecondsDurationArrayProperty(array)); Assertions.assertEquals(array, ret.getValue()); + + Assertions.assertEquals(MILLIS36000, + propertyClient.int32Milliseconds(new Int32MillisecondsDurationProperty(MILLIS36000)).getValue()); + + Assertions.assertEquals(MILLIS35625, + propertyClient.floatMilliseconds(new FloatMillisecondsDurationProperty(MILLIS35625)).getValue()); + + Assertions.assertEquals(MILLIS35625, + propertyClient.float64Milliseconds(new Float64MillisecondsDurationProperty(MILLIS35625)).getValue()); + + Assertions.assertEquals(Duration.ofMinutes(3), + propertyClient + .int32MillisecondsLargerUnit(new Int32MillisecondsLargerUnitDurationProperty(Duration.ofMinutes(3))) + .getValue()); + + Assertions.assertEquals(Duration.ofMinutes(3).plusSeconds(30), + propertyClient + .floatMillisecondsLargerUnit( + new FloatMillisecondsLargerUnitDurationProperty(Duration.ofMinutes(3).plusSeconds(30))) + .getValue()); + + List millisArray = Arrays.asList(Duration.ofMillis(35625), Duration.ofMillis(46750)); + FloatMillisecondsDurationArrayProperty millisArrayRet + = propertyClient.floatMillisecondsArray(new FloatMillisecondsDurationArrayProperty(millisArray)); + Assertions.assertEquals(millisArray, millisArrayRet.getValue()); } } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/payload/pageable/PageableTests.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/payload/pageable/PageableTests.java index 25f50fc64af..a15bd8a6034 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/payload/pageable/PageableTests.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/payload/pageable/PageableTests.java @@ -9,6 +9,7 @@ import java.util.stream.Collectors; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import payload.pageable.serverdrivenpagination.alternateinitialverb.Filter; public class PageableTests { @@ -16,6 +17,8 @@ public class PageableTests { private final ServerDrivenPaginationClient client = new PageableClientBuilder().buildServerDrivenPaginationClient(); private final ServerDrivenPaginationContinuationTokenClient tokenClient = new PageableClientBuilder().buildServerDrivenPaginationContinuationTokenClient(); + private final ServerDrivenPaginationAlternateInitialVerbClient alternateInitialVerbClient + = new PageableClientBuilder().buildServerDrivenPaginationAlternateInitialVerbClient(); @Test public void testNextLink() { @@ -101,4 +104,13 @@ public void testLinkString() { Assertions.assertEquals(List.of("1", "2", "3", "4"), pagedIterable.stream().map(Pet::getId).collect(Collectors.toList())); } + + @Test + public void testAlternateInitialVerbPost() { + PagedIterable pagedIterable = alternateInitialVerbClient.post(new Filter("foo eq bar")); + + Assertions.assertEquals(4, pagedIterable.stream().count()); + Assertions.assertEquals(List.of("1", "2", "3", "4"), + pagedIterable.stream().map(Pet::getId).collect(Collectors.toList())); + } } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/payload/pageable/XmlPageableTests.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/payload/pageable/XmlPageableTests.java new file mode 100644 index 00000000000..44850f8ecf1 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/payload/pageable/XmlPageableTests.java @@ -0,0 +1,47 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package payload.pageable; + +import io.clientcore.core.http.paging.PagedIterable; +import io.clientcore.core.http.paging.PagingOptions; +import java.util.List; +import java.util.stream.Collectors; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class XmlPageableTests { + private final XmlPaginationClient xmlPaginationClient = new PageableClientBuilder().buildXmlPaginationClient(); + + @Test + public void testListWithContinuation() { + PagedIterable pagedIterable = xmlPaginationClient.listWithContinuation(); + Assertions.assertTrue(pagedIterable.stream().count() > 0, "Should return at least one XmlPet"); + } + + @Test + public void testListWithNextLink() { + PagedIterable pagedIterable = xmlPaginationClient.listWithNextLink(); + Assertions.assertTrue(pagedIterable.stream().count() > 0, "Should return at least one XmlPet"); + } + + @Test + public void testListWithContinuationByPage() { + PagedIterable pagedIterable = xmlPaginationClient.listWithContinuation(); + List ids = pagedIterable.streamByPage(new PagingOptions().setContinuationToken("page2")) + .flatMap(page -> page.getValue().stream()) + .map(XmlPet::getId) + .collect(Collectors.toList()); + Assertions.assertNotNull(ids, "Ids should not be null"); + } + + @Test + public void testListWithNextLinkByPage() { + PagedIterable pagedIterable = xmlPaginationClient.listWithNextLink(); + List names = pagedIterable.streamByPage() + .flatMap(page -> page.getValue().stream()) + .map(XmlPet::getName) + .collect(Collectors.toList()); + Assertions.assertNotNull(names, "Names should not be null"); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/payload/xml/XmlTests.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/payload/xml/XmlTests.java index 6b650d6be8b..196e514ca3a 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/payload/xml/XmlTests.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/payload/xml/XmlTests.java @@ -3,10 +3,14 @@ package payload.xml; +import io.clientcore.core.http.models.HttpResponseException; +import java.time.OffsetDateTime; +import java.time.ZoneOffset; import java.util.Collections; import java.util.List; import java.util.Map; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; public final class XmlTests { @@ -148,4 +152,183 @@ public void testModelWithEncodedNames() { Assertions.assertEquals(123, model.getModelData().getAge()); Assertions.assertEquals(List.of("red", "green", "blue"), model.getColors()); } + + @Test + public void testModelWithEnum() { + ModelWithEnumValueClient client = new XmlClientBuilder().buildModelWithEnumValueClient(); + + client.put(new ModelWithEnum(Status.SUCCESS)); + + ModelWithEnum model = client.get(); + Assertions.assertEquals(Status.SUCCESS, model.getStatus()); + } + + @Test + public void testModelWithDatetime() { + ModelWithDatetimeValueClient client = new XmlClientBuilder().buildModelWithDatetimeValueClient(); + + OffsetDateTime rfc3339 = OffsetDateTime.of(2022, 8, 26, 18, 38, 0, 0, ZoneOffset.UTC); + OffsetDateTime rfc7231 = OffsetDateTime.of(2022, 8, 26, 14, 38, 0, 0, ZoneOffset.UTC); + + // UndefinedParserError: No parser and no file path given, couldn't infer a parser +// client.put(new ModelWithDatetime(rfc3339, rfc7231)); + + ModelWithDatetime model = client.get(); + Assertions.assertEquals(rfc3339, model.getRfc3339()); + Assertions.assertEquals(rfc7231, model.getRfc7231()); + } + + @Test + public void testXmlErrorValue() { + XmlErrorValueClient client = new XmlClientBuilder().buildXmlErrorValueClient(); + + HttpResponseException exception = Assertions.assertThrows(HttpResponseException.class, client::get); + XmlErrorBody errorBody = (XmlErrorBody) exception.getValue(); + Assertions.assertEquals("Something went wrong", errorBody.getMessage()); + Assertions.assertEquals(400, errorBody.getCode()); + } + + @Test + public void testModelWithRenamedProperty() { + ModelWithRenamedPropertyValueClient client = new XmlClientBuilder().buildModelWithRenamedPropertyValueClient(); + + client.put(new ModelWithRenamedProperty("foo", "bar")); + + ModelWithRenamedProperty model = client.get(); + Assertions.assertEquals("foo", model.getTitle()); + Assertions.assertEquals("bar", model.getAuthor()); + } + + @Test + public void testModelWithNestedModel() { + ModelWithNestedModelValueClient client = new XmlClientBuilder().buildModelWithNestedModelValueClient(); + + client.put(new ModelWithNestedModel(new SimpleModel("foo", 123))); + + ModelWithNestedModel model = client.get(); + Assertions.assertEquals("foo", model.getNested().getName()); + Assertions.assertEquals(123, model.getNested().getAge()); + } + + @Test + public void testModelWithRenamedNestedModel() { + ModelWithRenamedNestedModelValueClient client + = new XmlClientBuilder().buildModelWithRenamedNestedModelValueClient(); + + client.put(new ModelWithRenamedNestedModel(new Author("foo"))); + + ModelWithRenamedNestedModel model = client.get(); + Assertions.assertEquals("foo", model.getAuthor().getName()); + } + + @Test + public void testModelWithWrappedPrimitiveCustomItemNames() { + ModelWithWrappedPrimitiveCustomItemNamesValueClient client + = new XmlClientBuilder().buildModelWithWrappedPrimitiveCustomItemNamesValueClient(); + + client.put(new ModelWithWrappedPrimitiveCustomItemNames(List.of("fiction", "classic"))); + + ModelWithWrappedPrimitiveCustomItemNames model = client.get(); + Assertions.assertEquals(List.of("fiction", "classic"), model.getTags()); + } + + @Test + public void testModelWithUnwrappedModelArray() { + ModelWithUnwrappedModelArrayValueClient client + = new XmlClientBuilder().buildModelWithUnwrappedModelArrayValueClient(); + + client.put(new ModelWithUnwrappedModelArray(List.of(new SimpleModel("foo", 123), new SimpleModel("bar", 456)))); + + ModelWithUnwrappedModelArray model = client.get(); + Assertions.assertEquals(2, model.getItems().size()); + Assertions.assertEquals("foo", model.getItems().get(0).getName()); + Assertions.assertEquals(123, model.getItems().get(0).getAge()); + Assertions.assertEquals("bar", model.getItems().get(1).getName()); + Assertions.assertEquals(456, model.getItems().get(1).getAge()); + } + + @Test + public void testModelWithRenamedWrappedModelArray() { + ModelWithRenamedWrappedModelArrayValueClient client + = new XmlClientBuilder().buildModelWithRenamedWrappedModelArrayValueClient(); + + client.put( + new ModelWithRenamedWrappedModelArray(List.of(new SimpleModel("foo", 123), new SimpleModel("bar", 456)))); + + ModelWithRenamedWrappedModelArray model = client.get(); + Assertions.assertEquals(2, model.getItems().size()); + Assertions.assertEquals("foo", model.getItems().get(0).getName()); + Assertions.assertEquals(123, model.getItems().get(0).getAge()); + Assertions.assertEquals("bar", model.getItems().get(1).getName()); + Assertions.assertEquals(456, model.getItems().get(1).getAge()); + } + + @Test + public void testModelWithRenamedUnwrappedModelArray() { + ModelWithRenamedUnwrappedModelArrayValueClient client + = new XmlClientBuilder().buildModelWithRenamedUnwrappedModelArrayValueClient(); + + client.put( + new ModelWithRenamedUnwrappedModelArray(List.of(new SimpleModel("foo", 123), new SimpleModel("bar", 456)))); + + ModelWithRenamedUnwrappedModelArray model = client.get(); + Assertions.assertEquals(2, model.getItems().size()); + Assertions.assertEquals("foo", model.getItems().get(0).getName()); + Assertions.assertEquals(123, model.getItems().get(0).getAge()); + Assertions.assertEquals("bar", model.getItems().get(1).getName()); + Assertions.assertEquals(456, model.getItems().get(1).getAge()); + } + + @Test + public void testModelWithRenamedWrappedAndItemModelArray() { + ModelWithRenamedWrappedAndItemModelArrayValueClient client + = new XmlClientBuilder().buildModelWithRenamedWrappedAndItemModelArrayValueClient(); + + client.put(new ModelWithRenamedWrappedAndItemModelArray( + List.of(new Book("The Great Gatsby"), new Book("Les Miserables")))); + + ModelWithRenamedWrappedAndItemModelArray model = client.get(); + Assertions.assertEquals(2, model.getBooks().size()); + Assertions.assertEquals("The Great Gatsby", model.getBooks().get(0).getTitle()); + Assertions.assertEquals("Les Miserables", model.getBooks().get(1).getTitle()); + } + + @Test + public void testModelWithRenamedAttribute() { + ModelWithRenamedAttributeValueClient client + = new XmlClientBuilder().buildModelWithRenamedAttributeValueClient(); + + client.put(new ModelWithRenamedAttribute(123, "The Great Gatsby", "F. Scott Fitzgerald")); + + ModelWithRenamedAttribute model = client.get(); + Assertions.assertEquals(123, model.getId()); + Assertions.assertEquals("The Great Gatsby", model.getTitle()); + Assertions.assertEquals("F. Scott Fitzgerald", model.getAuthor()); + } + + @Disabled("namespace mismatch") + @Test + public void testModelWithNamespace() { + ModelWithNamespaceValueClient client = new XmlClientBuilder().buildModelWithNamespaceValueClient(); + + client.put(new ModelWithNamespace(123, "The Great Gatsby")); + + ModelWithNamespace model = client.get(); + Assertions.assertEquals(123, model.getId()); + Assertions.assertEquals("The Great Gatsby", model.getTitle()); + } + + @Disabled("namespace mismatch") + @Test + public void testModelWithNamespaceOnProperties() { + ModelWithNamespaceOnPropertiesValueClient client + = new XmlClientBuilder().buildModelWithNamespaceOnPropertiesValueClient(); + + client.put(new ModelWithNamespaceOnProperties(123, "The Great Gatsby", "F. Scott Fitzgerald")); + + ModelWithNamespaceOnProperties model = client.get(); + Assertions.assertEquals(123, model.getId()); + Assertions.assertEquals("The Great Gatsby", model.getTitle()); + Assertions.assertEquals("F. Scott Fitzgerald", model.getAuthor()); + } } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/type/file/FileTests.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/type/file/FileTests.java new file mode 100644 index 00000000000..e229301e3a5 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/test/java/type/file/FileTests.java @@ -0,0 +1,74 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package type.file; + +import io.clientcore.core.http.models.HttpHeaderName; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.models.binarydata.BinaryData; +import java.nio.file.Path; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.utils.FileUtils; + +public class FileTests { + + private static final Path PNG_FILE = FileUtils.getPngFile(); + + private final FileClient client = new FileClientBuilder().buildFileClient(); + + @Test + public void testUploadFileSpecificContentType() { + BinaryData fileData = BinaryData.fromFile(PNG_FILE); + client.uploadFileSpecificContentType(fileData, fileData.getLength()); + } + + @Disabled("possible bug in clientcore") + @Test + public void testUploadFileJsonContentType() { + // For JSON content type, we need to send a JSON payload + BinaryData jsonData = BinaryData.fromString("{\"message\":\"test file content\"}"); + client.uploadFileJsonContentType(jsonData, jsonData.getLength()); + } + + @Test + public void testDownloadFileJsonContentType() { + BinaryData response = client.downloadFileJsonContentType(); + Assertions.assertNotNull(response); + } + + @Test + public void testDownloadFileSpecificContentType() { + BinaryData response = client.downloadFileSpecificContentType(); + Assertions.assertNotNull(response); + } + + @Disabled("possible bug in clientcore") + @Test + public void testUploadFileMultipleContentTypes() { + BinaryData fileData = BinaryData.fromFile(PNG_FILE); + client.uploadFileMultipleContentTypes(UploadFileMultipleContentTypesContentType.IMAGE_PNG, fileData, + fileData.getLength()); + } + + @Test + public void testDownloadFileMultipleContentTypes() { + BinaryData response + = client.downloadFileMultipleContentTypes(DownloadFileMultipleContentTypesContentType.IMAGE_PNG); + Assertions.assertNotNull(response); + } + + @Test + public void testUploadFileDefaultContentType() { + BinaryData fileData = BinaryData.fromFile(PNG_FILE); + client.uploadFileDefaultContentTypeWithResponse(fileData, fileData.getLength(), + RequestContext.builder().setHeader(HttpHeaderName.CONTENT_TYPE, "image/png").build()); + } + + @Test + public void testDownloadFileDefaultContentType() { + BinaryData response = client.downloadFileDefaultContentType(); + Assertions.assertNotNull(response); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/Javagen.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/Javagen.java index b5294b77207..e9dc7ec87fd 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/Javagen.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/Javagen.java @@ -38,7 +38,6 @@ import com.microsoft.typespec.http.client.generator.core.util.ClientModelUtil; import com.microsoft.typespec.http.client.generator.core.util.SchemaUtil; import io.clientcore.core.utils.CoreUtils; -import java.util.Collections; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -166,7 +165,7 @@ protected JavaPackage writeToTemplates(CodeModel codeModel, Client client, JavaS && client.getSyncClients().stream().anyMatch(c -> c.getClientBuilder() != null)) { List serviceClients = client.getServiceClients(); if (CoreUtils.isNullOrEmpty(serviceClients)) { - serviceClients = Collections.singletonList(client.getServiceClient()); + serviceClients = List.of(client.getServiceClient()); } TestContext testContext = new TestContext<>(serviceClients, client.getSyncClients()); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/Client.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/Client.java index a47b8e99c4e..057880aeed6 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/Client.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/Client.java @@ -4,8 +4,9 @@ package com.microsoft.typespec.http.client.generator.core.extension.model.codemodel; import java.util.ArrayList; -import java.util.Collections; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; /** * Represents a client. @@ -18,9 +19,11 @@ public class Client extends Metadata { private List apiVersions = new ArrayList<>(); private ServiceVersion serviceVersion; private Client parent; - private List subClients = Collections.emptyList(); + private List subClients = List.of(); private boolean buildMethodPublic = true; private boolean parentAccessorPublic = false; + // map of TypeSpec namespace to api-version + private Map apiVersionMap = new LinkedHashMap<>(); /** * Creates a new instance of the Client class. @@ -168,4 +171,12 @@ public boolean isParentAccessorPublic() { public void setParentAccessorPublic(boolean parentAccessorPublic) { this.parentAccessorPublic = parentAccessorPublic; } + + public Map getApiVersionMap() { + return apiVersionMap; + } + + public void setApiVersionMap(Map apiVersionMap) { + this.apiVersionMap = apiVersionMap; + } } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/CodeModelCustomConstructor.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/CodeModelCustomConstructor.java index c28a07fe874..c304bca939e 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/CodeModelCustomConstructor.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/CodeModelCustomConstructor.java @@ -5,7 +5,7 @@ import com.microsoft.typespec.http.client.generator.core.extension.model.extensionmodel.XmsExamples; import java.util.ArrayList; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import org.yaml.snakeyaml.LoaderOptions; @@ -381,7 +381,7 @@ public Object construct(Node node) { protected Object constructJavaBean2ndStep(MappingNode node, Object object) { if (node.getType().equals(XmsExamples.class)) { // deserialize to Map, while Object would be LinkedHashMap - Map examples = new HashMap<>(); + Map examples = new LinkedHashMap<>(); for (NodeTuple tuple : node.getValue()) { examples.put(((ScalarNode) tuple.getKeyNode()).getValue(), constructObject(tuple.getValueNode())); } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/DurationSchema.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/DurationSchema.java index dea7b644137..a2ee69d4bea 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/DurationSchema.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/DurationSchema.java @@ -78,7 +78,17 @@ public enum Format { /** * The duration is in seconds as a number. */ - SECONDS_NUMBER("seconds-number"); + SECONDS_NUMBER("seconds-number"), + + /** + * The duration is in milliseconds as an integer. + */ + MILLISECONDS_INTEGER("milliseconds-integer"), + + /** + * The duration is in milliseconds as a number. + */ + MILLISECONDS_NUMBER("milliseconds-number"); private final String value; @@ -114,6 +124,10 @@ public static Format fromValue(String value) { return SECONDS_INTEGER; } else if ("seconds-number".equals(value)) { return SECONDS_NUMBER; + } else if ("milliseconds-integer".equals(value)) { + return MILLISECONDS_INTEGER; + } else if ("milliseconds-number".equals(value)) { + return MILLISECONDS_NUMBER; } else { throw new IllegalArgumentException(value); } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/OperationGroup.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/OperationGroup.java index c16370d6fb3..c140859d007 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/OperationGroup.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/OperationGroup.java @@ -11,7 +11,7 @@ */ public class OperationGroup extends Metadata { private String $key; - private List operations = new ArrayList(); + private List operations = new ArrayList<>(); private Client codeModel; /** diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/Scheme.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/Scheme.java index fb81ee2bb2d..6e1adf3723d 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/Scheme.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/Scheme.java @@ -4,7 +4,7 @@ package com.microsoft.typespec.http.client.generator.core.extension.model.codemodel; import java.util.ArrayList; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -14,7 +14,7 @@ public class Scheme { private Scheme.SecuritySchemeType type; // OAuth2 - private Set scopes = new HashSet<>(); + private Set scopes = new LinkedHashSet<>(); private List flows = new ArrayList<>(); // Key private String name; diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/XmlSerializationFormat.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/XmlSerializationFormat.java index 14de1b8b937..a041feb4265 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/XmlSerializationFormat.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/XmlSerializationFormat.java @@ -15,6 +15,9 @@ public class XmlSerializationFormat extends SerializationFormat { private boolean attribute; private boolean wrapped; private boolean text; + private String itemsName; + private String itemsNamespace; + private String itemsPrefix; /** * Creates a new instance of the XmlSerializationFormat class. @@ -130,17 +133,73 @@ public void setText(boolean text) { this.text = text; } + /** + * Gets the name of the XML items element. + * + * @return The name of the XML items element. + */ + public String getItemsName() { + return itemsName; + } + + /** + * Sets the name of the XML items element. + * + * @param itemsName The name of the XML items element. + */ + public void setItemsName(String itemsName) { + this.itemsName = itemsName; + } + + /** + * Gets the namespace of the XML items element. + * + * @return The namespace of the XML items element. + */ + public String getItemsNamespace() { + return itemsNamespace; + } + + /** + * Sets the namespace of the XML items element. + * + * @param itemsNamespace The namespace of the XML items element. + */ + public void setItemsNamespace(String itemsNamespace) { + this.itemsNamespace = itemsNamespace; + } + + /** + * Gets the prefix of the XML items element. + * + * @return The prefix of the XML items element. + */ + public String getItemsPrefix() { + return itemsPrefix; + } + + /** + * Sets the prefix of the XML items element. + * + * @param itemsPrefix The prefix of the XML items element. + */ + public void setItemsPrefix(String itemsPrefix) { + this.itemsPrefix = itemsPrefix; + } + @Override public String toString() { return XmlSerializationFormat.class.getName() + "@" + Integer.toHexString(System.identityHashCode(this)) + "[name=" + Objects.toString(name, "") + ",namespace=" + Objects.toString(namespace, "") + ",prefix=" + Objects.toString(prefix, "") + ",attribute=" + attribute + ",wrapped=" + wrapped - + ",text=" + text + "]"; + + ",itemsName=" + Objects.toString(itemsName, "") + ",itemsNamespace=" + + Objects.toString(itemsNamespace, "") + ",itemsPrefix=" + Objects.toString(itemsPrefix, "") + + "]"; } @Override public int hashCode() { - return Objects.hash(name, namespace, attribute, wrapped, prefix, text); + return Objects.hash(name, namespace, attribute, wrapped, prefix, text, itemsName, itemsNamespace, itemsPrefix); } @Override @@ -158,6 +217,9 @@ public boolean equals(Object other) { && attribute == rhs.attribute && wrapped == rhs.wrapped && Objects.equals(prefix, rhs.prefix) - && text == rhs.text; + && text == rhs.text + && Objects.equals(itemsName, rhs.itemsName) + && Objects.equals(itemsNamespace, rhs.itemsNamespace) + && Objects.equals(itemsPrefix, rhs.itemsPrefix); } } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/extensionmodel/NextLinkVerb.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/extensionmodel/NextLinkVerb.java index 6fd3ddcb89d..f66951da02b 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/extensionmodel/NextLinkVerb.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/extensionmodel/NextLinkVerb.java @@ -3,9 +3,6 @@ package com.microsoft.typespec.http.client.generator.core.extension.model.extensionmodel; -import java.util.HashMap; -import java.util.Map; - /** * Represents the HTTP verb for the nextLink operation in pageable settings. */ @@ -21,13 +18,6 @@ public enum NextLinkVerb { POST("POST"); private final String value; - private static final Map CONSTANTS = new HashMap<>(); - - static { - for (NextLinkVerb v : values()) { - CONSTANTS.put(v.value, v); - } - } NextLinkVerb(String value) { this.value = value; @@ -55,11 +45,11 @@ public String value() { * @throws IllegalArgumentException If the value is not a valid HTTP verb. */ public static NextLinkVerb fromValue(String value) { - NextLinkVerb constant = CONSTANTS.get(value); - if (constant == null) { - throw new IllegalArgumentException(value); - } else { - return constant; + if (GET.value.equals(value)) { + return GET; + } else if (POST.value.equals(value)) { + return POST; } + throw new IllegalArgumentException(value); } } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/plugin/JavaSettings.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/plugin/JavaSettings.java index d63e57e1cd4..372d154f8cc 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/plugin/JavaSettings.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/plugin/JavaSettings.java @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -34,7 +34,7 @@ public class JavaSettings { private static JavaSettings instance; private static NewPlugin host; private static String header; - private static final Map SIMPLE_JAVA_SETTINGS = new HashMap<>(); + private static final Map SIMPLE_JAVA_SETTINGS = new LinkedHashMap<>(); private static Logger logger; private final boolean useKeyCredential; private final String flavor; @@ -70,7 +70,7 @@ static void setHeader(String value) { } } - static void setHost(NewPlugin host) { + public static void setHost(NewPlugin host) { JavaSettings.host = host; logger = new PluginLogger(host, JavaSettings.class); } @@ -122,7 +122,7 @@ public static JavaSettings getInstance() { private static Map parseStatusCodeMapping(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - Map mapping = new HashMap<>(); + Map mapping = new LinkedHashMap<>(); while (reader.nextToken() != JsonToken.END_OBJECT) { int key = Integer.parseInt(reader.getFieldName()); reader.nextToken(); @@ -649,7 +649,7 @@ public static class ModelerSettings { * @param settings The settings that are used by the modeler. */ public ModelerSettings(Map settings) { - this.settings = settings == null ? Collections.emptyMap() : settings; + this.settings = settings == null ? Map.of() : settings; } /** @@ -1523,7 +1523,7 @@ public boolean isUseObjectForUnknown() { return useObjectForUnknown; } - private final Map renameModel = new HashMap<>(); + private final Map renameModel = new LinkedHashMap<>(); public Map getJavaNamesForRenameModel() { return renameModel; @@ -1602,7 +1602,7 @@ private static void loadStringOrArraySettingAsArray(String settingName, Consumer } else { // Single values will be returned as the string representation. logger.debug("Option, string, {} : {}", settingName, jsonString); - action.accept(Collections.singletonList(jsonString)); + action.accept(List.of(jsonString)); } return null; diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/plugin/NewPlugin.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/plugin/NewPlugin.java index 6570eaab9fc..0fefc48e14e 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/plugin/NewPlugin.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/plugin/NewPlugin.java @@ -15,7 +15,6 @@ import java.io.StringWriter; import java.io.UncheckedIOException; import java.util.Arrays; -import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -192,7 +191,7 @@ public void message(MessageChannel channel, String text, Throwable error, List enumTypes = new ArrayList<>(); - Set enumNames = new HashSet<>(); + Set enumNames = new LinkedHashSet<>(); for (ChoiceSchema choiceSchema : codeModel.getSchemas().getChoices()) { IType iType = Mappers.getChoiceMapper().map(choiceSchema); if (iType != ClassType.STRING) { @@ -117,7 +115,7 @@ public Client map(CodeModel codeModel) { List exceptions = Stream .concat( codeModel.getClients() == null - ? Stream.empty() + ? Stream.empty() : codeModel.getClients().stream().flatMap(c -> c.getOperationGroups().stream()), codeModel.getOperationGroups().stream()) .flatMap(og -> og.getOperations().stream()) @@ -211,7 +209,7 @@ public Client map(CodeModel codeModel) { // package info // client - Map packageInfos = new HashMap<>(); + Map packageInfos = new LinkedHashMap<>(); if (settings.isGenerateClientInterfaces() || !settings.isGenerateClientAsImpl() || settings.getImplementationSubpackage() == null @@ -328,10 +326,9 @@ public Client map(CodeModel codeModel) { ? syncClient.getClassName() : asyncClient.getClassName().replace("AsyncClient", "Client")); String clientBuilderName = clientName + builderSuffix; - ClientBuilder clientBuilder - = new ClientBuilder(builderPackage, clientBuilderName, serviceClient, - (syncClient == null) ? Collections.emptyList() : Collections.singletonList(syncClient), - Collections.singletonList(asyncClient), serviceClient.getCrossLanguageDefinitionId()); + ClientBuilder clientBuilder = new ClientBuilder(builderPackage, clientBuilderName, + serviceClient, (syncClient == null) ? List.of() : List.of(syncClient), List.of(asyncClient), + serviceClient.getCrossLanguageDefinitionId()); addBuilderTraits(clientBuilder, serviceClient); clientBuilders.add(clientBuilder); @@ -381,7 +378,7 @@ public Client map(CodeModel codeModel) { private void addConvenienceExamples(Client.Builder builder, List syncClients) { // convenience examples List convenienceExamples = new ArrayList<>(); - Set convenienceExampleNameSet = new HashSet<>(); + Set convenienceExampleNameSet = new LinkedHashSet<>(); BiConsumer handleConvenienceExample = (c, convenienceMethod) -> { ClientBuilder clientBuilder = c.getClientBuilder(); @@ -419,7 +416,7 @@ private void addConvenienceExamples(Client.Builder builder, List syncClients) { List protocolExamples = new ArrayList<>(); - Set protocolExampleNameSet = new HashSet<>(); + Set protocolExampleNameSet = new LinkedHashSet<>(); BiConsumer handleExample = (c, m) -> { if (m.getMethodVisibility() == JavaVisibility.Public @@ -445,7 +442,7 @@ private void addProtocolExamples(Client.Builder builder, List s // protocol examples, exclude those that have convenience methods syncClients.stream().filter(c -> c.getServiceClient() != null).forEach(c -> { - Set convenienceProxyMethodNames = new HashSet<>(); + Set convenienceProxyMethodNames = new LinkedHashSet<>(); if (c.getConvenienceMethods() != null) { convenienceProxyMethodNames.addAll(c.getConvenienceMethods() .stream() @@ -459,7 +456,7 @@ private void addProtocolExamples(Client.Builder builder, List s .forEach(m -> handleExample.accept(c, m)); }); syncClients.stream().filter(c -> c.getMethodGroupClient() != null).forEach(c -> { - Set convenienceProxyMethodNames = new HashSet<>(); + Set convenienceProxyMethodNames = new LinkedHashSet<>(); if (c.getConvenienceMethods() != null) { convenienceProxyMethodNames.addAll(c.getConvenienceMethods() .stream() @@ -484,7 +481,7 @@ private void addProtocolExamples(Client.Builder builder, List s protected Map processClients(List clients, CodeModel codeModel) { - return Collections.emptyMap(); + return Map.of(); } private void addBuilderTraits(ClientBuilder clientBuilder, ServiceClient serviceClient) { @@ -564,9 +561,9 @@ public ObjectSchema parseHeader(Operation operation, JavaSettings settings) { String name = CodeNamer.getPlural(operation.getOperationGroup().getLanguage().getJava().getName()) + CodeNamer.toPascalCase(operation.getLanguage().getJava().getName()) + "Headers"; - Map headerMap = new HashMap<>(); - Map headerClientNameMap = new HashMap<>(); - Map headerExtensions = new HashMap<>(); + Map headerMap = new LinkedHashMap<>(); + Map headerClientNameMap = new LinkedHashMap<>(); + Map headerExtensions = new LinkedHashMap<>(); for (Response response : operation.getResponses()) { if (response.getProtocol().getHttp().getHeaders() != null) { for (Header header : response.getProtocol().getHttp().getHeaders()) { @@ -585,7 +582,7 @@ public ObjectSchema parseHeader(Operation operation, JavaSettings settings) { headerSchema.getLanguage().getJava().setName(name); headerSchema.setProperties(new ArrayList<>()); headerSchema.setStronglyTypedHeader(true); - headerSchema.setUsage(new HashSet<>(Collections.singletonList(SchemaContext.OUTPUT))); + headerSchema.setUsage(new LinkedHashSet<>(List.of(SchemaContext.OUTPUT))); // TODO (weidxu): at present we do not generate convenience API with Header model // if (operation.getConvenienceApi() != null) { @@ -697,7 +694,7 @@ private static ModuleInfo getModuleInfo(List modelsPackages, Collection< protected List getModelsPackages(List clientModels, List enumTypes, List responseModels) { - List ret = Collections.emptyList(); + List ret = List.of(); JavaSettings settings = JavaSettings.getInstance(); boolean hasModels = !settings.isDataPlaneClient() // not DPG diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ClientMethodParameterProcessor.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ClientMethodParameterProcessor.java index cb7524bc6ee..f200492b990 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ClientMethodParameterProcessor.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ClientMethodParameterProcessor.java @@ -14,7 +14,7 @@ import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ProxyMethodParameter; import com.microsoft.typespec.http.client.generator.core.util.MethodUtil; import java.util.ArrayList; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -28,7 +28,7 @@ static ClientMethodParametersDetails process(Request request, boolean mapFluxByt final List codeModelParameters = getCodeModelParameters(request, isProtocolMethod); final List parametersTuples = new ArrayList<>(); final List requiredNullableParameterExpressions = new ArrayList<>(); - final Map validateParameterExpressions = new HashMap<>(); + final Map validateParameterExpressions = new LinkedHashMap<>(); final boolean isJsonPatch = MethodUtil.isContentTypeInRequest(request, "application/json-patch+json"); final ParametersTransformationProcessor transformationProcessor diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/CollectionUtil.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/CollectionUtil.java index 2c41435446c..039ddd5257c 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/CollectionUtil.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/CollectionUtil.java @@ -4,7 +4,7 @@ package com.microsoft.typespec.http.client.generator.core.mapper; import java.util.Collections; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -71,7 +71,7 @@ public static Map> toImmutableMapOfList(Map> map) { // 'map', so this reference equality check save us from creating a new map (below) with list values copied. return map; } - final Map> m = new HashMap<>(map.size()); + final Map> m = new LinkedHashMap<>(map.size()); for (Map.Entry> e : map.entrySet()) { m.put(e.getKey(), toImmutableList(e.getValue())); } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ExceptionSettingUtil.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ExceptionSettingUtil.java index 070970a967f..9e09e94bb00 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ExceptionSettingUtil.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ExceptionSettingUtil.java @@ -6,7 +6,7 @@ import com.microsoft.typespec.http.client.generator.core.extension.plugin.JavaSettings; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ClassType; import io.clientcore.core.utils.CoreUtils; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; /** @@ -36,7 +36,7 @@ static ClassType getDefaultHttpExceptionType(JavaSettings settings) { * @return a map of HTTP status codes to exception types. */ static Map getHttpStatusToExceptionTypeMapping(JavaSettings settings) { - final Map exceptionMapping = new HashMap<>(); + final Map exceptionMapping = new LinkedHashMap<>(); if (settings.isUseDefaultHttpStatusCodeToExceptionTypeMapping()) { // add default mapping, this may get overwritten if custom mapping is provided. exceptionMapping.put(401, ClassType.CLIENT_AUTHENTICATION_EXCEPTION); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/LiveTestsMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/LiveTestsMapper.java index a2b5806a815..5f14e6a3111 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/LiveTestsMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/LiveTestsMapper.java @@ -14,7 +14,7 @@ import com.microsoft.typespec.http.client.generator.core.util.CodeNamer; import com.microsoft.typespec.http.client.generator.core.util.XmsExampleWrapper; import java.util.ArrayList; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -47,7 +47,7 @@ public List map(TestModel testModel) { .filter(scenarioStep -> scenarioStep.getType() == TestScenarioStepType.REST_CALL && scenarioStep.getExampleFile() != null) .map((Function) scenarioStep -> { - Map example = new HashMap<>(); + Map example = new LinkedHashMap<>(); example.put("parameters", scenarioStep.getRequestParameters()); XmsExampleWrapper exampleWrapper = new XmsExampleWrapper(example, scenarioStep.getOperationId(), scenarioStep.getExampleName()); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/MapperUtils.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/MapperUtils.java index 1d285a024c3..e6413b89ca7 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/MapperUtils.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/MapperUtils.java @@ -82,38 +82,11 @@ public static IType createEnumType(ChoiceSchema enumType, boolean expandable, bo description = "Defines values for " + enumTypeName + "."; } - List enumValues = new ArrayList<>(); - for (ChoiceValue enumValue : enumType.getChoices()) { - String enumName = enumValue.getValue(); - String enumDescription = null; - if (useCodeModelNameForEnumMember) { - if (enumValue.getLanguage() != null - && enumValue.getLanguage().getJava() != null - && enumValue.getLanguage().getJava().getName() != null) { - enumName = enumValue.getLanguage().getJava().getName(); - enumDescription = enumValue.getLanguage().getJava().getDescription(); - } else if (enumValue.getLanguage() != null - && enumValue.getLanguage().getDefault() != null - && enumValue.getLanguage().getDefault().getName() != null) { - enumName = enumValue.getLanguage().getDefault().getName(); - enumDescription = enumValue.getLanguage().getDefault().getDescription(); - } - } - final String memberName = CodeNamer.getEnumMemberName(enumName); - long counter = enumValues.stream().filter(v -> v.getName().equals(memberName)).count(); - if (counter > 0) { - enumValues - .add(new ClientEnumValue(memberName + "_" + counter, enumValue.getValue(), enumDescription)); - } else { - enumValues.add(new ClientEnumValue(memberName, enumValue.getValue(), enumDescription)); - } - } - return new EnumType.Builder().packageName(enumPackage) .name(enumTypeName) .description(description) .expandable(expandable) - .values(enumValues) + .values(createEnumValues(enumType, useCodeModelNameForEnumMember)) .elementType(Mappers.getSchemaMapper().map(enumType.getChoiceType())) .implementationDetails( new ImplementationDetails.Builder().usages(SchemaUtil.mapSchemaContext(enumType.getUsage())) @@ -125,6 +98,91 @@ public static IType createEnumType(ChoiceSchema enumType, boolean expandable, bo } } + private static List createEnumValues(ChoiceSchema enumType, + boolean useCodeModelNameForEnumMember) { + List enumValues = new ArrayList<>(); + for (ChoiceValue enumValue : enumType.getChoices()) { + String enumName = enumValue.getValue(); + String enumDescription = null; + if (useCodeModelNameForEnumMember) { + if (enumValue.getLanguage() != null + && enumValue.getLanguage().getJava() != null + && enumValue.getLanguage().getJava().getName() != null) { + enumName = enumValue.getLanguage().getJava().getName(); + enumDescription = enumValue.getLanguage().getJava().getDescription(); + } else if (enumValue.getLanguage() != null + && enumValue.getLanguage().getDefault() != null + && enumValue.getLanguage().getDefault().getName() != null) { + enumName = enumValue.getLanguage().getDefault().getName(); + enumDescription = enumValue.getLanguage().getDefault().getDescription(); + } + } + final String memberName = CodeNamer.getEnumMemberName(enumName); + long counter = enumValues.stream().filter(v -> v.getName().equals(memberName)).count(); + if (counter > 0) { + enumValues.add(new ClientEnumValue(memberName + "_" + counter, enumValue.getValue(), enumDescription)); + } else { + enumValues.add(new ClientEnumValue(memberName, enumValue.getValue(), enumDescription)); + } + } + return enumValues; + } + + /** + * Map to external enum client type, if applicable. + * + * @param enumType code model schema for enum + * @param expandable whether it's expandable enum + * @return enum client type, or null if not applicable. + */ + public static EnumType mapExternalModel(ChoiceSchema enumType, boolean expandable) { + EnumType type = null; + if (enumType.getUsage() != null + && enumType.getUsage().contains(SchemaContext.EXTERNAL) + && enumType.getLanguage() != null + && enumType.getLanguage().getJava() != null + && enumType.getLanguage().getJava().getNamespace() != null + && enumType.getLanguage().getJava().getName() != null) { + + IType elementType = Mappers.getSchemaMapper().map(enumType.getChoiceType()); + + // schema is external model + String namespace = enumType.getLanguage().getJava().getNamespace(); + String name = enumType.getLanguage().getJava().getName(); + + String fromMethodName = null; + String toMethodName = null; + if (namespace.startsWith("java.")) { + // a hack here, we know that built-in Java enum will not have "fromString" method + // (and also won't be expandable) + expandable = false; + fromMethodName = "valueOf"; + toMethodName = "name"; + } + + if (expandable) { + boolean isStringEnum = elementType == ClassType.STRING; + JavaSettings javaSettings = JavaSettings.getInstance(); + if (!(isStringEnum && javaSettings.isAzureV1())) { + // core-v2 always use ExpandableEnum, as well as non-string enum in v1 + fromMethodName = "getValue"; + toMethodName = "fromValue"; + } + } + + type = new EnumType.Builder().packageName(namespace) + .name(name) + .expandable(expandable) + .values(createEnumValues(enumType, false)) + .elementType(elementType) + .fromMethodName(fromMethodName) + .toMethodName(toMethodName) + .build(); + } + + return type; + } + public static IType getExpectedResponseBodyType(Operation operation, JavaSettings settings) { final Schema responseSchema = SchemaUtil.getLowestCommonParent(operation.getResponseSchemas().iterator()); if (responseSchema != null && responseSchema.isXmlWrapped()) { diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/MethodGroupMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/MethodGroupMapper.java index afb280fea33..4e2903d68cd 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/MethodGroupMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/MethodGroupMapper.java @@ -21,7 +21,6 @@ import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Objects; @@ -173,7 +172,7 @@ private MethodGroupClient createMethodGroupClient(OperationGroup methodGroup, } protected List supportedInterfaces(OperationGroup operationGroup, List clientMethods) { - return Collections.emptyList(); + return List.of(); } protected String getServiceClientName(Client client) { diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ModelMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ModelMapper.java index 2ac19e75ce0..84a672e0ddd 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ModelMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ModelMapper.java @@ -25,8 +25,7 @@ import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Objects; import java.util.Set; @@ -62,7 +61,7 @@ public ClientModel map(ObjectSchema compositeType) { if (settings.isAzureV1() && !settings.isDataPlaneClient()) { return result; } else { - usages = new HashSet<>(usages); + usages = new LinkedHashSet<>(usages); usages.add(ImplementationDetails.Usage.EXTERNAL); } } @@ -86,11 +85,11 @@ public ClientModel map(ObjectSchema compositeType) { = compositeType.getDiscriminator() != null || compositeType.getDiscriminatorValue() != null; builder.polymorphic(isPolymorphic); - HashSet modelImports = new HashSet<>(); + Set modelImports = new LinkedHashSet<>(); String parentModelName = null; boolean hasAdditionalProperties = false; - List parentsNeedFlatten = Collections.emptyList(); + List parentsNeedFlatten = List.of(); if (compositeType.getParents() != null && compositeType.getParents().getImmediate() != null) { hasAdditionalProperties = compositeType.getParents().getImmediate().stream().anyMatch(s -> s instanceof DictionarySchema); @@ -552,7 +551,7 @@ private List collectPropertiesFromFlattenedModel(O propertyNames.add(PROPERTY_NAME_ADDITIONAL_PROPERTIES); } - Set referencePropertyNames = new HashSet<>(); + Set referencePropertyNames = new LinkedHashSet<>(); // properties from the target model for (ClientModelProperty property1 : targetModel.getProperties()) { if (!property1.getClientFlatten() && !property1.isAdditionalProperties()) { diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ModelPropertyMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ModelPropertyMapper.java index 44484d50143..ae99cd0c88e 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ModelPropertyMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ModelPropertyMapper.java @@ -194,11 +194,17 @@ public ClientModelProperty map(Property property, boolean mutableAsOptional) { Schema autoRestPropertyModelType = property.getSchema(); if (autoRestPropertyModelType instanceof ArraySchema) { ArraySchema sequence = (ArraySchema) autoRestPropertyModelType; - if (property.getSerialization() != null && !isXmlWrapper) { + if (property.getSerialization() != null) { // TypeSpec sets "serialization" to property - builder.xmlListElementName(property.getSerialization().getXml().getName()); - builder.xmlListElementNamespace(property.getSerialization().getXml().getNamespace()); - builder.xmlListElementPrefix(property.getSerialization().getXml().getPrefix()); + if (isXmlWrapper) { + builder.xmlListElementName(property.getSerialization().getXml().getItemsName()); + builder.xmlListElementNamespace(property.getSerialization().getXml().getItemsNamespace()); + builder.xmlListElementPrefix(property.getSerialization().getXml().getItemsPrefix()); + } else { + builder.xmlListElementName(property.getSerialization().getXml().getName()); + builder.xmlListElementNamespace(property.getSerialization().getXml().getNamespace()); + builder.xmlListElementPrefix(property.getSerialization().getXml().getPrefix()); + } } else if (sequence.getElementType().getSerialization() != null && sequence.getElementType().getSerialization().getXml() != null && sequence.getElementType().getSerialization().getXml().getName() != null) { diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ObjectMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ObjectMapper.java index 67e19dae5fc..3fc971fdaa6 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ObjectMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ObjectMapper.java @@ -60,7 +60,7 @@ private ClassType createClassType(ObjectSchema compositeType) { && isInternalModel(compositeType)) { // internal type is not exposed to user packageSuffixes = new String[] { settings.getImplementationSubpackage(), settings.getModelsSubpackage() }; - } else if (isPageModel(compositeType)) { + } else if (isPagedModel(compositeType) && isChildrenAllInternal(compositeType)) { // put class of Page<> type to implementation package // for DPG from TypeSpec, these are not generated to class @@ -137,10 +137,26 @@ protected boolean isInnerModel(ObjectSchema compositeType) { * @param compositeType object type * @return whether the type is a Page model. */ - private static boolean isPageModel(ObjectSchema compositeType) { + private static boolean isPagedModel(ObjectSchema compositeType) { return compositeType.getUsage() != null && compositeType.getUsage().contains(SchemaContext.PAGED); } + private static boolean isChildrenAllInternal(ObjectSchema compositeType) { + // If we move model to implementation package, we need to make sure it does not have child that need to be + // public + boolean ret = true; + if (compositeType.getChildren() != null && !CoreUtils.isNullOrEmpty(compositeType.getChildren().getAll())) { + ret = compositeType.getChildren() + .getAll() + .stream() + .noneMatch(s -> (s instanceof ObjectSchema) + && !isPagedModel(((ObjectSchema) s)) + && (((ObjectSchema) s).getUsage() != null + && ((ObjectSchema) s).getUsage().contains(SchemaContext.PUBLIC))); + } + return ret; + } + private static boolean isInternalModel(ObjectSchema compositeType) { return compositeType.getUsage() != null && compositeType.getUsage().contains(SchemaContext.INTERNAL); } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/PagingMetadata.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/PagingMetadata.java index 198ded4072c..c843858b03a 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/PagingMetadata.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/PagingMetadata.java @@ -23,7 +23,6 @@ import com.microsoft.typespec.http.client.generator.core.util.SchemaUtil; import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.stream.Stream; @@ -87,7 +86,7 @@ static PagingMetadata create(Operation operation, ProxyMethod proxyMethod, if (nextOperation != null && nextOperation != operation) { nextMethods = Mappers.getClientMethodMapper().map(nextOperation); } else { - nextMethods = Collections.emptyList(); + nextMethods = List.of(); } final MethodPageDetails.ContinuationToken continuationToken @@ -186,8 +185,7 @@ private static List getPageableItem(XmsPageable xmsPageabl return result; } else { // m4 - return Collections - .singletonList(ClientModelUtil.getModelPropertySegment(responseType, xmsPageable.getItemName())); + return List.of(ClientModelUtil.getModelPropertySegment(responseType, xmsPageable.getItemName())); } } @@ -212,8 +210,7 @@ private static List getPageableNextLink(XmsPageable xmsPag return result; } else { // m4 - return Collections - .singletonList(ClientModelUtil.getModelPropertySegment(responseType, xmsPageable.getNextLinkName())); + return List.of(ClientModelUtil.getModelPropertySegment(responseType, xmsPageable.getNextLinkName())); } } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/PomMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/PomMapper.java index 2d4a37f1e36..a0ea8950328 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/PomMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/PomMapper.java @@ -7,7 +7,7 @@ import com.microsoft.typespec.http.client.generator.core.model.clientmodel.Pom; import com.microsoft.typespec.http.client.generator.core.model.projectmodel.Project; import java.util.ArrayList; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -40,7 +40,7 @@ private Pom createAzurePom(Project project) { pom.setServiceName(project.getServiceName()); pom.setServiceDescription(project.getServiceDescriptionForPom()); - Set addedDependencyPrefixes = new HashSet<>(); + Set addedDependencyPrefixes = new LinkedHashSet<>(); List dependencyIdentifiers = new ArrayList<>(); addDependencyIdentifier(dependencyIdentifiers, addedDependencyPrefixes, Project.Dependency.AZURE_CORE, false); addDependencyIdentifier(dependencyIdentifiers, addedDependencyPrefixes, @@ -80,7 +80,7 @@ private Pom createGenericPom(Project project) { pom.setServiceName(project.getServiceName()); pom.setServiceDescription(project.getServiceDescriptionForPom()); - Set addedDependencyPrefixes = new HashSet<>(); + Set addedDependencyPrefixes = new LinkedHashSet<>(); List dependencyIdentifiers = new ArrayList<>(); // for generic pom, stream style is always true addDependencyIdentifier(dependencyIdentifiers, addedDependencyPrefixes, Project.Dependency.CLIENTCORE, false); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/PrimitiveMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/PrimitiveMapper.java index 3a113009a03..dff9c07d9f4 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/PrimitiveMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/PrimitiveMapper.java @@ -116,6 +116,12 @@ protected IType createPrimitiveType(PrimitiveSchema primaryType) { case SECONDS_NUMBER: return PrimitiveType.DURATION_DOUBLE; + + case MILLISECONDS_INTEGER: + return PrimitiveType.DURATION_MILLISECONDS_LONG; + + case MILLISECONDS_NUMBER: + return PrimitiveType.DURATION_MILLISECONDS_DOUBLE; } } return durationType; diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyMethodMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyMethodMapper.java index 980bc3fc3a4..4fe7a8f7351 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyMethodMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyMethodMapper.java @@ -23,7 +23,6 @@ import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -42,7 +41,9 @@ public class ProxyMethodMapper implements IMapper RETURN_VALUE_WIRE_TYPE_OPTIONS = Arrays.asList(ClassType.BASE_64_URL, ClassType.DATE_TIME_RFC_1123, PrimitiveType.DURATION_LONG, PrimitiveType.DURATION_DOUBLE, ClassType.DURATION_LONG, ClassType.DURATION_DOUBLE, - PrimitiveType.UNIX_TIME_LONG, ClassType.UNIX_TIME_LONG, ClassType.UNIX_TIME_DATE_TIME); + PrimitiveType.DURATION_MILLISECONDS_LONG, PrimitiveType.DURATION_MILLISECONDS_DOUBLE, + ClassType.DURATION_MILLISECONDS_LONG, ClassType.DURATION_MILLISECONDS_DOUBLE, PrimitiveType.UNIX_TIME_LONG, + ClassType.UNIX_TIME_LONG, ClassType.UNIX_TIME_DATE_TIME); private static final ProxyMethodMapper INSTANCE = new ProxyMethodMapper(); private final Logger logger = new PluginLogger(Javagen.getPluginInstance(), ProxyMethodMapper.class); @@ -210,7 +211,7 @@ protected void buildUnexpectedResponseExceptionFields(ProxyMethod.Builder builde expectedStatusCodes.forEach(mergedExceptionTypeMapping::remove); // Convert the exception type mapping into what code generation uses elsewhere. - final Map> processedMapping = new HashMap<>(); + final Map> processedMapping = new LinkedHashMap<>(); for (Map.Entry kvp : mergedExceptionTypeMapping.entrySet()) { processedMapping.compute(kvp.getValue(), (errorType, statuses) -> { if (statuses == null) { @@ -524,7 +525,7 @@ private static final class SwaggerExceptionDefinitions { private SwaggerExceptionDefinitions() { defaultExceptionType = null; - exceptionTypeMapping = new HashMap<>(); + exceptionTypeMapping = new LinkedHashMap<>(); } ClassType getDefaultExceptionType() { diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyMethodParameterProcessor.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyMethodParameterProcessor.java index 83d560f2312..c4857f91b92 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyMethodParameterProcessor.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyMethodParameterProcessor.java @@ -15,7 +15,6 @@ import io.clientcore.core.http.models.HttpMethod; import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Locale; import java.util.stream.Collectors; @@ -193,7 +192,7 @@ private static boolean isApiVersionParameter(Parameter parameter) { */ private static List getSpecialHeaderParameters(Operation operation) { if (!supportsRepeatabilityRequest(operation)) { - return Collections.emptyList(); + return List.of(); } final List parameters = new ArrayList<>(); parameters.add(ProxyMethodParameter.REPEATABILITY_REQUEST_ID_PARAMETER); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/SealedChoiceMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/SealedChoiceMapper.java index 63a5342a9de..a299c0e51f0 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/SealedChoiceMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/SealedChoiceMapper.java @@ -4,6 +4,7 @@ package com.microsoft.typespec.http.client.generator.core.mapper; import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.SealedChoiceSchema; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.EnumType; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.IType; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -41,6 +42,11 @@ protected boolean useCodeModelNameForEnumMember() { } private IType createSealedChoiceType(SealedChoiceSchema enumType) { + EnumType result = MapperUtils.mapExternalModel(enumType, false); + if (result != null) { + return result; + } + return MapperUtils.createEnumType(enumType, false, useCodeModelNameForEnumMember()); } } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ServiceClientMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ServiceClientMapper.java index aa63f4edccd..f201560cfa1 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ServiceClientMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ServiceClientMapper.java @@ -3,17 +3,38 @@ package com.microsoft.typespec.http.client.generator.core.mapper; -import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.*; import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Client; +import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.CodeModel; +import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.ConstantSchema; +import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Operation; +import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.OperationGroup; +import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Parameter; +import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.RequestParameterLocation; +import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Scheme; import com.microsoft.typespec.http.client.generator.core.extension.plugin.JavaSettings; -import com.microsoft.typespec.http.client.generator.core.model.clientmodel.*; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ClassType; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ClientMethod; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ClientMethodParameter; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.Constructor; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.IType; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.MethodGroupClient; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ParameterSynthesizedOrigin; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.Proxy; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ProxyMethod; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.SecurityInfo; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ServiceClient; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ServiceClientProperty; import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaVisibility; import com.microsoft.typespec.http.client.generator.core.util.ClientModelUtil; import com.microsoft.typespec.http.client.generator.core.util.CodeNamer; import com.microsoft.typespec.http.client.generator.core.util.MethodUtil; import com.microsoft.typespec.http.client.generator.core.util.SchemaUtil; import io.clientcore.core.utils.CoreUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Optional; +import java.util.Set; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -55,7 +76,7 @@ public ServiceClient map(CodeModel codeModel) { if (!codeModelRestAPIMethods.isEmpty()) { proxy = processClientOperations(builder, codeModelRestAPIMethods, serviceClientInterfaceName); } else { - builder.clientMethods(Collections.emptyList()); + builder.clientMethods(List.of()); } List properties = processClientProperties(codeModel, @@ -109,7 +130,7 @@ protected Proxy processClientOperations(ServiceClient.Builder builder, List()) .build(); - serviceClientConstructors.add(new Constructor(Arrays.asList(httpPipelineParameter, - serializerAdapterParameter, defaultPollIntervalParameter, azureEnvironmentParameter))); + serviceClientConstructors.add(new Constructor(List.of(httpPipelineParameter, serializerAdapterParameter, + defaultPollIntervalParameter, azureEnvironmentParameter))); builder.tokenCredentialParameter(tokenCredentialParameter) .httpPipelineParameter(httpPipelineParameter) .serializerAdapterParameter(serializerAdapterParameter) @@ -467,10 +488,9 @@ protected void processParametersAndConstructors(ServiceClient.Builder builder, C .azureEnvironmentParameter(azureEnvironmentParameter) .constructors(serviceClientConstructors); } else { - serviceClientConstructors.add(new Constructor(new ArrayList<>())); - serviceClientConstructors.add(new Constructor(Collections.singletonList(httpPipelineParameter))); - serviceClientConstructors - .add(new Constructor(Arrays.asList(httpPipelineParameter, serializerAdapterParameter))); + serviceClientConstructors.add(new Constructor(List.of())); + serviceClientConstructors.add(new Constructor(List.of(httpPipelineParameter))); + serviceClientConstructors.add(new Constructor(List.of(httpPipelineParameter, serializerAdapterParameter))); builder.tokenCredentialParameter(tokenCredentialParameter) .httpPipelineParameter(httpPipelineParameter) .serializerAdapterParameter(serializerAdapterParameter) diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/UnionModelMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/UnionModelMapper.java index c100ca54e53..89ae79e8a5e 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/UnionModelMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/UnionModelMapper.java @@ -15,8 +15,7 @@ import com.microsoft.typespec.http.client.generator.core.util.SchemaUtil; import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -34,7 +33,7 @@ public static UnionModelMapper getInstance() { @Override public List map(OrSchema type) { - return Collections.emptyList(); + return List.of(); } private List createSubClasses(OrSchema type) { @@ -60,7 +59,7 @@ private List createSubClasses(OrSchema type) { processDescription(builder, subtype); // import - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); imports.add(baseModelType.getFullName()); builder.imports(new ArrayList<>(imports)); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/UniqueProxyMethodNameGenerator.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/UniqueProxyMethodNameGenerator.java index 4e5610251cd..25b5669f283 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/UniqueProxyMethodNameGenerator.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/UniqueProxyMethodNameGenerator.java @@ -7,7 +7,7 @@ import com.microsoft.typespec.http.client.generator.core.util.CodeNamer; import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -19,12 +19,9 @@ * "application/json" and another takes "text/plain", which both are String type i.e., API with multiple content-types. */ public final class UniqueProxyMethodNameGenerator { - private static final Set EXCEPT; - static { - EXCEPT = new HashSet<>(); - EXCEPT.add(ProxyMethodParameter.CONTEXT_PARAMETER); - EXCEPT.add(ProxyMethodParameter.REQUEST_OPTIONS_PARAMETER); - } + private static final Set EXCEPT + = Set.of(ProxyMethodParameter.CONTEXT_PARAMETER, ProxyMethodParameter.REQUEST_OPTIONS_PARAMETER); + private final String operationName; private final Logger logger; // The set of list where each list is the method signature that were seen so far. @@ -33,7 +30,7 @@ public final class UniqueProxyMethodNameGenerator { UniqueProxyMethodNameGenerator(String operationName, Logger logger) { this.operationName = operationName; this.logger = logger; - this.methodSignatures = new HashSet<>(); + this.methodSignatures = new LinkedHashSet<>(); } /** diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/azurevnext/AzureVNextPomMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/azurevnext/AzureVNextPomMapper.java index 76b4262a5e9..f6309fb1448 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/azurevnext/AzureVNextPomMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/azurevnext/AzureVNextPomMapper.java @@ -7,7 +7,7 @@ import com.microsoft.typespec.http.client.generator.core.model.clientmodel.Pom; import com.microsoft.typespec.http.client.generator.core.model.projectmodel.Project; import java.util.ArrayList; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -35,7 +35,7 @@ private Pom createPom(Project project) { pom.setServiceName(project.getServiceName()); pom.setServiceDescription(project.getServiceDescriptionForPom()); - Set addedDependencyPrefixes = new HashSet<>(); + Set addedDependencyPrefixes = new LinkedHashSet<>(); List dependencyIdentifiers = new ArrayList<>(); addDependencyIdentifier(dependencyIdentifiers, addedDependencyPrefixes, Project.Dependency.CLIENTCORE, false); addDependencyIdentifier(dependencyIdentifiers, addedDependencyPrefixes, Project.Dependency.AZURE_CORE_V2, diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/clientcore/ClientCorePomMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/clientcore/ClientCorePomMapper.java index 923c09bd9c8..3dd66a382ec 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/clientcore/ClientCorePomMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/clientcore/ClientCorePomMapper.java @@ -7,7 +7,7 @@ import com.microsoft.typespec.http.client.generator.core.model.clientmodel.Pom; import com.microsoft.typespec.http.client.generator.core.model.projectmodel.Project; import java.util.ArrayList; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -36,7 +36,7 @@ private Pom createPom(Project project) { pom.setServiceName(project.getServiceName()); pom.setServiceDescription(project.getServiceDescriptionForPom()); - Set addedDependencyPrefixes = new HashSet<>(); + Set addedDependencyPrefixes = new LinkedHashSet<>(); List dependencyIdentifiers = new ArrayList<>(); addDependencyIdentifier(dependencyIdentifiers, addedDependencyPrefixes, Project.Dependency.CLIENTCORE, false); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/clientcore/ClientCoreProxyMethodMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/clientcore/ClientCoreProxyMethodMapper.java index 24ac1710f0b..121e59d7e8a 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/clientcore/ClientCoreProxyMethodMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/clientcore/ClientCoreProxyMethodMapper.java @@ -32,9 +32,8 @@ import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; import java.util.Map; @@ -61,7 +60,9 @@ public static ClientCoreProxyMethodMapper getInstance() { private static final List RETURN_VALUE_WIRE_TYPE_OPTIONS = Arrays.asList(ClassType.BASE_64_URL, ClassType.DATE_TIME_RFC_1123, PrimitiveType.DURATION_LONG, PrimitiveType.DURATION_DOUBLE, ClassType.DURATION_LONG, ClassType.DURATION_DOUBLE, - PrimitiveType.UNIX_TIME_LONG, ClassType.UNIX_TIME_LONG, ClassType.UNIX_TIME_DATE_TIME); + PrimitiveType.DURATION_MILLISECONDS_LONG, PrimitiveType.DURATION_MILLISECONDS_DOUBLE, + ClassType.DURATION_MILLISECONDS_LONG, ClassType.DURATION_MILLISECONDS_DOUBLE, PrimitiveType.UNIX_TIME_LONG, + ClassType.UNIX_TIME_LONG, ClassType.UNIX_TIME_DATE_TIME); private final Map> parsed = new ConcurrentHashMap<>(); @@ -127,7 +128,7 @@ public Map> map(Operation operation) { List requests = operation.getRequests(); // Used to deduplicate method with same signature. // E.g. one request takes "application/json" and another takes "text/plain", which both are String type - Set> methodSignatures = new HashSet<>(); + Set> methodSignatures = new LinkedHashSet<>(); for (Request request : requests) { if (parsed.containsKey(request)) { @@ -457,7 +458,7 @@ protected void buildUnexpectedResponseExceptionTypes(ProxyMethod.Builder builder expectedStatusCodes.forEach(mergedExceptionTypeMapping::remove); // Convert the exception type mapping into what code generation uses elsewhere. - Map> processedMapping = new HashMap<>(); + Map> processedMapping = new LinkedHashMap<>(); for (Map.Entry kvp : mergedExceptionTypeMapping.entrySet()) { processedMapping.compute(kvp.getValue(), (errorType, statuses) -> { if (statuses == null) { @@ -480,7 +481,7 @@ private SwaggerExceptionDefinitions getSwaggerExceptionDefinitions(Operation ope SwaggerExceptionDefinitions exceptionDefinitions = new SwaggerExceptionDefinitions(); ClassType swaggerDefaultExceptionType = null; - Map swaggerExceptionTypeMap = new HashMap<>(); + Map swaggerExceptionTypeMap = new LinkedHashMap<>(); if (settings.isDataPlaneClient() && settings.isAzureV1()) { // LLC does not use model, hence exception from swagger @@ -630,7 +631,7 @@ private static ClassType getDefaultHttpExceptionTypeFromSettings(JavaSettings se private Map getHttpStatusToExceptionTypeMappingFromSettings(JavaSettings settings) { // Use a status code to error type mapping initial so that the custom mapping can override the default mapping, // if the default mapping is being used. - Map exceptionMapping = new HashMap<>(); + Map exceptionMapping = new LinkedHashMap<>(); if (settings.isUseDefaultHttpStatusCodeToExceptionTypeMapping()) { exceptionMapping.putAll(getDefaultHttpStatusCodeToExceptionTypeMapping()); @@ -662,12 +663,8 @@ private static ClassType createExceptionTypeFromFullyQualifiedClass(String fully * @return The default HTTP status code to exception type mapping. */ protected Map getDefaultHttpStatusCodeToExceptionTypeMapping() { - Map defaultMapping = new HashMap<>(); - defaultMapping.put(401, ClassType.CLIENT_AUTHENTICATION_EXCEPTION); - defaultMapping.put(404, ClassType.RESOURCE_NOT_FOUND_EXCEPTION); - defaultMapping.put(409, ClassType.RESOURCE_MODIFIED_EXCEPTION); - - return defaultMapping; + return Map.of(401, ClassType.CLIENT_AUTHENTICATION_EXCEPTION, 404, ClassType.RESOURCE_NOT_FOUND_EXCEPTION, 409, + ClassType.RESOURCE_MODIFIED_EXCEPTION); } /** diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/AsyncSyncClient.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/AsyncSyncClient.java index 98cc8ddfedb..2c0158c119e 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/AsyncSyncClient.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/AsyncSyncClient.java @@ -3,7 +3,6 @@ package com.microsoft.typespec.http.client.generator.core.model.clientmodel; -import java.util.Collections; import java.util.List; import java.util.Set; @@ -125,7 +124,7 @@ public static class Builder { private ServiceClient serviceClient; - private List convenienceMethods = Collections.emptyList(); + private List convenienceMethods = List.of(); private String crossLanguageDefinitionId; /** diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClassType.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClassType.java index c31b0666683..a70f245bfda 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClassType.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClassType.java @@ -505,6 +505,11 @@ private static Builder withVNextReplacementBuilder(String azureClass, String azu public static final ClassType DURATION_LONG = new ClassType.Builder(false).prototypeAsLong().build(); // JSON type is NUMERIC, client type is Duration public static final ClassType DURATION_DOUBLE = new ClassType.Builder(false).prototypeAsDouble().build(); + // JSON type is NUMERIC (milliseconds), client type is Duration + public static final ClassType DURATION_MILLISECONDS_LONG = new ClassType.Builder(false).prototypeAsLong().build(); + // JSON type is NUMERIC (milliseconds), client type is Duration + public static final ClassType DURATION_MILLISECONDS_DOUBLE + = new ClassType.Builder(false).prototypeAsDouble().build(); public static final ClassType URL = new Builder(false) .defaultValueExpressionConverter(defaultValueExpression -> "new URL(\"" + defaultValueExpression + "\")") @@ -696,6 +701,10 @@ public final IType getClientType() { clientType = ClassType.DURATION; } else if (this == ClassType.DURATION_DOUBLE) { clientType = ClassType.DURATION; + } else if (this == ClassType.DURATION_MILLISECONDS_LONG) { + clientType = ClassType.DURATION; + } else if (this == ClassType.DURATION_MILLISECONDS_DOUBLE) { + clientType = ClassType.DURATION; } return clientType; } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/Client.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/Client.java index 486f4a508c3..7fad582249e 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/Client.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/Client.java @@ -3,7 +3,6 @@ package com.microsoft.typespec.http.client.generator.core.model.clientmodel; -import java.util.Collections; import java.util.List; /** @@ -15,48 +14,48 @@ public class Client { /** * The name of this service client. */ - private String clientName; + private final String clientName; /** * The description of this service. */ - private String clientDescription; + private final String clientDescription; /** * Get the enum types that are used by this service. */ - private List enums; + private final List enums; /** * Get the exception types that are used by this service. */ - private List exceptions; + private final List exceptions; /** * Get the XML sequence wrappers that are used by this service. */ - private List xmlSequenceWrappers; + private final List xmlSequenceWrappers; /** * Get the response models which contain the response status code, headers and body for each service method. */ - private List responseModels; + private final List responseModels; /** * Get the model types that are used by this service. */ - private List models; + private final List models; /** * Get the package infos. */ - private List packageInfos; + private final List packageInfos; /** * Get the manager for this service. */ - private Manager manager; + private final Manager manager; /** * The serviceClient for this service. */ - private ServiceClient serviceClient; - private List serviceClients; + private final ServiceClient serviceClient; + private final List serviceClients; /** * Get the module info. */ - private ModuleInfo moduleInfo; + private final ModuleInfo moduleInfo; private final List syncClients; private final List asyncClients; @@ -218,15 +217,15 @@ public static class Builder { private List packageInfos; private Manager manager; private ServiceClient serviceClient; - private List serviceClients = Collections.emptyList(); + private List serviceClients = List.of(); private ModuleInfo moduleInfo; - private List syncClients = Collections.emptyList(); - private List asyncClients = Collections.emptyList(); - private List clientBuilders = Collections.emptyList(); - private List protocolExamples = Collections.emptyList(); - private List liveTests = Collections.emptyList(); - private List unionModels = Collections.emptyList(); - private List clientMethodExamples = Collections.emptyList(); + private List syncClients = List.of(); + private List asyncClients = List.of(); + private List clientBuilders = List.of(); + private List protocolExamples = List.of(); + private List liveTests = List.of(); + private List unionModels = List.of(); + private List clientMethodExamples = List.of(); private GraalVmConfig graalVmConfig; private String crossLanguageDefinitionId; diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientBuilderTrait.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientBuilderTrait.java index a775ae0c70f..a7969283e7f 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientBuilderTrait.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientBuilderTrait.java @@ -6,7 +6,7 @@ import com.microsoft.typespec.http.client.generator.core.extension.plugin.JavaSettings; import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaBlock; import java.util.ArrayList; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.function.Consumer; @@ -324,7 +324,7 @@ public static ClientBuilderTrait getEndpointTrait(ServiceClientProperty property private static ClientBuilderTrait createTokenCredentialTrait() { ClientBuilderTrait tokenCredentialTrait = new ClientBuilderTrait(); tokenCredentialTrait.setTraitInterfaceName(ClassType.TOKEN_CREDENTIAL_TRAIT.getName()); - Set importPackages = new HashSet<>(); + Set importPackages = new LinkedHashSet<>(); ClassType.TOKEN_CREDENTIAL_TRAIT.addImportsTo(importPackages, false); ClassType.TOKEN_CREDENTIAL.addImportsTo(importPackages, false); ClassType.OAUTH_TOKEN_REQUEST_CONTEXT.addImportsTo(importPackages, false); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientMethod.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientMethod.java index 292a655b7c7..b4f91f90b32 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientMethod.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientMethod.java @@ -24,7 +24,7 @@ * A ClientMethod that exists on a ServiceClient or MethodGroupClient that eventually will call a ProxyMethod. */ public class ClientMethod { - private static final List KNOWN_POLLING_STRATEGIES = Arrays.asList("DefaultPollingStrategy", + private static final List KNOWN_POLLING_STRATEGIES = List.of("DefaultPollingStrategy", "ChainedPollingStrategy", "OperationResourcePollingStrategy", "LocationPollingStrategy", "StatusCheckPollingStrategy", "SyncDefaultPollingStrategy", "SyncChainedPollingStrategy", "SyncOperationResourcePollingStrategy", "SyncLocationPollingStrategy", "SyncStatusCheckPollingStrategy"); @@ -373,7 +373,7 @@ public ExternalDocumentation getMethodDocumentation() { } public final List getProxyMethodArguments(JavaSettings settings) { - List restAPIMethodArguments = getProxyMethod().getParameters().stream().map(parameter -> { + return getProxyMethod().getParameters().stream().map(parameter -> { String parameterName = parameter.getParameterReference(); IType parameterWireType = parameter.getWireType(); if (parameter.isNullable()) { @@ -382,13 +382,8 @@ public final List getProxyMethodArguments(JavaSettings settings) { IType parameterClientType = parameter.getClientType(); if (parameterClientType != ClassType.BASE_64_URL - && parameter.getRequestParameterLocation() != RequestParameterLocation.BODY /* - * && parameter. - * getRequestParameterLocation - * () != - * RequestParameterLocation. - * FormData - */ + // && parameter.getRequestParameterLocation() != RequestParameterLocation.FormData + && parameter.getRequestParameterLocation() != RequestParameterLocation.BODY && (parameterClientType instanceof ArrayType || parameterClientType instanceof IterableType)) { parameterWireType = ClassType.STRING; } @@ -405,7 +400,6 @@ public final List getProxyMethodArguments(JavaSettings settings) { } return result; }).collect(Collectors.toList()); - return restAPIMethodArguments; } public JavaVisibility getMethodVisibility() { diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientMethodParameter.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientMethodParameter.java index 1c82d665943..b6b397abb91 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientMethodParameter.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientMethodParameter.java @@ -4,7 +4,6 @@ package com.microsoft.typespec.http.client.generator.core.model.clientmodel; import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.RequestParameterLocation; -import java.util.Collections; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -19,7 +18,7 @@ public class ClientMethodParameter extends MethodParameter { .wireType(ClassType.CONTEXT) .name("context") .requestParameterLocation(RequestParameterLocation.NONE) - .annotations(Collections.emptyList()) + .annotations(List.of()) .constant(false) .defaultValue(null) .fromClient(false) @@ -32,7 +31,7 @@ public class ClientMethodParameter extends MethodParameter { .wireType(ClassType.HTTP_REQUEST) .name("httpRequest") .requestParameterLocation(RequestParameterLocation.NONE) - .annotations(Collections.emptyList()) + .annotations(List.of()) .constant(false) .defaultValue(null) .fromClient(false) @@ -48,7 +47,7 @@ public class ClientMethodParameter extends MethodParameter { .constant(false) .required(false) .fromClient(false) - .annotations(Collections.emptyList()) + .annotations(List.of()) .build(); public static final ClientMethodParameter REQUEST_CONTEXT_PARAMETER = new ClientMethodParameter.Builder() @@ -59,7 +58,7 @@ public class ClientMethodParameter extends MethodParameter { .constant(false) .required(false) .fromClient(false) - .annotations(Collections.emptyList()) + .annotations(List.of()) .build(); /** diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientModel.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientModel.java index 838a0648cc8..e9445c4368d 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientModel.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientModel.java @@ -7,7 +7,6 @@ import com.microsoft.typespec.http.client.generator.core.util.ClientModelUtil; import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Set; @@ -396,7 +395,7 @@ public IType getType() { * @return The property references for this model. */ public List getPropertyReferences() { - return propertyReferences == null ? Collections.emptyList() : propertyReferences; + return propertyReferences == null ? List.of() : propertyReferences; } /** @@ -626,7 +625,7 @@ private static boolean checkChildrenModelsPackage(ClientModel model, String pack public static class Builder { private String packageName; private String name; - private List imports = Collections.emptyList(); + private List imports = List.of(); private String description; private boolean isPolymorphic; private ClientModelProperty polymorphicDiscriminator; @@ -634,7 +633,7 @@ public static class Builder { private String serializedName; private boolean needsFlatten = false; private String parentModelName; - private List derivedModels = Collections.emptyList(); + private List derivedModels = List.of(); private String xmlName; private List properties; private String xmlNamespace; @@ -644,7 +643,7 @@ public static class Builder { private ImplementationDetails implementationDetails; private boolean usedInXml; private String crossLanguageDefinitionId; - private Set serializationFormats = Collections.emptySet(); + private Set serializationFormats = Set.of(); /** * Sets the package that this model class belongs to. @@ -867,7 +866,7 @@ public Builder crossLanguageDefinitionId(String crossLanguageDefinitionId) { * @return the Builder itself */ public Builder serializationFormats(Set serializationFormats) { - this.serializationFormats = serializationFormats == null ? Collections.emptySet() : serializationFormats; + this.serializationFormats = serializationFormats == null ? Set.of() : serializationFormats; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientModels.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientModels.java index aa1d7911c67..baf26a88bd4 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientModels.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientModels.java @@ -5,7 +5,7 @@ import com.microsoft.typespec.http.client.generator.core.util.ClientModelUtil; import java.util.ArrayList; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -14,7 +14,7 @@ */ public class ClientModels { private static final ClientModels INSTANCE = new ClientModels(); - private final Map nameMap = new HashMap<>(); + private final Map nameMap = new LinkedHashMap<>(); // private final Map> derivedTypesMap = new HashMap>(); private ClientModels() { diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/GraalVmConfig.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/GraalVmConfig.java index 43dad78515c..e952627ed0a 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/GraalVmConfig.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/GraalVmConfig.java @@ -75,11 +75,10 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { } private final Resource resources; - private final List bundles = Collections.emptyList(); + private final List bundles = List.of(); private ResourceConfig(String artifactId) { - this.resources - = new Resource(Collections.singletonList(new Pattern("\\Q" + artifactId + ".properties" + "\\E"))); + this.resources = new Resource(List.of(new Pattern("\\Q" + artifactId + ".properties" + "\\E"))); } @Override @@ -97,7 +96,7 @@ public boolean generateResourceConfig() { // TODO: Template public String toProxyConfigJson() { - List> result = proxies.stream().map(Collections::singletonList).collect(Collectors.toList()); + List> result = proxies.stream().map(List::of).collect(Collectors.toList()); return TemplateUtil.prettyPrintToJson(result); } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ImplementationDetails.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ImplementationDetails.java index 7cfe9c56cbf..4132fb1f632 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ImplementationDetails.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ImplementationDetails.java @@ -6,7 +6,7 @@ import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.SchemaContext; import com.microsoft.typespec.http.client.generator.core.mapper.CollectionUtil; import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; @@ -261,7 +261,7 @@ public Builder newBuilder() { */ public static final class Builder { private boolean implementationOnly = false; - private Set usages = new HashSet<>(); + private Set usages = new LinkedHashSet<>(); private String comment; /** diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ModelProperty.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ModelProperty.java index 62b8ac823fb..57d8c6b607d 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ModelProperty.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ModelProperty.java @@ -4,7 +4,6 @@ package com.microsoft.typespec.http.client.generator.core.model.clientmodel; import com.microsoft.typespec.http.client.generator.core.util.ClientModelUtil; -import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.Set; @@ -88,11 +87,9 @@ public String getSerializedName() { public List getSerializedNames() { if (property instanceof ClientModelProperty) { ClientModelProperty clientModelProperty = (ClientModelProperty) property; - if (!clientModelProperty.getNeedsFlatten()) { - return ClientModelUtil.splitFlattenedSerializedName(clientModelProperty.getSerializedName()); - } else { - return Collections.singletonList(clientModelProperty.getSerializedName()); - } + return !clientModelProperty.getNeedsFlatten() + ? ClientModelUtil.splitFlattenedSerializedName(clientModelProperty.getSerializedName()) + : List.of(clientModelProperty.getSerializedName()); } else if (property instanceof ClientModelPropertyReference) { return ((ClientModelPropertyReference) property).getAllProperties() .stream() diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/PrimitiveType.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/PrimitiveType.java index 11bd59c47c2..5aac753da67 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/PrimitiveType.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/PrimitiveType.java @@ -113,6 +113,14 @@ public class PrimitiveType implements IType, ConvertToJsonTypeTrait, ConvertFrom public static final PrimitiveType DURATION_DOUBLE = new Builder().prototypeAsDouble().nullableType(ClassType.DURATION_DOUBLE).build(); + // JSON type is NUMERIC (milliseconds), client type is Duration + public static final PrimitiveType DURATION_MILLISECONDS_LONG + = new Builder().prototypeAsLong().nullableType(ClassType.DURATION_MILLISECONDS_LONG).build(); + + // JSON type is NUMERIC (milliseconds), client type is Duration + public static final PrimitiveType DURATION_MILLISECONDS_DOUBLE + = new Builder().prototypeAsDouble().nullableType(ClassType.DURATION_MILLISECONDS_DOUBLE).build(); + /** * The name of this type. */ @@ -224,6 +232,10 @@ public final IType getClientType() { clientType = ClassType.DURATION; } else if (this == PrimitiveType.DURATION_DOUBLE) { clientType = ClassType.DURATION; + } else if (this == PrimitiveType.DURATION_MILLISECONDS_LONG) { + clientType = ClassType.DURATION; + } else if (this == PrimitiveType.DURATION_MILLISECONDS_DOUBLE) { + clientType = ClassType.DURATION; } return clientType; } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/SecurityInfo.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/SecurityInfo.java index fdf000f8a39..df98235e364 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/SecurityInfo.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/SecurityInfo.java @@ -6,15 +6,15 @@ import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.OAuth2Flow; import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Scheme; import java.util.ArrayList; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; public class SecurityInfo { - private Set securityTypes = new HashSet<>(); + private Set securityTypes = new LinkedHashSet<>(); - private Set scopes = new HashSet<>(); + private Set scopes = new LinkedHashSet<>(); private List flows = new ArrayList<>(); private String headerName; diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ServiceClient.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ServiceClient.java index 1e77a1ed081..35adc7f93a1 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ServiceClient.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ServiceClient.java @@ -5,7 +5,6 @@ import com.microsoft.typespec.http.client.generator.core.extension.plugin.JavaSettings; import com.microsoft.typespec.http.client.generator.core.util.ClientModelUtil; -import java.util.Collections; import java.util.List; import java.util.Set; @@ -392,7 +391,7 @@ public static class Builder { protected SecurityInfo securityInfo; protected String baseUrl; protected PipelinePolicyDetails pipelinePolicyDetails; - protected List clientAccessorMethods = Collections.emptyList(); + protected List clientAccessorMethods = List.of(); private String crossLanguageDefinitionId; /** diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/TypeSpecMetadata.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/TypeSpecMetadata.java index 29848adecb2..4d28725b897 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/TypeSpecMetadata.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/TypeSpecMetadata.java @@ -20,16 +20,16 @@ public final class TypeSpecMetadata implements JsonSerializable apiVersions; private final Map crossLanguageDefinitions; private final List generatedFiles; - public TypeSpecMetadata(String artifactId, String flavor, String apiVersion, + public TypeSpecMetadata(String artifactId, String flavor, Map apiVersions, Map crossLanguageDefinitions, List generatedFiles) { this.artifactId = artifactId; this.flavor = flavor; - this.apiVersion = apiVersion; + this.apiVersions = apiVersions; this.crossLanguageDefinitions = crossLanguageDefinitions; this.generatedFiles = generatedFiles; } @@ -42,8 +42,8 @@ public String getFlavor() { return flavor; } - public String getApiVersion() { - return apiVersion; + public Map getApiVersions() { + return apiVersions; } public Map getCrossLanguageDefinitions() { @@ -63,9 +63,15 @@ public List getGeneratedFiles() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("flavor", flavor); - jsonWriter.writeStringField("apiVersion", apiVersion); + jsonWriter.writeMapField("apiVersions", apiVersions, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + writer.writeString(element); + } + }); if (!CoreUtils.isNullOrEmpty(crossLanguageDefinitions)) { - jsonWriter.writeMapField("crossLanguageDefinitions", this.crossLanguageDefinitions, (writer, element) -> { + jsonWriter.writeMapField("crossLanguageDefinitions", crossLanguageDefinitions, (writer, element) -> { if (element == null) { writer.writeNull(); } else { @@ -74,7 +80,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { }); } if (!CoreUtils.isNullOrEmpty(generatedFiles)) { - jsonWriter.writeArrayField("generatedFiles", this.generatedFiles, JsonWriter::writeString); + jsonWriter.writeArrayField("generatedFiles", generatedFiles, JsonWriter::writeString); } return jsonWriter.writeEndObject(); } @@ -83,7 +89,7 @@ public static TypeSpecMetadata fromJson(JsonReader jsonReader) throws IOExceptio return jsonReader.readObject(reader -> { String artifactId = null; String flavor = null; - String apiVersion = null; + Map apiVersions = null; Map crossLanguageDefinitions = null; List generatedFiles = null; while (reader.nextToken() != JsonToken.END_OBJECT) { @@ -94,8 +100,8 @@ public static TypeSpecMetadata fromJson(JsonReader jsonReader) throws IOExceptio artifactId = reader.getString(); } else if ("flavor".equals(fieldName)) { flavor = reader.getString(); - } else if ("apiVersion".equals(fieldName)) { - apiVersion = reader.getString(); + } else if ("apiVersions".equals(fieldName)) { + apiVersions = reader.readMap(JsonReader::getString); } else if ("crossLanguageDefinitions".equals(fieldName)) { crossLanguageDefinitions = reader.readMap(JsonReader::getString); } else if ("generatedFiles".equals(fieldName)) { @@ -104,7 +110,7 @@ public static TypeSpecMetadata fromJson(JsonReader jsonReader) throws IOExceptio reader.skipChildren(); } } - return new TypeSpecMetadata(artifactId, flavor, apiVersion, crossLanguageDefinitions, generatedFiles); + return new TypeSpecMetadata(artifactId, flavor, apiVersions, crossLanguageDefinitions, generatedFiles); }); } } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/UnionModel.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/UnionModel.java index 834bde9d457..ede13c20d35 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/UnionModel.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/UnionModel.java @@ -3,7 +3,6 @@ package com.microsoft.typespec.http.client.generator.core.model.clientmodel; -import java.util.Collections; import java.util.List; import java.util.Set; @@ -91,10 +90,10 @@ public ImplementationDetails getImplementationDetails() { public static class Builder { private String packageName; private String name; - private List imports = Collections.emptyList(); + private List imports = List.of(); private String description; private String parentModelName; - private List properties = Collections.emptyList(); + private List properties = List.of(); private ImplementationDetails implementationDetails; /** diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/UnionModels.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/UnionModels.java index d8e45fb3eca..12ced8c97b8 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/UnionModels.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/UnionModels.java @@ -3,14 +3,14 @@ package com.microsoft.typespec.http.client.generator.core.model.clientmodel; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; public class UnionModels { private static final UnionModels INSTANCE = new UnionModels(); - private final Map> nameMap = new HashMap<>(); + private final Map> nameMap = new LinkedHashMap<>(); private UnionModels() { } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/Versioning.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/Versioning.java index 782a9b14817..1ea2d353b83 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/Versioning.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/Versioning.java @@ -3,7 +3,6 @@ package com.microsoft.typespec.http.client.generator.core.model.clientmodel; -import java.util.Collections; import java.util.List; public class Versioning { @@ -19,7 +18,7 @@ public List getAdded() { } public static class Builder { - private List added = Collections.emptyList(); + private List added = List.of(); public Builder() { } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/XmlSequenceWrapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/XmlSequenceWrapper.java index 66de8ff9da4..fc42810b125 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/XmlSequenceWrapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/XmlSequenceWrapper.java @@ -7,8 +7,8 @@ import com.microsoft.typespec.http.client.generator.core.extension.plugin.JavaSettings; import com.microsoft.typespec.http.client.generator.core.mapper.Mappers; import com.microsoft.typespec.http.client.generator.core.util.CodeNamer; -import java.util.Arrays; import java.util.HashSet; +import java.util.List; import java.util.Set; /** @@ -59,11 +59,11 @@ public XmlSequenceWrapper(String modelTypeName, ArraySchema arraySchema, JavaSet } private static Set getXmlSequenceWrapperImports() { - return new HashSet<>(Arrays.asList("com.fasterxml.jackson.annotation.JsonCreator", - "com.fasterxml.jackson.annotation.JsonProperty", - "com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty", - "com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement", - "com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText")); + return new HashSet<>( + List.of("com.fasterxml.jackson.annotation.JsonCreator", "com.fasterxml.jackson.annotation.JsonProperty", + "com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty", + "com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement", + "com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText")); } public final String getPackage() { diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/examplemodel/ClientModelNode.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/examplemodel/ClientModelNode.java index a790c2e34f2..216b09301d4 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/examplemodel/ClientModelNode.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/examplemodel/ClientModelNode.java @@ -6,7 +6,7 @@ import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ClientModel; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.IType; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ModelProperty; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; /** @@ -18,7 +18,7 @@ public class ClientModelNode extends ExampleNode { // modelProperties can contain more properties than in the model, as it includes those properties from the // superclass of the model - private final Map modelProperties = new HashMap<>(); + private final Map modelProperties = new LinkedHashMap<>(); public ClientModelNode(IType clientType, Object objectValue) { super(clientType, objectValue); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaClass.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaClass.java index 7c914fb7adc..49d705ca6be 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaClass.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaClass.java @@ -5,7 +5,6 @@ import io.clientcore.core.utils.CoreUtils; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.function.Consumer; @@ -173,7 +172,7 @@ public final void publicStaticMethod(String methodSignature, Consumer */ public final void staticMethod(JavaVisibility visibility, String methodSignature, Consumer method) { Objects.requireNonNull(visibility, "'visibility' cannot be null."); - method(visibility, Collections.singletonList(JavaModifier.Static), methodSignature, method); + method(visibility, List.of(JavaModifier.Static), methodSignature, method); } public final void interfaceBlock(JavaVisibility visibility, String interfaceSignature, @@ -194,8 +193,7 @@ public final void privateStaticFinalClass(String classSignature, Consumer classBlock) { addExpectedNewLine(); - contents.classBlock(visibility, Arrays.asList(JavaModifier.Static, JavaModifier.Final), classSignature, - classBlock); + contents.classBlock(visibility, List.of(JavaModifier.Static, JavaModifier.Final), classSignature, classBlock); addNewLine = true; } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaEnum.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaEnum.java index 3fc6fd15b42..9a145dd3fc3 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaEnum.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaEnum.java @@ -5,7 +5,6 @@ import com.microsoft.typespec.http.client.generator.core.model.clientmodel.IType; import io.clientcore.core.utils.CoreUtils; -import java.util.Collections; import java.util.List; import java.util.function.Consumer; @@ -93,7 +92,7 @@ public final void publicMethod(String methodSignature, Consumer metho } public final void publicStaticMethod(String methodSignature, Consumer method) { - method(JavaVisibility.Public, Collections.singletonList(JavaModifier.Static), methodSignature, method); + method(JavaVisibility.Public, List.of(JavaModifier.Static), methodSignature, method); } public final void javadocComment(String description) { diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaFile.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaFile.java index 672cc79c3a9..6cc200f6bcb 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaFile.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaFile.java @@ -4,8 +4,6 @@ package com.microsoft.typespec.http.client.generator.core.model.javamodel; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Set; import java.util.function.Consumer; @@ -47,7 +45,7 @@ public final void indent(Runnable indentAction) { } public final void publicFinalClass(String classDeclaration, Consumer classAction) { - publicClass(Collections.singletonList(JavaModifier.Final), classDeclaration, classAction); + publicClass(List.of(JavaModifier.Final), classDeclaration, classAction); } public final void publicClass(List modifiers, String classDeclaration, @@ -74,7 +72,7 @@ public final void declarePackage(String packageKeyword) { } public final void declareImport(String... imports) { - declareImport(Arrays.asList(imports)); + declareImport(List.of(imports)); } public final void declareImport(Set imports) { diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaFileContents.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaFileContents.java index 11055e2f2b6..579a85890b4 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaFileContents.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaFileContents.java @@ -5,7 +5,6 @@ import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Set; import java.util.TreeSet; @@ -154,7 +153,7 @@ public void block(String text, Consumer bodyAction) { } public void declareImport(String... imports) { - declareImport(Arrays.asList(imports)); + declareImport(List.of(imports)); } public void declareImport(List imports) { @@ -228,7 +227,7 @@ public void anonymousClass(String anonymousClassDeclaration, String instanceName } public void annotation(String... annotations) { - annotation(Arrays.asList(annotations)); + annotation(List.of(annotations)); } public void annotation(List annotations) { diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaInterface.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaInterface.java index 4915663f769..54012f893d4 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaInterface.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaInterface.java @@ -3,7 +3,6 @@ package com.microsoft.typespec.http.client.generator.core.model.javamodel; -import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.function.Consumer; @@ -55,7 +54,7 @@ public final void annotation(String... annotations) { public final void staticMethod(JavaVisibility visibility, String methodSignature, Consumer method) { Objects.requireNonNull(visibility, "'visibility' cannot be null."); - method(visibility, Collections.singletonList(JavaModifier.Static), methodSignature, method); + method(visibility, List.of(JavaModifier.Static), methodSignature, method); } public final void interfaceBlock(String interfaceName, Consumer interfaceAction) { diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaPackage.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaPackage.java index 5f12acfdac6..d7c6a7d675f 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaPackage.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaPackage.java @@ -43,18 +43,16 @@ import com.microsoft.typespec.http.client.generator.core.util.ClientModelUtil; import com.microsoft.typespec.http.client.generator.core.util.ConstantStringTooLongException; import com.microsoft.typespec.http.client.generator.core.util.PossibleCredentialException; -import io.clientcore.core.utils.CoreUtils; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; import org.slf4j.Logger; public class JavaPackage { @@ -67,7 +65,7 @@ public class JavaPackage { private final JavaFileFactory javaFileFactory; - private final Set filePaths = new HashSet<>(); + private final Set filePaths = new LinkedHashSet<>(); public JavaPackage(NewPlugin host) { this.settings = JavaSettings.getInstance(); @@ -380,34 +378,6 @@ public void addTypeSpecMetadata(TypeSpecMetadata typeSpecMetadata, String suffix } catch (IOException e) { logger.warn("Failed to write metadata file {}", filePath); } - - // TODO(weidxu): remove in future, when "apiview_properties.json" file is not needed - filePath = "src/main/resources/META-INF/" + typeSpecMetadata.getArtifactId() + "_apiview_properties" - + (suffix == null ? "" : "_" + suffix) + ".json"; - if (!CoreUtils.isNullOrEmpty(typeSpecMetadata.getCrossLanguageDefinitions())) { - String flavor = typeSpecMetadata.getFlavor(); - StringBuilder sb - = new StringBuilder("{\n \"flavor\": \"" + flavor + "\", \n \"CrossLanguageDefinitionId\": {\n"); - AtomicBoolean first = new AtomicBoolean(true); - typeSpecMetadata.getCrossLanguageDefinitions().forEach((key, value) -> { - if (first.get()) { - first.set(false); - } else { - sb.append(",\n"); - } - sb.append(" \"").append(key).append("\": "); - if (value == null) { - sb.append("null"); - } else { - sb.append("\"").append(value).append("\""); - } - }); - sb.append("\n }\n}\n"); - - TextFile textFile = new TextFile(filePath, sb.toString()); - this.checkDuplicateFile(textFile.getFilePath()); - textFiles.add(textFile); - } } /** diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/xmlmodel/XmlFileContents.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/xmlmodel/XmlFileContents.java index 89a0c5a2bc5..611d6a97abc 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/xmlmodel/XmlFileContents.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/xmlmodel/XmlFileContents.java @@ -4,7 +4,6 @@ package com.microsoft.typespec.http.client.generator.core.model.xmlmodel; import java.util.ArrayList; -import java.util.Arrays; import java.util.Map; import java.util.function.Consumer; import java.util.stream.Collectors; @@ -28,9 +27,7 @@ public XmlFileContents(String fileContents) { public XmlFileContents(String fileContents, XmlFile.Options options) { if (options != null) { if (options.getIndent() > 0) { - char[] chars = new char[options.getIndent()]; - Arrays.fill(chars, ' '); - singleIndent = String.valueOf(chars); + singleIndent = " ".repeat(options.getIndent()); } } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/partialupdate/util/PartialUpdateHandler.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/partialupdate/util/PartialUpdateHandler.java index 427da7617fd..1754ab3a5c6 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/partialupdate/util/PartialUpdateHandler.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/partialupdate/util/PartialUpdateHandler.java @@ -27,7 +27,7 @@ import java.io.BufferedReader; import java.io.StringReader; import java.util.ArrayList; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -314,7 +314,7 @@ public void accept(VoidVisitor v, A arg) { */ private static void validateGeneratedClassOrInterface(List> generatedFileMembers) { // 1. Verify there is no duplicate methods (methods with same signature are considered duplicate methods) - Set methodSignatureSet = new HashSet<>(); + Set methodSignatureSet = new LinkedHashSet<>(); for (BodyDeclaration generatedMember : generatedFileMembers) { if (generatedMember.isCallableDeclaration()) { if (methodSignatureSet.contains(generatedMember.asCallableDeclaration().getSignature())) { diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/implementation/CodeFormatterUtil.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/implementation/CodeFormatterUtil.java index 4e0422a2573..73df476ceb2 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/implementation/CodeFormatterUtil.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/implementation/CodeFormatterUtil.java @@ -16,7 +16,6 @@ import java.util.AbstractMap; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -95,7 +94,7 @@ private static Map loadEclipseSettings() { CodeFormatterUtil.class.getClassLoader().getResourceAsStream("eclipse-format-azure-sdk-for-java.xml")); NodeList formatterSettingXml = document.getElementsByTagName("setting"); - Map formatterSettings = new HashMap<>(); + Map formatterSettings = new LinkedHashMap<>(); for (int i = 0; i < formatterSettingXml.getLength(); i++) { org.w3c.dom.Node node = formatterSettingXml.item(i); formatterSettings.put(node.getAttributes().getNamedItem("id").getNodeValue(), diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/preprocessor/Preprocessor.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/preprocessor/Preprocessor.java index 2140a7adf40..ad5de79a97e 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/preprocessor/Preprocessor.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/preprocessor/Preprocessor.java @@ -23,9 +23,8 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -144,9 +143,9 @@ public static CodeModel convertOptionalConstantsToEnum(CodeModel codeModel) { Function schemaIsConstantWithChoice = schema -> schema.getValueType() instanceof ChoiceSchema; - Set constantSchemas = new HashSet<>(codeModel.getSchemas().getConstants()); + Set constantSchemas = new LinkedHashSet<>(codeModel.getSchemas().getConstants()); if (!constantSchemas.isEmpty()) { - Map convertedChoiceSchemas = new HashMap<>(); + Map convertedChoiceSchemas = new LinkedHashMap<>(); ClientModelUtil.getAllOperationGroups(codeModel) .stream() .flatMap(og -> og.getOperations().stream()) @@ -238,7 +237,7 @@ private static SealedChoiceSchema convertToChoiceSchema(ConstantSchema constantS ChoiceValue choice = new ChoiceValue(); choice.setValue(constantSchema.getValue().getValue().toString()); choice.setLanguage(constantSchema.getValue().getLanguage()); - sealedChoiceSchema.setChoices(Collections.singletonList(choice)); + sealedChoiceSchema.setChoices(List.of(choice)); return sealedChoiceSchema; } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/preprocessor/tranformer/Transformer.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/preprocessor/tranformer/Transformer.java index cd5d2babdc0..446f05a4524 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/preprocessor/tranformer/Transformer.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/preprocessor/tranformer/Transformer.java @@ -35,10 +35,9 @@ import com.microsoft.typespec.http.client.generator.core.preprocessor.namer.CodeNamer; import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; -import java.util.ListIterator; import java.util.Locale; import java.util.Map; import java.util.Objects; @@ -80,7 +79,7 @@ private void transformSchemas(Schemas schemas) { if (schemas.getGroups() != null) { schemas.getGroups().forEach(group -> { if (group.getUsage() == null) { - group.setUsage(new HashSet<>()); + group.setUsage(new LinkedHashSet<>()); } group.getUsage().add(SchemaContext.OPTIONS_GROUP); }); @@ -249,7 +248,7 @@ private static void markFlattenedSchemas(CodeModel codeModel) { } if (flattenedSchemas == null) { - flattenedSchemas = new HashMap<>(); + flattenedSchemas = new LinkedHashMap<>(); } flattenedSchemas.put(property.getLanguage().getJava().getName(), flattenedSchema); @@ -291,10 +290,10 @@ public int hashCode() { } } - private final Map pagingNextOperationResponseSchemaMap = new HashMap<>(); + private final Map pagingNextOperationResponseSchemaMap = new LinkedHashMap<>(); // Operation -> next page operation - private final Map operationNextPageOperationMap = new HashMap<>(); + private final Map operationNextPageOperationMap = new LinkedHashMap<>(); /** * Adds next page operation for the given operation. @@ -684,12 +683,10 @@ private static void deduplicateParameterNames(Request request) { } // rename if name conflict - Set parameterNames = new HashSet<>(); - ListIterator iter = parameters.listIterator(); - while (iter.hasNext()) { - Parameter parameter = iter.next(); + Set parameterNames = new LinkedHashSet<>(); + for (Parameter parameter : parameters) { if (parameter.getOriginalParameter() == null // skip the parameters resulted from parameter-flattening as - // they are not in proxy method + // they are not in proxy method && parameterNames.contains(parameter.getLanguage().getJava().getName())) { parameter.getLanguage().getJava().setName(parameter.getLanguage().getJava().getName() + "Param"); } @@ -698,11 +695,8 @@ private static void deduplicateParameterNames(Request request) { } } - private final static Map ODATA_PARAMETER_NAME_CONVERSION = new HashMap<>(2); - static { - ODATA_PARAMETER_NAME_CONVERSION.put("maxpagesize", "maxPageSize"); - ODATA_PARAMETER_NAME_CONVERSION.put("orderby", "orderBy"); - } + private final static Map ODATA_PARAMETER_NAME_CONVERSION + = Map.of("maxpagesize", "maxPageSize", "orderby", "orderBy"); private static void renameOdataParameterNames(Request request) { List parameters = request.getParameters(); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ClientMethodSampleTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ClientMethodSampleTemplate.java index 9d3c69eb79c..7ea427b16fc 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ClientMethodSampleTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ClientMethodSampleTemplate.java @@ -14,7 +14,7 @@ import com.microsoft.typespec.http.client.generator.core.template.example.ClientInitializationExampleWriter; import com.microsoft.typespec.http.client.generator.core.template.example.ClientMethodExampleWriter; import com.microsoft.typespec.http.client.generator.core.template.example.ModelExampleWriter; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; public class ClientMethodSampleTemplate implements IJavaTemplate { @@ -39,7 +39,7 @@ public void write(ClientMethodExample clientMethodExample, JavaFile javaFile) { clientInitializationExampleWriter.getClientVarName(), proxyMethodExample); // declare imports - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); imports.addAll(clientInitializationExampleWriter.getImports()); imports.addAll(clientMethodExampleWriter.getImports()); method.getReturnValue().getType().addImportsTo(imports, false); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ClientMethodTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ClientMethodTemplate.java index 54953eb3edd..01ad84e26b3 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ClientMethodTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ClientMethodTemplate.java @@ -39,8 +39,7 @@ import io.clientcore.core.annotations.ReturnType; import io.clientcore.core.http.models.HttpHeaderName; import io.clientcore.core.utils.CoreUtils; -import java.util.Collections; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -78,7 +77,7 @@ protected static void addValidations(JavaBlock function, ClientMethod clientMeth // Parameter expressions to validate for non-null value. final List paramReferenceExpressions = clientMethod.getRequiredNullableParameterExpressions(); // Parameter expressions for custom validation (key is the expression, value is the validation). - final Map validateParamExpressions = new HashMap<>(clientMethod.getValidateExpressions()); + final Map validateParamExpressions = new LinkedHashMap<>(clientMethod.getValidateExpressions()); for (String paramReferenceExpression : paramReferenceExpressions) { final JavaIfBlock nullCheck = function.ifBlock(paramReferenceExpression + " == null", ifBlock -> { @@ -148,7 +147,7 @@ protected static void addOptionalAndConstantVariables(JavaBlock function, Client = MethodUtil.getParameters(clientMethod, false); List overloadedMethodParameters = clientMethod.getOverloadedClientMethod() == null - ? Collections.emptyList() + ? List.of() : MethodUtil.getParameters(clientMethod.getOverloadedClientMethod(), false); for (ProxyMethodParameter parameter : proxyMethodParameters) { diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ClientMethodTemplateBase.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ClientMethodTemplateBase.java index 2c86a0928c0..c473ee3639e 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ClientMethodTemplateBase.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ClientMethodTemplateBase.java @@ -24,8 +24,8 @@ import com.microsoft.typespec.http.client.generator.core.util.CodeNamer; import com.microsoft.typespec.http.client.generator.core.util.MethodUtil; import io.clientcore.core.utils.CoreUtils; -import java.util.HashSet; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Optional; @@ -64,7 +64,7 @@ protected static void generateProtocolMethodJavadoc(ClientMethod clientMethod, J } // Request body - Set typesInJavadoc = new HashSet<>(); + Set typesInJavadoc = new LinkedHashSet<>(); Optional bodyParameter = clientMethod.getProxyMethod() .getAllParameters() diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ConvenienceMethodTemplateBase.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ConvenienceMethodTemplateBase.java index 5d9f1f412b9..6ec3aa6f12b 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ConvenienceMethodTemplateBase.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ConvenienceMethodTemplateBase.java @@ -47,7 +47,6 @@ import java.lang.reflect.Type; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; @@ -134,7 +133,7 @@ protected void writeMethodImplementation(ClientMethod protocolMethod, ClientMeth boolean isJsonMergePatchOperation = protocolMethod != null && protocolMethod.getProxyMethod() != null && "application/merge-patch+json".equalsIgnoreCase(protocolMethod.getProxyMethod().getRequestContentType()); - Map parameterExpressionsMap = new HashMap<>(); + Map parameterExpressionsMap = new LinkedHashMap<>(); for (Map.Entry entry : parametersMap.entrySet()) { MethodParameter parameter = entry.getKey(); MethodParameter protocolParameter = entry.getValue(); @@ -561,7 +560,7 @@ public static SupportedMimeType getResponseKnownMimeType(Collection medi } private static String expressionConvertToBinaryData(String name, IType type, String mediaType) { - SupportedMimeType mimeType = SupportedMimeType.getResponseKnownMimeType(Collections.singleton(mediaType)); + SupportedMimeType mimeType = SupportedMimeType.getResponseKnownMimeType(List.of(mediaType)); switch (mimeType) { case TEXT: return "BinaryData.fromString(" + name + ")"; diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/EnumTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/EnumTemplate.java index 7943c19a84a..7f538511a39 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/EnumTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/EnumTemplate.java @@ -19,7 +19,7 @@ import com.microsoft.typespec.http.client.generator.core.util.CodeNamer; import io.clientcore.core.utils.CoreUtils; import java.io.IOException; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; /** @@ -65,7 +65,7 @@ protected void writeBrandedExpandableEnum(EnumType enumType, JavaFile javaFile, } private void writeExpandableStringEnum(EnumType enumType, JavaFile javaFile, JavaSettings settings) { - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); imports.add("java.util.Collection"); imports.add(ClassType.EXPANDABLE_STRING_ENUM.getFullName()); if (!settings.isStreamStyleSerialization()) { @@ -137,7 +137,7 @@ private void writeExpandableStringEnum(EnumType enumType, JavaFile javaFile, Jav } private void writeEnum(EnumType enumType, JavaFile javaFile, JavaSettings settings) { - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); if (!settings.isStreamStyleSerialization()) { imports.add("com.fasterxml.jackson.annotation.JsonCreator"); imports.add("com.fasterxml.jackson.annotation.JsonValue"); @@ -210,7 +210,7 @@ private void writeEnum(EnumType enumType, JavaFile javaFile, JavaSettings settin } private void writeExpandableEnumInterface(EnumType enumType, JavaFile javaFile, JavaSettings settings) { - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); imports.add("java.util.Collection"); imports.add("java.lang.IllegalArgumentException"); imports.add("java.util.Map"); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ExceptionTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ExceptionTemplate.java index 391a615cb76..61d8d0bd9d4 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ExceptionTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ExceptionTemplate.java @@ -7,7 +7,7 @@ import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ClientException; import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaFile; import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaJavadocComment; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; /** @@ -25,7 +25,7 @@ public static ExceptionTemplate getInstance() { @Override public void write(ClientException exception, JavaFile javaFile) { - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); imports.add(ClassType.HTTP_RESPONSE.getFullName()); exception.getParentType().addImportsTo(imports, false); javaFile.declareImport(imports); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/JsonMergePatchHelperTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/JsonMergePatchHelperTemplate.java index d9412e74653..eff8ae9dd1e 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/JsonMergePatchHelperTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/JsonMergePatchHelperTemplate.java @@ -12,7 +12,7 @@ import com.microsoft.typespec.http.client.generator.core.util.ClientModelUtil; import com.microsoft.typespec.http.client.generator.core.util.CodeNamer; import io.clientcore.core.utils.CoreUtils; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; import java.util.Set; @@ -33,7 +33,7 @@ public static JsonMergePatchHelperTemplate getInstance() { public void write(List models, JavaFile javaFile) { // imports JavaSettings settings = JavaSettings.getInstance(); - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); addImports(imports, models, settings); javaFile.declareImport(imports); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/MethodGroupInterfaceTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/MethodGroupInterfaceTemplate.java index 716b420f533..bee5b466630 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/MethodGroupInterfaceTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/MethodGroupInterfaceTemplate.java @@ -8,8 +8,9 @@ import com.microsoft.typespec.http.client.generator.core.model.clientmodel.IType; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.MethodGroupClient; import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaFile; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.stream.Collectors; /** @@ -27,7 +28,7 @@ public static MethodGroupInterfaceTemplate getInstance() { public final void write(MethodGroupClient methodGroupClient, JavaFile javaFile) { JavaSettings settings = JavaSettings.getInstance(); - HashSet imports = new HashSet(); + Set imports = new LinkedHashSet<>(); methodGroupClient.addImportsTo(imports, false, settings); javaFile.declareImport(imports); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/MethodGroupTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/MethodGroupTemplate.java index ad91dcf0a8f..db1fbd18320 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/MethodGroupTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/MethodGroupTemplate.java @@ -17,7 +17,7 @@ import io.clientcore.core.serialization.ObjectSerializer; import io.clientcore.core.utils.CoreUtils; import java.lang.reflect.InvocationTargetException; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -37,7 +37,7 @@ public static MethodGroupTemplate getInstance() { public final void write(MethodGroupClient methodGroupClient, JavaFile javaFile) { JavaSettings settings = JavaSettings.getInstance(); - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); if (settings.isUseClientLogger()) { ClassType.CLIENT_LOGGER.addImportsTo(imports, false); } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ModelTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ModelTemplate.java index da035ee73d5..69dac758321 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ModelTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ModelTemplate.java @@ -39,6 +39,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Objects; import java.util.Set; @@ -74,7 +75,7 @@ public final void write(ClientModel model, JavaFile javaFile) { JavaSettings settings = JavaSettings.getInstance(); ClientModelPropertiesManager propertiesManager = new ClientModelPropertiesManager(model, settings); - Set imports = settings.isStreamStyleSerialization() ? new StreamStyleImports() : new HashSet<>(); + Set imports = settings.isStreamStyleSerialization() ? new StreamStyleImports() : new LinkedHashSet<>(); addImports(imports, model, settings); @@ -107,7 +108,7 @@ public final void write(ClientModel model, JavaFile javaFile) { List classModifiers = null; if (!hasDerivedModels && !model.getNeedsFlatten()) { - classModifiers = Collections.singletonList(JavaModifier.Final); + classModifiers = List.of(JavaModifier.Final); } String classNameWithBaseType = model.getName(); @@ -843,7 +844,7 @@ private void addModelConstructor(ClientModel model, ClientModelPropertiesManager // Properties required by the super class structure come first. ClientModel parentModel = ClientModelUtil.getClientModel(model.getParentModelName()); if (parentModel != null) { - Set superConstructorPropertiesSerializedNames = new HashSet<>(); + Set superConstructorPropertiesSerializedNames = new LinkedHashSet<>(); propertiesManager.forEachSuperConstructorProperty( p -> superConstructorPropertiesSerializedNames.add(p.getSerializedName())); @@ -1421,7 +1422,7 @@ private static void generateSetterJavadoc(JavaClass classBlock, ClientModel mode }); } - private static final class StreamStyleImports extends HashSet { + private static final class StreamStyleImports extends LinkedHashSet { @Override public boolean add(String s) { if (s != null && s.contains("fasterxml")) { @@ -1456,7 +1457,7 @@ private void addJsonMergePatchRelatedPropertyAndAccessors(JavaClass classBlock, } List setterProperties = !model.isPolymorphic() - ? Collections.emptyList() + ? List.of() : model.getProperties() .stream() .filter(property -> !property.isConstant() && !property.isPolymorphicDiscriminator()) diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ModelTestTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ModelTestTemplate.java index e685a454d48..db90de0a3d0 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ModelTestTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ModelTestTemplate.java @@ -17,7 +17,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.charset.StandardCharsets; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; @@ -64,7 +64,7 @@ public void write(ModelUnitTestInfo testInfo, JavaFile javaFile) { && model.getImplementationDetails() != null && !model.getImplementationDetails().isInput(); - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); model.addImportsTo(imports, JavaSettings.getInstance()); ClassType.BINARY_DATA.addImportsTo(imports, false); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/PomTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/PomTemplate.java index 3e1e7cddd5e..b6676207877 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/PomTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/PomTemplate.java @@ -10,7 +10,7 @@ import com.microsoft.typespec.http.client.generator.core.model.xmlmodel.XmlFile; import com.microsoft.typespec.http.client.generator.core.util.Constants; import io.clientcore.core.utils.CoreUtils; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.stream.Collectors; @@ -39,7 +39,7 @@ public void write(Pom pom, XmlFile xmlFile) { .collect(Collectors.joining(Constants.NEW_LINE)))); } - Map projectAnnotations = new HashMap<>(); + Map projectAnnotations = new LinkedHashMap<>(); projectAnnotations.put("xmlns", "http://maven.apache.org/POM/4.0.0"); projectAnnotations.put("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance"); projectAnnotations.put("xsi:schemaLocation", diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ReadmeTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ReadmeTemplate.java index 7096d1832b9..502ac153ced 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ReadmeTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ReadmeTemplate.java @@ -6,7 +6,6 @@ import com.microsoft.typespec.http.client.generator.core.extension.plugin.JavaSettings; import com.microsoft.typespec.http.client.generator.core.model.projectmodel.Project; import com.microsoft.typespec.http.client.generator.core.util.TemplateUtil; -import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -24,14 +23,10 @@ public String write(Project project) { protected static String getImpression(Project project) { String impression = ""; if (project.getSdkRepositoryPath().isPresent()) { - try { - impression = "![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/" - + URLEncoder.encode("azure-sdk-for-java/" + project.getSdkRepositoryPath().get() + "/README.png", - StandardCharsets.UTF_8.name()) - + ")"; - } catch (UnsupportedEncodingException e) { - // NOOP - } + impression = "![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/" + + URLEncoder.encode("azure-sdk-for-java/" + project.getSdkRepositoryPath().get() + "/README.png", + StandardCharsets.UTF_8) + + ")"; } return impression; } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ResponseTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ResponseTemplate.java index fdc7d80d4e3..7c7932e9325 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ResponseTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ResponseTemplate.java @@ -9,7 +9,7 @@ import com.microsoft.typespec.http.client.generator.core.model.clientmodel.GenericType; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.IType; import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaFile; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; /** @@ -28,7 +28,7 @@ public static ResponseTemplate getInstance() { public final void write(ClientResponse response, JavaFile javaFile) { JavaSettings settings = JavaSettings.getInstance(); - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); imports.add(ClassType.HTTP_REQUEST.getFullName()); imports.add(ClassType.HTTP_HEADERS.getFullName()); IType restResponseType = GenericType.restResponse(response.getHeadersType(), response.getBodyType()); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceAsyncClientTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceAsyncClientTemplate.java index 7f744905d13..8d1faf6a3a9 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceAsyncClientTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceAsyncClientTemplate.java @@ -25,7 +25,7 @@ import com.microsoft.typespec.http.client.generator.core.util.ModelNamer; import com.microsoft.typespec.http.client.generator.core.util.TemplateUtil; import io.clientcore.core.utils.CoreUtils; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -59,7 +59,7 @@ public final void write(AsyncSyncClient asyncClient, JavaFile javaFile) { = samePackageAsBuilder ? JavaVisibility.PackagePrivate : JavaVisibility.Public; ClientBuilder rootClientBuilder = getClientBuilder(asyncClient); - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); if (wrapServiceClient) { serviceClient.addImportsTo(imports, true, false, settings); imports.add(serviceClient.getPackage() + "." + serviceClient.getClassName()); @@ -263,7 +263,7 @@ static ClientBuilder getClientBuilder(AsyncSyncClient client) { } private void writeConvenienceMethods(List convenienceMethods, JavaClass classBlock) { - Set typeReferenceStaticClasses = new HashSet<>(); + Set typeReferenceStaticClasses = new LinkedHashSet<>(); convenienceMethods.forEach( m -> Templates.getConvenienceAsyncMethodTemplate().write(m, classBlock, typeReferenceStaticClasses)); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceClientBuilderTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceClientBuilderTemplate.java index a5a1a1cae7d..b2a898c60ae 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceClientBuilderTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceClientBuilderTemplate.java @@ -27,7 +27,7 @@ import io.clientcore.core.traits.EndpointTrait; import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -67,7 +67,7 @@ public final void write(ClientBuilder clientBuilder, JavaFile javaFile) { buildReturnType = serviceClient.getClassName(); } - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); serviceClient.addImportsTo(imports, false, true, settings); commonProperties.forEach(p -> p.addImportsTo(imports, false)); imports.add("java.util.List"); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceClientInterfaceTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceClientInterfaceTemplate.java index e93b0d61d64..0f6938beff9 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceClientInterfaceTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceClientInterfaceTemplate.java @@ -12,7 +12,8 @@ import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaVisibility; import com.microsoft.typespec.http.client.generator.core.util.CodeNamer; import com.microsoft.typespec.http.client.generator.core.util.ModelNamer; -import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.Set; /** * Writes a ServiceClient to a JavaFile as an interface. @@ -29,7 +30,7 @@ public static ServiceClientInterfaceTemplate getInstance() { } public void write(ServiceClient serviceClient, JavaFile javaFile) { - HashSet imports = new HashSet(); + Set imports = new LinkedHashSet<>(); serviceClient.addImportsTo(imports, false, false, JavaSettings.getInstance()); javaFile.declareImport(imports); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceClientTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceClientTemplate.java index 951257f4b21..3fbb35c8098 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceClientTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceClientTemplate.java @@ -26,7 +26,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Objects; import java.util.Set; @@ -61,7 +61,7 @@ public final void write(ServiceClient serviceClient, JavaFile javaFile) { serviceClientClassDeclaration += String.format(" implements %1$s", serviceClient.getInterfaceName()); } - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); imports.add(Objects.class.getName()); if (settings.isUseClientLogger()) { ClassType.CLIENT_LOGGER.addImportsTo(imports, false); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceSyncClientTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceSyncClientTemplate.java index bedf03f5f6a..8e58d6a261a 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceSyncClientTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceSyncClientTemplate.java @@ -20,7 +20,7 @@ import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaVisibility; import com.microsoft.typespec.http.client.generator.core.util.ClientModelUtil; import com.microsoft.typespec.http.client.generator.core.util.TemplateUtil; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -53,7 +53,7 @@ public final void write(AsyncSyncClient syncClient, JavaFile javaFile) { = samePackageAsBuilder ? JavaVisibility.PackagePrivate : JavaVisibility.Public; ClientBuilder rootClientBuilder = ServiceAsyncClientTemplate.getClientBuilder(syncClient); - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); if (wrapServiceClient) { serviceClient.addImportsTo(imports, true, false, settings); imports.add(serviceClient.getPackage() + "." + serviceClient.getClassName()); @@ -207,7 +207,7 @@ protected void addGeneratedAnnotation(JavaContext classBlock) { } private void writeConvenienceMethods(List convenienceMethods, JavaClass classBlock) { - Set typeReferenceStaticClasses = new HashSet<>(); + Set typeReferenceStaticClasses = new LinkedHashSet<>(); convenienceMethods.forEach( m -> Templates.getConvenienceSyncMethodTemplate().write(m, classBlock, typeReferenceStaticClasses)); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceVersionTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceVersionTemplate.java index c9d3f0359e0..d36fab6c59a 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceVersionTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ServiceVersionTemplate.java @@ -7,7 +7,7 @@ import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ServiceVersion; import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaFile; import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaJavadocComment; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.regex.Pattern; @@ -23,13 +23,12 @@ public static ServiceVersionTemplate getInstance() { @Override public void write(ServiceVersion serviceVersion, JavaFile javaFile) { // imports - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); ClassType.SERVICE_VERSION.addImportsTo(imports, false); javaFile.declareImport(imports); - javaFile.javadocComment(comment -> { - comment.description("Service version of " + serviceVersion.getServiceName()); - }); + javaFile + .javadocComment(comment -> comment.description("Service version of " + serviceVersion.getServiceName())); String className = serviceVersion.getClassName(); List serviceVersions = serviceVersion.getServiceVersions(); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/StreamSerializationModelTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/StreamSerializationModelTemplate.java index c8656983965..49f72130dcc 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/StreamSerializationModelTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/StreamSerializationModelTemplate.java @@ -33,8 +33,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Base64; -import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; @@ -879,7 +877,11 @@ private static void serializeJsonContainerProperty(JavaBlock methodBlock, String } methodBlock.indent(() -> { - if (valueSerializationMethod != null) { + if (elementType == ClassType.BINARY_DATA) { + // Special handling for BinaryData + methodBlock.line("{ if (%1$s == null) { %2$s.writeNull(); } else { %1$s.writeTo(%2$s); } }", + elementName, lambdaWriterName); + } else if (valueSerializationMethod != null) { if (isJsonMergePatch && containerType instanceof MapType) { methodBlock.block("", codeBlock -> codeBlock.ifBlock(elementName + "!= null", ifBlock -> { if (elementType instanceof ClassType && ((ClassType) elementType).isSwaggerType()) { @@ -908,8 +910,6 @@ private static void serializeJsonContainerProperty(JavaBlock methodBlock, String serializeJsonContainerProperty(methodBlock, "writeMap", elementType, ((MapType) elementType).getValueType(), serializedName, propertyValueGetter, depth + 1, isJsonMergePatch); - } else if (elementType == ClassType.BINARY_DATA) { - methodBlock.line(elementName + ".writeTo(" + lambdaWriterName + ")"); } else { throw new RuntimeException("Unknown value type " + elementType + " in " + containerType + " serialization. Need to add support for it."); @@ -1183,7 +1183,7 @@ private void writeFromJsonDeserialization0(JavaBlock methodBlock) { = (property, fromSuper) -> handleJsonPropertyDeserialization(property, whileBlock, ifBlockReference, fromSuper, false); - Map modelPropertyMap = new HashMap<>(); + Map modelPropertyMap = new LinkedHashMap<>(); for (ClientModelProperty parentProperty : ClientModelUtil.getParentProperties(model)) { modelPropertyMap.put(parentProperty.getName(), parentProperty); } @@ -2506,16 +2506,50 @@ private JavaIfBlock handleXmlPropertyDeserialization(ClientModelProperty propert private void generateXmlDeserializationLogic(JavaBlock deserializationBlock, ClientModelProperty property, boolean fromSuper) { IType wireType = property.getWireType(); + IType clientType = property.getClientType(); // Attempt to determine whether the wire type is simple deserialization. // This is primitives, boxed primitives, a small set of string based models, and other ClientModels. String simpleDeserialization = getSimpleXmlDeserialization(wireType, property.getXmlName(), null, null, false); if (simpleDeserialization != null) { - if (propertiesManager.hasConstructorArguments()) { - deserializationBlock.line(property.getName() + " = " + simpleDeserialization + ";"); + boolean convertToClientType = (clientType != wireType) + && (includePropertyInConstructor(property, settings) + || (fromSuper && !ClientModelUtil.readOnlyNotInCtor(model, property, settings))); + BiConsumer simpleDeserializationConsumer = (logic, block) -> { + if (!propertiesManager.hasConstructorArguments()) { + handleSettingDeserializedValue(deserializationBlock, property, logic, fromSuper); + } else { + deserializationBlock.line(property.getName() + " = " + logic + ";"); + } + }; + + if (convertToClientType) { + // If the wire type is nullable don't attempt to call the convert to client type until it's known + // that + // a value was deserialized. This protects against cases such as UnixTimeLong where the wire type is + // Long and the client type of OffsetDateTime. This is converted using Instant.ofEpochMilli(long) + // which + // would result in a null if the Long is null, which is already guarded using + // reader.readNullable(nonNullReader -> Instant.ofEpochMillis(nonNullReader.readLong())) but this + // itself + // returns null which would have been passed to OffsetDateTime.ofInstant(Instant, ZoneId) which + // would + // have thrown a NullPointerException. + if (wireType.isNullable()) { + // Check if the property is required, if so use a holder name as there will be an existing + // holder + // variable for the value that will be used in the constructor. + String holderName = property.getName() + "Holder"; + deserializationBlock.line(wireType + " " + holderName + " = " + simpleDeserialization + ";"); + deserializationBlock.ifBlock(holderName + " != null", ifBlock -> simpleDeserializationConsumer + .accept(wireType.convertToClientType(holderName), ifBlock)); + } else { + simpleDeserializationConsumer.accept(wireType.convertToClientType(simpleDeserialization), + deserializationBlock); + } } else { - handleSettingDeserializedValue(deserializationBlock, property, simpleDeserialization, fromSuper); + simpleDeserializationConsumer.accept(simpleDeserialization, deserializationBlock); } } else if (wireType instanceof IterableType) { IType elementType = ((IterableType) wireType).getElementType(); @@ -2634,7 +2668,7 @@ private void handleUnknownXmlFieldDeserialization(JavaBlock methodBlock, JavaIfB getClientModelPropertiesInJsonTree(JsonFlattenedPropertiesTree tree) { if (tree.getProperty() != null) { // Terminal node only contains a property. - return Collections.singletonList(tree.getProperty()); + return List.of(tree.getProperty()); } else { List treeProperties = new ArrayList<>(); for (JsonFlattenedPropertiesTree childNode : tree.getChildrenNodes().values()) { diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/UnionModelTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/UnionModelTemplate.java index faf8f4a9326..170f6f4d51d 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/UnionModelTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/UnionModelTemplate.java @@ -12,8 +12,7 @@ import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaModifier; import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaVisibility; import io.clientcore.core.utils.CoreUtils; -import java.util.Collections; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.function.Consumer; @@ -36,7 +35,7 @@ public void write(UnionModel model, JavaFile javaFile) { final boolean isAbstractClass = CoreUtils.isNullOrEmpty(model.getParentModelName()); final String superClassName = model.getParentModelName(); - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); model.addImportsTo(imports); imports.add(Annotation.IMMUTABLE.getFullName()); @@ -44,8 +43,7 @@ public void write(UnionModel model, JavaFile javaFile) { javaFile.declareImport(imports); - List modifiers - = Collections.singletonList(isAbstractClass ? JavaModifier.Abstract : JavaModifier.Final); + List modifiers = List.of(isAbstractClass ? JavaModifier.Abstract : JavaModifier.Final); String classDeclaration = isAbstractClass ? model.getName() : (model.getName() + " extends " + superClassName); javaFile.javadocComment(comment -> comment.description(model.getDescription())); if (!isAbstractClass) { diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/azurevnext/AzureVNextPomTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/azurevnext/AzureVNextPomTemplate.java index fbb43fc0a64..1fb1d6fabcf 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/azurevnext/AzureVNextPomTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/azurevnext/AzureVNextPomTemplate.java @@ -12,7 +12,7 @@ import com.microsoft.typespec.http.client.generator.core.template.TemplateHelper; import com.microsoft.typespec.http.client.generator.core.util.Constants; import io.clientcore.core.utils.CoreUtils; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.stream.Collectors; @@ -36,7 +36,7 @@ public void write(Pom pom, XmlFile xmlFile) { .collect(Collectors.joining(Constants.NEW_LINE)))); } - Map projectAnnotations = new HashMap<>(); + Map projectAnnotations = new LinkedHashMap<>(); projectAnnotations.put("xmlns", "http://maven.apache.org/POM/4.0.0"); projectAnnotations.put("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance"); projectAnnotations.put("xsi:schemaLocation", diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/clientcore/ClientCoreClientMethodTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/clientcore/ClientCoreClientMethodTemplate.java index 6e33dc34b12..f4dd1e6195c 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/clientcore/ClientCoreClientMethodTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/clientcore/ClientCoreClientMethodTemplate.java @@ -790,10 +790,8 @@ protected void generatePagingPlainSync(ClientMethod clientMethod, JavaType typeB String effectiveNextMethodArgs = nextMethodArgs; String effectiveFirstPageArgs = firstPageArgs; function.indent(() -> { - function.line("%s,", - this.getPagingSinglePageExpression(clientMethod, - clientMethod.getProxyMethod().getPagingSinglePageMethodName(), effectiveFirstPageArgs, - settings)); + function.line("%s,", this.getPagingSinglePageExpression(clientMethod, + clientMethod.getProxyMethod().getPagingSinglePageMethodName(), effectiveFirstPageArgs)); function.line("%s);", this.getPagingNextPageExpression(clientMethod, clientMethod.getMethodPageDetails() @@ -811,8 +809,7 @@ protected void generatePagingPlainSync(ClientMethod clientMethod, JavaType typeB addOptionalVariables(function, clientMethod); function.line("return new PagedIterable<>("); function.indent(() -> function.line(this.getPagingSinglePageExpression(clientMethod, - clientMethod.getProxyMethod().getPagingSinglePageMethodName(), effectiveFirstPageArgs, settings) - + ");")); + clientMethod.getProxyMethod().getPagingSinglePageMethodName(), effectiveFirstPageArgs) + ");")); }); } } @@ -1236,15 +1233,16 @@ protected void generateLongRunningBeginSync(ClientMethod clientMethod, JavaType }); } - private String getPagingSinglePageExpression(ClientMethod clientMethod, String methodName, String argumentLine, - JavaSettings settings) { + private String getPagingSinglePageExpression(ClientMethod clientMethod, String methodName, String argumentLine) { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("(pagingOptions) -> {"); stringBuilder.append("\n"); stringBuilder.append(getLogExceptionExpressionForPagingOptions(clientMethod)); if ((clientMethod.getMethodPageDetails().getContinuationToken() != null)) { - stringBuilder.append("String token = pagingOptions.getContinuationToken();"); + String continuationTokenVarName + = clientMethod.getMethodPageDetails().getContinuationToken().getRequestParameter().getName(); + stringBuilder.append("String " + continuationTokenVarName + " = pagingOptions.getContinuationToken();"); stringBuilder.append("\n"); } stringBuilder.append("return "); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/clientcore/ClientCoreExceptionTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/clientcore/ClientCoreExceptionTemplate.java index 7625ca7848c..39f2e263271 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/clientcore/ClientCoreExceptionTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/clientcore/ClientCoreExceptionTemplate.java @@ -8,7 +8,7 @@ import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaFile; import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaJavadocComment; import com.microsoft.typespec.http.client.generator.core.template.ExceptionTemplate; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; public class ClientCoreExceptionTemplate extends ExceptionTemplate { @@ -25,7 +25,7 @@ public static ClientCoreExceptionTemplate getInstance() { @Override public void write(ClientException exception, JavaFile javaFile) { - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); imports.add(getHttpResponseImport()); ClassType.BINARY_DATA.addImportsTo(imports, false); exception.getParentType().addImportsTo(imports, false); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/clientcore/ClientCorePomTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/clientcore/ClientCorePomTemplate.java index 186918f1a13..06c340d100f 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/clientcore/ClientCorePomTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/clientcore/ClientCorePomTemplate.java @@ -11,7 +11,7 @@ import com.microsoft.typespec.http.client.generator.core.template.TemplateHelper; import com.microsoft.typespec.http.client.generator.core.util.Constants; import io.clientcore.core.utils.CoreUtils; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.stream.Collectors; @@ -37,7 +37,7 @@ public void write(Pom pom, XmlFile xmlFile) { .collect(Collectors.joining(Constants.NEW_LINE)))); } - Map projectAnnotations = new HashMap<>(); + Map projectAnnotations = new LinkedHashMap<>(); projectAnnotations.put("xmlns", "http://maven.apache.org/POM/4.0.0"); projectAnnotations.put("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance"); projectAnnotations.put("xsi:schemaLocation", diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ClientInitializationExampleWriter.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ClientInitializationExampleWriter.java index b714c95b0e6..fac63094bbc 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ClientInitializationExampleWriter.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ClientInitializationExampleWriter.java @@ -15,7 +15,7 @@ import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaBlock; import com.microsoft.typespec.http.client.generator.core.util.CodeNamer; import java.util.ArrayList; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; import java.util.Map; @@ -25,7 +25,7 @@ /** Client initialization example writer for DPG methods. */ public class ClientInitializationExampleWriter { - private final Set imports = new HashSet<>(); + private final Set imports = new LinkedHashSet<>(); private final Consumer clientInitializationWriter; private final String clientVarName; @@ -44,7 +44,7 @@ public ClientInitializationExampleWriter(AsyncSyncClient syncClient, ClientMetho // client initialization List clientParameterLines = new ArrayList<>(); - Set processedServiceClientProperties = new HashSet<>(); + Set processedServiceClientProperties = new LinkedHashSet<>(); // proxy method parameters which value comes from client method.getProxyMethod().getAllParameters().stream().filter(ProxyMethodParameter::isFromClient).forEach(p -> { @@ -118,7 +118,7 @@ public ClientInitializationExampleWriter(AsyncSyncClient syncClient, ClientMetho } public Set getImports() { - return new HashSet<>(this.imports); + return new LinkedHashSet<>(this.imports); } public void write(JavaBlock methodBlock) { diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ClientMethodExampleWriter.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ClientMethodExampleWriter.java index fe5e0593ce1..dc369aa7faf 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ClientMethodExampleWriter.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ClientMethodExampleWriter.java @@ -29,8 +29,8 @@ import com.microsoft.typespec.http.client.generator.core.util.MethodUtil; import com.microsoft.typespec.http.client.generator.core.util.ModelExampleUtil; import io.clientcore.core.http.models.HttpMethod; -import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -41,7 +41,7 @@ public class ClientMethodExampleWriter { - private final Set imports = new HashSet<>(); + private final Set imports = new LinkedHashSet<>(); private final BiConsumer methodBodyWriter; private final Consumer responseAssertionWriter; private final ModelExampleWriter.ExampleNodeModelInitializationVisitor nodeVisitor @@ -285,7 +285,7 @@ private ExampleNode parseNodeFromParameter(ClientMethod convenienceMethod, Proxy if (transformations.isGroupingParameter(methodParameter)) { // grouping, possible with flattening first // group example values into a map - Map exampleValue = new HashMap<>(); + Map exampleValue = new LinkedHashMap<>(); for (ParameterTransformation transformation : convenienceMethod.getParameterTransformations().asList()) { for (ParameterMapping parameterMapping : transformation.getMappings()) { if (parameterMapping.getOutParameterPropertyName() != null) { @@ -368,7 +368,7 @@ private Map getFlattenedBodyParameterExampleValue(ProxyMethodExa } public Set getImports() { - return new HashSet<>(this.imports); + return new LinkedHashSet<>(this.imports); } public void writeClientMethodInvocation(JavaBlock javaBlock, boolean isTestCode) { @@ -376,7 +376,7 @@ public void writeClientMethodInvocation(JavaBlock javaBlock, boolean isTestCode) } public Set getHelperFeatures() { - return new HashSet<>(nodeVisitor.getHelperFeatures()); + return new LinkedHashSet<>(nodeVisitor.getHelperFeatures()); } public void writeAssertion(JavaBlock methodBlock) { diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ModelExampleWriter.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ModelExampleWriter.java index 894f120e671..21f49c20fe4 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ModelExampleWriter.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ModelExampleWriter.java @@ -32,8 +32,8 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -46,7 +46,7 @@ public class ModelExampleWriter { private static final Logger LOGGER = new PluginLogger(Javagen.getPluginInstance(), ModelExampleWriter.class); - private final Set imports = new HashSet<>(); + private final Set imports = new LinkedHashSet<>(); private final Consumer assertionWriter; private final ExampleNodeModelInitializationVisitor modelInitializationVisitor @@ -85,7 +85,7 @@ public String getModelInitializationCode() { public static void writeMapOfMethod(JavaClass classBlock) { classBlock.lineComment("Use \"Map.of\" if available"); classBlock.annotation("SuppressWarnings(\"unchecked\")"); - classBlock.method(JavaVisibility.Private, Collections.singletonList(JavaModifier.Static), + classBlock.method(JavaVisibility.Private, List.of(JavaModifier.Static), " Map mapOf(Object... inputs)", methodBlock -> { methodBlock.line("Map map = new HashMap<>();"); methodBlock.line("for (int i = 0; i < inputs.length; i += 2) {"); @@ -101,7 +101,7 @@ public static void writeMapOfMethod(JavaClass classBlock) { public static class ExampleNodeAssertionVisitor { - private final Set imports = new HashSet<>(); + private final Set imports = new LinkedHashSet<>(); private final List assertions = new ArrayList<>(); @@ -164,8 +164,8 @@ public List getAssertions() { public static class ExampleNodeModelInitializationVisitor { - protected final Set imports = new HashSet<>(); - protected final Set helperFeatures = new HashSet<>(); + protected final Set imports = new LinkedHashSet<>(); + protected final Set helperFeatures = new LinkedHashSet<>(); /** * Extension to write code for deserialize JSON String to Object. @@ -295,7 +295,7 @@ public String accept(ExampleNode node) { = Stream.concat(requiredParentProperties.stream(), requiredProperties.stream()) .map(ModelProperty::ofClientModelProperty) .collect(Collectors.toList()); - Map ctorPosition = new HashMap<>(); + Map ctorPosition = new LinkedHashMap<>(); for (int i = 0; i < properties.size(); ++i) { ctorPosition.put(properties.get(i), i); } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ProtocolExampleWriter.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ProtocolExampleWriter.java index 90e59f1dd47..9e6b72ec301 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ProtocolExampleWriter.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ProtocolExampleWriter.java @@ -28,7 +28,7 @@ import com.microsoft.typespec.http.client.generator.core.util.WireTypeClientTypeConverter; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -61,7 +61,7 @@ public ProtocolExampleWriter(ProtocolExample protocolExample) { = new ClientInitializationExampleWriter(syncClient, method, proxyMethodExample, serviceClient); // import - this.imports = new HashSet<>(); + this.imports = new LinkedHashSet<>(); imports.addAll(this.clientInitializationExampleWriter.getImports()); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/prototype/MethodTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/prototype/MethodTemplate.java index 5f3e68b6345..76c9db9928d 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/prototype/MethodTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/prototype/MethodTemplate.java @@ -11,7 +11,7 @@ import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaVisibility; import java.util.ArrayList; import java.util.Collection; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Objects; import java.util.Set; @@ -71,7 +71,7 @@ public static Builder builder() { } public static final class Builder { - private final Set imports = new HashSet<>(); + private final Set imports = new LinkedHashSet<>(); private JavaVisibility visibility = JavaVisibility.Public; private final List modifiers = new ArrayList<>(); private String methodSignature; diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/ClientModelUtil.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/ClientModelUtil.java index 6cb24165ee0..80cd040e55b 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/ClientModelUtil.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/ClientModelUtil.java @@ -34,8 +34,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashSet; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; import java.util.Map; @@ -98,7 +98,7 @@ public static void getAsyncSyncClients(Client client, ServiceClient serviceClien .filter(og -> CoreUtils.isNullOrEmpty(og.getLanguage().getJava().getName())) // no resource group .findAny() .map(og -> getConvenienceMethods(serviceClient::getClientMethods, og)) - .orElse(Collections.emptyList()); + .orElse(List.of()); if (JavaSettings.getInstance().isAzureV1()) { builder.convenienceMethods(convenienceMethods); } @@ -133,7 +133,7 @@ public static void getAsyncSyncClients(Client client, ServiceClient serviceClien .filter(og -> methodGroupClient.getClassBaseName().equals(og.getLanguage().getJava().getName())) .findAny() .map(og -> getConvenienceMethods(methodGroupClient::getClientMethods, og)) - .orElse(Collections.emptyList()); + .orElse(List.of()); if (JavaSettings.getInstance().isAzureV1()) { builder.convenienceMethods(convenienceMethods); } @@ -366,9 +366,9 @@ public static List getApiVersions(CodeModel codeModel) { if (versions == null) { String version = getFirstApiVersionFromOperation(codeModel); if (version != null) { - versions = Collections.singletonList(version); + versions = List.of(version); } else { - versions = Collections.emptyList(); + versions = List.of(); } } return versions; @@ -410,7 +410,7 @@ public static String clientNameToAsyncClientName(String clientName) { */ public static List splitFlattenedSerializedName(String serializedName) { if (serializedName == null) { - return Collections.emptyList(); + return List.of(); } String[] values = SPLIT_FLATTEN_PROPERTY_PATTERN.split(serializedName); @@ -764,7 +764,7 @@ public static ClientModel getRootParent(ClientModel model) { public static Set getExternalPackageNamesUsedInClient(List models, CodeModel codeModel) { // models Set externalPackageNames = models == null - ? new HashSet<>() + ? new LinkedHashSet<>() : models.stream() .filter(m -> m.getImplementationDetails() != null && m.getImplementationDetails().getUsages() != null diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/MethodUtil.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/MethodUtil.java index c68d2c70517..0329008a3a4 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/MethodUtil.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/MethodUtil.java @@ -32,7 +32,7 @@ import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; import java.util.EnumSet; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; import java.util.Map; @@ -222,7 +222,7 @@ public static Parameter createContentTypeParameter(Request request, Operation op * @return true if the requests have different content types, otherwise return false */ public static int getContentTypeCount(List requests) { - Set mediaTypes = new HashSet<>(); + Set mediaTypes = new LinkedHashSet<>(); for (Request request : requests) { if (!CoreUtils.isNullOrEmpty(request.getProtocol().getHttp().getMediaTypes())) { mediaTypes.addAll(request.getProtocol().getHttp().getMediaTypes()); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/ModelExampleUtil.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/ModelExampleUtil.java index bb2d8da54e0..c80d775f812 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/ModelExampleUtil.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/ModelExampleUtil.java @@ -101,8 +101,7 @@ public static ExampleNode parseNode(IType type, IType wireType, Object objectVal // redact possible credential if (elementType == ClassType.STRING && entry.getValue() instanceof String) { - value = ModelTestCaseUtil.redactStringValue(Collections.singletonList(entry.getKey()), - (String) value); + value = ModelTestCaseUtil.redactStringValue(List.of(entry.getKey()), (String) value); } ExampleNode childNode = parseNode(elementType, value); @@ -122,7 +121,7 @@ public static ExampleNode parseNode(IType type, IType wireType, Object objectVal if (model.isPolymorphic()) { // polymorphic, need to get the correct subclass from discriminator String serializedName = model.getPolymorphicDiscriminatorName(); - List jsonPropertyNames = Collections.singletonList(serializedName); + List jsonPropertyNames = List.of(serializedName); if (model.getNeedsFlatten()) { jsonPropertyNames = ClientModelUtil.splitFlattenedSerializedName(serializedName); } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/ModelTestCaseUtil.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/ModelTestCaseUtil.java index f38954434f8..b2370bd6f3b 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/ModelTestCaseUtil.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/ModelTestCaseUtil.java @@ -19,7 +19,6 @@ import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; @@ -123,13 +122,17 @@ public static Object jsonFromType(int depth, IType type) { return RANDOM.nextLong() & Long.MAX_VALUE; } else if (type.asNullable() == ClassType.DURATION_DOUBLE) { return Math.abs(RANDOM.nextDouble() * 10); + } else if (type.asNullable() == ClassType.DURATION_MILLISECONDS_LONG) { + return RANDOM.nextLong() & Long.MAX_VALUE; + } else if (type.asNullable() == ClassType.DURATION_MILLISECONDS_DOUBLE) { + return Math.abs(RANDOM.nextDouble() * 10000); } else if (type == ClassType.UUID) { return UUID.randomUUID().toString(); } else if (type == ClassType.URL) { return "http://example.org/" + URLEncoder.encode(randomString(), StandardCharsets.UTF_8); } else if (type == ClassType.OBJECT || type == ClassType.BINARY_DATA) { // unknown type, use a simple string - return "data" + randomString(); + return ClassType.STRING.defaultValueExpression("data" + randomString()); } else if (type instanceof EnumType) { IType elementType = ((EnumType) type).getElementType(); List values @@ -232,7 +235,7 @@ private static void addForProperty(Map jsonObject, String serial if (modelNeedsFlatten) { serializedNames = ClientModelUtil.splitFlattenedSerializedName(serializedName); } else { - serializedNames = Collections.singletonList(serializedName); + serializedNames = List.of(serializedName); } addToJsonObject(jsonObject, serializedNames, value); } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java index e64314fb97c..532902ec99d 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java @@ -22,7 +22,6 @@ import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ListType; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.PrimitiveType; import io.clientcore.core.utils.CoreUtils; -import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -302,7 +301,7 @@ public static ClassType mapExternalModel(ObjectSchema compositeType) { */ public static Set mapSchemaContext(Set schemaContexts) { if (schemaContexts == null) { - return Collections.emptySet(); + return Set.of(); } return schemaContexts.stream().map(ImplementationDetails.Usage::fromSchemaContext).collect(Collectors.toSet()); } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/TemplateUtil.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/TemplateUtil.java index 46ef43c0ebe..bd394a7e20d 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/TemplateUtil.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/TemplateUtil.java @@ -28,7 +28,7 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.Arrays; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.function.Supplier; @@ -134,7 +134,7 @@ public static void writeClientMethodsAndHelpers(JavaClass classBlock, List - Set typeReferenceStaticClasses = new HashSet<>(); + Set typeReferenceStaticClasses = new LinkedHashSet<>(); for (ClientMethod clientMethod : clientMethods) { Templates.getClientMethodTemplate().write(clientMethod, classBlock); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/WireTypeClientTypeConverter.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/WireTypeClientTypeConverter.java index 111e2552dfc..d80a8fa043b 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/WireTypeClientTypeConverter.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/WireTypeClientTypeConverter.java @@ -1,7 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. + package com.microsoft.typespec.http.client.generator.core.util; +import com.microsoft.typespec.http.client.generator.core.Javagen; +import com.microsoft.typespec.http.client.generator.core.extension.plugin.PluginLogger; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ClassType; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.IType; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.PrimitiveType; @@ -10,12 +13,16 @@ import java.time.Duration; import java.time.Instant; import java.time.ZoneOffset; +import org.slf4j.Logger; /** * Class to group conversion logic between client type and wire type. */ public class WireTypeClientTypeConverter { + private final static Logger LOGGER + = new PluginLogger(Javagen.getPluginInstance(), WireTypeClientTypeConverter.class); + private WireTypeClientTypeConverter() { } @@ -43,6 +50,10 @@ public static String convertToClientTypeExpression(ClassType wireType, String ex expression = "Duration.ofSeconds(" + expression + ")"; } else if (wireType == ClassType.DURATION_DOUBLE) { expression = "Duration.ofNanos((long) (" + expression + " * 1000_000_000L))"; + } else if (wireType == ClassType.DURATION_MILLISECONDS_LONG) { + expression = "Duration.ofMillis(" + expression + ")"; + } else if (wireType == ClassType.DURATION_MILLISECONDS_DOUBLE) { + expression = "Duration.ofNanos((long) (" + expression + " * 1000_000L))"; } return expression; @@ -72,6 +83,10 @@ public static String convertToWireTypeExpression(ClassType clientType, String ex expression = expression + ".getSeconds()"; } else if (clientType == ClassType.DURATION_DOUBLE) { expression = "(double) " + expression + ".toNanos() / 1000_000_000L"; + } else if (clientType == ClassType.DURATION_MILLISECONDS_LONG) { + expression = expression + ".toMillis()"; + } else if (clientType == ClassType.DURATION_MILLISECONDS_DOUBLE) { + expression = "(double) " + expression + ".toNanos() / 1000_000L"; } return expression; @@ -99,6 +114,10 @@ public static String convertToClientTypeExpression(PrimitiveType wireType, Strin expression = String.format("Duration.ofSeconds(%s)", expression); } else if (wireType == PrimitiveType.DURATION_DOUBLE) { expression = String.format("Duration.ofNanos((long) (%s * 1000_000_000L))", expression); + } else if (wireType == PrimitiveType.DURATION_MILLISECONDS_LONG) { + expression = String.format("Duration.ofMillis(%s)", expression); + } else if (wireType == PrimitiveType.DURATION_MILLISECONDS_DOUBLE) { + expression = String.format("Duration.ofNanos((long) (%s * 1000_000L))", expression); } return expression; } @@ -124,6 +143,10 @@ public static String convertToWireTypeExpression(PrimitiveType clientType, Strin expression = String.format("%s.getSeconds()", expression); } else if (clientType == PrimitiveType.DURATION_DOUBLE) { expression = String.format("(double) %s.toNanos() / 1000_000_000L", expression); + } else if (clientType == PrimitiveType.DURATION_MILLISECONDS_LONG) { + expression = String.format("%s.toMillis()", expression); + } else if (clientType == PrimitiveType.DURATION_MILLISECONDS_DOUBLE) { + expression = String.format("(double) %s.toNanos() / 1000_000L", expression); } return expression; } @@ -142,16 +165,27 @@ public static String convertToWireTypeExpression(PrimitiveType clientType, Strin */ public static String convertLiteralToClientValue(IType wireType, String literalInWireType) { String literalValue = literalInWireType; - if (wireType == ClassType.DATE_TIME_RFC_1123) { - literalValue = new DateTimeRfc1123(literalValue).getDateTime().toString(); - } else if (wireType == ClassType.BASE_64_URL) { - literalValue = new Base64Uri(literalValue).toString(); - } else if (wireType.asNullable() == ClassType.UNIX_TIME_LONG) { - literalValue = Instant.ofEpochSecond(Long.parseLong(literalValue)).atOffset(ZoneOffset.UTC).toString(); - } else if (wireType.asNullable() == ClassType.DURATION_LONG) { - literalValue = Duration.ofSeconds(Long.parseLong(literalValue)).toString(); - } else if (wireType.asNullable() == ClassType.DURATION_DOUBLE) { - literalValue = Duration.ofNanos((long) (Double.parseDouble(literalInWireType) * 1000_000_000L)).toString(); + try { + if (wireType == ClassType.DATE_TIME_RFC_1123) { + literalValue = new DateTimeRfc1123(literalValue).getDateTime().toString(); + } else if (wireType == ClassType.BASE_64_URL) { + literalValue = new Base64Uri(literalValue).toString(); + } else if (wireType.asNullable() == ClassType.UNIX_TIME_LONG) { + literalValue = Instant.ofEpochSecond(Long.parseLong(literalValue)).atOffset(ZoneOffset.UTC).toString(); + } else if (wireType.asNullable() == ClassType.DURATION_LONG) { + literalValue = Duration.ofSeconds(Long.parseLong(literalValue)).toString(); + } else if (wireType.asNullable() == ClassType.DURATION_DOUBLE) { + literalValue + = Duration.ofNanos((long) (Double.parseDouble(literalInWireType) * 1000_000_000L)).toString(); + } else if (wireType.asNullable() == ClassType.DURATION_MILLISECONDS_LONG) { + literalValue = Duration.ofMillis(Long.parseLong(literalValue)).toString(); + } else if (wireType.asNullable() == ClassType.DURATION_MILLISECONDS_DOUBLE) { + literalValue = Duration.ofNanos((long) (Double.parseDouble(literalInWireType) * 1000_000L)).toString(); + } + } catch (RuntimeException e) { + LOGGER.warn( + "Failed to convert literal value '{}' from wire type to client type. Return the original literal value. Error: {}", + literalInWireType, e.getMessage()); } return literalValue; } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ConvertFromJsonTypeTraitTests.java b/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ConvertFromJsonTypeTraitTests.java index 3460b89031f..75307636422 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ConvertFromJsonTypeTraitTests.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ConvertFromJsonTypeTraitTests.java @@ -16,6 +16,8 @@ public void testPrimitiveTypeConversion() { PrimitiveType.INT_AS_STRING.convertFromJsonType("var")); Assertions.assertEquals("Duration.ofNanos((long) (var * 1000_000_000L))", PrimitiveType.DURATION_DOUBLE.convertFromJsonType("var")); + Assertions.assertEquals("Duration.ofNanos((long) (var * 1000_000L))", + PrimitiveType.DURATION_MILLISECONDS_DOUBLE.convertFromJsonType("var")); Assertions.assertEquals("OffsetDateTime.ofInstant(Instant.ofEpochSecond(var), ZoneOffset.UTC)", PrimitiveType.UNIX_TIME_LONG.convertFromJsonType("var")); } @@ -30,6 +32,8 @@ public void testClassTypeConversion() { Assertions.assertEquals("var == null ? null : Duration.parse(var)", ClassType.DURATION.convertFromJsonType("var")); Assertions.assertEquals("Duration.ofSeconds(var)", ClassType.DURATION_LONG.convertFromJsonType("var")); + Assertions.assertEquals("Duration.ofMillis(var)", + ClassType.DURATION_MILLISECONDS_LONG.convertFromJsonType("var")); } @Test diff --git a/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ConvertToJsonTypeTraitTests.java b/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ConvertToJsonTypeTraitTests.java index a4311bc225d..3b47290ad5b 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ConvertToJsonTypeTraitTests.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ConvertToJsonTypeTraitTests.java @@ -15,6 +15,8 @@ public void testPrimitiveTypeConversion() { Assertions.assertEquals("Objects.toString(var, null)", PrimitiveType.INT_AS_STRING.convertToJsonType("var")); Assertions.assertEquals("(double) var.toNanos() / 1000_000_000L", PrimitiveType.DURATION_DOUBLE.convertToJsonType("var")); + Assertions.assertEquals("(double) var.toNanos() / 1000_000L", + PrimitiveType.DURATION_MILLISECONDS_DOUBLE.convertToJsonType("var")); } @Test diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/pom.xml b/packages/http-client-java/generator/http-client-generator-mgmt/pom.xml index f1e0e284a7e..f9d41728ecc 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/pom.xml +++ b/packages/http-client-java/generator/http-client-generator-mgmt/pom.xml @@ -27,6 +27,12 @@ 1.0.0-beta.1 + + io.github.encryptorcode + pluralize + 1.0.0 + + com.azure azure-core-management diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/FluentGen.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/FluentGen.java index bd08aa3e6b0..0502416009f 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/FluentGen.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/FluentGen.java @@ -50,6 +50,7 @@ import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; @@ -289,7 +290,7 @@ private void addServiceClient(JavaSettings javaSettings, FluentJavaPackage javaP } protected FluentClient handleFluentLite(CodeModel codeModel, Client client, FluentJavaPackage javaPackage, - String apiVersionInTypeSpec) { + Map apiVersionMap) { FluentJavaSettings fluentJavaSettings = this.getFluentJavaSettings(); JavaSettings javaSettings = JavaSettings.getInstance(); @@ -306,7 +307,7 @@ protected FluentClient handleFluentLite(CodeModel codeModel, Client client, Flue fluentClient = this.getFluentMapper().map(codeModel, client); // project - FluentProject project = new FluentProject(fluentClient, apiVersionInTypeSpec); + FluentProject project = new FluentProject(fluentClient, apiVersionMap); if (isSdkIntegration) { project.integrateWithSdk(); } diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/ExampleParser.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/ExampleParser.java index 5ef974e3ddd..04346d6a33c 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/ExampleParser.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/ExampleParser.java @@ -46,7 +46,7 @@ import com.microsoft.typespec.http.client.generator.mgmt.util.FluentUtils; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -80,7 +80,7 @@ public List parseMethodGroup(MethodGroupClient methodGroup) { } }); - Map examples = new HashMap<>(); + Map examples = new LinkedHashMap<>(); methodExamples.forEach(e -> { FluentExample example = getExample(examples, e.getMethodGroup(), e.getClientMethod(), e.getName()); example.getClientMethodExamples().add(e); @@ -113,7 +113,7 @@ public List parseResourceCollection(FluentResourceCollection reso } }); - Map examples = new HashMap<>(); + Map examples = new LinkedHashMap<>(); methodExamples.forEach(e -> { FluentExample example = getExample(examples, e.getResourceCollection(), e.getCollectionMethod(), e.getName()); diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentMapper.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentMapper.java index 2da86fc3d61..7011023632d 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentMapper.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentMapper.java @@ -30,7 +30,6 @@ import com.microsoft.typespec.http.client.generator.mgmt.util.Utils; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -79,7 +78,7 @@ public FluentClient map(CodeModel codeModel, Client client) { .findFirst(); if (collectionOpt.isPresent()) { FluentResourceCollection collection = collectionOpt.get(); - ResourceParser.parseResourcesCategory(collection, Collections.singletonList(model), + ResourceParser.parseResourcesCategory(collection, List.of(model), FluentStatic.getClient().getModels()); } else { LOGGER.warn("Resource collection '{}' not found in association override '{}' to '{}'.", diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentMethodGroupMapper.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentMethodGroupMapper.java index fda3ab1c961..734a1ff83fb 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentMethodGroupMapper.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentMethodGroupMapper.java @@ -16,7 +16,6 @@ import com.microsoft.typespec.http.client.generator.mgmt.util.TypeConversionUtils; import com.microsoft.typespec.http.client.generator.mgmt.util.Utils; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -35,11 +34,9 @@ public static FluentMethodGroupMapper getInstance() { @Override protected List supportedInterfaces(OperationGroup operationGroup, List clientMethods) { - if (!JavaSettings.getInstance().isFluentLite()) { - return findSupportedInterfaces(operationGroup, clientMethods); - } else { - return Collections.emptyList(); - } + return !JavaSettings.getInstance().isFluentLite() + ? findSupportedInterfaces(operationGroup, clientMethods) + : List.of(); } List findSupportedInterfaces(OperationGroup operationGroup, List clientMethods) { diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentModelMapper.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentModelMapper.java index ec830e6a173..f31e7d4fdd4 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentModelMapper.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentModelMapper.java @@ -6,14 +6,14 @@ import com.microsoft.typespec.http.client.generator.core.mapper.ModelMapper; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ClassType; import com.microsoft.typespec.http.client.generator.mgmt.model.FluentType; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; public class FluentModelMapper extends ModelMapper { private static final FluentModelMapper INSTANCE = new FluentModelMapper(); - private final Set removedModels = new HashSet<>(); + private final Set removedModels = new LinkedHashSet<>(); public static FluentModelMapper getInstance() { return INSTANCE; diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentObjectMapper.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentObjectMapper.java index 89fdd111fef..03d64195c04 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentObjectMapper.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentObjectMapper.java @@ -9,7 +9,7 @@ import com.microsoft.typespec.http.client.generator.mgmt.model.FluentType; import com.microsoft.typespec.http.client.generator.mgmt.util.Utils; import java.util.Collection; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; @@ -55,7 +55,7 @@ protected ClassType mapPredefinedModel(ObjectSchema compositeType) { * @return The types from compositeTypes that need to be added. */ public Set addInnerModels(Collection compositeTypes) { - Set compositeTypesToAdd = new HashSet<>(compositeTypes); + Set compositeTypesToAdd = new LinkedHashSet<>(compositeTypes); compositeTypesToAdd.removeAll(innerModels); innerModels.addAll(compositeTypesToAdd); return compositeTypesToAdd; diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentPomMapper.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentPomMapper.java index 5ac5d9d31a2..ac40b2cccc8 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentPomMapper.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/FluentPomMapper.java @@ -9,7 +9,7 @@ import com.microsoft.typespec.http.client.generator.core.model.projectmodel.Project; import com.microsoft.typespec.http.client.generator.mgmt.model.projectmodel.FluentProject; import java.util.ArrayList; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -25,7 +25,7 @@ public Pom map(FluentProject project) { pom.setServiceName(project.getServiceName() + " Management"); pom.setServiceDescription(project.getServiceDescriptionForPom()); - Set addedDependencyPrefixes = new HashSet<>(); + Set addedDependencyPrefixes = new LinkedHashSet<>(); List dependencyIdentifiers = new ArrayList<>(); addDependencyIdentifier(dependencyIdentifiers, addedDependencyPrefixes, Project.Dependency.AZURE_CORE, false); addDependencyIdentifier(dependencyIdentifiers, addedDependencyPrefixes, diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/MockTestParser.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/MockTestParser.java index 6c7723c0951..e5a27056234 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/MockTestParser.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/MockTestParser.java @@ -29,7 +29,7 @@ import io.clientcore.core.http.models.HttpMethod; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import org.slf4j.Logger; @@ -185,7 +185,7 @@ private static ResponseInfo createProxyMethodExampleResponse(ClientMethod client Object firstJsonObjectInPageable = ModelTestCaseUtil.jsonFromType(0, elementType); // put to first element in array - Map jsonMap = new HashMap<>(); + Map jsonMap = new LinkedHashMap<>(); jsonMap.put(clientMethod.getMethodPageDetails().getSerializedItemName(), Collections.singletonList(firstJsonObjectInPageable)); @@ -213,7 +213,7 @@ private static ResponseInfo createProxyMethodExampleResponse(ClientMethod client verificationObjectName = "response"; verificationNode = ModelExampleUtil.parseNode(clientReturnType, jsonObject); } - Map responseObject = new HashMap<>(); + Map responseObject = new LinkedHashMap<>(); responseObject.put("body", jsonObject); return new ResponseInfo(new ProxyMethodExample.Response(statusCode, responseObject), verificationNode, verificationObjectName); diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/ResourceParser.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/ResourceParser.java index 250b89b4d85..507ad2dface 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/ResourceParser.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/mapper/ResourceParser.java @@ -33,9 +33,8 @@ import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; import java.util.Map; @@ -82,15 +81,14 @@ private static void processAdditionalProperties(FluentResourceModel model) { if (model.getCategory() != ModelCategory.IMMUTABLE) { if (FluentUtils.modelHasLocationProperty(model) && !model.hasProperty("region")) { // if resource instance has location property, add region() method - methods.add(MethodTemplate.builder() - .imports(Collections.singletonList(FluentType.REGION.getFullName())) - .comment(commentBlock -> { + methods.add( + MethodTemplate.builder().imports(List.of(FluentType.REGION.getFullName())).comment(commentBlock -> { commentBlock.description("Gets the region of the resource."); commentBlock.methodReturns("the region of the resource."); }) - .methodSignature("Region region()") - .method(methodBlock -> methodBlock.methodReturn("Region.fromName(this.regionName())")) - .build()); + .methodSignature("Region region()") + .method(methodBlock -> methodBlock.methodReturn("Region.fromName(this.regionName())")) + .build()); methods.add(MethodTemplate.builder().comment(commentBlock -> { commentBlock.description("Gets the name of the resource region."); commentBlock.methodReturns("the name of the resource region."); @@ -184,7 +182,7 @@ static List resolveResourceCreate(FluentResourceCollection colle .collect(Collectors.toMap(m -> m.getInterfaceType().toString(), Function.identity())); List supportsCreateList = new ArrayList<>(); - Set foundModels = new HashSet<>(); + Set foundModels = new LinkedHashSet<>(); for (ModelCategory category : categories) { Map modelResourceCreateMap = findResourceCreateForCategory(collection, diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/FluentType.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/FluentType.java index aa115a0c1fd..d57588c394f 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/FluentType.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/FluentType.java @@ -34,9 +34,6 @@ public class FluentType { public static final ClassType SYSTEM_DATA = new ClassType.Builder().packageName("com.azure.core.management").name("SystemData").build(); - public static final ClassType AZURE_RESOURCE_MANAGER - = new ClassType.Builder().packageName("com.azure.resourcemanager").name("AzureResourceManager").build(); - public static final ClassType ADDITIONAL_INFO = new ClassType.Builder().packageName("com.azure.core.management.exception").name("AdditionalInfo").build(); diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/arm/ResourceClientModel.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/arm/ResourceClientModel.java index 54d84962551..aab9d4ea1b6 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/arm/ResourceClientModel.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/arm/ResourceClientModel.java @@ -9,7 +9,7 @@ import com.microsoft.typespec.http.client.generator.core.model.clientmodel.MapType; import com.microsoft.typespec.http.client.generator.mgmt.model.ResourceTypeName; import java.util.Arrays; -import java.util.Collections; +import java.util.List; import java.util.Optional; public class ResourceClientModel { @@ -20,7 +20,7 @@ private ResourceClientModel() { private static final ClientModel MODEL_SUB_RESOURCE = new ClientModel.Builder().name(ResourceTypeName.SUB_RESOURCE) .packageName("com.azure.core.management") - .properties(Collections.singletonList(new ClientModelProperty.Builder().name(ResourceTypeName.FIELD_ID) + .properties(List.of(new ClientModelProperty.Builder().name(ResourceTypeName.FIELD_ID) .serializedName(ResourceTypeName.FIELD_ID) .description("Fully qualified resource Id for the resource.") .wireType(ClassType.STRING) diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/FluentLiveTestCase.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/FluentLiveTestCase.java index 13fa85f4f68..1c2a0d22cf8 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/FluentLiveTestCase.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/FluentLiveTestCase.java @@ -6,13 +6,13 @@ import com.microsoft.typespec.http.client.generator.core.model.clientmodel.examplemodel.ExampleHelperFeature; import java.util.ArrayList; import java.util.Collections; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; public class FluentLiveTestCase { - private final Set helperFeatures = new HashSet<>(); + private final Set helperFeatures = new LinkedHashSet<>(); private final List steps = new ArrayList<>(); private String methodName; private String description; @@ -38,8 +38,8 @@ public List getSteps() { } public static final class Builder { - private Set helperFeatures = new HashSet<>(); - private List steps = new ArrayList<>(); + private final Set helperFeatures = new LinkedHashSet<>(); + private final List steps = new ArrayList<>(); private String methodName; private String description; diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/FluentLiveTests.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/FluentLiveTests.java index a45d30f3b09..475eea8fbd9 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/FluentLiveTests.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/FluentLiveTests.java @@ -9,15 +9,15 @@ import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; import java.util.Collection; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; public class FluentLiveTests { private String className; - private final Set imports = new HashSet<>(); - private final Set helperFeatures = new HashSet<>(); + private final Set imports = new LinkedHashSet<>(); + private final Set helperFeatures = new LinkedHashSet<>(); private final List testCases = new ArrayList<>(); private ClassType managerType; private String managerName; @@ -56,8 +56,8 @@ public static Builder newBuilder() { public static final class Builder { private String className; - private final Set imports = new HashSet<>(); - private final Set helperFeatures = new HashSet<>(); + private final Set imports = new LinkedHashSet<>(); + private final Set helperFeatures = new LinkedHashSet<>(); private final List testCases = new ArrayList<>(); private ClassType managerType; private String managerName; diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/FluentResourceCollection.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/FluentResourceCollection.java index c9720716832..ab1f60768be 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/FluentResourceCollection.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/FluentResourceCollection.java @@ -21,7 +21,7 @@ import com.microsoft.typespec.http.client.generator.mgmt.util.FluentUtils; import com.microsoft.typespec.http.client.generator.mgmt.util.Utils; import java.util.ArrayList; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -153,15 +153,15 @@ public ClassType getImplementationType() { public List getMethodsForTemplate() { List fluentMethods = new ArrayList<>(methods); - Set excludeMethods = new HashSet<>(); - excludeMethods.addAll(this.getResourceCreates() + Set excludeMethods = new LinkedHashSet<>(); + this.getResourceCreates() .stream() .flatMap(rc -> rc.getMethodReferences().stream()) - .collect(Collectors.toSet())); - excludeMethods.addAll(this.getResourceUpdates() + .forEach(excludeMethods::add); + this.getResourceUpdates() .stream() .flatMap(ru -> ru.getMethodReferences().stream()) - .collect(Collectors.toSet())); + .forEach(excludeMethods::add); fluentMethods.removeAll(excludeMethods); return fluentMethods; diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/examplemodel/FluentClientMethodExample.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/examplemodel/FluentClientMethodExample.java index a93ed710289..8a84ec1764c 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/examplemodel/FluentClientMethodExample.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/examplemodel/FluentClientMethodExample.java @@ -8,13 +8,13 @@ import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ClientMethod; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.MethodGroupClient; import com.microsoft.typespec.http.client.generator.core.util.CodeNamer; -import com.microsoft.typespec.http.client.generator.mgmt.model.FluentType; +import com.microsoft.typespec.http.client.generator.mgmt.model.clientmodel.FluentStatic; import com.microsoft.typespec.http.client.generator.mgmt.model.clientmodel.ModelNaming; +import com.microsoft.typespec.http.client.generator.mgmt.util.FluentUtils; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.regex.Pattern; /** * Model of example for service client method (usually for Fluent Premium). @@ -26,6 +26,7 @@ public class FluentClientMethodExample implements FluentMethodExample { private final MethodGroupClient methodGroup; private final ClientMethod clientMethod; private final List parameters = new ArrayList<>(); + private final ClassType managerType; public FluentClientMethodExample(String name, String originalFileName, MethodGroupClient methodGroup, ClientMethod clientMethod) { @@ -33,6 +34,13 @@ public FluentClientMethodExample(String name, String originalFileName, MethodGro this.originalFileName = originalFileName; this.methodGroup = methodGroup; this.clientMethod = clientMethod; + + String clientName = FluentStatic.getClient().getServiceClient().getClientBaseName(); + String serviceName = FluentUtils.getServiceName(clientName); + JavaSettings settings = JavaSettings.getInstance(); + this.managerType = new ClassType.Builder().packageName(settings.getPackage()) + .name(CodeNamer.toPascalCase(serviceName) + "Manager") + .build(); } public MethodGroupClient getMethodGroup() { @@ -55,17 +63,17 @@ public String getOriginalFileName() { @Override public ClassType getEntryType() { - return FluentType.AZURE_RESOURCE_MANAGER; + return managerType; } @Override public String getEntryName() { - return "azure"; + return "manager"; } @Override public String getEntryDescription() { - return "The entry point for accessing resource management APIs in Azure."; + return String.format("Entry point to %1$s.", managerType.getName()); } @Override @@ -76,46 +84,17 @@ public List getParameters() { @Override public String getMethodReference() { JavaSettings settings = JavaSettings.getInstance(); - String namespace = settings.getPackage(); - String[] identifiers = namespace.split(Pattern.quote(".")); - String lastIdentifier = identifiers[identifiers.length - 1]; + String lastIdentifier = namespace.substring(namespace.lastIndexOf('.') + 1); + // Guard against accidental premium code generation for non-premium libraries if (!MANAGER_REFERENCE.containsKey(lastIdentifier)) { throw new IllegalStateException("Package '" + namespace + "' is not supported by Fluent Premium"); } - String managerReference = MANAGER_REFERENCE.get(lastIdentifier) + "." + ModelNaming.METHOD_MANAGER + "()"; String serviceClientReference = ModelNaming.METHOD_SERVICE_CLIENT + "()"; - if ("authorization".equals(lastIdentifier)) { - serviceClientReference = "roleServiceClient()"; - } else if ("resources".equals(lastIdentifier)) { - String tag = settings.getAutorestSettings().getTag(); - if (tag.contains("feature")) { - serviceClientReference = "featureClient()"; - } else if (tag.contains("policy")) { - serviceClientReference = "policyClient()"; - } else if (tag.contains("subscriptions")) { - serviceClientReference = "subscriptionClient()"; - } else if (tag.contains("locks")) { - serviceClientReference = "managementLockClient()"; - } else if (tag.contains("changes")) { - serviceClientReference = "resourceChangeClient()"; - } else if (tag.contains("databoundaries")) { - serviceClientReference = "dataBoundaryClient()"; - } else if (!tag.contains("resources")) { - // OpenAPI source of deployments moved to a separate folder - serviceClientReference = "deploymentClient()"; - } - } else if ("containerregistry".equals(lastIdentifier)) { - String title = settings.getAutorestSettings().getTitle(); - if ("ContainerRegistryTasks".equals(title)) { - serviceClientReference = "taskClient()"; - } - } - String methodGroupReference = "get" + CodeNamer.toPascalCase(methodGroup.getVariableName()) + "()"; - return managerReference + "." + serviceClientReference + "." + methodGroupReference; + return serviceClientReference + "." + methodGroupReference; } @Override @@ -123,7 +102,7 @@ public String getMethodName() { return clientMethod.getName(); } - private final static Map MANAGER_REFERENCE = new HashMap<>(); + private static final Map MANAGER_REFERENCE = new HashMap<>(); static { MANAGER_REFERENCE.put("appplatform", "springServices()"); MANAGER_REFERENCE.put("appservice", "webApps()"); diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/ResourceOperation.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/ResourceOperation.java index 1c3983adde3..63f018c7f40 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/ResourceOperation.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/ResourceOperation.java @@ -27,8 +27,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.HashSet; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Optional; @@ -127,7 +127,7 @@ protected List getProperties() { // method parameters private List getParametersByLocation(RequestParameterLocation parameterLocation) { - return getParametersByLocation(new HashSet<>(Collections.singletonList(parameterLocation))); + return getParametersByLocation(new LinkedHashSet<>(List.of(parameterLocation))); } private List getParametersByLocation(Set parameterLocations) { @@ -157,7 +157,7 @@ public List getPathParameters() { public List getMiscParameters() { // header or query return getParametersByLocation( - new HashSet<>(Arrays.asList(RequestParameterLocation.HEADER, RequestParameterLocation.QUERY))).stream() + new LinkedHashSet<>(List.of(RequestParameterLocation.HEADER, RequestParameterLocation.QUERY))).stream() .map(MethodParameter::getClientMethodParameter) .collect(Collectors.toList()); } diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/delete/ResourceDelete.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/delete/ResourceDelete.java index 4e1e2f59d58..653eb698862 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/delete/ResourceDelete.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/delete/ResourceDelete.java @@ -18,7 +18,6 @@ import com.microsoft.typespec.http.client.generator.mgmt.util.FluentUtils; import com.microsoft.typespec.http.client.generator.mgmt.util.Utils; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.stream.Collectors; import org.slf4j.Logger; @@ -36,7 +35,7 @@ public ResourceDelete(FluentResourceModel resourceModel, FluentResourceCollectio @Override public List getFluentMethods() { - return Collections.emptyList(); + return List.of(); } @Override diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/method/CollectionMethodOperationByIdTemplate.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/method/CollectionMethodOperationByIdTemplate.java index 36b1c5108de..be1a5afed7d 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/method/CollectionMethodOperationByIdTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/method/CollectionMethodOperationByIdTemplate.java @@ -24,7 +24,7 @@ import com.microsoft.typespec.http.client.generator.mgmt.util.Utils; import java.util.ArrayList; import java.util.Collections; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -44,7 +44,7 @@ public CollectionMethodOperationByIdTemplate(FluentResourceModel model, String n this.name = name; final ResourceLocalVariables localVariables = resourceLocalVariables - .getDeduplicatedLocalVariables(new HashSet<>(Collections.singleton(ModelNaming.METHOD_PARAMETER_NAME_ID))); + .getDeduplicatedLocalVariables(new LinkedHashSet<>(List.of(ModelNaming.METHOD_PARAMETER_NAME_ID))); final boolean removeResponseInReturnType = !includeContextParameter; final IType returnType = getReturnType(collectionMethod.getFluentReturnType(), removeResponseInReturnType); final boolean responseInReturnTypeRemoved @@ -74,7 +74,7 @@ public CollectionMethodOperationByIdTemplate(FluentResourceModel model, String n } // method invocation - Set parametersSet = new HashSet<>(parameters); + Set parametersSet = new LinkedHashSet<>(parameters); List methodParameters = collectionMethod.getInnerClientMethod().getMethodParameters(); String argumentsLine = methodParameters.stream() .map(p -> FluentUtils.getLocalMethodArgument(p, parametersSet, localVariables, model, collectionMethod)) diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/method/FluentActionMethod.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/method/FluentActionMethod.java index 368916ff739..be2e5f300f4 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/method/FluentActionMethod.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/method/FluentActionMethod.java @@ -21,7 +21,7 @@ import com.microsoft.typespec.http.client.generator.mgmt.model.clientmodel.fluentmodel.ResourceLocalVariables; import com.microsoft.typespec.http.client.generator.mgmt.util.FluentUtils; import java.util.ArrayList; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -86,7 +86,7 @@ public FluentActionMethod(FluentResourceModel model, FluentMethodType type, Flue .get(); // method invocation - Set parametersSet = new HashSet<>(parameters); + Set parametersSet = new LinkedHashSet<>(parameters); List methodParameters = method.getMethodInputParameters(); String argumentsLine = methodParameters.stream() .map(p -> FluentUtils.getLocalMethodArgument(p, parametersSet, resourceLocalVariables, model, diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/method/FluentBaseMethod.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/method/FluentBaseMethod.java index 59a07de98b3..4e66bb3f026 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/method/FluentBaseMethod.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/fluentmodel/method/FluentBaseMethod.java @@ -18,7 +18,7 @@ import com.microsoft.typespec.http.client.generator.mgmt.model.clientmodel.fluentmodel.LocalVariable; import com.microsoft.typespec.http.client.generator.mgmt.model.clientmodel.fluentmodel.ResourceLocalVariables; import com.microsoft.typespec.http.client.generator.mgmt.util.FluentUtils; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -65,7 +65,7 @@ public FluentBaseMethod(FluentResourceModel model, FluentMethodType type, String .get(); // method invocation - Set parametersSet = new HashSet<>(parameters); + Set parametersSet = new LinkedHashSet<>(parameters); List methodParameters = collectionMethod.getInnerClientMethod().getMethodInputParameters(); String argumentsLine = methodParameters.stream() diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/immutablemodel/CollectionMethodTemplate.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/immutablemodel/CollectionMethodTemplate.java index 88d919d79c2..7385ad766a8 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/immutablemodel/CollectionMethodTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/immutablemodel/CollectionMethodTemplate.java @@ -12,7 +12,7 @@ import com.microsoft.typespec.http.client.generator.mgmt.model.clientmodel.ModelNaming; import com.microsoft.typespec.http.client.generator.mgmt.util.TypeConversionUtils; import java.util.Collections; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; // Implementation method template for simple return type @@ -22,7 +22,7 @@ public class CollectionMethodTemplate implements ImmutableMethod { private final MethodTemplate implementationMethodTemplate; public CollectionMethodTemplate(FluentCollectionMethod fluentMethod, IType innerType) { - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); fluentMethod.addImportsTo(imports, false); // Type inner = ... innerType.addImportsTo(imports, false); diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/immutablemodel/CollectionMethodTypeConversionTemplate.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/immutablemodel/CollectionMethodTypeConversionTemplate.java index 4178b91b55e..72a55508247 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/immutablemodel/CollectionMethodTypeConversionTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/immutablemodel/CollectionMethodTypeConversionTemplate.java @@ -13,7 +13,7 @@ import com.microsoft.typespec.http.client.generator.mgmt.util.FluentUtils; import com.microsoft.typespec.http.client.generator.mgmt.util.TypeConversionUtils; import java.util.Collections; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; import java.util.stream.Collectors; @@ -26,7 +26,7 @@ public class CollectionMethodTypeConversionTemplate implements ImmutableMethod { private final MethodTemplate conversionMethodTemplate; public CollectionMethodTypeConversionTemplate(FluentCollectionMethod fluentMethod, IType innerType) { - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); fluentMethod.addImportsTo(imports, false); // Type inner = ... innerType.addImportsTo(imports, false); @@ -48,7 +48,7 @@ public CollectionMethodTypeConversionTemplate(FluentCollectionMethod fluentMetho block.line( String.format("%1$s %2$s = this.%3$s().%4$s;", innerType, TypeConversionUtils.tempVariableName(), ModelNaming.METHOD_SERVICE_CLIENT, fluentMethod.getMethodInvocation())); - if (TypeConversionUtils.isPagedIterable(innerType)) { + if (TypeConversionUtils.isPagedIterable(innerType) || TypeConversionUtils.isResponse(innerType)) { block.methodReturn( TypeConversionUtils.conversionExpression(innerType, TypeConversionUtils.tempVariableName())); } else { diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/immutablemodel/PropertyTemplate.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/immutablemodel/PropertyTemplate.java index 953afbb3fd0..7d669101797 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/immutablemodel/PropertyTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/immutablemodel/PropertyTemplate.java @@ -11,7 +11,7 @@ import com.microsoft.typespec.http.client.generator.mgmt.model.clientmodel.ModelNaming; import com.microsoft.typespec.http.client.generator.mgmt.util.TypeConversionUtils; import java.util.Collections; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; // Implementation method template for simple property @@ -21,7 +21,7 @@ public class PropertyTemplate implements ImmutableMethod { private final MethodTemplate implementationMethodTemplate; public PropertyTemplate(FluentModelProperty fluentProperty, ModelProperty property) { - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); fluentProperty.getFluentType().addImportsTo(imports, false); if (property.getClientType() instanceof ListType || property.getClientType() instanceof MapType) { // Type inner = ... diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/immutablemodel/PropertyTypeConversionTemplate.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/immutablemodel/PropertyTypeConversionTemplate.java index 92d981430c1..bb90445c675 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/immutablemodel/PropertyTypeConversionTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/immutablemodel/PropertyTypeConversionTemplate.java @@ -11,7 +11,7 @@ import com.microsoft.typespec.http.client.generator.mgmt.model.clientmodel.ModelNaming; import com.microsoft.typespec.http.client.generator.mgmt.util.TypeConversionUtils; import java.util.Collections; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; import java.util.stream.Collectors; @@ -28,7 +28,7 @@ public class PropertyTypeConversionTemplate implements ImmutableMethod { private final MethodTemplate conversionMethodTemplate; public PropertyTypeConversionTemplate(FluentModelProperty fluentProperty, ModelProperty property) { - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); fluentProperty.getFluentType().addImportsTo(imports, false); // Type inner = ... property.getClientType().addImportsTo(imports, false); diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/projectmodel/FluentProject.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/projectmodel/FluentProject.java index 26d7cd99388..412b47bc238 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/projectmodel/FluentProject.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/projectmodel/FluentProject.java @@ -19,7 +19,9 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Optional; +import java.util.stream.Collectors; import org.slf4j.Logger; public class FluentProject extends Project { @@ -28,13 +30,13 @@ public class FluentProject extends Project { private final ServiceDescription serviceDescription = new ServiceDescription(); - private String apiVersionInTypeSpec = null; + private Map apiVersionMap = null; private Changelog changelog; private final List codeSamples = new ArrayList<>(); - public void setApiVersionInTypeSpec(String apiVersionInTypeSpec) { - this.apiVersionInTypeSpec = apiVersionInTypeSpec; + public void setApiVersionInTypeSpec(Map apiVersionMap) { + this.apiVersionMap = apiVersionMap; } private static class ServiceDescription { @@ -60,12 +62,12 @@ public String getServiceDescriptionForMarkdown() { } } - public FluentProject(FluentClient fluentClient, String apiVersionInTypeSpec) { - this(fluentClient.getManager().getServiceName(), apiVersionInTypeSpec, + public FluentProject(FluentClient fluentClient, Map apiVersionMap) { + this(fluentClient.getManager().getServiceName(), apiVersionMap, fluentClient.getInnerClient().getClientDescription()); } - protected FluentProject(String serviceName, String apiVersionInTypeSpec, String clientDescription) { + protected FluentProject(String serviceName, Map apiVersionMap, String clientDescription) { this.groupId = "com.azure.resourcemanager"; this.serviceName = serviceName; @@ -89,8 +91,16 @@ protected FluentProject(String serviceName, String apiVersionInTypeSpec, String // SDK from TypeSpec does not contain autorest tag. if (autorestTag != null) { this.serviceDescription.tagDescription = "Package tag " + autorestTag + "."; - } else if (apiVersionInTypeSpec != null) { - this.serviceDescription.tagDescription = "Package api-version " + apiVersionInTypeSpec + "."; + } else if (apiVersionMap != null) { + if (apiVersionMap.size() == 1) { + this.serviceDescription.tagDescription + = "Package api-version " + apiVersionMap.values().iterator().next() + "."; + } else { + this.serviceDescription.tagDescription = "Package api-version " + apiVersionMap.entrySet() + .stream() + .map(e -> e.getKey() + ": " + e.getValue()) + .collect(Collectors.joining(", ")) + "."; + } } else { this.serviceDescription.tagDescription = ""; } diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentManagerTemplate.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentManagerTemplate.java index 7a6eb8337fa..5694ed1db9a 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentManagerTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentManagerTemplate.java @@ -20,7 +20,7 @@ import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.ArrayList; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Objects; @@ -69,7 +69,7 @@ public void write(FluentManager manager, FluentProject project, JavaFile javaFil String managerName = manager.getType().getName(); - Set imports = new HashSet<>(List.of( + Set imports = new LinkedHashSet<>(List.of( // java Objects.class.getName(), Duration.class.getName(), ChronoUnit.class.getName(), List.class.getName(), ArrayList.class.getName(), Collectors.class.getName(), Map.class.getName(), diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentMethodMockTestTemplate.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentMethodMockTestTemplate.java index fac5f02f314..e4339797531 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentMethodMockTestTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentMethodMockTestTemplate.java @@ -22,7 +22,7 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.time.OffsetDateTime; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -52,7 +52,7 @@ public static FluentMethodMockTestTemplate getInstance() { @Override public void write(ClientMethodInfo info, JavaFile javaFile) { Set imports - = new HashSet<>(List.of(ClassType.ACCESS_TOKEN.getFullName(), ClassType.HTTP_CLIENT.getFullName(), + = new LinkedHashSet<>(List.of(ClassType.ACCESS_TOKEN.getFullName(), ClassType.HTTP_CLIENT.getFullName(), ClassType.HTTP_HEADERS.getFullName(), ClassType.HTTP_REQUEST.getFullName(), ClassType.HTTP_RESPONSE.getFullName(), "com.azure.core.test.http.MockHttpResponse", ClassType.AZURE_CLOUD.getFullName(), FluentType.AZURE_PROFILE.getFullName(), diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentProxyTemplate.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentProxyTemplate.java index f1730d26faf..14485a255b7 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentProxyTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentProxyTemplate.java @@ -8,7 +8,7 @@ import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ProxyMethodParameter; import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaInterface; import com.microsoft.typespec.http.client.generator.core.template.ProxyTemplate; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Locale; import java.util.Map; import java.util.Set; @@ -24,7 +24,7 @@ public static FluentProxyTemplate getInstance() { @Override protected void writeProxyMethodHeaders(ProxyMethod restAPIMethod, JavaInterface interfaceBlock) { - Map headers = new HashMap<>(); + Map headers = new LinkedHashMap<>(); headers.put("Content-Type", restAPIMethod.getRequestContentType()); headers.put("Accept", String.join(",", restAPIMethod.getResponseContentTypes())); diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentResourceCollectionImplementationTemplate.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentResourceCollectionImplementationTemplate.java index 76ee76bcae3..923eddfd880 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentResourceCollectionImplementationTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentResourceCollectionImplementationTemplate.java @@ -14,7 +14,7 @@ import com.microsoft.typespec.http.client.generator.mgmt.model.clientmodel.fluentmodel.method.FluentMethod; import com.microsoft.typespec.http.client.generator.mgmt.util.FluentUtils; import java.util.ArrayList; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -32,7 +32,7 @@ public static FluentResourceCollectionImplementationTemplate getInstance() { public void write(FluentResourceCollection collection, JavaFile javaFile) { ClassType managerType = FluentStatic.getFluentManager().getType(); - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); // ClientLogger ClassType.CLIENT_LOGGER.addImportsTo(imports, false); /* diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentResourceCollectionInterfaceTemplate.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentResourceCollectionInterfaceTemplate.java index cee7e2b9770..0422537301a 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentResourceCollectionInterfaceTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentResourceCollectionInterfaceTemplate.java @@ -8,7 +8,7 @@ import com.microsoft.typespec.http.client.generator.core.template.IJavaTemplate; import com.microsoft.typespec.http.client.generator.mgmt.model.clientmodel.FluentResourceCollection; import com.microsoft.typespec.http.client.generator.mgmt.model.clientmodel.fluentmodel.method.FluentDefineMethod; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; public class FluentResourceCollectionInterfaceTemplate implements IJavaTemplate { @@ -22,7 +22,7 @@ public static FluentResourceCollectionInterfaceTemplate getInstance() { @Override public void write(FluentResourceCollection collection, JavaFile javaFile) { - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); collection.addImportsTo(imports, false); collection.getResourceCreates().forEach(rc -> rc.getDefineMethod().addImportsTo(imports, false)); javaFile.declareImport(imports); diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentResourceModelImplementationTemplate.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentResourceModelImplementationTemplate.java index 95a0b1a5c80..0c1ea822b0c 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentResourceModelImplementationTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentResourceModelImplementationTemplate.java @@ -16,7 +16,7 @@ import com.microsoft.typespec.http.client.generator.mgmt.model.clientmodel.immutablemodel.ImmutableMethod; import com.microsoft.typespec.http.client.generator.mgmt.util.FluentUtils; import java.util.ArrayList; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -37,7 +37,7 @@ public void write(FluentResourceModel model, JavaFile javaFile) { model.getProperties().forEach(p -> methodTemplates.add(p.getImplementationMethodTemplate())); methodTemplates.addAll(model.getAdditionalMethods()); - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); /* * use full name for FooManager, to avoid naming conflict * // manager diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentResourceModelInterfaceTemplate.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentResourceModelInterfaceTemplate.java index 0b5c05a1844..85b426421a7 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentResourceModelInterfaceTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentResourceModelInterfaceTemplate.java @@ -7,7 +7,7 @@ import com.microsoft.typespec.http.client.generator.core.template.IJavaTemplate; import com.microsoft.typespec.http.client.generator.mgmt.model.arm.ModelCategory; import com.microsoft.typespec.http.client.generator.mgmt.model.clientmodel.FluentResourceModel; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; public class FluentResourceModelInterfaceTemplate implements IJavaTemplate { @@ -25,7 +25,7 @@ public static FluentResourceModelInterfaceTemplate getInstance() { @Override public void write(FluentResourceModel model, JavaFile javaFile) { - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); // imports.add(Immutable.class.getName()); model.addImportsTo(imports, false); javaFile.declareImport(imports); diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/ResourceManagerUtilsTemplate.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/ResourceManagerUtilsTemplate.java index b0c97ec190e..debdb3f795b 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/ResourceManagerUtilsTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/ResourceManagerUtilsTemplate.java @@ -14,8 +14,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.function.Function; @@ -35,7 +35,7 @@ public static ResourceManagerUtilsTemplate getInstance() { MethodTemplate getValueFromIdByNameMethod = MethodTemplate.builder() .imports(List.of(Arrays.class.getName(), Iterator.class.getName())) .visibility(JavaVisibility.PackagePrivate) - .modifiers(Collections.singletonList(JavaModifier.Static)) + .modifiers(List.of(JavaModifier.Static)) .methodSignature("String getValueFromIdByName(String id, String name)") .method( block -> block.line(FluentUtils.loadTextFromResource("ResourceManagerUtils_getValueFromIdByName.txt"))) @@ -46,7 +46,7 @@ public static ResourceManagerUtilsTemplate getInstance() { .imports(List.of(Arrays.class.getName(), Iterator.class.getName(), List.class.getName(), ArrayList.class.getName(), ClassType.CORE_UTILS.getFullName(), Collections.class.getName())) .visibility(JavaVisibility.PackagePrivate) - .modifiers(Collections.singletonList(JavaModifier.Static)) + .modifiers(List.of(JavaModifier.Static)) .methodSignature( "String getValueFromIdByParameterName(String id, String pathTemplate, String parameterName)") .method(block -> block @@ -66,12 +66,12 @@ public void write(JavaFile javaFile) { @Override public void write(Void ignored, JavaFile javaFile) { - Set imports = new HashSet<>(); + Set imports = new LinkedHashSet<>(); METHOD_TEMPLATES.forEach(mt -> mt.addImportsTo(imports)); imports.addAll(IMPORTS_UTILS_PAGED_ITERABLE); javaFile.declareImport(imports); - javaFile.classBlock(JavaVisibility.PackagePrivate, Collections.singletonList(JavaModifier.Final), + javaFile.classBlock(JavaVisibility.PackagePrivate, List.of(JavaModifier.Final), ModelNaming.CLASS_RESOURCE_MANAGER_UTILS, classBlock -> { classBlock.constructor(JavaVisibility.Private, ModelNaming.CLASS_RESOURCE_MANAGER_UTILS + "()", constructorBlock -> { diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/ErrorTypeNormalization.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/ErrorTypeNormalization.java index 60e5a3d3184..24d2a5d152a 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/ErrorTypeNormalization.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/ErrorTypeNormalization.java @@ -20,9 +20,6 @@ import com.microsoft.typespec.http.client.generator.mgmt.util.Utils; import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Objects; @@ -52,9 +49,8 @@ public CodeModel process(CodeModel codeModel) { } private static final Set MANAGEMENT_ERROR_FIELDS - = new HashSet<>(Arrays.asList("code", "message", "target", "details", "additionalInfo")); - private static final Set MANAGEMENT_ERROR_FIELDS_MIN_REQUIRED - = new HashSet<>(Arrays.asList("code", "message")); + = Set.of("code", "message", "target", "details", "additionalInfo"); + private static final Set MANAGEMENT_ERROR_FIELDS_MIN_REQUIRED = Set.of("code", "message"); private static final ObjectSchema DUMMY_ERROR = dummyManagementError(); @@ -130,8 +126,8 @@ private void normalizeErrorType(ObjectSchema error, ObjectSchema errorSchema) { // make it a subclass of ManagementError Relations parents = new Relations(); - parents.setAll(Collections.singletonList(DUMMY_ERROR)); - parents.setImmediate(Collections.singletonList(DUMMY_ERROR)); + parents.setAll(List.of(DUMMY_ERROR)); + parents.setImmediate(List.of(DUMMY_ERROR)); errorSchema.setParents(parents); if (errorSchema != error) { @@ -249,8 +245,8 @@ private void normalizeErrorDetailType(Property details) { case SUBCLASS_MANAGEMENT_ERROR: case GENERIC: Relations parents = new Relations(); - parents.setAll(Collections.singletonList(DUMMY_ERROR)); - parents.setImmediate(Collections.singletonList(DUMMY_ERROR)); + parents.setAll(List.of(DUMMY_ERROR)); + parents.setImmediate(List.of(DUMMY_ERROR)); error.setParents(parents); filterProperties(error); diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/NamingConflictResolver.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/NamingConflictResolver.java index 439d89e0cd8..d1bbda4d72d 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/NamingConflictResolver.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/NamingConflictResolver.java @@ -12,7 +12,7 @@ import com.microsoft.typespec.http.client.generator.mgmt.FluentNamer; import com.microsoft.typespec.http.client.generator.mgmt.util.Constants; import com.microsoft.typespec.http.client.generator.mgmt.util.Utils; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Locale; import java.util.Set; import java.util.stream.Collectors; @@ -25,7 +25,7 @@ public class NamingConflictResolver { public CodeModel process(CodeModel codeModel) { // conform to lowercase, to avoid problem on Windows system, where file name is case-insensitive - Set methodGroupNamesLowerCase = new HashSet<>(); + Set methodGroupNamesLowerCase = new LinkedHashSet<>(); Set objectNamesLowerCase = codeModel.getSchemas() .getObjects() .stream() diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/OperationNameNormalization.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/OperationNameNormalization.java index fa8369ac9ab..888cb89aa51 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/OperationNameNormalization.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/OperationNameNormalization.java @@ -16,10 +16,9 @@ import com.microsoft.typespec.http.client.generator.mgmt.model.WellKnownMethodName; import com.microsoft.typespec.http.client.generator.mgmt.util.Utils; import io.clientcore.core.http.models.HttpMethod; -import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Objects; @@ -102,10 +101,10 @@ private static void rename(OperationGroup operationGroup, Map re private static Map makeRenamePlan(OperationGroup operationGroup) { final Set candidateWellKnownName - = new HashSet<>(Arrays.asList(WellKnownMethodName.LIST, WellKnownMethodName.LIST_BY_RESOURCE_GROUP, + = new LinkedHashSet<>(List.of(WellKnownMethodName.LIST, WellKnownMethodName.LIST_BY_RESOURCE_GROUP, WellKnownMethodName.GET_BY_RESOURCE_GROUP, WellKnownMethodName.DELETE)); - Map renamePlan = new HashMap<>(); + Map renamePlan = new LinkedHashMap<>(); for (Operation operation : operationGroup.getOperations()) { String path = operation.getRequests().iterator().next().getProtocol().getHttp().getPath().trim(); diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/ResourceTypeNormalization.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/ResourceTypeNormalization.java index fa2e7407a6c..876fc737706 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/ResourceTypeNormalization.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/ResourceTypeNormalization.java @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashSet; import java.util.List; import java.util.Optional; import java.util.Set; @@ -47,7 +47,7 @@ class ResourceTypeNormalization { // lost systemData property. // Hence, we need to have CustomResource processed first. private static final Set LAST_TO_PROCESS_SCHEMA_NAMES - = new HashSet<>(Arrays.asList(ResourceTypeName.PROXY_RESOURCE, ResourceTypeName.PROXY_RESOURCE_AUTO_GENERATED, + = new LinkedHashSet<>(List.of(ResourceTypeName.PROXY_RESOURCE, ResourceTypeName.PROXY_RESOURCE_AUTO_GENERATED, ResourceTypeName.TRACKED_RESOURCE, ResourceTypeName.TRACKED_RESOURCE_AUTO_GENERATED, ResourceTypeName.RESOURCE, ResourceTypeName.RESOURCE_AUTO_GENERATED, ResourceTypeName.AZURE_RESOURCE, ResourceTypeName.AZURE_RESOURCE_AUTO_GENERATED)); @@ -87,15 +87,13 @@ public static ObjectSchema subResourceSchema() { return DUMMY_SUB_RESOURCE; } - private static final Set SUB_RESOURCE_FIELDS = new HashSet<>(Arrays.asList(ResourceTypeName.FIELD_ID)); - private static final Set PROXY_RESOURCE_FIELDS = new HashSet<>( - Arrays.asList(ResourceTypeName.FIELD_ID, ResourceTypeName.FIELD_NAME, ResourceTypeName.FIELD_TYPE)); - private static final Set RESOURCE_FIELDS - = new HashSet<>(Arrays.asList(ResourceTypeName.FIELD_ID, ResourceTypeName.FIELD_NAME, - ResourceTypeName.FIELD_TYPE, ResourceTypeName.FIELD_LOCATION, ResourceTypeName.FIELD_TAGS)); - + private static final Set SUB_RESOURCE_FIELDS = Set.of(ResourceTypeName.FIELD_ID); + private static final Set PROXY_RESOURCE_FIELDS + = Set.of(ResourceTypeName.FIELD_ID, ResourceTypeName.FIELD_NAME, ResourceTypeName.FIELD_TYPE); + private static final Set RESOURCE_FIELDS = Set.of(ResourceTypeName.FIELD_ID, ResourceTypeName.FIELD_NAME, + ResourceTypeName.FIELD_TYPE, ResourceTypeName.FIELD_LOCATION, ResourceTypeName.FIELD_TAGS); private static final Set RESOURCE_EXTRA_FIELDS - = new HashSet<>(Arrays.asList(ResourceTypeName.FIELD_LOCATION, ResourceTypeName.FIELD_TAGS)); + = Set.of(ResourceTypeName.FIELD_LOCATION, ResourceTypeName.FIELD_TAGS); private static final ObjectSchema DUMMY_SUB_RESOURCE = dummyResourceSchema(ResourceTypeName.SUB_RESOURCE); private static final ObjectSchema DUMMY_PROXY_RESOURCE = dummyResourceSchema(ResourceTypeName.PROXY_RESOURCE); @@ -386,7 +384,7 @@ private static void adaptForParentSchema(ObjectSchema compositeType, ObjectSchem */ private static List getDeclaredProperties(ObjectSchema parentType) { return parentType == null - ? Collections.emptyList() + ? List.of() : Stream .concat(parentType.getProperties().stream(), getDeclaredProperties(getObjectParent(parentType).orElse(null)).stream()) diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/SchemaCleanup.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/SchemaCleanup.java index c66dd3fd88d..5ede1eb8a6f 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/SchemaCleanup.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/SchemaCleanup.java @@ -17,7 +17,7 @@ import com.microsoft.typespec.http.client.generator.mgmt.FluentNamer; import com.microsoft.typespec.http.client.generator.mgmt.model.FluentType; import com.microsoft.typespec.http.client.generator.mgmt.util.Utils; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Objects; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; @@ -68,10 +68,10 @@ private static boolean tryCleanup(CodeModel codeModel, Set javaNamesForP })) .collect(Collectors.toSet()); - Set choicesSchemasNotInUse = new HashSet<>(codeModel.getSchemas().getSealedChoices()); + Set choicesSchemasNotInUse = new LinkedHashSet<>(codeModel.getSchemas().getSealedChoices()); choicesSchemasNotInUse.addAll(codeModel.getSchemas().getChoices()); - Set schemasInUse = new HashSet<>(); + Set schemasInUse = new LinkedHashSet<>(); if (!schemasNotInUse.isEmpty() || !choicesSchemasNotInUse.isEmpty()) { // properties of object Set propertiesOfObject = codeModel.getSchemas().getObjects().stream().filter(o -> { diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/SchemaNameNormalization.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/SchemaNameNormalization.java index eb04e4ebca9..079a8b89f5b 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/SchemaNameNormalization.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/transformer/SchemaNameNormalization.java @@ -23,8 +23,8 @@ import com.microsoft.typespec.http.client.generator.mgmt.util.Utils; import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Optional; @@ -41,7 +41,7 @@ public class SchemaNameNormalization { private static final Logger LOGGER = new PluginLogger(FluentNamer.getPluginInstance(), SchemaNameNormalization.class); - private final Map nameOverridePlan = new HashMap<>(); + private final Map nameOverridePlan = new LinkedHashMap<>(); public SchemaNameNormalization(Map nameOverridePlan) { nameOverridePlan.forEach((k, v) -> { @@ -60,7 +60,7 @@ public SchemaNameNormalization(Map nameOverridePlan) { public CodeModel process(CodeModel codeModel) { codeModel = namingOverride(codeModel); - Set names = new HashSet<>(); + Set names = new LinkedHashSet<>(); codeModel = normalizeUnnamedAdditionalProperties(codeModel, names); codeModel = normalizeUnnamedBaseType(codeModel, names); codeModel = normalizeUnnamedObjectTypeInArray(codeModel, names); // after normalizeUnnamedBaseType diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/util/FluentJavaSettings.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/util/FluentJavaSettings.java index dc7e8512598..3d6333d476f 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/util/FluentJavaSettings.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/util/FluentJavaSettings.java @@ -10,8 +10,8 @@ import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Objects; @@ -31,18 +31,18 @@ public class FluentJavaSettings { /** * Java class names for extra Inner classes. */ - private final Set javaNamesForAddInner = new HashSet<>(); + private final Set javaNamesForAddInner = new LinkedHashSet<>(); /** * Java class names for excluded Inner classes. */ - private final Set javaNamesForRemoveInner = new HashSet<>(); + private final Set javaNamesForRemoveInner = new LinkedHashSet<>(); - private final Set javaNamesForRemoveModel = new HashSet<>(); + private final Set javaNamesForRemoveModel = new LinkedHashSet<>(); - private final Set javaNamesForPreserveModel = new HashSet<>(); + private final Set javaNamesForPreserveModel = new LinkedHashSet<>(); - private final Set javaNamesForRemoveOperationGroup = new HashSet<>(); + private final Set javaNamesForRemoveOperationGroup = new LinkedHashSet<>(); private final List resourceCollectionAssociations = new ArrayList<>(); @@ -64,11 +64,11 @@ public class FluentJavaSettings { /** * Naming override. */ - private final Map namingOverride = new HashMap<>(); + private final Map namingOverride = new LinkedHashMap<>(); - private final Set javaNamesForPropertyIncludeAlways = new HashSet<>(); + private final Set javaNamesForPropertyIncludeAlways = new LinkedHashSet<>(); - private final Map renameOperationGroup = new HashMap<>(); + private final Map renameOperationGroup = new LinkedHashMap<>(); private String pomFilename = "pom.xml"; diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/util/TypeConversionUtils.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/util/TypeConversionUtils.java index 0dab1b8c229..84984715bbd 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/util/TypeConversionUtils.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/util/TypeConversionUtils.java @@ -57,26 +57,25 @@ public static String conversionExpression(IType clientType, String variableName) expression = String.format("%1$s.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, %2$s -> %3$s))", variableName, nestedPropertyName, conversionExpression(type.getValueType(), valuePropertyName)); - } else if (clientType instanceof GenericType) { + } else if (isPagedIterable(clientType)) { GenericType type = (GenericType) clientType; - if (ClassType.PAGED_ITERABLE.getName().equals(type.getName())) { - IType valueType = type.getTypeArguments()[0]; - if (valueType instanceof ClassType) { - String nestedPropertyName = nextPropertyName(variableName); - expression = String.format("%1$s.mapPage(%2$s, %3$s -> new %4$s(%5$s, this.%6$s()))", - ModelNaming.CLASS_RESOURCE_MANAGER_UTILS, variableName, nestedPropertyName, - getModelImplName((ClassType) valueType), nestedPropertyName, ModelNaming.METHOD_MANAGER); - } - } else if (ClassType.RESPONSE.getName().equals(type.getName())) { - IType valueType = type.getTypeArguments()[0]; - if (valueType instanceof ClassType || valueType instanceof GenericType) { - String valuePropertyName = variableName + ".getValue()"; - expression = String.format( - "new SimpleResponse<>(%1$s.getRequest(), %1$s.getStatusCode(), %1$s.getHeaders(), %2$s)", - variableName, conversionExpression(valueType, valuePropertyName)); - } else { - expression = variableName; - } + IType valueType = type.getTypeArguments()[0]; + if (valueType instanceof ClassType) { + String nestedPropertyName = nextPropertyName(variableName); + expression = String.format("%1$s.mapPage(%2$s, %3$s -> new %4$s(%5$s, this.%6$s()))", + ModelNaming.CLASS_RESOURCE_MANAGER_UTILS, variableName, nestedPropertyName, + getModelImplName((ClassType) valueType), nestedPropertyName, ModelNaming.METHOD_MANAGER); + } + } else if (isResponse(clientType)) { + GenericType type = (GenericType) clientType; + IType valueType = type.getTypeArguments()[0]; + if (valueType instanceof ClassType || valueType instanceof GenericType) { + String valuePropertyName = variableName + ".getValue()"; + expression = String.format( + "new SimpleResponse<>(%1$s.getRequest(), %1$s.getStatusCode(), %1$s.getHeaders(), %2$s)", + variableName, conversionExpression(valueType, valuePropertyName)); + } else { + expression = variableName; } } Objects.requireNonNull(expression, @@ -117,6 +116,17 @@ public static boolean isPagedIterable(IType clientType) { return ret; } + public static boolean isResponse(IType clientType) { + boolean ret = false; + if (clientType instanceof GenericType) { + GenericType type = (GenericType) clientType; + if (ClassType.RESPONSE.getName().equals(type.getName())) { + ret = true; + } + } + return ret; + } + public static String tempVariableName() { return "inner"; } diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/util/Utils.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/util/Utils.java index 4c97e0c2ac4..17854956f3b 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/util/Utils.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/util/Utils.java @@ -6,13 +6,11 @@ import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Client; import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Metadata; import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Parameter; -import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Property; import com.microsoft.typespec.http.client.generator.core.extension.plugin.JavaSettings; import com.microsoft.typespec.http.client.generator.core.util.SchemaUtil; -import java.lang.reflect.Field; +import io.github.encryptorcode.pluralize.Pluralize; import java.util.Set; import java.util.stream.Collectors; -import org.slf4j.Logger; public class Utils { @@ -26,37 +24,10 @@ public static String getJavaName(Metadata m) { return SchemaUtil.getJavaName(m); } - public static boolean nonFlattenedProperty(Property p) { - return p.getFlattenedNames() == null || p.getFlattenedNames().isEmpty(); - } - public static boolean nonFlattenedParameter(Parameter p) { return !p.isFlattened(); } - public static void shallowCopy(T obj, T newObj, Class clazz, Logger logger) { - while (clazz != Object.class) { - Field[] fields = clazz.getDeclaredFields(); - for (Field f : fields) { - try { - Field t = clazz.getDeclaredField(f.getName()); - - if (t.getType() == f.getType()) { - f.setAccessible(true); - t.setAccessible(true); - t.set(newObj, f.get(obj)); - } - } catch (NoSuchFieldException ex) { - // skip it - } catch (IllegalAccessException ex) { - logger.error("Failed to copy field '{}'", f.getName()); - } - } - - clazz = clazz.getSuperclass(); - } - } - public static String getNameForUngroupedOperations(Client client, FluentJavaSettings settings) { String nameForUngroupOperations = null; if (settings.getNameForUngroupedOperations().isPresent()) { @@ -78,14 +49,6 @@ public static String getSingular(String name) { return null; } - if (name.endsWith("ies")) { - return name.substring(0, name.length() - 3) + 'y'; - } else if (name.endsWith("sses")) { - return name.substring(0, name.length() - 2); - } else if (name.endsWith("s") && !name.endsWith("ss")) { - return name.substring(0, name.length() - 1); - } else { - return name; - } + return Pluralize.singular(name); } } diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/test/java/com/microsoft/typespec/http/client/generator/mgmt/util/FluentUtilsTests.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/test/java/com/microsoft/typespec/http/client/generator/mgmt/util/FluentUtilsTests.java index 6176708a2e8..cbca2c5741a 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/test/java/com/microsoft/typespec/http/client/generator/mgmt/util/FluentUtilsTests.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/test/java/com/microsoft/typespec/http/client/generator/mgmt/util/FluentUtilsTests.java @@ -61,4 +61,45 @@ public void testReservedClassName() { Assertions.assertEquals("ResponseModel", FluentUtils.resourceModelInterfaceClassType("Response" + innerSuffix).getName()); } + + @Test + public void testGetSingular() { + // ves → f (shelves → shelf) + Assertions.assertEquals("bookshelf", FluentUtils.getSingular("bookshelves")); + + // ves → fe (knives → knife) + Assertions.assertEquals("knife", FluentUtils.getSingular("knives")); + + // ies → y (policies → policy) + Assertions.assertEquals("policy", FluentUtils.getSingular("policies")); + + // (addresses → address) + Assertions.assertEquals("address", FluentUtils.getSingular("addresses")); + + // (watches → watch) + Assertions.assertEquals("watch", FluentUtils.getSingular("watches")); + + // xes → x (boxes → box) + Assertions.assertEquals("box", FluentUtils.getSingular("boxes")); + + // regular s (books → book) + Assertions.assertEquals("book", FluentUtils.getSingular("books")); + + // ss stays (class → class) + Assertions.assertEquals("class", FluentUtils.getSingular("class")); + + // null returns null + Assertions.assertNull(FluentUtils.getSingular(null)); + + // already singular + Assertions.assertEquals("child", FluentUtils.getSingular("child")); + + // irregular (children → child) + Assertions.assertEquals("child", FluentUtils.getSingular("children")); + + // Azure resource style names + Assertions.assertEquals("VirtualMachine", FluentUtils.getSingular("VirtualMachines")); + Assertions.assertEquals("NetworkInterface", FluentUtils.getSingular("NetworkInterfaces")); + Assertions.assertEquals("Factory", FluentUtils.getSingular("Factories")); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/Generate.ps1 b/packages/http-client-java/generator/http-client-generator-test/Generate.ps1 index 04565c86e76..6de39d2e421 100644 --- a/packages/http-client-java/generator/http-client-generator-test/Generate.ps1 +++ b/packages/http-client-java/generator/http-client-generator-test/Generate.ps1 @@ -19,7 +19,7 @@ Write-Host "Parallelization: $Parallelization" $generateScript = { $tspFile = $_ - if ((($tspFile -match "payload[\\/]pageable[\\/]main\.tsp") -and (-not ($tspFile -match "azure[\\/]payload[\\/]pageable[\\/]main\.tsp"))) -or ($tspFile -match "payload[\\/]xml[\\/]main\.tsp")) { + if ((($tspFile -match "payload[\\/]pageable[\\/]main\.tsp") -and (-not ($tspFile -match "azure[\\/]payload[\\/]pageable[\\/]main\.tsp"))) -or ($tspFile -match "payload[\\/]xml[\\/]main\.tsp") -or ($tspFile -match "service[\\/]multiple-services[\\/]main\.tsp")) { Write-Host " SKIPPED $tspFile @@ -201,7 +201,6 @@ try { $specFiles = Get-ChildItem ./specs -Include "main.tsp","old.tsp" -File -Recurse # ensure multi-service client specs are processed even though they do not match the default filter $specFiles += Get-Item (Join-Path ./specs "azure/resource-manager/multi-service/client.tsp") - $specFiles += Get-Item (Join-Path ./specs "azure/resource-manager/multi-service-older-versions/client.tsp") $specFiles += Get-Item (Join-Path ./specs "azure/resource-manager/multi-service-shared-models/client.tsp") $job = $specFiles | ForEach-Object -Parallel $generateScript -ThrottleLimit $Parallelization -AsJob diff --git a/packages/http-client-java/generator/http-client-generator-test/package.json b/packages/http-client-java/generator/http-client-generator-test/package.json index 1544157b4f5..8bc17a97b7d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/package.json +++ b/packages/http-client-java/generator/http-client-generator-test/package.json @@ -12,27 +12,27 @@ "spector-stop": "tsp-spector server stop" }, "dependencies": { - "@typespec/spector": "0.1.0-alpha.22", - "@typespec/spec-api": "0.1.0-alpha.12", - "@typespec/http-specs": "0.1.0-alpha.31", - "@azure-tools/azure-http-specs": "0.1.0-alpha.36", - "@typespec/http-client-java": "file:../../typespec-http-client-java-0.6.1.tgz", + "@typespec/spector": "0.1.0-alpha.25", + "@typespec/spec-api": "0.1.0-alpha.14", + "@typespec/http-specs": "0.1.0-alpha.36", + "@azure-tools/azure-http-specs": "0.1.0-alpha.39", + "@typespec/http-client-java": "file:../../typespec-http-client-java-0.7.0.tgz", "@typespec/http-client-java-tests": "file:" }, "overrides": { - "@typespec/compiler": "1.8.0", - "@typespec/http": "1.8.0", - "@typespec/rest": "0.78.0", - "@typespec/versioning": "0.78.0", - "@typespec/openapi": "1.8.0", - "@typespec/xml": "0.78.0", - "@typespec/events": "0.78.0", - "@typespec/sse": "0.78.0", - "@typespec/streams": "0.78.0", - "@azure-tools/typespec-azure-core": "0.64.0", - "@azure-tools/typespec-client-generator-core": "0.64.5", - "@azure-tools/typespec-azure-resource-manager": "0.64.1", - "@azure-tools/typespec-autorest": "0.64.1" + "@typespec/compiler": "1.11.0", + "@typespec/http": "1.11.0", + "@typespec/rest": "0.81.0", + "@typespec/versioning": "0.81.0", + "@typespec/openapi": "1.11.0", + "@typespec/xml": "0.81.0", + "@typespec/events": "0.81.0", + "@typespec/sse": "0.81.0", + "@typespec/streams": "0.81.0", + "@azure-tools/typespec-azure-core": "0.67.0", + "@azure-tools/typespec-client-generator-core": "0.67.1", + "@azure-tools/typespec-azure-resource-manager": "0.67.0", + "@azure-tools/typespec-autorest": "0.67.0" }, "private": true } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/HeaderParamAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java similarity index 95% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/HeaderParamAsyncClient.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java index 539b2d5456d..d8b5cb4bfdf 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/HeaderParamAsyncClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.implementation.HeaderParamClientImpl; -import azure.clientgenerator.core.clientinitialization.models.Input; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.HeaderParamClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/HeaderParamClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java similarity index 95% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/HeaderParamClient.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java index 4bbcd7e8365..15970b4e195 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/HeaderParamClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.implementation.HeaderParamClientImpl; -import azure.clientgenerator.core.clientinitialization.models.Input; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.HeaderParamClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/HeaderParamClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClientBuilder.java similarity index 97% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/HeaderParamClientBuilder.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClientBuilder.java index 31137851e48..9814ad550b0 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/HeaderParamClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.implementation.HeaderParamClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.HeaderParamClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class HeaderParamClientBuilder implements HttpTrait PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization.properties"); + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-defaultclient.properties"); @Generated private final List pipelinePolicies; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/MixedParamsAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java similarity index 95% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/MixedParamsAsyncClient.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java index 04a316639b8..af1808087a7 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/MixedParamsAsyncClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.implementation.MixedParamsClientImpl; -import azure.clientgenerator.core.clientinitialization.models.WithBodyRequest; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MixedParamsClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.WithBodyRequest; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/MixedParamsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java similarity index 95% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/MixedParamsClient.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java index 7ab664776b7..d67b25cee48 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/MixedParamsClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.implementation.MixedParamsClientImpl; -import azure.clientgenerator.core.clientinitialization.models.WithBodyRequest; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MixedParamsClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.WithBodyRequest; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/MixedParamsClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClientBuilder.java similarity index 97% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/MixedParamsClientBuilder.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClientBuilder.java index 7ce96535235..fc1da88f18e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/MixedParamsClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.implementation.MixedParamsClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MixedParamsClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class MixedParamsClientBuilder implements HttpTrait PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization.properties"); + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-defaultclient.properties"); @Generated private final List pipelinePolicies; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/MultipleParamsAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java similarity index 95% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/MultipleParamsAsyncClient.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java index fffad715e02..675066ddd6d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/MultipleParamsAsyncClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.implementation.MultipleParamsClientImpl; -import azure.clientgenerator.core.clientinitialization.models.Input; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MultipleParamsClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/MultipleParamsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java similarity index 95% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/MultipleParamsClient.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java index 99729267707..6957056c7ed 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/MultipleParamsClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.implementation.MultipleParamsClientImpl; -import azure.clientgenerator.core.clientinitialization.models.Input; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MultipleParamsClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/MultipleParamsClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClientBuilder.java similarity index 97% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/MultipleParamsClientBuilder.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClientBuilder.java index c448d71678b..81f14de1ff6 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/MultipleParamsClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.implementation.MultipleParamsClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MultipleParamsClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class MultipleParamsClientBuilder implements HttpTrait PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization.properties"); + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-defaultclient.properties"); @Generated private final List pipelinePolicies; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/ParamAliasAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasAsyncClient.java similarity index 96% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/ParamAliasAsyncClient.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasAsyncClient.java index d15937a219a..d7c603cfce9 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/ParamAliasAsyncClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.implementation.ParamAliasClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.ParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/ParamAliasClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClient.java similarity index 96% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/ParamAliasClient.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClient.java index c373ba582a2..444287dcb98 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/ParamAliasClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.implementation.ParamAliasClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.ParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/ParamAliasClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClientBuilder.java similarity index 97% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/ParamAliasClientBuilder.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClientBuilder.java index fb31bfe1980..cccfce5755c 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/ParamAliasClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.implementation.ParamAliasClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.ParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class ParamAliasClientBuilder implements HttpTrait PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization.properties"); + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-defaultclient.properties"); @Generated private final List pipelinePolicies; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/PathParamAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java similarity index 97% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/PathParamAsyncClient.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java index c62b4f90bf3..fffdd32a35b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/PathParamAsyncClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.implementation.PathParamClientImpl; -import azure.clientgenerator.core.clientinitialization.models.BlobProperties; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.PathParamClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/PathParamClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java similarity index 96% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/PathParamClient.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java index c724e68662b..0b44c5793a1 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/PathParamClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.implementation.PathParamClientImpl; -import azure.clientgenerator.core.clientinitialization.models.BlobProperties; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.PathParamClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/PathParamClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClientBuilder.java similarity index 97% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/PathParamClientBuilder.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClientBuilder.java index 59ec31c7f38..acc4851dbdc 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/PathParamClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.implementation.PathParamClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.PathParamClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class PathParamClientBuilder implements HttpTrait PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization.properties"); + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-defaultclient.properties"); @Generated private final List pipelinePolicies; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java new file mode 100644 index 00000000000..c80b04f8fc6 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java @@ -0,0 +1,185 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.defaultclient; + +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.QueryParamClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the asynchronous QueryParamClient type. + */ +@ServiceClient(builder = QueryParamClientBuilder.class, isAsync = true) +public final class QueryParamAsyncClient { + @Generated + private final QueryParamClientImpl serviceClient; + + /** + * Initializes an instance of QueryParamAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + QueryParamAsyncClient(QueryParamClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponseAsync(requestOptions); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponseAsync(requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponseAsync(requestOptions); + } + + /** + * The withQuery operation. + * + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery(String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The withQuery operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery() { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The getStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return properties of a blob on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getStandalone() { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(BlobProperties.class)); + } + + /** + * The deleteStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteStandalone() { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return deleteStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java new file mode 100644 index 00000000000..79de18b60ad --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java @@ -0,0 +1,179 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.defaultclient; + +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.QueryParamClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; + +/** + * Initializes a new instance of the synchronous QueryParamClient type. + */ +@ServiceClient(builder = QueryParamClientBuilder.class) +public final class QueryParamClient { + @Generated + private final QueryParamClientImpl serviceClient; + + /** + * Initializes an instance of QueryParamClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + QueryParamClient(QueryParamClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponse(requestOptions); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponse(requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponse(requestOptions); + } + + /** + * The withQuery operation. + * + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery(String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + withQueryWithResponse(requestOptions).getValue(); + } + + /** + * The withQuery operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery() { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + withQueryWithResponse(requestOptions).getValue(); + } + + /** + * The getStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return properties of a blob. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public BlobProperties getStandalone() { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getStandaloneWithResponse(requestOptions).getValue().toObject(BlobProperties.class); + } + + /** + * The deleteStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void deleteStandalone() { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + deleteStandaloneWithResponse(requestOptions).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClientBuilder.java new file mode 100644 index 00000000000..87f5155eaae --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClientBuilder.java @@ -0,0 +1,307 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.defaultclient; + +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.QueryParamClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ServiceClientBuilder; +import com.azure.core.client.traits.ConfigurationTrait; +import com.azure.core.client.traits.EndpointTrait; +import com.azure.core.client.traits.HttpTrait; +import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.HttpPipelinePosition; +import com.azure.core.http.policy.AddDatePolicy; +import com.azure.core.http.policy.AddHeadersFromContextPolicy; +import com.azure.core.http.policy.AddHeadersPolicy; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.http.policy.HttpLoggingPolicy; +import com.azure.core.http.policy.HttpPipelinePolicy; +import com.azure.core.http.policy.HttpPolicyProviders; +import com.azure.core.http.policy.RequestIdPolicy; +import com.azure.core.http.policy.RetryOptions; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.ClientOptions; +import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.builder.ClientBuilderUtil; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.serializer.JacksonAdapter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * A builder for creating a new instance of the QueryParamClient type. + */ +@ServiceClientBuilder(serviceClients = { QueryParamClient.class, QueryParamAsyncClient.class }) +public final class QueryParamClientBuilder implements HttpTrait, + ConfigurationTrait, EndpointTrait { + @Generated + private static final String SDK_NAME = "name"; + + @Generated + private static final String SDK_VERSION = "version"; + + @Generated + private static final Map PROPERTIES + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-defaultclient.properties"); + + @Generated + private final List pipelinePolicies; + + /** + * Create an instance of the QueryParamClientBuilder. + */ + @Generated + public QueryParamClientBuilder() { + this.pipelinePolicies = new ArrayList<>(); + } + + /* + * The HTTP client used to send the request. + */ + @Generated + private HttpClient httpClient; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public QueryParamClientBuilder httpClient(HttpClient httpClient) { + this.httpClient = httpClient; + return this; + } + + /* + * The HTTP pipeline to send requests through. + */ + @Generated + private HttpPipeline pipeline; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public QueryParamClientBuilder pipeline(HttpPipeline pipeline) { + if (this.pipeline != null && pipeline == null) { + LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured."); + } + this.pipeline = pipeline; + return this; + } + + /* + * The logging configuration for HTTP requests and responses. + */ + @Generated + private HttpLogOptions httpLogOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public QueryParamClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) { + this.httpLogOptions = httpLogOptions; + return this; + } + + /* + * The client options such as application ID and custom headers to set on a request. + */ + @Generated + private ClientOptions clientOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public QueryParamClientBuilder clientOptions(ClientOptions clientOptions) { + this.clientOptions = clientOptions; + return this; + } + + /* + * The retry options to configure retry policy for failed requests. + */ + @Generated + private RetryOptions retryOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public QueryParamClientBuilder retryOptions(RetryOptions retryOptions) { + this.retryOptions = retryOptions; + return this; + } + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public QueryParamClientBuilder addPolicy(HttpPipelinePolicy customPolicy) { + Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); + pipelinePolicies.add(customPolicy); + return this; + } + + /* + * The configuration store that is used during construction of the service client. + */ + @Generated + private Configuration configuration; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public QueryParamClientBuilder configuration(Configuration configuration) { + this.configuration = configuration; + return this; + } + + /* + * The service endpoint + */ + @Generated + private String endpoint; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public QueryParamClientBuilder endpoint(String endpoint) { + this.endpoint = endpoint; + return this; + } + + /* + * + */ + @Generated + private String blobName; + + /** + * Sets. + * + * @param blobName the blobName value. + * @return the QueryParamClientBuilder. + */ + @Generated + public QueryParamClientBuilder blobName(String blobName) { + this.blobName = blobName; + return this; + } + + /* + * The retry policy that will attempt to retry failed requests, if applicable. + */ + @Generated + private RetryPolicy retryPolicy; + + /** + * Sets The retry policy that will attempt to retry failed requests, if applicable. + * + * @param retryPolicy the retryPolicy value. + * @return the QueryParamClientBuilder. + */ + @Generated + public QueryParamClientBuilder retryPolicy(RetryPolicy retryPolicy) { + this.retryPolicy = retryPolicy; + return this; + } + + /** + * Builds an instance of QueryParamClientImpl with the provided parameters. + * + * @return an instance of QueryParamClientImpl. + */ + @Generated + private QueryParamClientImpl buildInnerClient() { + this.validateClient(); + HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline(); + String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000"; + QueryParamClientImpl client = new QueryParamClientImpl(localPipeline, + JacksonAdapter.createDefaultSerializerAdapter(), localEndpoint, this.blobName); + return client; + } + + @Generated + private void validateClient() { + // This method is invoked from 'buildInnerClient'/'buildClient' method. + // Developer can customize this method, to validate that the necessary conditions are met for the new client. + Objects.requireNonNull(blobName, "'blobName' cannot be null."); + } + + @Generated + private HttpPipeline createHttpPipeline() { + Configuration buildConfiguration + = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; + HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions; + ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions; + List policies = new ArrayList<>(); + String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName"); + String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); + String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions); + policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); + policies.add(new RequestIdPolicy()); + policies.add(new AddHeadersFromContextPolicy()); + HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions); + if (headers != null) { + policies.add(new AddHeadersPolicy(headers)); + } + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addBeforeRetryPolicies(policies); + policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy())); + policies.add(new AddDatePolicy()); + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addAfterRetryPolicies(policies); + policies.add(new HttpLoggingPolicy(localHttpLogOptions)); + HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])) + .httpClient(httpClient) + .clientOptions(localClientOptions) + .build(); + return httpPipeline; + } + + /** + * Builds an instance of QueryParamAsyncClient class. + * + * @return an instance of QueryParamAsyncClient. + */ + @Generated + public QueryParamAsyncClient buildAsyncClient() { + return new QueryParamAsyncClient(buildInnerClient()); + } + + /** + * Builds an instance of QueryParamClient class. + * + * @return an instance of QueryParamClient. + */ + @Generated + public QueryParamClient buildClient() { + return new QueryParamClient(buildInnerClient()); + } + + private static final ClientLogger LOGGER = new ClientLogger(QueryParamClientBuilder.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/HeaderParamClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java similarity index 98% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/HeaderParamClientImpl.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java index 6f6d472bfb7..9d71938ee8d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/HeaderParamClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.implementation; +package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; @@ -144,7 +144,7 @@ public HeaderParamClientImpl(HttpPipeline httpPipeline, SerializerAdapter serial @Host("{endpoint}") @ServiceInterface(name = "HeaderParamClient") public interface HeaderParamClientService { - @Get("/azure/client-generator-core/client-initialization/header-param/with-query") + @Get("/azure/client-generator-core/client-initialization/default/header-param/with-query") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @@ -153,7 +153,7 @@ public interface HeaderParamClientService { Mono> withQuery(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, @QueryParam("id") String id, RequestOptions requestOptions, Context context); - @Get("/azure/client-generator-core/client-initialization/header-param/with-query") + @Get("/azure/client-generator-core/client-initialization/default/header-param/with-query") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @@ -162,7 +162,7 @@ Mono> withQuery(@HostParam("endpoint") String endpoint, @HeaderPa Response withQuerySync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, @QueryParam("id") String id, RequestOptions requestOptions, Context context); - @Post("/azure/client-generator-core/client-initialization/header-param/with-body") + @Post("/azure/client-generator-core/client-initialization/default/header-param/with-body") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @@ -172,7 +172,7 @@ Mono> withBody(@HostParam("endpoint") String endpoint, @HeaderPar @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); - @Post("/azure/client-generator-core/client-initialization/header-param/with-body") + @Post("/azure/client-generator-core/client-initialization/default/header-param/with-body") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/MixedParamsClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java similarity index 98% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/MixedParamsClientImpl.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java index 0c38becf5c3..cc215cba914 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/MixedParamsClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.implementation; +package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; @@ -144,7 +144,7 @@ public MixedParamsClientImpl(HttpPipeline httpPipeline, SerializerAdapter serial @Host("{endpoint}") @ServiceInterface(name = "MixedParamsClient") public interface MixedParamsClientService { - @Get("/azure/client-generator-core/client-initialization/mixed-params/with-query") + @Get("/azure/client-generator-core/client-initialization/default/mixed-params/with-query") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @@ -154,7 +154,7 @@ Mono> withQuery(@HostParam("endpoint") String endpoint, @HeaderPa @QueryParam("region") String region, @QueryParam("id") String id, RequestOptions requestOptions, Context context); - @Get("/azure/client-generator-core/client-initialization/mixed-params/with-query") + @Get("/azure/client-generator-core/client-initialization/default/mixed-params/with-query") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @@ -164,7 +164,7 @@ Response withQuerySync(@HostParam("endpoint") String endpoint, @HeaderPara @QueryParam("region") String region, @QueryParam("id") String id, RequestOptions requestOptions, Context context); - @Post("/azure/client-generator-core/client-initialization/mixed-params/with-body") + @Post("/azure/client-generator-core/client-initialization/default/mixed-params/with-body") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @@ -174,7 +174,7 @@ Mono> withBody(@HostParam("endpoint") String endpoint, @HeaderPar @QueryParam("region") String region, @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); - @Post("/azure/client-generator-core/client-initialization/mixed-params/with-body") + @Post("/azure/client-generator-core/client-initialization/default/mixed-params/with-body") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/MultipleParamsClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java similarity index 98% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/MultipleParamsClientImpl.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java index f3f2e5d8a24..5adf51cb5e8 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/MultipleParamsClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.implementation; +package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; @@ -162,7 +162,7 @@ public MultipleParamsClientImpl(HttpPipeline httpPipeline, SerializerAdapter ser @Host("{endpoint}") @ServiceInterface(name = "MultipleParamsClient") public interface MultipleParamsClientService { - @Get("/azure/client-generator-core/client-initialization/multiple-params/with-query") + @Get("/azure/client-generator-core/client-initialization/default/multiple-params/with-query") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @@ -172,7 +172,7 @@ Mono> withQuery(@HostParam("endpoint") String endpoint, @HeaderPa @QueryParam("region") String region, @QueryParam("id") String id, RequestOptions requestOptions, Context context); - @Get("/azure/client-generator-core/client-initialization/multiple-params/with-query") + @Get("/azure/client-generator-core/client-initialization/default/multiple-params/with-query") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @@ -182,7 +182,7 @@ Response withQuerySync(@HostParam("endpoint") String endpoint, @HeaderPara @QueryParam("region") String region, @QueryParam("id") String id, RequestOptions requestOptions, Context context); - @Post("/azure/client-generator-core/client-initialization/multiple-params/with-body") + @Post("/azure/client-generator-core/client-initialization/default/multiple-params/with-body") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @@ -192,7 +192,7 @@ Mono> withBody(@HostParam("endpoint") String endpoint, @HeaderPar @QueryParam("region") String region, @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); - @Post("/azure/client-generator-core/client-initialization/multiple-params/with-body") + @Post("/azure/client-generator-core/client-initialization/default/multiple-params/with-body") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/ParamAliasClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/ParamAliasClientImpl.java similarity index 97% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/ParamAliasClientImpl.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/ParamAliasClientImpl.java index 0c1d58cfbce..ac9e42b8f1c 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/ParamAliasClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/ParamAliasClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.implementation; +package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Get; @@ -140,7 +140,7 @@ public ParamAliasClientImpl(HttpPipeline httpPipeline, SerializerAdapter seriali @Host("{endpoint}") @ServiceInterface(name = "ParamAliasClient") public interface ParamAliasClientService { - @Get("/azure/client-generator-core/client-initialization/param-alias/{blob}/with-aliased-name") + @Get("/azure/client-generator-core/client-initialization/default/param-alias/{blob}/with-aliased-name") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @@ -149,7 +149,7 @@ public interface ParamAliasClientService { Mono> withAliasedName(@HostParam("endpoint") String endpoint, @PathParam("blob") String blobName, RequestOptions requestOptions, Context context); - @Get("/azure/client-generator-core/client-initialization/param-alias/{blob}/with-aliased-name") + @Get("/azure/client-generator-core/client-initialization/default/param-alias/{blob}/with-aliased-name") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @@ -158,7 +158,7 @@ Mono> withAliasedName(@HostParam("endpoint") String endpoint, @Pa Response withAliasedNameSync(@HostParam("endpoint") String endpoint, @PathParam("blob") String blobName, RequestOptions requestOptions, Context context); - @Get("/azure/client-generator-core/client-initialization/param-alias/{blobName}/with-original-name") + @Get("/azure/client-generator-core/client-initialization/default/param-alias/{blobName}/with-original-name") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @@ -167,7 +167,7 @@ Response withAliasedNameSync(@HostParam("endpoint") String endpoint, @Path Mono> withOriginalName(@HostParam("endpoint") String endpoint, @PathParam("blobName") String blobName, RequestOptions requestOptions, Context context); - @Get("/azure/client-generator-core/client-initialization/param-alias/{blobName}/with-original-name") + @Get("/azure/client-generator-core/client-initialization/default/param-alias/{blobName}/with-original-name") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/PathParamClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java similarity index 98% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/PathParamClientImpl.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java index 7fd730e5700..1498d32b3b7 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/PathParamClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.implementation; +package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; @@ -143,7 +143,7 @@ public PathParamClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializ @Host("{endpoint}") @ServiceInterface(name = "PathParamClient") public interface PathParamClientService { - @Get("/azure/client-generator-core/client-initialization/path/{blobName}/with-query") + @Get("/azure/client-generator-core/client-initialization/default/path/{blobName}/with-query") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @@ -152,7 +152,7 @@ public interface PathParamClientService { Mono> withQuery(@HostParam("endpoint") String endpoint, @PathParam("blobName") String blobName, RequestOptions requestOptions, Context context); - @Get("/azure/client-generator-core/client-initialization/path/{blobName}/with-query") + @Get("/azure/client-generator-core/client-initialization/default/path/{blobName}/with-query") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @@ -161,7 +161,7 @@ Mono> withQuery(@HostParam("endpoint") String endpoint, @PathPara Response withQuerySync(@HostParam("endpoint") String endpoint, @PathParam("blobName") String blobName, RequestOptions requestOptions, Context context); - @Get("/azure/client-generator-core/client-initialization/path/{blobName}/get-standalone") + @Get("/azure/client-generator-core/client-initialization/default/path/{blobName}/get-standalone") @ExpectedResponses({ 200 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @@ -171,7 +171,7 @@ Mono> getStandalone(@HostParam("endpoint") String endpoint, @PathParam("blobName") String blobName, @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); - @Get("/azure/client-generator-core/client-initialization/path/{blobName}/get-standalone") + @Get("/azure/client-generator-core/client-initialization/default/path/{blobName}/get-standalone") @ExpectedResponses({ 200 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @@ -181,7 +181,7 @@ Response getStandaloneSync(@HostParam("endpoint") String endpoint, @PathParam("blobName") String blobName, @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); - @Delete("/azure/client-generator-core/client-initialization/path/{blobName}") + @Delete("/azure/client-generator-core/client-initialization/default/path/{blobName}") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @@ -190,7 +190,7 @@ Response getStandaloneSync(@HostParam("endpoint") String endpoint, Mono> deleteStandalone(@HostParam("endpoint") String endpoint, @PathParam("blobName") String blobName, RequestOptions requestOptions, Context context); - @Delete("/azure/client-generator-core/client-initialization/path/{blobName}") + @Delete("/azure/client-generator-core/client-initialization/default/path/{blobName}") @ExpectedResponses({ 204 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java new file mode 100644 index 00000000000..87fd2cb5929 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java @@ -0,0 +1,335 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; + +import com.azure.core.annotation.Delete; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.Get; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.QueryParam; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.BinaryData; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import com.azure.core.util.serializer.JacksonAdapter; +import com.azure.core.util.serializer.SerializerAdapter; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the QueryParamClient type. + */ +public final class QueryParamClientImpl { + /** + * The proxy service used to perform REST calls. + */ + private final QueryParamClientService service; + + /** + * Service host. + */ + private final String endpoint; + + /** + * Gets Service host. + * + * @return the endpoint value. + */ + public String getEndpoint() { + return this.endpoint; + } + + /** + */ + private final String blobName; + + /** + * Gets. + * + * @return the blobName value. + */ + public String getBlobName() { + return this.blobName; + } + + /** + * The HTTP pipeline to send requests through. + */ + private final HttpPipeline httpPipeline; + + /** + * Gets The HTTP pipeline to send requests through. + * + * @return the httpPipeline value. + */ + public HttpPipeline getHttpPipeline() { + return this.httpPipeline; + } + + /** + * The serializer to serialize an object into a string. + */ + private final SerializerAdapter serializerAdapter; + + /** + * Gets The serializer to serialize an object into a string. + * + * @return the serializerAdapter value. + */ + public SerializerAdapter getSerializerAdapter() { + return this.serializerAdapter; + } + + /** + * Initializes an instance of QueryParamClient client. + * + * @param endpoint Service host. + * @param blobName + */ + public QueryParamClientImpl(String endpoint, String blobName) { + this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), + JacksonAdapter.createDefaultSerializerAdapter(), endpoint, blobName); + } + + /** + * Initializes an instance of QueryParamClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param endpoint Service host. + * @param blobName + */ + public QueryParamClientImpl(HttpPipeline httpPipeline, String endpoint, String blobName) { + this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, blobName); + } + + /** + * Initializes an instance of QueryParamClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param serializerAdapter The serializer to serialize an object into a string. + * @param endpoint Service host. + * @param blobName + */ + public QueryParamClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, + String blobName) { + this.httpPipeline = httpPipeline; + this.serializerAdapter = serializerAdapter; + this.endpoint = endpoint; + this.blobName = blobName; + this.service = RestProxy.create(QueryParamClientService.class, this.httpPipeline, this.getSerializerAdapter()); + } + + /** + * The interface defining all the services for QueryParamClient to be used by the proxy service to perform REST + * calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "QueryParamClient") + public interface QueryParamClientService { + @Get("/azure/client-generator-core/client-initialization/default/query/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withQuery(@HostParam("endpoint") String endpoint, @QueryParam("blobName") String blobName, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/default/query/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withQuerySync(@HostParam("endpoint") String endpoint, @QueryParam("blobName") String blobName, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/default/query/get-standalone") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> getStandalone(@HostParam("endpoint") String endpoint, + @QueryParam("blobName") String blobName, @HeaderParam("Accept") String accept, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/default/query/get-standalone") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getStandaloneSync(@HostParam("endpoint") String endpoint, + @QueryParam("blobName") String blobName, @HeaderParam("Accept") String accept, + RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/default/query/delete-resource") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteStandalone(@HostParam("endpoint") String endpoint, + @QueryParam("blobName") String blobName, RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/default/query/delete-resource") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteStandaloneSync(@HostParam("endpoint") String endpoint, + @QueryParam("blobName") String blobName, RequestOptions requestOptions, Context context); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil + .withContext(context -> service.withQuery(this.getEndpoint(), this.getBlobName(), requestOptions, context)); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(RequestOptions requestOptions) { + return service.withQuerySync(this.getEndpoint(), this.getBlobName(), requestOptions, Context.NONE); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponseAsync(RequestOptions requestOptions) { + final String accept = "application/json"; + return FluxUtil.withContext( + context -> service.getStandalone(this.getEndpoint(), this.getBlobName(), accept, requestOptions, context)); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(RequestOptions requestOptions) { + final String accept = "application/json"; + return service.getStandaloneSync(this.getEndpoint(), this.getBlobName(), accept, requestOptions, Context.NONE); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.deleteStandalone(this.getEndpoint(), this.getBlobName(), requestOptions, context)); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { + return service.deleteStandaloneSync(this.getEndpoint(), this.getBlobName(), requestOptions, Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/package-info.java new file mode 100644 index 00000000000..146f7a467e3 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/package-info.java @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the implementations for DefaultClient. + * Test for client initialization decorator - moving parameters from method to client level. + * + */ +package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/BlobProperties.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/BlobProperties.java new file mode 100644 index 00000000000..4c721e41d6f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/BlobProperties.java @@ -0,0 +1,154 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.defaultclient.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.core.util.CoreUtils; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; + +/** + * Properties of a blob. + */ +@Immutable +public final class BlobProperties implements JsonSerializable { + /* + * The name property. + */ + @Generated + private final String name; + + /* + * The size property. + */ + @Generated + private final long size; + + /* + * The contentType property. + */ + @Generated + private final String contentType; + + /* + * The createdOn property. + */ + @Generated + private final OffsetDateTime createdOn; + + /** + * Creates an instance of BlobProperties class. + * + * @param name the name value to set. + * @param size the size value to set. + * @param contentType the contentType value to set. + * @param createdOn the createdOn value to set. + */ + @Generated + private BlobProperties(String name, long size, String contentType, OffsetDateTime createdOn) { + this.name = name; + this.size = size; + this.contentType = contentType; + this.createdOn = createdOn; + } + + /** + * Get the name property: The name property. + * + * @return the name value. + */ + @Generated + public String getName() { + return this.name; + } + + /** + * Get the size property: The size property. + * + * @return the size value. + */ + @Generated + public long getSize() { + return this.size; + } + + /** + * Get the contentType property: The contentType property. + * + * @return the contentType value. + */ + @Generated + public String getContentType() { + return this.contentType; + } + + /** + * Get the createdOn property: The createdOn property. + * + * @return the createdOn value. + */ + @Generated + public OffsetDateTime getCreatedOn() { + return this.createdOn; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("name", this.name); + jsonWriter.writeLongField("size", this.size); + jsonWriter.writeStringField("contentType", this.contentType); + jsonWriter.writeStringField("createdOn", + this.createdOn == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.createdOn)); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of BlobProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of BlobProperties if the JsonReader was pointing to an instance of it, or null if it was + * pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the BlobProperties. + */ + @Generated + public static BlobProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + String name = null; + long size = 0L; + String contentType = null; + OffsetDateTime createdOn = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("name".equals(fieldName)) { + name = reader.getString(); + } else if ("size".equals(fieldName)) { + size = reader.getLong(); + } else if ("contentType".equals(fieldName)) { + contentType = reader.getString(); + } else if ("createdOn".equals(fieldName)) { + createdOn = reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + } else { + reader.skipChildren(); + } + } + return new BlobProperties(name, size, contentType, createdOn); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/models/Input.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/Input.java similarity index 96% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/models/Input.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/Input.java index 3b0429b115c..3ce2d74c959 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/models/Input.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/Input.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.models; +package azure.clientgenerator.core.clientinitialization.defaultclient.models; import com.azure.core.annotation.Generated; import com.azure.core.annotation.Immutable; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/models/WithBodyRequest.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/WithBodyRequest.java similarity index 96% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/models/WithBodyRequest.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/WithBodyRequest.java index f8ff0870726..f884b7ea4e5 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/models/WithBodyRequest.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/WithBodyRequest.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.models; +package azure.clientgenerator.core.clientinitialization.defaultclient.models; import com.azure.core.annotation.Generated; import com.azure.core.annotation.Immutable; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/package-info.java new file mode 100644 index 00000000000..1135d1c1bcb --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/package-info.java @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the data models for DefaultClient. + * Test for client initialization decorator - moving parameters from method to client level. + * + */ +package azure.clientgenerator.core.clientinitialization.defaultclient.models; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/package-info.java new file mode 100644 index 00000000000..e65528b6e7a --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/package-info.java @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the classes for DefaultClient. + * Test for client initialization decorator - moving parameters from method to client level. + * + */ +package azure.clientgenerator.core.clientinitialization.defaultclient; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/ChildClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/ChildClientImpl.java deleted file mode 100644 index d7d09acf4c2..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/ChildClientImpl.java +++ /dev/null @@ -1,334 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.clientgenerator.core.clientinitialization.implementation; - -import com.azure.core.annotation.Delete; -import com.azure.core.annotation.ExpectedResponses; -import com.azure.core.annotation.Get; -import com.azure.core.annotation.HeaderParam; -import com.azure.core.annotation.Host; -import com.azure.core.annotation.HostParam; -import com.azure.core.annotation.PathParam; -import com.azure.core.annotation.ReturnType; -import com.azure.core.annotation.ServiceInterface; -import com.azure.core.annotation.ServiceMethod; -import com.azure.core.annotation.UnexpectedResponseExceptionType; -import com.azure.core.exception.ClientAuthenticationException; -import com.azure.core.exception.HttpResponseException; -import com.azure.core.exception.ResourceModifiedException; -import com.azure.core.exception.ResourceNotFoundException; -import com.azure.core.http.HttpPipeline; -import com.azure.core.http.HttpPipelineBuilder; -import com.azure.core.http.policy.RetryPolicy; -import com.azure.core.http.policy.UserAgentPolicy; -import com.azure.core.http.rest.RequestOptions; -import com.azure.core.http.rest.Response; -import com.azure.core.http.rest.RestProxy; -import com.azure.core.util.BinaryData; -import com.azure.core.util.Context; -import com.azure.core.util.FluxUtil; -import com.azure.core.util.serializer.JacksonAdapter; -import com.azure.core.util.serializer.SerializerAdapter; -import reactor.core.publisher.Mono; - -/** - * Initializes a new instance of the ChildClient type. - */ -public final class ChildClientImpl { - /** - * The proxy service used to perform REST calls. - */ - private final ChildClientService service; - - /** - * Service host. - */ - private final String endpoint; - - /** - * Gets Service host. - * - * @return the endpoint value. - */ - public String getEndpoint() { - return this.endpoint; - } - - /** - */ - private final String blobName; - - /** - * Gets. - * - * @return the blobName value. - */ - public String getBlobName() { - return this.blobName; - } - - /** - * The HTTP pipeline to send requests through. - */ - private final HttpPipeline httpPipeline; - - /** - * Gets The HTTP pipeline to send requests through. - * - * @return the httpPipeline value. - */ - public HttpPipeline getHttpPipeline() { - return this.httpPipeline; - } - - /** - * The serializer to serialize an object into a string. - */ - private final SerializerAdapter serializerAdapter; - - /** - * Gets The serializer to serialize an object into a string. - * - * @return the serializerAdapter value. - */ - public SerializerAdapter getSerializerAdapter() { - return this.serializerAdapter; - } - - /** - * Initializes an instance of ChildClient client. - * - * @param endpoint Service host. - * @param blobName - */ - public ChildClientImpl(String endpoint, String blobName) { - this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), - JacksonAdapter.createDefaultSerializerAdapter(), endpoint, blobName); - } - - /** - * Initializes an instance of ChildClient client. - * - * @param httpPipeline The HTTP pipeline to send requests through. - * @param endpoint Service host. - * @param blobName - */ - public ChildClientImpl(HttpPipeline httpPipeline, String endpoint, String blobName) { - this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, blobName); - } - - /** - * Initializes an instance of ChildClient client. - * - * @param httpPipeline The HTTP pipeline to send requests through. - * @param serializerAdapter The serializer to serialize an object into a string. - * @param endpoint Service host. - * @param blobName - */ - public ChildClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, - String blobName) { - this.httpPipeline = httpPipeline; - this.serializerAdapter = serializerAdapter; - this.endpoint = endpoint; - this.blobName = blobName; - this.service = RestProxy.create(ChildClientService.class, this.httpPipeline, this.getSerializerAdapter()); - } - - /** - * The interface defining all the services for ChildClient to be used by the proxy service to perform REST calls. - */ - @Host("{endpoint}") - @ServiceInterface(name = "ChildClient") - public interface ChildClientService { - @Get("/azure/client-generator-core/client-initialization/child-client/{blobName}/with-query") - @ExpectedResponses({ 204 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> withQuery(@HostParam("endpoint") String endpoint, @PathParam("blobName") String blobName, - RequestOptions requestOptions, Context context); - - @Get("/azure/client-generator-core/client-initialization/child-client/{blobName}/with-query") - @ExpectedResponses({ 204 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response withQuerySync(@HostParam("endpoint") String endpoint, @PathParam("blobName") String blobName, - RequestOptions requestOptions, Context context); - - @Get("/azure/client-generator-core/client-initialization/child-client/{blobName}/get-standalone") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> getStandalone(@HostParam("endpoint") String endpoint, - @PathParam("blobName") String blobName, @HeaderParam("Accept") String accept, RequestOptions requestOptions, - Context context); - - @Get("/azure/client-generator-core/client-initialization/child-client/{blobName}/get-standalone") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response getStandaloneSync(@HostParam("endpoint") String endpoint, - @PathParam("blobName") String blobName, @HeaderParam("Accept") String accept, RequestOptions requestOptions, - Context context); - - @Delete("/azure/client-generator-core/client-initialization/child-client/{blobName}") - @ExpectedResponses({ 204 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> deleteStandalone(@HostParam("endpoint") String endpoint, - @PathParam("blobName") String blobName, RequestOptions requestOptions, Context context); - - @Delete("/azure/client-generator-core/client-initialization/child-client/{blobName}") - @ExpectedResponses({ 204 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response deleteStandaloneSync(@HostParam("endpoint") String endpoint, - @PathParam("blobName") String blobName, RequestOptions requestOptions, Context context); - } - - /** - * The withQuery operation. - *

Query Parameters

- * - * - * - * - *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
- * You can add these to a request with {@link RequestOptions#addQueryParam} - * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> withQueryWithResponseAsync(RequestOptions requestOptions) { - return FluxUtil - .withContext(context -> service.withQuery(this.getEndpoint(), this.getBlobName(), requestOptions, context)); - } - - /** - * The withQuery operation. - *

Query Parameters

- * - * - * - * - *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
- * You can add these to a request with {@link RequestOptions#addQueryParam} - * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response withQueryWithResponse(RequestOptions requestOptions) { - return service.withQuerySync(this.getEndpoint(), this.getBlobName(), requestOptions, Context.NONE); - } - - /** - * The getStandalone operation. - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     size: long (Required)
-     *     contentType: String (Required)
-     *     createdOn: OffsetDateTime (Required)
-     * }
-     * }
-     *
- * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return properties of a blob along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getStandaloneWithResponseAsync(RequestOptions requestOptions) { - final String accept = "application/json"; - return FluxUtil.withContext( - context -> service.getStandalone(this.getEndpoint(), this.getBlobName(), accept, requestOptions, context)); - } - - /** - * The getStandalone operation. - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     size: long (Required)
-     *     contentType: String (Required)
-     *     createdOn: OffsetDateTime (Required)
-     * }
-     * }
-     *
- * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return properties of a blob along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response getStandaloneWithResponse(RequestOptions requestOptions) { - final String accept = "application/json"; - return service.getStandaloneSync(this.getEndpoint(), this.getBlobName(), accept, requestOptions, Context.NONE); - } - - /** - * The deleteStandalone operation. - * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> deleteStandaloneWithResponseAsync(RequestOptions requestOptions) { - return FluxUtil.withContext( - context -> service.deleteStandalone(this.getEndpoint(), this.getBlobName(), requestOptions, context)); - } - - /** - * The deleteStandalone operation. - * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { - return service.deleteStandaloneSync(this.getEndpoint(), this.getBlobName(), requestOptions, Context.NONE); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/ParentClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/ParentClientImpl.java deleted file mode 100644 index fc97d0a752e..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/ParentClientImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.clientgenerator.core.clientinitialization.implementation; - -import com.azure.core.http.HttpPipeline; -import com.azure.core.http.HttpPipelineBuilder; -import com.azure.core.http.policy.RetryPolicy; -import com.azure.core.http.policy.UserAgentPolicy; -import com.azure.core.util.serializer.JacksonAdapter; -import com.azure.core.util.serializer.SerializerAdapter; -import java.util.Objects; - -/** - * Initializes a new instance of the ParentClient type. - */ -public final class ParentClientImpl { - /** - * Service host. - */ - private final String endpoint; - - /** - * Gets Service host. - * - * @return the endpoint value. - */ - public String getEndpoint() { - return this.endpoint; - } - - /** - * The HTTP pipeline to send requests through. - */ - private final HttpPipeline httpPipeline; - - /** - * Gets The HTTP pipeline to send requests through. - * - * @return the httpPipeline value. - */ - public HttpPipeline getHttpPipeline() { - return this.httpPipeline; - } - - /** - * The serializer to serialize an object into a string. - */ - private final SerializerAdapter serializerAdapter; - - /** - * Gets The serializer to serialize an object into a string. - * - * @return the serializerAdapter value. - */ - public SerializerAdapter getSerializerAdapter() { - return this.serializerAdapter; - } - - /** - * Initializes an instance of ParentClient client. - * - * @param endpoint Service host. - */ - public ParentClientImpl(String endpoint) { - this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), - JacksonAdapter.createDefaultSerializerAdapter(), endpoint); - } - - /** - * Initializes an instance of ParentClient client. - * - * @param httpPipeline The HTTP pipeline to send requests through. - * @param endpoint Service host. - */ - public ParentClientImpl(HttpPipeline httpPipeline, String endpoint) { - this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint); - } - - /** - * Initializes an instance of ParentClient client. - * - * @param httpPipeline The HTTP pipeline to send requests through. - * @param serializerAdapter The serializer to serialize an object into a string. - * @param endpoint Service host. - */ - public ParentClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint) { - this.httpPipeline = httpPipeline; - this.serializerAdapter = serializerAdapter; - this.endpoint = endpoint; - } - - /** - * Gets an instance of ChildClientImpl class. - * - * @param blobName The blobName parameter. - * @return an instance of ChildClientImpl class. - */ - public ChildClientImpl getChildClient(String blobName) { - Objects.requireNonNull(blobName, "'blobName' cannot be null."); - return new ChildClientImpl(httpPipeline, serializerAdapter, endpoint, blobName); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/package-info.java deleted file mode 100644 index b43dea52e01..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/implementation/package-info.java +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -/** - * - * Package containing the implementations for Service. - * Test for client initialization decorator - moving parameters from method to client level. - * - */ -package azure.clientgenerator.core.clientinitialization.implementation; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderAsyncClient.java new file mode 100644 index 00000000000..2779ce61955 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderAsyncClient.java @@ -0,0 +1,170 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithHeaderClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the asynchronous IndividuallyNestedWithHeaderClient type. + */ +@ServiceClient(builder = IndividuallyNestedWithHeaderClientBuilder.class, isAsync = true) +public final class IndividuallyNestedWithHeaderAsyncClient { + @Generated + private final IndividuallyNestedWithHeaderClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyNestedWithHeaderAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyNestedWithHeaderAsyncClient(IndividuallyNestedWithHeaderClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponseAsync(requestOptions); + } + + /** + * The getStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponseAsync(requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponseAsync(requestOptions); + } + + /** + * The withQuery operation. + * + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery(String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The withQuery operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery() { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The getStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getStandalone() { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The deleteStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteStandalone() { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return deleteStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClient.java new file mode 100644 index 00000000000..4ba0a122bba --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClient.java @@ -0,0 +1,164 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithHeaderClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; + +/** + * Initializes a new instance of the synchronous IndividuallyNestedWithHeaderClient type. + */ +@ServiceClient(builder = IndividuallyNestedWithHeaderClientBuilder.class) +public final class IndividuallyNestedWithHeaderClient { + @Generated + private final IndividuallyNestedWithHeaderClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyNestedWithHeaderClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyNestedWithHeaderClient(IndividuallyNestedWithHeaderClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponse(requestOptions); + } + + /** + * The getStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponse(requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponse(requestOptions); + } + + /** + * The withQuery operation. + * + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery(String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + withQueryWithResponse(requestOptions).getValue(); + } + + /** + * The withQuery operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery() { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + withQueryWithResponse(requestOptions).getValue(); + } + + /** + * The getStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void getStandalone() { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + getStandaloneWithResponse(requestOptions).getValue(); + } + + /** + * The deleteStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void deleteStandalone() { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + deleteStandaloneWithResponse(requestOptions).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClientBuilder.java new file mode 100644 index 00000000000..e4e1a569c57 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClientBuilder.java @@ -0,0 +1,309 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithHeaderClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ServiceClientBuilder; +import com.azure.core.client.traits.ConfigurationTrait; +import com.azure.core.client.traits.EndpointTrait; +import com.azure.core.client.traits.HttpTrait; +import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.HttpPipelinePosition; +import com.azure.core.http.policy.AddDatePolicy; +import com.azure.core.http.policy.AddHeadersFromContextPolicy; +import com.azure.core.http.policy.AddHeadersPolicy; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.http.policy.HttpLoggingPolicy; +import com.azure.core.http.policy.HttpPipelinePolicy; +import com.azure.core.http.policy.HttpPolicyProviders; +import com.azure.core.http.policy.RequestIdPolicy; +import com.azure.core.http.policy.RetryOptions; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.ClientOptions; +import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.builder.ClientBuilderUtil; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.serializer.JacksonAdapter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * A builder for creating a new instance of the IndividuallyNestedWithHeaderClient type. + */ +@ServiceClientBuilder( + serviceClients = { IndividuallyNestedWithHeaderClient.class, IndividuallyNestedWithHeaderAsyncClient.class }) +public final class IndividuallyNestedWithHeaderClientBuilder implements + HttpTrait, ConfigurationTrait, + EndpointTrait { + @Generated + private static final String SDK_NAME = "name"; + + @Generated + private static final String SDK_VERSION = "version"; + + @Generated + private static final Map PROPERTIES + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); + + @Generated + private final List pipelinePolicies; + + /** + * Create an instance of the IndividuallyNestedWithHeaderClientBuilder. + */ + @Generated + public IndividuallyNestedWithHeaderClientBuilder() { + this.pipelinePolicies = new ArrayList<>(); + } + + /* + * The HTTP client used to send the request. + */ + @Generated + private HttpClient httpClient; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithHeaderClientBuilder httpClient(HttpClient httpClient) { + this.httpClient = httpClient; + return this; + } + + /* + * The HTTP pipeline to send requests through. + */ + @Generated + private HttpPipeline pipeline; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithHeaderClientBuilder pipeline(HttpPipeline pipeline) { + if (this.pipeline != null && pipeline == null) { + LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured."); + } + this.pipeline = pipeline; + return this; + } + + /* + * The logging configuration for HTTP requests and responses. + */ + @Generated + private HttpLogOptions httpLogOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithHeaderClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) { + this.httpLogOptions = httpLogOptions; + return this; + } + + /* + * The client options such as application ID and custom headers to set on a request. + */ + @Generated + private ClientOptions clientOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithHeaderClientBuilder clientOptions(ClientOptions clientOptions) { + this.clientOptions = clientOptions; + return this; + } + + /* + * The retry options to configure retry policy for failed requests. + */ + @Generated + private RetryOptions retryOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithHeaderClientBuilder retryOptions(RetryOptions retryOptions) { + this.retryOptions = retryOptions; + return this; + } + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithHeaderClientBuilder addPolicy(HttpPipelinePolicy customPolicy) { + Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); + pipelinePolicies.add(customPolicy); + return this; + } + + /* + * The configuration store that is used during construction of the service client. + */ + @Generated + private Configuration configuration; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithHeaderClientBuilder configuration(Configuration configuration) { + this.configuration = configuration; + return this; + } + + /* + * The service endpoint + */ + @Generated + private String endpoint; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithHeaderClientBuilder endpoint(String endpoint) { + this.endpoint = endpoint; + return this; + } + + /* + * + */ + @Generated + private String name; + + /** + * Sets. + * + * @param name the name value. + * @return the IndividuallyNestedWithHeaderClientBuilder. + */ + @Generated + public IndividuallyNestedWithHeaderClientBuilder name(String name) { + this.name = name; + return this; + } + + /* + * The retry policy that will attempt to retry failed requests, if applicable. + */ + @Generated + private RetryPolicy retryPolicy; + + /** + * Sets The retry policy that will attempt to retry failed requests, if applicable. + * + * @param retryPolicy the retryPolicy value. + * @return the IndividuallyNestedWithHeaderClientBuilder. + */ + @Generated + public IndividuallyNestedWithHeaderClientBuilder retryPolicy(RetryPolicy retryPolicy) { + this.retryPolicy = retryPolicy; + return this; + } + + /** + * Builds an instance of IndividuallyNestedWithHeaderClientImpl with the provided parameters. + * + * @return an instance of IndividuallyNestedWithHeaderClientImpl. + */ + @Generated + private IndividuallyNestedWithHeaderClientImpl buildInnerClient() { + this.validateClient(); + HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline(); + String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000"; + IndividuallyNestedWithHeaderClientImpl client = new IndividuallyNestedWithHeaderClientImpl(localPipeline, + JacksonAdapter.createDefaultSerializerAdapter(), localEndpoint, this.name); + return client; + } + + @Generated + private void validateClient() { + // This method is invoked from 'buildInnerClient'/'buildClient' method. + // Developer can customize this method, to validate that the necessary conditions are met for the new client. + Objects.requireNonNull(name, "'name' cannot be null."); + } + + @Generated + private HttpPipeline createHttpPipeline() { + Configuration buildConfiguration + = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; + HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions; + ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions; + List policies = new ArrayList<>(); + String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName"); + String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); + String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions); + policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); + policies.add(new RequestIdPolicy()); + policies.add(new AddHeadersFromContextPolicy()); + HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions); + if (headers != null) { + policies.add(new AddHeadersPolicy(headers)); + } + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addBeforeRetryPolicies(policies); + policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy())); + policies.add(new AddDatePolicy()); + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addAfterRetryPolicies(policies); + policies.add(new HttpLoggingPolicy(localHttpLogOptions)); + HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])) + .httpClient(httpClient) + .clientOptions(localClientOptions) + .build(); + return httpPipeline; + } + + /** + * Builds an instance of IndividuallyNestedWithHeaderAsyncClient class. + * + * @return an instance of IndividuallyNestedWithHeaderAsyncClient. + */ + @Generated + public IndividuallyNestedWithHeaderAsyncClient buildAsyncClient() { + return new IndividuallyNestedWithHeaderAsyncClient(buildInnerClient()); + } + + /** + * Builds an instance of IndividuallyNestedWithHeaderClient class. + * + * @return an instance of IndividuallyNestedWithHeaderClient. + */ + @Generated + public IndividuallyNestedWithHeaderClient buildClient() { + return new IndividuallyNestedWithHeaderClient(buildInnerClient()); + } + + private static final ClientLogger LOGGER = new ClientLogger(IndividuallyNestedWithHeaderClientBuilder.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedAsyncClient.java new file mode 100644 index 00000000000..b7da75aac04 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedAsyncClient.java @@ -0,0 +1,180 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMixedClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the asynchronous IndividuallyNestedWithMixedClient type. + */ +@ServiceClient(builder = IndividuallyNestedWithMixedClientBuilder.class, isAsync = true) +public final class IndividuallyNestedWithMixedAsyncClient { + @Generated + private final IndividuallyNestedWithMixedClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyNestedWithMixedAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyNestedWithMixedAsyncClient(IndividuallyNestedWithMixedClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponse(String region, RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponseAsync(region, requestOptions); + } + + /** + * The getStandalone operation. + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponse(String region, RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponseAsync(region, requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponse(String region, RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponseAsync(region, requestOptions); + } + + /** + * The withQuery operation. + * + * @param region The region parameter. + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery(String region, String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + return withQueryWithResponse(region, requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The withQuery operation. + * + * @param region The region parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery(String region) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + return withQueryWithResponse(region, requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The getStandalone operation. + * + * @param region The region parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getStandalone(String region) { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getStandaloneWithResponse(region, requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The deleteStandalone operation. + * + * @param region The region parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteStandalone(String region) { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return deleteStandaloneWithResponse(region, requestOptions).flatMap(FluxUtil::toMono); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClient.java new file mode 100644 index 00000000000..653331dd8ed --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClient.java @@ -0,0 +1,174 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMixedClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; + +/** + * Initializes a new instance of the synchronous IndividuallyNestedWithMixedClient type. + */ +@ServiceClient(builder = IndividuallyNestedWithMixedClientBuilder.class) +public final class IndividuallyNestedWithMixedClient { + @Generated + private final IndividuallyNestedWithMixedClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyNestedWithMixedClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyNestedWithMixedClient(IndividuallyNestedWithMixedClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(String region, RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponse(region, requestOptions); + } + + /** + * The getStandalone operation. + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(String region, RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponse(region, requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(String region, RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponse(region, requestOptions); + } + + /** + * The withQuery operation. + * + * @param region The region parameter. + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery(String region, String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + withQueryWithResponse(region, requestOptions).getValue(); + } + + /** + * The withQuery operation. + * + * @param region The region parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery(String region) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + withQueryWithResponse(region, requestOptions).getValue(); + } + + /** + * The getStandalone operation. + * + * @param region The region parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void getStandalone(String region) { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + getStandaloneWithResponse(region, requestOptions).getValue(); + } + + /** + * The deleteStandalone operation. + * + * @param region The region parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void deleteStandalone(String region) { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + deleteStandaloneWithResponse(region, requestOptions).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClientBuilder.java new file mode 100644 index 00000000000..9d3eb0b41ff --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClientBuilder.java @@ -0,0 +1,309 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMixedClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ServiceClientBuilder; +import com.azure.core.client.traits.ConfigurationTrait; +import com.azure.core.client.traits.EndpointTrait; +import com.azure.core.client.traits.HttpTrait; +import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.HttpPipelinePosition; +import com.azure.core.http.policy.AddDatePolicy; +import com.azure.core.http.policy.AddHeadersFromContextPolicy; +import com.azure.core.http.policy.AddHeadersPolicy; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.http.policy.HttpLoggingPolicy; +import com.azure.core.http.policy.HttpPipelinePolicy; +import com.azure.core.http.policy.HttpPolicyProviders; +import com.azure.core.http.policy.RequestIdPolicy; +import com.azure.core.http.policy.RetryOptions; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.ClientOptions; +import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.builder.ClientBuilderUtil; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.serializer.JacksonAdapter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * A builder for creating a new instance of the IndividuallyNestedWithMixedClient type. + */ +@ServiceClientBuilder( + serviceClients = { IndividuallyNestedWithMixedClient.class, IndividuallyNestedWithMixedAsyncClient.class }) +public final class IndividuallyNestedWithMixedClientBuilder implements + HttpTrait, ConfigurationTrait, + EndpointTrait { + @Generated + private static final String SDK_NAME = "name"; + + @Generated + private static final String SDK_VERSION = "version"; + + @Generated + private static final Map PROPERTIES + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); + + @Generated + private final List pipelinePolicies; + + /** + * Create an instance of the IndividuallyNestedWithMixedClientBuilder. + */ + @Generated + public IndividuallyNestedWithMixedClientBuilder() { + this.pipelinePolicies = new ArrayList<>(); + } + + /* + * The HTTP client used to send the request. + */ + @Generated + private HttpClient httpClient; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithMixedClientBuilder httpClient(HttpClient httpClient) { + this.httpClient = httpClient; + return this; + } + + /* + * The HTTP pipeline to send requests through. + */ + @Generated + private HttpPipeline pipeline; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithMixedClientBuilder pipeline(HttpPipeline pipeline) { + if (this.pipeline != null && pipeline == null) { + LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured."); + } + this.pipeline = pipeline; + return this; + } + + /* + * The logging configuration for HTTP requests and responses. + */ + @Generated + private HttpLogOptions httpLogOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithMixedClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) { + this.httpLogOptions = httpLogOptions; + return this; + } + + /* + * The client options such as application ID and custom headers to set on a request. + */ + @Generated + private ClientOptions clientOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithMixedClientBuilder clientOptions(ClientOptions clientOptions) { + this.clientOptions = clientOptions; + return this; + } + + /* + * The retry options to configure retry policy for failed requests. + */ + @Generated + private RetryOptions retryOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithMixedClientBuilder retryOptions(RetryOptions retryOptions) { + this.retryOptions = retryOptions; + return this; + } + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithMixedClientBuilder addPolicy(HttpPipelinePolicy customPolicy) { + Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); + pipelinePolicies.add(customPolicy); + return this; + } + + /* + * The configuration store that is used during construction of the service client. + */ + @Generated + private Configuration configuration; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithMixedClientBuilder configuration(Configuration configuration) { + this.configuration = configuration; + return this; + } + + /* + * The service endpoint + */ + @Generated + private String endpoint; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithMixedClientBuilder endpoint(String endpoint) { + this.endpoint = endpoint; + return this; + } + + /* + * + */ + @Generated + private String name; + + /** + * Sets. + * + * @param name the name value. + * @return the IndividuallyNestedWithMixedClientBuilder. + */ + @Generated + public IndividuallyNestedWithMixedClientBuilder name(String name) { + this.name = name; + return this; + } + + /* + * The retry policy that will attempt to retry failed requests, if applicable. + */ + @Generated + private RetryPolicy retryPolicy; + + /** + * Sets The retry policy that will attempt to retry failed requests, if applicable. + * + * @param retryPolicy the retryPolicy value. + * @return the IndividuallyNestedWithMixedClientBuilder. + */ + @Generated + public IndividuallyNestedWithMixedClientBuilder retryPolicy(RetryPolicy retryPolicy) { + this.retryPolicy = retryPolicy; + return this; + } + + /** + * Builds an instance of IndividuallyNestedWithMixedClientImpl with the provided parameters. + * + * @return an instance of IndividuallyNestedWithMixedClientImpl. + */ + @Generated + private IndividuallyNestedWithMixedClientImpl buildInnerClient() { + this.validateClient(); + HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline(); + String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000"; + IndividuallyNestedWithMixedClientImpl client = new IndividuallyNestedWithMixedClientImpl(localPipeline, + JacksonAdapter.createDefaultSerializerAdapter(), localEndpoint, this.name); + return client; + } + + @Generated + private void validateClient() { + // This method is invoked from 'buildInnerClient'/'buildClient' method. + // Developer can customize this method, to validate that the necessary conditions are met for the new client. + Objects.requireNonNull(name, "'name' cannot be null."); + } + + @Generated + private HttpPipeline createHttpPipeline() { + Configuration buildConfiguration + = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; + HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions; + ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions; + List policies = new ArrayList<>(); + String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName"); + String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); + String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions); + policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); + policies.add(new RequestIdPolicy()); + policies.add(new AddHeadersFromContextPolicy()); + HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions); + if (headers != null) { + policies.add(new AddHeadersPolicy(headers)); + } + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addBeforeRetryPolicies(policies); + policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy())); + policies.add(new AddDatePolicy()); + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addAfterRetryPolicies(policies); + policies.add(new HttpLoggingPolicy(localHttpLogOptions)); + HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])) + .httpClient(httpClient) + .clientOptions(localClientOptions) + .build(); + return httpPipeline; + } + + /** + * Builds an instance of IndividuallyNestedWithMixedAsyncClient class. + * + * @return an instance of IndividuallyNestedWithMixedAsyncClient. + */ + @Generated + public IndividuallyNestedWithMixedAsyncClient buildAsyncClient() { + return new IndividuallyNestedWithMixedAsyncClient(buildInnerClient()); + } + + /** + * Builds an instance of IndividuallyNestedWithMixedClient class. + * + * @return an instance of IndividuallyNestedWithMixedClient. + */ + @Generated + public IndividuallyNestedWithMixedClient buildClient() { + return new IndividuallyNestedWithMixedClient(buildInnerClient()); + } + + private static final ClientLogger LOGGER = new ClientLogger(IndividuallyNestedWithMixedClientBuilder.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleAsyncClient.java new file mode 100644 index 00000000000..1bd3bee141b --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleAsyncClient.java @@ -0,0 +1,170 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMultipleClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the asynchronous IndividuallyNestedWithMultipleClient type. + */ +@ServiceClient(builder = IndividuallyNestedWithMultipleClientBuilder.class, isAsync = true) +public final class IndividuallyNestedWithMultipleAsyncClient { + @Generated + private final IndividuallyNestedWithMultipleClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyNestedWithMultipleAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyNestedWithMultipleAsyncClient(IndividuallyNestedWithMultipleClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponseAsync(requestOptions); + } + + /** + * The getStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponseAsync(requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponseAsync(requestOptions); + } + + /** + * The withQuery operation. + * + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery(String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The withQuery operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery() { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The getStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getStandalone() { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The deleteStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteStandalone() { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return deleteStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClient.java new file mode 100644 index 00000000000..f41ef644dd0 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClient.java @@ -0,0 +1,164 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMultipleClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; + +/** + * Initializes a new instance of the synchronous IndividuallyNestedWithMultipleClient type. + */ +@ServiceClient(builder = IndividuallyNestedWithMultipleClientBuilder.class) +public final class IndividuallyNestedWithMultipleClient { + @Generated + private final IndividuallyNestedWithMultipleClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyNestedWithMultipleClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyNestedWithMultipleClient(IndividuallyNestedWithMultipleClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponse(requestOptions); + } + + /** + * The getStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponse(requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponse(requestOptions); + } + + /** + * The withQuery operation. + * + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery(String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + withQueryWithResponse(requestOptions).getValue(); + } + + /** + * The withQuery operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery() { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + withQueryWithResponse(requestOptions).getValue(); + } + + /** + * The getStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void getStandalone() { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + getStandaloneWithResponse(requestOptions).getValue(); + } + + /** + * The deleteStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void deleteStandalone() { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + deleteStandaloneWithResponse(requestOptions).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClientBuilder.java new file mode 100644 index 00000000000..6fa0ff162ef --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClientBuilder.java @@ -0,0 +1,329 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMultipleClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ServiceClientBuilder; +import com.azure.core.client.traits.ConfigurationTrait; +import com.azure.core.client.traits.EndpointTrait; +import com.azure.core.client.traits.HttpTrait; +import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.HttpPipelinePosition; +import com.azure.core.http.policy.AddDatePolicy; +import com.azure.core.http.policy.AddHeadersFromContextPolicy; +import com.azure.core.http.policy.AddHeadersPolicy; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.http.policy.HttpLoggingPolicy; +import com.azure.core.http.policy.HttpPipelinePolicy; +import com.azure.core.http.policy.HttpPolicyProviders; +import com.azure.core.http.policy.RequestIdPolicy; +import com.azure.core.http.policy.RetryOptions; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.ClientOptions; +import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.builder.ClientBuilderUtil; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.serializer.JacksonAdapter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * A builder for creating a new instance of the IndividuallyNestedWithMultipleClient type. + */ +@ServiceClientBuilder( + serviceClients = { IndividuallyNestedWithMultipleClient.class, IndividuallyNestedWithMultipleAsyncClient.class }) +public final class IndividuallyNestedWithMultipleClientBuilder + implements HttpTrait, + ConfigurationTrait, + EndpointTrait { + @Generated + private static final String SDK_NAME = "name"; + + @Generated + private static final String SDK_VERSION = "version"; + + @Generated + private static final Map PROPERTIES + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); + + @Generated + private final List pipelinePolicies; + + /** + * Create an instance of the IndividuallyNestedWithMultipleClientBuilder. + */ + @Generated + public IndividuallyNestedWithMultipleClientBuilder() { + this.pipelinePolicies = new ArrayList<>(); + } + + /* + * The HTTP client used to send the request. + */ + @Generated + private HttpClient httpClient; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithMultipleClientBuilder httpClient(HttpClient httpClient) { + this.httpClient = httpClient; + return this; + } + + /* + * The HTTP pipeline to send requests through. + */ + @Generated + private HttpPipeline pipeline; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithMultipleClientBuilder pipeline(HttpPipeline pipeline) { + if (this.pipeline != null && pipeline == null) { + LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured."); + } + this.pipeline = pipeline; + return this; + } + + /* + * The logging configuration for HTTP requests and responses. + */ + @Generated + private HttpLogOptions httpLogOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithMultipleClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) { + this.httpLogOptions = httpLogOptions; + return this; + } + + /* + * The client options such as application ID and custom headers to set on a request. + */ + @Generated + private ClientOptions clientOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithMultipleClientBuilder clientOptions(ClientOptions clientOptions) { + this.clientOptions = clientOptions; + return this; + } + + /* + * The retry options to configure retry policy for failed requests. + */ + @Generated + private RetryOptions retryOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithMultipleClientBuilder retryOptions(RetryOptions retryOptions) { + this.retryOptions = retryOptions; + return this; + } + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithMultipleClientBuilder addPolicy(HttpPipelinePolicy customPolicy) { + Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); + pipelinePolicies.add(customPolicy); + return this; + } + + /* + * The configuration store that is used during construction of the service client. + */ + @Generated + private Configuration configuration; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithMultipleClientBuilder configuration(Configuration configuration) { + this.configuration = configuration; + return this; + } + + /* + * The service endpoint + */ + @Generated + private String endpoint; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithMultipleClientBuilder endpoint(String endpoint) { + this.endpoint = endpoint; + return this; + } + + /* + * + */ + @Generated + private String name; + + /** + * Sets. + * + * @param name the name value. + * @return the IndividuallyNestedWithMultipleClientBuilder. + */ + @Generated + public IndividuallyNestedWithMultipleClientBuilder name(String name) { + this.name = name; + return this; + } + + /* + * + */ + @Generated + private String region; + + /** + * Sets. + * + * @param region the region value. + * @return the IndividuallyNestedWithMultipleClientBuilder. + */ + @Generated + public IndividuallyNestedWithMultipleClientBuilder region(String region) { + this.region = region; + return this; + } + + /* + * The retry policy that will attempt to retry failed requests, if applicable. + */ + @Generated + private RetryPolicy retryPolicy; + + /** + * Sets The retry policy that will attempt to retry failed requests, if applicable. + * + * @param retryPolicy the retryPolicy value. + * @return the IndividuallyNestedWithMultipleClientBuilder. + */ + @Generated + public IndividuallyNestedWithMultipleClientBuilder retryPolicy(RetryPolicy retryPolicy) { + this.retryPolicy = retryPolicy; + return this; + } + + /** + * Builds an instance of IndividuallyNestedWithMultipleClientImpl with the provided parameters. + * + * @return an instance of IndividuallyNestedWithMultipleClientImpl. + */ + @Generated + private IndividuallyNestedWithMultipleClientImpl buildInnerClient() { + this.validateClient(); + HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline(); + String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000"; + IndividuallyNestedWithMultipleClientImpl client = new IndividuallyNestedWithMultipleClientImpl(localPipeline, + JacksonAdapter.createDefaultSerializerAdapter(), localEndpoint, this.name, this.region); + return client; + } + + @Generated + private void validateClient() { + // This method is invoked from 'buildInnerClient'/'buildClient' method. + // Developer can customize this method, to validate that the necessary conditions are met for the new client. + Objects.requireNonNull(name, "'name' cannot be null."); + Objects.requireNonNull(region, "'region' cannot be null."); + } + + @Generated + private HttpPipeline createHttpPipeline() { + Configuration buildConfiguration + = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; + HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions; + ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions; + List policies = new ArrayList<>(); + String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName"); + String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); + String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions); + policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); + policies.add(new RequestIdPolicy()); + policies.add(new AddHeadersFromContextPolicy()); + HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions); + if (headers != null) { + policies.add(new AddHeadersPolicy(headers)); + } + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addBeforeRetryPolicies(policies); + policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy())); + policies.add(new AddDatePolicy()); + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addAfterRetryPolicies(policies); + policies.add(new HttpLoggingPolicy(localHttpLogOptions)); + HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])) + .httpClient(httpClient) + .clientOptions(localClientOptions) + .build(); + return httpPipeline; + } + + /** + * Builds an instance of IndividuallyNestedWithMultipleAsyncClient class. + * + * @return an instance of IndividuallyNestedWithMultipleAsyncClient. + */ + @Generated + public IndividuallyNestedWithMultipleAsyncClient buildAsyncClient() { + return new IndividuallyNestedWithMultipleAsyncClient(buildInnerClient()); + } + + /** + * Builds an instance of IndividuallyNestedWithMultipleClient class. + * + * @return an instance of IndividuallyNestedWithMultipleClient. + */ + @Generated + public IndividuallyNestedWithMultipleClient buildClient() { + return new IndividuallyNestedWithMultipleClient(buildInnerClient()); + } + + private static final ClientLogger LOGGER = new ClientLogger(IndividuallyNestedWithMultipleClientBuilder.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasAsyncClient.java new file mode 100644 index 00000000000..8b571536b33 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasAsyncClient.java @@ -0,0 +1,106 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithParamAliasClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the asynchronous IndividuallyNestedWithParamAliasClient type. + */ +@ServiceClient(builder = IndividuallyNestedWithParamAliasClientBuilder.class, isAsync = true) +public final class IndividuallyNestedWithParamAliasAsyncClient { + @Generated + private final IndividuallyNestedWithParamAliasClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyNestedWithParamAliasAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyNestedWithParamAliasAsyncClient(IndividuallyNestedWithParamAliasClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withAliasedName operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withAliasedNameWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withAliasedNameWithResponseAsync(requestOptions); + } + + /** + * The withOriginalName operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withOriginalNameWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withOriginalNameWithResponseAsync(requestOptions); + } + + /** + * The withAliasedName operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withAliasedName() { + // Generated convenience method for withAliasedNameWithResponse + RequestOptions requestOptions = new RequestOptions(); + return withAliasedNameWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The withOriginalName operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withOriginalName() { + // Generated convenience method for withOriginalNameWithResponse + RequestOptions requestOptions = new RequestOptions(); + return withOriginalNameWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClient.java new file mode 100644 index 00000000000..5b1c79b4cfd --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClient.java @@ -0,0 +1,102 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithParamAliasClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; + +/** + * Initializes a new instance of the synchronous IndividuallyNestedWithParamAliasClient type. + */ +@ServiceClient(builder = IndividuallyNestedWithParamAliasClientBuilder.class) +public final class IndividuallyNestedWithParamAliasClient { + @Generated + private final IndividuallyNestedWithParamAliasClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyNestedWithParamAliasClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyNestedWithParamAliasClient(IndividuallyNestedWithParamAliasClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withAliasedName operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withAliasedNameWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withAliasedNameWithResponse(requestOptions); + } + + /** + * The withOriginalName operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withOriginalNameWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withOriginalNameWithResponse(requestOptions); + } + + /** + * The withAliasedName operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withAliasedName() { + // Generated convenience method for withAliasedNameWithResponse + RequestOptions requestOptions = new RequestOptions(); + withAliasedNameWithResponse(requestOptions).getValue(); + } + + /** + * The withOriginalName operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withOriginalName() { + // Generated convenience method for withOriginalNameWithResponse + RequestOptions requestOptions = new RequestOptions(); + withOriginalNameWithResponse(requestOptions).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClientBuilder.java new file mode 100644 index 00000000000..08bbf80e0cd --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClientBuilder.java @@ -0,0 +1,312 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithParamAliasClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ServiceClientBuilder; +import com.azure.core.client.traits.ConfigurationTrait; +import com.azure.core.client.traits.EndpointTrait; +import com.azure.core.client.traits.HttpTrait; +import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.HttpPipelinePosition; +import com.azure.core.http.policy.AddDatePolicy; +import com.azure.core.http.policy.AddHeadersFromContextPolicy; +import com.azure.core.http.policy.AddHeadersPolicy; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.http.policy.HttpLoggingPolicy; +import com.azure.core.http.policy.HttpPipelinePolicy; +import com.azure.core.http.policy.HttpPolicyProviders; +import com.azure.core.http.policy.RequestIdPolicy; +import com.azure.core.http.policy.RetryOptions; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.ClientOptions; +import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.builder.ClientBuilderUtil; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.serializer.JacksonAdapter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * A builder for creating a new instance of the IndividuallyNestedWithParamAliasClient type. + */ +@ServiceClientBuilder( + serviceClients = { + IndividuallyNestedWithParamAliasClient.class, + IndividuallyNestedWithParamAliasAsyncClient.class }) +public final class IndividuallyNestedWithParamAliasClientBuilder + implements HttpTrait, + ConfigurationTrait, + EndpointTrait { + @Generated + private static final String SDK_NAME = "name"; + + @Generated + private static final String SDK_VERSION = "version"; + + @Generated + private static final Map PROPERTIES + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); + + @Generated + private final List pipelinePolicies; + + /** + * Create an instance of the IndividuallyNestedWithParamAliasClientBuilder. + */ + @Generated + public IndividuallyNestedWithParamAliasClientBuilder() { + this.pipelinePolicies = new ArrayList<>(); + } + + /* + * The HTTP client used to send the request. + */ + @Generated + private HttpClient httpClient; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithParamAliasClientBuilder httpClient(HttpClient httpClient) { + this.httpClient = httpClient; + return this; + } + + /* + * The HTTP pipeline to send requests through. + */ + @Generated + private HttpPipeline pipeline; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithParamAliasClientBuilder pipeline(HttpPipeline pipeline) { + if (this.pipeline != null && pipeline == null) { + LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured."); + } + this.pipeline = pipeline; + return this; + } + + /* + * The logging configuration for HTTP requests and responses. + */ + @Generated + private HttpLogOptions httpLogOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithParamAliasClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) { + this.httpLogOptions = httpLogOptions; + return this; + } + + /* + * The client options such as application ID and custom headers to set on a request. + */ + @Generated + private ClientOptions clientOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithParamAliasClientBuilder clientOptions(ClientOptions clientOptions) { + this.clientOptions = clientOptions; + return this; + } + + /* + * The retry options to configure retry policy for failed requests. + */ + @Generated + private RetryOptions retryOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithParamAliasClientBuilder retryOptions(RetryOptions retryOptions) { + this.retryOptions = retryOptions; + return this; + } + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithParamAliasClientBuilder addPolicy(HttpPipelinePolicy customPolicy) { + Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); + pipelinePolicies.add(customPolicy); + return this; + } + + /* + * The configuration store that is used during construction of the service client. + */ + @Generated + private Configuration configuration; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithParamAliasClientBuilder configuration(Configuration configuration) { + this.configuration = configuration; + return this; + } + + /* + * The service endpoint + */ + @Generated + private String endpoint; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithParamAliasClientBuilder endpoint(String endpoint) { + this.endpoint = endpoint; + return this; + } + + /* + * + */ + @Generated + private String blobName; + + /** + * Sets. + * + * @param blobName the blobName value. + * @return the IndividuallyNestedWithParamAliasClientBuilder. + */ + @Generated + public IndividuallyNestedWithParamAliasClientBuilder blobName(String blobName) { + this.blobName = blobName; + return this; + } + + /* + * The retry policy that will attempt to retry failed requests, if applicable. + */ + @Generated + private RetryPolicy retryPolicy; + + /** + * Sets The retry policy that will attempt to retry failed requests, if applicable. + * + * @param retryPolicy the retryPolicy value. + * @return the IndividuallyNestedWithParamAliasClientBuilder. + */ + @Generated + public IndividuallyNestedWithParamAliasClientBuilder retryPolicy(RetryPolicy retryPolicy) { + this.retryPolicy = retryPolicy; + return this; + } + + /** + * Builds an instance of IndividuallyNestedWithParamAliasClientImpl with the provided parameters. + * + * @return an instance of IndividuallyNestedWithParamAliasClientImpl. + */ + @Generated + private IndividuallyNestedWithParamAliasClientImpl buildInnerClient() { + this.validateClient(); + HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline(); + String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000"; + IndividuallyNestedWithParamAliasClientImpl client = new IndividuallyNestedWithParamAliasClientImpl( + localPipeline, JacksonAdapter.createDefaultSerializerAdapter(), localEndpoint, this.blobName); + return client; + } + + @Generated + private void validateClient() { + // This method is invoked from 'buildInnerClient'/'buildClient' method. + // Developer can customize this method, to validate that the necessary conditions are met for the new client. + Objects.requireNonNull(blobName, "'blobName' cannot be null."); + } + + @Generated + private HttpPipeline createHttpPipeline() { + Configuration buildConfiguration + = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; + HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions; + ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions; + List policies = new ArrayList<>(); + String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName"); + String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); + String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions); + policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); + policies.add(new RequestIdPolicy()); + policies.add(new AddHeadersFromContextPolicy()); + HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions); + if (headers != null) { + policies.add(new AddHeadersPolicy(headers)); + } + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addBeforeRetryPolicies(policies); + policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy())); + policies.add(new AddDatePolicy()); + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addAfterRetryPolicies(policies); + policies.add(new HttpLoggingPolicy(localHttpLogOptions)); + HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])) + .httpClient(httpClient) + .clientOptions(localClientOptions) + .build(); + return httpPipeline; + } + + /** + * Builds an instance of IndividuallyNestedWithParamAliasAsyncClient class. + * + * @return an instance of IndividuallyNestedWithParamAliasAsyncClient. + */ + @Generated + public IndividuallyNestedWithParamAliasAsyncClient buildAsyncClient() { + return new IndividuallyNestedWithParamAliasAsyncClient(buildInnerClient()); + } + + /** + * Builds an instance of IndividuallyNestedWithParamAliasClient class. + * + * @return an instance of IndividuallyNestedWithParamAliasClient. + */ + @Generated + public IndividuallyNestedWithParamAliasClient buildClient() { + return new IndividuallyNestedWithParamAliasClient(buildInnerClient()); + } + + private static final ClientLogger LOGGER = new ClientLogger(IndividuallyNestedWithParamAliasClientBuilder.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java new file mode 100644 index 00000000000..2395fb1d54d --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java @@ -0,0 +1,185 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithPathClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the asynchronous IndividuallyNestedWithPathClient type. + */ +@ServiceClient(builder = IndividuallyNestedWithPathClientBuilder.class, isAsync = true) +public final class IndividuallyNestedWithPathAsyncClient { + @Generated + private final IndividuallyNestedWithPathClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyNestedWithPathAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyNestedWithPathAsyncClient(IndividuallyNestedWithPathClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponseAsync(requestOptions); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponseAsync(requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponseAsync(requestOptions); + } + + /** + * The withQuery operation. + * + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery(String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The withQuery operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery() { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The getStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return properties of a blob on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getStandalone() { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(BlobProperties.class)); + } + + /** + * The deleteStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteStandalone() { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return deleteStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java new file mode 100644 index 00000000000..1a628e35125 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java @@ -0,0 +1,179 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithPathClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; + +/** + * Initializes a new instance of the synchronous IndividuallyNestedWithPathClient type. + */ +@ServiceClient(builder = IndividuallyNestedWithPathClientBuilder.class) +public final class IndividuallyNestedWithPathClient { + @Generated + private final IndividuallyNestedWithPathClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyNestedWithPathClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyNestedWithPathClient(IndividuallyNestedWithPathClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponse(requestOptions); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponse(requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponse(requestOptions); + } + + /** + * The withQuery operation. + * + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery(String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + withQueryWithResponse(requestOptions).getValue(); + } + + /** + * The withQuery operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery() { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + withQueryWithResponse(requestOptions).getValue(); + } + + /** + * The getStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return properties of a blob. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public BlobProperties getStandalone() { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getStandaloneWithResponse(requestOptions).getValue().toObject(BlobProperties.class); + } + + /** + * The deleteStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void deleteStandalone() { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + deleteStandaloneWithResponse(requestOptions).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClientBuilder.java new file mode 100644 index 00000000000..a6e6ecf693c --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClientBuilder.java @@ -0,0 +1,309 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithPathClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ServiceClientBuilder; +import com.azure.core.client.traits.ConfigurationTrait; +import com.azure.core.client.traits.EndpointTrait; +import com.azure.core.client.traits.HttpTrait; +import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.HttpPipelinePosition; +import com.azure.core.http.policy.AddDatePolicy; +import com.azure.core.http.policy.AddHeadersFromContextPolicy; +import com.azure.core.http.policy.AddHeadersPolicy; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.http.policy.HttpLoggingPolicy; +import com.azure.core.http.policy.HttpPipelinePolicy; +import com.azure.core.http.policy.HttpPolicyProviders; +import com.azure.core.http.policy.RequestIdPolicy; +import com.azure.core.http.policy.RetryOptions; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.ClientOptions; +import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.builder.ClientBuilderUtil; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.serializer.JacksonAdapter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * A builder for creating a new instance of the IndividuallyNestedWithPathClient type. + */ +@ServiceClientBuilder( + serviceClients = { IndividuallyNestedWithPathClient.class, IndividuallyNestedWithPathAsyncClient.class }) +public final class IndividuallyNestedWithPathClientBuilder implements + HttpTrait, ConfigurationTrait, + EndpointTrait { + @Generated + private static final String SDK_NAME = "name"; + + @Generated + private static final String SDK_VERSION = "version"; + + @Generated + private static final Map PROPERTIES + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); + + @Generated + private final List pipelinePolicies; + + /** + * Create an instance of the IndividuallyNestedWithPathClientBuilder. + */ + @Generated + public IndividuallyNestedWithPathClientBuilder() { + this.pipelinePolicies = new ArrayList<>(); + } + + /* + * The HTTP client used to send the request. + */ + @Generated + private HttpClient httpClient; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithPathClientBuilder httpClient(HttpClient httpClient) { + this.httpClient = httpClient; + return this; + } + + /* + * The HTTP pipeline to send requests through. + */ + @Generated + private HttpPipeline pipeline; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithPathClientBuilder pipeline(HttpPipeline pipeline) { + if (this.pipeline != null && pipeline == null) { + LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured."); + } + this.pipeline = pipeline; + return this; + } + + /* + * The logging configuration for HTTP requests and responses. + */ + @Generated + private HttpLogOptions httpLogOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithPathClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) { + this.httpLogOptions = httpLogOptions; + return this; + } + + /* + * The client options such as application ID and custom headers to set on a request. + */ + @Generated + private ClientOptions clientOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithPathClientBuilder clientOptions(ClientOptions clientOptions) { + this.clientOptions = clientOptions; + return this; + } + + /* + * The retry options to configure retry policy for failed requests. + */ + @Generated + private RetryOptions retryOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithPathClientBuilder retryOptions(RetryOptions retryOptions) { + this.retryOptions = retryOptions; + return this; + } + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithPathClientBuilder addPolicy(HttpPipelinePolicy customPolicy) { + Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); + pipelinePolicies.add(customPolicy); + return this; + } + + /* + * The configuration store that is used during construction of the service client. + */ + @Generated + private Configuration configuration; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithPathClientBuilder configuration(Configuration configuration) { + this.configuration = configuration; + return this; + } + + /* + * The service endpoint + */ + @Generated + private String endpoint; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithPathClientBuilder endpoint(String endpoint) { + this.endpoint = endpoint; + return this; + } + + /* + * + */ + @Generated + private String blobName; + + /** + * Sets. + * + * @param blobName the blobName value. + * @return the IndividuallyNestedWithPathClientBuilder. + */ + @Generated + public IndividuallyNestedWithPathClientBuilder blobName(String blobName) { + this.blobName = blobName; + return this; + } + + /* + * The retry policy that will attempt to retry failed requests, if applicable. + */ + @Generated + private RetryPolicy retryPolicy; + + /** + * Sets The retry policy that will attempt to retry failed requests, if applicable. + * + * @param retryPolicy the retryPolicy value. + * @return the IndividuallyNestedWithPathClientBuilder. + */ + @Generated + public IndividuallyNestedWithPathClientBuilder retryPolicy(RetryPolicy retryPolicy) { + this.retryPolicy = retryPolicy; + return this; + } + + /** + * Builds an instance of IndividuallyNestedWithPathClientImpl with the provided parameters. + * + * @return an instance of IndividuallyNestedWithPathClientImpl. + */ + @Generated + private IndividuallyNestedWithPathClientImpl buildInnerClient() { + this.validateClient(); + HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline(); + String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000"; + IndividuallyNestedWithPathClientImpl client = new IndividuallyNestedWithPathClientImpl(localPipeline, + JacksonAdapter.createDefaultSerializerAdapter(), localEndpoint, this.blobName); + return client; + } + + @Generated + private void validateClient() { + // This method is invoked from 'buildInnerClient'/'buildClient' method. + // Developer can customize this method, to validate that the necessary conditions are met for the new client. + Objects.requireNonNull(blobName, "'blobName' cannot be null."); + } + + @Generated + private HttpPipeline createHttpPipeline() { + Configuration buildConfiguration + = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; + HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions; + ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions; + List policies = new ArrayList<>(); + String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName"); + String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); + String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions); + policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); + policies.add(new RequestIdPolicy()); + policies.add(new AddHeadersFromContextPolicy()); + HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions); + if (headers != null) { + policies.add(new AddHeadersPolicy(headers)); + } + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addBeforeRetryPolicies(policies); + policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy())); + policies.add(new AddDatePolicy()); + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addAfterRetryPolicies(policies); + policies.add(new HttpLoggingPolicy(localHttpLogOptions)); + HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])) + .httpClient(httpClient) + .clientOptions(localClientOptions) + .build(); + return httpPipeline; + } + + /** + * Builds an instance of IndividuallyNestedWithPathAsyncClient class. + * + * @return an instance of IndividuallyNestedWithPathAsyncClient. + */ + @Generated + public IndividuallyNestedWithPathAsyncClient buildAsyncClient() { + return new IndividuallyNestedWithPathAsyncClient(buildInnerClient()); + } + + /** + * Builds an instance of IndividuallyNestedWithPathClient class. + * + * @return an instance of IndividuallyNestedWithPathClient. + */ + @Generated + public IndividuallyNestedWithPathClient buildClient() { + return new IndividuallyNestedWithPathClient(buildInnerClient()); + } + + private static final ClientLogger LOGGER = new ClientLogger(IndividuallyNestedWithPathClientBuilder.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java new file mode 100644 index 00000000000..4687e43da90 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java @@ -0,0 +1,185 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithQueryClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the asynchronous IndividuallyNestedWithQueryClient type. + */ +@ServiceClient(builder = IndividuallyNestedWithQueryClientBuilder.class, isAsync = true) +public final class IndividuallyNestedWithQueryAsyncClient { + @Generated + private final IndividuallyNestedWithQueryClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyNestedWithQueryAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyNestedWithQueryAsyncClient(IndividuallyNestedWithQueryClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponseAsync(requestOptions); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponseAsync(requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponseAsync(requestOptions); + } + + /** + * The withQuery operation. + * + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery(String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The withQuery operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery() { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The getStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return properties of a blob on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getStandalone() { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(BlobProperties.class)); + } + + /** + * The deleteStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteStandalone() { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return deleteStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java new file mode 100644 index 00000000000..386620bb3fc --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java @@ -0,0 +1,179 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithQueryClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; + +/** + * Initializes a new instance of the synchronous IndividuallyNestedWithQueryClient type. + */ +@ServiceClient(builder = IndividuallyNestedWithQueryClientBuilder.class) +public final class IndividuallyNestedWithQueryClient { + @Generated + private final IndividuallyNestedWithQueryClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyNestedWithQueryClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyNestedWithQueryClient(IndividuallyNestedWithQueryClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponse(requestOptions); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponse(requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponse(requestOptions); + } + + /** + * The withQuery operation. + * + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery(String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + withQueryWithResponse(requestOptions).getValue(); + } + + /** + * The withQuery operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery() { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + withQueryWithResponse(requestOptions).getValue(); + } + + /** + * The getStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return properties of a blob. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public BlobProperties getStandalone() { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getStandaloneWithResponse(requestOptions).getValue().toObject(BlobProperties.class); + } + + /** + * The deleteStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void deleteStandalone() { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + deleteStandaloneWithResponse(requestOptions).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClientBuilder.java new file mode 100644 index 00000000000..b9bf96e40a2 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClientBuilder.java @@ -0,0 +1,309 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithQueryClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ServiceClientBuilder; +import com.azure.core.client.traits.ConfigurationTrait; +import com.azure.core.client.traits.EndpointTrait; +import com.azure.core.client.traits.HttpTrait; +import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.HttpPipelinePosition; +import com.azure.core.http.policy.AddDatePolicy; +import com.azure.core.http.policy.AddHeadersFromContextPolicy; +import com.azure.core.http.policy.AddHeadersPolicy; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.http.policy.HttpLoggingPolicy; +import com.azure.core.http.policy.HttpPipelinePolicy; +import com.azure.core.http.policy.HttpPolicyProviders; +import com.azure.core.http.policy.RequestIdPolicy; +import com.azure.core.http.policy.RetryOptions; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.ClientOptions; +import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.builder.ClientBuilderUtil; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.serializer.JacksonAdapter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * A builder for creating a new instance of the IndividuallyNestedWithQueryClient type. + */ +@ServiceClientBuilder( + serviceClients = { IndividuallyNestedWithQueryClient.class, IndividuallyNestedWithQueryAsyncClient.class }) +public final class IndividuallyNestedWithQueryClientBuilder implements + HttpTrait, ConfigurationTrait, + EndpointTrait { + @Generated + private static final String SDK_NAME = "name"; + + @Generated + private static final String SDK_VERSION = "version"; + + @Generated + private static final Map PROPERTIES + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); + + @Generated + private final List pipelinePolicies; + + /** + * Create an instance of the IndividuallyNestedWithQueryClientBuilder. + */ + @Generated + public IndividuallyNestedWithQueryClientBuilder() { + this.pipelinePolicies = new ArrayList<>(); + } + + /* + * The HTTP client used to send the request. + */ + @Generated + private HttpClient httpClient; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithQueryClientBuilder httpClient(HttpClient httpClient) { + this.httpClient = httpClient; + return this; + } + + /* + * The HTTP pipeline to send requests through. + */ + @Generated + private HttpPipeline pipeline; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithQueryClientBuilder pipeline(HttpPipeline pipeline) { + if (this.pipeline != null && pipeline == null) { + LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured."); + } + this.pipeline = pipeline; + return this; + } + + /* + * The logging configuration for HTTP requests and responses. + */ + @Generated + private HttpLogOptions httpLogOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithQueryClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) { + this.httpLogOptions = httpLogOptions; + return this; + } + + /* + * The client options such as application ID and custom headers to set on a request. + */ + @Generated + private ClientOptions clientOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithQueryClientBuilder clientOptions(ClientOptions clientOptions) { + this.clientOptions = clientOptions; + return this; + } + + /* + * The retry options to configure retry policy for failed requests. + */ + @Generated + private RetryOptions retryOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithQueryClientBuilder retryOptions(RetryOptions retryOptions) { + this.retryOptions = retryOptions; + return this; + } + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithQueryClientBuilder addPolicy(HttpPipelinePolicy customPolicy) { + Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); + pipelinePolicies.add(customPolicy); + return this; + } + + /* + * The configuration store that is used during construction of the service client. + */ + @Generated + private Configuration configuration; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithQueryClientBuilder configuration(Configuration configuration) { + this.configuration = configuration; + return this; + } + + /* + * The service endpoint + */ + @Generated + private String endpoint; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyNestedWithQueryClientBuilder endpoint(String endpoint) { + this.endpoint = endpoint; + return this; + } + + /* + * + */ + @Generated + private String blobName; + + /** + * Sets. + * + * @param blobName the blobName value. + * @return the IndividuallyNestedWithQueryClientBuilder. + */ + @Generated + public IndividuallyNestedWithQueryClientBuilder blobName(String blobName) { + this.blobName = blobName; + return this; + } + + /* + * The retry policy that will attempt to retry failed requests, if applicable. + */ + @Generated + private RetryPolicy retryPolicy; + + /** + * Sets The retry policy that will attempt to retry failed requests, if applicable. + * + * @param retryPolicy the retryPolicy value. + * @return the IndividuallyNestedWithQueryClientBuilder. + */ + @Generated + public IndividuallyNestedWithQueryClientBuilder retryPolicy(RetryPolicy retryPolicy) { + this.retryPolicy = retryPolicy; + return this; + } + + /** + * Builds an instance of IndividuallyNestedWithQueryClientImpl with the provided parameters. + * + * @return an instance of IndividuallyNestedWithQueryClientImpl. + */ + @Generated + private IndividuallyNestedWithQueryClientImpl buildInnerClient() { + this.validateClient(); + HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline(); + String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000"; + IndividuallyNestedWithQueryClientImpl client = new IndividuallyNestedWithQueryClientImpl(localPipeline, + JacksonAdapter.createDefaultSerializerAdapter(), localEndpoint, this.blobName); + return client; + } + + @Generated + private void validateClient() { + // This method is invoked from 'buildInnerClient'/'buildClient' method. + // Developer can customize this method, to validate that the necessary conditions are met for the new client. + Objects.requireNonNull(blobName, "'blobName' cannot be null."); + } + + @Generated + private HttpPipeline createHttpPipeline() { + Configuration buildConfiguration + = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; + HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions; + ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions; + List policies = new ArrayList<>(); + String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName"); + String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); + String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions); + policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); + policies.add(new RequestIdPolicy()); + policies.add(new AddHeadersFromContextPolicy()); + HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions); + if (headers != null) { + policies.add(new AddHeadersPolicy(headers)); + } + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addBeforeRetryPolicies(policies); + policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy())); + policies.add(new AddDatePolicy()); + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addAfterRetryPolicies(policies); + policies.add(new HttpLoggingPolicy(localHttpLogOptions)); + HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])) + .httpClient(httpClient) + .clientOptions(localClientOptions) + .build(); + return httpPipeline; + } + + /** + * Builds an instance of IndividuallyNestedWithQueryAsyncClient class. + * + * @return an instance of IndividuallyNestedWithQueryAsyncClient. + */ + @Generated + public IndividuallyNestedWithQueryAsyncClient buildAsyncClient() { + return new IndividuallyNestedWithQueryAsyncClient(buildInnerClient()); + } + + /** + * Builds an instance of IndividuallyNestedWithQueryClient class. + * + * @return an instance of IndividuallyNestedWithQueryClient. + */ + @Generated + public IndividuallyNestedWithQueryClient buildClient() { + return new IndividuallyNestedWithQueryClient(buildInnerClient()); + } + + private static final ClientLogger LOGGER = new ClientLogger(IndividuallyNestedWithQueryClientBuilder.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithHeaderClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithHeaderClientImpl.java new file mode 100644 index 00000000000..a066012e6ac --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithHeaderClientImpl.java @@ -0,0 +1,306 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; + +import com.azure.core.annotation.Delete; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.Get; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import com.azure.core.util.serializer.JacksonAdapter; +import com.azure.core.util.serializer.SerializerAdapter; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the IndividuallyNestedWithHeaderClient type. + */ +public final class IndividuallyNestedWithHeaderClientImpl { + /** + * The proxy service used to perform REST calls. + */ + private final IndividuallyNestedWithHeaderClientService service; + + /** + * Service host. + */ + private final String endpoint; + + /** + * Gets Service host. + * + * @return the endpoint value. + */ + public String getEndpoint() { + return this.endpoint; + } + + /** + */ + private final String name; + + /** + * Gets. + * + * @return the name value. + */ + public String getName() { + return this.name; + } + + /** + * The HTTP pipeline to send requests through. + */ + private final HttpPipeline httpPipeline; + + /** + * Gets The HTTP pipeline to send requests through. + * + * @return the httpPipeline value. + */ + public HttpPipeline getHttpPipeline() { + return this.httpPipeline; + } + + /** + * The serializer to serialize an object into a string. + */ + private final SerializerAdapter serializerAdapter; + + /** + * Gets The serializer to serialize an object into a string. + * + * @return the serializerAdapter value. + */ + public SerializerAdapter getSerializerAdapter() { + return this.serializerAdapter; + } + + /** + * Initializes an instance of IndividuallyNestedWithHeaderClient client. + * + * @param endpoint Service host. + * @param name + */ + public IndividuallyNestedWithHeaderClientImpl(String endpoint, String name) { + this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), + JacksonAdapter.createDefaultSerializerAdapter(), endpoint, name); + } + + /** + * Initializes an instance of IndividuallyNestedWithHeaderClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param endpoint Service host. + * @param name + */ + public IndividuallyNestedWithHeaderClientImpl(HttpPipeline httpPipeline, String endpoint, String name) { + this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, name); + } + + /** + * Initializes an instance of IndividuallyNestedWithHeaderClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param serializerAdapter The serializer to serialize an object into a string. + * @param endpoint Service host. + * @param name + */ + public IndividuallyNestedWithHeaderClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, + String endpoint, String name) { + this.httpPipeline = httpPipeline; + this.serializerAdapter = serializerAdapter; + this.endpoint = endpoint; + this.name = name; + this.service = RestProxy.create(IndividuallyNestedWithHeaderClientService.class, this.httpPipeline, + this.getSerializerAdapter()); + } + + /** + * The interface defining all the services for IndividuallyNestedWithHeaderClient to be used by the proxy service to + * perform REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "IndividuallyNestedWithHeaderClient") + public interface IndividuallyNestedWithHeaderClientService { + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-header/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withQuery(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-header/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withQuerySync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-header/get-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> getStandalone(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-header/get-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getStandaloneSync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually/nested-default-individually-header/delete-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteStandalone(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually/nested-default-individually-header/delete-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteStandaloneSync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + RequestOptions requestOptions, Context context); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil + .withContext(context -> service.withQuery(this.getEndpoint(), this.getName(), requestOptions, context)); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(RequestOptions requestOptions) { + return service.withQuerySync(this.getEndpoint(), this.getName(), requestOptions, Context.NONE); + } + + /** + * The getStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil + .withContext(context -> service.getStandalone(this.getEndpoint(), this.getName(), requestOptions, context)); + } + + /** + * The getStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(RequestOptions requestOptions) { + return service.getStandaloneSync(this.getEndpoint(), this.getName(), requestOptions, Context.NONE); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.deleteStandalone(this.getEndpoint(), this.getName(), requestOptions, context)); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { + return service.deleteStandaloneSync(this.getEndpoint(), this.getName(), requestOptions, Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMixedClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMixedClientImpl.java new file mode 100644 index 00000000000..bfd2b9633e9 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMixedClientImpl.java @@ -0,0 +1,313 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; + +import com.azure.core.annotation.Delete; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.Get; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.QueryParam; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import com.azure.core.util.serializer.JacksonAdapter; +import com.azure.core.util.serializer.SerializerAdapter; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the IndividuallyNestedWithMixedClient type. + */ +public final class IndividuallyNestedWithMixedClientImpl { + /** + * The proxy service used to perform REST calls. + */ + private final IndividuallyNestedWithMixedClientService service; + + /** + * Service host. + */ + private final String endpoint; + + /** + * Gets Service host. + * + * @return the endpoint value. + */ + public String getEndpoint() { + return this.endpoint; + } + + /** + */ + private final String name; + + /** + * Gets. + * + * @return the name value. + */ + public String getName() { + return this.name; + } + + /** + * The HTTP pipeline to send requests through. + */ + private final HttpPipeline httpPipeline; + + /** + * Gets The HTTP pipeline to send requests through. + * + * @return the httpPipeline value. + */ + public HttpPipeline getHttpPipeline() { + return this.httpPipeline; + } + + /** + * The serializer to serialize an object into a string. + */ + private final SerializerAdapter serializerAdapter; + + /** + * Gets The serializer to serialize an object into a string. + * + * @return the serializerAdapter value. + */ + public SerializerAdapter getSerializerAdapter() { + return this.serializerAdapter; + } + + /** + * Initializes an instance of IndividuallyNestedWithMixedClient client. + * + * @param endpoint Service host. + * @param name + */ + public IndividuallyNestedWithMixedClientImpl(String endpoint, String name) { + this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), + JacksonAdapter.createDefaultSerializerAdapter(), endpoint, name); + } + + /** + * Initializes an instance of IndividuallyNestedWithMixedClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param endpoint Service host. + * @param name + */ + public IndividuallyNestedWithMixedClientImpl(HttpPipeline httpPipeline, String endpoint, String name) { + this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, name); + } + + /** + * Initializes an instance of IndividuallyNestedWithMixedClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param serializerAdapter The serializer to serialize an object into a string. + * @param endpoint Service host. + * @param name + */ + public IndividuallyNestedWithMixedClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, + String endpoint, String name) { + this.httpPipeline = httpPipeline; + this.serializerAdapter = serializerAdapter; + this.endpoint = endpoint; + this.name = name; + this.service = RestProxy.create(IndividuallyNestedWithMixedClientService.class, this.httpPipeline, + this.getSerializerAdapter()); + } + + /** + * The interface defining all the services for IndividuallyNestedWithMixedClient to be used by the proxy service to + * perform REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "IndividuallyNestedWithMixedClient") + public interface IndividuallyNestedWithMixedClientService { + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-mixed/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withQuery(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-mixed/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withQuerySync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-mixed/get-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> getStandalone(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-mixed/get-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getStandaloneSync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually/nested-default-individually-mixed/delete-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteStandalone(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually/nested-default-individually-mixed/delete-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteStandaloneSync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponseAsync(String region, RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.withQuery(this.getEndpoint(), this.getName(), region, requestOptions, context)); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(String region, RequestOptions requestOptions) { + return service.withQuerySync(this.getEndpoint(), this.getName(), region, requestOptions, Context.NONE); + } + + /** + * The getStandalone operation. + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponseAsync(String region, RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.getStandalone(this.getEndpoint(), this.getName(), region, requestOptions, context)); + } + + /** + * The getStandalone operation. + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(String region, RequestOptions requestOptions) { + return service.getStandaloneSync(this.getEndpoint(), this.getName(), region, requestOptions, Context.NONE); + } + + /** + * The deleteStandalone operation. + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponseAsync(String region, RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.deleteStandalone(this.getEndpoint(), this.getName(), region, requestOptions, context)); + } + + /** + * The deleteStandalone operation. + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(String region, RequestOptions requestOptions) { + return service.deleteStandaloneSync(this.getEndpoint(), this.getName(), region, requestOptions, Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMultipleClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMultipleClientImpl.java new file mode 100644 index 00000000000..73f3a63e34b --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMultipleClientImpl.java @@ -0,0 +1,328 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; + +import com.azure.core.annotation.Delete; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.Get; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.QueryParam; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import com.azure.core.util.serializer.JacksonAdapter; +import com.azure.core.util.serializer.SerializerAdapter; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the IndividuallyNestedWithMultipleClient type. + */ +public final class IndividuallyNestedWithMultipleClientImpl { + /** + * The proxy service used to perform REST calls. + */ + private final IndividuallyNestedWithMultipleClientService service; + + /** + * Service host. + */ + private final String endpoint; + + /** + * Gets Service host. + * + * @return the endpoint value. + */ + public String getEndpoint() { + return this.endpoint; + } + + /** + */ + private final String name; + + /** + * Gets. + * + * @return the name value. + */ + public String getName() { + return this.name; + } + + /** + */ + private final String region; + + /** + * Gets. + * + * @return the region value. + */ + public String getRegion() { + return this.region; + } + + /** + * The HTTP pipeline to send requests through. + */ + private final HttpPipeline httpPipeline; + + /** + * Gets The HTTP pipeline to send requests through. + * + * @return the httpPipeline value. + */ + public HttpPipeline getHttpPipeline() { + return this.httpPipeline; + } + + /** + * The serializer to serialize an object into a string. + */ + private final SerializerAdapter serializerAdapter; + + /** + * Gets The serializer to serialize an object into a string. + * + * @return the serializerAdapter value. + */ + public SerializerAdapter getSerializerAdapter() { + return this.serializerAdapter; + } + + /** + * Initializes an instance of IndividuallyNestedWithMultipleClient client. + * + * @param endpoint Service host. + * @param name + * @param region + */ + public IndividuallyNestedWithMultipleClientImpl(String endpoint, String name, String region) { + this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), + JacksonAdapter.createDefaultSerializerAdapter(), endpoint, name, region); + } + + /** + * Initializes an instance of IndividuallyNestedWithMultipleClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param endpoint Service host. + * @param name + * @param region + */ + public IndividuallyNestedWithMultipleClientImpl(HttpPipeline httpPipeline, String endpoint, String name, + String region) { + this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, name, region); + } + + /** + * Initializes an instance of IndividuallyNestedWithMultipleClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param serializerAdapter The serializer to serialize an object into a string. + * @param endpoint Service host. + * @param name + * @param region + */ + public IndividuallyNestedWithMultipleClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, + String endpoint, String name, String region) { + this.httpPipeline = httpPipeline; + this.serializerAdapter = serializerAdapter; + this.endpoint = endpoint; + this.name = name; + this.region = region; + this.service = RestProxy.create(IndividuallyNestedWithMultipleClientService.class, this.httpPipeline, + this.getSerializerAdapter()); + } + + /** + * The interface defining all the services for IndividuallyNestedWithMultipleClient to be used by the proxy service + * to perform REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "IndividuallyNestedWithMultipleClient") + public interface IndividuallyNestedWithMultipleClientService { + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-multiple/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withQuery(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-multiple/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withQuerySync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-multiple/get-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> getStandalone(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-multiple/get-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getStandaloneSync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually/nested-default-individually-multiple/delete-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteStandalone(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually/nested-default-individually-multiple/delete-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteStandaloneSync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil.withContext(context -> service.withQuery(this.getEndpoint(), this.getName(), this.getRegion(), + requestOptions, context)); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(RequestOptions requestOptions) { + return service.withQuerySync(this.getEndpoint(), this.getName(), this.getRegion(), requestOptions, + Context.NONE); + } + + /** + * The getStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil.withContext(context -> service.getStandalone(this.getEndpoint(), this.getName(), + this.getRegion(), requestOptions, context)); + } + + /** + * The getStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(RequestOptions requestOptions) { + return service.getStandaloneSync(this.getEndpoint(), this.getName(), this.getRegion(), requestOptions, + Context.NONE); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil.withContext(context -> service.deleteStandalone(this.getEndpoint(), this.getName(), + this.getRegion(), requestOptions, context)); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { + return service.deleteStandaloneSync(this.getEndpoint(), this.getName(), this.getRegion(), requestOptions, + Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithParamAliasClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithParamAliasClientImpl.java new file mode 100644 index 00000000000..b8b596731d5 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithParamAliasClientImpl.java @@ -0,0 +1,242 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; + +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.Get; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.PathParam; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import com.azure.core.util.serializer.JacksonAdapter; +import com.azure.core.util.serializer.SerializerAdapter; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the IndividuallyNestedWithParamAliasClient type. + */ +public final class IndividuallyNestedWithParamAliasClientImpl { + /** + * The proxy service used to perform REST calls. + */ + private final IndividuallyNestedWithParamAliasClientService service; + + /** + * Service host. + */ + private final String endpoint; + + /** + * Gets Service host. + * + * @return the endpoint value. + */ + public String getEndpoint() { + return this.endpoint; + } + + /** + */ + private final String blobName; + + /** + * Gets. + * + * @return the blobName value. + */ + public String getBlobName() { + return this.blobName; + } + + /** + * The HTTP pipeline to send requests through. + */ + private final HttpPipeline httpPipeline; + + /** + * Gets The HTTP pipeline to send requests through. + * + * @return the httpPipeline value. + */ + public HttpPipeline getHttpPipeline() { + return this.httpPipeline; + } + + /** + * The serializer to serialize an object into a string. + */ + private final SerializerAdapter serializerAdapter; + + /** + * Gets The serializer to serialize an object into a string. + * + * @return the serializerAdapter value. + */ + public SerializerAdapter getSerializerAdapter() { + return this.serializerAdapter; + } + + /** + * Initializes an instance of IndividuallyNestedWithParamAliasClient client. + * + * @param endpoint Service host. + * @param blobName + */ + public IndividuallyNestedWithParamAliasClientImpl(String endpoint, String blobName) { + this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), + JacksonAdapter.createDefaultSerializerAdapter(), endpoint, blobName); + } + + /** + * Initializes an instance of IndividuallyNestedWithParamAliasClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param endpoint Service host. + * @param blobName + */ + public IndividuallyNestedWithParamAliasClientImpl(HttpPipeline httpPipeline, String endpoint, String blobName) { + this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, blobName); + } + + /** + * Initializes an instance of IndividuallyNestedWithParamAliasClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param serializerAdapter The serializer to serialize an object into a string. + * @param endpoint Service host. + * @param blobName + */ + public IndividuallyNestedWithParamAliasClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, + String endpoint, String blobName) { + this.httpPipeline = httpPipeline; + this.serializerAdapter = serializerAdapter; + this.endpoint = endpoint; + this.blobName = blobName; + this.service = RestProxy.create(IndividuallyNestedWithParamAliasClientService.class, this.httpPipeline, + this.getSerializerAdapter()); + } + + /** + * The interface defining all the services for IndividuallyNestedWithParamAliasClient to be used by the proxy + * service to perform REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "IndividuallyNestedWithParamAliasClient") + public interface IndividuallyNestedWithParamAliasClientService { + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-param-alias/{blob}/with-aliased-name") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withAliasedName(@HostParam("endpoint") String endpoint, @PathParam("blob") String blobName, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-param-alias/{blob}/with-aliased-name") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withAliasedNameSync(@HostParam("endpoint") String endpoint, @PathParam("blob") String blobName, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-param-alias/{blobName}/with-original-name") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withOriginalName(@HostParam("endpoint") String endpoint, + @PathParam("blobName") String blobName, RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-param-alias/{blobName}/with-original-name") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withOriginalNameSync(@HostParam("endpoint") String endpoint, + @PathParam("blobName") String blobName, RequestOptions requestOptions, Context context); + } + + /** + * The withAliasedName operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withAliasedNameWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.withAliasedName(this.getEndpoint(), this.getBlobName(), requestOptions, context)); + } + + /** + * The withAliasedName operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withAliasedNameWithResponse(RequestOptions requestOptions) { + return service.withAliasedNameSync(this.getEndpoint(), this.getBlobName(), requestOptions, Context.NONE); + } + + /** + * The withOriginalName operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withOriginalNameWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.withOriginalName(this.getEndpoint(), this.getBlobName(), requestOptions, context)); + } + + /** + * The withOriginalName operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withOriginalNameWithResponse(RequestOptions requestOptions) { + return service.withOriginalNameSync(this.getEndpoint(), this.getBlobName(), requestOptions, Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java new file mode 100644 index 00000000000..f94075e66e8 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java @@ -0,0 +1,336 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; + +import com.azure.core.annotation.Delete; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.Get; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.PathParam; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.BinaryData; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import com.azure.core.util.serializer.JacksonAdapter; +import com.azure.core.util.serializer.SerializerAdapter; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the IndividuallyNestedWithPathClient type. + */ +public final class IndividuallyNestedWithPathClientImpl { + /** + * The proxy service used to perform REST calls. + */ + private final IndividuallyNestedWithPathClientService service; + + /** + * Service host. + */ + private final String endpoint; + + /** + * Gets Service host. + * + * @return the endpoint value. + */ + public String getEndpoint() { + return this.endpoint; + } + + /** + */ + private final String blobName; + + /** + * Gets. + * + * @return the blobName value. + */ + public String getBlobName() { + return this.blobName; + } + + /** + * The HTTP pipeline to send requests through. + */ + private final HttpPipeline httpPipeline; + + /** + * Gets The HTTP pipeline to send requests through. + * + * @return the httpPipeline value. + */ + public HttpPipeline getHttpPipeline() { + return this.httpPipeline; + } + + /** + * The serializer to serialize an object into a string. + */ + private final SerializerAdapter serializerAdapter; + + /** + * Gets The serializer to serialize an object into a string. + * + * @return the serializerAdapter value. + */ + public SerializerAdapter getSerializerAdapter() { + return this.serializerAdapter; + } + + /** + * Initializes an instance of IndividuallyNestedWithPathClient client. + * + * @param endpoint Service host. + * @param blobName + */ + public IndividuallyNestedWithPathClientImpl(String endpoint, String blobName) { + this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), + JacksonAdapter.createDefaultSerializerAdapter(), endpoint, blobName); + } + + /** + * Initializes an instance of IndividuallyNestedWithPathClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param endpoint Service host. + * @param blobName + */ + public IndividuallyNestedWithPathClientImpl(HttpPipeline httpPipeline, String endpoint, String blobName) { + this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, blobName); + } + + /** + * Initializes an instance of IndividuallyNestedWithPathClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param serializerAdapter The serializer to serialize an object into a string. + * @param endpoint Service host. + * @param blobName + */ + public IndividuallyNestedWithPathClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, + String endpoint, String blobName) { + this.httpPipeline = httpPipeline; + this.serializerAdapter = serializerAdapter; + this.endpoint = endpoint; + this.blobName = blobName; + this.service = RestProxy.create(IndividuallyNestedWithPathClientService.class, this.httpPipeline, + this.getSerializerAdapter()); + } + + /** + * The interface defining all the services for IndividuallyNestedWithPathClient to be used by the proxy service to + * perform REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "IndividuallyNestedWithPathClient") + public interface IndividuallyNestedWithPathClientService { + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually/{blobName}/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withQuery(@HostParam("endpoint") String endpoint, @PathParam("blobName") String blobName, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually/{blobName}/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withQuerySync(@HostParam("endpoint") String endpoint, @PathParam("blobName") String blobName, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually/{blobName}/get-standalone") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> getStandalone(@HostParam("endpoint") String endpoint, + @PathParam("blobName") String blobName, @HeaderParam("Accept") String accept, RequestOptions requestOptions, + Context context); + + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually/{blobName}/get-standalone") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getStandaloneSync(@HostParam("endpoint") String endpoint, + @PathParam("blobName") String blobName, @HeaderParam("Accept") String accept, RequestOptions requestOptions, + Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually/nested-default-individually/{blobName}") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteStandalone(@HostParam("endpoint") String endpoint, + @PathParam("blobName") String blobName, RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually/nested-default-individually/{blobName}") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteStandaloneSync(@HostParam("endpoint") String endpoint, + @PathParam("blobName") String blobName, RequestOptions requestOptions, Context context); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil + .withContext(context -> service.withQuery(this.getEndpoint(), this.getBlobName(), requestOptions, context)); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(RequestOptions requestOptions) { + return service.withQuerySync(this.getEndpoint(), this.getBlobName(), requestOptions, Context.NONE); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponseAsync(RequestOptions requestOptions) { + final String accept = "application/json"; + return FluxUtil.withContext( + context -> service.getStandalone(this.getEndpoint(), this.getBlobName(), accept, requestOptions, context)); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(RequestOptions requestOptions) { + final String accept = "application/json"; + return service.getStandaloneSync(this.getEndpoint(), this.getBlobName(), accept, requestOptions, Context.NONE); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.deleteStandalone(this.getEndpoint(), this.getBlobName(), requestOptions, context)); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { + return service.deleteStandaloneSync(this.getEndpoint(), this.getBlobName(), requestOptions, Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java new file mode 100644 index 00000000000..64794f5a5cc --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java @@ -0,0 +1,336 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; + +import com.azure.core.annotation.Delete; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.Get; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.QueryParam; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.BinaryData; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import com.azure.core.util.serializer.JacksonAdapter; +import com.azure.core.util.serializer.SerializerAdapter; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the IndividuallyNestedWithQueryClient type. + */ +public final class IndividuallyNestedWithQueryClientImpl { + /** + * The proxy service used to perform REST calls. + */ + private final IndividuallyNestedWithQueryClientService service; + + /** + * Service host. + */ + private final String endpoint; + + /** + * Gets Service host. + * + * @return the endpoint value. + */ + public String getEndpoint() { + return this.endpoint; + } + + /** + */ + private final String blobName; + + /** + * Gets. + * + * @return the blobName value. + */ + public String getBlobName() { + return this.blobName; + } + + /** + * The HTTP pipeline to send requests through. + */ + private final HttpPipeline httpPipeline; + + /** + * Gets The HTTP pipeline to send requests through. + * + * @return the httpPipeline value. + */ + public HttpPipeline getHttpPipeline() { + return this.httpPipeline; + } + + /** + * The serializer to serialize an object into a string. + */ + private final SerializerAdapter serializerAdapter; + + /** + * Gets The serializer to serialize an object into a string. + * + * @return the serializerAdapter value. + */ + public SerializerAdapter getSerializerAdapter() { + return this.serializerAdapter; + } + + /** + * Initializes an instance of IndividuallyNestedWithQueryClient client. + * + * @param endpoint Service host. + * @param blobName + */ + public IndividuallyNestedWithQueryClientImpl(String endpoint, String blobName) { + this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), + JacksonAdapter.createDefaultSerializerAdapter(), endpoint, blobName); + } + + /** + * Initializes an instance of IndividuallyNestedWithQueryClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param endpoint Service host. + * @param blobName + */ + public IndividuallyNestedWithQueryClientImpl(HttpPipeline httpPipeline, String endpoint, String blobName) { + this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, blobName); + } + + /** + * Initializes an instance of IndividuallyNestedWithQueryClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param serializerAdapter The serializer to serialize an object into a string. + * @param endpoint Service host. + * @param blobName + */ + public IndividuallyNestedWithQueryClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, + String endpoint, String blobName) { + this.httpPipeline = httpPipeline; + this.serializerAdapter = serializerAdapter; + this.endpoint = endpoint; + this.blobName = blobName; + this.service = RestProxy.create(IndividuallyNestedWithQueryClientService.class, this.httpPipeline, + this.getSerializerAdapter()); + } + + /** + * The interface defining all the services for IndividuallyNestedWithQueryClient to be used by the proxy service to + * perform REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "IndividuallyNestedWithQueryClient") + public interface IndividuallyNestedWithQueryClientService { + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-query/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withQuery(@HostParam("endpoint") String endpoint, @QueryParam("blobName") String blobName, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-query/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withQuerySync(@HostParam("endpoint") String endpoint, @QueryParam("blobName") String blobName, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-query/get-standalone") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> getStandalone(@HostParam("endpoint") String endpoint, + @QueryParam("blobName") String blobName, @HeaderParam("Accept") String accept, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually/nested-default-individually-query/get-standalone") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getStandaloneSync(@HostParam("endpoint") String endpoint, + @QueryParam("blobName") String blobName, @HeaderParam("Accept") String accept, + RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually/nested-default-individually-query/delete-resource") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteStandalone(@HostParam("endpoint") String endpoint, + @QueryParam("blobName") String blobName, RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually/nested-default-individually-query/delete-resource") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteStandaloneSync(@HostParam("endpoint") String endpoint, + @QueryParam("blobName") String blobName, RequestOptions requestOptions, Context context); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil + .withContext(context -> service.withQuery(this.getEndpoint(), this.getBlobName(), requestOptions, context)); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(RequestOptions requestOptions) { + return service.withQuerySync(this.getEndpoint(), this.getBlobName(), requestOptions, Context.NONE); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponseAsync(RequestOptions requestOptions) { + final String accept = "application/json"; + return FluxUtil.withContext( + context -> service.getStandalone(this.getEndpoint(), this.getBlobName(), accept, requestOptions, context)); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(RequestOptions requestOptions) { + final String accept = "application/json"; + return service.getStandaloneSync(this.getEndpoint(), this.getBlobName(), accept, requestOptions, Context.NONE); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.deleteStandalone(this.getEndpoint(), this.getBlobName(), requestOptions, context)); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { + return service.deleteStandaloneSync(this.getEndpoint(), this.getBlobName(), requestOptions, Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/package-info.java new file mode 100644 index 00000000000..eeeb569ccca --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/package-info.java @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the implementations for IndividuallyClient. + * Test for client initialization decorator - moving parameters from method to client level. + * + */ +package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/BlobProperties.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/BlobProperties.java new file mode 100644 index 00000000000..110e907c82f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/BlobProperties.java @@ -0,0 +1,154 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.core.util.CoreUtils; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; + +/** + * Properties of a blob. + */ +@Immutable +public final class BlobProperties implements JsonSerializable { + /* + * The name property. + */ + @Generated + private final String name; + + /* + * The size property. + */ + @Generated + private final long size; + + /* + * The contentType property. + */ + @Generated + private final String contentType; + + /* + * The createdOn property. + */ + @Generated + private final OffsetDateTime createdOn; + + /** + * Creates an instance of BlobProperties class. + * + * @param name the name value to set. + * @param size the size value to set. + * @param contentType the contentType value to set. + * @param createdOn the createdOn value to set. + */ + @Generated + private BlobProperties(String name, long size, String contentType, OffsetDateTime createdOn) { + this.name = name; + this.size = size; + this.contentType = contentType; + this.createdOn = createdOn; + } + + /** + * Get the name property: The name property. + * + * @return the name value. + */ + @Generated + public String getName() { + return this.name; + } + + /** + * Get the size property: The size property. + * + * @return the size value. + */ + @Generated + public long getSize() { + return this.size; + } + + /** + * Get the contentType property: The contentType property. + * + * @return the contentType value. + */ + @Generated + public String getContentType() { + return this.contentType; + } + + /** + * Get the createdOn property: The createdOn property. + * + * @return the createdOn value. + */ + @Generated + public OffsetDateTime getCreatedOn() { + return this.createdOn; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("name", this.name); + jsonWriter.writeLongField("size", this.size); + jsonWriter.writeStringField("contentType", this.contentType); + jsonWriter.writeStringField("createdOn", + this.createdOn == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.createdOn)); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of BlobProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of BlobProperties if the JsonReader was pointing to an instance of it, or null if it was + * pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the BlobProperties. + */ + @Generated + public static BlobProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + String name = null; + long size = 0L; + String contentType = null; + OffsetDateTime createdOn = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("name".equals(fieldName)) { + name = reader.getString(); + } else if ("size".equals(fieldName)) { + size = reader.getLong(); + } else if ("contentType".equals(fieldName)) { + contentType = reader.getString(); + } else if ("createdOn".equals(fieldName)) { + createdOn = reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + } else { + reader.skipChildren(); + } + } + return new BlobProperties(name, size, contentType, createdOn); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/package-info.java new file mode 100644 index 00000000000..251083ae64e --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/package-info.java @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the data models for IndividuallyClient. + * Test for client initialization decorator - moving parameters from method to client level. + * + */ +package azure.clientgenerator.core.clientinitialization.individuallyclient.models; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/package-info.java new file mode 100644 index 00000000000..9a5bb32001d --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/package-info.java @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the classes for IndividuallyClient. + * Test for client initialization decorator - moving parameters from method to client level. + * + */ +package azure.clientgenerator.core.clientinitialization.individuallyclient; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentAsyncClient.java new file mode 100644 index 00000000000..fb6bcc58351 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentAsyncClient.java @@ -0,0 +1,98 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ServiceClient; + +/** + * Initializes a new instance of the asynchronous IndividuallyParentClient type. + */ +@ServiceClient(builder = IndividuallyParentClientBuilder.class, isAsync = true) +public final class IndividuallyParentAsyncClient { + @Generated + private final IndividuallyParentClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyParentAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyParentAsyncClient(IndividuallyParentClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * Gets an instance of IndividuallyParentNestedWithPathAsyncClient class. + * + * @param blobName The blobName parameter. + * @return an instance of IndividuallyParentNestedWithPathAsyncClient class. + */ + public IndividuallyParentNestedWithPathAsyncClient getIndividuallyParentNestedWithPathAsyncClient(String blobName) { + return new IndividuallyParentNestedWithPathAsyncClient( + serviceClient.getIndividuallyParentNestedWithPathClient(blobName)); + } + + /** + * Gets an instance of IndividuallyParentNestedWithQueryAsyncClient class. + * + * @param blobName The blobName parameter. + * @return an instance of IndividuallyParentNestedWithQueryAsyncClient class. + */ + public IndividuallyParentNestedWithQueryAsyncClient + getIndividuallyParentNestedWithQueryAsyncClient(String blobName) { + return new IndividuallyParentNestedWithQueryAsyncClient( + serviceClient.getIndividuallyParentNestedWithQueryClient(blobName)); + } + + /** + * Gets an instance of IndividuallyParentNestedWithHeaderAsyncClient class. + * + * @param name The name parameter. + * @return an instance of IndividuallyParentNestedWithHeaderAsyncClient class. + */ + public IndividuallyParentNestedWithHeaderAsyncClient getIndividuallyParentNestedWithHeaderAsyncClient(String name) { + return new IndividuallyParentNestedWithHeaderAsyncClient( + serviceClient.getIndividuallyParentNestedWithHeaderClient(name)); + } + + /** + * Gets an instance of IndividuallyParentNestedWithMultipleAsyncClient class. + * + * @param name The name parameter. + * @param region The region parameter. + * @return an instance of IndividuallyParentNestedWithMultipleAsyncClient class. + */ + public IndividuallyParentNestedWithMultipleAsyncClient + getIndividuallyParentNestedWithMultipleAsyncClient(String name, String region) { + return new IndividuallyParentNestedWithMultipleAsyncClient( + serviceClient.getIndividuallyParentNestedWithMultipleClient(name, region)); + } + + /** + * Gets an instance of IndividuallyParentNestedWithMixedAsyncClient class. + * + * @param name The name parameter. + * @return an instance of IndividuallyParentNestedWithMixedAsyncClient class. + */ + public IndividuallyParentNestedWithMixedAsyncClient getIndividuallyParentNestedWithMixedAsyncClient(String name) { + return new IndividuallyParentNestedWithMixedAsyncClient( + serviceClient.getIndividuallyParentNestedWithMixedClient(name)); + } + + /** + * Gets an instance of IndividuallyParentNestedWithParamAliasAsyncClient class. + * + * @param blobName The blobName parameter. + * @return an instance of IndividuallyParentNestedWithParamAliasAsyncClient class. + */ + public IndividuallyParentNestedWithParamAliasAsyncClient + getIndividuallyParentNestedWithParamAliasAsyncClient(String blobName) { + return new IndividuallyParentNestedWithParamAliasAsyncClient( + serviceClient.getIndividuallyParentNestedWithParamAliasClient(blobName)); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClient.java new file mode 100644 index 00000000000..29d74a5138e --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClient.java @@ -0,0 +1,97 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ServiceClient; + +/** + * Initializes a new instance of the synchronous IndividuallyParentClient type. + */ +@ServiceClient(builder = IndividuallyParentClientBuilder.class) +public final class IndividuallyParentClient { + @Generated + private final IndividuallyParentClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyParentClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyParentClient(IndividuallyParentClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * Gets an instance of IndividuallyParentNestedWithPathClient class. + * + * @param blobName The blobName parameter. + * @return an instance of IndividuallyParentNestedWithPathClient class. + */ + public IndividuallyParentNestedWithPathClient getIndividuallyParentNestedWithPathClient(String blobName) { + return new IndividuallyParentNestedWithPathClient( + serviceClient.getIndividuallyParentNestedWithPathClient(blobName)); + } + + /** + * Gets an instance of IndividuallyParentNestedWithQueryClient class. + * + * @param blobName The blobName parameter. + * @return an instance of IndividuallyParentNestedWithQueryClient class. + */ + public IndividuallyParentNestedWithQueryClient getIndividuallyParentNestedWithQueryClient(String blobName) { + return new IndividuallyParentNestedWithQueryClient( + serviceClient.getIndividuallyParentNestedWithQueryClient(blobName)); + } + + /** + * Gets an instance of IndividuallyParentNestedWithHeaderClient class. + * + * @param name The name parameter. + * @return an instance of IndividuallyParentNestedWithHeaderClient class. + */ + public IndividuallyParentNestedWithHeaderClient getIndividuallyParentNestedWithHeaderClient(String name) { + return new IndividuallyParentNestedWithHeaderClient( + serviceClient.getIndividuallyParentNestedWithHeaderClient(name)); + } + + /** + * Gets an instance of IndividuallyParentNestedWithMultipleClient class. + * + * @param name The name parameter. + * @param region The region parameter. + * @return an instance of IndividuallyParentNestedWithMultipleClient class. + */ + public IndividuallyParentNestedWithMultipleClient getIndividuallyParentNestedWithMultipleClient(String name, + String region) { + return new IndividuallyParentNestedWithMultipleClient( + serviceClient.getIndividuallyParentNestedWithMultipleClient(name, region)); + } + + /** + * Gets an instance of IndividuallyParentNestedWithMixedClient class. + * + * @param name The name parameter. + * @return an instance of IndividuallyParentNestedWithMixedClient class. + */ + public IndividuallyParentNestedWithMixedClient getIndividuallyParentNestedWithMixedClient(String name) { + return new IndividuallyParentNestedWithMixedClient( + serviceClient.getIndividuallyParentNestedWithMixedClient(name)); + } + + /** + * Gets an instance of IndividuallyParentNestedWithParamAliasClient class. + * + * @param blobName The blobName parameter. + * @return an instance of IndividuallyParentNestedWithParamAliasClient class. + */ + public IndividuallyParentNestedWithParamAliasClient + getIndividuallyParentNestedWithParamAliasClient(String blobName) { + return new IndividuallyParentNestedWithParamAliasClient( + serviceClient.getIndividuallyParentNestedWithParamAliasClient(blobName)); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientBuilder.java new file mode 100644 index 00000000000..295021efe09 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientBuilder.java @@ -0,0 +1,288 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ServiceClientBuilder; +import com.azure.core.client.traits.ConfigurationTrait; +import com.azure.core.client.traits.EndpointTrait; +import com.azure.core.client.traits.HttpTrait; +import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.HttpPipelinePosition; +import com.azure.core.http.policy.AddDatePolicy; +import com.azure.core.http.policy.AddHeadersFromContextPolicy; +import com.azure.core.http.policy.AddHeadersPolicy; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.http.policy.HttpLoggingPolicy; +import com.azure.core.http.policy.HttpPipelinePolicy; +import com.azure.core.http.policy.HttpPolicyProviders; +import com.azure.core.http.policy.RequestIdPolicy; +import com.azure.core.http.policy.RetryOptions; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.ClientOptions; +import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.builder.ClientBuilderUtil; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.serializer.JacksonAdapter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * A builder for creating a new instance of the IndividuallyParentClient type. + */ +@ServiceClientBuilder(serviceClients = { IndividuallyParentClient.class, IndividuallyParentAsyncClient.class }) +public final class IndividuallyParentClientBuilder implements HttpTrait, + ConfigurationTrait, EndpointTrait { + @Generated + private static final String SDK_NAME = "name"; + + @Generated + private static final String SDK_VERSION = "version"; + + @Generated + private static final Map PROPERTIES = CoreUtils + .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + + @Generated + private final List pipelinePolicies; + + /** + * Create an instance of the IndividuallyParentClientBuilder. + */ + @Generated + public IndividuallyParentClientBuilder() { + this.pipelinePolicies = new ArrayList<>(); + } + + /* + * The HTTP client used to send the request. + */ + @Generated + private HttpClient httpClient; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentClientBuilder httpClient(HttpClient httpClient) { + this.httpClient = httpClient; + return this; + } + + /* + * The HTTP pipeline to send requests through. + */ + @Generated + private HttpPipeline pipeline; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentClientBuilder pipeline(HttpPipeline pipeline) { + if (this.pipeline != null && pipeline == null) { + LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured."); + } + this.pipeline = pipeline; + return this; + } + + /* + * The logging configuration for HTTP requests and responses. + */ + @Generated + private HttpLogOptions httpLogOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) { + this.httpLogOptions = httpLogOptions; + return this; + } + + /* + * The client options such as application ID and custom headers to set on a request. + */ + @Generated + private ClientOptions clientOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentClientBuilder clientOptions(ClientOptions clientOptions) { + this.clientOptions = clientOptions; + return this; + } + + /* + * The retry options to configure retry policy for failed requests. + */ + @Generated + private RetryOptions retryOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentClientBuilder retryOptions(RetryOptions retryOptions) { + this.retryOptions = retryOptions; + return this; + } + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentClientBuilder addPolicy(HttpPipelinePolicy customPolicy) { + Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); + pipelinePolicies.add(customPolicy); + return this; + } + + /* + * The configuration store that is used during construction of the service client. + */ + @Generated + private Configuration configuration; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentClientBuilder configuration(Configuration configuration) { + this.configuration = configuration; + return this; + } + + /* + * The service endpoint + */ + @Generated + private String endpoint; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentClientBuilder endpoint(String endpoint) { + this.endpoint = endpoint; + return this; + } + + /* + * The retry policy that will attempt to retry failed requests, if applicable. + */ + @Generated + private RetryPolicy retryPolicy; + + /** + * Sets The retry policy that will attempt to retry failed requests, if applicable. + * + * @param retryPolicy the retryPolicy value. + * @return the IndividuallyParentClientBuilder. + */ + @Generated + public IndividuallyParentClientBuilder retryPolicy(RetryPolicy retryPolicy) { + this.retryPolicy = retryPolicy; + return this; + } + + /** + * Builds an instance of IndividuallyParentClientImpl with the provided parameters. + * + * @return an instance of IndividuallyParentClientImpl. + */ + @Generated + private IndividuallyParentClientImpl buildInnerClient() { + this.validateClient(); + HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline(); + String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000"; + IndividuallyParentClientImpl client = new IndividuallyParentClientImpl(localPipeline, + JacksonAdapter.createDefaultSerializerAdapter(), localEndpoint); + return client; + } + + @Generated + private void validateClient() { + // This method is invoked from 'buildInnerClient'/'buildClient' method. + // Developer can customize this method, to validate that the necessary conditions are met for the new client. + } + + @Generated + private HttpPipeline createHttpPipeline() { + Configuration buildConfiguration + = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; + HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions; + ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions; + List policies = new ArrayList<>(); + String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName"); + String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); + String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions); + policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); + policies.add(new RequestIdPolicy()); + policies.add(new AddHeadersFromContextPolicy()); + HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions); + if (headers != null) { + policies.add(new AddHeadersPolicy(headers)); + } + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addBeforeRetryPolicies(policies); + policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy())); + policies.add(new AddDatePolicy()); + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addAfterRetryPolicies(policies); + policies.add(new HttpLoggingPolicy(localHttpLogOptions)); + HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])) + .httpClient(httpClient) + .clientOptions(localClientOptions) + .build(); + return httpPipeline; + } + + /** + * Builds an instance of IndividuallyParentAsyncClient class. + * + * @return an instance of IndividuallyParentAsyncClient. + */ + @Generated + public IndividuallyParentAsyncClient buildAsyncClient() { + return new IndividuallyParentAsyncClient(buildInnerClient()); + } + + /** + * Builds an instance of IndividuallyParentClient class. + * + * @return an instance of IndividuallyParentClient. + */ + @Generated + public IndividuallyParentClient buildClient() { + return new IndividuallyParentClient(buildInnerClient()); + } + + private static final ClientLogger LOGGER = new ClientLogger(IndividuallyParentClientBuilder.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderAsyncClient.java new file mode 100644 index 00000000000..903abb7c7bf --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderAsyncClient.java @@ -0,0 +1,170 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithHeaderClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the asynchronous IndividuallyParentNestedWithHeaderClient type. + */ +@ServiceClient(builder = IndividuallyParentNestedWithHeaderClientBuilder.class, isAsync = true) +public final class IndividuallyParentNestedWithHeaderAsyncClient { + @Generated + private final IndividuallyParentNestedWithHeaderClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyParentNestedWithHeaderAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyParentNestedWithHeaderAsyncClient(IndividuallyParentNestedWithHeaderClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponseAsync(requestOptions); + } + + /** + * The getStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponseAsync(requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponseAsync(requestOptions); + } + + /** + * The withQuery operation. + * + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery(String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The withQuery operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery() { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The getStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getStandalone() { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The deleteStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteStandalone() { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return deleteStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClient.java new file mode 100644 index 00000000000..67beeb628e9 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClient.java @@ -0,0 +1,164 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithHeaderClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; + +/** + * Initializes a new instance of the synchronous IndividuallyParentNestedWithHeaderClient type. + */ +@ServiceClient(builder = IndividuallyParentNestedWithHeaderClientBuilder.class) +public final class IndividuallyParentNestedWithHeaderClient { + @Generated + private final IndividuallyParentNestedWithHeaderClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyParentNestedWithHeaderClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyParentNestedWithHeaderClient(IndividuallyParentNestedWithHeaderClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponse(requestOptions); + } + + /** + * The getStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponse(requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponse(requestOptions); + } + + /** + * The withQuery operation. + * + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery(String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + withQueryWithResponse(requestOptions).getValue(); + } + + /** + * The withQuery operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery() { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + withQueryWithResponse(requestOptions).getValue(); + } + + /** + * The getStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void getStandalone() { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + getStandaloneWithResponse(requestOptions).getValue(); + } + + /** + * The deleteStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void deleteStandalone() { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + deleteStandaloneWithResponse(requestOptions).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClientBuilder.java new file mode 100644 index 00000000000..01c34b1003f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClientBuilder.java @@ -0,0 +1,312 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithHeaderClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ServiceClientBuilder; +import com.azure.core.client.traits.ConfigurationTrait; +import com.azure.core.client.traits.EndpointTrait; +import com.azure.core.client.traits.HttpTrait; +import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.HttpPipelinePosition; +import com.azure.core.http.policy.AddDatePolicy; +import com.azure.core.http.policy.AddHeadersFromContextPolicy; +import com.azure.core.http.policy.AddHeadersPolicy; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.http.policy.HttpLoggingPolicy; +import com.azure.core.http.policy.HttpPipelinePolicy; +import com.azure.core.http.policy.HttpPolicyProviders; +import com.azure.core.http.policy.RequestIdPolicy; +import com.azure.core.http.policy.RetryOptions; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.ClientOptions; +import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.builder.ClientBuilderUtil; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.serializer.JacksonAdapter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * A builder for creating a new instance of the IndividuallyParentNestedWithHeaderClient type. + */ +@ServiceClientBuilder( + serviceClients = { + IndividuallyParentNestedWithHeaderClient.class, + IndividuallyParentNestedWithHeaderAsyncClient.class }) +public final class IndividuallyParentNestedWithHeaderClientBuilder + implements HttpTrait, + ConfigurationTrait, + EndpointTrait { + @Generated + private static final String SDK_NAME = "name"; + + @Generated + private static final String SDK_VERSION = "version"; + + @Generated + private static final Map PROPERTIES = CoreUtils + .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + + @Generated + private final List pipelinePolicies; + + /** + * Create an instance of the IndividuallyParentNestedWithHeaderClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithHeaderClientBuilder() { + this.pipelinePolicies = new ArrayList<>(); + } + + /* + * The HTTP client used to send the request. + */ + @Generated + private HttpClient httpClient; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithHeaderClientBuilder httpClient(HttpClient httpClient) { + this.httpClient = httpClient; + return this; + } + + /* + * The HTTP pipeline to send requests through. + */ + @Generated + private HttpPipeline pipeline; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithHeaderClientBuilder pipeline(HttpPipeline pipeline) { + if (this.pipeline != null && pipeline == null) { + LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured."); + } + this.pipeline = pipeline; + return this; + } + + /* + * The logging configuration for HTTP requests and responses. + */ + @Generated + private HttpLogOptions httpLogOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithHeaderClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) { + this.httpLogOptions = httpLogOptions; + return this; + } + + /* + * The client options such as application ID and custom headers to set on a request. + */ + @Generated + private ClientOptions clientOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithHeaderClientBuilder clientOptions(ClientOptions clientOptions) { + this.clientOptions = clientOptions; + return this; + } + + /* + * The retry options to configure retry policy for failed requests. + */ + @Generated + private RetryOptions retryOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithHeaderClientBuilder retryOptions(RetryOptions retryOptions) { + this.retryOptions = retryOptions; + return this; + } + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithHeaderClientBuilder addPolicy(HttpPipelinePolicy customPolicy) { + Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); + pipelinePolicies.add(customPolicy); + return this; + } + + /* + * The configuration store that is used during construction of the service client. + */ + @Generated + private Configuration configuration; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithHeaderClientBuilder configuration(Configuration configuration) { + this.configuration = configuration; + return this; + } + + /* + * The service endpoint + */ + @Generated + private String endpoint; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithHeaderClientBuilder endpoint(String endpoint) { + this.endpoint = endpoint; + return this; + } + + /* + * + */ + @Generated + private String name; + + /** + * Sets. + * + * @param name the name value. + * @return the IndividuallyParentNestedWithHeaderClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithHeaderClientBuilder name(String name) { + this.name = name; + return this; + } + + /* + * The retry policy that will attempt to retry failed requests, if applicable. + */ + @Generated + private RetryPolicy retryPolicy; + + /** + * Sets The retry policy that will attempt to retry failed requests, if applicable. + * + * @param retryPolicy the retryPolicy value. + * @return the IndividuallyParentNestedWithHeaderClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithHeaderClientBuilder retryPolicy(RetryPolicy retryPolicy) { + this.retryPolicy = retryPolicy; + return this; + } + + /** + * Builds an instance of IndividuallyParentNestedWithHeaderClientImpl with the provided parameters. + * + * @return an instance of IndividuallyParentNestedWithHeaderClientImpl. + */ + @Generated + private IndividuallyParentNestedWithHeaderClientImpl buildInnerClient() { + this.validateClient(); + HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline(); + String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000"; + IndividuallyParentNestedWithHeaderClientImpl client = new IndividuallyParentNestedWithHeaderClientImpl( + localPipeline, JacksonAdapter.createDefaultSerializerAdapter(), localEndpoint, this.name); + return client; + } + + @Generated + private void validateClient() { + // This method is invoked from 'buildInnerClient'/'buildClient' method. + // Developer can customize this method, to validate that the necessary conditions are met for the new client. + Objects.requireNonNull(name, "'name' cannot be null."); + } + + @Generated + private HttpPipeline createHttpPipeline() { + Configuration buildConfiguration + = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; + HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions; + ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions; + List policies = new ArrayList<>(); + String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName"); + String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); + String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions); + policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); + policies.add(new RequestIdPolicy()); + policies.add(new AddHeadersFromContextPolicy()); + HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions); + if (headers != null) { + policies.add(new AddHeadersPolicy(headers)); + } + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addBeforeRetryPolicies(policies); + policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy())); + policies.add(new AddDatePolicy()); + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addAfterRetryPolicies(policies); + policies.add(new HttpLoggingPolicy(localHttpLogOptions)); + HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])) + .httpClient(httpClient) + .clientOptions(localClientOptions) + .build(); + return httpPipeline; + } + + /** + * Builds an instance of IndividuallyParentNestedWithHeaderAsyncClient class. + * + * @return an instance of IndividuallyParentNestedWithHeaderAsyncClient. + */ + @Generated + public IndividuallyParentNestedWithHeaderAsyncClient buildAsyncClient() { + return new IndividuallyParentNestedWithHeaderAsyncClient(buildInnerClient()); + } + + /** + * Builds an instance of IndividuallyParentNestedWithHeaderClient class. + * + * @return an instance of IndividuallyParentNestedWithHeaderClient. + */ + @Generated + public IndividuallyParentNestedWithHeaderClient buildClient() { + return new IndividuallyParentNestedWithHeaderClient(buildInnerClient()); + } + + private static final ClientLogger LOGGER = new ClientLogger(IndividuallyParentNestedWithHeaderClientBuilder.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedAsyncClient.java new file mode 100644 index 00000000000..acde1bf2542 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedAsyncClient.java @@ -0,0 +1,180 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMixedClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the asynchronous IndividuallyParentNestedWithMixedClient type. + */ +@ServiceClient(builder = IndividuallyParentNestedWithMixedClientBuilder.class, isAsync = true) +public final class IndividuallyParentNestedWithMixedAsyncClient { + @Generated + private final IndividuallyParentNestedWithMixedClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyParentNestedWithMixedAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyParentNestedWithMixedAsyncClient(IndividuallyParentNestedWithMixedClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponse(String region, RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponseAsync(region, requestOptions); + } + + /** + * The getStandalone operation. + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponse(String region, RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponseAsync(region, requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponse(String region, RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponseAsync(region, requestOptions); + } + + /** + * The withQuery operation. + * + * @param region The region parameter. + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery(String region, String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + return withQueryWithResponse(region, requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The withQuery operation. + * + * @param region The region parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery(String region) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + return withQueryWithResponse(region, requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The getStandalone operation. + * + * @param region The region parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getStandalone(String region) { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getStandaloneWithResponse(region, requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The deleteStandalone operation. + * + * @param region The region parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteStandalone(String region) { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return deleteStandaloneWithResponse(region, requestOptions).flatMap(FluxUtil::toMono); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClient.java new file mode 100644 index 00000000000..5525e0d8ab6 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClient.java @@ -0,0 +1,174 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMixedClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; + +/** + * Initializes a new instance of the synchronous IndividuallyParentNestedWithMixedClient type. + */ +@ServiceClient(builder = IndividuallyParentNestedWithMixedClientBuilder.class) +public final class IndividuallyParentNestedWithMixedClient { + @Generated + private final IndividuallyParentNestedWithMixedClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyParentNestedWithMixedClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyParentNestedWithMixedClient(IndividuallyParentNestedWithMixedClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(String region, RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponse(region, requestOptions); + } + + /** + * The getStandalone operation. + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(String region, RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponse(region, requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(String region, RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponse(region, requestOptions); + } + + /** + * The withQuery operation. + * + * @param region The region parameter. + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery(String region, String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + withQueryWithResponse(region, requestOptions).getValue(); + } + + /** + * The withQuery operation. + * + * @param region The region parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery(String region) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + withQueryWithResponse(region, requestOptions).getValue(); + } + + /** + * The getStandalone operation. + * + * @param region The region parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void getStandalone(String region) { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + getStandaloneWithResponse(region, requestOptions).getValue(); + } + + /** + * The deleteStandalone operation. + * + * @param region The region parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void deleteStandalone(String region) { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + deleteStandaloneWithResponse(region, requestOptions).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClientBuilder.java new file mode 100644 index 00000000000..79ecfc6729c --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClientBuilder.java @@ -0,0 +1,312 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMixedClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ServiceClientBuilder; +import com.azure.core.client.traits.ConfigurationTrait; +import com.azure.core.client.traits.EndpointTrait; +import com.azure.core.client.traits.HttpTrait; +import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.HttpPipelinePosition; +import com.azure.core.http.policy.AddDatePolicy; +import com.azure.core.http.policy.AddHeadersFromContextPolicy; +import com.azure.core.http.policy.AddHeadersPolicy; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.http.policy.HttpLoggingPolicy; +import com.azure.core.http.policy.HttpPipelinePolicy; +import com.azure.core.http.policy.HttpPolicyProviders; +import com.azure.core.http.policy.RequestIdPolicy; +import com.azure.core.http.policy.RetryOptions; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.ClientOptions; +import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.builder.ClientBuilderUtil; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.serializer.JacksonAdapter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * A builder for creating a new instance of the IndividuallyParentNestedWithMixedClient type. + */ +@ServiceClientBuilder( + serviceClients = { + IndividuallyParentNestedWithMixedClient.class, + IndividuallyParentNestedWithMixedAsyncClient.class }) +public final class IndividuallyParentNestedWithMixedClientBuilder + implements HttpTrait, + ConfigurationTrait, + EndpointTrait { + @Generated + private static final String SDK_NAME = "name"; + + @Generated + private static final String SDK_VERSION = "version"; + + @Generated + private static final Map PROPERTIES = CoreUtils + .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + + @Generated + private final List pipelinePolicies; + + /** + * Create an instance of the IndividuallyParentNestedWithMixedClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithMixedClientBuilder() { + this.pipelinePolicies = new ArrayList<>(); + } + + /* + * The HTTP client used to send the request. + */ + @Generated + private HttpClient httpClient; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithMixedClientBuilder httpClient(HttpClient httpClient) { + this.httpClient = httpClient; + return this; + } + + /* + * The HTTP pipeline to send requests through. + */ + @Generated + private HttpPipeline pipeline; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithMixedClientBuilder pipeline(HttpPipeline pipeline) { + if (this.pipeline != null && pipeline == null) { + LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured."); + } + this.pipeline = pipeline; + return this; + } + + /* + * The logging configuration for HTTP requests and responses. + */ + @Generated + private HttpLogOptions httpLogOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithMixedClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) { + this.httpLogOptions = httpLogOptions; + return this; + } + + /* + * The client options such as application ID and custom headers to set on a request. + */ + @Generated + private ClientOptions clientOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithMixedClientBuilder clientOptions(ClientOptions clientOptions) { + this.clientOptions = clientOptions; + return this; + } + + /* + * The retry options to configure retry policy for failed requests. + */ + @Generated + private RetryOptions retryOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithMixedClientBuilder retryOptions(RetryOptions retryOptions) { + this.retryOptions = retryOptions; + return this; + } + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithMixedClientBuilder addPolicy(HttpPipelinePolicy customPolicy) { + Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); + pipelinePolicies.add(customPolicy); + return this; + } + + /* + * The configuration store that is used during construction of the service client. + */ + @Generated + private Configuration configuration; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithMixedClientBuilder configuration(Configuration configuration) { + this.configuration = configuration; + return this; + } + + /* + * The service endpoint + */ + @Generated + private String endpoint; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithMixedClientBuilder endpoint(String endpoint) { + this.endpoint = endpoint; + return this; + } + + /* + * + */ + @Generated + private String name; + + /** + * Sets. + * + * @param name the name value. + * @return the IndividuallyParentNestedWithMixedClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithMixedClientBuilder name(String name) { + this.name = name; + return this; + } + + /* + * The retry policy that will attempt to retry failed requests, if applicable. + */ + @Generated + private RetryPolicy retryPolicy; + + /** + * Sets The retry policy that will attempt to retry failed requests, if applicable. + * + * @param retryPolicy the retryPolicy value. + * @return the IndividuallyParentNestedWithMixedClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithMixedClientBuilder retryPolicy(RetryPolicy retryPolicy) { + this.retryPolicy = retryPolicy; + return this; + } + + /** + * Builds an instance of IndividuallyParentNestedWithMixedClientImpl with the provided parameters. + * + * @return an instance of IndividuallyParentNestedWithMixedClientImpl. + */ + @Generated + private IndividuallyParentNestedWithMixedClientImpl buildInnerClient() { + this.validateClient(); + HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline(); + String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000"; + IndividuallyParentNestedWithMixedClientImpl client = new IndividuallyParentNestedWithMixedClientImpl( + localPipeline, JacksonAdapter.createDefaultSerializerAdapter(), localEndpoint, this.name); + return client; + } + + @Generated + private void validateClient() { + // This method is invoked from 'buildInnerClient'/'buildClient' method. + // Developer can customize this method, to validate that the necessary conditions are met for the new client. + Objects.requireNonNull(name, "'name' cannot be null."); + } + + @Generated + private HttpPipeline createHttpPipeline() { + Configuration buildConfiguration + = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; + HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions; + ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions; + List policies = new ArrayList<>(); + String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName"); + String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); + String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions); + policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); + policies.add(new RequestIdPolicy()); + policies.add(new AddHeadersFromContextPolicy()); + HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions); + if (headers != null) { + policies.add(new AddHeadersPolicy(headers)); + } + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addBeforeRetryPolicies(policies); + policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy())); + policies.add(new AddDatePolicy()); + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addAfterRetryPolicies(policies); + policies.add(new HttpLoggingPolicy(localHttpLogOptions)); + HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])) + .httpClient(httpClient) + .clientOptions(localClientOptions) + .build(); + return httpPipeline; + } + + /** + * Builds an instance of IndividuallyParentNestedWithMixedAsyncClient class. + * + * @return an instance of IndividuallyParentNestedWithMixedAsyncClient. + */ + @Generated + public IndividuallyParentNestedWithMixedAsyncClient buildAsyncClient() { + return new IndividuallyParentNestedWithMixedAsyncClient(buildInnerClient()); + } + + /** + * Builds an instance of IndividuallyParentNestedWithMixedClient class. + * + * @return an instance of IndividuallyParentNestedWithMixedClient. + */ + @Generated + public IndividuallyParentNestedWithMixedClient buildClient() { + return new IndividuallyParentNestedWithMixedClient(buildInnerClient()); + } + + private static final ClientLogger LOGGER = new ClientLogger(IndividuallyParentNestedWithMixedClientBuilder.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleAsyncClient.java new file mode 100644 index 00000000000..ea28f37e709 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleAsyncClient.java @@ -0,0 +1,170 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMultipleClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the asynchronous IndividuallyParentNestedWithMultipleClient type. + */ +@ServiceClient(builder = IndividuallyParentNestedWithMultipleClientBuilder.class, isAsync = true) +public final class IndividuallyParentNestedWithMultipleAsyncClient { + @Generated + private final IndividuallyParentNestedWithMultipleClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyParentNestedWithMultipleAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyParentNestedWithMultipleAsyncClient(IndividuallyParentNestedWithMultipleClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponseAsync(requestOptions); + } + + /** + * The getStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponseAsync(requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponseAsync(requestOptions); + } + + /** + * The withQuery operation. + * + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery(String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The withQuery operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery() { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The getStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getStandalone() { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The deleteStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteStandalone() { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return deleteStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClient.java new file mode 100644 index 00000000000..bcd04988ada --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClient.java @@ -0,0 +1,164 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMultipleClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; + +/** + * Initializes a new instance of the synchronous IndividuallyParentNestedWithMultipleClient type. + */ +@ServiceClient(builder = IndividuallyParentNestedWithMultipleClientBuilder.class) +public final class IndividuallyParentNestedWithMultipleClient { + @Generated + private final IndividuallyParentNestedWithMultipleClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyParentNestedWithMultipleClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyParentNestedWithMultipleClient(IndividuallyParentNestedWithMultipleClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponse(requestOptions); + } + + /** + * The getStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponse(requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponse(requestOptions); + } + + /** + * The withQuery operation. + * + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery(String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + withQueryWithResponse(requestOptions).getValue(); + } + + /** + * The withQuery operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery() { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + withQueryWithResponse(requestOptions).getValue(); + } + + /** + * The getStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void getStandalone() { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + getStandaloneWithResponse(requestOptions).getValue(); + } + + /** + * The deleteStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void deleteStandalone() { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + deleteStandaloneWithResponse(requestOptions).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClientBuilder.java new file mode 100644 index 00000000000..c2b35f4aec7 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClientBuilder.java @@ -0,0 +1,332 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMultipleClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ServiceClientBuilder; +import com.azure.core.client.traits.ConfigurationTrait; +import com.azure.core.client.traits.EndpointTrait; +import com.azure.core.client.traits.HttpTrait; +import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.HttpPipelinePosition; +import com.azure.core.http.policy.AddDatePolicy; +import com.azure.core.http.policy.AddHeadersFromContextPolicy; +import com.azure.core.http.policy.AddHeadersPolicy; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.http.policy.HttpLoggingPolicy; +import com.azure.core.http.policy.HttpPipelinePolicy; +import com.azure.core.http.policy.HttpPolicyProviders; +import com.azure.core.http.policy.RequestIdPolicy; +import com.azure.core.http.policy.RetryOptions; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.ClientOptions; +import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.builder.ClientBuilderUtil; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.serializer.JacksonAdapter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * A builder for creating a new instance of the IndividuallyParentNestedWithMultipleClient type. + */ +@ServiceClientBuilder( + serviceClients = { + IndividuallyParentNestedWithMultipleClient.class, + IndividuallyParentNestedWithMultipleAsyncClient.class }) +public final class IndividuallyParentNestedWithMultipleClientBuilder + implements HttpTrait, + ConfigurationTrait, + EndpointTrait { + @Generated + private static final String SDK_NAME = "name"; + + @Generated + private static final String SDK_VERSION = "version"; + + @Generated + private static final Map PROPERTIES = CoreUtils + .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + + @Generated + private final List pipelinePolicies; + + /** + * Create an instance of the IndividuallyParentNestedWithMultipleClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithMultipleClientBuilder() { + this.pipelinePolicies = new ArrayList<>(); + } + + /* + * The HTTP client used to send the request. + */ + @Generated + private HttpClient httpClient; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithMultipleClientBuilder httpClient(HttpClient httpClient) { + this.httpClient = httpClient; + return this; + } + + /* + * The HTTP pipeline to send requests through. + */ + @Generated + private HttpPipeline pipeline; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithMultipleClientBuilder pipeline(HttpPipeline pipeline) { + if (this.pipeline != null && pipeline == null) { + LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured."); + } + this.pipeline = pipeline; + return this; + } + + /* + * The logging configuration for HTTP requests and responses. + */ + @Generated + private HttpLogOptions httpLogOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithMultipleClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) { + this.httpLogOptions = httpLogOptions; + return this; + } + + /* + * The client options such as application ID and custom headers to set on a request. + */ + @Generated + private ClientOptions clientOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithMultipleClientBuilder clientOptions(ClientOptions clientOptions) { + this.clientOptions = clientOptions; + return this; + } + + /* + * The retry options to configure retry policy for failed requests. + */ + @Generated + private RetryOptions retryOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithMultipleClientBuilder retryOptions(RetryOptions retryOptions) { + this.retryOptions = retryOptions; + return this; + } + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithMultipleClientBuilder addPolicy(HttpPipelinePolicy customPolicy) { + Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); + pipelinePolicies.add(customPolicy); + return this; + } + + /* + * The configuration store that is used during construction of the service client. + */ + @Generated + private Configuration configuration; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithMultipleClientBuilder configuration(Configuration configuration) { + this.configuration = configuration; + return this; + } + + /* + * The service endpoint + */ + @Generated + private String endpoint; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithMultipleClientBuilder endpoint(String endpoint) { + this.endpoint = endpoint; + return this; + } + + /* + * + */ + @Generated + private String name; + + /** + * Sets. + * + * @param name the name value. + * @return the IndividuallyParentNestedWithMultipleClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithMultipleClientBuilder name(String name) { + this.name = name; + return this; + } + + /* + * + */ + @Generated + private String region; + + /** + * Sets. + * + * @param region the region value. + * @return the IndividuallyParentNestedWithMultipleClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithMultipleClientBuilder region(String region) { + this.region = region; + return this; + } + + /* + * The retry policy that will attempt to retry failed requests, if applicable. + */ + @Generated + private RetryPolicy retryPolicy; + + /** + * Sets The retry policy that will attempt to retry failed requests, if applicable. + * + * @param retryPolicy the retryPolicy value. + * @return the IndividuallyParentNestedWithMultipleClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithMultipleClientBuilder retryPolicy(RetryPolicy retryPolicy) { + this.retryPolicy = retryPolicy; + return this; + } + + /** + * Builds an instance of IndividuallyParentNestedWithMultipleClientImpl with the provided parameters. + * + * @return an instance of IndividuallyParentNestedWithMultipleClientImpl. + */ + @Generated + private IndividuallyParentNestedWithMultipleClientImpl buildInnerClient() { + this.validateClient(); + HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline(); + String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000"; + IndividuallyParentNestedWithMultipleClientImpl client = new IndividuallyParentNestedWithMultipleClientImpl( + localPipeline, JacksonAdapter.createDefaultSerializerAdapter(), localEndpoint, this.name, this.region); + return client; + } + + @Generated + private void validateClient() { + // This method is invoked from 'buildInnerClient'/'buildClient' method. + // Developer can customize this method, to validate that the necessary conditions are met for the new client. + Objects.requireNonNull(name, "'name' cannot be null."); + Objects.requireNonNull(region, "'region' cannot be null."); + } + + @Generated + private HttpPipeline createHttpPipeline() { + Configuration buildConfiguration + = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; + HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions; + ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions; + List policies = new ArrayList<>(); + String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName"); + String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); + String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions); + policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); + policies.add(new RequestIdPolicy()); + policies.add(new AddHeadersFromContextPolicy()); + HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions); + if (headers != null) { + policies.add(new AddHeadersPolicy(headers)); + } + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addBeforeRetryPolicies(policies); + policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy())); + policies.add(new AddDatePolicy()); + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addAfterRetryPolicies(policies); + policies.add(new HttpLoggingPolicy(localHttpLogOptions)); + HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])) + .httpClient(httpClient) + .clientOptions(localClientOptions) + .build(); + return httpPipeline; + } + + /** + * Builds an instance of IndividuallyParentNestedWithMultipleAsyncClient class. + * + * @return an instance of IndividuallyParentNestedWithMultipleAsyncClient. + */ + @Generated + public IndividuallyParentNestedWithMultipleAsyncClient buildAsyncClient() { + return new IndividuallyParentNestedWithMultipleAsyncClient(buildInnerClient()); + } + + /** + * Builds an instance of IndividuallyParentNestedWithMultipleClient class. + * + * @return an instance of IndividuallyParentNestedWithMultipleClient. + */ + @Generated + public IndividuallyParentNestedWithMultipleClient buildClient() { + return new IndividuallyParentNestedWithMultipleClient(buildInnerClient()); + } + + private static final ClientLogger LOGGER + = new ClientLogger(IndividuallyParentNestedWithMultipleClientBuilder.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasAsyncClient.java new file mode 100644 index 00000000000..09fd5b1b474 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasAsyncClient.java @@ -0,0 +1,106 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithParamAliasClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the asynchronous IndividuallyParentNestedWithParamAliasClient type. + */ +@ServiceClient(builder = IndividuallyParentNestedWithParamAliasClientBuilder.class, isAsync = true) +public final class IndividuallyParentNestedWithParamAliasAsyncClient { + @Generated + private final IndividuallyParentNestedWithParamAliasClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyParentNestedWithParamAliasAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyParentNestedWithParamAliasAsyncClient(IndividuallyParentNestedWithParamAliasClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withAliasedName operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withAliasedNameWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withAliasedNameWithResponseAsync(requestOptions); + } + + /** + * The withOriginalName operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withOriginalNameWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withOriginalNameWithResponseAsync(requestOptions); + } + + /** + * The withAliasedName operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withAliasedName() { + // Generated convenience method for withAliasedNameWithResponse + RequestOptions requestOptions = new RequestOptions(); + return withAliasedNameWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The withOriginalName operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withOriginalName() { + // Generated convenience method for withOriginalNameWithResponse + RequestOptions requestOptions = new RequestOptions(); + return withOriginalNameWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClient.java new file mode 100644 index 00000000000..fc8456077d1 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClient.java @@ -0,0 +1,102 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithParamAliasClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; + +/** + * Initializes a new instance of the synchronous IndividuallyParentNestedWithParamAliasClient type. + */ +@ServiceClient(builder = IndividuallyParentNestedWithParamAliasClientBuilder.class) +public final class IndividuallyParentNestedWithParamAliasClient { + @Generated + private final IndividuallyParentNestedWithParamAliasClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyParentNestedWithParamAliasClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyParentNestedWithParamAliasClient(IndividuallyParentNestedWithParamAliasClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withAliasedName operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withAliasedNameWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withAliasedNameWithResponse(requestOptions); + } + + /** + * The withOriginalName operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withOriginalNameWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withOriginalNameWithResponse(requestOptions); + } + + /** + * The withAliasedName operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withAliasedName() { + // Generated convenience method for withAliasedNameWithResponse + RequestOptions requestOptions = new RequestOptions(); + withAliasedNameWithResponse(requestOptions).getValue(); + } + + /** + * The withOriginalName operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withOriginalName() { + // Generated convenience method for withOriginalNameWithResponse + RequestOptions requestOptions = new RequestOptions(); + withOriginalNameWithResponse(requestOptions).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClientBuilder.java new file mode 100644 index 00000000000..ed2cd85cb0f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClientBuilder.java @@ -0,0 +1,313 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithParamAliasClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ServiceClientBuilder; +import com.azure.core.client.traits.ConfigurationTrait; +import com.azure.core.client.traits.EndpointTrait; +import com.azure.core.client.traits.HttpTrait; +import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.HttpPipelinePosition; +import com.azure.core.http.policy.AddDatePolicy; +import com.azure.core.http.policy.AddHeadersFromContextPolicy; +import com.azure.core.http.policy.AddHeadersPolicy; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.http.policy.HttpLoggingPolicy; +import com.azure.core.http.policy.HttpPipelinePolicy; +import com.azure.core.http.policy.HttpPolicyProviders; +import com.azure.core.http.policy.RequestIdPolicy; +import com.azure.core.http.policy.RetryOptions; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.ClientOptions; +import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.builder.ClientBuilderUtil; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.serializer.JacksonAdapter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * A builder for creating a new instance of the IndividuallyParentNestedWithParamAliasClient type. + */ +@ServiceClientBuilder( + serviceClients = { + IndividuallyParentNestedWithParamAliasClient.class, + IndividuallyParentNestedWithParamAliasAsyncClient.class }) +public final class IndividuallyParentNestedWithParamAliasClientBuilder + implements HttpTrait, + ConfigurationTrait, + EndpointTrait { + @Generated + private static final String SDK_NAME = "name"; + + @Generated + private static final String SDK_VERSION = "version"; + + @Generated + private static final Map PROPERTIES = CoreUtils + .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + + @Generated + private final List pipelinePolicies; + + /** + * Create an instance of the IndividuallyParentNestedWithParamAliasClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithParamAliasClientBuilder() { + this.pipelinePolicies = new ArrayList<>(); + } + + /* + * The HTTP client used to send the request. + */ + @Generated + private HttpClient httpClient; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithParamAliasClientBuilder httpClient(HttpClient httpClient) { + this.httpClient = httpClient; + return this; + } + + /* + * The HTTP pipeline to send requests through. + */ + @Generated + private HttpPipeline pipeline; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithParamAliasClientBuilder pipeline(HttpPipeline pipeline) { + if (this.pipeline != null && pipeline == null) { + LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured."); + } + this.pipeline = pipeline; + return this; + } + + /* + * The logging configuration for HTTP requests and responses. + */ + @Generated + private HttpLogOptions httpLogOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithParamAliasClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) { + this.httpLogOptions = httpLogOptions; + return this; + } + + /* + * The client options such as application ID and custom headers to set on a request. + */ + @Generated + private ClientOptions clientOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithParamAliasClientBuilder clientOptions(ClientOptions clientOptions) { + this.clientOptions = clientOptions; + return this; + } + + /* + * The retry options to configure retry policy for failed requests. + */ + @Generated + private RetryOptions retryOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithParamAliasClientBuilder retryOptions(RetryOptions retryOptions) { + this.retryOptions = retryOptions; + return this; + } + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithParamAliasClientBuilder addPolicy(HttpPipelinePolicy customPolicy) { + Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); + pipelinePolicies.add(customPolicy); + return this; + } + + /* + * The configuration store that is used during construction of the service client. + */ + @Generated + private Configuration configuration; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithParamAliasClientBuilder configuration(Configuration configuration) { + this.configuration = configuration; + return this; + } + + /* + * The service endpoint + */ + @Generated + private String endpoint; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithParamAliasClientBuilder endpoint(String endpoint) { + this.endpoint = endpoint; + return this; + } + + /* + * + */ + @Generated + private String blobName; + + /** + * Sets. + * + * @param blobName the blobName value. + * @return the IndividuallyParentNestedWithParamAliasClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithParamAliasClientBuilder blobName(String blobName) { + this.blobName = blobName; + return this; + } + + /* + * The retry policy that will attempt to retry failed requests, if applicable. + */ + @Generated + private RetryPolicy retryPolicy; + + /** + * Sets The retry policy that will attempt to retry failed requests, if applicable. + * + * @param retryPolicy the retryPolicy value. + * @return the IndividuallyParentNestedWithParamAliasClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithParamAliasClientBuilder retryPolicy(RetryPolicy retryPolicy) { + this.retryPolicy = retryPolicy; + return this; + } + + /** + * Builds an instance of IndividuallyParentNestedWithParamAliasClientImpl with the provided parameters. + * + * @return an instance of IndividuallyParentNestedWithParamAliasClientImpl. + */ + @Generated + private IndividuallyParentNestedWithParamAliasClientImpl buildInnerClient() { + this.validateClient(); + HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline(); + String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000"; + IndividuallyParentNestedWithParamAliasClientImpl client = new IndividuallyParentNestedWithParamAliasClientImpl( + localPipeline, JacksonAdapter.createDefaultSerializerAdapter(), localEndpoint, this.blobName); + return client; + } + + @Generated + private void validateClient() { + // This method is invoked from 'buildInnerClient'/'buildClient' method. + // Developer can customize this method, to validate that the necessary conditions are met for the new client. + Objects.requireNonNull(blobName, "'blobName' cannot be null."); + } + + @Generated + private HttpPipeline createHttpPipeline() { + Configuration buildConfiguration + = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; + HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions; + ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions; + List policies = new ArrayList<>(); + String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName"); + String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); + String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions); + policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); + policies.add(new RequestIdPolicy()); + policies.add(new AddHeadersFromContextPolicy()); + HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions); + if (headers != null) { + policies.add(new AddHeadersPolicy(headers)); + } + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addBeforeRetryPolicies(policies); + policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy())); + policies.add(new AddDatePolicy()); + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addAfterRetryPolicies(policies); + policies.add(new HttpLoggingPolicy(localHttpLogOptions)); + HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])) + .httpClient(httpClient) + .clientOptions(localClientOptions) + .build(); + return httpPipeline; + } + + /** + * Builds an instance of IndividuallyParentNestedWithParamAliasAsyncClient class. + * + * @return an instance of IndividuallyParentNestedWithParamAliasAsyncClient. + */ + @Generated + public IndividuallyParentNestedWithParamAliasAsyncClient buildAsyncClient() { + return new IndividuallyParentNestedWithParamAliasAsyncClient(buildInnerClient()); + } + + /** + * Builds an instance of IndividuallyParentNestedWithParamAliasClient class. + * + * @return an instance of IndividuallyParentNestedWithParamAliasClient. + */ + @Generated + public IndividuallyParentNestedWithParamAliasClient buildClient() { + return new IndividuallyParentNestedWithParamAliasClient(buildInnerClient()); + } + + private static final ClientLogger LOGGER + = new ClientLogger(IndividuallyParentNestedWithParamAliasClientBuilder.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java new file mode 100644 index 00000000000..87addaf2ba4 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java @@ -0,0 +1,185 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithPathClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the asynchronous IndividuallyParentNestedWithPathClient type. + */ +@ServiceClient(builder = IndividuallyParentNestedWithPathClientBuilder.class, isAsync = true) +public final class IndividuallyParentNestedWithPathAsyncClient { + @Generated + private final IndividuallyParentNestedWithPathClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyParentNestedWithPathAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyParentNestedWithPathAsyncClient(IndividuallyParentNestedWithPathClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponseAsync(requestOptions); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponseAsync(requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponseAsync(requestOptions); + } + + /** + * The withQuery operation. + * + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery(String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The withQuery operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery() { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The getStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return properties of a blob on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getStandalone() { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(BlobProperties.class)); + } + + /** + * The deleteStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteStandalone() { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return deleteStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java new file mode 100644 index 00000000000..7fb9a314265 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java @@ -0,0 +1,179 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithPathClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; + +/** + * Initializes a new instance of the synchronous IndividuallyParentNestedWithPathClient type. + */ +@ServiceClient(builder = IndividuallyParentNestedWithPathClientBuilder.class) +public final class IndividuallyParentNestedWithPathClient { + @Generated + private final IndividuallyParentNestedWithPathClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyParentNestedWithPathClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyParentNestedWithPathClient(IndividuallyParentNestedWithPathClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponse(requestOptions); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponse(requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponse(requestOptions); + } + + /** + * The withQuery operation. + * + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery(String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + withQueryWithResponse(requestOptions).getValue(); + } + + /** + * The withQuery operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery() { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + withQueryWithResponse(requestOptions).getValue(); + } + + /** + * The getStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return properties of a blob. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public BlobProperties getStandalone() { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getStandaloneWithResponse(requestOptions).getValue().toObject(BlobProperties.class); + } + + /** + * The deleteStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void deleteStandalone() { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + deleteStandaloneWithResponse(requestOptions).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClientBuilder.java new file mode 100644 index 00000000000..e151bacc101 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClientBuilder.java @@ -0,0 +1,312 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithPathClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ServiceClientBuilder; +import com.azure.core.client.traits.ConfigurationTrait; +import com.azure.core.client.traits.EndpointTrait; +import com.azure.core.client.traits.HttpTrait; +import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.HttpPipelinePosition; +import com.azure.core.http.policy.AddDatePolicy; +import com.azure.core.http.policy.AddHeadersFromContextPolicy; +import com.azure.core.http.policy.AddHeadersPolicy; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.http.policy.HttpLoggingPolicy; +import com.azure.core.http.policy.HttpPipelinePolicy; +import com.azure.core.http.policy.HttpPolicyProviders; +import com.azure.core.http.policy.RequestIdPolicy; +import com.azure.core.http.policy.RetryOptions; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.ClientOptions; +import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.builder.ClientBuilderUtil; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.serializer.JacksonAdapter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * A builder for creating a new instance of the IndividuallyParentNestedWithPathClient type. + */ +@ServiceClientBuilder( + serviceClients = { + IndividuallyParentNestedWithPathClient.class, + IndividuallyParentNestedWithPathAsyncClient.class }) +public final class IndividuallyParentNestedWithPathClientBuilder + implements HttpTrait, + ConfigurationTrait, + EndpointTrait { + @Generated + private static final String SDK_NAME = "name"; + + @Generated + private static final String SDK_VERSION = "version"; + + @Generated + private static final Map PROPERTIES = CoreUtils + .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + + @Generated + private final List pipelinePolicies; + + /** + * Create an instance of the IndividuallyParentNestedWithPathClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithPathClientBuilder() { + this.pipelinePolicies = new ArrayList<>(); + } + + /* + * The HTTP client used to send the request. + */ + @Generated + private HttpClient httpClient; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithPathClientBuilder httpClient(HttpClient httpClient) { + this.httpClient = httpClient; + return this; + } + + /* + * The HTTP pipeline to send requests through. + */ + @Generated + private HttpPipeline pipeline; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithPathClientBuilder pipeline(HttpPipeline pipeline) { + if (this.pipeline != null && pipeline == null) { + LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured."); + } + this.pipeline = pipeline; + return this; + } + + /* + * The logging configuration for HTTP requests and responses. + */ + @Generated + private HttpLogOptions httpLogOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithPathClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) { + this.httpLogOptions = httpLogOptions; + return this; + } + + /* + * The client options such as application ID and custom headers to set on a request. + */ + @Generated + private ClientOptions clientOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithPathClientBuilder clientOptions(ClientOptions clientOptions) { + this.clientOptions = clientOptions; + return this; + } + + /* + * The retry options to configure retry policy for failed requests. + */ + @Generated + private RetryOptions retryOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithPathClientBuilder retryOptions(RetryOptions retryOptions) { + this.retryOptions = retryOptions; + return this; + } + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithPathClientBuilder addPolicy(HttpPipelinePolicy customPolicy) { + Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); + pipelinePolicies.add(customPolicy); + return this; + } + + /* + * The configuration store that is used during construction of the service client. + */ + @Generated + private Configuration configuration; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithPathClientBuilder configuration(Configuration configuration) { + this.configuration = configuration; + return this; + } + + /* + * The service endpoint + */ + @Generated + private String endpoint; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithPathClientBuilder endpoint(String endpoint) { + this.endpoint = endpoint; + return this; + } + + /* + * + */ + @Generated + private String blobName; + + /** + * Sets. + * + * @param blobName the blobName value. + * @return the IndividuallyParentNestedWithPathClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithPathClientBuilder blobName(String blobName) { + this.blobName = blobName; + return this; + } + + /* + * The retry policy that will attempt to retry failed requests, if applicable. + */ + @Generated + private RetryPolicy retryPolicy; + + /** + * Sets The retry policy that will attempt to retry failed requests, if applicable. + * + * @param retryPolicy the retryPolicy value. + * @return the IndividuallyParentNestedWithPathClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithPathClientBuilder retryPolicy(RetryPolicy retryPolicy) { + this.retryPolicy = retryPolicy; + return this; + } + + /** + * Builds an instance of IndividuallyParentNestedWithPathClientImpl with the provided parameters. + * + * @return an instance of IndividuallyParentNestedWithPathClientImpl. + */ + @Generated + private IndividuallyParentNestedWithPathClientImpl buildInnerClient() { + this.validateClient(); + HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline(); + String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000"; + IndividuallyParentNestedWithPathClientImpl client = new IndividuallyParentNestedWithPathClientImpl( + localPipeline, JacksonAdapter.createDefaultSerializerAdapter(), localEndpoint, this.blobName); + return client; + } + + @Generated + private void validateClient() { + // This method is invoked from 'buildInnerClient'/'buildClient' method. + // Developer can customize this method, to validate that the necessary conditions are met for the new client. + Objects.requireNonNull(blobName, "'blobName' cannot be null."); + } + + @Generated + private HttpPipeline createHttpPipeline() { + Configuration buildConfiguration + = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; + HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions; + ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions; + List policies = new ArrayList<>(); + String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName"); + String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); + String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions); + policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); + policies.add(new RequestIdPolicy()); + policies.add(new AddHeadersFromContextPolicy()); + HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions); + if (headers != null) { + policies.add(new AddHeadersPolicy(headers)); + } + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addBeforeRetryPolicies(policies); + policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy())); + policies.add(new AddDatePolicy()); + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addAfterRetryPolicies(policies); + policies.add(new HttpLoggingPolicy(localHttpLogOptions)); + HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])) + .httpClient(httpClient) + .clientOptions(localClientOptions) + .build(); + return httpPipeline; + } + + /** + * Builds an instance of IndividuallyParentNestedWithPathAsyncClient class. + * + * @return an instance of IndividuallyParentNestedWithPathAsyncClient. + */ + @Generated + public IndividuallyParentNestedWithPathAsyncClient buildAsyncClient() { + return new IndividuallyParentNestedWithPathAsyncClient(buildInnerClient()); + } + + /** + * Builds an instance of IndividuallyParentNestedWithPathClient class. + * + * @return an instance of IndividuallyParentNestedWithPathClient. + */ + @Generated + public IndividuallyParentNestedWithPathClient buildClient() { + return new IndividuallyParentNestedWithPathClient(buildInnerClient()); + } + + private static final ClientLogger LOGGER = new ClientLogger(IndividuallyParentNestedWithPathClientBuilder.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java new file mode 100644 index 00000000000..d08a228542b --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java @@ -0,0 +1,185 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithQueryClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the asynchronous IndividuallyParentNestedWithQueryClient type. + */ +@ServiceClient(builder = IndividuallyParentNestedWithQueryClientBuilder.class, isAsync = true) +public final class IndividuallyParentNestedWithQueryAsyncClient { + @Generated + private final IndividuallyParentNestedWithQueryClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyParentNestedWithQueryAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyParentNestedWithQueryAsyncClient(IndividuallyParentNestedWithQueryClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponseAsync(requestOptions); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponseAsync(requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponseAsync(requestOptions); + } + + /** + * The withQuery operation. + * + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery(String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The withQuery operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono withQuery() { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The getStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return properties of a blob on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getStandalone() { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(BlobProperties.class)); + } + + /** + * The deleteStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteStandalone() { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return deleteStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java new file mode 100644 index 00000000000..c61919c1f10 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java @@ -0,0 +1,179 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithQueryClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; + +/** + * Initializes a new instance of the synchronous IndividuallyParentNestedWithQueryClient type. + */ +@ServiceClient(builder = IndividuallyParentNestedWithQueryClientBuilder.class) +public final class IndividuallyParentNestedWithQueryClient { + @Generated + private final IndividuallyParentNestedWithQueryClientImpl serviceClient; + + /** + * Initializes an instance of IndividuallyParentNestedWithQueryClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + IndividuallyParentNestedWithQueryClient(IndividuallyParentNestedWithQueryClientImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(RequestOptions requestOptions) { + return this.serviceClient.withQueryWithResponse(requestOptions); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getStandaloneWithResponse(requestOptions); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { + return this.serviceClient.deleteStandaloneWithResponse(requestOptions); + } + + /** + * The withQuery operation. + * + * @param format The format parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery(String format) { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + if (format != null) { + requestOptions.addQueryParam("format", format, false); + } + withQueryWithResponse(requestOptions).getValue(); + } + + /** + * The withQuery operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void withQuery() { + // Generated convenience method for withQueryWithResponse + RequestOptions requestOptions = new RequestOptions(); + withQueryWithResponse(requestOptions).getValue(); + } + + /** + * The getStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return properties of a blob. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public BlobProperties getStandalone() { + // Generated convenience method for getStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getStandaloneWithResponse(requestOptions).getValue().toObject(BlobProperties.class); + } + + /** + * The deleteStandalone operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void deleteStandalone() { + // Generated convenience method for deleteStandaloneWithResponse + RequestOptions requestOptions = new RequestOptions(); + deleteStandaloneWithResponse(requestOptions).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClientBuilder.java new file mode 100644 index 00000000000..264cc7722e6 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClientBuilder.java @@ -0,0 +1,312 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithQueryClientImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ServiceClientBuilder; +import com.azure.core.client.traits.ConfigurationTrait; +import com.azure.core.client.traits.EndpointTrait; +import com.azure.core.client.traits.HttpTrait; +import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.HttpPipelinePosition; +import com.azure.core.http.policy.AddDatePolicy; +import com.azure.core.http.policy.AddHeadersFromContextPolicy; +import com.azure.core.http.policy.AddHeadersPolicy; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.http.policy.HttpLoggingPolicy; +import com.azure.core.http.policy.HttpPipelinePolicy; +import com.azure.core.http.policy.HttpPolicyProviders; +import com.azure.core.http.policy.RequestIdPolicy; +import com.azure.core.http.policy.RetryOptions; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.ClientOptions; +import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.builder.ClientBuilderUtil; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.serializer.JacksonAdapter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * A builder for creating a new instance of the IndividuallyParentNestedWithQueryClient type. + */ +@ServiceClientBuilder( + serviceClients = { + IndividuallyParentNestedWithQueryClient.class, + IndividuallyParentNestedWithQueryAsyncClient.class }) +public final class IndividuallyParentNestedWithQueryClientBuilder + implements HttpTrait, + ConfigurationTrait, + EndpointTrait { + @Generated + private static final String SDK_NAME = "name"; + + @Generated + private static final String SDK_VERSION = "version"; + + @Generated + private static final Map PROPERTIES = CoreUtils + .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + + @Generated + private final List pipelinePolicies; + + /** + * Create an instance of the IndividuallyParentNestedWithQueryClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithQueryClientBuilder() { + this.pipelinePolicies = new ArrayList<>(); + } + + /* + * The HTTP client used to send the request. + */ + @Generated + private HttpClient httpClient; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithQueryClientBuilder httpClient(HttpClient httpClient) { + this.httpClient = httpClient; + return this; + } + + /* + * The HTTP pipeline to send requests through. + */ + @Generated + private HttpPipeline pipeline; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithQueryClientBuilder pipeline(HttpPipeline pipeline) { + if (this.pipeline != null && pipeline == null) { + LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured."); + } + this.pipeline = pipeline; + return this; + } + + /* + * The logging configuration for HTTP requests and responses. + */ + @Generated + private HttpLogOptions httpLogOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithQueryClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) { + this.httpLogOptions = httpLogOptions; + return this; + } + + /* + * The client options such as application ID and custom headers to set on a request. + */ + @Generated + private ClientOptions clientOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithQueryClientBuilder clientOptions(ClientOptions clientOptions) { + this.clientOptions = clientOptions; + return this; + } + + /* + * The retry options to configure retry policy for failed requests. + */ + @Generated + private RetryOptions retryOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithQueryClientBuilder retryOptions(RetryOptions retryOptions) { + this.retryOptions = retryOptions; + return this; + } + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithQueryClientBuilder addPolicy(HttpPipelinePolicy customPolicy) { + Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); + pipelinePolicies.add(customPolicy); + return this; + } + + /* + * The configuration store that is used during construction of the service client. + */ + @Generated + private Configuration configuration; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithQueryClientBuilder configuration(Configuration configuration) { + this.configuration = configuration; + return this; + } + + /* + * The service endpoint + */ + @Generated + private String endpoint; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public IndividuallyParentNestedWithQueryClientBuilder endpoint(String endpoint) { + this.endpoint = endpoint; + return this; + } + + /* + * + */ + @Generated + private String blobName; + + /** + * Sets. + * + * @param blobName the blobName value. + * @return the IndividuallyParentNestedWithQueryClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithQueryClientBuilder blobName(String blobName) { + this.blobName = blobName; + return this; + } + + /* + * The retry policy that will attempt to retry failed requests, if applicable. + */ + @Generated + private RetryPolicy retryPolicy; + + /** + * Sets The retry policy that will attempt to retry failed requests, if applicable. + * + * @param retryPolicy the retryPolicy value. + * @return the IndividuallyParentNestedWithQueryClientBuilder. + */ + @Generated + public IndividuallyParentNestedWithQueryClientBuilder retryPolicy(RetryPolicy retryPolicy) { + this.retryPolicy = retryPolicy; + return this; + } + + /** + * Builds an instance of IndividuallyParentNestedWithQueryClientImpl with the provided parameters. + * + * @return an instance of IndividuallyParentNestedWithQueryClientImpl. + */ + @Generated + private IndividuallyParentNestedWithQueryClientImpl buildInnerClient() { + this.validateClient(); + HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline(); + String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000"; + IndividuallyParentNestedWithQueryClientImpl client = new IndividuallyParentNestedWithQueryClientImpl( + localPipeline, JacksonAdapter.createDefaultSerializerAdapter(), localEndpoint, this.blobName); + return client; + } + + @Generated + private void validateClient() { + // This method is invoked from 'buildInnerClient'/'buildClient' method. + // Developer can customize this method, to validate that the necessary conditions are met for the new client. + Objects.requireNonNull(blobName, "'blobName' cannot be null."); + } + + @Generated + private HttpPipeline createHttpPipeline() { + Configuration buildConfiguration + = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; + HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions; + ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions; + List policies = new ArrayList<>(); + String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName"); + String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); + String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions); + policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); + policies.add(new RequestIdPolicy()); + policies.add(new AddHeadersFromContextPolicy()); + HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions); + if (headers != null) { + policies.add(new AddHeadersPolicy(headers)); + } + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addBeforeRetryPolicies(policies); + policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy())); + policies.add(new AddDatePolicy()); + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addAfterRetryPolicies(policies); + policies.add(new HttpLoggingPolicy(localHttpLogOptions)); + HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])) + .httpClient(httpClient) + .clientOptions(localClientOptions) + .build(); + return httpPipeline; + } + + /** + * Builds an instance of IndividuallyParentNestedWithQueryAsyncClient class. + * + * @return an instance of IndividuallyParentNestedWithQueryAsyncClient. + */ + @Generated + public IndividuallyParentNestedWithQueryAsyncClient buildAsyncClient() { + return new IndividuallyParentNestedWithQueryAsyncClient(buildInnerClient()); + } + + /** + * Builds an instance of IndividuallyParentNestedWithQueryClient class. + * + * @return an instance of IndividuallyParentNestedWithQueryClient. + */ + @Generated + public IndividuallyParentNestedWithQueryClient buildClient() { + return new IndividuallyParentNestedWithQueryClient(buildInnerClient()); + } + + private static final ClientLogger LOGGER = new ClientLogger(IndividuallyParentNestedWithQueryClientBuilder.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentClientImpl.java new file mode 100644 index 00000000000..9fc555c894a --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentClientImpl.java @@ -0,0 +1,166 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; + +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.serializer.JacksonAdapter; +import com.azure.core.util.serializer.SerializerAdapter; +import java.util.Objects; + +/** + * Initializes a new instance of the IndividuallyParentClient type. + */ +public final class IndividuallyParentClientImpl { + /** + * Service host. + */ + private final String endpoint; + + /** + * Gets Service host. + * + * @return the endpoint value. + */ + public String getEndpoint() { + return this.endpoint; + } + + /** + * The HTTP pipeline to send requests through. + */ + private final HttpPipeline httpPipeline; + + /** + * Gets The HTTP pipeline to send requests through. + * + * @return the httpPipeline value. + */ + public HttpPipeline getHttpPipeline() { + return this.httpPipeline; + } + + /** + * The serializer to serialize an object into a string. + */ + private final SerializerAdapter serializerAdapter; + + /** + * Gets The serializer to serialize an object into a string. + * + * @return the serializerAdapter value. + */ + public SerializerAdapter getSerializerAdapter() { + return this.serializerAdapter; + } + + /** + * Initializes an instance of IndividuallyParentClient client. + * + * @param endpoint Service host. + */ + public IndividuallyParentClientImpl(String endpoint) { + this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), + JacksonAdapter.createDefaultSerializerAdapter(), endpoint); + } + + /** + * Initializes an instance of IndividuallyParentClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param endpoint Service host. + */ + public IndividuallyParentClientImpl(HttpPipeline httpPipeline, String endpoint) { + this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint); + } + + /** + * Initializes an instance of IndividuallyParentClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param serializerAdapter The serializer to serialize an object into a string. + * @param endpoint Service host. + */ + public IndividuallyParentClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, + String endpoint) { + this.httpPipeline = httpPipeline; + this.serializerAdapter = serializerAdapter; + this.endpoint = endpoint; + } + + /** + * Gets an instance of IndividuallyParentNestedWithPathClientImpl class. + * + * @param blobName The blobName parameter. + * @return an instance of IndividuallyParentNestedWithPathClientImpl class. + */ + public IndividuallyParentNestedWithPathClientImpl getIndividuallyParentNestedWithPathClient(String blobName) { + Objects.requireNonNull(blobName, "'blobName' cannot be null."); + return new IndividuallyParentNestedWithPathClientImpl(httpPipeline, serializerAdapter, endpoint, blobName); + } + + /** + * Gets an instance of IndividuallyParentNestedWithQueryClientImpl class. + * + * @param blobName The blobName parameter. + * @return an instance of IndividuallyParentNestedWithQueryClientImpl class. + */ + public IndividuallyParentNestedWithQueryClientImpl getIndividuallyParentNestedWithQueryClient(String blobName) { + Objects.requireNonNull(blobName, "'blobName' cannot be null."); + return new IndividuallyParentNestedWithQueryClientImpl(httpPipeline, serializerAdapter, endpoint, blobName); + } + + /** + * Gets an instance of IndividuallyParentNestedWithHeaderClientImpl class. + * + * @param name The name parameter. + * @return an instance of IndividuallyParentNestedWithHeaderClientImpl class. + */ + public IndividuallyParentNestedWithHeaderClientImpl getIndividuallyParentNestedWithHeaderClient(String name) { + Objects.requireNonNull(name, "'name' cannot be null."); + return new IndividuallyParentNestedWithHeaderClientImpl(httpPipeline, serializerAdapter, endpoint, name); + } + + /** + * Gets an instance of IndividuallyParentNestedWithMultipleClientImpl class. + * + * @param name The name parameter. + * @param region The region parameter. + * @return an instance of IndividuallyParentNestedWithMultipleClientImpl class. + */ + public IndividuallyParentNestedWithMultipleClientImpl getIndividuallyParentNestedWithMultipleClient(String name, + String region) { + Objects.requireNonNull(name, "'name' cannot be null."); + Objects.requireNonNull(region, "'region' cannot be null."); + return new IndividuallyParentNestedWithMultipleClientImpl(httpPipeline, serializerAdapter, endpoint, name, + region); + } + + /** + * Gets an instance of IndividuallyParentNestedWithMixedClientImpl class. + * + * @param name The name parameter. + * @return an instance of IndividuallyParentNestedWithMixedClientImpl class. + */ + public IndividuallyParentNestedWithMixedClientImpl getIndividuallyParentNestedWithMixedClient(String name) { + Objects.requireNonNull(name, "'name' cannot be null."); + return new IndividuallyParentNestedWithMixedClientImpl(httpPipeline, serializerAdapter, endpoint, name); + } + + /** + * Gets an instance of IndividuallyParentNestedWithParamAliasClientImpl class. + * + * @param blobName The blobName parameter. + * @return an instance of IndividuallyParentNestedWithParamAliasClientImpl class. + */ + public IndividuallyParentNestedWithParamAliasClientImpl + getIndividuallyParentNestedWithParamAliasClient(String blobName) { + Objects.requireNonNull(blobName, "'blobName' cannot be null."); + return new IndividuallyParentNestedWithParamAliasClientImpl(httpPipeline, serializerAdapter, endpoint, + blobName); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithHeaderClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithHeaderClientImpl.java new file mode 100644 index 00000000000..ce080a8c394 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithHeaderClientImpl.java @@ -0,0 +1,306 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; + +import com.azure.core.annotation.Delete; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.Get; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import com.azure.core.util.serializer.JacksonAdapter; +import com.azure.core.util.serializer.SerializerAdapter; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the IndividuallyParentNestedWithHeaderClient type. + */ +public final class IndividuallyParentNestedWithHeaderClientImpl { + /** + * The proxy service used to perform REST calls. + */ + private final IndividuallyParentNestedWithHeaderClientService service; + + /** + * Service host. + */ + private final String endpoint; + + /** + * Gets Service host. + * + * @return the endpoint value. + */ + public String getEndpoint() { + return this.endpoint; + } + + /** + */ + private final String name; + + /** + * Gets. + * + * @return the name value. + */ + public String getName() { + return this.name; + } + + /** + * The HTTP pipeline to send requests through. + */ + private final HttpPipeline httpPipeline; + + /** + * Gets The HTTP pipeline to send requests through. + * + * @return the httpPipeline value. + */ + public HttpPipeline getHttpPipeline() { + return this.httpPipeline; + } + + /** + * The serializer to serialize an object into a string. + */ + private final SerializerAdapter serializerAdapter; + + /** + * Gets The serializer to serialize an object into a string. + * + * @return the serializerAdapter value. + */ + public SerializerAdapter getSerializerAdapter() { + return this.serializerAdapter; + } + + /** + * Initializes an instance of IndividuallyParentNestedWithHeaderClient client. + * + * @param endpoint Service host. + * @param name + */ + public IndividuallyParentNestedWithHeaderClientImpl(String endpoint, String name) { + this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), + JacksonAdapter.createDefaultSerializerAdapter(), endpoint, name); + } + + /** + * Initializes an instance of IndividuallyParentNestedWithHeaderClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param endpoint Service host. + * @param name + */ + public IndividuallyParentNestedWithHeaderClientImpl(HttpPipeline httpPipeline, String endpoint, String name) { + this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, name); + } + + /** + * Initializes an instance of IndividuallyParentNestedWithHeaderClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param serializerAdapter The serializer to serialize an object into a string. + * @param endpoint Service host. + * @param name + */ + public IndividuallyParentNestedWithHeaderClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, + String endpoint, String name) { + this.httpPipeline = httpPipeline; + this.serializerAdapter = serializerAdapter; + this.endpoint = endpoint; + this.name = name; + this.service = RestProxy.create(IndividuallyParentNestedWithHeaderClientService.class, this.httpPipeline, + this.getSerializerAdapter()); + } + + /** + * The interface defining all the services for IndividuallyParentNestedWithHeaderClient to be used by the proxy + * service to perform REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "IndividuallyParentNestedWithHeaderClient") + public interface IndividuallyParentNestedWithHeaderClientService { + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-header/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withQuery(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-header/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withQuerySync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-header/get-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> getStandalone(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-header/get-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getStandaloneSync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-header/delete-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteStandalone(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-header/delete-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteStandaloneSync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + RequestOptions requestOptions, Context context); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil + .withContext(context -> service.withQuery(this.getEndpoint(), this.getName(), requestOptions, context)); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(RequestOptions requestOptions) { + return service.withQuerySync(this.getEndpoint(), this.getName(), requestOptions, Context.NONE); + } + + /** + * The getStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil + .withContext(context -> service.getStandalone(this.getEndpoint(), this.getName(), requestOptions, context)); + } + + /** + * The getStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(RequestOptions requestOptions) { + return service.getStandaloneSync(this.getEndpoint(), this.getName(), requestOptions, Context.NONE); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.deleteStandalone(this.getEndpoint(), this.getName(), requestOptions, context)); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { + return service.deleteStandaloneSync(this.getEndpoint(), this.getName(), requestOptions, Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMixedClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMixedClientImpl.java new file mode 100644 index 00000000000..89a2c072df1 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMixedClientImpl.java @@ -0,0 +1,313 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; + +import com.azure.core.annotation.Delete; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.Get; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.QueryParam; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import com.azure.core.util.serializer.JacksonAdapter; +import com.azure.core.util.serializer.SerializerAdapter; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the IndividuallyParentNestedWithMixedClient type. + */ +public final class IndividuallyParentNestedWithMixedClientImpl { + /** + * The proxy service used to perform REST calls. + */ + private final IndividuallyParentNestedWithMixedClientService service; + + /** + * Service host. + */ + private final String endpoint; + + /** + * Gets Service host. + * + * @return the endpoint value. + */ + public String getEndpoint() { + return this.endpoint; + } + + /** + */ + private final String name; + + /** + * Gets. + * + * @return the name value. + */ + public String getName() { + return this.name; + } + + /** + * The HTTP pipeline to send requests through. + */ + private final HttpPipeline httpPipeline; + + /** + * Gets The HTTP pipeline to send requests through. + * + * @return the httpPipeline value. + */ + public HttpPipeline getHttpPipeline() { + return this.httpPipeline; + } + + /** + * The serializer to serialize an object into a string. + */ + private final SerializerAdapter serializerAdapter; + + /** + * Gets The serializer to serialize an object into a string. + * + * @return the serializerAdapter value. + */ + public SerializerAdapter getSerializerAdapter() { + return this.serializerAdapter; + } + + /** + * Initializes an instance of IndividuallyParentNestedWithMixedClient client. + * + * @param endpoint Service host. + * @param name + */ + public IndividuallyParentNestedWithMixedClientImpl(String endpoint, String name) { + this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), + JacksonAdapter.createDefaultSerializerAdapter(), endpoint, name); + } + + /** + * Initializes an instance of IndividuallyParentNestedWithMixedClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param endpoint Service host. + * @param name + */ + public IndividuallyParentNestedWithMixedClientImpl(HttpPipeline httpPipeline, String endpoint, String name) { + this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, name); + } + + /** + * Initializes an instance of IndividuallyParentNestedWithMixedClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param serializerAdapter The serializer to serialize an object into a string. + * @param endpoint Service host. + * @param name + */ + public IndividuallyParentNestedWithMixedClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, + String endpoint, String name) { + this.httpPipeline = httpPipeline; + this.serializerAdapter = serializerAdapter; + this.endpoint = endpoint; + this.name = name; + this.service = RestProxy.create(IndividuallyParentNestedWithMixedClientService.class, this.httpPipeline, + this.getSerializerAdapter()); + } + + /** + * The interface defining all the services for IndividuallyParentNestedWithMixedClient to be used by the proxy + * service to perform REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "IndividuallyParentNestedWithMixedClient") + public interface IndividuallyParentNestedWithMixedClientService { + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-mixed/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withQuery(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-mixed/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withQuerySync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-mixed/get-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> getStandalone(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-mixed/get-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getStandaloneSync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-mixed/delete-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteStandalone(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-mixed/delete-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteStandaloneSync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponseAsync(String region, RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.withQuery(this.getEndpoint(), this.getName(), region, requestOptions, context)); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(String region, RequestOptions requestOptions) { + return service.withQuerySync(this.getEndpoint(), this.getName(), region, requestOptions, Context.NONE); + } + + /** + * The getStandalone operation. + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponseAsync(String region, RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.getStandalone(this.getEndpoint(), this.getName(), region, requestOptions, context)); + } + + /** + * The getStandalone operation. + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(String region, RequestOptions requestOptions) { + return service.getStandaloneSync(this.getEndpoint(), this.getName(), region, requestOptions, Context.NONE); + } + + /** + * The deleteStandalone operation. + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponseAsync(String region, RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.deleteStandalone(this.getEndpoint(), this.getName(), region, requestOptions, context)); + } + + /** + * The deleteStandalone operation. + * + * @param region The region parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(String region, RequestOptions requestOptions) { + return service.deleteStandaloneSync(this.getEndpoint(), this.getName(), region, requestOptions, Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMultipleClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMultipleClientImpl.java new file mode 100644 index 00000000000..576ef3cbc06 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMultipleClientImpl.java @@ -0,0 +1,328 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; + +import com.azure.core.annotation.Delete; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.Get; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.QueryParam; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import com.azure.core.util.serializer.JacksonAdapter; +import com.azure.core.util.serializer.SerializerAdapter; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the IndividuallyParentNestedWithMultipleClient type. + */ +public final class IndividuallyParentNestedWithMultipleClientImpl { + /** + * The proxy service used to perform REST calls. + */ + private final IndividuallyParentNestedWithMultipleClientService service; + + /** + * Service host. + */ + private final String endpoint; + + /** + * Gets Service host. + * + * @return the endpoint value. + */ + public String getEndpoint() { + return this.endpoint; + } + + /** + */ + private final String name; + + /** + * Gets. + * + * @return the name value. + */ + public String getName() { + return this.name; + } + + /** + */ + private final String region; + + /** + * Gets. + * + * @return the region value. + */ + public String getRegion() { + return this.region; + } + + /** + * The HTTP pipeline to send requests through. + */ + private final HttpPipeline httpPipeline; + + /** + * Gets The HTTP pipeline to send requests through. + * + * @return the httpPipeline value. + */ + public HttpPipeline getHttpPipeline() { + return this.httpPipeline; + } + + /** + * The serializer to serialize an object into a string. + */ + private final SerializerAdapter serializerAdapter; + + /** + * Gets The serializer to serialize an object into a string. + * + * @return the serializerAdapter value. + */ + public SerializerAdapter getSerializerAdapter() { + return this.serializerAdapter; + } + + /** + * Initializes an instance of IndividuallyParentNestedWithMultipleClient client. + * + * @param endpoint Service host. + * @param name + * @param region + */ + public IndividuallyParentNestedWithMultipleClientImpl(String endpoint, String name, String region) { + this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), + JacksonAdapter.createDefaultSerializerAdapter(), endpoint, name, region); + } + + /** + * Initializes an instance of IndividuallyParentNestedWithMultipleClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param endpoint Service host. + * @param name + * @param region + */ + public IndividuallyParentNestedWithMultipleClientImpl(HttpPipeline httpPipeline, String endpoint, String name, + String region) { + this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, name, region); + } + + /** + * Initializes an instance of IndividuallyParentNestedWithMultipleClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param serializerAdapter The serializer to serialize an object into a string. + * @param endpoint Service host. + * @param name + * @param region + */ + public IndividuallyParentNestedWithMultipleClientImpl(HttpPipeline httpPipeline, + SerializerAdapter serializerAdapter, String endpoint, String name, String region) { + this.httpPipeline = httpPipeline; + this.serializerAdapter = serializerAdapter; + this.endpoint = endpoint; + this.name = name; + this.region = region; + this.service = RestProxy.create(IndividuallyParentNestedWithMultipleClientService.class, this.httpPipeline, + this.getSerializerAdapter()); + } + + /** + * The interface defining all the services for IndividuallyParentNestedWithMultipleClient to be used by the proxy + * service to perform REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "IndividuallyParentNestedWithMultipleClient") + public interface IndividuallyParentNestedWithMultipleClientService { + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-multiple/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withQuery(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-multiple/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withQuerySync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-multiple/get-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> getStandalone(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-multiple/get-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getStandaloneSync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-multiple/delete-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteStandalone(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-multiple/delete-standalone") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteStandaloneSync(@HostParam("endpoint") String endpoint, @HeaderParam("name") String name, + @QueryParam("region") String region, RequestOptions requestOptions, Context context); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil.withContext(context -> service.withQuery(this.getEndpoint(), this.getName(), this.getRegion(), + requestOptions, context)); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(RequestOptions requestOptions) { + return service.withQuerySync(this.getEndpoint(), this.getName(), this.getRegion(), requestOptions, + Context.NONE); + } + + /** + * The getStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil.withContext(context -> service.getStandalone(this.getEndpoint(), this.getName(), + this.getRegion(), requestOptions, context)); + } + + /** + * The getStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(RequestOptions requestOptions) { + return service.getStandaloneSync(this.getEndpoint(), this.getName(), this.getRegion(), requestOptions, + Context.NONE); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil.withContext(context -> service.deleteStandalone(this.getEndpoint(), this.getName(), + this.getRegion(), requestOptions, context)); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { + return service.deleteStandaloneSync(this.getEndpoint(), this.getName(), this.getRegion(), requestOptions, + Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithParamAliasClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithParamAliasClientImpl.java new file mode 100644 index 00000000000..e17cf898735 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithParamAliasClientImpl.java @@ -0,0 +1,243 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; + +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.Get; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.PathParam; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import com.azure.core.util.serializer.JacksonAdapter; +import com.azure.core.util.serializer.SerializerAdapter; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the IndividuallyParentNestedWithParamAliasClient type. + */ +public final class IndividuallyParentNestedWithParamAliasClientImpl { + /** + * The proxy service used to perform REST calls. + */ + private final IndividuallyParentNestedWithParamAliasClientService service; + + /** + * Service host. + */ + private final String endpoint; + + /** + * Gets Service host. + * + * @return the endpoint value. + */ + public String getEndpoint() { + return this.endpoint; + } + + /** + */ + private final String blobName; + + /** + * Gets. + * + * @return the blobName value. + */ + public String getBlobName() { + return this.blobName; + } + + /** + * The HTTP pipeline to send requests through. + */ + private final HttpPipeline httpPipeline; + + /** + * Gets The HTTP pipeline to send requests through. + * + * @return the httpPipeline value. + */ + public HttpPipeline getHttpPipeline() { + return this.httpPipeline; + } + + /** + * The serializer to serialize an object into a string. + */ + private final SerializerAdapter serializerAdapter; + + /** + * Gets The serializer to serialize an object into a string. + * + * @return the serializerAdapter value. + */ + public SerializerAdapter getSerializerAdapter() { + return this.serializerAdapter; + } + + /** + * Initializes an instance of IndividuallyParentNestedWithParamAliasClient client. + * + * @param endpoint Service host. + * @param blobName + */ + public IndividuallyParentNestedWithParamAliasClientImpl(String endpoint, String blobName) { + this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), + JacksonAdapter.createDefaultSerializerAdapter(), endpoint, blobName); + } + + /** + * Initializes an instance of IndividuallyParentNestedWithParamAliasClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param endpoint Service host. + * @param blobName + */ + public IndividuallyParentNestedWithParamAliasClientImpl(HttpPipeline httpPipeline, String endpoint, + String blobName) { + this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, blobName); + } + + /** + * Initializes an instance of IndividuallyParentNestedWithParamAliasClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param serializerAdapter The serializer to serialize an object into a string. + * @param endpoint Service host. + * @param blobName + */ + public IndividuallyParentNestedWithParamAliasClientImpl(HttpPipeline httpPipeline, + SerializerAdapter serializerAdapter, String endpoint, String blobName) { + this.httpPipeline = httpPipeline; + this.serializerAdapter = serializerAdapter; + this.endpoint = endpoint; + this.blobName = blobName; + this.service = RestProxy.create(IndividuallyParentNestedWithParamAliasClientService.class, this.httpPipeline, + this.getSerializerAdapter()); + } + + /** + * The interface defining all the services for IndividuallyParentNestedWithParamAliasClient to be used by the proxy + * service to perform REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "IndividuallyParentNestedWithParamAliasClient") + public interface IndividuallyParentNestedWithParamAliasClientService { + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-param-alias/{blob}/with-aliased-name") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withAliasedName(@HostParam("endpoint") String endpoint, @PathParam("blob") String blobName, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-param-alias/{blob}/with-aliased-name") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withAliasedNameSync(@HostParam("endpoint") String endpoint, @PathParam("blob") String blobName, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-param-alias/{blobName}/with-original-name") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withOriginalName(@HostParam("endpoint") String endpoint, + @PathParam("blobName") String blobName, RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-param-alias/{blobName}/with-original-name") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withOriginalNameSync(@HostParam("endpoint") String endpoint, + @PathParam("blobName") String blobName, RequestOptions requestOptions, Context context); + } + + /** + * The withAliasedName operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withAliasedNameWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.withAliasedName(this.getEndpoint(), this.getBlobName(), requestOptions, context)); + } + + /** + * The withAliasedName operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withAliasedNameWithResponse(RequestOptions requestOptions) { + return service.withAliasedNameSync(this.getEndpoint(), this.getBlobName(), requestOptions, Context.NONE); + } + + /** + * The withOriginalName operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withOriginalNameWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.withOriginalName(this.getEndpoint(), this.getBlobName(), requestOptions, context)); + } + + /** + * The withOriginalName operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withOriginalNameWithResponse(RequestOptions requestOptions) { + return service.withOriginalNameSync(this.getEndpoint(), this.getBlobName(), requestOptions, Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java new file mode 100644 index 00000000000..15231ef67c0 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java @@ -0,0 +1,336 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; + +import com.azure.core.annotation.Delete; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.Get; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.PathParam; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.BinaryData; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import com.azure.core.util.serializer.JacksonAdapter; +import com.azure.core.util.serializer.SerializerAdapter; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the IndividuallyParentNestedWithPathClient type. + */ +public final class IndividuallyParentNestedWithPathClientImpl { + /** + * The proxy service used to perform REST calls. + */ + private final IndividuallyParentNestedWithPathClientService service; + + /** + * Service host. + */ + private final String endpoint; + + /** + * Gets Service host. + * + * @return the endpoint value. + */ + public String getEndpoint() { + return this.endpoint; + } + + /** + */ + private final String blobName; + + /** + * Gets. + * + * @return the blobName value. + */ + public String getBlobName() { + return this.blobName; + } + + /** + * The HTTP pipeline to send requests through. + */ + private final HttpPipeline httpPipeline; + + /** + * Gets The HTTP pipeline to send requests through. + * + * @return the httpPipeline value. + */ + public HttpPipeline getHttpPipeline() { + return this.httpPipeline; + } + + /** + * The serializer to serialize an object into a string. + */ + private final SerializerAdapter serializerAdapter; + + /** + * Gets The serializer to serialize an object into a string. + * + * @return the serializerAdapter value. + */ + public SerializerAdapter getSerializerAdapter() { + return this.serializerAdapter; + } + + /** + * Initializes an instance of IndividuallyParentNestedWithPathClient client. + * + * @param endpoint Service host. + * @param blobName + */ + public IndividuallyParentNestedWithPathClientImpl(String endpoint, String blobName) { + this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), + JacksonAdapter.createDefaultSerializerAdapter(), endpoint, blobName); + } + + /** + * Initializes an instance of IndividuallyParentNestedWithPathClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param endpoint Service host. + * @param blobName + */ + public IndividuallyParentNestedWithPathClientImpl(HttpPipeline httpPipeline, String endpoint, String blobName) { + this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, blobName); + } + + /** + * Initializes an instance of IndividuallyParentNestedWithPathClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param serializerAdapter The serializer to serialize an object into a string. + * @param endpoint Service host. + * @param blobName + */ + public IndividuallyParentNestedWithPathClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, + String endpoint, String blobName) { + this.httpPipeline = httpPipeline; + this.serializerAdapter = serializerAdapter; + this.endpoint = endpoint; + this.blobName = blobName; + this.service = RestProxy.create(IndividuallyParentNestedWithPathClientService.class, this.httpPipeline, + this.getSerializerAdapter()); + } + + /** + * The interface defining all the services for IndividuallyParentNestedWithPathClient to be used by the proxy + * service to perform REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "IndividuallyParentNestedWithPathClient") + public interface IndividuallyParentNestedWithPathClientService { + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent/{blobName}/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withQuery(@HostParam("endpoint") String endpoint, @PathParam("blobName") String blobName, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent/{blobName}/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withQuerySync(@HostParam("endpoint") String endpoint, @PathParam("blobName") String blobName, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent/{blobName}/get-standalone") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> getStandalone(@HostParam("endpoint") String endpoint, + @PathParam("blobName") String blobName, @HeaderParam("Accept") String accept, RequestOptions requestOptions, + Context context); + + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent/{blobName}/get-standalone") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getStandaloneSync(@HostParam("endpoint") String endpoint, + @PathParam("blobName") String blobName, @HeaderParam("Accept") String accept, RequestOptions requestOptions, + Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent/{blobName}") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteStandalone(@HostParam("endpoint") String endpoint, + @PathParam("blobName") String blobName, RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent/{blobName}") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteStandaloneSync(@HostParam("endpoint") String endpoint, + @PathParam("blobName") String blobName, RequestOptions requestOptions, Context context); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil + .withContext(context -> service.withQuery(this.getEndpoint(), this.getBlobName(), requestOptions, context)); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(RequestOptions requestOptions) { + return service.withQuerySync(this.getEndpoint(), this.getBlobName(), requestOptions, Context.NONE); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponseAsync(RequestOptions requestOptions) { + final String accept = "application/json"; + return FluxUtil.withContext( + context -> service.getStandalone(this.getEndpoint(), this.getBlobName(), accept, requestOptions, context)); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(RequestOptions requestOptions) { + final String accept = "application/json"; + return service.getStandaloneSync(this.getEndpoint(), this.getBlobName(), accept, requestOptions, Context.NONE); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.deleteStandalone(this.getEndpoint(), this.getBlobName(), requestOptions, context)); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { + return service.deleteStandaloneSync(this.getEndpoint(), this.getBlobName(), requestOptions, Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java new file mode 100644 index 00000000000..402c7697d73 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java @@ -0,0 +1,336 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; + +import com.azure.core.annotation.Delete; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.Get; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.QueryParam; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.BinaryData; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import com.azure.core.util.serializer.JacksonAdapter; +import com.azure.core.util.serializer.SerializerAdapter; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the IndividuallyParentNestedWithQueryClient type. + */ +public final class IndividuallyParentNestedWithQueryClientImpl { + /** + * The proxy service used to perform REST calls. + */ + private final IndividuallyParentNestedWithQueryClientService service; + + /** + * Service host. + */ + private final String endpoint; + + /** + * Gets Service host. + * + * @return the endpoint value. + */ + public String getEndpoint() { + return this.endpoint; + } + + /** + */ + private final String blobName; + + /** + * Gets. + * + * @return the blobName value. + */ + public String getBlobName() { + return this.blobName; + } + + /** + * The HTTP pipeline to send requests through. + */ + private final HttpPipeline httpPipeline; + + /** + * Gets The HTTP pipeline to send requests through. + * + * @return the httpPipeline value. + */ + public HttpPipeline getHttpPipeline() { + return this.httpPipeline; + } + + /** + * The serializer to serialize an object into a string. + */ + private final SerializerAdapter serializerAdapter; + + /** + * Gets The serializer to serialize an object into a string. + * + * @return the serializerAdapter value. + */ + public SerializerAdapter getSerializerAdapter() { + return this.serializerAdapter; + } + + /** + * Initializes an instance of IndividuallyParentNestedWithQueryClient client. + * + * @param endpoint Service host. + * @param blobName + */ + public IndividuallyParentNestedWithQueryClientImpl(String endpoint, String blobName) { + this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), + JacksonAdapter.createDefaultSerializerAdapter(), endpoint, blobName); + } + + /** + * Initializes an instance of IndividuallyParentNestedWithQueryClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param endpoint Service host. + * @param blobName + */ + public IndividuallyParentNestedWithQueryClientImpl(HttpPipeline httpPipeline, String endpoint, String blobName) { + this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, blobName); + } + + /** + * Initializes an instance of IndividuallyParentNestedWithQueryClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param serializerAdapter The serializer to serialize an object into a string. + * @param endpoint Service host. + * @param blobName + */ + public IndividuallyParentNestedWithQueryClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, + String endpoint, String blobName) { + this.httpPipeline = httpPipeline; + this.serializerAdapter = serializerAdapter; + this.endpoint = endpoint; + this.blobName = blobName; + this.service = RestProxy.create(IndividuallyParentNestedWithQueryClientService.class, this.httpPipeline, + this.getSerializerAdapter()); + } + + /** + * The interface defining all the services for IndividuallyParentNestedWithQueryClient to be used by the proxy + * service to perform REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "IndividuallyParentNestedWithQueryClient") + public interface IndividuallyParentNestedWithQueryClientService { + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-query/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withQuery(@HostParam("endpoint") String endpoint, @QueryParam("blobName") String blobName, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-query/with-query") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withQuerySync(@HostParam("endpoint") String endpoint, @QueryParam("blobName") String blobName, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-query/get-standalone") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> getStandalone(@HostParam("endpoint") String endpoint, + @QueryParam("blobName") String blobName, @HeaderParam("Accept") String accept, + RequestOptions requestOptions, Context context); + + @Get("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-query/get-standalone") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getStandaloneSync(@HostParam("endpoint") String endpoint, + @QueryParam("blobName") String blobName, @HeaderParam("Accept") String accept, + RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-query/delete-resource") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteStandalone(@HostParam("endpoint") String endpoint, + @QueryParam("blobName") String blobName, RequestOptions requestOptions, Context context); + + @Delete("/azure/client-generator-core/client-initialization/individually-parent/nested-default-individually-parent-query/delete-resource") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteStandaloneSync(@HostParam("endpoint") String endpoint, + @QueryParam("blobName") String blobName, RequestOptions requestOptions, Context context); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> withQueryWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil + .withContext(context -> service.withQuery(this.getEndpoint(), this.getBlobName(), requestOptions, context)); + } + + /** + * The withQuery operation. + *

Query Parameters

+ * + * + * + * + *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
+ * You can add these to a request with {@link RequestOptions#addQueryParam} + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response withQueryWithResponse(RequestOptions requestOptions) { + return service.withQuerySync(this.getEndpoint(), this.getBlobName(), requestOptions, Context.NONE); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getStandaloneWithResponseAsync(RequestOptions requestOptions) { + final String accept = "application/json"; + return FluxUtil.withContext( + context -> service.getStandalone(this.getEndpoint(), this.getBlobName(), accept, requestOptions, context)); + } + + /** + * The getStandalone operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     size: long (Required)
+     *     contentType: String (Required)
+     *     createdOn: OffsetDateTime (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return properties of a blob along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getStandaloneWithResponse(RequestOptions requestOptions) { + final String accept = "application/json"; + return service.getStandaloneSync(this.getEndpoint(), this.getBlobName(), accept, requestOptions, Context.NONE); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteStandaloneWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.deleteStandalone(this.getEndpoint(), this.getBlobName(), requestOptions, context)); + } + + /** + * The deleteStandalone operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { + return service.deleteStandaloneSync(this.getEndpoint(), this.getBlobName(), requestOptions, Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/package-info.java new file mode 100644 index 00000000000..33101bf5789 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/package-info.java @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the implementations for IndividuallyParentClient. + * Test for client initialization decorator - moving parameters from method to client level. + * + */ +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/BlobProperties.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/BlobProperties.java new file mode 100644 index 00000000000..a63457c7983 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/BlobProperties.java @@ -0,0 +1,154 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.core.util.CoreUtils; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; + +/** + * Properties of a blob. + */ +@Immutable +public final class BlobProperties implements JsonSerializable { + /* + * The name property. + */ + @Generated + private final String name; + + /* + * The size property. + */ + @Generated + private final long size; + + /* + * The contentType property. + */ + @Generated + private final String contentType; + + /* + * The createdOn property. + */ + @Generated + private final OffsetDateTime createdOn; + + /** + * Creates an instance of BlobProperties class. + * + * @param name the name value to set. + * @param size the size value to set. + * @param contentType the contentType value to set. + * @param createdOn the createdOn value to set. + */ + @Generated + private BlobProperties(String name, long size, String contentType, OffsetDateTime createdOn) { + this.name = name; + this.size = size; + this.contentType = contentType; + this.createdOn = createdOn; + } + + /** + * Get the name property: The name property. + * + * @return the name value. + */ + @Generated + public String getName() { + return this.name; + } + + /** + * Get the size property: The size property. + * + * @return the size value. + */ + @Generated + public long getSize() { + return this.size; + } + + /** + * Get the contentType property: The contentType property. + * + * @return the contentType value. + */ + @Generated + public String getContentType() { + return this.contentType; + } + + /** + * Get the createdOn property: The createdOn property. + * + * @return the createdOn value. + */ + @Generated + public OffsetDateTime getCreatedOn() { + return this.createdOn; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("name", this.name); + jsonWriter.writeLongField("size", this.size); + jsonWriter.writeStringField("contentType", this.contentType); + jsonWriter.writeStringField("createdOn", + this.createdOn == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.createdOn)); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of BlobProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of BlobProperties if the JsonReader was pointing to an instance of it, or null if it was + * pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the BlobProperties. + */ + @Generated + public static BlobProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + String name = null; + long size = 0L; + String contentType = null; + OffsetDateTime createdOn = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("name".equals(fieldName)) { + name = reader.getString(); + } else if ("size".equals(fieldName)) { + size = reader.getLong(); + } else if ("contentType".equals(fieldName)) { + contentType = reader.getString(); + } else if ("createdOn".equals(fieldName)) { + createdOn = reader + .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + } else { + reader.skipChildren(); + } + } + return new BlobProperties(name, size, contentType, createdOn); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/package-info.java new file mode 100644 index 00000000000..2c1566b44f6 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/package-info.java @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the data models for IndividuallyParentClient. + * Test for client initialization decorator - moving parameters from method to client level. + * + */ +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.models; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/package-info.java new file mode 100644 index 00000000000..1009faef5bd --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/package-info.java @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the classes for IndividuallyParentClient. + * Test for client initialization decorator - moving parameters from method to client level. + * + */ +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/models/BlobProperties.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/models/BlobProperties.java deleted file mode 100644 index 06b73553c8d..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/models/BlobProperties.java +++ /dev/null @@ -1,154 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.clientgenerator.core.clientinitialization.models; - -import com.azure.core.annotation.Generated; -import com.azure.core.annotation.Immutable; -import com.azure.core.util.CoreUtils; -import com.azure.json.JsonReader; -import com.azure.json.JsonSerializable; -import com.azure.json.JsonToken; -import com.azure.json.JsonWriter; -import java.io.IOException; -import java.time.OffsetDateTime; -import java.time.format.DateTimeFormatter; - -/** - * Properties of a blob. - */ -@Immutable -public final class BlobProperties implements JsonSerializable { - /* - * The name property. - */ - @Generated - private final String name; - - /* - * The size property. - */ - @Generated - private final long size; - - /* - * The contentType property. - */ - @Generated - private final String contentType; - - /* - * The createdOn property. - */ - @Generated - private final OffsetDateTime createdOn; - - /** - * Creates an instance of BlobProperties class. - * - * @param name the name value to set. - * @param size the size value to set. - * @param contentType the contentType value to set. - * @param createdOn the createdOn value to set. - */ - @Generated - private BlobProperties(String name, long size, String contentType, OffsetDateTime createdOn) { - this.name = name; - this.size = size; - this.contentType = contentType; - this.createdOn = createdOn; - } - - /** - * Get the name property: The name property. - * - * @return the name value. - */ - @Generated - public String getName() { - return this.name; - } - - /** - * Get the size property: The size property. - * - * @return the size value. - */ - @Generated - public long getSize() { - return this.size; - } - - /** - * Get the contentType property: The contentType property. - * - * @return the contentType value. - */ - @Generated - public String getContentType() { - return this.contentType; - } - - /** - * Get the createdOn property: The createdOn property. - * - * @return the createdOn value. - */ - @Generated - public OffsetDateTime getCreatedOn() { - return this.createdOn; - } - - /** - * {@inheritDoc} - */ - @Generated - @Override - public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { - jsonWriter.writeStartObject(); - jsonWriter.writeStringField("name", this.name); - jsonWriter.writeLongField("size", this.size); - jsonWriter.writeStringField("contentType", this.contentType); - jsonWriter.writeStringField("createdOn", - this.createdOn == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.createdOn)); - return jsonWriter.writeEndObject(); - } - - /** - * Reads an instance of BlobProperties from the JsonReader. - * - * @param jsonReader The JsonReader being read. - * @return An instance of BlobProperties if the JsonReader was pointing to an instance of it, or null if it was - * pointing to JSON null. - * @throws IllegalStateException If the deserialized JSON object was missing any required properties. - * @throws IOException If an error occurs while reading the BlobProperties. - */ - @Generated - public static BlobProperties fromJson(JsonReader jsonReader) throws IOException { - return jsonReader.readObject(reader -> { - String name = null; - long size = 0L; - String contentType = null; - OffsetDateTime createdOn = null; - while (reader.nextToken() != JsonToken.END_OBJECT) { - String fieldName = reader.getFieldName(); - reader.nextToken(); - - if ("name".equals(fieldName)) { - name = reader.getString(); - } else if ("size".equals(fieldName)) { - size = reader.getLong(); - } else if ("contentType".equals(fieldName)) { - contentType = reader.getString(); - } else if ("createdOn".equals(fieldName)) { - createdOn = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else { - reader.skipChildren(); - } - } - return new BlobProperties(name, size, contentType, createdOn); - }); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/models/package-info.java deleted file mode 100644 index c2c747b3cf2..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/models/package-info.java +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -/** - * - * Package containing the data models for Service. - * Test for client initialization decorator - moving parameters from method to client level. - * - */ -package azure.clientgenerator.core.clientinitialization.models; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/package-info.java deleted file mode 100644 index daa49ebd2d7..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/package-info.java +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -/** - * - * Package containing the classes for Service. - * Test for client initialization decorator - moving parameters from method to client level. - * - */ -package azure.clientgenerator.core.clientinitialization; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ChildAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ChildAsyncClient.java deleted file mode 100644 index 9c7040e5860..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ChildAsyncClient.java +++ /dev/null @@ -1,185 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.clientgenerator.core.clientinitialization.parentclient; - -import azure.clientgenerator.core.clientinitialization.implementation.ChildClientImpl; -import azure.clientgenerator.core.clientinitialization.models.BlobProperties; -import com.azure.core.annotation.Generated; -import com.azure.core.annotation.ReturnType; -import com.azure.core.annotation.ServiceClient; -import com.azure.core.annotation.ServiceMethod; -import com.azure.core.exception.ClientAuthenticationException; -import com.azure.core.exception.HttpResponseException; -import com.azure.core.exception.ResourceModifiedException; -import com.azure.core.exception.ResourceNotFoundException; -import com.azure.core.http.rest.RequestOptions; -import com.azure.core.http.rest.Response; -import com.azure.core.util.BinaryData; -import com.azure.core.util.FluxUtil; -import reactor.core.publisher.Mono; - -/** - * Initializes a new instance of the asynchronous ChildClient type. - */ -@ServiceClient(builder = ChildClientBuilder.class, isAsync = true) -public final class ChildAsyncClient { - @Generated - private final ChildClientImpl serviceClient; - - /** - * Initializes an instance of ChildAsyncClient class. - * - * @param serviceClient the service client implementation. - */ - @Generated - ChildAsyncClient(ChildClientImpl serviceClient) { - this.serviceClient = serviceClient; - } - - /** - * The withQuery operation. - *

Query Parameters

- * - * - * - * - *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
- * You can add these to a request with {@link RequestOptions#addQueryParam} - * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response} on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> withQueryWithResponse(RequestOptions requestOptions) { - return this.serviceClient.withQueryWithResponseAsync(requestOptions); - } - - /** - * The getStandalone operation. - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     size: long (Required)
-     *     contentType: String (Required)
-     *     createdOn: OffsetDateTime (Required)
-     * }
-     * }
-     *
- * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return properties of a blob along with {@link Response} on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getStandaloneWithResponse(RequestOptions requestOptions) { - return this.serviceClient.getStandaloneWithResponseAsync(requestOptions); - } - - /** - * The deleteStandalone operation. - * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response} on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> deleteStandaloneWithResponse(RequestOptions requestOptions) { - return this.serviceClient.deleteStandaloneWithResponseAsync(requestOptions); - } - - /** - * The withQuery operation. - * - * @param format The format parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return A {@link Mono} that completes when a successful response is received. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono withQuery(String format) { - // Generated convenience method for withQueryWithResponse - RequestOptions requestOptions = new RequestOptions(); - if (format != null) { - requestOptions.addQueryParam("format", format, false); - } - return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); - } - - /** - * The withQuery operation. - * - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return A {@link Mono} that completes when a successful response is received. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono withQuery() { - // Generated convenience method for withQueryWithResponse - RequestOptions requestOptions = new RequestOptions(); - return withQueryWithResponse(requestOptions).flatMap(FluxUtil::toMono); - } - - /** - * The getStandalone operation. - * - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return properties of a blob on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono getStandalone() { - // Generated convenience method for getStandaloneWithResponse - RequestOptions requestOptions = new RequestOptions(); - return getStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono) - .map(protocolMethodData -> protocolMethodData.toObject(BlobProperties.class)); - } - - /** - * The deleteStandalone operation. - * - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return A {@link Mono} that completes when a successful response is received. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono deleteStandalone() { - // Generated convenience method for deleteStandaloneWithResponse - RequestOptions requestOptions = new RequestOptions(); - return deleteStandaloneWithResponse(requestOptions).flatMap(FluxUtil::toMono); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ChildClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ChildClient.java deleted file mode 100644 index 305cf7f8fc1..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ChildClient.java +++ /dev/null @@ -1,179 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.clientgenerator.core.clientinitialization.parentclient; - -import azure.clientgenerator.core.clientinitialization.implementation.ChildClientImpl; -import azure.clientgenerator.core.clientinitialization.models.BlobProperties; -import com.azure.core.annotation.Generated; -import com.azure.core.annotation.ReturnType; -import com.azure.core.annotation.ServiceClient; -import com.azure.core.annotation.ServiceMethod; -import com.azure.core.exception.ClientAuthenticationException; -import com.azure.core.exception.HttpResponseException; -import com.azure.core.exception.ResourceModifiedException; -import com.azure.core.exception.ResourceNotFoundException; -import com.azure.core.http.rest.RequestOptions; -import com.azure.core.http.rest.Response; -import com.azure.core.util.BinaryData; - -/** - * Initializes a new instance of the synchronous ChildClient type. - */ -@ServiceClient(builder = ChildClientBuilder.class) -public final class ChildClient { - @Generated - private final ChildClientImpl serviceClient; - - /** - * Initializes an instance of ChildClient class. - * - * @param serviceClient the service client implementation. - */ - @Generated - ChildClient(ChildClientImpl serviceClient) { - this.serviceClient = serviceClient; - } - - /** - * The withQuery operation. - *

Query Parameters

- * - * - * - * - *
Query Parameters
NameTypeRequiredDescription
formatStringNoThe format parameter
- * You can add these to a request with {@link RequestOptions#addQueryParam} - * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Response withQueryWithResponse(RequestOptions requestOptions) { - return this.serviceClient.withQueryWithResponse(requestOptions); - } - - /** - * The getStandalone operation. - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     size: long (Required)
-     *     contentType: String (Required)
-     *     createdOn: OffsetDateTime (Required)
-     * }
-     * }
-     *
- * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return properties of a blob along with {@link Response}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Response getStandaloneWithResponse(RequestOptions requestOptions) { - return this.serviceClient.getStandaloneWithResponse(requestOptions); - } - - /** - * The deleteStandalone operation. - * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Response deleteStandaloneWithResponse(RequestOptions requestOptions) { - return this.serviceClient.deleteStandaloneWithResponse(requestOptions); - } - - /** - * The withQuery operation. - * - * @param format The format parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public void withQuery(String format) { - // Generated convenience method for withQueryWithResponse - RequestOptions requestOptions = new RequestOptions(); - if (format != null) { - requestOptions.addQueryParam("format", format, false); - } - withQueryWithResponse(requestOptions).getValue(); - } - - /** - * The withQuery operation. - * - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public void withQuery() { - // Generated convenience method for withQueryWithResponse - RequestOptions requestOptions = new RequestOptions(); - withQueryWithResponse(requestOptions).getValue(); - } - - /** - * The getStandalone operation. - * - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return properties of a blob. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public BlobProperties getStandalone() { - // Generated convenience method for getStandaloneWithResponse - RequestOptions requestOptions = new RequestOptions(); - return getStandaloneWithResponse(requestOptions).getValue().toObject(BlobProperties.class); - } - - /** - * The deleteStandalone operation. - * - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public void deleteStandalone() { - // Generated convenience method for deleteStandaloneWithResponse - RequestOptions requestOptions = new RequestOptions(); - deleteStandaloneWithResponse(requestOptions).getValue(); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ChildClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ChildClientBuilder.java deleted file mode 100644 index 17c2d148691..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ChildClientBuilder.java +++ /dev/null @@ -1,307 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.clientgenerator.core.clientinitialization.parentclient; - -import azure.clientgenerator.core.clientinitialization.implementation.ChildClientImpl; -import com.azure.core.annotation.Generated; -import com.azure.core.annotation.ServiceClientBuilder; -import com.azure.core.client.traits.ConfigurationTrait; -import com.azure.core.client.traits.EndpointTrait; -import com.azure.core.client.traits.HttpTrait; -import com.azure.core.http.HttpClient; -import com.azure.core.http.HttpHeaders; -import com.azure.core.http.HttpPipeline; -import com.azure.core.http.HttpPipelineBuilder; -import com.azure.core.http.HttpPipelinePosition; -import com.azure.core.http.policy.AddDatePolicy; -import com.azure.core.http.policy.AddHeadersFromContextPolicy; -import com.azure.core.http.policy.AddHeadersPolicy; -import com.azure.core.http.policy.HttpLogOptions; -import com.azure.core.http.policy.HttpLoggingPolicy; -import com.azure.core.http.policy.HttpPipelinePolicy; -import com.azure.core.http.policy.HttpPolicyProviders; -import com.azure.core.http.policy.RequestIdPolicy; -import com.azure.core.http.policy.RetryOptions; -import com.azure.core.http.policy.RetryPolicy; -import com.azure.core.http.policy.UserAgentPolicy; -import com.azure.core.util.ClientOptions; -import com.azure.core.util.Configuration; -import com.azure.core.util.CoreUtils; -import com.azure.core.util.builder.ClientBuilderUtil; -import com.azure.core.util.logging.ClientLogger; -import com.azure.core.util.serializer.JacksonAdapter; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * A builder for creating a new instance of the ChildClient type. - */ -@ServiceClientBuilder(serviceClients = { ChildClient.class, ChildAsyncClient.class }) -public final class ChildClientBuilder implements HttpTrait, ConfigurationTrait, - EndpointTrait { - @Generated - private static final String SDK_NAME = "name"; - - @Generated - private static final String SDK_VERSION = "version"; - - @Generated - private static final Map PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization.properties"); - - @Generated - private final List pipelinePolicies; - - /** - * Create an instance of the ChildClientBuilder. - */ - @Generated - public ChildClientBuilder() { - this.pipelinePolicies = new ArrayList<>(); - } - - /* - * The HTTP client used to send the request. - */ - @Generated - private HttpClient httpClient; - - /** - * {@inheritDoc}. - */ - @Generated - @Override - public ChildClientBuilder httpClient(HttpClient httpClient) { - this.httpClient = httpClient; - return this; - } - - /* - * The HTTP pipeline to send requests through. - */ - @Generated - private HttpPipeline pipeline; - - /** - * {@inheritDoc}. - */ - @Generated - @Override - public ChildClientBuilder pipeline(HttpPipeline pipeline) { - if (this.pipeline != null && pipeline == null) { - LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured."); - } - this.pipeline = pipeline; - return this; - } - - /* - * The logging configuration for HTTP requests and responses. - */ - @Generated - private HttpLogOptions httpLogOptions; - - /** - * {@inheritDoc}. - */ - @Generated - @Override - public ChildClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) { - this.httpLogOptions = httpLogOptions; - return this; - } - - /* - * The client options such as application ID and custom headers to set on a request. - */ - @Generated - private ClientOptions clientOptions; - - /** - * {@inheritDoc}. - */ - @Generated - @Override - public ChildClientBuilder clientOptions(ClientOptions clientOptions) { - this.clientOptions = clientOptions; - return this; - } - - /* - * The retry options to configure retry policy for failed requests. - */ - @Generated - private RetryOptions retryOptions; - - /** - * {@inheritDoc}. - */ - @Generated - @Override - public ChildClientBuilder retryOptions(RetryOptions retryOptions) { - this.retryOptions = retryOptions; - return this; - } - - /** - * {@inheritDoc}. - */ - @Generated - @Override - public ChildClientBuilder addPolicy(HttpPipelinePolicy customPolicy) { - Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); - pipelinePolicies.add(customPolicy); - return this; - } - - /* - * The configuration store that is used during construction of the service client. - */ - @Generated - private Configuration configuration; - - /** - * {@inheritDoc}. - */ - @Generated - @Override - public ChildClientBuilder configuration(Configuration configuration) { - this.configuration = configuration; - return this; - } - - /* - * The service endpoint - */ - @Generated - private String endpoint; - - /** - * {@inheritDoc}. - */ - @Generated - @Override - public ChildClientBuilder endpoint(String endpoint) { - this.endpoint = endpoint; - return this; - } - - /* - * - */ - @Generated - private String blobName; - - /** - * Sets. - * - * @param blobName the blobName value. - * @return the ChildClientBuilder. - */ - @Generated - public ChildClientBuilder blobName(String blobName) { - this.blobName = blobName; - return this; - } - - /* - * The retry policy that will attempt to retry failed requests, if applicable. - */ - @Generated - private RetryPolicy retryPolicy; - - /** - * Sets The retry policy that will attempt to retry failed requests, if applicable. - * - * @param retryPolicy the retryPolicy value. - * @return the ChildClientBuilder. - */ - @Generated - public ChildClientBuilder retryPolicy(RetryPolicy retryPolicy) { - this.retryPolicy = retryPolicy; - return this; - } - - /** - * Builds an instance of ChildClientImpl with the provided parameters. - * - * @return an instance of ChildClientImpl. - */ - @Generated - private ChildClientImpl buildInnerClient() { - this.validateClient(); - HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline(); - String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000"; - ChildClientImpl client = new ChildClientImpl(localPipeline, JacksonAdapter.createDefaultSerializerAdapter(), - localEndpoint, this.blobName); - return client; - } - - @Generated - private void validateClient() { - // This method is invoked from 'buildInnerClient'/'buildClient' method. - // Developer can customize this method, to validate that the necessary conditions are met for the new client. - Objects.requireNonNull(blobName, "'blobName' cannot be null."); - } - - @Generated - private HttpPipeline createHttpPipeline() { - Configuration buildConfiguration - = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; - HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions; - ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions; - List policies = new ArrayList<>(); - String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName"); - String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); - String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions); - policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); - policies.add(new RequestIdPolicy()); - policies.add(new AddHeadersFromContextPolicy()); - HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions); - if (headers != null) { - policies.add(new AddHeadersPolicy(headers)); - } - this.pipelinePolicies.stream() - .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) - .forEach(p -> policies.add(p)); - HttpPolicyProviders.addBeforeRetryPolicies(policies); - policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy())); - policies.add(new AddDatePolicy()); - this.pipelinePolicies.stream() - .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) - .forEach(p -> policies.add(p)); - HttpPolicyProviders.addAfterRetryPolicies(policies); - policies.add(new HttpLoggingPolicy(localHttpLogOptions)); - HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])) - .httpClient(httpClient) - .clientOptions(localClientOptions) - .build(); - return httpPipeline; - } - - /** - * Builds an instance of ChildAsyncClient class. - * - * @return an instance of ChildAsyncClient. - */ - @Generated - public ChildAsyncClient buildAsyncClient() { - return new ChildAsyncClient(buildInnerClient()); - } - - /** - * Builds an instance of ChildClient class. - * - * @return an instance of ChildClient. - */ - @Generated - public ChildClient buildClient() { - return new ChildClient(buildInnerClient()); - } - - private static final ClientLogger LOGGER = new ClientLogger(ChildClientBuilder.class); -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ParentAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ParentAsyncClient.java deleted file mode 100644 index 773affee93b..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ParentAsyncClient.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.clientgenerator.core.clientinitialization.parentclient; - -import azure.clientgenerator.core.clientinitialization.implementation.ParentClientImpl; -import com.azure.core.annotation.Generated; -import com.azure.core.annotation.ServiceClient; - -/** - * Initializes a new instance of the asynchronous ParentClient type. - */ -@ServiceClient(builder = ParentClientBuilder.class, isAsync = true) -public final class ParentAsyncClient { - @Generated - private final ParentClientImpl serviceClient; - - /** - * Initializes an instance of ParentAsyncClient class. - * - * @param serviceClient the service client implementation. - */ - @Generated - ParentAsyncClient(ParentClientImpl serviceClient) { - this.serviceClient = serviceClient; - } - - /** - * Gets an instance of ChildAsyncClient class. - * - * @param blobName The blobName parameter. - * @return an instance of ChildAsyncClient class. - */ - public ChildAsyncClient getChildAsyncClient(String blobName) { - return new ChildAsyncClient(serviceClient.getChildClient(blobName)); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ParentClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ParentClient.java deleted file mode 100644 index a0f775904cf..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ParentClient.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.clientgenerator.core.clientinitialization.parentclient; - -import azure.clientgenerator.core.clientinitialization.implementation.ParentClientImpl; -import com.azure.core.annotation.Generated; -import com.azure.core.annotation.ServiceClient; - -/** - * Initializes a new instance of the synchronous ParentClient type. - */ -@ServiceClient(builder = ParentClientBuilder.class) -public final class ParentClient { - @Generated - private final ParentClientImpl serviceClient; - - /** - * Initializes an instance of ParentClient class. - * - * @param serviceClient the service client implementation. - */ - @Generated - ParentClient(ParentClientImpl serviceClient) { - this.serviceClient = serviceClient; - } - - /** - * Gets an instance of ChildClient class. - * - * @param blobName The blobName parameter. - * @return an instance of ChildClient class. - */ - public ChildClient getChildClient(String blobName) { - return new ChildClient(serviceClient.getChildClient(blobName)); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ParentClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ParentClientBuilder.java deleted file mode 100644 index cba227f9fba..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ParentClientBuilder.java +++ /dev/null @@ -1,288 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.clientgenerator.core.clientinitialization.parentclient; - -import azure.clientgenerator.core.clientinitialization.implementation.ParentClientImpl; -import com.azure.core.annotation.Generated; -import com.azure.core.annotation.ServiceClientBuilder; -import com.azure.core.client.traits.ConfigurationTrait; -import com.azure.core.client.traits.EndpointTrait; -import com.azure.core.client.traits.HttpTrait; -import com.azure.core.http.HttpClient; -import com.azure.core.http.HttpHeaders; -import com.azure.core.http.HttpPipeline; -import com.azure.core.http.HttpPipelineBuilder; -import com.azure.core.http.HttpPipelinePosition; -import com.azure.core.http.policy.AddDatePolicy; -import com.azure.core.http.policy.AddHeadersFromContextPolicy; -import com.azure.core.http.policy.AddHeadersPolicy; -import com.azure.core.http.policy.HttpLogOptions; -import com.azure.core.http.policy.HttpLoggingPolicy; -import com.azure.core.http.policy.HttpPipelinePolicy; -import com.azure.core.http.policy.HttpPolicyProviders; -import com.azure.core.http.policy.RequestIdPolicy; -import com.azure.core.http.policy.RetryOptions; -import com.azure.core.http.policy.RetryPolicy; -import com.azure.core.http.policy.UserAgentPolicy; -import com.azure.core.util.ClientOptions; -import com.azure.core.util.Configuration; -import com.azure.core.util.CoreUtils; -import com.azure.core.util.builder.ClientBuilderUtil; -import com.azure.core.util.logging.ClientLogger; -import com.azure.core.util.serializer.JacksonAdapter; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * A builder for creating a new instance of the ParentClient type. - */ -@ServiceClientBuilder(serviceClients = { ParentClient.class, ParentAsyncClient.class }) -public final class ParentClientBuilder implements HttpTrait, - ConfigurationTrait, EndpointTrait { - @Generated - private static final String SDK_NAME = "name"; - - @Generated - private static final String SDK_VERSION = "version"; - - @Generated - private static final Map PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization.properties"); - - @Generated - private final List pipelinePolicies; - - /** - * Create an instance of the ParentClientBuilder. - */ - @Generated - public ParentClientBuilder() { - this.pipelinePolicies = new ArrayList<>(); - } - - /* - * The HTTP client used to send the request. - */ - @Generated - private HttpClient httpClient; - - /** - * {@inheritDoc}. - */ - @Generated - @Override - public ParentClientBuilder httpClient(HttpClient httpClient) { - this.httpClient = httpClient; - return this; - } - - /* - * The HTTP pipeline to send requests through. - */ - @Generated - private HttpPipeline pipeline; - - /** - * {@inheritDoc}. - */ - @Generated - @Override - public ParentClientBuilder pipeline(HttpPipeline pipeline) { - if (this.pipeline != null && pipeline == null) { - LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured."); - } - this.pipeline = pipeline; - return this; - } - - /* - * The logging configuration for HTTP requests and responses. - */ - @Generated - private HttpLogOptions httpLogOptions; - - /** - * {@inheritDoc}. - */ - @Generated - @Override - public ParentClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) { - this.httpLogOptions = httpLogOptions; - return this; - } - - /* - * The client options such as application ID and custom headers to set on a request. - */ - @Generated - private ClientOptions clientOptions; - - /** - * {@inheritDoc}. - */ - @Generated - @Override - public ParentClientBuilder clientOptions(ClientOptions clientOptions) { - this.clientOptions = clientOptions; - return this; - } - - /* - * The retry options to configure retry policy for failed requests. - */ - @Generated - private RetryOptions retryOptions; - - /** - * {@inheritDoc}. - */ - @Generated - @Override - public ParentClientBuilder retryOptions(RetryOptions retryOptions) { - this.retryOptions = retryOptions; - return this; - } - - /** - * {@inheritDoc}. - */ - @Generated - @Override - public ParentClientBuilder addPolicy(HttpPipelinePolicy customPolicy) { - Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); - pipelinePolicies.add(customPolicy); - return this; - } - - /* - * The configuration store that is used during construction of the service client. - */ - @Generated - private Configuration configuration; - - /** - * {@inheritDoc}. - */ - @Generated - @Override - public ParentClientBuilder configuration(Configuration configuration) { - this.configuration = configuration; - return this; - } - - /* - * The service endpoint - */ - @Generated - private String endpoint; - - /** - * {@inheritDoc}. - */ - @Generated - @Override - public ParentClientBuilder endpoint(String endpoint) { - this.endpoint = endpoint; - return this; - } - - /* - * The retry policy that will attempt to retry failed requests, if applicable. - */ - @Generated - private RetryPolicy retryPolicy; - - /** - * Sets The retry policy that will attempt to retry failed requests, if applicable. - * - * @param retryPolicy the retryPolicy value. - * @return the ParentClientBuilder. - */ - @Generated - public ParentClientBuilder retryPolicy(RetryPolicy retryPolicy) { - this.retryPolicy = retryPolicy; - return this; - } - - /** - * Builds an instance of ParentClientImpl with the provided parameters. - * - * @return an instance of ParentClientImpl. - */ - @Generated - private ParentClientImpl buildInnerClient() { - this.validateClient(); - HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline(); - String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000"; - ParentClientImpl client - = new ParentClientImpl(localPipeline, JacksonAdapter.createDefaultSerializerAdapter(), localEndpoint); - return client; - } - - @Generated - private void validateClient() { - // This method is invoked from 'buildInnerClient'/'buildClient' method. - // Developer can customize this method, to validate that the necessary conditions are met for the new client. - } - - @Generated - private HttpPipeline createHttpPipeline() { - Configuration buildConfiguration - = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; - HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions; - ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions; - List policies = new ArrayList<>(); - String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName"); - String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); - String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions); - policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); - policies.add(new RequestIdPolicy()); - policies.add(new AddHeadersFromContextPolicy()); - HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions); - if (headers != null) { - policies.add(new AddHeadersPolicy(headers)); - } - this.pipelinePolicies.stream() - .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) - .forEach(p -> policies.add(p)); - HttpPolicyProviders.addBeforeRetryPolicies(policies); - policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy())); - policies.add(new AddDatePolicy()); - this.pipelinePolicies.stream() - .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) - .forEach(p -> policies.add(p)); - HttpPolicyProviders.addAfterRetryPolicies(policies); - policies.add(new HttpLoggingPolicy(localHttpLogOptions)); - HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])) - .httpClient(httpClient) - .clientOptions(localClientOptions) - .build(); - return httpPipeline; - } - - /** - * Builds an instance of ParentAsyncClient class. - * - * @return an instance of ParentAsyncClient. - */ - @Generated - public ParentAsyncClient buildAsyncClient() { - return new ParentAsyncClient(buildInnerClient()); - } - - /** - * Builds an instance of ParentClient class. - * - * @return an instance of ParentClient. - */ - @Generated - public ParentClient buildClient() { - return new ParentClient(buildInnerClient()); - } - - private static final ClientLogger LOGGER = new ClientLogger(ParentClientBuilder.class); -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/package-info.java deleted file mode 100644 index 2eb62c2e3d9..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/package-info.java +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -/** - * - * Package containing the classes for ChildClient. - * Test for client initialization decorator - moving parameters from method to client level. - * - */ -package azure.clientgenerator.core.clientinitialization.parentclient; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyAsyncClient.java index e4dd5e633de..7170464917f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyAsyncClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyAsyncClient.java @@ -6,7 +6,9 @@ import azure.clientgenerator.core.flattenproperty.implementation.FlattenPropertyClientImpl; import azure.clientgenerator.core.flattenproperty.models.FlattenModel; +import azure.clientgenerator.core.flattenproperty.models.FlattenUnknownModel; import azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel; +import azure.clientgenerator.core.flattenproperty.models.Solution; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; @@ -136,6 +138,94 @@ public Mono> putNestedFlattenModelWithResponse(BinaryData i return this.serviceClient.putNestedFlattenModelWithResponseAsync(input, requestOptions); } + /** + * The putFlattenUnknownModel operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties: BinaryData (Optional)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties: BinaryData (Optional)
+     * }
+     * }
+     *
+ * + * @param input The input parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return this is the model with unknown type properties to be flattened along with {@link Response} on successful + * completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> putFlattenUnknownModelWithResponse(BinaryData input, + RequestOptions requestOptions) { + return this.serviceClient.putFlattenUnknownModelWithResponseAsync(input, requestOptions); + } + + /** + * The putFlattenReadOnlyModel operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties (Optional): {
+     *         solutionId: String (Optional)
+     *         title: String (Optional)
+     *         content: String (Optional)
+     *     }
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties (Optional): {
+     *         solutionId: String (Optional)
+     *         title: String (Optional)
+     *         content: String (Optional)
+     *     }
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return this is the model with flattened properties that are all read-only along with {@link Response} on + * successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> putFlattenReadOnlyModelWithResponse(BinaryData body, + RequestOptions requestOptions) { + return this.serviceClient.putFlattenReadOnlyModelWithResponseAsync(body, requestOptions); + } + /** * The putFlattenModel operation. * @@ -177,4 +267,49 @@ public Mono putNestedFlattenModel(NestedFlattenModel input) return putNestedFlattenModelWithResponse(BinaryData.fromObject(input), requestOptions).flatMap(FluxUtil::toMono) .map(protocolMethodData -> protocolMethodData.toObject(NestedFlattenModel.class)); } + + /** + * The putFlattenUnknownModel operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return this is the model with unknown type properties to be flattened on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono putFlattenUnknownModel(FlattenUnknownModel input) { + // Generated convenience method for putFlattenUnknownModelWithResponse + RequestOptions requestOptions = new RequestOptions(); + return putFlattenUnknownModelWithResponse(BinaryData.fromObject(input), requestOptions) + .flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(FlattenUnknownModel.class)); + } + + /** + * The putFlattenReadOnlyModel operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return this is the model with flattened properties that are all read-only on successful completion of + * {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono putFlattenReadOnlyModel(Solution body) { + // Generated convenience method for putFlattenReadOnlyModelWithResponse + RequestOptions requestOptions = new RequestOptions(); + return putFlattenReadOnlyModelWithResponse(BinaryData.fromObject(body), requestOptions) + .flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(Solution.class)); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClient.java index 6df185bf86f..9188f468a62 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClient.java @@ -6,7 +6,9 @@ import azure.clientgenerator.core.flattenproperty.implementation.FlattenPropertyClientImpl; import azure.clientgenerator.core.flattenproperty.models.FlattenModel; +import azure.clientgenerator.core.flattenproperty.models.FlattenUnknownModel; import azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel; +import azure.clientgenerator.core.flattenproperty.models.Solution; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; @@ -131,6 +133,90 @@ public Response putNestedFlattenModelWithResponse(BinaryData input, return this.serviceClient.putNestedFlattenModelWithResponse(input, requestOptions); } + /** + * The putFlattenUnknownModel operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties: BinaryData (Optional)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties: BinaryData (Optional)
+     * }
+     * }
+     *
+ * + * @param input The input parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return this is the model with unknown type properties to be flattened along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putFlattenUnknownModelWithResponse(BinaryData input, RequestOptions requestOptions) { + return this.serviceClient.putFlattenUnknownModelWithResponse(input, requestOptions); + } + + /** + * The putFlattenReadOnlyModel operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties (Optional): {
+     *         solutionId: String (Optional)
+     *         title: String (Optional)
+     *         content: String (Optional)
+     *     }
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties (Optional): {
+     *         solutionId: String (Optional)
+     *         title: String (Optional)
+     *         content: String (Optional)
+     *     }
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return this is the model with flattened properties that are all read-only along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putFlattenReadOnlyModelWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.putFlattenReadOnlyModelWithResponse(body, requestOptions); + } + /** * The putFlattenModel operation. * @@ -172,4 +258,46 @@ public NestedFlattenModel putNestedFlattenModel(NestedFlattenModel input) { return putNestedFlattenModelWithResponse(BinaryData.fromObject(input), requestOptions).getValue() .toObject(NestedFlattenModel.class); } + + /** + * The putFlattenUnknownModel operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return this is the model with unknown type properties to be flattened. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public FlattenUnknownModel putFlattenUnknownModel(FlattenUnknownModel input) { + // Generated convenience method for putFlattenUnknownModelWithResponse + RequestOptions requestOptions = new RequestOptions(); + return putFlattenUnknownModelWithResponse(BinaryData.fromObject(input), requestOptions).getValue() + .toObject(FlattenUnknownModel.class); + } + + /** + * The putFlattenReadOnlyModel operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return this is the model with flattened properties that are all read-only. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Solution putFlattenReadOnlyModel(Solution body) { + // Generated convenience method for putFlattenReadOnlyModelWithResponse + RequestOptions requestOptions = new RequestOptions(); + return putFlattenReadOnlyModelWithResponse(BinaryData.fromObject(body), requestOptions).getValue() + .toObject(Solution.class); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/implementation/FlattenPropertyClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/implementation/FlattenPropertyClientImpl.java index b15d7fb3eb2..c204dea4b66 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/implementation/FlattenPropertyClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/implementation/FlattenPropertyClientImpl.java @@ -164,6 +164,46 @@ Mono> putNestedFlattenModel(@HostParam("endpoint") String e Response putNestedFlattenModelSync(@HostParam("endpoint") String endpoint, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData input, RequestOptions requestOptions, Context context); + + @Put("/azure/client-generator-core/flatten-property/flattenUnknownModel") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> putFlattenUnknownModel(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData input, RequestOptions requestOptions, Context context); + + @Put("/azure/client-generator-core/flatten-property/flattenUnknownModel") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response putFlattenUnknownModelSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData input, RequestOptions requestOptions, Context context); + + @Put("/azure/client-generator-core/flatten-property/flattenReadOnlyModel") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> putFlattenReadOnlyModel(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Put("/azure/client-generator-core/flatten-property/flattenReadOnlyModel") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response putFlattenReadOnlyModelSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); } /** @@ -365,4 +405,184 @@ public Response putNestedFlattenModelWithResponse(BinaryData input, return service.putNestedFlattenModelSync(this.getEndpoint(), contentType, accept, input, requestOptions, Context.NONE); } + + /** + * The putFlattenUnknownModel operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties: BinaryData (Optional)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties: BinaryData (Optional)
+     * }
+     * }
+     *
+ * + * @param input The input parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return this is the model with unknown type properties to be flattened along with {@link Response} on successful + * completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> putFlattenUnknownModelWithResponseAsync(BinaryData input, + RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.putFlattenUnknownModel(this.getEndpoint(), contentType, accept, + input, requestOptions, context)); + } + + /** + * The putFlattenUnknownModel operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties: BinaryData (Optional)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties: BinaryData (Optional)
+     * }
+     * }
+     *
+ * + * @param input The input parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return this is the model with unknown type properties to be flattened along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putFlattenUnknownModelWithResponse(BinaryData input, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.putFlattenUnknownModelSync(this.getEndpoint(), contentType, accept, input, requestOptions, + Context.NONE); + } + + /** + * The putFlattenReadOnlyModel operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties (Optional): {
+     *         solutionId: String (Optional)
+     *         title: String (Optional)
+     *         content: String (Optional)
+     *     }
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties (Optional): {
+     *         solutionId: String (Optional)
+     *         title: String (Optional)
+     *         content: String (Optional)
+     *     }
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return this is the model with flattened properties that are all read-only along with {@link Response} on + * successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> putFlattenReadOnlyModelWithResponseAsync(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.putFlattenReadOnlyModel(this.getEndpoint(), contentType, accept, + body, requestOptions, context)); + } + + /** + * The putFlattenReadOnlyModel operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties (Optional): {
+     *         solutionId: String (Optional)
+     *         title: String (Optional)
+     *         content: String (Optional)
+     *     }
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties (Optional): {
+     *         solutionId: String (Optional)
+     *         title: String (Optional)
+     *         content: String (Optional)
+     *     }
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return this is the model with flattened properties that are all read-only along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putFlattenReadOnlyModelWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.putFlattenReadOnlyModelSync(this.getEndpoint(), contentType, accept, body, requestOptions, + Context.NONE); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/models/FlattenUnknownModel.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/models/FlattenUnknownModel.java new file mode 100644 index 00000000000..66bd1f48f44 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/models/FlattenUnknownModel.java @@ -0,0 +1,123 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.flattenproperty.models; + +import com.azure.core.annotation.Fluent; +import com.azure.core.annotation.Generated; +import com.azure.core.util.BinaryData; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * This is the model with unknown type properties to be flattened. + */ +@Fluent +public final class FlattenUnknownModel implements JsonSerializable { + /* + * The name property. + */ + @Generated + private final String name; + + /* + * The properties property. + */ + @Generated + private BinaryData properties; + + /** + * Creates an instance of FlattenUnknownModel class. + * + * @param name the name value to set. + */ + @Generated + public FlattenUnknownModel(String name) { + this.name = name; + } + + /** + * Get the name property: The name property. + * + * @return the name value. + */ + @Generated + public String getName() { + return this.name; + } + + /** + * Get the properties property: The properties property. + * + * @return the properties value. + */ + @Generated + public BinaryData getProperties() { + return this.properties; + } + + /** + * Set the properties property: The properties property. + * + * @param properties the properties value to set. + * @return the FlattenUnknownModel object itself. + */ + @Generated + public FlattenUnknownModel setProperties(BinaryData properties) { + this.properties = properties; + return this; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("name", this.name); + if (this.properties != null) { + jsonWriter.writeFieldName("properties"); + this.properties.writeTo(jsonWriter); + } + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of FlattenUnknownModel from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of FlattenUnknownModel if the JsonReader was pointing to an instance of it, or null if it was + * pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the FlattenUnknownModel. + */ + @Generated + public static FlattenUnknownModel fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + String name = null; + BinaryData properties = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("name".equals(fieldName)) { + name = reader.getString(); + } else if ("properties".equals(fieldName)) { + properties + = reader.getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped())); + } else { + reader.skipChildren(); + } + } + FlattenUnknownModel deserializedFlattenUnknownModel = new FlattenUnknownModel(name); + deserializedFlattenUnknownModel.properties = properties; + + return deserializedFlattenUnknownModel; + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/models/Solution.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/models/Solution.java new file mode 100644 index 00000000000..5eda5a1882d --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/models/Solution.java @@ -0,0 +1,118 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.flattenproperty.models; + +import com.azure.core.annotation.Fluent; +import com.azure.core.annotation.Generated; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * This is the model with flattened properties that are all read-only. + */ +@Fluent +public final class Solution implements JsonSerializable { + /* + * The name property. + */ + @Generated + private final String name; + + /* + * The properties property. + */ + @Generated + private SolutionProperties properties; + + /** + * Creates an instance of Solution class. + * + * @param name the name value to set. + */ + @Generated + public Solution(String name) { + this.name = name; + } + + /** + * Get the name property: The name property. + * + * @return the name value. + */ + @Generated + public String getName() { + return this.name; + } + + /** + * Get the properties property: The properties property. + * + * @return the properties value. + */ + @Generated + public SolutionProperties getProperties() { + return this.properties; + } + + /** + * Set the properties property: The properties property. + * + * @param properties the properties value to set. + * @return the Solution object itself. + */ + @Generated + public Solution setProperties(SolutionProperties properties) { + this.properties = properties; + return this; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("name", this.name); + jsonWriter.writeJsonField("properties", this.properties); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of Solution from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of Solution if the JsonReader was pointing to an instance of it, or null if it was pointing + * to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the Solution. + */ + @Generated + public static Solution fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + String name = null; + SolutionProperties properties = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("name".equals(fieldName)) { + name = reader.getString(); + } else if ("properties".equals(fieldName)) { + properties = SolutionProperties.fromJson(reader); + } else { + reader.skipChildren(); + } + } + Solution deserializedSolution = new Solution(name); + deserializedSolution.properties = properties; + + return deserializedSolution; + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/models/SolutionProperties.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/models/SolutionProperties.java new file mode 100644 index 00000000000..d69aa8bacfc --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/models/SolutionProperties.java @@ -0,0 +1,115 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.flattenproperty.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * This is the model with all read-only properties to be flattened. + */ +@Immutable +public final class SolutionProperties implements JsonSerializable { + /* + * The solutionId property. + */ + @Generated + private String solutionId; + + /* + * The title property. + */ + @Generated + private String title; + + /* + * The content property. + */ + @Generated + private String content; + + /** + * Creates an instance of SolutionProperties class. + */ + @Generated + public SolutionProperties() { + } + + /** + * Get the solutionId property: The solutionId property. + * + * @return the solutionId value. + */ + @Generated + public String getSolutionId() { + return this.solutionId; + } + + /** + * Get the title property: The title property. + * + * @return the title value. + */ + @Generated + public String getTitle() { + return this.title; + } + + /** + * Get the content property: The content property. + * + * @return the content value. + */ + @Generated + public String getContent() { + return this.content; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of SolutionProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of SolutionProperties if the JsonReader was pointing to an instance of it, or null if it was + * pointing to JSON null. + * @throws IOException If an error occurs while reading the SolutionProperties. + */ + @Generated + public static SolutionProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + SolutionProperties deserializedSolutionProperties = new SolutionProperties(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("solutionId".equals(fieldName)) { + deserializedSolutionProperties.solutionId = reader.getString(); + } else if ("title".equals(fieldName)) { + deserializedSolutionProperties.title = reader.getString(); + } else if ("content".equals(fieldName)) { + deserializedSolutionProperties.content = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedSolutionProperties; + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/PageAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/PageAsyncClient.java index ccd87439af6..00da9c19a64 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/PageAsyncClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/PageAsyncClient.java @@ -205,6 +205,40 @@ public PagedFlux withParameterizedNextLink(String select, RequestOpt return this.serviceClient.withParameterizedNextLinkAsync(select, requestOptions); } + /** + * List with relative nextLink URL that requires endpoint resolution. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     *     orders (Optional): [
+     *          (Optional){
+     *             id: int (Required)
+     *             userId: int (Required)
+     *             detail: String (Required)
+     *         }
+     *     ]
+     *     etag: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return paged collection of User items as paginated response with {@link PagedFlux}. + */ + @Generated + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedFlux withRelativeNextLink(RequestOptions requestOptions) { + return this.serviceClient.withRelativeNextLinkAsync(requestOptions); + } + /** * List with Azure.Core.Page<>. * @@ -400,4 +434,34 @@ public PagedFlux withParameterizedNextLink(String select) { pagedResponse.getContinuationToken(), null)); }); } + + /** + * List with relative nextLink URL that requires endpoint resolution. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return paged collection of User items as paginated response with {@link PagedFlux}. + */ + @Generated + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedFlux withRelativeNextLink() { + // Generated convenience method for withRelativeNextLink + RequestOptions requestOptions = new RequestOptions(); + PagedFlux pagedFluxResponse = withRelativeNextLink(requestOptions); + return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> { + Flux> flux = (continuationTokenParam == null) + ? pagedFluxResponse.byPage().take(1) + : pagedFluxResponse.byPage(continuationTokenParam).take(1); + return flux.map(pagedResponse -> new PagedResponseBase(pagedResponse.getRequest(), + pagedResponse.getStatusCode(), pagedResponse.getHeaders(), + pagedResponse.getValue() + .stream() + .map(protocolMethodData -> protocolMethodData.toObject(User.class)) + .collect(Collectors.toList()), + pagedResponse.getContinuationToken(), null)); + }); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/PageClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/PageClient.java index d92d2dc4554..788f6272b29 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/PageClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/PageClient.java @@ -201,6 +201,40 @@ public PagedIterable withParameterizedNextLink(String select, Reques return this.serviceClient.withParameterizedNextLink(select, requestOptions); } + /** + * List with relative nextLink URL that requires endpoint resolution. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     *     orders (Optional): [
+     *          (Optional){
+     *             id: int (Required)
+     *             userId: int (Required)
+     *             detail: String (Required)
+     *         }
+     *     ]
+     *     etag: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return paged collection of User items as paginated response with {@link PagedIterable}. + */ + @Generated + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable withRelativeNextLink(RequestOptions requestOptions) { + return this.serviceClient.withRelativeNextLink(requestOptions); + } + /** * List with Azure.Core.Page<>. * @@ -329,4 +363,23 @@ public PagedIterable withParameterizedNextLink(String select) { return serviceClient.withParameterizedNextLink(select, requestOptions) .mapPage(bodyItemValue -> bodyItemValue.toObject(User.class)); } + + /** + * List with relative nextLink URL that requires endpoint resolution. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return paged collection of User items as paginated response with {@link PagedIterable}. + */ + @Generated + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable withRelativeNextLink() { + // Generated convenience method for withRelativeNextLink + RequestOptions requestOptions = new RequestOptions(); + return serviceClient.withRelativeNextLink(requestOptions) + .mapPage(bodyItemValue -> bodyItemValue.toObject(User.class)); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/implementation/PageClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/implementation/PageClientImpl.java index c870206103b..acf44981467 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/implementation/PageClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/implementation/PageClientImpl.java @@ -249,6 +249,24 @@ Response withParameterizedNextLinkSync(@HostParam("endpoint") String @QueryParam("select") String select, @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + @Get("/azure/core/page/with-relative-next-link") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withRelativeNextLink(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/azure/core/page/with-relative-next-link") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withRelativeNextLinkSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + @Get("{nextLink}") @ExpectedResponses({ 200 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @@ -328,6 +346,26 @@ Mono> withParameterizedNextLinkNext( Response withParameterizedNextLinkNextSync( @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("{nextLink}") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withRelativeNextLinkNext( + @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("{nextLink}") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withRelativeNextLinkNextSync( + @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); } /** @@ -1055,6 +1093,154 @@ public PagedIterable withParameterizedNextLink(String select, Reques nextLink -> withParameterizedNextLinkNextSinglePage(nextLink, requestOptionsForNextPage)); } + /** + * List with relative nextLink URL that requires endpoint resolution. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     *     orders (Optional): [
+     *          (Optional){
+     *             id: int (Required)
+     *             userId: int (Required)
+     *             detail: String (Required)
+     *         }
+     *     ]
+     *     etag: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return paged collection of User items along with {@link PagedResponse} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> withRelativeNextLinkSinglePageAsync(RequestOptions requestOptions) { + final String accept = "application/json"; + return FluxUtil + .withContext(context -> service.withRelativeNextLink(this.getEndpoint(), accept, requestOptions, context)) + .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + getValues(res.getValue(), "value"), getNextLink(res.getValue(), "nextLink"), null)); + } + + /** + * List with relative nextLink URL that requires endpoint resolution. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     *     orders (Optional): [
+     *          (Optional){
+     *             id: int (Required)
+     *             userId: int (Required)
+     *             detail: String (Required)
+     *         }
+     *     ]
+     *     etag: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return paged collection of User items as paginated response with {@link PagedFlux}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedFlux withRelativeNextLinkAsync(RequestOptions requestOptions) { + RequestOptions requestOptionsForNextPage = new RequestOptions(); + requestOptionsForNextPage.setContext( + requestOptions != null && requestOptions.getContext() != null ? requestOptions.getContext() : Context.NONE); + return new PagedFlux<>(() -> withRelativeNextLinkSinglePageAsync(requestOptions), + nextLink -> withRelativeNextLinkNextSinglePageAsync(nextLink, requestOptionsForNextPage)); + } + + /** + * List with relative nextLink URL that requires endpoint resolution. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     *     orders (Optional): [
+     *          (Optional){
+     *             id: int (Required)
+     *             userId: int (Required)
+     *             detail: String (Required)
+     *         }
+     *     ]
+     *     etag: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return paged collection of User items along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse withRelativeNextLinkSinglePage(RequestOptions requestOptions) { + final String accept = "application/json"; + Response res + = service.withRelativeNextLinkSync(this.getEndpoint(), accept, requestOptions, Context.NONE); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + getValues(res.getValue(), "value"), getNextLink(res.getValue(), "nextLink"), null); + } + + /** + * List with relative nextLink URL that requires endpoint resolution. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     *     orders (Optional): [
+     *          (Optional){
+     *             id: int (Required)
+     *             userId: int (Required)
+     *             detail: String (Required)
+     *         }
+     *     ]
+     *     etag: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return paged collection of User items as paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable withRelativeNextLink(RequestOptions requestOptions) { + RequestOptions requestOptionsForNextPage = new RequestOptions(); + requestOptionsForNextPage.setContext( + requestOptions != null && requestOptions.getContext() != null ? requestOptions.getContext() : Context.NONE); + return new PagedIterable<>(() -> withRelativeNextLinkSinglePage(requestOptions), + nextLink -> withRelativeNextLinkNextSinglePage(nextLink, requestOptionsForNextPage)); + } + /** * Get the next page of items. *

Response Body Schema

@@ -1368,6 +1554,84 @@ private PagedResponse withParameterizedNextLinkNextSinglePage(String getValues(res.getValue(), "values"), getNextLink(res.getValue(), "nextLink"), null); } + /** + * Get the next page of items. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     *     orders (Optional): [
+     *          (Optional){
+     *             id: int (Required)
+     *             userId: int (Required)
+     *             detail: String (Required)
+     *         }
+     *     ]
+     *     etag: String (Required)
+     * }
+     * }
+     *
+ * + * @param nextLink The URL to get the next list of items. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return paged collection of User items along with {@link PagedResponse} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> withRelativeNextLinkNextSinglePageAsync(String nextLink, + RequestOptions requestOptions) { + final String accept = "application/json"; + return FluxUtil.withContext( + context -> service.withRelativeNextLinkNext(nextLink, this.getEndpoint(), accept, requestOptions, context)) + .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + getValues(res.getValue(), "value"), getNextLink(res.getValue(), "nextLink"), null)); + } + + /** + * Get the next page of items. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     *     orders (Optional): [
+     *          (Optional){
+     *             id: int (Required)
+     *             userId: int (Required)
+     *             detail: String (Required)
+     *         }
+     *     ]
+     *     etag: String (Required)
+     * }
+     * }
+     *
+ * + * @param nextLink The URL to get the next list of items. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return paged collection of User items along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse withRelativeNextLinkNextSinglePage(String nextLink, + RequestOptions requestOptions) { + final String accept = "application/json"; + Response res + = service.withRelativeNextLinkNextSync(nextLink, this.getEndpoint(), accept, requestOptions, Context.NONE); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + getValues(res.getValue(), "value"), getNextLink(res.getValue(), "nextLink"), null); + } + private List getValues(BinaryData binaryData, String path) { try { Map obj = binaryData.toObject(Map.class); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/commonproperties/implementation/ErrorsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/commonproperties/implementation/ErrorsImpl.java index 13fa33d72d8..13e12a887f2 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/commonproperties/implementation/ErrorsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/commonproperties/implementation/ErrorsImpl.java @@ -30,12 +30,8 @@ public Response getByResourceGroupWithResponse(String reso String confidentialResourceName, Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, confidentialResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ConfidentialResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ConfidentialResourceImpl(inner.getValue(), this.manager())); } public ConfidentialResource getByResourceGroup(String resourceGroupName, String confidentialResourceName) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesImpl.java index 9627240bd36..12360ed7a31 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesImpl.java @@ -30,12 +30,8 @@ public Response getByResourceGroupWithResponse(S String managedIdentityTrackedResourceName, Context context) { Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, managedIdentityTrackedResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ManagedIdentityTrackedResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ManagedIdentityTrackedResourceImpl(inner.getValue(), this.manager())); } public ManagedIdentityTrackedResource getByResourceGroup(String resourceGroupName, diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementResourceGroupResourceOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementResourceGroupResourceOperationsImpl.java index e4c7ef18e1c..b66f919f2ca 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementResourceGroupResourceOperationsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementResourceGroupResourceOperationsImpl.java @@ -33,12 +33,8 @@ public Response getByResourceGroupWithResponse(String res String resourceGroupResourceName, Context context) { Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, resourceGroupResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ResourceGroupResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ResourceGroupResourceImpl(inner.getValue(), this.manager())); } public ResourceGroupResource getByResourceGroup(String resourceGroupName, String resourceGroupResourceName) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementSubscriptionResourceOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementSubscriptionResourceOperationsImpl.java index d16d4186aff..d513c4050cc 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementSubscriptionResourceOperationsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementSubscriptionResourceOperationsImpl.java @@ -33,12 +33,8 @@ public Response getWithResponse(String subscriptionId, Str Context context) { Response inner = this.serviceClient().getWithResponse(subscriptionId, subscriptionResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SubscriptionResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SubscriptionResourceImpl(inner.getValue(), this.manager())); } public SubscriptionResource get(String subscriptionId, String subscriptionResourceName) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsImpl.java index 86e2607d924..b69219f1184 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsImpl.java @@ -33,12 +33,8 @@ public Response getWithResponse(String subscriptionId, St Context context) { Response inner = this.serviceClient().getWithResponse(subscriptionId, subscriptionResource1Name, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SubscriptionResource1Impl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SubscriptionResource1Impl(inner.getValue(), this.manager())); } public SubscriptionResource1 get(String subscriptionId, String subscriptionResource1Name) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsImpl.java index 53407392904..17da1f964ec 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsImpl.java @@ -33,12 +33,8 @@ public Response getWithResponse(String subscriptionId, St Context context) { Response inner = this.serviceClient().getWithResponse(subscriptionId, subscriptionResource2Name, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SubscriptionResource2Impl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SubscriptionResource2Impl(inner.getValue(), this.manager())); } public SubscriptionResource2 get(String subscriptionId, String subscriptionResource2Name) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiservice/combined/implementation/DisksImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiservice/combined/implementation/DisksImpl.java index dc239f5146c..9d36143be8b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiservice/combined/implementation/DisksImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiservice/combined/implementation/DisksImpl.java @@ -29,12 +29,8 @@ public DisksImpl(DisksClient innerClient, public Response getByResourceGroupWithResponse(String resourceGroupName, String diskName, Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, diskName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new DiskImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new DiskImpl(inner.getValue(), this.manager())); } public Disk getByResourceGroup(String resourceGroupName, String diskName) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiservice/combined/implementation/VirtualMachinesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiservice/combined/implementation/VirtualMachinesImpl.java index 05f4cd048c2..b8993a4d3af 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiservice/combined/implementation/VirtualMachinesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiservice/combined/implementation/VirtualMachinesImpl.java @@ -30,12 +30,8 @@ public Response getByResourceGroupWithResponse(String resourceGr Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, vmName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new VirtualMachineImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new VirtualMachineImpl(inner.getValue(), this.manager())); } public VirtualMachine getByResourceGroup(String resourceGroupName, String vmName) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/CombinedManager.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/CombinedManager.java deleted file mode 100644 index d24968bd14f..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/CombinedManager.java +++ /dev/null @@ -1,298 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.Combined; -import azure.resourcemanager.multiserviceolderversions.combined.implementation.CombinedBuilder; -import azure.resourcemanager.multiserviceolderversions.combined.implementation.DisksImpl; -import azure.resourcemanager.multiserviceolderversions.combined.implementation.VirtualMachinesImpl; -import azure.resourcemanager.multiserviceolderversions.combined.models.Disks; -import azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachines; -import com.azure.core.credential.TokenCredential; -import com.azure.core.http.HttpClient; -import com.azure.core.http.HttpPipeline; -import com.azure.core.http.HttpPipelineBuilder; -import com.azure.core.http.HttpPipelinePosition; -import com.azure.core.http.policy.AddDatePolicy; -import com.azure.core.http.policy.AddHeadersFromContextPolicy; -import com.azure.core.http.policy.BearerTokenAuthenticationPolicy; -import com.azure.core.http.policy.HttpLogOptions; -import com.azure.core.http.policy.HttpLoggingPolicy; -import com.azure.core.http.policy.HttpPipelinePolicy; -import com.azure.core.http.policy.HttpPolicyProviders; -import com.azure.core.http.policy.RequestIdPolicy; -import com.azure.core.http.policy.RetryOptions; -import com.azure.core.http.policy.RetryPolicy; -import com.azure.core.http.policy.UserAgentPolicy; -import com.azure.core.management.profile.AzureProfile; -import com.azure.core.util.Configuration; -import com.azure.core.util.CoreUtils; -import com.azure.core.util.logging.ClientLogger; -import java.time.Duration; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * Entry point to CombinedManager. - * Compute Client. - */ -public final class CombinedManager { - private VirtualMachines virtualMachines; - - private Disks disks; - - private final Combined clientObject; - - private CombinedManager(HttpPipeline httpPipeline, AzureProfile profile, Duration defaultPollInterval) { - Objects.requireNonNull(httpPipeline, "'httpPipeline' cannot be null."); - Objects.requireNonNull(profile, "'profile' cannot be null."); - this.clientObject = new CombinedBuilder().pipeline(httpPipeline) - .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) - .subscriptionId(profile.getSubscriptionId()) - .defaultPollInterval(defaultPollInterval) - .buildClient(); - } - - /** - * Creates an instance of combined service API entry point. - * - * @param credential the credential to use. - * @param profile the Azure profile for client. - * @return the combined service API instance. - */ - public static CombinedManager authenticate(TokenCredential credential, AzureProfile profile) { - Objects.requireNonNull(credential, "'credential' cannot be null."); - Objects.requireNonNull(profile, "'profile' cannot be null."); - return configure().authenticate(credential, profile); - } - - /** - * Creates an instance of combined service API entry point. - * - * @param httpPipeline the {@link HttpPipeline} configured with Azure authentication credential. - * @param profile the Azure profile for client. - * @return the combined service API instance. - */ - public static CombinedManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - Objects.requireNonNull(httpPipeline, "'httpPipeline' cannot be null."); - Objects.requireNonNull(profile, "'profile' cannot be null."); - return new CombinedManager(httpPipeline, profile, null); - } - - /** - * Gets a Configurable instance that can be used to create CombinedManager with optional configuration. - * - * @return the Configurable instance allowing configurations. - */ - public static Configurable configure() { - return new CombinedManager.Configurable(); - } - - /** - * The Configurable allowing configurations to be set. - */ - public static final class Configurable { - private static final ClientLogger LOGGER = new ClientLogger(Configurable.class); - private static final String SDK_VERSION = "version"; - private static final Map PROPERTIES - = CoreUtils.getProperties("azure-resourcemanager-combined-generated.properties"); - - private HttpClient httpClient; - private HttpLogOptions httpLogOptions; - private final List policies = new ArrayList<>(); - private final List scopes = new ArrayList<>(); - private RetryPolicy retryPolicy; - private RetryOptions retryOptions; - private Duration defaultPollInterval; - - private Configurable() { - } - - /** - * Sets the http client. - * - * @param httpClient the HTTP client. - * @return the configurable object itself. - */ - public Configurable withHttpClient(HttpClient httpClient) { - this.httpClient = Objects.requireNonNull(httpClient, "'httpClient' cannot be null."); - return this; - } - - /** - * Sets the logging options to the HTTP pipeline. - * - * @param httpLogOptions the HTTP log options. - * @return the configurable object itself. - */ - public Configurable withLogOptions(HttpLogOptions httpLogOptions) { - this.httpLogOptions = Objects.requireNonNull(httpLogOptions, "'httpLogOptions' cannot be null."); - return this; - } - - /** - * Adds the pipeline policy to the HTTP pipeline. - * - * @param policy the HTTP pipeline policy. - * @return the configurable object itself. - */ - public Configurable withPolicy(HttpPipelinePolicy policy) { - this.policies.add(Objects.requireNonNull(policy, "'policy' cannot be null.")); - return this; - } - - /** - * Adds the scope to permission sets. - * - * @param scope the scope. - * @return the configurable object itself. - */ - public Configurable withScope(String scope) { - this.scopes.add(Objects.requireNonNull(scope, "'scope' cannot be null.")); - return this; - } - - /** - * Sets the retry policy to the HTTP pipeline. - * - * @param retryPolicy the HTTP pipeline retry policy. - * @return the configurable object itself. - */ - public Configurable withRetryPolicy(RetryPolicy retryPolicy) { - this.retryPolicy = Objects.requireNonNull(retryPolicy, "'retryPolicy' cannot be null."); - return this; - } - - /** - * Sets the retry options for the HTTP pipeline retry policy. - *

- * This setting has no effect, if retry policy is set via {@link #withRetryPolicy(RetryPolicy)}. - * - * @param retryOptions the retry options for the HTTP pipeline retry policy. - * @return the configurable object itself. - */ - public Configurable withRetryOptions(RetryOptions retryOptions) { - this.retryOptions = Objects.requireNonNull(retryOptions, "'retryOptions' cannot be null."); - return this; - } - - /** - * Sets the default poll interval, used when service does not provide "Retry-After" header. - * - * @param defaultPollInterval the default poll interval. - * @return the configurable object itself. - */ - public Configurable withDefaultPollInterval(Duration defaultPollInterval) { - this.defaultPollInterval - = Objects.requireNonNull(defaultPollInterval, "'defaultPollInterval' cannot be null."); - if (this.defaultPollInterval.isNegative()) { - throw LOGGER - .logExceptionAsError(new IllegalArgumentException("'defaultPollInterval' cannot be negative")); - } - return this; - } - - /** - * Creates an instance of combined service API entry point. - * - * @param credential the credential to use. - * @param profile the Azure profile for client. - * @return the combined service API instance. - */ - public CombinedManager authenticate(TokenCredential credential, AzureProfile profile) { - Objects.requireNonNull(credential, "'credential' cannot be null."); - Objects.requireNonNull(profile, "'profile' cannot be null."); - - String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); - - StringBuilder userAgentBuilder = new StringBuilder(); - userAgentBuilder.append("azsdk-java") - .append("-") - .append("azure.resourcemanager.multiserviceolderversions.combined") - .append("/") - .append(clientVersion); - if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) { - userAgentBuilder.append(" (") - .append(Configuration.getGlobalConfiguration().get("java.version")) - .append("; ") - .append(Configuration.getGlobalConfiguration().get("os.name")) - .append("; ") - .append(Configuration.getGlobalConfiguration().get("os.version")) - .append("; auto-generated)"); - } else { - userAgentBuilder.append(" (auto-generated)"); - } - - if (scopes.isEmpty()) { - scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default"); - } - if (retryPolicy == null) { - if (retryOptions != null) { - retryPolicy = new RetryPolicy(retryOptions); - } else { - retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS); - } - } - List policies = new ArrayList<>(); - policies.add(new UserAgentPolicy(userAgentBuilder.toString())); - policies.add(new AddHeadersFromContextPolicy()); - policies.add(new RequestIdPolicy()); - policies.addAll(this.policies.stream() - .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) - .collect(Collectors.toList())); - HttpPolicyProviders.addBeforeRetryPolicies(policies); - policies.add(retryPolicy); - policies.add(new AddDatePolicy()); - policies.add(new BearerTokenAuthenticationPolicy(credential, scopes.toArray(new String[0]))); - policies.addAll(this.policies.stream() - .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) - .collect(Collectors.toList())); - HttpPolicyProviders.addAfterRetryPolicies(policies); - policies.add(new HttpLoggingPolicy(httpLogOptions)); - HttpPipeline httpPipeline = new HttpPipelineBuilder().httpClient(httpClient) - .policies(policies.toArray(new HttpPipelinePolicy[0])) - .build(); - return new CombinedManager(httpPipeline, profile, defaultPollInterval); - } - } - - /** - * Gets the resource collection API of VirtualMachines. It manages VirtualMachine. - * - * @return Resource collection API of VirtualMachines. - */ - public VirtualMachines virtualMachines() { - if (this.virtualMachines == null) { - this.virtualMachines = new VirtualMachinesImpl(clientObject.getVirtualMachines(), this); - } - return virtualMachines; - } - - /** - * Gets the resource collection API of Disks. It manages Disk. - * - * @return Resource collection API of Disks. - */ - public Disks disks() { - if (this.disks == null) { - this.disks = new DisksImpl(clientObject.getDisks(), this); - } - return disks; - } - - /** - * Gets wrapped service client Combined providing direct access to the underlying auto-generated API implementation, - * based on Azure REST API. - * - * @return Wrapped service client Combined. - */ - public Combined serviceClient() { - return this.clientObject; - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/Combined.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/Combined.java deleted file mode 100644 index c14cf89263c..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/Combined.java +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.fluent; - -import com.azure.core.http.HttpPipeline; -import java.time.Duration; - -/** - * The interface for Combined class. - */ -public interface Combined { - /** - * Gets Service host. - * - * @return the endpoint value. - */ - String getEndpoint(); - - /** - * Gets The ID of the target subscription. The value must be an UUID. - * - * @return the subscriptionId value. - */ - String getSubscriptionId(); - - /** - * Gets The HTTP pipeline to send requests through. - * - * @return the httpPipeline value. - */ - HttpPipeline getHttpPipeline(); - - /** - * Gets The default poll interval for long-running operation. - * - * @return the defaultPollInterval value. - */ - Duration getDefaultPollInterval(); - - /** - * Gets the VirtualMachinesClient object to access its operations. - * - * @return the VirtualMachinesClient object. - */ - VirtualMachinesClient getVirtualMachines(); - - /** - * Gets the DisksClient object to access its operations. - * - * @return the DisksClient object. - */ - DisksClient getDisks(); -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/DisksClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/DisksClient.java deleted file mode 100644 index 53d3f79daf9..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/DisksClient.java +++ /dev/null @@ -1,105 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.fluent; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.DiskInner; -import com.azure.core.annotation.ReturnType; -import com.azure.core.annotation.ServiceMethod; -import com.azure.core.http.rest.Response; -import com.azure.core.management.polling.PollResult; -import com.azure.core.util.Context; -import com.azure.core.util.polling.SyncPoller; - -/** - * An instance of this class provides access to all the operations defined in DisksClient. - */ -public interface DisksClient { - /** - * Gets information about a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - Response getByResourceGroupWithResponse(String resourceGroupName, String diskName, Context context); - - /** - * Gets information about a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - DiskInner getByResourceGroup(String resourceGroupName, String diskName); - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link SyncPoller} for polling of disk resource. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, DiskInner> beginCreateOrUpdate(String resourceGroupName, String diskName, - DiskInner resource); - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link SyncPoller} for polling of disk resource. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, DiskInner> beginCreateOrUpdate(String resourceGroupName, String diskName, - DiskInner resource, Context context); - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return disk resource. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - DiskInner createOrUpdate(String resourceGroupName, String diskName, DiskInner resource); - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return disk resource. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - DiskInner createOrUpdate(String resourceGroupName, String diskName, DiskInner resource, Context context); -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/VirtualMachinesClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/VirtualMachinesClient.java deleted file mode 100644 index ae8ed67197d..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/VirtualMachinesClient.java +++ /dev/null @@ -1,111 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.fluent; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.VirtualMachineInner; -import com.azure.core.annotation.ReturnType; -import com.azure.core.annotation.ServiceMethod; -import com.azure.core.http.rest.Response; -import com.azure.core.management.polling.PollResult; -import com.azure.core.util.Context; -import com.azure.core.util.polling.SyncPoller; - -/** - * An instance of this class provides access to all the operations defined in VirtualMachinesClient. - */ -public interface VirtualMachinesClient { - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - Response getByResourceGroupWithResponse(String resourceGroupName, String vmName, - Context context); - - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - VirtualMachineInner getByResourceGroup(String resourceGroupName, String vmName); - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link SyncPoller} for polling of describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, VirtualMachineInner> beginCreateOrUpdate(String resourceGroupName, - String vmName, VirtualMachineInner resource); - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link SyncPoller} for polling of describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, VirtualMachineInner> beginCreateOrUpdate(String resourceGroupName, - String vmName, VirtualMachineInner resource, Context context); - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - VirtualMachineInner createOrUpdate(String resourceGroupName, String vmName, VirtualMachineInner resource); - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - VirtualMachineInner createOrUpdate(String resourceGroupName, String vmName, VirtualMachineInner resource, - Context context); -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/DiskInner.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/DiskInner.java deleted file mode 100644 index 920c05c5c28..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/DiskInner.java +++ /dev/null @@ -1,181 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.fluent.models; - -import azure.resourcemanager.multiserviceolderversions.combined.models.DiskProperties; -import com.azure.core.annotation.Fluent; -import com.azure.core.management.Resource; -import com.azure.core.management.SystemData; -import com.azure.json.JsonReader; -import com.azure.json.JsonToken; -import com.azure.json.JsonWriter; -import java.io.IOException; -import java.util.Map; - -/** - * Disk resource. - */ -@Fluent -public final class DiskInner extends Resource { - /* - * The resource-specific properties for this resource. - */ - private DiskProperties properties; - - /* - * Azure Resource Manager metadata containing createdBy and modifiedBy information. - */ - private SystemData systemData; - - /* - * The type of the resource. - */ - private String type; - - /* - * The name of the resource. - */ - private String name; - - /* - * Fully qualified resource Id for the resource. - */ - private String id; - - /** - * Creates an instance of DiskInner class. - */ - public DiskInner() { - } - - /** - * Get the properties property: The resource-specific properties for this resource. - * - * @return the properties value. - */ - public DiskProperties properties() { - return this.properties; - } - - /** - * Set the properties property: The resource-specific properties for this resource. - * - * @param properties the properties value to set. - * @return the DiskInner object itself. - */ - public DiskInner withProperties(DiskProperties properties) { - this.properties = properties; - return this; - } - - /** - * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. - * - * @return the systemData value. - */ - public SystemData systemData() { - return this.systemData; - } - - /** - * Get the type property: The type of the resource. - * - * @return the type value. - */ - @Override - public String type() { - return this.type; - } - - /** - * Get the name property: The name of the resource. - * - * @return the name value. - */ - @Override - public String name() { - return this.name; - } - - /** - * Get the id property: Fully qualified resource Id for the resource. - * - * @return the id value. - */ - @Override - public String id() { - return this.id; - } - - /** - * {@inheritDoc} - */ - @Override - public DiskInner withLocation(String location) { - super.withLocation(location); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public DiskInner withTags(Map tags) { - super.withTags(tags); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { - jsonWriter.writeStartObject(); - jsonWriter.writeStringField("location", location()); - jsonWriter.writeMapField("tags", tags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeJsonField("properties", this.properties); - return jsonWriter.writeEndObject(); - } - - /** - * Reads an instance of DiskInner from the JsonReader. - * - * @param jsonReader The JsonReader being read. - * @return An instance of DiskInner if the JsonReader was pointing to an instance of it, or null if it was pointing - * to JSON null. - * @throws IllegalStateException If the deserialized JSON object was missing any required properties. - * @throws IOException If an error occurs while reading the DiskInner. - */ - public static DiskInner fromJson(JsonReader jsonReader) throws IOException { - return jsonReader.readObject(reader -> { - DiskInner deserializedDiskInner = new DiskInner(); - while (reader.nextToken() != JsonToken.END_OBJECT) { - String fieldName = reader.getFieldName(); - reader.nextToken(); - - if ("id".equals(fieldName)) { - deserializedDiskInner.id = reader.getString(); - } else if ("name".equals(fieldName)) { - deserializedDiskInner.name = reader.getString(); - } else if ("type".equals(fieldName)) { - deserializedDiskInner.type = reader.getString(); - } else if ("location".equals(fieldName)) { - deserializedDiskInner.withLocation(reader.getString()); - } else if ("tags".equals(fieldName)) { - Map tags = reader.readMap(reader1 -> reader1.getString()); - deserializedDiskInner.withTags(tags); - } else if ("properties".equals(fieldName)) { - deserializedDiskInner.properties = DiskProperties.fromJson(reader); - } else if ("systemData".equals(fieldName)) { - deserializedDiskInner.systemData = SystemData.fromJson(reader); - } else { - reader.skipChildren(); - } - } - - return deserializedDiskInner; - }); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/VirtualMachineInner.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/VirtualMachineInner.java deleted file mode 100644 index fbf8b1af82e..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/VirtualMachineInner.java +++ /dev/null @@ -1,181 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.fluent.models; - -import azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachineProperties; -import com.azure.core.annotation.Fluent; -import com.azure.core.management.Resource; -import com.azure.core.management.SystemData; -import com.azure.json.JsonReader; -import com.azure.json.JsonToken; -import com.azure.json.JsonWriter; -import java.io.IOException; -import java.util.Map; - -/** - * Describes a Virtual Machine. - */ -@Fluent -public final class VirtualMachineInner extends Resource { - /* - * The resource-specific properties for this resource. - */ - private VirtualMachineProperties properties; - - /* - * Azure Resource Manager metadata containing createdBy and modifiedBy information. - */ - private SystemData systemData; - - /* - * The type of the resource. - */ - private String type; - - /* - * The name of the resource. - */ - private String name; - - /* - * Fully qualified resource Id for the resource. - */ - private String id; - - /** - * Creates an instance of VirtualMachineInner class. - */ - public VirtualMachineInner() { - } - - /** - * Get the properties property: The resource-specific properties for this resource. - * - * @return the properties value. - */ - public VirtualMachineProperties properties() { - return this.properties; - } - - /** - * Set the properties property: The resource-specific properties for this resource. - * - * @param properties the properties value to set. - * @return the VirtualMachineInner object itself. - */ - public VirtualMachineInner withProperties(VirtualMachineProperties properties) { - this.properties = properties; - return this; - } - - /** - * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. - * - * @return the systemData value. - */ - public SystemData systemData() { - return this.systemData; - } - - /** - * Get the type property: The type of the resource. - * - * @return the type value. - */ - @Override - public String type() { - return this.type; - } - - /** - * Get the name property: The name of the resource. - * - * @return the name value. - */ - @Override - public String name() { - return this.name; - } - - /** - * Get the id property: Fully qualified resource Id for the resource. - * - * @return the id value. - */ - @Override - public String id() { - return this.id; - } - - /** - * {@inheritDoc} - */ - @Override - public VirtualMachineInner withLocation(String location) { - super.withLocation(location); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public VirtualMachineInner withTags(Map tags) { - super.withTags(tags); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { - jsonWriter.writeStartObject(); - jsonWriter.writeStringField("location", location()); - jsonWriter.writeMapField("tags", tags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeJsonField("properties", this.properties); - return jsonWriter.writeEndObject(); - } - - /** - * Reads an instance of VirtualMachineInner from the JsonReader. - * - * @param jsonReader The JsonReader being read. - * @return An instance of VirtualMachineInner if the JsonReader was pointing to an instance of it, or null if it was - * pointing to JSON null. - * @throws IllegalStateException If the deserialized JSON object was missing any required properties. - * @throws IOException If an error occurs while reading the VirtualMachineInner. - */ - public static VirtualMachineInner fromJson(JsonReader jsonReader) throws IOException { - return jsonReader.readObject(reader -> { - VirtualMachineInner deserializedVirtualMachineInner = new VirtualMachineInner(); - while (reader.nextToken() != JsonToken.END_OBJECT) { - String fieldName = reader.getFieldName(); - reader.nextToken(); - - if ("id".equals(fieldName)) { - deserializedVirtualMachineInner.id = reader.getString(); - } else if ("name".equals(fieldName)) { - deserializedVirtualMachineInner.name = reader.getString(); - } else if ("type".equals(fieldName)) { - deserializedVirtualMachineInner.type = reader.getString(); - } else if ("location".equals(fieldName)) { - deserializedVirtualMachineInner.withLocation(reader.getString()); - } else if ("tags".equals(fieldName)) { - Map tags = reader.readMap(reader1 -> reader1.getString()); - deserializedVirtualMachineInner.withTags(tags); - } else if ("properties".equals(fieldName)) { - deserializedVirtualMachineInner.properties = VirtualMachineProperties.fromJson(reader); - } else if ("systemData".equals(fieldName)) { - deserializedVirtualMachineInner.systemData = SystemData.fromJson(reader); - } else { - reader.skipChildren(); - } - } - - return deserializedVirtualMachineInner; - }); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/package-info.java deleted file mode 100644 index b6f7366cf9f..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -/** - * Package containing the inner data models for Compute. - * Compute Client. - */ -package azure.resourcemanager.multiserviceolderversions.combined.fluent.models; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/package-info.java deleted file mode 100644 index f26ba069655..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -/** - * Package containing the service clients for Compute. - * Compute Client. - */ -package azure.resourcemanager.multiserviceolderversions.combined.fluent; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/CombinedBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/CombinedBuilder.java deleted file mode 100644 index 3178471ba12..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/CombinedBuilder.java +++ /dev/null @@ -1,138 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.implementation; - -import com.azure.core.annotation.ServiceClientBuilder; -import com.azure.core.http.HttpPipeline; -import com.azure.core.http.HttpPipelineBuilder; -import com.azure.core.http.policy.RetryPolicy; -import com.azure.core.http.policy.UserAgentPolicy; -import com.azure.core.management.AzureEnvironment; -import com.azure.core.management.serializer.SerializerFactory; -import com.azure.core.util.serializer.SerializerAdapter; -import java.time.Duration; - -/** - * A builder for creating a new instance of the CombinedImpl type. - */ -@ServiceClientBuilder(serviceClients = { CombinedImpl.class }) -public final class CombinedBuilder { - /* - * Service host - */ - private String endpoint; - - /** - * Sets Service host. - * - * @param endpoint the endpoint value. - * @return the CombinedBuilder. - */ - public CombinedBuilder endpoint(String endpoint) { - this.endpoint = endpoint; - return this; - } - - /* - * The ID of the target subscription. The value must be an UUID. - */ - private String subscriptionId; - - /** - * Sets The ID of the target subscription. The value must be an UUID. - * - * @param subscriptionId the subscriptionId value. - * @return the CombinedBuilder. - */ - public CombinedBuilder subscriptionId(String subscriptionId) { - this.subscriptionId = subscriptionId; - return this; - } - - /* - * The environment to connect to - */ - private AzureEnvironment environment; - - /** - * Sets The environment to connect to. - * - * @param environment the environment value. - * @return the CombinedBuilder. - */ - public CombinedBuilder environment(AzureEnvironment environment) { - this.environment = environment; - return this; - } - - /* - * The HTTP pipeline to send requests through - */ - private HttpPipeline pipeline; - - /** - * Sets The HTTP pipeline to send requests through. - * - * @param pipeline the pipeline value. - * @return the CombinedBuilder. - */ - public CombinedBuilder pipeline(HttpPipeline pipeline) { - this.pipeline = pipeline; - return this; - } - - /* - * The default poll interval for long-running operation - */ - private Duration defaultPollInterval; - - /** - * Sets The default poll interval for long-running operation. - * - * @param defaultPollInterval the defaultPollInterval value. - * @return the CombinedBuilder. - */ - public CombinedBuilder defaultPollInterval(Duration defaultPollInterval) { - this.defaultPollInterval = defaultPollInterval; - return this; - } - - /* - * The serializer to serialize an object into a string - */ - private SerializerAdapter serializerAdapter; - - /** - * Sets The serializer to serialize an object into a string. - * - * @param serializerAdapter the serializerAdapter value. - * @return the CombinedBuilder. - */ - public CombinedBuilder serializerAdapter(SerializerAdapter serializerAdapter) { - this.serializerAdapter = serializerAdapter; - return this; - } - - /** - * Builds an instance of CombinedImpl with the provided parameters. - * - * @return an instance of CombinedImpl. - */ - public CombinedImpl buildClient() { - String localEndpoint = (endpoint != null) ? endpoint : "https://management.azure.com"; - AzureEnvironment localEnvironment = (environment != null) ? environment : AzureEnvironment.AZURE; - HttpPipeline localPipeline = (pipeline != null) - ? pipeline - : new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(); - Duration localDefaultPollInterval - = (defaultPollInterval != null) ? defaultPollInterval : Duration.ofSeconds(30); - SerializerAdapter localSerializerAdapter = (serializerAdapter != null) - ? serializerAdapter - : SerializerFactory.createDefaultManagementSerializerAdapter(); - CombinedImpl client = new CombinedImpl(localPipeline, localSerializerAdapter, localDefaultPollInterval, - localEnvironment, localEndpoint, this.subscriptionId); - return client; - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/CombinedImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/CombinedImpl.java deleted file mode 100644 index 75986505a23..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/CombinedImpl.java +++ /dev/null @@ -1,309 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.implementation; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.Combined; -import azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient; -import azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient; -import com.azure.core.annotation.ServiceClient; -import com.azure.core.http.HttpHeaderName; -import com.azure.core.http.HttpHeaders; -import com.azure.core.http.HttpPipeline; -import com.azure.core.http.HttpResponse; -import com.azure.core.http.rest.Response; -import com.azure.core.management.AzureEnvironment; -import com.azure.core.management.exception.ManagementError; -import com.azure.core.management.exception.ManagementException; -import com.azure.core.management.polling.PollResult; -import com.azure.core.management.polling.PollerFactory; -import com.azure.core.management.polling.SyncPollerFactory; -import com.azure.core.util.BinaryData; -import com.azure.core.util.Context; -import com.azure.core.util.CoreUtils; -import com.azure.core.util.logging.ClientLogger; -import com.azure.core.util.polling.AsyncPollResponse; -import com.azure.core.util.polling.LongRunningOperationStatus; -import com.azure.core.util.polling.PollerFlux; -import com.azure.core.util.polling.SyncPoller; -import com.azure.core.util.serializer.SerializerAdapter; -import com.azure.core.util.serializer.SerializerEncoding; -import java.io.IOException; -import java.lang.reflect.Type; -import java.nio.ByteBuffer; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -/** - * Initializes a new instance of the CombinedImpl type. - */ -@ServiceClient(builder = CombinedBuilder.class) -public final class CombinedImpl implements Combined { - /** - * Service host. - */ - private final String endpoint; - - /** - * Gets Service host. - * - * @return the endpoint value. - */ - public String getEndpoint() { - return this.endpoint; - } - - /** - * The ID of the target subscription. The value must be an UUID. - */ - private final String subscriptionId; - - /** - * Gets The ID of the target subscription. The value must be an UUID. - * - * @return the subscriptionId value. - */ - public String getSubscriptionId() { - return this.subscriptionId; - } - - /** - * The HTTP pipeline to send requests through. - */ - private final HttpPipeline httpPipeline; - - /** - * Gets The HTTP pipeline to send requests through. - * - * @return the httpPipeline value. - */ - public HttpPipeline getHttpPipeline() { - return this.httpPipeline; - } - - /** - * The serializer to serialize an object into a string. - */ - private final SerializerAdapter serializerAdapter; - - /** - * Gets The serializer to serialize an object into a string. - * - * @return the serializerAdapter value. - */ - SerializerAdapter getSerializerAdapter() { - return this.serializerAdapter; - } - - /** - * The default poll interval for long-running operation. - */ - private final Duration defaultPollInterval; - - /** - * Gets The default poll interval for long-running operation. - * - * @return the defaultPollInterval value. - */ - public Duration getDefaultPollInterval() { - return this.defaultPollInterval; - } - - /** - * The VirtualMachinesClient object to access its operations. - */ - private final VirtualMachinesClient virtualMachines; - - /** - * Gets the VirtualMachinesClient object to access its operations. - * - * @return the VirtualMachinesClient object. - */ - public VirtualMachinesClient getVirtualMachines() { - return this.virtualMachines; - } - - /** - * The DisksClient object to access its operations. - */ - private final DisksClient disks; - - /** - * Gets the DisksClient object to access its operations. - * - * @return the DisksClient object. - */ - public DisksClient getDisks() { - return this.disks; - } - - /** - * Initializes an instance of Combined client. - * - * @param httpPipeline The HTTP pipeline to send requests through. - * @param serializerAdapter The serializer to serialize an object into a string. - * @param defaultPollInterval The default poll interval for long-running operation. - * @param environment The Azure environment. - * @param endpoint Service host. - * @param subscriptionId The ID of the target subscription. The value must be an UUID. - */ - CombinedImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, Duration defaultPollInterval, - AzureEnvironment environment, String endpoint, String subscriptionId) { - this.httpPipeline = httpPipeline; - this.serializerAdapter = serializerAdapter; - this.defaultPollInterval = defaultPollInterval; - this.endpoint = endpoint; - this.subscriptionId = subscriptionId; - this.virtualMachines = new VirtualMachinesClientImpl(this); - this.disks = new DisksClientImpl(this); - } - - /** - * Gets default client context. - * - * @return the default client context. - */ - public Context getContext() { - return Context.NONE; - } - - /** - * Merges default client context with provided context. - * - * @param context the context to be merged with default client context. - * @return the merged context. - */ - public Context mergeContext(Context context) { - return CoreUtils.mergeContexts(this.getContext(), context); - } - - /** - * Gets long running operation result. - * - * @param activationResponse the response of activation operation. - * @param httpPipeline the http pipeline. - * @param pollResultType type of poll result. - * @param finalResultType type of final result. - * @param context the context shared by all requests. - * @param type of poll result. - * @param type of final result. - * @return poller flux for poll result and final result. - */ - public PollerFlux, U> getLroResult(Mono>> activationResponse, - HttpPipeline httpPipeline, Type pollResultType, Type finalResultType, Context context) { - return PollerFactory.create(serializerAdapter, httpPipeline, pollResultType, finalResultType, - defaultPollInterval, activationResponse, context); - } - - /** - * Gets long running operation result. - * - * @param activationResponse the response of activation operation. - * @param pollResultType type of poll result. - * @param finalResultType type of final result. - * @param context the context shared by all requests. - * @param type of poll result. - * @param type of final result. - * @return SyncPoller for poll result and final result. - */ - public SyncPoller, U> getLroResult(Response activationResponse, - Type pollResultType, Type finalResultType, Context context) { - return SyncPollerFactory.create(serializerAdapter, httpPipeline, pollResultType, finalResultType, - defaultPollInterval, () -> activationResponse, context); - } - - /** - * Gets the final result, or an error, based on last async poll response. - * - * @param response the last async poll response. - * @param type of poll result. - * @param type of final result. - * @return the final result, or an error. - */ - public Mono getLroFinalResultOrError(AsyncPollResponse, U> response) { - if (response.getStatus() != LongRunningOperationStatus.SUCCESSFULLY_COMPLETED) { - String errorMessage; - ManagementError managementError = null; - HttpResponse errorResponse = null; - PollResult.Error lroError = response.getValue().getError(); - if (lroError != null) { - errorResponse = new HttpResponseImpl(lroError.getResponseStatusCode(), lroError.getResponseHeaders(), - lroError.getResponseBody()); - - errorMessage = response.getValue().getError().getMessage(); - String errorBody = response.getValue().getError().getResponseBody(); - if (errorBody != null) { - // try to deserialize error body to ManagementError - try { - managementError = this.getSerializerAdapter() - .deserialize(errorBody, ManagementError.class, SerializerEncoding.JSON); - if (managementError.getCode() == null || managementError.getMessage() == null) { - managementError = null; - } - } catch (IOException | RuntimeException ioe) { - LOGGER.logThrowableAsWarning(ioe); - } - } - } else { - // fallback to default error message - errorMessage = "Long running operation failed."; - } - if (managementError == null) { - // fallback to default ManagementError - managementError = new ManagementError(response.getStatus().toString(), errorMessage); - } - return Mono.error(new ManagementException(errorMessage, errorResponse, managementError)); - } else { - return response.getFinalResult(); - } - } - - private static final class HttpResponseImpl extends HttpResponse { - private final int statusCode; - - private final byte[] responseBody; - - private final HttpHeaders httpHeaders; - - HttpResponseImpl(int statusCode, HttpHeaders httpHeaders, String responseBody) { - super(null); - this.statusCode = statusCode; - this.httpHeaders = httpHeaders; - this.responseBody = responseBody == null ? null : responseBody.getBytes(StandardCharsets.UTF_8); - } - - public int getStatusCode() { - return statusCode; - } - - public String getHeaderValue(String s) { - return httpHeaders.getValue(HttpHeaderName.fromString(s)); - } - - public HttpHeaders getHeaders() { - return httpHeaders; - } - - public Flux getBody() { - return Flux.just(ByteBuffer.wrap(responseBody)); - } - - public Mono getBodyAsByteArray() { - return Mono.just(responseBody); - } - - public Mono getBodyAsString() { - return Mono.just(new String(responseBody, StandardCharsets.UTF_8)); - } - - public Mono getBodyAsString(Charset charset) { - return Mono.just(new String(responseBody, charset)); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(CombinedImpl.class); -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DiskImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DiskImpl.java deleted file mode 100644 index 4c8b72cd4c2..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DiskImpl.java +++ /dev/null @@ -1,164 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.implementation; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.DiskInner; -import azure.resourcemanager.multiserviceolderversions.combined.models.Disk; -import azure.resourcemanager.multiserviceolderversions.combined.models.DiskProperties; -import com.azure.core.management.Region; -import com.azure.core.management.SystemData; -import com.azure.core.util.Context; -import java.util.Collections; -import java.util.Map; - -public final class DiskImpl implements Disk, Disk.Definition, Disk.Update { - private DiskInner innerObject; - - private final azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager; - - public String id() { - return this.innerModel().id(); - } - - public String name() { - return this.innerModel().name(); - } - - public String type() { - return this.innerModel().type(); - } - - public String location() { - return this.innerModel().location(); - } - - public Map tags() { - Map inner = this.innerModel().tags(); - if (inner != null) { - return Collections.unmodifiableMap(inner); - } else { - return Collections.emptyMap(); - } - } - - public DiskProperties properties() { - return this.innerModel().properties(); - } - - public SystemData systemData() { - return this.innerModel().systemData(); - } - - public Region region() { - return Region.fromName(this.regionName()); - } - - public String regionName() { - return this.location(); - } - - public String resourceGroupName() { - return resourceGroupName; - } - - public DiskInner innerModel() { - return this.innerObject; - } - - private azure.resourcemanager.multiserviceolderversions.combined.CombinedManager manager() { - return this.serviceManager; - } - - private String resourceGroupName; - - private String diskName; - - public DiskImpl withExistingResourceGroup(String resourceGroupName) { - this.resourceGroupName = resourceGroupName; - return this; - } - - public Disk create() { - this.innerObject = serviceManager.serviceClient() - .getDisks() - .createOrUpdate(resourceGroupName, diskName, this.innerModel(), Context.NONE); - return this; - } - - public Disk create(Context context) { - this.innerObject = serviceManager.serviceClient() - .getDisks() - .createOrUpdate(resourceGroupName, diskName, this.innerModel(), context); - return this; - } - - DiskImpl(String name, azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager) { - this.innerObject = new DiskInner(); - this.serviceManager = serviceManager; - this.diskName = name; - } - - public DiskImpl update() { - return this; - } - - public Disk apply() { - this.innerObject = serviceManager.serviceClient() - .getDisks() - .createOrUpdate(resourceGroupName, diskName, this.innerModel(), Context.NONE); - return this; - } - - public Disk apply(Context context) { - this.innerObject = serviceManager.serviceClient() - .getDisks() - .createOrUpdate(resourceGroupName, diskName, this.innerModel(), context); - return this; - } - - DiskImpl(DiskInner innerObject, - azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager) { - this.innerObject = innerObject; - this.serviceManager = serviceManager; - this.resourceGroupName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "resourceGroups"); - this.diskName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "disksOld"); - } - - public Disk refresh() { - this.innerObject = serviceManager.serviceClient() - .getDisks() - .getByResourceGroupWithResponse(resourceGroupName, diskName, Context.NONE) - .getValue(); - return this; - } - - public Disk refresh(Context context) { - this.innerObject = serviceManager.serviceClient() - .getDisks() - .getByResourceGroupWithResponse(resourceGroupName, diskName, context) - .getValue(); - return this; - } - - public DiskImpl withRegion(Region location) { - this.innerModel().withLocation(location.toString()); - return this; - } - - public DiskImpl withRegion(String location) { - this.innerModel().withLocation(location); - return this; - } - - public DiskImpl withTags(Map tags) { - this.innerModel().withTags(tags); - return this; - } - - public DiskImpl withProperties(DiskProperties properties) { - this.innerModel().withProperties(properties); - return this; - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksClientImpl.java deleted file mode 100644 index c81a1b18357..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksClientImpl.java +++ /dev/null @@ -1,345 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.implementation; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient; -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.DiskInner; -import com.azure.core.annotation.BodyParam; -import com.azure.core.annotation.ExpectedResponses; -import com.azure.core.annotation.Get; -import com.azure.core.annotation.HeaderParam; -import com.azure.core.annotation.Headers; -import com.azure.core.annotation.Host; -import com.azure.core.annotation.HostParam; -import com.azure.core.annotation.PathParam; -import com.azure.core.annotation.Put; -import com.azure.core.annotation.QueryParam; -import com.azure.core.annotation.ReturnType; -import com.azure.core.annotation.ServiceInterface; -import com.azure.core.annotation.ServiceMethod; -import com.azure.core.annotation.UnexpectedResponseExceptionType; -import com.azure.core.http.rest.Response; -import com.azure.core.http.rest.RestProxy; -import com.azure.core.management.exception.ManagementException; -import com.azure.core.management.polling.PollResult; -import com.azure.core.util.BinaryData; -import com.azure.core.util.Context; -import com.azure.core.util.FluxUtil; -import com.azure.core.util.polling.PollerFlux; -import com.azure.core.util.polling.SyncPoller; -import java.nio.ByteBuffer; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -/** - * An instance of this class provides access to all the operations defined in DisksClient. - */ -public final class DisksClientImpl implements DisksClient { - /** - * The proxy service used to perform REST calls. - */ - private final DisksService service; - - /** - * The service client containing this operation class. - */ - private final CombinedImpl client; - - /** - * Initializes an instance of DisksClientImpl. - * - * @param client the instance of the service client containing this operation class. - */ - DisksClientImpl(CombinedImpl client) { - this.service = RestProxy.create(DisksService.class, client.getHttpPipeline(), client.getSerializerAdapter()); - this.client = client; - } - - /** - * The interface defining all the services for CombinedDisks to be used by the proxy service to perform REST calls. - */ - @Host("{endpoint}") - @ServiceInterface(name = "CombinedDisks") - public interface DisksService { - @Headers({ "Content-Type: application/json" }) - @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disksOld/{diskName}") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Mono> getByResourceGroup(@HostParam("endpoint") String endpoint, - @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, - @PathParam("resourceGroupName") String resourceGroupName, @PathParam("diskName") String diskName, - @HeaderParam("Accept") String accept, Context context); - - @Headers({ "Content-Type: application/json" }) - @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disksOld/{diskName}") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Response getByResourceGroupSync(@HostParam("endpoint") String endpoint, - @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, - @PathParam("resourceGroupName") String resourceGroupName, @PathParam("diskName") String diskName, - @HeaderParam("Accept") String accept, Context context); - - @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disksOld/{diskName}") - @ExpectedResponses({ 200, 201 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Mono>> createOrUpdate(@HostParam("endpoint") String endpoint, - @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, - @PathParam("resourceGroupName") String resourceGroupName, @PathParam("diskName") String diskName, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") DiskInner resource, Context context); - - @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disksOld/{diskName}") - @ExpectedResponses({ 200, 201 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Response createOrUpdateSync(@HostParam("endpoint") String endpoint, - @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, - @PathParam("resourceGroupName") String resourceGroupName, @PathParam("diskName") String diskName, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") DiskInner resource, Context context); - } - - /** - * Gets information about a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getByResourceGroupWithResponseAsync(String resourceGroupName, String diskName) { - final String apiVersion = "2024-03-02"; - final String accept = "application/json"; - return FluxUtil - .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), apiVersion, - this.client.getSubscriptionId(), resourceGroupName, diskName, accept, context)) - .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); - } - - /** - * Gets information about a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getByResourceGroupAsync(String resourceGroupName, String diskName) { - return getByResourceGroupWithResponseAsync(resourceGroupName, diskName) - .flatMap(res -> Mono.justOrEmpty(res.getValue())); - } - - /** - * Gets information about a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response getByResourceGroupWithResponse(String resourceGroupName, String diskName, - Context context) { - final String apiVersion = "2024-03-02"; - final String accept = "application/json"; - return service.getByResourceGroupSync(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), - resourceGroupName, diskName, accept, context); - } - - /** - * Gets information about a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public DiskInner getByResourceGroup(String resourceGroupName, String diskName) { - return getByResourceGroupWithResponse(resourceGroupName, diskName, Context.NONE).getValue(); - } - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return disk resource along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono>> createOrUpdateWithResponseAsync(String resourceGroupName, String diskName, - DiskInner resource) { - final String apiVersion = "2024-03-02"; - final String contentType = "application/json"; - final String accept = "application/json"; - return FluxUtil - .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion, - this.client.getSubscriptionId(), resourceGroupName, diskName, contentType, accept, resource, context)) - .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); - } - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return disk resource along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Response createOrUpdateWithResponse(String resourceGroupName, String diskName, - DiskInner resource) { - final String apiVersion = "2024-03-02"; - final String contentType = "application/json"; - final String accept = "application/json"; - return service.createOrUpdateSync(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), - resourceGroupName, diskName, contentType, accept, resource, Context.NONE); - } - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return disk resource along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Response createOrUpdateWithResponse(String resourceGroupName, String diskName, - DiskInner resource, Context context) { - final String apiVersion = "2024-03-02"; - final String contentType = "application/json"; - final String accept = "application/json"; - return service.createOrUpdateSync(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), - resourceGroupName, diskName, contentType, accept, resource, context); - } - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link PollerFlux} for polling of disk resource. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, DiskInner> beginCreateOrUpdateAsync(String resourceGroupName, - String diskName, DiskInner resource) { - Mono>> mono = createOrUpdateWithResponseAsync(resourceGroupName, diskName, resource); - return this.client.getLroResult(mono, this.client.getHttpPipeline(), DiskInner.class, - DiskInner.class, this.client.getContext()); - } - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link SyncPoller} for polling of disk resource. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, DiskInner> beginCreateOrUpdate(String resourceGroupName, String diskName, - DiskInner resource) { - Response response = createOrUpdateWithResponse(resourceGroupName, diskName, resource); - return this.client.getLroResult(response, DiskInner.class, DiskInner.class, Context.NONE); - } - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link SyncPoller} for polling of disk resource. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, DiskInner> beginCreateOrUpdate(String resourceGroupName, String diskName, - DiskInner resource, Context context) { - Response response = createOrUpdateWithResponse(resourceGroupName, diskName, resource, context); - return this.client.getLroResult(response, DiskInner.class, DiskInner.class, context); - } - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return disk resource on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync(String resourceGroupName, String diskName, DiskInner resource) { - return beginCreateOrUpdateAsync(resourceGroupName, diskName, resource).last() - .flatMap(this.client::getLroFinalResultOrError); - } - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return disk resource. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public DiskInner createOrUpdate(String resourceGroupName, String diskName, DiskInner resource) { - return beginCreateOrUpdate(resourceGroupName, diskName, resource).getFinalResult(); - } - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return disk resource. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public DiskInner createOrUpdate(String resourceGroupName, String diskName, DiskInner resource, Context context) { - return beginCreateOrUpdate(resourceGroupName, diskName, resource, context).getFinalResult(); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksImpl.java deleted file mode 100644 index 82dc82cdd5d..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksImpl.java +++ /dev/null @@ -1,88 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.implementation; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient; -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.DiskInner; -import azure.resourcemanager.multiserviceolderversions.combined.models.Disk; -import azure.resourcemanager.multiserviceolderversions.combined.models.Disks; -import com.azure.core.http.rest.Response; -import com.azure.core.http.rest.SimpleResponse; -import com.azure.core.util.Context; -import com.azure.core.util.logging.ClientLogger; - -public final class DisksImpl implements Disks { - private static final ClientLogger LOGGER = new ClientLogger(DisksImpl.class); - - private final DisksClient innerClient; - - private final azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager; - - public DisksImpl(DisksClient innerClient, - azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager) { - this.innerClient = innerClient; - this.serviceManager = serviceManager; - } - - public Response getByResourceGroupWithResponse(String resourceGroupName, String diskName, Context context) { - Response inner - = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, diskName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new DiskImpl(inner.getValue(), this.manager())); - } else { - return null; - } - } - - public Disk getByResourceGroup(String resourceGroupName, String diskName) { - DiskInner inner = this.serviceClient().getByResourceGroup(resourceGroupName, diskName); - if (inner != null) { - return new DiskImpl(inner, this.manager()); - } else { - return null; - } - } - - public Disk getById(String id) { - String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups"); - if (resourceGroupName == null) { - throw LOGGER.logExceptionAsError(new IllegalArgumentException( - String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id))); - } - String diskName = ResourceManagerUtils.getValueFromIdByName(id, "disksOld"); - if (diskName == null) { - throw LOGGER.logExceptionAsError(new IllegalArgumentException( - String.format("The resource ID '%s' is not valid. Missing path segment 'disksOld'.", id))); - } - return this.getByResourceGroupWithResponse(resourceGroupName, diskName, Context.NONE).getValue(); - } - - public Response getByIdWithResponse(String id, Context context) { - String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups"); - if (resourceGroupName == null) { - throw LOGGER.logExceptionAsError(new IllegalArgumentException( - String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id))); - } - String diskName = ResourceManagerUtils.getValueFromIdByName(id, "disksOld"); - if (diskName == null) { - throw LOGGER.logExceptionAsError(new IllegalArgumentException( - String.format("The resource ID '%s' is not valid. Missing path segment 'disksOld'.", id))); - } - return this.getByResourceGroupWithResponse(resourceGroupName, diskName, context); - } - - private DisksClient serviceClient() { - return this.innerClient; - } - - private azure.resourcemanager.multiserviceolderversions.combined.CombinedManager manager() { - return this.serviceManager; - } - - public DiskImpl define(String name) { - return new DiskImpl(name, this.manager()); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/ResourceManagerUtils.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/ResourceManagerUtils.java deleted file mode 100644 index e2a37af0be2..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/ResourceManagerUtils.java +++ /dev/null @@ -1,195 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.implementation; - -import com.azure.core.http.rest.PagedFlux; -import com.azure.core.http.rest.PagedIterable; -import com.azure.core.http.rest.PagedResponse; -import com.azure.core.http.rest.PagedResponseBase; -import com.azure.core.util.CoreUtils; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import reactor.core.publisher.Flux; - -final class ResourceManagerUtils { - private ResourceManagerUtils() { - } - - static String getValueFromIdByName(String id, String name) { - if (id == null) { - return null; - } - Iterator itr = Arrays.stream(id.split("/")).iterator(); - while (itr.hasNext()) { - String part = itr.next(); - if (part != null && !part.trim().isEmpty()) { - if (part.equalsIgnoreCase(name)) { - if (itr.hasNext()) { - return itr.next(); - } else { - return null; - } - } - } - } - return null; - } - - static String getValueFromIdByParameterName(String id, String pathTemplate, String parameterName) { - if (id == null || pathTemplate == null) { - return null; - } - String parameterNameParentheses = "{" + parameterName + "}"; - List idSegmentsReverted = Arrays.asList(id.split("/")); - List pathSegments = Arrays.asList(pathTemplate.split("/")); - Collections.reverse(idSegmentsReverted); - Iterator idItrReverted = idSegmentsReverted.iterator(); - int pathIndex = pathSegments.size(); - while (idItrReverted.hasNext() && pathIndex > 0) { - String idSegment = idItrReverted.next(); - String pathSegment = pathSegments.get(--pathIndex); - if (!CoreUtils.isNullOrEmpty(idSegment) && !CoreUtils.isNullOrEmpty(pathSegment)) { - if (pathSegment.equalsIgnoreCase(parameterNameParentheses)) { - if (pathIndex == 0 || (pathIndex == 1 && pathSegments.get(0).isEmpty())) { - List segments = new ArrayList<>(); - segments.add(idSegment); - idItrReverted.forEachRemaining(segments::add); - Collections.reverse(segments); - if (!segments.isEmpty() && segments.get(0).isEmpty()) { - segments.remove(0); - } - return String.join("/", segments); - } else { - return idSegment; - } - } - } - } - return null; - } - - static PagedIterable mapPage(PagedIterable pageIterable, Function mapper) { - return new PagedIterableImpl<>(pageIterable, mapper); - } - - private static final class PagedIterableImpl extends PagedIterable { - - private final PagedIterable pagedIterable; - private final Function mapper; - private final Function, PagedResponse> pageMapper; - - private PagedIterableImpl(PagedIterable pagedIterable, Function mapper) { - super(PagedFlux.create(() -> (continuationToken, pageSize) -> Flux - .fromStream(pagedIterable.streamByPage().map(getPageMapper(mapper))))); - this.pagedIterable = pagedIterable; - this.mapper = mapper; - this.pageMapper = getPageMapper(mapper); - } - - private static Function, PagedResponse> getPageMapper(Function mapper) { - return page -> new PagedResponseBase(page.getRequest(), page.getStatusCode(), page.getHeaders(), - page.getElements().stream().map(mapper).collect(Collectors.toList()), page.getContinuationToken(), - null); - } - - @Override - public Stream stream() { - return pagedIterable.stream().map(mapper); - } - - @Override - public Stream> streamByPage() { - return pagedIterable.streamByPage().map(pageMapper); - } - - @Override - public Stream> streamByPage(String continuationToken) { - return pagedIterable.streamByPage(continuationToken).map(pageMapper); - } - - @Override - public Stream> streamByPage(int preferredPageSize) { - return pagedIterable.streamByPage(preferredPageSize).map(pageMapper); - } - - @Override - public Stream> streamByPage(String continuationToken, int preferredPageSize) { - return pagedIterable.streamByPage(continuationToken, preferredPageSize).map(pageMapper); - } - - @Override - public Iterator iterator() { - return new IteratorImpl<>(pagedIterable.iterator(), mapper); - } - - @Override - public Iterable> iterableByPage() { - return new IterableImpl<>(pagedIterable.iterableByPage(), pageMapper); - } - - @Override - public Iterable> iterableByPage(String continuationToken) { - return new IterableImpl<>(pagedIterable.iterableByPage(continuationToken), pageMapper); - } - - @Override - public Iterable> iterableByPage(int preferredPageSize) { - return new IterableImpl<>(pagedIterable.iterableByPage(preferredPageSize), pageMapper); - } - - @Override - public Iterable> iterableByPage(String continuationToken, int preferredPageSize) { - return new IterableImpl<>(pagedIterable.iterableByPage(continuationToken, preferredPageSize), pageMapper); - } - } - - private static final class IteratorImpl implements Iterator { - - private final Iterator iterator; - private final Function mapper; - - private IteratorImpl(Iterator iterator, Function mapper) { - this.iterator = iterator; - this.mapper = mapper; - } - - @Override - public boolean hasNext() { - return iterator.hasNext(); - } - - @Override - public S next() { - return mapper.apply(iterator.next()); - } - - @Override - public void remove() { - iterator.remove(); - } - } - - private static final class IterableImpl implements Iterable { - - private final Iterable iterable; - private final Function mapper; - - private IterableImpl(Iterable iterable, Function mapper) { - this.iterable = iterable; - this.mapper = mapper; - } - - @Override - public Iterator iterator() { - return new IteratorImpl<>(iterable.iterator(), mapper); - } - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachineImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachineImpl.java deleted file mode 100644 index 5b3de7436c8..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachineImpl.java +++ /dev/null @@ -1,165 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.implementation; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.VirtualMachineInner; -import azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachine; -import azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachineProperties; -import com.azure.core.management.Region; -import com.azure.core.management.SystemData; -import com.azure.core.util.Context; -import java.util.Collections; -import java.util.Map; - -public final class VirtualMachineImpl implements VirtualMachine, VirtualMachine.Definition, VirtualMachine.Update { - private VirtualMachineInner innerObject; - - private final azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager; - - public String id() { - return this.innerModel().id(); - } - - public String name() { - return this.innerModel().name(); - } - - public String type() { - return this.innerModel().type(); - } - - public String location() { - return this.innerModel().location(); - } - - public Map tags() { - Map inner = this.innerModel().tags(); - if (inner != null) { - return Collections.unmodifiableMap(inner); - } else { - return Collections.emptyMap(); - } - } - - public VirtualMachineProperties properties() { - return this.innerModel().properties(); - } - - public SystemData systemData() { - return this.innerModel().systemData(); - } - - public Region region() { - return Region.fromName(this.regionName()); - } - - public String regionName() { - return this.location(); - } - - public String resourceGroupName() { - return resourceGroupName; - } - - public VirtualMachineInner innerModel() { - return this.innerObject; - } - - private azure.resourcemanager.multiserviceolderversions.combined.CombinedManager manager() { - return this.serviceManager; - } - - private String resourceGroupName; - - private String vmName; - - public VirtualMachineImpl withExistingResourceGroup(String resourceGroupName) { - this.resourceGroupName = resourceGroupName; - return this; - } - - public VirtualMachine create() { - this.innerObject = serviceManager.serviceClient() - .getVirtualMachines() - .createOrUpdate(resourceGroupName, vmName, this.innerModel(), Context.NONE); - return this; - } - - public VirtualMachine create(Context context) { - this.innerObject = serviceManager.serviceClient() - .getVirtualMachines() - .createOrUpdate(resourceGroupName, vmName, this.innerModel(), context); - return this; - } - - VirtualMachineImpl(String name, - azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager) { - this.innerObject = new VirtualMachineInner(); - this.serviceManager = serviceManager; - this.vmName = name; - } - - public VirtualMachineImpl update() { - return this; - } - - public VirtualMachine apply() { - this.innerObject = serviceManager.serviceClient() - .getVirtualMachines() - .createOrUpdate(resourceGroupName, vmName, this.innerModel(), Context.NONE); - return this; - } - - public VirtualMachine apply(Context context) { - this.innerObject = serviceManager.serviceClient() - .getVirtualMachines() - .createOrUpdate(resourceGroupName, vmName, this.innerModel(), context); - return this; - } - - VirtualMachineImpl(VirtualMachineInner innerObject, - azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager) { - this.innerObject = innerObject; - this.serviceManager = serviceManager; - this.resourceGroupName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "resourceGroups"); - this.vmName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "virtualMachinesOld"); - } - - public VirtualMachine refresh() { - this.innerObject = serviceManager.serviceClient() - .getVirtualMachines() - .getByResourceGroupWithResponse(resourceGroupName, vmName, Context.NONE) - .getValue(); - return this; - } - - public VirtualMachine refresh(Context context) { - this.innerObject = serviceManager.serviceClient() - .getVirtualMachines() - .getByResourceGroupWithResponse(resourceGroupName, vmName, context) - .getValue(); - return this; - } - - public VirtualMachineImpl withRegion(Region location) { - this.innerModel().withLocation(location.toString()); - return this; - } - - public VirtualMachineImpl withRegion(String location) { - this.innerModel().withLocation(location); - return this; - } - - public VirtualMachineImpl withTags(Map tags) { - this.innerModel().withTags(tags); - return this; - } - - public VirtualMachineImpl withProperties(VirtualMachineProperties properties) { - this.innerModel().withProperties(properties); - return this; - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesClientImpl.java deleted file mode 100644 index eafb898b300..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesClientImpl.java +++ /dev/null @@ -1,361 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.implementation; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient; -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.VirtualMachineInner; -import com.azure.core.annotation.BodyParam; -import com.azure.core.annotation.ExpectedResponses; -import com.azure.core.annotation.Get; -import com.azure.core.annotation.HeaderParam; -import com.azure.core.annotation.Headers; -import com.azure.core.annotation.Host; -import com.azure.core.annotation.HostParam; -import com.azure.core.annotation.PathParam; -import com.azure.core.annotation.Put; -import com.azure.core.annotation.QueryParam; -import com.azure.core.annotation.ReturnType; -import com.azure.core.annotation.ServiceInterface; -import com.azure.core.annotation.ServiceMethod; -import com.azure.core.annotation.UnexpectedResponseExceptionType; -import com.azure.core.http.rest.Response; -import com.azure.core.http.rest.RestProxy; -import com.azure.core.management.exception.ManagementException; -import com.azure.core.management.polling.PollResult; -import com.azure.core.util.BinaryData; -import com.azure.core.util.Context; -import com.azure.core.util.FluxUtil; -import com.azure.core.util.polling.PollerFlux; -import com.azure.core.util.polling.SyncPoller; -import java.nio.ByteBuffer; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -/** - * An instance of this class provides access to all the operations defined in VirtualMachinesClient. - */ -public final class VirtualMachinesClientImpl implements VirtualMachinesClient { - /** - * The proxy service used to perform REST calls. - */ - private final VirtualMachinesService service; - - /** - * The service client containing this operation class. - */ - private final CombinedImpl client; - - /** - * Initializes an instance of VirtualMachinesClientImpl. - * - * @param client the instance of the service client containing this operation class. - */ - VirtualMachinesClientImpl(CombinedImpl client) { - this.service - = RestProxy.create(VirtualMachinesService.class, client.getHttpPipeline(), client.getSerializerAdapter()); - this.client = client; - } - - /** - * The interface defining all the services for CombinedVirtualMachines to be used by the proxy service to perform - * REST calls. - */ - @Host("{endpoint}") - @ServiceInterface(name = "CombinedVirtualMachines") - public interface VirtualMachinesService { - @Headers({ "Content-Type: application/json" }) - @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachinesOld/{vmName}") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Mono> getByResourceGroup(@HostParam("endpoint") String endpoint, - @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, - @PathParam("resourceGroupName") String resourceGroupName, @PathParam("vmName") String vmName, - @HeaderParam("Accept") String accept, Context context); - - @Headers({ "Content-Type: application/json" }) - @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachinesOld/{vmName}") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Response getByResourceGroupSync(@HostParam("endpoint") String endpoint, - @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, - @PathParam("resourceGroupName") String resourceGroupName, @PathParam("vmName") String vmName, - @HeaderParam("Accept") String accept, Context context); - - @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachinesOld/{vmName}") - @ExpectedResponses({ 200, 201 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Mono>> createOrUpdate(@HostParam("endpoint") String endpoint, - @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, - @PathParam("resourceGroupName") String resourceGroupName, @PathParam("vmName") String vmName, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") VirtualMachineInner resource, Context context); - - @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachinesOld/{vmName}") - @ExpectedResponses({ 200, 201 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Response createOrUpdateSync(@HostParam("endpoint") String endpoint, - @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, - @PathParam("resourceGroupName") String resourceGroupName, @PathParam("vmName") String vmName, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") VirtualMachineInner resource, Context context); - } - - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getByResourceGroupWithResponseAsync(String resourceGroupName, - String vmName) { - final String apiVersion = "2024-11-01"; - final String accept = "application/json"; - return FluxUtil - .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), apiVersion, - this.client.getSubscriptionId(), resourceGroupName, vmName, accept, context)) - .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); - } - - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getByResourceGroupAsync(String resourceGroupName, String vmName) { - return getByResourceGroupWithResponseAsync(resourceGroupName, vmName) - .flatMap(res -> Mono.justOrEmpty(res.getValue())); - } - - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response getByResourceGroupWithResponse(String resourceGroupName, String vmName, - Context context) { - final String apiVersion = "2024-11-01"; - final String accept = "application/json"; - return service.getByResourceGroupSync(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), - resourceGroupName, vmName, accept, context); - } - - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public VirtualMachineInner getByResourceGroup(String resourceGroupName, String vmName) { - return getByResourceGroupWithResponse(resourceGroupName, vmName, Context.NONE).getValue(); - } - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono>> createOrUpdateWithResponseAsync(String resourceGroupName, String vmName, - VirtualMachineInner resource) { - final String apiVersion = "2024-11-01"; - final String contentType = "application/json"; - final String accept = "application/json"; - return FluxUtil - .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion, - this.client.getSubscriptionId(), resourceGroupName, vmName, contentType, accept, resource, context)) - .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); - } - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Response createOrUpdateWithResponse(String resourceGroupName, String vmName, - VirtualMachineInner resource) { - final String apiVersion = "2024-11-01"; - final String contentType = "application/json"; - final String accept = "application/json"; - return service.createOrUpdateSync(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), - resourceGroupName, vmName, contentType, accept, resource, Context.NONE); - } - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Response createOrUpdateWithResponse(String resourceGroupName, String vmName, - VirtualMachineInner resource, Context context) { - final String apiVersion = "2024-11-01"; - final String contentType = "application/json"; - final String accept = "application/json"; - return service.createOrUpdateSync(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), - resourceGroupName, vmName, contentType, accept, resource, context); - } - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link PollerFlux} for polling of describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, VirtualMachineInner> - beginCreateOrUpdateAsync(String resourceGroupName, String vmName, VirtualMachineInner resource) { - Mono>> mono = createOrUpdateWithResponseAsync(resourceGroupName, vmName, resource); - return this.client.getLroResult(mono, this.client.getHttpPipeline(), - VirtualMachineInner.class, VirtualMachineInner.class, this.client.getContext()); - } - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link SyncPoller} for polling of describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, VirtualMachineInner> - beginCreateOrUpdate(String resourceGroupName, String vmName, VirtualMachineInner resource) { - Response response = createOrUpdateWithResponse(resourceGroupName, vmName, resource); - return this.client.getLroResult(response, VirtualMachineInner.class, - VirtualMachineInner.class, Context.NONE); - } - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link SyncPoller} for polling of describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, VirtualMachineInner> - beginCreateOrUpdate(String resourceGroupName, String vmName, VirtualMachineInner resource, Context context) { - Response response = createOrUpdateWithResponse(resourceGroupName, vmName, resource, context); - return this.client.getLroResult(response, VirtualMachineInner.class, - VirtualMachineInner.class, context); - } - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync(String resourceGroupName, String vmName, - VirtualMachineInner resource) { - return beginCreateOrUpdateAsync(resourceGroupName, vmName, resource).last() - .flatMap(this.client::getLroFinalResultOrError); - } - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public VirtualMachineInner createOrUpdate(String resourceGroupName, String vmName, VirtualMachineInner resource) { - return beginCreateOrUpdate(resourceGroupName, vmName, resource).getFinalResult(); - } - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public VirtualMachineInner createOrUpdate(String resourceGroupName, String vmName, VirtualMachineInner resource, - Context context) { - return beginCreateOrUpdate(resourceGroupName, vmName, resource, context).getFinalResult(); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesImpl.java deleted file mode 100644 index f72d70052e6..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesImpl.java +++ /dev/null @@ -1,89 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.implementation; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient; -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.VirtualMachineInner; -import azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachine; -import azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachines; -import com.azure.core.http.rest.Response; -import com.azure.core.http.rest.SimpleResponse; -import com.azure.core.util.Context; -import com.azure.core.util.logging.ClientLogger; - -public final class VirtualMachinesImpl implements VirtualMachines { - private static final ClientLogger LOGGER = new ClientLogger(VirtualMachinesImpl.class); - - private final VirtualMachinesClient innerClient; - - private final azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager; - - public VirtualMachinesImpl(VirtualMachinesClient innerClient, - azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager) { - this.innerClient = innerClient; - this.serviceManager = serviceManager; - } - - public Response getByResourceGroupWithResponse(String resourceGroupName, String vmName, - Context context) { - Response inner - = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, vmName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new VirtualMachineImpl(inner.getValue(), this.manager())); - } else { - return null; - } - } - - public VirtualMachine getByResourceGroup(String resourceGroupName, String vmName) { - VirtualMachineInner inner = this.serviceClient().getByResourceGroup(resourceGroupName, vmName); - if (inner != null) { - return new VirtualMachineImpl(inner, this.manager()); - } else { - return null; - } - } - - public VirtualMachine getById(String id) { - String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups"); - if (resourceGroupName == null) { - throw LOGGER.logExceptionAsError(new IllegalArgumentException( - String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id))); - } - String vmName = ResourceManagerUtils.getValueFromIdByName(id, "virtualMachinesOld"); - if (vmName == null) { - throw LOGGER.logExceptionAsError(new IllegalArgumentException( - String.format("The resource ID '%s' is not valid. Missing path segment 'virtualMachinesOld'.", id))); - } - return this.getByResourceGroupWithResponse(resourceGroupName, vmName, Context.NONE).getValue(); - } - - public Response getByIdWithResponse(String id, Context context) { - String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups"); - if (resourceGroupName == null) { - throw LOGGER.logExceptionAsError(new IllegalArgumentException( - String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id))); - } - String vmName = ResourceManagerUtils.getValueFromIdByName(id, "virtualMachinesOld"); - if (vmName == null) { - throw LOGGER.logExceptionAsError(new IllegalArgumentException( - String.format("The resource ID '%s' is not valid. Missing path segment 'virtualMachinesOld'.", id))); - } - return this.getByResourceGroupWithResponse(resourceGroupName, vmName, context); - } - - private VirtualMachinesClient serviceClient() { - return this.innerClient; - } - - private azure.resourcemanager.multiserviceolderversions.combined.CombinedManager manager() { - return this.serviceManager; - } - - public VirtualMachineImpl define(String name) { - return new VirtualMachineImpl(name, this.manager()); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/package-info.java deleted file mode 100644 index 0fe238e297b..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -/** - * Package containing the implementations for Compute. - * Compute Client. - */ -package azure.resourcemanager.multiserviceolderversions.combined.implementation; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/Disk.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/Disk.java deleted file mode 100644 index 29add8d7ce7..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/Disk.java +++ /dev/null @@ -1,265 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.models; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.DiskInner; -import com.azure.core.management.Region; -import com.azure.core.management.SystemData; -import com.azure.core.util.Context; -import java.util.Map; - -/** - * An immutable client-side representation of Disk. - */ -public interface Disk { - /** - * Gets the id property: Fully qualified resource Id for the resource. - * - * @return the id value. - */ - String id(); - - /** - * Gets the name property: The name of the resource. - * - * @return the name value. - */ - String name(); - - /** - * Gets the type property: The type of the resource. - * - * @return the type value. - */ - String type(); - - /** - * Gets the location property: The geo-location where the resource lives. - * - * @return the location value. - */ - String location(); - - /** - * Gets the tags property: Resource tags. - * - * @return the tags value. - */ - Map tags(); - - /** - * Gets the properties property: The resource-specific properties for this resource. - * - * @return the properties value. - */ - DiskProperties properties(); - - /** - * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. - * - * @return the systemData value. - */ - SystemData systemData(); - - /** - * Gets the region of the resource. - * - * @return the region of the resource. - */ - Region region(); - - /** - * Gets the name of the resource region. - * - * @return the name of the resource region. - */ - String regionName(); - - /** - * Gets the name of the resource group. - * - * @return the name of the resource group. - */ - String resourceGroupName(); - - /** - * Gets the inner azure.resourcemanager.multiserviceolderversions.combined.fluent.models.DiskInner object. - * - * @return the inner object. - */ - DiskInner innerModel(); - - /** - * The entirety of the Disk definition. - */ - interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLocation, - DefinitionStages.WithResourceGroup, DefinitionStages.WithCreate { - } - - /** - * The Disk definition stages. - */ - interface DefinitionStages { - /** - * The first stage of the Disk definition. - */ - interface Blank extends WithLocation { - } - - /** - * The stage of the Disk definition allowing to specify location. - */ - interface WithLocation { - /** - * Specifies the region for the resource. - * - * @param location The geo-location where the resource lives. - * @return the next definition stage. - */ - WithResourceGroup withRegion(Region location); - - /** - * Specifies the region for the resource. - * - * @param location The geo-location where the resource lives. - * @return the next definition stage. - */ - WithResourceGroup withRegion(String location); - } - - /** - * The stage of the Disk definition allowing to specify parent resource. - */ - interface WithResourceGroup { - /** - * Specifies resourceGroupName. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @return the next definition stage. - */ - WithCreate withExistingResourceGroup(String resourceGroupName); - } - - /** - * The stage of the Disk definition which contains all the minimum required properties for the resource to be - * created, but also allows for any other optional properties to be specified. - */ - interface WithCreate extends DefinitionStages.WithTags, DefinitionStages.WithProperties { - /** - * Executes the create request. - * - * @return the created resource. - */ - Disk create(); - - /** - * Executes the create request. - * - * @param context The context to associate with this operation. - * @return the created resource. - */ - Disk create(Context context); - } - - /** - * The stage of the Disk definition allowing to specify tags. - */ - interface WithTags { - /** - * Specifies the tags property: Resource tags.. - * - * @param tags Resource tags. - * @return the next definition stage. - */ - WithCreate withTags(Map tags); - } - - /** - * The stage of the Disk definition allowing to specify properties. - */ - interface WithProperties { - /** - * Specifies the properties property: The resource-specific properties for this resource.. - * - * @param properties The resource-specific properties for this resource. - * @return the next definition stage. - */ - WithCreate withProperties(DiskProperties properties); - } - } - - /** - * Begins update for the Disk resource. - * - * @return the stage of resource update. - */ - Disk.Update update(); - - /** - * The template for Disk update. - */ - interface Update extends UpdateStages.WithTags, UpdateStages.WithProperties { - /** - * Executes the update request. - * - * @return the updated resource. - */ - Disk apply(); - - /** - * Executes the update request. - * - * @param context The context to associate with this operation. - * @return the updated resource. - */ - Disk apply(Context context); - } - - /** - * The Disk update stages. - */ - interface UpdateStages { - /** - * The stage of the Disk update allowing to specify tags. - */ - interface WithTags { - /** - * Specifies the tags property: Resource tags.. - * - * @param tags Resource tags. - * @return the next definition stage. - */ - Update withTags(Map tags); - } - - /** - * The stage of the Disk update allowing to specify properties. - */ - interface WithProperties { - /** - * Specifies the properties property: The resource-specific properties for this resource.. - * - * @param properties The resource-specific properties for this resource. - * @return the next definition stage. - */ - Update withProperties(DiskProperties properties); - } - } - - /** - * Refreshes the resource to sync with Azure. - * - * @return the refreshed resource. - */ - Disk refresh(); - - /** - * Refreshes the resource to sync with Azure. - * - * @param context The context to associate with this operation. - * @return the refreshed resource. - */ - Disk refresh(Context context); -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/DiskProperties.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/DiskProperties.java deleted file mode 100644 index f3fa7ddcc02..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/DiskProperties.java +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.models; - -import com.azure.core.annotation.Fluent; -import com.azure.json.JsonReader; -import com.azure.json.JsonSerializable; -import com.azure.json.JsonToken; -import com.azure.json.JsonWriter; -import java.io.IOException; - -/** - * Disk resource properties. - */ -@Fluent -public final class DiskProperties implements JsonSerializable { - /* - * The provisioningState property. - */ - private ResourceProvisioningState provisioningState; - - /* - * Size of the disk in GB. Only available in version 2024-03-02. - */ - private Integer diskSizeGB; - - /** - * Creates an instance of DiskProperties class. - */ - public DiskProperties() { - } - - /** - * Get the provisioningState property: The provisioningState property. - * - * @return the provisioningState value. - */ - public ResourceProvisioningState provisioningState() { - return this.provisioningState; - } - - /** - * Get the diskSizeGB property: Size of the disk in GB. Only available in version 2024-03-02. - * - * @return the diskSizeGB value. - */ - public Integer diskSizeGB() { - return this.diskSizeGB; - } - - /** - * Set the diskSizeGB property: Size of the disk in GB. Only available in version 2024-03-02. - * - * @param diskSizeGB the diskSizeGB value to set. - * @return the DiskProperties object itself. - */ - public DiskProperties withDiskSizeGB(Integer diskSizeGB) { - this.diskSizeGB = diskSizeGB; - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { - jsonWriter.writeStartObject(); - jsonWriter.writeNumberField("diskSizeGB", this.diskSizeGB); - return jsonWriter.writeEndObject(); - } - - /** - * Reads an instance of DiskProperties from the JsonReader. - * - * @param jsonReader The JsonReader being read. - * @return An instance of DiskProperties if the JsonReader was pointing to an instance of it, or null if it was - * pointing to JSON null. - * @throws IOException If an error occurs while reading the DiskProperties. - */ - public static DiskProperties fromJson(JsonReader jsonReader) throws IOException { - return jsonReader.readObject(reader -> { - DiskProperties deserializedDiskProperties = new DiskProperties(); - while (reader.nextToken() != JsonToken.END_OBJECT) { - String fieldName = reader.getFieldName(); - reader.nextToken(); - - if ("provisioningState".equals(fieldName)) { - deserializedDiskProperties.provisioningState - = ResourceProvisioningState.fromString(reader.getString()); - } else if ("diskSizeGB".equals(fieldName)) { - deserializedDiskProperties.diskSizeGB = reader.getNullable(JsonReader::getInt); - } else { - reader.skipChildren(); - } - } - - return deserializedDiskProperties; - }); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/Disks.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/Disks.java deleted file mode 100644 index 8f025c9db86..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/Disks.java +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.models; - -import com.azure.core.http.rest.Response; -import com.azure.core.util.Context; - -/** - * Resource collection API of Disks. - */ -public interface Disks { - /** - * Gets information about a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk along with {@link Response}. - */ - Response getByResourceGroupWithResponse(String resourceGroupName, String diskName, Context context); - - /** - * Gets information about a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk. - */ - Disk getByResourceGroup(String resourceGroupName, String diskName); - - /** - * Gets information about a disk. - * - * @param id the resource ID. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk along with {@link Response}. - */ - Disk getById(String id); - - /** - * Gets information about a disk. - * - * @param id the resource ID. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk along with {@link Response}. - */ - Response getByIdWithResponse(String id, Context context); - - /** - * Begins definition for a new Disk resource. - * - * @param name resource name. - * @return the first stage of the new Disk definition. - */ - Disk.DefinitionStages.Blank define(String name); -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/ResourceProvisioningState.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/ResourceProvisioningState.java deleted file mode 100644 index cbd8e8c6912..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/ResourceProvisioningState.java +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.models; - -import com.azure.core.util.ExpandableStringEnum; -import java.util.Collection; - -/** - * The provisioning state of a resource type. - */ -public final class ResourceProvisioningState extends ExpandableStringEnum { - /** - * Resource has been created. - */ - public static final ResourceProvisioningState SUCCEEDED = fromString("Succeeded"); - - /** - * Resource creation failed. - */ - public static final ResourceProvisioningState FAILED = fromString("Failed"); - - /** - * Resource creation was canceled. - */ - public static final ResourceProvisioningState CANCELED = fromString("Canceled"); - - /** - * Creates a new instance of ResourceProvisioningState value. - * - * @deprecated Use the {@link #fromString(String)} factory method. - */ - @Deprecated - public ResourceProvisioningState() { - } - - /** - * Creates or finds a ResourceProvisioningState from its string representation. - * - * @param name a name to look for. - * @return the corresponding ResourceProvisioningState. - */ - public static ResourceProvisioningState fromString(String name) { - return fromString(name, ResourceProvisioningState.class); - } - - /** - * Gets known ResourceProvisioningState values. - * - * @return known ResourceProvisioningState values. - */ - public static Collection values() { - return values(ResourceProvisioningState.class); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachine.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachine.java deleted file mode 100644 index e082f9f5600..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachine.java +++ /dev/null @@ -1,265 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.models; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.VirtualMachineInner; -import com.azure.core.management.Region; -import com.azure.core.management.SystemData; -import com.azure.core.util.Context; -import java.util.Map; - -/** - * An immutable client-side representation of VirtualMachine. - */ -public interface VirtualMachine { - /** - * Gets the id property: Fully qualified resource Id for the resource. - * - * @return the id value. - */ - String id(); - - /** - * Gets the name property: The name of the resource. - * - * @return the name value. - */ - String name(); - - /** - * Gets the type property: The type of the resource. - * - * @return the type value. - */ - String type(); - - /** - * Gets the location property: The geo-location where the resource lives. - * - * @return the location value. - */ - String location(); - - /** - * Gets the tags property: Resource tags. - * - * @return the tags value. - */ - Map tags(); - - /** - * Gets the properties property: The resource-specific properties for this resource. - * - * @return the properties value. - */ - VirtualMachineProperties properties(); - - /** - * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. - * - * @return the systemData value. - */ - SystemData systemData(); - - /** - * Gets the region of the resource. - * - * @return the region of the resource. - */ - Region region(); - - /** - * Gets the name of the resource region. - * - * @return the name of the resource region. - */ - String regionName(); - - /** - * Gets the name of the resource group. - * - * @return the name of the resource group. - */ - String resourceGroupName(); - - /** - * Gets the inner azure.resourcemanager.multiserviceolderversions.combined.fluent.models.VirtualMachineInner object. - * - * @return the inner object. - */ - VirtualMachineInner innerModel(); - - /** - * The entirety of the VirtualMachine definition. - */ - interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLocation, - DefinitionStages.WithResourceGroup, DefinitionStages.WithCreate { - } - - /** - * The VirtualMachine definition stages. - */ - interface DefinitionStages { - /** - * The first stage of the VirtualMachine definition. - */ - interface Blank extends WithLocation { - } - - /** - * The stage of the VirtualMachine definition allowing to specify location. - */ - interface WithLocation { - /** - * Specifies the region for the resource. - * - * @param location The geo-location where the resource lives. - * @return the next definition stage. - */ - WithResourceGroup withRegion(Region location); - - /** - * Specifies the region for the resource. - * - * @param location The geo-location where the resource lives. - * @return the next definition stage. - */ - WithResourceGroup withRegion(String location); - } - - /** - * The stage of the VirtualMachine definition allowing to specify parent resource. - */ - interface WithResourceGroup { - /** - * Specifies resourceGroupName. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @return the next definition stage. - */ - WithCreate withExistingResourceGroup(String resourceGroupName); - } - - /** - * The stage of the VirtualMachine definition which contains all the minimum required properties for the - * resource to be created, but also allows for any other optional properties to be specified. - */ - interface WithCreate extends DefinitionStages.WithTags, DefinitionStages.WithProperties { - /** - * Executes the create request. - * - * @return the created resource. - */ - VirtualMachine create(); - - /** - * Executes the create request. - * - * @param context The context to associate with this operation. - * @return the created resource. - */ - VirtualMachine create(Context context); - } - - /** - * The stage of the VirtualMachine definition allowing to specify tags. - */ - interface WithTags { - /** - * Specifies the tags property: Resource tags.. - * - * @param tags Resource tags. - * @return the next definition stage. - */ - WithCreate withTags(Map tags); - } - - /** - * The stage of the VirtualMachine definition allowing to specify properties. - */ - interface WithProperties { - /** - * Specifies the properties property: The resource-specific properties for this resource.. - * - * @param properties The resource-specific properties for this resource. - * @return the next definition stage. - */ - WithCreate withProperties(VirtualMachineProperties properties); - } - } - - /** - * Begins update for the VirtualMachine resource. - * - * @return the stage of resource update. - */ - VirtualMachine.Update update(); - - /** - * The template for VirtualMachine update. - */ - interface Update extends UpdateStages.WithTags, UpdateStages.WithProperties { - /** - * Executes the update request. - * - * @return the updated resource. - */ - VirtualMachine apply(); - - /** - * Executes the update request. - * - * @param context The context to associate with this operation. - * @return the updated resource. - */ - VirtualMachine apply(Context context); - } - - /** - * The VirtualMachine update stages. - */ - interface UpdateStages { - /** - * The stage of the VirtualMachine update allowing to specify tags. - */ - interface WithTags { - /** - * Specifies the tags property: Resource tags.. - * - * @param tags Resource tags. - * @return the next definition stage. - */ - Update withTags(Map tags); - } - - /** - * The stage of the VirtualMachine update allowing to specify properties. - */ - interface WithProperties { - /** - * Specifies the properties property: The resource-specific properties for this resource.. - * - * @param properties The resource-specific properties for this resource. - * @return the next definition stage. - */ - Update withProperties(VirtualMachineProperties properties); - } - } - - /** - * Refreshes the resource to sync with Azure. - * - * @return the refreshed resource. - */ - VirtualMachine refresh(); - - /** - * Refreshes the resource to sync with Azure. - * - * @param context The context to associate with this operation. - * @return the refreshed resource. - */ - VirtualMachine refresh(Context context); -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachineProperties.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachineProperties.java deleted file mode 100644 index 0a5e9296e9e..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachineProperties.java +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.models; - -import com.azure.core.annotation.Fluent; -import com.azure.json.JsonReader; -import com.azure.json.JsonSerializable; -import com.azure.json.JsonToken; -import com.azure.json.JsonWriter; -import java.io.IOException; - -/** - * The VirtualMachineProperties model. - */ -@Fluent -public final class VirtualMachineProperties implements JsonSerializable { - /* - * The provisioningState property. - */ - private ResourceProvisioningState provisioningState; - - /* - * Size of the virtual machine. Only available in version 2024-11-01. - */ - private String size; - - /** - * Creates an instance of VirtualMachineProperties class. - */ - public VirtualMachineProperties() { - } - - /** - * Get the provisioningState property: The provisioningState property. - * - * @return the provisioningState value. - */ - public ResourceProvisioningState provisioningState() { - return this.provisioningState; - } - - /** - * Get the size property: Size of the virtual machine. Only available in version 2024-11-01. - * - * @return the size value. - */ - public String size() { - return this.size; - } - - /** - * Set the size property: Size of the virtual machine. Only available in version 2024-11-01. - * - * @param size the size value to set. - * @return the VirtualMachineProperties object itself. - */ - public VirtualMachineProperties withSize(String size) { - this.size = size; - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { - jsonWriter.writeStartObject(); - jsonWriter.writeStringField("size", this.size); - return jsonWriter.writeEndObject(); - } - - /** - * Reads an instance of VirtualMachineProperties from the JsonReader. - * - * @param jsonReader The JsonReader being read. - * @return An instance of VirtualMachineProperties if the JsonReader was pointing to an instance of it, or null if - * it was pointing to JSON null. - * @throws IOException If an error occurs while reading the VirtualMachineProperties. - */ - public static VirtualMachineProperties fromJson(JsonReader jsonReader) throws IOException { - return jsonReader.readObject(reader -> { - VirtualMachineProperties deserializedVirtualMachineProperties = new VirtualMachineProperties(); - while (reader.nextToken() != JsonToken.END_OBJECT) { - String fieldName = reader.getFieldName(); - reader.nextToken(); - - if ("provisioningState".equals(fieldName)) { - deserializedVirtualMachineProperties.provisioningState - = ResourceProvisioningState.fromString(reader.getString()); - } else if ("size".equals(fieldName)) { - deserializedVirtualMachineProperties.size = reader.getString(); - } else { - reader.skipChildren(); - } - } - - return deserializedVirtualMachineProperties; - }); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachines.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachines.java deleted file mode 100644 index 085e55909fd..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachines.java +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.models; - -import com.azure.core.http.rest.Response; -import com.azure.core.util.Context; - -/** - * Resource collection API of VirtualMachines. - */ -public interface VirtualMachines { - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine along with {@link Response}. - */ - Response getByResourceGroupWithResponse(String resourceGroupName, String vmName, Context context); - - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine. - */ - VirtualMachine getByResourceGroup(String resourceGroupName, String vmName); - - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param id the resource ID. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine along with {@link Response}. - */ - VirtualMachine getById(String id); - - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param id the resource ID. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine along with {@link Response}. - */ - Response getByIdWithResponse(String id, Context context); - - /** - * Begins definition for a new VirtualMachine resource. - * - * @param name resource name. - * @return the first stage of the new VirtualMachine definition. - */ - VirtualMachine.DefinitionStages.Blank define(String name); -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/package-info.java deleted file mode 100644 index 221f269dbfb..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -/** - * Package containing the data models for Compute. - * Compute Client. - */ -package azure.resourcemanager.multiserviceolderversions.combined.models; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/package-info.java deleted file mode 100644 index af6d0a09834..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -/** - * Package containing the classes for Compute. - * Compute Client. - */ -package azure.resourcemanager.multiserviceolderversions.combined; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/StorageAccountsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/StorageAccountsImpl.java index bbf7e7bf70e..50fcaab7b73 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/StorageAccountsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/StorageAccountsImpl.java @@ -30,12 +30,8 @@ public Response getByResourceGroupWithResponse(String resourceGr Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, accountName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new StorageAccountImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new StorageAccountImpl(inner.getValue(), this.manager())); } public StorageAccount getByResourceGroup(String resourceGroupName, String accountName) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/VirtualMachinesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/VirtualMachinesImpl.java index 617de063fcb..8210e4243c4 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/VirtualMachinesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/VirtualMachinesImpl.java @@ -30,12 +30,8 @@ public Response getByResourceGroupWithResponse(String resourceGr Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, vmName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new VirtualMachineImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new VirtualMachineImpl(inner.getValue(), this.manager())); } public VirtualMachine getByResourceGroup(String resourceGroupName, String vmName) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceOperationsImpl.java index 53db37891f7..8908ba7e356 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceOperationsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceOperationsImpl.java @@ -28,12 +28,8 @@ public NonResourceOperationsImpl(NonResourceOperationsClient innerClient, public Response getWithResponse(String location, String parameter, Context context) { Response inner = this.serviceClient().getWithResponse(location, parameter, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new NonResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new NonResourceImpl(inner.getValue(), this.manager())); } public NonResource get(String location, String parameter) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/fluent/LroesClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/fluent/LroesClient.java index a3b6d814291..25550dca7a5 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/fluent/LroesClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/fluent/LroesClient.java @@ -12,6 +12,7 @@ import com.azure.core.management.polling.PollResult; import com.azure.core.util.Context; import com.azure.core.util.polling.SyncPoller; +import java.util.List; /** * An instance of this class provides access to all the operations defined in LroesClient. @@ -190,4 +191,55 @@ SyncPoller, ExportResultInner> beginExport(String */ @ServiceMethod(returns = ReturnType.SINGLE) void delete(String resourceGroupName, String orderName, Context context); + + /** + * The exportArray operation. + * + * @param body The request body. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link SyncPoller} for polling of long-running operation. + */ + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) + SyncPoller>, List> beginExportArray(ExportRequest body); + + /** + * The exportArray operation. + * + * @param body The request body. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link SyncPoller} for polling of long-running operation. + */ + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) + SyncPoller>, List> beginExportArray(ExportRequest body, + Context context); + + /** + * The exportArray operation. + * + * @param body The request body. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + List exportArray(ExportRequest body); + + /** + * The exportArray operation. + * + * @param body The request body. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + List exportArray(ExportRequest body, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesImpl.java index bba72824e04..51f40265168 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesImpl.java @@ -31,12 +31,8 @@ public Response checkGlobalWithResponse(CheckName Context context) { Response inner = this.serviceClient().checkGlobalWithResponse(body, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new CheckNameAvailabilityResponseImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new CheckNameAvailabilityResponseImpl(inner.getValue(), this.manager())); } public CheckNameAvailabilityResponse checkGlobal(CheckNameAvailabilityRequest body) { @@ -52,12 +48,8 @@ public Response checkLocalWithResponse(String loc CheckNameAvailabilityRequest body, Context context) { Response inner = this.serviceClient().checkLocalWithResponse(location, body, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new CheckNameAvailabilityResponseImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new CheckNameAvailabilityResponseImpl(inner.getValue(), this.manager())); } public CheckNameAvailabilityResponse checkLocal(String location, CheckNameAvailabilityRequest body) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesClientImpl.java index e713f224536..c9de25e34a7 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesClientImpl.java @@ -32,7 +32,9 @@ import com.azure.core.util.FluxUtil; import com.azure.core.util.polling.PollerFlux; import com.azure.core.util.polling.SyncPoller; +import com.azure.core.util.serializer.TypeReference; import java.nio.ByteBuffer; +import java.util.List; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -120,6 +122,22 @@ Response deleteSync(@HostParam("endpoint") String endpoint, @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("orderName") String orderName, Context context); + + @Post("/subscriptions/{subscriptionId}/providers/Azure.ResourceManager.OperationTemplates/exportArray") + @ExpectedResponses({ 200, 202 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono>> exportArray(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") ExportRequest body, Context context); + + @Post("/subscriptions/{subscriptionId}/providers/Azure.ResourceManager.OperationTemplates/exportArray") + @ExpectedResponses({ 200, 202 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response exportArraySync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") ExportRequest body, Context context); } /** @@ -615,4 +633,163 @@ public void delete(String resourceGroupName, String orderName) { public void delete(String resourceGroupName, String orderName, Context context) { beginDelete(resourceGroupName, orderName, context).getFinalResult(); } + + /** + * The exportArray operation. + * + * @param body The request body. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono>> exportArrayWithResponseAsync(ExportRequest body) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil + .withContext(context -> service.exportArray(this.client.getEndpoint(), this.client.getApiVersion(), + this.client.getSubscriptionId(), contentType, accept, body, context)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * The exportArray operation. + * + * @param body The request body. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Response exportArrayWithResponse(ExportRequest body) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.exportArraySync(this.client.getEndpoint(), this.client.getApiVersion(), + this.client.getSubscriptionId(), contentType, accept, body, Context.NONE); + } + + /** + * The exportArray operation. + * + * @param body The request body. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Response exportArrayWithResponse(ExportRequest body, Context context) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.exportArraySync(this.client.getEndpoint(), this.client.getApiVersion(), + this.client.getSubscriptionId(), contentType, accept, body, context); + } + + /** + * The exportArray operation. + * + * @param body The request body. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link PollerFlux} for polling of long-running operation. + */ + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) + private PollerFlux>, List> + beginExportArrayAsync(ExportRequest body) { + Mono>> mono = exportArrayWithResponseAsync(body); + return this.client., List>getLroResult(mono, + this.client.getHttpPipeline(), new TypeReference>() { + }.getJavaType(), new TypeReference>() { + }.getJavaType(), this.client.getContext()); + } + + /** + * The exportArray operation. + * + * @param body The request body. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link SyncPoller} for polling of long-running operation. + */ + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) + public SyncPoller>, List> + beginExportArray(ExportRequest body) { + Response response = exportArrayWithResponse(body); + return this.client., List>getLroResult(response, + new TypeReference>() { + }.getJavaType(), new TypeReference>() { + }.getJavaType(), Context.NONE); + } + + /** + * The exportArray operation. + * + * @param body The request body. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link SyncPoller} for polling of long-running operation. + */ + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) + public SyncPoller>, List> beginExportArray(ExportRequest body, + Context context) { + Response response = exportArrayWithResponse(body, context); + return this.client., List>getLroResult(response, + new TypeReference>() { + }.getJavaType(), new TypeReference>() { + }.getJavaType(), context); + } + + /** + * The exportArray operation. + * + * @param body The request body. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> exportArrayAsync(ExportRequest body) { + return beginExportArrayAsync(body).last().flatMap(this.client::getLroFinalResultOrError); + } + + /** + * The exportArray operation. + * + * @param body The request body. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public List exportArray(ExportRequest body) { + return beginExportArray(body).getFinalResult(); + } + + /** + * The exportArray operation. + * + * @param body The request body. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public List exportArray(ExportRequest body, Context context) { + return beginExportArray(body, context).getFinalResult(); + } + + private static final TypeReference> TYPE_REFERENCE_LIST_EXPORT_RESULT_INNER + = new TypeReference>() { + }; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesImpl.java index b528a783464..a4a016ccaea 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesImpl.java @@ -11,6 +11,9 @@ import azure.resourcemanager.operationtemplates.models.Lroes; import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; public final class LroesImpl implements Lroes { private static final ClientLogger LOGGER = new ClientLogger(LroesImpl.class); @@ -51,6 +54,28 @@ public void delete(String resourceGroupName, String orderName, Context context) this.serviceClient().delete(resourceGroupName, orderName, context); } + public List exportArray(ExportRequest body) { + List inner = this.serviceClient().exportArray(body); + if (inner != null) { + return Collections.unmodifiableList(inner.stream() + .map(inner1 -> new ExportResultImpl(inner1, this.manager())) + .collect(Collectors.toList())); + } else { + return Collections.emptyList(); + } + } + + public List exportArray(ExportRequest body, Context context) { + List inner = this.serviceClient().exportArray(body, context); + if (inner != null) { + return Collections.unmodifiableList(inner.stream() + .map(inner1 -> new ExportResultImpl(inner1, this.manager())) + .collect(Collectors.toList())); + } else { + return Collections.emptyList(); + } + } + public void deleteById(String id) { String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesImpl.java index 1395adf37aa..42685e107a0 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesImpl.java @@ -36,12 +36,8 @@ public Response getByResourceGroupWithResponse(String resourceGroupName, Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, widgetName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new WidgetImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new WidgetImpl(inner.getValue(), this.manager())); } public Widget getByResourceGroup(String resourceGroupName, String widgetName) { @@ -57,12 +53,8 @@ public Response patchWithResponse(String resourceGroupName, String widge Context context) { Response inner = this.serviceClient().patchWithResponse(resourceGroupName, widgetName, properties, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new WidgetImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new WidgetImpl(inner.getValue(), this.manager())); } public Widget patch(String resourceGroupName, String widgetName) { @@ -78,12 +70,8 @@ public Response postWithResponse(String resourceGroupName, String Context context) { Response inner = this.serviceClient().postWithResponse(resourceGroupName, widgetName, body, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ActionResultImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ActionResultImpl(inner.getValue(), this.manager())); } public ActionResult post(String resourceGroupName, String widgetName) { @@ -97,12 +85,8 @@ public ActionResult post(String resourceGroupName, String widgetName) { public Response providerPostWithResponse(ChangeAllowanceRequest body, Context context) { Response inner = this.serviceClient().providerPostWithResponse(body, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ChangeAllowanceResultImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ChangeAllowanceResultImpl(inner.getValue(), this.manager())); } public ChangeAllowanceResult providerPost() { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/models/Lroes.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/models/Lroes.java index 92398ca748a..6ec7337eed6 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/models/Lroes.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/models/Lroes.java @@ -5,6 +5,7 @@ package azure.resourcemanager.operationtemplates.models; import com.azure.core.util.Context; +import java.util.List; /** * Resource collection API of Lroes. @@ -60,6 +61,29 @@ public interface Lroes { */ void delete(String resourceGroupName, String orderName, Context context); + /** + * The exportArray operation. + * + * @param body The request body. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + List exportArray(ExportRequest body); + + /** + * The exportArray operation. + * + * @param body The request body. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + List exportArray(ExportRequest body, Context context); + /** * Delete a Order. * diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/ExtensionsResourcesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/ExtensionsResourcesImpl.java index aa268931b34..12271658b58 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/ExtensionsResourcesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/ExtensionsResourcesImpl.java @@ -31,12 +31,8 @@ public Response getWithResponse(String resourceUri, String e Context context) { Response inner = this.serviceClient().getWithResponse(resourceUri, extensionsResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ExtensionsResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ExtensionsResourceImpl(inner.getValue(), this.manager())); } public ExtensionsResource get(String resourceUri, String extensionsResourceName) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/LocationResourcesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/LocationResourcesImpl.java index 59faad49ddb..812ba6dadc6 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/LocationResourcesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/LocationResourcesImpl.java @@ -30,12 +30,8 @@ public LocationResourcesImpl(LocationResourcesClient innerClient, public Response getWithResponse(String location, String locationResourceName, Context context) { Response inner = this.serviceClient().getWithResponse(location, locationResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new LocationResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new LocationResourceImpl(inner.getValue(), this.manager())); } public LocationResource get(String location, String locationResourceName) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/NestedsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/NestedsImpl.java index dd4d8747aaa..adb72d20f22 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/NestedsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/NestedsImpl.java @@ -30,12 +30,8 @@ public Response getWithResponse(String resourceGroupName, S String nextedProxyResourceName, Context context) { Response inner = this.serviceClient() .getWithResponse(resourceGroupName, topLevelTrackedResourceName, nextedProxyResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new NestedProxyResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new NestedProxyResourceImpl(inner.getValue(), this.manager())); } public NestedProxyResource get(String resourceGroupName, String topLevelTrackedResourceName, diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/SingletonsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/SingletonsImpl.java index 17d498c93de..44c0808719b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/SingletonsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/SingletonsImpl.java @@ -31,12 +31,8 @@ public Response getByResourceGroupWithResponse(String Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SingletonTrackedResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SingletonTrackedResourceImpl(inner.getValue(), this.manager())); } public SingletonTrackedResource getByResourceGroup(String resourceGroupName) { @@ -71,12 +67,8 @@ public Response updateWithResponse(String resourceGrou SingletonTrackedResourceInner properties, Context context) { Response inner = this.serviceClient().updateWithResponse(resourceGroupName, properties, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SingletonTrackedResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SingletonTrackedResourceImpl(inner.getValue(), this.manager())); } public SingletonTrackedResource update(String resourceGroupName, SingletonTrackedResourceInner properties) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/TopLevelsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/TopLevelsImpl.java index ef143a2f101..97a4030b785 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/TopLevelsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/resources/implementation/TopLevelsImpl.java @@ -31,12 +31,8 @@ public Response getByResourceGroupWithResponse(String r String topLevelTrackedResourceName, Context context) { Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, topLevelTrackedResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new TopLevelTrackedResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new TopLevelTrackedResourceImpl(inner.getValue(), this.manager())); } public TopLevelTrackedResource getByResourceGroup(String resourceGroupName, String topLevelTrackedResourceName) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/HeaderAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/HeaderAsyncClient.java new file mode 100644 index 00000000000..21b19c60259 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/HeaderAsyncClient.java @@ -0,0 +1,109 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package client.naming; + +import client.naming.implementation.HeadersImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the asynchronous NamingClient type. + */ +@ServiceClient(builder = NamingClientBuilder.class, isAsync = true) +public final class HeaderAsyncClient { + @Generated + private final HeadersImpl serviceClient; + + /** + * Initializes an instance of HeaderAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + HeaderAsyncClient(HeadersImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The request operation. + * + * @param clientName The clientName parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> requestWithResponse(String clientName, RequestOptions requestOptions) { + return this.serviceClient.requestWithResponseAsync(clientName, requestOptions); + } + + /** + * The response operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> responseWithResponse(RequestOptions requestOptions) { + return this.serviceClient.responseWithResponseAsync(requestOptions); + } + + /** + * The request operation. + * + * @param clientName The clientName parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono request(String clientName) { + // Generated convenience method for requestWithResponse + RequestOptions requestOptions = new RequestOptions(); + return requestWithResponse(clientName, requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The response operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono response() { + // Generated convenience method for responseWithResponse + RequestOptions requestOptions = new RequestOptions(); + return responseWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/HeaderClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/HeaderClient.java new file mode 100644 index 00000000000..41ac9ed13ce --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/HeaderClient.java @@ -0,0 +1,105 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package client.naming; + +import client.naming.implementation.HeadersImpl; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; + +/** + * Initializes a new instance of the synchronous NamingClient type. + */ +@ServiceClient(builder = NamingClientBuilder.class) +public final class HeaderClient { + @Generated + private final HeadersImpl serviceClient; + + /** + * Initializes an instance of HeaderClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + HeaderClient(HeadersImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The request operation. + * + * @param clientName The clientName parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response requestWithResponse(String clientName, RequestOptions requestOptions) { + return this.serviceClient.requestWithResponse(clientName, requestOptions); + } + + /** + * The response operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response responseWithResponse(RequestOptions requestOptions) { + return this.serviceClient.responseWithResponse(requestOptions); + } + + /** + * The request operation. + * + * @param clientName The clientName parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void request(String clientName) { + // Generated convenience method for requestWithResponse + RequestOptions requestOptions = new RequestOptions(); + requestWithResponse(clientName, requestOptions).getValue(); + } + + /** + * The response operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void response() { + // Generated convenience method for responseWithResponse + RequestOptions requestOptions = new RequestOptions(); + responseWithResponse(requestOptions).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/NamingAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/NamingAsyncClient.java index 29bdc3d4247..1a9965972a2 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/NamingAsyncClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/NamingAsyncClient.java @@ -5,9 +5,6 @@ package client.naming; import client.naming.implementation.NamingClientImpl; -import client.naming.property.models.ClientNameAndJsonEncodedNameModel; -import client.naming.property.models.ClientNameModel; -import client.naming.property.models.LanguageClientNameModel; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; @@ -18,7 +15,6 @@ import com.azure.core.exception.ResourceNotFoundException; import com.azure.core.http.rest.RequestOptions; import com.azure.core.http.rest.Response; -import com.azure.core.util.BinaryData; import com.azure.core.util.FluxUtil; import reactor.core.publisher.Mono; @@ -73,117 +69,6 @@ public Mono> parameterWithResponse(String clientName, RequestOpti return this.serviceClient.parameterWithResponseAsync(clientName, requestOptions); } - /** - * The client operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     defaultName: boolean (Required)
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response} on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> clientWithResponse(BinaryData body, RequestOptions requestOptions) { - return this.serviceClient.clientWithResponseAsync(body, requestOptions); - } - - /** - * The language operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     defaultName: boolean (Required)
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response} on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> languageWithResponse(BinaryData body, RequestOptions requestOptions) { - return this.serviceClient.languageWithResponseAsync(body, requestOptions); - } - - /** - * The compatibleWithEncodedName operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     wireName: boolean (Required)
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response} on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> compatibleWithEncodedNameWithResponse(BinaryData body, RequestOptions requestOptions) { - return this.serviceClient.compatibleWithEncodedNameWithResponseAsync(body, requestOptions); - } - - /** - * The request operation. - * - * @param clientName The clientName parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response} on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> requestWithResponse(String clientName, RequestOptions requestOptions) { - return this.serviceClient.requestWithResponseAsync(clientName, requestOptions); - } - - /** - * The response operation. - * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response} on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> responseWithResponse(RequestOptions requestOptions) { - return this.serviceClient.responseWithResponseAsync(requestOptions); - } - /** * The clientName operation. * @@ -221,103 +106,4 @@ public Mono parameter(String clientName) { RequestOptions requestOptions = new RequestOptions(); return parameterWithResponse(clientName, requestOptions).flatMap(FluxUtil::toMono); } - - /** - * The client operation. - * - * @param body The body parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return A {@link Mono} that completes when a successful response is received. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono client(ClientNameModel body) { - // Generated convenience method for clientWithResponse - RequestOptions requestOptions = new RequestOptions(); - return clientWithResponse(BinaryData.fromObject(body), requestOptions).flatMap(FluxUtil::toMono); - } - - /** - * The language operation. - * - * @param body The body parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return A {@link Mono} that completes when a successful response is received. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono language(LanguageClientNameModel body) { - // Generated convenience method for languageWithResponse - RequestOptions requestOptions = new RequestOptions(); - return languageWithResponse(BinaryData.fromObject(body), requestOptions).flatMap(FluxUtil::toMono); - } - - /** - * The compatibleWithEncodedName operation. - * - * @param body The body parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return A {@link Mono} that completes when a successful response is received. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono compatibleWithEncodedName(ClientNameAndJsonEncodedNameModel body) { - // Generated convenience method for compatibleWithEncodedNameWithResponse - RequestOptions requestOptions = new RequestOptions(); - return compatibleWithEncodedNameWithResponse(BinaryData.fromObject(body), requestOptions) - .flatMap(FluxUtil::toMono); - } - - /** - * The request operation. - * - * @param clientName The clientName parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return A {@link Mono} that completes when a successful response is received. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono request(String clientName) { - // Generated convenience method for requestWithResponse - RequestOptions requestOptions = new RequestOptions(); - return requestWithResponse(clientName, requestOptions).flatMap(FluxUtil::toMono); - } - - /** - * The response operation. - * - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return A {@link Mono} that completes when a successful response is received. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono response() { - // Generated convenience method for responseWithResponse - RequestOptions requestOptions = new RequestOptions(); - return responseWithResponse(requestOptions).flatMap(FluxUtil::toMono); - } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/NamingClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/NamingClient.java index cbf0519ab3e..bf91d85c0a1 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/NamingClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/NamingClient.java @@ -5,9 +5,6 @@ package client.naming; import client.naming.implementation.NamingClientImpl; -import client.naming.property.models.ClientNameAndJsonEncodedNameModel; -import client.naming.property.models.ClientNameModel; -import client.naming.property.models.LanguageClientNameModel; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; @@ -18,7 +15,6 @@ import com.azure.core.exception.ResourceNotFoundException; import com.azure.core.http.rest.RequestOptions; import com.azure.core.http.rest.Response; -import com.azure.core.util.BinaryData; /** * Initializes a new instance of the synchronous NamingClient type. @@ -71,117 +67,6 @@ public Response parameterWithResponse(String clientName, RequestOptions re return this.serviceClient.parameterWithResponse(clientName, requestOptions); } - /** - * The client operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     defaultName: boolean (Required)
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Response clientWithResponse(BinaryData body, RequestOptions requestOptions) { - return this.serviceClient.clientWithResponse(body, requestOptions); - } - - /** - * The language operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     defaultName: boolean (Required)
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Response languageWithResponse(BinaryData body, RequestOptions requestOptions) { - return this.serviceClient.languageWithResponse(body, requestOptions); - } - - /** - * The compatibleWithEncodedName operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     wireName: boolean (Required)
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Response compatibleWithEncodedNameWithResponse(BinaryData body, RequestOptions requestOptions) { - return this.serviceClient.compatibleWithEncodedNameWithResponse(body, requestOptions); - } - - /** - * The request operation. - * - * @param clientName The clientName parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Response requestWithResponse(String clientName, RequestOptions requestOptions) { - return this.serviceClient.requestWithResponse(clientName, requestOptions); - } - - /** - * The response operation. - * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Response responseWithResponse(RequestOptions requestOptions) { - return this.serviceClient.responseWithResponse(requestOptions); - } - /** * The clientName operation. * @@ -217,97 +102,4 @@ public void parameter(String clientName) { RequestOptions requestOptions = new RequestOptions(); parameterWithResponse(clientName, requestOptions).getValue(); } - - /** - * The client operation. - * - * @param body The body parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public void client(ClientNameModel body) { - // Generated convenience method for clientWithResponse - RequestOptions requestOptions = new RequestOptions(); - clientWithResponse(BinaryData.fromObject(body), requestOptions).getValue(); - } - - /** - * The language operation. - * - * @param body The body parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public void language(LanguageClientNameModel body) { - // Generated convenience method for languageWithResponse - RequestOptions requestOptions = new RequestOptions(); - languageWithResponse(BinaryData.fromObject(body), requestOptions).getValue(); - } - - /** - * The compatibleWithEncodedName operation. - * - * @param body The body parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public void compatibleWithEncodedName(ClientNameAndJsonEncodedNameModel body) { - // Generated convenience method for compatibleWithEncodedNameWithResponse - RequestOptions requestOptions = new RequestOptions(); - compatibleWithEncodedNameWithResponse(BinaryData.fromObject(body), requestOptions).getValue(); - } - - /** - * The request operation. - * - * @param clientName The clientName parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public void request(String clientName) { - // Generated convenience method for requestWithResponse - RequestOptions requestOptions = new RequestOptions(); - requestWithResponse(clientName, requestOptions).getValue(); - } - - /** - * The response operation. - * - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public void response() { - // Generated convenience method for responseWithResponse - RequestOptions requestOptions = new RequestOptions(); - responseWithResponse(requestOptions).getValue(); - } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/NamingClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/NamingClientBuilder.java index e03f6a58db2..2f2b24a6177 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/NamingClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/NamingClientBuilder.java @@ -43,9 +43,13 @@ @ServiceClientBuilder( serviceClients = { NamingClient.class, + PropertyClient.class, + HeaderClient.class, ModelClient.class, UnionEnumClient.class, NamingAsyncClient.class, + PropertyAsyncClient.class, + HeaderAsyncClient.class, ModelAsyncClient.class, UnionEnumAsyncClient.class }) public final class NamingClientBuilder implements HttpTrait, @@ -280,6 +284,26 @@ public NamingAsyncClient buildAsyncClient() { return new NamingAsyncClient(buildInnerClient()); } + /** + * Builds an instance of PropertyAsyncClient class. + * + * @return an instance of PropertyAsyncClient. + */ + @Generated + public PropertyAsyncClient buildPropertyAsyncClient() { + return new PropertyAsyncClient(buildInnerClient().getProperties()); + } + + /** + * Builds an instance of HeaderAsyncClient class. + * + * @return an instance of HeaderAsyncClient. + */ + @Generated + public HeaderAsyncClient buildHeaderAsyncClient() { + return new HeaderAsyncClient(buildInnerClient().getHeaders()); + } + /** * Builds an instance of ModelAsyncClient class. * @@ -310,6 +334,26 @@ public NamingClient buildClient() { return new NamingClient(buildInnerClient()); } + /** + * Builds an instance of PropertyClient class. + * + * @return an instance of PropertyClient. + */ + @Generated + public PropertyClient buildPropertyClient() { + return new PropertyClient(buildInnerClient().getProperties()); + } + + /** + * Builds an instance of HeaderClient class. + * + * @return an instance of HeaderClient. + */ + @Generated + public HeaderClient buildHeaderClient() { + return new HeaderClient(buildInnerClient().getHeaders()); + } + /** * Builds an instance of ModelClient class. * diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/PropertyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/PropertyAsyncClient.java new file mode 100644 index 00000000000..07816f53712 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/PropertyAsyncClient.java @@ -0,0 +1,181 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package client.naming; + +import client.naming.implementation.PropertiesImpl; +import client.naming.property.models.ClientNameAndJsonEncodedNameModel; +import client.naming.property.models.ClientNameModel; +import client.naming.property.models.LanguageClientNameModel; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the asynchronous NamingClient type. + */ +@ServiceClient(builder = NamingClientBuilder.class, isAsync = true) +public final class PropertyAsyncClient { + @Generated + private final PropertiesImpl serviceClient; + + /** + * Initializes an instance of PropertyAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + PropertyAsyncClient(PropertiesImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The client operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     defaultName: boolean (Required)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> clientWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.clientWithResponseAsync(body, requestOptions); + } + + /** + * The language operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     defaultName: boolean (Required)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> languageWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.languageWithResponseAsync(body, requestOptions); + } + + /** + * The compatibleWithEncodedName operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     wireName: boolean (Required)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> compatibleWithEncodedNameWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.compatibleWithEncodedNameWithResponseAsync(body, requestOptions); + } + + /** + * The client operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono client(ClientNameModel body) { + // Generated convenience method for clientWithResponse + RequestOptions requestOptions = new RequestOptions(); + return clientWithResponse(BinaryData.fromObject(body), requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The language operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono language(LanguageClientNameModel body) { + // Generated convenience method for languageWithResponse + RequestOptions requestOptions = new RequestOptions(); + return languageWithResponse(BinaryData.fromObject(body), requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The compatibleWithEncodedName operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono compatibleWithEncodedName(ClientNameAndJsonEncodedNameModel body) { + // Generated convenience method for compatibleWithEncodedNameWithResponse + RequestOptions requestOptions = new RequestOptions(); + return compatibleWithEncodedNameWithResponse(BinaryData.fromObject(body), requestOptions) + .flatMap(FluxUtil::toMono); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/PropertyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/PropertyClient.java new file mode 100644 index 00000000000..bbd4d0fc8d3 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/PropertyClient.java @@ -0,0 +1,175 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package client.naming; + +import client.naming.implementation.PropertiesImpl; +import client.naming.property.models.ClientNameAndJsonEncodedNameModel; +import client.naming.property.models.ClientNameModel; +import client.naming.property.models.LanguageClientNameModel; +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; + +/** + * Initializes a new instance of the synchronous NamingClient type. + */ +@ServiceClient(builder = NamingClientBuilder.class) +public final class PropertyClient { + @Generated + private final PropertiesImpl serviceClient; + + /** + * Initializes an instance of PropertyClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + PropertyClient(PropertiesImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The client operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     defaultName: boolean (Required)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response clientWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.clientWithResponse(body, requestOptions); + } + + /** + * The language operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     defaultName: boolean (Required)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response languageWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.languageWithResponse(body, requestOptions); + } + + /** + * The compatibleWithEncodedName operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     wireName: boolean (Required)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response compatibleWithEncodedNameWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.compatibleWithEncodedNameWithResponse(body, requestOptions); + } + + /** + * The client operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void client(ClientNameModel body) { + // Generated convenience method for clientWithResponse + RequestOptions requestOptions = new RequestOptions(); + clientWithResponse(BinaryData.fromObject(body), requestOptions).getValue(); + } + + /** + * The language operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void language(LanguageClientNameModel body) { + // Generated convenience method for languageWithResponse + RequestOptions requestOptions = new RequestOptions(); + languageWithResponse(BinaryData.fromObject(body), requestOptions).getValue(); + } + + /** + * The compatibleWithEncodedName operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void compatibleWithEncodedName(ClientNameAndJsonEncodedNameModel body) { + // Generated convenience method for compatibleWithEncodedNameWithResponse + RequestOptions requestOptions = new RequestOptions(); + compatibleWithEncodedNameWithResponse(BinaryData.fromObject(body), requestOptions).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/HeadersImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/HeadersImpl.java new file mode 100644 index 00000000000..a74651005cf --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/HeadersImpl.java @@ -0,0 +1,158 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package client.naming.implementation; + +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.Get; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.Post; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * An instance of this class provides access to all the operations defined in Headers. + */ +public final class HeadersImpl { + /** + * The proxy service used to perform REST calls. + */ + private final HeadersService service; + + /** + * The service client containing this operation class. + */ + private final NamingClientImpl client; + + /** + * Initializes an instance of HeadersImpl. + * + * @param client the instance of the service client containing this operation class. + */ + HeadersImpl(NamingClientImpl client) { + this.service = RestProxy.create(HeadersService.class, client.getHttpPipeline(), client.getSerializerAdapter()); + this.client = client; + } + + /** + * The interface defining all the services for NamingClientHeaders to be used by the proxy service to perform REST + * calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "NamingClientHeaders") + public interface HeadersService { + @Post("/client/naming/header") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> request(@HostParam("endpoint") String endpoint, + @HeaderParam("default-name") String clientName, RequestOptions requestOptions, Context context); + + @Post("/client/naming/header") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response requestSync(@HostParam("endpoint") String endpoint, + @HeaderParam("default-name") String clientName, RequestOptions requestOptions, Context context); + + @Get("/client/naming/header") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> response(@HostParam("endpoint") String endpoint, RequestOptions requestOptions, + Context context); + + @Get("/client/naming/header") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response responseSync(@HostParam("endpoint") String endpoint, RequestOptions requestOptions, + Context context); + } + + /** + * The request operation. + * + * @param clientName The clientName parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> requestWithResponseAsync(String clientName, RequestOptions requestOptions) { + return FluxUtil + .withContext(context -> service.request(this.client.getEndpoint(), clientName, requestOptions, context)); + } + + /** + * The request operation. + * + * @param clientName The clientName parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response requestWithResponse(String clientName, RequestOptions requestOptions) { + return service.requestSync(this.client.getEndpoint(), clientName, requestOptions, Context.NONE); + } + + /** + * The response operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> responseWithResponseAsync(RequestOptions requestOptions) { + return FluxUtil.withContext(context -> service.response(this.client.getEndpoint(), requestOptions, context)); + } + + /** + * The response operation. + * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response responseWithResponse(RequestOptions requestOptions) { + return service.responseSync(this.client.getEndpoint(), requestOptions, Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/NamingClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/NamingClientImpl.java index e1555932b3d..1ba9477a595 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/NamingClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/NamingClientImpl.java @@ -4,10 +4,7 @@ package client.naming.implementation; -import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; -import com.azure.core.annotation.Get; -import com.azure.core.annotation.HeaderParam; import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; import com.azure.core.annotation.Post; @@ -27,7 +24,6 @@ import com.azure.core.http.rest.RequestOptions; import com.azure.core.http.rest.Response; import com.azure.core.http.rest.RestProxy; -import com.azure.core.util.BinaryData; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.serializer.JacksonAdapter; @@ -85,6 +81,34 @@ public SerializerAdapter getSerializerAdapter() { return this.serializerAdapter; } + /** + * The PropertiesImpl object to access its operations. + */ + private final PropertiesImpl properties; + + /** + * Gets the PropertiesImpl object to access its operations. + * + * @return the PropertiesImpl object. + */ + public PropertiesImpl getProperties() { + return this.properties; + } + + /** + * The HeadersImpl object to access its operations. + */ + private final HeadersImpl headers; + + /** + * Gets the HeadersImpl object to access its operations. + * + * @return the HeadersImpl object. + */ + public HeadersImpl getHeaders() { + return this.headers; + } + /** * The ModelClientsImpl object to access its operations. */ @@ -144,6 +168,8 @@ public NamingClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerA this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; + this.properties = new PropertiesImpl(this); + this.headers = new HeadersImpl(this); this.modelClients = new ModelClientsImpl(this); this.unionEnums = new UnionEnumsImpl(this); this.service = RestProxy.create(NamingClientService.class, this.httpPipeline, this.getSerializerAdapter()); @@ -190,102 +216,6 @@ Mono> parameter(@HostParam("endpoint") String endpoint, @UnexpectedResponseExceptionType(HttpResponseException.class) Response parameterSync(@HostParam("endpoint") String endpoint, @QueryParam("defaultName") String clientName, RequestOptions requestOptions, Context context); - - @Post("/client/naming/property/client") - @ExpectedResponses({ 204 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> client(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData body, - RequestOptions requestOptions, Context context); - - @Post("/client/naming/property/client") - @ExpectedResponses({ 204 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response clientSync(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData body, - RequestOptions requestOptions, Context context); - - @Post("/client/naming/property/language") - @ExpectedResponses({ 204 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> language(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData body, - RequestOptions requestOptions, Context context); - - @Post("/client/naming/property/language") - @ExpectedResponses({ 204 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response languageSync(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData body, - RequestOptions requestOptions, Context context); - - @Post("/client/naming/property/compatible-with-encoded-name") - @ExpectedResponses({ 204 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> compatibleWithEncodedName(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData body, - RequestOptions requestOptions, Context context); - - @Post("/client/naming/property/compatible-with-encoded-name") - @ExpectedResponses({ 204 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response compatibleWithEncodedNameSync(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData body, - RequestOptions requestOptions, Context context); - - @Post("/client/naming/header") - @ExpectedResponses({ 204 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> request(@HostParam("endpoint") String endpoint, - @HeaderParam("default-name") String clientName, RequestOptions requestOptions, Context context); - - @Post("/client/naming/header") - @ExpectedResponses({ 204 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response requestSync(@HostParam("endpoint") String endpoint, - @HeaderParam("default-name") String clientName, RequestOptions requestOptions, Context context); - - @Get("/client/naming/header") - @ExpectedResponses({ 204 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> response(@HostParam("endpoint") String endpoint, RequestOptions requestOptions, - Context context); - - @Get("/client/naming/header") - @ExpectedResponses({ 204 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response responseSync(@HostParam("endpoint") String endpoint, RequestOptions requestOptions, - Context context); } /** @@ -350,228 +280,4 @@ public Mono> parameterWithResponseAsync(String clientName, Reques public Response parameterWithResponse(String clientName, RequestOptions requestOptions) { return service.parameterSync(this.getEndpoint(), clientName, requestOptions, Context.NONE); } - - /** - * The client operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     defaultName: boolean (Required)
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> clientWithResponseAsync(BinaryData body, RequestOptions requestOptions) { - final String contentType = "application/json"; - return FluxUtil - .withContext(context -> service.client(this.getEndpoint(), contentType, body, requestOptions, context)); - } - - /** - * The client operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     defaultName: boolean (Required)
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response clientWithResponse(BinaryData body, RequestOptions requestOptions) { - final String contentType = "application/json"; - return service.clientSync(this.getEndpoint(), contentType, body, requestOptions, Context.NONE); - } - - /** - * The language operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     defaultName: boolean (Required)
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> languageWithResponseAsync(BinaryData body, RequestOptions requestOptions) { - final String contentType = "application/json"; - return FluxUtil - .withContext(context -> service.language(this.getEndpoint(), contentType, body, requestOptions, context)); - } - - /** - * The language operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     defaultName: boolean (Required)
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response languageWithResponse(BinaryData body, RequestOptions requestOptions) { - final String contentType = "application/json"; - return service.languageSync(this.getEndpoint(), contentType, body, requestOptions, Context.NONE); - } - - /** - * The compatibleWithEncodedName operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     wireName: boolean (Required)
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> compatibleWithEncodedNameWithResponseAsync(BinaryData body, - RequestOptions requestOptions) { - final String contentType = "application/json"; - return FluxUtil.withContext(context -> service.compatibleWithEncodedName(this.getEndpoint(), contentType, body, - requestOptions, context)); - } - - /** - * The compatibleWithEncodedName operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     wireName: boolean (Required)
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response compatibleWithEncodedNameWithResponse(BinaryData body, RequestOptions requestOptions) { - final String contentType = "application/json"; - return service.compatibleWithEncodedNameSync(this.getEndpoint(), contentType, body, requestOptions, - Context.NONE); - } - - /** - * The request operation. - * - * @param clientName The clientName parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> requestWithResponseAsync(String clientName, RequestOptions requestOptions) { - return FluxUtil - .withContext(context -> service.request(this.getEndpoint(), clientName, requestOptions, context)); - } - - /** - * The request operation. - * - * @param clientName The clientName parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response requestWithResponse(String clientName, RequestOptions requestOptions) { - return service.requestSync(this.getEndpoint(), clientName, requestOptions, Context.NONE); - } - - /** - * The response operation. - * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> responseWithResponseAsync(RequestOptions requestOptions) { - return FluxUtil.withContext(context -> service.response(this.getEndpoint(), requestOptions, context)); - } - - /** - * The response operation. - * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response responseWithResponse(RequestOptions requestOptions) { - return service.responseSync(this.getEndpoint(), requestOptions, Context.NONE); - } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/PropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/PropertiesImpl.java new file mode 100644 index 00000000000..dae6af0ed5a --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/PropertiesImpl.java @@ -0,0 +1,282 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package client.naming.implementation; + +import com.azure.core.annotation.BodyParam; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.Post; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.BinaryData; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * An instance of this class provides access to all the operations defined in Properties. + */ +public final class PropertiesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final PropertiesService service; + + /** + * The service client containing this operation class. + */ + private final NamingClientImpl client; + + /** + * Initializes an instance of PropertiesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + PropertiesImpl(NamingClientImpl client) { + this.service + = RestProxy.create(PropertiesService.class, client.getHttpPipeline(), client.getSerializerAdapter()); + this.client = client; + } + + /** + * The interface defining all the services for NamingClientProperties to be used by the proxy service to perform + * REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "NamingClientProperties") + public interface PropertiesService { + @Post("/client/naming/property/client") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> client(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData body, + RequestOptions requestOptions, Context context); + + @Post("/client/naming/property/client") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response clientSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData body, + RequestOptions requestOptions, Context context); + + @Post("/client/naming/property/language") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> language(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData body, + RequestOptions requestOptions, Context context); + + @Post("/client/naming/property/language") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response languageSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData body, + RequestOptions requestOptions, Context context); + + @Post("/client/naming/property/compatible-with-encoded-name") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> compatibleWithEncodedName(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData body, + RequestOptions requestOptions, Context context); + + @Post("/client/naming/property/compatible-with-encoded-name") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response compatibleWithEncodedNameSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData body, + RequestOptions requestOptions, Context context); + } + + /** + * The client operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     defaultName: boolean (Required)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> clientWithResponseAsync(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + return FluxUtil.withContext( + context -> service.client(this.client.getEndpoint(), contentType, body, requestOptions, context)); + } + + /** + * The client operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     defaultName: boolean (Required)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response clientWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + return service.clientSync(this.client.getEndpoint(), contentType, body, requestOptions, Context.NONE); + } + + /** + * The language operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     defaultName: boolean (Required)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> languageWithResponseAsync(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + return FluxUtil.withContext( + context -> service.language(this.client.getEndpoint(), contentType, body, requestOptions, context)); + } + + /** + * The language operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     defaultName: boolean (Required)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response languageWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + return service.languageSync(this.client.getEndpoint(), contentType, body, requestOptions, Context.NONE); + } + + /** + * The compatibleWithEncodedName operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     wireName: boolean (Required)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> compatibleWithEncodedNameWithResponseAsync(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; + return FluxUtil.withContext(context -> service.compatibleWithEncodedName(this.client.getEndpoint(), contentType, + body, requestOptions, context)); + } + + /** + * The compatibleWithEncodedName operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     wireName: boolean (Required)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response compatibleWithEncodedNameWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + return service.compatibleWithEncodedNameSync(this.client.getEndpoint(), contentType, body, requestOptions, + Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/anotherclientoperationgroup/subnamespace/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/anotherclientoperationgroup/subnamespace/package-info.java index 4a649af0460..64f2b7bae5e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/anotherclientoperationgroup/subnamespace/package-info.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/anotherclientoperationgroup/subnamespace/package-info.java @@ -5,8 +5,7 @@ /** * * Package containing the classes for SecondClient. - * Test that we can use @client and @operationGroup decorators to customize client side code structure, such - * as: + * Test that we can use @client decorators to customize client side code structure, such as: * 1. have everything as default. * 2. to rename client or operation group * 3. one client can have more than one operations groups diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/clientoperationgroup/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/clientoperationgroup/implementation/package-info.java index a806f1928b8..ef528715ceb 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/clientoperationgroup/implementation/package-info.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/clientoperationgroup/implementation/package-info.java @@ -5,8 +5,7 @@ /** * * Package containing the implementations for Service. - * Test that we can use @client and @operationGroup decorators to customize client side code structure, such - * as: + * Test that we can use @client decorators to customize client side code structure, such as: * 1. have everything as default. * 2. to rename client or operation group * 3. one client can have more than one operations groups diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/clientoperationgroup/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/clientoperationgroup/package-info.java index 2b619ea0cb2..d11613f5a9a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/clientoperationgroup/package-info.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/clientoperationgroup/package-info.java @@ -5,8 +5,7 @@ /** * * Package containing the classes for Service. - * Test that we can use @client and @operationGroup decorators to customize client side code structure, such - * as: + * Test that we can use @client decorators to customize client side code structure, such as: * 1. have everything as default. * 2. to rename client or operation group * 3. one client can have more than one operations groups diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/multiclient/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/multiclient/implementation/package-info.java index 4bd35e24192..ab1b67ee1d1 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/multiclient/implementation/package-info.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/multiclient/implementation/package-info.java @@ -5,8 +5,7 @@ /** * * Package containing the implementations for Service. - * Test that we can use @client and @operationGroup decorators to customize client side code structure, such - * as: + * Test that we can use @client decorators to customize client side code structure, such as: * 1. have everything as default. * 2. to rename client or operation group * 3. one client can have more than one operations groups diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/multiclient/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/multiclient/package-info.java index 9e0bc9b2ccd..9671e62f440 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/multiclient/package-info.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/multiclient/package-info.java @@ -5,8 +5,7 @@ /** * * Package containing the classes for Service. - * Test that we can use @client and @operationGroup decorators to customize client side code structure, such - * as: + * Test that we can use @client decorators to customize client side code structure, such as: * 1. have everything as default. * 2. to rename client or operation group * 3. one client can have more than one operations groups diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/renamedoperation/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/renamedoperation/implementation/package-info.java index ef4c542a7da..36fc52504d9 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/renamedoperation/implementation/package-info.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/renamedoperation/implementation/package-info.java @@ -5,8 +5,7 @@ /** * * Package containing the implementations for Service. - * Test that we can use @client and @operationGroup decorators to customize client side code structure, such - * as: + * Test that we can use @client decorators to customize client side code structure, such as: * 1. have everything as default. * 2. to rename client or operation group * 3. one client can have more than one operations groups diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/renamedoperation/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/renamedoperation/package-info.java index d08052aad20..a16d444ee1b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/renamedoperation/package-info.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/renamedoperation/package-info.java @@ -5,8 +5,7 @@ /** * * Package containing the classes for Service. - * Test that we can use @client and @operationGroup decorators to customize client side code structure, such - * as: + * Test that we can use @client decorators to customize client side code structure, such as: * 1. have everything as default. * 2. to rename client or operation group * 3. one client can have more than one operations groups diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/package-info.java index c7595374ac3..f2a385ef4c4 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/package-info.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/package-info.java @@ -5,8 +5,7 @@ /** * * Package containing the implementations for Service. - * Test that we can use @client and @operationGroup decorators to customize client side code structure, such - * as: + * Test that we can use @client decorators to customize client side code structure, such as: * 1. have everything as default. * 2. to rename client or operation group * 3. one client can have more than one operations groups diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/models/package-info.java index 39f210ff84a..38476d596b2 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/models/package-info.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/models/package-info.java @@ -5,8 +5,7 @@ /** * * Package containing the data models for Service. - * Test that we can use @client and @operationGroup decorators to customize client side code structure, such - * as: + * Test that we can use @client decorators to customize client side code structure, such as: * 1. have everything as default. * 2. to rename client or operation group * 3. one client can have more than one operations groups diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/package-info.java index 8f70f1bf5d8..23c65249310 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/package-info.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/package-info.java @@ -5,8 +5,7 @@ /** * * Package containing the classes for Service. - * Test that we can use @client and @operationGroup decorators to customize client side code structure, such - * as: + * Test that we can use @client decorators to customize client side code structure, such as: * 1. have everything as default. * 2. to rename client or operation group * 3. one client can have more than one operations groups diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/twooperationgroup/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/twooperationgroup/implementation/package-info.java index 799b292b9dd..c5e86c1afb1 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/twooperationgroup/implementation/package-info.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/twooperationgroup/implementation/package-info.java @@ -5,8 +5,7 @@ /** * * Package containing the implementations for Service. - * Test that we can use @client and @operationGroup decorators to customize client side code structure, such - * as: + * Test that we can use @client decorators to customize client side code structure, such as: * 1. have everything as default. * 2. to rename client or operation group * 3. one client can have more than one operations groups diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/twooperationgroup/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/twooperationgroup/package-info.java index e3d68ebcf75..f46b9bfe2ee 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/twooperationgroup/package-info.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/twooperationgroup/package-info.java @@ -5,8 +5,7 @@ /** * * Package containing the classes for Service. - * Test that we can use @client and @operationGroup decorators to customize client side code structure, such - * as: + * Test that we can use @client decorators to customize client side code structure, such as: * 1. have everything as default. * 2. to rename client or operation group * 3. one client can have more than one operations groups diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/ArrayAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/ArrayAsyncClient.java index c1f61049463..7667b905ee5 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/ArrayAsyncClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/ArrayAsyncClient.java @@ -18,9 +18,17 @@ import com.azure.core.util.FluxUtil; import encode.array.implementation.PropertiesImpl; import encode.array.models.CommaDelimitedArrayProperty; +import encode.array.models.CommaDelimitedEnumArrayProperty; +import encode.array.models.CommaDelimitedExtensibleEnumArrayProperty; import encode.array.models.NewlineDelimitedArrayProperty; +import encode.array.models.NewlineDelimitedEnumArrayProperty; +import encode.array.models.NewlineDelimitedExtensibleEnumArrayProperty; import encode.array.models.PipeDelimitedArrayProperty; +import encode.array.models.PipeDelimitedEnumArrayProperty; +import encode.array.models.PipeDelimitedExtensibleEnumArrayProperty; import encode.array.models.SpaceDelimitedArrayProperty; +import encode.array.models.SpaceDelimitedEnumArrayProperty; +import encode.array.models.SpaceDelimitedExtensibleEnumArrayProperty; import reactor.core.publisher.Mono; /** @@ -201,6 +209,330 @@ public Mono> newlineDelimitedWithResponse(BinaryData body, return this.serviceClient.newlineDelimitedWithResponseAsync(body, requestOptions); } + /** + * The enumCommaDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> enumCommaDelimitedWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.enumCommaDelimitedWithResponseAsync(body, requestOptions); + } + + /** + * The enumSpaceDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> enumSpaceDelimitedWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.enumSpaceDelimitedWithResponseAsync(body, requestOptions); + } + + /** + * The enumPipeDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> enumPipeDelimitedWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.enumPipeDelimitedWithResponseAsync(body, requestOptions); + } + + /** + * The enumNewlineDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> enumNewlineDelimitedWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.enumNewlineDelimitedWithResponseAsync(body, requestOptions); + } + + /** + * The extensibleEnumCommaDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> extensibleEnumCommaDelimitedWithResponse(BinaryData body, + RequestOptions requestOptions) { + return this.serviceClient.extensibleEnumCommaDelimitedWithResponseAsync(body, requestOptions); + } + + /** + * The extensibleEnumSpaceDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> extensibleEnumSpaceDelimitedWithResponse(BinaryData body, + RequestOptions requestOptions) { + return this.serviceClient.extensibleEnumSpaceDelimitedWithResponseAsync(body, requestOptions); + } + + /** + * The extensibleEnumPipeDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> extensibleEnumPipeDelimitedWithResponse(BinaryData body, + RequestOptions requestOptions) { + return this.serviceClient.extensibleEnumPipeDelimitedWithResponseAsync(body, requestOptions); + } + + /** + * The extensibleEnumNewlineDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> extensibleEnumNewlineDelimitedWithResponse(BinaryData body, + RequestOptions requestOptions) { + return this.serviceClient.extensibleEnumNewlineDelimitedWithResponseAsync(body, requestOptions); + } + /** * The commaDelimited operation. * @@ -284,4 +616,180 @@ public Mono newlineDelimited(NewlineDelimitedArra return newlineDelimitedWithResponse(BinaryData.fromObject(body), requestOptions).flatMap(FluxUtil::toMono) .map(protocolMethodData -> protocolMethodData.toObject(NewlineDelimitedArrayProperty.class)); } + + /** + * The enumCommaDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono enumCommaDelimited(CommaDelimitedEnumArrayProperty body) { + // Generated convenience method for enumCommaDelimitedWithResponse + RequestOptions requestOptions = new RequestOptions(); + return enumCommaDelimitedWithResponse(BinaryData.fromObject(body), requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(CommaDelimitedEnumArrayProperty.class)); + } + + /** + * The enumSpaceDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono enumSpaceDelimited(SpaceDelimitedEnumArrayProperty body) { + // Generated convenience method for enumSpaceDelimitedWithResponse + RequestOptions requestOptions = new RequestOptions(); + return enumSpaceDelimitedWithResponse(BinaryData.fromObject(body), requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(SpaceDelimitedEnumArrayProperty.class)); + } + + /** + * The enumPipeDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono enumPipeDelimited(PipeDelimitedEnumArrayProperty body) { + // Generated convenience method for enumPipeDelimitedWithResponse + RequestOptions requestOptions = new RequestOptions(); + return enumPipeDelimitedWithResponse(BinaryData.fromObject(body), requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(PipeDelimitedEnumArrayProperty.class)); + } + + /** + * The enumNewlineDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono enumNewlineDelimited(NewlineDelimitedEnumArrayProperty body) { + // Generated convenience method for enumNewlineDelimitedWithResponse + RequestOptions requestOptions = new RequestOptions(); + return enumNewlineDelimitedWithResponse(BinaryData.fromObject(body), requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(NewlineDelimitedEnumArrayProperty.class)); + } + + /** + * The extensibleEnumCommaDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono + extensibleEnumCommaDelimited(CommaDelimitedExtensibleEnumArrayProperty body) { + // Generated convenience method for extensibleEnumCommaDelimitedWithResponse + RequestOptions requestOptions = new RequestOptions(); + return extensibleEnumCommaDelimitedWithResponse(BinaryData.fromObject(body), requestOptions) + .flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(CommaDelimitedExtensibleEnumArrayProperty.class)); + } + + /** + * The extensibleEnumSpaceDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono + extensibleEnumSpaceDelimited(SpaceDelimitedExtensibleEnumArrayProperty body) { + // Generated convenience method for extensibleEnumSpaceDelimitedWithResponse + RequestOptions requestOptions = new RequestOptions(); + return extensibleEnumSpaceDelimitedWithResponse(BinaryData.fromObject(body), requestOptions) + .flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(SpaceDelimitedExtensibleEnumArrayProperty.class)); + } + + /** + * The extensibleEnumPipeDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono + extensibleEnumPipeDelimited(PipeDelimitedExtensibleEnumArrayProperty body) { + // Generated convenience method for extensibleEnumPipeDelimitedWithResponse + RequestOptions requestOptions = new RequestOptions(); + return extensibleEnumPipeDelimitedWithResponse(BinaryData.fromObject(body), requestOptions) + .flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(PipeDelimitedExtensibleEnumArrayProperty.class)); + } + + /** + * The extensibleEnumNewlineDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono + extensibleEnumNewlineDelimited(NewlineDelimitedExtensibleEnumArrayProperty body) { + // Generated convenience method for extensibleEnumNewlineDelimitedWithResponse + RequestOptions requestOptions = new RequestOptions(); + return extensibleEnumNewlineDelimitedWithResponse(BinaryData.fromObject(body), requestOptions) + .flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(NewlineDelimitedExtensibleEnumArrayProperty.class)); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/ArrayClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/ArrayClient.java index eba503c660f..6b45a6a9fc2 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/ArrayClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/ArrayClient.java @@ -17,9 +17,17 @@ import com.azure.core.util.BinaryData; import encode.array.implementation.PropertiesImpl; import encode.array.models.CommaDelimitedArrayProperty; +import encode.array.models.CommaDelimitedEnumArrayProperty; +import encode.array.models.CommaDelimitedExtensibleEnumArrayProperty; import encode.array.models.NewlineDelimitedArrayProperty; +import encode.array.models.NewlineDelimitedEnumArrayProperty; +import encode.array.models.NewlineDelimitedExtensibleEnumArrayProperty; import encode.array.models.PipeDelimitedArrayProperty; +import encode.array.models.PipeDelimitedEnumArrayProperty; +import encode.array.models.PipeDelimitedExtensibleEnumArrayProperty; import encode.array.models.SpaceDelimitedArrayProperty; +import encode.array.models.SpaceDelimitedEnumArrayProperty; +import encode.array.models.SpaceDelimitedExtensibleEnumArrayProperty; /** * Initializes a new instance of the synchronous ArrayClient type. @@ -199,6 +207,330 @@ public Response newlineDelimitedWithResponse(BinaryData body, Reques return this.serviceClient.newlineDelimitedWithResponse(body, requestOptions); } + /** + * The enumCommaDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response enumCommaDelimitedWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.enumCommaDelimitedWithResponse(body, requestOptions); + } + + /** + * The enumSpaceDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response enumSpaceDelimitedWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.enumSpaceDelimitedWithResponse(body, requestOptions); + } + + /** + * The enumPipeDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response enumPipeDelimitedWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.enumPipeDelimitedWithResponse(body, requestOptions); + } + + /** + * The enumNewlineDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response enumNewlineDelimitedWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.enumNewlineDelimitedWithResponse(body, requestOptions); + } + + /** + * The extensibleEnumCommaDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response extensibleEnumCommaDelimitedWithResponse(BinaryData body, + RequestOptions requestOptions) { + return this.serviceClient.extensibleEnumCommaDelimitedWithResponse(body, requestOptions); + } + + /** + * The extensibleEnumSpaceDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response extensibleEnumSpaceDelimitedWithResponse(BinaryData body, + RequestOptions requestOptions) { + return this.serviceClient.extensibleEnumSpaceDelimitedWithResponse(body, requestOptions); + } + + /** + * The extensibleEnumPipeDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response extensibleEnumPipeDelimitedWithResponse(BinaryData body, + RequestOptions requestOptions) { + return this.serviceClient.extensibleEnumPipeDelimitedWithResponse(body, requestOptions); + } + + /** + * The extensibleEnumNewlineDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response extensibleEnumNewlineDelimitedWithResponse(BinaryData body, + RequestOptions requestOptions) { + return this.serviceClient.extensibleEnumNewlineDelimitedWithResponse(body, requestOptions); + } + /** * The commaDelimited operation. * @@ -282,4 +614,176 @@ public NewlineDelimitedArrayProperty newlineDelimited(NewlineDelimitedArrayPrope return newlineDelimitedWithResponse(BinaryData.fromObject(body), requestOptions).getValue() .toObject(NewlineDelimitedArrayProperty.class); } + + /** + * The enumCommaDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public CommaDelimitedEnumArrayProperty enumCommaDelimited(CommaDelimitedEnumArrayProperty body) { + // Generated convenience method for enumCommaDelimitedWithResponse + RequestOptions requestOptions = new RequestOptions(); + return enumCommaDelimitedWithResponse(BinaryData.fromObject(body), requestOptions).getValue() + .toObject(CommaDelimitedEnumArrayProperty.class); + } + + /** + * The enumSpaceDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public SpaceDelimitedEnumArrayProperty enumSpaceDelimited(SpaceDelimitedEnumArrayProperty body) { + // Generated convenience method for enumSpaceDelimitedWithResponse + RequestOptions requestOptions = new RequestOptions(); + return enumSpaceDelimitedWithResponse(BinaryData.fromObject(body), requestOptions).getValue() + .toObject(SpaceDelimitedEnumArrayProperty.class); + } + + /** + * The enumPipeDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public PipeDelimitedEnumArrayProperty enumPipeDelimited(PipeDelimitedEnumArrayProperty body) { + // Generated convenience method for enumPipeDelimitedWithResponse + RequestOptions requestOptions = new RequestOptions(); + return enumPipeDelimitedWithResponse(BinaryData.fromObject(body), requestOptions).getValue() + .toObject(PipeDelimitedEnumArrayProperty.class); + } + + /** + * The enumNewlineDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public NewlineDelimitedEnumArrayProperty enumNewlineDelimited(NewlineDelimitedEnumArrayProperty body) { + // Generated convenience method for enumNewlineDelimitedWithResponse + RequestOptions requestOptions = new RequestOptions(); + return enumNewlineDelimitedWithResponse(BinaryData.fromObject(body), requestOptions).getValue() + .toObject(NewlineDelimitedEnumArrayProperty.class); + } + + /** + * The extensibleEnumCommaDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public CommaDelimitedExtensibleEnumArrayProperty + extensibleEnumCommaDelimited(CommaDelimitedExtensibleEnumArrayProperty body) { + // Generated convenience method for extensibleEnumCommaDelimitedWithResponse + RequestOptions requestOptions = new RequestOptions(); + return extensibleEnumCommaDelimitedWithResponse(BinaryData.fromObject(body), requestOptions).getValue() + .toObject(CommaDelimitedExtensibleEnumArrayProperty.class); + } + + /** + * The extensibleEnumSpaceDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public SpaceDelimitedExtensibleEnumArrayProperty + extensibleEnumSpaceDelimited(SpaceDelimitedExtensibleEnumArrayProperty body) { + // Generated convenience method for extensibleEnumSpaceDelimitedWithResponse + RequestOptions requestOptions = new RequestOptions(); + return extensibleEnumSpaceDelimitedWithResponse(BinaryData.fromObject(body), requestOptions).getValue() + .toObject(SpaceDelimitedExtensibleEnumArrayProperty.class); + } + + /** + * The extensibleEnumPipeDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public PipeDelimitedExtensibleEnumArrayProperty + extensibleEnumPipeDelimited(PipeDelimitedExtensibleEnumArrayProperty body) { + // Generated convenience method for extensibleEnumPipeDelimitedWithResponse + RequestOptions requestOptions = new RequestOptions(); + return extensibleEnumPipeDelimitedWithResponse(BinaryData.fromObject(body), requestOptions).getValue() + .toObject(PipeDelimitedExtensibleEnumArrayProperty.class); + } + + /** + * The extensibleEnumNewlineDelimited operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public NewlineDelimitedExtensibleEnumArrayProperty + extensibleEnumNewlineDelimited(NewlineDelimitedExtensibleEnumArrayProperty body) { + // Generated convenience method for extensibleEnumNewlineDelimitedWithResponse + RequestOptions requestOptions = new RequestOptions(); + return extensibleEnumNewlineDelimitedWithResponse(BinaryData.fromObject(body), requestOptions).getValue() + .toObject(NewlineDelimitedExtensibleEnumArrayProperty.class); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/implementation/PropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/implementation/PropertiesImpl.java index ee142d68512..fc32d96316e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/implementation/PropertiesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/implementation/PropertiesImpl.java @@ -137,6 +137,166 @@ Mono> newlineDelimited(@HostParam("endpoint") String endpoi Response newlineDelimitedSync(@HostParam("endpoint") String endpoint, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/encode/array/property/enum/comma-delimited") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> enumCommaDelimited(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/encode/array/property/enum/comma-delimited") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response enumCommaDelimitedSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/encode/array/property/enum/space-delimited") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> enumSpaceDelimited(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/encode/array/property/enum/space-delimited") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response enumSpaceDelimitedSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/encode/array/property/enum/pipe-delimited") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> enumPipeDelimited(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/encode/array/property/enum/pipe-delimited") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response enumPipeDelimitedSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/encode/array/property/enum/newline-delimited") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> enumNewlineDelimited(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/encode/array/property/enum/newline-delimited") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response enumNewlineDelimitedSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/encode/array/property/extensible-enum/comma-delimited") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> extensibleEnumCommaDelimited(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/encode/array/property/extensible-enum/comma-delimited") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response extensibleEnumCommaDelimitedSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/encode/array/property/extensible-enum/space-delimited") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> extensibleEnumSpaceDelimited(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/encode/array/property/extensible-enum/space-delimited") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response extensibleEnumSpaceDelimitedSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/encode/array/property/extensible-enum/pipe-delimited") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> extensibleEnumPipeDelimited(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/encode/array/property/extensible-enum/pipe-delimited") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response extensibleEnumPipeDelimitedSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/encode/array/property/extensible-enum/newline-delimited") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> extensibleEnumNewlineDelimited(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/encode/array/property/extensible-enum/newline-delimited") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response extensibleEnumNewlineDelimitedSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); } /** @@ -475,4 +635,688 @@ public Response newlineDelimitedWithResponse(BinaryData body, Reques return service.newlineDelimitedSync(this.client.getEndpoint(), contentType, accept, body, requestOptions, Context.NONE); } + + /** + * The enumCommaDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> enumCommaDelimitedWithResponseAsync(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.enumCommaDelimited(this.client.getEndpoint(), contentType, + accept, body, requestOptions, context)); + } + + /** + * The enumCommaDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response enumCommaDelimitedWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.enumCommaDelimitedSync(this.client.getEndpoint(), contentType, accept, body, requestOptions, + Context.NONE); + } + + /** + * The enumSpaceDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> enumSpaceDelimitedWithResponseAsync(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.enumSpaceDelimited(this.client.getEndpoint(), contentType, + accept, body, requestOptions, context)); + } + + /** + * The enumSpaceDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response enumSpaceDelimitedWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.enumSpaceDelimitedSync(this.client.getEndpoint(), contentType, accept, body, requestOptions, + Context.NONE); + } + + /** + * The enumPipeDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> enumPipeDelimitedWithResponseAsync(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.enumPipeDelimited(this.client.getEndpoint(), contentType, accept, + body, requestOptions, context)); + } + + /** + * The enumPipeDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response enumPipeDelimitedWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.enumPipeDelimitedSync(this.client.getEndpoint(), contentType, accept, body, requestOptions, + Context.NONE); + } + + /** + * The enumNewlineDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> enumNewlineDelimitedWithResponseAsync(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.enumNewlineDelimited(this.client.getEndpoint(), contentType, + accept, body, requestOptions, context)); + } + + /** + * The enumNewlineDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response enumNewlineDelimitedWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.enumNewlineDelimitedSync(this.client.getEndpoint(), contentType, accept, body, requestOptions, + Context.NONE); + } + + /** + * The extensibleEnumCommaDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> extensibleEnumCommaDelimitedWithResponseAsync(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.extensibleEnumCommaDelimited(this.client.getEndpoint(), + contentType, accept, body, requestOptions, context)); + } + + /** + * The extensibleEnumCommaDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response extensibleEnumCommaDelimitedWithResponse(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.extensibleEnumCommaDelimitedSync(this.client.getEndpoint(), contentType, accept, body, + requestOptions, Context.NONE); + } + + /** + * The extensibleEnumSpaceDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> extensibleEnumSpaceDelimitedWithResponseAsync(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.extensibleEnumSpaceDelimited(this.client.getEndpoint(), + contentType, accept, body, requestOptions, context)); + } + + /** + * The extensibleEnumSpaceDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response extensibleEnumSpaceDelimitedWithResponse(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.extensibleEnumSpaceDelimitedSync(this.client.getEndpoint(), contentType, accept, body, + requestOptions, Context.NONE); + } + + /** + * The extensibleEnumPipeDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> extensibleEnumPipeDelimitedWithResponseAsync(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.extensibleEnumPipeDelimited(this.client.getEndpoint(), + contentType, accept, body, requestOptions, context)); + } + + /** + * The extensibleEnumPipeDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response extensibleEnumPipeDelimitedWithResponse(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.extensibleEnumPipeDelimitedSync(this.client.getEndpoint(), contentType, accept, body, + requestOptions, Context.NONE); + } + + /** + * The extensibleEnumNewlineDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> extensibleEnumNewlineDelimitedWithResponseAsync(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.extensibleEnumNewlineDelimited(this.client.getEndpoint(), + contentType, accept, body, requestOptions, context)); + } + + /** + * The extensibleEnumNewlineDelimited operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     value (Required): [
+     *         String(blue/red/green) (Required)
+     *     ]
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response extensibleEnumNewlineDelimitedWithResponse(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.extensibleEnumNewlineDelimitedSync(this.client.getEndpoint(), contentType, accept, body, + requestOptions, Context.NONE); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/Colors.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/Colors.java new file mode 100644 index 00000000000..b06e7be454a --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/Colors.java @@ -0,0 +1,61 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package encode.array.models; + +/** + * Defines values for Colors. + */ +public enum Colors { + /** + * Enum value blue. + */ + BLUE("blue"), + + /** + * Enum value red. + */ + RED("red"), + + /** + * Enum value green. + */ + GREEN("green"); + + /** + * The actual serialized value for a Colors instance. + */ + private final String value; + + Colors(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a Colors instance. + * + * @param value the serialized value to parse. + * @return the parsed Colors object, or null if unable to parse. + */ + public static Colors fromString(String value) { + if (value == null) { + return null; + } + Colors[] items = Colors.values(); + for (Colors item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.value; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/ColorsExtensibleEnum.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/ColorsExtensibleEnum.java new file mode 100644 index 00000000000..bad0c8525e4 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/ColorsExtensibleEnum.java @@ -0,0 +1,63 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package encode.array.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.util.ExpandableStringEnum; +import java.util.Collection; + +/** + * Defines values for ColorsExtensibleEnum. + */ +public final class ColorsExtensibleEnum extends ExpandableStringEnum { + /** + * Static value blue for ColorsExtensibleEnum. + */ + @Generated + public static final ColorsExtensibleEnum BLUE = fromString("blue"); + + /** + * Static value red for ColorsExtensibleEnum. + */ + @Generated + public static final ColorsExtensibleEnum RED = fromString("red"); + + /** + * Static value green for ColorsExtensibleEnum. + */ + @Generated + public static final ColorsExtensibleEnum GREEN = fromString("green"); + + /** + * Creates a new instance of ColorsExtensibleEnum value. + * + * @deprecated Use the {@link #fromString(String)} factory method. + */ + @Generated + @Deprecated + public ColorsExtensibleEnum() { + } + + /** + * Creates or finds a ColorsExtensibleEnum from its string representation. + * + * @param name a name to look for. + * @return the corresponding ColorsExtensibleEnum. + */ + @Generated + public static ColorsExtensibleEnum fromString(String name) { + return fromString(name, ColorsExtensibleEnum.class); + } + + /** + * Gets known ColorsExtensibleEnum values. + * + * @return known ColorsExtensibleEnum values. + */ + @Generated + public static Collection values() { + return values(ColorsExtensibleEnum.class); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/CommaDelimitedEnumArrayProperty.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/CommaDelimitedEnumArrayProperty.java new file mode 100644 index 00000000000..c6309be8149 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/CommaDelimitedEnumArrayProperty.java @@ -0,0 +1,99 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package encode.array.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * The CommaDelimitedEnumArrayProperty model. + */ +@Immutable +public final class CommaDelimitedEnumArrayProperty implements JsonSerializable { + /* + * The value property. + */ + @Generated + private final List value; + + /** + * Creates an instance of CommaDelimitedEnumArrayProperty class. + * + * @param value the value value to set. + */ + @Generated + public CommaDelimitedEnumArrayProperty(List value) { + this.value = value; + } + + /** + * Get the value property: The value property. + * + * @return the value value. + */ + @Generated + public List getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + if (this.value != null) { + jsonWriter.writeStringField("value", + this.value.stream() + .map(element -> element == null ? null : element.toString()) + .collect(Collectors.joining(","))); + } + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of CommaDelimitedEnumArrayProperty from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of CommaDelimitedEnumArrayProperty if the JsonReader was pointing to an instance of it, or + * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the CommaDelimitedEnumArrayProperty. + */ + @Generated + public static CommaDelimitedEnumArrayProperty fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + List value = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("value".equals(fieldName)) { + value = reader.getNullable(nonNullReader -> { + String valueEncodedAsString = nonNullReader.getString(); + return valueEncodedAsString.isEmpty() + ? new LinkedList<>() + : new LinkedList<>(Arrays.stream(valueEncodedAsString.split(",", -1)) + .map(valueAsString -> valueAsString == null ? null : Colors.fromString(valueAsString)) + .collect(Collectors.toList())); + }); + } else { + reader.skipChildren(); + } + } + return new CommaDelimitedEnumArrayProperty(value); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/CommaDelimitedExtensibleEnumArrayProperty.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/CommaDelimitedExtensibleEnumArrayProperty.java new file mode 100644 index 00000000000..862f0d90dde --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/CommaDelimitedExtensibleEnumArrayProperty.java @@ -0,0 +1,102 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package encode.array.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * The CommaDelimitedExtensibleEnumArrayProperty model. + */ +@Immutable +public final class CommaDelimitedExtensibleEnumArrayProperty + implements JsonSerializable { + /* + * The value property. + */ + @Generated + private final List value; + + /** + * Creates an instance of CommaDelimitedExtensibleEnumArrayProperty class. + * + * @param value the value value to set. + */ + @Generated + public CommaDelimitedExtensibleEnumArrayProperty(List value) { + this.value = value; + } + + /** + * Get the value property: The value property. + * + * @return the value value. + */ + @Generated + public List getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + if (this.value != null) { + jsonWriter.writeStringField("value", + this.value.stream() + .map(element -> element == null ? null : element.toString()) + .collect(Collectors.joining(","))); + } + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of CommaDelimitedExtensibleEnumArrayProperty from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of CommaDelimitedExtensibleEnumArrayProperty if the JsonReader was pointing to an instance of + * it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the CommaDelimitedExtensibleEnumArrayProperty. + */ + @Generated + public static CommaDelimitedExtensibleEnumArrayProperty fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + List value = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("value".equals(fieldName)) { + value = reader.getNullable(nonNullReader -> { + String valueEncodedAsString = nonNullReader.getString(); + return valueEncodedAsString.isEmpty() + ? new LinkedList<>() + : new LinkedList<>(Arrays.stream(valueEncodedAsString.split(",", -1)) + .map(valueAsString -> valueAsString == null + ? null + : ColorsExtensibleEnum.fromString(valueAsString)) + .collect(Collectors.toList())); + }); + } else { + reader.skipChildren(); + } + } + return new CommaDelimitedExtensibleEnumArrayProperty(value); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/NewlineDelimitedEnumArrayProperty.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/NewlineDelimitedEnumArrayProperty.java new file mode 100644 index 00000000000..d2ec5f2d1cd --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/NewlineDelimitedEnumArrayProperty.java @@ -0,0 +1,99 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package encode.array.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * The NewlineDelimitedEnumArrayProperty model. + */ +@Immutable +public final class NewlineDelimitedEnumArrayProperty implements JsonSerializable { + /* + * The value property. + */ + @Generated + private final List value; + + /** + * Creates an instance of NewlineDelimitedEnumArrayProperty class. + * + * @param value the value value to set. + */ + @Generated + public NewlineDelimitedEnumArrayProperty(List value) { + this.value = value; + } + + /** + * Get the value property: The value property. + * + * @return the value value. + */ + @Generated + public List getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + if (this.value != null) { + jsonWriter.writeStringField("value", + this.value.stream() + .map(element -> element == null ? null : element.toString()) + .collect(Collectors.joining("\n"))); + } + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of NewlineDelimitedEnumArrayProperty from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of NewlineDelimitedEnumArrayProperty if the JsonReader was pointing to an instance of it, or + * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the NewlineDelimitedEnumArrayProperty. + */ + @Generated + public static NewlineDelimitedEnumArrayProperty fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + List value = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("value".equals(fieldName)) { + value = reader.getNullable(nonNullReader -> { + String valueEncodedAsString = nonNullReader.getString(); + return valueEncodedAsString.isEmpty() + ? new LinkedList<>() + : new LinkedList<>(Arrays.stream(valueEncodedAsString.split("\n", -1)) + .map(valueAsString -> valueAsString == null ? null : Colors.fromString(valueAsString)) + .collect(Collectors.toList())); + }); + } else { + reader.skipChildren(); + } + } + return new NewlineDelimitedEnumArrayProperty(value); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/NewlineDelimitedExtensibleEnumArrayProperty.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/NewlineDelimitedExtensibleEnumArrayProperty.java new file mode 100644 index 00000000000..10275b48c10 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/NewlineDelimitedExtensibleEnumArrayProperty.java @@ -0,0 +1,102 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package encode.array.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * The NewlineDelimitedExtensibleEnumArrayProperty model. + */ +@Immutable +public final class NewlineDelimitedExtensibleEnumArrayProperty + implements JsonSerializable { + /* + * The value property. + */ + @Generated + private final List value; + + /** + * Creates an instance of NewlineDelimitedExtensibleEnumArrayProperty class. + * + * @param value the value value to set. + */ + @Generated + public NewlineDelimitedExtensibleEnumArrayProperty(List value) { + this.value = value; + } + + /** + * Get the value property: The value property. + * + * @return the value value. + */ + @Generated + public List getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + if (this.value != null) { + jsonWriter.writeStringField("value", + this.value.stream() + .map(element -> element == null ? null : element.toString()) + .collect(Collectors.joining("\n"))); + } + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of NewlineDelimitedExtensibleEnumArrayProperty from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of NewlineDelimitedExtensibleEnumArrayProperty if the JsonReader was pointing to an instance + * of it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the NewlineDelimitedExtensibleEnumArrayProperty. + */ + @Generated + public static NewlineDelimitedExtensibleEnumArrayProperty fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + List value = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("value".equals(fieldName)) { + value = reader.getNullable(nonNullReader -> { + String valueEncodedAsString = nonNullReader.getString(); + return valueEncodedAsString.isEmpty() + ? new LinkedList<>() + : new LinkedList<>(Arrays.stream(valueEncodedAsString.split("\n", -1)) + .map(valueAsString -> valueAsString == null + ? null + : ColorsExtensibleEnum.fromString(valueAsString)) + .collect(Collectors.toList())); + }); + } else { + reader.skipChildren(); + } + } + return new NewlineDelimitedExtensibleEnumArrayProperty(value); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/PipeDelimitedEnumArrayProperty.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/PipeDelimitedEnumArrayProperty.java new file mode 100644 index 00000000000..7e599f85526 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/PipeDelimitedEnumArrayProperty.java @@ -0,0 +1,99 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package encode.array.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * The PipeDelimitedEnumArrayProperty model. + */ +@Immutable +public final class PipeDelimitedEnumArrayProperty implements JsonSerializable { + /* + * The value property. + */ + @Generated + private final List value; + + /** + * Creates an instance of PipeDelimitedEnumArrayProperty class. + * + * @param value the value value to set. + */ + @Generated + public PipeDelimitedEnumArrayProperty(List value) { + this.value = value; + } + + /** + * Get the value property: The value property. + * + * @return the value value. + */ + @Generated + public List getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + if (this.value != null) { + jsonWriter.writeStringField("value", + this.value.stream() + .map(element -> element == null ? null : element.toString()) + .collect(Collectors.joining("|"))); + } + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of PipeDelimitedEnumArrayProperty from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of PipeDelimitedEnumArrayProperty if the JsonReader was pointing to an instance of it, or + * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the PipeDelimitedEnumArrayProperty. + */ + @Generated + public static PipeDelimitedEnumArrayProperty fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + List value = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("value".equals(fieldName)) { + value = reader.getNullable(nonNullReader -> { + String valueEncodedAsString = nonNullReader.getString(); + return valueEncodedAsString.isEmpty() + ? new LinkedList<>() + : new LinkedList<>(Arrays.stream(valueEncodedAsString.split("\\|", -1)) + .map(valueAsString -> valueAsString == null ? null : Colors.fromString(valueAsString)) + .collect(Collectors.toList())); + }); + } else { + reader.skipChildren(); + } + } + return new PipeDelimitedEnumArrayProperty(value); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/PipeDelimitedExtensibleEnumArrayProperty.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/PipeDelimitedExtensibleEnumArrayProperty.java new file mode 100644 index 00000000000..c68113ab3c5 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/PipeDelimitedExtensibleEnumArrayProperty.java @@ -0,0 +1,102 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package encode.array.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * The PipeDelimitedExtensibleEnumArrayProperty model. + */ +@Immutable +public final class PipeDelimitedExtensibleEnumArrayProperty + implements JsonSerializable { + /* + * The value property. + */ + @Generated + private final List value; + + /** + * Creates an instance of PipeDelimitedExtensibleEnumArrayProperty class. + * + * @param value the value value to set. + */ + @Generated + public PipeDelimitedExtensibleEnumArrayProperty(List value) { + this.value = value; + } + + /** + * Get the value property: The value property. + * + * @return the value value. + */ + @Generated + public List getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + if (this.value != null) { + jsonWriter.writeStringField("value", + this.value.stream() + .map(element -> element == null ? null : element.toString()) + .collect(Collectors.joining("|"))); + } + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of PipeDelimitedExtensibleEnumArrayProperty from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of PipeDelimitedExtensibleEnumArrayProperty if the JsonReader was pointing to an instance of + * it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the PipeDelimitedExtensibleEnumArrayProperty. + */ + @Generated + public static PipeDelimitedExtensibleEnumArrayProperty fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + List value = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("value".equals(fieldName)) { + value = reader.getNullable(nonNullReader -> { + String valueEncodedAsString = nonNullReader.getString(); + return valueEncodedAsString.isEmpty() + ? new LinkedList<>() + : new LinkedList<>(Arrays.stream(valueEncodedAsString.split("\\|", -1)) + .map(valueAsString -> valueAsString == null + ? null + : ColorsExtensibleEnum.fromString(valueAsString)) + .collect(Collectors.toList())); + }); + } else { + reader.skipChildren(); + } + } + return new PipeDelimitedExtensibleEnumArrayProperty(value); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/SpaceDelimitedEnumArrayProperty.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/SpaceDelimitedEnumArrayProperty.java new file mode 100644 index 00000000000..c83e8e769dc --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/SpaceDelimitedEnumArrayProperty.java @@ -0,0 +1,99 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package encode.array.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * The SpaceDelimitedEnumArrayProperty model. + */ +@Immutable +public final class SpaceDelimitedEnumArrayProperty implements JsonSerializable { + /* + * The value property. + */ + @Generated + private final List value; + + /** + * Creates an instance of SpaceDelimitedEnumArrayProperty class. + * + * @param value the value value to set. + */ + @Generated + public SpaceDelimitedEnumArrayProperty(List value) { + this.value = value; + } + + /** + * Get the value property: The value property. + * + * @return the value value. + */ + @Generated + public List getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + if (this.value != null) { + jsonWriter.writeStringField("value", + this.value.stream() + .map(element -> element == null ? null : element.toString()) + .collect(Collectors.joining(" "))); + } + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of SpaceDelimitedEnumArrayProperty from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of SpaceDelimitedEnumArrayProperty if the JsonReader was pointing to an instance of it, or + * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the SpaceDelimitedEnumArrayProperty. + */ + @Generated + public static SpaceDelimitedEnumArrayProperty fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + List value = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("value".equals(fieldName)) { + value = reader.getNullable(nonNullReader -> { + String valueEncodedAsString = nonNullReader.getString(); + return valueEncodedAsString.isEmpty() + ? new LinkedList<>() + : new LinkedList<>(Arrays.stream(valueEncodedAsString.split(" ", -1)) + .map(valueAsString -> valueAsString == null ? null : Colors.fromString(valueAsString)) + .collect(Collectors.toList())); + }); + } else { + reader.skipChildren(); + } + } + return new SpaceDelimitedEnumArrayProperty(value); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/SpaceDelimitedExtensibleEnumArrayProperty.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/SpaceDelimitedExtensibleEnumArrayProperty.java new file mode 100644 index 00000000000..af64331abc6 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/models/SpaceDelimitedExtensibleEnumArrayProperty.java @@ -0,0 +1,102 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package encode.array.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * The SpaceDelimitedExtensibleEnumArrayProperty model. + */ +@Immutable +public final class SpaceDelimitedExtensibleEnumArrayProperty + implements JsonSerializable { + /* + * The value property. + */ + @Generated + private final List value; + + /** + * Creates an instance of SpaceDelimitedExtensibleEnumArrayProperty class. + * + * @param value the value value to set. + */ + @Generated + public SpaceDelimitedExtensibleEnumArrayProperty(List value) { + this.value = value; + } + + /** + * Get the value property: The value property. + * + * @return the value value. + */ + @Generated + public List getValue() { + return this.value; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + if (this.value != null) { + jsonWriter.writeStringField("value", + this.value.stream() + .map(element -> element == null ? null : element.toString()) + .collect(Collectors.joining(" "))); + } + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of SpaceDelimitedExtensibleEnumArrayProperty from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of SpaceDelimitedExtensibleEnumArrayProperty if the JsonReader was pointing to an instance of + * it, or null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the SpaceDelimitedExtensibleEnumArrayProperty. + */ + @Generated + public static SpaceDelimitedExtensibleEnumArrayProperty fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + List value = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("value".equals(fieldName)) { + value = reader.getNullable(nonNullReader -> { + String valueEncodedAsString = nonNullReader.getString(); + return valueEncodedAsString.isEmpty() + ? new LinkedList<>() + : new LinkedList<>(Arrays.stream(valueEncodedAsString.split(" ", -1)) + .map(valueAsString -> valueAsString == null + ? null + : ColorsExtensibleEnum.fromString(valueAsString)) + .collect(Collectors.toList())); + }); + } else { + reader.skipChildren(); + } + } + return new SpaceDelimitedExtensibleEnumArrayProperty(value); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/HeaderAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/HeaderAsyncClient.java index 6d626edacb1..08346f6dc9e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/HeaderAsyncClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/HeaderAsyncClient.java @@ -187,7 +187,7 @@ public Mono> float64SecondsWithResponse(Duration duration, Reques */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsWithResponse(int duration, RequestOptions requestOptions) { + public Mono> int32MillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsWithResponseAsync(duration, requestOptions); } @@ -204,7 +204,8 @@ public Mono> int32MillisecondsWithResponse(int duration, RequestO */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsLargerUnitWithResponse(int duration, RequestOptions requestOptions) { + public Mono> int32MillisecondsLargerUnitWithResponse(Duration duration, + RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsLargerUnitWithResponseAsync(duration, requestOptions); } @@ -221,7 +222,7 @@ public Mono> int32MillisecondsLargerUnitWithResponse(int duration */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsWithResponse(double duration, RequestOptions requestOptions) { + public Mono> floatMillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsWithResponseAsync(duration, requestOptions); } @@ -238,7 +239,7 @@ public Mono> floatMillisecondsWithResponse(double duration, Reque */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsLargerUnitWithResponse(double duration, + public Mono> floatMillisecondsLargerUnitWithResponse(Duration duration, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsLargerUnitWithResponseAsync(duration, requestOptions); } @@ -256,7 +257,7 @@ public Mono> floatMillisecondsLargerUnitWithResponse(double durat */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> float64MillisecondsWithResponse(double duration, RequestOptions requestOptions) { + public Mono> float64MillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { return this.serviceClient.float64MillisecondsWithResponseAsync(duration, requestOptions); } @@ -273,7 +274,7 @@ public Mono> float64MillisecondsWithResponse(double duration, Req */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsArrayWithResponse(List duration, + public Mono> int32MillisecondsArrayWithResponse(List duration, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsArrayWithResponseAsync(duration, requestOptions); } @@ -452,7 +453,7 @@ public Mono float64Seconds(Duration duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono int32Milliseconds(int duration) { + public Mono int32Milliseconds(Duration duration) { // Generated convenience method for int32MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); return int32MillisecondsWithResponse(duration, requestOptions).flatMap(FluxUtil::toMono); @@ -472,7 +473,7 @@ public Mono int32Milliseconds(int duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono int32MillisecondsLargerUnit(int duration) { + public Mono int32MillisecondsLargerUnit(Duration duration) { // Generated convenience method for int32MillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); return int32MillisecondsLargerUnitWithResponse(duration, requestOptions).flatMap(FluxUtil::toMono); @@ -492,7 +493,7 @@ public Mono int32MillisecondsLargerUnit(int duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono floatMilliseconds(double duration) { + public Mono floatMilliseconds(Duration duration) { // Generated convenience method for floatMillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); return floatMillisecondsWithResponse(duration, requestOptions).flatMap(FluxUtil::toMono); @@ -512,7 +513,7 @@ public Mono floatMilliseconds(double duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono floatMillisecondsLargerUnit(double duration) { + public Mono floatMillisecondsLargerUnit(Duration duration) { // Generated convenience method for floatMillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); return floatMillisecondsLargerUnitWithResponse(duration, requestOptions).flatMap(FluxUtil::toMono); @@ -532,7 +533,7 @@ public Mono floatMillisecondsLargerUnit(double duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono float64Milliseconds(double duration) { + public Mono float64Milliseconds(Duration duration) { // Generated convenience method for float64MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); return float64MillisecondsWithResponse(duration, requestOptions).flatMap(FluxUtil::toMono); @@ -552,7 +553,7 @@ public Mono float64Milliseconds(double duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono int32MillisecondsArray(List duration) { + public Mono int32MillisecondsArray(List duration) { // Generated convenience method for int32MillisecondsArrayWithResponse RequestOptions requestOptions = new RequestOptions(); return int32MillisecondsArrayWithResponse(duration, requestOptions).flatMap(FluxUtil::toMono); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/HeaderClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/HeaderClient.java index 710d085edcb..41941b1c5b2 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/HeaderClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/HeaderClient.java @@ -185,7 +185,7 @@ public Response float64SecondsWithResponse(Duration duration, RequestOptio */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsWithResponse(int duration, RequestOptions requestOptions) { + public Response int32MillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsWithResponse(duration, requestOptions); } @@ -202,7 +202,7 @@ public Response int32MillisecondsWithResponse(int duration, RequestOptions */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsLargerUnitWithResponse(int duration, RequestOptions requestOptions) { + public Response int32MillisecondsLargerUnitWithResponse(Duration duration, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsLargerUnitWithResponse(duration, requestOptions); } @@ -219,7 +219,7 @@ public Response int32MillisecondsLargerUnitWithResponse(int duration, Requ */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsWithResponse(double duration, RequestOptions requestOptions) { + public Response floatMillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsWithResponse(duration, requestOptions); } @@ -236,7 +236,7 @@ public Response floatMillisecondsWithResponse(double duration, RequestOpti */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsLargerUnitWithResponse(double duration, RequestOptions requestOptions) { + public Response floatMillisecondsLargerUnitWithResponse(Duration duration, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsLargerUnitWithResponse(duration, requestOptions); } @@ -253,7 +253,7 @@ public Response floatMillisecondsLargerUnitWithResponse(double duration, R */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response float64MillisecondsWithResponse(double duration, RequestOptions requestOptions) { + public Response float64MillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { return this.serviceClient.float64MillisecondsWithResponse(duration, requestOptions); } @@ -270,7 +270,7 @@ public Response float64MillisecondsWithResponse(double duration, RequestOp */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsArrayWithResponse(List duration, RequestOptions requestOptions) { + public Response int32MillisecondsArrayWithResponse(List duration, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsArrayWithResponse(duration, requestOptions); } @@ -439,7 +439,7 @@ public void float64Seconds(Duration duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void int32Milliseconds(int duration) { + public void int32Milliseconds(Duration duration) { // Generated convenience method for int32MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); int32MillisecondsWithResponse(duration, requestOptions).getValue(); @@ -458,7 +458,7 @@ public void int32Milliseconds(int duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void int32MillisecondsLargerUnit(int duration) { + public void int32MillisecondsLargerUnit(Duration duration) { // Generated convenience method for int32MillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); int32MillisecondsLargerUnitWithResponse(duration, requestOptions).getValue(); @@ -477,7 +477,7 @@ public void int32MillisecondsLargerUnit(int duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void floatMilliseconds(double duration) { + public void floatMilliseconds(Duration duration) { // Generated convenience method for floatMillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); floatMillisecondsWithResponse(duration, requestOptions).getValue(); @@ -496,7 +496,7 @@ public void floatMilliseconds(double duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void floatMillisecondsLargerUnit(double duration) { + public void floatMillisecondsLargerUnit(Duration duration) { // Generated convenience method for floatMillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); floatMillisecondsLargerUnitWithResponse(duration, requestOptions).getValue(); @@ -515,7 +515,7 @@ public void floatMillisecondsLargerUnit(double duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void float64Milliseconds(double duration) { + public void float64Milliseconds(Duration duration) { // Generated convenience method for float64MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); float64MillisecondsWithResponse(duration, requestOptions).getValue(); @@ -534,7 +534,7 @@ public void float64Milliseconds(double duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void int32MillisecondsArray(List duration) { + public void int32MillisecondsArray(List duration) { // Generated convenience method for int32MillisecondsArrayWithResponse RequestOptions requestOptions = new RequestOptions(); int32MillisecondsArrayWithResponse(duration, requestOptions).getValue(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/PropertyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/PropertyAsyncClient.java index ddebcb7d99d..17f4a7180e4 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/PropertyAsyncClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/PropertyAsyncClient.java @@ -238,7 +238,7 @@ public Mono> float64SecondsWithResponse(BinaryData body, Re * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -248,7 +248,7 @@ public Mono> float64SecondsWithResponse(BinaryData body, Re * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -501,7 +501,7 @@ public Mono> floatSecondsLargerUnitWithResponse(BinaryData * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -511,7 +511,7 @@ public Mono> floatSecondsLargerUnitWithResponse(BinaryData * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/PropertyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/PropertyClient.java index c175283374f..39eadae5454 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/PropertyClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/PropertyClient.java @@ -236,7 +236,7 @@ public Response float64SecondsWithResponse(BinaryData body, RequestO * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -246,7 +246,7 @@ public Response float64SecondsWithResponse(BinaryData body, RequestO * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -496,7 +496,7 @@ public Response floatSecondsLargerUnitWithResponse(BinaryData body, * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -506,7 +506,7 @@ public Response floatSecondsLargerUnitWithResponse(BinaryData body, * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/QueryAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/QueryAsyncClient.java index c376be68fe2..02b1ee49dec 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/QueryAsyncClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/QueryAsyncClient.java @@ -170,7 +170,7 @@ public Mono> float64SecondsWithResponse(Duration input, RequestOp */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsWithResponse(int input, RequestOptions requestOptions) { + public Mono> int32MillisecondsWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsWithResponseAsync(input, requestOptions); } @@ -187,7 +187,7 @@ public Mono> int32MillisecondsWithResponse(int input, RequestOpti */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsLargerUnitWithResponse(int input, RequestOptions requestOptions) { + public Mono> int32MillisecondsLargerUnitWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsLargerUnitWithResponseAsync(input, requestOptions); } @@ -204,7 +204,7 @@ public Mono> int32MillisecondsLargerUnitWithResponse(int input, R */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsWithResponse(double input, RequestOptions requestOptions) { + public Mono> floatMillisecondsWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsWithResponseAsync(input, requestOptions); } @@ -221,7 +221,7 @@ public Mono> floatMillisecondsWithResponse(double input, RequestO */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsLargerUnitWithResponse(double input, RequestOptions requestOptions) { + public Mono> floatMillisecondsLargerUnitWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsLargerUnitWithResponseAsync(input, requestOptions); } @@ -238,7 +238,7 @@ public Mono> floatMillisecondsLargerUnitWithResponse(double input */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> float64MillisecondsWithResponse(double input, RequestOptions requestOptions) { + public Mono> float64MillisecondsWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.float64MillisecondsWithResponseAsync(input, requestOptions); } @@ -272,7 +272,8 @@ public Mono> int32SecondsArrayWithResponse(List input, */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsArrayWithResponse(List input, RequestOptions requestOptions) { + public Mono> int32MillisecondsArrayWithResponse(List input, + RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsArrayWithResponseAsync(input, requestOptions); } @@ -430,7 +431,7 @@ public Mono float64Seconds(Duration input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono int32Milliseconds(int input) { + public Mono int32Milliseconds(Duration input) { // Generated convenience method for int32MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); return int32MillisecondsWithResponse(input, requestOptions).flatMap(FluxUtil::toMono); @@ -450,7 +451,7 @@ public Mono int32Milliseconds(int input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono int32MillisecondsLargerUnit(int input) { + public Mono int32MillisecondsLargerUnit(Duration input) { // Generated convenience method for int32MillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); return int32MillisecondsLargerUnitWithResponse(input, requestOptions).flatMap(FluxUtil::toMono); @@ -470,7 +471,7 @@ public Mono int32MillisecondsLargerUnit(int input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono floatMilliseconds(double input) { + public Mono floatMilliseconds(Duration input) { // Generated convenience method for floatMillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); return floatMillisecondsWithResponse(input, requestOptions).flatMap(FluxUtil::toMono); @@ -490,7 +491,7 @@ public Mono floatMilliseconds(double input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono floatMillisecondsLargerUnit(double input) { + public Mono floatMillisecondsLargerUnit(Duration input) { // Generated convenience method for floatMillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); return floatMillisecondsLargerUnitWithResponse(input, requestOptions).flatMap(FluxUtil::toMono); @@ -510,7 +511,7 @@ public Mono floatMillisecondsLargerUnit(double input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono float64Milliseconds(double input) { + public Mono float64Milliseconds(Duration input) { // Generated convenience method for float64MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); return float64MillisecondsWithResponse(input, requestOptions).flatMap(FluxUtil::toMono); @@ -550,7 +551,7 @@ public Mono int32SecondsArray(List input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono int32MillisecondsArray(List input) { + public Mono int32MillisecondsArray(List input) { // Generated convenience method for int32MillisecondsArrayWithResponse RequestOptions requestOptions = new RequestOptions(); return int32MillisecondsArrayWithResponse(input, requestOptions).flatMap(FluxUtil::toMono); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/QueryClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/QueryClient.java index 1c68bee8ba5..1a2f5812a46 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/QueryClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/QueryClient.java @@ -168,7 +168,7 @@ public Response float64SecondsWithResponse(Duration input, RequestOptions */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsWithResponse(int input, RequestOptions requestOptions) { + public Response int32MillisecondsWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsWithResponse(input, requestOptions); } @@ -185,7 +185,7 @@ public Response int32MillisecondsWithResponse(int input, RequestOptions re */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsLargerUnitWithResponse(int input, RequestOptions requestOptions) { + public Response int32MillisecondsLargerUnitWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsLargerUnitWithResponse(input, requestOptions); } @@ -202,7 +202,7 @@ public Response int32MillisecondsLargerUnitWithResponse(int input, Request */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsWithResponse(double input, RequestOptions requestOptions) { + public Response floatMillisecondsWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsWithResponse(input, requestOptions); } @@ -219,7 +219,7 @@ public Response floatMillisecondsWithResponse(double input, RequestOptions */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsLargerUnitWithResponse(double input, RequestOptions requestOptions) { + public Response floatMillisecondsLargerUnitWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsLargerUnitWithResponse(input, requestOptions); } @@ -236,7 +236,7 @@ public Response floatMillisecondsLargerUnitWithResponse(double input, Requ */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response float64MillisecondsWithResponse(double input, RequestOptions requestOptions) { + public Response float64MillisecondsWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.float64MillisecondsWithResponse(input, requestOptions); } @@ -270,7 +270,7 @@ public Response int32SecondsArrayWithResponse(List input, Reques */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsArrayWithResponse(List input, RequestOptions requestOptions) { + public Response int32MillisecondsArrayWithResponse(List input, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsArrayWithResponse(input, requestOptions); } @@ -420,7 +420,7 @@ public void float64Seconds(Duration input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void int32Milliseconds(int input) { + public void int32Milliseconds(Duration input) { // Generated convenience method for int32MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); int32MillisecondsWithResponse(input, requestOptions).getValue(); @@ -439,7 +439,7 @@ public void int32Milliseconds(int input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void int32MillisecondsLargerUnit(int input) { + public void int32MillisecondsLargerUnit(Duration input) { // Generated convenience method for int32MillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); int32MillisecondsLargerUnitWithResponse(input, requestOptions).getValue(); @@ -458,7 +458,7 @@ public void int32MillisecondsLargerUnit(int input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void floatMilliseconds(double input) { + public void floatMilliseconds(Duration input) { // Generated convenience method for floatMillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); floatMillisecondsWithResponse(input, requestOptions).getValue(); @@ -477,7 +477,7 @@ public void floatMilliseconds(double input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void floatMillisecondsLargerUnit(double input) { + public void floatMillisecondsLargerUnit(Duration input) { // Generated convenience method for floatMillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); floatMillisecondsLargerUnitWithResponse(input, requestOptions).getValue(); @@ -496,7 +496,7 @@ public void floatMillisecondsLargerUnit(double input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void float64Milliseconds(double input) { + public void float64Milliseconds(Duration input) { // Generated convenience method for float64MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); float64MillisecondsWithResponse(input, requestOptions).getValue(); @@ -534,7 +534,7 @@ public void int32SecondsArray(List input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void int32MillisecondsArray(List input) { + public void int32MillisecondsArray(List input) { // Generated convenience method for int32MillisecondsArrayWithResponse RequestOptions requestOptions = new RequestOptions(); int32MillisecondsArrayWithResponse(input, requestOptions).getValue(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/implementation/HeadersImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/implementation/HeadersImpl.java index 78fc0f39e98..86581183ea7 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/implementation/HeadersImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/implementation/HeadersImpl.java @@ -26,6 +26,7 @@ import com.azure.core.util.serializer.JacksonAdapter; import java.time.Duration; import java.util.List; +import java.util.stream.Collectors; import reactor.core.publisher.Mono; /** @@ -210,7 +211,7 @@ Response float64SecondsSync(@HostParam("endpoint") String endpoint, @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> int32Milliseconds(@HostParam("endpoint") String endpoint, - @HeaderParam("duration") int duration, RequestOptions requestOptions, Context context); + @HeaderParam("duration") long duration, RequestOptions requestOptions, Context context); @Get("/encode/duration/header/int32-milliseconds") @ExpectedResponses({ 204 }) @@ -219,7 +220,7 @@ Mono> int32Milliseconds(@HostParam("endpoint") String endpoint, @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Response int32MillisecondsSync(@HostParam("endpoint") String endpoint, - @HeaderParam("duration") int duration, RequestOptions requestOptions, Context context); + @HeaderParam("duration") long duration, RequestOptions requestOptions, Context context); @Get("/encode/duration/header/int32-milliseconds-larger-unit") @ExpectedResponses({ 204 }) @@ -228,7 +229,7 @@ Response int32MillisecondsSync(@HostParam("endpoint") String endpoint, @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> int32MillisecondsLargerUnit(@HostParam("endpoint") String endpoint, - @HeaderParam("duration") int duration, RequestOptions requestOptions, Context context); + @HeaderParam("duration") long duration, RequestOptions requestOptions, Context context); @Get("/encode/duration/header/int32-milliseconds-larger-unit") @ExpectedResponses({ 204 }) @@ -237,7 +238,7 @@ Mono> int32MillisecondsLargerUnit(@HostParam("endpoint") String e @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Response int32MillisecondsLargerUnitSync(@HostParam("endpoint") String endpoint, - @HeaderParam("duration") int duration, RequestOptions requestOptions, Context context); + @HeaderParam("duration") long duration, RequestOptions requestOptions, Context context); @Get("/encode/duration/header/float-milliseconds") @ExpectedResponses({ 204 }) @@ -606,9 +607,10 @@ public Response float64SecondsWithResponse(Duration duration, RequestOptio * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsWithResponseAsync(int duration, RequestOptions requestOptions) { - return FluxUtil.withContext( - context -> service.int32Milliseconds(this.client.getEndpoint(), duration, requestOptions, context)); + public Mono> int32MillisecondsWithResponseAsync(Duration duration, RequestOptions requestOptions) { + long durationConverted = duration.toMillis(); + return FluxUtil.withContext(context -> service.int32Milliseconds(this.client.getEndpoint(), durationConverted, + requestOptions, context)); } /** @@ -623,8 +625,10 @@ public Mono> int32MillisecondsWithResponseAsync(int duration, Req * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsWithResponse(int duration, RequestOptions requestOptions) { - return service.int32MillisecondsSync(this.client.getEndpoint(), duration, requestOptions, Context.NONE); + public Response int32MillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { + long durationConverted = duration.toMillis(); + return service.int32MillisecondsSync(this.client.getEndpoint(), durationConverted, requestOptions, + Context.NONE); } /** @@ -639,10 +643,11 @@ public Response int32MillisecondsWithResponse(int duration, RequestOptions * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsLargerUnitWithResponseAsync(int duration, + public Mono> int32MillisecondsLargerUnitWithResponseAsync(Duration duration, RequestOptions requestOptions) { - return FluxUtil.withContext(context -> service.int32MillisecondsLargerUnit(this.client.getEndpoint(), duration, - requestOptions, context)); + long durationConverted = duration.toMillis(); + return FluxUtil.withContext(context -> service.int32MillisecondsLargerUnit(this.client.getEndpoint(), + durationConverted, requestOptions, context)); } /** @@ -657,8 +662,9 @@ public Mono> int32MillisecondsLargerUnitWithResponseAsync(int dur * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsLargerUnitWithResponse(int duration, RequestOptions requestOptions) { - return service.int32MillisecondsLargerUnitSync(this.client.getEndpoint(), duration, requestOptions, + public Response int32MillisecondsLargerUnitWithResponse(Duration duration, RequestOptions requestOptions) { + long durationConverted = duration.toMillis(); + return service.int32MillisecondsLargerUnitSync(this.client.getEndpoint(), durationConverted, requestOptions, Context.NONE); } @@ -674,9 +680,10 @@ public Response int32MillisecondsLargerUnitWithResponse(int duration, Requ * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsWithResponseAsync(double duration, RequestOptions requestOptions) { - return FluxUtil.withContext( - context -> service.floatMilliseconds(this.client.getEndpoint(), duration, requestOptions, context)); + public Mono> floatMillisecondsWithResponseAsync(Duration duration, RequestOptions requestOptions) { + double durationConverted = (double) duration.toNanos() / 1000_000L; + return FluxUtil.withContext(context -> service.floatMilliseconds(this.client.getEndpoint(), durationConverted, + requestOptions, context)); } /** @@ -691,8 +698,10 @@ public Mono> floatMillisecondsWithResponseAsync(double duration, * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsWithResponse(double duration, RequestOptions requestOptions) { - return service.floatMillisecondsSync(this.client.getEndpoint(), duration, requestOptions, Context.NONE); + public Response floatMillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { + double durationConverted = (double) duration.toNanos() / 1000_000L; + return service.floatMillisecondsSync(this.client.getEndpoint(), durationConverted, requestOptions, + Context.NONE); } /** @@ -707,10 +716,11 @@ public Response floatMillisecondsWithResponse(double duration, RequestOpti * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsLargerUnitWithResponseAsync(double duration, + public Mono> floatMillisecondsLargerUnitWithResponseAsync(Duration duration, RequestOptions requestOptions) { - return FluxUtil.withContext(context -> service.floatMillisecondsLargerUnit(this.client.getEndpoint(), duration, - requestOptions, context)); + double durationConverted = (double) duration.toNanos() / 1000_000L; + return FluxUtil.withContext(context -> service.floatMillisecondsLargerUnit(this.client.getEndpoint(), + durationConverted, requestOptions, context)); } /** @@ -725,8 +735,9 @@ public Mono> floatMillisecondsLargerUnitWithResponseAsync(double * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsLargerUnitWithResponse(double duration, RequestOptions requestOptions) { - return service.floatMillisecondsLargerUnitSync(this.client.getEndpoint(), duration, requestOptions, + public Response floatMillisecondsLargerUnitWithResponse(Duration duration, RequestOptions requestOptions) { + double durationConverted = (double) duration.toNanos() / 1000_000L; + return service.floatMillisecondsLargerUnitSync(this.client.getEndpoint(), durationConverted, requestOptions, Context.NONE); } @@ -742,9 +753,10 @@ public Response floatMillisecondsLargerUnitWithResponse(double duration, R * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> float64MillisecondsWithResponseAsync(double duration, RequestOptions requestOptions) { - return FluxUtil.withContext( - context -> service.float64Milliseconds(this.client.getEndpoint(), duration, requestOptions, context)); + public Mono> float64MillisecondsWithResponseAsync(Duration duration, RequestOptions requestOptions) { + double durationConverted = (double) duration.toNanos() / 1000_000L; + return FluxUtil.withContext(context -> service.float64Milliseconds(this.client.getEndpoint(), durationConverted, + requestOptions, context)); } /** @@ -759,8 +771,10 @@ public Mono> float64MillisecondsWithResponseAsync(double duration * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response float64MillisecondsWithResponse(double duration, RequestOptions requestOptions) { - return service.float64MillisecondsSync(this.client.getEndpoint(), duration, requestOptions, Context.NONE); + public Response float64MillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { + double durationConverted = (double) duration.toNanos() / 1000_000L; + return service.float64MillisecondsSync(this.client.getEndpoint(), durationConverted, requestOptions, + Context.NONE); } /** @@ -775,10 +789,12 @@ public Response float64MillisecondsWithResponse(double duration, RequestOp * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsArrayWithResponseAsync(List duration, + public Mono> int32MillisecondsArrayWithResponseAsync(List duration, RequestOptions requestOptions) { - String durationConverted - = JacksonAdapter.createDefaultSerializerAdapter().serializeIterable(duration, CollectionFormat.CSV); + String durationConverted = JacksonAdapter.createDefaultSerializerAdapter() + .serializeIterable( + duration.stream().map(paramItemValue -> paramItemValue.toMillis()).collect(Collectors.toList()), + CollectionFormat.CSV); return FluxUtil.withContext(context -> service.int32MillisecondsArray(this.client.getEndpoint(), durationConverted, requestOptions, context)); } @@ -795,9 +811,11 @@ public Mono> int32MillisecondsArrayWithResponseAsync(List int32MillisecondsArrayWithResponse(List duration, RequestOptions requestOptions) { - String durationConverted - = JacksonAdapter.createDefaultSerializerAdapter().serializeIterable(duration, CollectionFormat.CSV); + public Response int32MillisecondsArrayWithResponse(List duration, RequestOptions requestOptions) { + String durationConverted = JacksonAdapter.createDefaultSerializerAdapter() + .serializeIterable( + duration.stream().map(paramItemValue -> paramItemValue.toMillis()).collect(Collectors.toList()), + CollectionFormat.CSV); return service.int32MillisecondsArraySync(this.client.getEndpoint(), durationConverted, requestOptions, Context.NONE); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/implementation/PropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/implementation/PropertiesImpl.java index b727b536a71..0733e08920c 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/implementation/PropertiesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/implementation/PropertiesImpl.java @@ -725,7 +725,7 @@ public Response float64SecondsWithResponse(BinaryData body, RequestO * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -735,7 +735,7 @@ public Response float64SecondsWithResponse(BinaryData body, RequestO * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -764,7 +764,7 @@ public Mono> int32MillisecondsWithResponseAsync(BinaryData * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -774,7 +774,7 @@ public Mono> int32MillisecondsWithResponseAsync(BinaryData * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -1280,7 +1280,7 @@ public Response floatSecondsLargerUnitWithResponse(BinaryData body, * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -1290,7 +1290,7 @@ public Response floatSecondsLargerUnitWithResponse(BinaryData body, * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -1319,7 +1319,7 @@ public Mono> int32MillisecondsLargerUnitWithResponseAsync(B * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -1329,7 +1329,7 @@ public Mono> int32MillisecondsLargerUnitWithResponseAsync(B * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/implementation/QueriesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/implementation/QueriesImpl.java index 3a46e23b7ad..476f3f5bb7e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/implementation/QueriesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/implementation/QueriesImpl.java @@ -192,7 +192,7 @@ Response float64SecondsSync(@HostParam("endpoint") String endpoint, @Query @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> int32Milliseconds(@HostParam("endpoint") String endpoint, @QueryParam("input") int input, + Mono> int32Milliseconds(@HostParam("endpoint") String endpoint, @QueryParam("input") long input, RequestOptions requestOptions, Context context); @Get("/encode/duration/query/int32-milliseconds") @@ -201,7 +201,7 @@ Mono> int32Milliseconds(@HostParam("endpoint") String endpoint, @ @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response int32MillisecondsSync(@HostParam("endpoint") String endpoint, @QueryParam("input") int input, + Response int32MillisecondsSync(@HostParam("endpoint") String endpoint, @QueryParam("input") long input, RequestOptions requestOptions, Context context); @Get("/encode/duration/query/int32-milliseconds-larger-unit") @@ -211,7 +211,7 @@ Response int32MillisecondsSync(@HostParam("endpoint") String endpoint, @Qu @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> int32MillisecondsLargerUnit(@HostParam("endpoint") String endpoint, - @QueryParam("input") int input, RequestOptions requestOptions, Context context); + @QueryParam("input") long input, RequestOptions requestOptions, Context context); @Get("/encode/duration/query/int32-milliseconds-larger-unit") @ExpectedResponses({ 204 }) @@ -220,7 +220,7 @@ Mono> int32MillisecondsLargerUnit(@HostParam("endpoint") String e @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Response int32MillisecondsLargerUnitSync(@HostParam("endpoint") String endpoint, - @QueryParam("input") int input, RequestOptions requestOptions, Context context); + @QueryParam("input") long input, RequestOptions requestOptions, Context context); @Get("/encode/duration/query/float-milliseconds") @ExpectedResponses({ 204 }) @@ -568,9 +568,10 @@ public Response float64SecondsWithResponse(Duration input, RequestOptions * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsWithResponseAsync(int input, RequestOptions requestOptions) { + public Mono> int32MillisecondsWithResponseAsync(Duration input, RequestOptions requestOptions) { + long inputConverted = input.toMillis(); return FluxUtil.withContext( - context -> service.int32Milliseconds(this.client.getEndpoint(), input, requestOptions, context)); + context -> service.int32Milliseconds(this.client.getEndpoint(), inputConverted, requestOptions, context)); } /** @@ -585,8 +586,9 @@ public Mono> int32MillisecondsWithResponseAsync(int input, Reques * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsWithResponse(int input, RequestOptions requestOptions) { - return service.int32MillisecondsSync(this.client.getEndpoint(), input, requestOptions, Context.NONE); + public Response int32MillisecondsWithResponse(Duration input, RequestOptions requestOptions) { + long inputConverted = input.toMillis(); + return service.int32MillisecondsSync(this.client.getEndpoint(), inputConverted, requestOptions, Context.NONE); } /** @@ -601,9 +603,11 @@ public Response int32MillisecondsWithResponse(int input, RequestOptions re * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsLargerUnitWithResponseAsync(int input, RequestOptions requestOptions) { - return FluxUtil.withContext( - context -> service.int32MillisecondsLargerUnit(this.client.getEndpoint(), input, requestOptions, context)); + public Mono> int32MillisecondsLargerUnitWithResponseAsync(Duration input, + RequestOptions requestOptions) { + long inputConverted = input.toMillis(); + return FluxUtil.withContext(context -> service.int32MillisecondsLargerUnit(this.client.getEndpoint(), + inputConverted, requestOptions, context)); } /** @@ -618,8 +622,10 @@ public Mono> int32MillisecondsLargerUnitWithResponseAsync(int inp * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsLargerUnitWithResponse(int input, RequestOptions requestOptions) { - return service.int32MillisecondsLargerUnitSync(this.client.getEndpoint(), input, requestOptions, Context.NONE); + public Response int32MillisecondsLargerUnitWithResponse(Duration input, RequestOptions requestOptions) { + long inputConverted = input.toMillis(); + return service.int32MillisecondsLargerUnitSync(this.client.getEndpoint(), inputConverted, requestOptions, + Context.NONE); } /** @@ -634,9 +640,10 @@ public Response int32MillisecondsLargerUnitWithResponse(int input, Request * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsWithResponseAsync(double input, RequestOptions requestOptions) { + public Mono> floatMillisecondsWithResponseAsync(Duration input, RequestOptions requestOptions) { + double inputConverted = (double) input.toNanos() / 1000_000L; return FluxUtil.withContext( - context -> service.floatMilliseconds(this.client.getEndpoint(), input, requestOptions, context)); + context -> service.floatMilliseconds(this.client.getEndpoint(), inputConverted, requestOptions, context)); } /** @@ -651,8 +658,9 @@ public Mono> floatMillisecondsWithResponseAsync(double input, Req * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsWithResponse(double input, RequestOptions requestOptions) { - return service.floatMillisecondsSync(this.client.getEndpoint(), input, requestOptions, Context.NONE); + public Response floatMillisecondsWithResponse(Duration input, RequestOptions requestOptions) { + double inputConverted = (double) input.toNanos() / 1000_000L; + return service.floatMillisecondsSync(this.client.getEndpoint(), inputConverted, requestOptions, Context.NONE); } /** @@ -667,10 +675,11 @@ public Response floatMillisecondsWithResponse(double input, RequestOptions * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsLargerUnitWithResponseAsync(double input, + public Mono> floatMillisecondsLargerUnitWithResponseAsync(Duration input, RequestOptions requestOptions) { - return FluxUtil.withContext( - context -> service.floatMillisecondsLargerUnit(this.client.getEndpoint(), input, requestOptions, context)); + double inputConverted = (double) input.toNanos() / 1000_000L; + return FluxUtil.withContext(context -> service.floatMillisecondsLargerUnit(this.client.getEndpoint(), + inputConverted, requestOptions, context)); } /** @@ -685,8 +694,10 @@ public Mono> floatMillisecondsLargerUnitWithResponseAsync(double * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsLargerUnitWithResponse(double input, RequestOptions requestOptions) { - return service.floatMillisecondsLargerUnitSync(this.client.getEndpoint(), input, requestOptions, Context.NONE); + public Response floatMillisecondsLargerUnitWithResponse(Duration input, RequestOptions requestOptions) { + double inputConverted = (double) input.toNanos() / 1000_000L; + return service.floatMillisecondsLargerUnitSync(this.client.getEndpoint(), inputConverted, requestOptions, + Context.NONE); } /** @@ -701,9 +712,10 @@ public Response floatMillisecondsLargerUnitWithResponse(double input, Requ * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> float64MillisecondsWithResponseAsync(double input, RequestOptions requestOptions) { + public Mono> float64MillisecondsWithResponseAsync(Duration input, RequestOptions requestOptions) { + double inputConverted = (double) input.toNanos() / 1000_000L; return FluxUtil.withContext( - context -> service.float64Milliseconds(this.client.getEndpoint(), input, requestOptions, context)); + context -> service.float64Milliseconds(this.client.getEndpoint(), inputConverted, requestOptions, context)); } /** @@ -718,8 +730,9 @@ public Mono> float64MillisecondsWithResponseAsync(double input, R * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response float64MillisecondsWithResponse(double input, RequestOptions requestOptions) { - return service.float64MillisecondsSync(this.client.getEndpoint(), input, requestOptions, Context.NONE); + public Response float64MillisecondsWithResponse(Duration input, RequestOptions requestOptions) { + double inputConverted = (double) input.toNanos() / 1000_000L; + return service.float64MillisecondsSync(this.client.getEndpoint(), inputConverted, requestOptions, Context.NONE); } /** @@ -776,10 +789,12 @@ public Response int32SecondsArrayWithResponse(List input, Reques * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsArrayWithResponseAsync(List input, + public Mono> int32MillisecondsArrayWithResponseAsync(List input, RequestOptions requestOptions) { - String inputConverted - = JacksonAdapter.createDefaultSerializerAdapter().serializeIterable(input, CollectionFormat.CSV); + String inputConverted = JacksonAdapter.createDefaultSerializerAdapter() + .serializeIterable( + input.stream().map(paramItemValue -> paramItemValue.toMillis()).collect(Collectors.toList()), + CollectionFormat.CSV); return FluxUtil.withContext(context -> service.int32MillisecondsArray(this.client.getEndpoint(), inputConverted, requestOptions, context)); } @@ -796,9 +811,11 @@ public Mono> int32MillisecondsArrayWithResponseAsync(List int32MillisecondsArrayWithResponse(List input, RequestOptions requestOptions) { - String inputConverted - = JacksonAdapter.createDefaultSerializerAdapter().serializeIterable(input, CollectionFormat.CSV); + public Response int32MillisecondsArrayWithResponse(List input, RequestOptions requestOptions) { + String inputConverted = JacksonAdapter.createDefaultSerializerAdapter() + .serializeIterable( + input.stream().map(paramItemValue -> paramItemValue.toMillis()).collect(Collectors.toList()), + CollectionFormat.CSV); return service.int32MillisecondsArraySync(this.client.getEndpoint(), inputConverted, requestOptions, Context.NONE); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/Float64MillisecondsDurationProperty.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/Float64MillisecondsDurationProperty.java index 5a6aa75879e..b72035fa618 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/Float64MillisecondsDurationProperty.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/Float64MillisecondsDurationProperty.java @@ -11,6 +11,7 @@ import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; +import java.time.Duration; /** * The Float64MillisecondsDurationProperty model. @@ -30,8 +31,12 @@ public final class Float64MillisecondsDurationProperty * @param value the value value to set. */ @Generated - public Float64MillisecondsDurationProperty(double value) { - this.value = value; + public Float64MillisecondsDurationProperty(Duration value) { + if (value == null) { + this.value = 0.0; + } else { + this.value = (double) value.toNanos() / 1000_000L; + } } /** @@ -40,8 +45,8 @@ public Float64MillisecondsDurationProperty(double value) { * @return the value value. */ @Generated - public double getValue() { - return this.value; + public Duration getValue() { + return Duration.ofNanos((long) (this.value * 1000_000L)); } /** @@ -67,13 +72,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static Float64MillisecondsDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - double value = 0.0; + Duration value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.getDouble(); + value = Duration.ofNanos((long) (reader.getDouble() * 1000_000L)); } else { reader.skipChildren(); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/FloatMillisecondsDurationArrayProperty.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/FloatMillisecondsDurationArrayProperty.java index aa77fd209a0..1341181dfc3 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/FloatMillisecondsDurationArrayProperty.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/FloatMillisecondsDurationArrayProperty.java @@ -11,6 +11,7 @@ import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; +import java.time.Duration; import java.util.List; /** @@ -31,8 +32,14 @@ public final class FloatMillisecondsDurationArrayProperty * @param value the value value to set. */ @Generated - public FloatMillisecondsDurationArrayProperty(List value) { - this.value = value; + public FloatMillisecondsDurationArrayProperty(List value) { + if (value == null) { + this.value = null; + } else { + this.value = value.stream() + .map(el -> (double) el.toNanos() / 1000_000L) + .collect(java.util.stream.Collectors.toList()); + } } /** @@ -41,8 +48,13 @@ public FloatMillisecondsDurationArrayProperty(List value) { * @return the value value. */ @Generated - public List getValue() { - return this.value; + public List getValue() { + if (this.value == null) { + return null; + } + return this.value.stream() + .map(el -> Duration.ofNanos((long) (el * 1000_000L))) + .collect(java.util.stream.Collectors.toList()); } /** @@ -68,13 +80,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static FloatMillisecondsDurationArrayProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - List value = null; + List value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.readArray(reader1 -> reader1.getDouble()); + value = reader.readArray(reader1 -> Duration.ofNanos((long) (reader1.getDouble() * 1000_000L))); } else { reader.skipChildren(); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/FloatMillisecondsDurationProperty.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/FloatMillisecondsDurationProperty.java index d40fbf62e9d..cb4eac0de8d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/FloatMillisecondsDurationProperty.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/FloatMillisecondsDurationProperty.java @@ -11,6 +11,7 @@ import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; +import java.time.Duration; /** * The FloatMillisecondsDurationProperty model. @@ -29,8 +30,12 @@ public final class FloatMillisecondsDurationProperty implements JsonSerializable * @param value the value value to set. */ @Generated - public FloatMillisecondsDurationProperty(double value) { - this.value = value; + public FloatMillisecondsDurationProperty(Duration value) { + if (value == null) { + this.value = 0.0; + } else { + this.value = (double) value.toNanos() / 1000_000L; + } } /** @@ -39,8 +44,8 @@ public FloatMillisecondsDurationProperty(double value) { * @return the value value. */ @Generated - public double getValue() { - return this.value; + public Duration getValue() { + return Duration.ofNanos((long) (this.value * 1000_000L)); } /** @@ -66,13 +71,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static FloatMillisecondsDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - double value = 0.0; + Duration value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.getDouble(); + value = Duration.ofNanos((long) (reader.getDouble() * 1000_000L)); } else { reader.skipChildren(); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/FloatMillisecondsLargerUnitDurationProperty.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/FloatMillisecondsLargerUnitDurationProperty.java index e98cf4026c6..13d8ffb22de 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/FloatMillisecondsLargerUnitDurationProperty.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/FloatMillisecondsLargerUnitDurationProperty.java @@ -11,6 +11,7 @@ import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; +import java.time.Duration; /** * The FloatMillisecondsLargerUnitDurationProperty model. @@ -30,8 +31,12 @@ public final class FloatMillisecondsLargerUnitDurationProperty * @param value the value value to set. */ @Generated - public FloatMillisecondsLargerUnitDurationProperty(double value) { - this.value = value; + public FloatMillisecondsLargerUnitDurationProperty(Duration value) { + if (value == null) { + this.value = 0.0; + } else { + this.value = (double) value.toNanos() / 1000_000L; + } } /** @@ -40,8 +45,8 @@ public FloatMillisecondsLargerUnitDurationProperty(double value) { * @return the value value. */ @Generated - public double getValue() { - return this.value; + public Duration getValue() { + return Duration.ofNanos((long) (this.value * 1000_000L)); } /** @@ -67,13 +72,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static FloatMillisecondsLargerUnitDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - double value = 0.0; + Duration value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.getDouble(); + value = Duration.ofNanos((long) (reader.getDouble() * 1000_000L)); } else { reader.skipChildren(); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/Int32MillisecondsDurationProperty.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/Int32MillisecondsDurationProperty.java index d8130c569a7..8c7d34072b9 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/Int32MillisecondsDurationProperty.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/Int32MillisecondsDurationProperty.java @@ -11,6 +11,7 @@ import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; +import java.time.Duration; /** * The Int32MillisecondsDurationProperty model. @@ -21,7 +22,7 @@ public final class Int32MillisecondsDurationProperty implements JsonSerializable * The value property. */ @Generated - private final int value; + private final long value; /** * Creates an instance of Int32MillisecondsDurationProperty class. @@ -29,8 +30,12 @@ public final class Int32MillisecondsDurationProperty implements JsonSerializable * @param value the value value to set. */ @Generated - public Int32MillisecondsDurationProperty(int value) { - this.value = value; + public Int32MillisecondsDurationProperty(Duration value) { + if (value == null) { + this.value = 0L; + } else { + this.value = value.toMillis(); + } } /** @@ -39,8 +44,8 @@ public Int32MillisecondsDurationProperty(int value) { * @return the value value. */ @Generated - public int getValue() { - return this.value; + public Duration getValue() { + return Duration.ofMillis(this.value); } /** @@ -50,7 +55,7 @@ public int getValue() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeIntField("value", this.value); + jsonWriter.writeLongField("value", this.value); return jsonWriter.writeEndObject(); } @@ -66,13 +71,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static Int32MillisecondsDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - int value = 0; + Duration value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.getInt(); + value = Duration.ofMillis(reader.getLong()); } else { reader.skipChildren(); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/Int32MillisecondsLargerUnitDurationProperty.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/Int32MillisecondsLargerUnitDurationProperty.java index 9be4f62447d..7f74132a550 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/Int32MillisecondsLargerUnitDurationProperty.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/property/models/Int32MillisecondsLargerUnitDurationProperty.java @@ -11,6 +11,7 @@ import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; +import java.time.Duration; /** * The Int32MillisecondsLargerUnitDurationProperty model. @@ -22,7 +23,7 @@ public final class Int32MillisecondsLargerUnitDurationProperty * The value property. */ @Generated - private final int value; + private final long value; /** * Creates an instance of Int32MillisecondsLargerUnitDurationProperty class. @@ -30,8 +31,12 @@ public final class Int32MillisecondsLargerUnitDurationProperty * @param value the value value to set. */ @Generated - public Int32MillisecondsLargerUnitDurationProperty(int value) { - this.value = value; + public Int32MillisecondsLargerUnitDurationProperty(Duration value) { + if (value == null) { + this.value = 0L; + } else { + this.value = value.toMillis(); + } } /** @@ -40,8 +45,8 @@ public Int32MillisecondsLargerUnitDurationProperty(int value) { * @return the value value. */ @Generated - public int getValue() { - return this.value; + public Duration getValue() { + return Duration.ofMillis(this.value); } /** @@ -51,7 +56,7 @@ public int getValue() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeIntField("value", this.value); + jsonWriter.writeLongField("value", this.value); return jsonWriter.writeEndObject(); } @@ -67,13 +72,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static Int32MillisecondsLargerUnitDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - int value = 0; + Duration value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.getInt(); + value = Duration.ofMillis(reader.getLong()); } else { reader.skipChildren(); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileAsyncClient.java new file mode 100644 index 00000000000..a0b124f22d3 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileAsyncClient.java @@ -0,0 +1,174 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package payload.multipart; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; +import com.azure.core.util.FluxUtil; +import java.util.stream.Collectors; +import payload.multipart.formdata.file.models.UploadFileArrayRequest; +import payload.multipart.formdata.file.models.UploadFileRequiredFilenameRequest; +import payload.multipart.formdata.file.models.UploadFileSpecificContentTypeRequest; +import payload.multipart.implementation.FormDataFilesImpl; +import payload.multipart.implementation.MultipartFormDataHelper; +import payload.multipart.models.FilesFileDetails; +import reactor.core.publisher.Mono; + +/** + * Initializes a new instance of the asynchronous MultiPartClient type. + */ +@ServiceClient(builder = MultiPartClientBuilder.class, isAsync = true) +public final class FormDataFileAsyncClient { + @Generated + private final FormDataFilesImpl serviceClient; + + /** + * Initializes an instance of FormDataFileAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + FormDataFileAsyncClient(FormDataFilesImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The uploadFileSpecificContentType operation. + * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + Mono> uploadFileSpecificContentTypeWithResponse(BinaryData body, RequestOptions requestOptions) { + // Operation 'uploadFileSpecificContentType' is of content-type 'multipart/form-data'. Protocol API is not + // usable and hence not generated. + return this.serviceClient.uploadFileSpecificContentTypeWithResponseAsync(body, requestOptions); + } + + /** + * The uploadFileRequiredFilename operation. + * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + Mono> uploadFileRequiredFilenameWithResponse(BinaryData body, RequestOptions requestOptions) { + // Operation 'uploadFileRequiredFilename' is of content-type 'multipart/form-data'. Protocol API is not usable + // and hence not generated. + return this.serviceClient.uploadFileRequiredFilenameWithResponseAsync(body, requestOptions); + } + + /** + * The uploadFileArray operation. + * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + Mono> uploadFileArrayWithResponse(BinaryData body, RequestOptions requestOptions) { + // Operation 'uploadFileArray' is of content-type 'multipart/form-data'. Protocol API is not usable and hence + // not generated. + return this.serviceClient.uploadFileArrayWithResponseAsync(body, requestOptions); + } + + /** + * The uploadFileSpecificContentType operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono uploadFileSpecificContentType(UploadFileSpecificContentTypeRequest body) { + // Generated convenience method for uploadFileSpecificContentTypeWithResponse + RequestOptions requestOptions = new RequestOptions(); + return uploadFileSpecificContentTypeWithResponse( + new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(), + body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(), + requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The uploadFileRequiredFilename operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono uploadFileRequiredFilename(UploadFileRequiredFilenameRequest body) { + // Generated convenience method for uploadFileRequiredFilenameWithResponse + RequestOptions requestOptions = new RequestOptions(); + return uploadFileRequiredFilenameWithResponse( + new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(), + body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(), + requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The uploadFileArray operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono uploadFileArray(UploadFileArrayRequest body) { + // Generated convenience method for uploadFileArrayWithResponse + RequestOptions requestOptions = new RequestOptions(); + return uploadFileArrayWithResponse(new MultipartFormDataHelper(requestOptions) + .serializeFileFields("files", + body.getFiles().stream().map(FilesFileDetails::getContent).collect(Collectors.toList()), + body.getFiles().stream().map(FilesFileDetails::getContentType).collect(Collectors.toList()), + body.getFiles().stream().map(FilesFileDetails::getFilename).collect(Collectors.toList())) + .end() + .getRequestBody(), requestOptions).flatMap(FluxUtil::toMono); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileClient.java new file mode 100644 index 00000000000..a9ff016c888 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileClient.java @@ -0,0 +1,169 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package payload.multipart; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; +import java.util.stream.Collectors; +import payload.multipart.formdata.file.models.UploadFileArrayRequest; +import payload.multipart.formdata.file.models.UploadFileRequiredFilenameRequest; +import payload.multipart.formdata.file.models.UploadFileSpecificContentTypeRequest; +import payload.multipart.implementation.FormDataFilesImpl; +import payload.multipart.implementation.MultipartFormDataHelper; +import payload.multipart.models.FilesFileDetails; + +/** + * Initializes a new instance of the synchronous MultiPartClient type. + */ +@ServiceClient(builder = MultiPartClientBuilder.class) +public final class FormDataFileClient { + @Generated + private final FormDataFilesImpl serviceClient; + + /** + * Initializes an instance of FormDataFileClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + FormDataFileClient(FormDataFilesImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The uploadFileSpecificContentType operation. + * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + Response uploadFileSpecificContentTypeWithResponse(BinaryData body, RequestOptions requestOptions) { + // Operation 'uploadFileSpecificContentType' is of content-type 'multipart/form-data'. Protocol API is not + // usable and hence not generated. + return this.serviceClient.uploadFileSpecificContentTypeWithResponse(body, requestOptions); + } + + /** + * The uploadFileRequiredFilename operation. + * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + Response uploadFileRequiredFilenameWithResponse(BinaryData body, RequestOptions requestOptions) { + // Operation 'uploadFileRequiredFilename' is of content-type 'multipart/form-data'. Protocol API is not usable + // and hence not generated. + return this.serviceClient.uploadFileRequiredFilenameWithResponse(body, requestOptions); + } + + /** + * The uploadFileArray operation. + * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + Response uploadFileArrayWithResponse(BinaryData body, RequestOptions requestOptions) { + // Operation 'uploadFileArray' is of content-type 'multipart/form-data'. Protocol API is not usable and hence + // not generated. + return this.serviceClient.uploadFileArrayWithResponse(body, requestOptions); + } + + /** + * The uploadFileSpecificContentType operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void uploadFileSpecificContentType(UploadFileSpecificContentTypeRequest body) { + // Generated convenience method for uploadFileSpecificContentTypeWithResponse + RequestOptions requestOptions = new RequestOptions(); + uploadFileSpecificContentTypeWithResponse( + new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(), + body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(), + requestOptions).getValue(); + } + + /** + * The uploadFileRequiredFilename operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void uploadFileRequiredFilename(UploadFileRequiredFilenameRequest body) { + // Generated convenience method for uploadFileRequiredFilenameWithResponse + RequestOptions requestOptions = new RequestOptions(); + uploadFileRequiredFilenameWithResponse( + new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(), + body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(), + requestOptions).getValue(); + } + + /** + * The uploadFileArray operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void uploadFileArray(UploadFileArrayRequest body) { + // Generated convenience method for uploadFileArrayWithResponse + RequestOptions requestOptions = new RequestOptions(); + uploadFileArrayWithResponse(new MultipartFormDataHelper(requestOptions) + .serializeFileFields("files", + body.getFiles().stream().map(FilesFileDetails::getContent).collect(Collectors.toList()), + body.getFiles().stream().map(FilesFileDetails::getContentType).collect(Collectors.toList()), + body.getFiles().stream().map(FilesFileDetails::getFilename).collect(Collectors.toList())) + .end() + .getRequestBody(), requestOptions).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/MultiPartClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/MultiPartClientBuilder.java index 73a94809558..9f4c70e860a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/MultiPartClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/MultiPartClientBuilder.java @@ -46,10 +46,12 @@ FormDataHttpPartsClient.class, FormDataHttpPartsContentTypeClient.class, FormDataHttpPartsNonStringClient.class, + FormDataFileClient.class, FormDataAsyncClient.class, FormDataHttpPartsAsyncClient.class, FormDataHttpPartsContentTypeAsyncClient.class, - FormDataHttpPartsNonStringAsyncClient.class }) + FormDataHttpPartsNonStringAsyncClient.class, + FormDataFileAsyncClient.class }) public final class MultiPartClientBuilder implements HttpTrait, ConfigurationTrait, EndpointTrait { @Generated @@ -312,6 +314,16 @@ public FormDataHttpPartsNonStringAsyncClient buildFormDataHttpPartsNonStringAsyn return new FormDataHttpPartsNonStringAsyncClient(buildInnerClient().getFormDataHttpPartsNonStrings()); } + /** + * Builds an instance of FormDataFileAsyncClient class. + * + * @return an instance of FormDataFileAsyncClient. + */ + @Generated + public FormDataFileAsyncClient buildFormDataFileAsyncClient() { + return new FormDataFileAsyncClient(buildInnerClient().getFormDataFiles()); + } + /** * Builds an instance of FormDataClient class. * @@ -352,5 +364,15 @@ public FormDataHttpPartsNonStringClient buildFormDataHttpPartsNonStringClient() return new FormDataHttpPartsNonStringClient(buildInnerClient().getFormDataHttpPartsNonStrings()); } + /** + * Builds an instance of FormDataFileClient class. + * + * @return an instance of FormDataFileClient. + */ + @Generated + public FormDataFileClient buildFormDataFileClient() { + return new FormDataFileClient(buildInnerClient().getFormDataFiles()); + } + private static final ClientLogger LOGGER = new ClientLogger(MultiPartClientBuilder.class); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/formdata/file/models/FileWithRequiredFilename.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/formdata/file/models/FileWithRequiredFilename.java new file mode 100644 index 00000000000..dc4d163d73a --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/formdata/file/models/FileWithRequiredFilename.java @@ -0,0 +1,87 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package payload.multipart.formdata.file.models; + +import com.azure.core.annotation.Fluent; +import com.azure.core.annotation.Generated; +import com.azure.core.util.BinaryData; + +/** + * The file details for the "file" field. + */ +@Fluent +public final class FileWithRequiredFilename { + /* + * The content of the file. + */ + @Generated + private final BinaryData content; + + /* + * The filename of the file. + */ + @Generated + private final String filename; + + /* + * The content-type of the file. + */ + @Generated + private String contentType = "image/png"; + + /** + * Creates an instance of FileWithRequiredFilename class. + * + * @param content the content value to set. + * @param filename the filename value to set. + */ + @Generated + public FileWithRequiredFilename(BinaryData content, String filename) { + this.content = content; + this.filename = filename; + } + + /** + * Get the content property: The content of the file. + * + * @return the content value. + */ + @Generated + public BinaryData getContent() { + return this.content; + } + + /** + * Get the filename property: The filename of the file. + * + * @return the filename value. + */ + @Generated + public String getFilename() { + return this.filename; + } + + /** + * Get the contentType property: The content-type of the file. + * + * @return the contentType value. + */ + @Generated + public String getContentType() { + return this.contentType; + } + + /** + * Set the contentType property: The content-type of the file. + * + * @param contentType the contentType value to set. + * @return the FileWithRequiredFilename object itself. + */ + @Generated + public FileWithRequiredFilename setContentType(String contentType) { + this.contentType = contentType; + return this; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/formdata/file/models/UploadFileArrayRequest.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/formdata/file/models/UploadFileArrayRequest.java new file mode 100644 index 00000000000..0efc9196457 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/formdata/file/models/UploadFileArrayRequest.java @@ -0,0 +1,42 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package payload.multipart.formdata.file.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import java.util.List; +import payload.multipart.models.FilesFileDetails; + +/** + * The UploadFileArrayRequest model. + */ +@Immutable +public final class UploadFileArrayRequest { + /* + * The files property. + */ + @Generated + private final List files; + + /** + * Creates an instance of UploadFileArrayRequest class. + * + * @param files the files value to set. + */ + @Generated + public UploadFileArrayRequest(List files) { + this.files = files; + } + + /** + * Get the files property: The files property. + * + * @return the files value. + */ + @Generated + public List getFiles() { + return this.files; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/formdata/file/models/UploadFileRequiredFilenameRequest.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/formdata/file/models/UploadFileRequiredFilenameRequest.java new file mode 100644 index 00000000000..97c3c461787 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/formdata/file/models/UploadFileRequiredFilenameRequest.java @@ -0,0 +1,40 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package payload.multipart.formdata.file.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; + +/** + * The UploadFileRequiredFilenameRequest model. + */ +@Immutable +public final class UploadFileRequiredFilenameRequest { + /* + * The file property. + */ + @Generated + private final FileWithRequiredFilename file; + + /** + * Creates an instance of UploadFileRequiredFilenameRequest class. + * + * @param file the file value to set. + */ + @Generated + public UploadFileRequiredFilenameRequest(FileWithRequiredFilename file) { + this.file = file; + } + + /** + * Get the file property: The file property. + * + * @return the file value. + */ + @Generated + public FileWithRequiredFilename getFile() { + return this.file; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/formdata/file/models/UploadFileSpecificContentTypeRequest.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/formdata/file/models/UploadFileSpecificContentTypeRequest.java new file mode 100644 index 00000000000..ea572c110b7 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/formdata/file/models/UploadFileSpecificContentTypeRequest.java @@ -0,0 +1,41 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package payload.multipart.formdata.file.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import payload.multipart.models.FileDetails; + +/** + * The UploadFileSpecificContentTypeRequest model. + */ +@Immutable +public final class UploadFileSpecificContentTypeRequest { + /* + * The file property. + */ + @Generated + private final FileDetails file; + + /** + * Creates an instance of UploadFileSpecificContentTypeRequest class. + * + * @param file the file value to set. + */ + @Generated + public UploadFileSpecificContentTypeRequest(FileDetails file) { + this.file = file; + } + + /** + * Get the file property: The file property. + * + * @return the file value. + */ + @Generated + public FileDetails getFile() { + return this.file; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/formdata/file/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/formdata/file/models/package-info.java new file mode 100644 index 00000000000..25fb95c27f7 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/formdata/file/models/package-info.java @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the data models for MultiPart. + * Test for multipart. + * + */ +package payload.multipart.formdata.file.models; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/implementation/FormDataFilesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/implementation/FormDataFilesImpl.java new file mode 100644 index 00000000000..193357c68d3 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/implementation/FormDataFilesImpl.java @@ -0,0 +1,236 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package payload.multipart.implementation; + +import com.azure.core.annotation.BodyParam; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.Post; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.BinaryData; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * An instance of this class provides access to all the operations defined in FormDataFiles. + */ +public final class FormDataFilesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final FormDataFilesService service; + + /** + * The service client containing this operation class. + */ + private final MultiPartClientImpl client; + + /** + * Initializes an instance of FormDataFilesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + FormDataFilesImpl(MultiPartClientImpl client) { + this.service + = RestProxy.create(FormDataFilesService.class, client.getHttpPipeline(), client.getSerializerAdapter()); + this.client = client; + } + + /** + * The interface defining all the services for MultiPartClientFormDataFiles to be used by the proxy service to + * perform REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "MultiPartClientFormDataFiles") + public interface FormDataFilesService { + // @Multipart not supported by RestProxy + @Post("/multipart/form-data/file/specific-content-type") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> uploadFileSpecificContentType(@HostParam("endpoint") String endpoint, + @HeaderParam("content-type") String contentType, @BodyParam("multipart/form-data") BinaryData body, + RequestOptions requestOptions, Context context); + + // @Multipart not supported by RestProxy + @Post("/multipart/form-data/file/specific-content-type") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response uploadFileSpecificContentTypeSync(@HostParam("endpoint") String endpoint, + @HeaderParam("content-type") String contentType, @BodyParam("multipart/form-data") BinaryData body, + RequestOptions requestOptions, Context context); + + // @Multipart not supported by RestProxy + @Post("/multipart/form-data/file/required-filename") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> uploadFileRequiredFilename(@HostParam("endpoint") String endpoint, + @HeaderParam("content-type") String contentType, @BodyParam("multipart/form-data") BinaryData body, + RequestOptions requestOptions, Context context); + + // @Multipart not supported by RestProxy + @Post("/multipart/form-data/file/required-filename") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response uploadFileRequiredFilenameSync(@HostParam("endpoint") String endpoint, + @HeaderParam("content-type") String contentType, @BodyParam("multipart/form-data") BinaryData body, + RequestOptions requestOptions, Context context); + + // @Multipart not supported by RestProxy + @Post("/multipart/form-data/file/file-array") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> uploadFileArray(@HostParam("endpoint") String endpoint, + @HeaderParam("content-type") String contentType, @BodyParam("multipart/form-data") BinaryData body, + RequestOptions requestOptions, Context context); + + // @Multipart not supported by RestProxy + @Post("/multipart/form-data/file/file-array") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response uploadFileArraySync(@HostParam("endpoint") String endpoint, + @HeaderParam("content-type") String contentType, @BodyParam("multipart/form-data") BinaryData body, + RequestOptions requestOptions, Context context); + } + + /** + * The uploadFileSpecificContentType operation. + * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> uploadFileSpecificContentTypeWithResponseAsync(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "multipart/form-data"; + return FluxUtil.withContext(context -> service.uploadFileSpecificContentType(this.client.getEndpoint(), + contentType, body, requestOptions, context)); + } + + /** + * The uploadFileSpecificContentType operation. + * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileSpecificContentTypeWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "multipart/form-data"; + return service.uploadFileSpecificContentTypeSync(this.client.getEndpoint(), contentType, body, requestOptions, + Context.NONE); + } + + /** + * The uploadFileRequiredFilename operation. + * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> uploadFileRequiredFilenameWithResponseAsync(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "multipart/form-data"; + return FluxUtil.withContext(context -> service.uploadFileRequiredFilename(this.client.getEndpoint(), + contentType, body, requestOptions, context)); + } + + /** + * The uploadFileRequiredFilename operation. + * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileRequiredFilenameWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "multipart/form-data"; + return service.uploadFileRequiredFilenameSync(this.client.getEndpoint(), contentType, body, requestOptions, + Context.NONE); + } + + /** + * The uploadFileArray operation. + * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> uploadFileArrayWithResponseAsync(BinaryData body, RequestOptions requestOptions) { + final String contentType = "multipart/form-data"; + return FluxUtil.withContext( + context -> service.uploadFileArray(this.client.getEndpoint(), contentType, body, requestOptions, context)); + } + + /** + * The uploadFileArray operation. + * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileArrayWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "multipart/form-data"; + return service.uploadFileArraySync(this.client.getEndpoint(), contentType, body, requestOptions, Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/implementation/MultiPartClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/implementation/MultiPartClientImpl.java index 084691d24cf..420b831cc1d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/implementation/MultiPartClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/implementation/MultiPartClientImpl.java @@ -113,6 +113,20 @@ public FormDataHttpPartsNonStringsImpl getFormDataHttpPartsNonStrings() { return this.formDataHttpPartsNonStrings; } + /** + * The FormDataFilesImpl object to access its operations. + */ + private final FormDataFilesImpl formDataFiles; + + /** + * Gets the FormDataFilesImpl object to access its operations. + * + * @return the FormDataFilesImpl object. + */ + public FormDataFilesImpl getFormDataFiles() { + return this.formDataFiles; + } + /** * Initializes an instance of MultiPartClient client. * @@ -148,5 +162,6 @@ public MultiPartClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializ this.formDataHttpParts = new FormDataHttpPartsImpl(this); this.formDataHttpPartsContentTypes = new FormDataHttpPartsContentTypesImpl(this); this.formDataHttpPartsNonStrings = new FormDataHttpPartsNonStringsImpl(this); + this.formDataFiles = new FormDataFilesImpl(this); } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/models/FileDetails.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/models/FileDetails.java new file mode 100644 index 00000000000..9552489b921 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/models/FileDetails.java @@ -0,0 +1,137 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package payload.multipart.models; + +import com.azure.core.annotation.Fluent; +import com.azure.core.annotation.Generated; +import com.azure.core.util.BinaryData; + +/** + * A file in an HTTP request, response, or multipart payload. + * + * A file in an HTTP request, response, or multipart payload. + * + * Files have a special meaning that the HTTP library understands. When the body of an HTTP request, response, + * or multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the + * operation is treated as a file upload or download. + * + * When using file bodies, the fields of the file model are defined to come from particular locations by default: + * + * - `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or + * changed). + * - `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed). + * - `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload + * (MAY be overridden or changed). + * + * A File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit + * `Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON + * payload, + * it will have a structure like: + * + * ``` + * { + * "contentType": <string?>, + * "filename": <string?>, + * "contents": <string, base64> + * } + * ``` + * + * The `contentType` _within_ the file defines what media types the data inside the file can be, but if the + * specification + * defines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is + * serialized_. See the examples below for more information. + * + * NOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename` + * (`Content-Disposition: <disposition>; filename=<filename>`) is only valid in HTTP responses and multipart + * payloads. If + * you wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the + * `filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` + * location + * is overridden, as shown in the examples below. + */ +@Fluent +public final class FileDetails { + /* + * The content of the file. + */ + @Generated + private final BinaryData content; + + /* + * The filename of the file. + */ + @Generated + private String filename; + + /* + * The content-type of the file. + */ + @Generated + private String contentType = "image/png"; + + /** + * Creates an instance of FileDetails class. + * + * @param content the content value to set. + */ + @Generated + public FileDetails(BinaryData content) { + this.content = content; + } + + /** + * Get the content property: The content of the file. + * + * @return the content value. + */ + @Generated + public BinaryData getContent() { + return this.content; + } + + /** + * Get the filename property: The filename of the file. + * + * @return the filename value. + */ + @Generated + public String getFilename() { + return this.filename; + } + + /** + * Set the filename property: The filename of the file. + * + * @param filename the filename value to set. + * @return the FileDetails object itself. + */ + @Generated + public FileDetails setFilename(String filename) { + this.filename = filename; + return this; + } + + /** + * Get the contentType property: The content-type of the file. + * + * @return the contentType value. + */ + @Generated + public String getContentType() { + return this.contentType; + } + + /** + * Set the contentType property: The content-type of the file. + * + * @param contentType the contentType value to set. + * @return the FileDetails object itself. + */ + @Generated + public FileDetails setContentType(String contentType) { + this.contentType = contentType; + return this; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/models/FilesFileDetails.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/models/FilesFileDetails.java new file mode 100644 index 00000000000..525983c27bd --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/models/FilesFileDetails.java @@ -0,0 +1,137 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package payload.multipart.models; + +import com.azure.core.annotation.Fluent; +import com.azure.core.annotation.Generated; +import com.azure.core.util.BinaryData; + +/** + * A file in an HTTP request, response, or multipart payload. + * + * A file in an HTTP request, response, or multipart payload. + * + * Files have a special meaning that the HTTP library understands. When the body of an HTTP request, response, + * or multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the + * operation is treated as a file upload or download. + * + * When using file bodies, the fields of the file model are defined to come from particular locations by default: + * + * - `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or + * changed). + * - `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed). + * - `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload + * (MAY be overridden or changed). + * + * A File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit + * `Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON + * payload, + * it will have a structure like: + * + * ``` + * { + * "contentType": <string?>, + * "filename": <string?>, + * "contents": <string, base64> + * } + * ``` + * + * The `contentType` _within_ the file defines what media types the data inside the file can be, but if the + * specification + * defines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is + * serialized_. See the examples below for more information. + * + * NOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename` + * (`Content-Disposition: <disposition>; filename=<filename>`) is only valid in HTTP responses and multipart + * payloads. If + * you wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the + * `filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` + * location + * is overridden, as shown in the examples below. + */ +@Fluent +public final class FilesFileDetails { + /* + * The content of the file. + */ + @Generated + private final BinaryData content; + + /* + * The filename of the file. + */ + @Generated + private String filename; + + /* + * The content-type of the file. + */ + @Generated + private String contentType = "image/png"; + + /** + * Creates an instance of FilesFileDetails class. + * + * @param content the content value to set. + */ + @Generated + public FilesFileDetails(BinaryData content) { + this.content = content; + } + + /** + * Get the content property: The content of the file. + * + * @return the content value. + */ + @Generated + public BinaryData getContent() { + return this.content; + } + + /** + * Get the filename property: The filename of the file. + * + * @return the filename value. + */ + @Generated + public String getFilename() { + return this.filename; + } + + /** + * Set the filename property: The filename of the file. + * + * @param filename the filename value to set. + * @return the FilesFileDetails object itself. + */ + @Generated + public FilesFileDetails setFilename(String filename) { + this.filename = filename; + return this; + } + + /** + * Get the contentType property: The content-type of the file. + * + * @return the contentType value. + */ + @Generated + public String getContentType() { + return this.contentType; + } + + /** + * Set the contentType property: The content-type of the file. + * + * @param contentType the contentType value to set. + * @return the FilesFileDetails object itself. + */ + @Generated + public FilesFileDetails setContentType(String contentType) { + this.contentType = contentType; + return this; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ExtensibleStringsAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ExtensibleStringsAsyncClient.java new file mode 100644 index 00000000000..aeeab3d03ff --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ExtensibleStringsAsyncClient.java @@ -0,0 +1,97 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package specialwords; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; +import specialwords.extensiblestrings.models.ExtensibleString; +import specialwords.implementation.ExtensibleStringsImpl; + +/** + * Initializes a new instance of the asynchronous SpecialWordsClient type. + */ +@ServiceClient(builder = SpecialWordsClientBuilder.class, isAsync = true) +public final class ExtensibleStringsAsyncClient { + @Generated + private final ExtensibleStringsImpl serviceClient; + + /** + * Initializes an instance of ExtensibleStringsAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + ExtensibleStringsAsyncClient(ExtensibleStringsImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The putExtensibleStringValue operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return verify enum member names that are special words using extensible enum (union) along with {@link Response} + * on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> putExtensibleStringValueWithResponse(BinaryData body, + RequestOptions requestOptions) { + return this.serviceClient.putExtensibleStringValueWithResponseAsync(body, requestOptions); + } + + /** + * The putExtensibleStringValue operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return verify enum member names that are special words using extensible enum (union) on successful completion of + * {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono putExtensibleStringValue(ExtensibleString body) { + // Generated convenience method for putExtensibleStringValueWithResponse + RequestOptions requestOptions = new RequestOptions(); + return putExtensibleStringValueWithResponse(BinaryData.fromObject(body == null ? null : body.toString()), + requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> ExtensibleString.fromString(protocolMethodData.toObject(String.class))); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ExtensibleStringsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ExtensibleStringsClient.java new file mode 100644 index 00000000000..05656c704df --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ExtensibleStringsClient.java @@ -0,0 +1,93 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package specialwords; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; +import specialwords.extensiblestrings.models.ExtensibleString; +import specialwords.implementation.ExtensibleStringsImpl; + +/** + * Initializes a new instance of the synchronous SpecialWordsClient type. + */ +@ServiceClient(builder = SpecialWordsClientBuilder.class) +public final class ExtensibleStringsClient { + @Generated + private final ExtensibleStringsImpl serviceClient; + + /** + * Initializes an instance of ExtensibleStringsClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + ExtensibleStringsClient(ExtensibleStringsImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The putExtensibleStringValue operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return verify enum member names that are special words using extensible enum (union) along with + * {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putExtensibleStringValueWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.putExtensibleStringValueWithResponse(body, requestOptions); + } + + /** + * The putExtensibleStringValue operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return verify enum member names that are special words using extensible enum (union). + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public ExtensibleString putExtensibleStringValue(ExtensibleString body) { + // Generated convenience method for putExtensibleStringValueWithResponse + RequestOptions requestOptions = new RequestOptions(); + return ExtensibleString.fromString( + putExtensibleStringValueWithResponse(BinaryData.fromObject(body == null ? null : body.toString()), + requestOptions).getValue().toObject(String.class)); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/SpecialWordsClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/SpecialWordsClientBuilder.java index ea87d109d89..66786237ef1 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/SpecialWordsClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/SpecialWordsClientBuilder.java @@ -44,10 +44,12 @@ serviceClients = { ModelsClient.class, ModelPropertiesClient.class, + ExtensibleStringsClient.class, OperationsClient.class, ParametersClient.class, ModelsAsyncClient.class, ModelPropertiesAsyncClient.class, + ExtensibleStringsAsyncClient.class, OperationsAsyncClient.class, ParametersAsyncClient.class }) public final class SpecialWordsClientBuilder implements HttpTrait, @@ -292,6 +294,16 @@ public ModelPropertiesAsyncClient buildModelPropertiesAsyncClient() { return new ModelPropertiesAsyncClient(buildInnerClient().getModelProperties()); } + /** + * Builds an instance of ExtensibleStringsAsyncClient class. + * + * @return an instance of ExtensibleStringsAsyncClient. + */ + @Generated + public ExtensibleStringsAsyncClient buildExtensibleStringsAsyncClient() { + return new ExtensibleStringsAsyncClient(buildInnerClient().getExtensibleStrings()); + } + /** * Builds an instance of OperationsAsyncClient class. * @@ -332,6 +344,16 @@ public ModelPropertiesClient buildModelPropertiesClient() { return new ModelPropertiesClient(buildInnerClient().getModelProperties()); } + /** + * Builds an instance of ExtensibleStringsClient class. + * + * @return an instance of ExtensibleStringsClient. + */ + @Generated + public ExtensibleStringsClient buildExtensibleStringsClient() { + return new ExtensibleStringsClient(buildInnerClient().getExtensibleStrings()); + } + /** * Builds an instance of OperationsClient class. * diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/extensiblestrings/models/ExtensibleString.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/extensiblestrings/models/ExtensibleString.java new file mode 100644 index 00000000000..52fdb2469ce --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/extensiblestrings/models/ExtensibleString.java @@ -0,0 +1,243 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package specialwords.extensiblestrings.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.util.ExpandableStringEnum; +import java.util.Collection; + +/** + * Verify enum member names that are special words using extensible enum (union). + */ +public final class ExtensibleString extends ExpandableStringEnum { + /** + * Static value and for ExtensibleString. + */ + @Generated + public static final ExtensibleString AND = fromString("and"); + + /** + * Static value as for ExtensibleString. + */ + @Generated + public static final ExtensibleString AS = fromString("as"); + + /** + * Static value assert for ExtensibleString. + */ + @Generated + public static final ExtensibleString ASSERT = fromString("assert"); + + /** + * Static value async for ExtensibleString. + */ + @Generated + public static final ExtensibleString ASYNC = fromString("async"); + + /** + * Static value await for ExtensibleString. + */ + @Generated + public static final ExtensibleString AWAIT = fromString("await"); + + /** + * Static value break for ExtensibleString. + */ + @Generated + public static final ExtensibleString BREAK = fromString("break"); + + /** + * Static value class for ExtensibleString. + */ + @Generated + public static final ExtensibleString CLASS = fromString("class"); + + /** + * Static value constructor for ExtensibleString. + */ + @Generated + public static final ExtensibleString CONSTRUCTOR = fromString("constructor"); + + /** + * Static value continue for ExtensibleString. + */ + @Generated + public static final ExtensibleString CONTINUE = fromString("continue"); + + /** + * Static value def for ExtensibleString. + */ + @Generated + public static final ExtensibleString DEF = fromString("def"); + + /** + * Static value del for ExtensibleString. + */ + @Generated + public static final ExtensibleString DEL = fromString("del"); + + /** + * Static value elif for ExtensibleString. + */ + @Generated + public static final ExtensibleString ELIF = fromString("elif"); + + /** + * Static value else for ExtensibleString. + */ + @Generated + public static final ExtensibleString ELSE = fromString("else"); + + /** + * Static value except for ExtensibleString. + */ + @Generated + public static final ExtensibleString EXCEPT = fromString("except"); + + /** + * Static value exec for ExtensibleString. + */ + @Generated + public static final ExtensibleString EXEC = fromString("exec"); + + /** + * Static value finally for ExtensibleString. + */ + @Generated + public static final ExtensibleString FINALLY = fromString("finally"); + + /** + * Static value for for ExtensibleString. + */ + @Generated + public static final ExtensibleString FOR = fromString("for"); + + /** + * Static value from for ExtensibleString. + */ + @Generated + public static final ExtensibleString FROM = fromString("from"); + + /** + * Static value global for ExtensibleString. + */ + @Generated + public static final ExtensibleString GLOBAL = fromString("global"); + + /** + * Static value if for ExtensibleString. + */ + @Generated + public static final ExtensibleString IF = fromString("if"); + + /** + * Static value import for ExtensibleString. + */ + @Generated + public static final ExtensibleString IMPORT = fromString("import"); + + /** + * Static value in for ExtensibleString. + */ + @Generated + public static final ExtensibleString IN = fromString("in"); + + /** + * Static value is for ExtensibleString. + */ + @Generated + public static final ExtensibleString IS = fromString("is"); + + /** + * Static value lambda for ExtensibleString. + */ + @Generated + public static final ExtensibleString LAMBDA = fromString("lambda"); + + /** + * Static value not for ExtensibleString. + */ + @Generated + public static final ExtensibleString NOT = fromString("not"); + + /** + * Static value or for ExtensibleString. + */ + @Generated + public static final ExtensibleString OR = fromString("or"); + + /** + * Static value pass for ExtensibleString. + */ + @Generated + public static final ExtensibleString PASS = fromString("pass"); + + /** + * Static value raise for ExtensibleString. + */ + @Generated + public static final ExtensibleString RAISE = fromString("raise"); + + /** + * Static value return for ExtensibleString. + */ + @Generated + public static final ExtensibleString RETURN = fromString("return"); + + /** + * Static value try for ExtensibleString. + */ + @Generated + public static final ExtensibleString TRY = fromString("try"); + + /** + * Static value while for ExtensibleString. + */ + @Generated + public static final ExtensibleString WHILE = fromString("while"); + + /** + * Static value with for ExtensibleString. + */ + @Generated + public static final ExtensibleString WITH = fromString("with"); + + /** + * Static value yield for ExtensibleString. + */ + @Generated + public static final ExtensibleString YIELD = fromString("yield"); + + /** + * Creates a new instance of ExtensibleString value. + * + * @deprecated Use the {@link #fromString(String)} factory method. + */ + @Generated + @Deprecated + public ExtensibleString() { + } + + /** + * Creates or finds a ExtensibleString from its string representation. + * + * @param name a name to look for. + * @return the corresponding ExtensibleString. + */ + @Generated + public static ExtensibleString fromString(String name) { + return fromString(name, ExtensibleString.class); + } + + /** + * Gets known ExtensibleString values. + * + * @return known ExtensibleString values. + */ + @Generated + public static Collection values() { + return values(ExtensibleString.class); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/extensiblestrings/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/extensiblestrings/models/package-info.java new file mode 100644 index 00000000000..521c13ab8f5 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/extensiblestrings/models/package-info.java @@ -0,0 +1,49 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the data models for SpecialWords. + * Scenarios to verify that reserved words can be used in service and generators will handle it appropriately. + * + * Current list of special words + * ```txt + * and + * as + * assert + * async + * await + * break + * class + * constructor + * continue + * def + * del + * elif + * else + * except + * exec + * finally + * for + * from + * global + * if + * import + * in + * is + * lambda + * list + * not + * or + * pass + * raise + * return + * try + * while + * with + * yield + * ```. + * + */ +package specialwords.extensiblestrings.models; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ExtensibleStringsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ExtensibleStringsImpl.java new file mode 100644 index 00000000000..bfc14dc2403 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ExtensibleStringsImpl.java @@ -0,0 +1,152 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package specialwords.implementation; + +import com.azure.core.annotation.BodyParam; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.Put; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.BinaryData; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * An instance of this class provides access to all the operations defined in ExtensibleStrings. + */ +public final class ExtensibleStringsImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ExtensibleStringsService service; + + /** + * The service client containing this operation class. + */ + private final SpecialWordsClientImpl client; + + /** + * Initializes an instance of ExtensibleStringsImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ExtensibleStringsImpl(SpecialWordsClientImpl client) { + this.service + = RestProxy.create(ExtensibleStringsService.class, client.getHttpPipeline(), client.getSerializerAdapter()); + this.client = client; + } + + /** + * The interface defining all the services for SpecialWordsClientExtensibleStrings to be used by the proxy service + * to perform REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "SpecialWordsClientExtensibleStrings") + public interface ExtensibleStringsService { + @Put("/special-words/extensible-strings/string") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> putExtensibleStringValue(@HostParam("endpoint") String endpoint, + @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Put("/special-words/extensible-strings/string") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response putExtensibleStringValueSync(@HostParam("endpoint") String endpoint, + @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + } + + /** + * The putExtensibleStringValue operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return verify enum member names that are special words using extensible enum (union) along with {@link Response} + * on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> putExtensibleStringValueWithResponseAsync(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.putExtensibleStringValue(this.client.getEndpoint(), contentType, + accept, body, requestOptions, context)); + } + + /** + * The putExtensibleStringValue operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return verify enum member names that are special words using extensible enum (union) along with + * {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putExtensibleStringValueWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.putExtensibleStringValueSync(this.client.getEndpoint(), contentType, accept, body, + requestOptions, Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/SpecialWordsClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/SpecialWordsClientImpl.java index 0228a3a8eff..5ff3f977f51 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/SpecialWordsClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/SpecialWordsClientImpl.java @@ -85,6 +85,20 @@ public ModelPropertiesImpl getModelProperties() { return this.modelProperties; } + /** + * The ExtensibleStringsImpl object to access its operations. + */ + private final ExtensibleStringsImpl extensibleStrings; + + /** + * Gets the ExtensibleStringsImpl object to access its operations. + * + * @return the ExtensibleStringsImpl object. + */ + public ExtensibleStringsImpl getExtensibleStrings() { + return this.extensibleStrings; + } + /** * The OperationsImpl object to access its operations. */ @@ -146,6 +160,7 @@ public SpecialWordsClientImpl(HttpPipeline httpPipeline, SerializerAdapter seria this.endpoint = endpoint; this.models = new ModelsImpl(this); this.modelProperties = new ModelPropertiesImpl(this); + this.extensibleStrings = new ExtensibleStringsImpl(this); this.operations = new OperationsImpl(this); this.parameters = new ParametersImpl(this); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armcustomization/implementation/VaultsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armcustomization/implementation/VaultsImpl.java index 7f656c6cabc..6b7bc67d766 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armcustomization/implementation/VaultsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armcustomization/implementation/VaultsImpl.java @@ -28,12 +28,8 @@ public VaultsImpl(VaultsClient innerClient, tsptest.armcustomization.ArmCustomiz public Response getByResourceGroupWithResponse(String resourceGroupName, String vaultName, Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, vaultName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new VaultImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new VaultImpl(inner.getValue(), this.manager())); } public Vault getByResourceGroup(String resourceGroupName, String vaultName) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armlegacy/implementation/SkusImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armlegacy/implementation/SkusImpl.java index 99a246c7aef..cc8e43cdf3e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armlegacy/implementation/SkusImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armlegacy/implementation/SkusImpl.java @@ -29,12 +29,8 @@ public Response getNestedWithResponse(String providerNamespace, Str String nestedResourceTypeFirst, String sku, Context context) { Response inner = this.serviceClient() .getNestedWithResponse(providerNamespace, resourceType, nestedResourceTypeFirst, sku, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SkuResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SkuResourceImpl(inner.getValue(), this.manager())); } public SkuResource getNested(String providerNamespace, String resourceType, String nestedResourceTypeFirst, @@ -52,12 +48,8 @@ public Response createNestedWithResponse(String providerNamespace, String nestedResourceTypeFirst, String sku, SkuResourceInner resource, Context context) { Response inner = this.serviceClient() .createNestedWithResponse(providerNamespace, resourceType, nestedResourceTypeFirst, sku, resource, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SkuResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SkuResourceImpl(inner.getValue(), this.manager())); } public SkuResource createNested(String providerNamespace, String resourceType, String nestedResourceTypeFirst, @@ -86,12 +78,8 @@ public Response getRootWithResponse(String providerNamespace, Strin Context context) { Response inner = this.serviceClient().getRootWithResponse(providerNamespace, resourceType, sku, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SkuResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SkuResourceImpl(inner.getValue(), this.manager())); } public SkuResource getRoot(String providerNamespace, String resourceType, String sku) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/ChildExtensionResourceInterfacesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/ChildExtensionResourceInterfacesImpl.java index 51e14bb9a49..f8f997455ba 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/ChildExtensionResourceInterfacesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/ChildExtensionResourceInterfacesImpl.java @@ -31,12 +31,8 @@ public Response getWithResponse(String resourceUri, Stri String childExtensionResourceName, Context context) { Response inner = this.serviceClient() .getWithResponse(resourceUri, topLevelArmResourceName, childExtensionResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ChildExtensionResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ChildExtensionResourceImpl(inner.getValue(), this.manager())); } public ChildExtensionResource get(String resourceUri, String topLevelArmResourceName, diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/ChildResourcesInterfacesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/ChildResourcesInterfacesImpl.java index 23014261973..ef2b3f50528 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/ChildResourcesInterfacesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/ChildResourcesInterfacesImpl.java @@ -31,12 +31,8 @@ public Response getWithResponse(String resourceGroupName, String String childResourceName, Context context) { Response inner = this.serviceClient() .getWithResponse(resourceGroupName, topLevelArmResourceName, childResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ChildResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ChildResourceImpl(inner.getValue(), this.manager())); } public ChildResource get(String resourceGroupName, String topLevelArmResourceName, String childResourceName) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/ManagedMaintenanceWindowStatusOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/ManagedMaintenanceWindowStatusOperationsImpl.java index cb64f8316cf..b003d07a245 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/ManagedMaintenanceWindowStatusOperationsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/ManagedMaintenanceWindowStatusOperationsImpl.java @@ -30,12 +30,8 @@ public Response getByResourceGroupWithResponse(S String managedMaintenanceWindowStatusContentName, Context context) { Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, managedMaintenanceWindowStatusContentName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ManagedMaintenanceWindowStatusImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ManagedMaintenanceWindowStatusImpl(inner.getValue(), this.manager())); } public ManagedMaintenanceWindowStatus getByResourceGroup(String resourceGroupName, diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/ModelInterfaceSameNamesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/ModelInterfaceSameNamesImpl.java index 3cbcc629c0d..ed9fb5cf73f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/ModelInterfaceSameNamesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/ModelInterfaceSameNamesImpl.java @@ -30,12 +30,8 @@ public Response getByResourceGroupWithResponse(String re String modelInterfaceDifferentNameName, Context context) { Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, modelInterfaceDifferentNameName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ModelInterfaceSameNameImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ModelInterfaceSameNameImpl(inner.getValue(), this.manager())); } public ModelInterfaceSameName getByResourceGroup(String resourceGroupName, String modelInterfaceDifferentNameName) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceInterfacesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceInterfacesImpl.java index 85ac6caf84c..2e198ed7976 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceInterfacesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceInterfacesImpl.java @@ -34,12 +34,8 @@ public Response getByResourceGroupWithResponse(String resou String topLevelArmResourceName, Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, topLevelArmResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new TopLevelArmResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new TopLevelArmResourceImpl(inner.getValue(), this.manager())); } public TopLevelArmResource getByResourceGroup(String resourceGroupName, String topLevelArmResourceName) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/FishesClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/FishesClient.java index 0124cb6d51c..b0aa1137be9 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/FishesClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/FishesClient.java @@ -20,7 +20,7 @@ public interface FishesClient { * * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws tsptest.armstreamstyleserialization.models.ErrorException thrown if the request is rejected by server. + * @throws tsptest.armstreamstyleserialization.models.ErrorMaxException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with * {@link Response}. @@ -31,7 +31,7 @@ public interface FishesClient { /** * The getModel operation. * - * @throws tsptest.armstreamstyleserialization.models.ErrorException thrown if the request is rejected by server. + * @throws tsptest.armstreamstyleserialization.models.ErrorMaxException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return this is base model for polymorphic multiple levels inheritance with a discriminator. */ diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java index b12428994a8..39dcb7ec1be 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java @@ -7,7 +7,10 @@ import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceMethod; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.http.rest.Response; import com.azure.core.util.Context; +import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; +import tsptest.armstreamstyleserialization.models.ListResult3; import tsptest.armstreamstyleserialization.models.Result; /** @@ -35,4 +38,116 @@ public interface ItemsClient { */ @ServiceMethod(returns = ReturnType.COLLECTION) PagedIterable list(Context context); + + /** + * The summary operation. + * + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + PagedIterable summary(); + + /** + * The summary operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + PagedIterable summary(Context context); + + /** + * The list2 operation. + * + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + PagedIterable list2(); + + /** + * The list2 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + PagedIterable list2(Context context); + + /** + * The summary2 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + Response summary2WithResponse(Context context); + + /** + * The summary2 operation. + * + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + ListResultSummary2Inner summary2(); + + /** + * The list3 operation. + * + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + PagedIterable list3(); + + /** + * The list3 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + PagedIterable list3(Context context); + + /** + * The post operation. + * + * @param body The body parameter. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + Response postWithResponse(ListResult3 body, Context context); + + /** + * The post operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + void post(ListResult3 body); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java new file mode 100644 index 00000000000..98b509fdb1c --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java @@ -0,0 +1,132 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.armstreamstyleserialization.fluent.models; + +import com.azure.core.annotation.Immutable; +import com.azure.core.util.logging.ClientLogger; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.List; +import tsptest.armstreamstyleserialization.models.ListResult2; +import tsptest.armstreamstyleserialization.models.Result; + +/** + * The ListResultSummary2 model. + */ +@Immutable +public final class ListResultSummary2Inner extends ListResult2 { + /* + * The summary property. + */ + private String summary; + + /* + * The nextLink property. + */ + private String nextLink; + + /* + * The items property. + */ + private List items; + + /** + * Creates an instance of ListResultSummary2Inner class. + */ + private ListResultSummary2Inner() { + } + + /** + * Get the summary property: The summary property. + * + * @return the summary value. + */ + public String summary() { + return this.summary; + } + + /** + * Get the nextLink property: The nextLink property. + * + * @return the nextLink value. + */ + @Override + public String nextLink() { + return this.nextLink; + } + + /** + * Get the items property: The items property. + * + * @return the items value. + */ + @Override + public List items() { + return this.items; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + @Override + public void validate() { + if (items() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Missing required property items in model ListResultSummary2Inner")); + } else { + items().forEach(e -> e.validate()); + } + } + + private static final ClientLogger LOGGER = new ClientLogger(ListResultSummary2Inner.class); + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeArrayField("items", items(), (writer, element) -> writer.writeJson(element)); + jsonWriter.writeStringField("nextLink", nextLink()); + jsonWriter.writeStringField("summary", this.summary); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ListResultSummary2Inner from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ListResultSummary2Inner if the JsonReader was pointing to an instance of it, or null if it + * was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ListResultSummary2Inner. + */ + public static ListResultSummary2Inner fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ListResultSummary2Inner deserializedListResultSummary2Inner = new ListResultSummary2Inner(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("items".equals(fieldName)) { + List items = reader.readArray(reader1 -> Result.fromJson(reader1)); + deserializedListResultSummary2Inner.items = items; + } else if ("nextLink".equals(fieldName)) { + deserializedListResultSummary2Inner.nextLink = reader.getString(); + } else if ("summary".equals(fieldName)) { + deserializedListResultSummary2Inner.summary = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedListResultSummary2Inner; + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/FishesClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/FishesClientImpl.java index ab3fe579502..efb854aa788 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/FishesClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/FishesClientImpl.java @@ -26,7 +26,7 @@ import tsptest.armstreamstyleserialization.fluent.FishesClient; import tsptest.armstreamstyleserialization.fluent.models.FishInner; import tsptest.armstreamstyleserialization.fluent.models.OutputOnlyModelInner; -import tsptest.armstreamstyleserialization.models.ErrorException; +import tsptest.armstreamstyleserialization.models.ErrorMaxException; import tsptest.armstreamstyleserialization.models.ErrorMinException; /** @@ -63,14 +63,14 @@ public interface FishesService { @Headers({ "Content-Type: application/json" }) @Get("/model") @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ErrorException.class) + @UnexpectedResponseExceptionType(ErrorMaxException.class) Mono> getModel(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); @Headers({ "Content-Type: application/json" }) @Get("/model") @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ErrorException.class) + @UnexpectedResponseExceptionType(ErrorMaxException.class) Response getModelSync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); @@ -106,7 +106,7 @@ Response getOutputOnlyModelSync(@HostParam("endpoint") Str /** * The getModel operation. * - * @throws ErrorException thrown if the request is rejected by server. + * @throws ErrorMaxException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with * {@link Response} on successful completion of {@link Mono}. @@ -125,7 +125,7 @@ private Mono> getModelWithResponseAsync() { /** * The getModel operation. * - * @throws ErrorException thrown if the request is rejected by server. + * @throws ErrorMaxException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return this is base model for polymorphic multiple levels inheritance with a discriminator on successful * completion of {@link Mono}. @@ -140,7 +140,7 @@ private Mono getModelAsync() { * * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ErrorException thrown if the request is rejected by server. + * @throws ErrorMaxException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with * {@link Response}. @@ -159,7 +159,7 @@ public Response getModelWithResponse(Context context) { /** * The getModel operation. * - * @throws ErrorException thrown if the request is rejected by server. + * @throws ErrorMaxException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return this is base model for polymorphic multiple levels inheritance with a discriminator. */ diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/FishesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/FishesImpl.java index 99a767143f0..0a636c9e946 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/FishesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/FishesImpl.java @@ -30,12 +30,8 @@ public FishesImpl(FishesClient innerClient, public Response getModelWithResponse(Context context) { Response inner = this.serviceClient().getModelWithResponse(context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new FishImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new FishImpl(inner.getValue(), this.manager())); } public Fish getModel() { @@ -49,12 +45,8 @@ public Fish getModel() { public Response putModelWithResponse(FishInner fish, Context context) { Response inner = this.serviceClient().putModelWithResponse(fish, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new FishImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new FishImpl(inner.getValue(), this.manager())); } public Fish putModel(FishInner fish) { @@ -68,12 +60,8 @@ public Fish putModel(FishInner fish) { public Response getOutputOnlyModelWithResponse(Context context) { Response inner = this.serviceClient().getOutputOnlyModelWithResponse(context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new OutputOnlyModelImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new OutputOnlyModelImpl(inner.getValue(), this.manager())); } public OutputOnlyModel getOutputOnlyModel() { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java index 70d6dc0ac48..c835c1e1715 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java @@ -4,6 +4,7 @@ package tsptest.armstreamstyleserialization.implementation; +import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Get; import com.azure.core.annotation.HeaderParam; @@ -11,6 +12,7 @@ import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; import com.azure.core.annotation.PathParam; +import com.azure.core.annotation.Post; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceInterface; import com.azure.core.annotation.ServiceMethod; @@ -30,7 +32,11 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import tsptest.armstreamstyleserialization.fluent.ItemsClient; +import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; import tsptest.armstreamstyleserialization.implementation.models.ListResult; +import tsptest.armstreamstyleserialization.implementation.models.ListResultSummary; +import tsptest.armstreamstyleserialization.models.ListResult2; +import tsptest.armstreamstyleserialization.models.ListResult3; import tsptest.armstreamstyleserialization.models.Result; /** @@ -78,6 +84,77 @@ Mono>> list(@HostParam("endpoint") String endpoint, Response listSync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); + @Headers({ "Content-Type: application/json" }) + @Get("/items/summary") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> summary(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/items/summary") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response summarySync(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/items/list2") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> list2(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/items/list2") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response list2Sync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/items/summary2") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> summary2(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/items/summary2") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response summary2Sync(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/items/list3") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> list3(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/items/list3") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response list3Sync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + Context context); + + @Headers({ "Accept: application/json;q=0.9" }) + @Post("/items") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> post(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") ListResult3 body, + Context context); + + @Headers({ "Accept: application/json;q=0.9" }) + @Post("/items") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response postSync(@HostParam("endpoint") String endpoint, @HeaderParam("Content-Type") String contentType, + @BodyParam("application/json") ListResult3 body, Context context); + @Headers({ "Content-Type: application/json" }) @Get("{nextLink}") @ExpectedResponses({ 200 }) @@ -91,6 +168,48 @@ Mono> listNext(@PathParam(value = "nextLink", encoded = tru @UnexpectedResponseExceptionType(ManagementException.class) Response listNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("{nextLink}") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> summaryNext(@PathParam(value = "nextLink", encoded = true) String nextLink, + @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("{nextLink}") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response summaryNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink, + @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("{nextLink}") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> list2Next(@PathParam(value = "nextLink", encoded = true) String nextLink, + @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("{nextLink}") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response list2NextSync(@PathParam(value = "nextLink", encoded = true) String nextLink, + @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("{nextLink}") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> list3Next(@PathParam(value = "nextLink", encoded = true) String nextLink, + @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("{nextLink}") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response list3NextSync(@PathParam(value = "nextLink", encoded = true) String nextLink, + @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); } /** @@ -209,60 +328,161 @@ public PagedIterable list(Context context) { } /** - * Get the next page of items. + * The summary operation. * - * @param nextLink The URL to get the next list of items. - * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink) { - if (nextLink == null) { - return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); - } + private Mono> summarySinglePageAsync() { if (this.client.getEndpoint() == null) { return Mono.error( new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); } final String accept = "application/json"; - return FluxUtil.withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) + return FluxUtil.withContext(context -> service.summary(this.client.getEndpoint(), accept, context)) .>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null)) .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); } /** - * Get the next page of items. + * The summary operation. * - * @param nextLink The URL to get the next list of items. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedFlux}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + private PagedFlux summaryAsync() { + return new PagedFlux<>(() -> summarySinglePageAsync(), nextLink -> summaryNextSinglePageAsync(nextLink)); + } + + /** + * The summary operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse summarySinglePage() { + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.summarySync(this.client.getEndpoint(), accept, Context.NONE); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * The summary operation. + * + * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response body along with {@link PagedResponse}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private PagedResponse listNextSinglePage(String nextLink) { - if (nextLink == null) { + private PagedResponse summarySinglePage(Context context) { + if (this.client.getEndpoint() == null) { throw LOGGER.atError() - .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.summarySync(this.client.getEndpoint(), accept, context); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * The summary operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable summary() { + return new PagedIterable<>(() -> summarySinglePage(), nextLink -> summaryNextSinglePage(nextLink)); + } + + /** + * The summary operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable summary(Context context) { + return new PagedIterable<>(() -> summarySinglePage(context), + nextLink -> summaryNextSinglePage(nextLink, context)); + } + + /** + * The list2 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> list2SinglePageAsync() { + if (this.client.getEndpoint() == null) { + return Mono.error( + new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); } + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.list2(this.client.getEndpoint(), accept, context)) + .>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), + res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * The list2 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedFlux}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + private PagedFlux list2Async() { + return new PagedFlux<>(() -> list2SinglePageAsync(), nextLink -> list2NextSinglePageAsync(nextLink)); + } + + /** + * The list2 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse list2SinglePage() { if (this.client.getEndpoint() == null) { throw LOGGER.atError() .log(new IllegalArgumentException( "Parameter this.client.getEndpoint() is required and cannot be null.")); } final String accept = "application/json"; - Response res = service.listNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE); + Response res = service.list2Sync(this.client.getEndpoint(), accept, Context.NONE); return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null); } /** - * Get the next page of items. + * The list2 operation. * - * @param nextLink The URL to get the next list of items. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. @@ -270,18 +490,594 @@ private PagedResponse listNextSinglePage(String nextLink) { * @return the response body along with {@link PagedResponse}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private PagedResponse listNextSinglePage(String nextLink, Context context) { - if (nextLink == null) { + private PagedResponse list2SinglePage(Context context) { + if (this.client.getEndpoint() == null) { throw LOGGER.atError() - .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.list2Sync(this.client.getEndpoint(), accept, context); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * The list2 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list2() { + return new PagedIterable<>(() -> list2SinglePage(), nextLink -> list2NextSinglePage(nextLink)); + } + + /** + * The list2 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list2(Context context) { + return new PagedIterable<>(() -> list2SinglePage(context), nextLink -> list2NextSinglePage(nextLink, context)); + } + + /** + * The summary2 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> summary2WithResponseAsync() { + if (this.client.getEndpoint() == null) { + return Mono.error( + new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); } + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.summary2(this.client.getEndpoint(), accept, context)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * The summary2 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono summary2Async() { + return summary2WithResponseAsync().flatMap(res -> Mono.justOrEmpty(res.getValue())); + } + + /** + * The summary2 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response summary2WithResponse(Context context) { if (this.client.getEndpoint() == null) { throw LOGGER.atError() .log(new IllegalArgumentException( "Parameter this.client.getEndpoint() is required and cannot be null.")); } final String accept = "application/json"; - Response res = service.listNextSync(nextLink, this.client.getEndpoint(), accept, context); + return service.summary2Sync(this.client.getEndpoint(), accept, context); + } + + /** + * The summary2 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public ListResultSummary2Inner summary2() { + return summary2WithResponse(Context.NONE).getValue(); + } + + /** + * The list3 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> list3SinglePageAsync() { + if (this.client.getEndpoint() == null) { + return Mono.error( + new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.list3(this.client.getEndpoint(), accept, context)) + .>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), + res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * The list3 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedFlux}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + private PagedFlux list3Async() { + return new PagedFlux<>(() -> list3SinglePageAsync(), nextLink -> list3NextSinglePageAsync(nextLink)); + } + + /** + * The list3 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse list3SinglePage() { + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.list3Sync(this.client.getEndpoint(), accept, Context.NONE); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * The list3 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse list3SinglePage(Context context) { + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.list3Sync(this.client.getEndpoint(), accept, context); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * The list3 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list3() { + return new PagedIterable<>(() -> list3SinglePage(), nextLink -> list3NextSinglePage(nextLink)); + } + + /** + * The list3 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list3(Context context) { + return new PagedIterable<>(() -> list3SinglePage(context), nextLink -> list3NextSinglePage(nextLink, context)); + } + + /** + * The post operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> postWithResponseAsync(ListResult3 body) { + if (this.client.getEndpoint() == null) { + return Mono.error( + new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); + } + if (body == null) { + return Mono.error(new IllegalArgumentException("Parameter body is required and cannot be null.")); + } else { + body.validate(); + } + final String contentType = "application/json"; + return FluxUtil.withContext(context -> service.post(this.client.getEndpoint(), contentType, body, context)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * The post operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono postAsync(ListResult3 body) { + return postWithResponseAsync(body).flatMap(ignored -> Mono.empty()); + } + + /** + * The post operation. + * + * @param body The body parameter. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response postWithResponse(ListResult3 body, Context context) { + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + if (body == null) { + throw LOGGER.atError().log(new IllegalArgumentException("Parameter body is required and cannot be null.")); + } else { + body.validate(); + } + final String contentType = "application/json"; + return service.postSync(this.client.getEndpoint(), contentType, body, context); + } + + /** + * The post operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public void post(ListResult3 body) { + postWithResponse(body, Context.NONE); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> listNextSinglePageAsync(String nextLink) { + if (nextLink == null) { + return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + return Mono.error( + new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) + .>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), + res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse listNextSinglePage(String nextLink) { + if (nextLink == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.listNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse listNextSinglePage(String nextLink, Context context) { + if (nextLink == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.listNextSync(nextLink, this.client.getEndpoint(), accept, context); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> summaryNextSinglePageAsync(String nextLink) { + if (nextLink == null) { + return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + return Mono.error( + new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + return FluxUtil + .withContext(context -> service.summaryNext(nextLink, this.client.getEndpoint(), accept, context)) + .>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), + res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse summaryNextSinglePage(String nextLink) { + if (nextLink == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res + = service.summaryNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse summaryNextSinglePage(String nextLink, Context context) { + if (nextLink == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.summaryNextSync(nextLink, this.client.getEndpoint(), accept, context); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> list2NextSinglePageAsync(String nextLink) { + if (nextLink == null) { + return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + return Mono.error( + new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.list2Next(nextLink, this.client.getEndpoint(), accept, context)) + .>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), + res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse list2NextSinglePage(String nextLink) { + if (nextLink == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.list2NextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse list2NextSinglePage(String nextLink, Context context) { + if (nextLink == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.list2NextSync(nextLink, this.client.getEndpoint(), accept, context); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> list3NextSinglePageAsync(String nextLink) { + if (nextLink == null) { + return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + return Mono.error( + new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.list3Next(nextLink, this.client.getEndpoint(), accept, context)) + .>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), + res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse list3NextSinglePage(String nextLink) { + if (nextLink == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.list3NextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse list3NextSinglePage(String nextLink, Context context) { + if (nextLink == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.list3NextSync(nextLink, this.client.getEndpoint(), accept, context); return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java index 37ad1648542..2602f80f5ff 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java @@ -5,10 +5,15 @@ package tsptest.armstreamstyleserialization.implementation; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.SimpleResponse; import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import tsptest.armstreamstyleserialization.fluent.ItemsClient; +import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; import tsptest.armstreamstyleserialization.models.Items; +import tsptest.armstreamstyleserialization.models.ListResult3; +import tsptest.armstreamstyleserialization.models.ListResultSummary2; import tsptest.armstreamstyleserialization.models.Result; public final class ItemsImpl implements Items { @@ -32,6 +37,53 @@ public PagedIterable list(Context context) { return this.serviceClient().list(context); } + public PagedIterable summary() { + return this.serviceClient().summary(); + } + + public PagedIterable summary(Context context) { + return this.serviceClient().summary(context); + } + + public PagedIterable list2() { + return this.serviceClient().list2(); + } + + public PagedIterable list2(Context context) { + return this.serviceClient().list2(context); + } + + public Response summary2WithResponse(Context context) { + Response inner = this.serviceClient().summary2WithResponse(context); + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ListResultSummary2Impl(inner.getValue(), this.manager())); + } + + public ListResultSummary2 summary2() { + ListResultSummary2Inner inner = this.serviceClient().summary2(); + if (inner != null) { + return new ListResultSummary2Impl(inner, this.manager()); + } else { + return null; + } + } + + public PagedIterable list3() { + return this.serviceClient().list3(); + } + + public PagedIterable list3(Context context) { + return this.serviceClient().list3(context); + } + + public Response postWithResponse(ListResult3 body, Context context) { + return this.serviceClient().postWithResponse(body, context); + } + + public void post(ListResult3 body) { + this.serviceClient().post(body); + } + private ItemsClient serviceClient() { return this.innerClient; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java new file mode 100644 index 00000000000..c5fe07fbb58 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java @@ -0,0 +1,48 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.armstreamstyleserialization.implementation; + +import java.util.Collections; +import java.util.List; +import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; +import tsptest.armstreamstyleserialization.models.ListResultSummary2; +import tsptest.armstreamstyleserialization.models.Result; + +public final class ListResultSummary2Impl implements ListResultSummary2 { + private ListResultSummary2Inner innerObject; + + private final tsptest.armstreamstyleserialization.ArmResourceProviderManager serviceManager; + + ListResultSummary2Impl(ListResultSummary2Inner innerObject, + tsptest.armstreamstyleserialization.ArmResourceProviderManager serviceManager) { + this.innerObject = innerObject; + this.serviceManager = serviceManager; + } + + public List items() { + List inner = this.innerModel().items(); + if (inner != null) { + return Collections.unmodifiableList(inner); + } else { + return Collections.emptyList(); + } + } + + public String nextLink() { + return this.innerModel().nextLink(); + } + + public String summary() { + return this.innerModel().summary(); + } + + public ListResultSummary2Inner innerModel() { + return this.innerObject; + } + + private tsptest.armstreamstyleserialization.ArmResourceProviderManager manager() { + return this.serviceManager; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesClientImpl.java index 45564684237..e7f67aafc25 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesClientImpl.java @@ -90,7 +90,7 @@ private Mono> setPriorityWithResponseAsync(Priority priority) if (priority == null) { return Mono.error(new IllegalArgumentException("Parameter priority is required and cannot be null.")); } - final String accept = "text/plain"; + final String accept = "application/json"; return FluxUtil .withContext(context -> service.setPriority(this.client.getEndpoint(), priority, accept, context)) .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); @@ -131,7 +131,7 @@ public Response setPriorityWithResponse(Priority priority, Context con throw LOGGER.atError() .log(new IllegalArgumentException("Parameter priority is required and cannot be null.")); } - final String accept = "text/plain"; + final String accept = "application/json"; return service.setPrioritySync(this.client.getEndpoint(), priority, accept, context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java index af772cd80e7..0d612e3c14c 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java @@ -18,7 +18,7 @@ * The ListResult model. */ @Immutable -public final class ListResult implements JsonSerializable { +public class ListResult implements JsonSerializable { /* * The items property. */ @@ -32,7 +32,7 @@ public final class ListResult implements JsonSerializable { /** * Creates an instance of ListResult class. */ - private ListResult() { + protected ListResult() { } /** @@ -44,6 +44,17 @@ public List items() { return this.items; } + /** + * Set the items property: The items property. + * + * @param items the items value to set. + * @return the ListResult object itself. + */ + ListResult withItems(List items) { + this.items = items; + return this; + } + /** * Get the nextLink property: The nextLink property. * @@ -53,6 +64,17 @@ public String nextLink() { return this.nextLink; } + /** + * Set the nextLink property: The nextLink property. + * + * @param nextLink the nextLink value to set. + * @return the ListResult object itself. + */ + ListResult withNextLink(String nextLink) { + this.nextLink = nextLink; + return this; + } + /** * Validates the instance. * diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java new file mode 100644 index 00000000000..04710cf983f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java @@ -0,0 +1,131 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.armstreamstyleserialization.implementation.models; + +import com.azure.core.annotation.Immutable; +import com.azure.core.util.logging.ClientLogger; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.List; +import tsptest.armstreamstyleserialization.models.Result; + +/** + * The ListResultSummary model. + */ +@Immutable +public final class ListResultSummary extends ListResult { + /* + * The summary property. + */ + private String summary; + + /* + * The nextLink property. + */ + private String nextLink; + + /* + * The items property. + */ + private List items; + + /** + * Creates an instance of ListResultSummary class. + */ + private ListResultSummary() { + } + + /** + * Get the summary property: The summary property. + * + * @return the summary value. + */ + public String summary() { + return this.summary; + } + + /** + * Get the nextLink property: The nextLink property. + * + * @return the nextLink value. + */ + @Override + public String nextLink() { + return this.nextLink; + } + + /** + * Get the items property: The items property. + * + * @return the items value. + */ + @Override + public List items() { + return this.items; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + @Override + public void validate() { + if (items() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Missing required property items in model ListResultSummary")); + } else { + items().forEach(e -> e.validate()); + } + } + + private static final ClientLogger LOGGER = new ClientLogger(ListResultSummary.class); + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeArrayField("items", items(), (writer, element) -> writer.writeJson(element)); + jsonWriter.writeStringField("nextLink", nextLink()); + jsonWriter.writeStringField("summary", this.summary); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ListResultSummary from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ListResultSummary if the JsonReader was pointing to an instance of it, or null if it was + * pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ListResultSummary. + */ + public static ListResultSummary fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ListResultSummary deserializedListResultSummary = new ListResultSummary(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("items".equals(fieldName)) { + List items = reader.readArray(reader1 -> Result.fromJson(reader1)); + deserializedListResultSummary.items = items; + } else if ("nextLink".equals(fieldName)) { + deserializedListResultSummary.nextLink = reader.getString(); + } else if ("summary".equals(fieldName)) { + deserializedListResultSummary.summary = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedListResultSummary; + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Builtin.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Builtin.java index 4baa115a2f1..f450c4a17fc 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Builtin.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Builtin.java @@ -122,6 +122,21 @@ public final class Builtin implements JsonSerializable { */ private BinaryData unknown; + /* + * The unknownDict property. + */ + private Map unknownDict; + + /* + * The unknownArray property. + */ + private List unknownArray; + + /* + * The unknownDictArray property. + */ + private List> unknownDictArray; + /** * Creates an instance of Builtin class. */ @@ -508,6 +523,66 @@ public Builtin withUnknown(BinaryData unknown) { return this; } + /** + * Get the unknownDict property: The unknownDict property. + * + * @return the unknownDict value. + */ + public Map unknownDict() { + return this.unknownDict; + } + + /** + * Set the unknownDict property: The unknownDict property. + * + * @param unknownDict the unknownDict value to set. + * @return the Builtin object itself. + */ + public Builtin withUnknownDict(Map unknownDict) { + this.unknownDict = unknownDict; + return this; + } + + /** + * Get the unknownArray property: The unknownArray property. + * + * @return the unknownArray value. + */ + public List unknownArray() { + return this.unknownArray; + } + + /** + * Set the unknownArray property: The unknownArray property. + * + * @param unknownArray the unknownArray value to set. + * @return the Builtin object itself. + */ + public Builtin withUnknownArray(List unknownArray) { + this.unknownArray = unknownArray; + return this; + } + + /** + * Get the unknownDictArray property: The unknownDictArray property. + * + * @return the unknownDictArray value. + */ + public List> unknownDictArray() { + return this.unknownDictArray; + } + + /** + * Set the unknownDictArray property: The unknownDictArray property. + * + * @param unknownDictArray the unknownDictArray value to set. + * @return the Builtin object itself. + */ + public Builtin withUnknownDictArray(List> unknownDictArray) { + this.unknownDictArray = unknownDictArray; + return this; + } + /** * Validates the instance. * @@ -565,6 +640,18 @@ public void validate() { throw LOGGER.atError() .log(new IllegalArgumentException("Missing required property unknown in model Builtin")); } + if (unknownDict() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Missing required property unknownDict in model Builtin")); + } + if (unknownArray() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Missing required property unknownArray in model Builtin")); + } + if (unknownDictArray() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Missing required property unknownDictArray in model Builtin")); + } } private static final ClientLogger LOGGER = new ClientLogger(Builtin.class); @@ -597,6 +684,28 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("uuid", this.uuid); jsonWriter.writeFieldName("unknown"); this.unknown.writeTo(jsonWriter); + jsonWriter.writeMapField("unknownDict", this.unknownDict, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); + jsonWriter.writeArrayField("unknownArray", this.unknownArray, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); + jsonWriter.writeArrayField("unknownDictArray", this.unknownDictArray, + (writer, element) -> writer.writeMap(element, (writer1, element1) -> { + if (element1 == null) { + writer1.writeNull(); + } else { + element1.writeTo(writer1); + } + })); return jsonWriter.writeEndObject(); } @@ -663,6 +772,19 @@ public static Builtin fromJson(JsonReader jsonReader) throws IOException { } else if ("unknown".equals(fieldName)) { deserializedBuiltin.unknown = reader.getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped())); + } else if ("unknownDict".equals(fieldName)) { + Map unknownDict = reader.readMap(reader1 -> reader1 + .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); + deserializedBuiltin.unknownDict = unknownDict; + } else if ("unknownArray".equals(fieldName)) { + List unknownArray = reader.readArray(reader1 -> reader1 + .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); + deserializedBuiltin.unknownArray = unknownArray; + } else if ("unknownDictArray".equals(fieldName)) { + List> unknownDictArray + = reader.readArray(reader1 -> reader1.readMap(reader2 -> reader2 + .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped())))); + deserializedBuiltin.unknownDictArray = unknownDictArray; } else { reader.skipChildren(); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Error.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Error.java deleted file mode 100644 index 693b29dbd74..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Error.java +++ /dev/null @@ -1,192 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package tsptest.armstreamstyleserialization.models; - -import com.azure.core.annotation.Immutable; -import com.azure.core.management.exception.AdditionalInfo; -import com.azure.core.management.exception.ManagementError; -import com.azure.json.JsonReader; -import com.azure.json.JsonToken; -import com.azure.json.JsonWriter; -import java.io.IOException; -import java.util.List; - -/** - * The Error model. - */ -@Immutable -public final class Error extends ManagementError { - /* - * The details property. - */ - private List details; - - /* - * The additionalProperty property. - */ - private String additionalProperty; - - /* - * Additional info for the error. - */ - private List additionalInfo; - - /* - * The target of the error. - */ - private String target; - - /* - * The error message parsed from the body of the http error response. - */ - private String message; - - /* - * The error code parsed from the body of the http error response. - */ - private String code; - - /** - * Creates an instance of Error class. - */ - private Error() { - } - - /** - * Get the details property: The details property. - * - * @return the details value. - */ - @Override - public List getDetails() { - return this.details; - } - - /** - * Get the additionalProperty property: The additionalProperty property. - * - * @return the additionalProperty value. - */ - public String getAdditionalProperty() { - return this.additionalProperty; - } - - /** - * Get the additionalInfo property: Additional info for the error. - * - * @return the additionalInfo value. - */ - @Override - public List getAdditionalInfo() { - return this.additionalInfo; - } - - /** - * Get the target property: The target of the error. - * - * @return the target value. - */ - @Override - public String getTarget() { - return this.target; - } - - /** - * Get the message property: The error message parsed from the body of the http error response. - * - * @return the message value. - */ - @Override - public String getMessage() { - return this.message; - } - - /** - * Get the code property: The error code parsed from the body of the http error response. - * - * @return the code value. - */ - @Override - public String getCode() { - return this.code; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (getDetails() != null) { - getDetails().forEach(e -> e.validate()); - } - } - - /** - * {@inheritDoc} - */ - @Override - public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { - jsonWriter.writeStartObject(); - return jsonWriter.writeEndObject(); - } - - /** - * Reads an instance of Error from the JsonReader. - * - * @param jsonReader The JsonReader being read. - * @return An instance of Error if the JsonReader was pointing to an instance of it, or null if it was pointing to - * JSON null. - * @throws IllegalStateException If the deserialized JSON object was missing any required properties. - * @throws IOException If an error occurs while reading the Error. - */ - public static Error fromJson(JsonReader jsonReader) throws IOException { - return jsonReader.readObject(reader -> { - JsonReader bufferedReader = reader.bufferObject(); - bufferedReader.nextToken(); - while (bufferedReader.nextToken() != JsonToken.END_OBJECT) { - String fieldName = bufferedReader.getFieldName(); - bufferedReader.nextToken(); - - if ("error".equals(fieldName)) { - return readManagementError(bufferedReader); - } else { - bufferedReader.skipChildren(); - } - } - return readManagementError(bufferedReader.reset()); - }); - } - - private static Error readManagementError(JsonReader jsonReader) throws IOException { - return jsonReader.readObject(reader -> { - Error deserializedError = new Error(); - while (reader.nextToken() != JsonToken.END_OBJECT) { - String fieldName = reader.getFieldName(); - reader.nextToken(); - - if ("code".equals(fieldName)) { - deserializedError.code = reader.getString(); - } else if ("message".equals(fieldName)) { - deserializedError.message = reader.getString(); - } else if ("target".equals(fieldName)) { - deserializedError.target = reader.getString(); - } else if ("additionalInfo".equals(fieldName)) { - List additionalInfo = reader.readArray(reader1 -> AdditionalInfo.fromJson(reader1)); - deserializedError.additionalInfo = additionalInfo; - } else if ("additionalProperty".equals(fieldName)) { - deserializedError.additionalProperty = reader.getString(); - } else if ("details".equals(fieldName)) { - List details = reader.readArray(reader1 -> Error.fromJson(reader1)); - deserializedError.details = details; - } else { - reader.skipChildren(); - } - } - - return deserializedError; - }); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ErrorException.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ErrorException.java deleted file mode 100644 index e07c1f64bbb..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ErrorException.java +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package tsptest.armstreamstyleserialization.models; - -import com.azure.core.http.HttpResponse; -import com.azure.core.management.exception.ManagementException; - -/** - * Exception thrown for an invalid response with Error information. - */ -public final class ErrorException extends ManagementException { - /** - * Initializes a new instance of the ErrorException class. - * - * @param message the exception message or the response content if a message is not available. - * @param response the HTTP response. - */ - public ErrorException(String message, HttpResponse response) { - super(message, response); - } - - /** - * Initializes a new instance of the ErrorException class. - * - * @param message the exception message or the response content if a message is not available. - * @param response the HTTP response. - * @param value the deserialized response value. - */ - public ErrorException(String message, HttpResponse response, Error value) { - super(message, response, value); - } - - /** - * {@inheritDoc} - */ - @Override - public Error getValue() { - return (Error) super.getValue(); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ErrorMax.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ErrorMax.java new file mode 100644 index 00000000000..17511bf104d --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ErrorMax.java @@ -0,0 +1,192 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.armstreamstyleserialization.models; + +import com.azure.core.annotation.Immutable; +import com.azure.core.management.exception.AdditionalInfo; +import com.azure.core.management.exception.ManagementError; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.List; + +/** + * The ErrorMax model. + */ +@Immutable +public final class ErrorMax extends ManagementError { + /* + * The details property. + */ + private List details; + + /* + * The additionalProperty property. + */ + private String additionalProperty; + + /* + * Additional info for the error. + */ + private List additionalInfo; + + /* + * The target of the error. + */ + private String target; + + /* + * The error message parsed from the body of the http error response. + */ + private String message; + + /* + * The error code parsed from the body of the http error response. + */ + private String code; + + /** + * Creates an instance of ErrorMax class. + */ + private ErrorMax() { + } + + /** + * Get the details property: The details property. + * + * @return the details value. + */ + @Override + public List getDetails() { + return this.details; + } + + /** + * Get the additionalProperty property: The additionalProperty property. + * + * @return the additionalProperty value. + */ + public String getAdditionalProperty() { + return this.additionalProperty; + } + + /** + * Get the additionalInfo property: Additional info for the error. + * + * @return the additionalInfo value. + */ + @Override + public List getAdditionalInfo() { + return this.additionalInfo; + } + + /** + * Get the target property: The target of the error. + * + * @return the target value. + */ + @Override + public String getTarget() { + return this.target; + } + + /** + * Get the message property: The error message parsed from the body of the http error response. + * + * @return the message value. + */ + @Override + public String getMessage() { + return this.message; + } + + /** + * Get the code property: The error code parsed from the body of the http error response. + * + * @return the code value. + */ + @Override + public String getCode() { + return this.code; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + public void validate() { + if (getDetails() != null) { + getDetails().forEach(e -> e.validate()); + } + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ErrorMax from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ErrorMax if the JsonReader was pointing to an instance of it, or null if it was pointing + * to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ErrorMax. + */ + public static ErrorMax fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + JsonReader bufferedReader = reader.bufferObject(); + bufferedReader.nextToken(); + while (bufferedReader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = bufferedReader.getFieldName(); + bufferedReader.nextToken(); + + if ("error".equals(fieldName)) { + return readManagementError(bufferedReader); + } else { + bufferedReader.skipChildren(); + } + } + return readManagementError(bufferedReader.reset()); + }); + } + + private static ErrorMax readManagementError(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ErrorMax deserializedErrorMax = new ErrorMax(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("code".equals(fieldName)) { + deserializedErrorMax.code = reader.getString(); + } else if ("message".equals(fieldName)) { + deserializedErrorMax.message = reader.getString(); + } else if ("target".equals(fieldName)) { + deserializedErrorMax.target = reader.getString(); + } else if ("additionalInfo".equals(fieldName)) { + List additionalInfo = reader.readArray(reader1 -> AdditionalInfo.fromJson(reader1)); + deserializedErrorMax.additionalInfo = additionalInfo; + } else if ("additionalProperty".equals(fieldName)) { + deserializedErrorMax.additionalProperty = reader.getString(); + } else if ("details".equals(fieldName)) { + List details = reader.readArray(reader1 -> ErrorMax.fromJson(reader1)); + deserializedErrorMax.details = details; + } else { + reader.skipChildren(); + } + } + + return deserializedErrorMax; + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ErrorMaxException.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ErrorMaxException.java new file mode 100644 index 00000000000..dd82ba35a8f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ErrorMaxException.java @@ -0,0 +1,42 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.armstreamstyleserialization.models; + +import com.azure.core.http.HttpResponse; +import com.azure.core.management.exception.ManagementException; + +/** + * Exception thrown for an invalid response with ErrorMax information. + */ +public final class ErrorMaxException extends ManagementException { + /** + * Initializes a new instance of the ErrorMaxException class. + * + * @param message the exception message or the response content if a message is not available. + * @param response the HTTP response. + */ + public ErrorMaxException(String message, HttpResponse response) { + super(message, response); + } + + /** + * Initializes a new instance of the ErrorMaxException class. + * + * @param message the exception message or the response content if a message is not available. + * @param response the HTTP response. + * @param value the deserialized response value. + */ + public ErrorMaxException(String message, HttpResponse response, ErrorMax value) { + super(message, response, value); + } + + /** + * {@inheritDoc} + */ + @Override + public ErrorMax getValue() { + return (ErrorMax) super.getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Fishes.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Fishes.java index a08020c3b28..0fdcea518eb 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Fishes.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Fishes.java @@ -17,7 +17,7 @@ public interface Fishes { * * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws tsptest.armstreamstyleserialization.models.ErrorException thrown if the request is rejected by server. + * @throws tsptest.armstreamstyleserialization.models.ErrorMaxException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with * {@link Response}. @@ -27,7 +27,7 @@ public interface Fishes { /** * The getModel operation. * - * @throws tsptest.armstreamstyleserialization.models.ErrorException thrown if the request is rejected by server. + * @throws tsptest.armstreamstyleserialization.models.ErrorMaxException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return this is base model for polymorphic multiple levels inheritance with a discriminator. */ diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Items.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Items.java index 819aef6f3a4..7cd5fc475dc 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Items.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Items.java @@ -5,6 +5,7 @@ package tsptest.armstreamstyleserialization.models; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.http.rest.Response; import com.azure.core.util.Context; /** @@ -30,4 +31,106 @@ public interface Items { * @return the paginated response with {@link PagedIterable}. */ PagedIterable list(Context context); + + /** + * The summary operation. + * + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + PagedIterable summary(); + + /** + * The summary operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + PagedIterable summary(Context context); + + /** + * The list2 operation. + * + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + PagedIterable list2(); + + /** + * The list2 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + PagedIterable list2(Context context); + + /** + * The summary2 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + Response summary2WithResponse(Context context); + + /** + * The summary2 operation. + * + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + ListResultSummary2 summary2(); + + /** + * The list3 operation. + * + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + PagedIterable list3(); + + /** + * The list3 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + PagedIterable list3(Context context); + + /** + * The post operation. + * + * @param body The body parameter. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + Response postWithResponse(ListResult3 body, Context context); + + /** + * The post operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + void post(ListResult3 body); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java new file mode 100644 index 00000000000..27bdf410dd3 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java @@ -0,0 +1,133 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.armstreamstyleserialization.models; + +import com.azure.core.annotation.Immutable; +import com.azure.core.util.logging.ClientLogger; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.List; + +/** + * The ListResult2 model. + */ +@Immutable +public class ListResult2 implements JsonSerializable { + /* + * The items property. + */ + private List items; + + /* + * The nextLink property. + */ + private String nextLink; + + /** + * Creates an instance of ListResult2 class. + */ + protected ListResult2() { + } + + /** + * Get the items property: The items property. + * + * @return the items value. + */ + public List items() { + return this.items; + } + + /** + * Set the items property: The items property. + * + * @param items the items value to set. + * @return the ListResult2 object itself. + */ + ListResult2 withItems(List items) { + this.items = items; + return this; + } + + /** + * Get the nextLink property: The nextLink property. + * + * @return the nextLink value. + */ + public String nextLink() { + return this.nextLink; + } + + /** + * Set the nextLink property: The nextLink property. + * + * @param nextLink the nextLink value to set. + * @return the ListResult2 object itself. + */ + ListResult2 withNextLink(String nextLink) { + this.nextLink = nextLink; + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + public void validate() { + if (items() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Missing required property items in model ListResult2")); + } else { + items().forEach(e -> e.validate()); + } + } + + private static final ClientLogger LOGGER = new ClientLogger(ListResult2.class); + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeArrayField("items", this.items, (writer, element) -> writer.writeJson(element)); + jsonWriter.writeStringField("nextLink", this.nextLink); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ListResult2 from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ListResult2 if the JsonReader was pointing to an instance of it, or null if it was + * pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ListResult2. + */ + public static ListResult2 fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ListResult2 deserializedListResult2 = new ListResult2(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("items".equals(fieldName)) { + List items = reader.readArray(reader1 -> Result.fromJson(reader1)); + deserializedListResult2.items = items; + } else if ("nextLink".equals(fieldName)) { + deserializedListResult2.nextLink = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedListResult2; + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResult3.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResult3.java new file mode 100644 index 00000000000..c24d0e9c9a9 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResult3.java @@ -0,0 +1,133 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.armstreamstyleserialization.models; + +import com.azure.core.annotation.Fluent; +import com.azure.core.util.logging.ClientLogger; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.List; + +/** + * The ListResult3 model. + */ +@Fluent +public final class ListResult3 implements JsonSerializable { + /* + * The items property. + */ + private List items; + + /* + * The nextLink property. + */ + private String nextLink; + + /** + * Creates an instance of ListResult3 class. + */ + public ListResult3() { + } + + /** + * Get the items property: The items property. + * + * @return the items value. + */ + public List items() { + return this.items; + } + + /** + * Set the items property: The items property. + * + * @param items the items value to set. + * @return the ListResult3 object itself. + */ + public ListResult3 withItems(List items) { + this.items = items; + return this; + } + + /** + * Get the nextLink property: The nextLink property. + * + * @return the nextLink value. + */ + public String nextLink() { + return this.nextLink; + } + + /** + * Set the nextLink property: The nextLink property. + * + * @param nextLink the nextLink value to set. + * @return the ListResult3 object itself. + */ + public ListResult3 withNextLink(String nextLink) { + this.nextLink = nextLink; + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + public void validate() { + if (items() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Missing required property items in model ListResult3")); + } else { + items().forEach(e -> e.validate()); + } + } + + private static final ClientLogger LOGGER = new ClientLogger(ListResult3.class); + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeArrayField("items", this.items, (writer, element) -> writer.writeJson(element)); + jsonWriter.writeStringField("nextLink", this.nextLink); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ListResult3 from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ListResult3 if the JsonReader was pointing to an instance of it, or null if it was + * pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ListResult3. + */ + public static ListResult3 fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ListResult3 deserializedListResult3 = new ListResult3(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("items".equals(fieldName)) { + List items = reader.readArray(reader1 -> Result.fromJson(reader1)); + deserializedListResult3.items = items; + } else if ("nextLink".equals(fieldName)) { + deserializedListResult3.nextLink = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedListResult3; + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java new file mode 100644 index 00000000000..5bd683003ca --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java @@ -0,0 +1,41 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.armstreamstyleserialization.models; + +import java.util.List; +import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; + +/** + * An immutable client-side representation of ListResultSummary2. + */ +public interface ListResultSummary2 { + /** + * Gets the items property: The items property. + * + * @return the items value. + */ + List items(); + + /** + * Gets the nextLink property: The nextLink property. + * + * @return the nextLink value. + */ + String nextLink(); + + /** + * Gets the summary property: The summary property. + * + * @return the summary value. + */ + String summary(); + + /** + * Gets the inner tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner object. + * + * @return the inner object. + */ + ListResultSummary2Inner innerModel(); +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Result.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Result.java index 2b17d99ebc6..e9ce2cc43fe 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Result.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Result.java @@ -4,7 +4,7 @@ package tsptest.armstreamstyleserialization.models; -import com.azure.core.annotation.Immutable; +import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; import com.azure.json.JsonReader; import com.azure.json.JsonSerializable; @@ -16,7 +16,7 @@ /** * The Result model. */ -@Immutable +@Fluent public final class Result implements JsonSerializable { /* * The name property. @@ -31,7 +31,7 @@ public final class Result implements JsonSerializable { /** * Creates an instance of Result class. */ - private Result() { + public Result() { } /** @@ -43,6 +43,17 @@ public String name() { return this.name; } + /** + * Set the name property: The name property. + * + * @param name the name value to set. + * @return the Result object itself. + */ + public Result withName(String name) { + this.name = name; + return this; + } + /** * Get the innerData property: The data property. * diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armversioned/implementation/TopLevelArmResourcesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armversioned/implementation/TopLevelArmResourcesImpl.java index a0b31f30dba..f38b5662862 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armversioned/implementation/TopLevelArmResourcesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armversioned/implementation/TopLevelArmResourcesImpl.java @@ -66,24 +66,16 @@ public Response getByResourceGroupWithResponse(String resou Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, topLevelArmResourcePropertiesName, parameter, newParameter, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new TopLevelArmResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new TopLevelArmResourceImpl(inner.getValue(), this.manager())); } public Response getByResourceGroupWithResponse(String resourceGroupName, String topLevelArmResourcePropertiesName, String parameter, Context context) { Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, topLevelArmResourcePropertiesName, parameter, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new TopLevelArmResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new TopLevelArmResourceImpl(inner.getValue(), this.manager())); } public TopLevelArmResource getByResourceGroup(String resourceGroupName, String topLevelArmResourcePropertiesName) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesAsyncClient.java index e73463da429..615aa6128a5 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesAsyncClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesAsyncClient.java @@ -20,6 +20,7 @@ import tsptest.discriminatoredgecases.implementation.DiscriminatorEdgeCasesClientImpl; import tsptest.discriminatoredgecases.models.ChildWithAnotherDiscriminator; import tsptest.discriminatoredgecases.models.ChildWithRequiredPropertyAsDiscriminator; +import tsptest.discriminatoredgecases.models.ModelWithDiscriminatorNoSubtypes; /** * Initializes a new instance of the asynchronous DiscriminatorEdgeCasesClient type. @@ -94,6 +95,32 @@ public Mono> getChildNewDiscrimWithResponse(RequestOptions return this.serviceClient.getChildNewDiscrimWithResponseAsync(requestOptions); } + /** + * The getNoSubtypes operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     kind: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return model with along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getNoSubtypesWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getNoSubtypesWithResponseAsync(requestOptions); + } + /** * The getChildRequiredDiscrim operation. * @@ -131,4 +158,23 @@ public Mono getChildNewDiscrim() { return getChildNewDiscrimWithResponse(requestOptions).flatMap(FluxUtil::toMono) .map(protocolMethodData -> protocolMethodData.toObject(ChildWithAnotherDiscriminator.class)); } + + /** + * The getNoSubtypes operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return model with on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getNoSubtypes() { + // Generated convenience method for getNoSubtypesWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getNoSubtypesWithResponse(requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(ModelWithDiscriminatorNoSubtypes.class)); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesClient.java index 1ffb3e582e3..81006ef04e8 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesClient.java @@ -18,6 +18,7 @@ import tsptest.discriminatoredgecases.implementation.DiscriminatorEdgeCasesClientImpl; import tsptest.discriminatoredgecases.models.ChildWithAnotherDiscriminator; import tsptest.discriminatoredgecases.models.ChildWithRequiredPropertyAsDiscriminator; +import tsptest.discriminatoredgecases.models.ModelWithDiscriminatorNoSubtypes; /** * Initializes a new instance of the synchronous DiscriminatorEdgeCasesClient type. @@ -92,6 +93,32 @@ public Response getChildNewDiscrimWithResponse(RequestOptions reques return this.serviceClient.getChildNewDiscrimWithResponse(requestOptions); } + /** + * The getNoSubtypes operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     kind: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return model with along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getNoSubtypesWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getNoSubtypesWithResponse(requestOptions); + } + /** * The getChildRequiredDiscrim operation. * @@ -128,4 +155,22 @@ public ChildWithAnotherDiscriminator getChildNewDiscrim() { RequestOptions requestOptions = new RequestOptions(); return getChildNewDiscrimWithResponse(requestOptions).getValue().toObject(ChildWithAnotherDiscriminator.class); } + + /** + * The getNoSubtypes operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return model with. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithDiscriminatorNoSubtypes getNoSubtypes() { + // Generated convenience method for getNoSubtypesWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getNoSubtypesWithResponse(requestOptions).getValue().toObject(ModelWithDiscriminatorNoSubtypes.class); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/implementation/DiscriminatorEdgeCasesClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/implementation/DiscriminatorEdgeCasesClientImpl.java index 9ac447b8517..f76c06ec6ca 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/implementation/DiscriminatorEdgeCasesClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/implementation/DiscriminatorEdgeCasesClientImpl.java @@ -160,6 +160,24 @@ Mono> getChildNewDiscrim(@HostParam("endpoint") String endp @UnexpectedResponseExceptionType(HttpResponseException.class) Response getChildNewDiscrimSync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/model/nosubtypes") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> getNoSubtypes(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/model/nosubtypes") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getNoSubtypesSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); } /** @@ -273,4 +291,57 @@ public Response getChildNewDiscrimWithResponse(RequestOptions reques final String accept = "application/json"; return service.getChildNewDiscrimSync(this.getEndpoint(), accept, requestOptions, Context.NONE); } + + /** + * The getNoSubtypes operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     kind: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return model with along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getNoSubtypesWithResponseAsync(RequestOptions requestOptions) { + final String accept = "application/json"; + return FluxUtil + .withContext(context -> service.getNoSubtypes(this.getEndpoint(), accept, requestOptions, context)); + } + + /** + * The getNoSubtypes operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     kind: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return model with along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getNoSubtypesWithResponse(RequestOptions requestOptions) { + final String accept = "application/json"; + return service.getNoSubtypesSync(this.getEndpoint(), accept, requestOptions, Context.NONE); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/models/ModelWithDiscriminatorNoSubtypes.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/models/ModelWithDiscriminatorNoSubtypes.java new file mode 100644 index 00000000000..59c1737d62e --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/models/ModelWithDiscriminatorNoSubtypes.java @@ -0,0 +1,107 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.discriminatoredgecases.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * Model with. + */ +@Immutable +public final class ModelWithDiscriminatorNoSubtypes implements JsonSerializable { + /* + * The kind property. + */ + @Generated + private String kind = "ModelWithDiscriminatorNoSubtypes"; + + /* + * The name property. + */ + @Generated + private final String name; + + /** + * Creates an instance of ModelWithDiscriminatorNoSubtypes class. + * + * @param name the name value to set. + */ + @Generated + private ModelWithDiscriminatorNoSubtypes(String name) { + this.name = name; + } + + /** + * Get the kind property: The kind property. + * + * @return the kind value. + */ + @Generated + public String getKind() { + return this.kind; + } + + /** + * Get the name property: The name property. + * + * @return the name value. + */ + @Generated + public String getName() { + return this.name; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("name", this.name); + jsonWriter.writeStringField("kind", this.kind); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ModelWithDiscriminatorNoSubtypes from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ModelWithDiscriminatorNoSubtypes if the JsonReader was pointing to an instance of it, or + * null if it was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ModelWithDiscriminatorNoSubtypes. + */ + @Generated + public static ModelWithDiscriminatorNoSubtypes fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + String name = null; + String kind = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("name".equals(fieldName)) { + name = reader.getString(); + } else if ("kind".equals(fieldName)) { + kind = reader.getString(); + } else { + reader.skipChildren(); + } + } + ModelWithDiscriminatorNoSubtypes deserializedModelWithDiscriminatorNoSubtypes + = new ModelWithDiscriminatorNoSubtypes(name); + deserializedModelWithDiscriminatorNoSubtypes.kind = kind; + + return deserializedModelWithDiscriminatorNoSubtypes; + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java index 5eb297d5fdc..28fd5ff589d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java @@ -474,6 +474,38 @@ public Mono> setStringEnumArrayHeaderWithResponse(List co return this.serviceClient.setStringEnumArrayHeaderWithResponseAsync(colorArray, requestOptions); } + /** + * The getWrongBody operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * String
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * String
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return simple string along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getWrongBodyWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.getWrongBodyWithResponseAsync(body, requestOptions); + } + /** * The getColor operation. * @@ -1042,4 +1074,25 @@ public Mono setStringEnumArrayHeader(List colorArray) { .map(paramItemValue -> Objects.toString(paramItemValue, "")) .collect(Collectors.toList()), requestOptions).flatMap(FluxUtil::toMono); } + + /** + * The getWrongBody operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return simple string on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getWrongBody(String body) { + // Generated convenience method for getWrongBodyWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getWrongBodyWithResponse(BinaryData.fromString(body), requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toString()); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceClient.java index 802a27c8802..05e4be7cc26 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceClient.java @@ -470,6 +470,38 @@ public Response setStringEnumArrayHeaderWithResponse(List colorArr return this.serviceClient.setStringEnumArrayHeaderWithResponse(colorArray, requestOptions); } + /** + * The getWrongBody operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * String
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * String
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return simple string along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWrongBodyWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.getWrongBodyWithResponse(body, requestOptions); + } + /** * The getColor operation. * @@ -1015,4 +1047,24 @@ public void setStringEnumArrayHeader(List colorArray) { .map(paramItemValue -> Objects.toString(paramItemValue, "")) .collect(Collectors.toList()), requestOptions).getValue(); } + + /** + * The getWrongBody operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return simple string. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public String getWrongBody(String body) { + // Generated convenience method for getWrongBodyWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getWrongBodyWithResponse(BinaryData.fromString(body), requestOptions).getValue().toString(); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/implementation/EnumServiceClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/implementation/EnumServiceClientImpl.java index fce35a37c7a..14c8d1c04e1 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/implementation/EnumServiceClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/implementation/EnumServiceClientImpl.java @@ -4,6 +4,7 @@ package tsptest.enumservice.implementation; +import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Get; import com.azure.core.annotation.HeaderParam; @@ -415,6 +416,26 @@ Mono> setStringEnumArrayHeader(@HostParam("endpoint") String endp @UnexpectedResponseExceptionType(HttpResponseException.class) Response setStringEnumArrayHeaderSync(@HostParam("endpoint") String endpoint, @HeaderParam("color-array") String colorArray, RequestOptions requestOptions, Context context); + + @Post("/enum/operation/wrong-body") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> getWrongBody(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("text/plain") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/enum/operation/wrong-body") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getWrongBodySync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("text/plain") BinaryData body, RequestOptions requestOptions, Context context); } /** @@ -1317,4 +1338,71 @@ public Response setStringEnumArrayHeaderWithResponse(List colorArr return service.setStringEnumArrayHeaderSync(this.getEndpoint(), colorArrayConverted, requestOptions, Context.NONE); } + + /** + * The getWrongBody operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * String
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * String
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return simple string along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getWrongBodyWithResponseAsync(BinaryData body, RequestOptions requestOptions) { + final String contentType = "text/plain"; + final String accept = "text/plain"; + return FluxUtil.withContext( + context -> service.getWrongBody(this.getEndpoint(), contentType, accept, body, requestOptions, context)); + } + + /** + * The getWrongBody operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * String
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * String
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return simple string along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWrongBodyWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "text/plain"; + final String accept = "text/plain"; + return service.getWrongBodySync(this.getEndpoint(), contentType, accept, body, requestOptions, Context.NONE); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/ExternalAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/ExternalAsyncClient.java new file mode 100644 index 00000000000..cdc91d4602e --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/ExternalAsyncClient.java @@ -0,0 +1,99 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.external; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; +import tsptest.external.implementation.ExternalOpsImpl; +import tsptest.external.models.Body; + +/** + * Initializes a new instance of the asynchronous ExternalClient type. + */ +@ServiceClient(builder = ExternalClientBuilder.class, isAsync = true) +public final class ExternalAsyncClient { + @Generated + private final ExternalOpsImpl serviceClient; + + /** + * Initializes an instance of ExternalAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + ExternalAsyncClient(ExternalOpsImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The postExternal operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     cloudEventDataFormat: String(BYTES/JSON) (Optional)
+     *     dayOfWeek: String(Sunday/Monday/Tuesday/Wednesday/Thursday/Friday/Saturday) (Optional)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     cloudEventDataFormat: String(BYTES/JSON) (Optional)
+     *     dayOfWeek: String(Sunday/Monday/Tuesday/Wednesday/Thursday/Friday/Saturday) (Optional)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> postExternalWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.postExternalWithResponseAsync(body, requestOptions); + } + + /** + * The postExternal operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono postExternal(Body body) { + // Generated convenience method for postExternalWithResponse + RequestOptions requestOptions = new RequestOptions(); + return postExternalWithResponse(BinaryData.fromObject(body), requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(Body.class)); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/ExternalClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/ExternalClient.java new file mode 100644 index 00000000000..0cec3803c0d --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/ExternalClient.java @@ -0,0 +1,96 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.external; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; +import tsptest.external.implementation.ExternalOpsImpl; +import tsptest.external.models.Body; + +/** + * Initializes a new instance of the synchronous ExternalClient type. + */ +@ServiceClient(builder = ExternalClientBuilder.class) +public final class ExternalClient { + @Generated + private final ExternalOpsImpl serviceClient; + + /** + * Initializes an instance of ExternalClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + ExternalClient(ExternalOpsImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The postExternal operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     cloudEventDataFormat: String(BYTES/JSON) (Optional)
+     *     dayOfWeek: String(Sunday/Monday/Tuesday/Wednesday/Thursday/Friday/Saturday) (Optional)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     cloudEventDataFormat: String(BYTES/JSON) (Optional)
+     *     dayOfWeek: String(Sunday/Monday/Tuesday/Wednesday/Thursday/Friday/Saturday) (Optional)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response postExternalWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.postExternalWithResponse(body, requestOptions); + } + + /** + * The postExternal operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Body postExternal(Body body) { + // Generated convenience method for postExternalWithResponse + RequestOptions requestOptions = new RequestOptions(); + return postExternalWithResponse(BinaryData.fromObject(body), requestOptions).getValue().toObject(Body.class); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/ExternalClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/ExternalClientBuilder.java new file mode 100644 index 00000000000..fe92dde86fa --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/ExternalClientBuilder.java @@ -0,0 +1,287 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.external; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ServiceClientBuilder; +import com.azure.core.client.traits.ConfigurationTrait; +import com.azure.core.client.traits.EndpointTrait; +import com.azure.core.client.traits.HttpTrait; +import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.HttpPipelinePosition; +import com.azure.core.http.policy.AddDatePolicy; +import com.azure.core.http.policy.AddHeadersFromContextPolicy; +import com.azure.core.http.policy.AddHeadersPolicy; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.http.policy.HttpLoggingPolicy; +import com.azure.core.http.policy.HttpPipelinePolicy; +import com.azure.core.http.policy.HttpPolicyProviders; +import com.azure.core.http.policy.RequestIdPolicy; +import com.azure.core.http.policy.RetryOptions; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.ClientOptions; +import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.builder.ClientBuilderUtil; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.serializer.JacksonAdapter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import tsptest.external.implementation.ExternalClientImpl; + +/** + * A builder for creating a new instance of the ExternalClient type. + */ +@ServiceClientBuilder(serviceClients = { ExternalClient.class, ExternalAsyncClient.class }) +public final class ExternalClientBuilder implements HttpTrait, + ConfigurationTrait, EndpointTrait { + @Generated + private static final String SDK_NAME = "name"; + + @Generated + private static final String SDK_VERSION = "version"; + + @Generated + private static final Map PROPERTIES = CoreUtils.getProperties("tsptest-external.properties"); + + @Generated + private final List pipelinePolicies; + + /** + * Create an instance of the ExternalClientBuilder. + */ + @Generated + public ExternalClientBuilder() { + this.pipelinePolicies = new ArrayList<>(); + } + + /* + * The HTTP client used to send the request. + */ + @Generated + private HttpClient httpClient; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public ExternalClientBuilder httpClient(HttpClient httpClient) { + this.httpClient = httpClient; + return this; + } + + /* + * The HTTP pipeline to send requests through. + */ + @Generated + private HttpPipeline pipeline; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public ExternalClientBuilder pipeline(HttpPipeline pipeline) { + if (this.pipeline != null && pipeline == null) { + LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured."); + } + this.pipeline = pipeline; + return this; + } + + /* + * The logging configuration for HTTP requests and responses. + */ + @Generated + private HttpLogOptions httpLogOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public ExternalClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) { + this.httpLogOptions = httpLogOptions; + return this; + } + + /* + * The client options such as application ID and custom headers to set on a request. + */ + @Generated + private ClientOptions clientOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public ExternalClientBuilder clientOptions(ClientOptions clientOptions) { + this.clientOptions = clientOptions; + return this; + } + + /* + * The retry options to configure retry policy for failed requests. + */ + @Generated + private RetryOptions retryOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public ExternalClientBuilder retryOptions(RetryOptions retryOptions) { + this.retryOptions = retryOptions; + return this; + } + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public ExternalClientBuilder addPolicy(HttpPipelinePolicy customPolicy) { + Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); + pipelinePolicies.add(customPolicy); + return this; + } + + /* + * The configuration store that is used during construction of the service client. + */ + @Generated + private Configuration configuration; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public ExternalClientBuilder configuration(Configuration configuration) { + this.configuration = configuration; + return this; + } + + /* + * The service endpoint + */ + @Generated + private String endpoint; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public ExternalClientBuilder endpoint(String endpoint) { + this.endpoint = endpoint; + return this; + } + + /* + * The retry policy that will attempt to retry failed requests, if applicable. + */ + @Generated + private RetryPolicy retryPolicy; + + /** + * Sets The retry policy that will attempt to retry failed requests, if applicable. + * + * @param retryPolicy the retryPolicy value. + * @return the ExternalClientBuilder. + */ + @Generated + public ExternalClientBuilder retryPolicy(RetryPolicy retryPolicy) { + this.retryPolicy = retryPolicy; + return this; + } + + /** + * Builds an instance of ExternalClientImpl with the provided parameters. + * + * @return an instance of ExternalClientImpl. + */ + @Generated + private ExternalClientImpl buildInnerClient() { + this.validateClient(); + HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline(); + ExternalClientImpl client + = new ExternalClientImpl(localPipeline, JacksonAdapter.createDefaultSerializerAdapter(), this.endpoint); + return client; + } + + @Generated + private void validateClient() { + // This method is invoked from 'buildInnerClient'/'buildClient' method. + // Developer can customize this method, to validate that the necessary conditions are met for the new client. + Objects.requireNonNull(endpoint, "'endpoint' cannot be null."); + } + + @Generated + private HttpPipeline createHttpPipeline() { + Configuration buildConfiguration + = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; + HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions; + ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions; + List policies = new ArrayList<>(); + String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName"); + String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); + String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions); + policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); + policies.add(new RequestIdPolicy()); + policies.add(new AddHeadersFromContextPolicy()); + HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions); + if (headers != null) { + policies.add(new AddHeadersPolicy(headers)); + } + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addBeforeRetryPolicies(policies); + policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy())); + policies.add(new AddDatePolicy()); + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addAfterRetryPolicies(policies); + policies.add(new HttpLoggingPolicy(localHttpLogOptions)); + HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])) + .httpClient(httpClient) + .clientOptions(localClientOptions) + .build(); + return httpPipeline; + } + + /** + * Builds an instance of ExternalAsyncClient class. + * + * @return an instance of ExternalAsyncClient. + */ + @Generated + public ExternalAsyncClient buildAsyncClient() { + return new ExternalAsyncClient(buildInnerClient().getExternalOps()); + } + + /** + * Builds an instance of ExternalClient class. + * + * @return an instance of ExternalClient. + */ + @Generated + public ExternalClient buildClient() { + return new ExternalClient(buildInnerClient().getExternalOps()); + } + + private static final ClientLogger LOGGER = new ClientLogger(ExternalClientBuilder.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/implementation/ExternalClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/implementation/ExternalClientImpl.java new file mode 100644 index 00000000000..105dea948e4 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/implementation/ExternalClientImpl.java @@ -0,0 +1,107 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.external.implementation; + +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.serializer.JacksonAdapter; +import com.azure.core.util.serializer.SerializerAdapter; + +/** + * Initializes a new instance of the ExternalClient type. + */ +public final class ExternalClientImpl { + /** + * Service host. + */ + private final String endpoint; + + /** + * Gets Service host. + * + * @return the endpoint value. + */ + public String getEndpoint() { + return this.endpoint; + } + + /** + * The HTTP pipeline to send requests through. + */ + private final HttpPipeline httpPipeline; + + /** + * Gets The HTTP pipeline to send requests through. + * + * @return the httpPipeline value. + */ + public HttpPipeline getHttpPipeline() { + return this.httpPipeline; + } + + /** + * The serializer to serialize an object into a string. + */ + private final SerializerAdapter serializerAdapter; + + /** + * Gets The serializer to serialize an object into a string. + * + * @return the serializerAdapter value. + */ + public SerializerAdapter getSerializerAdapter() { + return this.serializerAdapter; + } + + /** + * The ExternalOpsImpl object to access its operations. + */ + private final ExternalOpsImpl externalOps; + + /** + * Gets the ExternalOpsImpl object to access its operations. + * + * @return the ExternalOpsImpl object. + */ + public ExternalOpsImpl getExternalOps() { + return this.externalOps; + } + + /** + * Initializes an instance of ExternalClient client. + * + * @param endpoint Service host. + */ + public ExternalClientImpl(String endpoint) { + this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), + JacksonAdapter.createDefaultSerializerAdapter(), endpoint); + } + + /** + * Initializes an instance of ExternalClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param endpoint Service host. + */ + public ExternalClientImpl(HttpPipeline httpPipeline, String endpoint) { + this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint); + } + + /** + * Initializes an instance of ExternalClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param serializerAdapter The serializer to serialize an object into a string. + * @param endpoint Service host. + */ + public ExternalClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint) { + this.httpPipeline = httpPipeline; + this.serializerAdapter = serializerAdapter; + this.endpoint = endpoint; + this.externalOps = new ExternalOpsImpl(this); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/implementation/ExternalOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/implementation/ExternalOpsImpl.java new file mode 100644 index 00000000000..ecb9a4c1626 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/implementation/ExternalOpsImpl.java @@ -0,0 +1,161 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.external.implementation; + +import com.azure.core.annotation.BodyParam; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.Post; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.BinaryData; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * An instance of this class provides access to all the operations defined in ExternalOps. + */ +public final class ExternalOpsImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ExternalOpsService service; + + /** + * The service client containing this operation class. + */ + private final ExternalClientImpl client; + + /** + * Initializes an instance of ExternalOpsImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ExternalOpsImpl(ExternalClientImpl client) { + this.service + = RestProxy.create(ExternalOpsService.class, client.getHttpPipeline(), client.getSerializerAdapter()); + this.client = client; + } + + /** + * The interface defining all the services for ExternalClientExternalOps to be used by the proxy service to perform + * REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "ExternalClientExternalOps") + public interface ExternalOpsService { + @Post("/external") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> postExternal(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/external") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response postExternalSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + } + + /** + * The postExternal operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     cloudEventDataFormat: String(BYTES/JSON) (Optional)
+     *     dayOfWeek: String(Sunday/Monday/Tuesday/Wednesday/Thursday/Friday/Saturday) (Optional)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     cloudEventDataFormat: String(BYTES/JSON) (Optional)
+     *     dayOfWeek: String(Sunday/Monday/Tuesday/Wednesday/Thursday/Friday/Saturday) (Optional)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> postExternalWithResponseAsync(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.postExternal(this.client.getEndpoint(), contentType, accept, + body, requestOptions, context)); + } + + /** + * The postExternal operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     cloudEventDataFormat: String(BYTES/JSON) (Optional)
+     *     dayOfWeek: String(Sunday/Monday/Tuesday/Wednesday/Thursday/Friday/Saturday) (Optional)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     cloudEventDataFormat: String(BYTES/JSON) (Optional)
+     *     dayOfWeek: String(Sunday/Monday/Tuesday/Wednesday/Thursday/Friday/Saturday) (Optional)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response postExternalWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.postExternalSync(this.client.getEndpoint(), contentType, accept, body, requestOptions, + Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/implementation/package-info.java new file mode 100644 index 00000000000..a481dfb289f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/implementation/package-info.java @@ -0,0 +1,10 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the implementations for External. + * + */ +package tsptest.external.implementation; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/models/Body.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/models/Body.java new file mode 100644 index 00000000000..a1a2817f489 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/models/Body.java @@ -0,0 +1,126 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.external.models; + +import com.azure.core.annotation.Fluent; +import com.azure.core.annotation.Generated; +import com.azure.core.models.CloudEventDataFormat; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.time.DayOfWeek; + +/** + * The Body model. + */ +@Fluent +public final class Body implements JsonSerializable { + /* + * The cloudEventDataFormat property. + */ + @Generated + private CloudEventDataFormat cloudEventDataFormat; + + /* + * The dayOfWeek property. + */ + @Generated + private DayOfWeek dayOfWeek; + + /** + * Creates an instance of Body class. + */ + @Generated + public Body() { + } + + /** + * Get the cloudEventDataFormat property: The cloudEventDataFormat property. + * + * @return the cloudEventDataFormat value. + */ + @Generated + public CloudEventDataFormat getCloudEventDataFormat() { + return this.cloudEventDataFormat; + } + + /** + * Set the cloudEventDataFormat property: The cloudEventDataFormat property. + * + * @param cloudEventDataFormat the cloudEventDataFormat value to set. + * @return the Body object itself. + */ + @Generated + public Body setCloudEventDataFormat(CloudEventDataFormat cloudEventDataFormat) { + this.cloudEventDataFormat = cloudEventDataFormat; + return this; + } + + /** + * Get the dayOfWeek property: The dayOfWeek property. + * + * @return the dayOfWeek value. + */ + @Generated + public DayOfWeek getDayOfWeek() { + return this.dayOfWeek; + } + + /** + * Set the dayOfWeek property: The dayOfWeek property. + * + * @param dayOfWeek the dayOfWeek value to set. + * @return the Body object itself. + */ + @Generated + public Body setDayOfWeek(DayOfWeek dayOfWeek) { + this.dayOfWeek = dayOfWeek; + return this; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("cloudEventDataFormat", + this.cloudEventDataFormat == null ? null : this.cloudEventDataFormat.toString()); + jsonWriter.writeStringField("dayOfWeek", this.dayOfWeek == null ? null : this.dayOfWeek.name()); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of Body from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of Body if the JsonReader was pointing to an instance of it, or null if it was pointing to + * JSON null. + * @throws IOException If an error occurs while reading the Body. + */ + @Generated + public static Body fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + Body deserializedBody = new Body(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("cloudEventDataFormat".equals(fieldName)) { + deserializedBody.cloudEventDataFormat = CloudEventDataFormat.fromString(reader.getString()); + } else if ("dayOfWeek".equals(fieldName)) { + deserializedBody.dayOfWeek = DayOfWeek.valueOf(reader.getString()); + } else { + reader.skipChildren(); + } + } + + return deserializedBody; + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/models/package-info.java new file mode 100644 index 00000000000..7ddef4c0049 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/models/package-info.java @@ -0,0 +1,10 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the data models for External. + * + */ +package tsptest.external.models; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/package-info.java new file mode 100644 index 00000000000..bb5610e64c2 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/package-info.java @@ -0,0 +1,10 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the classes for External. + * + */ +package tsptest.external; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipart/models/FileData2FileDetails.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipart/models/FileData2FileDetails.java new file mode 100644 index 00000000000..44b6882fe13 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipart/models/FileData2FileDetails.java @@ -0,0 +1,137 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.multipart.models; + +import com.azure.core.annotation.Fluent; +import com.azure.core.annotation.Generated; +import com.azure.core.util.BinaryData; + +/** + * A file in an HTTP request, response, or multipart payload. + * + * A file in an HTTP request, response, or multipart payload. + * + * Files have a special meaning that the HTTP library understands. When the body of an HTTP request, response, + * or multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the + * operation is treated as a file upload or download. + * + * When using file bodies, the fields of the file model are defined to come from particular locations by default: + * + * - `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or + * changed). + * - `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed). + * - `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload + * (MAY be overridden or changed). + * + * A File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit + * `Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON + * payload, + * it will have a structure like: + * + * ``` + * { + * "contentType": <string?>, + * "filename": <string?>, + * "contents": <string, base64> + * } + * ``` + * + * The `contentType` _within_ the file defines what media types the data inside the file can be, but if the + * specification + * defines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is + * serialized_. See the examples below for more information. + * + * NOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename` + * (`Content-Disposition: <disposition>; filename=<filename>`) is only valid in HTTP responses and multipart + * payloads. If + * you wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the + * `filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` + * location + * is overridden, as shown in the examples below. + */ +@Fluent +public final class FileData2FileDetails { + /* + * The content of the file. + */ + @Generated + private final BinaryData content; + + /* + * The filename of the file. + */ + @Generated + private String filename; + + /* + * The content-type of the file. + */ + @Generated + private String contentType = "application/octet-stream"; + + /** + * Creates an instance of FileData2FileDetails class. + * + * @param content the content value to set. + */ + @Generated + public FileData2FileDetails(BinaryData content) { + this.content = content; + } + + /** + * Get the content property: The content of the file. + * + * @return the content value. + */ + @Generated + public BinaryData getContent() { + return this.content; + } + + /** + * Get the filename property: The filename of the file. + * + * @return the filename value. + */ + @Generated + public String getFilename() { + return this.filename; + } + + /** + * Set the filename property: The filename of the file. + * + * @param filename the filename value to set. + * @return the FileData2FileDetails object itself. + */ + @Generated + public FileData2FileDetails setFilename(String filename) { + this.filename = filename; + return this; + } + + /** + * Get the contentType property: The content-type of the file. + * + * @return the contentType value. + */ + @Generated + public String getContentType() { + return this.contentType; + } + + /** + * Set the contentType property: The content-type of the file. + * + * @param contentType the contentType value to set. + * @return the FileData2FileDetails object itself. + */ + @Generated + public FileData2FileDetails setContentType(String contentType) { + this.contentType = contentType; + return this; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipart/models/FileDetails.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipart/models/FileDetails.java deleted file mode 100644 index 63e0e2933b5..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipart/models/FileDetails.java +++ /dev/null @@ -1,137 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package tsptest.multipart.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.annotation.Generated; -import com.azure.core.util.BinaryData; - -/** - * A file in an HTTP request, response, or multipart payload. - * - * A file in an HTTP request, response, or multipart payload. - * - * Files have a special meaning that the HTTP library understands. When the body of an HTTP request, response, - * or multipart payload is _effectively_ an instance of `TypeSpec.Http.File` or any type that extends it, the - * operation is treated as a file upload or download. - * - * When using file bodies, the fields of the file model are defined to come from particular locations by default: - * - * - `contentType`: The `Content-Type` header of the request, response, or multipart payload (CANNOT be overridden or - * changed). - * - `contents`: The body of the request, response, or multipart payload (CANNOT be overridden or changed). - * - `filename`: The `filename` parameter value of the `Content-Disposition` header of the response or multipart payload - * (MAY be overridden or changed). - * - * A File may be used as a normal structured JSON object in a request or response, if the request specifies an explicit - * `Content-Type` header. In this case, the entire File model is serialized as if it were any other model. In a JSON - * payload, - * it will have a structure like: - * - * ``` - * { - * "contentType": <string?>, - * "filename": <string?>, - * "contents": <string, base64> - * } - * ``` - * - * The `contentType` _within_ the file defines what media types the data inside the file can be, but if the - * specification - * defines a `Content-Type` for the payload as HTTP metadata, that `Content-Type` metadata defines _how the file is - * serialized_. See the examples below for more information. - * - * NOTE: The `filename` and `contentType` fields are optional. Furthermore, the default location of `filename` - * (`Content-Disposition: <disposition>; filename=<filename>`) is only valid in HTTP responses and multipart - * payloads. If - * you wish to send the `filename` in a request, you must use HTTP metadata decorators to describe the location of the - * `filename` field. You can combine the metadata decorators with `@visibility` to control when the `filename` - * location - * is overridden, as shown in the examples below. - */ -@Fluent -public final class FileDetails { - /* - * The content of the file. - */ - @Generated - private final BinaryData content; - - /* - * The filename of the file. - */ - @Generated - private String filename; - - /* - * The content-type of the file. - */ - @Generated - private String contentType = "application/octet-stream"; - - /** - * Creates an instance of FileDetails class. - * - * @param content the content value to set. - */ - @Generated - public FileDetails(BinaryData content) { - this.content = content; - } - - /** - * Get the content property: The content of the file. - * - * @return the content value. - */ - @Generated - public BinaryData getContent() { - return this.content; - } - - /** - * Get the filename property: The filename of the file. - * - * @return the filename value. - */ - @Generated - public String getFilename() { - return this.filename; - } - - /** - * Set the filename property: The filename of the file. - * - * @param filename the filename value to set. - * @return the FileDetails object itself. - */ - @Generated - public FileDetails setFilename(String filename) { - this.filename = filename; - return this; - } - - /** - * Get the contentType property: The content-type of the file. - * - * @return the contentType value. - */ - @Generated - public String getContentType() { - return this.contentType; - } - - /** - * Set the contentType property: The content-type of the file. - * - * @param contentType the contentType value to set. - * @return the FileDetails object itself. - */ - @Generated - public FileDetails setContentType(String contentType) { - this.contentType = contentType; - return this; - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipart/models/UploadHttpPartRequest.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipart/models/UploadHttpPartRequest.java index 69f7bcdee36..1ded3050a85 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipart/models/UploadHttpPartRequest.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipart/models/UploadHttpPartRequest.java @@ -22,7 +22,7 @@ public final class UploadHttpPartRequest { * The file_data2 property. */ @Generated - private final FileDetails fileData2; + private final FileData2FileDetails fileData2; /* * The size property. @@ -38,7 +38,7 @@ public final class UploadHttpPartRequest { * @param size the size value to set. */ @Generated - public UploadHttpPartRequest(InheritFileData fileData1, FileDetails fileData2, Size size) { + public UploadHttpPartRequest(InheritFileData fileData1, FileData2FileDetails fileData2, Size size) { this.fileData1 = fileData1; this.fileData2 = fileData2; this.size = size; @@ -60,7 +60,7 @@ public InheritFileData getFileData1() { * @return the fileData2 value. */ @Generated - public FileDetails getFileData2() { + public FileData2FileDetails getFileData2() { return this.fileData2; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/ResponseAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/ResponseAsyncClient.java index bb5f84c9ca6..7f4328aa4e7 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/ResponseAsyncClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/ResponseAsyncClient.java @@ -26,6 +26,7 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import tsptest.response.implementation.ResponseClientImpl; +import tsptest.response.models.GetUnionResponseContentType; import tsptest.response.models.OperationDetails1; import tsptest.response.models.OperationDetails2; import tsptest.response.models.Resource; @@ -368,7 +369,7 @@ public Mono> getPlusJsonResponseWithResponse(RequestOptions * } * * - * @param accept The accept parameter. + * @param accept The accept parameter. Allowed values: "application/json", "application/json". * @param requestOptions The options to configure the HTTP request before HTTP client sends it. * @throws HttpResponseException thrown if the request is rejected by server. * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. @@ -806,10 +807,10 @@ public Mono getPlusJsonResponse() { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono getUnionResponse(String accept) { + public Mono getUnionResponse(GetUnionResponseContentType accept) { // Generated convenience method for getUnionResponseWithResponse RequestOptions requestOptions = new RequestOptions(); - return getUnionResponseWithResponse(accept, requestOptions).flatMap(FluxUtil::toMono); + return getUnionResponseWithResponse(accept.toString(), requestOptions).flatMap(FluxUtil::toMono); } /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/ResponseClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/ResponseClient.java index d6cfa44063c..3acf0e9a678 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/ResponseClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/ResponseClient.java @@ -20,6 +20,7 @@ import com.azure.core.util.serializer.TypeReference; import java.util.List; import tsptest.response.implementation.ResponseClientImpl; +import tsptest.response.models.GetUnionResponseContentType; import tsptest.response.models.OperationDetails1; import tsptest.response.models.OperationDetails2; import tsptest.response.models.Resource; @@ -362,7 +363,7 @@ public Response getPlusJsonResponseWithResponse(RequestOptions reque * } * * - * @param accept The accept parameter. + * @param accept The accept parameter. Allowed values: "application/json", "application/json". * @param requestOptions The options to configure the HTTP request before HTTP client sends it. * @throws HttpResponseException thrown if the request is rejected by server. * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. @@ -770,10 +771,10 @@ public Resource getPlusJsonResponse() { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public BinaryData getUnionResponse(String accept) { + public BinaryData getUnionResponse(GetUnionResponseContentType accept) { // Generated convenience method for getUnionResponseWithResponse RequestOptions requestOptions = new RequestOptions(); - return getUnionResponseWithResponse(accept, requestOptions).getValue(); + return getUnionResponseWithResponse(accept.toString(), requestOptions).getValue(); } /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/implementation/ResponseClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/implementation/ResponseClientImpl.java index 6b93dafe6cf..0cbf712deb2 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/implementation/ResponseClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/implementation/ResponseClientImpl.java @@ -1598,7 +1598,7 @@ public Response getPlusJsonResponseWithResponse(RequestOptions reque * } * * - * @param accept The accept parameter. + * @param accept The accept parameter. Allowed values: "application/json", "application/json". * @param requestOptions The options to configure the HTTP request before HTTP client sends it. * @throws HttpResponseException thrown if the request is rejected by server. * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. @@ -1622,7 +1622,7 @@ public Mono> getUnionResponseWithResponseAsync(String accep * } * * - * @param accept The accept parameter. + * @param accept The accept parameter. Allowed values: "application/json", "application/json". * @param requestOptions The options to configure the HTTP request before HTTP client sends it. * @throws HttpResponseException thrown if the request is rejected by server. * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/models/GetUnionResponseContentType.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/models/GetUnionResponseContentType.java new file mode 100644 index 00000000000..10072a3d711 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/models/GetUnionResponseContentType.java @@ -0,0 +1,56 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.response.models; + +/** + * Defines values for GetUnionResponseContentType. + */ +public enum GetUnionResponseContentType { + /** + * Enum value application/json. + */ + APPLICATION_JSON("application/json"), + + /** + * Enum value application/json. + */ + APPLICATION_JSON_1("application/json"); + + /** + * The actual serialized value for a GetUnionResponseContentType instance. + */ + private final String value; + + GetUnionResponseContentType(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a GetUnionResponseContentType instance. + * + * @param value the serialized value to parse. + * @return the parsed GetUnionResponseContentType object, or null if unable to parse. + */ + public static GetUnionResponseContentType fromString(String value) { + if (value == null) { + return null; + } + GetUnionResponseContentType[] items = GetUnionResponseContentType.values(); + for (GetUnionResponseContentType item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.value; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityAsyncClient.java deleted file mode 100644 index 807f5320a48..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityAsyncClient.java +++ /dev/null @@ -1,267 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package tsptest.visibility; - -import com.azure.core.annotation.Generated; -import com.azure.core.annotation.ReturnType; -import com.azure.core.annotation.ServiceClient; -import com.azure.core.annotation.ServiceMethod; -import com.azure.core.exception.ClientAuthenticationException; -import com.azure.core.exception.HttpResponseException; -import com.azure.core.exception.ResourceModifiedException; -import com.azure.core.exception.ResourceNotFoundException; -import com.azure.core.http.rest.RequestOptions; -import com.azure.core.http.rest.Response; -import com.azure.core.util.BinaryData; -import com.azure.core.util.FluxUtil; -import reactor.core.publisher.Mono; -import tsptest.visibility.implementation.VisibilityClientImpl; -import tsptest.visibility.models.Dog; -import tsptest.visibility.models.ReadDog; -import tsptest.visibility.models.RoundTripModel; -import tsptest.visibility.models.WriteDog; - -/** - * Initializes a new instance of the asynchronous VisibilityClient type. - */ -@ServiceClient(builder = VisibilityClientBuilder.class, isAsync = true) -public final class VisibilityAsyncClient { - @Generated - private final VisibilityClientImpl serviceClient; - - /** - * Initializes an instance of VisibilityAsyncClient class. - * - * @param serviceClient the service client implementation. - */ - @Generated - VisibilityAsyncClient(VisibilityClientImpl serviceClient) { - this.serviceClient = serviceClient; - } - - /** - * The get operation. - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response} on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponse(RequestOptions requestOptions) { - return this.serviceClient.getWithResponseAsync(requestOptions); - } - - /** - * The create operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - * @param dog The dog parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response} on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createWithResponse(BinaryData dog, RequestOptions requestOptions) { - return this.serviceClient.createWithResponseAsync(dog, requestOptions); - } - - /** - * The query operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - * @param dog The dog parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response} on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> queryWithResponse(BinaryData dog, RequestOptions requestOptions) { - return this.serviceClient.queryWithResponseAsync(dog, requestOptions); - } - - /** - * The roundtrip operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     secretName: String (Required)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     secretName: String (Required)
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response} on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> roundtripWithResponse(BinaryData body, RequestOptions requestOptions) { - return this.serviceClient.roundtripWithResponseAsync(body, requestOptions); - } - - /** - * The get operation. - * - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono get() { - // Generated convenience method for getWithResponse - RequestOptions requestOptions = new RequestOptions(); - return getWithResponse(requestOptions).flatMap(FluxUtil::toMono) - .map(protocolMethodData -> protocolMethodData.toObject(Dog.class)); - } - - /** - * The create operation. - * - * @param dog The dog parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono create(WriteDog dog) { - // Generated convenience method for createWithResponse - RequestOptions requestOptions = new RequestOptions(); - return createWithResponse(BinaryData.fromObject(dog), requestOptions).flatMap(FluxUtil::toMono) - .map(protocolMethodData -> protocolMethodData.toObject(Dog.class)); - } - - /** - * The query operation. - * - * @param dog The dog parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono query(WriteDog dog) { - // Generated convenience method for queryWithResponse - RequestOptions requestOptions = new RequestOptions(); - return queryWithResponse(BinaryData.fromObject(dog), requestOptions).flatMap(FluxUtil::toMono) - .map(protocolMethodData -> protocolMethodData.toObject(ReadDog.class)); - } - - /** - * The roundtrip operation. - * - * @param body The body parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono roundtrip(RoundTripModel body) { - // Generated convenience method for roundtripWithResponse - RequestOptions requestOptions = new RequestOptions(); - return roundtripWithResponse(BinaryData.fromObject(body), requestOptions).flatMap(FluxUtil::toMono) - .map(protocolMethodData -> protocolMethodData.toObject(RoundTripModel.class)); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityClient.java deleted file mode 100644 index a79ed9bd963..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityClient.java +++ /dev/null @@ -1,262 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package tsptest.visibility; - -import com.azure.core.annotation.Generated; -import com.azure.core.annotation.ReturnType; -import com.azure.core.annotation.ServiceClient; -import com.azure.core.annotation.ServiceMethod; -import com.azure.core.exception.ClientAuthenticationException; -import com.azure.core.exception.HttpResponseException; -import com.azure.core.exception.ResourceModifiedException; -import com.azure.core.exception.ResourceNotFoundException; -import com.azure.core.http.rest.RequestOptions; -import com.azure.core.http.rest.Response; -import com.azure.core.util.BinaryData; -import tsptest.visibility.implementation.VisibilityClientImpl; -import tsptest.visibility.models.Dog; -import tsptest.visibility.models.ReadDog; -import tsptest.visibility.models.RoundTripModel; -import tsptest.visibility.models.WriteDog; - -/** - * Initializes a new instance of the synchronous VisibilityClient type. - */ -@ServiceClient(builder = VisibilityClientBuilder.class) -public final class VisibilityClient { - @Generated - private final VisibilityClientImpl serviceClient; - - /** - * Initializes an instance of VisibilityClient class. - * - * @param serviceClient the service client implementation. - */ - @Generated - VisibilityClient(VisibilityClientImpl serviceClient) { - this.serviceClient = serviceClient; - } - - /** - * The get operation. - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse(RequestOptions requestOptions) { - return this.serviceClient.getWithResponse(requestOptions); - } - - /** - * The create operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - * @param dog The dog parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Response createWithResponse(BinaryData dog, RequestOptions requestOptions) { - return this.serviceClient.createWithResponse(dog, requestOptions); - } - - /** - * The query operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - * @param dog The dog parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Response queryWithResponse(BinaryData dog, RequestOptions requestOptions) { - return this.serviceClient.queryWithResponse(dog, requestOptions); - } - - /** - * The roundtrip operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     secretName: String (Required)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     secretName: String (Required)
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Response roundtripWithResponse(BinaryData body, RequestOptions requestOptions) { - return this.serviceClient.roundtripWithResponse(body, requestOptions); - } - - /** - * The get operation. - * - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Dog get() { - // Generated convenience method for getWithResponse - RequestOptions requestOptions = new RequestOptions(); - return getWithResponse(requestOptions).getValue().toObject(Dog.class); - } - - /** - * The create operation. - * - * @param dog The dog parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Dog create(WriteDog dog) { - // Generated convenience method for createWithResponse - RequestOptions requestOptions = new RequestOptions(); - return createWithResponse(BinaryData.fromObject(dog), requestOptions).getValue().toObject(Dog.class); - } - - /** - * The query operation. - * - * @param dog The dog parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public ReadDog query(WriteDog dog) { - // Generated convenience method for queryWithResponse - RequestOptions requestOptions = new RequestOptions(); - return queryWithResponse(BinaryData.fromObject(dog), requestOptions).getValue().toObject(ReadDog.class); - } - - /** - * The roundtrip operation. - * - * @param body The body parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public RoundTripModel roundtrip(RoundTripModel body) { - // Generated convenience method for roundtripWithResponse - RequestOptions requestOptions = new RequestOptions(); - return roundtripWithResponse(BinaryData.fromObject(body), requestOptions).getValue() - .toObject(RoundTripModel.class); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityClientBuilder.java index d1edc5a5fca..c6d3af3d3a5 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityClientBuilder.java @@ -42,12 +42,12 @@ */ @ServiceClientBuilder( serviceClients = { - VisibilityClient.class, VisibilityReadClient.class, VisibilityWriteClient.class, - VisibilityAsyncClient.class, + VisibilityOpClient.class, VisibilityReadAsyncClient.class, - VisibilityWriteAsyncClient.class }) + VisibilityWriteAsyncClient.class, + VisibilityOpAsyncClient.class }) public final class VisibilityClientBuilder implements HttpTrait, ConfigurationTrait, EndpointTrait { @Generated @@ -270,16 +270,6 @@ private HttpPipeline createHttpPipeline() { return httpPipeline; } - /** - * Builds an instance of VisibilityAsyncClient class. - * - * @return an instance of VisibilityAsyncClient. - */ - @Generated - public VisibilityAsyncClient buildAsyncClient() { - return new VisibilityAsyncClient(buildInnerClient()); - } - /** * Builds an instance of VisibilityReadAsyncClient class. * @@ -301,13 +291,13 @@ public VisibilityWriteAsyncClient buildVisibilityWriteAsyncClient() { } /** - * Builds an instance of VisibilityClient class. + * Builds an instance of VisibilityOpAsyncClient class. * - * @return an instance of VisibilityClient. + * @return an instance of VisibilityOpAsyncClient. */ @Generated - public VisibilityClient buildClient() { - return new VisibilityClient(buildInnerClient()); + public VisibilityOpAsyncClient buildVisibilityOpAsyncClient() { + return new VisibilityOpAsyncClient(buildInnerClient().getVisibilityOps()); } /** @@ -330,5 +320,15 @@ public VisibilityWriteClient buildVisibilityWriteClient() { return new VisibilityWriteClient(buildInnerClient().getVisibilityWrites()); } + /** + * Builds an instance of VisibilityOpClient class. + * + * @return an instance of VisibilityOpClient. + */ + @Generated + public VisibilityOpClient buildVisibilityOpClient() { + return new VisibilityOpClient(buildInnerClient().getVisibilityOps()); + } + private static final ClientLogger LOGGER = new ClientLogger(VisibilityClientBuilder.class); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpAsyncClient.java new file mode 100644 index 00000000000..017e122759d --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpAsyncClient.java @@ -0,0 +1,267 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.visibility; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; +import tsptest.visibility.implementation.VisibilityOpsImpl; +import tsptest.visibility.models.Dog; +import tsptest.visibility.models.ReadDog; +import tsptest.visibility.models.RoundTripModel; +import tsptest.visibility.models.WriteDog; + +/** + * Initializes a new instance of the asynchronous VisibilityClient type. + */ +@ServiceClient(builder = VisibilityClientBuilder.class, isAsync = true) +public final class VisibilityOpAsyncClient { + @Generated + private final VisibilityOpsImpl serviceClient; + + /** + * Initializes an instance of VisibilityOpAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + VisibilityOpAsyncClient(VisibilityOpsImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The get operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getWithResponseAsync(requestOptions); + } + + /** + * The create operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param dog The dog parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> createWithResponse(BinaryData dog, RequestOptions requestOptions) { + return this.serviceClient.createWithResponseAsync(dog, requestOptions); + } + + /** + * The query operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param dog The dog parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> queryWithResponse(BinaryData dog, RequestOptions requestOptions) { + return this.serviceClient.queryWithResponseAsync(dog, requestOptions); + } + + /** + * The roundtrip operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     secretName: String (Required)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     secretName: String (Required)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> roundtripWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.roundtripWithResponseAsync(body, requestOptions); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono get() { + // Generated convenience method for getWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getWithResponse(requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(Dog.class)); + } + + /** + * The create operation. + * + * @param dog The dog parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono create(WriteDog dog) { + // Generated convenience method for createWithResponse + RequestOptions requestOptions = new RequestOptions(); + return createWithResponse(BinaryData.fromObject(dog), requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(Dog.class)); + } + + /** + * The query operation. + * + * @param dog The dog parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono query(WriteDog dog) { + // Generated convenience method for queryWithResponse + RequestOptions requestOptions = new RequestOptions(); + return queryWithResponse(BinaryData.fromObject(dog), requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(ReadDog.class)); + } + + /** + * The roundtrip operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono roundtrip(RoundTripModel body) { + // Generated convenience method for roundtripWithResponse + RequestOptions requestOptions = new RequestOptions(); + return roundtripWithResponse(BinaryData.fromObject(body), requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(RoundTripModel.class)); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpClient.java new file mode 100644 index 00000000000..71e79e643aa --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpClient.java @@ -0,0 +1,262 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.visibility; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; +import tsptest.visibility.implementation.VisibilityOpsImpl; +import tsptest.visibility.models.Dog; +import tsptest.visibility.models.ReadDog; +import tsptest.visibility.models.RoundTripModel; +import tsptest.visibility.models.WriteDog; + +/** + * Initializes a new instance of the synchronous VisibilityClient type. + */ +@ServiceClient(builder = VisibilityClientBuilder.class) +public final class VisibilityOpClient { + @Generated + private final VisibilityOpsImpl serviceClient; + + /** + * Initializes an instance of VisibilityOpClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + VisibilityOpClient(VisibilityOpsImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The get operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getWithResponse(requestOptions); + } + + /** + * The create operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param dog The dog parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response createWithResponse(BinaryData dog, RequestOptions requestOptions) { + return this.serviceClient.createWithResponse(dog, requestOptions); + } + + /** + * The query operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param dog The dog parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response queryWithResponse(BinaryData dog, RequestOptions requestOptions) { + return this.serviceClient.queryWithResponse(dog, requestOptions); + } + + /** + * The roundtrip operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     secretName: String (Required)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     secretName: String (Required)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response roundtripWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.roundtripWithResponse(body, requestOptions); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Dog get() { + // Generated convenience method for getWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getWithResponse(requestOptions).getValue().toObject(Dog.class); + } + + /** + * The create operation. + * + * @param dog The dog parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Dog create(WriteDog dog) { + // Generated convenience method for createWithResponse + RequestOptions requestOptions = new RequestOptions(); + return createWithResponse(BinaryData.fromObject(dog), requestOptions).getValue().toObject(Dog.class); + } + + /** + * The query operation. + * + * @param dog The dog parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public ReadDog query(WriteDog dog) { + // Generated convenience method for queryWithResponse + RequestOptions requestOptions = new RequestOptions(); + return queryWithResponse(BinaryData.fromObject(dog), requestOptions).getValue().toObject(ReadDog.class); + } + + /** + * The roundtrip operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public RoundTripModel roundtrip(RoundTripModel body) { + // Generated convenience method for roundtripWithResponse + RequestOptions requestOptions = new RequestOptions(); + return roundtripWithResponse(BinaryData.fromObject(body), requestOptions).getValue() + .toObject(RoundTripModel.class); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityClientImpl.java index 02c3456cc5b..693a05c11d0 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityClientImpl.java @@ -4,45 +4,17 @@ package tsptest.visibility.implementation; -import com.azure.core.annotation.BodyParam; -import com.azure.core.annotation.ExpectedResponses; -import com.azure.core.annotation.Get; -import com.azure.core.annotation.HeaderParam; -import com.azure.core.annotation.Host; -import com.azure.core.annotation.HostParam; -import com.azure.core.annotation.Post; -import com.azure.core.annotation.Put; -import com.azure.core.annotation.ReturnType; -import com.azure.core.annotation.ServiceInterface; -import com.azure.core.annotation.ServiceMethod; -import com.azure.core.annotation.UnexpectedResponseExceptionType; -import com.azure.core.exception.ClientAuthenticationException; -import com.azure.core.exception.HttpResponseException; -import com.azure.core.exception.ResourceModifiedException; -import com.azure.core.exception.ResourceNotFoundException; import com.azure.core.http.HttpPipeline; import com.azure.core.http.HttpPipelineBuilder; import com.azure.core.http.policy.RetryPolicy; import com.azure.core.http.policy.UserAgentPolicy; -import com.azure.core.http.rest.RequestOptions; -import com.azure.core.http.rest.Response; -import com.azure.core.http.rest.RestProxy; -import com.azure.core.util.BinaryData; -import com.azure.core.util.Context; -import com.azure.core.util.FluxUtil; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; -import reactor.core.publisher.Mono; /** * Initializes a new instance of the VisibilityClient type. */ public final class VisibilityClientImpl { - /** - * The proxy service used to perform REST calls. - */ - private final VisibilityClientService service; - /** * Service host. */ @@ -113,6 +85,20 @@ public VisibilityWritesImpl getVisibilityWrites() { return this.visibilityWrites; } + /** + * The VisibilityOpsImpl object to access its operations. + */ + private final VisibilityOpsImpl visibilityOps; + + /** + * Gets the VisibilityOpsImpl object to access its operations. + * + * @return the VisibilityOpsImpl object. + */ + public VisibilityOpsImpl getVisibilityOps() { + return this.visibilityOps; + } + /** * Initializes an instance of VisibilityClient client. * @@ -146,385 +132,6 @@ public VisibilityClientImpl(HttpPipeline httpPipeline, SerializerAdapter seriali this.endpoint = endpoint; this.visibilityReads = new VisibilityReadsImpl(this); this.visibilityWrites = new VisibilityWritesImpl(this); - this.service = RestProxy.create(VisibilityClientService.class, this.httpPipeline, this.getSerializerAdapter()); - } - - /** - * The interface defining all the services for VisibilityClient to be used by the proxy service to perform REST - * calls. - */ - @Host("{endpoint}") - @ServiceInterface(name = "VisibilityClient") - public interface VisibilityClientService { - @Get("/visibility/read") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> get(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, - RequestOptions requestOptions, Context context); - - @Get("/visibility/read") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response getSync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, - RequestOptions requestOptions, Context context); - - @Put("/visibility/write") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> create(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") BinaryData dog, RequestOptions requestOptions, Context context); - - @Put("/visibility/write") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response createSync(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") BinaryData dog, RequestOptions requestOptions, Context context); - - @Post("/visibility/query") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> query(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") BinaryData dog, RequestOptions requestOptions, Context context); - - @Post("/visibility/query") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response querySync(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") BinaryData dog, RequestOptions requestOptions, Context context); - - @Put("/visibility/roundtrip") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> roundtrip(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); - - @Put("/visibility/roundtrip") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response roundtripSync(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); - } - - /** - * The get operation. - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponseAsync(RequestOptions requestOptions) { - final String accept = "application/json"; - return FluxUtil.withContext(context -> service.get(this.getEndpoint(), accept, requestOptions, context)); - } - - /** - * The get operation. - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse(RequestOptions requestOptions) { - final String accept = "application/json"; - return service.getSync(this.getEndpoint(), accept, requestOptions, Context.NONE); - } - - /** - * The create operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - * @param dog The dog parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createWithResponseAsync(BinaryData dog, RequestOptions requestOptions) { - final String contentType = "application/json"; - final String accept = "application/json"; - return FluxUtil.withContext( - context -> service.create(this.getEndpoint(), contentType, accept, dog, requestOptions, context)); - } - - /** - * The create operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - * @param dog The dog parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response createWithResponse(BinaryData dog, RequestOptions requestOptions) { - final String contentType = "application/json"; - final String accept = "application/json"; - return service.createSync(this.getEndpoint(), contentType, accept, dog, requestOptions, Context.NONE); - } - - /** - * The query operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - * @param dog The dog parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> queryWithResponseAsync(BinaryData dog, RequestOptions requestOptions) { - final String contentType = "application/json"; - final String accept = "application/json"; - return FluxUtil.withContext( - context -> service.query(this.getEndpoint(), contentType, accept, dog, requestOptions, context)); - } - - /** - * The query operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - * @param dog The dog parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response queryWithResponse(BinaryData dog, RequestOptions requestOptions) { - final String contentType = "application/json"; - final String accept = "application/json"; - return service.querySync(this.getEndpoint(), contentType, accept, dog, requestOptions, Context.NONE); - } - - /** - * The roundtrip operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     secretName: String (Required)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     secretName: String (Required)
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> roundtripWithResponseAsync(BinaryData body, RequestOptions requestOptions) { - final String contentType = "application/json"; - final String accept = "application/json"; - return FluxUtil.withContext( - context -> service.roundtrip(this.getEndpoint(), contentType, accept, body, requestOptions, context)); - } - - /** - * The roundtrip operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     secretName: String (Required)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     secretName: String (Required)
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response roundtripWithResponse(BinaryData body, RequestOptions requestOptions) { - final String contentType = "application/json"; - final String accept = "application/json"; - return service.roundtripSync(this.getEndpoint(), contentType, accept, body, requestOptions, Context.NONE); + this.visibilityOps = new VisibilityOpsImpl(this); } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityOpsImpl.java new file mode 100644 index 00000000000..f7bc0de85ed --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityOpsImpl.java @@ -0,0 +1,435 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.visibility.implementation; + +import com.azure.core.annotation.BodyParam; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.Get; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.Post; +import com.azure.core.annotation.Put; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.BinaryData; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * An instance of this class provides access to all the operations defined in VisibilityOps. + */ +public final class VisibilityOpsImpl { + /** + * The proxy service used to perform REST calls. + */ + private final VisibilityOpsService service; + + /** + * The service client containing this operation class. + */ + private final VisibilityClientImpl client; + + /** + * Initializes an instance of VisibilityOpsImpl. + * + * @param client the instance of the service client containing this operation class. + */ + VisibilityOpsImpl(VisibilityClientImpl client) { + this.service + = RestProxy.create(VisibilityOpsService.class, client.getHttpPipeline(), client.getSerializerAdapter()); + this.client = client; + } + + /** + * The interface defining all the services for VisibilityClientVisibilityOps to be used by the proxy service to + * perform REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "VisibilityClientVisibilityOps") + public interface VisibilityOpsService { + @Get("/visibility/read") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> get(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + RequestOptions requestOptions, Context context); + + @Get("/visibility/read") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getSync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + RequestOptions requestOptions, Context context); + + @Put("/visibility/write") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> create(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData dog, RequestOptions requestOptions, Context context); + + @Put("/visibility/write") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response createSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData dog, RequestOptions requestOptions, Context context); + + @Post("/visibility/query") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> query(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData dog, RequestOptions requestOptions, Context context); + + @Post("/visibility/query") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response querySync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData dog, RequestOptions requestOptions, Context context); + + @Put("/visibility/roundtrip") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> roundtrip(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Put("/visibility/roundtrip") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response roundtripSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + } + + /** + * The get operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getWithResponseAsync(RequestOptions requestOptions) { + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.get(this.client.getEndpoint(), accept, requestOptions, context)); + } + + /** + * The get operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestOptions requestOptions) { + final String accept = "application/json"; + return service.getSync(this.client.getEndpoint(), accept, requestOptions, Context.NONE); + } + + /** + * The create operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param dog The dog parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> createWithResponseAsync(BinaryData dog, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext( + context -> service.create(this.client.getEndpoint(), contentType, accept, dog, requestOptions, context)); + } + + /** + * The create operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param dog The dog parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response createWithResponse(BinaryData dog, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.createSync(this.client.getEndpoint(), contentType, accept, dog, requestOptions, Context.NONE); + } + + /** + * The query operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param dog The dog parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> queryWithResponseAsync(BinaryData dog, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext( + context -> service.query(this.client.getEndpoint(), contentType, accept, dog, requestOptions, context)); + } + + /** + * The query operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param dog The dog parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response queryWithResponse(BinaryData dog, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.querySync(this.client.getEndpoint(), contentType, accept, dog, requestOptions, Context.NONE); + } + + /** + * The roundtrip operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     secretName: String (Required)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     secretName: String (Required)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> roundtripWithResponseAsync(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.roundtrip(this.client.getEndpoint(), contentType, accept, body, + requestOptions, context)); + } + + /** + * The roundtrip operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     secretName: String (Required)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     secretName: String (Required)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response roundtripWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.roundtripSync(this.client.getEndpoint(), contentType, accept, body, requestOptions, + Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/FileAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/FileAsyncClient.java new file mode 100644 index 00000000000..6c07d30c1c0 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/FileAsyncClient.java @@ -0,0 +1,372 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package type.file; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; +import type.file.implementation.BodiesImpl; +import type.file.models.DownloadFileMultipleContentTypesContentType; + +/** + * Initializes a new instance of the asynchronous FileClient type. + */ +@ServiceClient(builder = FileClientBuilder.class, isAsync = true) +public final class FileAsyncClient { + @Generated + private final BodiesImpl serviceClient; + + /** + * Initializes an instance of FileAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + FileAsyncClient(BodiesImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The uploadFileSpecificContentType operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param file The file parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> uploadFileSpecificContentTypeWithResponse(BinaryData file, + RequestOptions requestOptions) { + return this.serviceClient.uploadFileSpecificContentTypeWithResponseAsync(file, requestOptions); + } + + /** + * The uploadFileJsonContentType operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param file The file parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> uploadFileJsonContentTypeWithResponse(BinaryData file, RequestOptions requestOptions) { + return this.serviceClient.uploadFileJsonContentTypeWithResponseAsync(file, requestOptions); + } + + /** + * The downloadFileJsonContentType operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> downloadFileJsonContentTypeWithResponse(RequestOptions requestOptions) { + return this.serviceClient.downloadFileJsonContentTypeWithResponseAsync(requestOptions); + } + + /** + * The downloadFileSpecificContentType operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> downloadFileSpecificContentTypeWithResponse(RequestOptions requestOptions) { + return this.serviceClient.downloadFileSpecificContentTypeWithResponseAsync(requestOptions); + } + + /** + * The uploadFileMultipleContentTypes operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param contentType Body parameter's content type. Known values are image/png,image/jpeg. Allowed values: + * "image/png", "image/jpeg". + * @param file The file parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> uploadFileMultipleContentTypesWithResponse(String contentType, BinaryData file, + RequestOptions requestOptions) { + // Operation 'uploadFileMultipleContentTypes' can be invoked with multiple content-type. It is difficult to form + // a correct method signature for convenience API, and hence the convenience API is not generated. + return this.serviceClient.uploadFileMultipleContentTypesWithResponseAsync(contentType, file, requestOptions); + } + + /** + * The downloadFileMultipleContentTypes operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param accept The accept parameter. Allowed values: "image/png", "image/jpeg". + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> downloadFileMultipleContentTypesWithResponse(String accept, + RequestOptions requestOptions) { + return this.serviceClient.downloadFileMultipleContentTypesWithResponseAsync(accept, requestOptions); + } + + /** + * The uploadFileDefaultContentType operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param file The file parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> uploadFileDefaultContentTypeWithResponse(BinaryData file, + RequestOptions requestOptions) { + return this.serviceClient.uploadFileDefaultContentTypeWithResponseAsync(file, requestOptions); + } + + /** + * The downloadFileDefaultContentType operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> downloadFileDefaultContentTypeWithResponse(RequestOptions requestOptions) { + return this.serviceClient.downloadFileDefaultContentTypeWithResponseAsync(requestOptions); + } + + /** + * The uploadFileSpecificContentType operation. + * + * @param file The file parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono uploadFileSpecificContentType(BinaryData file) { + // Generated convenience method for uploadFileSpecificContentTypeWithResponse + RequestOptions requestOptions = new RequestOptions(); + return uploadFileSpecificContentTypeWithResponse(file, requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The uploadFileJsonContentType operation. + * + * @param file The file parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono uploadFileJsonContentType(BinaryData file) { + // Generated convenience method for uploadFileJsonContentTypeWithResponse + RequestOptions requestOptions = new RequestOptions(); + return uploadFileJsonContentTypeWithResponse(file, requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The downloadFileJsonContentType operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono downloadFileJsonContentType() { + // Generated convenience method for downloadFileJsonContentTypeWithResponse + RequestOptions requestOptions = new RequestOptions(); + return downloadFileJsonContentTypeWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The downloadFileSpecificContentType operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono downloadFileSpecificContentType() { + // Generated convenience method for downloadFileSpecificContentTypeWithResponse + RequestOptions requestOptions = new RequestOptions(); + return downloadFileSpecificContentTypeWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The downloadFileMultipleContentTypes operation. + * + * @param accept The accept parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono downloadFileMultipleContentTypes(DownloadFileMultipleContentTypesContentType accept) { + // Generated convenience method for downloadFileMultipleContentTypesWithResponse + RequestOptions requestOptions = new RequestOptions(); + return downloadFileMultipleContentTypesWithResponse(accept.toString(), requestOptions) + .flatMap(FluxUtil::toMono); + } + + /** + * The uploadFileDefaultContentType operation. + * + * @param file The file parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono uploadFileDefaultContentType(BinaryData file) { + // Generated convenience method for uploadFileDefaultContentTypeWithResponse + RequestOptions requestOptions = new RequestOptions(); + return uploadFileDefaultContentTypeWithResponse(file, requestOptions).flatMap(FluxUtil::toMono); + } + + /** + * The downloadFileDefaultContentType operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono downloadFileDefaultContentType() { + // Generated convenience method for downloadFileDefaultContentTypeWithResponse + RequestOptions requestOptions = new RequestOptions(); + return downloadFileDefaultContentTypeWithResponse(requestOptions).flatMap(FluxUtil::toMono); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/FileClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/FileClient.java new file mode 100644 index 00000000000..7d00760c11d --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/FileClient.java @@ -0,0 +1,364 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package type.file; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; +import type.file.implementation.BodiesImpl; +import type.file.models.DownloadFileMultipleContentTypesContentType; + +/** + * Initializes a new instance of the synchronous FileClient type. + */ +@ServiceClient(builder = FileClientBuilder.class) +public final class FileClient { + @Generated + private final BodiesImpl serviceClient; + + /** + * Initializes an instance of FileClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + FileClient(BodiesImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The uploadFileSpecificContentType operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param file The file parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileSpecificContentTypeWithResponse(BinaryData file, RequestOptions requestOptions) { + return this.serviceClient.uploadFileSpecificContentTypeWithResponse(file, requestOptions); + } + + /** + * The uploadFileJsonContentType operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param file The file parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileJsonContentTypeWithResponse(BinaryData file, RequestOptions requestOptions) { + return this.serviceClient.uploadFileJsonContentTypeWithResponse(file, requestOptions); + } + + /** + * The downloadFileJsonContentType operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response downloadFileJsonContentTypeWithResponse(RequestOptions requestOptions) { + return this.serviceClient.downloadFileJsonContentTypeWithResponse(requestOptions); + } + + /** + * The downloadFileSpecificContentType operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response downloadFileSpecificContentTypeWithResponse(RequestOptions requestOptions) { + return this.serviceClient.downloadFileSpecificContentTypeWithResponse(requestOptions); + } + + /** + * The uploadFileMultipleContentTypes operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param contentType Body parameter's content type. Known values are image/png,image/jpeg. Allowed values: + * "image/png", "image/jpeg". + * @param file The file parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileMultipleContentTypesWithResponse(String contentType, BinaryData file, + RequestOptions requestOptions) { + // Operation 'uploadFileMultipleContentTypes' can be invoked with multiple content-type. It is difficult to form + // a correct method signature for convenience API, and hence the convenience API is not generated. + return this.serviceClient.uploadFileMultipleContentTypesWithResponse(contentType, file, requestOptions); + } + + /** + * The downloadFileMultipleContentTypes operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param accept The accept parameter. Allowed values: "image/png", "image/jpeg". + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response downloadFileMultipleContentTypesWithResponse(String accept, + RequestOptions requestOptions) { + return this.serviceClient.downloadFileMultipleContentTypesWithResponse(accept, requestOptions); + } + + /** + * The uploadFileDefaultContentType operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param file The file parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileDefaultContentTypeWithResponse(BinaryData file, RequestOptions requestOptions) { + return this.serviceClient.uploadFileDefaultContentTypeWithResponse(file, requestOptions); + } + + /** + * The downloadFileDefaultContentType operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response downloadFileDefaultContentTypeWithResponse(RequestOptions requestOptions) { + return this.serviceClient.downloadFileDefaultContentTypeWithResponse(requestOptions); + } + + /** + * The uploadFileSpecificContentType operation. + * + * @param file The file parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void uploadFileSpecificContentType(BinaryData file) { + // Generated convenience method for uploadFileSpecificContentTypeWithResponse + RequestOptions requestOptions = new RequestOptions(); + uploadFileSpecificContentTypeWithResponse(file, requestOptions).getValue(); + } + + /** + * The uploadFileJsonContentType operation. + * + * @param file The file parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void uploadFileJsonContentType(BinaryData file) { + // Generated convenience method for uploadFileJsonContentTypeWithResponse + RequestOptions requestOptions = new RequestOptions(); + uploadFileJsonContentTypeWithResponse(file, requestOptions).getValue(); + } + + /** + * The downloadFileJsonContentType operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public BinaryData downloadFileJsonContentType() { + // Generated convenience method for downloadFileJsonContentTypeWithResponse + RequestOptions requestOptions = new RequestOptions(); + return downloadFileJsonContentTypeWithResponse(requestOptions).getValue(); + } + + /** + * The downloadFileSpecificContentType operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public BinaryData downloadFileSpecificContentType() { + // Generated convenience method for downloadFileSpecificContentTypeWithResponse + RequestOptions requestOptions = new RequestOptions(); + return downloadFileSpecificContentTypeWithResponse(requestOptions).getValue(); + } + + /** + * The downloadFileMultipleContentTypes operation. + * + * @param accept The accept parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public BinaryData downloadFileMultipleContentTypes(DownloadFileMultipleContentTypesContentType accept) { + // Generated convenience method for downloadFileMultipleContentTypesWithResponse + RequestOptions requestOptions = new RequestOptions(); + return downloadFileMultipleContentTypesWithResponse(accept.toString(), requestOptions).getValue(); + } + + /** + * The uploadFileDefaultContentType operation. + * + * @param file The file parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public void uploadFileDefaultContentType(BinaryData file) { + // Generated convenience method for uploadFileDefaultContentTypeWithResponse + RequestOptions requestOptions = new RequestOptions(); + uploadFileDefaultContentTypeWithResponse(file, requestOptions).getValue(); + } + + /** + * The downloadFileDefaultContentType operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public BinaryData downloadFileDefaultContentType() { + // Generated convenience method for downloadFileDefaultContentTypeWithResponse + RequestOptions requestOptions = new RequestOptions(); + return downloadFileDefaultContentTypeWithResponse(requestOptions).getValue(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/FileClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/FileClientBuilder.java new file mode 100644 index 00000000000..be3cd098923 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/FileClientBuilder.java @@ -0,0 +1,287 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package type.file; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ServiceClientBuilder; +import com.azure.core.client.traits.ConfigurationTrait; +import com.azure.core.client.traits.EndpointTrait; +import com.azure.core.client.traits.HttpTrait; +import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.HttpPipelinePosition; +import com.azure.core.http.policy.AddDatePolicy; +import com.azure.core.http.policy.AddHeadersFromContextPolicy; +import com.azure.core.http.policy.AddHeadersPolicy; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.http.policy.HttpLoggingPolicy; +import com.azure.core.http.policy.HttpPipelinePolicy; +import com.azure.core.http.policy.HttpPolicyProviders; +import com.azure.core.http.policy.RequestIdPolicy; +import com.azure.core.http.policy.RetryOptions; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.ClientOptions; +import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.builder.ClientBuilderUtil; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.serializer.JacksonAdapter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import type.file.implementation.FileClientImpl; + +/** + * A builder for creating a new instance of the FileClient type. + */ +@ServiceClientBuilder(serviceClients = { FileClient.class, FileAsyncClient.class }) +public final class FileClientBuilder + implements HttpTrait, ConfigurationTrait, EndpointTrait { + @Generated + private static final String SDK_NAME = "name"; + + @Generated + private static final String SDK_VERSION = "version"; + + @Generated + private static final Map PROPERTIES = CoreUtils.getProperties("type-file.properties"); + + @Generated + private final List pipelinePolicies; + + /** + * Create an instance of the FileClientBuilder. + */ + @Generated + public FileClientBuilder() { + this.pipelinePolicies = new ArrayList<>(); + } + + /* + * The HTTP client used to send the request. + */ + @Generated + private HttpClient httpClient; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public FileClientBuilder httpClient(HttpClient httpClient) { + this.httpClient = httpClient; + return this; + } + + /* + * The HTTP pipeline to send requests through. + */ + @Generated + private HttpPipeline pipeline; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public FileClientBuilder pipeline(HttpPipeline pipeline) { + if (this.pipeline != null && pipeline == null) { + LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured."); + } + this.pipeline = pipeline; + return this; + } + + /* + * The logging configuration for HTTP requests and responses. + */ + @Generated + private HttpLogOptions httpLogOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public FileClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) { + this.httpLogOptions = httpLogOptions; + return this; + } + + /* + * The client options such as application ID and custom headers to set on a request. + */ + @Generated + private ClientOptions clientOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public FileClientBuilder clientOptions(ClientOptions clientOptions) { + this.clientOptions = clientOptions; + return this; + } + + /* + * The retry options to configure retry policy for failed requests. + */ + @Generated + private RetryOptions retryOptions; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public FileClientBuilder retryOptions(RetryOptions retryOptions) { + this.retryOptions = retryOptions; + return this; + } + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public FileClientBuilder addPolicy(HttpPipelinePolicy customPolicy) { + Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."); + pipelinePolicies.add(customPolicy); + return this; + } + + /* + * The configuration store that is used during construction of the service client. + */ + @Generated + private Configuration configuration; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public FileClientBuilder configuration(Configuration configuration) { + this.configuration = configuration; + return this; + } + + /* + * The service endpoint + */ + @Generated + private String endpoint; + + /** + * {@inheritDoc}. + */ + @Generated + @Override + public FileClientBuilder endpoint(String endpoint) { + this.endpoint = endpoint; + return this; + } + + /* + * The retry policy that will attempt to retry failed requests, if applicable. + */ + @Generated + private RetryPolicy retryPolicy; + + /** + * Sets The retry policy that will attempt to retry failed requests, if applicable. + * + * @param retryPolicy the retryPolicy value. + * @return the FileClientBuilder. + */ + @Generated + public FileClientBuilder retryPolicy(RetryPolicy retryPolicy) { + this.retryPolicy = retryPolicy; + return this; + } + + /** + * Builds an instance of FileClientImpl with the provided parameters. + * + * @return an instance of FileClientImpl. + */ + @Generated + private FileClientImpl buildInnerClient() { + this.validateClient(); + HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline(); + String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000"; + FileClientImpl client + = new FileClientImpl(localPipeline, JacksonAdapter.createDefaultSerializerAdapter(), localEndpoint); + return client; + } + + @Generated + private void validateClient() { + // This method is invoked from 'buildInnerClient'/'buildClient' method. + // Developer can customize this method, to validate that the necessary conditions are met for the new client. + } + + @Generated + private HttpPipeline createHttpPipeline() { + Configuration buildConfiguration + = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration; + HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions; + ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions; + List policies = new ArrayList<>(); + String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName"); + String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); + String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions); + policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); + policies.add(new RequestIdPolicy()); + policies.add(new AddHeadersFromContextPolicy()); + HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions); + if (headers != null) { + policies.add(new AddHeadersPolicy(headers)); + } + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addBeforeRetryPolicies(policies); + policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy())); + policies.add(new AddDatePolicy()); + this.pipelinePolicies.stream() + .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) + .forEach(p -> policies.add(p)); + HttpPolicyProviders.addAfterRetryPolicies(policies); + policies.add(new HttpLoggingPolicy(localHttpLogOptions)); + HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])) + .httpClient(httpClient) + .clientOptions(localClientOptions) + .build(); + return httpPipeline; + } + + /** + * Builds an instance of FileAsyncClient class. + * + * @return an instance of FileAsyncClient. + */ + @Generated + public FileAsyncClient buildAsyncClient() { + return new FileAsyncClient(buildInnerClient().getBodies()); + } + + /** + * Builds an instance of FileClient class. + * + * @return an instance of FileClient. + */ + @Generated + public FileClient buildClient() { + return new FileClient(buildInnerClient().getBodies()); + } + + private static final ClientLogger LOGGER = new ClientLogger(FileClientBuilder.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/implementation/BodiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/implementation/BodiesImpl.java new file mode 100644 index 00000000000..029aff61c13 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/implementation/BodiesImpl.java @@ -0,0 +1,613 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package type.file.implementation; + +import com.azure.core.annotation.BodyParam; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.Get; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.Post; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.BinaryData; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * An instance of this class provides access to all the operations defined in Bodies. + */ +public final class BodiesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final BodiesService service; + + /** + * The service client containing this operation class. + */ + private final FileClientImpl client; + + /** + * Initializes an instance of BodiesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + BodiesImpl(FileClientImpl client) { + this.service = RestProxy.create(BodiesService.class, client.getHttpPipeline(), client.getSerializerAdapter()); + this.client = client; + } + + /** + * The interface defining all the services for FileClientBodies to be used by the proxy service to perform REST + * calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "FileClientBodies") + public interface BodiesService { + @Post("/type/file/body/request/specific-content-type") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> uploadFileSpecificContentType(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("image/png") BinaryData file, + RequestOptions requestOptions, Context context); + + @Post("/type/file/body/request/specific-content-type") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response uploadFileSpecificContentTypeSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("image/png") BinaryData file, + RequestOptions requestOptions, Context context); + + @Post("/type/file/body/request/json-content-type") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> uploadFileJsonContentType(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData file, + RequestOptions requestOptions, Context context); + + @Post("/type/file/body/request/json-content-type") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response uploadFileJsonContentTypeSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData file, + RequestOptions requestOptions, Context context); + + @Get("/type/file/body/response/json-content-type") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> downloadFileJsonContentType(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/type/file/body/response/json-content-type") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response downloadFileJsonContentTypeSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/type/file/body/response/specific-content-type") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> downloadFileSpecificContentType(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/type/file/body/response/specific-content-type") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response downloadFileSpecificContentTypeSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/type/file/body/request/multiple-content-types") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> uploadFileMultipleContentTypes(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData file, + RequestOptions requestOptions, Context context); + + @Post("/type/file/body/request/multiple-content-types") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response uploadFileMultipleContentTypesSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData file, + RequestOptions requestOptions, Context context); + + @Get("/type/file/body/response/multiple-content-types") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> downloadFileMultipleContentTypes(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/type/file/body/response/multiple-content-types") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response downloadFileMultipleContentTypesSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/type/file/body/request/default-content-type") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> uploadFileDefaultContentType(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("*/*") BinaryData file, + RequestOptions requestOptions, Context context); + + @Post("/type/file/body/request/default-content-type") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response uploadFileDefaultContentTypeSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("*/*") BinaryData file, + RequestOptions requestOptions, Context context); + + @Get("/type/file/body/response/default-content-type") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> downloadFileDefaultContentType(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/type/file/body/response/default-content-type") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response downloadFileDefaultContentTypeSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + } + + /** + * The uploadFileSpecificContentType operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param file The file parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> uploadFileSpecificContentTypeWithResponseAsync(BinaryData file, + RequestOptions requestOptions) { + final String contentType = "image/png"; + return FluxUtil.withContext(context -> service.uploadFileSpecificContentType(this.client.getEndpoint(), + contentType, file, requestOptions, context)); + } + + /** + * The uploadFileSpecificContentType operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param file The file parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileSpecificContentTypeWithResponse(BinaryData file, RequestOptions requestOptions) { + final String contentType = "image/png"; + return service.uploadFileSpecificContentTypeSync(this.client.getEndpoint(), contentType, file, requestOptions, + Context.NONE); + } + + /** + * The uploadFileJsonContentType operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param file The file parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> uploadFileJsonContentTypeWithResponseAsync(BinaryData file, + RequestOptions requestOptions) { + final String contentType = "application/json"; + return FluxUtil.withContext(context -> service.uploadFileJsonContentType(this.client.getEndpoint(), contentType, + file, requestOptions, context)); + } + + /** + * The uploadFileJsonContentType operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param file The file parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileJsonContentTypeWithResponse(BinaryData file, RequestOptions requestOptions) { + final String contentType = "application/json"; + return service.uploadFileJsonContentTypeSync(this.client.getEndpoint(), contentType, file, requestOptions, + Context.NONE); + } + + /** + * The downloadFileJsonContentType operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> downloadFileJsonContentTypeWithResponseAsync(RequestOptions requestOptions) { + final String accept = "application/json"; + return FluxUtil.withContext( + context -> service.downloadFileJsonContentType(this.client.getEndpoint(), accept, requestOptions, context)); + } + + /** + * The downloadFileJsonContentType operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response downloadFileJsonContentTypeWithResponse(RequestOptions requestOptions) { + final String accept = "application/json"; + return service.downloadFileJsonContentTypeSync(this.client.getEndpoint(), accept, requestOptions, Context.NONE); + } + + /** + * The downloadFileSpecificContentType operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> downloadFileSpecificContentTypeWithResponseAsync(RequestOptions requestOptions) { + final String accept = "image/png"; + return FluxUtil.withContext(context -> service.downloadFileSpecificContentType(this.client.getEndpoint(), + accept, requestOptions, context)); + } + + /** + * The downloadFileSpecificContentType operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response downloadFileSpecificContentTypeWithResponse(RequestOptions requestOptions) { + final String accept = "image/png"; + return service.downloadFileSpecificContentTypeSync(this.client.getEndpoint(), accept, requestOptions, + Context.NONE); + } + + /** + * The uploadFileMultipleContentTypes operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param contentType Body parameter's content type. Known values are image/png,image/jpeg. Allowed values: + * "image/png", "image/jpeg". + * @param file The file parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> uploadFileMultipleContentTypesWithResponseAsync(String contentType, BinaryData file, + RequestOptions requestOptions) { + return FluxUtil.withContext(context -> service.uploadFileMultipleContentTypes(this.client.getEndpoint(), + contentType, file, requestOptions, context)); + } + + /** + * The uploadFileMultipleContentTypes operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param contentType Body parameter's content type. Known values are image/png,image/jpeg. Allowed values: + * "image/png", "image/jpeg". + * @param file The file parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileMultipleContentTypesWithResponse(String contentType, BinaryData file, + RequestOptions requestOptions) { + return service.uploadFileMultipleContentTypesSync(this.client.getEndpoint(), contentType, file, requestOptions, + Context.NONE); + } + + /** + * The downloadFileMultipleContentTypes operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param accept The accept parameter. Allowed values: "image/png", "image/jpeg". + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> downloadFileMultipleContentTypesWithResponseAsync(String accept, + RequestOptions requestOptions) { + return FluxUtil.withContext(context -> service.downloadFileMultipleContentTypes(this.client.getEndpoint(), + accept, requestOptions, context)); + } + + /** + * The downloadFileMultipleContentTypes operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param accept The accept parameter. Allowed values: "image/png", "image/jpeg". + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response downloadFileMultipleContentTypesWithResponse(String accept, + RequestOptions requestOptions) { + return service.downloadFileMultipleContentTypesSync(this.client.getEndpoint(), accept, requestOptions, + Context.NONE); + } + + /** + * The uploadFileDefaultContentType operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param file The file parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> uploadFileDefaultContentTypeWithResponseAsync(BinaryData file, + RequestOptions requestOptions) { + final String contentType = "*/*"; + return FluxUtil.withContext(context -> service.uploadFileDefaultContentType(this.client.getEndpoint(), + contentType, file, requestOptions, context)); + } + + /** + * The uploadFileDefaultContentType operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param file The file parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response uploadFileDefaultContentTypeWithResponse(BinaryData file, RequestOptions requestOptions) { + final String contentType = "*/*"; + return service.uploadFileDefaultContentTypeSync(this.client.getEndpoint(), contentType, file, requestOptions, + Context.NONE); + } + + /** + * The downloadFileDefaultContentType operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> downloadFileDefaultContentTypeWithResponseAsync(RequestOptions requestOptions) { + final String accept = "*/*"; + return FluxUtil.withContext(context -> service.downloadFileDefaultContentType(this.client.getEndpoint(), accept, + requestOptions, context)); + } + + /** + * The downloadFileDefaultContentType operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * BinaryData
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response downloadFileDefaultContentTypeWithResponse(RequestOptions requestOptions) { + final String accept = "*/*"; + return service.downloadFileDefaultContentTypeSync(this.client.getEndpoint(), accept, requestOptions, + Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/implementation/FileClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/implementation/FileClientImpl.java new file mode 100644 index 00000000000..142d728cab5 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/implementation/FileClientImpl.java @@ -0,0 +1,107 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package type.file.implementation; + +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.serializer.JacksonAdapter; +import com.azure.core.util.serializer.SerializerAdapter; + +/** + * Initializes a new instance of the FileClient type. + */ +public final class FileClientImpl { + /** + * Service host. + */ + private final String endpoint; + + /** + * Gets Service host. + * + * @return the endpoint value. + */ + public String getEndpoint() { + return this.endpoint; + } + + /** + * The HTTP pipeline to send requests through. + */ + private final HttpPipeline httpPipeline; + + /** + * Gets The HTTP pipeline to send requests through. + * + * @return the httpPipeline value. + */ + public HttpPipeline getHttpPipeline() { + return this.httpPipeline; + } + + /** + * The serializer to serialize an object into a string. + */ + private final SerializerAdapter serializerAdapter; + + /** + * Gets The serializer to serialize an object into a string. + * + * @return the serializerAdapter value. + */ + public SerializerAdapter getSerializerAdapter() { + return this.serializerAdapter; + } + + /** + * The BodiesImpl object to access its operations. + */ + private final BodiesImpl bodies; + + /** + * Gets the BodiesImpl object to access its operations. + * + * @return the BodiesImpl object. + */ + public BodiesImpl getBodies() { + return this.bodies; + } + + /** + * Initializes an instance of FileClient client. + * + * @param endpoint Service host. + */ + public FileClientImpl(String endpoint) { + this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), + JacksonAdapter.createDefaultSerializerAdapter(), endpoint); + } + + /** + * Initializes an instance of FileClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param endpoint Service host. + */ + public FileClientImpl(HttpPipeline httpPipeline, String endpoint) { + this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint); + } + + /** + * Initializes an instance of FileClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param serializerAdapter The serializer to serialize an object into a string. + * @param endpoint Service host. + */ + public FileClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint) { + this.httpPipeline = httpPipeline; + this.serializerAdapter = serializerAdapter; + this.endpoint = endpoint; + this.bodies = new BodiesImpl(this); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/implementation/package-info.java new file mode 100644 index 00000000000..8e8bc81517e --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/implementation/package-info.java @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the implementations for File. + * Test for File type usage in request and response bodies. + * + */ +package type.file.implementation; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/models/DownloadFileMultipleContentTypesContentType.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/models/DownloadFileMultipleContentTypesContentType.java new file mode 100644 index 00000000000..809a1d1bd91 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/models/DownloadFileMultipleContentTypesContentType.java @@ -0,0 +1,56 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package type.file.models; + +/** + * Defines values for DownloadFileMultipleContentTypesContentType. + */ +public enum DownloadFileMultipleContentTypesContentType { + /** + * Enum value image/png. + */ + IMAGE_PNG("image/png"), + + /** + * Enum value image/jpeg. + */ + IMAGE_JPEG("image/jpeg"); + + /** + * The actual serialized value for a DownloadFileMultipleContentTypesContentType instance. + */ + private final String value; + + DownloadFileMultipleContentTypesContentType(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a DownloadFileMultipleContentTypesContentType instance. + * + * @param value the serialized value to parse. + * @return the parsed DownloadFileMultipleContentTypesContentType object, or null if unable to parse. + */ + public static DownloadFileMultipleContentTypesContentType fromString(String value) { + if (value == null) { + return null; + } + DownloadFileMultipleContentTypesContentType[] items = DownloadFileMultipleContentTypesContentType.values(); + for (DownloadFileMultipleContentTypesContentType item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.value; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/models/package-info.java new file mode 100644 index 00000000000..70898197723 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/models/package-info.java @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the data models for File. + * Test for File type usage in request and response bodies. + * + */ +package type.file.models; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/package-info.java new file mode 100644 index 00000000000..a9ab17929b1 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/package-info.java @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the classes for File. + * Test for File type usage in request and response bodies. + * + */ +package type.file; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/models/MixedTypesCases.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/models/MixedTypesCases.java index a1432230f8b..8adfc9a891b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/models/MixedTypesCases.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/models/MixedTypesCases.java @@ -133,8 +133,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { this.intProperty.writeTo(jsonWriter); jsonWriter.writeFieldName("boolean"); this.booleanProperty.writeTo(jsonWriter); - jsonWriter.writeArrayField("array", this.array, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeArrayField("array", this.array, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-apikey_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-apikey_apiview_properties.json deleted file mode 100644 index d4b49f747a6..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-apikey_apiview_properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "authentication.apikey.ApiKeyAsyncClient": "Authentication.ApiKey", - "authentication.apikey.ApiKeyAsyncClient.invalid": "Authentication.ApiKey.invalid", - "authentication.apikey.ApiKeyAsyncClient.invalidWithResponse": "Authentication.ApiKey.invalid", - "authentication.apikey.ApiKeyAsyncClient.valid": "Authentication.ApiKey.valid", - "authentication.apikey.ApiKeyAsyncClient.validWithResponse": "Authentication.ApiKey.valid", - "authentication.apikey.ApiKeyClient": "Authentication.ApiKey", - "authentication.apikey.ApiKeyClient.invalid": "Authentication.ApiKey.invalid", - "authentication.apikey.ApiKeyClient.invalidWithResponse": "Authentication.ApiKey.invalid", - "authentication.apikey.ApiKeyClient.valid": "Authentication.ApiKey.valid", - "authentication.apikey.ApiKeyClient.validWithResponse": "Authentication.ApiKey.valid", - "authentication.apikey.ApiKeyClientBuilder": "Authentication.ApiKey" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-apikey_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-apikey_metadata.json index 697b8c7027b..21b19e1e76e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-apikey_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-apikey_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"authentication.apikey.ApiKeyAsyncClient":"Authentication.ApiKey","authentication.apikey.ApiKeyAsyncClient.invalid":"Authentication.ApiKey.invalid","authentication.apikey.ApiKeyAsyncClient.invalidWithResponse":"Authentication.ApiKey.invalid","authentication.apikey.ApiKeyAsyncClient.valid":"Authentication.ApiKey.valid","authentication.apikey.ApiKeyAsyncClient.validWithResponse":"Authentication.ApiKey.valid","authentication.apikey.ApiKeyClient":"Authentication.ApiKey","authentication.apikey.ApiKeyClient.invalid":"Authentication.ApiKey.invalid","authentication.apikey.ApiKeyClient.invalidWithResponse":"Authentication.ApiKey.invalid","authentication.apikey.ApiKeyClient.valid":"Authentication.ApiKey.valid","authentication.apikey.ApiKeyClient.validWithResponse":"Authentication.ApiKey.valid","authentication.apikey.ApiKeyClientBuilder":"Authentication.ApiKey"},"generatedFiles":["src/main/java/authentication/apikey/ApiKeyAsyncClient.java","src/main/java/authentication/apikey/ApiKeyClient.java","src/main/java/authentication/apikey/ApiKeyClientBuilder.java","src/main/java/authentication/apikey/implementation/ApiKeyClientImpl.java","src/main/java/authentication/apikey/implementation/package-info.java","src/main/java/authentication/apikey/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"authentication.apikey.ApiKeyAsyncClient":"Authentication.ApiKey","authentication.apikey.ApiKeyAsyncClient.invalid":"Authentication.ApiKey.invalid","authentication.apikey.ApiKeyAsyncClient.invalidWithResponse":"Authentication.ApiKey.invalid","authentication.apikey.ApiKeyAsyncClient.valid":"Authentication.ApiKey.valid","authentication.apikey.ApiKeyAsyncClient.validWithResponse":"Authentication.ApiKey.valid","authentication.apikey.ApiKeyClient":"Authentication.ApiKey","authentication.apikey.ApiKeyClient.invalid":"Authentication.ApiKey.invalid","authentication.apikey.ApiKeyClient.invalidWithResponse":"Authentication.ApiKey.invalid","authentication.apikey.ApiKeyClient.valid":"Authentication.ApiKey.valid","authentication.apikey.ApiKeyClient.validWithResponse":"Authentication.ApiKey.valid","authentication.apikey.ApiKeyClientBuilder":"Authentication.ApiKey"},"generatedFiles":["src/main/java/authentication/apikey/ApiKeyAsyncClient.java","src/main/java/authentication/apikey/ApiKeyClient.java","src/main/java/authentication/apikey/ApiKeyClientBuilder.java","src/main/java/authentication/apikey/implementation/ApiKeyClientImpl.java","src/main/java/authentication/apikey/implementation/package-info.java","src/main/java/authentication/apikey/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-http-custom_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-http-custom_apiview_properties.json deleted file mode 100644 index 5cb55d8a990..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-http-custom_apiview_properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "authentication.http.custom.CustomAsyncClient": "Authentication.Http.Custom", - "authentication.http.custom.CustomAsyncClient.invalid": "Authentication.Http.Custom.invalid", - "authentication.http.custom.CustomAsyncClient.invalidWithResponse": "Authentication.Http.Custom.invalid", - "authentication.http.custom.CustomAsyncClient.valid": "Authentication.Http.Custom.valid", - "authentication.http.custom.CustomAsyncClient.validWithResponse": "Authentication.Http.Custom.valid", - "authentication.http.custom.CustomClient": "Authentication.Http.Custom", - "authentication.http.custom.CustomClient.invalid": "Authentication.Http.Custom.invalid", - "authentication.http.custom.CustomClient.invalidWithResponse": "Authentication.Http.Custom.invalid", - "authentication.http.custom.CustomClient.valid": "Authentication.Http.Custom.valid", - "authentication.http.custom.CustomClient.validWithResponse": "Authentication.Http.Custom.valid", - "authentication.http.custom.CustomClientBuilder": "Authentication.Http.Custom" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-http-custom_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-http-custom_metadata.json index 2b83d16a831..1b0751018eb 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-http-custom_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-http-custom_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"authentication.http.custom.CustomAsyncClient":"Authentication.Http.Custom","authentication.http.custom.CustomAsyncClient.invalid":"Authentication.Http.Custom.invalid","authentication.http.custom.CustomAsyncClient.invalidWithResponse":"Authentication.Http.Custom.invalid","authentication.http.custom.CustomAsyncClient.valid":"Authentication.Http.Custom.valid","authentication.http.custom.CustomAsyncClient.validWithResponse":"Authentication.Http.Custom.valid","authentication.http.custom.CustomClient":"Authentication.Http.Custom","authentication.http.custom.CustomClient.invalid":"Authentication.Http.Custom.invalid","authentication.http.custom.CustomClient.invalidWithResponse":"Authentication.Http.Custom.invalid","authentication.http.custom.CustomClient.valid":"Authentication.Http.Custom.valid","authentication.http.custom.CustomClient.validWithResponse":"Authentication.Http.Custom.valid","authentication.http.custom.CustomClientBuilder":"Authentication.Http.Custom"},"generatedFiles":["src/main/java/authentication/http/custom/CustomAsyncClient.java","src/main/java/authentication/http/custom/CustomClient.java","src/main/java/authentication/http/custom/CustomClientBuilder.java","src/main/java/authentication/http/custom/implementation/CustomClientImpl.java","src/main/java/authentication/http/custom/implementation/package-info.java","src/main/java/authentication/http/custom/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"authentication.http.custom.CustomAsyncClient":"Authentication.Http.Custom","authentication.http.custom.CustomAsyncClient.invalid":"Authentication.Http.Custom.invalid","authentication.http.custom.CustomAsyncClient.invalidWithResponse":"Authentication.Http.Custom.invalid","authentication.http.custom.CustomAsyncClient.valid":"Authentication.Http.Custom.valid","authentication.http.custom.CustomAsyncClient.validWithResponse":"Authentication.Http.Custom.valid","authentication.http.custom.CustomClient":"Authentication.Http.Custom","authentication.http.custom.CustomClient.invalid":"Authentication.Http.Custom.invalid","authentication.http.custom.CustomClient.invalidWithResponse":"Authentication.Http.Custom.invalid","authentication.http.custom.CustomClient.valid":"Authentication.Http.Custom.valid","authentication.http.custom.CustomClient.validWithResponse":"Authentication.Http.Custom.valid","authentication.http.custom.CustomClientBuilder":"Authentication.Http.Custom"},"generatedFiles":["src/main/java/authentication/http/custom/CustomAsyncClient.java","src/main/java/authentication/http/custom/CustomClient.java","src/main/java/authentication/http/custom/CustomClientBuilder.java","src/main/java/authentication/http/custom/implementation/CustomClientImpl.java","src/main/java/authentication/http/custom/implementation/package-info.java","src/main/java/authentication/http/custom/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-noauth-union_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-noauth-union_apiview_properties.json deleted file mode 100644 index c21e8dfeb29..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-noauth-union_apiview_properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "authentication.noauth.union.UnionAsyncClient": "Authentication.Noauth.Union", - "authentication.noauth.union.UnionAsyncClient.validNoAuth": "Authentication.Noauth.Union.validNoAuth", - "authentication.noauth.union.UnionAsyncClient.validNoAuthWithResponse": "Authentication.Noauth.Union.validNoAuth", - "authentication.noauth.union.UnionAsyncClient.validToken": "Authentication.Noauth.Union.validToken", - "authentication.noauth.union.UnionAsyncClient.validTokenWithResponse": "Authentication.Noauth.Union.validToken", - "authentication.noauth.union.UnionClient": "Authentication.Noauth.Union", - "authentication.noauth.union.UnionClient.validNoAuth": "Authentication.Noauth.Union.validNoAuth", - "authentication.noauth.union.UnionClient.validNoAuthWithResponse": "Authentication.Noauth.Union.validNoAuth", - "authentication.noauth.union.UnionClient.validToken": "Authentication.Noauth.Union.validToken", - "authentication.noauth.union.UnionClient.validTokenWithResponse": "Authentication.Noauth.Union.validToken", - "authentication.noauth.union.UnionClientBuilder": "Authentication.Noauth.Union" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-noauth-union_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-noauth-union_metadata.json index 15e49999d34..8e51aaef4bf 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-noauth-union_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-noauth-union_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"authentication.noauth.union.UnionAsyncClient":"Authentication.Noauth.Union","authentication.noauth.union.UnionAsyncClient.validNoAuth":"Authentication.Noauth.Union.validNoAuth","authentication.noauth.union.UnionAsyncClient.validNoAuthWithResponse":"Authentication.Noauth.Union.validNoAuth","authentication.noauth.union.UnionAsyncClient.validToken":"Authentication.Noauth.Union.validToken","authentication.noauth.union.UnionAsyncClient.validTokenWithResponse":"Authentication.Noauth.Union.validToken","authentication.noauth.union.UnionClient":"Authentication.Noauth.Union","authentication.noauth.union.UnionClient.validNoAuth":"Authentication.Noauth.Union.validNoAuth","authentication.noauth.union.UnionClient.validNoAuthWithResponse":"Authentication.Noauth.Union.validNoAuth","authentication.noauth.union.UnionClient.validToken":"Authentication.Noauth.Union.validToken","authentication.noauth.union.UnionClient.validTokenWithResponse":"Authentication.Noauth.Union.validToken","authentication.noauth.union.UnionClientBuilder":"Authentication.Noauth.Union"},"generatedFiles":["src/main/java/authentication/noauth/union/UnionAsyncClient.java","src/main/java/authentication/noauth/union/UnionClient.java","src/main/java/authentication/noauth/union/UnionClientBuilder.java","src/main/java/authentication/noauth/union/implementation/UnionClientImpl.java","src/main/java/authentication/noauth/union/implementation/package-info.java","src/main/java/authentication/noauth/union/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"authentication.noauth.union.UnionAsyncClient":"Authentication.Noauth.Union","authentication.noauth.union.UnionAsyncClient.validNoAuth":"Authentication.Noauth.Union.validNoAuth","authentication.noauth.union.UnionAsyncClient.validNoAuthWithResponse":"Authentication.Noauth.Union.validNoAuth","authentication.noauth.union.UnionAsyncClient.validToken":"Authentication.Noauth.Union.validToken","authentication.noauth.union.UnionAsyncClient.validTokenWithResponse":"Authentication.Noauth.Union.validToken","authentication.noauth.union.UnionClient":"Authentication.Noauth.Union","authentication.noauth.union.UnionClient.validNoAuth":"Authentication.Noauth.Union.validNoAuth","authentication.noauth.union.UnionClient.validNoAuthWithResponse":"Authentication.Noauth.Union.validNoAuth","authentication.noauth.union.UnionClient.validToken":"Authentication.Noauth.Union.validToken","authentication.noauth.union.UnionClient.validTokenWithResponse":"Authentication.Noauth.Union.validToken","authentication.noauth.union.UnionClientBuilder":"Authentication.Noauth.Union"},"generatedFiles":["src/main/java/authentication/noauth/union/UnionAsyncClient.java","src/main/java/authentication/noauth/union/UnionClient.java","src/main/java/authentication/noauth/union/UnionClientBuilder.java","src/main/java/authentication/noauth/union/implementation/UnionClientImpl.java","src/main/java/authentication/noauth/union/implementation/package-info.java","src/main/java/authentication/noauth/union/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-oauth2_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-oauth2_apiview_properties.json deleted file mode 100644 index fce42c74766..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-oauth2_apiview_properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "authentication.oauth2.OAuth2AsyncClient": "Authentication.OAuth2", - "authentication.oauth2.OAuth2AsyncClient.invalid": "Authentication.OAuth2.invalid", - "authentication.oauth2.OAuth2AsyncClient.invalidWithResponse": "Authentication.OAuth2.invalid", - "authentication.oauth2.OAuth2AsyncClient.valid": "Authentication.OAuth2.valid", - "authentication.oauth2.OAuth2AsyncClient.validWithResponse": "Authentication.OAuth2.valid", - "authentication.oauth2.OAuth2Client": "Authentication.OAuth2", - "authentication.oauth2.OAuth2Client.invalid": "Authentication.OAuth2.invalid", - "authentication.oauth2.OAuth2Client.invalidWithResponse": "Authentication.OAuth2.invalid", - "authentication.oauth2.OAuth2Client.valid": "Authentication.OAuth2.valid", - "authentication.oauth2.OAuth2Client.validWithResponse": "Authentication.OAuth2.valid", - "authentication.oauth2.OAuth2ClientBuilder": "Authentication.OAuth2" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-oauth2_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-oauth2_metadata.json index bf1691010b7..77c9ee70a21 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-oauth2_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-oauth2_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"authentication.oauth2.OAuth2AsyncClient":"Authentication.OAuth2","authentication.oauth2.OAuth2AsyncClient.invalid":"Authentication.OAuth2.invalid","authentication.oauth2.OAuth2AsyncClient.invalidWithResponse":"Authentication.OAuth2.invalid","authentication.oauth2.OAuth2AsyncClient.valid":"Authentication.OAuth2.valid","authentication.oauth2.OAuth2AsyncClient.validWithResponse":"Authentication.OAuth2.valid","authentication.oauth2.OAuth2Client":"Authentication.OAuth2","authentication.oauth2.OAuth2Client.invalid":"Authentication.OAuth2.invalid","authentication.oauth2.OAuth2Client.invalidWithResponse":"Authentication.OAuth2.invalid","authentication.oauth2.OAuth2Client.valid":"Authentication.OAuth2.valid","authentication.oauth2.OAuth2Client.validWithResponse":"Authentication.OAuth2.valid","authentication.oauth2.OAuth2ClientBuilder":"Authentication.OAuth2"},"generatedFiles":["src/main/java/authentication/oauth2/OAuth2AsyncClient.java","src/main/java/authentication/oauth2/OAuth2Client.java","src/main/java/authentication/oauth2/OAuth2ClientBuilder.java","src/main/java/authentication/oauth2/implementation/OAuth2ClientImpl.java","src/main/java/authentication/oauth2/implementation/package-info.java","src/main/java/authentication/oauth2/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"authentication.oauth2.OAuth2AsyncClient":"Authentication.OAuth2","authentication.oauth2.OAuth2AsyncClient.invalid":"Authentication.OAuth2.invalid","authentication.oauth2.OAuth2AsyncClient.invalidWithResponse":"Authentication.OAuth2.invalid","authentication.oauth2.OAuth2AsyncClient.valid":"Authentication.OAuth2.valid","authentication.oauth2.OAuth2AsyncClient.validWithResponse":"Authentication.OAuth2.valid","authentication.oauth2.OAuth2Client":"Authentication.OAuth2","authentication.oauth2.OAuth2Client.invalid":"Authentication.OAuth2.invalid","authentication.oauth2.OAuth2Client.invalidWithResponse":"Authentication.OAuth2.invalid","authentication.oauth2.OAuth2Client.valid":"Authentication.OAuth2.valid","authentication.oauth2.OAuth2Client.validWithResponse":"Authentication.OAuth2.valid","authentication.oauth2.OAuth2ClientBuilder":"Authentication.OAuth2"},"generatedFiles":["src/main/java/authentication/oauth2/OAuth2AsyncClient.java","src/main/java/authentication/oauth2/OAuth2Client.java","src/main/java/authentication/oauth2/OAuth2ClientBuilder.java","src/main/java/authentication/oauth2/implementation/OAuth2ClientImpl.java","src/main/java/authentication/oauth2/implementation/package-info.java","src/main/java/authentication/oauth2/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-union_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-union_apiview_properties.json deleted file mode 100644 index e1703358e43..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-union_apiview_properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "authentication.union.UnionAsyncClient": "Authentication.Union", - "authentication.union.UnionAsyncClient.validKey": "Authentication.Union.validKey", - "authentication.union.UnionAsyncClient.validKeyWithResponse": "Authentication.Union.validKey", - "authentication.union.UnionAsyncClient.validToken": "Authentication.Union.validToken", - "authentication.union.UnionAsyncClient.validTokenWithResponse": "Authentication.Union.validToken", - "authentication.union.UnionClient": "Authentication.Union", - "authentication.union.UnionClient.validKey": "Authentication.Union.validKey", - "authentication.union.UnionClient.validKeyWithResponse": "Authentication.Union.validKey", - "authentication.union.UnionClient.validToken": "Authentication.Union.validToken", - "authentication.union.UnionClient.validTokenWithResponse": "Authentication.Union.validToken", - "authentication.union.UnionClientBuilder": "Authentication.Union" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-union_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-union_metadata.json index af664fefa6a..ad7336d7651 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-union_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/authentication-union_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"authentication.union.UnionAsyncClient":"Authentication.Union","authentication.union.UnionAsyncClient.validKey":"Authentication.Union.validKey","authentication.union.UnionAsyncClient.validKeyWithResponse":"Authentication.Union.validKey","authentication.union.UnionAsyncClient.validToken":"Authentication.Union.validToken","authentication.union.UnionAsyncClient.validTokenWithResponse":"Authentication.Union.validToken","authentication.union.UnionClient":"Authentication.Union","authentication.union.UnionClient.validKey":"Authentication.Union.validKey","authentication.union.UnionClient.validKeyWithResponse":"Authentication.Union.validKey","authentication.union.UnionClient.validToken":"Authentication.Union.validToken","authentication.union.UnionClient.validTokenWithResponse":"Authentication.Union.validToken","authentication.union.UnionClientBuilder":"Authentication.Union"},"generatedFiles":["src/main/java/authentication/union/UnionAsyncClient.java","src/main/java/authentication/union/UnionClient.java","src/main/java/authentication/union/UnionClientBuilder.java","src/main/java/authentication/union/implementation/UnionClientImpl.java","src/main/java/authentication/union/implementation/package-info.java","src/main/java/authentication/union/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"authentication.union.UnionAsyncClient":"Authentication.Union","authentication.union.UnionAsyncClient.validKey":"Authentication.Union.validKey","authentication.union.UnionAsyncClient.validKeyWithResponse":"Authentication.Union.validKey","authentication.union.UnionAsyncClient.validToken":"Authentication.Union.validToken","authentication.union.UnionAsyncClient.validTokenWithResponse":"Authentication.Union.validToken","authentication.union.UnionClient":"Authentication.Union","authentication.union.UnionClient.validKey":"Authentication.Union.validKey","authentication.union.UnionClient.validKeyWithResponse":"Authentication.Union.validKey","authentication.union.UnionClient.validToken":"Authentication.Union.validToken","authentication.union.UnionClient.validTokenWithResponse":"Authentication.Union.validToken","authentication.union.UnionClientBuilder":"Authentication.Union"},"generatedFiles":["src/main/java/authentication/union/UnionAsyncClient.java","src/main/java/authentication/union/UnionClient.java","src/main/java/authentication/union/UnionClientBuilder.java","src/main/java/authentication/union/implementation/UnionClientImpl.java","src/main/java/authentication/union/implementation/package-info.java","src/main/java/authentication/union/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-access_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-access_apiview_properties.json deleted file mode 100644 index b2ecacca094..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-access_apiview_properties.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.clientgenerator.core.access.AccessClientBuilder": "_Specs_.Azure.ClientGenerator.Core.Access", - "azure.clientgenerator.core.access.InternalOperationAsyncClient": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation", - "azure.clientgenerator.core.access.InternalOperationAsyncClient.internalDecoratorInInternal": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.internalDecoratorInInternal", - "azure.clientgenerator.core.access.InternalOperationAsyncClient.internalDecoratorInInternalWithResponse": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.internalDecoratorInInternal", - "azure.clientgenerator.core.access.InternalOperationAsyncClient.noDecoratorInInternal": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.noDecoratorInInternal", - "azure.clientgenerator.core.access.InternalOperationAsyncClient.noDecoratorInInternalWithResponse": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.noDecoratorInInternal", - "azure.clientgenerator.core.access.InternalOperationAsyncClient.publicDecoratorInInternal": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.publicDecoratorInInternal", - "azure.clientgenerator.core.access.InternalOperationAsyncClient.publicDecoratorInInternalWithResponse": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.publicDecoratorInInternal", - "azure.clientgenerator.core.access.InternalOperationClient": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation", - "azure.clientgenerator.core.access.InternalOperationClient.internalDecoratorInInternal": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.internalDecoratorInInternal", - "azure.clientgenerator.core.access.InternalOperationClient.internalDecoratorInInternalWithResponse": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.internalDecoratorInInternal", - "azure.clientgenerator.core.access.InternalOperationClient.noDecoratorInInternal": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.noDecoratorInInternal", - "azure.clientgenerator.core.access.InternalOperationClient.noDecoratorInInternalWithResponse": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.noDecoratorInInternal", - "azure.clientgenerator.core.access.InternalOperationClient.publicDecoratorInInternal": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.publicDecoratorInInternal", - "azure.clientgenerator.core.access.InternalOperationClient.publicDecoratorInInternalWithResponse": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.publicDecoratorInInternal", - "azure.clientgenerator.core.access.PublicOperationAsyncClient": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation", - "azure.clientgenerator.core.access.PublicOperationAsyncClient.noDecoratorInPublic": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.noDecoratorInPublic", - "azure.clientgenerator.core.access.PublicOperationAsyncClient.noDecoratorInPublicWithResponse": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.noDecoratorInPublic", - "azure.clientgenerator.core.access.PublicOperationAsyncClient.publicDecoratorInPublic": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.publicDecoratorInPublic", - "azure.clientgenerator.core.access.PublicOperationAsyncClient.publicDecoratorInPublicWithResponse": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.publicDecoratorInPublic", - "azure.clientgenerator.core.access.PublicOperationClient": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation", - "azure.clientgenerator.core.access.PublicOperationClient.noDecoratorInPublic": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.noDecoratorInPublic", - "azure.clientgenerator.core.access.PublicOperationClient.noDecoratorInPublicWithResponse": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.noDecoratorInPublic", - "azure.clientgenerator.core.access.PublicOperationClient.publicDecoratorInPublic": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.publicDecoratorInPublic", - "azure.clientgenerator.core.access.PublicOperationClient.publicDecoratorInPublicWithResponse": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.publicDecoratorInPublic", - "azure.clientgenerator.core.access.RelativeModelInOperationAsyncClient": "_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation", - "azure.clientgenerator.core.access.RelativeModelInOperationAsyncClient.discriminator": "_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.discriminator", - "azure.clientgenerator.core.access.RelativeModelInOperationAsyncClient.discriminatorWithResponse": "_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.discriminator", - "azure.clientgenerator.core.access.RelativeModelInOperationAsyncClient.operation": "_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.operation", - "azure.clientgenerator.core.access.RelativeModelInOperationAsyncClient.operationWithResponse": "_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.operation", - "azure.clientgenerator.core.access.RelativeModelInOperationClient": "_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation", - "azure.clientgenerator.core.access.RelativeModelInOperationClient.discriminator": "_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.discriminator", - "azure.clientgenerator.core.access.RelativeModelInOperationClient.discriminatorWithResponse": "_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.discriminator", - "azure.clientgenerator.core.access.RelativeModelInOperationClient.operation": "_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.operation", - "azure.clientgenerator.core.access.RelativeModelInOperationClient.operationWithResponse": "_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.operation", - "azure.clientgenerator.core.access.SharedModelInOperationAsyncClient": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation", - "azure.clientgenerator.core.access.SharedModelInOperationAsyncClient.internal": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.internal", - "azure.clientgenerator.core.access.SharedModelInOperationAsyncClient.internalWithResponse": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.internal", - "azure.clientgenerator.core.access.SharedModelInOperationAsyncClient.publicMethod": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.public", - "azure.clientgenerator.core.access.SharedModelInOperationAsyncClient.publicMethodWithResponse": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.public", - "azure.clientgenerator.core.access.SharedModelInOperationClient": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation", - "azure.clientgenerator.core.access.SharedModelInOperationClient.internal": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.internal", - "azure.clientgenerator.core.access.SharedModelInOperationClient.internalWithResponse": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.internal", - "azure.clientgenerator.core.access.SharedModelInOperationClient.publicMethod": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.public", - "azure.clientgenerator.core.access.SharedModelInOperationClient.publicMethodWithResponse": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.public", - "azure.clientgenerator.core.access.internaloperation.implementation.models.InternalDecoratorModelInInternal": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.InternalDecoratorModelInInternal", - "azure.clientgenerator.core.access.internaloperation.implementation.models.NoDecoratorModelInInternal": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.NoDecoratorModelInInternal", - "azure.clientgenerator.core.access.internaloperation.models.PublicDecoratorModelInInternal": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.PublicDecoratorModelInInternal", - "azure.clientgenerator.core.access.publicoperation.models.NoDecoratorModelInPublic": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.NoDecoratorModelInPublic", - "azure.clientgenerator.core.access.publicoperation.models.PublicDecoratorModelInPublic": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.PublicDecoratorModelInPublic", - "azure.clientgenerator.core.access.relativemodelinoperation.implementation.models.AbstractModel": "_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.AbstractModel", - "azure.clientgenerator.core.access.relativemodelinoperation.implementation.models.BaseModel": "_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.BaseModel", - "azure.clientgenerator.core.access.relativemodelinoperation.implementation.models.InnerModel": "_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.InnerModel", - "azure.clientgenerator.core.access.relativemodelinoperation.implementation.models.OuterModel": "_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.OuterModel", - "azure.clientgenerator.core.access.relativemodelinoperation.implementation.models.RealModel": "_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.RealModel", - "azure.clientgenerator.core.access.sharedmodelinoperation.models.SharedModel": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.SharedModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-access_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-access_metadata.json index 15214167dd7..a4af025a86d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-access_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-access_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.clientgenerator.core.access.AccessClientBuilder":"_Specs_.Azure.ClientGenerator.Core.Access","azure.clientgenerator.core.access.InternalOperationAsyncClient":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation","azure.clientgenerator.core.access.InternalOperationAsyncClient.internalDecoratorInInternal":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.internalDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationAsyncClient.internalDecoratorInInternalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.internalDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationAsyncClient.noDecoratorInInternal":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.noDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationAsyncClient.noDecoratorInInternalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.noDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationAsyncClient.publicDecoratorInInternal":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.publicDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationAsyncClient.publicDecoratorInInternalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.publicDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationClient":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation","azure.clientgenerator.core.access.InternalOperationClient.internalDecoratorInInternal":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.internalDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationClient.internalDecoratorInInternalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.internalDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationClient.noDecoratorInInternal":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.noDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationClient.noDecoratorInInternalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.noDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationClient.publicDecoratorInInternal":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.publicDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationClient.publicDecoratorInInternalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.publicDecoratorInInternal","azure.clientgenerator.core.access.PublicOperationAsyncClient":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation","azure.clientgenerator.core.access.PublicOperationAsyncClient.noDecoratorInPublic":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.noDecoratorInPublic","azure.clientgenerator.core.access.PublicOperationAsyncClient.noDecoratorInPublicWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.noDecoratorInPublic","azure.clientgenerator.core.access.PublicOperationAsyncClient.publicDecoratorInPublic":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.publicDecoratorInPublic","azure.clientgenerator.core.access.PublicOperationAsyncClient.publicDecoratorInPublicWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.publicDecoratorInPublic","azure.clientgenerator.core.access.PublicOperationClient":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation","azure.clientgenerator.core.access.PublicOperationClient.noDecoratorInPublic":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.noDecoratorInPublic","azure.clientgenerator.core.access.PublicOperationClient.noDecoratorInPublicWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.noDecoratorInPublic","azure.clientgenerator.core.access.PublicOperationClient.publicDecoratorInPublic":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.publicDecoratorInPublic","azure.clientgenerator.core.access.PublicOperationClient.publicDecoratorInPublicWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.publicDecoratorInPublic","azure.clientgenerator.core.access.RelativeModelInOperationAsyncClient":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation","azure.clientgenerator.core.access.RelativeModelInOperationAsyncClient.discriminator":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.discriminator","azure.clientgenerator.core.access.RelativeModelInOperationAsyncClient.discriminatorWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.discriminator","azure.clientgenerator.core.access.RelativeModelInOperationAsyncClient.operation":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.operation","azure.clientgenerator.core.access.RelativeModelInOperationAsyncClient.operationWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.operation","azure.clientgenerator.core.access.RelativeModelInOperationClient":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation","azure.clientgenerator.core.access.RelativeModelInOperationClient.discriminator":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.discriminator","azure.clientgenerator.core.access.RelativeModelInOperationClient.discriminatorWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.discriminator","azure.clientgenerator.core.access.RelativeModelInOperationClient.operation":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.operation","azure.clientgenerator.core.access.RelativeModelInOperationClient.operationWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.operation","azure.clientgenerator.core.access.SharedModelInOperationAsyncClient":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation","azure.clientgenerator.core.access.SharedModelInOperationAsyncClient.internal":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.internal","azure.clientgenerator.core.access.SharedModelInOperationAsyncClient.internalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.internal","azure.clientgenerator.core.access.SharedModelInOperationAsyncClient.publicMethod":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.public","azure.clientgenerator.core.access.SharedModelInOperationAsyncClient.publicMethodWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.public","azure.clientgenerator.core.access.SharedModelInOperationClient":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation","azure.clientgenerator.core.access.SharedModelInOperationClient.internal":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.internal","azure.clientgenerator.core.access.SharedModelInOperationClient.internalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.internal","azure.clientgenerator.core.access.SharedModelInOperationClient.publicMethod":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.public","azure.clientgenerator.core.access.SharedModelInOperationClient.publicMethodWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.public","azure.clientgenerator.core.access.internaloperation.implementation.models.InternalDecoratorModelInInternal":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.InternalDecoratorModelInInternal","azure.clientgenerator.core.access.internaloperation.implementation.models.NoDecoratorModelInInternal":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.NoDecoratorModelInInternal","azure.clientgenerator.core.access.internaloperation.models.PublicDecoratorModelInInternal":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.PublicDecoratorModelInInternal","azure.clientgenerator.core.access.publicoperation.models.NoDecoratorModelInPublic":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.NoDecoratorModelInPublic","azure.clientgenerator.core.access.publicoperation.models.PublicDecoratorModelInPublic":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.PublicDecoratorModelInPublic","azure.clientgenerator.core.access.relativemodelinoperation.implementation.models.AbstractModel":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.AbstractModel","azure.clientgenerator.core.access.relativemodelinoperation.implementation.models.BaseModel":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.BaseModel","azure.clientgenerator.core.access.relativemodelinoperation.implementation.models.InnerModel":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.InnerModel","azure.clientgenerator.core.access.relativemodelinoperation.implementation.models.OuterModel":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.OuterModel","azure.clientgenerator.core.access.relativemodelinoperation.implementation.models.RealModel":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.RealModel","azure.clientgenerator.core.access.sharedmodelinoperation.models.SharedModel":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.SharedModel"},"generatedFiles":["src/main/java/azure/clientgenerator/core/access/AccessClientBuilder.java","src/main/java/azure/clientgenerator/core/access/InternalOperationAsyncClient.java","src/main/java/azure/clientgenerator/core/access/InternalOperationClient.java","src/main/java/azure/clientgenerator/core/access/PublicOperationAsyncClient.java","src/main/java/azure/clientgenerator/core/access/PublicOperationClient.java","src/main/java/azure/clientgenerator/core/access/RelativeModelInOperationAsyncClient.java","src/main/java/azure/clientgenerator/core/access/RelativeModelInOperationClient.java","src/main/java/azure/clientgenerator/core/access/SharedModelInOperationAsyncClient.java","src/main/java/azure/clientgenerator/core/access/SharedModelInOperationClient.java","src/main/java/azure/clientgenerator/core/access/implementation/AccessClientImpl.java","src/main/java/azure/clientgenerator/core/access/implementation/InternalOperationsImpl.java","src/main/java/azure/clientgenerator/core/access/implementation/PublicOperationsImpl.java","src/main/java/azure/clientgenerator/core/access/implementation/RelativeModelInOperationsImpl.java","src/main/java/azure/clientgenerator/core/access/implementation/SharedModelInOperationsImpl.java","src/main/java/azure/clientgenerator/core/access/implementation/package-info.java","src/main/java/azure/clientgenerator/core/access/internaloperation/implementation/models/InternalDecoratorModelInInternal.java","src/main/java/azure/clientgenerator/core/access/internaloperation/implementation/models/NoDecoratorModelInInternal.java","src/main/java/azure/clientgenerator/core/access/internaloperation/implementation/models/package-info.java","src/main/java/azure/clientgenerator/core/access/internaloperation/models/PublicDecoratorModelInInternal.java","src/main/java/azure/clientgenerator/core/access/internaloperation/models/package-info.java","src/main/java/azure/clientgenerator/core/access/package-info.java","src/main/java/azure/clientgenerator/core/access/publicoperation/models/NoDecoratorModelInPublic.java","src/main/java/azure/clientgenerator/core/access/publicoperation/models/PublicDecoratorModelInPublic.java","src/main/java/azure/clientgenerator/core/access/publicoperation/models/package-info.java","src/main/java/azure/clientgenerator/core/access/relativemodelinoperation/implementation/models/AbstractModel.java","src/main/java/azure/clientgenerator/core/access/relativemodelinoperation/implementation/models/BaseModel.java","src/main/java/azure/clientgenerator/core/access/relativemodelinoperation/implementation/models/InnerModel.java","src/main/java/azure/clientgenerator/core/access/relativemodelinoperation/implementation/models/OuterModel.java","src/main/java/azure/clientgenerator/core/access/relativemodelinoperation/implementation/models/RealModel.java","src/main/java/azure/clientgenerator/core/access/relativemodelinoperation/implementation/models/package-info.java","src/main/java/azure/clientgenerator/core/access/sharedmodelinoperation/models/SharedModel.java","src/main/java/azure/clientgenerator/core/access/sharedmodelinoperation/models/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.clientgenerator.core.access.AccessClientBuilder":"_Specs_.Azure.ClientGenerator.Core.Access","azure.clientgenerator.core.access.InternalOperationAsyncClient":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation","azure.clientgenerator.core.access.InternalOperationAsyncClient.internalDecoratorInInternal":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.internalDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationAsyncClient.internalDecoratorInInternalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.internalDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationAsyncClient.noDecoratorInInternal":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.noDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationAsyncClient.noDecoratorInInternalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.noDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationAsyncClient.publicDecoratorInInternal":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.publicDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationAsyncClient.publicDecoratorInInternalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.publicDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationClient":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation","azure.clientgenerator.core.access.InternalOperationClient.internalDecoratorInInternal":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.internalDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationClient.internalDecoratorInInternalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.internalDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationClient.noDecoratorInInternal":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.noDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationClient.noDecoratorInInternalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.noDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationClient.publicDecoratorInInternal":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.publicDecoratorInInternal","azure.clientgenerator.core.access.InternalOperationClient.publicDecoratorInInternalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.publicDecoratorInInternal","azure.clientgenerator.core.access.PublicOperationAsyncClient":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation","azure.clientgenerator.core.access.PublicOperationAsyncClient.noDecoratorInPublic":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.noDecoratorInPublic","azure.clientgenerator.core.access.PublicOperationAsyncClient.noDecoratorInPublicWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.noDecoratorInPublic","azure.clientgenerator.core.access.PublicOperationAsyncClient.publicDecoratorInPublic":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.publicDecoratorInPublic","azure.clientgenerator.core.access.PublicOperationAsyncClient.publicDecoratorInPublicWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.publicDecoratorInPublic","azure.clientgenerator.core.access.PublicOperationClient":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation","azure.clientgenerator.core.access.PublicOperationClient.noDecoratorInPublic":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.noDecoratorInPublic","azure.clientgenerator.core.access.PublicOperationClient.noDecoratorInPublicWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.noDecoratorInPublic","azure.clientgenerator.core.access.PublicOperationClient.publicDecoratorInPublic":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.publicDecoratorInPublic","azure.clientgenerator.core.access.PublicOperationClient.publicDecoratorInPublicWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.publicDecoratorInPublic","azure.clientgenerator.core.access.RelativeModelInOperationAsyncClient":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation","azure.clientgenerator.core.access.RelativeModelInOperationAsyncClient.discriminator":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.discriminator","azure.clientgenerator.core.access.RelativeModelInOperationAsyncClient.discriminatorWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.discriminator","azure.clientgenerator.core.access.RelativeModelInOperationAsyncClient.operation":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.operation","azure.clientgenerator.core.access.RelativeModelInOperationAsyncClient.operationWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.operation","azure.clientgenerator.core.access.RelativeModelInOperationClient":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation","azure.clientgenerator.core.access.RelativeModelInOperationClient.discriminator":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.discriminator","azure.clientgenerator.core.access.RelativeModelInOperationClient.discriminatorWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.discriminator","azure.clientgenerator.core.access.RelativeModelInOperationClient.operation":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.operation","azure.clientgenerator.core.access.RelativeModelInOperationClient.operationWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.operation","azure.clientgenerator.core.access.SharedModelInOperationAsyncClient":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation","azure.clientgenerator.core.access.SharedModelInOperationAsyncClient.internal":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.internal","azure.clientgenerator.core.access.SharedModelInOperationAsyncClient.internalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.internal","azure.clientgenerator.core.access.SharedModelInOperationAsyncClient.publicMethod":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.public","azure.clientgenerator.core.access.SharedModelInOperationAsyncClient.publicMethodWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.public","azure.clientgenerator.core.access.SharedModelInOperationClient":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation","azure.clientgenerator.core.access.SharedModelInOperationClient.internal":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.internal","azure.clientgenerator.core.access.SharedModelInOperationClient.internalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.internal","azure.clientgenerator.core.access.SharedModelInOperationClient.publicMethod":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.public","azure.clientgenerator.core.access.SharedModelInOperationClient.publicMethodWithResponse":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.public","azure.clientgenerator.core.access.internaloperation.implementation.models.InternalDecoratorModelInInternal":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.InternalDecoratorModelInInternal","azure.clientgenerator.core.access.internaloperation.implementation.models.NoDecoratorModelInInternal":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.NoDecoratorModelInInternal","azure.clientgenerator.core.access.internaloperation.models.PublicDecoratorModelInInternal":"_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.PublicDecoratorModelInInternal","azure.clientgenerator.core.access.publicoperation.models.NoDecoratorModelInPublic":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.NoDecoratorModelInPublic","azure.clientgenerator.core.access.publicoperation.models.PublicDecoratorModelInPublic":"_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.PublicDecoratorModelInPublic","azure.clientgenerator.core.access.relativemodelinoperation.implementation.models.AbstractModel":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.AbstractModel","azure.clientgenerator.core.access.relativemodelinoperation.implementation.models.BaseModel":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.BaseModel","azure.clientgenerator.core.access.relativemodelinoperation.implementation.models.InnerModel":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.InnerModel","azure.clientgenerator.core.access.relativemodelinoperation.implementation.models.OuterModel":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.OuterModel","azure.clientgenerator.core.access.relativemodelinoperation.implementation.models.RealModel":"_Specs_.Azure.ClientGenerator.Core.Access.RelativeModelInOperation.RealModel","azure.clientgenerator.core.access.sharedmodelinoperation.models.SharedModel":"_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.SharedModel"},"generatedFiles":["src/main/java/azure/clientgenerator/core/access/AccessClientBuilder.java","src/main/java/azure/clientgenerator/core/access/InternalOperationAsyncClient.java","src/main/java/azure/clientgenerator/core/access/InternalOperationClient.java","src/main/java/azure/clientgenerator/core/access/PublicOperationAsyncClient.java","src/main/java/azure/clientgenerator/core/access/PublicOperationClient.java","src/main/java/azure/clientgenerator/core/access/RelativeModelInOperationAsyncClient.java","src/main/java/azure/clientgenerator/core/access/RelativeModelInOperationClient.java","src/main/java/azure/clientgenerator/core/access/SharedModelInOperationAsyncClient.java","src/main/java/azure/clientgenerator/core/access/SharedModelInOperationClient.java","src/main/java/azure/clientgenerator/core/access/implementation/AccessClientImpl.java","src/main/java/azure/clientgenerator/core/access/implementation/InternalOperationsImpl.java","src/main/java/azure/clientgenerator/core/access/implementation/PublicOperationsImpl.java","src/main/java/azure/clientgenerator/core/access/implementation/RelativeModelInOperationsImpl.java","src/main/java/azure/clientgenerator/core/access/implementation/SharedModelInOperationsImpl.java","src/main/java/azure/clientgenerator/core/access/implementation/package-info.java","src/main/java/azure/clientgenerator/core/access/internaloperation/implementation/models/InternalDecoratorModelInInternal.java","src/main/java/azure/clientgenerator/core/access/internaloperation/implementation/models/NoDecoratorModelInInternal.java","src/main/java/azure/clientgenerator/core/access/internaloperation/implementation/models/package-info.java","src/main/java/azure/clientgenerator/core/access/internaloperation/models/PublicDecoratorModelInInternal.java","src/main/java/azure/clientgenerator/core/access/internaloperation/models/package-info.java","src/main/java/azure/clientgenerator/core/access/package-info.java","src/main/java/azure/clientgenerator/core/access/publicoperation/models/NoDecoratorModelInPublic.java","src/main/java/azure/clientgenerator/core/access/publicoperation/models/PublicDecoratorModelInPublic.java","src/main/java/azure/clientgenerator/core/access/publicoperation/models/package-info.java","src/main/java/azure/clientgenerator/core/access/relativemodelinoperation/implementation/models/AbstractModel.java","src/main/java/azure/clientgenerator/core/access/relativemodelinoperation/implementation/models/BaseModel.java","src/main/java/azure/clientgenerator/core/access/relativemodelinoperation/implementation/models/InnerModel.java","src/main/java/azure/clientgenerator/core/access/relativemodelinoperation/implementation/models/OuterModel.java","src/main/java/azure/clientgenerator/core/access/relativemodelinoperation/implementation/models/RealModel.java","src/main/java/azure/clientgenerator/core/access/relativemodelinoperation/implementation/models/package-info.java","src/main/java/azure/clientgenerator/core/access/sharedmodelinoperation/models/SharedModel.java","src/main/java/azure/clientgenerator/core/access/sharedmodelinoperation/models/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-alternatetype_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-alternatetype_apiview_properties.json deleted file mode 100644 index 7c00ee0f7d6..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-alternatetype_apiview_properties.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType", - "azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.getModel": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getModel", - "azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.getModelWithResponse": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getModel", - "azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.getProperty": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getProperty", - "azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.getPropertyWithResponse": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getProperty", - "azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.putModel": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putModel", - "azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.putModelWithResponse": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putModel", - "azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.putProperty": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putProperty", - "azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.putPropertyWithResponse": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putProperty", - "azure.clientgenerator.core.alternatetype.AlternateTypeClient": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType", - "azure.clientgenerator.core.alternatetype.AlternateTypeClient.getModel": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getModel", - "azure.clientgenerator.core.alternatetype.AlternateTypeClient.getModelWithResponse": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getModel", - "azure.clientgenerator.core.alternatetype.AlternateTypeClient.getProperty": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getProperty", - "azure.clientgenerator.core.alternatetype.AlternateTypeClient.getPropertyWithResponse": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getProperty", - "azure.clientgenerator.core.alternatetype.AlternateTypeClient.putModel": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putModel", - "azure.clientgenerator.core.alternatetype.AlternateTypeClient.putModelWithResponse": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putModel", - "azure.clientgenerator.core.alternatetype.AlternateTypeClient.putProperty": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putProperty", - "azure.clientgenerator.core.alternatetype.AlternateTypeClient.putPropertyWithResponse": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putProperty", - "azure.clientgenerator.core.alternatetype.AlternateTypeClientBuilder": "_Specs_.Azure.ClientGenerator.Core.AlternateType", - "azure.clientgenerator.core.alternatetype.externaltype.models.ModelWithFeatureProperty": "_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.ModelWithFeatureProperty" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-alternatetype_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-alternatetype_metadata.json index fb0167e921f..48970099be9 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-alternatetype_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-alternatetype_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType","azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.getModel":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getModel","azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.getModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getModel","azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.getProperty":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getProperty","azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.getPropertyWithResponse":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getProperty","azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.putModel":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putModel","azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.putModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putModel","azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.putProperty":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putProperty","azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.putPropertyWithResponse":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putProperty","azure.clientgenerator.core.alternatetype.AlternateTypeClient":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType","azure.clientgenerator.core.alternatetype.AlternateTypeClient.getModel":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getModel","azure.clientgenerator.core.alternatetype.AlternateTypeClient.getModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getModel","azure.clientgenerator.core.alternatetype.AlternateTypeClient.getProperty":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getProperty","azure.clientgenerator.core.alternatetype.AlternateTypeClient.getPropertyWithResponse":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getProperty","azure.clientgenerator.core.alternatetype.AlternateTypeClient.putModel":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putModel","azure.clientgenerator.core.alternatetype.AlternateTypeClient.putModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putModel","azure.clientgenerator.core.alternatetype.AlternateTypeClient.putProperty":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putProperty","azure.clientgenerator.core.alternatetype.AlternateTypeClient.putPropertyWithResponse":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putProperty","azure.clientgenerator.core.alternatetype.AlternateTypeClientBuilder":"_Specs_.Azure.ClientGenerator.Core.AlternateType","azure.clientgenerator.core.alternatetype.externaltype.models.ModelWithFeatureProperty":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.ModelWithFeatureProperty"},"generatedFiles":["src/main/java/azure/clientgenerator/core/alternatetype/AlternateTypeAsyncClient.java","src/main/java/azure/clientgenerator/core/alternatetype/AlternateTypeClient.java","src/main/java/azure/clientgenerator/core/alternatetype/AlternateTypeClientBuilder.java","src/main/java/azure/clientgenerator/core/alternatetype/externaltype/models/ModelWithFeatureProperty.java","src/main/java/azure/clientgenerator/core/alternatetype/externaltype/models/package-info.java","src/main/java/azure/clientgenerator/core/alternatetype/implementation/AlternateTypeClientImpl.java","src/main/java/azure/clientgenerator/core/alternatetype/implementation/ExternalTypesImpl.java","src/main/java/azure/clientgenerator/core/alternatetype/implementation/package-info.java","src/main/java/azure/clientgenerator/core/alternatetype/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType","azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.getModel":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getModel","azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.getModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getModel","azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.getProperty":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getProperty","azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.getPropertyWithResponse":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getProperty","azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.putModel":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putModel","azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.putModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putModel","azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.putProperty":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putProperty","azure.clientgenerator.core.alternatetype.AlternateTypeAsyncClient.putPropertyWithResponse":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putProperty","azure.clientgenerator.core.alternatetype.AlternateTypeClient":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType","azure.clientgenerator.core.alternatetype.AlternateTypeClient.getModel":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getModel","azure.clientgenerator.core.alternatetype.AlternateTypeClient.getModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getModel","azure.clientgenerator.core.alternatetype.AlternateTypeClient.getProperty":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getProperty","azure.clientgenerator.core.alternatetype.AlternateTypeClient.getPropertyWithResponse":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.getProperty","azure.clientgenerator.core.alternatetype.AlternateTypeClient.putModel":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putModel","azure.clientgenerator.core.alternatetype.AlternateTypeClient.putModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putModel","azure.clientgenerator.core.alternatetype.AlternateTypeClient.putProperty":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putProperty","azure.clientgenerator.core.alternatetype.AlternateTypeClient.putPropertyWithResponse":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.putProperty","azure.clientgenerator.core.alternatetype.AlternateTypeClientBuilder":"_Specs_.Azure.ClientGenerator.Core.AlternateType","azure.clientgenerator.core.alternatetype.externaltype.models.ModelWithFeatureProperty":"_Specs_.Azure.ClientGenerator.Core.AlternateType.ExternalType.ModelWithFeatureProperty"},"generatedFiles":["src/main/java/azure/clientgenerator/core/alternatetype/AlternateTypeAsyncClient.java","src/main/java/azure/clientgenerator/core/alternatetype/AlternateTypeClient.java","src/main/java/azure/clientgenerator/core/alternatetype/AlternateTypeClientBuilder.java","src/main/java/azure/clientgenerator/core/alternatetype/externaltype/models/ModelWithFeatureProperty.java","src/main/java/azure/clientgenerator/core/alternatetype/externaltype/models/package-info.java","src/main/java/azure/clientgenerator/core/alternatetype/implementation/AlternateTypeClientImpl.java","src/main/java/azure/clientgenerator/core/alternatetype/implementation/ExternalTypesImpl.java","src/main/java/azure/clientgenerator/core/alternatetype/implementation/package-info.java","src/main/java/azure/clientgenerator/core/alternatetype/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-header_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-header_apiview_properties.json deleted file mode 100644 index a8c48566d57..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-header_apiview_properties.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.clientgenerator.core.apiversion.header.HeaderAsyncClient": "Client.AlternateApiVersion.Service.Header", - "azure.clientgenerator.core.apiversion.header.HeaderAsyncClient.headerApiVersion": "Client.AlternateApiVersion.Service.Header.headerApiVersion", - "azure.clientgenerator.core.apiversion.header.HeaderAsyncClient.headerApiVersionWithResponse": "Client.AlternateApiVersion.Service.Header.headerApiVersion", - "azure.clientgenerator.core.apiversion.header.HeaderClient": "Client.AlternateApiVersion.Service.Header", - "azure.clientgenerator.core.apiversion.header.HeaderClient.headerApiVersion": "Client.AlternateApiVersion.Service.Header.headerApiVersion", - "azure.clientgenerator.core.apiversion.header.HeaderClient.headerApiVersionWithResponse": "Client.AlternateApiVersion.Service.Header.headerApiVersion", - "azure.clientgenerator.core.apiversion.header.HeaderClientBuilder": "Client.AlternateApiVersion.Service.Header" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-header_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-header_metadata.json index 7fc6eb21f72..d44c8154d1e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-header_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-header_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2025-01-01","crossLanguageDefinitions":{"azure.clientgenerator.core.apiversion.header.HeaderAsyncClient":"Client.AlternateApiVersion.Service.Header","azure.clientgenerator.core.apiversion.header.HeaderAsyncClient.headerApiVersion":"Client.AlternateApiVersion.Service.Header.headerApiVersion","azure.clientgenerator.core.apiversion.header.HeaderAsyncClient.headerApiVersionWithResponse":"Client.AlternateApiVersion.Service.Header.headerApiVersion","azure.clientgenerator.core.apiversion.header.HeaderClient":"Client.AlternateApiVersion.Service.Header","azure.clientgenerator.core.apiversion.header.HeaderClient.headerApiVersion":"Client.AlternateApiVersion.Service.Header.headerApiVersion","azure.clientgenerator.core.apiversion.header.HeaderClient.headerApiVersionWithResponse":"Client.AlternateApiVersion.Service.Header.headerApiVersion","azure.clientgenerator.core.apiversion.header.HeaderClientBuilder":"Client.AlternateApiVersion.Service.Header"},"generatedFiles":["src/main/java/azure/clientgenerator/core/apiversion/header/HeaderAsyncClient.java","src/main/java/azure/clientgenerator/core/apiversion/header/HeaderClient.java","src/main/java/azure/clientgenerator/core/apiversion/header/HeaderClientBuilder.java","src/main/java/azure/clientgenerator/core/apiversion/header/HeaderServiceVersion.java","src/main/java/azure/clientgenerator/core/apiversion/header/implementation/HeaderClientImpl.java","src/main/java/azure/clientgenerator/core/apiversion/header/implementation/package-info.java","src/main/java/azure/clientgenerator/core/apiversion/header/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Client.AlternateApiVersion.Service.Header":"2025-01-01"},"crossLanguageDefinitions":{"azure.clientgenerator.core.apiversion.header.HeaderAsyncClient":"Client.AlternateApiVersion.Service.Header","azure.clientgenerator.core.apiversion.header.HeaderAsyncClient.headerApiVersion":"Client.AlternateApiVersion.Service.Header.headerApiVersion","azure.clientgenerator.core.apiversion.header.HeaderAsyncClient.headerApiVersionWithResponse":"Client.AlternateApiVersion.Service.Header.headerApiVersion","azure.clientgenerator.core.apiversion.header.HeaderClient":"Client.AlternateApiVersion.Service.Header","azure.clientgenerator.core.apiversion.header.HeaderClient.headerApiVersion":"Client.AlternateApiVersion.Service.Header.headerApiVersion","azure.clientgenerator.core.apiversion.header.HeaderClient.headerApiVersionWithResponse":"Client.AlternateApiVersion.Service.Header.headerApiVersion","azure.clientgenerator.core.apiversion.header.HeaderClientBuilder":"Client.AlternateApiVersion.Service.Header"},"generatedFiles":["src/main/java/azure/clientgenerator/core/apiversion/header/HeaderAsyncClient.java","src/main/java/azure/clientgenerator/core/apiversion/header/HeaderClient.java","src/main/java/azure/clientgenerator/core/apiversion/header/HeaderClientBuilder.java","src/main/java/azure/clientgenerator/core/apiversion/header/HeaderServiceVersion.java","src/main/java/azure/clientgenerator/core/apiversion/header/implementation/HeaderClientImpl.java","src/main/java/azure/clientgenerator/core/apiversion/header/implementation/package-info.java","src/main/java/azure/clientgenerator/core/apiversion/header/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-path_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-path_apiview_properties.json deleted file mode 100644 index 01e17170519..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-path_apiview_properties.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.clientgenerator.core.apiversion.path.PathAsyncClient": "Client.AlternateApiVersion.Service.Path", - "azure.clientgenerator.core.apiversion.path.PathAsyncClient.pathApiVersion": "Client.AlternateApiVersion.Service.Path.pathApiVersion", - "azure.clientgenerator.core.apiversion.path.PathAsyncClient.pathApiVersionWithResponse": "Client.AlternateApiVersion.Service.Path.pathApiVersion", - "azure.clientgenerator.core.apiversion.path.PathClient": "Client.AlternateApiVersion.Service.Path", - "azure.clientgenerator.core.apiversion.path.PathClient.pathApiVersion": "Client.AlternateApiVersion.Service.Path.pathApiVersion", - "azure.clientgenerator.core.apiversion.path.PathClient.pathApiVersionWithResponse": "Client.AlternateApiVersion.Service.Path.pathApiVersion", - "azure.clientgenerator.core.apiversion.path.PathClientBuilder": "Client.AlternateApiVersion.Service.Path" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-path_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-path_metadata.json index 48a19a365c1..48dfa6886bb 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-path_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-path_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2025-01-01","crossLanguageDefinitions":{"azure.clientgenerator.core.apiversion.path.PathAsyncClient":"Client.AlternateApiVersion.Service.Path","azure.clientgenerator.core.apiversion.path.PathAsyncClient.pathApiVersion":"Client.AlternateApiVersion.Service.Path.pathApiVersion","azure.clientgenerator.core.apiversion.path.PathAsyncClient.pathApiVersionWithResponse":"Client.AlternateApiVersion.Service.Path.pathApiVersion","azure.clientgenerator.core.apiversion.path.PathClient":"Client.AlternateApiVersion.Service.Path","azure.clientgenerator.core.apiversion.path.PathClient.pathApiVersion":"Client.AlternateApiVersion.Service.Path.pathApiVersion","azure.clientgenerator.core.apiversion.path.PathClient.pathApiVersionWithResponse":"Client.AlternateApiVersion.Service.Path.pathApiVersion","azure.clientgenerator.core.apiversion.path.PathClientBuilder":"Client.AlternateApiVersion.Service.Path"},"generatedFiles":["src/main/java/azure/clientgenerator/core/apiversion/path/PathAsyncClient.java","src/main/java/azure/clientgenerator/core/apiversion/path/PathClient.java","src/main/java/azure/clientgenerator/core/apiversion/path/PathClientBuilder.java","src/main/java/azure/clientgenerator/core/apiversion/path/PathServiceVersion.java","src/main/java/azure/clientgenerator/core/apiversion/path/implementation/PathClientImpl.java","src/main/java/azure/clientgenerator/core/apiversion/path/implementation/package-info.java","src/main/java/azure/clientgenerator/core/apiversion/path/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Client.AlternateApiVersion.Service.Path":"2025-01-01"},"crossLanguageDefinitions":{"azure.clientgenerator.core.apiversion.path.PathAsyncClient":"Client.AlternateApiVersion.Service.Path","azure.clientgenerator.core.apiversion.path.PathAsyncClient.pathApiVersion":"Client.AlternateApiVersion.Service.Path.pathApiVersion","azure.clientgenerator.core.apiversion.path.PathAsyncClient.pathApiVersionWithResponse":"Client.AlternateApiVersion.Service.Path.pathApiVersion","azure.clientgenerator.core.apiversion.path.PathClient":"Client.AlternateApiVersion.Service.Path","azure.clientgenerator.core.apiversion.path.PathClient.pathApiVersion":"Client.AlternateApiVersion.Service.Path.pathApiVersion","azure.clientgenerator.core.apiversion.path.PathClient.pathApiVersionWithResponse":"Client.AlternateApiVersion.Service.Path.pathApiVersion","azure.clientgenerator.core.apiversion.path.PathClientBuilder":"Client.AlternateApiVersion.Service.Path"},"generatedFiles":["src/main/java/azure/clientgenerator/core/apiversion/path/PathAsyncClient.java","src/main/java/azure/clientgenerator/core/apiversion/path/PathClient.java","src/main/java/azure/clientgenerator/core/apiversion/path/PathClientBuilder.java","src/main/java/azure/clientgenerator/core/apiversion/path/PathServiceVersion.java","src/main/java/azure/clientgenerator/core/apiversion/path/implementation/PathClientImpl.java","src/main/java/azure/clientgenerator/core/apiversion/path/implementation/package-info.java","src/main/java/azure/clientgenerator/core/apiversion/path/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-query_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-query_apiview_properties.json deleted file mode 100644 index ab6b566870b..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-query_apiview_properties.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.clientgenerator.core.apiversion.query.QueryAsyncClient": "Client.AlternateApiVersion.Service.Query", - "azure.clientgenerator.core.apiversion.query.QueryAsyncClient.queryApiVersion": "Client.AlternateApiVersion.Service.Query.queryApiVersion", - "azure.clientgenerator.core.apiversion.query.QueryAsyncClient.queryApiVersionWithResponse": "Client.AlternateApiVersion.Service.Query.queryApiVersion", - "azure.clientgenerator.core.apiversion.query.QueryClient": "Client.AlternateApiVersion.Service.Query", - "azure.clientgenerator.core.apiversion.query.QueryClient.queryApiVersion": "Client.AlternateApiVersion.Service.Query.queryApiVersion", - "azure.clientgenerator.core.apiversion.query.QueryClient.queryApiVersionWithResponse": "Client.AlternateApiVersion.Service.Query.queryApiVersion", - "azure.clientgenerator.core.apiversion.query.QueryClientBuilder": "Client.AlternateApiVersion.Service.Query" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-query_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-query_metadata.json index 2f0a64f5572..339179023c5 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-query_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-apiversion-query_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2025-01-01","crossLanguageDefinitions":{"azure.clientgenerator.core.apiversion.query.QueryAsyncClient":"Client.AlternateApiVersion.Service.Query","azure.clientgenerator.core.apiversion.query.QueryAsyncClient.queryApiVersion":"Client.AlternateApiVersion.Service.Query.queryApiVersion","azure.clientgenerator.core.apiversion.query.QueryAsyncClient.queryApiVersionWithResponse":"Client.AlternateApiVersion.Service.Query.queryApiVersion","azure.clientgenerator.core.apiversion.query.QueryClient":"Client.AlternateApiVersion.Service.Query","azure.clientgenerator.core.apiversion.query.QueryClient.queryApiVersion":"Client.AlternateApiVersion.Service.Query.queryApiVersion","azure.clientgenerator.core.apiversion.query.QueryClient.queryApiVersionWithResponse":"Client.AlternateApiVersion.Service.Query.queryApiVersion","azure.clientgenerator.core.apiversion.query.QueryClientBuilder":"Client.AlternateApiVersion.Service.Query"},"generatedFiles":["src/main/java/azure/clientgenerator/core/apiversion/query/QueryAsyncClient.java","src/main/java/azure/clientgenerator/core/apiversion/query/QueryClient.java","src/main/java/azure/clientgenerator/core/apiversion/query/QueryClientBuilder.java","src/main/java/azure/clientgenerator/core/apiversion/query/QueryServiceVersion.java","src/main/java/azure/clientgenerator/core/apiversion/query/implementation/QueryClientImpl.java","src/main/java/azure/clientgenerator/core/apiversion/query/implementation/package-info.java","src/main/java/azure/clientgenerator/core/apiversion/query/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Client.AlternateApiVersion.Service.Query":"2025-01-01"},"crossLanguageDefinitions":{"azure.clientgenerator.core.apiversion.query.QueryAsyncClient":"Client.AlternateApiVersion.Service.Query","azure.clientgenerator.core.apiversion.query.QueryAsyncClient.queryApiVersion":"Client.AlternateApiVersion.Service.Query.queryApiVersion","azure.clientgenerator.core.apiversion.query.QueryAsyncClient.queryApiVersionWithResponse":"Client.AlternateApiVersion.Service.Query.queryApiVersion","azure.clientgenerator.core.apiversion.query.QueryClient":"Client.AlternateApiVersion.Service.Query","azure.clientgenerator.core.apiversion.query.QueryClient.queryApiVersion":"Client.AlternateApiVersion.Service.Query.queryApiVersion","azure.clientgenerator.core.apiversion.query.QueryClient.queryApiVersionWithResponse":"Client.AlternateApiVersion.Service.Query.queryApiVersion","azure.clientgenerator.core.apiversion.query.QueryClientBuilder":"Client.AlternateApiVersion.Service.Query"},"generatedFiles":["src/main/java/azure/clientgenerator/core/apiversion/query/QueryAsyncClient.java","src/main/java/azure/clientgenerator/core/apiversion/query/QueryClient.java","src/main/java/azure/clientgenerator/core/apiversion/query/QueryClientBuilder.java","src/main/java/azure/clientgenerator/core/apiversion/query/QueryServiceVersion.java","src/main/java/azure/clientgenerator/core/apiversion/query/implementation/QueryClientImpl.java","src/main/java/azure/clientgenerator/core/apiversion/query/implementation/package-info.java","src/main/java/azure/clientgenerator/core/apiversion/query/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientdefaultvalue_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientdefaultvalue_apiview_properties.json deleted file mode 100644 index 01828510f90..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientdefaultvalue_apiview_properties.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue", - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.getHeaderParameter": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getHeaderParameter", - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.getHeaderParameterWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getHeaderParameter", - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.getOperationParameter": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getOperationParameter", - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.getOperationParameterWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getOperationParameter", - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.getPathParameter": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getPathParameter", - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.getPathParameterWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getPathParameter", - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.putModelProperty": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.putModelProperty", - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.putModelPropertyWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.putModelProperty", - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue", - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.getHeaderParameter": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getHeaderParameter", - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.getHeaderParameterWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getHeaderParameter", - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.getOperationParameter": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getOperationParameter", - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.getOperationParameterWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getOperationParameter", - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.getPathParameter": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getPathParameter", - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.getPathParameterWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getPathParameter", - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.putModelProperty": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.putModelProperty", - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.putModelPropertyWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.putModelProperty", - "azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClientBuilder": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue", - "azure.clientgenerator.core.clientdefaultvalue.models.ModelWithDefaultValues": "_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.ModelWithDefaultValues" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientdefaultvalue_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientdefaultvalue_metadata.json index ba04e5b0f28..650f831d114 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientdefaultvalue_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientdefaultvalue_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.getHeaderParameter":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getHeaderParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.getHeaderParameterWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getHeaderParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.getOperationParameter":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getOperationParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.getOperationParameterWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getOperationParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.getPathParameter":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getPathParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.getPathParameterWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getPathParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.putModelProperty":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.putModelProperty","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.putModelPropertyWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.putModelProperty","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.getHeaderParameter":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getHeaderParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.getHeaderParameterWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getHeaderParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.getOperationParameter":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getOperationParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.getOperationParameterWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getOperationParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.getPathParameter":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getPathParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.getPathParameterWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getPathParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.putModelProperty":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.putModelProperty","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.putModelPropertyWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.putModelProperty","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue","azure.clientgenerator.core.clientdefaultvalue.models.ModelWithDefaultValues":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.ModelWithDefaultValues"},"generatedFiles":["src/main/java/azure/clientgenerator/core/clientdefaultvalue/ClientDefaultValueAsyncClient.java","src/main/java/azure/clientgenerator/core/clientdefaultvalue/ClientDefaultValueClient.java","src/main/java/azure/clientgenerator/core/clientdefaultvalue/ClientDefaultValueClientBuilder.java","src/main/java/azure/clientgenerator/core/clientdefaultvalue/implementation/ClientDefaultValueClientImpl.java","src/main/java/azure/clientgenerator/core/clientdefaultvalue/implementation/package-info.java","src/main/java/azure/clientgenerator/core/clientdefaultvalue/models/ModelWithDefaultValues.java","src/main/java/azure/clientgenerator/core/clientdefaultvalue/models/package-info.java","src/main/java/azure/clientgenerator/core/clientdefaultvalue/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.getHeaderParameter":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getHeaderParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.getHeaderParameterWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getHeaderParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.getOperationParameter":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getOperationParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.getOperationParameterWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getOperationParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.getPathParameter":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getPathParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.getPathParameterWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getPathParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.putModelProperty":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.putModelProperty","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueAsyncClient.putModelPropertyWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.putModelProperty","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.getHeaderParameter":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getHeaderParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.getHeaderParameterWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getHeaderParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.getOperationParameter":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getOperationParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.getOperationParameterWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getOperationParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.getPathParameter":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getPathParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.getPathParameterWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.getPathParameter","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.putModelProperty":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.putModelProperty","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClient.putModelPropertyWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.putModelProperty","azure.clientgenerator.core.clientdefaultvalue.ClientDefaultValueClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue","azure.clientgenerator.core.clientdefaultvalue.models.ModelWithDefaultValues":"_Specs_.Azure.ClientGenerator.Core.ClientDefaultValue.ModelWithDefaultValues"},"generatedFiles":["src/main/java/azure/clientgenerator/core/clientdefaultvalue/ClientDefaultValueAsyncClient.java","src/main/java/azure/clientgenerator/core/clientdefaultvalue/ClientDefaultValueClient.java","src/main/java/azure/clientgenerator/core/clientdefaultvalue/ClientDefaultValueClientBuilder.java","src/main/java/azure/clientgenerator/core/clientdefaultvalue/implementation/ClientDefaultValueClientImpl.java","src/main/java/azure/clientgenerator/core/clientdefaultvalue/implementation/package-info.java","src/main/java/azure/clientgenerator/core/clientdefaultvalue/models/ModelWithDefaultValues.java","src/main/java/azure/clientgenerator/core/clientdefaultvalue/models/package-info.java","src/main/java/azure/clientgenerator/core/clientdefaultvalue/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientinitialization-defaultclient_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientinitialization-defaultclient_metadata.json new file mode 100644 index 00000000000..82030c59cda --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientinitialization-defaultclient_metadata.json @@ -0,0 +1 @@ +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.HeaderParam","azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamAsyncClient.withBody":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.HeaderParam.withBody","azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamAsyncClient.withBodyWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.HeaderParam.withBody","azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.HeaderParam.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.HeaderParam.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.HeaderParam","azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamClient.withBody":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.HeaderParam.withBody","azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamClient.withBodyWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.HeaderParam.withBody","azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.HeaderParam.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.HeaderParam.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.HeaderParam","azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MixedParams","azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsAsyncClient.withBody":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MixedParams.withBody","azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsAsyncClient.withBodyWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MixedParams.withBody","azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MixedParams.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MixedParams.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MixedParams","azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsClient.withBody":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MixedParams.withBody","azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsClient.withBodyWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MixedParams.withBody","azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MixedParams.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MixedParams.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MixedParams","azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MultipleParams","azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsAsyncClient.withBody":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MultipleParams.withBody","azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsAsyncClient.withBodyWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MultipleParams.withBody","azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MultipleParams.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MultipleParams.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MultipleParams","azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsClient.withBody":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MultipleParams.withBody","azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsClient.withBodyWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MultipleParams.withBody","azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MultipleParams.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MultipleParams.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.MultipleParams","azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.ParamAlias","azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasAsyncClient.withAliasedName":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.ParamAlias.withAliasedName","azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasAsyncClient.withAliasedNameWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.ParamAlias.withAliasedName","azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasAsyncClient.withOriginalName":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.ParamAlias.withOriginalName","azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasAsyncClient.withOriginalNameWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.ParamAlias.withOriginalName","azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.ParamAlias","azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasClient.withAliasedName":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.ParamAlias.withAliasedName","azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasClient.withAliasedNameWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.ParamAlias.withAliasedName","azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasClient.withOriginalName":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.ParamAlias.withOriginalName","azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasClient.withOriginalNameWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.ParamAlias.withOriginalName","azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.ParamAlias","azure.clientgenerator.core.clientinitialization.defaultclient.PathParamAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.PathParam","azure.clientgenerator.core.clientinitialization.defaultclient.PathParamAsyncClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.PathParam.deleteStandalone","azure.clientgenerator.core.clientinitialization.defaultclient.PathParamAsyncClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.PathParam.deleteStandalone","azure.clientgenerator.core.clientinitialization.defaultclient.PathParamAsyncClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.PathParam.getStandalone","azure.clientgenerator.core.clientinitialization.defaultclient.PathParamAsyncClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.PathParam.getStandalone","azure.clientgenerator.core.clientinitialization.defaultclient.PathParamAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.PathParam.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.PathParamAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.PathParam.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.PathParamClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.PathParam","azure.clientgenerator.core.clientinitialization.defaultclient.PathParamClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.PathParam.deleteStandalone","azure.clientgenerator.core.clientinitialization.defaultclient.PathParamClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.PathParam.deleteStandalone","azure.clientgenerator.core.clientinitialization.defaultclient.PathParamClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.PathParam.getStandalone","azure.clientgenerator.core.clientinitialization.defaultclient.PathParamClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.PathParam.getStandalone","azure.clientgenerator.core.clientinitialization.defaultclient.PathParamClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.PathParam.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.PathParamClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.PathParam.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.PathParamClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.PathParam","azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.QueryParam","azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamAsyncClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.QueryParam.deleteStandalone","azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamAsyncClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.QueryParam.deleteStandalone","azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamAsyncClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.QueryParam.getStandalone","azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamAsyncClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.QueryParam.getStandalone","azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.QueryParam.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.QueryParam.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.QueryParam","azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.QueryParam.deleteStandalone","azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.QueryParam.deleteStandalone","azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.QueryParam.getStandalone","azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.QueryParam.getStandalone","azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.QueryParam.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.QueryParam.withQuery","azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.QueryParam","azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.BlobProperties","azure.clientgenerator.core.clientinitialization.defaultclient.models.Input":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.Input","azure.clientgenerator.core.clientinitialization.defaultclient.models.WithBodyRequest":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.DefaultClient.withBody.Request.anonymous"},"generatedFiles":["src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/ParamAliasClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/package-info.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/BlobProperties.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/Input.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/WithBodyRequest.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/package-info.java","src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientinitialization-individuallyclient_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientinitialization-individuallyclient_metadata.json new file mode 100644 index 00000000000..a9904c63a21 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientinitialization-individuallyclient_metadata.json @@ -0,0 +1 @@ +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithHeader","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderAsyncClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithHeader.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderAsyncClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithHeader.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderAsyncClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithHeader.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderAsyncClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithHeader.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithHeader.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithHeader.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithHeader","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithHeader.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithHeader.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithHeader.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithHeader.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithHeader.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithHeader.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithHeader","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMixed","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedAsyncClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMixed.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedAsyncClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMixed.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedAsyncClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMixed.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedAsyncClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMixed.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMixed.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMixed.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMixed","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMixed.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMixed.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMixed.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMixed.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMixed.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMixed.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMixed","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMultiple","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleAsyncClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMultiple.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleAsyncClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMultiple.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleAsyncClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMultiple.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleAsyncClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMultiple.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMultiple.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMultiple.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMultiple","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMultiple.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMultiple.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMultiple.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMultiple.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMultiple.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMultiple.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithMultiple","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithParamAlias","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasAsyncClient.withAliasedName":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithParamAlias.withAliasedName","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasAsyncClient.withAliasedNameWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithParamAlias.withAliasedName","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasAsyncClient.withOriginalName":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithParamAlias.withOriginalName","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasAsyncClient.withOriginalNameWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithParamAlias.withOriginalName","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithParamAlias","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasClient.withAliasedName":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithParamAlias.withAliasedName","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasClient.withAliasedNameWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithParamAlias.withAliasedName","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasClient.withOriginalName":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithParamAlias.withOriginalName","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasClient.withOriginalNameWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithParamAlias.withOriginalName","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithParamAlias","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithPath","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathAsyncClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithPath.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathAsyncClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithPath.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathAsyncClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithPath.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathAsyncClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithPath.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithPath.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithPath.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithPath","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithPath.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithPath.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithPath.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithPath.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithPath.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithPath.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithPath","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryAsyncClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithQuery.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryAsyncClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithQuery.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryAsyncClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithQuery.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryAsyncClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithQuery.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithQuery.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithQuery.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithQuery.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithQuery.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithQuery.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithQuery.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithQuery.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithQuery.withQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.IndividuallyNestedWithQuery","azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyClient.BlobProperties"},"generatedFiles":["src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithHeaderClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMixedClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMultipleClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithParamAliasClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/package-info.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/BlobProperties.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/package-info.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientinitialization-individuallyparentclient_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientinitialization-individuallyparentclient_metadata.json new file mode 100644 index 00000000000..e3796a70166 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientinitialization-individuallyparentclient_metadata.json @@ -0,0 +1 @@ +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithHeaderClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderAsyncClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithHeaderClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderAsyncClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithHeaderClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderAsyncClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithHeaderClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderAsyncClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithHeaderClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithHeaderClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithHeaderClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithHeaderClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithHeaderClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithHeaderClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithHeaderClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithHeaderClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithHeaderClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithHeaderClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithHeaderClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMixedClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedAsyncClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMixedClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedAsyncClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMixedClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedAsyncClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMixedClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedAsyncClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMixedClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMixedClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMixedClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMixedClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMixedClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMixedClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMixedClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMixedClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMixedClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMixedClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMixedClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMultipleClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleAsyncClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMultipleClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleAsyncClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMultipleClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleAsyncClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMultipleClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleAsyncClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMultipleClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMultipleClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMultipleClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMultipleClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMultipleClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMultipleClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMultipleClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMultipleClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMultipleClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMultipleClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithMultipleClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithParamAliasClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasAsyncClient.withAliasedName":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithParamAliasClient.withAliasedName","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasAsyncClient.withAliasedNameWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithParamAliasClient.withAliasedName","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasAsyncClient.withOriginalName":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithParamAliasClient.withOriginalName","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasAsyncClient.withOriginalNameWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithParamAliasClient.withOriginalName","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithParamAliasClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasClient.withAliasedName":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithParamAliasClient.withAliasedName","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasClient.withAliasedNameWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithParamAliasClient.withAliasedName","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasClient.withOriginalName":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithParamAliasClient.withOriginalName","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasClient.withOriginalNameWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithParamAliasClient.withOriginalName","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithParamAliasClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithPathClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathAsyncClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithPathClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathAsyncClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithPathClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathAsyncClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithPathClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathAsyncClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithPathClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithPathClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithPathClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithPathClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithPathClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithPathClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithPathClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithPathClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithPathClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithPathClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithPathClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithQueryClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryAsyncClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithQueryClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryAsyncClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithQueryClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryAsyncClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithQueryClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryAsyncClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithQueryClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithQueryClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithQueryClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithQueryClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithQueryClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithQueryClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithQueryClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithQueryClient.getStandalone","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithQueryClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithQueryClient.withQuery","azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.IndividuallyParentNestedWithQueryClient","azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.IndividuallyParentClient.BlobProperties"},"generatedFiles":["src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithHeaderClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMixedClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMultipleClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithParamAliasClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/package-info.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/BlobProperties.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/package-info.java","src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientinitialization_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientinitialization_apiview_properties.json deleted file mode 100644 index c7da87b4bf0..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientinitialization_apiview_properties.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.clientgenerator.core.clientinitialization.HeaderParamAsyncClient": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam", - "azure.clientgenerator.core.clientinitialization.HeaderParamAsyncClient.withBody": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam.withBody", - "azure.clientgenerator.core.clientinitialization.HeaderParamAsyncClient.withBodyWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam.withBody", - "azure.clientgenerator.core.clientinitialization.HeaderParamAsyncClient.withQuery": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam.withQuery", - "azure.clientgenerator.core.clientinitialization.HeaderParamAsyncClient.withQueryWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam.withQuery", - "azure.clientgenerator.core.clientinitialization.HeaderParamClient": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam", - "azure.clientgenerator.core.clientinitialization.HeaderParamClient.withBody": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam.withBody", - "azure.clientgenerator.core.clientinitialization.HeaderParamClient.withBodyWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam.withBody", - "azure.clientgenerator.core.clientinitialization.HeaderParamClient.withQuery": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam.withQuery", - "azure.clientgenerator.core.clientinitialization.HeaderParamClient.withQueryWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam.withQuery", - "azure.clientgenerator.core.clientinitialization.HeaderParamClientBuilder": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam", - "azure.clientgenerator.core.clientinitialization.MixedParamsAsyncClient": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams", - "azure.clientgenerator.core.clientinitialization.MixedParamsAsyncClient.withBody": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams.withBody", - "azure.clientgenerator.core.clientinitialization.MixedParamsAsyncClient.withBodyWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams.withBody", - "azure.clientgenerator.core.clientinitialization.MixedParamsAsyncClient.withQuery": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams.withQuery", - "azure.clientgenerator.core.clientinitialization.MixedParamsAsyncClient.withQueryWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams.withQuery", - "azure.clientgenerator.core.clientinitialization.MixedParamsClient": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams", - "azure.clientgenerator.core.clientinitialization.MixedParamsClient.withBody": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams.withBody", - "azure.clientgenerator.core.clientinitialization.MixedParamsClient.withBodyWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams.withBody", - "azure.clientgenerator.core.clientinitialization.MixedParamsClient.withQuery": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams.withQuery", - "azure.clientgenerator.core.clientinitialization.MixedParamsClient.withQueryWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams.withQuery", - "azure.clientgenerator.core.clientinitialization.MixedParamsClientBuilder": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams", - "azure.clientgenerator.core.clientinitialization.MultipleParamsAsyncClient": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams", - "azure.clientgenerator.core.clientinitialization.MultipleParamsAsyncClient.withBody": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams.withBody", - "azure.clientgenerator.core.clientinitialization.MultipleParamsAsyncClient.withBodyWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams.withBody", - "azure.clientgenerator.core.clientinitialization.MultipleParamsAsyncClient.withQuery": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams.withQuery", - "azure.clientgenerator.core.clientinitialization.MultipleParamsAsyncClient.withQueryWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams.withQuery", - "azure.clientgenerator.core.clientinitialization.MultipleParamsClient": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams", - "azure.clientgenerator.core.clientinitialization.MultipleParamsClient.withBody": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams.withBody", - "azure.clientgenerator.core.clientinitialization.MultipleParamsClient.withBodyWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams.withBody", - "azure.clientgenerator.core.clientinitialization.MultipleParamsClient.withQuery": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams.withQuery", - "azure.clientgenerator.core.clientinitialization.MultipleParamsClient.withQueryWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams.withQuery", - "azure.clientgenerator.core.clientinitialization.MultipleParamsClientBuilder": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams", - "azure.clientgenerator.core.clientinitialization.ParamAliasAsyncClient": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias", - "azure.clientgenerator.core.clientinitialization.ParamAliasAsyncClient.withAliasedName": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias.withAliasedName", - "azure.clientgenerator.core.clientinitialization.ParamAliasAsyncClient.withAliasedNameWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias.withAliasedName", - "azure.clientgenerator.core.clientinitialization.ParamAliasAsyncClient.withOriginalName": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias.withOriginalName", - "azure.clientgenerator.core.clientinitialization.ParamAliasAsyncClient.withOriginalNameWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias.withOriginalName", - "azure.clientgenerator.core.clientinitialization.ParamAliasClient": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias", - "azure.clientgenerator.core.clientinitialization.ParamAliasClient.withAliasedName": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias.withAliasedName", - "azure.clientgenerator.core.clientinitialization.ParamAliasClient.withAliasedNameWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias.withAliasedName", - "azure.clientgenerator.core.clientinitialization.ParamAliasClient.withOriginalName": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias.withOriginalName", - "azure.clientgenerator.core.clientinitialization.ParamAliasClient.withOriginalNameWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias.withOriginalName", - "azure.clientgenerator.core.clientinitialization.ParamAliasClientBuilder": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias", - "azure.clientgenerator.core.clientinitialization.PathParamAsyncClient": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam", - "azure.clientgenerator.core.clientinitialization.PathParamAsyncClient.deleteStandalone": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.deleteStandalone", - "azure.clientgenerator.core.clientinitialization.PathParamAsyncClient.deleteStandaloneWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.deleteStandalone", - "azure.clientgenerator.core.clientinitialization.PathParamAsyncClient.getStandalone": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.getStandalone", - "azure.clientgenerator.core.clientinitialization.PathParamAsyncClient.getStandaloneWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.getStandalone", - "azure.clientgenerator.core.clientinitialization.PathParamAsyncClient.withQuery": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.withQuery", - "azure.clientgenerator.core.clientinitialization.PathParamAsyncClient.withQueryWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.withQuery", - "azure.clientgenerator.core.clientinitialization.PathParamClient": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam", - "azure.clientgenerator.core.clientinitialization.PathParamClient.deleteStandalone": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.deleteStandalone", - "azure.clientgenerator.core.clientinitialization.PathParamClient.deleteStandaloneWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.deleteStandalone", - "azure.clientgenerator.core.clientinitialization.PathParamClient.getStandalone": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.getStandalone", - "azure.clientgenerator.core.clientinitialization.PathParamClient.getStandaloneWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.getStandalone", - "azure.clientgenerator.core.clientinitialization.PathParamClient.withQuery": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.withQuery", - "azure.clientgenerator.core.clientinitialization.PathParamClient.withQueryWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.withQuery", - "azure.clientgenerator.core.clientinitialization.PathParamClientBuilder": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam", - "azure.clientgenerator.core.clientinitialization.models.BlobProperties": "Service.BlobProperties", - "azure.clientgenerator.core.clientinitialization.models.Input": "Service.Input", - "azure.clientgenerator.core.clientinitialization.models.WithBodyRequest": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.withBody.Request.anonymous", - "azure.clientgenerator.core.clientinitialization.parentclient.ChildAsyncClient": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient", - "azure.clientgenerator.core.clientinitialization.parentclient.ChildAsyncClient.deleteStandalone": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.deleteStandalone", - "azure.clientgenerator.core.clientinitialization.parentclient.ChildAsyncClient.deleteStandaloneWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.deleteStandalone", - "azure.clientgenerator.core.clientinitialization.parentclient.ChildAsyncClient.getStandalone": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.getStandalone", - "azure.clientgenerator.core.clientinitialization.parentclient.ChildAsyncClient.getStandaloneWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.getStandalone", - "azure.clientgenerator.core.clientinitialization.parentclient.ChildAsyncClient.withQuery": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.withQuery", - "azure.clientgenerator.core.clientinitialization.parentclient.ChildAsyncClient.withQueryWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.withQuery", - "azure.clientgenerator.core.clientinitialization.parentclient.ChildClient": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient", - "azure.clientgenerator.core.clientinitialization.parentclient.ChildClient.deleteStandalone": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.deleteStandalone", - "azure.clientgenerator.core.clientinitialization.parentclient.ChildClient.deleteStandaloneWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.deleteStandalone", - "azure.clientgenerator.core.clientinitialization.parentclient.ChildClient.getStandalone": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.getStandalone", - "azure.clientgenerator.core.clientinitialization.parentclient.ChildClient.getStandaloneWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.getStandalone", - "azure.clientgenerator.core.clientinitialization.parentclient.ChildClient.withQuery": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.withQuery", - "azure.clientgenerator.core.clientinitialization.parentclient.ChildClient.withQueryWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.withQuery", - "azure.clientgenerator.core.clientinitialization.parentclient.ChildClientBuilder": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient", - "azure.clientgenerator.core.clientinitialization.parentclient.ParentAsyncClient": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient", - "azure.clientgenerator.core.clientinitialization.parentclient.ParentClient": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient", - "azure.clientgenerator.core.clientinitialization.parentclient.ParentClientBuilder": "_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientinitialization_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientinitialization_metadata.json deleted file mode 100644 index 8b2cc8b5ed8..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientinitialization_metadata.json +++ /dev/null @@ -1 +0,0 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.clientgenerator.core.clientinitialization.HeaderParamAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam","azure.clientgenerator.core.clientinitialization.HeaderParamAsyncClient.withBody":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam.withBody","azure.clientgenerator.core.clientinitialization.HeaderParamAsyncClient.withBodyWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam.withBody","azure.clientgenerator.core.clientinitialization.HeaderParamAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam.withQuery","azure.clientgenerator.core.clientinitialization.HeaderParamAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam.withQuery","azure.clientgenerator.core.clientinitialization.HeaderParamClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam","azure.clientgenerator.core.clientinitialization.HeaderParamClient.withBody":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam.withBody","azure.clientgenerator.core.clientinitialization.HeaderParamClient.withBodyWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam.withBody","azure.clientgenerator.core.clientinitialization.HeaderParamClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam.withQuery","azure.clientgenerator.core.clientinitialization.HeaderParamClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam.withQuery","azure.clientgenerator.core.clientinitialization.HeaderParamClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.HeaderParam","azure.clientgenerator.core.clientinitialization.MixedParamsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams","azure.clientgenerator.core.clientinitialization.MixedParamsAsyncClient.withBody":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams.withBody","azure.clientgenerator.core.clientinitialization.MixedParamsAsyncClient.withBodyWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams.withBody","azure.clientgenerator.core.clientinitialization.MixedParamsAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams.withQuery","azure.clientgenerator.core.clientinitialization.MixedParamsAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams.withQuery","azure.clientgenerator.core.clientinitialization.MixedParamsClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams","azure.clientgenerator.core.clientinitialization.MixedParamsClient.withBody":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams.withBody","azure.clientgenerator.core.clientinitialization.MixedParamsClient.withBodyWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams.withBody","azure.clientgenerator.core.clientinitialization.MixedParamsClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams.withQuery","azure.clientgenerator.core.clientinitialization.MixedParamsClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams.withQuery","azure.clientgenerator.core.clientinitialization.MixedParamsClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MixedParams","azure.clientgenerator.core.clientinitialization.MultipleParamsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams","azure.clientgenerator.core.clientinitialization.MultipleParamsAsyncClient.withBody":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams.withBody","azure.clientgenerator.core.clientinitialization.MultipleParamsAsyncClient.withBodyWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams.withBody","azure.clientgenerator.core.clientinitialization.MultipleParamsAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams.withQuery","azure.clientgenerator.core.clientinitialization.MultipleParamsAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams.withQuery","azure.clientgenerator.core.clientinitialization.MultipleParamsClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams","azure.clientgenerator.core.clientinitialization.MultipleParamsClient.withBody":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams.withBody","azure.clientgenerator.core.clientinitialization.MultipleParamsClient.withBodyWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams.withBody","azure.clientgenerator.core.clientinitialization.MultipleParamsClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams.withQuery","azure.clientgenerator.core.clientinitialization.MultipleParamsClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams.withQuery","azure.clientgenerator.core.clientinitialization.MultipleParamsClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.MultipleParams","azure.clientgenerator.core.clientinitialization.ParamAliasAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias","azure.clientgenerator.core.clientinitialization.ParamAliasAsyncClient.withAliasedName":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias.withAliasedName","azure.clientgenerator.core.clientinitialization.ParamAliasAsyncClient.withAliasedNameWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias.withAliasedName","azure.clientgenerator.core.clientinitialization.ParamAliasAsyncClient.withOriginalName":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias.withOriginalName","azure.clientgenerator.core.clientinitialization.ParamAliasAsyncClient.withOriginalNameWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias.withOriginalName","azure.clientgenerator.core.clientinitialization.ParamAliasClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias","azure.clientgenerator.core.clientinitialization.ParamAliasClient.withAliasedName":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias.withAliasedName","azure.clientgenerator.core.clientinitialization.ParamAliasClient.withAliasedNameWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias.withAliasedName","azure.clientgenerator.core.clientinitialization.ParamAliasClient.withOriginalName":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias.withOriginalName","azure.clientgenerator.core.clientinitialization.ParamAliasClient.withOriginalNameWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias.withOriginalName","azure.clientgenerator.core.clientinitialization.ParamAliasClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParamAlias","azure.clientgenerator.core.clientinitialization.PathParamAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam","azure.clientgenerator.core.clientinitialization.PathParamAsyncClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.deleteStandalone","azure.clientgenerator.core.clientinitialization.PathParamAsyncClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.deleteStandalone","azure.clientgenerator.core.clientinitialization.PathParamAsyncClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.getStandalone","azure.clientgenerator.core.clientinitialization.PathParamAsyncClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.getStandalone","azure.clientgenerator.core.clientinitialization.PathParamAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.withQuery","azure.clientgenerator.core.clientinitialization.PathParamAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.withQuery","azure.clientgenerator.core.clientinitialization.PathParamClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam","azure.clientgenerator.core.clientinitialization.PathParamClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.deleteStandalone","azure.clientgenerator.core.clientinitialization.PathParamClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.deleteStandalone","azure.clientgenerator.core.clientinitialization.PathParamClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.getStandalone","azure.clientgenerator.core.clientinitialization.PathParamClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.getStandalone","azure.clientgenerator.core.clientinitialization.PathParamClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.withQuery","azure.clientgenerator.core.clientinitialization.PathParamClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam.withQuery","azure.clientgenerator.core.clientinitialization.PathParamClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.PathParam","azure.clientgenerator.core.clientinitialization.models.BlobProperties":"Service.BlobProperties","azure.clientgenerator.core.clientinitialization.models.Input":"Service.Input","azure.clientgenerator.core.clientinitialization.models.WithBodyRequest":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.withBody.Request.anonymous","azure.clientgenerator.core.clientinitialization.parentclient.ChildAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient","azure.clientgenerator.core.clientinitialization.parentclient.ChildAsyncClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.parentclient.ChildAsyncClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.parentclient.ChildAsyncClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.getStandalone","azure.clientgenerator.core.clientinitialization.parentclient.ChildAsyncClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.getStandalone","azure.clientgenerator.core.clientinitialization.parentclient.ChildAsyncClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.withQuery","azure.clientgenerator.core.clientinitialization.parentclient.ChildAsyncClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.withQuery","azure.clientgenerator.core.clientinitialization.parentclient.ChildClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient","azure.clientgenerator.core.clientinitialization.parentclient.ChildClient.deleteStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.parentclient.ChildClient.deleteStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.deleteStandalone","azure.clientgenerator.core.clientinitialization.parentclient.ChildClient.getStandalone":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.getStandalone","azure.clientgenerator.core.clientinitialization.parentclient.ChildClient.getStandaloneWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.getStandalone","azure.clientgenerator.core.clientinitialization.parentclient.ChildClient.withQuery":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.withQuery","azure.clientgenerator.core.clientinitialization.parentclient.ChildClient.withQueryWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient.withQuery","azure.clientgenerator.core.clientinitialization.parentclient.ChildClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient.ChildClient","azure.clientgenerator.core.clientinitialization.parentclient.ParentAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient","azure.clientgenerator.core.clientinitialization.parentclient.ParentClient":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient","azure.clientgenerator.core.clientinitialization.parentclient.ParentClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientInitialization.ParentClient"},"generatedFiles":["src/main/java/azure/clientgenerator/core/clientinitialization/HeaderParamAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/HeaderParamClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/HeaderParamClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/MixedParamsAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/MixedParamsClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/MixedParamsClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/MultipleParamsAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/MultipleParamsClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/MultipleParamsClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/ParamAliasAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/ParamAliasClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/ParamAliasClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/PathParamAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/PathParamClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/PathParamClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/implementation/ChildClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/implementation/HeaderParamClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/implementation/MixedParamsClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/implementation/MultipleParamsClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/implementation/ParamAliasClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/implementation/ParentClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/implementation/PathParamClientImpl.java","src/main/java/azure/clientgenerator/core/clientinitialization/implementation/package-info.java","src/main/java/azure/clientgenerator/core/clientinitialization/models/BlobProperties.java","src/main/java/azure/clientgenerator/core/clientinitialization/models/Input.java","src/main/java/azure/clientgenerator/core/clientinitialization/models/WithBodyRequest.java","src/main/java/azure/clientgenerator/core/clientinitialization/models/package-info.java","src/main/java/azure/clientgenerator/core/clientinitialization/package-info.java","src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ChildAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ChildClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ChildClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ParentAsyncClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ParentClient.java","src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/ParentClientBuilder.java","src/main/java/azure/clientgenerator/core/clientinitialization/parentclient/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-newsubclient_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-newsubclient_apiview_properties.json deleted file mode 100644 index 5cd3f0df5ac..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-newsubclient_apiview_properties.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.clientgenerator.core.clientlocation.newsubclient.ArchiveOperationsAsyncClient": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient", - "azure.clientgenerator.core.clientlocation.newsubclient.ArchiveOperationsAsyncClient.archiveProduct": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.archiveProduct", - "azure.clientgenerator.core.clientlocation.newsubclient.ArchiveOperationsAsyncClient.archiveProductWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.archiveProduct", - "azure.clientgenerator.core.clientlocation.newsubclient.ArchiveOperationsClient": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient", - "azure.clientgenerator.core.clientlocation.newsubclient.ArchiveOperationsClient.archiveProduct": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.archiveProduct", - "azure.clientgenerator.core.clientlocation.newsubclient.ArchiveOperationsClient.archiveProductWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.archiveProduct", - "azure.clientgenerator.core.clientlocation.newsubclient.MoveToNewSubClientBuilder": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient", - "azure.clientgenerator.core.clientlocation.newsubclient.ProductOperationsAsyncClient": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations", - "azure.clientgenerator.core.clientlocation.newsubclient.ProductOperationsAsyncClient.listProducts": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.listProducts", - "azure.clientgenerator.core.clientlocation.newsubclient.ProductOperationsAsyncClient.listProductsWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.listProducts", - "azure.clientgenerator.core.clientlocation.newsubclient.ProductOperationsClient": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations", - "azure.clientgenerator.core.clientlocation.newsubclient.ProductOperationsClient.listProducts": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.listProducts", - "azure.clientgenerator.core.clientlocation.newsubclient.ProductOperationsClient.listProductsWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.listProducts" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-newsubclient_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-newsubclient_metadata.json index c6c1ce71986..19bc402431d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-newsubclient_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-newsubclient_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.clientgenerator.core.clientlocation.newsubclient.ArchiveOperationsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient","azure.clientgenerator.core.clientlocation.newsubclient.ArchiveOperationsAsyncClient.archiveProduct":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.archiveProduct","azure.clientgenerator.core.clientlocation.newsubclient.ArchiveOperationsAsyncClient.archiveProductWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.archiveProduct","azure.clientgenerator.core.clientlocation.newsubclient.ArchiveOperationsClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient","azure.clientgenerator.core.clientlocation.newsubclient.ArchiveOperationsClient.archiveProduct":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.archiveProduct","azure.clientgenerator.core.clientlocation.newsubclient.ArchiveOperationsClient.archiveProductWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.archiveProduct","azure.clientgenerator.core.clientlocation.newsubclient.MoveToNewSubClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient","azure.clientgenerator.core.clientlocation.newsubclient.ProductOperationsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations","azure.clientgenerator.core.clientlocation.newsubclient.ProductOperationsAsyncClient.listProducts":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.listProducts","azure.clientgenerator.core.clientlocation.newsubclient.ProductOperationsAsyncClient.listProductsWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.listProducts","azure.clientgenerator.core.clientlocation.newsubclient.ProductOperationsClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations","azure.clientgenerator.core.clientlocation.newsubclient.ProductOperationsClient.listProducts":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.listProducts","azure.clientgenerator.core.clientlocation.newsubclient.ProductOperationsClient.listProductsWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.listProducts"},"generatedFiles":["src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/ArchiveOperationsAsyncClient.java","src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/ArchiveOperationsClient.java","src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/MoveToNewSubClientBuilder.java","src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/ProductOperationsAsyncClient.java","src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/ProductOperationsClient.java","src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/implementation/ArchiveOperationsImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/implementation/MoveToNewSubClientImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/implementation/ProductOperationsImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/implementation/package-info.java","src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.clientgenerator.core.clientlocation.newsubclient.ArchiveOperationsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient","azure.clientgenerator.core.clientlocation.newsubclient.ArchiveOperationsAsyncClient.archiveProduct":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.archiveProduct","azure.clientgenerator.core.clientlocation.newsubclient.ArchiveOperationsAsyncClient.archiveProductWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.archiveProduct","azure.clientgenerator.core.clientlocation.newsubclient.ArchiveOperationsClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient","azure.clientgenerator.core.clientlocation.newsubclient.ArchiveOperationsClient.archiveProduct":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.archiveProduct","azure.clientgenerator.core.clientlocation.newsubclient.ArchiveOperationsClient.archiveProductWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.archiveProduct","azure.clientgenerator.core.clientlocation.newsubclient.MoveToNewSubClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient","azure.clientgenerator.core.clientlocation.newsubclient.ProductOperationsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations","azure.clientgenerator.core.clientlocation.newsubclient.ProductOperationsAsyncClient.listProducts":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.listProducts","azure.clientgenerator.core.clientlocation.newsubclient.ProductOperationsAsyncClient.listProductsWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.listProducts","azure.clientgenerator.core.clientlocation.newsubclient.ProductOperationsClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations","azure.clientgenerator.core.clientlocation.newsubclient.ProductOperationsClient.listProducts":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.listProducts","azure.clientgenerator.core.clientlocation.newsubclient.ProductOperationsClient.listProductsWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToNewSubClient.ProductOperations.listProducts"},"generatedFiles":["src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/ArchiveOperationsAsyncClient.java","src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/ArchiveOperationsClient.java","src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/MoveToNewSubClientBuilder.java","src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/ProductOperationsAsyncClient.java","src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/ProductOperationsClient.java","src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/implementation/ArchiveOperationsImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/implementation/MoveToNewSubClientImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/implementation/ProductOperationsImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/implementation/package-info.java","src/main/java/azure/clientgenerator/core/clientlocation/newsubclient/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-parameter_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-parameter_apiview_properties.json deleted file mode 100644 index a8d3cdf54c7..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-parameter_apiview_properties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToAsyncClient": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.BlobOperations", - "azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToAsyncClient.getBlob": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.BlobOperations.getBlob", - "azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToAsyncClient.getBlobWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.BlobOperations.getBlob", - "azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToClient": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.BlobOperations", - "azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToClient.getBlob": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.BlobOperations.getBlob", - "azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToClient.getBlobWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.BlobOperations.getBlob", - "azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToClientBuilder": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient", - "azure.clientgenerator.core.clientlocation.parameter.models.Blob": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.Blob" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-parameter_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-parameter_metadata.json index 8246dd98bee..0485df7272b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-parameter_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-parameter_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.BlobOperations","azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToAsyncClient.getBlob":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.BlobOperations.getBlob","azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToAsyncClient.getBlobWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.BlobOperations.getBlob","azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.BlobOperations","azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToClient.getBlob":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.BlobOperations.getBlob","azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToClient.getBlobWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.BlobOperations.getBlob","azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient","azure.clientgenerator.core.clientlocation.parameter.models.Blob":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.Blob"},"generatedFiles":["src/main/java/azure/clientgenerator/core/clientlocation/parameter/MoveMethodParameterToAsyncClient.java","src/main/java/azure/clientgenerator/core/clientlocation/parameter/MoveMethodParameterToClient.java","src/main/java/azure/clientgenerator/core/clientlocation/parameter/MoveMethodParameterToClientBuilder.java","src/main/java/azure/clientgenerator/core/clientlocation/parameter/implementation/BlobOperationsImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/parameter/implementation/MoveMethodParameterToClientImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/parameter/implementation/package-info.java","src/main/java/azure/clientgenerator/core/clientlocation/parameter/models/Blob.java","src/main/java/azure/clientgenerator/core/clientlocation/parameter/models/package-info.java","src/main/java/azure/clientgenerator/core/clientlocation/parameter/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.BlobOperations","azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToAsyncClient.getBlob":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.BlobOperations.getBlob","azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToAsyncClient.getBlobWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.BlobOperations.getBlob","azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.BlobOperations","azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToClient.getBlob":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.BlobOperations.getBlob","azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToClient.getBlobWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.BlobOperations.getBlob","azure.clientgenerator.core.clientlocation.parameter.MoveMethodParameterToClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient","azure.clientgenerator.core.clientlocation.parameter.models.Blob":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveMethodParameterToClient.Blob"},"generatedFiles":["src/main/java/azure/clientgenerator/core/clientlocation/parameter/MoveMethodParameterToAsyncClient.java","src/main/java/azure/clientgenerator/core/clientlocation/parameter/MoveMethodParameterToClient.java","src/main/java/azure/clientgenerator/core/clientlocation/parameter/MoveMethodParameterToClientBuilder.java","src/main/java/azure/clientgenerator/core/clientlocation/parameter/implementation/BlobOperationsImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/parameter/implementation/MoveMethodParameterToClientImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/parameter/implementation/package-info.java","src/main/java/azure/clientgenerator/core/clientlocation/parameter/models/Blob.java","src/main/java/azure/clientgenerator/core/clientlocation/parameter/models/package-info.java","src/main/java/azure/clientgenerator/core/clientlocation/parameter/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-rootclient_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-rootclient_apiview_properties.json deleted file mode 100644 index 261e5407b0a..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-rootclient_apiview_properties.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.clientgenerator.core.clientlocation.rootclient.MoveToRootAsyncClient": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient", - "azure.clientgenerator.core.clientlocation.rootclient.MoveToRootAsyncClient.getHealthStatus": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getHealthStatus", - "azure.clientgenerator.core.clientlocation.rootclient.MoveToRootAsyncClient.getHealthStatusWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getHealthStatus", - "azure.clientgenerator.core.clientlocation.rootclient.MoveToRootClient": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient", - "azure.clientgenerator.core.clientlocation.rootclient.MoveToRootClient.getHealthStatus": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getHealthStatus", - "azure.clientgenerator.core.clientlocation.rootclient.MoveToRootClient.getHealthStatusWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getHealthStatus", - "azure.clientgenerator.core.clientlocation.rootclient.MoveToRootClientBuilder": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient", - "azure.clientgenerator.core.clientlocation.rootclient.ResourceOperationsAsyncClient": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations", - "azure.clientgenerator.core.clientlocation.rootclient.ResourceOperationsAsyncClient.getResource": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getResource", - "azure.clientgenerator.core.clientlocation.rootclient.ResourceOperationsAsyncClient.getResourceWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getResource", - "azure.clientgenerator.core.clientlocation.rootclient.ResourceOperationsClient": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations", - "azure.clientgenerator.core.clientlocation.rootclient.ResourceOperationsClient.getResource": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getResource", - "azure.clientgenerator.core.clientlocation.rootclient.ResourceOperationsClient.getResourceWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getResource" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-rootclient_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-rootclient_metadata.json index 8be41fc32da..3d55ce31931 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-rootclient_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-rootclient_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.clientgenerator.core.clientlocation.rootclient.MoveToRootAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient","azure.clientgenerator.core.clientlocation.rootclient.MoveToRootAsyncClient.getHealthStatus":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getHealthStatus","azure.clientgenerator.core.clientlocation.rootclient.MoveToRootAsyncClient.getHealthStatusWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getHealthStatus","azure.clientgenerator.core.clientlocation.rootclient.MoveToRootClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient","azure.clientgenerator.core.clientlocation.rootclient.MoveToRootClient.getHealthStatus":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getHealthStatus","azure.clientgenerator.core.clientlocation.rootclient.MoveToRootClient.getHealthStatusWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getHealthStatus","azure.clientgenerator.core.clientlocation.rootclient.MoveToRootClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient","azure.clientgenerator.core.clientlocation.rootclient.ResourceOperationsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations","azure.clientgenerator.core.clientlocation.rootclient.ResourceOperationsAsyncClient.getResource":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getResource","azure.clientgenerator.core.clientlocation.rootclient.ResourceOperationsAsyncClient.getResourceWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getResource","azure.clientgenerator.core.clientlocation.rootclient.ResourceOperationsClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations","azure.clientgenerator.core.clientlocation.rootclient.ResourceOperationsClient.getResource":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getResource","azure.clientgenerator.core.clientlocation.rootclient.ResourceOperationsClient.getResourceWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getResource"},"generatedFiles":["src/main/java/azure/clientgenerator/core/clientlocation/rootclient/MoveToRootAsyncClient.java","src/main/java/azure/clientgenerator/core/clientlocation/rootclient/MoveToRootClient.java","src/main/java/azure/clientgenerator/core/clientlocation/rootclient/MoveToRootClientBuilder.java","src/main/java/azure/clientgenerator/core/clientlocation/rootclient/ResourceOperationsAsyncClient.java","src/main/java/azure/clientgenerator/core/clientlocation/rootclient/ResourceOperationsClient.java","src/main/java/azure/clientgenerator/core/clientlocation/rootclient/implementation/MoveToRootClientImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/rootclient/implementation/ResourceOperationsImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/rootclient/implementation/package-info.java","src/main/java/azure/clientgenerator/core/clientlocation/rootclient/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.clientgenerator.core.clientlocation.rootclient.MoveToRootAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient","azure.clientgenerator.core.clientlocation.rootclient.MoveToRootAsyncClient.getHealthStatus":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getHealthStatus","azure.clientgenerator.core.clientlocation.rootclient.MoveToRootAsyncClient.getHealthStatusWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getHealthStatus","azure.clientgenerator.core.clientlocation.rootclient.MoveToRootClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient","azure.clientgenerator.core.clientlocation.rootclient.MoveToRootClient.getHealthStatus":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getHealthStatus","azure.clientgenerator.core.clientlocation.rootclient.MoveToRootClient.getHealthStatusWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getHealthStatus","azure.clientgenerator.core.clientlocation.rootclient.MoveToRootClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient","azure.clientgenerator.core.clientlocation.rootclient.ResourceOperationsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations","azure.clientgenerator.core.clientlocation.rootclient.ResourceOperationsAsyncClient.getResource":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getResource","azure.clientgenerator.core.clientlocation.rootclient.ResourceOperationsAsyncClient.getResourceWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getResource","azure.clientgenerator.core.clientlocation.rootclient.ResourceOperationsClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations","azure.clientgenerator.core.clientlocation.rootclient.ResourceOperationsClient.getResource":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getResource","azure.clientgenerator.core.clientlocation.rootclient.ResourceOperationsClient.getResourceWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToRootClient.ResourceOperations.getResource"},"generatedFiles":["src/main/java/azure/clientgenerator/core/clientlocation/rootclient/MoveToRootAsyncClient.java","src/main/java/azure/clientgenerator/core/clientlocation/rootclient/MoveToRootClient.java","src/main/java/azure/clientgenerator/core/clientlocation/rootclient/MoveToRootClientBuilder.java","src/main/java/azure/clientgenerator/core/clientlocation/rootclient/ResourceOperationsAsyncClient.java","src/main/java/azure/clientgenerator/core/clientlocation/rootclient/ResourceOperationsClient.java","src/main/java/azure/clientgenerator/core/clientlocation/rootclient/implementation/MoveToRootClientImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/rootclient/implementation/ResourceOperationsImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/rootclient/implementation/package-info.java","src/main/java/azure/clientgenerator/core/clientlocation/rootclient/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-subclient_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-subclient_apiview_properties.json deleted file mode 100644 index 3e275d250dd..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-subclient_apiview_properties.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.clientgenerator.core.clientlocation.subclient.AdminOperationsAsyncClient": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.AdminOperations", - "azure.clientgenerator.core.clientlocation.subclient.AdminOperationsAsyncClient.deleteUser": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.deleteUser", - "azure.clientgenerator.core.clientlocation.subclient.AdminOperationsAsyncClient.deleteUserWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.deleteUser", - "azure.clientgenerator.core.clientlocation.subclient.AdminOperationsAsyncClient.getAdminInfo": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.AdminOperations.getAdminInfo", - "azure.clientgenerator.core.clientlocation.subclient.AdminOperationsAsyncClient.getAdminInfoWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.AdminOperations.getAdminInfo", - "azure.clientgenerator.core.clientlocation.subclient.AdminOperationsClient": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.AdminOperations", - "azure.clientgenerator.core.clientlocation.subclient.AdminOperationsClient.deleteUser": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.deleteUser", - "azure.clientgenerator.core.clientlocation.subclient.AdminOperationsClient.deleteUserWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.deleteUser", - "azure.clientgenerator.core.clientlocation.subclient.AdminOperationsClient.getAdminInfo": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.AdminOperations.getAdminInfo", - "azure.clientgenerator.core.clientlocation.subclient.AdminOperationsClient.getAdminInfoWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.AdminOperations.getAdminInfo", - "azure.clientgenerator.core.clientlocation.subclient.MoveToExistingSubClientBuilder": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient", - "azure.clientgenerator.core.clientlocation.subclient.UserOperationsAsyncClient": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations", - "azure.clientgenerator.core.clientlocation.subclient.UserOperationsAsyncClient.getUser": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.getUser", - "azure.clientgenerator.core.clientlocation.subclient.UserOperationsAsyncClient.getUserWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.getUser", - "azure.clientgenerator.core.clientlocation.subclient.UserOperationsClient": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations", - "azure.clientgenerator.core.clientlocation.subclient.UserOperationsClient.getUser": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.getUser", - "azure.clientgenerator.core.clientlocation.subclient.UserOperationsClient.getUserWithResponse": "_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.getUser" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-subclient_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-subclient_metadata.json index 902f741e8fb..45dd63c644b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-subclient_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-clientlocation-subclient_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.clientgenerator.core.clientlocation.subclient.AdminOperationsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.AdminOperations","azure.clientgenerator.core.clientlocation.subclient.AdminOperationsAsyncClient.deleteUser":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.deleteUser","azure.clientgenerator.core.clientlocation.subclient.AdminOperationsAsyncClient.deleteUserWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.deleteUser","azure.clientgenerator.core.clientlocation.subclient.AdminOperationsAsyncClient.getAdminInfo":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.AdminOperations.getAdminInfo","azure.clientgenerator.core.clientlocation.subclient.AdminOperationsAsyncClient.getAdminInfoWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.AdminOperations.getAdminInfo","azure.clientgenerator.core.clientlocation.subclient.AdminOperationsClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.AdminOperations","azure.clientgenerator.core.clientlocation.subclient.AdminOperationsClient.deleteUser":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.deleteUser","azure.clientgenerator.core.clientlocation.subclient.AdminOperationsClient.deleteUserWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.deleteUser","azure.clientgenerator.core.clientlocation.subclient.AdminOperationsClient.getAdminInfo":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.AdminOperations.getAdminInfo","azure.clientgenerator.core.clientlocation.subclient.AdminOperationsClient.getAdminInfoWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.AdminOperations.getAdminInfo","azure.clientgenerator.core.clientlocation.subclient.MoveToExistingSubClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient","azure.clientgenerator.core.clientlocation.subclient.UserOperationsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations","azure.clientgenerator.core.clientlocation.subclient.UserOperationsAsyncClient.getUser":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.getUser","azure.clientgenerator.core.clientlocation.subclient.UserOperationsAsyncClient.getUserWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.getUser","azure.clientgenerator.core.clientlocation.subclient.UserOperationsClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations","azure.clientgenerator.core.clientlocation.subclient.UserOperationsClient.getUser":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.getUser","azure.clientgenerator.core.clientlocation.subclient.UserOperationsClient.getUserWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.getUser"},"generatedFiles":["src/main/java/azure/clientgenerator/core/clientlocation/subclient/AdminOperationsAsyncClient.java","src/main/java/azure/clientgenerator/core/clientlocation/subclient/AdminOperationsClient.java","src/main/java/azure/clientgenerator/core/clientlocation/subclient/MoveToExistingSubClientBuilder.java","src/main/java/azure/clientgenerator/core/clientlocation/subclient/UserOperationsAsyncClient.java","src/main/java/azure/clientgenerator/core/clientlocation/subclient/UserOperationsClient.java","src/main/java/azure/clientgenerator/core/clientlocation/subclient/implementation/AdminOperationsImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/subclient/implementation/MoveToExistingSubClientImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/subclient/implementation/UserOperationsImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/subclient/implementation/package-info.java","src/main/java/azure/clientgenerator/core/clientlocation/subclient/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.clientgenerator.core.clientlocation.subclient.AdminOperationsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.AdminOperations","azure.clientgenerator.core.clientlocation.subclient.AdminOperationsAsyncClient.deleteUser":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.deleteUser","azure.clientgenerator.core.clientlocation.subclient.AdminOperationsAsyncClient.deleteUserWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.deleteUser","azure.clientgenerator.core.clientlocation.subclient.AdminOperationsAsyncClient.getAdminInfo":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.AdminOperations.getAdminInfo","azure.clientgenerator.core.clientlocation.subclient.AdminOperationsAsyncClient.getAdminInfoWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.AdminOperations.getAdminInfo","azure.clientgenerator.core.clientlocation.subclient.AdminOperationsClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.AdminOperations","azure.clientgenerator.core.clientlocation.subclient.AdminOperationsClient.deleteUser":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.deleteUser","azure.clientgenerator.core.clientlocation.subclient.AdminOperationsClient.deleteUserWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.deleteUser","azure.clientgenerator.core.clientlocation.subclient.AdminOperationsClient.getAdminInfo":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.AdminOperations.getAdminInfo","azure.clientgenerator.core.clientlocation.subclient.AdminOperationsClient.getAdminInfoWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.AdminOperations.getAdminInfo","azure.clientgenerator.core.clientlocation.subclient.MoveToExistingSubClientBuilder":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient","azure.clientgenerator.core.clientlocation.subclient.UserOperationsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations","azure.clientgenerator.core.clientlocation.subclient.UserOperationsAsyncClient.getUser":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.getUser","azure.clientgenerator.core.clientlocation.subclient.UserOperationsAsyncClient.getUserWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.getUser","azure.clientgenerator.core.clientlocation.subclient.UserOperationsClient":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations","azure.clientgenerator.core.clientlocation.subclient.UserOperationsClient.getUser":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.getUser","azure.clientgenerator.core.clientlocation.subclient.UserOperationsClient.getUserWithResponse":"_Specs_.Azure.ClientGenerator.Core.ClientLocation.MoveToExistingSubClient.UserOperations.getUser"},"generatedFiles":["src/main/java/azure/clientgenerator/core/clientlocation/subclient/AdminOperationsAsyncClient.java","src/main/java/azure/clientgenerator/core/clientlocation/subclient/AdminOperationsClient.java","src/main/java/azure/clientgenerator/core/clientlocation/subclient/MoveToExistingSubClientBuilder.java","src/main/java/azure/clientgenerator/core/clientlocation/subclient/UserOperationsAsyncClient.java","src/main/java/azure/clientgenerator/core/clientlocation/subclient/UserOperationsClient.java","src/main/java/azure/clientgenerator/core/clientlocation/subclient/implementation/AdminOperationsImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/subclient/implementation/MoveToExistingSubClientImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/subclient/implementation/UserOperationsImpl.java","src/main/java/azure/clientgenerator/core/clientlocation/subclient/implementation/package-info.java","src/main/java/azure/clientgenerator/core/clientlocation/subclient/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-deserialize-emptystringnull_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-deserialize-emptystringnull_apiview_properties.json deleted file mode 100644 index 7b58226868c..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-deserialize-emptystringnull_apiview_properties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullAsyncClient": "_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull", - "azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullAsyncClient.get": "_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.get", - "azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullAsyncClient.getWithResponse": "_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.get", - "azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullClient": "_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull", - "azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullClient.get": "_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.get", - "azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullClient.getWithResponse": "_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.get", - "azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullClientBuilder": "_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull", - "azure.clientgenerator.core.deserialize.emptystringnull.models.ResponseModel": "_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.ResponseModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-deserialize-emptystringnull_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-deserialize-emptystringnull_metadata.json index b584ce2c196..eae29a4156f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-deserialize-emptystringnull_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-deserialize-emptystringnull_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullAsyncClient":"_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull","azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullAsyncClient.get":"_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.get","azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullAsyncClient.getWithResponse":"_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.get","azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullClient":"_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull","azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullClient.get":"_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.get","azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullClient.getWithResponse":"_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.get","azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullClientBuilder":"_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull","azure.clientgenerator.core.deserialize.emptystringnull.models.ResponseModel":"_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.ResponseModel"},"generatedFiles":["src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/DeserializeEmptyStringAsNullAsyncClient.java","src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/DeserializeEmptyStringAsNullClient.java","src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/DeserializeEmptyStringAsNullClientBuilder.java","src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/implementation/DeserializeEmptyStringAsNullClientImpl.java","src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/implementation/package-info.java","src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/models/ResponseModel.java","src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/models/package-info.java","src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullAsyncClient":"_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull","azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullAsyncClient.get":"_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.get","azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullAsyncClient.getWithResponse":"_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.get","azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullClient":"_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull","azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullClient.get":"_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.get","azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullClient.getWithResponse":"_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.get","azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullClientBuilder":"_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull","azure.clientgenerator.core.deserialize.emptystringnull.models.ResponseModel":"_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.ResponseModel"},"generatedFiles":["src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/DeserializeEmptyStringAsNullAsyncClient.java","src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/DeserializeEmptyStringAsNullClient.java","src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/DeserializeEmptyStringAsNullClientBuilder.java","src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/implementation/DeserializeEmptyStringAsNullClientImpl.java","src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/implementation/package-info.java","src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/models/ResponseModel.java","src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/models/package-info.java","src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-flattenproperty_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-flattenproperty_apiview_properties.json deleted file mode 100644 index b62a2cbecf0..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-flattenproperty_apiview_properties.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty", - "azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient.putFlattenModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenModel", - "azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient.putFlattenModelWithResponse": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenModel", - "azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient.putNestedFlattenModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel", - "azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient.putNestedFlattenModelWithResponse": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel", - "azure.clientgenerator.core.flattenproperty.FlattenPropertyClient": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty", - "azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.putFlattenModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenModel", - "azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.putFlattenModelWithResponse": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenModel", - "azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.putNestedFlattenModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel", - "azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.putNestedFlattenModelWithResponse": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel", - "azure.clientgenerator.core.flattenproperty.FlattenPropertyClientBuilder": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty", - "azure.clientgenerator.core.flattenproperty.models.ChildFlattenModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.ChildFlattenModel", - "azure.clientgenerator.core.flattenproperty.models.ChildModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.ChildModel", - "azure.clientgenerator.core.flattenproperty.models.FlattenModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.FlattenModel", - "azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.NestedFlattenModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-flattenproperty_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-flattenproperty_metadata.json index 91781c5335f..1cac878f300 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-flattenproperty_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-flattenproperty_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty","azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient.putFlattenModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient.putFlattenModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient.putNestedFlattenModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient.putNestedFlattenModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyClient":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty","azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.putFlattenModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.putFlattenModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.putNestedFlattenModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.putNestedFlattenModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyClientBuilder":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty","azure.clientgenerator.core.flattenproperty.models.ChildFlattenModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.ChildFlattenModel","azure.clientgenerator.core.flattenproperty.models.ChildModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.ChildModel","azure.clientgenerator.core.flattenproperty.models.FlattenModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.FlattenModel","azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.NestedFlattenModel"},"generatedFiles":["src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyAsyncClient.java","src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClient.java","src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClientBuilder.java","src/main/java/azure/clientgenerator/core/flattenproperty/implementation/FlattenPropertyClientImpl.java","src/main/java/azure/clientgenerator/core/flattenproperty/implementation/package-info.java","src/main/java/azure/clientgenerator/core/flattenproperty/models/ChildFlattenModel.java","src/main/java/azure/clientgenerator/core/flattenproperty/models/ChildModel.java","src/main/java/azure/clientgenerator/core/flattenproperty/models/FlattenModel.java","src/main/java/azure/clientgenerator/core/flattenproperty/models/NestedFlattenModel.java","src/main/java/azure/clientgenerator/core/flattenproperty/models/package-info.java","src/main/java/azure/clientgenerator/core/flattenproperty/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty","azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient.putFlattenModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient.putFlattenModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient.putFlattenReadOnlyModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenReadOnlyModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient.putFlattenReadOnlyModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenReadOnlyModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient.putFlattenUnknownModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenUnknownModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient.putFlattenUnknownModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenUnknownModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient.putNestedFlattenModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyAsyncClient.putNestedFlattenModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyClient":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty","azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.putFlattenModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.putFlattenModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.putFlattenReadOnlyModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenReadOnlyModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.putFlattenReadOnlyModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenReadOnlyModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.putFlattenUnknownModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenUnknownModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.putFlattenUnknownModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenUnknownModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.putNestedFlattenModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.putNestedFlattenModelWithResponse":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel","azure.clientgenerator.core.flattenproperty.FlattenPropertyClientBuilder":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty","azure.clientgenerator.core.flattenproperty.models.ChildFlattenModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.ChildFlattenModel","azure.clientgenerator.core.flattenproperty.models.ChildModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.ChildModel","azure.clientgenerator.core.flattenproperty.models.FlattenModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.FlattenModel","azure.clientgenerator.core.flattenproperty.models.FlattenUnknownModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.FlattenUnknownModel","azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.NestedFlattenModel","azure.clientgenerator.core.flattenproperty.models.Solution":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.Solution","azure.clientgenerator.core.flattenproperty.models.SolutionProperties":"_Specs_.Azure.ClientGenerator.Core.FlattenProperty.SolutionProperties"},"generatedFiles":["src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyAsyncClient.java","src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClient.java","src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClientBuilder.java","src/main/java/azure/clientgenerator/core/flattenproperty/implementation/FlattenPropertyClientImpl.java","src/main/java/azure/clientgenerator/core/flattenproperty/implementation/package-info.java","src/main/java/azure/clientgenerator/core/flattenproperty/models/ChildFlattenModel.java","src/main/java/azure/clientgenerator/core/flattenproperty/models/ChildModel.java","src/main/java/azure/clientgenerator/core/flattenproperty/models/FlattenModel.java","src/main/java/azure/clientgenerator/core/flattenproperty/models/FlattenUnknownModel.java","src/main/java/azure/clientgenerator/core/flattenproperty/models/NestedFlattenModel.java","src/main/java/azure/clientgenerator/core/flattenproperty/models/Solution.java","src/main/java/azure/clientgenerator/core/flattenproperty/models/SolutionProperties.java","src/main/java/azure/clientgenerator/core/flattenproperty/models/package-info.java","src/main/java/azure/clientgenerator/core/flattenproperty/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-hierarchybuilding_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-hierarchybuilding_apiview_properties.json deleted file mode 100644 index eb9b9c02053..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-hierarchybuilding_apiview_properties.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.clientgenerator.core.hierarchybuilding.AnimalOperationsAsyncClient": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations", - "azure.clientgenerator.core.hierarchybuilding.AnimalOperationsAsyncClient.updateDogAsAnimal": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updateDogAsAnimal", - "azure.clientgenerator.core.hierarchybuilding.AnimalOperationsAsyncClient.updateDogAsAnimalWithResponse": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updateDogAsAnimal", - "azure.clientgenerator.core.hierarchybuilding.AnimalOperationsAsyncClient.updatePetAsAnimal": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updatePetAsAnimal", - "azure.clientgenerator.core.hierarchybuilding.AnimalOperationsAsyncClient.updatePetAsAnimalWithResponse": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updatePetAsAnimal", - "azure.clientgenerator.core.hierarchybuilding.AnimalOperationsClient": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations", - "azure.clientgenerator.core.hierarchybuilding.AnimalOperationsClient.updateDogAsAnimal": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updateDogAsAnimal", - "azure.clientgenerator.core.hierarchybuilding.AnimalOperationsClient.updateDogAsAnimalWithResponse": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updateDogAsAnimal", - "azure.clientgenerator.core.hierarchybuilding.AnimalOperationsClient.updatePetAsAnimal": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updatePetAsAnimal", - "azure.clientgenerator.core.hierarchybuilding.AnimalOperationsClient.updatePetAsAnimalWithResponse": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updatePetAsAnimal", - "azure.clientgenerator.core.hierarchybuilding.DogOperationsAsyncClient": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.DogOperations", - "azure.clientgenerator.core.hierarchybuilding.DogOperationsAsyncClient.updateDogAsDog": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.DogOperations.updateDogAsDog", - "azure.clientgenerator.core.hierarchybuilding.DogOperationsAsyncClient.updateDogAsDogWithResponse": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.DogOperations.updateDogAsDog", - "azure.clientgenerator.core.hierarchybuilding.DogOperationsClient": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.DogOperations", - "azure.clientgenerator.core.hierarchybuilding.DogOperationsClient.updateDogAsDog": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.DogOperations.updateDogAsDog", - "azure.clientgenerator.core.hierarchybuilding.DogOperationsClient.updateDogAsDogWithResponse": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.DogOperations.updateDogAsDog", - "azure.clientgenerator.core.hierarchybuilding.HierarchyBuildingClientBuilder": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding", - "azure.clientgenerator.core.hierarchybuilding.PetOperationsAsyncClient": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations", - "azure.clientgenerator.core.hierarchybuilding.PetOperationsAsyncClient.updateDogAsPet": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updateDogAsPet", - "azure.clientgenerator.core.hierarchybuilding.PetOperationsAsyncClient.updateDogAsPetWithResponse": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updateDogAsPet", - "azure.clientgenerator.core.hierarchybuilding.PetOperationsAsyncClient.updatePetAsPet": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updatePetAsPet", - "azure.clientgenerator.core.hierarchybuilding.PetOperationsAsyncClient.updatePetAsPetWithResponse": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updatePetAsPet", - "azure.clientgenerator.core.hierarchybuilding.PetOperationsClient": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations", - "azure.clientgenerator.core.hierarchybuilding.PetOperationsClient.updateDogAsPet": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updateDogAsPet", - "azure.clientgenerator.core.hierarchybuilding.PetOperationsClient.updateDogAsPetWithResponse": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updateDogAsPet", - "azure.clientgenerator.core.hierarchybuilding.PetOperationsClient.updatePetAsPet": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updatePetAsPet", - "azure.clientgenerator.core.hierarchybuilding.PetOperationsClient.updatePetAsPetWithResponse": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updatePetAsPet", - "azure.clientgenerator.core.hierarchybuilding.models.Animal": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.Animal", - "azure.clientgenerator.core.hierarchybuilding.models.Dog": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.Dog", - "azure.clientgenerator.core.hierarchybuilding.models.Pet": "_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.Pet" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-hierarchybuilding_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-hierarchybuilding_metadata.json index 495d8219de7..0a724d3c4b9 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-hierarchybuilding_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-hierarchybuilding_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.clientgenerator.core.hierarchybuilding.AnimalOperationsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations","azure.clientgenerator.core.hierarchybuilding.AnimalOperationsAsyncClient.updateDogAsAnimal":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updateDogAsAnimal","azure.clientgenerator.core.hierarchybuilding.AnimalOperationsAsyncClient.updateDogAsAnimalWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updateDogAsAnimal","azure.clientgenerator.core.hierarchybuilding.AnimalOperationsAsyncClient.updatePetAsAnimal":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updatePetAsAnimal","azure.clientgenerator.core.hierarchybuilding.AnimalOperationsAsyncClient.updatePetAsAnimalWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updatePetAsAnimal","azure.clientgenerator.core.hierarchybuilding.AnimalOperationsClient":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations","azure.clientgenerator.core.hierarchybuilding.AnimalOperationsClient.updateDogAsAnimal":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updateDogAsAnimal","azure.clientgenerator.core.hierarchybuilding.AnimalOperationsClient.updateDogAsAnimalWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updateDogAsAnimal","azure.clientgenerator.core.hierarchybuilding.AnimalOperationsClient.updatePetAsAnimal":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updatePetAsAnimal","azure.clientgenerator.core.hierarchybuilding.AnimalOperationsClient.updatePetAsAnimalWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updatePetAsAnimal","azure.clientgenerator.core.hierarchybuilding.DogOperationsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.DogOperations","azure.clientgenerator.core.hierarchybuilding.DogOperationsAsyncClient.updateDogAsDog":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.DogOperations.updateDogAsDog","azure.clientgenerator.core.hierarchybuilding.DogOperationsAsyncClient.updateDogAsDogWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.DogOperations.updateDogAsDog","azure.clientgenerator.core.hierarchybuilding.DogOperationsClient":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.DogOperations","azure.clientgenerator.core.hierarchybuilding.DogOperationsClient.updateDogAsDog":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.DogOperations.updateDogAsDog","azure.clientgenerator.core.hierarchybuilding.DogOperationsClient.updateDogAsDogWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.DogOperations.updateDogAsDog","azure.clientgenerator.core.hierarchybuilding.HierarchyBuildingClientBuilder":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding","azure.clientgenerator.core.hierarchybuilding.PetOperationsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations","azure.clientgenerator.core.hierarchybuilding.PetOperationsAsyncClient.updateDogAsPet":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updateDogAsPet","azure.clientgenerator.core.hierarchybuilding.PetOperationsAsyncClient.updateDogAsPetWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updateDogAsPet","azure.clientgenerator.core.hierarchybuilding.PetOperationsAsyncClient.updatePetAsPet":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updatePetAsPet","azure.clientgenerator.core.hierarchybuilding.PetOperationsAsyncClient.updatePetAsPetWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updatePetAsPet","azure.clientgenerator.core.hierarchybuilding.PetOperationsClient":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations","azure.clientgenerator.core.hierarchybuilding.PetOperationsClient.updateDogAsPet":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updateDogAsPet","azure.clientgenerator.core.hierarchybuilding.PetOperationsClient.updateDogAsPetWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updateDogAsPet","azure.clientgenerator.core.hierarchybuilding.PetOperationsClient.updatePetAsPet":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updatePetAsPet","azure.clientgenerator.core.hierarchybuilding.PetOperationsClient.updatePetAsPetWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updatePetAsPet","azure.clientgenerator.core.hierarchybuilding.models.Animal":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.Animal","azure.clientgenerator.core.hierarchybuilding.models.Dog":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.Dog","azure.clientgenerator.core.hierarchybuilding.models.Pet":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.Pet"},"generatedFiles":["src/main/java/azure/clientgenerator/core/hierarchybuilding/AnimalOperationsAsyncClient.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/AnimalOperationsClient.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/DogOperationsAsyncClient.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/DogOperationsClient.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/HierarchyBuildingClientBuilder.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/PetOperationsAsyncClient.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/PetOperationsClient.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/AnimalOperationsImpl.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/DogOperationsImpl.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/HierarchyBuildingClientImpl.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/PetOperationsImpl.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/package-info.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/models/Animal.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/models/Dog.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/models/Pet.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/models/package-info.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.clientgenerator.core.hierarchybuilding.AnimalOperationsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations","azure.clientgenerator.core.hierarchybuilding.AnimalOperationsAsyncClient.updateDogAsAnimal":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updateDogAsAnimal","azure.clientgenerator.core.hierarchybuilding.AnimalOperationsAsyncClient.updateDogAsAnimalWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updateDogAsAnimal","azure.clientgenerator.core.hierarchybuilding.AnimalOperationsAsyncClient.updatePetAsAnimal":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updatePetAsAnimal","azure.clientgenerator.core.hierarchybuilding.AnimalOperationsAsyncClient.updatePetAsAnimalWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updatePetAsAnimal","azure.clientgenerator.core.hierarchybuilding.AnimalOperationsClient":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations","azure.clientgenerator.core.hierarchybuilding.AnimalOperationsClient.updateDogAsAnimal":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updateDogAsAnimal","azure.clientgenerator.core.hierarchybuilding.AnimalOperationsClient.updateDogAsAnimalWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updateDogAsAnimal","azure.clientgenerator.core.hierarchybuilding.AnimalOperationsClient.updatePetAsAnimal":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updatePetAsAnimal","azure.clientgenerator.core.hierarchybuilding.AnimalOperationsClient.updatePetAsAnimalWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.AnimalOperations.updatePetAsAnimal","azure.clientgenerator.core.hierarchybuilding.DogOperationsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.DogOperations","azure.clientgenerator.core.hierarchybuilding.DogOperationsAsyncClient.updateDogAsDog":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.DogOperations.updateDogAsDog","azure.clientgenerator.core.hierarchybuilding.DogOperationsAsyncClient.updateDogAsDogWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.DogOperations.updateDogAsDog","azure.clientgenerator.core.hierarchybuilding.DogOperationsClient":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.DogOperations","azure.clientgenerator.core.hierarchybuilding.DogOperationsClient.updateDogAsDog":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.DogOperations.updateDogAsDog","azure.clientgenerator.core.hierarchybuilding.DogOperationsClient.updateDogAsDogWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.DogOperations.updateDogAsDog","azure.clientgenerator.core.hierarchybuilding.HierarchyBuildingClientBuilder":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding","azure.clientgenerator.core.hierarchybuilding.PetOperationsAsyncClient":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations","azure.clientgenerator.core.hierarchybuilding.PetOperationsAsyncClient.updateDogAsPet":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updateDogAsPet","azure.clientgenerator.core.hierarchybuilding.PetOperationsAsyncClient.updateDogAsPetWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updateDogAsPet","azure.clientgenerator.core.hierarchybuilding.PetOperationsAsyncClient.updatePetAsPet":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updatePetAsPet","azure.clientgenerator.core.hierarchybuilding.PetOperationsAsyncClient.updatePetAsPetWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updatePetAsPet","azure.clientgenerator.core.hierarchybuilding.PetOperationsClient":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations","azure.clientgenerator.core.hierarchybuilding.PetOperationsClient.updateDogAsPet":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updateDogAsPet","azure.clientgenerator.core.hierarchybuilding.PetOperationsClient.updateDogAsPetWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updateDogAsPet","azure.clientgenerator.core.hierarchybuilding.PetOperationsClient.updatePetAsPet":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updatePetAsPet","azure.clientgenerator.core.hierarchybuilding.PetOperationsClient.updatePetAsPetWithResponse":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.PetOperations.updatePetAsPet","azure.clientgenerator.core.hierarchybuilding.models.Animal":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.Animal","azure.clientgenerator.core.hierarchybuilding.models.Dog":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.Dog","azure.clientgenerator.core.hierarchybuilding.models.Pet":"_Specs_.Azure.ClientGenerator.Core.HierarchyBuilding.Pet"},"generatedFiles":["src/main/java/azure/clientgenerator/core/hierarchybuilding/AnimalOperationsAsyncClient.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/AnimalOperationsClient.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/DogOperationsAsyncClient.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/DogOperationsClient.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/HierarchyBuildingClientBuilder.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/PetOperationsAsyncClient.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/PetOperationsClient.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/AnimalOperationsImpl.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/DogOperationsImpl.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/HierarchyBuildingClientImpl.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/PetOperationsImpl.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/package-info.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/models/Animal.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/models/Dog.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/models/Pet.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/models/package-info.java","src/main/java/azure/clientgenerator/core/hierarchybuilding/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-methodoverride_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-methodoverride_apiview_properties.json deleted file mode 100644 index e731f5daf59..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-methodoverride_apiview_properties.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.clientgenerator.core.methodoverride.GroupParametersAsyncClient": "_Specs_.Azure.ClientGenerator.Core.Override.GroupParameters", - "azure.clientgenerator.core.methodoverride.GroupParametersAsyncClient.group": "_Specs_.Azure.ClientGenerator.Core.Override.GroupParameters.group", - "azure.clientgenerator.core.methodoverride.GroupParametersAsyncClient.groupWithResponse": "_Specs_.Azure.ClientGenerator.Core.Override.GroupParameters.group", - "azure.clientgenerator.core.methodoverride.GroupParametersClient": "_Specs_.Azure.ClientGenerator.Core.Override.GroupParameters", - "azure.clientgenerator.core.methodoverride.GroupParametersClient.group": "_Specs_.Azure.ClientGenerator.Core.Override.GroupParameters.group", - "azure.clientgenerator.core.methodoverride.GroupParametersClient.groupWithResponse": "_Specs_.Azure.ClientGenerator.Core.Override.GroupParameters.group", - "azure.clientgenerator.core.methodoverride.OverrideClientBuilder": "_Specs_.Azure.ClientGenerator.Core.Override", - "azure.clientgenerator.core.methodoverride.RemoveOptionalParameterAsyncClient": "_Specs_.Azure.ClientGenerator.Core.Override.RemoveOptionalParameter", - "azure.clientgenerator.core.methodoverride.RemoveOptionalParameterAsyncClient.removeOptional": "_Specs_.Azure.ClientGenerator.Core.Override.RemoveOptionalParameter.removeOptional", - "azure.clientgenerator.core.methodoverride.RemoveOptionalParameterAsyncClient.removeOptionalWithResponse": "_Specs_.Azure.ClientGenerator.Core.Override.RemoveOptionalParameter.removeOptional", - "azure.clientgenerator.core.methodoverride.RemoveOptionalParameterClient": "_Specs_.Azure.ClientGenerator.Core.Override.RemoveOptionalParameter", - "azure.clientgenerator.core.methodoverride.RemoveOptionalParameterClient.removeOptional": "_Specs_.Azure.ClientGenerator.Core.Override.RemoveOptionalParameter.removeOptional", - "azure.clientgenerator.core.methodoverride.RemoveOptionalParameterClient.removeOptionalWithResponse": "_Specs_.Azure.ClientGenerator.Core.Override.RemoveOptionalParameter.removeOptional", - "azure.clientgenerator.core.methodoverride.ReorderParametersAsyncClient": "_Specs_.Azure.ClientGenerator.Core.Override.ReorderParameters", - "azure.clientgenerator.core.methodoverride.ReorderParametersAsyncClient.reorder": "_Specs_.Azure.ClientGenerator.Core.Override.ReorderParameters.reorder", - "azure.clientgenerator.core.methodoverride.ReorderParametersAsyncClient.reorderWithResponse": "_Specs_.Azure.ClientGenerator.Core.Override.ReorderParameters.reorder", - "azure.clientgenerator.core.methodoverride.ReorderParametersClient": "_Specs_.Azure.ClientGenerator.Core.Override.ReorderParameters", - "azure.clientgenerator.core.methodoverride.ReorderParametersClient.reorder": "_Specs_.Azure.ClientGenerator.Core.Override.ReorderParameters.reorder", - "azure.clientgenerator.core.methodoverride.ReorderParametersClient.reorderWithResponse": "_Specs_.Azure.ClientGenerator.Core.Override.ReorderParameters.reorder", - "azure.clientgenerator.core.methodoverride.RequireOptionalParameterAsyncClient": "_Specs_.Azure.ClientGenerator.Core.Override.RequireOptionalParameter", - "azure.clientgenerator.core.methodoverride.RequireOptionalParameterAsyncClient.requireOptional": "_Specs_.Azure.ClientGenerator.Core.Override.RequireOptionalParameter.requireOptional", - "azure.clientgenerator.core.methodoverride.RequireOptionalParameterAsyncClient.requireOptionalWithResponse": "_Specs_.Azure.ClientGenerator.Core.Override.RequireOptionalParameter.requireOptional", - "azure.clientgenerator.core.methodoverride.RequireOptionalParameterClient": "_Specs_.Azure.ClientGenerator.Core.Override.RequireOptionalParameter", - "azure.clientgenerator.core.methodoverride.RequireOptionalParameterClient.requireOptional": "_Specs_.Azure.ClientGenerator.Core.Override.RequireOptionalParameter.requireOptional", - "azure.clientgenerator.core.methodoverride.RequireOptionalParameterClient.requireOptionalWithResponse": "_Specs_.Azure.ClientGenerator.Core.Override.RequireOptionalParameter.requireOptional", - "azure.clientgenerator.core.methodoverride.models.GroupParametersOptions": null - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-methodoverride_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-methodoverride_metadata.json index d57f5228241..2bac687459d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-methodoverride_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-methodoverride_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.clientgenerator.core.methodoverride.GroupParametersAsyncClient":"_Specs_.Azure.ClientGenerator.Core.Override.GroupParameters","azure.clientgenerator.core.methodoverride.GroupParametersAsyncClient.group":"_Specs_.Azure.ClientGenerator.Core.Override.GroupParameters.group","azure.clientgenerator.core.methodoverride.GroupParametersAsyncClient.groupWithResponse":"_Specs_.Azure.ClientGenerator.Core.Override.GroupParameters.group","azure.clientgenerator.core.methodoverride.GroupParametersClient":"_Specs_.Azure.ClientGenerator.Core.Override.GroupParameters","azure.clientgenerator.core.methodoverride.GroupParametersClient.group":"_Specs_.Azure.ClientGenerator.Core.Override.GroupParameters.group","azure.clientgenerator.core.methodoverride.GroupParametersClient.groupWithResponse":"_Specs_.Azure.ClientGenerator.Core.Override.GroupParameters.group","azure.clientgenerator.core.methodoverride.OverrideClientBuilder":"_Specs_.Azure.ClientGenerator.Core.Override","azure.clientgenerator.core.methodoverride.RemoveOptionalParameterAsyncClient":"_Specs_.Azure.ClientGenerator.Core.Override.RemoveOptionalParameter","azure.clientgenerator.core.methodoverride.RemoveOptionalParameterAsyncClient.removeOptional":"_Specs_.Azure.ClientGenerator.Core.Override.RemoveOptionalParameter.removeOptional","azure.clientgenerator.core.methodoverride.RemoveOptionalParameterAsyncClient.removeOptionalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Override.RemoveOptionalParameter.removeOptional","azure.clientgenerator.core.methodoverride.RemoveOptionalParameterClient":"_Specs_.Azure.ClientGenerator.Core.Override.RemoveOptionalParameter","azure.clientgenerator.core.methodoverride.RemoveOptionalParameterClient.removeOptional":"_Specs_.Azure.ClientGenerator.Core.Override.RemoveOptionalParameter.removeOptional","azure.clientgenerator.core.methodoverride.RemoveOptionalParameterClient.removeOptionalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Override.RemoveOptionalParameter.removeOptional","azure.clientgenerator.core.methodoverride.ReorderParametersAsyncClient":"_Specs_.Azure.ClientGenerator.Core.Override.ReorderParameters","azure.clientgenerator.core.methodoverride.ReorderParametersAsyncClient.reorder":"_Specs_.Azure.ClientGenerator.Core.Override.ReorderParameters.reorder","azure.clientgenerator.core.methodoverride.ReorderParametersAsyncClient.reorderWithResponse":"_Specs_.Azure.ClientGenerator.Core.Override.ReorderParameters.reorder","azure.clientgenerator.core.methodoverride.ReorderParametersClient":"_Specs_.Azure.ClientGenerator.Core.Override.ReorderParameters","azure.clientgenerator.core.methodoverride.ReorderParametersClient.reorder":"_Specs_.Azure.ClientGenerator.Core.Override.ReorderParameters.reorder","azure.clientgenerator.core.methodoverride.ReorderParametersClient.reorderWithResponse":"_Specs_.Azure.ClientGenerator.Core.Override.ReorderParameters.reorder","azure.clientgenerator.core.methodoverride.RequireOptionalParameterAsyncClient":"_Specs_.Azure.ClientGenerator.Core.Override.RequireOptionalParameter","azure.clientgenerator.core.methodoverride.RequireOptionalParameterAsyncClient.requireOptional":"_Specs_.Azure.ClientGenerator.Core.Override.RequireOptionalParameter.requireOptional","azure.clientgenerator.core.methodoverride.RequireOptionalParameterAsyncClient.requireOptionalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Override.RequireOptionalParameter.requireOptional","azure.clientgenerator.core.methodoverride.RequireOptionalParameterClient":"_Specs_.Azure.ClientGenerator.Core.Override.RequireOptionalParameter","azure.clientgenerator.core.methodoverride.RequireOptionalParameterClient.requireOptional":"_Specs_.Azure.ClientGenerator.Core.Override.RequireOptionalParameter.requireOptional","azure.clientgenerator.core.methodoverride.RequireOptionalParameterClient.requireOptionalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Override.RequireOptionalParameter.requireOptional","azure.clientgenerator.core.methodoverride.models.GroupParametersOptions":null},"generatedFiles":["src/main/java/azure/clientgenerator/core/methodoverride/GroupParametersAsyncClient.java","src/main/java/azure/clientgenerator/core/methodoverride/GroupParametersClient.java","src/main/java/azure/clientgenerator/core/methodoverride/OverrideClientBuilder.java","src/main/java/azure/clientgenerator/core/methodoverride/RemoveOptionalParameterAsyncClient.java","src/main/java/azure/clientgenerator/core/methodoverride/RemoveOptionalParameterClient.java","src/main/java/azure/clientgenerator/core/methodoverride/ReorderParametersAsyncClient.java","src/main/java/azure/clientgenerator/core/methodoverride/ReorderParametersClient.java","src/main/java/azure/clientgenerator/core/methodoverride/RequireOptionalParameterAsyncClient.java","src/main/java/azure/clientgenerator/core/methodoverride/RequireOptionalParameterClient.java","src/main/java/azure/clientgenerator/core/methodoverride/implementation/GroupParametersImpl.java","src/main/java/azure/clientgenerator/core/methodoverride/implementation/OverrideClientImpl.java","src/main/java/azure/clientgenerator/core/methodoverride/implementation/RemoveOptionalParametersImpl.java","src/main/java/azure/clientgenerator/core/methodoverride/implementation/ReorderParametersImpl.java","src/main/java/azure/clientgenerator/core/methodoverride/implementation/RequireOptionalParametersImpl.java","src/main/java/azure/clientgenerator/core/methodoverride/implementation/package-info.java","src/main/java/azure/clientgenerator/core/methodoverride/models/GroupParametersOptions.java","src/main/java/azure/clientgenerator/core/methodoverride/models/package-info.java","src/main/java/azure/clientgenerator/core/methodoverride/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.clientgenerator.core.methodoverride.GroupParametersAsyncClient":"_Specs_.Azure.ClientGenerator.Core.Override.GroupParameters","azure.clientgenerator.core.methodoverride.GroupParametersAsyncClient.group":"_Specs_.Azure.ClientGenerator.Core.Override.GroupParameters.group","azure.clientgenerator.core.methodoverride.GroupParametersAsyncClient.groupWithResponse":"_Specs_.Azure.ClientGenerator.Core.Override.GroupParameters.group","azure.clientgenerator.core.methodoverride.GroupParametersClient":"_Specs_.Azure.ClientGenerator.Core.Override.GroupParameters","azure.clientgenerator.core.methodoverride.GroupParametersClient.group":"_Specs_.Azure.ClientGenerator.Core.Override.GroupParameters.group","azure.clientgenerator.core.methodoverride.GroupParametersClient.groupWithResponse":"_Specs_.Azure.ClientGenerator.Core.Override.GroupParameters.group","azure.clientgenerator.core.methodoverride.OverrideClientBuilder":"_Specs_.Azure.ClientGenerator.Core.Override","azure.clientgenerator.core.methodoverride.RemoveOptionalParameterAsyncClient":"_Specs_.Azure.ClientGenerator.Core.Override.RemoveOptionalParameter","azure.clientgenerator.core.methodoverride.RemoveOptionalParameterAsyncClient.removeOptional":"_Specs_.Azure.ClientGenerator.Core.Override.RemoveOptionalParameter.removeOptional","azure.clientgenerator.core.methodoverride.RemoveOptionalParameterAsyncClient.removeOptionalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Override.RemoveOptionalParameter.removeOptional","azure.clientgenerator.core.methodoverride.RemoveOptionalParameterClient":"_Specs_.Azure.ClientGenerator.Core.Override.RemoveOptionalParameter","azure.clientgenerator.core.methodoverride.RemoveOptionalParameterClient.removeOptional":"_Specs_.Azure.ClientGenerator.Core.Override.RemoveOptionalParameter.removeOptional","azure.clientgenerator.core.methodoverride.RemoveOptionalParameterClient.removeOptionalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Override.RemoveOptionalParameter.removeOptional","azure.clientgenerator.core.methodoverride.ReorderParametersAsyncClient":"_Specs_.Azure.ClientGenerator.Core.Override.ReorderParameters","azure.clientgenerator.core.methodoverride.ReorderParametersAsyncClient.reorder":"_Specs_.Azure.ClientGenerator.Core.Override.ReorderParameters.reorder","azure.clientgenerator.core.methodoverride.ReorderParametersAsyncClient.reorderWithResponse":"_Specs_.Azure.ClientGenerator.Core.Override.ReorderParameters.reorder","azure.clientgenerator.core.methodoverride.ReorderParametersClient":"_Specs_.Azure.ClientGenerator.Core.Override.ReorderParameters","azure.clientgenerator.core.methodoverride.ReorderParametersClient.reorder":"_Specs_.Azure.ClientGenerator.Core.Override.ReorderParameters.reorder","azure.clientgenerator.core.methodoverride.ReorderParametersClient.reorderWithResponse":"_Specs_.Azure.ClientGenerator.Core.Override.ReorderParameters.reorder","azure.clientgenerator.core.methodoverride.RequireOptionalParameterAsyncClient":"_Specs_.Azure.ClientGenerator.Core.Override.RequireOptionalParameter","azure.clientgenerator.core.methodoverride.RequireOptionalParameterAsyncClient.requireOptional":"_Specs_.Azure.ClientGenerator.Core.Override.RequireOptionalParameter.requireOptional","azure.clientgenerator.core.methodoverride.RequireOptionalParameterAsyncClient.requireOptionalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Override.RequireOptionalParameter.requireOptional","azure.clientgenerator.core.methodoverride.RequireOptionalParameterClient":"_Specs_.Azure.ClientGenerator.Core.Override.RequireOptionalParameter","azure.clientgenerator.core.methodoverride.RequireOptionalParameterClient.requireOptional":"_Specs_.Azure.ClientGenerator.Core.Override.RequireOptionalParameter.requireOptional","azure.clientgenerator.core.methodoverride.RequireOptionalParameterClient.requireOptionalWithResponse":"_Specs_.Azure.ClientGenerator.Core.Override.RequireOptionalParameter.requireOptional","azure.clientgenerator.core.methodoverride.models.GroupParametersOptions":null},"generatedFiles":["src/main/java/azure/clientgenerator/core/methodoverride/GroupParametersAsyncClient.java","src/main/java/azure/clientgenerator/core/methodoverride/GroupParametersClient.java","src/main/java/azure/clientgenerator/core/methodoverride/OverrideClientBuilder.java","src/main/java/azure/clientgenerator/core/methodoverride/RemoveOptionalParameterAsyncClient.java","src/main/java/azure/clientgenerator/core/methodoverride/RemoveOptionalParameterClient.java","src/main/java/azure/clientgenerator/core/methodoverride/ReorderParametersAsyncClient.java","src/main/java/azure/clientgenerator/core/methodoverride/ReorderParametersClient.java","src/main/java/azure/clientgenerator/core/methodoverride/RequireOptionalParameterAsyncClient.java","src/main/java/azure/clientgenerator/core/methodoverride/RequireOptionalParameterClient.java","src/main/java/azure/clientgenerator/core/methodoverride/implementation/GroupParametersImpl.java","src/main/java/azure/clientgenerator/core/methodoverride/implementation/OverrideClientImpl.java","src/main/java/azure/clientgenerator/core/methodoverride/implementation/RemoveOptionalParametersImpl.java","src/main/java/azure/clientgenerator/core/methodoverride/implementation/ReorderParametersImpl.java","src/main/java/azure/clientgenerator/core/methodoverride/implementation/RequireOptionalParametersImpl.java","src/main/java/azure/clientgenerator/core/methodoverride/implementation/package-info.java","src/main/java/azure/clientgenerator/core/methodoverride/models/GroupParametersOptions.java","src/main/java/azure/clientgenerator/core/methodoverride/models/package-info.java","src/main/java/azure/clientgenerator/core/methodoverride/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-nextlinkverb_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-nextlinkverb_apiview_properties.json deleted file mode 100644 index c07cf51fbfc..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-nextlinkverb_apiview_properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.clientgenerator.core.nextlinkverb.NextLinkVerbAsyncClient": "_Specs_.Azure.ClientGenerator.Core.NextLinkVerb", - "azure.clientgenerator.core.nextlinkverb.NextLinkVerbAsyncClient.listItems": "_Specs_.Azure.ClientGenerator.Core.NextLinkVerb.listItems", - "azure.clientgenerator.core.nextlinkverb.NextLinkVerbClient": "_Specs_.Azure.ClientGenerator.Core.NextLinkVerb", - "azure.clientgenerator.core.nextlinkverb.NextLinkVerbClient.listItems": "_Specs_.Azure.ClientGenerator.Core.NextLinkVerb.listItems", - "azure.clientgenerator.core.nextlinkverb.NextLinkVerbClientBuilder": "_Specs_.Azure.ClientGenerator.Core.NextLinkVerb", - "azure.clientgenerator.core.nextlinkverb.models.Test": "_Specs_.Azure.ClientGenerator.Core.NextLinkVerb.Test" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-nextlinkverb_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-nextlinkverb_metadata.json index 052cd7c74fe..09371173a6f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-nextlinkverb_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-nextlinkverb_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.clientgenerator.core.nextlinkverb.NextLinkVerbAsyncClient":"_Specs_.Azure.ClientGenerator.Core.NextLinkVerb","azure.clientgenerator.core.nextlinkverb.NextLinkVerbAsyncClient.listItems":"_Specs_.Azure.ClientGenerator.Core.NextLinkVerb.listItems","azure.clientgenerator.core.nextlinkverb.NextLinkVerbClient":"_Specs_.Azure.ClientGenerator.Core.NextLinkVerb","azure.clientgenerator.core.nextlinkverb.NextLinkVerbClient.listItems":"_Specs_.Azure.ClientGenerator.Core.NextLinkVerb.listItems","azure.clientgenerator.core.nextlinkverb.NextLinkVerbClientBuilder":"_Specs_.Azure.ClientGenerator.Core.NextLinkVerb","azure.clientgenerator.core.nextlinkverb.models.Test":"_Specs_.Azure.ClientGenerator.Core.NextLinkVerb.Test"},"generatedFiles":["src/main/java/azure/clientgenerator/core/nextlinkverb/NextLinkVerbAsyncClient.java","src/main/java/azure/clientgenerator/core/nextlinkverb/NextLinkVerbClient.java","src/main/java/azure/clientgenerator/core/nextlinkverb/NextLinkVerbClientBuilder.java","src/main/java/azure/clientgenerator/core/nextlinkverb/implementation/NextLinkVerbClientImpl.java","src/main/java/azure/clientgenerator/core/nextlinkverb/implementation/package-info.java","src/main/java/azure/clientgenerator/core/nextlinkverb/models/Test.java","src/main/java/azure/clientgenerator/core/nextlinkverb/models/package-info.java","src/main/java/azure/clientgenerator/core/nextlinkverb/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.clientgenerator.core.nextlinkverb.NextLinkVerbAsyncClient":"_Specs_.Azure.ClientGenerator.Core.NextLinkVerb","azure.clientgenerator.core.nextlinkverb.NextLinkVerbAsyncClient.listItems":"_Specs_.Azure.ClientGenerator.Core.NextLinkVerb.listItems","azure.clientgenerator.core.nextlinkverb.NextLinkVerbClient":"_Specs_.Azure.ClientGenerator.Core.NextLinkVerb","azure.clientgenerator.core.nextlinkverb.NextLinkVerbClient.listItems":"_Specs_.Azure.ClientGenerator.Core.NextLinkVerb.listItems","azure.clientgenerator.core.nextlinkverb.NextLinkVerbClientBuilder":"_Specs_.Azure.ClientGenerator.Core.NextLinkVerb","azure.clientgenerator.core.nextlinkverb.models.Test":"_Specs_.Azure.ClientGenerator.Core.NextLinkVerb.Test"},"generatedFiles":["src/main/java/azure/clientgenerator/core/nextlinkverb/NextLinkVerbAsyncClient.java","src/main/java/azure/clientgenerator/core/nextlinkverb/NextLinkVerbClient.java","src/main/java/azure/clientgenerator/core/nextlinkverb/NextLinkVerbClientBuilder.java","src/main/java/azure/clientgenerator/core/nextlinkverb/implementation/NextLinkVerbClientImpl.java","src/main/java/azure/clientgenerator/core/nextlinkverb/implementation/package-info.java","src/main/java/azure/clientgenerator/core/nextlinkverb/models/Test.java","src/main/java/azure/clientgenerator/core/nextlinkverb/models/package-info.java","src/main/java/azure/clientgenerator/core/nextlinkverb/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-usage_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-usage_apiview_properties.json deleted file mode 100644 index 0fc1637b80a..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-usage_apiview_properties.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.clientgenerator.core.usage.UsageAsyncClient": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation", - "azure.clientgenerator.core.usage.UsageAsyncClient.inputToInputOutput": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.inputToInputOutput", - "azure.clientgenerator.core.usage.UsageAsyncClient.inputToInputOutputWithResponse": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.inputToInputOutput", - "azure.clientgenerator.core.usage.UsageAsyncClient.modelInReadOnlyProperty": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.modelInReadOnlyProperty", - "azure.clientgenerator.core.usage.UsageAsyncClient.modelInReadOnlyPropertyWithResponse": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.modelInReadOnlyProperty", - "azure.clientgenerator.core.usage.UsageAsyncClient.outputToInputOutput": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.outputToInputOutput", - "azure.clientgenerator.core.usage.UsageAsyncClient.outputToInputOutputWithResponse": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.outputToInputOutput", - "azure.clientgenerator.core.usage.UsageClient": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation", - "azure.clientgenerator.core.usage.UsageClient.inputToInputOutput": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.inputToInputOutput", - "azure.clientgenerator.core.usage.UsageClient.inputToInputOutputWithResponse": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.inputToInputOutput", - "azure.clientgenerator.core.usage.UsageClient.modelInReadOnlyProperty": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.modelInReadOnlyProperty", - "azure.clientgenerator.core.usage.UsageClient.modelInReadOnlyPropertyWithResponse": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.modelInReadOnlyProperty", - "azure.clientgenerator.core.usage.UsageClient.outputToInputOutput": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.outputToInputOutput", - "azure.clientgenerator.core.usage.UsageClient.outputToInputOutputWithResponse": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.outputToInputOutput", - "azure.clientgenerator.core.usage.UsageClientBuilder": "_Specs_.Azure.ClientGenerator.Core.Usage", - "azure.clientgenerator.core.usage.models.InputModel": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.InputModel", - "azure.clientgenerator.core.usage.models.OrphanModel": "_Specs_.Azure.ClientGenerator.Core.Usage.OrphanModel", - "azure.clientgenerator.core.usage.models.OutputModel": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.OutputModel", - "azure.clientgenerator.core.usage.models.ResultModel": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.ResultModel", - "azure.clientgenerator.core.usage.models.RoundTripModel": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.RoundTripModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-usage_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-usage_metadata.json index 8b43ddbb1ba..f2f8ce515af 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-usage_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-clientgenerator-core-usage_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.clientgenerator.core.usage.UsageAsyncClient":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation","azure.clientgenerator.core.usage.UsageAsyncClient.inputToInputOutput":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.inputToInputOutput","azure.clientgenerator.core.usage.UsageAsyncClient.inputToInputOutputWithResponse":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.inputToInputOutput","azure.clientgenerator.core.usage.UsageAsyncClient.modelInReadOnlyProperty":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.modelInReadOnlyProperty","azure.clientgenerator.core.usage.UsageAsyncClient.modelInReadOnlyPropertyWithResponse":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.modelInReadOnlyProperty","azure.clientgenerator.core.usage.UsageAsyncClient.outputToInputOutput":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.outputToInputOutput","azure.clientgenerator.core.usage.UsageAsyncClient.outputToInputOutputWithResponse":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.outputToInputOutput","azure.clientgenerator.core.usage.UsageClient":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation","azure.clientgenerator.core.usage.UsageClient.inputToInputOutput":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.inputToInputOutput","azure.clientgenerator.core.usage.UsageClient.inputToInputOutputWithResponse":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.inputToInputOutput","azure.clientgenerator.core.usage.UsageClient.modelInReadOnlyProperty":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.modelInReadOnlyProperty","azure.clientgenerator.core.usage.UsageClient.modelInReadOnlyPropertyWithResponse":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.modelInReadOnlyProperty","azure.clientgenerator.core.usage.UsageClient.outputToInputOutput":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.outputToInputOutput","azure.clientgenerator.core.usage.UsageClient.outputToInputOutputWithResponse":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.outputToInputOutput","azure.clientgenerator.core.usage.UsageClientBuilder":"_Specs_.Azure.ClientGenerator.Core.Usage","azure.clientgenerator.core.usage.models.InputModel":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.InputModel","azure.clientgenerator.core.usage.models.OrphanModel":"_Specs_.Azure.ClientGenerator.Core.Usage.OrphanModel","azure.clientgenerator.core.usage.models.OutputModel":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.OutputModel","azure.clientgenerator.core.usage.models.ResultModel":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.ResultModel","azure.clientgenerator.core.usage.models.RoundTripModel":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.RoundTripModel"},"generatedFiles":["src/main/java/azure/clientgenerator/core/usage/UsageAsyncClient.java","src/main/java/azure/clientgenerator/core/usage/UsageClient.java","src/main/java/azure/clientgenerator/core/usage/UsageClientBuilder.java","src/main/java/azure/clientgenerator/core/usage/implementation/ModelInOperationsImpl.java","src/main/java/azure/clientgenerator/core/usage/implementation/UsageClientImpl.java","src/main/java/azure/clientgenerator/core/usage/implementation/package-info.java","src/main/java/azure/clientgenerator/core/usage/models/InputModel.java","src/main/java/azure/clientgenerator/core/usage/models/OrphanModel.java","src/main/java/azure/clientgenerator/core/usage/models/OutputModel.java","src/main/java/azure/clientgenerator/core/usage/models/ResultModel.java","src/main/java/azure/clientgenerator/core/usage/models/RoundTripModel.java","src/main/java/azure/clientgenerator/core/usage/models/package-info.java","src/main/java/azure/clientgenerator/core/usage/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.clientgenerator.core.usage.UsageAsyncClient":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation","azure.clientgenerator.core.usage.UsageAsyncClient.inputToInputOutput":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.inputToInputOutput","azure.clientgenerator.core.usage.UsageAsyncClient.inputToInputOutputWithResponse":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.inputToInputOutput","azure.clientgenerator.core.usage.UsageAsyncClient.modelInReadOnlyProperty":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.modelInReadOnlyProperty","azure.clientgenerator.core.usage.UsageAsyncClient.modelInReadOnlyPropertyWithResponse":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.modelInReadOnlyProperty","azure.clientgenerator.core.usage.UsageAsyncClient.outputToInputOutput":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.outputToInputOutput","azure.clientgenerator.core.usage.UsageAsyncClient.outputToInputOutputWithResponse":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.outputToInputOutput","azure.clientgenerator.core.usage.UsageClient":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation","azure.clientgenerator.core.usage.UsageClient.inputToInputOutput":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.inputToInputOutput","azure.clientgenerator.core.usage.UsageClient.inputToInputOutputWithResponse":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.inputToInputOutput","azure.clientgenerator.core.usage.UsageClient.modelInReadOnlyProperty":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.modelInReadOnlyProperty","azure.clientgenerator.core.usage.UsageClient.modelInReadOnlyPropertyWithResponse":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.modelInReadOnlyProperty","azure.clientgenerator.core.usage.UsageClient.outputToInputOutput":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.outputToInputOutput","azure.clientgenerator.core.usage.UsageClient.outputToInputOutputWithResponse":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.outputToInputOutput","azure.clientgenerator.core.usage.UsageClientBuilder":"_Specs_.Azure.ClientGenerator.Core.Usage","azure.clientgenerator.core.usage.models.InputModel":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.InputModel","azure.clientgenerator.core.usage.models.OrphanModel":"_Specs_.Azure.ClientGenerator.Core.Usage.OrphanModel","azure.clientgenerator.core.usage.models.OutputModel":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.OutputModel","azure.clientgenerator.core.usage.models.ResultModel":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.ResultModel","azure.clientgenerator.core.usage.models.RoundTripModel":"_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.RoundTripModel"},"generatedFiles":["src/main/java/azure/clientgenerator/core/usage/UsageAsyncClient.java","src/main/java/azure/clientgenerator/core/usage/UsageClient.java","src/main/java/azure/clientgenerator/core/usage/UsageClientBuilder.java","src/main/java/azure/clientgenerator/core/usage/implementation/ModelInOperationsImpl.java","src/main/java/azure/clientgenerator/core/usage/implementation/UsageClientImpl.java","src/main/java/azure/clientgenerator/core/usage/implementation/package-info.java","src/main/java/azure/clientgenerator/core/usage/models/InputModel.java","src/main/java/azure/clientgenerator/core/usage/models/OrphanModel.java","src/main/java/azure/clientgenerator/core/usage/models/OutputModel.java","src/main/java/azure/clientgenerator/core/usage/models/ResultModel.java","src/main/java/azure/clientgenerator/core/usage/models/RoundTripModel.java","src/main/java/azure/clientgenerator/core/usage/models/package-info.java","src/main/java/azure/clientgenerator/core/usage/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-basic_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-basic_apiview_properties.json deleted file mode 100644 index 6adeef17226..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-basic_apiview_properties.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.core.basic.BasicAsyncClient": "_Specs_.Azure.Core.Basic", - "azure.core.basic.BasicAsyncClient.createOrReplace": "_Specs_.Azure.Core.Basic.createOrReplace", - "azure.core.basic.BasicAsyncClient.createOrReplaceWithResponse": "_Specs_.Azure.Core.Basic.createOrReplace", - "azure.core.basic.BasicAsyncClient.createOrUpdate": "_Specs_.Azure.Core.Basic.createOrUpdate", - "azure.core.basic.BasicAsyncClient.createOrUpdateWithResponse": "_Specs_.Azure.Core.Basic.createOrUpdate", - "azure.core.basic.BasicAsyncClient.delete": "_Specs_.Azure.Core.Basic.delete", - "azure.core.basic.BasicAsyncClient.deleteWithResponse": "_Specs_.Azure.Core.Basic.delete", - "azure.core.basic.BasicAsyncClient.export": "_Specs_.Azure.Core.Basic.export", - "azure.core.basic.BasicAsyncClient.exportAllUsers": "_Specs_.Azure.Core.Basic.exportAllUsers", - "azure.core.basic.BasicAsyncClient.exportAllUsersWithResponse": "_Specs_.Azure.Core.Basic.exportAllUsers", - "azure.core.basic.BasicAsyncClient.exportWithResponse": "_Specs_.Azure.Core.Basic.export", - "azure.core.basic.BasicAsyncClient.get": "_Specs_.Azure.Core.Basic.get", - "azure.core.basic.BasicAsyncClient.getWithResponse": "_Specs_.Azure.Core.Basic.get", - "azure.core.basic.BasicAsyncClient.list": "_Specs_.Azure.Core.Basic.list", - "azure.core.basic.BasicClient": "_Specs_.Azure.Core.Basic", - "azure.core.basic.BasicClient.createOrReplace": "_Specs_.Azure.Core.Basic.createOrReplace", - "azure.core.basic.BasicClient.createOrReplaceWithResponse": "_Specs_.Azure.Core.Basic.createOrReplace", - "azure.core.basic.BasicClient.createOrUpdate": "_Specs_.Azure.Core.Basic.createOrUpdate", - "azure.core.basic.BasicClient.createOrUpdateWithResponse": "_Specs_.Azure.Core.Basic.createOrUpdate", - "azure.core.basic.BasicClient.delete": "_Specs_.Azure.Core.Basic.delete", - "azure.core.basic.BasicClient.deleteWithResponse": "_Specs_.Azure.Core.Basic.delete", - "azure.core.basic.BasicClient.export": "_Specs_.Azure.Core.Basic.export", - "azure.core.basic.BasicClient.exportAllUsers": "_Specs_.Azure.Core.Basic.exportAllUsers", - "azure.core.basic.BasicClient.exportAllUsersWithResponse": "_Specs_.Azure.Core.Basic.exportAllUsers", - "azure.core.basic.BasicClient.exportWithResponse": "_Specs_.Azure.Core.Basic.export", - "azure.core.basic.BasicClient.get": "_Specs_.Azure.Core.Basic.get", - "azure.core.basic.BasicClient.getWithResponse": "_Specs_.Azure.Core.Basic.get", - "azure.core.basic.BasicClient.list": "_Specs_.Azure.Core.Basic.list", - "azure.core.basic.BasicClientBuilder": "_Specs_.Azure.Core.Basic", - "azure.core.basic.models.User": "_Specs_.Azure.Core.Basic.User", - "azure.core.basic.models.UserList": "_Specs_.Azure.Core.Basic.UserList", - "azure.core.basic.models.UserOrder": "_Specs_.Azure.Core.Basic.UserOrder" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-basic_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-basic_metadata.json index af3ee916621..022545f050f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-basic_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-basic_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2022-12-01-preview","crossLanguageDefinitions":{"azure.core.basic.BasicAsyncClient":"_Specs_.Azure.Core.Basic","azure.core.basic.BasicAsyncClient.createOrReplace":"_Specs_.Azure.Core.Basic.createOrReplace","azure.core.basic.BasicAsyncClient.createOrReplaceWithResponse":"_Specs_.Azure.Core.Basic.createOrReplace","azure.core.basic.BasicAsyncClient.createOrUpdate":"_Specs_.Azure.Core.Basic.createOrUpdate","azure.core.basic.BasicAsyncClient.createOrUpdateWithResponse":"_Specs_.Azure.Core.Basic.createOrUpdate","azure.core.basic.BasicAsyncClient.delete":"_Specs_.Azure.Core.Basic.delete","azure.core.basic.BasicAsyncClient.deleteWithResponse":"_Specs_.Azure.Core.Basic.delete","azure.core.basic.BasicAsyncClient.export":"_Specs_.Azure.Core.Basic.export","azure.core.basic.BasicAsyncClient.exportAllUsers":"_Specs_.Azure.Core.Basic.exportAllUsers","azure.core.basic.BasicAsyncClient.exportAllUsersWithResponse":"_Specs_.Azure.Core.Basic.exportAllUsers","azure.core.basic.BasicAsyncClient.exportWithResponse":"_Specs_.Azure.Core.Basic.export","azure.core.basic.BasicAsyncClient.get":"_Specs_.Azure.Core.Basic.get","azure.core.basic.BasicAsyncClient.getWithResponse":"_Specs_.Azure.Core.Basic.get","azure.core.basic.BasicAsyncClient.list":"_Specs_.Azure.Core.Basic.list","azure.core.basic.BasicClient":"_Specs_.Azure.Core.Basic","azure.core.basic.BasicClient.createOrReplace":"_Specs_.Azure.Core.Basic.createOrReplace","azure.core.basic.BasicClient.createOrReplaceWithResponse":"_Specs_.Azure.Core.Basic.createOrReplace","azure.core.basic.BasicClient.createOrUpdate":"_Specs_.Azure.Core.Basic.createOrUpdate","azure.core.basic.BasicClient.createOrUpdateWithResponse":"_Specs_.Azure.Core.Basic.createOrUpdate","azure.core.basic.BasicClient.delete":"_Specs_.Azure.Core.Basic.delete","azure.core.basic.BasicClient.deleteWithResponse":"_Specs_.Azure.Core.Basic.delete","azure.core.basic.BasicClient.export":"_Specs_.Azure.Core.Basic.export","azure.core.basic.BasicClient.exportAllUsers":"_Specs_.Azure.Core.Basic.exportAllUsers","azure.core.basic.BasicClient.exportAllUsersWithResponse":"_Specs_.Azure.Core.Basic.exportAllUsers","azure.core.basic.BasicClient.exportWithResponse":"_Specs_.Azure.Core.Basic.export","azure.core.basic.BasicClient.get":"_Specs_.Azure.Core.Basic.get","azure.core.basic.BasicClient.getWithResponse":"_Specs_.Azure.Core.Basic.get","azure.core.basic.BasicClient.list":"_Specs_.Azure.Core.Basic.list","azure.core.basic.BasicClientBuilder":"_Specs_.Azure.Core.Basic","azure.core.basic.models.User":"_Specs_.Azure.Core.Basic.User","azure.core.basic.models.UserList":"_Specs_.Azure.Core.Basic.UserList","azure.core.basic.models.UserOrder":"_Specs_.Azure.Core.Basic.UserOrder"},"generatedFiles":["src/main/java/azure/core/basic/BasicAsyncClient.java","src/main/java/azure/core/basic/BasicClient.java","src/main/java/azure/core/basic/BasicClientBuilder.java","src/main/java/azure/core/basic/BasicServiceVersion.java","src/main/java/azure/core/basic/implementation/BasicClientImpl.java","src/main/java/azure/core/basic/implementation/JsonMergePatchHelper.java","src/main/java/azure/core/basic/implementation/package-info.java","src/main/java/azure/core/basic/models/User.java","src/main/java/azure/core/basic/models/UserList.java","src/main/java/azure/core/basic/models/UserOrder.java","src/main/java/azure/core/basic/models/package-info.java","src/main/java/azure/core/basic/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"_Specs_.Azure.Core.Basic":"2022-12-01-preview"},"crossLanguageDefinitions":{"azure.core.basic.BasicAsyncClient":"_Specs_.Azure.Core.Basic","azure.core.basic.BasicAsyncClient.createOrReplace":"_Specs_.Azure.Core.Basic.createOrReplace","azure.core.basic.BasicAsyncClient.createOrReplaceWithResponse":"_Specs_.Azure.Core.Basic.createOrReplace","azure.core.basic.BasicAsyncClient.createOrUpdate":"_Specs_.Azure.Core.Basic.createOrUpdate","azure.core.basic.BasicAsyncClient.createOrUpdateWithResponse":"_Specs_.Azure.Core.Basic.createOrUpdate","azure.core.basic.BasicAsyncClient.delete":"_Specs_.Azure.Core.Basic.delete","azure.core.basic.BasicAsyncClient.deleteWithResponse":"_Specs_.Azure.Core.Basic.delete","azure.core.basic.BasicAsyncClient.export":"_Specs_.Azure.Core.Basic.export","azure.core.basic.BasicAsyncClient.exportAllUsers":"_Specs_.Azure.Core.Basic.exportAllUsers","azure.core.basic.BasicAsyncClient.exportAllUsersWithResponse":"_Specs_.Azure.Core.Basic.exportAllUsers","azure.core.basic.BasicAsyncClient.exportWithResponse":"_Specs_.Azure.Core.Basic.export","azure.core.basic.BasicAsyncClient.get":"_Specs_.Azure.Core.Basic.get","azure.core.basic.BasicAsyncClient.getWithResponse":"_Specs_.Azure.Core.Basic.get","azure.core.basic.BasicAsyncClient.list":"_Specs_.Azure.Core.Basic.list","azure.core.basic.BasicClient":"_Specs_.Azure.Core.Basic","azure.core.basic.BasicClient.createOrReplace":"_Specs_.Azure.Core.Basic.createOrReplace","azure.core.basic.BasicClient.createOrReplaceWithResponse":"_Specs_.Azure.Core.Basic.createOrReplace","azure.core.basic.BasicClient.createOrUpdate":"_Specs_.Azure.Core.Basic.createOrUpdate","azure.core.basic.BasicClient.createOrUpdateWithResponse":"_Specs_.Azure.Core.Basic.createOrUpdate","azure.core.basic.BasicClient.delete":"_Specs_.Azure.Core.Basic.delete","azure.core.basic.BasicClient.deleteWithResponse":"_Specs_.Azure.Core.Basic.delete","azure.core.basic.BasicClient.export":"_Specs_.Azure.Core.Basic.export","azure.core.basic.BasicClient.exportAllUsers":"_Specs_.Azure.Core.Basic.exportAllUsers","azure.core.basic.BasicClient.exportAllUsersWithResponse":"_Specs_.Azure.Core.Basic.exportAllUsers","azure.core.basic.BasicClient.exportWithResponse":"_Specs_.Azure.Core.Basic.export","azure.core.basic.BasicClient.get":"_Specs_.Azure.Core.Basic.get","azure.core.basic.BasicClient.getWithResponse":"_Specs_.Azure.Core.Basic.get","azure.core.basic.BasicClient.list":"_Specs_.Azure.Core.Basic.list","azure.core.basic.BasicClientBuilder":"_Specs_.Azure.Core.Basic","azure.core.basic.models.User":"_Specs_.Azure.Core.Basic.User","azure.core.basic.models.UserList":"_Specs_.Azure.Core.Basic.UserList","azure.core.basic.models.UserOrder":"_Specs_.Azure.Core.Basic.UserOrder"},"generatedFiles":["src/main/java/azure/core/basic/BasicAsyncClient.java","src/main/java/azure/core/basic/BasicClient.java","src/main/java/azure/core/basic/BasicClientBuilder.java","src/main/java/azure/core/basic/BasicServiceVersion.java","src/main/java/azure/core/basic/implementation/BasicClientImpl.java","src/main/java/azure/core/basic/implementation/JsonMergePatchHelper.java","src/main/java/azure/core/basic/implementation/package-info.java","src/main/java/azure/core/basic/models/User.java","src/main/java/azure/core/basic/models/UserList.java","src/main/java/azure/core/basic/models/UserOrder.java","src/main/java/azure/core/basic/models/package-info.java","src/main/java/azure/core/basic/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-lro-rpc_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-lro-rpc_apiview_properties.json deleted file mode 100644 index 2f41d55d8dc..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-lro-rpc_apiview_properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.core.lro.rpc.RpcAsyncClient": "_Specs_.Azure.Core.Lro.Rpc", - "azure.core.lro.rpc.RpcAsyncClient.beginLongRunningRpc": "_Specs_.Azure.Core.Lro.Rpc.longRunningRpc", - "azure.core.lro.rpc.RpcAsyncClient.beginLongRunningRpcWithModel": "_Specs_.Azure.Core.Lro.Rpc.longRunningRpc", - "azure.core.lro.rpc.RpcClient": "_Specs_.Azure.Core.Lro.Rpc", - "azure.core.lro.rpc.RpcClient.beginLongRunningRpc": "_Specs_.Azure.Core.Lro.Rpc.longRunningRpc", - "azure.core.lro.rpc.RpcClient.beginLongRunningRpcWithModel": "_Specs_.Azure.Core.Lro.Rpc.longRunningRpc", - "azure.core.lro.rpc.RpcClientBuilder": "_Specs_.Azure.Core.Lro.Rpc", - "azure.core.lro.rpc.models.GenerationOptions": "_Specs_.Azure.Core.Lro.Rpc.GenerationOptions", - "azure.core.lro.rpc.models.GenerationResult": "_Specs_.Azure.Core.Lro.Rpc.GenerationResult" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-lro-rpc_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-lro-rpc_metadata.json index 779d36e24f7..df62e10032e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-lro-rpc_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-lro-rpc_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2022-12-01-preview","crossLanguageDefinitions":{"azure.core.lro.rpc.RpcAsyncClient":"_Specs_.Azure.Core.Lro.Rpc","azure.core.lro.rpc.RpcAsyncClient.beginLongRunningRpc":"_Specs_.Azure.Core.Lro.Rpc.longRunningRpc","azure.core.lro.rpc.RpcAsyncClient.beginLongRunningRpcWithModel":"_Specs_.Azure.Core.Lro.Rpc.longRunningRpc","azure.core.lro.rpc.RpcClient":"_Specs_.Azure.Core.Lro.Rpc","azure.core.lro.rpc.RpcClient.beginLongRunningRpc":"_Specs_.Azure.Core.Lro.Rpc.longRunningRpc","azure.core.lro.rpc.RpcClient.beginLongRunningRpcWithModel":"_Specs_.Azure.Core.Lro.Rpc.longRunningRpc","azure.core.lro.rpc.RpcClientBuilder":"_Specs_.Azure.Core.Lro.Rpc","azure.core.lro.rpc.models.GenerationOptions":"_Specs_.Azure.Core.Lro.Rpc.GenerationOptions","azure.core.lro.rpc.models.GenerationResult":"_Specs_.Azure.Core.Lro.Rpc.GenerationResult"},"generatedFiles":["src/main/java/azure/core/lro/rpc/RpcAsyncClient.java","src/main/java/azure/core/lro/rpc/RpcClient.java","src/main/java/azure/core/lro/rpc/RpcClientBuilder.java","src/main/java/azure/core/lro/rpc/RpcServiceVersion.java","src/main/java/azure/core/lro/rpc/implementation/OperationLocationPollingStrategy.java","src/main/java/azure/core/lro/rpc/implementation/PollingUtils.java","src/main/java/azure/core/lro/rpc/implementation/RpcClientImpl.java","src/main/java/azure/core/lro/rpc/implementation/SyncOperationLocationPollingStrategy.java","src/main/java/azure/core/lro/rpc/implementation/package-info.java","src/main/java/azure/core/lro/rpc/models/GenerationOptions.java","src/main/java/azure/core/lro/rpc/models/GenerationResult.java","src/main/java/azure/core/lro/rpc/models/package-info.java","src/main/java/azure/core/lro/rpc/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"_Specs_.Azure.Core.Lro.Rpc":"2022-12-01-preview"},"crossLanguageDefinitions":{"azure.core.lro.rpc.RpcAsyncClient":"_Specs_.Azure.Core.Lro.Rpc","azure.core.lro.rpc.RpcAsyncClient.beginLongRunningRpc":"_Specs_.Azure.Core.Lro.Rpc.longRunningRpc","azure.core.lro.rpc.RpcAsyncClient.beginLongRunningRpcWithModel":"_Specs_.Azure.Core.Lro.Rpc.longRunningRpc","azure.core.lro.rpc.RpcClient":"_Specs_.Azure.Core.Lro.Rpc","azure.core.lro.rpc.RpcClient.beginLongRunningRpc":"_Specs_.Azure.Core.Lro.Rpc.longRunningRpc","azure.core.lro.rpc.RpcClient.beginLongRunningRpcWithModel":"_Specs_.Azure.Core.Lro.Rpc.longRunningRpc","azure.core.lro.rpc.RpcClientBuilder":"_Specs_.Azure.Core.Lro.Rpc","azure.core.lro.rpc.models.GenerationOptions":"_Specs_.Azure.Core.Lro.Rpc.GenerationOptions","azure.core.lro.rpc.models.GenerationResult":"_Specs_.Azure.Core.Lro.Rpc.GenerationResult"},"generatedFiles":["src/main/java/azure/core/lro/rpc/RpcAsyncClient.java","src/main/java/azure/core/lro/rpc/RpcClient.java","src/main/java/azure/core/lro/rpc/RpcClientBuilder.java","src/main/java/azure/core/lro/rpc/RpcServiceVersion.java","src/main/java/azure/core/lro/rpc/implementation/OperationLocationPollingStrategy.java","src/main/java/azure/core/lro/rpc/implementation/PollingUtils.java","src/main/java/azure/core/lro/rpc/implementation/RpcClientImpl.java","src/main/java/azure/core/lro/rpc/implementation/SyncOperationLocationPollingStrategy.java","src/main/java/azure/core/lro/rpc/implementation/package-info.java","src/main/java/azure/core/lro/rpc/models/GenerationOptions.java","src/main/java/azure/core/lro/rpc/models/GenerationResult.java","src/main/java/azure/core/lro/rpc/models/package-info.java","src/main/java/azure/core/lro/rpc/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-lro-standard_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-lro-standard_apiview_properties.json deleted file mode 100644 index f595608fbe1..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-lro-standard_apiview_properties.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.core.lro.standard.StandardAsyncClient": "_Specs_.Azure.Core.Lro.Standard", - "azure.core.lro.standard.StandardAsyncClient.beginCreateOrReplace": "_Specs_.Azure.Core.Lro.Standard.createOrReplace", - "azure.core.lro.standard.StandardAsyncClient.beginCreateOrReplaceWithModel": "_Specs_.Azure.Core.Lro.Standard.createOrReplace", - "azure.core.lro.standard.StandardAsyncClient.beginDelete": "_Specs_.Azure.Core.Lro.Standard.delete", - "azure.core.lro.standard.StandardAsyncClient.beginDeleteWithModel": "_Specs_.Azure.Core.Lro.Standard.delete", - "azure.core.lro.standard.StandardAsyncClient.beginExport": "_Specs_.Azure.Core.Lro.Standard.export", - "azure.core.lro.standard.StandardAsyncClient.beginExportWithModel": "_Specs_.Azure.Core.Lro.Standard.export", - "azure.core.lro.standard.StandardClient": "_Specs_.Azure.Core.Lro.Standard", - "azure.core.lro.standard.StandardClient.beginCreateOrReplace": "_Specs_.Azure.Core.Lro.Standard.createOrReplace", - "azure.core.lro.standard.StandardClient.beginCreateOrReplaceWithModel": "_Specs_.Azure.Core.Lro.Standard.createOrReplace", - "azure.core.lro.standard.StandardClient.beginDelete": "_Specs_.Azure.Core.Lro.Standard.delete", - "azure.core.lro.standard.StandardClient.beginDeleteWithModel": "_Specs_.Azure.Core.Lro.Standard.delete", - "azure.core.lro.standard.StandardClient.beginExport": "_Specs_.Azure.Core.Lro.Standard.export", - "azure.core.lro.standard.StandardClient.beginExportWithModel": "_Specs_.Azure.Core.Lro.Standard.export", - "azure.core.lro.standard.StandardClientBuilder": "_Specs_.Azure.Core.Lro.Standard", - "azure.core.lro.standard.models.ExportedUser": "_Specs_.Azure.Core.Lro.Standard.ExportedUser", - "azure.core.lro.standard.models.User": "_Specs_.Azure.Core.Lro.Standard.User" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-lro-standard_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-lro-standard_metadata.json index e826d2e20c1..801db73fb41 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-lro-standard_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-lro-standard_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2022-12-01-preview","crossLanguageDefinitions":{"azure.core.lro.standard.StandardAsyncClient":"_Specs_.Azure.Core.Lro.Standard","azure.core.lro.standard.StandardAsyncClient.beginCreateOrReplace":"_Specs_.Azure.Core.Lro.Standard.createOrReplace","azure.core.lro.standard.StandardAsyncClient.beginCreateOrReplaceWithModel":"_Specs_.Azure.Core.Lro.Standard.createOrReplace","azure.core.lro.standard.StandardAsyncClient.beginDelete":"_Specs_.Azure.Core.Lro.Standard.delete","azure.core.lro.standard.StandardAsyncClient.beginDeleteWithModel":"_Specs_.Azure.Core.Lro.Standard.delete","azure.core.lro.standard.StandardAsyncClient.beginExport":"_Specs_.Azure.Core.Lro.Standard.export","azure.core.lro.standard.StandardAsyncClient.beginExportWithModel":"_Specs_.Azure.Core.Lro.Standard.export","azure.core.lro.standard.StandardClient":"_Specs_.Azure.Core.Lro.Standard","azure.core.lro.standard.StandardClient.beginCreateOrReplace":"_Specs_.Azure.Core.Lro.Standard.createOrReplace","azure.core.lro.standard.StandardClient.beginCreateOrReplaceWithModel":"_Specs_.Azure.Core.Lro.Standard.createOrReplace","azure.core.lro.standard.StandardClient.beginDelete":"_Specs_.Azure.Core.Lro.Standard.delete","azure.core.lro.standard.StandardClient.beginDeleteWithModel":"_Specs_.Azure.Core.Lro.Standard.delete","azure.core.lro.standard.StandardClient.beginExport":"_Specs_.Azure.Core.Lro.Standard.export","azure.core.lro.standard.StandardClient.beginExportWithModel":"_Specs_.Azure.Core.Lro.Standard.export","azure.core.lro.standard.StandardClientBuilder":"_Specs_.Azure.Core.Lro.Standard","azure.core.lro.standard.models.ExportedUser":"_Specs_.Azure.Core.Lro.Standard.ExportedUser","azure.core.lro.standard.models.User":"_Specs_.Azure.Core.Lro.Standard.User"},"generatedFiles":["src/main/java/azure/core/lro/standard/StandardAsyncClient.java","src/main/java/azure/core/lro/standard/StandardClient.java","src/main/java/azure/core/lro/standard/StandardClientBuilder.java","src/main/java/azure/core/lro/standard/StandardServiceVersion.java","src/main/java/azure/core/lro/standard/implementation/OperationLocationPollingStrategy.java","src/main/java/azure/core/lro/standard/implementation/PollingUtils.java","src/main/java/azure/core/lro/standard/implementation/StandardClientImpl.java","src/main/java/azure/core/lro/standard/implementation/SyncOperationLocationPollingStrategy.java","src/main/java/azure/core/lro/standard/implementation/package-info.java","src/main/java/azure/core/lro/standard/models/ExportedUser.java","src/main/java/azure/core/lro/standard/models/User.java","src/main/java/azure/core/lro/standard/models/package-info.java","src/main/java/azure/core/lro/standard/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"_Specs_.Azure.Core.Lro.Standard":"2022-12-01-preview"},"crossLanguageDefinitions":{"azure.core.lro.standard.StandardAsyncClient":"_Specs_.Azure.Core.Lro.Standard","azure.core.lro.standard.StandardAsyncClient.beginCreateOrReplace":"_Specs_.Azure.Core.Lro.Standard.createOrReplace","azure.core.lro.standard.StandardAsyncClient.beginCreateOrReplaceWithModel":"_Specs_.Azure.Core.Lro.Standard.createOrReplace","azure.core.lro.standard.StandardAsyncClient.beginDelete":"_Specs_.Azure.Core.Lro.Standard.delete","azure.core.lro.standard.StandardAsyncClient.beginDeleteWithModel":"_Specs_.Azure.Core.Lro.Standard.delete","azure.core.lro.standard.StandardAsyncClient.beginExport":"_Specs_.Azure.Core.Lro.Standard.export","azure.core.lro.standard.StandardAsyncClient.beginExportWithModel":"_Specs_.Azure.Core.Lro.Standard.export","azure.core.lro.standard.StandardClient":"_Specs_.Azure.Core.Lro.Standard","azure.core.lro.standard.StandardClient.beginCreateOrReplace":"_Specs_.Azure.Core.Lro.Standard.createOrReplace","azure.core.lro.standard.StandardClient.beginCreateOrReplaceWithModel":"_Specs_.Azure.Core.Lro.Standard.createOrReplace","azure.core.lro.standard.StandardClient.beginDelete":"_Specs_.Azure.Core.Lro.Standard.delete","azure.core.lro.standard.StandardClient.beginDeleteWithModel":"_Specs_.Azure.Core.Lro.Standard.delete","azure.core.lro.standard.StandardClient.beginExport":"_Specs_.Azure.Core.Lro.Standard.export","azure.core.lro.standard.StandardClient.beginExportWithModel":"_Specs_.Azure.Core.Lro.Standard.export","azure.core.lro.standard.StandardClientBuilder":"_Specs_.Azure.Core.Lro.Standard","azure.core.lro.standard.models.ExportedUser":"_Specs_.Azure.Core.Lro.Standard.ExportedUser","azure.core.lro.standard.models.User":"_Specs_.Azure.Core.Lro.Standard.User"},"generatedFiles":["src/main/java/azure/core/lro/standard/StandardAsyncClient.java","src/main/java/azure/core/lro/standard/StandardClient.java","src/main/java/azure/core/lro/standard/StandardClientBuilder.java","src/main/java/azure/core/lro/standard/StandardServiceVersion.java","src/main/java/azure/core/lro/standard/implementation/OperationLocationPollingStrategy.java","src/main/java/azure/core/lro/standard/implementation/PollingUtils.java","src/main/java/azure/core/lro/standard/implementation/StandardClientImpl.java","src/main/java/azure/core/lro/standard/implementation/SyncOperationLocationPollingStrategy.java","src/main/java/azure/core/lro/standard/implementation/package-info.java","src/main/java/azure/core/lro/standard/models/ExportedUser.java","src/main/java/azure/core/lro/standard/models/User.java","src/main/java/azure/core/lro/standard/models/package-info.java","src/main/java/azure/core/lro/standard/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-model_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-model_apiview_properties.json deleted file mode 100644 index 2d2610f90c8..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-model_apiview_properties.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.core.model.ModelAsyncClient": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector", - "azure.core.model.ModelAsyncClient.get": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.get", - "azure.core.model.ModelAsyncClient.getWithResponse": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.get", - "azure.core.model.ModelAsyncClient.post": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.post", - "azure.core.model.ModelAsyncClient.postWithResponse": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.post", - "azure.core.model.ModelAsyncClient.put": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.put", - "azure.core.model.ModelAsyncClient.putWithResponse": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.put", - "azure.core.model.ModelClient": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector", - "azure.core.model.ModelClient.get": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.get", - "azure.core.model.ModelClient.getWithResponse": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.get", - "azure.core.model.ModelClient.post": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.post", - "azure.core.model.ModelClient.postWithResponse": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.post", - "azure.core.model.ModelClient.put": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.put", - "azure.core.model.ModelClient.putWithResponse": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.put", - "azure.core.model.ModelClientBuilder": "_Specs_.Azure.Core.Model", - "azure.core.model.models.AzureEmbeddingModel": "_Specs_.Azure.Core.Model.AzureEmbeddingModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-model_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-model_metadata.json index d33186735b9..3ed064178fa 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-model_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-model_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2022-12-01-preview","crossLanguageDefinitions":{"azure.core.model.ModelAsyncClient":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector","azure.core.model.ModelAsyncClient.get":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.get","azure.core.model.ModelAsyncClient.getWithResponse":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.get","azure.core.model.ModelAsyncClient.post":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.post","azure.core.model.ModelAsyncClient.postWithResponse":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.post","azure.core.model.ModelAsyncClient.put":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.put","azure.core.model.ModelAsyncClient.putWithResponse":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.put","azure.core.model.ModelClient":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector","azure.core.model.ModelClient.get":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.get","azure.core.model.ModelClient.getWithResponse":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.get","azure.core.model.ModelClient.post":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.post","azure.core.model.ModelClient.postWithResponse":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.post","azure.core.model.ModelClient.put":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.put","azure.core.model.ModelClient.putWithResponse":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.put","azure.core.model.ModelClientBuilder":"_Specs_.Azure.Core.Model","azure.core.model.models.AzureEmbeddingModel":"_Specs_.Azure.Core.Model.AzureEmbeddingModel"},"generatedFiles":["src/main/java/azure/core/model/ModelAsyncClient.java","src/main/java/azure/core/model/ModelClient.java","src/main/java/azure/core/model/ModelClientBuilder.java","src/main/java/azure/core/model/ModelServiceVersion.java","src/main/java/azure/core/model/implementation/AzureCoreEmbeddingVectorsImpl.java","src/main/java/azure/core/model/implementation/ModelClientImpl.java","src/main/java/azure/core/model/implementation/package-info.java","src/main/java/azure/core/model/models/AzureEmbeddingModel.java","src/main/java/azure/core/model/models/package-info.java","src/main/java/azure/core/model/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"_Specs_.Azure.Core.Model":"2022-12-01-preview"},"crossLanguageDefinitions":{"azure.core.model.ModelAsyncClient":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector","azure.core.model.ModelAsyncClient.get":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.get","azure.core.model.ModelAsyncClient.getWithResponse":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.get","azure.core.model.ModelAsyncClient.post":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.post","azure.core.model.ModelAsyncClient.postWithResponse":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.post","azure.core.model.ModelAsyncClient.put":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.put","azure.core.model.ModelAsyncClient.putWithResponse":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.put","azure.core.model.ModelClient":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector","azure.core.model.ModelClient.get":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.get","azure.core.model.ModelClient.getWithResponse":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.get","azure.core.model.ModelClient.post":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.post","azure.core.model.ModelClient.postWithResponse":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.post","azure.core.model.ModelClient.put":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.put","azure.core.model.ModelClient.putWithResponse":"_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.put","azure.core.model.ModelClientBuilder":"_Specs_.Azure.Core.Model","azure.core.model.models.AzureEmbeddingModel":"_Specs_.Azure.Core.Model.AzureEmbeddingModel"},"generatedFiles":["src/main/java/azure/core/model/ModelAsyncClient.java","src/main/java/azure/core/model/ModelClient.java","src/main/java/azure/core/model/ModelClientBuilder.java","src/main/java/azure/core/model/ModelServiceVersion.java","src/main/java/azure/core/model/implementation/AzureCoreEmbeddingVectorsImpl.java","src/main/java/azure/core/model/implementation/ModelClientImpl.java","src/main/java/azure/core/model/implementation/package-info.java","src/main/java/azure/core/model/models/AzureEmbeddingModel.java","src/main/java/azure/core/model/models/package-info.java","src/main/java/azure/core/model/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-page_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-page_apiview_properties.json deleted file mode 100644 index bbd2a4eae5d..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-page_apiview_properties.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.core.page.PageAsyncClient": "_Specs_.Azure.Core.Page", - "azure.core.page.PageAsyncClient.listWithCustomPageModel": "_Specs_.Azure.Core.Page.listWithCustomPageModel", - "azure.core.page.PageAsyncClient.listWithPage": "_Specs_.Azure.Core.Page.listWithPage", - "azure.core.page.PageAsyncClient.listWithParameters": "_Specs_.Azure.Core.Page.listWithParameters", - "azure.core.page.PageAsyncClient.withParameterizedNextLink": "_Specs_.Azure.Core.Page.withParameterizedNextLink", - "azure.core.page.PageClient": "_Specs_.Azure.Core.Page", - "azure.core.page.PageClient.listWithCustomPageModel": "_Specs_.Azure.Core.Page.listWithCustomPageModel", - "azure.core.page.PageClient.listWithPage": "_Specs_.Azure.Core.Page.listWithPage", - "azure.core.page.PageClient.listWithParameters": "_Specs_.Azure.Core.Page.listWithParameters", - "azure.core.page.PageClient.withParameterizedNextLink": "_Specs_.Azure.Core.Page.withParameterizedNextLink", - "azure.core.page.PageClientBuilder": "_Specs_.Azure.Core.Page", - "azure.core.page.TwoModelsAsPageItemAsyncClient": "_Specs_.Azure.Core.Page.TwoModelsAsPageItem", - "azure.core.page.TwoModelsAsPageItemAsyncClient.listFirstItem": "_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listFirstItem", - "azure.core.page.TwoModelsAsPageItemAsyncClient.listSecondItem": "_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listSecondItem", - "azure.core.page.TwoModelsAsPageItemClient": "_Specs_.Azure.Core.Page.TwoModelsAsPageItem", - "azure.core.page.TwoModelsAsPageItemClient.listFirstItem": "_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listFirstItem", - "azure.core.page.TwoModelsAsPageItemClient.listSecondItem": "_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listSecondItem", - "azure.core.page.models.FirstItem": "_Specs_.Azure.Core.Page.FirstItem", - "azure.core.page.models.ListItemInputBody": "_Specs_.Azure.Core.Page.ListItemInputBody", - "azure.core.page.models.ListItemInputExtensibleEnum": "_Specs_.Azure.Core.Page.ListItemInputExtensibleEnum", - "azure.core.page.models.SecondItem": "_Specs_.Azure.Core.Page.SecondItem", - "azure.core.page.models.User": "_Specs_.Azure.Core.Page.User", - "azure.core.page.models.UserOrder": "_Specs_.Azure.Core.Page.UserOrder" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-page_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-page_metadata.json index fb07c449bde..13d482e0b9b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-page_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-page_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2022-12-01-preview","crossLanguageDefinitions":{"azure.core.page.PageAsyncClient":"_Specs_.Azure.Core.Page","azure.core.page.PageAsyncClient.listWithCustomPageModel":"_Specs_.Azure.Core.Page.listWithCustomPageModel","azure.core.page.PageAsyncClient.listWithPage":"_Specs_.Azure.Core.Page.listWithPage","azure.core.page.PageAsyncClient.listWithParameters":"_Specs_.Azure.Core.Page.listWithParameters","azure.core.page.PageAsyncClient.withParameterizedNextLink":"_Specs_.Azure.Core.Page.withParameterizedNextLink","azure.core.page.PageClient":"_Specs_.Azure.Core.Page","azure.core.page.PageClient.listWithCustomPageModel":"_Specs_.Azure.Core.Page.listWithCustomPageModel","azure.core.page.PageClient.listWithPage":"_Specs_.Azure.Core.Page.listWithPage","azure.core.page.PageClient.listWithParameters":"_Specs_.Azure.Core.Page.listWithParameters","azure.core.page.PageClient.withParameterizedNextLink":"_Specs_.Azure.Core.Page.withParameterizedNextLink","azure.core.page.PageClientBuilder":"_Specs_.Azure.Core.Page","azure.core.page.TwoModelsAsPageItemAsyncClient":"_Specs_.Azure.Core.Page.TwoModelsAsPageItem","azure.core.page.TwoModelsAsPageItemAsyncClient.listFirstItem":"_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listFirstItem","azure.core.page.TwoModelsAsPageItemAsyncClient.listSecondItem":"_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listSecondItem","azure.core.page.TwoModelsAsPageItemClient":"_Specs_.Azure.Core.Page.TwoModelsAsPageItem","azure.core.page.TwoModelsAsPageItemClient.listFirstItem":"_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listFirstItem","azure.core.page.TwoModelsAsPageItemClient.listSecondItem":"_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listSecondItem","azure.core.page.models.FirstItem":"_Specs_.Azure.Core.Page.FirstItem","azure.core.page.models.ListItemInputBody":"_Specs_.Azure.Core.Page.ListItemInputBody","azure.core.page.models.ListItemInputExtensibleEnum":"_Specs_.Azure.Core.Page.ListItemInputExtensibleEnum","azure.core.page.models.SecondItem":"_Specs_.Azure.Core.Page.SecondItem","azure.core.page.models.User":"_Specs_.Azure.Core.Page.User","azure.core.page.models.UserOrder":"_Specs_.Azure.Core.Page.UserOrder"},"generatedFiles":["src/main/java/azure/core/page/PageAsyncClient.java","src/main/java/azure/core/page/PageClient.java","src/main/java/azure/core/page/PageClientBuilder.java","src/main/java/azure/core/page/PageServiceVersion.java","src/main/java/azure/core/page/TwoModelsAsPageItemAsyncClient.java","src/main/java/azure/core/page/TwoModelsAsPageItemClient.java","src/main/java/azure/core/page/implementation/PageClientImpl.java","src/main/java/azure/core/page/implementation/TwoModelsAsPageItemsImpl.java","src/main/java/azure/core/page/implementation/package-info.java","src/main/java/azure/core/page/models/FirstItem.java","src/main/java/azure/core/page/models/ListItemInputBody.java","src/main/java/azure/core/page/models/ListItemInputExtensibleEnum.java","src/main/java/azure/core/page/models/SecondItem.java","src/main/java/azure/core/page/models/User.java","src/main/java/azure/core/page/models/UserOrder.java","src/main/java/azure/core/page/models/package-info.java","src/main/java/azure/core/page/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"_Specs_.Azure.Core.Page":"2022-12-01-preview"},"crossLanguageDefinitions":{"azure.core.page.PageAsyncClient":"_Specs_.Azure.Core.Page","azure.core.page.PageAsyncClient.listWithCustomPageModel":"_Specs_.Azure.Core.Page.listWithCustomPageModel","azure.core.page.PageAsyncClient.listWithPage":"_Specs_.Azure.Core.Page.listWithPage","azure.core.page.PageAsyncClient.listWithParameters":"_Specs_.Azure.Core.Page.listWithParameters","azure.core.page.PageAsyncClient.withParameterizedNextLink":"_Specs_.Azure.Core.Page.withParameterizedNextLink","azure.core.page.PageAsyncClient.withRelativeNextLink":"_Specs_.Azure.Core.Page.withRelativeNextLink","azure.core.page.PageClient":"_Specs_.Azure.Core.Page","azure.core.page.PageClient.listWithCustomPageModel":"_Specs_.Azure.Core.Page.listWithCustomPageModel","azure.core.page.PageClient.listWithPage":"_Specs_.Azure.Core.Page.listWithPage","azure.core.page.PageClient.listWithParameters":"_Specs_.Azure.Core.Page.listWithParameters","azure.core.page.PageClient.withParameterizedNextLink":"_Specs_.Azure.Core.Page.withParameterizedNextLink","azure.core.page.PageClient.withRelativeNextLink":"_Specs_.Azure.Core.Page.withRelativeNextLink","azure.core.page.PageClientBuilder":"_Specs_.Azure.Core.Page","azure.core.page.TwoModelsAsPageItemAsyncClient":"_Specs_.Azure.Core.Page.TwoModelsAsPageItem","azure.core.page.TwoModelsAsPageItemAsyncClient.listFirstItem":"_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listFirstItem","azure.core.page.TwoModelsAsPageItemAsyncClient.listSecondItem":"_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listSecondItem","azure.core.page.TwoModelsAsPageItemClient":"_Specs_.Azure.Core.Page.TwoModelsAsPageItem","azure.core.page.TwoModelsAsPageItemClient.listFirstItem":"_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listFirstItem","azure.core.page.TwoModelsAsPageItemClient.listSecondItem":"_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listSecondItem","azure.core.page.models.FirstItem":"_Specs_.Azure.Core.Page.FirstItem","azure.core.page.models.ListItemInputBody":"_Specs_.Azure.Core.Page.ListItemInputBody","azure.core.page.models.ListItemInputExtensibleEnum":"_Specs_.Azure.Core.Page.ListItemInputExtensibleEnum","azure.core.page.models.SecondItem":"_Specs_.Azure.Core.Page.SecondItem","azure.core.page.models.User":"_Specs_.Azure.Core.Page.User","azure.core.page.models.UserOrder":"_Specs_.Azure.Core.Page.UserOrder"},"generatedFiles":["src/main/java/azure/core/page/PageAsyncClient.java","src/main/java/azure/core/page/PageClient.java","src/main/java/azure/core/page/PageClientBuilder.java","src/main/java/azure/core/page/PageServiceVersion.java","src/main/java/azure/core/page/TwoModelsAsPageItemAsyncClient.java","src/main/java/azure/core/page/TwoModelsAsPageItemClient.java","src/main/java/azure/core/page/implementation/PageClientImpl.java","src/main/java/azure/core/page/implementation/TwoModelsAsPageItemsImpl.java","src/main/java/azure/core/page/implementation/package-info.java","src/main/java/azure/core/page/models/FirstItem.java","src/main/java/azure/core/page/models/ListItemInputBody.java","src/main/java/azure/core/page/models/ListItemInputExtensibleEnum.java","src/main/java/azure/core/page/models/SecondItem.java","src/main/java/azure/core/page/models/User.java","src/main/java/azure/core/page/models/UserOrder.java","src/main/java/azure/core/page/models/package-info.java","src/main/java/azure/core/page/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-scalar_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-scalar_apiview_properties.json deleted file mode 100644 index 5f4385ca34e..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-scalar_apiview_properties.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.core.scalar.ScalarAsyncClient": "_Specs_.Azure.Core.Scalar.AzureLocationScalar", - "azure.core.scalar.ScalarAsyncClient.get": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.get", - "azure.core.scalar.ScalarAsyncClient.getWithResponse": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.get", - "azure.core.scalar.ScalarAsyncClient.headerMethod": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.header", - "azure.core.scalar.ScalarAsyncClient.headerMethodWithResponse": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.header", - "azure.core.scalar.ScalarAsyncClient.post": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.post", - "azure.core.scalar.ScalarAsyncClient.postWithResponse": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.post", - "azure.core.scalar.ScalarAsyncClient.put": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.put", - "azure.core.scalar.ScalarAsyncClient.putWithResponse": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.put", - "azure.core.scalar.ScalarAsyncClient.query": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.query", - "azure.core.scalar.ScalarAsyncClient.queryWithResponse": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.query", - "azure.core.scalar.ScalarClient": "_Specs_.Azure.Core.Scalar.AzureLocationScalar", - "azure.core.scalar.ScalarClient.get": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.get", - "azure.core.scalar.ScalarClient.getWithResponse": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.get", - "azure.core.scalar.ScalarClient.headerMethod": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.header", - "azure.core.scalar.ScalarClient.headerMethodWithResponse": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.header", - "azure.core.scalar.ScalarClient.post": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.post", - "azure.core.scalar.ScalarClient.postWithResponse": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.post", - "azure.core.scalar.ScalarClient.put": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.put", - "azure.core.scalar.ScalarClient.putWithResponse": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.put", - "azure.core.scalar.ScalarClient.query": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.query", - "azure.core.scalar.ScalarClient.queryWithResponse": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.query", - "azure.core.scalar.ScalarClientBuilder": "_Specs_.Azure.Core.Scalar", - "azure.core.scalar.models.AzureLocationModel": "_Specs_.Azure.Core.Scalar.AzureLocationModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-scalar_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-scalar_metadata.json index 9751e756fd3..5e5bcb1b693 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-scalar_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-scalar_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2022-12-01-preview","crossLanguageDefinitions":{"azure.core.scalar.ScalarAsyncClient":"_Specs_.Azure.Core.Scalar.AzureLocationScalar","azure.core.scalar.ScalarAsyncClient.get":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.get","azure.core.scalar.ScalarAsyncClient.getWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.get","azure.core.scalar.ScalarAsyncClient.headerMethod":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.header","azure.core.scalar.ScalarAsyncClient.headerMethodWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.header","azure.core.scalar.ScalarAsyncClient.post":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.post","azure.core.scalar.ScalarAsyncClient.postWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.post","azure.core.scalar.ScalarAsyncClient.put":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.put","azure.core.scalar.ScalarAsyncClient.putWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.put","azure.core.scalar.ScalarAsyncClient.query":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.query","azure.core.scalar.ScalarAsyncClient.queryWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.query","azure.core.scalar.ScalarClient":"_Specs_.Azure.Core.Scalar.AzureLocationScalar","azure.core.scalar.ScalarClient.get":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.get","azure.core.scalar.ScalarClient.getWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.get","azure.core.scalar.ScalarClient.headerMethod":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.header","azure.core.scalar.ScalarClient.headerMethodWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.header","azure.core.scalar.ScalarClient.post":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.post","azure.core.scalar.ScalarClient.postWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.post","azure.core.scalar.ScalarClient.put":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.put","azure.core.scalar.ScalarClient.putWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.put","azure.core.scalar.ScalarClient.query":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.query","azure.core.scalar.ScalarClient.queryWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.query","azure.core.scalar.ScalarClientBuilder":"_Specs_.Azure.Core.Scalar","azure.core.scalar.models.AzureLocationModel":"_Specs_.Azure.Core.Scalar.AzureLocationModel"},"generatedFiles":["src/main/java/azure/core/scalar/ScalarAsyncClient.java","src/main/java/azure/core/scalar/ScalarClient.java","src/main/java/azure/core/scalar/ScalarClientBuilder.java","src/main/java/azure/core/scalar/ScalarServiceVersion.java","src/main/java/azure/core/scalar/implementation/AzureLocationScalarsImpl.java","src/main/java/azure/core/scalar/implementation/ScalarClientImpl.java","src/main/java/azure/core/scalar/implementation/package-info.java","src/main/java/azure/core/scalar/models/AzureLocationModel.java","src/main/java/azure/core/scalar/models/package-info.java","src/main/java/azure/core/scalar/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"_Specs_.Azure.Core.Scalar":"2022-12-01-preview"},"crossLanguageDefinitions":{"azure.core.scalar.ScalarAsyncClient":"_Specs_.Azure.Core.Scalar.AzureLocationScalar","azure.core.scalar.ScalarAsyncClient.get":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.get","azure.core.scalar.ScalarAsyncClient.getWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.get","azure.core.scalar.ScalarAsyncClient.headerMethod":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.header","azure.core.scalar.ScalarAsyncClient.headerMethodWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.header","azure.core.scalar.ScalarAsyncClient.post":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.post","azure.core.scalar.ScalarAsyncClient.postWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.post","azure.core.scalar.ScalarAsyncClient.put":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.put","azure.core.scalar.ScalarAsyncClient.putWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.put","azure.core.scalar.ScalarAsyncClient.query":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.query","azure.core.scalar.ScalarAsyncClient.queryWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.query","azure.core.scalar.ScalarClient":"_Specs_.Azure.Core.Scalar.AzureLocationScalar","azure.core.scalar.ScalarClient.get":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.get","azure.core.scalar.ScalarClient.getWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.get","azure.core.scalar.ScalarClient.headerMethod":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.header","azure.core.scalar.ScalarClient.headerMethodWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.header","azure.core.scalar.ScalarClient.post":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.post","azure.core.scalar.ScalarClient.postWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.post","azure.core.scalar.ScalarClient.put":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.put","azure.core.scalar.ScalarClient.putWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.put","azure.core.scalar.ScalarClient.query":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.query","azure.core.scalar.ScalarClient.queryWithResponse":"_Specs_.Azure.Core.Scalar.AzureLocationScalar.query","azure.core.scalar.ScalarClientBuilder":"_Specs_.Azure.Core.Scalar","azure.core.scalar.models.AzureLocationModel":"_Specs_.Azure.Core.Scalar.AzureLocationModel"},"generatedFiles":["src/main/java/azure/core/scalar/ScalarAsyncClient.java","src/main/java/azure/core/scalar/ScalarClient.java","src/main/java/azure/core/scalar/ScalarClientBuilder.java","src/main/java/azure/core/scalar/ScalarServiceVersion.java","src/main/java/azure/core/scalar/implementation/AzureLocationScalarsImpl.java","src/main/java/azure/core/scalar/implementation/ScalarClientImpl.java","src/main/java/azure/core/scalar/implementation/package-info.java","src/main/java/azure/core/scalar/models/AzureLocationModel.java","src/main/java/azure/core/scalar/models/package-info.java","src/main/java/azure/core/scalar/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-traits_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-traits_apiview_properties.json deleted file mode 100644 index 1818e714dfc..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-traits_apiview_properties.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.core.traits.TraitsAsyncClient": "_Specs_.Azure.Core.Traits", - "azure.core.traits.TraitsAsyncClient.repeatableAction": "_Specs_.Azure.Core.Traits.repeatableAction", - "azure.core.traits.TraitsAsyncClient.repeatableActionWithResponse": "_Specs_.Azure.Core.Traits.repeatableAction", - "azure.core.traits.TraitsAsyncClient.smokeTest": "_Specs_.Azure.Core.Traits.smokeTest", - "azure.core.traits.TraitsAsyncClient.smokeTestWithResponse": "_Specs_.Azure.Core.Traits.smokeTest", - "azure.core.traits.TraitsClient": "_Specs_.Azure.Core.Traits", - "azure.core.traits.TraitsClient.repeatableAction": "_Specs_.Azure.Core.Traits.repeatableAction", - "azure.core.traits.TraitsClient.repeatableActionWithResponse": "_Specs_.Azure.Core.Traits.repeatableAction", - "azure.core.traits.TraitsClient.smokeTest": "_Specs_.Azure.Core.Traits.smokeTest", - "azure.core.traits.TraitsClient.smokeTestWithResponse": "_Specs_.Azure.Core.Traits.smokeTest", - "azure.core.traits.TraitsClientBuilder": "_Specs_.Azure.Core.Traits", - "azure.core.traits.models.User": "_Specs_.Azure.Core.Traits.User", - "azure.core.traits.models.UserActionParam": "_Specs_.Azure.Core.Traits.UserActionParam", - "azure.core.traits.models.UserActionResponse": "_Specs_.Azure.Core.Traits.UserActionResponse" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-traits_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-traits_metadata.json index 44321ed9606..bdc7e9c16c3 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-traits_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-core-traits_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2022-12-01-preview","crossLanguageDefinitions":{"azure.core.traits.TraitsAsyncClient":"_Specs_.Azure.Core.Traits","azure.core.traits.TraitsAsyncClient.repeatableAction":"_Specs_.Azure.Core.Traits.repeatableAction","azure.core.traits.TraitsAsyncClient.repeatableActionWithResponse":"_Specs_.Azure.Core.Traits.repeatableAction","azure.core.traits.TraitsAsyncClient.smokeTest":"_Specs_.Azure.Core.Traits.smokeTest","azure.core.traits.TraitsAsyncClient.smokeTestWithResponse":"_Specs_.Azure.Core.Traits.smokeTest","azure.core.traits.TraitsClient":"_Specs_.Azure.Core.Traits","azure.core.traits.TraitsClient.repeatableAction":"_Specs_.Azure.Core.Traits.repeatableAction","azure.core.traits.TraitsClient.repeatableActionWithResponse":"_Specs_.Azure.Core.Traits.repeatableAction","azure.core.traits.TraitsClient.smokeTest":"_Specs_.Azure.Core.Traits.smokeTest","azure.core.traits.TraitsClient.smokeTestWithResponse":"_Specs_.Azure.Core.Traits.smokeTest","azure.core.traits.TraitsClientBuilder":"_Specs_.Azure.Core.Traits","azure.core.traits.models.User":"_Specs_.Azure.Core.Traits.User","azure.core.traits.models.UserActionParam":"_Specs_.Azure.Core.Traits.UserActionParam","azure.core.traits.models.UserActionResponse":"_Specs_.Azure.Core.Traits.UserActionResponse"},"generatedFiles":["src/main/java/azure/core/traits/TraitsAsyncClient.java","src/main/java/azure/core/traits/TraitsClient.java","src/main/java/azure/core/traits/TraitsClientBuilder.java","src/main/java/azure/core/traits/TraitsServiceVersion.java","src/main/java/azure/core/traits/implementation/TraitsClientImpl.java","src/main/java/azure/core/traits/implementation/package-info.java","src/main/java/azure/core/traits/models/User.java","src/main/java/azure/core/traits/models/UserActionParam.java","src/main/java/azure/core/traits/models/UserActionResponse.java","src/main/java/azure/core/traits/models/package-info.java","src/main/java/azure/core/traits/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"_Specs_.Azure.Core.Traits":"2022-12-01-preview"},"crossLanguageDefinitions":{"azure.core.traits.TraitsAsyncClient":"_Specs_.Azure.Core.Traits","azure.core.traits.TraitsAsyncClient.repeatableAction":"_Specs_.Azure.Core.Traits.repeatableAction","azure.core.traits.TraitsAsyncClient.repeatableActionWithResponse":"_Specs_.Azure.Core.Traits.repeatableAction","azure.core.traits.TraitsAsyncClient.smokeTest":"_Specs_.Azure.Core.Traits.smokeTest","azure.core.traits.TraitsAsyncClient.smokeTestWithResponse":"_Specs_.Azure.Core.Traits.smokeTest","azure.core.traits.TraitsClient":"_Specs_.Azure.Core.Traits","azure.core.traits.TraitsClient.repeatableAction":"_Specs_.Azure.Core.Traits.repeatableAction","azure.core.traits.TraitsClient.repeatableActionWithResponse":"_Specs_.Azure.Core.Traits.repeatableAction","azure.core.traits.TraitsClient.smokeTest":"_Specs_.Azure.Core.Traits.smokeTest","azure.core.traits.TraitsClient.smokeTestWithResponse":"_Specs_.Azure.Core.Traits.smokeTest","azure.core.traits.TraitsClientBuilder":"_Specs_.Azure.Core.Traits","azure.core.traits.models.User":"_Specs_.Azure.Core.Traits.User","azure.core.traits.models.UserActionParam":"_Specs_.Azure.Core.Traits.UserActionParam","azure.core.traits.models.UserActionResponse":"_Specs_.Azure.Core.Traits.UserActionResponse"},"generatedFiles":["src/main/java/azure/core/traits/TraitsAsyncClient.java","src/main/java/azure/core/traits/TraitsClient.java","src/main/java/azure/core/traits/TraitsClientBuilder.java","src/main/java/azure/core/traits/TraitsServiceVersion.java","src/main/java/azure/core/traits/implementation/TraitsClientImpl.java","src/main/java/azure/core/traits/implementation/package-info.java","src/main/java/azure/core/traits/models/User.java","src/main/java/azure/core/traits/models/UserActionParam.java","src/main/java/azure/core/traits/models/UserActionResponse.java","src/main/java/azure/core/traits/models/package-info.java","src/main/java/azure/core/traits/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-encode-duration_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-encode-duration_apiview_properties.json deleted file mode 100644 index 26e8454c342..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-encode-duration_apiview_properties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.encode.duration.DurationAsyncClient": "_Specs_.Azure.Encode.Duration", - "azure.encode.duration.DurationAsyncClient.durationConstant": "_Specs_.Azure.Encode.Duration.durationConstant", - "azure.encode.duration.DurationAsyncClient.durationConstantWithResponse": "_Specs_.Azure.Encode.Duration.durationConstant", - "azure.encode.duration.DurationClient": "_Specs_.Azure.Encode.Duration", - "azure.encode.duration.DurationClient.durationConstant": "_Specs_.Azure.Encode.Duration.durationConstant", - "azure.encode.duration.DurationClient.durationConstantWithResponse": "_Specs_.Azure.Encode.Duration.durationConstant", - "azure.encode.duration.DurationClientBuilder": "_Specs_.Azure.Encode.Duration", - "azure.encode.duration.models.DurationModel": "_Specs_.Azure.Encode.Duration.DurationModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-encode-duration_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-encode-duration_metadata.json index 31f801694b4..34009875549 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-encode-duration_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-encode-duration_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.encode.duration.DurationAsyncClient":"_Specs_.Azure.Encode.Duration","azure.encode.duration.DurationAsyncClient.durationConstant":"_Specs_.Azure.Encode.Duration.durationConstant","azure.encode.duration.DurationAsyncClient.durationConstantWithResponse":"_Specs_.Azure.Encode.Duration.durationConstant","azure.encode.duration.DurationClient":"_Specs_.Azure.Encode.Duration","azure.encode.duration.DurationClient.durationConstant":"_Specs_.Azure.Encode.Duration.durationConstant","azure.encode.duration.DurationClient.durationConstantWithResponse":"_Specs_.Azure.Encode.Duration.durationConstant","azure.encode.duration.DurationClientBuilder":"_Specs_.Azure.Encode.Duration","azure.encode.duration.models.DurationModel":"_Specs_.Azure.Encode.Duration.DurationModel"},"generatedFiles":["src/main/java/azure/encode/duration/DurationAsyncClient.java","src/main/java/azure/encode/duration/DurationClient.java","src/main/java/azure/encode/duration/DurationClientBuilder.java","src/main/java/azure/encode/duration/implementation/DurationClientImpl.java","src/main/java/azure/encode/duration/implementation/package-info.java","src/main/java/azure/encode/duration/models/DurationModel.java","src/main/java/azure/encode/duration/models/package-info.java","src/main/java/azure/encode/duration/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.encode.duration.DurationAsyncClient":"_Specs_.Azure.Encode.Duration","azure.encode.duration.DurationAsyncClient.durationConstant":"_Specs_.Azure.Encode.Duration.durationConstant","azure.encode.duration.DurationAsyncClient.durationConstantWithResponse":"_Specs_.Azure.Encode.Duration.durationConstant","azure.encode.duration.DurationClient":"_Specs_.Azure.Encode.Duration","azure.encode.duration.DurationClient.durationConstant":"_Specs_.Azure.Encode.Duration.durationConstant","azure.encode.duration.DurationClient.durationConstantWithResponse":"_Specs_.Azure.Encode.Duration.durationConstant","azure.encode.duration.DurationClientBuilder":"_Specs_.Azure.Encode.Duration","azure.encode.duration.models.DurationModel":"_Specs_.Azure.Encode.Duration.DurationModel"},"generatedFiles":["src/main/java/azure/encode/duration/DurationAsyncClient.java","src/main/java/azure/encode/duration/DurationClient.java","src/main/java/azure/encode/duration/DurationClientBuilder.java","src/main/java/azure/encode/duration/implementation/DurationClientImpl.java","src/main/java/azure/encode/duration/implementation/package-info.java","src/main/java/azure/encode/duration/models/DurationModel.java","src/main/java/azure/encode/duration/models/package-info.java","src/main/java/azure/encode/duration/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-example-basic_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-example-basic_apiview_properties.json deleted file mode 100644 index bfdc0a71ff3..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-example-basic_apiview_properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.example.basic.AzureExampleAsyncClient": "AzureExampleBasicClient.AzureExampleClient", - "azure.example.basic.AzureExampleAsyncClient.basicAction": "AzureExampleBasicClient.AzureExampleClient.basicAction", - "azure.example.basic.AzureExampleAsyncClient.basicActionWithResponse": "AzureExampleBasicClient.AzureExampleClient.basicAction", - "azure.example.basic.AzureExampleClient": "AzureExampleBasicClient.AzureExampleClient", - "azure.example.basic.AzureExampleClient.basicAction": "AzureExampleBasicClient.AzureExampleClient.basicAction", - "azure.example.basic.AzureExampleClient.basicActionWithResponse": "AzureExampleBasicClient.AzureExampleClient.basicAction", - "azure.example.basic.AzureExampleClientBuilder": "AzureExampleBasicClient.AzureExampleClient", - "azure.example.basic.models.ActionRequest": "_Specs_.Azure.Example.Basic.ActionRequest", - "azure.example.basic.models.ActionResponse": "_Specs_.Azure.Example.Basic.ActionResponse", - "azure.example.basic.models.Enum": "_Specs_.Azure.Example.Basic.Enum", - "azure.example.basic.models.Model": "_Specs_.Azure.Example.Basic.Model" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-example-basic_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-example-basic_metadata.json index 1bfd695c8ce..5ff001f36c9 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-example-basic_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-example-basic_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2022-12-01-preview","crossLanguageDefinitions":{"azure.example.basic.AzureExampleAsyncClient":"AzureExampleBasicClient.AzureExampleClient","azure.example.basic.AzureExampleAsyncClient.basicAction":"AzureExampleBasicClient.AzureExampleClient.basicAction","azure.example.basic.AzureExampleAsyncClient.basicActionWithResponse":"AzureExampleBasicClient.AzureExampleClient.basicAction","azure.example.basic.AzureExampleClient":"AzureExampleBasicClient.AzureExampleClient","azure.example.basic.AzureExampleClient.basicAction":"AzureExampleBasicClient.AzureExampleClient.basicAction","azure.example.basic.AzureExampleClient.basicActionWithResponse":"AzureExampleBasicClient.AzureExampleClient.basicAction","azure.example.basic.AzureExampleClientBuilder":"AzureExampleBasicClient.AzureExampleClient","azure.example.basic.models.ActionRequest":"_Specs_.Azure.Example.Basic.ActionRequest","azure.example.basic.models.ActionResponse":"_Specs_.Azure.Example.Basic.ActionResponse","azure.example.basic.models.Enum":"_Specs_.Azure.Example.Basic.Enum","azure.example.basic.models.Model":"_Specs_.Azure.Example.Basic.Model"},"generatedFiles":["src/main/java/azure/example/basic/AzureExampleAsyncClient.java","src/main/java/azure/example/basic/AzureExampleClient.java","src/main/java/azure/example/basic/AzureExampleClientBuilder.java","src/main/java/azure/example/basic/BasicServiceVersion.java","src/main/java/azure/example/basic/implementation/AzureExampleClientImpl.java","src/main/java/azure/example/basic/implementation/package-info.java","src/main/java/azure/example/basic/models/ActionRequest.java","src/main/java/azure/example/basic/models/ActionResponse.java","src/main/java/azure/example/basic/models/Enum.java","src/main/java/azure/example/basic/models/Model.java","src/main/java/azure/example/basic/models/package-info.java","src/main/java/azure/example/basic/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"_Specs_.Azure.Example.Basic":"2022-12-01-preview"},"crossLanguageDefinitions":{"azure.example.basic.AzureExampleAsyncClient":"AzureExampleBasicClient.AzureExampleClient","azure.example.basic.AzureExampleAsyncClient.basicAction":"AzureExampleBasicClient.AzureExampleClient.basicAction","azure.example.basic.AzureExampleAsyncClient.basicActionWithResponse":"AzureExampleBasicClient.AzureExampleClient.basicAction","azure.example.basic.AzureExampleClient":"AzureExampleBasicClient.AzureExampleClient","azure.example.basic.AzureExampleClient.basicAction":"AzureExampleBasicClient.AzureExampleClient.basicAction","azure.example.basic.AzureExampleClient.basicActionWithResponse":"AzureExampleBasicClient.AzureExampleClient.basicAction","azure.example.basic.AzureExampleClientBuilder":"AzureExampleBasicClient.AzureExampleClient","azure.example.basic.models.ActionRequest":"_Specs_.Azure.Example.Basic.ActionRequest","azure.example.basic.models.ActionResponse":"_Specs_.Azure.Example.Basic.ActionResponse","azure.example.basic.models.Enum":"_Specs_.Azure.Example.Basic.Enum","azure.example.basic.models.Model":"_Specs_.Azure.Example.Basic.Model"},"generatedFiles":["src/main/java/azure/example/basic/AzureExampleAsyncClient.java","src/main/java/azure/example/basic/AzureExampleClient.java","src/main/java/azure/example/basic/AzureExampleClientBuilder.java","src/main/java/azure/example/basic/BasicServiceVersion.java","src/main/java/azure/example/basic/implementation/AzureExampleClientImpl.java","src/main/java/azure/example/basic/implementation/package-info.java","src/main/java/azure/example/basic/models/ActionRequest.java","src/main/java/azure/example/basic/models/ActionResponse.java","src/main/java/azure/example/basic/models/Enum.java","src/main/java/azure/example/basic/models/Model.java","src/main/java/azure/example/basic/models/package-info.java","src/main/java/azure/example/basic/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-payload-pageable_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-payload-pageable_apiview_properties.json deleted file mode 100644 index bd89a3061c0..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-payload-pageable_apiview_properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.payload.pageable.PageableAsyncClient": "_Specs_.Azure.Payload.Pageable", - "azure.payload.pageable.PageableAsyncClient.list": "_Specs_.Azure.Payload.Pageable.list", - "azure.payload.pageable.PageableClient": "_Specs_.Azure.Payload.Pageable", - "azure.payload.pageable.PageableClient.list": "_Specs_.Azure.Payload.Pageable.list", - "azure.payload.pageable.PageableClientBuilder": "_Specs_.Azure.Payload.Pageable", - "azure.payload.pageable.models.User": "_Specs_.Azure.Payload.Pageable.User" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-payload-pageable_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-payload-pageable_metadata.json index 008a93f1d53..00d1737e2e0 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-payload-pageable_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-payload-pageable_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.payload.pageable.PageableAsyncClient":"_Specs_.Azure.Payload.Pageable","azure.payload.pageable.PageableAsyncClient.list":"_Specs_.Azure.Payload.Pageable.list","azure.payload.pageable.PageableClient":"_Specs_.Azure.Payload.Pageable","azure.payload.pageable.PageableClient.list":"_Specs_.Azure.Payload.Pageable.list","azure.payload.pageable.PageableClientBuilder":"_Specs_.Azure.Payload.Pageable","azure.payload.pageable.models.User":"_Specs_.Azure.Payload.Pageable.User"},"generatedFiles":["src/main/java/azure/payload/pageable/PageableAsyncClient.java","src/main/java/azure/payload/pageable/PageableClient.java","src/main/java/azure/payload/pageable/PageableClientBuilder.java","src/main/java/azure/payload/pageable/implementation/PageableClientImpl.java","src/main/java/azure/payload/pageable/implementation/package-info.java","src/main/java/azure/payload/pageable/models/User.java","src/main/java/azure/payload/pageable/models/package-info.java","src/main/java/azure/payload/pageable/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.payload.pageable.PageableAsyncClient":"_Specs_.Azure.Payload.Pageable","azure.payload.pageable.PageableAsyncClient.list":"_Specs_.Azure.Payload.Pageable.list","azure.payload.pageable.PageableClient":"_Specs_.Azure.Payload.Pageable","azure.payload.pageable.PageableClient.list":"_Specs_.Azure.Payload.Pageable.list","azure.payload.pageable.PageableClientBuilder":"_Specs_.Azure.Payload.Pageable","azure.payload.pageable.models.User":"_Specs_.Azure.Payload.Pageable.User"},"generatedFiles":["src/main/java/azure/payload/pageable/PageableAsyncClient.java","src/main/java/azure/payload/pageable/PageableClient.java","src/main/java/azure/payload/pageable/PageableClientBuilder.java","src/main/java/azure/payload/pageable/implementation/PageableClientImpl.java","src/main/java/azure/payload/pageable/implementation/package-info.java","src/main/java/azure/payload/pageable/models/User.java","src/main/java/azure/payload/pageable/models/package-info.java","src/main/java/azure/payload/pageable/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armcustomization-generated_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armcustomization-generated_apiview_properties.json deleted file mode 100644 index 2ed6a3a2d01..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armcustomization-generated_apiview_properties.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.armcustomization.fluent.ArmCustomizationClient": "TspTest.ArmCustomization", - "tsptest.armcustomization.fluent.VaultsClient": "TspTest.ArmCustomization.Vaults", - "tsptest.armcustomization.fluent.VaultsClient.getByResourceGroup": "TspTest.ArmCustomization.Vaults.get", - "tsptest.armcustomization.fluent.VaultsClient.getByResourceGroupWithResponse": "TspTest.ArmCustomization.Vaults.get", - "tsptest.armcustomization.fluent.models.VaultInner": "TspTest.ArmCustomization.Vault", - "tsptest.armcustomization.implementation.ArmCustomizationClientBuilder": "TspTest.ArmCustomization", - "tsptest.armcustomization.models.VaultProperties": "TspTest.ArmCustomization.VaultProperties" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armcustomization-generated_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armcustomization-generated_metadata.json index e75ad0ce598..9599cd0f362 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armcustomization-generated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armcustomization-generated_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2023-12-01-preview","crossLanguageDefinitions":{"tsptest.armcustomization.fluent.ArmCustomizationClient":"TspTest.ArmCustomization","tsptest.armcustomization.fluent.VaultsClient":"TspTest.ArmCustomization.Vaults","tsptest.armcustomization.fluent.VaultsClient.getByResourceGroup":"TspTest.ArmCustomization.Vaults.get","tsptest.armcustomization.fluent.VaultsClient.getByResourceGroupWithResponse":"TspTest.ArmCustomization.Vaults.get","tsptest.armcustomization.fluent.models.VaultInner":"TspTest.ArmCustomization.Vault","tsptest.armcustomization.implementation.ArmCustomizationClientBuilder":"TspTest.ArmCustomization","tsptest.armcustomization.models.VaultProperties":"TspTest.ArmCustomization.VaultProperties"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/armcustomization/ArmCustomizationManager.java","src/main/java/tsptest/armcustomization/fluent/ArmCustomizationClient.java","src/main/java/tsptest/armcustomization/fluent/VaultsClient.java","src/main/java/tsptest/armcustomization/fluent/models/VaultInner.java","src/main/java/tsptest/armcustomization/fluent/models/package-info.java","src/main/java/tsptest/armcustomization/fluent/package-info.java","src/main/java/tsptest/armcustomization/implementation/ArmCustomizationClientBuilder.java","src/main/java/tsptest/armcustomization/implementation/ArmCustomizationClientImpl.java","src/main/java/tsptest/armcustomization/implementation/ResourceManagerUtils.java","src/main/java/tsptest/armcustomization/implementation/VaultImpl.java","src/main/java/tsptest/armcustomization/implementation/VaultsClientImpl.java","src/main/java/tsptest/armcustomization/implementation/VaultsImpl.java","src/main/java/tsptest/armcustomization/implementation/package-info.java","src/main/java/tsptest/armcustomization/models/Vault.java","src/main/java/tsptest/armcustomization/models/VaultProperties.java","src/main/java/tsptest/armcustomization/models/Vaults.java","src/main/java/tsptest/armcustomization/models/package-info.java","src/main/java/tsptest/armcustomization/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"TspTest.ArmCustomization":"2023-12-01-preview"},"crossLanguageDefinitions":{"tsptest.armcustomization.fluent.ArmCustomizationClient":"TspTest.ArmCustomization","tsptest.armcustomization.fluent.VaultsClient":"TspTest.ArmCustomization.Vaults","tsptest.armcustomization.fluent.VaultsClient.getByResourceGroup":"TspTest.ArmCustomization.Vaults.get","tsptest.armcustomization.fluent.VaultsClient.getByResourceGroupWithResponse":"TspTest.ArmCustomization.Vaults.get","tsptest.armcustomization.fluent.models.VaultInner":"TspTest.ArmCustomization.Vault","tsptest.armcustomization.implementation.ArmCustomizationClientBuilder":"TspTest.ArmCustomization","tsptest.armcustomization.models.VaultProperties":"TspTest.ArmCustomization.VaultProperties"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/armcustomization/ArmCustomizationManager.java","src/main/java/tsptest/armcustomization/fluent/ArmCustomizationClient.java","src/main/java/tsptest/armcustomization/fluent/VaultsClient.java","src/main/java/tsptest/armcustomization/fluent/models/VaultInner.java","src/main/java/tsptest/armcustomization/fluent/models/package-info.java","src/main/java/tsptest/armcustomization/fluent/package-info.java","src/main/java/tsptest/armcustomization/implementation/ArmCustomizationClientBuilder.java","src/main/java/tsptest/armcustomization/implementation/ArmCustomizationClientImpl.java","src/main/java/tsptest/armcustomization/implementation/ResourceManagerUtils.java","src/main/java/tsptest/armcustomization/implementation/VaultImpl.java","src/main/java/tsptest/armcustomization/implementation/VaultsClientImpl.java","src/main/java/tsptest/armcustomization/implementation/VaultsImpl.java","src/main/java/tsptest/armcustomization/implementation/package-info.java","src/main/java/tsptest/armcustomization/models/Vault.java","src/main/java/tsptest/armcustomization/models/VaultProperties.java","src/main/java/tsptest/armcustomization/models/Vaults.java","src/main/java/tsptest/armcustomization/models/package-info.java","src/main/java/tsptest/armcustomization/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armlegacy-generated_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armlegacy-generated_apiview_properties.json deleted file mode 100644 index f1496f1c481..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armlegacy-generated_apiview_properties.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.armlegacy.fluent.ArmLegacyClient": "TspTest.ArmLegacy", - "tsptest.armlegacy.fluent.SkusClient": "TspTest.ArmLegacy.Skus", - "tsptest.armlegacy.fluent.SkusClient.createNested": "TspTest.ArmLegacy.Skus.createNested", - "tsptest.armlegacy.fluent.SkusClient.createNestedWithResponse": "TspTest.ArmLegacy.Skus.createNested", - "tsptest.armlegacy.fluent.SkusClient.createRoot": "TspTest.ArmLegacy.Skus.createRoot", - "tsptest.armlegacy.fluent.SkusClient.createRootWithResponse": "TspTest.ArmLegacy.Skus.createRoot", - "tsptest.armlegacy.fluent.SkusClient.deleteNested": "TspTest.ArmLegacy.Skus.deleteNested", - "tsptest.armlegacy.fluent.SkusClient.deleteNestedWithResponse": "TspTest.ArmLegacy.Skus.deleteNested", - "tsptest.armlegacy.fluent.SkusClient.deleteRoot": "TspTest.ArmLegacy.Skus.deleteRoot", - "tsptest.armlegacy.fluent.SkusClient.deleteRootWithResponse": "TspTest.ArmLegacy.Skus.deleteRoot", - "tsptest.armlegacy.fluent.SkusClient.getNested": "TspTest.ArmLegacy.Skus.getNested", - "tsptest.armlegacy.fluent.SkusClient.getNestedWithResponse": "TspTest.ArmLegacy.Skus.getNested", - "tsptest.armlegacy.fluent.SkusClient.getRoot": "TspTest.ArmLegacy.Skus.getRoot", - "tsptest.armlegacy.fluent.SkusClient.getRootWithResponse": "TspTest.ArmLegacy.Skus.getRoot", - "tsptest.armlegacy.fluent.models.SkuResourceInner": "TspTest.ArmLegacy.SkuResource", - "tsptest.armlegacy.implementation.ArmLegacyClientBuilder": "TspTest.ArmLegacy", - "tsptest.armlegacy.models.ProvisioningState": "TspTest.ArmLegacy.ProvisioningState", - "tsptest.armlegacy.models.ResourceTypeSku": "TspTest.ArmLegacy.ResourceTypeSku" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armlegacy-generated_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armlegacy-generated_metadata.json index e73fd1e1c9d..c8d002210e8 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armlegacy-generated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armlegacy-generated_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2024-12-01","crossLanguageDefinitions":{"tsptest.armlegacy.fluent.ArmLegacyClient":"TspTest.ArmLegacy","tsptest.armlegacy.fluent.SkusClient":"TspTest.ArmLegacy.Skus","tsptest.armlegacy.fluent.SkusClient.createNested":"TspTest.ArmLegacy.Skus.createNested","tsptest.armlegacy.fluent.SkusClient.createNestedWithResponse":"TspTest.ArmLegacy.Skus.createNested","tsptest.armlegacy.fluent.SkusClient.createRoot":"TspTest.ArmLegacy.Skus.createRoot","tsptest.armlegacy.fluent.SkusClient.createRootWithResponse":"TspTest.ArmLegacy.Skus.createRoot","tsptest.armlegacy.fluent.SkusClient.deleteNested":"TspTest.ArmLegacy.Skus.deleteNested","tsptest.armlegacy.fluent.SkusClient.deleteNestedWithResponse":"TspTest.ArmLegacy.Skus.deleteNested","tsptest.armlegacy.fluent.SkusClient.deleteRoot":"TspTest.ArmLegacy.Skus.deleteRoot","tsptest.armlegacy.fluent.SkusClient.deleteRootWithResponse":"TspTest.ArmLegacy.Skus.deleteRoot","tsptest.armlegacy.fluent.SkusClient.getNested":"TspTest.ArmLegacy.Skus.getNested","tsptest.armlegacy.fluent.SkusClient.getNestedWithResponse":"TspTest.ArmLegacy.Skus.getNested","tsptest.armlegacy.fluent.SkusClient.getRoot":"TspTest.ArmLegacy.Skus.getRoot","tsptest.armlegacy.fluent.SkusClient.getRootWithResponse":"TspTest.ArmLegacy.Skus.getRoot","tsptest.armlegacy.fluent.models.SkuResourceInner":"TspTest.ArmLegacy.SkuResource","tsptest.armlegacy.implementation.ArmLegacyClientBuilder":"TspTest.ArmLegacy","tsptest.armlegacy.models.ProvisioningState":"TspTest.ArmLegacy.ProvisioningState","tsptest.armlegacy.models.ResourceTypeSku":"TspTest.ArmLegacy.ResourceTypeSku"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/armlegacy/ArmLegacyManager.java","src/main/java/tsptest/armlegacy/fluent/ArmLegacyClient.java","src/main/java/tsptest/armlegacy/fluent/SkusClient.java","src/main/java/tsptest/armlegacy/fluent/models/SkuResourceInner.java","src/main/java/tsptest/armlegacy/fluent/models/package-info.java","src/main/java/tsptest/armlegacy/fluent/package-info.java","src/main/java/tsptest/armlegacy/implementation/ArmLegacyClientBuilder.java","src/main/java/tsptest/armlegacy/implementation/ArmLegacyClientImpl.java","src/main/java/tsptest/armlegacy/implementation/ResourceManagerUtils.java","src/main/java/tsptest/armlegacy/implementation/SkuResourceImpl.java","src/main/java/tsptest/armlegacy/implementation/SkusClientImpl.java","src/main/java/tsptest/armlegacy/implementation/SkusImpl.java","src/main/java/tsptest/armlegacy/implementation/package-info.java","src/main/java/tsptest/armlegacy/models/ProvisioningState.java","src/main/java/tsptest/armlegacy/models/ResourceTypeSku.java","src/main/java/tsptest/armlegacy/models/SkuResource.java","src/main/java/tsptest/armlegacy/models/Skus.java","src/main/java/tsptest/armlegacy/models/package-info.java","src/main/java/tsptest/armlegacy/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"TspTest.ArmLegacy":"2024-12-01"},"crossLanguageDefinitions":{"tsptest.armlegacy.fluent.ArmLegacyClient":"TspTest.ArmLegacy","tsptest.armlegacy.fluent.SkusClient":"TspTest.ArmLegacy.Skus","tsptest.armlegacy.fluent.SkusClient.createNested":"TspTest.ArmLegacy.Skus.createNested","tsptest.armlegacy.fluent.SkusClient.createNestedWithResponse":"TspTest.ArmLegacy.Skus.createNested","tsptest.armlegacy.fluent.SkusClient.createRoot":"TspTest.ArmLegacy.Skus.createRoot","tsptest.armlegacy.fluent.SkusClient.createRootWithResponse":"TspTest.ArmLegacy.Skus.createRoot","tsptest.armlegacy.fluent.SkusClient.deleteNested":"TspTest.ArmLegacy.Skus.deleteNested","tsptest.armlegacy.fluent.SkusClient.deleteNestedWithResponse":"TspTest.ArmLegacy.Skus.deleteNested","tsptest.armlegacy.fluent.SkusClient.deleteRoot":"TspTest.ArmLegacy.Skus.deleteRoot","tsptest.armlegacy.fluent.SkusClient.deleteRootWithResponse":"TspTest.ArmLegacy.Skus.deleteRoot","tsptest.armlegacy.fluent.SkusClient.getNested":"TspTest.ArmLegacy.Skus.getNested","tsptest.armlegacy.fluent.SkusClient.getNestedWithResponse":"TspTest.ArmLegacy.Skus.getNested","tsptest.armlegacy.fluent.SkusClient.getRoot":"TspTest.ArmLegacy.Skus.getRoot","tsptest.armlegacy.fluent.SkusClient.getRootWithResponse":"TspTest.ArmLegacy.Skus.getRoot","tsptest.armlegacy.fluent.models.SkuResourceInner":"TspTest.ArmLegacy.SkuResource","tsptest.armlegacy.implementation.ArmLegacyClientBuilder":"TspTest.ArmLegacy","tsptest.armlegacy.models.ProvisioningState":"TspTest.ArmLegacy.ProvisioningState","tsptest.armlegacy.models.ResourceTypeSku":"TspTest.ArmLegacy.ResourceTypeSku"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/armlegacy/ArmLegacyManager.java","src/main/java/tsptest/armlegacy/fluent/ArmLegacyClient.java","src/main/java/tsptest/armlegacy/fluent/SkusClient.java","src/main/java/tsptest/armlegacy/fluent/models/SkuResourceInner.java","src/main/java/tsptest/armlegacy/fluent/models/package-info.java","src/main/java/tsptest/armlegacy/fluent/package-info.java","src/main/java/tsptest/armlegacy/implementation/ArmLegacyClientBuilder.java","src/main/java/tsptest/armlegacy/implementation/ArmLegacyClientImpl.java","src/main/java/tsptest/armlegacy/implementation/ResourceManagerUtils.java","src/main/java/tsptest/armlegacy/implementation/SkuResourceImpl.java","src/main/java/tsptest/armlegacy/implementation/SkusClientImpl.java","src/main/java/tsptest/armlegacy/implementation/SkusImpl.java","src/main/java/tsptest/armlegacy/implementation/package-info.java","src/main/java/tsptest/armlegacy/models/ProvisioningState.java","src/main/java/tsptest/armlegacy/models/ResourceTypeSku.java","src/main/java/tsptest/armlegacy/models/SkuResource.java","src/main/java/tsptest/armlegacy/models/Skus.java","src/main/java/tsptest/armlegacy/models/package-info.java","src/main/java/tsptest/armlegacy/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armresourceprovider-generated_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armresourceprovider-generated_apiview_properties.json deleted file mode 100644 index aa82debcdba..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armresourceprovider-generated_apiview_properties.json +++ /dev/null @@ -1,178 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.armresourceprovider.fluent.ArmClient": "TspTest.ArmResourceProvider", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient": "TspTest.ArmResourceProvider.ChildExtensionResourceInterface", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.beginCreateOrUpdate": "Azure.ResourceManager.ChildExtensionResourceInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.beginCreateOrUpdateAsync": "Azure.ResourceManager.ChildExtensionResourceInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.beginDelete": "Azure.ResourceManager.ChildExtensionResourceInterface.delete", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.beginDeleteAsync": "Azure.ResourceManager.ChildExtensionResourceInterface.delete", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.createOrUpdate": "Azure.ResourceManager.ChildExtensionResourceInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.createOrUpdateAsync": "Azure.ResourceManager.ChildExtensionResourceInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.createOrUpdateWithResponseAsync": "Azure.ResourceManager.ChildExtensionResourceInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.delete": "Azure.ResourceManager.ChildExtensionResourceInterface.delete", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.deleteAsync": "Azure.ResourceManager.ChildExtensionResourceInterface.delete", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.deleteWithResponseAsync": "Azure.ResourceManager.ChildExtensionResourceInterface.delete", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.get": "Azure.ResourceManager.ChildExtensionResourceInterface.get", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.getAsync": "Azure.ResourceManager.ChildExtensionResourceInterface.get", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.getWithResponse": "Azure.ResourceManager.ChildExtensionResourceInterface.get", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.getWithResponseAsync": "Azure.ResourceManager.ChildExtensionResourceInterface.get", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.listByTopLevelArmResource": "Azure.ResourceManager.ChildExtensionResourceInterface.listByTopLevelArmResource", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.listByTopLevelArmResourceAsync": "Azure.ResourceManager.ChildExtensionResourceInterface.listByTopLevelArmResource", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.update": "Azure.ResourceManager.ChildExtensionResourceInterface.update", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.updateAsync": "Azure.ResourceManager.ChildExtensionResourceInterface.update", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.updateWithResponse": "Azure.ResourceManager.ChildExtensionResourceInterface.update", - "tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.updateWithResponseAsync": "Azure.ResourceManager.ChildExtensionResourceInterface.update", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient": "TspTest.ArmResourceProvider.ChildResourcesInterface", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.actionWithoutBody": "TspTest.ArmResourceProvider.ChildResourcesInterface.actionWithoutBody", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.actionWithoutBodyAsync": "TspTest.ArmResourceProvider.ChildResourcesInterface.actionWithoutBody", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.actionWithoutBodyWithResponseAsync": "TspTest.ArmResourceProvider.ChildResourcesInterface.actionWithoutBody", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.beginActionWithoutBody": "TspTest.ArmResourceProvider.ChildResourcesInterface.actionWithoutBody", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.beginActionWithoutBodyAsync": "TspTest.ArmResourceProvider.ChildResourcesInterface.actionWithoutBody", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.beginCreateOrUpdate": "Azure.ResourceManager.ChildResourcesInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.beginCreateOrUpdateAsync": "Azure.ResourceManager.ChildResourcesInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.beginDelete": "Azure.ResourceManager.ChildResourcesInterface.delete", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.beginDeleteAsync": "Azure.ResourceManager.ChildResourcesInterface.delete", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.createOrUpdate": "Azure.ResourceManager.ChildResourcesInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.createOrUpdateAsync": "Azure.ResourceManager.ChildResourcesInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.createOrUpdateWithResponseAsync": "Azure.ResourceManager.ChildResourcesInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.delete": "Azure.ResourceManager.ChildResourcesInterface.delete", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.deleteAsync": "Azure.ResourceManager.ChildResourcesInterface.delete", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.deleteWithResponseAsync": "Azure.ResourceManager.ChildResourcesInterface.delete", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.get": "Azure.ResourceManager.ChildResourcesInterface.get", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.getAsync": "Azure.ResourceManager.ChildResourcesInterface.get", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.getWithResponse": "Azure.ResourceManager.ChildResourcesInterface.get", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.getWithResponseAsync": "Azure.ResourceManager.ChildResourcesInterface.get", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.listByTopLevelArmResource": "TspTest.ArmResourceProvider.ChildResourcesInterface.listByTopLevelArmResource", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.listByTopLevelArmResourceAsync": "TspTest.ArmResourceProvider.ChildResourcesInterface.listByTopLevelArmResource", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.update": "Azure.ResourceManager.ChildResourcesInterface.update", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.updateAsync": "Azure.ResourceManager.ChildResourcesInterface.update", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.updateWithResponse": "Azure.ResourceManager.ChildResourcesInterface.update", - "tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.updateWithResponseAsync": "Azure.ResourceManager.ChildResourcesInterface.update", - "tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient": "TspTest.ArmResourceProvider.CustomTemplateResourceInterface", - "tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.beginCreateOrUpdate": "Azure.ResourceManager.CustomTemplateResourceInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.beginCreateOrUpdateAsync": "Azure.ResourceManager.CustomTemplateResourceInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.beginUpdateLongRunning": "TspTest.ArmResourceProvider.CustomTemplateResourceInterface.updateLongRunning", - "tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.beginUpdateLongRunningAsync": "TspTest.ArmResourceProvider.CustomTemplateResourceInterface.updateLongRunning", - "tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.createOrUpdate": "Azure.ResourceManager.CustomTemplateResourceInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.createOrUpdateAsync": "Azure.ResourceManager.CustomTemplateResourceInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.createOrUpdateWithResponseAsync": "Azure.ResourceManager.CustomTemplateResourceInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.updateLongRunning": "TspTest.ArmResourceProvider.CustomTemplateResourceInterface.updateLongRunning", - "tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.updateLongRunningAsync": "TspTest.ArmResourceProvider.CustomTemplateResourceInterface.updateLongRunning", - "tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.updateLongRunningWithResponseAsync": "TspTest.ArmResourceProvider.CustomTemplateResourceInterface.updateLongRunning", - "tsptest.armresourceprovider.fluent.ImmutableResourceModelsClient": "TspTest.ArmResourceProvider.ImmutableResourceModel", - "tsptest.armresourceprovider.fluent.ImmutableResourceModelsClient.beginCreateOrUpdate": "TspTest.ArmResourceProvider.ImmutableResourceModel.createOrUpdate", - "tsptest.armresourceprovider.fluent.ImmutableResourceModelsClient.beginCreateOrUpdateAsync": "TspTest.ArmResourceProvider.ImmutableResourceModel.createOrUpdate", - "tsptest.armresourceprovider.fluent.ImmutableResourceModelsClient.createOrUpdate": "TspTest.ArmResourceProvider.ImmutableResourceModel.createOrUpdate", - "tsptest.armresourceprovider.fluent.ImmutableResourceModelsClient.createOrUpdateAsync": "TspTest.ArmResourceProvider.ImmutableResourceModel.createOrUpdate", - "tsptest.armresourceprovider.fluent.ImmutableResourceModelsClient.createOrUpdateWithResponseAsync": "TspTest.ArmResourceProvider.ImmutableResourceModel.createOrUpdate", - "tsptest.armresourceprovider.fluent.LroNoBodiesClient": "TspTest.ArmResourceProvider.LroNoBody", - "tsptest.armresourceprovider.fluent.LroNoBodiesClient.action": "TspTest.ArmResourceProvider.LroNoBody.action", - "tsptest.armresourceprovider.fluent.LroNoBodiesClient.actionAsync": "TspTest.ArmResourceProvider.LroNoBody.action", - "tsptest.armresourceprovider.fluent.LroNoBodiesClient.actionWithResponseAsync": "TspTest.ArmResourceProvider.LroNoBody.action", - "tsptest.armresourceprovider.fluent.LroNoBodiesClient.beginAction": "TspTest.ArmResourceProvider.LroNoBody.action", - "tsptest.armresourceprovider.fluent.LroNoBodiesClient.beginActionAsync": "TspTest.ArmResourceProvider.LroNoBody.action", - "tsptest.armresourceprovider.fluent.LroNoBodiesClient.beginCreateOrUpdate": "TspTest.ArmResourceProvider.LroNoBody.createOrUpdate", - "tsptest.armresourceprovider.fluent.LroNoBodiesClient.beginCreateOrUpdateAsync": "TspTest.ArmResourceProvider.LroNoBody.createOrUpdate", - "tsptest.armresourceprovider.fluent.LroNoBodiesClient.createOrUpdate": "TspTest.ArmResourceProvider.LroNoBody.createOrUpdate", - "tsptest.armresourceprovider.fluent.LroNoBodiesClient.createOrUpdateAsync": "TspTest.ArmResourceProvider.LroNoBody.createOrUpdate", - "tsptest.armresourceprovider.fluent.LroNoBodiesClient.createOrUpdateWithResponseAsync": "TspTest.ArmResourceProvider.LroNoBody.createOrUpdate", - "tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient": "TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus", - "tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.beginDelete": "TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.delete", - "tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.beginDeleteAsync": "TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.delete", - "tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.delete": "TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.delete", - "tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.deleteAsync": "TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.delete", - "tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.deleteWithResponseAsync": "TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.delete", - "tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.getByResourceGroup": "TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.get", - "tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.getByResourceGroupAsync": "TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.get", - "tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.getByResourceGroupWithResponse": "TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.get", - "tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.getByResourceGroupWithResponseAsync": "TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.get", - "tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient": "TspTest.ArmResourceProvider.ModelInterfaceSameName", - "tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.delete": "TspTest.ArmResourceProvider.ModelInterfaceSameName.delete", - "tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.deleteAsync": "TspTest.ArmResourceProvider.ModelInterfaceSameName.delete", - "tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.deleteWithResponse": "TspTest.ArmResourceProvider.ModelInterfaceSameName.delete", - "tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.deleteWithResponseAsync": "TspTest.ArmResourceProvider.ModelInterfaceSameName.delete", - "tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.getByResourceGroup": "TspTest.ArmResourceProvider.ModelInterfaceSameName.get", - "tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.getByResourceGroupAsync": "TspTest.ArmResourceProvider.ModelInterfaceSameName.get", - "tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.getByResourceGroupWithResponse": "TspTest.ArmResourceProvider.ModelInterfaceSameName.get", - "tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.getByResourceGroupWithResponseAsync": "TspTest.ArmResourceProvider.ModelInterfaceSameName.get", - "tsptest.armresourceprovider.fluent.OperationsClient": "TspTest.ArmResourceProvider.Operations", - "tsptest.armresourceprovider.fluent.OperationsClient.list": "Azure.ResourceManager.Operations.list", - "tsptest.armresourceprovider.fluent.OperationsClient.listAsync": "Azure.ResourceManager.Operations.list", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient": "TspTest.ArmResourceProvider.TopLevelArmResourceInterface", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.action": "TspTest.ArmResourceProvider.TopLevelArmResourceInterface.action", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.actionAsync": "TspTest.ArmResourceProvider.TopLevelArmResourceInterface.action", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.actionWithResponseAsync": "TspTest.ArmResourceProvider.TopLevelArmResourceInterface.action", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.beginAction": "TspTest.ArmResourceProvider.TopLevelArmResourceInterface.action", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.beginActionAsync": "TspTest.ArmResourceProvider.TopLevelArmResourceInterface.action", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.beginCreateOrUpdate": "Azure.ResourceManager.TopLevelArmResourceInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.beginCreateOrUpdateAsync": "Azure.ResourceManager.TopLevelArmResourceInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.beginDelete": "Azure.ResourceManager.TopLevelArmResourceInterface.delete", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.beginDeleteAsync": "Azure.ResourceManager.TopLevelArmResourceInterface.delete", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.createOrUpdate": "Azure.ResourceManager.TopLevelArmResourceInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.createOrUpdateAsync": "Azure.ResourceManager.TopLevelArmResourceInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.createOrUpdateWithResponseAsync": "Azure.ResourceManager.TopLevelArmResourceInterface.createOrUpdate", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.delete": "Azure.ResourceManager.TopLevelArmResourceInterface.delete", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.deleteAsync": "Azure.ResourceManager.TopLevelArmResourceInterface.delete", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.deleteWithResponseAsync": "Azure.ResourceManager.TopLevelArmResourceInterface.delete", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.getByResourceGroup": "Azure.ResourceManager.TopLevelArmResourceInterface.get", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.getByResourceGroupAsync": "Azure.ResourceManager.TopLevelArmResourceInterface.get", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.getByResourceGroupWithResponse": "Azure.ResourceManager.TopLevelArmResourceInterface.get", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.getByResourceGroupWithResponseAsync": "Azure.ResourceManager.TopLevelArmResourceInterface.get", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.list": "Azure.ResourceManager.TopLevelArmResourceInterface.listBySubscription", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.listAsync": "Azure.ResourceManager.TopLevelArmResourceInterface.listBySubscription", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.listByResourceGroup": "Azure.ResourceManager.TopLevelArmResourceInterface.listByResourceGroup", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.listByResourceGroupAsync": "Azure.ResourceManager.TopLevelArmResourceInterface.listByResourceGroup", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.publishXml": "TspTest.ArmResourceProvider.TopLevelArmResourceInterface.publishXml", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.publishXmlAsync": "TspTest.ArmResourceProvider.TopLevelArmResourceInterface.publishXml", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.publishXmlWithResponse": "TspTest.ArmResourceProvider.TopLevelArmResourceInterface.publishXml", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.publishXmlWithResponseAsync": "TspTest.ArmResourceProvider.TopLevelArmResourceInterface.publishXml", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.update": "Azure.ResourceManager.TopLevelArmResourceInterface.update", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.updateAsync": "Azure.ResourceManager.TopLevelArmResourceInterface.update", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.updateWithResponse": "Azure.ResourceManager.TopLevelArmResourceInterface.update", - "tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.updateWithResponseAsync": "Azure.ResourceManager.TopLevelArmResourceInterface.update", - "tsptest.armresourceprovider.fluent.models.ChildExtensionResourceInner": "TspTest.ArmResourceProvider.ChildExtensionResource", - "tsptest.armresourceprovider.fluent.models.ChildResourceInner": "TspTest.ArmResourceProvider.ChildResource", - "tsptest.armresourceprovider.fluent.models.ChildResourceProperties": "TspTest.ArmResourceProvider.ChildResourceProperties", - "tsptest.armresourceprovider.fluent.models.CustomTemplateResourceInner": "TspTest.ArmResourceProvider.CustomTemplateResource", - "tsptest.armresourceprovider.fluent.models.CustomTemplateResourceProperties": "TspTest.ArmResourceProvider.CustomTemplateResourceProperties", - "tsptest.armresourceprovider.fluent.models.ManagedMaintenanceWindowStatusContentProperties": "TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatusContentProperties", - "tsptest.armresourceprovider.fluent.models.ManagedMaintenanceWindowStatusInner": "TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatusContent", - "tsptest.armresourceprovider.fluent.models.ModelInterfaceDifferentNameProperties": "TspTest.ArmResourceProvider.ModelInterfaceDifferentNameProperties", - "tsptest.armresourceprovider.fluent.models.ModelInterfaceSameNameInner": "TspTest.ArmResourceProvider.ModelInterfaceDifferentName", - "tsptest.armresourceprovider.fluent.models.OperationInner": "Azure.ResourceManager.CommonTypes.Operation", - "tsptest.armresourceprovider.fluent.models.ResourceLroNoBodyProperties": "TspTest.ArmResourceProvider.ResourceLroNoBodyProperties", - "tsptest.armresourceprovider.fluent.models.ResultInner": "TspTest.ArmResourceProvider.Result", - "tsptest.armresourceprovider.fluent.models.TopLevelArmResourceInner": "TspTest.ArmResourceProvider.TopLevelArmResource", - "tsptest.armresourceprovider.fluent.models.TopLevelArmResourceProperties": "TspTest.ArmResourceProvider.TopLevelArmResourceProperties", - "tsptest.armresourceprovider.fluent.models.TopLevelArmResourceUpdateProperties": "Azure.ResourceManager.Foundations.ResourceUpdateModelProperties", - "tsptest.armresourceprovider.implementation.ArmClientBuilder": "TspTest.ArmResourceProvider", - "tsptest.armresourceprovider.implementation.models.ChildExtensionResourceListResult": "Azure.ResourceManager.ResourceListResult", - "tsptest.armresourceprovider.implementation.models.ChildResourceListResult": "TspTest.ArmResourceProvider.ChildResourceListResult", - "tsptest.armresourceprovider.implementation.models.OperationListResult": "Azure.ResourceManager.CommonTypes.OperationListResult", - "tsptest.armresourceprovider.implementation.models.ResourceListResult": "Azure.ResourceManager.ResourceListResult", - "tsptest.armresourceprovider.models.ActionFinalResult": "TspTest.ArmResourceProvider.ActionFinalResult", - "tsptest.armresourceprovider.models.ActionType": "Azure.ResourceManager.CommonTypes.ActionType", - "tsptest.armresourceprovider.models.AnonymousEmptyModel": "TspTest.ArmResourceProvider.CustomTemplateResourceProperties.anonymousEmptyModel.anonymous", - "tsptest.armresourceprovider.models.ChildExtensionResourceProperties": "TspTest.ArmResourceProvider.ChildExtensionResourceProperties", - "tsptest.armresourceprovider.models.ChildExtensionResourceUpdate": "Azure.ResourceManager.Foundations.ResourceUpdateModel", - "tsptest.armresourceprovider.models.ChildResourceUpdate": "Azure.ResourceManager.Foundations.ResourceUpdateModel", - "tsptest.armresourceprovider.models.CustomTemplateResourcePatch": "TspTest.ArmResourceProvider.CustomTemplateResourcePatch", - "tsptest.armresourceprovider.models.Dog": "TspTest.ArmResourceProvider.Dog", - "tsptest.armresourceprovider.models.DogKind": "TspTest.ArmResourceProvider.DogKind", - "tsptest.armresourceprovider.models.EmptyModel": "TspTest.ArmResourceProvider.EmptyModel", - "tsptest.armresourceprovider.models.Golden": "TspTest.ArmResourceProvider.Golden", - "tsptest.armresourceprovider.models.ManagedServiceIdentity": "Azure.ResourceManager.CommonTypes.ManagedServiceIdentity", - "tsptest.armresourceprovider.models.ManagedServiceIdentityType": "Azure.ResourceManager.CommonTypes.ManagedServiceIdentityType", - "tsptest.armresourceprovider.models.NginxConfigurationRequest": "TspTest.ArmResourceProvider.NginxConfigurationRequest", - "tsptest.armresourceprovider.models.NginxConfigurationResponse": "TspTest.ArmResourceProvider.NginxConfigurationResponse", - "tsptest.armresourceprovider.models.NginxConfigurationResponseProperties": "TspTest.ArmResourceProvider.NginxConfigurationResponseProperties", - "tsptest.armresourceprovider.models.OperationDisplay": "Azure.ResourceManager.CommonTypes.OperationDisplay", - "tsptest.armresourceprovider.models.Origin": "Azure.ResourceManager.CommonTypes.Origin", - "tsptest.armresourceprovider.models.PriorityModel": "TspTest.ArmResourceProvider.PriorityModel", - "tsptest.armresourceprovider.models.ProvisioningState": "TspTest.ArmResourceProvider.ProvisioningState", - "tsptest.armresourceprovider.models.ResourceLroNoBody": "TspTest.ArmResourceProvider.ResourceLroNoBody", - "tsptest.armresourceprovider.models.TopLevelArmResourceUpdate": "Azure.ResourceManager.Foundations.ResourceUpdateModel", - "tsptest.armresourceprovider.models.UserAssignedIdentity": "Azure.ResourceManager.CommonTypes.UserAssignedIdentity" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armresourceprovider-generated_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armresourceprovider-generated_metadata.json index c8a5d15cbab..66ea7a9b593 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armresourceprovider-generated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armresourceprovider-generated_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2023-11-01","crossLanguageDefinitions":{"tsptest.armresourceprovider.fluent.ArmClient":"TspTest.ArmResourceProvider","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient":"TspTest.ArmResourceProvider.ChildExtensionResourceInterface","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.beginCreateOrUpdate":"Azure.ResourceManager.ChildExtensionResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.beginCreateOrUpdateAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.beginDelete":"Azure.ResourceManager.ChildExtensionResourceInterface.delete","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.beginDeleteAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.delete","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.createOrUpdate":"Azure.ResourceManager.ChildExtensionResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.createOrUpdateAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.createOrUpdateWithResponseAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.delete":"Azure.ResourceManager.ChildExtensionResourceInterface.delete","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.deleteAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.delete","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.deleteWithResponseAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.delete","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.get":"Azure.ResourceManager.ChildExtensionResourceInterface.get","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.getAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.get","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.getWithResponse":"Azure.ResourceManager.ChildExtensionResourceInterface.get","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.getWithResponseAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.get","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.listByTopLevelArmResource":"Azure.ResourceManager.ChildExtensionResourceInterface.listByTopLevelArmResource","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.listByTopLevelArmResourceAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.listByTopLevelArmResource","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.update":"Azure.ResourceManager.ChildExtensionResourceInterface.update","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.updateAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.update","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.updateWithResponse":"Azure.ResourceManager.ChildExtensionResourceInterface.update","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.updateWithResponseAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.update","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient":"TspTest.ArmResourceProvider.ChildResourcesInterface","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.actionWithoutBody":"TspTest.ArmResourceProvider.ChildResourcesInterface.actionWithoutBody","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.actionWithoutBodyAsync":"TspTest.ArmResourceProvider.ChildResourcesInterface.actionWithoutBody","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.actionWithoutBodyWithResponseAsync":"TspTest.ArmResourceProvider.ChildResourcesInterface.actionWithoutBody","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.beginActionWithoutBody":"TspTest.ArmResourceProvider.ChildResourcesInterface.actionWithoutBody","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.beginActionWithoutBodyAsync":"TspTest.ArmResourceProvider.ChildResourcesInterface.actionWithoutBody","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.beginCreateOrUpdate":"Azure.ResourceManager.ChildResourcesInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.beginCreateOrUpdateAsync":"Azure.ResourceManager.ChildResourcesInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.beginDelete":"Azure.ResourceManager.ChildResourcesInterface.delete","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.beginDeleteAsync":"Azure.ResourceManager.ChildResourcesInterface.delete","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.createOrUpdate":"Azure.ResourceManager.ChildResourcesInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.createOrUpdateAsync":"Azure.ResourceManager.ChildResourcesInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.createOrUpdateWithResponseAsync":"Azure.ResourceManager.ChildResourcesInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.delete":"Azure.ResourceManager.ChildResourcesInterface.delete","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.deleteAsync":"Azure.ResourceManager.ChildResourcesInterface.delete","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.deleteWithResponseAsync":"Azure.ResourceManager.ChildResourcesInterface.delete","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.get":"Azure.ResourceManager.ChildResourcesInterface.get","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.getAsync":"Azure.ResourceManager.ChildResourcesInterface.get","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.getWithResponse":"Azure.ResourceManager.ChildResourcesInterface.get","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.getWithResponseAsync":"Azure.ResourceManager.ChildResourcesInterface.get","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.listByTopLevelArmResource":"TspTest.ArmResourceProvider.ChildResourcesInterface.listByTopLevelArmResource","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.listByTopLevelArmResourceAsync":"TspTest.ArmResourceProvider.ChildResourcesInterface.listByTopLevelArmResource","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.update":"Azure.ResourceManager.ChildResourcesInterface.update","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.updateAsync":"Azure.ResourceManager.ChildResourcesInterface.update","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.updateWithResponse":"Azure.ResourceManager.ChildResourcesInterface.update","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.updateWithResponseAsync":"Azure.ResourceManager.ChildResourcesInterface.update","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient":"TspTest.ArmResourceProvider.CustomTemplateResourceInterface","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.beginCreateOrUpdate":"Azure.ResourceManager.CustomTemplateResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.beginCreateOrUpdateAsync":"Azure.ResourceManager.CustomTemplateResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.beginUpdateLongRunning":"TspTest.ArmResourceProvider.CustomTemplateResourceInterface.updateLongRunning","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.beginUpdateLongRunningAsync":"TspTest.ArmResourceProvider.CustomTemplateResourceInterface.updateLongRunning","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.createOrUpdate":"Azure.ResourceManager.CustomTemplateResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.createOrUpdateAsync":"Azure.ResourceManager.CustomTemplateResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.createOrUpdateWithResponseAsync":"Azure.ResourceManager.CustomTemplateResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.updateLongRunning":"TspTest.ArmResourceProvider.CustomTemplateResourceInterface.updateLongRunning","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.updateLongRunningAsync":"TspTest.ArmResourceProvider.CustomTemplateResourceInterface.updateLongRunning","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.updateLongRunningWithResponseAsync":"TspTest.ArmResourceProvider.CustomTemplateResourceInterface.updateLongRunning","tsptest.armresourceprovider.fluent.ImmutableResourceModelsClient":"TspTest.ArmResourceProvider.ImmutableResourceModel","tsptest.armresourceprovider.fluent.ImmutableResourceModelsClient.beginCreateOrUpdate":"TspTest.ArmResourceProvider.ImmutableResourceModel.createOrUpdate","tsptest.armresourceprovider.fluent.ImmutableResourceModelsClient.beginCreateOrUpdateAsync":"TspTest.ArmResourceProvider.ImmutableResourceModel.createOrUpdate","tsptest.armresourceprovider.fluent.ImmutableResourceModelsClient.createOrUpdate":"TspTest.ArmResourceProvider.ImmutableResourceModel.createOrUpdate","tsptest.armresourceprovider.fluent.ImmutableResourceModelsClient.createOrUpdateAsync":"TspTest.ArmResourceProvider.ImmutableResourceModel.createOrUpdate","tsptest.armresourceprovider.fluent.ImmutableResourceModelsClient.createOrUpdateWithResponseAsync":"TspTest.ArmResourceProvider.ImmutableResourceModel.createOrUpdate","tsptest.armresourceprovider.fluent.LroNoBodiesClient":"TspTest.ArmResourceProvider.LroNoBody","tsptest.armresourceprovider.fluent.LroNoBodiesClient.action":"TspTest.ArmResourceProvider.LroNoBody.action","tsptest.armresourceprovider.fluent.LroNoBodiesClient.actionAsync":"TspTest.ArmResourceProvider.LroNoBody.action","tsptest.armresourceprovider.fluent.LroNoBodiesClient.actionWithResponseAsync":"TspTest.ArmResourceProvider.LroNoBody.action","tsptest.armresourceprovider.fluent.LroNoBodiesClient.beginAction":"TspTest.ArmResourceProvider.LroNoBody.action","tsptest.armresourceprovider.fluent.LroNoBodiesClient.beginActionAsync":"TspTest.ArmResourceProvider.LroNoBody.action","tsptest.armresourceprovider.fluent.LroNoBodiesClient.beginCreateOrUpdate":"TspTest.ArmResourceProvider.LroNoBody.createOrUpdate","tsptest.armresourceprovider.fluent.LroNoBodiesClient.beginCreateOrUpdateAsync":"TspTest.ArmResourceProvider.LroNoBody.createOrUpdate","tsptest.armresourceprovider.fluent.LroNoBodiesClient.createOrUpdate":"TspTest.ArmResourceProvider.LroNoBody.createOrUpdate","tsptest.armresourceprovider.fluent.LroNoBodiesClient.createOrUpdateAsync":"TspTest.ArmResourceProvider.LroNoBody.createOrUpdate","tsptest.armresourceprovider.fluent.LroNoBodiesClient.createOrUpdateWithResponseAsync":"TspTest.ArmResourceProvider.LroNoBody.createOrUpdate","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.beginDelete":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.delete","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.beginDeleteAsync":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.delete","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.delete":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.delete","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.deleteAsync":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.delete","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.deleteWithResponseAsync":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.delete","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.getByResourceGroup":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.get","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.getByResourceGroupAsync":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.get","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.getByResourceGroupWithResponse":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.get","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.getByResourceGroupWithResponseAsync":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.get","tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient":"TspTest.ArmResourceProvider.ModelInterfaceSameName","tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.delete":"TspTest.ArmResourceProvider.ModelInterfaceSameName.delete","tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.deleteAsync":"TspTest.ArmResourceProvider.ModelInterfaceSameName.delete","tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.deleteWithResponse":"TspTest.ArmResourceProvider.ModelInterfaceSameName.delete","tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.deleteWithResponseAsync":"TspTest.ArmResourceProvider.ModelInterfaceSameName.delete","tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.getByResourceGroup":"TspTest.ArmResourceProvider.ModelInterfaceSameName.get","tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.getByResourceGroupAsync":"TspTest.ArmResourceProvider.ModelInterfaceSameName.get","tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.getByResourceGroupWithResponse":"TspTest.ArmResourceProvider.ModelInterfaceSameName.get","tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.getByResourceGroupWithResponseAsync":"TspTest.ArmResourceProvider.ModelInterfaceSameName.get","tsptest.armresourceprovider.fluent.OperationsClient":"TspTest.ArmResourceProvider.Operations","tsptest.armresourceprovider.fluent.OperationsClient.list":"Azure.ResourceManager.Operations.list","tsptest.armresourceprovider.fluent.OperationsClient.listAsync":"Azure.ResourceManager.Operations.list","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.action":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface.action","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.actionAsync":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface.action","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.actionWithResponseAsync":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface.action","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.beginAction":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface.action","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.beginActionAsync":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface.action","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.beginCreateOrUpdate":"Azure.ResourceManager.TopLevelArmResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.beginCreateOrUpdateAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.beginDelete":"Azure.ResourceManager.TopLevelArmResourceInterface.delete","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.beginDeleteAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.delete","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.createOrUpdate":"Azure.ResourceManager.TopLevelArmResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.createOrUpdateAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.createOrUpdateWithResponseAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.delete":"Azure.ResourceManager.TopLevelArmResourceInterface.delete","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.deleteAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.delete","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.deleteWithResponseAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.delete","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.getByResourceGroup":"Azure.ResourceManager.TopLevelArmResourceInterface.get","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.getByResourceGroupAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.get","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.getByResourceGroupWithResponse":"Azure.ResourceManager.TopLevelArmResourceInterface.get","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.getByResourceGroupWithResponseAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.get","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.list":"Azure.ResourceManager.TopLevelArmResourceInterface.listBySubscription","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.listAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.listBySubscription","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.listByResourceGroup":"Azure.ResourceManager.TopLevelArmResourceInterface.listByResourceGroup","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.listByResourceGroupAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.listByResourceGroup","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.publishXml":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface.publishXml","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.publishXmlAsync":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface.publishXml","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.publishXmlWithResponse":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface.publishXml","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.publishXmlWithResponseAsync":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface.publishXml","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.update":"Azure.ResourceManager.TopLevelArmResourceInterface.update","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.updateAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.update","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.updateWithResponse":"Azure.ResourceManager.TopLevelArmResourceInterface.update","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.updateWithResponseAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.update","tsptest.armresourceprovider.fluent.models.ChildExtensionResourceInner":"TspTest.ArmResourceProvider.ChildExtensionResource","tsptest.armresourceprovider.fluent.models.ChildResourceInner":"TspTest.ArmResourceProvider.ChildResource","tsptest.armresourceprovider.fluent.models.ChildResourceProperties":"TspTest.ArmResourceProvider.ChildResourceProperties","tsptest.armresourceprovider.fluent.models.CustomTemplateResourceInner":"TspTest.ArmResourceProvider.CustomTemplateResource","tsptest.armresourceprovider.fluent.models.CustomTemplateResourceProperties":"TspTest.ArmResourceProvider.CustomTemplateResourceProperties","tsptest.armresourceprovider.fluent.models.ManagedMaintenanceWindowStatusContentProperties":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatusContentProperties","tsptest.armresourceprovider.fluent.models.ManagedMaintenanceWindowStatusInner":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatusContent","tsptest.armresourceprovider.fluent.models.ModelInterfaceDifferentNameProperties":"TspTest.ArmResourceProvider.ModelInterfaceDifferentNameProperties","tsptest.armresourceprovider.fluent.models.ModelInterfaceSameNameInner":"TspTest.ArmResourceProvider.ModelInterfaceDifferentName","tsptest.armresourceprovider.fluent.models.OperationInner":"Azure.ResourceManager.CommonTypes.Operation","tsptest.armresourceprovider.fluent.models.ResourceLroNoBodyProperties":"TspTest.ArmResourceProvider.ResourceLroNoBodyProperties","tsptest.armresourceprovider.fluent.models.ResultInner":"TspTest.ArmResourceProvider.Result","tsptest.armresourceprovider.fluent.models.TopLevelArmResourceInner":"TspTest.ArmResourceProvider.TopLevelArmResource","tsptest.armresourceprovider.fluent.models.TopLevelArmResourceProperties":"TspTest.ArmResourceProvider.TopLevelArmResourceProperties","tsptest.armresourceprovider.fluent.models.TopLevelArmResourceUpdateProperties":"Azure.ResourceManager.Foundations.ResourceUpdateModelProperties","tsptest.armresourceprovider.implementation.ArmClientBuilder":"TspTest.ArmResourceProvider","tsptest.armresourceprovider.implementation.models.ChildExtensionResourceListResult":"Azure.ResourceManager.ResourceListResult","tsptest.armresourceprovider.implementation.models.ChildResourceListResult":"TspTest.ArmResourceProvider.ChildResourceListResult","tsptest.armresourceprovider.implementation.models.OperationListResult":"Azure.ResourceManager.CommonTypes.OperationListResult","tsptest.armresourceprovider.implementation.models.ResourceListResult":"Azure.ResourceManager.ResourceListResult","tsptest.armresourceprovider.models.ActionFinalResult":"TspTest.ArmResourceProvider.ActionFinalResult","tsptest.armresourceprovider.models.ActionType":"Azure.ResourceManager.CommonTypes.ActionType","tsptest.armresourceprovider.models.AnonymousEmptyModel":"TspTest.ArmResourceProvider.CustomTemplateResourceProperties.anonymousEmptyModel.anonymous","tsptest.armresourceprovider.models.ChildExtensionResourceProperties":"TspTest.ArmResourceProvider.ChildExtensionResourceProperties","tsptest.armresourceprovider.models.ChildExtensionResourceUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","tsptest.armresourceprovider.models.ChildResourceUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","tsptest.armresourceprovider.models.CustomTemplateResourcePatch":"TspTest.ArmResourceProvider.CustomTemplateResourcePatch","tsptest.armresourceprovider.models.Dog":"TspTest.ArmResourceProvider.Dog","tsptest.armresourceprovider.models.DogKind":"TspTest.ArmResourceProvider.DogKind","tsptest.armresourceprovider.models.EmptyModel":"TspTest.ArmResourceProvider.EmptyModel","tsptest.armresourceprovider.models.Golden":"TspTest.ArmResourceProvider.Golden","tsptest.armresourceprovider.models.ManagedServiceIdentity":"Azure.ResourceManager.CommonTypes.ManagedServiceIdentity","tsptest.armresourceprovider.models.ManagedServiceIdentityType":"Azure.ResourceManager.CommonTypes.ManagedServiceIdentityType","tsptest.armresourceprovider.models.NginxConfigurationRequest":"TspTest.ArmResourceProvider.NginxConfigurationRequest","tsptest.armresourceprovider.models.NginxConfigurationResponse":"TspTest.ArmResourceProvider.NginxConfigurationResponse","tsptest.armresourceprovider.models.NginxConfigurationResponseProperties":"TspTest.ArmResourceProvider.NginxConfigurationResponseProperties","tsptest.armresourceprovider.models.OperationDisplay":"Azure.ResourceManager.CommonTypes.OperationDisplay","tsptest.armresourceprovider.models.Origin":"Azure.ResourceManager.CommonTypes.Origin","tsptest.armresourceprovider.models.PriorityModel":"TspTest.ArmResourceProvider.PriorityModel","tsptest.armresourceprovider.models.ProvisioningState":"TspTest.ArmResourceProvider.ProvisioningState","tsptest.armresourceprovider.models.ResourceLroNoBody":"TspTest.ArmResourceProvider.ResourceLroNoBody","tsptest.armresourceprovider.models.TopLevelArmResourceUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","tsptest.armresourceprovider.models.UserAssignedIdentity":"Azure.ResourceManager.CommonTypes.UserAssignedIdentity"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/armresourceprovider/ArmResourceProviderManager.java","src/main/java/tsptest/armresourceprovider/fluent/ArmClient.java","src/main/java/tsptest/armresourceprovider/fluent/ChildExtensionResourceInterfacesClient.java","src/main/java/tsptest/armresourceprovider/fluent/ChildResourcesInterfacesClient.java","src/main/java/tsptest/armresourceprovider/fluent/CustomTemplateResourceInterfacesClient.java","src/main/java/tsptest/armresourceprovider/fluent/ImmutableResourceModelsClient.java","src/main/java/tsptest/armresourceprovider/fluent/LroNoBodiesClient.java","src/main/java/tsptest/armresourceprovider/fluent/ManagedMaintenanceWindowStatusOperationsClient.java","src/main/java/tsptest/armresourceprovider/fluent/ModelInterfaceSameNamesClient.java","src/main/java/tsptest/armresourceprovider/fluent/OperationsClient.java","src/main/java/tsptest/armresourceprovider/fluent/TopLevelArmResourceInterfacesClient.java","src/main/java/tsptest/armresourceprovider/fluent/models/ChildExtensionResourceInner.java","src/main/java/tsptest/armresourceprovider/fluent/models/ChildResourceInner.java","src/main/java/tsptest/armresourceprovider/fluent/models/ChildResourceProperties.java","src/main/java/tsptest/armresourceprovider/fluent/models/CustomTemplateResourceInner.java","src/main/java/tsptest/armresourceprovider/fluent/models/CustomTemplateResourceProperties.java","src/main/java/tsptest/armresourceprovider/fluent/models/ManagedMaintenanceWindowStatusContentProperties.java","src/main/java/tsptest/armresourceprovider/fluent/models/ManagedMaintenanceWindowStatusInner.java","src/main/java/tsptest/armresourceprovider/fluent/models/ModelInterfaceDifferentNameProperties.java","src/main/java/tsptest/armresourceprovider/fluent/models/ModelInterfaceSameNameInner.java","src/main/java/tsptest/armresourceprovider/fluent/models/OperationInner.java","src/main/java/tsptest/armresourceprovider/fluent/models/ResourceLroNoBodyProperties.java","src/main/java/tsptest/armresourceprovider/fluent/models/ResultInner.java","src/main/java/tsptest/armresourceprovider/fluent/models/TopLevelArmResourceInner.java","src/main/java/tsptest/armresourceprovider/fluent/models/TopLevelArmResourceProperties.java","src/main/java/tsptest/armresourceprovider/fluent/models/TopLevelArmResourceUpdateProperties.java","src/main/java/tsptest/armresourceprovider/fluent/models/package-info.java","src/main/java/tsptest/armresourceprovider/fluent/package-info.java","src/main/java/tsptest/armresourceprovider/implementation/ArmClientBuilder.java","src/main/java/tsptest/armresourceprovider/implementation/ArmClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ChildExtensionResourceImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ChildExtensionResourceInterfacesClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ChildExtensionResourceInterfacesImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ChildResourceImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ChildResourcesInterfacesClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ChildResourcesInterfacesImpl.java","src/main/java/tsptest/armresourceprovider/implementation/CustomTemplateResourceImpl.java","src/main/java/tsptest/armresourceprovider/implementation/CustomTemplateResourceInterfacesClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/CustomTemplateResourceInterfacesImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ImmutableResourceModelsClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ImmutableResourceModelsImpl.java","src/main/java/tsptest/armresourceprovider/implementation/LroNoBodiesClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/LroNoBodiesImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ManagedMaintenanceWindowStatusImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ManagedMaintenanceWindowStatusOperationsClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ManagedMaintenanceWindowStatusOperationsImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ModelInterfaceSameNameImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ModelInterfaceSameNamesClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ModelInterfaceSameNamesImpl.java","src/main/java/tsptest/armresourceprovider/implementation/OperationImpl.java","src/main/java/tsptest/armresourceprovider/implementation/OperationsClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/OperationsImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ResourceManagerUtils.java","src/main/java/tsptest/armresourceprovider/implementation/ResultImpl.java","src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceImpl.java","src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceInterfacesClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceInterfacesImpl.java","src/main/java/tsptest/armresourceprovider/implementation/models/ChildExtensionResourceListResult.java","src/main/java/tsptest/armresourceprovider/implementation/models/ChildResourceListResult.java","src/main/java/tsptest/armresourceprovider/implementation/models/OperationListResult.java","src/main/java/tsptest/armresourceprovider/implementation/models/ResourceListResult.java","src/main/java/tsptest/armresourceprovider/implementation/package-info.java","src/main/java/tsptest/armresourceprovider/models/ActionFinalResult.java","src/main/java/tsptest/armresourceprovider/models/ActionType.java","src/main/java/tsptest/armresourceprovider/models/AnonymousEmptyModel.java","src/main/java/tsptest/armresourceprovider/models/ChildExtensionResource.java","src/main/java/tsptest/armresourceprovider/models/ChildExtensionResourceInterfaces.java","src/main/java/tsptest/armresourceprovider/models/ChildExtensionResourceProperties.java","src/main/java/tsptest/armresourceprovider/models/ChildExtensionResourceUpdate.java","src/main/java/tsptest/armresourceprovider/models/ChildResource.java","src/main/java/tsptest/armresourceprovider/models/ChildResourceUpdate.java","src/main/java/tsptest/armresourceprovider/models/ChildResourcesInterfaces.java","src/main/java/tsptest/armresourceprovider/models/CustomTemplateResource.java","src/main/java/tsptest/armresourceprovider/models/CustomTemplateResourceInterfaces.java","src/main/java/tsptest/armresourceprovider/models/CustomTemplateResourcePatch.java","src/main/java/tsptest/armresourceprovider/models/Dog.java","src/main/java/tsptest/armresourceprovider/models/DogKind.java","src/main/java/tsptest/armresourceprovider/models/EmptyModel.java","src/main/java/tsptest/armresourceprovider/models/Golden.java","src/main/java/tsptest/armresourceprovider/models/ImmutableResourceModels.java","src/main/java/tsptest/armresourceprovider/models/LroNoBodies.java","src/main/java/tsptest/armresourceprovider/models/ManagedMaintenanceWindowStatus.java","src/main/java/tsptest/armresourceprovider/models/ManagedMaintenanceWindowStatusOperations.java","src/main/java/tsptest/armresourceprovider/models/ManagedServiceIdentity.java","src/main/java/tsptest/armresourceprovider/models/ManagedServiceIdentityType.java","src/main/java/tsptest/armresourceprovider/models/ModelInterfaceSameName.java","src/main/java/tsptest/armresourceprovider/models/ModelInterfaceSameNames.java","src/main/java/tsptest/armresourceprovider/models/NginxConfigurationRequest.java","src/main/java/tsptest/armresourceprovider/models/NginxConfigurationResponse.java","src/main/java/tsptest/armresourceprovider/models/NginxConfigurationResponseProperties.java","src/main/java/tsptest/armresourceprovider/models/Operation.java","src/main/java/tsptest/armresourceprovider/models/OperationDisplay.java","src/main/java/tsptest/armresourceprovider/models/Operations.java","src/main/java/tsptest/armresourceprovider/models/Origin.java","src/main/java/tsptest/armresourceprovider/models/PriorityModel.java","src/main/java/tsptest/armresourceprovider/models/ProvisioningState.java","src/main/java/tsptest/armresourceprovider/models/ResourceLroNoBody.java","src/main/java/tsptest/armresourceprovider/models/Result.java","src/main/java/tsptest/armresourceprovider/models/TopLevelArmResource.java","src/main/java/tsptest/armresourceprovider/models/TopLevelArmResourceInterfaces.java","src/main/java/tsptest/armresourceprovider/models/TopLevelArmResourceUpdate.java","src/main/java/tsptest/armresourceprovider/models/UserAssignedIdentity.java","src/main/java/tsptest/armresourceprovider/models/package-info.java","src/main/java/tsptest/armresourceprovider/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"TspTest.ArmResourceProvider":"2023-11-01"},"crossLanguageDefinitions":{"tsptest.armresourceprovider.fluent.ArmClient":"TspTest.ArmResourceProvider","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient":"TspTest.ArmResourceProvider.ChildExtensionResourceInterface","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.beginCreateOrUpdate":"Azure.ResourceManager.ChildExtensionResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.beginCreateOrUpdateAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.beginDelete":"Azure.ResourceManager.ChildExtensionResourceInterface.delete","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.beginDeleteAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.delete","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.createOrUpdate":"Azure.ResourceManager.ChildExtensionResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.createOrUpdateAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.createOrUpdateWithResponseAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.delete":"Azure.ResourceManager.ChildExtensionResourceInterface.delete","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.deleteAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.delete","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.deleteWithResponseAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.delete","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.get":"Azure.ResourceManager.ChildExtensionResourceInterface.get","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.getAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.get","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.getWithResponse":"Azure.ResourceManager.ChildExtensionResourceInterface.get","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.getWithResponseAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.get","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.listByTopLevelArmResource":"Azure.ResourceManager.ChildExtensionResourceInterface.listByTopLevelArmResource","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.listByTopLevelArmResourceAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.listByTopLevelArmResource","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.update":"Azure.ResourceManager.ChildExtensionResourceInterface.update","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.updateAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.update","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.updateWithResponse":"Azure.ResourceManager.ChildExtensionResourceInterface.update","tsptest.armresourceprovider.fluent.ChildExtensionResourceInterfacesClient.updateWithResponseAsync":"Azure.ResourceManager.ChildExtensionResourceInterface.update","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient":"TspTest.ArmResourceProvider.ChildResourcesInterface","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.actionWithoutBody":"TspTest.ArmResourceProvider.ChildResourcesInterface.actionWithoutBody","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.actionWithoutBodyAsync":"TspTest.ArmResourceProvider.ChildResourcesInterface.actionWithoutBody","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.actionWithoutBodyWithResponseAsync":"TspTest.ArmResourceProvider.ChildResourcesInterface.actionWithoutBody","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.beginActionWithoutBody":"TspTest.ArmResourceProvider.ChildResourcesInterface.actionWithoutBody","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.beginActionWithoutBodyAsync":"TspTest.ArmResourceProvider.ChildResourcesInterface.actionWithoutBody","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.beginCreateOrUpdate":"Azure.ResourceManager.ChildResourcesInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.beginCreateOrUpdateAsync":"Azure.ResourceManager.ChildResourcesInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.beginDelete":"Azure.ResourceManager.ChildResourcesInterface.delete","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.beginDeleteAsync":"Azure.ResourceManager.ChildResourcesInterface.delete","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.createOrUpdate":"Azure.ResourceManager.ChildResourcesInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.createOrUpdateAsync":"Azure.ResourceManager.ChildResourcesInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.createOrUpdateWithResponseAsync":"Azure.ResourceManager.ChildResourcesInterface.createOrUpdate","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.delete":"Azure.ResourceManager.ChildResourcesInterface.delete","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.deleteAsync":"Azure.ResourceManager.ChildResourcesInterface.delete","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.deleteWithResponseAsync":"Azure.ResourceManager.ChildResourcesInterface.delete","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.get":"Azure.ResourceManager.ChildResourcesInterface.get","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.getAsync":"Azure.ResourceManager.ChildResourcesInterface.get","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.getWithResponse":"Azure.ResourceManager.ChildResourcesInterface.get","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.getWithResponseAsync":"Azure.ResourceManager.ChildResourcesInterface.get","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.listByTopLevelArmResource":"TspTest.ArmResourceProvider.ChildResourcesInterface.listByTopLevelArmResource","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.listByTopLevelArmResourceAsync":"TspTest.ArmResourceProvider.ChildResourcesInterface.listByTopLevelArmResource","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.update":"Azure.ResourceManager.ChildResourcesInterface.update","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.updateAsync":"Azure.ResourceManager.ChildResourcesInterface.update","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.updateWithResponse":"Azure.ResourceManager.ChildResourcesInterface.update","tsptest.armresourceprovider.fluent.ChildResourcesInterfacesClient.updateWithResponseAsync":"Azure.ResourceManager.ChildResourcesInterface.update","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient":"TspTest.ArmResourceProvider.CustomTemplateResourceInterface","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.beginCreateOrUpdate":"Azure.ResourceManager.CustomTemplateResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.beginCreateOrUpdateAsync":"Azure.ResourceManager.CustomTemplateResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.beginUpdateLongRunning":"TspTest.ArmResourceProvider.CustomTemplateResourceInterface.updateLongRunning","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.beginUpdateLongRunningAsync":"TspTest.ArmResourceProvider.CustomTemplateResourceInterface.updateLongRunning","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.createOrUpdate":"Azure.ResourceManager.CustomTemplateResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.createOrUpdateAsync":"Azure.ResourceManager.CustomTemplateResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.createOrUpdateWithResponseAsync":"Azure.ResourceManager.CustomTemplateResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.updateLongRunning":"TspTest.ArmResourceProvider.CustomTemplateResourceInterface.updateLongRunning","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.updateLongRunningAsync":"TspTest.ArmResourceProvider.CustomTemplateResourceInterface.updateLongRunning","tsptest.armresourceprovider.fluent.CustomTemplateResourceInterfacesClient.updateLongRunningWithResponseAsync":"TspTest.ArmResourceProvider.CustomTemplateResourceInterface.updateLongRunning","tsptest.armresourceprovider.fluent.ImmutableResourceModelsClient":"TspTest.ArmResourceProvider.ImmutableResourceModel","tsptest.armresourceprovider.fluent.ImmutableResourceModelsClient.beginCreateOrUpdate":"TspTest.ArmResourceProvider.ImmutableResourceModel.createOrUpdate","tsptest.armresourceprovider.fluent.ImmutableResourceModelsClient.beginCreateOrUpdateAsync":"TspTest.ArmResourceProvider.ImmutableResourceModel.createOrUpdate","tsptest.armresourceprovider.fluent.ImmutableResourceModelsClient.createOrUpdate":"TspTest.ArmResourceProvider.ImmutableResourceModel.createOrUpdate","tsptest.armresourceprovider.fluent.ImmutableResourceModelsClient.createOrUpdateAsync":"TspTest.ArmResourceProvider.ImmutableResourceModel.createOrUpdate","tsptest.armresourceprovider.fluent.ImmutableResourceModelsClient.createOrUpdateWithResponseAsync":"TspTest.ArmResourceProvider.ImmutableResourceModel.createOrUpdate","tsptest.armresourceprovider.fluent.LroNoBodiesClient":"TspTest.ArmResourceProvider.LroNoBody","tsptest.armresourceprovider.fluent.LroNoBodiesClient.action":"TspTest.ArmResourceProvider.LroNoBody.action","tsptest.armresourceprovider.fluent.LroNoBodiesClient.actionAsync":"TspTest.ArmResourceProvider.LroNoBody.action","tsptest.armresourceprovider.fluent.LroNoBodiesClient.actionWithResponseAsync":"TspTest.ArmResourceProvider.LroNoBody.action","tsptest.armresourceprovider.fluent.LroNoBodiesClient.beginAction":"TspTest.ArmResourceProvider.LroNoBody.action","tsptest.armresourceprovider.fluent.LroNoBodiesClient.beginActionAsync":"TspTest.ArmResourceProvider.LroNoBody.action","tsptest.armresourceprovider.fluent.LroNoBodiesClient.beginCreateOrUpdate":"TspTest.ArmResourceProvider.LroNoBody.createOrUpdate","tsptest.armresourceprovider.fluent.LroNoBodiesClient.beginCreateOrUpdateAsync":"TspTest.ArmResourceProvider.LroNoBody.createOrUpdate","tsptest.armresourceprovider.fluent.LroNoBodiesClient.createOrUpdate":"TspTest.ArmResourceProvider.LroNoBody.createOrUpdate","tsptest.armresourceprovider.fluent.LroNoBodiesClient.createOrUpdateAsync":"TspTest.ArmResourceProvider.LroNoBody.createOrUpdate","tsptest.armresourceprovider.fluent.LroNoBodiesClient.createOrUpdateWithResponseAsync":"TspTest.ArmResourceProvider.LroNoBody.createOrUpdate","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.beginDelete":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.delete","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.beginDeleteAsync":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.delete","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.delete":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.delete","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.deleteAsync":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.delete","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.deleteWithResponseAsync":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.delete","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.getByResourceGroup":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.get","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.getByResourceGroupAsync":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.get","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.getByResourceGroupWithResponse":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.get","tsptest.armresourceprovider.fluent.ManagedMaintenanceWindowStatusOperationsClient.getByResourceGroupWithResponseAsync":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatus.get","tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient":"TspTest.ArmResourceProvider.ModelInterfaceSameName","tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.delete":"TspTest.ArmResourceProvider.ModelInterfaceSameName.delete","tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.deleteAsync":"TspTest.ArmResourceProvider.ModelInterfaceSameName.delete","tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.deleteWithResponse":"TspTest.ArmResourceProvider.ModelInterfaceSameName.delete","tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.deleteWithResponseAsync":"TspTest.ArmResourceProvider.ModelInterfaceSameName.delete","tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.getByResourceGroup":"TspTest.ArmResourceProvider.ModelInterfaceSameName.get","tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.getByResourceGroupAsync":"TspTest.ArmResourceProvider.ModelInterfaceSameName.get","tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.getByResourceGroupWithResponse":"TspTest.ArmResourceProvider.ModelInterfaceSameName.get","tsptest.armresourceprovider.fluent.ModelInterfaceSameNamesClient.getByResourceGroupWithResponseAsync":"TspTest.ArmResourceProvider.ModelInterfaceSameName.get","tsptest.armresourceprovider.fluent.OperationsClient":"TspTest.ArmResourceProvider.Operations","tsptest.armresourceprovider.fluent.OperationsClient.list":"Azure.ResourceManager.Operations.list","tsptest.armresourceprovider.fluent.OperationsClient.listAsync":"Azure.ResourceManager.Operations.list","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.action":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface.action","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.actionAsync":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface.action","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.actionWithResponseAsync":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface.action","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.beginAction":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface.action","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.beginActionAsync":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface.action","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.beginCreateOrUpdate":"Azure.ResourceManager.TopLevelArmResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.beginCreateOrUpdateAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.beginDelete":"Azure.ResourceManager.TopLevelArmResourceInterface.delete","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.beginDeleteAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.delete","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.createOrUpdate":"Azure.ResourceManager.TopLevelArmResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.createOrUpdateAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.createOrUpdateWithResponseAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.createOrUpdate","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.delete":"Azure.ResourceManager.TopLevelArmResourceInterface.delete","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.deleteAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.delete","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.deleteWithResponseAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.delete","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.getByResourceGroup":"Azure.ResourceManager.TopLevelArmResourceInterface.get","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.getByResourceGroupAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.get","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.getByResourceGroupWithResponse":"Azure.ResourceManager.TopLevelArmResourceInterface.get","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.getByResourceGroupWithResponseAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.get","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.list":"Azure.ResourceManager.TopLevelArmResourceInterface.listBySubscription","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.listAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.listBySubscription","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.listByResourceGroup":"Azure.ResourceManager.TopLevelArmResourceInterface.listByResourceGroup","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.listByResourceGroupAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.listByResourceGroup","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.publishXml":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface.publishXml","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.publishXmlAsync":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface.publishXml","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.publishXmlWithResponse":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface.publishXml","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.publishXmlWithResponseAsync":"TspTest.ArmResourceProvider.TopLevelArmResourceInterface.publishXml","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.update":"Azure.ResourceManager.TopLevelArmResourceInterface.update","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.updateAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.update","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.updateWithResponse":"Azure.ResourceManager.TopLevelArmResourceInterface.update","tsptest.armresourceprovider.fluent.TopLevelArmResourceInterfacesClient.updateWithResponseAsync":"Azure.ResourceManager.TopLevelArmResourceInterface.update","tsptest.armresourceprovider.fluent.models.ChildExtensionResourceInner":"TspTest.ArmResourceProvider.ChildExtensionResource","tsptest.armresourceprovider.fluent.models.ChildResourceInner":"TspTest.ArmResourceProvider.ChildResource","tsptest.armresourceprovider.fluent.models.ChildResourceProperties":"TspTest.ArmResourceProvider.ChildResourceProperties","tsptest.armresourceprovider.fluent.models.CustomTemplateResourceInner":"TspTest.ArmResourceProvider.CustomTemplateResource","tsptest.armresourceprovider.fluent.models.CustomTemplateResourceProperties":"TspTest.ArmResourceProvider.CustomTemplateResourceProperties","tsptest.armresourceprovider.fluent.models.ManagedMaintenanceWindowStatusContentProperties":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatusContentProperties","tsptest.armresourceprovider.fluent.models.ManagedMaintenanceWindowStatusInner":"TspTest.ArmResourceProvider.ManagedMaintenanceWindowStatusContent","tsptest.armresourceprovider.fluent.models.ModelInterfaceDifferentNameProperties":"TspTest.ArmResourceProvider.ModelInterfaceDifferentNameProperties","tsptest.armresourceprovider.fluent.models.ModelInterfaceSameNameInner":"TspTest.ArmResourceProvider.ModelInterfaceDifferentName","tsptest.armresourceprovider.fluent.models.OperationInner":"Azure.ResourceManager.CommonTypes.Operation","tsptest.armresourceprovider.fluent.models.ResourceLroNoBodyProperties":"TspTest.ArmResourceProvider.ResourceLroNoBodyProperties","tsptest.armresourceprovider.fluent.models.ResultInner":"TspTest.ArmResourceProvider.Result","tsptest.armresourceprovider.fluent.models.TopLevelArmResourceInner":"TspTest.ArmResourceProvider.TopLevelArmResource","tsptest.armresourceprovider.fluent.models.TopLevelArmResourceProperties":"TspTest.ArmResourceProvider.TopLevelArmResourceProperties","tsptest.armresourceprovider.fluent.models.TopLevelArmResourceUpdateProperties":"Azure.ResourceManager.Foundations.ResourceUpdateModelProperties","tsptest.armresourceprovider.implementation.ArmClientBuilder":"TspTest.ArmResourceProvider","tsptest.armresourceprovider.implementation.models.ChildExtensionResourceListResult":"Azure.ResourceManager.ResourceListResult","tsptest.armresourceprovider.implementation.models.ChildResourceListResult":"TspTest.ArmResourceProvider.ChildResourceListResult","tsptest.armresourceprovider.implementation.models.OperationListResult":"Azure.ResourceManager.CommonTypes.OperationListResult","tsptest.armresourceprovider.implementation.models.ResourceListResult":"Azure.ResourceManager.ResourceListResult","tsptest.armresourceprovider.models.ActionFinalResult":"TspTest.ArmResourceProvider.ActionFinalResult","tsptest.armresourceprovider.models.ActionType":"Azure.ResourceManager.CommonTypes.ActionType","tsptest.armresourceprovider.models.AnonymousEmptyModel":"TspTest.ArmResourceProvider.CustomTemplateResourceProperties.anonymousEmptyModel.anonymous","tsptest.armresourceprovider.models.ChildExtensionResourceProperties":"TspTest.ArmResourceProvider.ChildExtensionResourceProperties","tsptest.armresourceprovider.models.ChildExtensionResourceUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","tsptest.armresourceprovider.models.ChildResourceUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","tsptest.armresourceprovider.models.CustomTemplateResourcePatch":"TspTest.ArmResourceProvider.CustomTemplateResourcePatch","tsptest.armresourceprovider.models.Dog":"TspTest.ArmResourceProvider.Dog","tsptest.armresourceprovider.models.DogKind":"TspTest.ArmResourceProvider.DogKind","tsptest.armresourceprovider.models.EmptyModel":"TspTest.ArmResourceProvider.EmptyModel","tsptest.armresourceprovider.models.Golden":"TspTest.ArmResourceProvider.Golden","tsptest.armresourceprovider.models.ManagedServiceIdentity":"Azure.ResourceManager.CommonTypes.ManagedServiceIdentity","tsptest.armresourceprovider.models.ManagedServiceIdentityType":"Azure.ResourceManager.CommonTypes.ManagedServiceIdentityType","tsptest.armresourceprovider.models.NginxConfigurationRequest":"TspTest.ArmResourceProvider.NginxConfigurationRequest","tsptest.armresourceprovider.models.NginxConfigurationResponse":"TspTest.ArmResourceProvider.NginxConfigurationResponse","tsptest.armresourceprovider.models.NginxConfigurationResponseProperties":"TspTest.ArmResourceProvider.NginxConfigurationResponseProperties","tsptest.armresourceprovider.models.OperationDisplay":"Azure.ResourceManager.CommonTypes.OperationDisplay","tsptest.armresourceprovider.models.Origin":"Azure.ResourceManager.CommonTypes.Origin","tsptest.armresourceprovider.models.PriorityModel":"TspTest.ArmResourceProvider.PriorityModel","tsptest.armresourceprovider.models.ProvisioningState":"TspTest.ArmResourceProvider.ProvisioningState","tsptest.armresourceprovider.models.ResourceLroNoBody":"TspTest.ArmResourceProvider.ResourceLroNoBody","tsptest.armresourceprovider.models.TopLevelArmResourceUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","tsptest.armresourceprovider.models.UserAssignedIdentity":"Azure.ResourceManager.CommonTypes.UserAssignedIdentity"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/armresourceprovider/ArmResourceProviderManager.java","src/main/java/tsptest/armresourceprovider/fluent/ArmClient.java","src/main/java/tsptest/armresourceprovider/fluent/ChildExtensionResourceInterfacesClient.java","src/main/java/tsptest/armresourceprovider/fluent/ChildResourcesInterfacesClient.java","src/main/java/tsptest/armresourceprovider/fluent/CustomTemplateResourceInterfacesClient.java","src/main/java/tsptest/armresourceprovider/fluent/ImmutableResourceModelsClient.java","src/main/java/tsptest/armresourceprovider/fluent/LroNoBodiesClient.java","src/main/java/tsptest/armresourceprovider/fluent/ManagedMaintenanceWindowStatusOperationsClient.java","src/main/java/tsptest/armresourceprovider/fluent/ModelInterfaceSameNamesClient.java","src/main/java/tsptest/armresourceprovider/fluent/OperationsClient.java","src/main/java/tsptest/armresourceprovider/fluent/TopLevelArmResourceInterfacesClient.java","src/main/java/tsptest/armresourceprovider/fluent/models/ChildExtensionResourceInner.java","src/main/java/tsptest/armresourceprovider/fluent/models/ChildResourceInner.java","src/main/java/tsptest/armresourceprovider/fluent/models/ChildResourceProperties.java","src/main/java/tsptest/armresourceprovider/fluent/models/CustomTemplateResourceInner.java","src/main/java/tsptest/armresourceprovider/fluent/models/CustomTemplateResourceProperties.java","src/main/java/tsptest/armresourceprovider/fluent/models/ManagedMaintenanceWindowStatusContentProperties.java","src/main/java/tsptest/armresourceprovider/fluent/models/ManagedMaintenanceWindowStatusInner.java","src/main/java/tsptest/armresourceprovider/fluent/models/ModelInterfaceDifferentNameProperties.java","src/main/java/tsptest/armresourceprovider/fluent/models/ModelInterfaceSameNameInner.java","src/main/java/tsptest/armresourceprovider/fluent/models/OperationInner.java","src/main/java/tsptest/armresourceprovider/fluent/models/ResourceLroNoBodyProperties.java","src/main/java/tsptest/armresourceprovider/fluent/models/ResultInner.java","src/main/java/tsptest/armresourceprovider/fluent/models/TopLevelArmResourceInner.java","src/main/java/tsptest/armresourceprovider/fluent/models/TopLevelArmResourceProperties.java","src/main/java/tsptest/armresourceprovider/fluent/models/TopLevelArmResourceUpdateProperties.java","src/main/java/tsptest/armresourceprovider/fluent/models/package-info.java","src/main/java/tsptest/armresourceprovider/fluent/package-info.java","src/main/java/tsptest/armresourceprovider/implementation/ArmClientBuilder.java","src/main/java/tsptest/armresourceprovider/implementation/ArmClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ChildExtensionResourceImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ChildExtensionResourceInterfacesClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ChildExtensionResourceInterfacesImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ChildResourceImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ChildResourcesInterfacesClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ChildResourcesInterfacesImpl.java","src/main/java/tsptest/armresourceprovider/implementation/CustomTemplateResourceImpl.java","src/main/java/tsptest/armresourceprovider/implementation/CustomTemplateResourceInterfacesClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/CustomTemplateResourceInterfacesImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ImmutableResourceModelsClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ImmutableResourceModelsImpl.java","src/main/java/tsptest/armresourceprovider/implementation/LroNoBodiesClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/LroNoBodiesImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ManagedMaintenanceWindowStatusImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ManagedMaintenanceWindowStatusOperationsClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ManagedMaintenanceWindowStatusOperationsImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ModelInterfaceSameNameImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ModelInterfaceSameNamesClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ModelInterfaceSameNamesImpl.java","src/main/java/tsptest/armresourceprovider/implementation/OperationImpl.java","src/main/java/tsptest/armresourceprovider/implementation/OperationsClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/OperationsImpl.java","src/main/java/tsptest/armresourceprovider/implementation/ResourceManagerUtils.java","src/main/java/tsptest/armresourceprovider/implementation/ResultImpl.java","src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceImpl.java","src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceInterfacesClientImpl.java","src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceInterfacesImpl.java","src/main/java/tsptest/armresourceprovider/implementation/models/ChildExtensionResourceListResult.java","src/main/java/tsptest/armresourceprovider/implementation/models/ChildResourceListResult.java","src/main/java/tsptest/armresourceprovider/implementation/models/OperationListResult.java","src/main/java/tsptest/armresourceprovider/implementation/models/ResourceListResult.java","src/main/java/tsptest/armresourceprovider/implementation/package-info.java","src/main/java/tsptest/armresourceprovider/models/ActionFinalResult.java","src/main/java/tsptest/armresourceprovider/models/ActionType.java","src/main/java/tsptest/armresourceprovider/models/AnonymousEmptyModel.java","src/main/java/tsptest/armresourceprovider/models/ChildExtensionResource.java","src/main/java/tsptest/armresourceprovider/models/ChildExtensionResourceInterfaces.java","src/main/java/tsptest/armresourceprovider/models/ChildExtensionResourceProperties.java","src/main/java/tsptest/armresourceprovider/models/ChildExtensionResourceUpdate.java","src/main/java/tsptest/armresourceprovider/models/ChildResource.java","src/main/java/tsptest/armresourceprovider/models/ChildResourceUpdate.java","src/main/java/tsptest/armresourceprovider/models/ChildResourcesInterfaces.java","src/main/java/tsptest/armresourceprovider/models/CustomTemplateResource.java","src/main/java/tsptest/armresourceprovider/models/CustomTemplateResourceInterfaces.java","src/main/java/tsptest/armresourceprovider/models/CustomTemplateResourcePatch.java","src/main/java/tsptest/armresourceprovider/models/Dog.java","src/main/java/tsptest/armresourceprovider/models/DogKind.java","src/main/java/tsptest/armresourceprovider/models/EmptyModel.java","src/main/java/tsptest/armresourceprovider/models/Golden.java","src/main/java/tsptest/armresourceprovider/models/ImmutableResourceModels.java","src/main/java/tsptest/armresourceprovider/models/LroNoBodies.java","src/main/java/tsptest/armresourceprovider/models/ManagedMaintenanceWindowStatus.java","src/main/java/tsptest/armresourceprovider/models/ManagedMaintenanceWindowStatusOperations.java","src/main/java/tsptest/armresourceprovider/models/ManagedServiceIdentity.java","src/main/java/tsptest/armresourceprovider/models/ManagedServiceIdentityType.java","src/main/java/tsptest/armresourceprovider/models/ModelInterfaceSameName.java","src/main/java/tsptest/armresourceprovider/models/ModelInterfaceSameNames.java","src/main/java/tsptest/armresourceprovider/models/NginxConfigurationRequest.java","src/main/java/tsptest/armresourceprovider/models/NginxConfigurationResponse.java","src/main/java/tsptest/armresourceprovider/models/NginxConfigurationResponseProperties.java","src/main/java/tsptest/armresourceprovider/models/Operation.java","src/main/java/tsptest/armresourceprovider/models/OperationDisplay.java","src/main/java/tsptest/armresourceprovider/models/Operations.java","src/main/java/tsptest/armresourceprovider/models/Origin.java","src/main/java/tsptest/armresourceprovider/models/PriorityModel.java","src/main/java/tsptest/armresourceprovider/models/ProvisioningState.java","src/main/java/tsptest/armresourceprovider/models/ResourceLroNoBody.java","src/main/java/tsptest/armresourceprovider/models/Result.java","src/main/java/tsptest/armresourceprovider/models/TopLevelArmResource.java","src/main/java/tsptest/armresourceprovider/models/TopLevelArmResourceInterfaces.java","src/main/java/tsptest/armresourceprovider/models/TopLevelArmResourceUpdate.java","src/main/java/tsptest/armresourceprovider/models/UserAssignedIdentity.java","src/main/java/tsptest/armresourceprovider/models/package-info.java","src/main/java/tsptest/armresourceprovider/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armstreamstyleserialization-generated_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armstreamstyleserialization-generated_apiview_properties.json deleted file mode 100644 index aeb257e3cca..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armstreamstyleserialization-generated_apiview_properties.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.armstreamstyleserialization.fluent.ArmResourceProviderManagementClient": "TspTest.ArmStreamStyleSerialization", - "tsptest.armstreamstyleserialization.fluent.FishesClient": "TspTest.ArmStreamStyleSerialization.Fishes", - "tsptest.armstreamstyleserialization.fluent.FishesClient.getModel": "TspTest.ArmStreamStyleSerialization.Fishes.getModel", - "tsptest.armstreamstyleserialization.fluent.FishesClient.getModelWithResponse": "TspTest.ArmStreamStyleSerialization.Fishes.getModel", - "tsptest.armstreamstyleserialization.fluent.FishesClient.getOutputOnlyModel": "TspTest.ArmStreamStyleSerialization.Fishes.getOutputOnlyModel", - "tsptest.armstreamstyleserialization.fluent.FishesClient.getOutputOnlyModelWithResponse": "TspTest.ArmStreamStyleSerialization.Fishes.getOutputOnlyModel", - "tsptest.armstreamstyleserialization.fluent.FishesClient.putModel": "TspTest.ArmStreamStyleSerialization.Fishes.putModel", - "tsptest.armstreamstyleserialization.fluent.FishesClient.putModelWithResponse": "TspTest.ArmStreamStyleSerialization.Fishes.putModel", - "tsptest.armstreamstyleserialization.fluent.FunctionsClient": "TspTest.ArmStreamStyleSerialization.Functions", - "tsptest.armstreamstyleserialization.fluent.FunctionsClient.createFunction": "TspTest.ArmStreamStyleSerialization.Functions.createFunction", - "tsptest.armstreamstyleserialization.fluent.FunctionsClient.createFunctionWithResponse": "TspTest.ArmStreamStyleSerialization.Functions.createFunction", - "tsptest.armstreamstyleserialization.fluent.ItemsClient": "TspTest.ArmStreamStyleSerialization.Items", - "tsptest.armstreamstyleserialization.fluent.ItemsClient.list": "TspTest.ArmStreamStyleSerialization.Items.list", - "tsptest.armstreamstyleserialization.fluent.PrioritiesClient": "TspTest.ArmStreamStyleSerialization.Priorities", - "tsptest.armstreamstyleserialization.fluent.PrioritiesClient.setPriority": "TspTest.ArmStreamStyleSerialization.Priorities.setPriority", - "tsptest.armstreamstyleserialization.fluent.PrioritiesClient.setPriorityWithResponse": "TspTest.ArmStreamStyleSerialization.Priorities.setPriority", - "tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient": "TspTest.ArmStreamStyleSerialization.TopLevelArmResources", - "tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient.beginUpdate": "TspTest.ArmStreamStyleSerialization.TopLevelArmResources.update", - "tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient.update": "TspTest.ArmStreamStyleSerialization.TopLevelArmResources.update", - "tsptest.armstreamstyleserialization.fluent.models.AnotherFishProperties": "TspTest.ArmStreamStyleSerialization.AnotherFishProperties", - "tsptest.armstreamstyleserialization.fluent.models.EyeProperties": "TspTest.ArmStreamStyleSerialization.EyeProperties", - "tsptest.armstreamstyleserialization.fluent.models.FishInner": "TspTest.ArmStreamStyleSerialization.Fish", - "tsptest.armstreamstyleserialization.fluent.models.FishProperties": "TspTest.ArmStreamStyleSerialization.FishProperties", - "tsptest.armstreamstyleserialization.fluent.models.FunctionConfiguration": "TspTest.ArmStreamStyleSerialization.FunctionConfiguration", - "tsptest.armstreamstyleserialization.fluent.models.FunctionInner": "TspTest.ArmStreamStyleSerialization.Function", - "tsptest.armstreamstyleserialization.fluent.models.OutputOnlyModelInner": "TspTest.ArmStreamStyleSerialization.OutputOnlyModel", - "tsptest.armstreamstyleserialization.fluent.models.OutputOnlyModelProperties": "TspTest.ArmStreamStyleSerialization.OutputOnlyModelProperties", - "tsptest.armstreamstyleserialization.fluent.models.ResultData": "TspTest.ArmStreamStyleSerialization.ResultData", - "tsptest.armstreamstyleserialization.fluent.models.SalmonInner": "TspTest.ArmStreamStyleSerialization.Salmon", - "tsptest.armstreamstyleserialization.fluent.models.TailProperties": "TspTest.ArmStreamStyleSerialization.TailProperties", - "tsptest.armstreamstyleserialization.fluent.models.TopLevelArmResourceInner": "TspTest.ArmStreamStyleSerialization.TopLevelArmResource", - "tsptest.armstreamstyleserialization.implementation.ArmResourceProviderManagementClientBuilder": "TspTest.ArmStreamStyleSerialization", - "tsptest.armstreamstyleserialization.implementation.models.ListResult": "TspTest.ArmStreamStyleSerialization.ListResult", - "tsptest.armstreamstyleserialization.models.AggregateFunctionProperties": "TspTest.ArmStreamStyleSerialization.AggregateFunctionProperties", - "tsptest.armstreamstyleserialization.models.Builtin": "TspTest.ArmStreamStyleSerialization.Builtin", - "tsptest.armstreamstyleserialization.models.Dog": "TspTest.ArmStreamStyleSerialization.Dog", - "tsptest.armstreamstyleserialization.models.DogKind": "TspTest.ArmStreamStyleSerialization.DogKind", - "tsptest.armstreamstyleserialization.models.Encoded": "TspTest.ArmStreamStyleSerialization.Encoded", - "tsptest.armstreamstyleserialization.models.Error": "TspTest.ArmStreamStyleSerialization.ErrorResponse", - "tsptest.armstreamstyleserialization.models.ErrorMin": "TspTest.ArmStreamStyleSerialization.ErrorResponseMin", - "tsptest.armstreamstyleserialization.models.FunctionProperties": "TspTest.ArmStreamStyleSerialization.FunctionProperties", - "tsptest.armstreamstyleserialization.models.FunctionsCreateFunctionHeaders": null, - "tsptest.armstreamstyleserialization.models.GoblinShark": "TspTest.ArmStreamStyleSerialization.GoblinShark", - "tsptest.armstreamstyleserialization.models.Golden": "TspTest.ArmStreamStyleSerialization.Golden", - "tsptest.armstreamstyleserialization.models.OutputOnlyModelChild": "TspTest.ArmStreamStyleSerialization.OutputOnlyModelChild", - "tsptest.armstreamstyleserialization.models.Priority": "TspTest.ArmStreamStyleSerialization.Priority", - "tsptest.armstreamstyleserialization.models.Result": "TspTest.ArmStreamStyleSerialization.Result", - "tsptest.armstreamstyleserialization.models.SawShark": "TspTest.ArmStreamStyleSerialization.SawShark", - "tsptest.armstreamstyleserialization.models.Shark": "TspTest.ArmStreamStyleSerialization.Shark", - "tsptest.armstreamstyleserialization.models.TopLevelArmResourceProperties": "TspTest.ArmStreamStyleSerialization.TopLevelArmResourceProperties", - "tsptest.armstreamstyleserialization.models.TopLevelArmResourceTagsUpdate": "Azure.ResourceManager.Foundations.TagsUpdateModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armstreamstyleserialization-generated_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armstreamstyleserialization-generated_metadata.json index e039ab6fcb4..90d204298a3 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armstreamstyleserialization-generated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armstreamstyleserialization-generated_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2023-12-01-preview","crossLanguageDefinitions":{"tsptest.armstreamstyleserialization.fluent.ArmResourceProviderManagementClient":"TspTest.ArmStreamStyleSerialization","tsptest.armstreamstyleserialization.fluent.FishesClient":"TspTest.ArmStreamStyleSerialization.Fishes","tsptest.armstreamstyleserialization.fluent.FishesClient.getModel":"TspTest.ArmStreamStyleSerialization.Fishes.getModel","tsptest.armstreamstyleserialization.fluent.FishesClient.getModelWithResponse":"TspTest.ArmStreamStyleSerialization.Fishes.getModel","tsptest.armstreamstyleserialization.fluent.FishesClient.getOutputOnlyModel":"TspTest.ArmStreamStyleSerialization.Fishes.getOutputOnlyModel","tsptest.armstreamstyleserialization.fluent.FishesClient.getOutputOnlyModelWithResponse":"TspTest.ArmStreamStyleSerialization.Fishes.getOutputOnlyModel","tsptest.armstreamstyleserialization.fluent.FishesClient.putModel":"TspTest.ArmStreamStyleSerialization.Fishes.putModel","tsptest.armstreamstyleserialization.fluent.FishesClient.putModelWithResponse":"TspTest.ArmStreamStyleSerialization.Fishes.putModel","tsptest.armstreamstyleserialization.fluent.FunctionsClient":"TspTest.ArmStreamStyleSerialization.Functions","tsptest.armstreamstyleserialization.fluent.FunctionsClient.createFunction":"TspTest.ArmStreamStyleSerialization.Functions.createFunction","tsptest.armstreamstyleserialization.fluent.FunctionsClient.createFunctionWithResponse":"TspTest.ArmStreamStyleSerialization.Functions.createFunction","tsptest.armstreamstyleserialization.fluent.ItemsClient":"TspTest.ArmStreamStyleSerialization.Items","tsptest.armstreamstyleserialization.fluent.ItemsClient.list":"TspTest.ArmStreamStyleSerialization.Items.list","tsptest.armstreamstyleserialization.fluent.PrioritiesClient":"TspTest.ArmStreamStyleSerialization.Priorities","tsptest.armstreamstyleserialization.fluent.PrioritiesClient.setPriority":"TspTest.ArmStreamStyleSerialization.Priorities.setPriority","tsptest.armstreamstyleserialization.fluent.PrioritiesClient.setPriorityWithResponse":"TspTest.ArmStreamStyleSerialization.Priorities.setPriority","tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient":"TspTest.ArmStreamStyleSerialization.TopLevelArmResources","tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient.beginUpdate":"TspTest.ArmStreamStyleSerialization.TopLevelArmResources.update","tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient.update":"TspTest.ArmStreamStyleSerialization.TopLevelArmResources.update","tsptest.armstreamstyleserialization.fluent.models.AnotherFishProperties":"TspTest.ArmStreamStyleSerialization.AnotherFishProperties","tsptest.armstreamstyleserialization.fluent.models.EyeProperties":"TspTest.ArmStreamStyleSerialization.EyeProperties","tsptest.armstreamstyleserialization.fluent.models.FishInner":"TspTest.ArmStreamStyleSerialization.Fish","tsptest.armstreamstyleserialization.fluent.models.FishProperties":"TspTest.ArmStreamStyleSerialization.FishProperties","tsptest.armstreamstyleserialization.fluent.models.FunctionConfiguration":"TspTest.ArmStreamStyleSerialization.FunctionConfiguration","tsptest.armstreamstyleserialization.fluent.models.FunctionInner":"TspTest.ArmStreamStyleSerialization.Function","tsptest.armstreamstyleserialization.fluent.models.OutputOnlyModelInner":"TspTest.ArmStreamStyleSerialization.OutputOnlyModel","tsptest.armstreamstyleserialization.fluent.models.OutputOnlyModelProperties":"TspTest.ArmStreamStyleSerialization.OutputOnlyModelProperties","tsptest.armstreamstyleserialization.fluent.models.ResultData":"TspTest.ArmStreamStyleSerialization.ResultData","tsptest.armstreamstyleserialization.fluent.models.SalmonInner":"TspTest.ArmStreamStyleSerialization.Salmon","tsptest.armstreamstyleserialization.fluent.models.TailProperties":"TspTest.ArmStreamStyleSerialization.TailProperties","tsptest.armstreamstyleserialization.fluent.models.TopLevelArmResourceInner":"TspTest.ArmStreamStyleSerialization.TopLevelArmResource","tsptest.armstreamstyleserialization.implementation.ArmResourceProviderManagementClientBuilder":"TspTest.ArmStreamStyleSerialization","tsptest.armstreamstyleserialization.implementation.models.ListResult":"TspTest.ArmStreamStyleSerialization.ListResult","tsptest.armstreamstyleserialization.models.AggregateFunctionProperties":"TspTest.ArmStreamStyleSerialization.AggregateFunctionProperties","tsptest.armstreamstyleserialization.models.Builtin":"TspTest.ArmStreamStyleSerialization.Builtin","tsptest.armstreamstyleserialization.models.Dog":"TspTest.ArmStreamStyleSerialization.Dog","tsptest.armstreamstyleserialization.models.DogKind":"TspTest.ArmStreamStyleSerialization.DogKind","tsptest.armstreamstyleserialization.models.Encoded":"TspTest.ArmStreamStyleSerialization.Encoded","tsptest.armstreamstyleserialization.models.Error":"TspTest.ArmStreamStyleSerialization.ErrorResponse","tsptest.armstreamstyleserialization.models.ErrorMin":"TspTest.ArmStreamStyleSerialization.ErrorResponseMin","tsptest.armstreamstyleserialization.models.FunctionProperties":"TspTest.ArmStreamStyleSerialization.FunctionProperties","tsptest.armstreamstyleserialization.models.FunctionsCreateFunctionHeaders":null,"tsptest.armstreamstyleserialization.models.GoblinShark":"TspTest.ArmStreamStyleSerialization.GoblinShark","tsptest.armstreamstyleserialization.models.Golden":"TspTest.ArmStreamStyleSerialization.Golden","tsptest.armstreamstyleserialization.models.OutputOnlyModelChild":"TspTest.ArmStreamStyleSerialization.OutputOnlyModelChild","tsptest.armstreamstyleserialization.models.Priority":"TspTest.ArmStreamStyleSerialization.Priority","tsptest.armstreamstyleserialization.models.Result":"TspTest.ArmStreamStyleSerialization.Result","tsptest.armstreamstyleserialization.models.SawShark":"TspTest.ArmStreamStyleSerialization.SawShark","tsptest.armstreamstyleserialization.models.Shark":"TspTest.ArmStreamStyleSerialization.Shark","tsptest.armstreamstyleserialization.models.TopLevelArmResourceProperties":"TspTest.ArmStreamStyleSerialization.TopLevelArmResourceProperties","tsptest.armstreamstyleserialization.models.TopLevelArmResourceTagsUpdate":"Azure.ResourceManager.Foundations.TagsUpdateModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/armstreamstyleserialization/ArmResourceProviderManager.java","src/main/java/tsptest/armstreamstyleserialization/fluent/ArmResourceProviderManagementClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/FishesClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/FunctionsClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/PrioritiesClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/TopLevelArmResourcesClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/AnotherFishProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/EyeProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FishInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FishProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FunctionConfiguration.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FunctionInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/OutputOnlyModelInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/OutputOnlyModelProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/ResultData.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/SalmonInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/TailProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/TopLevelArmResourceInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/package-info.java","src/main/java/tsptest/armstreamstyleserialization/fluent/package-info.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ArmResourceProviderManagementClientBuilder.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ArmResourceProviderManagementClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FishImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FishesClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FishesImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionsClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionsImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/OutputOnlyModelImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ResourceManagerUtils.java","src/main/java/tsptest/armstreamstyleserialization/implementation/SalmonImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/TopLevelArmResourceImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/TopLevelArmResourcesClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/TopLevelArmResourcesImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java","src/main/java/tsptest/armstreamstyleserialization/implementation/package-info.java","src/main/java/tsptest/armstreamstyleserialization/models/AggregateFunctionProperties.java","src/main/java/tsptest/armstreamstyleserialization/models/Builtin.java","src/main/java/tsptest/armstreamstyleserialization/models/Dog.java","src/main/java/tsptest/armstreamstyleserialization/models/DogKind.java","src/main/java/tsptest/armstreamstyleserialization/models/Encoded.java","src/main/java/tsptest/armstreamstyleserialization/models/Error.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorException.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMin.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMinException.java","src/main/java/tsptest/armstreamstyleserialization/models/Fish.java","src/main/java/tsptest/armstreamstyleserialization/models/Fishes.java","src/main/java/tsptest/armstreamstyleserialization/models/Function.java","src/main/java/tsptest/armstreamstyleserialization/models/FunctionProperties.java","src/main/java/tsptest/armstreamstyleserialization/models/Functions.java","src/main/java/tsptest/armstreamstyleserialization/models/FunctionsCreateFunctionHeaders.java","src/main/java/tsptest/armstreamstyleserialization/models/FunctionsCreateFunctionResponse.java","src/main/java/tsptest/armstreamstyleserialization/models/GoblinShark.java","src/main/java/tsptest/armstreamstyleserialization/models/Golden.java","src/main/java/tsptest/armstreamstyleserialization/models/Items.java","src/main/java/tsptest/armstreamstyleserialization/models/OutputOnlyModel.java","src/main/java/tsptest/armstreamstyleserialization/models/OutputOnlyModelChild.java","src/main/java/tsptest/armstreamstyleserialization/models/Priorities.java","src/main/java/tsptest/armstreamstyleserialization/models/Priority.java","src/main/java/tsptest/armstreamstyleserialization/models/Result.java","src/main/java/tsptest/armstreamstyleserialization/models/Salmon.java","src/main/java/tsptest/armstreamstyleserialization/models/SawShark.java","src/main/java/tsptest/armstreamstyleserialization/models/Shark.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResource.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResourceProperties.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResourceTagsUpdate.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResources.java","src/main/java/tsptest/armstreamstyleserialization/models/package-info.java","src/main/java/tsptest/armstreamstyleserialization/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"TspTest.ArmStreamStyleSerialization":"2023-12-01-preview"},"crossLanguageDefinitions":{"tsptest.armstreamstyleserialization.fluent.ArmResourceProviderManagementClient":"TspTest.ArmStreamStyleSerialization","tsptest.armstreamstyleserialization.fluent.FishesClient":"TspTest.ArmStreamStyleSerialization.Fishes","tsptest.armstreamstyleserialization.fluent.FishesClient.getModel":"TspTest.ArmStreamStyleSerialization.Fishes.getModel","tsptest.armstreamstyleserialization.fluent.FishesClient.getModelWithResponse":"TspTest.ArmStreamStyleSerialization.Fishes.getModel","tsptest.armstreamstyleserialization.fluent.FishesClient.getOutputOnlyModel":"TspTest.ArmStreamStyleSerialization.Fishes.getOutputOnlyModel","tsptest.armstreamstyleserialization.fluent.FishesClient.getOutputOnlyModelWithResponse":"TspTest.ArmStreamStyleSerialization.Fishes.getOutputOnlyModel","tsptest.armstreamstyleserialization.fluent.FishesClient.putModel":"TspTest.ArmStreamStyleSerialization.Fishes.putModel","tsptest.armstreamstyleserialization.fluent.FishesClient.putModelWithResponse":"TspTest.ArmStreamStyleSerialization.Fishes.putModel","tsptest.armstreamstyleserialization.fluent.FunctionsClient":"TspTest.ArmStreamStyleSerialization.Functions","tsptest.armstreamstyleserialization.fluent.FunctionsClient.createFunction":"TspTest.ArmStreamStyleSerialization.Functions.createFunction","tsptest.armstreamstyleserialization.fluent.FunctionsClient.createFunctionWithResponse":"TspTest.ArmStreamStyleSerialization.Functions.createFunction","tsptest.armstreamstyleserialization.fluent.ItemsClient":"TspTest.ArmStreamStyleSerialization.Items","tsptest.armstreamstyleserialization.fluent.ItemsClient.list":"TspTest.ArmStreamStyleSerialization.Items.list","tsptest.armstreamstyleserialization.fluent.ItemsClient.list2":"TspTest.ArmStreamStyleSerialization.Items.list2","tsptest.armstreamstyleserialization.fluent.ItemsClient.list3":"TspTest.ArmStreamStyleSerialization.Items.list3","tsptest.armstreamstyleserialization.fluent.ItemsClient.post":"TspTest.ArmStreamStyleSerialization.Items.post","tsptest.armstreamstyleserialization.fluent.ItemsClient.postWithResponse":"TspTest.ArmStreamStyleSerialization.Items.post","tsptest.armstreamstyleserialization.fluent.ItemsClient.summary":"TspTest.ArmStreamStyleSerialization.Items.summary","tsptest.armstreamstyleserialization.fluent.ItemsClient.summary2":"TspTest.ArmStreamStyleSerialization.Items.summary2","tsptest.armstreamstyleserialization.fluent.ItemsClient.summary2WithResponse":"TspTest.ArmStreamStyleSerialization.Items.summary2","tsptest.armstreamstyleserialization.fluent.PrioritiesClient":"TspTest.ArmStreamStyleSerialization.Priorities","tsptest.armstreamstyleserialization.fluent.PrioritiesClient.setPriority":"TspTest.ArmStreamStyleSerialization.Priorities.setPriority","tsptest.armstreamstyleserialization.fluent.PrioritiesClient.setPriorityWithResponse":"TspTest.ArmStreamStyleSerialization.Priorities.setPriority","tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient":"TspTest.ArmStreamStyleSerialization.TopLevelArmResources","tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient.beginUpdate":"TspTest.ArmStreamStyleSerialization.TopLevelArmResources.update","tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient.update":"TspTest.ArmStreamStyleSerialization.TopLevelArmResources.update","tsptest.armstreamstyleserialization.fluent.models.AnotherFishProperties":"TspTest.ArmStreamStyleSerialization.AnotherFishProperties","tsptest.armstreamstyleserialization.fluent.models.EyeProperties":"TspTest.ArmStreamStyleSerialization.EyeProperties","tsptest.armstreamstyleserialization.fluent.models.FishInner":"TspTest.ArmStreamStyleSerialization.Fish","tsptest.armstreamstyleserialization.fluent.models.FishProperties":"TspTest.ArmStreamStyleSerialization.FishProperties","tsptest.armstreamstyleserialization.fluent.models.FunctionConfiguration":"TspTest.ArmStreamStyleSerialization.FunctionConfiguration","tsptest.armstreamstyleserialization.fluent.models.FunctionInner":"TspTest.ArmStreamStyleSerialization.Function","tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner":"TspTest.ArmStreamStyleSerialization.ListResultSummary2","tsptest.armstreamstyleserialization.fluent.models.OutputOnlyModelInner":"TspTest.ArmStreamStyleSerialization.OutputOnlyModel","tsptest.armstreamstyleserialization.fluent.models.OutputOnlyModelProperties":"TspTest.ArmStreamStyleSerialization.OutputOnlyModelProperties","tsptest.armstreamstyleserialization.fluent.models.ResultData":"TspTest.ArmStreamStyleSerialization.ResultData","tsptest.armstreamstyleserialization.fluent.models.SalmonInner":"TspTest.ArmStreamStyleSerialization.Salmon","tsptest.armstreamstyleserialization.fluent.models.TailProperties":"TspTest.ArmStreamStyleSerialization.TailProperties","tsptest.armstreamstyleserialization.fluent.models.TopLevelArmResourceInner":"TspTest.ArmStreamStyleSerialization.TopLevelArmResource","tsptest.armstreamstyleserialization.implementation.ArmResourceProviderManagementClientBuilder":"TspTest.ArmStreamStyleSerialization","tsptest.armstreamstyleserialization.implementation.models.ListResult":"TspTest.ArmStreamStyleSerialization.ListResult","tsptest.armstreamstyleserialization.implementation.models.ListResultSummary":"TspTest.ArmStreamStyleSerialization.ListResultSummary","tsptest.armstreamstyleserialization.models.AggregateFunctionProperties":"TspTest.ArmStreamStyleSerialization.AggregateFunctionProperties","tsptest.armstreamstyleserialization.models.Builtin":"TspTest.ArmStreamStyleSerialization.Builtin","tsptest.armstreamstyleserialization.models.Dog":"TspTest.ArmStreamStyleSerialization.Dog","tsptest.armstreamstyleserialization.models.DogKind":"TspTest.ArmStreamStyleSerialization.DogKind","tsptest.armstreamstyleserialization.models.Encoded":"TspTest.ArmStreamStyleSerialization.Encoded","tsptest.armstreamstyleserialization.models.ErrorMax":"TspTest.ArmStreamStyleSerialization.ErrorResponseMax","tsptest.armstreamstyleserialization.models.ErrorMin":"TspTest.ArmStreamStyleSerialization.ErrorResponseMin","tsptest.armstreamstyleserialization.models.FunctionProperties":"TspTest.ArmStreamStyleSerialization.FunctionProperties","tsptest.armstreamstyleserialization.models.FunctionsCreateFunctionHeaders":null,"tsptest.armstreamstyleserialization.models.GoblinShark":"TspTest.ArmStreamStyleSerialization.GoblinShark","tsptest.armstreamstyleserialization.models.Golden":"TspTest.ArmStreamStyleSerialization.Golden","tsptest.armstreamstyleserialization.models.ListResult2":"TspTest.ArmStreamStyleSerialization.ListResult2","tsptest.armstreamstyleserialization.models.ListResult3":"TspTest.ArmStreamStyleSerialization.ListResult3","tsptest.armstreamstyleserialization.models.OutputOnlyModelChild":"TspTest.ArmStreamStyleSerialization.OutputOnlyModelChild","tsptest.armstreamstyleserialization.models.Priority":"TspTest.ArmStreamStyleSerialization.Priority","tsptest.armstreamstyleserialization.models.Result":"TspTest.ArmStreamStyleSerialization.Result","tsptest.armstreamstyleserialization.models.SawShark":"TspTest.ArmStreamStyleSerialization.SawShark","tsptest.armstreamstyleserialization.models.Shark":"TspTest.ArmStreamStyleSerialization.Shark","tsptest.armstreamstyleserialization.models.TopLevelArmResourceProperties":"TspTest.ArmStreamStyleSerialization.TopLevelArmResourceProperties","tsptest.armstreamstyleserialization.models.TopLevelArmResourceTagsUpdate":"Azure.ResourceManager.Foundations.TagsUpdateModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/armstreamstyleserialization/ArmResourceProviderManager.java","src/main/java/tsptest/armstreamstyleserialization/fluent/ArmResourceProviderManagementClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/FishesClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/FunctionsClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/PrioritiesClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/TopLevelArmResourcesClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/AnotherFishProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/EyeProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FishInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FishProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FunctionConfiguration.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FunctionInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/OutputOnlyModelInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/OutputOnlyModelProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/ResultData.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/SalmonInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/TailProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/TopLevelArmResourceInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/package-info.java","src/main/java/tsptest/armstreamstyleserialization/fluent/package-info.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ArmResourceProviderManagementClientBuilder.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ArmResourceProviderManagementClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FishImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FishesClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FishesImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionsClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionsImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/OutputOnlyModelImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ResourceManagerUtils.java","src/main/java/tsptest/armstreamstyleserialization/implementation/SalmonImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/TopLevelArmResourceImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/TopLevelArmResourcesClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/TopLevelArmResourcesImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java","src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java","src/main/java/tsptest/armstreamstyleserialization/implementation/package-info.java","src/main/java/tsptest/armstreamstyleserialization/models/AggregateFunctionProperties.java","src/main/java/tsptest/armstreamstyleserialization/models/Builtin.java","src/main/java/tsptest/armstreamstyleserialization/models/Dog.java","src/main/java/tsptest/armstreamstyleserialization/models/DogKind.java","src/main/java/tsptest/armstreamstyleserialization/models/Encoded.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMax.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMaxException.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMin.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMinException.java","src/main/java/tsptest/armstreamstyleserialization/models/Fish.java","src/main/java/tsptest/armstreamstyleserialization/models/Fishes.java","src/main/java/tsptest/armstreamstyleserialization/models/Function.java","src/main/java/tsptest/armstreamstyleserialization/models/FunctionProperties.java","src/main/java/tsptest/armstreamstyleserialization/models/Functions.java","src/main/java/tsptest/armstreamstyleserialization/models/FunctionsCreateFunctionHeaders.java","src/main/java/tsptest/armstreamstyleserialization/models/FunctionsCreateFunctionResponse.java","src/main/java/tsptest/armstreamstyleserialization/models/GoblinShark.java","src/main/java/tsptest/armstreamstyleserialization/models/Golden.java","src/main/java/tsptest/armstreamstyleserialization/models/Items.java","src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java","src/main/java/tsptest/armstreamstyleserialization/models/ListResult3.java","src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java","src/main/java/tsptest/armstreamstyleserialization/models/OutputOnlyModel.java","src/main/java/tsptest/armstreamstyleserialization/models/OutputOnlyModelChild.java","src/main/java/tsptest/armstreamstyleserialization/models/Priorities.java","src/main/java/tsptest/armstreamstyleserialization/models/Priority.java","src/main/java/tsptest/armstreamstyleserialization/models/Result.java","src/main/java/tsptest/armstreamstyleserialization/models/Salmon.java","src/main/java/tsptest/armstreamstyleserialization/models/SawShark.java","src/main/java/tsptest/armstreamstyleserialization/models/Shark.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResource.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResourceProperties.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResourceTagsUpdate.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResources.java","src/main/java/tsptest/armstreamstyleserialization/models/package-info.java","src/main/java/tsptest/armstreamstyleserialization/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armversioned-generated_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armversioned-generated_apiview_properties.json deleted file mode 100644 index 6f845da1398..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armversioned-generated_apiview_properties.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.armversioned.fluent.ArmVersionedClient": "TspTest.ArmVersioned", - "tsptest.armversioned.fluent.TopLevelArmResourcesClient": "TspTest.ArmVersioned.TopLevelArmResources", - "tsptest.armversioned.fluent.TopLevelArmResourcesClient.action": "TspTest.ArmVersioned.TopLevelArmResources.action", - "tsptest.armversioned.fluent.TopLevelArmResourcesClient.actionWithResponse": "TspTest.ArmVersioned.TopLevelArmResources.action", - "tsptest.armversioned.fluent.TopLevelArmResourcesClient.beginCreateOrUpdate": "TspTest.ArmVersioned.TopLevelArmResources.createOrUpdate", - "tsptest.armversioned.fluent.TopLevelArmResourcesClient.createOrUpdate": "TspTest.ArmVersioned.TopLevelArmResources.createOrUpdate", - "tsptest.armversioned.fluent.TopLevelArmResourcesClient.delete": "TspTest.ArmVersioned.TopLevelArmResources.delete", - "tsptest.armversioned.fluent.TopLevelArmResourcesClient.deleteWithResponse": "TspTest.ArmVersioned.TopLevelArmResources.delete", - "tsptest.armversioned.fluent.TopLevelArmResourcesClient.getByResourceGroup": "TspTest.ArmVersioned.TopLevelArmResources.get", - "tsptest.armversioned.fluent.TopLevelArmResourcesClient.getByResourceGroupWithResponse": "TspTest.ArmVersioned.TopLevelArmResources.get", - "tsptest.armversioned.fluent.TopLevelArmResourcesClient.list": "TspTest.ArmVersioned.TopLevelArmResources.listBySubscription", - "tsptest.armversioned.fluent.TopLevelArmResourcesClient.listByResourceGroup": "TspTest.ArmVersioned.TopLevelArmResources.listByResourceGroup", - "tsptest.armversioned.fluent.models.TopLevelArmResourceInner": "TspTest.ArmVersioned.TopLevelArmResource", - "tsptest.armversioned.implementation.ArmVersionedClientBuilder": "TspTest.ArmVersioned", - "tsptest.armversioned.implementation.models.TopLevelArmResourceListResult": "Azure.ResourceManager.ResourceListResult", - "tsptest.armversioned.models.ResourceProvisioningState": "Azure.ResourceManager.ResourceProvisioningState", - "tsptest.armversioned.models.TopLevelArmResourceProperties": "TspTest.ArmVersioned.TopLevelArmResourceProperties" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armversioned-generated_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armversioned-generated_metadata.json index 5eb8d805513..4112fbb5aef 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armversioned-generated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armversioned-generated_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2024-12-01","crossLanguageDefinitions":{"tsptest.armversioned.fluent.ArmVersionedClient":"TspTest.ArmVersioned","tsptest.armversioned.fluent.TopLevelArmResourcesClient":"TspTest.ArmVersioned.TopLevelArmResources","tsptest.armversioned.fluent.TopLevelArmResourcesClient.action":"TspTest.ArmVersioned.TopLevelArmResources.action","tsptest.armversioned.fluent.TopLevelArmResourcesClient.actionWithResponse":"TspTest.ArmVersioned.TopLevelArmResources.action","tsptest.armversioned.fluent.TopLevelArmResourcesClient.beginCreateOrUpdate":"TspTest.ArmVersioned.TopLevelArmResources.createOrUpdate","tsptest.armversioned.fluent.TopLevelArmResourcesClient.createOrUpdate":"TspTest.ArmVersioned.TopLevelArmResources.createOrUpdate","tsptest.armversioned.fluent.TopLevelArmResourcesClient.delete":"TspTest.ArmVersioned.TopLevelArmResources.delete","tsptest.armversioned.fluent.TopLevelArmResourcesClient.deleteWithResponse":"TspTest.ArmVersioned.TopLevelArmResources.delete","tsptest.armversioned.fluent.TopLevelArmResourcesClient.getByResourceGroup":"TspTest.ArmVersioned.TopLevelArmResources.get","tsptest.armversioned.fluent.TopLevelArmResourcesClient.getByResourceGroupWithResponse":"TspTest.ArmVersioned.TopLevelArmResources.get","tsptest.armversioned.fluent.TopLevelArmResourcesClient.list":"TspTest.ArmVersioned.TopLevelArmResources.listBySubscription","tsptest.armversioned.fluent.TopLevelArmResourcesClient.listByResourceGroup":"TspTest.ArmVersioned.TopLevelArmResources.listByResourceGroup","tsptest.armversioned.fluent.models.TopLevelArmResourceInner":"TspTest.ArmVersioned.TopLevelArmResource","tsptest.armversioned.implementation.ArmVersionedClientBuilder":"TspTest.ArmVersioned","tsptest.armversioned.implementation.models.TopLevelArmResourceListResult":"Azure.ResourceManager.ResourceListResult","tsptest.armversioned.models.ResourceProvisioningState":"Azure.ResourceManager.ResourceProvisioningState","tsptest.armversioned.models.TopLevelArmResourceProperties":"TspTest.ArmVersioned.TopLevelArmResourceProperties"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/armversioned/ArmVersionedManager.java","src/main/java/tsptest/armversioned/fluent/ArmVersionedClient.java","src/main/java/tsptest/armversioned/fluent/TopLevelArmResourcesClient.java","src/main/java/tsptest/armversioned/fluent/models/TopLevelArmResourceInner.java","src/main/java/tsptest/armversioned/fluent/models/package-info.java","src/main/java/tsptest/armversioned/fluent/package-info.java","src/main/java/tsptest/armversioned/implementation/ArmVersionedClientBuilder.java","src/main/java/tsptest/armversioned/implementation/ArmVersionedClientImpl.java","src/main/java/tsptest/armversioned/implementation/ResourceManagerUtils.java","src/main/java/tsptest/armversioned/implementation/TopLevelArmResourceImpl.java","src/main/java/tsptest/armversioned/implementation/TopLevelArmResourcesClientImpl.java","src/main/java/tsptest/armversioned/implementation/TopLevelArmResourcesImpl.java","src/main/java/tsptest/armversioned/implementation/models/TopLevelArmResourceListResult.java","src/main/java/tsptest/armversioned/implementation/package-info.java","src/main/java/tsptest/armversioned/models/ResourceProvisioningState.java","src/main/java/tsptest/armversioned/models/TopLevelArmResource.java","src/main/java/tsptest/armversioned/models/TopLevelArmResourceProperties.java","src/main/java/tsptest/armversioned/models/TopLevelArmResources.java","src/main/java/tsptest/armversioned/models/package-info.java","src/main/java/tsptest/armversioned/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"TspTest.ArmVersioned":"2024-12-01"},"crossLanguageDefinitions":{"tsptest.armversioned.fluent.ArmVersionedClient":"TspTest.ArmVersioned","tsptest.armversioned.fluent.TopLevelArmResourcesClient":"TspTest.ArmVersioned.TopLevelArmResources","tsptest.armversioned.fluent.TopLevelArmResourcesClient.action":"TspTest.ArmVersioned.TopLevelArmResources.action","tsptest.armversioned.fluent.TopLevelArmResourcesClient.actionWithResponse":"TspTest.ArmVersioned.TopLevelArmResources.action","tsptest.armversioned.fluent.TopLevelArmResourcesClient.beginCreateOrUpdate":"TspTest.ArmVersioned.TopLevelArmResources.createOrUpdate","tsptest.armversioned.fluent.TopLevelArmResourcesClient.createOrUpdate":"TspTest.ArmVersioned.TopLevelArmResources.createOrUpdate","tsptest.armversioned.fluent.TopLevelArmResourcesClient.delete":"TspTest.ArmVersioned.TopLevelArmResources.delete","tsptest.armversioned.fluent.TopLevelArmResourcesClient.deleteWithResponse":"TspTest.ArmVersioned.TopLevelArmResources.delete","tsptest.armversioned.fluent.TopLevelArmResourcesClient.getByResourceGroup":"TspTest.ArmVersioned.TopLevelArmResources.get","tsptest.armversioned.fluent.TopLevelArmResourcesClient.getByResourceGroupWithResponse":"TspTest.ArmVersioned.TopLevelArmResources.get","tsptest.armversioned.fluent.TopLevelArmResourcesClient.list":"TspTest.ArmVersioned.TopLevelArmResources.listBySubscription","tsptest.armversioned.fluent.TopLevelArmResourcesClient.listByResourceGroup":"TspTest.ArmVersioned.TopLevelArmResources.listByResourceGroup","tsptest.armversioned.fluent.models.TopLevelArmResourceInner":"TspTest.ArmVersioned.TopLevelArmResource","tsptest.armversioned.implementation.ArmVersionedClientBuilder":"TspTest.ArmVersioned","tsptest.armversioned.implementation.models.TopLevelArmResourceListResult":"Azure.ResourceManager.ResourceListResult","tsptest.armversioned.models.ResourceProvisioningState":"Azure.ResourceManager.ResourceProvisioningState","tsptest.armversioned.models.TopLevelArmResourceProperties":"TspTest.ArmVersioned.TopLevelArmResourceProperties"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/armversioned/ArmVersionedManager.java","src/main/java/tsptest/armversioned/fluent/ArmVersionedClient.java","src/main/java/tsptest/armversioned/fluent/TopLevelArmResourcesClient.java","src/main/java/tsptest/armversioned/fluent/models/TopLevelArmResourceInner.java","src/main/java/tsptest/armversioned/fluent/models/package-info.java","src/main/java/tsptest/armversioned/fluent/package-info.java","src/main/java/tsptest/armversioned/implementation/ArmVersionedClientBuilder.java","src/main/java/tsptest/armversioned/implementation/ArmVersionedClientImpl.java","src/main/java/tsptest/armversioned/implementation/ResourceManagerUtils.java","src/main/java/tsptest/armversioned/implementation/TopLevelArmResourceImpl.java","src/main/java/tsptest/armversioned/implementation/TopLevelArmResourcesClientImpl.java","src/main/java/tsptest/armversioned/implementation/TopLevelArmResourcesImpl.java","src/main/java/tsptest/armversioned/implementation/models/TopLevelArmResourceListResult.java","src/main/java/tsptest/armversioned/implementation/package-info.java","src/main/java/tsptest/armversioned/models/ResourceProvisioningState.java","src/main/java/tsptest/armversioned/models/TopLevelArmResource.java","src/main/java/tsptest/armversioned/models/TopLevelArmResourceProperties.java","src/main/java/tsptest/armversioned/models/TopLevelArmResources.java","src/main/java/tsptest/armversioned/models/package-info.java","src/main/java/tsptest/armversioned/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_apiview_properties.json deleted file mode 100644 index 0dd670209e9..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_apiview_properties.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.resourcemanager.multiservice.combined.fluent.Combined": "Azure.ResourceManager.MultiService.Combined", - "azure.resourcemanager.multiservice.combined.fluent.DisksClient": "Azure.ResourceManager.MultiService.ComputeDisk.Disks", - "azure.resourcemanager.multiservice.combined.fluent.DisksClient.beginCreateOrUpdate": "Azure.ResourceManager.MultiService.ComputeDisk.Disks.createOrUpdate", - "azure.resourcemanager.multiservice.combined.fluent.DisksClient.createOrUpdate": "Azure.ResourceManager.MultiService.ComputeDisk.Disks.createOrUpdate", - "azure.resourcemanager.multiservice.combined.fluent.DisksClient.getByResourceGroup": "Azure.ResourceManager.MultiService.ComputeDisk.Disks.get", - "azure.resourcemanager.multiservice.combined.fluent.DisksClient.getByResourceGroupWithResponse": "Azure.ResourceManager.MultiService.ComputeDisk.Disks.get", - "azure.resourcemanager.multiservice.combined.fluent.VirtualMachinesClient": "Azure.ResourceManager.MultiService.Compute.VirtualMachines", - "azure.resourcemanager.multiservice.combined.fluent.VirtualMachinesClient.beginCreateOrUpdate": "Azure.ResourceManager.MultiService.Compute.VirtualMachines.createOrUpdate", - "azure.resourcemanager.multiservice.combined.fluent.VirtualMachinesClient.createOrUpdate": "Azure.ResourceManager.MultiService.Compute.VirtualMachines.createOrUpdate", - "azure.resourcemanager.multiservice.combined.fluent.VirtualMachinesClient.getByResourceGroup": "Azure.ResourceManager.MultiService.Compute.VirtualMachines.get", - "azure.resourcemanager.multiservice.combined.fluent.VirtualMachinesClient.getByResourceGroupWithResponse": "Azure.ResourceManager.MultiService.Compute.VirtualMachines.get", - "azure.resourcemanager.multiservice.combined.fluent.models.DiskInner": "Azure.ResourceManager.MultiService.ComputeDisk.Disk", - "azure.resourcemanager.multiservice.combined.fluent.models.VirtualMachineInner": "Azure.ResourceManager.MultiService.Compute.VirtualMachine", - "azure.resourcemanager.multiservice.combined.implementation.CombinedBuilder": "Azure.ResourceManager.MultiService.Combined", - "azure.resourcemanager.multiservice.combined.models.DiskProperties": "Azure.ResourceManager.MultiService.ComputeDisk.DiskProperties", - "azure.resourcemanager.multiservice.combined.models.ResourceProvisioningState": "Azure.ResourceManager.ResourceProvisioningState", - "azure.resourcemanager.multiservice.combined.models.VirtualMachineProperties": "Azure.ResourceManager.MultiService.Compute.VirtualMachineProperties" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_apiview_properties_older-versions.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_apiview_properties_older-versions.json deleted file mode 100644 index 002ec4e4000..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_apiview_properties_older-versions.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.resourcemanager.multiserviceolderversions.combined.fluent.Combined": "Azure.ResourceManager.MultiServiceOlderVersions.Combined", - "azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient": "Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.Disks", - "azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient.beginCreateOrUpdate": "Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.Disks.createOrUpdate", - "azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient.createOrUpdate": "Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.Disks.createOrUpdate", - "azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient.getByResourceGroup": "Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.Disks.get", - "azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient.getByResourceGroupWithResponse": "Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.Disks.get", - "azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient": "Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachines", - "azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient.beginCreateOrUpdate": "Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachines.createOrUpdate", - "azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient.createOrUpdate": "Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachines.createOrUpdate", - "azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient.getByResourceGroup": "Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachines.get", - "azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient.getByResourceGroupWithResponse": "Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachines.get", - "azure.resourcemanager.multiserviceolderversions.combined.fluent.models.DiskInner": "Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.Disk", - "azure.resourcemanager.multiserviceolderversions.combined.fluent.models.VirtualMachineInner": "Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachine", - "azure.resourcemanager.multiserviceolderversions.combined.implementation.CombinedBuilder": "Azure.ResourceManager.MultiServiceOlderVersions.Combined", - "azure.resourcemanager.multiserviceolderversions.combined.models.DiskProperties": "Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.DiskProperties", - "azure.resourcemanager.multiserviceolderversions.combined.models.ResourceProvisioningState": "Azure.ResourceManager.ResourceProvisioningState", - "azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachineProperties": "Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachineProperties" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_apiview_properties_shared-models.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_apiview_properties_shared-models.json deleted file mode 100644 index 306ae1cb8b0..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_apiview_properties_shared-models.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.resourcemanager.multiservicesharedmodels.combined.fluent.Combined": "Azure.ResourceManager.MultiServiceSharedModels.Combined", - "azure.resourcemanager.multiservicesharedmodels.combined.fluent.StorageAccountsClient": "Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccounts", - "azure.resourcemanager.multiservicesharedmodels.combined.fluent.StorageAccountsClient.beginCreateOrUpdate": "Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccounts.createOrUpdate", - "azure.resourcemanager.multiservicesharedmodels.combined.fluent.StorageAccountsClient.createOrUpdate": "Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccounts.createOrUpdate", - "azure.resourcemanager.multiservicesharedmodels.combined.fluent.StorageAccountsClient.getByResourceGroup": "Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccounts.get", - "azure.resourcemanager.multiservicesharedmodels.combined.fluent.StorageAccountsClient.getByResourceGroupWithResponse": "Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccounts.get", - "azure.resourcemanager.multiservicesharedmodels.combined.fluent.VirtualMachinesClient": "Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachines", - "azure.resourcemanager.multiservicesharedmodels.combined.fluent.VirtualMachinesClient.beginCreateOrUpdate": "Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachines.createOrUpdate", - "azure.resourcemanager.multiservicesharedmodels.combined.fluent.VirtualMachinesClient.createOrUpdate": "Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachines.createOrUpdate", - "azure.resourcemanager.multiservicesharedmodels.combined.fluent.VirtualMachinesClient.getByResourceGroup": "Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachines.get", - "azure.resourcemanager.multiservicesharedmodels.combined.fluent.VirtualMachinesClient.getByResourceGroupWithResponse": "Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachines.get", - "azure.resourcemanager.multiservicesharedmodels.combined.fluent.models.StorageAccountInner": "Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccount", - "azure.resourcemanager.multiservicesharedmodels.combined.fluent.models.VirtualMachineInner": "Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachine", - "azure.resourcemanager.multiservicesharedmodels.combined.implementation.CombinedBuilder": "Azure.ResourceManager.MultiServiceSharedModels.Combined", - "azure.resourcemanager.multiservicesharedmodels.combined.models.ResourceProvisioningState": "Azure.ResourceManager.ResourceProvisioningState", - "azure.resourcemanager.multiservicesharedmodels.combined.models.SharedMetadata": "Azure.ResourceManager.MultiServiceSharedModels.Shared.SharedMetadata", - "azure.resourcemanager.multiservicesharedmodels.combined.models.StorageAccountProperties": "Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccountProperties", - "azure.resourcemanager.multiservicesharedmodels.combined.models.VirtualMachineProperties": "Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachineProperties" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_metadata.json index 234887d5b64..37386142103 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.resourcemanager.multiservice.combined.fluent.Combined":"Azure.ResourceManager.MultiService.Combined","azure.resourcemanager.multiservice.combined.fluent.DisksClient":"Azure.ResourceManager.MultiService.ComputeDisk.Disks","azure.resourcemanager.multiservice.combined.fluent.DisksClient.beginCreateOrUpdate":"Azure.ResourceManager.MultiService.ComputeDisk.Disks.createOrUpdate","azure.resourcemanager.multiservice.combined.fluent.DisksClient.createOrUpdate":"Azure.ResourceManager.MultiService.ComputeDisk.Disks.createOrUpdate","azure.resourcemanager.multiservice.combined.fluent.DisksClient.getByResourceGroup":"Azure.ResourceManager.MultiService.ComputeDisk.Disks.get","azure.resourcemanager.multiservice.combined.fluent.DisksClient.getByResourceGroupWithResponse":"Azure.ResourceManager.MultiService.ComputeDisk.Disks.get","azure.resourcemanager.multiservice.combined.fluent.VirtualMachinesClient":"Azure.ResourceManager.MultiService.Compute.VirtualMachines","azure.resourcemanager.multiservice.combined.fluent.VirtualMachinesClient.beginCreateOrUpdate":"Azure.ResourceManager.MultiService.Compute.VirtualMachines.createOrUpdate","azure.resourcemanager.multiservice.combined.fluent.VirtualMachinesClient.createOrUpdate":"Azure.ResourceManager.MultiService.Compute.VirtualMachines.createOrUpdate","azure.resourcemanager.multiservice.combined.fluent.VirtualMachinesClient.getByResourceGroup":"Azure.ResourceManager.MultiService.Compute.VirtualMachines.get","azure.resourcemanager.multiservice.combined.fluent.VirtualMachinesClient.getByResourceGroupWithResponse":"Azure.ResourceManager.MultiService.Compute.VirtualMachines.get","azure.resourcemanager.multiservice.combined.fluent.models.DiskInner":"Azure.ResourceManager.MultiService.ComputeDisk.Disk","azure.resourcemanager.multiservice.combined.fluent.models.VirtualMachineInner":"Azure.ResourceManager.MultiService.Compute.VirtualMachine","azure.resourcemanager.multiservice.combined.implementation.CombinedBuilder":"Azure.ResourceManager.MultiService.Combined","azure.resourcemanager.multiservice.combined.models.DiskProperties":"Azure.ResourceManager.MultiService.ComputeDisk.DiskProperties","azure.resourcemanager.multiservice.combined.models.ResourceProvisioningState":"Azure.ResourceManager.ResourceProvisioningState","azure.resourcemanager.multiservice.combined.models.VirtualMachineProperties":"Azure.ResourceManager.MultiService.Compute.VirtualMachineProperties"},"generatedFiles":["src/main/java/azure/resourcemanager/multiservice/combined/CombinedManager.java","src/main/java/azure/resourcemanager/multiservice/combined/fluent/Combined.java","src/main/java/azure/resourcemanager/multiservice/combined/fluent/DisksClient.java","src/main/java/azure/resourcemanager/multiservice/combined/fluent/VirtualMachinesClient.java","src/main/java/azure/resourcemanager/multiservice/combined/fluent/models/DiskInner.java","src/main/java/azure/resourcemanager/multiservice/combined/fluent/models/VirtualMachineInner.java","src/main/java/azure/resourcemanager/multiservice/combined/fluent/models/package-info.java","src/main/java/azure/resourcemanager/multiservice/combined/fluent/package-info.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/CombinedBuilder.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/CombinedImpl.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/DiskImpl.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/DisksClientImpl.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/DisksImpl.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/VirtualMachineImpl.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/VirtualMachinesClientImpl.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/VirtualMachinesImpl.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/package-info.java","src/main/java/azure/resourcemanager/multiservice/combined/models/Disk.java","src/main/java/azure/resourcemanager/multiservice/combined/models/DiskProperties.java","src/main/java/azure/resourcemanager/multiservice/combined/models/Disks.java","src/main/java/azure/resourcemanager/multiservice/combined/models/ResourceProvisioningState.java","src/main/java/azure/resourcemanager/multiservice/combined/models/VirtualMachine.java","src/main/java/azure/resourcemanager/multiservice/combined/models/VirtualMachineProperties.java","src/main/java/azure/resourcemanager/multiservice/combined/models/VirtualMachines.java","src/main/java/azure/resourcemanager/multiservice/combined/models/package-info.java","src/main/java/azure/resourcemanager/multiservice/combined/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Azure.ResourceManager.MultiService.Compute":"2025-04-01","Azure.ResourceManager.MultiService.ComputeDisk":"2025-01-02"},"crossLanguageDefinitions":{"azure.resourcemanager.multiservice.combined.fluent.Combined":"Azure.ResourceManager.MultiService.Combined","azure.resourcemanager.multiservice.combined.fluent.DisksClient":"Azure.ResourceManager.MultiService.ComputeDisk.Disks","azure.resourcemanager.multiservice.combined.fluent.DisksClient.beginCreateOrUpdate":"Azure.ResourceManager.MultiService.ComputeDisk.Disks.createOrUpdate","azure.resourcemanager.multiservice.combined.fluent.DisksClient.createOrUpdate":"Azure.ResourceManager.MultiService.ComputeDisk.Disks.createOrUpdate","azure.resourcemanager.multiservice.combined.fluent.DisksClient.getByResourceGroup":"Azure.ResourceManager.MultiService.ComputeDisk.Disks.get","azure.resourcemanager.multiservice.combined.fluent.DisksClient.getByResourceGroupWithResponse":"Azure.ResourceManager.MultiService.ComputeDisk.Disks.get","azure.resourcemanager.multiservice.combined.fluent.VirtualMachinesClient":"Azure.ResourceManager.MultiService.Compute.VirtualMachines","azure.resourcemanager.multiservice.combined.fluent.VirtualMachinesClient.beginCreateOrUpdate":"Azure.ResourceManager.MultiService.Compute.VirtualMachines.createOrUpdate","azure.resourcemanager.multiservice.combined.fluent.VirtualMachinesClient.createOrUpdate":"Azure.ResourceManager.MultiService.Compute.VirtualMachines.createOrUpdate","azure.resourcemanager.multiservice.combined.fluent.VirtualMachinesClient.getByResourceGroup":"Azure.ResourceManager.MultiService.Compute.VirtualMachines.get","azure.resourcemanager.multiservice.combined.fluent.VirtualMachinesClient.getByResourceGroupWithResponse":"Azure.ResourceManager.MultiService.Compute.VirtualMachines.get","azure.resourcemanager.multiservice.combined.fluent.models.DiskInner":"Azure.ResourceManager.MultiService.ComputeDisk.Disk","azure.resourcemanager.multiservice.combined.fluent.models.VirtualMachineInner":"Azure.ResourceManager.MultiService.Compute.VirtualMachine","azure.resourcemanager.multiservice.combined.implementation.CombinedBuilder":"Azure.ResourceManager.MultiService.Combined","azure.resourcemanager.multiservice.combined.models.DiskProperties":"Azure.ResourceManager.MultiService.ComputeDisk.DiskProperties","azure.resourcemanager.multiservice.combined.models.ResourceProvisioningState":"Azure.ResourceManager.ResourceProvisioningState","azure.resourcemanager.multiservice.combined.models.VirtualMachineProperties":"Azure.ResourceManager.MultiService.Compute.VirtualMachineProperties"},"generatedFiles":["src/main/java/azure/resourcemanager/multiservice/combined/CombinedManager.java","src/main/java/azure/resourcemanager/multiservice/combined/fluent/Combined.java","src/main/java/azure/resourcemanager/multiservice/combined/fluent/DisksClient.java","src/main/java/azure/resourcemanager/multiservice/combined/fluent/VirtualMachinesClient.java","src/main/java/azure/resourcemanager/multiservice/combined/fluent/models/DiskInner.java","src/main/java/azure/resourcemanager/multiservice/combined/fluent/models/VirtualMachineInner.java","src/main/java/azure/resourcemanager/multiservice/combined/fluent/models/package-info.java","src/main/java/azure/resourcemanager/multiservice/combined/fluent/package-info.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/CombinedBuilder.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/CombinedImpl.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/DiskImpl.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/DisksClientImpl.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/DisksImpl.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/VirtualMachineImpl.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/VirtualMachinesClientImpl.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/VirtualMachinesImpl.java","src/main/java/azure/resourcemanager/multiservice/combined/implementation/package-info.java","src/main/java/azure/resourcemanager/multiservice/combined/models/Disk.java","src/main/java/azure/resourcemanager/multiservice/combined/models/DiskProperties.java","src/main/java/azure/resourcemanager/multiservice/combined/models/Disks.java","src/main/java/azure/resourcemanager/multiservice/combined/models/ResourceProvisioningState.java","src/main/java/azure/resourcemanager/multiservice/combined/models/VirtualMachine.java","src/main/java/azure/resourcemanager/multiservice/combined/models/VirtualMachineProperties.java","src/main/java/azure/resourcemanager/multiservice/combined/models/VirtualMachines.java","src/main/java/azure/resourcemanager/multiservice/combined/models/package-info.java","src/main/java/azure/resourcemanager/multiservice/combined/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_metadata_older-versions.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_metadata_older-versions.json deleted file mode 100644 index 37b992ffa88..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_metadata_older-versions.json +++ /dev/null @@ -1 +0,0 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.resourcemanager.multiserviceolderversions.combined.fluent.Combined":"Azure.ResourceManager.MultiServiceOlderVersions.Combined","azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient":"Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.Disks","azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient.beginCreateOrUpdate":"Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.Disks.createOrUpdate","azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient.createOrUpdate":"Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.Disks.createOrUpdate","azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient.getByResourceGroup":"Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.Disks.get","azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient.getByResourceGroupWithResponse":"Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.Disks.get","azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient":"Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachines","azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient.beginCreateOrUpdate":"Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachines.createOrUpdate","azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient.createOrUpdate":"Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachines.createOrUpdate","azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient.getByResourceGroup":"Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachines.get","azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient.getByResourceGroupWithResponse":"Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachines.get","azure.resourcemanager.multiserviceolderversions.combined.fluent.models.DiskInner":"Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.Disk","azure.resourcemanager.multiserviceolderversions.combined.fluent.models.VirtualMachineInner":"Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachine","azure.resourcemanager.multiserviceolderversions.combined.implementation.CombinedBuilder":"Azure.ResourceManager.MultiServiceOlderVersions.Combined","azure.resourcemanager.multiserviceolderversions.combined.models.DiskProperties":"Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.DiskProperties","azure.resourcemanager.multiserviceolderversions.combined.models.ResourceProvisioningState":"Azure.ResourceManager.ResourceProvisioningState","azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachineProperties":"Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachineProperties"},"generatedFiles":["src/main/java/azure/resourcemanager/multiserviceolderversions/combined/CombinedManager.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/Combined.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/DisksClient.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/VirtualMachinesClient.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/DiskInner.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/VirtualMachineInner.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/package-info.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/package-info.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/CombinedBuilder.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/CombinedImpl.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DiskImpl.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksClientImpl.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksImpl.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachineImpl.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesClientImpl.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesImpl.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/package-info.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/Disk.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/DiskProperties.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/Disks.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/ResourceProvisioningState.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachine.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachineProperties.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachines.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/package-info.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_metadata_shared-models.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_metadata_shared-models.json index 3e3303bc350..d8f5b556260 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_metadata_shared-models.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_metadata_shared-models.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.resourcemanager.multiservicesharedmodels.combined.fluent.Combined":"Azure.ResourceManager.MultiServiceSharedModels.Combined","azure.resourcemanager.multiservicesharedmodels.combined.fluent.StorageAccountsClient":"Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccounts","azure.resourcemanager.multiservicesharedmodels.combined.fluent.StorageAccountsClient.beginCreateOrUpdate":"Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccounts.createOrUpdate","azure.resourcemanager.multiservicesharedmodels.combined.fluent.StorageAccountsClient.createOrUpdate":"Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccounts.createOrUpdate","azure.resourcemanager.multiservicesharedmodels.combined.fluent.StorageAccountsClient.getByResourceGroup":"Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccounts.get","azure.resourcemanager.multiservicesharedmodels.combined.fluent.StorageAccountsClient.getByResourceGroupWithResponse":"Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccounts.get","azure.resourcemanager.multiservicesharedmodels.combined.fluent.VirtualMachinesClient":"Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachines","azure.resourcemanager.multiservicesharedmodels.combined.fluent.VirtualMachinesClient.beginCreateOrUpdate":"Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachines.createOrUpdate","azure.resourcemanager.multiservicesharedmodels.combined.fluent.VirtualMachinesClient.createOrUpdate":"Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachines.createOrUpdate","azure.resourcemanager.multiservicesharedmodels.combined.fluent.VirtualMachinesClient.getByResourceGroup":"Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachines.get","azure.resourcemanager.multiservicesharedmodels.combined.fluent.VirtualMachinesClient.getByResourceGroupWithResponse":"Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachines.get","azure.resourcemanager.multiservicesharedmodels.combined.fluent.models.StorageAccountInner":"Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccount","azure.resourcemanager.multiservicesharedmodels.combined.fluent.models.VirtualMachineInner":"Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachine","azure.resourcemanager.multiservicesharedmodels.combined.implementation.CombinedBuilder":"Azure.ResourceManager.MultiServiceSharedModels.Combined","azure.resourcemanager.multiservicesharedmodels.combined.models.ResourceProvisioningState":"Azure.ResourceManager.ResourceProvisioningState","azure.resourcemanager.multiservicesharedmodels.combined.models.SharedMetadata":"Azure.ResourceManager.MultiServiceSharedModels.Shared.SharedMetadata","azure.resourcemanager.multiservicesharedmodels.combined.models.StorageAccountProperties":"Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccountProperties","azure.resourcemanager.multiservicesharedmodels.combined.models.VirtualMachineProperties":"Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachineProperties"},"generatedFiles":["src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/CombinedManager.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/fluent/Combined.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/fluent/StorageAccountsClient.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/fluent/VirtualMachinesClient.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/fluent/models/StorageAccountInner.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/fluent/models/VirtualMachineInner.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/fluent/models/package-info.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/fluent/package-info.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/CombinedBuilder.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/CombinedImpl.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/StorageAccountImpl.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/StorageAccountsClientImpl.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/StorageAccountsImpl.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/VirtualMachineImpl.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/VirtualMachinesClientImpl.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/VirtualMachinesImpl.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/package-info.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/models/ResourceProvisioningState.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/models/SharedMetadata.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/models/StorageAccount.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/models/StorageAccountProperties.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/models/StorageAccounts.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/models/VirtualMachine.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/models/VirtualMachineProperties.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/models/VirtualMachines.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/models/package-info.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Azure.ResourceManager.MultiServiceSharedModels.Compute":"2025-05-01","Azure.ResourceManager.MultiServiceSharedModels.Storage":"2025-02-01"},"crossLanguageDefinitions":{"azure.resourcemanager.multiservicesharedmodels.combined.fluent.Combined":"Azure.ResourceManager.MultiServiceSharedModels.Combined","azure.resourcemanager.multiservicesharedmodels.combined.fluent.StorageAccountsClient":"Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccounts","azure.resourcemanager.multiservicesharedmodels.combined.fluent.StorageAccountsClient.beginCreateOrUpdate":"Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccounts.createOrUpdate","azure.resourcemanager.multiservicesharedmodels.combined.fluent.StorageAccountsClient.createOrUpdate":"Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccounts.createOrUpdate","azure.resourcemanager.multiservicesharedmodels.combined.fluent.StorageAccountsClient.getByResourceGroup":"Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccounts.get","azure.resourcemanager.multiservicesharedmodels.combined.fluent.StorageAccountsClient.getByResourceGroupWithResponse":"Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccounts.get","azure.resourcemanager.multiservicesharedmodels.combined.fluent.VirtualMachinesClient":"Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachines","azure.resourcemanager.multiservicesharedmodels.combined.fluent.VirtualMachinesClient.beginCreateOrUpdate":"Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachines.createOrUpdate","azure.resourcemanager.multiservicesharedmodels.combined.fluent.VirtualMachinesClient.createOrUpdate":"Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachines.createOrUpdate","azure.resourcemanager.multiservicesharedmodels.combined.fluent.VirtualMachinesClient.getByResourceGroup":"Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachines.get","azure.resourcemanager.multiservicesharedmodels.combined.fluent.VirtualMachinesClient.getByResourceGroupWithResponse":"Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachines.get","azure.resourcemanager.multiservicesharedmodels.combined.fluent.models.StorageAccountInner":"Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccount","azure.resourcemanager.multiservicesharedmodels.combined.fluent.models.VirtualMachineInner":"Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachine","azure.resourcemanager.multiservicesharedmodels.combined.implementation.CombinedBuilder":"Azure.ResourceManager.MultiServiceSharedModels.Combined","azure.resourcemanager.multiservicesharedmodels.combined.models.ResourceProvisioningState":"Azure.ResourceManager.ResourceProvisioningState","azure.resourcemanager.multiservicesharedmodels.combined.models.SharedMetadata":"Azure.ResourceManager.MultiServiceSharedModels.Shared.SharedMetadata","azure.resourcemanager.multiservicesharedmodels.combined.models.StorageAccountProperties":"Azure.ResourceManager.MultiServiceSharedModels.Storage.StorageAccountProperties","azure.resourcemanager.multiservicesharedmodels.combined.models.VirtualMachineProperties":"Azure.ResourceManager.MultiServiceSharedModels.Compute.VirtualMachineProperties"},"generatedFiles":["src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/CombinedManager.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/fluent/Combined.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/fluent/StorageAccountsClient.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/fluent/VirtualMachinesClient.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/fluent/models/StorageAccountInner.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/fluent/models/VirtualMachineInner.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/fluent/models/package-info.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/fluent/package-info.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/CombinedBuilder.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/CombinedImpl.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/StorageAccountImpl.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/StorageAccountsClientImpl.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/StorageAccountsImpl.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/VirtualMachineImpl.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/VirtualMachinesClientImpl.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/VirtualMachinesImpl.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/package-info.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/models/ResourceProvisioningState.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/models/SharedMetadata.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/models/StorageAccount.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/models/StorageAccountProperties.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/models/StorageAccounts.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/models/VirtualMachine.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/models/VirtualMachineProperties.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/models/VirtualMachines.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/models/package-info.java","src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-commonproperties-generated_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-commonproperties-generated_apiview_properties.json deleted file mode 100644 index b89c3621c4b..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-commonproperties-generated_apiview_properties.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.resourcemanager.commonproperties.fluent.CommonPropertiesClient": "Azure.ResourceManager.CommonProperties", - "azure.resourcemanager.commonproperties.fluent.ErrorsClient": "Azure.ResourceManager.CommonProperties.Error", - "azure.resourcemanager.commonproperties.fluent.ErrorsClient.createForUserDefinedError": "Azure.ResourceManager.CommonProperties.Error.createForUserDefinedError", - "azure.resourcemanager.commonproperties.fluent.ErrorsClient.createForUserDefinedErrorWithResponse": "Azure.ResourceManager.CommonProperties.Error.createForUserDefinedError", - "azure.resourcemanager.commonproperties.fluent.ErrorsClient.getByResourceGroup": "Azure.ResourceManager.CommonProperties.Error.getForPredefinedError", - "azure.resourcemanager.commonproperties.fluent.ErrorsClient.getByResourceGroupWithResponse": "Azure.ResourceManager.CommonProperties.Error.getForPredefinedError", - "azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient": "Azure.ResourceManager.CommonProperties.ManagedIdentity", - "azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient.createWithSystemAssigned": "Azure.ResourceManager.CommonProperties.ManagedIdentity.createWithSystemAssigned", - "azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient.createWithSystemAssignedWithResponse": "Azure.ResourceManager.CommonProperties.ManagedIdentity.createWithSystemAssigned", - "azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient.getByResourceGroup": "Azure.ResourceManager.CommonProperties.ManagedIdentity.get", - "azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient.getByResourceGroupWithResponse": "Azure.ResourceManager.CommonProperties.ManagedIdentity.get", - "azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient.updateWithUserAssignedAndSystemAssigned": "Azure.ResourceManager.CommonProperties.ManagedIdentity.updateWithUserAssignedAndSystemAssigned", - "azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient.updateWithUserAssignedAndSystemAssignedWithResponse": "Azure.ResourceManager.CommonProperties.ManagedIdentity.updateWithUserAssignedAndSystemAssigned", - "azure.resourcemanager.commonproperties.fluent.models.ConfidentialResourceInner": "Azure.ResourceManager.CommonProperties.ConfidentialResource", - "azure.resourcemanager.commonproperties.fluent.models.ManagedIdentityTrackedResourceInner": "Azure.ResourceManager.CommonProperties.ManagedIdentityTrackedResource", - "azure.resourcemanager.commonproperties.implementation.CommonPropertiesClientBuilder": "Azure.ResourceManager.CommonProperties", - "azure.resourcemanager.commonproperties.models.ApiError": "Azure.ResourceManager.CommonProperties.CloudError", - "azure.resourcemanager.commonproperties.models.ConfidentialResourceProperties": "Azure.ResourceManager.CommonProperties.ConfidentialResourceProperties", - "azure.resourcemanager.commonproperties.models.InnerError": "Azure.ResourceManager.CommonProperties.InnerError", - "azure.resourcemanager.commonproperties.models.ManagedIdentityTrackedResourceProperties": "Azure.ResourceManager.CommonProperties.ManagedIdentityTrackedResourceProperties", - "azure.resourcemanager.commonproperties.models.ManagedServiceIdentity": "Azure.ResourceManager.CommonTypes.ManagedServiceIdentity", - "azure.resourcemanager.commonproperties.models.ManagedServiceIdentityType": "Azure.ResourceManager.CommonTypes.ManagedServiceIdentityType", - "azure.resourcemanager.commonproperties.models.UserAssignedIdentity": "Azure.ResourceManager.CommonTypes.UserAssignedIdentity" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-commonproperties-generated_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-commonproperties-generated_metadata.json index f93f7490097..28345575c91 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-commonproperties-generated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-commonproperties-generated_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2023-12-01-preview","crossLanguageDefinitions":{"azure.resourcemanager.commonproperties.fluent.CommonPropertiesClient":"Azure.ResourceManager.CommonProperties","azure.resourcemanager.commonproperties.fluent.ErrorsClient":"Azure.ResourceManager.CommonProperties.Error","azure.resourcemanager.commonproperties.fluent.ErrorsClient.createForUserDefinedError":"Azure.ResourceManager.CommonProperties.Error.createForUserDefinedError","azure.resourcemanager.commonproperties.fluent.ErrorsClient.createForUserDefinedErrorWithResponse":"Azure.ResourceManager.CommonProperties.Error.createForUserDefinedError","azure.resourcemanager.commonproperties.fluent.ErrorsClient.getByResourceGroup":"Azure.ResourceManager.CommonProperties.Error.getForPredefinedError","azure.resourcemanager.commonproperties.fluent.ErrorsClient.getByResourceGroupWithResponse":"Azure.ResourceManager.CommonProperties.Error.getForPredefinedError","azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient":"Azure.ResourceManager.CommonProperties.ManagedIdentity","azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient.createWithSystemAssigned":"Azure.ResourceManager.CommonProperties.ManagedIdentity.createWithSystemAssigned","azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient.createWithSystemAssignedWithResponse":"Azure.ResourceManager.CommonProperties.ManagedIdentity.createWithSystemAssigned","azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient.getByResourceGroup":"Azure.ResourceManager.CommonProperties.ManagedIdentity.get","azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient.getByResourceGroupWithResponse":"Azure.ResourceManager.CommonProperties.ManagedIdentity.get","azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient.updateWithUserAssignedAndSystemAssigned":"Azure.ResourceManager.CommonProperties.ManagedIdentity.updateWithUserAssignedAndSystemAssigned","azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient.updateWithUserAssignedAndSystemAssignedWithResponse":"Azure.ResourceManager.CommonProperties.ManagedIdentity.updateWithUserAssignedAndSystemAssigned","azure.resourcemanager.commonproperties.fluent.models.ConfidentialResourceInner":"Azure.ResourceManager.CommonProperties.ConfidentialResource","azure.resourcemanager.commonproperties.fluent.models.ManagedIdentityTrackedResourceInner":"Azure.ResourceManager.CommonProperties.ManagedIdentityTrackedResource","azure.resourcemanager.commonproperties.implementation.CommonPropertiesClientBuilder":"Azure.ResourceManager.CommonProperties","azure.resourcemanager.commonproperties.models.ApiError":"Azure.ResourceManager.CommonProperties.CloudError","azure.resourcemanager.commonproperties.models.ConfidentialResourceProperties":"Azure.ResourceManager.CommonProperties.ConfidentialResourceProperties","azure.resourcemanager.commonproperties.models.InnerError":"Azure.ResourceManager.CommonProperties.InnerError","azure.resourcemanager.commonproperties.models.ManagedIdentityTrackedResourceProperties":"Azure.ResourceManager.CommonProperties.ManagedIdentityTrackedResourceProperties","azure.resourcemanager.commonproperties.models.ManagedServiceIdentity":"Azure.ResourceManager.CommonTypes.ManagedServiceIdentity","azure.resourcemanager.commonproperties.models.ManagedServiceIdentityType":"Azure.ResourceManager.CommonTypes.ManagedServiceIdentityType","azure.resourcemanager.commonproperties.models.UserAssignedIdentity":"Azure.ResourceManager.CommonTypes.UserAssignedIdentity"},"generatedFiles":["src/main/java/azure/resourcemanager/commonproperties/CommonPropertiesManager.java","src/main/java/azure/resourcemanager/commonproperties/fluent/CommonPropertiesClient.java","src/main/java/azure/resourcemanager/commonproperties/fluent/ErrorsClient.java","src/main/java/azure/resourcemanager/commonproperties/fluent/ManagedIdentitiesClient.java","src/main/java/azure/resourcemanager/commonproperties/fluent/models/ConfidentialResourceInner.java","src/main/java/azure/resourcemanager/commonproperties/fluent/models/ManagedIdentityTrackedResourceInner.java","src/main/java/azure/resourcemanager/commonproperties/fluent/models/package-info.java","src/main/java/azure/resourcemanager/commonproperties/fluent/package-info.java","src/main/java/azure/resourcemanager/commonproperties/implementation/CommonPropertiesClientBuilder.java","src/main/java/azure/resourcemanager/commonproperties/implementation/CommonPropertiesClientImpl.java","src/main/java/azure/resourcemanager/commonproperties/implementation/ConfidentialResourceImpl.java","src/main/java/azure/resourcemanager/commonproperties/implementation/ErrorsClientImpl.java","src/main/java/azure/resourcemanager/commonproperties/implementation/ErrorsImpl.java","src/main/java/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesClientImpl.java","src/main/java/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesImpl.java","src/main/java/azure/resourcemanager/commonproperties/implementation/ManagedIdentityTrackedResourceImpl.java","src/main/java/azure/resourcemanager/commonproperties/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/commonproperties/implementation/package-info.java","src/main/java/azure/resourcemanager/commonproperties/models/ApiError.java","src/main/java/azure/resourcemanager/commonproperties/models/ApiErrorException.java","src/main/java/azure/resourcemanager/commonproperties/models/ConfidentialResource.java","src/main/java/azure/resourcemanager/commonproperties/models/ConfidentialResourceProperties.java","src/main/java/azure/resourcemanager/commonproperties/models/Errors.java","src/main/java/azure/resourcemanager/commonproperties/models/InnerError.java","src/main/java/azure/resourcemanager/commonproperties/models/ManagedIdentities.java","src/main/java/azure/resourcemanager/commonproperties/models/ManagedIdentityTrackedResource.java","src/main/java/azure/resourcemanager/commonproperties/models/ManagedIdentityTrackedResourceProperties.java","src/main/java/azure/resourcemanager/commonproperties/models/ManagedServiceIdentity.java","src/main/java/azure/resourcemanager/commonproperties/models/ManagedServiceIdentityType.java","src/main/java/azure/resourcemanager/commonproperties/models/UserAssignedIdentity.java","src/main/java/azure/resourcemanager/commonproperties/models/package-info.java","src/main/java/azure/resourcemanager/commonproperties/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Azure.ResourceManager.CommonProperties":"2023-12-01-preview"},"crossLanguageDefinitions":{"azure.resourcemanager.commonproperties.fluent.CommonPropertiesClient":"Azure.ResourceManager.CommonProperties","azure.resourcemanager.commonproperties.fluent.ErrorsClient":"Azure.ResourceManager.CommonProperties.Error","azure.resourcemanager.commonproperties.fluent.ErrorsClient.createForUserDefinedError":"Azure.ResourceManager.CommonProperties.Error.createForUserDefinedError","azure.resourcemanager.commonproperties.fluent.ErrorsClient.createForUserDefinedErrorWithResponse":"Azure.ResourceManager.CommonProperties.Error.createForUserDefinedError","azure.resourcemanager.commonproperties.fluent.ErrorsClient.getByResourceGroup":"Azure.ResourceManager.CommonProperties.Error.getForPredefinedError","azure.resourcemanager.commonproperties.fluent.ErrorsClient.getByResourceGroupWithResponse":"Azure.ResourceManager.CommonProperties.Error.getForPredefinedError","azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient":"Azure.ResourceManager.CommonProperties.ManagedIdentity","azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient.createWithSystemAssigned":"Azure.ResourceManager.CommonProperties.ManagedIdentity.createWithSystemAssigned","azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient.createWithSystemAssignedWithResponse":"Azure.ResourceManager.CommonProperties.ManagedIdentity.createWithSystemAssigned","azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient.getByResourceGroup":"Azure.ResourceManager.CommonProperties.ManagedIdentity.get","azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient.getByResourceGroupWithResponse":"Azure.ResourceManager.CommonProperties.ManagedIdentity.get","azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient.updateWithUserAssignedAndSystemAssigned":"Azure.ResourceManager.CommonProperties.ManagedIdentity.updateWithUserAssignedAndSystemAssigned","azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient.updateWithUserAssignedAndSystemAssignedWithResponse":"Azure.ResourceManager.CommonProperties.ManagedIdentity.updateWithUserAssignedAndSystemAssigned","azure.resourcemanager.commonproperties.fluent.models.ConfidentialResourceInner":"Azure.ResourceManager.CommonProperties.ConfidentialResource","azure.resourcemanager.commonproperties.fluent.models.ManagedIdentityTrackedResourceInner":"Azure.ResourceManager.CommonProperties.ManagedIdentityTrackedResource","azure.resourcemanager.commonproperties.implementation.CommonPropertiesClientBuilder":"Azure.ResourceManager.CommonProperties","azure.resourcemanager.commonproperties.models.ApiError":"Azure.ResourceManager.CommonProperties.CloudError","azure.resourcemanager.commonproperties.models.ConfidentialResourceProperties":"Azure.ResourceManager.CommonProperties.ConfidentialResourceProperties","azure.resourcemanager.commonproperties.models.InnerError":"Azure.ResourceManager.CommonProperties.InnerError","azure.resourcemanager.commonproperties.models.ManagedIdentityTrackedResourceProperties":"Azure.ResourceManager.CommonProperties.ManagedIdentityTrackedResourceProperties","azure.resourcemanager.commonproperties.models.ManagedServiceIdentity":"Azure.ResourceManager.CommonTypes.ManagedServiceIdentity","azure.resourcemanager.commonproperties.models.ManagedServiceIdentityType":"Azure.ResourceManager.CommonTypes.ManagedServiceIdentityType","azure.resourcemanager.commonproperties.models.UserAssignedIdentity":"Azure.ResourceManager.CommonTypes.UserAssignedIdentity"},"generatedFiles":["src/main/java/azure/resourcemanager/commonproperties/CommonPropertiesManager.java","src/main/java/azure/resourcemanager/commonproperties/fluent/CommonPropertiesClient.java","src/main/java/azure/resourcemanager/commonproperties/fluent/ErrorsClient.java","src/main/java/azure/resourcemanager/commonproperties/fluent/ManagedIdentitiesClient.java","src/main/java/azure/resourcemanager/commonproperties/fluent/models/ConfidentialResourceInner.java","src/main/java/azure/resourcemanager/commonproperties/fluent/models/ManagedIdentityTrackedResourceInner.java","src/main/java/azure/resourcemanager/commonproperties/fluent/models/package-info.java","src/main/java/azure/resourcemanager/commonproperties/fluent/package-info.java","src/main/java/azure/resourcemanager/commonproperties/implementation/CommonPropertiesClientBuilder.java","src/main/java/azure/resourcemanager/commonproperties/implementation/CommonPropertiesClientImpl.java","src/main/java/azure/resourcemanager/commonproperties/implementation/ConfidentialResourceImpl.java","src/main/java/azure/resourcemanager/commonproperties/implementation/ErrorsClientImpl.java","src/main/java/azure/resourcemanager/commonproperties/implementation/ErrorsImpl.java","src/main/java/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesClientImpl.java","src/main/java/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesImpl.java","src/main/java/azure/resourcemanager/commonproperties/implementation/ManagedIdentityTrackedResourceImpl.java","src/main/java/azure/resourcemanager/commonproperties/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/commonproperties/implementation/package-info.java","src/main/java/azure/resourcemanager/commonproperties/models/ApiError.java","src/main/java/azure/resourcemanager/commonproperties/models/ApiErrorException.java","src/main/java/azure/resourcemanager/commonproperties/models/ConfidentialResource.java","src/main/java/azure/resourcemanager/commonproperties/models/ConfidentialResourceProperties.java","src/main/java/azure/resourcemanager/commonproperties/models/Errors.java","src/main/java/azure/resourcemanager/commonproperties/models/InnerError.java","src/main/java/azure/resourcemanager/commonproperties/models/ManagedIdentities.java","src/main/java/azure/resourcemanager/commonproperties/models/ManagedIdentityTrackedResource.java","src/main/java/azure/resourcemanager/commonproperties/models/ManagedIdentityTrackedResourceProperties.java","src/main/java/azure/resourcemanager/commonproperties/models/ManagedServiceIdentity.java","src/main/java/azure/resourcemanager/commonproperties/models/ManagedServiceIdentityType.java","src/main/java/azure/resourcemanager/commonproperties/models/UserAssignedIdentity.java","src/main/java/azure/resourcemanager/commonproperties/models/package-info.java","src/main/java/azure/resourcemanager/commonproperties/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-largeheader-generated_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-largeheader-generated_apiview_properties.json deleted file mode 100644 index dfb9414cee4..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-largeheader-generated_apiview_properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.resourcemanager.largeheader.fluent.LargeHeaderClient": "Azure.ResourceManager.LargeHeader", - "azure.resourcemanager.largeheader.fluent.LargeHeadersClient": "Azure.ResourceManager.LargeHeader.LargeHeaders", - "azure.resourcemanager.largeheader.fluent.LargeHeadersClient.beginTwo6k": "Azure.ResourceManager.LargeHeader.LargeHeaders.two6k", - "azure.resourcemanager.largeheader.fluent.LargeHeadersClient.two6k": "Azure.ResourceManager.LargeHeader.LargeHeaders.two6k", - "azure.resourcemanager.largeheader.fluent.models.CancelResultInner": "Azure.ResourceManager.LargeHeader.CancelResult", - "azure.resourcemanager.largeheader.implementation.LargeHeaderClientBuilder": "Azure.ResourceManager.LargeHeader" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-largeheader-generated_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-largeheader-generated_metadata.json index c508ef0d333..aff6137522a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-largeheader-generated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-largeheader-generated_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2023-12-01-preview","crossLanguageDefinitions":{"azure.resourcemanager.largeheader.fluent.LargeHeaderClient":"Azure.ResourceManager.LargeHeader","azure.resourcemanager.largeheader.fluent.LargeHeadersClient":"Azure.ResourceManager.LargeHeader.LargeHeaders","azure.resourcemanager.largeheader.fluent.LargeHeadersClient.beginTwo6k":"Azure.ResourceManager.LargeHeader.LargeHeaders.two6k","azure.resourcemanager.largeheader.fluent.LargeHeadersClient.two6k":"Azure.ResourceManager.LargeHeader.LargeHeaders.two6k","azure.resourcemanager.largeheader.fluent.models.CancelResultInner":"Azure.ResourceManager.LargeHeader.CancelResult","azure.resourcemanager.largeheader.implementation.LargeHeaderClientBuilder":"Azure.ResourceManager.LargeHeader"},"generatedFiles":["src/main/java/azure/resourcemanager/largeheader/LargeHeaderManager.java","src/main/java/azure/resourcemanager/largeheader/fluent/LargeHeaderClient.java","src/main/java/azure/resourcemanager/largeheader/fluent/LargeHeadersClient.java","src/main/java/azure/resourcemanager/largeheader/fluent/models/CancelResultInner.java","src/main/java/azure/resourcemanager/largeheader/fluent/models/package-info.java","src/main/java/azure/resourcemanager/largeheader/fluent/package-info.java","src/main/java/azure/resourcemanager/largeheader/implementation/CancelResultImpl.java","src/main/java/azure/resourcemanager/largeheader/implementation/LargeHeaderClientBuilder.java","src/main/java/azure/resourcemanager/largeheader/implementation/LargeHeaderClientImpl.java","src/main/java/azure/resourcemanager/largeheader/implementation/LargeHeadersClientImpl.java","src/main/java/azure/resourcemanager/largeheader/implementation/LargeHeadersImpl.java","src/main/java/azure/resourcemanager/largeheader/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/largeheader/implementation/package-info.java","src/main/java/azure/resourcemanager/largeheader/models/CancelResult.java","src/main/java/azure/resourcemanager/largeheader/models/LargeHeaders.java","src/main/java/azure/resourcemanager/largeheader/models/package-info.java","src/main/java/azure/resourcemanager/largeheader/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Azure.ResourceManager.LargeHeader":"2023-12-01-preview"},"crossLanguageDefinitions":{"azure.resourcemanager.largeheader.fluent.LargeHeaderClient":"Azure.ResourceManager.LargeHeader","azure.resourcemanager.largeheader.fluent.LargeHeadersClient":"Azure.ResourceManager.LargeHeader.LargeHeaders","azure.resourcemanager.largeheader.fluent.LargeHeadersClient.beginTwo6k":"Azure.ResourceManager.LargeHeader.LargeHeaders.two6k","azure.resourcemanager.largeheader.fluent.LargeHeadersClient.two6k":"Azure.ResourceManager.LargeHeader.LargeHeaders.two6k","azure.resourcemanager.largeheader.fluent.models.CancelResultInner":"Azure.ResourceManager.LargeHeader.CancelResult","azure.resourcemanager.largeheader.implementation.LargeHeaderClientBuilder":"Azure.ResourceManager.LargeHeader"},"generatedFiles":["src/main/java/azure/resourcemanager/largeheader/LargeHeaderManager.java","src/main/java/azure/resourcemanager/largeheader/fluent/LargeHeaderClient.java","src/main/java/azure/resourcemanager/largeheader/fluent/LargeHeadersClient.java","src/main/java/azure/resourcemanager/largeheader/fluent/models/CancelResultInner.java","src/main/java/azure/resourcemanager/largeheader/fluent/models/package-info.java","src/main/java/azure/resourcemanager/largeheader/fluent/package-info.java","src/main/java/azure/resourcemanager/largeheader/implementation/CancelResultImpl.java","src/main/java/azure/resourcemanager/largeheader/implementation/LargeHeaderClientBuilder.java","src/main/java/azure/resourcemanager/largeheader/implementation/LargeHeaderClientImpl.java","src/main/java/azure/resourcemanager/largeheader/implementation/LargeHeadersClientImpl.java","src/main/java/azure/resourcemanager/largeheader/implementation/LargeHeadersImpl.java","src/main/java/azure/resourcemanager/largeheader/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/largeheader/implementation/package-info.java","src/main/java/azure/resourcemanager/largeheader/models/CancelResult.java","src/main/java/azure/resourcemanager/largeheader/models/LargeHeaders.java","src/main/java/azure/resourcemanager/largeheader/models/package-info.java","src/main/java/azure/resourcemanager/largeheader/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-methodsubscriptionid-generated_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-methodsubscriptionid-generated_apiview_properties.json deleted file mode 100644 index 70b60f8e8d0..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-methodsubscriptionid-generated_apiview_properties.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.resourcemanager.methodsubscriptionid.fluent.MethodSubscriptionIdClient": "Azure.ResourceManager.MethodSubscriptionId", - "azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient": "Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations", - "azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient.delete": "Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations.delete", - "azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient.deleteWithResponse": "Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations.delete", - "azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient.getByResourceGroup": "Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations.get", - "azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient.getByResourceGroupWithResponse": "Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations.get", - "azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient.put": "Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations.put", - "azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient.putWithResponse": "Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations.put", - "azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient": "Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations", - "azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient.delete": "Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations.delete", - "azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient.deleteWithResponse": "Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations.delete", - "azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient.get": "Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations.get", - "azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient.getWithResponse": "Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations.get", - "azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient.put": "Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations.put", - "azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient.putWithResponse": "Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations.put", - "azure.resourcemanager.methodsubscriptionid.fluent.OperationsClient": "Azure.ResourceManager.MethodSubscriptionId.Operations", - "azure.resourcemanager.methodsubscriptionid.fluent.OperationsClient.list": "Azure.ResourceManager.Operations.list", - "azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient": "Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations", - "azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.delete": "Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations.delete", - "azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.deleteWithResponse": "Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations.delete", - "azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.get": "Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations.get", - "azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.getWithResponse": "Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations.get", - "azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.put": "Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations.put", - "azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.putWithResponse": "Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations.put", - "azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient": "Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations", - "azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.delete": "Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations.delete", - "azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.deleteWithResponse": "Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations.delete", - "azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.get": "Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations.get", - "azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.getWithResponse": "Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations.get", - "azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.put": "Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations.put", - "azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.putWithResponse": "Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations.put", - "azure.resourcemanager.methodsubscriptionid.fluent.models.OperationInner": "Azure.ResourceManager.CommonTypes.Operation", - "azure.resourcemanager.methodsubscriptionid.fluent.models.ResourceGroupResourceInner": "Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResource", - "azure.resourcemanager.methodsubscriptionid.fluent.models.SubscriptionResource1Inner": "Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1", - "azure.resourcemanager.methodsubscriptionid.fluent.models.SubscriptionResource2Inner": "Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2", - "azure.resourcemanager.methodsubscriptionid.fluent.models.SubscriptionResourceInner": "Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResource", - "azure.resourcemanager.methodsubscriptionid.implementation.MethodSubscriptionIdClientBuilder": "Azure.ResourceManager.MethodSubscriptionId", - "azure.resourcemanager.methodsubscriptionid.implementation.models.OperationListResult": "Azure.ResourceManager.CommonTypes.OperationListResult", - "azure.resourcemanager.methodsubscriptionid.models.ActionType": "Azure.ResourceManager.CommonTypes.ActionType", - "azure.resourcemanager.methodsubscriptionid.models.OperationDisplay": "Azure.ResourceManager.CommonTypes.OperationDisplay", - "azure.resourcemanager.methodsubscriptionid.models.Origin": "Azure.ResourceManager.CommonTypes.Origin", - "azure.resourcemanager.methodsubscriptionid.models.ResourceGroupResourceProperties": "Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceProperties", - "azure.resourcemanager.methodsubscriptionid.models.ResourceProvisioningState": "Azure.ResourceManager.ResourceProvisioningState", - "azure.resourcemanager.methodsubscriptionid.models.SubscriptionResource1Properties": "Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Properties", - "azure.resourcemanager.methodsubscriptionid.models.SubscriptionResource2Properties": "Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Properties", - "azure.resourcemanager.methodsubscriptionid.models.SubscriptionResourceProperties": "Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceProperties" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-methodsubscriptionid-generated_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-methodsubscriptionid-generated_metadata.json index 40c9aa31aa7..d70c559a5c2 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-methodsubscriptionid-generated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-methodsubscriptionid-generated_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2023-12-01-preview","crossLanguageDefinitions":{"azure.resourcemanager.methodsubscriptionid.fluent.MethodSubscriptionIdClient":"Azure.ResourceManager.MethodSubscriptionId","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient.delete":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations.delete","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient.deleteWithResponse":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations.delete","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient.getByResourceGroup":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations.get","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient.getByResourceGroupWithResponse":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations.get","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient.put":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations.put","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient.putWithResponse":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations.put","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient.delete":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations.delete","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient.deleteWithResponse":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations.delete","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient.get":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations.get","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient.getWithResponse":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations.get","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient.put":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations.put","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient.putWithResponse":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations.put","azure.resourcemanager.methodsubscriptionid.fluent.OperationsClient":"Azure.ResourceManager.MethodSubscriptionId.Operations","azure.resourcemanager.methodsubscriptionid.fluent.OperationsClient.list":"Azure.ResourceManager.Operations.list","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.delete":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations.delete","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.deleteWithResponse":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations.delete","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.get":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations.get","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.getWithResponse":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations.get","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.put":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations.put","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.putWithResponse":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations.put","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.delete":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations.delete","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.deleteWithResponse":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations.delete","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.get":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations.get","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.getWithResponse":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations.get","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.put":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations.put","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.putWithResponse":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations.put","azure.resourcemanager.methodsubscriptionid.fluent.models.OperationInner":"Azure.ResourceManager.CommonTypes.Operation","azure.resourcemanager.methodsubscriptionid.fluent.models.ResourceGroupResourceInner":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResource","azure.resourcemanager.methodsubscriptionid.fluent.models.SubscriptionResource1Inner":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1","azure.resourcemanager.methodsubscriptionid.fluent.models.SubscriptionResource2Inner":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2","azure.resourcemanager.methodsubscriptionid.fluent.models.SubscriptionResourceInner":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResource","azure.resourcemanager.methodsubscriptionid.implementation.MethodSubscriptionIdClientBuilder":"Azure.ResourceManager.MethodSubscriptionId","azure.resourcemanager.methodsubscriptionid.implementation.models.OperationListResult":"Azure.ResourceManager.CommonTypes.OperationListResult","azure.resourcemanager.methodsubscriptionid.models.ActionType":"Azure.ResourceManager.CommonTypes.ActionType","azure.resourcemanager.methodsubscriptionid.models.OperationDisplay":"Azure.ResourceManager.CommonTypes.OperationDisplay","azure.resourcemanager.methodsubscriptionid.models.Origin":"Azure.ResourceManager.CommonTypes.Origin","azure.resourcemanager.methodsubscriptionid.models.ResourceGroupResourceProperties":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceProperties","azure.resourcemanager.methodsubscriptionid.models.ResourceProvisioningState":"Azure.ResourceManager.ResourceProvisioningState","azure.resourcemanager.methodsubscriptionid.models.SubscriptionResource1Properties":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Properties","azure.resourcemanager.methodsubscriptionid.models.SubscriptionResource2Properties":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Properties","azure.resourcemanager.methodsubscriptionid.models.SubscriptionResourceProperties":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceProperties"},"generatedFiles":["src/main/java/azure/resourcemanager/methodsubscriptionid/MethodSubscriptionIdManager.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/MethodSubscriptionIdClient.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/MixedSubscriptionPlacementResourceGroupResourceOperationsClient.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/MixedSubscriptionPlacementSubscriptionResourceOperationsClient.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/OperationsClient.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/models/OperationInner.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/models/ResourceGroupResourceInner.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/models/SubscriptionResource1Inner.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/models/SubscriptionResource2Inner.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/models/SubscriptionResourceInner.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/models/package-info.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/package-info.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MethodSubscriptionIdClientBuilder.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MethodSubscriptionIdClientImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementResourceGroupResourceOperationsClientImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementResourceGroupResourceOperationsImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementSubscriptionResourceOperationsClientImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementSubscriptionResourceOperationsImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/OperationImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/OperationsClientImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/OperationsImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/ResourceGroupResourceImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/SubscriptionResource1Impl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/SubscriptionResource2Impl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/SubscriptionResourceImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClientImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClientImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/models/OperationListResult.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/package-info.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/ActionType.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/MixedSubscriptionPlacementResourceGroupResourceOperations.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/MixedSubscriptionPlacementSubscriptionResourceOperations.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/Operation.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/OperationDisplay.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/Operations.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/Origin.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/ResourceGroupResource.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/ResourceGroupResourceProperties.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/ResourceProvisioningState.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/SubscriptionResource.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/SubscriptionResource1.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/SubscriptionResource1Properties.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/SubscriptionResource2.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/SubscriptionResource2Properties.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/SubscriptionResourceProperties.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/TwoSubscriptionResourcesMethodLevelSubscriptionResource1Operations.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/TwoSubscriptionResourcesMethodLevelSubscriptionResource2Operations.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/package-info.java","src/main/java/azure/resourcemanager/methodsubscriptionid/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Azure.ResourceManager.MethodSubscriptionId":"2023-12-01-preview"},"crossLanguageDefinitions":{"azure.resourcemanager.methodsubscriptionid.fluent.MethodSubscriptionIdClient":"Azure.ResourceManager.MethodSubscriptionId","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient.delete":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations.delete","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient.deleteWithResponse":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations.delete","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient.getByResourceGroup":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations.get","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient.getByResourceGroupWithResponse":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations.get","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient.put":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations.put","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementResourceGroupResourceOperationsClient.putWithResponse":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceOperations.put","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient.delete":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations.delete","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient.deleteWithResponse":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations.delete","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient.get":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations.get","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient.getWithResponse":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations.get","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient.put":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations.put","azure.resourcemanager.methodsubscriptionid.fluent.MixedSubscriptionPlacementSubscriptionResourceOperationsClient.putWithResponse":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceOperations.put","azure.resourcemanager.methodsubscriptionid.fluent.OperationsClient":"Azure.ResourceManager.MethodSubscriptionId.Operations","azure.resourcemanager.methodsubscriptionid.fluent.OperationsClient.list":"Azure.ResourceManager.Operations.list","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.delete":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations.delete","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.deleteWithResponse":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations.delete","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.get":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations.get","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.getWithResponse":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations.get","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.put":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations.put","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.putWithResponse":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Operations.put","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.delete":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations.delete","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.deleteWithResponse":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations.delete","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.get":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations.get","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.getWithResponse":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations.get","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.put":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations.put","azure.resourcemanager.methodsubscriptionid.fluent.TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.putWithResponse":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Operations.put","azure.resourcemanager.methodsubscriptionid.fluent.models.OperationInner":"Azure.ResourceManager.CommonTypes.Operation","azure.resourcemanager.methodsubscriptionid.fluent.models.ResourceGroupResourceInner":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResource","azure.resourcemanager.methodsubscriptionid.fluent.models.SubscriptionResource1Inner":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1","azure.resourcemanager.methodsubscriptionid.fluent.models.SubscriptionResource2Inner":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2","azure.resourcemanager.methodsubscriptionid.fluent.models.SubscriptionResourceInner":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResource","azure.resourcemanager.methodsubscriptionid.implementation.MethodSubscriptionIdClientBuilder":"Azure.ResourceManager.MethodSubscriptionId","azure.resourcemanager.methodsubscriptionid.implementation.models.OperationListResult":"Azure.ResourceManager.CommonTypes.OperationListResult","azure.resourcemanager.methodsubscriptionid.models.ActionType":"Azure.ResourceManager.CommonTypes.ActionType","azure.resourcemanager.methodsubscriptionid.models.OperationDisplay":"Azure.ResourceManager.CommonTypes.OperationDisplay","azure.resourcemanager.methodsubscriptionid.models.Origin":"Azure.ResourceManager.CommonTypes.Origin","azure.resourcemanager.methodsubscriptionid.models.ResourceGroupResourceProperties":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.ResourceGroupResourceProperties","azure.resourcemanager.methodsubscriptionid.models.ResourceProvisioningState":"Azure.ResourceManager.ResourceProvisioningState","azure.resourcemanager.methodsubscriptionid.models.SubscriptionResource1Properties":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource1Properties","azure.resourcemanager.methodsubscriptionid.models.SubscriptionResource2Properties":"Azure.ResourceManager.MethodSubscriptionId.TwoSubscriptionResourcesMethodLevel.SubscriptionResource2Properties","azure.resourcemanager.methodsubscriptionid.models.SubscriptionResourceProperties":"Azure.ResourceManager.MethodSubscriptionId.MixedSubscriptionPlacement.SubscriptionResourceProperties"},"generatedFiles":["src/main/java/azure/resourcemanager/methodsubscriptionid/MethodSubscriptionIdManager.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/MethodSubscriptionIdClient.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/MixedSubscriptionPlacementResourceGroupResourceOperationsClient.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/MixedSubscriptionPlacementSubscriptionResourceOperationsClient.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/OperationsClient.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClient.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClient.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/models/OperationInner.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/models/ResourceGroupResourceInner.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/models/SubscriptionResource1Inner.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/models/SubscriptionResource2Inner.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/models/SubscriptionResourceInner.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/models/package-info.java","src/main/java/azure/resourcemanager/methodsubscriptionid/fluent/package-info.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MethodSubscriptionIdClientBuilder.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MethodSubscriptionIdClientImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementResourceGroupResourceOperationsClientImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementResourceGroupResourceOperationsImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementSubscriptionResourceOperationsClientImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementSubscriptionResourceOperationsImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/OperationImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/OperationsClientImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/OperationsImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/ResourceGroupResourceImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/SubscriptionResource1Impl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/SubscriptionResource2Impl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/SubscriptionResourceImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsClientImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsClientImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsImpl.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/models/OperationListResult.java","src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/package-info.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/ActionType.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/MixedSubscriptionPlacementResourceGroupResourceOperations.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/MixedSubscriptionPlacementSubscriptionResourceOperations.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/Operation.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/OperationDisplay.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/Operations.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/Origin.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/ResourceGroupResource.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/ResourceGroupResourceProperties.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/ResourceProvisioningState.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/SubscriptionResource.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/SubscriptionResource1.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/SubscriptionResource1Properties.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/SubscriptionResource2.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/SubscriptionResource2Properties.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/SubscriptionResourceProperties.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/TwoSubscriptionResourcesMethodLevelSubscriptionResource1Operations.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/TwoSubscriptionResourcesMethodLevelSubscriptionResource2Operations.java","src/main/java/azure/resourcemanager/methodsubscriptionid/models/package-info.java","src/main/java/azure/resourcemanager/methodsubscriptionid/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-nonresource-generated_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-nonresource-generated_apiview_properties.json deleted file mode 100644 index 0128abdd54d..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-nonresource-generated_apiview_properties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.resourcemanager.nonresource.fluent.NonResourceClient": "Azure.ResourceManager.NonResource", - "azure.resourcemanager.nonresource.fluent.NonResourceOperationsClient": "Azure.ResourceManager.NonResource.NonResourceOperations", - "azure.resourcemanager.nonresource.fluent.NonResourceOperationsClient.create": "Azure.ResourceManager.NonResource.NonResourceOperations.create", - "azure.resourcemanager.nonresource.fluent.NonResourceOperationsClient.createWithResponse": "Azure.ResourceManager.NonResource.NonResourceOperations.create", - "azure.resourcemanager.nonresource.fluent.NonResourceOperationsClient.get": "Azure.ResourceManager.NonResource.NonResourceOperations.get", - "azure.resourcemanager.nonresource.fluent.NonResourceOperationsClient.getWithResponse": "Azure.ResourceManager.NonResource.NonResourceOperations.get", - "azure.resourcemanager.nonresource.fluent.models.NonResourceInner": "Azure.ResourceManager.NonResource.NonResource", - "azure.resourcemanager.nonresource.implementation.NonResourceClientBuilder": "Azure.ResourceManager.NonResource" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-nonresource-generated_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-nonresource-generated_metadata.json index f06e8dd7c98..0a94e8cbe77 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-nonresource-generated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-nonresource-generated_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2023-12-01-preview","crossLanguageDefinitions":{"azure.resourcemanager.nonresource.fluent.NonResourceClient":"Azure.ResourceManager.NonResource","azure.resourcemanager.nonresource.fluent.NonResourceOperationsClient":"Azure.ResourceManager.NonResource.NonResourceOperations","azure.resourcemanager.nonresource.fluent.NonResourceOperationsClient.create":"Azure.ResourceManager.NonResource.NonResourceOperations.create","azure.resourcemanager.nonresource.fluent.NonResourceOperationsClient.createWithResponse":"Azure.ResourceManager.NonResource.NonResourceOperations.create","azure.resourcemanager.nonresource.fluent.NonResourceOperationsClient.get":"Azure.ResourceManager.NonResource.NonResourceOperations.get","azure.resourcemanager.nonresource.fluent.NonResourceOperationsClient.getWithResponse":"Azure.ResourceManager.NonResource.NonResourceOperations.get","azure.resourcemanager.nonresource.fluent.models.NonResourceInner":"Azure.ResourceManager.NonResource.NonResource","azure.resourcemanager.nonresource.implementation.NonResourceClientBuilder":"Azure.ResourceManager.NonResource"},"generatedFiles":["src/main/java/azure/resourcemanager/nonresource/NonResourceManager.java","src/main/java/azure/resourcemanager/nonresource/fluent/NonResourceClient.java","src/main/java/azure/resourcemanager/nonresource/fluent/NonResourceOperationsClient.java","src/main/java/azure/resourcemanager/nonresource/fluent/models/NonResourceInner.java","src/main/java/azure/resourcemanager/nonresource/fluent/models/package-info.java","src/main/java/azure/resourcemanager/nonresource/fluent/package-info.java","src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceClientBuilder.java","src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceClientImpl.java","src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceImpl.java","src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceOperationsClientImpl.java","src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceOperationsImpl.java","src/main/java/azure/resourcemanager/nonresource/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/nonresource/implementation/package-info.java","src/main/java/azure/resourcemanager/nonresource/models/NonResource.java","src/main/java/azure/resourcemanager/nonresource/models/NonResourceOperations.java","src/main/java/azure/resourcemanager/nonresource/models/package-info.java","src/main/java/azure/resourcemanager/nonresource/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Azure.ResourceManager.NonResource":"2023-12-01-preview"},"crossLanguageDefinitions":{"azure.resourcemanager.nonresource.fluent.NonResourceClient":"Azure.ResourceManager.NonResource","azure.resourcemanager.nonresource.fluent.NonResourceOperationsClient":"Azure.ResourceManager.NonResource.NonResourceOperations","azure.resourcemanager.nonresource.fluent.NonResourceOperationsClient.create":"Azure.ResourceManager.NonResource.NonResourceOperations.create","azure.resourcemanager.nonresource.fluent.NonResourceOperationsClient.createWithResponse":"Azure.ResourceManager.NonResource.NonResourceOperations.create","azure.resourcemanager.nonresource.fluent.NonResourceOperationsClient.get":"Azure.ResourceManager.NonResource.NonResourceOperations.get","azure.resourcemanager.nonresource.fluent.NonResourceOperationsClient.getWithResponse":"Azure.ResourceManager.NonResource.NonResourceOperations.get","azure.resourcemanager.nonresource.fluent.models.NonResourceInner":"Azure.ResourceManager.NonResource.NonResource","azure.resourcemanager.nonresource.implementation.NonResourceClientBuilder":"Azure.ResourceManager.NonResource"},"generatedFiles":["src/main/java/azure/resourcemanager/nonresource/NonResourceManager.java","src/main/java/azure/resourcemanager/nonresource/fluent/NonResourceClient.java","src/main/java/azure/resourcemanager/nonresource/fluent/NonResourceOperationsClient.java","src/main/java/azure/resourcemanager/nonresource/fluent/models/NonResourceInner.java","src/main/java/azure/resourcemanager/nonresource/fluent/models/package-info.java","src/main/java/azure/resourcemanager/nonresource/fluent/package-info.java","src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceClientBuilder.java","src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceClientImpl.java","src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceImpl.java","src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceOperationsClientImpl.java","src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceOperationsImpl.java","src/main/java/azure/resourcemanager/nonresource/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/nonresource/implementation/package-info.java","src/main/java/azure/resourcemanager/nonresource/models/NonResource.java","src/main/java/azure/resourcemanager/nonresource/models/NonResourceOperations.java","src/main/java/azure/resourcemanager/nonresource/models/package-info.java","src/main/java/azure/resourcemanager/nonresource/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-operationtemplates-generated_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-operationtemplates-generated_apiview_properties.json deleted file mode 100644 index 8d43fc5d89c..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-operationtemplates-generated_apiview_properties.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient": "Azure.ResourceManager.OperationTemplates.CheckNameAvailability", - "azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkGlobal": "Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkGlobal", - "azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkGlobalWithResponse": "Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkGlobal", - "azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkLocal": "Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkLocal", - "azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkLocalWithResponse": "Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkLocal", - "azure.resourcemanager.operationtemplates.fluent.LroPagingsClient": "Azure.ResourceManager.OperationTemplates.LroPaging", - "azure.resourcemanager.operationtemplates.fluent.LroPagingsClient.postPagingLro": "Azure.ResourceManager.OperationTemplates.LroPaging.postPagingLro", - "azure.resourcemanager.operationtemplates.fluent.LroesClient": "Azure.ResourceManager.OperationTemplates.Lro", - "azure.resourcemanager.operationtemplates.fluent.LroesClient.beginCreateOrReplace": "Azure.ResourceManager.OperationTemplates.Lro.createOrReplace", - "azure.resourcemanager.operationtemplates.fluent.LroesClient.beginDelete": "Azure.ResourceManager.OperationTemplates.Lro.delete", - "azure.resourcemanager.operationtemplates.fluent.LroesClient.beginExport": "Azure.ResourceManager.OperationTemplates.Lro.export", - "azure.resourcemanager.operationtemplates.fluent.LroesClient.createOrReplace": "Azure.ResourceManager.OperationTemplates.Lro.createOrReplace", - "azure.resourcemanager.operationtemplates.fluent.LroesClient.delete": "Azure.ResourceManager.OperationTemplates.Lro.delete", - "azure.resourcemanager.operationtemplates.fluent.LroesClient.export": "Azure.ResourceManager.OperationTemplates.Lro.export", - "azure.resourcemanager.operationtemplates.fluent.OperationTemplatesClient": "Azure.ResourceManager.OperationTemplates", - "azure.resourcemanager.operationtemplates.fluent.OperationsClient": "Azure.ResourceManager.OperationTemplates.Operations", - "azure.resourcemanager.operationtemplates.fluent.OperationsClient.list": "Azure.ResourceManager.Operations.list", - "azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient": "Azure.ResourceManager.OperationTemplates.OptionalBody", - "azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.getByResourceGroup": "Azure.ResourceManager.OperationTemplates.OptionalBody.get", - "azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.getByResourceGroupWithResponse": "Azure.ResourceManager.OperationTemplates.OptionalBody.get", - "azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.patch": "Azure.ResourceManager.OperationTemplates.OptionalBody.patch", - "azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.patchWithResponse": "Azure.ResourceManager.OperationTemplates.OptionalBody.patch", - "azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.post": "Azure.ResourceManager.OperationTemplates.OptionalBody.post", - "azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.postWithResponse": "Azure.ResourceManager.OperationTemplates.OptionalBody.post", - "azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.providerPost": "Azure.ResourceManager.OperationTemplates.OptionalBody.providerPost", - "azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.providerPostWithResponse": "Azure.ResourceManager.OperationTemplates.OptionalBody.providerPost", - "azure.resourcemanager.operationtemplates.fluent.models.ActionResultInner": "Azure.ResourceManager.OperationTemplates.ActionResult", - "azure.resourcemanager.operationtemplates.fluent.models.ChangeAllowanceResultInner": "Azure.ResourceManager.OperationTemplates.ChangeAllowanceResult", - "azure.resourcemanager.operationtemplates.fluent.models.CheckNameAvailabilityResponseInner": "Azure.ResourceManager.CommonTypes.CheckNameAvailabilityResponse", - "azure.resourcemanager.operationtemplates.fluent.models.ExportResultInner": "Azure.ResourceManager.OperationTemplates.ExportResult", - "azure.resourcemanager.operationtemplates.fluent.models.OperationInner": "Azure.ResourceManager.CommonTypes.Operation", - "azure.resourcemanager.operationtemplates.fluent.models.OrderInner": "Azure.ResourceManager.OperationTemplates.Order", - "azure.resourcemanager.operationtemplates.fluent.models.ProductInner": "Azure.ResourceManager.OperationTemplates.Product", - "azure.resourcemanager.operationtemplates.fluent.models.WidgetInner": "Azure.ResourceManager.OperationTemplates.Widget", - "azure.resourcemanager.operationtemplates.implementation.OperationTemplatesClientBuilder": "Azure.ResourceManager.OperationTemplates", - "azure.resourcemanager.operationtemplates.implementation.models.OperationListResult": "Azure.ResourceManager.CommonTypes.OperationListResult", - "azure.resourcemanager.operationtemplates.implementation.models.ProductListResult": "Azure.ResourceManager.OperationTemplates.ProductListResult", - "azure.resourcemanager.operationtemplates.models.ActionRequest": "Azure.ResourceManager.OperationTemplates.ActionRequest", - "azure.resourcemanager.operationtemplates.models.ActionType": "Azure.ResourceManager.CommonTypes.ActionType", - "azure.resourcemanager.operationtemplates.models.ChangeAllowanceRequest": "Azure.ResourceManager.OperationTemplates.ChangeAllowanceRequest", - "azure.resourcemanager.operationtemplates.models.CheckNameAvailabilityReason": "Azure.ResourceManager.CommonTypes.CheckNameAvailabilityReason", - "azure.resourcemanager.operationtemplates.models.CheckNameAvailabilityRequest": "Azure.ResourceManager.CommonTypes.CheckNameAvailabilityRequest", - "azure.resourcemanager.operationtemplates.models.ExportRequest": "Azure.ResourceManager.OperationTemplates.ExportRequest", - "azure.resourcemanager.operationtemplates.models.OperationDisplay": "Azure.ResourceManager.CommonTypes.OperationDisplay", - "azure.resourcemanager.operationtemplates.models.OrderProperties": "Azure.ResourceManager.OperationTemplates.OrderProperties", - "azure.resourcemanager.operationtemplates.models.Origin": "Azure.ResourceManager.CommonTypes.Origin", - "azure.resourcemanager.operationtemplates.models.ProductProperties": "Azure.ResourceManager.OperationTemplates.ProductProperties", - "azure.resourcemanager.operationtemplates.models.WidgetProperties": "Azure.ResourceManager.OperationTemplates.WidgetProperties" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-operationtemplates-generated_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-operationtemplates-generated_metadata.json index 599bef539cb..736ac7b86c0 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-operationtemplates-generated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-operationtemplates-generated_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2023-12-01-preview","crossLanguageDefinitions":{"azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkGlobal":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkGlobal","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkGlobalWithResponse":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkGlobal","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkLocal":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkLocal","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkLocalWithResponse":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkLocal","azure.resourcemanager.operationtemplates.fluent.LroPagingsClient":"Azure.ResourceManager.OperationTemplates.LroPaging","azure.resourcemanager.operationtemplates.fluent.LroPagingsClient.postPagingLro":"Azure.ResourceManager.OperationTemplates.LroPaging.postPagingLro","azure.resourcemanager.operationtemplates.fluent.LroesClient":"Azure.ResourceManager.OperationTemplates.Lro","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginCreateOrReplace":"Azure.ResourceManager.OperationTemplates.Lro.createOrReplace","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginDelete":"Azure.ResourceManager.OperationTemplates.Lro.delete","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginExport":"Azure.ResourceManager.OperationTemplates.Lro.export","azure.resourcemanager.operationtemplates.fluent.LroesClient.createOrReplace":"Azure.ResourceManager.OperationTemplates.Lro.createOrReplace","azure.resourcemanager.operationtemplates.fluent.LroesClient.delete":"Azure.ResourceManager.OperationTemplates.Lro.delete","azure.resourcemanager.operationtemplates.fluent.LroesClient.export":"Azure.ResourceManager.OperationTemplates.Lro.export","azure.resourcemanager.operationtemplates.fluent.OperationTemplatesClient":"Azure.ResourceManager.OperationTemplates","azure.resourcemanager.operationtemplates.fluent.OperationsClient":"Azure.ResourceManager.OperationTemplates.Operations","azure.resourcemanager.operationtemplates.fluent.OperationsClient.list":"Azure.ResourceManager.Operations.list","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient":"Azure.ResourceManager.OperationTemplates.OptionalBody","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.getByResourceGroup":"Azure.ResourceManager.OperationTemplates.OptionalBody.get","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.getByResourceGroupWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.get","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.patch":"Azure.ResourceManager.OperationTemplates.OptionalBody.patch","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.patchWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.patch","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.post":"Azure.ResourceManager.OperationTemplates.OptionalBody.post","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.postWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.post","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.providerPost":"Azure.ResourceManager.OperationTemplates.OptionalBody.providerPost","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.providerPostWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.providerPost","azure.resourcemanager.operationtemplates.fluent.models.ActionResultInner":"Azure.ResourceManager.OperationTemplates.ActionResult","azure.resourcemanager.operationtemplates.fluent.models.ChangeAllowanceResultInner":"Azure.ResourceManager.OperationTemplates.ChangeAllowanceResult","azure.resourcemanager.operationtemplates.fluent.models.CheckNameAvailabilityResponseInner":"Azure.ResourceManager.CommonTypes.CheckNameAvailabilityResponse","azure.resourcemanager.operationtemplates.fluent.models.ExportResultInner":"Azure.ResourceManager.OperationTemplates.ExportResult","azure.resourcemanager.operationtemplates.fluent.models.OperationInner":"Azure.ResourceManager.CommonTypes.Operation","azure.resourcemanager.operationtemplates.fluent.models.OrderInner":"Azure.ResourceManager.OperationTemplates.Order","azure.resourcemanager.operationtemplates.fluent.models.ProductInner":"Azure.ResourceManager.OperationTemplates.Product","azure.resourcemanager.operationtemplates.fluent.models.WidgetInner":"Azure.ResourceManager.OperationTemplates.Widget","azure.resourcemanager.operationtemplates.implementation.OperationTemplatesClientBuilder":"Azure.ResourceManager.OperationTemplates","azure.resourcemanager.operationtemplates.implementation.models.OperationListResult":"Azure.ResourceManager.CommonTypes.OperationListResult","azure.resourcemanager.operationtemplates.implementation.models.ProductListResult":"Azure.ResourceManager.OperationTemplates.ProductListResult","azure.resourcemanager.operationtemplates.models.ActionRequest":"Azure.ResourceManager.OperationTemplates.ActionRequest","azure.resourcemanager.operationtemplates.models.ActionType":"Azure.ResourceManager.CommonTypes.ActionType","azure.resourcemanager.operationtemplates.models.ChangeAllowanceRequest":"Azure.ResourceManager.OperationTemplates.ChangeAllowanceRequest","azure.resourcemanager.operationtemplates.models.CheckNameAvailabilityReason":"Azure.ResourceManager.CommonTypes.CheckNameAvailabilityReason","azure.resourcemanager.operationtemplates.models.CheckNameAvailabilityRequest":"Azure.ResourceManager.CommonTypes.CheckNameAvailabilityRequest","azure.resourcemanager.operationtemplates.models.ExportRequest":"Azure.ResourceManager.OperationTemplates.ExportRequest","azure.resourcemanager.operationtemplates.models.OperationDisplay":"Azure.ResourceManager.CommonTypes.OperationDisplay","azure.resourcemanager.operationtemplates.models.OrderProperties":"Azure.ResourceManager.OperationTemplates.OrderProperties","azure.resourcemanager.operationtemplates.models.Origin":"Azure.ResourceManager.CommonTypes.Origin","azure.resourcemanager.operationtemplates.models.ProductProperties":"Azure.ResourceManager.OperationTemplates.ProductProperties","azure.resourcemanager.operationtemplates.models.WidgetProperties":"Azure.ResourceManager.OperationTemplates.WidgetProperties"},"generatedFiles":["src/main/java/azure/resourcemanager/operationtemplates/OperationTemplatesManager.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/CheckNameAvailabilitiesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/LroPagingsClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/LroesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/OperationTemplatesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/OperationsClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/OptionalBodiesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ActionResultInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ChangeAllowanceResultInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/CheckNameAvailabilityResponseInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ExportResultInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/OperationInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/OrderInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ProductInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/WidgetInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ActionResultImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ChangeAllowanceResultImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilityResponseImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ExportResultImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationTemplatesClientBuilder.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationTemplatesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationsClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationsImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OrderImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ProductImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/WidgetImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/models/OperationListResult.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/models/ProductListResult.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/models/ActionRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/ActionResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/ActionType.java","src/main/java/azure/resourcemanager/operationtemplates/models/ChangeAllowanceRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/ChangeAllowanceResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilities.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilityReason.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilityRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilityResponse.java","src/main/java/azure/resourcemanager/operationtemplates/models/ExportRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/ExportResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/LroPagings.java","src/main/java/azure/resourcemanager/operationtemplates/models/Lroes.java","src/main/java/azure/resourcemanager/operationtemplates/models/Operation.java","src/main/java/azure/resourcemanager/operationtemplates/models/OperationDisplay.java","src/main/java/azure/resourcemanager/operationtemplates/models/Operations.java","src/main/java/azure/resourcemanager/operationtemplates/models/OptionalBodies.java","src/main/java/azure/resourcemanager/operationtemplates/models/Order.java","src/main/java/azure/resourcemanager/operationtemplates/models/OrderProperties.java","src/main/java/azure/resourcemanager/operationtemplates/models/Origin.java","src/main/java/azure/resourcemanager/operationtemplates/models/Product.java","src/main/java/azure/resourcemanager/operationtemplates/models/ProductProperties.java","src/main/java/azure/resourcemanager/operationtemplates/models/Widget.java","src/main/java/azure/resourcemanager/operationtemplates/models/WidgetProperties.java","src/main/java/azure/resourcemanager/operationtemplates/models/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Azure.ResourceManager.OperationTemplates":"2023-12-01-preview"},"crossLanguageDefinitions":{"azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkGlobal":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkGlobal","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkGlobalWithResponse":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkGlobal","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkLocal":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkLocal","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkLocalWithResponse":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkLocal","azure.resourcemanager.operationtemplates.fluent.LroPagingsClient":"Azure.ResourceManager.OperationTemplates.LroPaging","azure.resourcemanager.operationtemplates.fluent.LroPagingsClient.postPagingLro":"Azure.ResourceManager.OperationTemplates.LroPaging.postPagingLro","azure.resourcemanager.operationtemplates.fluent.LroesClient":"Azure.ResourceManager.OperationTemplates.Lro","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginCreateOrReplace":"Azure.ResourceManager.OperationTemplates.Lro.createOrReplace","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginDelete":"Azure.ResourceManager.OperationTemplates.Lro.delete","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginExport":"Azure.ResourceManager.OperationTemplates.Lro.export","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginExportArray":"Azure.ResourceManager.OperationTemplates.Lro.exportArray","azure.resourcemanager.operationtemplates.fluent.LroesClient.createOrReplace":"Azure.ResourceManager.OperationTemplates.Lro.createOrReplace","azure.resourcemanager.operationtemplates.fluent.LroesClient.delete":"Azure.ResourceManager.OperationTemplates.Lro.delete","azure.resourcemanager.operationtemplates.fluent.LroesClient.export":"Azure.ResourceManager.OperationTemplates.Lro.export","azure.resourcemanager.operationtemplates.fluent.LroesClient.exportArray":"Azure.ResourceManager.OperationTemplates.Lro.exportArray","azure.resourcemanager.operationtemplates.fluent.OperationTemplatesClient":"Azure.ResourceManager.OperationTemplates","azure.resourcemanager.operationtemplates.fluent.OperationsClient":"Azure.ResourceManager.OperationTemplates.Operations","azure.resourcemanager.operationtemplates.fluent.OperationsClient.list":"Azure.ResourceManager.Operations.list","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient":"Azure.ResourceManager.OperationTemplates.OptionalBody","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.getByResourceGroup":"Azure.ResourceManager.OperationTemplates.OptionalBody.get","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.getByResourceGroupWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.get","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.patch":"Azure.ResourceManager.OperationTemplates.OptionalBody.patch","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.patchWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.patch","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.post":"Azure.ResourceManager.OperationTemplates.OptionalBody.post","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.postWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.post","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.providerPost":"Azure.ResourceManager.OperationTemplates.OptionalBody.providerPost","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.providerPostWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.providerPost","azure.resourcemanager.operationtemplates.fluent.models.ActionResultInner":"Azure.ResourceManager.OperationTemplates.ActionResult","azure.resourcemanager.operationtemplates.fluent.models.ChangeAllowanceResultInner":"Azure.ResourceManager.OperationTemplates.ChangeAllowanceResult","azure.resourcemanager.operationtemplates.fluent.models.CheckNameAvailabilityResponseInner":"Azure.ResourceManager.CommonTypes.CheckNameAvailabilityResponse","azure.resourcemanager.operationtemplates.fluent.models.ExportResultInner":"Azure.ResourceManager.OperationTemplates.ExportResult","azure.resourcemanager.operationtemplates.fluent.models.OperationInner":"Azure.ResourceManager.CommonTypes.Operation","azure.resourcemanager.operationtemplates.fluent.models.OrderInner":"Azure.ResourceManager.OperationTemplates.Order","azure.resourcemanager.operationtemplates.fluent.models.ProductInner":"Azure.ResourceManager.OperationTemplates.Product","azure.resourcemanager.operationtemplates.fluent.models.WidgetInner":"Azure.ResourceManager.OperationTemplates.Widget","azure.resourcemanager.operationtemplates.implementation.OperationTemplatesClientBuilder":"Azure.ResourceManager.OperationTemplates","azure.resourcemanager.operationtemplates.implementation.models.OperationListResult":"Azure.ResourceManager.CommonTypes.OperationListResult","azure.resourcemanager.operationtemplates.implementation.models.ProductListResult":"Azure.ResourceManager.OperationTemplates.ProductListResult","azure.resourcemanager.operationtemplates.models.ActionRequest":"Azure.ResourceManager.OperationTemplates.ActionRequest","azure.resourcemanager.operationtemplates.models.ActionType":"Azure.ResourceManager.CommonTypes.ActionType","azure.resourcemanager.operationtemplates.models.ChangeAllowanceRequest":"Azure.ResourceManager.OperationTemplates.ChangeAllowanceRequest","azure.resourcemanager.operationtemplates.models.CheckNameAvailabilityReason":"Azure.ResourceManager.CommonTypes.CheckNameAvailabilityReason","azure.resourcemanager.operationtemplates.models.CheckNameAvailabilityRequest":"Azure.ResourceManager.CommonTypes.CheckNameAvailabilityRequest","azure.resourcemanager.operationtemplates.models.ExportRequest":"Azure.ResourceManager.OperationTemplates.ExportRequest","azure.resourcemanager.operationtemplates.models.OperationDisplay":"Azure.ResourceManager.CommonTypes.OperationDisplay","azure.resourcemanager.operationtemplates.models.OrderProperties":"Azure.ResourceManager.OperationTemplates.OrderProperties","azure.resourcemanager.operationtemplates.models.Origin":"Azure.ResourceManager.CommonTypes.Origin","azure.resourcemanager.operationtemplates.models.ProductProperties":"Azure.ResourceManager.OperationTemplates.ProductProperties","azure.resourcemanager.operationtemplates.models.WidgetProperties":"Azure.ResourceManager.OperationTemplates.WidgetProperties"},"generatedFiles":["src/main/java/azure/resourcemanager/operationtemplates/OperationTemplatesManager.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/CheckNameAvailabilitiesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/LroPagingsClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/LroesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/OperationTemplatesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/OperationsClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/OptionalBodiesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ActionResultInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ChangeAllowanceResultInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/CheckNameAvailabilityResponseInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ExportResultInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/OperationInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/OrderInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ProductInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/WidgetInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ActionResultImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ChangeAllowanceResultImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilityResponseImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ExportResultImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationTemplatesClientBuilder.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationTemplatesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationsClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationsImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OrderImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ProductImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/WidgetImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/models/OperationListResult.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/models/ProductListResult.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/models/ActionRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/ActionResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/ActionType.java","src/main/java/azure/resourcemanager/operationtemplates/models/ChangeAllowanceRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/ChangeAllowanceResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilities.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilityReason.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilityRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilityResponse.java","src/main/java/azure/resourcemanager/operationtemplates/models/ExportRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/ExportResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/LroPagings.java","src/main/java/azure/resourcemanager/operationtemplates/models/Lroes.java","src/main/java/azure/resourcemanager/operationtemplates/models/Operation.java","src/main/java/azure/resourcemanager/operationtemplates/models/OperationDisplay.java","src/main/java/azure/resourcemanager/operationtemplates/models/Operations.java","src/main/java/azure/resourcemanager/operationtemplates/models/OptionalBodies.java","src/main/java/azure/resourcemanager/operationtemplates/models/Order.java","src/main/java/azure/resourcemanager/operationtemplates/models/OrderProperties.java","src/main/java/azure/resourcemanager/operationtemplates/models/Origin.java","src/main/java/azure/resourcemanager/operationtemplates/models/Product.java","src/main/java/azure/resourcemanager/operationtemplates/models/ProductProperties.java","src/main/java/azure/resourcemanager/operationtemplates/models/Widget.java","src/main/java/azure/resourcemanager/operationtemplates/models/WidgetProperties.java","src/main/java/azure/resourcemanager/operationtemplates/models/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-resources-generated_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-resources-generated_apiview_properties.json deleted file mode 100644 index 817067252c9..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-resources-generated_apiview_properties.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.resourcemanager.resources.fluent.ExtensionsResourcesClient": "Azure.ResourceManager.Resources.ExtensionsResources", - "azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.beginCreateOrUpdate": "Azure.ResourceManager.Resources.ExtensionsResources.createOrUpdate", - "azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.createOrUpdate": "Azure.ResourceManager.Resources.ExtensionsResources.createOrUpdate", - "azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.delete": "Azure.ResourceManager.Resources.ExtensionsResources.delete", - "azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.deleteWithResponse": "Azure.ResourceManager.Resources.ExtensionsResources.delete", - "azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.get": "Azure.ResourceManager.Resources.ExtensionsResources.get", - "azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.getWithResponse": "Azure.ResourceManager.Resources.ExtensionsResources.get", - "azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.listByScope": "Azure.ResourceManager.Resources.ExtensionsResources.listByScope", - "azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.update": "Azure.ResourceManager.Resources.ExtensionsResources.update", - "azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.updateWithResponse": "Azure.ResourceManager.Resources.ExtensionsResources.update", - "azure.resourcemanager.resources.fluent.LocationResourcesClient": "Azure.ResourceManager.Resources.LocationResources", - "azure.resourcemanager.resources.fluent.LocationResourcesClient.createOrUpdate": "Azure.ResourceManager.Resources.LocationResources.createOrUpdate", - "azure.resourcemanager.resources.fluent.LocationResourcesClient.createOrUpdateWithResponse": "Azure.ResourceManager.Resources.LocationResources.createOrUpdate", - "azure.resourcemanager.resources.fluent.LocationResourcesClient.delete": "Azure.ResourceManager.Resources.LocationResources.delete", - "azure.resourcemanager.resources.fluent.LocationResourcesClient.deleteWithResponse": "Azure.ResourceManager.Resources.LocationResources.delete", - "azure.resourcemanager.resources.fluent.LocationResourcesClient.get": "Azure.ResourceManager.Resources.LocationResources.get", - "azure.resourcemanager.resources.fluent.LocationResourcesClient.getWithResponse": "Azure.ResourceManager.Resources.LocationResources.get", - "azure.resourcemanager.resources.fluent.LocationResourcesClient.listByLocation": "Azure.ResourceManager.Resources.LocationResources.listByLocation", - "azure.resourcemanager.resources.fluent.LocationResourcesClient.update": "Azure.ResourceManager.Resources.LocationResources.update", - "azure.resourcemanager.resources.fluent.LocationResourcesClient.updateWithResponse": "Azure.ResourceManager.Resources.LocationResources.update", - "azure.resourcemanager.resources.fluent.NestedsClient": "Azure.ResourceManager.Resources.Nested", - "azure.resourcemanager.resources.fluent.NestedsClient.beginCreateOrReplace": "Azure.ResourceManager.Resources.Nested.createOrReplace", - "azure.resourcemanager.resources.fluent.NestedsClient.beginDelete": "Azure.ResourceManager.Resources.Nested.delete", - "azure.resourcemanager.resources.fluent.NestedsClient.beginUpdate": "Azure.ResourceManager.Resources.Nested.update", - "azure.resourcemanager.resources.fluent.NestedsClient.createOrReplace": "Azure.ResourceManager.Resources.Nested.createOrReplace", - "azure.resourcemanager.resources.fluent.NestedsClient.delete": "Azure.ResourceManager.Resources.Nested.delete", - "azure.resourcemanager.resources.fluent.NestedsClient.get": "Azure.ResourceManager.Resources.Nested.get", - "azure.resourcemanager.resources.fluent.NestedsClient.getWithResponse": "Azure.ResourceManager.Resources.Nested.get", - "azure.resourcemanager.resources.fluent.NestedsClient.listByTopLevelTrackedResource": "Azure.ResourceManager.Resources.Nested.listByTopLevelTrackedResource", - "azure.resourcemanager.resources.fluent.NestedsClient.update": "Azure.ResourceManager.Resources.Nested.update", - "azure.resourcemanager.resources.fluent.ResourcesClient": "Azure.ResourceManager.Resources", - "azure.resourcemanager.resources.fluent.SingletonsClient": "Azure.ResourceManager.Resources.Singleton", - "azure.resourcemanager.resources.fluent.SingletonsClient.beginCreateOrUpdate": "Azure.ResourceManager.Resources.Singleton.createOrUpdate", - "azure.resourcemanager.resources.fluent.SingletonsClient.createOrUpdate": "Azure.ResourceManager.Resources.Singleton.createOrUpdate", - "azure.resourcemanager.resources.fluent.SingletonsClient.getByResourceGroup": "Azure.ResourceManager.Resources.Singleton.getByResourceGroup", - "azure.resourcemanager.resources.fluent.SingletonsClient.getByResourceGroupWithResponse": "Azure.ResourceManager.Resources.Singleton.getByResourceGroup", - "azure.resourcemanager.resources.fluent.SingletonsClient.listByResourceGroup": "Azure.ResourceManager.Resources.Singleton.listByResourceGroup", - "azure.resourcemanager.resources.fluent.SingletonsClient.update": "Azure.ResourceManager.Resources.Singleton.update", - "azure.resourcemanager.resources.fluent.SingletonsClient.updateWithResponse": "Azure.ResourceManager.Resources.Singleton.update", - "azure.resourcemanager.resources.fluent.TopLevelsClient": "Azure.ResourceManager.Resources.TopLevel", - "azure.resourcemanager.resources.fluent.TopLevelsClient.actionSync": "Azure.ResourceManager.Resources.TopLevel.actionSync", - "azure.resourcemanager.resources.fluent.TopLevelsClient.actionSyncWithResponse": "Azure.ResourceManager.Resources.TopLevel.actionSync", - "azure.resourcemanager.resources.fluent.TopLevelsClient.beginCreateOrReplace": "Azure.ResourceManager.Resources.TopLevel.createOrReplace", - "azure.resourcemanager.resources.fluent.TopLevelsClient.beginDelete": "Azure.ResourceManager.Resources.TopLevel.delete", - "azure.resourcemanager.resources.fluent.TopLevelsClient.beginUpdate": "Azure.ResourceManager.Resources.TopLevel.update", - "azure.resourcemanager.resources.fluent.TopLevelsClient.createOrReplace": "Azure.ResourceManager.Resources.TopLevel.createOrReplace", - "azure.resourcemanager.resources.fluent.TopLevelsClient.delete": "Azure.ResourceManager.Resources.TopLevel.delete", - "azure.resourcemanager.resources.fluent.TopLevelsClient.getByResourceGroup": "Azure.ResourceManager.Resources.TopLevel.get", - "azure.resourcemanager.resources.fluent.TopLevelsClient.getByResourceGroupWithResponse": "Azure.ResourceManager.Resources.TopLevel.get", - "azure.resourcemanager.resources.fluent.TopLevelsClient.list": "Azure.ResourceManager.Resources.TopLevel.listBySubscription", - "azure.resourcemanager.resources.fluent.TopLevelsClient.listByResourceGroup": "Azure.ResourceManager.Resources.TopLevel.listByResourceGroup", - "azure.resourcemanager.resources.fluent.TopLevelsClient.update": "Azure.ResourceManager.Resources.TopLevel.update", - "azure.resourcemanager.resources.fluent.models.ExtensionsResourceInner": "Azure.ResourceManager.Resources.ExtensionsResource", - "azure.resourcemanager.resources.fluent.models.LocationResourceInner": "Azure.ResourceManager.Resources.LocationResource", - "azure.resourcemanager.resources.fluent.models.NestedProxyResourceInner": "Azure.ResourceManager.Resources.NestedProxyResource", - "azure.resourcemanager.resources.fluent.models.SingletonTrackedResourceInner": "Azure.ResourceManager.Resources.SingletonTrackedResource", - "azure.resourcemanager.resources.fluent.models.TopLevelTrackedResourceInner": "Azure.ResourceManager.Resources.TopLevelTrackedResource", - "azure.resourcemanager.resources.implementation.ResourcesClientBuilder": "Azure.ResourceManager.Resources", - "azure.resourcemanager.resources.implementation.models.ExtensionsResourceListResult": "Azure.ResourceManager.ResourceListResult", - "azure.resourcemanager.resources.implementation.models.LocationResourceListResult": "Azure.ResourceManager.ResourceListResult", - "azure.resourcemanager.resources.implementation.models.NestedProxyResourceListResult": "Azure.ResourceManager.ResourceListResult", - "azure.resourcemanager.resources.implementation.models.SingletonTrackedResourceListResult": "Azure.ResourceManager.ResourceListResult", - "azure.resourcemanager.resources.implementation.models.TopLevelTrackedResourceListResult": "Azure.ResourceManager.ResourceListResult", - "azure.resourcemanager.resources.models.ExtensionsResourceProperties": "Azure.ResourceManager.Resources.ExtensionsResourceProperties", - "azure.resourcemanager.resources.models.LocationResourceProperties": "Azure.ResourceManager.Resources.LocationResourceProperties", - "azure.resourcemanager.resources.models.NestedProxyResourceProperties": "Azure.ResourceManager.Resources.NestedProxyResourceProperties", - "azure.resourcemanager.resources.models.NotificationDetails": "Azure.ResourceManager.Resources.NotificationDetails", - "azure.resourcemanager.resources.models.ProvisioningState": "Azure.ResourceManager.Resources.ProvisioningState", - "azure.resourcemanager.resources.models.SingletonTrackedResourceProperties": "Azure.ResourceManager.Resources.SingletonTrackedResourceProperties", - "azure.resourcemanager.resources.models.TopLevelTrackedResourceProperties": "Azure.ResourceManager.Resources.TopLevelTrackedResourceProperties" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-resources-generated_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-resources-generated_metadata.json index bf88404e1d9..91b01d26f73 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-resources-generated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-resources-generated_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2023-12-01-preview","crossLanguageDefinitions":{"azure.resourcemanager.resources.fluent.ExtensionsResourcesClient":"Azure.ResourceManager.Resources.ExtensionsResources","azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.beginCreateOrUpdate":"Azure.ResourceManager.Resources.ExtensionsResources.createOrUpdate","azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.createOrUpdate":"Azure.ResourceManager.Resources.ExtensionsResources.createOrUpdate","azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.delete":"Azure.ResourceManager.Resources.ExtensionsResources.delete","azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.deleteWithResponse":"Azure.ResourceManager.Resources.ExtensionsResources.delete","azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.get":"Azure.ResourceManager.Resources.ExtensionsResources.get","azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.getWithResponse":"Azure.ResourceManager.Resources.ExtensionsResources.get","azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.listByScope":"Azure.ResourceManager.Resources.ExtensionsResources.listByScope","azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.update":"Azure.ResourceManager.Resources.ExtensionsResources.update","azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.updateWithResponse":"Azure.ResourceManager.Resources.ExtensionsResources.update","azure.resourcemanager.resources.fluent.LocationResourcesClient":"Azure.ResourceManager.Resources.LocationResources","azure.resourcemanager.resources.fluent.LocationResourcesClient.createOrUpdate":"Azure.ResourceManager.Resources.LocationResources.createOrUpdate","azure.resourcemanager.resources.fluent.LocationResourcesClient.createOrUpdateWithResponse":"Azure.ResourceManager.Resources.LocationResources.createOrUpdate","azure.resourcemanager.resources.fluent.LocationResourcesClient.delete":"Azure.ResourceManager.Resources.LocationResources.delete","azure.resourcemanager.resources.fluent.LocationResourcesClient.deleteWithResponse":"Azure.ResourceManager.Resources.LocationResources.delete","azure.resourcemanager.resources.fluent.LocationResourcesClient.get":"Azure.ResourceManager.Resources.LocationResources.get","azure.resourcemanager.resources.fluent.LocationResourcesClient.getWithResponse":"Azure.ResourceManager.Resources.LocationResources.get","azure.resourcemanager.resources.fluent.LocationResourcesClient.listByLocation":"Azure.ResourceManager.Resources.LocationResources.listByLocation","azure.resourcemanager.resources.fluent.LocationResourcesClient.update":"Azure.ResourceManager.Resources.LocationResources.update","azure.resourcemanager.resources.fluent.LocationResourcesClient.updateWithResponse":"Azure.ResourceManager.Resources.LocationResources.update","azure.resourcemanager.resources.fluent.NestedsClient":"Azure.ResourceManager.Resources.Nested","azure.resourcemanager.resources.fluent.NestedsClient.beginCreateOrReplace":"Azure.ResourceManager.Resources.Nested.createOrReplace","azure.resourcemanager.resources.fluent.NestedsClient.beginDelete":"Azure.ResourceManager.Resources.Nested.delete","azure.resourcemanager.resources.fluent.NestedsClient.beginUpdate":"Azure.ResourceManager.Resources.Nested.update","azure.resourcemanager.resources.fluent.NestedsClient.createOrReplace":"Azure.ResourceManager.Resources.Nested.createOrReplace","azure.resourcemanager.resources.fluent.NestedsClient.delete":"Azure.ResourceManager.Resources.Nested.delete","azure.resourcemanager.resources.fluent.NestedsClient.get":"Azure.ResourceManager.Resources.Nested.get","azure.resourcemanager.resources.fluent.NestedsClient.getWithResponse":"Azure.ResourceManager.Resources.Nested.get","azure.resourcemanager.resources.fluent.NestedsClient.listByTopLevelTrackedResource":"Azure.ResourceManager.Resources.Nested.listByTopLevelTrackedResource","azure.resourcemanager.resources.fluent.NestedsClient.update":"Azure.ResourceManager.Resources.Nested.update","azure.resourcemanager.resources.fluent.ResourcesClient":"Azure.ResourceManager.Resources","azure.resourcemanager.resources.fluent.SingletonsClient":"Azure.ResourceManager.Resources.Singleton","azure.resourcemanager.resources.fluent.SingletonsClient.beginCreateOrUpdate":"Azure.ResourceManager.Resources.Singleton.createOrUpdate","azure.resourcemanager.resources.fluent.SingletonsClient.createOrUpdate":"Azure.ResourceManager.Resources.Singleton.createOrUpdate","azure.resourcemanager.resources.fluent.SingletonsClient.getByResourceGroup":"Azure.ResourceManager.Resources.Singleton.getByResourceGroup","azure.resourcemanager.resources.fluent.SingletonsClient.getByResourceGroupWithResponse":"Azure.ResourceManager.Resources.Singleton.getByResourceGroup","azure.resourcemanager.resources.fluent.SingletonsClient.listByResourceGroup":"Azure.ResourceManager.Resources.Singleton.listByResourceGroup","azure.resourcemanager.resources.fluent.SingletonsClient.update":"Azure.ResourceManager.Resources.Singleton.update","azure.resourcemanager.resources.fluent.SingletonsClient.updateWithResponse":"Azure.ResourceManager.Resources.Singleton.update","azure.resourcemanager.resources.fluent.TopLevelsClient":"Azure.ResourceManager.Resources.TopLevel","azure.resourcemanager.resources.fluent.TopLevelsClient.actionSync":"Azure.ResourceManager.Resources.TopLevel.actionSync","azure.resourcemanager.resources.fluent.TopLevelsClient.actionSyncWithResponse":"Azure.ResourceManager.Resources.TopLevel.actionSync","azure.resourcemanager.resources.fluent.TopLevelsClient.beginCreateOrReplace":"Azure.ResourceManager.Resources.TopLevel.createOrReplace","azure.resourcemanager.resources.fluent.TopLevelsClient.beginDelete":"Azure.ResourceManager.Resources.TopLevel.delete","azure.resourcemanager.resources.fluent.TopLevelsClient.beginUpdate":"Azure.ResourceManager.Resources.TopLevel.update","azure.resourcemanager.resources.fluent.TopLevelsClient.createOrReplace":"Azure.ResourceManager.Resources.TopLevel.createOrReplace","azure.resourcemanager.resources.fluent.TopLevelsClient.delete":"Azure.ResourceManager.Resources.TopLevel.delete","azure.resourcemanager.resources.fluent.TopLevelsClient.getByResourceGroup":"Azure.ResourceManager.Resources.TopLevel.get","azure.resourcemanager.resources.fluent.TopLevelsClient.getByResourceGroupWithResponse":"Azure.ResourceManager.Resources.TopLevel.get","azure.resourcemanager.resources.fluent.TopLevelsClient.list":"Azure.ResourceManager.Resources.TopLevel.listBySubscription","azure.resourcemanager.resources.fluent.TopLevelsClient.listByResourceGroup":"Azure.ResourceManager.Resources.TopLevel.listByResourceGroup","azure.resourcemanager.resources.fluent.TopLevelsClient.update":"Azure.ResourceManager.Resources.TopLevel.update","azure.resourcemanager.resources.fluent.models.ExtensionsResourceInner":"Azure.ResourceManager.Resources.ExtensionsResource","azure.resourcemanager.resources.fluent.models.LocationResourceInner":"Azure.ResourceManager.Resources.LocationResource","azure.resourcemanager.resources.fluent.models.NestedProxyResourceInner":"Azure.ResourceManager.Resources.NestedProxyResource","azure.resourcemanager.resources.fluent.models.SingletonTrackedResourceInner":"Azure.ResourceManager.Resources.SingletonTrackedResource","azure.resourcemanager.resources.fluent.models.TopLevelTrackedResourceInner":"Azure.ResourceManager.Resources.TopLevelTrackedResource","azure.resourcemanager.resources.implementation.ResourcesClientBuilder":"Azure.ResourceManager.Resources","azure.resourcemanager.resources.implementation.models.ExtensionsResourceListResult":"Azure.ResourceManager.ResourceListResult","azure.resourcemanager.resources.implementation.models.LocationResourceListResult":"Azure.ResourceManager.ResourceListResult","azure.resourcemanager.resources.implementation.models.NestedProxyResourceListResult":"Azure.ResourceManager.ResourceListResult","azure.resourcemanager.resources.implementation.models.SingletonTrackedResourceListResult":"Azure.ResourceManager.ResourceListResult","azure.resourcemanager.resources.implementation.models.TopLevelTrackedResourceListResult":"Azure.ResourceManager.ResourceListResult","azure.resourcemanager.resources.models.ExtensionsResourceProperties":"Azure.ResourceManager.Resources.ExtensionsResourceProperties","azure.resourcemanager.resources.models.LocationResourceProperties":"Azure.ResourceManager.Resources.LocationResourceProperties","azure.resourcemanager.resources.models.NestedProxyResourceProperties":"Azure.ResourceManager.Resources.NestedProxyResourceProperties","azure.resourcemanager.resources.models.NotificationDetails":"Azure.ResourceManager.Resources.NotificationDetails","azure.resourcemanager.resources.models.ProvisioningState":"Azure.ResourceManager.Resources.ProvisioningState","azure.resourcemanager.resources.models.SingletonTrackedResourceProperties":"Azure.ResourceManager.Resources.SingletonTrackedResourceProperties","azure.resourcemanager.resources.models.TopLevelTrackedResourceProperties":"Azure.ResourceManager.Resources.TopLevelTrackedResourceProperties"},"generatedFiles":["src/main/java/azure/resourcemanager/resources/ResourcesManager.java","src/main/java/azure/resourcemanager/resources/fluent/ExtensionsResourcesClient.java","src/main/java/azure/resourcemanager/resources/fluent/LocationResourcesClient.java","src/main/java/azure/resourcemanager/resources/fluent/NestedsClient.java","src/main/java/azure/resourcemanager/resources/fluent/ResourcesClient.java","src/main/java/azure/resourcemanager/resources/fluent/SingletonsClient.java","src/main/java/azure/resourcemanager/resources/fluent/TopLevelsClient.java","src/main/java/azure/resourcemanager/resources/fluent/models/ExtensionsResourceInner.java","src/main/java/azure/resourcemanager/resources/fluent/models/LocationResourceInner.java","src/main/java/azure/resourcemanager/resources/fluent/models/NestedProxyResourceInner.java","src/main/java/azure/resourcemanager/resources/fluent/models/SingletonTrackedResourceInner.java","src/main/java/azure/resourcemanager/resources/fluent/models/TopLevelTrackedResourceInner.java","src/main/java/azure/resourcemanager/resources/fluent/models/package-info.java","src/main/java/azure/resourcemanager/resources/fluent/package-info.java","src/main/java/azure/resourcemanager/resources/implementation/ExtensionsResourceImpl.java","src/main/java/azure/resourcemanager/resources/implementation/ExtensionsResourcesClientImpl.java","src/main/java/azure/resourcemanager/resources/implementation/ExtensionsResourcesImpl.java","src/main/java/azure/resourcemanager/resources/implementation/LocationResourceImpl.java","src/main/java/azure/resourcemanager/resources/implementation/LocationResourcesClientImpl.java","src/main/java/azure/resourcemanager/resources/implementation/LocationResourcesImpl.java","src/main/java/azure/resourcemanager/resources/implementation/NestedProxyResourceImpl.java","src/main/java/azure/resourcemanager/resources/implementation/NestedsClientImpl.java","src/main/java/azure/resourcemanager/resources/implementation/NestedsImpl.java","src/main/java/azure/resourcemanager/resources/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/resources/implementation/ResourcesClientBuilder.java","src/main/java/azure/resourcemanager/resources/implementation/ResourcesClientImpl.java","src/main/java/azure/resourcemanager/resources/implementation/SingletonTrackedResourceImpl.java","src/main/java/azure/resourcemanager/resources/implementation/SingletonsClientImpl.java","src/main/java/azure/resourcemanager/resources/implementation/SingletonsImpl.java","src/main/java/azure/resourcemanager/resources/implementation/TopLevelTrackedResourceImpl.java","src/main/java/azure/resourcemanager/resources/implementation/TopLevelsClientImpl.java","src/main/java/azure/resourcemanager/resources/implementation/TopLevelsImpl.java","src/main/java/azure/resourcemanager/resources/implementation/models/ExtensionsResourceListResult.java","src/main/java/azure/resourcemanager/resources/implementation/models/LocationResourceListResult.java","src/main/java/azure/resourcemanager/resources/implementation/models/NestedProxyResourceListResult.java","src/main/java/azure/resourcemanager/resources/implementation/models/SingletonTrackedResourceListResult.java","src/main/java/azure/resourcemanager/resources/implementation/models/TopLevelTrackedResourceListResult.java","src/main/java/azure/resourcemanager/resources/implementation/package-info.java","src/main/java/azure/resourcemanager/resources/models/ExtensionsResource.java","src/main/java/azure/resourcemanager/resources/models/ExtensionsResourceProperties.java","src/main/java/azure/resourcemanager/resources/models/ExtensionsResources.java","src/main/java/azure/resourcemanager/resources/models/LocationResource.java","src/main/java/azure/resourcemanager/resources/models/LocationResourceProperties.java","src/main/java/azure/resourcemanager/resources/models/LocationResources.java","src/main/java/azure/resourcemanager/resources/models/NestedProxyResource.java","src/main/java/azure/resourcemanager/resources/models/NestedProxyResourceProperties.java","src/main/java/azure/resourcemanager/resources/models/Nesteds.java","src/main/java/azure/resourcemanager/resources/models/NotificationDetails.java","src/main/java/azure/resourcemanager/resources/models/ProvisioningState.java","src/main/java/azure/resourcemanager/resources/models/SingletonTrackedResource.java","src/main/java/azure/resourcemanager/resources/models/SingletonTrackedResourceProperties.java","src/main/java/azure/resourcemanager/resources/models/Singletons.java","src/main/java/azure/resourcemanager/resources/models/TopLevelTrackedResource.java","src/main/java/azure/resourcemanager/resources/models/TopLevelTrackedResourceProperties.java","src/main/java/azure/resourcemanager/resources/models/TopLevels.java","src/main/java/azure/resourcemanager/resources/models/package-info.java","src/main/java/azure/resourcemanager/resources/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Azure.ResourceManager.Resources":"2023-12-01-preview"},"crossLanguageDefinitions":{"azure.resourcemanager.resources.fluent.ExtensionsResourcesClient":"Azure.ResourceManager.Resources.ExtensionsResources","azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.beginCreateOrUpdate":"Azure.ResourceManager.Resources.ExtensionsResources.createOrUpdate","azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.createOrUpdate":"Azure.ResourceManager.Resources.ExtensionsResources.createOrUpdate","azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.delete":"Azure.ResourceManager.Resources.ExtensionsResources.delete","azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.deleteWithResponse":"Azure.ResourceManager.Resources.ExtensionsResources.delete","azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.get":"Azure.ResourceManager.Resources.ExtensionsResources.get","azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.getWithResponse":"Azure.ResourceManager.Resources.ExtensionsResources.get","azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.listByScope":"Azure.ResourceManager.Resources.ExtensionsResources.listByScope","azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.update":"Azure.ResourceManager.Resources.ExtensionsResources.update","azure.resourcemanager.resources.fluent.ExtensionsResourcesClient.updateWithResponse":"Azure.ResourceManager.Resources.ExtensionsResources.update","azure.resourcemanager.resources.fluent.LocationResourcesClient":"Azure.ResourceManager.Resources.LocationResources","azure.resourcemanager.resources.fluent.LocationResourcesClient.createOrUpdate":"Azure.ResourceManager.Resources.LocationResources.createOrUpdate","azure.resourcemanager.resources.fluent.LocationResourcesClient.createOrUpdateWithResponse":"Azure.ResourceManager.Resources.LocationResources.createOrUpdate","azure.resourcemanager.resources.fluent.LocationResourcesClient.delete":"Azure.ResourceManager.Resources.LocationResources.delete","azure.resourcemanager.resources.fluent.LocationResourcesClient.deleteWithResponse":"Azure.ResourceManager.Resources.LocationResources.delete","azure.resourcemanager.resources.fluent.LocationResourcesClient.get":"Azure.ResourceManager.Resources.LocationResources.get","azure.resourcemanager.resources.fluent.LocationResourcesClient.getWithResponse":"Azure.ResourceManager.Resources.LocationResources.get","azure.resourcemanager.resources.fluent.LocationResourcesClient.listByLocation":"Azure.ResourceManager.Resources.LocationResources.listByLocation","azure.resourcemanager.resources.fluent.LocationResourcesClient.update":"Azure.ResourceManager.Resources.LocationResources.update","azure.resourcemanager.resources.fluent.LocationResourcesClient.updateWithResponse":"Azure.ResourceManager.Resources.LocationResources.update","azure.resourcemanager.resources.fluent.NestedsClient":"Azure.ResourceManager.Resources.Nested","azure.resourcemanager.resources.fluent.NestedsClient.beginCreateOrReplace":"Azure.ResourceManager.Resources.Nested.createOrReplace","azure.resourcemanager.resources.fluent.NestedsClient.beginDelete":"Azure.ResourceManager.Resources.Nested.delete","azure.resourcemanager.resources.fluent.NestedsClient.beginUpdate":"Azure.ResourceManager.Resources.Nested.update","azure.resourcemanager.resources.fluent.NestedsClient.createOrReplace":"Azure.ResourceManager.Resources.Nested.createOrReplace","azure.resourcemanager.resources.fluent.NestedsClient.delete":"Azure.ResourceManager.Resources.Nested.delete","azure.resourcemanager.resources.fluent.NestedsClient.get":"Azure.ResourceManager.Resources.Nested.get","azure.resourcemanager.resources.fluent.NestedsClient.getWithResponse":"Azure.ResourceManager.Resources.Nested.get","azure.resourcemanager.resources.fluent.NestedsClient.listByTopLevelTrackedResource":"Azure.ResourceManager.Resources.Nested.listByTopLevelTrackedResource","azure.resourcemanager.resources.fluent.NestedsClient.update":"Azure.ResourceManager.Resources.Nested.update","azure.resourcemanager.resources.fluent.ResourcesClient":"Azure.ResourceManager.Resources","azure.resourcemanager.resources.fluent.SingletonsClient":"Azure.ResourceManager.Resources.Singleton","azure.resourcemanager.resources.fluent.SingletonsClient.beginCreateOrUpdate":"Azure.ResourceManager.Resources.Singleton.createOrUpdate","azure.resourcemanager.resources.fluent.SingletonsClient.createOrUpdate":"Azure.ResourceManager.Resources.Singleton.createOrUpdate","azure.resourcemanager.resources.fluent.SingletonsClient.getByResourceGroup":"Azure.ResourceManager.Resources.Singleton.getByResourceGroup","azure.resourcemanager.resources.fluent.SingletonsClient.getByResourceGroupWithResponse":"Azure.ResourceManager.Resources.Singleton.getByResourceGroup","azure.resourcemanager.resources.fluent.SingletonsClient.listByResourceGroup":"Azure.ResourceManager.Resources.Singleton.listByResourceGroup","azure.resourcemanager.resources.fluent.SingletonsClient.update":"Azure.ResourceManager.Resources.Singleton.update","azure.resourcemanager.resources.fluent.SingletonsClient.updateWithResponse":"Azure.ResourceManager.Resources.Singleton.update","azure.resourcemanager.resources.fluent.TopLevelsClient":"Azure.ResourceManager.Resources.TopLevel","azure.resourcemanager.resources.fluent.TopLevelsClient.actionSync":"Azure.ResourceManager.Resources.TopLevel.actionSync","azure.resourcemanager.resources.fluent.TopLevelsClient.actionSyncWithResponse":"Azure.ResourceManager.Resources.TopLevel.actionSync","azure.resourcemanager.resources.fluent.TopLevelsClient.beginCreateOrReplace":"Azure.ResourceManager.Resources.TopLevel.createOrReplace","azure.resourcemanager.resources.fluent.TopLevelsClient.beginDelete":"Azure.ResourceManager.Resources.TopLevel.delete","azure.resourcemanager.resources.fluent.TopLevelsClient.beginUpdate":"Azure.ResourceManager.Resources.TopLevel.update","azure.resourcemanager.resources.fluent.TopLevelsClient.createOrReplace":"Azure.ResourceManager.Resources.TopLevel.createOrReplace","azure.resourcemanager.resources.fluent.TopLevelsClient.delete":"Azure.ResourceManager.Resources.TopLevel.delete","azure.resourcemanager.resources.fluent.TopLevelsClient.getByResourceGroup":"Azure.ResourceManager.Resources.TopLevel.get","azure.resourcemanager.resources.fluent.TopLevelsClient.getByResourceGroupWithResponse":"Azure.ResourceManager.Resources.TopLevel.get","azure.resourcemanager.resources.fluent.TopLevelsClient.list":"Azure.ResourceManager.Resources.TopLevel.listBySubscription","azure.resourcemanager.resources.fluent.TopLevelsClient.listByResourceGroup":"Azure.ResourceManager.Resources.TopLevel.listByResourceGroup","azure.resourcemanager.resources.fluent.TopLevelsClient.update":"Azure.ResourceManager.Resources.TopLevel.update","azure.resourcemanager.resources.fluent.models.ExtensionsResourceInner":"Azure.ResourceManager.Resources.ExtensionsResource","azure.resourcemanager.resources.fluent.models.LocationResourceInner":"Azure.ResourceManager.Resources.LocationResource","azure.resourcemanager.resources.fluent.models.NestedProxyResourceInner":"Azure.ResourceManager.Resources.NestedProxyResource","azure.resourcemanager.resources.fluent.models.SingletonTrackedResourceInner":"Azure.ResourceManager.Resources.SingletonTrackedResource","azure.resourcemanager.resources.fluent.models.TopLevelTrackedResourceInner":"Azure.ResourceManager.Resources.TopLevelTrackedResource","azure.resourcemanager.resources.implementation.ResourcesClientBuilder":"Azure.ResourceManager.Resources","azure.resourcemanager.resources.implementation.models.ExtensionsResourceListResult":"Azure.ResourceManager.ResourceListResult","azure.resourcemanager.resources.implementation.models.LocationResourceListResult":"Azure.ResourceManager.ResourceListResult","azure.resourcemanager.resources.implementation.models.NestedProxyResourceListResult":"Azure.ResourceManager.ResourceListResult","azure.resourcemanager.resources.implementation.models.SingletonTrackedResourceListResult":"Azure.ResourceManager.ResourceListResult","azure.resourcemanager.resources.implementation.models.TopLevelTrackedResourceListResult":"Azure.ResourceManager.ResourceListResult","azure.resourcemanager.resources.models.ExtensionsResourceProperties":"Azure.ResourceManager.Resources.ExtensionsResourceProperties","azure.resourcemanager.resources.models.LocationResourceProperties":"Azure.ResourceManager.Resources.LocationResourceProperties","azure.resourcemanager.resources.models.NestedProxyResourceProperties":"Azure.ResourceManager.Resources.NestedProxyResourceProperties","azure.resourcemanager.resources.models.NotificationDetails":"Azure.ResourceManager.Resources.NotificationDetails","azure.resourcemanager.resources.models.ProvisioningState":"Azure.ResourceManager.Resources.ProvisioningState","azure.resourcemanager.resources.models.SingletonTrackedResourceProperties":"Azure.ResourceManager.Resources.SingletonTrackedResourceProperties","azure.resourcemanager.resources.models.TopLevelTrackedResourceProperties":"Azure.ResourceManager.Resources.TopLevelTrackedResourceProperties"},"generatedFiles":["src/main/java/azure/resourcemanager/resources/ResourcesManager.java","src/main/java/azure/resourcemanager/resources/fluent/ExtensionsResourcesClient.java","src/main/java/azure/resourcemanager/resources/fluent/LocationResourcesClient.java","src/main/java/azure/resourcemanager/resources/fluent/NestedsClient.java","src/main/java/azure/resourcemanager/resources/fluent/ResourcesClient.java","src/main/java/azure/resourcemanager/resources/fluent/SingletonsClient.java","src/main/java/azure/resourcemanager/resources/fluent/TopLevelsClient.java","src/main/java/azure/resourcemanager/resources/fluent/models/ExtensionsResourceInner.java","src/main/java/azure/resourcemanager/resources/fluent/models/LocationResourceInner.java","src/main/java/azure/resourcemanager/resources/fluent/models/NestedProxyResourceInner.java","src/main/java/azure/resourcemanager/resources/fluent/models/SingletonTrackedResourceInner.java","src/main/java/azure/resourcemanager/resources/fluent/models/TopLevelTrackedResourceInner.java","src/main/java/azure/resourcemanager/resources/fluent/models/package-info.java","src/main/java/azure/resourcemanager/resources/fluent/package-info.java","src/main/java/azure/resourcemanager/resources/implementation/ExtensionsResourceImpl.java","src/main/java/azure/resourcemanager/resources/implementation/ExtensionsResourcesClientImpl.java","src/main/java/azure/resourcemanager/resources/implementation/ExtensionsResourcesImpl.java","src/main/java/azure/resourcemanager/resources/implementation/LocationResourceImpl.java","src/main/java/azure/resourcemanager/resources/implementation/LocationResourcesClientImpl.java","src/main/java/azure/resourcemanager/resources/implementation/LocationResourcesImpl.java","src/main/java/azure/resourcemanager/resources/implementation/NestedProxyResourceImpl.java","src/main/java/azure/resourcemanager/resources/implementation/NestedsClientImpl.java","src/main/java/azure/resourcemanager/resources/implementation/NestedsImpl.java","src/main/java/azure/resourcemanager/resources/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/resources/implementation/ResourcesClientBuilder.java","src/main/java/azure/resourcemanager/resources/implementation/ResourcesClientImpl.java","src/main/java/azure/resourcemanager/resources/implementation/SingletonTrackedResourceImpl.java","src/main/java/azure/resourcemanager/resources/implementation/SingletonsClientImpl.java","src/main/java/azure/resourcemanager/resources/implementation/SingletonsImpl.java","src/main/java/azure/resourcemanager/resources/implementation/TopLevelTrackedResourceImpl.java","src/main/java/azure/resourcemanager/resources/implementation/TopLevelsClientImpl.java","src/main/java/azure/resourcemanager/resources/implementation/TopLevelsImpl.java","src/main/java/azure/resourcemanager/resources/implementation/models/ExtensionsResourceListResult.java","src/main/java/azure/resourcemanager/resources/implementation/models/LocationResourceListResult.java","src/main/java/azure/resourcemanager/resources/implementation/models/NestedProxyResourceListResult.java","src/main/java/azure/resourcemanager/resources/implementation/models/SingletonTrackedResourceListResult.java","src/main/java/azure/resourcemanager/resources/implementation/models/TopLevelTrackedResourceListResult.java","src/main/java/azure/resourcemanager/resources/implementation/package-info.java","src/main/java/azure/resourcemanager/resources/models/ExtensionsResource.java","src/main/java/azure/resourcemanager/resources/models/ExtensionsResourceProperties.java","src/main/java/azure/resourcemanager/resources/models/ExtensionsResources.java","src/main/java/azure/resourcemanager/resources/models/LocationResource.java","src/main/java/azure/resourcemanager/resources/models/LocationResourceProperties.java","src/main/java/azure/resourcemanager/resources/models/LocationResources.java","src/main/java/azure/resourcemanager/resources/models/NestedProxyResource.java","src/main/java/azure/resourcemanager/resources/models/NestedProxyResourceProperties.java","src/main/java/azure/resourcemanager/resources/models/Nesteds.java","src/main/java/azure/resourcemanager/resources/models/NotificationDetails.java","src/main/java/azure/resourcemanager/resources/models/ProvisioningState.java","src/main/java/azure/resourcemanager/resources/models/SingletonTrackedResource.java","src/main/java/azure/resourcemanager/resources/models/SingletonTrackedResourceProperties.java","src/main/java/azure/resourcemanager/resources/models/Singletons.java","src/main/java/azure/resourcemanager/resources/models/TopLevelTrackedResource.java","src/main/java/azure/resourcemanager/resources/models/TopLevelTrackedResourceProperties.java","src/main/java/azure/resourcemanager/resources/models/TopLevels.java","src/main/java/azure/resourcemanager/resources/models/package-info.java","src/main/java/azure/resourcemanager/resources/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-specialheaders-xmsclientrequestid_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-specialheaders-xmsclientrequestid_apiview_properties.json deleted file mode 100644 index ab80c581358..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-specialheaders-xmsclientrequestid_apiview_properties.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.specialheaders.xmsclientrequestid.XmsClientRequestIdAsyncClient": "Azure.SpecialHeaders.XmsClientRequestId", - "azure.specialheaders.xmsclientrequestid.XmsClientRequestIdAsyncClient.get": "Azure.SpecialHeaders.XmsClientRequestId.get", - "azure.specialheaders.xmsclientrequestid.XmsClientRequestIdAsyncClient.getWithResponse": "Azure.SpecialHeaders.XmsClientRequestId.get", - "azure.specialheaders.xmsclientrequestid.XmsClientRequestIdClient": "Azure.SpecialHeaders.XmsClientRequestId", - "azure.specialheaders.xmsclientrequestid.XmsClientRequestIdClient.get": "Azure.SpecialHeaders.XmsClientRequestId.get", - "azure.specialheaders.xmsclientrequestid.XmsClientRequestIdClient.getWithResponse": "Azure.SpecialHeaders.XmsClientRequestId.get", - "azure.specialheaders.xmsclientrequestid.XmsClientRequestIdClientBuilder": "Azure.SpecialHeaders.XmsClientRequestId" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-specialheaders-xmsclientrequestid_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-specialheaders-xmsclientrequestid_metadata.json index 86eec9b4669..dca9e4b143b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-specialheaders-xmsclientrequestid_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-specialheaders-xmsclientrequestid_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"azure.specialheaders.xmsclientrequestid.XmsClientRequestIdAsyncClient":"Azure.SpecialHeaders.XmsClientRequestId","azure.specialheaders.xmsclientrequestid.XmsClientRequestIdAsyncClient.get":"Azure.SpecialHeaders.XmsClientRequestId.get","azure.specialheaders.xmsclientrequestid.XmsClientRequestIdAsyncClient.getWithResponse":"Azure.SpecialHeaders.XmsClientRequestId.get","azure.specialheaders.xmsclientrequestid.XmsClientRequestIdClient":"Azure.SpecialHeaders.XmsClientRequestId","azure.specialheaders.xmsclientrequestid.XmsClientRequestIdClient.get":"Azure.SpecialHeaders.XmsClientRequestId.get","azure.specialheaders.xmsclientrequestid.XmsClientRequestIdClient.getWithResponse":"Azure.SpecialHeaders.XmsClientRequestId.get","azure.specialheaders.xmsclientrequestid.XmsClientRequestIdClientBuilder":"Azure.SpecialHeaders.XmsClientRequestId"},"generatedFiles":["src/main/java/azure/specialheaders/xmsclientrequestid/XmsClientRequestIdAsyncClient.java","src/main/java/azure/specialheaders/xmsclientrequestid/XmsClientRequestIdClient.java","src/main/java/azure/specialheaders/xmsclientrequestid/XmsClientRequestIdClientBuilder.java","src/main/java/azure/specialheaders/xmsclientrequestid/implementation/XmsClientRequestIdClientImpl.java","src/main/java/azure/specialheaders/xmsclientrequestid/implementation/package-info.java","src/main/java/azure/specialheaders/xmsclientrequestid/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"azure.specialheaders.xmsclientrequestid.XmsClientRequestIdAsyncClient":"Azure.SpecialHeaders.XmsClientRequestId","azure.specialheaders.xmsclientrequestid.XmsClientRequestIdAsyncClient.get":"Azure.SpecialHeaders.XmsClientRequestId.get","azure.specialheaders.xmsclientrequestid.XmsClientRequestIdAsyncClient.getWithResponse":"Azure.SpecialHeaders.XmsClientRequestId.get","azure.specialheaders.xmsclientrequestid.XmsClientRequestIdClient":"Azure.SpecialHeaders.XmsClientRequestId","azure.specialheaders.xmsclientrequestid.XmsClientRequestIdClient.get":"Azure.SpecialHeaders.XmsClientRequestId.get","azure.specialheaders.xmsclientrequestid.XmsClientRequestIdClient.getWithResponse":"Azure.SpecialHeaders.XmsClientRequestId.get","azure.specialheaders.xmsclientrequestid.XmsClientRequestIdClientBuilder":"Azure.SpecialHeaders.XmsClientRequestId"},"generatedFiles":["src/main/java/azure/specialheaders/xmsclientrequestid/XmsClientRequestIdAsyncClient.java","src/main/java/azure/specialheaders/xmsclientrequestid/XmsClientRequestIdClient.java","src/main/java/azure/specialheaders/xmsclientrequestid/XmsClientRequestIdClientBuilder.java","src/main/java/azure/specialheaders/xmsclientrequestid/implementation/XmsClientRequestIdClientImpl.java","src/main/java/azure/specialheaders/xmsclientrequestid/implementation/package-info.java","src/main/java/azure/specialheaders/xmsclientrequestid/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-versioning-previewversion_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-versioning-previewversion_apiview_properties.json deleted file mode 100644 index bd69a696a6d..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-versioning-previewversion_apiview_properties.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "azure.versioning.previewversion.PreviewVersionAsyncClient": "_Specs_.Azure.Versioning.PreviewVersion", - "azure.versioning.previewversion.PreviewVersionAsyncClient.getWidget": "_Specs_.Azure.Versioning.PreviewVersion.getWidget", - "azure.versioning.previewversion.PreviewVersionAsyncClient.getWidgetWithResponse": "_Specs_.Azure.Versioning.PreviewVersion.getWidget", - "azure.versioning.previewversion.PreviewVersionAsyncClient.listWidgets": "_Specs_.Azure.Versioning.PreviewVersion.listWidgets", - "azure.versioning.previewversion.PreviewVersionAsyncClient.listWidgetsWithResponse": "_Specs_.Azure.Versioning.PreviewVersion.listWidgets", - "azure.versioning.previewversion.PreviewVersionAsyncClient.updateWidgetColor": "_Specs_.Azure.Versioning.PreviewVersion.updateWidgetColor", - "azure.versioning.previewversion.PreviewVersionAsyncClient.updateWidgetColorWithResponse": "_Specs_.Azure.Versioning.PreviewVersion.updateWidgetColor", - "azure.versioning.previewversion.PreviewVersionClient": "_Specs_.Azure.Versioning.PreviewVersion", - "azure.versioning.previewversion.PreviewVersionClient.getWidget": "_Specs_.Azure.Versioning.PreviewVersion.getWidget", - "azure.versioning.previewversion.PreviewVersionClient.getWidgetWithResponse": "_Specs_.Azure.Versioning.PreviewVersion.getWidget", - "azure.versioning.previewversion.PreviewVersionClient.listWidgets": "_Specs_.Azure.Versioning.PreviewVersion.listWidgets", - "azure.versioning.previewversion.PreviewVersionClient.listWidgetsWithResponse": "_Specs_.Azure.Versioning.PreviewVersion.listWidgets", - "azure.versioning.previewversion.PreviewVersionClient.updateWidgetColor": "_Specs_.Azure.Versioning.PreviewVersion.updateWidgetColor", - "azure.versioning.previewversion.PreviewVersionClient.updateWidgetColorWithResponse": "_Specs_.Azure.Versioning.PreviewVersion.updateWidgetColor", - "azure.versioning.previewversion.PreviewVersionClientBuilder": "_Specs_.Azure.Versioning.PreviewVersion", - "azure.versioning.previewversion.models.ListWidgetsResponse": "_Specs_.Azure.Versioning.PreviewVersion.listWidgets.Response.anonymous", - "azure.versioning.previewversion.models.UpdateWidgetColorRequest": "_Specs_.Azure.Versioning.PreviewVersion.UpdateWidgetColorRequest", - "azure.versioning.previewversion.models.Widget": "_Specs_.Azure.Versioning.PreviewVersion.Widget" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-versioning-previewversion_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-versioning-previewversion_metadata.json index 036009afc6f..bb4d5df0478 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-versioning-previewversion_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-versioning-previewversion_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2024-12-01-preview","crossLanguageDefinitions":{"azure.versioning.previewversion.PreviewVersionAsyncClient":"_Specs_.Azure.Versioning.PreviewVersion","azure.versioning.previewversion.PreviewVersionAsyncClient.getWidget":"_Specs_.Azure.Versioning.PreviewVersion.getWidget","azure.versioning.previewversion.PreviewVersionAsyncClient.getWidgetWithResponse":"_Specs_.Azure.Versioning.PreviewVersion.getWidget","azure.versioning.previewversion.PreviewVersionAsyncClient.listWidgets":"_Specs_.Azure.Versioning.PreviewVersion.listWidgets","azure.versioning.previewversion.PreviewVersionAsyncClient.listWidgetsWithResponse":"_Specs_.Azure.Versioning.PreviewVersion.listWidgets","azure.versioning.previewversion.PreviewVersionAsyncClient.updateWidgetColor":"_Specs_.Azure.Versioning.PreviewVersion.updateWidgetColor","azure.versioning.previewversion.PreviewVersionAsyncClient.updateWidgetColorWithResponse":"_Specs_.Azure.Versioning.PreviewVersion.updateWidgetColor","azure.versioning.previewversion.PreviewVersionClient":"_Specs_.Azure.Versioning.PreviewVersion","azure.versioning.previewversion.PreviewVersionClient.getWidget":"_Specs_.Azure.Versioning.PreviewVersion.getWidget","azure.versioning.previewversion.PreviewVersionClient.getWidgetWithResponse":"_Specs_.Azure.Versioning.PreviewVersion.getWidget","azure.versioning.previewversion.PreviewVersionClient.listWidgets":"_Specs_.Azure.Versioning.PreviewVersion.listWidgets","azure.versioning.previewversion.PreviewVersionClient.listWidgetsWithResponse":"_Specs_.Azure.Versioning.PreviewVersion.listWidgets","azure.versioning.previewversion.PreviewVersionClient.updateWidgetColor":"_Specs_.Azure.Versioning.PreviewVersion.updateWidgetColor","azure.versioning.previewversion.PreviewVersionClient.updateWidgetColorWithResponse":"_Specs_.Azure.Versioning.PreviewVersion.updateWidgetColor","azure.versioning.previewversion.PreviewVersionClientBuilder":"_Specs_.Azure.Versioning.PreviewVersion","azure.versioning.previewversion.models.ListWidgetsResponse":"_Specs_.Azure.Versioning.PreviewVersion.listWidgets.Response.anonymous","azure.versioning.previewversion.models.UpdateWidgetColorRequest":"_Specs_.Azure.Versioning.PreviewVersion.UpdateWidgetColorRequest","azure.versioning.previewversion.models.Widget":"_Specs_.Azure.Versioning.PreviewVersion.Widget"},"generatedFiles":["src/main/java/azure/versioning/previewversion/PreviewVersionAsyncClient.java","src/main/java/azure/versioning/previewversion/PreviewVersionClient.java","src/main/java/azure/versioning/previewversion/PreviewVersionClientBuilder.java","src/main/java/azure/versioning/previewversion/PreviewVersionServiceVersion.java","src/main/java/azure/versioning/previewversion/implementation/JsonMergePatchHelper.java","src/main/java/azure/versioning/previewversion/implementation/PreviewVersionClientImpl.java","src/main/java/azure/versioning/previewversion/implementation/package-info.java","src/main/java/azure/versioning/previewversion/models/ListWidgetsResponse.java","src/main/java/azure/versioning/previewversion/models/UpdateWidgetColorRequest.java","src/main/java/azure/versioning/previewversion/models/Widget.java","src/main/java/azure/versioning/previewversion/models/package-info.java","src/main/java/azure/versioning/previewversion/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"_Specs_.Azure.Versioning.PreviewVersion":"2024-12-01-preview"},"crossLanguageDefinitions":{"azure.versioning.previewversion.PreviewVersionAsyncClient":"_Specs_.Azure.Versioning.PreviewVersion","azure.versioning.previewversion.PreviewVersionAsyncClient.getWidget":"_Specs_.Azure.Versioning.PreviewVersion.getWidget","azure.versioning.previewversion.PreviewVersionAsyncClient.getWidgetWithResponse":"_Specs_.Azure.Versioning.PreviewVersion.getWidget","azure.versioning.previewversion.PreviewVersionAsyncClient.listWidgets":"_Specs_.Azure.Versioning.PreviewVersion.listWidgets","azure.versioning.previewversion.PreviewVersionAsyncClient.listWidgetsWithResponse":"_Specs_.Azure.Versioning.PreviewVersion.listWidgets","azure.versioning.previewversion.PreviewVersionAsyncClient.updateWidgetColor":"_Specs_.Azure.Versioning.PreviewVersion.updateWidgetColor","azure.versioning.previewversion.PreviewVersionAsyncClient.updateWidgetColorWithResponse":"_Specs_.Azure.Versioning.PreviewVersion.updateWidgetColor","azure.versioning.previewversion.PreviewVersionClient":"_Specs_.Azure.Versioning.PreviewVersion","azure.versioning.previewversion.PreviewVersionClient.getWidget":"_Specs_.Azure.Versioning.PreviewVersion.getWidget","azure.versioning.previewversion.PreviewVersionClient.getWidgetWithResponse":"_Specs_.Azure.Versioning.PreviewVersion.getWidget","azure.versioning.previewversion.PreviewVersionClient.listWidgets":"_Specs_.Azure.Versioning.PreviewVersion.listWidgets","azure.versioning.previewversion.PreviewVersionClient.listWidgetsWithResponse":"_Specs_.Azure.Versioning.PreviewVersion.listWidgets","azure.versioning.previewversion.PreviewVersionClient.updateWidgetColor":"_Specs_.Azure.Versioning.PreviewVersion.updateWidgetColor","azure.versioning.previewversion.PreviewVersionClient.updateWidgetColorWithResponse":"_Specs_.Azure.Versioning.PreviewVersion.updateWidgetColor","azure.versioning.previewversion.PreviewVersionClientBuilder":"_Specs_.Azure.Versioning.PreviewVersion","azure.versioning.previewversion.models.ListWidgetsResponse":"_Specs_.Azure.Versioning.PreviewVersion.listWidgets.Response.anonymous","azure.versioning.previewversion.models.UpdateWidgetColorRequest":"_Specs_.Azure.Versioning.PreviewVersion.UpdateWidgetColorRequest","azure.versioning.previewversion.models.Widget":"_Specs_.Azure.Versioning.PreviewVersion.Widget"},"generatedFiles":["src/main/java/azure/versioning/previewversion/PreviewVersionAsyncClient.java","src/main/java/azure/versioning/previewversion/PreviewVersionClient.java","src/main/java/azure/versioning/previewversion/PreviewVersionClientBuilder.java","src/main/java/azure/versioning/previewversion/PreviewVersionServiceVersion.java","src/main/java/azure/versioning/previewversion/implementation/JsonMergePatchHelper.java","src/main/java/azure/versioning/previewversion/implementation/PreviewVersionClientImpl.java","src/main/java/azure/versioning/previewversion/implementation/package-info.java","src/main/java/azure/versioning/previewversion/models/ListWidgetsResponse.java","src/main/java/azure/versioning/previewversion/models/UpdateWidgetColorRequest.java","src/main/java/azure/versioning/previewversion/models/Widget.java","src/main/java/azure/versioning/previewversion/models/package-info.java","src/main/java/azure/versioning/previewversion/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-clientnamespace_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-clientnamespace_apiview_properties.json deleted file mode 100644 index d59cf7dae7c..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-clientnamespace_apiview_properties.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "client.clientnamespace.ClientNamespaceFirstAsyncClient": "ClientNameSpaceClient.ClientNamespaceFirstClient", - "client.clientnamespace.ClientNamespaceFirstAsyncClient.getFirst": "ClientNameSpaceClient.ClientNamespaceFirstClient.getFirst", - "client.clientnamespace.ClientNamespaceFirstAsyncClient.getFirstWithResponse": "ClientNameSpaceClient.ClientNamespaceFirstClient.getFirst", - "client.clientnamespace.ClientNamespaceFirstClient": "ClientNameSpaceClient.ClientNamespaceFirstClient", - "client.clientnamespace.ClientNamespaceFirstClient.getFirst": "ClientNameSpaceClient.ClientNamespaceFirstClient.getFirst", - "client.clientnamespace.ClientNamespaceFirstClient.getFirstWithResponse": "ClientNameSpaceClient.ClientNamespaceFirstClient.getFirst", - "client.clientnamespace.ClientNamespaceFirstClientBuilder": "ClientNameSpaceClient.ClientNamespaceFirstClient", - "client.clientnamespace.first.models.FirstClientResult": "Client.ClientNamespace.FirstModel.FirstClientResult", - "client.clientnamespace.second.ClientNamespaceSecondAsyncClient": "ClientNameSpaceClient.ClientNamespaceSecondClient", - "client.clientnamespace.second.ClientNamespaceSecondAsyncClient.getSecond": "ClientNameSpaceClient.ClientNamespaceSecondClient.getSecond", - "client.clientnamespace.second.ClientNamespaceSecondAsyncClient.getSecondWithResponse": "ClientNameSpaceClient.ClientNamespaceSecondClient.getSecond", - "client.clientnamespace.second.ClientNamespaceSecondClient": "ClientNameSpaceClient.ClientNamespaceSecondClient", - "client.clientnamespace.second.ClientNamespaceSecondClient.getSecond": "ClientNameSpaceClient.ClientNamespaceSecondClient.getSecond", - "client.clientnamespace.second.ClientNamespaceSecondClient.getSecondWithResponse": "ClientNameSpaceClient.ClientNamespaceSecondClient.getSecond", - "client.clientnamespace.second.ClientNamespaceSecondClientBuilder": "ClientNameSpaceClient.ClientNamespaceSecondClient", - "client.clientnamespace.second.models.SecondClientResult": "Client.ClientNamespace.Second.Model.SecondClientResult", - "client.clientnamespace.second.sub.models.SecondClientEnumType": "Client.ClientNamespace.Second.Model.SecondClientEnumType" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-clientnamespace_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-clientnamespace_metadata.json index cfa23759df2..d5415739aa3 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-clientnamespace_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-clientnamespace_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"client.clientnamespace.ClientNamespaceFirstAsyncClient":"ClientNameSpaceClient.ClientNamespaceFirstClient","client.clientnamespace.ClientNamespaceFirstAsyncClient.getFirst":"ClientNameSpaceClient.ClientNamespaceFirstClient.getFirst","client.clientnamespace.ClientNamespaceFirstAsyncClient.getFirstWithResponse":"ClientNameSpaceClient.ClientNamespaceFirstClient.getFirst","client.clientnamespace.ClientNamespaceFirstClient":"ClientNameSpaceClient.ClientNamespaceFirstClient","client.clientnamespace.ClientNamespaceFirstClient.getFirst":"ClientNameSpaceClient.ClientNamespaceFirstClient.getFirst","client.clientnamespace.ClientNamespaceFirstClient.getFirstWithResponse":"ClientNameSpaceClient.ClientNamespaceFirstClient.getFirst","client.clientnamespace.ClientNamespaceFirstClientBuilder":"ClientNameSpaceClient.ClientNamespaceFirstClient","client.clientnamespace.first.models.FirstClientResult":"Client.ClientNamespace.FirstModel.FirstClientResult","client.clientnamespace.second.ClientNamespaceSecondAsyncClient":"ClientNameSpaceClient.ClientNamespaceSecondClient","client.clientnamespace.second.ClientNamespaceSecondAsyncClient.getSecond":"ClientNameSpaceClient.ClientNamespaceSecondClient.getSecond","client.clientnamespace.second.ClientNamespaceSecondAsyncClient.getSecondWithResponse":"ClientNameSpaceClient.ClientNamespaceSecondClient.getSecond","client.clientnamespace.second.ClientNamespaceSecondClient":"ClientNameSpaceClient.ClientNamespaceSecondClient","client.clientnamespace.second.ClientNamespaceSecondClient.getSecond":"ClientNameSpaceClient.ClientNamespaceSecondClient.getSecond","client.clientnamespace.second.ClientNamespaceSecondClient.getSecondWithResponse":"ClientNameSpaceClient.ClientNamespaceSecondClient.getSecond","client.clientnamespace.second.ClientNamespaceSecondClientBuilder":"ClientNameSpaceClient.ClientNamespaceSecondClient","client.clientnamespace.second.models.SecondClientResult":"Client.ClientNamespace.Second.Model.SecondClientResult","client.clientnamespace.second.sub.models.SecondClientEnumType":"Client.ClientNamespace.Second.Model.SecondClientEnumType"},"generatedFiles":["src/main/java/client/clientnamespace/ClientNamespaceFirstAsyncClient.java","src/main/java/client/clientnamespace/ClientNamespaceFirstClient.java","src/main/java/client/clientnamespace/ClientNamespaceFirstClientBuilder.java","src/main/java/client/clientnamespace/first/models/FirstClientResult.java","src/main/java/client/clientnamespace/first/models/package-info.java","src/main/java/client/clientnamespace/implementation/ClientNamespaceFirstClientImpl.java","src/main/java/client/clientnamespace/implementation/ClientNamespaceSecondClientImpl.java","src/main/java/client/clientnamespace/implementation/package-info.java","src/main/java/client/clientnamespace/package-info.java","src/main/java/client/clientnamespace/second/ClientNamespaceSecondAsyncClient.java","src/main/java/client/clientnamespace/second/ClientNamespaceSecondClient.java","src/main/java/client/clientnamespace/second/ClientNamespaceSecondClientBuilder.java","src/main/java/client/clientnamespace/second/models/SecondClientResult.java","src/main/java/client/clientnamespace/second/models/package-info.java","src/main/java/client/clientnamespace/second/package-info.java","src/main/java/client/clientnamespace/second/sub/models/SecondClientEnumType.java","src/main/java/client/clientnamespace/second/sub/models/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"client.clientnamespace.ClientNamespaceFirstAsyncClient":"ClientNameSpaceClient.ClientNamespaceFirstClient","client.clientnamespace.ClientNamespaceFirstAsyncClient.getFirst":"ClientNameSpaceClient.ClientNamespaceFirstClient.getFirst","client.clientnamespace.ClientNamespaceFirstAsyncClient.getFirstWithResponse":"ClientNameSpaceClient.ClientNamespaceFirstClient.getFirst","client.clientnamespace.ClientNamespaceFirstClient":"ClientNameSpaceClient.ClientNamespaceFirstClient","client.clientnamespace.ClientNamespaceFirstClient.getFirst":"ClientNameSpaceClient.ClientNamespaceFirstClient.getFirst","client.clientnamespace.ClientNamespaceFirstClient.getFirstWithResponse":"ClientNameSpaceClient.ClientNamespaceFirstClient.getFirst","client.clientnamespace.ClientNamespaceFirstClientBuilder":"ClientNameSpaceClient.ClientNamespaceFirstClient","client.clientnamespace.first.models.FirstClientResult":"Client.ClientNamespace.FirstModel.FirstClientResult","client.clientnamespace.second.ClientNamespaceSecondAsyncClient":"ClientNameSpaceClient.ClientNamespaceSecondClient","client.clientnamespace.second.ClientNamespaceSecondAsyncClient.getSecond":"ClientNameSpaceClient.ClientNamespaceSecondClient.getSecond","client.clientnamespace.second.ClientNamespaceSecondAsyncClient.getSecondWithResponse":"ClientNameSpaceClient.ClientNamespaceSecondClient.getSecond","client.clientnamespace.second.ClientNamespaceSecondClient":"ClientNameSpaceClient.ClientNamespaceSecondClient","client.clientnamespace.second.ClientNamespaceSecondClient.getSecond":"ClientNameSpaceClient.ClientNamespaceSecondClient.getSecond","client.clientnamespace.second.ClientNamespaceSecondClient.getSecondWithResponse":"ClientNameSpaceClient.ClientNamespaceSecondClient.getSecond","client.clientnamespace.second.ClientNamespaceSecondClientBuilder":"ClientNameSpaceClient.ClientNamespaceSecondClient","client.clientnamespace.second.models.SecondClientResult":"Client.ClientNamespace.Second.Model.SecondClientResult","client.clientnamespace.second.sub.models.SecondClientEnumType":"Client.ClientNamespace.Second.Model.SecondClientEnumType"},"generatedFiles":["src/main/java/client/clientnamespace/ClientNamespaceFirstAsyncClient.java","src/main/java/client/clientnamespace/ClientNamespaceFirstClient.java","src/main/java/client/clientnamespace/ClientNamespaceFirstClientBuilder.java","src/main/java/client/clientnamespace/first/models/FirstClientResult.java","src/main/java/client/clientnamespace/first/models/package-info.java","src/main/java/client/clientnamespace/implementation/ClientNamespaceFirstClientImpl.java","src/main/java/client/clientnamespace/implementation/ClientNamespaceSecondClientImpl.java","src/main/java/client/clientnamespace/implementation/package-info.java","src/main/java/client/clientnamespace/package-info.java","src/main/java/client/clientnamespace/second/ClientNamespaceSecondAsyncClient.java","src/main/java/client/clientnamespace/second/ClientNamespaceSecondClient.java","src/main/java/client/clientnamespace/second/ClientNamespaceSecondClientBuilder.java","src/main/java/client/clientnamespace/second/models/SecondClientResult.java","src/main/java/client/clientnamespace/second/models/package-info.java","src/main/java/client/clientnamespace/second/package-info.java","src/main/java/client/clientnamespace/second/sub/models/SecondClientEnumType.java","src/main/java/client/clientnamespace/second/sub/models/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-naming-enumconflict_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-naming-enumconflict_apiview_properties.json deleted file mode 100644 index a4831a5f744..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-naming-enumconflict_apiview_properties.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "client.naming.enumconflict.EnumConflictClientBuilder": "Client.Naming.EnumConflict", - "client.naming.enumconflict.FirstOperationsAsyncClient": "Client.Naming.EnumConflict.FirstOperations", - "client.naming.enumconflict.FirstOperationsAsyncClient.first": "Client.Naming.EnumConflict.FirstOperations.first", - "client.naming.enumconflict.FirstOperationsAsyncClient.firstWithResponse": "Client.Naming.EnumConflict.FirstOperations.first", - "client.naming.enumconflict.FirstOperationsClient": "Client.Naming.EnumConflict.FirstOperations", - "client.naming.enumconflict.FirstOperationsClient.first": "Client.Naming.EnumConflict.FirstOperations.first", - "client.naming.enumconflict.FirstOperationsClient.firstWithResponse": "Client.Naming.EnumConflict.FirstOperations.first", - "client.naming.enumconflict.SecondOperationsAsyncClient": "Client.Naming.EnumConflict.SecondOperations", - "client.naming.enumconflict.SecondOperationsAsyncClient.second": "Client.Naming.EnumConflict.SecondOperations.second", - "client.naming.enumconflict.SecondOperationsAsyncClient.secondWithResponse": "Client.Naming.EnumConflict.SecondOperations.second", - "client.naming.enumconflict.SecondOperationsClient": "Client.Naming.EnumConflict.SecondOperations", - "client.naming.enumconflict.SecondOperationsClient.second": "Client.Naming.EnumConflict.SecondOperations.second", - "client.naming.enumconflict.SecondOperationsClient.secondWithResponse": "Client.Naming.EnumConflict.SecondOperations.second", - "client.naming.enumconflict.firstnamespace.models.FirstModel": "Client.Naming.EnumConflict.FirstNamespace.FirstModel", - "client.naming.enumconflict.firstnamespace.models.Status": "Client.Naming.EnumConflict.FirstNamespace.Status", - "client.naming.enumconflict.secondnamespace.models.SecondModel": "Client.Naming.EnumConflict.SecondNamespace.SecondModel", - "client.naming.enumconflict.secondnamespace.models.SecondStatus": "Client.Naming.EnumConflict.SecondNamespace.Status" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-naming-enumconflict_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-naming-enumconflict_metadata.json index 654827ac5b6..9648770cc30 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-naming-enumconflict_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-naming-enumconflict_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"client.naming.enumconflict.EnumConflictClientBuilder":"Client.Naming.EnumConflict","client.naming.enumconflict.FirstOperationsAsyncClient":"Client.Naming.EnumConflict.FirstOperations","client.naming.enumconflict.FirstOperationsAsyncClient.first":"Client.Naming.EnumConflict.FirstOperations.first","client.naming.enumconflict.FirstOperationsAsyncClient.firstWithResponse":"Client.Naming.EnumConflict.FirstOperations.first","client.naming.enumconflict.FirstOperationsClient":"Client.Naming.EnumConflict.FirstOperations","client.naming.enumconflict.FirstOperationsClient.first":"Client.Naming.EnumConflict.FirstOperations.first","client.naming.enumconflict.FirstOperationsClient.firstWithResponse":"Client.Naming.EnumConflict.FirstOperations.first","client.naming.enumconflict.SecondOperationsAsyncClient":"Client.Naming.EnumConflict.SecondOperations","client.naming.enumconflict.SecondOperationsAsyncClient.second":"Client.Naming.EnumConflict.SecondOperations.second","client.naming.enumconflict.SecondOperationsAsyncClient.secondWithResponse":"Client.Naming.EnumConflict.SecondOperations.second","client.naming.enumconflict.SecondOperationsClient":"Client.Naming.EnumConflict.SecondOperations","client.naming.enumconflict.SecondOperationsClient.second":"Client.Naming.EnumConflict.SecondOperations.second","client.naming.enumconflict.SecondOperationsClient.secondWithResponse":"Client.Naming.EnumConflict.SecondOperations.second","client.naming.enumconflict.firstnamespace.models.FirstModel":"Client.Naming.EnumConflict.FirstNamespace.FirstModel","client.naming.enumconflict.firstnamespace.models.Status":"Client.Naming.EnumConflict.FirstNamespace.Status","client.naming.enumconflict.secondnamespace.models.SecondModel":"Client.Naming.EnumConflict.SecondNamespace.SecondModel","client.naming.enumconflict.secondnamespace.models.SecondStatus":"Client.Naming.EnumConflict.SecondNamespace.Status"},"generatedFiles":["src/main/java/client/naming/enumconflict/EnumConflictClientBuilder.java","src/main/java/client/naming/enumconflict/FirstOperationsAsyncClient.java","src/main/java/client/naming/enumconflict/FirstOperationsClient.java","src/main/java/client/naming/enumconflict/SecondOperationsAsyncClient.java","src/main/java/client/naming/enumconflict/SecondOperationsClient.java","src/main/java/client/naming/enumconflict/firstnamespace/models/FirstModel.java","src/main/java/client/naming/enumconflict/firstnamespace/models/Status.java","src/main/java/client/naming/enumconflict/firstnamespace/models/package-info.java","src/main/java/client/naming/enumconflict/implementation/EnumConflictClientImpl.java","src/main/java/client/naming/enumconflict/implementation/FirstOperationsImpl.java","src/main/java/client/naming/enumconflict/implementation/SecondOperationsImpl.java","src/main/java/client/naming/enumconflict/implementation/package-info.java","src/main/java/client/naming/enumconflict/package-info.java","src/main/java/client/naming/enumconflict/secondnamespace/models/SecondModel.java","src/main/java/client/naming/enumconflict/secondnamespace/models/SecondStatus.java","src/main/java/client/naming/enumconflict/secondnamespace/models/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"client.naming.enumconflict.EnumConflictClientBuilder":"Client.Naming.EnumConflict","client.naming.enumconflict.FirstOperationsAsyncClient":"Client.Naming.EnumConflict.FirstOperations","client.naming.enumconflict.FirstOperationsAsyncClient.first":"Client.Naming.EnumConflict.FirstOperations.first","client.naming.enumconflict.FirstOperationsAsyncClient.firstWithResponse":"Client.Naming.EnumConflict.FirstOperations.first","client.naming.enumconflict.FirstOperationsClient":"Client.Naming.EnumConflict.FirstOperations","client.naming.enumconflict.FirstOperationsClient.first":"Client.Naming.EnumConflict.FirstOperations.first","client.naming.enumconflict.FirstOperationsClient.firstWithResponse":"Client.Naming.EnumConflict.FirstOperations.first","client.naming.enumconflict.SecondOperationsAsyncClient":"Client.Naming.EnumConflict.SecondOperations","client.naming.enumconflict.SecondOperationsAsyncClient.second":"Client.Naming.EnumConflict.SecondOperations.second","client.naming.enumconflict.SecondOperationsAsyncClient.secondWithResponse":"Client.Naming.EnumConflict.SecondOperations.second","client.naming.enumconflict.SecondOperationsClient":"Client.Naming.EnumConflict.SecondOperations","client.naming.enumconflict.SecondOperationsClient.second":"Client.Naming.EnumConflict.SecondOperations.second","client.naming.enumconflict.SecondOperationsClient.secondWithResponse":"Client.Naming.EnumConflict.SecondOperations.second","client.naming.enumconflict.firstnamespace.models.FirstModel":"Client.Naming.EnumConflict.FirstNamespace.FirstModel","client.naming.enumconflict.firstnamespace.models.Status":"Client.Naming.EnumConflict.FirstNamespace.Status","client.naming.enumconflict.secondnamespace.models.SecondModel":"Client.Naming.EnumConflict.SecondNamespace.SecondModel","client.naming.enumconflict.secondnamespace.models.SecondStatus":"Client.Naming.EnumConflict.SecondNamespace.Status"},"generatedFiles":["src/main/java/client/naming/enumconflict/EnumConflictClientBuilder.java","src/main/java/client/naming/enumconflict/FirstOperationsAsyncClient.java","src/main/java/client/naming/enumconflict/FirstOperationsClient.java","src/main/java/client/naming/enumconflict/SecondOperationsAsyncClient.java","src/main/java/client/naming/enumconflict/SecondOperationsClient.java","src/main/java/client/naming/enumconflict/firstnamespace/models/FirstModel.java","src/main/java/client/naming/enumconflict/firstnamespace/models/Status.java","src/main/java/client/naming/enumconflict/firstnamespace/models/package-info.java","src/main/java/client/naming/enumconflict/implementation/EnumConflictClientImpl.java","src/main/java/client/naming/enumconflict/implementation/FirstOperationsImpl.java","src/main/java/client/naming/enumconflict/implementation/SecondOperationsImpl.java","src/main/java/client/naming/enumconflict/implementation/package-info.java","src/main/java/client/naming/enumconflict/package-info.java","src/main/java/client/naming/enumconflict/secondnamespace/models/SecondModel.java","src/main/java/client/naming/enumconflict/secondnamespace/models/SecondStatus.java","src/main/java/client/naming/enumconflict/secondnamespace/models/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-naming_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-naming_apiview_properties.json deleted file mode 100644 index 40f6085435d..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-naming_apiview_properties.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "client.naming.ModelAsyncClient": "Client.Naming.Model", - "client.naming.ModelAsyncClient.client": "Client.Naming.Model.client", - "client.naming.ModelAsyncClient.clientWithResponse": "Client.Naming.Model.client", - "client.naming.ModelAsyncClient.language": "Client.Naming.Model.language", - "client.naming.ModelAsyncClient.languageWithResponse": "Client.Naming.Model.language", - "client.naming.ModelClient": "Client.Naming.Model", - "client.naming.ModelClient.client": "Client.Naming.Model.client", - "client.naming.ModelClient.clientWithResponse": "Client.Naming.Model.client", - "client.naming.ModelClient.language": "Client.Naming.Model.language", - "client.naming.ModelClient.languageWithResponse": "Client.Naming.Model.language", - "client.naming.NamingAsyncClient": "Client.Naming", - "client.naming.NamingAsyncClient.client": "Client.Naming.Property.client", - "client.naming.NamingAsyncClient.clientName": "Client.Naming.operation", - "client.naming.NamingAsyncClient.clientNameWithResponse": "Client.Naming.operation", - "client.naming.NamingAsyncClient.clientWithResponse": "Client.Naming.Property.client", - "client.naming.NamingAsyncClient.compatibleWithEncodedName": "Client.Naming.Property.compatibleWithEncodedName", - "client.naming.NamingAsyncClient.compatibleWithEncodedNameWithResponse": "Client.Naming.Property.compatibleWithEncodedName", - "client.naming.NamingAsyncClient.language": "Client.Naming.Property.language", - "client.naming.NamingAsyncClient.languageWithResponse": "Client.Naming.Property.language", - "client.naming.NamingAsyncClient.parameter": "Client.Naming.parameter", - "client.naming.NamingAsyncClient.parameterWithResponse": "Client.Naming.parameter", - "client.naming.NamingAsyncClient.request": "Client.Naming.Header.request", - "client.naming.NamingAsyncClient.requestWithResponse": "Client.Naming.Header.request", - "client.naming.NamingAsyncClient.response": "Client.Naming.Header.response", - "client.naming.NamingAsyncClient.responseWithResponse": "Client.Naming.Header.response", - "client.naming.NamingClient": "Client.Naming", - "client.naming.NamingClient.client": "Client.Naming.Property.client", - "client.naming.NamingClient.clientName": "Client.Naming.operation", - "client.naming.NamingClient.clientNameWithResponse": "Client.Naming.operation", - "client.naming.NamingClient.clientWithResponse": "Client.Naming.Property.client", - "client.naming.NamingClient.compatibleWithEncodedName": "Client.Naming.Property.compatibleWithEncodedName", - "client.naming.NamingClient.compatibleWithEncodedNameWithResponse": "Client.Naming.Property.compatibleWithEncodedName", - "client.naming.NamingClient.language": "Client.Naming.Property.language", - "client.naming.NamingClient.languageWithResponse": "Client.Naming.Property.language", - "client.naming.NamingClient.parameter": "Client.Naming.parameter", - "client.naming.NamingClient.parameterWithResponse": "Client.Naming.parameter", - "client.naming.NamingClient.request": "Client.Naming.Header.request", - "client.naming.NamingClient.requestWithResponse": "Client.Naming.Header.request", - "client.naming.NamingClient.response": "Client.Naming.Header.response", - "client.naming.NamingClient.responseWithResponse": "Client.Naming.Header.response", - "client.naming.NamingClientBuilder": "Client.Naming", - "client.naming.UnionEnumAsyncClient": "Client.Naming.UnionEnum", - "client.naming.UnionEnumAsyncClient.unionEnumMemberName": "Client.Naming.UnionEnum.unionEnumMemberName", - "client.naming.UnionEnumAsyncClient.unionEnumMemberNameWithResponse": "Client.Naming.UnionEnum.unionEnumMemberName", - "client.naming.UnionEnumAsyncClient.unionEnumName": "Client.Naming.UnionEnum.unionEnumName", - "client.naming.UnionEnumAsyncClient.unionEnumNameWithResponse": "Client.Naming.UnionEnum.unionEnumName", - "client.naming.UnionEnumClient": "Client.Naming.UnionEnum", - "client.naming.UnionEnumClient.unionEnumMemberName": "Client.Naming.UnionEnum.unionEnumMemberName", - "client.naming.UnionEnumClient.unionEnumMemberNameWithResponse": "Client.Naming.UnionEnum.unionEnumMemberName", - "client.naming.UnionEnumClient.unionEnumName": "Client.Naming.UnionEnum.unionEnumName", - "client.naming.UnionEnumClient.unionEnumNameWithResponse": "Client.Naming.UnionEnum.unionEnumName", - "client.naming.model.models.ClientModel": "Client.Naming.Model.ModelWithClientClientName", - "client.naming.model.models.JavaModel": "Client.Naming.Model.ModelWithLanguageClientName", - "client.naming.property.models.ClientNameAndJsonEncodedNameModel": "Client.Naming.Property.ClientNameAndJsonEncodedNameModel", - "client.naming.property.models.ClientNameModel": "Client.Naming.Property.ClientNameModel", - "client.naming.property.models.LanguageClientNameModel": "Client.Naming.Property.LanguageClientNameModel", - "client.naming.unionenum.models.ClientExtensibleEnum": "Client.Naming.UnionEnum.ServerExtensibleEnum", - "client.naming.unionenum.models.ExtensibleEnum": "Client.Naming.UnionEnum.ExtensibleEnum" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-naming_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-naming_metadata.json index 310a52df4d1..070b1b3c21f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-naming_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-naming_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"client.naming.ModelAsyncClient":"Client.Naming.Model","client.naming.ModelAsyncClient.client":"Client.Naming.Model.client","client.naming.ModelAsyncClient.clientWithResponse":"Client.Naming.Model.client","client.naming.ModelAsyncClient.language":"Client.Naming.Model.language","client.naming.ModelAsyncClient.languageWithResponse":"Client.Naming.Model.language","client.naming.ModelClient":"Client.Naming.Model","client.naming.ModelClient.client":"Client.Naming.Model.client","client.naming.ModelClient.clientWithResponse":"Client.Naming.Model.client","client.naming.ModelClient.language":"Client.Naming.Model.language","client.naming.ModelClient.languageWithResponse":"Client.Naming.Model.language","client.naming.NamingAsyncClient":"Client.Naming","client.naming.NamingAsyncClient.client":"Client.Naming.Property.client","client.naming.NamingAsyncClient.clientName":"Client.Naming.operation","client.naming.NamingAsyncClient.clientNameWithResponse":"Client.Naming.operation","client.naming.NamingAsyncClient.clientWithResponse":"Client.Naming.Property.client","client.naming.NamingAsyncClient.compatibleWithEncodedName":"Client.Naming.Property.compatibleWithEncodedName","client.naming.NamingAsyncClient.compatibleWithEncodedNameWithResponse":"Client.Naming.Property.compatibleWithEncodedName","client.naming.NamingAsyncClient.language":"Client.Naming.Property.language","client.naming.NamingAsyncClient.languageWithResponse":"Client.Naming.Property.language","client.naming.NamingAsyncClient.parameter":"Client.Naming.parameter","client.naming.NamingAsyncClient.parameterWithResponse":"Client.Naming.parameter","client.naming.NamingAsyncClient.request":"Client.Naming.Header.request","client.naming.NamingAsyncClient.requestWithResponse":"Client.Naming.Header.request","client.naming.NamingAsyncClient.response":"Client.Naming.Header.response","client.naming.NamingAsyncClient.responseWithResponse":"Client.Naming.Header.response","client.naming.NamingClient":"Client.Naming","client.naming.NamingClient.client":"Client.Naming.Property.client","client.naming.NamingClient.clientName":"Client.Naming.operation","client.naming.NamingClient.clientNameWithResponse":"Client.Naming.operation","client.naming.NamingClient.clientWithResponse":"Client.Naming.Property.client","client.naming.NamingClient.compatibleWithEncodedName":"Client.Naming.Property.compatibleWithEncodedName","client.naming.NamingClient.compatibleWithEncodedNameWithResponse":"Client.Naming.Property.compatibleWithEncodedName","client.naming.NamingClient.language":"Client.Naming.Property.language","client.naming.NamingClient.languageWithResponse":"Client.Naming.Property.language","client.naming.NamingClient.parameter":"Client.Naming.parameter","client.naming.NamingClient.parameterWithResponse":"Client.Naming.parameter","client.naming.NamingClient.request":"Client.Naming.Header.request","client.naming.NamingClient.requestWithResponse":"Client.Naming.Header.request","client.naming.NamingClient.response":"Client.Naming.Header.response","client.naming.NamingClient.responseWithResponse":"Client.Naming.Header.response","client.naming.NamingClientBuilder":"Client.Naming","client.naming.UnionEnumAsyncClient":"Client.Naming.UnionEnum","client.naming.UnionEnumAsyncClient.unionEnumMemberName":"Client.Naming.UnionEnum.unionEnumMemberName","client.naming.UnionEnumAsyncClient.unionEnumMemberNameWithResponse":"Client.Naming.UnionEnum.unionEnumMemberName","client.naming.UnionEnumAsyncClient.unionEnumName":"Client.Naming.UnionEnum.unionEnumName","client.naming.UnionEnumAsyncClient.unionEnumNameWithResponse":"Client.Naming.UnionEnum.unionEnumName","client.naming.UnionEnumClient":"Client.Naming.UnionEnum","client.naming.UnionEnumClient.unionEnumMemberName":"Client.Naming.UnionEnum.unionEnumMemberName","client.naming.UnionEnumClient.unionEnumMemberNameWithResponse":"Client.Naming.UnionEnum.unionEnumMemberName","client.naming.UnionEnumClient.unionEnumName":"Client.Naming.UnionEnum.unionEnumName","client.naming.UnionEnumClient.unionEnumNameWithResponse":"Client.Naming.UnionEnum.unionEnumName","client.naming.model.models.ClientModel":"Client.Naming.Model.ModelWithClientClientName","client.naming.model.models.JavaModel":"Client.Naming.Model.ModelWithLanguageClientName","client.naming.property.models.ClientNameAndJsonEncodedNameModel":"Client.Naming.Property.ClientNameAndJsonEncodedNameModel","client.naming.property.models.ClientNameModel":"Client.Naming.Property.ClientNameModel","client.naming.property.models.LanguageClientNameModel":"Client.Naming.Property.LanguageClientNameModel","client.naming.unionenum.models.ClientExtensibleEnum":"Client.Naming.UnionEnum.ServerExtensibleEnum","client.naming.unionenum.models.ExtensibleEnum":"Client.Naming.UnionEnum.ExtensibleEnum"},"generatedFiles":["src/main/java/client/naming/ModelAsyncClient.java","src/main/java/client/naming/ModelClient.java","src/main/java/client/naming/NamingAsyncClient.java","src/main/java/client/naming/NamingClient.java","src/main/java/client/naming/NamingClientBuilder.java","src/main/java/client/naming/UnionEnumAsyncClient.java","src/main/java/client/naming/UnionEnumClient.java","src/main/java/client/naming/implementation/ModelClientsImpl.java","src/main/java/client/naming/implementation/NamingClientImpl.java","src/main/java/client/naming/implementation/UnionEnumsImpl.java","src/main/java/client/naming/implementation/package-info.java","src/main/java/client/naming/model/models/ClientModel.java","src/main/java/client/naming/model/models/JavaModel.java","src/main/java/client/naming/model/models/package-info.java","src/main/java/client/naming/package-info.java","src/main/java/client/naming/property/models/ClientNameAndJsonEncodedNameModel.java","src/main/java/client/naming/property/models/ClientNameModel.java","src/main/java/client/naming/property/models/LanguageClientNameModel.java","src/main/java/client/naming/property/models/package-info.java","src/main/java/client/naming/unionenum/models/ClientExtensibleEnum.java","src/main/java/client/naming/unionenum/models/ExtensibleEnum.java","src/main/java/client/naming/unionenum/models/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"client.naming.HeaderAsyncClient":"Client.Naming.Header","client.naming.HeaderAsyncClient.request":"Client.Naming.Header.request","client.naming.HeaderAsyncClient.requestWithResponse":"Client.Naming.Header.request","client.naming.HeaderAsyncClient.response":"Client.Naming.Header.response","client.naming.HeaderAsyncClient.responseWithResponse":"Client.Naming.Header.response","client.naming.HeaderClient":"Client.Naming.Header","client.naming.HeaderClient.request":"Client.Naming.Header.request","client.naming.HeaderClient.requestWithResponse":"Client.Naming.Header.request","client.naming.HeaderClient.response":"Client.Naming.Header.response","client.naming.HeaderClient.responseWithResponse":"Client.Naming.Header.response","client.naming.ModelAsyncClient":"Client.Naming.Model","client.naming.ModelAsyncClient.client":"Client.Naming.Model.client","client.naming.ModelAsyncClient.clientWithResponse":"Client.Naming.Model.client","client.naming.ModelAsyncClient.language":"Client.Naming.Model.language","client.naming.ModelAsyncClient.languageWithResponse":"Client.Naming.Model.language","client.naming.ModelClient":"Client.Naming.Model","client.naming.ModelClient.client":"Client.Naming.Model.client","client.naming.ModelClient.clientWithResponse":"Client.Naming.Model.client","client.naming.ModelClient.language":"Client.Naming.Model.language","client.naming.ModelClient.languageWithResponse":"Client.Naming.Model.language","client.naming.NamingAsyncClient":"Client.Naming","client.naming.NamingAsyncClient.clientName":"Client.Naming.operation","client.naming.NamingAsyncClient.clientNameWithResponse":"Client.Naming.operation","client.naming.NamingAsyncClient.parameter":"Client.Naming.parameter","client.naming.NamingAsyncClient.parameterWithResponse":"Client.Naming.parameter","client.naming.NamingClient":"Client.Naming","client.naming.NamingClient.clientName":"Client.Naming.operation","client.naming.NamingClient.clientNameWithResponse":"Client.Naming.operation","client.naming.NamingClient.parameter":"Client.Naming.parameter","client.naming.NamingClient.parameterWithResponse":"Client.Naming.parameter","client.naming.NamingClientBuilder":"Client.Naming","client.naming.PropertyAsyncClient":"Client.Naming.Property","client.naming.PropertyAsyncClient.client":"Client.Naming.Property.client","client.naming.PropertyAsyncClient.clientWithResponse":"Client.Naming.Property.client","client.naming.PropertyAsyncClient.compatibleWithEncodedName":"Client.Naming.Property.compatibleWithEncodedName","client.naming.PropertyAsyncClient.compatibleWithEncodedNameWithResponse":"Client.Naming.Property.compatibleWithEncodedName","client.naming.PropertyAsyncClient.language":"Client.Naming.Property.language","client.naming.PropertyAsyncClient.languageWithResponse":"Client.Naming.Property.language","client.naming.PropertyClient":"Client.Naming.Property","client.naming.PropertyClient.client":"Client.Naming.Property.client","client.naming.PropertyClient.clientWithResponse":"Client.Naming.Property.client","client.naming.PropertyClient.compatibleWithEncodedName":"Client.Naming.Property.compatibleWithEncodedName","client.naming.PropertyClient.compatibleWithEncodedNameWithResponse":"Client.Naming.Property.compatibleWithEncodedName","client.naming.PropertyClient.language":"Client.Naming.Property.language","client.naming.PropertyClient.languageWithResponse":"Client.Naming.Property.language","client.naming.UnionEnumAsyncClient":"Client.Naming.UnionEnum","client.naming.UnionEnumAsyncClient.unionEnumMemberName":"Client.Naming.UnionEnum.unionEnumMemberName","client.naming.UnionEnumAsyncClient.unionEnumMemberNameWithResponse":"Client.Naming.UnionEnum.unionEnumMemberName","client.naming.UnionEnumAsyncClient.unionEnumName":"Client.Naming.UnionEnum.unionEnumName","client.naming.UnionEnumAsyncClient.unionEnumNameWithResponse":"Client.Naming.UnionEnum.unionEnumName","client.naming.UnionEnumClient":"Client.Naming.UnionEnum","client.naming.UnionEnumClient.unionEnumMemberName":"Client.Naming.UnionEnum.unionEnumMemberName","client.naming.UnionEnumClient.unionEnumMemberNameWithResponse":"Client.Naming.UnionEnum.unionEnumMemberName","client.naming.UnionEnumClient.unionEnumName":"Client.Naming.UnionEnum.unionEnumName","client.naming.UnionEnumClient.unionEnumNameWithResponse":"Client.Naming.UnionEnum.unionEnumName","client.naming.model.models.ClientModel":"Client.Naming.Model.ModelWithClientClientName","client.naming.model.models.JavaModel":"Client.Naming.Model.ModelWithLanguageClientName","client.naming.property.models.ClientNameAndJsonEncodedNameModel":"Client.Naming.Property.ClientNameAndJsonEncodedNameModel","client.naming.property.models.ClientNameModel":"Client.Naming.Property.ClientNameModel","client.naming.property.models.LanguageClientNameModel":"Client.Naming.Property.LanguageClientNameModel","client.naming.unionenum.models.ClientExtensibleEnum":"Client.Naming.UnionEnum.ServerExtensibleEnum","client.naming.unionenum.models.ExtensibleEnum":"Client.Naming.UnionEnum.ExtensibleEnum"},"generatedFiles":["src/main/java/client/naming/HeaderAsyncClient.java","src/main/java/client/naming/HeaderClient.java","src/main/java/client/naming/ModelAsyncClient.java","src/main/java/client/naming/ModelClient.java","src/main/java/client/naming/NamingAsyncClient.java","src/main/java/client/naming/NamingClient.java","src/main/java/client/naming/NamingClientBuilder.java","src/main/java/client/naming/PropertyAsyncClient.java","src/main/java/client/naming/PropertyClient.java","src/main/java/client/naming/UnionEnumAsyncClient.java","src/main/java/client/naming/UnionEnumClient.java","src/main/java/client/naming/implementation/HeadersImpl.java","src/main/java/client/naming/implementation/ModelClientsImpl.java","src/main/java/client/naming/implementation/NamingClientImpl.java","src/main/java/client/naming/implementation/PropertiesImpl.java","src/main/java/client/naming/implementation/UnionEnumsImpl.java","src/main/java/client/naming/implementation/package-info.java","src/main/java/client/naming/model/models/ClientModel.java","src/main/java/client/naming/model/models/JavaModel.java","src/main/java/client/naming/model/models/package-info.java","src/main/java/client/naming/package-info.java","src/main/java/client/naming/property/models/ClientNameAndJsonEncodedNameModel.java","src/main/java/client/naming/property/models/ClientNameModel.java","src/main/java/client/naming/property/models/LanguageClientNameModel.java","src/main/java/client/naming/property/models/package-info.java","src/main/java/client/naming/unionenum/models/ClientExtensibleEnum.java","src/main/java/client/naming/unionenum/models/ExtensibleEnum.java","src/main/java/client/naming/unionenum/models/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-overload_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-overload_apiview_properties.json deleted file mode 100644 index 7f451d6a2d4..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-overload_apiview_properties.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "client.overload.OverloadAsyncClient": "Client.Overload", - "client.overload.OverloadAsyncClient.list": "Client.Overload.list", - "client.overload.OverloadAsyncClient.listByScope": "Client.Overload.listByScope", - "client.overload.OverloadAsyncClient.listByScopeWithResponse": "Client.Overload.listByScope", - "client.overload.OverloadAsyncClient.listWithResponse": "Client.Overload.list", - "client.overload.OverloadClient": "Client.Overload", - "client.overload.OverloadClient.list": "Client.Overload.list", - "client.overload.OverloadClient.listByScope": "Client.Overload.listByScope", - "client.overload.OverloadClient.listByScopeWithResponse": "Client.Overload.listByScope", - "client.overload.OverloadClient.listWithResponse": "Client.Overload.list", - "client.overload.OverloadClientBuilder": "Client.Overload", - "client.overload.models.Resource": "Client.Overload.Resource" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-overload_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-overload_metadata.json index 05ce1b694de..b8a3495f2ea 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-overload_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-overload_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"client.overload.OverloadAsyncClient":"Client.Overload","client.overload.OverloadAsyncClient.list":"Client.Overload.list","client.overload.OverloadAsyncClient.listByScope":"Client.Overload.listByScope","client.overload.OverloadAsyncClient.listByScopeWithResponse":"Client.Overload.listByScope","client.overload.OverloadAsyncClient.listWithResponse":"Client.Overload.list","client.overload.OverloadClient":"Client.Overload","client.overload.OverloadClient.list":"Client.Overload.list","client.overload.OverloadClient.listByScope":"Client.Overload.listByScope","client.overload.OverloadClient.listByScopeWithResponse":"Client.Overload.listByScope","client.overload.OverloadClient.listWithResponse":"Client.Overload.list","client.overload.OverloadClientBuilder":"Client.Overload","client.overload.models.Resource":"Client.Overload.Resource"},"generatedFiles":["src/main/java/client/overload/OverloadAsyncClient.java","src/main/java/client/overload/OverloadClient.java","src/main/java/client/overload/OverloadClientBuilder.java","src/main/java/client/overload/implementation/OverloadClientImpl.java","src/main/java/client/overload/implementation/package-info.java","src/main/java/client/overload/models/Resource.java","src/main/java/client/overload/models/package-info.java","src/main/java/client/overload/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"client.overload.OverloadAsyncClient":"Client.Overload","client.overload.OverloadAsyncClient.list":"Client.Overload.list","client.overload.OverloadAsyncClient.listByScope":"Client.Overload.listByScope","client.overload.OverloadAsyncClient.listByScopeWithResponse":"Client.Overload.listByScope","client.overload.OverloadAsyncClient.listWithResponse":"Client.Overload.list","client.overload.OverloadClient":"Client.Overload","client.overload.OverloadClient.list":"Client.Overload.list","client.overload.OverloadClient.listByScope":"Client.Overload.listByScope","client.overload.OverloadClient.listByScopeWithResponse":"Client.Overload.listByScope","client.overload.OverloadClient.listWithResponse":"Client.Overload.list","client.overload.OverloadClientBuilder":"Client.Overload","client.overload.models.Resource":"Client.Overload.Resource"},"generatedFiles":["src/main/java/client/overload/OverloadAsyncClient.java","src/main/java/client/overload/OverloadClient.java","src/main/java/client/overload/OverloadClientBuilder.java","src/main/java/client/overload/implementation/OverloadClientImpl.java","src/main/java/client/overload/implementation/package-info.java","src/main/java/client/overload/models/Resource.java","src/main/java/client/overload/models/package-info.java","src/main/java/client/overload/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-clientoperationgroup_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-clientoperationgroup_apiview_properties.json deleted file mode 100644 index 190ae590faf..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-clientoperationgroup_apiview_properties.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "client.structure.anotherclientoperationgroup.subnamespace.Group5AsyncClient": "Client.Structure.AnotherClientOperationGroup.Group5", - "client.structure.anotherclientoperationgroup.subnamespace.Group5AsyncClient.six": "Client.Structure.AnotherClientOperationGroup.Group5.six", - "client.structure.anotherclientoperationgroup.subnamespace.Group5AsyncClient.sixWithResponse": "Client.Structure.AnotherClientOperationGroup.Group5.six", - "client.structure.anotherclientoperationgroup.subnamespace.Group5Client": "Client.Structure.AnotherClientOperationGroup.Group5", - "client.structure.anotherclientoperationgroup.subnamespace.Group5Client.six": "Client.Structure.AnotherClientOperationGroup.Group5.six", - "client.structure.anotherclientoperationgroup.subnamespace.Group5Client.sixWithResponse": "Client.Structure.AnotherClientOperationGroup.Group5.six", - "client.structure.anotherclientoperationgroup.subnamespace.SecondAsyncClient": "Client.Structure.AnotherClientOperationGroup", - "client.structure.anotherclientoperationgroup.subnamespace.SecondAsyncClient.five": "Client.Structure.AnotherClientOperationGroup.five", - "client.structure.anotherclientoperationgroup.subnamespace.SecondAsyncClient.fiveWithResponse": "Client.Structure.AnotherClientOperationGroup.five", - "client.structure.anotherclientoperationgroup.subnamespace.SecondClient": "Client.Structure.AnotherClientOperationGroup", - "client.structure.anotherclientoperationgroup.subnamespace.SecondClient.five": "Client.Structure.AnotherClientOperationGroup.five", - "client.structure.anotherclientoperationgroup.subnamespace.SecondClient.fiveWithResponse": "Client.Structure.AnotherClientOperationGroup.five", - "client.structure.anotherclientoperationgroup.subnamespace.SecondClientBuilder": "Client.Structure.AnotherClientOperationGroup", - "client.structure.clientoperationgroup.FirstAsyncClient": "Client.Structure.ClientOperationGroup", - "client.structure.clientoperationgroup.FirstAsyncClient.one": "Client.Structure.ClientOperationGroup.one", - "client.structure.clientoperationgroup.FirstAsyncClient.oneWithResponse": "Client.Structure.ClientOperationGroup.one", - "client.structure.clientoperationgroup.FirstClient": "Client.Structure.ClientOperationGroup", - "client.structure.clientoperationgroup.FirstClient.one": "Client.Structure.ClientOperationGroup.one", - "client.structure.clientoperationgroup.FirstClient.oneWithResponse": "Client.Structure.ClientOperationGroup.one", - "client.structure.clientoperationgroup.FirstClientBuilder": "Client.Structure.ClientOperationGroup", - "client.structure.clientoperationgroup.Group3AsyncClient": "Client.Structure.ClientOperationGroup.Group3", - "client.structure.clientoperationgroup.Group3AsyncClient.three": "Client.Structure.ClientOperationGroup.Group3.three", - "client.structure.clientoperationgroup.Group3AsyncClient.threeWithResponse": "Client.Structure.ClientOperationGroup.Group3.three", - "client.structure.clientoperationgroup.Group3AsyncClient.two": "Client.Structure.ClientOperationGroup.Group3.two", - "client.structure.clientoperationgroup.Group3AsyncClient.twoWithResponse": "Client.Structure.ClientOperationGroup.Group3.two", - "client.structure.clientoperationgroup.Group3Client": "Client.Structure.ClientOperationGroup.Group3", - "client.structure.clientoperationgroup.Group3Client.three": "Client.Structure.ClientOperationGroup.Group3.three", - "client.structure.clientoperationgroup.Group3Client.threeWithResponse": "Client.Structure.ClientOperationGroup.Group3.three", - "client.structure.clientoperationgroup.Group3Client.two": "Client.Structure.ClientOperationGroup.Group3.two", - "client.structure.clientoperationgroup.Group3Client.twoWithResponse": "Client.Structure.ClientOperationGroup.Group3.two", - "client.structure.clientoperationgroup.Group4AsyncClient": "Client.Structure.ClientOperationGroup.Group4", - "client.structure.clientoperationgroup.Group4AsyncClient.four": "Client.Structure.ClientOperationGroup.Group4.four", - "client.structure.clientoperationgroup.Group4AsyncClient.fourWithResponse": "Client.Structure.ClientOperationGroup.Group4.four", - "client.structure.clientoperationgroup.Group4Client": "Client.Structure.ClientOperationGroup.Group4", - "client.structure.clientoperationgroup.Group4Client.four": "Client.Structure.ClientOperationGroup.Group4.four", - "client.structure.clientoperationgroup.Group4Client.fourWithResponse": "Client.Structure.ClientOperationGroup.Group4.four", - "client.structure.service.models.ClientType": "Client.Structure.Service.ClientType" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-clientoperationgroup_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-clientoperationgroup_metadata.json index 5cdad377d8d..8a66b20a9b6 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-clientoperationgroup_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-clientoperationgroup_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"client.structure.anotherclientoperationgroup.subnamespace.Group5AsyncClient":"Client.Structure.AnotherClientOperationGroup.Group5","client.structure.anotherclientoperationgroup.subnamespace.Group5AsyncClient.six":"Client.Structure.AnotherClientOperationGroup.Group5.six","client.structure.anotherclientoperationgroup.subnamespace.Group5AsyncClient.sixWithResponse":"Client.Structure.AnotherClientOperationGroup.Group5.six","client.structure.anotherclientoperationgroup.subnamespace.Group5Client":"Client.Structure.AnotherClientOperationGroup.Group5","client.structure.anotherclientoperationgroup.subnamespace.Group5Client.six":"Client.Structure.AnotherClientOperationGroup.Group5.six","client.structure.anotherclientoperationgroup.subnamespace.Group5Client.sixWithResponse":"Client.Structure.AnotherClientOperationGroup.Group5.six","client.structure.anotherclientoperationgroup.subnamespace.SecondAsyncClient":"Client.Structure.AnotherClientOperationGroup","client.structure.anotherclientoperationgroup.subnamespace.SecondAsyncClient.five":"Client.Structure.AnotherClientOperationGroup.five","client.structure.anotherclientoperationgroup.subnamespace.SecondAsyncClient.fiveWithResponse":"Client.Structure.AnotherClientOperationGroup.five","client.structure.anotherclientoperationgroup.subnamespace.SecondClient":"Client.Structure.AnotherClientOperationGroup","client.structure.anotherclientoperationgroup.subnamespace.SecondClient.five":"Client.Structure.AnotherClientOperationGroup.five","client.structure.anotherclientoperationgroup.subnamespace.SecondClient.fiveWithResponse":"Client.Structure.AnotherClientOperationGroup.five","client.structure.anotherclientoperationgroup.subnamespace.SecondClientBuilder":"Client.Structure.AnotherClientOperationGroup","client.structure.clientoperationgroup.FirstAsyncClient":"Client.Structure.ClientOperationGroup","client.structure.clientoperationgroup.FirstAsyncClient.one":"Client.Structure.ClientOperationGroup.one","client.structure.clientoperationgroup.FirstAsyncClient.oneWithResponse":"Client.Structure.ClientOperationGroup.one","client.structure.clientoperationgroup.FirstClient":"Client.Structure.ClientOperationGroup","client.structure.clientoperationgroup.FirstClient.one":"Client.Structure.ClientOperationGroup.one","client.structure.clientoperationgroup.FirstClient.oneWithResponse":"Client.Structure.ClientOperationGroup.one","client.structure.clientoperationgroup.FirstClientBuilder":"Client.Structure.ClientOperationGroup","client.structure.clientoperationgroup.Group3AsyncClient":"Client.Structure.ClientOperationGroup.Group3","client.structure.clientoperationgroup.Group3AsyncClient.three":"Client.Structure.ClientOperationGroup.Group3.three","client.structure.clientoperationgroup.Group3AsyncClient.threeWithResponse":"Client.Structure.ClientOperationGroup.Group3.three","client.structure.clientoperationgroup.Group3AsyncClient.two":"Client.Structure.ClientOperationGroup.Group3.two","client.structure.clientoperationgroup.Group3AsyncClient.twoWithResponse":"Client.Structure.ClientOperationGroup.Group3.two","client.structure.clientoperationgroup.Group3Client":"Client.Structure.ClientOperationGroup.Group3","client.structure.clientoperationgroup.Group3Client.three":"Client.Structure.ClientOperationGroup.Group3.three","client.structure.clientoperationgroup.Group3Client.threeWithResponse":"Client.Structure.ClientOperationGroup.Group3.three","client.structure.clientoperationgroup.Group3Client.two":"Client.Structure.ClientOperationGroup.Group3.two","client.structure.clientoperationgroup.Group3Client.twoWithResponse":"Client.Structure.ClientOperationGroup.Group3.two","client.structure.clientoperationgroup.Group4AsyncClient":"Client.Structure.ClientOperationGroup.Group4","client.structure.clientoperationgroup.Group4AsyncClient.four":"Client.Structure.ClientOperationGroup.Group4.four","client.structure.clientoperationgroup.Group4AsyncClient.fourWithResponse":"Client.Structure.ClientOperationGroup.Group4.four","client.structure.clientoperationgroup.Group4Client":"Client.Structure.ClientOperationGroup.Group4","client.structure.clientoperationgroup.Group4Client.four":"Client.Structure.ClientOperationGroup.Group4.four","client.structure.clientoperationgroup.Group4Client.fourWithResponse":"Client.Structure.ClientOperationGroup.Group4.four","client.structure.service.models.ClientType":"Client.Structure.Service.ClientType"},"generatedFiles":["src/main/java/client/structure/anotherclientoperationgroup/subnamespace/Group5AsyncClient.java","src/main/java/client/structure/anotherclientoperationgroup/subnamespace/Group5Client.java","src/main/java/client/structure/anotherclientoperationgroup/subnamespace/SecondAsyncClient.java","src/main/java/client/structure/anotherclientoperationgroup/subnamespace/SecondClient.java","src/main/java/client/structure/anotherclientoperationgroup/subnamespace/SecondClientBuilder.java","src/main/java/client/structure/anotherclientoperationgroup/subnamespace/package-info.java","src/main/java/client/structure/clientoperationgroup/FirstAsyncClient.java","src/main/java/client/structure/clientoperationgroup/FirstClient.java","src/main/java/client/structure/clientoperationgroup/FirstClientBuilder.java","src/main/java/client/structure/clientoperationgroup/Group3AsyncClient.java","src/main/java/client/structure/clientoperationgroup/Group3Client.java","src/main/java/client/structure/clientoperationgroup/Group4AsyncClient.java","src/main/java/client/structure/clientoperationgroup/Group4Client.java","src/main/java/client/structure/clientoperationgroup/implementation/FirstClientImpl.java","src/main/java/client/structure/clientoperationgroup/implementation/Group3sImpl.java","src/main/java/client/structure/clientoperationgroup/implementation/Group4sImpl.java","src/main/java/client/structure/clientoperationgroup/implementation/Group5sImpl.java","src/main/java/client/structure/clientoperationgroup/implementation/SecondClientImpl.java","src/main/java/client/structure/clientoperationgroup/implementation/package-info.java","src/main/java/client/structure/clientoperationgroup/package-info.java","src/main/java/client/structure/service/models/ClientType.java","src/main/java/client/structure/service/models/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"client.structure.anotherclientoperationgroup.subnamespace.Group5AsyncClient":"Client.Structure.AnotherClientOperationGroup.Group5","client.structure.anotherclientoperationgroup.subnamespace.Group5AsyncClient.six":"Client.Structure.AnotherClientOperationGroup.Group5.six","client.structure.anotherclientoperationgroup.subnamespace.Group5AsyncClient.sixWithResponse":"Client.Structure.AnotherClientOperationGroup.Group5.six","client.structure.anotherclientoperationgroup.subnamespace.Group5Client":"Client.Structure.AnotherClientOperationGroup.Group5","client.structure.anotherclientoperationgroup.subnamespace.Group5Client.six":"Client.Structure.AnotherClientOperationGroup.Group5.six","client.structure.anotherclientoperationgroup.subnamespace.Group5Client.sixWithResponse":"Client.Structure.AnotherClientOperationGroup.Group5.six","client.structure.anotherclientoperationgroup.subnamespace.SecondAsyncClient":"Client.Structure.AnotherClientOperationGroup","client.structure.anotherclientoperationgroup.subnamespace.SecondAsyncClient.five":"Client.Structure.AnotherClientOperationGroup.five","client.structure.anotherclientoperationgroup.subnamespace.SecondAsyncClient.fiveWithResponse":"Client.Structure.AnotherClientOperationGroup.five","client.structure.anotherclientoperationgroup.subnamespace.SecondClient":"Client.Structure.AnotherClientOperationGroup","client.structure.anotherclientoperationgroup.subnamespace.SecondClient.five":"Client.Structure.AnotherClientOperationGroup.five","client.structure.anotherclientoperationgroup.subnamespace.SecondClient.fiveWithResponse":"Client.Structure.AnotherClientOperationGroup.five","client.structure.anotherclientoperationgroup.subnamespace.SecondClientBuilder":"Client.Structure.AnotherClientOperationGroup","client.structure.clientoperationgroup.FirstAsyncClient":"Client.Structure.ClientOperationGroup","client.structure.clientoperationgroup.FirstAsyncClient.one":"Client.Structure.ClientOperationGroup.one","client.structure.clientoperationgroup.FirstAsyncClient.oneWithResponse":"Client.Structure.ClientOperationGroup.one","client.structure.clientoperationgroup.FirstClient":"Client.Structure.ClientOperationGroup","client.structure.clientoperationgroup.FirstClient.one":"Client.Structure.ClientOperationGroup.one","client.structure.clientoperationgroup.FirstClient.oneWithResponse":"Client.Structure.ClientOperationGroup.one","client.structure.clientoperationgroup.FirstClientBuilder":"Client.Structure.ClientOperationGroup","client.structure.clientoperationgroup.Group3AsyncClient":"Client.Structure.ClientOperationGroup.Group3","client.structure.clientoperationgroup.Group3AsyncClient.three":"Client.Structure.ClientOperationGroup.Group3.three","client.structure.clientoperationgroup.Group3AsyncClient.threeWithResponse":"Client.Structure.ClientOperationGroup.Group3.three","client.structure.clientoperationgroup.Group3AsyncClient.two":"Client.Structure.ClientOperationGroup.Group3.two","client.structure.clientoperationgroup.Group3AsyncClient.twoWithResponse":"Client.Structure.ClientOperationGroup.Group3.two","client.structure.clientoperationgroup.Group3Client":"Client.Structure.ClientOperationGroup.Group3","client.structure.clientoperationgroup.Group3Client.three":"Client.Structure.ClientOperationGroup.Group3.three","client.structure.clientoperationgroup.Group3Client.threeWithResponse":"Client.Structure.ClientOperationGroup.Group3.three","client.structure.clientoperationgroup.Group3Client.two":"Client.Structure.ClientOperationGroup.Group3.two","client.structure.clientoperationgroup.Group3Client.twoWithResponse":"Client.Structure.ClientOperationGroup.Group3.two","client.structure.clientoperationgroup.Group4AsyncClient":"Client.Structure.ClientOperationGroup.Group4","client.structure.clientoperationgroup.Group4AsyncClient.four":"Client.Structure.ClientOperationGroup.Group4.four","client.structure.clientoperationgroup.Group4AsyncClient.fourWithResponse":"Client.Structure.ClientOperationGroup.Group4.four","client.structure.clientoperationgroup.Group4Client":"Client.Structure.ClientOperationGroup.Group4","client.structure.clientoperationgroup.Group4Client.four":"Client.Structure.ClientOperationGroup.Group4.four","client.structure.clientoperationgroup.Group4Client.fourWithResponse":"Client.Structure.ClientOperationGroup.Group4.four","client.structure.service.models.ClientType":"Client.Structure.Service.ClientType"},"generatedFiles":["src/main/java/client/structure/anotherclientoperationgroup/subnamespace/Group5AsyncClient.java","src/main/java/client/structure/anotherclientoperationgroup/subnamespace/Group5Client.java","src/main/java/client/structure/anotherclientoperationgroup/subnamespace/SecondAsyncClient.java","src/main/java/client/structure/anotherclientoperationgroup/subnamespace/SecondClient.java","src/main/java/client/structure/anotherclientoperationgroup/subnamespace/SecondClientBuilder.java","src/main/java/client/structure/anotherclientoperationgroup/subnamespace/package-info.java","src/main/java/client/structure/clientoperationgroup/FirstAsyncClient.java","src/main/java/client/structure/clientoperationgroup/FirstClient.java","src/main/java/client/structure/clientoperationgroup/FirstClientBuilder.java","src/main/java/client/structure/clientoperationgroup/Group3AsyncClient.java","src/main/java/client/structure/clientoperationgroup/Group3Client.java","src/main/java/client/structure/clientoperationgroup/Group4AsyncClient.java","src/main/java/client/structure/clientoperationgroup/Group4Client.java","src/main/java/client/structure/clientoperationgroup/implementation/FirstClientImpl.java","src/main/java/client/structure/clientoperationgroup/implementation/Group3sImpl.java","src/main/java/client/structure/clientoperationgroup/implementation/Group4sImpl.java","src/main/java/client/structure/clientoperationgroup/implementation/Group5sImpl.java","src/main/java/client/structure/clientoperationgroup/implementation/SecondClientImpl.java","src/main/java/client/structure/clientoperationgroup/implementation/package-info.java","src/main/java/client/structure/clientoperationgroup/package-info.java","src/main/java/client/structure/service/models/ClientType.java","src/main/java/client/structure/service/models/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-multiclient_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-multiclient_apiview_properties.json deleted file mode 100644 index d75958e00ec..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-multiclient_apiview_properties.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "client.structure.multiclient.ClientAAsyncClient": "Client.Structure.MultiClient.ClientA", - "client.structure.multiclient.ClientAAsyncClient.renamedFive": "Client.Structure.MultiClient.ClientA.renamedFive", - "client.structure.multiclient.ClientAAsyncClient.renamedFiveWithResponse": "Client.Structure.MultiClient.ClientA.renamedFive", - "client.structure.multiclient.ClientAAsyncClient.renamedOne": "Client.Structure.MultiClient.ClientA.renamedOne", - "client.structure.multiclient.ClientAAsyncClient.renamedOneWithResponse": "Client.Structure.MultiClient.ClientA.renamedOne", - "client.structure.multiclient.ClientAAsyncClient.renamedThree": "Client.Structure.MultiClient.ClientA.renamedThree", - "client.structure.multiclient.ClientAAsyncClient.renamedThreeWithResponse": "Client.Structure.MultiClient.ClientA.renamedThree", - "client.structure.multiclient.ClientAClient": "Client.Structure.MultiClient.ClientA", - "client.structure.multiclient.ClientAClient.renamedFive": "Client.Structure.MultiClient.ClientA.renamedFive", - "client.structure.multiclient.ClientAClient.renamedFiveWithResponse": "Client.Structure.MultiClient.ClientA.renamedFive", - "client.structure.multiclient.ClientAClient.renamedOne": "Client.Structure.MultiClient.ClientA.renamedOne", - "client.structure.multiclient.ClientAClient.renamedOneWithResponse": "Client.Structure.MultiClient.ClientA.renamedOne", - "client.structure.multiclient.ClientAClient.renamedThree": "Client.Structure.MultiClient.ClientA.renamedThree", - "client.structure.multiclient.ClientAClient.renamedThreeWithResponse": "Client.Structure.MultiClient.ClientA.renamedThree", - "client.structure.multiclient.ClientAClientBuilder": "Client.Structure.MultiClient.ClientA", - "client.structure.multiclient.ClientBAsyncClient": "Client.Structure.MultiClient.ClientB", - "client.structure.multiclient.ClientBAsyncClient.renamedFour": "Client.Structure.MultiClient.ClientB.renamedFour", - "client.structure.multiclient.ClientBAsyncClient.renamedFourWithResponse": "Client.Structure.MultiClient.ClientB.renamedFour", - "client.structure.multiclient.ClientBAsyncClient.renamedSix": "Client.Structure.MultiClient.ClientB.renamedSix", - "client.structure.multiclient.ClientBAsyncClient.renamedSixWithResponse": "Client.Structure.MultiClient.ClientB.renamedSix", - "client.structure.multiclient.ClientBAsyncClient.renamedTwo": "Client.Structure.MultiClient.ClientB.renamedTwo", - "client.structure.multiclient.ClientBAsyncClient.renamedTwoWithResponse": "Client.Structure.MultiClient.ClientB.renamedTwo", - "client.structure.multiclient.ClientBClient": "Client.Structure.MultiClient.ClientB", - "client.structure.multiclient.ClientBClient.renamedFour": "Client.Structure.MultiClient.ClientB.renamedFour", - "client.structure.multiclient.ClientBClient.renamedFourWithResponse": "Client.Structure.MultiClient.ClientB.renamedFour", - "client.structure.multiclient.ClientBClient.renamedSix": "Client.Structure.MultiClient.ClientB.renamedSix", - "client.structure.multiclient.ClientBClient.renamedSixWithResponse": "Client.Structure.MultiClient.ClientB.renamedSix", - "client.structure.multiclient.ClientBClient.renamedTwo": "Client.Structure.MultiClient.ClientB.renamedTwo", - "client.structure.multiclient.ClientBClient.renamedTwoWithResponse": "Client.Structure.MultiClient.ClientB.renamedTwo", - "client.structure.multiclient.ClientBClientBuilder": "Client.Structure.MultiClient.ClientB", - "client.structure.service.models.ClientType": "Client.Structure.Service.ClientType" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-multiclient_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-multiclient_metadata.json index 3405ed1cf36..887433c0a88 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-multiclient_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-multiclient_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"client.structure.multiclient.ClientAAsyncClient":"Client.Structure.MultiClient.ClientA","client.structure.multiclient.ClientAAsyncClient.renamedFive":"Client.Structure.MultiClient.ClientA.renamedFive","client.structure.multiclient.ClientAAsyncClient.renamedFiveWithResponse":"Client.Structure.MultiClient.ClientA.renamedFive","client.structure.multiclient.ClientAAsyncClient.renamedOne":"Client.Structure.MultiClient.ClientA.renamedOne","client.structure.multiclient.ClientAAsyncClient.renamedOneWithResponse":"Client.Structure.MultiClient.ClientA.renamedOne","client.structure.multiclient.ClientAAsyncClient.renamedThree":"Client.Structure.MultiClient.ClientA.renamedThree","client.structure.multiclient.ClientAAsyncClient.renamedThreeWithResponse":"Client.Structure.MultiClient.ClientA.renamedThree","client.structure.multiclient.ClientAClient":"Client.Structure.MultiClient.ClientA","client.structure.multiclient.ClientAClient.renamedFive":"Client.Structure.MultiClient.ClientA.renamedFive","client.structure.multiclient.ClientAClient.renamedFiveWithResponse":"Client.Structure.MultiClient.ClientA.renamedFive","client.structure.multiclient.ClientAClient.renamedOne":"Client.Structure.MultiClient.ClientA.renamedOne","client.structure.multiclient.ClientAClient.renamedOneWithResponse":"Client.Structure.MultiClient.ClientA.renamedOne","client.structure.multiclient.ClientAClient.renamedThree":"Client.Structure.MultiClient.ClientA.renamedThree","client.structure.multiclient.ClientAClient.renamedThreeWithResponse":"Client.Structure.MultiClient.ClientA.renamedThree","client.structure.multiclient.ClientAClientBuilder":"Client.Structure.MultiClient.ClientA","client.structure.multiclient.ClientBAsyncClient":"Client.Structure.MultiClient.ClientB","client.structure.multiclient.ClientBAsyncClient.renamedFour":"Client.Structure.MultiClient.ClientB.renamedFour","client.structure.multiclient.ClientBAsyncClient.renamedFourWithResponse":"Client.Structure.MultiClient.ClientB.renamedFour","client.structure.multiclient.ClientBAsyncClient.renamedSix":"Client.Structure.MultiClient.ClientB.renamedSix","client.structure.multiclient.ClientBAsyncClient.renamedSixWithResponse":"Client.Structure.MultiClient.ClientB.renamedSix","client.structure.multiclient.ClientBAsyncClient.renamedTwo":"Client.Structure.MultiClient.ClientB.renamedTwo","client.structure.multiclient.ClientBAsyncClient.renamedTwoWithResponse":"Client.Structure.MultiClient.ClientB.renamedTwo","client.structure.multiclient.ClientBClient":"Client.Structure.MultiClient.ClientB","client.structure.multiclient.ClientBClient.renamedFour":"Client.Structure.MultiClient.ClientB.renamedFour","client.structure.multiclient.ClientBClient.renamedFourWithResponse":"Client.Structure.MultiClient.ClientB.renamedFour","client.structure.multiclient.ClientBClient.renamedSix":"Client.Structure.MultiClient.ClientB.renamedSix","client.structure.multiclient.ClientBClient.renamedSixWithResponse":"Client.Structure.MultiClient.ClientB.renamedSix","client.structure.multiclient.ClientBClient.renamedTwo":"Client.Structure.MultiClient.ClientB.renamedTwo","client.structure.multiclient.ClientBClient.renamedTwoWithResponse":"Client.Structure.MultiClient.ClientB.renamedTwo","client.structure.multiclient.ClientBClientBuilder":"Client.Structure.MultiClient.ClientB","client.structure.service.models.ClientType":"Client.Structure.Service.ClientType"},"generatedFiles":["src/main/java/client/structure/multiclient/ClientAAsyncClient.java","src/main/java/client/structure/multiclient/ClientAClient.java","src/main/java/client/structure/multiclient/ClientAClientBuilder.java","src/main/java/client/structure/multiclient/ClientBAsyncClient.java","src/main/java/client/structure/multiclient/ClientBClient.java","src/main/java/client/structure/multiclient/ClientBClientBuilder.java","src/main/java/client/structure/multiclient/implementation/ClientAClientImpl.java","src/main/java/client/structure/multiclient/implementation/ClientBClientImpl.java","src/main/java/client/structure/multiclient/implementation/package-info.java","src/main/java/client/structure/multiclient/package-info.java","src/main/java/client/structure/service/models/ClientType.java","src/main/java/client/structure/service/models/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"client.structure.multiclient.ClientAAsyncClient":"Client.Structure.MultiClient.ClientA","client.structure.multiclient.ClientAAsyncClient.renamedFive":"Client.Structure.MultiClient.ClientA.renamedFive","client.structure.multiclient.ClientAAsyncClient.renamedFiveWithResponse":"Client.Structure.MultiClient.ClientA.renamedFive","client.structure.multiclient.ClientAAsyncClient.renamedOne":"Client.Structure.MultiClient.ClientA.renamedOne","client.structure.multiclient.ClientAAsyncClient.renamedOneWithResponse":"Client.Structure.MultiClient.ClientA.renamedOne","client.structure.multiclient.ClientAAsyncClient.renamedThree":"Client.Structure.MultiClient.ClientA.renamedThree","client.structure.multiclient.ClientAAsyncClient.renamedThreeWithResponse":"Client.Structure.MultiClient.ClientA.renamedThree","client.structure.multiclient.ClientAClient":"Client.Structure.MultiClient.ClientA","client.structure.multiclient.ClientAClient.renamedFive":"Client.Structure.MultiClient.ClientA.renamedFive","client.structure.multiclient.ClientAClient.renamedFiveWithResponse":"Client.Structure.MultiClient.ClientA.renamedFive","client.structure.multiclient.ClientAClient.renamedOne":"Client.Structure.MultiClient.ClientA.renamedOne","client.structure.multiclient.ClientAClient.renamedOneWithResponse":"Client.Structure.MultiClient.ClientA.renamedOne","client.structure.multiclient.ClientAClient.renamedThree":"Client.Structure.MultiClient.ClientA.renamedThree","client.structure.multiclient.ClientAClient.renamedThreeWithResponse":"Client.Structure.MultiClient.ClientA.renamedThree","client.structure.multiclient.ClientAClientBuilder":"Client.Structure.MultiClient.ClientA","client.structure.multiclient.ClientBAsyncClient":"Client.Structure.MultiClient.ClientB","client.structure.multiclient.ClientBAsyncClient.renamedFour":"Client.Structure.MultiClient.ClientB.renamedFour","client.structure.multiclient.ClientBAsyncClient.renamedFourWithResponse":"Client.Structure.MultiClient.ClientB.renamedFour","client.structure.multiclient.ClientBAsyncClient.renamedSix":"Client.Structure.MultiClient.ClientB.renamedSix","client.structure.multiclient.ClientBAsyncClient.renamedSixWithResponse":"Client.Structure.MultiClient.ClientB.renamedSix","client.structure.multiclient.ClientBAsyncClient.renamedTwo":"Client.Structure.MultiClient.ClientB.renamedTwo","client.structure.multiclient.ClientBAsyncClient.renamedTwoWithResponse":"Client.Structure.MultiClient.ClientB.renamedTwo","client.structure.multiclient.ClientBClient":"Client.Structure.MultiClient.ClientB","client.structure.multiclient.ClientBClient.renamedFour":"Client.Structure.MultiClient.ClientB.renamedFour","client.structure.multiclient.ClientBClient.renamedFourWithResponse":"Client.Structure.MultiClient.ClientB.renamedFour","client.structure.multiclient.ClientBClient.renamedSix":"Client.Structure.MultiClient.ClientB.renamedSix","client.structure.multiclient.ClientBClient.renamedSixWithResponse":"Client.Structure.MultiClient.ClientB.renamedSix","client.structure.multiclient.ClientBClient.renamedTwo":"Client.Structure.MultiClient.ClientB.renamedTwo","client.structure.multiclient.ClientBClient.renamedTwoWithResponse":"Client.Structure.MultiClient.ClientB.renamedTwo","client.structure.multiclient.ClientBClientBuilder":"Client.Structure.MultiClient.ClientB","client.structure.service.models.ClientType":"Client.Structure.Service.ClientType"},"generatedFiles":["src/main/java/client/structure/multiclient/ClientAAsyncClient.java","src/main/java/client/structure/multiclient/ClientAClient.java","src/main/java/client/structure/multiclient/ClientAClientBuilder.java","src/main/java/client/structure/multiclient/ClientBAsyncClient.java","src/main/java/client/structure/multiclient/ClientBClient.java","src/main/java/client/structure/multiclient/ClientBClientBuilder.java","src/main/java/client/structure/multiclient/implementation/ClientAClientImpl.java","src/main/java/client/structure/multiclient/implementation/ClientBClientImpl.java","src/main/java/client/structure/multiclient/implementation/package-info.java","src/main/java/client/structure/multiclient/package-info.java","src/main/java/client/structure/service/models/ClientType.java","src/main/java/client/structure/service/models/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-renamedoperation_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-renamedoperation_apiview_properties.json deleted file mode 100644 index c3b92699425..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-renamedoperation_apiview_properties.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "client.structure.renamedoperation.GroupAsyncClient": "Client.Structure.RenamedOperation.Group", - "client.structure.renamedoperation.GroupAsyncClient.renamedFour": "Client.Structure.RenamedOperation.Group.renamedFour", - "client.structure.renamedoperation.GroupAsyncClient.renamedFourWithResponse": "Client.Structure.RenamedOperation.Group.renamedFour", - "client.structure.renamedoperation.GroupAsyncClient.renamedSix": "Client.Structure.RenamedOperation.Group.renamedSix", - "client.structure.renamedoperation.GroupAsyncClient.renamedSixWithResponse": "Client.Structure.RenamedOperation.Group.renamedSix", - "client.structure.renamedoperation.GroupAsyncClient.renamedTwo": "Client.Structure.RenamedOperation.Group.renamedTwo", - "client.structure.renamedoperation.GroupAsyncClient.renamedTwoWithResponse": "Client.Structure.RenamedOperation.Group.renamedTwo", - "client.structure.renamedoperation.GroupClient": "Client.Structure.RenamedOperation.Group", - "client.structure.renamedoperation.GroupClient.renamedFour": "Client.Structure.RenamedOperation.Group.renamedFour", - "client.structure.renamedoperation.GroupClient.renamedFourWithResponse": "Client.Structure.RenamedOperation.Group.renamedFour", - "client.structure.renamedoperation.GroupClient.renamedSix": "Client.Structure.RenamedOperation.Group.renamedSix", - "client.structure.renamedoperation.GroupClient.renamedSixWithResponse": "Client.Structure.RenamedOperation.Group.renamedSix", - "client.structure.renamedoperation.GroupClient.renamedTwo": "Client.Structure.RenamedOperation.Group.renamedTwo", - "client.structure.renamedoperation.GroupClient.renamedTwoWithResponse": "Client.Structure.RenamedOperation.Group.renamedTwo", - "client.structure.renamedoperation.RenamedOperationAsyncClient": "Client.Structure.RenamedOperation", - "client.structure.renamedoperation.RenamedOperationAsyncClient.renamedFive": "Client.Structure.RenamedOperation.renamedFive", - "client.structure.renamedoperation.RenamedOperationAsyncClient.renamedFiveWithResponse": "Client.Structure.RenamedOperation.renamedFive", - "client.structure.renamedoperation.RenamedOperationAsyncClient.renamedOne": "Client.Structure.RenamedOperation.renamedOne", - "client.structure.renamedoperation.RenamedOperationAsyncClient.renamedOneWithResponse": "Client.Structure.RenamedOperation.renamedOne", - "client.structure.renamedoperation.RenamedOperationAsyncClient.renamedThree": "Client.Structure.RenamedOperation.renamedThree", - "client.structure.renamedoperation.RenamedOperationAsyncClient.renamedThreeWithResponse": "Client.Structure.RenamedOperation.renamedThree", - "client.structure.renamedoperation.RenamedOperationClient": "Client.Structure.RenamedOperation", - "client.structure.renamedoperation.RenamedOperationClient.renamedFive": "Client.Structure.RenamedOperation.renamedFive", - "client.structure.renamedoperation.RenamedOperationClient.renamedFiveWithResponse": "Client.Structure.RenamedOperation.renamedFive", - "client.structure.renamedoperation.RenamedOperationClient.renamedOne": "Client.Structure.RenamedOperation.renamedOne", - "client.structure.renamedoperation.RenamedOperationClient.renamedOneWithResponse": "Client.Structure.RenamedOperation.renamedOne", - "client.structure.renamedoperation.RenamedOperationClient.renamedThree": "Client.Structure.RenamedOperation.renamedThree", - "client.structure.renamedoperation.RenamedOperationClient.renamedThreeWithResponse": "Client.Structure.RenamedOperation.renamedThree", - "client.structure.renamedoperation.RenamedOperationClientBuilder": "Client.Structure.RenamedOperation", - "client.structure.service.models.ClientType": "Client.Structure.Service.ClientType" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-renamedoperation_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-renamedoperation_metadata.json index ac8f98b7c9a..75cfa74fbef 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-renamedoperation_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-renamedoperation_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"client.structure.renamedoperation.GroupAsyncClient":"Client.Structure.RenamedOperation.Group","client.structure.renamedoperation.GroupAsyncClient.renamedFour":"Client.Structure.RenamedOperation.Group.renamedFour","client.structure.renamedoperation.GroupAsyncClient.renamedFourWithResponse":"Client.Structure.RenamedOperation.Group.renamedFour","client.structure.renamedoperation.GroupAsyncClient.renamedSix":"Client.Structure.RenamedOperation.Group.renamedSix","client.structure.renamedoperation.GroupAsyncClient.renamedSixWithResponse":"Client.Structure.RenamedOperation.Group.renamedSix","client.structure.renamedoperation.GroupAsyncClient.renamedTwo":"Client.Structure.RenamedOperation.Group.renamedTwo","client.structure.renamedoperation.GroupAsyncClient.renamedTwoWithResponse":"Client.Structure.RenamedOperation.Group.renamedTwo","client.structure.renamedoperation.GroupClient":"Client.Structure.RenamedOperation.Group","client.structure.renamedoperation.GroupClient.renamedFour":"Client.Structure.RenamedOperation.Group.renamedFour","client.structure.renamedoperation.GroupClient.renamedFourWithResponse":"Client.Structure.RenamedOperation.Group.renamedFour","client.structure.renamedoperation.GroupClient.renamedSix":"Client.Structure.RenamedOperation.Group.renamedSix","client.structure.renamedoperation.GroupClient.renamedSixWithResponse":"Client.Structure.RenamedOperation.Group.renamedSix","client.structure.renamedoperation.GroupClient.renamedTwo":"Client.Structure.RenamedOperation.Group.renamedTwo","client.structure.renamedoperation.GroupClient.renamedTwoWithResponse":"Client.Structure.RenamedOperation.Group.renamedTwo","client.structure.renamedoperation.RenamedOperationAsyncClient":"Client.Structure.RenamedOperation","client.structure.renamedoperation.RenamedOperationAsyncClient.renamedFive":"Client.Structure.RenamedOperation.renamedFive","client.structure.renamedoperation.RenamedOperationAsyncClient.renamedFiveWithResponse":"Client.Structure.RenamedOperation.renamedFive","client.structure.renamedoperation.RenamedOperationAsyncClient.renamedOne":"Client.Structure.RenamedOperation.renamedOne","client.structure.renamedoperation.RenamedOperationAsyncClient.renamedOneWithResponse":"Client.Structure.RenamedOperation.renamedOne","client.structure.renamedoperation.RenamedOperationAsyncClient.renamedThree":"Client.Structure.RenamedOperation.renamedThree","client.structure.renamedoperation.RenamedOperationAsyncClient.renamedThreeWithResponse":"Client.Structure.RenamedOperation.renamedThree","client.structure.renamedoperation.RenamedOperationClient":"Client.Structure.RenamedOperation","client.structure.renamedoperation.RenamedOperationClient.renamedFive":"Client.Structure.RenamedOperation.renamedFive","client.structure.renamedoperation.RenamedOperationClient.renamedFiveWithResponse":"Client.Structure.RenamedOperation.renamedFive","client.structure.renamedoperation.RenamedOperationClient.renamedOne":"Client.Structure.RenamedOperation.renamedOne","client.structure.renamedoperation.RenamedOperationClient.renamedOneWithResponse":"Client.Structure.RenamedOperation.renamedOne","client.structure.renamedoperation.RenamedOperationClient.renamedThree":"Client.Structure.RenamedOperation.renamedThree","client.structure.renamedoperation.RenamedOperationClient.renamedThreeWithResponse":"Client.Structure.RenamedOperation.renamedThree","client.structure.renamedoperation.RenamedOperationClientBuilder":"Client.Structure.RenamedOperation","client.structure.service.models.ClientType":"Client.Structure.Service.ClientType"},"generatedFiles":["src/main/java/client/structure/renamedoperation/GroupAsyncClient.java","src/main/java/client/structure/renamedoperation/GroupClient.java","src/main/java/client/structure/renamedoperation/RenamedOperationAsyncClient.java","src/main/java/client/structure/renamedoperation/RenamedOperationClient.java","src/main/java/client/structure/renamedoperation/RenamedOperationClientBuilder.java","src/main/java/client/structure/renamedoperation/implementation/GroupsImpl.java","src/main/java/client/structure/renamedoperation/implementation/RenamedOperationClientImpl.java","src/main/java/client/structure/renamedoperation/implementation/package-info.java","src/main/java/client/structure/renamedoperation/package-info.java","src/main/java/client/structure/service/models/ClientType.java","src/main/java/client/structure/service/models/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"client.structure.renamedoperation.GroupAsyncClient":"Client.Structure.RenamedOperation.Group","client.structure.renamedoperation.GroupAsyncClient.renamedFour":"Client.Structure.RenamedOperation.Group.renamedFour","client.structure.renamedoperation.GroupAsyncClient.renamedFourWithResponse":"Client.Structure.RenamedOperation.Group.renamedFour","client.structure.renamedoperation.GroupAsyncClient.renamedSix":"Client.Structure.RenamedOperation.Group.renamedSix","client.structure.renamedoperation.GroupAsyncClient.renamedSixWithResponse":"Client.Structure.RenamedOperation.Group.renamedSix","client.structure.renamedoperation.GroupAsyncClient.renamedTwo":"Client.Structure.RenamedOperation.Group.renamedTwo","client.structure.renamedoperation.GroupAsyncClient.renamedTwoWithResponse":"Client.Structure.RenamedOperation.Group.renamedTwo","client.structure.renamedoperation.GroupClient":"Client.Structure.RenamedOperation.Group","client.structure.renamedoperation.GroupClient.renamedFour":"Client.Structure.RenamedOperation.Group.renamedFour","client.structure.renamedoperation.GroupClient.renamedFourWithResponse":"Client.Structure.RenamedOperation.Group.renamedFour","client.structure.renamedoperation.GroupClient.renamedSix":"Client.Structure.RenamedOperation.Group.renamedSix","client.structure.renamedoperation.GroupClient.renamedSixWithResponse":"Client.Structure.RenamedOperation.Group.renamedSix","client.structure.renamedoperation.GroupClient.renamedTwo":"Client.Structure.RenamedOperation.Group.renamedTwo","client.structure.renamedoperation.GroupClient.renamedTwoWithResponse":"Client.Structure.RenamedOperation.Group.renamedTwo","client.structure.renamedoperation.RenamedOperationAsyncClient":"Client.Structure.RenamedOperation","client.structure.renamedoperation.RenamedOperationAsyncClient.renamedFive":"Client.Structure.RenamedOperation.renamedFive","client.structure.renamedoperation.RenamedOperationAsyncClient.renamedFiveWithResponse":"Client.Structure.RenamedOperation.renamedFive","client.structure.renamedoperation.RenamedOperationAsyncClient.renamedOne":"Client.Structure.RenamedOperation.renamedOne","client.structure.renamedoperation.RenamedOperationAsyncClient.renamedOneWithResponse":"Client.Structure.RenamedOperation.renamedOne","client.structure.renamedoperation.RenamedOperationAsyncClient.renamedThree":"Client.Structure.RenamedOperation.renamedThree","client.structure.renamedoperation.RenamedOperationAsyncClient.renamedThreeWithResponse":"Client.Structure.RenamedOperation.renamedThree","client.structure.renamedoperation.RenamedOperationClient":"Client.Structure.RenamedOperation","client.structure.renamedoperation.RenamedOperationClient.renamedFive":"Client.Structure.RenamedOperation.renamedFive","client.structure.renamedoperation.RenamedOperationClient.renamedFiveWithResponse":"Client.Structure.RenamedOperation.renamedFive","client.structure.renamedoperation.RenamedOperationClient.renamedOne":"Client.Structure.RenamedOperation.renamedOne","client.structure.renamedoperation.RenamedOperationClient.renamedOneWithResponse":"Client.Structure.RenamedOperation.renamedOne","client.structure.renamedoperation.RenamedOperationClient.renamedThree":"Client.Structure.RenamedOperation.renamedThree","client.structure.renamedoperation.RenamedOperationClient.renamedThreeWithResponse":"Client.Structure.RenamedOperation.renamedThree","client.structure.renamedoperation.RenamedOperationClientBuilder":"Client.Structure.RenamedOperation","client.structure.service.models.ClientType":"Client.Structure.Service.ClientType"},"generatedFiles":["src/main/java/client/structure/renamedoperation/GroupAsyncClient.java","src/main/java/client/structure/renamedoperation/GroupClient.java","src/main/java/client/structure/renamedoperation/RenamedOperationAsyncClient.java","src/main/java/client/structure/renamedoperation/RenamedOperationClient.java","src/main/java/client/structure/renamedoperation/RenamedOperationClientBuilder.java","src/main/java/client/structure/renamedoperation/implementation/GroupsImpl.java","src/main/java/client/structure/renamedoperation/implementation/RenamedOperationClientImpl.java","src/main/java/client/structure/renamedoperation/implementation/package-info.java","src/main/java/client/structure/renamedoperation/package-info.java","src/main/java/client/structure/service/models/ClientType.java","src/main/java/client/structure/service/models/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-service_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-service_apiview_properties.json deleted file mode 100644 index c57c264820f..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-service_apiview_properties.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "client.structure.service.BarAsyncClient": "Client.Structure.Service.Bar", - "client.structure.service.BarAsyncClient.five": "Client.Structure.Service.Bar.five", - "client.structure.service.BarAsyncClient.fiveWithResponse": "Client.Structure.Service.Bar.five", - "client.structure.service.BarAsyncClient.six": "Client.Structure.Service.Bar.six", - "client.structure.service.BarAsyncClient.sixWithResponse": "Client.Structure.Service.Bar.six", - "client.structure.service.BarClient": "Client.Structure.Service.Bar", - "client.structure.service.BarClient.five": "Client.Structure.Service.Bar.five", - "client.structure.service.BarClient.fiveWithResponse": "Client.Structure.Service.Bar.five", - "client.structure.service.BarClient.six": "Client.Structure.Service.Bar.six", - "client.structure.service.BarClient.sixWithResponse": "Client.Structure.Service.Bar.six", - "client.structure.service.BazFooAsyncClient": "Client.Structure.Service.Baz.Foo", - "client.structure.service.BazFooAsyncClient.seven": "Client.Structure.Service.Baz.Foo.seven", - "client.structure.service.BazFooAsyncClient.sevenWithResponse": "Client.Structure.Service.Baz.Foo.seven", - "client.structure.service.BazFooClient": "Client.Structure.Service.Baz.Foo", - "client.structure.service.BazFooClient.seven": "Client.Structure.Service.Baz.Foo.seven", - "client.structure.service.BazFooClient.sevenWithResponse": "Client.Structure.Service.Baz.Foo.seven", - "client.structure.service.FooAsyncClient": "Client.Structure.Service.Foo", - "client.structure.service.FooAsyncClient.four": "Client.Structure.Service.Foo.four", - "client.structure.service.FooAsyncClient.fourWithResponse": "Client.Structure.Service.Foo.four", - "client.structure.service.FooAsyncClient.three": "Client.Structure.Service.Foo.three", - "client.structure.service.FooAsyncClient.threeWithResponse": "Client.Structure.Service.Foo.three", - "client.structure.service.FooClient": "Client.Structure.Service.Foo", - "client.structure.service.FooClient.four": "Client.Structure.Service.Foo.four", - "client.structure.service.FooClient.fourWithResponse": "Client.Structure.Service.Foo.four", - "client.structure.service.FooClient.three": "Client.Structure.Service.Foo.three", - "client.structure.service.FooClient.threeWithResponse": "Client.Structure.Service.Foo.three", - "client.structure.service.QuxAsyncClient": "Client.Structure.Service.Qux", - "client.structure.service.QuxAsyncClient.eight": "Client.Structure.Service.Qux.eight", - "client.structure.service.QuxAsyncClient.eightWithResponse": "Client.Structure.Service.Qux.eight", - "client.structure.service.QuxBarAsyncClient": "Client.Structure.Service.Qux.Bar", - "client.structure.service.QuxBarAsyncClient.nine": "Client.Structure.Service.Qux.Bar.nine", - "client.structure.service.QuxBarAsyncClient.nineWithResponse": "Client.Structure.Service.Qux.Bar.nine", - "client.structure.service.QuxBarClient": "Client.Structure.Service.Qux.Bar", - "client.structure.service.QuxBarClient.nine": "Client.Structure.Service.Qux.Bar.nine", - "client.structure.service.QuxBarClient.nineWithResponse": "Client.Structure.Service.Qux.Bar.nine", - "client.structure.service.QuxClient": "Client.Structure.Service.Qux", - "client.structure.service.QuxClient.eight": "Client.Structure.Service.Qux.eight", - "client.structure.service.QuxClient.eightWithResponse": "Client.Structure.Service.Qux.eight", - "client.structure.service.ServiceClientAsyncClient": "Client.Structure.Service", - "client.structure.service.ServiceClientAsyncClient.one": "Client.Structure.Service.one", - "client.structure.service.ServiceClientAsyncClient.oneWithResponse": "Client.Structure.Service.one", - "client.structure.service.ServiceClientAsyncClient.two": "Client.Structure.Service.two", - "client.structure.service.ServiceClientAsyncClient.twoWithResponse": "Client.Structure.Service.two", - "client.structure.service.ServiceClientClient": "Client.Structure.Service", - "client.structure.service.ServiceClientClient.one": "Client.Structure.Service.one", - "client.structure.service.ServiceClientClient.oneWithResponse": "Client.Structure.Service.one", - "client.structure.service.ServiceClientClient.two": "Client.Structure.Service.two", - "client.structure.service.ServiceClientClient.twoWithResponse": "Client.Structure.Service.two", - "client.structure.service.ServiceClientClientBuilder": "Client.Structure.Service", - "client.structure.service.models.ClientType": "Client.Structure.Service.ClientType" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-twooperationgroup_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-twooperationgroup_apiview_properties.json deleted file mode 100644 index 4e8b278c515..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-twooperationgroup_apiview_properties.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "client.structure.service.models.ClientType": "Client.Structure.Service.ClientType", - "client.structure.twooperationgroup.Group1AsyncClient": "Client.Structure.TwoOperationGroup.Group1", - "client.structure.twooperationgroup.Group1AsyncClient.four": "Client.Structure.TwoOperationGroup.Group1.four", - "client.structure.twooperationgroup.Group1AsyncClient.fourWithResponse": "Client.Structure.TwoOperationGroup.Group1.four", - "client.structure.twooperationgroup.Group1AsyncClient.one": "Client.Structure.TwoOperationGroup.Group1.one", - "client.structure.twooperationgroup.Group1AsyncClient.oneWithResponse": "Client.Structure.TwoOperationGroup.Group1.one", - "client.structure.twooperationgroup.Group1AsyncClient.three": "Client.Structure.TwoOperationGroup.Group1.three", - "client.structure.twooperationgroup.Group1AsyncClient.threeWithResponse": "Client.Structure.TwoOperationGroup.Group1.three", - "client.structure.twooperationgroup.Group1Client": "Client.Structure.TwoOperationGroup.Group1", - "client.structure.twooperationgroup.Group1Client.four": "Client.Structure.TwoOperationGroup.Group1.four", - "client.structure.twooperationgroup.Group1Client.fourWithResponse": "Client.Structure.TwoOperationGroup.Group1.four", - "client.structure.twooperationgroup.Group1Client.one": "Client.Structure.TwoOperationGroup.Group1.one", - "client.structure.twooperationgroup.Group1Client.oneWithResponse": "Client.Structure.TwoOperationGroup.Group1.one", - "client.structure.twooperationgroup.Group1Client.three": "Client.Structure.TwoOperationGroup.Group1.three", - "client.structure.twooperationgroup.Group1Client.threeWithResponse": "Client.Structure.TwoOperationGroup.Group1.three", - "client.structure.twooperationgroup.Group2AsyncClient": "Client.Structure.TwoOperationGroup.Group2", - "client.structure.twooperationgroup.Group2AsyncClient.five": "Client.Structure.TwoOperationGroup.Group2.five", - "client.structure.twooperationgroup.Group2AsyncClient.fiveWithResponse": "Client.Structure.TwoOperationGroup.Group2.five", - "client.structure.twooperationgroup.Group2AsyncClient.six": "Client.Structure.TwoOperationGroup.Group2.six", - "client.structure.twooperationgroup.Group2AsyncClient.sixWithResponse": "Client.Structure.TwoOperationGroup.Group2.six", - "client.structure.twooperationgroup.Group2AsyncClient.two": "Client.Structure.TwoOperationGroup.Group2.two", - "client.structure.twooperationgroup.Group2AsyncClient.twoWithResponse": "Client.Structure.TwoOperationGroup.Group2.two", - "client.structure.twooperationgroup.Group2Client": "Client.Structure.TwoOperationGroup.Group2", - "client.structure.twooperationgroup.Group2Client.five": "Client.Structure.TwoOperationGroup.Group2.five", - "client.structure.twooperationgroup.Group2Client.fiveWithResponse": "Client.Structure.TwoOperationGroup.Group2.five", - "client.structure.twooperationgroup.Group2Client.six": "Client.Structure.TwoOperationGroup.Group2.six", - "client.structure.twooperationgroup.Group2Client.sixWithResponse": "Client.Structure.TwoOperationGroup.Group2.six", - "client.structure.twooperationgroup.Group2Client.two": "Client.Structure.TwoOperationGroup.Group2.two", - "client.structure.twooperationgroup.Group2Client.twoWithResponse": "Client.Structure.TwoOperationGroup.Group2.two", - "client.structure.twooperationgroup.TwoOperationGroupClientBuilder": "Client.Structure.TwoOperationGroup" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-twooperationgroup_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-twooperationgroup_metadata.json index a3c5969f803..16bc7502595 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-twooperationgroup_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/client-structure-twooperationgroup_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"client.structure.service.models.ClientType":"Client.Structure.Service.ClientType","client.structure.twooperationgroup.Group1AsyncClient":"Client.Structure.TwoOperationGroup.Group1","client.structure.twooperationgroup.Group1AsyncClient.four":"Client.Structure.TwoOperationGroup.Group1.four","client.structure.twooperationgroup.Group1AsyncClient.fourWithResponse":"Client.Structure.TwoOperationGroup.Group1.four","client.structure.twooperationgroup.Group1AsyncClient.one":"Client.Structure.TwoOperationGroup.Group1.one","client.structure.twooperationgroup.Group1AsyncClient.oneWithResponse":"Client.Structure.TwoOperationGroup.Group1.one","client.structure.twooperationgroup.Group1AsyncClient.three":"Client.Structure.TwoOperationGroup.Group1.three","client.structure.twooperationgroup.Group1AsyncClient.threeWithResponse":"Client.Structure.TwoOperationGroup.Group1.three","client.structure.twooperationgroup.Group1Client":"Client.Structure.TwoOperationGroup.Group1","client.structure.twooperationgroup.Group1Client.four":"Client.Structure.TwoOperationGroup.Group1.four","client.structure.twooperationgroup.Group1Client.fourWithResponse":"Client.Structure.TwoOperationGroup.Group1.four","client.structure.twooperationgroup.Group1Client.one":"Client.Structure.TwoOperationGroup.Group1.one","client.structure.twooperationgroup.Group1Client.oneWithResponse":"Client.Structure.TwoOperationGroup.Group1.one","client.structure.twooperationgroup.Group1Client.three":"Client.Structure.TwoOperationGroup.Group1.three","client.structure.twooperationgroup.Group1Client.threeWithResponse":"Client.Structure.TwoOperationGroup.Group1.three","client.structure.twooperationgroup.Group2AsyncClient":"Client.Structure.TwoOperationGroup.Group2","client.structure.twooperationgroup.Group2AsyncClient.five":"Client.Structure.TwoOperationGroup.Group2.five","client.structure.twooperationgroup.Group2AsyncClient.fiveWithResponse":"Client.Structure.TwoOperationGroup.Group2.five","client.structure.twooperationgroup.Group2AsyncClient.six":"Client.Structure.TwoOperationGroup.Group2.six","client.structure.twooperationgroup.Group2AsyncClient.sixWithResponse":"Client.Structure.TwoOperationGroup.Group2.six","client.structure.twooperationgroup.Group2AsyncClient.two":"Client.Structure.TwoOperationGroup.Group2.two","client.structure.twooperationgroup.Group2AsyncClient.twoWithResponse":"Client.Structure.TwoOperationGroup.Group2.two","client.structure.twooperationgroup.Group2Client":"Client.Structure.TwoOperationGroup.Group2","client.structure.twooperationgroup.Group2Client.five":"Client.Structure.TwoOperationGroup.Group2.five","client.structure.twooperationgroup.Group2Client.fiveWithResponse":"Client.Structure.TwoOperationGroup.Group2.five","client.structure.twooperationgroup.Group2Client.six":"Client.Structure.TwoOperationGroup.Group2.six","client.structure.twooperationgroup.Group2Client.sixWithResponse":"Client.Structure.TwoOperationGroup.Group2.six","client.structure.twooperationgroup.Group2Client.two":"Client.Structure.TwoOperationGroup.Group2.two","client.structure.twooperationgroup.Group2Client.twoWithResponse":"Client.Structure.TwoOperationGroup.Group2.two","client.structure.twooperationgroup.TwoOperationGroupClientBuilder":"Client.Structure.TwoOperationGroup"},"generatedFiles":["src/main/java/client/structure/service/models/ClientType.java","src/main/java/client/structure/service/models/package-info.java","src/main/java/client/structure/twooperationgroup/Group1AsyncClient.java","src/main/java/client/structure/twooperationgroup/Group1Client.java","src/main/java/client/structure/twooperationgroup/Group2AsyncClient.java","src/main/java/client/structure/twooperationgroup/Group2Client.java","src/main/java/client/structure/twooperationgroup/TwoOperationGroupClientBuilder.java","src/main/java/client/structure/twooperationgroup/implementation/Group1sImpl.java","src/main/java/client/structure/twooperationgroup/implementation/Group2sImpl.java","src/main/java/client/structure/twooperationgroup/implementation/TwoOperationGroupClientImpl.java","src/main/java/client/structure/twooperationgroup/implementation/package-info.java","src/main/java/client/structure/twooperationgroup/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"client.structure.service.models.ClientType":"Client.Structure.Service.ClientType","client.structure.twooperationgroup.Group1AsyncClient":"Client.Structure.TwoOperationGroup.Group1","client.structure.twooperationgroup.Group1AsyncClient.four":"Client.Structure.TwoOperationGroup.Group1.four","client.structure.twooperationgroup.Group1AsyncClient.fourWithResponse":"Client.Structure.TwoOperationGroup.Group1.four","client.structure.twooperationgroup.Group1AsyncClient.one":"Client.Structure.TwoOperationGroup.Group1.one","client.structure.twooperationgroup.Group1AsyncClient.oneWithResponse":"Client.Structure.TwoOperationGroup.Group1.one","client.structure.twooperationgroup.Group1AsyncClient.three":"Client.Structure.TwoOperationGroup.Group1.three","client.structure.twooperationgroup.Group1AsyncClient.threeWithResponse":"Client.Structure.TwoOperationGroup.Group1.three","client.structure.twooperationgroup.Group1Client":"Client.Structure.TwoOperationGroup.Group1","client.structure.twooperationgroup.Group1Client.four":"Client.Structure.TwoOperationGroup.Group1.four","client.structure.twooperationgroup.Group1Client.fourWithResponse":"Client.Structure.TwoOperationGroup.Group1.four","client.structure.twooperationgroup.Group1Client.one":"Client.Structure.TwoOperationGroup.Group1.one","client.structure.twooperationgroup.Group1Client.oneWithResponse":"Client.Structure.TwoOperationGroup.Group1.one","client.structure.twooperationgroup.Group1Client.three":"Client.Structure.TwoOperationGroup.Group1.three","client.structure.twooperationgroup.Group1Client.threeWithResponse":"Client.Structure.TwoOperationGroup.Group1.three","client.structure.twooperationgroup.Group2AsyncClient":"Client.Structure.TwoOperationGroup.Group2","client.structure.twooperationgroup.Group2AsyncClient.five":"Client.Structure.TwoOperationGroup.Group2.five","client.structure.twooperationgroup.Group2AsyncClient.fiveWithResponse":"Client.Structure.TwoOperationGroup.Group2.five","client.structure.twooperationgroup.Group2AsyncClient.six":"Client.Structure.TwoOperationGroup.Group2.six","client.structure.twooperationgroup.Group2AsyncClient.sixWithResponse":"Client.Structure.TwoOperationGroup.Group2.six","client.structure.twooperationgroup.Group2AsyncClient.two":"Client.Structure.TwoOperationGroup.Group2.two","client.structure.twooperationgroup.Group2AsyncClient.twoWithResponse":"Client.Structure.TwoOperationGroup.Group2.two","client.structure.twooperationgroup.Group2Client":"Client.Structure.TwoOperationGroup.Group2","client.structure.twooperationgroup.Group2Client.five":"Client.Structure.TwoOperationGroup.Group2.five","client.structure.twooperationgroup.Group2Client.fiveWithResponse":"Client.Structure.TwoOperationGroup.Group2.five","client.structure.twooperationgroup.Group2Client.six":"Client.Structure.TwoOperationGroup.Group2.six","client.structure.twooperationgroup.Group2Client.sixWithResponse":"Client.Structure.TwoOperationGroup.Group2.six","client.structure.twooperationgroup.Group2Client.two":"Client.Structure.TwoOperationGroup.Group2.two","client.structure.twooperationgroup.Group2Client.twoWithResponse":"Client.Structure.TwoOperationGroup.Group2.two","client.structure.twooperationgroup.TwoOperationGroupClientBuilder":"Client.Structure.TwoOperationGroup"},"generatedFiles":["src/main/java/client/structure/service/models/ClientType.java","src/main/java/client/structure/service/models/package-info.java","src/main/java/client/structure/twooperationgroup/Group1AsyncClient.java","src/main/java/client/structure/twooperationgroup/Group1Client.java","src/main/java/client/structure/twooperationgroup/Group2AsyncClient.java","src/main/java/client/structure/twooperationgroup/Group2Client.java","src/main/java/client/structure/twooperationgroup/TwoOperationGroupClientBuilder.java","src/main/java/client/structure/twooperationgroup/implementation/Group1sImpl.java","src/main/java/client/structure/twooperationgroup/implementation/Group2sImpl.java","src/main/java/client/structure/twooperationgroup/implementation/TwoOperationGroupClientImpl.java","src/main/java/client/structure/twooperationgroup/implementation/package-info.java","src/main/java/client/structure/twooperationgroup/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/documentation_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/documentation_apiview_properties.json deleted file mode 100644 index d2aa92134d7..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/documentation_apiview_properties.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "documentation.DocumentationClientBuilder": "Documentation", - "documentation.ListsAsyncClient": "Documentation.Lists", - "documentation.ListsAsyncClient.bulletPointsModel": "Documentation.Lists.bulletPointsModel", - "documentation.ListsAsyncClient.bulletPointsModelWithResponse": "Documentation.Lists.bulletPointsModel", - "documentation.ListsAsyncClient.bulletPointsOp": "Documentation.Lists.bulletPointsOp", - "documentation.ListsAsyncClient.bulletPointsOpWithResponse": "Documentation.Lists.bulletPointsOp", - "documentation.ListsAsyncClient.numbered": "Documentation.Lists.numbered", - "documentation.ListsAsyncClient.numberedWithResponse": "Documentation.Lists.numbered", - "documentation.ListsClient": "Documentation.Lists", - "documentation.ListsClient.bulletPointsModel": "Documentation.Lists.bulletPointsModel", - "documentation.ListsClient.bulletPointsModelWithResponse": "Documentation.Lists.bulletPointsModel", - "documentation.ListsClient.bulletPointsOp": "Documentation.Lists.bulletPointsOp", - "documentation.ListsClient.bulletPointsOpWithResponse": "Documentation.Lists.bulletPointsOp", - "documentation.ListsClient.numbered": "Documentation.Lists.numbered", - "documentation.ListsClient.numberedWithResponse": "Documentation.Lists.numbered", - "documentation.TextFormattingAsyncClient": "Documentation.TextFormatting", - "documentation.TextFormattingAsyncClient.boldText": "Documentation.TextFormatting.boldText", - "documentation.TextFormattingAsyncClient.boldTextWithResponse": "Documentation.TextFormatting.boldText", - "documentation.TextFormattingAsyncClient.combinedFormatting": "Documentation.TextFormatting.combinedFormatting", - "documentation.TextFormattingAsyncClient.combinedFormattingWithResponse": "Documentation.TextFormatting.combinedFormatting", - "documentation.TextFormattingAsyncClient.italicText": "Documentation.TextFormatting.italicText", - "documentation.TextFormattingAsyncClient.italicTextWithResponse": "Documentation.TextFormatting.italicText", - "documentation.TextFormattingClient": "Documentation.TextFormatting", - "documentation.TextFormattingClient.boldText": "Documentation.TextFormatting.boldText", - "documentation.TextFormattingClient.boldTextWithResponse": "Documentation.TextFormatting.boldText", - "documentation.TextFormattingClient.combinedFormatting": "Documentation.TextFormatting.combinedFormatting", - "documentation.TextFormattingClient.combinedFormattingWithResponse": "Documentation.TextFormatting.combinedFormatting", - "documentation.TextFormattingClient.italicText": "Documentation.TextFormatting.italicText", - "documentation.TextFormattingClient.italicTextWithResponse": "Documentation.TextFormatting.italicText", - "documentation.lists.implementation.models.BulletPointsModelRequest": "Documentation.Lists.bulletPointsModel.Request.anonymous", - "documentation.lists.models.BulletPointsEnum": "Documentation.Lists.BulletPointsEnum", - "documentation.lists.models.BulletPointsModel": "Documentation.Lists.BulletPointsModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/documentation_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/documentation_metadata.json index 8e1a954c7f1..4deeba66aee 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/documentation_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/documentation_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"documentation.DocumentationClientBuilder":"Documentation","documentation.ListsAsyncClient":"Documentation.Lists","documentation.ListsAsyncClient.bulletPointsModel":"Documentation.Lists.bulletPointsModel","documentation.ListsAsyncClient.bulletPointsModelWithResponse":"Documentation.Lists.bulletPointsModel","documentation.ListsAsyncClient.bulletPointsOp":"Documentation.Lists.bulletPointsOp","documentation.ListsAsyncClient.bulletPointsOpWithResponse":"Documentation.Lists.bulletPointsOp","documentation.ListsAsyncClient.numbered":"Documentation.Lists.numbered","documentation.ListsAsyncClient.numberedWithResponse":"Documentation.Lists.numbered","documentation.ListsClient":"Documentation.Lists","documentation.ListsClient.bulletPointsModel":"Documentation.Lists.bulletPointsModel","documentation.ListsClient.bulletPointsModelWithResponse":"Documentation.Lists.bulletPointsModel","documentation.ListsClient.bulletPointsOp":"Documentation.Lists.bulletPointsOp","documentation.ListsClient.bulletPointsOpWithResponse":"Documentation.Lists.bulletPointsOp","documentation.ListsClient.numbered":"Documentation.Lists.numbered","documentation.ListsClient.numberedWithResponse":"Documentation.Lists.numbered","documentation.TextFormattingAsyncClient":"Documentation.TextFormatting","documentation.TextFormattingAsyncClient.boldText":"Documentation.TextFormatting.boldText","documentation.TextFormattingAsyncClient.boldTextWithResponse":"Documentation.TextFormatting.boldText","documentation.TextFormattingAsyncClient.combinedFormatting":"Documentation.TextFormatting.combinedFormatting","documentation.TextFormattingAsyncClient.combinedFormattingWithResponse":"Documentation.TextFormatting.combinedFormatting","documentation.TextFormattingAsyncClient.italicText":"Documentation.TextFormatting.italicText","documentation.TextFormattingAsyncClient.italicTextWithResponse":"Documentation.TextFormatting.italicText","documentation.TextFormattingClient":"Documentation.TextFormatting","documentation.TextFormattingClient.boldText":"Documentation.TextFormatting.boldText","documentation.TextFormattingClient.boldTextWithResponse":"Documentation.TextFormatting.boldText","documentation.TextFormattingClient.combinedFormatting":"Documentation.TextFormatting.combinedFormatting","documentation.TextFormattingClient.combinedFormattingWithResponse":"Documentation.TextFormatting.combinedFormatting","documentation.TextFormattingClient.italicText":"Documentation.TextFormatting.italicText","documentation.TextFormattingClient.italicTextWithResponse":"Documentation.TextFormatting.italicText","documentation.lists.implementation.models.BulletPointsModelRequest":"Documentation.Lists.bulletPointsModel.Request.anonymous","documentation.lists.models.BulletPointsEnum":"Documentation.Lists.BulletPointsEnum","documentation.lists.models.BulletPointsModel":"Documentation.Lists.BulletPointsModel"},"generatedFiles":["src/main/java/documentation/DocumentationClientBuilder.java","src/main/java/documentation/ListsAsyncClient.java","src/main/java/documentation/ListsClient.java","src/main/java/documentation/TextFormattingAsyncClient.java","src/main/java/documentation/TextFormattingClient.java","src/main/java/documentation/implementation/DocumentationClientImpl.java","src/main/java/documentation/implementation/ListsImpl.java","src/main/java/documentation/implementation/TextFormattingsImpl.java","src/main/java/documentation/implementation/package-info.java","src/main/java/documentation/lists/implementation/models/BulletPointsModelRequest.java","src/main/java/documentation/lists/implementation/models/package-info.java","src/main/java/documentation/lists/models/BulletPointsEnum.java","src/main/java/documentation/lists/models/BulletPointsModel.java","src/main/java/documentation/lists/models/package-info.java","src/main/java/documentation/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"documentation.DocumentationClientBuilder":"Documentation","documentation.ListsAsyncClient":"Documentation.Lists","documentation.ListsAsyncClient.bulletPointsModel":"Documentation.Lists.bulletPointsModel","documentation.ListsAsyncClient.bulletPointsModelWithResponse":"Documentation.Lists.bulletPointsModel","documentation.ListsAsyncClient.bulletPointsOp":"Documentation.Lists.bulletPointsOp","documentation.ListsAsyncClient.bulletPointsOpWithResponse":"Documentation.Lists.bulletPointsOp","documentation.ListsAsyncClient.numbered":"Documentation.Lists.numbered","documentation.ListsAsyncClient.numberedWithResponse":"Documentation.Lists.numbered","documentation.ListsClient":"Documentation.Lists","documentation.ListsClient.bulletPointsModel":"Documentation.Lists.bulletPointsModel","documentation.ListsClient.bulletPointsModelWithResponse":"Documentation.Lists.bulletPointsModel","documentation.ListsClient.bulletPointsOp":"Documentation.Lists.bulletPointsOp","documentation.ListsClient.bulletPointsOpWithResponse":"Documentation.Lists.bulletPointsOp","documentation.ListsClient.numbered":"Documentation.Lists.numbered","documentation.ListsClient.numberedWithResponse":"Documentation.Lists.numbered","documentation.TextFormattingAsyncClient":"Documentation.TextFormatting","documentation.TextFormattingAsyncClient.boldText":"Documentation.TextFormatting.boldText","documentation.TextFormattingAsyncClient.boldTextWithResponse":"Documentation.TextFormatting.boldText","documentation.TextFormattingAsyncClient.combinedFormatting":"Documentation.TextFormatting.combinedFormatting","documentation.TextFormattingAsyncClient.combinedFormattingWithResponse":"Documentation.TextFormatting.combinedFormatting","documentation.TextFormattingAsyncClient.italicText":"Documentation.TextFormatting.italicText","documentation.TextFormattingAsyncClient.italicTextWithResponse":"Documentation.TextFormatting.italicText","documentation.TextFormattingClient":"Documentation.TextFormatting","documentation.TextFormattingClient.boldText":"Documentation.TextFormatting.boldText","documentation.TextFormattingClient.boldTextWithResponse":"Documentation.TextFormatting.boldText","documentation.TextFormattingClient.combinedFormatting":"Documentation.TextFormatting.combinedFormatting","documentation.TextFormattingClient.combinedFormattingWithResponse":"Documentation.TextFormatting.combinedFormatting","documentation.TextFormattingClient.italicText":"Documentation.TextFormatting.italicText","documentation.TextFormattingClient.italicTextWithResponse":"Documentation.TextFormatting.italicText","documentation.lists.implementation.models.BulletPointsModelRequest":"Documentation.Lists.bulletPointsModel.Request.anonymous","documentation.lists.models.BulletPointsEnum":"Documentation.Lists.BulletPointsEnum","documentation.lists.models.BulletPointsModel":"Documentation.Lists.BulletPointsModel"},"generatedFiles":["src/main/java/documentation/DocumentationClientBuilder.java","src/main/java/documentation/ListsAsyncClient.java","src/main/java/documentation/ListsClient.java","src/main/java/documentation/TextFormattingAsyncClient.java","src/main/java/documentation/TextFormattingClient.java","src/main/java/documentation/implementation/DocumentationClientImpl.java","src/main/java/documentation/implementation/ListsImpl.java","src/main/java/documentation/implementation/TextFormattingsImpl.java","src/main/java/documentation/implementation/package-info.java","src/main/java/documentation/lists/implementation/models/BulletPointsModelRequest.java","src/main/java/documentation/lists/implementation/models/package-info.java","src/main/java/documentation/lists/models/BulletPointsEnum.java","src/main/java/documentation/lists/models/BulletPointsModel.java","src/main/java/documentation/lists/models/package-info.java","src/main/java/documentation/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-array_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-array_apiview_properties.json deleted file mode 100644 index 47a20deb2f2..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-array_apiview_properties.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "encode.array.ArrayAsyncClient": "Encode.Array.Property", - "encode.array.ArrayAsyncClient.commaDelimited": "Encode.Array.Property.commaDelimited", - "encode.array.ArrayAsyncClient.commaDelimitedWithResponse": "Encode.Array.Property.commaDelimited", - "encode.array.ArrayAsyncClient.newlineDelimited": "Encode.Array.Property.newlineDelimited", - "encode.array.ArrayAsyncClient.newlineDelimitedWithResponse": "Encode.Array.Property.newlineDelimited", - "encode.array.ArrayAsyncClient.pipeDelimited": "Encode.Array.Property.pipeDelimited", - "encode.array.ArrayAsyncClient.pipeDelimitedWithResponse": "Encode.Array.Property.pipeDelimited", - "encode.array.ArrayAsyncClient.spaceDelimited": "Encode.Array.Property.spaceDelimited", - "encode.array.ArrayAsyncClient.spaceDelimitedWithResponse": "Encode.Array.Property.spaceDelimited", - "encode.array.ArrayClient": "Encode.Array.Property", - "encode.array.ArrayClient.commaDelimited": "Encode.Array.Property.commaDelimited", - "encode.array.ArrayClient.commaDelimitedWithResponse": "Encode.Array.Property.commaDelimited", - "encode.array.ArrayClient.newlineDelimited": "Encode.Array.Property.newlineDelimited", - "encode.array.ArrayClient.newlineDelimitedWithResponse": "Encode.Array.Property.newlineDelimited", - "encode.array.ArrayClient.pipeDelimited": "Encode.Array.Property.pipeDelimited", - "encode.array.ArrayClient.pipeDelimitedWithResponse": "Encode.Array.Property.pipeDelimited", - "encode.array.ArrayClient.spaceDelimited": "Encode.Array.Property.spaceDelimited", - "encode.array.ArrayClient.spaceDelimitedWithResponse": "Encode.Array.Property.spaceDelimited", - "encode.array.ArrayClientBuilder": "Encode.Array", - "encode.array.models.CommaDelimitedArrayProperty": "Encode.Array.CommaDelimitedArrayProperty", - "encode.array.models.NewlineDelimitedArrayProperty": "Encode.Array.NewlineDelimitedArrayProperty", - "encode.array.models.PipeDelimitedArrayProperty": "Encode.Array.PipeDelimitedArrayProperty", - "encode.array.models.SpaceDelimitedArrayProperty": "Encode.Array.SpaceDelimitedArrayProperty" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-array_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-array_metadata.json index a094a17ad8f..99dc8ad5af7 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-array_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-array_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"encode.array.ArrayAsyncClient":"Encode.Array.Property","encode.array.ArrayAsyncClient.commaDelimited":"Encode.Array.Property.commaDelimited","encode.array.ArrayAsyncClient.commaDelimitedWithResponse":"Encode.Array.Property.commaDelimited","encode.array.ArrayAsyncClient.newlineDelimited":"Encode.Array.Property.newlineDelimited","encode.array.ArrayAsyncClient.newlineDelimitedWithResponse":"Encode.Array.Property.newlineDelimited","encode.array.ArrayAsyncClient.pipeDelimited":"Encode.Array.Property.pipeDelimited","encode.array.ArrayAsyncClient.pipeDelimitedWithResponse":"Encode.Array.Property.pipeDelimited","encode.array.ArrayAsyncClient.spaceDelimited":"Encode.Array.Property.spaceDelimited","encode.array.ArrayAsyncClient.spaceDelimitedWithResponse":"Encode.Array.Property.spaceDelimited","encode.array.ArrayClient":"Encode.Array.Property","encode.array.ArrayClient.commaDelimited":"Encode.Array.Property.commaDelimited","encode.array.ArrayClient.commaDelimitedWithResponse":"Encode.Array.Property.commaDelimited","encode.array.ArrayClient.newlineDelimited":"Encode.Array.Property.newlineDelimited","encode.array.ArrayClient.newlineDelimitedWithResponse":"Encode.Array.Property.newlineDelimited","encode.array.ArrayClient.pipeDelimited":"Encode.Array.Property.pipeDelimited","encode.array.ArrayClient.pipeDelimitedWithResponse":"Encode.Array.Property.pipeDelimited","encode.array.ArrayClient.spaceDelimited":"Encode.Array.Property.spaceDelimited","encode.array.ArrayClient.spaceDelimitedWithResponse":"Encode.Array.Property.spaceDelimited","encode.array.ArrayClientBuilder":"Encode.Array","encode.array.models.CommaDelimitedArrayProperty":"Encode.Array.CommaDelimitedArrayProperty","encode.array.models.NewlineDelimitedArrayProperty":"Encode.Array.NewlineDelimitedArrayProperty","encode.array.models.PipeDelimitedArrayProperty":"Encode.Array.PipeDelimitedArrayProperty","encode.array.models.SpaceDelimitedArrayProperty":"Encode.Array.SpaceDelimitedArrayProperty"},"generatedFiles":["src/main/java/encode/array/ArrayAsyncClient.java","src/main/java/encode/array/ArrayClient.java","src/main/java/encode/array/ArrayClientBuilder.java","src/main/java/encode/array/implementation/ArrayClientImpl.java","src/main/java/encode/array/implementation/PropertiesImpl.java","src/main/java/encode/array/implementation/package-info.java","src/main/java/encode/array/models/CommaDelimitedArrayProperty.java","src/main/java/encode/array/models/NewlineDelimitedArrayProperty.java","src/main/java/encode/array/models/PipeDelimitedArrayProperty.java","src/main/java/encode/array/models/SpaceDelimitedArrayProperty.java","src/main/java/encode/array/models/package-info.java","src/main/java/encode/array/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"encode.array.ArrayAsyncClient":"Encode.Array.Property","encode.array.ArrayAsyncClient.commaDelimited":"Encode.Array.Property.commaDelimited","encode.array.ArrayAsyncClient.commaDelimitedWithResponse":"Encode.Array.Property.commaDelimited","encode.array.ArrayAsyncClient.enumCommaDelimited":"Encode.Array.Property.enumCommaDelimited","encode.array.ArrayAsyncClient.enumCommaDelimitedWithResponse":"Encode.Array.Property.enumCommaDelimited","encode.array.ArrayAsyncClient.enumNewlineDelimited":"Encode.Array.Property.enumNewlineDelimited","encode.array.ArrayAsyncClient.enumNewlineDelimitedWithResponse":"Encode.Array.Property.enumNewlineDelimited","encode.array.ArrayAsyncClient.enumPipeDelimited":"Encode.Array.Property.enumPipeDelimited","encode.array.ArrayAsyncClient.enumPipeDelimitedWithResponse":"Encode.Array.Property.enumPipeDelimited","encode.array.ArrayAsyncClient.enumSpaceDelimited":"Encode.Array.Property.enumSpaceDelimited","encode.array.ArrayAsyncClient.enumSpaceDelimitedWithResponse":"Encode.Array.Property.enumSpaceDelimited","encode.array.ArrayAsyncClient.extensibleEnumCommaDelimited":"Encode.Array.Property.extensibleEnumCommaDelimited","encode.array.ArrayAsyncClient.extensibleEnumCommaDelimitedWithResponse":"Encode.Array.Property.extensibleEnumCommaDelimited","encode.array.ArrayAsyncClient.extensibleEnumNewlineDelimited":"Encode.Array.Property.extensibleEnumNewlineDelimited","encode.array.ArrayAsyncClient.extensibleEnumNewlineDelimitedWithResponse":"Encode.Array.Property.extensibleEnumNewlineDelimited","encode.array.ArrayAsyncClient.extensibleEnumPipeDelimited":"Encode.Array.Property.extensibleEnumPipeDelimited","encode.array.ArrayAsyncClient.extensibleEnumPipeDelimitedWithResponse":"Encode.Array.Property.extensibleEnumPipeDelimited","encode.array.ArrayAsyncClient.extensibleEnumSpaceDelimited":"Encode.Array.Property.extensibleEnumSpaceDelimited","encode.array.ArrayAsyncClient.extensibleEnumSpaceDelimitedWithResponse":"Encode.Array.Property.extensibleEnumSpaceDelimited","encode.array.ArrayAsyncClient.newlineDelimited":"Encode.Array.Property.newlineDelimited","encode.array.ArrayAsyncClient.newlineDelimitedWithResponse":"Encode.Array.Property.newlineDelimited","encode.array.ArrayAsyncClient.pipeDelimited":"Encode.Array.Property.pipeDelimited","encode.array.ArrayAsyncClient.pipeDelimitedWithResponse":"Encode.Array.Property.pipeDelimited","encode.array.ArrayAsyncClient.spaceDelimited":"Encode.Array.Property.spaceDelimited","encode.array.ArrayAsyncClient.spaceDelimitedWithResponse":"Encode.Array.Property.spaceDelimited","encode.array.ArrayClient":"Encode.Array.Property","encode.array.ArrayClient.commaDelimited":"Encode.Array.Property.commaDelimited","encode.array.ArrayClient.commaDelimitedWithResponse":"Encode.Array.Property.commaDelimited","encode.array.ArrayClient.enumCommaDelimited":"Encode.Array.Property.enumCommaDelimited","encode.array.ArrayClient.enumCommaDelimitedWithResponse":"Encode.Array.Property.enumCommaDelimited","encode.array.ArrayClient.enumNewlineDelimited":"Encode.Array.Property.enumNewlineDelimited","encode.array.ArrayClient.enumNewlineDelimitedWithResponse":"Encode.Array.Property.enumNewlineDelimited","encode.array.ArrayClient.enumPipeDelimited":"Encode.Array.Property.enumPipeDelimited","encode.array.ArrayClient.enumPipeDelimitedWithResponse":"Encode.Array.Property.enumPipeDelimited","encode.array.ArrayClient.enumSpaceDelimited":"Encode.Array.Property.enumSpaceDelimited","encode.array.ArrayClient.enumSpaceDelimitedWithResponse":"Encode.Array.Property.enumSpaceDelimited","encode.array.ArrayClient.extensibleEnumCommaDelimited":"Encode.Array.Property.extensibleEnumCommaDelimited","encode.array.ArrayClient.extensibleEnumCommaDelimitedWithResponse":"Encode.Array.Property.extensibleEnumCommaDelimited","encode.array.ArrayClient.extensibleEnumNewlineDelimited":"Encode.Array.Property.extensibleEnumNewlineDelimited","encode.array.ArrayClient.extensibleEnumNewlineDelimitedWithResponse":"Encode.Array.Property.extensibleEnumNewlineDelimited","encode.array.ArrayClient.extensibleEnumPipeDelimited":"Encode.Array.Property.extensibleEnumPipeDelimited","encode.array.ArrayClient.extensibleEnumPipeDelimitedWithResponse":"Encode.Array.Property.extensibleEnumPipeDelimited","encode.array.ArrayClient.extensibleEnumSpaceDelimited":"Encode.Array.Property.extensibleEnumSpaceDelimited","encode.array.ArrayClient.extensibleEnumSpaceDelimitedWithResponse":"Encode.Array.Property.extensibleEnumSpaceDelimited","encode.array.ArrayClient.newlineDelimited":"Encode.Array.Property.newlineDelimited","encode.array.ArrayClient.newlineDelimitedWithResponse":"Encode.Array.Property.newlineDelimited","encode.array.ArrayClient.pipeDelimited":"Encode.Array.Property.pipeDelimited","encode.array.ArrayClient.pipeDelimitedWithResponse":"Encode.Array.Property.pipeDelimited","encode.array.ArrayClient.spaceDelimited":"Encode.Array.Property.spaceDelimited","encode.array.ArrayClient.spaceDelimitedWithResponse":"Encode.Array.Property.spaceDelimited","encode.array.ArrayClientBuilder":"Encode.Array","encode.array.models.Colors":"Encode.Array.Colors","encode.array.models.ColorsExtensibleEnum":"Encode.Array.ColorsExtensibleEnum","encode.array.models.CommaDelimitedArrayProperty":"Encode.Array.CommaDelimitedArrayProperty","encode.array.models.CommaDelimitedEnumArrayProperty":"Encode.Array.CommaDelimitedEnumArrayProperty","encode.array.models.CommaDelimitedExtensibleEnumArrayProperty":"Encode.Array.CommaDelimitedExtensibleEnumArrayProperty","encode.array.models.NewlineDelimitedArrayProperty":"Encode.Array.NewlineDelimitedArrayProperty","encode.array.models.NewlineDelimitedEnumArrayProperty":"Encode.Array.NewlineDelimitedEnumArrayProperty","encode.array.models.NewlineDelimitedExtensibleEnumArrayProperty":"Encode.Array.NewlineDelimitedExtensibleEnumArrayProperty","encode.array.models.PipeDelimitedArrayProperty":"Encode.Array.PipeDelimitedArrayProperty","encode.array.models.PipeDelimitedEnumArrayProperty":"Encode.Array.PipeDelimitedEnumArrayProperty","encode.array.models.PipeDelimitedExtensibleEnumArrayProperty":"Encode.Array.PipeDelimitedExtensibleEnumArrayProperty","encode.array.models.SpaceDelimitedArrayProperty":"Encode.Array.SpaceDelimitedArrayProperty","encode.array.models.SpaceDelimitedEnumArrayProperty":"Encode.Array.SpaceDelimitedEnumArrayProperty","encode.array.models.SpaceDelimitedExtensibleEnumArrayProperty":"Encode.Array.SpaceDelimitedExtensibleEnumArrayProperty"},"generatedFiles":["src/main/java/encode/array/ArrayAsyncClient.java","src/main/java/encode/array/ArrayClient.java","src/main/java/encode/array/ArrayClientBuilder.java","src/main/java/encode/array/implementation/ArrayClientImpl.java","src/main/java/encode/array/implementation/PropertiesImpl.java","src/main/java/encode/array/implementation/package-info.java","src/main/java/encode/array/models/Colors.java","src/main/java/encode/array/models/ColorsExtensibleEnum.java","src/main/java/encode/array/models/CommaDelimitedArrayProperty.java","src/main/java/encode/array/models/CommaDelimitedEnumArrayProperty.java","src/main/java/encode/array/models/CommaDelimitedExtensibleEnumArrayProperty.java","src/main/java/encode/array/models/NewlineDelimitedArrayProperty.java","src/main/java/encode/array/models/NewlineDelimitedEnumArrayProperty.java","src/main/java/encode/array/models/NewlineDelimitedExtensibleEnumArrayProperty.java","src/main/java/encode/array/models/PipeDelimitedArrayProperty.java","src/main/java/encode/array/models/PipeDelimitedEnumArrayProperty.java","src/main/java/encode/array/models/PipeDelimitedExtensibleEnumArrayProperty.java","src/main/java/encode/array/models/SpaceDelimitedArrayProperty.java","src/main/java/encode/array/models/SpaceDelimitedEnumArrayProperty.java","src/main/java/encode/array/models/SpaceDelimitedExtensibleEnumArrayProperty.java","src/main/java/encode/array/models/package-info.java","src/main/java/encode/array/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-bytes_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-bytes_apiview_properties.json deleted file mode 100644 index 1497454c2d1..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-bytes_apiview_properties.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "encode.bytes.BytesClientBuilder": "Encode.Bytes", - "encode.bytes.HeaderAsyncClient": "Encode.Bytes.Header", - "encode.bytes.HeaderAsyncClient.base64": "Encode.Bytes.Header.base64", - "encode.bytes.HeaderAsyncClient.base64WithResponse": "Encode.Bytes.Header.base64", - "encode.bytes.HeaderAsyncClient.base64url": "Encode.Bytes.Header.base64url", - "encode.bytes.HeaderAsyncClient.base64urlArray": "Encode.Bytes.Header.base64urlArray", - "encode.bytes.HeaderAsyncClient.base64urlArrayWithResponse": "Encode.Bytes.Header.base64urlArray", - "encode.bytes.HeaderAsyncClient.base64urlWithResponse": "Encode.Bytes.Header.base64url", - "encode.bytes.HeaderAsyncClient.defaultMethod": "Encode.Bytes.Header.default", - "encode.bytes.HeaderAsyncClient.defaultMethodWithResponse": "Encode.Bytes.Header.default", - "encode.bytes.HeaderClient": "Encode.Bytes.Header", - "encode.bytes.HeaderClient.base64": "Encode.Bytes.Header.base64", - "encode.bytes.HeaderClient.base64WithResponse": "Encode.Bytes.Header.base64", - "encode.bytes.HeaderClient.base64url": "Encode.Bytes.Header.base64url", - "encode.bytes.HeaderClient.base64urlArray": "Encode.Bytes.Header.base64urlArray", - "encode.bytes.HeaderClient.base64urlArrayWithResponse": "Encode.Bytes.Header.base64urlArray", - "encode.bytes.HeaderClient.base64urlWithResponse": "Encode.Bytes.Header.base64url", - "encode.bytes.HeaderClient.defaultMethod": "Encode.Bytes.Header.default", - "encode.bytes.HeaderClient.defaultMethodWithResponse": "Encode.Bytes.Header.default", - "encode.bytes.PropertyAsyncClient": "Encode.Bytes.Property", - "encode.bytes.PropertyAsyncClient.base64": "Encode.Bytes.Property.base64", - "encode.bytes.PropertyAsyncClient.base64WithResponse": "Encode.Bytes.Property.base64", - "encode.bytes.PropertyAsyncClient.base64url": "Encode.Bytes.Property.base64url", - "encode.bytes.PropertyAsyncClient.base64urlArray": "Encode.Bytes.Property.base64urlArray", - "encode.bytes.PropertyAsyncClient.base64urlArrayWithResponse": "Encode.Bytes.Property.base64urlArray", - "encode.bytes.PropertyAsyncClient.base64urlWithResponse": "Encode.Bytes.Property.base64url", - "encode.bytes.PropertyAsyncClient.defaultMethod": "Encode.Bytes.Property.default", - "encode.bytes.PropertyAsyncClient.defaultMethodWithResponse": "Encode.Bytes.Property.default", - "encode.bytes.PropertyClient": "Encode.Bytes.Property", - "encode.bytes.PropertyClient.base64": "Encode.Bytes.Property.base64", - "encode.bytes.PropertyClient.base64WithResponse": "Encode.Bytes.Property.base64", - "encode.bytes.PropertyClient.base64url": "Encode.Bytes.Property.base64url", - "encode.bytes.PropertyClient.base64urlArray": "Encode.Bytes.Property.base64urlArray", - "encode.bytes.PropertyClient.base64urlArrayWithResponse": "Encode.Bytes.Property.base64urlArray", - "encode.bytes.PropertyClient.base64urlWithResponse": "Encode.Bytes.Property.base64url", - "encode.bytes.PropertyClient.defaultMethod": "Encode.Bytes.Property.default", - "encode.bytes.PropertyClient.defaultMethodWithResponse": "Encode.Bytes.Property.default", - "encode.bytes.QueryAsyncClient": "Encode.Bytes.Query", - "encode.bytes.QueryAsyncClient.base64": "Encode.Bytes.Query.base64", - "encode.bytes.QueryAsyncClient.base64WithResponse": "Encode.Bytes.Query.base64", - "encode.bytes.QueryAsyncClient.base64url": "Encode.Bytes.Query.base64url", - "encode.bytes.QueryAsyncClient.base64urlArray": "Encode.Bytes.Query.base64urlArray", - "encode.bytes.QueryAsyncClient.base64urlArrayWithResponse": "Encode.Bytes.Query.base64urlArray", - "encode.bytes.QueryAsyncClient.base64urlWithResponse": "Encode.Bytes.Query.base64url", - "encode.bytes.QueryAsyncClient.defaultMethod": "Encode.Bytes.Query.default", - "encode.bytes.QueryAsyncClient.defaultMethodWithResponse": "Encode.Bytes.Query.default", - "encode.bytes.QueryClient": "Encode.Bytes.Query", - "encode.bytes.QueryClient.base64": "Encode.Bytes.Query.base64", - "encode.bytes.QueryClient.base64WithResponse": "Encode.Bytes.Query.base64", - "encode.bytes.QueryClient.base64url": "Encode.Bytes.Query.base64url", - "encode.bytes.QueryClient.base64urlArray": "Encode.Bytes.Query.base64urlArray", - "encode.bytes.QueryClient.base64urlArrayWithResponse": "Encode.Bytes.Query.base64urlArray", - "encode.bytes.QueryClient.base64urlWithResponse": "Encode.Bytes.Query.base64url", - "encode.bytes.QueryClient.defaultMethod": "Encode.Bytes.Query.default", - "encode.bytes.QueryClient.defaultMethodWithResponse": "Encode.Bytes.Query.default", - "encode.bytes.RequestBodyAsyncClient": "Encode.Bytes.RequestBody", - "encode.bytes.RequestBodyAsyncClient.base64": "Encode.Bytes.RequestBody.base64", - "encode.bytes.RequestBodyAsyncClient.base64WithResponse": "Encode.Bytes.RequestBody.base64", - "encode.bytes.RequestBodyAsyncClient.base64url": "Encode.Bytes.RequestBody.base64url", - "encode.bytes.RequestBodyAsyncClient.base64urlWithResponse": "Encode.Bytes.RequestBody.base64url", - "encode.bytes.RequestBodyAsyncClient.customContentType": "Encode.Bytes.RequestBody.customContentType", - "encode.bytes.RequestBodyAsyncClient.customContentTypeWithResponse": "Encode.Bytes.RequestBody.customContentType", - "encode.bytes.RequestBodyAsyncClient.defaultMethod": "Encode.Bytes.RequestBody.default", - "encode.bytes.RequestBodyAsyncClient.defaultMethodWithResponse": "Encode.Bytes.RequestBody.default", - "encode.bytes.RequestBodyAsyncClient.octetStream": "Encode.Bytes.RequestBody.octetStream", - "encode.bytes.RequestBodyAsyncClient.octetStreamWithResponse": "Encode.Bytes.RequestBody.octetStream", - "encode.bytes.RequestBodyClient": "Encode.Bytes.RequestBody", - "encode.bytes.RequestBodyClient.base64": "Encode.Bytes.RequestBody.base64", - "encode.bytes.RequestBodyClient.base64WithResponse": "Encode.Bytes.RequestBody.base64", - "encode.bytes.RequestBodyClient.base64url": "Encode.Bytes.RequestBody.base64url", - "encode.bytes.RequestBodyClient.base64urlWithResponse": "Encode.Bytes.RequestBody.base64url", - "encode.bytes.RequestBodyClient.customContentType": "Encode.Bytes.RequestBody.customContentType", - "encode.bytes.RequestBodyClient.customContentTypeWithResponse": "Encode.Bytes.RequestBody.customContentType", - "encode.bytes.RequestBodyClient.defaultMethod": "Encode.Bytes.RequestBody.default", - "encode.bytes.RequestBodyClient.defaultMethodWithResponse": "Encode.Bytes.RequestBody.default", - "encode.bytes.RequestBodyClient.octetStream": "Encode.Bytes.RequestBody.octetStream", - "encode.bytes.RequestBodyClient.octetStreamWithResponse": "Encode.Bytes.RequestBody.octetStream", - "encode.bytes.ResponseBodyAsyncClient": "Encode.Bytes.ResponseBody", - "encode.bytes.ResponseBodyAsyncClient.base64": "Encode.Bytes.ResponseBody.base64", - "encode.bytes.ResponseBodyAsyncClient.base64WithResponse": "Encode.Bytes.ResponseBody.base64", - "encode.bytes.ResponseBodyAsyncClient.base64url": "Encode.Bytes.ResponseBody.base64url", - "encode.bytes.ResponseBodyAsyncClient.base64urlWithResponse": "Encode.Bytes.ResponseBody.base64url", - "encode.bytes.ResponseBodyAsyncClient.customContentType": "Encode.Bytes.ResponseBody.customContentType", - "encode.bytes.ResponseBodyAsyncClient.customContentTypeWithResponse": "Encode.Bytes.ResponseBody.customContentType", - "encode.bytes.ResponseBodyAsyncClient.defaultMethod": "Encode.Bytes.ResponseBody.default", - "encode.bytes.ResponseBodyAsyncClient.defaultMethodWithResponse": "Encode.Bytes.ResponseBody.default", - "encode.bytes.ResponseBodyAsyncClient.octetStream": "Encode.Bytes.ResponseBody.octetStream", - "encode.bytes.ResponseBodyAsyncClient.octetStreamWithResponse": "Encode.Bytes.ResponseBody.octetStream", - "encode.bytes.ResponseBodyClient": "Encode.Bytes.ResponseBody", - "encode.bytes.ResponseBodyClient.base64": "Encode.Bytes.ResponseBody.base64", - "encode.bytes.ResponseBodyClient.base64WithResponse": "Encode.Bytes.ResponseBody.base64", - "encode.bytes.ResponseBodyClient.base64url": "Encode.Bytes.ResponseBody.base64url", - "encode.bytes.ResponseBodyClient.base64urlWithResponse": "Encode.Bytes.ResponseBody.base64url", - "encode.bytes.ResponseBodyClient.customContentType": "Encode.Bytes.ResponseBody.customContentType", - "encode.bytes.ResponseBodyClient.customContentTypeWithResponse": "Encode.Bytes.ResponseBody.customContentType", - "encode.bytes.ResponseBodyClient.defaultMethod": "Encode.Bytes.ResponseBody.default", - "encode.bytes.ResponseBodyClient.defaultMethodWithResponse": "Encode.Bytes.ResponseBody.default", - "encode.bytes.ResponseBodyClient.octetStream": "Encode.Bytes.ResponseBody.octetStream", - "encode.bytes.ResponseBodyClient.octetStreamWithResponse": "Encode.Bytes.ResponseBody.octetStream", - "encode.bytes.models.Base64BytesProperty": "Encode.Bytes.Base64BytesProperty", - "encode.bytes.models.Base64urlArrayBytesProperty": "Encode.Bytes.Base64urlArrayBytesProperty", - "encode.bytes.models.Base64urlBytesProperty": "Encode.Bytes.Base64urlBytesProperty", - "encode.bytes.models.DefaultBytesProperty": "Encode.Bytes.DefaultBytesProperty" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-bytes_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-bytes_metadata.json index 3654d682d58..629f6a64e06 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-bytes_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-bytes_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"encode.bytes.BytesClientBuilder":"Encode.Bytes","encode.bytes.HeaderAsyncClient":"Encode.Bytes.Header","encode.bytes.HeaderAsyncClient.base64":"Encode.Bytes.Header.base64","encode.bytes.HeaderAsyncClient.base64WithResponse":"Encode.Bytes.Header.base64","encode.bytes.HeaderAsyncClient.base64url":"Encode.Bytes.Header.base64url","encode.bytes.HeaderAsyncClient.base64urlArray":"Encode.Bytes.Header.base64urlArray","encode.bytes.HeaderAsyncClient.base64urlArrayWithResponse":"Encode.Bytes.Header.base64urlArray","encode.bytes.HeaderAsyncClient.base64urlWithResponse":"Encode.Bytes.Header.base64url","encode.bytes.HeaderAsyncClient.defaultMethod":"Encode.Bytes.Header.default","encode.bytes.HeaderAsyncClient.defaultMethodWithResponse":"Encode.Bytes.Header.default","encode.bytes.HeaderClient":"Encode.Bytes.Header","encode.bytes.HeaderClient.base64":"Encode.Bytes.Header.base64","encode.bytes.HeaderClient.base64WithResponse":"Encode.Bytes.Header.base64","encode.bytes.HeaderClient.base64url":"Encode.Bytes.Header.base64url","encode.bytes.HeaderClient.base64urlArray":"Encode.Bytes.Header.base64urlArray","encode.bytes.HeaderClient.base64urlArrayWithResponse":"Encode.Bytes.Header.base64urlArray","encode.bytes.HeaderClient.base64urlWithResponse":"Encode.Bytes.Header.base64url","encode.bytes.HeaderClient.defaultMethod":"Encode.Bytes.Header.default","encode.bytes.HeaderClient.defaultMethodWithResponse":"Encode.Bytes.Header.default","encode.bytes.PropertyAsyncClient":"Encode.Bytes.Property","encode.bytes.PropertyAsyncClient.base64":"Encode.Bytes.Property.base64","encode.bytes.PropertyAsyncClient.base64WithResponse":"Encode.Bytes.Property.base64","encode.bytes.PropertyAsyncClient.base64url":"Encode.Bytes.Property.base64url","encode.bytes.PropertyAsyncClient.base64urlArray":"Encode.Bytes.Property.base64urlArray","encode.bytes.PropertyAsyncClient.base64urlArrayWithResponse":"Encode.Bytes.Property.base64urlArray","encode.bytes.PropertyAsyncClient.base64urlWithResponse":"Encode.Bytes.Property.base64url","encode.bytes.PropertyAsyncClient.defaultMethod":"Encode.Bytes.Property.default","encode.bytes.PropertyAsyncClient.defaultMethodWithResponse":"Encode.Bytes.Property.default","encode.bytes.PropertyClient":"Encode.Bytes.Property","encode.bytes.PropertyClient.base64":"Encode.Bytes.Property.base64","encode.bytes.PropertyClient.base64WithResponse":"Encode.Bytes.Property.base64","encode.bytes.PropertyClient.base64url":"Encode.Bytes.Property.base64url","encode.bytes.PropertyClient.base64urlArray":"Encode.Bytes.Property.base64urlArray","encode.bytes.PropertyClient.base64urlArrayWithResponse":"Encode.Bytes.Property.base64urlArray","encode.bytes.PropertyClient.base64urlWithResponse":"Encode.Bytes.Property.base64url","encode.bytes.PropertyClient.defaultMethod":"Encode.Bytes.Property.default","encode.bytes.PropertyClient.defaultMethodWithResponse":"Encode.Bytes.Property.default","encode.bytes.QueryAsyncClient":"Encode.Bytes.Query","encode.bytes.QueryAsyncClient.base64":"Encode.Bytes.Query.base64","encode.bytes.QueryAsyncClient.base64WithResponse":"Encode.Bytes.Query.base64","encode.bytes.QueryAsyncClient.base64url":"Encode.Bytes.Query.base64url","encode.bytes.QueryAsyncClient.base64urlArray":"Encode.Bytes.Query.base64urlArray","encode.bytes.QueryAsyncClient.base64urlArrayWithResponse":"Encode.Bytes.Query.base64urlArray","encode.bytes.QueryAsyncClient.base64urlWithResponse":"Encode.Bytes.Query.base64url","encode.bytes.QueryAsyncClient.defaultMethod":"Encode.Bytes.Query.default","encode.bytes.QueryAsyncClient.defaultMethodWithResponse":"Encode.Bytes.Query.default","encode.bytes.QueryClient":"Encode.Bytes.Query","encode.bytes.QueryClient.base64":"Encode.Bytes.Query.base64","encode.bytes.QueryClient.base64WithResponse":"Encode.Bytes.Query.base64","encode.bytes.QueryClient.base64url":"Encode.Bytes.Query.base64url","encode.bytes.QueryClient.base64urlArray":"Encode.Bytes.Query.base64urlArray","encode.bytes.QueryClient.base64urlArrayWithResponse":"Encode.Bytes.Query.base64urlArray","encode.bytes.QueryClient.base64urlWithResponse":"Encode.Bytes.Query.base64url","encode.bytes.QueryClient.defaultMethod":"Encode.Bytes.Query.default","encode.bytes.QueryClient.defaultMethodWithResponse":"Encode.Bytes.Query.default","encode.bytes.RequestBodyAsyncClient":"Encode.Bytes.RequestBody","encode.bytes.RequestBodyAsyncClient.base64":"Encode.Bytes.RequestBody.base64","encode.bytes.RequestBodyAsyncClient.base64WithResponse":"Encode.Bytes.RequestBody.base64","encode.bytes.RequestBodyAsyncClient.base64url":"Encode.Bytes.RequestBody.base64url","encode.bytes.RequestBodyAsyncClient.base64urlWithResponse":"Encode.Bytes.RequestBody.base64url","encode.bytes.RequestBodyAsyncClient.customContentType":"Encode.Bytes.RequestBody.customContentType","encode.bytes.RequestBodyAsyncClient.customContentTypeWithResponse":"Encode.Bytes.RequestBody.customContentType","encode.bytes.RequestBodyAsyncClient.defaultMethod":"Encode.Bytes.RequestBody.default","encode.bytes.RequestBodyAsyncClient.defaultMethodWithResponse":"Encode.Bytes.RequestBody.default","encode.bytes.RequestBodyAsyncClient.octetStream":"Encode.Bytes.RequestBody.octetStream","encode.bytes.RequestBodyAsyncClient.octetStreamWithResponse":"Encode.Bytes.RequestBody.octetStream","encode.bytes.RequestBodyClient":"Encode.Bytes.RequestBody","encode.bytes.RequestBodyClient.base64":"Encode.Bytes.RequestBody.base64","encode.bytes.RequestBodyClient.base64WithResponse":"Encode.Bytes.RequestBody.base64","encode.bytes.RequestBodyClient.base64url":"Encode.Bytes.RequestBody.base64url","encode.bytes.RequestBodyClient.base64urlWithResponse":"Encode.Bytes.RequestBody.base64url","encode.bytes.RequestBodyClient.customContentType":"Encode.Bytes.RequestBody.customContentType","encode.bytes.RequestBodyClient.customContentTypeWithResponse":"Encode.Bytes.RequestBody.customContentType","encode.bytes.RequestBodyClient.defaultMethod":"Encode.Bytes.RequestBody.default","encode.bytes.RequestBodyClient.defaultMethodWithResponse":"Encode.Bytes.RequestBody.default","encode.bytes.RequestBodyClient.octetStream":"Encode.Bytes.RequestBody.octetStream","encode.bytes.RequestBodyClient.octetStreamWithResponse":"Encode.Bytes.RequestBody.octetStream","encode.bytes.ResponseBodyAsyncClient":"Encode.Bytes.ResponseBody","encode.bytes.ResponseBodyAsyncClient.base64":"Encode.Bytes.ResponseBody.base64","encode.bytes.ResponseBodyAsyncClient.base64WithResponse":"Encode.Bytes.ResponseBody.base64","encode.bytes.ResponseBodyAsyncClient.base64url":"Encode.Bytes.ResponseBody.base64url","encode.bytes.ResponseBodyAsyncClient.base64urlWithResponse":"Encode.Bytes.ResponseBody.base64url","encode.bytes.ResponseBodyAsyncClient.customContentType":"Encode.Bytes.ResponseBody.customContentType","encode.bytes.ResponseBodyAsyncClient.customContentTypeWithResponse":"Encode.Bytes.ResponseBody.customContentType","encode.bytes.ResponseBodyAsyncClient.defaultMethod":"Encode.Bytes.ResponseBody.default","encode.bytes.ResponseBodyAsyncClient.defaultMethodWithResponse":"Encode.Bytes.ResponseBody.default","encode.bytes.ResponseBodyAsyncClient.octetStream":"Encode.Bytes.ResponseBody.octetStream","encode.bytes.ResponseBodyAsyncClient.octetStreamWithResponse":"Encode.Bytes.ResponseBody.octetStream","encode.bytes.ResponseBodyClient":"Encode.Bytes.ResponseBody","encode.bytes.ResponseBodyClient.base64":"Encode.Bytes.ResponseBody.base64","encode.bytes.ResponseBodyClient.base64WithResponse":"Encode.Bytes.ResponseBody.base64","encode.bytes.ResponseBodyClient.base64url":"Encode.Bytes.ResponseBody.base64url","encode.bytes.ResponseBodyClient.base64urlWithResponse":"Encode.Bytes.ResponseBody.base64url","encode.bytes.ResponseBodyClient.customContentType":"Encode.Bytes.ResponseBody.customContentType","encode.bytes.ResponseBodyClient.customContentTypeWithResponse":"Encode.Bytes.ResponseBody.customContentType","encode.bytes.ResponseBodyClient.defaultMethod":"Encode.Bytes.ResponseBody.default","encode.bytes.ResponseBodyClient.defaultMethodWithResponse":"Encode.Bytes.ResponseBody.default","encode.bytes.ResponseBodyClient.octetStream":"Encode.Bytes.ResponseBody.octetStream","encode.bytes.ResponseBodyClient.octetStreamWithResponse":"Encode.Bytes.ResponseBody.octetStream","encode.bytes.models.Base64BytesProperty":"Encode.Bytes.Base64BytesProperty","encode.bytes.models.Base64urlArrayBytesProperty":"Encode.Bytes.Base64urlArrayBytesProperty","encode.bytes.models.Base64urlBytesProperty":"Encode.Bytes.Base64urlBytesProperty","encode.bytes.models.DefaultBytesProperty":"Encode.Bytes.DefaultBytesProperty"},"generatedFiles":["src/main/java/encode/bytes/BytesClientBuilder.java","src/main/java/encode/bytes/HeaderAsyncClient.java","src/main/java/encode/bytes/HeaderClient.java","src/main/java/encode/bytes/PropertyAsyncClient.java","src/main/java/encode/bytes/PropertyClient.java","src/main/java/encode/bytes/QueryAsyncClient.java","src/main/java/encode/bytes/QueryClient.java","src/main/java/encode/bytes/RequestBodyAsyncClient.java","src/main/java/encode/bytes/RequestBodyClient.java","src/main/java/encode/bytes/ResponseBodyAsyncClient.java","src/main/java/encode/bytes/ResponseBodyClient.java","src/main/java/encode/bytes/implementation/BytesClientImpl.java","src/main/java/encode/bytes/implementation/HeadersImpl.java","src/main/java/encode/bytes/implementation/PropertiesImpl.java","src/main/java/encode/bytes/implementation/QueriesImpl.java","src/main/java/encode/bytes/implementation/RequestBodiesImpl.java","src/main/java/encode/bytes/implementation/ResponseBodiesImpl.java","src/main/java/encode/bytes/implementation/package-info.java","src/main/java/encode/bytes/models/Base64BytesProperty.java","src/main/java/encode/bytes/models/Base64urlArrayBytesProperty.java","src/main/java/encode/bytes/models/Base64urlBytesProperty.java","src/main/java/encode/bytes/models/DefaultBytesProperty.java","src/main/java/encode/bytes/models/package-info.java","src/main/java/encode/bytes/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"encode.bytes.BytesClientBuilder":"Encode.Bytes","encode.bytes.HeaderAsyncClient":"Encode.Bytes.Header","encode.bytes.HeaderAsyncClient.base64":"Encode.Bytes.Header.base64","encode.bytes.HeaderAsyncClient.base64WithResponse":"Encode.Bytes.Header.base64","encode.bytes.HeaderAsyncClient.base64url":"Encode.Bytes.Header.base64url","encode.bytes.HeaderAsyncClient.base64urlArray":"Encode.Bytes.Header.base64urlArray","encode.bytes.HeaderAsyncClient.base64urlArrayWithResponse":"Encode.Bytes.Header.base64urlArray","encode.bytes.HeaderAsyncClient.base64urlWithResponse":"Encode.Bytes.Header.base64url","encode.bytes.HeaderAsyncClient.defaultMethod":"Encode.Bytes.Header.default","encode.bytes.HeaderAsyncClient.defaultMethodWithResponse":"Encode.Bytes.Header.default","encode.bytes.HeaderClient":"Encode.Bytes.Header","encode.bytes.HeaderClient.base64":"Encode.Bytes.Header.base64","encode.bytes.HeaderClient.base64WithResponse":"Encode.Bytes.Header.base64","encode.bytes.HeaderClient.base64url":"Encode.Bytes.Header.base64url","encode.bytes.HeaderClient.base64urlArray":"Encode.Bytes.Header.base64urlArray","encode.bytes.HeaderClient.base64urlArrayWithResponse":"Encode.Bytes.Header.base64urlArray","encode.bytes.HeaderClient.base64urlWithResponse":"Encode.Bytes.Header.base64url","encode.bytes.HeaderClient.defaultMethod":"Encode.Bytes.Header.default","encode.bytes.HeaderClient.defaultMethodWithResponse":"Encode.Bytes.Header.default","encode.bytes.PropertyAsyncClient":"Encode.Bytes.Property","encode.bytes.PropertyAsyncClient.base64":"Encode.Bytes.Property.base64","encode.bytes.PropertyAsyncClient.base64WithResponse":"Encode.Bytes.Property.base64","encode.bytes.PropertyAsyncClient.base64url":"Encode.Bytes.Property.base64url","encode.bytes.PropertyAsyncClient.base64urlArray":"Encode.Bytes.Property.base64urlArray","encode.bytes.PropertyAsyncClient.base64urlArrayWithResponse":"Encode.Bytes.Property.base64urlArray","encode.bytes.PropertyAsyncClient.base64urlWithResponse":"Encode.Bytes.Property.base64url","encode.bytes.PropertyAsyncClient.defaultMethod":"Encode.Bytes.Property.default","encode.bytes.PropertyAsyncClient.defaultMethodWithResponse":"Encode.Bytes.Property.default","encode.bytes.PropertyClient":"Encode.Bytes.Property","encode.bytes.PropertyClient.base64":"Encode.Bytes.Property.base64","encode.bytes.PropertyClient.base64WithResponse":"Encode.Bytes.Property.base64","encode.bytes.PropertyClient.base64url":"Encode.Bytes.Property.base64url","encode.bytes.PropertyClient.base64urlArray":"Encode.Bytes.Property.base64urlArray","encode.bytes.PropertyClient.base64urlArrayWithResponse":"Encode.Bytes.Property.base64urlArray","encode.bytes.PropertyClient.base64urlWithResponse":"Encode.Bytes.Property.base64url","encode.bytes.PropertyClient.defaultMethod":"Encode.Bytes.Property.default","encode.bytes.PropertyClient.defaultMethodWithResponse":"Encode.Bytes.Property.default","encode.bytes.QueryAsyncClient":"Encode.Bytes.Query","encode.bytes.QueryAsyncClient.base64":"Encode.Bytes.Query.base64","encode.bytes.QueryAsyncClient.base64WithResponse":"Encode.Bytes.Query.base64","encode.bytes.QueryAsyncClient.base64url":"Encode.Bytes.Query.base64url","encode.bytes.QueryAsyncClient.base64urlArray":"Encode.Bytes.Query.base64urlArray","encode.bytes.QueryAsyncClient.base64urlArrayWithResponse":"Encode.Bytes.Query.base64urlArray","encode.bytes.QueryAsyncClient.base64urlWithResponse":"Encode.Bytes.Query.base64url","encode.bytes.QueryAsyncClient.defaultMethod":"Encode.Bytes.Query.default","encode.bytes.QueryAsyncClient.defaultMethodWithResponse":"Encode.Bytes.Query.default","encode.bytes.QueryClient":"Encode.Bytes.Query","encode.bytes.QueryClient.base64":"Encode.Bytes.Query.base64","encode.bytes.QueryClient.base64WithResponse":"Encode.Bytes.Query.base64","encode.bytes.QueryClient.base64url":"Encode.Bytes.Query.base64url","encode.bytes.QueryClient.base64urlArray":"Encode.Bytes.Query.base64urlArray","encode.bytes.QueryClient.base64urlArrayWithResponse":"Encode.Bytes.Query.base64urlArray","encode.bytes.QueryClient.base64urlWithResponse":"Encode.Bytes.Query.base64url","encode.bytes.QueryClient.defaultMethod":"Encode.Bytes.Query.default","encode.bytes.QueryClient.defaultMethodWithResponse":"Encode.Bytes.Query.default","encode.bytes.RequestBodyAsyncClient":"Encode.Bytes.RequestBody","encode.bytes.RequestBodyAsyncClient.base64":"Encode.Bytes.RequestBody.base64","encode.bytes.RequestBodyAsyncClient.base64WithResponse":"Encode.Bytes.RequestBody.base64","encode.bytes.RequestBodyAsyncClient.base64url":"Encode.Bytes.RequestBody.base64url","encode.bytes.RequestBodyAsyncClient.base64urlWithResponse":"Encode.Bytes.RequestBody.base64url","encode.bytes.RequestBodyAsyncClient.customContentType":"Encode.Bytes.RequestBody.customContentType","encode.bytes.RequestBodyAsyncClient.customContentTypeWithResponse":"Encode.Bytes.RequestBody.customContentType","encode.bytes.RequestBodyAsyncClient.defaultMethod":"Encode.Bytes.RequestBody.default","encode.bytes.RequestBodyAsyncClient.defaultMethodWithResponse":"Encode.Bytes.RequestBody.default","encode.bytes.RequestBodyAsyncClient.octetStream":"Encode.Bytes.RequestBody.octetStream","encode.bytes.RequestBodyAsyncClient.octetStreamWithResponse":"Encode.Bytes.RequestBody.octetStream","encode.bytes.RequestBodyClient":"Encode.Bytes.RequestBody","encode.bytes.RequestBodyClient.base64":"Encode.Bytes.RequestBody.base64","encode.bytes.RequestBodyClient.base64WithResponse":"Encode.Bytes.RequestBody.base64","encode.bytes.RequestBodyClient.base64url":"Encode.Bytes.RequestBody.base64url","encode.bytes.RequestBodyClient.base64urlWithResponse":"Encode.Bytes.RequestBody.base64url","encode.bytes.RequestBodyClient.customContentType":"Encode.Bytes.RequestBody.customContentType","encode.bytes.RequestBodyClient.customContentTypeWithResponse":"Encode.Bytes.RequestBody.customContentType","encode.bytes.RequestBodyClient.defaultMethod":"Encode.Bytes.RequestBody.default","encode.bytes.RequestBodyClient.defaultMethodWithResponse":"Encode.Bytes.RequestBody.default","encode.bytes.RequestBodyClient.octetStream":"Encode.Bytes.RequestBody.octetStream","encode.bytes.RequestBodyClient.octetStreamWithResponse":"Encode.Bytes.RequestBody.octetStream","encode.bytes.ResponseBodyAsyncClient":"Encode.Bytes.ResponseBody","encode.bytes.ResponseBodyAsyncClient.base64":"Encode.Bytes.ResponseBody.base64","encode.bytes.ResponseBodyAsyncClient.base64WithResponse":"Encode.Bytes.ResponseBody.base64","encode.bytes.ResponseBodyAsyncClient.base64url":"Encode.Bytes.ResponseBody.base64url","encode.bytes.ResponseBodyAsyncClient.base64urlWithResponse":"Encode.Bytes.ResponseBody.base64url","encode.bytes.ResponseBodyAsyncClient.customContentType":"Encode.Bytes.ResponseBody.customContentType","encode.bytes.ResponseBodyAsyncClient.customContentTypeWithResponse":"Encode.Bytes.ResponseBody.customContentType","encode.bytes.ResponseBodyAsyncClient.defaultMethod":"Encode.Bytes.ResponseBody.default","encode.bytes.ResponseBodyAsyncClient.defaultMethodWithResponse":"Encode.Bytes.ResponseBody.default","encode.bytes.ResponseBodyAsyncClient.octetStream":"Encode.Bytes.ResponseBody.octetStream","encode.bytes.ResponseBodyAsyncClient.octetStreamWithResponse":"Encode.Bytes.ResponseBody.octetStream","encode.bytes.ResponseBodyClient":"Encode.Bytes.ResponseBody","encode.bytes.ResponseBodyClient.base64":"Encode.Bytes.ResponseBody.base64","encode.bytes.ResponseBodyClient.base64WithResponse":"Encode.Bytes.ResponseBody.base64","encode.bytes.ResponseBodyClient.base64url":"Encode.Bytes.ResponseBody.base64url","encode.bytes.ResponseBodyClient.base64urlWithResponse":"Encode.Bytes.ResponseBody.base64url","encode.bytes.ResponseBodyClient.customContentType":"Encode.Bytes.ResponseBody.customContentType","encode.bytes.ResponseBodyClient.customContentTypeWithResponse":"Encode.Bytes.ResponseBody.customContentType","encode.bytes.ResponseBodyClient.defaultMethod":"Encode.Bytes.ResponseBody.default","encode.bytes.ResponseBodyClient.defaultMethodWithResponse":"Encode.Bytes.ResponseBody.default","encode.bytes.ResponseBodyClient.octetStream":"Encode.Bytes.ResponseBody.octetStream","encode.bytes.ResponseBodyClient.octetStreamWithResponse":"Encode.Bytes.ResponseBody.octetStream","encode.bytes.models.Base64BytesProperty":"Encode.Bytes.Base64BytesProperty","encode.bytes.models.Base64urlArrayBytesProperty":"Encode.Bytes.Base64urlArrayBytesProperty","encode.bytes.models.Base64urlBytesProperty":"Encode.Bytes.Base64urlBytesProperty","encode.bytes.models.DefaultBytesProperty":"Encode.Bytes.DefaultBytesProperty"},"generatedFiles":["src/main/java/encode/bytes/BytesClientBuilder.java","src/main/java/encode/bytes/HeaderAsyncClient.java","src/main/java/encode/bytes/HeaderClient.java","src/main/java/encode/bytes/PropertyAsyncClient.java","src/main/java/encode/bytes/PropertyClient.java","src/main/java/encode/bytes/QueryAsyncClient.java","src/main/java/encode/bytes/QueryClient.java","src/main/java/encode/bytes/RequestBodyAsyncClient.java","src/main/java/encode/bytes/RequestBodyClient.java","src/main/java/encode/bytes/ResponseBodyAsyncClient.java","src/main/java/encode/bytes/ResponseBodyClient.java","src/main/java/encode/bytes/implementation/BytesClientImpl.java","src/main/java/encode/bytes/implementation/HeadersImpl.java","src/main/java/encode/bytes/implementation/PropertiesImpl.java","src/main/java/encode/bytes/implementation/QueriesImpl.java","src/main/java/encode/bytes/implementation/RequestBodiesImpl.java","src/main/java/encode/bytes/implementation/ResponseBodiesImpl.java","src/main/java/encode/bytes/implementation/package-info.java","src/main/java/encode/bytes/models/Base64BytesProperty.java","src/main/java/encode/bytes/models/Base64urlArrayBytesProperty.java","src/main/java/encode/bytes/models/Base64urlBytesProperty.java","src/main/java/encode/bytes/models/DefaultBytesProperty.java","src/main/java/encode/bytes/models/package-info.java","src/main/java/encode/bytes/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-datetime_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-datetime_apiview_properties.json deleted file mode 100644 index 0ccdfc55975..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-datetime_apiview_properties.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "encode.datetime.DatetimeClientBuilder": "Encode.Datetime", - "encode.datetime.HeaderAsyncClient": "Encode.Datetime.Header", - "encode.datetime.HeaderAsyncClient.defaultMethod": "Encode.Datetime.Header.default", - "encode.datetime.HeaderAsyncClient.defaultMethodWithResponse": "Encode.Datetime.Header.default", - "encode.datetime.HeaderAsyncClient.rfc3339": "Encode.Datetime.Header.rfc3339", - "encode.datetime.HeaderAsyncClient.rfc3339WithResponse": "Encode.Datetime.Header.rfc3339", - "encode.datetime.HeaderAsyncClient.rfc7231": "Encode.Datetime.Header.rfc7231", - "encode.datetime.HeaderAsyncClient.rfc7231WithResponse": "Encode.Datetime.Header.rfc7231", - "encode.datetime.HeaderAsyncClient.unixTimestamp": "Encode.Datetime.Header.unixTimestamp", - "encode.datetime.HeaderAsyncClient.unixTimestampArray": "Encode.Datetime.Header.unixTimestampArray", - "encode.datetime.HeaderAsyncClient.unixTimestampArrayWithResponse": "Encode.Datetime.Header.unixTimestampArray", - "encode.datetime.HeaderAsyncClient.unixTimestampWithResponse": "Encode.Datetime.Header.unixTimestamp", - "encode.datetime.HeaderClient": "Encode.Datetime.Header", - "encode.datetime.HeaderClient.defaultMethod": "Encode.Datetime.Header.default", - "encode.datetime.HeaderClient.defaultMethodWithResponse": "Encode.Datetime.Header.default", - "encode.datetime.HeaderClient.rfc3339": "Encode.Datetime.Header.rfc3339", - "encode.datetime.HeaderClient.rfc3339WithResponse": "Encode.Datetime.Header.rfc3339", - "encode.datetime.HeaderClient.rfc7231": "Encode.Datetime.Header.rfc7231", - "encode.datetime.HeaderClient.rfc7231WithResponse": "Encode.Datetime.Header.rfc7231", - "encode.datetime.HeaderClient.unixTimestamp": "Encode.Datetime.Header.unixTimestamp", - "encode.datetime.HeaderClient.unixTimestampArray": "Encode.Datetime.Header.unixTimestampArray", - "encode.datetime.HeaderClient.unixTimestampArrayWithResponse": "Encode.Datetime.Header.unixTimestampArray", - "encode.datetime.HeaderClient.unixTimestampWithResponse": "Encode.Datetime.Header.unixTimestamp", - "encode.datetime.PropertyAsyncClient": "Encode.Datetime.Property", - "encode.datetime.PropertyAsyncClient.defaultMethod": "Encode.Datetime.Property.default", - "encode.datetime.PropertyAsyncClient.defaultMethodWithResponse": "Encode.Datetime.Property.default", - "encode.datetime.PropertyAsyncClient.rfc3339": "Encode.Datetime.Property.rfc3339", - "encode.datetime.PropertyAsyncClient.rfc3339WithResponse": "Encode.Datetime.Property.rfc3339", - "encode.datetime.PropertyAsyncClient.rfc7231": "Encode.Datetime.Property.rfc7231", - "encode.datetime.PropertyAsyncClient.rfc7231WithResponse": "Encode.Datetime.Property.rfc7231", - "encode.datetime.PropertyAsyncClient.unixTimestamp": "Encode.Datetime.Property.unixTimestamp", - "encode.datetime.PropertyAsyncClient.unixTimestampArray": "Encode.Datetime.Property.unixTimestampArray", - "encode.datetime.PropertyAsyncClient.unixTimestampArrayWithResponse": "Encode.Datetime.Property.unixTimestampArray", - "encode.datetime.PropertyAsyncClient.unixTimestampWithResponse": "Encode.Datetime.Property.unixTimestamp", - "encode.datetime.PropertyClient": "Encode.Datetime.Property", - "encode.datetime.PropertyClient.defaultMethod": "Encode.Datetime.Property.default", - "encode.datetime.PropertyClient.defaultMethodWithResponse": "Encode.Datetime.Property.default", - "encode.datetime.PropertyClient.rfc3339": "Encode.Datetime.Property.rfc3339", - "encode.datetime.PropertyClient.rfc3339WithResponse": "Encode.Datetime.Property.rfc3339", - "encode.datetime.PropertyClient.rfc7231": "Encode.Datetime.Property.rfc7231", - "encode.datetime.PropertyClient.rfc7231WithResponse": "Encode.Datetime.Property.rfc7231", - "encode.datetime.PropertyClient.unixTimestamp": "Encode.Datetime.Property.unixTimestamp", - "encode.datetime.PropertyClient.unixTimestampArray": "Encode.Datetime.Property.unixTimestampArray", - "encode.datetime.PropertyClient.unixTimestampArrayWithResponse": "Encode.Datetime.Property.unixTimestampArray", - "encode.datetime.PropertyClient.unixTimestampWithResponse": "Encode.Datetime.Property.unixTimestamp", - "encode.datetime.QueryAsyncClient": "Encode.Datetime.Query", - "encode.datetime.QueryAsyncClient.defaultMethod": "Encode.Datetime.Query.default", - "encode.datetime.QueryAsyncClient.defaultMethodWithResponse": "Encode.Datetime.Query.default", - "encode.datetime.QueryAsyncClient.rfc3339": "Encode.Datetime.Query.rfc3339", - "encode.datetime.QueryAsyncClient.rfc3339WithResponse": "Encode.Datetime.Query.rfc3339", - "encode.datetime.QueryAsyncClient.rfc7231": "Encode.Datetime.Query.rfc7231", - "encode.datetime.QueryAsyncClient.rfc7231WithResponse": "Encode.Datetime.Query.rfc7231", - "encode.datetime.QueryAsyncClient.unixTimestamp": "Encode.Datetime.Query.unixTimestamp", - "encode.datetime.QueryAsyncClient.unixTimestampArray": "Encode.Datetime.Query.unixTimestampArray", - "encode.datetime.QueryAsyncClient.unixTimestampArrayWithResponse": "Encode.Datetime.Query.unixTimestampArray", - "encode.datetime.QueryAsyncClient.unixTimestampWithResponse": "Encode.Datetime.Query.unixTimestamp", - "encode.datetime.QueryClient": "Encode.Datetime.Query", - "encode.datetime.QueryClient.defaultMethod": "Encode.Datetime.Query.default", - "encode.datetime.QueryClient.defaultMethodWithResponse": "Encode.Datetime.Query.default", - "encode.datetime.QueryClient.rfc3339": "Encode.Datetime.Query.rfc3339", - "encode.datetime.QueryClient.rfc3339WithResponse": "Encode.Datetime.Query.rfc3339", - "encode.datetime.QueryClient.rfc7231": "Encode.Datetime.Query.rfc7231", - "encode.datetime.QueryClient.rfc7231WithResponse": "Encode.Datetime.Query.rfc7231", - "encode.datetime.QueryClient.unixTimestamp": "Encode.Datetime.Query.unixTimestamp", - "encode.datetime.QueryClient.unixTimestampArray": "Encode.Datetime.Query.unixTimestampArray", - "encode.datetime.QueryClient.unixTimestampArrayWithResponse": "Encode.Datetime.Query.unixTimestampArray", - "encode.datetime.QueryClient.unixTimestampWithResponse": "Encode.Datetime.Query.unixTimestamp", - "encode.datetime.ResponseHeaderAsyncClient": "Encode.Datetime.ResponseHeader", - "encode.datetime.ResponseHeaderAsyncClient.defaultMethod": "Encode.Datetime.ResponseHeader.default", - "encode.datetime.ResponseHeaderAsyncClient.defaultMethodWithResponse": "Encode.Datetime.ResponseHeader.default", - "encode.datetime.ResponseHeaderAsyncClient.rfc3339": "Encode.Datetime.ResponseHeader.rfc3339", - "encode.datetime.ResponseHeaderAsyncClient.rfc3339WithResponse": "Encode.Datetime.ResponseHeader.rfc3339", - "encode.datetime.ResponseHeaderAsyncClient.rfc7231": "Encode.Datetime.ResponseHeader.rfc7231", - "encode.datetime.ResponseHeaderAsyncClient.rfc7231WithResponse": "Encode.Datetime.ResponseHeader.rfc7231", - "encode.datetime.ResponseHeaderAsyncClient.unixTimestamp": "Encode.Datetime.ResponseHeader.unixTimestamp", - "encode.datetime.ResponseHeaderAsyncClient.unixTimestampWithResponse": "Encode.Datetime.ResponseHeader.unixTimestamp", - "encode.datetime.ResponseHeaderClient": "Encode.Datetime.ResponseHeader", - "encode.datetime.ResponseHeaderClient.defaultMethod": "Encode.Datetime.ResponseHeader.default", - "encode.datetime.ResponseHeaderClient.defaultMethodWithResponse": "Encode.Datetime.ResponseHeader.default", - "encode.datetime.ResponseHeaderClient.rfc3339": "Encode.Datetime.ResponseHeader.rfc3339", - "encode.datetime.ResponseHeaderClient.rfc3339WithResponse": "Encode.Datetime.ResponseHeader.rfc3339", - "encode.datetime.ResponseHeaderClient.rfc7231": "Encode.Datetime.ResponseHeader.rfc7231", - "encode.datetime.ResponseHeaderClient.rfc7231WithResponse": "Encode.Datetime.ResponseHeader.rfc7231", - "encode.datetime.ResponseHeaderClient.unixTimestamp": "Encode.Datetime.ResponseHeader.unixTimestamp", - "encode.datetime.ResponseHeaderClient.unixTimestampWithResponse": "Encode.Datetime.ResponseHeader.unixTimestamp", - "encode.datetime.models.DefaultDatetimeProperty": "Encode.Datetime.DefaultDatetimeProperty", - "encode.datetime.models.Rfc3339DatetimeProperty": "Encode.Datetime.Rfc3339DatetimeProperty", - "encode.datetime.models.Rfc7231DatetimeProperty": "Encode.Datetime.Rfc7231DatetimeProperty", - "encode.datetime.models.UnixTimestampArrayDatetimeProperty": "Encode.Datetime.UnixTimestampArrayDatetimeProperty", - "encode.datetime.models.UnixTimestampDatetimeProperty": "Encode.Datetime.UnixTimestampDatetimeProperty" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-datetime_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-datetime_metadata.json index 84ce62f87c0..7c9c7efd7e6 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-datetime_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-datetime_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"encode.datetime.DatetimeClientBuilder":"Encode.Datetime","encode.datetime.HeaderAsyncClient":"Encode.Datetime.Header","encode.datetime.HeaderAsyncClient.defaultMethod":"Encode.Datetime.Header.default","encode.datetime.HeaderAsyncClient.defaultMethodWithResponse":"Encode.Datetime.Header.default","encode.datetime.HeaderAsyncClient.rfc3339":"Encode.Datetime.Header.rfc3339","encode.datetime.HeaderAsyncClient.rfc3339WithResponse":"Encode.Datetime.Header.rfc3339","encode.datetime.HeaderAsyncClient.rfc7231":"Encode.Datetime.Header.rfc7231","encode.datetime.HeaderAsyncClient.rfc7231WithResponse":"Encode.Datetime.Header.rfc7231","encode.datetime.HeaderAsyncClient.unixTimestamp":"Encode.Datetime.Header.unixTimestamp","encode.datetime.HeaderAsyncClient.unixTimestampArray":"Encode.Datetime.Header.unixTimestampArray","encode.datetime.HeaderAsyncClient.unixTimestampArrayWithResponse":"Encode.Datetime.Header.unixTimestampArray","encode.datetime.HeaderAsyncClient.unixTimestampWithResponse":"Encode.Datetime.Header.unixTimestamp","encode.datetime.HeaderClient":"Encode.Datetime.Header","encode.datetime.HeaderClient.defaultMethod":"Encode.Datetime.Header.default","encode.datetime.HeaderClient.defaultMethodWithResponse":"Encode.Datetime.Header.default","encode.datetime.HeaderClient.rfc3339":"Encode.Datetime.Header.rfc3339","encode.datetime.HeaderClient.rfc3339WithResponse":"Encode.Datetime.Header.rfc3339","encode.datetime.HeaderClient.rfc7231":"Encode.Datetime.Header.rfc7231","encode.datetime.HeaderClient.rfc7231WithResponse":"Encode.Datetime.Header.rfc7231","encode.datetime.HeaderClient.unixTimestamp":"Encode.Datetime.Header.unixTimestamp","encode.datetime.HeaderClient.unixTimestampArray":"Encode.Datetime.Header.unixTimestampArray","encode.datetime.HeaderClient.unixTimestampArrayWithResponse":"Encode.Datetime.Header.unixTimestampArray","encode.datetime.HeaderClient.unixTimestampWithResponse":"Encode.Datetime.Header.unixTimestamp","encode.datetime.PropertyAsyncClient":"Encode.Datetime.Property","encode.datetime.PropertyAsyncClient.defaultMethod":"Encode.Datetime.Property.default","encode.datetime.PropertyAsyncClient.defaultMethodWithResponse":"Encode.Datetime.Property.default","encode.datetime.PropertyAsyncClient.rfc3339":"Encode.Datetime.Property.rfc3339","encode.datetime.PropertyAsyncClient.rfc3339WithResponse":"Encode.Datetime.Property.rfc3339","encode.datetime.PropertyAsyncClient.rfc7231":"Encode.Datetime.Property.rfc7231","encode.datetime.PropertyAsyncClient.rfc7231WithResponse":"Encode.Datetime.Property.rfc7231","encode.datetime.PropertyAsyncClient.unixTimestamp":"Encode.Datetime.Property.unixTimestamp","encode.datetime.PropertyAsyncClient.unixTimestampArray":"Encode.Datetime.Property.unixTimestampArray","encode.datetime.PropertyAsyncClient.unixTimestampArrayWithResponse":"Encode.Datetime.Property.unixTimestampArray","encode.datetime.PropertyAsyncClient.unixTimestampWithResponse":"Encode.Datetime.Property.unixTimestamp","encode.datetime.PropertyClient":"Encode.Datetime.Property","encode.datetime.PropertyClient.defaultMethod":"Encode.Datetime.Property.default","encode.datetime.PropertyClient.defaultMethodWithResponse":"Encode.Datetime.Property.default","encode.datetime.PropertyClient.rfc3339":"Encode.Datetime.Property.rfc3339","encode.datetime.PropertyClient.rfc3339WithResponse":"Encode.Datetime.Property.rfc3339","encode.datetime.PropertyClient.rfc7231":"Encode.Datetime.Property.rfc7231","encode.datetime.PropertyClient.rfc7231WithResponse":"Encode.Datetime.Property.rfc7231","encode.datetime.PropertyClient.unixTimestamp":"Encode.Datetime.Property.unixTimestamp","encode.datetime.PropertyClient.unixTimestampArray":"Encode.Datetime.Property.unixTimestampArray","encode.datetime.PropertyClient.unixTimestampArrayWithResponse":"Encode.Datetime.Property.unixTimestampArray","encode.datetime.PropertyClient.unixTimestampWithResponse":"Encode.Datetime.Property.unixTimestamp","encode.datetime.QueryAsyncClient":"Encode.Datetime.Query","encode.datetime.QueryAsyncClient.defaultMethod":"Encode.Datetime.Query.default","encode.datetime.QueryAsyncClient.defaultMethodWithResponse":"Encode.Datetime.Query.default","encode.datetime.QueryAsyncClient.rfc3339":"Encode.Datetime.Query.rfc3339","encode.datetime.QueryAsyncClient.rfc3339WithResponse":"Encode.Datetime.Query.rfc3339","encode.datetime.QueryAsyncClient.rfc7231":"Encode.Datetime.Query.rfc7231","encode.datetime.QueryAsyncClient.rfc7231WithResponse":"Encode.Datetime.Query.rfc7231","encode.datetime.QueryAsyncClient.unixTimestamp":"Encode.Datetime.Query.unixTimestamp","encode.datetime.QueryAsyncClient.unixTimestampArray":"Encode.Datetime.Query.unixTimestampArray","encode.datetime.QueryAsyncClient.unixTimestampArrayWithResponse":"Encode.Datetime.Query.unixTimestampArray","encode.datetime.QueryAsyncClient.unixTimestampWithResponse":"Encode.Datetime.Query.unixTimestamp","encode.datetime.QueryClient":"Encode.Datetime.Query","encode.datetime.QueryClient.defaultMethod":"Encode.Datetime.Query.default","encode.datetime.QueryClient.defaultMethodWithResponse":"Encode.Datetime.Query.default","encode.datetime.QueryClient.rfc3339":"Encode.Datetime.Query.rfc3339","encode.datetime.QueryClient.rfc3339WithResponse":"Encode.Datetime.Query.rfc3339","encode.datetime.QueryClient.rfc7231":"Encode.Datetime.Query.rfc7231","encode.datetime.QueryClient.rfc7231WithResponse":"Encode.Datetime.Query.rfc7231","encode.datetime.QueryClient.unixTimestamp":"Encode.Datetime.Query.unixTimestamp","encode.datetime.QueryClient.unixTimestampArray":"Encode.Datetime.Query.unixTimestampArray","encode.datetime.QueryClient.unixTimestampArrayWithResponse":"Encode.Datetime.Query.unixTimestampArray","encode.datetime.QueryClient.unixTimestampWithResponse":"Encode.Datetime.Query.unixTimestamp","encode.datetime.ResponseHeaderAsyncClient":"Encode.Datetime.ResponseHeader","encode.datetime.ResponseHeaderAsyncClient.defaultMethod":"Encode.Datetime.ResponseHeader.default","encode.datetime.ResponseHeaderAsyncClient.defaultMethodWithResponse":"Encode.Datetime.ResponseHeader.default","encode.datetime.ResponseHeaderAsyncClient.rfc3339":"Encode.Datetime.ResponseHeader.rfc3339","encode.datetime.ResponseHeaderAsyncClient.rfc3339WithResponse":"Encode.Datetime.ResponseHeader.rfc3339","encode.datetime.ResponseHeaderAsyncClient.rfc7231":"Encode.Datetime.ResponseHeader.rfc7231","encode.datetime.ResponseHeaderAsyncClient.rfc7231WithResponse":"Encode.Datetime.ResponseHeader.rfc7231","encode.datetime.ResponseHeaderAsyncClient.unixTimestamp":"Encode.Datetime.ResponseHeader.unixTimestamp","encode.datetime.ResponseHeaderAsyncClient.unixTimestampWithResponse":"Encode.Datetime.ResponseHeader.unixTimestamp","encode.datetime.ResponseHeaderClient":"Encode.Datetime.ResponseHeader","encode.datetime.ResponseHeaderClient.defaultMethod":"Encode.Datetime.ResponseHeader.default","encode.datetime.ResponseHeaderClient.defaultMethodWithResponse":"Encode.Datetime.ResponseHeader.default","encode.datetime.ResponseHeaderClient.rfc3339":"Encode.Datetime.ResponseHeader.rfc3339","encode.datetime.ResponseHeaderClient.rfc3339WithResponse":"Encode.Datetime.ResponseHeader.rfc3339","encode.datetime.ResponseHeaderClient.rfc7231":"Encode.Datetime.ResponseHeader.rfc7231","encode.datetime.ResponseHeaderClient.rfc7231WithResponse":"Encode.Datetime.ResponseHeader.rfc7231","encode.datetime.ResponseHeaderClient.unixTimestamp":"Encode.Datetime.ResponseHeader.unixTimestamp","encode.datetime.ResponseHeaderClient.unixTimestampWithResponse":"Encode.Datetime.ResponseHeader.unixTimestamp","encode.datetime.models.DefaultDatetimeProperty":"Encode.Datetime.DefaultDatetimeProperty","encode.datetime.models.Rfc3339DatetimeProperty":"Encode.Datetime.Rfc3339DatetimeProperty","encode.datetime.models.Rfc7231DatetimeProperty":"Encode.Datetime.Rfc7231DatetimeProperty","encode.datetime.models.UnixTimestampArrayDatetimeProperty":"Encode.Datetime.UnixTimestampArrayDatetimeProperty","encode.datetime.models.UnixTimestampDatetimeProperty":"Encode.Datetime.UnixTimestampDatetimeProperty"},"generatedFiles":["src/main/java/encode/datetime/DatetimeClientBuilder.java","src/main/java/encode/datetime/HeaderAsyncClient.java","src/main/java/encode/datetime/HeaderClient.java","src/main/java/encode/datetime/PropertyAsyncClient.java","src/main/java/encode/datetime/PropertyClient.java","src/main/java/encode/datetime/QueryAsyncClient.java","src/main/java/encode/datetime/QueryClient.java","src/main/java/encode/datetime/ResponseHeaderAsyncClient.java","src/main/java/encode/datetime/ResponseHeaderClient.java","src/main/java/encode/datetime/implementation/DatetimeClientImpl.java","src/main/java/encode/datetime/implementation/HeadersImpl.java","src/main/java/encode/datetime/implementation/PropertiesImpl.java","src/main/java/encode/datetime/implementation/QueriesImpl.java","src/main/java/encode/datetime/implementation/ResponseHeadersImpl.java","src/main/java/encode/datetime/implementation/package-info.java","src/main/java/encode/datetime/models/DefaultDatetimeProperty.java","src/main/java/encode/datetime/models/Rfc3339DatetimeProperty.java","src/main/java/encode/datetime/models/Rfc7231DatetimeProperty.java","src/main/java/encode/datetime/models/UnixTimestampArrayDatetimeProperty.java","src/main/java/encode/datetime/models/UnixTimestampDatetimeProperty.java","src/main/java/encode/datetime/models/package-info.java","src/main/java/encode/datetime/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"encode.datetime.DatetimeClientBuilder":"Encode.Datetime","encode.datetime.HeaderAsyncClient":"Encode.Datetime.Header","encode.datetime.HeaderAsyncClient.defaultMethod":"Encode.Datetime.Header.default","encode.datetime.HeaderAsyncClient.defaultMethodWithResponse":"Encode.Datetime.Header.default","encode.datetime.HeaderAsyncClient.rfc3339":"Encode.Datetime.Header.rfc3339","encode.datetime.HeaderAsyncClient.rfc3339WithResponse":"Encode.Datetime.Header.rfc3339","encode.datetime.HeaderAsyncClient.rfc7231":"Encode.Datetime.Header.rfc7231","encode.datetime.HeaderAsyncClient.rfc7231WithResponse":"Encode.Datetime.Header.rfc7231","encode.datetime.HeaderAsyncClient.unixTimestamp":"Encode.Datetime.Header.unixTimestamp","encode.datetime.HeaderAsyncClient.unixTimestampArray":"Encode.Datetime.Header.unixTimestampArray","encode.datetime.HeaderAsyncClient.unixTimestampArrayWithResponse":"Encode.Datetime.Header.unixTimestampArray","encode.datetime.HeaderAsyncClient.unixTimestampWithResponse":"Encode.Datetime.Header.unixTimestamp","encode.datetime.HeaderClient":"Encode.Datetime.Header","encode.datetime.HeaderClient.defaultMethod":"Encode.Datetime.Header.default","encode.datetime.HeaderClient.defaultMethodWithResponse":"Encode.Datetime.Header.default","encode.datetime.HeaderClient.rfc3339":"Encode.Datetime.Header.rfc3339","encode.datetime.HeaderClient.rfc3339WithResponse":"Encode.Datetime.Header.rfc3339","encode.datetime.HeaderClient.rfc7231":"Encode.Datetime.Header.rfc7231","encode.datetime.HeaderClient.rfc7231WithResponse":"Encode.Datetime.Header.rfc7231","encode.datetime.HeaderClient.unixTimestamp":"Encode.Datetime.Header.unixTimestamp","encode.datetime.HeaderClient.unixTimestampArray":"Encode.Datetime.Header.unixTimestampArray","encode.datetime.HeaderClient.unixTimestampArrayWithResponse":"Encode.Datetime.Header.unixTimestampArray","encode.datetime.HeaderClient.unixTimestampWithResponse":"Encode.Datetime.Header.unixTimestamp","encode.datetime.PropertyAsyncClient":"Encode.Datetime.Property","encode.datetime.PropertyAsyncClient.defaultMethod":"Encode.Datetime.Property.default","encode.datetime.PropertyAsyncClient.defaultMethodWithResponse":"Encode.Datetime.Property.default","encode.datetime.PropertyAsyncClient.rfc3339":"Encode.Datetime.Property.rfc3339","encode.datetime.PropertyAsyncClient.rfc3339WithResponse":"Encode.Datetime.Property.rfc3339","encode.datetime.PropertyAsyncClient.rfc7231":"Encode.Datetime.Property.rfc7231","encode.datetime.PropertyAsyncClient.rfc7231WithResponse":"Encode.Datetime.Property.rfc7231","encode.datetime.PropertyAsyncClient.unixTimestamp":"Encode.Datetime.Property.unixTimestamp","encode.datetime.PropertyAsyncClient.unixTimestampArray":"Encode.Datetime.Property.unixTimestampArray","encode.datetime.PropertyAsyncClient.unixTimestampArrayWithResponse":"Encode.Datetime.Property.unixTimestampArray","encode.datetime.PropertyAsyncClient.unixTimestampWithResponse":"Encode.Datetime.Property.unixTimestamp","encode.datetime.PropertyClient":"Encode.Datetime.Property","encode.datetime.PropertyClient.defaultMethod":"Encode.Datetime.Property.default","encode.datetime.PropertyClient.defaultMethodWithResponse":"Encode.Datetime.Property.default","encode.datetime.PropertyClient.rfc3339":"Encode.Datetime.Property.rfc3339","encode.datetime.PropertyClient.rfc3339WithResponse":"Encode.Datetime.Property.rfc3339","encode.datetime.PropertyClient.rfc7231":"Encode.Datetime.Property.rfc7231","encode.datetime.PropertyClient.rfc7231WithResponse":"Encode.Datetime.Property.rfc7231","encode.datetime.PropertyClient.unixTimestamp":"Encode.Datetime.Property.unixTimestamp","encode.datetime.PropertyClient.unixTimestampArray":"Encode.Datetime.Property.unixTimestampArray","encode.datetime.PropertyClient.unixTimestampArrayWithResponse":"Encode.Datetime.Property.unixTimestampArray","encode.datetime.PropertyClient.unixTimestampWithResponse":"Encode.Datetime.Property.unixTimestamp","encode.datetime.QueryAsyncClient":"Encode.Datetime.Query","encode.datetime.QueryAsyncClient.defaultMethod":"Encode.Datetime.Query.default","encode.datetime.QueryAsyncClient.defaultMethodWithResponse":"Encode.Datetime.Query.default","encode.datetime.QueryAsyncClient.rfc3339":"Encode.Datetime.Query.rfc3339","encode.datetime.QueryAsyncClient.rfc3339WithResponse":"Encode.Datetime.Query.rfc3339","encode.datetime.QueryAsyncClient.rfc7231":"Encode.Datetime.Query.rfc7231","encode.datetime.QueryAsyncClient.rfc7231WithResponse":"Encode.Datetime.Query.rfc7231","encode.datetime.QueryAsyncClient.unixTimestamp":"Encode.Datetime.Query.unixTimestamp","encode.datetime.QueryAsyncClient.unixTimestampArray":"Encode.Datetime.Query.unixTimestampArray","encode.datetime.QueryAsyncClient.unixTimestampArrayWithResponse":"Encode.Datetime.Query.unixTimestampArray","encode.datetime.QueryAsyncClient.unixTimestampWithResponse":"Encode.Datetime.Query.unixTimestamp","encode.datetime.QueryClient":"Encode.Datetime.Query","encode.datetime.QueryClient.defaultMethod":"Encode.Datetime.Query.default","encode.datetime.QueryClient.defaultMethodWithResponse":"Encode.Datetime.Query.default","encode.datetime.QueryClient.rfc3339":"Encode.Datetime.Query.rfc3339","encode.datetime.QueryClient.rfc3339WithResponse":"Encode.Datetime.Query.rfc3339","encode.datetime.QueryClient.rfc7231":"Encode.Datetime.Query.rfc7231","encode.datetime.QueryClient.rfc7231WithResponse":"Encode.Datetime.Query.rfc7231","encode.datetime.QueryClient.unixTimestamp":"Encode.Datetime.Query.unixTimestamp","encode.datetime.QueryClient.unixTimestampArray":"Encode.Datetime.Query.unixTimestampArray","encode.datetime.QueryClient.unixTimestampArrayWithResponse":"Encode.Datetime.Query.unixTimestampArray","encode.datetime.QueryClient.unixTimestampWithResponse":"Encode.Datetime.Query.unixTimestamp","encode.datetime.ResponseHeaderAsyncClient":"Encode.Datetime.ResponseHeader","encode.datetime.ResponseHeaderAsyncClient.defaultMethod":"Encode.Datetime.ResponseHeader.default","encode.datetime.ResponseHeaderAsyncClient.defaultMethodWithResponse":"Encode.Datetime.ResponseHeader.default","encode.datetime.ResponseHeaderAsyncClient.rfc3339":"Encode.Datetime.ResponseHeader.rfc3339","encode.datetime.ResponseHeaderAsyncClient.rfc3339WithResponse":"Encode.Datetime.ResponseHeader.rfc3339","encode.datetime.ResponseHeaderAsyncClient.rfc7231":"Encode.Datetime.ResponseHeader.rfc7231","encode.datetime.ResponseHeaderAsyncClient.rfc7231WithResponse":"Encode.Datetime.ResponseHeader.rfc7231","encode.datetime.ResponseHeaderAsyncClient.unixTimestamp":"Encode.Datetime.ResponseHeader.unixTimestamp","encode.datetime.ResponseHeaderAsyncClient.unixTimestampWithResponse":"Encode.Datetime.ResponseHeader.unixTimestamp","encode.datetime.ResponseHeaderClient":"Encode.Datetime.ResponseHeader","encode.datetime.ResponseHeaderClient.defaultMethod":"Encode.Datetime.ResponseHeader.default","encode.datetime.ResponseHeaderClient.defaultMethodWithResponse":"Encode.Datetime.ResponseHeader.default","encode.datetime.ResponseHeaderClient.rfc3339":"Encode.Datetime.ResponseHeader.rfc3339","encode.datetime.ResponseHeaderClient.rfc3339WithResponse":"Encode.Datetime.ResponseHeader.rfc3339","encode.datetime.ResponseHeaderClient.rfc7231":"Encode.Datetime.ResponseHeader.rfc7231","encode.datetime.ResponseHeaderClient.rfc7231WithResponse":"Encode.Datetime.ResponseHeader.rfc7231","encode.datetime.ResponseHeaderClient.unixTimestamp":"Encode.Datetime.ResponseHeader.unixTimestamp","encode.datetime.ResponseHeaderClient.unixTimestampWithResponse":"Encode.Datetime.ResponseHeader.unixTimestamp","encode.datetime.models.DefaultDatetimeProperty":"Encode.Datetime.DefaultDatetimeProperty","encode.datetime.models.Rfc3339DatetimeProperty":"Encode.Datetime.Rfc3339DatetimeProperty","encode.datetime.models.Rfc7231DatetimeProperty":"Encode.Datetime.Rfc7231DatetimeProperty","encode.datetime.models.UnixTimestampArrayDatetimeProperty":"Encode.Datetime.UnixTimestampArrayDatetimeProperty","encode.datetime.models.UnixTimestampDatetimeProperty":"Encode.Datetime.UnixTimestampDatetimeProperty"},"generatedFiles":["src/main/java/encode/datetime/DatetimeClientBuilder.java","src/main/java/encode/datetime/HeaderAsyncClient.java","src/main/java/encode/datetime/HeaderClient.java","src/main/java/encode/datetime/PropertyAsyncClient.java","src/main/java/encode/datetime/PropertyClient.java","src/main/java/encode/datetime/QueryAsyncClient.java","src/main/java/encode/datetime/QueryClient.java","src/main/java/encode/datetime/ResponseHeaderAsyncClient.java","src/main/java/encode/datetime/ResponseHeaderClient.java","src/main/java/encode/datetime/implementation/DatetimeClientImpl.java","src/main/java/encode/datetime/implementation/HeadersImpl.java","src/main/java/encode/datetime/implementation/PropertiesImpl.java","src/main/java/encode/datetime/implementation/QueriesImpl.java","src/main/java/encode/datetime/implementation/ResponseHeadersImpl.java","src/main/java/encode/datetime/implementation/package-info.java","src/main/java/encode/datetime/models/DefaultDatetimeProperty.java","src/main/java/encode/datetime/models/Rfc3339DatetimeProperty.java","src/main/java/encode/datetime/models/Rfc7231DatetimeProperty.java","src/main/java/encode/datetime/models/UnixTimestampArrayDatetimeProperty.java","src/main/java/encode/datetime/models/UnixTimestampDatetimeProperty.java","src/main/java/encode/datetime/models/package-info.java","src/main/java/encode/datetime/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-duration_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-duration_apiview_properties.json deleted file mode 100644 index 821255378ba..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-duration_apiview_properties.json +++ /dev/null @@ -1,194 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "encode.duration.DurationClientBuilder": "Encode.Duration", - "encode.duration.HeaderAsyncClient": "Encode.Duration.Header", - "encode.duration.HeaderAsyncClient.defaultMethod": "Encode.Duration.Header.default", - "encode.duration.HeaderAsyncClient.defaultMethodWithResponse": "Encode.Duration.Header.default", - "encode.duration.HeaderAsyncClient.float64Milliseconds": "Encode.Duration.Header.float64Milliseconds", - "encode.duration.HeaderAsyncClient.float64MillisecondsWithResponse": "Encode.Duration.Header.float64Milliseconds", - "encode.duration.HeaderAsyncClient.float64Seconds": "Encode.Duration.Header.float64Seconds", - "encode.duration.HeaderAsyncClient.float64SecondsWithResponse": "Encode.Duration.Header.float64Seconds", - "encode.duration.HeaderAsyncClient.floatMilliseconds": "Encode.Duration.Header.floatMilliseconds", - "encode.duration.HeaderAsyncClient.floatMillisecondsLargerUnit": "Encode.Duration.Header.floatMillisecondsLargerUnit", - "encode.duration.HeaderAsyncClient.floatMillisecondsLargerUnitWithResponse": "Encode.Duration.Header.floatMillisecondsLargerUnit", - "encode.duration.HeaderAsyncClient.floatMillisecondsWithResponse": "Encode.Duration.Header.floatMilliseconds", - "encode.duration.HeaderAsyncClient.floatSeconds": "Encode.Duration.Header.floatSeconds", - "encode.duration.HeaderAsyncClient.floatSecondsLargerUnit": "Encode.Duration.Header.floatSecondsLargerUnit", - "encode.duration.HeaderAsyncClient.floatSecondsLargerUnitWithResponse": "Encode.Duration.Header.floatSecondsLargerUnit", - "encode.duration.HeaderAsyncClient.floatSecondsWithResponse": "Encode.Duration.Header.floatSeconds", - "encode.duration.HeaderAsyncClient.int32Milliseconds": "Encode.Duration.Header.int32Milliseconds", - "encode.duration.HeaderAsyncClient.int32MillisecondsArray": "Encode.Duration.Header.int32MillisecondsArray", - "encode.duration.HeaderAsyncClient.int32MillisecondsArrayWithResponse": "Encode.Duration.Header.int32MillisecondsArray", - "encode.duration.HeaderAsyncClient.int32MillisecondsLargerUnit": "Encode.Duration.Header.int32MillisecondsLargerUnit", - "encode.duration.HeaderAsyncClient.int32MillisecondsLargerUnitWithResponse": "Encode.Duration.Header.int32MillisecondsLargerUnit", - "encode.duration.HeaderAsyncClient.int32MillisecondsWithResponse": "Encode.Duration.Header.int32Milliseconds", - "encode.duration.HeaderAsyncClient.int32Seconds": "Encode.Duration.Header.int32Seconds", - "encode.duration.HeaderAsyncClient.int32SecondsLargerUnit": "Encode.Duration.Header.int32SecondsLargerUnit", - "encode.duration.HeaderAsyncClient.int32SecondsLargerUnitWithResponse": "Encode.Duration.Header.int32SecondsLargerUnit", - "encode.duration.HeaderAsyncClient.int32SecondsWithResponse": "Encode.Duration.Header.int32Seconds", - "encode.duration.HeaderAsyncClient.iso8601": "Encode.Duration.Header.iso8601", - "encode.duration.HeaderAsyncClient.iso8601Array": "Encode.Duration.Header.iso8601Array", - "encode.duration.HeaderAsyncClient.iso8601ArrayWithResponse": "Encode.Duration.Header.iso8601Array", - "encode.duration.HeaderAsyncClient.iso8601WithResponse": "Encode.Duration.Header.iso8601", - "encode.duration.HeaderClient": "Encode.Duration.Header", - "encode.duration.HeaderClient.defaultMethod": "Encode.Duration.Header.default", - "encode.duration.HeaderClient.defaultMethodWithResponse": "Encode.Duration.Header.default", - "encode.duration.HeaderClient.float64Milliseconds": "Encode.Duration.Header.float64Milliseconds", - "encode.duration.HeaderClient.float64MillisecondsWithResponse": "Encode.Duration.Header.float64Milliseconds", - "encode.duration.HeaderClient.float64Seconds": "Encode.Duration.Header.float64Seconds", - "encode.duration.HeaderClient.float64SecondsWithResponse": "Encode.Duration.Header.float64Seconds", - "encode.duration.HeaderClient.floatMilliseconds": "Encode.Duration.Header.floatMilliseconds", - "encode.duration.HeaderClient.floatMillisecondsLargerUnit": "Encode.Duration.Header.floatMillisecondsLargerUnit", - "encode.duration.HeaderClient.floatMillisecondsLargerUnitWithResponse": "Encode.Duration.Header.floatMillisecondsLargerUnit", - "encode.duration.HeaderClient.floatMillisecondsWithResponse": "Encode.Duration.Header.floatMilliseconds", - "encode.duration.HeaderClient.floatSeconds": "Encode.Duration.Header.floatSeconds", - "encode.duration.HeaderClient.floatSecondsLargerUnit": "Encode.Duration.Header.floatSecondsLargerUnit", - "encode.duration.HeaderClient.floatSecondsLargerUnitWithResponse": "Encode.Duration.Header.floatSecondsLargerUnit", - "encode.duration.HeaderClient.floatSecondsWithResponse": "Encode.Duration.Header.floatSeconds", - "encode.duration.HeaderClient.int32Milliseconds": "Encode.Duration.Header.int32Milliseconds", - "encode.duration.HeaderClient.int32MillisecondsArray": "Encode.Duration.Header.int32MillisecondsArray", - "encode.duration.HeaderClient.int32MillisecondsArrayWithResponse": "Encode.Duration.Header.int32MillisecondsArray", - "encode.duration.HeaderClient.int32MillisecondsLargerUnit": "Encode.Duration.Header.int32MillisecondsLargerUnit", - "encode.duration.HeaderClient.int32MillisecondsLargerUnitWithResponse": "Encode.Duration.Header.int32MillisecondsLargerUnit", - "encode.duration.HeaderClient.int32MillisecondsWithResponse": "Encode.Duration.Header.int32Milliseconds", - "encode.duration.HeaderClient.int32Seconds": "Encode.Duration.Header.int32Seconds", - "encode.duration.HeaderClient.int32SecondsLargerUnit": "Encode.Duration.Header.int32SecondsLargerUnit", - "encode.duration.HeaderClient.int32SecondsLargerUnitWithResponse": "Encode.Duration.Header.int32SecondsLargerUnit", - "encode.duration.HeaderClient.int32SecondsWithResponse": "Encode.Duration.Header.int32Seconds", - "encode.duration.HeaderClient.iso8601": "Encode.Duration.Header.iso8601", - "encode.duration.HeaderClient.iso8601Array": "Encode.Duration.Header.iso8601Array", - "encode.duration.HeaderClient.iso8601ArrayWithResponse": "Encode.Duration.Header.iso8601Array", - "encode.duration.HeaderClient.iso8601WithResponse": "Encode.Duration.Header.iso8601", - "encode.duration.PropertyAsyncClient": "Encode.Duration.Property", - "encode.duration.PropertyAsyncClient.defaultMethod": "Encode.Duration.Property.default", - "encode.duration.PropertyAsyncClient.defaultMethodWithResponse": "Encode.Duration.Property.default", - "encode.duration.PropertyAsyncClient.float64Milliseconds": "Encode.Duration.Property.float64Milliseconds", - "encode.duration.PropertyAsyncClient.float64MillisecondsWithResponse": "Encode.Duration.Property.float64Milliseconds", - "encode.duration.PropertyAsyncClient.float64Seconds": "Encode.Duration.Property.float64Seconds", - "encode.duration.PropertyAsyncClient.float64SecondsWithResponse": "Encode.Duration.Property.float64Seconds", - "encode.duration.PropertyAsyncClient.floatMilliseconds": "Encode.Duration.Property.floatMilliseconds", - "encode.duration.PropertyAsyncClient.floatMillisecondsArray": "Encode.Duration.Property.floatMillisecondsArray", - "encode.duration.PropertyAsyncClient.floatMillisecondsArrayWithResponse": "Encode.Duration.Property.floatMillisecondsArray", - "encode.duration.PropertyAsyncClient.floatMillisecondsLargerUnit": "Encode.Duration.Property.floatMillisecondsLargerUnit", - "encode.duration.PropertyAsyncClient.floatMillisecondsLargerUnitWithResponse": "Encode.Duration.Property.floatMillisecondsLargerUnit", - "encode.duration.PropertyAsyncClient.floatMillisecondsWithResponse": "Encode.Duration.Property.floatMilliseconds", - "encode.duration.PropertyAsyncClient.floatSeconds": "Encode.Duration.Property.floatSeconds", - "encode.duration.PropertyAsyncClient.floatSecondsArray": "Encode.Duration.Property.floatSecondsArray", - "encode.duration.PropertyAsyncClient.floatSecondsArrayWithResponse": "Encode.Duration.Property.floatSecondsArray", - "encode.duration.PropertyAsyncClient.floatSecondsLargerUnit": "Encode.Duration.Property.floatSecondsLargerUnit", - "encode.duration.PropertyAsyncClient.floatSecondsLargerUnitWithResponse": "Encode.Duration.Property.floatSecondsLargerUnit", - "encode.duration.PropertyAsyncClient.floatSecondsWithResponse": "Encode.Duration.Property.floatSeconds", - "encode.duration.PropertyAsyncClient.int32Milliseconds": "Encode.Duration.Property.int32Milliseconds", - "encode.duration.PropertyAsyncClient.int32MillisecondsLargerUnit": "Encode.Duration.Property.int32MillisecondsLargerUnit", - "encode.duration.PropertyAsyncClient.int32MillisecondsLargerUnitWithResponse": "Encode.Duration.Property.int32MillisecondsLargerUnit", - "encode.duration.PropertyAsyncClient.int32MillisecondsWithResponse": "Encode.Duration.Property.int32Milliseconds", - "encode.duration.PropertyAsyncClient.int32Seconds": "Encode.Duration.Property.int32Seconds", - "encode.duration.PropertyAsyncClient.int32SecondsLargerUnit": "Encode.Duration.Property.int32SecondsLargerUnit", - "encode.duration.PropertyAsyncClient.int32SecondsLargerUnitWithResponse": "Encode.Duration.Property.int32SecondsLargerUnit", - "encode.duration.PropertyAsyncClient.int32SecondsWithResponse": "Encode.Duration.Property.int32Seconds", - "encode.duration.PropertyAsyncClient.iso8601": "Encode.Duration.Property.iso8601", - "encode.duration.PropertyAsyncClient.iso8601WithResponse": "Encode.Duration.Property.iso8601", - "encode.duration.PropertyClient": "Encode.Duration.Property", - "encode.duration.PropertyClient.defaultMethod": "Encode.Duration.Property.default", - "encode.duration.PropertyClient.defaultMethodWithResponse": "Encode.Duration.Property.default", - "encode.duration.PropertyClient.float64Milliseconds": "Encode.Duration.Property.float64Milliseconds", - "encode.duration.PropertyClient.float64MillisecondsWithResponse": "Encode.Duration.Property.float64Milliseconds", - "encode.duration.PropertyClient.float64Seconds": "Encode.Duration.Property.float64Seconds", - "encode.duration.PropertyClient.float64SecondsWithResponse": "Encode.Duration.Property.float64Seconds", - "encode.duration.PropertyClient.floatMilliseconds": "Encode.Duration.Property.floatMilliseconds", - "encode.duration.PropertyClient.floatMillisecondsArray": "Encode.Duration.Property.floatMillisecondsArray", - "encode.duration.PropertyClient.floatMillisecondsArrayWithResponse": "Encode.Duration.Property.floatMillisecondsArray", - "encode.duration.PropertyClient.floatMillisecondsLargerUnit": "Encode.Duration.Property.floatMillisecondsLargerUnit", - "encode.duration.PropertyClient.floatMillisecondsLargerUnitWithResponse": "Encode.Duration.Property.floatMillisecondsLargerUnit", - "encode.duration.PropertyClient.floatMillisecondsWithResponse": "Encode.Duration.Property.floatMilliseconds", - "encode.duration.PropertyClient.floatSeconds": "Encode.Duration.Property.floatSeconds", - "encode.duration.PropertyClient.floatSecondsArray": "Encode.Duration.Property.floatSecondsArray", - "encode.duration.PropertyClient.floatSecondsArrayWithResponse": "Encode.Duration.Property.floatSecondsArray", - "encode.duration.PropertyClient.floatSecondsLargerUnit": "Encode.Duration.Property.floatSecondsLargerUnit", - "encode.duration.PropertyClient.floatSecondsLargerUnitWithResponse": "Encode.Duration.Property.floatSecondsLargerUnit", - "encode.duration.PropertyClient.floatSecondsWithResponse": "Encode.Duration.Property.floatSeconds", - "encode.duration.PropertyClient.int32Milliseconds": "Encode.Duration.Property.int32Milliseconds", - "encode.duration.PropertyClient.int32MillisecondsLargerUnit": "Encode.Duration.Property.int32MillisecondsLargerUnit", - "encode.duration.PropertyClient.int32MillisecondsLargerUnitWithResponse": "Encode.Duration.Property.int32MillisecondsLargerUnit", - "encode.duration.PropertyClient.int32MillisecondsWithResponse": "Encode.Duration.Property.int32Milliseconds", - "encode.duration.PropertyClient.int32Seconds": "Encode.Duration.Property.int32Seconds", - "encode.duration.PropertyClient.int32SecondsLargerUnit": "Encode.Duration.Property.int32SecondsLargerUnit", - "encode.duration.PropertyClient.int32SecondsLargerUnitWithResponse": "Encode.Duration.Property.int32SecondsLargerUnit", - "encode.duration.PropertyClient.int32SecondsWithResponse": "Encode.Duration.Property.int32Seconds", - "encode.duration.PropertyClient.iso8601": "Encode.Duration.Property.iso8601", - "encode.duration.PropertyClient.iso8601WithResponse": "Encode.Duration.Property.iso8601", - "encode.duration.QueryAsyncClient": "Encode.Duration.Query", - "encode.duration.QueryAsyncClient.defaultMethod": "Encode.Duration.Query.default", - "encode.duration.QueryAsyncClient.defaultMethodWithResponse": "Encode.Duration.Query.default", - "encode.duration.QueryAsyncClient.float64Milliseconds": "Encode.Duration.Query.float64Milliseconds", - "encode.duration.QueryAsyncClient.float64MillisecondsWithResponse": "Encode.Duration.Query.float64Milliseconds", - "encode.duration.QueryAsyncClient.float64Seconds": "Encode.Duration.Query.float64Seconds", - "encode.duration.QueryAsyncClient.float64SecondsWithResponse": "Encode.Duration.Query.float64Seconds", - "encode.duration.QueryAsyncClient.floatMilliseconds": "Encode.Duration.Query.floatMilliseconds", - "encode.duration.QueryAsyncClient.floatMillisecondsLargerUnit": "Encode.Duration.Query.floatMillisecondsLargerUnit", - "encode.duration.QueryAsyncClient.floatMillisecondsLargerUnitWithResponse": "Encode.Duration.Query.floatMillisecondsLargerUnit", - "encode.duration.QueryAsyncClient.floatMillisecondsWithResponse": "Encode.Duration.Query.floatMilliseconds", - "encode.duration.QueryAsyncClient.floatSeconds": "Encode.Duration.Query.floatSeconds", - "encode.duration.QueryAsyncClient.floatSecondsLargerUnit": "Encode.Duration.Query.floatSecondsLargerUnit", - "encode.duration.QueryAsyncClient.floatSecondsLargerUnitWithResponse": "Encode.Duration.Query.floatSecondsLargerUnit", - "encode.duration.QueryAsyncClient.floatSecondsWithResponse": "Encode.Duration.Query.floatSeconds", - "encode.duration.QueryAsyncClient.int32Milliseconds": "Encode.Duration.Query.int32Milliseconds", - "encode.duration.QueryAsyncClient.int32MillisecondsArray": "Encode.Duration.Query.int32MillisecondsArray", - "encode.duration.QueryAsyncClient.int32MillisecondsArrayWithResponse": "Encode.Duration.Query.int32MillisecondsArray", - "encode.duration.QueryAsyncClient.int32MillisecondsLargerUnit": "Encode.Duration.Query.int32MillisecondsLargerUnit", - "encode.duration.QueryAsyncClient.int32MillisecondsLargerUnitWithResponse": "Encode.Duration.Query.int32MillisecondsLargerUnit", - "encode.duration.QueryAsyncClient.int32MillisecondsWithResponse": "Encode.Duration.Query.int32Milliseconds", - "encode.duration.QueryAsyncClient.int32Seconds": "Encode.Duration.Query.int32Seconds", - "encode.duration.QueryAsyncClient.int32SecondsArray": "Encode.Duration.Query.int32SecondsArray", - "encode.duration.QueryAsyncClient.int32SecondsArrayWithResponse": "Encode.Duration.Query.int32SecondsArray", - "encode.duration.QueryAsyncClient.int32SecondsLargerUnit": "Encode.Duration.Query.int32SecondsLargerUnit", - "encode.duration.QueryAsyncClient.int32SecondsLargerUnitWithResponse": "Encode.Duration.Query.int32SecondsLargerUnit", - "encode.duration.QueryAsyncClient.int32SecondsWithResponse": "Encode.Duration.Query.int32Seconds", - "encode.duration.QueryAsyncClient.iso8601": "Encode.Duration.Query.iso8601", - "encode.duration.QueryAsyncClient.iso8601WithResponse": "Encode.Duration.Query.iso8601", - "encode.duration.QueryClient": "Encode.Duration.Query", - "encode.duration.QueryClient.defaultMethod": "Encode.Duration.Query.default", - "encode.duration.QueryClient.defaultMethodWithResponse": "Encode.Duration.Query.default", - "encode.duration.QueryClient.float64Milliseconds": "Encode.Duration.Query.float64Milliseconds", - "encode.duration.QueryClient.float64MillisecondsWithResponse": "Encode.Duration.Query.float64Milliseconds", - "encode.duration.QueryClient.float64Seconds": "Encode.Duration.Query.float64Seconds", - "encode.duration.QueryClient.float64SecondsWithResponse": "Encode.Duration.Query.float64Seconds", - "encode.duration.QueryClient.floatMilliseconds": "Encode.Duration.Query.floatMilliseconds", - "encode.duration.QueryClient.floatMillisecondsLargerUnit": "Encode.Duration.Query.floatMillisecondsLargerUnit", - "encode.duration.QueryClient.floatMillisecondsLargerUnitWithResponse": "Encode.Duration.Query.floatMillisecondsLargerUnit", - "encode.duration.QueryClient.floatMillisecondsWithResponse": "Encode.Duration.Query.floatMilliseconds", - "encode.duration.QueryClient.floatSeconds": "Encode.Duration.Query.floatSeconds", - "encode.duration.QueryClient.floatSecondsLargerUnit": "Encode.Duration.Query.floatSecondsLargerUnit", - "encode.duration.QueryClient.floatSecondsLargerUnitWithResponse": "Encode.Duration.Query.floatSecondsLargerUnit", - "encode.duration.QueryClient.floatSecondsWithResponse": "Encode.Duration.Query.floatSeconds", - "encode.duration.QueryClient.int32Milliseconds": "Encode.Duration.Query.int32Milliseconds", - "encode.duration.QueryClient.int32MillisecondsArray": "Encode.Duration.Query.int32MillisecondsArray", - "encode.duration.QueryClient.int32MillisecondsArrayWithResponse": "Encode.Duration.Query.int32MillisecondsArray", - "encode.duration.QueryClient.int32MillisecondsLargerUnit": "Encode.Duration.Query.int32MillisecondsLargerUnit", - "encode.duration.QueryClient.int32MillisecondsLargerUnitWithResponse": "Encode.Duration.Query.int32MillisecondsLargerUnit", - "encode.duration.QueryClient.int32MillisecondsWithResponse": "Encode.Duration.Query.int32Milliseconds", - "encode.duration.QueryClient.int32Seconds": "Encode.Duration.Query.int32Seconds", - "encode.duration.QueryClient.int32SecondsArray": "Encode.Duration.Query.int32SecondsArray", - "encode.duration.QueryClient.int32SecondsArrayWithResponse": "Encode.Duration.Query.int32SecondsArray", - "encode.duration.QueryClient.int32SecondsLargerUnit": "Encode.Duration.Query.int32SecondsLargerUnit", - "encode.duration.QueryClient.int32SecondsLargerUnitWithResponse": "Encode.Duration.Query.int32SecondsLargerUnit", - "encode.duration.QueryClient.int32SecondsWithResponse": "Encode.Duration.Query.int32Seconds", - "encode.duration.QueryClient.iso8601": "Encode.Duration.Query.iso8601", - "encode.duration.QueryClient.iso8601WithResponse": "Encode.Duration.Query.iso8601", - "encode.duration.property.models.DefaultDurationProperty": "Encode.Duration.Property.DefaultDurationProperty", - "encode.duration.property.models.Float64MillisecondsDurationProperty": "Encode.Duration.Property.Float64MillisecondsDurationProperty", - "encode.duration.property.models.Float64SecondsDurationProperty": "Encode.Duration.Property.Float64SecondsDurationProperty", - "encode.duration.property.models.FloatMillisecondsDurationArrayProperty": "Encode.Duration.Property.FloatMillisecondsDurationArrayProperty", - "encode.duration.property.models.FloatMillisecondsDurationProperty": "Encode.Duration.Property.FloatMillisecondsDurationProperty", - "encode.duration.property.models.FloatMillisecondsLargerUnitDurationProperty": "Encode.Duration.Property.FloatMillisecondsLargerUnitDurationProperty", - "encode.duration.property.models.FloatSecondsDurationArrayProperty": "Encode.Duration.Property.FloatSecondsDurationArrayProperty", - "encode.duration.property.models.FloatSecondsDurationProperty": "Encode.Duration.Property.FloatSecondsDurationProperty", - "encode.duration.property.models.FloatSecondsLargerUnitDurationProperty": "Encode.Duration.Property.FloatSecondsLargerUnitDurationProperty", - "encode.duration.property.models.ISO8601DurationProperty": "Encode.Duration.Property.ISO8601DurationProperty", - "encode.duration.property.models.Int32MillisecondsDurationProperty": "Encode.Duration.Property.Int32MillisecondsDurationProperty", - "encode.duration.property.models.Int32MillisecondsLargerUnitDurationProperty": "Encode.Duration.Property.Int32MillisecondsLargerUnitDurationProperty", - "encode.duration.property.models.Int32SecondsDurationProperty": "Encode.Duration.Property.Int32SecondsDurationProperty", - "encode.duration.property.models.Int32SecondsLargerUnitDurationProperty": "Encode.Duration.Property.Int32SecondsLargerUnitDurationProperty" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-duration_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-duration_metadata.json index 14ef5931425..7efd9f18b3d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-duration_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-duration_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"encode.duration.DurationClientBuilder":"Encode.Duration","encode.duration.HeaderAsyncClient":"Encode.Duration.Header","encode.duration.HeaderAsyncClient.defaultMethod":"Encode.Duration.Header.default","encode.duration.HeaderAsyncClient.defaultMethodWithResponse":"Encode.Duration.Header.default","encode.duration.HeaderAsyncClient.float64Milliseconds":"Encode.Duration.Header.float64Milliseconds","encode.duration.HeaderAsyncClient.float64MillisecondsWithResponse":"Encode.Duration.Header.float64Milliseconds","encode.duration.HeaderAsyncClient.float64Seconds":"Encode.Duration.Header.float64Seconds","encode.duration.HeaderAsyncClient.float64SecondsWithResponse":"Encode.Duration.Header.float64Seconds","encode.duration.HeaderAsyncClient.floatMilliseconds":"Encode.Duration.Header.floatMilliseconds","encode.duration.HeaderAsyncClient.floatMillisecondsLargerUnit":"Encode.Duration.Header.floatMillisecondsLargerUnit","encode.duration.HeaderAsyncClient.floatMillisecondsLargerUnitWithResponse":"Encode.Duration.Header.floatMillisecondsLargerUnit","encode.duration.HeaderAsyncClient.floatMillisecondsWithResponse":"Encode.Duration.Header.floatMilliseconds","encode.duration.HeaderAsyncClient.floatSeconds":"Encode.Duration.Header.floatSeconds","encode.duration.HeaderAsyncClient.floatSecondsLargerUnit":"Encode.Duration.Header.floatSecondsLargerUnit","encode.duration.HeaderAsyncClient.floatSecondsLargerUnitWithResponse":"Encode.Duration.Header.floatSecondsLargerUnit","encode.duration.HeaderAsyncClient.floatSecondsWithResponse":"Encode.Duration.Header.floatSeconds","encode.duration.HeaderAsyncClient.int32Milliseconds":"Encode.Duration.Header.int32Milliseconds","encode.duration.HeaderAsyncClient.int32MillisecondsArray":"Encode.Duration.Header.int32MillisecondsArray","encode.duration.HeaderAsyncClient.int32MillisecondsArrayWithResponse":"Encode.Duration.Header.int32MillisecondsArray","encode.duration.HeaderAsyncClient.int32MillisecondsLargerUnit":"Encode.Duration.Header.int32MillisecondsLargerUnit","encode.duration.HeaderAsyncClient.int32MillisecondsLargerUnitWithResponse":"Encode.Duration.Header.int32MillisecondsLargerUnit","encode.duration.HeaderAsyncClient.int32MillisecondsWithResponse":"Encode.Duration.Header.int32Milliseconds","encode.duration.HeaderAsyncClient.int32Seconds":"Encode.Duration.Header.int32Seconds","encode.duration.HeaderAsyncClient.int32SecondsLargerUnit":"Encode.Duration.Header.int32SecondsLargerUnit","encode.duration.HeaderAsyncClient.int32SecondsLargerUnitWithResponse":"Encode.Duration.Header.int32SecondsLargerUnit","encode.duration.HeaderAsyncClient.int32SecondsWithResponse":"Encode.Duration.Header.int32Seconds","encode.duration.HeaderAsyncClient.iso8601":"Encode.Duration.Header.iso8601","encode.duration.HeaderAsyncClient.iso8601Array":"Encode.Duration.Header.iso8601Array","encode.duration.HeaderAsyncClient.iso8601ArrayWithResponse":"Encode.Duration.Header.iso8601Array","encode.duration.HeaderAsyncClient.iso8601WithResponse":"Encode.Duration.Header.iso8601","encode.duration.HeaderClient":"Encode.Duration.Header","encode.duration.HeaderClient.defaultMethod":"Encode.Duration.Header.default","encode.duration.HeaderClient.defaultMethodWithResponse":"Encode.Duration.Header.default","encode.duration.HeaderClient.float64Milliseconds":"Encode.Duration.Header.float64Milliseconds","encode.duration.HeaderClient.float64MillisecondsWithResponse":"Encode.Duration.Header.float64Milliseconds","encode.duration.HeaderClient.float64Seconds":"Encode.Duration.Header.float64Seconds","encode.duration.HeaderClient.float64SecondsWithResponse":"Encode.Duration.Header.float64Seconds","encode.duration.HeaderClient.floatMilliseconds":"Encode.Duration.Header.floatMilliseconds","encode.duration.HeaderClient.floatMillisecondsLargerUnit":"Encode.Duration.Header.floatMillisecondsLargerUnit","encode.duration.HeaderClient.floatMillisecondsLargerUnitWithResponse":"Encode.Duration.Header.floatMillisecondsLargerUnit","encode.duration.HeaderClient.floatMillisecondsWithResponse":"Encode.Duration.Header.floatMilliseconds","encode.duration.HeaderClient.floatSeconds":"Encode.Duration.Header.floatSeconds","encode.duration.HeaderClient.floatSecondsLargerUnit":"Encode.Duration.Header.floatSecondsLargerUnit","encode.duration.HeaderClient.floatSecondsLargerUnitWithResponse":"Encode.Duration.Header.floatSecondsLargerUnit","encode.duration.HeaderClient.floatSecondsWithResponse":"Encode.Duration.Header.floatSeconds","encode.duration.HeaderClient.int32Milliseconds":"Encode.Duration.Header.int32Milliseconds","encode.duration.HeaderClient.int32MillisecondsArray":"Encode.Duration.Header.int32MillisecondsArray","encode.duration.HeaderClient.int32MillisecondsArrayWithResponse":"Encode.Duration.Header.int32MillisecondsArray","encode.duration.HeaderClient.int32MillisecondsLargerUnit":"Encode.Duration.Header.int32MillisecondsLargerUnit","encode.duration.HeaderClient.int32MillisecondsLargerUnitWithResponse":"Encode.Duration.Header.int32MillisecondsLargerUnit","encode.duration.HeaderClient.int32MillisecondsWithResponse":"Encode.Duration.Header.int32Milliseconds","encode.duration.HeaderClient.int32Seconds":"Encode.Duration.Header.int32Seconds","encode.duration.HeaderClient.int32SecondsLargerUnit":"Encode.Duration.Header.int32SecondsLargerUnit","encode.duration.HeaderClient.int32SecondsLargerUnitWithResponse":"Encode.Duration.Header.int32SecondsLargerUnit","encode.duration.HeaderClient.int32SecondsWithResponse":"Encode.Duration.Header.int32Seconds","encode.duration.HeaderClient.iso8601":"Encode.Duration.Header.iso8601","encode.duration.HeaderClient.iso8601Array":"Encode.Duration.Header.iso8601Array","encode.duration.HeaderClient.iso8601ArrayWithResponse":"Encode.Duration.Header.iso8601Array","encode.duration.HeaderClient.iso8601WithResponse":"Encode.Duration.Header.iso8601","encode.duration.PropertyAsyncClient":"Encode.Duration.Property","encode.duration.PropertyAsyncClient.defaultMethod":"Encode.Duration.Property.default","encode.duration.PropertyAsyncClient.defaultMethodWithResponse":"Encode.Duration.Property.default","encode.duration.PropertyAsyncClient.float64Milliseconds":"Encode.Duration.Property.float64Milliseconds","encode.duration.PropertyAsyncClient.float64MillisecondsWithResponse":"Encode.Duration.Property.float64Milliseconds","encode.duration.PropertyAsyncClient.float64Seconds":"Encode.Duration.Property.float64Seconds","encode.duration.PropertyAsyncClient.float64SecondsWithResponse":"Encode.Duration.Property.float64Seconds","encode.duration.PropertyAsyncClient.floatMilliseconds":"Encode.Duration.Property.floatMilliseconds","encode.duration.PropertyAsyncClient.floatMillisecondsArray":"Encode.Duration.Property.floatMillisecondsArray","encode.duration.PropertyAsyncClient.floatMillisecondsArrayWithResponse":"Encode.Duration.Property.floatMillisecondsArray","encode.duration.PropertyAsyncClient.floatMillisecondsLargerUnit":"Encode.Duration.Property.floatMillisecondsLargerUnit","encode.duration.PropertyAsyncClient.floatMillisecondsLargerUnitWithResponse":"Encode.Duration.Property.floatMillisecondsLargerUnit","encode.duration.PropertyAsyncClient.floatMillisecondsWithResponse":"Encode.Duration.Property.floatMilliseconds","encode.duration.PropertyAsyncClient.floatSeconds":"Encode.Duration.Property.floatSeconds","encode.duration.PropertyAsyncClient.floatSecondsArray":"Encode.Duration.Property.floatSecondsArray","encode.duration.PropertyAsyncClient.floatSecondsArrayWithResponse":"Encode.Duration.Property.floatSecondsArray","encode.duration.PropertyAsyncClient.floatSecondsLargerUnit":"Encode.Duration.Property.floatSecondsLargerUnit","encode.duration.PropertyAsyncClient.floatSecondsLargerUnitWithResponse":"Encode.Duration.Property.floatSecondsLargerUnit","encode.duration.PropertyAsyncClient.floatSecondsWithResponse":"Encode.Duration.Property.floatSeconds","encode.duration.PropertyAsyncClient.int32Milliseconds":"Encode.Duration.Property.int32Milliseconds","encode.duration.PropertyAsyncClient.int32MillisecondsLargerUnit":"Encode.Duration.Property.int32MillisecondsLargerUnit","encode.duration.PropertyAsyncClient.int32MillisecondsLargerUnitWithResponse":"Encode.Duration.Property.int32MillisecondsLargerUnit","encode.duration.PropertyAsyncClient.int32MillisecondsWithResponse":"Encode.Duration.Property.int32Milliseconds","encode.duration.PropertyAsyncClient.int32Seconds":"Encode.Duration.Property.int32Seconds","encode.duration.PropertyAsyncClient.int32SecondsLargerUnit":"Encode.Duration.Property.int32SecondsLargerUnit","encode.duration.PropertyAsyncClient.int32SecondsLargerUnitWithResponse":"Encode.Duration.Property.int32SecondsLargerUnit","encode.duration.PropertyAsyncClient.int32SecondsWithResponse":"Encode.Duration.Property.int32Seconds","encode.duration.PropertyAsyncClient.iso8601":"Encode.Duration.Property.iso8601","encode.duration.PropertyAsyncClient.iso8601WithResponse":"Encode.Duration.Property.iso8601","encode.duration.PropertyClient":"Encode.Duration.Property","encode.duration.PropertyClient.defaultMethod":"Encode.Duration.Property.default","encode.duration.PropertyClient.defaultMethodWithResponse":"Encode.Duration.Property.default","encode.duration.PropertyClient.float64Milliseconds":"Encode.Duration.Property.float64Milliseconds","encode.duration.PropertyClient.float64MillisecondsWithResponse":"Encode.Duration.Property.float64Milliseconds","encode.duration.PropertyClient.float64Seconds":"Encode.Duration.Property.float64Seconds","encode.duration.PropertyClient.float64SecondsWithResponse":"Encode.Duration.Property.float64Seconds","encode.duration.PropertyClient.floatMilliseconds":"Encode.Duration.Property.floatMilliseconds","encode.duration.PropertyClient.floatMillisecondsArray":"Encode.Duration.Property.floatMillisecondsArray","encode.duration.PropertyClient.floatMillisecondsArrayWithResponse":"Encode.Duration.Property.floatMillisecondsArray","encode.duration.PropertyClient.floatMillisecondsLargerUnit":"Encode.Duration.Property.floatMillisecondsLargerUnit","encode.duration.PropertyClient.floatMillisecondsLargerUnitWithResponse":"Encode.Duration.Property.floatMillisecondsLargerUnit","encode.duration.PropertyClient.floatMillisecondsWithResponse":"Encode.Duration.Property.floatMilliseconds","encode.duration.PropertyClient.floatSeconds":"Encode.Duration.Property.floatSeconds","encode.duration.PropertyClient.floatSecondsArray":"Encode.Duration.Property.floatSecondsArray","encode.duration.PropertyClient.floatSecondsArrayWithResponse":"Encode.Duration.Property.floatSecondsArray","encode.duration.PropertyClient.floatSecondsLargerUnit":"Encode.Duration.Property.floatSecondsLargerUnit","encode.duration.PropertyClient.floatSecondsLargerUnitWithResponse":"Encode.Duration.Property.floatSecondsLargerUnit","encode.duration.PropertyClient.floatSecondsWithResponse":"Encode.Duration.Property.floatSeconds","encode.duration.PropertyClient.int32Milliseconds":"Encode.Duration.Property.int32Milliseconds","encode.duration.PropertyClient.int32MillisecondsLargerUnit":"Encode.Duration.Property.int32MillisecondsLargerUnit","encode.duration.PropertyClient.int32MillisecondsLargerUnitWithResponse":"Encode.Duration.Property.int32MillisecondsLargerUnit","encode.duration.PropertyClient.int32MillisecondsWithResponse":"Encode.Duration.Property.int32Milliseconds","encode.duration.PropertyClient.int32Seconds":"Encode.Duration.Property.int32Seconds","encode.duration.PropertyClient.int32SecondsLargerUnit":"Encode.Duration.Property.int32SecondsLargerUnit","encode.duration.PropertyClient.int32SecondsLargerUnitWithResponse":"Encode.Duration.Property.int32SecondsLargerUnit","encode.duration.PropertyClient.int32SecondsWithResponse":"Encode.Duration.Property.int32Seconds","encode.duration.PropertyClient.iso8601":"Encode.Duration.Property.iso8601","encode.duration.PropertyClient.iso8601WithResponse":"Encode.Duration.Property.iso8601","encode.duration.QueryAsyncClient":"Encode.Duration.Query","encode.duration.QueryAsyncClient.defaultMethod":"Encode.Duration.Query.default","encode.duration.QueryAsyncClient.defaultMethodWithResponse":"Encode.Duration.Query.default","encode.duration.QueryAsyncClient.float64Milliseconds":"Encode.Duration.Query.float64Milliseconds","encode.duration.QueryAsyncClient.float64MillisecondsWithResponse":"Encode.Duration.Query.float64Milliseconds","encode.duration.QueryAsyncClient.float64Seconds":"Encode.Duration.Query.float64Seconds","encode.duration.QueryAsyncClient.float64SecondsWithResponse":"Encode.Duration.Query.float64Seconds","encode.duration.QueryAsyncClient.floatMilliseconds":"Encode.Duration.Query.floatMilliseconds","encode.duration.QueryAsyncClient.floatMillisecondsLargerUnit":"Encode.Duration.Query.floatMillisecondsLargerUnit","encode.duration.QueryAsyncClient.floatMillisecondsLargerUnitWithResponse":"Encode.Duration.Query.floatMillisecondsLargerUnit","encode.duration.QueryAsyncClient.floatMillisecondsWithResponse":"Encode.Duration.Query.floatMilliseconds","encode.duration.QueryAsyncClient.floatSeconds":"Encode.Duration.Query.floatSeconds","encode.duration.QueryAsyncClient.floatSecondsLargerUnit":"Encode.Duration.Query.floatSecondsLargerUnit","encode.duration.QueryAsyncClient.floatSecondsLargerUnitWithResponse":"Encode.Duration.Query.floatSecondsLargerUnit","encode.duration.QueryAsyncClient.floatSecondsWithResponse":"Encode.Duration.Query.floatSeconds","encode.duration.QueryAsyncClient.int32Milliseconds":"Encode.Duration.Query.int32Milliseconds","encode.duration.QueryAsyncClient.int32MillisecondsArray":"Encode.Duration.Query.int32MillisecondsArray","encode.duration.QueryAsyncClient.int32MillisecondsArrayWithResponse":"Encode.Duration.Query.int32MillisecondsArray","encode.duration.QueryAsyncClient.int32MillisecondsLargerUnit":"Encode.Duration.Query.int32MillisecondsLargerUnit","encode.duration.QueryAsyncClient.int32MillisecondsLargerUnitWithResponse":"Encode.Duration.Query.int32MillisecondsLargerUnit","encode.duration.QueryAsyncClient.int32MillisecondsWithResponse":"Encode.Duration.Query.int32Milliseconds","encode.duration.QueryAsyncClient.int32Seconds":"Encode.Duration.Query.int32Seconds","encode.duration.QueryAsyncClient.int32SecondsArray":"Encode.Duration.Query.int32SecondsArray","encode.duration.QueryAsyncClient.int32SecondsArrayWithResponse":"Encode.Duration.Query.int32SecondsArray","encode.duration.QueryAsyncClient.int32SecondsLargerUnit":"Encode.Duration.Query.int32SecondsLargerUnit","encode.duration.QueryAsyncClient.int32SecondsLargerUnitWithResponse":"Encode.Duration.Query.int32SecondsLargerUnit","encode.duration.QueryAsyncClient.int32SecondsWithResponse":"Encode.Duration.Query.int32Seconds","encode.duration.QueryAsyncClient.iso8601":"Encode.Duration.Query.iso8601","encode.duration.QueryAsyncClient.iso8601WithResponse":"Encode.Duration.Query.iso8601","encode.duration.QueryClient":"Encode.Duration.Query","encode.duration.QueryClient.defaultMethod":"Encode.Duration.Query.default","encode.duration.QueryClient.defaultMethodWithResponse":"Encode.Duration.Query.default","encode.duration.QueryClient.float64Milliseconds":"Encode.Duration.Query.float64Milliseconds","encode.duration.QueryClient.float64MillisecondsWithResponse":"Encode.Duration.Query.float64Milliseconds","encode.duration.QueryClient.float64Seconds":"Encode.Duration.Query.float64Seconds","encode.duration.QueryClient.float64SecondsWithResponse":"Encode.Duration.Query.float64Seconds","encode.duration.QueryClient.floatMilliseconds":"Encode.Duration.Query.floatMilliseconds","encode.duration.QueryClient.floatMillisecondsLargerUnit":"Encode.Duration.Query.floatMillisecondsLargerUnit","encode.duration.QueryClient.floatMillisecondsLargerUnitWithResponse":"Encode.Duration.Query.floatMillisecondsLargerUnit","encode.duration.QueryClient.floatMillisecondsWithResponse":"Encode.Duration.Query.floatMilliseconds","encode.duration.QueryClient.floatSeconds":"Encode.Duration.Query.floatSeconds","encode.duration.QueryClient.floatSecondsLargerUnit":"Encode.Duration.Query.floatSecondsLargerUnit","encode.duration.QueryClient.floatSecondsLargerUnitWithResponse":"Encode.Duration.Query.floatSecondsLargerUnit","encode.duration.QueryClient.floatSecondsWithResponse":"Encode.Duration.Query.floatSeconds","encode.duration.QueryClient.int32Milliseconds":"Encode.Duration.Query.int32Milliseconds","encode.duration.QueryClient.int32MillisecondsArray":"Encode.Duration.Query.int32MillisecondsArray","encode.duration.QueryClient.int32MillisecondsArrayWithResponse":"Encode.Duration.Query.int32MillisecondsArray","encode.duration.QueryClient.int32MillisecondsLargerUnit":"Encode.Duration.Query.int32MillisecondsLargerUnit","encode.duration.QueryClient.int32MillisecondsLargerUnitWithResponse":"Encode.Duration.Query.int32MillisecondsLargerUnit","encode.duration.QueryClient.int32MillisecondsWithResponse":"Encode.Duration.Query.int32Milliseconds","encode.duration.QueryClient.int32Seconds":"Encode.Duration.Query.int32Seconds","encode.duration.QueryClient.int32SecondsArray":"Encode.Duration.Query.int32SecondsArray","encode.duration.QueryClient.int32SecondsArrayWithResponse":"Encode.Duration.Query.int32SecondsArray","encode.duration.QueryClient.int32SecondsLargerUnit":"Encode.Duration.Query.int32SecondsLargerUnit","encode.duration.QueryClient.int32SecondsLargerUnitWithResponse":"Encode.Duration.Query.int32SecondsLargerUnit","encode.duration.QueryClient.int32SecondsWithResponse":"Encode.Duration.Query.int32Seconds","encode.duration.QueryClient.iso8601":"Encode.Duration.Query.iso8601","encode.duration.QueryClient.iso8601WithResponse":"Encode.Duration.Query.iso8601","encode.duration.property.models.DefaultDurationProperty":"Encode.Duration.Property.DefaultDurationProperty","encode.duration.property.models.Float64MillisecondsDurationProperty":"Encode.Duration.Property.Float64MillisecondsDurationProperty","encode.duration.property.models.Float64SecondsDurationProperty":"Encode.Duration.Property.Float64SecondsDurationProperty","encode.duration.property.models.FloatMillisecondsDurationArrayProperty":"Encode.Duration.Property.FloatMillisecondsDurationArrayProperty","encode.duration.property.models.FloatMillisecondsDurationProperty":"Encode.Duration.Property.FloatMillisecondsDurationProperty","encode.duration.property.models.FloatMillisecondsLargerUnitDurationProperty":"Encode.Duration.Property.FloatMillisecondsLargerUnitDurationProperty","encode.duration.property.models.FloatSecondsDurationArrayProperty":"Encode.Duration.Property.FloatSecondsDurationArrayProperty","encode.duration.property.models.FloatSecondsDurationProperty":"Encode.Duration.Property.FloatSecondsDurationProperty","encode.duration.property.models.FloatSecondsLargerUnitDurationProperty":"Encode.Duration.Property.FloatSecondsLargerUnitDurationProperty","encode.duration.property.models.ISO8601DurationProperty":"Encode.Duration.Property.ISO8601DurationProperty","encode.duration.property.models.Int32MillisecondsDurationProperty":"Encode.Duration.Property.Int32MillisecondsDurationProperty","encode.duration.property.models.Int32MillisecondsLargerUnitDurationProperty":"Encode.Duration.Property.Int32MillisecondsLargerUnitDurationProperty","encode.duration.property.models.Int32SecondsDurationProperty":"Encode.Duration.Property.Int32SecondsDurationProperty","encode.duration.property.models.Int32SecondsLargerUnitDurationProperty":"Encode.Duration.Property.Int32SecondsLargerUnitDurationProperty"},"generatedFiles":["src/main/java/encode/duration/DurationClientBuilder.java","src/main/java/encode/duration/HeaderAsyncClient.java","src/main/java/encode/duration/HeaderClient.java","src/main/java/encode/duration/PropertyAsyncClient.java","src/main/java/encode/duration/PropertyClient.java","src/main/java/encode/duration/QueryAsyncClient.java","src/main/java/encode/duration/QueryClient.java","src/main/java/encode/duration/implementation/DurationClientImpl.java","src/main/java/encode/duration/implementation/HeadersImpl.java","src/main/java/encode/duration/implementation/PropertiesImpl.java","src/main/java/encode/duration/implementation/QueriesImpl.java","src/main/java/encode/duration/implementation/package-info.java","src/main/java/encode/duration/package-info.java","src/main/java/encode/duration/property/models/DefaultDurationProperty.java","src/main/java/encode/duration/property/models/Float64MillisecondsDurationProperty.java","src/main/java/encode/duration/property/models/Float64SecondsDurationProperty.java","src/main/java/encode/duration/property/models/FloatMillisecondsDurationArrayProperty.java","src/main/java/encode/duration/property/models/FloatMillisecondsDurationProperty.java","src/main/java/encode/duration/property/models/FloatMillisecondsLargerUnitDurationProperty.java","src/main/java/encode/duration/property/models/FloatSecondsDurationArrayProperty.java","src/main/java/encode/duration/property/models/FloatSecondsDurationProperty.java","src/main/java/encode/duration/property/models/FloatSecondsLargerUnitDurationProperty.java","src/main/java/encode/duration/property/models/ISO8601DurationProperty.java","src/main/java/encode/duration/property/models/Int32MillisecondsDurationProperty.java","src/main/java/encode/duration/property/models/Int32MillisecondsLargerUnitDurationProperty.java","src/main/java/encode/duration/property/models/Int32SecondsDurationProperty.java","src/main/java/encode/duration/property/models/Int32SecondsLargerUnitDurationProperty.java","src/main/java/encode/duration/property/models/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"encode.duration.DurationClientBuilder":"Encode.Duration","encode.duration.HeaderAsyncClient":"Encode.Duration.Header","encode.duration.HeaderAsyncClient.defaultMethod":"Encode.Duration.Header.default","encode.duration.HeaderAsyncClient.defaultMethodWithResponse":"Encode.Duration.Header.default","encode.duration.HeaderAsyncClient.float64Milliseconds":"Encode.Duration.Header.float64Milliseconds","encode.duration.HeaderAsyncClient.float64MillisecondsWithResponse":"Encode.Duration.Header.float64Milliseconds","encode.duration.HeaderAsyncClient.float64Seconds":"Encode.Duration.Header.float64Seconds","encode.duration.HeaderAsyncClient.float64SecondsWithResponse":"Encode.Duration.Header.float64Seconds","encode.duration.HeaderAsyncClient.floatMilliseconds":"Encode.Duration.Header.floatMilliseconds","encode.duration.HeaderAsyncClient.floatMillisecondsLargerUnit":"Encode.Duration.Header.floatMillisecondsLargerUnit","encode.duration.HeaderAsyncClient.floatMillisecondsLargerUnitWithResponse":"Encode.Duration.Header.floatMillisecondsLargerUnit","encode.duration.HeaderAsyncClient.floatMillisecondsWithResponse":"Encode.Duration.Header.floatMilliseconds","encode.duration.HeaderAsyncClient.floatSeconds":"Encode.Duration.Header.floatSeconds","encode.duration.HeaderAsyncClient.floatSecondsLargerUnit":"Encode.Duration.Header.floatSecondsLargerUnit","encode.duration.HeaderAsyncClient.floatSecondsLargerUnitWithResponse":"Encode.Duration.Header.floatSecondsLargerUnit","encode.duration.HeaderAsyncClient.floatSecondsWithResponse":"Encode.Duration.Header.floatSeconds","encode.duration.HeaderAsyncClient.int32Milliseconds":"Encode.Duration.Header.int32Milliseconds","encode.duration.HeaderAsyncClient.int32MillisecondsArray":"Encode.Duration.Header.int32MillisecondsArray","encode.duration.HeaderAsyncClient.int32MillisecondsArrayWithResponse":"Encode.Duration.Header.int32MillisecondsArray","encode.duration.HeaderAsyncClient.int32MillisecondsLargerUnit":"Encode.Duration.Header.int32MillisecondsLargerUnit","encode.duration.HeaderAsyncClient.int32MillisecondsLargerUnitWithResponse":"Encode.Duration.Header.int32MillisecondsLargerUnit","encode.duration.HeaderAsyncClient.int32MillisecondsWithResponse":"Encode.Duration.Header.int32Milliseconds","encode.duration.HeaderAsyncClient.int32Seconds":"Encode.Duration.Header.int32Seconds","encode.duration.HeaderAsyncClient.int32SecondsLargerUnit":"Encode.Duration.Header.int32SecondsLargerUnit","encode.duration.HeaderAsyncClient.int32SecondsLargerUnitWithResponse":"Encode.Duration.Header.int32SecondsLargerUnit","encode.duration.HeaderAsyncClient.int32SecondsWithResponse":"Encode.Duration.Header.int32Seconds","encode.duration.HeaderAsyncClient.iso8601":"Encode.Duration.Header.iso8601","encode.duration.HeaderAsyncClient.iso8601Array":"Encode.Duration.Header.iso8601Array","encode.duration.HeaderAsyncClient.iso8601ArrayWithResponse":"Encode.Duration.Header.iso8601Array","encode.duration.HeaderAsyncClient.iso8601WithResponse":"Encode.Duration.Header.iso8601","encode.duration.HeaderClient":"Encode.Duration.Header","encode.duration.HeaderClient.defaultMethod":"Encode.Duration.Header.default","encode.duration.HeaderClient.defaultMethodWithResponse":"Encode.Duration.Header.default","encode.duration.HeaderClient.float64Milliseconds":"Encode.Duration.Header.float64Milliseconds","encode.duration.HeaderClient.float64MillisecondsWithResponse":"Encode.Duration.Header.float64Milliseconds","encode.duration.HeaderClient.float64Seconds":"Encode.Duration.Header.float64Seconds","encode.duration.HeaderClient.float64SecondsWithResponse":"Encode.Duration.Header.float64Seconds","encode.duration.HeaderClient.floatMilliseconds":"Encode.Duration.Header.floatMilliseconds","encode.duration.HeaderClient.floatMillisecondsLargerUnit":"Encode.Duration.Header.floatMillisecondsLargerUnit","encode.duration.HeaderClient.floatMillisecondsLargerUnitWithResponse":"Encode.Duration.Header.floatMillisecondsLargerUnit","encode.duration.HeaderClient.floatMillisecondsWithResponse":"Encode.Duration.Header.floatMilliseconds","encode.duration.HeaderClient.floatSeconds":"Encode.Duration.Header.floatSeconds","encode.duration.HeaderClient.floatSecondsLargerUnit":"Encode.Duration.Header.floatSecondsLargerUnit","encode.duration.HeaderClient.floatSecondsLargerUnitWithResponse":"Encode.Duration.Header.floatSecondsLargerUnit","encode.duration.HeaderClient.floatSecondsWithResponse":"Encode.Duration.Header.floatSeconds","encode.duration.HeaderClient.int32Milliseconds":"Encode.Duration.Header.int32Milliseconds","encode.duration.HeaderClient.int32MillisecondsArray":"Encode.Duration.Header.int32MillisecondsArray","encode.duration.HeaderClient.int32MillisecondsArrayWithResponse":"Encode.Duration.Header.int32MillisecondsArray","encode.duration.HeaderClient.int32MillisecondsLargerUnit":"Encode.Duration.Header.int32MillisecondsLargerUnit","encode.duration.HeaderClient.int32MillisecondsLargerUnitWithResponse":"Encode.Duration.Header.int32MillisecondsLargerUnit","encode.duration.HeaderClient.int32MillisecondsWithResponse":"Encode.Duration.Header.int32Milliseconds","encode.duration.HeaderClient.int32Seconds":"Encode.Duration.Header.int32Seconds","encode.duration.HeaderClient.int32SecondsLargerUnit":"Encode.Duration.Header.int32SecondsLargerUnit","encode.duration.HeaderClient.int32SecondsLargerUnitWithResponse":"Encode.Duration.Header.int32SecondsLargerUnit","encode.duration.HeaderClient.int32SecondsWithResponse":"Encode.Duration.Header.int32Seconds","encode.duration.HeaderClient.iso8601":"Encode.Duration.Header.iso8601","encode.duration.HeaderClient.iso8601Array":"Encode.Duration.Header.iso8601Array","encode.duration.HeaderClient.iso8601ArrayWithResponse":"Encode.Duration.Header.iso8601Array","encode.duration.HeaderClient.iso8601WithResponse":"Encode.Duration.Header.iso8601","encode.duration.PropertyAsyncClient":"Encode.Duration.Property","encode.duration.PropertyAsyncClient.defaultMethod":"Encode.Duration.Property.default","encode.duration.PropertyAsyncClient.defaultMethodWithResponse":"Encode.Duration.Property.default","encode.duration.PropertyAsyncClient.float64Milliseconds":"Encode.Duration.Property.float64Milliseconds","encode.duration.PropertyAsyncClient.float64MillisecondsWithResponse":"Encode.Duration.Property.float64Milliseconds","encode.duration.PropertyAsyncClient.float64Seconds":"Encode.Duration.Property.float64Seconds","encode.duration.PropertyAsyncClient.float64SecondsWithResponse":"Encode.Duration.Property.float64Seconds","encode.duration.PropertyAsyncClient.floatMilliseconds":"Encode.Duration.Property.floatMilliseconds","encode.duration.PropertyAsyncClient.floatMillisecondsArray":"Encode.Duration.Property.floatMillisecondsArray","encode.duration.PropertyAsyncClient.floatMillisecondsArrayWithResponse":"Encode.Duration.Property.floatMillisecondsArray","encode.duration.PropertyAsyncClient.floatMillisecondsLargerUnit":"Encode.Duration.Property.floatMillisecondsLargerUnit","encode.duration.PropertyAsyncClient.floatMillisecondsLargerUnitWithResponse":"Encode.Duration.Property.floatMillisecondsLargerUnit","encode.duration.PropertyAsyncClient.floatMillisecondsWithResponse":"Encode.Duration.Property.floatMilliseconds","encode.duration.PropertyAsyncClient.floatSeconds":"Encode.Duration.Property.floatSeconds","encode.duration.PropertyAsyncClient.floatSecondsArray":"Encode.Duration.Property.floatSecondsArray","encode.duration.PropertyAsyncClient.floatSecondsArrayWithResponse":"Encode.Duration.Property.floatSecondsArray","encode.duration.PropertyAsyncClient.floatSecondsLargerUnit":"Encode.Duration.Property.floatSecondsLargerUnit","encode.duration.PropertyAsyncClient.floatSecondsLargerUnitWithResponse":"Encode.Duration.Property.floatSecondsLargerUnit","encode.duration.PropertyAsyncClient.floatSecondsWithResponse":"Encode.Duration.Property.floatSeconds","encode.duration.PropertyAsyncClient.int32Milliseconds":"Encode.Duration.Property.int32Milliseconds","encode.duration.PropertyAsyncClient.int32MillisecondsLargerUnit":"Encode.Duration.Property.int32MillisecondsLargerUnit","encode.duration.PropertyAsyncClient.int32MillisecondsLargerUnitWithResponse":"Encode.Duration.Property.int32MillisecondsLargerUnit","encode.duration.PropertyAsyncClient.int32MillisecondsWithResponse":"Encode.Duration.Property.int32Milliseconds","encode.duration.PropertyAsyncClient.int32Seconds":"Encode.Duration.Property.int32Seconds","encode.duration.PropertyAsyncClient.int32SecondsLargerUnit":"Encode.Duration.Property.int32SecondsLargerUnit","encode.duration.PropertyAsyncClient.int32SecondsLargerUnitWithResponse":"Encode.Duration.Property.int32SecondsLargerUnit","encode.duration.PropertyAsyncClient.int32SecondsWithResponse":"Encode.Duration.Property.int32Seconds","encode.duration.PropertyAsyncClient.iso8601":"Encode.Duration.Property.iso8601","encode.duration.PropertyAsyncClient.iso8601WithResponse":"Encode.Duration.Property.iso8601","encode.duration.PropertyClient":"Encode.Duration.Property","encode.duration.PropertyClient.defaultMethod":"Encode.Duration.Property.default","encode.duration.PropertyClient.defaultMethodWithResponse":"Encode.Duration.Property.default","encode.duration.PropertyClient.float64Milliseconds":"Encode.Duration.Property.float64Milliseconds","encode.duration.PropertyClient.float64MillisecondsWithResponse":"Encode.Duration.Property.float64Milliseconds","encode.duration.PropertyClient.float64Seconds":"Encode.Duration.Property.float64Seconds","encode.duration.PropertyClient.float64SecondsWithResponse":"Encode.Duration.Property.float64Seconds","encode.duration.PropertyClient.floatMilliseconds":"Encode.Duration.Property.floatMilliseconds","encode.duration.PropertyClient.floatMillisecondsArray":"Encode.Duration.Property.floatMillisecondsArray","encode.duration.PropertyClient.floatMillisecondsArrayWithResponse":"Encode.Duration.Property.floatMillisecondsArray","encode.duration.PropertyClient.floatMillisecondsLargerUnit":"Encode.Duration.Property.floatMillisecondsLargerUnit","encode.duration.PropertyClient.floatMillisecondsLargerUnitWithResponse":"Encode.Duration.Property.floatMillisecondsLargerUnit","encode.duration.PropertyClient.floatMillisecondsWithResponse":"Encode.Duration.Property.floatMilliseconds","encode.duration.PropertyClient.floatSeconds":"Encode.Duration.Property.floatSeconds","encode.duration.PropertyClient.floatSecondsArray":"Encode.Duration.Property.floatSecondsArray","encode.duration.PropertyClient.floatSecondsArrayWithResponse":"Encode.Duration.Property.floatSecondsArray","encode.duration.PropertyClient.floatSecondsLargerUnit":"Encode.Duration.Property.floatSecondsLargerUnit","encode.duration.PropertyClient.floatSecondsLargerUnitWithResponse":"Encode.Duration.Property.floatSecondsLargerUnit","encode.duration.PropertyClient.floatSecondsWithResponse":"Encode.Duration.Property.floatSeconds","encode.duration.PropertyClient.int32Milliseconds":"Encode.Duration.Property.int32Milliseconds","encode.duration.PropertyClient.int32MillisecondsLargerUnit":"Encode.Duration.Property.int32MillisecondsLargerUnit","encode.duration.PropertyClient.int32MillisecondsLargerUnitWithResponse":"Encode.Duration.Property.int32MillisecondsLargerUnit","encode.duration.PropertyClient.int32MillisecondsWithResponse":"Encode.Duration.Property.int32Milliseconds","encode.duration.PropertyClient.int32Seconds":"Encode.Duration.Property.int32Seconds","encode.duration.PropertyClient.int32SecondsLargerUnit":"Encode.Duration.Property.int32SecondsLargerUnit","encode.duration.PropertyClient.int32SecondsLargerUnitWithResponse":"Encode.Duration.Property.int32SecondsLargerUnit","encode.duration.PropertyClient.int32SecondsWithResponse":"Encode.Duration.Property.int32Seconds","encode.duration.PropertyClient.iso8601":"Encode.Duration.Property.iso8601","encode.duration.PropertyClient.iso8601WithResponse":"Encode.Duration.Property.iso8601","encode.duration.QueryAsyncClient":"Encode.Duration.Query","encode.duration.QueryAsyncClient.defaultMethod":"Encode.Duration.Query.default","encode.duration.QueryAsyncClient.defaultMethodWithResponse":"Encode.Duration.Query.default","encode.duration.QueryAsyncClient.float64Milliseconds":"Encode.Duration.Query.float64Milliseconds","encode.duration.QueryAsyncClient.float64MillisecondsWithResponse":"Encode.Duration.Query.float64Milliseconds","encode.duration.QueryAsyncClient.float64Seconds":"Encode.Duration.Query.float64Seconds","encode.duration.QueryAsyncClient.float64SecondsWithResponse":"Encode.Duration.Query.float64Seconds","encode.duration.QueryAsyncClient.floatMilliseconds":"Encode.Duration.Query.floatMilliseconds","encode.duration.QueryAsyncClient.floatMillisecondsLargerUnit":"Encode.Duration.Query.floatMillisecondsLargerUnit","encode.duration.QueryAsyncClient.floatMillisecondsLargerUnitWithResponse":"Encode.Duration.Query.floatMillisecondsLargerUnit","encode.duration.QueryAsyncClient.floatMillisecondsWithResponse":"Encode.Duration.Query.floatMilliseconds","encode.duration.QueryAsyncClient.floatSeconds":"Encode.Duration.Query.floatSeconds","encode.duration.QueryAsyncClient.floatSecondsLargerUnit":"Encode.Duration.Query.floatSecondsLargerUnit","encode.duration.QueryAsyncClient.floatSecondsLargerUnitWithResponse":"Encode.Duration.Query.floatSecondsLargerUnit","encode.duration.QueryAsyncClient.floatSecondsWithResponse":"Encode.Duration.Query.floatSeconds","encode.duration.QueryAsyncClient.int32Milliseconds":"Encode.Duration.Query.int32Milliseconds","encode.duration.QueryAsyncClient.int32MillisecondsArray":"Encode.Duration.Query.int32MillisecondsArray","encode.duration.QueryAsyncClient.int32MillisecondsArrayWithResponse":"Encode.Duration.Query.int32MillisecondsArray","encode.duration.QueryAsyncClient.int32MillisecondsLargerUnit":"Encode.Duration.Query.int32MillisecondsLargerUnit","encode.duration.QueryAsyncClient.int32MillisecondsLargerUnitWithResponse":"Encode.Duration.Query.int32MillisecondsLargerUnit","encode.duration.QueryAsyncClient.int32MillisecondsWithResponse":"Encode.Duration.Query.int32Milliseconds","encode.duration.QueryAsyncClient.int32Seconds":"Encode.Duration.Query.int32Seconds","encode.duration.QueryAsyncClient.int32SecondsArray":"Encode.Duration.Query.int32SecondsArray","encode.duration.QueryAsyncClient.int32SecondsArrayWithResponse":"Encode.Duration.Query.int32SecondsArray","encode.duration.QueryAsyncClient.int32SecondsLargerUnit":"Encode.Duration.Query.int32SecondsLargerUnit","encode.duration.QueryAsyncClient.int32SecondsLargerUnitWithResponse":"Encode.Duration.Query.int32SecondsLargerUnit","encode.duration.QueryAsyncClient.int32SecondsWithResponse":"Encode.Duration.Query.int32Seconds","encode.duration.QueryAsyncClient.iso8601":"Encode.Duration.Query.iso8601","encode.duration.QueryAsyncClient.iso8601WithResponse":"Encode.Duration.Query.iso8601","encode.duration.QueryClient":"Encode.Duration.Query","encode.duration.QueryClient.defaultMethod":"Encode.Duration.Query.default","encode.duration.QueryClient.defaultMethodWithResponse":"Encode.Duration.Query.default","encode.duration.QueryClient.float64Milliseconds":"Encode.Duration.Query.float64Milliseconds","encode.duration.QueryClient.float64MillisecondsWithResponse":"Encode.Duration.Query.float64Milliseconds","encode.duration.QueryClient.float64Seconds":"Encode.Duration.Query.float64Seconds","encode.duration.QueryClient.float64SecondsWithResponse":"Encode.Duration.Query.float64Seconds","encode.duration.QueryClient.floatMilliseconds":"Encode.Duration.Query.floatMilliseconds","encode.duration.QueryClient.floatMillisecondsLargerUnit":"Encode.Duration.Query.floatMillisecondsLargerUnit","encode.duration.QueryClient.floatMillisecondsLargerUnitWithResponse":"Encode.Duration.Query.floatMillisecondsLargerUnit","encode.duration.QueryClient.floatMillisecondsWithResponse":"Encode.Duration.Query.floatMilliseconds","encode.duration.QueryClient.floatSeconds":"Encode.Duration.Query.floatSeconds","encode.duration.QueryClient.floatSecondsLargerUnit":"Encode.Duration.Query.floatSecondsLargerUnit","encode.duration.QueryClient.floatSecondsLargerUnitWithResponse":"Encode.Duration.Query.floatSecondsLargerUnit","encode.duration.QueryClient.floatSecondsWithResponse":"Encode.Duration.Query.floatSeconds","encode.duration.QueryClient.int32Milliseconds":"Encode.Duration.Query.int32Milliseconds","encode.duration.QueryClient.int32MillisecondsArray":"Encode.Duration.Query.int32MillisecondsArray","encode.duration.QueryClient.int32MillisecondsArrayWithResponse":"Encode.Duration.Query.int32MillisecondsArray","encode.duration.QueryClient.int32MillisecondsLargerUnit":"Encode.Duration.Query.int32MillisecondsLargerUnit","encode.duration.QueryClient.int32MillisecondsLargerUnitWithResponse":"Encode.Duration.Query.int32MillisecondsLargerUnit","encode.duration.QueryClient.int32MillisecondsWithResponse":"Encode.Duration.Query.int32Milliseconds","encode.duration.QueryClient.int32Seconds":"Encode.Duration.Query.int32Seconds","encode.duration.QueryClient.int32SecondsArray":"Encode.Duration.Query.int32SecondsArray","encode.duration.QueryClient.int32SecondsArrayWithResponse":"Encode.Duration.Query.int32SecondsArray","encode.duration.QueryClient.int32SecondsLargerUnit":"Encode.Duration.Query.int32SecondsLargerUnit","encode.duration.QueryClient.int32SecondsLargerUnitWithResponse":"Encode.Duration.Query.int32SecondsLargerUnit","encode.duration.QueryClient.int32SecondsWithResponse":"Encode.Duration.Query.int32Seconds","encode.duration.QueryClient.iso8601":"Encode.Duration.Query.iso8601","encode.duration.QueryClient.iso8601WithResponse":"Encode.Duration.Query.iso8601","encode.duration.property.models.DefaultDurationProperty":"Encode.Duration.Property.DefaultDurationProperty","encode.duration.property.models.Float64MillisecondsDurationProperty":"Encode.Duration.Property.Float64MillisecondsDurationProperty","encode.duration.property.models.Float64SecondsDurationProperty":"Encode.Duration.Property.Float64SecondsDurationProperty","encode.duration.property.models.FloatMillisecondsDurationArrayProperty":"Encode.Duration.Property.FloatMillisecondsDurationArrayProperty","encode.duration.property.models.FloatMillisecondsDurationProperty":"Encode.Duration.Property.FloatMillisecondsDurationProperty","encode.duration.property.models.FloatMillisecondsLargerUnitDurationProperty":"Encode.Duration.Property.FloatMillisecondsLargerUnitDurationProperty","encode.duration.property.models.FloatSecondsDurationArrayProperty":"Encode.Duration.Property.FloatSecondsDurationArrayProperty","encode.duration.property.models.FloatSecondsDurationProperty":"Encode.Duration.Property.FloatSecondsDurationProperty","encode.duration.property.models.FloatSecondsLargerUnitDurationProperty":"Encode.Duration.Property.FloatSecondsLargerUnitDurationProperty","encode.duration.property.models.ISO8601DurationProperty":"Encode.Duration.Property.ISO8601DurationProperty","encode.duration.property.models.Int32MillisecondsDurationProperty":"Encode.Duration.Property.Int32MillisecondsDurationProperty","encode.duration.property.models.Int32MillisecondsLargerUnitDurationProperty":"Encode.Duration.Property.Int32MillisecondsLargerUnitDurationProperty","encode.duration.property.models.Int32SecondsDurationProperty":"Encode.Duration.Property.Int32SecondsDurationProperty","encode.duration.property.models.Int32SecondsLargerUnitDurationProperty":"Encode.Duration.Property.Int32SecondsLargerUnitDurationProperty"},"generatedFiles":["src/main/java/encode/duration/DurationClientBuilder.java","src/main/java/encode/duration/HeaderAsyncClient.java","src/main/java/encode/duration/HeaderClient.java","src/main/java/encode/duration/PropertyAsyncClient.java","src/main/java/encode/duration/PropertyClient.java","src/main/java/encode/duration/QueryAsyncClient.java","src/main/java/encode/duration/QueryClient.java","src/main/java/encode/duration/implementation/DurationClientImpl.java","src/main/java/encode/duration/implementation/HeadersImpl.java","src/main/java/encode/duration/implementation/PropertiesImpl.java","src/main/java/encode/duration/implementation/QueriesImpl.java","src/main/java/encode/duration/implementation/package-info.java","src/main/java/encode/duration/package-info.java","src/main/java/encode/duration/property/models/DefaultDurationProperty.java","src/main/java/encode/duration/property/models/Float64MillisecondsDurationProperty.java","src/main/java/encode/duration/property/models/Float64SecondsDurationProperty.java","src/main/java/encode/duration/property/models/FloatMillisecondsDurationArrayProperty.java","src/main/java/encode/duration/property/models/FloatMillisecondsDurationProperty.java","src/main/java/encode/duration/property/models/FloatMillisecondsLargerUnitDurationProperty.java","src/main/java/encode/duration/property/models/FloatSecondsDurationArrayProperty.java","src/main/java/encode/duration/property/models/FloatSecondsDurationProperty.java","src/main/java/encode/duration/property/models/FloatSecondsLargerUnitDurationProperty.java","src/main/java/encode/duration/property/models/ISO8601DurationProperty.java","src/main/java/encode/duration/property/models/Int32MillisecondsDurationProperty.java","src/main/java/encode/duration/property/models/Int32MillisecondsLargerUnitDurationProperty.java","src/main/java/encode/duration/property/models/Int32SecondsDurationProperty.java","src/main/java/encode/duration/property/models/Int32SecondsLargerUnitDurationProperty.java","src/main/java/encode/duration/property/models/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-numeric_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-numeric_apiview_properties.json deleted file mode 100644 index 33f149d361d..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-numeric_apiview_properties.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "encode.numeric.NumericAsyncClient": "Encode.Numeric.Property", - "encode.numeric.NumericAsyncClient.safeintAsString": "Encode.Numeric.Property.safeintAsString", - "encode.numeric.NumericAsyncClient.safeintAsStringWithResponse": "Encode.Numeric.Property.safeintAsString", - "encode.numeric.NumericAsyncClient.uint32AsStringOptional": "Encode.Numeric.Property.uint32AsStringOptional", - "encode.numeric.NumericAsyncClient.uint32AsStringOptionalWithResponse": "Encode.Numeric.Property.uint32AsStringOptional", - "encode.numeric.NumericAsyncClient.uint8AsString": "Encode.Numeric.Property.uint8AsString", - "encode.numeric.NumericAsyncClient.uint8AsStringWithResponse": "Encode.Numeric.Property.uint8AsString", - "encode.numeric.NumericClient": "Encode.Numeric.Property", - "encode.numeric.NumericClient.safeintAsString": "Encode.Numeric.Property.safeintAsString", - "encode.numeric.NumericClient.safeintAsStringWithResponse": "Encode.Numeric.Property.safeintAsString", - "encode.numeric.NumericClient.uint32AsStringOptional": "Encode.Numeric.Property.uint32AsStringOptional", - "encode.numeric.NumericClient.uint32AsStringOptionalWithResponse": "Encode.Numeric.Property.uint32AsStringOptional", - "encode.numeric.NumericClient.uint8AsString": "Encode.Numeric.Property.uint8AsString", - "encode.numeric.NumericClient.uint8AsStringWithResponse": "Encode.Numeric.Property.uint8AsString", - "encode.numeric.NumericClientBuilder": "Encode.Numeric", - "encode.numeric.property.models.SafeintAsStringProperty": "Encode.Numeric.Property.SafeintAsStringProperty", - "encode.numeric.property.models.Uint32AsStringProperty": "Encode.Numeric.Property.Uint32AsStringProperty", - "encode.numeric.property.models.Uint8AsStringProperty": "Encode.Numeric.Property.Uint8AsStringProperty" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-numeric_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-numeric_metadata.json index 8db4b2db574..d8710ec687b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-numeric_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/encode-numeric_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"encode.numeric.NumericAsyncClient":"Encode.Numeric.Property","encode.numeric.NumericAsyncClient.safeintAsString":"Encode.Numeric.Property.safeintAsString","encode.numeric.NumericAsyncClient.safeintAsStringWithResponse":"Encode.Numeric.Property.safeintAsString","encode.numeric.NumericAsyncClient.uint32AsStringOptional":"Encode.Numeric.Property.uint32AsStringOptional","encode.numeric.NumericAsyncClient.uint32AsStringOptionalWithResponse":"Encode.Numeric.Property.uint32AsStringOptional","encode.numeric.NumericAsyncClient.uint8AsString":"Encode.Numeric.Property.uint8AsString","encode.numeric.NumericAsyncClient.uint8AsStringWithResponse":"Encode.Numeric.Property.uint8AsString","encode.numeric.NumericClient":"Encode.Numeric.Property","encode.numeric.NumericClient.safeintAsString":"Encode.Numeric.Property.safeintAsString","encode.numeric.NumericClient.safeintAsStringWithResponse":"Encode.Numeric.Property.safeintAsString","encode.numeric.NumericClient.uint32AsStringOptional":"Encode.Numeric.Property.uint32AsStringOptional","encode.numeric.NumericClient.uint32AsStringOptionalWithResponse":"Encode.Numeric.Property.uint32AsStringOptional","encode.numeric.NumericClient.uint8AsString":"Encode.Numeric.Property.uint8AsString","encode.numeric.NumericClient.uint8AsStringWithResponse":"Encode.Numeric.Property.uint8AsString","encode.numeric.NumericClientBuilder":"Encode.Numeric","encode.numeric.property.models.SafeintAsStringProperty":"Encode.Numeric.Property.SafeintAsStringProperty","encode.numeric.property.models.Uint32AsStringProperty":"Encode.Numeric.Property.Uint32AsStringProperty","encode.numeric.property.models.Uint8AsStringProperty":"Encode.Numeric.Property.Uint8AsStringProperty"},"generatedFiles":["src/main/java/encode/numeric/NumericAsyncClient.java","src/main/java/encode/numeric/NumericClient.java","src/main/java/encode/numeric/NumericClientBuilder.java","src/main/java/encode/numeric/implementation/NumericClientImpl.java","src/main/java/encode/numeric/implementation/PropertiesImpl.java","src/main/java/encode/numeric/implementation/package-info.java","src/main/java/encode/numeric/package-info.java","src/main/java/encode/numeric/property/models/SafeintAsStringProperty.java","src/main/java/encode/numeric/property/models/Uint32AsStringProperty.java","src/main/java/encode/numeric/property/models/Uint8AsStringProperty.java","src/main/java/encode/numeric/property/models/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"encode.numeric.NumericAsyncClient":"Encode.Numeric.Property","encode.numeric.NumericAsyncClient.safeintAsString":"Encode.Numeric.Property.safeintAsString","encode.numeric.NumericAsyncClient.safeintAsStringWithResponse":"Encode.Numeric.Property.safeintAsString","encode.numeric.NumericAsyncClient.uint32AsStringOptional":"Encode.Numeric.Property.uint32AsStringOptional","encode.numeric.NumericAsyncClient.uint32AsStringOptionalWithResponse":"Encode.Numeric.Property.uint32AsStringOptional","encode.numeric.NumericAsyncClient.uint8AsString":"Encode.Numeric.Property.uint8AsString","encode.numeric.NumericAsyncClient.uint8AsStringWithResponse":"Encode.Numeric.Property.uint8AsString","encode.numeric.NumericClient":"Encode.Numeric.Property","encode.numeric.NumericClient.safeintAsString":"Encode.Numeric.Property.safeintAsString","encode.numeric.NumericClient.safeintAsStringWithResponse":"Encode.Numeric.Property.safeintAsString","encode.numeric.NumericClient.uint32AsStringOptional":"Encode.Numeric.Property.uint32AsStringOptional","encode.numeric.NumericClient.uint32AsStringOptionalWithResponse":"Encode.Numeric.Property.uint32AsStringOptional","encode.numeric.NumericClient.uint8AsString":"Encode.Numeric.Property.uint8AsString","encode.numeric.NumericClient.uint8AsStringWithResponse":"Encode.Numeric.Property.uint8AsString","encode.numeric.NumericClientBuilder":"Encode.Numeric","encode.numeric.property.models.SafeintAsStringProperty":"Encode.Numeric.Property.SafeintAsStringProperty","encode.numeric.property.models.Uint32AsStringProperty":"Encode.Numeric.Property.Uint32AsStringProperty","encode.numeric.property.models.Uint8AsStringProperty":"Encode.Numeric.Property.Uint8AsStringProperty"},"generatedFiles":["src/main/java/encode/numeric/NumericAsyncClient.java","src/main/java/encode/numeric/NumericClient.java","src/main/java/encode/numeric/NumericClientBuilder.java","src/main/java/encode/numeric/implementation/NumericClientImpl.java","src/main/java/encode/numeric/implementation/PropertiesImpl.java","src/main/java/encode/numeric/implementation/package-info.java","src/main/java/encode/numeric/package-info.java","src/main/java/encode/numeric/property/models/SafeintAsStringProperty.java","src/main/java/encode/numeric/property/models/Uint32AsStringProperty.java","src/main/java/encode/numeric/property/models/Uint8AsStringProperty.java","src/main/java/encode/numeric/property/models/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/armstreamstyleserialization-generated/reflect-config.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/armstreamstyleserialization-generated/reflect-config.json index 04b770df5e9..5194955c3a8 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/armstreamstyleserialization-generated/reflect-config.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/armstreamstyleserialization-generated/reflect-config.json @@ -1 +1 @@ -[{"name":"tsptest.armstreamstyleserialization.models.Error","allDeclaredConstructors":true,"allDeclaredFields":true,"allDeclaredMethods":true},{"name":"tsptest.armstreamstyleserialization.models.ErrorException","allDeclaredConstructors":true,"allDeclaredFields":true,"allDeclaredMethods":true},{"name":"tsptest.armstreamstyleserialization.models.ErrorMin","allDeclaredConstructors":true,"allDeclaredFields":true,"allDeclaredMethods":true},{"name":"tsptest.armstreamstyleserialization.models.ErrorMinException","allDeclaredConstructors":true,"allDeclaredFields":true,"allDeclaredMethods":true}] \ No newline at end of file +[{"name":"tsptest.armstreamstyleserialization.models.ErrorMax","allDeclaredConstructors":true,"allDeclaredFields":true,"allDeclaredMethods":true},{"name":"tsptest.armstreamstyleserialization.models.ErrorMaxException","allDeclaredConstructors":true,"allDeclaredFields":true,"allDeclaredMethods":true},{"name":"tsptest.armstreamstyleserialization.models.ErrorMin","allDeclaredConstructors":true,"allDeclaredFields":true,"allDeclaredMethods":true},{"name":"tsptest.armstreamstyleserialization.models.ErrorMinException","allDeclaredConstructors":true,"allDeclaredFields":true,"allDeclaredMethods":true}] \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-combined-generated_older-versions/proxy-config.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-combined-generated_older-versions/proxy-config.json deleted file mode 100644 index 05dc52000a6..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-combined-generated_older-versions/proxy-config.json +++ /dev/null @@ -1 +0,0 @@ -[["azure.resourcemanager.multiserviceolderversions.combined.implementation.DisksClientImpl$DisksService"],["azure.resourcemanager.multiserviceolderversions.combined.implementation.VirtualMachinesClientImpl$VirtualMachinesService"]] \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-combined-generated_older-versions/reflect-config.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-combined-generated_older-versions/reflect-config.json deleted file mode 100644 index 0637a088a01..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-combined-generated_older-versions/reflect-config.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-basic_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-basic_apiview_properties.json deleted file mode 100644 index f6f9142402b..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-basic_apiview_properties.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "parameters.basic.BasicClientBuilder": "Parameters.Basic", - "parameters.basic.ExplicitBodyAsyncClient": "Parameters.Basic.ExplicitBody", - "parameters.basic.ExplicitBodyAsyncClient.simple": "Parameters.Basic.ExplicitBody.simple", - "parameters.basic.ExplicitBodyAsyncClient.simpleWithResponse": "Parameters.Basic.ExplicitBody.simple", - "parameters.basic.ExplicitBodyClient": "Parameters.Basic.ExplicitBody", - "parameters.basic.ExplicitBodyClient.simple": "Parameters.Basic.ExplicitBody.simple", - "parameters.basic.ExplicitBodyClient.simpleWithResponse": "Parameters.Basic.ExplicitBody.simple", - "parameters.basic.ImplicitBodyAsyncClient": "Parameters.Basic.ImplicitBody", - "parameters.basic.ImplicitBodyAsyncClient.simple": "Parameters.Basic.ImplicitBody.simple", - "parameters.basic.ImplicitBodyAsyncClient.simpleWithResponse": "Parameters.Basic.ImplicitBody.simple", - "parameters.basic.ImplicitBodyClient": "Parameters.Basic.ImplicitBody", - "parameters.basic.ImplicitBodyClient.simple": "Parameters.Basic.ImplicitBody.simple", - "parameters.basic.ImplicitBodyClient.simpleWithResponse": "Parameters.Basic.ImplicitBody.simple", - "parameters.basic.explicitbody.models.User": "Parameters.Basic.ExplicitBody.User", - "parameters.basic.implicitbody.implementation.models.SimpleRequest": "Parameters.Basic.ImplicitBody.simple.Request.anonymous" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-basic_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-basic_metadata.json index 3a597d991b9..f06b4a20c5c 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-basic_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-basic_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"parameters.basic.BasicClientBuilder":"Parameters.Basic","parameters.basic.ExplicitBodyAsyncClient":"Parameters.Basic.ExplicitBody","parameters.basic.ExplicitBodyAsyncClient.simple":"Parameters.Basic.ExplicitBody.simple","parameters.basic.ExplicitBodyAsyncClient.simpleWithResponse":"Parameters.Basic.ExplicitBody.simple","parameters.basic.ExplicitBodyClient":"Parameters.Basic.ExplicitBody","parameters.basic.ExplicitBodyClient.simple":"Parameters.Basic.ExplicitBody.simple","parameters.basic.ExplicitBodyClient.simpleWithResponse":"Parameters.Basic.ExplicitBody.simple","parameters.basic.ImplicitBodyAsyncClient":"Parameters.Basic.ImplicitBody","parameters.basic.ImplicitBodyAsyncClient.simple":"Parameters.Basic.ImplicitBody.simple","parameters.basic.ImplicitBodyAsyncClient.simpleWithResponse":"Parameters.Basic.ImplicitBody.simple","parameters.basic.ImplicitBodyClient":"Parameters.Basic.ImplicitBody","parameters.basic.ImplicitBodyClient.simple":"Parameters.Basic.ImplicitBody.simple","parameters.basic.ImplicitBodyClient.simpleWithResponse":"Parameters.Basic.ImplicitBody.simple","parameters.basic.explicitbody.models.User":"Parameters.Basic.ExplicitBody.User","parameters.basic.implicitbody.implementation.models.SimpleRequest":"Parameters.Basic.ImplicitBody.simple.Request.anonymous"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/basic/BasicClientBuilder.java","src/main/java/parameters/basic/ExplicitBodyAsyncClient.java","src/main/java/parameters/basic/ExplicitBodyClient.java","src/main/java/parameters/basic/ImplicitBodyAsyncClient.java","src/main/java/parameters/basic/ImplicitBodyClient.java","src/main/java/parameters/basic/explicitbody/models/User.java","src/main/java/parameters/basic/explicitbody/models/package-info.java","src/main/java/parameters/basic/implementation/BasicClientImpl.java","src/main/java/parameters/basic/implementation/ExplicitBodiesImpl.java","src/main/java/parameters/basic/implementation/ImplicitBodiesImpl.java","src/main/java/parameters/basic/implementation/package-info.java","src/main/java/parameters/basic/implicitbody/implementation/models/SimpleRequest.java","src/main/java/parameters/basic/implicitbody/implementation/models/package-info.java","src/main/java/parameters/basic/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"parameters.basic.BasicClientBuilder":"Parameters.Basic","parameters.basic.ExplicitBodyAsyncClient":"Parameters.Basic.ExplicitBody","parameters.basic.ExplicitBodyAsyncClient.simple":"Parameters.Basic.ExplicitBody.simple","parameters.basic.ExplicitBodyAsyncClient.simpleWithResponse":"Parameters.Basic.ExplicitBody.simple","parameters.basic.ExplicitBodyClient":"Parameters.Basic.ExplicitBody","parameters.basic.ExplicitBodyClient.simple":"Parameters.Basic.ExplicitBody.simple","parameters.basic.ExplicitBodyClient.simpleWithResponse":"Parameters.Basic.ExplicitBody.simple","parameters.basic.ImplicitBodyAsyncClient":"Parameters.Basic.ImplicitBody","parameters.basic.ImplicitBodyAsyncClient.simple":"Parameters.Basic.ImplicitBody.simple","parameters.basic.ImplicitBodyAsyncClient.simpleWithResponse":"Parameters.Basic.ImplicitBody.simple","parameters.basic.ImplicitBodyClient":"Parameters.Basic.ImplicitBody","parameters.basic.ImplicitBodyClient.simple":"Parameters.Basic.ImplicitBody.simple","parameters.basic.ImplicitBodyClient.simpleWithResponse":"Parameters.Basic.ImplicitBody.simple","parameters.basic.explicitbody.models.User":"Parameters.Basic.ExplicitBody.User","parameters.basic.implicitbody.implementation.models.SimpleRequest":"Parameters.Basic.ImplicitBody.simple.Request.anonymous"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/basic/BasicClientBuilder.java","src/main/java/parameters/basic/ExplicitBodyAsyncClient.java","src/main/java/parameters/basic/ExplicitBodyClient.java","src/main/java/parameters/basic/ImplicitBodyAsyncClient.java","src/main/java/parameters/basic/ImplicitBodyClient.java","src/main/java/parameters/basic/explicitbody/models/User.java","src/main/java/parameters/basic/explicitbody/models/package-info.java","src/main/java/parameters/basic/implementation/BasicClientImpl.java","src/main/java/parameters/basic/implementation/ExplicitBodiesImpl.java","src/main/java/parameters/basic/implementation/ImplicitBodiesImpl.java","src/main/java/parameters/basic/implementation/package-info.java","src/main/java/parameters/basic/implicitbody/implementation/models/SimpleRequest.java","src/main/java/parameters/basic/implicitbody/implementation/models/package-info.java","src/main/java/parameters/basic/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-bodyoptionality_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-bodyoptionality_apiview_properties.json deleted file mode 100644 index 36ee4a51333..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-bodyoptionality_apiview_properties.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "parameters.bodyoptionality.BodyOptionalityAsyncClient": "Parameters.BodyOptionality", - "parameters.bodyoptionality.BodyOptionalityAsyncClient.requiredExplicit": "Parameters.BodyOptionality.requiredExplicit", - "parameters.bodyoptionality.BodyOptionalityAsyncClient.requiredExplicitWithResponse": "Parameters.BodyOptionality.requiredExplicit", - "parameters.bodyoptionality.BodyOptionalityAsyncClient.requiredImplicit": "Parameters.BodyOptionality.requiredImplicit", - "parameters.bodyoptionality.BodyOptionalityAsyncClient.requiredImplicitWithResponse": "Parameters.BodyOptionality.requiredImplicit", - "parameters.bodyoptionality.BodyOptionalityClient": "Parameters.BodyOptionality", - "parameters.bodyoptionality.BodyOptionalityClient.requiredExplicit": "Parameters.BodyOptionality.requiredExplicit", - "parameters.bodyoptionality.BodyOptionalityClient.requiredExplicitWithResponse": "Parameters.BodyOptionality.requiredExplicit", - "parameters.bodyoptionality.BodyOptionalityClient.requiredImplicit": "Parameters.BodyOptionality.requiredImplicit", - "parameters.bodyoptionality.BodyOptionalityClient.requiredImplicitWithResponse": "Parameters.BodyOptionality.requiredImplicit", - "parameters.bodyoptionality.BodyOptionalityClientBuilder": "Parameters.BodyOptionality", - "parameters.bodyoptionality.OptionalExplicitAsyncClient": "Parameters.BodyOptionality.OptionalExplicit", - "parameters.bodyoptionality.OptionalExplicitAsyncClient.omit": "Parameters.BodyOptionality.OptionalExplicit.omit", - "parameters.bodyoptionality.OptionalExplicitAsyncClient.omitWithResponse": "Parameters.BodyOptionality.OptionalExplicit.omit", - "parameters.bodyoptionality.OptionalExplicitAsyncClient.set": "Parameters.BodyOptionality.OptionalExplicit.set", - "parameters.bodyoptionality.OptionalExplicitAsyncClient.setWithResponse": "Parameters.BodyOptionality.OptionalExplicit.set", - "parameters.bodyoptionality.OptionalExplicitClient": "Parameters.BodyOptionality.OptionalExplicit", - "parameters.bodyoptionality.OptionalExplicitClient.omit": "Parameters.BodyOptionality.OptionalExplicit.omit", - "parameters.bodyoptionality.OptionalExplicitClient.omitWithResponse": "Parameters.BodyOptionality.OptionalExplicit.omit", - "parameters.bodyoptionality.OptionalExplicitClient.set": "Parameters.BodyOptionality.OptionalExplicit.set", - "parameters.bodyoptionality.OptionalExplicitClient.setWithResponse": "Parameters.BodyOptionality.OptionalExplicit.set", - "parameters.bodyoptionality.models.BodyModel": "Parameters.BodyOptionality.BodyModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-bodyoptionality_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-bodyoptionality_metadata.json index 4b8826c036a..f7d42e51f41 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-bodyoptionality_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-bodyoptionality_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"parameters.bodyoptionality.BodyOptionalityAsyncClient":"Parameters.BodyOptionality","parameters.bodyoptionality.BodyOptionalityAsyncClient.requiredExplicit":"Parameters.BodyOptionality.requiredExplicit","parameters.bodyoptionality.BodyOptionalityAsyncClient.requiredExplicitWithResponse":"Parameters.BodyOptionality.requiredExplicit","parameters.bodyoptionality.BodyOptionalityAsyncClient.requiredImplicit":"Parameters.BodyOptionality.requiredImplicit","parameters.bodyoptionality.BodyOptionalityAsyncClient.requiredImplicitWithResponse":"Parameters.BodyOptionality.requiredImplicit","parameters.bodyoptionality.BodyOptionalityClient":"Parameters.BodyOptionality","parameters.bodyoptionality.BodyOptionalityClient.requiredExplicit":"Parameters.BodyOptionality.requiredExplicit","parameters.bodyoptionality.BodyOptionalityClient.requiredExplicitWithResponse":"Parameters.BodyOptionality.requiredExplicit","parameters.bodyoptionality.BodyOptionalityClient.requiredImplicit":"Parameters.BodyOptionality.requiredImplicit","parameters.bodyoptionality.BodyOptionalityClient.requiredImplicitWithResponse":"Parameters.BodyOptionality.requiredImplicit","parameters.bodyoptionality.BodyOptionalityClientBuilder":"Parameters.BodyOptionality","parameters.bodyoptionality.OptionalExplicitAsyncClient":"Parameters.BodyOptionality.OptionalExplicit","parameters.bodyoptionality.OptionalExplicitAsyncClient.omit":"Parameters.BodyOptionality.OptionalExplicit.omit","parameters.bodyoptionality.OptionalExplicitAsyncClient.omitWithResponse":"Parameters.BodyOptionality.OptionalExplicit.omit","parameters.bodyoptionality.OptionalExplicitAsyncClient.set":"Parameters.BodyOptionality.OptionalExplicit.set","parameters.bodyoptionality.OptionalExplicitAsyncClient.setWithResponse":"Parameters.BodyOptionality.OptionalExplicit.set","parameters.bodyoptionality.OptionalExplicitClient":"Parameters.BodyOptionality.OptionalExplicit","parameters.bodyoptionality.OptionalExplicitClient.omit":"Parameters.BodyOptionality.OptionalExplicit.omit","parameters.bodyoptionality.OptionalExplicitClient.omitWithResponse":"Parameters.BodyOptionality.OptionalExplicit.omit","parameters.bodyoptionality.OptionalExplicitClient.set":"Parameters.BodyOptionality.OptionalExplicit.set","parameters.bodyoptionality.OptionalExplicitClient.setWithResponse":"Parameters.BodyOptionality.OptionalExplicit.set","parameters.bodyoptionality.models.BodyModel":"Parameters.BodyOptionality.BodyModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/bodyoptionality/BodyOptionalityAsyncClient.java","src/main/java/parameters/bodyoptionality/BodyOptionalityClient.java","src/main/java/parameters/bodyoptionality/BodyOptionalityClientBuilder.java","src/main/java/parameters/bodyoptionality/OptionalExplicitAsyncClient.java","src/main/java/parameters/bodyoptionality/OptionalExplicitClient.java","src/main/java/parameters/bodyoptionality/implementation/BodyOptionalityClientImpl.java","src/main/java/parameters/bodyoptionality/implementation/OptionalExplicitsImpl.java","src/main/java/parameters/bodyoptionality/implementation/package-info.java","src/main/java/parameters/bodyoptionality/models/BodyModel.java","src/main/java/parameters/bodyoptionality/models/package-info.java","src/main/java/parameters/bodyoptionality/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"parameters.bodyoptionality.BodyOptionalityAsyncClient":"Parameters.BodyOptionality","parameters.bodyoptionality.BodyOptionalityAsyncClient.requiredExplicit":"Parameters.BodyOptionality.requiredExplicit","parameters.bodyoptionality.BodyOptionalityAsyncClient.requiredExplicitWithResponse":"Parameters.BodyOptionality.requiredExplicit","parameters.bodyoptionality.BodyOptionalityAsyncClient.requiredImplicit":"Parameters.BodyOptionality.requiredImplicit","parameters.bodyoptionality.BodyOptionalityAsyncClient.requiredImplicitWithResponse":"Parameters.BodyOptionality.requiredImplicit","parameters.bodyoptionality.BodyOptionalityClient":"Parameters.BodyOptionality","parameters.bodyoptionality.BodyOptionalityClient.requiredExplicit":"Parameters.BodyOptionality.requiredExplicit","parameters.bodyoptionality.BodyOptionalityClient.requiredExplicitWithResponse":"Parameters.BodyOptionality.requiredExplicit","parameters.bodyoptionality.BodyOptionalityClient.requiredImplicit":"Parameters.BodyOptionality.requiredImplicit","parameters.bodyoptionality.BodyOptionalityClient.requiredImplicitWithResponse":"Parameters.BodyOptionality.requiredImplicit","parameters.bodyoptionality.BodyOptionalityClientBuilder":"Parameters.BodyOptionality","parameters.bodyoptionality.OptionalExplicitAsyncClient":"Parameters.BodyOptionality.OptionalExplicit","parameters.bodyoptionality.OptionalExplicitAsyncClient.omit":"Parameters.BodyOptionality.OptionalExplicit.omit","parameters.bodyoptionality.OptionalExplicitAsyncClient.omitWithResponse":"Parameters.BodyOptionality.OptionalExplicit.omit","parameters.bodyoptionality.OptionalExplicitAsyncClient.set":"Parameters.BodyOptionality.OptionalExplicit.set","parameters.bodyoptionality.OptionalExplicitAsyncClient.setWithResponse":"Parameters.BodyOptionality.OptionalExplicit.set","parameters.bodyoptionality.OptionalExplicitClient":"Parameters.BodyOptionality.OptionalExplicit","parameters.bodyoptionality.OptionalExplicitClient.omit":"Parameters.BodyOptionality.OptionalExplicit.omit","parameters.bodyoptionality.OptionalExplicitClient.omitWithResponse":"Parameters.BodyOptionality.OptionalExplicit.omit","parameters.bodyoptionality.OptionalExplicitClient.set":"Parameters.BodyOptionality.OptionalExplicit.set","parameters.bodyoptionality.OptionalExplicitClient.setWithResponse":"Parameters.BodyOptionality.OptionalExplicit.set","parameters.bodyoptionality.models.BodyModel":"Parameters.BodyOptionality.BodyModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/bodyoptionality/BodyOptionalityAsyncClient.java","src/main/java/parameters/bodyoptionality/BodyOptionalityClient.java","src/main/java/parameters/bodyoptionality/BodyOptionalityClientBuilder.java","src/main/java/parameters/bodyoptionality/OptionalExplicitAsyncClient.java","src/main/java/parameters/bodyoptionality/OptionalExplicitClient.java","src/main/java/parameters/bodyoptionality/implementation/BodyOptionalityClientImpl.java","src/main/java/parameters/bodyoptionality/implementation/OptionalExplicitsImpl.java","src/main/java/parameters/bodyoptionality/implementation/package-info.java","src/main/java/parameters/bodyoptionality/models/BodyModel.java","src/main/java/parameters/bodyoptionality/models/package-info.java","src/main/java/parameters/bodyoptionality/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-collectionformat_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-collectionformat_apiview_properties.json deleted file mode 100644 index 22010c897f1..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-collectionformat_apiview_properties.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "parameters.collectionformat.CollectionFormatClientBuilder": "Parameters.CollectionFormat", - "parameters.collectionformat.HeaderAsyncClient": "Parameters.CollectionFormat.Header", - "parameters.collectionformat.HeaderAsyncClient.csv": "Parameters.CollectionFormat.Header.csv", - "parameters.collectionformat.HeaderAsyncClient.csvWithResponse": "Parameters.CollectionFormat.Header.csv", - "parameters.collectionformat.HeaderClient": "Parameters.CollectionFormat.Header", - "parameters.collectionformat.HeaderClient.csv": "Parameters.CollectionFormat.Header.csv", - "parameters.collectionformat.HeaderClient.csvWithResponse": "Parameters.CollectionFormat.Header.csv", - "parameters.collectionformat.QueryAsyncClient": "Parameters.CollectionFormat.Query", - "parameters.collectionformat.QueryAsyncClient.csv": "Parameters.CollectionFormat.Query.csv", - "parameters.collectionformat.QueryAsyncClient.csvWithResponse": "Parameters.CollectionFormat.Query.csv", - "parameters.collectionformat.QueryAsyncClient.multi": "Parameters.CollectionFormat.Query.multi", - "parameters.collectionformat.QueryAsyncClient.multiWithResponse": "Parameters.CollectionFormat.Query.multi", - "parameters.collectionformat.QueryAsyncClient.pipes": "Parameters.CollectionFormat.Query.pipes", - "parameters.collectionformat.QueryAsyncClient.pipesWithResponse": "Parameters.CollectionFormat.Query.pipes", - "parameters.collectionformat.QueryAsyncClient.ssv": "Parameters.CollectionFormat.Query.ssv", - "parameters.collectionformat.QueryAsyncClient.ssvWithResponse": "Parameters.CollectionFormat.Query.ssv", - "parameters.collectionformat.QueryClient": "Parameters.CollectionFormat.Query", - "parameters.collectionformat.QueryClient.csv": "Parameters.CollectionFormat.Query.csv", - "parameters.collectionformat.QueryClient.csvWithResponse": "Parameters.CollectionFormat.Query.csv", - "parameters.collectionformat.QueryClient.multi": "Parameters.CollectionFormat.Query.multi", - "parameters.collectionformat.QueryClient.multiWithResponse": "Parameters.CollectionFormat.Query.multi", - "parameters.collectionformat.QueryClient.pipes": "Parameters.CollectionFormat.Query.pipes", - "parameters.collectionformat.QueryClient.pipesWithResponse": "Parameters.CollectionFormat.Query.pipes", - "parameters.collectionformat.QueryClient.ssv": "Parameters.CollectionFormat.Query.ssv", - "parameters.collectionformat.QueryClient.ssvWithResponse": "Parameters.CollectionFormat.Query.ssv" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-collectionformat_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-collectionformat_metadata.json index e105e86b5f3..54b5a883a6a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-collectionformat_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-collectionformat_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"parameters.collectionformat.CollectionFormatClientBuilder":"Parameters.CollectionFormat","parameters.collectionformat.HeaderAsyncClient":"Parameters.CollectionFormat.Header","parameters.collectionformat.HeaderAsyncClient.csv":"Parameters.CollectionFormat.Header.csv","parameters.collectionformat.HeaderAsyncClient.csvWithResponse":"Parameters.CollectionFormat.Header.csv","parameters.collectionformat.HeaderClient":"Parameters.CollectionFormat.Header","parameters.collectionformat.HeaderClient.csv":"Parameters.CollectionFormat.Header.csv","parameters.collectionformat.HeaderClient.csvWithResponse":"Parameters.CollectionFormat.Header.csv","parameters.collectionformat.QueryAsyncClient":"Parameters.CollectionFormat.Query","parameters.collectionformat.QueryAsyncClient.csv":"Parameters.CollectionFormat.Query.csv","parameters.collectionformat.QueryAsyncClient.csvWithResponse":"Parameters.CollectionFormat.Query.csv","parameters.collectionformat.QueryAsyncClient.multi":"Parameters.CollectionFormat.Query.multi","parameters.collectionformat.QueryAsyncClient.multiWithResponse":"Parameters.CollectionFormat.Query.multi","parameters.collectionformat.QueryAsyncClient.pipes":"Parameters.CollectionFormat.Query.pipes","parameters.collectionformat.QueryAsyncClient.pipesWithResponse":"Parameters.CollectionFormat.Query.pipes","parameters.collectionformat.QueryAsyncClient.ssv":"Parameters.CollectionFormat.Query.ssv","parameters.collectionformat.QueryAsyncClient.ssvWithResponse":"Parameters.CollectionFormat.Query.ssv","parameters.collectionformat.QueryClient":"Parameters.CollectionFormat.Query","parameters.collectionformat.QueryClient.csv":"Parameters.CollectionFormat.Query.csv","parameters.collectionformat.QueryClient.csvWithResponse":"Parameters.CollectionFormat.Query.csv","parameters.collectionformat.QueryClient.multi":"Parameters.CollectionFormat.Query.multi","parameters.collectionformat.QueryClient.multiWithResponse":"Parameters.CollectionFormat.Query.multi","parameters.collectionformat.QueryClient.pipes":"Parameters.CollectionFormat.Query.pipes","parameters.collectionformat.QueryClient.pipesWithResponse":"Parameters.CollectionFormat.Query.pipes","parameters.collectionformat.QueryClient.ssv":"Parameters.CollectionFormat.Query.ssv","parameters.collectionformat.QueryClient.ssvWithResponse":"Parameters.CollectionFormat.Query.ssv"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/collectionformat/CollectionFormatClientBuilder.java","src/main/java/parameters/collectionformat/HeaderAsyncClient.java","src/main/java/parameters/collectionformat/HeaderClient.java","src/main/java/parameters/collectionformat/QueryAsyncClient.java","src/main/java/parameters/collectionformat/QueryClient.java","src/main/java/parameters/collectionformat/implementation/CollectionFormatClientImpl.java","src/main/java/parameters/collectionformat/implementation/HeadersImpl.java","src/main/java/parameters/collectionformat/implementation/QueriesImpl.java","src/main/java/parameters/collectionformat/implementation/package-info.java","src/main/java/parameters/collectionformat/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"parameters.collectionformat.CollectionFormatClientBuilder":"Parameters.CollectionFormat","parameters.collectionformat.HeaderAsyncClient":"Parameters.CollectionFormat.Header","parameters.collectionformat.HeaderAsyncClient.csv":"Parameters.CollectionFormat.Header.csv","parameters.collectionformat.HeaderAsyncClient.csvWithResponse":"Parameters.CollectionFormat.Header.csv","parameters.collectionformat.HeaderClient":"Parameters.CollectionFormat.Header","parameters.collectionformat.HeaderClient.csv":"Parameters.CollectionFormat.Header.csv","parameters.collectionformat.HeaderClient.csvWithResponse":"Parameters.CollectionFormat.Header.csv","parameters.collectionformat.QueryAsyncClient":"Parameters.CollectionFormat.Query","parameters.collectionformat.QueryAsyncClient.csv":"Parameters.CollectionFormat.Query.csv","parameters.collectionformat.QueryAsyncClient.csvWithResponse":"Parameters.CollectionFormat.Query.csv","parameters.collectionformat.QueryAsyncClient.multi":"Parameters.CollectionFormat.Query.multi","parameters.collectionformat.QueryAsyncClient.multiWithResponse":"Parameters.CollectionFormat.Query.multi","parameters.collectionformat.QueryAsyncClient.pipes":"Parameters.CollectionFormat.Query.pipes","parameters.collectionformat.QueryAsyncClient.pipesWithResponse":"Parameters.CollectionFormat.Query.pipes","parameters.collectionformat.QueryAsyncClient.ssv":"Parameters.CollectionFormat.Query.ssv","parameters.collectionformat.QueryAsyncClient.ssvWithResponse":"Parameters.CollectionFormat.Query.ssv","parameters.collectionformat.QueryClient":"Parameters.CollectionFormat.Query","parameters.collectionformat.QueryClient.csv":"Parameters.CollectionFormat.Query.csv","parameters.collectionformat.QueryClient.csvWithResponse":"Parameters.CollectionFormat.Query.csv","parameters.collectionformat.QueryClient.multi":"Parameters.CollectionFormat.Query.multi","parameters.collectionformat.QueryClient.multiWithResponse":"Parameters.CollectionFormat.Query.multi","parameters.collectionformat.QueryClient.pipes":"Parameters.CollectionFormat.Query.pipes","parameters.collectionformat.QueryClient.pipesWithResponse":"Parameters.CollectionFormat.Query.pipes","parameters.collectionformat.QueryClient.ssv":"Parameters.CollectionFormat.Query.ssv","parameters.collectionformat.QueryClient.ssvWithResponse":"Parameters.CollectionFormat.Query.ssv"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/collectionformat/CollectionFormatClientBuilder.java","src/main/java/parameters/collectionformat/HeaderAsyncClient.java","src/main/java/parameters/collectionformat/HeaderClient.java","src/main/java/parameters/collectionformat/QueryAsyncClient.java","src/main/java/parameters/collectionformat/QueryClient.java","src/main/java/parameters/collectionformat/implementation/CollectionFormatClientImpl.java","src/main/java/parameters/collectionformat/implementation/HeadersImpl.java","src/main/java/parameters/collectionformat/implementation/QueriesImpl.java","src/main/java/parameters/collectionformat/implementation/package-info.java","src/main/java/parameters/collectionformat/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-path_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-path_apiview_properties.json deleted file mode 100644 index 66d5687efad..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-path_apiview_properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "parameters.path.PathAsyncClient": "Parameters.Path", - "parameters.path.PathAsyncClient.normal": "Parameters.Path.normal", - "parameters.path.PathAsyncClient.normalWithResponse": "Parameters.Path.normal", - "parameters.path.PathAsyncClient.optional": "Parameters.Path.optional", - "parameters.path.PathAsyncClient.optionalWithResponse": "Parameters.Path.optional", - "parameters.path.PathClient": "Parameters.Path", - "parameters.path.PathClient.normal": "Parameters.Path.normal", - "parameters.path.PathClient.normalWithResponse": "Parameters.Path.normal", - "parameters.path.PathClient.optional": "Parameters.Path.optional", - "parameters.path.PathClient.optionalWithResponse": "Parameters.Path.optional", - "parameters.path.PathClientBuilder": "Parameters.Path" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-path_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-path_metadata.json index 02ff582ae64..1f2bfb767c5 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-path_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-path_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"parameters.path.PathAsyncClient":"Parameters.Path","parameters.path.PathAsyncClient.normal":"Parameters.Path.normal","parameters.path.PathAsyncClient.normalWithResponse":"Parameters.Path.normal","parameters.path.PathAsyncClient.optional":"Parameters.Path.optional","parameters.path.PathAsyncClient.optionalWithResponse":"Parameters.Path.optional","parameters.path.PathClient":"Parameters.Path","parameters.path.PathClient.normal":"Parameters.Path.normal","parameters.path.PathClient.normalWithResponse":"Parameters.Path.normal","parameters.path.PathClient.optional":"Parameters.Path.optional","parameters.path.PathClient.optionalWithResponse":"Parameters.Path.optional","parameters.path.PathClientBuilder":"Parameters.Path"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/path/PathAsyncClient.java","src/main/java/parameters/path/PathClient.java","src/main/java/parameters/path/PathClientBuilder.java","src/main/java/parameters/path/implementation/PathClientImpl.java","src/main/java/parameters/path/implementation/package-info.java","src/main/java/parameters/path/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"parameters.path.PathAsyncClient":"Parameters.Path","parameters.path.PathAsyncClient.normal":"Parameters.Path.normal","parameters.path.PathAsyncClient.normalWithResponse":"Parameters.Path.normal","parameters.path.PathAsyncClient.optional":"Parameters.Path.optional","parameters.path.PathAsyncClient.optionalWithResponse":"Parameters.Path.optional","parameters.path.PathClient":"Parameters.Path","parameters.path.PathClient.normal":"Parameters.Path.normal","parameters.path.PathClient.normalWithResponse":"Parameters.Path.normal","parameters.path.PathClient.optional":"Parameters.Path.optional","parameters.path.PathClient.optionalWithResponse":"Parameters.Path.optional","parameters.path.PathClientBuilder":"Parameters.Path"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/path/PathAsyncClient.java","src/main/java/parameters/path/PathClient.java","src/main/java/parameters/path/PathClientBuilder.java","src/main/java/parameters/path/implementation/PathClientImpl.java","src/main/java/parameters/path/implementation/package-info.java","src/main/java/parameters/path/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-query_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-query_apiview_properties.json deleted file mode 100644 index e3d5c5a2da8..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-query_apiview_properties.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "parameters.query.QueryAsyncClient": "Parameters.Query.Constant", - "parameters.query.QueryAsyncClient.post": "Parameters.Query.Constant.post", - "parameters.query.QueryAsyncClient.postWithResponse": "Parameters.Query.Constant.post", - "parameters.query.QueryClient": "Parameters.Query.Constant", - "parameters.query.QueryClient.post": "Parameters.Query.Constant.post", - "parameters.query.QueryClient.postWithResponse": "Parameters.Query.Constant.post", - "parameters.query.QueryClientBuilder": "Parameters.Query" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-query_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-query_metadata.json index de0f4efb488..bcea2b2bf2f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-query_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-query_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"parameters.query.QueryAsyncClient":"Parameters.Query.Constant","parameters.query.QueryAsyncClient.post":"Parameters.Query.Constant.post","parameters.query.QueryAsyncClient.postWithResponse":"Parameters.Query.Constant.post","parameters.query.QueryClient":"Parameters.Query.Constant","parameters.query.QueryClient.post":"Parameters.Query.Constant.post","parameters.query.QueryClient.postWithResponse":"Parameters.Query.Constant.post","parameters.query.QueryClientBuilder":"Parameters.Query"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/query/QueryAsyncClient.java","src/main/java/parameters/query/QueryClient.java","src/main/java/parameters/query/QueryClientBuilder.java","src/main/java/parameters/query/implementation/ConstantsImpl.java","src/main/java/parameters/query/implementation/QueryClientImpl.java","src/main/java/parameters/query/implementation/package-info.java","src/main/java/parameters/query/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"parameters.query.QueryAsyncClient":"Parameters.Query.Constant","parameters.query.QueryAsyncClient.post":"Parameters.Query.Constant.post","parameters.query.QueryAsyncClient.postWithResponse":"Parameters.Query.Constant.post","parameters.query.QueryClient":"Parameters.Query.Constant","parameters.query.QueryClient.post":"Parameters.Query.Constant.post","parameters.query.QueryClient.postWithResponse":"Parameters.Query.Constant.post","parameters.query.QueryClientBuilder":"Parameters.Query"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/query/QueryAsyncClient.java","src/main/java/parameters/query/QueryClient.java","src/main/java/parameters/query/QueryClientBuilder.java","src/main/java/parameters/query/implementation/ConstantsImpl.java","src/main/java/parameters/query/implementation/QueryClientImpl.java","src/main/java/parameters/query/implementation/package-info.java","src/main/java/parameters/query/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-spread_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-spread_apiview_properties.json deleted file mode 100644 index 94bb7ef9d28..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-spread_apiview_properties.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "parameters.spread.AliasAsyncClient": "Parameters.Spread.Alias", - "parameters.spread.AliasAsyncClient.spreadAsRequestBody": "Parameters.Spread.Alias.spreadAsRequestBody", - "parameters.spread.AliasAsyncClient.spreadAsRequestBodyWithResponse": "Parameters.Spread.Alias.spreadAsRequestBody", - "parameters.spread.AliasAsyncClient.spreadAsRequestParameter": "Parameters.Spread.Alias.spreadAsRequestParameter", - "parameters.spread.AliasAsyncClient.spreadAsRequestParameterWithResponse": "Parameters.Spread.Alias.spreadAsRequestParameter", - "parameters.spread.AliasAsyncClient.spreadParameterWithInnerAlias": "Parameters.Spread.Alias.spreadParameterWithInnerAlias", - "parameters.spread.AliasAsyncClient.spreadParameterWithInnerAliasWithResponse": "Parameters.Spread.Alias.spreadParameterWithInnerAlias", - "parameters.spread.AliasAsyncClient.spreadParameterWithInnerModel": "Parameters.Spread.Alias.spreadParameterWithInnerModel", - "parameters.spread.AliasAsyncClient.spreadParameterWithInnerModelWithResponse": "Parameters.Spread.Alias.spreadParameterWithInnerModel", - "parameters.spread.AliasAsyncClient.spreadWithMultipleParameters": "Parameters.Spread.Alias.spreadWithMultipleParameters", - "parameters.spread.AliasAsyncClient.spreadWithMultipleParametersWithResponse": "Parameters.Spread.Alias.spreadWithMultipleParameters", - "parameters.spread.AliasClient": "Parameters.Spread.Alias", - "parameters.spread.AliasClient.spreadAsRequestBody": "Parameters.Spread.Alias.spreadAsRequestBody", - "parameters.spread.AliasClient.spreadAsRequestBodyWithResponse": "Parameters.Spread.Alias.spreadAsRequestBody", - "parameters.spread.AliasClient.spreadAsRequestParameter": "Parameters.Spread.Alias.spreadAsRequestParameter", - "parameters.spread.AliasClient.spreadAsRequestParameterWithResponse": "Parameters.Spread.Alias.spreadAsRequestParameter", - "parameters.spread.AliasClient.spreadParameterWithInnerAlias": "Parameters.Spread.Alias.spreadParameterWithInnerAlias", - "parameters.spread.AliasClient.spreadParameterWithInnerAliasWithResponse": "Parameters.Spread.Alias.spreadParameterWithInnerAlias", - "parameters.spread.AliasClient.spreadParameterWithInnerModel": "Parameters.Spread.Alias.spreadParameterWithInnerModel", - "parameters.spread.AliasClient.spreadParameterWithInnerModelWithResponse": "Parameters.Spread.Alias.spreadParameterWithInnerModel", - "parameters.spread.AliasClient.spreadWithMultipleParameters": "Parameters.Spread.Alias.spreadWithMultipleParameters", - "parameters.spread.AliasClient.spreadWithMultipleParametersWithResponse": "Parameters.Spread.Alias.spreadWithMultipleParameters", - "parameters.spread.ModelAsyncClient": "Parameters.Spread.Model", - "parameters.spread.ModelAsyncClient.spreadAsRequestBody": "Parameters.Spread.Model.spreadAsRequestBody", - "parameters.spread.ModelAsyncClient.spreadAsRequestBodyWithResponse": "Parameters.Spread.Model.spreadAsRequestBody", - "parameters.spread.ModelAsyncClient.spreadCompositeRequest": "Parameters.Spread.Model.spreadCompositeRequest", - "parameters.spread.ModelAsyncClient.spreadCompositeRequestMix": "Parameters.Spread.Model.spreadCompositeRequestMix", - "parameters.spread.ModelAsyncClient.spreadCompositeRequestMixWithResponse": "Parameters.Spread.Model.spreadCompositeRequestMix", - "parameters.spread.ModelAsyncClient.spreadCompositeRequestOnlyWithBody": "Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody", - "parameters.spread.ModelAsyncClient.spreadCompositeRequestOnlyWithBodyWithResponse": "Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody", - "parameters.spread.ModelAsyncClient.spreadCompositeRequestWithResponse": "Parameters.Spread.Model.spreadCompositeRequest", - "parameters.spread.ModelAsyncClient.spreadCompositeRequestWithoutBody": "Parameters.Spread.Model.spreadCompositeRequestWithoutBody", - "parameters.spread.ModelAsyncClient.spreadCompositeRequestWithoutBodyWithResponse": "Parameters.Spread.Model.spreadCompositeRequestWithoutBody", - "parameters.spread.ModelClient": "Parameters.Spread.Model", - "parameters.spread.ModelClient.spreadAsRequestBody": "Parameters.Spread.Model.spreadAsRequestBody", - "parameters.spread.ModelClient.spreadAsRequestBodyWithResponse": "Parameters.Spread.Model.spreadAsRequestBody", - "parameters.spread.ModelClient.spreadCompositeRequest": "Parameters.Spread.Model.spreadCompositeRequest", - "parameters.spread.ModelClient.spreadCompositeRequestMix": "Parameters.Spread.Model.spreadCompositeRequestMix", - "parameters.spread.ModelClient.spreadCompositeRequestMixWithResponse": "Parameters.Spread.Model.spreadCompositeRequestMix", - "parameters.spread.ModelClient.spreadCompositeRequestOnlyWithBody": "Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody", - "parameters.spread.ModelClient.spreadCompositeRequestOnlyWithBodyWithResponse": "Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody", - "parameters.spread.ModelClient.spreadCompositeRequestWithResponse": "Parameters.Spread.Model.spreadCompositeRequest", - "parameters.spread.ModelClient.spreadCompositeRequestWithoutBody": "Parameters.Spread.Model.spreadCompositeRequestWithoutBody", - "parameters.spread.ModelClient.spreadCompositeRequestWithoutBodyWithResponse": "Parameters.Spread.Model.spreadCompositeRequestWithoutBody", - "parameters.spread.SpreadClientBuilder": "Parameters.Spread", - "parameters.spread.alias.implementation.models.SpreadAsRequestBodyRequest": "Parameters.Spread.Alias.spreadAsRequestBody.Request.anonymous", - "parameters.spread.implementation.models.SpreadAsRequestParameterRequest": "Parameters.Spread.Alias.spreadAsRequestParameter.Request.anonymous", - "parameters.spread.implementation.models.SpreadCompositeRequestMixRequest": "Parameters.Spread.Model.spreadCompositeRequestMix.Request.anonymous", - "parameters.spread.implementation.models.SpreadParameterWithInnerAliasRequest": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.Request.anonymous", - "parameters.spread.implementation.models.SpreadParameterWithInnerModelRequest": "Parameters.Spread.Alias.spreadParameterWithInnerModel.Request.anonymous", - "parameters.spread.implementation.models.SpreadWithMultipleParametersRequest": "Parameters.Spread.Alias.spreadWithMultipleParameters.Request.anonymous", - "parameters.spread.model.models.BodyParameter": "Parameters.Spread.Model.BodyParameter" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-spread_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-spread_metadata.json index d746a4940bb..d1b94f139aa 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-spread_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/parameters-spread_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"parameters.spread.AliasAsyncClient":"Parameters.Spread.Alias","parameters.spread.AliasAsyncClient.spreadAsRequestBody":"Parameters.Spread.Alias.spreadAsRequestBody","parameters.spread.AliasAsyncClient.spreadAsRequestBodyWithResponse":"Parameters.Spread.Alias.spreadAsRequestBody","parameters.spread.AliasAsyncClient.spreadAsRequestParameter":"Parameters.Spread.Alias.spreadAsRequestParameter","parameters.spread.AliasAsyncClient.spreadAsRequestParameterWithResponse":"Parameters.Spread.Alias.spreadAsRequestParameter","parameters.spread.AliasAsyncClient.spreadParameterWithInnerAlias":"Parameters.Spread.Alias.spreadParameterWithInnerAlias","parameters.spread.AliasAsyncClient.spreadParameterWithInnerAliasWithResponse":"Parameters.Spread.Alias.spreadParameterWithInnerAlias","parameters.spread.AliasAsyncClient.spreadParameterWithInnerModel":"Parameters.Spread.Alias.spreadParameterWithInnerModel","parameters.spread.AliasAsyncClient.spreadParameterWithInnerModelWithResponse":"Parameters.Spread.Alias.spreadParameterWithInnerModel","parameters.spread.AliasAsyncClient.spreadWithMultipleParameters":"Parameters.Spread.Alias.spreadWithMultipleParameters","parameters.spread.AliasAsyncClient.spreadWithMultipleParametersWithResponse":"Parameters.Spread.Alias.spreadWithMultipleParameters","parameters.spread.AliasClient":"Parameters.Spread.Alias","parameters.spread.AliasClient.spreadAsRequestBody":"Parameters.Spread.Alias.spreadAsRequestBody","parameters.spread.AliasClient.spreadAsRequestBodyWithResponse":"Parameters.Spread.Alias.spreadAsRequestBody","parameters.spread.AliasClient.spreadAsRequestParameter":"Parameters.Spread.Alias.spreadAsRequestParameter","parameters.spread.AliasClient.spreadAsRequestParameterWithResponse":"Parameters.Spread.Alias.spreadAsRequestParameter","parameters.spread.AliasClient.spreadParameterWithInnerAlias":"Parameters.Spread.Alias.spreadParameterWithInnerAlias","parameters.spread.AliasClient.spreadParameterWithInnerAliasWithResponse":"Parameters.Spread.Alias.spreadParameterWithInnerAlias","parameters.spread.AliasClient.spreadParameterWithInnerModel":"Parameters.Spread.Alias.spreadParameterWithInnerModel","parameters.spread.AliasClient.spreadParameterWithInnerModelWithResponse":"Parameters.Spread.Alias.spreadParameterWithInnerModel","parameters.spread.AliasClient.spreadWithMultipleParameters":"Parameters.Spread.Alias.spreadWithMultipleParameters","parameters.spread.AliasClient.spreadWithMultipleParametersWithResponse":"Parameters.Spread.Alias.spreadWithMultipleParameters","parameters.spread.ModelAsyncClient":"Parameters.Spread.Model","parameters.spread.ModelAsyncClient.spreadAsRequestBody":"Parameters.Spread.Model.spreadAsRequestBody","parameters.spread.ModelAsyncClient.spreadAsRequestBodyWithResponse":"Parameters.Spread.Model.spreadAsRequestBody","parameters.spread.ModelAsyncClient.spreadCompositeRequest":"Parameters.Spread.Model.spreadCompositeRequest","parameters.spread.ModelAsyncClient.spreadCompositeRequestMix":"Parameters.Spread.Model.spreadCompositeRequestMix","parameters.spread.ModelAsyncClient.spreadCompositeRequestMixWithResponse":"Parameters.Spread.Model.spreadCompositeRequestMix","parameters.spread.ModelAsyncClient.spreadCompositeRequestOnlyWithBody":"Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody","parameters.spread.ModelAsyncClient.spreadCompositeRequestOnlyWithBodyWithResponse":"Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody","parameters.spread.ModelAsyncClient.spreadCompositeRequestWithResponse":"Parameters.Spread.Model.spreadCompositeRequest","parameters.spread.ModelAsyncClient.spreadCompositeRequestWithoutBody":"Parameters.Spread.Model.spreadCompositeRequestWithoutBody","parameters.spread.ModelAsyncClient.spreadCompositeRequestWithoutBodyWithResponse":"Parameters.Spread.Model.spreadCompositeRequestWithoutBody","parameters.spread.ModelClient":"Parameters.Spread.Model","parameters.spread.ModelClient.spreadAsRequestBody":"Parameters.Spread.Model.spreadAsRequestBody","parameters.spread.ModelClient.spreadAsRequestBodyWithResponse":"Parameters.Spread.Model.spreadAsRequestBody","parameters.spread.ModelClient.spreadCompositeRequest":"Parameters.Spread.Model.spreadCompositeRequest","parameters.spread.ModelClient.spreadCompositeRequestMix":"Parameters.Spread.Model.spreadCompositeRequestMix","parameters.spread.ModelClient.spreadCompositeRequestMixWithResponse":"Parameters.Spread.Model.spreadCompositeRequestMix","parameters.spread.ModelClient.spreadCompositeRequestOnlyWithBody":"Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody","parameters.spread.ModelClient.spreadCompositeRequestOnlyWithBodyWithResponse":"Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody","parameters.spread.ModelClient.spreadCompositeRequestWithResponse":"Parameters.Spread.Model.spreadCompositeRequest","parameters.spread.ModelClient.spreadCompositeRequestWithoutBody":"Parameters.Spread.Model.spreadCompositeRequestWithoutBody","parameters.spread.ModelClient.spreadCompositeRequestWithoutBodyWithResponse":"Parameters.Spread.Model.spreadCompositeRequestWithoutBody","parameters.spread.SpreadClientBuilder":"Parameters.Spread","parameters.spread.alias.implementation.models.SpreadAsRequestBodyRequest":"Parameters.Spread.Alias.spreadAsRequestBody.Request.anonymous","parameters.spread.implementation.models.SpreadAsRequestParameterRequest":"Parameters.Spread.Alias.spreadAsRequestParameter.Request.anonymous","parameters.spread.implementation.models.SpreadCompositeRequestMixRequest":"Parameters.Spread.Model.spreadCompositeRequestMix.Request.anonymous","parameters.spread.implementation.models.SpreadParameterWithInnerAliasRequest":"Parameters.Spread.Alias.spreadParameterWithInnerAlias.Request.anonymous","parameters.spread.implementation.models.SpreadParameterWithInnerModelRequest":"Parameters.Spread.Alias.spreadParameterWithInnerModel.Request.anonymous","parameters.spread.implementation.models.SpreadWithMultipleParametersRequest":"Parameters.Spread.Alias.spreadWithMultipleParameters.Request.anonymous","parameters.spread.model.models.BodyParameter":"Parameters.Spread.Model.BodyParameter"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/spread/AliasAsyncClient.java","src/main/java/parameters/spread/AliasClient.java","src/main/java/parameters/spread/ModelAsyncClient.java","src/main/java/parameters/spread/ModelClient.java","src/main/java/parameters/spread/SpreadClientBuilder.java","src/main/java/parameters/spread/alias/implementation/models/SpreadAsRequestBodyRequest.java","src/main/java/parameters/spread/alias/implementation/models/package-info.java","src/main/java/parameters/spread/implementation/AliasImpl.java","src/main/java/parameters/spread/implementation/ModelsImpl.java","src/main/java/parameters/spread/implementation/SpreadClientImpl.java","src/main/java/parameters/spread/implementation/models/SpreadAsRequestParameterRequest.java","src/main/java/parameters/spread/implementation/models/SpreadCompositeRequestMixRequest.java","src/main/java/parameters/spread/implementation/models/SpreadParameterWithInnerAliasRequest.java","src/main/java/parameters/spread/implementation/models/SpreadParameterWithInnerModelRequest.java","src/main/java/parameters/spread/implementation/models/SpreadWithMultipleParametersRequest.java","src/main/java/parameters/spread/implementation/models/package-info.java","src/main/java/parameters/spread/implementation/package-info.java","src/main/java/parameters/spread/model/models/BodyParameter.java","src/main/java/parameters/spread/model/models/package-info.java","src/main/java/parameters/spread/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"parameters.spread.AliasAsyncClient":"Parameters.Spread.Alias","parameters.spread.AliasAsyncClient.spreadAsRequestBody":"Parameters.Spread.Alias.spreadAsRequestBody","parameters.spread.AliasAsyncClient.spreadAsRequestBodyWithResponse":"Parameters.Spread.Alias.spreadAsRequestBody","parameters.spread.AliasAsyncClient.spreadAsRequestParameter":"Parameters.Spread.Alias.spreadAsRequestParameter","parameters.spread.AliasAsyncClient.spreadAsRequestParameterWithResponse":"Parameters.Spread.Alias.spreadAsRequestParameter","parameters.spread.AliasAsyncClient.spreadParameterWithInnerAlias":"Parameters.Spread.Alias.spreadParameterWithInnerAlias","parameters.spread.AliasAsyncClient.spreadParameterWithInnerAliasWithResponse":"Parameters.Spread.Alias.spreadParameterWithInnerAlias","parameters.spread.AliasAsyncClient.spreadParameterWithInnerModel":"Parameters.Spread.Alias.spreadParameterWithInnerModel","parameters.spread.AliasAsyncClient.spreadParameterWithInnerModelWithResponse":"Parameters.Spread.Alias.spreadParameterWithInnerModel","parameters.spread.AliasAsyncClient.spreadWithMultipleParameters":"Parameters.Spread.Alias.spreadWithMultipleParameters","parameters.spread.AliasAsyncClient.spreadWithMultipleParametersWithResponse":"Parameters.Spread.Alias.spreadWithMultipleParameters","parameters.spread.AliasClient":"Parameters.Spread.Alias","parameters.spread.AliasClient.spreadAsRequestBody":"Parameters.Spread.Alias.spreadAsRequestBody","parameters.spread.AliasClient.spreadAsRequestBodyWithResponse":"Parameters.Spread.Alias.spreadAsRequestBody","parameters.spread.AliasClient.spreadAsRequestParameter":"Parameters.Spread.Alias.spreadAsRequestParameter","parameters.spread.AliasClient.spreadAsRequestParameterWithResponse":"Parameters.Spread.Alias.spreadAsRequestParameter","parameters.spread.AliasClient.spreadParameterWithInnerAlias":"Parameters.Spread.Alias.spreadParameterWithInnerAlias","parameters.spread.AliasClient.spreadParameterWithInnerAliasWithResponse":"Parameters.Spread.Alias.spreadParameterWithInnerAlias","parameters.spread.AliasClient.spreadParameterWithInnerModel":"Parameters.Spread.Alias.spreadParameterWithInnerModel","parameters.spread.AliasClient.spreadParameterWithInnerModelWithResponse":"Parameters.Spread.Alias.spreadParameterWithInnerModel","parameters.spread.AliasClient.spreadWithMultipleParameters":"Parameters.Spread.Alias.spreadWithMultipleParameters","parameters.spread.AliasClient.spreadWithMultipleParametersWithResponse":"Parameters.Spread.Alias.spreadWithMultipleParameters","parameters.spread.ModelAsyncClient":"Parameters.Spread.Model","parameters.spread.ModelAsyncClient.spreadAsRequestBody":"Parameters.Spread.Model.spreadAsRequestBody","parameters.spread.ModelAsyncClient.spreadAsRequestBodyWithResponse":"Parameters.Spread.Model.spreadAsRequestBody","parameters.spread.ModelAsyncClient.spreadCompositeRequest":"Parameters.Spread.Model.spreadCompositeRequest","parameters.spread.ModelAsyncClient.spreadCompositeRequestMix":"Parameters.Spread.Model.spreadCompositeRequestMix","parameters.spread.ModelAsyncClient.spreadCompositeRequestMixWithResponse":"Parameters.Spread.Model.spreadCompositeRequestMix","parameters.spread.ModelAsyncClient.spreadCompositeRequestOnlyWithBody":"Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody","parameters.spread.ModelAsyncClient.spreadCompositeRequestOnlyWithBodyWithResponse":"Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody","parameters.spread.ModelAsyncClient.spreadCompositeRequestWithResponse":"Parameters.Spread.Model.spreadCompositeRequest","parameters.spread.ModelAsyncClient.spreadCompositeRequestWithoutBody":"Parameters.Spread.Model.spreadCompositeRequestWithoutBody","parameters.spread.ModelAsyncClient.spreadCompositeRequestWithoutBodyWithResponse":"Parameters.Spread.Model.spreadCompositeRequestWithoutBody","parameters.spread.ModelClient":"Parameters.Spread.Model","parameters.spread.ModelClient.spreadAsRequestBody":"Parameters.Spread.Model.spreadAsRequestBody","parameters.spread.ModelClient.spreadAsRequestBodyWithResponse":"Parameters.Spread.Model.spreadAsRequestBody","parameters.spread.ModelClient.spreadCompositeRequest":"Parameters.Spread.Model.spreadCompositeRequest","parameters.spread.ModelClient.spreadCompositeRequestMix":"Parameters.Spread.Model.spreadCompositeRequestMix","parameters.spread.ModelClient.spreadCompositeRequestMixWithResponse":"Parameters.Spread.Model.spreadCompositeRequestMix","parameters.spread.ModelClient.spreadCompositeRequestOnlyWithBody":"Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody","parameters.spread.ModelClient.spreadCompositeRequestOnlyWithBodyWithResponse":"Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody","parameters.spread.ModelClient.spreadCompositeRequestWithResponse":"Parameters.Spread.Model.spreadCompositeRequest","parameters.spread.ModelClient.spreadCompositeRequestWithoutBody":"Parameters.Spread.Model.spreadCompositeRequestWithoutBody","parameters.spread.ModelClient.spreadCompositeRequestWithoutBodyWithResponse":"Parameters.Spread.Model.spreadCompositeRequestWithoutBody","parameters.spread.SpreadClientBuilder":"Parameters.Spread","parameters.spread.alias.implementation.models.SpreadAsRequestBodyRequest":"Parameters.Spread.Alias.spreadAsRequestBody.Request.anonymous","parameters.spread.implementation.models.SpreadAsRequestParameterRequest":"Parameters.Spread.Alias.spreadAsRequestParameter.Request.anonymous","parameters.spread.implementation.models.SpreadCompositeRequestMixRequest":"Parameters.Spread.Model.spreadCompositeRequestMix.Request.anonymous","parameters.spread.implementation.models.SpreadParameterWithInnerAliasRequest":"Parameters.Spread.Alias.spreadParameterWithInnerAlias.Request.anonymous","parameters.spread.implementation.models.SpreadParameterWithInnerModelRequest":"Parameters.Spread.Alias.spreadParameterWithInnerModel.Request.anonymous","parameters.spread.implementation.models.SpreadWithMultipleParametersRequest":"Parameters.Spread.Alias.spreadWithMultipleParameters.Request.anonymous","parameters.spread.model.models.BodyParameter":"Parameters.Spread.Model.BodyParameter"},"generatedFiles":["src/main/java/module-info.java","src/main/java/parameters/spread/AliasAsyncClient.java","src/main/java/parameters/spread/AliasClient.java","src/main/java/parameters/spread/ModelAsyncClient.java","src/main/java/parameters/spread/ModelClient.java","src/main/java/parameters/spread/SpreadClientBuilder.java","src/main/java/parameters/spread/alias/implementation/models/SpreadAsRequestBodyRequest.java","src/main/java/parameters/spread/alias/implementation/models/package-info.java","src/main/java/parameters/spread/implementation/AliasImpl.java","src/main/java/parameters/spread/implementation/ModelsImpl.java","src/main/java/parameters/spread/implementation/SpreadClientImpl.java","src/main/java/parameters/spread/implementation/models/SpreadAsRequestParameterRequest.java","src/main/java/parameters/spread/implementation/models/SpreadCompositeRequestMixRequest.java","src/main/java/parameters/spread/implementation/models/SpreadParameterWithInnerAliasRequest.java","src/main/java/parameters/spread/implementation/models/SpreadParameterWithInnerModelRequest.java","src/main/java/parameters/spread/implementation/models/SpreadWithMultipleParametersRequest.java","src/main/java/parameters/spread/implementation/models/package-info.java","src/main/java/parameters/spread/implementation/package-info.java","src/main/java/parameters/spread/model/models/BodyParameter.java","src/main/java/parameters/spread/model/models/package-info.java","src/main/java/parameters/spread/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-contentnegotiation_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-contentnegotiation_apiview_properties.json deleted file mode 100644 index a545c0caa95..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-contentnegotiation_apiview_properties.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "payload.contentnegotiation.ContentNegotiationClientBuilder": "Payload.ContentNegotiation", - "payload.contentnegotiation.DifferentBodyAsyncClient": "Payload.ContentNegotiation.DifferentBody", - "payload.contentnegotiation.DifferentBodyAsyncClient.getAvatarAsJson": "Payload.ContentNegotiation.DifferentBody.getAvatarAsJson", - "payload.contentnegotiation.DifferentBodyAsyncClient.getAvatarAsJsonWithResponse": "Payload.ContentNegotiation.DifferentBody.getAvatarAsJson", - "payload.contentnegotiation.DifferentBodyAsyncClient.getAvatarAsPng": "Payload.ContentNegotiation.DifferentBody.getAvatarAsPng", - "payload.contentnegotiation.DifferentBodyAsyncClient.getAvatarAsPngWithResponse": "Payload.ContentNegotiation.DifferentBody.getAvatarAsPng", - "payload.contentnegotiation.DifferentBodyClient": "Payload.ContentNegotiation.DifferentBody", - "payload.contentnegotiation.DifferentBodyClient.getAvatarAsJson": "Payload.ContentNegotiation.DifferentBody.getAvatarAsJson", - "payload.contentnegotiation.DifferentBodyClient.getAvatarAsJsonWithResponse": "Payload.ContentNegotiation.DifferentBody.getAvatarAsJson", - "payload.contentnegotiation.DifferentBodyClient.getAvatarAsPng": "Payload.ContentNegotiation.DifferentBody.getAvatarAsPng", - "payload.contentnegotiation.DifferentBodyClient.getAvatarAsPngWithResponse": "Payload.ContentNegotiation.DifferentBody.getAvatarAsPng", - "payload.contentnegotiation.SameBodyAsyncClient": "Payload.ContentNegotiation.SameBody", - "payload.contentnegotiation.SameBodyAsyncClient.getAvatarAsJpeg": "Payload.ContentNegotiation.SameBody.getAvatarAsJpeg", - "payload.contentnegotiation.SameBodyAsyncClient.getAvatarAsJpegWithResponse": "Payload.ContentNegotiation.SameBody.getAvatarAsJpeg", - "payload.contentnegotiation.SameBodyAsyncClient.getAvatarAsPng": "Payload.ContentNegotiation.SameBody.getAvatarAsPng", - "payload.contentnegotiation.SameBodyAsyncClient.getAvatarAsPngWithResponse": "Payload.ContentNegotiation.SameBody.getAvatarAsPng", - "payload.contentnegotiation.SameBodyClient": "Payload.ContentNegotiation.SameBody", - "payload.contentnegotiation.SameBodyClient.getAvatarAsJpeg": "Payload.ContentNegotiation.SameBody.getAvatarAsJpeg", - "payload.contentnegotiation.SameBodyClient.getAvatarAsJpegWithResponse": "Payload.ContentNegotiation.SameBody.getAvatarAsJpeg", - "payload.contentnegotiation.SameBodyClient.getAvatarAsPng": "Payload.ContentNegotiation.SameBody.getAvatarAsPng", - "payload.contentnegotiation.SameBodyClient.getAvatarAsPngWithResponse": "Payload.ContentNegotiation.SameBody.getAvatarAsPng", - "payload.contentnegotiation.differentbody.models.PngImageAsJson": "Payload.ContentNegotiation.DifferentBody.PngImageAsJson" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-contentnegotiation_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-contentnegotiation_metadata.json index d136feae480..4b2121af9ab 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-contentnegotiation_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-contentnegotiation_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"payload.contentnegotiation.ContentNegotiationClientBuilder":"Payload.ContentNegotiation","payload.contentnegotiation.DifferentBodyAsyncClient":"Payload.ContentNegotiation.DifferentBody","payload.contentnegotiation.DifferentBodyAsyncClient.getAvatarAsJson":"Payload.ContentNegotiation.DifferentBody.getAvatarAsJson","payload.contentnegotiation.DifferentBodyAsyncClient.getAvatarAsJsonWithResponse":"Payload.ContentNegotiation.DifferentBody.getAvatarAsJson","payload.contentnegotiation.DifferentBodyAsyncClient.getAvatarAsPng":"Payload.ContentNegotiation.DifferentBody.getAvatarAsPng","payload.contentnegotiation.DifferentBodyAsyncClient.getAvatarAsPngWithResponse":"Payload.ContentNegotiation.DifferentBody.getAvatarAsPng","payload.contentnegotiation.DifferentBodyClient":"Payload.ContentNegotiation.DifferentBody","payload.contentnegotiation.DifferentBodyClient.getAvatarAsJson":"Payload.ContentNegotiation.DifferentBody.getAvatarAsJson","payload.contentnegotiation.DifferentBodyClient.getAvatarAsJsonWithResponse":"Payload.ContentNegotiation.DifferentBody.getAvatarAsJson","payload.contentnegotiation.DifferentBodyClient.getAvatarAsPng":"Payload.ContentNegotiation.DifferentBody.getAvatarAsPng","payload.contentnegotiation.DifferentBodyClient.getAvatarAsPngWithResponse":"Payload.ContentNegotiation.DifferentBody.getAvatarAsPng","payload.contentnegotiation.SameBodyAsyncClient":"Payload.ContentNegotiation.SameBody","payload.contentnegotiation.SameBodyAsyncClient.getAvatarAsJpeg":"Payload.ContentNegotiation.SameBody.getAvatarAsJpeg","payload.contentnegotiation.SameBodyAsyncClient.getAvatarAsJpegWithResponse":"Payload.ContentNegotiation.SameBody.getAvatarAsJpeg","payload.contentnegotiation.SameBodyAsyncClient.getAvatarAsPng":"Payload.ContentNegotiation.SameBody.getAvatarAsPng","payload.contentnegotiation.SameBodyAsyncClient.getAvatarAsPngWithResponse":"Payload.ContentNegotiation.SameBody.getAvatarAsPng","payload.contentnegotiation.SameBodyClient":"Payload.ContentNegotiation.SameBody","payload.contentnegotiation.SameBodyClient.getAvatarAsJpeg":"Payload.ContentNegotiation.SameBody.getAvatarAsJpeg","payload.contentnegotiation.SameBodyClient.getAvatarAsJpegWithResponse":"Payload.ContentNegotiation.SameBody.getAvatarAsJpeg","payload.contentnegotiation.SameBodyClient.getAvatarAsPng":"Payload.ContentNegotiation.SameBody.getAvatarAsPng","payload.contentnegotiation.SameBodyClient.getAvatarAsPngWithResponse":"Payload.ContentNegotiation.SameBody.getAvatarAsPng","payload.contentnegotiation.differentbody.models.PngImageAsJson":"Payload.ContentNegotiation.DifferentBody.PngImageAsJson"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/contentnegotiation/ContentNegotiationClientBuilder.java","src/main/java/payload/contentnegotiation/DifferentBodyAsyncClient.java","src/main/java/payload/contentnegotiation/DifferentBodyClient.java","src/main/java/payload/contentnegotiation/SameBodyAsyncClient.java","src/main/java/payload/contentnegotiation/SameBodyClient.java","src/main/java/payload/contentnegotiation/differentbody/models/PngImageAsJson.java","src/main/java/payload/contentnegotiation/differentbody/models/package-info.java","src/main/java/payload/contentnegotiation/implementation/ContentNegotiationClientImpl.java","src/main/java/payload/contentnegotiation/implementation/DifferentBodiesImpl.java","src/main/java/payload/contentnegotiation/implementation/SameBodiesImpl.java","src/main/java/payload/contentnegotiation/implementation/package-info.java","src/main/java/payload/contentnegotiation/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"payload.contentnegotiation.ContentNegotiationClientBuilder":"Payload.ContentNegotiation","payload.contentnegotiation.DifferentBodyAsyncClient":"Payload.ContentNegotiation.DifferentBody","payload.contentnegotiation.DifferentBodyAsyncClient.getAvatarAsJson":"Payload.ContentNegotiation.DifferentBody.getAvatarAsJson","payload.contentnegotiation.DifferentBodyAsyncClient.getAvatarAsJsonWithResponse":"Payload.ContentNegotiation.DifferentBody.getAvatarAsJson","payload.contentnegotiation.DifferentBodyAsyncClient.getAvatarAsPng":"Payload.ContentNegotiation.DifferentBody.getAvatarAsPng","payload.contentnegotiation.DifferentBodyAsyncClient.getAvatarAsPngWithResponse":"Payload.ContentNegotiation.DifferentBody.getAvatarAsPng","payload.contentnegotiation.DifferentBodyClient":"Payload.ContentNegotiation.DifferentBody","payload.contentnegotiation.DifferentBodyClient.getAvatarAsJson":"Payload.ContentNegotiation.DifferentBody.getAvatarAsJson","payload.contentnegotiation.DifferentBodyClient.getAvatarAsJsonWithResponse":"Payload.ContentNegotiation.DifferentBody.getAvatarAsJson","payload.contentnegotiation.DifferentBodyClient.getAvatarAsPng":"Payload.ContentNegotiation.DifferentBody.getAvatarAsPng","payload.contentnegotiation.DifferentBodyClient.getAvatarAsPngWithResponse":"Payload.ContentNegotiation.DifferentBody.getAvatarAsPng","payload.contentnegotiation.SameBodyAsyncClient":"Payload.ContentNegotiation.SameBody","payload.contentnegotiation.SameBodyAsyncClient.getAvatarAsJpeg":"Payload.ContentNegotiation.SameBody.getAvatarAsJpeg","payload.contentnegotiation.SameBodyAsyncClient.getAvatarAsJpegWithResponse":"Payload.ContentNegotiation.SameBody.getAvatarAsJpeg","payload.contentnegotiation.SameBodyAsyncClient.getAvatarAsPng":"Payload.ContentNegotiation.SameBody.getAvatarAsPng","payload.contentnegotiation.SameBodyAsyncClient.getAvatarAsPngWithResponse":"Payload.ContentNegotiation.SameBody.getAvatarAsPng","payload.contentnegotiation.SameBodyClient":"Payload.ContentNegotiation.SameBody","payload.contentnegotiation.SameBodyClient.getAvatarAsJpeg":"Payload.ContentNegotiation.SameBody.getAvatarAsJpeg","payload.contentnegotiation.SameBodyClient.getAvatarAsJpegWithResponse":"Payload.ContentNegotiation.SameBody.getAvatarAsJpeg","payload.contentnegotiation.SameBodyClient.getAvatarAsPng":"Payload.ContentNegotiation.SameBody.getAvatarAsPng","payload.contentnegotiation.SameBodyClient.getAvatarAsPngWithResponse":"Payload.ContentNegotiation.SameBody.getAvatarAsPng","payload.contentnegotiation.differentbody.models.PngImageAsJson":"Payload.ContentNegotiation.DifferentBody.PngImageAsJson"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/contentnegotiation/ContentNegotiationClientBuilder.java","src/main/java/payload/contentnegotiation/DifferentBodyAsyncClient.java","src/main/java/payload/contentnegotiation/DifferentBodyClient.java","src/main/java/payload/contentnegotiation/SameBodyAsyncClient.java","src/main/java/payload/contentnegotiation/SameBodyClient.java","src/main/java/payload/contentnegotiation/differentbody/models/PngImageAsJson.java","src/main/java/payload/contentnegotiation/differentbody/models/package-info.java","src/main/java/payload/contentnegotiation/implementation/ContentNegotiationClientImpl.java","src/main/java/payload/contentnegotiation/implementation/DifferentBodiesImpl.java","src/main/java/payload/contentnegotiation/implementation/SameBodiesImpl.java","src/main/java/payload/contentnegotiation/implementation/package-info.java","src/main/java/payload/contentnegotiation/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-jsonmergepatch_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-jsonmergepatch_apiview_properties.json deleted file mode 100644 index 0f127fc8f9c..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-jsonmergepatch_apiview_properties.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "payload.jsonmergepatch.JsonMergePatchAsyncClient": "Payload.JsonMergePatch", - "payload.jsonmergepatch.JsonMergePatchAsyncClient.createResource": "Payload.JsonMergePatch.createResource", - "payload.jsonmergepatch.JsonMergePatchAsyncClient.createResourceWithResponse": "Payload.JsonMergePatch.createResource", - "payload.jsonmergepatch.JsonMergePatchAsyncClient.updateOptionalResource": "Payload.JsonMergePatch.updateOptionalResource", - "payload.jsonmergepatch.JsonMergePatchAsyncClient.updateOptionalResourceWithResponse": "Payload.JsonMergePatch.updateOptionalResource", - "payload.jsonmergepatch.JsonMergePatchAsyncClient.updateResource": "Payload.JsonMergePatch.updateResource", - "payload.jsonmergepatch.JsonMergePatchAsyncClient.updateResourceWithResponse": "Payload.JsonMergePatch.updateResource", - "payload.jsonmergepatch.JsonMergePatchClient": "Payload.JsonMergePatch", - "payload.jsonmergepatch.JsonMergePatchClient.createResource": "Payload.JsonMergePatch.createResource", - "payload.jsonmergepatch.JsonMergePatchClient.createResourceWithResponse": "Payload.JsonMergePatch.createResource", - "payload.jsonmergepatch.JsonMergePatchClient.updateOptionalResource": "Payload.JsonMergePatch.updateOptionalResource", - "payload.jsonmergepatch.JsonMergePatchClient.updateOptionalResourceWithResponse": "Payload.JsonMergePatch.updateOptionalResource", - "payload.jsonmergepatch.JsonMergePatchClient.updateResource": "Payload.JsonMergePatch.updateResource", - "payload.jsonmergepatch.JsonMergePatchClient.updateResourceWithResponse": "Payload.JsonMergePatch.updateResource", - "payload.jsonmergepatch.JsonMergePatchClientBuilder": "Payload.JsonMergePatch", - "payload.jsonmergepatch.models.InnerModel": "Payload.JsonMergePatch.InnerModel", - "payload.jsonmergepatch.models.Resource": "Payload.JsonMergePatch.Resource", - "payload.jsonmergepatch.models.ResourcePatch": "Payload.JsonMergePatch.ResourcePatch" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-jsonmergepatch_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-jsonmergepatch_metadata.json index 45056ffa48e..38621572edd 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-jsonmergepatch_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-jsonmergepatch_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"payload.jsonmergepatch.JsonMergePatchAsyncClient":"Payload.JsonMergePatch","payload.jsonmergepatch.JsonMergePatchAsyncClient.createResource":"Payload.JsonMergePatch.createResource","payload.jsonmergepatch.JsonMergePatchAsyncClient.createResourceWithResponse":"Payload.JsonMergePatch.createResource","payload.jsonmergepatch.JsonMergePatchAsyncClient.updateOptionalResource":"Payload.JsonMergePatch.updateOptionalResource","payload.jsonmergepatch.JsonMergePatchAsyncClient.updateOptionalResourceWithResponse":"Payload.JsonMergePatch.updateOptionalResource","payload.jsonmergepatch.JsonMergePatchAsyncClient.updateResource":"Payload.JsonMergePatch.updateResource","payload.jsonmergepatch.JsonMergePatchAsyncClient.updateResourceWithResponse":"Payload.JsonMergePatch.updateResource","payload.jsonmergepatch.JsonMergePatchClient":"Payload.JsonMergePatch","payload.jsonmergepatch.JsonMergePatchClient.createResource":"Payload.JsonMergePatch.createResource","payload.jsonmergepatch.JsonMergePatchClient.createResourceWithResponse":"Payload.JsonMergePatch.createResource","payload.jsonmergepatch.JsonMergePatchClient.updateOptionalResource":"Payload.JsonMergePatch.updateOptionalResource","payload.jsonmergepatch.JsonMergePatchClient.updateOptionalResourceWithResponse":"Payload.JsonMergePatch.updateOptionalResource","payload.jsonmergepatch.JsonMergePatchClient.updateResource":"Payload.JsonMergePatch.updateResource","payload.jsonmergepatch.JsonMergePatchClient.updateResourceWithResponse":"Payload.JsonMergePatch.updateResource","payload.jsonmergepatch.JsonMergePatchClientBuilder":"Payload.JsonMergePatch","payload.jsonmergepatch.models.InnerModel":"Payload.JsonMergePatch.InnerModel","payload.jsonmergepatch.models.Resource":"Payload.JsonMergePatch.Resource","payload.jsonmergepatch.models.ResourcePatch":"Payload.JsonMergePatch.ResourcePatch"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/jsonmergepatch/JsonMergePatchAsyncClient.java","src/main/java/payload/jsonmergepatch/JsonMergePatchClient.java","src/main/java/payload/jsonmergepatch/JsonMergePatchClientBuilder.java","src/main/java/payload/jsonmergepatch/implementation/JsonMergePatchClientImpl.java","src/main/java/payload/jsonmergepatch/implementation/JsonMergePatchHelper.java","src/main/java/payload/jsonmergepatch/implementation/package-info.java","src/main/java/payload/jsonmergepatch/models/InnerModel.java","src/main/java/payload/jsonmergepatch/models/Resource.java","src/main/java/payload/jsonmergepatch/models/ResourcePatch.java","src/main/java/payload/jsonmergepatch/models/package-info.java","src/main/java/payload/jsonmergepatch/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"payload.jsonmergepatch.JsonMergePatchAsyncClient":"Payload.JsonMergePatch","payload.jsonmergepatch.JsonMergePatchAsyncClient.createResource":"Payload.JsonMergePatch.createResource","payload.jsonmergepatch.JsonMergePatchAsyncClient.createResourceWithResponse":"Payload.JsonMergePatch.createResource","payload.jsonmergepatch.JsonMergePatchAsyncClient.updateOptionalResource":"Payload.JsonMergePatch.updateOptionalResource","payload.jsonmergepatch.JsonMergePatchAsyncClient.updateOptionalResourceWithResponse":"Payload.JsonMergePatch.updateOptionalResource","payload.jsonmergepatch.JsonMergePatchAsyncClient.updateResource":"Payload.JsonMergePatch.updateResource","payload.jsonmergepatch.JsonMergePatchAsyncClient.updateResourceWithResponse":"Payload.JsonMergePatch.updateResource","payload.jsonmergepatch.JsonMergePatchClient":"Payload.JsonMergePatch","payload.jsonmergepatch.JsonMergePatchClient.createResource":"Payload.JsonMergePatch.createResource","payload.jsonmergepatch.JsonMergePatchClient.createResourceWithResponse":"Payload.JsonMergePatch.createResource","payload.jsonmergepatch.JsonMergePatchClient.updateOptionalResource":"Payload.JsonMergePatch.updateOptionalResource","payload.jsonmergepatch.JsonMergePatchClient.updateOptionalResourceWithResponse":"Payload.JsonMergePatch.updateOptionalResource","payload.jsonmergepatch.JsonMergePatchClient.updateResource":"Payload.JsonMergePatch.updateResource","payload.jsonmergepatch.JsonMergePatchClient.updateResourceWithResponse":"Payload.JsonMergePatch.updateResource","payload.jsonmergepatch.JsonMergePatchClientBuilder":"Payload.JsonMergePatch","payload.jsonmergepatch.models.InnerModel":"Payload.JsonMergePatch.InnerModel","payload.jsonmergepatch.models.Resource":"Payload.JsonMergePatch.Resource","payload.jsonmergepatch.models.ResourcePatch":"Payload.JsonMergePatch.ResourcePatch"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/jsonmergepatch/JsonMergePatchAsyncClient.java","src/main/java/payload/jsonmergepatch/JsonMergePatchClient.java","src/main/java/payload/jsonmergepatch/JsonMergePatchClientBuilder.java","src/main/java/payload/jsonmergepatch/implementation/JsonMergePatchClientImpl.java","src/main/java/payload/jsonmergepatch/implementation/JsonMergePatchHelper.java","src/main/java/payload/jsonmergepatch/implementation/package-info.java","src/main/java/payload/jsonmergepatch/models/InnerModel.java","src/main/java/payload/jsonmergepatch/models/Resource.java","src/main/java/payload/jsonmergepatch/models/ResourcePatch.java","src/main/java/payload/jsonmergepatch/models/package-info.java","src/main/java/payload/jsonmergepatch/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-mediatype_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-mediatype_apiview_properties.json deleted file mode 100644 index 6e003b50b54..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-mediatype_apiview_properties.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "payload.mediatype.MediaTypeAsyncClient": "Payload.MediaType.StringBody", - "payload.mediatype.MediaTypeAsyncClient.getAsJson": "Payload.MediaType.StringBody.getAsJson", - "payload.mediatype.MediaTypeAsyncClient.getAsJsonWithResponse": "Payload.MediaType.StringBody.getAsJson", - "payload.mediatype.MediaTypeAsyncClient.getAsText": "Payload.MediaType.StringBody.getAsText", - "payload.mediatype.MediaTypeAsyncClient.getAsTextWithResponse": "Payload.MediaType.StringBody.getAsText", - "payload.mediatype.MediaTypeAsyncClient.sendAsJson": "Payload.MediaType.StringBody.sendAsJson", - "payload.mediatype.MediaTypeAsyncClient.sendAsJsonWithResponse": "Payload.MediaType.StringBody.sendAsJson", - "payload.mediatype.MediaTypeAsyncClient.sendAsText": "Payload.MediaType.StringBody.sendAsText", - "payload.mediatype.MediaTypeAsyncClient.sendAsTextWithResponse": "Payload.MediaType.StringBody.sendAsText", - "payload.mediatype.MediaTypeClient": "Payload.MediaType.StringBody", - "payload.mediatype.MediaTypeClient.getAsJson": "Payload.MediaType.StringBody.getAsJson", - "payload.mediatype.MediaTypeClient.getAsJsonWithResponse": "Payload.MediaType.StringBody.getAsJson", - "payload.mediatype.MediaTypeClient.getAsText": "Payload.MediaType.StringBody.getAsText", - "payload.mediatype.MediaTypeClient.getAsTextWithResponse": "Payload.MediaType.StringBody.getAsText", - "payload.mediatype.MediaTypeClient.sendAsJson": "Payload.MediaType.StringBody.sendAsJson", - "payload.mediatype.MediaTypeClient.sendAsJsonWithResponse": "Payload.MediaType.StringBody.sendAsJson", - "payload.mediatype.MediaTypeClient.sendAsText": "Payload.MediaType.StringBody.sendAsText", - "payload.mediatype.MediaTypeClient.sendAsTextWithResponse": "Payload.MediaType.StringBody.sendAsText", - "payload.mediatype.MediaTypeClientBuilder": "Payload.MediaType" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-mediatype_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-mediatype_metadata.json index 7cfedb7a6a9..113f1a3dc73 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-mediatype_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-mediatype_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"payload.mediatype.MediaTypeAsyncClient":"Payload.MediaType.StringBody","payload.mediatype.MediaTypeAsyncClient.getAsJson":"Payload.MediaType.StringBody.getAsJson","payload.mediatype.MediaTypeAsyncClient.getAsJsonWithResponse":"Payload.MediaType.StringBody.getAsJson","payload.mediatype.MediaTypeAsyncClient.getAsText":"Payload.MediaType.StringBody.getAsText","payload.mediatype.MediaTypeAsyncClient.getAsTextWithResponse":"Payload.MediaType.StringBody.getAsText","payload.mediatype.MediaTypeAsyncClient.sendAsJson":"Payload.MediaType.StringBody.sendAsJson","payload.mediatype.MediaTypeAsyncClient.sendAsJsonWithResponse":"Payload.MediaType.StringBody.sendAsJson","payload.mediatype.MediaTypeAsyncClient.sendAsText":"Payload.MediaType.StringBody.sendAsText","payload.mediatype.MediaTypeAsyncClient.sendAsTextWithResponse":"Payload.MediaType.StringBody.sendAsText","payload.mediatype.MediaTypeClient":"Payload.MediaType.StringBody","payload.mediatype.MediaTypeClient.getAsJson":"Payload.MediaType.StringBody.getAsJson","payload.mediatype.MediaTypeClient.getAsJsonWithResponse":"Payload.MediaType.StringBody.getAsJson","payload.mediatype.MediaTypeClient.getAsText":"Payload.MediaType.StringBody.getAsText","payload.mediatype.MediaTypeClient.getAsTextWithResponse":"Payload.MediaType.StringBody.getAsText","payload.mediatype.MediaTypeClient.sendAsJson":"Payload.MediaType.StringBody.sendAsJson","payload.mediatype.MediaTypeClient.sendAsJsonWithResponse":"Payload.MediaType.StringBody.sendAsJson","payload.mediatype.MediaTypeClient.sendAsText":"Payload.MediaType.StringBody.sendAsText","payload.mediatype.MediaTypeClient.sendAsTextWithResponse":"Payload.MediaType.StringBody.sendAsText","payload.mediatype.MediaTypeClientBuilder":"Payload.MediaType"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/mediatype/MediaTypeAsyncClient.java","src/main/java/payload/mediatype/MediaTypeClient.java","src/main/java/payload/mediatype/MediaTypeClientBuilder.java","src/main/java/payload/mediatype/implementation/MediaTypeClientImpl.java","src/main/java/payload/mediatype/implementation/StringBodiesImpl.java","src/main/java/payload/mediatype/implementation/package-info.java","src/main/java/payload/mediatype/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"payload.mediatype.MediaTypeAsyncClient":"Payload.MediaType.StringBody","payload.mediatype.MediaTypeAsyncClient.getAsJson":"Payload.MediaType.StringBody.getAsJson","payload.mediatype.MediaTypeAsyncClient.getAsJsonWithResponse":"Payload.MediaType.StringBody.getAsJson","payload.mediatype.MediaTypeAsyncClient.getAsText":"Payload.MediaType.StringBody.getAsText","payload.mediatype.MediaTypeAsyncClient.getAsTextWithResponse":"Payload.MediaType.StringBody.getAsText","payload.mediatype.MediaTypeAsyncClient.sendAsJson":"Payload.MediaType.StringBody.sendAsJson","payload.mediatype.MediaTypeAsyncClient.sendAsJsonWithResponse":"Payload.MediaType.StringBody.sendAsJson","payload.mediatype.MediaTypeAsyncClient.sendAsText":"Payload.MediaType.StringBody.sendAsText","payload.mediatype.MediaTypeAsyncClient.sendAsTextWithResponse":"Payload.MediaType.StringBody.sendAsText","payload.mediatype.MediaTypeClient":"Payload.MediaType.StringBody","payload.mediatype.MediaTypeClient.getAsJson":"Payload.MediaType.StringBody.getAsJson","payload.mediatype.MediaTypeClient.getAsJsonWithResponse":"Payload.MediaType.StringBody.getAsJson","payload.mediatype.MediaTypeClient.getAsText":"Payload.MediaType.StringBody.getAsText","payload.mediatype.MediaTypeClient.getAsTextWithResponse":"Payload.MediaType.StringBody.getAsText","payload.mediatype.MediaTypeClient.sendAsJson":"Payload.MediaType.StringBody.sendAsJson","payload.mediatype.MediaTypeClient.sendAsJsonWithResponse":"Payload.MediaType.StringBody.sendAsJson","payload.mediatype.MediaTypeClient.sendAsText":"Payload.MediaType.StringBody.sendAsText","payload.mediatype.MediaTypeClient.sendAsTextWithResponse":"Payload.MediaType.StringBody.sendAsText","payload.mediatype.MediaTypeClientBuilder":"Payload.MediaType"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/mediatype/MediaTypeAsyncClient.java","src/main/java/payload/mediatype/MediaTypeClient.java","src/main/java/payload/mediatype/MediaTypeClientBuilder.java","src/main/java/payload/mediatype/implementation/MediaTypeClientImpl.java","src/main/java/payload/mediatype/implementation/StringBodiesImpl.java","src/main/java/payload/mediatype/implementation/package-info.java","src/main/java/payload/mediatype/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-multipart_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-multipart_apiview_properties.json deleted file mode 100644 index a9bc37a318c..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-multipart_apiview_properties.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "payload.multipart.FormDataAsyncClient": "Payload.MultiPart.FormData", - "payload.multipart.FormDataAsyncClient.anonymousModel": "Payload.MultiPart.FormData.anonymousModel", - "payload.multipart.FormDataAsyncClient.anonymousModelWithResponse": "Payload.MultiPart.FormData.anonymousModel", - "payload.multipart.FormDataAsyncClient.basic": "Payload.MultiPart.FormData.basic", - "payload.multipart.FormDataAsyncClient.basicWithResponse": "Payload.MultiPart.FormData.basic", - "payload.multipart.FormDataAsyncClient.binaryArrayParts": "Payload.MultiPart.FormData.binaryArrayParts", - "payload.multipart.FormDataAsyncClient.binaryArrayPartsWithResponse": "Payload.MultiPart.FormData.binaryArrayParts", - "payload.multipart.FormDataAsyncClient.checkFileNameAndContentType": "Payload.MultiPart.FormData.checkFileNameAndContentType", - "payload.multipart.FormDataAsyncClient.checkFileNameAndContentTypeWithResponse": "Payload.MultiPart.FormData.checkFileNameAndContentType", - "payload.multipart.FormDataAsyncClient.fileArrayAndBasic": "Payload.MultiPart.FormData.fileArrayAndBasic", - "payload.multipart.FormDataAsyncClient.fileArrayAndBasicWithResponse": "Payload.MultiPart.FormData.fileArrayAndBasic", - "payload.multipart.FormDataAsyncClient.jsonPart": "Payload.MultiPart.FormData.jsonPart", - "payload.multipart.FormDataAsyncClient.jsonPartWithResponse": "Payload.MultiPart.FormData.jsonPart", - "payload.multipart.FormDataAsyncClient.multiBinaryParts": "Payload.MultiPart.FormData.multiBinaryParts", - "payload.multipart.FormDataAsyncClient.multiBinaryPartsWithResponse": "Payload.MultiPart.FormData.multiBinaryParts", - "payload.multipart.FormDataAsyncClient.optionalParts": "Payload.MultiPart.FormData.optionalParts", - "payload.multipart.FormDataAsyncClient.optionalPartsWithResponse": "Payload.MultiPart.FormData.optionalParts", - "payload.multipart.FormDataAsyncClient.withWireName": "Payload.MultiPart.FormData.withWireName", - "payload.multipart.FormDataAsyncClient.withWireNameWithResponse": "Payload.MultiPart.FormData.withWireName", - "payload.multipart.FormDataClient": "Payload.MultiPart.FormData", - "payload.multipart.FormDataClient.anonymousModel": "Payload.MultiPart.FormData.anonymousModel", - "payload.multipart.FormDataClient.anonymousModelWithResponse": "Payload.MultiPart.FormData.anonymousModel", - "payload.multipart.FormDataClient.basic": "Payload.MultiPart.FormData.basic", - "payload.multipart.FormDataClient.basicWithResponse": "Payload.MultiPart.FormData.basic", - "payload.multipart.FormDataClient.binaryArrayParts": "Payload.MultiPart.FormData.binaryArrayParts", - "payload.multipart.FormDataClient.binaryArrayPartsWithResponse": "Payload.MultiPart.FormData.binaryArrayParts", - "payload.multipart.FormDataClient.checkFileNameAndContentType": "Payload.MultiPart.FormData.checkFileNameAndContentType", - "payload.multipart.FormDataClient.checkFileNameAndContentTypeWithResponse": "Payload.MultiPart.FormData.checkFileNameAndContentType", - "payload.multipart.FormDataClient.fileArrayAndBasic": "Payload.MultiPart.FormData.fileArrayAndBasic", - "payload.multipart.FormDataClient.fileArrayAndBasicWithResponse": "Payload.MultiPart.FormData.fileArrayAndBasic", - "payload.multipart.FormDataClient.jsonPart": "Payload.MultiPart.FormData.jsonPart", - "payload.multipart.FormDataClient.jsonPartWithResponse": "Payload.MultiPart.FormData.jsonPart", - "payload.multipart.FormDataClient.multiBinaryParts": "Payload.MultiPart.FormData.multiBinaryParts", - "payload.multipart.FormDataClient.multiBinaryPartsWithResponse": "Payload.MultiPart.FormData.multiBinaryParts", - "payload.multipart.FormDataClient.optionalParts": "Payload.MultiPart.FormData.optionalParts", - "payload.multipart.FormDataClient.optionalPartsWithResponse": "Payload.MultiPart.FormData.optionalParts", - "payload.multipart.FormDataClient.withWireName": "Payload.MultiPart.FormData.withWireName", - "payload.multipart.FormDataClient.withWireNameWithResponse": "Payload.MultiPart.FormData.withWireName", - "payload.multipart.FormDataHttpPartsAsyncClient": "Payload.MultiPart.FormData.HttpParts", - "payload.multipart.FormDataHttpPartsAsyncClient.jsonArrayAndFileArray": "Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray", - "payload.multipart.FormDataHttpPartsAsyncClient.jsonArrayAndFileArrayWithResponse": "Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray", - "payload.multipart.FormDataHttpPartsClient": "Payload.MultiPart.FormData.HttpParts", - "payload.multipart.FormDataHttpPartsClient.jsonArrayAndFileArray": "Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray", - "payload.multipart.FormDataHttpPartsClient.jsonArrayAndFileArrayWithResponse": "Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray", - "payload.multipart.FormDataHttpPartsContentTypeAsyncClient": "Payload.MultiPart.FormData.HttpParts.ContentType", - "payload.multipart.FormDataHttpPartsContentTypeAsyncClient.imageJpegContentType": "Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType", - "payload.multipart.FormDataHttpPartsContentTypeAsyncClient.imageJpegContentTypeWithResponse": "Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType", - "payload.multipart.FormDataHttpPartsContentTypeAsyncClient.optionalContentType": "Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType", - "payload.multipart.FormDataHttpPartsContentTypeAsyncClient.optionalContentTypeWithResponse": "Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType", - "payload.multipart.FormDataHttpPartsContentTypeAsyncClient.requiredContentType": "Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType", - "payload.multipart.FormDataHttpPartsContentTypeAsyncClient.requiredContentTypeWithResponse": "Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType", - "payload.multipart.FormDataHttpPartsContentTypeClient": "Payload.MultiPart.FormData.HttpParts.ContentType", - "payload.multipart.FormDataHttpPartsContentTypeClient.imageJpegContentType": "Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType", - "payload.multipart.FormDataHttpPartsContentTypeClient.imageJpegContentTypeWithResponse": "Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType", - "payload.multipart.FormDataHttpPartsContentTypeClient.optionalContentType": "Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType", - "payload.multipart.FormDataHttpPartsContentTypeClient.optionalContentTypeWithResponse": "Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType", - "payload.multipart.FormDataHttpPartsContentTypeClient.requiredContentType": "Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType", - "payload.multipart.FormDataHttpPartsContentTypeClient.requiredContentTypeWithResponse": "Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType", - "payload.multipart.FormDataHttpPartsNonStringAsyncClient": "Payload.MultiPart.FormData.HttpParts.NonString", - "payload.multipart.FormDataHttpPartsNonStringAsyncClient.floatMethod": "Payload.MultiPart.FormData.HttpParts.NonString.float", - "payload.multipart.FormDataHttpPartsNonStringAsyncClient.floatMethodWithResponse": "Payload.MultiPart.FormData.HttpParts.NonString.float", - "payload.multipart.FormDataHttpPartsNonStringClient": "Payload.MultiPart.FormData.HttpParts.NonString", - "payload.multipart.FormDataHttpPartsNonStringClient.floatMethod": "Payload.MultiPart.FormData.HttpParts.NonString.float", - "payload.multipart.FormDataHttpPartsNonStringClient.floatMethodWithResponse": "Payload.MultiPart.FormData.HttpParts.NonString.float", - "payload.multipart.MultiPartClientBuilder": "Payload.MultiPart", - "payload.multipart.formdata.httpparts.nonstring.models.FloatRequest": "Payload.MultiPart.FormData.HttpParts.NonString.float.Request.anonymous", - "payload.multipart.formdata.models.AnonymousModelRequest": "Payload.MultiPart.FormData.anonymousModel.Request.anonymous", - "payload.multipart.models.Address": "Payload.MultiPart.Address", - "payload.multipart.models.BinaryArrayPartsRequest": "Payload.MultiPart.BinaryArrayPartsRequest", - "payload.multipart.models.ComplexHttpPartsModelRequest": "Payload.MultiPart.ComplexHttpPartsModelRequest", - "payload.multipart.models.ComplexPartsRequest": "Payload.MultiPart.ComplexPartsRequest", - "payload.multipart.models.FileOptionalContentType": "Payload.MultiPart.FileOptionalContentType", - "payload.multipart.models.FileRequiredMetaData": "Payload.MultiPart.FileRequiredMetaData", - "payload.multipart.models.FileSpecificContentType": "Payload.MultiPart.FileSpecificContentType", - "payload.multipart.models.FileWithHttpPartOptionalContentTypeRequest": "Payload.MultiPart.FileWithHttpPartOptionalContentTypeRequest", - "payload.multipart.models.FileWithHttpPartRequiredContentTypeRequest": "Payload.MultiPart.FileWithHttpPartRequiredContentTypeRequest", - "payload.multipart.models.FileWithHttpPartSpecificContentTypeRequest": "Payload.MultiPart.FileWithHttpPartSpecificContentTypeRequest", - "payload.multipart.models.ImageFileDetails": null, - "payload.multipart.models.JsonPartRequest": "Payload.MultiPart.JsonPartRequest", - "payload.multipart.models.MultiBinaryPartsRequest": "Payload.MultiPart.MultiBinaryPartsRequest", - "payload.multipart.models.MultiPartOptionalRequest": "Payload.MultiPart.MultiPartOptionalRequest", - "payload.multipart.models.MultiPartRequest": "Payload.MultiPart.MultiPartRequest", - "payload.multipart.models.MultiPartRequestWithWireName": "Payload.MultiPart.MultiPartRequestWithWireName", - "payload.multipart.models.PictureFileDetails": null, - "payload.multipart.models.PicturesFileDetails": null, - "payload.multipart.models.ProfileImageFileDetails": null - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-multipart_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-multipart_metadata.json index e6127e740a6..8b115849783 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-multipart_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/payload-multipart_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"payload.multipart.FormDataAsyncClient":"Payload.MultiPart.FormData","payload.multipart.FormDataAsyncClient.anonymousModel":"Payload.MultiPart.FormData.anonymousModel","payload.multipart.FormDataAsyncClient.anonymousModelWithResponse":"Payload.MultiPart.FormData.anonymousModel","payload.multipart.FormDataAsyncClient.basic":"Payload.MultiPart.FormData.basic","payload.multipart.FormDataAsyncClient.basicWithResponse":"Payload.MultiPart.FormData.basic","payload.multipart.FormDataAsyncClient.binaryArrayParts":"Payload.MultiPart.FormData.binaryArrayParts","payload.multipart.FormDataAsyncClient.binaryArrayPartsWithResponse":"Payload.MultiPart.FormData.binaryArrayParts","payload.multipart.FormDataAsyncClient.checkFileNameAndContentType":"Payload.MultiPart.FormData.checkFileNameAndContentType","payload.multipart.FormDataAsyncClient.checkFileNameAndContentTypeWithResponse":"Payload.MultiPart.FormData.checkFileNameAndContentType","payload.multipart.FormDataAsyncClient.fileArrayAndBasic":"Payload.MultiPart.FormData.fileArrayAndBasic","payload.multipart.FormDataAsyncClient.fileArrayAndBasicWithResponse":"Payload.MultiPart.FormData.fileArrayAndBasic","payload.multipart.FormDataAsyncClient.jsonPart":"Payload.MultiPart.FormData.jsonPart","payload.multipart.FormDataAsyncClient.jsonPartWithResponse":"Payload.MultiPart.FormData.jsonPart","payload.multipart.FormDataAsyncClient.multiBinaryParts":"Payload.MultiPart.FormData.multiBinaryParts","payload.multipart.FormDataAsyncClient.multiBinaryPartsWithResponse":"Payload.MultiPart.FormData.multiBinaryParts","payload.multipart.FormDataAsyncClient.optionalParts":"Payload.MultiPart.FormData.optionalParts","payload.multipart.FormDataAsyncClient.optionalPartsWithResponse":"Payload.MultiPart.FormData.optionalParts","payload.multipart.FormDataAsyncClient.withWireName":"Payload.MultiPart.FormData.withWireName","payload.multipart.FormDataAsyncClient.withWireNameWithResponse":"Payload.MultiPart.FormData.withWireName","payload.multipart.FormDataClient":"Payload.MultiPart.FormData","payload.multipart.FormDataClient.anonymousModel":"Payload.MultiPart.FormData.anonymousModel","payload.multipart.FormDataClient.anonymousModelWithResponse":"Payload.MultiPart.FormData.anonymousModel","payload.multipart.FormDataClient.basic":"Payload.MultiPart.FormData.basic","payload.multipart.FormDataClient.basicWithResponse":"Payload.MultiPart.FormData.basic","payload.multipart.FormDataClient.binaryArrayParts":"Payload.MultiPart.FormData.binaryArrayParts","payload.multipart.FormDataClient.binaryArrayPartsWithResponse":"Payload.MultiPart.FormData.binaryArrayParts","payload.multipart.FormDataClient.checkFileNameAndContentType":"Payload.MultiPart.FormData.checkFileNameAndContentType","payload.multipart.FormDataClient.checkFileNameAndContentTypeWithResponse":"Payload.MultiPart.FormData.checkFileNameAndContentType","payload.multipart.FormDataClient.fileArrayAndBasic":"Payload.MultiPart.FormData.fileArrayAndBasic","payload.multipart.FormDataClient.fileArrayAndBasicWithResponse":"Payload.MultiPart.FormData.fileArrayAndBasic","payload.multipart.FormDataClient.jsonPart":"Payload.MultiPart.FormData.jsonPart","payload.multipart.FormDataClient.jsonPartWithResponse":"Payload.MultiPart.FormData.jsonPart","payload.multipart.FormDataClient.multiBinaryParts":"Payload.MultiPart.FormData.multiBinaryParts","payload.multipart.FormDataClient.multiBinaryPartsWithResponse":"Payload.MultiPart.FormData.multiBinaryParts","payload.multipart.FormDataClient.optionalParts":"Payload.MultiPart.FormData.optionalParts","payload.multipart.FormDataClient.optionalPartsWithResponse":"Payload.MultiPart.FormData.optionalParts","payload.multipart.FormDataClient.withWireName":"Payload.MultiPart.FormData.withWireName","payload.multipart.FormDataClient.withWireNameWithResponse":"Payload.MultiPart.FormData.withWireName","payload.multipart.FormDataHttpPartsAsyncClient":"Payload.MultiPart.FormData.HttpParts","payload.multipart.FormDataHttpPartsAsyncClient.jsonArrayAndFileArray":"Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray","payload.multipart.FormDataHttpPartsAsyncClient.jsonArrayAndFileArrayWithResponse":"Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray","payload.multipart.FormDataHttpPartsClient":"Payload.MultiPart.FormData.HttpParts","payload.multipart.FormDataHttpPartsClient.jsonArrayAndFileArray":"Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray","payload.multipart.FormDataHttpPartsClient.jsonArrayAndFileArrayWithResponse":"Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray","payload.multipart.FormDataHttpPartsContentTypeAsyncClient":"Payload.MultiPart.FormData.HttpParts.ContentType","payload.multipart.FormDataHttpPartsContentTypeAsyncClient.imageJpegContentType":"Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType","payload.multipart.FormDataHttpPartsContentTypeAsyncClient.imageJpegContentTypeWithResponse":"Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType","payload.multipart.FormDataHttpPartsContentTypeAsyncClient.optionalContentType":"Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType","payload.multipart.FormDataHttpPartsContentTypeAsyncClient.optionalContentTypeWithResponse":"Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType","payload.multipart.FormDataHttpPartsContentTypeAsyncClient.requiredContentType":"Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType","payload.multipart.FormDataHttpPartsContentTypeAsyncClient.requiredContentTypeWithResponse":"Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType","payload.multipart.FormDataHttpPartsContentTypeClient":"Payload.MultiPart.FormData.HttpParts.ContentType","payload.multipart.FormDataHttpPartsContentTypeClient.imageJpegContentType":"Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType","payload.multipart.FormDataHttpPartsContentTypeClient.imageJpegContentTypeWithResponse":"Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType","payload.multipart.FormDataHttpPartsContentTypeClient.optionalContentType":"Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType","payload.multipart.FormDataHttpPartsContentTypeClient.optionalContentTypeWithResponse":"Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType","payload.multipart.FormDataHttpPartsContentTypeClient.requiredContentType":"Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType","payload.multipart.FormDataHttpPartsContentTypeClient.requiredContentTypeWithResponse":"Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType","payload.multipart.FormDataHttpPartsNonStringAsyncClient":"Payload.MultiPart.FormData.HttpParts.NonString","payload.multipart.FormDataHttpPartsNonStringAsyncClient.floatMethod":"Payload.MultiPart.FormData.HttpParts.NonString.float","payload.multipart.FormDataHttpPartsNonStringAsyncClient.floatMethodWithResponse":"Payload.MultiPart.FormData.HttpParts.NonString.float","payload.multipart.FormDataHttpPartsNonStringClient":"Payload.MultiPart.FormData.HttpParts.NonString","payload.multipart.FormDataHttpPartsNonStringClient.floatMethod":"Payload.MultiPart.FormData.HttpParts.NonString.float","payload.multipart.FormDataHttpPartsNonStringClient.floatMethodWithResponse":"Payload.MultiPart.FormData.HttpParts.NonString.float","payload.multipart.MultiPartClientBuilder":"Payload.MultiPart","payload.multipart.formdata.httpparts.nonstring.models.FloatRequest":"Payload.MultiPart.FormData.HttpParts.NonString.float.Request.anonymous","payload.multipart.formdata.models.AnonymousModelRequest":"Payload.MultiPart.FormData.anonymousModel.Request.anonymous","payload.multipart.models.Address":"Payload.MultiPart.Address","payload.multipart.models.BinaryArrayPartsRequest":"Payload.MultiPart.BinaryArrayPartsRequest","payload.multipart.models.ComplexHttpPartsModelRequest":"Payload.MultiPart.ComplexHttpPartsModelRequest","payload.multipart.models.ComplexPartsRequest":"Payload.MultiPart.ComplexPartsRequest","payload.multipart.models.FileOptionalContentType":"Payload.MultiPart.FileOptionalContentType","payload.multipart.models.FileRequiredMetaData":"Payload.MultiPart.FileRequiredMetaData","payload.multipart.models.FileSpecificContentType":"Payload.MultiPart.FileSpecificContentType","payload.multipart.models.FileWithHttpPartOptionalContentTypeRequest":"Payload.MultiPart.FileWithHttpPartOptionalContentTypeRequest","payload.multipart.models.FileWithHttpPartRequiredContentTypeRequest":"Payload.MultiPart.FileWithHttpPartRequiredContentTypeRequest","payload.multipart.models.FileWithHttpPartSpecificContentTypeRequest":"Payload.MultiPart.FileWithHttpPartSpecificContentTypeRequest","payload.multipart.models.ImageFileDetails":null,"payload.multipart.models.JsonPartRequest":"Payload.MultiPart.JsonPartRequest","payload.multipart.models.MultiBinaryPartsRequest":"Payload.MultiPart.MultiBinaryPartsRequest","payload.multipart.models.MultiPartOptionalRequest":"Payload.MultiPart.MultiPartOptionalRequest","payload.multipart.models.MultiPartRequest":"Payload.MultiPart.MultiPartRequest","payload.multipart.models.MultiPartRequestWithWireName":"Payload.MultiPart.MultiPartRequestWithWireName","payload.multipart.models.PictureFileDetails":null,"payload.multipart.models.PicturesFileDetails":null,"payload.multipart.models.ProfileImageFileDetails":null},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/multipart/FormDataAsyncClient.java","src/main/java/payload/multipart/FormDataClient.java","src/main/java/payload/multipart/FormDataHttpPartsAsyncClient.java","src/main/java/payload/multipart/FormDataHttpPartsClient.java","src/main/java/payload/multipart/FormDataHttpPartsContentTypeAsyncClient.java","src/main/java/payload/multipart/FormDataHttpPartsContentTypeClient.java","src/main/java/payload/multipart/FormDataHttpPartsNonStringAsyncClient.java","src/main/java/payload/multipart/FormDataHttpPartsNonStringClient.java","src/main/java/payload/multipart/MultiPartClientBuilder.java","src/main/java/payload/multipart/formdata/httpparts/nonstring/models/FloatRequest.java","src/main/java/payload/multipart/formdata/httpparts/nonstring/models/package-info.java","src/main/java/payload/multipart/formdata/models/AnonymousModelRequest.java","src/main/java/payload/multipart/formdata/models/package-info.java","src/main/java/payload/multipart/implementation/FormDataHttpPartsContentTypesImpl.java","src/main/java/payload/multipart/implementation/FormDataHttpPartsImpl.java","src/main/java/payload/multipart/implementation/FormDataHttpPartsNonStringsImpl.java","src/main/java/payload/multipart/implementation/FormDatasImpl.java","src/main/java/payload/multipart/implementation/MultiPartClientImpl.java","src/main/java/payload/multipart/implementation/MultipartFormDataHelper.java","src/main/java/payload/multipart/implementation/package-info.java","src/main/java/payload/multipart/models/Address.java","src/main/java/payload/multipart/models/BinaryArrayPartsRequest.java","src/main/java/payload/multipart/models/ComplexHttpPartsModelRequest.java","src/main/java/payload/multipart/models/ComplexPartsRequest.java","src/main/java/payload/multipart/models/FileOptionalContentType.java","src/main/java/payload/multipart/models/FileRequiredMetaData.java","src/main/java/payload/multipart/models/FileSpecificContentType.java","src/main/java/payload/multipart/models/FileWithHttpPartOptionalContentTypeRequest.java","src/main/java/payload/multipart/models/FileWithHttpPartRequiredContentTypeRequest.java","src/main/java/payload/multipart/models/FileWithHttpPartSpecificContentTypeRequest.java","src/main/java/payload/multipart/models/ImageFileDetails.java","src/main/java/payload/multipart/models/JsonPartRequest.java","src/main/java/payload/multipart/models/MultiBinaryPartsRequest.java","src/main/java/payload/multipart/models/MultiPartOptionalRequest.java","src/main/java/payload/multipart/models/MultiPartRequest.java","src/main/java/payload/multipart/models/MultiPartRequestWithWireName.java","src/main/java/payload/multipart/models/PictureFileDetails.java","src/main/java/payload/multipart/models/PicturesFileDetails.java","src/main/java/payload/multipart/models/ProfileImageFileDetails.java","src/main/java/payload/multipart/models/package-info.java","src/main/java/payload/multipart/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"payload.multipart.FormDataAsyncClient":"Payload.MultiPart.FormData","payload.multipart.FormDataAsyncClient.anonymousModel":"Payload.MultiPart.FormData.anonymousModel","payload.multipart.FormDataAsyncClient.anonymousModelWithResponse":"Payload.MultiPart.FormData.anonymousModel","payload.multipart.FormDataAsyncClient.basic":"Payload.MultiPart.FormData.basic","payload.multipart.FormDataAsyncClient.basicWithResponse":"Payload.MultiPart.FormData.basic","payload.multipart.FormDataAsyncClient.binaryArrayParts":"Payload.MultiPart.FormData.binaryArrayParts","payload.multipart.FormDataAsyncClient.binaryArrayPartsWithResponse":"Payload.MultiPart.FormData.binaryArrayParts","payload.multipart.FormDataAsyncClient.checkFileNameAndContentType":"Payload.MultiPart.FormData.checkFileNameAndContentType","payload.multipart.FormDataAsyncClient.checkFileNameAndContentTypeWithResponse":"Payload.MultiPart.FormData.checkFileNameAndContentType","payload.multipart.FormDataAsyncClient.fileArrayAndBasic":"Payload.MultiPart.FormData.fileArrayAndBasic","payload.multipart.FormDataAsyncClient.fileArrayAndBasicWithResponse":"Payload.MultiPart.FormData.fileArrayAndBasic","payload.multipart.FormDataAsyncClient.jsonPart":"Payload.MultiPart.FormData.jsonPart","payload.multipart.FormDataAsyncClient.jsonPartWithResponse":"Payload.MultiPart.FormData.jsonPart","payload.multipart.FormDataAsyncClient.multiBinaryParts":"Payload.MultiPart.FormData.multiBinaryParts","payload.multipart.FormDataAsyncClient.multiBinaryPartsWithResponse":"Payload.MultiPart.FormData.multiBinaryParts","payload.multipart.FormDataAsyncClient.optionalParts":"Payload.MultiPart.FormData.optionalParts","payload.multipart.FormDataAsyncClient.optionalPartsWithResponse":"Payload.MultiPart.FormData.optionalParts","payload.multipart.FormDataAsyncClient.withWireName":"Payload.MultiPart.FormData.withWireName","payload.multipart.FormDataAsyncClient.withWireNameWithResponse":"Payload.MultiPart.FormData.withWireName","payload.multipart.FormDataClient":"Payload.MultiPart.FormData","payload.multipart.FormDataClient.anonymousModel":"Payload.MultiPart.FormData.anonymousModel","payload.multipart.FormDataClient.anonymousModelWithResponse":"Payload.MultiPart.FormData.anonymousModel","payload.multipart.FormDataClient.basic":"Payload.MultiPart.FormData.basic","payload.multipart.FormDataClient.basicWithResponse":"Payload.MultiPart.FormData.basic","payload.multipart.FormDataClient.binaryArrayParts":"Payload.MultiPart.FormData.binaryArrayParts","payload.multipart.FormDataClient.binaryArrayPartsWithResponse":"Payload.MultiPart.FormData.binaryArrayParts","payload.multipart.FormDataClient.checkFileNameAndContentType":"Payload.MultiPart.FormData.checkFileNameAndContentType","payload.multipart.FormDataClient.checkFileNameAndContentTypeWithResponse":"Payload.MultiPart.FormData.checkFileNameAndContentType","payload.multipart.FormDataClient.fileArrayAndBasic":"Payload.MultiPart.FormData.fileArrayAndBasic","payload.multipart.FormDataClient.fileArrayAndBasicWithResponse":"Payload.MultiPart.FormData.fileArrayAndBasic","payload.multipart.FormDataClient.jsonPart":"Payload.MultiPart.FormData.jsonPart","payload.multipart.FormDataClient.jsonPartWithResponse":"Payload.MultiPart.FormData.jsonPart","payload.multipart.FormDataClient.multiBinaryParts":"Payload.MultiPart.FormData.multiBinaryParts","payload.multipart.FormDataClient.multiBinaryPartsWithResponse":"Payload.MultiPart.FormData.multiBinaryParts","payload.multipart.FormDataClient.optionalParts":"Payload.MultiPart.FormData.optionalParts","payload.multipart.FormDataClient.optionalPartsWithResponse":"Payload.MultiPart.FormData.optionalParts","payload.multipart.FormDataClient.withWireName":"Payload.MultiPart.FormData.withWireName","payload.multipart.FormDataClient.withWireNameWithResponse":"Payload.MultiPart.FormData.withWireName","payload.multipart.FormDataFileAsyncClient":"Payload.MultiPart.FormData.File","payload.multipart.FormDataFileAsyncClient.uploadFileArray":"Payload.MultiPart.FormData.File.uploadFileArray","payload.multipart.FormDataFileAsyncClient.uploadFileArrayWithResponse":"Payload.MultiPart.FormData.File.uploadFileArray","payload.multipart.FormDataFileAsyncClient.uploadFileRequiredFilename":"Payload.MultiPart.FormData.File.uploadFileRequiredFilename","payload.multipart.FormDataFileAsyncClient.uploadFileRequiredFilenameWithResponse":"Payload.MultiPart.FormData.File.uploadFileRequiredFilename","payload.multipart.FormDataFileAsyncClient.uploadFileSpecificContentType":"Payload.MultiPart.FormData.File.uploadFileSpecificContentType","payload.multipart.FormDataFileAsyncClient.uploadFileSpecificContentTypeWithResponse":"Payload.MultiPart.FormData.File.uploadFileSpecificContentType","payload.multipart.FormDataFileClient":"Payload.MultiPart.FormData.File","payload.multipart.FormDataFileClient.uploadFileArray":"Payload.MultiPart.FormData.File.uploadFileArray","payload.multipart.FormDataFileClient.uploadFileArrayWithResponse":"Payload.MultiPart.FormData.File.uploadFileArray","payload.multipart.FormDataFileClient.uploadFileRequiredFilename":"Payload.MultiPart.FormData.File.uploadFileRequiredFilename","payload.multipart.FormDataFileClient.uploadFileRequiredFilenameWithResponse":"Payload.MultiPart.FormData.File.uploadFileRequiredFilename","payload.multipart.FormDataFileClient.uploadFileSpecificContentType":"Payload.MultiPart.FormData.File.uploadFileSpecificContentType","payload.multipart.FormDataFileClient.uploadFileSpecificContentTypeWithResponse":"Payload.MultiPart.FormData.File.uploadFileSpecificContentType","payload.multipart.FormDataHttpPartsAsyncClient":"Payload.MultiPart.FormData.HttpParts","payload.multipart.FormDataHttpPartsAsyncClient.jsonArrayAndFileArray":"Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray","payload.multipart.FormDataHttpPartsAsyncClient.jsonArrayAndFileArrayWithResponse":"Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray","payload.multipart.FormDataHttpPartsClient":"Payload.MultiPart.FormData.HttpParts","payload.multipart.FormDataHttpPartsClient.jsonArrayAndFileArray":"Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray","payload.multipart.FormDataHttpPartsClient.jsonArrayAndFileArrayWithResponse":"Payload.MultiPart.FormData.HttpParts.jsonArrayAndFileArray","payload.multipart.FormDataHttpPartsContentTypeAsyncClient":"Payload.MultiPart.FormData.HttpParts.ContentType","payload.multipart.FormDataHttpPartsContentTypeAsyncClient.imageJpegContentType":"Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType","payload.multipart.FormDataHttpPartsContentTypeAsyncClient.imageJpegContentTypeWithResponse":"Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType","payload.multipart.FormDataHttpPartsContentTypeAsyncClient.optionalContentType":"Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType","payload.multipart.FormDataHttpPartsContentTypeAsyncClient.optionalContentTypeWithResponse":"Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType","payload.multipart.FormDataHttpPartsContentTypeAsyncClient.requiredContentType":"Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType","payload.multipart.FormDataHttpPartsContentTypeAsyncClient.requiredContentTypeWithResponse":"Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType","payload.multipart.FormDataHttpPartsContentTypeClient":"Payload.MultiPart.FormData.HttpParts.ContentType","payload.multipart.FormDataHttpPartsContentTypeClient.imageJpegContentType":"Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType","payload.multipart.FormDataHttpPartsContentTypeClient.imageJpegContentTypeWithResponse":"Payload.MultiPart.FormData.HttpParts.ContentType.imageJpegContentType","payload.multipart.FormDataHttpPartsContentTypeClient.optionalContentType":"Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType","payload.multipart.FormDataHttpPartsContentTypeClient.optionalContentTypeWithResponse":"Payload.MultiPart.FormData.HttpParts.ContentType.optionalContentType","payload.multipart.FormDataHttpPartsContentTypeClient.requiredContentType":"Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType","payload.multipart.FormDataHttpPartsContentTypeClient.requiredContentTypeWithResponse":"Payload.MultiPart.FormData.HttpParts.ContentType.requiredContentType","payload.multipart.FormDataHttpPartsNonStringAsyncClient":"Payload.MultiPart.FormData.HttpParts.NonString","payload.multipart.FormDataHttpPartsNonStringAsyncClient.floatMethod":"Payload.MultiPart.FormData.HttpParts.NonString.float","payload.multipart.FormDataHttpPartsNonStringAsyncClient.floatMethodWithResponse":"Payload.MultiPart.FormData.HttpParts.NonString.float","payload.multipart.FormDataHttpPartsNonStringClient":"Payload.MultiPart.FormData.HttpParts.NonString","payload.multipart.FormDataHttpPartsNonStringClient.floatMethod":"Payload.MultiPart.FormData.HttpParts.NonString.float","payload.multipart.FormDataHttpPartsNonStringClient.floatMethodWithResponse":"Payload.MultiPart.FormData.HttpParts.NonString.float","payload.multipart.MultiPartClientBuilder":"Payload.MultiPart","payload.multipart.formdata.file.models.FileWithRequiredFilename":"Payload.MultiPart.FormData.File.FileWithRequiredFilename","payload.multipart.formdata.file.models.UploadFileArrayRequest":"Payload.MultiPart.FormData.File.uploadFileArray.Request.anonymous","payload.multipart.formdata.file.models.UploadFileRequiredFilenameRequest":"Payload.MultiPart.FormData.File.uploadFileRequiredFilename.Request.anonymous","payload.multipart.formdata.file.models.UploadFileSpecificContentTypeRequest":"Payload.MultiPart.FormData.File.uploadFileSpecificContentType.Request.anonymous","payload.multipart.formdata.httpparts.nonstring.models.FloatRequest":"Payload.MultiPart.FormData.HttpParts.NonString.float.Request.anonymous","payload.multipart.formdata.models.AnonymousModelRequest":"Payload.MultiPart.FormData.anonymousModel.Request.anonymous","payload.multipart.models.Address":"Payload.MultiPart.Address","payload.multipart.models.BinaryArrayPartsRequest":"Payload.MultiPart.BinaryArrayPartsRequest","payload.multipart.models.ComplexHttpPartsModelRequest":"Payload.MultiPart.ComplexHttpPartsModelRequest","payload.multipart.models.ComplexPartsRequest":"Payload.MultiPart.ComplexPartsRequest","payload.multipart.models.FileDetails":"TypeSpec.Http.File","payload.multipart.models.FileOptionalContentType":"Payload.MultiPart.FileOptionalContentType","payload.multipart.models.FileRequiredMetaData":"Payload.MultiPart.FileRequiredMetaData","payload.multipart.models.FileSpecificContentType":"Payload.MultiPart.FileSpecificContentType","payload.multipart.models.FileWithHttpPartOptionalContentTypeRequest":"Payload.MultiPart.FileWithHttpPartOptionalContentTypeRequest","payload.multipart.models.FileWithHttpPartRequiredContentTypeRequest":"Payload.MultiPart.FileWithHttpPartRequiredContentTypeRequest","payload.multipart.models.FileWithHttpPartSpecificContentTypeRequest":"Payload.MultiPart.FileWithHttpPartSpecificContentTypeRequest","payload.multipart.models.FilesFileDetails":"TypeSpec.Http.File","payload.multipart.models.ImageFileDetails":null,"payload.multipart.models.JsonPartRequest":"Payload.MultiPart.JsonPartRequest","payload.multipart.models.MultiBinaryPartsRequest":"Payload.MultiPart.MultiBinaryPartsRequest","payload.multipart.models.MultiPartOptionalRequest":"Payload.MultiPart.MultiPartOptionalRequest","payload.multipart.models.MultiPartRequest":"Payload.MultiPart.MultiPartRequest","payload.multipart.models.MultiPartRequestWithWireName":"Payload.MultiPart.MultiPartRequestWithWireName","payload.multipart.models.PictureFileDetails":null,"payload.multipart.models.PicturesFileDetails":null,"payload.multipart.models.ProfileImageFileDetails":null},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/multipart/FormDataAsyncClient.java","src/main/java/payload/multipart/FormDataClient.java","src/main/java/payload/multipart/FormDataFileAsyncClient.java","src/main/java/payload/multipart/FormDataFileClient.java","src/main/java/payload/multipart/FormDataHttpPartsAsyncClient.java","src/main/java/payload/multipart/FormDataHttpPartsClient.java","src/main/java/payload/multipart/FormDataHttpPartsContentTypeAsyncClient.java","src/main/java/payload/multipart/FormDataHttpPartsContentTypeClient.java","src/main/java/payload/multipart/FormDataHttpPartsNonStringAsyncClient.java","src/main/java/payload/multipart/FormDataHttpPartsNonStringClient.java","src/main/java/payload/multipart/MultiPartClientBuilder.java","src/main/java/payload/multipart/formdata/file/models/FileWithRequiredFilename.java","src/main/java/payload/multipart/formdata/file/models/UploadFileArrayRequest.java","src/main/java/payload/multipart/formdata/file/models/UploadFileRequiredFilenameRequest.java","src/main/java/payload/multipart/formdata/file/models/UploadFileSpecificContentTypeRequest.java","src/main/java/payload/multipart/formdata/file/models/package-info.java","src/main/java/payload/multipart/formdata/httpparts/nonstring/models/FloatRequest.java","src/main/java/payload/multipart/formdata/httpparts/nonstring/models/package-info.java","src/main/java/payload/multipart/formdata/models/AnonymousModelRequest.java","src/main/java/payload/multipart/formdata/models/package-info.java","src/main/java/payload/multipart/implementation/FormDataFilesImpl.java","src/main/java/payload/multipart/implementation/FormDataHttpPartsContentTypesImpl.java","src/main/java/payload/multipart/implementation/FormDataHttpPartsImpl.java","src/main/java/payload/multipart/implementation/FormDataHttpPartsNonStringsImpl.java","src/main/java/payload/multipart/implementation/FormDatasImpl.java","src/main/java/payload/multipart/implementation/MultiPartClientImpl.java","src/main/java/payload/multipart/implementation/MultipartFormDataHelper.java","src/main/java/payload/multipart/implementation/package-info.java","src/main/java/payload/multipart/models/Address.java","src/main/java/payload/multipart/models/BinaryArrayPartsRequest.java","src/main/java/payload/multipart/models/ComplexHttpPartsModelRequest.java","src/main/java/payload/multipart/models/ComplexPartsRequest.java","src/main/java/payload/multipart/models/FileDetails.java","src/main/java/payload/multipart/models/FileOptionalContentType.java","src/main/java/payload/multipart/models/FileRequiredMetaData.java","src/main/java/payload/multipart/models/FileSpecificContentType.java","src/main/java/payload/multipart/models/FileWithHttpPartOptionalContentTypeRequest.java","src/main/java/payload/multipart/models/FileWithHttpPartRequiredContentTypeRequest.java","src/main/java/payload/multipart/models/FileWithHttpPartSpecificContentTypeRequest.java","src/main/java/payload/multipart/models/FilesFileDetails.java","src/main/java/payload/multipart/models/ImageFileDetails.java","src/main/java/payload/multipart/models/JsonPartRequest.java","src/main/java/payload/multipart/models/MultiBinaryPartsRequest.java","src/main/java/payload/multipart/models/MultiPartOptionalRequest.java","src/main/java/payload/multipart/models/MultiPartRequest.java","src/main/java/payload/multipart/models/MultiPartRequestWithWireName.java","src/main/java/payload/multipart/models/PictureFileDetails.java","src/main/java/payload/multipart/models/PicturesFileDetails.java","src/main/java/payload/multipart/models/ProfileImageFileDetails.java","src/main/java/payload/multipart/models/package-info.java","src/main/java/payload/multipart/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/resiliency-servicedriven-v1_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/resiliency-servicedriven-v1_apiview_properties.json deleted file mode 100644 index a9628906051..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/resiliency-servicedriven-v1_apiview_properties.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient": "Resiliency.ServiceDriven", - "resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient.fromNone": "Resiliency.ServiceDriven.AddOptionalParam.fromNone", - "resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient.fromNoneWithResponse": "Resiliency.ServiceDriven.AddOptionalParam.fromNone", - "resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient.fromOneOptional": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional", - "resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient.fromOneOptionalWithResponse": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional", - "resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient.fromOneRequired": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired", - "resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient.fromOneRequiredWithResponse": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired", - "resiliency.servicedriven.v1.ResiliencyServiceDrivenClient": "Resiliency.ServiceDriven", - "resiliency.servicedriven.v1.ResiliencyServiceDrivenClient.fromNone": "Resiliency.ServiceDriven.AddOptionalParam.fromNone", - "resiliency.servicedriven.v1.ResiliencyServiceDrivenClient.fromNoneWithResponse": "Resiliency.ServiceDriven.AddOptionalParam.fromNone", - "resiliency.servicedriven.v1.ResiliencyServiceDrivenClient.fromOneOptional": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional", - "resiliency.servicedriven.v1.ResiliencyServiceDrivenClient.fromOneOptionalWithResponse": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional", - "resiliency.servicedriven.v1.ResiliencyServiceDrivenClient.fromOneRequired": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired", - "resiliency.servicedriven.v1.ResiliencyServiceDrivenClient.fromOneRequiredWithResponse": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired", - "resiliency.servicedriven.v1.ResiliencyServiceDrivenClientBuilder": "Resiliency.ServiceDriven" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/resiliency-servicedriven-v1_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/resiliency-servicedriven-v1_metadata.json index 916871c2b60..6911e64e707 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/resiliency-servicedriven-v1_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/resiliency-servicedriven-v1_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"all","crossLanguageDefinitions":{"resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient":"Resiliency.ServiceDriven","resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient.fromNone":"Resiliency.ServiceDriven.AddOptionalParam.fromNone","resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient.fromNoneWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromNone","resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient.fromOneOptional":"Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional","resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient.fromOneOptionalWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional","resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient.fromOneRequired":"Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired","resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient.fromOneRequiredWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired","resiliency.servicedriven.v1.ResiliencyServiceDrivenClient":"Resiliency.ServiceDriven","resiliency.servicedriven.v1.ResiliencyServiceDrivenClient.fromNone":"Resiliency.ServiceDriven.AddOptionalParam.fromNone","resiliency.servicedriven.v1.ResiliencyServiceDrivenClient.fromNoneWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromNone","resiliency.servicedriven.v1.ResiliencyServiceDrivenClient.fromOneOptional":"Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional","resiliency.servicedriven.v1.ResiliencyServiceDrivenClient.fromOneOptionalWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional","resiliency.servicedriven.v1.ResiliencyServiceDrivenClient.fromOneRequired":"Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired","resiliency.servicedriven.v1.ResiliencyServiceDrivenClient.fromOneRequiredWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired","resiliency.servicedriven.v1.ResiliencyServiceDrivenClientBuilder":"Resiliency.ServiceDriven"},"generatedFiles":["src/main/java/module-info.java","src/main/java/resiliency/servicedriven/v1/ResiliencyServiceDrivenAsyncClient.java","src/main/java/resiliency/servicedriven/v1/ResiliencyServiceDrivenClient.java","src/main/java/resiliency/servicedriven/v1/ResiliencyServiceDrivenClientBuilder.java","src/main/java/resiliency/servicedriven/v1/ServiceDrivenServiceVersion.java","src/main/java/resiliency/servicedriven/v1/implementation/ResiliencyServiceDrivenClientImpl.java","src/main/java/resiliency/servicedriven/v1/implementation/package-info.java","src/main/java/resiliency/servicedriven/v1/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Resiliency.ServiceDriven":"all"},"crossLanguageDefinitions":{"resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient":"Resiliency.ServiceDriven","resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient.fromNone":"Resiliency.ServiceDriven.AddOptionalParam.fromNone","resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient.fromNoneWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromNone","resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient.fromOneOptional":"Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional","resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient.fromOneOptionalWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional","resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient.fromOneRequired":"Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired","resiliency.servicedriven.v1.ResiliencyServiceDrivenAsyncClient.fromOneRequiredWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired","resiliency.servicedriven.v1.ResiliencyServiceDrivenClient":"Resiliency.ServiceDriven","resiliency.servicedriven.v1.ResiliencyServiceDrivenClient.fromNone":"Resiliency.ServiceDriven.AddOptionalParam.fromNone","resiliency.servicedriven.v1.ResiliencyServiceDrivenClient.fromNoneWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromNone","resiliency.servicedriven.v1.ResiliencyServiceDrivenClient.fromOneOptional":"Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional","resiliency.servicedriven.v1.ResiliencyServiceDrivenClient.fromOneOptionalWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional","resiliency.servicedriven.v1.ResiliencyServiceDrivenClient.fromOneRequired":"Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired","resiliency.servicedriven.v1.ResiliencyServiceDrivenClient.fromOneRequiredWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired","resiliency.servicedriven.v1.ResiliencyServiceDrivenClientBuilder":"Resiliency.ServiceDriven"},"generatedFiles":["src/main/java/module-info.java","src/main/java/resiliency/servicedriven/v1/ResiliencyServiceDrivenAsyncClient.java","src/main/java/resiliency/servicedriven/v1/ResiliencyServiceDrivenClient.java","src/main/java/resiliency/servicedriven/v1/ResiliencyServiceDrivenClientBuilder.java","src/main/java/resiliency/servicedriven/v1/ServiceDrivenServiceVersion.java","src/main/java/resiliency/servicedriven/v1/implementation/ResiliencyServiceDrivenClientImpl.java","src/main/java/resiliency/servicedriven/v1/implementation/package-info.java","src/main/java/resiliency/servicedriven/v1/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/resiliency-servicedriven_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/resiliency-servicedriven_apiview_properties.json deleted file mode 100644 index 46deca191e8..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/resiliency-servicedriven_apiview_properties.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient": "Resiliency.ServiceDriven", - "resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.addOperation": "Resiliency.ServiceDriven.addOperation", - "resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.addOperationWithResponse": "Resiliency.ServiceDriven.addOperation", - "resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.fromNone": "Resiliency.ServiceDriven.AddOptionalParam.fromNone", - "resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.fromNoneWithResponse": "Resiliency.ServiceDriven.AddOptionalParam.fromNone", - "resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.fromOneOptional": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional", - "resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.fromOneOptionalWithResponse": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional", - "resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.fromOneRequired": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired", - "resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.fromOneRequiredWithResponse": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired", - "resiliency.servicedriven.ResiliencyServiceDrivenClient": "Resiliency.ServiceDriven", - "resiliency.servicedriven.ResiliencyServiceDrivenClient.addOperation": "Resiliency.ServiceDriven.addOperation", - "resiliency.servicedriven.ResiliencyServiceDrivenClient.addOperationWithResponse": "Resiliency.ServiceDriven.addOperation", - "resiliency.servicedriven.ResiliencyServiceDrivenClient.fromNone": "Resiliency.ServiceDriven.AddOptionalParam.fromNone", - "resiliency.servicedriven.ResiliencyServiceDrivenClient.fromNoneWithResponse": "Resiliency.ServiceDriven.AddOptionalParam.fromNone", - "resiliency.servicedriven.ResiliencyServiceDrivenClient.fromOneOptional": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional", - "resiliency.servicedriven.ResiliencyServiceDrivenClient.fromOneOptionalWithResponse": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional", - "resiliency.servicedriven.ResiliencyServiceDrivenClient.fromOneRequired": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired", - "resiliency.servicedriven.ResiliencyServiceDrivenClient.fromOneRequiredWithResponse": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired", - "resiliency.servicedriven.ResiliencyServiceDrivenClientBuilder": "Resiliency.ServiceDriven" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/resiliency-servicedriven_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/resiliency-servicedriven_metadata.json index 15907f7f4a4..d1da83d5c2b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/resiliency-servicedriven_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/resiliency-servicedriven_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"all","crossLanguageDefinitions":{"resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient":"Resiliency.ServiceDriven","resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.addOperation":"Resiliency.ServiceDriven.addOperation","resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.addOperationWithResponse":"Resiliency.ServiceDriven.addOperation","resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.fromNone":"Resiliency.ServiceDriven.AddOptionalParam.fromNone","resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.fromNoneWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromNone","resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.fromOneOptional":"Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional","resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.fromOneOptionalWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional","resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.fromOneRequired":"Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired","resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.fromOneRequiredWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired","resiliency.servicedriven.ResiliencyServiceDrivenClient":"Resiliency.ServiceDriven","resiliency.servicedriven.ResiliencyServiceDrivenClient.addOperation":"Resiliency.ServiceDriven.addOperation","resiliency.servicedriven.ResiliencyServiceDrivenClient.addOperationWithResponse":"Resiliency.ServiceDriven.addOperation","resiliency.servicedriven.ResiliencyServiceDrivenClient.fromNone":"Resiliency.ServiceDriven.AddOptionalParam.fromNone","resiliency.servicedriven.ResiliencyServiceDrivenClient.fromNoneWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromNone","resiliency.servicedriven.ResiliencyServiceDrivenClient.fromOneOptional":"Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional","resiliency.servicedriven.ResiliencyServiceDrivenClient.fromOneOptionalWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional","resiliency.servicedriven.ResiliencyServiceDrivenClient.fromOneRequired":"Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired","resiliency.servicedriven.ResiliencyServiceDrivenClient.fromOneRequiredWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired","resiliency.servicedriven.ResiliencyServiceDrivenClientBuilder":"Resiliency.ServiceDriven"},"generatedFiles":["src/main/java/module-info.java","src/main/java/resiliency/servicedriven/ResiliencyServiceDrivenAsyncClient.java","src/main/java/resiliency/servicedriven/ResiliencyServiceDrivenClient.java","src/main/java/resiliency/servicedriven/ResiliencyServiceDrivenClientBuilder.java","src/main/java/resiliency/servicedriven/ServiceDrivenServiceVersion.java","src/main/java/resiliency/servicedriven/implementation/ResiliencyServiceDrivenClientImpl.java","src/main/java/resiliency/servicedriven/implementation/package-info.java","src/main/java/resiliency/servicedriven/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Resiliency.ServiceDriven":"all"},"crossLanguageDefinitions":{"resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient":"Resiliency.ServiceDriven","resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.addOperation":"Resiliency.ServiceDriven.addOperation","resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.addOperationWithResponse":"Resiliency.ServiceDriven.addOperation","resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.fromNone":"Resiliency.ServiceDriven.AddOptionalParam.fromNone","resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.fromNoneWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromNone","resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.fromOneOptional":"Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional","resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.fromOneOptionalWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional","resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.fromOneRequired":"Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired","resiliency.servicedriven.ResiliencyServiceDrivenAsyncClient.fromOneRequiredWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired","resiliency.servicedriven.ResiliencyServiceDrivenClient":"Resiliency.ServiceDriven","resiliency.servicedriven.ResiliencyServiceDrivenClient.addOperation":"Resiliency.ServiceDriven.addOperation","resiliency.servicedriven.ResiliencyServiceDrivenClient.addOperationWithResponse":"Resiliency.ServiceDriven.addOperation","resiliency.servicedriven.ResiliencyServiceDrivenClient.fromNone":"Resiliency.ServiceDriven.AddOptionalParam.fromNone","resiliency.servicedriven.ResiliencyServiceDrivenClient.fromNoneWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromNone","resiliency.servicedriven.ResiliencyServiceDrivenClient.fromOneOptional":"Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional","resiliency.servicedriven.ResiliencyServiceDrivenClient.fromOneOptionalWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional","resiliency.servicedriven.ResiliencyServiceDrivenClient.fromOneRequired":"Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired","resiliency.servicedriven.ResiliencyServiceDrivenClient.fromOneRequiredWithResponse":"Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired","resiliency.servicedriven.ResiliencyServiceDrivenClientBuilder":"Resiliency.ServiceDriven"},"generatedFiles":["src/main/java/module-info.java","src/main/java/resiliency/servicedriven/ResiliencyServiceDrivenAsyncClient.java","src/main/java/resiliency/servicedriven/ResiliencyServiceDrivenClient.java","src/main/java/resiliency/servicedriven/ResiliencyServiceDrivenClientBuilder.java","src/main/java/resiliency/servicedriven/ServiceDrivenServiceVersion.java","src/main/java/resiliency/servicedriven/implementation/ResiliencyServiceDrivenClientImpl.java","src/main/java/resiliency/servicedriven/implementation/package-info.java","src/main/java/resiliency/servicedriven/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/response-statuscoderange_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/response-statuscoderange_apiview_properties.json deleted file mode 100644 index 916a08548b1..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/response-statuscoderange_apiview_properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "response.statuscoderange.StatusCodeRangeAsyncClient": "Response.StatusCodeRange", - "response.statuscoderange.StatusCodeRangeAsyncClient.errorResponseStatusCode404": "Response.StatusCodeRange.errorResponseStatusCode404", - "response.statuscoderange.StatusCodeRangeAsyncClient.errorResponseStatusCode404WithResponse": "Response.StatusCodeRange.errorResponseStatusCode404", - "response.statuscoderange.StatusCodeRangeAsyncClient.errorResponseStatusCodeInRange": "Response.StatusCodeRange.errorResponseStatusCodeInRange", - "response.statuscoderange.StatusCodeRangeAsyncClient.errorResponseStatusCodeInRangeWithResponse": "Response.StatusCodeRange.errorResponseStatusCodeInRange", - "response.statuscoderange.StatusCodeRangeClient": "Response.StatusCodeRange", - "response.statuscoderange.StatusCodeRangeClient.errorResponseStatusCode404": "Response.StatusCodeRange.errorResponseStatusCode404", - "response.statuscoderange.StatusCodeRangeClient.errorResponseStatusCode404WithResponse": "Response.StatusCodeRange.errorResponseStatusCode404", - "response.statuscoderange.StatusCodeRangeClient.errorResponseStatusCodeInRange": "Response.StatusCodeRange.errorResponseStatusCodeInRange", - "response.statuscoderange.StatusCodeRangeClient.errorResponseStatusCodeInRangeWithResponse": "Response.StatusCodeRange.errorResponseStatusCodeInRange", - "response.statuscoderange.StatusCodeRangeClientBuilder": "Response.StatusCodeRange" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/response-statuscoderange_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/response-statuscoderange_metadata.json index 15d6f0b192d..0d2a6959030 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/response-statuscoderange_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/response-statuscoderange_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"response.statuscoderange.StatusCodeRangeAsyncClient":"Response.StatusCodeRange","response.statuscoderange.StatusCodeRangeAsyncClient.errorResponseStatusCode404":"Response.StatusCodeRange.errorResponseStatusCode404","response.statuscoderange.StatusCodeRangeAsyncClient.errorResponseStatusCode404WithResponse":"Response.StatusCodeRange.errorResponseStatusCode404","response.statuscoderange.StatusCodeRangeAsyncClient.errorResponseStatusCodeInRange":"Response.StatusCodeRange.errorResponseStatusCodeInRange","response.statuscoderange.StatusCodeRangeAsyncClient.errorResponseStatusCodeInRangeWithResponse":"Response.StatusCodeRange.errorResponseStatusCodeInRange","response.statuscoderange.StatusCodeRangeClient":"Response.StatusCodeRange","response.statuscoderange.StatusCodeRangeClient.errorResponseStatusCode404":"Response.StatusCodeRange.errorResponseStatusCode404","response.statuscoderange.StatusCodeRangeClient.errorResponseStatusCode404WithResponse":"Response.StatusCodeRange.errorResponseStatusCode404","response.statuscoderange.StatusCodeRangeClient.errorResponseStatusCodeInRange":"Response.StatusCodeRange.errorResponseStatusCodeInRange","response.statuscoderange.StatusCodeRangeClient.errorResponseStatusCodeInRangeWithResponse":"Response.StatusCodeRange.errorResponseStatusCodeInRange","response.statuscoderange.StatusCodeRangeClientBuilder":"Response.StatusCodeRange"},"generatedFiles":["src/main/java/module-info.java","src/main/java/response/statuscoderange/StatusCodeRangeAsyncClient.java","src/main/java/response/statuscoderange/StatusCodeRangeClient.java","src/main/java/response/statuscoderange/StatusCodeRangeClientBuilder.java","src/main/java/response/statuscoderange/implementation/StatusCodeRangeClientImpl.java","src/main/java/response/statuscoderange/implementation/package-info.java","src/main/java/response/statuscoderange/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"response.statuscoderange.StatusCodeRangeAsyncClient":"Response.StatusCodeRange","response.statuscoderange.StatusCodeRangeAsyncClient.errorResponseStatusCode404":"Response.StatusCodeRange.errorResponseStatusCode404","response.statuscoderange.StatusCodeRangeAsyncClient.errorResponseStatusCode404WithResponse":"Response.StatusCodeRange.errorResponseStatusCode404","response.statuscoderange.StatusCodeRangeAsyncClient.errorResponseStatusCodeInRange":"Response.StatusCodeRange.errorResponseStatusCodeInRange","response.statuscoderange.StatusCodeRangeAsyncClient.errorResponseStatusCodeInRangeWithResponse":"Response.StatusCodeRange.errorResponseStatusCodeInRange","response.statuscoderange.StatusCodeRangeClient":"Response.StatusCodeRange","response.statuscoderange.StatusCodeRangeClient.errorResponseStatusCode404":"Response.StatusCodeRange.errorResponseStatusCode404","response.statuscoderange.StatusCodeRangeClient.errorResponseStatusCode404WithResponse":"Response.StatusCodeRange.errorResponseStatusCode404","response.statuscoderange.StatusCodeRangeClient.errorResponseStatusCodeInRange":"Response.StatusCodeRange.errorResponseStatusCodeInRange","response.statuscoderange.StatusCodeRangeClient.errorResponseStatusCodeInRangeWithResponse":"Response.StatusCodeRange.errorResponseStatusCodeInRange","response.statuscoderange.StatusCodeRangeClientBuilder":"Response.StatusCodeRange"},"generatedFiles":["src/main/java/module-info.java","src/main/java/response/statuscoderange/StatusCodeRangeAsyncClient.java","src/main/java/response/statuscoderange/StatusCodeRangeClient.java","src/main/java/response/statuscoderange/StatusCodeRangeClientBuilder.java","src/main/java/response/statuscoderange/implementation/StatusCodeRangeClientImpl.java","src/main/java/response/statuscoderange/implementation/package-info.java","src/main/java/response/statuscoderange/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/routes_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/routes_apiview_properties.json deleted file mode 100644 index f2c4c80ec03..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/routes_apiview_properties.json +++ /dev/null @@ -1,224 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "routes.InInterfaceAsyncClient": "Routes.InInterface", - "routes.InInterfaceAsyncClient.fixed": "Routes.InInterface.fixed", - "routes.InInterfaceAsyncClient.fixedWithResponse": "Routes.InInterface.fixed", - "routes.InInterfaceClient": "Routes.InInterface", - "routes.InInterfaceClient.fixed": "Routes.InInterface.fixed", - "routes.InInterfaceClient.fixedWithResponse": "Routes.InInterface.fixed", - "routes.PathParametersAsyncClient": "Routes.PathParameters", - "routes.PathParametersAsyncClient.annotationOnly": "Routes.PathParameters.annotationOnly", - "routes.PathParametersAsyncClient.annotationOnlyWithResponse": "Routes.PathParameters.annotationOnly", - "routes.PathParametersAsyncClient.explicit": "Routes.PathParameters.explicit", - "routes.PathParametersAsyncClient.explicitWithResponse": "Routes.PathParameters.explicit", - "routes.PathParametersAsyncClient.templateOnly": "Routes.PathParameters.templateOnly", - "routes.PathParametersAsyncClient.templateOnlyWithResponse": "Routes.PathParameters.templateOnly", - "routes.PathParametersClient": "Routes.PathParameters", - "routes.PathParametersClient.annotationOnly": "Routes.PathParameters.annotationOnly", - "routes.PathParametersClient.annotationOnlyWithResponse": "Routes.PathParameters.annotationOnly", - "routes.PathParametersClient.explicit": "Routes.PathParameters.explicit", - "routes.PathParametersClient.explicitWithResponse": "Routes.PathParameters.explicit", - "routes.PathParametersClient.templateOnly": "Routes.PathParameters.templateOnly", - "routes.PathParametersClient.templateOnlyWithResponse": "Routes.PathParameters.templateOnly", - "routes.PathParametersLabelExpansionExplodeAsyncClient": "Routes.PathParameters.LabelExpansion.Explode", - "routes.PathParametersLabelExpansionExplodeAsyncClient.array": "Routes.PathParameters.LabelExpansion.Explode.array", - "routes.PathParametersLabelExpansionExplodeAsyncClient.arrayWithResponse": "Routes.PathParameters.LabelExpansion.Explode.array", - "routes.PathParametersLabelExpansionExplodeAsyncClient.primitive": "Routes.PathParameters.LabelExpansion.Explode.primitive", - "routes.PathParametersLabelExpansionExplodeAsyncClient.primitiveWithResponse": "Routes.PathParameters.LabelExpansion.Explode.primitive", - "routes.PathParametersLabelExpansionExplodeAsyncClient.record": "Routes.PathParameters.LabelExpansion.Explode.record", - "routes.PathParametersLabelExpansionExplodeAsyncClient.recordWithResponse": "Routes.PathParameters.LabelExpansion.Explode.record", - "routes.PathParametersLabelExpansionExplodeClient": "Routes.PathParameters.LabelExpansion.Explode", - "routes.PathParametersLabelExpansionExplodeClient.array": "Routes.PathParameters.LabelExpansion.Explode.array", - "routes.PathParametersLabelExpansionExplodeClient.arrayWithResponse": "Routes.PathParameters.LabelExpansion.Explode.array", - "routes.PathParametersLabelExpansionExplodeClient.primitive": "Routes.PathParameters.LabelExpansion.Explode.primitive", - "routes.PathParametersLabelExpansionExplodeClient.primitiveWithResponse": "Routes.PathParameters.LabelExpansion.Explode.primitive", - "routes.PathParametersLabelExpansionExplodeClient.record": "Routes.PathParameters.LabelExpansion.Explode.record", - "routes.PathParametersLabelExpansionExplodeClient.recordWithResponse": "Routes.PathParameters.LabelExpansion.Explode.record", - "routes.PathParametersLabelExpansionStandardAsyncClient": "Routes.PathParameters.LabelExpansion.Standard", - "routes.PathParametersLabelExpansionStandardAsyncClient.array": "Routes.PathParameters.LabelExpansion.Standard.array", - "routes.PathParametersLabelExpansionStandardAsyncClient.arrayWithResponse": "Routes.PathParameters.LabelExpansion.Standard.array", - "routes.PathParametersLabelExpansionStandardAsyncClient.primitive": "Routes.PathParameters.LabelExpansion.Standard.primitive", - "routes.PathParametersLabelExpansionStandardAsyncClient.primitiveWithResponse": "Routes.PathParameters.LabelExpansion.Standard.primitive", - "routes.PathParametersLabelExpansionStandardAsyncClient.record": "Routes.PathParameters.LabelExpansion.Standard.record", - "routes.PathParametersLabelExpansionStandardAsyncClient.recordWithResponse": "Routes.PathParameters.LabelExpansion.Standard.record", - "routes.PathParametersLabelExpansionStandardClient": "Routes.PathParameters.LabelExpansion.Standard", - "routes.PathParametersLabelExpansionStandardClient.array": "Routes.PathParameters.LabelExpansion.Standard.array", - "routes.PathParametersLabelExpansionStandardClient.arrayWithResponse": "Routes.PathParameters.LabelExpansion.Standard.array", - "routes.PathParametersLabelExpansionStandardClient.primitive": "Routes.PathParameters.LabelExpansion.Standard.primitive", - "routes.PathParametersLabelExpansionStandardClient.primitiveWithResponse": "Routes.PathParameters.LabelExpansion.Standard.primitive", - "routes.PathParametersLabelExpansionStandardClient.record": "Routes.PathParameters.LabelExpansion.Standard.record", - "routes.PathParametersLabelExpansionStandardClient.recordWithResponse": "Routes.PathParameters.LabelExpansion.Standard.record", - "routes.PathParametersMatrixExpansionExplodeAsyncClient": "Routes.PathParameters.MatrixExpansion.Explode", - "routes.PathParametersMatrixExpansionExplodeAsyncClient.array": "Routes.PathParameters.MatrixExpansion.Explode.array", - "routes.PathParametersMatrixExpansionExplodeAsyncClient.arrayWithResponse": "Routes.PathParameters.MatrixExpansion.Explode.array", - "routes.PathParametersMatrixExpansionExplodeAsyncClient.primitive": "Routes.PathParameters.MatrixExpansion.Explode.primitive", - "routes.PathParametersMatrixExpansionExplodeAsyncClient.primitiveWithResponse": "Routes.PathParameters.MatrixExpansion.Explode.primitive", - "routes.PathParametersMatrixExpansionExplodeAsyncClient.record": "Routes.PathParameters.MatrixExpansion.Explode.record", - "routes.PathParametersMatrixExpansionExplodeAsyncClient.recordWithResponse": "Routes.PathParameters.MatrixExpansion.Explode.record", - "routes.PathParametersMatrixExpansionExplodeClient": "Routes.PathParameters.MatrixExpansion.Explode", - "routes.PathParametersMatrixExpansionExplodeClient.array": "Routes.PathParameters.MatrixExpansion.Explode.array", - "routes.PathParametersMatrixExpansionExplodeClient.arrayWithResponse": "Routes.PathParameters.MatrixExpansion.Explode.array", - "routes.PathParametersMatrixExpansionExplodeClient.primitive": "Routes.PathParameters.MatrixExpansion.Explode.primitive", - "routes.PathParametersMatrixExpansionExplodeClient.primitiveWithResponse": "Routes.PathParameters.MatrixExpansion.Explode.primitive", - "routes.PathParametersMatrixExpansionExplodeClient.record": "Routes.PathParameters.MatrixExpansion.Explode.record", - "routes.PathParametersMatrixExpansionExplodeClient.recordWithResponse": "Routes.PathParameters.MatrixExpansion.Explode.record", - "routes.PathParametersMatrixExpansionStandardAsyncClient": "Routes.PathParameters.MatrixExpansion.Standard", - "routes.PathParametersMatrixExpansionStandardAsyncClient.array": "Routes.PathParameters.MatrixExpansion.Standard.array", - "routes.PathParametersMatrixExpansionStandardAsyncClient.arrayWithResponse": "Routes.PathParameters.MatrixExpansion.Standard.array", - "routes.PathParametersMatrixExpansionStandardAsyncClient.primitive": "Routes.PathParameters.MatrixExpansion.Standard.primitive", - "routes.PathParametersMatrixExpansionStandardAsyncClient.primitiveWithResponse": "Routes.PathParameters.MatrixExpansion.Standard.primitive", - "routes.PathParametersMatrixExpansionStandardAsyncClient.record": "Routes.PathParameters.MatrixExpansion.Standard.record", - "routes.PathParametersMatrixExpansionStandardAsyncClient.recordWithResponse": "Routes.PathParameters.MatrixExpansion.Standard.record", - "routes.PathParametersMatrixExpansionStandardClient": "Routes.PathParameters.MatrixExpansion.Standard", - "routes.PathParametersMatrixExpansionStandardClient.array": "Routes.PathParameters.MatrixExpansion.Standard.array", - "routes.PathParametersMatrixExpansionStandardClient.arrayWithResponse": "Routes.PathParameters.MatrixExpansion.Standard.array", - "routes.PathParametersMatrixExpansionStandardClient.primitive": "Routes.PathParameters.MatrixExpansion.Standard.primitive", - "routes.PathParametersMatrixExpansionStandardClient.primitiveWithResponse": "Routes.PathParameters.MatrixExpansion.Standard.primitive", - "routes.PathParametersMatrixExpansionStandardClient.record": "Routes.PathParameters.MatrixExpansion.Standard.record", - "routes.PathParametersMatrixExpansionStandardClient.recordWithResponse": "Routes.PathParameters.MatrixExpansion.Standard.record", - "routes.PathParametersPathExpansionExplodeAsyncClient": "Routes.PathParameters.PathExpansion.Explode", - "routes.PathParametersPathExpansionExplodeAsyncClient.array": "Routes.PathParameters.PathExpansion.Explode.array", - "routes.PathParametersPathExpansionExplodeAsyncClient.arrayWithResponse": "Routes.PathParameters.PathExpansion.Explode.array", - "routes.PathParametersPathExpansionExplodeAsyncClient.primitive": "Routes.PathParameters.PathExpansion.Explode.primitive", - "routes.PathParametersPathExpansionExplodeAsyncClient.primitiveWithResponse": "Routes.PathParameters.PathExpansion.Explode.primitive", - "routes.PathParametersPathExpansionExplodeAsyncClient.record": "Routes.PathParameters.PathExpansion.Explode.record", - "routes.PathParametersPathExpansionExplodeAsyncClient.recordWithResponse": "Routes.PathParameters.PathExpansion.Explode.record", - "routes.PathParametersPathExpansionExplodeClient": "Routes.PathParameters.PathExpansion.Explode", - "routes.PathParametersPathExpansionExplodeClient.array": "Routes.PathParameters.PathExpansion.Explode.array", - "routes.PathParametersPathExpansionExplodeClient.arrayWithResponse": "Routes.PathParameters.PathExpansion.Explode.array", - "routes.PathParametersPathExpansionExplodeClient.primitive": "Routes.PathParameters.PathExpansion.Explode.primitive", - "routes.PathParametersPathExpansionExplodeClient.primitiveWithResponse": "Routes.PathParameters.PathExpansion.Explode.primitive", - "routes.PathParametersPathExpansionExplodeClient.record": "Routes.PathParameters.PathExpansion.Explode.record", - "routes.PathParametersPathExpansionExplodeClient.recordWithResponse": "Routes.PathParameters.PathExpansion.Explode.record", - "routes.PathParametersPathExpansionStandardAsyncClient": "Routes.PathParameters.PathExpansion.Standard", - "routes.PathParametersPathExpansionStandardAsyncClient.array": "Routes.PathParameters.PathExpansion.Standard.array", - "routes.PathParametersPathExpansionStandardAsyncClient.arrayWithResponse": "Routes.PathParameters.PathExpansion.Standard.array", - "routes.PathParametersPathExpansionStandardAsyncClient.primitive": "Routes.PathParameters.PathExpansion.Standard.primitive", - "routes.PathParametersPathExpansionStandardAsyncClient.primitiveWithResponse": "Routes.PathParameters.PathExpansion.Standard.primitive", - "routes.PathParametersPathExpansionStandardAsyncClient.record": "Routes.PathParameters.PathExpansion.Standard.record", - "routes.PathParametersPathExpansionStandardAsyncClient.recordWithResponse": "Routes.PathParameters.PathExpansion.Standard.record", - "routes.PathParametersPathExpansionStandardClient": "Routes.PathParameters.PathExpansion.Standard", - "routes.PathParametersPathExpansionStandardClient.array": "Routes.PathParameters.PathExpansion.Standard.array", - "routes.PathParametersPathExpansionStandardClient.arrayWithResponse": "Routes.PathParameters.PathExpansion.Standard.array", - "routes.PathParametersPathExpansionStandardClient.primitive": "Routes.PathParameters.PathExpansion.Standard.primitive", - "routes.PathParametersPathExpansionStandardClient.primitiveWithResponse": "Routes.PathParameters.PathExpansion.Standard.primitive", - "routes.PathParametersPathExpansionStandardClient.record": "Routes.PathParameters.PathExpansion.Standard.record", - "routes.PathParametersPathExpansionStandardClient.recordWithResponse": "Routes.PathParameters.PathExpansion.Standard.record", - "routes.PathParametersReservedExpansionAsyncClient": "Routes.PathParameters.ReservedExpansion", - "routes.PathParametersReservedExpansionAsyncClient.annotation": "Routes.PathParameters.ReservedExpansion.annotation", - "routes.PathParametersReservedExpansionAsyncClient.annotationWithResponse": "Routes.PathParameters.ReservedExpansion.annotation", - "routes.PathParametersReservedExpansionAsyncClient.template": "Routes.PathParameters.ReservedExpansion.template", - "routes.PathParametersReservedExpansionAsyncClient.templateWithResponse": "Routes.PathParameters.ReservedExpansion.template", - "routes.PathParametersReservedExpansionClient": "Routes.PathParameters.ReservedExpansion", - "routes.PathParametersReservedExpansionClient.annotation": "Routes.PathParameters.ReservedExpansion.annotation", - "routes.PathParametersReservedExpansionClient.annotationWithResponse": "Routes.PathParameters.ReservedExpansion.annotation", - "routes.PathParametersReservedExpansionClient.template": "Routes.PathParameters.ReservedExpansion.template", - "routes.PathParametersReservedExpansionClient.templateWithResponse": "Routes.PathParameters.ReservedExpansion.template", - "routes.PathParametersSimpleExpansionExplodeAsyncClient": "Routes.PathParameters.SimpleExpansion.Explode", - "routes.PathParametersSimpleExpansionExplodeAsyncClient.array": "Routes.PathParameters.SimpleExpansion.Explode.array", - "routes.PathParametersSimpleExpansionExplodeAsyncClient.arrayWithResponse": "Routes.PathParameters.SimpleExpansion.Explode.array", - "routes.PathParametersSimpleExpansionExplodeAsyncClient.primitive": "Routes.PathParameters.SimpleExpansion.Explode.primitive", - "routes.PathParametersSimpleExpansionExplodeAsyncClient.primitiveWithResponse": "Routes.PathParameters.SimpleExpansion.Explode.primitive", - "routes.PathParametersSimpleExpansionExplodeAsyncClient.record": "Routes.PathParameters.SimpleExpansion.Explode.record", - "routes.PathParametersSimpleExpansionExplodeAsyncClient.recordWithResponse": "Routes.PathParameters.SimpleExpansion.Explode.record", - "routes.PathParametersSimpleExpansionExplodeClient": "Routes.PathParameters.SimpleExpansion.Explode", - "routes.PathParametersSimpleExpansionExplodeClient.array": "Routes.PathParameters.SimpleExpansion.Explode.array", - "routes.PathParametersSimpleExpansionExplodeClient.arrayWithResponse": "Routes.PathParameters.SimpleExpansion.Explode.array", - "routes.PathParametersSimpleExpansionExplodeClient.primitive": "Routes.PathParameters.SimpleExpansion.Explode.primitive", - "routes.PathParametersSimpleExpansionExplodeClient.primitiveWithResponse": "Routes.PathParameters.SimpleExpansion.Explode.primitive", - "routes.PathParametersSimpleExpansionExplodeClient.record": "Routes.PathParameters.SimpleExpansion.Explode.record", - "routes.PathParametersSimpleExpansionExplodeClient.recordWithResponse": "Routes.PathParameters.SimpleExpansion.Explode.record", - "routes.PathParametersSimpleExpansionStandardAsyncClient": "Routes.PathParameters.SimpleExpansion.Standard", - "routes.PathParametersSimpleExpansionStandardAsyncClient.array": "Routes.PathParameters.SimpleExpansion.Standard.array", - "routes.PathParametersSimpleExpansionStandardAsyncClient.arrayWithResponse": "Routes.PathParameters.SimpleExpansion.Standard.array", - "routes.PathParametersSimpleExpansionStandardAsyncClient.primitive": "Routes.PathParameters.SimpleExpansion.Standard.primitive", - "routes.PathParametersSimpleExpansionStandardAsyncClient.primitiveWithResponse": "Routes.PathParameters.SimpleExpansion.Standard.primitive", - "routes.PathParametersSimpleExpansionStandardAsyncClient.record": "Routes.PathParameters.SimpleExpansion.Standard.record", - "routes.PathParametersSimpleExpansionStandardAsyncClient.recordWithResponse": "Routes.PathParameters.SimpleExpansion.Standard.record", - "routes.PathParametersSimpleExpansionStandardClient": "Routes.PathParameters.SimpleExpansion.Standard", - "routes.PathParametersSimpleExpansionStandardClient.array": "Routes.PathParameters.SimpleExpansion.Standard.array", - "routes.PathParametersSimpleExpansionStandardClient.arrayWithResponse": "Routes.PathParameters.SimpleExpansion.Standard.array", - "routes.PathParametersSimpleExpansionStandardClient.primitive": "Routes.PathParameters.SimpleExpansion.Standard.primitive", - "routes.PathParametersSimpleExpansionStandardClient.primitiveWithResponse": "Routes.PathParameters.SimpleExpansion.Standard.primitive", - "routes.PathParametersSimpleExpansionStandardClient.record": "Routes.PathParameters.SimpleExpansion.Standard.record", - "routes.PathParametersSimpleExpansionStandardClient.recordWithResponse": "Routes.PathParameters.SimpleExpansion.Standard.record", - "routes.QueryParametersAsyncClient": "Routes.QueryParameters", - "routes.QueryParametersAsyncClient.annotationOnly": "Routes.QueryParameters.annotationOnly", - "routes.QueryParametersAsyncClient.annotationOnlyWithResponse": "Routes.QueryParameters.annotationOnly", - "routes.QueryParametersAsyncClient.explicit": "Routes.QueryParameters.explicit", - "routes.QueryParametersAsyncClient.explicitWithResponse": "Routes.QueryParameters.explicit", - "routes.QueryParametersAsyncClient.templateOnly": "Routes.QueryParameters.templateOnly", - "routes.QueryParametersAsyncClient.templateOnlyWithResponse": "Routes.QueryParameters.templateOnly", - "routes.QueryParametersClient": "Routes.QueryParameters", - "routes.QueryParametersClient.annotationOnly": "Routes.QueryParameters.annotationOnly", - "routes.QueryParametersClient.annotationOnlyWithResponse": "Routes.QueryParameters.annotationOnly", - "routes.QueryParametersClient.explicit": "Routes.QueryParameters.explicit", - "routes.QueryParametersClient.explicitWithResponse": "Routes.QueryParameters.explicit", - "routes.QueryParametersClient.templateOnly": "Routes.QueryParameters.templateOnly", - "routes.QueryParametersClient.templateOnlyWithResponse": "Routes.QueryParameters.templateOnly", - "routes.QueryParametersQueryContinuationExplodeAsyncClient": "Routes.QueryParameters.QueryContinuation.Explode", - "routes.QueryParametersQueryContinuationExplodeAsyncClient.array": "Routes.QueryParameters.QueryContinuation.Explode.array", - "routes.QueryParametersQueryContinuationExplodeAsyncClient.arrayWithResponse": "Routes.QueryParameters.QueryContinuation.Explode.array", - "routes.QueryParametersQueryContinuationExplodeAsyncClient.primitive": "Routes.QueryParameters.QueryContinuation.Explode.primitive", - "routes.QueryParametersQueryContinuationExplodeAsyncClient.primitiveWithResponse": "Routes.QueryParameters.QueryContinuation.Explode.primitive", - "routes.QueryParametersQueryContinuationExplodeAsyncClient.record": "Routes.QueryParameters.QueryContinuation.Explode.record", - "routes.QueryParametersQueryContinuationExplodeAsyncClient.recordWithResponse": "Routes.QueryParameters.QueryContinuation.Explode.record", - "routes.QueryParametersQueryContinuationExplodeClient": "Routes.QueryParameters.QueryContinuation.Explode", - "routes.QueryParametersQueryContinuationExplodeClient.array": "Routes.QueryParameters.QueryContinuation.Explode.array", - "routes.QueryParametersQueryContinuationExplodeClient.arrayWithResponse": "Routes.QueryParameters.QueryContinuation.Explode.array", - "routes.QueryParametersQueryContinuationExplodeClient.primitive": "Routes.QueryParameters.QueryContinuation.Explode.primitive", - "routes.QueryParametersQueryContinuationExplodeClient.primitiveWithResponse": "Routes.QueryParameters.QueryContinuation.Explode.primitive", - "routes.QueryParametersQueryContinuationExplodeClient.record": "Routes.QueryParameters.QueryContinuation.Explode.record", - "routes.QueryParametersQueryContinuationExplodeClient.recordWithResponse": "Routes.QueryParameters.QueryContinuation.Explode.record", - "routes.QueryParametersQueryContinuationStandardAsyncClient": "Routes.QueryParameters.QueryContinuation.Standard", - "routes.QueryParametersQueryContinuationStandardAsyncClient.array": "Routes.QueryParameters.QueryContinuation.Standard.array", - "routes.QueryParametersQueryContinuationStandardAsyncClient.arrayWithResponse": "Routes.QueryParameters.QueryContinuation.Standard.array", - "routes.QueryParametersQueryContinuationStandardAsyncClient.primitive": "Routes.QueryParameters.QueryContinuation.Standard.primitive", - "routes.QueryParametersQueryContinuationStandardAsyncClient.primitiveWithResponse": "Routes.QueryParameters.QueryContinuation.Standard.primitive", - "routes.QueryParametersQueryContinuationStandardAsyncClient.record": "Routes.QueryParameters.QueryContinuation.Standard.record", - "routes.QueryParametersQueryContinuationStandardAsyncClient.recordWithResponse": "Routes.QueryParameters.QueryContinuation.Standard.record", - "routes.QueryParametersQueryContinuationStandardClient": "Routes.QueryParameters.QueryContinuation.Standard", - "routes.QueryParametersQueryContinuationStandardClient.array": "Routes.QueryParameters.QueryContinuation.Standard.array", - "routes.QueryParametersQueryContinuationStandardClient.arrayWithResponse": "Routes.QueryParameters.QueryContinuation.Standard.array", - "routes.QueryParametersQueryContinuationStandardClient.primitive": "Routes.QueryParameters.QueryContinuation.Standard.primitive", - "routes.QueryParametersQueryContinuationStandardClient.primitiveWithResponse": "Routes.QueryParameters.QueryContinuation.Standard.primitive", - "routes.QueryParametersQueryContinuationStandardClient.record": "Routes.QueryParameters.QueryContinuation.Standard.record", - "routes.QueryParametersQueryContinuationStandardClient.recordWithResponse": "Routes.QueryParameters.QueryContinuation.Standard.record", - "routes.QueryParametersQueryExpansionExplodeAsyncClient": "Routes.QueryParameters.QueryExpansion.Explode", - "routes.QueryParametersQueryExpansionExplodeAsyncClient.array": "Routes.QueryParameters.QueryExpansion.Explode.array", - "routes.QueryParametersQueryExpansionExplodeAsyncClient.arrayWithResponse": "Routes.QueryParameters.QueryExpansion.Explode.array", - "routes.QueryParametersQueryExpansionExplodeAsyncClient.primitive": "Routes.QueryParameters.QueryExpansion.Explode.primitive", - "routes.QueryParametersQueryExpansionExplodeAsyncClient.primitiveWithResponse": "Routes.QueryParameters.QueryExpansion.Explode.primitive", - "routes.QueryParametersQueryExpansionExplodeAsyncClient.record": "Routes.QueryParameters.QueryExpansion.Explode.record", - "routes.QueryParametersQueryExpansionExplodeAsyncClient.recordWithResponse": "Routes.QueryParameters.QueryExpansion.Explode.record", - "routes.QueryParametersQueryExpansionExplodeClient": "Routes.QueryParameters.QueryExpansion.Explode", - "routes.QueryParametersQueryExpansionExplodeClient.array": "Routes.QueryParameters.QueryExpansion.Explode.array", - "routes.QueryParametersQueryExpansionExplodeClient.arrayWithResponse": "Routes.QueryParameters.QueryExpansion.Explode.array", - "routes.QueryParametersQueryExpansionExplodeClient.primitive": "Routes.QueryParameters.QueryExpansion.Explode.primitive", - "routes.QueryParametersQueryExpansionExplodeClient.primitiveWithResponse": "Routes.QueryParameters.QueryExpansion.Explode.primitive", - "routes.QueryParametersQueryExpansionExplodeClient.record": "Routes.QueryParameters.QueryExpansion.Explode.record", - "routes.QueryParametersQueryExpansionExplodeClient.recordWithResponse": "Routes.QueryParameters.QueryExpansion.Explode.record", - "routes.QueryParametersQueryExpansionStandardAsyncClient": "Routes.QueryParameters.QueryExpansion.Standard", - "routes.QueryParametersQueryExpansionStandardAsyncClient.array": "Routes.QueryParameters.QueryExpansion.Standard.array", - "routes.QueryParametersQueryExpansionStandardAsyncClient.arrayWithResponse": "Routes.QueryParameters.QueryExpansion.Standard.array", - "routes.QueryParametersQueryExpansionStandardAsyncClient.primitive": "Routes.QueryParameters.QueryExpansion.Standard.primitive", - "routes.QueryParametersQueryExpansionStandardAsyncClient.primitiveWithResponse": "Routes.QueryParameters.QueryExpansion.Standard.primitive", - "routes.QueryParametersQueryExpansionStandardAsyncClient.record": "Routes.QueryParameters.QueryExpansion.Standard.record", - "routes.QueryParametersQueryExpansionStandardAsyncClient.recordWithResponse": "Routes.QueryParameters.QueryExpansion.Standard.record", - "routes.QueryParametersQueryExpansionStandardClient": "Routes.QueryParameters.QueryExpansion.Standard", - "routes.QueryParametersQueryExpansionStandardClient.array": "Routes.QueryParameters.QueryExpansion.Standard.array", - "routes.QueryParametersQueryExpansionStandardClient.arrayWithResponse": "Routes.QueryParameters.QueryExpansion.Standard.array", - "routes.QueryParametersQueryExpansionStandardClient.primitive": "Routes.QueryParameters.QueryExpansion.Standard.primitive", - "routes.QueryParametersQueryExpansionStandardClient.primitiveWithResponse": "Routes.QueryParameters.QueryExpansion.Standard.primitive", - "routes.QueryParametersQueryExpansionStandardClient.record": "Routes.QueryParameters.QueryExpansion.Standard.record", - "routes.QueryParametersQueryExpansionStandardClient.recordWithResponse": "Routes.QueryParameters.QueryExpansion.Standard.record", - "routes.RoutesAsyncClient": "Routes", - "routes.RoutesAsyncClient.fixed": "Routes.fixed", - "routes.RoutesAsyncClient.fixedWithResponse": "Routes.fixed", - "routes.RoutesClient": "Routes", - "routes.RoutesClient.fixed": "Routes.fixed", - "routes.RoutesClient.fixedWithResponse": "Routes.fixed", - "routes.RoutesClientBuilder": "Routes" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/routes_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/routes_metadata.json index 1e82f42b581..0fb4896d5e7 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/routes_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/routes_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"routes.InInterfaceAsyncClient":"Routes.InInterface","routes.InInterfaceAsyncClient.fixed":"Routes.InInterface.fixed","routes.InInterfaceAsyncClient.fixedWithResponse":"Routes.InInterface.fixed","routes.InInterfaceClient":"Routes.InInterface","routes.InInterfaceClient.fixed":"Routes.InInterface.fixed","routes.InInterfaceClient.fixedWithResponse":"Routes.InInterface.fixed","routes.PathParametersAsyncClient":"Routes.PathParameters","routes.PathParametersAsyncClient.annotationOnly":"Routes.PathParameters.annotationOnly","routes.PathParametersAsyncClient.annotationOnlyWithResponse":"Routes.PathParameters.annotationOnly","routes.PathParametersAsyncClient.explicit":"Routes.PathParameters.explicit","routes.PathParametersAsyncClient.explicitWithResponse":"Routes.PathParameters.explicit","routes.PathParametersAsyncClient.templateOnly":"Routes.PathParameters.templateOnly","routes.PathParametersAsyncClient.templateOnlyWithResponse":"Routes.PathParameters.templateOnly","routes.PathParametersClient":"Routes.PathParameters","routes.PathParametersClient.annotationOnly":"Routes.PathParameters.annotationOnly","routes.PathParametersClient.annotationOnlyWithResponse":"Routes.PathParameters.annotationOnly","routes.PathParametersClient.explicit":"Routes.PathParameters.explicit","routes.PathParametersClient.explicitWithResponse":"Routes.PathParameters.explicit","routes.PathParametersClient.templateOnly":"Routes.PathParameters.templateOnly","routes.PathParametersClient.templateOnlyWithResponse":"Routes.PathParameters.templateOnly","routes.PathParametersLabelExpansionExplodeAsyncClient":"Routes.PathParameters.LabelExpansion.Explode","routes.PathParametersLabelExpansionExplodeAsyncClient.array":"Routes.PathParameters.LabelExpansion.Explode.array","routes.PathParametersLabelExpansionExplodeAsyncClient.arrayWithResponse":"Routes.PathParameters.LabelExpansion.Explode.array","routes.PathParametersLabelExpansionExplodeAsyncClient.primitive":"Routes.PathParameters.LabelExpansion.Explode.primitive","routes.PathParametersLabelExpansionExplodeAsyncClient.primitiveWithResponse":"Routes.PathParameters.LabelExpansion.Explode.primitive","routes.PathParametersLabelExpansionExplodeAsyncClient.record":"Routes.PathParameters.LabelExpansion.Explode.record","routes.PathParametersLabelExpansionExplodeAsyncClient.recordWithResponse":"Routes.PathParameters.LabelExpansion.Explode.record","routes.PathParametersLabelExpansionExplodeClient":"Routes.PathParameters.LabelExpansion.Explode","routes.PathParametersLabelExpansionExplodeClient.array":"Routes.PathParameters.LabelExpansion.Explode.array","routes.PathParametersLabelExpansionExplodeClient.arrayWithResponse":"Routes.PathParameters.LabelExpansion.Explode.array","routes.PathParametersLabelExpansionExplodeClient.primitive":"Routes.PathParameters.LabelExpansion.Explode.primitive","routes.PathParametersLabelExpansionExplodeClient.primitiveWithResponse":"Routes.PathParameters.LabelExpansion.Explode.primitive","routes.PathParametersLabelExpansionExplodeClient.record":"Routes.PathParameters.LabelExpansion.Explode.record","routes.PathParametersLabelExpansionExplodeClient.recordWithResponse":"Routes.PathParameters.LabelExpansion.Explode.record","routes.PathParametersLabelExpansionStandardAsyncClient":"Routes.PathParameters.LabelExpansion.Standard","routes.PathParametersLabelExpansionStandardAsyncClient.array":"Routes.PathParameters.LabelExpansion.Standard.array","routes.PathParametersLabelExpansionStandardAsyncClient.arrayWithResponse":"Routes.PathParameters.LabelExpansion.Standard.array","routes.PathParametersLabelExpansionStandardAsyncClient.primitive":"Routes.PathParameters.LabelExpansion.Standard.primitive","routes.PathParametersLabelExpansionStandardAsyncClient.primitiveWithResponse":"Routes.PathParameters.LabelExpansion.Standard.primitive","routes.PathParametersLabelExpansionStandardAsyncClient.record":"Routes.PathParameters.LabelExpansion.Standard.record","routes.PathParametersLabelExpansionStandardAsyncClient.recordWithResponse":"Routes.PathParameters.LabelExpansion.Standard.record","routes.PathParametersLabelExpansionStandardClient":"Routes.PathParameters.LabelExpansion.Standard","routes.PathParametersLabelExpansionStandardClient.array":"Routes.PathParameters.LabelExpansion.Standard.array","routes.PathParametersLabelExpansionStandardClient.arrayWithResponse":"Routes.PathParameters.LabelExpansion.Standard.array","routes.PathParametersLabelExpansionStandardClient.primitive":"Routes.PathParameters.LabelExpansion.Standard.primitive","routes.PathParametersLabelExpansionStandardClient.primitiveWithResponse":"Routes.PathParameters.LabelExpansion.Standard.primitive","routes.PathParametersLabelExpansionStandardClient.record":"Routes.PathParameters.LabelExpansion.Standard.record","routes.PathParametersLabelExpansionStandardClient.recordWithResponse":"Routes.PathParameters.LabelExpansion.Standard.record","routes.PathParametersMatrixExpansionExplodeAsyncClient":"Routes.PathParameters.MatrixExpansion.Explode","routes.PathParametersMatrixExpansionExplodeAsyncClient.array":"Routes.PathParameters.MatrixExpansion.Explode.array","routes.PathParametersMatrixExpansionExplodeAsyncClient.arrayWithResponse":"Routes.PathParameters.MatrixExpansion.Explode.array","routes.PathParametersMatrixExpansionExplodeAsyncClient.primitive":"Routes.PathParameters.MatrixExpansion.Explode.primitive","routes.PathParametersMatrixExpansionExplodeAsyncClient.primitiveWithResponse":"Routes.PathParameters.MatrixExpansion.Explode.primitive","routes.PathParametersMatrixExpansionExplodeAsyncClient.record":"Routes.PathParameters.MatrixExpansion.Explode.record","routes.PathParametersMatrixExpansionExplodeAsyncClient.recordWithResponse":"Routes.PathParameters.MatrixExpansion.Explode.record","routes.PathParametersMatrixExpansionExplodeClient":"Routes.PathParameters.MatrixExpansion.Explode","routes.PathParametersMatrixExpansionExplodeClient.array":"Routes.PathParameters.MatrixExpansion.Explode.array","routes.PathParametersMatrixExpansionExplodeClient.arrayWithResponse":"Routes.PathParameters.MatrixExpansion.Explode.array","routes.PathParametersMatrixExpansionExplodeClient.primitive":"Routes.PathParameters.MatrixExpansion.Explode.primitive","routes.PathParametersMatrixExpansionExplodeClient.primitiveWithResponse":"Routes.PathParameters.MatrixExpansion.Explode.primitive","routes.PathParametersMatrixExpansionExplodeClient.record":"Routes.PathParameters.MatrixExpansion.Explode.record","routes.PathParametersMatrixExpansionExplodeClient.recordWithResponse":"Routes.PathParameters.MatrixExpansion.Explode.record","routes.PathParametersMatrixExpansionStandardAsyncClient":"Routes.PathParameters.MatrixExpansion.Standard","routes.PathParametersMatrixExpansionStandardAsyncClient.array":"Routes.PathParameters.MatrixExpansion.Standard.array","routes.PathParametersMatrixExpansionStandardAsyncClient.arrayWithResponse":"Routes.PathParameters.MatrixExpansion.Standard.array","routes.PathParametersMatrixExpansionStandardAsyncClient.primitive":"Routes.PathParameters.MatrixExpansion.Standard.primitive","routes.PathParametersMatrixExpansionStandardAsyncClient.primitiveWithResponse":"Routes.PathParameters.MatrixExpansion.Standard.primitive","routes.PathParametersMatrixExpansionStandardAsyncClient.record":"Routes.PathParameters.MatrixExpansion.Standard.record","routes.PathParametersMatrixExpansionStandardAsyncClient.recordWithResponse":"Routes.PathParameters.MatrixExpansion.Standard.record","routes.PathParametersMatrixExpansionStandardClient":"Routes.PathParameters.MatrixExpansion.Standard","routes.PathParametersMatrixExpansionStandardClient.array":"Routes.PathParameters.MatrixExpansion.Standard.array","routes.PathParametersMatrixExpansionStandardClient.arrayWithResponse":"Routes.PathParameters.MatrixExpansion.Standard.array","routes.PathParametersMatrixExpansionStandardClient.primitive":"Routes.PathParameters.MatrixExpansion.Standard.primitive","routes.PathParametersMatrixExpansionStandardClient.primitiveWithResponse":"Routes.PathParameters.MatrixExpansion.Standard.primitive","routes.PathParametersMatrixExpansionStandardClient.record":"Routes.PathParameters.MatrixExpansion.Standard.record","routes.PathParametersMatrixExpansionStandardClient.recordWithResponse":"Routes.PathParameters.MatrixExpansion.Standard.record","routes.PathParametersPathExpansionExplodeAsyncClient":"Routes.PathParameters.PathExpansion.Explode","routes.PathParametersPathExpansionExplodeAsyncClient.array":"Routes.PathParameters.PathExpansion.Explode.array","routes.PathParametersPathExpansionExplodeAsyncClient.arrayWithResponse":"Routes.PathParameters.PathExpansion.Explode.array","routes.PathParametersPathExpansionExplodeAsyncClient.primitive":"Routes.PathParameters.PathExpansion.Explode.primitive","routes.PathParametersPathExpansionExplodeAsyncClient.primitiveWithResponse":"Routes.PathParameters.PathExpansion.Explode.primitive","routes.PathParametersPathExpansionExplodeAsyncClient.record":"Routes.PathParameters.PathExpansion.Explode.record","routes.PathParametersPathExpansionExplodeAsyncClient.recordWithResponse":"Routes.PathParameters.PathExpansion.Explode.record","routes.PathParametersPathExpansionExplodeClient":"Routes.PathParameters.PathExpansion.Explode","routes.PathParametersPathExpansionExplodeClient.array":"Routes.PathParameters.PathExpansion.Explode.array","routes.PathParametersPathExpansionExplodeClient.arrayWithResponse":"Routes.PathParameters.PathExpansion.Explode.array","routes.PathParametersPathExpansionExplodeClient.primitive":"Routes.PathParameters.PathExpansion.Explode.primitive","routes.PathParametersPathExpansionExplodeClient.primitiveWithResponse":"Routes.PathParameters.PathExpansion.Explode.primitive","routes.PathParametersPathExpansionExplodeClient.record":"Routes.PathParameters.PathExpansion.Explode.record","routes.PathParametersPathExpansionExplodeClient.recordWithResponse":"Routes.PathParameters.PathExpansion.Explode.record","routes.PathParametersPathExpansionStandardAsyncClient":"Routes.PathParameters.PathExpansion.Standard","routes.PathParametersPathExpansionStandardAsyncClient.array":"Routes.PathParameters.PathExpansion.Standard.array","routes.PathParametersPathExpansionStandardAsyncClient.arrayWithResponse":"Routes.PathParameters.PathExpansion.Standard.array","routes.PathParametersPathExpansionStandardAsyncClient.primitive":"Routes.PathParameters.PathExpansion.Standard.primitive","routes.PathParametersPathExpansionStandardAsyncClient.primitiveWithResponse":"Routes.PathParameters.PathExpansion.Standard.primitive","routes.PathParametersPathExpansionStandardAsyncClient.record":"Routes.PathParameters.PathExpansion.Standard.record","routes.PathParametersPathExpansionStandardAsyncClient.recordWithResponse":"Routes.PathParameters.PathExpansion.Standard.record","routes.PathParametersPathExpansionStandardClient":"Routes.PathParameters.PathExpansion.Standard","routes.PathParametersPathExpansionStandardClient.array":"Routes.PathParameters.PathExpansion.Standard.array","routes.PathParametersPathExpansionStandardClient.arrayWithResponse":"Routes.PathParameters.PathExpansion.Standard.array","routes.PathParametersPathExpansionStandardClient.primitive":"Routes.PathParameters.PathExpansion.Standard.primitive","routes.PathParametersPathExpansionStandardClient.primitiveWithResponse":"Routes.PathParameters.PathExpansion.Standard.primitive","routes.PathParametersPathExpansionStandardClient.record":"Routes.PathParameters.PathExpansion.Standard.record","routes.PathParametersPathExpansionStandardClient.recordWithResponse":"Routes.PathParameters.PathExpansion.Standard.record","routes.PathParametersReservedExpansionAsyncClient":"Routes.PathParameters.ReservedExpansion","routes.PathParametersReservedExpansionAsyncClient.annotation":"Routes.PathParameters.ReservedExpansion.annotation","routes.PathParametersReservedExpansionAsyncClient.annotationWithResponse":"Routes.PathParameters.ReservedExpansion.annotation","routes.PathParametersReservedExpansionAsyncClient.template":"Routes.PathParameters.ReservedExpansion.template","routes.PathParametersReservedExpansionAsyncClient.templateWithResponse":"Routes.PathParameters.ReservedExpansion.template","routes.PathParametersReservedExpansionClient":"Routes.PathParameters.ReservedExpansion","routes.PathParametersReservedExpansionClient.annotation":"Routes.PathParameters.ReservedExpansion.annotation","routes.PathParametersReservedExpansionClient.annotationWithResponse":"Routes.PathParameters.ReservedExpansion.annotation","routes.PathParametersReservedExpansionClient.template":"Routes.PathParameters.ReservedExpansion.template","routes.PathParametersReservedExpansionClient.templateWithResponse":"Routes.PathParameters.ReservedExpansion.template","routes.PathParametersSimpleExpansionExplodeAsyncClient":"Routes.PathParameters.SimpleExpansion.Explode","routes.PathParametersSimpleExpansionExplodeAsyncClient.array":"Routes.PathParameters.SimpleExpansion.Explode.array","routes.PathParametersSimpleExpansionExplodeAsyncClient.arrayWithResponse":"Routes.PathParameters.SimpleExpansion.Explode.array","routes.PathParametersSimpleExpansionExplodeAsyncClient.primitive":"Routes.PathParameters.SimpleExpansion.Explode.primitive","routes.PathParametersSimpleExpansionExplodeAsyncClient.primitiveWithResponse":"Routes.PathParameters.SimpleExpansion.Explode.primitive","routes.PathParametersSimpleExpansionExplodeAsyncClient.record":"Routes.PathParameters.SimpleExpansion.Explode.record","routes.PathParametersSimpleExpansionExplodeAsyncClient.recordWithResponse":"Routes.PathParameters.SimpleExpansion.Explode.record","routes.PathParametersSimpleExpansionExplodeClient":"Routes.PathParameters.SimpleExpansion.Explode","routes.PathParametersSimpleExpansionExplodeClient.array":"Routes.PathParameters.SimpleExpansion.Explode.array","routes.PathParametersSimpleExpansionExplodeClient.arrayWithResponse":"Routes.PathParameters.SimpleExpansion.Explode.array","routes.PathParametersSimpleExpansionExplodeClient.primitive":"Routes.PathParameters.SimpleExpansion.Explode.primitive","routes.PathParametersSimpleExpansionExplodeClient.primitiveWithResponse":"Routes.PathParameters.SimpleExpansion.Explode.primitive","routes.PathParametersSimpleExpansionExplodeClient.record":"Routes.PathParameters.SimpleExpansion.Explode.record","routes.PathParametersSimpleExpansionExplodeClient.recordWithResponse":"Routes.PathParameters.SimpleExpansion.Explode.record","routes.PathParametersSimpleExpansionStandardAsyncClient":"Routes.PathParameters.SimpleExpansion.Standard","routes.PathParametersSimpleExpansionStandardAsyncClient.array":"Routes.PathParameters.SimpleExpansion.Standard.array","routes.PathParametersSimpleExpansionStandardAsyncClient.arrayWithResponse":"Routes.PathParameters.SimpleExpansion.Standard.array","routes.PathParametersSimpleExpansionStandardAsyncClient.primitive":"Routes.PathParameters.SimpleExpansion.Standard.primitive","routes.PathParametersSimpleExpansionStandardAsyncClient.primitiveWithResponse":"Routes.PathParameters.SimpleExpansion.Standard.primitive","routes.PathParametersSimpleExpansionStandardAsyncClient.record":"Routes.PathParameters.SimpleExpansion.Standard.record","routes.PathParametersSimpleExpansionStandardAsyncClient.recordWithResponse":"Routes.PathParameters.SimpleExpansion.Standard.record","routes.PathParametersSimpleExpansionStandardClient":"Routes.PathParameters.SimpleExpansion.Standard","routes.PathParametersSimpleExpansionStandardClient.array":"Routes.PathParameters.SimpleExpansion.Standard.array","routes.PathParametersSimpleExpansionStandardClient.arrayWithResponse":"Routes.PathParameters.SimpleExpansion.Standard.array","routes.PathParametersSimpleExpansionStandardClient.primitive":"Routes.PathParameters.SimpleExpansion.Standard.primitive","routes.PathParametersSimpleExpansionStandardClient.primitiveWithResponse":"Routes.PathParameters.SimpleExpansion.Standard.primitive","routes.PathParametersSimpleExpansionStandardClient.record":"Routes.PathParameters.SimpleExpansion.Standard.record","routes.PathParametersSimpleExpansionStandardClient.recordWithResponse":"Routes.PathParameters.SimpleExpansion.Standard.record","routes.QueryParametersAsyncClient":"Routes.QueryParameters","routes.QueryParametersAsyncClient.annotationOnly":"Routes.QueryParameters.annotationOnly","routes.QueryParametersAsyncClient.annotationOnlyWithResponse":"Routes.QueryParameters.annotationOnly","routes.QueryParametersAsyncClient.explicit":"Routes.QueryParameters.explicit","routes.QueryParametersAsyncClient.explicitWithResponse":"Routes.QueryParameters.explicit","routes.QueryParametersAsyncClient.templateOnly":"Routes.QueryParameters.templateOnly","routes.QueryParametersAsyncClient.templateOnlyWithResponse":"Routes.QueryParameters.templateOnly","routes.QueryParametersClient":"Routes.QueryParameters","routes.QueryParametersClient.annotationOnly":"Routes.QueryParameters.annotationOnly","routes.QueryParametersClient.annotationOnlyWithResponse":"Routes.QueryParameters.annotationOnly","routes.QueryParametersClient.explicit":"Routes.QueryParameters.explicit","routes.QueryParametersClient.explicitWithResponse":"Routes.QueryParameters.explicit","routes.QueryParametersClient.templateOnly":"Routes.QueryParameters.templateOnly","routes.QueryParametersClient.templateOnlyWithResponse":"Routes.QueryParameters.templateOnly","routes.QueryParametersQueryContinuationExplodeAsyncClient":"Routes.QueryParameters.QueryContinuation.Explode","routes.QueryParametersQueryContinuationExplodeAsyncClient.array":"Routes.QueryParameters.QueryContinuation.Explode.array","routes.QueryParametersQueryContinuationExplodeAsyncClient.arrayWithResponse":"Routes.QueryParameters.QueryContinuation.Explode.array","routes.QueryParametersQueryContinuationExplodeAsyncClient.primitive":"Routes.QueryParameters.QueryContinuation.Explode.primitive","routes.QueryParametersQueryContinuationExplodeAsyncClient.primitiveWithResponse":"Routes.QueryParameters.QueryContinuation.Explode.primitive","routes.QueryParametersQueryContinuationExplodeAsyncClient.record":"Routes.QueryParameters.QueryContinuation.Explode.record","routes.QueryParametersQueryContinuationExplodeAsyncClient.recordWithResponse":"Routes.QueryParameters.QueryContinuation.Explode.record","routes.QueryParametersQueryContinuationExplodeClient":"Routes.QueryParameters.QueryContinuation.Explode","routes.QueryParametersQueryContinuationExplodeClient.array":"Routes.QueryParameters.QueryContinuation.Explode.array","routes.QueryParametersQueryContinuationExplodeClient.arrayWithResponse":"Routes.QueryParameters.QueryContinuation.Explode.array","routes.QueryParametersQueryContinuationExplodeClient.primitive":"Routes.QueryParameters.QueryContinuation.Explode.primitive","routes.QueryParametersQueryContinuationExplodeClient.primitiveWithResponse":"Routes.QueryParameters.QueryContinuation.Explode.primitive","routes.QueryParametersQueryContinuationExplodeClient.record":"Routes.QueryParameters.QueryContinuation.Explode.record","routes.QueryParametersQueryContinuationExplodeClient.recordWithResponse":"Routes.QueryParameters.QueryContinuation.Explode.record","routes.QueryParametersQueryContinuationStandardAsyncClient":"Routes.QueryParameters.QueryContinuation.Standard","routes.QueryParametersQueryContinuationStandardAsyncClient.array":"Routes.QueryParameters.QueryContinuation.Standard.array","routes.QueryParametersQueryContinuationStandardAsyncClient.arrayWithResponse":"Routes.QueryParameters.QueryContinuation.Standard.array","routes.QueryParametersQueryContinuationStandardAsyncClient.primitive":"Routes.QueryParameters.QueryContinuation.Standard.primitive","routes.QueryParametersQueryContinuationStandardAsyncClient.primitiveWithResponse":"Routes.QueryParameters.QueryContinuation.Standard.primitive","routes.QueryParametersQueryContinuationStandardAsyncClient.record":"Routes.QueryParameters.QueryContinuation.Standard.record","routes.QueryParametersQueryContinuationStandardAsyncClient.recordWithResponse":"Routes.QueryParameters.QueryContinuation.Standard.record","routes.QueryParametersQueryContinuationStandardClient":"Routes.QueryParameters.QueryContinuation.Standard","routes.QueryParametersQueryContinuationStandardClient.array":"Routes.QueryParameters.QueryContinuation.Standard.array","routes.QueryParametersQueryContinuationStandardClient.arrayWithResponse":"Routes.QueryParameters.QueryContinuation.Standard.array","routes.QueryParametersQueryContinuationStandardClient.primitive":"Routes.QueryParameters.QueryContinuation.Standard.primitive","routes.QueryParametersQueryContinuationStandardClient.primitiveWithResponse":"Routes.QueryParameters.QueryContinuation.Standard.primitive","routes.QueryParametersQueryContinuationStandardClient.record":"Routes.QueryParameters.QueryContinuation.Standard.record","routes.QueryParametersQueryContinuationStandardClient.recordWithResponse":"Routes.QueryParameters.QueryContinuation.Standard.record","routes.QueryParametersQueryExpansionExplodeAsyncClient":"Routes.QueryParameters.QueryExpansion.Explode","routes.QueryParametersQueryExpansionExplodeAsyncClient.array":"Routes.QueryParameters.QueryExpansion.Explode.array","routes.QueryParametersQueryExpansionExplodeAsyncClient.arrayWithResponse":"Routes.QueryParameters.QueryExpansion.Explode.array","routes.QueryParametersQueryExpansionExplodeAsyncClient.primitive":"Routes.QueryParameters.QueryExpansion.Explode.primitive","routes.QueryParametersQueryExpansionExplodeAsyncClient.primitiveWithResponse":"Routes.QueryParameters.QueryExpansion.Explode.primitive","routes.QueryParametersQueryExpansionExplodeAsyncClient.record":"Routes.QueryParameters.QueryExpansion.Explode.record","routes.QueryParametersQueryExpansionExplodeAsyncClient.recordWithResponse":"Routes.QueryParameters.QueryExpansion.Explode.record","routes.QueryParametersQueryExpansionExplodeClient":"Routes.QueryParameters.QueryExpansion.Explode","routes.QueryParametersQueryExpansionExplodeClient.array":"Routes.QueryParameters.QueryExpansion.Explode.array","routes.QueryParametersQueryExpansionExplodeClient.arrayWithResponse":"Routes.QueryParameters.QueryExpansion.Explode.array","routes.QueryParametersQueryExpansionExplodeClient.primitive":"Routes.QueryParameters.QueryExpansion.Explode.primitive","routes.QueryParametersQueryExpansionExplodeClient.primitiveWithResponse":"Routes.QueryParameters.QueryExpansion.Explode.primitive","routes.QueryParametersQueryExpansionExplodeClient.record":"Routes.QueryParameters.QueryExpansion.Explode.record","routes.QueryParametersQueryExpansionExplodeClient.recordWithResponse":"Routes.QueryParameters.QueryExpansion.Explode.record","routes.QueryParametersQueryExpansionStandardAsyncClient":"Routes.QueryParameters.QueryExpansion.Standard","routes.QueryParametersQueryExpansionStandardAsyncClient.array":"Routes.QueryParameters.QueryExpansion.Standard.array","routes.QueryParametersQueryExpansionStandardAsyncClient.arrayWithResponse":"Routes.QueryParameters.QueryExpansion.Standard.array","routes.QueryParametersQueryExpansionStandardAsyncClient.primitive":"Routes.QueryParameters.QueryExpansion.Standard.primitive","routes.QueryParametersQueryExpansionStandardAsyncClient.primitiveWithResponse":"Routes.QueryParameters.QueryExpansion.Standard.primitive","routes.QueryParametersQueryExpansionStandardAsyncClient.record":"Routes.QueryParameters.QueryExpansion.Standard.record","routes.QueryParametersQueryExpansionStandardAsyncClient.recordWithResponse":"Routes.QueryParameters.QueryExpansion.Standard.record","routes.QueryParametersQueryExpansionStandardClient":"Routes.QueryParameters.QueryExpansion.Standard","routes.QueryParametersQueryExpansionStandardClient.array":"Routes.QueryParameters.QueryExpansion.Standard.array","routes.QueryParametersQueryExpansionStandardClient.arrayWithResponse":"Routes.QueryParameters.QueryExpansion.Standard.array","routes.QueryParametersQueryExpansionStandardClient.primitive":"Routes.QueryParameters.QueryExpansion.Standard.primitive","routes.QueryParametersQueryExpansionStandardClient.primitiveWithResponse":"Routes.QueryParameters.QueryExpansion.Standard.primitive","routes.QueryParametersQueryExpansionStandardClient.record":"Routes.QueryParameters.QueryExpansion.Standard.record","routes.QueryParametersQueryExpansionStandardClient.recordWithResponse":"Routes.QueryParameters.QueryExpansion.Standard.record","routes.RoutesAsyncClient":"Routes","routes.RoutesAsyncClient.fixed":"Routes.fixed","routes.RoutesAsyncClient.fixedWithResponse":"Routes.fixed","routes.RoutesClient":"Routes","routes.RoutesClient.fixed":"Routes.fixed","routes.RoutesClient.fixedWithResponse":"Routes.fixed","routes.RoutesClientBuilder":"Routes"},"generatedFiles":["src/main/java/module-info.java","src/main/java/routes/InInterfaceAsyncClient.java","src/main/java/routes/InInterfaceClient.java","src/main/java/routes/PathParametersAsyncClient.java","src/main/java/routes/PathParametersClient.java","src/main/java/routes/PathParametersLabelExpansionExplodeAsyncClient.java","src/main/java/routes/PathParametersLabelExpansionExplodeClient.java","src/main/java/routes/PathParametersLabelExpansionStandardAsyncClient.java","src/main/java/routes/PathParametersLabelExpansionStandardClient.java","src/main/java/routes/PathParametersMatrixExpansionExplodeAsyncClient.java","src/main/java/routes/PathParametersMatrixExpansionExplodeClient.java","src/main/java/routes/PathParametersMatrixExpansionStandardAsyncClient.java","src/main/java/routes/PathParametersMatrixExpansionStandardClient.java","src/main/java/routes/PathParametersPathExpansionExplodeAsyncClient.java","src/main/java/routes/PathParametersPathExpansionExplodeClient.java","src/main/java/routes/PathParametersPathExpansionStandardAsyncClient.java","src/main/java/routes/PathParametersPathExpansionStandardClient.java","src/main/java/routes/PathParametersReservedExpansionAsyncClient.java","src/main/java/routes/PathParametersReservedExpansionClient.java","src/main/java/routes/PathParametersSimpleExpansionExplodeAsyncClient.java","src/main/java/routes/PathParametersSimpleExpansionExplodeClient.java","src/main/java/routes/PathParametersSimpleExpansionStandardAsyncClient.java","src/main/java/routes/PathParametersSimpleExpansionStandardClient.java","src/main/java/routes/QueryParametersAsyncClient.java","src/main/java/routes/QueryParametersClient.java","src/main/java/routes/QueryParametersQueryContinuationExplodeAsyncClient.java","src/main/java/routes/QueryParametersQueryContinuationExplodeClient.java","src/main/java/routes/QueryParametersQueryContinuationStandardAsyncClient.java","src/main/java/routes/QueryParametersQueryContinuationStandardClient.java","src/main/java/routes/QueryParametersQueryExpansionExplodeAsyncClient.java","src/main/java/routes/QueryParametersQueryExpansionExplodeClient.java","src/main/java/routes/QueryParametersQueryExpansionStandardAsyncClient.java","src/main/java/routes/QueryParametersQueryExpansionStandardClient.java","src/main/java/routes/RoutesAsyncClient.java","src/main/java/routes/RoutesClient.java","src/main/java/routes/RoutesClientBuilder.java","src/main/java/routes/implementation/InInterfacesImpl.java","src/main/java/routes/implementation/PathParametersImpl.java","src/main/java/routes/implementation/PathParametersLabelExpansionExplodesImpl.java","src/main/java/routes/implementation/PathParametersLabelExpansionStandardsImpl.java","src/main/java/routes/implementation/PathParametersMatrixExpansionExplodesImpl.java","src/main/java/routes/implementation/PathParametersMatrixExpansionStandardsImpl.java","src/main/java/routes/implementation/PathParametersPathExpansionExplodesImpl.java","src/main/java/routes/implementation/PathParametersPathExpansionStandardsImpl.java","src/main/java/routes/implementation/PathParametersReservedExpansionsImpl.java","src/main/java/routes/implementation/PathParametersSimpleExpansionExplodesImpl.java","src/main/java/routes/implementation/PathParametersSimpleExpansionStandardsImpl.java","src/main/java/routes/implementation/QueryParametersImpl.java","src/main/java/routes/implementation/QueryParametersQueryContinuationExplodesImpl.java","src/main/java/routes/implementation/QueryParametersQueryContinuationStandardsImpl.java","src/main/java/routes/implementation/QueryParametersQueryExpansionExplodesImpl.java","src/main/java/routes/implementation/QueryParametersQueryExpansionStandardsImpl.java","src/main/java/routes/implementation/RoutesClientImpl.java","src/main/java/routes/implementation/package-info.java","src/main/java/routes/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"routes.InInterfaceAsyncClient":"Routes.InInterface","routes.InInterfaceAsyncClient.fixed":"Routes.InInterface.fixed","routes.InInterfaceAsyncClient.fixedWithResponse":"Routes.InInterface.fixed","routes.InInterfaceClient":"Routes.InInterface","routes.InInterfaceClient.fixed":"Routes.InInterface.fixed","routes.InInterfaceClient.fixedWithResponse":"Routes.InInterface.fixed","routes.PathParametersAsyncClient":"Routes.PathParameters","routes.PathParametersAsyncClient.annotationOnly":"Routes.PathParameters.annotationOnly","routes.PathParametersAsyncClient.annotationOnlyWithResponse":"Routes.PathParameters.annotationOnly","routes.PathParametersAsyncClient.explicit":"Routes.PathParameters.explicit","routes.PathParametersAsyncClient.explicitWithResponse":"Routes.PathParameters.explicit","routes.PathParametersAsyncClient.templateOnly":"Routes.PathParameters.templateOnly","routes.PathParametersAsyncClient.templateOnlyWithResponse":"Routes.PathParameters.templateOnly","routes.PathParametersClient":"Routes.PathParameters","routes.PathParametersClient.annotationOnly":"Routes.PathParameters.annotationOnly","routes.PathParametersClient.annotationOnlyWithResponse":"Routes.PathParameters.annotationOnly","routes.PathParametersClient.explicit":"Routes.PathParameters.explicit","routes.PathParametersClient.explicitWithResponse":"Routes.PathParameters.explicit","routes.PathParametersClient.templateOnly":"Routes.PathParameters.templateOnly","routes.PathParametersClient.templateOnlyWithResponse":"Routes.PathParameters.templateOnly","routes.PathParametersLabelExpansionExplodeAsyncClient":"Routes.PathParameters.LabelExpansion.Explode","routes.PathParametersLabelExpansionExplodeAsyncClient.array":"Routes.PathParameters.LabelExpansion.Explode.array","routes.PathParametersLabelExpansionExplodeAsyncClient.arrayWithResponse":"Routes.PathParameters.LabelExpansion.Explode.array","routes.PathParametersLabelExpansionExplodeAsyncClient.primitive":"Routes.PathParameters.LabelExpansion.Explode.primitive","routes.PathParametersLabelExpansionExplodeAsyncClient.primitiveWithResponse":"Routes.PathParameters.LabelExpansion.Explode.primitive","routes.PathParametersLabelExpansionExplodeAsyncClient.record":"Routes.PathParameters.LabelExpansion.Explode.record","routes.PathParametersLabelExpansionExplodeAsyncClient.recordWithResponse":"Routes.PathParameters.LabelExpansion.Explode.record","routes.PathParametersLabelExpansionExplodeClient":"Routes.PathParameters.LabelExpansion.Explode","routes.PathParametersLabelExpansionExplodeClient.array":"Routes.PathParameters.LabelExpansion.Explode.array","routes.PathParametersLabelExpansionExplodeClient.arrayWithResponse":"Routes.PathParameters.LabelExpansion.Explode.array","routes.PathParametersLabelExpansionExplodeClient.primitive":"Routes.PathParameters.LabelExpansion.Explode.primitive","routes.PathParametersLabelExpansionExplodeClient.primitiveWithResponse":"Routes.PathParameters.LabelExpansion.Explode.primitive","routes.PathParametersLabelExpansionExplodeClient.record":"Routes.PathParameters.LabelExpansion.Explode.record","routes.PathParametersLabelExpansionExplodeClient.recordWithResponse":"Routes.PathParameters.LabelExpansion.Explode.record","routes.PathParametersLabelExpansionStandardAsyncClient":"Routes.PathParameters.LabelExpansion.Standard","routes.PathParametersLabelExpansionStandardAsyncClient.array":"Routes.PathParameters.LabelExpansion.Standard.array","routes.PathParametersLabelExpansionStandardAsyncClient.arrayWithResponse":"Routes.PathParameters.LabelExpansion.Standard.array","routes.PathParametersLabelExpansionStandardAsyncClient.primitive":"Routes.PathParameters.LabelExpansion.Standard.primitive","routes.PathParametersLabelExpansionStandardAsyncClient.primitiveWithResponse":"Routes.PathParameters.LabelExpansion.Standard.primitive","routes.PathParametersLabelExpansionStandardAsyncClient.record":"Routes.PathParameters.LabelExpansion.Standard.record","routes.PathParametersLabelExpansionStandardAsyncClient.recordWithResponse":"Routes.PathParameters.LabelExpansion.Standard.record","routes.PathParametersLabelExpansionStandardClient":"Routes.PathParameters.LabelExpansion.Standard","routes.PathParametersLabelExpansionStandardClient.array":"Routes.PathParameters.LabelExpansion.Standard.array","routes.PathParametersLabelExpansionStandardClient.arrayWithResponse":"Routes.PathParameters.LabelExpansion.Standard.array","routes.PathParametersLabelExpansionStandardClient.primitive":"Routes.PathParameters.LabelExpansion.Standard.primitive","routes.PathParametersLabelExpansionStandardClient.primitiveWithResponse":"Routes.PathParameters.LabelExpansion.Standard.primitive","routes.PathParametersLabelExpansionStandardClient.record":"Routes.PathParameters.LabelExpansion.Standard.record","routes.PathParametersLabelExpansionStandardClient.recordWithResponse":"Routes.PathParameters.LabelExpansion.Standard.record","routes.PathParametersMatrixExpansionExplodeAsyncClient":"Routes.PathParameters.MatrixExpansion.Explode","routes.PathParametersMatrixExpansionExplodeAsyncClient.array":"Routes.PathParameters.MatrixExpansion.Explode.array","routes.PathParametersMatrixExpansionExplodeAsyncClient.arrayWithResponse":"Routes.PathParameters.MatrixExpansion.Explode.array","routes.PathParametersMatrixExpansionExplodeAsyncClient.primitive":"Routes.PathParameters.MatrixExpansion.Explode.primitive","routes.PathParametersMatrixExpansionExplodeAsyncClient.primitiveWithResponse":"Routes.PathParameters.MatrixExpansion.Explode.primitive","routes.PathParametersMatrixExpansionExplodeAsyncClient.record":"Routes.PathParameters.MatrixExpansion.Explode.record","routes.PathParametersMatrixExpansionExplodeAsyncClient.recordWithResponse":"Routes.PathParameters.MatrixExpansion.Explode.record","routes.PathParametersMatrixExpansionExplodeClient":"Routes.PathParameters.MatrixExpansion.Explode","routes.PathParametersMatrixExpansionExplodeClient.array":"Routes.PathParameters.MatrixExpansion.Explode.array","routes.PathParametersMatrixExpansionExplodeClient.arrayWithResponse":"Routes.PathParameters.MatrixExpansion.Explode.array","routes.PathParametersMatrixExpansionExplodeClient.primitive":"Routes.PathParameters.MatrixExpansion.Explode.primitive","routes.PathParametersMatrixExpansionExplodeClient.primitiveWithResponse":"Routes.PathParameters.MatrixExpansion.Explode.primitive","routes.PathParametersMatrixExpansionExplodeClient.record":"Routes.PathParameters.MatrixExpansion.Explode.record","routes.PathParametersMatrixExpansionExplodeClient.recordWithResponse":"Routes.PathParameters.MatrixExpansion.Explode.record","routes.PathParametersMatrixExpansionStandardAsyncClient":"Routes.PathParameters.MatrixExpansion.Standard","routes.PathParametersMatrixExpansionStandardAsyncClient.array":"Routes.PathParameters.MatrixExpansion.Standard.array","routes.PathParametersMatrixExpansionStandardAsyncClient.arrayWithResponse":"Routes.PathParameters.MatrixExpansion.Standard.array","routes.PathParametersMatrixExpansionStandardAsyncClient.primitive":"Routes.PathParameters.MatrixExpansion.Standard.primitive","routes.PathParametersMatrixExpansionStandardAsyncClient.primitiveWithResponse":"Routes.PathParameters.MatrixExpansion.Standard.primitive","routes.PathParametersMatrixExpansionStandardAsyncClient.record":"Routes.PathParameters.MatrixExpansion.Standard.record","routes.PathParametersMatrixExpansionStandardAsyncClient.recordWithResponse":"Routes.PathParameters.MatrixExpansion.Standard.record","routes.PathParametersMatrixExpansionStandardClient":"Routes.PathParameters.MatrixExpansion.Standard","routes.PathParametersMatrixExpansionStandardClient.array":"Routes.PathParameters.MatrixExpansion.Standard.array","routes.PathParametersMatrixExpansionStandardClient.arrayWithResponse":"Routes.PathParameters.MatrixExpansion.Standard.array","routes.PathParametersMatrixExpansionStandardClient.primitive":"Routes.PathParameters.MatrixExpansion.Standard.primitive","routes.PathParametersMatrixExpansionStandardClient.primitiveWithResponse":"Routes.PathParameters.MatrixExpansion.Standard.primitive","routes.PathParametersMatrixExpansionStandardClient.record":"Routes.PathParameters.MatrixExpansion.Standard.record","routes.PathParametersMatrixExpansionStandardClient.recordWithResponse":"Routes.PathParameters.MatrixExpansion.Standard.record","routes.PathParametersPathExpansionExplodeAsyncClient":"Routes.PathParameters.PathExpansion.Explode","routes.PathParametersPathExpansionExplodeAsyncClient.array":"Routes.PathParameters.PathExpansion.Explode.array","routes.PathParametersPathExpansionExplodeAsyncClient.arrayWithResponse":"Routes.PathParameters.PathExpansion.Explode.array","routes.PathParametersPathExpansionExplodeAsyncClient.primitive":"Routes.PathParameters.PathExpansion.Explode.primitive","routes.PathParametersPathExpansionExplodeAsyncClient.primitiveWithResponse":"Routes.PathParameters.PathExpansion.Explode.primitive","routes.PathParametersPathExpansionExplodeAsyncClient.record":"Routes.PathParameters.PathExpansion.Explode.record","routes.PathParametersPathExpansionExplodeAsyncClient.recordWithResponse":"Routes.PathParameters.PathExpansion.Explode.record","routes.PathParametersPathExpansionExplodeClient":"Routes.PathParameters.PathExpansion.Explode","routes.PathParametersPathExpansionExplodeClient.array":"Routes.PathParameters.PathExpansion.Explode.array","routes.PathParametersPathExpansionExplodeClient.arrayWithResponse":"Routes.PathParameters.PathExpansion.Explode.array","routes.PathParametersPathExpansionExplodeClient.primitive":"Routes.PathParameters.PathExpansion.Explode.primitive","routes.PathParametersPathExpansionExplodeClient.primitiveWithResponse":"Routes.PathParameters.PathExpansion.Explode.primitive","routes.PathParametersPathExpansionExplodeClient.record":"Routes.PathParameters.PathExpansion.Explode.record","routes.PathParametersPathExpansionExplodeClient.recordWithResponse":"Routes.PathParameters.PathExpansion.Explode.record","routes.PathParametersPathExpansionStandardAsyncClient":"Routes.PathParameters.PathExpansion.Standard","routes.PathParametersPathExpansionStandardAsyncClient.array":"Routes.PathParameters.PathExpansion.Standard.array","routes.PathParametersPathExpansionStandardAsyncClient.arrayWithResponse":"Routes.PathParameters.PathExpansion.Standard.array","routes.PathParametersPathExpansionStandardAsyncClient.primitive":"Routes.PathParameters.PathExpansion.Standard.primitive","routes.PathParametersPathExpansionStandardAsyncClient.primitiveWithResponse":"Routes.PathParameters.PathExpansion.Standard.primitive","routes.PathParametersPathExpansionStandardAsyncClient.record":"Routes.PathParameters.PathExpansion.Standard.record","routes.PathParametersPathExpansionStandardAsyncClient.recordWithResponse":"Routes.PathParameters.PathExpansion.Standard.record","routes.PathParametersPathExpansionStandardClient":"Routes.PathParameters.PathExpansion.Standard","routes.PathParametersPathExpansionStandardClient.array":"Routes.PathParameters.PathExpansion.Standard.array","routes.PathParametersPathExpansionStandardClient.arrayWithResponse":"Routes.PathParameters.PathExpansion.Standard.array","routes.PathParametersPathExpansionStandardClient.primitive":"Routes.PathParameters.PathExpansion.Standard.primitive","routes.PathParametersPathExpansionStandardClient.primitiveWithResponse":"Routes.PathParameters.PathExpansion.Standard.primitive","routes.PathParametersPathExpansionStandardClient.record":"Routes.PathParameters.PathExpansion.Standard.record","routes.PathParametersPathExpansionStandardClient.recordWithResponse":"Routes.PathParameters.PathExpansion.Standard.record","routes.PathParametersReservedExpansionAsyncClient":"Routes.PathParameters.ReservedExpansion","routes.PathParametersReservedExpansionAsyncClient.annotation":"Routes.PathParameters.ReservedExpansion.annotation","routes.PathParametersReservedExpansionAsyncClient.annotationWithResponse":"Routes.PathParameters.ReservedExpansion.annotation","routes.PathParametersReservedExpansionAsyncClient.template":"Routes.PathParameters.ReservedExpansion.template","routes.PathParametersReservedExpansionAsyncClient.templateWithResponse":"Routes.PathParameters.ReservedExpansion.template","routes.PathParametersReservedExpansionClient":"Routes.PathParameters.ReservedExpansion","routes.PathParametersReservedExpansionClient.annotation":"Routes.PathParameters.ReservedExpansion.annotation","routes.PathParametersReservedExpansionClient.annotationWithResponse":"Routes.PathParameters.ReservedExpansion.annotation","routes.PathParametersReservedExpansionClient.template":"Routes.PathParameters.ReservedExpansion.template","routes.PathParametersReservedExpansionClient.templateWithResponse":"Routes.PathParameters.ReservedExpansion.template","routes.PathParametersSimpleExpansionExplodeAsyncClient":"Routes.PathParameters.SimpleExpansion.Explode","routes.PathParametersSimpleExpansionExplodeAsyncClient.array":"Routes.PathParameters.SimpleExpansion.Explode.array","routes.PathParametersSimpleExpansionExplodeAsyncClient.arrayWithResponse":"Routes.PathParameters.SimpleExpansion.Explode.array","routes.PathParametersSimpleExpansionExplodeAsyncClient.primitive":"Routes.PathParameters.SimpleExpansion.Explode.primitive","routes.PathParametersSimpleExpansionExplodeAsyncClient.primitiveWithResponse":"Routes.PathParameters.SimpleExpansion.Explode.primitive","routes.PathParametersSimpleExpansionExplodeAsyncClient.record":"Routes.PathParameters.SimpleExpansion.Explode.record","routes.PathParametersSimpleExpansionExplodeAsyncClient.recordWithResponse":"Routes.PathParameters.SimpleExpansion.Explode.record","routes.PathParametersSimpleExpansionExplodeClient":"Routes.PathParameters.SimpleExpansion.Explode","routes.PathParametersSimpleExpansionExplodeClient.array":"Routes.PathParameters.SimpleExpansion.Explode.array","routes.PathParametersSimpleExpansionExplodeClient.arrayWithResponse":"Routes.PathParameters.SimpleExpansion.Explode.array","routes.PathParametersSimpleExpansionExplodeClient.primitive":"Routes.PathParameters.SimpleExpansion.Explode.primitive","routes.PathParametersSimpleExpansionExplodeClient.primitiveWithResponse":"Routes.PathParameters.SimpleExpansion.Explode.primitive","routes.PathParametersSimpleExpansionExplodeClient.record":"Routes.PathParameters.SimpleExpansion.Explode.record","routes.PathParametersSimpleExpansionExplodeClient.recordWithResponse":"Routes.PathParameters.SimpleExpansion.Explode.record","routes.PathParametersSimpleExpansionStandardAsyncClient":"Routes.PathParameters.SimpleExpansion.Standard","routes.PathParametersSimpleExpansionStandardAsyncClient.array":"Routes.PathParameters.SimpleExpansion.Standard.array","routes.PathParametersSimpleExpansionStandardAsyncClient.arrayWithResponse":"Routes.PathParameters.SimpleExpansion.Standard.array","routes.PathParametersSimpleExpansionStandardAsyncClient.primitive":"Routes.PathParameters.SimpleExpansion.Standard.primitive","routes.PathParametersSimpleExpansionStandardAsyncClient.primitiveWithResponse":"Routes.PathParameters.SimpleExpansion.Standard.primitive","routes.PathParametersSimpleExpansionStandardAsyncClient.record":"Routes.PathParameters.SimpleExpansion.Standard.record","routes.PathParametersSimpleExpansionStandardAsyncClient.recordWithResponse":"Routes.PathParameters.SimpleExpansion.Standard.record","routes.PathParametersSimpleExpansionStandardClient":"Routes.PathParameters.SimpleExpansion.Standard","routes.PathParametersSimpleExpansionStandardClient.array":"Routes.PathParameters.SimpleExpansion.Standard.array","routes.PathParametersSimpleExpansionStandardClient.arrayWithResponse":"Routes.PathParameters.SimpleExpansion.Standard.array","routes.PathParametersSimpleExpansionStandardClient.primitive":"Routes.PathParameters.SimpleExpansion.Standard.primitive","routes.PathParametersSimpleExpansionStandardClient.primitiveWithResponse":"Routes.PathParameters.SimpleExpansion.Standard.primitive","routes.PathParametersSimpleExpansionStandardClient.record":"Routes.PathParameters.SimpleExpansion.Standard.record","routes.PathParametersSimpleExpansionStandardClient.recordWithResponse":"Routes.PathParameters.SimpleExpansion.Standard.record","routes.QueryParametersAsyncClient":"Routes.QueryParameters","routes.QueryParametersAsyncClient.annotationOnly":"Routes.QueryParameters.annotationOnly","routes.QueryParametersAsyncClient.annotationOnlyWithResponse":"Routes.QueryParameters.annotationOnly","routes.QueryParametersAsyncClient.explicit":"Routes.QueryParameters.explicit","routes.QueryParametersAsyncClient.explicitWithResponse":"Routes.QueryParameters.explicit","routes.QueryParametersAsyncClient.templateOnly":"Routes.QueryParameters.templateOnly","routes.QueryParametersAsyncClient.templateOnlyWithResponse":"Routes.QueryParameters.templateOnly","routes.QueryParametersClient":"Routes.QueryParameters","routes.QueryParametersClient.annotationOnly":"Routes.QueryParameters.annotationOnly","routes.QueryParametersClient.annotationOnlyWithResponse":"Routes.QueryParameters.annotationOnly","routes.QueryParametersClient.explicit":"Routes.QueryParameters.explicit","routes.QueryParametersClient.explicitWithResponse":"Routes.QueryParameters.explicit","routes.QueryParametersClient.templateOnly":"Routes.QueryParameters.templateOnly","routes.QueryParametersClient.templateOnlyWithResponse":"Routes.QueryParameters.templateOnly","routes.QueryParametersQueryContinuationExplodeAsyncClient":"Routes.QueryParameters.QueryContinuation.Explode","routes.QueryParametersQueryContinuationExplodeAsyncClient.array":"Routes.QueryParameters.QueryContinuation.Explode.array","routes.QueryParametersQueryContinuationExplodeAsyncClient.arrayWithResponse":"Routes.QueryParameters.QueryContinuation.Explode.array","routes.QueryParametersQueryContinuationExplodeAsyncClient.primitive":"Routes.QueryParameters.QueryContinuation.Explode.primitive","routes.QueryParametersQueryContinuationExplodeAsyncClient.primitiveWithResponse":"Routes.QueryParameters.QueryContinuation.Explode.primitive","routes.QueryParametersQueryContinuationExplodeAsyncClient.record":"Routes.QueryParameters.QueryContinuation.Explode.record","routes.QueryParametersQueryContinuationExplodeAsyncClient.recordWithResponse":"Routes.QueryParameters.QueryContinuation.Explode.record","routes.QueryParametersQueryContinuationExplodeClient":"Routes.QueryParameters.QueryContinuation.Explode","routes.QueryParametersQueryContinuationExplodeClient.array":"Routes.QueryParameters.QueryContinuation.Explode.array","routes.QueryParametersQueryContinuationExplodeClient.arrayWithResponse":"Routes.QueryParameters.QueryContinuation.Explode.array","routes.QueryParametersQueryContinuationExplodeClient.primitive":"Routes.QueryParameters.QueryContinuation.Explode.primitive","routes.QueryParametersQueryContinuationExplodeClient.primitiveWithResponse":"Routes.QueryParameters.QueryContinuation.Explode.primitive","routes.QueryParametersQueryContinuationExplodeClient.record":"Routes.QueryParameters.QueryContinuation.Explode.record","routes.QueryParametersQueryContinuationExplodeClient.recordWithResponse":"Routes.QueryParameters.QueryContinuation.Explode.record","routes.QueryParametersQueryContinuationStandardAsyncClient":"Routes.QueryParameters.QueryContinuation.Standard","routes.QueryParametersQueryContinuationStandardAsyncClient.array":"Routes.QueryParameters.QueryContinuation.Standard.array","routes.QueryParametersQueryContinuationStandardAsyncClient.arrayWithResponse":"Routes.QueryParameters.QueryContinuation.Standard.array","routes.QueryParametersQueryContinuationStandardAsyncClient.primitive":"Routes.QueryParameters.QueryContinuation.Standard.primitive","routes.QueryParametersQueryContinuationStandardAsyncClient.primitiveWithResponse":"Routes.QueryParameters.QueryContinuation.Standard.primitive","routes.QueryParametersQueryContinuationStandardAsyncClient.record":"Routes.QueryParameters.QueryContinuation.Standard.record","routes.QueryParametersQueryContinuationStandardAsyncClient.recordWithResponse":"Routes.QueryParameters.QueryContinuation.Standard.record","routes.QueryParametersQueryContinuationStandardClient":"Routes.QueryParameters.QueryContinuation.Standard","routes.QueryParametersQueryContinuationStandardClient.array":"Routes.QueryParameters.QueryContinuation.Standard.array","routes.QueryParametersQueryContinuationStandardClient.arrayWithResponse":"Routes.QueryParameters.QueryContinuation.Standard.array","routes.QueryParametersQueryContinuationStandardClient.primitive":"Routes.QueryParameters.QueryContinuation.Standard.primitive","routes.QueryParametersQueryContinuationStandardClient.primitiveWithResponse":"Routes.QueryParameters.QueryContinuation.Standard.primitive","routes.QueryParametersQueryContinuationStandardClient.record":"Routes.QueryParameters.QueryContinuation.Standard.record","routes.QueryParametersQueryContinuationStandardClient.recordWithResponse":"Routes.QueryParameters.QueryContinuation.Standard.record","routes.QueryParametersQueryExpansionExplodeAsyncClient":"Routes.QueryParameters.QueryExpansion.Explode","routes.QueryParametersQueryExpansionExplodeAsyncClient.array":"Routes.QueryParameters.QueryExpansion.Explode.array","routes.QueryParametersQueryExpansionExplodeAsyncClient.arrayWithResponse":"Routes.QueryParameters.QueryExpansion.Explode.array","routes.QueryParametersQueryExpansionExplodeAsyncClient.primitive":"Routes.QueryParameters.QueryExpansion.Explode.primitive","routes.QueryParametersQueryExpansionExplodeAsyncClient.primitiveWithResponse":"Routes.QueryParameters.QueryExpansion.Explode.primitive","routes.QueryParametersQueryExpansionExplodeAsyncClient.record":"Routes.QueryParameters.QueryExpansion.Explode.record","routes.QueryParametersQueryExpansionExplodeAsyncClient.recordWithResponse":"Routes.QueryParameters.QueryExpansion.Explode.record","routes.QueryParametersQueryExpansionExplodeClient":"Routes.QueryParameters.QueryExpansion.Explode","routes.QueryParametersQueryExpansionExplodeClient.array":"Routes.QueryParameters.QueryExpansion.Explode.array","routes.QueryParametersQueryExpansionExplodeClient.arrayWithResponse":"Routes.QueryParameters.QueryExpansion.Explode.array","routes.QueryParametersQueryExpansionExplodeClient.primitive":"Routes.QueryParameters.QueryExpansion.Explode.primitive","routes.QueryParametersQueryExpansionExplodeClient.primitiveWithResponse":"Routes.QueryParameters.QueryExpansion.Explode.primitive","routes.QueryParametersQueryExpansionExplodeClient.record":"Routes.QueryParameters.QueryExpansion.Explode.record","routes.QueryParametersQueryExpansionExplodeClient.recordWithResponse":"Routes.QueryParameters.QueryExpansion.Explode.record","routes.QueryParametersQueryExpansionStandardAsyncClient":"Routes.QueryParameters.QueryExpansion.Standard","routes.QueryParametersQueryExpansionStandardAsyncClient.array":"Routes.QueryParameters.QueryExpansion.Standard.array","routes.QueryParametersQueryExpansionStandardAsyncClient.arrayWithResponse":"Routes.QueryParameters.QueryExpansion.Standard.array","routes.QueryParametersQueryExpansionStandardAsyncClient.primitive":"Routes.QueryParameters.QueryExpansion.Standard.primitive","routes.QueryParametersQueryExpansionStandardAsyncClient.primitiveWithResponse":"Routes.QueryParameters.QueryExpansion.Standard.primitive","routes.QueryParametersQueryExpansionStandardAsyncClient.record":"Routes.QueryParameters.QueryExpansion.Standard.record","routes.QueryParametersQueryExpansionStandardAsyncClient.recordWithResponse":"Routes.QueryParameters.QueryExpansion.Standard.record","routes.QueryParametersQueryExpansionStandardClient":"Routes.QueryParameters.QueryExpansion.Standard","routes.QueryParametersQueryExpansionStandardClient.array":"Routes.QueryParameters.QueryExpansion.Standard.array","routes.QueryParametersQueryExpansionStandardClient.arrayWithResponse":"Routes.QueryParameters.QueryExpansion.Standard.array","routes.QueryParametersQueryExpansionStandardClient.primitive":"Routes.QueryParameters.QueryExpansion.Standard.primitive","routes.QueryParametersQueryExpansionStandardClient.primitiveWithResponse":"Routes.QueryParameters.QueryExpansion.Standard.primitive","routes.QueryParametersQueryExpansionStandardClient.record":"Routes.QueryParameters.QueryExpansion.Standard.record","routes.QueryParametersQueryExpansionStandardClient.recordWithResponse":"Routes.QueryParameters.QueryExpansion.Standard.record","routes.RoutesAsyncClient":"Routes","routes.RoutesAsyncClient.fixed":"Routes.fixed","routes.RoutesAsyncClient.fixedWithResponse":"Routes.fixed","routes.RoutesClient":"Routes","routes.RoutesClient.fixed":"Routes.fixed","routes.RoutesClient.fixedWithResponse":"Routes.fixed","routes.RoutesClientBuilder":"Routes"},"generatedFiles":["src/main/java/module-info.java","src/main/java/routes/InInterfaceAsyncClient.java","src/main/java/routes/InInterfaceClient.java","src/main/java/routes/PathParametersAsyncClient.java","src/main/java/routes/PathParametersClient.java","src/main/java/routes/PathParametersLabelExpansionExplodeAsyncClient.java","src/main/java/routes/PathParametersLabelExpansionExplodeClient.java","src/main/java/routes/PathParametersLabelExpansionStandardAsyncClient.java","src/main/java/routes/PathParametersLabelExpansionStandardClient.java","src/main/java/routes/PathParametersMatrixExpansionExplodeAsyncClient.java","src/main/java/routes/PathParametersMatrixExpansionExplodeClient.java","src/main/java/routes/PathParametersMatrixExpansionStandardAsyncClient.java","src/main/java/routes/PathParametersMatrixExpansionStandardClient.java","src/main/java/routes/PathParametersPathExpansionExplodeAsyncClient.java","src/main/java/routes/PathParametersPathExpansionExplodeClient.java","src/main/java/routes/PathParametersPathExpansionStandardAsyncClient.java","src/main/java/routes/PathParametersPathExpansionStandardClient.java","src/main/java/routes/PathParametersReservedExpansionAsyncClient.java","src/main/java/routes/PathParametersReservedExpansionClient.java","src/main/java/routes/PathParametersSimpleExpansionExplodeAsyncClient.java","src/main/java/routes/PathParametersSimpleExpansionExplodeClient.java","src/main/java/routes/PathParametersSimpleExpansionStandardAsyncClient.java","src/main/java/routes/PathParametersSimpleExpansionStandardClient.java","src/main/java/routes/QueryParametersAsyncClient.java","src/main/java/routes/QueryParametersClient.java","src/main/java/routes/QueryParametersQueryContinuationExplodeAsyncClient.java","src/main/java/routes/QueryParametersQueryContinuationExplodeClient.java","src/main/java/routes/QueryParametersQueryContinuationStandardAsyncClient.java","src/main/java/routes/QueryParametersQueryContinuationStandardClient.java","src/main/java/routes/QueryParametersQueryExpansionExplodeAsyncClient.java","src/main/java/routes/QueryParametersQueryExpansionExplodeClient.java","src/main/java/routes/QueryParametersQueryExpansionStandardAsyncClient.java","src/main/java/routes/QueryParametersQueryExpansionStandardClient.java","src/main/java/routes/RoutesAsyncClient.java","src/main/java/routes/RoutesClient.java","src/main/java/routes/RoutesClientBuilder.java","src/main/java/routes/implementation/InInterfacesImpl.java","src/main/java/routes/implementation/PathParametersImpl.java","src/main/java/routes/implementation/PathParametersLabelExpansionExplodesImpl.java","src/main/java/routes/implementation/PathParametersLabelExpansionStandardsImpl.java","src/main/java/routes/implementation/PathParametersMatrixExpansionExplodesImpl.java","src/main/java/routes/implementation/PathParametersMatrixExpansionStandardsImpl.java","src/main/java/routes/implementation/PathParametersPathExpansionExplodesImpl.java","src/main/java/routes/implementation/PathParametersPathExpansionStandardsImpl.java","src/main/java/routes/implementation/PathParametersReservedExpansionsImpl.java","src/main/java/routes/implementation/PathParametersSimpleExpansionExplodesImpl.java","src/main/java/routes/implementation/PathParametersSimpleExpansionStandardsImpl.java","src/main/java/routes/implementation/QueryParametersImpl.java","src/main/java/routes/implementation/QueryParametersQueryContinuationExplodesImpl.java","src/main/java/routes/implementation/QueryParametersQueryContinuationStandardsImpl.java","src/main/java/routes/implementation/QueryParametersQueryExpansionExplodesImpl.java","src/main/java/routes/implementation/QueryParametersQueryExpansionStandardsImpl.java","src/main/java/routes/implementation/RoutesClientImpl.java","src/main/java/routes/implementation/package-info.java","src/main/java/routes/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/serialization-encodedname-json_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/serialization-encodedname-json_apiview_properties.json deleted file mode 100644 index 92d2b385806..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/serialization-encodedname-json_apiview_properties.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "serialization.encodedname.json.JsonAsyncClient": "Serialization.EncodedName.Json.Property", - "serialization.encodedname.json.JsonAsyncClient.get": "Serialization.EncodedName.Json.Property.get", - "serialization.encodedname.json.JsonAsyncClient.getWithResponse": "Serialization.EncodedName.Json.Property.get", - "serialization.encodedname.json.JsonAsyncClient.send": "Serialization.EncodedName.Json.Property.send", - "serialization.encodedname.json.JsonAsyncClient.sendWithResponse": "Serialization.EncodedName.Json.Property.send", - "serialization.encodedname.json.JsonClient": "Serialization.EncodedName.Json.Property", - "serialization.encodedname.json.JsonClient.get": "Serialization.EncodedName.Json.Property.get", - "serialization.encodedname.json.JsonClient.getWithResponse": "Serialization.EncodedName.Json.Property.get", - "serialization.encodedname.json.JsonClient.send": "Serialization.EncodedName.Json.Property.send", - "serialization.encodedname.json.JsonClient.sendWithResponse": "Serialization.EncodedName.Json.Property.send", - "serialization.encodedname.json.JsonClientBuilder": "Serialization.EncodedName.Json", - "serialization.encodedname.json.property.models.JsonEncodedNameModel": "Serialization.EncodedName.Json.Property.JsonEncodedNameModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/serialization-encodedname-json_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/serialization-encodedname-json_metadata.json index bbcad97db1a..2a6010c831a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/serialization-encodedname-json_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/serialization-encodedname-json_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"serialization.encodedname.json.JsonAsyncClient":"Serialization.EncodedName.Json.Property","serialization.encodedname.json.JsonAsyncClient.get":"Serialization.EncodedName.Json.Property.get","serialization.encodedname.json.JsonAsyncClient.getWithResponse":"Serialization.EncodedName.Json.Property.get","serialization.encodedname.json.JsonAsyncClient.send":"Serialization.EncodedName.Json.Property.send","serialization.encodedname.json.JsonAsyncClient.sendWithResponse":"Serialization.EncodedName.Json.Property.send","serialization.encodedname.json.JsonClient":"Serialization.EncodedName.Json.Property","serialization.encodedname.json.JsonClient.get":"Serialization.EncodedName.Json.Property.get","serialization.encodedname.json.JsonClient.getWithResponse":"Serialization.EncodedName.Json.Property.get","serialization.encodedname.json.JsonClient.send":"Serialization.EncodedName.Json.Property.send","serialization.encodedname.json.JsonClient.sendWithResponse":"Serialization.EncodedName.Json.Property.send","serialization.encodedname.json.JsonClientBuilder":"Serialization.EncodedName.Json","serialization.encodedname.json.property.models.JsonEncodedNameModel":"Serialization.EncodedName.Json.Property.JsonEncodedNameModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/serialization/encodedname/json/JsonAsyncClient.java","src/main/java/serialization/encodedname/json/JsonClient.java","src/main/java/serialization/encodedname/json/JsonClientBuilder.java","src/main/java/serialization/encodedname/json/implementation/JsonClientImpl.java","src/main/java/serialization/encodedname/json/implementation/PropertiesImpl.java","src/main/java/serialization/encodedname/json/implementation/package-info.java","src/main/java/serialization/encodedname/json/package-info.java","src/main/java/serialization/encodedname/json/property/models/JsonEncodedNameModel.java","src/main/java/serialization/encodedname/json/property/models/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"serialization.encodedname.json.JsonAsyncClient":"Serialization.EncodedName.Json.Property","serialization.encodedname.json.JsonAsyncClient.get":"Serialization.EncodedName.Json.Property.get","serialization.encodedname.json.JsonAsyncClient.getWithResponse":"Serialization.EncodedName.Json.Property.get","serialization.encodedname.json.JsonAsyncClient.send":"Serialization.EncodedName.Json.Property.send","serialization.encodedname.json.JsonAsyncClient.sendWithResponse":"Serialization.EncodedName.Json.Property.send","serialization.encodedname.json.JsonClient":"Serialization.EncodedName.Json.Property","serialization.encodedname.json.JsonClient.get":"Serialization.EncodedName.Json.Property.get","serialization.encodedname.json.JsonClient.getWithResponse":"Serialization.EncodedName.Json.Property.get","serialization.encodedname.json.JsonClient.send":"Serialization.EncodedName.Json.Property.send","serialization.encodedname.json.JsonClient.sendWithResponse":"Serialization.EncodedName.Json.Property.send","serialization.encodedname.json.JsonClientBuilder":"Serialization.EncodedName.Json","serialization.encodedname.json.property.models.JsonEncodedNameModel":"Serialization.EncodedName.Json.Property.JsonEncodedNameModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/serialization/encodedname/json/JsonAsyncClient.java","src/main/java/serialization/encodedname/json/JsonClient.java","src/main/java/serialization/encodedname/json/JsonClientBuilder.java","src/main/java/serialization/encodedname/json/implementation/JsonClientImpl.java","src/main/java/serialization/encodedname/json/implementation/PropertiesImpl.java","src/main/java/serialization/encodedname/json/implementation/package-info.java","src/main/java/serialization/encodedname/json/package-info.java","src/main/java/serialization/encodedname/json/property/models/JsonEncodedNameModel.java","src/main/java/serialization/encodedname/json/property/models/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-endpoint-notdefined_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-endpoint-notdefined_apiview_properties.json deleted file mode 100644 index eaeafddebd3..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-endpoint-notdefined_apiview_properties.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "server.endpoint.notdefined.NotDefinedAsyncClient": "Server.Endpoint.NotDefined", - "server.endpoint.notdefined.NotDefinedAsyncClient.valid": "Server.Endpoint.NotDefined.valid", - "server.endpoint.notdefined.NotDefinedAsyncClient.validWithResponse": "Server.Endpoint.NotDefined.valid", - "server.endpoint.notdefined.NotDefinedClient": "Server.Endpoint.NotDefined", - "server.endpoint.notdefined.NotDefinedClient.valid": "Server.Endpoint.NotDefined.valid", - "server.endpoint.notdefined.NotDefinedClient.validWithResponse": "Server.Endpoint.NotDefined.valid", - "server.endpoint.notdefined.NotDefinedClientBuilder": "Server.Endpoint.NotDefined" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-endpoint-notdefined_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-endpoint-notdefined_metadata.json index eda20fc720a..6130f9b48e8 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-endpoint-notdefined_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-endpoint-notdefined_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"server.endpoint.notdefined.NotDefinedAsyncClient":"Server.Endpoint.NotDefined","server.endpoint.notdefined.NotDefinedAsyncClient.valid":"Server.Endpoint.NotDefined.valid","server.endpoint.notdefined.NotDefinedAsyncClient.validWithResponse":"Server.Endpoint.NotDefined.valid","server.endpoint.notdefined.NotDefinedClient":"Server.Endpoint.NotDefined","server.endpoint.notdefined.NotDefinedClient.valid":"Server.Endpoint.NotDefined.valid","server.endpoint.notdefined.NotDefinedClient.validWithResponse":"Server.Endpoint.NotDefined.valid","server.endpoint.notdefined.NotDefinedClientBuilder":"Server.Endpoint.NotDefined"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/endpoint/notdefined/NotDefinedAsyncClient.java","src/main/java/server/endpoint/notdefined/NotDefinedClient.java","src/main/java/server/endpoint/notdefined/NotDefinedClientBuilder.java","src/main/java/server/endpoint/notdefined/implementation/NotDefinedClientImpl.java","src/main/java/server/endpoint/notdefined/implementation/package-info.java","src/main/java/server/endpoint/notdefined/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"server.endpoint.notdefined.NotDefinedAsyncClient":"Server.Endpoint.NotDefined","server.endpoint.notdefined.NotDefinedAsyncClient.valid":"Server.Endpoint.NotDefined.valid","server.endpoint.notdefined.NotDefinedAsyncClient.validWithResponse":"Server.Endpoint.NotDefined.valid","server.endpoint.notdefined.NotDefinedClient":"Server.Endpoint.NotDefined","server.endpoint.notdefined.NotDefinedClient.valid":"Server.Endpoint.NotDefined.valid","server.endpoint.notdefined.NotDefinedClient.validWithResponse":"Server.Endpoint.NotDefined.valid","server.endpoint.notdefined.NotDefinedClientBuilder":"Server.Endpoint.NotDefined"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/endpoint/notdefined/NotDefinedAsyncClient.java","src/main/java/server/endpoint/notdefined/NotDefinedClient.java","src/main/java/server/endpoint/notdefined/NotDefinedClientBuilder.java","src/main/java/server/endpoint/notdefined/implementation/NotDefinedClientImpl.java","src/main/java/server/endpoint/notdefined/implementation/package-info.java","src/main/java/server/endpoint/notdefined/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-path-multiple_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-path-multiple_apiview_properties.json deleted file mode 100644 index 354265e93d4..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-path-multiple_apiview_properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "server.path.multiple.MultipleAsyncClient": "Server.Path.Multiple", - "server.path.multiple.MultipleAsyncClient.noOperationParams": "Server.Path.Multiple.noOperationParams", - "server.path.multiple.MultipleAsyncClient.noOperationParamsWithResponse": "Server.Path.Multiple.noOperationParams", - "server.path.multiple.MultipleAsyncClient.withOperationPathParam": "Server.Path.Multiple.withOperationPathParam", - "server.path.multiple.MultipleAsyncClient.withOperationPathParamWithResponse": "Server.Path.Multiple.withOperationPathParam", - "server.path.multiple.MultipleClient": "Server.Path.Multiple", - "server.path.multiple.MultipleClient.noOperationParams": "Server.Path.Multiple.noOperationParams", - "server.path.multiple.MultipleClient.noOperationParamsWithResponse": "Server.Path.Multiple.noOperationParams", - "server.path.multiple.MultipleClient.withOperationPathParam": "Server.Path.Multiple.withOperationPathParam", - "server.path.multiple.MultipleClient.withOperationPathParamWithResponse": "Server.Path.Multiple.withOperationPathParam", - "server.path.multiple.MultipleClientBuilder": "Server.Path.Multiple" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-path-multiple_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-path-multiple_metadata.json index 24c2aa4f6d0..f705a73de80 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-path-multiple_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-path-multiple_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"v1.0","crossLanguageDefinitions":{"server.path.multiple.MultipleAsyncClient":"Server.Path.Multiple","server.path.multiple.MultipleAsyncClient.noOperationParams":"Server.Path.Multiple.noOperationParams","server.path.multiple.MultipleAsyncClient.noOperationParamsWithResponse":"Server.Path.Multiple.noOperationParams","server.path.multiple.MultipleAsyncClient.withOperationPathParam":"Server.Path.Multiple.withOperationPathParam","server.path.multiple.MultipleAsyncClient.withOperationPathParamWithResponse":"Server.Path.Multiple.withOperationPathParam","server.path.multiple.MultipleClient":"Server.Path.Multiple","server.path.multiple.MultipleClient.noOperationParams":"Server.Path.Multiple.noOperationParams","server.path.multiple.MultipleClient.noOperationParamsWithResponse":"Server.Path.Multiple.noOperationParams","server.path.multiple.MultipleClient.withOperationPathParam":"Server.Path.Multiple.withOperationPathParam","server.path.multiple.MultipleClient.withOperationPathParamWithResponse":"Server.Path.Multiple.withOperationPathParam","server.path.multiple.MultipleClientBuilder":"Server.Path.Multiple"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/path/multiple/MultipleAsyncClient.java","src/main/java/server/path/multiple/MultipleClient.java","src/main/java/server/path/multiple/MultipleClientBuilder.java","src/main/java/server/path/multiple/MultipleServiceVersion.java","src/main/java/server/path/multiple/implementation/MultipleClientImpl.java","src/main/java/server/path/multiple/implementation/package-info.java","src/main/java/server/path/multiple/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Server.Path.Multiple":"v1.0"},"crossLanguageDefinitions":{"server.path.multiple.MultipleAsyncClient":"Server.Path.Multiple","server.path.multiple.MultipleAsyncClient.noOperationParams":"Server.Path.Multiple.noOperationParams","server.path.multiple.MultipleAsyncClient.noOperationParamsWithResponse":"Server.Path.Multiple.noOperationParams","server.path.multiple.MultipleAsyncClient.withOperationPathParam":"Server.Path.Multiple.withOperationPathParam","server.path.multiple.MultipleAsyncClient.withOperationPathParamWithResponse":"Server.Path.Multiple.withOperationPathParam","server.path.multiple.MultipleClient":"Server.Path.Multiple","server.path.multiple.MultipleClient.noOperationParams":"Server.Path.Multiple.noOperationParams","server.path.multiple.MultipleClient.noOperationParamsWithResponse":"Server.Path.Multiple.noOperationParams","server.path.multiple.MultipleClient.withOperationPathParam":"Server.Path.Multiple.withOperationPathParam","server.path.multiple.MultipleClient.withOperationPathParamWithResponse":"Server.Path.Multiple.withOperationPathParam","server.path.multiple.MultipleClientBuilder":"Server.Path.Multiple"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/path/multiple/MultipleAsyncClient.java","src/main/java/server/path/multiple/MultipleClient.java","src/main/java/server/path/multiple/MultipleClientBuilder.java","src/main/java/server/path/multiple/MultipleServiceVersion.java","src/main/java/server/path/multiple/implementation/MultipleClientImpl.java","src/main/java/server/path/multiple/implementation/package-info.java","src/main/java/server/path/multiple/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-path-single_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-path-single_apiview_properties.json deleted file mode 100644 index a15da207d9f..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-path-single_apiview_properties.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "server.path.single.SingleAsyncClient": "Server.Path.Single", - "server.path.single.SingleAsyncClient.myOp": "Server.Path.Single.myOp", - "server.path.single.SingleAsyncClient.myOpWithResponse": "Server.Path.Single.myOp", - "server.path.single.SingleClient": "Server.Path.Single", - "server.path.single.SingleClient.myOp": "Server.Path.Single.myOp", - "server.path.single.SingleClient.myOpWithResponse": "Server.Path.Single.myOp", - "server.path.single.SingleClientBuilder": "Server.Path.Single" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-path-single_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-path-single_metadata.json index 41b5ee625b3..e3940c68840 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-path-single_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-path-single_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"server.path.single.SingleAsyncClient":"Server.Path.Single","server.path.single.SingleAsyncClient.myOp":"Server.Path.Single.myOp","server.path.single.SingleAsyncClient.myOpWithResponse":"Server.Path.Single.myOp","server.path.single.SingleClient":"Server.Path.Single","server.path.single.SingleClient.myOp":"Server.Path.Single.myOp","server.path.single.SingleClient.myOpWithResponse":"Server.Path.Single.myOp","server.path.single.SingleClientBuilder":"Server.Path.Single"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/path/single/SingleAsyncClient.java","src/main/java/server/path/single/SingleClient.java","src/main/java/server/path/single/SingleClientBuilder.java","src/main/java/server/path/single/implementation/SingleClientImpl.java","src/main/java/server/path/single/implementation/package-info.java","src/main/java/server/path/single/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"server.path.single.SingleAsyncClient":"Server.Path.Single","server.path.single.SingleAsyncClient.myOp":"Server.Path.Single.myOp","server.path.single.SingleAsyncClient.myOpWithResponse":"Server.Path.Single.myOp","server.path.single.SingleClient":"Server.Path.Single","server.path.single.SingleClient.myOp":"Server.Path.Single.myOp","server.path.single.SingleClient.myOpWithResponse":"Server.Path.Single.myOp","server.path.single.SingleClientBuilder":"Server.Path.Single"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/path/single/SingleAsyncClient.java","src/main/java/server/path/single/SingleClient.java","src/main/java/server/path/single/SingleClientBuilder.java","src/main/java/server/path/single/implementation/SingleClientImpl.java","src/main/java/server/path/single/implementation/package-info.java","src/main/java/server/path/single/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-versions-notversioned_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-versions-notversioned_apiview_properties.json deleted file mode 100644 index 7e8c0612518..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-versions-notversioned_apiview_properties.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "server.versions.notversioned.NotVersionedAsyncClient": "Server.Versions.NotVersioned", - "server.versions.notversioned.NotVersionedAsyncClient.withPathApiVersion": "Server.Versions.NotVersioned.withPathApiVersion", - "server.versions.notversioned.NotVersionedAsyncClient.withPathApiVersionWithResponse": "Server.Versions.NotVersioned.withPathApiVersion", - "server.versions.notversioned.NotVersionedAsyncClient.withQueryApiVersion": "Server.Versions.NotVersioned.withQueryApiVersion", - "server.versions.notversioned.NotVersionedAsyncClient.withQueryApiVersionWithResponse": "Server.Versions.NotVersioned.withQueryApiVersion", - "server.versions.notversioned.NotVersionedAsyncClient.withoutApiVersion": "Server.Versions.NotVersioned.withoutApiVersion", - "server.versions.notversioned.NotVersionedAsyncClient.withoutApiVersionWithResponse": "Server.Versions.NotVersioned.withoutApiVersion", - "server.versions.notversioned.NotVersionedClient": "Server.Versions.NotVersioned", - "server.versions.notversioned.NotVersionedClient.withPathApiVersion": "Server.Versions.NotVersioned.withPathApiVersion", - "server.versions.notversioned.NotVersionedClient.withPathApiVersionWithResponse": "Server.Versions.NotVersioned.withPathApiVersion", - "server.versions.notversioned.NotVersionedClient.withQueryApiVersion": "Server.Versions.NotVersioned.withQueryApiVersion", - "server.versions.notversioned.NotVersionedClient.withQueryApiVersionWithResponse": "Server.Versions.NotVersioned.withQueryApiVersion", - "server.versions.notversioned.NotVersionedClient.withoutApiVersion": "Server.Versions.NotVersioned.withoutApiVersion", - "server.versions.notversioned.NotVersionedClient.withoutApiVersionWithResponse": "Server.Versions.NotVersioned.withoutApiVersion", - "server.versions.notversioned.NotVersionedClientBuilder": "Server.Versions.NotVersioned" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-versions-notversioned_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-versions-notversioned_metadata.json index 1e7846fb03b..ab77bb3b006 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-versions-notversioned_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-versions-notversioned_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"server.versions.notversioned.NotVersionedAsyncClient":"Server.Versions.NotVersioned","server.versions.notversioned.NotVersionedAsyncClient.withPathApiVersion":"Server.Versions.NotVersioned.withPathApiVersion","server.versions.notversioned.NotVersionedAsyncClient.withPathApiVersionWithResponse":"Server.Versions.NotVersioned.withPathApiVersion","server.versions.notversioned.NotVersionedAsyncClient.withQueryApiVersion":"Server.Versions.NotVersioned.withQueryApiVersion","server.versions.notversioned.NotVersionedAsyncClient.withQueryApiVersionWithResponse":"Server.Versions.NotVersioned.withQueryApiVersion","server.versions.notversioned.NotVersionedAsyncClient.withoutApiVersion":"Server.Versions.NotVersioned.withoutApiVersion","server.versions.notversioned.NotVersionedAsyncClient.withoutApiVersionWithResponse":"Server.Versions.NotVersioned.withoutApiVersion","server.versions.notversioned.NotVersionedClient":"Server.Versions.NotVersioned","server.versions.notversioned.NotVersionedClient.withPathApiVersion":"Server.Versions.NotVersioned.withPathApiVersion","server.versions.notversioned.NotVersionedClient.withPathApiVersionWithResponse":"Server.Versions.NotVersioned.withPathApiVersion","server.versions.notversioned.NotVersionedClient.withQueryApiVersion":"Server.Versions.NotVersioned.withQueryApiVersion","server.versions.notversioned.NotVersionedClient.withQueryApiVersionWithResponse":"Server.Versions.NotVersioned.withQueryApiVersion","server.versions.notversioned.NotVersionedClient.withoutApiVersion":"Server.Versions.NotVersioned.withoutApiVersion","server.versions.notversioned.NotVersionedClient.withoutApiVersionWithResponse":"Server.Versions.NotVersioned.withoutApiVersion","server.versions.notversioned.NotVersionedClientBuilder":"Server.Versions.NotVersioned"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/versions/notversioned/NotVersionedAsyncClient.java","src/main/java/server/versions/notversioned/NotVersionedClient.java","src/main/java/server/versions/notversioned/NotVersionedClientBuilder.java","src/main/java/server/versions/notversioned/implementation/NotVersionedClientImpl.java","src/main/java/server/versions/notversioned/implementation/package-info.java","src/main/java/server/versions/notversioned/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"server.versions.notversioned.NotVersionedAsyncClient":"Server.Versions.NotVersioned","server.versions.notversioned.NotVersionedAsyncClient.withPathApiVersion":"Server.Versions.NotVersioned.withPathApiVersion","server.versions.notversioned.NotVersionedAsyncClient.withPathApiVersionWithResponse":"Server.Versions.NotVersioned.withPathApiVersion","server.versions.notversioned.NotVersionedAsyncClient.withQueryApiVersion":"Server.Versions.NotVersioned.withQueryApiVersion","server.versions.notversioned.NotVersionedAsyncClient.withQueryApiVersionWithResponse":"Server.Versions.NotVersioned.withQueryApiVersion","server.versions.notversioned.NotVersionedAsyncClient.withoutApiVersion":"Server.Versions.NotVersioned.withoutApiVersion","server.versions.notversioned.NotVersionedAsyncClient.withoutApiVersionWithResponse":"Server.Versions.NotVersioned.withoutApiVersion","server.versions.notversioned.NotVersionedClient":"Server.Versions.NotVersioned","server.versions.notversioned.NotVersionedClient.withPathApiVersion":"Server.Versions.NotVersioned.withPathApiVersion","server.versions.notversioned.NotVersionedClient.withPathApiVersionWithResponse":"Server.Versions.NotVersioned.withPathApiVersion","server.versions.notversioned.NotVersionedClient.withQueryApiVersion":"Server.Versions.NotVersioned.withQueryApiVersion","server.versions.notversioned.NotVersionedClient.withQueryApiVersionWithResponse":"Server.Versions.NotVersioned.withQueryApiVersion","server.versions.notversioned.NotVersionedClient.withoutApiVersion":"Server.Versions.NotVersioned.withoutApiVersion","server.versions.notversioned.NotVersionedClient.withoutApiVersionWithResponse":"Server.Versions.NotVersioned.withoutApiVersion","server.versions.notversioned.NotVersionedClientBuilder":"Server.Versions.NotVersioned"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/versions/notversioned/NotVersionedAsyncClient.java","src/main/java/server/versions/notversioned/NotVersionedClient.java","src/main/java/server/versions/notversioned/NotVersionedClientBuilder.java","src/main/java/server/versions/notversioned/implementation/NotVersionedClientImpl.java","src/main/java/server/versions/notversioned/implementation/package-info.java","src/main/java/server/versions/notversioned/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-versions-versioned_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-versions-versioned_apiview_properties.json deleted file mode 100644 index 4ef1c621313..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-versions-versioned_apiview_properties.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "server.versions.versioned.VersionedAsyncClient": "Server.Versions.Versioned", - "server.versions.versioned.VersionedAsyncClient.withPathApiVersion": "Server.Versions.Versioned.withPathApiVersion", - "server.versions.versioned.VersionedAsyncClient.withPathApiVersionWithResponse": "Server.Versions.Versioned.withPathApiVersion", - "server.versions.versioned.VersionedAsyncClient.withQueryApiVersion": "Server.Versions.Versioned.withQueryApiVersion", - "server.versions.versioned.VersionedAsyncClient.withQueryApiVersionWithResponse": "Server.Versions.Versioned.withQueryApiVersion", - "server.versions.versioned.VersionedAsyncClient.withQueryOldApiVersion": "Server.Versions.Versioned.withQueryOldApiVersion", - "server.versions.versioned.VersionedAsyncClient.withQueryOldApiVersionWithResponse": "Server.Versions.Versioned.withQueryOldApiVersion", - "server.versions.versioned.VersionedAsyncClient.withoutApiVersion": "Server.Versions.Versioned.withoutApiVersion", - "server.versions.versioned.VersionedAsyncClient.withoutApiVersionWithResponse": "Server.Versions.Versioned.withoutApiVersion", - "server.versions.versioned.VersionedClient": "Server.Versions.Versioned", - "server.versions.versioned.VersionedClient.withPathApiVersion": "Server.Versions.Versioned.withPathApiVersion", - "server.versions.versioned.VersionedClient.withPathApiVersionWithResponse": "Server.Versions.Versioned.withPathApiVersion", - "server.versions.versioned.VersionedClient.withQueryApiVersion": "Server.Versions.Versioned.withQueryApiVersion", - "server.versions.versioned.VersionedClient.withQueryApiVersionWithResponse": "Server.Versions.Versioned.withQueryApiVersion", - "server.versions.versioned.VersionedClient.withQueryOldApiVersion": "Server.Versions.Versioned.withQueryOldApiVersion", - "server.versions.versioned.VersionedClient.withQueryOldApiVersionWithResponse": "Server.Versions.Versioned.withQueryOldApiVersion", - "server.versions.versioned.VersionedClient.withoutApiVersion": "Server.Versions.Versioned.withoutApiVersion", - "server.versions.versioned.VersionedClient.withoutApiVersionWithResponse": "Server.Versions.Versioned.withoutApiVersion", - "server.versions.versioned.VersionedClientBuilder": "Server.Versions.Versioned" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-versions-versioned_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-versions-versioned_metadata.json index 168a72c64a6..e937190495a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-versions-versioned_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/server-versions-versioned_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2022-12-01-preview","crossLanguageDefinitions":{"server.versions.versioned.VersionedAsyncClient":"Server.Versions.Versioned","server.versions.versioned.VersionedAsyncClient.withPathApiVersion":"Server.Versions.Versioned.withPathApiVersion","server.versions.versioned.VersionedAsyncClient.withPathApiVersionWithResponse":"Server.Versions.Versioned.withPathApiVersion","server.versions.versioned.VersionedAsyncClient.withQueryApiVersion":"Server.Versions.Versioned.withQueryApiVersion","server.versions.versioned.VersionedAsyncClient.withQueryApiVersionWithResponse":"Server.Versions.Versioned.withQueryApiVersion","server.versions.versioned.VersionedAsyncClient.withQueryOldApiVersion":"Server.Versions.Versioned.withQueryOldApiVersion","server.versions.versioned.VersionedAsyncClient.withQueryOldApiVersionWithResponse":"Server.Versions.Versioned.withQueryOldApiVersion","server.versions.versioned.VersionedAsyncClient.withoutApiVersion":"Server.Versions.Versioned.withoutApiVersion","server.versions.versioned.VersionedAsyncClient.withoutApiVersionWithResponse":"Server.Versions.Versioned.withoutApiVersion","server.versions.versioned.VersionedClient":"Server.Versions.Versioned","server.versions.versioned.VersionedClient.withPathApiVersion":"Server.Versions.Versioned.withPathApiVersion","server.versions.versioned.VersionedClient.withPathApiVersionWithResponse":"Server.Versions.Versioned.withPathApiVersion","server.versions.versioned.VersionedClient.withQueryApiVersion":"Server.Versions.Versioned.withQueryApiVersion","server.versions.versioned.VersionedClient.withQueryApiVersionWithResponse":"Server.Versions.Versioned.withQueryApiVersion","server.versions.versioned.VersionedClient.withQueryOldApiVersion":"Server.Versions.Versioned.withQueryOldApiVersion","server.versions.versioned.VersionedClient.withQueryOldApiVersionWithResponse":"Server.Versions.Versioned.withQueryOldApiVersion","server.versions.versioned.VersionedClient.withoutApiVersion":"Server.Versions.Versioned.withoutApiVersion","server.versions.versioned.VersionedClient.withoutApiVersionWithResponse":"Server.Versions.Versioned.withoutApiVersion","server.versions.versioned.VersionedClientBuilder":"Server.Versions.Versioned"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/versions/versioned/VersionedAsyncClient.java","src/main/java/server/versions/versioned/VersionedClient.java","src/main/java/server/versions/versioned/VersionedClientBuilder.java","src/main/java/server/versions/versioned/VersionedServiceVersion.java","src/main/java/server/versions/versioned/implementation/VersionedClientImpl.java","src/main/java/server/versions/versioned/implementation/package-info.java","src/main/java/server/versions/versioned/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Server.Versions.Versioned":"2022-12-01-preview"},"crossLanguageDefinitions":{"server.versions.versioned.VersionedAsyncClient":"Server.Versions.Versioned","server.versions.versioned.VersionedAsyncClient.withPathApiVersion":"Server.Versions.Versioned.withPathApiVersion","server.versions.versioned.VersionedAsyncClient.withPathApiVersionWithResponse":"Server.Versions.Versioned.withPathApiVersion","server.versions.versioned.VersionedAsyncClient.withQueryApiVersion":"Server.Versions.Versioned.withQueryApiVersion","server.versions.versioned.VersionedAsyncClient.withQueryApiVersionWithResponse":"Server.Versions.Versioned.withQueryApiVersion","server.versions.versioned.VersionedAsyncClient.withQueryOldApiVersion":"Server.Versions.Versioned.withQueryOldApiVersion","server.versions.versioned.VersionedAsyncClient.withQueryOldApiVersionWithResponse":"Server.Versions.Versioned.withQueryOldApiVersion","server.versions.versioned.VersionedAsyncClient.withoutApiVersion":"Server.Versions.Versioned.withoutApiVersion","server.versions.versioned.VersionedAsyncClient.withoutApiVersionWithResponse":"Server.Versions.Versioned.withoutApiVersion","server.versions.versioned.VersionedClient":"Server.Versions.Versioned","server.versions.versioned.VersionedClient.withPathApiVersion":"Server.Versions.Versioned.withPathApiVersion","server.versions.versioned.VersionedClient.withPathApiVersionWithResponse":"Server.Versions.Versioned.withPathApiVersion","server.versions.versioned.VersionedClient.withQueryApiVersion":"Server.Versions.Versioned.withQueryApiVersion","server.versions.versioned.VersionedClient.withQueryApiVersionWithResponse":"Server.Versions.Versioned.withQueryApiVersion","server.versions.versioned.VersionedClient.withQueryOldApiVersion":"Server.Versions.Versioned.withQueryOldApiVersion","server.versions.versioned.VersionedClient.withQueryOldApiVersionWithResponse":"Server.Versions.Versioned.withQueryOldApiVersion","server.versions.versioned.VersionedClient.withoutApiVersion":"Server.Versions.Versioned.withoutApiVersion","server.versions.versioned.VersionedClient.withoutApiVersionWithResponse":"Server.Versions.Versioned.withoutApiVersion","server.versions.versioned.VersionedClientBuilder":"Server.Versions.Versioned"},"generatedFiles":["src/main/java/module-info.java","src/main/java/server/versions/versioned/VersionedAsyncClient.java","src/main/java/server/versions/versioned/VersionedClient.java","src/main/java/server/versions/versioned/VersionedClientBuilder.java","src/main/java/server/versions/versioned/VersionedServiceVersion.java","src/main/java/server/versions/versioned/implementation/VersionedClientImpl.java","src/main/java/server/versions/versioned/implementation/package-info.java","src/main/java/server/versions/versioned/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/service-multiservice-combined_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/service-multiservice-combined_apiview_properties.json deleted file mode 100644 index 1d0bb376bda..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/service-multiservice-combined_apiview_properties.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "service.multiservice.combined.BarAsyncClient": "Service.MultiService.ServiceB.Bar", - "service.multiservice.combined.BarAsyncClient.test": "Service.MultiService.ServiceB.Bar.test", - "service.multiservice.combined.BarAsyncClient.testWithResponse": "Service.MultiService.ServiceB.Bar.test", - "service.multiservice.combined.BarClient": "Service.MultiService.ServiceB.Bar", - "service.multiservice.combined.BarClient.test": "Service.MultiService.ServiceB.Bar.test", - "service.multiservice.combined.BarClient.testWithResponse": "Service.MultiService.ServiceB.Bar.test", - "service.multiservice.combined.CombinedBuilder": "Service.MultiService.Combined", - "service.multiservice.combined.FooAsyncClient": "Service.MultiService.ServiceA.Foo", - "service.multiservice.combined.FooAsyncClient.test": "Service.MultiService.ServiceA.Foo.test", - "service.multiservice.combined.FooAsyncClient.testWithResponse": "Service.MultiService.ServiceA.Foo.test", - "service.multiservice.combined.FooClient": "Service.MultiService.ServiceA.Foo", - "service.multiservice.combined.FooClient.test": "Service.MultiService.ServiceA.Foo.test", - "service.multiservice.combined.FooClient.testWithResponse": "Service.MultiService.ServiceA.Foo.test" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/service-multiservice-combined_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/service-multiservice-combined_metadata.json index 614135013ef..21c86c7dada 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/service-multiservice-combined_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/service-multiservice-combined_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"service.multiservice.combined.BarAsyncClient":"Service.MultiService.ServiceB.Bar","service.multiservice.combined.BarAsyncClient.test":"Service.MultiService.ServiceB.Bar.test","service.multiservice.combined.BarAsyncClient.testWithResponse":"Service.MultiService.ServiceB.Bar.test","service.multiservice.combined.BarClient":"Service.MultiService.ServiceB.Bar","service.multiservice.combined.BarClient.test":"Service.MultiService.ServiceB.Bar.test","service.multiservice.combined.BarClient.testWithResponse":"Service.MultiService.ServiceB.Bar.test","service.multiservice.combined.CombinedBuilder":"Service.MultiService.Combined","service.multiservice.combined.FooAsyncClient":"Service.MultiService.ServiceA.Foo","service.multiservice.combined.FooAsyncClient.test":"Service.MultiService.ServiceA.Foo.test","service.multiservice.combined.FooAsyncClient.testWithResponse":"Service.MultiService.ServiceA.Foo.test","service.multiservice.combined.FooClient":"Service.MultiService.ServiceA.Foo","service.multiservice.combined.FooClient.test":"Service.MultiService.ServiceA.Foo.test","service.multiservice.combined.FooClient.testWithResponse":"Service.MultiService.ServiceA.Foo.test"},"generatedFiles":["src/main/java/module-info.java","src/main/java/service/multiservice/combined/BarAsyncClient.java","src/main/java/service/multiservice/combined/BarClient.java","src/main/java/service/multiservice/combined/CombinedBuilder.java","src/main/java/service/multiservice/combined/FooAsyncClient.java","src/main/java/service/multiservice/combined/FooClient.java","src/main/java/service/multiservice/combined/implementation/BarsImpl.java","src/main/java/service/multiservice/combined/implementation/CombinedImpl.java","src/main/java/service/multiservice/combined/implementation/FoosImpl.java","src/main/java/service/multiservice/combined/implementation/package-info.java","src/main/java/service/multiservice/combined/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Service.MultiService.ServiceA":"av2","Service.MultiService.ServiceB":"bv2"},"crossLanguageDefinitions":{"service.multiservice.combined.BarAsyncClient":"Service.MultiService.ServiceB.Bar","service.multiservice.combined.BarAsyncClient.test":"Service.MultiService.ServiceB.Bar.test","service.multiservice.combined.BarAsyncClient.testWithResponse":"Service.MultiService.ServiceB.Bar.test","service.multiservice.combined.BarClient":"Service.MultiService.ServiceB.Bar","service.multiservice.combined.BarClient.test":"Service.MultiService.ServiceB.Bar.test","service.multiservice.combined.BarClient.testWithResponse":"Service.MultiService.ServiceB.Bar.test","service.multiservice.combined.CombinedBuilder":"Service.MultiService.Combined","service.multiservice.combined.FooAsyncClient":"Service.MultiService.ServiceA.Foo","service.multiservice.combined.FooAsyncClient.test":"Service.MultiService.ServiceA.Foo.test","service.multiservice.combined.FooAsyncClient.testWithResponse":"Service.MultiService.ServiceA.Foo.test","service.multiservice.combined.FooClient":"Service.MultiService.ServiceA.Foo","service.multiservice.combined.FooClient.test":"Service.MultiService.ServiceA.Foo.test","service.multiservice.combined.FooClient.testWithResponse":"Service.MultiService.ServiceA.Foo.test"},"generatedFiles":["src/main/java/module-info.java","src/main/java/service/multiservice/combined/BarAsyncClient.java","src/main/java/service/multiservice/combined/BarClient.java","src/main/java/service/multiservice/combined/CombinedBuilder.java","src/main/java/service/multiservice/combined/FooAsyncClient.java","src/main/java/service/multiservice/combined/FooClient.java","src/main/java/service/multiservice/combined/implementation/BarsImpl.java","src/main/java/service/multiservice/combined/implementation/CombinedImpl.java","src/main/java/service/multiservice/combined/implementation/FoosImpl.java","src/main/java/service/multiservice/combined/implementation/package-info.java","src/main/java/service/multiservice/combined/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialheaders-conditionalrequest_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialheaders-conditionalrequest_apiview_properties.json deleted file mode 100644 index 2755cb3e3aa..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialheaders-conditionalrequest_apiview_properties.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "specialheaders.conditionalrequest.ConditionalRequestAsyncClient": "SpecialHeaders.ConditionalRequest", - "specialheaders.conditionalrequest.ConditionalRequestAsyncClient.headIfModifiedSince": "SpecialHeaders.ConditionalRequest.headIfModifiedSince", - "specialheaders.conditionalrequest.ConditionalRequestAsyncClient.headIfModifiedSinceWithResponse": "SpecialHeaders.ConditionalRequest.headIfModifiedSince", - "specialheaders.conditionalrequest.ConditionalRequestAsyncClient.postIfMatch": "SpecialHeaders.ConditionalRequest.postIfMatch", - "specialheaders.conditionalrequest.ConditionalRequestAsyncClient.postIfMatchWithResponse": "SpecialHeaders.ConditionalRequest.postIfMatch", - "specialheaders.conditionalrequest.ConditionalRequestAsyncClient.postIfNoneMatch": "SpecialHeaders.ConditionalRequest.postIfNoneMatch", - "specialheaders.conditionalrequest.ConditionalRequestAsyncClient.postIfNoneMatchWithResponse": "SpecialHeaders.ConditionalRequest.postIfNoneMatch", - "specialheaders.conditionalrequest.ConditionalRequestAsyncClient.postIfUnmodifiedSince": "SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince", - "specialheaders.conditionalrequest.ConditionalRequestAsyncClient.postIfUnmodifiedSinceWithResponse": "SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince", - "specialheaders.conditionalrequest.ConditionalRequestClient": "SpecialHeaders.ConditionalRequest", - "specialheaders.conditionalrequest.ConditionalRequestClient.headIfModifiedSince": "SpecialHeaders.ConditionalRequest.headIfModifiedSince", - "specialheaders.conditionalrequest.ConditionalRequestClient.headIfModifiedSinceWithResponse": "SpecialHeaders.ConditionalRequest.headIfModifiedSince", - "specialheaders.conditionalrequest.ConditionalRequestClient.postIfMatch": "SpecialHeaders.ConditionalRequest.postIfMatch", - "specialheaders.conditionalrequest.ConditionalRequestClient.postIfMatchWithResponse": "SpecialHeaders.ConditionalRequest.postIfMatch", - "specialheaders.conditionalrequest.ConditionalRequestClient.postIfNoneMatch": "SpecialHeaders.ConditionalRequest.postIfNoneMatch", - "specialheaders.conditionalrequest.ConditionalRequestClient.postIfNoneMatchWithResponse": "SpecialHeaders.ConditionalRequest.postIfNoneMatch", - "specialheaders.conditionalrequest.ConditionalRequestClient.postIfUnmodifiedSince": "SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince", - "specialheaders.conditionalrequest.ConditionalRequestClient.postIfUnmodifiedSinceWithResponse": "SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince", - "specialheaders.conditionalrequest.ConditionalRequestClientBuilder": "SpecialHeaders.ConditionalRequest" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialheaders-conditionalrequest_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialheaders-conditionalrequest_metadata.json index badcb6ee5c3..391ef6f1941 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialheaders-conditionalrequest_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialheaders-conditionalrequest_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"specialheaders.conditionalrequest.ConditionalRequestAsyncClient":"SpecialHeaders.ConditionalRequest","specialheaders.conditionalrequest.ConditionalRequestAsyncClient.headIfModifiedSince":"SpecialHeaders.ConditionalRequest.headIfModifiedSince","specialheaders.conditionalrequest.ConditionalRequestAsyncClient.headIfModifiedSinceWithResponse":"SpecialHeaders.ConditionalRequest.headIfModifiedSince","specialheaders.conditionalrequest.ConditionalRequestAsyncClient.postIfMatch":"SpecialHeaders.ConditionalRequest.postIfMatch","specialheaders.conditionalrequest.ConditionalRequestAsyncClient.postIfMatchWithResponse":"SpecialHeaders.ConditionalRequest.postIfMatch","specialheaders.conditionalrequest.ConditionalRequestAsyncClient.postIfNoneMatch":"SpecialHeaders.ConditionalRequest.postIfNoneMatch","specialheaders.conditionalrequest.ConditionalRequestAsyncClient.postIfNoneMatchWithResponse":"SpecialHeaders.ConditionalRequest.postIfNoneMatch","specialheaders.conditionalrequest.ConditionalRequestAsyncClient.postIfUnmodifiedSince":"SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince","specialheaders.conditionalrequest.ConditionalRequestAsyncClient.postIfUnmodifiedSinceWithResponse":"SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince","specialheaders.conditionalrequest.ConditionalRequestClient":"SpecialHeaders.ConditionalRequest","specialheaders.conditionalrequest.ConditionalRequestClient.headIfModifiedSince":"SpecialHeaders.ConditionalRequest.headIfModifiedSince","specialheaders.conditionalrequest.ConditionalRequestClient.headIfModifiedSinceWithResponse":"SpecialHeaders.ConditionalRequest.headIfModifiedSince","specialheaders.conditionalrequest.ConditionalRequestClient.postIfMatch":"SpecialHeaders.ConditionalRequest.postIfMatch","specialheaders.conditionalrequest.ConditionalRequestClient.postIfMatchWithResponse":"SpecialHeaders.ConditionalRequest.postIfMatch","specialheaders.conditionalrequest.ConditionalRequestClient.postIfNoneMatch":"SpecialHeaders.ConditionalRequest.postIfNoneMatch","specialheaders.conditionalrequest.ConditionalRequestClient.postIfNoneMatchWithResponse":"SpecialHeaders.ConditionalRequest.postIfNoneMatch","specialheaders.conditionalrequest.ConditionalRequestClient.postIfUnmodifiedSince":"SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince","specialheaders.conditionalrequest.ConditionalRequestClient.postIfUnmodifiedSinceWithResponse":"SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince","specialheaders.conditionalrequest.ConditionalRequestClientBuilder":"SpecialHeaders.ConditionalRequest"},"generatedFiles":["src/main/java/module-info.java","src/main/java/specialheaders/conditionalrequest/ConditionalRequestAsyncClient.java","src/main/java/specialheaders/conditionalrequest/ConditionalRequestClient.java","src/main/java/specialheaders/conditionalrequest/ConditionalRequestClientBuilder.java","src/main/java/specialheaders/conditionalrequest/implementation/ConditionalRequestClientImpl.java","src/main/java/specialheaders/conditionalrequest/implementation/package-info.java","src/main/java/specialheaders/conditionalrequest/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"specialheaders.conditionalrequest.ConditionalRequestAsyncClient":"SpecialHeaders.ConditionalRequest","specialheaders.conditionalrequest.ConditionalRequestAsyncClient.headIfModifiedSince":"SpecialHeaders.ConditionalRequest.headIfModifiedSince","specialheaders.conditionalrequest.ConditionalRequestAsyncClient.headIfModifiedSinceWithResponse":"SpecialHeaders.ConditionalRequest.headIfModifiedSince","specialheaders.conditionalrequest.ConditionalRequestAsyncClient.postIfMatch":"SpecialHeaders.ConditionalRequest.postIfMatch","specialheaders.conditionalrequest.ConditionalRequestAsyncClient.postIfMatchWithResponse":"SpecialHeaders.ConditionalRequest.postIfMatch","specialheaders.conditionalrequest.ConditionalRequestAsyncClient.postIfNoneMatch":"SpecialHeaders.ConditionalRequest.postIfNoneMatch","specialheaders.conditionalrequest.ConditionalRequestAsyncClient.postIfNoneMatchWithResponse":"SpecialHeaders.ConditionalRequest.postIfNoneMatch","specialheaders.conditionalrequest.ConditionalRequestAsyncClient.postIfUnmodifiedSince":"SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince","specialheaders.conditionalrequest.ConditionalRequestAsyncClient.postIfUnmodifiedSinceWithResponse":"SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince","specialheaders.conditionalrequest.ConditionalRequestClient":"SpecialHeaders.ConditionalRequest","specialheaders.conditionalrequest.ConditionalRequestClient.headIfModifiedSince":"SpecialHeaders.ConditionalRequest.headIfModifiedSince","specialheaders.conditionalrequest.ConditionalRequestClient.headIfModifiedSinceWithResponse":"SpecialHeaders.ConditionalRequest.headIfModifiedSince","specialheaders.conditionalrequest.ConditionalRequestClient.postIfMatch":"SpecialHeaders.ConditionalRequest.postIfMatch","specialheaders.conditionalrequest.ConditionalRequestClient.postIfMatchWithResponse":"SpecialHeaders.ConditionalRequest.postIfMatch","specialheaders.conditionalrequest.ConditionalRequestClient.postIfNoneMatch":"SpecialHeaders.ConditionalRequest.postIfNoneMatch","specialheaders.conditionalrequest.ConditionalRequestClient.postIfNoneMatchWithResponse":"SpecialHeaders.ConditionalRequest.postIfNoneMatch","specialheaders.conditionalrequest.ConditionalRequestClient.postIfUnmodifiedSince":"SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince","specialheaders.conditionalrequest.ConditionalRequestClient.postIfUnmodifiedSinceWithResponse":"SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince","specialheaders.conditionalrequest.ConditionalRequestClientBuilder":"SpecialHeaders.ConditionalRequest"},"generatedFiles":["src/main/java/module-info.java","src/main/java/specialheaders/conditionalrequest/ConditionalRequestAsyncClient.java","src/main/java/specialheaders/conditionalrequest/ConditionalRequestClient.java","src/main/java/specialheaders/conditionalrequest/ConditionalRequestClientBuilder.java","src/main/java/specialheaders/conditionalrequest/implementation/ConditionalRequestClientImpl.java","src/main/java/specialheaders/conditionalrequest/implementation/package-info.java","src/main/java/specialheaders/conditionalrequest/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialheaders-repeatability_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialheaders-repeatability_apiview_properties.json deleted file mode 100644 index 78b61690bc4..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialheaders-repeatability_apiview_properties.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "specialheaders.repeatability.RepeatabilityAsyncClient": "SpecialHeaders.Repeatability", - "specialheaders.repeatability.RepeatabilityAsyncClient.immediateSuccess": "SpecialHeaders.Repeatability.immediateSuccess", - "specialheaders.repeatability.RepeatabilityAsyncClient.immediateSuccessWithResponse": "SpecialHeaders.Repeatability.immediateSuccess", - "specialheaders.repeatability.RepeatabilityClient": "SpecialHeaders.Repeatability", - "specialheaders.repeatability.RepeatabilityClient.immediateSuccess": "SpecialHeaders.Repeatability.immediateSuccess", - "specialheaders.repeatability.RepeatabilityClient.immediateSuccessWithResponse": "SpecialHeaders.Repeatability.immediateSuccess", - "specialheaders.repeatability.RepeatabilityClientBuilder": "SpecialHeaders.Repeatability" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialheaders-repeatability_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialheaders-repeatability_metadata.json index 82460b3991f..fa54ff0ef0b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialheaders-repeatability_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialheaders-repeatability_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"specialheaders.repeatability.RepeatabilityAsyncClient":"SpecialHeaders.Repeatability","specialheaders.repeatability.RepeatabilityAsyncClient.immediateSuccess":"SpecialHeaders.Repeatability.immediateSuccess","specialheaders.repeatability.RepeatabilityAsyncClient.immediateSuccessWithResponse":"SpecialHeaders.Repeatability.immediateSuccess","specialheaders.repeatability.RepeatabilityClient":"SpecialHeaders.Repeatability","specialheaders.repeatability.RepeatabilityClient.immediateSuccess":"SpecialHeaders.Repeatability.immediateSuccess","specialheaders.repeatability.RepeatabilityClient.immediateSuccessWithResponse":"SpecialHeaders.Repeatability.immediateSuccess","specialheaders.repeatability.RepeatabilityClientBuilder":"SpecialHeaders.Repeatability"},"generatedFiles":["src/main/java/module-info.java","src/main/java/specialheaders/repeatability/RepeatabilityAsyncClient.java","src/main/java/specialheaders/repeatability/RepeatabilityClient.java","src/main/java/specialheaders/repeatability/RepeatabilityClientBuilder.java","src/main/java/specialheaders/repeatability/implementation/RepeatabilityClientImpl.java","src/main/java/specialheaders/repeatability/implementation/package-info.java","src/main/java/specialheaders/repeatability/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"specialheaders.repeatability.RepeatabilityAsyncClient":"SpecialHeaders.Repeatability","specialheaders.repeatability.RepeatabilityAsyncClient.immediateSuccess":"SpecialHeaders.Repeatability.immediateSuccess","specialheaders.repeatability.RepeatabilityAsyncClient.immediateSuccessWithResponse":"SpecialHeaders.Repeatability.immediateSuccess","specialheaders.repeatability.RepeatabilityClient":"SpecialHeaders.Repeatability","specialheaders.repeatability.RepeatabilityClient.immediateSuccess":"SpecialHeaders.Repeatability.immediateSuccess","specialheaders.repeatability.RepeatabilityClient.immediateSuccessWithResponse":"SpecialHeaders.Repeatability.immediateSuccess","specialheaders.repeatability.RepeatabilityClientBuilder":"SpecialHeaders.Repeatability"},"generatedFiles":["src/main/java/module-info.java","src/main/java/specialheaders/repeatability/RepeatabilityAsyncClient.java","src/main/java/specialheaders/repeatability/RepeatabilityClient.java","src/main/java/specialheaders/repeatability/RepeatabilityClientBuilder.java","src/main/java/specialheaders/repeatability/implementation/RepeatabilityClientImpl.java","src/main/java/specialheaders/repeatability/implementation/package-info.java","src/main/java/specialheaders/repeatability/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialwords_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialwords_apiview_properties.json deleted file mode 100644 index c2d0e0c9eb4..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialwords_apiview_properties.json +++ /dev/null @@ -1,458 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "specialwords.ModelPropertiesAsyncClient": "SpecialWords.ModelProperties", - "specialwords.ModelPropertiesAsyncClient.dictMethods": "SpecialWords.ModelProperties.dictMethods", - "specialwords.ModelPropertiesAsyncClient.dictMethodsWithResponse": "SpecialWords.ModelProperties.dictMethods", - "specialwords.ModelPropertiesAsyncClient.sameAsModel": "SpecialWords.ModelProperties.sameAsModel", - "specialwords.ModelPropertiesAsyncClient.sameAsModelWithResponse": "SpecialWords.ModelProperties.sameAsModel", - "specialwords.ModelPropertiesAsyncClient.withList": "SpecialWords.ModelProperties.withList", - "specialwords.ModelPropertiesAsyncClient.withListWithResponse": "SpecialWords.ModelProperties.withList", - "specialwords.ModelPropertiesClient": "SpecialWords.ModelProperties", - "specialwords.ModelPropertiesClient.dictMethods": "SpecialWords.ModelProperties.dictMethods", - "specialwords.ModelPropertiesClient.dictMethodsWithResponse": "SpecialWords.ModelProperties.dictMethods", - "specialwords.ModelPropertiesClient.sameAsModel": "SpecialWords.ModelProperties.sameAsModel", - "specialwords.ModelPropertiesClient.sameAsModelWithResponse": "SpecialWords.ModelProperties.sameAsModel", - "specialwords.ModelPropertiesClient.withList": "SpecialWords.ModelProperties.withList", - "specialwords.ModelPropertiesClient.withListWithResponse": "SpecialWords.ModelProperties.withList", - "specialwords.ModelsAsyncClient": "SpecialWords.Models", - "specialwords.ModelsAsyncClient.withAnd": "SpecialWords.Models.withAnd", - "specialwords.ModelsAsyncClient.withAndWithResponse": "SpecialWords.Models.withAnd", - "specialwords.ModelsAsyncClient.withAs": "SpecialWords.Models.withAs", - "specialwords.ModelsAsyncClient.withAsWithResponse": "SpecialWords.Models.withAs", - "specialwords.ModelsAsyncClient.withAssert": "SpecialWords.Models.withAssert", - "specialwords.ModelsAsyncClient.withAssertWithResponse": "SpecialWords.Models.withAssert", - "specialwords.ModelsAsyncClient.withAsyncWithResponse": "SpecialWords.Models.withAsync", - "specialwords.ModelsAsyncClient.withAwait": "SpecialWords.Models.withAwait", - "specialwords.ModelsAsyncClient.withAwaitWithResponse": "SpecialWords.Models.withAwait", - "specialwords.ModelsAsyncClient.withBreak": "SpecialWords.Models.withBreak", - "specialwords.ModelsAsyncClient.withBreakWithResponse": "SpecialWords.Models.withBreak", - "specialwords.ModelsAsyncClient.withClass": "SpecialWords.Models.withClass", - "specialwords.ModelsAsyncClient.withClassWithResponse": "SpecialWords.Models.withClass", - "specialwords.ModelsAsyncClient.withConstructor": "SpecialWords.Models.withConstructor", - "specialwords.ModelsAsyncClient.withConstructorWithResponse": "SpecialWords.Models.withConstructor", - "specialwords.ModelsAsyncClient.withContinue": "SpecialWords.Models.withContinue", - "specialwords.ModelsAsyncClient.withContinueWithResponse": "SpecialWords.Models.withContinue", - "specialwords.ModelsAsyncClient.withDef": "SpecialWords.Models.withDef", - "specialwords.ModelsAsyncClient.withDefWithResponse": "SpecialWords.Models.withDef", - "specialwords.ModelsAsyncClient.withDel": "SpecialWords.Models.withDel", - "specialwords.ModelsAsyncClient.withDelWithResponse": "SpecialWords.Models.withDel", - "specialwords.ModelsAsyncClient.withElif": "SpecialWords.Models.withElif", - "specialwords.ModelsAsyncClient.withElifWithResponse": "SpecialWords.Models.withElif", - "specialwords.ModelsAsyncClient.withElse": "SpecialWords.Models.withElse", - "specialwords.ModelsAsyncClient.withElseWithResponse": "SpecialWords.Models.withElse", - "specialwords.ModelsAsyncClient.withExcept": "SpecialWords.Models.withExcept", - "specialwords.ModelsAsyncClient.withExceptWithResponse": "SpecialWords.Models.withExcept", - "specialwords.ModelsAsyncClient.withExec": "SpecialWords.Models.withExec", - "specialwords.ModelsAsyncClient.withExecWithResponse": "SpecialWords.Models.withExec", - "specialwords.ModelsAsyncClient.withFinally": "SpecialWords.Models.withFinally", - "specialwords.ModelsAsyncClient.withFinallyWithResponse": "SpecialWords.Models.withFinally", - "specialwords.ModelsAsyncClient.withFor": "SpecialWords.Models.withFor", - "specialwords.ModelsAsyncClient.withForWithResponse": "SpecialWords.Models.withFor", - "specialwords.ModelsAsyncClient.withFrom": "SpecialWords.Models.withFrom", - "specialwords.ModelsAsyncClient.withFromWithResponse": "SpecialWords.Models.withFrom", - "specialwords.ModelsAsyncClient.withGlobal": "SpecialWords.Models.withGlobal", - "specialwords.ModelsAsyncClient.withGlobalWithResponse": "SpecialWords.Models.withGlobal", - "specialwords.ModelsAsyncClient.withIf": "SpecialWords.Models.withIf", - "specialwords.ModelsAsyncClient.withIfWithResponse": "SpecialWords.Models.withIf", - "specialwords.ModelsAsyncClient.withImport": "SpecialWords.Models.withImport", - "specialwords.ModelsAsyncClient.withImportWithResponse": "SpecialWords.Models.withImport", - "specialwords.ModelsAsyncClient.withIn": "SpecialWords.Models.withIn", - "specialwords.ModelsAsyncClient.withInWithResponse": "SpecialWords.Models.withIn", - "specialwords.ModelsAsyncClient.withIs": "SpecialWords.Models.withIs", - "specialwords.ModelsAsyncClient.withIsWithResponse": "SpecialWords.Models.withIs", - "specialwords.ModelsAsyncClient.withLambda": "SpecialWords.Models.withLambda", - "specialwords.ModelsAsyncClient.withLambdaWithResponse": "SpecialWords.Models.withLambda", - "specialwords.ModelsAsyncClient.withNot": "SpecialWords.Models.withNot", - "specialwords.ModelsAsyncClient.withNotWithResponse": "SpecialWords.Models.withNot", - "specialwords.ModelsAsyncClient.withOr": "SpecialWords.Models.withOr", - "specialwords.ModelsAsyncClient.withOrWithResponse": "SpecialWords.Models.withOr", - "specialwords.ModelsAsyncClient.withPass": "SpecialWords.Models.withPass", - "specialwords.ModelsAsyncClient.withPassWithResponse": "SpecialWords.Models.withPass", - "specialwords.ModelsAsyncClient.withRaise": "SpecialWords.Models.withRaise", - "specialwords.ModelsAsyncClient.withRaiseWithResponse": "SpecialWords.Models.withRaise", - "specialwords.ModelsAsyncClient.withReturn": "SpecialWords.Models.withReturn", - "specialwords.ModelsAsyncClient.withReturnWithResponse": "SpecialWords.Models.withReturn", - "specialwords.ModelsAsyncClient.withTry": "SpecialWords.Models.withTry", - "specialwords.ModelsAsyncClient.withTryWithResponse": "SpecialWords.Models.withTry", - "specialwords.ModelsAsyncClient.withWhile": "SpecialWords.Models.withWhile", - "specialwords.ModelsAsyncClient.withWhileWithResponse": "SpecialWords.Models.withWhile", - "specialwords.ModelsAsyncClient.withWith": "SpecialWords.Models.withWith", - "specialwords.ModelsAsyncClient.withWithWithResponse": "SpecialWords.Models.withWith", - "specialwords.ModelsAsyncClient.withYield": "SpecialWords.Models.withYield", - "specialwords.ModelsAsyncClient.withYieldWithResponse": "SpecialWords.Models.withYield", - "specialwords.ModelsClient": "SpecialWords.Models", - "specialwords.ModelsClient.withAnd": "SpecialWords.Models.withAnd", - "specialwords.ModelsClient.withAndWithResponse": "SpecialWords.Models.withAnd", - "specialwords.ModelsClient.withAs": "SpecialWords.Models.withAs", - "specialwords.ModelsClient.withAsWithResponse": "SpecialWords.Models.withAs", - "specialwords.ModelsClient.withAssert": "SpecialWords.Models.withAssert", - "specialwords.ModelsClient.withAssertWithResponse": "SpecialWords.Models.withAssert", - "specialwords.ModelsClient.withAsyncWithResponse": "SpecialWords.Models.withAsync", - "specialwords.ModelsClient.withAwait": "SpecialWords.Models.withAwait", - "specialwords.ModelsClient.withAwaitWithResponse": "SpecialWords.Models.withAwait", - "specialwords.ModelsClient.withBreak": "SpecialWords.Models.withBreak", - "specialwords.ModelsClient.withBreakWithResponse": "SpecialWords.Models.withBreak", - "specialwords.ModelsClient.withClass": "SpecialWords.Models.withClass", - "specialwords.ModelsClient.withClassWithResponse": "SpecialWords.Models.withClass", - "specialwords.ModelsClient.withConstructor": "SpecialWords.Models.withConstructor", - "specialwords.ModelsClient.withConstructorWithResponse": "SpecialWords.Models.withConstructor", - "specialwords.ModelsClient.withContinue": "SpecialWords.Models.withContinue", - "specialwords.ModelsClient.withContinueWithResponse": "SpecialWords.Models.withContinue", - "specialwords.ModelsClient.withDef": "SpecialWords.Models.withDef", - "specialwords.ModelsClient.withDefWithResponse": "SpecialWords.Models.withDef", - "specialwords.ModelsClient.withDel": "SpecialWords.Models.withDel", - "specialwords.ModelsClient.withDelWithResponse": "SpecialWords.Models.withDel", - "specialwords.ModelsClient.withElif": "SpecialWords.Models.withElif", - "specialwords.ModelsClient.withElifWithResponse": "SpecialWords.Models.withElif", - "specialwords.ModelsClient.withElse": "SpecialWords.Models.withElse", - "specialwords.ModelsClient.withElseWithResponse": "SpecialWords.Models.withElse", - "specialwords.ModelsClient.withExcept": "SpecialWords.Models.withExcept", - "specialwords.ModelsClient.withExceptWithResponse": "SpecialWords.Models.withExcept", - "specialwords.ModelsClient.withExec": "SpecialWords.Models.withExec", - "specialwords.ModelsClient.withExecWithResponse": "SpecialWords.Models.withExec", - "specialwords.ModelsClient.withFinally": "SpecialWords.Models.withFinally", - "specialwords.ModelsClient.withFinallyWithResponse": "SpecialWords.Models.withFinally", - "specialwords.ModelsClient.withFor": "SpecialWords.Models.withFor", - "specialwords.ModelsClient.withForWithResponse": "SpecialWords.Models.withFor", - "specialwords.ModelsClient.withFrom": "SpecialWords.Models.withFrom", - "specialwords.ModelsClient.withFromWithResponse": "SpecialWords.Models.withFrom", - "specialwords.ModelsClient.withGlobal": "SpecialWords.Models.withGlobal", - "specialwords.ModelsClient.withGlobalWithResponse": "SpecialWords.Models.withGlobal", - "specialwords.ModelsClient.withIf": "SpecialWords.Models.withIf", - "specialwords.ModelsClient.withIfWithResponse": "SpecialWords.Models.withIf", - "specialwords.ModelsClient.withImport": "SpecialWords.Models.withImport", - "specialwords.ModelsClient.withImportWithResponse": "SpecialWords.Models.withImport", - "specialwords.ModelsClient.withIn": "SpecialWords.Models.withIn", - "specialwords.ModelsClient.withInWithResponse": "SpecialWords.Models.withIn", - "specialwords.ModelsClient.withIs": "SpecialWords.Models.withIs", - "specialwords.ModelsClient.withIsWithResponse": "SpecialWords.Models.withIs", - "specialwords.ModelsClient.withLambda": "SpecialWords.Models.withLambda", - "specialwords.ModelsClient.withLambdaWithResponse": "SpecialWords.Models.withLambda", - "specialwords.ModelsClient.withNot": "SpecialWords.Models.withNot", - "specialwords.ModelsClient.withNotWithResponse": "SpecialWords.Models.withNot", - "specialwords.ModelsClient.withOr": "SpecialWords.Models.withOr", - "specialwords.ModelsClient.withOrWithResponse": "SpecialWords.Models.withOr", - "specialwords.ModelsClient.withPass": "SpecialWords.Models.withPass", - "specialwords.ModelsClient.withPassWithResponse": "SpecialWords.Models.withPass", - "specialwords.ModelsClient.withRaise": "SpecialWords.Models.withRaise", - "specialwords.ModelsClient.withRaiseWithResponse": "SpecialWords.Models.withRaise", - "specialwords.ModelsClient.withReturn": "SpecialWords.Models.withReturn", - "specialwords.ModelsClient.withReturnWithResponse": "SpecialWords.Models.withReturn", - "specialwords.ModelsClient.withTry": "SpecialWords.Models.withTry", - "specialwords.ModelsClient.withTryWithResponse": "SpecialWords.Models.withTry", - "specialwords.ModelsClient.withWhile": "SpecialWords.Models.withWhile", - "specialwords.ModelsClient.withWhileWithResponse": "SpecialWords.Models.withWhile", - "specialwords.ModelsClient.withWith": "SpecialWords.Models.withWith", - "specialwords.ModelsClient.withWithWithResponse": "SpecialWords.Models.withWith", - "specialwords.ModelsClient.withYield": "SpecialWords.Models.withYield", - "specialwords.ModelsClient.withYieldWithResponse": "SpecialWords.Models.withYield", - "specialwords.OperationsAsyncClient": "SpecialWords.Operations", - "specialwords.OperationsAsyncClient.and": "SpecialWords.Operations.and", - "specialwords.OperationsAsyncClient.andWithResponse": "SpecialWords.Operations.and", - "specialwords.OperationsAsyncClient.as": "SpecialWords.Operations.as", - "specialwords.OperationsAsyncClient.asWithResponse": "SpecialWords.Operations.as", - "specialwords.OperationsAsyncClient.assertMethod": "SpecialWords.Operations.assert", - "specialwords.OperationsAsyncClient.assertMethodWithResponse": "SpecialWords.Operations.assert", - "specialwords.OperationsAsyncClient.async": "SpecialWords.Operations.async", - "specialwords.OperationsAsyncClient.asyncWithResponse": "SpecialWords.Operations.async", - "specialwords.OperationsAsyncClient.await": "SpecialWords.Operations.await", - "specialwords.OperationsAsyncClient.awaitWithResponse": "SpecialWords.Operations.await", - "specialwords.OperationsAsyncClient.breakMethod": "SpecialWords.Operations.break", - "specialwords.OperationsAsyncClient.breakMethodWithResponse": "SpecialWords.Operations.break", - "specialwords.OperationsAsyncClient.classMethod": "SpecialWords.Operations.class", - "specialwords.OperationsAsyncClient.classMethodWithResponse": "SpecialWords.Operations.class", - "specialwords.OperationsAsyncClient.constructor": "SpecialWords.Operations.constructor", - "specialwords.OperationsAsyncClient.constructorWithResponse": "SpecialWords.Operations.constructor", - "specialwords.OperationsAsyncClient.continueMethod": "SpecialWords.Operations.continue", - "specialwords.OperationsAsyncClient.continueMethodWithResponse": "SpecialWords.Operations.continue", - "specialwords.OperationsAsyncClient.def": "SpecialWords.Operations.def", - "specialwords.OperationsAsyncClient.defWithResponse": "SpecialWords.Operations.def", - "specialwords.OperationsAsyncClient.del": "SpecialWords.Operations.del", - "specialwords.OperationsAsyncClient.delWithResponse": "SpecialWords.Operations.del", - "specialwords.OperationsAsyncClient.elif": "SpecialWords.Operations.elif", - "specialwords.OperationsAsyncClient.elifWithResponse": "SpecialWords.Operations.elif", - "specialwords.OperationsAsyncClient.elseMethod": "SpecialWords.Operations.else", - "specialwords.OperationsAsyncClient.elseMethodWithResponse": "SpecialWords.Operations.else", - "specialwords.OperationsAsyncClient.except": "SpecialWords.Operations.except", - "specialwords.OperationsAsyncClient.exceptWithResponse": "SpecialWords.Operations.except", - "specialwords.OperationsAsyncClient.exec": "SpecialWords.Operations.exec", - "specialwords.OperationsAsyncClient.execWithResponse": "SpecialWords.Operations.exec", - "specialwords.OperationsAsyncClient.finallyMethod": "SpecialWords.Operations.finally", - "specialwords.OperationsAsyncClient.finallyMethodWithResponse": "SpecialWords.Operations.finally", - "specialwords.OperationsAsyncClient.forMethod": "SpecialWords.Operations.for", - "specialwords.OperationsAsyncClient.forMethodWithResponse": "SpecialWords.Operations.for", - "specialwords.OperationsAsyncClient.from": "SpecialWords.Operations.from", - "specialwords.OperationsAsyncClient.fromWithResponse": "SpecialWords.Operations.from", - "specialwords.OperationsAsyncClient.global": "SpecialWords.Operations.global", - "specialwords.OperationsAsyncClient.globalWithResponse": "SpecialWords.Operations.global", - "specialwords.OperationsAsyncClient.ifMethod": "SpecialWords.Operations.if", - "specialwords.OperationsAsyncClient.ifMethodWithResponse": "SpecialWords.Operations.if", - "specialwords.OperationsAsyncClient.importMethod": "SpecialWords.Operations.import", - "specialwords.OperationsAsyncClient.importMethodWithResponse": "SpecialWords.Operations.import", - "specialwords.OperationsAsyncClient.in": "SpecialWords.Operations.in", - "specialwords.OperationsAsyncClient.inWithResponse": "SpecialWords.Operations.in", - "specialwords.OperationsAsyncClient.is": "SpecialWords.Operations.is", - "specialwords.OperationsAsyncClient.isWithResponse": "SpecialWords.Operations.is", - "specialwords.OperationsAsyncClient.lambda": "SpecialWords.Operations.lambda", - "specialwords.OperationsAsyncClient.lambdaWithResponse": "SpecialWords.Operations.lambda", - "specialwords.OperationsAsyncClient.not": "SpecialWords.Operations.not", - "specialwords.OperationsAsyncClient.notWithResponse": "SpecialWords.Operations.not", - "specialwords.OperationsAsyncClient.or": "SpecialWords.Operations.or", - "specialwords.OperationsAsyncClient.orWithResponse": "SpecialWords.Operations.or", - "specialwords.OperationsAsyncClient.pass": "SpecialWords.Operations.pass", - "specialwords.OperationsAsyncClient.passWithResponse": "SpecialWords.Operations.pass", - "specialwords.OperationsAsyncClient.raise": "SpecialWords.Operations.raise", - "specialwords.OperationsAsyncClient.raiseWithResponse": "SpecialWords.Operations.raise", - "specialwords.OperationsAsyncClient.returnMethod": "SpecialWords.Operations.return", - "specialwords.OperationsAsyncClient.returnMethodWithResponse": "SpecialWords.Operations.return", - "specialwords.OperationsAsyncClient.tryMethod": "SpecialWords.Operations.try", - "specialwords.OperationsAsyncClient.tryMethodWithResponse": "SpecialWords.Operations.try", - "specialwords.OperationsAsyncClient.whileMethod": "SpecialWords.Operations.while", - "specialwords.OperationsAsyncClient.whileMethodWithResponse": "SpecialWords.Operations.while", - "specialwords.OperationsAsyncClient.with": "SpecialWords.Operations.with", - "specialwords.OperationsAsyncClient.withWithResponse": "SpecialWords.Operations.with", - "specialwords.OperationsAsyncClient.yield": "SpecialWords.Operations.yield", - "specialwords.OperationsAsyncClient.yieldWithResponse": "SpecialWords.Operations.yield", - "specialwords.OperationsClient": "SpecialWords.Operations", - "specialwords.OperationsClient.and": "SpecialWords.Operations.and", - "specialwords.OperationsClient.andWithResponse": "SpecialWords.Operations.and", - "specialwords.OperationsClient.as": "SpecialWords.Operations.as", - "specialwords.OperationsClient.asWithResponse": "SpecialWords.Operations.as", - "specialwords.OperationsClient.assertMethod": "SpecialWords.Operations.assert", - "specialwords.OperationsClient.assertMethodWithResponse": "SpecialWords.Operations.assert", - "specialwords.OperationsClient.async": "SpecialWords.Operations.async", - "specialwords.OperationsClient.asyncWithResponse": "SpecialWords.Operations.async", - "specialwords.OperationsClient.await": "SpecialWords.Operations.await", - "specialwords.OperationsClient.awaitWithResponse": "SpecialWords.Operations.await", - "specialwords.OperationsClient.breakMethod": "SpecialWords.Operations.break", - "specialwords.OperationsClient.breakMethodWithResponse": "SpecialWords.Operations.break", - "specialwords.OperationsClient.classMethod": "SpecialWords.Operations.class", - "specialwords.OperationsClient.classMethodWithResponse": "SpecialWords.Operations.class", - "specialwords.OperationsClient.constructor": "SpecialWords.Operations.constructor", - "specialwords.OperationsClient.constructorWithResponse": "SpecialWords.Operations.constructor", - "specialwords.OperationsClient.continueMethod": "SpecialWords.Operations.continue", - "specialwords.OperationsClient.continueMethodWithResponse": "SpecialWords.Operations.continue", - "specialwords.OperationsClient.def": "SpecialWords.Operations.def", - "specialwords.OperationsClient.defWithResponse": "SpecialWords.Operations.def", - "specialwords.OperationsClient.del": "SpecialWords.Operations.del", - "specialwords.OperationsClient.delWithResponse": "SpecialWords.Operations.del", - "specialwords.OperationsClient.elif": "SpecialWords.Operations.elif", - "specialwords.OperationsClient.elifWithResponse": "SpecialWords.Operations.elif", - "specialwords.OperationsClient.elseMethod": "SpecialWords.Operations.else", - "specialwords.OperationsClient.elseMethodWithResponse": "SpecialWords.Operations.else", - "specialwords.OperationsClient.except": "SpecialWords.Operations.except", - "specialwords.OperationsClient.exceptWithResponse": "SpecialWords.Operations.except", - "specialwords.OperationsClient.exec": "SpecialWords.Operations.exec", - "specialwords.OperationsClient.execWithResponse": "SpecialWords.Operations.exec", - "specialwords.OperationsClient.finallyMethod": "SpecialWords.Operations.finally", - "specialwords.OperationsClient.finallyMethodWithResponse": "SpecialWords.Operations.finally", - "specialwords.OperationsClient.forMethod": "SpecialWords.Operations.for", - "specialwords.OperationsClient.forMethodWithResponse": "SpecialWords.Operations.for", - "specialwords.OperationsClient.from": "SpecialWords.Operations.from", - "specialwords.OperationsClient.fromWithResponse": "SpecialWords.Operations.from", - "specialwords.OperationsClient.global": "SpecialWords.Operations.global", - "specialwords.OperationsClient.globalWithResponse": "SpecialWords.Operations.global", - "specialwords.OperationsClient.ifMethod": "SpecialWords.Operations.if", - "specialwords.OperationsClient.ifMethodWithResponse": "SpecialWords.Operations.if", - "specialwords.OperationsClient.importMethod": "SpecialWords.Operations.import", - "specialwords.OperationsClient.importMethodWithResponse": "SpecialWords.Operations.import", - "specialwords.OperationsClient.in": "SpecialWords.Operations.in", - "specialwords.OperationsClient.inWithResponse": "SpecialWords.Operations.in", - "specialwords.OperationsClient.is": "SpecialWords.Operations.is", - "specialwords.OperationsClient.isWithResponse": "SpecialWords.Operations.is", - "specialwords.OperationsClient.lambda": "SpecialWords.Operations.lambda", - "specialwords.OperationsClient.lambdaWithResponse": "SpecialWords.Operations.lambda", - "specialwords.OperationsClient.not": "SpecialWords.Operations.not", - "specialwords.OperationsClient.notWithResponse": "SpecialWords.Operations.not", - "specialwords.OperationsClient.or": "SpecialWords.Operations.or", - "specialwords.OperationsClient.orWithResponse": "SpecialWords.Operations.or", - "specialwords.OperationsClient.pass": "SpecialWords.Operations.pass", - "specialwords.OperationsClient.passWithResponse": "SpecialWords.Operations.pass", - "specialwords.OperationsClient.raise": "SpecialWords.Operations.raise", - "specialwords.OperationsClient.raiseWithResponse": "SpecialWords.Operations.raise", - "specialwords.OperationsClient.returnMethod": "SpecialWords.Operations.return", - "specialwords.OperationsClient.returnMethodWithResponse": "SpecialWords.Operations.return", - "specialwords.OperationsClient.tryMethod": "SpecialWords.Operations.try", - "specialwords.OperationsClient.tryMethodWithResponse": "SpecialWords.Operations.try", - "specialwords.OperationsClient.whileMethod": "SpecialWords.Operations.while", - "specialwords.OperationsClient.whileMethodWithResponse": "SpecialWords.Operations.while", - "specialwords.OperationsClient.with": "SpecialWords.Operations.with", - "specialwords.OperationsClient.withWithResponse": "SpecialWords.Operations.with", - "specialwords.OperationsClient.yield": "SpecialWords.Operations.yield", - "specialwords.OperationsClient.yieldWithResponse": "SpecialWords.Operations.yield", - "specialwords.ParametersAsyncClient": "SpecialWords.Parameters", - "specialwords.ParametersAsyncClient.withAnd": "SpecialWords.Parameters.withAnd", - "specialwords.ParametersAsyncClient.withAndWithResponse": "SpecialWords.Parameters.withAnd", - "specialwords.ParametersAsyncClient.withAs": "SpecialWords.Parameters.withAs", - "specialwords.ParametersAsyncClient.withAsWithResponse": "SpecialWords.Parameters.withAs", - "specialwords.ParametersAsyncClient.withAssert": "SpecialWords.Parameters.withAssert", - "specialwords.ParametersAsyncClient.withAssertWithResponse": "SpecialWords.Parameters.withAssert", - "specialwords.ParametersAsyncClient.withAsyncWithResponse": "SpecialWords.Parameters.withAsync", - "specialwords.ParametersAsyncClient.withAwait": "SpecialWords.Parameters.withAwait", - "specialwords.ParametersAsyncClient.withAwaitWithResponse": "SpecialWords.Parameters.withAwait", - "specialwords.ParametersAsyncClient.withBreak": "SpecialWords.Parameters.withBreak", - "specialwords.ParametersAsyncClient.withBreakWithResponse": "SpecialWords.Parameters.withBreak", - "specialwords.ParametersAsyncClient.withCancellationToken": "SpecialWords.Parameters.withCancellationToken", - "specialwords.ParametersAsyncClient.withCancellationTokenWithResponse": "SpecialWords.Parameters.withCancellationToken", - "specialwords.ParametersAsyncClient.withClass": "SpecialWords.Parameters.withClass", - "specialwords.ParametersAsyncClient.withClassWithResponse": "SpecialWords.Parameters.withClass", - "specialwords.ParametersAsyncClient.withConstructor": "SpecialWords.Parameters.withConstructor", - "specialwords.ParametersAsyncClient.withConstructorWithResponse": "SpecialWords.Parameters.withConstructor", - "specialwords.ParametersAsyncClient.withContinue": "SpecialWords.Parameters.withContinue", - "specialwords.ParametersAsyncClient.withContinueWithResponse": "SpecialWords.Parameters.withContinue", - "specialwords.ParametersAsyncClient.withDef": "SpecialWords.Parameters.withDef", - "specialwords.ParametersAsyncClient.withDefWithResponse": "SpecialWords.Parameters.withDef", - "specialwords.ParametersAsyncClient.withDel": "SpecialWords.Parameters.withDel", - "specialwords.ParametersAsyncClient.withDelWithResponse": "SpecialWords.Parameters.withDel", - "specialwords.ParametersAsyncClient.withElif": "SpecialWords.Parameters.withElif", - "specialwords.ParametersAsyncClient.withElifWithResponse": "SpecialWords.Parameters.withElif", - "specialwords.ParametersAsyncClient.withElse": "SpecialWords.Parameters.withElse", - "specialwords.ParametersAsyncClient.withElseWithResponse": "SpecialWords.Parameters.withElse", - "specialwords.ParametersAsyncClient.withExcept": "SpecialWords.Parameters.withExcept", - "specialwords.ParametersAsyncClient.withExceptWithResponse": "SpecialWords.Parameters.withExcept", - "specialwords.ParametersAsyncClient.withExec": "SpecialWords.Parameters.withExec", - "specialwords.ParametersAsyncClient.withExecWithResponse": "SpecialWords.Parameters.withExec", - "specialwords.ParametersAsyncClient.withFinally": "SpecialWords.Parameters.withFinally", - "specialwords.ParametersAsyncClient.withFinallyWithResponse": "SpecialWords.Parameters.withFinally", - "specialwords.ParametersAsyncClient.withFor": "SpecialWords.Parameters.withFor", - "specialwords.ParametersAsyncClient.withForWithResponse": "SpecialWords.Parameters.withFor", - "specialwords.ParametersAsyncClient.withFrom": "SpecialWords.Parameters.withFrom", - "specialwords.ParametersAsyncClient.withFromWithResponse": "SpecialWords.Parameters.withFrom", - "specialwords.ParametersAsyncClient.withGlobal": "SpecialWords.Parameters.withGlobal", - "specialwords.ParametersAsyncClient.withGlobalWithResponse": "SpecialWords.Parameters.withGlobal", - "specialwords.ParametersAsyncClient.withIf": "SpecialWords.Parameters.withIf", - "specialwords.ParametersAsyncClient.withIfWithResponse": "SpecialWords.Parameters.withIf", - "specialwords.ParametersAsyncClient.withImport": "SpecialWords.Parameters.withImport", - "specialwords.ParametersAsyncClient.withImportWithResponse": "SpecialWords.Parameters.withImport", - "specialwords.ParametersAsyncClient.withIn": "SpecialWords.Parameters.withIn", - "specialwords.ParametersAsyncClient.withInWithResponse": "SpecialWords.Parameters.withIn", - "specialwords.ParametersAsyncClient.withIs": "SpecialWords.Parameters.withIs", - "specialwords.ParametersAsyncClient.withIsWithResponse": "SpecialWords.Parameters.withIs", - "specialwords.ParametersAsyncClient.withLambda": "SpecialWords.Parameters.withLambda", - "specialwords.ParametersAsyncClient.withLambdaWithResponse": "SpecialWords.Parameters.withLambda", - "specialwords.ParametersAsyncClient.withNot": "SpecialWords.Parameters.withNot", - "specialwords.ParametersAsyncClient.withNotWithResponse": "SpecialWords.Parameters.withNot", - "specialwords.ParametersAsyncClient.withOr": "SpecialWords.Parameters.withOr", - "specialwords.ParametersAsyncClient.withOrWithResponse": "SpecialWords.Parameters.withOr", - "specialwords.ParametersAsyncClient.withPass": "SpecialWords.Parameters.withPass", - "specialwords.ParametersAsyncClient.withPassWithResponse": "SpecialWords.Parameters.withPass", - "specialwords.ParametersAsyncClient.withRaise": "SpecialWords.Parameters.withRaise", - "specialwords.ParametersAsyncClient.withRaiseWithResponse": "SpecialWords.Parameters.withRaise", - "specialwords.ParametersAsyncClient.withReturn": "SpecialWords.Parameters.withReturn", - "specialwords.ParametersAsyncClient.withReturnWithResponse": "SpecialWords.Parameters.withReturn", - "specialwords.ParametersAsyncClient.withTry": "SpecialWords.Parameters.withTry", - "specialwords.ParametersAsyncClient.withTryWithResponse": "SpecialWords.Parameters.withTry", - "specialwords.ParametersAsyncClient.withWhile": "SpecialWords.Parameters.withWhile", - "specialwords.ParametersAsyncClient.withWhileWithResponse": "SpecialWords.Parameters.withWhile", - "specialwords.ParametersAsyncClient.withWith": "SpecialWords.Parameters.withWith", - "specialwords.ParametersAsyncClient.withWithWithResponse": "SpecialWords.Parameters.withWith", - "specialwords.ParametersAsyncClient.withYield": "SpecialWords.Parameters.withYield", - "specialwords.ParametersAsyncClient.withYieldWithResponse": "SpecialWords.Parameters.withYield", - "specialwords.ParametersClient": "SpecialWords.Parameters", - "specialwords.ParametersClient.withAnd": "SpecialWords.Parameters.withAnd", - "specialwords.ParametersClient.withAndWithResponse": "SpecialWords.Parameters.withAnd", - "specialwords.ParametersClient.withAs": "SpecialWords.Parameters.withAs", - "specialwords.ParametersClient.withAsWithResponse": "SpecialWords.Parameters.withAs", - "specialwords.ParametersClient.withAssert": "SpecialWords.Parameters.withAssert", - "specialwords.ParametersClient.withAssertWithResponse": "SpecialWords.Parameters.withAssert", - "specialwords.ParametersClient.withAsyncWithResponse": "SpecialWords.Parameters.withAsync", - "specialwords.ParametersClient.withAwait": "SpecialWords.Parameters.withAwait", - "specialwords.ParametersClient.withAwaitWithResponse": "SpecialWords.Parameters.withAwait", - "specialwords.ParametersClient.withBreak": "SpecialWords.Parameters.withBreak", - "specialwords.ParametersClient.withBreakWithResponse": "SpecialWords.Parameters.withBreak", - "specialwords.ParametersClient.withCancellationToken": "SpecialWords.Parameters.withCancellationToken", - "specialwords.ParametersClient.withCancellationTokenWithResponse": "SpecialWords.Parameters.withCancellationToken", - "specialwords.ParametersClient.withClass": "SpecialWords.Parameters.withClass", - "specialwords.ParametersClient.withClassWithResponse": "SpecialWords.Parameters.withClass", - "specialwords.ParametersClient.withConstructor": "SpecialWords.Parameters.withConstructor", - "specialwords.ParametersClient.withConstructorWithResponse": "SpecialWords.Parameters.withConstructor", - "specialwords.ParametersClient.withContinue": "SpecialWords.Parameters.withContinue", - "specialwords.ParametersClient.withContinueWithResponse": "SpecialWords.Parameters.withContinue", - "specialwords.ParametersClient.withDef": "SpecialWords.Parameters.withDef", - "specialwords.ParametersClient.withDefWithResponse": "SpecialWords.Parameters.withDef", - "specialwords.ParametersClient.withDel": "SpecialWords.Parameters.withDel", - "specialwords.ParametersClient.withDelWithResponse": "SpecialWords.Parameters.withDel", - "specialwords.ParametersClient.withElif": "SpecialWords.Parameters.withElif", - "specialwords.ParametersClient.withElifWithResponse": "SpecialWords.Parameters.withElif", - "specialwords.ParametersClient.withElse": "SpecialWords.Parameters.withElse", - "specialwords.ParametersClient.withElseWithResponse": "SpecialWords.Parameters.withElse", - "specialwords.ParametersClient.withExcept": "SpecialWords.Parameters.withExcept", - "specialwords.ParametersClient.withExceptWithResponse": "SpecialWords.Parameters.withExcept", - "specialwords.ParametersClient.withExec": "SpecialWords.Parameters.withExec", - "specialwords.ParametersClient.withExecWithResponse": "SpecialWords.Parameters.withExec", - "specialwords.ParametersClient.withFinally": "SpecialWords.Parameters.withFinally", - "specialwords.ParametersClient.withFinallyWithResponse": "SpecialWords.Parameters.withFinally", - "specialwords.ParametersClient.withFor": "SpecialWords.Parameters.withFor", - "specialwords.ParametersClient.withForWithResponse": "SpecialWords.Parameters.withFor", - "specialwords.ParametersClient.withFrom": "SpecialWords.Parameters.withFrom", - "specialwords.ParametersClient.withFromWithResponse": "SpecialWords.Parameters.withFrom", - "specialwords.ParametersClient.withGlobal": "SpecialWords.Parameters.withGlobal", - "specialwords.ParametersClient.withGlobalWithResponse": "SpecialWords.Parameters.withGlobal", - "specialwords.ParametersClient.withIf": "SpecialWords.Parameters.withIf", - "specialwords.ParametersClient.withIfWithResponse": "SpecialWords.Parameters.withIf", - "specialwords.ParametersClient.withImport": "SpecialWords.Parameters.withImport", - "specialwords.ParametersClient.withImportWithResponse": "SpecialWords.Parameters.withImport", - "specialwords.ParametersClient.withIn": "SpecialWords.Parameters.withIn", - "specialwords.ParametersClient.withInWithResponse": "SpecialWords.Parameters.withIn", - "specialwords.ParametersClient.withIs": "SpecialWords.Parameters.withIs", - "specialwords.ParametersClient.withIsWithResponse": "SpecialWords.Parameters.withIs", - "specialwords.ParametersClient.withLambda": "SpecialWords.Parameters.withLambda", - "specialwords.ParametersClient.withLambdaWithResponse": "SpecialWords.Parameters.withLambda", - "specialwords.ParametersClient.withNot": "SpecialWords.Parameters.withNot", - "specialwords.ParametersClient.withNotWithResponse": "SpecialWords.Parameters.withNot", - "specialwords.ParametersClient.withOr": "SpecialWords.Parameters.withOr", - "specialwords.ParametersClient.withOrWithResponse": "SpecialWords.Parameters.withOr", - "specialwords.ParametersClient.withPass": "SpecialWords.Parameters.withPass", - "specialwords.ParametersClient.withPassWithResponse": "SpecialWords.Parameters.withPass", - "specialwords.ParametersClient.withRaise": "SpecialWords.Parameters.withRaise", - "specialwords.ParametersClient.withRaiseWithResponse": "SpecialWords.Parameters.withRaise", - "specialwords.ParametersClient.withReturn": "SpecialWords.Parameters.withReturn", - "specialwords.ParametersClient.withReturnWithResponse": "SpecialWords.Parameters.withReturn", - "specialwords.ParametersClient.withTry": "SpecialWords.Parameters.withTry", - "specialwords.ParametersClient.withTryWithResponse": "SpecialWords.Parameters.withTry", - "specialwords.ParametersClient.withWhile": "SpecialWords.Parameters.withWhile", - "specialwords.ParametersClient.withWhileWithResponse": "SpecialWords.Parameters.withWhile", - "specialwords.ParametersClient.withWith": "SpecialWords.Parameters.withWith", - "specialwords.ParametersClient.withWithWithResponse": "SpecialWords.Parameters.withWith", - "specialwords.ParametersClient.withYield": "SpecialWords.Parameters.withYield", - "specialwords.ParametersClient.withYieldWithResponse": "SpecialWords.Parameters.withYield", - "specialwords.SpecialWordsClientBuilder": "SpecialWords", - "specialwords.modelproperties.models.DictMethods": "SpecialWords.ModelProperties.DictMethods", - "specialwords.modelproperties.models.ModelWithList": "SpecialWords.ModelProperties.ModelWithList", - "specialwords.modelproperties.models.SameAsModel": "SpecialWords.ModelProperties.SameAsModel", - "specialwords.models.models.And": "SpecialWords.Models.and", - "specialwords.models.models.As": "SpecialWords.Models.as", - "specialwords.models.models.Assert": "SpecialWords.Models.assert", - "specialwords.models.models.Async": "SpecialWords.Models.async", - "specialwords.models.models.Await": "SpecialWords.Models.await", - "specialwords.models.models.Break": "SpecialWords.Models.break", - "specialwords.models.models.ClassModel": "SpecialWords.Models.class", - "specialwords.models.models.Constructor": "SpecialWords.Models.constructor", - "specialwords.models.models.Continue": "SpecialWords.Models.continue", - "specialwords.models.models.Def": "SpecialWords.Models.def", - "specialwords.models.models.Del": "SpecialWords.Models.del", - "specialwords.models.models.Elif": "SpecialWords.Models.elif", - "specialwords.models.models.Else": "SpecialWords.Models.else", - "specialwords.models.models.Except": "SpecialWords.Models.except", - "specialwords.models.models.Exec": "SpecialWords.Models.exec", - "specialwords.models.models.Finally": "SpecialWords.Models.finally", - "specialwords.models.models.For": "SpecialWords.Models.for", - "specialwords.models.models.From": "SpecialWords.Models.from", - "specialwords.models.models.Global": "SpecialWords.Models.global", - "specialwords.models.models.If": "SpecialWords.Models.if", - "specialwords.models.models.Import": "SpecialWords.Models.import", - "specialwords.models.models.In": "SpecialWords.Models.in", - "specialwords.models.models.Is": "SpecialWords.Models.is", - "specialwords.models.models.Lambda": "SpecialWords.Models.lambda", - "specialwords.models.models.Not": "SpecialWords.Models.not", - "specialwords.models.models.Or": "SpecialWords.Models.or", - "specialwords.models.models.Pass": "SpecialWords.Models.pass", - "specialwords.models.models.Raise": "SpecialWords.Models.raise", - "specialwords.models.models.Return": "SpecialWords.Models.return", - "specialwords.models.models.Try": "SpecialWords.Models.try", - "specialwords.models.models.While": "SpecialWords.Models.while", - "specialwords.models.models.With": "SpecialWords.Models.with", - "specialwords.models.models.Yield": "SpecialWords.Models.yield" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialwords_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialwords_metadata.json index 295eb3cccd4..4e9b64ff6fa 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialwords_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/specialwords_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"specialwords.ModelPropertiesAsyncClient":"SpecialWords.ModelProperties","specialwords.ModelPropertiesAsyncClient.dictMethods":"SpecialWords.ModelProperties.dictMethods","specialwords.ModelPropertiesAsyncClient.dictMethodsWithResponse":"SpecialWords.ModelProperties.dictMethods","specialwords.ModelPropertiesAsyncClient.sameAsModel":"SpecialWords.ModelProperties.sameAsModel","specialwords.ModelPropertiesAsyncClient.sameAsModelWithResponse":"SpecialWords.ModelProperties.sameAsModel","specialwords.ModelPropertiesAsyncClient.withList":"SpecialWords.ModelProperties.withList","specialwords.ModelPropertiesAsyncClient.withListWithResponse":"SpecialWords.ModelProperties.withList","specialwords.ModelPropertiesClient":"SpecialWords.ModelProperties","specialwords.ModelPropertiesClient.dictMethods":"SpecialWords.ModelProperties.dictMethods","specialwords.ModelPropertiesClient.dictMethodsWithResponse":"SpecialWords.ModelProperties.dictMethods","specialwords.ModelPropertiesClient.sameAsModel":"SpecialWords.ModelProperties.sameAsModel","specialwords.ModelPropertiesClient.sameAsModelWithResponse":"SpecialWords.ModelProperties.sameAsModel","specialwords.ModelPropertiesClient.withList":"SpecialWords.ModelProperties.withList","specialwords.ModelPropertiesClient.withListWithResponse":"SpecialWords.ModelProperties.withList","specialwords.ModelsAsyncClient":"SpecialWords.Models","specialwords.ModelsAsyncClient.withAnd":"SpecialWords.Models.withAnd","specialwords.ModelsAsyncClient.withAndWithResponse":"SpecialWords.Models.withAnd","specialwords.ModelsAsyncClient.withAs":"SpecialWords.Models.withAs","specialwords.ModelsAsyncClient.withAsWithResponse":"SpecialWords.Models.withAs","specialwords.ModelsAsyncClient.withAssert":"SpecialWords.Models.withAssert","specialwords.ModelsAsyncClient.withAssertWithResponse":"SpecialWords.Models.withAssert","specialwords.ModelsAsyncClient.withAsyncWithResponse":"SpecialWords.Models.withAsync","specialwords.ModelsAsyncClient.withAwait":"SpecialWords.Models.withAwait","specialwords.ModelsAsyncClient.withAwaitWithResponse":"SpecialWords.Models.withAwait","specialwords.ModelsAsyncClient.withBreak":"SpecialWords.Models.withBreak","specialwords.ModelsAsyncClient.withBreakWithResponse":"SpecialWords.Models.withBreak","specialwords.ModelsAsyncClient.withClass":"SpecialWords.Models.withClass","specialwords.ModelsAsyncClient.withClassWithResponse":"SpecialWords.Models.withClass","specialwords.ModelsAsyncClient.withConstructor":"SpecialWords.Models.withConstructor","specialwords.ModelsAsyncClient.withConstructorWithResponse":"SpecialWords.Models.withConstructor","specialwords.ModelsAsyncClient.withContinue":"SpecialWords.Models.withContinue","specialwords.ModelsAsyncClient.withContinueWithResponse":"SpecialWords.Models.withContinue","specialwords.ModelsAsyncClient.withDef":"SpecialWords.Models.withDef","specialwords.ModelsAsyncClient.withDefWithResponse":"SpecialWords.Models.withDef","specialwords.ModelsAsyncClient.withDel":"SpecialWords.Models.withDel","specialwords.ModelsAsyncClient.withDelWithResponse":"SpecialWords.Models.withDel","specialwords.ModelsAsyncClient.withElif":"SpecialWords.Models.withElif","specialwords.ModelsAsyncClient.withElifWithResponse":"SpecialWords.Models.withElif","specialwords.ModelsAsyncClient.withElse":"SpecialWords.Models.withElse","specialwords.ModelsAsyncClient.withElseWithResponse":"SpecialWords.Models.withElse","specialwords.ModelsAsyncClient.withExcept":"SpecialWords.Models.withExcept","specialwords.ModelsAsyncClient.withExceptWithResponse":"SpecialWords.Models.withExcept","specialwords.ModelsAsyncClient.withExec":"SpecialWords.Models.withExec","specialwords.ModelsAsyncClient.withExecWithResponse":"SpecialWords.Models.withExec","specialwords.ModelsAsyncClient.withFinally":"SpecialWords.Models.withFinally","specialwords.ModelsAsyncClient.withFinallyWithResponse":"SpecialWords.Models.withFinally","specialwords.ModelsAsyncClient.withFor":"SpecialWords.Models.withFor","specialwords.ModelsAsyncClient.withForWithResponse":"SpecialWords.Models.withFor","specialwords.ModelsAsyncClient.withFrom":"SpecialWords.Models.withFrom","specialwords.ModelsAsyncClient.withFromWithResponse":"SpecialWords.Models.withFrom","specialwords.ModelsAsyncClient.withGlobal":"SpecialWords.Models.withGlobal","specialwords.ModelsAsyncClient.withGlobalWithResponse":"SpecialWords.Models.withGlobal","specialwords.ModelsAsyncClient.withIf":"SpecialWords.Models.withIf","specialwords.ModelsAsyncClient.withIfWithResponse":"SpecialWords.Models.withIf","specialwords.ModelsAsyncClient.withImport":"SpecialWords.Models.withImport","specialwords.ModelsAsyncClient.withImportWithResponse":"SpecialWords.Models.withImport","specialwords.ModelsAsyncClient.withIn":"SpecialWords.Models.withIn","specialwords.ModelsAsyncClient.withInWithResponse":"SpecialWords.Models.withIn","specialwords.ModelsAsyncClient.withIs":"SpecialWords.Models.withIs","specialwords.ModelsAsyncClient.withIsWithResponse":"SpecialWords.Models.withIs","specialwords.ModelsAsyncClient.withLambda":"SpecialWords.Models.withLambda","specialwords.ModelsAsyncClient.withLambdaWithResponse":"SpecialWords.Models.withLambda","specialwords.ModelsAsyncClient.withNot":"SpecialWords.Models.withNot","specialwords.ModelsAsyncClient.withNotWithResponse":"SpecialWords.Models.withNot","specialwords.ModelsAsyncClient.withOr":"SpecialWords.Models.withOr","specialwords.ModelsAsyncClient.withOrWithResponse":"SpecialWords.Models.withOr","specialwords.ModelsAsyncClient.withPass":"SpecialWords.Models.withPass","specialwords.ModelsAsyncClient.withPassWithResponse":"SpecialWords.Models.withPass","specialwords.ModelsAsyncClient.withRaise":"SpecialWords.Models.withRaise","specialwords.ModelsAsyncClient.withRaiseWithResponse":"SpecialWords.Models.withRaise","specialwords.ModelsAsyncClient.withReturn":"SpecialWords.Models.withReturn","specialwords.ModelsAsyncClient.withReturnWithResponse":"SpecialWords.Models.withReturn","specialwords.ModelsAsyncClient.withTry":"SpecialWords.Models.withTry","specialwords.ModelsAsyncClient.withTryWithResponse":"SpecialWords.Models.withTry","specialwords.ModelsAsyncClient.withWhile":"SpecialWords.Models.withWhile","specialwords.ModelsAsyncClient.withWhileWithResponse":"SpecialWords.Models.withWhile","specialwords.ModelsAsyncClient.withWith":"SpecialWords.Models.withWith","specialwords.ModelsAsyncClient.withWithWithResponse":"SpecialWords.Models.withWith","specialwords.ModelsAsyncClient.withYield":"SpecialWords.Models.withYield","specialwords.ModelsAsyncClient.withYieldWithResponse":"SpecialWords.Models.withYield","specialwords.ModelsClient":"SpecialWords.Models","specialwords.ModelsClient.withAnd":"SpecialWords.Models.withAnd","specialwords.ModelsClient.withAndWithResponse":"SpecialWords.Models.withAnd","specialwords.ModelsClient.withAs":"SpecialWords.Models.withAs","specialwords.ModelsClient.withAsWithResponse":"SpecialWords.Models.withAs","specialwords.ModelsClient.withAssert":"SpecialWords.Models.withAssert","specialwords.ModelsClient.withAssertWithResponse":"SpecialWords.Models.withAssert","specialwords.ModelsClient.withAsyncWithResponse":"SpecialWords.Models.withAsync","specialwords.ModelsClient.withAwait":"SpecialWords.Models.withAwait","specialwords.ModelsClient.withAwaitWithResponse":"SpecialWords.Models.withAwait","specialwords.ModelsClient.withBreak":"SpecialWords.Models.withBreak","specialwords.ModelsClient.withBreakWithResponse":"SpecialWords.Models.withBreak","specialwords.ModelsClient.withClass":"SpecialWords.Models.withClass","specialwords.ModelsClient.withClassWithResponse":"SpecialWords.Models.withClass","specialwords.ModelsClient.withConstructor":"SpecialWords.Models.withConstructor","specialwords.ModelsClient.withConstructorWithResponse":"SpecialWords.Models.withConstructor","specialwords.ModelsClient.withContinue":"SpecialWords.Models.withContinue","specialwords.ModelsClient.withContinueWithResponse":"SpecialWords.Models.withContinue","specialwords.ModelsClient.withDef":"SpecialWords.Models.withDef","specialwords.ModelsClient.withDefWithResponse":"SpecialWords.Models.withDef","specialwords.ModelsClient.withDel":"SpecialWords.Models.withDel","specialwords.ModelsClient.withDelWithResponse":"SpecialWords.Models.withDel","specialwords.ModelsClient.withElif":"SpecialWords.Models.withElif","specialwords.ModelsClient.withElifWithResponse":"SpecialWords.Models.withElif","specialwords.ModelsClient.withElse":"SpecialWords.Models.withElse","specialwords.ModelsClient.withElseWithResponse":"SpecialWords.Models.withElse","specialwords.ModelsClient.withExcept":"SpecialWords.Models.withExcept","specialwords.ModelsClient.withExceptWithResponse":"SpecialWords.Models.withExcept","specialwords.ModelsClient.withExec":"SpecialWords.Models.withExec","specialwords.ModelsClient.withExecWithResponse":"SpecialWords.Models.withExec","specialwords.ModelsClient.withFinally":"SpecialWords.Models.withFinally","specialwords.ModelsClient.withFinallyWithResponse":"SpecialWords.Models.withFinally","specialwords.ModelsClient.withFor":"SpecialWords.Models.withFor","specialwords.ModelsClient.withForWithResponse":"SpecialWords.Models.withFor","specialwords.ModelsClient.withFrom":"SpecialWords.Models.withFrom","specialwords.ModelsClient.withFromWithResponse":"SpecialWords.Models.withFrom","specialwords.ModelsClient.withGlobal":"SpecialWords.Models.withGlobal","specialwords.ModelsClient.withGlobalWithResponse":"SpecialWords.Models.withGlobal","specialwords.ModelsClient.withIf":"SpecialWords.Models.withIf","specialwords.ModelsClient.withIfWithResponse":"SpecialWords.Models.withIf","specialwords.ModelsClient.withImport":"SpecialWords.Models.withImport","specialwords.ModelsClient.withImportWithResponse":"SpecialWords.Models.withImport","specialwords.ModelsClient.withIn":"SpecialWords.Models.withIn","specialwords.ModelsClient.withInWithResponse":"SpecialWords.Models.withIn","specialwords.ModelsClient.withIs":"SpecialWords.Models.withIs","specialwords.ModelsClient.withIsWithResponse":"SpecialWords.Models.withIs","specialwords.ModelsClient.withLambda":"SpecialWords.Models.withLambda","specialwords.ModelsClient.withLambdaWithResponse":"SpecialWords.Models.withLambda","specialwords.ModelsClient.withNot":"SpecialWords.Models.withNot","specialwords.ModelsClient.withNotWithResponse":"SpecialWords.Models.withNot","specialwords.ModelsClient.withOr":"SpecialWords.Models.withOr","specialwords.ModelsClient.withOrWithResponse":"SpecialWords.Models.withOr","specialwords.ModelsClient.withPass":"SpecialWords.Models.withPass","specialwords.ModelsClient.withPassWithResponse":"SpecialWords.Models.withPass","specialwords.ModelsClient.withRaise":"SpecialWords.Models.withRaise","specialwords.ModelsClient.withRaiseWithResponse":"SpecialWords.Models.withRaise","specialwords.ModelsClient.withReturn":"SpecialWords.Models.withReturn","specialwords.ModelsClient.withReturnWithResponse":"SpecialWords.Models.withReturn","specialwords.ModelsClient.withTry":"SpecialWords.Models.withTry","specialwords.ModelsClient.withTryWithResponse":"SpecialWords.Models.withTry","specialwords.ModelsClient.withWhile":"SpecialWords.Models.withWhile","specialwords.ModelsClient.withWhileWithResponse":"SpecialWords.Models.withWhile","specialwords.ModelsClient.withWith":"SpecialWords.Models.withWith","specialwords.ModelsClient.withWithWithResponse":"SpecialWords.Models.withWith","specialwords.ModelsClient.withYield":"SpecialWords.Models.withYield","specialwords.ModelsClient.withYieldWithResponse":"SpecialWords.Models.withYield","specialwords.OperationsAsyncClient":"SpecialWords.Operations","specialwords.OperationsAsyncClient.and":"SpecialWords.Operations.and","specialwords.OperationsAsyncClient.andWithResponse":"SpecialWords.Operations.and","specialwords.OperationsAsyncClient.as":"SpecialWords.Operations.as","specialwords.OperationsAsyncClient.asWithResponse":"SpecialWords.Operations.as","specialwords.OperationsAsyncClient.assertMethod":"SpecialWords.Operations.assert","specialwords.OperationsAsyncClient.assertMethodWithResponse":"SpecialWords.Operations.assert","specialwords.OperationsAsyncClient.async":"SpecialWords.Operations.async","specialwords.OperationsAsyncClient.asyncWithResponse":"SpecialWords.Operations.async","specialwords.OperationsAsyncClient.await":"SpecialWords.Operations.await","specialwords.OperationsAsyncClient.awaitWithResponse":"SpecialWords.Operations.await","specialwords.OperationsAsyncClient.breakMethod":"SpecialWords.Operations.break","specialwords.OperationsAsyncClient.breakMethodWithResponse":"SpecialWords.Operations.break","specialwords.OperationsAsyncClient.classMethod":"SpecialWords.Operations.class","specialwords.OperationsAsyncClient.classMethodWithResponse":"SpecialWords.Operations.class","specialwords.OperationsAsyncClient.constructor":"SpecialWords.Operations.constructor","specialwords.OperationsAsyncClient.constructorWithResponse":"SpecialWords.Operations.constructor","specialwords.OperationsAsyncClient.continueMethod":"SpecialWords.Operations.continue","specialwords.OperationsAsyncClient.continueMethodWithResponse":"SpecialWords.Operations.continue","specialwords.OperationsAsyncClient.def":"SpecialWords.Operations.def","specialwords.OperationsAsyncClient.defWithResponse":"SpecialWords.Operations.def","specialwords.OperationsAsyncClient.del":"SpecialWords.Operations.del","specialwords.OperationsAsyncClient.delWithResponse":"SpecialWords.Operations.del","specialwords.OperationsAsyncClient.elif":"SpecialWords.Operations.elif","specialwords.OperationsAsyncClient.elifWithResponse":"SpecialWords.Operations.elif","specialwords.OperationsAsyncClient.elseMethod":"SpecialWords.Operations.else","specialwords.OperationsAsyncClient.elseMethodWithResponse":"SpecialWords.Operations.else","specialwords.OperationsAsyncClient.except":"SpecialWords.Operations.except","specialwords.OperationsAsyncClient.exceptWithResponse":"SpecialWords.Operations.except","specialwords.OperationsAsyncClient.exec":"SpecialWords.Operations.exec","specialwords.OperationsAsyncClient.execWithResponse":"SpecialWords.Operations.exec","specialwords.OperationsAsyncClient.finallyMethod":"SpecialWords.Operations.finally","specialwords.OperationsAsyncClient.finallyMethodWithResponse":"SpecialWords.Operations.finally","specialwords.OperationsAsyncClient.forMethod":"SpecialWords.Operations.for","specialwords.OperationsAsyncClient.forMethodWithResponse":"SpecialWords.Operations.for","specialwords.OperationsAsyncClient.from":"SpecialWords.Operations.from","specialwords.OperationsAsyncClient.fromWithResponse":"SpecialWords.Operations.from","specialwords.OperationsAsyncClient.global":"SpecialWords.Operations.global","specialwords.OperationsAsyncClient.globalWithResponse":"SpecialWords.Operations.global","specialwords.OperationsAsyncClient.ifMethod":"SpecialWords.Operations.if","specialwords.OperationsAsyncClient.ifMethodWithResponse":"SpecialWords.Operations.if","specialwords.OperationsAsyncClient.importMethod":"SpecialWords.Operations.import","specialwords.OperationsAsyncClient.importMethodWithResponse":"SpecialWords.Operations.import","specialwords.OperationsAsyncClient.in":"SpecialWords.Operations.in","specialwords.OperationsAsyncClient.inWithResponse":"SpecialWords.Operations.in","specialwords.OperationsAsyncClient.is":"SpecialWords.Operations.is","specialwords.OperationsAsyncClient.isWithResponse":"SpecialWords.Operations.is","specialwords.OperationsAsyncClient.lambda":"SpecialWords.Operations.lambda","specialwords.OperationsAsyncClient.lambdaWithResponse":"SpecialWords.Operations.lambda","specialwords.OperationsAsyncClient.not":"SpecialWords.Operations.not","specialwords.OperationsAsyncClient.notWithResponse":"SpecialWords.Operations.not","specialwords.OperationsAsyncClient.or":"SpecialWords.Operations.or","specialwords.OperationsAsyncClient.orWithResponse":"SpecialWords.Operations.or","specialwords.OperationsAsyncClient.pass":"SpecialWords.Operations.pass","specialwords.OperationsAsyncClient.passWithResponse":"SpecialWords.Operations.pass","specialwords.OperationsAsyncClient.raise":"SpecialWords.Operations.raise","specialwords.OperationsAsyncClient.raiseWithResponse":"SpecialWords.Operations.raise","specialwords.OperationsAsyncClient.returnMethod":"SpecialWords.Operations.return","specialwords.OperationsAsyncClient.returnMethodWithResponse":"SpecialWords.Operations.return","specialwords.OperationsAsyncClient.tryMethod":"SpecialWords.Operations.try","specialwords.OperationsAsyncClient.tryMethodWithResponse":"SpecialWords.Operations.try","specialwords.OperationsAsyncClient.whileMethod":"SpecialWords.Operations.while","specialwords.OperationsAsyncClient.whileMethodWithResponse":"SpecialWords.Operations.while","specialwords.OperationsAsyncClient.with":"SpecialWords.Operations.with","specialwords.OperationsAsyncClient.withWithResponse":"SpecialWords.Operations.with","specialwords.OperationsAsyncClient.yield":"SpecialWords.Operations.yield","specialwords.OperationsAsyncClient.yieldWithResponse":"SpecialWords.Operations.yield","specialwords.OperationsClient":"SpecialWords.Operations","specialwords.OperationsClient.and":"SpecialWords.Operations.and","specialwords.OperationsClient.andWithResponse":"SpecialWords.Operations.and","specialwords.OperationsClient.as":"SpecialWords.Operations.as","specialwords.OperationsClient.asWithResponse":"SpecialWords.Operations.as","specialwords.OperationsClient.assertMethod":"SpecialWords.Operations.assert","specialwords.OperationsClient.assertMethodWithResponse":"SpecialWords.Operations.assert","specialwords.OperationsClient.async":"SpecialWords.Operations.async","specialwords.OperationsClient.asyncWithResponse":"SpecialWords.Operations.async","specialwords.OperationsClient.await":"SpecialWords.Operations.await","specialwords.OperationsClient.awaitWithResponse":"SpecialWords.Operations.await","specialwords.OperationsClient.breakMethod":"SpecialWords.Operations.break","specialwords.OperationsClient.breakMethodWithResponse":"SpecialWords.Operations.break","specialwords.OperationsClient.classMethod":"SpecialWords.Operations.class","specialwords.OperationsClient.classMethodWithResponse":"SpecialWords.Operations.class","specialwords.OperationsClient.constructor":"SpecialWords.Operations.constructor","specialwords.OperationsClient.constructorWithResponse":"SpecialWords.Operations.constructor","specialwords.OperationsClient.continueMethod":"SpecialWords.Operations.continue","specialwords.OperationsClient.continueMethodWithResponse":"SpecialWords.Operations.continue","specialwords.OperationsClient.def":"SpecialWords.Operations.def","specialwords.OperationsClient.defWithResponse":"SpecialWords.Operations.def","specialwords.OperationsClient.del":"SpecialWords.Operations.del","specialwords.OperationsClient.delWithResponse":"SpecialWords.Operations.del","specialwords.OperationsClient.elif":"SpecialWords.Operations.elif","specialwords.OperationsClient.elifWithResponse":"SpecialWords.Operations.elif","specialwords.OperationsClient.elseMethod":"SpecialWords.Operations.else","specialwords.OperationsClient.elseMethodWithResponse":"SpecialWords.Operations.else","specialwords.OperationsClient.except":"SpecialWords.Operations.except","specialwords.OperationsClient.exceptWithResponse":"SpecialWords.Operations.except","specialwords.OperationsClient.exec":"SpecialWords.Operations.exec","specialwords.OperationsClient.execWithResponse":"SpecialWords.Operations.exec","specialwords.OperationsClient.finallyMethod":"SpecialWords.Operations.finally","specialwords.OperationsClient.finallyMethodWithResponse":"SpecialWords.Operations.finally","specialwords.OperationsClient.forMethod":"SpecialWords.Operations.for","specialwords.OperationsClient.forMethodWithResponse":"SpecialWords.Operations.for","specialwords.OperationsClient.from":"SpecialWords.Operations.from","specialwords.OperationsClient.fromWithResponse":"SpecialWords.Operations.from","specialwords.OperationsClient.global":"SpecialWords.Operations.global","specialwords.OperationsClient.globalWithResponse":"SpecialWords.Operations.global","specialwords.OperationsClient.ifMethod":"SpecialWords.Operations.if","specialwords.OperationsClient.ifMethodWithResponse":"SpecialWords.Operations.if","specialwords.OperationsClient.importMethod":"SpecialWords.Operations.import","specialwords.OperationsClient.importMethodWithResponse":"SpecialWords.Operations.import","specialwords.OperationsClient.in":"SpecialWords.Operations.in","specialwords.OperationsClient.inWithResponse":"SpecialWords.Operations.in","specialwords.OperationsClient.is":"SpecialWords.Operations.is","specialwords.OperationsClient.isWithResponse":"SpecialWords.Operations.is","specialwords.OperationsClient.lambda":"SpecialWords.Operations.lambda","specialwords.OperationsClient.lambdaWithResponse":"SpecialWords.Operations.lambda","specialwords.OperationsClient.not":"SpecialWords.Operations.not","specialwords.OperationsClient.notWithResponse":"SpecialWords.Operations.not","specialwords.OperationsClient.or":"SpecialWords.Operations.or","specialwords.OperationsClient.orWithResponse":"SpecialWords.Operations.or","specialwords.OperationsClient.pass":"SpecialWords.Operations.pass","specialwords.OperationsClient.passWithResponse":"SpecialWords.Operations.pass","specialwords.OperationsClient.raise":"SpecialWords.Operations.raise","specialwords.OperationsClient.raiseWithResponse":"SpecialWords.Operations.raise","specialwords.OperationsClient.returnMethod":"SpecialWords.Operations.return","specialwords.OperationsClient.returnMethodWithResponse":"SpecialWords.Operations.return","specialwords.OperationsClient.tryMethod":"SpecialWords.Operations.try","specialwords.OperationsClient.tryMethodWithResponse":"SpecialWords.Operations.try","specialwords.OperationsClient.whileMethod":"SpecialWords.Operations.while","specialwords.OperationsClient.whileMethodWithResponse":"SpecialWords.Operations.while","specialwords.OperationsClient.with":"SpecialWords.Operations.with","specialwords.OperationsClient.withWithResponse":"SpecialWords.Operations.with","specialwords.OperationsClient.yield":"SpecialWords.Operations.yield","specialwords.OperationsClient.yieldWithResponse":"SpecialWords.Operations.yield","specialwords.ParametersAsyncClient":"SpecialWords.Parameters","specialwords.ParametersAsyncClient.withAnd":"SpecialWords.Parameters.withAnd","specialwords.ParametersAsyncClient.withAndWithResponse":"SpecialWords.Parameters.withAnd","specialwords.ParametersAsyncClient.withAs":"SpecialWords.Parameters.withAs","specialwords.ParametersAsyncClient.withAsWithResponse":"SpecialWords.Parameters.withAs","specialwords.ParametersAsyncClient.withAssert":"SpecialWords.Parameters.withAssert","specialwords.ParametersAsyncClient.withAssertWithResponse":"SpecialWords.Parameters.withAssert","specialwords.ParametersAsyncClient.withAsyncWithResponse":"SpecialWords.Parameters.withAsync","specialwords.ParametersAsyncClient.withAwait":"SpecialWords.Parameters.withAwait","specialwords.ParametersAsyncClient.withAwaitWithResponse":"SpecialWords.Parameters.withAwait","specialwords.ParametersAsyncClient.withBreak":"SpecialWords.Parameters.withBreak","specialwords.ParametersAsyncClient.withBreakWithResponse":"SpecialWords.Parameters.withBreak","specialwords.ParametersAsyncClient.withCancellationToken":"SpecialWords.Parameters.withCancellationToken","specialwords.ParametersAsyncClient.withCancellationTokenWithResponse":"SpecialWords.Parameters.withCancellationToken","specialwords.ParametersAsyncClient.withClass":"SpecialWords.Parameters.withClass","specialwords.ParametersAsyncClient.withClassWithResponse":"SpecialWords.Parameters.withClass","specialwords.ParametersAsyncClient.withConstructor":"SpecialWords.Parameters.withConstructor","specialwords.ParametersAsyncClient.withConstructorWithResponse":"SpecialWords.Parameters.withConstructor","specialwords.ParametersAsyncClient.withContinue":"SpecialWords.Parameters.withContinue","specialwords.ParametersAsyncClient.withContinueWithResponse":"SpecialWords.Parameters.withContinue","specialwords.ParametersAsyncClient.withDef":"SpecialWords.Parameters.withDef","specialwords.ParametersAsyncClient.withDefWithResponse":"SpecialWords.Parameters.withDef","specialwords.ParametersAsyncClient.withDel":"SpecialWords.Parameters.withDel","specialwords.ParametersAsyncClient.withDelWithResponse":"SpecialWords.Parameters.withDel","specialwords.ParametersAsyncClient.withElif":"SpecialWords.Parameters.withElif","specialwords.ParametersAsyncClient.withElifWithResponse":"SpecialWords.Parameters.withElif","specialwords.ParametersAsyncClient.withElse":"SpecialWords.Parameters.withElse","specialwords.ParametersAsyncClient.withElseWithResponse":"SpecialWords.Parameters.withElse","specialwords.ParametersAsyncClient.withExcept":"SpecialWords.Parameters.withExcept","specialwords.ParametersAsyncClient.withExceptWithResponse":"SpecialWords.Parameters.withExcept","specialwords.ParametersAsyncClient.withExec":"SpecialWords.Parameters.withExec","specialwords.ParametersAsyncClient.withExecWithResponse":"SpecialWords.Parameters.withExec","specialwords.ParametersAsyncClient.withFinally":"SpecialWords.Parameters.withFinally","specialwords.ParametersAsyncClient.withFinallyWithResponse":"SpecialWords.Parameters.withFinally","specialwords.ParametersAsyncClient.withFor":"SpecialWords.Parameters.withFor","specialwords.ParametersAsyncClient.withForWithResponse":"SpecialWords.Parameters.withFor","specialwords.ParametersAsyncClient.withFrom":"SpecialWords.Parameters.withFrom","specialwords.ParametersAsyncClient.withFromWithResponse":"SpecialWords.Parameters.withFrom","specialwords.ParametersAsyncClient.withGlobal":"SpecialWords.Parameters.withGlobal","specialwords.ParametersAsyncClient.withGlobalWithResponse":"SpecialWords.Parameters.withGlobal","specialwords.ParametersAsyncClient.withIf":"SpecialWords.Parameters.withIf","specialwords.ParametersAsyncClient.withIfWithResponse":"SpecialWords.Parameters.withIf","specialwords.ParametersAsyncClient.withImport":"SpecialWords.Parameters.withImport","specialwords.ParametersAsyncClient.withImportWithResponse":"SpecialWords.Parameters.withImport","specialwords.ParametersAsyncClient.withIn":"SpecialWords.Parameters.withIn","specialwords.ParametersAsyncClient.withInWithResponse":"SpecialWords.Parameters.withIn","specialwords.ParametersAsyncClient.withIs":"SpecialWords.Parameters.withIs","specialwords.ParametersAsyncClient.withIsWithResponse":"SpecialWords.Parameters.withIs","specialwords.ParametersAsyncClient.withLambda":"SpecialWords.Parameters.withLambda","specialwords.ParametersAsyncClient.withLambdaWithResponse":"SpecialWords.Parameters.withLambda","specialwords.ParametersAsyncClient.withNot":"SpecialWords.Parameters.withNot","specialwords.ParametersAsyncClient.withNotWithResponse":"SpecialWords.Parameters.withNot","specialwords.ParametersAsyncClient.withOr":"SpecialWords.Parameters.withOr","specialwords.ParametersAsyncClient.withOrWithResponse":"SpecialWords.Parameters.withOr","specialwords.ParametersAsyncClient.withPass":"SpecialWords.Parameters.withPass","specialwords.ParametersAsyncClient.withPassWithResponse":"SpecialWords.Parameters.withPass","specialwords.ParametersAsyncClient.withRaise":"SpecialWords.Parameters.withRaise","specialwords.ParametersAsyncClient.withRaiseWithResponse":"SpecialWords.Parameters.withRaise","specialwords.ParametersAsyncClient.withReturn":"SpecialWords.Parameters.withReturn","specialwords.ParametersAsyncClient.withReturnWithResponse":"SpecialWords.Parameters.withReturn","specialwords.ParametersAsyncClient.withTry":"SpecialWords.Parameters.withTry","specialwords.ParametersAsyncClient.withTryWithResponse":"SpecialWords.Parameters.withTry","specialwords.ParametersAsyncClient.withWhile":"SpecialWords.Parameters.withWhile","specialwords.ParametersAsyncClient.withWhileWithResponse":"SpecialWords.Parameters.withWhile","specialwords.ParametersAsyncClient.withWith":"SpecialWords.Parameters.withWith","specialwords.ParametersAsyncClient.withWithWithResponse":"SpecialWords.Parameters.withWith","specialwords.ParametersAsyncClient.withYield":"SpecialWords.Parameters.withYield","specialwords.ParametersAsyncClient.withYieldWithResponse":"SpecialWords.Parameters.withYield","specialwords.ParametersClient":"SpecialWords.Parameters","specialwords.ParametersClient.withAnd":"SpecialWords.Parameters.withAnd","specialwords.ParametersClient.withAndWithResponse":"SpecialWords.Parameters.withAnd","specialwords.ParametersClient.withAs":"SpecialWords.Parameters.withAs","specialwords.ParametersClient.withAsWithResponse":"SpecialWords.Parameters.withAs","specialwords.ParametersClient.withAssert":"SpecialWords.Parameters.withAssert","specialwords.ParametersClient.withAssertWithResponse":"SpecialWords.Parameters.withAssert","specialwords.ParametersClient.withAsyncWithResponse":"SpecialWords.Parameters.withAsync","specialwords.ParametersClient.withAwait":"SpecialWords.Parameters.withAwait","specialwords.ParametersClient.withAwaitWithResponse":"SpecialWords.Parameters.withAwait","specialwords.ParametersClient.withBreak":"SpecialWords.Parameters.withBreak","specialwords.ParametersClient.withBreakWithResponse":"SpecialWords.Parameters.withBreak","specialwords.ParametersClient.withCancellationToken":"SpecialWords.Parameters.withCancellationToken","specialwords.ParametersClient.withCancellationTokenWithResponse":"SpecialWords.Parameters.withCancellationToken","specialwords.ParametersClient.withClass":"SpecialWords.Parameters.withClass","specialwords.ParametersClient.withClassWithResponse":"SpecialWords.Parameters.withClass","specialwords.ParametersClient.withConstructor":"SpecialWords.Parameters.withConstructor","specialwords.ParametersClient.withConstructorWithResponse":"SpecialWords.Parameters.withConstructor","specialwords.ParametersClient.withContinue":"SpecialWords.Parameters.withContinue","specialwords.ParametersClient.withContinueWithResponse":"SpecialWords.Parameters.withContinue","specialwords.ParametersClient.withDef":"SpecialWords.Parameters.withDef","specialwords.ParametersClient.withDefWithResponse":"SpecialWords.Parameters.withDef","specialwords.ParametersClient.withDel":"SpecialWords.Parameters.withDel","specialwords.ParametersClient.withDelWithResponse":"SpecialWords.Parameters.withDel","specialwords.ParametersClient.withElif":"SpecialWords.Parameters.withElif","specialwords.ParametersClient.withElifWithResponse":"SpecialWords.Parameters.withElif","specialwords.ParametersClient.withElse":"SpecialWords.Parameters.withElse","specialwords.ParametersClient.withElseWithResponse":"SpecialWords.Parameters.withElse","specialwords.ParametersClient.withExcept":"SpecialWords.Parameters.withExcept","specialwords.ParametersClient.withExceptWithResponse":"SpecialWords.Parameters.withExcept","specialwords.ParametersClient.withExec":"SpecialWords.Parameters.withExec","specialwords.ParametersClient.withExecWithResponse":"SpecialWords.Parameters.withExec","specialwords.ParametersClient.withFinally":"SpecialWords.Parameters.withFinally","specialwords.ParametersClient.withFinallyWithResponse":"SpecialWords.Parameters.withFinally","specialwords.ParametersClient.withFor":"SpecialWords.Parameters.withFor","specialwords.ParametersClient.withForWithResponse":"SpecialWords.Parameters.withFor","specialwords.ParametersClient.withFrom":"SpecialWords.Parameters.withFrom","specialwords.ParametersClient.withFromWithResponse":"SpecialWords.Parameters.withFrom","specialwords.ParametersClient.withGlobal":"SpecialWords.Parameters.withGlobal","specialwords.ParametersClient.withGlobalWithResponse":"SpecialWords.Parameters.withGlobal","specialwords.ParametersClient.withIf":"SpecialWords.Parameters.withIf","specialwords.ParametersClient.withIfWithResponse":"SpecialWords.Parameters.withIf","specialwords.ParametersClient.withImport":"SpecialWords.Parameters.withImport","specialwords.ParametersClient.withImportWithResponse":"SpecialWords.Parameters.withImport","specialwords.ParametersClient.withIn":"SpecialWords.Parameters.withIn","specialwords.ParametersClient.withInWithResponse":"SpecialWords.Parameters.withIn","specialwords.ParametersClient.withIs":"SpecialWords.Parameters.withIs","specialwords.ParametersClient.withIsWithResponse":"SpecialWords.Parameters.withIs","specialwords.ParametersClient.withLambda":"SpecialWords.Parameters.withLambda","specialwords.ParametersClient.withLambdaWithResponse":"SpecialWords.Parameters.withLambda","specialwords.ParametersClient.withNot":"SpecialWords.Parameters.withNot","specialwords.ParametersClient.withNotWithResponse":"SpecialWords.Parameters.withNot","specialwords.ParametersClient.withOr":"SpecialWords.Parameters.withOr","specialwords.ParametersClient.withOrWithResponse":"SpecialWords.Parameters.withOr","specialwords.ParametersClient.withPass":"SpecialWords.Parameters.withPass","specialwords.ParametersClient.withPassWithResponse":"SpecialWords.Parameters.withPass","specialwords.ParametersClient.withRaise":"SpecialWords.Parameters.withRaise","specialwords.ParametersClient.withRaiseWithResponse":"SpecialWords.Parameters.withRaise","specialwords.ParametersClient.withReturn":"SpecialWords.Parameters.withReturn","specialwords.ParametersClient.withReturnWithResponse":"SpecialWords.Parameters.withReturn","specialwords.ParametersClient.withTry":"SpecialWords.Parameters.withTry","specialwords.ParametersClient.withTryWithResponse":"SpecialWords.Parameters.withTry","specialwords.ParametersClient.withWhile":"SpecialWords.Parameters.withWhile","specialwords.ParametersClient.withWhileWithResponse":"SpecialWords.Parameters.withWhile","specialwords.ParametersClient.withWith":"SpecialWords.Parameters.withWith","specialwords.ParametersClient.withWithWithResponse":"SpecialWords.Parameters.withWith","specialwords.ParametersClient.withYield":"SpecialWords.Parameters.withYield","specialwords.ParametersClient.withYieldWithResponse":"SpecialWords.Parameters.withYield","specialwords.SpecialWordsClientBuilder":"SpecialWords","specialwords.modelproperties.models.DictMethods":"SpecialWords.ModelProperties.DictMethods","specialwords.modelproperties.models.ModelWithList":"SpecialWords.ModelProperties.ModelWithList","specialwords.modelproperties.models.SameAsModel":"SpecialWords.ModelProperties.SameAsModel","specialwords.models.models.And":"SpecialWords.Models.and","specialwords.models.models.As":"SpecialWords.Models.as","specialwords.models.models.Assert":"SpecialWords.Models.assert","specialwords.models.models.Async":"SpecialWords.Models.async","specialwords.models.models.Await":"SpecialWords.Models.await","specialwords.models.models.Break":"SpecialWords.Models.break","specialwords.models.models.ClassModel":"SpecialWords.Models.class","specialwords.models.models.Constructor":"SpecialWords.Models.constructor","specialwords.models.models.Continue":"SpecialWords.Models.continue","specialwords.models.models.Def":"SpecialWords.Models.def","specialwords.models.models.Del":"SpecialWords.Models.del","specialwords.models.models.Elif":"SpecialWords.Models.elif","specialwords.models.models.Else":"SpecialWords.Models.else","specialwords.models.models.Except":"SpecialWords.Models.except","specialwords.models.models.Exec":"SpecialWords.Models.exec","specialwords.models.models.Finally":"SpecialWords.Models.finally","specialwords.models.models.For":"SpecialWords.Models.for","specialwords.models.models.From":"SpecialWords.Models.from","specialwords.models.models.Global":"SpecialWords.Models.global","specialwords.models.models.If":"SpecialWords.Models.if","specialwords.models.models.Import":"SpecialWords.Models.import","specialwords.models.models.In":"SpecialWords.Models.in","specialwords.models.models.Is":"SpecialWords.Models.is","specialwords.models.models.Lambda":"SpecialWords.Models.lambda","specialwords.models.models.Not":"SpecialWords.Models.not","specialwords.models.models.Or":"SpecialWords.Models.or","specialwords.models.models.Pass":"SpecialWords.Models.pass","specialwords.models.models.Raise":"SpecialWords.Models.raise","specialwords.models.models.Return":"SpecialWords.Models.return","specialwords.models.models.Try":"SpecialWords.Models.try","specialwords.models.models.While":"SpecialWords.Models.while","specialwords.models.models.With":"SpecialWords.Models.with","specialwords.models.models.Yield":"SpecialWords.Models.yield"},"generatedFiles":["src/main/java/module-info.java","src/main/java/specialwords/ModelPropertiesAsyncClient.java","src/main/java/specialwords/ModelPropertiesClient.java","src/main/java/specialwords/ModelsAsyncClient.java","src/main/java/specialwords/ModelsClient.java","src/main/java/specialwords/OperationsAsyncClient.java","src/main/java/specialwords/OperationsClient.java","src/main/java/specialwords/ParametersAsyncClient.java","src/main/java/specialwords/ParametersClient.java","src/main/java/specialwords/SpecialWordsClientBuilder.java","src/main/java/specialwords/implementation/ModelPropertiesImpl.java","src/main/java/specialwords/implementation/ModelsImpl.java","src/main/java/specialwords/implementation/OperationsImpl.java","src/main/java/specialwords/implementation/ParametersImpl.java","src/main/java/specialwords/implementation/SpecialWordsClientImpl.java","src/main/java/specialwords/implementation/package-info.java","src/main/java/specialwords/modelproperties/models/DictMethods.java","src/main/java/specialwords/modelproperties/models/ModelWithList.java","src/main/java/specialwords/modelproperties/models/SameAsModel.java","src/main/java/specialwords/modelproperties/models/package-info.java","src/main/java/specialwords/models/models/And.java","src/main/java/specialwords/models/models/As.java","src/main/java/specialwords/models/models/Assert.java","src/main/java/specialwords/models/models/Async.java","src/main/java/specialwords/models/models/Await.java","src/main/java/specialwords/models/models/Break.java","src/main/java/specialwords/models/models/ClassModel.java","src/main/java/specialwords/models/models/Constructor.java","src/main/java/specialwords/models/models/Continue.java","src/main/java/specialwords/models/models/Def.java","src/main/java/specialwords/models/models/Del.java","src/main/java/specialwords/models/models/Elif.java","src/main/java/specialwords/models/models/Else.java","src/main/java/specialwords/models/models/Except.java","src/main/java/specialwords/models/models/Exec.java","src/main/java/specialwords/models/models/Finally.java","src/main/java/specialwords/models/models/For.java","src/main/java/specialwords/models/models/From.java","src/main/java/specialwords/models/models/Global.java","src/main/java/specialwords/models/models/If.java","src/main/java/specialwords/models/models/Import.java","src/main/java/specialwords/models/models/In.java","src/main/java/specialwords/models/models/Is.java","src/main/java/specialwords/models/models/Lambda.java","src/main/java/specialwords/models/models/Not.java","src/main/java/specialwords/models/models/Or.java","src/main/java/specialwords/models/models/Pass.java","src/main/java/specialwords/models/models/Raise.java","src/main/java/specialwords/models/models/Return.java","src/main/java/specialwords/models/models/Try.java","src/main/java/specialwords/models/models/While.java","src/main/java/specialwords/models/models/With.java","src/main/java/specialwords/models/models/Yield.java","src/main/java/specialwords/models/models/package-info.java","src/main/java/specialwords/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"specialwords.ExtensibleStringsAsyncClient":"SpecialWords.ExtensibleStrings","specialwords.ExtensibleStringsAsyncClient.putExtensibleStringValue":"SpecialWords.ExtensibleStrings.putExtensibleStringValue","specialwords.ExtensibleStringsAsyncClient.putExtensibleStringValueWithResponse":"SpecialWords.ExtensibleStrings.putExtensibleStringValue","specialwords.ExtensibleStringsClient":"SpecialWords.ExtensibleStrings","specialwords.ExtensibleStringsClient.putExtensibleStringValue":"SpecialWords.ExtensibleStrings.putExtensibleStringValue","specialwords.ExtensibleStringsClient.putExtensibleStringValueWithResponse":"SpecialWords.ExtensibleStrings.putExtensibleStringValue","specialwords.ModelPropertiesAsyncClient":"SpecialWords.ModelProperties","specialwords.ModelPropertiesAsyncClient.dictMethods":"SpecialWords.ModelProperties.dictMethods","specialwords.ModelPropertiesAsyncClient.dictMethodsWithResponse":"SpecialWords.ModelProperties.dictMethods","specialwords.ModelPropertiesAsyncClient.sameAsModel":"SpecialWords.ModelProperties.sameAsModel","specialwords.ModelPropertiesAsyncClient.sameAsModelWithResponse":"SpecialWords.ModelProperties.sameAsModel","specialwords.ModelPropertiesAsyncClient.withList":"SpecialWords.ModelProperties.withList","specialwords.ModelPropertiesAsyncClient.withListWithResponse":"SpecialWords.ModelProperties.withList","specialwords.ModelPropertiesClient":"SpecialWords.ModelProperties","specialwords.ModelPropertiesClient.dictMethods":"SpecialWords.ModelProperties.dictMethods","specialwords.ModelPropertiesClient.dictMethodsWithResponse":"SpecialWords.ModelProperties.dictMethods","specialwords.ModelPropertiesClient.sameAsModel":"SpecialWords.ModelProperties.sameAsModel","specialwords.ModelPropertiesClient.sameAsModelWithResponse":"SpecialWords.ModelProperties.sameAsModel","specialwords.ModelPropertiesClient.withList":"SpecialWords.ModelProperties.withList","specialwords.ModelPropertiesClient.withListWithResponse":"SpecialWords.ModelProperties.withList","specialwords.ModelsAsyncClient":"SpecialWords.Models","specialwords.ModelsAsyncClient.withAnd":"SpecialWords.Models.withAnd","specialwords.ModelsAsyncClient.withAndWithResponse":"SpecialWords.Models.withAnd","specialwords.ModelsAsyncClient.withAs":"SpecialWords.Models.withAs","specialwords.ModelsAsyncClient.withAsWithResponse":"SpecialWords.Models.withAs","specialwords.ModelsAsyncClient.withAssert":"SpecialWords.Models.withAssert","specialwords.ModelsAsyncClient.withAssertWithResponse":"SpecialWords.Models.withAssert","specialwords.ModelsAsyncClient.withAsyncWithResponse":"SpecialWords.Models.withAsync","specialwords.ModelsAsyncClient.withAwait":"SpecialWords.Models.withAwait","specialwords.ModelsAsyncClient.withAwaitWithResponse":"SpecialWords.Models.withAwait","specialwords.ModelsAsyncClient.withBreak":"SpecialWords.Models.withBreak","specialwords.ModelsAsyncClient.withBreakWithResponse":"SpecialWords.Models.withBreak","specialwords.ModelsAsyncClient.withClass":"SpecialWords.Models.withClass","specialwords.ModelsAsyncClient.withClassWithResponse":"SpecialWords.Models.withClass","specialwords.ModelsAsyncClient.withConstructor":"SpecialWords.Models.withConstructor","specialwords.ModelsAsyncClient.withConstructorWithResponse":"SpecialWords.Models.withConstructor","specialwords.ModelsAsyncClient.withContinue":"SpecialWords.Models.withContinue","specialwords.ModelsAsyncClient.withContinueWithResponse":"SpecialWords.Models.withContinue","specialwords.ModelsAsyncClient.withDef":"SpecialWords.Models.withDef","specialwords.ModelsAsyncClient.withDefWithResponse":"SpecialWords.Models.withDef","specialwords.ModelsAsyncClient.withDel":"SpecialWords.Models.withDel","specialwords.ModelsAsyncClient.withDelWithResponse":"SpecialWords.Models.withDel","specialwords.ModelsAsyncClient.withElif":"SpecialWords.Models.withElif","specialwords.ModelsAsyncClient.withElifWithResponse":"SpecialWords.Models.withElif","specialwords.ModelsAsyncClient.withElse":"SpecialWords.Models.withElse","specialwords.ModelsAsyncClient.withElseWithResponse":"SpecialWords.Models.withElse","specialwords.ModelsAsyncClient.withExcept":"SpecialWords.Models.withExcept","specialwords.ModelsAsyncClient.withExceptWithResponse":"SpecialWords.Models.withExcept","specialwords.ModelsAsyncClient.withExec":"SpecialWords.Models.withExec","specialwords.ModelsAsyncClient.withExecWithResponse":"SpecialWords.Models.withExec","specialwords.ModelsAsyncClient.withFinally":"SpecialWords.Models.withFinally","specialwords.ModelsAsyncClient.withFinallyWithResponse":"SpecialWords.Models.withFinally","specialwords.ModelsAsyncClient.withFor":"SpecialWords.Models.withFor","specialwords.ModelsAsyncClient.withForWithResponse":"SpecialWords.Models.withFor","specialwords.ModelsAsyncClient.withFrom":"SpecialWords.Models.withFrom","specialwords.ModelsAsyncClient.withFromWithResponse":"SpecialWords.Models.withFrom","specialwords.ModelsAsyncClient.withGlobal":"SpecialWords.Models.withGlobal","specialwords.ModelsAsyncClient.withGlobalWithResponse":"SpecialWords.Models.withGlobal","specialwords.ModelsAsyncClient.withIf":"SpecialWords.Models.withIf","specialwords.ModelsAsyncClient.withIfWithResponse":"SpecialWords.Models.withIf","specialwords.ModelsAsyncClient.withImport":"SpecialWords.Models.withImport","specialwords.ModelsAsyncClient.withImportWithResponse":"SpecialWords.Models.withImport","specialwords.ModelsAsyncClient.withIn":"SpecialWords.Models.withIn","specialwords.ModelsAsyncClient.withInWithResponse":"SpecialWords.Models.withIn","specialwords.ModelsAsyncClient.withIs":"SpecialWords.Models.withIs","specialwords.ModelsAsyncClient.withIsWithResponse":"SpecialWords.Models.withIs","specialwords.ModelsAsyncClient.withLambda":"SpecialWords.Models.withLambda","specialwords.ModelsAsyncClient.withLambdaWithResponse":"SpecialWords.Models.withLambda","specialwords.ModelsAsyncClient.withNot":"SpecialWords.Models.withNot","specialwords.ModelsAsyncClient.withNotWithResponse":"SpecialWords.Models.withNot","specialwords.ModelsAsyncClient.withOr":"SpecialWords.Models.withOr","specialwords.ModelsAsyncClient.withOrWithResponse":"SpecialWords.Models.withOr","specialwords.ModelsAsyncClient.withPass":"SpecialWords.Models.withPass","specialwords.ModelsAsyncClient.withPassWithResponse":"SpecialWords.Models.withPass","specialwords.ModelsAsyncClient.withRaise":"SpecialWords.Models.withRaise","specialwords.ModelsAsyncClient.withRaiseWithResponse":"SpecialWords.Models.withRaise","specialwords.ModelsAsyncClient.withReturn":"SpecialWords.Models.withReturn","specialwords.ModelsAsyncClient.withReturnWithResponse":"SpecialWords.Models.withReturn","specialwords.ModelsAsyncClient.withTry":"SpecialWords.Models.withTry","specialwords.ModelsAsyncClient.withTryWithResponse":"SpecialWords.Models.withTry","specialwords.ModelsAsyncClient.withWhile":"SpecialWords.Models.withWhile","specialwords.ModelsAsyncClient.withWhileWithResponse":"SpecialWords.Models.withWhile","specialwords.ModelsAsyncClient.withWith":"SpecialWords.Models.withWith","specialwords.ModelsAsyncClient.withWithWithResponse":"SpecialWords.Models.withWith","specialwords.ModelsAsyncClient.withYield":"SpecialWords.Models.withYield","specialwords.ModelsAsyncClient.withYieldWithResponse":"SpecialWords.Models.withYield","specialwords.ModelsClient":"SpecialWords.Models","specialwords.ModelsClient.withAnd":"SpecialWords.Models.withAnd","specialwords.ModelsClient.withAndWithResponse":"SpecialWords.Models.withAnd","specialwords.ModelsClient.withAs":"SpecialWords.Models.withAs","specialwords.ModelsClient.withAsWithResponse":"SpecialWords.Models.withAs","specialwords.ModelsClient.withAssert":"SpecialWords.Models.withAssert","specialwords.ModelsClient.withAssertWithResponse":"SpecialWords.Models.withAssert","specialwords.ModelsClient.withAsyncWithResponse":"SpecialWords.Models.withAsync","specialwords.ModelsClient.withAwait":"SpecialWords.Models.withAwait","specialwords.ModelsClient.withAwaitWithResponse":"SpecialWords.Models.withAwait","specialwords.ModelsClient.withBreak":"SpecialWords.Models.withBreak","specialwords.ModelsClient.withBreakWithResponse":"SpecialWords.Models.withBreak","specialwords.ModelsClient.withClass":"SpecialWords.Models.withClass","specialwords.ModelsClient.withClassWithResponse":"SpecialWords.Models.withClass","specialwords.ModelsClient.withConstructor":"SpecialWords.Models.withConstructor","specialwords.ModelsClient.withConstructorWithResponse":"SpecialWords.Models.withConstructor","specialwords.ModelsClient.withContinue":"SpecialWords.Models.withContinue","specialwords.ModelsClient.withContinueWithResponse":"SpecialWords.Models.withContinue","specialwords.ModelsClient.withDef":"SpecialWords.Models.withDef","specialwords.ModelsClient.withDefWithResponse":"SpecialWords.Models.withDef","specialwords.ModelsClient.withDel":"SpecialWords.Models.withDel","specialwords.ModelsClient.withDelWithResponse":"SpecialWords.Models.withDel","specialwords.ModelsClient.withElif":"SpecialWords.Models.withElif","specialwords.ModelsClient.withElifWithResponse":"SpecialWords.Models.withElif","specialwords.ModelsClient.withElse":"SpecialWords.Models.withElse","specialwords.ModelsClient.withElseWithResponse":"SpecialWords.Models.withElse","specialwords.ModelsClient.withExcept":"SpecialWords.Models.withExcept","specialwords.ModelsClient.withExceptWithResponse":"SpecialWords.Models.withExcept","specialwords.ModelsClient.withExec":"SpecialWords.Models.withExec","specialwords.ModelsClient.withExecWithResponse":"SpecialWords.Models.withExec","specialwords.ModelsClient.withFinally":"SpecialWords.Models.withFinally","specialwords.ModelsClient.withFinallyWithResponse":"SpecialWords.Models.withFinally","specialwords.ModelsClient.withFor":"SpecialWords.Models.withFor","specialwords.ModelsClient.withForWithResponse":"SpecialWords.Models.withFor","specialwords.ModelsClient.withFrom":"SpecialWords.Models.withFrom","specialwords.ModelsClient.withFromWithResponse":"SpecialWords.Models.withFrom","specialwords.ModelsClient.withGlobal":"SpecialWords.Models.withGlobal","specialwords.ModelsClient.withGlobalWithResponse":"SpecialWords.Models.withGlobal","specialwords.ModelsClient.withIf":"SpecialWords.Models.withIf","specialwords.ModelsClient.withIfWithResponse":"SpecialWords.Models.withIf","specialwords.ModelsClient.withImport":"SpecialWords.Models.withImport","specialwords.ModelsClient.withImportWithResponse":"SpecialWords.Models.withImport","specialwords.ModelsClient.withIn":"SpecialWords.Models.withIn","specialwords.ModelsClient.withInWithResponse":"SpecialWords.Models.withIn","specialwords.ModelsClient.withIs":"SpecialWords.Models.withIs","specialwords.ModelsClient.withIsWithResponse":"SpecialWords.Models.withIs","specialwords.ModelsClient.withLambda":"SpecialWords.Models.withLambda","specialwords.ModelsClient.withLambdaWithResponse":"SpecialWords.Models.withLambda","specialwords.ModelsClient.withNot":"SpecialWords.Models.withNot","specialwords.ModelsClient.withNotWithResponse":"SpecialWords.Models.withNot","specialwords.ModelsClient.withOr":"SpecialWords.Models.withOr","specialwords.ModelsClient.withOrWithResponse":"SpecialWords.Models.withOr","specialwords.ModelsClient.withPass":"SpecialWords.Models.withPass","specialwords.ModelsClient.withPassWithResponse":"SpecialWords.Models.withPass","specialwords.ModelsClient.withRaise":"SpecialWords.Models.withRaise","specialwords.ModelsClient.withRaiseWithResponse":"SpecialWords.Models.withRaise","specialwords.ModelsClient.withReturn":"SpecialWords.Models.withReturn","specialwords.ModelsClient.withReturnWithResponse":"SpecialWords.Models.withReturn","specialwords.ModelsClient.withTry":"SpecialWords.Models.withTry","specialwords.ModelsClient.withTryWithResponse":"SpecialWords.Models.withTry","specialwords.ModelsClient.withWhile":"SpecialWords.Models.withWhile","specialwords.ModelsClient.withWhileWithResponse":"SpecialWords.Models.withWhile","specialwords.ModelsClient.withWith":"SpecialWords.Models.withWith","specialwords.ModelsClient.withWithWithResponse":"SpecialWords.Models.withWith","specialwords.ModelsClient.withYield":"SpecialWords.Models.withYield","specialwords.ModelsClient.withYieldWithResponse":"SpecialWords.Models.withYield","specialwords.OperationsAsyncClient":"SpecialWords.Operations","specialwords.OperationsAsyncClient.and":"SpecialWords.Operations.and","specialwords.OperationsAsyncClient.andWithResponse":"SpecialWords.Operations.and","specialwords.OperationsAsyncClient.as":"SpecialWords.Operations.as","specialwords.OperationsAsyncClient.asWithResponse":"SpecialWords.Operations.as","specialwords.OperationsAsyncClient.assertMethod":"SpecialWords.Operations.assert","specialwords.OperationsAsyncClient.assertMethodWithResponse":"SpecialWords.Operations.assert","specialwords.OperationsAsyncClient.async":"SpecialWords.Operations.async","specialwords.OperationsAsyncClient.asyncWithResponse":"SpecialWords.Operations.async","specialwords.OperationsAsyncClient.await":"SpecialWords.Operations.await","specialwords.OperationsAsyncClient.awaitWithResponse":"SpecialWords.Operations.await","specialwords.OperationsAsyncClient.breakMethod":"SpecialWords.Operations.break","specialwords.OperationsAsyncClient.breakMethodWithResponse":"SpecialWords.Operations.break","specialwords.OperationsAsyncClient.classMethod":"SpecialWords.Operations.class","specialwords.OperationsAsyncClient.classMethodWithResponse":"SpecialWords.Operations.class","specialwords.OperationsAsyncClient.constructor":"SpecialWords.Operations.constructor","specialwords.OperationsAsyncClient.constructorWithResponse":"SpecialWords.Operations.constructor","specialwords.OperationsAsyncClient.continueMethod":"SpecialWords.Operations.continue","specialwords.OperationsAsyncClient.continueMethodWithResponse":"SpecialWords.Operations.continue","specialwords.OperationsAsyncClient.def":"SpecialWords.Operations.def","specialwords.OperationsAsyncClient.defWithResponse":"SpecialWords.Operations.def","specialwords.OperationsAsyncClient.del":"SpecialWords.Operations.del","specialwords.OperationsAsyncClient.delWithResponse":"SpecialWords.Operations.del","specialwords.OperationsAsyncClient.elif":"SpecialWords.Operations.elif","specialwords.OperationsAsyncClient.elifWithResponse":"SpecialWords.Operations.elif","specialwords.OperationsAsyncClient.elseMethod":"SpecialWords.Operations.else","specialwords.OperationsAsyncClient.elseMethodWithResponse":"SpecialWords.Operations.else","specialwords.OperationsAsyncClient.except":"SpecialWords.Operations.except","specialwords.OperationsAsyncClient.exceptWithResponse":"SpecialWords.Operations.except","specialwords.OperationsAsyncClient.exec":"SpecialWords.Operations.exec","specialwords.OperationsAsyncClient.execWithResponse":"SpecialWords.Operations.exec","specialwords.OperationsAsyncClient.finallyMethod":"SpecialWords.Operations.finally","specialwords.OperationsAsyncClient.finallyMethodWithResponse":"SpecialWords.Operations.finally","specialwords.OperationsAsyncClient.forMethod":"SpecialWords.Operations.for","specialwords.OperationsAsyncClient.forMethodWithResponse":"SpecialWords.Operations.for","specialwords.OperationsAsyncClient.from":"SpecialWords.Operations.from","specialwords.OperationsAsyncClient.fromWithResponse":"SpecialWords.Operations.from","specialwords.OperationsAsyncClient.global":"SpecialWords.Operations.global","specialwords.OperationsAsyncClient.globalWithResponse":"SpecialWords.Operations.global","specialwords.OperationsAsyncClient.ifMethod":"SpecialWords.Operations.if","specialwords.OperationsAsyncClient.ifMethodWithResponse":"SpecialWords.Operations.if","specialwords.OperationsAsyncClient.importMethod":"SpecialWords.Operations.import","specialwords.OperationsAsyncClient.importMethodWithResponse":"SpecialWords.Operations.import","specialwords.OperationsAsyncClient.in":"SpecialWords.Operations.in","specialwords.OperationsAsyncClient.inWithResponse":"SpecialWords.Operations.in","specialwords.OperationsAsyncClient.is":"SpecialWords.Operations.is","specialwords.OperationsAsyncClient.isWithResponse":"SpecialWords.Operations.is","specialwords.OperationsAsyncClient.lambda":"SpecialWords.Operations.lambda","specialwords.OperationsAsyncClient.lambdaWithResponse":"SpecialWords.Operations.lambda","specialwords.OperationsAsyncClient.not":"SpecialWords.Operations.not","specialwords.OperationsAsyncClient.notWithResponse":"SpecialWords.Operations.not","specialwords.OperationsAsyncClient.or":"SpecialWords.Operations.or","specialwords.OperationsAsyncClient.orWithResponse":"SpecialWords.Operations.or","specialwords.OperationsAsyncClient.pass":"SpecialWords.Operations.pass","specialwords.OperationsAsyncClient.passWithResponse":"SpecialWords.Operations.pass","specialwords.OperationsAsyncClient.raise":"SpecialWords.Operations.raise","specialwords.OperationsAsyncClient.raiseWithResponse":"SpecialWords.Operations.raise","specialwords.OperationsAsyncClient.returnMethod":"SpecialWords.Operations.return","specialwords.OperationsAsyncClient.returnMethodWithResponse":"SpecialWords.Operations.return","specialwords.OperationsAsyncClient.tryMethod":"SpecialWords.Operations.try","specialwords.OperationsAsyncClient.tryMethodWithResponse":"SpecialWords.Operations.try","specialwords.OperationsAsyncClient.whileMethod":"SpecialWords.Operations.while","specialwords.OperationsAsyncClient.whileMethodWithResponse":"SpecialWords.Operations.while","specialwords.OperationsAsyncClient.with":"SpecialWords.Operations.with","specialwords.OperationsAsyncClient.withWithResponse":"SpecialWords.Operations.with","specialwords.OperationsAsyncClient.yield":"SpecialWords.Operations.yield","specialwords.OperationsAsyncClient.yieldWithResponse":"SpecialWords.Operations.yield","specialwords.OperationsClient":"SpecialWords.Operations","specialwords.OperationsClient.and":"SpecialWords.Operations.and","specialwords.OperationsClient.andWithResponse":"SpecialWords.Operations.and","specialwords.OperationsClient.as":"SpecialWords.Operations.as","specialwords.OperationsClient.asWithResponse":"SpecialWords.Operations.as","specialwords.OperationsClient.assertMethod":"SpecialWords.Operations.assert","specialwords.OperationsClient.assertMethodWithResponse":"SpecialWords.Operations.assert","specialwords.OperationsClient.async":"SpecialWords.Operations.async","specialwords.OperationsClient.asyncWithResponse":"SpecialWords.Operations.async","specialwords.OperationsClient.await":"SpecialWords.Operations.await","specialwords.OperationsClient.awaitWithResponse":"SpecialWords.Operations.await","specialwords.OperationsClient.breakMethod":"SpecialWords.Operations.break","specialwords.OperationsClient.breakMethodWithResponse":"SpecialWords.Operations.break","specialwords.OperationsClient.classMethod":"SpecialWords.Operations.class","specialwords.OperationsClient.classMethodWithResponse":"SpecialWords.Operations.class","specialwords.OperationsClient.constructor":"SpecialWords.Operations.constructor","specialwords.OperationsClient.constructorWithResponse":"SpecialWords.Operations.constructor","specialwords.OperationsClient.continueMethod":"SpecialWords.Operations.continue","specialwords.OperationsClient.continueMethodWithResponse":"SpecialWords.Operations.continue","specialwords.OperationsClient.def":"SpecialWords.Operations.def","specialwords.OperationsClient.defWithResponse":"SpecialWords.Operations.def","specialwords.OperationsClient.del":"SpecialWords.Operations.del","specialwords.OperationsClient.delWithResponse":"SpecialWords.Operations.del","specialwords.OperationsClient.elif":"SpecialWords.Operations.elif","specialwords.OperationsClient.elifWithResponse":"SpecialWords.Operations.elif","specialwords.OperationsClient.elseMethod":"SpecialWords.Operations.else","specialwords.OperationsClient.elseMethodWithResponse":"SpecialWords.Operations.else","specialwords.OperationsClient.except":"SpecialWords.Operations.except","specialwords.OperationsClient.exceptWithResponse":"SpecialWords.Operations.except","specialwords.OperationsClient.exec":"SpecialWords.Operations.exec","specialwords.OperationsClient.execWithResponse":"SpecialWords.Operations.exec","specialwords.OperationsClient.finallyMethod":"SpecialWords.Operations.finally","specialwords.OperationsClient.finallyMethodWithResponse":"SpecialWords.Operations.finally","specialwords.OperationsClient.forMethod":"SpecialWords.Operations.for","specialwords.OperationsClient.forMethodWithResponse":"SpecialWords.Operations.for","specialwords.OperationsClient.from":"SpecialWords.Operations.from","specialwords.OperationsClient.fromWithResponse":"SpecialWords.Operations.from","specialwords.OperationsClient.global":"SpecialWords.Operations.global","specialwords.OperationsClient.globalWithResponse":"SpecialWords.Operations.global","specialwords.OperationsClient.ifMethod":"SpecialWords.Operations.if","specialwords.OperationsClient.ifMethodWithResponse":"SpecialWords.Operations.if","specialwords.OperationsClient.importMethod":"SpecialWords.Operations.import","specialwords.OperationsClient.importMethodWithResponse":"SpecialWords.Operations.import","specialwords.OperationsClient.in":"SpecialWords.Operations.in","specialwords.OperationsClient.inWithResponse":"SpecialWords.Operations.in","specialwords.OperationsClient.is":"SpecialWords.Operations.is","specialwords.OperationsClient.isWithResponse":"SpecialWords.Operations.is","specialwords.OperationsClient.lambda":"SpecialWords.Operations.lambda","specialwords.OperationsClient.lambdaWithResponse":"SpecialWords.Operations.lambda","specialwords.OperationsClient.not":"SpecialWords.Operations.not","specialwords.OperationsClient.notWithResponse":"SpecialWords.Operations.not","specialwords.OperationsClient.or":"SpecialWords.Operations.or","specialwords.OperationsClient.orWithResponse":"SpecialWords.Operations.or","specialwords.OperationsClient.pass":"SpecialWords.Operations.pass","specialwords.OperationsClient.passWithResponse":"SpecialWords.Operations.pass","specialwords.OperationsClient.raise":"SpecialWords.Operations.raise","specialwords.OperationsClient.raiseWithResponse":"SpecialWords.Operations.raise","specialwords.OperationsClient.returnMethod":"SpecialWords.Operations.return","specialwords.OperationsClient.returnMethodWithResponse":"SpecialWords.Operations.return","specialwords.OperationsClient.tryMethod":"SpecialWords.Operations.try","specialwords.OperationsClient.tryMethodWithResponse":"SpecialWords.Operations.try","specialwords.OperationsClient.whileMethod":"SpecialWords.Operations.while","specialwords.OperationsClient.whileMethodWithResponse":"SpecialWords.Operations.while","specialwords.OperationsClient.with":"SpecialWords.Operations.with","specialwords.OperationsClient.withWithResponse":"SpecialWords.Operations.with","specialwords.OperationsClient.yield":"SpecialWords.Operations.yield","specialwords.OperationsClient.yieldWithResponse":"SpecialWords.Operations.yield","specialwords.ParametersAsyncClient":"SpecialWords.Parameters","specialwords.ParametersAsyncClient.withAnd":"SpecialWords.Parameters.withAnd","specialwords.ParametersAsyncClient.withAndWithResponse":"SpecialWords.Parameters.withAnd","specialwords.ParametersAsyncClient.withAs":"SpecialWords.Parameters.withAs","specialwords.ParametersAsyncClient.withAsWithResponse":"SpecialWords.Parameters.withAs","specialwords.ParametersAsyncClient.withAssert":"SpecialWords.Parameters.withAssert","specialwords.ParametersAsyncClient.withAssertWithResponse":"SpecialWords.Parameters.withAssert","specialwords.ParametersAsyncClient.withAsyncWithResponse":"SpecialWords.Parameters.withAsync","specialwords.ParametersAsyncClient.withAwait":"SpecialWords.Parameters.withAwait","specialwords.ParametersAsyncClient.withAwaitWithResponse":"SpecialWords.Parameters.withAwait","specialwords.ParametersAsyncClient.withBreak":"SpecialWords.Parameters.withBreak","specialwords.ParametersAsyncClient.withBreakWithResponse":"SpecialWords.Parameters.withBreak","specialwords.ParametersAsyncClient.withCancellationToken":"SpecialWords.Parameters.withCancellationToken","specialwords.ParametersAsyncClient.withCancellationTokenWithResponse":"SpecialWords.Parameters.withCancellationToken","specialwords.ParametersAsyncClient.withClass":"SpecialWords.Parameters.withClass","specialwords.ParametersAsyncClient.withClassWithResponse":"SpecialWords.Parameters.withClass","specialwords.ParametersAsyncClient.withConstructor":"SpecialWords.Parameters.withConstructor","specialwords.ParametersAsyncClient.withConstructorWithResponse":"SpecialWords.Parameters.withConstructor","specialwords.ParametersAsyncClient.withContinue":"SpecialWords.Parameters.withContinue","specialwords.ParametersAsyncClient.withContinueWithResponse":"SpecialWords.Parameters.withContinue","specialwords.ParametersAsyncClient.withDef":"SpecialWords.Parameters.withDef","specialwords.ParametersAsyncClient.withDefWithResponse":"SpecialWords.Parameters.withDef","specialwords.ParametersAsyncClient.withDel":"SpecialWords.Parameters.withDel","specialwords.ParametersAsyncClient.withDelWithResponse":"SpecialWords.Parameters.withDel","specialwords.ParametersAsyncClient.withElif":"SpecialWords.Parameters.withElif","specialwords.ParametersAsyncClient.withElifWithResponse":"SpecialWords.Parameters.withElif","specialwords.ParametersAsyncClient.withElse":"SpecialWords.Parameters.withElse","specialwords.ParametersAsyncClient.withElseWithResponse":"SpecialWords.Parameters.withElse","specialwords.ParametersAsyncClient.withExcept":"SpecialWords.Parameters.withExcept","specialwords.ParametersAsyncClient.withExceptWithResponse":"SpecialWords.Parameters.withExcept","specialwords.ParametersAsyncClient.withExec":"SpecialWords.Parameters.withExec","specialwords.ParametersAsyncClient.withExecWithResponse":"SpecialWords.Parameters.withExec","specialwords.ParametersAsyncClient.withFinally":"SpecialWords.Parameters.withFinally","specialwords.ParametersAsyncClient.withFinallyWithResponse":"SpecialWords.Parameters.withFinally","specialwords.ParametersAsyncClient.withFor":"SpecialWords.Parameters.withFor","specialwords.ParametersAsyncClient.withForWithResponse":"SpecialWords.Parameters.withFor","specialwords.ParametersAsyncClient.withFrom":"SpecialWords.Parameters.withFrom","specialwords.ParametersAsyncClient.withFromWithResponse":"SpecialWords.Parameters.withFrom","specialwords.ParametersAsyncClient.withGlobal":"SpecialWords.Parameters.withGlobal","specialwords.ParametersAsyncClient.withGlobalWithResponse":"SpecialWords.Parameters.withGlobal","specialwords.ParametersAsyncClient.withIf":"SpecialWords.Parameters.withIf","specialwords.ParametersAsyncClient.withIfWithResponse":"SpecialWords.Parameters.withIf","specialwords.ParametersAsyncClient.withImport":"SpecialWords.Parameters.withImport","specialwords.ParametersAsyncClient.withImportWithResponse":"SpecialWords.Parameters.withImport","specialwords.ParametersAsyncClient.withIn":"SpecialWords.Parameters.withIn","specialwords.ParametersAsyncClient.withInWithResponse":"SpecialWords.Parameters.withIn","specialwords.ParametersAsyncClient.withIs":"SpecialWords.Parameters.withIs","specialwords.ParametersAsyncClient.withIsWithResponse":"SpecialWords.Parameters.withIs","specialwords.ParametersAsyncClient.withLambda":"SpecialWords.Parameters.withLambda","specialwords.ParametersAsyncClient.withLambdaWithResponse":"SpecialWords.Parameters.withLambda","specialwords.ParametersAsyncClient.withNot":"SpecialWords.Parameters.withNot","specialwords.ParametersAsyncClient.withNotWithResponse":"SpecialWords.Parameters.withNot","specialwords.ParametersAsyncClient.withOr":"SpecialWords.Parameters.withOr","specialwords.ParametersAsyncClient.withOrWithResponse":"SpecialWords.Parameters.withOr","specialwords.ParametersAsyncClient.withPass":"SpecialWords.Parameters.withPass","specialwords.ParametersAsyncClient.withPassWithResponse":"SpecialWords.Parameters.withPass","specialwords.ParametersAsyncClient.withRaise":"SpecialWords.Parameters.withRaise","specialwords.ParametersAsyncClient.withRaiseWithResponse":"SpecialWords.Parameters.withRaise","specialwords.ParametersAsyncClient.withReturn":"SpecialWords.Parameters.withReturn","specialwords.ParametersAsyncClient.withReturnWithResponse":"SpecialWords.Parameters.withReturn","specialwords.ParametersAsyncClient.withTry":"SpecialWords.Parameters.withTry","specialwords.ParametersAsyncClient.withTryWithResponse":"SpecialWords.Parameters.withTry","specialwords.ParametersAsyncClient.withWhile":"SpecialWords.Parameters.withWhile","specialwords.ParametersAsyncClient.withWhileWithResponse":"SpecialWords.Parameters.withWhile","specialwords.ParametersAsyncClient.withWith":"SpecialWords.Parameters.withWith","specialwords.ParametersAsyncClient.withWithWithResponse":"SpecialWords.Parameters.withWith","specialwords.ParametersAsyncClient.withYield":"SpecialWords.Parameters.withYield","specialwords.ParametersAsyncClient.withYieldWithResponse":"SpecialWords.Parameters.withYield","specialwords.ParametersClient":"SpecialWords.Parameters","specialwords.ParametersClient.withAnd":"SpecialWords.Parameters.withAnd","specialwords.ParametersClient.withAndWithResponse":"SpecialWords.Parameters.withAnd","specialwords.ParametersClient.withAs":"SpecialWords.Parameters.withAs","specialwords.ParametersClient.withAsWithResponse":"SpecialWords.Parameters.withAs","specialwords.ParametersClient.withAssert":"SpecialWords.Parameters.withAssert","specialwords.ParametersClient.withAssertWithResponse":"SpecialWords.Parameters.withAssert","specialwords.ParametersClient.withAsyncWithResponse":"SpecialWords.Parameters.withAsync","specialwords.ParametersClient.withAwait":"SpecialWords.Parameters.withAwait","specialwords.ParametersClient.withAwaitWithResponse":"SpecialWords.Parameters.withAwait","specialwords.ParametersClient.withBreak":"SpecialWords.Parameters.withBreak","specialwords.ParametersClient.withBreakWithResponse":"SpecialWords.Parameters.withBreak","specialwords.ParametersClient.withCancellationToken":"SpecialWords.Parameters.withCancellationToken","specialwords.ParametersClient.withCancellationTokenWithResponse":"SpecialWords.Parameters.withCancellationToken","specialwords.ParametersClient.withClass":"SpecialWords.Parameters.withClass","specialwords.ParametersClient.withClassWithResponse":"SpecialWords.Parameters.withClass","specialwords.ParametersClient.withConstructor":"SpecialWords.Parameters.withConstructor","specialwords.ParametersClient.withConstructorWithResponse":"SpecialWords.Parameters.withConstructor","specialwords.ParametersClient.withContinue":"SpecialWords.Parameters.withContinue","specialwords.ParametersClient.withContinueWithResponse":"SpecialWords.Parameters.withContinue","specialwords.ParametersClient.withDef":"SpecialWords.Parameters.withDef","specialwords.ParametersClient.withDefWithResponse":"SpecialWords.Parameters.withDef","specialwords.ParametersClient.withDel":"SpecialWords.Parameters.withDel","specialwords.ParametersClient.withDelWithResponse":"SpecialWords.Parameters.withDel","specialwords.ParametersClient.withElif":"SpecialWords.Parameters.withElif","specialwords.ParametersClient.withElifWithResponse":"SpecialWords.Parameters.withElif","specialwords.ParametersClient.withElse":"SpecialWords.Parameters.withElse","specialwords.ParametersClient.withElseWithResponse":"SpecialWords.Parameters.withElse","specialwords.ParametersClient.withExcept":"SpecialWords.Parameters.withExcept","specialwords.ParametersClient.withExceptWithResponse":"SpecialWords.Parameters.withExcept","specialwords.ParametersClient.withExec":"SpecialWords.Parameters.withExec","specialwords.ParametersClient.withExecWithResponse":"SpecialWords.Parameters.withExec","specialwords.ParametersClient.withFinally":"SpecialWords.Parameters.withFinally","specialwords.ParametersClient.withFinallyWithResponse":"SpecialWords.Parameters.withFinally","specialwords.ParametersClient.withFor":"SpecialWords.Parameters.withFor","specialwords.ParametersClient.withForWithResponse":"SpecialWords.Parameters.withFor","specialwords.ParametersClient.withFrom":"SpecialWords.Parameters.withFrom","specialwords.ParametersClient.withFromWithResponse":"SpecialWords.Parameters.withFrom","specialwords.ParametersClient.withGlobal":"SpecialWords.Parameters.withGlobal","specialwords.ParametersClient.withGlobalWithResponse":"SpecialWords.Parameters.withGlobal","specialwords.ParametersClient.withIf":"SpecialWords.Parameters.withIf","specialwords.ParametersClient.withIfWithResponse":"SpecialWords.Parameters.withIf","specialwords.ParametersClient.withImport":"SpecialWords.Parameters.withImport","specialwords.ParametersClient.withImportWithResponse":"SpecialWords.Parameters.withImport","specialwords.ParametersClient.withIn":"SpecialWords.Parameters.withIn","specialwords.ParametersClient.withInWithResponse":"SpecialWords.Parameters.withIn","specialwords.ParametersClient.withIs":"SpecialWords.Parameters.withIs","specialwords.ParametersClient.withIsWithResponse":"SpecialWords.Parameters.withIs","specialwords.ParametersClient.withLambda":"SpecialWords.Parameters.withLambda","specialwords.ParametersClient.withLambdaWithResponse":"SpecialWords.Parameters.withLambda","specialwords.ParametersClient.withNot":"SpecialWords.Parameters.withNot","specialwords.ParametersClient.withNotWithResponse":"SpecialWords.Parameters.withNot","specialwords.ParametersClient.withOr":"SpecialWords.Parameters.withOr","specialwords.ParametersClient.withOrWithResponse":"SpecialWords.Parameters.withOr","specialwords.ParametersClient.withPass":"SpecialWords.Parameters.withPass","specialwords.ParametersClient.withPassWithResponse":"SpecialWords.Parameters.withPass","specialwords.ParametersClient.withRaise":"SpecialWords.Parameters.withRaise","specialwords.ParametersClient.withRaiseWithResponse":"SpecialWords.Parameters.withRaise","specialwords.ParametersClient.withReturn":"SpecialWords.Parameters.withReturn","specialwords.ParametersClient.withReturnWithResponse":"SpecialWords.Parameters.withReturn","specialwords.ParametersClient.withTry":"SpecialWords.Parameters.withTry","specialwords.ParametersClient.withTryWithResponse":"SpecialWords.Parameters.withTry","specialwords.ParametersClient.withWhile":"SpecialWords.Parameters.withWhile","specialwords.ParametersClient.withWhileWithResponse":"SpecialWords.Parameters.withWhile","specialwords.ParametersClient.withWith":"SpecialWords.Parameters.withWith","specialwords.ParametersClient.withWithWithResponse":"SpecialWords.Parameters.withWith","specialwords.ParametersClient.withYield":"SpecialWords.Parameters.withYield","specialwords.ParametersClient.withYieldWithResponse":"SpecialWords.Parameters.withYield","specialwords.SpecialWordsClientBuilder":"SpecialWords","specialwords.extensiblestrings.models.ExtensibleString":"SpecialWords.ExtensibleStrings.ExtensibleString","specialwords.modelproperties.models.DictMethods":"SpecialWords.ModelProperties.DictMethods","specialwords.modelproperties.models.ModelWithList":"SpecialWords.ModelProperties.ModelWithList","specialwords.modelproperties.models.SameAsModel":"SpecialWords.ModelProperties.SameAsModel","specialwords.models.models.And":"SpecialWords.Models.and","specialwords.models.models.As":"SpecialWords.Models.as","specialwords.models.models.Assert":"SpecialWords.Models.assert","specialwords.models.models.Async":"SpecialWords.Models.async","specialwords.models.models.Await":"SpecialWords.Models.await","specialwords.models.models.Break":"SpecialWords.Models.break","specialwords.models.models.ClassModel":"SpecialWords.Models.class","specialwords.models.models.Constructor":"SpecialWords.Models.constructor","specialwords.models.models.Continue":"SpecialWords.Models.continue","specialwords.models.models.Def":"SpecialWords.Models.def","specialwords.models.models.Del":"SpecialWords.Models.del","specialwords.models.models.Elif":"SpecialWords.Models.elif","specialwords.models.models.Else":"SpecialWords.Models.else","specialwords.models.models.Except":"SpecialWords.Models.except","specialwords.models.models.Exec":"SpecialWords.Models.exec","specialwords.models.models.Finally":"SpecialWords.Models.finally","specialwords.models.models.For":"SpecialWords.Models.for","specialwords.models.models.From":"SpecialWords.Models.from","specialwords.models.models.Global":"SpecialWords.Models.global","specialwords.models.models.If":"SpecialWords.Models.if","specialwords.models.models.Import":"SpecialWords.Models.import","specialwords.models.models.In":"SpecialWords.Models.in","specialwords.models.models.Is":"SpecialWords.Models.is","specialwords.models.models.Lambda":"SpecialWords.Models.lambda","specialwords.models.models.Not":"SpecialWords.Models.not","specialwords.models.models.Or":"SpecialWords.Models.or","specialwords.models.models.Pass":"SpecialWords.Models.pass","specialwords.models.models.Raise":"SpecialWords.Models.raise","specialwords.models.models.Return":"SpecialWords.Models.return","specialwords.models.models.Try":"SpecialWords.Models.try","specialwords.models.models.While":"SpecialWords.Models.while","specialwords.models.models.With":"SpecialWords.Models.with","specialwords.models.models.Yield":"SpecialWords.Models.yield"},"generatedFiles":["src/main/java/module-info.java","src/main/java/specialwords/ExtensibleStringsAsyncClient.java","src/main/java/specialwords/ExtensibleStringsClient.java","src/main/java/specialwords/ModelPropertiesAsyncClient.java","src/main/java/specialwords/ModelPropertiesClient.java","src/main/java/specialwords/ModelsAsyncClient.java","src/main/java/specialwords/ModelsClient.java","src/main/java/specialwords/OperationsAsyncClient.java","src/main/java/specialwords/OperationsClient.java","src/main/java/specialwords/ParametersAsyncClient.java","src/main/java/specialwords/ParametersClient.java","src/main/java/specialwords/SpecialWordsClientBuilder.java","src/main/java/specialwords/extensiblestrings/models/ExtensibleString.java","src/main/java/specialwords/extensiblestrings/models/package-info.java","src/main/java/specialwords/implementation/ExtensibleStringsImpl.java","src/main/java/specialwords/implementation/ModelPropertiesImpl.java","src/main/java/specialwords/implementation/ModelsImpl.java","src/main/java/specialwords/implementation/OperationsImpl.java","src/main/java/specialwords/implementation/ParametersImpl.java","src/main/java/specialwords/implementation/SpecialWordsClientImpl.java","src/main/java/specialwords/implementation/package-info.java","src/main/java/specialwords/modelproperties/models/DictMethods.java","src/main/java/specialwords/modelproperties/models/ModelWithList.java","src/main/java/specialwords/modelproperties/models/SameAsModel.java","src/main/java/specialwords/modelproperties/models/package-info.java","src/main/java/specialwords/models/models/And.java","src/main/java/specialwords/models/models/As.java","src/main/java/specialwords/models/models/Assert.java","src/main/java/specialwords/models/models/Async.java","src/main/java/specialwords/models/models/Await.java","src/main/java/specialwords/models/models/Break.java","src/main/java/specialwords/models/models/ClassModel.java","src/main/java/specialwords/models/models/Constructor.java","src/main/java/specialwords/models/models/Continue.java","src/main/java/specialwords/models/models/Def.java","src/main/java/specialwords/models/models/Del.java","src/main/java/specialwords/models/models/Elif.java","src/main/java/specialwords/models/models/Else.java","src/main/java/specialwords/models/models/Except.java","src/main/java/specialwords/models/models/Exec.java","src/main/java/specialwords/models/models/Finally.java","src/main/java/specialwords/models/models/For.java","src/main/java/specialwords/models/models/From.java","src/main/java/specialwords/models/models/Global.java","src/main/java/specialwords/models/models/If.java","src/main/java/specialwords/models/models/Import.java","src/main/java/specialwords/models/models/In.java","src/main/java/specialwords/models/models/Is.java","src/main/java/specialwords/models/models/Lambda.java","src/main/java/specialwords/models/models/Not.java","src/main/java/specialwords/models/models/Or.java","src/main/java/specialwords/models/models/Pass.java","src/main/java/specialwords/models/models/Raise.java","src/main/java/specialwords/models/models/Return.java","src/main/java/specialwords/models/models/Try.java","src/main/java/specialwords/models/models/While.java","src/main/java/specialwords/models/models/With.java","src/main/java/specialwords/models/models/Yield.java","src/main/java/specialwords/models/models/package-info.java","src/main/java/specialwords/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/streaming-jsonl_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/streaming-jsonl_apiview_properties.json deleted file mode 100644 index 3deb2426e93..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/streaming-jsonl_apiview_properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "streaming.jsonl.JsonlAsyncClient": "Streaming.Jsonl.Basic", - "streaming.jsonl.JsonlAsyncClient.receive": "Streaming.Jsonl.Basic.receive", - "streaming.jsonl.JsonlAsyncClient.receiveWithResponse": "Streaming.Jsonl.Basic.receive", - "streaming.jsonl.JsonlAsyncClient.send": "Streaming.Jsonl.Basic.send", - "streaming.jsonl.JsonlAsyncClient.sendWithResponse": "Streaming.Jsonl.Basic.send", - "streaming.jsonl.JsonlClient": "Streaming.Jsonl.Basic", - "streaming.jsonl.JsonlClient.receive": "Streaming.Jsonl.Basic.receive", - "streaming.jsonl.JsonlClient.receiveWithResponse": "Streaming.Jsonl.Basic.receive", - "streaming.jsonl.JsonlClient.send": "Streaming.Jsonl.Basic.send", - "streaming.jsonl.JsonlClient.sendWithResponse": "Streaming.Jsonl.Basic.send", - "streaming.jsonl.JsonlClientBuilder": "Streaming.Jsonl" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/streaming-jsonl_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/streaming-jsonl_metadata.json index 28c0c75f2ce..0ae0f8f0224 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/streaming-jsonl_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/streaming-jsonl_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"streaming.jsonl.JsonlAsyncClient":"Streaming.Jsonl.Basic","streaming.jsonl.JsonlAsyncClient.receive":"Streaming.Jsonl.Basic.receive","streaming.jsonl.JsonlAsyncClient.receiveWithResponse":"Streaming.Jsonl.Basic.receive","streaming.jsonl.JsonlAsyncClient.send":"Streaming.Jsonl.Basic.send","streaming.jsonl.JsonlAsyncClient.sendWithResponse":"Streaming.Jsonl.Basic.send","streaming.jsonl.JsonlClient":"Streaming.Jsonl.Basic","streaming.jsonl.JsonlClient.receive":"Streaming.Jsonl.Basic.receive","streaming.jsonl.JsonlClient.receiveWithResponse":"Streaming.Jsonl.Basic.receive","streaming.jsonl.JsonlClient.send":"Streaming.Jsonl.Basic.send","streaming.jsonl.JsonlClient.sendWithResponse":"Streaming.Jsonl.Basic.send","streaming.jsonl.JsonlClientBuilder":"Streaming.Jsonl"},"generatedFiles":["src/main/java/module-info.java","src/main/java/streaming/jsonl/JsonlAsyncClient.java","src/main/java/streaming/jsonl/JsonlClient.java","src/main/java/streaming/jsonl/JsonlClientBuilder.java","src/main/java/streaming/jsonl/implementation/BasicsImpl.java","src/main/java/streaming/jsonl/implementation/JsonlClientImpl.java","src/main/java/streaming/jsonl/implementation/package-info.java","src/main/java/streaming/jsonl/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"streaming.jsonl.JsonlAsyncClient":"Streaming.Jsonl.Basic","streaming.jsonl.JsonlAsyncClient.receive":"Streaming.Jsonl.Basic.receive","streaming.jsonl.JsonlAsyncClient.receiveWithResponse":"Streaming.Jsonl.Basic.receive","streaming.jsonl.JsonlAsyncClient.send":"Streaming.Jsonl.Basic.send","streaming.jsonl.JsonlAsyncClient.sendWithResponse":"Streaming.Jsonl.Basic.send","streaming.jsonl.JsonlClient":"Streaming.Jsonl.Basic","streaming.jsonl.JsonlClient.receive":"Streaming.Jsonl.Basic.receive","streaming.jsonl.JsonlClient.receiveWithResponse":"Streaming.Jsonl.Basic.receive","streaming.jsonl.JsonlClient.send":"Streaming.Jsonl.Basic.send","streaming.jsonl.JsonlClient.sendWithResponse":"Streaming.Jsonl.Basic.send","streaming.jsonl.JsonlClientBuilder":"Streaming.Jsonl"},"generatedFiles":["src/main/java/module-info.java","src/main/java/streaming/jsonl/JsonlAsyncClient.java","src/main/java/streaming/jsonl/JsonlClient.java","src/main/java/streaming/jsonl/JsonlClientBuilder.java","src/main/java/streaming/jsonl/implementation/BasicsImpl.java","src/main/java/streaming/jsonl/implementation/JsonlClientImpl.java","src/main/java/streaming/jsonl/implementation/package-info.java","src/main/java/streaming/jsonl/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-builtin_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-builtin_apiview_properties.json deleted file mode 100644 index 4f2f513124e..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-builtin_apiview_properties.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.builtin.BuiltinAsyncClient": "TspTest.Builtin.BuiltinOp", - "tsptest.builtin.BuiltinAsyncClient.read": "TspTest.Builtin.BuiltinOp.read", - "tsptest.builtin.BuiltinAsyncClient.readWithResponse": "TspTest.Builtin.BuiltinOp.read", - "tsptest.builtin.BuiltinAsyncClient.write": "TspTest.Builtin.BuiltinOp.write", - "tsptest.builtin.BuiltinAsyncClient.writeWithResponse": "TspTest.Builtin.BuiltinOp.write", - "tsptest.builtin.BuiltinClient": "TspTest.Builtin.BuiltinOp", - "tsptest.builtin.BuiltinClient.read": "TspTest.Builtin.BuiltinOp.read", - "tsptest.builtin.BuiltinClient.readWithResponse": "TspTest.Builtin.BuiltinOp.read", - "tsptest.builtin.BuiltinClient.write": "TspTest.Builtin.BuiltinOp.write", - "tsptest.builtin.BuiltinClient.writeWithResponse": "TspTest.Builtin.BuiltinOp.write", - "tsptest.builtin.BuiltinClientBuilder": "TspTest.Builtin", - "tsptest.builtin.models.Builtin": "TspTest.Builtin.Builtin", - "tsptest.builtin.models.Encoded": "TspTest.Builtin.Encoded" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-builtin_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-builtin_metadata.json index 8e0acdcd6f0..71ccbc9b63f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-builtin_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-builtin_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.builtin.BuiltinAsyncClient":"TspTest.Builtin.BuiltinOp","tsptest.builtin.BuiltinAsyncClient.read":"TspTest.Builtin.BuiltinOp.read","tsptest.builtin.BuiltinAsyncClient.readWithResponse":"TspTest.Builtin.BuiltinOp.read","tsptest.builtin.BuiltinAsyncClient.write":"TspTest.Builtin.BuiltinOp.write","tsptest.builtin.BuiltinAsyncClient.writeWithResponse":"TspTest.Builtin.BuiltinOp.write","tsptest.builtin.BuiltinClient":"TspTest.Builtin.BuiltinOp","tsptest.builtin.BuiltinClient.read":"TspTest.Builtin.BuiltinOp.read","tsptest.builtin.BuiltinClient.readWithResponse":"TspTest.Builtin.BuiltinOp.read","tsptest.builtin.BuiltinClient.write":"TspTest.Builtin.BuiltinOp.write","tsptest.builtin.BuiltinClient.writeWithResponse":"TspTest.Builtin.BuiltinOp.write","tsptest.builtin.BuiltinClientBuilder":"TspTest.Builtin","tsptest.builtin.models.Builtin":"TspTest.Builtin.Builtin","tsptest.builtin.models.Encoded":"TspTest.Builtin.Encoded"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/builtin/BuiltinAsyncClient.java","src/main/java/tsptest/builtin/BuiltinClient.java","src/main/java/tsptest/builtin/BuiltinClientBuilder.java","src/main/java/tsptest/builtin/implementation/BuiltinClientImpl.java","src/main/java/tsptest/builtin/implementation/BuiltinOpsImpl.java","src/main/java/tsptest/builtin/implementation/package-info.java","src/main/java/tsptest/builtin/models/Builtin.java","src/main/java/tsptest/builtin/models/Encoded.java","src/main/java/tsptest/builtin/models/package-info.java","src/main/java/tsptest/builtin/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.builtin.BuiltinAsyncClient":"TspTest.Builtin.BuiltinOp","tsptest.builtin.BuiltinAsyncClient.read":"TspTest.Builtin.BuiltinOp.read","tsptest.builtin.BuiltinAsyncClient.readWithResponse":"TspTest.Builtin.BuiltinOp.read","tsptest.builtin.BuiltinAsyncClient.write":"TspTest.Builtin.BuiltinOp.write","tsptest.builtin.BuiltinAsyncClient.writeWithResponse":"TspTest.Builtin.BuiltinOp.write","tsptest.builtin.BuiltinClient":"TspTest.Builtin.BuiltinOp","tsptest.builtin.BuiltinClient.read":"TspTest.Builtin.BuiltinOp.read","tsptest.builtin.BuiltinClient.readWithResponse":"TspTest.Builtin.BuiltinOp.read","tsptest.builtin.BuiltinClient.write":"TspTest.Builtin.BuiltinOp.write","tsptest.builtin.BuiltinClient.writeWithResponse":"TspTest.Builtin.BuiltinOp.write","tsptest.builtin.BuiltinClientBuilder":"TspTest.Builtin","tsptest.builtin.models.Builtin":"TspTest.Builtin.Builtin","tsptest.builtin.models.Encoded":"TspTest.Builtin.Encoded"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/builtin/BuiltinAsyncClient.java","src/main/java/tsptest/builtin/BuiltinClient.java","src/main/java/tsptest/builtin/BuiltinClientBuilder.java","src/main/java/tsptest/builtin/implementation/BuiltinClientImpl.java","src/main/java/tsptest/builtin/implementation/BuiltinOpsImpl.java","src/main/java/tsptest/builtin/implementation/package-info.java","src/main/java/tsptest/builtin/models/Builtin.java","src/main/java/tsptest/builtin/models/Encoded.java","src/main/java/tsptest/builtin/models/package-info.java","src/main/java/tsptest/builtin/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-discriminatoredgecases_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-discriminatoredgecases_apiview_properties.json deleted file mode 100644 index 155252204bc..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-discriminatoredgecases_apiview_properties.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.discriminatoredgecases.DiscriminatorEdgeCasesAsyncClient": "TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp", - "tsptest.discriminatoredgecases.DiscriminatorEdgeCasesAsyncClient.getChildNewDiscrim": "TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildNewDiscrim", - "tsptest.discriminatoredgecases.DiscriminatorEdgeCasesAsyncClient.getChildNewDiscrimWithResponse": "TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildNewDiscrim", - "tsptest.discriminatoredgecases.DiscriminatorEdgeCasesAsyncClient.getChildRequiredDiscrim": "TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildRequiredDiscrim", - "tsptest.discriminatoredgecases.DiscriminatorEdgeCasesAsyncClient.getChildRequiredDiscrimWithResponse": "TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildRequiredDiscrim", - "tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClient": "TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp", - "tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClient.getChildNewDiscrim": "TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildNewDiscrim", - "tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClient.getChildNewDiscrimWithResponse": "TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildNewDiscrim", - "tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClient.getChildRequiredDiscrim": "TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildRequiredDiscrim", - "tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClient.getChildRequiredDiscrimWithResponse": "TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildRequiredDiscrim", - "tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClientBuilder": "TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp", - "tsptest.discriminatoredgecases.models.ChildWithAnotherDiscriminator": "TspTest.DiscriminatorEdgeCases.ChildWithAnotherDiscriminator", - "tsptest.discriminatoredgecases.models.ChildWithRequiredPropertyAsDiscriminator": "TspTest.DiscriminatorEdgeCases.ChildWithRequiredPropertyAsDiscriminator", - "tsptest.discriminatoredgecases.models.GrandChildWithAnotherDiscriminator": "TspTest.DiscriminatorEdgeCases.GrandChildWithAnotherDiscriminator", - "tsptest.discriminatoredgecases.models.GrandChildWithRequiredProperty": "TspTest.DiscriminatorEdgeCases.GrandChildWithRequiredProperty", - "tsptest.discriminatoredgecases.models.ParentWithRequiredProperty": "TspTest.DiscriminatorEdgeCases.ParentWithRequiredProperty" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-discriminatoredgecases_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-discriminatoredgecases_metadata.json index e873bad3cba..033bf4bc493 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-discriminatoredgecases_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-discriminatoredgecases_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.discriminatoredgecases.DiscriminatorEdgeCasesAsyncClient":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesAsyncClient.getChildNewDiscrim":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildNewDiscrim","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesAsyncClient.getChildNewDiscrimWithResponse":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildNewDiscrim","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesAsyncClient.getChildRequiredDiscrim":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildRequiredDiscrim","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesAsyncClient.getChildRequiredDiscrimWithResponse":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildRequiredDiscrim","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClient":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClient.getChildNewDiscrim":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildNewDiscrim","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClient.getChildNewDiscrimWithResponse":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildNewDiscrim","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClient.getChildRequiredDiscrim":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildRequiredDiscrim","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClient.getChildRequiredDiscrimWithResponse":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildRequiredDiscrim","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClientBuilder":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp","tsptest.discriminatoredgecases.models.ChildWithAnotherDiscriminator":"TspTest.DiscriminatorEdgeCases.ChildWithAnotherDiscriminator","tsptest.discriminatoredgecases.models.ChildWithRequiredPropertyAsDiscriminator":"TspTest.DiscriminatorEdgeCases.ChildWithRequiredPropertyAsDiscriminator","tsptest.discriminatoredgecases.models.GrandChildWithAnotherDiscriminator":"TspTest.DiscriminatorEdgeCases.GrandChildWithAnotherDiscriminator","tsptest.discriminatoredgecases.models.GrandChildWithRequiredProperty":"TspTest.DiscriminatorEdgeCases.GrandChildWithRequiredProperty","tsptest.discriminatoredgecases.models.ParentWithRequiredProperty":"TspTest.DiscriminatorEdgeCases.ParentWithRequiredProperty"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesAsyncClient.java","src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesClient.java","src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesClientBuilder.java","src/main/java/tsptest/discriminatoredgecases/implementation/DiscriminatorEdgeCasesClientImpl.java","src/main/java/tsptest/discriminatoredgecases/implementation/package-info.java","src/main/java/tsptest/discriminatoredgecases/models/ChildWithAnotherDiscriminator.java","src/main/java/tsptest/discriminatoredgecases/models/ChildWithRequiredPropertyAsDiscriminator.java","src/main/java/tsptest/discriminatoredgecases/models/GrandChildWithAnotherDiscriminator.java","src/main/java/tsptest/discriminatoredgecases/models/GrandChildWithRequiredProperty.java","src/main/java/tsptest/discriminatoredgecases/models/ParentWithRequiredProperty.java","src/main/java/tsptest/discriminatoredgecases/models/package-info.java","src/main/java/tsptest/discriminatoredgecases/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.discriminatoredgecases.DiscriminatorEdgeCasesAsyncClient":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesAsyncClient.getChildNewDiscrim":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildNewDiscrim","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesAsyncClient.getChildNewDiscrimWithResponse":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildNewDiscrim","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesAsyncClient.getChildRequiredDiscrim":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildRequiredDiscrim","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesAsyncClient.getChildRequiredDiscrimWithResponse":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildRequiredDiscrim","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesAsyncClient.getNoSubtypes":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getNoSubtypes","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesAsyncClient.getNoSubtypesWithResponse":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getNoSubtypes","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClient":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClient.getChildNewDiscrim":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildNewDiscrim","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClient.getChildNewDiscrimWithResponse":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildNewDiscrim","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClient.getChildRequiredDiscrim":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildRequiredDiscrim","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClient.getChildRequiredDiscrimWithResponse":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getChildRequiredDiscrim","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClient.getNoSubtypes":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getNoSubtypes","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClient.getNoSubtypesWithResponse":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp.getNoSubtypes","tsptest.discriminatoredgecases.DiscriminatorEdgeCasesClientBuilder":"TspTest.DiscriminatorEdgeCases.DiscriminatorEdgeCasesOp","tsptest.discriminatoredgecases.models.ChildWithAnotherDiscriminator":"TspTest.DiscriminatorEdgeCases.ChildWithAnotherDiscriminator","tsptest.discriminatoredgecases.models.ChildWithRequiredPropertyAsDiscriminator":"TspTest.DiscriminatorEdgeCases.ChildWithRequiredPropertyAsDiscriminator","tsptest.discriminatoredgecases.models.GrandChildWithAnotherDiscriminator":"TspTest.DiscriminatorEdgeCases.GrandChildWithAnotherDiscriminator","tsptest.discriminatoredgecases.models.GrandChildWithRequiredProperty":"TspTest.DiscriminatorEdgeCases.GrandChildWithRequiredProperty","tsptest.discriminatoredgecases.models.ModelWithDiscriminatorNoSubtypes":"TspTest.DiscriminatorEdgeCases.ModelWithDiscriminatorNoSubtypes","tsptest.discriminatoredgecases.models.ParentWithRequiredProperty":"TspTest.DiscriminatorEdgeCases.ParentWithRequiredProperty"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesAsyncClient.java","src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesClient.java","src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesClientBuilder.java","src/main/java/tsptest/discriminatoredgecases/implementation/DiscriminatorEdgeCasesClientImpl.java","src/main/java/tsptest/discriminatoredgecases/implementation/package-info.java","src/main/java/tsptest/discriminatoredgecases/models/ChildWithAnotherDiscriminator.java","src/main/java/tsptest/discriminatoredgecases/models/ChildWithRequiredPropertyAsDiscriminator.java","src/main/java/tsptest/discriminatoredgecases/models/GrandChildWithAnotherDiscriminator.java","src/main/java/tsptest/discriminatoredgecases/models/GrandChildWithRequiredProperty.java","src/main/java/tsptest/discriminatoredgecases/models/ModelWithDiscriminatorNoSubtypes.java","src/main/java/tsptest/discriminatoredgecases/models/ParentWithRequiredProperty.java","src/main/java/tsptest/discriminatoredgecases/models/package-info.java","src/main/java/tsptest/discriminatoredgecases/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-enumnesteddiscriminator_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-enumnesteddiscriminator_apiview_properties.json deleted file mode 100644 index c3c3c809f34..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-enumnesteddiscriminator_apiview_properties.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient": "TspTest.EnumNestedDiscriminator", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getMissingDiscriminator": "TspTest.EnumNestedDiscriminator.getMissingDiscriminator", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getMissingDiscriminatorWithResponse": "TspTest.EnumNestedDiscriminator.getMissingDiscriminator", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getModel": "TspTest.EnumNestedDiscriminator.getModel", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getModelWithResponse": "TspTest.EnumNestedDiscriminator.getModel", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getRecursiveModel": "TspTest.EnumNestedDiscriminator.getRecursiveModel", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getRecursiveModelWithResponse": "TspTest.EnumNestedDiscriminator.getRecursiveModel", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getWrongDiscriminator": "TspTest.EnumNestedDiscriminator.getWrongDiscriminator", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getWrongDiscriminatorWithResponse": "TspTest.EnumNestedDiscriminator.getWrongDiscriminator", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.putModel": "TspTest.EnumNestedDiscriminator.putModel", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.putModelWithResponse": "TspTest.EnumNestedDiscriminator.putModel", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.putRecursiveModel": "TspTest.EnumNestedDiscriminator.putRecursiveModel", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.putRecursiveModelWithResponse": "TspTest.EnumNestedDiscriminator.putRecursiveModel", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient": "TspTest.EnumNestedDiscriminator", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getMissingDiscriminator": "TspTest.EnumNestedDiscriminator.getMissingDiscriminator", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getMissingDiscriminatorWithResponse": "TspTest.EnumNestedDiscriminator.getMissingDiscriminator", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getModel": "TspTest.EnumNestedDiscriminator.getModel", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getModelWithResponse": "TspTest.EnumNestedDiscriminator.getModel", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getRecursiveModel": "TspTest.EnumNestedDiscriminator.getRecursiveModel", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getRecursiveModelWithResponse": "TspTest.EnumNestedDiscriminator.getRecursiveModel", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getWrongDiscriminator": "TspTest.EnumNestedDiscriminator.getWrongDiscriminator", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getWrongDiscriminatorWithResponse": "TspTest.EnumNestedDiscriminator.getWrongDiscriminator", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.putModel": "TspTest.EnumNestedDiscriminator.putModel", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.putModelWithResponse": "TspTest.EnumNestedDiscriminator.putModel", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.putRecursiveModel": "TspTest.EnumNestedDiscriminator.putRecursiveModel", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.putRecursiveModelWithResponse": "TspTest.EnumNestedDiscriminator.putRecursiveModel", - "tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClientBuilder": "TspTest.EnumNestedDiscriminator", - "tsptest.enumnesteddiscriminator.models.Fish": "TspTest.EnumNestedDiscriminator.Fish", - "tsptest.enumnesteddiscriminator.models.FishKind": "TspTest.EnumNestedDiscriminator.FishKind", - "tsptest.enumnesteddiscriminator.models.GoblinShark": "TspTest.EnumNestedDiscriminator.GoblinShark", - "tsptest.enumnesteddiscriminator.models.Salmon": "TspTest.EnumNestedDiscriminator.Salmon", - "tsptest.enumnesteddiscriminator.models.SawShark": "TspTest.EnumNestedDiscriminator.SawShark", - "tsptest.enumnesteddiscriminator.models.Shark": "TspTest.EnumNestedDiscriminator.Shark", - "tsptest.enumnesteddiscriminator.models.SharkKind": "TspTest.EnumNestedDiscriminator.SharkKind" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-enumnesteddiscriminator_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-enumnesteddiscriminator_metadata.json index 266addcdb29..8c189b16a74 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-enumnesteddiscriminator_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-enumnesteddiscriminator_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient":"TspTest.EnumNestedDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getMissingDiscriminator":"TspTest.EnumNestedDiscriminator.getMissingDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getMissingDiscriminatorWithResponse":"TspTest.EnumNestedDiscriminator.getMissingDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getModel":"TspTest.EnumNestedDiscriminator.getModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getModelWithResponse":"TspTest.EnumNestedDiscriminator.getModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getRecursiveModel":"TspTest.EnumNestedDiscriminator.getRecursiveModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getRecursiveModelWithResponse":"TspTest.EnumNestedDiscriminator.getRecursiveModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getWrongDiscriminator":"TspTest.EnumNestedDiscriminator.getWrongDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getWrongDiscriminatorWithResponse":"TspTest.EnumNestedDiscriminator.getWrongDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.putModel":"TspTest.EnumNestedDiscriminator.putModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.putModelWithResponse":"TspTest.EnumNestedDiscriminator.putModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.putRecursiveModel":"TspTest.EnumNestedDiscriminator.putRecursiveModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.putRecursiveModelWithResponse":"TspTest.EnumNestedDiscriminator.putRecursiveModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient":"TspTest.EnumNestedDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getMissingDiscriminator":"TspTest.EnumNestedDiscriminator.getMissingDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getMissingDiscriminatorWithResponse":"TspTest.EnumNestedDiscriminator.getMissingDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getModel":"TspTest.EnumNestedDiscriminator.getModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getModelWithResponse":"TspTest.EnumNestedDiscriminator.getModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getRecursiveModel":"TspTest.EnumNestedDiscriminator.getRecursiveModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getRecursiveModelWithResponse":"TspTest.EnumNestedDiscriminator.getRecursiveModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getWrongDiscriminator":"TspTest.EnumNestedDiscriminator.getWrongDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getWrongDiscriminatorWithResponse":"TspTest.EnumNestedDiscriminator.getWrongDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.putModel":"TspTest.EnumNestedDiscriminator.putModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.putModelWithResponse":"TspTest.EnumNestedDiscriminator.putModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.putRecursiveModel":"TspTest.EnumNestedDiscriminator.putRecursiveModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.putRecursiveModelWithResponse":"TspTest.EnumNestedDiscriminator.putRecursiveModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClientBuilder":"TspTest.EnumNestedDiscriminator","tsptest.enumnesteddiscriminator.models.Fish":"TspTest.EnumNestedDiscriminator.Fish","tsptest.enumnesteddiscriminator.models.FishKind":"TspTest.EnumNestedDiscriminator.FishKind","tsptest.enumnesteddiscriminator.models.GoblinShark":"TspTest.EnumNestedDiscriminator.GoblinShark","tsptest.enumnesteddiscriminator.models.Salmon":"TspTest.EnumNestedDiscriminator.Salmon","tsptest.enumnesteddiscriminator.models.SawShark":"TspTest.EnumNestedDiscriminator.SawShark","tsptest.enumnesteddiscriminator.models.Shark":"TspTest.EnumNestedDiscriminator.Shark","tsptest.enumnesteddiscriminator.models.SharkKind":"TspTest.EnumNestedDiscriminator.SharkKind"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/enumnesteddiscriminator/EnumNestedDiscriminatorAsyncClient.java","src/main/java/tsptest/enumnesteddiscriminator/EnumNestedDiscriminatorClient.java","src/main/java/tsptest/enumnesteddiscriminator/EnumNestedDiscriminatorClientBuilder.java","src/main/java/tsptest/enumnesteddiscriminator/implementation/EnumNestedDiscriminatorClientImpl.java","src/main/java/tsptest/enumnesteddiscriminator/implementation/package-info.java","src/main/java/tsptest/enumnesteddiscriminator/models/Fish.java","src/main/java/tsptest/enumnesteddiscriminator/models/FishKind.java","src/main/java/tsptest/enumnesteddiscriminator/models/GoblinShark.java","src/main/java/tsptest/enumnesteddiscriminator/models/Salmon.java","src/main/java/tsptest/enumnesteddiscriminator/models/SawShark.java","src/main/java/tsptest/enumnesteddiscriminator/models/Shark.java","src/main/java/tsptest/enumnesteddiscriminator/models/SharkKind.java","src/main/java/tsptest/enumnesteddiscriminator/models/package-info.java","src/main/java/tsptest/enumnesteddiscriminator/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient":"TspTest.EnumNestedDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getMissingDiscriminator":"TspTest.EnumNestedDiscriminator.getMissingDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getMissingDiscriminatorWithResponse":"TspTest.EnumNestedDiscriminator.getMissingDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getModel":"TspTest.EnumNestedDiscriminator.getModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getModelWithResponse":"TspTest.EnumNestedDiscriminator.getModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getRecursiveModel":"TspTest.EnumNestedDiscriminator.getRecursiveModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getRecursiveModelWithResponse":"TspTest.EnumNestedDiscriminator.getRecursiveModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getWrongDiscriminator":"TspTest.EnumNestedDiscriminator.getWrongDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.getWrongDiscriminatorWithResponse":"TspTest.EnumNestedDiscriminator.getWrongDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.putModel":"TspTest.EnumNestedDiscriminator.putModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.putModelWithResponse":"TspTest.EnumNestedDiscriminator.putModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.putRecursiveModel":"TspTest.EnumNestedDiscriminator.putRecursiveModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorAsyncClient.putRecursiveModelWithResponse":"TspTest.EnumNestedDiscriminator.putRecursiveModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient":"TspTest.EnumNestedDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getMissingDiscriminator":"TspTest.EnumNestedDiscriminator.getMissingDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getMissingDiscriminatorWithResponse":"TspTest.EnumNestedDiscriminator.getMissingDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getModel":"TspTest.EnumNestedDiscriminator.getModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getModelWithResponse":"TspTest.EnumNestedDiscriminator.getModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getRecursiveModel":"TspTest.EnumNestedDiscriminator.getRecursiveModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getRecursiveModelWithResponse":"TspTest.EnumNestedDiscriminator.getRecursiveModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getWrongDiscriminator":"TspTest.EnumNestedDiscriminator.getWrongDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.getWrongDiscriminatorWithResponse":"TspTest.EnumNestedDiscriminator.getWrongDiscriminator","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.putModel":"TspTest.EnumNestedDiscriminator.putModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.putModelWithResponse":"TspTest.EnumNestedDiscriminator.putModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.putRecursiveModel":"TspTest.EnumNestedDiscriminator.putRecursiveModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClient.putRecursiveModelWithResponse":"TspTest.EnumNestedDiscriminator.putRecursiveModel","tsptest.enumnesteddiscriminator.EnumNestedDiscriminatorClientBuilder":"TspTest.EnumNestedDiscriminator","tsptest.enumnesteddiscriminator.models.Fish":"TspTest.EnumNestedDiscriminator.Fish","tsptest.enumnesteddiscriminator.models.FishKind":"TspTest.EnumNestedDiscriminator.FishKind","tsptest.enumnesteddiscriminator.models.GoblinShark":"TspTest.EnumNestedDiscriminator.GoblinShark","tsptest.enumnesteddiscriminator.models.Salmon":"TspTest.EnumNestedDiscriminator.Salmon","tsptest.enumnesteddiscriminator.models.SawShark":"TspTest.EnumNestedDiscriminator.SawShark","tsptest.enumnesteddiscriminator.models.Shark":"TspTest.EnumNestedDiscriminator.Shark","tsptest.enumnesteddiscriminator.models.SharkKind":"TspTest.EnumNestedDiscriminator.SharkKind"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/enumnesteddiscriminator/EnumNestedDiscriminatorAsyncClient.java","src/main/java/tsptest/enumnesteddiscriminator/EnumNestedDiscriminatorClient.java","src/main/java/tsptest/enumnesteddiscriminator/EnumNestedDiscriminatorClientBuilder.java","src/main/java/tsptest/enumnesteddiscriminator/implementation/EnumNestedDiscriminatorClientImpl.java","src/main/java/tsptest/enumnesteddiscriminator/implementation/package-info.java","src/main/java/tsptest/enumnesteddiscriminator/models/Fish.java","src/main/java/tsptest/enumnesteddiscriminator/models/FishKind.java","src/main/java/tsptest/enumnesteddiscriminator/models/GoblinShark.java","src/main/java/tsptest/enumnesteddiscriminator/models/Salmon.java","src/main/java/tsptest/enumnesteddiscriminator/models/SawShark.java","src/main/java/tsptest/enumnesteddiscriminator/models/Shark.java","src/main/java/tsptest/enumnesteddiscriminator/models/SharkKind.java","src/main/java/tsptest/enumnesteddiscriminator/models/package-info.java","src/main/java/tsptest/enumnesteddiscriminator/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-enumservice_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-enumservice_apiview_properties.json deleted file mode 100644 index b6e62977f28..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-enumservice_apiview_properties.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.enumservice.EnumServiceAsyncClient": "TspTest.EnumService.EnumOp", - "tsptest.enumservice.EnumServiceAsyncClient.getColor": "TspTest.EnumService.EnumOp.getColor", - "tsptest.enumservice.EnumServiceAsyncClient.getColorModel": "TspTest.EnumService.EnumOp.getColorModel", - "tsptest.enumservice.EnumServiceAsyncClient.getColorModelWithResponse": "TspTest.EnumService.EnumOp.getColorModel", - "tsptest.enumservice.EnumServiceAsyncClient.getColorWithResponse": "TspTest.EnumService.EnumOp.getColor", - "tsptest.enumservice.EnumServiceAsyncClient.getOperation": "TspTest.EnumService.EnumOp.getOperation", - "tsptest.enumservice.EnumServiceAsyncClient.getOperationWithResponse": "TspTest.EnumService.EnumOp.getOperation", - "tsptest.enumservice.EnumServiceAsyncClient.getRunningOperation": "TspTest.EnumService.EnumOp.getRunningOperation", - "tsptest.enumservice.EnumServiceAsyncClient.getRunningOperationWithResponse": "TspTest.EnumService.EnumOp.getRunningOperation", - "tsptest.enumservice.EnumServiceAsyncClient.setColorModel": "TspTest.EnumService.EnumOp.setColorModel", - "tsptest.enumservice.EnumServiceAsyncClient.setColorModelWithResponse": "TspTest.EnumService.EnumOp.setColorModel", - "tsptest.enumservice.EnumServiceAsyncClient.setIntArray": "TspTest.EnumService.EnumOp.setIntArray", - "tsptest.enumservice.EnumServiceAsyncClient.setIntArrayWithResponse": "TspTest.EnumService.EnumOp.setIntArray", - "tsptest.enumservice.EnumServiceAsyncClient.setIntEnumArray": "TspTest.EnumService.EnumOp.setIntEnumArray", - "tsptest.enumservice.EnumServiceAsyncClient.setIntEnumArrayWithResponse": "TspTest.EnumService.EnumOp.setIntEnumArray", - "tsptest.enumservice.EnumServiceAsyncClient.setIntEnumMulti": "TspTest.EnumService.EnumOp.setIntEnumMulti", - "tsptest.enumservice.EnumServiceAsyncClient.setIntEnumMultiWithResponse": "TspTest.EnumService.EnumOp.setIntEnumMulti", - "tsptest.enumservice.EnumServiceAsyncClient.setIntMulti": "TspTest.EnumService.EnumOp.setIntMulti", - "tsptest.enumservice.EnumServiceAsyncClient.setIntMultiWithResponse": "TspTest.EnumService.EnumOp.setIntMulti", - "tsptest.enumservice.EnumServiceAsyncClient.setPriority": "TspTest.EnumService.EnumOp.setPriority", - "tsptest.enumservice.EnumServiceAsyncClient.setPriorityWithResponse": "TspTest.EnumService.EnumOp.setPriority", - "tsptest.enumservice.EnumServiceAsyncClient.setStringArray": "TspTest.EnumService.EnumOp.setStringArray", - "tsptest.enumservice.EnumServiceAsyncClient.setStringArrayWithResponse": "TspTest.EnumService.EnumOp.setStringArray", - "tsptest.enumservice.EnumServiceAsyncClient.setStringEnumArray": "TspTest.EnumService.EnumOp.setStringEnumArray", - "tsptest.enumservice.EnumServiceAsyncClient.setStringEnumArrayHeader": "TspTest.EnumService.EnumOp.setStringEnumArrayHeader", - "tsptest.enumservice.EnumServiceAsyncClient.setStringEnumArrayHeaderWithResponse": "TspTest.EnumService.EnumOp.setStringEnumArrayHeader", - "tsptest.enumservice.EnumServiceAsyncClient.setStringEnumArrayWithResponse": "TspTest.EnumService.EnumOp.setStringEnumArray", - "tsptest.enumservice.EnumServiceAsyncClient.setStringEnumMulti": "TspTest.EnumService.EnumOp.setStringEnumMulti", - "tsptest.enumservice.EnumServiceAsyncClient.setStringEnumMultiWithResponse": "TspTest.EnumService.EnumOp.setStringEnumMulti", - "tsptest.enumservice.EnumServiceAsyncClient.setStringMulti": "TspTest.EnumService.EnumOp.setStringMulti", - "tsptest.enumservice.EnumServiceAsyncClient.setStringMultiWithResponse": "TspTest.EnumService.EnumOp.setStringMulti", - "tsptest.enumservice.EnumServiceClient": "TspTest.EnumService.EnumOp", - "tsptest.enumservice.EnumServiceClient.getColor": "TspTest.EnumService.EnumOp.getColor", - "tsptest.enumservice.EnumServiceClient.getColorModel": "TspTest.EnumService.EnumOp.getColorModel", - "tsptest.enumservice.EnumServiceClient.getColorModelWithResponse": "TspTest.EnumService.EnumOp.getColorModel", - "tsptest.enumservice.EnumServiceClient.getColorWithResponse": "TspTest.EnumService.EnumOp.getColor", - "tsptest.enumservice.EnumServiceClient.getOperation": "TspTest.EnumService.EnumOp.getOperation", - "tsptest.enumservice.EnumServiceClient.getOperationWithResponse": "TspTest.EnumService.EnumOp.getOperation", - "tsptest.enumservice.EnumServiceClient.getRunningOperation": "TspTest.EnumService.EnumOp.getRunningOperation", - "tsptest.enumservice.EnumServiceClient.getRunningOperationWithResponse": "TspTest.EnumService.EnumOp.getRunningOperation", - "tsptest.enumservice.EnumServiceClient.setColorModel": "TspTest.EnumService.EnumOp.setColorModel", - "tsptest.enumservice.EnumServiceClient.setColorModelWithResponse": "TspTest.EnumService.EnumOp.setColorModel", - "tsptest.enumservice.EnumServiceClient.setIntArray": "TspTest.EnumService.EnumOp.setIntArray", - "tsptest.enumservice.EnumServiceClient.setIntArrayWithResponse": "TspTest.EnumService.EnumOp.setIntArray", - "tsptest.enumservice.EnumServiceClient.setIntEnumArray": "TspTest.EnumService.EnumOp.setIntEnumArray", - "tsptest.enumservice.EnumServiceClient.setIntEnumArrayWithResponse": "TspTest.EnumService.EnumOp.setIntEnumArray", - "tsptest.enumservice.EnumServiceClient.setIntEnumMulti": "TspTest.EnumService.EnumOp.setIntEnumMulti", - "tsptest.enumservice.EnumServiceClient.setIntEnumMultiWithResponse": "TspTest.EnumService.EnumOp.setIntEnumMulti", - "tsptest.enumservice.EnumServiceClient.setIntMulti": "TspTest.EnumService.EnumOp.setIntMulti", - "tsptest.enumservice.EnumServiceClient.setIntMultiWithResponse": "TspTest.EnumService.EnumOp.setIntMulti", - "tsptest.enumservice.EnumServiceClient.setPriority": "TspTest.EnumService.EnumOp.setPriority", - "tsptest.enumservice.EnumServiceClient.setPriorityWithResponse": "TspTest.EnumService.EnumOp.setPriority", - "tsptest.enumservice.EnumServiceClient.setStringArray": "TspTest.EnumService.EnumOp.setStringArray", - "tsptest.enumservice.EnumServiceClient.setStringArrayWithResponse": "TspTest.EnumService.EnumOp.setStringArray", - "tsptest.enumservice.EnumServiceClient.setStringEnumArray": "TspTest.EnumService.EnumOp.setStringEnumArray", - "tsptest.enumservice.EnumServiceClient.setStringEnumArrayHeader": "TspTest.EnumService.EnumOp.setStringEnumArrayHeader", - "tsptest.enumservice.EnumServiceClient.setStringEnumArrayHeaderWithResponse": "TspTest.EnumService.EnumOp.setStringEnumArrayHeader", - "tsptest.enumservice.EnumServiceClient.setStringEnumArrayWithResponse": "TspTest.EnumService.EnumOp.setStringEnumArray", - "tsptest.enumservice.EnumServiceClient.setStringEnumMulti": "TspTest.EnumService.EnumOp.setStringEnumMulti", - "tsptest.enumservice.EnumServiceClient.setStringEnumMultiWithResponse": "TspTest.EnumService.EnumOp.setStringEnumMulti", - "tsptest.enumservice.EnumServiceClient.setStringMulti": "TspTest.EnumService.EnumOp.setStringMulti", - "tsptest.enumservice.EnumServiceClient.setStringMultiWithResponse": "TspTest.EnumService.EnumOp.setStringMulti", - "tsptest.enumservice.EnumServiceClientBuilder": "TspTest.EnumService.EnumOp", - "tsptest.enumservice.models.Color": "TspTest.EnumService.Color", - "tsptest.enumservice.models.ColorModel": "TspTest.EnumService.ColorModel", - "tsptest.enumservice.models.OlympicRecordModel": "TspTest.EnumService.OlympicRecordModel", - "tsptest.enumservice.models.Operation": "TspTest.EnumService.Operation", - "tsptest.enumservice.models.OperationName": "TspTest.EnumService.Operation.name.anonymous", - "tsptest.enumservice.models.OperationStateValues": "TspTest.EnumService.OperationStateValues", - "tsptest.enumservice.models.Priority": "TspTest.EnumService.Priority", - "tsptest.enumservice.models.PriorityModel": "TspTest.EnumService.PriorityModel", - "tsptest.enumservice.models.Unit": "TspTest.EnumService.Unit" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-enumservice_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-enumservice_metadata.json index 169c50ba56d..4c372550cf3 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-enumservice_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-enumservice_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.enumservice.EnumServiceAsyncClient":"TspTest.EnumService.EnumOp","tsptest.enumservice.EnumServiceAsyncClient.getColor":"TspTest.EnumService.EnumOp.getColor","tsptest.enumservice.EnumServiceAsyncClient.getColorModel":"TspTest.EnumService.EnumOp.getColorModel","tsptest.enumservice.EnumServiceAsyncClient.getColorModelWithResponse":"TspTest.EnumService.EnumOp.getColorModel","tsptest.enumservice.EnumServiceAsyncClient.getColorWithResponse":"TspTest.EnumService.EnumOp.getColor","tsptest.enumservice.EnumServiceAsyncClient.getOperation":"TspTest.EnumService.EnumOp.getOperation","tsptest.enumservice.EnumServiceAsyncClient.getOperationWithResponse":"TspTest.EnumService.EnumOp.getOperation","tsptest.enumservice.EnumServiceAsyncClient.getRunningOperation":"TspTest.EnumService.EnumOp.getRunningOperation","tsptest.enumservice.EnumServiceAsyncClient.getRunningOperationWithResponse":"TspTest.EnumService.EnumOp.getRunningOperation","tsptest.enumservice.EnumServiceAsyncClient.setColorModel":"TspTest.EnumService.EnumOp.setColorModel","tsptest.enumservice.EnumServiceAsyncClient.setColorModelWithResponse":"TspTest.EnumService.EnumOp.setColorModel","tsptest.enumservice.EnumServiceAsyncClient.setIntArray":"TspTest.EnumService.EnumOp.setIntArray","tsptest.enumservice.EnumServiceAsyncClient.setIntArrayWithResponse":"TspTest.EnumService.EnumOp.setIntArray","tsptest.enumservice.EnumServiceAsyncClient.setIntEnumArray":"TspTest.EnumService.EnumOp.setIntEnumArray","tsptest.enumservice.EnumServiceAsyncClient.setIntEnumArrayWithResponse":"TspTest.EnumService.EnumOp.setIntEnumArray","tsptest.enumservice.EnumServiceAsyncClient.setIntEnumMulti":"TspTest.EnumService.EnumOp.setIntEnumMulti","tsptest.enumservice.EnumServiceAsyncClient.setIntEnumMultiWithResponse":"TspTest.EnumService.EnumOp.setIntEnumMulti","tsptest.enumservice.EnumServiceAsyncClient.setIntMulti":"TspTest.EnumService.EnumOp.setIntMulti","tsptest.enumservice.EnumServiceAsyncClient.setIntMultiWithResponse":"TspTest.EnumService.EnumOp.setIntMulti","tsptest.enumservice.EnumServiceAsyncClient.setPriority":"TspTest.EnumService.EnumOp.setPriority","tsptest.enumservice.EnumServiceAsyncClient.setPriorityWithResponse":"TspTest.EnumService.EnumOp.setPriority","tsptest.enumservice.EnumServiceAsyncClient.setStringArray":"TspTest.EnumService.EnumOp.setStringArray","tsptest.enumservice.EnumServiceAsyncClient.setStringArrayWithResponse":"TspTest.EnumService.EnumOp.setStringArray","tsptest.enumservice.EnumServiceAsyncClient.setStringEnumArray":"TspTest.EnumService.EnumOp.setStringEnumArray","tsptest.enumservice.EnumServiceAsyncClient.setStringEnumArrayHeader":"TspTest.EnumService.EnumOp.setStringEnumArrayHeader","tsptest.enumservice.EnumServiceAsyncClient.setStringEnumArrayHeaderWithResponse":"TspTest.EnumService.EnumOp.setStringEnumArrayHeader","tsptest.enumservice.EnumServiceAsyncClient.setStringEnumArrayWithResponse":"TspTest.EnumService.EnumOp.setStringEnumArray","tsptest.enumservice.EnumServiceAsyncClient.setStringEnumMulti":"TspTest.EnumService.EnumOp.setStringEnumMulti","tsptest.enumservice.EnumServiceAsyncClient.setStringEnumMultiWithResponse":"TspTest.EnumService.EnumOp.setStringEnumMulti","tsptest.enumservice.EnumServiceAsyncClient.setStringMulti":"TspTest.EnumService.EnumOp.setStringMulti","tsptest.enumservice.EnumServiceAsyncClient.setStringMultiWithResponse":"TspTest.EnumService.EnumOp.setStringMulti","tsptest.enumservice.EnumServiceClient":"TspTest.EnumService.EnumOp","tsptest.enumservice.EnumServiceClient.getColor":"TspTest.EnumService.EnumOp.getColor","tsptest.enumservice.EnumServiceClient.getColorModel":"TspTest.EnumService.EnumOp.getColorModel","tsptest.enumservice.EnumServiceClient.getColorModelWithResponse":"TspTest.EnumService.EnumOp.getColorModel","tsptest.enumservice.EnumServiceClient.getColorWithResponse":"TspTest.EnumService.EnumOp.getColor","tsptest.enumservice.EnumServiceClient.getOperation":"TspTest.EnumService.EnumOp.getOperation","tsptest.enumservice.EnumServiceClient.getOperationWithResponse":"TspTest.EnumService.EnumOp.getOperation","tsptest.enumservice.EnumServiceClient.getRunningOperation":"TspTest.EnumService.EnumOp.getRunningOperation","tsptest.enumservice.EnumServiceClient.getRunningOperationWithResponse":"TspTest.EnumService.EnumOp.getRunningOperation","tsptest.enumservice.EnumServiceClient.setColorModel":"TspTest.EnumService.EnumOp.setColorModel","tsptest.enumservice.EnumServiceClient.setColorModelWithResponse":"TspTest.EnumService.EnumOp.setColorModel","tsptest.enumservice.EnumServiceClient.setIntArray":"TspTest.EnumService.EnumOp.setIntArray","tsptest.enumservice.EnumServiceClient.setIntArrayWithResponse":"TspTest.EnumService.EnumOp.setIntArray","tsptest.enumservice.EnumServiceClient.setIntEnumArray":"TspTest.EnumService.EnumOp.setIntEnumArray","tsptest.enumservice.EnumServiceClient.setIntEnumArrayWithResponse":"TspTest.EnumService.EnumOp.setIntEnumArray","tsptest.enumservice.EnumServiceClient.setIntEnumMulti":"TspTest.EnumService.EnumOp.setIntEnumMulti","tsptest.enumservice.EnumServiceClient.setIntEnumMultiWithResponse":"TspTest.EnumService.EnumOp.setIntEnumMulti","tsptest.enumservice.EnumServiceClient.setIntMulti":"TspTest.EnumService.EnumOp.setIntMulti","tsptest.enumservice.EnumServiceClient.setIntMultiWithResponse":"TspTest.EnumService.EnumOp.setIntMulti","tsptest.enumservice.EnumServiceClient.setPriority":"TspTest.EnumService.EnumOp.setPriority","tsptest.enumservice.EnumServiceClient.setPriorityWithResponse":"TspTest.EnumService.EnumOp.setPriority","tsptest.enumservice.EnumServiceClient.setStringArray":"TspTest.EnumService.EnumOp.setStringArray","tsptest.enumservice.EnumServiceClient.setStringArrayWithResponse":"TspTest.EnumService.EnumOp.setStringArray","tsptest.enumservice.EnumServiceClient.setStringEnumArray":"TspTest.EnumService.EnumOp.setStringEnumArray","tsptest.enumservice.EnumServiceClient.setStringEnumArrayHeader":"TspTest.EnumService.EnumOp.setStringEnumArrayHeader","tsptest.enumservice.EnumServiceClient.setStringEnumArrayHeaderWithResponse":"TspTest.EnumService.EnumOp.setStringEnumArrayHeader","tsptest.enumservice.EnumServiceClient.setStringEnumArrayWithResponse":"TspTest.EnumService.EnumOp.setStringEnumArray","tsptest.enumservice.EnumServiceClient.setStringEnumMulti":"TspTest.EnumService.EnumOp.setStringEnumMulti","tsptest.enumservice.EnumServiceClient.setStringEnumMultiWithResponse":"TspTest.EnumService.EnumOp.setStringEnumMulti","tsptest.enumservice.EnumServiceClient.setStringMulti":"TspTest.EnumService.EnumOp.setStringMulti","tsptest.enumservice.EnumServiceClient.setStringMultiWithResponse":"TspTest.EnumService.EnumOp.setStringMulti","tsptest.enumservice.EnumServiceClientBuilder":"TspTest.EnumService.EnumOp","tsptest.enumservice.models.Color":"TspTest.EnumService.Color","tsptest.enumservice.models.ColorModel":"TspTest.EnumService.ColorModel","tsptest.enumservice.models.OlympicRecordModel":"TspTest.EnumService.OlympicRecordModel","tsptest.enumservice.models.Operation":"TspTest.EnumService.Operation","tsptest.enumservice.models.OperationName":"TspTest.EnumService.Operation.name.anonymous","tsptest.enumservice.models.OperationStateValues":"TspTest.EnumService.OperationStateValues","tsptest.enumservice.models.Priority":"TspTest.EnumService.Priority","tsptest.enumservice.models.PriorityModel":"TspTest.EnumService.PriorityModel","tsptest.enumservice.models.Unit":"TspTest.EnumService.Unit"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java","src/main/java/tsptest/enumservice/EnumServiceClient.java","src/main/java/tsptest/enumservice/EnumServiceClientBuilder.java","src/main/java/tsptest/enumservice/implementation/EnumServiceClientImpl.java","src/main/java/tsptest/enumservice/implementation/package-info.java","src/main/java/tsptest/enumservice/models/Color.java","src/main/java/tsptest/enumservice/models/ColorModel.java","src/main/java/tsptest/enumservice/models/OlympicRecordModel.java","src/main/java/tsptest/enumservice/models/Operation.java","src/main/java/tsptest/enumservice/models/OperationName.java","src/main/java/tsptest/enumservice/models/OperationStateValues.java","src/main/java/tsptest/enumservice/models/Priority.java","src/main/java/tsptest/enumservice/models/PriorityModel.java","src/main/java/tsptest/enumservice/models/Unit.java","src/main/java/tsptest/enumservice/models/package-info.java","src/main/java/tsptest/enumservice/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.enumservice.EnumServiceAsyncClient":"TspTest.EnumService.EnumOp","tsptest.enumservice.EnumServiceAsyncClient.getColor":"TspTest.EnumService.EnumOp.getColor","tsptest.enumservice.EnumServiceAsyncClient.getColorModel":"TspTest.EnumService.EnumOp.getColorModel","tsptest.enumservice.EnumServiceAsyncClient.getColorModelWithResponse":"TspTest.EnumService.EnumOp.getColorModel","tsptest.enumservice.EnumServiceAsyncClient.getColorWithResponse":"TspTest.EnumService.EnumOp.getColor","tsptest.enumservice.EnumServiceAsyncClient.getOperation":"TspTest.EnumService.EnumOp.getOperation","tsptest.enumservice.EnumServiceAsyncClient.getOperationWithResponse":"TspTest.EnumService.EnumOp.getOperation","tsptest.enumservice.EnumServiceAsyncClient.getRunningOperation":"TspTest.EnumService.EnumOp.getRunningOperation","tsptest.enumservice.EnumServiceAsyncClient.getRunningOperationWithResponse":"TspTest.EnumService.EnumOp.getRunningOperation","tsptest.enumservice.EnumServiceAsyncClient.getWrongBody":"TspTest.EnumService.EnumOp.getWrongBody","tsptest.enumservice.EnumServiceAsyncClient.getWrongBodyWithResponse":"TspTest.EnumService.EnumOp.getWrongBody","tsptest.enumservice.EnumServiceAsyncClient.setColorModel":"TspTest.EnumService.EnumOp.setColorModel","tsptest.enumservice.EnumServiceAsyncClient.setColorModelWithResponse":"TspTest.EnumService.EnumOp.setColorModel","tsptest.enumservice.EnumServiceAsyncClient.setIntArray":"TspTest.EnumService.EnumOp.setIntArray","tsptest.enumservice.EnumServiceAsyncClient.setIntArrayWithResponse":"TspTest.EnumService.EnumOp.setIntArray","tsptest.enumservice.EnumServiceAsyncClient.setIntEnumArray":"TspTest.EnumService.EnumOp.setIntEnumArray","tsptest.enumservice.EnumServiceAsyncClient.setIntEnumArrayWithResponse":"TspTest.EnumService.EnumOp.setIntEnumArray","tsptest.enumservice.EnumServiceAsyncClient.setIntEnumMulti":"TspTest.EnumService.EnumOp.setIntEnumMulti","tsptest.enumservice.EnumServiceAsyncClient.setIntEnumMultiWithResponse":"TspTest.EnumService.EnumOp.setIntEnumMulti","tsptest.enumservice.EnumServiceAsyncClient.setIntMulti":"TspTest.EnumService.EnumOp.setIntMulti","tsptest.enumservice.EnumServiceAsyncClient.setIntMultiWithResponse":"TspTest.EnumService.EnumOp.setIntMulti","tsptest.enumservice.EnumServiceAsyncClient.setPriority":"TspTest.EnumService.EnumOp.setPriority","tsptest.enumservice.EnumServiceAsyncClient.setPriorityWithResponse":"TspTest.EnumService.EnumOp.setPriority","tsptest.enumservice.EnumServiceAsyncClient.setStringArray":"TspTest.EnumService.EnumOp.setStringArray","tsptest.enumservice.EnumServiceAsyncClient.setStringArrayWithResponse":"TspTest.EnumService.EnumOp.setStringArray","tsptest.enumservice.EnumServiceAsyncClient.setStringEnumArray":"TspTest.EnumService.EnumOp.setStringEnumArray","tsptest.enumservice.EnumServiceAsyncClient.setStringEnumArrayHeader":"TspTest.EnumService.EnumOp.setStringEnumArrayHeader","tsptest.enumservice.EnumServiceAsyncClient.setStringEnumArrayHeaderWithResponse":"TspTest.EnumService.EnumOp.setStringEnumArrayHeader","tsptest.enumservice.EnumServiceAsyncClient.setStringEnumArrayWithResponse":"TspTest.EnumService.EnumOp.setStringEnumArray","tsptest.enumservice.EnumServiceAsyncClient.setStringEnumMulti":"TspTest.EnumService.EnumOp.setStringEnumMulti","tsptest.enumservice.EnumServiceAsyncClient.setStringEnumMultiWithResponse":"TspTest.EnumService.EnumOp.setStringEnumMulti","tsptest.enumservice.EnumServiceAsyncClient.setStringMulti":"TspTest.EnumService.EnumOp.setStringMulti","tsptest.enumservice.EnumServiceAsyncClient.setStringMultiWithResponse":"TspTest.EnumService.EnumOp.setStringMulti","tsptest.enumservice.EnumServiceClient":"TspTest.EnumService.EnumOp","tsptest.enumservice.EnumServiceClient.getColor":"TspTest.EnumService.EnumOp.getColor","tsptest.enumservice.EnumServiceClient.getColorModel":"TspTest.EnumService.EnumOp.getColorModel","tsptest.enumservice.EnumServiceClient.getColorModelWithResponse":"TspTest.EnumService.EnumOp.getColorModel","tsptest.enumservice.EnumServiceClient.getColorWithResponse":"TspTest.EnumService.EnumOp.getColor","tsptest.enumservice.EnumServiceClient.getOperation":"TspTest.EnumService.EnumOp.getOperation","tsptest.enumservice.EnumServiceClient.getOperationWithResponse":"TspTest.EnumService.EnumOp.getOperation","tsptest.enumservice.EnumServiceClient.getRunningOperation":"TspTest.EnumService.EnumOp.getRunningOperation","tsptest.enumservice.EnumServiceClient.getRunningOperationWithResponse":"TspTest.EnumService.EnumOp.getRunningOperation","tsptest.enumservice.EnumServiceClient.getWrongBody":"TspTest.EnumService.EnumOp.getWrongBody","tsptest.enumservice.EnumServiceClient.getWrongBodyWithResponse":"TspTest.EnumService.EnumOp.getWrongBody","tsptest.enumservice.EnumServiceClient.setColorModel":"TspTest.EnumService.EnumOp.setColorModel","tsptest.enumservice.EnumServiceClient.setColorModelWithResponse":"TspTest.EnumService.EnumOp.setColorModel","tsptest.enumservice.EnumServiceClient.setIntArray":"TspTest.EnumService.EnumOp.setIntArray","tsptest.enumservice.EnumServiceClient.setIntArrayWithResponse":"TspTest.EnumService.EnumOp.setIntArray","tsptest.enumservice.EnumServiceClient.setIntEnumArray":"TspTest.EnumService.EnumOp.setIntEnumArray","tsptest.enumservice.EnumServiceClient.setIntEnumArrayWithResponse":"TspTest.EnumService.EnumOp.setIntEnumArray","tsptest.enumservice.EnumServiceClient.setIntEnumMulti":"TspTest.EnumService.EnumOp.setIntEnumMulti","tsptest.enumservice.EnumServiceClient.setIntEnumMultiWithResponse":"TspTest.EnumService.EnumOp.setIntEnumMulti","tsptest.enumservice.EnumServiceClient.setIntMulti":"TspTest.EnumService.EnumOp.setIntMulti","tsptest.enumservice.EnumServiceClient.setIntMultiWithResponse":"TspTest.EnumService.EnumOp.setIntMulti","tsptest.enumservice.EnumServiceClient.setPriority":"TspTest.EnumService.EnumOp.setPriority","tsptest.enumservice.EnumServiceClient.setPriorityWithResponse":"TspTest.EnumService.EnumOp.setPriority","tsptest.enumservice.EnumServiceClient.setStringArray":"TspTest.EnumService.EnumOp.setStringArray","tsptest.enumservice.EnumServiceClient.setStringArrayWithResponse":"TspTest.EnumService.EnumOp.setStringArray","tsptest.enumservice.EnumServiceClient.setStringEnumArray":"TspTest.EnumService.EnumOp.setStringEnumArray","tsptest.enumservice.EnumServiceClient.setStringEnumArrayHeader":"TspTest.EnumService.EnumOp.setStringEnumArrayHeader","tsptest.enumservice.EnumServiceClient.setStringEnumArrayHeaderWithResponse":"TspTest.EnumService.EnumOp.setStringEnumArrayHeader","tsptest.enumservice.EnumServiceClient.setStringEnumArrayWithResponse":"TspTest.EnumService.EnumOp.setStringEnumArray","tsptest.enumservice.EnumServiceClient.setStringEnumMulti":"TspTest.EnumService.EnumOp.setStringEnumMulti","tsptest.enumservice.EnumServiceClient.setStringEnumMultiWithResponse":"TspTest.EnumService.EnumOp.setStringEnumMulti","tsptest.enumservice.EnumServiceClient.setStringMulti":"TspTest.EnumService.EnumOp.setStringMulti","tsptest.enumservice.EnumServiceClient.setStringMultiWithResponse":"TspTest.EnumService.EnumOp.setStringMulti","tsptest.enumservice.EnumServiceClientBuilder":"TspTest.EnumService.EnumOp","tsptest.enumservice.models.Color":"TspTest.EnumService.Color","tsptest.enumservice.models.ColorModel":"TspTest.EnumService.ColorModel","tsptest.enumservice.models.OlympicRecordModel":"TspTest.EnumService.OlympicRecordModel","tsptest.enumservice.models.Operation":"TspTest.EnumService.Operation","tsptest.enumservice.models.OperationName":"TspTest.EnumService.Operation.name.anonymous","tsptest.enumservice.models.OperationStateValues":"TspTest.EnumService.OperationStateValues","tsptest.enumservice.models.Priority":"TspTest.EnumService.Priority","tsptest.enumservice.models.PriorityModel":"TspTest.EnumService.PriorityModel","tsptest.enumservice.models.Unit":"TspTest.EnumService.Unit"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java","src/main/java/tsptest/enumservice/EnumServiceClient.java","src/main/java/tsptest/enumservice/EnumServiceClientBuilder.java","src/main/java/tsptest/enumservice/implementation/EnumServiceClientImpl.java","src/main/java/tsptest/enumservice/implementation/package-info.java","src/main/java/tsptest/enumservice/models/Color.java","src/main/java/tsptest/enumservice/models/ColorModel.java","src/main/java/tsptest/enumservice/models/OlympicRecordModel.java","src/main/java/tsptest/enumservice/models/Operation.java","src/main/java/tsptest/enumservice/models/OperationName.java","src/main/java/tsptest/enumservice/models/OperationStateValues.java","src/main/java/tsptest/enumservice/models/Priority.java","src/main/java/tsptest/enumservice/models/PriorityModel.java","src/main/java/tsptest/enumservice/models/Unit.java","src/main/java/tsptest/enumservice/models/package-info.java","src/main/java/tsptest/enumservice/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-errormodel_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-errormodel_apiview_properties.json deleted file mode 100644 index 5b466208aee..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-errormodel_apiview_properties.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.errormodel.ErrorModelAsyncClient": "TspTest.ErrorModel.ErrorOp", - "tsptest.errormodel.ErrorModelAsyncClient.read": "TspTest.ErrorModel.ErrorOp.read", - "tsptest.errormodel.ErrorModelAsyncClient.readWithResponse": "TspTest.ErrorModel.ErrorOp.read", - "tsptest.errormodel.ErrorModelClient": "TspTest.ErrorModel.ErrorOp", - "tsptest.errormodel.ErrorModelClient.read": "TspTest.ErrorModel.ErrorOp.read", - "tsptest.errormodel.ErrorModelClient.readWithResponse": "TspTest.ErrorModel.ErrorOp.read", - "tsptest.errormodel.ErrorModelClientBuilder": "TspTest.ErrorModel", - "tsptest.errormodel.models.BadResponseError": "TspTest.ErrorModel.BadResponseError", - "tsptest.errormodel.models.BatchError": "TspTest.ErrorModel.BatchError", - "tsptest.errormodel.models.BatchErrorMessage": "TspTest.ErrorModel.BatchErrorMessage", - "tsptest.errormodel.models.Details": "TspTest.ErrorModel.Details", - "tsptest.errormodel.models.Diagnostic": "TspTest.ErrorModel.Diagnostic", - "tsptest.errormodel.models.InnerError": "Azure.Core.Foundations.InnerError", - "tsptest.errormodel.models.SubError": "TspTest.ErrorModel.SubError" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-errormodel_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-errormodel_metadata.json index ec105b0f181..577647d94f7 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-errormodel_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-errormodel_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.errormodel.ErrorModelAsyncClient":"TspTest.ErrorModel.ErrorOp","tsptest.errormodel.ErrorModelAsyncClient.read":"TspTest.ErrorModel.ErrorOp.read","tsptest.errormodel.ErrorModelAsyncClient.readWithResponse":"TspTest.ErrorModel.ErrorOp.read","tsptest.errormodel.ErrorModelClient":"TspTest.ErrorModel.ErrorOp","tsptest.errormodel.ErrorModelClient.read":"TspTest.ErrorModel.ErrorOp.read","tsptest.errormodel.ErrorModelClient.readWithResponse":"TspTest.ErrorModel.ErrorOp.read","tsptest.errormodel.ErrorModelClientBuilder":"TspTest.ErrorModel","tsptest.errormodel.models.BadResponseError":"TspTest.ErrorModel.BadResponseError","tsptest.errormodel.models.BatchError":"TspTest.ErrorModel.BatchError","tsptest.errormodel.models.BatchErrorMessage":"TspTest.ErrorModel.BatchErrorMessage","tsptest.errormodel.models.Details":"TspTest.ErrorModel.Details","tsptest.errormodel.models.Diagnostic":"TspTest.ErrorModel.Diagnostic","tsptest.errormodel.models.InnerError":"Azure.Core.Foundations.InnerError","tsptest.errormodel.models.SubError":"TspTest.ErrorModel.SubError"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/errormodel/ErrorModelAsyncClient.java","src/main/java/tsptest/errormodel/ErrorModelClient.java","src/main/java/tsptest/errormodel/ErrorModelClientBuilder.java","src/main/java/tsptest/errormodel/implementation/ErrorModelClientImpl.java","src/main/java/tsptest/errormodel/implementation/ErrorOpsImpl.java","src/main/java/tsptest/errormodel/implementation/package-info.java","src/main/java/tsptest/errormodel/models/BadResponseError.java","src/main/java/tsptest/errormodel/models/BadResponseErrorException.java","src/main/java/tsptest/errormodel/models/BatchError.java","src/main/java/tsptest/errormodel/models/BatchErrorException.java","src/main/java/tsptest/errormodel/models/BatchErrorMessage.java","src/main/java/tsptest/errormodel/models/Details.java","src/main/java/tsptest/errormodel/models/Diagnostic.java","src/main/java/tsptest/errormodel/models/InnerError.java","src/main/java/tsptest/errormodel/models/SubError.java","src/main/java/tsptest/errormodel/models/package-info.java","src/main/java/tsptest/errormodel/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.errormodel.ErrorModelAsyncClient":"TspTest.ErrorModel.ErrorOp","tsptest.errormodel.ErrorModelAsyncClient.read":"TspTest.ErrorModel.ErrorOp.read","tsptest.errormodel.ErrorModelAsyncClient.readWithResponse":"TspTest.ErrorModel.ErrorOp.read","tsptest.errormodel.ErrorModelClient":"TspTest.ErrorModel.ErrorOp","tsptest.errormodel.ErrorModelClient.read":"TspTest.ErrorModel.ErrorOp.read","tsptest.errormodel.ErrorModelClient.readWithResponse":"TspTest.ErrorModel.ErrorOp.read","tsptest.errormodel.ErrorModelClientBuilder":"TspTest.ErrorModel","tsptest.errormodel.models.BadResponseError":"TspTest.ErrorModel.BadResponseError","tsptest.errormodel.models.BatchError":"TspTest.ErrorModel.BatchError","tsptest.errormodel.models.BatchErrorMessage":"TspTest.ErrorModel.BatchErrorMessage","tsptest.errormodel.models.Details":"TspTest.ErrorModel.Details","tsptest.errormodel.models.Diagnostic":"TspTest.ErrorModel.Diagnostic","tsptest.errormodel.models.InnerError":"Azure.Core.Foundations.InnerError","tsptest.errormodel.models.SubError":"TspTest.ErrorModel.SubError"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/errormodel/ErrorModelAsyncClient.java","src/main/java/tsptest/errormodel/ErrorModelClient.java","src/main/java/tsptest/errormodel/ErrorModelClientBuilder.java","src/main/java/tsptest/errormodel/implementation/ErrorModelClientImpl.java","src/main/java/tsptest/errormodel/implementation/ErrorOpsImpl.java","src/main/java/tsptest/errormodel/implementation/package-info.java","src/main/java/tsptest/errormodel/models/BadResponseError.java","src/main/java/tsptest/errormodel/models/BadResponseErrorException.java","src/main/java/tsptest/errormodel/models/BatchError.java","src/main/java/tsptest/errormodel/models/BatchErrorException.java","src/main/java/tsptest/errormodel/models/BatchErrorMessage.java","src/main/java/tsptest/errormodel/models/Details.java","src/main/java/tsptest/errormodel/models/Diagnostic.java","src/main/java/tsptest/errormodel/models/InnerError.java","src/main/java/tsptest/errormodel/models/SubError.java","src/main/java/tsptest/errormodel/models/package-info.java","src/main/java/tsptest/errormodel/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-external_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-external_metadata.json new file mode 100644 index 00000000000..500be620ad8 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-external_metadata.json @@ -0,0 +1 @@ +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.external.ExternalAsyncClient":"TspTest.External.ExternalOp","tsptest.external.ExternalAsyncClient.postExternal":"TspTest.External.ExternalOp.postExternal","tsptest.external.ExternalAsyncClient.postExternalWithResponse":"TspTest.External.ExternalOp.postExternal","tsptest.external.ExternalClient":"TspTest.External.ExternalOp","tsptest.external.ExternalClient.postExternal":"TspTest.External.ExternalOp.postExternal","tsptest.external.ExternalClient.postExternalWithResponse":"TspTest.External.ExternalOp.postExternal","tsptest.external.ExternalClientBuilder":"TspTest.External","tsptest.external.models.Body":"TspTest.External.Body"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/external/ExternalAsyncClient.java","src/main/java/tsptest/external/ExternalClient.java","src/main/java/tsptest/external/ExternalClientBuilder.java","src/main/java/tsptest/external/implementation/ExternalClientImpl.java","src/main/java/tsptest/external/implementation/ExternalOpsImpl.java","src/main/java/tsptest/external/implementation/package-info.java","src/main/java/tsptest/external/models/Body.java","src/main/java/tsptest/external/models/package-info.java","src/main/java/tsptest/external/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-flatten_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-flatten_apiview_properties.json deleted file mode 100644 index 27ab30ca8e6..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-flatten_apiview_properties.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.flatten.FlattenAsyncClient": "TspTest.Flatten.FlattenOp", - "tsptest.flatten.FlattenAsyncClient.send": "TspTest.Flatten.FlattenOp.send", - "tsptest.flatten.FlattenAsyncClient.sendLong": "TspTest.Flatten.FlattenOp.sendLong", - "tsptest.flatten.FlattenAsyncClient.sendLongWithResponse": "TspTest.Flatten.FlattenOp.sendLong", - "tsptest.flatten.FlattenAsyncClient.sendOptionalBody": "TspTest.Flatten.FlattenOp.sendOptionalBody", - "tsptest.flatten.FlattenAsyncClient.sendOptionalBodyWithResponse": "TspTest.Flatten.FlattenOp.sendOptionalBody", - "tsptest.flatten.FlattenAsyncClient.sendProjectedName": "TspTest.Flatten.FlattenOp.sendProjectedName", - "tsptest.flatten.FlattenAsyncClient.sendProjectedNameWithResponse": "TspTest.Flatten.FlattenOp.sendProjectedName", - "tsptest.flatten.FlattenAsyncClient.sendWithResponse": "TspTest.Flatten.FlattenOp.send", - "tsptest.flatten.FlattenAsyncClient.update": "TspTest.Flatten.FlattenOp.update", - "tsptest.flatten.FlattenAsyncClient.updateWithResponse": "TspTest.Flatten.FlattenOp.update", - "tsptest.flatten.FlattenClient": "TspTest.Flatten.FlattenOp", - "tsptest.flatten.FlattenClient.send": "TspTest.Flatten.FlattenOp.send", - "tsptest.flatten.FlattenClient.sendLong": "TspTest.Flatten.FlattenOp.sendLong", - "tsptest.flatten.FlattenClient.sendLongWithResponse": "TspTest.Flatten.FlattenOp.sendLong", - "tsptest.flatten.FlattenClient.sendOptionalBody": "TspTest.Flatten.FlattenOp.sendOptionalBody", - "tsptest.flatten.FlattenClient.sendOptionalBodyWithResponse": "TspTest.Flatten.FlattenOp.sendOptionalBody", - "tsptest.flatten.FlattenClient.sendProjectedName": "TspTest.Flatten.FlattenOp.sendProjectedName", - "tsptest.flatten.FlattenClient.sendProjectedNameWithResponse": "TspTest.Flatten.FlattenOp.sendProjectedName", - "tsptest.flatten.FlattenClient.sendWithResponse": "TspTest.Flatten.FlattenOp.send", - "tsptest.flatten.FlattenClient.update": "TspTest.Flatten.FlattenOp.update", - "tsptest.flatten.FlattenClient.updateWithResponse": "TspTest.Flatten.FlattenOp.update", - "tsptest.flatten.FlattenClientBuilder": "TspTest.Flatten.FlattenOp", - "tsptest.flatten.implementation.models.SendLongRequest": "TspTest.Flatten.sendLong.Request.anonymous", - "tsptest.flatten.implementation.models.SendOptionalBodyRequest": "TspTest.Flatten.sendOptionalBody.Request.anonymous", - "tsptest.flatten.implementation.models.SendProjectedNameRequest": "TspTest.Flatten.sendProjectedName.Request.anonymous", - "tsptest.flatten.implementation.models.SendRequest": "TspTest.Flatten.send.Request.anonymous", - "tsptest.flatten.models.SendLongOptions": null, - "tsptest.flatten.models.SendLongRequestStatus": "TspTest.Flatten.sendLong.Request.status.anonymous", - "tsptest.flatten.models.TodoItem": "TspTest.Flatten.TodoItem", - "tsptest.flatten.models.TodoItemPatch": "TspTest.Flatten.TodoItemPatch", - "tsptest.flatten.models.TodoItemPatchStatus": "TspTest.Flatten.TodoItemPatch.status.anonymous", - "tsptest.flatten.models.UpdatePatchRequest": "TspTest.Flatten.update.Request.anonymous", - "tsptest.flatten.models.User": "TspTest.Flatten.User" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-flatten_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-flatten_metadata.json index 027b10c8709..332fb715074 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-flatten_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-flatten_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2022-06-01-preview","crossLanguageDefinitions":{"tsptest.flatten.FlattenAsyncClient":"TspTest.Flatten.FlattenOp","tsptest.flatten.FlattenAsyncClient.send":"TspTest.Flatten.FlattenOp.send","tsptest.flatten.FlattenAsyncClient.sendLong":"TspTest.Flatten.FlattenOp.sendLong","tsptest.flatten.FlattenAsyncClient.sendLongWithResponse":"TspTest.Flatten.FlattenOp.sendLong","tsptest.flatten.FlattenAsyncClient.sendOptionalBody":"TspTest.Flatten.FlattenOp.sendOptionalBody","tsptest.flatten.FlattenAsyncClient.sendOptionalBodyWithResponse":"TspTest.Flatten.FlattenOp.sendOptionalBody","tsptest.flatten.FlattenAsyncClient.sendProjectedName":"TspTest.Flatten.FlattenOp.sendProjectedName","tsptest.flatten.FlattenAsyncClient.sendProjectedNameWithResponse":"TspTest.Flatten.FlattenOp.sendProjectedName","tsptest.flatten.FlattenAsyncClient.sendWithResponse":"TspTest.Flatten.FlattenOp.send","tsptest.flatten.FlattenAsyncClient.update":"TspTest.Flatten.FlattenOp.update","tsptest.flatten.FlattenAsyncClient.updateWithResponse":"TspTest.Flatten.FlattenOp.update","tsptest.flatten.FlattenClient":"TspTest.Flatten.FlattenOp","tsptest.flatten.FlattenClient.send":"TspTest.Flatten.FlattenOp.send","tsptest.flatten.FlattenClient.sendLong":"TspTest.Flatten.FlattenOp.sendLong","tsptest.flatten.FlattenClient.sendLongWithResponse":"TspTest.Flatten.FlattenOp.sendLong","tsptest.flatten.FlattenClient.sendOptionalBody":"TspTest.Flatten.FlattenOp.sendOptionalBody","tsptest.flatten.FlattenClient.sendOptionalBodyWithResponse":"TspTest.Flatten.FlattenOp.sendOptionalBody","tsptest.flatten.FlattenClient.sendProjectedName":"TspTest.Flatten.FlattenOp.sendProjectedName","tsptest.flatten.FlattenClient.sendProjectedNameWithResponse":"TspTest.Flatten.FlattenOp.sendProjectedName","tsptest.flatten.FlattenClient.sendWithResponse":"TspTest.Flatten.FlattenOp.send","tsptest.flatten.FlattenClient.update":"TspTest.Flatten.FlattenOp.update","tsptest.flatten.FlattenClient.updateWithResponse":"TspTest.Flatten.FlattenOp.update","tsptest.flatten.FlattenClientBuilder":"TspTest.Flatten.FlattenOp","tsptest.flatten.implementation.models.SendLongRequest":"TspTest.Flatten.sendLong.Request.anonymous","tsptest.flatten.implementation.models.SendOptionalBodyRequest":"TspTest.Flatten.sendOptionalBody.Request.anonymous","tsptest.flatten.implementation.models.SendProjectedNameRequest":"TspTest.Flatten.sendProjectedName.Request.anonymous","tsptest.flatten.implementation.models.SendRequest":"TspTest.Flatten.send.Request.anonymous","tsptest.flatten.models.SendLongOptions":null,"tsptest.flatten.models.SendLongRequestStatus":"TspTest.Flatten.sendLong.Request.status.anonymous","tsptest.flatten.models.TodoItem":"TspTest.Flatten.TodoItem","tsptest.flatten.models.TodoItemPatch":"TspTest.Flatten.TodoItemPatch","tsptest.flatten.models.TodoItemPatchStatus":"TspTest.Flatten.TodoItemPatch.status.anonymous","tsptest.flatten.models.UpdatePatchRequest":"TspTest.Flatten.update.Request.anonymous","tsptest.flatten.models.User":"TspTest.Flatten.User"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/flatten/FlattenAsyncClient.java","src/main/java/tsptest/flatten/FlattenClient.java","src/main/java/tsptest/flatten/FlattenClientBuilder.java","src/main/java/tsptest/flatten/FlattenServiceVersion.java","src/main/java/tsptest/flatten/implementation/FlattenClientImpl.java","src/main/java/tsptest/flatten/implementation/JsonMergePatchHelper.java","src/main/java/tsptest/flatten/implementation/models/SendLongRequest.java","src/main/java/tsptest/flatten/implementation/models/SendOptionalBodyRequest.java","src/main/java/tsptest/flatten/implementation/models/SendProjectedNameRequest.java","src/main/java/tsptest/flatten/implementation/models/SendRequest.java","src/main/java/tsptest/flatten/implementation/models/package-info.java","src/main/java/tsptest/flatten/implementation/package-info.java","src/main/java/tsptest/flatten/models/SendLongOptions.java","src/main/java/tsptest/flatten/models/SendLongRequestStatus.java","src/main/java/tsptest/flatten/models/TodoItem.java","src/main/java/tsptest/flatten/models/TodoItemPatch.java","src/main/java/tsptest/flatten/models/TodoItemPatchStatus.java","src/main/java/tsptest/flatten/models/UpdatePatchRequest.java","src/main/java/tsptest/flatten/models/User.java","src/main/java/tsptest/flatten/models/package-info.java","src/main/java/tsptest/flatten/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"TspTest.Flatten":"2022-06-01-preview"},"crossLanguageDefinitions":{"tsptest.flatten.FlattenAsyncClient":"TspTest.Flatten.FlattenOp","tsptest.flatten.FlattenAsyncClient.send":"TspTest.Flatten.FlattenOp.send","tsptest.flatten.FlattenAsyncClient.sendLong":"TspTest.Flatten.FlattenOp.sendLong","tsptest.flatten.FlattenAsyncClient.sendLongWithResponse":"TspTest.Flatten.FlattenOp.sendLong","tsptest.flatten.FlattenAsyncClient.sendOptionalBody":"TspTest.Flatten.FlattenOp.sendOptionalBody","tsptest.flatten.FlattenAsyncClient.sendOptionalBodyWithResponse":"TspTest.Flatten.FlattenOp.sendOptionalBody","tsptest.flatten.FlattenAsyncClient.sendProjectedName":"TspTest.Flatten.FlattenOp.sendProjectedName","tsptest.flatten.FlattenAsyncClient.sendProjectedNameWithResponse":"TspTest.Flatten.FlattenOp.sendProjectedName","tsptest.flatten.FlattenAsyncClient.sendWithResponse":"TspTest.Flatten.FlattenOp.send","tsptest.flatten.FlattenAsyncClient.update":"TspTest.Flatten.FlattenOp.update","tsptest.flatten.FlattenAsyncClient.updateWithResponse":"TspTest.Flatten.FlattenOp.update","tsptest.flatten.FlattenClient":"TspTest.Flatten.FlattenOp","tsptest.flatten.FlattenClient.send":"TspTest.Flatten.FlattenOp.send","tsptest.flatten.FlattenClient.sendLong":"TspTest.Flatten.FlattenOp.sendLong","tsptest.flatten.FlattenClient.sendLongWithResponse":"TspTest.Flatten.FlattenOp.sendLong","tsptest.flatten.FlattenClient.sendOptionalBody":"TspTest.Flatten.FlattenOp.sendOptionalBody","tsptest.flatten.FlattenClient.sendOptionalBodyWithResponse":"TspTest.Flatten.FlattenOp.sendOptionalBody","tsptest.flatten.FlattenClient.sendProjectedName":"TspTest.Flatten.FlattenOp.sendProjectedName","tsptest.flatten.FlattenClient.sendProjectedNameWithResponse":"TspTest.Flatten.FlattenOp.sendProjectedName","tsptest.flatten.FlattenClient.sendWithResponse":"TspTest.Flatten.FlattenOp.send","tsptest.flatten.FlattenClient.update":"TspTest.Flatten.FlattenOp.update","tsptest.flatten.FlattenClient.updateWithResponse":"TspTest.Flatten.FlattenOp.update","tsptest.flatten.FlattenClientBuilder":"TspTest.Flatten.FlattenOp","tsptest.flatten.implementation.models.SendLongRequest":"TspTest.Flatten.sendLong.Request.anonymous","tsptest.flatten.implementation.models.SendOptionalBodyRequest":"TspTest.Flatten.sendOptionalBody.Request.anonymous","tsptest.flatten.implementation.models.SendProjectedNameRequest":"TspTest.Flatten.sendProjectedName.Request.anonymous","tsptest.flatten.implementation.models.SendRequest":"TspTest.Flatten.send.Request.anonymous","tsptest.flatten.models.SendLongOptions":null,"tsptest.flatten.models.SendLongRequestStatus":"TspTest.Flatten.sendLong.Request.status.anonymous","tsptest.flatten.models.TodoItem":"TspTest.Flatten.TodoItem","tsptest.flatten.models.TodoItemPatch":"TspTest.Flatten.TodoItemPatch","tsptest.flatten.models.TodoItemPatchStatus":"TspTest.Flatten.TodoItemPatch.status.anonymous","tsptest.flatten.models.UpdatePatchRequest":"TspTest.Flatten.update.Request.anonymous","tsptest.flatten.models.User":"TspTest.Flatten.User"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/flatten/FlattenAsyncClient.java","src/main/java/tsptest/flatten/FlattenClient.java","src/main/java/tsptest/flatten/FlattenClientBuilder.java","src/main/java/tsptest/flatten/FlattenServiceVersion.java","src/main/java/tsptest/flatten/implementation/FlattenClientImpl.java","src/main/java/tsptest/flatten/implementation/JsonMergePatchHelper.java","src/main/java/tsptest/flatten/implementation/models/SendLongRequest.java","src/main/java/tsptest/flatten/implementation/models/SendOptionalBodyRequest.java","src/main/java/tsptest/flatten/implementation/models/SendProjectedNameRequest.java","src/main/java/tsptest/flatten/implementation/models/SendRequest.java","src/main/java/tsptest/flatten/implementation/models/package-info.java","src/main/java/tsptest/flatten/implementation/package-info.java","src/main/java/tsptest/flatten/models/SendLongOptions.java","src/main/java/tsptest/flatten/models/SendLongRequestStatus.java","src/main/java/tsptest/flatten/models/TodoItem.java","src/main/java/tsptest/flatten/models/TodoItemPatch.java","src/main/java/tsptest/flatten/models/TodoItemPatchStatus.java","src/main/java/tsptest/flatten/models/UpdatePatchRequest.java","src/main/java/tsptest/flatten/models/User.java","src/main/java/tsptest/flatten/models/package-info.java","src/main/java/tsptest/flatten/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-internal_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-internal_apiview_properties.json deleted file mode 100644 index 0f72102f872..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-internal_apiview_properties.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.internal.InternalAsyncClient": "TspTest.Internal.InternalOp", - "tsptest.internal.InternalAsyncClient.getInternal": "TspTest.Internal.InternalOp.getInternal", - "tsptest.internal.InternalAsyncClient.getInternalWithResponse": "TspTest.Internal.InternalOp.getInternal", - "tsptest.internal.InternalAsyncClient.postInternal": "TspTest.Internal.InternalOp.postInternal", - "tsptest.internal.InternalAsyncClient.postInternalWithResponse": "TspTest.Internal.InternalOp.postInternal", - "tsptest.internal.InternalClient": "TspTest.Internal.InternalOp", - "tsptest.internal.InternalClient.getInternal": "TspTest.Internal.InternalOp.getInternal", - "tsptest.internal.InternalClient.getInternalWithResponse": "TspTest.Internal.InternalOp.getInternal", - "tsptest.internal.InternalClient.postInternal": "TspTest.Internal.InternalOp.postInternal", - "tsptest.internal.InternalClient.postInternalWithResponse": "TspTest.Internal.InternalOp.postInternal", - "tsptest.internal.InternalClientBuilder": "TspTest.Internal", - "tsptest.internal.implementation.models.Color": "TspTest.Internal.Color", - "tsptest.internal.implementation.models.ColorModel": "TspTest.Internal.ColorModel", - "tsptest.internal.models.ApiRequest": "TspTest.Internal.ApiRequest", - "tsptest.internal.models.ApiResponse": "TspTest.Internal.ApiResponse", - "tsptest.internal.models.RequestInner": "TspTest.Internal.RequestInner", - "tsptest.internal.models.ResponseInternal": "TspTest.Internal.ResponseInternal", - "tsptest.internal.models.ResponseInternalInner": "TspTest.Internal.ResponseInternalInner", - "tsptest.internal.models.StandAloneData": "TspTest.Internal.StandAloneData", - "tsptest.internal.models.StandAloneDataInner": "TspTest.Internal.StandAloneDataInner", - "tsptest.internal.models.UnusedEnum": "TspTest.Internal.UnusedEnum" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-internal_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-internal_metadata.json index 0725b185a36..08e3e007f88 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-internal_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-internal_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.internal.InternalAsyncClient":"TspTest.Internal.InternalOp","tsptest.internal.InternalAsyncClient.getInternal":"TspTest.Internal.InternalOp.getInternal","tsptest.internal.InternalAsyncClient.getInternalWithResponse":"TspTest.Internal.InternalOp.getInternal","tsptest.internal.InternalAsyncClient.postInternal":"TspTest.Internal.InternalOp.postInternal","tsptest.internal.InternalAsyncClient.postInternalWithResponse":"TspTest.Internal.InternalOp.postInternal","tsptest.internal.InternalClient":"TspTest.Internal.InternalOp","tsptest.internal.InternalClient.getInternal":"TspTest.Internal.InternalOp.getInternal","tsptest.internal.InternalClient.getInternalWithResponse":"TspTest.Internal.InternalOp.getInternal","tsptest.internal.InternalClient.postInternal":"TspTest.Internal.InternalOp.postInternal","tsptest.internal.InternalClient.postInternalWithResponse":"TspTest.Internal.InternalOp.postInternal","tsptest.internal.InternalClientBuilder":"TspTest.Internal","tsptest.internal.implementation.models.Color":"TspTest.Internal.Color","tsptest.internal.implementation.models.ColorModel":"TspTest.Internal.ColorModel","tsptest.internal.models.ApiRequest":"TspTest.Internal.ApiRequest","tsptest.internal.models.ApiResponse":"TspTest.Internal.ApiResponse","tsptest.internal.models.RequestInner":"TspTest.Internal.RequestInner","tsptest.internal.models.ResponseInternal":"TspTest.Internal.ResponseInternal","tsptest.internal.models.ResponseInternalInner":"TspTest.Internal.ResponseInternalInner","tsptest.internal.models.StandAloneData":"TspTest.Internal.StandAloneData","tsptest.internal.models.StandAloneDataInner":"TspTest.Internal.StandAloneDataInner","tsptest.internal.models.UnusedEnum":"TspTest.Internal.UnusedEnum"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/internal/InternalAsyncClient.java","src/main/java/tsptest/internal/InternalClient.java","src/main/java/tsptest/internal/InternalClientBuilder.java","src/main/java/tsptest/internal/implementation/InternalClientImpl.java","src/main/java/tsptest/internal/implementation/InternalOpsImpl.java","src/main/java/tsptest/internal/implementation/models/Color.java","src/main/java/tsptest/internal/implementation/models/ColorModel.java","src/main/java/tsptest/internal/implementation/models/package-info.java","src/main/java/tsptest/internal/implementation/package-info.java","src/main/java/tsptest/internal/models/ApiRequest.java","src/main/java/tsptest/internal/models/ApiResponse.java","src/main/java/tsptest/internal/models/RequestInner.java","src/main/java/tsptest/internal/models/ResponseInternal.java","src/main/java/tsptest/internal/models/ResponseInternalInner.java","src/main/java/tsptest/internal/models/StandAloneData.java","src/main/java/tsptest/internal/models/StandAloneDataInner.java","src/main/java/tsptest/internal/models/UnusedEnum.java","src/main/java/tsptest/internal/models/package-info.java","src/main/java/tsptest/internal/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.internal.InternalAsyncClient":"TspTest.Internal.InternalOp","tsptest.internal.InternalAsyncClient.getInternal":"TspTest.Internal.InternalOp.getInternal","tsptest.internal.InternalAsyncClient.getInternalWithResponse":"TspTest.Internal.InternalOp.getInternal","tsptest.internal.InternalAsyncClient.postInternal":"TspTest.Internal.InternalOp.postInternal","tsptest.internal.InternalAsyncClient.postInternalWithResponse":"TspTest.Internal.InternalOp.postInternal","tsptest.internal.InternalClient":"TspTest.Internal.InternalOp","tsptest.internal.InternalClient.getInternal":"TspTest.Internal.InternalOp.getInternal","tsptest.internal.InternalClient.getInternalWithResponse":"TspTest.Internal.InternalOp.getInternal","tsptest.internal.InternalClient.postInternal":"TspTest.Internal.InternalOp.postInternal","tsptest.internal.InternalClient.postInternalWithResponse":"TspTest.Internal.InternalOp.postInternal","tsptest.internal.InternalClientBuilder":"TspTest.Internal","tsptest.internal.implementation.models.Color":"TspTest.Internal.Color","tsptest.internal.implementation.models.ColorModel":"TspTest.Internal.ColorModel","tsptest.internal.models.ApiRequest":"TspTest.Internal.ApiRequest","tsptest.internal.models.ApiResponse":"TspTest.Internal.ApiResponse","tsptest.internal.models.RequestInner":"TspTest.Internal.RequestInner","tsptest.internal.models.ResponseInternal":"TspTest.Internal.ResponseInternal","tsptest.internal.models.ResponseInternalInner":"TspTest.Internal.ResponseInternalInner","tsptest.internal.models.StandAloneData":"TspTest.Internal.StandAloneData","tsptest.internal.models.StandAloneDataInner":"TspTest.Internal.StandAloneDataInner","tsptest.internal.models.UnusedEnum":"TspTest.Internal.UnusedEnum"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/internal/InternalAsyncClient.java","src/main/java/tsptest/internal/InternalClient.java","src/main/java/tsptest/internal/InternalClientBuilder.java","src/main/java/tsptest/internal/implementation/InternalClientImpl.java","src/main/java/tsptest/internal/implementation/InternalOpsImpl.java","src/main/java/tsptest/internal/implementation/models/Color.java","src/main/java/tsptest/internal/implementation/models/ColorModel.java","src/main/java/tsptest/internal/implementation/models/package-info.java","src/main/java/tsptest/internal/implementation/package-info.java","src/main/java/tsptest/internal/models/ApiRequest.java","src/main/java/tsptest/internal/models/ApiResponse.java","src/main/java/tsptest/internal/models/RequestInner.java","src/main/java/tsptest/internal/models/ResponseInternal.java","src/main/java/tsptest/internal/models/ResponseInternalInner.java","src/main/java/tsptest/internal/models/StandAloneData.java","src/main/java/tsptest/internal/models/StandAloneDataInner.java","src/main/java/tsptest/internal/models/UnusedEnum.java","src/main/java/tsptest/internal/models/package-info.java","src/main/java/tsptest/internal/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-literalservice_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-literalservice_apiview_properties.json deleted file mode 100644 index 70163b04f02..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-literalservice_apiview_properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.literalservice.LiteralServiceAsyncClient": "TspTest.LiteralService.LiteralOp", - "tsptest.literalservice.LiteralServiceAsyncClient.put": "TspTest.LiteralService.LiteralOp.put", - "tsptest.literalservice.LiteralServiceAsyncClient.putWithResponse": "TspTest.LiteralService.LiteralOp.put", - "tsptest.literalservice.LiteralServiceClient": "TspTest.LiteralService.LiteralOp", - "tsptest.literalservice.LiteralServiceClient.put": "TspTest.LiteralService.LiteralOp.put", - "tsptest.literalservice.LiteralServiceClient.putWithResponse": "TspTest.LiteralService.LiteralOp.put", - "tsptest.literalservice.LiteralServiceClientBuilder": "TspTest.LiteralService", - "tsptest.literalservice.models.Model": "TspTest.LiteralService.Model", - "tsptest.literalservice.models.ModelOptionalLiteral": null, - "tsptest.literalservice.models.PutRequestOptionalLiteralParam": null - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-literalservice_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-literalservice_metadata.json index 625e4dcfa65..393e60eeb84 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-literalservice_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-literalservice_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.literalservice.LiteralServiceAsyncClient":"TspTest.LiteralService.LiteralOp","tsptest.literalservice.LiteralServiceAsyncClient.put":"TspTest.LiteralService.LiteralOp.put","tsptest.literalservice.LiteralServiceAsyncClient.putWithResponse":"TspTest.LiteralService.LiteralOp.put","tsptest.literalservice.LiteralServiceClient":"TspTest.LiteralService.LiteralOp","tsptest.literalservice.LiteralServiceClient.put":"TspTest.LiteralService.LiteralOp.put","tsptest.literalservice.LiteralServiceClient.putWithResponse":"TspTest.LiteralService.LiteralOp.put","tsptest.literalservice.LiteralServiceClientBuilder":"TspTest.LiteralService","tsptest.literalservice.models.Model":"TspTest.LiteralService.Model","tsptest.literalservice.models.ModelOptionalLiteral":null,"tsptest.literalservice.models.PutRequestOptionalLiteralParam":null},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/literalservice/LiteralServiceAsyncClient.java","src/main/java/tsptest/literalservice/LiteralServiceClient.java","src/main/java/tsptest/literalservice/LiteralServiceClientBuilder.java","src/main/java/tsptest/literalservice/implementation/LiteralOpsImpl.java","src/main/java/tsptest/literalservice/implementation/LiteralServiceClientImpl.java","src/main/java/tsptest/literalservice/implementation/package-info.java","src/main/java/tsptest/literalservice/models/Model.java","src/main/java/tsptest/literalservice/models/ModelOptionalLiteral.java","src/main/java/tsptest/literalservice/models/PutRequestOptionalLiteralParam.java","src/main/java/tsptest/literalservice/models/package-info.java","src/main/java/tsptest/literalservice/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.literalservice.LiteralServiceAsyncClient":"TspTest.LiteralService.LiteralOp","tsptest.literalservice.LiteralServiceAsyncClient.put":"TspTest.LiteralService.LiteralOp.put","tsptest.literalservice.LiteralServiceAsyncClient.putWithResponse":"TspTest.LiteralService.LiteralOp.put","tsptest.literalservice.LiteralServiceClient":"TspTest.LiteralService.LiteralOp","tsptest.literalservice.LiteralServiceClient.put":"TspTest.LiteralService.LiteralOp.put","tsptest.literalservice.LiteralServiceClient.putWithResponse":"TspTest.LiteralService.LiteralOp.put","tsptest.literalservice.LiteralServiceClientBuilder":"TspTest.LiteralService","tsptest.literalservice.models.Model":"TspTest.LiteralService.Model","tsptest.literalservice.models.ModelOptionalLiteral":null,"tsptest.literalservice.models.PutRequestOptionalLiteralParam":null},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/literalservice/LiteralServiceAsyncClient.java","src/main/java/tsptest/literalservice/LiteralServiceClient.java","src/main/java/tsptest/literalservice/LiteralServiceClientBuilder.java","src/main/java/tsptest/literalservice/implementation/LiteralOpsImpl.java","src/main/java/tsptest/literalservice/implementation/LiteralServiceClientImpl.java","src/main/java/tsptest/literalservice/implementation/package-info.java","src/main/java/tsptest/literalservice/models/Model.java","src/main/java/tsptest/literalservice/models/ModelOptionalLiteral.java","src/main/java/tsptest/literalservice/models/PutRequestOptionalLiteralParam.java","src/main/java/tsptest/literalservice/models/package-info.java","src/main/java/tsptest/literalservice/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-longrunning_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-longrunning_apiview_properties.json deleted file mode 100644 index df246d16cf3..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-longrunning_apiview_properties.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.longrunning.LongRunningAsyncClient": "TspTest.LongRunning", - "tsptest.longrunning.LongRunningAsyncClient.beginCreateJob": "TspTest.LongRunning.createJob", - "tsptest.longrunning.LongRunningAsyncClient.beginCreateJobWithModel": "TspTest.LongRunning.createJob", - "tsptest.longrunning.LongRunningAsyncClient.beginLongRunning": "TspTest.LongRunning.longRunning", - "tsptest.longrunning.LongRunningAsyncClient.beginLongRunningWithModel": "TspTest.LongRunning.longRunning", - "tsptest.longrunning.LongRunningAsyncClient.getJob": "TspTest.LongRunning.getJob", - "tsptest.longrunning.LongRunningAsyncClient.getJobWithResponse": "TspTest.LongRunning.getJob", - "tsptest.longrunning.LongRunningClient": "TspTest.LongRunning", - "tsptest.longrunning.LongRunningClient.beginCreateJob": "TspTest.LongRunning.createJob", - "tsptest.longrunning.LongRunningClient.beginCreateJobWithModel": "TspTest.LongRunning.createJob", - "tsptest.longrunning.LongRunningClient.beginLongRunning": "TspTest.LongRunning.longRunning", - "tsptest.longrunning.LongRunningClient.beginLongRunningWithModel": "TspTest.LongRunning.longRunning", - "tsptest.longrunning.LongRunningClient.getJob": "TspTest.LongRunning.getJob", - "tsptest.longrunning.LongRunningClient.getJobWithResponse": "TspTest.LongRunning.getJob", - "tsptest.longrunning.LongRunningClientBuilder": "TspTest.LongRunning", - "tsptest.longrunning.models.JobData": "TspTest.LongRunning.JobData", - "tsptest.longrunning.models.JobResult": "TspTest.LongRunning.JobResult", - "tsptest.longrunning.models.JobResultResult": "TspTest.LongRunning.JobResult.result.anonymous", - "tsptest.longrunning.models.JobStatus": "TspTest.LongRunning.JobStatus", - "tsptest.longrunning.models.OperationState": "Azure.Core.Foundations.OperationState", - "tsptest.longrunning.models.PollResponse": "TspTest.LongRunning.PollResponse" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-longrunning_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-longrunning_metadata.json index 838cd158488..65c0babbf98 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-longrunning_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-longrunning_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2022-06-01-preview","crossLanguageDefinitions":{"tsptest.longrunning.LongRunningAsyncClient":"TspTest.LongRunning","tsptest.longrunning.LongRunningAsyncClient.beginCreateJob":"TspTest.LongRunning.createJob","tsptest.longrunning.LongRunningAsyncClient.beginCreateJobWithModel":"TspTest.LongRunning.createJob","tsptest.longrunning.LongRunningAsyncClient.beginLongRunning":"TspTest.LongRunning.longRunning","tsptest.longrunning.LongRunningAsyncClient.beginLongRunningWithModel":"TspTest.LongRunning.longRunning","tsptest.longrunning.LongRunningAsyncClient.getJob":"TspTest.LongRunning.getJob","tsptest.longrunning.LongRunningAsyncClient.getJobWithResponse":"TspTest.LongRunning.getJob","tsptest.longrunning.LongRunningClient":"TspTest.LongRunning","tsptest.longrunning.LongRunningClient.beginCreateJob":"TspTest.LongRunning.createJob","tsptest.longrunning.LongRunningClient.beginCreateJobWithModel":"TspTest.LongRunning.createJob","tsptest.longrunning.LongRunningClient.beginLongRunning":"TspTest.LongRunning.longRunning","tsptest.longrunning.LongRunningClient.beginLongRunningWithModel":"TspTest.LongRunning.longRunning","tsptest.longrunning.LongRunningClient.getJob":"TspTest.LongRunning.getJob","tsptest.longrunning.LongRunningClient.getJobWithResponse":"TspTest.LongRunning.getJob","tsptest.longrunning.LongRunningClientBuilder":"TspTest.LongRunning","tsptest.longrunning.models.JobData":"TspTest.LongRunning.JobData","tsptest.longrunning.models.JobResult":"TspTest.LongRunning.JobResult","tsptest.longrunning.models.JobResultResult":"TspTest.LongRunning.JobResult.result.anonymous","tsptest.longrunning.models.JobStatus":"TspTest.LongRunning.JobStatus","tsptest.longrunning.models.OperationState":"Azure.Core.Foundations.OperationState","tsptest.longrunning.models.PollResponse":"TspTest.LongRunning.PollResponse"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/longrunning/LongRunningAsyncClient.java","src/main/java/tsptest/longrunning/LongRunningClient.java","src/main/java/tsptest/longrunning/LongRunningClientBuilder.java","src/main/java/tsptest/longrunning/LongRunningServiceVersion.java","src/main/java/tsptest/longrunning/implementation/LongRunningClientImpl.java","src/main/java/tsptest/longrunning/implementation/OperationLocationPollingStrategy.java","src/main/java/tsptest/longrunning/implementation/PollingUtils.java","src/main/java/tsptest/longrunning/implementation/SyncOperationLocationPollingStrategy.java","src/main/java/tsptest/longrunning/implementation/package-info.java","src/main/java/tsptest/longrunning/models/JobData.java","src/main/java/tsptest/longrunning/models/JobResult.java","src/main/java/tsptest/longrunning/models/JobResultResult.java","src/main/java/tsptest/longrunning/models/JobStatus.java","src/main/java/tsptest/longrunning/models/OperationState.java","src/main/java/tsptest/longrunning/models/PollResponse.java","src/main/java/tsptest/longrunning/models/package-info.java","src/main/java/tsptest/longrunning/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"TspTest.LongRunning":"2022-06-01-preview"},"crossLanguageDefinitions":{"tsptest.longrunning.LongRunningAsyncClient":"TspTest.LongRunning","tsptest.longrunning.LongRunningAsyncClient.beginCreateJob":"TspTest.LongRunning.createJob","tsptest.longrunning.LongRunningAsyncClient.beginCreateJobWithModel":"TspTest.LongRunning.createJob","tsptest.longrunning.LongRunningAsyncClient.beginLongRunning":"TspTest.LongRunning.longRunning","tsptest.longrunning.LongRunningAsyncClient.beginLongRunningWithModel":"TspTest.LongRunning.longRunning","tsptest.longrunning.LongRunningAsyncClient.getJob":"TspTest.LongRunning.getJob","tsptest.longrunning.LongRunningAsyncClient.getJobWithResponse":"TspTest.LongRunning.getJob","tsptest.longrunning.LongRunningClient":"TspTest.LongRunning","tsptest.longrunning.LongRunningClient.beginCreateJob":"TspTest.LongRunning.createJob","tsptest.longrunning.LongRunningClient.beginCreateJobWithModel":"TspTest.LongRunning.createJob","tsptest.longrunning.LongRunningClient.beginLongRunning":"TspTest.LongRunning.longRunning","tsptest.longrunning.LongRunningClient.beginLongRunningWithModel":"TspTest.LongRunning.longRunning","tsptest.longrunning.LongRunningClient.getJob":"TspTest.LongRunning.getJob","tsptest.longrunning.LongRunningClient.getJobWithResponse":"TspTest.LongRunning.getJob","tsptest.longrunning.LongRunningClientBuilder":"TspTest.LongRunning","tsptest.longrunning.models.JobData":"TspTest.LongRunning.JobData","tsptest.longrunning.models.JobResult":"TspTest.LongRunning.JobResult","tsptest.longrunning.models.JobResultResult":"TspTest.LongRunning.JobResult.result.anonymous","tsptest.longrunning.models.JobStatus":"TspTest.LongRunning.JobStatus","tsptest.longrunning.models.OperationState":"Azure.Core.Foundations.OperationState","tsptest.longrunning.models.PollResponse":"TspTest.LongRunning.PollResponse"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/longrunning/LongRunningAsyncClient.java","src/main/java/tsptest/longrunning/LongRunningClient.java","src/main/java/tsptest/longrunning/LongRunningClientBuilder.java","src/main/java/tsptest/longrunning/LongRunningServiceVersion.java","src/main/java/tsptest/longrunning/implementation/LongRunningClientImpl.java","src/main/java/tsptest/longrunning/implementation/OperationLocationPollingStrategy.java","src/main/java/tsptest/longrunning/implementation/PollingUtils.java","src/main/java/tsptest/longrunning/implementation/SyncOperationLocationPollingStrategy.java","src/main/java/tsptest/longrunning/implementation/package-info.java","src/main/java/tsptest/longrunning/models/JobData.java","src/main/java/tsptest/longrunning/models/JobResult.java","src/main/java/tsptest/longrunning/models/JobResultResult.java","src/main/java/tsptest/longrunning/models/JobStatus.java","src/main/java/tsptest/longrunning/models/OperationState.java","src/main/java/tsptest/longrunning/models/PollResponse.java","src/main/java/tsptest/longrunning/models/package-info.java","src/main/java/tsptest/longrunning/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-methodoverride_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-methodoverride_apiview_properties.json deleted file mode 100644 index 10851663be0..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-methodoverride_apiview_properties.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.methodoverride.MethodOverrideAsyncClient": "TspTest.MethodOverride", - "tsptest.methodoverride.MethodOverrideAsyncClient.groupAll": "TspTest.MethodOverride.groupAll", - "tsptest.methodoverride.MethodOverrideAsyncClient.groupAllWithResponse": "TspTest.MethodOverride.groupAll", - "tsptest.methodoverride.MethodOverrideAsyncClient.groupExcludeBody": "TspTest.MethodOverride.groupExcludeBody", - "tsptest.methodoverride.MethodOverrideAsyncClient.groupExcludeBodyWithResponse": "TspTest.MethodOverride.groupExcludeBody", - "tsptest.methodoverride.MethodOverrideAsyncClient.groupNone": "TspTest.MethodOverride.groupNone", - "tsptest.methodoverride.MethodOverrideAsyncClient.groupNoneWithResponse": "TspTest.MethodOverride.groupNone", - "tsptest.methodoverride.MethodOverrideAsyncClient.groupPart": "TspTest.MethodOverride.groupPart", - "tsptest.methodoverride.MethodOverrideAsyncClient.groupPartETag": "TspTest.MethodOverride.groupPartETag", - "tsptest.methodoverride.MethodOverrideAsyncClient.groupPartETagWithResponse": "TspTest.MethodOverride.groupPartETag", - "tsptest.methodoverride.MethodOverrideAsyncClient.groupPartWithResponse": "TspTest.MethodOverride.groupPart", - "tsptest.methodoverride.MethodOverrideAsyncClient.groupQuery": "TspTest.MethodOverride.groupQuery", - "tsptest.methodoverride.MethodOverrideAsyncClient.groupQueryWithResponse": "TspTest.MethodOverride.groupQuery", - "tsptest.methodoverride.MethodOverrideClient": "TspTest.MethodOverride", - "tsptest.methodoverride.MethodOverrideClient.groupAll": "TspTest.MethodOverride.groupAll", - "tsptest.methodoverride.MethodOverrideClient.groupAllWithResponse": "TspTest.MethodOverride.groupAll", - "tsptest.methodoverride.MethodOverrideClient.groupExcludeBody": "TspTest.MethodOverride.groupExcludeBody", - "tsptest.methodoverride.MethodOverrideClient.groupExcludeBodyWithResponse": "TspTest.MethodOverride.groupExcludeBody", - "tsptest.methodoverride.MethodOverrideClient.groupNone": "TspTest.MethodOverride.groupNone", - "tsptest.methodoverride.MethodOverrideClient.groupNoneWithResponse": "TspTest.MethodOverride.groupNone", - "tsptest.methodoverride.MethodOverrideClient.groupPart": "TspTest.MethodOverride.groupPart", - "tsptest.methodoverride.MethodOverrideClient.groupPartETag": "TspTest.MethodOverride.groupPartETag", - "tsptest.methodoverride.MethodOverrideClient.groupPartETagWithResponse": "TspTest.MethodOverride.groupPartETag", - "tsptest.methodoverride.MethodOverrideClient.groupPartWithResponse": "TspTest.MethodOverride.groupPart", - "tsptest.methodoverride.MethodOverrideClient.groupQuery": "TspTest.MethodOverride.groupQuery", - "tsptest.methodoverride.MethodOverrideClient.groupQueryWithResponse": "TspTest.MethodOverride.groupQuery", - "tsptest.methodoverride.MethodOverrideClientBuilder": "TspTest.MethodOverride", - "tsptest.methodoverride.implementation.models.GroupAllRequest": "TspTest.MethodOverride.groupAll.Request.anonymous", - "tsptest.methodoverride.implementation.models.GroupNoneRequest": "TspTest.MethodOverride.groupNone.Request.anonymous", - "tsptest.methodoverride.implementation.models.GroupPartETagRequest": "TspTest.MethodOverride.groupPartETag.Request.anonymous", - "tsptest.methodoverride.implementation.models.GroupPartRequest": "TspTest.MethodOverride.groupPart.Request.anonymous", - "tsptest.methodoverride.models.GroupAllOptions": null, - "tsptest.methodoverride.models.GroupExcludeBodyModel": "TspTest.MethodOverride.GroupExcludeBodyModel", - "tsptest.methodoverride.models.GroupPartETagOptions": null, - "tsptest.methodoverride.models.GroupPartOptions": null, - "tsptest.methodoverride.models.GroupQueryOptions": null - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-methodoverride_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-methodoverride_metadata.json index d3b5b3eab8c..8a58fb81cab 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-methodoverride_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-methodoverride_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2022-12-01-preview","crossLanguageDefinitions":{"tsptest.methodoverride.MethodOverrideAsyncClient":"TspTest.MethodOverride","tsptest.methodoverride.MethodOverrideAsyncClient.groupAll":"TspTest.MethodOverride.groupAll","tsptest.methodoverride.MethodOverrideAsyncClient.groupAllWithResponse":"TspTest.MethodOverride.groupAll","tsptest.methodoverride.MethodOverrideAsyncClient.groupExcludeBody":"TspTest.MethodOverride.groupExcludeBody","tsptest.methodoverride.MethodOverrideAsyncClient.groupExcludeBodyWithResponse":"TspTest.MethodOverride.groupExcludeBody","tsptest.methodoverride.MethodOverrideAsyncClient.groupNone":"TspTest.MethodOverride.groupNone","tsptest.methodoverride.MethodOverrideAsyncClient.groupNoneWithResponse":"TspTest.MethodOverride.groupNone","tsptest.methodoverride.MethodOverrideAsyncClient.groupPart":"TspTest.MethodOverride.groupPart","tsptest.methodoverride.MethodOverrideAsyncClient.groupPartETag":"TspTest.MethodOverride.groupPartETag","tsptest.methodoverride.MethodOverrideAsyncClient.groupPartETagWithResponse":"TspTest.MethodOverride.groupPartETag","tsptest.methodoverride.MethodOverrideAsyncClient.groupPartWithResponse":"TspTest.MethodOverride.groupPart","tsptest.methodoverride.MethodOverrideAsyncClient.groupQuery":"TspTest.MethodOverride.groupQuery","tsptest.methodoverride.MethodOverrideAsyncClient.groupQueryWithResponse":"TspTest.MethodOverride.groupQuery","tsptest.methodoverride.MethodOverrideClient":"TspTest.MethodOverride","tsptest.methodoverride.MethodOverrideClient.groupAll":"TspTest.MethodOverride.groupAll","tsptest.methodoverride.MethodOverrideClient.groupAllWithResponse":"TspTest.MethodOverride.groupAll","tsptest.methodoverride.MethodOverrideClient.groupExcludeBody":"TspTest.MethodOverride.groupExcludeBody","tsptest.methodoverride.MethodOverrideClient.groupExcludeBodyWithResponse":"TspTest.MethodOverride.groupExcludeBody","tsptest.methodoverride.MethodOverrideClient.groupNone":"TspTest.MethodOverride.groupNone","tsptest.methodoverride.MethodOverrideClient.groupNoneWithResponse":"TspTest.MethodOverride.groupNone","tsptest.methodoverride.MethodOverrideClient.groupPart":"TspTest.MethodOverride.groupPart","tsptest.methodoverride.MethodOverrideClient.groupPartETag":"TspTest.MethodOverride.groupPartETag","tsptest.methodoverride.MethodOverrideClient.groupPartETagWithResponse":"TspTest.MethodOverride.groupPartETag","tsptest.methodoverride.MethodOverrideClient.groupPartWithResponse":"TspTest.MethodOverride.groupPart","tsptest.methodoverride.MethodOverrideClient.groupQuery":"TspTest.MethodOverride.groupQuery","tsptest.methodoverride.MethodOverrideClient.groupQueryWithResponse":"TspTest.MethodOverride.groupQuery","tsptest.methodoverride.MethodOverrideClientBuilder":"TspTest.MethodOverride","tsptest.methodoverride.implementation.models.GroupAllRequest":"TspTest.MethodOverride.groupAll.Request.anonymous","tsptest.methodoverride.implementation.models.GroupNoneRequest":"TspTest.MethodOverride.groupNone.Request.anonymous","tsptest.methodoverride.implementation.models.GroupPartETagRequest":"TspTest.MethodOverride.groupPartETag.Request.anonymous","tsptest.methodoverride.implementation.models.GroupPartRequest":"TspTest.MethodOverride.groupPart.Request.anonymous","tsptest.methodoverride.models.GroupAllOptions":null,"tsptest.methodoverride.models.GroupExcludeBodyModel":"TspTest.MethodOverride.GroupExcludeBodyModel","tsptest.methodoverride.models.GroupPartETagOptions":null,"tsptest.methodoverride.models.GroupPartOptions":null,"tsptest.methodoverride.models.GroupQueryOptions":null},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/methodoverride/MethodOverrideAsyncClient.java","src/main/java/tsptest/methodoverride/MethodOverrideClient.java","src/main/java/tsptest/methodoverride/MethodOverrideClientBuilder.java","src/main/java/tsptest/methodoverride/MethodOverrideServiceVersion.java","src/main/java/tsptest/methodoverride/implementation/MethodOverrideClientImpl.java","src/main/java/tsptest/methodoverride/implementation/models/GroupAllRequest.java","src/main/java/tsptest/methodoverride/implementation/models/GroupNoneRequest.java","src/main/java/tsptest/methodoverride/implementation/models/GroupPartETagRequest.java","src/main/java/tsptest/methodoverride/implementation/models/GroupPartRequest.java","src/main/java/tsptest/methodoverride/implementation/models/package-info.java","src/main/java/tsptest/methodoverride/implementation/package-info.java","src/main/java/tsptest/methodoverride/models/GroupAllOptions.java","src/main/java/tsptest/methodoverride/models/GroupExcludeBodyModel.java","src/main/java/tsptest/methodoverride/models/GroupPartETagOptions.java","src/main/java/tsptest/methodoverride/models/GroupPartOptions.java","src/main/java/tsptest/methodoverride/models/GroupQueryOptions.java","src/main/java/tsptest/methodoverride/models/package-info.java","src/main/java/tsptest/methodoverride/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"TspTest.MethodOverride":"2022-12-01-preview"},"crossLanguageDefinitions":{"tsptest.methodoverride.MethodOverrideAsyncClient":"TspTest.MethodOverride","tsptest.methodoverride.MethodOverrideAsyncClient.groupAll":"TspTest.MethodOverride.groupAll","tsptest.methodoverride.MethodOverrideAsyncClient.groupAllWithResponse":"TspTest.MethodOverride.groupAll","tsptest.methodoverride.MethodOverrideAsyncClient.groupExcludeBody":"TspTest.MethodOverride.groupExcludeBody","tsptest.methodoverride.MethodOverrideAsyncClient.groupExcludeBodyWithResponse":"TspTest.MethodOverride.groupExcludeBody","tsptest.methodoverride.MethodOverrideAsyncClient.groupNone":"TspTest.MethodOverride.groupNone","tsptest.methodoverride.MethodOverrideAsyncClient.groupNoneWithResponse":"TspTest.MethodOverride.groupNone","tsptest.methodoverride.MethodOverrideAsyncClient.groupPart":"TspTest.MethodOverride.groupPart","tsptest.methodoverride.MethodOverrideAsyncClient.groupPartETag":"TspTest.MethodOverride.groupPartETag","tsptest.methodoverride.MethodOverrideAsyncClient.groupPartETagWithResponse":"TspTest.MethodOverride.groupPartETag","tsptest.methodoverride.MethodOverrideAsyncClient.groupPartWithResponse":"TspTest.MethodOverride.groupPart","tsptest.methodoverride.MethodOverrideAsyncClient.groupQuery":"TspTest.MethodOverride.groupQuery","tsptest.methodoverride.MethodOverrideAsyncClient.groupQueryWithResponse":"TspTest.MethodOverride.groupQuery","tsptest.methodoverride.MethodOverrideClient":"TspTest.MethodOverride","tsptest.methodoverride.MethodOverrideClient.groupAll":"TspTest.MethodOverride.groupAll","tsptest.methodoverride.MethodOverrideClient.groupAllWithResponse":"TspTest.MethodOverride.groupAll","tsptest.methodoverride.MethodOverrideClient.groupExcludeBody":"TspTest.MethodOverride.groupExcludeBody","tsptest.methodoverride.MethodOverrideClient.groupExcludeBodyWithResponse":"TspTest.MethodOverride.groupExcludeBody","tsptest.methodoverride.MethodOverrideClient.groupNone":"TspTest.MethodOverride.groupNone","tsptest.methodoverride.MethodOverrideClient.groupNoneWithResponse":"TspTest.MethodOverride.groupNone","tsptest.methodoverride.MethodOverrideClient.groupPart":"TspTest.MethodOverride.groupPart","tsptest.methodoverride.MethodOverrideClient.groupPartETag":"TspTest.MethodOverride.groupPartETag","tsptest.methodoverride.MethodOverrideClient.groupPartETagWithResponse":"TspTest.MethodOverride.groupPartETag","tsptest.methodoverride.MethodOverrideClient.groupPartWithResponse":"TspTest.MethodOverride.groupPart","tsptest.methodoverride.MethodOverrideClient.groupQuery":"TspTest.MethodOverride.groupQuery","tsptest.methodoverride.MethodOverrideClient.groupQueryWithResponse":"TspTest.MethodOverride.groupQuery","tsptest.methodoverride.MethodOverrideClientBuilder":"TspTest.MethodOverride","tsptest.methodoverride.implementation.models.GroupAllRequest":"TspTest.MethodOverride.groupAll.Request.anonymous","tsptest.methodoverride.implementation.models.GroupNoneRequest":"TspTest.MethodOverride.groupNone.Request.anonymous","tsptest.methodoverride.implementation.models.GroupPartETagRequest":"TspTest.MethodOverride.groupPartETag.Request.anonymous","tsptest.methodoverride.implementation.models.GroupPartRequest":"TspTest.MethodOverride.groupPart.Request.anonymous","tsptest.methodoverride.models.GroupAllOptions":null,"tsptest.methodoverride.models.GroupExcludeBodyModel":"TspTest.MethodOverride.GroupExcludeBodyModel","tsptest.methodoverride.models.GroupPartETagOptions":null,"tsptest.methodoverride.models.GroupPartOptions":null,"tsptest.methodoverride.models.GroupQueryOptions":null},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/methodoverride/MethodOverrideAsyncClient.java","src/main/java/tsptest/methodoverride/MethodOverrideClient.java","src/main/java/tsptest/methodoverride/MethodOverrideClientBuilder.java","src/main/java/tsptest/methodoverride/MethodOverrideServiceVersion.java","src/main/java/tsptest/methodoverride/implementation/MethodOverrideClientImpl.java","src/main/java/tsptest/methodoverride/implementation/models/GroupAllRequest.java","src/main/java/tsptest/methodoverride/implementation/models/GroupNoneRequest.java","src/main/java/tsptest/methodoverride/implementation/models/GroupPartETagRequest.java","src/main/java/tsptest/methodoverride/implementation/models/GroupPartRequest.java","src/main/java/tsptest/methodoverride/implementation/models/package-info.java","src/main/java/tsptest/methodoverride/implementation/package-info.java","src/main/java/tsptest/methodoverride/models/GroupAllOptions.java","src/main/java/tsptest/methodoverride/models/GroupExcludeBodyModel.java","src/main/java/tsptest/methodoverride/models/GroupPartETagOptions.java","src/main/java/tsptest/methodoverride/models/GroupPartOptions.java","src/main/java/tsptest/methodoverride/models/GroupQueryOptions.java","src/main/java/tsptest/methodoverride/models/package-info.java","src/main/java/tsptest/methodoverride/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-model_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-model_apiview_properties.json deleted file mode 100644 index 4e61494580d..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-model_apiview_properties.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.model.ModelAsyncClient": "TspTest.Model.ModelOp", - "tsptest.model.ModelAsyncClient.get3": "TspTest.Model.ModelOp.get3", - "tsptest.model.ModelAsyncClient.get3WithResponse": "TspTest.Model.ModelOp.get3", - "tsptest.model.ModelAsyncClient.put1": "TspTest.Model.ModelOp.put1", - "tsptest.model.ModelAsyncClient.put1WithResponse": "TspTest.Model.ModelOp.put1", - "tsptest.model.ModelAsyncClient.put2": "TspTest.Model.ModelOp.put2", - "tsptest.model.ModelAsyncClient.put2WithResponse": "TspTest.Model.ModelOp.put2", - "tsptest.model.ModelAsyncClient.putNested": "TspTest.Model.ModelOp.putNested", - "tsptest.model.ModelAsyncClient.putNestedWithResponse": "TspTest.Model.ModelOp.putNested", - "tsptest.model.ModelClient": "TspTest.Model.ModelOp", - "tsptest.model.ModelClient.get3": "TspTest.Model.ModelOp.get3", - "tsptest.model.ModelClient.get3WithResponse": "TspTest.Model.ModelOp.get3", - "tsptest.model.ModelClient.put1": "TspTest.Model.ModelOp.put1", - "tsptest.model.ModelClient.put1WithResponse": "TspTest.Model.ModelOp.put1", - "tsptest.model.ModelClient.put2": "TspTest.Model.ModelOp.put2", - "tsptest.model.ModelClient.put2WithResponse": "TspTest.Model.ModelOp.put2", - "tsptest.model.ModelClient.putNested": "TspTest.Model.ModelOp.putNested", - "tsptest.model.ModelClient.putNestedWithResponse": "TspTest.Model.ModelOp.putNested", - "tsptest.model.ModelClientBuilder": "TspTest.Model", - "tsptest.model.models.InputOutputData2": "TspTest.Model.InputOutputData2", - "tsptest.model.models.NestedModel": "TspTest.Model.NestedModel", - "tsptest.model.models.NestedModel1": "TspTest.Model.NestedModel1", - "tsptest.model.models.NestedModel2": "TspTest.Model.NestedModel2", - "tsptest.model.models.OutputData": "TspTest.Model.OutputData", - "tsptest.model.models.OutputData3": "TspTest.Model.OutputData3", - "tsptest.model.models.Resource1": "TspTest.Model.Resource1", - "tsptest.model.models.Resource2": "TspTest.Model.Resource2", - "tsptest.model.models.Resource3": "TspTest.Model.Resource3" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-model_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-model_metadata.json index b046c907fc0..946382ba39b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-model_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-model_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.model.ModelAsyncClient":"TspTest.Model.ModelOp","tsptest.model.ModelAsyncClient.get3":"TspTest.Model.ModelOp.get3","tsptest.model.ModelAsyncClient.get3WithResponse":"TspTest.Model.ModelOp.get3","tsptest.model.ModelAsyncClient.put1":"TspTest.Model.ModelOp.put1","tsptest.model.ModelAsyncClient.put1WithResponse":"TspTest.Model.ModelOp.put1","tsptest.model.ModelAsyncClient.put2":"TspTest.Model.ModelOp.put2","tsptest.model.ModelAsyncClient.put2WithResponse":"TspTest.Model.ModelOp.put2","tsptest.model.ModelAsyncClient.putNested":"TspTest.Model.ModelOp.putNested","tsptest.model.ModelAsyncClient.putNestedWithResponse":"TspTest.Model.ModelOp.putNested","tsptest.model.ModelClient":"TspTest.Model.ModelOp","tsptest.model.ModelClient.get3":"TspTest.Model.ModelOp.get3","tsptest.model.ModelClient.get3WithResponse":"TspTest.Model.ModelOp.get3","tsptest.model.ModelClient.put1":"TspTest.Model.ModelOp.put1","tsptest.model.ModelClient.put1WithResponse":"TspTest.Model.ModelOp.put1","tsptest.model.ModelClient.put2":"TspTest.Model.ModelOp.put2","tsptest.model.ModelClient.put2WithResponse":"TspTest.Model.ModelOp.put2","tsptest.model.ModelClient.putNested":"TspTest.Model.ModelOp.putNested","tsptest.model.ModelClient.putNestedWithResponse":"TspTest.Model.ModelOp.putNested","tsptest.model.ModelClientBuilder":"TspTest.Model","tsptest.model.models.InputOutputData2":"TspTest.Model.InputOutputData2","tsptest.model.models.NestedModel":"TspTest.Model.NestedModel","tsptest.model.models.NestedModel1":"TspTest.Model.NestedModel1","tsptest.model.models.NestedModel2":"TspTest.Model.NestedModel2","tsptest.model.models.OutputData":"TspTest.Model.OutputData","tsptest.model.models.OutputData3":"TspTest.Model.OutputData3","tsptest.model.models.Resource1":"TspTest.Model.Resource1","tsptest.model.models.Resource2":"TspTest.Model.Resource2","tsptest.model.models.Resource3":"TspTest.Model.Resource3"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/model/ModelAsyncClient.java","src/main/java/tsptest/model/ModelClient.java","src/main/java/tsptest/model/ModelClientBuilder.java","src/main/java/tsptest/model/implementation/ModelClientImpl.java","src/main/java/tsptest/model/implementation/ModelOpsImpl.java","src/main/java/tsptest/model/implementation/package-info.java","src/main/java/tsptest/model/models/InputOutputData2.java","src/main/java/tsptest/model/models/NestedModel.java","src/main/java/tsptest/model/models/NestedModel1.java","src/main/java/tsptest/model/models/NestedModel2.java","src/main/java/tsptest/model/models/OutputData.java","src/main/java/tsptest/model/models/OutputData3.java","src/main/java/tsptest/model/models/Resource1.java","src/main/java/tsptest/model/models/Resource2.java","src/main/java/tsptest/model/models/Resource3.java","src/main/java/tsptest/model/models/package-info.java","src/main/java/tsptest/model/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.model.ModelAsyncClient":"TspTest.Model.ModelOp","tsptest.model.ModelAsyncClient.get3":"TspTest.Model.ModelOp.get3","tsptest.model.ModelAsyncClient.get3WithResponse":"TspTest.Model.ModelOp.get3","tsptest.model.ModelAsyncClient.put1":"TspTest.Model.ModelOp.put1","tsptest.model.ModelAsyncClient.put1WithResponse":"TspTest.Model.ModelOp.put1","tsptest.model.ModelAsyncClient.put2":"TspTest.Model.ModelOp.put2","tsptest.model.ModelAsyncClient.put2WithResponse":"TspTest.Model.ModelOp.put2","tsptest.model.ModelAsyncClient.putNested":"TspTest.Model.ModelOp.putNested","tsptest.model.ModelAsyncClient.putNestedWithResponse":"TspTest.Model.ModelOp.putNested","tsptest.model.ModelClient":"TspTest.Model.ModelOp","tsptest.model.ModelClient.get3":"TspTest.Model.ModelOp.get3","tsptest.model.ModelClient.get3WithResponse":"TspTest.Model.ModelOp.get3","tsptest.model.ModelClient.put1":"TspTest.Model.ModelOp.put1","tsptest.model.ModelClient.put1WithResponse":"TspTest.Model.ModelOp.put1","tsptest.model.ModelClient.put2":"TspTest.Model.ModelOp.put2","tsptest.model.ModelClient.put2WithResponse":"TspTest.Model.ModelOp.put2","tsptest.model.ModelClient.putNested":"TspTest.Model.ModelOp.putNested","tsptest.model.ModelClient.putNestedWithResponse":"TspTest.Model.ModelOp.putNested","tsptest.model.ModelClientBuilder":"TspTest.Model","tsptest.model.models.InputOutputData2":"TspTest.Model.InputOutputData2","tsptest.model.models.NestedModel":"TspTest.Model.NestedModel","tsptest.model.models.NestedModel1":"TspTest.Model.NestedModel1","tsptest.model.models.NestedModel2":"TspTest.Model.NestedModel2","tsptest.model.models.OutputData":"TspTest.Model.OutputData","tsptest.model.models.OutputData3":"TspTest.Model.OutputData3","tsptest.model.models.Resource1":"TspTest.Model.Resource1","tsptest.model.models.Resource2":"TspTest.Model.Resource2","tsptest.model.models.Resource3":"TspTest.Model.Resource3"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/model/ModelAsyncClient.java","src/main/java/tsptest/model/ModelClient.java","src/main/java/tsptest/model/ModelClientBuilder.java","src/main/java/tsptest/model/implementation/ModelClientImpl.java","src/main/java/tsptest/model/implementation/ModelOpsImpl.java","src/main/java/tsptest/model/implementation/package-info.java","src/main/java/tsptest/model/models/InputOutputData2.java","src/main/java/tsptest/model/models/NestedModel.java","src/main/java/tsptest/model/models/NestedModel1.java","src/main/java/tsptest/model/models/NestedModel2.java","src/main/java/tsptest/model/models/OutputData.java","src/main/java/tsptest/model/models/OutputData3.java","src/main/java/tsptest/model/models/Resource1.java","src/main/java/tsptest/model/models/Resource2.java","src/main/java/tsptest/model/models/Resource3.java","src/main/java/tsptest/model/models/package-info.java","src/main/java/tsptest/model/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-multicontenttypes_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-multicontenttypes_apiview_properties.json deleted file mode 100644 index e22e3a1a0a4..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-multicontenttypes_apiview_properties.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.multicontenttypes.MultiContentTypesAsyncClient": "TspTest.MultiContentTypes", - "tsptest.multicontenttypes.MultiContentTypesClient": "TspTest.MultiContentTypes", - "tsptest.multicontenttypes.MultiContentTypesClientBuilder": "TspTest.MultiContentTypes", - "tsptest.multicontenttypes.MultipleContentTypesOnRequestAsyncClient": "TspTest.MultiContentTypes.MultipleContentTypesOnRequest", - "tsptest.multicontenttypes.MultipleContentTypesOnRequestAsyncClient.uploadJsonWithMultiBodyTypesForMultiContentTypes": "TspTest.MultiContentTypes.MultipleContentTypesOnRequest.uploadJsonWithMultiBodyTypesForMultiContentTypes", - "tsptest.multicontenttypes.MultipleContentTypesOnRequestAsyncClient.uploadJsonWithMultiBodyTypesForMultiContentTypesWithResponse": "TspTest.MultiContentTypes.MultipleContentTypesOnRequest.uploadJsonWithMultiBodyTypesForMultiContentTypes", - "tsptest.multicontenttypes.MultipleContentTypesOnRequestClient": "TspTest.MultiContentTypes.MultipleContentTypesOnRequest", - "tsptest.multicontenttypes.MultipleContentTypesOnRequestClient.uploadJsonWithMultiBodyTypesForMultiContentTypes": "TspTest.MultiContentTypes.MultipleContentTypesOnRequest.uploadJsonWithMultiBodyTypesForMultiContentTypes", - "tsptest.multicontenttypes.MultipleContentTypesOnRequestClient.uploadJsonWithMultiBodyTypesForMultiContentTypesWithResponse": "TspTest.MultiContentTypes.MultipleContentTypesOnRequest.uploadJsonWithMultiBodyTypesForMultiContentTypes", - "tsptest.multicontenttypes.SingleContentTypeAsyncClient": "TspTest.MultiContentTypes.SingleContentType", - "tsptest.multicontenttypes.SingleContentTypeAsyncClient.downloadImageForSingleContentType": "TspTest.MultiContentTypes.SingleContentType.downloadImageForSingleContentType", - "tsptest.multicontenttypes.SingleContentTypeAsyncClient.downloadImageForSingleContentTypeWithResponse": "TspTest.MultiContentTypes.SingleContentType.downloadImageForSingleContentType", - "tsptest.multicontenttypes.SingleContentTypeAsyncClient.uploadImageForSingleContentType": "TspTest.MultiContentTypes.SingleContentType.uploadImageForSingleContentType", - "tsptest.multicontenttypes.SingleContentTypeAsyncClient.uploadImageForSingleContentTypeWithResponse": "TspTest.MultiContentTypes.SingleContentType.uploadImageForSingleContentType", - "tsptest.multicontenttypes.SingleContentTypeClient": "TspTest.MultiContentTypes.SingleContentType", - "tsptest.multicontenttypes.SingleContentTypeClient.downloadImageForSingleContentType": "TspTest.MultiContentTypes.SingleContentType.downloadImageForSingleContentType", - "tsptest.multicontenttypes.SingleContentTypeClient.downloadImageForSingleContentTypeWithResponse": "TspTest.MultiContentTypes.SingleContentType.downloadImageForSingleContentType", - "tsptest.multicontenttypes.SingleContentTypeClient.uploadImageForSingleContentType": "TspTest.MultiContentTypes.SingleContentType.uploadImageForSingleContentType", - "tsptest.multicontenttypes.SingleContentTypeClient.uploadImageForSingleContentTypeWithResponse": "TspTest.MultiContentTypes.SingleContentType.uploadImageForSingleContentType", - "tsptest.multicontenttypes.models.Resource": "TspTest.MultiContentTypes.Resource" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-multicontenttypes_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-multicontenttypes_metadata.json index c6679c3d9ac..9dc02726143 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-multicontenttypes_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-multicontenttypes_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.multicontenttypes.MultiContentTypesAsyncClient":"TspTest.MultiContentTypes","tsptest.multicontenttypes.MultiContentTypesClient":"TspTest.MultiContentTypes","tsptest.multicontenttypes.MultiContentTypesClientBuilder":"TspTest.MultiContentTypes","tsptest.multicontenttypes.MultipleContentTypesOnRequestAsyncClient":"TspTest.MultiContentTypes.MultipleContentTypesOnRequest","tsptest.multicontenttypes.MultipleContentTypesOnRequestAsyncClient.uploadJsonWithMultiBodyTypesForMultiContentTypes":"TspTest.MultiContentTypes.MultipleContentTypesOnRequest.uploadJsonWithMultiBodyTypesForMultiContentTypes","tsptest.multicontenttypes.MultipleContentTypesOnRequestAsyncClient.uploadJsonWithMultiBodyTypesForMultiContentTypesWithResponse":"TspTest.MultiContentTypes.MultipleContentTypesOnRequest.uploadJsonWithMultiBodyTypesForMultiContentTypes","tsptest.multicontenttypes.MultipleContentTypesOnRequestClient":"TspTest.MultiContentTypes.MultipleContentTypesOnRequest","tsptest.multicontenttypes.MultipleContentTypesOnRequestClient.uploadJsonWithMultiBodyTypesForMultiContentTypes":"TspTest.MultiContentTypes.MultipleContentTypesOnRequest.uploadJsonWithMultiBodyTypesForMultiContentTypes","tsptest.multicontenttypes.MultipleContentTypesOnRequestClient.uploadJsonWithMultiBodyTypesForMultiContentTypesWithResponse":"TspTest.MultiContentTypes.MultipleContentTypesOnRequest.uploadJsonWithMultiBodyTypesForMultiContentTypes","tsptest.multicontenttypes.SingleContentTypeAsyncClient":"TspTest.MultiContentTypes.SingleContentType","tsptest.multicontenttypes.SingleContentTypeAsyncClient.downloadImageForSingleContentType":"TspTest.MultiContentTypes.SingleContentType.downloadImageForSingleContentType","tsptest.multicontenttypes.SingleContentTypeAsyncClient.downloadImageForSingleContentTypeWithResponse":"TspTest.MultiContentTypes.SingleContentType.downloadImageForSingleContentType","tsptest.multicontenttypes.SingleContentTypeAsyncClient.uploadImageForSingleContentType":"TspTest.MultiContentTypes.SingleContentType.uploadImageForSingleContentType","tsptest.multicontenttypes.SingleContentTypeAsyncClient.uploadImageForSingleContentTypeWithResponse":"TspTest.MultiContentTypes.SingleContentType.uploadImageForSingleContentType","tsptest.multicontenttypes.SingleContentTypeClient":"TspTest.MultiContentTypes.SingleContentType","tsptest.multicontenttypes.SingleContentTypeClient.downloadImageForSingleContentType":"TspTest.MultiContentTypes.SingleContentType.downloadImageForSingleContentType","tsptest.multicontenttypes.SingleContentTypeClient.downloadImageForSingleContentTypeWithResponse":"TspTest.MultiContentTypes.SingleContentType.downloadImageForSingleContentType","tsptest.multicontenttypes.SingleContentTypeClient.uploadImageForSingleContentType":"TspTest.MultiContentTypes.SingleContentType.uploadImageForSingleContentType","tsptest.multicontenttypes.SingleContentTypeClient.uploadImageForSingleContentTypeWithResponse":"TspTest.MultiContentTypes.SingleContentType.uploadImageForSingleContentType","tsptest.multicontenttypes.models.Resource":"TspTest.MultiContentTypes.Resource"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/multicontenttypes/MultiContentTypesAsyncClient.java","src/main/java/tsptest/multicontenttypes/MultiContentTypesClient.java","src/main/java/tsptest/multicontenttypes/MultiContentTypesClientBuilder.java","src/main/java/tsptest/multicontenttypes/MultipleContentTypesOnRequestAsyncClient.java","src/main/java/tsptest/multicontenttypes/MultipleContentTypesOnRequestClient.java","src/main/java/tsptest/multicontenttypes/SingleContentTypeAsyncClient.java","src/main/java/tsptest/multicontenttypes/SingleContentTypeClient.java","src/main/java/tsptest/multicontenttypes/implementation/MultiContentTypesClientImpl.java","src/main/java/tsptest/multicontenttypes/implementation/MultipleContentTypesOnRequestsImpl.java","src/main/java/tsptest/multicontenttypes/implementation/SingleContentTypesImpl.java","src/main/java/tsptest/multicontenttypes/implementation/package-info.java","src/main/java/tsptest/multicontenttypes/models/Resource.java","src/main/java/tsptest/multicontenttypes/models/package-info.java","src/main/java/tsptest/multicontenttypes/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.multicontenttypes.MultiContentTypesAsyncClient":"TspTest.MultiContentTypes","tsptest.multicontenttypes.MultiContentTypesClient":"TspTest.MultiContentTypes","tsptest.multicontenttypes.MultiContentTypesClientBuilder":"TspTest.MultiContentTypes","tsptest.multicontenttypes.MultipleContentTypesOnRequestAsyncClient":"TspTest.MultiContentTypes.MultipleContentTypesOnRequest","tsptest.multicontenttypes.MultipleContentTypesOnRequestAsyncClient.uploadJsonWithMultiBodyTypesForMultiContentTypes":"TspTest.MultiContentTypes.MultipleContentTypesOnRequest.uploadJsonWithMultiBodyTypesForMultiContentTypes","tsptest.multicontenttypes.MultipleContentTypesOnRequestAsyncClient.uploadJsonWithMultiBodyTypesForMultiContentTypesWithResponse":"TspTest.MultiContentTypes.MultipleContentTypesOnRequest.uploadJsonWithMultiBodyTypesForMultiContentTypes","tsptest.multicontenttypes.MultipleContentTypesOnRequestClient":"TspTest.MultiContentTypes.MultipleContentTypesOnRequest","tsptest.multicontenttypes.MultipleContentTypesOnRequestClient.uploadJsonWithMultiBodyTypesForMultiContentTypes":"TspTest.MultiContentTypes.MultipleContentTypesOnRequest.uploadJsonWithMultiBodyTypesForMultiContentTypes","tsptest.multicontenttypes.MultipleContentTypesOnRequestClient.uploadJsonWithMultiBodyTypesForMultiContentTypesWithResponse":"TspTest.MultiContentTypes.MultipleContentTypesOnRequest.uploadJsonWithMultiBodyTypesForMultiContentTypes","tsptest.multicontenttypes.SingleContentTypeAsyncClient":"TspTest.MultiContentTypes.SingleContentType","tsptest.multicontenttypes.SingleContentTypeAsyncClient.downloadImageForSingleContentType":"TspTest.MultiContentTypes.SingleContentType.downloadImageForSingleContentType","tsptest.multicontenttypes.SingleContentTypeAsyncClient.downloadImageForSingleContentTypeWithResponse":"TspTest.MultiContentTypes.SingleContentType.downloadImageForSingleContentType","tsptest.multicontenttypes.SingleContentTypeAsyncClient.uploadImageForSingleContentType":"TspTest.MultiContentTypes.SingleContentType.uploadImageForSingleContentType","tsptest.multicontenttypes.SingleContentTypeAsyncClient.uploadImageForSingleContentTypeWithResponse":"TspTest.MultiContentTypes.SingleContentType.uploadImageForSingleContentType","tsptest.multicontenttypes.SingleContentTypeClient":"TspTest.MultiContentTypes.SingleContentType","tsptest.multicontenttypes.SingleContentTypeClient.downloadImageForSingleContentType":"TspTest.MultiContentTypes.SingleContentType.downloadImageForSingleContentType","tsptest.multicontenttypes.SingleContentTypeClient.downloadImageForSingleContentTypeWithResponse":"TspTest.MultiContentTypes.SingleContentType.downloadImageForSingleContentType","tsptest.multicontenttypes.SingleContentTypeClient.uploadImageForSingleContentType":"TspTest.MultiContentTypes.SingleContentType.uploadImageForSingleContentType","tsptest.multicontenttypes.SingleContentTypeClient.uploadImageForSingleContentTypeWithResponse":"TspTest.MultiContentTypes.SingleContentType.uploadImageForSingleContentType","tsptest.multicontenttypes.models.Resource":"TspTest.MultiContentTypes.Resource"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/multicontenttypes/MultiContentTypesAsyncClient.java","src/main/java/tsptest/multicontenttypes/MultiContentTypesClient.java","src/main/java/tsptest/multicontenttypes/MultiContentTypesClientBuilder.java","src/main/java/tsptest/multicontenttypes/MultipleContentTypesOnRequestAsyncClient.java","src/main/java/tsptest/multicontenttypes/MultipleContentTypesOnRequestClient.java","src/main/java/tsptest/multicontenttypes/SingleContentTypeAsyncClient.java","src/main/java/tsptest/multicontenttypes/SingleContentTypeClient.java","src/main/java/tsptest/multicontenttypes/implementation/MultiContentTypesClientImpl.java","src/main/java/tsptest/multicontenttypes/implementation/MultipleContentTypesOnRequestsImpl.java","src/main/java/tsptest/multicontenttypes/implementation/SingleContentTypesImpl.java","src/main/java/tsptest/multicontenttypes/implementation/package-info.java","src/main/java/tsptest/multicontenttypes/models/Resource.java","src/main/java/tsptest/multicontenttypes/models/package-info.java","src/main/java/tsptest/multicontenttypes/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-multipart_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-multipart_apiview_properties.json deleted file mode 100644 index 80c378ecf48..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-multipart_apiview_properties.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.multipart.MultipartAsyncClient": "TspTest.Multipart", - "tsptest.multipart.MultipartAsyncClient.upload": "TspTest.Multipart.upload", - "tsptest.multipart.MultipartAsyncClient.uploadHttpPart": "TspTest.Multipart.uploadHttpPart", - "tsptest.multipart.MultipartAsyncClient.uploadHttpPartWithResponse": "TspTest.Multipart.uploadHttpPart", - "tsptest.multipart.MultipartAsyncClient.uploadWithResponse": "TspTest.Multipart.upload", - "tsptest.multipart.MultipartClient": "TspTest.Multipart", - "tsptest.multipart.MultipartClient.upload": "TspTest.Multipart.upload", - "tsptest.multipart.MultipartClient.uploadHttpPart": "TspTest.Multipart.uploadHttpPart", - "tsptest.multipart.MultipartClient.uploadHttpPartWithResponse": "TspTest.Multipart.uploadHttpPart", - "tsptest.multipart.MultipartClient.uploadWithResponse": "TspTest.Multipart.upload", - "tsptest.multipart.MultipartClientBuilder": "TspTest.Multipart", - "tsptest.multipart.models.FileDataFileDetails": null, - "tsptest.multipart.models.FileDetails": "TypeSpec.Http.File", - "tsptest.multipart.models.FormData": "TspTest.Multipart.FormData", - "tsptest.multipart.models.ImageFileDetails": null, - "tsptest.multipart.models.ImageType": "TspTest.Multipart.ImageType", - "tsptest.multipart.models.InheritFileData": "TspTest.Multipart.Inherit2File", - "tsptest.multipart.models.Size": "TspTest.Multipart.Size", - "tsptest.multipart.models.UploadHttpPartRequest": "TspTest.Multipart.uploadHttpPart.Request.anonymous" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-multipart_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-multipart_metadata.json index ebc522ead6f..5eeaeb34714 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-multipart_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-multipart_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.multipart.MultipartAsyncClient":"TspTest.Multipart","tsptest.multipart.MultipartAsyncClient.upload":"TspTest.Multipart.upload","tsptest.multipart.MultipartAsyncClient.uploadHttpPart":"TspTest.Multipart.uploadHttpPart","tsptest.multipart.MultipartAsyncClient.uploadHttpPartWithResponse":"TspTest.Multipart.uploadHttpPart","tsptest.multipart.MultipartAsyncClient.uploadWithResponse":"TspTest.Multipart.upload","tsptest.multipart.MultipartClient":"TspTest.Multipart","tsptest.multipart.MultipartClient.upload":"TspTest.Multipart.upload","tsptest.multipart.MultipartClient.uploadHttpPart":"TspTest.Multipart.uploadHttpPart","tsptest.multipart.MultipartClient.uploadHttpPartWithResponse":"TspTest.Multipart.uploadHttpPart","tsptest.multipart.MultipartClient.uploadWithResponse":"TspTest.Multipart.upload","tsptest.multipart.MultipartClientBuilder":"TspTest.Multipart","tsptest.multipart.models.FileDataFileDetails":null,"tsptest.multipart.models.FileDetails":"TypeSpec.Http.File","tsptest.multipart.models.FormData":"TspTest.Multipart.FormData","tsptest.multipart.models.ImageFileDetails":null,"tsptest.multipart.models.ImageType":"TspTest.Multipart.ImageType","tsptest.multipart.models.InheritFileData":"TspTest.Multipart.Inherit2File","tsptest.multipart.models.Size":"TspTest.Multipart.Size","tsptest.multipart.models.UploadHttpPartRequest":"TspTest.Multipart.uploadHttpPart.Request.anonymous"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/multipart/MultipartAsyncClient.java","src/main/java/tsptest/multipart/MultipartClient.java","src/main/java/tsptest/multipart/MultipartClientBuilder.java","src/main/java/tsptest/multipart/implementation/MultipartClientImpl.java","src/main/java/tsptest/multipart/implementation/MultipartFormDataHelper.java","src/main/java/tsptest/multipart/implementation/package-info.java","src/main/java/tsptest/multipart/models/FileDataFileDetails.java","src/main/java/tsptest/multipart/models/FileDetails.java","src/main/java/tsptest/multipart/models/FormData.java","src/main/java/tsptest/multipart/models/ImageFileDetails.java","src/main/java/tsptest/multipart/models/ImageType.java","src/main/java/tsptest/multipart/models/InheritFileData.java","src/main/java/tsptest/multipart/models/Size.java","src/main/java/tsptest/multipart/models/UploadHttpPartRequest.java","src/main/java/tsptest/multipart/models/package-info.java","src/main/java/tsptest/multipart/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.multipart.MultipartAsyncClient":"TspTest.Multipart","tsptest.multipart.MultipartAsyncClient.upload":"TspTest.Multipart.upload","tsptest.multipart.MultipartAsyncClient.uploadHttpPart":"TspTest.Multipart.uploadHttpPart","tsptest.multipart.MultipartAsyncClient.uploadHttpPartWithResponse":"TspTest.Multipart.uploadHttpPart","tsptest.multipart.MultipartAsyncClient.uploadWithResponse":"TspTest.Multipart.upload","tsptest.multipart.MultipartClient":"TspTest.Multipart","tsptest.multipart.MultipartClient.upload":"TspTest.Multipart.upload","tsptest.multipart.MultipartClient.uploadHttpPart":"TspTest.Multipart.uploadHttpPart","tsptest.multipart.MultipartClient.uploadHttpPartWithResponse":"TspTest.Multipart.uploadHttpPart","tsptest.multipart.MultipartClient.uploadWithResponse":"TspTest.Multipart.upload","tsptest.multipart.MultipartClientBuilder":"TspTest.Multipart","tsptest.multipart.models.FileData2FileDetails":"TypeSpec.Http.File","tsptest.multipart.models.FileDataFileDetails":null,"tsptest.multipart.models.FormData":"TspTest.Multipart.FormData","tsptest.multipart.models.ImageFileDetails":null,"tsptest.multipart.models.ImageType":"TspTest.Multipart.ImageType","tsptest.multipart.models.InheritFileData":"TspTest.Multipart.Inherit2File","tsptest.multipart.models.Size":"TspTest.Multipart.Size","tsptest.multipart.models.UploadHttpPartRequest":"TspTest.Multipart.uploadHttpPart.Request.anonymous"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/multipart/MultipartAsyncClient.java","src/main/java/tsptest/multipart/MultipartClient.java","src/main/java/tsptest/multipart/MultipartClientBuilder.java","src/main/java/tsptest/multipart/implementation/MultipartClientImpl.java","src/main/java/tsptest/multipart/implementation/MultipartFormDataHelper.java","src/main/java/tsptest/multipart/implementation/package-info.java","src/main/java/tsptest/multipart/models/FileData2FileDetails.java","src/main/java/tsptest/multipart/models/FileDataFileDetails.java","src/main/java/tsptest/multipart/models/FormData.java","src/main/java/tsptest/multipart/models/ImageFileDetails.java","src/main/java/tsptest/multipart/models/ImageType.java","src/main/java/tsptest/multipart/models/InheritFileData.java","src/main/java/tsptest/multipart/models/Size.java","src/main/java/tsptest/multipart/models/UploadHttpPartRequest.java","src/main/java/tsptest/multipart/models/package-info.java","src/main/java/tsptest/multipart/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-namespaceclient_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-namespaceclient_apiview_properties.json deleted file mode 100644 index a177c21a899..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-namespaceclient_apiview_properties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.namespaceclient.NamespaceAsyncClient": "TspTest.NamespaceClient", - "tsptest.namespaceclient.NamespaceAsyncClient.get": "TspTest.NamespaceClient.get", - "tsptest.namespaceclient.NamespaceAsyncClient.getWithResponse": "TspTest.NamespaceClient.get", - "tsptest.namespaceclient.NamespaceClient": "TspTest.NamespaceClient", - "tsptest.namespaceclient.NamespaceClient.get": "TspTest.NamespaceClient.get", - "tsptest.namespaceclient.NamespaceClient.getWithResponse": "TspTest.NamespaceClient.get", - "tsptest.namespaceclient.NamespaceClientBuilder": "TspTest.NamespaceClient", - "tsptest.namespacemodel.models.Model": "TspTest.NamespaceModel.Model" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-namespaceclient_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-namespaceclient_metadata.json index c559630f57e..bfee0361391 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-namespaceclient_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-namespaceclient_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.namespaceclient.NamespaceAsyncClient":"TspTest.NamespaceClient","tsptest.namespaceclient.NamespaceAsyncClient.get":"TspTest.NamespaceClient.get","tsptest.namespaceclient.NamespaceAsyncClient.getWithResponse":"TspTest.NamespaceClient.get","tsptest.namespaceclient.NamespaceClient":"TspTest.NamespaceClient","tsptest.namespaceclient.NamespaceClient.get":"TspTest.NamespaceClient.get","tsptest.namespaceclient.NamespaceClient.getWithResponse":"TspTest.NamespaceClient.get","tsptest.namespaceclient.NamespaceClientBuilder":"TspTest.NamespaceClient","tsptest.namespacemodel.models.Model":"TspTest.NamespaceModel.Model"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/namespaceclient/NamespaceAsyncClient.java","src/main/java/tsptest/namespaceclient/NamespaceClient.java","src/main/java/tsptest/namespaceclient/NamespaceClientBuilder.java","src/main/java/tsptest/namespaceclient/implementation/NamespaceClientImpl.java","src/main/java/tsptest/namespaceclient/implementation/package-info.java","src/main/java/tsptest/namespaceclient/package-info.java","src/main/java/tsptest/namespacemodel/models/Model.java","src/main/java/tsptest/namespacemodel/models/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.namespaceclient.NamespaceAsyncClient":"TspTest.NamespaceClient","tsptest.namespaceclient.NamespaceAsyncClient.get":"TspTest.NamespaceClient.get","tsptest.namespaceclient.NamespaceAsyncClient.getWithResponse":"TspTest.NamespaceClient.get","tsptest.namespaceclient.NamespaceClient":"TspTest.NamespaceClient","tsptest.namespaceclient.NamespaceClient.get":"TspTest.NamespaceClient.get","tsptest.namespaceclient.NamespaceClient.getWithResponse":"TspTest.NamespaceClient.get","tsptest.namespaceclient.NamespaceClientBuilder":"TspTest.NamespaceClient","tsptest.namespacemodel.models.Model":"TspTest.NamespaceModel.Model"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/namespaceclient/NamespaceAsyncClient.java","src/main/java/tsptest/namespaceclient/NamespaceClient.java","src/main/java/tsptest/namespaceclient/NamespaceClientBuilder.java","src/main/java/tsptest/namespaceclient/implementation/NamespaceClientImpl.java","src/main/java/tsptest/namespaceclient/implementation/package-info.java","src/main/java/tsptest/namespaceclient/package-info.java","src/main/java/tsptest/namespacemodel/models/Model.java","src/main/java/tsptest/namespacemodel/models/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-naming_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-naming_apiview_properties.json deleted file mode 100644 index 4fcd275ff4b..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-naming_apiview_properties.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.naming.NamingAsyncClient": "TspTest.Naming.NamingOp", - "tsptest.naming.NamingAsyncClient.getAnonymous": "TspTest.Naming.NamingOp.getAnonymous", - "tsptest.naming.NamingAsyncClient.getAnonymousWithResponse": "TspTest.Naming.NamingOp.getAnonymous", - "tsptest.naming.NamingAsyncClient.post": "TspTest.Naming.NamingOp.post", - "tsptest.naming.NamingAsyncClient.postWithResponse": "TspTest.Naming.NamingOp.post", - "tsptest.naming.NamingClient": "TspTest.Naming.NamingOp", - "tsptest.naming.NamingClient.getAnonymous": "TspTest.Naming.NamingOp.getAnonymous", - "tsptest.naming.NamingClient.getAnonymousWithResponse": "TspTest.Naming.NamingOp.getAnonymous", - "tsptest.naming.NamingClient.post": "TspTest.Naming.NamingOp.post", - "tsptest.naming.NamingClient.postWithResponse": "TspTest.Naming.NamingOp.post", - "tsptest.naming.NamingClientBuilder": "TspTest.Naming", - "tsptest.naming.models.BinaryData": "TspTest.Naming.DataModel", - "tsptest.naming.models.BytesData": "TspTest.Naming.BytesData", - "tsptest.naming.models.Data": "TspTest.Naming.Data", - "tsptest.naming.models.DataRequest": "TspTest.Naming.Request", - "tsptest.naming.models.DataResponse": "TspTest.Naming.Response", - "tsptest.naming.models.DataStatus": "TspTest.Naming.StatusModel", - "tsptest.naming.models.GetAnonymousResponse": "TspTest.Naming.getAnonymous.Response.anonymous", - "tsptest.naming.models.RequestParameters": "TspTest.Naming.Request.parameters.anonymous", - "tsptest.naming.models.RequestParametersType": "TspTest.Naming.Request.parameters.type.anonymous", - "tsptest.naming.models.RunObject": "TspTest.Naming.RunObject", - "tsptest.naming.models.RunObjectLastErrorCodeRenamed": "TspTest.Naming.RunObject.last_error.code.anonymous", - "tsptest.naming.models.RunObjectLastErrorRenamed": "TspTest.Naming.RunObject.last_error.anonymous", - "tsptest.naming.models.TypesModel": "TspTest.Naming.TypesModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-naming_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-naming_metadata.json index eec462e5b7c..59c63b83621 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-naming_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-naming_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.naming.NamingAsyncClient":"TspTest.Naming.NamingOp","tsptest.naming.NamingAsyncClient.getAnonymous":"TspTest.Naming.NamingOp.getAnonymous","tsptest.naming.NamingAsyncClient.getAnonymousWithResponse":"TspTest.Naming.NamingOp.getAnonymous","tsptest.naming.NamingAsyncClient.post":"TspTest.Naming.NamingOp.post","tsptest.naming.NamingAsyncClient.postWithResponse":"TspTest.Naming.NamingOp.post","tsptest.naming.NamingClient":"TspTest.Naming.NamingOp","tsptest.naming.NamingClient.getAnonymous":"TspTest.Naming.NamingOp.getAnonymous","tsptest.naming.NamingClient.getAnonymousWithResponse":"TspTest.Naming.NamingOp.getAnonymous","tsptest.naming.NamingClient.post":"TspTest.Naming.NamingOp.post","tsptest.naming.NamingClient.postWithResponse":"TspTest.Naming.NamingOp.post","tsptest.naming.NamingClientBuilder":"TspTest.Naming","tsptest.naming.models.BinaryData":"TspTest.Naming.DataModel","tsptest.naming.models.BytesData":"TspTest.Naming.BytesData","tsptest.naming.models.Data":"TspTest.Naming.Data","tsptest.naming.models.DataRequest":"TspTest.Naming.Request","tsptest.naming.models.DataResponse":"TspTest.Naming.Response","tsptest.naming.models.DataStatus":"TspTest.Naming.StatusModel","tsptest.naming.models.GetAnonymousResponse":"TspTest.Naming.getAnonymous.Response.anonymous","tsptest.naming.models.RequestParameters":"TspTest.Naming.Request.parameters.anonymous","tsptest.naming.models.RequestParametersType":"TspTest.Naming.Request.parameters.type.anonymous","tsptest.naming.models.RunObject":"TspTest.Naming.RunObject","tsptest.naming.models.RunObjectLastErrorCodeRenamed":"TspTest.Naming.RunObject.last_error.code.anonymous","tsptest.naming.models.RunObjectLastErrorRenamed":"TspTest.Naming.RunObject.last_error.anonymous","tsptest.naming.models.TypesModel":"TspTest.Naming.TypesModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/naming/NamingAsyncClient.java","src/main/java/tsptest/naming/NamingClient.java","src/main/java/tsptest/naming/NamingClientBuilder.java","src/main/java/tsptest/naming/implementation/NamingClientImpl.java","src/main/java/tsptest/naming/implementation/NamingOpsImpl.java","src/main/java/tsptest/naming/implementation/package-info.java","src/main/java/tsptest/naming/models/BinaryData.java","src/main/java/tsptest/naming/models/BytesData.java","src/main/java/tsptest/naming/models/Data.java","src/main/java/tsptest/naming/models/DataRequest.java","src/main/java/tsptest/naming/models/DataResponse.java","src/main/java/tsptest/naming/models/DataStatus.java","src/main/java/tsptest/naming/models/GetAnonymousResponse.java","src/main/java/tsptest/naming/models/RequestParameters.java","src/main/java/tsptest/naming/models/RequestParametersType.java","src/main/java/tsptest/naming/models/RunObject.java","src/main/java/tsptest/naming/models/RunObjectLastErrorCodeRenamed.java","src/main/java/tsptest/naming/models/RunObjectLastErrorRenamed.java","src/main/java/tsptest/naming/models/TypesModel.java","src/main/java/tsptest/naming/models/package-info.java","src/main/java/tsptest/naming/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.naming.NamingAsyncClient":"TspTest.Naming.NamingOp","tsptest.naming.NamingAsyncClient.getAnonymous":"TspTest.Naming.NamingOp.getAnonymous","tsptest.naming.NamingAsyncClient.getAnonymousWithResponse":"TspTest.Naming.NamingOp.getAnonymous","tsptest.naming.NamingAsyncClient.post":"TspTest.Naming.NamingOp.post","tsptest.naming.NamingAsyncClient.postWithResponse":"TspTest.Naming.NamingOp.post","tsptest.naming.NamingClient":"TspTest.Naming.NamingOp","tsptest.naming.NamingClient.getAnonymous":"TspTest.Naming.NamingOp.getAnonymous","tsptest.naming.NamingClient.getAnonymousWithResponse":"TspTest.Naming.NamingOp.getAnonymous","tsptest.naming.NamingClient.post":"TspTest.Naming.NamingOp.post","tsptest.naming.NamingClient.postWithResponse":"TspTest.Naming.NamingOp.post","tsptest.naming.NamingClientBuilder":"TspTest.Naming","tsptest.naming.models.BinaryData":"TspTest.Naming.DataModel","tsptest.naming.models.BytesData":"TspTest.Naming.BytesData","tsptest.naming.models.Data":"TspTest.Naming.Data","tsptest.naming.models.DataRequest":"TspTest.Naming.Request","tsptest.naming.models.DataResponse":"TspTest.Naming.Response","tsptest.naming.models.DataStatus":"TspTest.Naming.StatusModel","tsptest.naming.models.GetAnonymousResponse":"TspTest.Naming.getAnonymous.Response.anonymous","tsptest.naming.models.RequestParameters":"TspTest.Naming.Request.parameters.anonymous","tsptest.naming.models.RequestParametersType":"TspTest.Naming.Request.parameters.type.anonymous","tsptest.naming.models.RunObject":"TspTest.Naming.RunObject","tsptest.naming.models.RunObjectLastErrorCodeRenamed":"TspTest.Naming.RunObject.last_error.code.anonymous","tsptest.naming.models.RunObjectLastErrorRenamed":"TspTest.Naming.RunObject.last_error.anonymous","tsptest.naming.models.TypesModel":"TspTest.Naming.TypesModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/naming/NamingAsyncClient.java","src/main/java/tsptest/naming/NamingClient.java","src/main/java/tsptest/naming/NamingClientBuilder.java","src/main/java/tsptest/naming/implementation/NamingClientImpl.java","src/main/java/tsptest/naming/implementation/NamingOpsImpl.java","src/main/java/tsptest/naming/implementation/package-info.java","src/main/java/tsptest/naming/models/BinaryData.java","src/main/java/tsptest/naming/models/BytesData.java","src/main/java/tsptest/naming/models/Data.java","src/main/java/tsptest/naming/models/DataRequest.java","src/main/java/tsptest/naming/models/DataResponse.java","src/main/java/tsptest/naming/models/DataStatus.java","src/main/java/tsptest/naming/models/GetAnonymousResponse.java","src/main/java/tsptest/naming/models/RequestParameters.java","src/main/java/tsptest/naming/models/RequestParametersType.java","src/main/java/tsptest/naming/models/RunObject.java","src/main/java/tsptest/naming/models/RunObjectLastErrorCodeRenamed.java","src/main/java/tsptest/naming/models/RunObjectLastErrorRenamed.java","src/main/java/tsptest/naming/models/TypesModel.java","src/main/java/tsptest/naming/models/package-info.java","src/main/java/tsptest/naming/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-namingjavaparser_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-namingjavaparser_apiview_properties.json deleted file mode 100644 index b9a1873b662..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-namingjavaparser_apiview_properties.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.namingjavaparser.NamingJavaParserAsyncClient": "TspTest.NamingJavaParser.NamingOp", - "tsptest.namingjavaparser.NamingJavaParserAsyncClient.getAnonymous": "TspTest.NamingJavaParser.NamingOp.getAnonymous", - "tsptest.namingjavaparser.NamingJavaParserAsyncClient.getAnonymousWithResponse": "TspTest.NamingJavaParser.NamingOp.getAnonymous", - "tsptest.namingjavaparser.NamingJavaParserAsyncClient.post": "TspTest.NamingJavaParser.NamingOp.post", - "tsptest.namingjavaparser.NamingJavaParserAsyncClient.postWithResponse": "TspTest.NamingJavaParser.NamingOp.post", - "tsptest.namingjavaparser.NamingJavaParserClient": "TspTest.NamingJavaParser.NamingOp", - "tsptest.namingjavaparser.NamingJavaParserClient.getAnonymous": "TspTest.NamingJavaParser.NamingOp.getAnonymous", - "tsptest.namingjavaparser.NamingJavaParserClient.getAnonymousWithResponse": "TspTest.NamingJavaParser.NamingOp.getAnonymous", - "tsptest.namingjavaparser.NamingJavaParserClient.post": "TspTest.NamingJavaParser.NamingOp.post", - "tsptest.namingjavaparser.NamingJavaParserClient.postWithResponse": "TspTest.NamingJavaParser.NamingOp.post", - "tsptest.namingjavaparser.NamingJavaParserClientBuilder": "TspTest.NamingJavaParser", - "tsptest.namingjavaparser.models.BinaryData": "TspTest.NamingJavaParser.DataModel", - "tsptest.namingjavaparser.models.BytesData": "TspTest.NamingJavaParser.BytesData", - "tsptest.namingjavaparser.models.Data": "TspTest.NamingJavaParser.Data", - "tsptest.namingjavaparser.models.DataRequest": "TspTest.NamingJavaParser.Request", - "tsptest.namingjavaparser.models.DataResponse": "TspTest.NamingJavaParser.Response", - "tsptest.namingjavaparser.models.DataStatus": "TspTest.NamingJavaParser.StatusModel", - "tsptest.namingjavaparser.models.GetAnonymousResponse": "TspTest.NamingJavaParser.getAnonymous.Response.anonymous", - "tsptest.namingjavaparser.models.RequestParameters": "TspTest.NamingJavaParser.Request.parameters.anonymous", - "tsptest.namingjavaparser.models.RequestParametersType": "TspTest.NamingJavaParser.Request.parameters.type.anonymous", - "tsptest.namingjavaparser.models.RunObject": "TspTest.NamingJavaParser.RunObject", - "tsptest.namingjavaparser.models.RunObjectLastError1": "TspTest.NamingJavaParser.RunObject.last_error.anonymous", - "tsptest.namingjavaparser.models.RunObjectLastErrorCode": "TspTest.NamingJavaParser.RunObject.last_error.code.anonymous", - "tsptest.namingjavaparser.models.TypesModel": "TspTest.NamingJavaParser.TypesModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-namingjavaparser_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-namingjavaparser_metadata.json index 0cb93e61ec2..d9ee4e0ef6a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-namingjavaparser_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-namingjavaparser_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.namingjavaparser.NamingJavaParserAsyncClient":"TspTest.NamingJavaParser.NamingOp","tsptest.namingjavaparser.NamingJavaParserAsyncClient.getAnonymous":"TspTest.NamingJavaParser.NamingOp.getAnonymous","tsptest.namingjavaparser.NamingJavaParserAsyncClient.getAnonymousWithResponse":"TspTest.NamingJavaParser.NamingOp.getAnonymous","tsptest.namingjavaparser.NamingJavaParserAsyncClient.post":"TspTest.NamingJavaParser.NamingOp.post","tsptest.namingjavaparser.NamingJavaParserAsyncClient.postWithResponse":"TspTest.NamingJavaParser.NamingOp.post","tsptest.namingjavaparser.NamingJavaParserClient":"TspTest.NamingJavaParser.NamingOp","tsptest.namingjavaparser.NamingJavaParserClient.getAnonymous":"TspTest.NamingJavaParser.NamingOp.getAnonymous","tsptest.namingjavaparser.NamingJavaParserClient.getAnonymousWithResponse":"TspTest.NamingJavaParser.NamingOp.getAnonymous","tsptest.namingjavaparser.NamingJavaParserClient.post":"TspTest.NamingJavaParser.NamingOp.post","tsptest.namingjavaparser.NamingJavaParserClient.postWithResponse":"TspTest.NamingJavaParser.NamingOp.post","tsptest.namingjavaparser.NamingJavaParserClientBuilder":"TspTest.NamingJavaParser","tsptest.namingjavaparser.models.BinaryData":"TspTest.NamingJavaParser.DataModel","tsptest.namingjavaparser.models.BytesData":"TspTest.NamingJavaParser.BytesData","tsptest.namingjavaparser.models.Data":"TspTest.NamingJavaParser.Data","tsptest.namingjavaparser.models.DataRequest":"TspTest.NamingJavaParser.Request","tsptest.namingjavaparser.models.DataResponse":"TspTest.NamingJavaParser.Response","tsptest.namingjavaparser.models.DataStatus":"TspTest.NamingJavaParser.StatusModel","tsptest.namingjavaparser.models.GetAnonymousResponse":"TspTest.NamingJavaParser.getAnonymous.Response.anonymous","tsptest.namingjavaparser.models.RequestParameters":"TspTest.NamingJavaParser.Request.parameters.anonymous","tsptest.namingjavaparser.models.RequestParametersType":"TspTest.NamingJavaParser.Request.parameters.type.anonymous","tsptest.namingjavaparser.models.RunObject":"TspTest.NamingJavaParser.RunObject","tsptest.namingjavaparser.models.RunObjectLastError1":"TspTest.NamingJavaParser.RunObject.last_error.anonymous","tsptest.namingjavaparser.models.RunObjectLastErrorCode":"TspTest.NamingJavaParser.RunObject.last_error.code.anonymous","tsptest.namingjavaparser.models.TypesModel":"TspTest.NamingJavaParser.TypesModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/namingjavaparser/NamingJavaParserAsyncClient.java","src/main/java/tsptest/namingjavaparser/NamingJavaParserClient.java","src/main/java/tsptest/namingjavaparser/NamingJavaParserClientBuilder.java","src/main/java/tsptest/namingjavaparser/implementation/NamingJavaParserClientImpl.java","src/main/java/tsptest/namingjavaparser/implementation/NamingOpsImpl.java","src/main/java/tsptest/namingjavaparser/implementation/package-info.java","src/main/java/tsptest/namingjavaparser/models/BinaryData.java","src/main/java/tsptest/namingjavaparser/models/BytesData.java","src/main/java/tsptest/namingjavaparser/models/Data.java","src/main/java/tsptest/namingjavaparser/models/DataRequest.java","src/main/java/tsptest/namingjavaparser/models/DataResponse.java","src/main/java/tsptest/namingjavaparser/models/DataStatus.java","src/main/java/tsptest/namingjavaparser/models/GetAnonymousResponse.java","src/main/java/tsptest/namingjavaparser/models/RequestParameters.java","src/main/java/tsptest/namingjavaparser/models/RequestParametersType.java","src/main/java/tsptest/namingjavaparser/models/RunObject.java","src/main/java/tsptest/namingjavaparser/models/RunObjectLastError1.java","src/main/java/tsptest/namingjavaparser/models/RunObjectLastErrorCode.java","src/main/java/tsptest/namingjavaparser/models/TypesModel.java","src/main/java/tsptest/namingjavaparser/models/package-info.java","src/main/java/tsptest/namingjavaparser/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.namingjavaparser.NamingJavaParserAsyncClient":"TspTest.NamingJavaParser.NamingOp","tsptest.namingjavaparser.NamingJavaParserAsyncClient.getAnonymous":"TspTest.NamingJavaParser.NamingOp.getAnonymous","tsptest.namingjavaparser.NamingJavaParserAsyncClient.getAnonymousWithResponse":"TspTest.NamingJavaParser.NamingOp.getAnonymous","tsptest.namingjavaparser.NamingJavaParserAsyncClient.post":"TspTest.NamingJavaParser.NamingOp.post","tsptest.namingjavaparser.NamingJavaParserAsyncClient.postWithResponse":"TspTest.NamingJavaParser.NamingOp.post","tsptest.namingjavaparser.NamingJavaParserClient":"TspTest.NamingJavaParser.NamingOp","tsptest.namingjavaparser.NamingJavaParserClient.getAnonymous":"TspTest.NamingJavaParser.NamingOp.getAnonymous","tsptest.namingjavaparser.NamingJavaParserClient.getAnonymousWithResponse":"TspTest.NamingJavaParser.NamingOp.getAnonymous","tsptest.namingjavaparser.NamingJavaParserClient.post":"TspTest.NamingJavaParser.NamingOp.post","tsptest.namingjavaparser.NamingJavaParserClient.postWithResponse":"TspTest.NamingJavaParser.NamingOp.post","tsptest.namingjavaparser.NamingJavaParserClientBuilder":"TspTest.NamingJavaParser","tsptest.namingjavaparser.models.BinaryData":"TspTest.NamingJavaParser.DataModel","tsptest.namingjavaparser.models.BytesData":"TspTest.NamingJavaParser.BytesData","tsptest.namingjavaparser.models.Data":"TspTest.NamingJavaParser.Data","tsptest.namingjavaparser.models.DataRequest":"TspTest.NamingJavaParser.Request","tsptest.namingjavaparser.models.DataResponse":"TspTest.NamingJavaParser.Response","tsptest.namingjavaparser.models.DataStatus":"TspTest.NamingJavaParser.StatusModel","tsptest.namingjavaparser.models.GetAnonymousResponse":"TspTest.NamingJavaParser.getAnonymous.Response.anonymous","tsptest.namingjavaparser.models.RequestParameters":"TspTest.NamingJavaParser.Request.parameters.anonymous","tsptest.namingjavaparser.models.RequestParametersType":"TspTest.NamingJavaParser.Request.parameters.type.anonymous","tsptest.namingjavaparser.models.RunObject":"TspTest.NamingJavaParser.RunObject","tsptest.namingjavaparser.models.RunObjectLastError1":"TspTest.NamingJavaParser.RunObject.last_error.anonymous","tsptest.namingjavaparser.models.RunObjectLastErrorCode":"TspTest.NamingJavaParser.RunObject.last_error.code.anonymous","tsptest.namingjavaparser.models.TypesModel":"TspTest.NamingJavaParser.TypesModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/namingjavaparser/NamingJavaParserAsyncClient.java","src/main/java/tsptest/namingjavaparser/NamingJavaParserClient.java","src/main/java/tsptest/namingjavaparser/NamingJavaParserClientBuilder.java","src/main/java/tsptest/namingjavaparser/implementation/NamingJavaParserClientImpl.java","src/main/java/tsptest/namingjavaparser/implementation/NamingOpsImpl.java","src/main/java/tsptest/namingjavaparser/implementation/package-info.java","src/main/java/tsptest/namingjavaparser/models/BinaryData.java","src/main/java/tsptest/namingjavaparser/models/BytesData.java","src/main/java/tsptest/namingjavaparser/models/Data.java","src/main/java/tsptest/namingjavaparser/models/DataRequest.java","src/main/java/tsptest/namingjavaparser/models/DataResponse.java","src/main/java/tsptest/namingjavaparser/models/DataStatus.java","src/main/java/tsptest/namingjavaparser/models/GetAnonymousResponse.java","src/main/java/tsptest/namingjavaparser/models/RequestParameters.java","src/main/java/tsptest/namingjavaparser/models/RequestParametersType.java","src/main/java/tsptest/namingjavaparser/models/RunObject.java","src/main/java/tsptest/namingjavaparser/models/RunObjectLastError1.java","src/main/java/tsptest/namingjavaparser/models/RunObjectLastErrorCode.java","src/main/java/tsptest/namingjavaparser/models/TypesModel.java","src/main/java/tsptest/namingjavaparser/models/package-info.java","src/main/java/tsptest/namingjavaparser/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-optional_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-optional_apiview_properties.json deleted file mode 100644 index 41b50abc027..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-optional_apiview_properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.optional.OptionalAsyncClient": "TspTest.Optional.OptionalOp", - "tsptest.optional.OptionalAsyncClient.put": "TspTest.Optional.OptionalOp.put", - "tsptest.optional.OptionalAsyncClient.putWithResponse": "TspTest.Optional.OptionalOp.put", - "tsptest.optional.OptionalClient": "TspTest.Optional.OptionalOp", - "tsptest.optional.OptionalClient.put": "TspTest.Optional.OptionalOp.put", - "tsptest.optional.OptionalClient.putWithResponse": "TspTest.Optional.OptionalOp.put", - "tsptest.optional.OptionalClientBuilder": "TspTest.Optional", - "tsptest.optional.models.AllPropertiesOptional": "TspTest.Optional.AllPropertiesOptional", - "tsptest.optional.models.ImmutableModel": "TspTest.Optional.Immutable", - "tsptest.optional.models.Optional": "TspTest.Optional.Optional" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-optional_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-optional_metadata.json index dae73d46a49..bc56b51a8a9 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-optional_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-optional_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.optional.OptionalAsyncClient":"TspTest.Optional.OptionalOp","tsptest.optional.OptionalAsyncClient.put":"TspTest.Optional.OptionalOp.put","tsptest.optional.OptionalAsyncClient.putWithResponse":"TspTest.Optional.OptionalOp.put","tsptest.optional.OptionalClient":"TspTest.Optional.OptionalOp","tsptest.optional.OptionalClient.put":"TspTest.Optional.OptionalOp.put","tsptest.optional.OptionalClient.putWithResponse":"TspTest.Optional.OptionalOp.put","tsptest.optional.OptionalClientBuilder":"TspTest.Optional","tsptest.optional.models.AllPropertiesOptional":"TspTest.Optional.AllPropertiesOptional","tsptest.optional.models.ImmutableModel":"TspTest.Optional.Immutable","tsptest.optional.models.Optional":"TspTest.Optional.Optional"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/optional/OptionalAsyncClient.java","src/main/java/tsptest/optional/OptionalClient.java","src/main/java/tsptest/optional/OptionalClientBuilder.java","src/main/java/tsptest/optional/implementation/OptionalClientImpl.java","src/main/java/tsptest/optional/implementation/OptionalOpsImpl.java","src/main/java/tsptest/optional/implementation/package-info.java","src/main/java/tsptest/optional/models/AllPropertiesOptional.java","src/main/java/tsptest/optional/models/ImmutableModel.java","src/main/java/tsptest/optional/models/Optional.java","src/main/java/tsptest/optional/models/package-info.java","src/main/java/tsptest/optional/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.optional.OptionalAsyncClient":"TspTest.Optional.OptionalOp","tsptest.optional.OptionalAsyncClient.put":"TspTest.Optional.OptionalOp.put","tsptest.optional.OptionalAsyncClient.putWithResponse":"TspTest.Optional.OptionalOp.put","tsptest.optional.OptionalClient":"TspTest.Optional.OptionalOp","tsptest.optional.OptionalClient.put":"TspTest.Optional.OptionalOp.put","tsptest.optional.OptionalClient.putWithResponse":"TspTest.Optional.OptionalOp.put","tsptest.optional.OptionalClientBuilder":"TspTest.Optional","tsptest.optional.models.AllPropertiesOptional":"TspTest.Optional.AllPropertiesOptional","tsptest.optional.models.ImmutableModel":"TspTest.Optional.Immutable","tsptest.optional.models.Optional":"TspTest.Optional.Optional"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/optional/OptionalAsyncClient.java","src/main/java/tsptest/optional/OptionalClient.java","src/main/java/tsptest/optional/OptionalClientBuilder.java","src/main/java/tsptest/optional/implementation/OptionalClientImpl.java","src/main/java/tsptest/optional/implementation/OptionalOpsImpl.java","src/main/java/tsptest/optional/implementation/package-info.java","src/main/java/tsptest/optional/models/AllPropertiesOptional.java","src/main/java/tsptest/optional/models/ImmutableModel.java","src/main/java/tsptest/optional/models/Optional.java","src/main/java/tsptest/optional/models/package-info.java","src/main/java/tsptest/optional/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-patch_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-patch_apiview_properties.json deleted file mode 100644 index 6fa1ea824c0..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-patch_apiview_properties.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.patch.PatchAsyncClient": "TspTest.Patch.Patch", - "tsptest.patch.PatchAsyncClient.createOrUpdateFish": "TspTest.Patch.Patch.createOrUpdateFish", - "tsptest.patch.PatchAsyncClient.createOrUpdateFishWithResponse": "TspTest.Patch.Patch.createOrUpdateFish", - "tsptest.patch.PatchAsyncClient.createOrUpdateOptionalResource": "TspTest.Patch.Patch.createOrUpdateOptionalResource", - "tsptest.patch.PatchAsyncClient.createOrUpdateOptionalResourceWithResponse": "TspTest.Patch.Patch.createOrUpdateOptionalResource", - "tsptest.patch.PatchAsyncClient.createOrUpdateResource": "TspTest.Patch.Patch.createOrUpdateResource", - "tsptest.patch.PatchAsyncClient.createOrUpdateResourceWithResponse": "TspTest.Patch.Patch.createOrUpdateResource", - "tsptest.patch.PatchAsyncClient.createOrUpdateSalmon": "TspTest.Patch.Patch.createOrUpdateSalmon", - "tsptest.patch.PatchAsyncClient.createOrUpdateSalmonWithResponse": "TspTest.Patch.Patch.createOrUpdateSalmon", - "tsptest.patch.PatchClient": "TspTest.Patch.Patch", - "tsptest.patch.PatchClient.createOrUpdateFish": "TspTest.Patch.Patch.createOrUpdateFish", - "tsptest.patch.PatchClient.createOrUpdateFishWithResponse": "TspTest.Patch.Patch.createOrUpdateFish", - "tsptest.patch.PatchClient.createOrUpdateOptionalResource": "TspTest.Patch.Patch.createOrUpdateOptionalResource", - "tsptest.patch.PatchClient.createOrUpdateOptionalResourceWithResponse": "TspTest.Patch.Patch.createOrUpdateOptionalResource", - "tsptest.patch.PatchClient.createOrUpdateResource": "TspTest.Patch.Patch.createOrUpdateResource", - "tsptest.patch.PatchClient.createOrUpdateResourceWithResponse": "TspTest.Patch.Patch.createOrUpdateResource", - "tsptest.patch.PatchClient.createOrUpdateSalmon": "TspTest.Patch.Patch.createOrUpdateSalmon", - "tsptest.patch.PatchClient.createOrUpdateSalmonWithResponse": "TspTest.Patch.Patch.createOrUpdateSalmon", - "tsptest.patch.PatchClientBuilder": "TspTest.Patch", - "tsptest.patch.models.Fish": "TspTest.Patch.Fish", - "tsptest.patch.models.InnerModel": "TspTest.Patch.InnerModel", - "tsptest.patch.models.Resource": "TspTest.Patch.Resource", - "tsptest.patch.models.ResourceEnumValue": "TspTest.Patch.Resource.enumValue.anonymous", - "tsptest.patch.models.Salmon": "TspTest.Patch.Salmon", - "tsptest.patch.models.SawShark": "TspTest.Patch.SawShark", - "tsptest.patch.models.Shark": "TspTest.Patch.Shark" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-patch_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-patch_metadata.json index 6bb6967928e..eef8223e96b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-patch_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-patch_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.patch.PatchAsyncClient":"TspTest.Patch.Patch","tsptest.patch.PatchAsyncClient.createOrUpdateFish":"TspTest.Patch.Patch.createOrUpdateFish","tsptest.patch.PatchAsyncClient.createOrUpdateFishWithResponse":"TspTest.Patch.Patch.createOrUpdateFish","tsptest.patch.PatchAsyncClient.createOrUpdateOptionalResource":"TspTest.Patch.Patch.createOrUpdateOptionalResource","tsptest.patch.PatchAsyncClient.createOrUpdateOptionalResourceWithResponse":"TspTest.Patch.Patch.createOrUpdateOptionalResource","tsptest.patch.PatchAsyncClient.createOrUpdateResource":"TspTest.Patch.Patch.createOrUpdateResource","tsptest.patch.PatchAsyncClient.createOrUpdateResourceWithResponse":"TspTest.Patch.Patch.createOrUpdateResource","tsptest.patch.PatchAsyncClient.createOrUpdateSalmon":"TspTest.Patch.Patch.createOrUpdateSalmon","tsptest.patch.PatchAsyncClient.createOrUpdateSalmonWithResponse":"TspTest.Patch.Patch.createOrUpdateSalmon","tsptest.patch.PatchClient":"TspTest.Patch.Patch","tsptest.patch.PatchClient.createOrUpdateFish":"TspTest.Patch.Patch.createOrUpdateFish","tsptest.patch.PatchClient.createOrUpdateFishWithResponse":"TspTest.Patch.Patch.createOrUpdateFish","tsptest.patch.PatchClient.createOrUpdateOptionalResource":"TspTest.Patch.Patch.createOrUpdateOptionalResource","tsptest.patch.PatchClient.createOrUpdateOptionalResourceWithResponse":"TspTest.Patch.Patch.createOrUpdateOptionalResource","tsptest.patch.PatchClient.createOrUpdateResource":"TspTest.Patch.Patch.createOrUpdateResource","tsptest.patch.PatchClient.createOrUpdateResourceWithResponse":"TspTest.Patch.Patch.createOrUpdateResource","tsptest.patch.PatchClient.createOrUpdateSalmon":"TspTest.Patch.Patch.createOrUpdateSalmon","tsptest.patch.PatchClient.createOrUpdateSalmonWithResponse":"TspTest.Patch.Patch.createOrUpdateSalmon","tsptest.patch.PatchClientBuilder":"TspTest.Patch","tsptest.patch.models.Fish":"TspTest.Patch.Fish","tsptest.patch.models.InnerModel":"TspTest.Patch.InnerModel","tsptest.patch.models.Resource":"TspTest.Patch.Resource","tsptest.patch.models.ResourceEnumValue":"TspTest.Patch.Resource.enumValue.anonymous","tsptest.patch.models.Salmon":"TspTest.Patch.Salmon","tsptest.patch.models.SawShark":"TspTest.Patch.SawShark","tsptest.patch.models.Shark":"TspTest.Patch.Shark"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/patch/PatchAsyncClient.java","src/main/java/tsptest/patch/PatchClient.java","src/main/java/tsptest/patch/PatchClientBuilder.java","src/main/java/tsptest/patch/implementation/JsonMergePatchHelper.java","src/main/java/tsptest/patch/implementation/PatchClientImpl.java","src/main/java/tsptest/patch/implementation/PatchesImpl.java","src/main/java/tsptest/patch/implementation/package-info.java","src/main/java/tsptest/patch/models/Fish.java","src/main/java/tsptest/patch/models/InnerModel.java","src/main/java/tsptest/patch/models/Resource.java","src/main/java/tsptest/patch/models/ResourceEnumValue.java","src/main/java/tsptest/patch/models/Salmon.java","src/main/java/tsptest/patch/models/SawShark.java","src/main/java/tsptest/patch/models/Shark.java","src/main/java/tsptest/patch/models/package-info.java","src/main/java/tsptest/patch/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.patch.PatchAsyncClient":"TspTest.Patch.Patch","tsptest.patch.PatchAsyncClient.createOrUpdateFish":"TspTest.Patch.Patch.createOrUpdateFish","tsptest.patch.PatchAsyncClient.createOrUpdateFishWithResponse":"TspTest.Patch.Patch.createOrUpdateFish","tsptest.patch.PatchAsyncClient.createOrUpdateOptionalResource":"TspTest.Patch.Patch.createOrUpdateOptionalResource","tsptest.patch.PatchAsyncClient.createOrUpdateOptionalResourceWithResponse":"TspTest.Patch.Patch.createOrUpdateOptionalResource","tsptest.patch.PatchAsyncClient.createOrUpdateResource":"TspTest.Patch.Patch.createOrUpdateResource","tsptest.patch.PatchAsyncClient.createOrUpdateResourceWithResponse":"TspTest.Patch.Patch.createOrUpdateResource","tsptest.patch.PatchAsyncClient.createOrUpdateSalmon":"TspTest.Patch.Patch.createOrUpdateSalmon","tsptest.patch.PatchAsyncClient.createOrUpdateSalmonWithResponse":"TspTest.Patch.Patch.createOrUpdateSalmon","tsptest.patch.PatchClient":"TspTest.Patch.Patch","tsptest.patch.PatchClient.createOrUpdateFish":"TspTest.Patch.Patch.createOrUpdateFish","tsptest.patch.PatchClient.createOrUpdateFishWithResponse":"TspTest.Patch.Patch.createOrUpdateFish","tsptest.patch.PatchClient.createOrUpdateOptionalResource":"TspTest.Patch.Patch.createOrUpdateOptionalResource","tsptest.patch.PatchClient.createOrUpdateOptionalResourceWithResponse":"TspTest.Patch.Patch.createOrUpdateOptionalResource","tsptest.patch.PatchClient.createOrUpdateResource":"TspTest.Patch.Patch.createOrUpdateResource","tsptest.patch.PatchClient.createOrUpdateResourceWithResponse":"TspTest.Patch.Patch.createOrUpdateResource","tsptest.patch.PatchClient.createOrUpdateSalmon":"TspTest.Patch.Patch.createOrUpdateSalmon","tsptest.patch.PatchClient.createOrUpdateSalmonWithResponse":"TspTest.Patch.Patch.createOrUpdateSalmon","tsptest.patch.PatchClientBuilder":"TspTest.Patch","tsptest.patch.models.Fish":"TspTest.Patch.Fish","tsptest.patch.models.InnerModel":"TspTest.Patch.InnerModel","tsptest.patch.models.Resource":"TspTest.Patch.Resource","tsptest.patch.models.ResourceEnumValue":"TspTest.Patch.Resource.enumValue.anonymous","tsptest.patch.models.Salmon":"TspTest.Patch.Salmon","tsptest.patch.models.SawShark":"TspTest.Patch.SawShark","tsptest.patch.models.Shark":"TspTest.Patch.Shark"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/patch/PatchAsyncClient.java","src/main/java/tsptest/patch/PatchClient.java","src/main/java/tsptest/patch/PatchClientBuilder.java","src/main/java/tsptest/patch/implementation/JsonMergePatchHelper.java","src/main/java/tsptest/patch/implementation/PatchClientImpl.java","src/main/java/tsptest/patch/implementation/PatchesImpl.java","src/main/java/tsptest/patch/implementation/package-info.java","src/main/java/tsptest/patch/models/Fish.java","src/main/java/tsptest/patch/models/InnerModel.java","src/main/java/tsptest/patch/models/Resource.java","src/main/java/tsptest/patch/models/ResourceEnumValue.java","src/main/java/tsptest/patch/models/Salmon.java","src/main/java/tsptest/patch/models/SawShark.java","src/main/java/tsptest/patch/models/Shark.java","src/main/java/tsptest/patch/models/package-info.java","src/main/java/tsptest/patch/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-protocolandconvenient_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-protocolandconvenient_apiview_properties.json deleted file mode 100644 index 27d8b6340dc..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-protocolandconvenient_apiview_properties.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient": "TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp", - "tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.beginCreateOrReplace": "TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.createOrReplace", - "tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.beginCreateOrReplaceWithModel": "TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.createOrReplace", - "tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.bothConvenientAndProtocol": "TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.bothConvenientAndProtocol", - "tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.bothConvenientAndProtocolWithResponse": "TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.bothConvenientAndProtocol", - "tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.list": "TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.list", - "tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.onlyConvenient": "TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.onlyConvenient", - "tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.onlyConvenientWithResponse": "TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.onlyConvenient", - "tsptest.protocolandconvenient.ProtocolAndConvenientClient": "TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp", - "tsptest.protocolandconvenient.ProtocolAndConvenientClient.beginCreateOrReplace": "TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.createOrReplace", - "tsptest.protocolandconvenient.ProtocolAndConvenientClient.beginCreateOrReplaceWithModel": "TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.createOrReplace", - "tsptest.protocolandconvenient.ProtocolAndConvenientClient.bothConvenientAndProtocol": "TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.bothConvenientAndProtocol", - "tsptest.protocolandconvenient.ProtocolAndConvenientClient.bothConvenientAndProtocolWithResponse": "TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.bothConvenientAndProtocol", - "tsptest.protocolandconvenient.ProtocolAndConvenientClient.list": "TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.list", - "tsptest.protocolandconvenient.ProtocolAndConvenientClient.onlyConvenient": "TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.onlyConvenient", - "tsptest.protocolandconvenient.ProtocolAndConvenientClient.onlyConvenientWithResponse": "TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.onlyConvenient", - "tsptest.protocolandconvenient.ProtocolAndConvenientClientBuilder": "TspTest.ProtocolAndConvenient", - "tsptest.protocolandconvenient.models.ResourceA": "TspTest.ProtocolAndConvenient.ResourceA", - "tsptest.protocolandconvenient.models.ResourceB": "TspTest.ProtocolAndConvenient.ResourceB", - "tsptest.protocolandconvenient.models.ResourceE": "TspTest.ProtocolAndConvenient.ResourceE", - "tsptest.protocolandconvenient.models.ResourceF": "TspTest.ProtocolAndConvenient.ResourceF", - "tsptest.protocolandconvenient.models.ResourceI": "TspTest.ProtocolAndConvenient.ResourceI", - "tsptest.protocolandconvenient.models.ResourceJ": "TspTest.ProtocolAndConvenient.ResourceJ" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-protocolandconvenient_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-protocolandconvenient_metadata.json index f51cf29b1e9..db3bb57cb41 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-protocolandconvenient_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-protocolandconvenient_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2022-06-01-preview","crossLanguageDefinitions":{"tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp","tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.beginCreateOrReplace":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.createOrReplace","tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.beginCreateOrReplaceWithModel":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.createOrReplace","tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.bothConvenientAndProtocol":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.bothConvenientAndProtocol","tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.bothConvenientAndProtocolWithResponse":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.bothConvenientAndProtocol","tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.list":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.list","tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.onlyConvenient":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.onlyConvenient","tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.onlyConvenientWithResponse":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.onlyConvenient","tsptest.protocolandconvenient.ProtocolAndConvenientClient":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp","tsptest.protocolandconvenient.ProtocolAndConvenientClient.beginCreateOrReplace":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.createOrReplace","tsptest.protocolandconvenient.ProtocolAndConvenientClient.beginCreateOrReplaceWithModel":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.createOrReplace","tsptest.protocolandconvenient.ProtocolAndConvenientClient.bothConvenientAndProtocol":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.bothConvenientAndProtocol","tsptest.protocolandconvenient.ProtocolAndConvenientClient.bothConvenientAndProtocolWithResponse":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.bothConvenientAndProtocol","tsptest.protocolandconvenient.ProtocolAndConvenientClient.list":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.list","tsptest.protocolandconvenient.ProtocolAndConvenientClient.onlyConvenient":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.onlyConvenient","tsptest.protocolandconvenient.ProtocolAndConvenientClient.onlyConvenientWithResponse":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.onlyConvenient","tsptest.protocolandconvenient.ProtocolAndConvenientClientBuilder":"TspTest.ProtocolAndConvenient","tsptest.protocolandconvenient.models.ResourceA":"TspTest.ProtocolAndConvenient.ResourceA","tsptest.protocolandconvenient.models.ResourceB":"TspTest.ProtocolAndConvenient.ResourceB","tsptest.protocolandconvenient.models.ResourceE":"TspTest.ProtocolAndConvenient.ResourceE","tsptest.protocolandconvenient.models.ResourceF":"TspTest.ProtocolAndConvenient.ResourceF","tsptest.protocolandconvenient.models.ResourceI":"TspTest.ProtocolAndConvenient.ResourceI","tsptest.protocolandconvenient.models.ResourceJ":"TspTest.ProtocolAndConvenient.ResourceJ"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/protocolandconvenient/ProtocolAndConvenientAsyncClient.java","src/main/java/tsptest/protocolandconvenient/ProtocolAndConvenientClient.java","src/main/java/tsptest/protocolandconvenient/ProtocolAndConvenientClientBuilder.java","src/main/java/tsptest/protocolandconvenient/ProtocolAndConvenientServiceVersion.java","src/main/java/tsptest/protocolandconvenient/implementation/OperationLocationPollingStrategy.java","src/main/java/tsptest/protocolandconvenient/implementation/PollingUtils.java","src/main/java/tsptest/protocolandconvenient/implementation/ProtocolAndConvenienceOpsImpl.java","src/main/java/tsptest/protocolandconvenient/implementation/ProtocolAndConvenientClientImpl.java","src/main/java/tsptest/protocolandconvenient/implementation/SyncOperationLocationPollingStrategy.java","src/main/java/tsptest/protocolandconvenient/implementation/package-info.java","src/main/java/tsptest/protocolandconvenient/models/ResourceA.java","src/main/java/tsptest/protocolandconvenient/models/ResourceB.java","src/main/java/tsptest/protocolandconvenient/models/ResourceE.java","src/main/java/tsptest/protocolandconvenient/models/ResourceF.java","src/main/java/tsptest/protocolandconvenient/models/ResourceI.java","src/main/java/tsptest/protocolandconvenient/models/ResourceJ.java","src/main/java/tsptest/protocolandconvenient/models/package-info.java","src/main/java/tsptest/protocolandconvenient/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"TspTest.ProtocolAndConvenient":"2022-06-01-preview"},"crossLanguageDefinitions":{"tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp","tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.beginCreateOrReplace":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.createOrReplace","tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.beginCreateOrReplaceWithModel":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.createOrReplace","tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.bothConvenientAndProtocol":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.bothConvenientAndProtocol","tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.bothConvenientAndProtocolWithResponse":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.bothConvenientAndProtocol","tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.list":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.list","tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.onlyConvenient":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.onlyConvenient","tsptest.protocolandconvenient.ProtocolAndConvenientAsyncClient.onlyConvenientWithResponse":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.onlyConvenient","tsptest.protocolandconvenient.ProtocolAndConvenientClient":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp","tsptest.protocolandconvenient.ProtocolAndConvenientClient.beginCreateOrReplace":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.createOrReplace","tsptest.protocolandconvenient.ProtocolAndConvenientClient.beginCreateOrReplaceWithModel":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.createOrReplace","tsptest.protocolandconvenient.ProtocolAndConvenientClient.bothConvenientAndProtocol":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.bothConvenientAndProtocol","tsptest.protocolandconvenient.ProtocolAndConvenientClient.bothConvenientAndProtocolWithResponse":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.bothConvenientAndProtocol","tsptest.protocolandconvenient.ProtocolAndConvenientClient.list":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.list","tsptest.protocolandconvenient.ProtocolAndConvenientClient.onlyConvenient":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.onlyConvenient","tsptest.protocolandconvenient.ProtocolAndConvenientClient.onlyConvenientWithResponse":"TspTest.ProtocolAndConvenient.ProtocolAndConvenienceOp.onlyConvenient","tsptest.protocolandconvenient.ProtocolAndConvenientClientBuilder":"TspTest.ProtocolAndConvenient","tsptest.protocolandconvenient.models.ResourceA":"TspTest.ProtocolAndConvenient.ResourceA","tsptest.protocolandconvenient.models.ResourceB":"TspTest.ProtocolAndConvenient.ResourceB","tsptest.protocolandconvenient.models.ResourceE":"TspTest.ProtocolAndConvenient.ResourceE","tsptest.protocolandconvenient.models.ResourceF":"TspTest.ProtocolAndConvenient.ResourceF","tsptest.protocolandconvenient.models.ResourceI":"TspTest.ProtocolAndConvenient.ResourceI","tsptest.protocolandconvenient.models.ResourceJ":"TspTest.ProtocolAndConvenient.ResourceJ"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/protocolandconvenient/ProtocolAndConvenientAsyncClient.java","src/main/java/tsptest/protocolandconvenient/ProtocolAndConvenientClient.java","src/main/java/tsptest/protocolandconvenient/ProtocolAndConvenientClientBuilder.java","src/main/java/tsptest/protocolandconvenient/ProtocolAndConvenientServiceVersion.java","src/main/java/tsptest/protocolandconvenient/implementation/OperationLocationPollingStrategy.java","src/main/java/tsptest/protocolandconvenient/implementation/PollingUtils.java","src/main/java/tsptest/protocolandconvenient/implementation/ProtocolAndConvenienceOpsImpl.java","src/main/java/tsptest/protocolandconvenient/implementation/ProtocolAndConvenientClientImpl.java","src/main/java/tsptest/protocolandconvenient/implementation/SyncOperationLocationPollingStrategy.java","src/main/java/tsptest/protocolandconvenient/implementation/package-info.java","src/main/java/tsptest/protocolandconvenient/models/ResourceA.java","src/main/java/tsptest/protocolandconvenient/models/ResourceB.java","src/main/java/tsptest/protocolandconvenient/models/ResourceE.java","src/main/java/tsptest/protocolandconvenient/models/ResourceF.java","src/main/java/tsptest/protocolandconvenient/models/ResourceI.java","src/main/java/tsptest/protocolandconvenient/models/ResourceJ.java","src/main/java/tsptest/protocolandconvenient/models/package-info.java","src/main/java/tsptest/protocolandconvenient/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-response_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-response_apiview_properties.json deleted file mode 100644 index 90a2ed4ab6c..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-response_apiview_properties.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.response.ResponseAsyncClient": "TspTest.Response.ResponseOp", - "tsptest.response.ResponseAsyncClient.beginLroInvalidPollResponse": "TspTest.Response.ResponseOp.lroInvalidPollResponse", - "tsptest.response.ResponseAsyncClient.beginLroInvalidPollResponseWithModel": "TspTest.Response.ResponseOp.lroInvalidPollResponse", - "tsptest.response.ResponseAsyncClient.beginLroInvalidResult": "TspTest.Response.ResponseOp.lroInvalidResult", - "tsptest.response.ResponseAsyncClient.beginLroInvalidResultWithModel": "TspTest.Response.ResponseOp.lroInvalidResult", - "tsptest.response.ResponseAsyncClient.createWithHeaders": "TspTest.Response.ResponseOp.createWithHeaders", - "tsptest.response.ResponseAsyncClient.createWithHeadersWithResponse": "TspTest.Response.ResponseOp.createWithHeaders", - "tsptest.response.ResponseAsyncClient.deleteWithHeaders": "TspTest.Response.ResponseOp.deleteWithHeaders", - "tsptest.response.ResponseAsyncClient.deleteWithHeadersWithResponse": "TspTest.Response.ResponseOp.deleteWithHeaders", - "tsptest.response.ResponseAsyncClient.exists": "TspTest.Response.ResponseOp.exists", - "tsptest.response.ResponseAsyncClient.existsWithResponse": "TspTest.Response.ResponseOp.exists", - "tsptest.response.ResponseAsyncClient.getAnotherArray": "TspTest.Response.ResponseOp.getAnotherArray", - "tsptest.response.ResponseAsyncClient.getAnotherArrayWithResponse": "TspTest.Response.ResponseOp.getAnotherArray", - "tsptest.response.ResponseAsyncClient.getArray": "TspTest.Response.ResponseOp.getArray", - "tsptest.response.ResponseAsyncClient.getArrayWithResponse": "TspTest.Response.ResponseOp.getArray", - "tsptest.response.ResponseAsyncClient.getBinary": "TspTest.Response.ResponseOp.getBinary", - "tsptest.response.ResponseAsyncClient.getBinaryWithResponse": "TspTest.Response.ResponseOp.getBinary", - "tsptest.response.ResponseAsyncClient.getJsonUtf8Response": "TspTest.Response.ResponseOp.getJsonUtf8Response", - "tsptest.response.ResponseAsyncClient.getJsonUtf8ResponseWithResponse": "TspTest.Response.ResponseOp.getJsonUtf8Response", - "tsptest.response.ResponseAsyncClient.getPlusJsonResponse": "TspTest.Response.ResponseOp.getPlusJsonResponse", - "tsptest.response.ResponseAsyncClient.getPlusJsonResponseWithResponse": "TspTest.Response.ResponseOp.getPlusJsonResponse", - "tsptest.response.ResponseAsyncClient.getTextBoolean": "TspTest.Response.ResponseOp.getTextBoolean", - "tsptest.response.ResponseAsyncClient.getTextBooleanWithResponse": "TspTest.Response.ResponseOp.getTextBoolean", - "tsptest.response.ResponseAsyncClient.getTextByte": "TspTest.Response.ResponseOp.getTextByte", - "tsptest.response.ResponseAsyncClient.getTextByteWithResponse": "TspTest.Response.ResponseOp.getTextByte", - "tsptest.response.ResponseAsyncClient.getTextChar": "TspTest.Response.ResponseOp.getTextChar", - "tsptest.response.ResponseAsyncClient.getTextCharWithResponse": "TspTest.Response.ResponseOp.getTextChar", - "tsptest.response.ResponseAsyncClient.getTextFloat32": "TspTest.Response.ResponseOp.getTextFloat32", - "tsptest.response.ResponseAsyncClient.getTextFloat32WithResponse": "TspTest.Response.ResponseOp.getTextFloat32", - "tsptest.response.ResponseAsyncClient.getTextFloat64": "TspTest.Response.ResponseOp.getTextFloat64", - "tsptest.response.ResponseAsyncClient.getTextFloat64WithResponse": "TspTest.Response.ResponseOp.getTextFloat64", - "tsptest.response.ResponseAsyncClient.getTextInt32": "TspTest.Response.ResponseOp.getTextInt32", - "tsptest.response.ResponseAsyncClient.getTextInt32WithResponse": "TspTest.Response.ResponseOp.getTextInt32", - "tsptest.response.ResponseAsyncClient.getTextInt64": "TspTest.Response.ResponseOp.getTextInt64", - "tsptest.response.ResponseAsyncClient.getTextInt64WithResponse": "TspTest.Response.ResponseOp.getTextInt64", - "tsptest.response.ResponseAsyncClient.getUnionResponse": "TspTest.Response.ResponseOp.getUnionResponse", - "tsptest.response.ResponseAsyncClient.getUnionResponseWithResponse": "TspTest.Response.ResponseOp.getUnionResponse", - "tsptest.response.ResponseAsyncClient.listIntegers": "TspTest.Response.ResponseOp.listIntegers", - "tsptest.response.ResponseAsyncClient.listStrings": "TspTest.Response.ResponseOp.listStrings", - "tsptest.response.ResponseClient": "TspTest.Response.ResponseOp", - "tsptest.response.ResponseClient.beginLroInvalidPollResponse": "TspTest.Response.ResponseOp.lroInvalidPollResponse", - "tsptest.response.ResponseClient.beginLroInvalidPollResponseWithModel": "TspTest.Response.ResponseOp.lroInvalidPollResponse", - "tsptest.response.ResponseClient.beginLroInvalidResult": "TspTest.Response.ResponseOp.lroInvalidResult", - "tsptest.response.ResponseClient.beginLroInvalidResultWithModel": "TspTest.Response.ResponseOp.lroInvalidResult", - "tsptest.response.ResponseClient.createWithHeaders": "TspTest.Response.ResponseOp.createWithHeaders", - "tsptest.response.ResponseClient.createWithHeadersWithResponse": "TspTest.Response.ResponseOp.createWithHeaders", - "tsptest.response.ResponseClient.deleteWithHeaders": "TspTest.Response.ResponseOp.deleteWithHeaders", - "tsptest.response.ResponseClient.deleteWithHeadersWithResponse": "TspTest.Response.ResponseOp.deleteWithHeaders", - "tsptest.response.ResponseClient.exists": "TspTest.Response.ResponseOp.exists", - "tsptest.response.ResponseClient.existsWithResponse": "TspTest.Response.ResponseOp.exists", - "tsptest.response.ResponseClient.getAnotherArray": "TspTest.Response.ResponseOp.getAnotherArray", - "tsptest.response.ResponseClient.getAnotherArrayWithResponse": "TspTest.Response.ResponseOp.getAnotherArray", - "tsptest.response.ResponseClient.getArray": "TspTest.Response.ResponseOp.getArray", - "tsptest.response.ResponseClient.getArrayWithResponse": "TspTest.Response.ResponseOp.getArray", - "tsptest.response.ResponseClient.getBinary": "TspTest.Response.ResponseOp.getBinary", - "tsptest.response.ResponseClient.getBinaryWithResponse": "TspTest.Response.ResponseOp.getBinary", - "tsptest.response.ResponseClient.getJsonUtf8Response": "TspTest.Response.ResponseOp.getJsonUtf8Response", - "tsptest.response.ResponseClient.getJsonUtf8ResponseWithResponse": "TspTest.Response.ResponseOp.getJsonUtf8Response", - "tsptest.response.ResponseClient.getPlusJsonResponse": "TspTest.Response.ResponseOp.getPlusJsonResponse", - "tsptest.response.ResponseClient.getPlusJsonResponseWithResponse": "TspTest.Response.ResponseOp.getPlusJsonResponse", - "tsptest.response.ResponseClient.getTextBoolean": "TspTest.Response.ResponseOp.getTextBoolean", - "tsptest.response.ResponseClient.getTextBooleanWithResponse": "TspTest.Response.ResponseOp.getTextBoolean", - "tsptest.response.ResponseClient.getTextByte": "TspTest.Response.ResponseOp.getTextByte", - "tsptest.response.ResponseClient.getTextByteWithResponse": "TspTest.Response.ResponseOp.getTextByte", - "tsptest.response.ResponseClient.getTextChar": "TspTest.Response.ResponseOp.getTextChar", - "tsptest.response.ResponseClient.getTextCharWithResponse": "TspTest.Response.ResponseOp.getTextChar", - "tsptest.response.ResponseClient.getTextFloat32": "TspTest.Response.ResponseOp.getTextFloat32", - "tsptest.response.ResponseClient.getTextFloat32WithResponse": "TspTest.Response.ResponseOp.getTextFloat32", - "tsptest.response.ResponseClient.getTextFloat64": "TspTest.Response.ResponseOp.getTextFloat64", - "tsptest.response.ResponseClient.getTextFloat64WithResponse": "TspTest.Response.ResponseOp.getTextFloat64", - "tsptest.response.ResponseClient.getTextInt32": "TspTest.Response.ResponseOp.getTextInt32", - "tsptest.response.ResponseClient.getTextInt32WithResponse": "TspTest.Response.ResponseOp.getTextInt32", - "tsptest.response.ResponseClient.getTextInt64": "TspTest.Response.ResponseOp.getTextInt64", - "tsptest.response.ResponseClient.getTextInt64WithResponse": "TspTest.Response.ResponseOp.getTextInt64", - "tsptest.response.ResponseClient.getUnionResponse": "TspTest.Response.ResponseOp.getUnionResponse", - "tsptest.response.ResponseClient.getUnionResponseWithResponse": "TspTest.Response.ResponseOp.getUnionResponse", - "tsptest.response.ResponseClient.listIntegers": "TspTest.Response.ResponseOp.listIntegers", - "tsptest.response.ResponseClient.listStrings": "TspTest.Response.ResponseOp.listStrings", - "tsptest.response.ResponseClientBuilder": "TspTest.Response.ResponseOp", - "tsptest.response.models.OperationDetails1": "TspTest.Response.OperationDetails1", - "tsptest.response.models.OperationDetails2": "TspTest.Response.OperationDetails2", - "tsptest.response.models.OperationState": "Azure.Core.Foundations.OperationState", - "tsptest.response.models.Resource": "TspTest.Response.Resource" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-response_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-response_metadata.json index 0710c8eb04e..ed9cc4a37e7 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-response_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-response_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2022-06-01-preview","crossLanguageDefinitions":{"tsptest.response.ResponseAsyncClient":"TspTest.Response.ResponseOp","tsptest.response.ResponseAsyncClient.beginLroInvalidPollResponse":"TspTest.Response.ResponseOp.lroInvalidPollResponse","tsptest.response.ResponseAsyncClient.beginLroInvalidPollResponseWithModel":"TspTest.Response.ResponseOp.lroInvalidPollResponse","tsptest.response.ResponseAsyncClient.beginLroInvalidResult":"TspTest.Response.ResponseOp.lroInvalidResult","tsptest.response.ResponseAsyncClient.beginLroInvalidResultWithModel":"TspTest.Response.ResponseOp.lroInvalidResult","tsptest.response.ResponseAsyncClient.createWithHeaders":"TspTest.Response.ResponseOp.createWithHeaders","tsptest.response.ResponseAsyncClient.createWithHeadersWithResponse":"TspTest.Response.ResponseOp.createWithHeaders","tsptest.response.ResponseAsyncClient.deleteWithHeaders":"TspTest.Response.ResponseOp.deleteWithHeaders","tsptest.response.ResponseAsyncClient.deleteWithHeadersWithResponse":"TspTest.Response.ResponseOp.deleteWithHeaders","tsptest.response.ResponseAsyncClient.exists":"TspTest.Response.ResponseOp.exists","tsptest.response.ResponseAsyncClient.existsWithResponse":"TspTest.Response.ResponseOp.exists","tsptest.response.ResponseAsyncClient.getAnotherArray":"TspTest.Response.ResponseOp.getAnotherArray","tsptest.response.ResponseAsyncClient.getAnotherArrayWithResponse":"TspTest.Response.ResponseOp.getAnotherArray","tsptest.response.ResponseAsyncClient.getArray":"TspTest.Response.ResponseOp.getArray","tsptest.response.ResponseAsyncClient.getArrayWithResponse":"TspTest.Response.ResponseOp.getArray","tsptest.response.ResponseAsyncClient.getBinary":"TspTest.Response.ResponseOp.getBinary","tsptest.response.ResponseAsyncClient.getBinaryWithResponse":"TspTest.Response.ResponseOp.getBinary","tsptest.response.ResponseAsyncClient.getJsonUtf8Response":"TspTest.Response.ResponseOp.getJsonUtf8Response","tsptest.response.ResponseAsyncClient.getJsonUtf8ResponseWithResponse":"TspTest.Response.ResponseOp.getJsonUtf8Response","tsptest.response.ResponseAsyncClient.getPlusJsonResponse":"TspTest.Response.ResponseOp.getPlusJsonResponse","tsptest.response.ResponseAsyncClient.getPlusJsonResponseWithResponse":"TspTest.Response.ResponseOp.getPlusJsonResponse","tsptest.response.ResponseAsyncClient.getTextBoolean":"TspTest.Response.ResponseOp.getTextBoolean","tsptest.response.ResponseAsyncClient.getTextBooleanWithResponse":"TspTest.Response.ResponseOp.getTextBoolean","tsptest.response.ResponseAsyncClient.getTextByte":"TspTest.Response.ResponseOp.getTextByte","tsptest.response.ResponseAsyncClient.getTextByteWithResponse":"TspTest.Response.ResponseOp.getTextByte","tsptest.response.ResponseAsyncClient.getTextChar":"TspTest.Response.ResponseOp.getTextChar","tsptest.response.ResponseAsyncClient.getTextCharWithResponse":"TspTest.Response.ResponseOp.getTextChar","tsptest.response.ResponseAsyncClient.getTextFloat32":"TspTest.Response.ResponseOp.getTextFloat32","tsptest.response.ResponseAsyncClient.getTextFloat32WithResponse":"TspTest.Response.ResponseOp.getTextFloat32","tsptest.response.ResponseAsyncClient.getTextFloat64":"TspTest.Response.ResponseOp.getTextFloat64","tsptest.response.ResponseAsyncClient.getTextFloat64WithResponse":"TspTest.Response.ResponseOp.getTextFloat64","tsptest.response.ResponseAsyncClient.getTextInt32":"TspTest.Response.ResponseOp.getTextInt32","tsptest.response.ResponseAsyncClient.getTextInt32WithResponse":"TspTest.Response.ResponseOp.getTextInt32","tsptest.response.ResponseAsyncClient.getTextInt64":"TspTest.Response.ResponseOp.getTextInt64","tsptest.response.ResponseAsyncClient.getTextInt64WithResponse":"TspTest.Response.ResponseOp.getTextInt64","tsptest.response.ResponseAsyncClient.getUnionResponse":"TspTest.Response.ResponseOp.getUnionResponse","tsptest.response.ResponseAsyncClient.getUnionResponseWithResponse":"TspTest.Response.ResponseOp.getUnionResponse","tsptest.response.ResponseAsyncClient.listIntegers":"TspTest.Response.ResponseOp.listIntegers","tsptest.response.ResponseAsyncClient.listStrings":"TspTest.Response.ResponseOp.listStrings","tsptest.response.ResponseClient":"TspTest.Response.ResponseOp","tsptest.response.ResponseClient.beginLroInvalidPollResponse":"TspTest.Response.ResponseOp.lroInvalidPollResponse","tsptest.response.ResponseClient.beginLroInvalidPollResponseWithModel":"TspTest.Response.ResponseOp.lroInvalidPollResponse","tsptest.response.ResponseClient.beginLroInvalidResult":"TspTest.Response.ResponseOp.lroInvalidResult","tsptest.response.ResponseClient.beginLroInvalidResultWithModel":"TspTest.Response.ResponseOp.lroInvalidResult","tsptest.response.ResponseClient.createWithHeaders":"TspTest.Response.ResponseOp.createWithHeaders","tsptest.response.ResponseClient.createWithHeadersWithResponse":"TspTest.Response.ResponseOp.createWithHeaders","tsptest.response.ResponseClient.deleteWithHeaders":"TspTest.Response.ResponseOp.deleteWithHeaders","tsptest.response.ResponseClient.deleteWithHeadersWithResponse":"TspTest.Response.ResponseOp.deleteWithHeaders","tsptest.response.ResponseClient.exists":"TspTest.Response.ResponseOp.exists","tsptest.response.ResponseClient.existsWithResponse":"TspTest.Response.ResponseOp.exists","tsptest.response.ResponseClient.getAnotherArray":"TspTest.Response.ResponseOp.getAnotherArray","tsptest.response.ResponseClient.getAnotherArrayWithResponse":"TspTest.Response.ResponseOp.getAnotherArray","tsptest.response.ResponseClient.getArray":"TspTest.Response.ResponseOp.getArray","tsptest.response.ResponseClient.getArrayWithResponse":"TspTest.Response.ResponseOp.getArray","tsptest.response.ResponseClient.getBinary":"TspTest.Response.ResponseOp.getBinary","tsptest.response.ResponseClient.getBinaryWithResponse":"TspTest.Response.ResponseOp.getBinary","tsptest.response.ResponseClient.getJsonUtf8Response":"TspTest.Response.ResponseOp.getJsonUtf8Response","tsptest.response.ResponseClient.getJsonUtf8ResponseWithResponse":"TspTest.Response.ResponseOp.getJsonUtf8Response","tsptest.response.ResponseClient.getPlusJsonResponse":"TspTest.Response.ResponseOp.getPlusJsonResponse","tsptest.response.ResponseClient.getPlusJsonResponseWithResponse":"TspTest.Response.ResponseOp.getPlusJsonResponse","tsptest.response.ResponseClient.getTextBoolean":"TspTest.Response.ResponseOp.getTextBoolean","tsptest.response.ResponseClient.getTextBooleanWithResponse":"TspTest.Response.ResponseOp.getTextBoolean","tsptest.response.ResponseClient.getTextByte":"TspTest.Response.ResponseOp.getTextByte","tsptest.response.ResponseClient.getTextByteWithResponse":"TspTest.Response.ResponseOp.getTextByte","tsptest.response.ResponseClient.getTextChar":"TspTest.Response.ResponseOp.getTextChar","tsptest.response.ResponseClient.getTextCharWithResponse":"TspTest.Response.ResponseOp.getTextChar","tsptest.response.ResponseClient.getTextFloat32":"TspTest.Response.ResponseOp.getTextFloat32","tsptest.response.ResponseClient.getTextFloat32WithResponse":"TspTest.Response.ResponseOp.getTextFloat32","tsptest.response.ResponseClient.getTextFloat64":"TspTest.Response.ResponseOp.getTextFloat64","tsptest.response.ResponseClient.getTextFloat64WithResponse":"TspTest.Response.ResponseOp.getTextFloat64","tsptest.response.ResponseClient.getTextInt32":"TspTest.Response.ResponseOp.getTextInt32","tsptest.response.ResponseClient.getTextInt32WithResponse":"TspTest.Response.ResponseOp.getTextInt32","tsptest.response.ResponseClient.getTextInt64":"TspTest.Response.ResponseOp.getTextInt64","tsptest.response.ResponseClient.getTextInt64WithResponse":"TspTest.Response.ResponseOp.getTextInt64","tsptest.response.ResponseClient.getUnionResponse":"TspTest.Response.ResponseOp.getUnionResponse","tsptest.response.ResponseClient.getUnionResponseWithResponse":"TspTest.Response.ResponseOp.getUnionResponse","tsptest.response.ResponseClient.listIntegers":"TspTest.Response.ResponseOp.listIntegers","tsptest.response.ResponseClient.listStrings":"TspTest.Response.ResponseOp.listStrings","tsptest.response.ResponseClientBuilder":"TspTest.Response.ResponseOp","tsptest.response.models.OperationDetails1":"TspTest.Response.OperationDetails1","tsptest.response.models.OperationDetails2":"TspTest.Response.OperationDetails2","tsptest.response.models.OperationState":"Azure.Core.Foundations.OperationState","tsptest.response.models.Resource":"TspTest.Response.Resource"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/response/ResponseAsyncClient.java","src/main/java/tsptest/response/ResponseClient.java","src/main/java/tsptest/response/ResponseClientBuilder.java","src/main/java/tsptest/response/ResponseServiceVersion.java","src/main/java/tsptest/response/implementation/OperationLocationPollingStrategy.java","src/main/java/tsptest/response/implementation/PollingUtils.java","src/main/java/tsptest/response/implementation/ResponseClientImpl.java","src/main/java/tsptest/response/implementation/SyncOperationLocationPollingStrategy.java","src/main/java/tsptest/response/implementation/package-info.java","src/main/java/tsptest/response/models/OperationDetails1.java","src/main/java/tsptest/response/models/OperationDetails2.java","src/main/java/tsptest/response/models/OperationState.java","src/main/java/tsptest/response/models/Resource.java","src/main/java/tsptest/response/models/package-info.java","src/main/java/tsptest/response/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"TspTest.Response":"2022-06-01-preview"},"crossLanguageDefinitions":{"tsptest.response.ResponseAsyncClient":"TspTest.Response.ResponseOp","tsptest.response.ResponseAsyncClient.beginLroInvalidPollResponse":"TspTest.Response.ResponseOp.lroInvalidPollResponse","tsptest.response.ResponseAsyncClient.beginLroInvalidPollResponseWithModel":"TspTest.Response.ResponseOp.lroInvalidPollResponse","tsptest.response.ResponseAsyncClient.beginLroInvalidResult":"TspTest.Response.ResponseOp.lroInvalidResult","tsptest.response.ResponseAsyncClient.beginLroInvalidResultWithModel":"TspTest.Response.ResponseOp.lroInvalidResult","tsptest.response.ResponseAsyncClient.createWithHeaders":"TspTest.Response.ResponseOp.createWithHeaders","tsptest.response.ResponseAsyncClient.createWithHeadersWithResponse":"TspTest.Response.ResponseOp.createWithHeaders","tsptest.response.ResponseAsyncClient.deleteWithHeaders":"TspTest.Response.ResponseOp.deleteWithHeaders","tsptest.response.ResponseAsyncClient.deleteWithHeadersWithResponse":"TspTest.Response.ResponseOp.deleteWithHeaders","tsptest.response.ResponseAsyncClient.exists":"TspTest.Response.ResponseOp.exists","tsptest.response.ResponseAsyncClient.existsWithResponse":"TspTest.Response.ResponseOp.exists","tsptest.response.ResponseAsyncClient.getAnotherArray":"TspTest.Response.ResponseOp.getAnotherArray","tsptest.response.ResponseAsyncClient.getAnotherArrayWithResponse":"TspTest.Response.ResponseOp.getAnotherArray","tsptest.response.ResponseAsyncClient.getArray":"TspTest.Response.ResponseOp.getArray","tsptest.response.ResponseAsyncClient.getArrayWithResponse":"TspTest.Response.ResponseOp.getArray","tsptest.response.ResponseAsyncClient.getBinary":"TspTest.Response.ResponseOp.getBinary","tsptest.response.ResponseAsyncClient.getBinaryWithResponse":"TspTest.Response.ResponseOp.getBinary","tsptest.response.ResponseAsyncClient.getJsonUtf8Response":"TspTest.Response.ResponseOp.getJsonUtf8Response","tsptest.response.ResponseAsyncClient.getJsonUtf8ResponseWithResponse":"TspTest.Response.ResponseOp.getJsonUtf8Response","tsptest.response.ResponseAsyncClient.getPlusJsonResponse":"TspTest.Response.ResponseOp.getPlusJsonResponse","tsptest.response.ResponseAsyncClient.getPlusJsonResponseWithResponse":"TspTest.Response.ResponseOp.getPlusJsonResponse","tsptest.response.ResponseAsyncClient.getTextBoolean":"TspTest.Response.ResponseOp.getTextBoolean","tsptest.response.ResponseAsyncClient.getTextBooleanWithResponse":"TspTest.Response.ResponseOp.getTextBoolean","tsptest.response.ResponseAsyncClient.getTextByte":"TspTest.Response.ResponseOp.getTextByte","tsptest.response.ResponseAsyncClient.getTextByteWithResponse":"TspTest.Response.ResponseOp.getTextByte","tsptest.response.ResponseAsyncClient.getTextChar":"TspTest.Response.ResponseOp.getTextChar","tsptest.response.ResponseAsyncClient.getTextCharWithResponse":"TspTest.Response.ResponseOp.getTextChar","tsptest.response.ResponseAsyncClient.getTextFloat32":"TspTest.Response.ResponseOp.getTextFloat32","tsptest.response.ResponseAsyncClient.getTextFloat32WithResponse":"TspTest.Response.ResponseOp.getTextFloat32","tsptest.response.ResponseAsyncClient.getTextFloat64":"TspTest.Response.ResponseOp.getTextFloat64","tsptest.response.ResponseAsyncClient.getTextFloat64WithResponse":"TspTest.Response.ResponseOp.getTextFloat64","tsptest.response.ResponseAsyncClient.getTextInt32":"TspTest.Response.ResponseOp.getTextInt32","tsptest.response.ResponseAsyncClient.getTextInt32WithResponse":"TspTest.Response.ResponseOp.getTextInt32","tsptest.response.ResponseAsyncClient.getTextInt64":"TspTest.Response.ResponseOp.getTextInt64","tsptest.response.ResponseAsyncClient.getTextInt64WithResponse":"TspTest.Response.ResponseOp.getTextInt64","tsptest.response.ResponseAsyncClient.getUnionResponse":"TspTest.Response.ResponseOp.getUnionResponse","tsptest.response.ResponseAsyncClient.getUnionResponseWithResponse":"TspTest.Response.ResponseOp.getUnionResponse","tsptest.response.ResponseAsyncClient.listIntegers":"TspTest.Response.ResponseOp.listIntegers","tsptest.response.ResponseAsyncClient.listStrings":"TspTest.Response.ResponseOp.listStrings","tsptest.response.ResponseClient":"TspTest.Response.ResponseOp","tsptest.response.ResponseClient.beginLroInvalidPollResponse":"TspTest.Response.ResponseOp.lroInvalidPollResponse","tsptest.response.ResponseClient.beginLroInvalidPollResponseWithModel":"TspTest.Response.ResponseOp.lroInvalidPollResponse","tsptest.response.ResponseClient.beginLroInvalidResult":"TspTest.Response.ResponseOp.lroInvalidResult","tsptest.response.ResponseClient.beginLroInvalidResultWithModel":"TspTest.Response.ResponseOp.lroInvalidResult","tsptest.response.ResponseClient.createWithHeaders":"TspTest.Response.ResponseOp.createWithHeaders","tsptest.response.ResponseClient.createWithHeadersWithResponse":"TspTest.Response.ResponseOp.createWithHeaders","tsptest.response.ResponseClient.deleteWithHeaders":"TspTest.Response.ResponseOp.deleteWithHeaders","tsptest.response.ResponseClient.deleteWithHeadersWithResponse":"TspTest.Response.ResponseOp.deleteWithHeaders","tsptest.response.ResponseClient.exists":"TspTest.Response.ResponseOp.exists","tsptest.response.ResponseClient.existsWithResponse":"TspTest.Response.ResponseOp.exists","tsptest.response.ResponseClient.getAnotherArray":"TspTest.Response.ResponseOp.getAnotherArray","tsptest.response.ResponseClient.getAnotherArrayWithResponse":"TspTest.Response.ResponseOp.getAnotherArray","tsptest.response.ResponseClient.getArray":"TspTest.Response.ResponseOp.getArray","tsptest.response.ResponseClient.getArrayWithResponse":"TspTest.Response.ResponseOp.getArray","tsptest.response.ResponseClient.getBinary":"TspTest.Response.ResponseOp.getBinary","tsptest.response.ResponseClient.getBinaryWithResponse":"TspTest.Response.ResponseOp.getBinary","tsptest.response.ResponseClient.getJsonUtf8Response":"TspTest.Response.ResponseOp.getJsonUtf8Response","tsptest.response.ResponseClient.getJsonUtf8ResponseWithResponse":"TspTest.Response.ResponseOp.getJsonUtf8Response","tsptest.response.ResponseClient.getPlusJsonResponse":"TspTest.Response.ResponseOp.getPlusJsonResponse","tsptest.response.ResponseClient.getPlusJsonResponseWithResponse":"TspTest.Response.ResponseOp.getPlusJsonResponse","tsptest.response.ResponseClient.getTextBoolean":"TspTest.Response.ResponseOp.getTextBoolean","tsptest.response.ResponseClient.getTextBooleanWithResponse":"TspTest.Response.ResponseOp.getTextBoolean","tsptest.response.ResponseClient.getTextByte":"TspTest.Response.ResponseOp.getTextByte","tsptest.response.ResponseClient.getTextByteWithResponse":"TspTest.Response.ResponseOp.getTextByte","tsptest.response.ResponseClient.getTextChar":"TspTest.Response.ResponseOp.getTextChar","tsptest.response.ResponseClient.getTextCharWithResponse":"TspTest.Response.ResponseOp.getTextChar","tsptest.response.ResponseClient.getTextFloat32":"TspTest.Response.ResponseOp.getTextFloat32","tsptest.response.ResponseClient.getTextFloat32WithResponse":"TspTest.Response.ResponseOp.getTextFloat32","tsptest.response.ResponseClient.getTextFloat64":"TspTest.Response.ResponseOp.getTextFloat64","tsptest.response.ResponseClient.getTextFloat64WithResponse":"TspTest.Response.ResponseOp.getTextFloat64","tsptest.response.ResponseClient.getTextInt32":"TspTest.Response.ResponseOp.getTextInt32","tsptest.response.ResponseClient.getTextInt32WithResponse":"TspTest.Response.ResponseOp.getTextInt32","tsptest.response.ResponseClient.getTextInt64":"TspTest.Response.ResponseOp.getTextInt64","tsptest.response.ResponseClient.getTextInt64WithResponse":"TspTest.Response.ResponseOp.getTextInt64","tsptest.response.ResponseClient.getUnionResponse":"TspTest.Response.ResponseOp.getUnionResponse","tsptest.response.ResponseClient.getUnionResponseWithResponse":"TspTest.Response.ResponseOp.getUnionResponse","tsptest.response.ResponseClient.listIntegers":"TspTest.Response.ResponseOp.listIntegers","tsptest.response.ResponseClient.listStrings":"TspTest.Response.ResponseOp.listStrings","tsptest.response.ResponseClientBuilder":"TspTest.Response.ResponseOp","tsptest.response.models.GetUnionResponseContentType":"TspTest.Response.ResponseOp.getUnionResponse.accept","tsptest.response.models.OperationDetails1":"TspTest.Response.OperationDetails1","tsptest.response.models.OperationDetails2":"TspTest.Response.OperationDetails2","tsptest.response.models.OperationState":"Azure.Core.Foundations.OperationState","tsptest.response.models.Resource":"TspTest.Response.Resource"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/response/ResponseAsyncClient.java","src/main/java/tsptest/response/ResponseClient.java","src/main/java/tsptest/response/ResponseClientBuilder.java","src/main/java/tsptest/response/ResponseServiceVersion.java","src/main/java/tsptest/response/implementation/OperationLocationPollingStrategy.java","src/main/java/tsptest/response/implementation/PollingUtils.java","src/main/java/tsptest/response/implementation/ResponseClientImpl.java","src/main/java/tsptest/response/implementation/SyncOperationLocationPollingStrategy.java","src/main/java/tsptest/response/implementation/package-info.java","src/main/java/tsptest/response/models/GetUnionResponseContentType.java","src/main/java/tsptest/response/models/OperationDetails1.java","src/main/java/tsptest/response/models/OperationDetails2.java","src/main/java/tsptest/response/models/OperationState.java","src/main/java/tsptest/response/models/Resource.java","src/main/java/tsptest/response/models/package-info.java","src/main/java/tsptest/response/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-specialchars_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-specialchars_apiview_properties.json deleted file mode 100644 index 466eacde758..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-specialchars_apiview_properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.specialchars.SpecialCharsAsyncClient": "TspTest.SpecialChars.BuiltinOp", - "tsptest.specialchars.SpecialCharsAsyncClient.read": "TspTest.SpecialChars.BuiltinOp.read", - "tsptest.specialchars.SpecialCharsAsyncClient.readWithResponse": "TspTest.SpecialChars.BuiltinOp.read", - "tsptest.specialchars.SpecialCharsClient": "TspTest.SpecialChars.BuiltinOp", - "tsptest.specialchars.SpecialCharsClient.read": "TspTest.SpecialChars.BuiltinOp.read", - "tsptest.specialchars.SpecialCharsClient.readWithResponse": "TspTest.SpecialChars.BuiltinOp.read", - "tsptest.specialchars.SpecialCharsClientBuilder": "TspTest.SpecialChars", - "tsptest.specialchars.implementation.models.ReadRequest": "TspTest.SpecialChars.read.Request.anonymous", - "tsptest.specialchars.models.Resource": "TspTest.SpecialChars.Resource" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-specialchars_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-specialchars_metadata.json index 06830ca0c57..ef4b91462d3 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-specialchars_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-specialchars_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.specialchars.SpecialCharsAsyncClient":"TspTest.SpecialChars.BuiltinOp","tsptest.specialchars.SpecialCharsAsyncClient.read":"TspTest.SpecialChars.BuiltinOp.read","tsptest.specialchars.SpecialCharsAsyncClient.readWithResponse":"TspTest.SpecialChars.BuiltinOp.read","tsptest.specialchars.SpecialCharsClient":"TspTest.SpecialChars.BuiltinOp","tsptest.specialchars.SpecialCharsClient.read":"TspTest.SpecialChars.BuiltinOp.read","tsptest.specialchars.SpecialCharsClient.readWithResponse":"TspTest.SpecialChars.BuiltinOp.read","tsptest.specialchars.SpecialCharsClientBuilder":"TspTest.SpecialChars","tsptest.specialchars.implementation.models.ReadRequest":"TspTest.SpecialChars.read.Request.anonymous","tsptest.specialchars.models.Resource":"TspTest.SpecialChars.Resource"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/specialchars/SpecialCharsAsyncClient.java","src/main/java/tsptest/specialchars/SpecialCharsClient.java","src/main/java/tsptest/specialchars/SpecialCharsClientBuilder.java","src/main/java/tsptest/specialchars/implementation/BuiltinOpsImpl.java","src/main/java/tsptest/specialchars/implementation/SpecialCharsClientImpl.java","src/main/java/tsptest/specialchars/implementation/models/ReadRequest.java","src/main/java/tsptest/specialchars/implementation/models/package-info.java","src/main/java/tsptest/specialchars/implementation/package-info.java","src/main/java/tsptest/specialchars/models/Resource.java","src/main/java/tsptest/specialchars/models/package-info.java","src/main/java/tsptest/specialchars/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.specialchars.SpecialCharsAsyncClient":"TspTest.SpecialChars.BuiltinOp","tsptest.specialchars.SpecialCharsAsyncClient.read":"TspTest.SpecialChars.BuiltinOp.read","tsptest.specialchars.SpecialCharsAsyncClient.readWithResponse":"TspTest.SpecialChars.BuiltinOp.read","tsptest.specialchars.SpecialCharsClient":"TspTest.SpecialChars.BuiltinOp","tsptest.specialchars.SpecialCharsClient.read":"TspTest.SpecialChars.BuiltinOp.read","tsptest.specialchars.SpecialCharsClient.readWithResponse":"TspTest.SpecialChars.BuiltinOp.read","tsptest.specialchars.SpecialCharsClientBuilder":"TspTest.SpecialChars","tsptest.specialchars.implementation.models.ReadRequest":"TspTest.SpecialChars.read.Request.anonymous","tsptest.specialchars.models.Resource":"TspTest.SpecialChars.Resource"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/specialchars/SpecialCharsAsyncClient.java","src/main/java/tsptest/specialchars/SpecialCharsClient.java","src/main/java/tsptest/specialchars/SpecialCharsClientBuilder.java","src/main/java/tsptest/specialchars/implementation/BuiltinOpsImpl.java","src/main/java/tsptest/specialchars/implementation/SpecialCharsClientImpl.java","src/main/java/tsptest/specialchars/implementation/models/ReadRequest.java","src/main/java/tsptest/specialchars/implementation/models/package-info.java","src/main/java/tsptest/specialchars/implementation/package-info.java","src/main/java/tsptest/specialchars/models/Resource.java","src/main/java/tsptest/specialchars/models/package-info.java","src/main/java/tsptest/specialchars/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-specialheaders_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-specialheaders_apiview_properties.json deleted file mode 100644 index 7b25f95aa3d..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-specialheaders_apiview_properties.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.specialheaders.EtagHeadersAsyncClient": "TspTest.SpecialHeaders.EtagHeaders", - "tsptest.specialheaders.EtagHeadersAsyncClient.listWithEtag": "TspTest.SpecialHeaders.EtagHeaders.listWithEtag", - "tsptest.specialheaders.EtagHeadersAsyncClient.patchWithMatchHeaders": "TspTest.SpecialHeaders.EtagHeaders.patchWithMatchHeaders", - "tsptest.specialheaders.EtagHeadersAsyncClient.patchWithMatchHeadersWithResponse": "TspTest.SpecialHeaders.EtagHeaders.patchWithMatchHeaders", - "tsptest.specialheaders.EtagHeadersAsyncClient.putWithRequestHeaders": "TspTest.SpecialHeaders.EtagHeaders.putWithRequestHeaders", - "tsptest.specialheaders.EtagHeadersAsyncClient.putWithRequestHeadersWithResponse": "TspTest.SpecialHeaders.EtagHeaders.putWithRequestHeaders", - "tsptest.specialheaders.EtagHeadersClient": "TspTest.SpecialHeaders.EtagHeaders", - "tsptest.specialheaders.EtagHeadersClient.listWithEtag": "TspTest.SpecialHeaders.EtagHeaders.listWithEtag", - "tsptest.specialheaders.EtagHeadersClient.patchWithMatchHeaders": "TspTest.SpecialHeaders.EtagHeaders.patchWithMatchHeaders", - "tsptest.specialheaders.EtagHeadersClient.patchWithMatchHeadersWithResponse": "TspTest.SpecialHeaders.EtagHeaders.patchWithMatchHeaders", - "tsptest.specialheaders.EtagHeadersClient.putWithRequestHeaders": "TspTest.SpecialHeaders.EtagHeaders.putWithRequestHeaders", - "tsptest.specialheaders.EtagHeadersClient.putWithRequestHeadersWithResponse": "TspTest.SpecialHeaders.EtagHeaders.putWithRequestHeaders", - "tsptest.specialheaders.EtagHeadersOptionalBodyAsyncClient": "TspTest.SpecialHeaders.EtagHeadersOptionalBody", - "tsptest.specialheaders.EtagHeadersOptionalBodyAsyncClient.putWithOptionalBody": "TspTest.SpecialHeaders.EtagHeadersOptionalBody.putWithOptionalBody", - "tsptest.specialheaders.EtagHeadersOptionalBodyAsyncClient.putWithOptionalBodyWithResponse": "TspTest.SpecialHeaders.EtagHeadersOptionalBody.putWithOptionalBody", - "tsptest.specialheaders.EtagHeadersOptionalBodyClient": "TspTest.SpecialHeaders.EtagHeadersOptionalBody", - "tsptest.specialheaders.EtagHeadersOptionalBodyClient.putWithOptionalBody": "TspTest.SpecialHeaders.EtagHeadersOptionalBody.putWithOptionalBody", - "tsptest.specialheaders.EtagHeadersOptionalBodyClient.putWithOptionalBodyWithResponse": "TspTest.SpecialHeaders.EtagHeadersOptionalBody.putWithOptionalBody", - "tsptest.specialheaders.RepeatabilityHeadersAsyncClient": "TspTest.SpecialHeaders.RepeatabilityHeaders", - "tsptest.specialheaders.RepeatabilityHeadersAsyncClient.beginCreateLro": "TspTest.SpecialHeaders.RepeatabilityHeaders.createLro", - "tsptest.specialheaders.RepeatabilityHeadersAsyncClient.beginCreateLroWithModel": "TspTest.SpecialHeaders.RepeatabilityHeaders.createLro", - "tsptest.specialheaders.RepeatabilityHeadersAsyncClient.get": "TspTest.SpecialHeaders.RepeatabilityHeaders.get", - "tsptest.specialheaders.RepeatabilityHeadersAsyncClient.getWithResponse": "TspTest.SpecialHeaders.RepeatabilityHeaders.get", - "tsptest.specialheaders.RepeatabilityHeadersAsyncClient.post": "TspTest.SpecialHeaders.RepeatabilityHeaders.post", - "tsptest.specialheaders.RepeatabilityHeadersAsyncClient.postWithResponse": "TspTest.SpecialHeaders.RepeatabilityHeaders.post", - "tsptest.specialheaders.RepeatabilityHeadersAsyncClient.put": "TspTest.SpecialHeaders.RepeatabilityHeaders.put", - "tsptest.specialheaders.RepeatabilityHeadersAsyncClient.putWithResponse": "TspTest.SpecialHeaders.RepeatabilityHeaders.put", - "tsptest.specialheaders.RepeatabilityHeadersClient": "TspTest.SpecialHeaders.RepeatabilityHeaders", - "tsptest.specialheaders.RepeatabilityHeadersClient.beginCreateLro": "TspTest.SpecialHeaders.RepeatabilityHeaders.createLro", - "tsptest.specialheaders.RepeatabilityHeadersClient.beginCreateLroWithModel": "TspTest.SpecialHeaders.RepeatabilityHeaders.createLro", - "tsptest.specialheaders.RepeatabilityHeadersClient.get": "TspTest.SpecialHeaders.RepeatabilityHeaders.get", - "tsptest.specialheaders.RepeatabilityHeadersClient.getWithResponse": "TspTest.SpecialHeaders.RepeatabilityHeaders.get", - "tsptest.specialheaders.RepeatabilityHeadersClient.post": "TspTest.SpecialHeaders.RepeatabilityHeaders.post", - "tsptest.specialheaders.RepeatabilityHeadersClient.postWithResponse": "TspTest.SpecialHeaders.RepeatabilityHeaders.post", - "tsptest.specialheaders.RepeatabilityHeadersClient.put": "TspTest.SpecialHeaders.RepeatabilityHeaders.put", - "tsptest.specialheaders.RepeatabilityHeadersClient.putWithResponse": "TspTest.SpecialHeaders.RepeatabilityHeaders.put", - "tsptest.specialheaders.SkipSpecialHeadersAsyncClient": "TspTest.SpecialHeaders.SkipSpecialHeaders", - "tsptest.specialheaders.SkipSpecialHeadersAsyncClient.deleteWithSpecialHeaders": "TspTest.SpecialHeaders.SkipSpecialHeaders.deleteWithSpecialHeaders", - "tsptest.specialheaders.SkipSpecialHeadersAsyncClient.deleteWithSpecialHeadersWithResponse": "TspTest.SpecialHeaders.SkipSpecialHeaders.deleteWithSpecialHeaders", - "tsptest.specialheaders.SkipSpecialHeadersClient": "TspTest.SpecialHeaders.SkipSpecialHeaders", - "tsptest.specialheaders.SkipSpecialHeadersClient.deleteWithSpecialHeaders": "TspTest.SpecialHeaders.SkipSpecialHeaders.deleteWithSpecialHeaders", - "tsptest.specialheaders.SkipSpecialHeadersClient.deleteWithSpecialHeadersWithResponse": "TspTest.SpecialHeaders.SkipSpecialHeaders.deleteWithSpecialHeaders", - "tsptest.specialheaders.SpecialHeadersClientBuilder": "TspTest.SpecialHeaders", - "tsptest.specialheaders.models.Resource": "TspTest.SpecialHeaders.Resource" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-specialheaders_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-specialheaders_metadata.json index c9ff49456bb..bfdbf849151 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-specialheaders_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-specialheaders_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2022-06-01-preview","crossLanguageDefinitions":{"tsptest.specialheaders.EtagHeadersAsyncClient":"TspTest.SpecialHeaders.EtagHeaders","tsptest.specialheaders.EtagHeadersAsyncClient.listWithEtag":"TspTest.SpecialHeaders.EtagHeaders.listWithEtag","tsptest.specialheaders.EtagHeadersAsyncClient.patchWithMatchHeaders":"TspTest.SpecialHeaders.EtagHeaders.patchWithMatchHeaders","tsptest.specialheaders.EtagHeadersAsyncClient.patchWithMatchHeadersWithResponse":"TspTest.SpecialHeaders.EtagHeaders.patchWithMatchHeaders","tsptest.specialheaders.EtagHeadersAsyncClient.putWithRequestHeaders":"TspTest.SpecialHeaders.EtagHeaders.putWithRequestHeaders","tsptest.specialheaders.EtagHeadersAsyncClient.putWithRequestHeadersWithResponse":"TspTest.SpecialHeaders.EtagHeaders.putWithRequestHeaders","tsptest.specialheaders.EtagHeadersClient":"TspTest.SpecialHeaders.EtagHeaders","tsptest.specialheaders.EtagHeadersClient.listWithEtag":"TspTest.SpecialHeaders.EtagHeaders.listWithEtag","tsptest.specialheaders.EtagHeadersClient.patchWithMatchHeaders":"TspTest.SpecialHeaders.EtagHeaders.patchWithMatchHeaders","tsptest.specialheaders.EtagHeadersClient.patchWithMatchHeadersWithResponse":"TspTest.SpecialHeaders.EtagHeaders.patchWithMatchHeaders","tsptest.specialheaders.EtagHeadersClient.putWithRequestHeaders":"TspTest.SpecialHeaders.EtagHeaders.putWithRequestHeaders","tsptest.specialheaders.EtagHeadersClient.putWithRequestHeadersWithResponse":"TspTest.SpecialHeaders.EtagHeaders.putWithRequestHeaders","tsptest.specialheaders.EtagHeadersOptionalBodyAsyncClient":"TspTest.SpecialHeaders.EtagHeadersOptionalBody","tsptest.specialheaders.EtagHeadersOptionalBodyAsyncClient.putWithOptionalBody":"TspTest.SpecialHeaders.EtagHeadersOptionalBody.putWithOptionalBody","tsptest.specialheaders.EtagHeadersOptionalBodyAsyncClient.putWithOptionalBodyWithResponse":"TspTest.SpecialHeaders.EtagHeadersOptionalBody.putWithOptionalBody","tsptest.specialheaders.EtagHeadersOptionalBodyClient":"TspTest.SpecialHeaders.EtagHeadersOptionalBody","tsptest.specialheaders.EtagHeadersOptionalBodyClient.putWithOptionalBody":"TspTest.SpecialHeaders.EtagHeadersOptionalBody.putWithOptionalBody","tsptest.specialheaders.EtagHeadersOptionalBodyClient.putWithOptionalBodyWithResponse":"TspTest.SpecialHeaders.EtagHeadersOptionalBody.putWithOptionalBody","tsptest.specialheaders.RepeatabilityHeadersAsyncClient":"TspTest.SpecialHeaders.RepeatabilityHeaders","tsptest.specialheaders.RepeatabilityHeadersAsyncClient.beginCreateLro":"TspTest.SpecialHeaders.RepeatabilityHeaders.createLro","tsptest.specialheaders.RepeatabilityHeadersAsyncClient.beginCreateLroWithModel":"TspTest.SpecialHeaders.RepeatabilityHeaders.createLro","tsptest.specialheaders.RepeatabilityHeadersAsyncClient.get":"TspTest.SpecialHeaders.RepeatabilityHeaders.get","tsptest.specialheaders.RepeatabilityHeadersAsyncClient.getWithResponse":"TspTest.SpecialHeaders.RepeatabilityHeaders.get","tsptest.specialheaders.RepeatabilityHeadersAsyncClient.post":"TspTest.SpecialHeaders.RepeatabilityHeaders.post","tsptest.specialheaders.RepeatabilityHeadersAsyncClient.postWithResponse":"TspTest.SpecialHeaders.RepeatabilityHeaders.post","tsptest.specialheaders.RepeatabilityHeadersAsyncClient.put":"TspTest.SpecialHeaders.RepeatabilityHeaders.put","tsptest.specialheaders.RepeatabilityHeadersAsyncClient.putWithResponse":"TspTest.SpecialHeaders.RepeatabilityHeaders.put","tsptest.specialheaders.RepeatabilityHeadersClient":"TspTest.SpecialHeaders.RepeatabilityHeaders","tsptest.specialheaders.RepeatabilityHeadersClient.beginCreateLro":"TspTest.SpecialHeaders.RepeatabilityHeaders.createLro","tsptest.specialheaders.RepeatabilityHeadersClient.beginCreateLroWithModel":"TspTest.SpecialHeaders.RepeatabilityHeaders.createLro","tsptest.specialheaders.RepeatabilityHeadersClient.get":"TspTest.SpecialHeaders.RepeatabilityHeaders.get","tsptest.specialheaders.RepeatabilityHeadersClient.getWithResponse":"TspTest.SpecialHeaders.RepeatabilityHeaders.get","tsptest.specialheaders.RepeatabilityHeadersClient.post":"TspTest.SpecialHeaders.RepeatabilityHeaders.post","tsptest.specialheaders.RepeatabilityHeadersClient.postWithResponse":"TspTest.SpecialHeaders.RepeatabilityHeaders.post","tsptest.specialheaders.RepeatabilityHeadersClient.put":"TspTest.SpecialHeaders.RepeatabilityHeaders.put","tsptest.specialheaders.RepeatabilityHeadersClient.putWithResponse":"TspTest.SpecialHeaders.RepeatabilityHeaders.put","tsptest.specialheaders.SkipSpecialHeadersAsyncClient":"TspTest.SpecialHeaders.SkipSpecialHeaders","tsptest.specialheaders.SkipSpecialHeadersAsyncClient.deleteWithSpecialHeaders":"TspTest.SpecialHeaders.SkipSpecialHeaders.deleteWithSpecialHeaders","tsptest.specialheaders.SkipSpecialHeadersAsyncClient.deleteWithSpecialHeadersWithResponse":"TspTest.SpecialHeaders.SkipSpecialHeaders.deleteWithSpecialHeaders","tsptest.specialheaders.SkipSpecialHeadersClient":"TspTest.SpecialHeaders.SkipSpecialHeaders","tsptest.specialheaders.SkipSpecialHeadersClient.deleteWithSpecialHeaders":"TspTest.SpecialHeaders.SkipSpecialHeaders.deleteWithSpecialHeaders","tsptest.specialheaders.SkipSpecialHeadersClient.deleteWithSpecialHeadersWithResponse":"TspTest.SpecialHeaders.SkipSpecialHeaders.deleteWithSpecialHeaders","tsptest.specialheaders.SpecialHeadersClientBuilder":"TspTest.SpecialHeaders","tsptest.specialheaders.models.Resource":"TspTest.SpecialHeaders.Resource"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/specialheaders/EtagHeadersAsyncClient.java","src/main/java/tsptest/specialheaders/EtagHeadersClient.java","src/main/java/tsptest/specialheaders/EtagHeadersOptionalBodyAsyncClient.java","src/main/java/tsptest/specialheaders/EtagHeadersOptionalBodyClient.java","src/main/java/tsptest/specialheaders/RepeatabilityHeadersAsyncClient.java","src/main/java/tsptest/specialheaders/RepeatabilityHeadersClient.java","src/main/java/tsptest/specialheaders/SkipSpecialHeadersAsyncClient.java","src/main/java/tsptest/specialheaders/SkipSpecialHeadersClient.java","src/main/java/tsptest/specialheaders/SpecialHeadersClientBuilder.java","src/main/java/tsptest/specialheaders/SpecialHeadersServiceVersion.java","src/main/java/tsptest/specialheaders/implementation/EtagHeadersImpl.java","src/main/java/tsptest/specialheaders/implementation/EtagHeadersOptionalBodiesImpl.java","src/main/java/tsptest/specialheaders/implementation/JsonMergePatchHelper.java","src/main/java/tsptest/specialheaders/implementation/OperationLocationPollingStrategy.java","src/main/java/tsptest/specialheaders/implementation/PollingUtils.java","src/main/java/tsptest/specialheaders/implementation/RepeatabilityHeadersImpl.java","src/main/java/tsptest/specialheaders/implementation/SkipSpecialHeadersImpl.java","src/main/java/tsptest/specialheaders/implementation/SpecialHeadersClientImpl.java","src/main/java/tsptest/specialheaders/implementation/SyncOperationLocationPollingStrategy.java","src/main/java/tsptest/specialheaders/implementation/package-info.java","src/main/java/tsptest/specialheaders/models/Resource.java","src/main/java/tsptest/specialheaders/models/package-info.java","src/main/java/tsptest/specialheaders/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"TspTest.SpecialHeaders":"2022-06-01-preview"},"crossLanguageDefinitions":{"tsptest.specialheaders.EtagHeadersAsyncClient":"TspTest.SpecialHeaders.EtagHeaders","tsptest.specialheaders.EtagHeadersAsyncClient.listWithEtag":"TspTest.SpecialHeaders.EtagHeaders.listWithEtag","tsptest.specialheaders.EtagHeadersAsyncClient.patchWithMatchHeaders":"TspTest.SpecialHeaders.EtagHeaders.patchWithMatchHeaders","tsptest.specialheaders.EtagHeadersAsyncClient.patchWithMatchHeadersWithResponse":"TspTest.SpecialHeaders.EtagHeaders.patchWithMatchHeaders","tsptest.specialheaders.EtagHeadersAsyncClient.putWithRequestHeaders":"TspTest.SpecialHeaders.EtagHeaders.putWithRequestHeaders","tsptest.specialheaders.EtagHeadersAsyncClient.putWithRequestHeadersWithResponse":"TspTest.SpecialHeaders.EtagHeaders.putWithRequestHeaders","tsptest.specialheaders.EtagHeadersClient":"TspTest.SpecialHeaders.EtagHeaders","tsptest.specialheaders.EtagHeadersClient.listWithEtag":"TspTest.SpecialHeaders.EtagHeaders.listWithEtag","tsptest.specialheaders.EtagHeadersClient.patchWithMatchHeaders":"TspTest.SpecialHeaders.EtagHeaders.patchWithMatchHeaders","tsptest.specialheaders.EtagHeadersClient.patchWithMatchHeadersWithResponse":"TspTest.SpecialHeaders.EtagHeaders.patchWithMatchHeaders","tsptest.specialheaders.EtagHeadersClient.putWithRequestHeaders":"TspTest.SpecialHeaders.EtagHeaders.putWithRequestHeaders","tsptest.specialheaders.EtagHeadersClient.putWithRequestHeadersWithResponse":"TspTest.SpecialHeaders.EtagHeaders.putWithRequestHeaders","tsptest.specialheaders.EtagHeadersOptionalBodyAsyncClient":"TspTest.SpecialHeaders.EtagHeadersOptionalBody","tsptest.specialheaders.EtagHeadersOptionalBodyAsyncClient.putWithOptionalBody":"TspTest.SpecialHeaders.EtagHeadersOptionalBody.putWithOptionalBody","tsptest.specialheaders.EtagHeadersOptionalBodyAsyncClient.putWithOptionalBodyWithResponse":"TspTest.SpecialHeaders.EtagHeadersOptionalBody.putWithOptionalBody","tsptest.specialheaders.EtagHeadersOptionalBodyClient":"TspTest.SpecialHeaders.EtagHeadersOptionalBody","tsptest.specialheaders.EtagHeadersOptionalBodyClient.putWithOptionalBody":"TspTest.SpecialHeaders.EtagHeadersOptionalBody.putWithOptionalBody","tsptest.specialheaders.EtagHeadersOptionalBodyClient.putWithOptionalBodyWithResponse":"TspTest.SpecialHeaders.EtagHeadersOptionalBody.putWithOptionalBody","tsptest.specialheaders.RepeatabilityHeadersAsyncClient":"TspTest.SpecialHeaders.RepeatabilityHeaders","tsptest.specialheaders.RepeatabilityHeadersAsyncClient.beginCreateLro":"TspTest.SpecialHeaders.RepeatabilityHeaders.createLro","tsptest.specialheaders.RepeatabilityHeadersAsyncClient.beginCreateLroWithModel":"TspTest.SpecialHeaders.RepeatabilityHeaders.createLro","tsptest.specialheaders.RepeatabilityHeadersAsyncClient.get":"TspTest.SpecialHeaders.RepeatabilityHeaders.get","tsptest.specialheaders.RepeatabilityHeadersAsyncClient.getWithResponse":"TspTest.SpecialHeaders.RepeatabilityHeaders.get","tsptest.specialheaders.RepeatabilityHeadersAsyncClient.post":"TspTest.SpecialHeaders.RepeatabilityHeaders.post","tsptest.specialheaders.RepeatabilityHeadersAsyncClient.postWithResponse":"TspTest.SpecialHeaders.RepeatabilityHeaders.post","tsptest.specialheaders.RepeatabilityHeadersAsyncClient.put":"TspTest.SpecialHeaders.RepeatabilityHeaders.put","tsptest.specialheaders.RepeatabilityHeadersAsyncClient.putWithResponse":"TspTest.SpecialHeaders.RepeatabilityHeaders.put","tsptest.specialheaders.RepeatabilityHeadersClient":"TspTest.SpecialHeaders.RepeatabilityHeaders","tsptest.specialheaders.RepeatabilityHeadersClient.beginCreateLro":"TspTest.SpecialHeaders.RepeatabilityHeaders.createLro","tsptest.specialheaders.RepeatabilityHeadersClient.beginCreateLroWithModel":"TspTest.SpecialHeaders.RepeatabilityHeaders.createLro","tsptest.specialheaders.RepeatabilityHeadersClient.get":"TspTest.SpecialHeaders.RepeatabilityHeaders.get","tsptest.specialheaders.RepeatabilityHeadersClient.getWithResponse":"TspTest.SpecialHeaders.RepeatabilityHeaders.get","tsptest.specialheaders.RepeatabilityHeadersClient.post":"TspTest.SpecialHeaders.RepeatabilityHeaders.post","tsptest.specialheaders.RepeatabilityHeadersClient.postWithResponse":"TspTest.SpecialHeaders.RepeatabilityHeaders.post","tsptest.specialheaders.RepeatabilityHeadersClient.put":"TspTest.SpecialHeaders.RepeatabilityHeaders.put","tsptest.specialheaders.RepeatabilityHeadersClient.putWithResponse":"TspTest.SpecialHeaders.RepeatabilityHeaders.put","tsptest.specialheaders.SkipSpecialHeadersAsyncClient":"TspTest.SpecialHeaders.SkipSpecialHeaders","tsptest.specialheaders.SkipSpecialHeadersAsyncClient.deleteWithSpecialHeaders":"TspTest.SpecialHeaders.SkipSpecialHeaders.deleteWithSpecialHeaders","tsptest.specialheaders.SkipSpecialHeadersAsyncClient.deleteWithSpecialHeadersWithResponse":"TspTest.SpecialHeaders.SkipSpecialHeaders.deleteWithSpecialHeaders","tsptest.specialheaders.SkipSpecialHeadersClient":"TspTest.SpecialHeaders.SkipSpecialHeaders","tsptest.specialheaders.SkipSpecialHeadersClient.deleteWithSpecialHeaders":"TspTest.SpecialHeaders.SkipSpecialHeaders.deleteWithSpecialHeaders","tsptest.specialheaders.SkipSpecialHeadersClient.deleteWithSpecialHeadersWithResponse":"TspTest.SpecialHeaders.SkipSpecialHeaders.deleteWithSpecialHeaders","tsptest.specialheaders.SpecialHeadersClientBuilder":"TspTest.SpecialHeaders","tsptest.specialheaders.models.Resource":"TspTest.SpecialHeaders.Resource"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/specialheaders/EtagHeadersAsyncClient.java","src/main/java/tsptest/specialheaders/EtagHeadersClient.java","src/main/java/tsptest/specialheaders/EtagHeadersOptionalBodyAsyncClient.java","src/main/java/tsptest/specialheaders/EtagHeadersOptionalBodyClient.java","src/main/java/tsptest/specialheaders/RepeatabilityHeadersAsyncClient.java","src/main/java/tsptest/specialheaders/RepeatabilityHeadersClient.java","src/main/java/tsptest/specialheaders/SkipSpecialHeadersAsyncClient.java","src/main/java/tsptest/specialheaders/SkipSpecialHeadersClient.java","src/main/java/tsptest/specialheaders/SpecialHeadersClientBuilder.java","src/main/java/tsptest/specialheaders/SpecialHeadersServiceVersion.java","src/main/java/tsptest/specialheaders/implementation/EtagHeadersImpl.java","src/main/java/tsptest/specialheaders/implementation/EtagHeadersOptionalBodiesImpl.java","src/main/java/tsptest/specialheaders/implementation/JsonMergePatchHelper.java","src/main/java/tsptest/specialheaders/implementation/OperationLocationPollingStrategy.java","src/main/java/tsptest/specialheaders/implementation/PollingUtils.java","src/main/java/tsptest/specialheaders/implementation/RepeatabilityHeadersImpl.java","src/main/java/tsptest/specialheaders/implementation/SkipSpecialHeadersImpl.java","src/main/java/tsptest/specialheaders/implementation/SpecialHeadersClientImpl.java","src/main/java/tsptest/specialheaders/implementation/SyncOperationLocationPollingStrategy.java","src/main/java/tsptest/specialheaders/implementation/package-info.java","src/main/java/tsptest/specialheaders/models/Resource.java","src/main/java/tsptest/specialheaders/models/package-info.java","src/main/java/tsptest/specialheaders/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-subclass_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-subclass_apiview_properties.json deleted file mode 100644 index e4eb8cba216..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-subclass_apiview_properties.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.subclass.SubclassAsyncClient": "TspTest.Subclass.Subclass", - "tsptest.subclass.SubclassAsyncClient.propertyInSubclass": "TspTest.Subclass.Subclass.propertyInSubclass", - "tsptest.subclass.SubclassAsyncClient.propertyInSubclassWithResponse": "TspTest.Subclass.Subclass.propertyInSubclass", - "tsptest.subclass.SubclassClient": "TspTest.Subclass.Subclass", - "tsptest.subclass.SubclassClient.propertyInSubclass": "TspTest.Subclass.Subclass.propertyInSubclass", - "tsptest.subclass.SubclassClient.propertyInSubclassWithResponse": "TspTest.Subclass.Subclass.propertyInSubclass", - "tsptest.subclass.SubclassClientBuilder": "TspTest.Subclass", - "tsptest.subclass.models.Body": "TspTest.Subclass.Body", - "tsptest.subclass.models.DuplicateRequiredProperty": "TspTest.Subclass.DuplicateRequiredProperty", - "tsptest.subclass.models.DuplicateRequiredPropertyParent": "TspTest.Subclass.DuplicateRequiredPropertyParent", - "tsptest.subclass.models.PropertyChangedToConstant": "TspTest.Subclass.PropertyChangedToConstant", - "tsptest.subclass.models.PropertyChangedToConstantParent": "TspTest.Subclass.PropertyChangedToConstantParent", - "tsptest.subclass.models.PropertyChangedToRequired": "TspTest.Subclass.PropertyChangedToRequired", - "tsptest.subclass.models.PropertyChangedToRequiredParent": "TspTest.Subclass.PropertyChangedToRequiredParent" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-subclass_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-subclass_metadata.json index 2ad8bd225c0..1cb7d8f2826 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-subclass_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-subclass_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.subclass.SubclassAsyncClient":"TspTest.Subclass.Subclass","tsptest.subclass.SubclassAsyncClient.propertyInSubclass":"TspTest.Subclass.Subclass.propertyInSubclass","tsptest.subclass.SubclassAsyncClient.propertyInSubclassWithResponse":"TspTest.Subclass.Subclass.propertyInSubclass","tsptest.subclass.SubclassClient":"TspTest.Subclass.Subclass","tsptest.subclass.SubclassClient.propertyInSubclass":"TspTest.Subclass.Subclass.propertyInSubclass","tsptest.subclass.SubclassClient.propertyInSubclassWithResponse":"TspTest.Subclass.Subclass.propertyInSubclass","tsptest.subclass.SubclassClientBuilder":"TspTest.Subclass","tsptest.subclass.models.Body":"TspTest.Subclass.Body","tsptest.subclass.models.DuplicateRequiredProperty":"TspTest.Subclass.DuplicateRequiredProperty","tsptest.subclass.models.DuplicateRequiredPropertyParent":"TspTest.Subclass.DuplicateRequiredPropertyParent","tsptest.subclass.models.PropertyChangedToConstant":"TspTest.Subclass.PropertyChangedToConstant","tsptest.subclass.models.PropertyChangedToConstantParent":"TspTest.Subclass.PropertyChangedToConstantParent","tsptest.subclass.models.PropertyChangedToRequired":"TspTest.Subclass.PropertyChangedToRequired","tsptest.subclass.models.PropertyChangedToRequiredParent":"TspTest.Subclass.PropertyChangedToRequiredParent"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/subclass/SubclassAsyncClient.java","src/main/java/tsptest/subclass/SubclassClient.java","src/main/java/tsptest/subclass/SubclassClientBuilder.java","src/main/java/tsptest/subclass/implementation/SubclassClientImpl.java","src/main/java/tsptest/subclass/implementation/SubclassImpl.java","src/main/java/tsptest/subclass/implementation/package-info.java","src/main/java/tsptest/subclass/models/Body.java","src/main/java/tsptest/subclass/models/DuplicateRequiredProperty.java","src/main/java/tsptest/subclass/models/DuplicateRequiredPropertyParent.java","src/main/java/tsptest/subclass/models/PropertyChangedToConstant.java","src/main/java/tsptest/subclass/models/PropertyChangedToConstantParent.java","src/main/java/tsptest/subclass/models/PropertyChangedToRequired.java","src/main/java/tsptest/subclass/models/PropertyChangedToRequiredParent.java","src/main/java/tsptest/subclass/models/package-info.java","src/main/java/tsptest/subclass/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.subclass.SubclassAsyncClient":"TspTest.Subclass.Subclass","tsptest.subclass.SubclassAsyncClient.propertyInSubclass":"TspTest.Subclass.Subclass.propertyInSubclass","tsptest.subclass.SubclassAsyncClient.propertyInSubclassWithResponse":"TspTest.Subclass.Subclass.propertyInSubclass","tsptest.subclass.SubclassClient":"TspTest.Subclass.Subclass","tsptest.subclass.SubclassClient.propertyInSubclass":"TspTest.Subclass.Subclass.propertyInSubclass","tsptest.subclass.SubclassClient.propertyInSubclassWithResponse":"TspTest.Subclass.Subclass.propertyInSubclass","tsptest.subclass.SubclassClientBuilder":"TspTest.Subclass","tsptest.subclass.models.Body":"TspTest.Subclass.Body","tsptest.subclass.models.DuplicateRequiredProperty":"TspTest.Subclass.DuplicateRequiredProperty","tsptest.subclass.models.DuplicateRequiredPropertyParent":"TspTest.Subclass.DuplicateRequiredPropertyParent","tsptest.subclass.models.PropertyChangedToConstant":"TspTest.Subclass.PropertyChangedToConstant","tsptest.subclass.models.PropertyChangedToConstantParent":"TspTest.Subclass.PropertyChangedToConstantParent","tsptest.subclass.models.PropertyChangedToRequired":"TspTest.Subclass.PropertyChangedToRequired","tsptest.subclass.models.PropertyChangedToRequiredParent":"TspTest.Subclass.PropertyChangedToRequiredParent"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/subclass/SubclassAsyncClient.java","src/main/java/tsptest/subclass/SubclassClient.java","src/main/java/tsptest/subclass/SubclassClientBuilder.java","src/main/java/tsptest/subclass/implementation/SubclassClientImpl.java","src/main/java/tsptest/subclass/implementation/SubclassImpl.java","src/main/java/tsptest/subclass/implementation/package-info.java","src/main/java/tsptest/subclass/models/Body.java","src/main/java/tsptest/subclass/models/DuplicateRequiredProperty.java","src/main/java/tsptest/subclass/models/DuplicateRequiredPropertyParent.java","src/main/java/tsptest/subclass/models/PropertyChangedToConstant.java","src/main/java/tsptest/subclass/models/PropertyChangedToConstantParent.java","src/main/java/tsptest/subclass/models/PropertyChangedToRequired.java","src/main/java/tsptest/subclass/models/PropertyChangedToRequiredParent.java","src/main/java/tsptest/subclass/models/package-info.java","src/main/java/tsptest/subclass/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-union_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-union_apiview_properties.json deleted file mode 100644 index 14a7ce16492..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-union_apiview_properties.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.union.UnionAsyncClient": "TspTest.Union.UnionFlattenOp", - "tsptest.union.UnionAsyncClient.beginGenerate": "TspTest.Union.UnionFlattenOp.generate", - "tsptest.union.UnionAsyncClient.beginGenerateWithModel": "TspTest.Union.UnionFlattenOp.generate", - "tsptest.union.UnionAsyncClient.get": "TspTest.Union.UnionFlattenOp.get", - "tsptest.union.UnionAsyncClient.getWithResponse": "TspTest.Union.UnionFlattenOp.get", - "tsptest.union.UnionAsyncClient.send": "TspTest.Union.UnionFlattenOp.send", - "tsptest.union.UnionAsyncClient.sendLong": "TspTest.Union.UnionFlattenOp.sendLong", - "tsptest.union.UnionAsyncClient.sendLongWithResponse": "TspTest.Union.UnionFlattenOp.sendLong", - "tsptest.union.UnionAsyncClient.sendWithResponse": "TspTest.Union.UnionFlattenOp.send", - "tsptest.union.UnionClient": "TspTest.Union.UnionFlattenOp", - "tsptest.union.UnionClient.beginGenerate": "TspTest.Union.UnionFlattenOp.generate", - "tsptest.union.UnionClient.beginGenerateWithModel": "TspTest.Union.UnionFlattenOp.generate", - "tsptest.union.UnionClient.get": "TspTest.Union.UnionFlattenOp.get", - "tsptest.union.UnionClient.getWithResponse": "TspTest.Union.UnionFlattenOp.get", - "tsptest.union.UnionClient.send": "TspTest.Union.UnionFlattenOp.send", - "tsptest.union.UnionClient.sendLong": "TspTest.Union.UnionFlattenOp.sendLong", - "tsptest.union.UnionClient.sendLongWithResponse": "TspTest.Union.UnionFlattenOp.sendLong", - "tsptest.union.UnionClient.sendWithResponse": "TspTest.Union.UnionFlattenOp.send", - "tsptest.union.UnionClientBuilder": "TspTest.Union", - "tsptest.union.implementation.models.SendLongRequest": "TspTest.Union.sendLong.Request.anonymous", - "tsptest.union.implementation.models.SendRequest": "TspTest.Union.send.Request.anonymous", - "tsptest.union.implementation.models.SubResult": "TspTest.Union.SubResult", - "tsptest.union.models.ArrayData": "TspTest.Union.ArrayData", - "tsptest.union.models.Result": "TspTest.Union.Result", - "tsptest.union.models.SendLongOptions": null, - "tsptest.union.models.User": "TspTest.Union.User" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-union_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-union_metadata.json index 7a720173441..911686614d8 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-union_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-union_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2022-06-01-preview","crossLanguageDefinitions":{"tsptest.union.UnionAsyncClient":"TspTest.Union.UnionFlattenOp","tsptest.union.UnionAsyncClient.beginGenerate":"TspTest.Union.UnionFlattenOp.generate","tsptest.union.UnionAsyncClient.beginGenerateWithModel":"TspTest.Union.UnionFlattenOp.generate","tsptest.union.UnionAsyncClient.get":"TspTest.Union.UnionFlattenOp.get","tsptest.union.UnionAsyncClient.getWithResponse":"TspTest.Union.UnionFlattenOp.get","tsptest.union.UnionAsyncClient.send":"TspTest.Union.UnionFlattenOp.send","tsptest.union.UnionAsyncClient.sendLong":"TspTest.Union.UnionFlattenOp.sendLong","tsptest.union.UnionAsyncClient.sendLongWithResponse":"TspTest.Union.UnionFlattenOp.sendLong","tsptest.union.UnionAsyncClient.sendWithResponse":"TspTest.Union.UnionFlattenOp.send","tsptest.union.UnionClient":"TspTest.Union.UnionFlattenOp","tsptest.union.UnionClient.beginGenerate":"TspTest.Union.UnionFlattenOp.generate","tsptest.union.UnionClient.beginGenerateWithModel":"TspTest.Union.UnionFlattenOp.generate","tsptest.union.UnionClient.get":"TspTest.Union.UnionFlattenOp.get","tsptest.union.UnionClient.getWithResponse":"TspTest.Union.UnionFlattenOp.get","tsptest.union.UnionClient.send":"TspTest.Union.UnionFlattenOp.send","tsptest.union.UnionClient.sendLong":"TspTest.Union.UnionFlattenOp.sendLong","tsptest.union.UnionClient.sendLongWithResponse":"TspTest.Union.UnionFlattenOp.sendLong","tsptest.union.UnionClient.sendWithResponse":"TspTest.Union.UnionFlattenOp.send","tsptest.union.UnionClientBuilder":"TspTest.Union","tsptest.union.implementation.models.SendLongRequest":"TspTest.Union.sendLong.Request.anonymous","tsptest.union.implementation.models.SendRequest":"TspTest.Union.send.Request.anonymous","tsptest.union.implementation.models.SubResult":"TspTest.Union.SubResult","tsptest.union.models.ArrayData":"TspTest.Union.ArrayData","tsptest.union.models.Result":"TspTest.Union.Result","tsptest.union.models.SendLongOptions":null,"tsptest.union.models.User":"TspTest.Union.User"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/union/UnionAsyncClient.java","src/main/java/tsptest/union/UnionClient.java","src/main/java/tsptest/union/UnionClientBuilder.java","src/main/java/tsptest/union/UnionServiceVersion.java","src/main/java/tsptest/union/implementation/OperationLocationPollingStrategy.java","src/main/java/tsptest/union/implementation/PollingUtils.java","src/main/java/tsptest/union/implementation/SyncOperationLocationPollingStrategy.java","src/main/java/tsptest/union/implementation/UnionClientImpl.java","src/main/java/tsptest/union/implementation/UnionFlattenOpsImpl.java","src/main/java/tsptest/union/implementation/models/SendLongRequest.java","src/main/java/tsptest/union/implementation/models/SendRequest.java","src/main/java/tsptest/union/implementation/models/SubResult.java","src/main/java/tsptest/union/implementation/models/package-info.java","src/main/java/tsptest/union/implementation/package-info.java","src/main/java/tsptest/union/models/ArrayData.java","src/main/java/tsptest/union/models/Result.java","src/main/java/tsptest/union/models/SendLongOptions.java","src/main/java/tsptest/union/models/User.java","src/main/java/tsptest/union/models/package-info.java","src/main/java/tsptest/union/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"TspTest.Union":"2022-06-01-preview"},"crossLanguageDefinitions":{"tsptest.union.UnionAsyncClient":"TspTest.Union.UnionFlattenOp","tsptest.union.UnionAsyncClient.beginGenerate":"TspTest.Union.UnionFlattenOp.generate","tsptest.union.UnionAsyncClient.beginGenerateWithModel":"TspTest.Union.UnionFlattenOp.generate","tsptest.union.UnionAsyncClient.get":"TspTest.Union.UnionFlattenOp.get","tsptest.union.UnionAsyncClient.getWithResponse":"TspTest.Union.UnionFlattenOp.get","tsptest.union.UnionAsyncClient.send":"TspTest.Union.UnionFlattenOp.send","tsptest.union.UnionAsyncClient.sendLong":"TspTest.Union.UnionFlattenOp.sendLong","tsptest.union.UnionAsyncClient.sendLongWithResponse":"TspTest.Union.UnionFlattenOp.sendLong","tsptest.union.UnionAsyncClient.sendWithResponse":"TspTest.Union.UnionFlattenOp.send","tsptest.union.UnionClient":"TspTest.Union.UnionFlattenOp","tsptest.union.UnionClient.beginGenerate":"TspTest.Union.UnionFlattenOp.generate","tsptest.union.UnionClient.beginGenerateWithModel":"TspTest.Union.UnionFlattenOp.generate","tsptest.union.UnionClient.get":"TspTest.Union.UnionFlattenOp.get","tsptest.union.UnionClient.getWithResponse":"TspTest.Union.UnionFlattenOp.get","tsptest.union.UnionClient.send":"TspTest.Union.UnionFlattenOp.send","tsptest.union.UnionClient.sendLong":"TspTest.Union.UnionFlattenOp.sendLong","tsptest.union.UnionClient.sendLongWithResponse":"TspTest.Union.UnionFlattenOp.sendLong","tsptest.union.UnionClient.sendWithResponse":"TspTest.Union.UnionFlattenOp.send","tsptest.union.UnionClientBuilder":"TspTest.Union","tsptest.union.implementation.models.SendLongRequest":"TspTest.Union.sendLong.Request.anonymous","tsptest.union.implementation.models.SendRequest":"TspTest.Union.send.Request.anonymous","tsptest.union.implementation.models.SubResult":"TspTest.Union.SubResult","tsptest.union.models.ArrayData":"TspTest.Union.ArrayData","tsptest.union.models.Result":"TspTest.Union.Result","tsptest.union.models.SendLongOptions":null,"tsptest.union.models.User":"TspTest.Union.User"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/union/UnionAsyncClient.java","src/main/java/tsptest/union/UnionClient.java","src/main/java/tsptest/union/UnionClientBuilder.java","src/main/java/tsptest/union/UnionServiceVersion.java","src/main/java/tsptest/union/implementation/OperationLocationPollingStrategy.java","src/main/java/tsptest/union/implementation/PollingUtils.java","src/main/java/tsptest/union/implementation/SyncOperationLocationPollingStrategy.java","src/main/java/tsptest/union/implementation/UnionClientImpl.java","src/main/java/tsptest/union/implementation/UnionFlattenOpsImpl.java","src/main/java/tsptest/union/implementation/models/SendLongRequest.java","src/main/java/tsptest/union/implementation/models/SendRequest.java","src/main/java/tsptest/union/implementation/models/SubResult.java","src/main/java/tsptest/union/implementation/models/package-info.java","src/main/java/tsptest/union/implementation/package-info.java","src/main/java/tsptest/union/models/ArrayData.java","src/main/java/tsptest/union/models/Result.java","src/main/java/tsptest/union/models/SendLongOptions.java","src/main/java/tsptest/union/models/User.java","src/main/java/tsptest/union/models/package-info.java","src/main/java/tsptest/union/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-versioning_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-versioning_apiview_properties.json deleted file mode 100644 index 04355f40b29..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-versioning_apiview_properties.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.versioning.VersioningAsyncClient": "TspTest.Versioning.VersioningOp", - "tsptest.versioning.VersioningAsyncClient.beginCreateLongRunning": "TspTest.Versioning.VersioningOp.createLongRunning", - "tsptest.versioning.VersioningAsyncClient.beginCreateLongRunningWithModel": "TspTest.Versioning.VersioningOp.createLongRunning", - "tsptest.versioning.VersioningAsyncClient.beginExport": "TspTest.Versioning.VersioningOp.export", - "tsptest.versioning.VersioningAsyncClient.beginExportWithModel": "TspTest.Versioning.VersioningOp.export", - "tsptest.versioning.VersioningAsyncClient.list": "TspTest.Versioning.VersioningOp.list", - "tsptest.versioning.VersioningClient": "TspTest.Versioning.VersioningOp", - "tsptest.versioning.VersioningClient.beginCreateLongRunning": "TspTest.Versioning.VersioningOp.createLongRunning", - "tsptest.versioning.VersioningClient.beginCreateLongRunningWithModel": "TspTest.Versioning.VersioningOp.createLongRunning", - "tsptest.versioning.VersioningClient.beginExport": "TspTest.Versioning.VersioningOp.export", - "tsptest.versioning.VersioningClient.beginExportWithModel": "TspTest.Versioning.VersioningOp.export", - "tsptest.versioning.VersioningClient.list": "TspTest.Versioning.VersioningOp.list", - "tsptest.versioning.VersioningClientBuilder": "TspTest.Versioning", - "tsptest.versioning.models.ExportedResource": "TspTest.Versioning.ExportedResource", - "tsptest.versioning.models.Resource": "TspTest.Versioning.Resource" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-versioning_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-versioning_metadata.json index 777fb73eb68..e704126fb4c 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-versioning_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-versioning_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"2022-09-01","crossLanguageDefinitions":{"tsptest.versioning.VersioningAsyncClient":"TspTest.Versioning.VersioningOp","tsptest.versioning.VersioningAsyncClient.beginCreateLongRunning":"TspTest.Versioning.VersioningOp.createLongRunning","tsptest.versioning.VersioningAsyncClient.beginCreateLongRunningWithModel":"TspTest.Versioning.VersioningOp.createLongRunning","tsptest.versioning.VersioningAsyncClient.beginExport":"TspTest.Versioning.VersioningOp.export","tsptest.versioning.VersioningAsyncClient.beginExportWithModel":"TspTest.Versioning.VersioningOp.export","tsptest.versioning.VersioningAsyncClient.list":"TspTest.Versioning.VersioningOp.list","tsptest.versioning.VersioningClient":"TspTest.Versioning.VersioningOp","tsptest.versioning.VersioningClient.beginCreateLongRunning":"TspTest.Versioning.VersioningOp.createLongRunning","tsptest.versioning.VersioningClient.beginCreateLongRunningWithModel":"TspTest.Versioning.VersioningOp.createLongRunning","tsptest.versioning.VersioningClient.beginExport":"TspTest.Versioning.VersioningOp.export","tsptest.versioning.VersioningClient.beginExportWithModel":"TspTest.Versioning.VersioningOp.export","tsptest.versioning.VersioningClient.list":"TspTest.Versioning.VersioningOp.list","tsptest.versioning.VersioningClientBuilder":"TspTest.Versioning","tsptest.versioning.models.ExportedResource":"TspTest.Versioning.ExportedResource","tsptest.versioning.models.Resource":"TspTest.Versioning.Resource"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/versioning/VersioningAsyncClient.java","src/main/java/tsptest/versioning/VersioningClient.java","src/main/java/tsptest/versioning/VersioningClientBuilder.java","src/main/java/tsptest/versioning/VersioningServiceVersion.java","src/main/java/tsptest/versioning/implementation/OperationLocationPollingStrategy.java","src/main/java/tsptest/versioning/implementation/PollingUtils.java","src/main/java/tsptest/versioning/implementation/SyncOperationLocationPollingStrategy.java","src/main/java/tsptest/versioning/implementation/VersioningClientImpl.java","src/main/java/tsptest/versioning/implementation/VersioningOpsImpl.java","src/main/java/tsptest/versioning/implementation/package-info.java","src/main/java/tsptest/versioning/models/ExportedResource.java","src/main/java/tsptest/versioning/models/Resource.java","src/main/java/tsptest/versioning/models/package-info.java","src/main/java/tsptest/versioning/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"TspTest.Versioning":"2022-09-01"},"crossLanguageDefinitions":{"tsptest.versioning.VersioningAsyncClient":"TspTest.Versioning.VersioningOp","tsptest.versioning.VersioningAsyncClient.beginCreateLongRunning":"TspTest.Versioning.VersioningOp.createLongRunning","tsptest.versioning.VersioningAsyncClient.beginCreateLongRunningWithModel":"TspTest.Versioning.VersioningOp.createLongRunning","tsptest.versioning.VersioningAsyncClient.beginExport":"TspTest.Versioning.VersioningOp.export","tsptest.versioning.VersioningAsyncClient.beginExportWithModel":"TspTest.Versioning.VersioningOp.export","tsptest.versioning.VersioningAsyncClient.list":"TspTest.Versioning.VersioningOp.list","tsptest.versioning.VersioningClient":"TspTest.Versioning.VersioningOp","tsptest.versioning.VersioningClient.beginCreateLongRunning":"TspTest.Versioning.VersioningOp.createLongRunning","tsptest.versioning.VersioningClient.beginCreateLongRunningWithModel":"TspTest.Versioning.VersioningOp.createLongRunning","tsptest.versioning.VersioningClient.beginExport":"TspTest.Versioning.VersioningOp.export","tsptest.versioning.VersioningClient.beginExportWithModel":"TspTest.Versioning.VersioningOp.export","tsptest.versioning.VersioningClient.list":"TspTest.Versioning.VersioningOp.list","tsptest.versioning.VersioningClientBuilder":"TspTest.Versioning","tsptest.versioning.models.ExportedResource":"TspTest.Versioning.ExportedResource","tsptest.versioning.models.Resource":"TspTest.Versioning.Resource"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/versioning/VersioningAsyncClient.java","src/main/java/tsptest/versioning/VersioningClient.java","src/main/java/tsptest/versioning/VersioningClientBuilder.java","src/main/java/tsptest/versioning/VersioningServiceVersion.java","src/main/java/tsptest/versioning/implementation/OperationLocationPollingStrategy.java","src/main/java/tsptest/versioning/implementation/PollingUtils.java","src/main/java/tsptest/versioning/implementation/SyncOperationLocationPollingStrategy.java","src/main/java/tsptest/versioning/implementation/VersioningClientImpl.java","src/main/java/tsptest/versioning/implementation/VersioningOpsImpl.java","src/main/java/tsptest/versioning/implementation/package-info.java","src/main/java/tsptest/versioning/models/ExportedResource.java","src/main/java/tsptest/versioning/models/Resource.java","src/main/java/tsptest/versioning/models/package-info.java","src/main/java/tsptest/versioning/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-visibility_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-visibility_apiview_properties.json deleted file mode 100644 index ded2032de86..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-visibility_apiview_properties.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.visibility.VisibilityAsyncClient": "TspTest.Visibility", - "tsptest.visibility.VisibilityAsyncClient.create": "TspTest.Visibility.VisibilityOp.create", - "tsptest.visibility.VisibilityAsyncClient.createWithResponse": "TspTest.Visibility.VisibilityOp.create", - "tsptest.visibility.VisibilityAsyncClient.get": "TspTest.Visibility.VisibilityOp.get", - "tsptest.visibility.VisibilityAsyncClient.getWithResponse": "TspTest.Visibility.VisibilityOp.get", - "tsptest.visibility.VisibilityAsyncClient.query": "TspTest.Visibility.VisibilityOp.query", - "tsptest.visibility.VisibilityAsyncClient.queryWithResponse": "TspTest.Visibility.VisibilityOp.query", - "tsptest.visibility.VisibilityAsyncClient.roundtrip": "TspTest.Visibility.VisibilityOp.roundtrip", - "tsptest.visibility.VisibilityAsyncClient.roundtripWithResponse": "TspTest.Visibility.VisibilityOp.roundtrip", - "tsptest.visibility.VisibilityClient": "TspTest.Visibility", - "tsptest.visibility.VisibilityClient.create": "TspTest.Visibility.VisibilityOp.create", - "tsptest.visibility.VisibilityClient.createWithResponse": "TspTest.Visibility.VisibilityOp.create", - "tsptest.visibility.VisibilityClient.get": "TspTest.Visibility.VisibilityOp.get", - "tsptest.visibility.VisibilityClient.getWithResponse": "TspTest.Visibility.VisibilityOp.get", - "tsptest.visibility.VisibilityClient.query": "TspTest.Visibility.VisibilityOp.query", - "tsptest.visibility.VisibilityClient.queryWithResponse": "TspTest.Visibility.VisibilityOp.query", - "tsptest.visibility.VisibilityClient.roundtrip": "TspTest.Visibility.VisibilityOp.roundtrip", - "tsptest.visibility.VisibilityClient.roundtripWithResponse": "TspTest.Visibility.VisibilityOp.roundtrip", - "tsptest.visibility.VisibilityClientBuilder": "TspTest.Visibility", - "tsptest.visibility.VisibilityReadAsyncClient": "TspTest.Visibility.VisibilityRead", - "tsptest.visibility.VisibilityReadAsyncClient.get": "TspTest.Visibility.VisibilityRead.get", - "tsptest.visibility.VisibilityReadAsyncClient.getWithResponse": "TspTest.Visibility.VisibilityRead.get", - "tsptest.visibility.VisibilityReadClient": "TspTest.Visibility.VisibilityRead", - "tsptest.visibility.VisibilityReadClient.get": "TspTest.Visibility.VisibilityRead.get", - "tsptest.visibility.VisibilityReadClient.getWithResponse": "TspTest.Visibility.VisibilityRead.get", - "tsptest.visibility.VisibilityWriteAsyncClient": "TspTest.Visibility.VisibilityWrite", - "tsptest.visibility.VisibilityWriteAsyncClient.create": "TspTest.Visibility.VisibilityWrite.create", - "tsptest.visibility.VisibilityWriteAsyncClient.createWithResponse": "TspTest.Visibility.VisibilityWrite.create", - "tsptest.visibility.VisibilityWriteClient": "TspTest.Visibility.VisibilityWrite", - "tsptest.visibility.VisibilityWriteClient.create": "TspTest.Visibility.VisibilityWrite.create", - "tsptest.visibility.VisibilityWriteClient.createWithResponse": "TspTest.Visibility.VisibilityWrite.create", - "tsptest.visibility.models.Dog": "TspTest.Visibility.Dog", - "tsptest.visibility.models.ReadDog": "TspTest.Visibility.ReadDog", - "tsptest.visibility.models.RoundTripModel": "TspTest.Visibility.RoundTripModel", - "tsptest.visibility.models.WriteDog": "TspTest.Visibility.WriteDog" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-visibility_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-visibility_metadata.json index 8782e235654..71b987df743 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-visibility_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-visibility_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.visibility.VisibilityAsyncClient":"TspTest.Visibility","tsptest.visibility.VisibilityAsyncClient.create":"TspTest.Visibility.VisibilityOp.create","tsptest.visibility.VisibilityAsyncClient.createWithResponse":"TspTest.Visibility.VisibilityOp.create","tsptest.visibility.VisibilityAsyncClient.get":"TspTest.Visibility.VisibilityOp.get","tsptest.visibility.VisibilityAsyncClient.getWithResponse":"TspTest.Visibility.VisibilityOp.get","tsptest.visibility.VisibilityAsyncClient.query":"TspTest.Visibility.VisibilityOp.query","tsptest.visibility.VisibilityAsyncClient.queryWithResponse":"TspTest.Visibility.VisibilityOp.query","tsptest.visibility.VisibilityAsyncClient.roundtrip":"TspTest.Visibility.VisibilityOp.roundtrip","tsptest.visibility.VisibilityAsyncClient.roundtripWithResponse":"TspTest.Visibility.VisibilityOp.roundtrip","tsptest.visibility.VisibilityClient":"TspTest.Visibility","tsptest.visibility.VisibilityClient.create":"TspTest.Visibility.VisibilityOp.create","tsptest.visibility.VisibilityClient.createWithResponse":"TspTest.Visibility.VisibilityOp.create","tsptest.visibility.VisibilityClient.get":"TspTest.Visibility.VisibilityOp.get","tsptest.visibility.VisibilityClient.getWithResponse":"TspTest.Visibility.VisibilityOp.get","tsptest.visibility.VisibilityClient.query":"TspTest.Visibility.VisibilityOp.query","tsptest.visibility.VisibilityClient.queryWithResponse":"TspTest.Visibility.VisibilityOp.query","tsptest.visibility.VisibilityClient.roundtrip":"TspTest.Visibility.VisibilityOp.roundtrip","tsptest.visibility.VisibilityClient.roundtripWithResponse":"TspTest.Visibility.VisibilityOp.roundtrip","tsptest.visibility.VisibilityClientBuilder":"TspTest.Visibility","tsptest.visibility.VisibilityReadAsyncClient":"TspTest.Visibility.VisibilityRead","tsptest.visibility.VisibilityReadAsyncClient.get":"TspTest.Visibility.VisibilityRead.get","tsptest.visibility.VisibilityReadAsyncClient.getWithResponse":"TspTest.Visibility.VisibilityRead.get","tsptest.visibility.VisibilityReadClient":"TspTest.Visibility.VisibilityRead","tsptest.visibility.VisibilityReadClient.get":"TspTest.Visibility.VisibilityRead.get","tsptest.visibility.VisibilityReadClient.getWithResponse":"TspTest.Visibility.VisibilityRead.get","tsptest.visibility.VisibilityWriteAsyncClient":"TspTest.Visibility.VisibilityWrite","tsptest.visibility.VisibilityWriteAsyncClient.create":"TspTest.Visibility.VisibilityWrite.create","tsptest.visibility.VisibilityWriteAsyncClient.createWithResponse":"TspTest.Visibility.VisibilityWrite.create","tsptest.visibility.VisibilityWriteClient":"TspTest.Visibility.VisibilityWrite","tsptest.visibility.VisibilityWriteClient.create":"TspTest.Visibility.VisibilityWrite.create","tsptest.visibility.VisibilityWriteClient.createWithResponse":"TspTest.Visibility.VisibilityWrite.create","tsptest.visibility.models.Dog":"TspTest.Visibility.Dog","tsptest.visibility.models.ReadDog":"TspTest.Visibility.ReadDog","tsptest.visibility.models.RoundTripModel":"TspTest.Visibility.RoundTripModel","tsptest.visibility.models.WriteDog":"TspTest.Visibility.WriteDog"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/visibility/VisibilityAsyncClient.java","src/main/java/tsptest/visibility/VisibilityClient.java","src/main/java/tsptest/visibility/VisibilityClientBuilder.java","src/main/java/tsptest/visibility/VisibilityReadAsyncClient.java","src/main/java/tsptest/visibility/VisibilityReadClient.java","src/main/java/tsptest/visibility/VisibilityWriteAsyncClient.java","src/main/java/tsptest/visibility/VisibilityWriteClient.java","src/main/java/tsptest/visibility/implementation/VisibilityClientImpl.java","src/main/java/tsptest/visibility/implementation/VisibilityReadsImpl.java","src/main/java/tsptest/visibility/implementation/VisibilityWritesImpl.java","src/main/java/tsptest/visibility/implementation/package-info.java","src/main/java/tsptest/visibility/models/Dog.java","src/main/java/tsptest/visibility/models/ReadDog.java","src/main/java/tsptest/visibility/models/RoundTripModel.java","src/main/java/tsptest/visibility/models/WriteDog.java","src/main/java/tsptest/visibility/models/package-info.java","src/main/java/tsptest/visibility/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.visibility.VisibilityClientBuilder":"TspTest.Visibility","tsptest.visibility.VisibilityOpAsyncClient":"TspTest.Visibility.VisibilityOp","tsptest.visibility.VisibilityOpAsyncClient.create":"TspTest.Visibility.VisibilityOp.create","tsptest.visibility.VisibilityOpAsyncClient.createWithResponse":"TspTest.Visibility.VisibilityOp.create","tsptest.visibility.VisibilityOpAsyncClient.get":"TspTest.Visibility.VisibilityOp.get","tsptest.visibility.VisibilityOpAsyncClient.getWithResponse":"TspTest.Visibility.VisibilityOp.get","tsptest.visibility.VisibilityOpAsyncClient.query":"TspTest.Visibility.VisibilityOp.query","tsptest.visibility.VisibilityOpAsyncClient.queryWithResponse":"TspTest.Visibility.VisibilityOp.query","tsptest.visibility.VisibilityOpAsyncClient.roundtrip":"TspTest.Visibility.VisibilityOp.roundtrip","tsptest.visibility.VisibilityOpAsyncClient.roundtripWithResponse":"TspTest.Visibility.VisibilityOp.roundtrip","tsptest.visibility.VisibilityOpClient":"TspTest.Visibility.VisibilityOp","tsptest.visibility.VisibilityOpClient.create":"TspTest.Visibility.VisibilityOp.create","tsptest.visibility.VisibilityOpClient.createWithResponse":"TspTest.Visibility.VisibilityOp.create","tsptest.visibility.VisibilityOpClient.get":"TspTest.Visibility.VisibilityOp.get","tsptest.visibility.VisibilityOpClient.getWithResponse":"TspTest.Visibility.VisibilityOp.get","tsptest.visibility.VisibilityOpClient.query":"TspTest.Visibility.VisibilityOp.query","tsptest.visibility.VisibilityOpClient.queryWithResponse":"TspTest.Visibility.VisibilityOp.query","tsptest.visibility.VisibilityOpClient.roundtrip":"TspTest.Visibility.VisibilityOp.roundtrip","tsptest.visibility.VisibilityOpClient.roundtripWithResponse":"TspTest.Visibility.VisibilityOp.roundtrip","tsptest.visibility.VisibilityReadAsyncClient":"TspTest.Visibility.VisibilityRead","tsptest.visibility.VisibilityReadAsyncClient.get":"TspTest.Visibility.VisibilityRead.get","tsptest.visibility.VisibilityReadAsyncClient.getWithResponse":"TspTest.Visibility.VisibilityRead.get","tsptest.visibility.VisibilityReadClient":"TspTest.Visibility.VisibilityRead","tsptest.visibility.VisibilityReadClient.get":"TspTest.Visibility.VisibilityRead.get","tsptest.visibility.VisibilityReadClient.getWithResponse":"TspTest.Visibility.VisibilityRead.get","tsptest.visibility.VisibilityWriteAsyncClient":"TspTest.Visibility.VisibilityWrite","tsptest.visibility.VisibilityWriteAsyncClient.create":"TspTest.Visibility.VisibilityWrite.create","tsptest.visibility.VisibilityWriteAsyncClient.createWithResponse":"TspTest.Visibility.VisibilityWrite.create","tsptest.visibility.VisibilityWriteClient":"TspTest.Visibility.VisibilityWrite","tsptest.visibility.VisibilityWriteClient.create":"TspTest.Visibility.VisibilityWrite.create","tsptest.visibility.VisibilityWriteClient.createWithResponse":"TspTest.Visibility.VisibilityWrite.create","tsptest.visibility.models.Dog":"TspTest.Visibility.Dog","tsptest.visibility.models.ReadDog":"TspTest.Visibility.ReadDog","tsptest.visibility.models.RoundTripModel":"TspTest.Visibility.RoundTripModel","tsptest.visibility.models.WriteDog":"TspTest.Visibility.WriteDog"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/visibility/VisibilityClientBuilder.java","src/main/java/tsptest/visibility/VisibilityOpAsyncClient.java","src/main/java/tsptest/visibility/VisibilityOpClient.java","src/main/java/tsptest/visibility/VisibilityReadAsyncClient.java","src/main/java/tsptest/visibility/VisibilityReadClient.java","src/main/java/tsptest/visibility/VisibilityWriteAsyncClient.java","src/main/java/tsptest/visibility/VisibilityWriteClient.java","src/main/java/tsptest/visibility/implementation/VisibilityClientImpl.java","src/main/java/tsptest/visibility/implementation/VisibilityOpsImpl.java","src/main/java/tsptest/visibility/implementation/VisibilityReadsImpl.java","src/main/java/tsptest/visibility/implementation/VisibilityWritesImpl.java","src/main/java/tsptest/visibility/implementation/package-info.java","src/main/java/tsptest/visibility/models/Dog.java","src/main/java/tsptest/visibility/models/ReadDog.java","src/main/java/tsptest/visibility/models/RoundTripModel.java","src/main/java/tsptest/visibility/models/WriteDog.java","src/main/java/tsptest/visibility/models/package-info.java","src/main/java/tsptest/visibility/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-wiretype_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-wiretype_apiview_properties.json deleted file mode 100644 index 05715761071..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-wiretype_apiview_properties.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "tsptest.wiretype.WireTypeAsyncClient": "TspTest.WireType.WireTypeOp", - "tsptest.wiretype.WireTypeAsyncClient.bothClassMismatch": "TspTest.WireType.WireTypeOp.bothClassMismatch", - "tsptest.wiretype.WireTypeAsyncClient.bothClassMismatchWithResponse": "TspTest.WireType.WireTypeOp.bothClassMismatch", - "tsptest.wiretype.WireTypeAsyncClient.subClassMismatch": "TspTest.WireType.WireTypeOp.subClassMismatch", - "tsptest.wiretype.WireTypeAsyncClient.subClassMismatchWithResponse": "TspTest.WireType.WireTypeOp.subClassMismatch", - "tsptest.wiretype.WireTypeAsyncClient.superClassMismatch": "TspTest.WireType.WireTypeOp.superClassMismatch", - "tsptest.wiretype.WireTypeAsyncClient.superClassMismatchWithResponse": "TspTest.WireType.WireTypeOp.superClassMismatch", - "tsptest.wiretype.WireTypeClient": "TspTest.WireType.WireTypeOp", - "tsptest.wiretype.WireTypeClient.bothClassMismatch": "TspTest.WireType.WireTypeOp.bothClassMismatch", - "tsptest.wiretype.WireTypeClient.bothClassMismatchWithResponse": "TspTest.WireType.WireTypeOp.bothClassMismatch", - "tsptest.wiretype.WireTypeClient.subClassMismatch": "TspTest.WireType.WireTypeOp.subClassMismatch", - "tsptest.wiretype.WireTypeClient.subClassMismatchWithResponse": "TspTest.WireType.WireTypeOp.subClassMismatch", - "tsptest.wiretype.WireTypeClient.superClassMismatch": "TspTest.WireType.WireTypeOp.superClassMismatch", - "tsptest.wiretype.WireTypeClient.superClassMismatchWithResponse": "TspTest.WireType.WireTypeOp.superClassMismatch", - "tsptest.wiretype.WireTypeClientBuilder": "TspTest.WireType", - "tsptest.wiretype.models.SubClass": "TspTest.WireType.SubClass", - "tsptest.wiretype.models.SubClassBothMismatch": "TspTest.WireType.SubClassBothMismatch", - "tsptest.wiretype.models.SubClassMismatch": "TspTest.WireType.SubClassMismatch", - "tsptest.wiretype.models.SuperClass": "TspTest.WireType.SuperClass", - "tsptest.wiretype.models.SuperClassMismatch": "TspTest.WireType.SuperClassMismatch" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-wiretype_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-wiretype_metadata.json index 457ca6191f3..7fefe4085b0 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-wiretype_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-wiretype_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"tsptest.wiretype.WireTypeAsyncClient":"TspTest.WireType.WireTypeOp","tsptest.wiretype.WireTypeAsyncClient.bothClassMismatch":"TspTest.WireType.WireTypeOp.bothClassMismatch","tsptest.wiretype.WireTypeAsyncClient.bothClassMismatchWithResponse":"TspTest.WireType.WireTypeOp.bothClassMismatch","tsptest.wiretype.WireTypeAsyncClient.subClassMismatch":"TspTest.WireType.WireTypeOp.subClassMismatch","tsptest.wiretype.WireTypeAsyncClient.subClassMismatchWithResponse":"TspTest.WireType.WireTypeOp.subClassMismatch","tsptest.wiretype.WireTypeAsyncClient.superClassMismatch":"TspTest.WireType.WireTypeOp.superClassMismatch","tsptest.wiretype.WireTypeAsyncClient.superClassMismatchWithResponse":"TspTest.WireType.WireTypeOp.superClassMismatch","tsptest.wiretype.WireTypeClient":"TspTest.WireType.WireTypeOp","tsptest.wiretype.WireTypeClient.bothClassMismatch":"TspTest.WireType.WireTypeOp.bothClassMismatch","tsptest.wiretype.WireTypeClient.bothClassMismatchWithResponse":"TspTest.WireType.WireTypeOp.bothClassMismatch","tsptest.wiretype.WireTypeClient.subClassMismatch":"TspTest.WireType.WireTypeOp.subClassMismatch","tsptest.wiretype.WireTypeClient.subClassMismatchWithResponse":"TspTest.WireType.WireTypeOp.subClassMismatch","tsptest.wiretype.WireTypeClient.superClassMismatch":"TspTest.WireType.WireTypeOp.superClassMismatch","tsptest.wiretype.WireTypeClient.superClassMismatchWithResponse":"TspTest.WireType.WireTypeOp.superClassMismatch","tsptest.wiretype.WireTypeClientBuilder":"TspTest.WireType","tsptest.wiretype.models.SubClass":"TspTest.WireType.SubClass","tsptest.wiretype.models.SubClassBothMismatch":"TspTest.WireType.SubClassBothMismatch","tsptest.wiretype.models.SubClassMismatch":"TspTest.WireType.SubClassMismatch","tsptest.wiretype.models.SuperClass":"TspTest.WireType.SuperClass","tsptest.wiretype.models.SuperClassMismatch":"TspTest.WireType.SuperClassMismatch"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/wiretype/WireTypeAsyncClient.java","src/main/java/tsptest/wiretype/WireTypeClient.java","src/main/java/tsptest/wiretype/WireTypeClientBuilder.java","src/main/java/tsptest/wiretype/implementation/WireTypeClientImpl.java","src/main/java/tsptest/wiretype/implementation/WireTypeOpsImpl.java","src/main/java/tsptest/wiretype/implementation/package-info.java","src/main/java/tsptest/wiretype/models/SubClass.java","src/main/java/tsptest/wiretype/models/SubClassBothMismatch.java","src/main/java/tsptest/wiretype/models/SubClassMismatch.java","src/main/java/tsptest/wiretype/models/SuperClass.java","src/main/java/tsptest/wiretype/models/SuperClassMismatch.java","src/main/java/tsptest/wiretype/models/package-info.java","src/main/java/tsptest/wiretype/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.wiretype.WireTypeAsyncClient":"TspTest.WireType.WireTypeOp","tsptest.wiretype.WireTypeAsyncClient.bothClassMismatch":"TspTest.WireType.WireTypeOp.bothClassMismatch","tsptest.wiretype.WireTypeAsyncClient.bothClassMismatchWithResponse":"TspTest.WireType.WireTypeOp.bothClassMismatch","tsptest.wiretype.WireTypeAsyncClient.subClassMismatch":"TspTest.WireType.WireTypeOp.subClassMismatch","tsptest.wiretype.WireTypeAsyncClient.subClassMismatchWithResponse":"TspTest.WireType.WireTypeOp.subClassMismatch","tsptest.wiretype.WireTypeAsyncClient.superClassMismatch":"TspTest.WireType.WireTypeOp.superClassMismatch","tsptest.wiretype.WireTypeAsyncClient.superClassMismatchWithResponse":"TspTest.WireType.WireTypeOp.superClassMismatch","tsptest.wiretype.WireTypeClient":"TspTest.WireType.WireTypeOp","tsptest.wiretype.WireTypeClient.bothClassMismatch":"TspTest.WireType.WireTypeOp.bothClassMismatch","tsptest.wiretype.WireTypeClient.bothClassMismatchWithResponse":"TspTest.WireType.WireTypeOp.bothClassMismatch","tsptest.wiretype.WireTypeClient.subClassMismatch":"TspTest.WireType.WireTypeOp.subClassMismatch","tsptest.wiretype.WireTypeClient.subClassMismatchWithResponse":"TspTest.WireType.WireTypeOp.subClassMismatch","tsptest.wiretype.WireTypeClient.superClassMismatch":"TspTest.WireType.WireTypeOp.superClassMismatch","tsptest.wiretype.WireTypeClient.superClassMismatchWithResponse":"TspTest.WireType.WireTypeOp.superClassMismatch","tsptest.wiretype.WireTypeClientBuilder":"TspTest.WireType","tsptest.wiretype.models.SubClass":"TspTest.WireType.SubClass","tsptest.wiretype.models.SubClassBothMismatch":"TspTest.WireType.SubClassBothMismatch","tsptest.wiretype.models.SubClassMismatch":"TspTest.WireType.SubClassMismatch","tsptest.wiretype.models.SuperClass":"TspTest.WireType.SuperClass","tsptest.wiretype.models.SuperClassMismatch":"TspTest.WireType.SuperClassMismatch"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/wiretype/WireTypeAsyncClient.java","src/main/java/tsptest/wiretype/WireTypeClient.java","src/main/java/tsptest/wiretype/WireTypeClientBuilder.java","src/main/java/tsptest/wiretype/implementation/WireTypeClientImpl.java","src/main/java/tsptest/wiretype/implementation/WireTypeOpsImpl.java","src/main/java/tsptest/wiretype/implementation/package-info.java","src/main/java/tsptest/wiretype/models/SubClass.java","src/main/java/tsptest/wiretype/models/SubClassBothMismatch.java","src/main/java/tsptest/wiretype/models/SubClassMismatch.java","src/main/java/tsptest/wiretype/models/SuperClass.java","src/main/java/tsptest/wiretype/models/SuperClassMismatch.java","src/main/java/tsptest/wiretype/models/package-info.java","src/main/java/tsptest/wiretype/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-array_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-array_apiview_properties.json deleted file mode 100644 index d93e42231f3..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-array_apiview_properties.json +++ /dev/null @@ -1,147 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.array.ArrayClientBuilder": "Type.Array", - "type.array.BooleanValueAsyncClient": "Type.Array.BooleanValue", - "type.array.BooleanValueAsyncClient.get": "Type.Array.BooleanValue.get", - "type.array.BooleanValueAsyncClient.getWithResponse": "Type.Array.BooleanValue.get", - "type.array.BooleanValueAsyncClient.put": "Type.Array.BooleanValue.put", - "type.array.BooleanValueAsyncClient.putWithResponse": "Type.Array.BooleanValue.put", - "type.array.BooleanValueClient": "Type.Array.BooleanValue", - "type.array.BooleanValueClient.get": "Type.Array.BooleanValue.get", - "type.array.BooleanValueClient.getWithResponse": "Type.Array.BooleanValue.get", - "type.array.BooleanValueClient.put": "Type.Array.BooleanValue.put", - "type.array.BooleanValueClient.putWithResponse": "Type.Array.BooleanValue.put", - "type.array.DatetimeValueAsyncClient": "Type.Array.DatetimeValue", - "type.array.DatetimeValueAsyncClient.get": "Type.Array.DatetimeValue.get", - "type.array.DatetimeValueAsyncClient.getWithResponse": "Type.Array.DatetimeValue.get", - "type.array.DatetimeValueAsyncClient.put": "Type.Array.DatetimeValue.put", - "type.array.DatetimeValueAsyncClient.putWithResponse": "Type.Array.DatetimeValue.put", - "type.array.DatetimeValueClient": "Type.Array.DatetimeValue", - "type.array.DatetimeValueClient.get": "Type.Array.DatetimeValue.get", - "type.array.DatetimeValueClient.getWithResponse": "Type.Array.DatetimeValue.get", - "type.array.DatetimeValueClient.put": "Type.Array.DatetimeValue.put", - "type.array.DatetimeValueClient.putWithResponse": "Type.Array.DatetimeValue.put", - "type.array.DurationValueAsyncClient": "Type.Array.DurationValue", - "type.array.DurationValueAsyncClient.get": "Type.Array.DurationValue.get", - "type.array.DurationValueAsyncClient.getWithResponse": "Type.Array.DurationValue.get", - "type.array.DurationValueAsyncClient.put": "Type.Array.DurationValue.put", - "type.array.DurationValueAsyncClient.putWithResponse": "Type.Array.DurationValue.put", - "type.array.DurationValueClient": "Type.Array.DurationValue", - "type.array.DurationValueClient.get": "Type.Array.DurationValue.get", - "type.array.DurationValueClient.getWithResponse": "Type.Array.DurationValue.get", - "type.array.DurationValueClient.put": "Type.Array.DurationValue.put", - "type.array.DurationValueClient.putWithResponse": "Type.Array.DurationValue.put", - "type.array.Float32ValueAsyncClient": "Type.Array.Float32Value", - "type.array.Float32ValueAsyncClient.get": "Type.Array.Float32Value.get", - "type.array.Float32ValueAsyncClient.getWithResponse": "Type.Array.Float32Value.get", - "type.array.Float32ValueAsyncClient.put": "Type.Array.Float32Value.put", - "type.array.Float32ValueAsyncClient.putWithResponse": "Type.Array.Float32Value.put", - "type.array.Float32ValueClient": "Type.Array.Float32Value", - "type.array.Float32ValueClient.get": "Type.Array.Float32Value.get", - "type.array.Float32ValueClient.getWithResponse": "Type.Array.Float32Value.get", - "type.array.Float32ValueClient.put": "Type.Array.Float32Value.put", - "type.array.Float32ValueClient.putWithResponse": "Type.Array.Float32Value.put", - "type.array.Int32ValueAsyncClient": "Type.Array.Int32Value", - "type.array.Int32ValueAsyncClient.get": "Type.Array.Int32Value.get", - "type.array.Int32ValueAsyncClient.getWithResponse": "Type.Array.Int32Value.get", - "type.array.Int32ValueAsyncClient.put": "Type.Array.Int32Value.put", - "type.array.Int32ValueAsyncClient.putWithResponse": "Type.Array.Int32Value.put", - "type.array.Int32ValueClient": "Type.Array.Int32Value", - "type.array.Int32ValueClient.get": "Type.Array.Int32Value.get", - "type.array.Int32ValueClient.getWithResponse": "Type.Array.Int32Value.get", - "type.array.Int32ValueClient.put": "Type.Array.Int32Value.put", - "type.array.Int32ValueClient.putWithResponse": "Type.Array.Int32Value.put", - "type.array.Int64ValueAsyncClient": "Type.Array.Int64Value", - "type.array.Int64ValueAsyncClient.get": "Type.Array.Int64Value.get", - "type.array.Int64ValueAsyncClient.getWithResponse": "Type.Array.Int64Value.get", - "type.array.Int64ValueAsyncClient.put": "Type.Array.Int64Value.put", - "type.array.Int64ValueAsyncClient.putWithResponse": "Type.Array.Int64Value.put", - "type.array.Int64ValueClient": "Type.Array.Int64Value", - "type.array.Int64ValueClient.get": "Type.Array.Int64Value.get", - "type.array.Int64ValueClient.getWithResponse": "Type.Array.Int64Value.get", - "type.array.Int64ValueClient.put": "Type.Array.Int64Value.put", - "type.array.Int64ValueClient.putWithResponse": "Type.Array.Int64Value.put", - "type.array.ModelValueAsyncClient": "Type.Array.ModelValue", - "type.array.ModelValueAsyncClient.get": "Type.Array.ModelValue.get", - "type.array.ModelValueAsyncClient.getWithResponse": "Type.Array.ModelValue.get", - "type.array.ModelValueAsyncClient.put": "Type.Array.ModelValue.put", - "type.array.ModelValueAsyncClient.putWithResponse": "Type.Array.ModelValue.put", - "type.array.ModelValueClient": "Type.Array.ModelValue", - "type.array.ModelValueClient.get": "Type.Array.ModelValue.get", - "type.array.ModelValueClient.getWithResponse": "Type.Array.ModelValue.get", - "type.array.ModelValueClient.put": "Type.Array.ModelValue.put", - "type.array.ModelValueClient.putWithResponse": "Type.Array.ModelValue.put", - "type.array.NullableBooleanValueAsyncClient": "Type.Array.NullableBooleanValue", - "type.array.NullableBooleanValueAsyncClient.get": "Type.Array.NullableBooleanValue.get", - "type.array.NullableBooleanValueAsyncClient.getWithResponse": "Type.Array.NullableBooleanValue.get", - "type.array.NullableBooleanValueAsyncClient.put": "Type.Array.NullableBooleanValue.put", - "type.array.NullableBooleanValueAsyncClient.putWithResponse": "Type.Array.NullableBooleanValue.put", - "type.array.NullableBooleanValueClient": "Type.Array.NullableBooleanValue", - "type.array.NullableBooleanValueClient.get": "Type.Array.NullableBooleanValue.get", - "type.array.NullableBooleanValueClient.getWithResponse": "Type.Array.NullableBooleanValue.get", - "type.array.NullableBooleanValueClient.put": "Type.Array.NullableBooleanValue.put", - "type.array.NullableBooleanValueClient.putWithResponse": "Type.Array.NullableBooleanValue.put", - "type.array.NullableFloatValueAsyncClient": "Type.Array.NullableFloatValue", - "type.array.NullableFloatValueAsyncClient.get": "Type.Array.NullableFloatValue.get", - "type.array.NullableFloatValueAsyncClient.getWithResponse": "Type.Array.NullableFloatValue.get", - "type.array.NullableFloatValueAsyncClient.put": "Type.Array.NullableFloatValue.put", - "type.array.NullableFloatValueAsyncClient.putWithResponse": "Type.Array.NullableFloatValue.put", - "type.array.NullableFloatValueClient": "Type.Array.NullableFloatValue", - "type.array.NullableFloatValueClient.get": "Type.Array.NullableFloatValue.get", - "type.array.NullableFloatValueClient.getWithResponse": "Type.Array.NullableFloatValue.get", - "type.array.NullableFloatValueClient.put": "Type.Array.NullableFloatValue.put", - "type.array.NullableFloatValueClient.putWithResponse": "Type.Array.NullableFloatValue.put", - "type.array.NullableInt32ValueAsyncClient": "Type.Array.NullableInt32Value", - "type.array.NullableInt32ValueAsyncClient.get": "Type.Array.NullableInt32Value.get", - "type.array.NullableInt32ValueAsyncClient.getWithResponse": "Type.Array.NullableInt32Value.get", - "type.array.NullableInt32ValueAsyncClient.put": "Type.Array.NullableInt32Value.put", - "type.array.NullableInt32ValueAsyncClient.putWithResponse": "Type.Array.NullableInt32Value.put", - "type.array.NullableInt32ValueClient": "Type.Array.NullableInt32Value", - "type.array.NullableInt32ValueClient.get": "Type.Array.NullableInt32Value.get", - "type.array.NullableInt32ValueClient.getWithResponse": "Type.Array.NullableInt32Value.get", - "type.array.NullableInt32ValueClient.put": "Type.Array.NullableInt32Value.put", - "type.array.NullableInt32ValueClient.putWithResponse": "Type.Array.NullableInt32Value.put", - "type.array.NullableModelValueAsyncClient": "Type.Array.NullableModelValue", - "type.array.NullableModelValueAsyncClient.get": "Type.Array.NullableModelValue.get", - "type.array.NullableModelValueAsyncClient.getWithResponse": "Type.Array.NullableModelValue.get", - "type.array.NullableModelValueAsyncClient.put": "Type.Array.NullableModelValue.put", - "type.array.NullableModelValueAsyncClient.putWithResponse": "Type.Array.NullableModelValue.put", - "type.array.NullableModelValueClient": "Type.Array.NullableModelValue", - "type.array.NullableModelValueClient.get": "Type.Array.NullableModelValue.get", - "type.array.NullableModelValueClient.getWithResponse": "Type.Array.NullableModelValue.get", - "type.array.NullableModelValueClient.put": "Type.Array.NullableModelValue.put", - "type.array.NullableModelValueClient.putWithResponse": "Type.Array.NullableModelValue.put", - "type.array.NullableStringValueAsyncClient": "Type.Array.NullableStringValue", - "type.array.NullableStringValueAsyncClient.get": "Type.Array.NullableStringValue.get", - "type.array.NullableStringValueAsyncClient.getWithResponse": "Type.Array.NullableStringValue.get", - "type.array.NullableStringValueAsyncClient.put": "Type.Array.NullableStringValue.put", - "type.array.NullableStringValueAsyncClient.putWithResponse": "Type.Array.NullableStringValue.put", - "type.array.NullableStringValueClient": "Type.Array.NullableStringValue", - "type.array.NullableStringValueClient.get": "Type.Array.NullableStringValue.get", - "type.array.NullableStringValueClient.getWithResponse": "Type.Array.NullableStringValue.get", - "type.array.NullableStringValueClient.put": "Type.Array.NullableStringValue.put", - "type.array.NullableStringValueClient.putWithResponse": "Type.Array.NullableStringValue.put", - "type.array.StringValueAsyncClient": "Type.Array.StringValue", - "type.array.StringValueAsyncClient.get": "Type.Array.StringValue.get", - "type.array.StringValueAsyncClient.getWithResponse": "Type.Array.StringValue.get", - "type.array.StringValueAsyncClient.put": "Type.Array.StringValue.put", - "type.array.StringValueAsyncClient.putWithResponse": "Type.Array.StringValue.put", - "type.array.StringValueClient": "Type.Array.StringValue", - "type.array.StringValueClient.get": "Type.Array.StringValue.get", - "type.array.StringValueClient.getWithResponse": "Type.Array.StringValue.get", - "type.array.StringValueClient.put": "Type.Array.StringValue.put", - "type.array.StringValueClient.putWithResponse": "Type.Array.StringValue.put", - "type.array.UnknownValueAsyncClient": "Type.Array.UnknownValue", - "type.array.UnknownValueAsyncClient.get": "Type.Array.UnknownValue.get", - "type.array.UnknownValueAsyncClient.getWithResponse": "Type.Array.UnknownValue.get", - "type.array.UnknownValueAsyncClient.put": "Type.Array.UnknownValue.put", - "type.array.UnknownValueAsyncClient.putWithResponse": "Type.Array.UnknownValue.put", - "type.array.UnknownValueClient": "Type.Array.UnknownValue", - "type.array.UnknownValueClient.get": "Type.Array.UnknownValue.get", - "type.array.UnknownValueClient.getWithResponse": "Type.Array.UnknownValue.get", - "type.array.UnknownValueClient.put": "Type.Array.UnknownValue.put", - "type.array.UnknownValueClient.putWithResponse": "Type.Array.UnknownValue.put", - "type.array.models.InnerModel": "Type.Array.InnerModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-array_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-array_metadata.json index e3fee9b1ce4..53dbc00780d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-array_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-array_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.array.ArrayClientBuilder":"Type.Array","type.array.BooleanValueAsyncClient":"Type.Array.BooleanValue","type.array.BooleanValueAsyncClient.get":"Type.Array.BooleanValue.get","type.array.BooleanValueAsyncClient.getWithResponse":"Type.Array.BooleanValue.get","type.array.BooleanValueAsyncClient.put":"Type.Array.BooleanValue.put","type.array.BooleanValueAsyncClient.putWithResponse":"Type.Array.BooleanValue.put","type.array.BooleanValueClient":"Type.Array.BooleanValue","type.array.BooleanValueClient.get":"Type.Array.BooleanValue.get","type.array.BooleanValueClient.getWithResponse":"Type.Array.BooleanValue.get","type.array.BooleanValueClient.put":"Type.Array.BooleanValue.put","type.array.BooleanValueClient.putWithResponse":"Type.Array.BooleanValue.put","type.array.DatetimeValueAsyncClient":"Type.Array.DatetimeValue","type.array.DatetimeValueAsyncClient.get":"Type.Array.DatetimeValue.get","type.array.DatetimeValueAsyncClient.getWithResponse":"Type.Array.DatetimeValue.get","type.array.DatetimeValueAsyncClient.put":"Type.Array.DatetimeValue.put","type.array.DatetimeValueAsyncClient.putWithResponse":"Type.Array.DatetimeValue.put","type.array.DatetimeValueClient":"Type.Array.DatetimeValue","type.array.DatetimeValueClient.get":"Type.Array.DatetimeValue.get","type.array.DatetimeValueClient.getWithResponse":"Type.Array.DatetimeValue.get","type.array.DatetimeValueClient.put":"Type.Array.DatetimeValue.put","type.array.DatetimeValueClient.putWithResponse":"Type.Array.DatetimeValue.put","type.array.DurationValueAsyncClient":"Type.Array.DurationValue","type.array.DurationValueAsyncClient.get":"Type.Array.DurationValue.get","type.array.DurationValueAsyncClient.getWithResponse":"Type.Array.DurationValue.get","type.array.DurationValueAsyncClient.put":"Type.Array.DurationValue.put","type.array.DurationValueAsyncClient.putWithResponse":"Type.Array.DurationValue.put","type.array.DurationValueClient":"Type.Array.DurationValue","type.array.DurationValueClient.get":"Type.Array.DurationValue.get","type.array.DurationValueClient.getWithResponse":"Type.Array.DurationValue.get","type.array.DurationValueClient.put":"Type.Array.DurationValue.put","type.array.DurationValueClient.putWithResponse":"Type.Array.DurationValue.put","type.array.Float32ValueAsyncClient":"Type.Array.Float32Value","type.array.Float32ValueAsyncClient.get":"Type.Array.Float32Value.get","type.array.Float32ValueAsyncClient.getWithResponse":"Type.Array.Float32Value.get","type.array.Float32ValueAsyncClient.put":"Type.Array.Float32Value.put","type.array.Float32ValueAsyncClient.putWithResponse":"Type.Array.Float32Value.put","type.array.Float32ValueClient":"Type.Array.Float32Value","type.array.Float32ValueClient.get":"Type.Array.Float32Value.get","type.array.Float32ValueClient.getWithResponse":"Type.Array.Float32Value.get","type.array.Float32ValueClient.put":"Type.Array.Float32Value.put","type.array.Float32ValueClient.putWithResponse":"Type.Array.Float32Value.put","type.array.Int32ValueAsyncClient":"Type.Array.Int32Value","type.array.Int32ValueAsyncClient.get":"Type.Array.Int32Value.get","type.array.Int32ValueAsyncClient.getWithResponse":"Type.Array.Int32Value.get","type.array.Int32ValueAsyncClient.put":"Type.Array.Int32Value.put","type.array.Int32ValueAsyncClient.putWithResponse":"Type.Array.Int32Value.put","type.array.Int32ValueClient":"Type.Array.Int32Value","type.array.Int32ValueClient.get":"Type.Array.Int32Value.get","type.array.Int32ValueClient.getWithResponse":"Type.Array.Int32Value.get","type.array.Int32ValueClient.put":"Type.Array.Int32Value.put","type.array.Int32ValueClient.putWithResponse":"Type.Array.Int32Value.put","type.array.Int64ValueAsyncClient":"Type.Array.Int64Value","type.array.Int64ValueAsyncClient.get":"Type.Array.Int64Value.get","type.array.Int64ValueAsyncClient.getWithResponse":"Type.Array.Int64Value.get","type.array.Int64ValueAsyncClient.put":"Type.Array.Int64Value.put","type.array.Int64ValueAsyncClient.putWithResponse":"Type.Array.Int64Value.put","type.array.Int64ValueClient":"Type.Array.Int64Value","type.array.Int64ValueClient.get":"Type.Array.Int64Value.get","type.array.Int64ValueClient.getWithResponse":"Type.Array.Int64Value.get","type.array.Int64ValueClient.put":"Type.Array.Int64Value.put","type.array.Int64ValueClient.putWithResponse":"Type.Array.Int64Value.put","type.array.ModelValueAsyncClient":"Type.Array.ModelValue","type.array.ModelValueAsyncClient.get":"Type.Array.ModelValue.get","type.array.ModelValueAsyncClient.getWithResponse":"Type.Array.ModelValue.get","type.array.ModelValueAsyncClient.put":"Type.Array.ModelValue.put","type.array.ModelValueAsyncClient.putWithResponse":"Type.Array.ModelValue.put","type.array.ModelValueClient":"Type.Array.ModelValue","type.array.ModelValueClient.get":"Type.Array.ModelValue.get","type.array.ModelValueClient.getWithResponse":"Type.Array.ModelValue.get","type.array.ModelValueClient.put":"Type.Array.ModelValue.put","type.array.ModelValueClient.putWithResponse":"Type.Array.ModelValue.put","type.array.NullableBooleanValueAsyncClient":"Type.Array.NullableBooleanValue","type.array.NullableBooleanValueAsyncClient.get":"Type.Array.NullableBooleanValue.get","type.array.NullableBooleanValueAsyncClient.getWithResponse":"Type.Array.NullableBooleanValue.get","type.array.NullableBooleanValueAsyncClient.put":"Type.Array.NullableBooleanValue.put","type.array.NullableBooleanValueAsyncClient.putWithResponse":"Type.Array.NullableBooleanValue.put","type.array.NullableBooleanValueClient":"Type.Array.NullableBooleanValue","type.array.NullableBooleanValueClient.get":"Type.Array.NullableBooleanValue.get","type.array.NullableBooleanValueClient.getWithResponse":"Type.Array.NullableBooleanValue.get","type.array.NullableBooleanValueClient.put":"Type.Array.NullableBooleanValue.put","type.array.NullableBooleanValueClient.putWithResponse":"Type.Array.NullableBooleanValue.put","type.array.NullableFloatValueAsyncClient":"Type.Array.NullableFloatValue","type.array.NullableFloatValueAsyncClient.get":"Type.Array.NullableFloatValue.get","type.array.NullableFloatValueAsyncClient.getWithResponse":"Type.Array.NullableFloatValue.get","type.array.NullableFloatValueAsyncClient.put":"Type.Array.NullableFloatValue.put","type.array.NullableFloatValueAsyncClient.putWithResponse":"Type.Array.NullableFloatValue.put","type.array.NullableFloatValueClient":"Type.Array.NullableFloatValue","type.array.NullableFloatValueClient.get":"Type.Array.NullableFloatValue.get","type.array.NullableFloatValueClient.getWithResponse":"Type.Array.NullableFloatValue.get","type.array.NullableFloatValueClient.put":"Type.Array.NullableFloatValue.put","type.array.NullableFloatValueClient.putWithResponse":"Type.Array.NullableFloatValue.put","type.array.NullableInt32ValueAsyncClient":"Type.Array.NullableInt32Value","type.array.NullableInt32ValueAsyncClient.get":"Type.Array.NullableInt32Value.get","type.array.NullableInt32ValueAsyncClient.getWithResponse":"Type.Array.NullableInt32Value.get","type.array.NullableInt32ValueAsyncClient.put":"Type.Array.NullableInt32Value.put","type.array.NullableInt32ValueAsyncClient.putWithResponse":"Type.Array.NullableInt32Value.put","type.array.NullableInt32ValueClient":"Type.Array.NullableInt32Value","type.array.NullableInt32ValueClient.get":"Type.Array.NullableInt32Value.get","type.array.NullableInt32ValueClient.getWithResponse":"Type.Array.NullableInt32Value.get","type.array.NullableInt32ValueClient.put":"Type.Array.NullableInt32Value.put","type.array.NullableInt32ValueClient.putWithResponse":"Type.Array.NullableInt32Value.put","type.array.NullableModelValueAsyncClient":"Type.Array.NullableModelValue","type.array.NullableModelValueAsyncClient.get":"Type.Array.NullableModelValue.get","type.array.NullableModelValueAsyncClient.getWithResponse":"Type.Array.NullableModelValue.get","type.array.NullableModelValueAsyncClient.put":"Type.Array.NullableModelValue.put","type.array.NullableModelValueAsyncClient.putWithResponse":"Type.Array.NullableModelValue.put","type.array.NullableModelValueClient":"Type.Array.NullableModelValue","type.array.NullableModelValueClient.get":"Type.Array.NullableModelValue.get","type.array.NullableModelValueClient.getWithResponse":"Type.Array.NullableModelValue.get","type.array.NullableModelValueClient.put":"Type.Array.NullableModelValue.put","type.array.NullableModelValueClient.putWithResponse":"Type.Array.NullableModelValue.put","type.array.NullableStringValueAsyncClient":"Type.Array.NullableStringValue","type.array.NullableStringValueAsyncClient.get":"Type.Array.NullableStringValue.get","type.array.NullableStringValueAsyncClient.getWithResponse":"Type.Array.NullableStringValue.get","type.array.NullableStringValueAsyncClient.put":"Type.Array.NullableStringValue.put","type.array.NullableStringValueAsyncClient.putWithResponse":"Type.Array.NullableStringValue.put","type.array.NullableStringValueClient":"Type.Array.NullableStringValue","type.array.NullableStringValueClient.get":"Type.Array.NullableStringValue.get","type.array.NullableStringValueClient.getWithResponse":"Type.Array.NullableStringValue.get","type.array.NullableStringValueClient.put":"Type.Array.NullableStringValue.put","type.array.NullableStringValueClient.putWithResponse":"Type.Array.NullableStringValue.put","type.array.StringValueAsyncClient":"Type.Array.StringValue","type.array.StringValueAsyncClient.get":"Type.Array.StringValue.get","type.array.StringValueAsyncClient.getWithResponse":"Type.Array.StringValue.get","type.array.StringValueAsyncClient.put":"Type.Array.StringValue.put","type.array.StringValueAsyncClient.putWithResponse":"Type.Array.StringValue.put","type.array.StringValueClient":"Type.Array.StringValue","type.array.StringValueClient.get":"Type.Array.StringValue.get","type.array.StringValueClient.getWithResponse":"Type.Array.StringValue.get","type.array.StringValueClient.put":"Type.Array.StringValue.put","type.array.StringValueClient.putWithResponse":"Type.Array.StringValue.put","type.array.UnknownValueAsyncClient":"Type.Array.UnknownValue","type.array.UnknownValueAsyncClient.get":"Type.Array.UnknownValue.get","type.array.UnknownValueAsyncClient.getWithResponse":"Type.Array.UnknownValue.get","type.array.UnknownValueAsyncClient.put":"Type.Array.UnknownValue.put","type.array.UnknownValueAsyncClient.putWithResponse":"Type.Array.UnknownValue.put","type.array.UnknownValueClient":"Type.Array.UnknownValue","type.array.UnknownValueClient.get":"Type.Array.UnknownValue.get","type.array.UnknownValueClient.getWithResponse":"Type.Array.UnknownValue.get","type.array.UnknownValueClient.put":"Type.Array.UnknownValue.put","type.array.UnknownValueClient.putWithResponse":"Type.Array.UnknownValue.put","type.array.models.InnerModel":"Type.Array.InnerModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/array/ArrayClientBuilder.java","src/main/java/type/array/BooleanValueAsyncClient.java","src/main/java/type/array/BooleanValueClient.java","src/main/java/type/array/DatetimeValueAsyncClient.java","src/main/java/type/array/DatetimeValueClient.java","src/main/java/type/array/DurationValueAsyncClient.java","src/main/java/type/array/DurationValueClient.java","src/main/java/type/array/Float32ValueAsyncClient.java","src/main/java/type/array/Float32ValueClient.java","src/main/java/type/array/Int32ValueAsyncClient.java","src/main/java/type/array/Int32ValueClient.java","src/main/java/type/array/Int64ValueAsyncClient.java","src/main/java/type/array/Int64ValueClient.java","src/main/java/type/array/ModelValueAsyncClient.java","src/main/java/type/array/ModelValueClient.java","src/main/java/type/array/NullableBooleanValueAsyncClient.java","src/main/java/type/array/NullableBooleanValueClient.java","src/main/java/type/array/NullableFloatValueAsyncClient.java","src/main/java/type/array/NullableFloatValueClient.java","src/main/java/type/array/NullableInt32ValueAsyncClient.java","src/main/java/type/array/NullableInt32ValueClient.java","src/main/java/type/array/NullableModelValueAsyncClient.java","src/main/java/type/array/NullableModelValueClient.java","src/main/java/type/array/NullableStringValueAsyncClient.java","src/main/java/type/array/NullableStringValueClient.java","src/main/java/type/array/StringValueAsyncClient.java","src/main/java/type/array/StringValueClient.java","src/main/java/type/array/UnknownValueAsyncClient.java","src/main/java/type/array/UnknownValueClient.java","src/main/java/type/array/implementation/ArrayClientImpl.java","src/main/java/type/array/implementation/BooleanValuesImpl.java","src/main/java/type/array/implementation/DatetimeValuesImpl.java","src/main/java/type/array/implementation/DurationValuesImpl.java","src/main/java/type/array/implementation/Float32ValuesImpl.java","src/main/java/type/array/implementation/Int32ValuesImpl.java","src/main/java/type/array/implementation/Int64ValuesImpl.java","src/main/java/type/array/implementation/ModelValuesImpl.java","src/main/java/type/array/implementation/NullableBooleanValuesImpl.java","src/main/java/type/array/implementation/NullableFloatValuesImpl.java","src/main/java/type/array/implementation/NullableInt32ValuesImpl.java","src/main/java/type/array/implementation/NullableModelValuesImpl.java","src/main/java/type/array/implementation/NullableStringValuesImpl.java","src/main/java/type/array/implementation/StringValuesImpl.java","src/main/java/type/array/implementation/UnknownValuesImpl.java","src/main/java/type/array/implementation/package-info.java","src/main/java/type/array/models/InnerModel.java","src/main/java/type/array/models/package-info.java","src/main/java/type/array/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.array.ArrayClientBuilder":"Type.Array","type.array.BooleanValueAsyncClient":"Type.Array.BooleanValue","type.array.BooleanValueAsyncClient.get":"Type.Array.BooleanValue.get","type.array.BooleanValueAsyncClient.getWithResponse":"Type.Array.BooleanValue.get","type.array.BooleanValueAsyncClient.put":"Type.Array.BooleanValue.put","type.array.BooleanValueAsyncClient.putWithResponse":"Type.Array.BooleanValue.put","type.array.BooleanValueClient":"Type.Array.BooleanValue","type.array.BooleanValueClient.get":"Type.Array.BooleanValue.get","type.array.BooleanValueClient.getWithResponse":"Type.Array.BooleanValue.get","type.array.BooleanValueClient.put":"Type.Array.BooleanValue.put","type.array.BooleanValueClient.putWithResponse":"Type.Array.BooleanValue.put","type.array.DatetimeValueAsyncClient":"Type.Array.DatetimeValue","type.array.DatetimeValueAsyncClient.get":"Type.Array.DatetimeValue.get","type.array.DatetimeValueAsyncClient.getWithResponse":"Type.Array.DatetimeValue.get","type.array.DatetimeValueAsyncClient.put":"Type.Array.DatetimeValue.put","type.array.DatetimeValueAsyncClient.putWithResponse":"Type.Array.DatetimeValue.put","type.array.DatetimeValueClient":"Type.Array.DatetimeValue","type.array.DatetimeValueClient.get":"Type.Array.DatetimeValue.get","type.array.DatetimeValueClient.getWithResponse":"Type.Array.DatetimeValue.get","type.array.DatetimeValueClient.put":"Type.Array.DatetimeValue.put","type.array.DatetimeValueClient.putWithResponse":"Type.Array.DatetimeValue.put","type.array.DurationValueAsyncClient":"Type.Array.DurationValue","type.array.DurationValueAsyncClient.get":"Type.Array.DurationValue.get","type.array.DurationValueAsyncClient.getWithResponse":"Type.Array.DurationValue.get","type.array.DurationValueAsyncClient.put":"Type.Array.DurationValue.put","type.array.DurationValueAsyncClient.putWithResponse":"Type.Array.DurationValue.put","type.array.DurationValueClient":"Type.Array.DurationValue","type.array.DurationValueClient.get":"Type.Array.DurationValue.get","type.array.DurationValueClient.getWithResponse":"Type.Array.DurationValue.get","type.array.DurationValueClient.put":"Type.Array.DurationValue.put","type.array.DurationValueClient.putWithResponse":"Type.Array.DurationValue.put","type.array.Float32ValueAsyncClient":"Type.Array.Float32Value","type.array.Float32ValueAsyncClient.get":"Type.Array.Float32Value.get","type.array.Float32ValueAsyncClient.getWithResponse":"Type.Array.Float32Value.get","type.array.Float32ValueAsyncClient.put":"Type.Array.Float32Value.put","type.array.Float32ValueAsyncClient.putWithResponse":"Type.Array.Float32Value.put","type.array.Float32ValueClient":"Type.Array.Float32Value","type.array.Float32ValueClient.get":"Type.Array.Float32Value.get","type.array.Float32ValueClient.getWithResponse":"Type.Array.Float32Value.get","type.array.Float32ValueClient.put":"Type.Array.Float32Value.put","type.array.Float32ValueClient.putWithResponse":"Type.Array.Float32Value.put","type.array.Int32ValueAsyncClient":"Type.Array.Int32Value","type.array.Int32ValueAsyncClient.get":"Type.Array.Int32Value.get","type.array.Int32ValueAsyncClient.getWithResponse":"Type.Array.Int32Value.get","type.array.Int32ValueAsyncClient.put":"Type.Array.Int32Value.put","type.array.Int32ValueAsyncClient.putWithResponse":"Type.Array.Int32Value.put","type.array.Int32ValueClient":"Type.Array.Int32Value","type.array.Int32ValueClient.get":"Type.Array.Int32Value.get","type.array.Int32ValueClient.getWithResponse":"Type.Array.Int32Value.get","type.array.Int32ValueClient.put":"Type.Array.Int32Value.put","type.array.Int32ValueClient.putWithResponse":"Type.Array.Int32Value.put","type.array.Int64ValueAsyncClient":"Type.Array.Int64Value","type.array.Int64ValueAsyncClient.get":"Type.Array.Int64Value.get","type.array.Int64ValueAsyncClient.getWithResponse":"Type.Array.Int64Value.get","type.array.Int64ValueAsyncClient.put":"Type.Array.Int64Value.put","type.array.Int64ValueAsyncClient.putWithResponse":"Type.Array.Int64Value.put","type.array.Int64ValueClient":"Type.Array.Int64Value","type.array.Int64ValueClient.get":"Type.Array.Int64Value.get","type.array.Int64ValueClient.getWithResponse":"Type.Array.Int64Value.get","type.array.Int64ValueClient.put":"Type.Array.Int64Value.put","type.array.Int64ValueClient.putWithResponse":"Type.Array.Int64Value.put","type.array.ModelValueAsyncClient":"Type.Array.ModelValue","type.array.ModelValueAsyncClient.get":"Type.Array.ModelValue.get","type.array.ModelValueAsyncClient.getWithResponse":"Type.Array.ModelValue.get","type.array.ModelValueAsyncClient.put":"Type.Array.ModelValue.put","type.array.ModelValueAsyncClient.putWithResponse":"Type.Array.ModelValue.put","type.array.ModelValueClient":"Type.Array.ModelValue","type.array.ModelValueClient.get":"Type.Array.ModelValue.get","type.array.ModelValueClient.getWithResponse":"Type.Array.ModelValue.get","type.array.ModelValueClient.put":"Type.Array.ModelValue.put","type.array.ModelValueClient.putWithResponse":"Type.Array.ModelValue.put","type.array.NullableBooleanValueAsyncClient":"Type.Array.NullableBooleanValue","type.array.NullableBooleanValueAsyncClient.get":"Type.Array.NullableBooleanValue.get","type.array.NullableBooleanValueAsyncClient.getWithResponse":"Type.Array.NullableBooleanValue.get","type.array.NullableBooleanValueAsyncClient.put":"Type.Array.NullableBooleanValue.put","type.array.NullableBooleanValueAsyncClient.putWithResponse":"Type.Array.NullableBooleanValue.put","type.array.NullableBooleanValueClient":"Type.Array.NullableBooleanValue","type.array.NullableBooleanValueClient.get":"Type.Array.NullableBooleanValue.get","type.array.NullableBooleanValueClient.getWithResponse":"Type.Array.NullableBooleanValue.get","type.array.NullableBooleanValueClient.put":"Type.Array.NullableBooleanValue.put","type.array.NullableBooleanValueClient.putWithResponse":"Type.Array.NullableBooleanValue.put","type.array.NullableFloatValueAsyncClient":"Type.Array.NullableFloatValue","type.array.NullableFloatValueAsyncClient.get":"Type.Array.NullableFloatValue.get","type.array.NullableFloatValueAsyncClient.getWithResponse":"Type.Array.NullableFloatValue.get","type.array.NullableFloatValueAsyncClient.put":"Type.Array.NullableFloatValue.put","type.array.NullableFloatValueAsyncClient.putWithResponse":"Type.Array.NullableFloatValue.put","type.array.NullableFloatValueClient":"Type.Array.NullableFloatValue","type.array.NullableFloatValueClient.get":"Type.Array.NullableFloatValue.get","type.array.NullableFloatValueClient.getWithResponse":"Type.Array.NullableFloatValue.get","type.array.NullableFloatValueClient.put":"Type.Array.NullableFloatValue.put","type.array.NullableFloatValueClient.putWithResponse":"Type.Array.NullableFloatValue.put","type.array.NullableInt32ValueAsyncClient":"Type.Array.NullableInt32Value","type.array.NullableInt32ValueAsyncClient.get":"Type.Array.NullableInt32Value.get","type.array.NullableInt32ValueAsyncClient.getWithResponse":"Type.Array.NullableInt32Value.get","type.array.NullableInt32ValueAsyncClient.put":"Type.Array.NullableInt32Value.put","type.array.NullableInt32ValueAsyncClient.putWithResponse":"Type.Array.NullableInt32Value.put","type.array.NullableInt32ValueClient":"Type.Array.NullableInt32Value","type.array.NullableInt32ValueClient.get":"Type.Array.NullableInt32Value.get","type.array.NullableInt32ValueClient.getWithResponse":"Type.Array.NullableInt32Value.get","type.array.NullableInt32ValueClient.put":"Type.Array.NullableInt32Value.put","type.array.NullableInt32ValueClient.putWithResponse":"Type.Array.NullableInt32Value.put","type.array.NullableModelValueAsyncClient":"Type.Array.NullableModelValue","type.array.NullableModelValueAsyncClient.get":"Type.Array.NullableModelValue.get","type.array.NullableModelValueAsyncClient.getWithResponse":"Type.Array.NullableModelValue.get","type.array.NullableModelValueAsyncClient.put":"Type.Array.NullableModelValue.put","type.array.NullableModelValueAsyncClient.putWithResponse":"Type.Array.NullableModelValue.put","type.array.NullableModelValueClient":"Type.Array.NullableModelValue","type.array.NullableModelValueClient.get":"Type.Array.NullableModelValue.get","type.array.NullableModelValueClient.getWithResponse":"Type.Array.NullableModelValue.get","type.array.NullableModelValueClient.put":"Type.Array.NullableModelValue.put","type.array.NullableModelValueClient.putWithResponse":"Type.Array.NullableModelValue.put","type.array.NullableStringValueAsyncClient":"Type.Array.NullableStringValue","type.array.NullableStringValueAsyncClient.get":"Type.Array.NullableStringValue.get","type.array.NullableStringValueAsyncClient.getWithResponse":"Type.Array.NullableStringValue.get","type.array.NullableStringValueAsyncClient.put":"Type.Array.NullableStringValue.put","type.array.NullableStringValueAsyncClient.putWithResponse":"Type.Array.NullableStringValue.put","type.array.NullableStringValueClient":"Type.Array.NullableStringValue","type.array.NullableStringValueClient.get":"Type.Array.NullableStringValue.get","type.array.NullableStringValueClient.getWithResponse":"Type.Array.NullableStringValue.get","type.array.NullableStringValueClient.put":"Type.Array.NullableStringValue.put","type.array.NullableStringValueClient.putWithResponse":"Type.Array.NullableStringValue.put","type.array.StringValueAsyncClient":"Type.Array.StringValue","type.array.StringValueAsyncClient.get":"Type.Array.StringValue.get","type.array.StringValueAsyncClient.getWithResponse":"Type.Array.StringValue.get","type.array.StringValueAsyncClient.put":"Type.Array.StringValue.put","type.array.StringValueAsyncClient.putWithResponse":"Type.Array.StringValue.put","type.array.StringValueClient":"Type.Array.StringValue","type.array.StringValueClient.get":"Type.Array.StringValue.get","type.array.StringValueClient.getWithResponse":"Type.Array.StringValue.get","type.array.StringValueClient.put":"Type.Array.StringValue.put","type.array.StringValueClient.putWithResponse":"Type.Array.StringValue.put","type.array.UnknownValueAsyncClient":"Type.Array.UnknownValue","type.array.UnknownValueAsyncClient.get":"Type.Array.UnknownValue.get","type.array.UnknownValueAsyncClient.getWithResponse":"Type.Array.UnknownValue.get","type.array.UnknownValueAsyncClient.put":"Type.Array.UnknownValue.put","type.array.UnknownValueAsyncClient.putWithResponse":"Type.Array.UnknownValue.put","type.array.UnknownValueClient":"Type.Array.UnknownValue","type.array.UnknownValueClient.get":"Type.Array.UnknownValue.get","type.array.UnknownValueClient.getWithResponse":"Type.Array.UnknownValue.get","type.array.UnknownValueClient.put":"Type.Array.UnknownValue.put","type.array.UnknownValueClient.putWithResponse":"Type.Array.UnknownValue.put","type.array.models.InnerModel":"Type.Array.InnerModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/array/ArrayClientBuilder.java","src/main/java/type/array/BooleanValueAsyncClient.java","src/main/java/type/array/BooleanValueClient.java","src/main/java/type/array/DatetimeValueAsyncClient.java","src/main/java/type/array/DatetimeValueClient.java","src/main/java/type/array/DurationValueAsyncClient.java","src/main/java/type/array/DurationValueClient.java","src/main/java/type/array/Float32ValueAsyncClient.java","src/main/java/type/array/Float32ValueClient.java","src/main/java/type/array/Int32ValueAsyncClient.java","src/main/java/type/array/Int32ValueClient.java","src/main/java/type/array/Int64ValueAsyncClient.java","src/main/java/type/array/Int64ValueClient.java","src/main/java/type/array/ModelValueAsyncClient.java","src/main/java/type/array/ModelValueClient.java","src/main/java/type/array/NullableBooleanValueAsyncClient.java","src/main/java/type/array/NullableBooleanValueClient.java","src/main/java/type/array/NullableFloatValueAsyncClient.java","src/main/java/type/array/NullableFloatValueClient.java","src/main/java/type/array/NullableInt32ValueAsyncClient.java","src/main/java/type/array/NullableInt32ValueClient.java","src/main/java/type/array/NullableModelValueAsyncClient.java","src/main/java/type/array/NullableModelValueClient.java","src/main/java/type/array/NullableStringValueAsyncClient.java","src/main/java/type/array/NullableStringValueClient.java","src/main/java/type/array/StringValueAsyncClient.java","src/main/java/type/array/StringValueClient.java","src/main/java/type/array/UnknownValueAsyncClient.java","src/main/java/type/array/UnknownValueClient.java","src/main/java/type/array/implementation/ArrayClientImpl.java","src/main/java/type/array/implementation/BooleanValuesImpl.java","src/main/java/type/array/implementation/DatetimeValuesImpl.java","src/main/java/type/array/implementation/DurationValuesImpl.java","src/main/java/type/array/implementation/Float32ValuesImpl.java","src/main/java/type/array/implementation/Int32ValuesImpl.java","src/main/java/type/array/implementation/Int64ValuesImpl.java","src/main/java/type/array/implementation/ModelValuesImpl.java","src/main/java/type/array/implementation/NullableBooleanValuesImpl.java","src/main/java/type/array/implementation/NullableFloatValuesImpl.java","src/main/java/type/array/implementation/NullableInt32ValuesImpl.java","src/main/java/type/array/implementation/NullableModelValuesImpl.java","src/main/java/type/array/implementation/NullableStringValuesImpl.java","src/main/java/type/array/implementation/StringValuesImpl.java","src/main/java/type/array/implementation/UnknownValuesImpl.java","src/main/java/type/array/implementation/package-info.java","src/main/java/type/array/models/InnerModel.java","src/main/java/type/array/models/package-info.java","src/main/java/type/array/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-dictionary_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-dictionary_apiview_properties.json deleted file mode 100644 index 8cc56c8c284..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-dictionary_apiview_properties.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.dictionary.BooleanValueAsyncClient": "Type.Dictionary.BooleanValue", - "type.dictionary.BooleanValueAsyncClient.get": "Type.Dictionary.BooleanValue.get", - "type.dictionary.BooleanValueAsyncClient.getWithResponse": "Type.Dictionary.BooleanValue.get", - "type.dictionary.BooleanValueAsyncClient.put": "Type.Dictionary.BooleanValue.put", - "type.dictionary.BooleanValueAsyncClient.putWithResponse": "Type.Dictionary.BooleanValue.put", - "type.dictionary.BooleanValueClient": "Type.Dictionary.BooleanValue", - "type.dictionary.BooleanValueClient.get": "Type.Dictionary.BooleanValue.get", - "type.dictionary.BooleanValueClient.getWithResponse": "Type.Dictionary.BooleanValue.get", - "type.dictionary.BooleanValueClient.put": "Type.Dictionary.BooleanValue.put", - "type.dictionary.BooleanValueClient.putWithResponse": "Type.Dictionary.BooleanValue.put", - "type.dictionary.DatetimeValueAsyncClient": "Type.Dictionary.DatetimeValue", - "type.dictionary.DatetimeValueAsyncClient.get": "Type.Dictionary.DatetimeValue.get", - "type.dictionary.DatetimeValueAsyncClient.getWithResponse": "Type.Dictionary.DatetimeValue.get", - "type.dictionary.DatetimeValueAsyncClient.put": "Type.Dictionary.DatetimeValue.put", - "type.dictionary.DatetimeValueAsyncClient.putWithResponse": "Type.Dictionary.DatetimeValue.put", - "type.dictionary.DatetimeValueClient": "Type.Dictionary.DatetimeValue", - "type.dictionary.DatetimeValueClient.get": "Type.Dictionary.DatetimeValue.get", - "type.dictionary.DatetimeValueClient.getWithResponse": "Type.Dictionary.DatetimeValue.get", - "type.dictionary.DatetimeValueClient.put": "Type.Dictionary.DatetimeValue.put", - "type.dictionary.DatetimeValueClient.putWithResponse": "Type.Dictionary.DatetimeValue.put", - "type.dictionary.DictionaryClientBuilder": "Type.Dictionary", - "type.dictionary.DurationValueAsyncClient": "Type.Dictionary.DurationValue", - "type.dictionary.DurationValueAsyncClient.get": "Type.Dictionary.DurationValue.get", - "type.dictionary.DurationValueAsyncClient.getWithResponse": "Type.Dictionary.DurationValue.get", - "type.dictionary.DurationValueAsyncClient.put": "Type.Dictionary.DurationValue.put", - "type.dictionary.DurationValueAsyncClient.putWithResponse": "Type.Dictionary.DurationValue.put", - "type.dictionary.DurationValueClient": "Type.Dictionary.DurationValue", - "type.dictionary.DurationValueClient.get": "Type.Dictionary.DurationValue.get", - "type.dictionary.DurationValueClient.getWithResponse": "Type.Dictionary.DurationValue.get", - "type.dictionary.DurationValueClient.put": "Type.Dictionary.DurationValue.put", - "type.dictionary.DurationValueClient.putWithResponse": "Type.Dictionary.DurationValue.put", - "type.dictionary.Float32ValueAsyncClient": "Type.Dictionary.Float32Value", - "type.dictionary.Float32ValueAsyncClient.get": "Type.Dictionary.Float32Value.get", - "type.dictionary.Float32ValueAsyncClient.getWithResponse": "Type.Dictionary.Float32Value.get", - "type.dictionary.Float32ValueAsyncClient.put": "Type.Dictionary.Float32Value.put", - "type.dictionary.Float32ValueAsyncClient.putWithResponse": "Type.Dictionary.Float32Value.put", - "type.dictionary.Float32ValueClient": "Type.Dictionary.Float32Value", - "type.dictionary.Float32ValueClient.get": "Type.Dictionary.Float32Value.get", - "type.dictionary.Float32ValueClient.getWithResponse": "Type.Dictionary.Float32Value.get", - "type.dictionary.Float32ValueClient.put": "Type.Dictionary.Float32Value.put", - "type.dictionary.Float32ValueClient.putWithResponse": "Type.Dictionary.Float32Value.put", - "type.dictionary.Int32ValueAsyncClient": "Type.Dictionary.Int32Value", - "type.dictionary.Int32ValueAsyncClient.get": "Type.Dictionary.Int32Value.get", - "type.dictionary.Int32ValueAsyncClient.getWithResponse": "Type.Dictionary.Int32Value.get", - "type.dictionary.Int32ValueAsyncClient.put": "Type.Dictionary.Int32Value.put", - "type.dictionary.Int32ValueAsyncClient.putWithResponse": "Type.Dictionary.Int32Value.put", - "type.dictionary.Int32ValueClient": "Type.Dictionary.Int32Value", - "type.dictionary.Int32ValueClient.get": "Type.Dictionary.Int32Value.get", - "type.dictionary.Int32ValueClient.getWithResponse": "Type.Dictionary.Int32Value.get", - "type.dictionary.Int32ValueClient.put": "Type.Dictionary.Int32Value.put", - "type.dictionary.Int32ValueClient.putWithResponse": "Type.Dictionary.Int32Value.put", - "type.dictionary.Int64ValueAsyncClient": "Type.Dictionary.Int64Value", - "type.dictionary.Int64ValueAsyncClient.get": "Type.Dictionary.Int64Value.get", - "type.dictionary.Int64ValueAsyncClient.getWithResponse": "Type.Dictionary.Int64Value.get", - "type.dictionary.Int64ValueAsyncClient.put": "Type.Dictionary.Int64Value.put", - "type.dictionary.Int64ValueAsyncClient.putWithResponse": "Type.Dictionary.Int64Value.put", - "type.dictionary.Int64ValueClient": "Type.Dictionary.Int64Value", - "type.dictionary.Int64ValueClient.get": "Type.Dictionary.Int64Value.get", - "type.dictionary.Int64ValueClient.getWithResponse": "Type.Dictionary.Int64Value.get", - "type.dictionary.Int64ValueClient.put": "Type.Dictionary.Int64Value.put", - "type.dictionary.Int64ValueClient.putWithResponse": "Type.Dictionary.Int64Value.put", - "type.dictionary.ModelValueAsyncClient": "Type.Dictionary.ModelValue", - "type.dictionary.ModelValueAsyncClient.get": "Type.Dictionary.ModelValue.get", - "type.dictionary.ModelValueAsyncClient.getWithResponse": "Type.Dictionary.ModelValue.get", - "type.dictionary.ModelValueAsyncClient.put": "Type.Dictionary.ModelValue.put", - "type.dictionary.ModelValueAsyncClient.putWithResponse": "Type.Dictionary.ModelValue.put", - "type.dictionary.ModelValueClient": "Type.Dictionary.ModelValue", - "type.dictionary.ModelValueClient.get": "Type.Dictionary.ModelValue.get", - "type.dictionary.ModelValueClient.getWithResponse": "Type.Dictionary.ModelValue.get", - "type.dictionary.ModelValueClient.put": "Type.Dictionary.ModelValue.put", - "type.dictionary.ModelValueClient.putWithResponse": "Type.Dictionary.ModelValue.put", - "type.dictionary.NullableFloatValueAsyncClient": "Type.Dictionary.NullableFloatValue", - "type.dictionary.NullableFloatValueAsyncClient.get": "Type.Dictionary.NullableFloatValue.get", - "type.dictionary.NullableFloatValueAsyncClient.getWithResponse": "Type.Dictionary.NullableFloatValue.get", - "type.dictionary.NullableFloatValueAsyncClient.put": "Type.Dictionary.NullableFloatValue.put", - "type.dictionary.NullableFloatValueAsyncClient.putWithResponse": "Type.Dictionary.NullableFloatValue.put", - "type.dictionary.NullableFloatValueClient": "Type.Dictionary.NullableFloatValue", - "type.dictionary.NullableFloatValueClient.get": "Type.Dictionary.NullableFloatValue.get", - "type.dictionary.NullableFloatValueClient.getWithResponse": "Type.Dictionary.NullableFloatValue.get", - "type.dictionary.NullableFloatValueClient.put": "Type.Dictionary.NullableFloatValue.put", - "type.dictionary.NullableFloatValueClient.putWithResponse": "Type.Dictionary.NullableFloatValue.put", - "type.dictionary.RecursiveModelValueAsyncClient": "Type.Dictionary.RecursiveModelValue", - "type.dictionary.RecursiveModelValueAsyncClient.get": "Type.Dictionary.RecursiveModelValue.get", - "type.dictionary.RecursiveModelValueAsyncClient.getWithResponse": "Type.Dictionary.RecursiveModelValue.get", - "type.dictionary.RecursiveModelValueAsyncClient.put": "Type.Dictionary.RecursiveModelValue.put", - "type.dictionary.RecursiveModelValueAsyncClient.putWithResponse": "Type.Dictionary.RecursiveModelValue.put", - "type.dictionary.RecursiveModelValueClient": "Type.Dictionary.RecursiveModelValue", - "type.dictionary.RecursiveModelValueClient.get": "Type.Dictionary.RecursiveModelValue.get", - "type.dictionary.RecursiveModelValueClient.getWithResponse": "Type.Dictionary.RecursiveModelValue.get", - "type.dictionary.RecursiveModelValueClient.put": "Type.Dictionary.RecursiveModelValue.put", - "type.dictionary.RecursiveModelValueClient.putWithResponse": "Type.Dictionary.RecursiveModelValue.put", - "type.dictionary.StringValueAsyncClient": "Type.Dictionary.StringValue", - "type.dictionary.StringValueAsyncClient.get": "Type.Dictionary.StringValue.get", - "type.dictionary.StringValueAsyncClient.getWithResponse": "Type.Dictionary.StringValue.get", - "type.dictionary.StringValueAsyncClient.put": "Type.Dictionary.StringValue.put", - "type.dictionary.StringValueAsyncClient.putWithResponse": "Type.Dictionary.StringValue.put", - "type.dictionary.StringValueClient": "Type.Dictionary.StringValue", - "type.dictionary.StringValueClient.get": "Type.Dictionary.StringValue.get", - "type.dictionary.StringValueClient.getWithResponse": "Type.Dictionary.StringValue.get", - "type.dictionary.StringValueClient.put": "Type.Dictionary.StringValue.put", - "type.dictionary.StringValueClient.putWithResponse": "Type.Dictionary.StringValue.put", - "type.dictionary.UnknownValueAsyncClient": "Type.Dictionary.UnknownValue", - "type.dictionary.UnknownValueAsyncClient.get": "Type.Dictionary.UnknownValue.get", - "type.dictionary.UnknownValueAsyncClient.getWithResponse": "Type.Dictionary.UnknownValue.get", - "type.dictionary.UnknownValueAsyncClient.put": "Type.Dictionary.UnknownValue.put", - "type.dictionary.UnknownValueAsyncClient.putWithResponse": "Type.Dictionary.UnknownValue.put", - "type.dictionary.UnknownValueClient": "Type.Dictionary.UnknownValue", - "type.dictionary.UnknownValueClient.get": "Type.Dictionary.UnknownValue.get", - "type.dictionary.UnknownValueClient.getWithResponse": "Type.Dictionary.UnknownValue.get", - "type.dictionary.UnknownValueClient.put": "Type.Dictionary.UnknownValue.put", - "type.dictionary.UnknownValueClient.putWithResponse": "Type.Dictionary.UnknownValue.put", - "type.dictionary.models.InnerModel": "Type.Dictionary.InnerModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-dictionary_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-dictionary_metadata.json index 6a781e5c329..2ae91b54a57 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-dictionary_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-dictionary_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.dictionary.BooleanValueAsyncClient":"Type.Dictionary.BooleanValue","type.dictionary.BooleanValueAsyncClient.get":"Type.Dictionary.BooleanValue.get","type.dictionary.BooleanValueAsyncClient.getWithResponse":"Type.Dictionary.BooleanValue.get","type.dictionary.BooleanValueAsyncClient.put":"Type.Dictionary.BooleanValue.put","type.dictionary.BooleanValueAsyncClient.putWithResponse":"Type.Dictionary.BooleanValue.put","type.dictionary.BooleanValueClient":"Type.Dictionary.BooleanValue","type.dictionary.BooleanValueClient.get":"Type.Dictionary.BooleanValue.get","type.dictionary.BooleanValueClient.getWithResponse":"Type.Dictionary.BooleanValue.get","type.dictionary.BooleanValueClient.put":"Type.Dictionary.BooleanValue.put","type.dictionary.BooleanValueClient.putWithResponse":"Type.Dictionary.BooleanValue.put","type.dictionary.DatetimeValueAsyncClient":"Type.Dictionary.DatetimeValue","type.dictionary.DatetimeValueAsyncClient.get":"Type.Dictionary.DatetimeValue.get","type.dictionary.DatetimeValueAsyncClient.getWithResponse":"Type.Dictionary.DatetimeValue.get","type.dictionary.DatetimeValueAsyncClient.put":"Type.Dictionary.DatetimeValue.put","type.dictionary.DatetimeValueAsyncClient.putWithResponse":"Type.Dictionary.DatetimeValue.put","type.dictionary.DatetimeValueClient":"Type.Dictionary.DatetimeValue","type.dictionary.DatetimeValueClient.get":"Type.Dictionary.DatetimeValue.get","type.dictionary.DatetimeValueClient.getWithResponse":"Type.Dictionary.DatetimeValue.get","type.dictionary.DatetimeValueClient.put":"Type.Dictionary.DatetimeValue.put","type.dictionary.DatetimeValueClient.putWithResponse":"Type.Dictionary.DatetimeValue.put","type.dictionary.DictionaryClientBuilder":"Type.Dictionary","type.dictionary.DurationValueAsyncClient":"Type.Dictionary.DurationValue","type.dictionary.DurationValueAsyncClient.get":"Type.Dictionary.DurationValue.get","type.dictionary.DurationValueAsyncClient.getWithResponse":"Type.Dictionary.DurationValue.get","type.dictionary.DurationValueAsyncClient.put":"Type.Dictionary.DurationValue.put","type.dictionary.DurationValueAsyncClient.putWithResponse":"Type.Dictionary.DurationValue.put","type.dictionary.DurationValueClient":"Type.Dictionary.DurationValue","type.dictionary.DurationValueClient.get":"Type.Dictionary.DurationValue.get","type.dictionary.DurationValueClient.getWithResponse":"Type.Dictionary.DurationValue.get","type.dictionary.DurationValueClient.put":"Type.Dictionary.DurationValue.put","type.dictionary.DurationValueClient.putWithResponse":"Type.Dictionary.DurationValue.put","type.dictionary.Float32ValueAsyncClient":"Type.Dictionary.Float32Value","type.dictionary.Float32ValueAsyncClient.get":"Type.Dictionary.Float32Value.get","type.dictionary.Float32ValueAsyncClient.getWithResponse":"Type.Dictionary.Float32Value.get","type.dictionary.Float32ValueAsyncClient.put":"Type.Dictionary.Float32Value.put","type.dictionary.Float32ValueAsyncClient.putWithResponse":"Type.Dictionary.Float32Value.put","type.dictionary.Float32ValueClient":"Type.Dictionary.Float32Value","type.dictionary.Float32ValueClient.get":"Type.Dictionary.Float32Value.get","type.dictionary.Float32ValueClient.getWithResponse":"Type.Dictionary.Float32Value.get","type.dictionary.Float32ValueClient.put":"Type.Dictionary.Float32Value.put","type.dictionary.Float32ValueClient.putWithResponse":"Type.Dictionary.Float32Value.put","type.dictionary.Int32ValueAsyncClient":"Type.Dictionary.Int32Value","type.dictionary.Int32ValueAsyncClient.get":"Type.Dictionary.Int32Value.get","type.dictionary.Int32ValueAsyncClient.getWithResponse":"Type.Dictionary.Int32Value.get","type.dictionary.Int32ValueAsyncClient.put":"Type.Dictionary.Int32Value.put","type.dictionary.Int32ValueAsyncClient.putWithResponse":"Type.Dictionary.Int32Value.put","type.dictionary.Int32ValueClient":"Type.Dictionary.Int32Value","type.dictionary.Int32ValueClient.get":"Type.Dictionary.Int32Value.get","type.dictionary.Int32ValueClient.getWithResponse":"Type.Dictionary.Int32Value.get","type.dictionary.Int32ValueClient.put":"Type.Dictionary.Int32Value.put","type.dictionary.Int32ValueClient.putWithResponse":"Type.Dictionary.Int32Value.put","type.dictionary.Int64ValueAsyncClient":"Type.Dictionary.Int64Value","type.dictionary.Int64ValueAsyncClient.get":"Type.Dictionary.Int64Value.get","type.dictionary.Int64ValueAsyncClient.getWithResponse":"Type.Dictionary.Int64Value.get","type.dictionary.Int64ValueAsyncClient.put":"Type.Dictionary.Int64Value.put","type.dictionary.Int64ValueAsyncClient.putWithResponse":"Type.Dictionary.Int64Value.put","type.dictionary.Int64ValueClient":"Type.Dictionary.Int64Value","type.dictionary.Int64ValueClient.get":"Type.Dictionary.Int64Value.get","type.dictionary.Int64ValueClient.getWithResponse":"Type.Dictionary.Int64Value.get","type.dictionary.Int64ValueClient.put":"Type.Dictionary.Int64Value.put","type.dictionary.Int64ValueClient.putWithResponse":"Type.Dictionary.Int64Value.put","type.dictionary.ModelValueAsyncClient":"Type.Dictionary.ModelValue","type.dictionary.ModelValueAsyncClient.get":"Type.Dictionary.ModelValue.get","type.dictionary.ModelValueAsyncClient.getWithResponse":"Type.Dictionary.ModelValue.get","type.dictionary.ModelValueAsyncClient.put":"Type.Dictionary.ModelValue.put","type.dictionary.ModelValueAsyncClient.putWithResponse":"Type.Dictionary.ModelValue.put","type.dictionary.ModelValueClient":"Type.Dictionary.ModelValue","type.dictionary.ModelValueClient.get":"Type.Dictionary.ModelValue.get","type.dictionary.ModelValueClient.getWithResponse":"Type.Dictionary.ModelValue.get","type.dictionary.ModelValueClient.put":"Type.Dictionary.ModelValue.put","type.dictionary.ModelValueClient.putWithResponse":"Type.Dictionary.ModelValue.put","type.dictionary.NullableFloatValueAsyncClient":"Type.Dictionary.NullableFloatValue","type.dictionary.NullableFloatValueAsyncClient.get":"Type.Dictionary.NullableFloatValue.get","type.dictionary.NullableFloatValueAsyncClient.getWithResponse":"Type.Dictionary.NullableFloatValue.get","type.dictionary.NullableFloatValueAsyncClient.put":"Type.Dictionary.NullableFloatValue.put","type.dictionary.NullableFloatValueAsyncClient.putWithResponse":"Type.Dictionary.NullableFloatValue.put","type.dictionary.NullableFloatValueClient":"Type.Dictionary.NullableFloatValue","type.dictionary.NullableFloatValueClient.get":"Type.Dictionary.NullableFloatValue.get","type.dictionary.NullableFloatValueClient.getWithResponse":"Type.Dictionary.NullableFloatValue.get","type.dictionary.NullableFloatValueClient.put":"Type.Dictionary.NullableFloatValue.put","type.dictionary.NullableFloatValueClient.putWithResponse":"Type.Dictionary.NullableFloatValue.put","type.dictionary.RecursiveModelValueAsyncClient":"Type.Dictionary.RecursiveModelValue","type.dictionary.RecursiveModelValueAsyncClient.get":"Type.Dictionary.RecursiveModelValue.get","type.dictionary.RecursiveModelValueAsyncClient.getWithResponse":"Type.Dictionary.RecursiveModelValue.get","type.dictionary.RecursiveModelValueAsyncClient.put":"Type.Dictionary.RecursiveModelValue.put","type.dictionary.RecursiveModelValueAsyncClient.putWithResponse":"Type.Dictionary.RecursiveModelValue.put","type.dictionary.RecursiveModelValueClient":"Type.Dictionary.RecursiveModelValue","type.dictionary.RecursiveModelValueClient.get":"Type.Dictionary.RecursiveModelValue.get","type.dictionary.RecursiveModelValueClient.getWithResponse":"Type.Dictionary.RecursiveModelValue.get","type.dictionary.RecursiveModelValueClient.put":"Type.Dictionary.RecursiveModelValue.put","type.dictionary.RecursiveModelValueClient.putWithResponse":"Type.Dictionary.RecursiveModelValue.put","type.dictionary.StringValueAsyncClient":"Type.Dictionary.StringValue","type.dictionary.StringValueAsyncClient.get":"Type.Dictionary.StringValue.get","type.dictionary.StringValueAsyncClient.getWithResponse":"Type.Dictionary.StringValue.get","type.dictionary.StringValueAsyncClient.put":"Type.Dictionary.StringValue.put","type.dictionary.StringValueAsyncClient.putWithResponse":"Type.Dictionary.StringValue.put","type.dictionary.StringValueClient":"Type.Dictionary.StringValue","type.dictionary.StringValueClient.get":"Type.Dictionary.StringValue.get","type.dictionary.StringValueClient.getWithResponse":"Type.Dictionary.StringValue.get","type.dictionary.StringValueClient.put":"Type.Dictionary.StringValue.put","type.dictionary.StringValueClient.putWithResponse":"Type.Dictionary.StringValue.put","type.dictionary.UnknownValueAsyncClient":"Type.Dictionary.UnknownValue","type.dictionary.UnknownValueAsyncClient.get":"Type.Dictionary.UnknownValue.get","type.dictionary.UnknownValueAsyncClient.getWithResponse":"Type.Dictionary.UnknownValue.get","type.dictionary.UnknownValueAsyncClient.put":"Type.Dictionary.UnknownValue.put","type.dictionary.UnknownValueAsyncClient.putWithResponse":"Type.Dictionary.UnknownValue.put","type.dictionary.UnknownValueClient":"Type.Dictionary.UnknownValue","type.dictionary.UnknownValueClient.get":"Type.Dictionary.UnknownValue.get","type.dictionary.UnknownValueClient.getWithResponse":"Type.Dictionary.UnknownValue.get","type.dictionary.UnknownValueClient.put":"Type.Dictionary.UnknownValue.put","type.dictionary.UnknownValueClient.putWithResponse":"Type.Dictionary.UnknownValue.put","type.dictionary.models.InnerModel":"Type.Dictionary.InnerModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/dictionary/BooleanValueAsyncClient.java","src/main/java/type/dictionary/BooleanValueClient.java","src/main/java/type/dictionary/DatetimeValueAsyncClient.java","src/main/java/type/dictionary/DatetimeValueClient.java","src/main/java/type/dictionary/DictionaryClientBuilder.java","src/main/java/type/dictionary/DurationValueAsyncClient.java","src/main/java/type/dictionary/DurationValueClient.java","src/main/java/type/dictionary/Float32ValueAsyncClient.java","src/main/java/type/dictionary/Float32ValueClient.java","src/main/java/type/dictionary/Int32ValueAsyncClient.java","src/main/java/type/dictionary/Int32ValueClient.java","src/main/java/type/dictionary/Int64ValueAsyncClient.java","src/main/java/type/dictionary/Int64ValueClient.java","src/main/java/type/dictionary/ModelValueAsyncClient.java","src/main/java/type/dictionary/ModelValueClient.java","src/main/java/type/dictionary/NullableFloatValueAsyncClient.java","src/main/java/type/dictionary/NullableFloatValueClient.java","src/main/java/type/dictionary/RecursiveModelValueAsyncClient.java","src/main/java/type/dictionary/RecursiveModelValueClient.java","src/main/java/type/dictionary/StringValueAsyncClient.java","src/main/java/type/dictionary/StringValueClient.java","src/main/java/type/dictionary/UnknownValueAsyncClient.java","src/main/java/type/dictionary/UnknownValueClient.java","src/main/java/type/dictionary/implementation/BooleanValuesImpl.java","src/main/java/type/dictionary/implementation/DatetimeValuesImpl.java","src/main/java/type/dictionary/implementation/DictionaryClientImpl.java","src/main/java/type/dictionary/implementation/DurationValuesImpl.java","src/main/java/type/dictionary/implementation/Float32ValuesImpl.java","src/main/java/type/dictionary/implementation/Int32ValuesImpl.java","src/main/java/type/dictionary/implementation/Int64ValuesImpl.java","src/main/java/type/dictionary/implementation/ModelValuesImpl.java","src/main/java/type/dictionary/implementation/NullableFloatValuesImpl.java","src/main/java/type/dictionary/implementation/RecursiveModelValuesImpl.java","src/main/java/type/dictionary/implementation/StringValuesImpl.java","src/main/java/type/dictionary/implementation/UnknownValuesImpl.java","src/main/java/type/dictionary/implementation/package-info.java","src/main/java/type/dictionary/models/InnerModel.java","src/main/java/type/dictionary/models/package-info.java","src/main/java/type/dictionary/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.dictionary.BooleanValueAsyncClient":"Type.Dictionary.BooleanValue","type.dictionary.BooleanValueAsyncClient.get":"Type.Dictionary.BooleanValue.get","type.dictionary.BooleanValueAsyncClient.getWithResponse":"Type.Dictionary.BooleanValue.get","type.dictionary.BooleanValueAsyncClient.put":"Type.Dictionary.BooleanValue.put","type.dictionary.BooleanValueAsyncClient.putWithResponse":"Type.Dictionary.BooleanValue.put","type.dictionary.BooleanValueClient":"Type.Dictionary.BooleanValue","type.dictionary.BooleanValueClient.get":"Type.Dictionary.BooleanValue.get","type.dictionary.BooleanValueClient.getWithResponse":"Type.Dictionary.BooleanValue.get","type.dictionary.BooleanValueClient.put":"Type.Dictionary.BooleanValue.put","type.dictionary.BooleanValueClient.putWithResponse":"Type.Dictionary.BooleanValue.put","type.dictionary.DatetimeValueAsyncClient":"Type.Dictionary.DatetimeValue","type.dictionary.DatetimeValueAsyncClient.get":"Type.Dictionary.DatetimeValue.get","type.dictionary.DatetimeValueAsyncClient.getWithResponse":"Type.Dictionary.DatetimeValue.get","type.dictionary.DatetimeValueAsyncClient.put":"Type.Dictionary.DatetimeValue.put","type.dictionary.DatetimeValueAsyncClient.putWithResponse":"Type.Dictionary.DatetimeValue.put","type.dictionary.DatetimeValueClient":"Type.Dictionary.DatetimeValue","type.dictionary.DatetimeValueClient.get":"Type.Dictionary.DatetimeValue.get","type.dictionary.DatetimeValueClient.getWithResponse":"Type.Dictionary.DatetimeValue.get","type.dictionary.DatetimeValueClient.put":"Type.Dictionary.DatetimeValue.put","type.dictionary.DatetimeValueClient.putWithResponse":"Type.Dictionary.DatetimeValue.put","type.dictionary.DictionaryClientBuilder":"Type.Dictionary","type.dictionary.DurationValueAsyncClient":"Type.Dictionary.DurationValue","type.dictionary.DurationValueAsyncClient.get":"Type.Dictionary.DurationValue.get","type.dictionary.DurationValueAsyncClient.getWithResponse":"Type.Dictionary.DurationValue.get","type.dictionary.DurationValueAsyncClient.put":"Type.Dictionary.DurationValue.put","type.dictionary.DurationValueAsyncClient.putWithResponse":"Type.Dictionary.DurationValue.put","type.dictionary.DurationValueClient":"Type.Dictionary.DurationValue","type.dictionary.DurationValueClient.get":"Type.Dictionary.DurationValue.get","type.dictionary.DurationValueClient.getWithResponse":"Type.Dictionary.DurationValue.get","type.dictionary.DurationValueClient.put":"Type.Dictionary.DurationValue.put","type.dictionary.DurationValueClient.putWithResponse":"Type.Dictionary.DurationValue.put","type.dictionary.Float32ValueAsyncClient":"Type.Dictionary.Float32Value","type.dictionary.Float32ValueAsyncClient.get":"Type.Dictionary.Float32Value.get","type.dictionary.Float32ValueAsyncClient.getWithResponse":"Type.Dictionary.Float32Value.get","type.dictionary.Float32ValueAsyncClient.put":"Type.Dictionary.Float32Value.put","type.dictionary.Float32ValueAsyncClient.putWithResponse":"Type.Dictionary.Float32Value.put","type.dictionary.Float32ValueClient":"Type.Dictionary.Float32Value","type.dictionary.Float32ValueClient.get":"Type.Dictionary.Float32Value.get","type.dictionary.Float32ValueClient.getWithResponse":"Type.Dictionary.Float32Value.get","type.dictionary.Float32ValueClient.put":"Type.Dictionary.Float32Value.put","type.dictionary.Float32ValueClient.putWithResponse":"Type.Dictionary.Float32Value.put","type.dictionary.Int32ValueAsyncClient":"Type.Dictionary.Int32Value","type.dictionary.Int32ValueAsyncClient.get":"Type.Dictionary.Int32Value.get","type.dictionary.Int32ValueAsyncClient.getWithResponse":"Type.Dictionary.Int32Value.get","type.dictionary.Int32ValueAsyncClient.put":"Type.Dictionary.Int32Value.put","type.dictionary.Int32ValueAsyncClient.putWithResponse":"Type.Dictionary.Int32Value.put","type.dictionary.Int32ValueClient":"Type.Dictionary.Int32Value","type.dictionary.Int32ValueClient.get":"Type.Dictionary.Int32Value.get","type.dictionary.Int32ValueClient.getWithResponse":"Type.Dictionary.Int32Value.get","type.dictionary.Int32ValueClient.put":"Type.Dictionary.Int32Value.put","type.dictionary.Int32ValueClient.putWithResponse":"Type.Dictionary.Int32Value.put","type.dictionary.Int64ValueAsyncClient":"Type.Dictionary.Int64Value","type.dictionary.Int64ValueAsyncClient.get":"Type.Dictionary.Int64Value.get","type.dictionary.Int64ValueAsyncClient.getWithResponse":"Type.Dictionary.Int64Value.get","type.dictionary.Int64ValueAsyncClient.put":"Type.Dictionary.Int64Value.put","type.dictionary.Int64ValueAsyncClient.putWithResponse":"Type.Dictionary.Int64Value.put","type.dictionary.Int64ValueClient":"Type.Dictionary.Int64Value","type.dictionary.Int64ValueClient.get":"Type.Dictionary.Int64Value.get","type.dictionary.Int64ValueClient.getWithResponse":"Type.Dictionary.Int64Value.get","type.dictionary.Int64ValueClient.put":"Type.Dictionary.Int64Value.put","type.dictionary.Int64ValueClient.putWithResponse":"Type.Dictionary.Int64Value.put","type.dictionary.ModelValueAsyncClient":"Type.Dictionary.ModelValue","type.dictionary.ModelValueAsyncClient.get":"Type.Dictionary.ModelValue.get","type.dictionary.ModelValueAsyncClient.getWithResponse":"Type.Dictionary.ModelValue.get","type.dictionary.ModelValueAsyncClient.put":"Type.Dictionary.ModelValue.put","type.dictionary.ModelValueAsyncClient.putWithResponse":"Type.Dictionary.ModelValue.put","type.dictionary.ModelValueClient":"Type.Dictionary.ModelValue","type.dictionary.ModelValueClient.get":"Type.Dictionary.ModelValue.get","type.dictionary.ModelValueClient.getWithResponse":"Type.Dictionary.ModelValue.get","type.dictionary.ModelValueClient.put":"Type.Dictionary.ModelValue.put","type.dictionary.ModelValueClient.putWithResponse":"Type.Dictionary.ModelValue.put","type.dictionary.NullableFloatValueAsyncClient":"Type.Dictionary.NullableFloatValue","type.dictionary.NullableFloatValueAsyncClient.get":"Type.Dictionary.NullableFloatValue.get","type.dictionary.NullableFloatValueAsyncClient.getWithResponse":"Type.Dictionary.NullableFloatValue.get","type.dictionary.NullableFloatValueAsyncClient.put":"Type.Dictionary.NullableFloatValue.put","type.dictionary.NullableFloatValueAsyncClient.putWithResponse":"Type.Dictionary.NullableFloatValue.put","type.dictionary.NullableFloatValueClient":"Type.Dictionary.NullableFloatValue","type.dictionary.NullableFloatValueClient.get":"Type.Dictionary.NullableFloatValue.get","type.dictionary.NullableFloatValueClient.getWithResponse":"Type.Dictionary.NullableFloatValue.get","type.dictionary.NullableFloatValueClient.put":"Type.Dictionary.NullableFloatValue.put","type.dictionary.NullableFloatValueClient.putWithResponse":"Type.Dictionary.NullableFloatValue.put","type.dictionary.RecursiveModelValueAsyncClient":"Type.Dictionary.RecursiveModelValue","type.dictionary.RecursiveModelValueAsyncClient.get":"Type.Dictionary.RecursiveModelValue.get","type.dictionary.RecursiveModelValueAsyncClient.getWithResponse":"Type.Dictionary.RecursiveModelValue.get","type.dictionary.RecursiveModelValueAsyncClient.put":"Type.Dictionary.RecursiveModelValue.put","type.dictionary.RecursiveModelValueAsyncClient.putWithResponse":"Type.Dictionary.RecursiveModelValue.put","type.dictionary.RecursiveModelValueClient":"Type.Dictionary.RecursiveModelValue","type.dictionary.RecursiveModelValueClient.get":"Type.Dictionary.RecursiveModelValue.get","type.dictionary.RecursiveModelValueClient.getWithResponse":"Type.Dictionary.RecursiveModelValue.get","type.dictionary.RecursiveModelValueClient.put":"Type.Dictionary.RecursiveModelValue.put","type.dictionary.RecursiveModelValueClient.putWithResponse":"Type.Dictionary.RecursiveModelValue.put","type.dictionary.StringValueAsyncClient":"Type.Dictionary.StringValue","type.dictionary.StringValueAsyncClient.get":"Type.Dictionary.StringValue.get","type.dictionary.StringValueAsyncClient.getWithResponse":"Type.Dictionary.StringValue.get","type.dictionary.StringValueAsyncClient.put":"Type.Dictionary.StringValue.put","type.dictionary.StringValueAsyncClient.putWithResponse":"Type.Dictionary.StringValue.put","type.dictionary.StringValueClient":"Type.Dictionary.StringValue","type.dictionary.StringValueClient.get":"Type.Dictionary.StringValue.get","type.dictionary.StringValueClient.getWithResponse":"Type.Dictionary.StringValue.get","type.dictionary.StringValueClient.put":"Type.Dictionary.StringValue.put","type.dictionary.StringValueClient.putWithResponse":"Type.Dictionary.StringValue.put","type.dictionary.UnknownValueAsyncClient":"Type.Dictionary.UnknownValue","type.dictionary.UnknownValueAsyncClient.get":"Type.Dictionary.UnknownValue.get","type.dictionary.UnknownValueAsyncClient.getWithResponse":"Type.Dictionary.UnknownValue.get","type.dictionary.UnknownValueAsyncClient.put":"Type.Dictionary.UnknownValue.put","type.dictionary.UnknownValueAsyncClient.putWithResponse":"Type.Dictionary.UnknownValue.put","type.dictionary.UnknownValueClient":"Type.Dictionary.UnknownValue","type.dictionary.UnknownValueClient.get":"Type.Dictionary.UnknownValue.get","type.dictionary.UnknownValueClient.getWithResponse":"Type.Dictionary.UnknownValue.get","type.dictionary.UnknownValueClient.put":"Type.Dictionary.UnknownValue.put","type.dictionary.UnknownValueClient.putWithResponse":"Type.Dictionary.UnknownValue.put","type.dictionary.models.InnerModel":"Type.Dictionary.InnerModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/dictionary/BooleanValueAsyncClient.java","src/main/java/type/dictionary/BooleanValueClient.java","src/main/java/type/dictionary/DatetimeValueAsyncClient.java","src/main/java/type/dictionary/DatetimeValueClient.java","src/main/java/type/dictionary/DictionaryClientBuilder.java","src/main/java/type/dictionary/DurationValueAsyncClient.java","src/main/java/type/dictionary/DurationValueClient.java","src/main/java/type/dictionary/Float32ValueAsyncClient.java","src/main/java/type/dictionary/Float32ValueClient.java","src/main/java/type/dictionary/Int32ValueAsyncClient.java","src/main/java/type/dictionary/Int32ValueClient.java","src/main/java/type/dictionary/Int64ValueAsyncClient.java","src/main/java/type/dictionary/Int64ValueClient.java","src/main/java/type/dictionary/ModelValueAsyncClient.java","src/main/java/type/dictionary/ModelValueClient.java","src/main/java/type/dictionary/NullableFloatValueAsyncClient.java","src/main/java/type/dictionary/NullableFloatValueClient.java","src/main/java/type/dictionary/RecursiveModelValueAsyncClient.java","src/main/java/type/dictionary/RecursiveModelValueClient.java","src/main/java/type/dictionary/StringValueAsyncClient.java","src/main/java/type/dictionary/StringValueClient.java","src/main/java/type/dictionary/UnknownValueAsyncClient.java","src/main/java/type/dictionary/UnknownValueClient.java","src/main/java/type/dictionary/implementation/BooleanValuesImpl.java","src/main/java/type/dictionary/implementation/DatetimeValuesImpl.java","src/main/java/type/dictionary/implementation/DictionaryClientImpl.java","src/main/java/type/dictionary/implementation/DurationValuesImpl.java","src/main/java/type/dictionary/implementation/Float32ValuesImpl.java","src/main/java/type/dictionary/implementation/Int32ValuesImpl.java","src/main/java/type/dictionary/implementation/Int64ValuesImpl.java","src/main/java/type/dictionary/implementation/ModelValuesImpl.java","src/main/java/type/dictionary/implementation/NullableFloatValuesImpl.java","src/main/java/type/dictionary/implementation/RecursiveModelValuesImpl.java","src/main/java/type/dictionary/implementation/StringValuesImpl.java","src/main/java/type/dictionary/implementation/UnknownValuesImpl.java","src/main/java/type/dictionary/implementation/package-info.java","src/main/java/type/dictionary/models/InnerModel.java","src/main/java/type/dictionary/models/package-info.java","src/main/java/type/dictionary/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-enums-extensible_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-enums-extensible_apiview_properties.json deleted file mode 100644 index 68ae6fa5542..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-enums-extensible_apiview_properties.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.enums.extensible.ExtensibleAsyncClient": "Type.Enum.Extensible.String", - "type.enums.extensible.ExtensibleAsyncClient.getKnownValue": "Type.Enum.Extensible.String.getKnownValue", - "type.enums.extensible.ExtensibleAsyncClient.getKnownValueWithResponse": "Type.Enum.Extensible.String.getKnownValue", - "type.enums.extensible.ExtensibleAsyncClient.getUnknownValue": "Type.Enum.Extensible.String.getUnknownValue", - "type.enums.extensible.ExtensibleAsyncClient.getUnknownValueWithResponse": "Type.Enum.Extensible.String.getUnknownValue", - "type.enums.extensible.ExtensibleAsyncClient.putKnownValue": "Type.Enum.Extensible.String.putKnownValue", - "type.enums.extensible.ExtensibleAsyncClient.putKnownValueWithResponse": "Type.Enum.Extensible.String.putKnownValue", - "type.enums.extensible.ExtensibleAsyncClient.putUnknownValue": "Type.Enum.Extensible.String.putUnknownValue", - "type.enums.extensible.ExtensibleAsyncClient.putUnknownValueWithResponse": "Type.Enum.Extensible.String.putUnknownValue", - "type.enums.extensible.ExtensibleClient": "Type.Enum.Extensible.String", - "type.enums.extensible.ExtensibleClient.getKnownValue": "Type.Enum.Extensible.String.getKnownValue", - "type.enums.extensible.ExtensibleClient.getKnownValueWithResponse": "Type.Enum.Extensible.String.getKnownValue", - "type.enums.extensible.ExtensibleClient.getUnknownValue": "Type.Enum.Extensible.String.getUnknownValue", - "type.enums.extensible.ExtensibleClient.getUnknownValueWithResponse": "Type.Enum.Extensible.String.getUnknownValue", - "type.enums.extensible.ExtensibleClient.putKnownValue": "Type.Enum.Extensible.String.putKnownValue", - "type.enums.extensible.ExtensibleClient.putKnownValueWithResponse": "Type.Enum.Extensible.String.putKnownValue", - "type.enums.extensible.ExtensibleClient.putUnknownValue": "Type.Enum.Extensible.String.putUnknownValue", - "type.enums.extensible.ExtensibleClient.putUnknownValueWithResponse": "Type.Enum.Extensible.String.putUnknownValue", - "type.enums.extensible.ExtensibleClientBuilder": "Type.Enum.Extensible", - "type.enums.extensible.models.DaysOfWeekExtensibleEnum": "Type.Enum.Extensible.DaysOfWeekExtensibleEnum" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-enums-extensible_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-enums-extensible_metadata.json index 075d5fc74f9..cdd95105d63 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-enums-extensible_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-enums-extensible_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.enums.extensible.ExtensibleAsyncClient":"Type.Enum.Extensible.String","type.enums.extensible.ExtensibleAsyncClient.getKnownValue":"Type.Enum.Extensible.String.getKnownValue","type.enums.extensible.ExtensibleAsyncClient.getKnownValueWithResponse":"Type.Enum.Extensible.String.getKnownValue","type.enums.extensible.ExtensibleAsyncClient.getUnknownValue":"Type.Enum.Extensible.String.getUnknownValue","type.enums.extensible.ExtensibleAsyncClient.getUnknownValueWithResponse":"Type.Enum.Extensible.String.getUnknownValue","type.enums.extensible.ExtensibleAsyncClient.putKnownValue":"Type.Enum.Extensible.String.putKnownValue","type.enums.extensible.ExtensibleAsyncClient.putKnownValueWithResponse":"Type.Enum.Extensible.String.putKnownValue","type.enums.extensible.ExtensibleAsyncClient.putUnknownValue":"Type.Enum.Extensible.String.putUnknownValue","type.enums.extensible.ExtensibleAsyncClient.putUnknownValueWithResponse":"Type.Enum.Extensible.String.putUnknownValue","type.enums.extensible.ExtensibleClient":"Type.Enum.Extensible.String","type.enums.extensible.ExtensibleClient.getKnownValue":"Type.Enum.Extensible.String.getKnownValue","type.enums.extensible.ExtensibleClient.getKnownValueWithResponse":"Type.Enum.Extensible.String.getKnownValue","type.enums.extensible.ExtensibleClient.getUnknownValue":"Type.Enum.Extensible.String.getUnknownValue","type.enums.extensible.ExtensibleClient.getUnknownValueWithResponse":"Type.Enum.Extensible.String.getUnknownValue","type.enums.extensible.ExtensibleClient.putKnownValue":"Type.Enum.Extensible.String.putKnownValue","type.enums.extensible.ExtensibleClient.putKnownValueWithResponse":"Type.Enum.Extensible.String.putKnownValue","type.enums.extensible.ExtensibleClient.putUnknownValue":"Type.Enum.Extensible.String.putUnknownValue","type.enums.extensible.ExtensibleClient.putUnknownValueWithResponse":"Type.Enum.Extensible.String.putUnknownValue","type.enums.extensible.ExtensibleClientBuilder":"Type.Enum.Extensible","type.enums.extensible.models.DaysOfWeekExtensibleEnum":"Type.Enum.Extensible.DaysOfWeekExtensibleEnum"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/enums/extensible/ExtensibleAsyncClient.java","src/main/java/type/enums/extensible/ExtensibleClient.java","src/main/java/type/enums/extensible/ExtensibleClientBuilder.java","src/main/java/type/enums/extensible/implementation/ExtensibleClientImpl.java","src/main/java/type/enums/extensible/implementation/StringOperationsImpl.java","src/main/java/type/enums/extensible/implementation/package-info.java","src/main/java/type/enums/extensible/models/DaysOfWeekExtensibleEnum.java","src/main/java/type/enums/extensible/models/package-info.java","src/main/java/type/enums/extensible/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.enums.extensible.ExtensibleAsyncClient":"Type.Enum.Extensible.String","type.enums.extensible.ExtensibleAsyncClient.getKnownValue":"Type.Enum.Extensible.String.getKnownValue","type.enums.extensible.ExtensibleAsyncClient.getKnownValueWithResponse":"Type.Enum.Extensible.String.getKnownValue","type.enums.extensible.ExtensibleAsyncClient.getUnknownValue":"Type.Enum.Extensible.String.getUnknownValue","type.enums.extensible.ExtensibleAsyncClient.getUnknownValueWithResponse":"Type.Enum.Extensible.String.getUnknownValue","type.enums.extensible.ExtensibleAsyncClient.putKnownValue":"Type.Enum.Extensible.String.putKnownValue","type.enums.extensible.ExtensibleAsyncClient.putKnownValueWithResponse":"Type.Enum.Extensible.String.putKnownValue","type.enums.extensible.ExtensibleAsyncClient.putUnknownValue":"Type.Enum.Extensible.String.putUnknownValue","type.enums.extensible.ExtensibleAsyncClient.putUnknownValueWithResponse":"Type.Enum.Extensible.String.putUnknownValue","type.enums.extensible.ExtensibleClient":"Type.Enum.Extensible.String","type.enums.extensible.ExtensibleClient.getKnownValue":"Type.Enum.Extensible.String.getKnownValue","type.enums.extensible.ExtensibleClient.getKnownValueWithResponse":"Type.Enum.Extensible.String.getKnownValue","type.enums.extensible.ExtensibleClient.getUnknownValue":"Type.Enum.Extensible.String.getUnknownValue","type.enums.extensible.ExtensibleClient.getUnknownValueWithResponse":"Type.Enum.Extensible.String.getUnknownValue","type.enums.extensible.ExtensibleClient.putKnownValue":"Type.Enum.Extensible.String.putKnownValue","type.enums.extensible.ExtensibleClient.putKnownValueWithResponse":"Type.Enum.Extensible.String.putKnownValue","type.enums.extensible.ExtensibleClient.putUnknownValue":"Type.Enum.Extensible.String.putUnknownValue","type.enums.extensible.ExtensibleClient.putUnknownValueWithResponse":"Type.Enum.Extensible.String.putUnknownValue","type.enums.extensible.ExtensibleClientBuilder":"Type.Enum.Extensible","type.enums.extensible.models.DaysOfWeekExtensibleEnum":"Type.Enum.Extensible.DaysOfWeekExtensibleEnum"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/enums/extensible/ExtensibleAsyncClient.java","src/main/java/type/enums/extensible/ExtensibleClient.java","src/main/java/type/enums/extensible/ExtensibleClientBuilder.java","src/main/java/type/enums/extensible/implementation/ExtensibleClientImpl.java","src/main/java/type/enums/extensible/implementation/StringOperationsImpl.java","src/main/java/type/enums/extensible/implementation/package-info.java","src/main/java/type/enums/extensible/models/DaysOfWeekExtensibleEnum.java","src/main/java/type/enums/extensible/models/package-info.java","src/main/java/type/enums/extensible/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-enums-fixed_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-enums-fixed_apiview_properties.json deleted file mode 100644 index 1db0b5526e2..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-enums-fixed_apiview_properties.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.enums.fixed.FixedAsyncClient": "Type.Enum.Fixed.String", - "type.enums.fixed.FixedAsyncClient.getKnownValue": "Type.Enum.Fixed.String.getKnownValue", - "type.enums.fixed.FixedAsyncClient.getKnownValueWithResponse": "Type.Enum.Fixed.String.getKnownValue", - "type.enums.fixed.FixedAsyncClient.putKnownValue": "Type.Enum.Fixed.String.putKnownValue", - "type.enums.fixed.FixedAsyncClient.putKnownValueWithResponse": "Type.Enum.Fixed.String.putKnownValue", - "type.enums.fixed.FixedAsyncClient.putUnknownValue": "Type.Enum.Fixed.String.putUnknownValue", - "type.enums.fixed.FixedAsyncClient.putUnknownValueWithResponse": "Type.Enum.Fixed.String.putUnknownValue", - "type.enums.fixed.FixedClient": "Type.Enum.Fixed.String", - "type.enums.fixed.FixedClient.getKnownValue": "Type.Enum.Fixed.String.getKnownValue", - "type.enums.fixed.FixedClient.getKnownValueWithResponse": "Type.Enum.Fixed.String.getKnownValue", - "type.enums.fixed.FixedClient.putKnownValue": "Type.Enum.Fixed.String.putKnownValue", - "type.enums.fixed.FixedClient.putKnownValueWithResponse": "Type.Enum.Fixed.String.putKnownValue", - "type.enums.fixed.FixedClient.putUnknownValue": "Type.Enum.Fixed.String.putUnknownValue", - "type.enums.fixed.FixedClient.putUnknownValueWithResponse": "Type.Enum.Fixed.String.putUnknownValue", - "type.enums.fixed.FixedClientBuilder": "Type.Enum.Fixed", - "type.enums.fixed.models.DaysOfWeekEnum": "Type.Enum.Fixed.DaysOfWeekEnum" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-enums-fixed_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-enums-fixed_metadata.json index 7ac8ef536fd..60da86ee604 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-enums-fixed_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-enums-fixed_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.enums.fixed.FixedAsyncClient":"Type.Enum.Fixed.String","type.enums.fixed.FixedAsyncClient.getKnownValue":"Type.Enum.Fixed.String.getKnownValue","type.enums.fixed.FixedAsyncClient.getKnownValueWithResponse":"Type.Enum.Fixed.String.getKnownValue","type.enums.fixed.FixedAsyncClient.putKnownValue":"Type.Enum.Fixed.String.putKnownValue","type.enums.fixed.FixedAsyncClient.putKnownValueWithResponse":"Type.Enum.Fixed.String.putKnownValue","type.enums.fixed.FixedAsyncClient.putUnknownValue":"Type.Enum.Fixed.String.putUnknownValue","type.enums.fixed.FixedAsyncClient.putUnknownValueWithResponse":"Type.Enum.Fixed.String.putUnknownValue","type.enums.fixed.FixedClient":"Type.Enum.Fixed.String","type.enums.fixed.FixedClient.getKnownValue":"Type.Enum.Fixed.String.getKnownValue","type.enums.fixed.FixedClient.getKnownValueWithResponse":"Type.Enum.Fixed.String.getKnownValue","type.enums.fixed.FixedClient.putKnownValue":"Type.Enum.Fixed.String.putKnownValue","type.enums.fixed.FixedClient.putKnownValueWithResponse":"Type.Enum.Fixed.String.putKnownValue","type.enums.fixed.FixedClient.putUnknownValue":"Type.Enum.Fixed.String.putUnknownValue","type.enums.fixed.FixedClient.putUnknownValueWithResponse":"Type.Enum.Fixed.String.putUnknownValue","type.enums.fixed.FixedClientBuilder":"Type.Enum.Fixed","type.enums.fixed.models.DaysOfWeekEnum":"Type.Enum.Fixed.DaysOfWeekEnum"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/enums/fixed/FixedAsyncClient.java","src/main/java/type/enums/fixed/FixedClient.java","src/main/java/type/enums/fixed/FixedClientBuilder.java","src/main/java/type/enums/fixed/implementation/FixedClientImpl.java","src/main/java/type/enums/fixed/implementation/StringOperationsImpl.java","src/main/java/type/enums/fixed/implementation/package-info.java","src/main/java/type/enums/fixed/models/DaysOfWeekEnum.java","src/main/java/type/enums/fixed/models/package-info.java","src/main/java/type/enums/fixed/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.enums.fixed.FixedAsyncClient":"Type.Enum.Fixed.String","type.enums.fixed.FixedAsyncClient.getKnownValue":"Type.Enum.Fixed.String.getKnownValue","type.enums.fixed.FixedAsyncClient.getKnownValueWithResponse":"Type.Enum.Fixed.String.getKnownValue","type.enums.fixed.FixedAsyncClient.putKnownValue":"Type.Enum.Fixed.String.putKnownValue","type.enums.fixed.FixedAsyncClient.putKnownValueWithResponse":"Type.Enum.Fixed.String.putKnownValue","type.enums.fixed.FixedAsyncClient.putUnknownValue":"Type.Enum.Fixed.String.putUnknownValue","type.enums.fixed.FixedAsyncClient.putUnknownValueWithResponse":"Type.Enum.Fixed.String.putUnknownValue","type.enums.fixed.FixedClient":"Type.Enum.Fixed.String","type.enums.fixed.FixedClient.getKnownValue":"Type.Enum.Fixed.String.getKnownValue","type.enums.fixed.FixedClient.getKnownValueWithResponse":"Type.Enum.Fixed.String.getKnownValue","type.enums.fixed.FixedClient.putKnownValue":"Type.Enum.Fixed.String.putKnownValue","type.enums.fixed.FixedClient.putKnownValueWithResponse":"Type.Enum.Fixed.String.putKnownValue","type.enums.fixed.FixedClient.putUnknownValue":"Type.Enum.Fixed.String.putUnknownValue","type.enums.fixed.FixedClient.putUnknownValueWithResponse":"Type.Enum.Fixed.String.putUnknownValue","type.enums.fixed.FixedClientBuilder":"Type.Enum.Fixed","type.enums.fixed.models.DaysOfWeekEnum":"Type.Enum.Fixed.DaysOfWeekEnum"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/enums/fixed/FixedAsyncClient.java","src/main/java/type/enums/fixed/FixedClient.java","src/main/java/type/enums/fixed/FixedClientBuilder.java","src/main/java/type/enums/fixed/implementation/FixedClientImpl.java","src/main/java/type/enums/fixed/implementation/StringOperationsImpl.java","src/main/java/type/enums/fixed/implementation/package-info.java","src/main/java/type/enums/fixed/models/DaysOfWeekEnum.java","src/main/java/type/enums/fixed/models/package-info.java","src/main/java/type/enums/fixed/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-file_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-file_metadata.json new file mode 100644 index 00000000000..c267d01168c --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-file_metadata.json @@ -0,0 +1 @@ +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.file.FileAsyncClient":"Type.File.Body","type.file.FileAsyncClient.downloadFileDefaultContentType":"Type.File.Body.downloadFileDefaultContentType","type.file.FileAsyncClient.downloadFileDefaultContentTypeWithResponse":"Type.File.Body.downloadFileDefaultContentType","type.file.FileAsyncClient.downloadFileJsonContentType":"Type.File.Body.downloadFileJsonContentType","type.file.FileAsyncClient.downloadFileJsonContentTypeWithResponse":"Type.File.Body.downloadFileJsonContentType","type.file.FileAsyncClient.downloadFileMultipleContentTypes":"Type.File.Body.downloadFileMultipleContentTypes","type.file.FileAsyncClient.downloadFileMultipleContentTypesWithResponse":"Type.File.Body.downloadFileMultipleContentTypes","type.file.FileAsyncClient.downloadFileSpecificContentType":"Type.File.Body.downloadFileSpecificContentType","type.file.FileAsyncClient.downloadFileSpecificContentTypeWithResponse":"Type.File.Body.downloadFileSpecificContentType","type.file.FileAsyncClient.uploadFileDefaultContentType":"Type.File.Body.uploadFileDefaultContentType","type.file.FileAsyncClient.uploadFileDefaultContentTypeWithResponse":"Type.File.Body.uploadFileDefaultContentType","type.file.FileAsyncClient.uploadFileJsonContentType":"Type.File.Body.uploadFileJsonContentType","type.file.FileAsyncClient.uploadFileJsonContentTypeWithResponse":"Type.File.Body.uploadFileJsonContentType","type.file.FileAsyncClient.uploadFileSpecificContentType":"Type.File.Body.uploadFileSpecificContentType","type.file.FileAsyncClient.uploadFileSpecificContentTypeWithResponse":"Type.File.Body.uploadFileSpecificContentType","type.file.FileClient":"Type.File.Body","type.file.FileClient.downloadFileDefaultContentType":"Type.File.Body.downloadFileDefaultContentType","type.file.FileClient.downloadFileDefaultContentTypeWithResponse":"Type.File.Body.downloadFileDefaultContentType","type.file.FileClient.downloadFileJsonContentType":"Type.File.Body.downloadFileJsonContentType","type.file.FileClient.downloadFileJsonContentTypeWithResponse":"Type.File.Body.downloadFileJsonContentType","type.file.FileClient.downloadFileMultipleContentTypes":"Type.File.Body.downloadFileMultipleContentTypes","type.file.FileClient.downloadFileMultipleContentTypesWithResponse":"Type.File.Body.downloadFileMultipleContentTypes","type.file.FileClient.downloadFileSpecificContentType":"Type.File.Body.downloadFileSpecificContentType","type.file.FileClient.downloadFileSpecificContentTypeWithResponse":"Type.File.Body.downloadFileSpecificContentType","type.file.FileClient.uploadFileDefaultContentType":"Type.File.Body.uploadFileDefaultContentType","type.file.FileClient.uploadFileDefaultContentTypeWithResponse":"Type.File.Body.uploadFileDefaultContentType","type.file.FileClient.uploadFileJsonContentType":"Type.File.Body.uploadFileJsonContentType","type.file.FileClient.uploadFileJsonContentTypeWithResponse":"Type.File.Body.uploadFileJsonContentType","type.file.FileClient.uploadFileSpecificContentType":"Type.File.Body.uploadFileSpecificContentType","type.file.FileClient.uploadFileSpecificContentTypeWithResponse":"Type.File.Body.uploadFileSpecificContentType","type.file.FileClientBuilder":"Type.File","type.file.models.DownloadFileMultipleContentTypesContentType":"Type.File.Body.downloadFileMultipleContentTypes.accept"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/file/FileAsyncClient.java","src/main/java/type/file/FileClient.java","src/main/java/type/file/FileClientBuilder.java","src/main/java/type/file/implementation/BodiesImpl.java","src/main/java/type/file/implementation/FileClientImpl.java","src/main/java/type/file/implementation/package-info.java","src/main/java/type/file/models/DownloadFileMultipleContentTypesContentType.java","src/main/java/type/file/models/package-info.java","src/main/java/type/file/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-empty_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-empty_apiview_properties.json deleted file mode 100644 index 23111e92cea..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-empty_apiview_properties.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.model.empty.EmptyAsyncClient": "Type.Model.Empty", - "type.model.empty.EmptyAsyncClient.getEmpty": "Type.Model.Empty.getEmpty", - "type.model.empty.EmptyAsyncClient.getEmptyWithResponse": "Type.Model.Empty.getEmpty", - "type.model.empty.EmptyAsyncClient.postRoundTripEmpty": "Type.Model.Empty.postRoundTripEmpty", - "type.model.empty.EmptyAsyncClient.postRoundTripEmptyWithResponse": "Type.Model.Empty.postRoundTripEmpty", - "type.model.empty.EmptyAsyncClient.putEmpty": "Type.Model.Empty.putEmpty", - "type.model.empty.EmptyAsyncClient.putEmptyWithResponse": "Type.Model.Empty.putEmpty", - "type.model.empty.EmptyClient": "Type.Model.Empty", - "type.model.empty.EmptyClient.getEmpty": "Type.Model.Empty.getEmpty", - "type.model.empty.EmptyClient.getEmptyWithResponse": "Type.Model.Empty.getEmpty", - "type.model.empty.EmptyClient.postRoundTripEmpty": "Type.Model.Empty.postRoundTripEmpty", - "type.model.empty.EmptyClient.postRoundTripEmptyWithResponse": "Type.Model.Empty.postRoundTripEmpty", - "type.model.empty.EmptyClient.putEmpty": "Type.Model.Empty.putEmpty", - "type.model.empty.EmptyClient.putEmptyWithResponse": "Type.Model.Empty.putEmpty", - "type.model.empty.EmptyClientBuilder": "Type.Model.Empty", - "type.model.empty.models.EmptyInput": "Type.Model.Empty.EmptyInput", - "type.model.empty.models.EmptyInputOutput": "Type.Model.Empty.EmptyInputOutput", - "type.model.empty.models.EmptyOutput": "Type.Model.Empty.EmptyOutput" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-empty_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-empty_metadata.json index 155723389ed..cefcf213aa0 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-empty_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-empty_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.model.empty.EmptyAsyncClient":"Type.Model.Empty","type.model.empty.EmptyAsyncClient.getEmpty":"Type.Model.Empty.getEmpty","type.model.empty.EmptyAsyncClient.getEmptyWithResponse":"Type.Model.Empty.getEmpty","type.model.empty.EmptyAsyncClient.postRoundTripEmpty":"Type.Model.Empty.postRoundTripEmpty","type.model.empty.EmptyAsyncClient.postRoundTripEmptyWithResponse":"Type.Model.Empty.postRoundTripEmpty","type.model.empty.EmptyAsyncClient.putEmpty":"Type.Model.Empty.putEmpty","type.model.empty.EmptyAsyncClient.putEmptyWithResponse":"Type.Model.Empty.putEmpty","type.model.empty.EmptyClient":"Type.Model.Empty","type.model.empty.EmptyClient.getEmpty":"Type.Model.Empty.getEmpty","type.model.empty.EmptyClient.getEmptyWithResponse":"Type.Model.Empty.getEmpty","type.model.empty.EmptyClient.postRoundTripEmpty":"Type.Model.Empty.postRoundTripEmpty","type.model.empty.EmptyClient.postRoundTripEmptyWithResponse":"Type.Model.Empty.postRoundTripEmpty","type.model.empty.EmptyClient.putEmpty":"Type.Model.Empty.putEmpty","type.model.empty.EmptyClient.putEmptyWithResponse":"Type.Model.Empty.putEmpty","type.model.empty.EmptyClientBuilder":"Type.Model.Empty","type.model.empty.models.EmptyInput":"Type.Model.Empty.EmptyInput","type.model.empty.models.EmptyInputOutput":"Type.Model.Empty.EmptyInputOutput","type.model.empty.models.EmptyOutput":"Type.Model.Empty.EmptyOutput"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/empty/EmptyAsyncClient.java","src/main/java/type/model/empty/EmptyClient.java","src/main/java/type/model/empty/EmptyClientBuilder.java","src/main/java/type/model/empty/implementation/EmptyClientImpl.java","src/main/java/type/model/empty/implementation/package-info.java","src/main/java/type/model/empty/models/EmptyInput.java","src/main/java/type/model/empty/models/EmptyInputOutput.java","src/main/java/type/model/empty/models/EmptyOutput.java","src/main/java/type/model/empty/models/package-info.java","src/main/java/type/model/empty/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.model.empty.EmptyAsyncClient":"Type.Model.Empty","type.model.empty.EmptyAsyncClient.getEmpty":"Type.Model.Empty.getEmpty","type.model.empty.EmptyAsyncClient.getEmptyWithResponse":"Type.Model.Empty.getEmpty","type.model.empty.EmptyAsyncClient.postRoundTripEmpty":"Type.Model.Empty.postRoundTripEmpty","type.model.empty.EmptyAsyncClient.postRoundTripEmptyWithResponse":"Type.Model.Empty.postRoundTripEmpty","type.model.empty.EmptyAsyncClient.putEmpty":"Type.Model.Empty.putEmpty","type.model.empty.EmptyAsyncClient.putEmptyWithResponse":"Type.Model.Empty.putEmpty","type.model.empty.EmptyClient":"Type.Model.Empty","type.model.empty.EmptyClient.getEmpty":"Type.Model.Empty.getEmpty","type.model.empty.EmptyClient.getEmptyWithResponse":"Type.Model.Empty.getEmpty","type.model.empty.EmptyClient.postRoundTripEmpty":"Type.Model.Empty.postRoundTripEmpty","type.model.empty.EmptyClient.postRoundTripEmptyWithResponse":"Type.Model.Empty.postRoundTripEmpty","type.model.empty.EmptyClient.putEmpty":"Type.Model.Empty.putEmpty","type.model.empty.EmptyClient.putEmptyWithResponse":"Type.Model.Empty.putEmpty","type.model.empty.EmptyClientBuilder":"Type.Model.Empty","type.model.empty.models.EmptyInput":"Type.Model.Empty.EmptyInput","type.model.empty.models.EmptyInputOutput":"Type.Model.Empty.EmptyInputOutput","type.model.empty.models.EmptyOutput":"Type.Model.Empty.EmptyOutput"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/empty/EmptyAsyncClient.java","src/main/java/type/model/empty/EmptyClient.java","src/main/java/type/model/empty/EmptyClientBuilder.java","src/main/java/type/model/empty/implementation/EmptyClientImpl.java","src/main/java/type/model/empty/implementation/package-info.java","src/main/java/type/model/empty/models/EmptyInput.java","src/main/java/type/model/empty/models/EmptyInputOutput.java","src/main/java/type/model/empty/models/EmptyOutput.java","src/main/java/type/model/empty/models/package-info.java","src/main/java/type/model/empty/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-enumdiscriminator_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-enumdiscriminator_apiview_properties.json deleted file mode 100644 index a2ac2ec8474..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-enumdiscriminator_apiview_properties.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient": "Type.Model.Inheritance.EnumDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getExtensibleModel": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModel", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getExtensibleModelMissingDiscriminator": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelMissingDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getExtensibleModelMissingDiscriminatorWithResponse": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelMissingDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getExtensibleModelWithResponse": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModel", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getExtensibleModelWrongDiscriminator": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelWrongDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getExtensibleModelWrongDiscriminatorWithResponse": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelWrongDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getFixedModel": "Type.Model.Inheritance.EnumDiscriminator.getFixedModel", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getFixedModelMissingDiscriminator": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelMissingDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getFixedModelMissingDiscriminatorWithResponse": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelMissingDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getFixedModelWithResponse": "Type.Model.Inheritance.EnumDiscriminator.getFixedModel", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getFixedModelWrongDiscriminator": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getFixedModelWrongDiscriminatorWithResponse": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.putExtensibleModel": "Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.putExtensibleModelWithResponse": "Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.putFixedModel": "Type.Model.Inheritance.EnumDiscriminator.putFixedModel", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.putFixedModelWithResponse": "Type.Model.Inheritance.EnumDiscriminator.putFixedModel", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient": "Type.Model.Inheritance.EnumDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getExtensibleModel": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModel", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getExtensibleModelMissingDiscriminator": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelMissingDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getExtensibleModelMissingDiscriminatorWithResponse": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelMissingDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getExtensibleModelWithResponse": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModel", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getExtensibleModelWrongDiscriminator": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelWrongDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getExtensibleModelWrongDiscriminatorWithResponse": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelWrongDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getFixedModel": "Type.Model.Inheritance.EnumDiscriminator.getFixedModel", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getFixedModelMissingDiscriminator": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelMissingDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getFixedModelMissingDiscriminatorWithResponse": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelMissingDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getFixedModelWithResponse": "Type.Model.Inheritance.EnumDiscriminator.getFixedModel", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getFixedModelWrongDiscriminator": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getFixedModelWrongDiscriminatorWithResponse": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.putExtensibleModel": "Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.putExtensibleModelWithResponse": "Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.putFixedModel": "Type.Model.Inheritance.EnumDiscriminator.putFixedModel", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.putFixedModelWithResponse": "Type.Model.Inheritance.EnumDiscriminator.putFixedModel", - "type.model.inheritance.enumdiscriminator.EnumDiscriminatorClientBuilder": "Type.Model.Inheritance.EnumDiscriminator", - "type.model.inheritance.enumdiscriminator.models.Cobra": "Type.Model.Inheritance.EnumDiscriminator.Cobra", - "type.model.inheritance.enumdiscriminator.models.Dog": "Type.Model.Inheritance.EnumDiscriminator.Dog", - "type.model.inheritance.enumdiscriminator.models.DogKind": "Type.Model.Inheritance.EnumDiscriminator.DogKind", - "type.model.inheritance.enumdiscriminator.models.Golden": "Type.Model.Inheritance.EnumDiscriminator.Golden", - "type.model.inheritance.enumdiscriminator.models.Snake": "Type.Model.Inheritance.EnumDiscriminator.Snake", - "type.model.inheritance.enumdiscriminator.models.SnakeKind": "Type.Model.Inheritance.EnumDiscriminator.SnakeKind" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-enumdiscriminator_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-enumdiscriminator_metadata.json index 5720ee41028..6308788399b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-enumdiscriminator_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-enumdiscriminator_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient":"Type.Model.Inheritance.EnumDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getExtensibleModel":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getExtensibleModelMissingDiscriminator":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelMissingDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getExtensibleModelMissingDiscriminatorWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelMissingDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getExtensibleModelWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getExtensibleModelWrongDiscriminator":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelWrongDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getExtensibleModelWrongDiscriminatorWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelWrongDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getFixedModel":"Type.Model.Inheritance.EnumDiscriminator.getFixedModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getFixedModelMissingDiscriminator":"Type.Model.Inheritance.EnumDiscriminator.getFixedModelMissingDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getFixedModelMissingDiscriminatorWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getFixedModelMissingDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getFixedModelWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getFixedModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getFixedModelWrongDiscriminator":"Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getFixedModelWrongDiscriminatorWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.putExtensibleModel":"Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.putExtensibleModelWithResponse":"Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.putFixedModel":"Type.Model.Inheritance.EnumDiscriminator.putFixedModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.putFixedModelWithResponse":"Type.Model.Inheritance.EnumDiscriminator.putFixedModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient":"Type.Model.Inheritance.EnumDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getExtensibleModel":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getExtensibleModelMissingDiscriminator":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelMissingDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getExtensibleModelMissingDiscriminatorWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelMissingDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getExtensibleModelWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getExtensibleModelWrongDiscriminator":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelWrongDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getExtensibleModelWrongDiscriminatorWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelWrongDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getFixedModel":"Type.Model.Inheritance.EnumDiscriminator.getFixedModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getFixedModelMissingDiscriminator":"Type.Model.Inheritance.EnumDiscriminator.getFixedModelMissingDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getFixedModelMissingDiscriminatorWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getFixedModelMissingDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getFixedModelWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getFixedModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getFixedModelWrongDiscriminator":"Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getFixedModelWrongDiscriminatorWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.putExtensibleModel":"Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.putExtensibleModelWithResponse":"Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.putFixedModel":"Type.Model.Inheritance.EnumDiscriminator.putFixedModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.putFixedModelWithResponse":"Type.Model.Inheritance.EnumDiscriminator.putFixedModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClientBuilder":"Type.Model.Inheritance.EnumDiscriminator","type.model.inheritance.enumdiscriminator.models.Cobra":"Type.Model.Inheritance.EnumDiscriminator.Cobra","type.model.inheritance.enumdiscriminator.models.Dog":"Type.Model.Inheritance.EnumDiscriminator.Dog","type.model.inheritance.enumdiscriminator.models.DogKind":"Type.Model.Inheritance.EnumDiscriminator.DogKind","type.model.inheritance.enumdiscriminator.models.Golden":"Type.Model.Inheritance.EnumDiscriminator.Golden","type.model.inheritance.enumdiscriminator.models.Snake":"Type.Model.Inheritance.EnumDiscriminator.Snake","type.model.inheritance.enumdiscriminator.models.SnakeKind":"Type.Model.Inheritance.EnumDiscriminator.SnakeKind"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/enumdiscriminator/EnumDiscriminatorAsyncClient.java","src/main/java/type/model/inheritance/enumdiscriminator/EnumDiscriminatorClient.java","src/main/java/type/model/inheritance/enumdiscriminator/EnumDiscriminatorClientBuilder.java","src/main/java/type/model/inheritance/enumdiscriminator/implementation/EnumDiscriminatorClientImpl.java","src/main/java/type/model/inheritance/enumdiscriminator/implementation/package-info.java","src/main/java/type/model/inheritance/enumdiscriminator/models/Cobra.java","src/main/java/type/model/inheritance/enumdiscriminator/models/Dog.java","src/main/java/type/model/inheritance/enumdiscriminator/models/DogKind.java","src/main/java/type/model/inheritance/enumdiscriminator/models/Golden.java","src/main/java/type/model/inheritance/enumdiscriminator/models/Snake.java","src/main/java/type/model/inheritance/enumdiscriminator/models/SnakeKind.java","src/main/java/type/model/inheritance/enumdiscriminator/models/package-info.java","src/main/java/type/model/inheritance/enumdiscriminator/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient":"Type.Model.Inheritance.EnumDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getExtensibleModel":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getExtensibleModelMissingDiscriminator":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelMissingDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getExtensibleModelMissingDiscriminatorWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelMissingDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getExtensibleModelWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getExtensibleModelWrongDiscriminator":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelWrongDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getExtensibleModelWrongDiscriminatorWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelWrongDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getFixedModel":"Type.Model.Inheritance.EnumDiscriminator.getFixedModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getFixedModelMissingDiscriminator":"Type.Model.Inheritance.EnumDiscriminator.getFixedModelMissingDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getFixedModelMissingDiscriminatorWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getFixedModelMissingDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getFixedModelWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getFixedModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getFixedModelWrongDiscriminator":"Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.getFixedModelWrongDiscriminatorWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.putExtensibleModel":"Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.putExtensibleModelWithResponse":"Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.putFixedModel":"Type.Model.Inheritance.EnumDiscriminator.putFixedModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorAsyncClient.putFixedModelWithResponse":"Type.Model.Inheritance.EnumDiscriminator.putFixedModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient":"Type.Model.Inheritance.EnumDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getExtensibleModel":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getExtensibleModelMissingDiscriminator":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelMissingDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getExtensibleModelMissingDiscriminatorWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelMissingDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getExtensibleModelWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getExtensibleModelWrongDiscriminator":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelWrongDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getExtensibleModelWrongDiscriminatorWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelWrongDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getFixedModel":"Type.Model.Inheritance.EnumDiscriminator.getFixedModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getFixedModelMissingDiscriminator":"Type.Model.Inheritance.EnumDiscriminator.getFixedModelMissingDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getFixedModelMissingDiscriminatorWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getFixedModelMissingDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getFixedModelWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getFixedModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getFixedModelWrongDiscriminator":"Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.getFixedModelWrongDiscriminatorWithResponse":"Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.putExtensibleModel":"Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.putExtensibleModelWithResponse":"Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.putFixedModel":"Type.Model.Inheritance.EnumDiscriminator.putFixedModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClient.putFixedModelWithResponse":"Type.Model.Inheritance.EnumDiscriminator.putFixedModel","type.model.inheritance.enumdiscriminator.EnumDiscriminatorClientBuilder":"Type.Model.Inheritance.EnumDiscriminator","type.model.inheritance.enumdiscriminator.models.Cobra":"Type.Model.Inheritance.EnumDiscriminator.Cobra","type.model.inheritance.enumdiscriminator.models.Dog":"Type.Model.Inheritance.EnumDiscriminator.Dog","type.model.inheritance.enumdiscriminator.models.DogKind":"Type.Model.Inheritance.EnumDiscriminator.DogKind","type.model.inheritance.enumdiscriminator.models.Golden":"Type.Model.Inheritance.EnumDiscriminator.Golden","type.model.inheritance.enumdiscriminator.models.Snake":"Type.Model.Inheritance.EnumDiscriminator.Snake","type.model.inheritance.enumdiscriminator.models.SnakeKind":"Type.Model.Inheritance.EnumDiscriminator.SnakeKind"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/enumdiscriminator/EnumDiscriminatorAsyncClient.java","src/main/java/type/model/inheritance/enumdiscriminator/EnumDiscriminatorClient.java","src/main/java/type/model/inheritance/enumdiscriminator/EnumDiscriminatorClientBuilder.java","src/main/java/type/model/inheritance/enumdiscriminator/implementation/EnumDiscriminatorClientImpl.java","src/main/java/type/model/inheritance/enumdiscriminator/implementation/package-info.java","src/main/java/type/model/inheritance/enumdiscriminator/models/Cobra.java","src/main/java/type/model/inheritance/enumdiscriminator/models/Dog.java","src/main/java/type/model/inheritance/enumdiscriminator/models/DogKind.java","src/main/java/type/model/inheritance/enumdiscriminator/models/Golden.java","src/main/java/type/model/inheritance/enumdiscriminator/models/Snake.java","src/main/java/type/model/inheritance/enumdiscriminator/models/SnakeKind.java","src/main/java/type/model/inheritance/enumdiscriminator/models/package-info.java","src/main/java/type/model/inheritance/enumdiscriminator/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-nesteddiscriminator_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-nesteddiscriminator_apiview_properties.json deleted file mode 100644 index 16c4638dfda..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-nesteddiscriminator_apiview_properties.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient": "Type.Model.Inheritance.NestedDiscriminator", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getMissingDiscriminator": "Type.Model.Inheritance.NestedDiscriminator.getMissingDiscriminator", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getMissingDiscriminatorWithResponse": "Type.Model.Inheritance.NestedDiscriminator.getMissingDiscriminator", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getModel": "Type.Model.Inheritance.NestedDiscriminator.getModel", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getModelWithResponse": "Type.Model.Inheritance.NestedDiscriminator.getModel", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getRecursiveModel": "Type.Model.Inheritance.NestedDiscriminator.getRecursiveModel", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getRecursiveModelWithResponse": "Type.Model.Inheritance.NestedDiscriminator.getRecursiveModel", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getWrongDiscriminator": "Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getWrongDiscriminatorWithResponse": "Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.putModel": "Type.Model.Inheritance.NestedDiscriminator.putModel", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.putModelWithResponse": "Type.Model.Inheritance.NestedDiscriminator.putModel", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.putRecursiveModel": "Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.putRecursiveModelWithResponse": "Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient": "Type.Model.Inheritance.NestedDiscriminator", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getMissingDiscriminator": "Type.Model.Inheritance.NestedDiscriminator.getMissingDiscriminator", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getMissingDiscriminatorWithResponse": "Type.Model.Inheritance.NestedDiscriminator.getMissingDiscriminator", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getModel": "Type.Model.Inheritance.NestedDiscriminator.getModel", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getModelWithResponse": "Type.Model.Inheritance.NestedDiscriminator.getModel", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getRecursiveModel": "Type.Model.Inheritance.NestedDiscriminator.getRecursiveModel", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getRecursiveModelWithResponse": "Type.Model.Inheritance.NestedDiscriminator.getRecursiveModel", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getWrongDiscriminator": "Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getWrongDiscriminatorWithResponse": "Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.putModel": "Type.Model.Inheritance.NestedDiscriminator.putModel", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.putModelWithResponse": "Type.Model.Inheritance.NestedDiscriminator.putModel", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.putRecursiveModel": "Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.putRecursiveModelWithResponse": "Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel", - "type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClientBuilder": "Type.Model.Inheritance.NestedDiscriminator", - "type.model.inheritance.nesteddiscriminator.models.Fish": "Type.Model.Inheritance.NestedDiscriminator.Fish", - "type.model.inheritance.nesteddiscriminator.models.GoblinShark": "Type.Model.Inheritance.NestedDiscriminator.GoblinShark", - "type.model.inheritance.nesteddiscriminator.models.Salmon": "Type.Model.Inheritance.NestedDiscriminator.Salmon", - "type.model.inheritance.nesteddiscriminator.models.SawShark": "Type.Model.Inheritance.NestedDiscriminator.SawShark", - "type.model.inheritance.nesteddiscriminator.models.Shark": "Type.Model.Inheritance.NestedDiscriminator.Shark" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-nesteddiscriminator_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-nesteddiscriminator_metadata.json index 6ce5aa5e40a..c552eab48c7 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-nesteddiscriminator_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-nesteddiscriminator_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient":"Type.Model.Inheritance.NestedDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getMissingDiscriminator":"Type.Model.Inheritance.NestedDiscriminator.getMissingDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getMissingDiscriminatorWithResponse":"Type.Model.Inheritance.NestedDiscriminator.getMissingDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getModel":"Type.Model.Inheritance.NestedDiscriminator.getModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getModelWithResponse":"Type.Model.Inheritance.NestedDiscriminator.getModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getRecursiveModel":"Type.Model.Inheritance.NestedDiscriminator.getRecursiveModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getRecursiveModelWithResponse":"Type.Model.Inheritance.NestedDiscriminator.getRecursiveModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getWrongDiscriminator":"Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getWrongDiscriminatorWithResponse":"Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.putModel":"Type.Model.Inheritance.NestedDiscriminator.putModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.putModelWithResponse":"Type.Model.Inheritance.NestedDiscriminator.putModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.putRecursiveModel":"Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.putRecursiveModelWithResponse":"Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient":"Type.Model.Inheritance.NestedDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getMissingDiscriminator":"Type.Model.Inheritance.NestedDiscriminator.getMissingDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getMissingDiscriminatorWithResponse":"Type.Model.Inheritance.NestedDiscriminator.getMissingDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getModel":"Type.Model.Inheritance.NestedDiscriminator.getModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getModelWithResponse":"Type.Model.Inheritance.NestedDiscriminator.getModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getRecursiveModel":"Type.Model.Inheritance.NestedDiscriminator.getRecursiveModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getRecursiveModelWithResponse":"Type.Model.Inheritance.NestedDiscriminator.getRecursiveModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getWrongDiscriminator":"Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getWrongDiscriminatorWithResponse":"Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.putModel":"Type.Model.Inheritance.NestedDiscriminator.putModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.putModelWithResponse":"Type.Model.Inheritance.NestedDiscriminator.putModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.putRecursiveModel":"Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.putRecursiveModelWithResponse":"Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClientBuilder":"Type.Model.Inheritance.NestedDiscriminator","type.model.inheritance.nesteddiscriminator.models.Fish":"Type.Model.Inheritance.NestedDiscriminator.Fish","type.model.inheritance.nesteddiscriminator.models.GoblinShark":"Type.Model.Inheritance.NestedDiscriminator.GoblinShark","type.model.inheritance.nesteddiscriminator.models.Salmon":"Type.Model.Inheritance.NestedDiscriminator.Salmon","type.model.inheritance.nesteddiscriminator.models.SawShark":"Type.Model.Inheritance.NestedDiscriminator.SawShark","type.model.inheritance.nesteddiscriminator.models.Shark":"Type.Model.Inheritance.NestedDiscriminator.Shark"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/nesteddiscriminator/NestedDiscriminatorAsyncClient.java","src/main/java/type/model/inheritance/nesteddiscriminator/NestedDiscriminatorClient.java","src/main/java/type/model/inheritance/nesteddiscriminator/NestedDiscriminatorClientBuilder.java","src/main/java/type/model/inheritance/nesteddiscriminator/implementation/NestedDiscriminatorClientImpl.java","src/main/java/type/model/inheritance/nesteddiscriminator/implementation/package-info.java","src/main/java/type/model/inheritance/nesteddiscriminator/models/Fish.java","src/main/java/type/model/inheritance/nesteddiscriminator/models/GoblinShark.java","src/main/java/type/model/inheritance/nesteddiscriminator/models/Salmon.java","src/main/java/type/model/inheritance/nesteddiscriminator/models/SawShark.java","src/main/java/type/model/inheritance/nesteddiscriminator/models/Shark.java","src/main/java/type/model/inheritance/nesteddiscriminator/models/package-info.java","src/main/java/type/model/inheritance/nesteddiscriminator/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient":"Type.Model.Inheritance.NestedDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getMissingDiscriminator":"Type.Model.Inheritance.NestedDiscriminator.getMissingDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getMissingDiscriminatorWithResponse":"Type.Model.Inheritance.NestedDiscriminator.getMissingDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getModel":"Type.Model.Inheritance.NestedDiscriminator.getModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getModelWithResponse":"Type.Model.Inheritance.NestedDiscriminator.getModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getRecursiveModel":"Type.Model.Inheritance.NestedDiscriminator.getRecursiveModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getRecursiveModelWithResponse":"Type.Model.Inheritance.NestedDiscriminator.getRecursiveModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getWrongDiscriminator":"Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.getWrongDiscriminatorWithResponse":"Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.putModel":"Type.Model.Inheritance.NestedDiscriminator.putModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.putModelWithResponse":"Type.Model.Inheritance.NestedDiscriminator.putModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.putRecursiveModel":"Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorAsyncClient.putRecursiveModelWithResponse":"Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient":"Type.Model.Inheritance.NestedDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getMissingDiscriminator":"Type.Model.Inheritance.NestedDiscriminator.getMissingDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getMissingDiscriminatorWithResponse":"Type.Model.Inheritance.NestedDiscriminator.getMissingDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getModel":"Type.Model.Inheritance.NestedDiscriminator.getModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getModelWithResponse":"Type.Model.Inheritance.NestedDiscriminator.getModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getRecursiveModel":"Type.Model.Inheritance.NestedDiscriminator.getRecursiveModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getRecursiveModelWithResponse":"Type.Model.Inheritance.NestedDiscriminator.getRecursiveModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getWrongDiscriminator":"Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.getWrongDiscriminatorWithResponse":"Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.putModel":"Type.Model.Inheritance.NestedDiscriminator.putModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.putModelWithResponse":"Type.Model.Inheritance.NestedDiscriminator.putModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.putRecursiveModel":"Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClient.putRecursiveModelWithResponse":"Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel","type.model.inheritance.nesteddiscriminator.NestedDiscriminatorClientBuilder":"Type.Model.Inheritance.NestedDiscriminator","type.model.inheritance.nesteddiscriminator.models.Fish":"Type.Model.Inheritance.NestedDiscriminator.Fish","type.model.inheritance.nesteddiscriminator.models.GoblinShark":"Type.Model.Inheritance.NestedDiscriminator.GoblinShark","type.model.inheritance.nesteddiscriminator.models.Salmon":"Type.Model.Inheritance.NestedDiscriminator.Salmon","type.model.inheritance.nesteddiscriminator.models.SawShark":"Type.Model.Inheritance.NestedDiscriminator.SawShark","type.model.inheritance.nesteddiscriminator.models.Shark":"Type.Model.Inheritance.NestedDiscriminator.Shark"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/nesteddiscriminator/NestedDiscriminatorAsyncClient.java","src/main/java/type/model/inheritance/nesteddiscriminator/NestedDiscriminatorClient.java","src/main/java/type/model/inheritance/nesteddiscriminator/NestedDiscriminatorClientBuilder.java","src/main/java/type/model/inheritance/nesteddiscriminator/implementation/NestedDiscriminatorClientImpl.java","src/main/java/type/model/inheritance/nesteddiscriminator/implementation/package-info.java","src/main/java/type/model/inheritance/nesteddiscriminator/models/Fish.java","src/main/java/type/model/inheritance/nesteddiscriminator/models/GoblinShark.java","src/main/java/type/model/inheritance/nesteddiscriminator/models/Salmon.java","src/main/java/type/model/inheritance/nesteddiscriminator/models/SawShark.java","src/main/java/type/model/inheritance/nesteddiscriminator/models/Shark.java","src/main/java/type/model/inheritance/nesteddiscriminator/models/package-info.java","src/main/java/type/model/inheritance/nesteddiscriminator/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-notdiscriminated_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-notdiscriminated_apiview_properties.json deleted file mode 100644 index c46978d245b..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-notdiscriminated_apiview_properties.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient": "Type.Model.Inheritance.NotDiscriminated", - "type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient.getValid": "Type.Model.Inheritance.NotDiscriminated.getValid", - "type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient.getValidWithResponse": "Type.Model.Inheritance.NotDiscriminated.getValid", - "type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient.postValid": "Type.Model.Inheritance.NotDiscriminated.postValid", - "type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient.postValidWithResponse": "Type.Model.Inheritance.NotDiscriminated.postValid", - "type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient.putValid": "Type.Model.Inheritance.NotDiscriminated.putValid", - "type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient.putValidWithResponse": "Type.Model.Inheritance.NotDiscriminated.putValid", - "type.model.inheritance.notdiscriminated.NotDiscriminatedClient": "Type.Model.Inheritance.NotDiscriminated", - "type.model.inheritance.notdiscriminated.NotDiscriminatedClient.getValid": "Type.Model.Inheritance.NotDiscriminated.getValid", - "type.model.inheritance.notdiscriminated.NotDiscriminatedClient.getValidWithResponse": "Type.Model.Inheritance.NotDiscriminated.getValid", - "type.model.inheritance.notdiscriminated.NotDiscriminatedClient.postValid": "Type.Model.Inheritance.NotDiscriminated.postValid", - "type.model.inheritance.notdiscriminated.NotDiscriminatedClient.postValidWithResponse": "Type.Model.Inheritance.NotDiscriminated.postValid", - "type.model.inheritance.notdiscriminated.NotDiscriminatedClient.putValid": "Type.Model.Inheritance.NotDiscriminated.putValid", - "type.model.inheritance.notdiscriminated.NotDiscriminatedClient.putValidWithResponse": "Type.Model.Inheritance.NotDiscriminated.putValid", - "type.model.inheritance.notdiscriminated.NotDiscriminatedClientBuilder": "Type.Model.Inheritance.NotDiscriminated", - "type.model.inheritance.notdiscriminated.models.Cat": "Type.Model.Inheritance.NotDiscriminated.Cat", - "type.model.inheritance.notdiscriminated.models.Pet": "Type.Model.Inheritance.NotDiscriminated.Pet", - "type.model.inheritance.notdiscriminated.models.Siamese": "Type.Model.Inheritance.NotDiscriminated.Siamese" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-notdiscriminated_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-notdiscriminated_metadata.json index 2d2dd758f5c..7291541af0c 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-notdiscriminated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-notdiscriminated_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient":"Type.Model.Inheritance.NotDiscriminated","type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient.getValid":"Type.Model.Inheritance.NotDiscriminated.getValid","type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient.getValidWithResponse":"Type.Model.Inheritance.NotDiscriminated.getValid","type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient.postValid":"Type.Model.Inheritance.NotDiscriminated.postValid","type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient.postValidWithResponse":"Type.Model.Inheritance.NotDiscriminated.postValid","type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient.putValid":"Type.Model.Inheritance.NotDiscriminated.putValid","type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient.putValidWithResponse":"Type.Model.Inheritance.NotDiscriminated.putValid","type.model.inheritance.notdiscriminated.NotDiscriminatedClient":"Type.Model.Inheritance.NotDiscriminated","type.model.inheritance.notdiscriminated.NotDiscriminatedClient.getValid":"Type.Model.Inheritance.NotDiscriminated.getValid","type.model.inheritance.notdiscriminated.NotDiscriminatedClient.getValidWithResponse":"Type.Model.Inheritance.NotDiscriminated.getValid","type.model.inheritance.notdiscriminated.NotDiscriminatedClient.postValid":"Type.Model.Inheritance.NotDiscriminated.postValid","type.model.inheritance.notdiscriminated.NotDiscriminatedClient.postValidWithResponse":"Type.Model.Inheritance.NotDiscriminated.postValid","type.model.inheritance.notdiscriminated.NotDiscriminatedClient.putValid":"Type.Model.Inheritance.NotDiscriminated.putValid","type.model.inheritance.notdiscriminated.NotDiscriminatedClient.putValidWithResponse":"Type.Model.Inheritance.NotDiscriminated.putValid","type.model.inheritance.notdiscriminated.NotDiscriminatedClientBuilder":"Type.Model.Inheritance.NotDiscriminated","type.model.inheritance.notdiscriminated.models.Cat":"Type.Model.Inheritance.NotDiscriminated.Cat","type.model.inheritance.notdiscriminated.models.Pet":"Type.Model.Inheritance.NotDiscriminated.Pet","type.model.inheritance.notdiscriminated.models.Siamese":"Type.Model.Inheritance.NotDiscriminated.Siamese"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/notdiscriminated/NotDiscriminatedAsyncClient.java","src/main/java/type/model/inheritance/notdiscriminated/NotDiscriminatedClient.java","src/main/java/type/model/inheritance/notdiscriminated/NotDiscriminatedClientBuilder.java","src/main/java/type/model/inheritance/notdiscriminated/implementation/NotDiscriminatedClientImpl.java","src/main/java/type/model/inheritance/notdiscriminated/implementation/package-info.java","src/main/java/type/model/inheritance/notdiscriminated/models/Cat.java","src/main/java/type/model/inheritance/notdiscriminated/models/Pet.java","src/main/java/type/model/inheritance/notdiscriminated/models/Siamese.java","src/main/java/type/model/inheritance/notdiscriminated/models/package-info.java","src/main/java/type/model/inheritance/notdiscriminated/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient":"Type.Model.Inheritance.NotDiscriminated","type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient.getValid":"Type.Model.Inheritance.NotDiscriminated.getValid","type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient.getValidWithResponse":"Type.Model.Inheritance.NotDiscriminated.getValid","type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient.postValid":"Type.Model.Inheritance.NotDiscriminated.postValid","type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient.postValidWithResponse":"Type.Model.Inheritance.NotDiscriminated.postValid","type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient.putValid":"Type.Model.Inheritance.NotDiscriminated.putValid","type.model.inheritance.notdiscriminated.NotDiscriminatedAsyncClient.putValidWithResponse":"Type.Model.Inheritance.NotDiscriminated.putValid","type.model.inheritance.notdiscriminated.NotDiscriminatedClient":"Type.Model.Inheritance.NotDiscriminated","type.model.inheritance.notdiscriminated.NotDiscriminatedClient.getValid":"Type.Model.Inheritance.NotDiscriminated.getValid","type.model.inheritance.notdiscriminated.NotDiscriminatedClient.getValidWithResponse":"Type.Model.Inheritance.NotDiscriminated.getValid","type.model.inheritance.notdiscriminated.NotDiscriminatedClient.postValid":"Type.Model.Inheritance.NotDiscriminated.postValid","type.model.inheritance.notdiscriminated.NotDiscriminatedClient.postValidWithResponse":"Type.Model.Inheritance.NotDiscriminated.postValid","type.model.inheritance.notdiscriminated.NotDiscriminatedClient.putValid":"Type.Model.Inheritance.NotDiscriminated.putValid","type.model.inheritance.notdiscriminated.NotDiscriminatedClient.putValidWithResponse":"Type.Model.Inheritance.NotDiscriminated.putValid","type.model.inheritance.notdiscriminated.NotDiscriminatedClientBuilder":"Type.Model.Inheritance.NotDiscriminated","type.model.inheritance.notdiscriminated.models.Cat":"Type.Model.Inheritance.NotDiscriminated.Cat","type.model.inheritance.notdiscriminated.models.Pet":"Type.Model.Inheritance.NotDiscriminated.Pet","type.model.inheritance.notdiscriminated.models.Siamese":"Type.Model.Inheritance.NotDiscriminated.Siamese"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/notdiscriminated/NotDiscriminatedAsyncClient.java","src/main/java/type/model/inheritance/notdiscriminated/NotDiscriminatedClient.java","src/main/java/type/model/inheritance/notdiscriminated/NotDiscriminatedClientBuilder.java","src/main/java/type/model/inheritance/notdiscriminated/implementation/NotDiscriminatedClientImpl.java","src/main/java/type/model/inheritance/notdiscriminated/implementation/package-info.java","src/main/java/type/model/inheritance/notdiscriminated/models/Cat.java","src/main/java/type/model/inheritance/notdiscriminated/models/Pet.java","src/main/java/type/model/inheritance/notdiscriminated/models/Siamese.java","src/main/java/type/model/inheritance/notdiscriminated/models/package-info.java","src/main/java/type/model/inheritance/notdiscriminated/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-recursive_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-recursive_apiview_properties.json deleted file mode 100644 index 3aa7ccfa566..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-recursive_apiview_properties.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.model.inheritance.recursive.RecursiveAsyncClient": "Type.Model.Inheritance.Recursive", - "type.model.inheritance.recursive.RecursiveAsyncClient.get": "Type.Model.Inheritance.Recursive.get", - "type.model.inheritance.recursive.RecursiveAsyncClient.getWithResponse": "Type.Model.Inheritance.Recursive.get", - "type.model.inheritance.recursive.RecursiveAsyncClient.put": "Type.Model.Inheritance.Recursive.put", - "type.model.inheritance.recursive.RecursiveAsyncClient.putWithResponse": "Type.Model.Inheritance.Recursive.put", - "type.model.inheritance.recursive.RecursiveClient": "Type.Model.Inheritance.Recursive", - "type.model.inheritance.recursive.RecursiveClient.get": "Type.Model.Inheritance.Recursive.get", - "type.model.inheritance.recursive.RecursiveClient.getWithResponse": "Type.Model.Inheritance.Recursive.get", - "type.model.inheritance.recursive.RecursiveClient.put": "Type.Model.Inheritance.Recursive.put", - "type.model.inheritance.recursive.RecursiveClient.putWithResponse": "Type.Model.Inheritance.Recursive.put", - "type.model.inheritance.recursive.RecursiveClientBuilder": "Type.Model.Inheritance.Recursive", - "type.model.inheritance.recursive.models.Element": "Type.Model.Inheritance.Recursive.Element", - "type.model.inheritance.recursive.models.Extension": "Type.Model.Inheritance.Recursive.Extension" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-recursive_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-recursive_metadata.json index d7a2cbc5660..bc7210f9f51 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-recursive_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-recursive_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.model.inheritance.recursive.RecursiveAsyncClient":"Type.Model.Inheritance.Recursive","type.model.inheritance.recursive.RecursiveAsyncClient.get":"Type.Model.Inheritance.Recursive.get","type.model.inheritance.recursive.RecursiveAsyncClient.getWithResponse":"Type.Model.Inheritance.Recursive.get","type.model.inheritance.recursive.RecursiveAsyncClient.put":"Type.Model.Inheritance.Recursive.put","type.model.inheritance.recursive.RecursiveAsyncClient.putWithResponse":"Type.Model.Inheritance.Recursive.put","type.model.inheritance.recursive.RecursiveClient":"Type.Model.Inheritance.Recursive","type.model.inheritance.recursive.RecursiveClient.get":"Type.Model.Inheritance.Recursive.get","type.model.inheritance.recursive.RecursiveClient.getWithResponse":"Type.Model.Inheritance.Recursive.get","type.model.inheritance.recursive.RecursiveClient.put":"Type.Model.Inheritance.Recursive.put","type.model.inheritance.recursive.RecursiveClient.putWithResponse":"Type.Model.Inheritance.Recursive.put","type.model.inheritance.recursive.RecursiveClientBuilder":"Type.Model.Inheritance.Recursive","type.model.inheritance.recursive.models.Element":"Type.Model.Inheritance.Recursive.Element","type.model.inheritance.recursive.models.Extension":"Type.Model.Inheritance.Recursive.Extension"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/recursive/RecursiveAsyncClient.java","src/main/java/type/model/inheritance/recursive/RecursiveClient.java","src/main/java/type/model/inheritance/recursive/RecursiveClientBuilder.java","src/main/java/type/model/inheritance/recursive/implementation/RecursiveClientImpl.java","src/main/java/type/model/inheritance/recursive/implementation/package-info.java","src/main/java/type/model/inheritance/recursive/models/Element.java","src/main/java/type/model/inheritance/recursive/models/Extension.java","src/main/java/type/model/inheritance/recursive/models/package-info.java","src/main/java/type/model/inheritance/recursive/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.model.inheritance.recursive.RecursiveAsyncClient":"Type.Model.Inheritance.Recursive","type.model.inheritance.recursive.RecursiveAsyncClient.get":"Type.Model.Inheritance.Recursive.get","type.model.inheritance.recursive.RecursiveAsyncClient.getWithResponse":"Type.Model.Inheritance.Recursive.get","type.model.inheritance.recursive.RecursiveAsyncClient.put":"Type.Model.Inheritance.Recursive.put","type.model.inheritance.recursive.RecursiveAsyncClient.putWithResponse":"Type.Model.Inheritance.Recursive.put","type.model.inheritance.recursive.RecursiveClient":"Type.Model.Inheritance.Recursive","type.model.inheritance.recursive.RecursiveClient.get":"Type.Model.Inheritance.Recursive.get","type.model.inheritance.recursive.RecursiveClient.getWithResponse":"Type.Model.Inheritance.Recursive.get","type.model.inheritance.recursive.RecursiveClient.put":"Type.Model.Inheritance.Recursive.put","type.model.inheritance.recursive.RecursiveClient.putWithResponse":"Type.Model.Inheritance.Recursive.put","type.model.inheritance.recursive.RecursiveClientBuilder":"Type.Model.Inheritance.Recursive","type.model.inheritance.recursive.models.Element":"Type.Model.Inheritance.Recursive.Element","type.model.inheritance.recursive.models.Extension":"Type.Model.Inheritance.Recursive.Extension"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/recursive/RecursiveAsyncClient.java","src/main/java/type/model/inheritance/recursive/RecursiveClient.java","src/main/java/type/model/inheritance/recursive/RecursiveClientBuilder.java","src/main/java/type/model/inheritance/recursive/implementation/RecursiveClientImpl.java","src/main/java/type/model/inheritance/recursive/implementation/package-info.java","src/main/java/type/model/inheritance/recursive/models/Element.java","src/main/java/type/model/inheritance/recursive/models/Extension.java","src/main/java/type/model/inheritance/recursive/models/package-info.java","src/main/java/type/model/inheritance/recursive/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-singlediscriminator_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-singlediscriminator_apiview_properties.json deleted file mode 100644 index f4ba5935669..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-singlediscriminator_apiview_properties.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient": "Type.Model.Inheritance.SingleDiscriminator", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getLegacyModel": "Type.Model.Inheritance.SingleDiscriminator.getLegacyModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getLegacyModelWithResponse": "Type.Model.Inheritance.SingleDiscriminator.getLegacyModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getMissingDiscriminator": "Type.Model.Inheritance.SingleDiscriminator.getMissingDiscriminator", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getMissingDiscriminatorWithResponse": "Type.Model.Inheritance.SingleDiscriminator.getMissingDiscriminator", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getModel": "Type.Model.Inheritance.SingleDiscriminator.getModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getModelWithResponse": "Type.Model.Inheritance.SingleDiscriminator.getModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getRecursiveModel": "Type.Model.Inheritance.SingleDiscriminator.getRecursiveModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getRecursiveModelWithResponse": "Type.Model.Inheritance.SingleDiscriminator.getRecursiveModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getWrongDiscriminator": "Type.Model.Inheritance.SingleDiscriminator.getWrongDiscriminator", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getWrongDiscriminatorWithResponse": "Type.Model.Inheritance.SingleDiscriminator.getWrongDiscriminator", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.putModel": "Type.Model.Inheritance.SingleDiscriminator.putModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.putModelWithResponse": "Type.Model.Inheritance.SingleDiscriminator.putModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.putRecursiveModel": "Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.putRecursiveModelWithResponse": "Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorClient": "Type.Model.Inheritance.SingleDiscriminator", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getLegacyModel": "Type.Model.Inheritance.SingleDiscriminator.getLegacyModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getLegacyModelWithResponse": "Type.Model.Inheritance.SingleDiscriminator.getLegacyModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getMissingDiscriminator": "Type.Model.Inheritance.SingleDiscriminator.getMissingDiscriminator", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getMissingDiscriminatorWithResponse": "Type.Model.Inheritance.SingleDiscriminator.getMissingDiscriminator", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getModel": "Type.Model.Inheritance.SingleDiscriminator.getModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getModelWithResponse": "Type.Model.Inheritance.SingleDiscriminator.getModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getRecursiveModel": "Type.Model.Inheritance.SingleDiscriminator.getRecursiveModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getRecursiveModelWithResponse": "Type.Model.Inheritance.SingleDiscriminator.getRecursiveModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getWrongDiscriminator": "Type.Model.Inheritance.SingleDiscriminator.getWrongDiscriminator", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getWrongDiscriminatorWithResponse": "Type.Model.Inheritance.SingleDiscriminator.getWrongDiscriminator", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.putModel": "Type.Model.Inheritance.SingleDiscriminator.putModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.putModelWithResponse": "Type.Model.Inheritance.SingleDiscriminator.putModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.putRecursiveModel": "Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.putRecursiveModelWithResponse": "Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel", - "type.model.inheritance.singlediscriminator.SingleDiscriminatorClientBuilder": "Type.Model.Inheritance.SingleDiscriminator", - "type.model.inheritance.singlediscriminator.models.Bird": "Type.Model.Inheritance.SingleDiscriminator.Bird", - "type.model.inheritance.singlediscriminator.models.Dinosaur": "Type.Model.Inheritance.SingleDiscriminator.Dinosaur", - "type.model.inheritance.singlediscriminator.models.Eagle": "Type.Model.Inheritance.SingleDiscriminator.Eagle", - "type.model.inheritance.singlediscriminator.models.Goose": "Type.Model.Inheritance.SingleDiscriminator.Goose", - "type.model.inheritance.singlediscriminator.models.SeaGull": "Type.Model.Inheritance.SingleDiscriminator.SeaGull", - "type.model.inheritance.singlediscriminator.models.Sparrow": "Type.Model.Inheritance.SingleDiscriminator.Sparrow", - "type.model.inheritance.singlediscriminator.models.TRex": "Type.Model.Inheritance.SingleDiscriminator.TRex" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-singlediscriminator_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-singlediscriminator_metadata.json index b3d3a183378..73c5a835892 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-singlediscriminator_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-inheritance-singlediscriminator_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient":"Type.Model.Inheritance.SingleDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getLegacyModel":"Type.Model.Inheritance.SingleDiscriminator.getLegacyModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getLegacyModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getLegacyModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getMissingDiscriminator":"Type.Model.Inheritance.SingleDiscriminator.getMissingDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getMissingDiscriminatorWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getMissingDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getModel":"Type.Model.Inheritance.SingleDiscriminator.getModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getRecursiveModel":"Type.Model.Inheritance.SingleDiscriminator.getRecursiveModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getRecursiveModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getRecursiveModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getWrongDiscriminator":"Type.Model.Inheritance.SingleDiscriminator.getWrongDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getWrongDiscriminatorWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getWrongDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.putModel":"Type.Model.Inheritance.SingleDiscriminator.putModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.putModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.putModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.putRecursiveModel":"Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.putRecursiveModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient":"Type.Model.Inheritance.SingleDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getLegacyModel":"Type.Model.Inheritance.SingleDiscriminator.getLegacyModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getLegacyModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getLegacyModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getMissingDiscriminator":"Type.Model.Inheritance.SingleDiscriminator.getMissingDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getMissingDiscriminatorWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getMissingDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getModel":"Type.Model.Inheritance.SingleDiscriminator.getModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getRecursiveModel":"Type.Model.Inheritance.SingleDiscriminator.getRecursiveModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getRecursiveModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getRecursiveModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getWrongDiscriminator":"Type.Model.Inheritance.SingleDiscriminator.getWrongDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getWrongDiscriminatorWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getWrongDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.putModel":"Type.Model.Inheritance.SingleDiscriminator.putModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.putModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.putModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.putRecursiveModel":"Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.putRecursiveModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClientBuilder":"Type.Model.Inheritance.SingleDiscriminator","type.model.inheritance.singlediscriminator.models.Bird":"Type.Model.Inheritance.SingleDiscriminator.Bird","type.model.inheritance.singlediscriminator.models.Dinosaur":"Type.Model.Inheritance.SingleDiscriminator.Dinosaur","type.model.inheritance.singlediscriminator.models.Eagle":"Type.Model.Inheritance.SingleDiscriminator.Eagle","type.model.inheritance.singlediscriminator.models.Goose":"Type.Model.Inheritance.SingleDiscriminator.Goose","type.model.inheritance.singlediscriminator.models.SeaGull":"Type.Model.Inheritance.SingleDiscriminator.SeaGull","type.model.inheritance.singlediscriminator.models.Sparrow":"Type.Model.Inheritance.SingleDiscriminator.Sparrow","type.model.inheritance.singlediscriminator.models.TRex":"Type.Model.Inheritance.SingleDiscriminator.TRex"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/singlediscriminator/SingleDiscriminatorAsyncClient.java","src/main/java/type/model/inheritance/singlediscriminator/SingleDiscriminatorClient.java","src/main/java/type/model/inheritance/singlediscriminator/SingleDiscriminatorClientBuilder.java","src/main/java/type/model/inheritance/singlediscriminator/implementation/SingleDiscriminatorClientImpl.java","src/main/java/type/model/inheritance/singlediscriminator/implementation/package-info.java","src/main/java/type/model/inheritance/singlediscriminator/models/Bird.java","src/main/java/type/model/inheritance/singlediscriminator/models/Dinosaur.java","src/main/java/type/model/inheritance/singlediscriminator/models/Eagle.java","src/main/java/type/model/inheritance/singlediscriminator/models/Goose.java","src/main/java/type/model/inheritance/singlediscriminator/models/SeaGull.java","src/main/java/type/model/inheritance/singlediscriminator/models/Sparrow.java","src/main/java/type/model/inheritance/singlediscriminator/models/TRex.java","src/main/java/type/model/inheritance/singlediscriminator/models/package-info.java","src/main/java/type/model/inheritance/singlediscriminator/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient":"Type.Model.Inheritance.SingleDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getLegacyModel":"Type.Model.Inheritance.SingleDiscriminator.getLegacyModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getLegacyModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getLegacyModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getMissingDiscriminator":"Type.Model.Inheritance.SingleDiscriminator.getMissingDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getMissingDiscriminatorWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getMissingDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getModel":"Type.Model.Inheritance.SingleDiscriminator.getModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getRecursiveModel":"Type.Model.Inheritance.SingleDiscriminator.getRecursiveModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getRecursiveModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getRecursiveModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getWrongDiscriminator":"Type.Model.Inheritance.SingleDiscriminator.getWrongDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.getWrongDiscriminatorWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getWrongDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.putModel":"Type.Model.Inheritance.SingleDiscriminator.putModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.putModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.putModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.putRecursiveModel":"Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorAsyncClient.putRecursiveModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient":"Type.Model.Inheritance.SingleDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getLegacyModel":"Type.Model.Inheritance.SingleDiscriminator.getLegacyModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getLegacyModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getLegacyModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getMissingDiscriminator":"Type.Model.Inheritance.SingleDiscriminator.getMissingDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getMissingDiscriminatorWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getMissingDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getModel":"Type.Model.Inheritance.SingleDiscriminator.getModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getRecursiveModel":"Type.Model.Inheritance.SingleDiscriminator.getRecursiveModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getRecursiveModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getRecursiveModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getWrongDiscriminator":"Type.Model.Inheritance.SingleDiscriminator.getWrongDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.getWrongDiscriminatorWithResponse":"Type.Model.Inheritance.SingleDiscriminator.getWrongDiscriminator","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.putModel":"Type.Model.Inheritance.SingleDiscriminator.putModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.putModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.putModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.putRecursiveModel":"Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClient.putRecursiveModelWithResponse":"Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel","type.model.inheritance.singlediscriminator.SingleDiscriminatorClientBuilder":"Type.Model.Inheritance.SingleDiscriminator","type.model.inheritance.singlediscriminator.models.Bird":"Type.Model.Inheritance.SingleDiscriminator.Bird","type.model.inheritance.singlediscriminator.models.Dinosaur":"Type.Model.Inheritance.SingleDiscriminator.Dinosaur","type.model.inheritance.singlediscriminator.models.Eagle":"Type.Model.Inheritance.SingleDiscriminator.Eagle","type.model.inheritance.singlediscriminator.models.Goose":"Type.Model.Inheritance.SingleDiscriminator.Goose","type.model.inheritance.singlediscriminator.models.SeaGull":"Type.Model.Inheritance.SingleDiscriminator.SeaGull","type.model.inheritance.singlediscriminator.models.Sparrow":"Type.Model.Inheritance.SingleDiscriminator.Sparrow","type.model.inheritance.singlediscriminator.models.TRex":"Type.Model.Inheritance.SingleDiscriminator.TRex"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/inheritance/singlediscriminator/SingleDiscriminatorAsyncClient.java","src/main/java/type/model/inheritance/singlediscriminator/SingleDiscriminatorClient.java","src/main/java/type/model/inheritance/singlediscriminator/SingleDiscriminatorClientBuilder.java","src/main/java/type/model/inheritance/singlediscriminator/implementation/SingleDiscriminatorClientImpl.java","src/main/java/type/model/inheritance/singlediscriminator/implementation/package-info.java","src/main/java/type/model/inheritance/singlediscriminator/models/Bird.java","src/main/java/type/model/inheritance/singlediscriminator/models/Dinosaur.java","src/main/java/type/model/inheritance/singlediscriminator/models/Eagle.java","src/main/java/type/model/inheritance/singlediscriminator/models/Goose.java","src/main/java/type/model/inheritance/singlediscriminator/models/SeaGull.java","src/main/java/type/model/inheritance/singlediscriminator/models/Sparrow.java","src/main/java/type/model/inheritance/singlediscriminator/models/TRex.java","src/main/java/type/model/inheritance/singlediscriminator/models/package-info.java","src/main/java/type/model/inheritance/singlediscriminator/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-usage_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-usage_apiview_properties.json deleted file mode 100644 index f61716112e4..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-usage_apiview_properties.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.model.usage.UsageAsyncClient": "Type.Model.Usage", - "type.model.usage.UsageAsyncClient.input": "Type.Model.Usage.input", - "type.model.usage.UsageAsyncClient.inputAndOutput": "Type.Model.Usage.inputAndOutput", - "type.model.usage.UsageAsyncClient.inputAndOutputWithResponse": "Type.Model.Usage.inputAndOutput", - "type.model.usage.UsageAsyncClient.inputWithResponse": "Type.Model.Usage.input", - "type.model.usage.UsageAsyncClient.output": "Type.Model.Usage.output", - "type.model.usage.UsageAsyncClient.outputWithResponse": "Type.Model.Usage.output", - "type.model.usage.UsageClient": "Type.Model.Usage", - "type.model.usage.UsageClient.input": "Type.Model.Usage.input", - "type.model.usage.UsageClient.inputAndOutput": "Type.Model.Usage.inputAndOutput", - "type.model.usage.UsageClient.inputAndOutputWithResponse": "Type.Model.Usage.inputAndOutput", - "type.model.usage.UsageClient.inputWithResponse": "Type.Model.Usage.input", - "type.model.usage.UsageClient.output": "Type.Model.Usage.output", - "type.model.usage.UsageClient.outputWithResponse": "Type.Model.Usage.output", - "type.model.usage.UsageClientBuilder": "Type.Model.Usage", - "type.model.usage.models.InputOutputRecord": "Type.Model.Usage.InputOutputRecord", - "type.model.usage.models.InputRecord": "Type.Model.Usage.InputRecord", - "type.model.usage.models.OutputRecord": "Type.Model.Usage.OutputRecord" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-usage_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-usage_metadata.json index fd6f78b5843..e305cedebb4 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-usage_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-usage_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.model.usage.UsageAsyncClient":"Type.Model.Usage","type.model.usage.UsageAsyncClient.input":"Type.Model.Usage.input","type.model.usage.UsageAsyncClient.inputAndOutput":"Type.Model.Usage.inputAndOutput","type.model.usage.UsageAsyncClient.inputAndOutputWithResponse":"Type.Model.Usage.inputAndOutput","type.model.usage.UsageAsyncClient.inputWithResponse":"Type.Model.Usage.input","type.model.usage.UsageAsyncClient.output":"Type.Model.Usage.output","type.model.usage.UsageAsyncClient.outputWithResponse":"Type.Model.Usage.output","type.model.usage.UsageClient":"Type.Model.Usage","type.model.usage.UsageClient.input":"Type.Model.Usage.input","type.model.usage.UsageClient.inputAndOutput":"Type.Model.Usage.inputAndOutput","type.model.usage.UsageClient.inputAndOutputWithResponse":"Type.Model.Usage.inputAndOutput","type.model.usage.UsageClient.inputWithResponse":"Type.Model.Usage.input","type.model.usage.UsageClient.output":"Type.Model.Usage.output","type.model.usage.UsageClient.outputWithResponse":"Type.Model.Usage.output","type.model.usage.UsageClientBuilder":"Type.Model.Usage","type.model.usage.models.InputOutputRecord":"Type.Model.Usage.InputOutputRecord","type.model.usage.models.InputRecord":"Type.Model.Usage.InputRecord","type.model.usage.models.OutputRecord":"Type.Model.Usage.OutputRecord"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/usage/UsageAsyncClient.java","src/main/java/type/model/usage/UsageClient.java","src/main/java/type/model/usage/UsageClientBuilder.java","src/main/java/type/model/usage/implementation/UsageClientImpl.java","src/main/java/type/model/usage/implementation/package-info.java","src/main/java/type/model/usage/models/InputOutputRecord.java","src/main/java/type/model/usage/models/InputRecord.java","src/main/java/type/model/usage/models/OutputRecord.java","src/main/java/type/model/usage/models/package-info.java","src/main/java/type/model/usage/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.model.usage.UsageAsyncClient":"Type.Model.Usage","type.model.usage.UsageAsyncClient.input":"Type.Model.Usage.input","type.model.usage.UsageAsyncClient.inputAndOutput":"Type.Model.Usage.inputAndOutput","type.model.usage.UsageAsyncClient.inputAndOutputWithResponse":"Type.Model.Usage.inputAndOutput","type.model.usage.UsageAsyncClient.inputWithResponse":"Type.Model.Usage.input","type.model.usage.UsageAsyncClient.output":"Type.Model.Usage.output","type.model.usage.UsageAsyncClient.outputWithResponse":"Type.Model.Usage.output","type.model.usage.UsageClient":"Type.Model.Usage","type.model.usage.UsageClient.input":"Type.Model.Usage.input","type.model.usage.UsageClient.inputAndOutput":"Type.Model.Usage.inputAndOutput","type.model.usage.UsageClient.inputAndOutputWithResponse":"Type.Model.Usage.inputAndOutput","type.model.usage.UsageClient.inputWithResponse":"Type.Model.Usage.input","type.model.usage.UsageClient.output":"Type.Model.Usage.output","type.model.usage.UsageClient.outputWithResponse":"Type.Model.Usage.output","type.model.usage.UsageClientBuilder":"Type.Model.Usage","type.model.usage.models.InputOutputRecord":"Type.Model.Usage.InputOutputRecord","type.model.usage.models.InputRecord":"Type.Model.Usage.InputRecord","type.model.usage.models.OutputRecord":"Type.Model.Usage.OutputRecord"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/usage/UsageAsyncClient.java","src/main/java/type/model/usage/UsageClient.java","src/main/java/type/model/usage/UsageClientBuilder.java","src/main/java/type/model/usage/implementation/UsageClientImpl.java","src/main/java/type/model/usage/implementation/package-info.java","src/main/java/type/model/usage/models/InputOutputRecord.java","src/main/java/type/model/usage/models/InputRecord.java","src/main/java/type/model/usage/models/OutputRecord.java","src/main/java/type/model/usage/models/package-info.java","src/main/java/type/model/usage/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-visibility_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-visibility_apiview_properties.json deleted file mode 100644 index 5104cc3c1c6..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-visibility_apiview_properties.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.model.visibility.VisibilityAsyncClient": "Type.Model.Visibility", - "type.model.visibility.VisibilityAsyncClient.deleteModel": "Type.Model.Visibility.deleteModel", - "type.model.visibility.VisibilityAsyncClient.deleteModelWithResponse": "Type.Model.Visibility.deleteModel", - "type.model.visibility.VisibilityAsyncClient.getModel": "Type.Model.Visibility.getModel", - "type.model.visibility.VisibilityAsyncClient.getModelWithResponse": "Type.Model.Visibility.getModel", - "type.model.visibility.VisibilityAsyncClient.headModel": "Type.Model.Visibility.headModel", - "type.model.visibility.VisibilityAsyncClient.headModelWithResponse": "Type.Model.Visibility.headModel", - "type.model.visibility.VisibilityAsyncClient.patchModel": "Type.Model.Visibility.patchModel", - "type.model.visibility.VisibilityAsyncClient.patchModelWithResponse": "Type.Model.Visibility.patchModel", - "type.model.visibility.VisibilityAsyncClient.postModel": "Type.Model.Visibility.postModel", - "type.model.visibility.VisibilityAsyncClient.postModelWithResponse": "Type.Model.Visibility.postModel", - "type.model.visibility.VisibilityAsyncClient.putModel": "Type.Model.Visibility.putModel", - "type.model.visibility.VisibilityAsyncClient.putModelWithResponse": "Type.Model.Visibility.putModel", - "type.model.visibility.VisibilityAsyncClient.putReadOnlyModel": "Type.Model.Visibility.putReadOnlyModel", - "type.model.visibility.VisibilityAsyncClient.putReadOnlyModelWithResponse": "Type.Model.Visibility.putReadOnlyModel", - "type.model.visibility.VisibilityClient": "Type.Model.Visibility", - "type.model.visibility.VisibilityClient.deleteModel": "Type.Model.Visibility.deleteModel", - "type.model.visibility.VisibilityClient.deleteModelWithResponse": "Type.Model.Visibility.deleteModel", - "type.model.visibility.VisibilityClient.getModel": "Type.Model.Visibility.getModel", - "type.model.visibility.VisibilityClient.getModelWithResponse": "Type.Model.Visibility.getModel", - "type.model.visibility.VisibilityClient.headModel": "Type.Model.Visibility.headModel", - "type.model.visibility.VisibilityClient.headModelWithResponse": "Type.Model.Visibility.headModel", - "type.model.visibility.VisibilityClient.patchModel": "Type.Model.Visibility.patchModel", - "type.model.visibility.VisibilityClient.patchModelWithResponse": "Type.Model.Visibility.patchModel", - "type.model.visibility.VisibilityClient.postModel": "Type.Model.Visibility.postModel", - "type.model.visibility.VisibilityClient.postModelWithResponse": "Type.Model.Visibility.postModel", - "type.model.visibility.VisibilityClient.putModel": "Type.Model.Visibility.putModel", - "type.model.visibility.VisibilityClient.putModelWithResponse": "Type.Model.Visibility.putModel", - "type.model.visibility.VisibilityClient.putReadOnlyModel": "Type.Model.Visibility.putReadOnlyModel", - "type.model.visibility.VisibilityClient.putReadOnlyModelWithResponse": "Type.Model.Visibility.putReadOnlyModel", - "type.model.visibility.VisibilityClientBuilder": "Type.Model.Visibility", - "type.model.visibility.models.ReadOnlyModel": "Type.Model.Visibility.ReadOnlyModel", - "type.model.visibility.models.VisibilityModel": "Type.Model.Visibility.VisibilityModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-visibility_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-visibility_metadata.json index b60ec1a653a..e8057faf758 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-visibility_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-visibility_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.model.visibility.VisibilityAsyncClient":"Type.Model.Visibility","type.model.visibility.VisibilityAsyncClient.deleteModel":"Type.Model.Visibility.deleteModel","type.model.visibility.VisibilityAsyncClient.deleteModelWithResponse":"Type.Model.Visibility.deleteModel","type.model.visibility.VisibilityAsyncClient.getModel":"Type.Model.Visibility.getModel","type.model.visibility.VisibilityAsyncClient.getModelWithResponse":"Type.Model.Visibility.getModel","type.model.visibility.VisibilityAsyncClient.headModel":"Type.Model.Visibility.headModel","type.model.visibility.VisibilityAsyncClient.headModelWithResponse":"Type.Model.Visibility.headModel","type.model.visibility.VisibilityAsyncClient.patchModel":"Type.Model.Visibility.patchModel","type.model.visibility.VisibilityAsyncClient.patchModelWithResponse":"Type.Model.Visibility.patchModel","type.model.visibility.VisibilityAsyncClient.postModel":"Type.Model.Visibility.postModel","type.model.visibility.VisibilityAsyncClient.postModelWithResponse":"Type.Model.Visibility.postModel","type.model.visibility.VisibilityAsyncClient.putModel":"Type.Model.Visibility.putModel","type.model.visibility.VisibilityAsyncClient.putModelWithResponse":"Type.Model.Visibility.putModel","type.model.visibility.VisibilityAsyncClient.putReadOnlyModel":"Type.Model.Visibility.putReadOnlyModel","type.model.visibility.VisibilityAsyncClient.putReadOnlyModelWithResponse":"Type.Model.Visibility.putReadOnlyModel","type.model.visibility.VisibilityClient":"Type.Model.Visibility","type.model.visibility.VisibilityClient.deleteModel":"Type.Model.Visibility.deleteModel","type.model.visibility.VisibilityClient.deleteModelWithResponse":"Type.Model.Visibility.deleteModel","type.model.visibility.VisibilityClient.getModel":"Type.Model.Visibility.getModel","type.model.visibility.VisibilityClient.getModelWithResponse":"Type.Model.Visibility.getModel","type.model.visibility.VisibilityClient.headModel":"Type.Model.Visibility.headModel","type.model.visibility.VisibilityClient.headModelWithResponse":"Type.Model.Visibility.headModel","type.model.visibility.VisibilityClient.patchModel":"Type.Model.Visibility.patchModel","type.model.visibility.VisibilityClient.patchModelWithResponse":"Type.Model.Visibility.patchModel","type.model.visibility.VisibilityClient.postModel":"Type.Model.Visibility.postModel","type.model.visibility.VisibilityClient.postModelWithResponse":"Type.Model.Visibility.postModel","type.model.visibility.VisibilityClient.putModel":"Type.Model.Visibility.putModel","type.model.visibility.VisibilityClient.putModelWithResponse":"Type.Model.Visibility.putModel","type.model.visibility.VisibilityClient.putReadOnlyModel":"Type.Model.Visibility.putReadOnlyModel","type.model.visibility.VisibilityClient.putReadOnlyModelWithResponse":"Type.Model.Visibility.putReadOnlyModel","type.model.visibility.VisibilityClientBuilder":"Type.Model.Visibility","type.model.visibility.models.ReadOnlyModel":"Type.Model.Visibility.ReadOnlyModel","type.model.visibility.models.VisibilityModel":"Type.Model.Visibility.VisibilityModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/visibility/VisibilityAsyncClient.java","src/main/java/type/model/visibility/VisibilityClient.java","src/main/java/type/model/visibility/VisibilityClientBuilder.java","src/main/java/type/model/visibility/implementation/VisibilityClientImpl.java","src/main/java/type/model/visibility/implementation/package-info.java","src/main/java/type/model/visibility/models/ReadOnlyModel.java","src/main/java/type/model/visibility/models/VisibilityModel.java","src/main/java/type/model/visibility/models/package-info.java","src/main/java/type/model/visibility/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.model.visibility.VisibilityAsyncClient":"Type.Model.Visibility","type.model.visibility.VisibilityAsyncClient.deleteModel":"Type.Model.Visibility.deleteModel","type.model.visibility.VisibilityAsyncClient.deleteModelWithResponse":"Type.Model.Visibility.deleteModel","type.model.visibility.VisibilityAsyncClient.getModel":"Type.Model.Visibility.getModel","type.model.visibility.VisibilityAsyncClient.getModelWithResponse":"Type.Model.Visibility.getModel","type.model.visibility.VisibilityAsyncClient.headModel":"Type.Model.Visibility.headModel","type.model.visibility.VisibilityAsyncClient.headModelWithResponse":"Type.Model.Visibility.headModel","type.model.visibility.VisibilityAsyncClient.patchModel":"Type.Model.Visibility.patchModel","type.model.visibility.VisibilityAsyncClient.patchModelWithResponse":"Type.Model.Visibility.patchModel","type.model.visibility.VisibilityAsyncClient.postModel":"Type.Model.Visibility.postModel","type.model.visibility.VisibilityAsyncClient.postModelWithResponse":"Type.Model.Visibility.postModel","type.model.visibility.VisibilityAsyncClient.putModel":"Type.Model.Visibility.putModel","type.model.visibility.VisibilityAsyncClient.putModelWithResponse":"Type.Model.Visibility.putModel","type.model.visibility.VisibilityAsyncClient.putReadOnlyModel":"Type.Model.Visibility.putReadOnlyModel","type.model.visibility.VisibilityAsyncClient.putReadOnlyModelWithResponse":"Type.Model.Visibility.putReadOnlyModel","type.model.visibility.VisibilityClient":"Type.Model.Visibility","type.model.visibility.VisibilityClient.deleteModel":"Type.Model.Visibility.deleteModel","type.model.visibility.VisibilityClient.deleteModelWithResponse":"Type.Model.Visibility.deleteModel","type.model.visibility.VisibilityClient.getModel":"Type.Model.Visibility.getModel","type.model.visibility.VisibilityClient.getModelWithResponse":"Type.Model.Visibility.getModel","type.model.visibility.VisibilityClient.headModel":"Type.Model.Visibility.headModel","type.model.visibility.VisibilityClient.headModelWithResponse":"Type.Model.Visibility.headModel","type.model.visibility.VisibilityClient.patchModel":"Type.Model.Visibility.patchModel","type.model.visibility.VisibilityClient.patchModelWithResponse":"Type.Model.Visibility.patchModel","type.model.visibility.VisibilityClient.postModel":"Type.Model.Visibility.postModel","type.model.visibility.VisibilityClient.postModelWithResponse":"Type.Model.Visibility.postModel","type.model.visibility.VisibilityClient.putModel":"Type.Model.Visibility.putModel","type.model.visibility.VisibilityClient.putModelWithResponse":"Type.Model.Visibility.putModel","type.model.visibility.VisibilityClient.putReadOnlyModel":"Type.Model.Visibility.putReadOnlyModel","type.model.visibility.VisibilityClient.putReadOnlyModelWithResponse":"Type.Model.Visibility.putReadOnlyModel","type.model.visibility.VisibilityClientBuilder":"Type.Model.Visibility","type.model.visibility.models.ReadOnlyModel":"Type.Model.Visibility.ReadOnlyModel","type.model.visibility.models.VisibilityModel":"Type.Model.Visibility.VisibilityModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/model/visibility/VisibilityAsyncClient.java","src/main/java/type/model/visibility/VisibilityClient.java","src/main/java/type/model/visibility/VisibilityClientBuilder.java","src/main/java/type/model/visibility/implementation/VisibilityClientImpl.java","src/main/java/type/model/visibility/implementation/package-info.java","src/main/java/type/model/visibility/models/ReadOnlyModel.java","src/main/java/type/model/visibility/models/VisibilityModel.java","src/main/java/type/model/visibility/models/package-info.java","src/main/java/type/model/visibility/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-additionalproperties_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-additionalproperties_apiview_properties.json deleted file mode 100644 index c7e092788c9..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-additionalproperties_apiview_properties.json +++ /dev/null @@ -1,353 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.property.additionalproperties.AdditionalPropertiesClientBuilder": "Type.Property.AdditionalProperties", - "type.property.additionalproperties.ExtendsDifferentSpreadFloatAsyncClient": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat", - "type.property.additionalproperties.ExtendsDifferentSpreadFloatAsyncClient.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get", - "type.property.additionalproperties.ExtendsDifferentSpreadFloatAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get", - "type.property.additionalproperties.ExtendsDifferentSpreadFloatAsyncClient.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put", - "type.property.additionalproperties.ExtendsDifferentSpreadFloatAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put", - "type.property.additionalproperties.ExtendsDifferentSpreadFloatClient": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat", - "type.property.additionalproperties.ExtendsDifferentSpreadFloatClient.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get", - "type.property.additionalproperties.ExtendsDifferentSpreadFloatClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get", - "type.property.additionalproperties.ExtendsDifferentSpreadFloatClient.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put", - "type.property.additionalproperties.ExtendsDifferentSpreadFloatClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put", - "type.property.additionalproperties.ExtendsDifferentSpreadModelArrayAsyncClient": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray", - "type.property.additionalproperties.ExtendsDifferentSpreadModelArrayAsyncClient.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get", - "type.property.additionalproperties.ExtendsDifferentSpreadModelArrayAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get", - "type.property.additionalproperties.ExtendsDifferentSpreadModelArrayAsyncClient.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put", - "type.property.additionalproperties.ExtendsDifferentSpreadModelArrayAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put", - "type.property.additionalproperties.ExtendsDifferentSpreadModelArrayClient": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray", - "type.property.additionalproperties.ExtendsDifferentSpreadModelArrayClient.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get", - "type.property.additionalproperties.ExtendsDifferentSpreadModelArrayClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get", - "type.property.additionalproperties.ExtendsDifferentSpreadModelArrayClient.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put", - "type.property.additionalproperties.ExtendsDifferentSpreadModelArrayClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put", - "type.property.additionalproperties.ExtendsDifferentSpreadModelAsyncClient": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel", - "type.property.additionalproperties.ExtendsDifferentSpreadModelAsyncClient.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get", - "type.property.additionalproperties.ExtendsDifferentSpreadModelAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get", - "type.property.additionalproperties.ExtendsDifferentSpreadModelAsyncClient.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put", - "type.property.additionalproperties.ExtendsDifferentSpreadModelAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put", - "type.property.additionalproperties.ExtendsDifferentSpreadModelClient": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel", - "type.property.additionalproperties.ExtendsDifferentSpreadModelClient.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get", - "type.property.additionalproperties.ExtendsDifferentSpreadModelClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get", - "type.property.additionalproperties.ExtendsDifferentSpreadModelClient.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put", - "type.property.additionalproperties.ExtendsDifferentSpreadModelClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put", - "type.property.additionalproperties.ExtendsDifferentSpreadStringAsyncClient": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString", - "type.property.additionalproperties.ExtendsDifferentSpreadStringAsyncClient.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get", - "type.property.additionalproperties.ExtendsDifferentSpreadStringAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get", - "type.property.additionalproperties.ExtendsDifferentSpreadStringAsyncClient.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put", - "type.property.additionalproperties.ExtendsDifferentSpreadStringAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put", - "type.property.additionalproperties.ExtendsDifferentSpreadStringClient": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString", - "type.property.additionalproperties.ExtendsDifferentSpreadStringClient.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get", - "type.property.additionalproperties.ExtendsDifferentSpreadStringClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get", - "type.property.additionalproperties.ExtendsDifferentSpreadStringClient.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put", - "type.property.additionalproperties.ExtendsDifferentSpreadStringClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put", - "type.property.additionalproperties.ExtendsFloatAsyncClient": "Type.Property.AdditionalProperties.ExtendsFloat", - "type.property.additionalproperties.ExtendsFloatAsyncClient.get": "Type.Property.AdditionalProperties.ExtendsFloat.get", - "type.property.additionalproperties.ExtendsFloatAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsFloat.get", - "type.property.additionalproperties.ExtendsFloatAsyncClient.put": "Type.Property.AdditionalProperties.ExtendsFloat.put", - "type.property.additionalproperties.ExtendsFloatAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsFloat.put", - "type.property.additionalproperties.ExtendsFloatClient": "Type.Property.AdditionalProperties.ExtendsFloat", - "type.property.additionalproperties.ExtendsFloatClient.get": "Type.Property.AdditionalProperties.ExtendsFloat.get", - "type.property.additionalproperties.ExtendsFloatClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsFloat.get", - "type.property.additionalproperties.ExtendsFloatClient.put": "Type.Property.AdditionalProperties.ExtendsFloat.put", - "type.property.additionalproperties.ExtendsFloatClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsFloat.put", - "type.property.additionalproperties.ExtendsModelArrayAsyncClient": "Type.Property.AdditionalProperties.ExtendsModelArray", - "type.property.additionalproperties.ExtendsModelArrayAsyncClient.get": "Type.Property.AdditionalProperties.ExtendsModelArray.get", - "type.property.additionalproperties.ExtendsModelArrayAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsModelArray.get", - "type.property.additionalproperties.ExtendsModelArrayAsyncClient.put": "Type.Property.AdditionalProperties.ExtendsModelArray.put", - "type.property.additionalproperties.ExtendsModelArrayAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsModelArray.put", - "type.property.additionalproperties.ExtendsModelArrayClient": "Type.Property.AdditionalProperties.ExtendsModelArray", - "type.property.additionalproperties.ExtendsModelArrayClient.get": "Type.Property.AdditionalProperties.ExtendsModelArray.get", - "type.property.additionalproperties.ExtendsModelArrayClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsModelArray.get", - "type.property.additionalproperties.ExtendsModelArrayClient.put": "Type.Property.AdditionalProperties.ExtendsModelArray.put", - "type.property.additionalproperties.ExtendsModelArrayClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsModelArray.put", - "type.property.additionalproperties.ExtendsModelAsyncClient": "Type.Property.AdditionalProperties.ExtendsModel", - "type.property.additionalproperties.ExtendsModelAsyncClient.get": "Type.Property.AdditionalProperties.ExtendsModel.get", - "type.property.additionalproperties.ExtendsModelAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsModel.get", - "type.property.additionalproperties.ExtendsModelAsyncClient.put": "Type.Property.AdditionalProperties.ExtendsModel.put", - "type.property.additionalproperties.ExtendsModelAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsModel.put", - "type.property.additionalproperties.ExtendsModelClient": "Type.Property.AdditionalProperties.ExtendsModel", - "type.property.additionalproperties.ExtendsModelClient.get": "Type.Property.AdditionalProperties.ExtendsModel.get", - "type.property.additionalproperties.ExtendsModelClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsModel.get", - "type.property.additionalproperties.ExtendsModelClient.put": "Type.Property.AdditionalProperties.ExtendsModel.put", - "type.property.additionalproperties.ExtendsModelClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsModel.put", - "type.property.additionalproperties.ExtendsStringAsyncClient": "Type.Property.AdditionalProperties.ExtendsString", - "type.property.additionalproperties.ExtendsStringAsyncClient.get": "Type.Property.AdditionalProperties.ExtendsString.get", - "type.property.additionalproperties.ExtendsStringAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsString.get", - "type.property.additionalproperties.ExtendsStringAsyncClient.put": "Type.Property.AdditionalProperties.ExtendsString.put", - "type.property.additionalproperties.ExtendsStringAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsString.put", - "type.property.additionalproperties.ExtendsStringClient": "Type.Property.AdditionalProperties.ExtendsString", - "type.property.additionalproperties.ExtendsStringClient.get": "Type.Property.AdditionalProperties.ExtendsString.get", - "type.property.additionalproperties.ExtendsStringClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsString.get", - "type.property.additionalproperties.ExtendsStringClient.put": "Type.Property.AdditionalProperties.ExtendsString.put", - "type.property.additionalproperties.ExtendsStringClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsString.put", - "type.property.additionalproperties.ExtendsUnknownAsyncClient": "Type.Property.AdditionalProperties.ExtendsUnknown", - "type.property.additionalproperties.ExtendsUnknownAsyncClient.get": "Type.Property.AdditionalProperties.ExtendsUnknown.get", - "type.property.additionalproperties.ExtendsUnknownAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsUnknown.get", - "type.property.additionalproperties.ExtendsUnknownAsyncClient.put": "Type.Property.AdditionalProperties.ExtendsUnknown.put", - "type.property.additionalproperties.ExtendsUnknownAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsUnknown.put", - "type.property.additionalproperties.ExtendsUnknownClient": "Type.Property.AdditionalProperties.ExtendsUnknown", - "type.property.additionalproperties.ExtendsUnknownClient.get": "Type.Property.AdditionalProperties.ExtendsUnknown.get", - "type.property.additionalproperties.ExtendsUnknownClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsUnknown.get", - "type.property.additionalproperties.ExtendsUnknownClient.put": "Type.Property.AdditionalProperties.ExtendsUnknown.put", - "type.property.additionalproperties.ExtendsUnknownClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsUnknown.put", - "type.property.additionalproperties.ExtendsUnknownDerivedAsyncClient": "Type.Property.AdditionalProperties.ExtendsUnknownDerived", - "type.property.additionalproperties.ExtendsUnknownDerivedAsyncClient.get": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.get", - "type.property.additionalproperties.ExtendsUnknownDerivedAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.get", - "type.property.additionalproperties.ExtendsUnknownDerivedAsyncClient.put": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.put", - "type.property.additionalproperties.ExtendsUnknownDerivedAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.put", - "type.property.additionalproperties.ExtendsUnknownDerivedClient": "Type.Property.AdditionalProperties.ExtendsUnknownDerived", - "type.property.additionalproperties.ExtendsUnknownDerivedClient.get": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.get", - "type.property.additionalproperties.ExtendsUnknownDerivedClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.get", - "type.property.additionalproperties.ExtendsUnknownDerivedClient.put": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.put", - "type.property.additionalproperties.ExtendsUnknownDerivedClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.put", - "type.property.additionalproperties.ExtendsUnknownDiscriminatedAsyncClient": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated", - "type.property.additionalproperties.ExtendsUnknownDiscriminatedAsyncClient.get": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get", - "type.property.additionalproperties.ExtendsUnknownDiscriminatedAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get", - "type.property.additionalproperties.ExtendsUnknownDiscriminatedAsyncClient.put": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put", - "type.property.additionalproperties.ExtendsUnknownDiscriminatedAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put", - "type.property.additionalproperties.ExtendsUnknownDiscriminatedClient": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated", - "type.property.additionalproperties.ExtendsUnknownDiscriminatedClient.get": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get", - "type.property.additionalproperties.ExtendsUnknownDiscriminatedClient.getWithResponse": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get", - "type.property.additionalproperties.ExtendsUnknownDiscriminatedClient.put": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put", - "type.property.additionalproperties.ExtendsUnknownDiscriminatedClient.putWithResponse": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put", - "type.property.additionalproperties.IsFloatAsyncClient": "Type.Property.AdditionalProperties.IsFloat", - "type.property.additionalproperties.IsFloatAsyncClient.get": "Type.Property.AdditionalProperties.IsFloat.get", - "type.property.additionalproperties.IsFloatAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.IsFloat.get", - "type.property.additionalproperties.IsFloatAsyncClient.put": "Type.Property.AdditionalProperties.IsFloat.put", - "type.property.additionalproperties.IsFloatAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.IsFloat.put", - "type.property.additionalproperties.IsFloatClient": "Type.Property.AdditionalProperties.IsFloat", - "type.property.additionalproperties.IsFloatClient.get": "Type.Property.AdditionalProperties.IsFloat.get", - "type.property.additionalproperties.IsFloatClient.getWithResponse": "Type.Property.AdditionalProperties.IsFloat.get", - "type.property.additionalproperties.IsFloatClient.put": "Type.Property.AdditionalProperties.IsFloat.put", - "type.property.additionalproperties.IsFloatClient.putWithResponse": "Type.Property.AdditionalProperties.IsFloat.put", - "type.property.additionalproperties.IsModelArrayAsyncClient": "Type.Property.AdditionalProperties.IsModelArray", - "type.property.additionalproperties.IsModelArrayAsyncClient.get": "Type.Property.AdditionalProperties.IsModelArray.get", - "type.property.additionalproperties.IsModelArrayAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.IsModelArray.get", - "type.property.additionalproperties.IsModelArrayAsyncClient.put": "Type.Property.AdditionalProperties.IsModelArray.put", - "type.property.additionalproperties.IsModelArrayAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.IsModelArray.put", - "type.property.additionalproperties.IsModelArrayClient": "Type.Property.AdditionalProperties.IsModelArray", - "type.property.additionalproperties.IsModelArrayClient.get": "Type.Property.AdditionalProperties.IsModelArray.get", - "type.property.additionalproperties.IsModelArrayClient.getWithResponse": "Type.Property.AdditionalProperties.IsModelArray.get", - "type.property.additionalproperties.IsModelArrayClient.put": "Type.Property.AdditionalProperties.IsModelArray.put", - "type.property.additionalproperties.IsModelArrayClient.putWithResponse": "Type.Property.AdditionalProperties.IsModelArray.put", - "type.property.additionalproperties.IsModelAsyncClient": "Type.Property.AdditionalProperties.IsModel", - "type.property.additionalproperties.IsModelAsyncClient.get": "Type.Property.AdditionalProperties.IsModel.get", - "type.property.additionalproperties.IsModelAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.IsModel.get", - "type.property.additionalproperties.IsModelAsyncClient.put": "Type.Property.AdditionalProperties.IsModel.put", - "type.property.additionalproperties.IsModelAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.IsModel.put", - "type.property.additionalproperties.IsModelClient": "Type.Property.AdditionalProperties.IsModel", - "type.property.additionalproperties.IsModelClient.get": "Type.Property.AdditionalProperties.IsModel.get", - "type.property.additionalproperties.IsModelClient.getWithResponse": "Type.Property.AdditionalProperties.IsModel.get", - "type.property.additionalproperties.IsModelClient.put": "Type.Property.AdditionalProperties.IsModel.put", - "type.property.additionalproperties.IsModelClient.putWithResponse": "Type.Property.AdditionalProperties.IsModel.put", - "type.property.additionalproperties.IsStringAsyncClient": "Type.Property.AdditionalProperties.IsString", - "type.property.additionalproperties.IsStringAsyncClient.get": "Type.Property.AdditionalProperties.IsString.get", - "type.property.additionalproperties.IsStringAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.IsString.get", - "type.property.additionalproperties.IsStringAsyncClient.put": "Type.Property.AdditionalProperties.IsString.put", - "type.property.additionalproperties.IsStringAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.IsString.put", - "type.property.additionalproperties.IsStringClient": "Type.Property.AdditionalProperties.IsString", - "type.property.additionalproperties.IsStringClient.get": "Type.Property.AdditionalProperties.IsString.get", - "type.property.additionalproperties.IsStringClient.getWithResponse": "Type.Property.AdditionalProperties.IsString.get", - "type.property.additionalproperties.IsStringClient.put": "Type.Property.AdditionalProperties.IsString.put", - "type.property.additionalproperties.IsStringClient.putWithResponse": "Type.Property.AdditionalProperties.IsString.put", - "type.property.additionalproperties.IsUnknownAsyncClient": "Type.Property.AdditionalProperties.IsUnknown", - "type.property.additionalproperties.IsUnknownAsyncClient.get": "Type.Property.AdditionalProperties.IsUnknown.get", - "type.property.additionalproperties.IsUnknownAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.IsUnknown.get", - "type.property.additionalproperties.IsUnknownAsyncClient.put": "Type.Property.AdditionalProperties.IsUnknown.put", - "type.property.additionalproperties.IsUnknownAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.IsUnknown.put", - "type.property.additionalproperties.IsUnknownClient": "Type.Property.AdditionalProperties.IsUnknown", - "type.property.additionalproperties.IsUnknownClient.get": "Type.Property.AdditionalProperties.IsUnknown.get", - "type.property.additionalproperties.IsUnknownClient.getWithResponse": "Type.Property.AdditionalProperties.IsUnknown.get", - "type.property.additionalproperties.IsUnknownClient.put": "Type.Property.AdditionalProperties.IsUnknown.put", - "type.property.additionalproperties.IsUnknownClient.putWithResponse": "Type.Property.AdditionalProperties.IsUnknown.put", - "type.property.additionalproperties.IsUnknownDerivedAsyncClient": "Type.Property.AdditionalProperties.IsUnknownDerived", - "type.property.additionalproperties.IsUnknownDerivedAsyncClient.get": "Type.Property.AdditionalProperties.IsUnknownDerived.get", - "type.property.additionalproperties.IsUnknownDerivedAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.IsUnknownDerived.get", - "type.property.additionalproperties.IsUnknownDerivedAsyncClient.put": "Type.Property.AdditionalProperties.IsUnknownDerived.put", - "type.property.additionalproperties.IsUnknownDerivedAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.IsUnknownDerived.put", - "type.property.additionalproperties.IsUnknownDerivedClient": "Type.Property.AdditionalProperties.IsUnknownDerived", - "type.property.additionalproperties.IsUnknownDerivedClient.get": "Type.Property.AdditionalProperties.IsUnknownDerived.get", - "type.property.additionalproperties.IsUnknownDerivedClient.getWithResponse": "Type.Property.AdditionalProperties.IsUnknownDerived.get", - "type.property.additionalproperties.IsUnknownDerivedClient.put": "Type.Property.AdditionalProperties.IsUnknownDerived.put", - "type.property.additionalproperties.IsUnknownDerivedClient.putWithResponse": "Type.Property.AdditionalProperties.IsUnknownDerived.put", - "type.property.additionalproperties.IsUnknownDiscriminatedAsyncClient": "Type.Property.AdditionalProperties.IsUnknownDiscriminated", - "type.property.additionalproperties.IsUnknownDiscriminatedAsyncClient.get": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.get", - "type.property.additionalproperties.IsUnknownDiscriminatedAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.get", - "type.property.additionalproperties.IsUnknownDiscriminatedAsyncClient.put": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.put", - "type.property.additionalproperties.IsUnknownDiscriminatedAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.put", - "type.property.additionalproperties.IsUnknownDiscriminatedClient": "Type.Property.AdditionalProperties.IsUnknownDiscriminated", - "type.property.additionalproperties.IsUnknownDiscriminatedClient.get": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.get", - "type.property.additionalproperties.IsUnknownDiscriminatedClient.getWithResponse": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.get", - "type.property.additionalproperties.IsUnknownDiscriminatedClient.put": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.put", - "type.property.additionalproperties.IsUnknownDiscriminatedClient.putWithResponse": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.put", - "type.property.additionalproperties.MultipleSpreadAsyncClient": "Type.Property.AdditionalProperties.MultipleSpread", - "type.property.additionalproperties.MultipleSpreadAsyncClient.get": "Type.Property.AdditionalProperties.MultipleSpread.get", - "type.property.additionalproperties.MultipleSpreadAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.MultipleSpread.get", - "type.property.additionalproperties.MultipleSpreadAsyncClient.put": "Type.Property.AdditionalProperties.MultipleSpread.put", - "type.property.additionalproperties.MultipleSpreadAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.MultipleSpread.put", - "type.property.additionalproperties.MultipleSpreadClient": "Type.Property.AdditionalProperties.MultipleSpread", - "type.property.additionalproperties.MultipleSpreadClient.get": "Type.Property.AdditionalProperties.MultipleSpread.get", - "type.property.additionalproperties.MultipleSpreadClient.getWithResponse": "Type.Property.AdditionalProperties.MultipleSpread.get", - "type.property.additionalproperties.MultipleSpreadClient.put": "Type.Property.AdditionalProperties.MultipleSpread.put", - "type.property.additionalproperties.MultipleSpreadClient.putWithResponse": "Type.Property.AdditionalProperties.MultipleSpread.put", - "type.property.additionalproperties.SpreadDifferentFloatAsyncClient": "Type.Property.AdditionalProperties.SpreadDifferentFloat", - "type.property.additionalproperties.SpreadDifferentFloatAsyncClient.get": "Type.Property.AdditionalProperties.SpreadDifferentFloat.get", - "type.property.additionalproperties.SpreadDifferentFloatAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadDifferentFloat.get", - "type.property.additionalproperties.SpreadDifferentFloatAsyncClient.put": "Type.Property.AdditionalProperties.SpreadDifferentFloat.put", - "type.property.additionalproperties.SpreadDifferentFloatAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadDifferentFloat.put", - "type.property.additionalproperties.SpreadDifferentFloatClient": "Type.Property.AdditionalProperties.SpreadDifferentFloat", - "type.property.additionalproperties.SpreadDifferentFloatClient.get": "Type.Property.AdditionalProperties.SpreadDifferentFloat.get", - "type.property.additionalproperties.SpreadDifferentFloatClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadDifferentFloat.get", - "type.property.additionalproperties.SpreadDifferentFloatClient.put": "Type.Property.AdditionalProperties.SpreadDifferentFloat.put", - "type.property.additionalproperties.SpreadDifferentFloatClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadDifferentFloat.put", - "type.property.additionalproperties.SpreadDifferentModelArrayAsyncClient": "Type.Property.AdditionalProperties.SpreadDifferentModelArray", - "type.property.additionalproperties.SpreadDifferentModelArrayAsyncClient.get": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.get", - "type.property.additionalproperties.SpreadDifferentModelArrayAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.get", - "type.property.additionalproperties.SpreadDifferentModelArrayAsyncClient.put": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.put", - "type.property.additionalproperties.SpreadDifferentModelArrayAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.put", - "type.property.additionalproperties.SpreadDifferentModelArrayClient": "Type.Property.AdditionalProperties.SpreadDifferentModelArray", - "type.property.additionalproperties.SpreadDifferentModelArrayClient.get": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.get", - "type.property.additionalproperties.SpreadDifferentModelArrayClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.get", - "type.property.additionalproperties.SpreadDifferentModelArrayClient.put": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.put", - "type.property.additionalproperties.SpreadDifferentModelArrayClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.put", - "type.property.additionalproperties.SpreadDifferentModelAsyncClient": "Type.Property.AdditionalProperties.SpreadDifferentModel", - "type.property.additionalproperties.SpreadDifferentModelAsyncClient.get": "Type.Property.AdditionalProperties.SpreadDifferentModel.get", - "type.property.additionalproperties.SpreadDifferentModelAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadDifferentModel.get", - "type.property.additionalproperties.SpreadDifferentModelAsyncClient.put": "Type.Property.AdditionalProperties.SpreadDifferentModel.put", - "type.property.additionalproperties.SpreadDifferentModelAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadDifferentModel.put", - "type.property.additionalproperties.SpreadDifferentModelClient": "Type.Property.AdditionalProperties.SpreadDifferentModel", - "type.property.additionalproperties.SpreadDifferentModelClient.get": "Type.Property.AdditionalProperties.SpreadDifferentModel.get", - "type.property.additionalproperties.SpreadDifferentModelClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadDifferentModel.get", - "type.property.additionalproperties.SpreadDifferentModelClient.put": "Type.Property.AdditionalProperties.SpreadDifferentModel.put", - "type.property.additionalproperties.SpreadDifferentModelClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadDifferentModel.put", - "type.property.additionalproperties.SpreadDifferentStringAsyncClient": "Type.Property.AdditionalProperties.SpreadDifferentString", - "type.property.additionalproperties.SpreadDifferentStringAsyncClient.get": "Type.Property.AdditionalProperties.SpreadDifferentString.get", - "type.property.additionalproperties.SpreadDifferentStringAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadDifferentString.get", - "type.property.additionalproperties.SpreadDifferentStringAsyncClient.put": "Type.Property.AdditionalProperties.SpreadDifferentString.put", - "type.property.additionalproperties.SpreadDifferentStringAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadDifferentString.put", - "type.property.additionalproperties.SpreadDifferentStringClient": "Type.Property.AdditionalProperties.SpreadDifferentString", - "type.property.additionalproperties.SpreadDifferentStringClient.get": "Type.Property.AdditionalProperties.SpreadDifferentString.get", - "type.property.additionalproperties.SpreadDifferentStringClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadDifferentString.get", - "type.property.additionalproperties.SpreadDifferentStringClient.put": "Type.Property.AdditionalProperties.SpreadDifferentString.put", - "type.property.additionalproperties.SpreadDifferentStringClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadDifferentString.put", - "type.property.additionalproperties.SpreadFloatAsyncClient": "Type.Property.AdditionalProperties.SpreadFloat", - "type.property.additionalproperties.SpreadFloatAsyncClient.get": "Type.Property.AdditionalProperties.SpreadFloat.get", - "type.property.additionalproperties.SpreadFloatAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadFloat.get", - "type.property.additionalproperties.SpreadFloatAsyncClient.put": "Type.Property.AdditionalProperties.SpreadFloat.put", - "type.property.additionalproperties.SpreadFloatAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadFloat.put", - "type.property.additionalproperties.SpreadFloatClient": "Type.Property.AdditionalProperties.SpreadFloat", - "type.property.additionalproperties.SpreadFloatClient.get": "Type.Property.AdditionalProperties.SpreadFloat.get", - "type.property.additionalproperties.SpreadFloatClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadFloat.get", - "type.property.additionalproperties.SpreadFloatClient.put": "Type.Property.AdditionalProperties.SpreadFloat.put", - "type.property.additionalproperties.SpreadFloatClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadFloat.put", - "type.property.additionalproperties.SpreadModelArrayAsyncClient": "Type.Property.AdditionalProperties.SpreadModelArray", - "type.property.additionalproperties.SpreadModelArrayAsyncClient.get": "Type.Property.AdditionalProperties.SpreadModelArray.get", - "type.property.additionalproperties.SpreadModelArrayAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadModelArray.get", - "type.property.additionalproperties.SpreadModelArrayAsyncClient.put": "Type.Property.AdditionalProperties.SpreadModelArray.put", - "type.property.additionalproperties.SpreadModelArrayAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadModelArray.put", - "type.property.additionalproperties.SpreadModelArrayClient": "Type.Property.AdditionalProperties.SpreadModelArray", - "type.property.additionalproperties.SpreadModelArrayClient.get": "Type.Property.AdditionalProperties.SpreadModelArray.get", - "type.property.additionalproperties.SpreadModelArrayClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadModelArray.get", - "type.property.additionalproperties.SpreadModelArrayClient.put": "Type.Property.AdditionalProperties.SpreadModelArray.put", - "type.property.additionalproperties.SpreadModelArrayClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadModelArray.put", - "type.property.additionalproperties.SpreadModelAsyncClient": "Type.Property.AdditionalProperties.SpreadModel", - "type.property.additionalproperties.SpreadModelAsyncClient.get": "Type.Property.AdditionalProperties.SpreadModel.get", - "type.property.additionalproperties.SpreadModelAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadModel.get", - "type.property.additionalproperties.SpreadModelAsyncClient.put": "Type.Property.AdditionalProperties.SpreadModel.put", - "type.property.additionalproperties.SpreadModelAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadModel.put", - "type.property.additionalproperties.SpreadModelClient": "Type.Property.AdditionalProperties.SpreadModel", - "type.property.additionalproperties.SpreadModelClient.get": "Type.Property.AdditionalProperties.SpreadModel.get", - "type.property.additionalproperties.SpreadModelClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadModel.get", - "type.property.additionalproperties.SpreadModelClient.put": "Type.Property.AdditionalProperties.SpreadModel.put", - "type.property.additionalproperties.SpreadModelClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadModel.put", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2AsyncClient": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2AsyncClient.get": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2AsyncClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2AsyncClient.put": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2AsyncClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2Client": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2Client.get": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2Client.getWithResponse": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2Client.put": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2Client.putWithResponse": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3AsyncClient": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3AsyncClient.get": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3AsyncClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3AsyncClient.put": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3AsyncClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3Client": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3Client.get": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3Client.getWithResponse": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3Client.put": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3Client.putWithResponse": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionAsyncClient": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionAsyncClient.get": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionAsyncClient.put": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionClient": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionClient.get": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionClient.put": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put", - "type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put", - "type.property.additionalproperties.SpreadRecordUnionAsyncClient": "Type.Property.AdditionalProperties.SpreadRecordUnion", - "type.property.additionalproperties.SpreadRecordUnionAsyncClient.get": "Type.Property.AdditionalProperties.SpreadRecordUnion.get", - "type.property.additionalproperties.SpreadRecordUnionAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadRecordUnion.get", - "type.property.additionalproperties.SpreadRecordUnionAsyncClient.put": "Type.Property.AdditionalProperties.SpreadRecordUnion.put", - "type.property.additionalproperties.SpreadRecordUnionAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadRecordUnion.put", - "type.property.additionalproperties.SpreadRecordUnionClient": "Type.Property.AdditionalProperties.SpreadRecordUnion", - "type.property.additionalproperties.SpreadRecordUnionClient.get": "Type.Property.AdditionalProperties.SpreadRecordUnion.get", - "type.property.additionalproperties.SpreadRecordUnionClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadRecordUnion.get", - "type.property.additionalproperties.SpreadRecordUnionClient.put": "Type.Property.AdditionalProperties.SpreadRecordUnion.put", - "type.property.additionalproperties.SpreadRecordUnionClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadRecordUnion.put", - "type.property.additionalproperties.SpreadStringAsyncClient": "Type.Property.AdditionalProperties.SpreadString", - "type.property.additionalproperties.SpreadStringAsyncClient.get": "Type.Property.AdditionalProperties.SpreadString.get", - "type.property.additionalproperties.SpreadStringAsyncClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadString.get", - "type.property.additionalproperties.SpreadStringAsyncClient.put": "Type.Property.AdditionalProperties.SpreadString.put", - "type.property.additionalproperties.SpreadStringAsyncClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadString.put", - "type.property.additionalproperties.SpreadStringClient": "Type.Property.AdditionalProperties.SpreadString", - "type.property.additionalproperties.SpreadStringClient.get": "Type.Property.AdditionalProperties.SpreadString.get", - "type.property.additionalproperties.SpreadStringClient.getWithResponse": "Type.Property.AdditionalProperties.SpreadString.get", - "type.property.additionalproperties.SpreadStringClient.put": "Type.Property.AdditionalProperties.SpreadString.put", - "type.property.additionalproperties.SpreadStringClient.putWithResponse": "Type.Property.AdditionalProperties.SpreadString.put", - "type.property.additionalproperties.models.DifferentSpreadFloatDerived": "Type.Property.AdditionalProperties.DifferentSpreadFloatDerived", - "type.property.additionalproperties.models.DifferentSpreadFloatRecord": "Type.Property.AdditionalProperties.DifferentSpreadFloatRecord", - "type.property.additionalproperties.models.DifferentSpreadModelArrayDerived": "Type.Property.AdditionalProperties.DifferentSpreadModelArrayDerived", - "type.property.additionalproperties.models.DifferentSpreadModelArrayRecord": "Type.Property.AdditionalProperties.DifferentSpreadModelArrayRecord", - "type.property.additionalproperties.models.DifferentSpreadModelDerived": "Type.Property.AdditionalProperties.DifferentSpreadModelDerived", - "type.property.additionalproperties.models.DifferentSpreadModelRecord": "Type.Property.AdditionalProperties.DifferentSpreadModelRecord", - "type.property.additionalproperties.models.DifferentSpreadStringDerived": "Type.Property.AdditionalProperties.DifferentSpreadStringDerived", - "type.property.additionalproperties.models.DifferentSpreadStringRecord": "Type.Property.AdditionalProperties.DifferentSpreadStringRecord", - "type.property.additionalproperties.models.ExtendsFloatAdditionalProperties": "Type.Property.AdditionalProperties.ExtendsFloatAdditionalProperties", - "type.property.additionalproperties.models.ExtendsModelAdditionalProperties": "Type.Property.AdditionalProperties.ExtendsModelAdditionalProperties", - "type.property.additionalproperties.models.ExtendsModelArrayAdditionalProperties": "Type.Property.AdditionalProperties.ExtendsModelArrayAdditionalProperties", - "type.property.additionalproperties.models.ExtendsStringAdditionalProperties": "Type.Property.AdditionalProperties.ExtendsStringAdditionalProperties", - "type.property.additionalproperties.models.ExtendsUnknownAdditionalProperties": "Type.Property.AdditionalProperties.ExtendsUnknownAdditionalProperties", - "type.property.additionalproperties.models.ExtendsUnknownAdditionalPropertiesDerived": "Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDerived", - "type.property.additionalproperties.models.ExtendsUnknownAdditionalPropertiesDiscriminated": "Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDiscriminated", - "type.property.additionalproperties.models.ExtendsUnknownAdditionalPropertiesDiscriminatedDerived": "Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDiscriminatedDerived", - "type.property.additionalproperties.models.IsFloatAdditionalProperties": "Type.Property.AdditionalProperties.IsFloatAdditionalProperties", - "type.property.additionalproperties.models.IsModelAdditionalProperties": "Type.Property.AdditionalProperties.IsModelAdditionalProperties", - "type.property.additionalproperties.models.IsModelArrayAdditionalProperties": "Type.Property.AdditionalProperties.IsModelArrayAdditionalProperties", - "type.property.additionalproperties.models.IsStringAdditionalProperties": "Type.Property.AdditionalProperties.IsStringAdditionalProperties", - "type.property.additionalproperties.models.IsUnknownAdditionalProperties": "Type.Property.AdditionalProperties.IsUnknownAdditionalProperties", - "type.property.additionalproperties.models.IsUnknownAdditionalPropertiesDerived": "Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDerived", - "type.property.additionalproperties.models.IsUnknownAdditionalPropertiesDiscriminated": "Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDiscriminated", - "type.property.additionalproperties.models.IsUnknownAdditionalPropertiesDiscriminatedDerived": "Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDiscriminatedDerived", - "type.property.additionalproperties.models.ModelForRecord": "Type.Property.AdditionalProperties.ModelForRecord", - "type.property.additionalproperties.models.MultipleSpreadRecord": "Type.Property.AdditionalProperties.MultipleSpreadRecord", - "type.property.additionalproperties.models.SpreadFloatRecord": "Type.Property.AdditionalProperties.SpreadFloatRecord", - "type.property.additionalproperties.models.SpreadModelArrayRecord": "Type.Property.AdditionalProperties.SpreadModelArrayRecord", - "type.property.additionalproperties.models.SpreadModelRecord": "Type.Property.AdditionalProperties.SpreadModelRecord", - "type.property.additionalproperties.models.SpreadRecordForNonDiscriminatedUnion": "Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion", - "type.property.additionalproperties.models.SpreadRecordForNonDiscriminatedUnion2": "Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion2", - "type.property.additionalproperties.models.SpreadRecordForNonDiscriminatedUnion3": "Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion3", - "type.property.additionalproperties.models.SpreadRecordForUnion": "Type.Property.AdditionalProperties.SpreadRecordForUnion", - "type.property.additionalproperties.models.SpreadStringRecord": "Type.Property.AdditionalProperties.SpreadStringRecord", - "type.property.additionalproperties.models.WidgetData0": "Type.Property.AdditionalProperties.WidgetData0", - "type.property.additionalproperties.models.WidgetData1": "Type.Property.AdditionalProperties.WidgetData1", - "type.property.additionalproperties.models.WidgetData2": "Type.Property.AdditionalProperties.WidgetData2" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-additionalproperties_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-additionalproperties_metadata.json index 62d49c881f7..33eff15ef02 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-additionalproperties_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-additionalproperties_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.property.additionalproperties.AdditionalPropertiesClientBuilder":"Type.Property.AdditionalProperties","type.property.additionalproperties.ExtendsDifferentSpreadFloatAsyncClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat","type.property.additionalproperties.ExtendsDifferentSpreadFloatAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get","type.property.additionalproperties.ExtendsDifferentSpreadFloatAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get","type.property.additionalproperties.ExtendsDifferentSpreadFloatAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put","type.property.additionalproperties.ExtendsDifferentSpreadFloatAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put","type.property.additionalproperties.ExtendsDifferentSpreadFloatClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat","type.property.additionalproperties.ExtendsDifferentSpreadFloatClient.get":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get","type.property.additionalproperties.ExtendsDifferentSpreadFloatClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get","type.property.additionalproperties.ExtendsDifferentSpreadFloatClient.put":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put","type.property.additionalproperties.ExtendsDifferentSpreadFloatClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayAsyncClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayClient.get":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayClient.put":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put","type.property.additionalproperties.ExtendsDifferentSpreadModelAsyncClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel","type.property.additionalproperties.ExtendsDifferentSpreadModelAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get","type.property.additionalproperties.ExtendsDifferentSpreadModelAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get","type.property.additionalproperties.ExtendsDifferentSpreadModelAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put","type.property.additionalproperties.ExtendsDifferentSpreadModelAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put","type.property.additionalproperties.ExtendsDifferentSpreadModelClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel","type.property.additionalproperties.ExtendsDifferentSpreadModelClient.get":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get","type.property.additionalproperties.ExtendsDifferentSpreadModelClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get","type.property.additionalproperties.ExtendsDifferentSpreadModelClient.put":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put","type.property.additionalproperties.ExtendsDifferentSpreadModelClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put","type.property.additionalproperties.ExtendsDifferentSpreadStringAsyncClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString","type.property.additionalproperties.ExtendsDifferentSpreadStringAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get","type.property.additionalproperties.ExtendsDifferentSpreadStringAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get","type.property.additionalproperties.ExtendsDifferentSpreadStringAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put","type.property.additionalproperties.ExtendsDifferentSpreadStringAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put","type.property.additionalproperties.ExtendsDifferentSpreadStringClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString","type.property.additionalproperties.ExtendsDifferentSpreadStringClient.get":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get","type.property.additionalproperties.ExtendsDifferentSpreadStringClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get","type.property.additionalproperties.ExtendsDifferentSpreadStringClient.put":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put","type.property.additionalproperties.ExtendsDifferentSpreadStringClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put","type.property.additionalproperties.ExtendsFloatAsyncClient":"Type.Property.AdditionalProperties.ExtendsFloat","type.property.additionalproperties.ExtendsFloatAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsFloat.get","type.property.additionalproperties.ExtendsFloatAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsFloat.get","type.property.additionalproperties.ExtendsFloatAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsFloat.put","type.property.additionalproperties.ExtendsFloatAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsFloat.put","type.property.additionalproperties.ExtendsFloatClient":"Type.Property.AdditionalProperties.ExtendsFloat","type.property.additionalproperties.ExtendsFloatClient.get":"Type.Property.AdditionalProperties.ExtendsFloat.get","type.property.additionalproperties.ExtendsFloatClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsFloat.get","type.property.additionalproperties.ExtendsFloatClient.put":"Type.Property.AdditionalProperties.ExtendsFloat.put","type.property.additionalproperties.ExtendsFloatClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsFloat.put","type.property.additionalproperties.ExtendsModelArrayAsyncClient":"Type.Property.AdditionalProperties.ExtendsModelArray","type.property.additionalproperties.ExtendsModelArrayAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsModelArray.get","type.property.additionalproperties.ExtendsModelArrayAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsModelArray.get","type.property.additionalproperties.ExtendsModelArrayAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsModelArray.put","type.property.additionalproperties.ExtendsModelArrayAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsModelArray.put","type.property.additionalproperties.ExtendsModelArrayClient":"Type.Property.AdditionalProperties.ExtendsModelArray","type.property.additionalproperties.ExtendsModelArrayClient.get":"Type.Property.AdditionalProperties.ExtendsModelArray.get","type.property.additionalproperties.ExtendsModelArrayClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsModelArray.get","type.property.additionalproperties.ExtendsModelArrayClient.put":"Type.Property.AdditionalProperties.ExtendsModelArray.put","type.property.additionalproperties.ExtendsModelArrayClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsModelArray.put","type.property.additionalproperties.ExtendsModelAsyncClient":"Type.Property.AdditionalProperties.ExtendsModel","type.property.additionalproperties.ExtendsModelAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsModel.get","type.property.additionalproperties.ExtendsModelAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsModel.get","type.property.additionalproperties.ExtendsModelAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsModel.put","type.property.additionalproperties.ExtendsModelAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsModel.put","type.property.additionalproperties.ExtendsModelClient":"Type.Property.AdditionalProperties.ExtendsModel","type.property.additionalproperties.ExtendsModelClient.get":"Type.Property.AdditionalProperties.ExtendsModel.get","type.property.additionalproperties.ExtendsModelClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsModel.get","type.property.additionalproperties.ExtendsModelClient.put":"Type.Property.AdditionalProperties.ExtendsModel.put","type.property.additionalproperties.ExtendsModelClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsModel.put","type.property.additionalproperties.ExtendsStringAsyncClient":"Type.Property.AdditionalProperties.ExtendsString","type.property.additionalproperties.ExtendsStringAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsString.get","type.property.additionalproperties.ExtendsStringAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsString.get","type.property.additionalproperties.ExtendsStringAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsString.put","type.property.additionalproperties.ExtendsStringAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsString.put","type.property.additionalproperties.ExtendsStringClient":"Type.Property.AdditionalProperties.ExtendsString","type.property.additionalproperties.ExtendsStringClient.get":"Type.Property.AdditionalProperties.ExtendsString.get","type.property.additionalproperties.ExtendsStringClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsString.get","type.property.additionalproperties.ExtendsStringClient.put":"Type.Property.AdditionalProperties.ExtendsString.put","type.property.additionalproperties.ExtendsStringClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsString.put","type.property.additionalproperties.ExtendsUnknownAsyncClient":"Type.Property.AdditionalProperties.ExtendsUnknown","type.property.additionalproperties.ExtendsUnknownAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsUnknown.get","type.property.additionalproperties.ExtendsUnknownAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknown.get","type.property.additionalproperties.ExtendsUnknownAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsUnknown.put","type.property.additionalproperties.ExtendsUnknownAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknown.put","type.property.additionalproperties.ExtendsUnknownClient":"Type.Property.AdditionalProperties.ExtendsUnknown","type.property.additionalproperties.ExtendsUnknownClient.get":"Type.Property.AdditionalProperties.ExtendsUnknown.get","type.property.additionalproperties.ExtendsUnknownClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknown.get","type.property.additionalproperties.ExtendsUnknownClient.put":"Type.Property.AdditionalProperties.ExtendsUnknown.put","type.property.additionalproperties.ExtendsUnknownClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknown.put","type.property.additionalproperties.ExtendsUnknownDerivedAsyncClient":"Type.Property.AdditionalProperties.ExtendsUnknownDerived","type.property.additionalproperties.ExtendsUnknownDerivedAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsUnknownDerived.get","type.property.additionalproperties.ExtendsUnknownDerivedAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknownDerived.get","type.property.additionalproperties.ExtendsUnknownDerivedAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsUnknownDerived.put","type.property.additionalproperties.ExtendsUnknownDerivedAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknownDerived.put","type.property.additionalproperties.ExtendsUnknownDerivedClient":"Type.Property.AdditionalProperties.ExtendsUnknownDerived","type.property.additionalproperties.ExtendsUnknownDerivedClient.get":"Type.Property.AdditionalProperties.ExtendsUnknownDerived.get","type.property.additionalproperties.ExtendsUnknownDerivedClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknownDerived.get","type.property.additionalproperties.ExtendsUnknownDerivedClient.put":"Type.Property.AdditionalProperties.ExtendsUnknownDerived.put","type.property.additionalproperties.ExtendsUnknownDerivedClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknownDerived.put","type.property.additionalproperties.ExtendsUnknownDiscriminatedAsyncClient":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated","type.property.additionalproperties.ExtendsUnknownDiscriminatedAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get","type.property.additionalproperties.ExtendsUnknownDiscriminatedAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get","type.property.additionalproperties.ExtendsUnknownDiscriminatedAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put","type.property.additionalproperties.ExtendsUnknownDiscriminatedAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put","type.property.additionalproperties.ExtendsUnknownDiscriminatedClient":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated","type.property.additionalproperties.ExtendsUnknownDiscriminatedClient.get":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get","type.property.additionalproperties.ExtendsUnknownDiscriminatedClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get","type.property.additionalproperties.ExtendsUnknownDiscriminatedClient.put":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put","type.property.additionalproperties.ExtendsUnknownDiscriminatedClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put","type.property.additionalproperties.IsFloatAsyncClient":"Type.Property.AdditionalProperties.IsFloat","type.property.additionalproperties.IsFloatAsyncClient.get":"Type.Property.AdditionalProperties.IsFloat.get","type.property.additionalproperties.IsFloatAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.IsFloat.get","type.property.additionalproperties.IsFloatAsyncClient.put":"Type.Property.AdditionalProperties.IsFloat.put","type.property.additionalproperties.IsFloatAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.IsFloat.put","type.property.additionalproperties.IsFloatClient":"Type.Property.AdditionalProperties.IsFloat","type.property.additionalproperties.IsFloatClient.get":"Type.Property.AdditionalProperties.IsFloat.get","type.property.additionalproperties.IsFloatClient.getWithResponse":"Type.Property.AdditionalProperties.IsFloat.get","type.property.additionalproperties.IsFloatClient.put":"Type.Property.AdditionalProperties.IsFloat.put","type.property.additionalproperties.IsFloatClient.putWithResponse":"Type.Property.AdditionalProperties.IsFloat.put","type.property.additionalproperties.IsModelArrayAsyncClient":"Type.Property.AdditionalProperties.IsModelArray","type.property.additionalproperties.IsModelArrayAsyncClient.get":"Type.Property.AdditionalProperties.IsModelArray.get","type.property.additionalproperties.IsModelArrayAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.IsModelArray.get","type.property.additionalproperties.IsModelArrayAsyncClient.put":"Type.Property.AdditionalProperties.IsModelArray.put","type.property.additionalproperties.IsModelArrayAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.IsModelArray.put","type.property.additionalproperties.IsModelArrayClient":"Type.Property.AdditionalProperties.IsModelArray","type.property.additionalproperties.IsModelArrayClient.get":"Type.Property.AdditionalProperties.IsModelArray.get","type.property.additionalproperties.IsModelArrayClient.getWithResponse":"Type.Property.AdditionalProperties.IsModelArray.get","type.property.additionalproperties.IsModelArrayClient.put":"Type.Property.AdditionalProperties.IsModelArray.put","type.property.additionalproperties.IsModelArrayClient.putWithResponse":"Type.Property.AdditionalProperties.IsModelArray.put","type.property.additionalproperties.IsModelAsyncClient":"Type.Property.AdditionalProperties.IsModel","type.property.additionalproperties.IsModelAsyncClient.get":"Type.Property.AdditionalProperties.IsModel.get","type.property.additionalproperties.IsModelAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.IsModel.get","type.property.additionalproperties.IsModelAsyncClient.put":"Type.Property.AdditionalProperties.IsModel.put","type.property.additionalproperties.IsModelAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.IsModel.put","type.property.additionalproperties.IsModelClient":"Type.Property.AdditionalProperties.IsModel","type.property.additionalproperties.IsModelClient.get":"Type.Property.AdditionalProperties.IsModel.get","type.property.additionalproperties.IsModelClient.getWithResponse":"Type.Property.AdditionalProperties.IsModel.get","type.property.additionalproperties.IsModelClient.put":"Type.Property.AdditionalProperties.IsModel.put","type.property.additionalproperties.IsModelClient.putWithResponse":"Type.Property.AdditionalProperties.IsModel.put","type.property.additionalproperties.IsStringAsyncClient":"Type.Property.AdditionalProperties.IsString","type.property.additionalproperties.IsStringAsyncClient.get":"Type.Property.AdditionalProperties.IsString.get","type.property.additionalproperties.IsStringAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.IsString.get","type.property.additionalproperties.IsStringAsyncClient.put":"Type.Property.AdditionalProperties.IsString.put","type.property.additionalproperties.IsStringAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.IsString.put","type.property.additionalproperties.IsStringClient":"Type.Property.AdditionalProperties.IsString","type.property.additionalproperties.IsStringClient.get":"Type.Property.AdditionalProperties.IsString.get","type.property.additionalproperties.IsStringClient.getWithResponse":"Type.Property.AdditionalProperties.IsString.get","type.property.additionalproperties.IsStringClient.put":"Type.Property.AdditionalProperties.IsString.put","type.property.additionalproperties.IsStringClient.putWithResponse":"Type.Property.AdditionalProperties.IsString.put","type.property.additionalproperties.IsUnknownAsyncClient":"Type.Property.AdditionalProperties.IsUnknown","type.property.additionalproperties.IsUnknownAsyncClient.get":"Type.Property.AdditionalProperties.IsUnknown.get","type.property.additionalproperties.IsUnknownAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.IsUnknown.get","type.property.additionalproperties.IsUnknownAsyncClient.put":"Type.Property.AdditionalProperties.IsUnknown.put","type.property.additionalproperties.IsUnknownAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.IsUnknown.put","type.property.additionalproperties.IsUnknownClient":"Type.Property.AdditionalProperties.IsUnknown","type.property.additionalproperties.IsUnknownClient.get":"Type.Property.AdditionalProperties.IsUnknown.get","type.property.additionalproperties.IsUnknownClient.getWithResponse":"Type.Property.AdditionalProperties.IsUnknown.get","type.property.additionalproperties.IsUnknownClient.put":"Type.Property.AdditionalProperties.IsUnknown.put","type.property.additionalproperties.IsUnknownClient.putWithResponse":"Type.Property.AdditionalProperties.IsUnknown.put","type.property.additionalproperties.IsUnknownDerivedAsyncClient":"Type.Property.AdditionalProperties.IsUnknownDerived","type.property.additionalproperties.IsUnknownDerivedAsyncClient.get":"Type.Property.AdditionalProperties.IsUnknownDerived.get","type.property.additionalproperties.IsUnknownDerivedAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.IsUnknownDerived.get","type.property.additionalproperties.IsUnknownDerivedAsyncClient.put":"Type.Property.AdditionalProperties.IsUnknownDerived.put","type.property.additionalproperties.IsUnknownDerivedAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.IsUnknownDerived.put","type.property.additionalproperties.IsUnknownDerivedClient":"Type.Property.AdditionalProperties.IsUnknownDerived","type.property.additionalproperties.IsUnknownDerivedClient.get":"Type.Property.AdditionalProperties.IsUnknownDerived.get","type.property.additionalproperties.IsUnknownDerivedClient.getWithResponse":"Type.Property.AdditionalProperties.IsUnknownDerived.get","type.property.additionalproperties.IsUnknownDerivedClient.put":"Type.Property.AdditionalProperties.IsUnknownDerived.put","type.property.additionalproperties.IsUnknownDerivedClient.putWithResponse":"Type.Property.AdditionalProperties.IsUnknownDerived.put","type.property.additionalproperties.IsUnknownDiscriminatedAsyncClient":"Type.Property.AdditionalProperties.IsUnknownDiscriminated","type.property.additionalproperties.IsUnknownDiscriminatedAsyncClient.get":"Type.Property.AdditionalProperties.IsUnknownDiscriminated.get","type.property.additionalproperties.IsUnknownDiscriminatedAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.IsUnknownDiscriminated.get","type.property.additionalproperties.IsUnknownDiscriminatedAsyncClient.put":"Type.Property.AdditionalProperties.IsUnknownDiscriminated.put","type.property.additionalproperties.IsUnknownDiscriminatedAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.IsUnknownDiscriminated.put","type.property.additionalproperties.IsUnknownDiscriminatedClient":"Type.Property.AdditionalProperties.IsUnknownDiscriminated","type.property.additionalproperties.IsUnknownDiscriminatedClient.get":"Type.Property.AdditionalProperties.IsUnknownDiscriminated.get","type.property.additionalproperties.IsUnknownDiscriminatedClient.getWithResponse":"Type.Property.AdditionalProperties.IsUnknownDiscriminated.get","type.property.additionalproperties.IsUnknownDiscriminatedClient.put":"Type.Property.AdditionalProperties.IsUnknownDiscriminated.put","type.property.additionalproperties.IsUnknownDiscriminatedClient.putWithResponse":"Type.Property.AdditionalProperties.IsUnknownDiscriminated.put","type.property.additionalproperties.MultipleSpreadAsyncClient":"Type.Property.AdditionalProperties.MultipleSpread","type.property.additionalproperties.MultipleSpreadAsyncClient.get":"Type.Property.AdditionalProperties.MultipleSpread.get","type.property.additionalproperties.MultipleSpreadAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.MultipleSpread.get","type.property.additionalproperties.MultipleSpreadAsyncClient.put":"Type.Property.AdditionalProperties.MultipleSpread.put","type.property.additionalproperties.MultipleSpreadAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.MultipleSpread.put","type.property.additionalproperties.MultipleSpreadClient":"Type.Property.AdditionalProperties.MultipleSpread","type.property.additionalproperties.MultipleSpreadClient.get":"Type.Property.AdditionalProperties.MultipleSpread.get","type.property.additionalproperties.MultipleSpreadClient.getWithResponse":"Type.Property.AdditionalProperties.MultipleSpread.get","type.property.additionalproperties.MultipleSpreadClient.put":"Type.Property.AdditionalProperties.MultipleSpread.put","type.property.additionalproperties.MultipleSpreadClient.putWithResponse":"Type.Property.AdditionalProperties.MultipleSpread.put","type.property.additionalproperties.SpreadDifferentFloatAsyncClient":"Type.Property.AdditionalProperties.SpreadDifferentFloat","type.property.additionalproperties.SpreadDifferentFloatAsyncClient.get":"Type.Property.AdditionalProperties.SpreadDifferentFloat.get","type.property.additionalproperties.SpreadDifferentFloatAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentFloat.get","type.property.additionalproperties.SpreadDifferentFloatAsyncClient.put":"Type.Property.AdditionalProperties.SpreadDifferentFloat.put","type.property.additionalproperties.SpreadDifferentFloatAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentFloat.put","type.property.additionalproperties.SpreadDifferentFloatClient":"Type.Property.AdditionalProperties.SpreadDifferentFloat","type.property.additionalproperties.SpreadDifferentFloatClient.get":"Type.Property.AdditionalProperties.SpreadDifferentFloat.get","type.property.additionalproperties.SpreadDifferentFloatClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentFloat.get","type.property.additionalproperties.SpreadDifferentFloatClient.put":"Type.Property.AdditionalProperties.SpreadDifferentFloat.put","type.property.additionalproperties.SpreadDifferentFloatClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentFloat.put","type.property.additionalproperties.SpreadDifferentModelArrayAsyncClient":"Type.Property.AdditionalProperties.SpreadDifferentModelArray","type.property.additionalproperties.SpreadDifferentModelArrayAsyncClient.get":"Type.Property.AdditionalProperties.SpreadDifferentModelArray.get","type.property.additionalproperties.SpreadDifferentModelArrayAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentModelArray.get","type.property.additionalproperties.SpreadDifferentModelArrayAsyncClient.put":"Type.Property.AdditionalProperties.SpreadDifferentModelArray.put","type.property.additionalproperties.SpreadDifferentModelArrayAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentModelArray.put","type.property.additionalproperties.SpreadDifferentModelArrayClient":"Type.Property.AdditionalProperties.SpreadDifferentModelArray","type.property.additionalproperties.SpreadDifferentModelArrayClient.get":"Type.Property.AdditionalProperties.SpreadDifferentModelArray.get","type.property.additionalproperties.SpreadDifferentModelArrayClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentModelArray.get","type.property.additionalproperties.SpreadDifferentModelArrayClient.put":"Type.Property.AdditionalProperties.SpreadDifferentModelArray.put","type.property.additionalproperties.SpreadDifferentModelArrayClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentModelArray.put","type.property.additionalproperties.SpreadDifferentModelAsyncClient":"Type.Property.AdditionalProperties.SpreadDifferentModel","type.property.additionalproperties.SpreadDifferentModelAsyncClient.get":"Type.Property.AdditionalProperties.SpreadDifferentModel.get","type.property.additionalproperties.SpreadDifferentModelAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentModel.get","type.property.additionalproperties.SpreadDifferentModelAsyncClient.put":"Type.Property.AdditionalProperties.SpreadDifferentModel.put","type.property.additionalproperties.SpreadDifferentModelAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentModel.put","type.property.additionalproperties.SpreadDifferentModelClient":"Type.Property.AdditionalProperties.SpreadDifferentModel","type.property.additionalproperties.SpreadDifferentModelClient.get":"Type.Property.AdditionalProperties.SpreadDifferentModel.get","type.property.additionalproperties.SpreadDifferentModelClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentModel.get","type.property.additionalproperties.SpreadDifferentModelClient.put":"Type.Property.AdditionalProperties.SpreadDifferentModel.put","type.property.additionalproperties.SpreadDifferentModelClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentModel.put","type.property.additionalproperties.SpreadDifferentStringAsyncClient":"Type.Property.AdditionalProperties.SpreadDifferentString","type.property.additionalproperties.SpreadDifferentStringAsyncClient.get":"Type.Property.AdditionalProperties.SpreadDifferentString.get","type.property.additionalproperties.SpreadDifferentStringAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentString.get","type.property.additionalproperties.SpreadDifferentStringAsyncClient.put":"Type.Property.AdditionalProperties.SpreadDifferentString.put","type.property.additionalproperties.SpreadDifferentStringAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentString.put","type.property.additionalproperties.SpreadDifferentStringClient":"Type.Property.AdditionalProperties.SpreadDifferentString","type.property.additionalproperties.SpreadDifferentStringClient.get":"Type.Property.AdditionalProperties.SpreadDifferentString.get","type.property.additionalproperties.SpreadDifferentStringClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentString.get","type.property.additionalproperties.SpreadDifferentStringClient.put":"Type.Property.AdditionalProperties.SpreadDifferentString.put","type.property.additionalproperties.SpreadDifferentStringClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentString.put","type.property.additionalproperties.SpreadFloatAsyncClient":"Type.Property.AdditionalProperties.SpreadFloat","type.property.additionalproperties.SpreadFloatAsyncClient.get":"Type.Property.AdditionalProperties.SpreadFloat.get","type.property.additionalproperties.SpreadFloatAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadFloat.get","type.property.additionalproperties.SpreadFloatAsyncClient.put":"Type.Property.AdditionalProperties.SpreadFloat.put","type.property.additionalproperties.SpreadFloatAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadFloat.put","type.property.additionalproperties.SpreadFloatClient":"Type.Property.AdditionalProperties.SpreadFloat","type.property.additionalproperties.SpreadFloatClient.get":"Type.Property.AdditionalProperties.SpreadFloat.get","type.property.additionalproperties.SpreadFloatClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadFloat.get","type.property.additionalproperties.SpreadFloatClient.put":"Type.Property.AdditionalProperties.SpreadFloat.put","type.property.additionalproperties.SpreadFloatClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadFloat.put","type.property.additionalproperties.SpreadModelArrayAsyncClient":"Type.Property.AdditionalProperties.SpreadModelArray","type.property.additionalproperties.SpreadModelArrayAsyncClient.get":"Type.Property.AdditionalProperties.SpreadModelArray.get","type.property.additionalproperties.SpreadModelArrayAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadModelArray.get","type.property.additionalproperties.SpreadModelArrayAsyncClient.put":"Type.Property.AdditionalProperties.SpreadModelArray.put","type.property.additionalproperties.SpreadModelArrayAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadModelArray.put","type.property.additionalproperties.SpreadModelArrayClient":"Type.Property.AdditionalProperties.SpreadModelArray","type.property.additionalproperties.SpreadModelArrayClient.get":"Type.Property.AdditionalProperties.SpreadModelArray.get","type.property.additionalproperties.SpreadModelArrayClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadModelArray.get","type.property.additionalproperties.SpreadModelArrayClient.put":"Type.Property.AdditionalProperties.SpreadModelArray.put","type.property.additionalproperties.SpreadModelArrayClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadModelArray.put","type.property.additionalproperties.SpreadModelAsyncClient":"Type.Property.AdditionalProperties.SpreadModel","type.property.additionalproperties.SpreadModelAsyncClient.get":"Type.Property.AdditionalProperties.SpreadModel.get","type.property.additionalproperties.SpreadModelAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadModel.get","type.property.additionalproperties.SpreadModelAsyncClient.put":"Type.Property.AdditionalProperties.SpreadModel.put","type.property.additionalproperties.SpreadModelAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadModel.put","type.property.additionalproperties.SpreadModelClient":"Type.Property.AdditionalProperties.SpreadModel","type.property.additionalproperties.SpreadModelClient.get":"Type.Property.AdditionalProperties.SpreadModel.get","type.property.additionalproperties.SpreadModelClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadModel.get","type.property.additionalproperties.SpreadModelClient.put":"Type.Property.AdditionalProperties.SpreadModel.put","type.property.additionalproperties.SpreadModelClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadModel.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2AsyncClient":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2AsyncClient.get":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2AsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2AsyncClient.put":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2AsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2Client":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2Client.get":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2Client.getWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2Client.put":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2Client.putWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3AsyncClient":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3AsyncClient.get":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3AsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3AsyncClient.put":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3AsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3Client":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3Client.get":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3Client.getWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3Client.put":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3Client.putWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionAsyncClient":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionAsyncClient.get":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionAsyncClient.put":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionClient":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionClient.get":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionClient.put":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put","type.property.additionalproperties.SpreadRecordUnionAsyncClient":"Type.Property.AdditionalProperties.SpreadRecordUnion","type.property.additionalproperties.SpreadRecordUnionAsyncClient.get":"Type.Property.AdditionalProperties.SpreadRecordUnion.get","type.property.additionalproperties.SpreadRecordUnionAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadRecordUnion.get","type.property.additionalproperties.SpreadRecordUnionAsyncClient.put":"Type.Property.AdditionalProperties.SpreadRecordUnion.put","type.property.additionalproperties.SpreadRecordUnionAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadRecordUnion.put","type.property.additionalproperties.SpreadRecordUnionClient":"Type.Property.AdditionalProperties.SpreadRecordUnion","type.property.additionalproperties.SpreadRecordUnionClient.get":"Type.Property.AdditionalProperties.SpreadRecordUnion.get","type.property.additionalproperties.SpreadRecordUnionClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadRecordUnion.get","type.property.additionalproperties.SpreadRecordUnionClient.put":"Type.Property.AdditionalProperties.SpreadRecordUnion.put","type.property.additionalproperties.SpreadRecordUnionClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadRecordUnion.put","type.property.additionalproperties.SpreadStringAsyncClient":"Type.Property.AdditionalProperties.SpreadString","type.property.additionalproperties.SpreadStringAsyncClient.get":"Type.Property.AdditionalProperties.SpreadString.get","type.property.additionalproperties.SpreadStringAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadString.get","type.property.additionalproperties.SpreadStringAsyncClient.put":"Type.Property.AdditionalProperties.SpreadString.put","type.property.additionalproperties.SpreadStringAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadString.put","type.property.additionalproperties.SpreadStringClient":"Type.Property.AdditionalProperties.SpreadString","type.property.additionalproperties.SpreadStringClient.get":"Type.Property.AdditionalProperties.SpreadString.get","type.property.additionalproperties.SpreadStringClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadString.get","type.property.additionalproperties.SpreadStringClient.put":"Type.Property.AdditionalProperties.SpreadString.put","type.property.additionalproperties.SpreadStringClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadString.put","type.property.additionalproperties.models.DifferentSpreadFloatDerived":"Type.Property.AdditionalProperties.DifferentSpreadFloatDerived","type.property.additionalproperties.models.DifferentSpreadFloatRecord":"Type.Property.AdditionalProperties.DifferentSpreadFloatRecord","type.property.additionalproperties.models.DifferentSpreadModelArrayDerived":"Type.Property.AdditionalProperties.DifferentSpreadModelArrayDerived","type.property.additionalproperties.models.DifferentSpreadModelArrayRecord":"Type.Property.AdditionalProperties.DifferentSpreadModelArrayRecord","type.property.additionalproperties.models.DifferentSpreadModelDerived":"Type.Property.AdditionalProperties.DifferentSpreadModelDerived","type.property.additionalproperties.models.DifferentSpreadModelRecord":"Type.Property.AdditionalProperties.DifferentSpreadModelRecord","type.property.additionalproperties.models.DifferentSpreadStringDerived":"Type.Property.AdditionalProperties.DifferentSpreadStringDerived","type.property.additionalproperties.models.DifferentSpreadStringRecord":"Type.Property.AdditionalProperties.DifferentSpreadStringRecord","type.property.additionalproperties.models.ExtendsFloatAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsFloatAdditionalProperties","type.property.additionalproperties.models.ExtendsModelAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsModelAdditionalProperties","type.property.additionalproperties.models.ExtendsModelArrayAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsModelArrayAdditionalProperties","type.property.additionalproperties.models.ExtendsStringAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsStringAdditionalProperties","type.property.additionalproperties.models.ExtendsUnknownAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsUnknownAdditionalProperties","type.property.additionalproperties.models.ExtendsUnknownAdditionalPropertiesDerived":"Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDerived","type.property.additionalproperties.models.ExtendsUnknownAdditionalPropertiesDiscriminated":"Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDiscriminated","type.property.additionalproperties.models.ExtendsUnknownAdditionalPropertiesDiscriminatedDerived":"Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDiscriminatedDerived","type.property.additionalproperties.models.IsFloatAdditionalProperties":"Type.Property.AdditionalProperties.IsFloatAdditionalProperties","type.property.additionalproperties.models.IsModelAdditionalProperties":"Type.Property.AdditionalProperties.IsModelAdditionalProperties","type.property.additionalproperties.models.IsModelArrayAdditionalProperties":"Type.Property.AdditionalProperties.IsModelArrayAdditionalProperties","type.property.additionalproperties.models.IsStringAdditionalProperties":"Type.Property.AdditionalProperties.IsStringAdditionalProperties","type.property.additionalproperties.models.IsUnknownAdditionalProperties":"Type.Property.AdditionalProperties.IsUnknownAdditionalProperties","type.property.additionalproperties.models.IsUnknownAdditionalPropertiesDerived":"Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDerived","type.property.additionalproperties.models.IsUnknownAdditionalPropertiesDiscriminated":"Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDiscriminated","type.property.additionalproperties.models.IsUnknownAdditionalPropertiesDiscriminatedDerived":"Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDiscriminatedDerived","type.property.additionalproperties.models.ModelForRecord":"Type.Property.AdditionalProperties.ModelForRecord","type.property.additionalproperties.models.MultipleSpreadRecord":"Type.Property.AdditionalProperties.MultipleSpreadRecord","type.property.additionalproperties.models.SpreadFloatRecord":"Type.Property.AdditionalProperties.SpreadFloatRecord","type.property.additionalproperties.models.SpreadModelArrayRecord":"Type.Property.AdditionalProperties.SpreadModelArrayRecord","type.property.additionalproperties.models.SpreadModelRecord":"Type.Property.AdditionalProperties.SpreadModelRecord","type.property.additionalproperties.models.SpreadRecordForNonDiscriminatedUnion":"Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion","type.property.additionalproperties.models.SpreadRecordForNonDiscriminatedUnion2":"Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion2","type.property.additionalproperties.models.SpreadRecordForNonDiscriminatedUnion3":"Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion3","type.property.additionalproperties.models.SpreadRecordForUnion":"Type.Property.AdditionalProperties.SpreadRecordForUnion","type.property.additionalproperties.models.SpreadStringRecord":"Type.Property.AdditionalProperties.SpreadStringRecord","type.property.additionalproperties.models.WidgetData0":"Type.Property.AdditionalProperties.WidgetData0","type.property.additionalproperties.models.WidgetData1":"Type.Property.AdditionalProperties.WidgetData1","type.property.additionalproperties.models.WidgetData2":"Type.Property.AdditionalProperties.WidgetData2"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/property/additionalproperties/AdditionalPropertiesClientBuilder.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadFloatAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadFloatClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelArrayAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelArrayClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadStringAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadStringClient.java","src/main/java/type/property/additionalproperties/ExtendsFloatAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsFloatClient.java","src/main/java/type/property/additionalproperties/ExtendsModelArrayAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsModelArrayClient.java","src/main/java/type/property/additionalproperties/ExtendsModelAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsModelClient.java","src/main/java/type/property/additionalproperties/ExtendsStringAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsStringClient.java","src/main/java/type/property/additionalproperties/ExtendsUnknownAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsUnknownClient.java","src/main/java/type/property/additionalproperties/ExtendsUnknownDerivedAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsUnknownDerivedClient.java","src/main/java/type/property/additionalproperties/ExtendsUnknownDiscriminatedAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsUnknownDiscriminatedClient.java","src/main/java/type/property/additionalproperties/IsFloatAsyncClient.java","src/main/java/type/property/additionalproperties/IsFloatClient.java","src/main/java/type/property/additionalproperties/IsModelArrayAsyncClient.java","src/main/java/type/property/additionalproperties/IsModelArrayClient.java","src/main/java/type/property/additionalproperties/IsModelAsyncClient.java","src/main/java/type/property/additionalproperties/IsModelClient.java","src/main/java/type/property/additionalproperties/IsStringAsyncClient.java","src/main/java/type/property/additionalproperties/IsStringClient.java","src/main/java/type/property/additionalproperties/IsUnknownAsyncClient.java","src/main/java/type/property/additionalproperties/IsUnknownClient.java","src/main/java/type/property/additionalproperties/IsUnknownDerivedAsyncClient.java","src/main/java/type/property/additionalproperties/IsUnknownDerivedClient.java","src/main/java/type/property/additionalproperties/IsUnknownDiscriminatedAsyncClient.java","src/main/java/type/property/additionalproperties/IsUnknownDiscriminatedClient.java","src/main/java/type/property/additionalproperties/MultipleSpreadAsyncClient.java","src/main/java/type/property/additionalproperties/MultipleSpreadClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentFloatAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentFloatClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentModelArrayAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentModelArrayClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentModelAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentModelClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentStringAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentStringClient.java","src/main/java/type/property/additionalproperties/SpreadFloatAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadFloatClient.java","src/main/java/type/property/additionalproperties/SpreadModelArrayAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadModelArrayClient.java","src/main/java/type/property/additionalproperties/SpreadModelAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadModelClient.java","src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion2AsyncClient.java","src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion2Client.java","src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion3AsyncClient.java","src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion3Client.java","src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnionAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnionClient.java","src/main/java/type/property/additionalproperties/SpreadRecordUnionAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadRecordUnionClient.java","src/main/java/type/property/additionalproperties/SpreadStringAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadStringClient.java","src/main/java/type/property/additionalproperties/implementation/AdditionalPropertiesClientImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownDerivedsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownDiscriminatedsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/IsModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsUnknownDerivedsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsUnknownDiscriminatedsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsUnknownsImpl.java","src/main/java/type/property/additionalproperties/implementation/MultipleSpreadsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadDifferentFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadDifferentModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadDifferentModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadDifferentStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnion2sImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnion3sImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnionsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadRecordUnionsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/package-info.java","src/main/java/type/property/additionalproperties/models/DifferentSpreadFloatDerived.java","src/main/java/type/property/additionalproperties/models/DifferentSpreadFloatRecord.java","src/main/java/type/property/additionalproperties/models/DifferentSpreadModelArrayDerived.java","src/main/java/type/property/additionalproperties/models/DifferentSpreadModelArrayRecord.java","src/main/java/type/property/additionalproperties/models/DifferentSpreadModelDerived.java","src/main/java/type/property/additionalproperties/models/DifferentSpreadModelRecord.java","src/main/java/type/property/additionalproperties/models/DifferentSpreadStringDerived.java","src/main/java/type/property/additionalproperties/models/DifferentSpreadStringRecord.java","src/main/java/type/property/additionalproperties/models/ExtendsFloatAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/ExtendsModelAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/ExtendsModelArrayAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/ExtendsStringAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/ExtendsUnknownAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/ExtendsUnknownAdditionalPropertiesDerived.java","src/main/java/type/property/additionalproperties/models/ExtendsUnknownAdditionalPropertiesDiscriminated.java","src/main/java/type/property/additionalproperties/models/ExtendsUnknownAdditionalPropertiesDiscriminatedDerived.java","src/main/java/type/property/additionalproperties/models/IsFloatAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/IsModelAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/IsModelArrayAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/IsStringAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/IsUnknownAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/IsUnknownAdditionalPropertiesDerived.java","src/main/java/type/property/additionalproperties/models/IsUnknownAdditionalPropertiesDiscriminated.java","src/main/java/type/property/additionalproperties/models/IsUnknownAdditionalPropertiesDiscriminatedDerived.java","src/main/java/type/property/additionalproperties/models/ModelForRecord.java","src/main/java/type/property/additionalproperties/models/MultipleSpreadRecord.java","src/main/java/type/property/additionalproperties/models/SpreadFloatRecord.java","src/main/java/type/property/additionalproperties/models/SpreadModelArrayRecord.java","src/main/java/type/property/additionalproperties/models/SpreadModelRecord.java","src/main/java/type/property/additionalproperties/models/SpreadRecordForNonDiscriminatedUnion.java","src/main/java/type/property/additionalproperties/models/SpreadRecordForNonDiscriminatedUnion2.java","src/main/java/type/property/additionalproperties/models/SpreadRecordForNonDiscriminatedUnion3.java","src/main/java/type/property/additionalproperties/models/SpreadRecordForUnion.java","src/main/java/type/property/additionalproperties/models/SpreadStringRecord.java","src/main/java/type/property/additionalproperties/models/WidgetData0.java","src/main/java/type/property/additionalproperties/models/WidgetData1.java","src/main/java/type/property/additionalproperties/models/WidgetData2.java","src/main/java/type/property/additionalproperties/models/package-info.java","src/main/java/type/property/additionalproperties/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.property.additionalproperties.AdditionalPropertiesClientBuilder":"Type.Property.AdditionalProperties","type.property.additionalproperties.ExtendsDifferentSpreadFloatAsyncClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat","type.property.additionalproperties.ExtendsDifferentSpreadFloatAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get","type.property.additionalproperties.ExtendsDifferentSpreadFloatAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get","type.property.additionalproperties.ExtendsDifferentSpreadFloatAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put","type.property.additionalproperties.ExtendsDifferentSpreadFloatAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put","type.property.additionalproperties.ExtendsDifferentSpreadFloatClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat","type.property.additionalproperties.ExtendsDifferentSpreadFloatClient.get":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get","type.property.additionalproperties.ExtendsDifferentSpreadFloatClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get","type.property.additionalproperties.ExtendsDifferentSpreadFloatClient.put":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put","type.property.additionalproperties.ExtendsDifferentSpreadFloatClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayAsyncClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayClient.get":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayClient.put":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put","type.property.additionalproperties.ExtendsDifferentSpreadModelArrayClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put","type.property.additionalproperties.ExtendsDifferentSpreadModelAsyncClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel","type.property.additionalproperties.ExtendsDifferentSpreadModelAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get","type.property.additionalproperties.ExtendsDifferentSpreadModelAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get","type.property.additionalproperties.ExtendsDifferentSpreadModelAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put","type.property.additionalproperties.ExtendsDifferentSpreadModelAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put","type.property.additionalproperties.ExtendsDifferentSpreadModelClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel","type.property.additionalproperties.ExtendsDifferentSpreadModelClient.get":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get","type.property.additionalproperties.ExtendsDifferentSpreadModelClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get","type.property.additionalproperties.ExtendsDifferentSpreadModelClient.put":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put","type.property.additionalproperties.ExtendsDifferentSpreadModelClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put","type.property.additionalproperties.ExtendsDifferentSpreadStringAsyncClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString","type.property.additionalproperties.ExtendsDifferentSpreadStringAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get","type.property.additionalproperties.ExtendsDifferentSpreadStringAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get","type.property.additionalproperties.ExtendsDifferentSpreadStringAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put","type.property.additionalproperties.ExtendsDifferentSpreadStringAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put","type.property.additionalproperties.ExtendsDifferentSpreadStringClient":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString","type.property.additionalproperties.ExtendsDifferentSpreadStringClient.get":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get","type.property.additionalproperties.ExtendsDifferentSpreadStringClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get","type.property.additionalproperties.ExtendsDifferentSpreadStringClient.put":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put","type.property.additionalproperties.ExtendsDifferentSpreadStringClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put","type.property.additionalproperties.ExtendsFloatAsyncClient":"Type.Property.AdditionalProperties.ExtendsFloat","type.property.additionalproperties.ExtendsFloatAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsFloat.get","type.property.additionalproperties.ExtendsFloatAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsFloat.get","type.property.additionalproperties.ExtendsFloatAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsFloat.put","type.property.additionalproperties.ExtendsFloatAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsFloat.put","type.property.additionalproperties.ExtendsFloatClient":"Type.Property.AdditionalProperties.ExtendsFloat","type.property.additionalproperties.ExtendsFloatClient.get":"Type.Property.AdditionalProperties.ExtendsFloat.get","type.property.additionalproperties.ExtendsFloatClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsFloat.get","type.property.additionalproperties.ExtendsFloatClient.put":"Type.Property.AdditionalProperties.ExtendsFloat.put","type.property.additionalproperties.ExtendsFloatClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsFloat.put","type.property.additionalproperties.ExtendsModelArrayAsyncClient":"Type.Property.AdditionalProperties.ExtendsModelArray","type.property.additionalproperties.ExtendsModelArrayAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsModelArray.get","type.property.additionalproperties.ExtendsModelArrayAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsModelArray.get","type.property.additionalproperties.ExtendsModelArrayAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsModelArray.put","type.property.additionalproperties.ExtendsModelArrayAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsModelArray.put","type.property.additionalproperties.ExtendsModelArrayClient":"Type.Property.AdditionalProperties.ExtendsModelArray","type.property.additionalproperties.ExtendsModelArrayClient.get":"Type.Property.AdditionalProperties.ExtendsModelArray.get","type.property.additionalproperties.ExtendsModelArrayClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsModelArray.get","type.property.additionalproperties.ExtendsModelArrayClient.put":"Type.Property.AdditionalProperties.ExtendsModelArray.put","type.property.additionalproperties.ExtendsModelArrayClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsModelArray.put","type.property.additionalproperties.ExtendsModelAsyncClient":"Type.Property.AdditionalProperties.ExtendsModel","type.property.additionalproperties.ExtendsModelAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsModel.get","type.property.additionalproperties.ExtendsModelAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsModel.get","type.property.additionalproperties.ExtendsModelAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsModel.put","type.property.additionalproperties.ExtendsModelAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsModel.put","type.property.additionalproperties.ExtendsModelClient":"Type.Property.AdditionalProperties.ExtendsModel","type.property.additionalproperties.ExtendsModelClient.get":"Type.Property.AdditionalProperties.ExtendsModel.get","type.property.additionalproperties.ExtendsModelClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsModel.get","type.property.additionalproperties.ExtendsModelClient.put":"Type.Property.AdditionalProperties.ExtendsModel.put","type.property.additionalproperties.ExtendsModelClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsModel.put","type.property.additionalproperties.ExtendsStringAsyncClient":"Type.Property.AdditionalProperties.ExtendsString","type.property.additionalproperties.ExtendsStringAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsString.get","type.property.additionalproperties.ExtendsStringAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsString.get","type.property.additionalproperties.ExtendsStringAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsString.put","type.property.additionalproperties.ExtendsStringAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsString.put","type.property.additionalproperties.ExtendsStringClient":"Type.Property.AdditionalProperties.ExtendsString","type.property.additionalproperties.ExtendsStringClient.get":"Type.Property.AdditionalProperties.ExtendsString.get","type.property.additionalproperties.ExtendsStringClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsString.get","type.property.additionalproperties.ExtendsStringClient.put":"Type.Property.AdditionalProperties.ExtendsString.put","type.property.additionalproperties.ExtendsStringClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsString.put","type.property.additionalproperties.ExtendsUnknownAsyncClient":"Type.Property.AdditionalProperties.ExtendsUnknown","type.property.additionalproperties.ExtendsUnknownAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsUnknown.get","type.property.additionalproperties.ExtendsUnknownAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknown.get","type.property.additionalproperties.ExtendsUnknownAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsUnknown.put","type.property.additionalproperties.ExtendsUnknownAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknown.put","type.property.additionalproperties.ExtendsUnknownClient":"Type.Property.AdditionalProperties.ExtendsUnknown","type.property.additionalproperties.ExtendsUnknownClient.get":"Type.Property.AdditionalProperties.ExtendsUnknown.get","type.property.additionalproperties.ExtendsUnknownClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknown.get","type.property.additionalproperties.ExtendsUnknownClient.put":"Type.Property.AdditionalProperties.ExtendsUnknown.put","type.property.additionalproperties.ExtendsUnknownClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknown.put","type.property.additionalproperties.ExtendsUnknownDerivedAsyncClient":"Type.Property.AdditionalProperties.ExtendsUnknownDerived","type.property.additionalproperties.ExtendsUnknownDerivedAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsUnknownDerived.get","type.property.additionalproperties.ExtendsUnknownDerivedAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknownDerived.get","type.property.additionalproperties.ExtendsUnknownDerivedAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsUnknownDerived.put","type.property.additionalproperties.ExtendsUnknownDerivedAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknownDerived.put","type.property.additionalproperties.ExtendsUnknownDerivedClient":"Type.Property.AdditionalProperties.ExtendsUnknownDerived","type.property.additionalproperties.ExtendsUnknownDerivedClient.get":"Type.Property.AdditionalProperties.ExtendsUnknownDerived.get","type.property.additionalproperties.ExtendsUnknownDerivedClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknownDerived.get","type.property.additionalproperties.ExtendsUnknownDerivedClient.put":"Type.Property.AdditionalProperties.ExtendsUnknownDerived.put","type.property.additionalproperties.ExtendsUnknownDerivedClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknownDerived.put","type.property.additionalproperties.ExtendsUnknownDiscriminatedAsyncClient":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated","type.property.additionalproperties.ExtendsUnknownDiscriminatedAsyncClient.get":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get","type.property.additionalproperties.ExtendsUnknownDiscriminatedAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get","type.property.additionalproperties.ExtendsUnknownDiscriminatedAsyncClient.put":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put","type.property.additionalproperties.ExtendsUnknownDiscriminatedAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put","type.property.additionalproperties.ExtendsUnknownDiscriminatedClient":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated","type.property.additionalproperties.ExtendsUnknownDiscriminatedClient.get":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get","type.property.additionalproperties.ExtendsUnknownDiscriminatedClient.getWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get","type.property.additionalproperties.ExtendsUnknownDiscriminatedClient.put":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put","type.property.additionalproperties.ExtendsUnknownDiscriminatedClient.putWithResponse":"Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put","type.property.additionalproperties.IsFloatAsyncClient":"Type.Property.AdditionalProperties.IsFloat","type.property.additionalproperties.IsFloatAsyncClient.get":"Type.Property.AdditionalProperties.IsFloat.get","type.property.additionalproperties.IsFloatAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.IsFloat.get","type.property.additionalproperties.IsFloatAsyncClient.put":"Type.Property.AdditionalProperties.IsFloat.put","type.property.additionalproperties.IsFloatAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.IsFloat.put","type.property.additionalproperties.IsFloatClient":"Type.Property.AdditionalProperties.IsFloat","type.property.additionalproperties.IsFloatClient.get":"Type.Property.AdditionalProperties.IsFloat.get","type.property.additionalproperties.IsFloatClient.getWithResponse":"Type.Property.AdditionalProperties.IsFloat.get","type.property.additionalproperties.IsFloatClient.put":"Type.Property.AdditionalProperties.IsFloat.put","type.property.additionalproperties.IsFloatClient.putWithResponse":"Type.Property.AdditionalProperties.IsFloat.put","type.property.additionalproperties.IsModelArrayAsyncClient":"Type.Property.AdditionalProperties.IsModelArray","type.property.additionalproperties.IsModelArrayAsyncClient.get":"Type.Property.AdditionalProperties.IsModelArray.get","type.property.additionalproperties.IsModelArrayAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.IsModelArray.get","type.property.additionalproperties.IsModelArrayAsyncClient.put":"Type.Property.AdditionalProperties.IsModelArray.put","type.property.additionalproperties.IsModelArrayAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.IsModelArray.put","type.property.additionalproperties.IsModelArrayClient":"Type.Property.AdditionalProperties.IsModelArray","type.property.additionalproperties.IsModelArrayClient.get":"Type.Property.AdditionalProperties.IsModelArray.get","type.property.additionalproperties.IsModelArrayClient.getWithResponse":"Type.Property.AdditionalProperties.IsModelArray.get","type.property.additionalproperties.IsModelArrayClient.put":"Type.Property.AdditionalProperties.IsModelArray.put","type.property.additionalproperties.IsModelArrayClient.putWithResponse":"Type.Property.AdditionalProperties.IsModelArray.put","type.property.additionalproperties.IsModelAsyncClient":"Type.Property.AdditionalProperties.IsModel","type.property.additionalproperties.IsModelAsyncClient.get":"Type.Property.AdditionalProperties.IsModel.get","type.property.additionalproperties.IsModelAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.IsModel.get","type.property.additionalproperties.IsModelAsyncClient.put":"Type.Property.AdditionalProperties.IsModel.put","type.property.additionalproperties.IsModelAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.IsModel.put","type.property.additionalproperties.IsModelClient":"Type.Property.AdditionalProperties.IsModel","type.property.additionalproperties.IsModelClient.get":"Type.Property.AdditionalProperties.IsModel.get","type.property.additionalproperties.IsModelClient.getWithResponse":"Type.Property.AdditionalProperties.IsModel.get","type.property.additionalproperties.IsModelClient.put":"Type.Property.AdditionalProperties.IsModel.put","type.property.additionalproperties.IsModelClient.putWithResponse":"Type.Property.AdditionalProperties.IsModel.put","type.property.additionalproperties.IsStringAsyncClient":"Type.Property.AdditionalProperties.IsString","type.property.additionalproperties.IsStringAsyncClient.get":"Type.Property.AdditionalProperties.IsString.get","type.property.additionalproperties.IsStringAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.IsString.get","type.property.additionalproperties.IsStringAsyncClient.put":"Type.Property.AdditionalProperties.IsString.put","type.property.additionalproperties.IsStringAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.IsString.put","type.property.additionalproperties.IsStringClient":"Type.Property.AdditionalProperties.IsString","type.property.additionalproperties.IsStringClient.get":"Type.Property.AdditionalProperties.IsString.get","type.property.additionalproperties.IsStringClient.getWithResponse":"Type.Property.AdditionalProperties.IsString.get","type.property.additionalproperties.IsStringClient.put":"Type.Property.AdditionalProperties.IsString.put","type.property.additionalproperties.IsStringClient.putWithResponse":"Type.Property.AdditionalProperties.IsString.put","type.property.additionalproperties.IsUnknownAsyncClient":"Type.Property.AdditionalProperties.IsUnknown","type.property.additionalproperties.IsUnknownAsyncClient.get":"Type.Property.AdditionalProperties.IsUnknown.get","type.property.additionalproperties.IsUnknownAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.IsUnknown.get","type.property.additionalproperties.IsUnknownAsyncClient.put":"Type.Property.AdditionalProperties.IsUnknown.put","type.property.additionalproperties.IsUnknownAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.IsUnknown.put","type.property.additionalproperties.IsUnknownClient":"Type.Property.AdditionalProperties.IsUnknown","type.property.additionalproperties.IsUnknownClient.get":"Type.Property.AdditionalProperties.IsUnknown.get","type.property.additionalproperties.IsUnknownClient.getWithResponse":"Type.Property.AdditionalProperties.IsUnknown.get","type.property.additionalproperties.IsUnknownClient.put":"Type.Property.AdditionalProperties.IsUnknown.put","type.property.additionalproperties.IsUnknownClient.putWithResponse":"Type.Property.AdditionalProperties.IsUnknown.put","type.property.additionalproperties.IsUnknownDerivedAsyncClient":"Type.Property.AdditionalProperties.IsUnknownDerived","type.property.additionalproperties.IsUnknownDerivedAsyncClient.get":"Type.Property.AdditionalProperties.IsUnknownDerived.get","type.property.additionalproperties.IsUnknownDerivedAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.IsUnknownDerived.get","type.property.additionalproperties.IsUnknownDerivedAsyncClient.put":"Type.Property.AdditionalProperties.IsUnknownDerived.put","type.property.additionalproperties.IsUnknownDerivedAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.IsUnknownDerived.put","type.property.additionalproperties.IsUnknownDerivedClient":"Type.Property.AdditionalProperties.IsUnknownDerived","type.property.additionalproperties.IsUnknownDerivedClient.get":"Type.Property.AdditionalProperties.IsUnknownDerived.get","type.property.additionalproperties.IsUnknownDerivedClient.getWithResponse":"Type.Property.AdditionalProperties.IsUnknownDerived.get","type.property.additionalproperties.IsUnknownDerivedClient.put":"Type.Property.AdditionalProperties.IsUnknownDerived.put","type.property.additionalproperties.IsUnknownDerivedClient.putWithResponse":"Type.Property.AdditionalProperties.IsUnknownDerived.put","type.property.additionalproperties.IsUnknownDiscriminatedAsyncClient":"Type.Property.AdditionalProperties.IsUnknownDiscriminated","type.property.additionalproperties.IsUnknownDiscriminatedAsyncClient.get":"Type.Property.AdditionalProperties.IsUnknownDiscriminated.get","type.property.additionalproperties.IsUnknownDiscriminatedAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.IsUnknownDiscriminated.get","type.property.additionalproperties.IsUnknownDiscriminatedAsyncClient.put":"Type.Property.AdditionalProperties.IsUnknownDiscriminated.put","type.property.additionalproperties.IsUnknownDiscriminatedAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.IsUnknownDiscriminated.put","type.property.additionalproperties.IsUnknownDiscriminatedClient":"Type.Property.AdditionalProperties.IsUnknownDiscriminated","type.property.additionalproperties.IsUnknownDiscriminatedClient.get":"Type.Property.AdditionalProperties.IsUnknownDiscriminated.get","type.property.additionalproperties.IsUnknownDiscriminatedClient.getWithResponse":"Type.Property.AdditionalProperties.IsUnknownDiscriminated.get","type.property.additionalproperties.IsUnknownDiscriminatedClient.put":"Type.Property.AdditionalProperties.IsUnknownDiscriminated.put","type.property.additionalproperties.IsUnknownDiscriminatedClient.putWithResponse":"Type.Property.AdditionalProperties.IsUnknownDiscriminated.put","type.property.additionalproperties.MultipleSpreadAsyncClient":"Type.Property.AdditionalProperties.MultipleSpread","type.property.additionalproperties.MultipleSpreadAsyncClient.get":"Type.Property.AdditionalProperties.MultipleSpread.get","type.property.additionalproperties.MultipleSpreadAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.MultipleSpread.get","type.property.additionalproperties.MultipleSpreadAsyncClient.put":"Type.Property.AdditionalProperties.MultipleSpread.put","type.property.additionalproperties.MultipleSpreadAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.MultipleSpread.put","type.property.additionalproperties.MultipleSpreadClient":"Type.Property.AdditionalProperties.MultipleSpread","type.property.additionalproperties.MultipleSpreadClient.get":"Type.Property.AdditionalProperties.MultipleSpread.get","type.property.additionalproperties.MultipleSpreadClient.getWithResponse":"Type.Property.AdditionalProperties.MultipleSpread.get","type.property.additionalproperties.MultipleSpreadClient.put":"Type.Property.AdditionalProperties.MultipleSpread.put","type.property.additionalproperties.MultipleSpreadClient.putWithResponse":"Type.Property.AdditionalProperties.MultipleSpread.put","type.property.additionalproperties.SpreadDifferentFloatAsyncClient":"Type.Property.AdditionalProperties.SpreadDifferentFloat","type.property.additionalproperties.SpreadDifferentFloatAsyncClient.get":"Type.Property.AdditionalProperties.SpreadDifferentFloat.get","type.property.additionalproperties.SpreadDifferentFloatAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentFloat.get","type.property.additionalproperties.SpreadDifferentFloatAsyncClient.put":"Type.Property.AdditionalProperties.SpreadDifferentFloat.put","type.property.additionalproperties.SpreadDifferentFloatAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentFloat.put","type.property.additionalproperties.SpreadDifferentFloatClient":"Type.Property.AdditionalProperties.SpreadDifferentFloat","type.property.additionalproperties.SpreadDifferentFloatClient.get":"Type.Property.AdditionalProperties.SpreadDifferentFloat.get","type.property.additionalproperties.SpreadDifferentFloatClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentFloat.get","type.property.additionalproperties.SpreadDifferentFloatClient.put":"Type.Property.AdditionalProperties.SpreadDifferentFloat.put","type.property.additionalproperties.SpreadDifferentFloatClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentFloat.put","type.property.additionalproperties.SpreadDifferentModelArrayAsyncClient":"Type.Property.AdditionalProperties.SpreadDifferentModelArray","type.property.additionalproperties.SpreadDifferentModelArrayAsyncClient.get":"Type.Property.AdditionalProperties.SpreadDifferentModelArray.get","type.property.additionalproperties.SpreadDifferentModelArrayAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentModelArray.get","type.property.additionalproperties.SpreadDifferentModelArrayAsyncClient.put":"Type.Property.AdditionalProperties.SpreadDifferentModelArray.put","type.property.additionalproperties.SpreadDifferentModelArrayAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentModelArray.put","type.property.additionalproperties.SpreadDifferentModelArrayClient":"Type.Property.AdditionalProperties.SpreadDifferentModelArray","type.property.additionalproperties.SpreadDifferentModelArrayClient.get":"Type.Property.AdditionalProperties.SpreadDifferentModelArray.get","type.property.additionalproperties.SpreadDifferentModelArrayClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentModelArray.get","type.property.additionalproperties.SpreadDifferentModelArrayClient.put":"Type.Property.AdditionalProperties.SpreadDifferentModelArray.put","type.property.additionalproperties.SpreadDifferentModelArrayClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentModelArray.put","type.property.additionalproperties.SpreadDifferentModelAsyncClient":"Type.Property.AdditionalProperties.SpreadDifferentModel","type.property.additionalproperties.SpreadDifferentModelAsyncClient.get":"Type.Property.AdditionalProperties.SpreadDifferentModel.get","type.property.additionalproperties.SpreadDifferentModelAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentModel.get","type.property.additionalproperties.SpreadDifferentModelAsyncClient.put":"Type.Property.AdditionalProperties.SpreadDifferentModel.put","type.property.additionalproperties.SpreadDifferentModelAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentModel.put","type.property.additionalproperties.SpreadDifferentModelClient":"Type.Property.AdditionalProperties.SpreadDifferentModel","type.property.additionalproperties.SpreadDifferentModelClient.get":"Type.Property.AdditionalProperties.SpreadDifferentModel.get","type.property.additionalproperties.SpreadDifferentModelClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentModel.get","type.property.additionalproperties.SpreadDifferentModelClient.put":"Type.Property.AdditionalProperties.SpreadDifferentModel.put","type.property.additionalproperties.SpreadDifferentModelClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentModel.put","type.property.additionalproperties.SpreadDifferentStringAsyncClient":"Type.Property.AdditionalProperties.SpreadDifferentString","type.property.additionalproperties.SpreadDifferentStringAsyncClient.get":"Type.Property.AdditionalProperties.SpreadDifferentString.get","type.property.additionalproperties.SpreadDifferentStringAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentString.get","type.property.additionalproperties.SpreadDifferentStringAsyncClient.put":"Type.Property.AdditionalProperties.SpreadDifferentString.put","type.property.additionalproperties.SpreadDifferentStringAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentString.put","type.property.additionalproperties.SpreadDifferentStringClient":"Type.Property.AdditionalProperties.SpreadDifferentString","type.property.additionalproperties.SpreadDifferentStringClient.get":"Type.Property.AdditionalProperties.SpreadDifferentString.get","type.property.additionalproperties.SpreadDifferentStringClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentString.get","type.property.additionalproperties.SpreadDifferentStringClient.put":"Type.Property.AdditionalProperties.SpreadDifferentString.put","type.property.additionalproperties.SpreadDifferentStringClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadDifferentString.put","type.property.additionalproperties.SpreadFloatAsyncClient":"Type.Property.AdditionalProperties.SpreadFloat","type.property.additionalproperties.SpreadFloatAsyncClient.get":"Type.Property.AdditionalProperties.SpreadFloat.get","type.property.additionalproperties.SpreadFloatAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadFloat.get","type.property.additionalproperties.SpreadFloatAsyncClient.put":"Type.Property.AdditionalProperties.SpreadFloat.put","type.property.additionalproperties.SpreadFloatAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadFloat.put","type.property.additionalproperties.SpreadFloatClient":"Type.Property.AdditionalProperties.SpreadFloat","type.property.additionalproperties.SpreadFloatClient.get":"Type.Property.AdditionalProperties.SpreadFloat.get","type.property.additionalproperties.SpreadFloatClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadFloat.get","type.property.additionalproperties.SpreadFloatClient.put":"Type.Property.AdditionalProperties.SpreadFloat.put","type.property.additionalproperties.SpreadFloatClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadFloat.put","type.property.additionalproperties.SpreadModelArrayAsyncClient":"Type.Property.AdditionalProperties.SpreadModelArray","type.property.additionalproperties.SpreadModelArrayAsyncClient.get":"Type.Property.AdditionalProperties.SpreadModelArray.get","type.property.additionalproperties.SpreadModelArrayAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadModelArray.get","type.property.additionalproperties.SpreadModelArrayAsyncClient.put":"Type.Property.AdditionalProperties.SpreadModelArray.put","type.property.additionalproperties.SpreadModelArrayAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadModelArray.put","type.property.additionalproperties.SpreadModelArrayClient":"Type.Property.AdditionalProperties.SpreadModelArray","type.property.additionalproperties.SpreadModelArrayClient.get":"Type.Property.AdditionalProperties.SpreadModelArray.get","type.property.additionalproperties.SpreadModelArrayClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadModelArray.get","type.property.additionalproperties.SpreadModelArrayClient.put":"Type.Property.AdditionalProperties.SpreadModelArray.put","type.property.additionalproperties.SpreadModelArrayClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadModelArray.put","type.property.additionalproperties.SpreadModelAsyncClient":"Type.Property.AdditionalProperties.SpreadModel","type.property.additionalproperties.SpreadModelAsyncClient.get":"Type.Property.AdditionalProperties.SpreadModel.get","type.property.additionalproperties.SpreadModelAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadModel.get","type.property.additionalproperties.SpreadModelAsyncClient.put":"Type.Property.AdditionalProperties.SpreadModel.put","type.property.additionalproperties.SpreadModelAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadModel.put","type.property.additionalproperties.SpreadModelClient":"Type.Property.AdditionalProperties.SpreadModel","type.property.additionalproperties.SpreadModelClient.get":"Type.Property.AdditionalProperties.SpreadModel.get","type.property.additionalproperties.SpreadModelClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadModel.get","type.property.additionalproperties.SpreadModelClient.put":"Type.Property.AdditionalProperties.SpreadModel.put","type.property.additionalproperties.SpreadModelClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadModel.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2AsyncClient":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2AsyncClient.get":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2AsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2AsyncClient.put":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2AsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2Client":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2Client.get":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2Client.getWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2Client.put":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion2Client.putWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3AsyncClient":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3AsyncClient.get":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3AsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3AsyncClient.put":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3AsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3Client":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3Client.get":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3Client.getWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3Client.put":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnion3Client.putWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionAsyncClient":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionAsyncClient.get":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionAsyncClient.put":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionClient":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionClient.get":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionClient.put":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put","type.property.additionalproperties.SpreadRecordNonDiscriminatedUnionClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put","type.property.additionalproperties.SpreadRecordUnionAsyncClient":"Type.Property.AdditionalProperties.SpreadRecordUnion","type.property.additionalproperties.SpreadRecordUnionAsyncClient.get":"Type.Property.AdditionalProperties.SpreadRecordUnion.get","type.property.additionalproperties.SpreadRecordUnionAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadRecordUnion.get","type.property.additionalproperties.SpreadRecordUnionAsyncClient.put":"Type.Property.AdditionalProperties.SpreadRecordUnion.put","type.property.additionalproperties.SpreadRecordUnionAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadRecordUnion.put","type.property.additionalproperties.SpreadRecordUnionClient":"Type.Property.AdditionalProperties.SpreadRecordUnion","type.property.additionalproperties.SpreadRecordUnionClient.get":"Type.Property.AdditionalProperties.SpreadRecordUnion.get","type.property.additionalproperties.SpreadRecordUnionClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadRecordUnion.get","type.property.additionalproperties.SpreadRecordUnionClient.put":"Type.Property.AdditionalProperties.SpreadRecordUnion.put","type.property.additionalproperties.SpreadRecordUnionClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadRecordUnion.put","type.property.additionalproperties.SpreadStringAsyncClient":"Type.Property.AdditionalProperties.SpreadString","type.property.additionalproperties.SpreadStringAsyncClient.get":"Type.Property.AdditionalProperties.SpreadString.get","type.property.additionalproperties.SpreadStringAsyncClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadString.get","type.property.additionalproperties.SpreadStringAsyncClient.put":"Type.Property.AdditionalProperties.SpreadString.put","type.property.additionalproperties.SpreadStringAsyncClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadString.put","type.property.additionalproperties.SpreadStringClient":"Type.Property.AdditionalProperties.SpreadString","type.property.additionalproperties.SpreadStringClient.get":"Type.Property.AdditionalProperties.SpreadString.get","type.property.additionalproperties.SpreadStringClient.getWithResponse":"Type.Property.AdditionalProperties.SpreadString.get","type.property.additionalproperties.SpreadStringClient.put":"Type.Property.AdditionalProperties.SpreadString.put","type.property.additionalproperties.SpreadStringClient.putWithResponse":"Type.Property.AdditionalProperties.SpreadString.put","type.property.additionalproperties.models.DifferentSpreadFloatDerived":"Type.Property.AdditionalProperties.DifferentSpreadFloatDerived","type.property.additionalproperties.models.DifferentSpreadFloatRecord":"Type.Property.AdditionalProperties.DifferentSpreadFloatRecord","type.property.additionalproperties.models.DifferentSpreadModelArrayDerived":"Type.Property.AdditionalProperties.DifferentSpreadModelArrayDerived","type.property.additionalproperties.models.DifferentSpreadModelArrayRecord":"Type.Property.AdditionalProperties.DifferentSpreadModelArrayRecord","type.property.additionalproperties.models.DifferentSpreadModelDerived":"Type.Property.AdditionalProperties.DifferentSpreadModelDerived","type.property.additionalproperties.models.DifferentSpreadModelRecord":"Type.Property.AdditionalProperties.DifferentSpreadModelRecord","type.property.additionalproperties.models.DifferentSpreadStringDerived":"Type.Property.AdditionalProperties.DifferentSpreadStringDerived","type.property.additionalproperties.models.DifferentSpreadStringRecord":"Type.Property.AdditionalProperties.DifferentSpreadStringRecord","type.property.additionalproperties.models.ExtendsFloatAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsFloatAdditionalProperties","type.property.additionalproperties.models.ExtendsModelAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsModelAdditionalProperties","type.property.additionalproperties.models.ExtendsModelArrayAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsModelArrayAdditionalProperties","type.property.additionalproperties.models.ExtendsStringAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsStringAdditionalProperties","type.property.additionalproperties.models.ExtendsUnknownAdditionalProperties":"Type.Property.AdditionalProperties.ExtendsUnknownAdditionalProperties","type.property.additionalproperties.models.ExtendsUnknownAdditionalPropertiesDerived":"Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDerived","type.property.additionalproperties.models.ExtendsUnknownAdditionalPropertiesDiscriminated":"Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDiscriminated","type.property.additionalproperties.models.ExtendsUnknownAdditionalPropertiesDiscriminatedDerived":"Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDiscriminatedDerived","type.property.additionalproperties.models.IsFloatAdditionalProperties":"Type.Property.AdditionalProperties.IsFloatAdditionalProperties","type.property.additionalproperties.models.IsModelAdditionalProperties":"Type.Property.AdditionalProperties.IsModelAdditionalProperties","type.property.additionalproperties.models.IsModelArrayAdditionalProperties":"Type.Property.AdditionalProperties.IsModelArrayAdditionalProperties","type.property.additionalproperties.models.IsStringAdditionalProperties":"Type.Property.AdditionalProperties.IsStringAdditionalProperties","type.property.additionalproperties.models.IsUnknownAdditionalProperties":"Type.Property.AdditionalProperties.IsUnknownAdditionalProperties","type.property.additionalproperties.models.IsUnknownAdditionalPropertiesDerived":"Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDerived","type.property.additionalproperties.models.IsUnknownAdditionalPropertiesDiscriminated":"Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDiscriminated","type.property.additionalproperties.models.IsUnknownAdditionalPropertiesDiscriminatedDerived":"Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDiscriminatedDerived","type.property.additionalproperties.models.ModelForRecord":"Type.Property.AdditionalProperties.ModelForRecord","type.property.additionalproperties.models.MultipleSpreadRecord":"Type.Property.AdditionalProperties.MultipleSpreadRecord","type.property.additionalproperties.models.SpreadFloatRecord":"Type.Property.AdditionalProperties.SpreadFloatRecord","type.property.additionalproperties.models.SpreadModelArrayRecord":"Type.Property.AdditionalProperties.SpreadModelArrayRecord","type.property.additionalproperties.models.SpreadModelRecord":"Type.Property.AdditionalProperties.SpreadModelRecord","type.property.additionalproperties.models.SpreadRecordForNonDiscriminatedUnion":"Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion","type.property.additionalproperties.models.SpreadRecordForNonDiscriminatedUnion2":"Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion2","type.property.additionalproperties.models.SpreadRecordForNonDiscriminatedUnion3":"Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion3","type.property.additionalproperties.models.SpreadRecordForUnion":"Type.Property.AdditionalProperties.SpreadRecordForUnion","type.property.additionalproperties.models.SpreadStringRecord":"Type.Property.AdditionalProperties.SpreadStringRecord","type.property.additionalproperties.models.WidgetData0":"Type.Property.AdditionalProperties.WidgetData0","type.property.additionalproperties.models.WidgetData1":"Type.Property.AdditionalProperties.WidgetData1","type.property.additionalproperties.models.WidgetData2":"Type.Property.AdditionalProperties.WidgetData2"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/property/additionalproperties/AdditionalPropertiesClientBuilder.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadFloatAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadFloatClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelArrayAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelArrayClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadStringAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadStringClient.java","src/main/java/type/property/additionalproperties/ExtendsFloatAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsFloatClient.java","src/main/java/type/property/additionalproperties/ExtendsModelArrayAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsModelArrayClient.java","src/main/java/type/property/additionalproperties/ExtendsModelAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsModelClient.java","src/main/java/type/property/additionalproperties/ExtendsStringAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsStringClient.java","src/main/java/type/property/additionalproperties/ExtendsUnknownAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsUnknownClient.java","src/main/java/type/property/additionalproperties/ExtendsUnknownDerivedAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsUnknownDerivedClient.java","src/main/java/type/property/additionalproperties/ExtendsUnknownDiscriminatedAsyncClient.java","src/main/java/type/property/additionalproperties/ExtendsUnknownDiscriminatedClient.java","src/main/java/type/property/additionalproperties/IsFloatAsyncClient.java","src/main/java/type/property/additionalproperties/IsFloatClient.java","src/main/java/type/property/additionalproperties/IsModelArrayAsyncClient.java","src/main/java/type/property/additionalproperties/IsModelArrayClient.java","src/main/java/type/property/additionalproperties/IsModelAsyncClient.java","src/main/java/type/property/additionalproperties/IsModelClient.java","src/main/java/type/property/additionalproperties/IsStringAsyncClient.java","src/main/java/type/property/additionalproperties/IsStringClient.java","src/main/java/type/property/additionalproperties/IsUnknownAsyncClient.java","src/main/java/type/property/additionalproperties/IsUnknownClient.java","src/main/java/type/property/additionalproperties/IsUnknownDerivedAsyncClient.java","src/main/java/type/property/additionalproperties/IsUnknownDerivedClient.java","src/main/java/type/property/additionalproperties/IsUnknownDiscriminatedAsyncClient.java","src/main/java/type/property/additionalproperties/IsUnknownDiscriminatedClient.java","src/main/java/type/property/additionalproperties/MultipleSpreadAsyncClient.java","src/main/java/type/property/additionalproperties/MultipleSpreadClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentFloatAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentFloatClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentModelArrayAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentModelArrayClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentModelAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentModelClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentStringAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadDifferentStringClient.java","src/main/java/type/property/additionalproperties/SpreadFloatAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadFloatClient.java","src/main/java/type/property/additionalproperties/SpreadModelArrayAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadModelArrayClient.java","src/main/java/type/property/additionalproperties/SpreadModelAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadModelClient.java","src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion2AsyncClient.java","src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion2Client.java","src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion3AsyncClient.java","src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion3Client.java","src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnionAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnionClient.java","src/main/java/type/property/additionalproperties/SpreadRecordUnionAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadRecordUnionClient.java","src/main/java/type/property/additionalproperties/SpreadStringAsyncClient.java","src/main/java/type/property/additionalproperties/SpreadStringClient.java","src/main/java/type/property/additionalproperties/implementation/AdditionalPropertiesClientImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownDerivedsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownDiscriminatedsImpl.java","src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/IsModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsUnknownDerivedsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsUnknownDiscriminatedsImpl.java","src/main/java/type/property/additionalproperties/implementation/IsUnknownsImpl.java","src/main/java/type/property/additionalproperties/implementation/MultipleSpreadsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadDifferentFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadDifferentModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadDifferentModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadDifferentStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadFloatsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadModelArraysImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadModelsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnion2sImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnion3sImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnionsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadRecordUnionsImpl.java","src/main/java/type/property/additionalproperties/implementation/SpreadStringsImpl.java","src/main/java/type/property/additionalproperties/implementation/package-info.java","src/main/java/type/property/additionalproperties/models/DifferentSpreadFloatDerived.java","src/main/java/type/property/additionalproperties/models/DifferentSpreadFloatRecord.java","src/main/java/type/property/additionalproperties/models/DifferentSpreadModelArrayDerived.java","src/main/java/type/property/additionalproperties/models/DifferentSpreadModelArrayRecord.java","src/main/java/type/property/additionalproperties/models/DifferentSpreadModelDerived.java","src/main/java/type/property/additionalproperties/models/DifferentSpreadModelRecord.java","src/main/java/type/property/additionalproperties/models/DifferentSpreadStringDerived.java","src/main/java/type/property/additionalproperties/models/DifferentSpreadStringRecord.java","src/main/java/type/property/additionalproperties/models/ExtendsFloatAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/ExtendsModelAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/ExtendsModelArrayAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/ExtendsStringAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/ExtendsUnknownAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/ExtendsUnknownAdditionalPropertiesDerived.java","src/main/java/type/property/additionalproperties/models/ExtendsUnknownAdditionalPropertiesDiscriminated.java","src/main/java/type/property/additionalproperties/models/ExtendsUnknownAdditionalPropertiesDiscriminatedDerived.java","src/main/java/type/property/additionalproperties/models/IsFloatAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/IsModelAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/IsModelArrayAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/IsStringAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/IsUnknownAdditionalProperties.java","src/main/java/type/property/additionalproperties/models/IsUnknownAdditionalPropertiesDerived.java","src/main/java/type/property/additionalproperties/models/IsUnknownAdditionalPropertiesDiscriminated.java","src/main/java/type/property/additionalproperties/models/IsUnknownAdditionalPropertiesDiscriminatedDerived.java","src/main/java/type/property/additionalproperties/models/ModelForRecord.java","src/main/java/type/property/additionalproperties/models/MultipleSpreadRecord.java","src/main/java/type/property/additionalproperties/models/SpreadFloatRecord.java","src/main/java/type/property/additionalproperties/models/SpreadModelArrayRecord.java","src/main/java/type/property/additionalproperties/models/SpreadModelRecord.java","src/main/java/type/property/additionalproperties/models/SpreadRecordForNonDiscriminatedUnion.java","src/main/java/type/property/additionalproperties/models/SpreadRecordForNonDiscriminatedUnion2.java","src/main/java/type/property/additionalproperties/models/SpreadRecordForNonDiscriminatedUnion3.java","src/main/java/type/property/additionalproperties/models/SpreadRecordForUnion.java","src/main/java/type/property/additionalproperties/models/SpreadStringRecord.java","src/main/java/type/property/additionalproperties/models/WidgetData0.java","src/main/java/type/property/additionalproperties/models/WidgetData1.java","src/main/java/type/property/additionalproperties/models/WidgetData2.java","src/main/java/type/property/additionalproperties/models/package-info.java","src/main/java/type/property/additionalproperties/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-nullable_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-nullable_apiview_properties.json deleted file mode 100644 index 55a6f1c60f9..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-nullable_apiview_properties.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.property.nullable.BytesAsyncClient": "Type.Property.Nullable.Bytes", - "type.property.nullable.BytesAsyncClient.getNonNull": "Type.Property.Nullable.Bytes.getNonNull", - "type.property.nullable.BytesAsyncClient.getNonNullWithResponse": "Type.Property.Nullable.Bytes.getNonNull", - "type.property.nullable.BytesAsyncClient.getNull": "Type.Property.Nullable.Bytes.getNull", - "type.property.nullable.BytesAsyncClient.getNullWithResponse": "Type.Property.Nullable.Bytes.getNull", - "type.property.nullable.BytesAsyncClient.patchNonNull": "Type.Property.Nullable.Bytes.patchNonNull", - "type.property.nullable.BytesAsyncClient.patchNonNullWithResponse": "Type.Property.Nullable.Bytes.patchNonNull", - "type.property.nullable.BytesAsyncClient.patchNull": "Type.Property.Nullable.Bytes.patchNull", - "type.property.nullable.BytesAsyncClient.patchNullWithResponse": "Type.Property.Nullable.Bytes.patchNull", - "type.property.nullable.BytesClient": "Type.Property.Nullable.Bytes", - "type.property.nullable.BytesClient.getNonNull": "Type.Property.Nullable.Bytes.getNonNull", - "type.property.nullable.BytesClient.getNonNullWithResponse": "Type.Property.Nullable.Bytes.getNonNull", - "type.property.nullable.BytesClient.getNull": "Type.Property.Nullable.Bytes.getNull", - "type.property.nullable.BytesClient.getNullWithResponse": "Type.Property.Nullable.Bytes.getNull", - "type.property.nullable.BytesClient.patchNonNull": "Type.Property.Nullable.Bytes.patchNonNull", - "type.property.nullable.BytesClient.patchNonNullWithResponse": "Type.Property.Nullable.Bytes.patchNonNull", - "type.property.nullable.BytesClient.patchNull": "Type.Property.Nullable.Bytes.patchNull", - "type.property.nullable.BytesClient.patchNullWithResponse": "Type.Property.Nullable.Bytes.patchNull", - "type.property.nullable.CollectionsByteAsyncClient": "Type.Property.Nullable.CollectionsByte", - "type.property.nullable.CollectionsByteAsyncClient.getNonNull": "Type.Property.Nullable.CollectionsByte.getNonNull", - "type.property.nullable.CollectionsByteAsyncClient.getNonNullWithResponse": "Type.Property.Nullable.CollectionsByte.getNonNull", - "type.property.nullable.CollectionsByteAsyncClient.getNull": "Type.Property.Nullable.CollectionsByte.getNull", - "type.property.nullable.CollectionsByteAsyncClient.getNullWithResponse": "Type.Property.Nullable.CollectionsByte.getNull", - "type.property.nullable.CollectionsByteAsyncClient.patchNonNull": "Type.Property.Nullable.CollectionsByte.patchNonNull", - "type.property.nullable.CollectionsByteAsyncClient.patchNonNullWithResponse": "Type.Property.Nullable.CollectionsByte.patchNonNull", - "type.property.nullable.CollectionsByteAsyncClient.patchNull": "Type.Property.Nullable.CollectionsByte.patchNull", - "type.property.nullable.CollectionsByteAsyncClient.patchNullWithResponse": "Type.Property.Nullable.CollectionsByte.patchNull", - "type.property.nullable.CollectionsByteClient": "Type.Property.Nullable.CollectionsByte", - "type.property.nullable.CollectionsByteClient.getNonNull": "Type.Property.Nullable.CollectionsByte.getNonNull", - "type.property.nullable.CollectionsByteClient.getNonNullWithResponse": "Type.Property.Nullable.CollectionsByte.getNonNull", - "type.property.nullable.CollectionsByteClient.getNull": "Type.Property.Nullable.CollectionsByte.getNull", - "type.property.nullable.CollectionsByteClient.getNullWithResponse": "Type.Property.Nullable.CollectionsByte.getNull", - "type.property.nullable.CollectionsByteClient.patchNonNull": "Type.Property.Nullable.CollectionsByte.patchNonNull", - "type.property.nullable.CollectionsByteClient.patchNonNullWithResponse": "Type.Property.Nullable.CollectionsByte.patchNonNull", - "type.property.nullable.CollectionsByteClient.patchNull": "Type.Property.Nullable.CollectionsByte.patchNull", - "type.property.nullable.CollectionsByteClient.patchNullWithResponse": "Type.Property.Nullable.CollectionsByte.patchNull", - "type.property.nullable.CollectionsModelAsyncClient": "Type.Property.Nullable.CollectionsModel", - "type.property.nullable.CollectionsModelAsyncClient.getNonNull": "Type.Property.Nullable.CollectionsModel.getNonNull", - "type.property.nullable.CollectionsModelAsyncClient.getNonNullWithResponse": "Type.Property.Nullable.CollectionsModel.getNonNull", - "type.property.nullable.CollectionsModelAsyncClient.getNull": "Type.Property.Nullable.CollectionsModel.getNull", - "type.property.nullable.CollectionsModelAsyncClient.getNullWithResponse": "Type.Property.Nullable.CollectionsModel.getNull", - "type.property.nullable.CollectionsModelAsyncClient.patchNonNull": "Type.Property.Nullable.CollectionsModel.patchNonNull", - "type.property.nullable.CollectionsModelAsyncClient.patchNonNullWithResponse": "Type.Property.Nullable.CollectionsModel.patchNonNull", - "type.property.nullable.CollectionsModelAsyncClient.patchNull": "Type.Property.Nullable.CollectionsModel.patchNull", - "type.property.nullable.CollectionsModelAsyncClient.patchNullWithResponse": "Type.Property.Nullable.CollectionsModel.patchNull", - "type.property.nullable.CollectionsModelClient": "Type.Property.Nullable.CollectionsModel", - "type.property.nullable.CollectionsModelClient.getNonNull": "Type.Property.Nullable.CollectionsModel.getNonNull", - "type.property.nullable.CollectionsModelClient.getNonNullWithResponse": "Type.Property.Nullable.CollectionsModel.getNonNull", - "type.property.nullable.CollectionsModelClient.getNull": "Type.Property.Nullable.CollectionsModel.getNull", - "type.property.nullable.CollectionsModelClient.getNullWithResponse": "Type.Property.Nullable.CollectionsModel.getNull", - "type.property.nullable.CollectionsModelClient.patchNonNull": "Type.Property.Nullable.CollectionsModel.patchNonNull", - "type.property.nullable.CollectionsModelClient.patchNonNullWithResponse": "Type.Property.Nullable.CollectionsModel.patchNonNull", - "type.property.nullable.CollectionsModelClient.patchNull": "Type.Property.Nullable.CollectionsModel.patchNull", - "type.property.nullable.CollectionsModelClient.patchNullWithResponse": "Type.Property.Nullable.CollectionsModel.patchNull", - "type.property.nullable.CollectionsStringAsyncClient": "Type.Property.Nullable.CollectionsString", - "type.property.nullable.CollectionsStringAsyncClient.getNonNull": "Type.Property.Nullable.CollectionsString.getNonNull", - "type.property.nullable.CollectionsStringAsyncClient.getNonNullWithResponse": "Type.Property.Nullable.CollectionsString.getNonNull", - "type.property.nullable.CollectionsStringAsyncClient.getNull": "Type.Property.Nullable.CollectionsString.getNull", - "type.property.nullable.CollectionsStringAsyncClient.getNullWithResponse": "Type.Property.Nullable.CollectionsString.getNull", - "type.property.nullable.CollectionsStringAsyncClient.patchNonNull": "Type.Property.Nullable.CollectionsString.patchNonNull", - "type.property.nullable.CollectionsStringAsyncClient.patchNonNullWithResponse": "Type.Property.Nullable.CollectionsString.patchNonNull", - "type.property.nullable.CollectionsStringAsyncClient.patchNull": "Type.Property.Nullable.CollectionsString.patchNull", - "type.property.nullable.CollectionsStringAsyncClient.patchNullWithResponse": "Type.Property.Nullable.CollectionsString.patchNull", - "type.property.nullable.CollectionsStringClient": "Type.Property.Nullable.CollectionsString", - "type.property.nullable.CollectionsStringClient.getNonNull": "Type.Property.Nullable.CollectionsString.getNonNull", - "type.property.nullable.CollectionsStringClient.getNonNullWithResponse": "Type.Property.Nullable.CollectionsString.getNonNull", - "type.property.nullable.CollectionsStringClient.getNull": "Type.Property.Nullable.CollectionsString.getNull", - "type.property.nullable.CollectionsStringClient.getNullWithResponse": "Type.Property.Nullable.CollectionsString.getNull", - "type.property.nullable.CollectionsStringClient.patchNonNull": "Type.Property.Nullable.CollectionsString.patchNonNull", - "type.property.nullable.CollectionsStringClient.patchNonNullWithResponse": "Type.Property.Nullable.CollectionsString.patchNonNull", - "type.property.nullable.CollectionsStringClient.patchNull": "Type.Property.Nullable.CollectionsString.patchNull", - "type.property.nullable.CollectionsStringClient.patchNullWithResponse": "Type.Property.Nullable.CollectionsString.patchNull", - "type.property.nullable.DatetimeOperationAsyncClient": "Type.Property.Nullable.Datetime", - "type.property.nullable.DatetimeOperationAsyncClient.getNonNull": "Type.Property.Nullable.Datetime.getNonNull", - "type.property.nullable.DatetimeOperationAsyncClient.getNonNullWithResponse": "Type.Property.Nullable.Datetime.getNonNull", - "type.property.nullable.DatetimeOperationAsyncClient.getNull": "Type.Property.Nullable.Datetime.getNull", - "type.property.nullable.DatetimeOperationAsyncClient.getNullWithResponse": "Type.Property.Nullable.Datetime.getNull", - "type.property.nullable.DatetimeOperationAsyncClient.patchNonNull": "Type.Property.Nullable.Datetime.patchNonNull", - "type.property.nullable.DatetimeOperationAsyncClient.patchNonNullWithResponse": "Type.Property.Nullable.Datetime.patchNonNull", - "type.property.nullable.DatetimeOperationAsyncClient.patchNull": "Type.Property.Nullable.Datetime.patchNull", - "type.property.nullable.DatetimeOperationAsyncClient.patchNullWithResponse": "Type.Property.Nullable.Datetime.patchNull", - "type.property.nullable.DatetimeOperationClient": "Type.Property.Nullable.Datetime", - "type.property.nullable.DatetimeOperationClient.getNonNull": "Type.Property.Nullable.Datetime.getNonNull", - "type.property.nullable.DatetimeOperationClient.getNonNullWithResponse": "Type.Property.Nullable.Datetime.getNonNull", - "type.property.nullable.DatetimeOperationClient.getNull": "Type.Property.Nullable.Datetime.getNull", - "type.property.nullable.DatetimeOperationClient.getNullWithResponse": "Type.Property.Nullable.Datetime.getNull", - "type.property.nullable.DatetimeOperationClient.patchNonNull": "Type.Property.Nullable.Datetime.patchNonNull", - "type.property.nullable.DatetimeOperationClient.patchNonNullWithResponse": "Type.Property.Nullable.Datetime.patchNonNull", - "type.property.nullable.DatetimeOperationClient.patchNull": "Type.Property.Nullable.Datetime.patchNull", - "type.property.nullable.DatetimeOperationClient.patchNullWithResponse": "Type.Property.Nullable.Datetime.patchNull", - "type.property.nullable.DurationOperationAsyncClient": "Type.Property.Nullable.Duration", - "type.property.nullable.DurationOperationAsyncClient.getNonNull": "Type.Property.Nullable.Duration.getNonNull", - "type.property.nullable.DurationOperationAsyncClient.getNonNullWithResponse": "Type.Property.Nullable.Duration.getNonNull", - "type.property.nullable.DurationOperationAsyncClient.getNull": "Type.Property.Nullable.Duration.getNull", - "type.property.nullable.DurationOperationAsyncClient.getNullWithResponse": "Type.Property.Nullable.Duration.getNull", - "type.property.nullable.DurationOperationAsyncClient.patchNonNull": "Type.Property.Nullable.Duration.patchNonNull", - "type.property.nullable.DurationOperationAsyncClient.patchNonNullWithResponse": "Type.Property.Nullable.Duration.patchNonNull", - "type.property.nullable.DurationOperationAsyncClient.patchNull": "Type.Property.Nullable.Duration.patchNull", - "type.property.nullable.DurationOperationAsyncClient.patchNullWithResponse": "Type.Property.Nullable.Duration.patchNull", - "type.property.nullable.DurationOperationClient": "Type.Property.Nullable.Duration", - "type.property.nullable.DurationOperationClient.getNonNull": "Type.Property.Nullable.Duration.getNonNull", - "type.property.nullable.DurationOperationClient.getNonNullWithResponse": "Type.Property.Nullable.Duration.getNonNull", - "type.property.nullable.DurationOperationClient.getNull": "Type.Property.Nullable.Duration.getNull", - "type.property.nullable.DurationOperationClient.getNullWithResponse": "Type.Property.Nullable.Duration.getNull", - "type.property.nullable.DurationOperationClient.patchNonNull": "Type.Property.Nullable.Duration.patchNonNull", - "type.property.nullable.DurationOperationClient.patchNonNullWithResponse": "Type.Property.Nullable.Duration.patchNonNull", - "type.property.nullable.DurationOperationClient.patchNull": "Type.Property.Nullable.Duration.patchNull", - "type.property.nullable.DurationOperationClient.patchNullWithResponse": "Type.Property.Nullable.Duration.patchNull", - "type.property.nullable.NullableClientBuilder": "Type.Property.Nullable", - "type.property.nullable.StringOperationAsyncClient": "Type.Property.Nullable.String", - "type.property.nullable.StringOperationAsyncClient.getNonNull": "Type.Property.Nullable.String.getNonNull", - "type.property.nullable.StringOperationAsyncClient.getNonNullWithResponse": "Type.Property.Nullable.String.getNonNull", - "type.property.nullable.StringOperationAsyncClient.getNull": "Type.Property.Nullable.String.getNull", - "type.property.nullable.StringOperationAsyncClient.getNullWithResponse": "Type.Property.Nullable.String.getNull", - "type.property.nullable.StringOperationAsyncClient.patchNonNull": "Type.Property.Nullable.String.patchNonNull", - "type.property.nullable.StringOperationAsyncClient.patchNonNullWithResponse": "Type.Property.Nullable.String.patchNonNull", - "type.property.nullable.StringOperationAsyncClient.patchNull": "Type.Property.Nullable.String.patchNull", - "type.property.nullable.StringOperationAsyncClient.patchNullWithResponse": "Type.Property.Nullable.String.patchNull", - "type.property.nullable.StringOperationClient": "Type.Property.Nullable.String", - "type.property.nullable.StringOperationClient.getNonNull": "Type.Property.Nullable.String.getNonNull", - "type.property.nullable.StringOperationClient.getNonNullWithResponse": "Type.Property.Nullable.String.getNonNull", - "type.property.nullable.StringOperationClient.getNull": "Type.Property.Nullable.String.getNull", - "type.property.nullable.StringOperationClient.getNullWithResponse": "Type.Property.Nullable.String.getNull", - "type.property.nullable.StringOperationClient.patchNonNull": "Type.Property.Nullable.String.patchNonNull", - "type.property.nullable.StringOperationClient.patchNonNullWithResponse": "Type.Property.Nullable.String.patchNonNull", - "type.property.nullable.StringOperationClient.patchNull": "Type.Property.Nullable.String.patchNull", - "type.property.nullable.StringOperationClient.patchNullWithResponse": "Type.Property.Nullable.String.patchNull", - "type.property.nullable.models.BytesProperty": "Type.Property.Nullable.BytesProperty", - "type.property.nullable.models.CollectionsByteProperty": "Type.Property.Nullable.CollectionsByteProperty", - "type.property.nullable.models.CollectionsModelProperty": "Type.Property.Nullable.CollectionsModelProperty", - "type.property.nullable.models.CollectionsStringProperty": "Type.Property.Nullable.CollectionsStringProperty", - "type.property.nullable.models.DatetimeProperty": "Type.Property.Nullable.DatetimeProperty", - "type.property.nullable.models.DurationProperty": "Type.Property.Nullable.DurationProperty", - "type.property.nullable.models.InnerModel": "Type.Property.Nullable.InnerModel", - "type.property.nullable.models.StringProperty": "Type.Property.Nullable.StringProperty" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-nullable_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-nullable_metadata.json index c2b21d66665..23eff3ab859 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-nullable_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-nullable_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.property.nullable.BytesAsyncClient":"Type.Property.Nullable.Bytes","type.property.nullable.BytesAsyncClient.getNonNull":"Type.Property.Nullable.Bytes.getNonNull","type.property.nullable.BytesAsyncClient.getNonNullWithResponse":"Type.Property.Nullable.Bytes.getNonNull","type.property.nullable.BytesAsyncClient.getNull":"Type.Property.Nullable.Bytes.getNull","type.property.nullable.BytesAsyncClient.getNullWithResponse":"Type.Property.Nullable.Bytes.getNull","type.property.nullable.BytesAsyncClient.patchNonNull":"Type.Property.Nullable.Bytes.patchNonNull","type.property.nullable.BytesAsyncClient.patchNonNullWithResponse":"Type.Property.Nullable.Bytes.patchNonNull","type.property.nullable.BytesAsyncClient.patchNull":"Type.Property.Nullable.Bytes.patchNull","type.property.nullable.BytesAsyncClient.patchNullWithResponse":"Type.Property.Nullable.Bytes.patchNull","type.property.nullable.BytesClient":"Type.Property.Nullable.Bytes","type.property.nullable.BytesClient.getNonNull":"Type.Property.Nullable.Bytes.getNonNull","type.property.nullable.BytesClient.getNonNullWithResponse":"Type.Property.Nullable.Bytes.getNonNull","type.property.nullable.BytesClient.getNull":"Type.Property.Nullable.Bytes.getNull","type.property.nullable.BytesClient.getNullWithResponse":"Type.Property.Nullable.Bytes.getNull","type.property.nullable.BytesClient.patchNonNull":"Type.Property.Nullable.Bytes.patchNonNull","type.property.nullable.BytesClient.patchNonNullWithResponse":"Type.Property.Nullable.Bytes.patchNonNull","type.property.nullable.BytesClient.patchNull":"Type.Property.Nullable.Bytes.patchNull","type.property.nullable.BytesClient.patchNullWithResponse":"Type.Property.Nullable.Bytes.patchNull","type.property.nullable.CollectionsByteAsyncClient":"Type.Property.Nullable.CollectionsByte","type.property.nullable.CollectionsByteAsyncClient.getNonNull":"Type.Property.Nullable.CollectionsByte.getNonNull","type.property.nullable.CollectionsByteAsyncClient.getNonNullWithResponse":"Type.Property.Nullable.CollectionsByte.getNonNull","type.property.nullable.CollectionsByteAsyncClient.getNull":"Type.Property.Nullable.CollectionsByte.getNull","type.property.nullable.CollectionsByteAsyncClient.getNullWithResponse":"Type.Property.Nullable.CollectionsByte.getNull","type.property.nullable.CollectionsByteAsyncClient.patchNonNull":"Type.Property.Nullable.CollectionsByte.patchNonNull","type.property.nullable.CollectionsByteAsyncClient.patchNonNullWithResponse":"Type.Property.Nullable.CollectionsByte.patchNonNull","type.property.nullable.CollectionsByteAsyncClient.patchNull":"Type.Property.Nullable.CollectionsByte.patchNull","type.property.nullable.CollectionsByteAsyncClient.patchNullWithResponse":"Type.Property.Nullable.CollectionsByte.patchNull","type.property.nullable.CollectionsByteClient":"Type.Property.Nullable.CollectionsByte","type.property.nullable.CollectionsByteClient.getNonNull":"Type.Property.Nullable.CollectionsByte.getNonNull","type.property.nullable.CollectionsByteClient.getNonNullWithResponse":"Type.Property.Nullable.CollectionsByte.getNonNull","type.property.nullable.CollectionsByteClient.getNull":"Type.Property.Nullable.CollectionsByte.getNull","type.property.nullable.CollectionsByteClient.getNullWithResponse":"Type.Property.Nullable.CollectionsByte.getNull","type.property.nullable.CollectionsByteClient.patchNonNull":"Type.Property.Nullable.CollectionsByte.patchNonNull","type.property.nullable.CollectionsByteClient.patchNonNullWithResponse":"Type.Property.Nullable.CollectionsByte.patchNonNull","type.property.nullable.CollectionsByteClient.patchNull":"Type.Property.Nullable.CollectionsByte.patchNull","type.property.nullable.CollectionsByteClient.patchNullWithResponse":"Type.Property.Nullable.CollectionsByte.patchNull","type.property.nullable.CollectionsModelAsyncClient":"Type.Property.Nullable.CollectionsModel","type.property.nullable.CollectionsModelAsyncClient.getNonNull":"Type.Property.Nullable.CollectionsModel.getNonNull","type.property.nullable.CollectionsModelAsyncClient.getNonNullWithResponse":"Type.Property.Nullable.CollectionsModel.getNonNull","type.property.nullable.CollectionsModelAsyncClient.getNull":"Type.Property.Nullable.CollectionsModel.getNull","type.property.nullable.CollectionsModelAsyncClient.getNullWithResponse":"Type.Property.Nullable.CollectionsModel.getNull","type.property.nullable.CollectionsModelAsyncClient.patchNonNull":"Type.Property.Nullable.CollectionsModel.patchNonNull","type.property.nullable.CollectionsModelAsyncClient.patchNonNullWithResponse":"Type.Property.Nullable.CollectionsModel.patchNonNull","type.property.nullable.CollectionsModelAsyncClient.patchNull":"Type.Property.Nullable.CollectionsModel.patchNull","type.property.nullable.CollectionsModelAsyncClient.patchNullWithResponse":"Type.Property.Nullable.CollectionsModel.patchNull","type.property.nullable.CollectionsModelClient":"Type.Property.Nullable.CollectionsModel","type.property.nullable.CollectionsModelClient.getNonNull":"Type.Property.Nullable.CollectionsModel.getNonNull","type.property.nullable.CollectionsModelClient.getNonNullWithResponse":"Type.Property.Nullable.CollectionsModel.getNonNull","type.property.nullable.CollectionsModelClient.getNull":"Type.Property.Nullable.CollectionsModel.getNull","type.property.nullable.CollectionsModelClient.getNullWithResponse":"Type.Property.Nullable.CollectionsModel.getNull","type.property.nullable.CollectionsModelClient.patchNonNull":"Type.Property.Nullable.CollectionsModel.patchNonNull","type.property.nullable.CollectionsModelClient.patchNonNullWithResponse":"Type.Property.Nullable.CollectionsModel.patchNonNull","type.property.nullable.CollectionsModelClient.patchNull":"Type.Property.Nullable.CollectionsModel.patchNull","type.property.nullable.CollectionsModelClient.patchNullWithResponse":"Type.Property.Nullable.CollectionsModel.patchNull","type.property.nullable.CollectionsStringAsyncClient":"Type.Property.Nullable.CollectionsString","type.property.nullable.CollectionsStringAsyncClient.getNonNull":"Type.Property.Nullable.CollectionsString.getNonNull","type.property.nullable.CollectionsStringAsyncClient.getNonNullWithResponse":"Type.Property.Nullable.CollectionsString.getNonNull","type.property.nullable.CollectionsStringAsyncClient.getNull":"Type.Property.Nullable.CollectionsString.getNull","type.property.nullable.CollectionsStringAsyncClient.getNullWithResponse":"Type.Property.Nullable.CollectionsString.getNull","type.property.nullable.CollectionsStringAsyncClient.patchNonNull":"Type.Property.Nullable.CollectionsString.patchNonNull","type.property.nullable.CollectionsStringAsyncClient.patchNonNullWithResponse":"Type.Property.Nullable.CollectionsString.patchNonNull","type.property.nullable.CollectionsStringAsyncClient.patchNull":"Type.Property.Nullable.CollectionsString.patchNull","type.property.nullable.CollectionsStringAsyncClient.patchNullWithResponse":"Type.Property.Nullable.CollectionsString.patchNull","type.property.nullable.CollectionsStringClient":"Type.Property.Nullable.CollectionsString","type.property.nullable.CollectionsStringClient.getNonNull":"Type.Property.Nullable.CollectionsString.getNonNull","type.property.nullable.CollectionsStringClient.getNonNullWithResponse":"Type.Property.Nullable.CollectionsString.getNonNull","type.property.nullable.CollectionsStringClient.getNull":"Type.Property.Nullable.CollectionsString.getNull","type.property.nullable.CollectionsStringClient.getNullWithResponse":"Type.Property.Nullable.CollectionsString.getNull","type.property.nullable.CollectionsStringClient.patchNonNull":"Type.Property.Nullable.CollectionsString.patchNonNull","type.property.nullable.CollectionsStringClient.patchNonNullWithResponse":"Type.Property.Nullable.CollectionsString.patchNonNull","type.property.nullable.CollectionsStringClient.patchNull":"Type.Property.Nullable.CollectionsString.patchNull","type.property.nullable.CollectionsStringClient.patchNullWithResponse":"Type.Property.Nullable.CollectionsString.patchNull","type.property.nullable.DatetimeOperationAsyncClient":"Type.Property.Nullable.Datetime","type.property.nullable.DatetimeOperationAsyncClient.getNonNull":"Type.Property.Nullable.Datetime.getNonNull","type.property.nullable.DatetimeOperationAsyncClient.getNonNullWithResponse":"Type.Property.Nullable.Datetime.getNonNull","type.property.nullable.DatetimeOperationAsyncClient.getNull":"Type.Property.Nullable.Datetime.getNull","type.property.nullable.DatetimeOperationAsyncClient.getNullWithResponse":"Type.Property.Nullable.Datetime.getNull","type.property.nullable.DatetimeOperationAsyncClient.patchNonNull":"Type.Property.Nullable.Datetime.patchNonNull","type.property.nullable.DatetimeOperationAsyncClient.patchNonNullWithResponse":"Type.Property.Nullable.Datetime.patchNonNull","type.property.nullable.DatetimeOperationAsyncClient.patchNull":"Type.Property.Nullable.Datetime.patchNull","type.property.nullable.DatetimeOperationAsyncClient.patchNullWithResponse":"Type.Property.Nullable.Datetime.patchNull","type.property.nullable.DatetimeOperationClient":"Type.Property.Nullable.Datetime","type.property.nullable.DatetimeOperationClient.getNonNull":"Type.Property.Nullable.Datetime.getNonNull","type.property.nullable.DatetimeOperationClient.getNonNullWithResponse":"Type.Property.Nullable.Datetime.getNonNull","type.property.nullable.DatetimeOperationClient.getNull":"Type.Property.Nullable.Datetime.getNull","type.property.nullable.DatetimeOperationClient.getNullWithResponse":"Type.Property.Nullable.Datetime.getNull","type.property.nullable.DatetimeOperationClient.patchNonNull":"Type.Property.Nullable.Datetime.patchNonNull","type.property.nullable.DatetimeOperationClient.patchNonNullWithResponse":"Type.Property.Nullable.Datetime.patchNonNull","type.property.nullable.DatetimeOperationClient.patchNull":"Type.Property.Nullable.Datetime.patchNull","type.property.nullable.DatetimeOperationClient.patchNullWithResponse":"Type.Property.Nullable.Datetime.patchNull","type.property.nullable.DurationOperationAsyncClient":"Type.Property.Nullable.Duration","type.property.nullable.DurationOperationAsyncClient.getNonNull":"Type.Property.Nullable.Duration.getNonNull","type.property.nullable.DurationOperationAsyncClient.getNonNullWithResponse":"Type.Property.Nullable.Duration.getNonNull","type.property.nullable.DurationOperationAsyncClient.getNull":"Type.Property.Nullable.Duration.getNull","type.property.nullable.DurationOperationAsyncClient.getNullWithResponse":"Type.Property.Nullable.Duration.getNull","type.property.nullable.DurationOperationAsyncClient.patchNonNull":"Type.Property.Nullable.Duration.patchNonNull","type.property.nullable.DurationOperationAsyncClient.patchNonNullWithResponse":"Type.Property.Nullable.Duration.patchNonNull","type.property.nullable.DurationOperationAsyncClient.patchNull":"Type.Property.Nullable.Duration.patchNull","type.property.nullable.DurationOperationAsyncClient.patchNullWithResponse":"Type.Property.Nullable.Duration.patchNull","type.property.nullable.DurationOperationClient":"Type.Property.Nullable.Duration","type.property.nullable.DurationOperationClient.getNonNull":"Type.Property.Nullable.Duration.getNonNull","type.property.nullable.DurationOperationClient.getNonNullWithResponse":"Type.Property.Nullable.Duration.getNonNull","type.property.nullable.DurationOperationClient.getNull":"Type.Property.Nullable.Duration.getNull","type.property.nullable.DurationOperationClient.getNullWithResponse":"Type.Property.Nullable.Duration.getNull","type.property.nullable.DurationOperationClient.patchNonNull":"Type.Property.Nullable.Duration.patchNonNull","type.property.nullable.DurationOperationClient.patchNonNullWithResponse":"Type.Property.Nullable.Duration.patchNonNull","type.property.nullable.DurationOperationClient.patchNull":"Type.Property.Nullable.Duration.patchNull","type.property.nullable.DurationOperationClient.patchNullWithResponse":"Type.Property.Nullable.Duration.patchNull","type.property.nullable.NullableClientBuilder":"Type.Property.Nullable","type.property.nullable.StringOperationAsyncClient":"Type.Property.Nullable.String","type.property.nullable.StringOperationAsyncClient.getNonNull":"Type.Property.Nullable.String.getNonNull","type.property.nullable.StringOperationAsyncClient.getNonNullWithResponse":"Type.Property.Nullable.String.getNonNull","type.property.nullable.StringOperationAsyncClient.getNull":"Type.Property.Nullable.String.getNull","type.property.nullable.StringOperationAsyncClient.getNullWithResponse":"Type.Property.Nullable.String.getNull","type.property.nullable.StringOperationAsyncClient.patchNonNull":"Type.Property.Nullable.String.patchNonNull","type.property.nullable.StringOperationAsyncClient.patchNonNullWithResponse":"Type.Property.Nullable.String.patchNonNull","type.property.nullable.StringOperationAsyncClient.patchNull":"Type.Property.Nullable.String.patchNull","type.property.nullable.StringOperationAsyncClient.patchNullWithResponse":"Type.Property.Nullable.String.patchNull","type.property.nullable.StringOperationClient":"Type.Property.Nullable.String","type.property.nullable.StringOperationClient.getNonNull":"Type.Property.Nullable.String.getNonNull","type.property.nullable.StringOperationClient.getNonNullWithResponse":"Type.Property.Nullable.String.getNonNull","type.property.nullable.StringOperationClient.getNull":"Type.Property.Nullable.String.getNull","type.property.nullable.StringOperationClient.getNullWithResponse":"Type.Property.Nullable.String.getNull","type.property.nullable.StringOperationClient.patchNonNull":"Type.Property.Nullable.String.patchNonNull","type.property.nullable.StringOperationClient.patchNonNullWithResponse":"Type.Property.Nullable.String.patchNonNull","type.property.nullable.StringOperationClient.patchNull":"Type.Property.Nullable.String.patchNull","type.property.nullable.StringOperationClient.patchNullWithResponse":"Type.Property.Nullable.String.patchNull","type.property.nullable.models.BytesProperty":"Type.Property.Nullable.BytesProperty","type.property.nullable.models.CollectionsByteProperty":"Type.Property.Nullable.CollectionsByteProperty","type.property.nullable.models.CollectionsModelProperty":"Type.Property.Nullable.CollectionsModelProperty","type.property.nullable.models.CollectionsStringProperty":"Type.Property.Nullable.CollectionsStringProperty","type.property.nullable.models.DatetimeProperty":"Type.Property.Nullable.DatetimeProperty","type.property.nullable.models.DurationProperty":"Type.Property.Nullable.DurationProperty","type.property.nullable.models.InnerModel":"Type.Property.Nullable.InnerModel","type.property.nullable.models.StringProperty":"Type.Property.Nullable.StringProperty"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/property/nullable/BytesAsyncClient.java","src/main/java/type/property/nullable/BytesClient.java","src/main/java/type/property/nullable/CollectionsByteAsyncClient.java","src/main/java/type/property/nullable/CollectionsByteClient.java","src/main/java/type/property/nullable/CollectionsModelAsyncClient.java","src/main/java/type/property/nullable/CollectionsModelClient.java","src/main/java/type/property/nullable/CollectionsStringAsyncClient.java","src/main/java/type/property/nullable/CollectionsStringClient.java","src/main/java/type/property/nullable/DatetimeOperationAsyncClient.java","src/main/java/type/property/nullable/DatetimeOperationClient.java","src/main/java/type/property/nullable/DurationOperationAsyncClient.java","src/main/java/type/property/nullable/DurationOperationClient.java","src/main/java/type/property/nullable/NullableClientBuilder.java","src/main/java/type/property/nullable/StringOperationAsyncClient.java","src/main/java/type/property/nullable/StringOperationClient.java","src/main/java/type/property/nullable/implementation/BytesImpl.java","src/main/java/type/property/nullable/implementation/CollectionsBytesImpl.java","src/main/java/type/property/nullable/implementation/CollectionsModelsImpl.java","src/main/java/type/property/nullable/implementation/CollectionsStringsImpl.java","src/main/java/type/property/nullable/implementation/DatetimeOperationsImpl.java","src/main/java/type/property/nullable/implementation/DurationOperationsImpl.java","src/main/java/type/property/nullable/implementation/JsonMergePatchHelper.java","src/main/java/type/property/nullable/implementation/NullableClientImpl.java","src/main/java/type/property/nullable/implementation/StringOperationsImpl.java","src/main/java/type/property/nullable/implementation/package-info.java","src/main/java/type/property/nullable/models/BytesProperty.java","src/main/java/type/property/nullable/models/CollectionsByteProperty.java","src/main/java/type/property/nullable/models/CollectionsModelProperty.java","src/main/java/type/property/nullable/models/CollectionsStringProperty.java","src/main/java/type/property/nullable/models/DatetimeProperty.java","src/main/java/type/property/nullable/models/DurationProperty.java","src/main/java/type/property/nullable/models/InnerModel.java","src/main/java/type/property/nullable/models/StringProperty.java","src/main/java/type/property/nullable/models/package-info.java","src/main/java/type/property/nullable/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.property.nullable.BytesAsyncClient":"Type.Property.Nullable.Bytes","type.property.nullable.BytesAsyncClient.getNonNull":"Type.Property.Nullable.Bytes.getNonNull","type.property.nullable.BytesAsyncClient.getNonNullWithResponse":"Type.Property.Nullable.Bytes.getNonNull","type.property.nullable.BytesAsyncClient.getNull":"Type.Property.Nullable.Bytes.getNull","type.property.nullable.BytesAsyncClient.getNullWithResponse":"Type.Property.Nullable.Bytes.getNull","type.property.nullable.BytesAsyncClient.patchNonNull":"Type.Property.Nullable.Bytes.patchNonNull","type.property.nullable.BytesAsyncClient.patchNonNullWithResponse":"Type.Property.Nullable.Bytes.patchNonNull","type.property.nullable.BytesAsyncClient.patchNull":"Type.Property.Nullable.Bytes.patchNull","type.property.nullable.BytesAsyncClient.patchNullWithResponse":"Type.Property.Nullable.Bytes.patchNull","type.property.nullable.BytesClient":"Type.Property.Nullable.Bytes","type.property.nullable.BytesClient.getNonNull":"Type.Property.Nullable.Bytes.getNonNull","type.property.nullable.BytesClient.getNonNullWithResponse":"Type.Property.Nullable.Bytes.getNonNull","type.property.nullable.BytesClient.getNull":"Type.Property.Nullable.Bytes.getNull","type.property.nullable.BytesClient.getNullWithResponse":"Type.Property.Nullable.Bytes.getNull","type.property.nullable.BytesClient.patchNonNull":"Type.Property.Nullable.Bytes.patchNonNull","type.property.nullable.BytesClient.patchNonNullWithResponse":"Type.Property.Nullable.Bytes.patchNonNull","type.property.nullable.BytesClient.patchNull":"Type.Property.Nullable.Bytes.patchNull","type.property.nullable.BytesClient.patchNullWithResponse":"Type.Property.Nullable.Bytes.patchNull","type.property.nullable.CollectionsByteAsyncClient":"Type.Property.Nullable.CollectionsByte","type.property.nullable.CollectionsByteAsyncClient.getNonNull":"Type.Property.Nullable.CollectionsByte.getNonNull","type.property.nullable.CollectionsByteAsyncClient.getNonNullWithResponse":"Type.Property.Nullable.CollectionsByte.getNonNull","type.property.nullable.CollectionsByteAsyncClient.getNull":"Type.Property.Nullable.CollectionsByte.getNull","type.property.nullable.CollectionsByteAsyncClient.getNullWithResponse":"Type.Property.Nullable.CollectionsByte.getNull","type.property.nullable.CollectionsByteAsyncClient.patchNonNull":"Type.Property.Nullable.CollectionsByte.patchNonNull","type.property.nullable.CollectionsByteAsyncClient.patchNonNullWithResponse":"Type.Property.Nullable.CollectionsByte.patchNonNull","type.property.nullable.CollectionsByteAsyncClient.patchNull":"Type.Property.Nullable.CollectionsByte.patchNull","type.property.nullable.CollectionsByteAsyncClient.patchNullWithResponse":"Type.Property.Nullable.CollectionsByte.patchNull","type.property.nullable.CollectionsByteClient":"Type.Property.Nullable.CollectionsByte","type.property.nullable.CollectionsByteClient.getNonNull":"Type.Property.Nullable.CollectionsByte.getNonNull","type.property.nullable.CollectionsByteClient.getNonNullWithResponse":"Type.Property.Nullable.CollectionsByte.getNonNull","type.property.nullable.CollectionsByteClient.getNull":"Type.Property.Nullable.CollectionsByte.getNull","type.property.nullable.CollectionsByteClient.getNullWithResponse":"Type.Property.Nullable.CollectionsByte.getNull","type.property.nullable.CollectionsByteClient.patchNonNull":"Type.Property.Nullable.CollectionsByte.patchNonNull","type.property.nullable.CollectionsByteClient.patchNonNullWithResponse":"Type.Property.Nullable.CollectionsByte.patchNonNull","type.property.nullable.CollectionsByteClient.patchNull":"Type.Property.Nullable.CollectionsByte.patchNull","type.property.nullable.CollectionsByteClient.patchNullWithResponse":"Type.Property.Nullable.CollectionsByte.patchNull","type.property.nullable.CollectionsModelAsyncClient":"Type.Property.Nullable.CollectionsModel","type.property.nullable.CollectionsModelAsyncClient.getNonNull":"Type.Property.Nullable.CollectionsModel.getNonNull","type.property.nullable.CollectionsModelAsyncClient.getNonNullWithResponse":"Type.Property.Nullable.CollectionsModel.getNonNull","type.property.nullable.CollectionsModelAsyncClient.getNull":"Type.Property.Nullable.CollectionsModel.getNull","type.property.nullable.CollectionsModelAsyncClient.getNullWithResponse":"Type.Property.Nullable.CollectionsModel.getNull","type.property.nullable.CollectionsModelAsyncClient.patchNonNull":"Type.Property.Nullable.CollectionsModel.patchNonNull","type.property.nullable.CollectionsModelAsyncClient.patchNonNullWithResponse":"Type.Property.Nullable.CollectionsModel.patchNonNull","type.property.nullable.CollectionsModelAsyncClient.patchNull":"Type.Property.Nullable.CollectionsModel.patchNull","type.property.nullable.CollectionsModelAsyncClient.patchNullWithResponse":"Type.Property.Nullable.CollectionsModel.patchNull","type.property.nullable.CollectionsModelClient":"Type.Property.Nullable.CollectionsModel","type.property.nullable.CollectionsModelClient.getNonNull":"Type.Property.Nullable.CollectionsModel.getNonNull","type.property.nullable.CollectionsModelClient.getNonNullWithResponse":"Type.Property.Nullable.CollectionsModel.getNonNull","type.property.nullable.CollectionsModelClient.getNull":"Type.Property.Nullable.CollectionsModel.getNull","type.property.nullable.CollectionsModelClient.getNullWithResponse":"Type.Property.Nullable.CollectionsModel.getNull","type.property.nullable.CollectionsModelClient.patchNonNull":"Type.Property.Nullable.CollectionsModel.patchNonNull","type.property.nullable.CollectionsModelClient.patchNonNullWithResponse":"Type.Property.Nullable.CollectionsModel.patchNonNull","type.property.nullable.CollectionsModelClient.patchNull":"Type.Property.Nullable.CollectionsModel.patchNull","type.property.nullable.CollectionsModelClient.patchNullWithResponse":"Type.Property.Nullable.CollectionsModel.patchNull","type.property.nullable.CollectionsStringAsyncClient":"Type.Property.Nullable.CollectionsString","type.property.nullable.CollectionsStringAsyncClient.getNonNull":"Type.Property.Nullable.CollectionsString.getNonNull","type.property.nullable.CollectionsStringAsyncClient.getNonNullWithResponse":"Type.Property.Nullable.CollectionsString.getNonNull","type.property.nullable.CollectionsStringAsyncClient.getNull":"Type.Property.Nullable.CollectionsString.getNull","type.property.nullable.CollectionsStringAsyncClient.getNullWithResponse":"Type.Property.Nullable.CollectionsString.getNull","type.property.nullable.CollectionsStringAsyncClient.patchNonNull":"Type.Property.Nullable.CollectionsString.patchNonNull","type.property.nullable.CollectionsStringAsyncClient.patchNonNullWithResponse":"Type.Property.Nullable.CollectionsString.patchNonNull","type.property.nullable.CollectionsStringAsyncClient.patchNull":"Type.Property.Nullable.CollectionsString.patchNull","type.property.nullable.CollectionsStringAsyncClient.patchNullWithResponse":"Type.Property.Nullable.CollectionsString.patchNull","type.property.nullable.CollectionsStringClient":"Type.Property.Nullable.CollectionsString","type.property.nullable.CollectionsStringClient.getNonNull":"Type.Property.Nullable.CollectionsString.getNonNull","type.property.nullable.CollectionsStringClient.getNonNullWithResponse":"Type.Property.Nullable.CollectionsString.getNonNull","type.property.nullable.CollectionsStringClient.getNull":"Type.Property.Nullable.CollectionsString.getNull","type.property.nullable.CollectionsStringClient.getNullWithResponse":"Type.Property.Nullable.CollectionsString.getNull","type.property.nullable.CollectionsStringClient.patchNonNull":"Type.Property.Nullable.CollectionsString.patchNonNull","type.property.nullable.CollectionsStringClient.patchNonNullWithResponse":"Type.Property.Nullable.CollectionsString.patchNonNull","type.property.nullable.CollectionsStringClient.patchNull":"Type.Property.Nullable.CollectionsString.patchNull","type.property.nullable.CollectionsStringClient.patchNullWithResponse":"Type.Property.Nullable.CollectionsString.patchNull","type.property.nullable.DatetimeOperationAsyncClient":"Type.Property.Nullable.Datetime","type.property.nullable.DatetimeOperationAsyncClient.getNonNull":"Type.Property.Nullable.Datetime.getNonNull","type.property.nullable.DatetimeOperationAsyncClient.getNonNullWithResponse":"Type.Property.Nullable.Datetime.getNonNull","type.property.nullable.DatetimeOperationAsyncClient.getNull":"Type.Property.Nullable.Datetime.getNull","type.property.nullable.DatetimeOperationAsyncClient.getNullWithResponse":"Type.Property.Nullable.Datetime.getNull","type.property.nullable.DatetimeOperationAsyncClient.patchNonNull":"Type.Property.Nullable.Datetime.patchNonNull","type.property.nullable.DatetimeOperationAsyncClient.patchNonNullWithResponse":"Type.Property.Nullable.Datetime.patchNonNull","type.property.nullable.DatetimeOperationAsyncClient.patchNull":"Type.Property.Nullable.Datetime.patchNull","type.property.nullable.DatetimeOperationAsyncClient.patchNullWithResponse":"Type.Property.Nullable.Datetime.patchNull","type.property.nullable.DatetimeOperationClient":"Type.Property.Nullable.Datetime","type.property.nullable.DatetimeOperationClient.getNonNull":"Type.Property.Nullable.Datetime.getNonNull","type.property.nullable.DatetimeOperationClient.getNonNullWithResponse":"Type.Property.Nullable.Datetime.getNonNull","type.property.nullable.DatetimeOperationClient.getNull":"Type.Property.Nullable.Datetime.getNull","type.property.nullable.DatetimeOperationClient.getNullWithResponse":"Type.Property.Nullable.Datetime.getNull","type.property.nullable.DatetimeOperationClient.patchNonNull":"Type.Property.Nullable.Datetime.patchNonNull","type.property.nullable.DatetimeOperationClient.patchNonNullWithResponse":"Type.Property.Nullable.Datetime.patchNonNull","type.property.nullable.DatetimeOperationClient.patchNull":"Type.Property.Nullable.Datetime.patchNull","type.property.nullable.DatetimeOperationClient.patchNullWithResponse":"Type.Property.Nullable.Datetime.patchNull","type.property.nullable.DurationOperationAsyncClient":"Type.Property.Nullable.Duration","type.property.nullable.DurationOperationAsyncClient.getNonNull":"Type.Property.Nullable.Duration.getNonNull","type.property.nullable.DurationOperationAsyncClient.getNonNullWithResponse":"Type.Property.Nullable.Duration.getNonNull","type.property.nullable.DurationOperationAsyncClient.getNull":"Type.Property.Nullable.Duration.getNull","type.property.nullable.DurationOperationAsyncClient.getNullWithResponse":"Type.Property.Nullable.Duration.getNull","type.property.nullable.DurationOperationAsyncClient.patchNonNull":"Type.Property.Nullable.Duration.patchNonNull","type.property.nullable.DurationOperationAsyncClient.patchNonNullWithResponse":"Type.Property.Nullable.Duration.patchNonNull","type.property.nullable.DurationOperationAsyncClient.patchNull":"Type.Property.Nullable.Duration.patchNull","type.property.nullable.DurationOperationAsyncClient.patchNullWithResponse":"Type.Property.Nullable.Duration.patchNull","type.property.nullable.DurationOperationClient":"Type.Property.Nullable.Duration","type.property.nullable.DurationOperationClient.getNonNull":"Type.Property.Nullable.Duration.getNonNull","type.property.nullable.DurationOperationClient.getNonNullWithResponse":"Type.Property.Nullable.Duration.getNonNull","type.property.nullable.DurationOperationClient.getNull":"Type.Property.Nullable.Duration.getNull","type.property.nullable.DurationOperationClient.getNullWithResponse":"Type.Property.Nullable.Duration.getNull","type.property.nullable.DurationOperationClient.patchNonNull":"Type.Property.Nullable.Duration.patchNonNull","type.property.nullable.DurationOperationClient.patchNonNullWithResponse":"Type.Property.Nullable.Duration.patchNonNull","type.property.nullable.DurationOperationClient.patchNull":"Type.Property.Nullable.Duration.patchNull","type.property.nullable.DurationOperationClient.patchNullWithResponse":"Type.Property.Nullable.Duration.patchNull","type.property.nullable.NullableClientBuilder":"Type.Property.Nullable","type.property.nullable.StringOperationAsyncClient":"Type.Property.Nullable.String","type.property.nullable.StringOperationAsyncClient.getNonNull":"Type.Property.Nullable.String.getNonNull","type.property.nullable.StringOperationAsyncClient.getNonNullWithResponse":"Type.Property.Nullable.String.getNonNull","type.property.nullable.StringOperationAsyncClient.getNull":"Type.Property.Nullable.String.getNull","type.property.nullable.StringOperationAsyncClient.getNullWithResponse":"Type.Property.Nullable.String.getNull","type.property.nullable.StringOperationAsyncClient.patchNonNull":"Type.Property.Nullable.String.patchNonNull","type.property.nullable.StringOperationAsyncClient.patchNonNullWithResponse":"Type.Property.Nullable.String.patchNonNull","type.property.nullable.StringOperationAsyncClient.patchNull":"Type.Property.Nullable.String.patchNull","type.property.nullable.StringOperationAsyncClient.patchNullWithResponse":"Type.Property.Nullable.String.patchNull","type.property.nullable.StringOperationClient":"Type.Property.Nullable.String","type.property.nullable.StringOperationClient.getNonNull":"Type.Property.Nullable.String.getNonNull","type.property.nullable.StringOperationClient.getNonNullWithResponse":"Type.Property.Nullable.String.getNonNull","type.property.nullable.StringOperationClient.getNull":"Type.Property.Nullable.String.getNull","type.property.nullable.StringOperationClient.getNullWithResponse":"Type.Property.Nullable.String.getNull","type.property.nullable.StringOperationClient.patchNonNull":"Type.Property.Nullable.String.patchNonNull","type.property.nullable.StringOperationClient.patchNonNullWithResponse":"Type.Property.Nullable.String.patchNonNull","type.property.nullable.StringOperationClient.patchNull":"Type.Property.Nullable.String.patchNull","type.property.nullable.StringOperationClient.patchNullWithResponse":"Type.Property.Nullable.String.patchNull","type.property.nullable.models.BytesProperty":"Type.Property.Nullable.BytesProperty","type.property.nullable.models.CollectionsByteProperty":"Type.Property.Nullable.CollectionsByteProperty","type.property.nullable.models.CollectionsModelProperty":"Type.Property.Nullable.CollectionsModelProperty","type.property.nullable.models.CollectionsStringProperty":"Type.Property.Nullable.CollectionsStringProperty","type.property.nullable.models.DatetimeProperty":"Type.Property.Nullable.DatetimeProperty","type.property.nullable.models.DurationProperty":"Type.Property.Nullable.DurationProperty","type.property.nullable.models.InnerModel":"Type.Property.Nullable.InnerModel","type.property.nullable.models.StringProperty":"Type.Property.Nullable.StringProperty"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/property/nullable/BytesAsyncClient.java","src/main/java/type/property/nullable/BytesClient.java","src/main/java/type/property/nullable/CollectionsByteAsyncClient.java","src/main/java/type/property/nullable/CollectionsByteClient.java","src/main/java/type/property/nullable/CollectionsModelAsyncClient.java","src/main/java/type/property/nullable/CollectionsModelClient.java","src/main/java/type/property/nullable/CollectionsStringAsyncClient.java","src/main/java/type/property/nullable/CollectionsStringClient.java","src/main/java/type/property/nullable/DatetimeOperationAsyncClient.java","src/main/java/type/property/nullable/DatetimeOperationClient.java","src/main/java/type/property/nullable/DurationOperationAsyncClient.java","src/main/java/type/property/nullable/DurationOperationClient.java","src/main/java/type/property/nullable/NullableClientBuilder.java","src/main/java/type/property/nullable/StringOperationAsyncClient.java","src/main/java/type/property/nullable/StringOperationClient.java","src/main/java/type/property/nullable/implementation/BytesImpl.java","src/main/java/type/property/nullable/implementation/CollectionsBytesImpl.java","src/main/java/type/property/nullable/implementation/CollectionsModelsImpl.java","src/main/java/type/property/nullable/implementation/CollectionsStringsImpl.java","src/main/java/type/property/nullable/implementation/DatetimeOperationsImpl.java","src/main/java/type/property/nullable/implementation/DurationOperationsImpl.java","src/main/java/type/property/nullable/implementation/JsonMergePatchHelper.java","src/main/java/type/property/nullable/implementation/NullableClientImpl.java","src/main/java/type/property/nullable/implementation/StringOperationsImpl.java","src/main/java/type/property/nullable/implementation/package-info.java","src/main/java/type/property/nullable/models/BytesProperty.java","src/main/java/type/property/nullable/models/CollectionsByteProperty.java","src/main/java/type/property/nullable/models/CollectionsModelProperty.java","src/main/java/type/property/nullable/models/CollectionsStringProperty.java","src/main/java/type/property/nullable/models/DatetimeProperty.java","src/main/java/type/property/nullable/models/DurationProperty.java","src/main/java/type/property/nullable/models/InnerModel.java","src/main/java/type/property/nullable/models/StringProperty.java","src/main/java/type/property/nullable/models/package-info.java","src/main/java/type/property/nullable/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-optional_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-optional_apiview_properties.json deleted file mode 100644 index c584d938ab6..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-optional_apiview_properties.json +++ /dev/null @@ -1,317 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.property.optional.BooleanLiteralAsyncClient": "Type.Property.Optional.BooleanLiteral", - "type.property.optional.BooleanLiteralAsyncClient.getAll": "Type.Property.Optional.BooleanLiteral.getAll", - "type.property.optional.BooleanLiteralAsyncClient.getAllWithResponse": "Type.Property.Optional.BooleanLiteral.getAll", - "type.property.optional.BooleanLiteralAsyncClient.getDefault": "Type.Property.Optional.BooleanLiteral.getDefault", - "type.property.optional.BooleanLiteralAsyncClient.getDefaultWithResponse": "Type.Property.Optional.BooleanLiteral.getDefault", - "type.property.optional.BooleanLiteralAsyncClient.putAll": "Type.Property.Optional.BooleanLiteral.putAll", - "type.property.optional.BooleanLiteralAsyncClient.putAllWithResponse": "Type.Property.Optional.BooleanLiteral.putAll", - "type.property.optional.BooleanLiteralAsyncClient.putDefault": "Type.Property.Optional.BooleanLiteral.putDefault", - "type.property.optional.BooleanLiteralAsyncClient.putDefaultWithResponse": "Type.Property.Optional.BooleanLiteral.putDefault", - "type.property.optional.BooleanLiteralClient": "Type.Property.Optional.BooleanLiteral", - "type.property.optional.BooleanLiteralClient.getAll": "Type.Property.Optional.BooleanLiteral.getAll", - "type.property.optional.BooleanLiteralClient.getAllWithResponse": "Type.Property.Optional.BooleanLiteral.getAll", - "type.property.optional.BooleanLiteralClient.getDefault": "Type.Property.Optional.BooleanLiteral.getDefault", - "type.property.optional.BooleanLiteralClient.getDefaultWithResponse": "Type.Property.Optional.BooleanLiteral.getDefault", - "type.property.optional.BooleanLiteralClient.putAll": "Type.Property.Optional.BooleanLiteral.putAll", - "type.property.optional.BooleanLiteralClient.putAllWithResponse": "Type.Property.Optional.BooleanLiteral.putAll", - "type.property.optional.BooleanLiteralClient.putDefault": "Type.Property.Optional.BooleanLiteral.putDefault", - "type.property.optional.BooleanLiteralClient.putDefaultWithResponse": "Type.Property.Optional.BooleanLiteral.putDefault", - "type.property.optional.BytesAsyncClient": "Type.Property.Optional.Bytes", - "type.property.optional.BytesAsyncClient.getAll": "Type.Property.Optional.Bytes.getAll", - "type.property.optional.BytesAsyncClient.getAllWithResponse": "Type.Property.Optional.Bytes.getAll", - "type.property.optional.BytesAsyncClient.getDefault": "Type.Property.Optional.Bytes.getDefault", - "type.property.optional.BytesAsyncClient.getDefaultWithResponse": "Type.Property.Optional.Bytes.getDefault", - "type.property.optional.BytesAsyncClient.putAll": "Type.Property.Optional.Bytes.putAll", - "type.property.optional.BytesAsyncClient.putAllWithResponse": "Type.Property.Optional.Bytes.putAll", - "type.property.optional.BytesAsyncClient.putDefault": "Type.Property.Optional.Bytes.putDefault", - "type.property.optional.BytesAsyncClient.putDefaultWithResponse": "Type.Property.Optional.Bytes.putDefault", - "type.property.optional.BytesClient": "Type.Property.Optional.Bytes", - "type.property.optional.BytesClient.getAll": "Type.Property.Optional.Bytes.getAll", - "type.property.optional.BytesClient.getAllWithResponse": "Type.Property.Optional.Bytes.getAll", - "type.property.optional.BytesClient.getDefault": "Type.Property.Optional.Bytes.getDefault", - "type.property.optional.BytesClient.getDefaultWithResponse": "Type.Property.Optional.Bytes.getDefault", - "type.property.optional.BytesClient.putAll": "Type.Property.Optional.Bytes.putAll", - "type.property.optional.BytesClient.putAllWithResponse": "Type.Property.Optional.Bytes.putAll", - "type.property.optional.BytesClient.putDefault": "Type.Property.Optional.Bytes.putDefault", - "type.property.optional.BytesClient.putDefaultWithResponse": "Type.Property.Optional.Bytes.putDefault", - "type.property.optional.CollectionsByteAsyncClient": "Type.Property.Optional.CollectionsByte", - "type.property.optional.CollectionsByteAsyncClient.getAll": "Type.Property.Optional.CollectionsByte.getAll", - "type.property.optional.CollectionsByteAsyncClient.getAllWithResponse": "Type.Property.Optional.CollectionsByte.getAll", - "type.property.optional.CollectionsByteAsyncClient.getDefault": "Type.Property.Optional.CollectionsByte.getDefault", - "type.property.optional.CollectionsByteAsyncClient.getDefaultWithResponse": "Type.Property.Optional.CollectionsByte.getDefault", - "type.property.optional.CollectionsByteAsyncClient.putAll": "Type.Property.Optional.CollectionsByte.putAll", - "type.property.optional.CollectionsByteAsyncClient.putAllWithResponse": "Type.Property.Optional.CollectionsByte.putAll", - "type.property.optional.CollectionsByteAsyncClient.putDefault": "Type.Property.Optional.CollectionsByte.putDefault", - "type.property.optional.CollectionsByteAsyncClient.putDefaultWithResponse": "Type.Property.Optional.CollectionsByte.putDefault", - "type.property.optional.CollectionsByteClient": "Type.Property.Optional.CollectionsByte", - "type.property.optional.CollectionsByteClient.getAll": "Type.Property.Optional.CollectionsByte.getAll", - "type.property.optional.CollectionsByteClient.getAllWithResponse": "Type.Property.Optional.CollectionsByte.getAll", - "type.property.optional.CollectionsByteClient.getDefault": "Type.Property.Optional.CollectionsByte.getDefault", - "type.property.optional.CollectionsByteClient.getDefaultWithResponse": "Type.Property.Optional.CollectionsByte.getDefault", - "type.property.optional.CollectionsByteClient.putAll": "Type.Property.Optional.CollectionsByte.putAll", - "type.property.optional.CollectionsByteClient.putAllWithResponse": "Type.Property.Optional.CollectionsByte.putAll", - "type.property.optional.CollectionsByteClient.putDefault": "Type.Property.Optional.CollectionsByte.putDefault", - "type.property.optional.CollectionsByteClient.putDefaultWithResponse": "Type.Property.Optional.CollectionsByte.putDefault", - "type.property.optional.CollectionsModelAsyncClient": "Type.Property.Optional.CollectionsModel", - "type.property.optional.CollectionsModelAsyncClient.getAll": "Type.Property.Optional.CollectionsModel.getAll", - "type.property.optional.CollectionsModelAsyncClient.getAllWithResponse": "Type.Property.Optional.CollectionsModel.getAll", - "type.property.optional.CollectionsModelAsyncClient.getDefault": "Type.Property.Optional.CollectionsModel.getDefault", - "type.property.optional.CollectionsModelAsyncClient.getDefaultWithResponse": "Type.Property.Optional.CollectionsModel.getDefault", - "type.property.optional.CollectionsModelAsyncClient.putAll": "Type.Property.Optional.CollectionsModel.putAll", - "type.property.optional.CollectionsModelAsyncClient.putAllWithResponse": "Type.Property.Optional.CollectionsModel.putAll", - "type.property.optional.CollectionsModelAsyncClient.putDefault": "Type.Property.Optional.CollectionsModel.putDefault", - "type.property.optional.CollectionsModelAsyncClient.putDefaultWithResponse": "Type.Property.Optional.CollectionsModel.putDefault", - "type.property.optional.CollectionsModelClient": "Type.Property.Optional.CollectionsModel", - "type.property.optional.CollectionsModelClient.getAll": "Type.Property.Optional.CollectionsModel.getAll", - "type.property.optional.CollectionsModelClient.getAllWithResponse": "Type.Property.Optional.CollectionsModel.getAll", - "type.property.optional.CollectionsModelClient.getDefault": "Type.Property.Optional.CollectionsModel.getDefault", - "type.property.optional.CollectionsModelClient.getDefaultWithResponse": "Type.Property.Optional.CollectionsModel.getDefault", - "type.property.optional.CollectionsModelClient.putAll": "Type.Property.Optional.CollectionsModel.putAll", - "type.property.optional.CollectionsModelClient.putAllWithResponse": "Type.Property.Optional.CollectionsModel.putAll", - "type.property.optional.CollectionsModelClient.putDefault": "Type.Property.Optional.CollectionsModel.putDefault", - "type.property.optional.CollectionsModelClient.putDefaultWithResponse": "Type.Property.Optional.CollectionsModel.putDefault", - "type.property.optional.DatetimeOperationAsyncClient": "Type.Property.Optional.Datetime", - "type.property.optional.DatetimeOperationAsyncClient.getAll": "Type.Property.Optional.Datetime.getAll", - "type.property.optional.DatetimeOperationAsyncClient.getAllWithResponse": "Type.Property.Optional.Datetime.getAll", - "type.property.optional.DatetimeOperationAsyncClient.getDefault": "Type.Property.Optional.Datetime.getDefault", - "type.property.optional.DatetimeOperationAsyncClient.getDefaultWithResponse": "Type.Property.Optional.Datetime.getDefault", - "type.property.optional.DatetimeOperationAsyncClient.putAll": "Type.Property.Optional.Datetime.putAll", - "type.property.optional.DatetimeOperationAsyncClient.putAllWithResponse": "Type.Property.Optional.Datetime.putAll", - "type.property.optional.DatetimeOperationAsyncClient.putDefault": "Type.Property.Optional.Datetime.putDefault", - "type.property.optional.DatetimeOperationAsyncClient.putDefaultWithResponse": "Type.Property.Optional.Datetime.putDefault", - "type.property.optional.DatetimeOperationClient": "Type.Property.Optional.Datetime", - "type.property.optional.DatetimeOperationClient.getAll": "Type.Property.Optional.Datetime.getAll", - "type.property.optional.DatetimeOperationClient.getAllWithResponse": "Type.Property.Optional.Datetime.getAll", - "type.property.optional.DatetimeOperationClient.getDefault": "Type.Property.Optional.Datetime.getDefault", - "type.property.optional.DatetimeOperationClient.getDefaultWithResponse": "Type.Property.Optional.Datetime.getDefault", - "type.property.optional.DatetimeOperationClient.putAll": "Type.Property.Optional.Datetime.putAll", - "type.property.optional.DatetimeOperationClient.putAllWithResponse": "Type.Property.Optional.Datetime.putAll", - "type.property.optional.DatetimeOperationClient.putDefault": "Type.Property.Optional.Datetime.putDefault", - "type.property.optional.DatetimeOperationClient.putDefaultWithResponse": "Type.Property.Optional.Datetime.putDefault", - "type.property.optional.DurationOperationAsyncClient": "Type.Property.Optional.Duration", - "type.property.optional.DurationOperationAsyncClient.getAll": "Type.Property.Optional.Duration.getAll", - "type.property.optional.DurationOperationAsyncClient.getAllWithResponse": "Type.Property.Optional.Duration.getAll", - "type.property.optional.DurationOperationAsyncClient.getDefault": "Type.Property.Optional.Duration.getDefault", - "type.property.optional.DurationOperationAsyncClient.getDefaultWithResponse": "Type.Property.Optional.Duration.getDefault", - "type.property.optional.DurationOperationAsyncClient.putAll": "Type.Property.Optional.Duration.putAll", - "type.property.optional.DurationOperationAsyncClient.putAllWithResponse": "Type.Property.Optional.Duration.putAll", - "type.property.optional.DurationOperationAsyncClient.putDefault": "Type.Property.Optional.Duration.putDefault", - "type.property.optional.DurationOperationAsyncClient.putDefaultWithResponse": "Type.Property.Optional.Duration.putDefault", - "type.property.optional.DurationOperationClient": "Type.Property.Optional.Duration", - "type.property.optional.DurationOperationClient.getAll": "Type.Property.Optional.Duration.getAll", - "type.property.optional.DurationOperationClient.getAllWithResponse": "Type.Property.Optional.Duration.getAll", - "type.property.optional.DurationOperationClient.getDefault": "Type.Property.Optional.Duration.getDefault", - "type.property.optional.DurationOperationClient.getDefaultWithResponse": "Type.Property.Optional.Duration.getDefault", - "type.property.optional.DurationOperationClient.putAll": "Type.Property.Optional.Duration.putAll", - "type.property.optional.DurationOperationClient.putAllWithResponse": "Type.Property.Optional.Duration.putAll", - "type.property.optional.DurationOperationClient.putDefault": "Type.Property.Optional.Duration.putDefault", - "type.property.optional.DurationOperationClient.putDefaultWithResponse": "Type.Property.Optional.Duration.putDefault", - "type.property.optional.FloatLiteralAsyncClient": "Type.Property.Optional.FloatLiteral", - "type.property.optional.FloatLiteralAsyncClient.getAll": "Type.Property.Optional.FloatLiteral.getAll", - "type.property.optional.FloatLiteralAsyncClient.getAllWithResponse": "Type.Property.Optional.FloatLiteral.getAll", - "type.property.optional.FloatLiteralAsyncClient.getDefault": "Type.Property.Optional.FloatLiteral.getDefault", - "type.property.optional.FloatLiteralAsyncClient.getDefaultWithResponse": "Type.Property.Optional.FloatLiteral.getDefault", - "type.property.optional.FloatLiteralAsyncClient.putAll": "Type.Property.Optional.FloatLiteral.putAll", - "type.property.optional.FloatLiteralAsyncClient.putAllWithResponse": "Type.Property.Optional.FloatLiteral.putAll", - "type.property.optional.FloatLiteralAsyncClient.putDefault": "Type.Property.Optional.FloatLiteral.putDefault", - "type.property.optional.FloatLiteralAsyncClient.putDefaultWithResponse": "Type.Property.Optional.FloatLiteral.putDefault", - "type.property.optional.FloatLiteralClient": "Type.Property.Optional.FloatLiteral", - "type.property.optional.FloatLiteralClient.getAll": "Type.Property.Optional.FloatLiteral.getAll", - "type.property.optional.FloatLiteralClient.getAllWithResponse": "Type.Property.Optional.FloatLiteral.getAll", - "type.property.optional.FloatLiteralClient.getDefault": "Type.Property.Optional.FloatLiteral.getDefault", - "type.property.optional.FloatLiteralClient.getDefaultWithResponse": "Type.Property.Optional.FloatLiteral.getDefault", - "type.property.optional.FloatLiteralClient.putAll": "Type.Property.Optional.FloatLiteral.putAll", - "type.property.optional.FloatLiteralClient.putAllWithResponse": "Type.Property.Optional.FloatLiteral.putAll", - "type.property.optional.FloatLiteralClient.putDefault": "Type.Property.Optional.FloatLiteral.putDefault", - "type.property.optional.FloatLiteralClient.putDefaultWithResponse": "Type.Property.Optional.FloatLiteral.putDefault", - "type.property.optional.IntLiteralAsyncClient": "Type.Property.Optional.IntLiteral", - "type.property.optional.IntLiteralAsyncClient.getAll": "Type.Property.Optional.IntLiteral.getAll", - "type.property.optional.IntLiteralAsyncClient.getAllWithResponse": "Type.Property.Optional.IntLiteral.getAll", - "type.property.optional.IntLiteralAsyncClient.getDefault": "Type.Property.Optional.IntLiteral.getDefault", - "type.property.optional.IntLiteralAsyncClient.getDefaultWithResponse": "Type.Property.Optional.IntLiteral.getDefault", - "type.property.optional.IntLiteralAsyncClient.putAll": "Type.Property.Optional.IntLiteral.putAll", - "type.property.optional.IntLiteralAsyncClient.putAllWithResponse": "Type.Property.Optional.IntLiteral.putAll", - "type.property.optional.IntLiteralAsyncClient.putDefault": "Type.Property.Optional.IntLiteral.putDefault", - "type.property.optional.IntLiteralAsyncClient.putDefaultWithResponse": "Type.Property.Optional.IntLiteral.putDefault", - "type.property.optional.IntLiteralClient": "Type.Property.Optional.IntLiteral", - "type.property.optional.IntLiteralClient.getAll": "Type.Property.Optional.IntLiteral.getAll", - "type.property.optional.IntLiteralClient.getAllWithResponse": "Type.Property.Optional.IntLiteral.getAll", - "type.property.optional.IntLiteralClient.getDefault": "Type.Property.Optional.IntLiteral.getDefault", - "type.property.optional.IntLiteralClient.getDefaultWithResponse": "Type.Property.Optional.IntLiteral.getDefault", - "type.property.optional.IntLiteralClient.putAll": "Type.Property.Optional.IntLiteral.putAll", - "type.property.optional.IntLiteralClient.putAllWithResponse": "Type.Property.Optional.IntLiteral.putAll", - "type.property.optional.IntLiteralClient.putDefault": "Type.Property.Optional.IntLiteral.putDefault", - "type.property.optional.IntLiteralClient.putDefaultWithResponse": "Type.Property.Optional.IntLiteral.putDefault", - "type.property.optional.OptionalClientBuilder": "Type.Property.Optional", - "type.property.optional.PlainDateAsyncClient": "Type.Property.Optional.PlainDate", - "type.property.optional.PlainDateAsyncClient.getAll": "Type.Property.Optional.PlainDate.getAll", - "type.property.optional.PlainDateAsyncClient.getAllWithResponse": "Type.Property.Optional.PlainDate.getAll", - "type.property.optional.PlainDateAsyncClient.getDefault": "Type.Property.Optional.PlainDate.getDefault", - "type.property.optional.PlainDateAsyncClient.getDefaultWithResponse": "Type.Property.Optional.PlainDate.getDefault", - "type.property.optional.PlainDateAsyncClient.putAll": "Type.Property.Optional.PlainDate.putAll", - "type.property.optional.PlainDateAsyncClient.putAllWithResponse": "Type.Property.Optional.PlainDate.putAll", - "type.property.optional.PlainDateAsyncClient.putDefault": "Type.Property.Optional.PlainDate.putDefault", - "type.property.optional.PlainDateAsyncClient.putDefaultWithResponse": "Type.Property.Optional.PlainDate.putDefault", - "type.property.optional.PlainDateClient": "Type.Property.Optional.PlainDate", - "type.property.optional.PlainDateClient.getAll": "Type.Property.Optional.PlainDate.getAll", - "type.property.optional.PlainDateClient.getAllWithResponse": "Type.Property.Optional.PlainDate.getAll", - "type.property.optional.PlainDateClient.getDefault": "Type.Property.Optional.PlainDate.getDefault", - "type.property.optional.PlainDateClient.getDefaultWithResponse": "Type.Property.Optional.PlainDate.getDefault", - "type.property.optional.PlainDateClient.putAll": "Type.Property.Optional.PlainDate.putAll", - "type.property.optional.PlainDateClient.putAllWithResponse": "Type.Property.Optional.PlainDate.putAll", - "type.property.optional.PlainDateClient.putDefault": "Type.Property.Optional.PlainDate.putDefault", - "type.property.optional.PlainDateClient.putDefaultWithResponse": "Type.Property.Optional.PlainDate.putDefault", - "type.property.optional.PlainTimeAsyncClient": "Type.Property.Optional.PlainTime", - "type.property.optional.PlainTimeAsyncClient.getAll": "Type.Property.Optional.PlainTime.getAll", - "type.property.optional.PlainTimeAsyncClient.getAllWithResponse": "Type.Property.Optional.PlainTime.getAll", - "type.property.optional.PlainTimeAsyncClient.getDefault": "Type.Property.Optional.PlainTime.getDefault", - "type.property.optional.PlainTimeAsyncClient.getDefaultWithResponse": "Type.Property.Optional.PlainTime.getDefault", - "type.property.optional.PlainTimeAsyncClient.putAll": "Type.Property.Optional.PlainTime.putAll", - "type.property.optional.PlainTimeAsyncClient.putAllWithResponse": "Type.Property.Optional.PlainTime.putAll", - "type.property.optional.PlainTimeAsyncClient.putDefault": "Type.Property.Optional.PlainTime.putDefault", - "type.property.optional.PlainTimeAsyncClient.putDefaultWithResponse": "Type.Property.Optional.PlainTime.putDefault", - "type.property.optional.PlainTimeClient": "Type.Property.Optional.PlainTime", - "type.property.optional.PlainTimeClient.getAll": "Type.Property.Optional.PlainTime.getAll", - "type.property.optional.PlainTimeClient.getAllWithResponse": "Type.Property.Optional.PlainTime.getAll", - "type.property.optional.PlainTimeClient.getDefault": "Type.Property.Optional.PlainTime.getDefault", - "type.property.optional.PlainTimeClient.getDefaultWithResponse": "Type.Property.Optional.PlainTime.getDefault", - "type.property.optional.PlainTimeClient.putAll": "Type.Property.Optional.PlainTime.putAll", - "type.property.optional.PlainTimeClient.putAllWithResponse": "Type.Property.Optional.PlainTime.putAll", - "type.property.optional.PlainTimeClient.putDefault": "Type.Property.Optional.PlainTime.putDefault", - "type.property.optional.PlainTimeClient.putDefaultWithResponse": "Type.Property.Optional.PlainTime.putDefault", - "type.property.optional.RequiredAndOptionalAsyncClient": "Type.Property.Optional.RequiredAndOptional", - "type.property.optional.RequiredAndOptionalAsyncClient.getAll": "Type.Property.Optional.RequiredAndOptional.getAll", - "type.property.optional.RequiredAndOptionalAsyncClient.getAllWithResponse": "Type.Property.Optional.RequiredAndOptional.getAll", - "type.property.optional.RequiredAndOptionalAsyncClient.getRequiredOnly": "Type.Property.Optional.RequiredAndOptional.getRequiredOnly", - "type.property.optional.RequiredAndOptionalAsyncClient.getRequiredOnlyWithResponse": "Type.Property.Optional.RequiredAndOptional.getRequiredOnly", - "type.property.optional.RequiredAndOptionalAsyncClient.putAll": "Type.Property.Optional.RequiredAndOptional.putAll", - "type.property.optional.RequiredAndOptionalAsyncClient.putAllWithResponse": "Type.Property.Optional.RequiredAndOptional.putAll", - "type.property.optional.RequiredAndOptionalAsyncClient.putRequiredOnly": "Type.Property.Optional.RequiredAndOptional.putRequiredOnly", - "type.property.optional.RequiredAndOptionalAsyncClient.putRequiredOnlyWithResponse": "Type.Property.Optional.RequiredAndOptional.putRequiredOnly", - "type.property.optional.RequiredAndOptionalClient": "Type.Property.Optional.RequiredAndOptional", - "type.property.optional.RequiredAndOptionalClient.getAll": "Type.Property.Optional.RequiredAndOptional.getAll", - "type.property.optional.RequiredAndOptionalClient.getAllWithResponse": "Type.Property.Optional.RequiredAndOptional.getAll", - "type.property.optional.RequiredAndOptionalClient.getRequiredOnly": "Type.Property.Optional.RequiredAndOptional.getRequiredOnly", - "type.property.optional.RequiredAndOptionalClient.getRequiredOnlyWithResponse": "Type.Property.Optional.RequiredAndOptional.getRequiredOnly", - "type.property.optional.RequiredAndOptionalClient.putAll": "Type.Property.Optional.RequiredAndOptional.putAll", - "type.property.optional.RequiredAndOptionalClient.putAllWithResponse": "Type.Property.Optional.RequiredAndOptional.putAll", - "type.property.optional.RequiredAndOptionalClient.putRequiredOnly": "Type.Property.Optional.RequiredAndOptional.putRequiredOnly", - "type.property.optional.RequiredAndOptionalClient.putRequiredOnlyWithResponse": "Type.Property.Optional.RequiredAndOptional.putRequiredOnly", - "type.property.optional.StringLiteralAsyncClient": "Type.Property.Optional.StringLiteral", - "type.property.optional.StringLiteralAsyncClient.getAll": "Type.Property.Optional.StringLiteral.getAll", - "type.property.optional.StringLiteralAsyncClient.getAllWithResponse": "Type.Property.Optional.StringLiteral.getAll", - "type.property.optional.StringLiteralAsyncClient.getDefault": "Type.Property.Optional.StringLiteral.getDefault", - "type.property.optional.StringLiteralAsyncClient.getDefaultWithResponse": "Type.Property.Optional.StringLiteral.getDefault", - "type.property.optional.StringLiteralAsyncClient.putAll": "Type.Property.Optional.StringLiteral.putAll", - "type.property.optional.StringLiteralAsyncClient.putAllWithResponse": "Type.Property.Optional.StringLiteral.putAll", - "type.property.optional.StringLiteralAsyncClient.putDefault": "Type.Property.Optional.StringLiteral.putDefault", - "type.property.optional.StringLiteralAsyncClient.putDefaultWithResponse": "Type.Property.Optional.StringLiteral.putDefault", - "type.property.optional.StringLiteralClient": "Type.Property.Optional.StringLiteral", - "type.property.optional.StringLiteralClient.getAll": "Type.Property.Optional.StringLiteral.getAll", - "type.property.optional.StringLiteralClient.getAllWithResponse": "Type.Property.Optional.StringLiteral.getAll", - "type.property.optional.StringLiteralClient.getDefault": "Type.Property.Optional.StringLiteral.getDefault", - "type.property.optional.StringLiteralClient.getDefaultWithResponse": "Type.Property.Optional.StringLiteral.getDefault", - "type.property.optional.StringLiteralClient.putAll": "Type.Property.Optional.StringLiteral.putAll", - "type.property.optional.StringLiteralClient.putAllWithResponse": "Type.Property.Optional.StringLiteral.putAll", - "type.property.optional.StringLiteralClient.putDefault": "Type.Property.Optional.StringLiteral.putDefault", - "type.property.optional.StringLiteralClient.putDefaultWithResponse": "Type.Property.Optional.StringLiteral.putDefault", - "type.property.optional.StringOperationAsyncClient": "Type.Property.Optional.String", - "type.property.optional.StringOperationAsyncClient.getAll": "Type.Property.Optional.String.getAll", - "type.property.optional.StringOperationAsyncClient.getAllWithResponse": "Type.Property.Optional.String.getAll", - "type.property.optional.StringOperationAsyncClient.getDefault": "Type.Property.Optional.String.getDefault", - "type.property.optional.StringOperationAsyncClient.getDefaultWithResponse": "Type.Property.Optional.String.getDefault", - "type.property.optional.StringOperationAsyncClient.putAll": "Type.Property.Optional.String.putAll", - "type.property.optional.StringOperationAsyncClient.putAllWithResponse": "Type.Property.Optional.String.putAll", - "type.property.optional.StringOperationAsyncClient.putDefault": "Type.Property.Optional.String.putDefault", - "type.property.optional.StringOperationAsyncClient.putDefaultWithResponse": "Type.Property.Optional.String.putDefault", - "type.property.optional.StringOperationClient": "Type.Property.Optional.String", - "type.property.optional.StringOperationClient.getAll": "Type.Property.Optional.String.getAll", - "type.property.optional.StringOperationClient.getAllWithResponse": "Type.Property.Optional.String.getAll", - "type.property.optional.StringOperationClient.getDefault": "Type.Property.Optional.String.getDefault", - "type.property.optional.StringOperationClient.getDefaultWithResponse": "Type.Property.Optional.String.getDefault", - "type.property.optional.StringOperationClient.putAll": "Type.Property.Optional.String.putAll", - "type.property.optional.StringOperationClient.putAllWithResponse": "Type.Property.Optional.String.putAll", - "type.property.optional.StringOperationClient.putDefault": "Type.Property.Optional.String.putDefault", - "type.property.optional.StringOperationClient.putDefaultWithResponse": "Type.Property.Optional.String.putDefault", - "type.property.optional.UnionFloatLiteralAsyncClient": "Type.Property.Optional.UnionFloatLiteral", - "type.property.optional.UnionFloatLiteralAsyncClient.getAll": "Type.Property.Optional.UnionFloatLiteral.getAll", - "type.property.optional.UnionFloatLiteralAsyncClient.getAllWithResponse": "Type.Property.Optional.UnionFloatLiteral.getAll", - "type.property.optional.UnionFloatLiteralAsyncClient.getDefault": "Type.Property.Optional.UnionFloatLiteral.getDefault", - "type.property.optional.UnionFloatLiteralAsyncClient.getDefaultWithResponse": "Type.Property.Optional.UnionFloatLiteral.getDefault", - "type.property.optional.UnionFloatLiteralAsyncClient.putAll": "Type.Property.Optional.UnionFloatLiteral.putAll", - "type.property.optional.UnionFloatLiteralAsyncClient.putAllWithResponse": "Type.Property.Optional.UnionFloatLiteral.putAll", - "type.property.optional.UnionFloatLiteralAsyncClient.putDefault": "Type.Property.Optional.UnionFloatLiteral.putDefault", - "type.property.optional.UnionFloatLiteralAsyncClient.putDefaultWithResponse": "Type.Property.Optional.UnionFloatLiteral.putDefault", - "type.property.optional.UnionFloatLiteralClient": "Type.Property.Optional.UnionFloatLiteral", - "type.property.optional.UnionFloatLiteralClient.getAll": "Type.Property.Optional.UnionFloatLiteral.getAll", - "type.property.optional.UnionFloatLiteralClient.getAllWithResponse": "Type.Property.Optional.UnionFloatLiteral.getAll", - "type.property.optional.UnionFloatLiteralClient.getDefault": "Type.Property.Optional.UnionFloatLiteral.getDefault", - "type.property.optional.UnionFloatLiteralClient.getDefaultWithResponse": "Type.Property.Optional.UnionFloatLiteral.getDefault", - "type.property.optional.UnionFloatLiteralClient.putAll": "Type.Property.Optional.UnionFloatLiteral.putAll", - "type.property.optional.UnionFloatLiteralClient.putAllWithResponse": "Type.Property.Optional.UnionFloatLiteral.putAll", - "type.property.optional.UnionFloatLiteralClient.putDefault": "Type.Property.Optional.UnionFloatLiteral.putDefault", - "type.property.optional.UnionFloatLiteralClient.putDefaultWithResponse": "Type.Property.Optional.UnionFloatLiteral.putDefault", - "type.property.optional.UnionIntLiteralAsyncClient": "Type.Property.Optional.UnionIntLiteral", - "type.property.optional.UnionIntLiteralAsyncClient.getAll": "Type.Property.Optional.UnionIntLiteral.getAll", - "type.property.optional.UnionIntLiteralAsyncClient.getAllWithResponse": "Type.Property.Optional.UnionIntLiteral.getAll", - "type.property.optional.UnionIntLiteralAsyncClient.getDefault": "Type.Property.Optional.UnionIntLiteral.getDefault", - "type.property.optional.UnionIntLiteralAsyncClient.getDefaultWithResponse": "Type.Property.Optional.UnionIntLiteral.getDefault", - "type.property.optional.UnionIntLiteralAsyncClient.putAll": "Type.Property.Optional.UnionIntLiteral.putAll", - "type.property.optional.UnionIntLiteralAsyncClient.putAllWithResponse": "Type.Property.Optional.UnionIntLiteral.putAll", - "type.property.optional.UnionIntLiteralAsyncClient.putDefault": "Type.Property.Optional.UnionIntLiteral.putDefault", - "type.property.optional.UnionIntLiteralAsyncClient.putDefaultWithResponse": "Type.Property.Optional.UnionIntLiteral.putDefault", - "type.property.optional.UnionIntLiteralClient": "Type.Property.Optional.UnionIntLiteral", - "type.property.optional.UnionIntLiteralClient.getAll": "Type.Property.Optional.UnionIntLiteral.getAll", - "type.property.optional.UnionIntLiteralClient.getAllWithResponse": "Type.Property.Optional.UnionIntLiteral.getAll", - "type.property.optional.UnionIntLiteralClient.getDefault": "Type.Property.Optional.UnionIntLiteral.getDefault", - "type.property.optional.UnionIntLiteralClient.getDefaultWithResponse": "Type.Property.Optional.UnionIntLiteral.getDefault", - "type.property.optional.UnionIntLiteralClient.putAll": "Type.Property.Optional.UnionIntLiteral.putAll", - "type.property.optional.UnionIntLiteralClient.putAllWithResponse": "Type.Property.Optional.UnionIntLiteral.putAll", - "type.property.optional.UnionIntLiteralClient.putDefault": "Type.Property.Optional.UnionIntLiteral.putDefault", - "type.property.optional.UnionIntLiteralClient.putDefaultWithResponse": "Type.Property.Optional.UnionIntLiteral.putDefault", - "type.property.optional.UnionStringLiteralAsyncClient": "Type.Property.Optional.UnionStringLiteral", - "type.property.optional.UnionStringLiteralAsyncClient.getAll": "Type.Property.Optional.UnionStringLiteral.getAll", - "type.property.optional.UnionStringLiteralAsyncClient.getAllWithResponse": "Type.Property.Optional.UnionStringLiteral.getAll", - "type.property.optional.UnionStringLiteralAsyncClient.getDefault": "Type.Property.Optional.UnionStringLiteral.getDefault", - "type.property.optional.UnionStringLiteralAsyncClient.getDefaultWithResponse": "Type.Property.Optional.UnionStringLiteral.getDefault", - "type.property.optional.UnionStringLiteralAsyncClient.putAll": "Type.Property.Optional.UnionStringLiteral.putAll", - "type.property.optional.UnionStringLiteralAsyncClient.putAllWithResponse": "Type.Property.Optional.UnionStringLiteral.putAll", - "type.property.optional.UnionStringLiteralAsyncClient.putDefault": "Type.Property.Optional.UnionStringLiteral.putDefault", - "type.property.optional.UnionStringLiteralAsyncClient.putDefaultWithResponse": "Type.Property.Optional.UnionStringLiteral.putDefault", - "type.property.optional.UnionStringLiteralClient": "Type.Property.Optional.UnionStringLiteral", - "type.property.optional.UnionStringLiteralClient.getAll": "Type.Property.Optional.UnionStringLiteral.getAll", - "type.property.optional.UnionStringLiteralClient.getAllWithResponse": "Type.Property.Optional.UnionStringLiteral.getAll", - "type.property.optional.UnionStringLiteralClient.getDefault": "Type.Property.Optional.UnionStringLiteral.getDefault", - "type.property.optional.UnionStringLiteralClient.getDefaultWithResponse": "Type.Property.Optional.UnionStringLiteral.getDefault", - "type.property.optional.UnionStringLiteralClient.putAll": "Type.Property.Optional.UnionStringLiteral.putAll", - "type.property.optional.UnionStringLiteralClient.putAllWithResponse": "Type.Property.Optional.UnionStringLiteral.putAll", - "type.property.optional.UnionStringLiteralClient.putDefault": "Type.Property.Optional.UnionStringLiteral.putDefault", - "type.property.optional.UnionStringLiteralClient.putDefaultWithResponse": "Type.Property.Optional.UnionStringLiteral.putDefault", - "type.property.optional.models.BooleanLiteralProperty": "Type.Property.Optional.BooleanLiteralProperty", - "type.property.optional.models.BooleanLiteralPropertyProperty": null, - "type.property.optional.models.BytesProperty": "Type.Property.Optional.BytesProperty", - "type.property.optional.models.CollectionsByteProperty": "Type.Property.Optional.CollectionsByteProperty", - "type.property.optional.models.CollectionsModelProperty": "Type.Property.Optional.CollectionsModelProperty", - "type.property.optional.models.DatetimeProperty": "Type.Property.Optional.DatetimeProperty", - "type.property.optional.models.DurationProperty": "Type.Property.Optional.DurationProperty", - "type.property.optional.models.FloatLiteralProperty": "Type.Property.Optional.FloatLiteralProperty", - "type.property.optional.models.FloatLiteralPropertyProperty": null, - "type.property.optional.models.IntLiteralProperty": "Type.Property.Optional.IntLiteralProperty", - "type.property.optional.models.IntLiteralPropertyProperty": null, - "type.property.optional.models.PlainDateProperty": "Type.Property.Optional.PlainDateProperty", - "type.property.optional.models.PlainTimeProperty": "Type.Property.Optional.PlainTimeProperty", - "type.property.optional.models.RequiredAndOptionalProperty": "Type.Property.Optional.RequiredAndOptionalProperty", - "type.property.optional.models.StringLiteralProperty": "Type.Property.Optional.StringLiteralProperty", - "type.property.optional.models.StringLiteralPropertyProperty": null, - "type.property.optional.models.StringProperty": "Type.Property.Optional.StringProperty", - "type.property.optional.models.UnionFloatLiteralProperty": "Type.Property.Optional.UnionFloatLiteralProperty", - "type.property.optional.models.UnionFloatLiteralPropertyProperty": "Type.Property.Optional.UnionFloatLiteralProperty.property.anonymous", - "type.property.optional.models.UnionIntLiteralProperty": "Type.Property.Optional.UnionIntLiteralProperty", - "type.property.optional.models.UnionIntLiteralPropertyProperty": "Type.Property.Optional.UnionIntLiteralProperty.property.anonymous", - "type.property.optional.models.UnionStringLiteralProperty": "Type.Property.Optional.UnionStringLiteralProperty", - "type.property.optional.models.UnionStringLiteralPropertyProperty": "Type.Property.Optional.UnionStringLiteralProperty.property.anonymous" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-optional_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-optional_metadata.json index d42e370e0f1..f8a1578b4c7 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-optional_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-optional_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.property.optional.BooleanLiteralAsyncClient":"Type.Property.Optional.BooleanLiteral","type.property.optional.BooleanLiteralAsyncClient.getAll":"Type.Property.Optional.BooleanLiteral.getAll","type.property.optional.BooleanLiteralAsyncClient.getAllWithResponse":"Type.Property.Optional.BooleanLiteral.getAll","type.property.optional.BooleanLiteralAsyncClient.getDefault":"Type.Property.Optional.BooleanLiteral.getDefault","type.property.optional.BooleanLiteralAsyncClient.getDefaultWithResponse":"Type.Property.Optional.BooleanLiteral.getDefault","type.property.optional.BooleanLiteralAsyncClient.putAll":"Type.Property.Optional.BooleanLiteral.putAll","type.property.optional.BooleanLiteralAsyncClient.putAllWithResponse":"Type.Property.Optional.BooleanLiteral.putAll","type.property.optional.BooleanLiteralAsyncClient.putDefault":"Type.Property.Optional.BooleanLiteral.putDefault","type.property.optional.BooleanLiteralAsyncClient.putDefaultWithResponse":"Type.Property.Optional.BooleanLiteral.putDefault","type.property.optional.BooleanLiteralClient":"Type.Property.Optional.BooleanLiteral","type.property.optional.BooleanLiteralClient.getAll":"Type.Property.Optional.BooleanLiteral.getAll","type.property.optional.BooleanLiteralClient.getAllWithResponse":"Type.Property.Optional.BooleanLiteral.getAll","type.property.optional.BooleanLiteralClient.getDefault":"Type.Property.Optional.BooleanLiteral.getDefault","type.property.optional.BooleanLiteralClient.getDefaultWithResponse":"Type.Property.Optional.BooleanLiteral.getDefault","type.property.optional.BooleanLiteralClient.putAll":"Type.Property.Optional.BooleanLiteral.putAll","type.property.optional.BooleanLiteralClient.putAllWithResponse":"Type.Property.Optional.BooleanLiteral.putAll","type.property.optional.BooleanLiteralClient.putDefault":"Type.Property.Optional.BooleanLiteral.putDefault","type.property.optional.BooleanLiteralClient.putDefaultWithResponse":"Type.Property.Optional.BooleanLiteral.putDefault","type.property.optional.BytesAsyncClient":"Type.Property.Optional.Bytes","type.property.optional.BytesAsyncClient.getAll":"Type.Property.Optional.Bytes.getAll","type.property.optional.BytesAsyncClient.getAllWithResponse":"Type.Property.Optional.Bytes.getAll","type.property.optional.BytesAsyncClient.getDefault":"Type.Property.Optional.Bytes.getDefault","type.property.optional.BytesAsyncClient.getDefaultWithResponse":"Type.Property.Optional.Bytes.getDefault","type.property.optional.BytesAsyncClient.putAll":"Type.Property.Optional.Bytes.putAll","type.property.optional.BytesAsyncClient.putAllWithResponse":"Type.Property.Optional.Bytes.putAll","type.property.optional.BytesAsyncClient.putDefault":"Type.Property.Optional.Bytes.putDefault","type.property.optional.BytesAsyncClient.putDefaultWithResponse":"Type.Property.Optional.Bytes.putDefault","type.property.optional.BytesClient":"Type.Property.Optional.Bytes","type.property.optional.BytesClient.getAll":"Type.Property.Optional.Bytes.getAll","type.property.optional.BytesClient.getAllWithResponse":"Type.Property.Optional.Bytes.getAll","type.property.optional.BytesClient.getDefault":"Type.Property.Optional.Bytes.getDefault","type.property.optional.BytesClient.getDefaultWithResponse":"Type.Property.Optional.Bytes.getDefault","type.property.optional.BytesClient.putAll":"Type.Property.Optional.Bytes.putAll","type.property.optional.BytesClient.putAllWithResponse":"Type.Property.Optional.Bytes.putAll","type.property.optional.BytesClient.putDefault":"Type.Property.Optional.Bytes.putDefault","type.property.optional.BytesClient.putDefaultWithResponse":"Type.Property.Optional.Bytes.putDefault","type.property.optional.CollectionsByteAsyncClient":"Type.Property.Optional.CollectionsByte","type.property.optional.CollectionsByteAsyncClient.getAll":"Type.Property.Optional.CollectionsByte.getAll","type.property.optional.CollectionsByteAsyncClient.getAllWithResponse":"Type.Property.Optional.CollectionsByte.getAll","type.property.optional.CollectionsByteAsyncClient.getDefault":"Type.Property.Optional.CollectionsByte.getDefault","type.property.optional.CollectionsByteAsyncClient.getDefaultWithResponse":"Type.Property.Optional.CollectionsByte.getDefault","type.property.optional.CollectionsByteAsyncClient.putAll":"Type.Property.Optional.CollectionsByte.putAll","type.property.optional.CollectionsByteAsyncClient.putAllWithResponse":"Type.Property.Optional.CollectionsByte.putAll","type.property.optional.CollectionsByteAsyncClient.putDefault":"Type.Property.Optional.CollectionsByte.putDefault","type.property.optional.CollectionsByteAsyncClient.putDefaultWithResponse":"Type.Property.Optional.CollectionsByte.putDefault","type.property.optional.CollectionsByteClient":"Type.Property.Optional.CollectionsByte","type.property.optional.CollectionsByteClient.getAll":"Type.Property.Optional.CollectionsByte.getAll","type.property.optional.CollectionsByteClient.getAllWithResponse":"Type.Property.Optional.CollectionsByte.getAll","type.property.optional.CollectionsByteClient.getDefault":"Type.Property.Optional.CollectionsByte.getDefault","type.property.optional.CollectionsByteClient.getDefaultWithResponse":"Type.Property.Optional.CollectionsByte.getDefault","type.property.optional.CollectionsByteClient.putAll":"Type.Property.Optional.CollectionsByte.putAll","type.property.optional.CollectionsByteClient.putAllWithResponse":"Type.Property.Optional.CollectionsByte.putAll","type.property.optional.CollectionsByteClient.putDefault":"Type.Property.Optional.CollectionsByte.putDefault","type.property.optional.CollectionsByteClient.putDefaultWithResponse":"Type.Property.Optional.CollectionsByte.putDefault","type.property.optional.CollectionsModelAsyncClient":"Type.Property.Optional.CollectionsModel","type.property.optional.CollectionsModelAsyncClient.getAll":"Type.Property.Optional.CollectionsModel.getAll","type.property.optional.CollectionsModelAsyncClient.getAllWithResponse":"Type.Property.Optional.CollectionsModel.getAll","type.property.optional.CollectionsModelAsyncClient.getDefault":"Type.Property.Optional.CollectionsModel.getDefault","type.property.optional.CollectionsModelAsyncClient.getDefaultWithResponse":"Type.Property.Optional.CollectionsModel.getDefault","type.property.optional.CollectionsModelAsyncClient.putAll":"Type.Property.Optional.CollectionsModel.putAll","type.property.optional.CollectionsModelAsyncClient.putAllWithResponse":"Type.Property.Optional.CollectionsModel.putAll","type.property.optional.CollectionsModelAsyncClient.putDefault":"Type.Property.Optional.CollectionsModel.putDefault","type.property.optional.CollectionsModelAsyncClient.putDefaultWithResponse":"Type.Property.Optional.CollectionsModel.putDefault","type.property.optional.CollectionsModelClient":"Type.Property.Optional.CollectionsModel","type.property.optional.CollectionsModelClient.getAll":"Type.Property.Optional.CollectionsModel.getAll","type.property.optional.CollectionsModelClient.getAllWithResponse":"Type.Property.Optional.CollectionsModel.getAll","type.property.optional.CollectionsModelClient.getDefault":"Type.Property.Optional.CollectionsModel.getDefault","type.property.optional.CollectionsModelClient.getDefaultWithResponse":"Type.Property.Optional.CollectionsModel.getDefault","type.property.optional.CollectionsModelClient.putAll":"Type.Property.Optional.CollectionsModel.putAll","type.property.optional.CollectionsModelClient.putAllWithResponse":"Type.Property.Optional.CollectionsModel.putAll","type.property.optional.CollectionsModelClient.putDefault":"Type.Property.Optional.CollectionsModel.putDefault","type.property.optional.CollectionsModelClient.putDefaultWithResponse":"Type.Property.Optional.CollectionsModel.putDefault","type.property.optional.DatetimeOperationAsyncClient":"Type.Property.Optional.Datetime","type.property.optional.DatetimeOperationAsyncClient.getAll":"Type.Property.Optional.Datetime.getAll","type.property.optional.DatetimeOperationAsyncClient.getAllWithResponse":"Type.Property.Optional.Datetime.getAll","type.property.optional.DatetimeOperationAsyncClient.getDefault":"Type.Property.Optional.Datetime.getDefault","type.property.optional.DatetimeOperationAsyncClient.getDefaultWithResponse":"Type.Property.Optional.Datetime.getDefault","type.property.optional.DatetimeOperationAsyncClient.putAll":"Type.Property.Optional.Datetime.putAll","type.property.optional.DatetimeOperationAsyncClient.putAllWithResponse":"Type.Property.Optional.Datetime.putAll","type.property.optional.DatetimeOperationAsyncClient.putDefault":"Type.Property.Optional.Datetime.putDefault","type.property.optional.DatetimeOperationAsyncClient.putDefaultWithResponse":"Type.Property.Optional.Datetime.putDefault","type.property.optional.DatetimeOperationClient":"Type.Property.Optional.Datetime","type.property.optional.DatetimeOperationClient.getAll":"Type.Property.Optional.Datetime.getAll","type.property.optional.DatetimeOperationClient.getAllWithResponse":"Type.Property.Optional.Datetime.getAll","type.property.optional.DatetimeOperationClient.getDefault":"Type.Property.Optional.Datetime.getDefault","type.property.optional.DatetimeOperationClient.getDefaultWithResponse":"Type.Property.Optional.Datetime.getDefault","type.property.optional.DatetimeOperationClient.putAll":"Type.Property.Optional.Datetime.putAll","type.property.optional.DatetimeOperationClient.putAllWithResponse":"Type.Property.Optional.Datetime.putAll","type.property.optional.DatetimeOperationClient.putDefault":"Type.Property.Optional.Datetime.putDefault","type.property.optional.DatetimeOperationClient.putDefaultWithResponse":"Type.Property.Optional.Datetime.putDefault","type.property.optional.DurationOperationAsyncClient":"Type.Property.Optional.Duration","type.property.optional.DurationOperationAsyncClient.getAll":"Type.Property.Optional.Duration.getAll","type.property.optional.DurationOperationAsyncClient.getAllWithResponse":"Type.Property.Optional.Duration.getAll","type.property.optional.DurationOperationAsyncClient.getDefault":"Type.Property.Optional.Duration.getDefault","type.property.optional.DurationOperationAsyncClient.getDefaultWithResponse":"Type.Property.Optional.Duration.getDefault","type.property.optional.DurationOperationAsyncClient.putAll":"Type.Property.Optional.Duration.putAll","type.property.optional.DurationOperationAsyncClient.putAllWithResponse":"Type.Property.Optional.Duration.putAll","type.property.optional.DurationOperationAsyncClient.putDefault":"Type.Property.Optional.Duration.putDefault","type.property.optional.DurationOperationAsyncClient.putDefaultWithResponse":"Type.Property.Optional.Duration.putDefault","type.property.optional.DurationOperationClient":"Type.Property.Optional.Duration","type.property.optional.DurationOperationClient.getAll":"Type.Property.Optional.Duration.getAll","type.property.optional.DurationOperationClient.getAllWithResponse":"Type.Property.Optional.Duration.getAll","type.property.optional.DurationOperationClient.getDefault":"Type.Property.Optional.Duration.getDefault","type.property.optional.DurationOperationClient.getDefaultWithResponse":"Type.Property.Optional.Duration.getDefault","type.property.optional.DurationOperationClient.putAll":"Type.Property.Optional.Duration.putAll","type.property.optional.DurationOperationClient.putAllWithResponse":"Type.Property.Optional.Duration.putAll","type.property.optional.DurationOperationClient.putDefault":"Type.Property.Optional.Duration.putDefault","type.property.optional.DurationOperationClient.putDefaultWithResponse":"Type.Property.Optional.Duration.putDefault","type.property.optional.FloatLiteralAsyncClient":"Type.Property.Optional.FloatLiteral","type.property.optional.FloatLiteralAsyncClient.getAll":"Type.Property.Optional.FloatLiteral.getAll","type.property.optional.FloatLiteralAsyncClient.getAllWithResponse":"Type.Property.Optional.FloatLiteral.getAll","type.property.optional.FloatLiteralAsyncClient.getDefault":"Type.Property.Optional.FloatLiteral.getDefault","type.property.optional.FloatLiteralAsyncClient.getDefaultWithResponse":"Type.Property.Optional.FloatLiteral.getDefault","type.property.optional.FloatLiteralAsyncClient.putAll":"Type.Property.Optional.FloatLiteral.putAll","type.property.optional.FloatLiteralAsyncClient.putAllWithResponse":"Type.Property.Optional.FloatLiteral.putAll","type.property.optional.FloatLiteralAsyncClient.putDefault":"Type.Property.Optional.FloatLiteral.putDefault","type.property.optional.FloatLiteralAsyncClient.putDefaultWithResponse":"Type.Property.Optional.FloatLiteral.putDefault","type.property.optional.FloatLiteralClient":"Type.Property.Optional.FloatLiteral","type.property.optional.FloatLiteralClient.getAll":"Type.Property.Optional.FloatLiteral.getAll","type.property.optional.FloatLiteralClient.getAllWithResponse":"Type.Property.Optional.FloatLiteral.getAll","type.property.optional.FloatLiteralClient.getDefault":"Type.Property.Optional.FloatLiteral.getDefault","type.property.optional.FloatLiteralClient.getDefaultWithResponse":"Type.Property.Optional.FloatLiteral.getDefault","type.property.optional.FloatLiteralClient.putAll":"Type.Property.Optional.FloatLiteral.putAll","type.property.optional.FloatLiteralClient.putAllWithResponse":"Type.Property.Optional.FloatLiteral.putAll","type.property.optional.FloatLiteralClient.putDefault":"Type.Property.Optional.FloatLiteral.putDefault","type.property.optional.FloatLiteralClient.putDefaultWithResponse":"Type.Property.Optional.FloatLiteral.putDefault","type.property.optional.IntLiteralAsyncClient":"Type.Property.Optional.IntLiteral","type.property.optional.IntLiteralAsyncClient.getAll":"Type.Property.Optional.IntLiteral.getAll","type.property.optional.IntLiteralAsyncClient.getAllWithResponse":"Type.Property.Optional.IntLiteral.getAll","type.property.optional.IntLiteralAsyncClient.getDefault":"Type.Property.Optional.IntLiteral.getDefault","type.property.optional.IntLiteralAsyncClient.getDefaultWithResponse":"Type.Property.Optional.IntLiteral.getDefault","type.property.optional.IntLiteralAsyncClient.putAll":"Type.Property.Optional.IntLiteral.putAll","type.property.optional.IntLiteralAsyncClient.putAllWithResponse":"Type.Property.Optional.IntLiteral.putAll","type.property.optional.IntLiteralAsyncClient.putDefault":"Type.Property.Optional.IntLiteral.putDefault","type.property.optional.IntLiteralAsyncClient.putDefaultWithResponse":"Type.Property.Optional.IntLiteral.putDefault","type.property.optional.IntLiteralClient":"Type.Property.Optional.IntLiteral","type.property.optional.IntLiteralClient.getAll":"Type.Property.Optional.IntLiteral.getAll","type.property.optional.IntLiteralClient.getAllWithResponse":"Type.Property.Optional.IntLiteral.getAll","type.property.optional.IntLiteralClient.getDefault":"Type.Property.Optional.IntLiteral.getDefault","type.property.optional.IntLiteralClient.getDefaultWithResponse":"Type.Property.Optional.IntLiteral.getDefault","type.property.optional.IntLiteralClient.putAll":"Type.Property.Optional.IntLiteral.putAll","type.property.optional.IntLiteralClient.putAllWithResponse":"Type.Property.Optional.IntLiteral.putAll","type.property.optional.IntLiteralClient.putDefault":"Type.Property.Optional.IntLiteral.putDefault","type.property.optional.IntLiteralClient.putDefaultWithResponse":"Type.Property.Optional.IntLiteral.putDefault","type.property.optional.OptionalClientBuilder":"Type.Property.Optional","type.property.optional.PlainDateAsyncClient":"Type.Property.Optional.PlainDate","type.property.optional.PlainDateAsyncClient.getAll":"Type.Property.Optional.PlainDate.getAll","type.property.optional.PlainDateAsyncClient.getAllWithResponse":"Type.Property.Optional.PlainDate.getAll","type.property.optional.PlainDateAsyncClient.getDefault":"Type.Property.Optional.PlainDate.getDefault","type.property.optional.PlainDateAsyncClient.getDefaultWithResponse":"Type.Property.Optional.PlainDate.getDefault","type.property.optional.PlainDateAsyncClient.putAll":"Type.Property.Optional.PlainDate.putAll","type.property.optional.PlainDateAsyncClient.putAllWithResponse":"Type.Property.Optional.PlainDate.putAll","type.property.optional.PlainDateAsyncClient.putDefault":"Type.Property.Optional.PlainDate.putDefault","type.property.optional.PlainDateAsyncClient.putDefaultWithResponse":"Type.Property.Optional.PlainDate.putDefault","type.property.optional.PlainDateClient":"Type.Property.Optional.PlainDate","type.property.optional.PlainDateClient.getAll":"Type.Property.Optional.PlainDate.getAll","type.property.optional.PlainDateClient.getAllWithResponse":"Type.Property.Optional.PlainDate.getAll","type.property.optional.PlainDateClient.getDefault":"Type.Property.Optional.PlainDate.getDefault","type.property.optional.PlainDateClient.getDefaultWithResponse":"Type.Property.Optional.PlainDate.getDefault","type.property.optional.PlainDateClient.putAll":"Type.Property.Optional.PlainDate.putAll","type.property.optional.PlainDateClient.putAllWithResponse":"Type.Property.Optional.PlainDate.putAll","type.property.optional.PlainDateClient.putDefault":"Type.Property.Optional.PlainDate.putDefault","type.property.optional.PlainDateClient.putDefaultWithResponse":"Type.Property.Optional.PlainDate.putDefault","type.property.optional.PlainTimeAsyncClient":"Type.Property.Optional.PlainTime","type.property.optional.PlainTimeAsyncClient.getAll":"Type.Property.Optional.PlainTime.getAll","type.property.optional.PlainTimeAsyncClient.getAllWithResponse":"Type.Property.Optional.PlainTime.getAll","type.property.optional.PlainTimeAsyncClient.getDefault":"Type.Property.Optional.PlainTime.getDefault","type.property.optional.PlainTimeAsyncClient.getDefaultWithResponse":"Type.Property.Optional.PlainTime.getDefault","type.property.optional.PlainTimeAsyncClient.putAll":"Type.Property.Optional.PlainTime.putAll","type.property.optional.PlainTimeAsyncClient.putAllWithResponse":"Type.Property.Optional.PlainTime.putAll","type.property.optional.PlainTimeAsyncClient.putDefault":"Type.Property.Optional.PlainTime.putDefault","type.property.optional.PlainTimeAsyncClient.putDefaultWithResponse":"Type.Property.Optional.PlainTime.putDefault","type.property.optional.PlainTimeClient":"Type.Property.Optional.PlainTime","type.property.optional.PlainTimeClient.getAll":"Type.Property.Optional.PlainTime.getAll","type.property.optional.PlainTimeClient.getAllWithResponse":"Type.Property.Optional.PlainTime.getAll","type.property.optional.PlainTimeClient.getDefault":"Type.Property.Optional.PlainTime.getDefault","type.property.optional.PlainTimeClient.getDefaultWithResponse":"Type.Property.Optional.PlainTime.getDefault","type.property.optional.PlainTimeClient.putAll":"Type.Property.Optional.PlainTime.putAll","type.property.optional.PlainTimeClient.putAllWithResponse":"Type.Property.Optional.PlainTime.putAll","type.property.optional.PlainTimeClient.putDefault":"Type.Property.Optional.PlainTime.putDefault","type.property.optional.PlainTimeClient.putDefaultWithResponse":"Type.Property.Optional.PlainTime.putDefault","type.property.optional.RequiredAndOptionalAsyncClient":"Type.Property.Optional.RequiredAndOptional","type.property.optional.RequiredAndOptionalAsyncClient.getAll":"Type.Property.Optional.RequiredAndOptional.getAll","type.property.optional.RequiredAndOptionalAsyncClient.getAllWithResponse":"Type.Property.Optional.RequiredAndOptional.getAll","type.property.optional.RequiredAndOptionalAsyncClient.getRequiredOnly":"Type.Property.Optional.RequiredAndOptional.getRequiredOnly","type.property.optional.RequiredAndOptionalAsyncClient.getRequiredOnlyWithResponse":"Type.Property.Optional.RequiredAndOptional.getRequiredOnly","type.property.optional.RequiredAndOptionalAsyncClient.putAll":"Type.Property.Optional.RequiredAndOptional.putAll","type.property.optional.RequiredAndOptionalAsyncClient.putAllWithResponse":"Type.Property.Optional.RequiredAndOptional.putAll","type.property.optional.RequiredAndOptionalAsyncClient.putRequiredOnly":"Type.Property.Optional.RequiredAndOptional.putRequiredOnly","type.property.optional.RequiredAndOptionalAsyncClient.putRequiredOnlyWithResponse":"Type.Property.Optional.RequiredAndOptional.putRequiredOnly","type.property.optional.RequiredAndOptionalClient":"Type.Property.Optional.RequiredAndOptional","type.property.optional.RequiredAndOptionalClient.getAll":"Type.Property.Optional.RequiredAndOptional.getAll","type.property.optional.RequiredAndOptionalClient.getAllWithResponse":"Type.Property.Optional.RequiredAndOptional.getAll","type.property.optional.RequiredAndOptionalClient.getRequiredOnly":"Type.Property.Optional.RequiredAndOptional.getRequiredOnly","type.property.optional.RequiredAndOptionalClient.getRequiredOnlyWithResponse":"Type.Property.Optional.RequiredAndOptional.getRequiredOnly","type.property.optional.RequiredAndOptionalClient.putAll":"Type.Property.Optional.RequiredAndOptional.putAll","type.property.optional.RequiredAndOptionalClient.putAllWithResponse":"Type.Property.Optional.RequiredAndOptional.putAll","type.property.optional.RequiredAndOptionalClient.putRequiredOnly":"Type.Property.Optional.RequiredAndOptional.putRequiredOnly","type.property.optional.RequiredAndOptionalClient.putRequiredOnlyWithResponse":"Type.Property.Optional.RequiredAndOptional.putRequiredOnly","type.property.optional.StringLiteralAsyncClient":"Type.Property.Optional.StringLiteral","type.property.optional.StringLiteralAsyncClient.getAll":"Type.Property.Optional.StringLiteral.getAll","type.property.optional.StringLiteralAsyncClient.getAllWithResponse":"Type.Property.Optional.StringLiteral.getAll","type.property.optional.StringLiteralAsyncClient.getDefault":"Type.Property.Optional.StringLiteral.getDefault","type.property.optional.StringLiteralAsyncClient.getDefaultWithResponse":"Type.Property.Optional.StringLiteral.getDefault","type.property.optional.StringLiteralAsyncClient.putAll":"Type.Property.Optional.StringLiteral.putAll","type.property.optional.StringLiteralAsyncClient.putAllWithResponse":"Type.Property.Optional.StringLiteral.putAll","type.property.optional.StringLiteralAsyncClient.putDefault":"Type.Property.Optional.StringLiteral.putDefault","type.property.optional.StringLiteralAsyncClient.putDefaultWithResponse":"Type.Property.Optional.StringLiteral.putDefault","type.property.optional.StringLiteralClient":"Type.Property.Optional.StringLiteral","type.property.optional.StringLiteralClient.getAll":"Type.Property.Optional.StringLiteral.getAll","type.property.optional.StringLiteralClient.getAllWithResponse":"Type.Property.Optional.StringLiteral.getAll","type.property.optional.StringLiteralClient.getDefault":"Type.Property.Optional.StringLiteral.getDefault","type.property.optional.StringLiteralClient.getDefaultWithResponse":"Type.Property.Optional.StringLiteral.getDefault","type.property.optional.StringLiteralClient.putAll":"Type.Property.Optional.StringLiteral.putAll","type.property.optional.StringLiteralClient.putAllWithResponse":"Type.Property.Optional.StringLiteral.putAll","type.property.optional.StringLiteralClient.putDefault":"Type.Property.Optional.StringLiteral.putDefault","type.property.optional.StringLiteralClient.putDefaultWithResponse":"Type.Property.Optional.StringLiteral.putDefault","type.property.optional.StringOperationAsyncClient":"Type.Property.Optional.String","type.property.optional.StringOperationAsyncClient.getAll":"Type.Property.Optional.String.getAll","type.property.optional.StringOperationAsyncClient.getAllWithResponse":"Type.Property.Optional.String.getAll","type.property.optional.StringOperationAsyncClient.getDefault":"Type.Property.Optional.String.getDefault","type.property.optional.StringOperationAsyncClient.getDefaultWithResponse":"Type.Property.Optional.String.getDefault","type.property.optional.StringOperationAsyncClient.putAll":"Type.Property.Optional.String.putAll","type.property.optional.StringOperationAsyncClient.putAllWithResponse":"Type.Property.Optional.String.putAll","type.property.optional.StringOperationAsyncClient.putDefault":"Type.Property.Optional.String.putDefault","type.property.optional.StringOperationAsyncClient.putDefaultWithResponse":"Type.Property.Optional.String.putDefault","type.property.optional.StringOperationClient":"Type.Property.Optional.String","type.property.optional.StringOperationClient.getAll":"Type.Property.Optional.String.getAll","type.property.optional.StringOperationClient.getAllWithResponse":"Type.Property.Optional.String.getAll","type.property.optional.StringOperationClient.getDefault":"Type.Property.Optional.String.getDefault","type.property.optional.StringOperationClient.getDefaultWithResponse":"Type.Property.Optional.String.getDefault","type.property.optional.StringOperationClient.putAll":"Type.Property.Optional.String.putAll","type.property.optional.StringOperationClient.putAllWithResponse":"Type.Property.Optional.String.putAll","type.property.optional.StringOperationClient.putDefault":"Type.Property.Optional.String.putDefault","type.property.optional.StringOperationClient.putDefaultWithResponse":"Type.Property.Optional.String.putDefault","type.property.optional.UnionFloatLiteralAsyncClient":"Type.Property.Optional.UnionFloatLiteral","type.property.optional.UnionFloatLiteralAsyncClient.getAll":"Type.Property.Optional.UnionFloatLiteral.getAll","type.property.optional.UnionFloatLiteralAsyncClient.getAllWithResponse":"Type.Property.Optional.UnionFloatLiteral.getAll","type.property.optional.UnionFloatLiteralAsyncClient.getDefault":"Type.Property.Optional.UnionFloatLiteral.getDefault","type.property.optional.UnionFloatLiteralAsyncClient.getDefaultWithResponse":"Type.Property.Optional.UnionFloatLiteral.getDefault","type.property.optional.UnionFloatLiteralAsyncClient.putAll":"Type.Property.Optional.UnionFloatLiteral.putAll","type.property.optional.UnionFloatLiteralAsyncClient.putAllWithResponse":"Type.Property.Optional.UnionFloatLiteral.putAll","type.property.optional.UnionFloatLiteralAsyncClient.putDefault":"Type.Property.Optional.UnionFloatLiteral.putDefault","type.property.optional.UnionFloatLiteralAsyncClient.putDefaultWithResponse":"Type.Property.Optional.UnionFloatLiteral.putDefault","type.property.optional.UnionFloatLiteralClient":"Type.Property.Optional.UnionFloatLiteral","type.property.optional.UnionFloatLiteralClient.getAll":"Type.Property.Optional.UnionFloatLiteral.getAll","type.property.optional.UnionFloatLiteralClient.getAllWithResponse":"Type.Property.Optional.UnionFloatLiteral.getAll","type.property.optional.UnionFloatLiteralClient.getDefault":"Type.Property.Optional.UnionFloatLiteral.getDefault","type.property.optional.UnionFloatLiteralClient.getDefaultWithResponse":"Type.Property.Optional.UnionFloatLiteral.getDefault","type.property.optional.UnionFloatLiteralClient.putAll":"Type.Property.Optional.UnionFloatLiteral.putAll","type.property.optional.UnionFloatLiteralClient.putAllWithResponse":"Type.Property.Optional.UnionFloatLiteral.putAll","type.property.optional.UnionFloatLiteralClient.putDefault":"Type.Property.Optional.UnionFloatLiteral.putDefault","type.property.optional.UnionFloatLiteralClient.putDefaultWithResponse":"Type.Property.Optional.UnionFloatLiteral.putDefault","type.property.optional.UnionIntLiteralAsyncClient":"Type.Property.Optional.UnionIntLiteral","type.property.optional.UnionIntLiteralAsyncClient.getAll":"Type.Property.Optional.UnionIntLiteral.getAll","type.property.optional.UnionIntLiteralAsyncClient.getAllWithResponse":"Type.Property.Optional.UnionIntLiteral.getAll","type.property.optional.UnionIntLiteralAsyncClient.getDefault":"Type.Property.Optional.UnionIntLiteral.getDefault","type.property.optional.UnionIntLiteralAsyncClient.getDefaultWithResponse":"Type.Property.Optional.UnionIntLiteral.getDefault","type.property.optional.UnionIntLiteralAsyncClient.putAll":"Type.Property.Optional.UnionIntLiteral.putAll","type.property.optional.UnionIntLiteralAsyncClient.putAllWithResponse":"Type.Property.Optional.UnionIntLiteral.putAll","type.property.optional.UnionIntLiteralAsyncClient.putDefault":"Type.Property.Optional.UnionIntLiteral.putDefault","type.property.optional.UnionIntLiteralAsyncClient.putDefaultWithResponse":"Type.Property.Optional.UnionIntLiteral.putDefault","type.property.optional.UnionIntLiteralClient":"Type.Property.Optional.UnionIntLiteral","type.property.optional.UnionIntLiteralClient.getAll":"Type.Property.Optional.UnionIntLiteral.getAll","type.property.optional.UnionIntLiteralClient.getAllWithResponse":"Type.Property.Optional.UnionIntLiteral.getAll","type.property.optional.UnionIntLiteralClient.getDefault":"Type.Property.Optional.UnionIntLiteral.getDefault","type.property.optional.UnionIntLiteralClient.getDefaultWithResponse":"Type.Property.Optional.UnionIntLiteral.getDefault","type.property.optional.UnionIntLiteralClient.putAll":"Type.Property.Optional.UnionIntLiteral.putAll","type.property.optional.UnionIntLiteralClient.putAllWithResponse":"Type.Property.Optional.UnionIntLiteral.putAll","type.property.optional.UnionIntLiteralClient.putDefault":"Type.Property.Optional.UnionIntLiteral.putDefault","type.property.optional.UnionIntLiteralClient.putDefaultWithResponse":"Type.Property.Optional.UnionIntLiteral.putDefault","type.property.optional.UnionStringLiteralAsyncClient":"Type.Property.Optional.UnionStringLiteral","type.property.optional.UnionStringLiteralAsyncClient.getAll":"Type.Property.Optional.UnionStringLiteral.getAll","type.property.optional.UnionStringLiteralAsyncClient.getAllWithResponse":"Type.Property.Optional.UnionStringLiteral.getAll","type.property.optional.UnionStringLiteralAsyncClient.getDefault":"Type.Property.Optional.UnionStringLiteral.getDefault","type.property.optional.UnionStringLiteralAsyncClient.getDefaultWithResponse":"Type.Property.Optional.UnionStringLiteral.getDefault","type.property.optional.UnionStringLiteralAsyncClient.putAll":"Type.Property.Optional.UnionStringLiteral.putAll","type.property.optional.UnionStringLiteralAsyncClient.putAllWithResponse":"Type.Property.Optional.UnionStringLiteral.putAll","type.property.optional.UnionStringLiteralAsyncClient.putDefault":"Type.Property.Optional.UnionStringLiteral.putDefault","type.property.optional.UnionStringLiteralAsyncClient.putDefaultWithResponse":"Type.Property.Optional.UnionStringLiteral.putDefault","type.property.optional.UnionStringLiteralClient":"Type.Property.Optional.UnionStringLiteral","type.property.optional.UnionStringLiteralClient.getAll":"Type.Property.Optional.UnionStringLiteral.getAll","type.property.optional.UnionStringLiteralClient.getAllWithResponse":"Type.Property.Optional.UnionStringLiteral.getAll","type.property.optional.UnionStringLiteralClient.getDefault":"Type.Property.Optional.UnionStringLiteral.getDefault","type.property.optional.UnionStringLiteralClient.getDefaultWithResponse":"Type.Property.Optional.UnionStringLiteral.getDefault","type.property.optional.UnionStringLiteralClient.putAll":"Type.Property.Optional.UnionStringLiteral.putAll","type.property.optional.UnionStringLiteralClient.putAllWithResponse":"Type.Property.Optional.UnionStringLiteral.putAll","type.property.optional.UnionStringLiteralClient.putDefault":"Type.Property.Optional.UnionStringLiteral.putDefault","type.property.optional.UnionStringLiteralClient.putDefaultWithResponse":"Type.Property.Optional.UnionStringLiteral.putDefault","type.property.optional.models.BooleanLiteralProperty":"Type.Property.Optional.BooleanLiteralProperty","type.property.optional.models.BooleanLiteralPropertyProperty":null,"type.property.optional.models.BytesProperty":"Type.Property.Optional.BytesProperty","type.property.optional.models.CollectionsByteProperty":"Type.Property.Optional.CollectionsByteProperty","type.property.optional.models.CollectionsModelProperty":"Type.Property.Optional.CollectionsModelProperty","type.property.optional.models.DatetimeProperty":"Type.Property.Optional.DatetimeProperty","type.property.optional.models.DurationProperty":"Type.Property.Optional.DurationProperty","type.property.optional.models.FloatLiteralProperty":"Type.Property.Optional.FloatLiteralProperty","type.property.optional.models.FloatLiteralPropertyProperty":null,"type.property.optional.models.IntLiteralProperty":"Type.Property.Optional.IntLiteralProperty","type.property.optional.models.IntLiteralPropertyProperty":null,"type.property.optional.models.PlainDateProperty":"Type.Property.Optional.PlainDateProperty","type.property.optional.models.PlainTimeProperty":"Type.Property.Optional.PlainTimeProperty","type.property.optional.models.RequiredAndOptionalProperty":"Type.Property.Optional.RequiredAndOptionalProperty","type.property.optional.models.StringLiteralProperty":"Type.Property.Optional.StringLiteralProperty","type.property.optional.models.StringLiteralPropertyProperty":null,"type.property.optional.models.StringProperty":"Type.Property.Optional.StringProperty","type.property.optional.models.UnionFloatLiteralProperty":"Type.Property.Optional.UnionFloatLiteralProperty","type.property.optional.models.UnionFloatLiteralPropertyProperty":"Type.Property.Optional.UnionFloatLiteralProperty.property.anonymous","type.property.optional.models.UnionIntLiteralProperty":"Type.Property.Optional.UnionIntLiteralProperty","type.property.optional.models.UnionIntLiteralPropertyProperty":"Type.Property.Optional.UnionIntLiteralProperty.property.anonymous","type.property.optional.models.UnionStringLiteralProperty":"Type.Property.Optional.UnionStringLiteralProperty","type.property.optional.models.UnionStringLiteralPropertyProperty":"Type.Property.Optional.UnionStringLiteralProperty.property.anonymous"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/property/optional/BooleanLiteralAsyncClient.java","src/main/java/type/property/optional/BooleanLiteralClient.java","src/main/java/type/property/optional/BytesAsyncClient.java","src/main/java/type/property/optional/BytesClient.java","src/main/java/type/property/optional/CollectionsByteAsyncClient.java","src/main/java/type/property/optional/CollectionsByteClient.java","src/main/java/type/property/optional/CollectionsModelAsyncClient.java","src/main/java/type/property/optional/CollectionsModelClient.java","src/main/java/type/property/optional/DatetimeOperationAsyncClient.java","src/main/java/type/property/optional/DatetimeOperationClient.java","src/main/java/type/property/optional/DurationOperationAsyncClient.java","src/main/java/type/property/optional/DurationOperationClient.java","src/main/java/type/property/optional/FloatLiteralAsyncClient.java","src/main/java/type/property/optional/FloatLiteralClient.java","src/main/java/type/property/optional/IntLiteralAsyncClient.java","src/main/java/type/property/optional/IntLiteralClient.java","src/main/java/type/property/optional/OptionalClientBuilder.java","src/main/java/type/property/optional/PlainDateAsyncClient.java","src/main/java/type/property/optional/PlainDateClient.java","src/main/java/type/property/optional/PlainTimeAsyncClient.java","src/main/java/type/property/optional/PlainTimeClient.java","src/main/java/type/property/optional/RequiredAndOptionalAsyncClient.java","src/main/java/type/property/optional/RequiredAndOptionalClient.java","src/main/java/type/property/optional/StringLiteralAsyncClient.java","src/main/java/type/property/optional/StringLiteralClient.java","src/main/java/type/property/optional/StringOperationAsyncClient.java","src/main/java/type/property/optional/StringOperationClient.java","src/main/java/type/property/optional/UnionFloatLiteralAsyncClient.java","src/main/java/type/property/optional/UnionFloatLiteralClient.java","src/main/java/type/property/optional/UnionIntLiteralAsyncClient.java","src/main/java/type/property/optional/UnionIntLiteralClient.java","src/main/java/type/property/optional/UnionStringLiteralAsyncClient.java","src/main/java/type/property/optional/UnionStringLiteralClient.java","src/main/java/type/property/optional/implementation/BooleanLiteralsImpl.java","src/main/java/type/property/optional/implementation/BytesImpl.java","src/main/java/type/property/optional/implementation/CollectionsBytesImpl.java","src/main/java/type/property/optional/implementation/CollectionsModelsImpl.java","src/main/java/type/property/optional/implementation/DatetimeOperationsImpl.java","src/main/java/type/property/optional/implementation/DurationOperationsImpl.java","src/main/java/type/property/optional/implementation/FloatLiteralsImpl.java","src/main/java/type/property/optional/implementation/IntLiteralsImpl.java","src/main/java/type/property/optional/implementation/OptionalClientImpl.java","src/main/java/type/property/optional/implementation/PlainDatesImpl.java","src/main/java/type/property/optional/implementation/PlainTimesImpl.java","src/main/java/type/property/optional/implementation/RequiredAndOptionalsImpl.java","src/main/java/type/property/optional/implementation/StringLiteralsImpl.java","src/main/java/type/property/optional/implementation/StringOperationsImpl.java","src/main/java/type/property/optional/implementation/UnionFloatLiteralsImpl.java","src/main/java/type/property/optional/implementation/UnionIntLiteralsImpl.java","src/main/java/type/property/optional/implementation/UnionStringLiteralsImpl.java","src/main/java/type/property/optional/implementation/package-info.java","src/main/java/type/property/optional/models/BooleanLiteralProperty.java","src/main/java/type/property/optional/models/BooleanLiteralPropertyProperty.java","src/main/java/type/property/optional/models/BytesProperty.java","src/main/java/type/property/optional/models/CollectionsByteProperty.java","src/main/java/type/property/optional/models/CollectionsModelProperty.java","src/main/java/type/property/optional/models/DatetimeProperty.java","src/main/java/type/property/optional/models/DurationProperty.java","src/main/java/type/property/optional/models/FloatLiteralProperty.java","src/main/java/type/property/optional/models/FloatLiteralPropertyProperty.java","src/main/java/type/property/optional/models/IntLiteralProperty.java","src/main/java/type/property/optional/models/IntLiteralPropertyProperty.java","src/main/java/type/property/optional/models/PlainDateProperty.java","src/main/java/type/property/optional/models/PlainTimeProperty.java","src/main/java/type/property/optional/models/RequiredAndOptionalProperty.java","src/main/java/type/property/optional/models/StringLiteralProperty.java","src/main/java/type/property/optional/models/StringLiteralPropertyProperty.java","src/main/java/type/property/optional/models/StringProperty.java","src/main/java/type/property/optional/models/UnionFloatLiteralProperty.java","src/main/java/type/property/optional/models/UnionFloatLiteralPropertyProperty.java","src/main/java/type/property/optional/models/UnionIntLiteralProperty.java","src/main/java/type/property/optional/models/UnionIntLiteralPropertyProperty.java","src/main/java/type/property/optional/models/UnionStringLiteralProperty.java","src/main/java/type/property/optional/models/UnionStringLiteralPropertyProperty.java","src/main/java/type/property/optional/models/package-info.java","src/main/java/type/property/optional/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.property.optional.BooleanLiteralAsyncClient":"Type.Property.Optional.BooleanLiteral","type.property.optional.BooleanLiteralAsyncClient.getAll":"Type.Property.Optional.BooleanLiteral.getAll","type.property.optional.BooleanLiteralAsyncClient.getAllWithResponse":"Type.Property.Optional.BooleanLiteral.getAll","type.property.optional.BooleanLiteralAsyncClient.getDefault":"Type.Property.Optional.BooleanLiteral.getDefault","type.property.optional.BooleanLiteralAsyncClient.getDefaultWithResponse":"Type.Property.Optional.BooleanLiteral.getDefault","type.property.optional.BooleanLiteralAsyncClient.putAll":"Type.Property.Optional.BooleanLiteral.putAll","type.property.optional.BooleanLiteralAsyncClient.putAllWithResponse":"Type.Property.Optional.BooleanLiteral.putAll","type.property.optional.BooleanLiteralAsyncClient.putDefault":"Type.Property.Optional.BooleanLiteral.putDefault","type.property.optional.BooleanLiteralAsyncClient.putDefaultWithResponse":"Type.Property.Optional.BooleanLiteral.putDefault","type.property.optional.BooleanLiteralClient":"Type.Property.Optional.BooleanLiteral","type.property.optional.BooleanLiteralClient.getAll":"Type.Property.Optional.BooleanLiteral.getAll","type.property.optional.BooleanLiteralClient.getAllWithResponse":"Type.Property.Optional.BooleanLiteral.getAll","type.property.optional.BooleanLiteralClient.getDefault":"Type.Property.Optional.BooleanLiteral.getDefault","type.property.optional.BooleanLiteralClient.getDefaultWithResponse":"Type.Property.Optional.BooleanLiteral.getDefault","type.property.optional.BooleanLiteralClient.putAll":"Type.Property.Optional.BooleanLiteral.putAll","type.property.optional.BooleanLiteralClient.putAllWithResponse":"Type.Property.Optional.BooleanLiteral.putAll","type.property.optional.BooleanLiteralClient.putDefault":"Type.Property.Optional.BooleanLiteral.putDefault","type.property.optional.BooleanLiteralClient.putDefaultWithResponse":"Type.Property.Optional.BooleanLiteral.putDefault","type.property.optional.BytesAsyncClient":"Type.Property.Optional.Bytes","type.property.optional.BytesAsyncClient.getAll":"Type.Property.Optional.Bytes.getAll","type.property.optional.BytesAsyncClient.getAllWithResponse":"Type.Property.Optional.Bytes.getAll","type.property.optional.BytesAsyncClient.getDefault":"Type.Property.Optional.Bytes.getDefault","type.property.optional.BytesAsyncClient.getDefaultWithResponse":"Type.Property.Optional.Bytes.getDefault","type.property.optional.BytesAsyncClient.putAll":"Type.Property.Optional.Bytes.putAll","type.property.optional.BytesAsyncClient.putAllWithResponse":"Type.Property.Optional.Bytes.putAll","type.property.optional.BytesAsyncClient.putDefault":"Type.Property.Optional.Bytes.putDefault","type.property.optional.BytesAsyncClient.putDefaultWithResponse":"Type.Property.Optional.Bytes.putDefault","type.property.optional.BytesClient":"Type.Property.Optional.Bytes","type.property.optional.BytesClient.getAll":"Type.Property.Optional.Bytes.getAll","type.property.optional.BytesClient.getAllWithResponse":"Type.Property.Optional.Bytes.getAll","type.property.optional.BytesClient.getDefault":"Type.Property.Optional.Bytes.getDefault","type.property.optional.BytesClient.getDefaultWithResponse":"Type.Property.Optional.Bytes.getDefault","type.property.optional.BytesClient.putAll":"Type.Property.Optional.Bytes.putAll","type.property.optional.BytesClient.putAllWithResponse":"Type.Property.Optional.Bytes.putAll","type.property.optional.BytesClient.putDefault":"Type.Property.Optional.Bytes.putDefault","type.property.optional.BytesClient.putDefaultWithResponse":"Type.Property.Optional.Bytes.putDefault","type.property.optional.CollectionsByteAsyncClient":"Type.Property.Optional.CollectionsByte","type.property.optional.CollectionsByteAsyncClient.getAll":"Type.Property.Optional.CollectionsByte.getAll","type.property.optional.CollectionsByteAsyncClient.getAllWithResponse":"Type.Property.Optional.CollectionsByte.getAll","type.property.optional.CollectionsByteAsyncClient.getDefault":"Type.Property.Optional.CollectionsByte.getDefault","type.property.optional.CollectionsByteAsyncClient.getDefaultWithResponse":"Type.Property.Optional.CollectionsByte.getDefault","type.property.optional.CollectionsByteAsyncClient.putAll":"Type.Property.Optional.CollectionsByte.putAll","type.property.optional.CollectionsByteAsyncClient.putAllWithResponse":"Type.Property.Optional.CollectionsByte.putAll","type.property.optional.CollectionsByteAsyncClient.putDefault":"Type.Property.Optional.CollectionsByte.putDefault","type.property.optional.CollectionsByteAsyncClient.putDefaultWithResponse":"Type.Property.Optional.CollectionsByte.putDefault","type.property.optional.CollectionsByteClient":"Type.Property.Optional.CollectionsByte","type.property.optional.CollectionsByteClient.getAll":"Type.Property.Optional.CollectionsByte.getAll","type.property.optional.CollectionsByteClient.getAllWithResponse":"Type.Property.Optional.CollectionsByte.getAll","type.property.optional.CollectionsByteClient.getDefault":"Type.Property.Optional.CollectionsByte.getDefault","type.property.optional.CollectionsByteClient.getDefaultWithResponse":"Type.Property.Optional.CollectionsByte.getDefault","type.property.optional.CollectionsByteClient.putAll":"Type.Property.Optional.CollectionsByte.putAll","type.property.optional.CollectionsByteClient.putAllWithResponse":"Type.Property.Optional.CollectionsByte.putAll","type.property.optional.CollectionsByteClient.putDefault":"Type.Property.Optional.CollectionsByte.putDefault","type.property.optional.CollectionsByteClient.putDefaultWithResponse":"Type.Property.Optional.CollectionsByte.putDefault","type.property.optional.CollectionsModelAsyncClient":"Type.Property.Optional.CollectionsModel","type.property.optional.CollectionsModelAsyncClient.getAll":"Type.Property.Optional.CollectionsModel.getAll","type.property.optional.CollectionsModelAsyncClient.getAllWithResponse":"Type.Property.Optional.CollectionsModel.getAll","type.property.optional.CollectionsModelAsyncClient.getDefault":"Type.Property.Optional.CollectionsModel.getDefault","type.property.optional.CollectionsModelAsyncClient.getDefaultWithResponse":"Type.Property.Optional.CollectionsModel.getDefault","type.property.optional.CollectionsModelAsyncClient.putAll":"Type.Property.Optional.CollectionsModel.putAll","type.property.optional.CollectionsModelAsyncClient.putAllWithResponse":"Type.Property.Optional.CollectionsModel.putAll","type.property.optional.CollectionsModelAsyncClient.putDefault":"Type.Property.Optional.CollectionsModel.putDefault","type.property.optional.CollectionsModelAsyncClient.putDefaultWithResponse":"Type.Property.Optional.CollectionsModel.putDefault","type.property.optional.CollectionsModelClient":"Type.Property.Optional.CollectionsModel","type.property.optional.CollectionsModelClient.getAll":"Type.Property.Optional.CollectionsModel.getAll","type.property.optional.CollectionsModelClient.getAllWithResponse":"Type.Property.Optional.CollectionsModel.getAll","type.property.optional.CollectionsModelClient.getDefault":"Type.Property.Optional.CollectionsModel.getDefault","type.property.optional.CollectionsModelClient.getDefaultWithResponse":"Type.Property.Optional.CollectionsModel.getDefault","type.property.optional.CollectionsModelClient.putAll":"Type.Property.Optional.CollectionsModel.putAll","type.property.optional.CollectionsModelClient.putAllWithResponse":"Type.Property.Optional.CollectionsModel.putAll","type.property.optional.CollectionsModelClient.putDefault":"Type.Property.Optional.CollectionsModel.putDefault","type.property.optional.CollectionsModelClient.putDefaultWithResponse":"Type.Property.Optional.CollectionsModel.putDefault","type.property.optional.DatetimeOperationAsyncClient":"Type.Property.Optional.Datetime","type.property.optional.DatetimeOperationAsyncClient.getAll":"Type.Property.Optional.Datetime.getAll","type.property.optional.DatetimeOperationAsyncClient.getAllWithResponse":"Type.Property.Optional.Datetime.getAll","type.property.optional.DatetimeOperationAsyncClient.getDefault":"Type.Property.Optional.Datetime.getDefault","type.property.optional.DatetimeOperationAsyncClient.getDefaultWithResponse":"Type.Property.Optional.Datetime.getDefault","type.property.optional.DatetimeOperationAsyncClient.putAll":"Type.Property.Optional.Datetime.putAll","type.property.optional.DatetimeOperationAsyncClient.putAllWithResponse":"Type.Property.Optional.Datetime.putAll","type.property.optional.DatetimeOperationAsyncClient.putDefault":"Type.Property.Optional.Datetime.putDefault","type.property.optional.DatetimeOperationAsyncClient.putDefaultWithResponse":"Type.Property.Optional.Datetime.putDefault","type.property.optional.DatetimeOperationClient":"Type.Property.Optional.Datetime","type.property.optional.DatetimeOperationClient.getAll":"Type.Property.Optional.Datetime.getAll","type.property.optional.DatetimeOperationClient.getAllWithResponse":"Type.Property.Optional.Datetime.getAll","type.property.optional.DatetimeOperationClient.getDefault":"Type.Property.Optional.Datetime.getDefault","type.property.optional.DatetimeOperationClient.getDefaultWithResponse":"Type.Property.Optional.Datetime.getDefault","type.property.optional.DatetimeOperationClient.putAll":"Type.Property.Optional.Datetime.putAll","type.property.optional.DatetimeOperationClient.putAllWithResponse":"Type.Property.Optional.Datetime.putAll","type.property.optional.DatetimeOperationClient.putDefault":"Type.Property.Optional.Datetime.putDefault","type.property.optional.DatetimeOperationClient.putDefaultWithResponse":"Type.Property.Optional.Datetime.putDefault","type.property.optional.DurationOperationAsyncClient":"Type.Property.Optional.Duration","type.property.optional.DurationOperationAsyncClient.getAll":"Type.Property.Optional.Duration.getAll","type.property.optional.DurationOperationAsyncClient.getAllWithResponse":"Type.Property.Optional.Duration.getAll","type.property.optional.DurationOperationAsyncClient.getDefault":"Type.Property.Optional.Duration.getDefault","type.property.optional.DurationOperationAsyncClient.getDefaultWithResponse":"Type.Property.Optional.Duration.getDefault","type.property.optional.DurationOperationAsyncClient.putAll":"Type.Property.Optional.Duration.putAll","type.property.optional.DurationOperationAsyncClient.putAllWithResponse":"Type.Property.Optional.Duration.putAll","type.property.optional.DurationOperationAsyncClient.putDefault":"Type.Property.Optional.Duration.putDefault","type.property.optional.DurationOperationAsyncClient.putDefaultWithResponse":"Type.Property.Optional.Duration.putDefault","type.property.optional.DurationOperationClient":"Type.Property.Optional.Duration","type.property.optional.DurationOperationClient.getAll":"Type.Property.Optional.Duration.getAll","type.property.optional.DurationOperationClient.getAllWithResponse":"Type.Property.Optional.Duration.getAll","type.property.optional.DurationOperationClient.getDefault":"Type.Property.Optional.Duration.getDefault","type.property.optional.DurationOperationClient.getDefaultWithResponse":"Type.Property.Optional.Duration.getDefault","type.property.optional.DurationOperationClient.putAll":"Type.Property.Optional.Duration.putAll","type.property.optional.DurationOperationClient.putAllWithResponse":"Type.Property.Optional.Duration.putAll","type.property.optional.DurationOperationClient.putDefault":"Type.Property.Optional.Duration.putDefault","type.property.optional.DurationOperationClient.putDefaultWithResponse":"Type.Property.Optional.Duration.putDefault","type.property.optional.FloatLiteralAsyncClient":"Type.Property.Optional.FloatLiteral","type.property.optional.FloatLiteralAsyncClient.getAll":"Type.Property.Optional.FloatLiteral.getAll","type.property.optional.FloatLiteralAsyncClient.getAllWithResponse":"Type.Property.Optional.FloatLiteral.getAll","type.property.optional.FloatLiteralAsyncClient.getDefault":"Type.Property.Optional.FloatLiteral.getDefault","type.property.optional.FloatLiteralAsyncClient.getDefaultWithResponse":"Type.Property.Optional.FloatLiteral.getDefault","type.property.optional.FloatLiteralAsyncClient.putAll":"Type.Property.Optional.FloatLiteral.putAll","type.property.optional.FloatLiteralAsyncClient.putAllWithResponse":"Type.Property.Optional.FloatLiteral.putAll","type.property.optional.FloatLiteralAsyncClient.putDefault":"Type.Property.Optional.FloatLiteral.putDefault","type.property.optional.FloatLiteralAsyncClient.putDefaultWithResponse":"Type.Property.Optional.FloatLiteral.putDefault","type.property.optional.FloatLiteralClient":"Type.Property.Optional.FloatLiteral","type.property.optional.FloatLiteralClient.getAll":"Type.Property.Optional.FloatLiteral.getAll","type.property.optional.FloatLiteralClient.getAllWithResponse":"Type.Property.Optional.FloatLiteral.getAll","type.property.optional.FloatLiteralClient.getDefault":"Type.Property.Optional.FloatLiteral.getDefault","type.property.optional.FloatLiteralClient.getDefaultWithResponse":"Type.Property.Optional.FloatLiteral.getDefault","type.property.optional.FloatLiteralClient.putAll":"Type.Property.Optional.FloatLiteral.putAll","type.property.optional.FloatLiteralClient.putAllWithResponse":"Type.Property.Optional.FloatLiteral.putAll","type.property.optional.FloatLiteralClient.putDefault":"Type.Property.Optional.FloatLiteral.putDefault","type.property.optional.FloatLiteralClient.putDefaultWithResponse":"Type.Property.Optional.FloatLiteral.putDefault","type.property.optional.IntLiteralAsyncClient":"Type.Property.Optional.IntLiteral","type.property.optional.IntLiteralAsyncClient.getAll":"Type.Property.Optional.IntLiteral.getAll","type.property.optional.IntLiteralAsyncClient.getAllWithResponse":"Type.Property.Optional.IntLiteral.getAll","type.property.optional.IntLiteralAsyncClient.getDefault":"Type.Property.Optional.IntLiteral.getDefault","type.property.optional.IntLiteralAsyncClient.getDefaultWithResponse":"Type.Property.Optional.IntLiteral.getDefault","type.property.optional.IntLiteralAsyncClient.putAll":"Type.Property.Optional.IntLiteral.putAll","type.property.optional.IntLiteralAsyncClient.putAllWithResponse":"Type.Property.Optional.IntLiteral.putAll","type.property.optional.IntLiteralAsyncClient.putDefault":"Type.Property.Optional.IntLiteral.putDefault","type.property.optional.IntLiteralAsyncClient.putDefaultWithResponse":"Type.Property.Optional.IntLiteral.putDefault","type.property.optional.IntLiteralClient":"Type.Property.Optional.IntLiteral","type.property.optional.IntLiteralClient.getAll":"Type.Property.Optional.IntLiteral.getAll","type.property.optional.IntLiteralClient.getAllWithResponse":"Type.Property.Optional.IntLiteral.getAll","type.property.optional.IntLiteralClient.getDefault":"Type.Property.Optional.IntLiteral.getDefault","type.property.optional.IntLiteralClient.getDefaultWithResponse":"Type.Property.Optional.IntLiteral.getDefault","type.property.optional.IntLiteralClient.putAll":"Type.Property.Optional.IntLiteral.putAll","type.property.optional.IntLiteralClient.putAllWithResponse":"Type.Property.Optional.IntLiteral.putAll","type.property.optional.IntLiteralClient.putDefault":"Type.Property.Optional.IntLiteral.putDefault","type.property.optional.IntLiteralClient.putDefaultWithResponse":"Type.Property.Optional.IntLiteral.putDefault","type.property.optional.OptionalClientBuilder":"Type.Property.Optional","type.property.optional.PlainDateAsyncClient":"Type.Property.Optional.PlainDate","type.property.optional.PlainDateAsyncClient.getAll":"Type.Property.Optional.PlainDate.getAll","type.property.optional.PlainDateAsyncClient.getAllWithResponse":"Type.Property.Optional.PlainDate.getAll","type.property.optional.PlainDateAsyncClient.getDefault":"Type.Property.Optional.PlainDate.getDefault","type.property.optional.PlainDateAsyncClient.getDefaultWithResponse":"Type.Property.Optional.PlainDate.getDefault","type.property.optional.PlainDateAsyncClient.putAll":"Type.Property.Optional.PlainDate.putAll","type.property.optional.PlainDateAsyncClient.putAllWithResponse":"Type.Property.Optional.PlainDate.putAll","type.property.optional.PlainDateAsyncClient.putDefault":"Type.Property.Optional.PlainDate.putDefault","type.property.optional.PlainDateAsyncClient.putDefaultWithResponse":"Type.Property.Optional.PlainDate.putDefault","type.property.optional.PlainDateClient":"Type.Property.Optional.PlainDate","type.property.optional.PlainDateClient.getAll":"Type.Property.Optional.PlainDate.getAll","type.property.optional.PlainDateClient.getAllWithResponse":"Type.Property.Optional.PlainDate.getAll","type.property.optional.PlainDateClient.getDefault":"Type.Property.Optional.PlainDate.getDefault","type.property.optional.PlainDateClient.getDefaultWithResponse":"Type.Property.Optional.PlainDate.getDefault","type.property.optional.PlainDateClient.putAll":"Type.Property.Optional.PlainDate.putAll","type.property.optional.PlainDateClient.putAllWithResponse":"Type.Property.Optional.PlainDate.putAll","type.property.optional.PlainDateClient.putDefault":"Type.Property.Optional.PlainDate.putDefault","type.property.optional.PlainDateClient.putDefaultWithResponse":"Type.Property.Optional.PlainDate.putDefault","type.property.optional.PlainTimeAsyncClient":"Type.Property.Optional.PlainTime","type.property.optional.PlainTimeAsyncClient.getAll":"Type.Property.Optional.PlainTime.getAll","type.property.optional.PlainTimeAsyncClient.getAllWithResponse":"Type.Property.Optional.PlainTime.getAll","type.property.optional.PlainTimeAsyncClient.getDefault":"Type.Property.Optional.PlainTime.getDefault","type.property.optional.PlainTimeAsyncClient.getDefaultWithResponse":"Type.Property.Optional.PlainTime.getDefault","type.property.optional.PlainTimeAsyncClient.putAll":"Type.Property.Optional.PlainTime.putAll","type.property.optional.PlainTimeAsyncClient.putAllWithResponse":"Type.Property.Optional.PlainTime.putAll","type.property.optional.PlainTimeAsyncClient.putDefault":"Type.Property.Optional.PlainTime.putDefault","type.property.optional.PlainTimeAsyncClient.putDefaultWithResponse":"Type.Property.Optional.PlainTime.putDefault","type.property.optional.PlainTimeClient":"Type.Property.Optional.PlainTime","type.property.optional.PlainTimeClient.getAll":"Type.Property.Optional.PlainTime.getAll","type.property.optional.PlainTimeClient.getAllWithResponse":"Type.Property.Optional.PlainTime.getAll","type.property.optional.PlainTimeClient.getDefault":"Type.Property.Optional.PlainTime.getDefault","type.property.optional.PlainTimeClient.getDefaultWithResponse":"Type.Property.Optional.PlainTime.getDefault","type.property.optional.PlainTimeClient.putAll":"Type.Property.Optional.PlainTime.putAll","type.property.optional.PlainTimeClient.putAllWithResponse":"Type.Property.Optional.PlainTime.putAll","type.property.optional.PlainTimeClient.putDefault":"Type.Property.Optional.PlainTime.putDefault","type.property.optional.PlainTimeClient.putDefaultWithResponse":"Type.Property.Optional.PlainTime.putDefault","type.property.optional.RequiredAndOptionalAsyncClient":"Type.Property.Optional.RequiredAndOptional","type.property.optional.RequiredAndOptionalAsyncClient.getAll":"Type.Property.Optional.RequiredAndOptional.getAll","type.property.optional.RequiredAndOptionalAsyncClient.getAllWithResponse":"Type.Property.Optional.RequiredAndOptional.getAll","type.property.optional.RequiredAndOptionalAsyncClient.getRequiredOnly":"Type.Property.Optional.RequiredAndOptional.getRequiredOnly","type.property.optional.RequiredAndOptionalAsyncClient.getRequiredOnlyWithResponse":"Type.Property.Optional.RequiredAndOptional.getRequiredOnly","type.property.optional.RequiredAndOptionalAsyncClient.putAll":"Type.Property.Optional.RequiredAndOptional.putAll","type.property.optional.RequiredAndOptionalAsyncClient.putAllWithResponse":"Type.Property.Optional.RequiredAndOptional.putAll","type.property.optional.RequiredAndOptionalAsyncClient.putRequiredOnly":"Type.Property.Optional.RequiredAndOptional.putRequiredOnly","type.property.optional.RequiredAndOptionalAsyncClient.putRequiredOnlyWithResponse":"Type.Property.Optional.RequiredAndOptional.putRequiredOnly","type.property.optional.RequiredAndOptionalClient":"Type.Property.Optional.RequiredAndOptional","type.property.optional.RequiredAndOptionalClient.getAll":"Type.Property.Optional.RequiredAndOptional.getAll","type.property.optional.RequiredAndOptionalClient.getAllWithResponse":"Type.Property.Optional.RequiredAndOptional.getAll","type.property.optional.RequiredAndOptionalClient.getRequiredOnly":"Type.Property.Optional.RequiredAndOptional.getRequiredOnly","type.property.optional.RequiredAndOptionalClient.getRequiredOnlyWithResponse":"Type.Property.Optional.RequiredAndOptional.getRequiredOnly","type.property.optional.RequiredAndOptionalClient.putAll":"Type.Property.Optional.RequiredAndOptional.putAll","type.property.optional.RequiredAndOptionalClient.putAllWithResponse":"Type.Property.Optional.RequiredAndOptional.putAll","type.property.optional.RequiredAndOptionalClient.putRequiredOnly":"Type.Property.Optional.RequiredAndOptional.putRequiredOnly","type.property.optional.RequiredAndOptionalClient.putRequiredOnlyWithResponse":"Type.Property.Optional.RequiredAndOptional.putRequiredOnly","type.property.optional.StringLiteralAsyncClient":"Type.Property.Optional.StringLiteral","type.property.optional.StringLiteralAsyncClient.getAll":"Type.Property.Optional.StringLiteral.getAll","type.property.optional.StringLiteralAsyncClient.getAllWithResponse":"Type.Property.Optional.StringLiteral.getAll","type.property.optional.StringLiteralAsyncClient.getDefault":"Type.Property.Optional.StringLiteral.getDefault","type.property.optional.StringLiteralAsyncClient.getDefaultWithResponse":"Type.Property.Optional.StringLiteral.getDefault","type.property.optional.StringLiteralAsyncClient.putAll":"Type.Property.Optional.StringLiteral.putAll","type.property.optional.StringLiteralAsyncClient.putAllWithResponse":"Type.Property.Optional.StringLiteral.putAll","type.property.optional.StringLiteralAsyncClient.putDefault":"Type.Property.Optional.StringLiteral.putDefault","type.property.optional.StringLiteralAsyncClient.putDefaultWithResponse":"Type.Property.Optional.StringLiteral.putDefault","type.property.optional.StringLiteralClient":"Type.Property.Optional.StringLiteral","type.property.optional.StringLiteralClient.getAll":"Type.Property.Optional.StringLiteral.getAll","type.property.optional.StringLiteralClient.getAllWithResponse":"Type.Property.Optional.StringLiteral.getAll","type.property.optional.StringLiteralClient.getDefault":"Type.Property.Optional.StringLiteral.getDefault","type.property.optional.StringLiteralClient.getDefaultWithResponse":"Type.Property.Optional.StringLiteral.getDefault","type.property.optional.StringLiteralClient.putAll":"Type.Property.Optional.StringLiteral.putAll","type.property.optional.StringLiteralClient.putAllWithResponse":"Type.Property.Optional.StringLiteral.putAll","type.property.optional.StringLiteralClient.putDefault":"Type.Property.Optional.StringLiteral.putDefault","type.property.optional.StringLiteralClient.putDefaultWithResponse":"Type.Property.Optional.StringLiteral.putDefault","type.property.optional.StringOperationAsyncClient":"Type.Property.Optional.String","type.property.optional.StringOperationAsyncClient.getAll":"Type.Property.Optional.String.getAll","type.property.optional.StringOperationAsyncClient.getAllWithResponse":"Type.Property.Optional.String.getAll","type.property.optional.StringOperationAsyncClient.getDefault":"Type.Property.Optional.String.getDefault","type.property.optional.StringOperationAsyncClient.getDefaultWithResponse":"Type.Property.Optional.String.getDefault","type.property.optional.StringOperationAsyncClient.putAll":"Type.Property.Optional.String.putAll","type.property.optional.StringOperationAsyncClient.putAllWithResponse":"Type.Property.Optional.String.putAll","type.property.optional.StringOperationAsyncClient.putDefault":"Type.Property.Optional.String.putDefault","type.property.optional.StringOperationAsyncClient.putDefaultWithResponse":"Type.Property.Optional.String.putDefault","type.property.optional.StringOperationClient":"Type.Property.Optional.String","type.property.optional.StringOperationClient.getAll":"Type.Property.Optional.String.getAll","type.property.optional.StringOperationClient.getAllWithResponse":"Type.Property.Optional.String.getAll","type.property.optional.StringOperationClient.getDefault":"Type.Property.Optional.String.getDefault","type.property.optional.StringOperationClient.getDefaultWithResponse":"Type.Property.Optional.String.getDefault","type.property.optional.StringOperationClient.putAll":"Type.Property.Optional.String.putAll","type.property.optional.StringOperationClient.putAllWithResponse":"Type.Property.Optional.String.putAll","type.property.optional.StringOperationClient.putDefault":"Type.Property.Optional.String.putDefault","type.property.optional.StringOperationClient.putDefaultWithResponse":"Type.Property.Optional.String.putDefault","type.property.optional.UnionFloatLiteralAsyncClient":"Type.Property.Optional.UnionFloatLiteral","type.property.optional.UnionFloatLiteralAsyncClient.getAll":"Type.Property.Optional.UnionFloatLiteral.getAll","type.property.optional.UnionFloatLiteralAsyncClient.getAllWithResponse":"Type.Property.Optional.UnionFloatLiteral.getAll","type.property.optional.UnionFloatLiteralAsyncClient.getDefault":"Type.Property.Optional.UnionFloatLiteral.getDefault","type.property.optional.UnionFloatLiteralAsyncClient.getDefaultWithResponse":"Type.Property.Optional.UnionFloatLiteral.getDefault","type.property.optional.UnionFloatLiteralAsyncClient.putAll":"Type.Property.Optional.UnionFloatLiteral.putAll","type.property.optional.UnionFloatLiteralAsyncClient.putAllWithResponse":"Type.Property.Optional.UnionFloatLiteral.putAll","type.property.optional.UnionFloatLiteralAsyncClient.putDefault":"Type.Property.Optional.UnionFloatLiteral.putDefault","type.property.optional.UnionFloatLiteralAsyncClient.putDefaultWithResponse":"Type.Property.Optional.UnionFloatLiteral.putDefault","type.property.optional.UnionFloatLiteralClient":"Type.Property.Optional.UnionFloatLiteral","type.property.optional.UnionFloatLiteralClient.getAll":"Type.Property.Optional.UnionFloatLiteral.getAll","type.property.optional.UnionFloatLiteralClient.getAllWithResponse":"Type.Property.Optional.UnionFloatLiteral.getAll","type.property.optional.UnionFloatLiteralClient.getDefault":"Type.Property.Optional.UnionFloatLiteral.getDefault","type.property.optional.UnionFloatLiteralClient.getDefaultWithResponse":"Type.Property.Optional.UnionFloatLiteral.getDefault","type.property.optional.UnionFloatLiteralClient.putAll":"Type.Property.Optional.UnionFloatLiteral.putAll","type.property.optional.UnionFloatLiteralClient.putAllWithResponse":"Type.Property.Optional.UnionFloatLiteral.putAll","type.property.optional.UnionFloatLiteralClient.putDefault":"Type.Property.Optional.UnionFloatLiteral.putDefault","type.property.optional.UnionFloatLiteralClient.putDefaultWithResponse":"Type.Property.Optional.UnionFloatLiteral.putDefault","type.property.optional.UnionIntLiteralAsyncClient":"Type.Property.Optional.UnionIntLiteral","type.property.optional.UnionIntLiteralAsyncClient.getAll":"Type.Property.Optional.UnionIntLiteral.getAll","type.property.optional.UnionIntLiteralAsyncClient.getAllWithResponse":"Type.Property.Optional.UnionIntLiteral.getAll","type.property.optional.UnionIntLiteralAsyncClient.getDefault":"Type.Property.Optional.UnionIntLiteral.getDefault","type.property.optional.UnionIntLiteralAsyncClient.getDefaultWithResponse":"Type.Property.Optional.UnionIntLiteral.getDefault","type.property.optional.UnionIntLiteralAsyncClient.putAll":"Type.Property.Optional.UnionIntLiteral.putAll","type.property.optional.UnionIntLiteralAsyncClient.putAllWithResponse":"Type.Property.Optional.UnionIntLiteral.putAll","type.property.optional.UnionIntLiteralAsyncClient.putDefault":"Type.Property.Optional.UnionIntLiteral.putDefault","type.property.optional.UnionIntLiteralAsyncClient.putDefaultWithResponse":"Type.Property.Optional.UnionIntLiteral.putDefault","type.property.optional.UnionIntLiteralClient":"Type.Property.Optional.UnionIntLiteral","type.property.optional.UnionIntLiteralClient.getAll":"Type.Property.Optional.UnionIntLiteral.getAll","type.property.optional.UnionIntLiteralClient.getAllWithResponse":"Type.Property.Optional.UnionIntLiteral.getAll","type.property.optional.UnionIntLiteralClient.getDefault":"Type.Property.Optional.UnionIntLiteral.getDefault","type.property.optional.UnionIntLiteralClient.getDefaultWithResponse":"Type.Property.Optional.UnionIntLiteral.getDefault","type.property.optional.UnionIntLiteralClient.putAll":"Type.Property.Optional.UnionIntLiteral.putAll","type.property.optional.UnionIntLiteralClient.putAllWithResponse":"Type.Property.Optional.UnionIntLiteral.putAll","type.property.optional.UnionIntLiteralClient.putDefault":"Type.Property.Optional.UnionIntLiteral.putDefault","type.property.optional.UnionIntLiteralClient.putDefaultWithResponse":"Type.Property.Optional.UnionIntLiteral.putDefault","type.property.optional.UnionStringLiteralAsyncClient":"Type.Property.Optional.UnionStringLiteral","type.property.optional.UnionStringLiteralAsyncClient.getAll":"Type.Property.Optional.UnionStringLiteral.getAll","type.property.optional.UnionStringLiteralAsyncClient.getAllWithResponse":"Type.Property.Optional.UnionStringLiteral.getAll","type.property.optional.UnionStringLiteralAsyncClient.getDefault":"Type.Property.Optional.UnionStringLiteral.getDefault","type.property.optional.UnionStringLiteralAsyncClient.getDefaultWithResponse":"Type.Property.Optional.UnionStringLiteral.getDefault","type.property.optional.UnionStringLiteralAsyncClient.putAll":"Type.Property.Optional.UnionStringLiteral.putAll","type.property.optional.UnionStringLiteralAsyncClient.putAllWithResponse":"Type.Property.Optional.UnionStringLiteral.putAll","type.property.optional.UnionStringLiteralAsyncClient.putDefault":"Type.Property.Optional.UnionStringLiteral.putDefault","type.property.optional.UnionStringLiteralAsyncClient.putDefaultWithResponse":"Type.Property.Optional.UnionStringLiteral.putDefault","type.property.optional.UnionStringLiteralClient":"Type.Property.Optional.UnionStringLiteral","type.property.optional.UnionStringLiteralClient.getAll":"Type.Property.Optional.UnionStringLiteral.getAll","type.property.optional.UnionStringLiteralClient.getAllWithResponse":"Type.Property.Optional.UnionStringLiteral.getAll","type.property.optional.UnionStringLiteralClient.getDefault":"Type.Property.Optional.UnionStringLiteral.getDefault","type.property.optional.UnionStringLiteralClient.getDefaultWithResponse":"Type.Property.Optional.UnionStringLiteral.getDefault","type.property.optional.UnionStringLiteralClient.putAll":"Type.Property.Optional.UnionStringLiteral.putAll","type.property.optional.UnionStringLiteralClient.putAllWithResponse":"Type.Property.Optional.UnionStringLiteral.putAll","type.property.optional.UnionStringLiteralClient.putDefault":"Type.Property.Optional.UnionStringLiteral.putDefault","type.property.optional.UnionStringLiteralClient.putDefaultWithResponse":"Type.Property.Optional.UnionStringLiteral.putDefault","type.property.optional.models.BooleanLiteralProperty":"Type.Property.Optional.BooleanLiteralProperty","type.property.optional.models.BooleanLiteralPropertyProperty":null,"type.property.optional.models.BytesProperty":"Type.Property.Optional.BytesProperty","type.property.optional.models.CollectionsByteProperty":"Type.Property.Optional.CollectionsByteProperty","type.property.optional.models.CollectionsModelProperty":"Type.Property.Optional.CollectionsModelProperty","type.property.optional.models.DatetimeProperty":"Type.Property.Optional.DatetimeProperty","type.property.optional.models.DurationProperty":"Type.Property.Optional.DurationProperty","type.property.optional.models.FloatLiteralProperty":"Type.Property.Optional.FloatLiteralProperty","type.property.optional.models.FloatLiteralPropertyProperty":null,"type.property.optional.models.IntLiteralProperty":"Type.Property.Optional.IntLiteralProperty","type.property.optional.models.IntLiteralPropertyProperty":null,"type.property.optional.models.PlainDateProperty":"Type.Property.Optional.PlainDateProperty","type.property.optional.models.PlainTimeProperty":"Type.Property.Optional.PlainTimeProperty","type.property.optional.models.RequiredAndOptionalProperty":"Type.Property.Optional.RequiredAndOptionalProperty","type.property.optional.models.StringLiteralProperty":"Type.Property.Optional.StringLiteralProperty","type.property.optional.models.StringLiteralPropertyProperty":null,"type.property.optional.models.StringProperty":"Type.Property.Optional.StringProperty","type.property.optional.models.UnionFloatLiteralProperty":"Type.Property.Optional.UnionFloatLiteralProperty","type.property.optional.models.UnionFloatLiteralPropertyProperty":"Type.Property.Optional.UnionFloatLiteralProperty.property.anonymous","type.property.optional.models.UnionIntLiteralProperty":"Type.Property.Optional.UnionIntLiteralProperty","type.property.optional.models.UnionIntLiteralPropertyProperty":"Type.Property.Optional.UnionIntLiteralProperty.property.anonymous","type.property.optional.models.UnionStringLiteralProperty":"Type.Property.Optional.UnionStringLiteralProperty","type.property.optional.models.UnionStringLiteralPropertyProperty":"Type.Property.Optional.UnionStringLiteralProperty.property.anonymous"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/property/optional/BooleanLiteralAsyncClient.java","src/main/java/type/property/optional/BooleanLiteralClient.java","src/main/java/type/property/optional/BytesAsyncClient.java","src/main/java/type/property/optional/BytesClient.java","src/main/java/type/property/optional/CollectionsByteAsyncClient.java","src/main/java/type/property/optional/CollectionsByteClient.java","src/main/java/type/property/optional/CollectionsModelAsyncClient.java","src/main/java/type/property/optional/CollectionsModelClient.java","src/main/java/type/property/optional/DatetimeOperationAsyncClient.java","src/main/java/type/property/optional/DatetimeOperationClient.java","src/main/java/type/property/optional/DurationOperationAsyncClient.java","src/main/java/type/property/optional/DurationOperationClient.java","src/main/java/type/property/optional/FloatLiteralAsyncClient.java","src/main/java/type/property/optional/FloatLiteralClient.java","src/main/java/type/property/optional/IntLiteralAsyncClient.java","src/main/java/type/property/optional/IntLiteralClient.java","src/main/java/type/property/optional/OptionalClientBuilder.java","src/main/java/type/property/optional/PlainDateAsyncClient.java","src/main/java/type/property/optional/PlainDateClient.java","src/main/java/type/property/optional/PlainTimeAsyncClient.java","src/main/java/type/property/optional/PlainTimeClient.java","src/main/java/type/property/optional/RequiredAndOptionalAsyncClient.java","src/main/java/type/property/optional/RequiredAndOptionalClient.java","src/main/java/type/property/optional/StringLiteralAsyncClient.java","src/main/java/type/property/optional/StringLiteralClient.java","src/main/java/type/property/optional/StringOperationAsyncClient.java","src/main/java/type/property/optional/StringOperationClient.java","src/main/java/type/property/optional/UnionFloatLiteralAsyncClient.java","src/main/java/type/property/optional/UnionFloatLiteralClient.java","src/main/java/type/property/optional/UnionIntLiteralAsyncClient.java","src/main/java/type/property/optional/UnionIntLiteralClient.java","src/main/java/type/property/optional/UnionStringLiteralAsyncClient.java","src/main/java/type/property/optional/UnionStringLiteralClient.java","src/main/java/type/property/optional/implementation/BooleanLiteralsImpl.java","src/main/java/type/property/optional/implementation/BytesImpl.java","src/main/java/type/property/optional/implementation/CollectionsBytesImpl.java","src/main/java/type/property/optional/implementation/CollectionsModelsImpl.java","src/main/java/type/property/optional/implementation/DatetimeOperationsImpl.java","src/main/java/type/property/optional/implementation/DurationOperationsImpl.java","src/main/java/type/property/optional/implementation/FloatLiteralsImpl.java","src/main/java/type/property/optional/implementation/IntLiteralsImpl.java","src/main/java/type/property/optional/implementation/OptionalClientImpl.java","src/main/java/type/property/optional/implementation/PlainDatesImpl.java","src/main/java/type/property/optional/implementation/PlainTimesImpl.java","src/main/java/type/property/optional/implementation/RequiredAndOptionalsImpl.java","src/main/java/type/property/optional/implementation/StringLiteralsImpl.java","src/main/java/type/property/optional/implementation/StringOperationsImpl.java","src/main/java/type/property/optional/implementation/UnionFloatLiteralsImpl.java","src/main/java/type/property/optional/implementation/UnionIntLiteralsImpl.java","src/main/java/type/property/optional/implementation/UnionStringLiteralsImpl.java","src/main/java/type/property/optional/implementation/package-info.java","src/main/java/type/property/optional/models/BooleanLiteralProperty.java","src/main/java/type/property/optional/models/BooleanLiteralPropertyProperty.java","src/main/java/type/property/optional/models/BytesProperty.java","src/main/java/type/property/optional/models/CollectionsByteProperty.java","src/main/java/type/property/optional/models/CollectionsModelProperty.java","src/main/java/type/property/optional/models/DatetimeProperty.java","src/main/java/type/property/optional/models/DurationProperty.java","src/main/java/type/property/optional/models/FloatLiteralProperty.java","src/main/java/type/property/optional/models/FloatLiteralPropertyProperty.java","src/main/java/type/property/optional/models/IntLiteralProperty.java","src/main/java/type/property/optional/models/IntLiteralPropertyProperty.java","src/main/java/type/property/optional/models/PlainDateProperty.java","src/main/java/type/property/optional/models/PlainTimeProperty.java","src/main/java/type/property/optional/models/RequiredAndOptionalProperty.java","src/main/java/type/property/optional/models/StringLiteralProperty.java","src/main/java/type/property/optional/models/StringLiteralPropertyProperty.java","src/main/java/type/property/optional/models/StringProperty.java","src/main/java/type/property/optional/models/UnionFloatLiteralProperty.java","src/main/java/type/property/optional/models/UnionFloatLiteralPropertyProperty.java","src/main/java/type/property/optional/models/UnionIntLiteralProperty.java","src/main/java/type/property/optional/models/UnionIntLiteralPropertyProperty.java","src/main/java/type/property/optional/models/UnionStringLiteralProperty.java","src/main/java/type/property/optional/models/UnionStringLiteralPropertyProperty.java","src/main/java/type/property/optional/models/package-info.java","src/main/java/type/property/optional/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-valuetypes_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-valuetypes_apiview_properties.json deleted file mode 100644 index 77ed3a46f1d..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-valuetypes_apiview_properties.json +++ /dev/null @@ -1,332 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.property.valuetypes.BooleanLiteralAsyncClient": "Type.Property.ValueTypes.BooleanLiteral", - "type.property.valuetypes.BooleanLiteralAsyncClient.get": "Type.Property.ValueTypes.BooleanLiteral.get", - "type.property.valuetypes.BooleanLiteralAsyncClient.getWithResponse": "Type.Property.ValueTypes.BooleanLiteral.get", - "type.property.valuetypes.BooleanLiteralAsyncClient.put": "Type.Property.ValueTypes.BooleanLiteral.put", - "type.property.valuetypes.BooleanLiteralAsyncClient.putWithResponse": "Type.Property.ValueTypes.BooleanLiteral.put", - "type.property.valuetypes.BooleanLiteralClient": "Type.Property.ValueTypes.BooleanLiteral", - "type.property.valuetypes.BooleanLiteralClient.get": "Type.Property.ValueTypes.BooleanLiteral.get", - "type.property.valuetypes.BooleanLiteralClient.getWithResponse": "Type.Property.ValueTypes.BooleanLiteral.get", - "type.property.valuetypes.BooleanLiteralClient.put": "Type.Property.ValueTypes.BooleanLiteral.put", - "type.property.valuetypes.BooleanLiteralClient.putWithResponse": "Type.Property.ValueTypes.BooleanLiteral.put", - "type.property.valuetypes.BooleanOperationAsyncClient": "Type.Property.ValueTypes.Boolean", - "type.property.valuetypes.BooleanOperationAsyncClient.get": "Type.Property.ValueTypes.Boolean.get", - "type.property.valuetypes.BooleanOperationAsyncClient.getWithResponse": "Type.Property.ValueTypes.Boolean.get", - "type.property.valuetypes.BooleanOperationAsyncClient.put": "Type.Property.ValueTypes.Boolean.put", - "type.property.valuetypes.BooleanOperationAsyncClient.putWithResponse": "Type.Property.ValueTypes.Boolean.put", - "type.property.valuetypes.BooleanOperationClient": "Type.Property.ValueTypes.Boolean", - "type.property.valuetypes.BooleanOperationClient.get": "Type.Property.ValueTypes.Boolean.get", - "type.property.valuetypes.BooleanOperationClient.getWithResponse": "Type.Property.ValueTypes.Boolean.get", - "type.property.valuetypes.BooleanOperationClient.put": "Type.Property.ValueTypes.Boolean.put", - "type.property.valuetypes.BooleanOperationClient.putWithResponse": "Type.Property.ValueTypes.Boolean.put", - "type.property.valuetypes.BytesAsyncClient": "Type.Property.ValueTypes.Bytes", - "type.property.valuetypes.BytesAsyncClient.get": "Type.Property.ValueTypes.Bytes.get", - "type.property.valuetypes.BytesAsyncClient.getWithResponse": "Type.Property.ValueTypes.Bytes.get", - "type.property.valuetypes.BytesAsyncClient.put": "Type.Property.ValueTypes.Bytes.put", - "type.property.valuetypes.BytesAsyncClient.putWithResponse": "Type.Property.ValueTypes.Bytes.put", - "type.property.valuetypes.BytesClient": "Type.Property.ValueTypes.Bytes", - "type.property.valuetypes.BytesClient.get": "Type.Property.ValueTypes.Bytes.get", - "type.property.valuetypes.BytesClient.getWithResponse": "Type.Property.ValueTypes.Bytes.get", - "type.property.valuetypes.BytesClient.put": "Type.Property.ValueTypes.Bytes.put", - "type.property.valuetypes.BytesClient.putWithResponse": "Type.Property.ValueTypes.Bytes.put", - "type.property.valuetypes.CollectionsIntAsyncClient": "Type.Property.ValueTypes.CollectionsInt", - "type.property.valuetypes.CollectionsIntAsyncClient.get": "Type.Property.ValueTypes.CollectionsInt.get", - "type.property.valuetypes.CollectionsIntAsyncClient.getWithResponse": "Type.Property.ValueTypes.CollectionsInt.get", - "type.property.valuetypes.CollectionsIntAsyncClient.put": "Type.Property.ValueTypes.CollectionsInt.put", - "type.property.valuetypes.CollectionsIntAsyncClient.putWithResponse": "Type.Property.ValueTypes.CollectionsInt.put", - "type.property.valuetypes.CollectionsIntClient": "Type.Property.ValueTypes.CollectionsInt", - "type.property.valuetypes.CollectionsIntClient.get": "Type.Property.ValueTypes.CollectionsInt.get", - "type.property.valuetypes.CollectionsIntClient.getWithResponse": "Type.Property.ValueTypes.CollectionsInt.get", - "type.property.valuetypes.CollectionsIntClient.put": "Type.Property.ValueTypes.CollectionsInt.put", - "type.property.valuetypes.CollectionsIntClient.putWithResponse": "Type.Property.ValueTypes.CollectionsInt.put", - "type.property.valuetypes.CollectionsModelAsyncClient": "Type.Property.ValueTypes.CollectionsModel", - "type.property.valuetypes.CollectionsModelAsyncClient.get": "Type.Property.ValueTypes.CollectionsModel.get", - "type.property.valuetypes.CollectionsModelAsyncClient.getWithResponse": "Type.Property.ValueTypes.CollectionsModel.get", - "type.property.valuetypes.CollectionsModelAsyncClient.put": "Type.Property.ValueTypes.CollectionsModel.put", - "type.property.valuetypes.CollectionsModelAsyncClient.putWithResponse": "Type.Property.ValueTypes.CollectionsModel.put", - "type.property.valuetypes.CollectionsModelClient": "Type.Property.ValueTypes.CollectionsModel", - "type.property.valuetypes.CollectionsModelClient.get": "Type.Property.ValueTypes.CollectionsModel.get", - "type.property.valuetypes.CollectionsModelClient.getWithResponse": "Type.Property.ValueTypes.CollectionsModel.get", - "type.property.valuetypes.CollectionsModelClient.put": "Type.Property.ValueTypes.CollectionsModel.put", - "type.property.valuetypes.CollectionsModelClient.putWithResponse": "Type.Property.ValueTypes.CollectionsModel.put", - "type.property.valuetypes.CollectionsStringAsyncClient": "Type.Property.ValueTypes.CollectionsString", - "type.property.valuetypes.CollectionsStringAsyncClient.get": "Type.Property.ValueTypes.CollectionsString.get", - "type.property.valuetypes.CollectionsStringAsyncClient.getWithResponse": "Type.Property.ValueTypes.CollectionsString.get", - "type.property.valuetypes.CollectionsStringAsyncClient.put": "Type.Property.ValueTypes.CollectionsString.put", - "type.property.valuetypes.CollectionsStringAsyncClient.putWithResponse": "Type.Property.ValueTypes.CollectionsString.put", - "type.property.valuetypes.CollectionsStringClient": "Type.Property.ValueTypes.CollectionsString", - "type.property.valuetypes.CollectionsStringClient.get": "Type.Property.ValueTypes.CollectionsString.get", - "type.property.valuetypes.CollectionsStringClient.getWithResponse": "Type.Property.ValueTypes.CollectionsString.get", - "type.property.valuetypes.CollectionsStringClient.put": "Type.Property.ValueTypes.CollectionsString.put", - "type.property.valuetypes.CollectionsStringClient.putWithResponse": "Type.Property.ValueTypes.CollectionsString.put", - "type.property.valuetypes.DatetimeOperationAsyncClient": "Type.Property.ValueTypes.Datetime", - "type.property.valuetypes.DatetimeOperationAsyncClient.get": "Type.Property.ValueTypes.Datetime.get", - "type.property.valuetypes.DatetimeOperationAsyncClient.getWithResponse": "Type.Property.ValueTypes.Datetime.get", - "type.property.valuetypes.DatetimeOperationAsyncClient.put": "Type.Property.ValueTypes.Datetime.put", - "type.property.valuetypes.DatetimeOperationAsyncClient.putWithResponse": "Type.Property.ValueTypes.Datetime.put", - "type.property.valuetypes.DatetimeOperationClient": "Type.Property.ValueTypes.Datetime", - "type.property.valuetypes.DatetimeOperationClient.get": "Type.Property.ValueTypes.Datetime.get", - "type.property.valuetypes.DatetimeOperationClient.getWithResponse": "Type.Property.ValueTypes.Datetime.get", - "type.property.valuetypes.DatetimeOperationClient.put": "Type.Property.ValueTypes.Datetime.put", - "type.property.valuetypes.DatetimeOperationClient.putWithResponse": "Type.Property.ValueTypes.Datetime.put", - "type.property.valuetypes.Decimal128AsyncClient": "Type.Property.ValueTypes.Decimal128", - "type.property.valuetypes.Decimal128AsyncClient.get": "Type.Property.ValueTypes.Decimal128.get", - "type.property.valuetypes.Decimal128AsyncClient.getWithResponse": "Type.Property.ValueTypes.Decimal128.get", - "type.property.valuetypes.Decimal128AsyncClient.put": "Type.Property.ValueTypes.Decimal128.put", - "type.property.valuetypes.Decimal128AsyncClient.putWithResponse": "Type.Property.ValueTypes.Decimal128.put", - "type.property.valuetypes.Decimal128Client": "Type.Property.ValueTypes.Decimal128", - "type.property.valuetypes.Decimal128Client.get": "Type.Property.ValueTypes.Decimal128.get", - "type.property.valuetypes.Decimal128Client.getWithResponse": "Type.Property.ValueTypes.Decimal128.get", - "type.property.valuetypes.Decimal128Client.put": "Type.Property.ValueTypes.Decimal128.put", - "type.property.valuetypes.Decimal128Client.putWithResponse": "Type.Property.ValueTypes.Decimal128.put", - "type.property.valuetypes.DecimalAsyncClient": "Type.Property.ValueTypes.Decimal", - "type.property.valuetypes.DecimalAsyncClient.get": "Type.Property.ValueTypes.Decimal.get", - "type.property.valuetypes.DecimalAsyncClient.getWithResponse": "Type.Property.ValueTypes.Decimal.get", - "type.property.valuetypes.DecimalAsyncClient.put": "Type.Property.ValueTypes.Decimal.put", - "type.property.valuetypes.DecimalAsyncClient.putWithResponse": "Type.Property.ValueTypes.Decimal.put", - "type.property.valuetypes.DecimalClient": "Type.Property.ValueTypes.Decimal", - "type.property.valuetypes.DecimalClient.get": "Type.Property.ValueTypes.Decimal.get", - "type.property.valuetypes.DecimalClient.getWithResponse": "Type.Property.ValueTypes.Decimal.get", - "type.property.valuetypes.DecimalClient.put": "Type.Property.ValueTypes.Decimal.put", - "type.property.valuetypes.DecimalClient.putWithResponse": "Type.Property.ValueTypes.Decimal.put", - "type.property.valuetypes.DictionaryStringAsyncClient": "Type.Property.ValueTypes.DictionaryString", - "type.property.valuetypes.DictionaryStringAsyncClient.get": "Type.Property.ValueTypes.DictionaryString.get", - "type.property.valuetypes.DictionaryStringAsyncClient.getWithResponse": "Type.Property.ValueTypes.DictionaryString.get", - "type.property.valuetypes.DictionaryStringAsyncClient.put": "Type.Property.ValueTypes.DictionaryString.put", - "type.property.valuetypes.DictionaryStringAsyncClient.putWithResponse": "Type.Property.ValueTypes.DictionaryString.put", - "type.property.valuetypes.DictionaryStringClient": "Type.Property.ValueTypes.DictionaryString", - "type.property.valuetypes.DictionaryStringClient.get": "Type.Property.ValueTypes.DictionaryString.get", - "type.property.valuetypes.DictionaryStringClient.getWithResponse": "Type.Property.ValueTypes.DictionaryString.get", - "type.property.valuetypes.DictionaryStringClient.put": "Type.Property.ValueTypes.DictionaryString.put", - "type.property.valuetypes.DictionaryStringClient.putWithResponse": "Type.Property.ValueTypes.DictionaryString.put", - "type.property.valuetypes.DurationOperationAsyncClient": "Type.Property.ValueTypes.Duration", - "type.property.valuetypes.DurationOperationAsyncClient.get": "Type.Property.ValueTypes.Duration.get", - "type.property.valuetypes.DurationOperationAsyncClient.getWithResponse": "Type.Property.ValueTypes.Duration.get", - "type.property.valuetypes.DurationOperationAsyncClient.put": "Type.Property.ValueTypes.Duration.put", - "type.property.valuetypes.DurationOperationAsyncClient.putWithResponse": "Type.Property.ValueTypes.Duration.put", - "type.property.valuetypes.DurationOperationClient": "Type.Property.ValueTypes.Duration", - "type.property.valuetypes.DurationOperationClient.get": "Type.Property.ValueTypes.Duration.get", - "type.property.valuetypes.DurationOperationClient.getWithResponse": "Type.Property.ValueTypes.Duration.get", - "type.property.valuetypes.DurationOperationClient.put": "Type.Property.ValueTypes.Duration.put", - "type.property.valuetypes.DurationOperationClient.putWithResponse": "Type.Property.ValueTypes.Duration.put", - "type.property.valuetypes.EnumAsyncClient": "Type.Property.ValueTypes.Enum", - "type.property.valuetypes.EnumAsyncClient.get": "Type.Property.ValueTypes.Enum.get", - "type.property.valuetypes.EnumAsyncClient.getWithResponse": "Type.Property.ValueTypes.Enum.get", - "type.property.valuetypes.EnumAsyncClient.put": "Type.Property.ValueTypes.Enum.put", - "type.property.valuetypes.EnumAsyncClient.putWithResponse": "Type.Property.ValueTypes.Enum.put", - "type.property.valuetypes.EnumClient": "Type.Property.ValueTypes.Enum", - "type.property.valuetypes.EnumClient.get": "Type.Property.ValueTypes.Enum.get", - "type.property.valuetypes.EnumClient.getWithResponse": "Type.Property.ValueTypes.Enum.get", - "type.property.valuetypes.EnumClient.put": "Type.Property.ValueTypes.Enum.put", - "type.property.valuetypes.EnumClient.putWithResponse": "Type.Property.ValueTypes.Enum.put", - "type.property.valuetypes.ExtensibleEnumAsyncClient": "Type.Property.ValueTypes.ExtensibleEnum", - "type.property.valuetypes.ExtensibleEnumAsyncClient.get": "Type.Property.ValueTypes.ExtensibleEnum.get", - "type.property.valuetypes.ExtensibleEnumAsyncClient.getWithResponse": "Type.Property.ValueTypes.ExtensibleEnum.get", - "type.property.valuetypes.ExtensibleEnumAsyncClient.put": "Type.Property.ValueTypes.ExtensibleEnum.put", - "type.property.valuetypes.ExtensibleEnumAsyncClient.putWithResponse": "Type.Property.ValueTypes.ExtensibleEnum.put", - "type.property.valuetypes.ExtensibleEnumClient": "Type.Property.ValueTypes.ExtensibleEnum", - "type.property.valuetypes.ExtensibleEnumClient.get": "Type.Property.ValueTypes.ExtensibleEnum.get", - "type.property.valuetypes.ExtensibleEnumClient.getWithResponse": "Type.Property.ValueTypes.ExtensibleEnum.get", - "type.property.valuetypes.ExtensibleEnumClient.put": "Type.Property.ValueTypes.ExtensibleEnum.put", - "type.property.valuetypes.ExtensibleEnumClient.putWithResponse": "Type.Property.ValueTypes.ExtensibleEnum.put", - "type.property.valuetypes.FloatLiteralAsyncClient": "Type.Property.ValueTypes.FloatLiteral", - "type.property.valuetypes.FloatLiteralAsyncClient.get": "Type.Property.ValueTypes.FloatLiteral.get", - "type.property.valuetypes.FloatLiteralAsyncClient.getWithResponse": "Type.Property.ValueTypes.FloatLiteral.get", - "type.property.valuetypes.FloatLiteralAsyncClient.put": "Type.Property.ValueTypes.FloatLiteral.put", - "type.property.valuetypes.FloatLiteralAsyncClient.putWithResponse": "Type.Property.ValueTypes.FloatLiteral.put", - "type.property.valuetypes.FloatLiteralClient": "Type.Property.ValueTypes.FloatLiteral", - "type.property.valuetypes.FloatLiteralClient.get": "Type.Property.ValueTypes.FloatLiteral.get", - "type.property.valuetypes.FloatLiteralClient.getWithResponse": "Type.Property.ValueTypes.FloatLiteral.get", - "type.property.valuetypes.FloatLiteralClient.put": "Type.Property.ValueTypes.FloatLiteral.put", - "type.property.valuetypes.FloatLiteralClient.putWithResponse": "Type.Property.ValueTypes.FloatLiteral.put", - "type.property.valuetypes.FloatOperationAsyncClient": "Type.Property.ValueTypes.Float", - "type.property.valuetypes.FloatOperationAsyncClient.get": "Type.Property.ValueTypes.Float.get", - "type.property.valuetypes.FloatOperationAsyncClient.getWithResponse": "Type.Property.ValueTypes.Float.get", - "type.property.valuetypes.FloatOperationAsyncClient.put": "Type.Property.ValueTypes.Float.put", - "type.property.valuetypes.FloatOperationAsyncClient.putWithResponse": "Type.Property.ValueTypes.Float.put", - "type.property.valuetypes.FloatOperationClient": "Type.Property.ValueTypes.Float", - "type.property.valuetypes.FloatOperationClient.get": "Type.Property.ValueTypes.Float.get", - "type.property.valuetypes.FloatOperationClient.getWithResponse": "Type.Property.ValueTypes.Float.get", - "type.property.valuetypes.FloatOperationClient.put": "Type.Property.ValueTypes.Float.put", - "type.property.valuetypes.FloatOperationClient.putWithResponse": "Type.Property.ValueTypes.Float.put", - "type.property.valuetypes.IntAsyncClient": "Type.Property.ValueTypes.Int", - "type.property.valuetypes.IntAsyncClient.get": "Type.Property.ValueTypes.Int.get", - "type.property.valuetypes.IntAsyncClient.getWithResponse": "Type.Property.ValueTypes.Int.get", - "type.property.valuetypes.IntAsyncClient.put": "Type.Property.ValueTypes.Int.put", - "type.property.valuetypes.IntAsyncClient.putWithResponse": "Type.Property.ValueTypes.Int.put", - "type.property.valuetypes.IntClient": "Type.Property.ValueTypes.Int", - "type.property.valuetypes.IntClient.get": "Type.Property.ValueTypes.Int.get", - "type.property.valuetypes.IntClient.getWithResponse": "Type.Property.ValueTypes.Int.get", - "type.property.valuetypes.IntClient.put": "Type.Property.ValueTypes.Int.put", - "type.property.valuetypes.IntClient.putWithResponse": "Type.Property.ValueTypes.Int.put", - "type.property.valuetypes.IntLiteralAsyncClient": "Type.Property.ValueTypes.IntLiteral", - "type.property.valuetypes.IntLiteralAsyncClient.get": "Type.Property.ValueTypes.IntLiteral.get", - "type.property.valuetypes.IntLiteralAsyncClient.getWithResponse": "Type.Property.ValueTypes.IntLiteral.get", - "type.property.valuetypes.IntLiteralAsyncClient.put": "Type.Property.ValueTypes.IntLiteral.put", - "type.property.valuetypes.IntLiteralAsyncClient.putWithResponse": "Type.Property.ValueTypes.IntLiteral.put", - "type.property.valuetypes.IntLiteralClient": "Type.Property.ValueTypes.IntLiteral", - "type.property.valuetypes.IntLiteralClient.get": "Type.Property.ValueTypes.IntLiteral.get", - "type.property.valuetypes.IntLiteralClient.getWithResponse": "Type.Property.ValueTypes.IntLiteral.get", - "type.property.valuetypes.IntLiteralClient.put": "Type.Property.ValueTypes.IntLiteral.put", - "type.property.valuetypes.IntLiteralClient.putWithResponse": "Type.Property.ValueTypes.IntLiteral.put", - "type.property.valuetypes.ModelAsyncClient": "Type.Property.ValueTypes.Model", - "type.property.valuetypes.ModelAsyncClient.get": "Type.Property.ValueTypes.Model.get", - "type.property.valuetypes.ModelAsyncClient.getWithResponse": "Type.Property.ValueTypes.Model.get", - "type.property.valuetypes.ModelAsyncClient.put": "Type.Property.ValueTypes.Model.put", - "type.property.valuetypes.ModelAsyncClient.putWithResponse": "Type.Property.ValueTypes.Model.put", - "type.property.valuetypes.ModelClient": "Type.Property.ValueTypes.Model", - "type.property.valuetypes.ModelClient.get": "Type.Property.ValueTypes.Model.get", - "type.property.valuetypes.ModelClient.getWithResponse": "Type.Property.ValueTypes.Model.get", - "type.property.valuetypes.ModelClient.put": "Type.Property.ValueTypes.Model.put", - "type.property.valuetypes.ModelClient.putWithResponse": "Type.Property.ValueTypes.Model.put", - "type.property.valuetypes.NeverAsyncClient": "Type.Property.ValueTypes.Never", - "type.property.valuetypes.NeverAsyncClient.get": "Type.Property.ValueTypes.Never.get", - "type.property.valuetypes.NeverAsyncClient.getWithResponse": "Type.Property.ValueTypes.Never.get", - "type.property.valuetypes.NeverAsyncClient.put": "Type.Property.ValueTypes.Never.put", - "type.property.valuetypes.NeverAsyncClient.putWithResponse": "Type.Property.ValueTypes.Never.put", - "type.property.valuetypes.NeverClient": "Type.Property.ValueTypes.Never", - "type.property.valuetypes.NeverClient.get": "Type.Property.ValueTypes.Never.get", - "type.property.valuetypes.NeverClient.getWithResponse": "Type.Property.ValueTypes.Never.get", - "type.property.valuetypes.NeverClient.put": "Type.Property.ValueTypes.Never.put", - "type.property.valuetypes.NeverClient.putWithResponse": "Type.Property.ValueTypes.Never.put", - "type.property.valuetypes.StringLiteralAsyncClient": "Type.Property.ValueTypes.StringLiteral", - "type.property.valuetypes.StringLiteralAsyncClient.get": "Type.Property.ValueTypes.StringLiteral.get", - "type.property.valuetypes.StringLiteralAsyncClient.getWithResponse": "Type.Property.ValueTypes.StringLiteral.get", - "type.property.valuetypes.StringLiteralAsyncClient.put": "Type.Property.ValueTypes.StringLiteral.put", - "type.property.valuetypes.StringLiteralAsyncClient.putWithResponse": "Type.Property.ValueTypes.StringLiteral.put", - "type.property.valuetypes.StringLiteralClient": "Type.Property.ValueTypes.StringLiteral", - "type.property.valuetypes.StringLiteralClient.get": "Type.Property.ValueTypes.StringLiteral.get", - "type.property.valuetypes.StringLiteralClient.getWithResponse": "Type.Property.ValueTypes.StringLiteral.get", - "type.property.valuetypes.StringLiteralClient.put": "Type.Property.ValueTypes.StringLiteral.put", - "type.property.valuetypes.StringLiteralClient.putWithResponse": "Type.Property.ValueTypes.StringLiteral.put", - "type.property.valuetypes.StringOperationAsyncClient": "Type.Property.ValueTypes.String", - "type.property.valuetypes.StringOperationAsyncClient.get": "Type.Property.ValueTypes.String.get", - "type.property.valuetypes.StringOperationAsyncClient.getWithResponse": "Type.Property.ValueTypes.String.get", - "type.property.valuetypes.StringOperationAsyncClient.put": "Type.Property.ValueTypes.String.put", - "type.property.valuetypes.StringOperationAsyncClient.putWithResponse": "Type.Property.ValueTypes.String.put", - "type.property.valuetypes.StringOperationClient": "Type.Property.ValueTypes.String", - "type.property.valuetypes.StringOperationClient.get": "Type.Property.ValueTypes.String.get", - "type.property.valuetypes.StringOperationClient.getWithResponse": "Type.Property.ValueTypes.String.get", - "type.property.valuetypes.StringOperationClient.put": "Type.Property.ValueTypes.String.put", - "type.property.valuetypes.StringOperationClient.putWithResponse": "Type.Property.ValueTypes.String.put", - "type.property.valuetypes.UnionEnumValueAsyncClient": "Type.Property.ValueTypes.UnionEnumValue", - "type.property.valuetypes.UnionEnumValueAsyncClient.get": "Type.Property.ValueTypes.UnionEnumValue.get", - "type.property.valuetypes.UnionEnumValueAsyncClient.getWithResponse": "Type.Property.ValueTypes.UnionEnumValue.get", - "type.property.valuetypes.UnionEnumValueAsyncClient.put": "Type.Property.ValueTypes.UnionEnumValue.put", - "type.property.valuetypes.UnionEnumValueAsyncClient.putWithResponse": "Type.Property.ValueTypes.UnionEnumValue.put", - "type.property.valuetypes.UnionEnumValueClient": "Type.Property.ValueTypes.UnionEnumValue", - "type.property.valuetypes.UnionEnumValueClient.get": "Type.Property.ValueTypes.UnionEnumValue.get", - "type.property.valuetypes.UnionEnumValueClient.getWithResponse": "Type.Property.ValueTypes.UnionEnumValue.get", - "type.property.valuetypes.UnionEnumValueClient.put": "Type.Property.ValueTypes.UnionEnumValue.put", - "type.property.valuetypes.UnionEnumValueClient.putWithResponse": "Type.Property.ValueTypes.UnionEnumValue.put", - "type.property.valuetypes.UnionFloatLiteralAsyncClient": "Type.Property.ValueTypes.UnionFloatLiteral", - "type.property.valuetypes.UnionFloatLiteralAsyncClient.get": "Type.Property.ValueTypes.UnionFloatLiteral.get", - "type.property.valuetypes.UnionFloatLiteralAsyncClient.getWithResponse": "Type.Property.ValueTypes.UnionFloatLiteral.get", - "type.property.valuetypes.UnionFloatLiteralAsyncClient.put": "Type.Property.ValueTypes.UnionFloatLiteral.put", - "type.property.valuetypes.UnionFloatLiteralAsyncClient.putWithResponse": "Type.Property.ValueTypes.UnionFloatLiteral.put", - "type.property.valuetypes.UnionFloatLiteralClient": "Type.Property.ValueTypes.UnionFloatLiteral", - "type.property.valuetypes.UnionFloatLiteralClient.get": "Type.Property.ValueTypes.UnionFloatLiteral.get", - "type.property.valuetypes.UnionFloatLiteralClient.getWithResponse": "Type.Property.ValueTypes.UnionFloatLiteral.get", - "type.property.valuetypes.UnionFloatLiteralClient.put": "Type.Property.ValueTypes.UnionFloatLiteral.put", - "type.property.valuetypes.UnionFloatLiteralClient.putWithResponse": "Type.Property.ValueTypes.UnionFloatLiteral.put", - "type.property.valuetypes.UnionIntLiteralAsyncClient": "Type.Property.ValueTypes.UnionIntLiteral", - "type.property.valuetypes.UnionIntLiteralAsyncClient.get": "Type.Property.ValueTypes.UnionIntLiteral.get", - "type.property.valuetypes.UnionIntLiteralAsyncClient.getWithResponse": "Type.Property.ValueTypes.UnionIntLiteral.get", - "type.property.valuetypes.UnionIntLiteralAsyncClient.put": "Type.Property.ValueTypes.UnionIntLiteral.put", - "type.property.valuetypes.UnionIntLiteralAsyncClient.putWithResponse": "Type.Property.ValueTypes.UnionIntLiteral.put", - "type.property.valuetypes.UnionIntLiteralClient": "Type.Property.ValueTypes.UnionIntLiteral", - "type.property.valuetypes.UnionIntLiteralClient.get": "Type.Property.ValueTypes.UnionIntLiteral.get", - "type.property.valuetypes.UnionIntLiteralClient.getWithResponse": "Type.Property.ValueTypes.UnionIntLiteral.get", - "type.property.valuetypes.UnionIntLiteralClient.put": "Type.Property.ValueTypes.UnionIntLiteral.put", - "type.property.valuetypes.UnionIntLiteralClient.putWithResponse": "Type.Property.ValueTypes.UnionIntLiteral.put", - "type.property.valuetypes.UnionStringLiteralAsyncClient": "Type.Property.ValueTypes.UnionStringLiteral", - "type.property.valuetypes.UnionStringLiteralAsyncClient.get": "Type.Property.ValueTypes.UnionStringLiteral.get", - "type.property.valuetypes.UnionStringLiteralAsyncClient.getWithResponse": "Type.Property.ValueTypes.UnionStringLiteral.get", - "type.property.valuetypes.UnionStringLiteralAsyncClient.put": "Type.Property.ValueTypes.UnionStringLiteral.put", - "type.property.valuetypes.UnionStringLiteralAsyncClient.putWithResponse": "Type.Property.ValueTypes.UnionStringLiteral.put", - "type.property.valuetypes.UnionStringLiteralClient": "Type.Property.ValueTypes.UnionStringLiteral", - "type.property.valuetypes.UnionStringLiteralClient.get": "Type.Property.ValueTypes.UnionStringLiteral.get", - "type.property.valuetypes.UnionStringLiteralClient.getWithResponse": "Type.Property.ValueTypes.UnionStringLiteral.get", - "type.property.valuetypes.UnionStringLiteralClient.put": "Type.Property.ValueTypes.UnionStringLiteral.put", - "type.property.valuetypes.UnionStringLiteralClient.putWithResponse": "Type.Property.ValueTypes.UnionStringLiteral.put", - "type.property.valuetypes.UnknownArrayAsyncClient": "Type.Property.ValueTypes.UnknownArray", - "type.property.valuetypes.UnknownArrayAsyncClient.get": "Type.Property.ValueTypes.UnknownArray.get", - "type.property.valuetypes.UnknownArrayAsyncClient.getWithResponse": "Type.Property.ValueTypes.UnknownArray.get", - "type.property.valuetypes.UnknownArrayAsyncClient.put": "Type.Property.ValueTypes.UnknownArray.put", - "type.property.valuetypes.UnknownArrayAsyncClient.putWithResponse": "Type.Property.ValueTypes.UnknownArray.put", - "type.property.valuetypes.UnknownArrayClient": "Type.Property.ValueTypes.UnknownArray", - "type.property.valuetypes.UnknownArrayClient.get": "Type.Property.ValueTypes.UnknownArray.get", - "type.property.valuetypes.UnknownArrayClient.getWithResponse": "Type.Property.ValueTypes.UnknownArray.get", - "type.property.valuetypes.UnknownArrayClient.put": "Type.Property.ValueTypes.UnknownArray.put", - "type.property.valuetypes.UnknownArrayClient.putWithResponse": "Type.Property.ValueTypes.UnknownArray.put", - "type.property.valuetypes.UnknownDictAsyncClient": "Type.Property.ValueTypes.UnknownDict", - "type.property.valuetypes.UnknownDictAsyncClient.get": "Type.Property.ValueTypes.UnknownDict.get", - "type.property.valuetypes.UnknownDictAsyncClient.getWithResponse": "Type.Property.ValueTypes.UnknownDict.get", - "type.property.valuetypes.UnknownDictAsyncClient.put": "Type.Property.ValueTypes.UnknownDict.put", - "type.property.valuetypes.UnknownDictAsyncClient.putWithResponse": "Type.Property.ValueTypes.UnknownDict.put", - "type.property.valuetypes.UnknownDictClient": "Type.Property.ValueTypes.UnknownDict", - "type.property.valuetypes.UnknownDictClient.get": "Type.Property.ValueTypes.UnknownDict.get", - "type.property.valuetypes.UnknownDictClient.getWithResponse": "Type.Property.ValueTypes.UnknownDict.get", - "type.property.valuetypes.UnknownDictClient.put": "Type.Property.ValueTypes.UnknownDict.put", - "type.property.valuetypes.UnknownDictClient.putWithResponse": "Type.Property.ValueTypes.UnknownDict.put", - "type.property.valuetypes.UnknownIntAsyncClient": "Type.Property.ValueTypes.UnknownInt", - "type.property.valuetypes.UnknownIntAsyncClient.get": "Type.Property.ValueTypes.UnknownInt.get", - "type.property.valuetypes.UnknownIntAsyncClient.getWithResponse": "Type.Property.ValueTypes.UnknownInt.get", - "type.property.valuetypes.UnknownIntAsyncClient.put": "Type.Property.ValueTypes.UnknownInt.put", - "type.property.valuetypes.UnknownIntAsyncClient.putWithResponse": "Type.Property.ValueTypes.UnknownInt.put", - "type.property.valuetypes.UnknownIntClient": "Type.Property.ValueTypes.UnknownInt", - "type.property.valuetypes.UnknownIntClient.get": "Type.Property.ValueTypes.UnknownInt.get", - "type.property.valuetypes.UnknownIntClient.getWithResponse": "Type.Property.ValueTypes.UnknownInt.get", - "type.property.valuetypes.UnknownIntClient.put": "Type.Property.ValueTypes.UnknownInt.put", - "type.property.valuetypes.UnknownIntClient.putWithResponse": "Type.Property.ValueTypes.UnknownInt.put", - "type.property.valuetypes.UnknownStringAsyncClient": "Type.Property.ValueTypes.UnknownString", - "type.property.valuetypes.UnknownStringAsyncClient.get": "Type.Property.ValueTypes.UnknownString.get", - "type.property.valuetypes.UnknownStringAsyncClient.getWithResponse": "Type.Property.ValueTypes.UnknownString.get", - "type.property.valuetypes.UnknownStringAsyncClient.put": "Type.Property.ValueTypes.UnknownString.put", - "type.property.valuetypes.UnknownStringAsyncClient.putWithResponse": "Type.Property.ValueTypes.UnknownString.put", - "type.property.valuetypes.UnknownStringClient": "Type.Property.ValueTypes.UnknownString", - "type.property.valuetypes.UnknownStringClient.get": "Type.Property.ValueTypes.UnknownString.get", - "type.property.valuetypes.UnknownStringClient.getWithResponse": "Type.Property.ValueTypes.UnknownString.get", - "type.property.valuetypes.UnknownStringClient.put": "Type.Property.ValueTypes.UnknownString.put", - "type.property.valuetypes.UnknownStringClient.putWithResponse": "Type.Property.ValueTypes.UnknownString.put", - "type.property.valuetypes.ValueTypesClientBuilder": "Type.Property.ValueTypes", - "type.property.valuetypes.models.BooleanLiteralProperty": "Type.Property.ValueTypes.BooleanLiteralProperty", - "type.property.valuetypes.models.BooleanProperty": "Type.Property.ValueTypes.BooleanProperty", - "type.property.valuetypes.models.BytesProperty": "Type.Property.ValueTypes.BytesProperty", - "type.property.valuetypes.models.CollectionsIntProperty": "Type.Property.ValueTypes.CollectionsIntProperty", - "type.property.valuetypes.models.CollectionsModelProperty": "Type.Property.ValueTypes.CollectionsModelProperty", - "type.property.valuetypes.models.CollectionsStringProperty": "Type.Property.ValueTypes.CollectionsStringProperty", - "type.property.valuetypes.models.DatetimeProperty": "Type.Property.ValueTypes.DatetimeProperty", - "type.property.valuetypes.models.Decimal128Property": "Type.Property.ValueTypes.Decimal128Property", - "type.property.valuetypes.models.DecimalProperty": "Type.Property.ValueTypes.DecimalProperty", - "type.property.valuetypes.models.DictionaryStringProperty": "Type.Property.ValueTypes.DictionaryStringProperty", - "type.property.valuetypes.models.DurationProperty": "Type.Property.ValueTypes.DurationProperty", - "type.property.valuetypes.models.EnumProperty": "Type.Property.ValueTypes.EnumProperty", - "type.property.valuetypes.models.ExtendedEnum": "Type.Property.ValueTypes.ExtendedEnum", - "type.property.valuetypes.models.ExtensibleEnumProperty": "Type.Property.ValueTypes.ExtensibleEnumProperty", - "type.property.valuetypes.models.FixedInnerEnum": "Type.Property.ValueTypes.FixedInnerEnum", - "type.property.valuetypes.models.FloatLiteralProperty": "Type.Property.ValueTypes.FloatLiteralProperty", - "type.property.valuetypes.models.FloatProperty": "Type.Property.ValueTypes.FloatProperty", - "type.property.valuetypes.models.InnerEnum": "Type.Property.ValueTypes.InnerEnum", - "type.property.valuetypes.models.InnerModel": "Type.Property.ValueTypes.InnerModel", - "type.property.valuetypes.models.IntLiteralProperty": "Type.Property.ValueTypes.IntLiteralProperty", - "type.property.valuetypes.models.IntProperty": "Type.Property.ValueTypes.IntProperty", - "type.property.valuetypes.models.ModelProperty": "Type.Property.ValueTypes.ModelProperty", - "type.property.valuetypes.models.NeverProperty": "Type.Property.ValueTypes.NeverProperty", - "type.property.valuetypes.models.StringLiteralProperty": "Type.Property.ValueTypes.StringLiteralProperty", - "type.property.valuetypes.models.StringProperty": "Type.Property.ValueTypes.StringProperty", - "type.property.valuetypes.models.UnionEnumValueProperty": "Type.Property.ValueTypes.UnionEnumValueProperty", - "type.property.valuetypes.models.UnionFloatLiteralProperty": "Type.Property.ValueTypes.UnionFloatLiteralProperty", - "type.property.valuetypes.models.UnionFloatLiteralPropertyProperty": "Type.Property.ValueTypes.UnionFloatLiteralProperty.property.anonymous", - "type.property.valuetypes.models.UnionIntLiteralProperty": "Type.Property.ValueTypes.UnionIntLiteralProperty", - "type.property.valuetypes.models.UnionIntLiteralPropertyProperty": "Type.Property.ValueTypes.UnionIntLiteralProperty.property.anonymous", - "type.property.valuetypes.models.UnionStringLiteralProperty": "Type.Property.ValueTypes.UnionStringLiteralProperty", - "type.property.valuetypes.models.UnionStringLiteralPropertyProperty": "Type.Property.ValueTypes.UnionStringLiteralProperty.property.anonymous", - "type.property.valuetypes.models.UnknownArrayProperty": "Type.Property.ValueTypes.UnknownArrayProperty", - "type.property.valuetypes.models.UnknownDictProperty": "Type.Property.ValueTypes.UnknownDictProperty", - "type.property.valuetypes.models.UnknownIntProperty": "Type.Property.ValueTypes.UnknownIntProperty", - "type.property.valuetypes.models.UnknownStringProperty": "Type.Property.ValueTypes.UnknownStringProperty" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-valuetypes_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-valuetypes_metadata.json index 8be7c6e3ac4..f959af0215b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-valuetypes_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-property-valuetypes_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.property.valuetypes.BooleanLiteralAsyncClient":"Type.Property.ValueTypes.BooleanLiteral","type.property.valuetypes.BooleanLiteralAsyncClient.get":"Type.Property.ValueTypes.BooleanLiteral.get","type.property.valuetypes.BooleanLiteralAsyncClient.getWithResponse":"Type.Property.ValueTypes.BooleanLiteral.get","type.property.valuetypes.BooleanLiteralAsyncClient.put":"Type.Property.ValueTypes.BooleanLiteral.put","type.property.valuetypes.BooleanLiteralAsyncClient.putWithResponse":"Type.Property.ValueTypes.BooleanLiteral.put","type.property.valuetypes.BooleanLiteralClient":"Type.Property.ValueTypes.BooleanLiteral","type.property.valuetypes.BooleanLiteralClient.get":"Type.Property.ValueTypes.BooleanLiteral.get","type.property.valuetypes.BooleanLiteralClient.getWithResponse":"Type.Property.ValueTypes.BooleanLiteral.get","type.property.valuetypes.BooleanLiteralClient.put":"Type.Property.ValueTypes.BooleanLiteral.put","type.property.valuetypes.BooleanLiteralClient.putWithResponse":"Type.Property.ValueTypes.BooleanLiteral.put","type.property.valuetypes.BooleanOperationAsyncClient":"Type.Property.ValueTypes.Boolean","type.property.valuetypes.BooleanOperationAsyncClient.get":"Type.Property.ValueTypes.Boolean.get","type.property.valuetypes.BooleanOperationAsyncClient.getWithResponse":"Type.Property.ValueTypes.Boolean.get","type.property.valuetypes.BooleanOperationAsyncClient.put":"Type.Property.ValueTypes.Boolean.put","type.property.valuetypes.BooleanOperationAsyncClient.putWithResponse":"Type.Property.ValueTypes.Boolean.put","type.property.valuetypes.BooleanOperationClient":"Type.Property.ValueTypes.Boolean","type.property.valuetypes.BooleanOperationClient.get":"Type.Property.ValueTypes.Boolean.get","type.property.valuetypes.BooleanOperationClient.getWithResponse":"Type.Property.ValueTypes.Boolean.get","type.property.valuetypes.BooleanOperationClient.put":"Type.Property.ValueTypes.Boolean.put","type.property.valuetypes.BooleanOperationClient.putWithResponse":"Type.Property.ValueTypes.Boolean.put","type.property.valuetypes.BytesAsyncClient":"Type.Property.ValueTypes.Bytes","type.property.valuetypes.BytesAsyncClient.get":"Type.Property.ValueTypes.Bytes.get","type.property.valuetypes.BytesAsyncClient.getWithResponse":"Type.Property.ValueTypes.Bytes.get","type.property.valuetypes.BytesAsyncClient.put":"Type.Property.ValueTypes.Bytes.put","type.property.valuetypes.BytesAsyncClient.putWithResponse":"Type.Property.ValueTypes.Bytes.put","type.property.valuetypes.BytesClient":"Type.Property.ValueTypes.Bytes","type.property.valuetypes.BytesClient.get":"Type.Property.ValueTypes.Bytes.get","type.property.valuetypes.BytesClient.getWithResponse":"Type.Property.ValueTypes.Bytes.get","type.property.valuetypes.BytesClient.put":"Type.Property.ValueTypes.Bytes.put","type.property.valuetypes.BytesClient.putWithResponse":"Type.Property.ValueTypes.Bytes.put","type.property.valuetypes.CollectionsIntAsyncClient":"Type.Property.ValueTypes.CollectionsInt","type.property.valuetypes.CollectionsIntAsyncClient.get":"Type.Property.ValueTypes.CollectionsInt.get","type.property.valuetypes.CollectionsIntAsyncClient.getWithResponse":"Type.Property.ValueTypes.CollectionsInt.get","type.property.valuetypes.CollectionsIntAsyncClient.put":"Type.Property.ValueTypes.CollectionsInt.put","type.property.valuetypes.CollectionsIntAsyncClient.putWithResponse":"Type.Property.ValueTypes.CollectionsInt.put","type.property.valuetypes.CollectionsIntClient":"Type.Property.ValueTypes.CollectionsInt","type.property.valuetypes.CollectionsIntClient.get":"Type.Property.ValueTypes.CollectionsInt.get","type.property.valuetypes.CollectionsIntClient.getWithResponse":"Type.Property.ValueTypes.CollectionsInt.get","type.property.valuetypes.CollectionsIntClient.put":"Type.Property.ValueTypes.CollectionsInt.put","type.property.valuetypes.CollectionsIntClient.putWithResponse":"Type.Property.ValueTypes.CollectionsInt.put","type.property.valuetypes.CollectionsModelAsyncClient":"Type.Property.ValueTypes.CollectionsModel","type.property.valuetypes.CollectionsModelAsyncClient.get":"Type.Property.ValueTypes.CollectionsModel.get","type.property.valuetypes.CollectionsModelAsyncClient.getWithResponse":"Type.Property.ValueTypes.CollectionsModel.get","type.property.valuetypes.CollectionsModelAsyncClient.put":"Type.Property.ValueTypes.CollectionsModel.put","type.property.valuetypes.CollectionsModelAsyncClient.putWithResponse":"Type.Property.ValueTypes.CollectionsModel.put","type.property.valuetypes.CollectionsModelClient":"Type.Property.ValueTypes.CollectionsModel","type.property.valuetypes.CollectionsModelClient.get":"Type.Property.ValueTypes.CollectionsModel.get","type.property.valuetypes.CollectionsModelClient.getWithResponse":"Type.Property.ValueTypes.CollectionsModel.get","type.property.valuetypes.CollectionsModelClient.put":"Type.Property.ValueTypes.CollectionsModel.put","type.property.valuetypes.CollectionsModelClient.putWithResponse":"Type.Property.ValueTypes.CollectionsModel.put","type.property.valuetypes.CollectionsStringAsyncClient":"Type.Property.ValueTypes.CollectionsString","type.property.valuetypes.CollectionsStringAsyncClient.get":"Type.Property.ValueTypes.CollectionsString.get","type.property.valuetypes.CollectionsStringAsyncClient.getWithResponse":"Type.Property.ValueTypes.CollectionsString.get","type.property.valuetypes.CollectionsStringAsyncClient.put":"Type.Property.ValueTypes.CollectionsString.put","type.property.valuetypes.CollectionsStringAsyncClient.putWithResponse":"Type.Property.ValueTypes.CollectionsString.put","type.property.valuetypes.CollectionsStringClient":"Type.Property.ValueTypes.CollectionsString","type.property.valuetypes.CollectionsStringClient.get":"Type.Property.ValueTypes.CollectionsString.get","type.property.valuetypes.CollectionsStringClient.getWithResponse":"Type.Property.ValueTypes.CollectionsString.get","type.property.valuetypes.CollectionsStringClient.put":"Type.Property.ValueTypes.CollectionsString.put","type.property.valuetypes.CollectionsStringClient.putWithResponse":"Type.Property.ValueTypes.CollectionsString.put","type.property.valuetypes.DatetimeOperationAsyncClient":"Type.Property.ValueTypes.Datetime","type.property.valuetypes.DatetimeOperationAsyncClient.get":"Type.Property.ValueTypes.Datetime.get","type.property.valuetypes.DatetimeOperationAsyncClient.getWithResponse":"Type.Property.ValueTypes.Datetime.get","type.property.valuetypes.DatetimeOperationAsyncClient.put":"Type.Property.ValueTypes.Datetime.put","type.property.valuetypes.DatetimeOperationAsyncClient.putWithResponse":"Type.Property.ValueTypes.Datetime.put","type.property.valuetypes.DatetimeOperationClient":"Type.Property.ValueTypes.Datetime","type.property.valuetypes.DatetimeOperationClient.get":"Type.Property.ValueTypes.Datetime.get","type.property.valuetypes.DatetimeOperationClient.getWithResponse":"Type.Property.ValueTypes.Datetime.get","type.property.valuetypes.DatetimeOperationClient.put":"Type.Property.ValueTypes.Datetime.put","type.property.valuetypes.DatetimeOperationClient.putWithResponse":"Type.Property.ValueTypes.Datetime.put","type.property.valuetypes.Decimal128AsyncClient":"Type.Property.ValueTypes.Decimal128","type.property.valuetypes.Decimal128AsyncClient.get":"Type.Property.ValueTypes.Decimal128.get","type.property.valuetypes.Decimal128AsyncClient.getWithResponse":"Type.Property.ValueTypes.Decimal128.get","type.property.valuetypes.Decimal128AsyncClient.put":"Type.Property.ValueTypes.Decimal128.put","type.property.valuetypes.Decimal128AsyncClient.putWithResponse":"Type.Property.ValueTypes.Decimal128.put","type.property.valuetypes.Decimal128Client":"Type.Property.ValueTypes.Decimal128","type.property.valuetypes.Decimal128Client.get":"Type.Property.ValueTypes.Decimal128.get","type.property.valuetypes.Decimal128Client.getWithResponse":"Type.Property.ValueTypes.Decimal128.get","type.property.valuetypes.Decimal128Client.put":"Type.Property.ValueTypes.Decimal128.put","type.property.valuetypes.Decimal128Client.putWithResponse":"Type.Property.ValueTypes.Decimal128.put","type.property.valuetypes.DecimalAsyncClient":"Type.Property.ValueTypes.Decimal","type.property.valuetypes.DecimalAsyncClient.get":"Type.Property.ValueTypes.Decimal.get","type.property.valuetypes.DecimalAsyncClient.getWithResponse":"Type.Property.ValueTypes.Decimal.get","type.property.valuetypes.DecimalAsyncClient.put":"Type.Property.ValueTypes.Decimal.put","type.property.valuetypes.DecimalAsyncClient.putWithResponse":"Type.Property.ValueTypes.Decimal.put","type.property.valuetypes.DecimalClient":"Type.Property.ValueTypes.Decimal","type.property.valuetypes.DecimalClient.get":"Type.Property.ValueTypes.Decimal.get","type.property.valuetypes.DecimalClient.getWithResponse":"Type.Property.ValueTypes.Decimal.get","type.property.valuetypes.DecimalClient.put":"Type.Property.ValueTypes.Decimal.put","type.property.valuetypes.DecimalClient.putWithResponse":"Type.Property.ValueTypes.Decimal.put","type.property.valuetypes.DictionaryStringAsyncClient":"Type.Property.ValueTypes.DictionaryString","type.property.valuetypes.DictionaryStringAsyncClient.get":"Type.Property.ValueTypes.DictionaryString.get","type.property.valuetypes.DictionaryStringAsyncClient.getWithResponse":"Type.Property.ValueTypes.DictionaryString.get","type.property.valuetypes.DictionaryStringAsyncClient.put":"Type.Property.ValueTypes.DictionaryString.put","type.property.valuetypes.DictionaryStringAsyncClient.putWithResponse":"Type.Property.ValueTypes.DictionaryString.put","type.property.valuetypes.DictionaryStringClient":"Type.Property.ValueTypes.DictionaryString","type.property.valuetypes.DictionaryStringClient.get":"Type.Property.ValueTypes.DictionaryString.get","type.property.valuetypes.DictionaryStringClient.getWithResponse":"Type.Property.ValueTypes.DictionaryString.get","type.property.valuetypes.DictionaryStringClient.put":"Type.Property.ValueTypes.DictionaryString.put","type.property.valuetypes.DictionaryStringClient.putWithResponse":"Type.Property.ValueTypes.DictionaryString.put","type.property.valuetypes.DurationOperationAsyncClient":"Type.Property.ValueTypes.Duration","type.property.valuetypes.DurationOperationAsyncClient.get":"Type.Property.ValueTypes.Duration.get","type.property.valuetypes.DurationOperationAsyncClient.getWithResponse":"Type.Property.ValueTypes.Duration.get","type.property.valuetypes.DurationOperationAsyncClient.put":"Type.Property.ValueTypes.Duration.put","type.property.valuetypes.DurationOperationAsyncClient.putWithResponse":"Type.Property.ValueTypes.Duration.put","type.property.valuetypes.DurationOperationClient":"Type.Property.ValueTypes.Duration","type.property.valuetypes.DurationOperationClient.get":"Type.Property.ValueTypes.Duration.get","type.property.valuetypes.DurationOperationClient.getWithResponse":"Type.Property.ValueTypes.Duration.get","type.property.valuetypes.DurationOperationClient.put":"Type.Property.ValueTypes.Duration.put","type.property.valuetypes.DurationOperationClient.putWithResponse":"Type.Property.ValueTypes.Duration.put","type.property.valuetypes.EnumAsyncClient":"Type.Property.ValueTypes.Enum","type.property.valuetypes.EnumAsyncClient.get":"Type.Property.ValueTypes.Enum.get","type.property.valuetypes.EnumAsyncClient.getWithResponse":"Type.Property.ValueTypes.Enum.get","type.property.valuetypes.EnumAsyncClient.put":"Type.Property.ValueTypes.Enum.put","type.property.valuetypes.EnumAsyncClient.putWithResponse":"Type.Property.ValueTypes.Enum.put","type.property.valuetypes.EnumClient":"Type.Property.ValueTypes.Enum","type.property.valuetypes.EnumClient.get":"Type.Property.ValueTypes.Enum.get","type.property.valuetypes.EnumClient.getWithResponse":"Type.Property.ValueTypes.Enum.get","type.property.valuetypes.EnumClient.put":"Type.Property.ValueTypes.Enum.put","type.property.valuetypes.EnumClient.putWithResponse":"Type.Property.ValueTypes.Enum.put","type.property.valuetypes.ExtensibleEnumAsyncClient":"Type.Property.ValueTypes.ExtensibleEnum","type.property.valuetypes.ExtensibleEnumAsyncClient.get":"Type.Property.ValueTypes.ExtensibleEnum.get","type.property.valuetypes.ExtensibleEnumAsyncClient.getWithResponse":"Type.Property.ValueTypes.ExtensibleEnum.get","type.property.valuetypes.ExtensibleEnumAsyncClient.put":"Type.Property.ValueTypes.ExtensibleEnum.put","type.property.valuetypes.ExtensibleEnumAsyncClient.putWithResponse":"Type.Property.ValueTypes.ExtensibleEnum.put","type.property.valuetypes.ExtensibleEnumClient":"Type.Property.ValueTypes.ExtensibleEnum","type.property.valuetypes.ExtensibleEnumClient.get":"Type.Property.ValueTypes.ExtensibleEnum.get","type.property.valuetypes.ExtensibleEnumClient.getWithResponse":"Type.Property.ValueTypes.ExtensibleEnum.get","type.property.valuetypes.ExtensibleEnumClient.put":"Type.Property.ValueTypes.ExtensibleEnum.put","type.property.valuetypes.ExtensibleEnumClient.putWithResponse":"Type.Property.ValueTypes.ExtensibleEnum.put","type.property.valuetypes.FloatLiteralAsyncClient":"Type.Property.ValueTypes.FloatLiteral","type.property.valuetypes.FloatLiteralAsyncClient.get":"Type.Property.ValueTypes.FloatLiteral.get","type.property.valuetypes.FloatLiteralAsyncClient.getWithResponse":"Type.Property.ValueTypes.FloatLiteral.get","type.property.valuetypes.FloatLiteralAsyncClient.put":"Type.Property.ValueTypes.FloatLiteral.put","type.property.valuetypes.FloatLiteralAsyncClient.putWithResponse":"Type.Property.ValueTypes.FloatLiteral.put","type.property.valuetypes.FloatLiteralClient":"Type.Property.ValueTypes.FloatLiteral","type.property.valuetypes.FloatLiteralClient.get":"Type.Property.ValueTypes.FloatLiteral.get","type.property.valuetypes.FloatLiteralClient.getWithResponse":"Type.Property.ValueTypes.FloatLiteral.get","type.property.valuetypes.FloatLiteralClient.put":"Type.Property.ValueTypes.FloatLiteral.put","type.property.valuetypes.FloatLiteralClient.putWithResponse":"Type.Property.ValueTypes.FloatLiteral.put","type.property.valuetypes.FloatOperationAsyncClient":"Type.Property.ValueTypes.Float","type.property.valuetypes.FloatOperationAsyncClient.get":"Type.Property.ValueTypes.Float.get","type.property.valuetypes.FloatOperationAsyncClient.getWithResponse":"Type.Property.ValueTypes.Float.get","type.property.valuetypes.FloatOperationAsyncClient.put":"Type.Property.ValueTypes.Float.put","type.property.valuetypes.FloatOperationAsyncClient.putWithResponse":"Type.Property.ValueTypes.Float.put","type.property.valuetypes.FloatOperationClient":"Type.Property.ValueTypes.Float","type.property.valuetypes.FloatOperationClient.get":"Type.Property.ValueTypes.Float.get","type.property.valuetypes.FloatOperationClient.getWithResponse":"Type.Property.ValueTypes.Float.get","type.property.valuetypes.FloatOperationClient.put":"Type.Property.ValueTypes.Float.put","type.property.valuetypes.FloatOperationClient.putWithResponse":"Type.Property.ValueTypes.Float.put","type.property.valuetypes.IntAsyncClient":"Type.Property.ValueTypes.Int","type.property.valuetypes.IntAsyncClient.get":"Type.Property.ValueTypes.Int.get","type.property.valuetypes.IntAsyncClient.getWithResponse":"Type.Property.ValueTypes.Int.get","type.property.valuetypes.IntAsyncClient.put":"Type.Property.ValueTypes.Int.put","type.property.valuetypes.IntAsyncClient.putWithResponse":"Type.Property.ValueTypes.Int.put","type.property.valuetypes.IntClient":"Type.Property.ValueTypes.Int","type.property.valuetypes.IntClient.get":"Type.Property.ValueTypes.Int.get","type.property.valuetypes.IntClient.getWithResponse":"Type.Property.ValueTypes.Int.get","type.property.valuetypes.IntClient.put":"Type.Property.ValueTypes.Int.put","type.property.valuetypes.IntClient.putWithResponse":"Type.Property.ValueTypes.Int.put","type.property.valuetypes.IntLiteralAsyncClient":"Type.Property.ValueTypes.IntLiteral","type.property.valuetypes.IntLiteralAsyncClient.get":"Type.Property.ValueTypes.IntLiteral.get","type.property.valuetypes.IntLiteralAsyncClient.getWithResponse":"Type.Property.ValueTypes.IntLiteral.get","type.property.valuetypes.IntLiteralAsyncClient.put":"Type.Property.ValueTypes.IntLiteral.put","type.property.valuetypes.IntLiteralAsyncClient.putWithResponse":"Type.Property.ValueTypes.IntLiteral.put","type.property.valuetypes.IntLiteralClient":"Type.Property.ValueTypes.IntLiteral","type.property.valuetypes.IntLiteralClient.get":"Type.Property.ValueTypes.IntLiteral.get","type.property.valuetypes.IntLiteralClient.getWithResponse":"Type.Property.ValueTypes.IntLiteral.get","type.property.valuetypes.IntLiteralClient.put":"Type.Property.ValueTypes.IntLiteral.put","type.property.valuetypes.IntLiteralClient.putWithResponse":"Type.Property.ValueTypes.IntLiteral.put","type.property.valuetypes.ModelAsyncClient":"Type.Property.ValueTypes.Model","type.property.valuetypes.ModelAsyncClient.get":"Type.Property.ValueTypes.Model.get","type.property.valuetypes.ModelAsyncClient.getWithResponse":"Type.Property.ValueTypes.Model.get","type.property.valuetypes.ModelAsyncClient.put":"Type.Property.ValueTypes.Model.put","type.property.valuetypes.ModelAsyncClient.putWithResponse":"Type.Property.ValueTypes.Model.put","type.property.valuetypes.ModelClient":"Type.Property.ValueTypes.Model","type.property.valuetypes.ModelClient.get":"Type.Property.ValueTypes.Model.get","type.property.valuetypes.ModelClient.getWithResponse":"Type.Property.ValueTypes.Model.get","type.property.valuetypes.ModelClient.put":"Type.Property.ValueTypes.Model.put","type.property.valuetypes.ModelClient.putWithResponse":"Type.Property.ValueTypes.Model.put","type.property.valuetypes.NeverAsyncClient":"Type.Property.ValueTypes.Never","type.property.valuetypes.NeverAsyncClient.get":"Type.Property.ValueTypes.Never.get","type.property.valuetypes.NeverAsyncClient.getWithResponse":"Type.Property.ValueTypes.Never.get","type.property.valuetypes.NeverAsyncClient.put":"Type.Property.ValueTypes.Never.put","type.property.valuetypes.NeverAsyncClient.putWithResponse":"Type.Property.ValueTypes.Never.put","type.property.valuetypes.NeverClient":"Type.Property.ValueTypes.Never","type.property.valuetypes.NeverClient.get":"Type.Property.ValueTypes.Never.get","type.property.valuetypes.NeverClient.getWithResponse":"Type.Property.ValueTypes.Never.get","type.property.valuetypes.NeverClient.put":"Type.Property.ValueTypes.Never.put","type.property.valuetypes.NeverClient.putWithResponse":"Type.Property.ValueTypes.Never.put","type.property.valuetypes.StringLiteralAsyncClient":"Type.Property.ValueTypes.StringLiteral","type.property.valuetypes.StringLiteralAsyncClient.get":"Type.Property.ValueTypes.StringLiteral.get","type.property.valuetypes.StringLiteralAsyncClient.getWithResponse":"Type.Property.ValueTypes.StringLiteral.get","type.property.valuetypes.StringLiteralAsyncClient.put":"Type.Property.ValueTypes.StringLiteral.put","type.property.valuetypes.StringLiteralAsyncClient.putWithResponse":"Type.Property.ValueTypes.StringLiteral.put","type.property.valuetypes.StringLiteralClient":"Type.Property.ValueTypes.StringLiteral","type.property.valuetypes.StringLiteralClient.get":"Type.Property.ValueTypes.StringLiteral.get","type.property.valuetypes.StringLiteralClient.getWithResponse":"Type.Property.ValueTypes.StringLiteral.get","type.property.valuetypes.StringLiteralClient.put":"Type.Property.ValueTypes.StringLiteral.put","type.property.valuetypes.StringLiteralClient.putWithResponse":"Type.Property.ValueTypes.StringLiteral.put","type.property.valuetypes.StringOperationAsyncClient":"Type.Property.ValueTypes.String","type.property.valuetypes.StringOperationAsyncClient.get":"Type.Property.ValueTypes.String.get","type.property.valuetypes.StringOperationAsyncClient.getWithResponse":"Type.Property.ValueTypes.String.get","type.property.valuetypes.StringOperationAsyncClient.put":"Type.Property.ValueTypes.String.put","type.property.valuetypes.StringOperationAsyncClient.putWithResponse":"Type.Property.ValueTypes.String.put","type.property.valuetypes.StringOperationClient":"Type.Property.ValueTypes.String","type.property.valuetypes.StringOperationClient.get":"Type.Property.ValueTypes.String.get","type.property.valuetypes.StringOperationClient.getWithResponse":"Type.Property.ValueTypes.String.get","type.property.valuetypes.StringOperationClient.put":"Type.Property.ValueTypes.String.put","type.property.valuetypes.StringOperationClient.putWithResponse":"Type.Property.ValueTypes.String.put","type.property.valuetypes.UnionEnumValueAsyncClient":"Type.Property.ValueTypes.UnionEnumValue","type.property.valuetypes.UnionEnumValueAsyncClient.get":"Type.Property.ValueTypes.UnionEnumValue.get","type.property.valuetypes.UnionEnumValueAsyncClient.getWithResponse":"Type.Property.ValueTypes.UnionEnumValue.get","type.property.valuetypes.UnionEnumValueAsyncClient.put":"Type.Property.ValueTypes.UnionEnumValue.put","type.property.valuetypes.UnionEnumValueAsyncClient.putWithResponse":"Type.Property.ValueTypes.UnionEnumValue.put","type.property.valuetypes.UnionEnumValueClient":"Type.Property.ValueTypes.UnionEnumValue","type.property.valuetypes.UnionEnumValueClient.get":"Type.Property.ValueTypes.UnionEnumValue.get","type.property.valuetypes.UnionEnumValueClient.getWithResponse":"Type.Property.ValueTypes.UnionEnumValue.get","type.property.valuetypes.UnionEnumValueClient.put":"Type.Property.ValueTypes.UnionEnumValue.put","type.property.valuetypes.UnionEnumValueClient.putWithResponse":"Type.Property.ValueTypes.UnionEnumValue.put","type.property.valuetypes.UnionFloatLiteralAsyncClient":"Type.Property.ValueTypes.UnionFloatLiteral","type.property.valuetypes.UnionFloatLiteralAsyncClient.get":"Type.Property.ValueTypes.UnionFloatLiteral.get","type.property.valuetypes.UnionFloatLiteralAsyncClient.getWithResponse":"Type.Property.ValueTypes.UnionFloatLiteral.get","type.property.valuetypes.UnionFloatLiteralAsyncClient.put":"Type.Property.ValueTypes.UnionFloatLiteral.put","type.property.valuetypes.UnionFloatLiteralAsyncClient.putWithResponse":"Type.Property.ValueTypes.UnionFloatLiteral.put","type.property.valuetypes.UnionFloatLiteralClient":"Type.Property.ValueTypes.UnionFloatLiteral","type.property.valuetypes.UnionFloatLiteralClient.get":"Type.Property.ValueTypes.UnionFloatLiteral.get","type.property.valuetypes.UnionFloatLiteralClient.getWithResponse":"Type.Property.ValueTypes.UnionFloatLiteral.get","type.property.valuetypes.UnionFloatLiteralClient.put":"Type.Property.ValueTypes.UnionFloatLiteral.put","type.property.valuetypes.UnionFloatLiteralClient.putWithResponse":"Type.Property.ValueTypes.UnionFloatLiteral.put","type.property.valuetypes.UnionIntLiteralAsyncClient":"Type.Property.ValueTypes.UnionIntLiteral","type.property.valuetypes.UnionIntLiteralAsyncClient.get":"Type.Property.ValueTypes.UnionIntLiteral.get","type.property.valuetypes.UnionIntLiteralAsyncClient.getWithResponse":"Type.Property.ValueTypes.UnionIntLiteral.get","type.property.valuetypes.UnionIntLiteralAsyncClient.put":"Type.Property.ValueTypes.UnionIntLiteral.put","type.property.valuetypes.UnionIntLiteralAsyncClient.putWithResponse":"Type.Property.ValueTypes.UnionIntLiteral.put","type.property.valuetypes.UnionIntLiteralClient":"Type.Property.ValueTypes.UnionIntLiteral","type.property.valuetypes.UnionIntLiteralClient.get":"Type.Property.ValueTypes.UnionIntLiteral.get","type.property.valuetypes.UnionIntLiteralClient.getWithResponse":"Type.Property.ValueTypes.UnionIntLiteral.get","type.property.valuetypes.UnionIntLiteralClient.put":"Type.Property.ValueTypes.UnionIntLiteral.put","type.property.valuetypes.UnionIntLiteralClient.putWithResponse":"Type.Property.ValueTypes.UnionIntLiteral.put","type.property.valuetypes.UnionStringLiteralAsyncClient":"Type.Property.ValueTypes.UnionStringLiteral","type.property.valuetypes.UnionStringLiteralAsyncClient.get":"Type.Property.ValueTypes.UnionStringLiteral.get","type.property.valuetypes.UnionStringLiteralAsyncClient.getWithResponse":"Type.Property.ValueTypes.UnionStringLiteral.get","type.property.valuetypes.UnionStringLiteralAsyncClient.put":"Type.Property.ValueTypes.UnionStringLiteral.put","type.property.valuetypes.UnionStringLiteralAsyncClient.putWithResponse":"Type.Property.ValueTypes.UnionStringLiteral.put","type.property.valuetypes.UnionStringLiteralClient":"Type.Property.ValueTypes.UnionStringLiteral","type.property.valuetypes.UnionStringLiteralClient.get":"Type.Property.ValueTypes.UnionStringLiteral.get","type.property.valuetypes.UnionStringLiteralClient.getWithResponse":"Type.Property.ValueTypes.UnionStringLiteral.get","type.property.valuetypes.UnionStringLiteralClient.put":"Type.Property.ValueTypes.UnionStringLiteral.put","type.property.valuetypes.UnionStringLiteralClient.putWithResponse":"Type.Property.ValueTypes.UnionStringLiteral.put","type.property.valuetypes.UnknownArrayAsyncClient":"Type.Property.ValueTypes.UnknownArray","type.property.valuetypes.UnknownArrayAsyncClient.get":"Type.Property.ValueTypes.UnknownArray.get","type.property.valuetypes.UnknownArrayAsyncClient.getWithResponse":"Type.Property.ValueTypes.UnknownArray.get","type.property.valuetypes.UnknownArrayAsyncClient.put":"Type.Property.ValueTypes.UnknownArray.put","type.property.valuetypes.UnknownArrayAsyncClient.putWithResponse":"Type.Property.ValueTypes.UnknownArray.put","type.property.valuetypes.UnknownArrayClient":"Type.Property.ValueTypes.UnknownArray","type.property.valuetypes.UnknownArrayClient.get":"Type.Property.ValueTypes.UnknownArray.get","type.property.valuetypes.UnknownArrayClient.getWithResponse":"Type.Property.ValueTypes.UnknownArray.get","type.property.valuetypes.UnknownArrayClient.put":"Type.Property.ValueTypes.UnknownArray.put","type.property.valuetypes.UnknownArrayClient.putWithResponse":"Type.Property.ValueTypes.UnknownArray.put","type.property.valuetypes.UnknownDictAsyncClient":"Type.Property.ValueTypes.UnknownDict","type.property.valuetypes.UnknownDictAsyncClient.get":"Type.Property.ValueTypes.UnknownDict.get","type.property.valuetypes.UnknownDictAsyncClient.getWithResponse":"Type.Property.ValueTypes.UnknownDict.get","type.property.valuetypes.UnknownDictAsyncClient.put":"Type.Property.ValueTypes.UnknownDict.put","type.property.valuetypes.UnknownDictAsyncClient.putWithResponse":"Type.Property.ValueTypes.UnknownDict.put","type.property.valuetypes.UnknownDictClient":"Type.Property.ValueTypes.UnknownDict","type.property.valuetypes.UnknownDictClient.get":"Type.Property.ValueTypes.UnknownDict.get","type.property.valuetypes.UnknownDictClient.getWithResponse":"Type.Property.ValueTypes.UnknownDict.get","type.property.valuetypes.UnknownDictClient.put":"Type.Property.ValueTypes.UnknownDict.put","type.property.valuetypes.UnknownDictClient.putWithResponse":"Type.Property.ValueTypes.UnknownDict.put","type.property.valuetypes.UnknownIntAsyncClient":"Type.Property.ValueTypes.UnknownInt","type.property.valuetypes.UnknownIntAsyncClient.get":"Type.Property.ValueTypes.UnknownInt.get","type.property.valuetypes.UnknownIntAsyncClient.getWithResponse":"Type.Property.ValueTypes.UnknownInt.get","type.property.valuetypes.UnknownIntAsyncClient.put":"Type.Property.ValueTypes.UnknownInt.put","type.property.valuetypes.UnknownIntAsyncClient.putWithResponse":"Type.Property.ValueTypes.UnknownInt.put","type.property.valuetypes.UnknownIntClient":"Type.Property.ValueTypes.UnknownInt","type.property.valuetypes.UnknownIntClient.get":"Type.Property.ValueTypes.UnknownInt.get","type.property.valuetypes.UnknownIntClient.getWithResponse":"Type.Property.ValueTypes.UnknownInt.get","type.property.valuetypes.UnknownIntClient.put":"Type.Property.ValueTypes.UnknownInt.put","type.property.valuetypes.UnknownIntClient.putWithResponse":"Type.Property.ValueTypes.UnknownInt.put","type.property.valuetypes.UnknownStringAsyncClient":"Type.Property.ValueTypes.UnknownString","type.property.valuetypes.UnknownStringAsyncClient.get":"Type.Property.ValueTypes.UnknownString.get","type.property.valuetypes.UnknownStringAsyncClient.getWithResponse":"Type.Property.ValueTypes.UnknownString.get","type.property.valuetypes.UnknownStringAsyncClient.put":"Type.Property.ValueTypes.UnknownString.put","type.property.valuetypes.UnknownStringAsyncClient.putWithResponse":"Type.Property.ValueTypes.UnknownString.put","type.property.valuetypes.UnknownStringClient":"Type.Property.ValueTypes.UnknownString","type.property.valuetypes.UnknownStringClient.get":"Type.Property.ValueTypes.UnknownString.get","type.property.valuetypes.UnknownStringClient.getWithResponse":"Type.Property.ValueTypes.UnknownString.get","type.property.valuetypes.UnknownStringClient.put":"Type.Property.ValueTypes.UnknownString.put","type.property.valuetypes.UnknownStringClient.putWithResponse":"Type.Property.ValueTypes.UnknownString.put","type.property.valuetypes.ValueTypesClientBuilder":"Type.Property.ValueTypes","type.property.valuetypes.models.BooleanLiteralProperty":"Type.Property.ValueTypes.BooleanLiteralProperty","type.property.valuetypes.models.BooleanProperty":"Type.Property.ValueTypes.BooleanProperty","type.property.valuetypes.models.BytesProperty":"Type.Property.ValueTypes.BytesProperty","type.property.valuetypes.models.CollectionsIntProperty":"Type.Property.ValueTypes.CollectionsIntProperty","type.property.valuetypes.models.CollectionsModelProperty":"Type.Property.ValueTypes.CollectionsModelProperty","type.property.valuetypes.models.CollectionsStringProperty":"Type.Property.ValueTypes.CollectionsStringProperty","type.property.valuetypes.models.DatetimeProperty":"Type.Property.ValueTypes.DatetimeProperty","type.property.valuetypes.models.Decimal128Property":"Type.Property.ValueTypes.Decimal128Property","type.property.valuetypes.models.DecimalProperty":"Type.Property.ValueTypes.DecimalProperty","type.property.valuetypes.models.DictionaryStringProperty":"Type.Property.ValueTypes.DictionaryStringProperty","type.property.valuetypes.models.DurationProperty":"Type.Property.ValueTypes.DurationProperty","type.property.valuetypes.models.EnumProperty":"Type.Property.ValueTypes.EnumProperty","type.property.valuetypes.models.ExtendedEnum":"Type.Property.ValueTypes.ExtendedEnum","type.property.valuetypes.models.ExtensibleEnumProperty":"Type.Property.ValueTypes.ExtensibleEnumProperty","type.property.valuetypes.models.FixedInnerEnum":"Type.Property.ValueTypes.FixedInnerEnum","type.property.valuetypes.models.FloatLiteralProperty":"Type.Property.ValueTypes.FloatLiteralProperty","type.property.valuetypes.models.FloatProperty":"Type.Property.ValueTypes.FloatProperty","type.property.valuetypes.models.InnerEnum":"Type.Property.ValueTypes.InnerEnum","type.property.valuetypes.models.InnerModel":"Type.Property.ValueTypes.InnerModel","type.property.valuetypes.models.IntLiteralProperty":"Type.Property.ValueTypes.IntLiteralProperty","type.property.valuetypes.models.IntProperty":"Type.Property.ValueTypes.IntProperty","type.property.valuetypes.models.ModelProperty":"Type.Property.ValueTypes.ModelProperty","type.property.valuetypes.models.NeverProperty":"Type.Property.ValueTypes.NeverProperty","type.property.valuetypes.models.StringLiteralProperty":"Type.Property.ValueTypes.StringLiteralProperty","type.property.valuetypes.models.StringProperty":"Type.Property.ValueTypes.StringProperty","type.property.valuetypes.models.UnionEnumValueProperty":"Type.Property.ValueTypes.UnionEnumValueProperty","type.property.valuetypes.models.UnionFloatLiteralProperty":"Type.Property.ValueTypes.UnionFloatLiteralProperty","type.property.valuetypes.models.UnionFloatLiteralPropertyProperty":"Type.Property.ValueTypes.UnionFloatLiteralProperty.property.anonymous","type.property.valuetypes.models.UnionIntLiteralProperty":"Type.Property.ValueTypes.UnionIntLiteralProperty","type.property.valuetypes.models.UnionIntLiteralPropertyProperty":"Type.Property.ValueTypes.UnionIntLiteralProperty.property.anonymous","type.property.valuetypes.models.UnionStringLiteralProperty":"Type.Property.ValueTypes.UnionStringLiteralProperty","type.property.valuetypes.models.UnionStringLiteralPropertyProperty":"Type.Property.ValueTypes.UnionStringLiteralProperty.property.anonymous","type.property.valuetypes.models.UnknownArrayProperty":"Type.Property.ValueTypes.UnknownArrayProperty","type.property.valuetypes.models.UnknownDictProperty":"Type.Property.ValueTypes.UnknownDictProperty","type.property.valuetypes.models.UnknownIntProperty":"Type.Property.ValueTypes.UnknownIntProperty","type.property.valuetypes.models.UnknownStringProperty":"Type.Property.ValueTypes.UnknownStringProperty"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/property/valuetypes/BooleanLiteralAsyncClient.java","src/main/java/type/property/valuetypes/BooleanLiteralClient.java","src/main/java/type/property/valuetypes/BooleanOperationAsyncClient.java","src/main/java/type/property/valuetypes/BooleanOperationClient.java","src/main/java/type/property/valuetypes/BytesAsyncClient.java","src/main/java/type/property/valuetypes/BytesClient.java","src/main/java/type/property/valuetypes/CollectionsIntAsyncClient.java","src/main/java/type/property/valuetypes/CollectionsIntClient.java","src/main/java/type/property/valuetypes/CollectionsModelAsyncClient.java","src/main/java/type/property/valuetypes/CollectionsModelClient.java","src/main/java/type/property/valuetypes/CollectionsStringAsyncClient.java","src/main/java/type/property/valuetypes/CollectionsStringClient.java","src/main/java/type/property/valuetypes/DatetimeOperationAsyncClient.java","src/main/java/type/property/valuetypes/DatetimeOperationClient.java","src/main/java/type/property/valuetypes/Decimal128AsyncClient.java","src/main/java/type/property/valuetypes/Decimal128Client.java","src/main/java/type/property/valuetypes/DecimalAsyncClient.java","src/main/java/type/property/valuetypes/DecimalClient.java","src/main/java/type/property/valuetypes/DictionaryStringAsyncClient.java","src/main/java/type/property/valuetypes/DictionaryStringClient.java","src/main/java/type/property/valuetypes/DurationOperationAsyncClient.java","src/main/java/type/property/valuetypes/DurationOperationClient.java","src/main/java/type/property/valuetypes/EnumAsyncClient.java","src/main/java/type/property/valuetypes/EnumClient.java","src/main/java/type/property/valuetypes/ExtensibleEnumAsyncClient.java","src/main/java/type/property/valuetypes/ExtensibleEnumClient.java","src/main/java/type/property/valuetypes/FloatLiteralAsyncClient.java","src/main/java/type/property/valuetypes/FloatLiteralClient.java","src/main/java/type/property/valuetypes/FloatOperationAsyncClient.java","src/main/java/type/property/valuetypes/FloatOperationClient.java","src/main/java/type/property/valuetypes/IntAsyncClient.java","src/main/java/type/property/valuetypes/IntClient.java","src/main/java/type/property/valuetypes/IntLiteralAsyncClient.java","src/main/java/type/property/valuetypes/IntLiteralClient.java","src/main/java/type/property/valuetypes/ModelAsyncClient.java","src/main/java/type/property/valuetypes/ModelClient.java","src/main/java/type/property/valuetypes/NeverAsyncClient.java","src/main/java/type/property/valuetypes/NeverClient.java","src/main/java/type/property/valuetypes/StringLiteralAsyncClient.java","src/main/java/type/property/valuetypes/StringLiteralClient.java","src/main/java/type/property/valuetypes/StringOperationAsyncClient.java","src/main/java/type/property/valuetypes/StringOperationClient.java","src/main/java/type/property/valuetypes/UnionEnumValueAsyncClient.java","src/main/java/type/property/valuetypes/UnionEnumValueClient.java","src/main/java/type/property/valuetypes/UnionFloatLiteralAsyncClient.java","src/main/java/type/property/valuetypes/UnionFloatLiteralClient.java","src/main/java/type/property/valuetypes/UnionIntLiteralAsyncClient.java","src/main/java/type/property/valuetypes/UnionIntLiteralClient.java","src/main/java/type/property/valuetypes/UnionStringLiteralAsyncClient.java","src/main/java/type/property/valuetypes/UnionStringLiteralClient.java","src/main/java/type/property/valuetypes/UnknownArrayAsyncClient.java","src/main/java/type/property/valuetypes/UnknownArrayClient.java","src/main/java/type/property/valuetypes/UnknownDictAsyncClient.java","src/main/java/type/property/valuetypes/UnknownDictClient.java","src/main/java/type/property/valuetypes/UnknownIntAsyncClient.java","src/main/java/type/property/valuetypes/UnknownIntClient.java","src/main/java/type/property/valuetypes/UnknownStringAsyncClient.java","src/main/java/type/property/valuetypes/UnknownStringClient.java","src/main/java/type/property/valuetypes/ValueTypesClientBuilder.java","src/main/java/type/property/valuetypes/implementation/BooleanLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/BooleanOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/BytesImpl.java","src/main/java/type/property/valuetypes/implementation/CollectionsIntsImpl.java","src/main/java/type/property/valuetypes/implementation/CollectionsModelsImpl.java","src/main/java/type/property/valuetypes/implementation/CollectionsStringsImpl.java","src/main/java/type/property/valuetypes/implementation/DatetimeOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/Decimal128sImpl.java","src/main/java/type/property/valuetypes/implementation/DecimalsImpl.java","src/main/java/type/property/valuetypes/implementation/DictionaryStringsImpl.java","src/main/java/type/property/valuetypes/implementation/DurationOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/EnumsImpl.java","src/main/java/type/property/valuetypes/implementation/ExtensibleEnumsImpl.java","src/main/java/type/property/valuetypes/implementation/FloatLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/FloatOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/IntLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/IntsImpl.java","src/main/java/type/property/valuetypes/implementation/ModelsImpl.java","src/main/java/type/property/valuetypes/implementation/NeversImpl.java","src/main/java/type/property/valuetypes/implementation/StringLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/StringOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/UnionEnumValuesImpl.java","src/main/java/type/property/valuetypes/implementation/UnionFloatLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/UnionIntLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/UnionStringLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/UnknownArraysImpl.java","src/main/java/type/property/valuetypes/implementation/UnknownDictsImpl.java","src/main/java/type/property/valuetypes/implementation/UnknownIntsImpl.java","src/main/java/type/property/valuetypes/implementation/UnknownStringsImpl.java","src/main/java/type/property/valuetypes/implementation/ValueTypesClientImpl.java","src/main/java/type/property/valuetypes/implementation/package-info.java","src/main/java/type/property/valuetypes/models/BooleanLiteralProperty.java","src/main/java/type/property/valuetypes/models/BooleanProperty.java","src/main/java/type/property/valuetypes/models/BytesProperty.java","src/main/java/type/property/valuetypes/models/CollectionsIntProperty.java","src/main/java/type/property/valuetypes/models/CollectionsModelProperty.java","src/main/java/type/property/valuetypes/models/CollectionsStringProperty.java","src/main/java/type/property/valuetypes/models/DatetimeProperty.java","src/main/java/type/property/valuetypes/models/Decimal128Property.java","src/main/java/type/property/valuetypes/models/DecimalProperty.java","src/main/java/type/property/valuetypes/models/DictionaryStringProperty.java","src/main/java/type/property/valuetypes/models/DurationProperty.java","src/main/java/type/property/valuetypes/models/EnumProperty.java","src/main/java/type/property/valuetypes/models/ExtendedEnum.java","src/main/java/type/property/valuetypes/models/ExtensibleEnumProperty.java","src/main/java/type/property/valuetypes/models/FixedInnerEnum.java","src/main/java/type/property/valuetypes/models/FloatLiteralProperty.java","src/main/java/type/property/valuetypes/models/FloatProperty.java","src/main/java/type/property/valuetypes/models/InnerEnum.java","src/main/java/type/property/valuetypes/models/InnerModel.java","src/main/java/type/property/valuetypes/models/IntLiteralProperty.java","src/main/java/type/property/valuetypes/models/IntProperty.java","src/main/java/type/property/valuetypes/models/ModelProperty.java","src/main/java/type/property/valuetypes/models/NeverProperty.java","src/main/java/type/property/valuetypes/models/StringLiteralProperty.java","src/main/java/type/property/valuetypes/models/StringProperty.java","src/main/java/type/property/valuetypes/models/UnionEnumValueProperty.java","src/main/java/type/property/valuetypes/models/UnionFloatLiteralProperty.java","src/main/java/type/property/valuetypes/models/UnionFloatLiteralPropertyProperty.java","src/main/java/type/property/valuetypes/models/UnionIntLiteralProperty.java","src/main/java/type/property/valuetypes/models/UnionIntLiteralPropertyProperty.java","src/main/java/type/property/valuetypes/models/UnionStringLiteralProperty.java","src/main/java/type/property/valuetypes/models/UnionStringLiteralPropertyProperty.java","src/main/java/type/property/valuetypes/models/UnknownArrayProperty.java","src/main/java/type/property/valuetypes/models/UnknownDictProperty.java","src/main/java/type/property/valuetypes/models/UnknownIntProperty.java","src/main/java/type/property/valuetypes/models/UnknownStringProperty.java","src/main/java/type/property/valuetypes/models/package-info.java","src/main/java/type/property/valuetypes/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.property.valuetypes.BooleanLiteralAsyncClient":"Type.Property.ValueTypes.BooleanLiteral","type.property.valuetypes.BooleanLiteralAsyncClient.get":"Type.Property.ValueTypes.BooleanLiteral.get","type.property.valuetypes.BooleanLiteralAsyncClient.getWithResponse":"Type.Property.ValueTypes.BooleanLiteral.get","type.property.valuetypes.BooleanLiteralAsyncClient.put":"Type.Property.ValueTypes.BooleanLiteral.put","type.property.valuetypes.BooleanLiteralAsyncClient.putWithResponse":"Type.Property.ValueTypes.BooleanLiteral.put","type.property.valuetypes.BooleanLiteralClient":"Type.Property.ValueTypes.BooleanLiteral","type.property.valuetypes.BooleanLiteralClient.get":"Type.Property.ValueTypes.BooleanLiteral.get","type.property.valuetypes.BooleanLiteralClient.getWithResponse":"Type.Property.ValueTypes.BooleanLiteral.get","type.property.valuetypes.BooleanLiteralClient.put":"Type.Property.ValueTypes.BooleanLiteral.put","type.property.valuetypes.BooleanLiteralClient.putWithResponse":"Type.Property.ValueTypes.BooleanLiteral.put","type.property.valuetypes.BooleanOperationAsyncClient":"Type.Property.ValueTypes.Boolean","type.property.valuetypes.BooleanOperationAsyncClient.get":"Type.Property.ValueTypes.Boolean.get","type.property.valuetypes.BooleanOperationAsyncClient.getWithResponse":"Type.Property.ValueTypes.Boolean.get","type.property.valuetypes.BooleanOperationAsyncClient.put":"Type.Property.ValueTypes.Boolean.put","type.property.valuetypes.BooleanOperationAsyncClient.putWithResponse":"Type.Property.ValueTypes.Boolean.put","type.property.valuetypes.BooleanOperationClient":"Type.Property.ValueTypes.Boolean","type.property.valuetypes.BooleanOperationClient.get":"Type.Property.ValueTypes.Boolean.get","type.property.valuetypes.BooleanOperationClient.getWithResponse":"Type.Property.ValueTypes.Boolean.get","type.property.valuetypes.BooleanOperationClient.put":"Type.Property.ValueTypes.Boolean.put","type.property.valuetypes.BooleanOperationClient.putWithResponse":"Type.Property.ValueTypes.Boolean.put","type.property.valuetypes.BytesAsyncClient":"Type.Property.ValueTypes.Bytes","type.property.valuetypes.BytesAsyncClient.get":"Type.Property.ValueTypes.Bytes.get","type.property.valuetypes.BytesAsyncClient.getWithResponse":"Type.Property.ValueTypes.Bytes.get","type.property.valuetypes.BytesAsyncClient.put":"Type.Property.ValueTypes.Bytes.put","type.property.valuetypes.BytesAsyncClient.putWithResponse":"Type.Property.ValueTypes.Bytes.put","type.property.valuetypes.BytesClient":"Type.Property.ValueTypes.Bytes","type.property.valuetypes.BytesClient.get":"Type.Property.ValueTypes.Bytes.get","type.property.valuetypes.BytesClient.getWithResponse":"Type.Property.ValueTypes.Bytes.get","type.property.valuetypes.BytesClient.put":"Type.Property.ValueTypes.Bytes.put","type.property.valuetypes.BytesClient.putWithResponse":"Type.Property.ValueTypes.Bytes.put","type.property.valuetypes.CollectionsIntAsyncClient":"Type.Property.ValueTypes.CollectionsInt","type.property.valuetypes.CollectionsIntAsyncClient.get":"Type.Property.ValueTypes.CollectionsInt.get","type.property.valuetypes.CollectionsIntAsyncClient.getWithResponse":"Type.Property.ValueTypes.CollectionsInt.get","type.property.valuetypes.CollectionsIntAsyncClient.put":"Type.Property.ValueTypes.CollectionsInt.put","type.property.valuetypes.CollectionsIntAsyncClient.putWithResponse":"Type.Property.ValueTypes.CollectionsInt.put","type.property.valuetypes.CollectionsIntClient":"Type.Property.ValueTypes.CollectionsInt","type.property.valuetypes.CollectionsIntClient.get":"Type.Property.ValueTypes.CollectionsInt.get","type.property.valuetypes.CollectionsIntClient.getWithResponse":"Type.Property.ValueTypes.CollectionsInt.get","type.property.valuetypes.CollectionsIntClient.put":"Type.Property.ValueTypes.CollectionsInt.put","type.property.valuetypes.CollectionsIntClient.putWithResponse":"Type.Property.ValueTypes.CollectionsInt.put","type.property.valuetypes.CollectionsModelAsyncClient":"Type.Property.ValueTypes.CollectionsModel","type.property.valuetypes.CollectionsModelAsyncClient.get":"Type.Property.ValueTypes.CollectionsModel.get","type.property.valuetypes.CollectionsModelAsyncClient.getWithResponse":"Type.Property.ValueTypes.CollectionsModel.get","type.property.valuetypes.CollectionsModelAsyncClient.put":"Type.Property.ValueTypes.CollectionsModel.put","type.property.valuetypes.CollectionsModelAsyncClient.putWithResponse":"Type.Property.ValueTypes.CollectionsModel.put","type.property.valuetypes.CollectionsModelClient":"Type.Property.ValueTypes.CollectionsModel","type.property.valuetypes.CollectionsModelClient.get":"Type.Property.ValueTypes.CollectionsModel.get","type.property.valuetypes.CollectionsModelClient.getWithResponse":"Type.Property.ValueTypes.CollectionsModel.get","type.property.valuetypes.CollectionsModelClient.put":"Type.Property.ValueTypes.CollectionsModel.put","type.property.valuetypes.CollectionsModelClient.putWithResponse":"Type.Property.ValueTypes.CollectionsModel.put","type.property.valuetypes.CollectionsStringAsyncClient":"Type.Property.ValueTypes.CollectionsString","type.property.valuetypes.CollectionsStringAsyncClient.get":"Type.Property.ValueTypes.CollectionsString.get","type.property.valuetypes.CollectionsStringAsyncClient.getWithResponse":"Type.Property.ValueTypes.CollectionsString.get","type.property.valuetypes.CollectionsStringAsyncClient.put":"Type.Property.ValueTypes.CollectionsString.put","type.property.valuetypes.CollectionsStringAsyncClient.putWithResponse":"Type.Property.ValueTypes.CollectionsString.put","type.property.valuetypes.CollectionsStringClient":"Type.Property.ValueTypes.CollectionsString","type.property.valuetypes.CollectionsStringClient.get":"Type.Property.ValueTypes.CollectionsString.get","type.property.valuetypes.CollectionsStringClient.getWithResponse":"Type.Property.ValueTypes.CollectionsString.get","type.property.valuetypes.CollectionsStringClient.put":"Type.Property.ValueTypes.CollectionsString.put","type.property.valuetypes.CollectionsStringClient.putWithResponse":"Type.Property.ValueTypes.CollectionsString.put","type.property.valuetypes.DatetimeOperationAsyncClient":"Type.Property.ValueTypes.Datetime","type.property.valuetypes.DatetimeOperationAsyncClient.get":"Type.Property.ValueTypes.Datetime.get","type.property.valuetypes.DatetimeOperationAsyncClient.getWithResponse":"Type.Property.ValueTypes.Datetime.get","type.property.valuetypes.DatetimeOperationAsyncClient.put":"Type.Property.ValueTypes.Datetime.put","type.property.valuetypes.DatetimeOperationAsyncClient.putWithResponse":"Type.Property.ValueTypes.Datetime.put","type.property.valuetypes.DatetimeOperationClient":"Type.Property.ValueTypes.Datetime","type.property.valuetypes.DatetimeOperationClient.get":"Type.Property.ValueTypes.Datetime.get","type.property.valuetypes.DatetimeOperationClient.getWithResponse":"Type.Property.ValueTypes.Datetime.get","type.property.valuetypes.DatetimeOperationClient.put":"Type.Property.ValueTypes.Datetime.put","type.property.valuetypes.DatetimeOperationClient.putWithResponse":"Type.Property.ValueTypes.Datetime.put","type.property.valuetypes.Decimal128AsyncClient":"Type.Property.ValueTypes.Decimal128","type.property.valuetypes.Decimal128AsyncClient.get":"Type.Property.ValueTypes.Decimal128.get","type.property.valuetypes.Decimal128AsyncClient.getWithResponse":"Type.Property.ValueTypes.Decimal128.get","type.property.valuetypes.Decimal128AsyncClient.put":"Type.Property.ValueTypes.Decimal128.put","type.property.valuetypes.Decimal128AsyncClient.putWithResponse":"Type.Property.ValueTypes.Decimal128.put","type.property.valuetypes.Decimal128Client":"Type.Property.ValueTypes.Decimal128","type.property.valuetypes.Decimal128Client.get":"Type.Property.ValueTypes.Decimal128.get","type.property.valuetypes.Decimal128Client.getWithResponse":"Type.Property.ValueTypes.Decimal128.get","type.property.valuetypes.Decimal128Client.put":"Type.Property.ValueTypes.Decimal128.put","type.property.valuetypes.Decimal128Client.putWithResponse":"Type.Property.ValueTypes.Decimal128.put","type.property.valuetypes.DecimalAsyncClient":"Type.Property.ValueTypes.Decimal","type.property.valuetypes.DecimalAsyncClient.get":"Type.Property.ValueTypes.Decimal.get","type.property.valuetypes.DecimalAsyncClient.getWithResponse":"Type.Property.ValueTypes.Decimal.get","type.property.valuetypes.DecimalAsyncClient.put":"Type.Property.ValueTypes.Decimal.put","type.property.valuetypes.DecimalAsyncClient.putWithResponse":"Type.Property.ValueTypes.Decimal.put","type.property.valuetypes.DecimalClient":"Type.Property.ValueTypes.Decimal","type.property.valuetypes.DecimalClient.get":"Type.Property.ValueTypes.Decimal.get","type.property.valuetypes.DecimalClient.getWithResponse":"Type.Property.ValueTypes.Decimal.get","type.property.valuetypes.DecimalClient.put":"Type.Property.ValueTypes.Decimal.put","type.property.valuetypes.DecimalClient.putWithResponse":"Type.Property.ValueTypes.Decimal.put","type.property.valuetypes.DictionaryStringAsyncClient":"Type.Property.ValueTypes.DictionaryString","type.property.valuetypes.DictionaryStringAsyncClient.get":"Type.Property.ValueTypes.DictionaryString.get","type.property.valuetypes.DictionaryStringAsyncClient.getWithResponse":"Type.Property.ValueTypes.DictionaryString.get","type.property.valuetypes.DictionaryStringAsyncClient.put":"Type.Property.ValueTypes.DictionaryString.put","type.property.valuetypes.DictionaryStringAsyncClient.putWithResponse":"Type.Property.ValueTypes.DictionaryString.put","type.property.valuetypes.DictionaryStringClient":"Type.Property.ValueTypes.DictionaryString","type.property.valuetypes.DictionaryStringClient.get":"Type.Property.ValueTypes.DictionaryString.get","type.property.valuetypes.DictionaryStringClient.getWithResponse":"Type.Property.ValueTypes.DictionaryString.get","type.property.valuetypes.DictionaryStringClient.put":"Type.Property.ValueTypes.DictionaryString.put","type.property.valuetypes.DictionaryStringClient.putWithResponse":"Type.Property.ValueTypes.DictionaryString.put","type.property.valuetypes.DurationOperationAsyncClient":"Type.Property.ValueTypes.Duration","type.property.valuetypes.DurationOperationAsyncClient.get":"Type.Property.ValueTypes.Duration.get","type.property.valuetypes.DurationOperationAsyncClient.getWithResponse":"Type.Property.ValueTypes.Duration.get","type.property.valuetypes.DurationOperationAsyncClient.put":"Type.Property.ValueTypes.Duration.put","type.property.valuetypes.DurationOperationAsyncClient.putWithResponse":"Type.Property.ValueTypes.Duration.put","type.property.valuetypes.DurationOperationClient":"Type.Property.ValueTypes.Duration","type.property.valuetypes.DurationOperationClient.get":"Type.Property.ValueTypes.Duration.get","type.property.valuetypes.DurationOperationClient.getWithResponse":"Type.Property.ValueTypes.Duration.get","type.property.valuetypes.DurationOperationClient.put":"Type.Property.ValueTypes.Duration.put","type.property.valuetypes.DurationOperationClient.putWithResponse":"Type.Property.ValueTypes.Duration.put","type.property.valuetypes.EnumAsyncClient":"Type.Property.ValueTypes.Enum","type.property.valuetypes.EnumAsyncClient.get":"Type.Property.ValueTypes.Enum.get","type.property.valuetypes.EnumAsyncClient.getWithResponse":"Type.Property.ValueTypes.Enum.get","type.property.valuetypes.EnumAsyncClient.put":"Type.Property.ValueTypes.Enum.put","type.property.valuetypes.EnumAsyncClient.putWithResponse":"Type.Property.ValueTypes.Enum.put","type.property.valuetypes.EnumClient":"Type.Property.ValueTypes.Enum","type.property.valuetypes.EnumClient.get":"Type.Property.ValueTypes.Enum.get","type.property.valuetypes.EnumClient.getWithResponse":"Type.Property.ValueTypes.Enum.get","type.property.valuetypes.EnumClient.put":"Type.Property.ValueTypes.Enum.put","type.property.valuetypes.EnumClient.putWithResponse":"Type.Property.ValueTypes.Enum.put","type.property.valuetypes.ExtensibleEnumAsyncClient":"Type.Property.ValueTypes.ExtensibleEnum","type.property.valuetypes.ExtensibleEnumAsyncClient.get":"Type.Property.ValueTypes.ExtensibleEnum.get","type.property.valuetypes.ExtensibleEnumAsyncClient.getWithResponse":"Type.Property.ValueTypes.ExtensibleEnum.get","type.property.valuetypes.ExtensibleEnumAsyncClient.put":"Type.Property.ValueTypes.ExtensibleEnum.put","type.property.valuetypes.ExtensibleEnumAsyncClient.putWithResponse":"Type.Property.ValueTypes.ExtensibleEnum.put","type.property.valuetypes.ExtensibleEnumClient":"Type.Property.ValueTypes.ExtensibleEnum","type.property.valuetypes.ExtensibleEnumClient.get":"Type.Property.ValueTypes.ExtensibleEnum.get","type.property.valuetypes.ExtensibleEnumClient.getWithResponse":"Type.Property.ValueTypes.ExtensibleEnum.get","type.property.valuetypes.ExtensibleEnumClient.put":"Type.Property.ValueTypes.ExtensibleEnum.put","type.property.valuetypes.ExtensibleEnumClient.putWithResponse":"Type.Property.ValueTypes.ExtensibleEnum.put","type.property.valuetypes.FloatLiteralAsyncClient":"Type.Property.ValueTypes.FloatLiteral","type.property.valuetypes.FloatLiteralAsyncClient.get":"Type.Property.ValueTypes.FloatLiteral.get","type.property.valuetypes.FloatLiteralAsyncClient.getWithResponse":"Type.Property.ValueTypes.FloatLiteral.get","type.property.valuetypes.FloatLiteralAsyncClient.put":"Type.Property.ValueTypes.FloatLiteral.put","type.property.valuetypes.FloatLiteralAsyncClient.putWithResponse":"Type.Property.ValueTypes.FloatLiteral.put","type.property.valuetypes.FloatLiteralClient":"Type.Property.ValueTypes.FloatLiteral","type.property.valuetypes.FloatLiteralClient.get":"Type.Property.ValueTypes.FloatLiteral.get","type.property.valuetypes.FloatLiteralClient.getWithResponse":"Type.Property.ValueTypes.FloatLiteral.get","type.property.valuetypes.FloatLiteralClient.put":"Type.Property.ValueTypes.FloatLiteral.put","type.property.valuetypes.FloatLiteralClient.putWithResponse":"Type.Property.ValueTypes.FloatLiteral.put","type.property.valuetypes.FloatOperationAsyncClient":"Type.Property.ValueTypes.Float","type.property.valuetypes.FloatOperationAsyncClient.get":"Type.Property.ValueTypes.Float.get","type.property.valuetypes.FloatOperationAsyncClient.getWithResponse":"Type.Property.ValueTypes.Float.get","type.property.valuetypes.FloatOperationAsyncClient.put":"Type.Property.ValueTypes.Float.put","type.property.valuetypes.FloatOperationAsyncClient.putWithResponse":"Type.Property.ValueTypes.Float.put","type.property.valuetypes.FloatOperationClient":"Type.Property.ValueTypes.Float","type.property.valuetypes.FloatOperationClient.get":"Type.Property.ValueTypes.Float.get","type.property.valuetypes.FloatOperationClient.getWithResponse":"Type.Property.ValueTypes.Float.get","type.property.valuetypes.FloatOperationClient.put":"Type.Property.ValueTypes.Float.put","type.property.valuetypes.FloatOperationClient.putWithResponse":"Type.Property.ValueTypes.Float.put","type.property.valuetypes.IntAsyncClient":"Type.Property.ValueTypes.Int","type.property.valuetypes.IntAsyncClient.get":"Type.Property.ValueTypes.Int.get","type.property.valuetypes.IntAsyncClient.getWithResponse":"Type.Property.ValueTypes.Int.get","type.property.valuetypes.IntAsyncClient.put":"Type.Property.ValueTypes.Int.put","type.property.valuetypes.IntAsyncClient.putWithResponse":"Type.Property.ValueTypes.Int.put","type.property.valuetypes.IntClient":"Type.Property.ValueTypes.Int","type.property.valuetypes.IntClient.get":"Type.Property.ValueTypes.Int.get","type.property.valuetypes.IntClient.getWithResponse":"Type.Property.ValueTypes.Int.get","type.property.valuetypes.IntClient.put":"Type.Property.ValueTypes.Int.put","type.property.valuetypes.IntClient.putWithResponse":"Type.Property.ValueTypes.Int.put","type.property.valuetypes.IntLiteralAsyncClient":"Type.Property.ValueTypes.IntLiteral","type.property.valuetypes.IntLiteralAsyncClient.get":"Type.Property.ValueTypes.IntLiteral.get","type.property.valuetypes.IntLiteralAsyncClient.getWithResponse":"Type.Property.ValueTypes.IntLiteral.get","type.property.valuetypes.IntLiteralAsyncClient.put":"Type.Property.ValueTypes.IntLiteral.put","type.property.valuetypes.IntLiteralAsyncClient.putWithResponse":"Type.Property.ValueTypes.IntLiteral.put","type.property.valuetypes.IntLiteralClient":"Type.Property.ValueTypes.IntLiteral","type.property.valuetypes.IntLiteralClient.get":"Type.Property.ValueTypes.IntLiteral.get","type.property.valuetypes.IntLiteralClient.getWithResponse":"Type.Property.ValueTypes.IntLiteral.get","type.property.valuetypes.IntLiteralClient.put":"Type.Property.ValueTypes.IntLiteral.put","type.property.valuetypes.IntLiteralClient.putWithResponse":"Type.Property.ValueTypes.IntLiteral.put","type.property.valuetypes.ModelAsyncClient":"Type.Property.ValueTypes.Model","type.property.valuetypes.ModelAsyncClient.get":"Type.Property.ValueTypes.Model.get","type.property.valuetypes.ModelAsyncClient.getWithResponse":"Type.Property.ValueTypes.Model.get","type.property.valuetypes.ModelAsyncClient.put":"Type.Property.ValueTypes.Model.put","type.property.valuetypes.ModelAsyncClient.putWithResponse":"Type.Property.ValueTypes.Model.put","type.property.valuetypes.ModelClient":"Type.Property.ValueTypes.Model","type.property.valuetypes.ModelClient.get":"Type.Property.ValueTypes.Model.get","type.property.valuetypes.ModelClient.getWithResponse":"Type.Property.ValueTypes.Model.get","type.property.valuetypes.ModelClient.put":"Type.Property.ValueTypes.Model.put","type.property.valuetypes.ModelClient.putWithResponse":"Type.Property.ValueTypes.Model.put","type.property.valuetypes.NeverAsyncClient":"Type.Property.ValueTypes.Never","type.property.valuetypes.NeverAsyncClient.get":"Type.Property.ValueTypes.Never.get","type.property.valuetypes.NeverAsyncClient.getWithResponse":"Type.Property.ValueTypes.Never.get","type.property.valuetypes.NeverAsyncClient.put":"Type.Property.ValueTypes.Never.put","type.property.valuetypes.NeverAsyncClient.putWithResponse":"Type.Property.ValueTypes.Never.put","type.property.valuetypes.NeverClient":"Type.Property.ValueTypes.Never","type.property.valuetypes.NeverClient.get":"Type.Property.ValueTypes.Never.get","type.property.valuetypes.NeverClient.getWithResponse":"Type.Property.ValueTypes.Never.get","type.property.valuetypes.NeverClient.put":"Type.Property.ValueTypes.Never.put","type.property.valuetypes.NeverClient.putWithResponse":"Type.Property.ValueTypes.Never.put","type.property.valuetypes.StringLiteralAsyncClient":"Type.Property.ValueTypes.StringLiteral","type.property.valuetypes.StringLiteralAsyncClient.get":"Type.Property.ValueTypes.StringLiteral.get","type.property.valuetypes.StringLiteralAsyncClient.getWithResponse":"Type.Property.ValueTypes.StringLiteral.get","type.property.valuetypes.StringLiteralAsyncClient.put":"Type.Property.ValueTypes.StringLiteral.put","type.property.valuetypes.StringLiteralAsyncClient.putWithResponse":"Type.Property.ValueTypes.StringLiteral.put","type.property.valuetypes.StringLiteralClient":"Type.Property.ValueTypes.StringLiteral","type.property.valuetypes.StringLiteralClient.get":"Type.Property.ValueTypes.StringLiteral.get","type.property.valuetypes.StringLiteralClient.getWithResponse":"Type.Property.ValueTypes.StringLiteral.get","type.property.valuetypes.StringLiteralClient.put":"Type.Property.ValueTypes.StringLiteral.put","type.property.valuetypes.StringLiteralClient.putWithResponse":"Type.Property.ValueTypes.StringLiteral.put","type.property.valuetypes.StringOperationAsyncClient":"Type.Property.ValueTypes.String","type.property.valuetypes.StringOperationAsyncClient.get":"Type.Property.ValueTypes.String.get","type.property.valuetypes.StringOperationAsyncClient.getWithResponse":"Type.Property.ValueTypes.String.get","type.property.valuetypes.StringOperationAsyncClient.put":"Type.Property.ValueTypes.String.put","type.property.valuetypes.StringOperationAsyncClient.putWithResponse":"Type.Property.ValueTypes.String.put","type.property.valuetypes.StringOperationClient":"Type.Property.ValueTypes.String","type.property.valuetypes.StringOperationClient.get":"Type.Property.ValueTypes.String.get","type.property.valuetypes.StringOperationClient.getWithResponse":"Type.Property.ValueTypes.String.get","type.property.valuetypes.StringOperationClient.put":"Type.Property.ValueTypes.String.put","type.property.valuetypes.StringOperationClient.putWithResponse":"Type.Property.ValueTypes.String.put","type.property.valuetypes.UnionEnumValueAsyncClient":"Type.Property.ValueTypes.UnionEnumValue","type.property.valuetypes.UnionEnumValueAsyncClient.get":"Type.Property.ValueTypes.UnionEnumValue.get","type.property.valuetypes.UnionEnumValueAsyncClient.getWithResponse":"Type.Property.ValueTypes.UnionEnumValue.get","type.property.valuetypes.UnionEnumValueAsyncClient.put":"Type.Property.ValueTypes.UnionEnumValue.put","type.property.valuetypes.UnionEnumValueAsyncClient.putWithResponse":"Type.Property.ValueTypes.UnionEnumValue.put","type.property.valuetypes.UnionEnumValueClient":"Type.Property.ValueTypes.UnionEnumValue","type.property.valuetypes.UnionEnumValueClient.get":"Type.Property.ValueTypes.UnionEnumValue.get","type.property.valuetypes.UnionEnumValueClient.getWithResponse":"Type.Property.ValueTypes.UnionEnumValue.get","type.property.valuetypes.UnionEnumValueClient.put":"Type.Property.ValueTypes.UnionEnumValue.put","type.property.valuetypes.UnionEnumValueClient.putWithResponse":"Type.Property.ValueTypes.UnionEnumValue.put","type.property.valuetypes.UnionFloatLiteralAsyncClient":"Type.Property.ValueTypes.UnionFloatLiteral","type.property.valuetypes.UnionFloatLiteralAsyncClient.get":"Type.Property.ValueTypes.UnionFloatLiteral.get","type.property.valuetypes.UnionFloatLiteralAsyncClient.getWithResponse":"Type.Property.ValueTypes.UnionFloatLiteral.get","type.property.valuetypes.UnionFloatLiteralAsyncClient.put":"Type.Property.ValueTypes.UnionFloatLiteral.put","type.property.valuetypes.UnionFloatLiteralAsyncClient.putWithResponse":"Type.Property.ValueTypes.UnionFloatLiteral.put","type.property.valuetypes.UnionFloatLiteralClient":"Type.Property.ValueTypes.UnionFloatLiteral","type.property.valuetypes.UnionFloatLiteralClient.get":"Type.Property.ValueTypes.UnionFloatLiteral.get","type.property.valuetypes.UnionFloatLiteralClient.getWithResponse":"Type.Property.ValueTypes.UnionFloatLiteral.get","type.property.valuetypes.UnionFloatLiteralClient.put":"Type.Property.ValueTypes.UnionFloatLiteral.put","type.property.valuetypes.UnionFloatLiteralClient.putWithResponse":"Type.Property.ValueTypes.UnionFloatLiteral.put","type.property.valuetypes.UnionIntLiteralAsyncClient":"Type.Property.ValueTypes.UnionIntLiteral","type.property.valuetypes.UnionIntLiteralAsyncClient.get":"Type.Property.ValueTypes.UnionIntLiteral.get","type.property.valuetypes.UnionIntLiteralAsyncClient.getWithResponse":"Type.Property.ValueTypes.UnionIntLiteral.get","type.property.valuetypes.UnionIntLiteralAsyncClient.put":"Type.Property.ValueTypes.UnionIntLiteral.put","type.property.valuetypes.UnionIntLiteralAsyncClient.putWithResponse":"Type.Property.ValueTypes.UnionIntLiteral.put","type.property.valuetypes.UnionIntLiteralClient":"Type.Property.ValueTypes.UnionIntLiteral","type.property.valuetypes.UnionIntLiteralClient.get":"Type.Property.ValueTypes.UnionIntLiteral.get","type.property.valuetypes.UnionIntLiteralClient.getWithResponse":"Type.Property.ValueTypes.UnionIntLiteral.get","type.property.valuetypes.UnionIntLiteralClient.put":"Type.Property.ValueTypes.UnionIntLiteral.put","type.property.valuetypes.UnionIntLiteralClient.putWithResponse":"Type.Property.ValueTypes.UnionIntLiteral.put","type.property.valuetypes.UnionStringLiteralAsyncClient":"Type.Property.ValueTypes.UnionStringLiteral","type.property.valuetypes.UnionStringLiteralAsyncClient.get":"Type.Property.ValueTypes.UnionStringLiteral.get","type.property.valuetypes.UnionStringLiteralAsyncClient.getWithResponse":"Type.Property.ValueTypes.UnionStringLiteral.get","type.property.valuetypes.UnionStringLiteralAsyncClient.put":"Type.Property.ValueTypes.UnionStringLiteral.put","type.property.valuetypes.UnionStringLiteralAsyncClient.putWithResponse":"Type.Property.ValueTypes.UnionStringLiteral.put","type.property.valuetypes.UnionStringLiteralClient":"Type.Property.ValueTypes.UnionStringLiteral","type.property.valuetypes.UnionStringLiteralClient.get":"Type.Property.ValueTypes.UnionStringLiteral.get","type.property.valuetypes.UnionStringLiteralClient.getWithResponse":"Type.Property.ValueTypes.UnionStringLiteral.get","type.property.valuetypes.UnionStringLiteralClient.put":"Type.Property.ValueTypes.UnionStringLiteral.put","type.property.valuetypes.UnionStringLiteralClient.putWithResponse":"Type.Property.ValueTypes.UnionStringLiteral.put","type.property.valuetypes.UnknownArrayAsyncClient":"Type.Property.ValueTypes.UnknownArray","type.property.valuetypes.UnknownArrayAsyncClient.get":"Type.Property.ValueTypes.UnknownArray.get","type.property.valuetypes.UnknownArrayAsyncClient.getWithResponse":"Type.Property.ValueTypes.UnknownArray.get","type.property.valuetypes.UnknownArrayAsyncClient.put":"Type.Property.ValueTypes.UnknownArray.put","type.property.valuetypes.UnknownArrayAsyncClient.putWithResponse":"Type.Property.ValueTypes.UnknownArray.put","type.property.valuetypes.UnknownArrayClient":"Type.Property.ValueTypes.UnknownArray","type.property.valuetypes.UnknownArrayClient.get":"Type.Property.ValueTypes.UnknownArray.get","type.property.valuetypes.UnknownArrayClient.getWithResponse":"Type.Property.ValueTypes.UnknownArray.get","type.property.valuetypes.UnknownArrayClient.put":"Type.Property.ValueTypes.UnknownArray.put","type.property.valuetypes.UnknownArrayClient.putWithResponse":"Type.Property.ValueTypes.UnknownArray.put","type.property.valuetypes.UnknownDictAsyncClient":"Type.Property.ValueTypes.UnknownDict","type.property.valuetypes.UnknownDictAsyncClient.get":"Type.Property.ValueTypes.UnknownDict.get","type.property.valuetypes.UnknownDictAsyncClient.getWithResponse":"Type.Property.ValueTypes.UnknownDict.get","type.property.valuetypes.UnknownDictAsyncClient.put":"Type.Property.ValueTypes.UnknownDict.put","type.property.valuetypes.UnknownDictAsyncClient.putWithResponse":"Type.Property.ValueTypes.UnknownDict.put","type.property.valuetypes.UnknownDictClient":"Type.Property.ValueTypes.UnknownDict","type.property.valuetypes.UnknownDictClient.get":"Type.Property.ValueTypes.UnknownDict.get","type.property.valuetypes.UnknownDictClient.getWithResponse":"Type.Property.ValueTypes.UnknownDict.get","type.property.valuetypes.UnknownDictClient.put":"Type.Property.ValueTypes.UnknownDict.put","type.property.valuetypes.UnknownDictClient.putWithResponse":"Type.Property.ValueTypes.UnknownDict.put","type.property.valuetypes.UnknownIntAsyncClient":"Type.Property.ValueTypes.UnknownInt","type.property.valuetypes.UnknownIntAsyncClient.get":"Type.Property.ValueTypes.UnknownInt.get","type.property.valuetypes.UnknownIntAsyncClient.getWithResponse":"Type.Property.ValueTypes.UnknownInt.get","type.property.valuetypes.UnknownIntAsyncClient.put":"Type.Property.ValueTypes.UnknownInt.put","type.property.valuetypes.UnknownIntAsyncClient.putWithResponse":"Type.Property.ValueTypes.UnknownInt.put","type.property.valuetypes.UnknownIntClient":"Type.Property.ValueTypes.UnknownInt","type.property.valuetypes.UnknownIntClient.get":"Type.Property.ValueTypes.UnknownInt.get","type.property.valuetypes.UnknownIntClient.getWithResponse":"Type.Property.ValueTypes.UnknownInt.get","type.property.valuetypes.UnknownIntClient.put":"Type.Property.ValueTypes.UnknownInt.put","type.property.valuetypes.UnknownIntClient.putWithResponse":"Type.Property.ValueTypes.UnknownInt.put","type.property.valuetypes.UnknownStringAsyncClient":"Type.Property.ValueTypes.UnknownString","type.property.valuetypes.UnknownStringAsyncClient.get":"Type.Property.ValueTypes.UnknownString.get","type.property.valuetypes.UnknownStringAsyncClient.getWithResponse":"Type.Property.ValueTypes.UnknownString.get","type.property.valuetypes.UnknownStringAsyncClient.put":"Type.Property.ValueTypes.UnknownString.put","type.property.valuetypes.UnknownStringAsyncClient.putWithResponse":"Type.Property.ValueTypes.UnknownString.put","type.property.valuetypes.UnknownStringClient":"Type.Property.ValueTypes.UnknownString","type.property.valuetypes.UnknownStringClient.get":"Type.Property.ValueTypes.UnknownString.get","type.property.valuetypes.UnknownStringClient.getWithResponse":"Type.Property.ValueTypes.UnknownString.get","type.property.valuetypes.UnknownStringClient.put":"Type.Property.ValueTypes.UnknownString.put","type.property.valuetypes.UnknownStringClient.putWithResponse":"Type.Property.ValueTypes.UnknownString.put","type.property.valuetypes.ValueTypesClientBuilder":"Type.Property.ValueTypes","type.property.valuetypes.models.BooleanLiteralProperty":"Type.Property.ValueTypes.BooleanLiteralProperty","type.property.valuetypes.models.BooleanProperty":"Type.Property.ValueTypes.BooleanProperty","type.property.valuetypes.models.BytesProperty":"Type.Property.ValueTypes.BytesProperty","type.property.valuetypes.models.CollectionsIntProperty":"Type.Property.ValueTypes.CollectionsIntProperty","type.property.valuetypes.models.CollectionsModelProperty":"Type.Property.ValueTypes.CollectionsModelProperty","type.property.valuetypes.models.CollectionsStringProperty":"Type.Property.ValueTypes.CollectionsStringProperty","type.property.valuetypes.models.DatetimeProperty":"Type.Property.ValueTypes.DatetimeProperty","type.property.valuetypes.models.Decimal128Property":"Type.Property.ValueTypes.Decimal128Property","type.property.valuetypes.models.DecimalProperty":"Type.Property.ValueTypes.DecimalProperty","type.property.valuetypes.models.DictionaryStringProperty":"Type.Property.ValueTypes.DictionaryStringProperty","type.property.valuetypes.models.DurationProperty":"Type.Property.ValueTypes.DurationProperty","type.property.valuetypes.models.EnumProperty":"Type.Property.ValueTypes.EnumProperty","type.property.valuetypes.models.ExtendedEnum":"Type.Property.ValueTypes.ExtendedEnum","type.property.valuetypes.models.ExtensibleEnumProperty":"Type.Property.ValueTypes.ExtensibleEnumProperty","type.property.valuetypes.models.FixedInnerEnum":"Type.Property.ValueTypes.FixedInnerEnum","type.property.valuetypes.models.FloatLiteralProperty":"Type.Property.ValueTypes.FloatLiteralProperty","type.property.valuetypes.models.FloatProperty":"Type.Property.ValueTypes.FloatProperty","type.property.valuetypes.models.InnerEnum":"Type.Property.ValueTypes.InnerEnum","type.property.valuetypes.models.InnerModel":"Type.Property.ValueTypes.InnerModel","type.property.valuetypes.models.IntLiteralProperty":"Type.Property.ValueTypes.IntLiteralProperty","type.property.valuetypes.models.IntProperty":"Type.Property.ValueTypes.IntProperty","type.property.valuetypes.models.ModelProperty":"Type.Property.ValueTypes.ModelProperty","type.property.valuetypes.models.NeverProperty":"Type.Property.ValueTypes.NeverProperty","type.property.valuetypes.models.StringLiteralProperty":"Type.Property.ValueTypes.StringLiteralProperty","type.property.valuetypes.models.StringProperty":"Type.Property.ValueTypes.StringProperty","type.property.valuetypes.models.UnionEnumValueProperty":"Type.Property.ValueTypes.UnionEnumValueProperty","type.property.valuetypes.models.UnionFloatLiteralProperty":"Type.Property.ValueTypes.UnionFloatLiteralProperty","type.property.valuetypes.models.UnionFloatLiteralPropertyProperty":"Type.Property.ValueTypes.UnionFloatLiteralProperty.property.anonymous","type.property.valuetypes.models.UnionIntLiteralProperty":"Type.Property.ValueTypes.UnionIntLiteralProperty","type.property.valuetypes.models.UnionIntLiteralPropertyProperty":"Type.Property.ValueTypes.UnionIntLiteralProperty.property.anonymous","type.property.valuetypes.models.UnionStringLiteralProperty":"Type.Property.ValueTypes.UnionStringLiteralProperty","type.property.valuetypes.models.UnionStringLiteralPropertyProperty":"Type.Property.ValueTypes.UnionStringLiteralProperty.property.anonymous","type.property.valuetypes.models.UnknownArrayProperty":"Type.Property.ValueTypes.UnknownArrayProperty","type.property.valuetypes.models.UnknownDictProperty":"Type.Property.ValueTypes.UnknownDictProperty","type.property.valuetypes.models.UnknownIntProperty":"Type.Property.ValueTypes.UnknownIntProperty","type.property.valuetypes.models.UnknownStringProperty":"Type.Property.ValueTypes.UnknownStringProperty"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/property/valuetypes/BooleanLiteralAsyncClient.java","src/main/java/type/property/valuetypes/BooleanLiteralClient.java","src/main/java/type/property/valuetypes/BooleanOperationAsyncClient.java","src/main/java/type/property/valuetypes/BooleanOperationClient.java","src/main/java/type/property/valuetypes/BytesAsyncClient.java","src/main/java/type/property/valuetypes/BytesClient.java","src/main/java/type/property/valuetypes/CollectionsIntAsyncClient.java","src/main/java/type/property/valuetypes/CollectionsIntClient.java","src/main/java/type/property/valuetypes/CollectionsModelAsyncClient.java","src/main/java/type/property/valuetypes/CollectionsModelClient.java","src/main/java/type/property/valuetypes/CollectionsStringAsyncClient.java","src/main/java/type/property/valuetypes/CollectionsStringClient.java","src/main/java/type/property/valuetypes/DatetimeOperationAsyncClient.java","src/main/java/type/property/valuetypes/DatetimeOperationClient.java","src/main/java/type/property/valuetypes/Decimal128AsyncClient.java","src/main/java/type/property/valuetypes/Decimal128Client.java","src/main/java/type/property/valuetypes/DecimalAsyncClient.java","src/main/java/type/property/valuetypes/DecimalClient.java","src/main/java/type/property/valuetypes/DictionaryStringAsyncClient.java","src/main/java/type/property/valuetypes/DictionaryStringClient.java","src/main/java/type/property/valuetypes/DurationOperationAsyncClient.java","src/main/java/type/property/valuetypes/DurationOperationClient.java","src/main/java/type/property/valuetypes/EnumAsyncClient.java","src/main/java/type/property/valuetypes/EnumClient.java","src/main/java/type/property/valuetypes/ExtensibleEnumAsyncClient.java","src/main/java/type/property/valuetypes/ExtensibleEnumClient.java","src/main/java/type/property/valuetypes/FloatLiteralAsyncClient.java","src/main/java/type/property/valuetypes/FloatLiteralClient.java","src/main/java/type/property/valuetypes/FloatOperationAsyncClient.java","src/main/java/type/property/valuetypes/FloatOperationClient.java","src/main/java/type/property/valuetypes/IntAsyncClient.java","src/main/java/type/property/valuetypes/IntClient.java","src/main/java/type/property/valuetypes/IntLiteralAsyncClient.java","src/main/java/type/property/valuetypes/IntLiteralClient.java","src/main/java/type/property/valuetypes/ModelAsyncClient.java","src/main/java/type/property/valuetypes/ModelClient.java","src/main/java/type/property/valuetypes/NeverAsyncClient.java","src/main/java/type/property/valuetypes/NeverClient.java","src/main/java/type/property/valuetypes/StringLiteralAsyncClient.java","src/main/java/type/property/valuetypes/StringLiteralClient.java","src/main/java/type/property/valuetypes/StringOperationAsyncClient.java","src/main/java/type/property/valuetypes/StringOperationClient.java","src/main/java/type/property/valuetypes/UnionEnumValueAsyncClient.java","src/main/java/type/property/valuetypes/UnionEnumValueClient.java","src/main/java/type/property/valuetypes/UnionFloatLiteralAsyncClient.java","src/main/java/type/property/valuetypes/UnionFloatLiteralClient.java","src/main/java/type/property/valuetypes/UnionIntLiteralAsyncClient.java","src/main/java/type/property/valuetypes/UnionIntLiteralClient.java","src/main/java/type/property/valuetypes/UnionStringLiteralAsyncClient.java","src/main/java/type/property/valuetypes/UnionStringLiteralClient.java","src/main/java/type/property/valuetypes/UnknownArrayAsyncClient.java","src/main/java/type/property/valuetypes/UnknownArrayClient.java","src/main/java/type/property/valuetypes/UnknownDictAsyncClient.java","src/main/java/type/property/valuetypes/UnknownDictClient.java","src/main/java/type/property/valuetypes/UnknownIntAsyncClient.java","src/main/java/type/property/valuetypes/UnknownIntClient.java","src/main/java/type/property/valuetypes/UnknownStringAsyncClient.java","src/main/java/type/property/valuetypes/UnknownStringClient.java","src/main/java/type/property/valuetypes/ValueTypesClientBuilder.java","src/main/java/type/property/valuetypes/implementation/BooleanLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/BooleanOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/BytesImpl.java","src/main/java/type/property/valuetypes/implementation/CollectionsIntsImpl.java","src/main/java/type/property/valuetypes/implementation/CollectionsModelsImpl.java","src/main/java/type/property/valuetypes/implementation/CollectionsStringsImpl.java","src/main/java/type/property/valuetypes/implementation/DatetimeOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/Decimal128sImpl.java","src/main/java/type/property/valuetypes/implementation/DecimalsImpl.java","src/main/java/type/property/valuetypes/implementation/DictionaryStringsImpl.java","src/main/java/type/property/valuetypes/implementation/DurationOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/EnumsImpl.java","src/main/java/type/property/valuetypes/implementation/ExtensibleEnumsImpl.java","src/main/java/type/property/valuetypes/implementation/FloatLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/FloatOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/IntLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/IntsImpl.java","src/main/java/type/property/valuetypes/implementation/ModelsImpl.java","src/main/java/type/property/valuetypes/implementation/NeversImpl.java","src/main/java/type/property/valuetypes/implementation/StringLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/StringOperationsImpl.java","src/main/java/type/property/valuetypes/implementation/UnionEnumValuesImpl.java","src/main/java/type/property/valuetypes/implementation/UnionFloatLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/UnionIntLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/UnionStringLiteralsImpl.java","src/main/java/type/property/valuetypes/implementation/UnknownArraysImpl.java","src/main/java/type/property/valuetypes/implementation/UnknownDictsImpl.java","src/main/java/type/property/valuetypes/implementation/UnknownIntsImpl.java","src/main/java/type/property/valuetypes/implementation/UnknownStringsImpl.java","src/main/java/type/property/valuetypes/implementation/ValueTypesClientImpl.java","src/main/java/type/property/valuetypes/implementation/package-info.java","src/main/java/type/property/valuetypes/models/BooleanLiteralProperty.java","src/main/java/type/property/valuetypes/models/BooleanProperty.java","src/main/java/type/property/valuetypes/models/BytesProperty.java","src/main/java/type/property/valuetypes/models/CollectionsIntProperty.java","src/main/java/type/property/valuetypes/models/CollectionsModelProperty.java","src/main/java/type/property/valuetypes/models/CollectionsStringProperty.java","src/main/java/type/property/valuetypes/models/DatetimeProperty.java","src/main/java/type/property/valuetypes/models/Decimal128Property.java","src/main/java/type/property/valuetypes/models/DecimalProperty.java","src/main/java/type/property/valuetypes/models/DictionaryStringProperty.java","src/main/java/type/property/valuetypes/models/DurationProperty.java","src/main/java/type/property/valuetypes/models/EnumProperty.java","src/main/java/type/property/valuetypes/models/ExtendedEnum.java","src/main/java/type/property/valuetypes/models/ExtensibleEnumProperty.java","src/main/java/type/property/valuetypes/models/FixedInnerEnum.java","src/main/java/type/property/valuetypes/models/FloatLiteralProperty.java","src/main/java/type/property/valuetypes/models/FloatProperty.java","src/main/java/type/property/valuetypes/models/InnerEnum.java","src/main/java/type/property/valuetypes/models/InnerModel.java","src/main/java/type/property/valuetypes/models/IntLiteralProperty.java","src/main/java/type/property/valuetypes/models/IntProperty.java","src/main/java/type/property/valuetypes/models/ModelProperty.java","src/main/java/type/property/valuetypes/models/NeverProperty.java","src/main/java/type/property/valuetypes/models/StringLiteralProperty.java","src/main/java/type/property/valuetypes/models/StringProperty.java","src/main/java/type/property/valuetypes/models/UnionEnumValueProperty.java","src/main/java/type/property/valuetypes/models/UnionFloatLiteralProperty.java","src/main/java/type/property/valuetypes/models/UnionFloatLiteralPropertyProperty.java","src/main/java/type/property/valuetypes/models/UnionIntLiteralProperty.java","src/main/java/type/property/valuetypes/models/UnionIntLiteralPropertyProperty.java","src/main/java/type/property/valuetypes/models/UnionStringLiteralProperty.java","src/main/java/type/property/valuetypes/models/UnionStringLiteralPropertyProperty.java","src/main/java/type/property/valuetypes/models/UnknownArrayProperty.java","src/main/java/type/property/valuetypes/models/UnknownDictProperty.java","src/main/java/type/property/valuetypes/models/UnknownIntProperty.java","src/main/java/type/property/valuetypes/models/UnknownStringProperty.java","src/main/java/type/property/valuetypes/models/package-info.java","src/main/java/type/property/valuetypes/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-scalar_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-scalar_apiview_properties.json deleted file mode 100644 index bc0e915353d..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-scalar_apiview_properties.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.scalar.BooleanOperationAsyncClient": "Type.Scalar.Boolean", - "type.scalar.BooleanOperationAsyncClient.get": "Type.Scalar.Boolean.get", - "type.scalar.BooleanOperationAsyncClient.getWithResponse": "Type.Scalar.Boolean.get", - "type.scalar.BooleanOperationAsyncClient.put": "Type.Scalar.Boolean.put", - "type.scalar.BooleanOperationAsyncClient.putWithResponse": "Type.Scalar.Boolean.put", - "type.scalar.BooleanOperationClient": "Type.Scalar.Boolean", - "type.scalar.BooleanOperationClient.get": "Type.Scalar.Boolean.get", - "type.scalar.BooleanOperationClient.getWithResponse": "Type.Scalar.Boolean.get", - "type.scalar.BooleanOperationClient.put": "Type.Scalar.Boolean.put", - "type.scalar.BooleanOperationClient.putWithResponse": "Type.Scalar.Boolean.put", - "type.scalar.Decimal128TypeAsyncClient": "Type.Scalar.Decimal128Type", - "type.scalar.Decimal128TypeAsyncClient.requestBody": "Type.Scalar.Decimal128Type.requestBody", - "type.scalar.Decimal128TypeAsyncClient.requestBodyWithResponse": "Type.Scalar.Decimal128Type.requestBody", - "type.scalar.Decimal128TypeAsyncClient.requestParameter": "Type.Scalar.Decimal128Type.requestParameter", - "type.scalar.Decimal128TypeAsyncClient.requestParameterWithResponse": "Type.Scalar.Decimal128Type.requestParameter", - "type.scalar.Decimal128TypeAsyncClient.responseBody": "Type.Scalar.Decimal128Type.responseBody", - "type.scalar.Decimal128TypeAsyncClient.responseBodyWithResponse": "Type.Scalar.Decimal128Type.responseBody", - "type.scalar.Decimal128TypeClient": "Type.Scalar.Decimal128Type", - "type.scalar.Decimal128TypeClient.requestBody": "Type.Scalar.Decimal128Type.requestBody", - "type.scalar.Decimal128TypeClient.requestBodyWithResponse": "Type.Scalar.Decimal128Type.requestBody", - "type.scalar.Decimal128TypeClient.requestParameter": "Type.Scalar.Decimal128Type.requestParameter", - "type.scalar.Decimal128TypeClient.requestParameterWithResponse": "Type.Scalar.Decimal128Type.requestParameter", - "type.scalar.Decimal128TypeClient.responseBody": "Type.Scalar.Decimal128Type.responseBody", - "type.scalar.Decimal128TypeClient.responseBodyWithResponse": "Type.Scalar.Decimal128Type.responseBody", - "type.scalar.Decimal128VerifyAsyncClient": "Type.Scalar.Decimal128Verify", - "type.scalar.Decimal128VerifyAsyncClient.prepareVerify": "Type.Scalar.Decimal128Verify.prepareVerify", - "type.scalar.Decimal128VerifyAsyncClient.prepareVerifyWithResponse": "Type.Scalar.Decimal128Verify.prepareVerify", - "type.scalar.Decimal128VerifyAsyncClient.verify": "Type.Scalar.Decimal128Verify.verify", - "type.scalar.Decimal128VerifyAsyncClient.verifyWithResponse": "Type.Scalar.Decimal128Verify.verify", - "type.scalar.Decimal128VerifyClient": "Type.Scalar.Decimal128Verify", - "type.scalar.Decimal128VerifyClient.prepareVerify": "Type.Scalar.Decimal128Verify.prepareVerify", - "type.scalar.Decimal128VerifyClient.prepareVerifyWithResponse": "Type.Scalar.Decimal128Verify.prepareVerify", - "type.scalar.Decimal128VerifyClient.verify": "Type.Scalar.Decimal128Verify.verify", - "type.scalar.Decimal128VerifyClient.verifyWithResponse": "Type.Scalar.Decimal128Verify.verify", - "type.scalar.DecimalTypeAsyncClient": "Type.Scalar.DecimalType", - "type.scalar.DecimalTypeAsyncClient.requestBody": "Type.Scalar.DecimalType.requestBody", - "type.scalar.DecimalTypeAsyncClient.requestBodyWithResponse": "Type.Scalar.DecimalType.requestBody", - "type.scalar.DecimalTypeAsyncClient.requestParameter": "Type.Scalar.DecimalType.requestParameter", - "type.scalar.DecimalTypeAsyncClient.requestParameterWithResponse": "Type.Scalar.DecimalType.requestParameter", - "type.scalar.DecimalTypeAsyncClient.responseBody": "Type.Scalar.DecimalType.responseBody", - "type.scalar.DecimalTypeAsyncClient.responseBodyWithResponse": "Type.Scalar.DecimalType.responseBody", - "type.scalar.DecimalTypeClient": "Type.Scalar.DecimalType", - "type.scalar.DecimalTypeClient.requestBody": "Type.Scalar.DecimalType.requestBody", - "type.scalar.DecimalTypeClient.requestBodyWithResponse": "Type.Scalar.DecimalType.requestBody", - "type.scalar.DecimalTypeClient.requestParameter": "Type.Scalar.DecimalType.requestParameter", - "type.scalar.DecimalTypeClient.requestParameterWithResponse": "Type.Scalar.DecimalType.requestParameter", - "type.scalar.DecimalTypeClient.responseBody": "Type.Scalar.DecimalType.responseBody", - "type.scalar.DecimalTypeClient.responseBodyWithResponse": "Type.Scalar.DecimalType.responseBody", - "type.scalar.DecimalVerifyAsyncClient": "Type.Scalar.DecimalVerify", - "type.scalar.DecimalVerifyAsyncClient.prepareVerify": "Type.Scalar.DecimalVerify.prepareVerify", - "type.scalar.DecimalVerifyAsyncClient.prepareVerifyWithResponse": "Type.Scalar.DecimalVerify.prepareVerify", - "type.scalar.DecimalVerifyAsyncClient.verify": "Type.Scalar.DecimalVerify.verify", - "type.scalar.DecimalVerifyAsyncClient.verifyWithResponse": "Type.Scalar.DecimalVerify.verify", - "type.scalar.DecimalVerifyClient": "Type.Scalar.DecimalVerify", - "type.scalar.DecimalVerifyClient.prepareVerify": "Type.Scalar.DecimalVerify.prepareVerify", - "type.scalar.DecimalVerifyClient.prepareVerifyWithResponse": "Type.Scalar.DecimalVerify.prepareVerify", - "type.scalar.DecimalVerifyClient.verify": "Type.Scalar.DecimalVerify.verify", - "type.scalar.DecimalVerifyClient.verifyWithResponse": "Type.Scalar.DecimalVerify.verify", - "type.scalar.ScalarClientBuilder": "Type.Scalar", - "type.scalar.StringOperationAsyncClient": "Type.Scalar.String", - "type.scalar.StringOperationAsyncClient.get": "Type.Scalar.String.get", - "type.scalar.StringOperationAsyncClient.getWithResponse": "Type.Scalar.String.get", - "type.scalar.StringOperationAsyncClient.put": "Type.Scalar.String.put", - "type.scalar.StringOperationAsyncClient.putWithResponse": "Type.Scalar.String.put", - "type.scalar.StringOperationClient": "Type.Scalar.String", - "type.scalar.StringOperationClient.get": "Type.Scalar.String.get", - "type.scalar.StringOperationClient.getWithResponse": "Type.Scalar.String.get", - "type.scalar.StringOperationClient.put": "Type.Scalar.String.put", - "type.scalar.StringOperationClient.putWithResponse": "Type.Scalar.String.put", - "type.scalar.UnknownAsyncClient": "Type.Scalar.Unknown", - "type.scalar.UnknownAsyncClient.get": "Type.Scalar.Unknown.get", - "type.scalar.UnknownAsyncClient.getWithResponse": "Type.Scalar.Unknown.get", - "type.scalar.UnknownAsyncClient.put": "Type.Scalar.Unknown.put", - "type.scalar.UnknownAsyncClient.putWithResponse": "Type.Scalar.Unknown.put", - "type.scalar.UnknownClient": "Type.Scalar.Unknown", - "type.scalar.UnknownClient.get": "Type.Scalar.Unknown.get", - "type.scalar.UnknownClient.getWithResponse": "Type.Scalar.Unknown.get", - "type.scalar.UnknownClient.put": "Type.Scalar.Unknown.put", - "type.scalar.UnknownClient.putWithResponse": "Type.Scalar.Unknown.put" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-scalar_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-scalar_metadata.json index 7111fed4641..195c252e268 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-scalar_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-scalar_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.scalar.BooleanOperationAsyncClient":"Type.Scalar.Boolean","type.scalar.BooleanOperationAsyncClient.get":"Type.Scalar.Boolean.get","type.scalar.BooleanOperationAsyncClient.getWithResponse":"Type.Scalar.Boolean.get","type.scalar.BooleanOperationAsyncClient.put":"Type.Scalar.Boolean.put","type.scalar.BooleanOperationAsyncClient.putWithResponse":"Type.Scalar.Boolean.put","type.scalar.BooleanOperationClient":"Type.Scalar.Boolean","type.scalar.BooleanOperationClient.get":"Type.Scalar.Boolean.get","type.scalar.BooleanOperationClient.getWithResponse":"Type.Scalar.Boolean.get","type.scalar.BooleanOperationClient.put":"Type.Scalar.Boolean.put","type.scalar.BooleanOperationClient.putWithResponse":"Type.Scalar.Boolean.put","type.scalar.Decimal128TypeAsyncClient":"Type.Scalar.Decimal128Type","type.scalar.Decimal128TypeAsyncClient.requestBody":"Type.Scalar.Decimal128Type.requestBody","type.scalar.Decimal128TypeAsyncClient.requestBodyWithResponse":"Type.Scalar.Decimal128Type.requestBody","type.scalar.Decimal128TypeAsyncClient.requestParameter":"Type.Scalar.Decimal128Type.requestParameter","type.scalar.Decimal128TypeAsyncClient.requestParameterWithResponse":"Type.Scalar.Decimal128Type.requestParameter","type.scalar.Decimal128TypeAsyncClient.responseBody":"Type.Scalar.Decimal128Type.responseBody","type.scalar.Decimal128TypeAsyncClient.responseBodyWithResponse":"Type.Scalar.Decimal128Type.responseBody","type.scalar.Decimal128TypeClient":"Type.Scalar.Decimal128Type","type.scalar.Decimal128TypeClient.requestBody":"Type.Scalar.Decimal128Type.requestBody","type.scalar.Decimal128TypeClient.requestBodyWithResponse":"Type.Scalar.Decimal128Type.requestBody","type.scalar.Decimal128TypeClient.requestParameter":"Type.Scalar.Decimal128Type.requestParameter","type.scalar.Decimal128TypeClient.requestParameterWithResponse":"Type.Scalar.Decimal128Type.requestParameter","type.scalar.Decimal128TypeClient.responseBody":"Type.Scalar.Decimal128Type.responseBody","type.scalar.Decimal128TypeClient.responseBodyWithResponse":"Type.Scalar.Decimal128Type.responseBody","type.scalar.Decimal128VerifyAsyncClient":"Type.Scalar.Decimal128Verify","type.scalar.Decimal128VerifyAsyncClient.prepareVerify":"Type.Scalar.Decimal128Verify.prepareVerify","type.scalar.Decimal128VerifyAsyncClient.prepareVerifyWithResponse":"Type.Scalar.Decimal128Verify.prepareVerify","type.scalar.Decimal128VerifyAsyncClient.verify":"Type.Scalar.Decimal128Verify.verify","type.scalar.Decimal128VerifyAsyncClient.verifyWithResponse":"Type.Scalar.Decimal128Verify.verify","type.scalar.Decimal128VerifyClient":"Type.Scalar.Decimal128Verify","type.scalar.Decimal128VerifyClient.prepareVerify":"Type.Scalar.Decimal128Verify.prepareVerify","type.scalar.Decimal128VerifyClient.prepareVerifyWithResponse":"Type.Scalar.Decimal128Verify.prepareVerify","type.scalar.Decimal128VerifyClient.verify":"Type.Scalar.Decimal128Verify.verify","type.scalar.Decimal128VerifyClient.verifyWithResponse":"Type.Scalar.Decimal128Verify.verify","type.scalar.DecimalTypeAsyncClient":"Type.Scalar.DecimalType","type.scalar.DecimalTypeAsyncClient.requestBody":"Type.Scalar.DecimalType.requestBody","type.scalar.DecimalTypeAsyncClient.requestBodyWithResponse":"Type.Scalar.DecimalType.requestBody","type.scalar.DecimalTypeAsyncClient.requestParameter":"Type.Scalar.DecimalType.requestParameter","type.scalar.DecimalTypeAsyncClient.requestParameterWithResponse":"Type.Scalar.DecimalType.requestParameter","type.scalar.DecimalTypeAsyncClient.responseBody":"Type.Scalar.DecimalType.responseBody","type.scalar.DecimalTypeAsyncClient.responseBodyWithResponse":"Type.Scalar.DecimalType.responseBody","type.scalar.DecimalTypeClient":"Type.Scalar.DecimalType","type.scalar.DecimalTypeClient.requestBody":"Type.Scalar.DecimalType.requestBody","type.scalar.DecimalTypeClient.requestBodyWithResponse":"Type.Scalar.DecimalType.requestBody","type.scalar.DecimalTypeClient.requestParameter":"Type.Scalar.DecimalType.requestParameter","type.scalar.DecimalTypeClient.requestParameterWithResponse":"Type.Scalar.DecimalType.requestParameter","type.scalar.DecimalTypeClient.responseBody":"Type.Scalar.DecimalType.responseBody","type.scalar.DecimalTypeClient.responseBodyWithResponse":"Type.Scalar.DecimalType.responseBody","type.scalar.DecimalVerifyAsyncClient":"Type.Scalar.DecimalVerify","type.scalar.DecimalVerifyAsyncClient.prepareVerify":"Type.Scalar.DecimalVerify.prepareVerify","type.scalar.DecimalVerifyAsyncClient.prepareVerifyWithResponse":"Type.Scalar.DecimalVerify.prepareVerify","type.scalar.DecimalVerifyAsyncClient.verify":"Type.Scalar.DecimalVerify.verify","type.scalar.DecimalVerifyAsyncClient.verifyWithResponse":"Type.Scalar.DecimalVerify.verify","type.scalar.DecimalVerifyClient":"Type.Scalar.DecimalVerify","type.scalar.DecimalVerifyClient.prepareVerify":"Type.Scalar.DecimalVerify.prepareVerify","type.scalar.DecimalVerifyClient.prepareVerifyWithResponse":"Type.Scalar.DecimalVerify.prepareVerify","type.scalar.DecimalVerifyClient.verify":"Type.Scalar.DecimalVerify.verify","type.scalar.DecimalVerifyClient.verifyWithResponse":"Type.Scalar.DecimalVerify.verify","type.scalar.ScalarClientBuilder":"Type.Scalar","type.scalar.StringOperationAsyncClient":"Type.Scalar.String","type.scalar.StringOperationAsyncClient.get":"Type.Scalar.String.get","type.scalar.StringOperationAsyncClient.getWithResponse":"Type.Scalar.String.get","type.scalar.StringOperationAsyncClient.put":"Type.Scalar.String.put","type.scalar.StringOperationAsyncClient.putWithResponse":"Type.Scalar.String.put","type.scalar.StringOperationClient":"Type.Scalar.String","type.scalar.StringOperationClient.get":"Type.Scalar.String.get","type.scalar.StringOperationClient.getWithResponse":"Type.Scalar.String.get","type.scalar.StringOperationClient.put":"Type.Scalar.String.put","type.scalar.StringOperationClient.putWithResponse":"Type.Scalar.String.put","type.scalar.UnknownAsyncClient":"Type.Scalar.Unknown","type.scalar.UnknownAsyncClient.get":"Type.Scalar.Unknown.get","type.scalar.UnknownAsyncClient.getWithResponse":"Type.Scalar.Unknown.get","type.scalar.UnknownAsyncClient.put":"Type.Scalar.Unknown.put","type.scalar.UnknownAsyncClient.putWithResponse":"Type.Scalar.Unknown.put","type.scalar.UnknownClient":"Type.Scalar.Unknown","type.scalar.UnknownClient.get":"Type.Scalar.Unknown.get","type.scalar.UnknownClient.getWithResponse":"Type.Scalar.Unknown.get","type.scalar.UnknownClient.put":"Type.Scalar.Unknown.put","type.scalar.UnknownClient.putWithResponse":"Type.Scalar.Unknown.put"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/scalar/BooleanOperationAsyncClient.java","src/main/java/type/scalar/BooleanOperationClient.java","src/main/java/type/scalar/Decimal128TypeAsyncClient.java","src/main/java/type/scalar/Decimal128TypeClient.java","src/main/java/type/scalar/Decimal128VerifyAsyncClient.java","src/main/java/type/scalar/Decimal128VerifyClient.java","src/main/java/type/scalar/DecimalTypeAsyncClient.java","src/main/java/type/scalar/DecimalTypeClient.java","src/main/java/type/scalar/DecimalVerifyAsyncClient.java","src/main/java/type/scalar/DecimalVerifyClient.java","src/main/java/type/scalar/ScalarClientBuilder.java","src/main/java/type/scalar/StringOperationAsyncClient.java","src/main/java/type/scalar/StringOperationClient.java","src/main/java/type/scalar/UnknownAsyncClient.java","src/main/java/type/scalar/UnknownClient.java","src/main/java/type/scalar/implementation/BooleanOperationsImpl.java","src/main/java/type/scalar/implementation/Decimal128TypesImpl.java","src/main/java/type/scalar/implementation/Decimal128VerifiesImpl.java","src/main/java/type/scalar/implementation/DecimalTypesImpl.java","src/main/java/type/scalar/implementation/DecimalVerifiesImpl.java","src/main/java/type/scalar/implementation/ScalarClientImpl.java","src/main/java/type/scalar/implementation/StringOperationsImpl.java","src/main/java/type/scalar/implementation/UnknownsImpl.java","src/main/java/type/scalar/implementation/package-info.java","src/main/java/type/scalar/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.scalar.BooleanOperationAsyncClient":"Type.Scalar.Boolean","type.scalar.BooleanOperationAsyncClient.get":"Type.Scalar.Boolean.get","type.scalar.BooleanOperationAsyncClient.getWithResponse":"Type.Scalar.Boolean.get","type.scalar.BooleanOperationAsyncClient.put":"Type.Scalar.Boolean.put","type.scalar.BooleanOperationAsyncClient.putWithResponse":"Type.Scalar.Boolean.put","type.scalar.BooleanOperationClient":"Type.Scalar.Boolean","type.scalar.BooleanOperationClient.get":"Type.Scalar.Boolean.get","type.scalar.BooleanOperationClient.getWithResponse":"Type.Scalar.Boolean.get","type.scalar.BooleanOperationClient.put":"Type.Scalar.Boolean.put","type.scalar.BooleanOperationClient.putWithResponse":"Type.Scalar.Boolean.put","type.scalar.Decimal128TypeAsyncClient":"Type.Scalar.Decimal128Type","type.scalar.Decimal128TypeAsyncClient.requestBody":"Type.Scalar.Decimal128Type.requestBody","type.scalar.Decimal128TypeAsyncClient.requestBodyWithResponse":"Type.Scalar.Decimal128Type.requestBody","type.scalar.Decimal128TypeAsyncClient.requestParameter":"Type.Scalar.Decimal128Type.requestParameter","type.scalar.Decimal128TypeAsyncClient.requestParameterWithResponse":"Type.Scalar.Decimal128Type.requestParameter","type.scalar.Decimal128TypeAsyncClient.responseBody":"Type.Scalar.Decimal128Type.responseBody","type.scalar.Decimal128TypeAsyncClient.responseBodyWithResponse":"Type.Scalar.Decimal128Type.responseBody","type.scalar.Decimal128TypeClient":"Type.Scalar.Decimal128Type","type.scalar.Decimal128TypeClient.requestBody":"Type.Scalar.Decimal128Type.requestBody","type.scalar.Decimal128TypeClient.requestBodyWithResponse":"Type.Scalar.Decimal128Type.requestBody","type.scalar.Decimal128TypeClient.requestParameter":"Type.Scalar.Decimal128Type.requestParameter","type.scalar.Decimal128TypeClient.requestParameterWithResponse":"Type.Scalar.Decimal128Type.requestParameter","type.scalar.Decimal128TypeClient.responseBody":"Type.Scalar.Decimal128Type.responseBody","type.scalar.Decimal128TypeClient.responseBodyWithResponse":"Type.Scalar.Decimal128Type.responseBody","type.scalar.Decimal128VerifyAsyncClient":"Type.Scalar.Decimal128Verify","type.scalar.Decimal128VerifyAsyncClient.prepareVerify":"Type.Scalar.Decimal128Verify.prepareVerify","type.scalar.Decimal128VerifyAsyncClient.prepareVerifyWithResponse":"Type.Scalar.Decimal128Verify.prepareVerify","type.scalar.Decimal128VerifyAsyncClient.verify":"Type.Scalar.Decimal128Verify.verify","type.scalar.Decimal128VerifyAsyncClient.verifyWithResponse":"Type.Scalar.Decimal128Verify.verify","type.scalar.Decimal128VerifyClient":"Type.Scalar.Decimal128Verify","type.scalar.Decimal128VerifyClient.prepareVerify":"Type.Scalar.Decimal128Verify.prepareVerify","type.scalar.Decimal128VerifyClient.prepareVerifyWithResponse":"Type.Scalar.Decimal128Verify.prepareVerify","type.scalar.Decimal128VerifyClient.verify":"Type.Scalar.Decimal128Verify.verify","type.scalar.Decimal128VerifyClient.verifyWithResponse":"Type.Scalar.Decimal128Verify.verify","type.scalar.DecimalTypeAsyncClient":"Type.Scalar.DecimalType","type.scalar.DecimalTypeAsyncClient.requestBody":"Type.Scalar.DecimalType.requestBody","type.scalar.DecimalTypeAsyncClient.requestBodyWithResponse":"Type.Scalar.DecimalType.requestBody","type.scalar.DecimalTypeAsyncClient.requestParameter":"Type.Scalar.DecimalType.requestParameter","type.scalar.DecimalTypeAsyncClient.requestParameterWithResponse":"Type.Scalar.DecimalType.requestParameter","type.scalar.DecimalTypeAsyncClient.responseBody":"Type.Scalar.DecimalType.responseBody","type.scalar.DecimalTypeAsyncClient.responseBodyWithResponse":"Type.Scalar.DecimalType.responseBody","type.scalar.DecimalTypeClient":"Type.Scalar.DecimalType","type.scalar.DecimalTypeClient.requestBody":"Type.Scalar.DecimalType.requestBody","type.scalar.DecimalTypeClient.requestBodyWithResponse":"Type.Scalar.DecimalType.requestBody","type.scalar.DecimalTypeClient.requestParameter":"Type.Scalar.DecimalType.requestParameter","type.scalar.DecimalTypeClient.requestParameterWithResponse":"Type.Scalar.DecimalType.requestParameter","type.scalar.DecimalTypeClient.responseBody":"Type.Scalar.DecimalType.responseBody","type.scalar.DecimalTypeClient.responseBodyWithResponse":"Type.Scalar.DecimalType.responseBody","type.scalar.DecimalVerifyAsyncClient":"Type.Scalar.DecimalVerify","type.scalar.DecimalVerifyAsyncClient.prepareVerify":"Type.Scalar.DecimalVerify.prepareVerify","type.scalar.DecimalVerifyAsyncClient.prepareVerifyWithResponse":"Type.Scalar.DecimalVerify.prepareVerify","type.scalar.DecimalVerifyAsyncClient.verify":"Type.Scalar.DecimalVerify.verify","type.scalar.DecimalVerifyAsyncClient.verifyWithResponse":"Type.Scalar.DecimalVerify.verify","type.scalar.DecimalVerifyClient":"Type.Scalar.DecimalVerify","type.scalar.DecimalVerifyClient.prepareVerify":"Type.Scalar.DecimalVerify.prepareVerify","type.scalar.DecimalVerifyClient.prepareVerifyWithResponse":"Type.Scalar.DecimalVerify.prepareVerify","type.scalar.DecimalVerifyClient.verify":"Type.Scalar.DecimalVerify.verify","type.scalar.DecimalVerifyClient.verifyWithResponse":"Type.Scalar.DecimalVerify.verify","type.scalar.ScalarClientBuilder":"Type.Scalar","type.scalar.StringOperationAsyncClient":"Type.Scalar.String","type.scalar.StringOperationAsyncClient.get":"Type.Scalar.String.get","type.scalar.StringOperationAsyncClient.getWithResponse":"Type.Scalar.String.get","type.scalar.StringOperationAsyncClient.put":"Type.Scalar.String.put","type.scalar.StringOperationAsyncClient.putWithResponse":"Type.Scalar.String.put","type.scalar.StringOperationClient":"Type.Scalar.String","type.scalar.StringOperationClient.get":"Type.Scalar.String.get","type.scalar.StringOperationClient.getWithResponse":"Type.Scalar.String.get","type.scalar.StringOperationClient.put":"Type.Scalar.String.put","type.scalar.StringOperationClient.putWithResponse":"Type.Scalar.String.put","type.scalar.UnknownAsyncClient":"Type.Scalar.Unknown","type.scalar.UnknownAsyncClient.get":"Type.Scalar.Unknown.get","type.scalar.UnknownAsyncClient.getWithResponse":"Type.Scalar.Unknown.get","type.scalar.UnknownAsyncClient.put":"Type.Scalar.Unknown.put","type.scalar.UnknownAsyncClient.putWithResponse":"Type.Scalar.Unknown.put","type.scalar.UnknownClient":"Type.Scalar.Unknown","type.scalar.UnknownClient.get":"Type.Scalar.Unknown.get","type.scalar.UnknownClient.getWithResponse":"Type.Scalar.Unknown.get","type.scalar.UnknownClient.put":"Type.Scalar.Unknown.put","type.scalar.UnknownClient.putWithResponse":"Type.Scalar.Unknown.put"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/scalar/BooleanOperationAsyncClient.java","src/main/java/type/scalar/BooleanOperationClient.java","src/main/java/type/scalar/Decimal128TypeAsyncClient.java","src/main/java/type/scalar/Decimal128TypeClient.java","src/main/java/type/scalar/Decimal128VerifyAsyncClient.java","src/main/java/type/scalar/Decimal128VerifyClient.java","src/main/java/type/scalar/DecimalTypeAsyncClient.java","src/main/java/type/scalar/DecimalTypeClient.java","src/main/java/type/scalar/DecimalVerifyAsyncClient.java","src/main/java/type/scalar/DecimalVerifyClient.java","src/main/java/type/scalar/ScalarClientBuilder.java","src/main/java/type/scalar/StringOperationAsyncClient.java","src/main/java/type/scalar/StringOperationClient.java","src/main/java/type/scalar/UnknownAsyncClient.java","src/main/java/type/scalar/UnknownClient.java","src/main/java/type/scalar/implementation/BooleanOperationsImpl.java","src/main/java/type/scalar/implementation/Decimal128TypesImpl.java","src/main/java/type/scalar/implementation/Decimal128VerifiesImpl.java","src/main/java/type/scalar/implementation/DecimalTypesImpl.java","src/main/java/type/scalar/implementation/DecimalVerifiesImpl.java","src/main/java/type/scalar/implementation/ScalarClientImpl.java","src/main/java/type/scalar/implementation/StringOperationsImpl.java","src/main/java/type/scalar/implementation/UnknownsImpl.java","src/main/java/type/scalar/implementation/package-info.java","src/main/java/type/scalar/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-union-discriminated_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-union-discriminated_apiview_properties.json deleted file mode 100644 index 95c1b7aafc0..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-union-discriminated_apiview_properties.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.union.discriminated.DiscriminatedClientBuilder": "Type.Union.Discriminated", - "type.union.discriminated.EnvelopeObjectCustomPropertiesAsyncClient": "Type.Union.Discriminated.Envelope.Object.CustomProperties", - "type.union.discriminated.EnvelopeObjectCustomPropertiesAsyncClient.get": "Type.Union.Discriminated.Envelope.Object.CustomProperties.get", - "type.union.discriminated.EnvelopeObjectCustomPropertiesAsyncClient.getWithResponse": "Type.Union.Discriminated.Envelope.Object.CustomProperties.get", - "type.union.discriminated.EnvelopeObjectCustomPropertiesAsyncClient.put": "Type.Union.Discriminated.Envelope.Object.CustomProperties.put", - "type.union.discriminated.EnvelopeObjectCustomPropertiesAsyncClient.putWithResponse": "Type.Union.Discriminated.Envelope.Object.CustomProperties.put", - "type.union.discriminated.EnvelopeObjectCustomPropertiesClient": "Type.Union.Discriminated.Envelope.Object.CustomProperties", - "type.union.discriminated.EnvelopeObjectCustomPropertiesClient.get": "Type.Union.Discriminated.Envelope.Object.CustomProperties.get", - "type.union.discriminated.EnvelopeObjectCustomPropertiesClient.getWithResponse": "Type.Union.Discriminated.Envelope.Object.CustomProperties.get", - "type.union.discriminated.EnvelopeObjectCustomPropertiesClient.put": "Type.Union.Discriminated.Envelope.Object.CustomProperties.put", - "type.union.discriminated.EnvelopeObjectCustomPropertiesClient.putWithResponse": "Type.Union.Discriminated.Envelope.Object.CustomProperties.put", - "type.union.discriminated.EnvelopeObjectDefaultAsyncClient": "Type.Union.Discriminated.Envelope.Object.Default", - "type.union.discriminated.EnvelopeObjectDefaultAsyncClient.get": "Type.Union.Discriminated.Envelope.Object.Default.get", - "type.union.discriminated.EnvelopeObjectDefaultAsyncClient.getWithResponse": "Type.Union.Discriminated.Envelope.Object.Default.get", - "type.union.discriminated.EnvelopeObjectDefaultAsyncClient.put": "Type.Union.Discriminated.Envelope.Object.Default.put", - "type.union.discriminated.EnvelopeObjectDefaultAsyncClient.putWithResponse": "Type.Union.Discriminated.Envelope.Object.Default.put", - "type.union.discriminated.EnvelopeObjectDefaultClient": "Type.Union.Discriminated.Envelope.Object.Default", - "type.union.discriminated.EnvelopeObjectDefaultClient.get": "Type.Union.Discriminated.Envelope.Object.Default.get", - "type.union.discriminated.EnvelopeObjectDefaultClient.getWithResponse": "Type.Union.Discriminated.Envelope.Object.Default.get", - "type.union.discriminated.EnvelopeObjectDefaultClient.put": "Type.Union.Discriminated.Envelope.Object.Default.put", - "type.union.discriminated.EnvelopeObjectDefaultClient.putWithResponse": "Type.Union.Discriminated.Envelope.Object.Default.put", - "type.union.discriminated.NoEnvelopeCustomDiscriminatorAsyncClient": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator", - "type.union.discriminated.NoEnvelopeCustomDiscriminatorAsyncClient.get": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.get", - "type.union.discriminated.NoEnvelopeCustomDiscriminatorAsyncClient.getWithResponse": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.get", - "type.union.discriminated.NoEnvelopeCustomDiscriminatorAsyncClient.put": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put", - "type.union.discriminated.NoEnvelopeCustomDiscriminatorAsyncClient.putWithResponse": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put", - "type.union.discriminated.NoEnvelopeCustomDiscriminatorClient": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator", - "type.union.discriminated.NoEnvelopeCustomDiscriminatorClient.get": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.get", - "type.union.discriminated.NoEnvelopeCustomDiscriminatorClient.getWithResponse": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.get", - "type.union.discriminated.NoEnvelopeCustomDiscriminatorClient.put": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put", - "type.union.discriminated.NoEnvelopeCustomDiscriminatorClient.putWithResponse": "Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put", - "type.union.discriminated.NoEnvelopeDefaultAsyncClient": "Type.Union.Discriminated.NoEnvelope.Default", - "type.union.discriminated.NoEnvelopeDefaultAsyncClient.get": "Type.Union.Discriminated.NoEnvelope.Default.get", - "type.union.discriminated.NoEnvelopeDefaultAsyncClient.getWithResponse": "Type.Union.Discriminated.NoEnvelope.Default.get", - "type.union.discriminated.NoEnvelopeDefaultAsyncClient.put": "Type.Union.Discriminated.NoEnvelope.Default.put", - "type.union.discriminated.NoEnvelopeDefaultAsyncClient.putWithResponse": "Type.Union.Discriminated.NoEnvelope.Default.put", - "type.union.discriminated.NoEnvelopeDefaultClient": "Type.Union.Discriminated.NoEnvelope.Default", - "type.union.discriminated.NoEnvelopeDefaultClient.get": "Type.Union.Discriminated.NoEnvelope.Default.get", - "type.union.discriminated.NoEnvelopeDefaultClient.getWithResponse": "Type.Union.Discriminated.NoEnvelope.Default.get", - "type.union.discriminated.NoEnvelopeDefaultClient.put": "Type.Union.Discriminated.NoEnvelope.Default.put", - "type.union.discriminated.NoEnvelopeDefaultClient.putWithResponse": "Type.Union.Discriminated.NoEnvelope.Default.put" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-union-discriminated_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-union-discriminated_metadata.json index 1b64e37521d..e6fa0a77a75 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-union-discriminated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-union-discriminated_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.union.discriminated.DiscriminatedClientBuilder":"Type.Union.Discriminated","type.union.discriminated.EnvelopeObjectCustomPropertiesAsyncClient":"Type.Union.Discriminated.Envelope.Object.CustomProperties","type.union.discriminated.EnvelopeObjectCustomPropertiesAsyncClient.get":"Type.Union.Discriminated.Envelope.Object.CustomProperties.get","type.union.discriminated.EnvelopeObjectCustomPropertiesAsyncClient.getWithResponse":"Type.Union.Discriminated.Envelope.Object.CustomProperties.get","type.union.discriminated.EnvelopeObjectCustomPropertiesAsyncClient.put":"Type.Union.Discriminated.Envelope.Object.CustomProperties.put","type.union.discriminated.EnvelopeObjectCustomPropertiesAsyncClient.putWithResponse":"Type.Union.Discriminated.Envelope.Object.CustomProperties.put","type.union.discriminated.EnvelopeObjectCustomPropertiesClient":"Type.Union.Discriminated.Envelope.Object.CustomProperties","type.union.discriminated.EnvelopeObjectCustomPropertiesClient.get":"Type.Union.Discriminated.Envelope.Object.CustomProperties.get","type.union.discriminated.EnvelopeObjectCustomPropertiesClient.getWithResponse":"Type.Union.Discriminated.Envelope.Object.CustomProperties.get","type.union.discriminated.EnvelopeObjectCustomPropertiesClient.put":"Type.Union.Discriminated.Envelope.Object.CustomProperties.put","type.union.discriminated.EnvelopeObjectCustomPropertiesClient.putWithResponse":"Type.Union.Discriminated.Envelope.Object.CustomProperties.put","type.union.discriminated.EnvelopeObjectDefaultAsyncClient":"Type.Union.Discriminated.Envelope.Object.Default","type.union.discriminated.EnvelopeObjectDefaultAsyncClient.get":"Type.Union.Discriminated.Envelope.Object.Default.get","type.union.discriminated.EnvelopeObjectDefaultAsyncClient.getWithResponse":"Type.Union.Discriminated.Envelope.Object.Default.get","type.union.discriminated.EnvelopeObjectDefaultAsyncClient.put":"Type.Union.Discriminated.Envelope.Object.Default.put","type.union.discriminated.EnvelopeObjectDefaultAsyncClient.putWithResponse":"Type.Union.Discriminated.Envelope.Object.Default.put","type.union.discriminated.EnvelopeObjectDefaultClient":"Type.Union.Discriminated.Envelope.Object.Default","type.union.discriminated.EnvelopeObjectDefaultClient.get":"Type.Union.Discriminated.Envelope.Object.Default.get","type.union.discriminated.EnvelopeObjectDefaultClient.getWithResponse":"Type.Union.Discriminated.Envelope.Object.Default.get","type.union.discriminated.EnvelopeObjectDefaultClient.put":"Type.Union.Discriminated.Envelope.Object.Default.put","type.union.discriminated.EnvelopeObjectDefaultClient.putWithResponse":"Type.Union.Discriminated.Envelope.Object.Default.put","type.union.discriminated.NoEnvelopeCustomDiscriminatorAsyncClient":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator","type.union.discriminated.NoEnvelopeCustomDiscriminatorAsyncClient.get":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.get","type.union.discriminated.NoEnvelopeCustomDiscriminatorAsyncClient.getWithResponse":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.get","type.union.discriminated.NoEnvelopeCustomDiscriminatorAsyncClient.put":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put","type.union.discriminated.NoEnvelopeCustomDiscriminatorAsyncClient.putWithResponse":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put","type.union.discriminated.NoEnvelopeCustomDiscriminatorClient":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator","type.union.discriminated.NoEnvelopeCustomDiscriminatorClient.get":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.get","type.union.discriminated.NoEnvelopeCustomDiscriminatorClient.getWithResponse":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.get","type.union.discriminated.NoEnvelopeCustomDiscriminatorClient.put":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put","type.union.discriminated.NoEnvelopeCustomDiscriminatorClient.putWithResponse":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put","type.union.discriminated.NoEnvelopeDefaultAsyncClient":"Type.Union.Discriminated.NoEnvelope.Default","type.union.discriminated.NoEnvelopeDefaultAsyncClient.get":"Type.Union.Discriminated.NoEnvelope.Default.get","type.union.discriminated.NoEnvelopeDefaultAsyncClient.getWithResponse":"Type.Union.Discriminated.NoEnvelope.Default.get","type.union.discriminated.NoEnvelopeDefaultAsyncClient.put":"Type.Union.Discriminated.NoEnvelope.Default.put","type.union.discriminated.NoEnvelopeDefaultAsyncClient.putWithResponse":"Type.Union.Discriminated.NoEnvelope.Default.put","type.union.discriminated.NoEnvelopeDefaultClient":"Type.Union.Discriminated.NoEnvelope.Default","type.union.discriminated.NoEnvelopeDefaultClient.get":"Type.Union.Discriminated.NoEnvelope.Default.get","type.union.discriminated.NoEnvelopeDefaultClient.getWithResponse":"Type.Union.Discriminated.NoEnvelope.Default.get","type.union.discriminated.NoEnvelopeDefaultClient.put":"Type.Union.Discriminated.NoEnvelope.Default.put","type.union.discriminated.NoEnvelopeDefaultClient.putWithResponse":"Type.Union.Discriminated.NoEnvelope.Default.put"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/union/discriminated/DiscriminatedClientBuilder.java","src/main/java/type/union/discriminated/EnvelopeObjectCustomPropertiesAsyncClient.java","src/main/java/type/union/discriminated/EnvelopeObjectCustomPropertiesClient.java","src/main/java/type/union/discriminated/EnvelopeObjectDefaultAsyncClient.java","src/main/java/type/union/discriminated/EnvelopeObjectDefaultClient.java","src/main/java/type/union/discriminated/NoEnvelopeCustomDiscriminatorAsyncClient.java","src/main/java/type/union/discriminated/NoEnvelopeCustomDiscriminatorClient.java","src/main/java/type/union/discriminated/NoEnvelopeDefaultAsyncClient.java","src/main/java/type/union/discriminated/NoEnvelopeDefaultClient.java","src/main/java/type/union/discriminated/implementation/DiscriminatedClientImpl.java","src/main/java/type/union/discriminated/implementation/EnvelopeObjectCustomPropertiesImpl.java","src/main/java/type/union/discriminated/implementation/EnvelopeObjectDefaultsImpl.java","src/main/java/type/union/discriminated/implementation/NoEnvelopeCustomDiscriminatorsImpl.java","src/main/java/type/union/discriminated/implementation/NoEnvelopeDefaultsImpl.java","src/main/java/type/union/discriminated/implementation/package-info.java","src/main/java/type/union/discriminated/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.union.discriminated.DiscriminatedClientBuilder":"Type.Union.Discriminated","type.union.discriminated.EnvelopeObjectCustomPropertiesAsyncClient":"Type.Union.Discriminated.Envelope.Object.CustomProperties","type.union.discriminated.EnvelopeObjectCustomPropertiesAsyncClient.get":"Type.Union.Discriminated.Envelope.Object.CustomProperties.get","type.union.discriminated.EnvelopeObjectCustomPropertiesAsyncClient.getWithResponse":"Type.Union.Discriminated.Envelope.Object.CustomProperties.get","type.union.discriminated.EnvelopeObjectCustomPropertiesAsyncClient.put":"Type.Union.Discriminated.Envelope.Object.CustomProperties.put","type.union.discriminated.EnvelopeObjectCustomPropertiesAsyncClient.putWithResponse":"Type.Union.Discriminated.Envelope.Object.CustomProperties.put","type.union.discriminated.EnvelopeObjectCustomPropertiesClient":"Type.Union.Discriminated.Envelope.Object.CustomProperties","type.union.discriminated.EnvelopeObjectCustomPropertiesClient.get":"Type.Union.Discriminated.Envelope.Object.CustomProperties.get","type.union.discriminated.EnvelopeObjectCustomPropertiesClient.getWithResponse":"Type.Union.Discriminated.Envelope.Object.CustomProperties.get","type.union.discriminated.EnvelopeObjectCustomPropertiesClient.put":"Type.Union.Discriminated.Envelope.Object.CustomProperties.put","type.union.discriminated.EnvelopeObjectCustomPropertiesClient.putWithResponse":"Type.Union.Discriminated.Envelope.Object.CustomProperties.put","type.union.discriminated.EnvelopeObjectDefaultAsyncClient":"Type.Union.Discriminated.Envelope.Object.Default","type.union.discriminated.EnvelopeObjectDefaultAsyncClient.get":"Type.Union.Discriminated.Envelope.Object.Default.get","type.union.discriminated.EnvelopeObjectDefaultAsyncClient.getWithResponse":"Type.Union.Discriminated.Envelope.Object.Default.get","type.union.discriminated.EnvelopeObjectDefaultAsyncClient.put":"Type.Union.Discriminated.Envelope.Object.Default.put","type.union.discriminated.EnvelopeObjectDefaultAsyncClient.putWithResponse":"Type.Union.Discriminated.Envelope.Object.Default.put","type.union.discriminated.EnvelopeObjectDefaultClient":"Type.Union.Discriminated.Envelope.Object.Default","type.union.discriminated.EnvelopeObjectDefaultClient.get":"Type.Union.Discriminated.Envelope.Object.Default.get","type.union.discriminated.EnvelopeObjectDefaultClient.getWithResponse":"Type.Union.Discriminated.Envelope.Object.Default.get","type.union.discriminated.EnvelopeObjectDefaultClient.put":"Type.Union.Discriminated.Envelope.Object.Default.put","type.union.discriminated.EnvelopeObjectDefaultClient.putWithResponse":"Type.Union.Discriminated.Envelope.Object.Default.put","type.union.discriminated.NoEnvelopeCustomDiscriminatorAsyncClient":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator","type.union.discriminated.NoEnvelopeCustomDiscriminatorAsyncClient.get":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.get","type.union.discriminated.NoEnvelopeCustomDiscriminatorAsyncClient.getWithResponse":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.get","type.union.discriminated.NoEnvelopeCustomDiscriminatorAsyncClient.put":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put","type.union.discriminated.NoEnvelopeCustomDiscriminatorAsyncClient.putWithResponse":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put","type.union.discriminated.NoEnvelopeCustomDiscriminatorClient":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator","type.union.discriminated.NoEnvelopeCustomDiscriminatorClient.get":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.get","type.union.discriminated.NoEnvelopeCustomDiscriminatorClient.getWithResponse":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.get","type.union.discriminated.NoEnvelopeCustomDiscriminatorClient.put":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put","type.union.discriminated.NoEnvelopeCustomDiscriminatorClient.putWithResponse":"Type.Union.Discriminated.NoEnvelope.CustomDiscriminator.put","type.union.discriminated.NoEnvelopeDefaultAsyncClient":"Type.Union.Discriminated.NoEnvelope.Default","type.union.discriminated.NoEnvelopeDefaultAsyncClient.get":"Type.Union.Discriminated.NoEnvelope.Default.get","type.union.discriminated.NoEnvelopeDefaultAsyncClient.getWithResponse":"Type.Union.Discriminated.NoEnvelope.Default.get","type.union.discriminated.NoEnvelopeDefaultAsyncClient.put":"Type.Union.Discriminated.NoEnvelope.Default.put","type.union.discriminated.NoEnvelopeDefaultAsyncClient.putWithResponse":"Type.Union.Discriminated.NoEnvelope.Default.put","type.union.discriminated.NoEnvelopeDefaultClient":"Type.Union.Discriminated.NoEnvelope.Default","type.union.discriminated.NoEnvelopeDefaultClient.get":"Type.Union.Discriminated.NoEnvelope.Default.get","type.union.discriminated.NoEnvelopeDefaultClient.getWithResponse":"Type.Union.Discriminated.NoEnvelope.Default.get","type.union.discriminated.NoEnvelopeDefaultClient.put":"Type.Union.Discriminated.NoEnvelope.Default.put","type.union.discriminated.NoEnvelopeDefaultClient.putWithResponse":"Type.Union.Discriminated.NoEnvelope.Default.put"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/union/discriminated/DiscriminatedClientBuilder.java","src/main/java/type/union/discriminated/EnvelopeObjectCustomPropertiesAsyncClient.java","src/main/java/type/union/discriminated/EnvelopeObjectCustomPropertiesClient.java","src/main/java/type/union/discriminated/EnvelopeObjectDefaultAsyncClient.java","src/main/java/type/union/discriminated/EnvelopeObjectDefaultClient.java","src/main/java/type/union/discriminated/NoEnvelopeCustomDiscriminatorAsyncClient.java","src/main/java/type/union/discriminated/NoEnvelopeCustomDiscriminatorClient.java","src/main/java/type/union/discriminated/NoEnvelopeDefaultAsyncClient.java","src/main/java/type/union/discriminated/NoEnvelopeDefaultClient.java","src/main/java/type/union/discriminated/implementation/DiscriminatedClientImpl.java","src/main/java/type/union/discriminated/implementation/EnvelopeObjectCustomPropertiesImpl.java","src/main/java/type/union/discriminated/implementation/EnvelopeObjectDefaultsImpl.java","src/main/java/type/union/discriminated/implementation/NoEnvelopeCustomDiscriminatorsImpl.java","src/main/java/type/union/discriminated/implementation/NoEnvelopeDefaultsImpl.java","src/main/java/type/union/discriminated/implementation/package-info.java","src/main/java/type/union/discriminated/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-union_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-union_apiview_properties.json deleted file mode 100644 index 7a6a8d03465..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-union_apiview_properties.json +++ /dev/null @@ -1,139 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "type.union.EnumsOnlyAsyncClient": "Type.Union.EnumsOnly", - "type.union.EnumsOnlyAsyncClient.get": "Type.Union.EnumsOnly.get", - "type.union.EnumsOnlyAsyncClient.getWithResponse": "Type.Union.EnumsOnly.get", - "type.union.EnumsOnlyAsyncClient.send": "Type.Union.EnumsOnly.send", - "type.union.EnumsOnlyAsyncClient.sendWithResponse": "Type.Union.EnumsOnly.send", - "type.union.EnumsOnlyClient": "Type.Union.EnumsOnly", - "type.union.EnumsOnlyClient.get": "Type.Union.EnumsOnly.get", - "type.union.EnumsOnlyClient.getWithResponse": "Type.Union.EnumsOnly.get", - "type.union.EnumsOnlyClient.send": "Type.Union.EnumsOnly.send", - "type.union.EnumsOnlyClient.sendWithResponse": "Type.Union.EnumsOnly.send", - "type.union.FloatsOnlyAsyncClient": "Type.Union.FloatsOnly", - "type.union.FloatsOnlyAsyncClient.get": "Type.Union.FloatsOnly.get", - "type.union.FloatsOnlyAsyncClient.getWithResponse": "Type.Union.FloatsOnly.get", - "type.union.FloatsOnlyAsyncClient.send": "Type.Union.FloatsOnly.send", - "type.union.FloatsOnlyAsyncClient.sendWithResponse": "Type.Union.FloatsOnly.send", - "type.union.FloatsOnlyClient": "Type.Union.FloatsOnly", - "type.union.FloatsOnlyClient.get": "Type.Union.FloatsOnly.get", - "type.union.FloatsOnlyClient.getWithResponse": "Type.Union.FloatsOnly.get", - "type.union.FloatsOnlyClient.send": "Type.Union.FloatsOnly.send", - "type.union.FloatsOnlyClient.sendWithResponse": "Type.Union.FloatsOnly.send", - "type.union.IntsOnlyAsyncClient": "Type.Union.IntsOnly", - "type.union.IntsOnlyAsyncClient.get": "Type.Union.IntsOnly.get", - "type.union.IntsOnlyAsyncClient.getWithResponse": "Type.Union.IntsOnly.get", - "type.union.IntsOnlyAsyncClient.send": "Type.Union.IntsOnly.send", - "type.union.IntsOnlyAsyncClient.sendWithResponse": "Type.Union.IntsOnly.send", - "type.union.IntsOnlyClient": "Type.Union.IntsOnly", - "type.union.IntsOnlyClient.get": "Type.Union.IntsOnly.get", - "type.union.IntsOnlyClient.getWithResponse": "Type.Union.IntsOnly.get", - "type.union.IntsOnlyClient.send": "Type.Union.IntsOnly.send", - "type.union.IntsOnlyClient.sendWithResponse": "Type.Union.IntsOnly.send", - "type.union.MixedLiteralsAsyncClient": "Type.Union.MixedLiterals", - "type.union.MixedLiteralsAsyncClient.get": "Type.Union.MixedLiterals.get", - "type.union.MixedLiteralsAsyncClient.getWithResponse": "Type.Union.MixedLiterals.get", - "type.union.MixedLiteralsAsyncClient.send": "Type.Union.MixedLiterals.send", - "type.union.MixedLiteralsAsyncClient.sendWithResponse": "Type.Union.MixedLiterals.send", - "type.union.MixedLiteralsClient": "Type.Union.MixedLiterals", - "type.union.MixedLiteralsClient.get": "Type.Union.MixedLiterals.get", - "type.union.MixedLiteralsClient.getWithResponse": "Type.Union.MixedLiterals.get", - "type.union.MixedLiteralsClient.send": "Type.Union.MixedLiterals.send", - "type.union.MixedLiteralsClient.sendWithResponse": "Type.Union.MixedLiterals.send", - "type.union.MixedTypesAsyncClient": "Type.Union.MixedTypes", - "type.union.MixedTypesAsyncClient.get": "Type.Union.MixedTypes.get", - "type.union.MixedTypesAsyncClient.getWithResponse": "Type.Union.MixedTypes.get", - "type.union.MixedTypesAsyncClient.send": "Type.Union.MixedTypes.send", - "type.union.MixedTypesAsyncClient.sendWithResponse": "Type.Union.MixedTypes.send", - "type.union.MixedTypesClient": "Type.Union.MixedTypes", - "type.union.MixedTypesClient.get": "Type.Union.MixedTypes.get", - "type.union.MixedTypesClient.getWithResponse": "Type.Union.MixedTypes.get", - "type.union.MixedTypesClient.send": "Type.Union.MixedTypes.send", - "type.union.MixedTypesClient.sendWithResponse": "Type.Union.MixedTypes.send", - "type.union.ModelsOnlyAsyncClient": "Type.Union.ModelsOnly", - "type.union.ModelsOnlyAsyncClient.get": "Type.Union.ModelsOnly.get", - "type.union.ModelsOnlyAsyncClient.getWithResponse": "Type.Union.ModelsOnly.get", - "type.union.ModelsOnlyAsyncClient.send": "Type.Union.ModelsOnly.send", - "type.union.ModelsOnlyAsyncClient.sendWithResponse": "Type.Union.ModelsOnly.send", - "type.union.ModelsOnlyClient": "Type.Union.ModelsOnly", - "type.union.ModelsOnlyClient.get": "Type.Union.ModelsOnly.get", - "type.union.ModelsOnlyClient.getWithResponse": "Type.Union.ModelsOnly.get", - "type.union.ModelsOnlyClient.send": "Type.Union.ModelsOnly.send", - "type.union.ModelsOnlyClient.sendWithResponse": "Type.Union.ModelsOnly.send", - "type.union.StringAndArrayAsyncClient": "Type.Union.StringAndArray", - "type.union.StringAndArrayAsyncClient.get": "Type.Union.StringAndArray.get", - "type.union.StringAndArrayAsyncClient.getWithResponse": "Type.Union.StringAndArray.get", - "type.union.StringAndArrayAsyncClient.send": "Type.Union.StringAndArray.send", - "type.union.StringAndArrayAsyncClient.sendWithResponse": "Type.Union.StringAndArray.send", - "type.union.StringAndArrayClient": "Type.Union.StringAndArray", - "type.union.StringAndArrayClient.get": "Type.Union.StringAndArray.get", - "type.union.StringAndArrayClient.getWithResponse": "Type.Union.StringAndArray.get", - "type.union.StringAndArrayClient.send": "Type.Union.StringAndArray.send", - "type.union.StringAndArrayClient.sendWithResponse": "Type.Union.StringAndArray.send", - "type.union.StringExtensibleAsyncClient": "Type.Union.StringExtensible", - "type.union.StringExtensibleAsyncClient.get": "Type.Union.StringExtensible.get", - "type.union.StringExtensibleAsyncClient.getWithResponse": "Type.Union.StringExtensible.get", - "type.union.StringExtensibleAsyncClient.send": "Type.Union.StringExtensible.send", - "type.union.StringExtensibleAsyncClient.sendWithResponse": "Type.Union.StringExtensible.send", - "type.union.StringExtensibleClient": "Type.Union.StringExtensible", - "type.union.StringExtensibleClient.get": "Type.Union.StringExtensible.get", - "type.union.StringExtensibleClient.getWithResponse": "Type.Union.StringExtensible.get", - "type.union.StringExtensibleClient.send": "Type.Union.StringExtensible.send", - "type.union.StringExtensibleClient.sendWithResponse": "Type.Union.StringExtensible.send", - "type.union.StringExtensibleNamedAsyncClient": "Type.Union.StringExtensibleNamed", - "type.union.StringExtensibleNamedAsyncClient.get": "Type.Union.StringExtensibleNamed.get", - "type.union.StringExtensibleNamedAsyncClient.getWithResponse": "Type.Union.StringExtensibleNamed.get", - "type.union.StringExtensibleNamedAsyncClient.send": "Type.Union.StringExtensibleNamed.send", - "type.union.StringExtensibleNamedAsyncClient.sendWithResponse": "Type.Union.StringExtensibleNamed.send", - "type.union.StringExtensibleNamedClient": "Type.Union.StringExtensibleNamed", - "type.union.StringExtensibleNamedClient.get": "Type.Union.StringExtensibleNamed.get", - "type.union.StringExtensibleNamedClient.getWithResponse": "Type.Union.StringExtensibleNamed.get", - "type.union.StringExtensibleNamedClient.send": "Type.Union.StringExtensibleNamed.send", - "type.union.StringExtensibleNamedClient.sendWithResponse": "Type.Union.StringExtensibleNamed.send", - "type.union.StringsOnlyAsyncClient": "Type.Union.StringsOnly", - "type.union.StringsOnlyAsyncClient.get": "Type.Union.StringsOnly.get", - "type.union.StringsOnlyAsyncClient.getWithResponse": "Type.Union.StringsOnly.get", - "type.union.StringsOnlyAsyncClient.send": "Type.Union.StringsOnly.send", - "type.union.StringsOnlyAsyncClient.sendWithResponse": "Type.Union.StringsOnly.send", - "type.union.StringsOnlyClient": "Type.Union.StringsOnly", - "type.union.StringsOnlyClient.get": "Type.Union.StringsOnly.get", - "type.union.StringsOnlyClient.getWithResponse": "Type.Union.StringsOnly.get", - "type.union.StringsOnlyClient.send": "Type.Union.StringsOnly.send", - "type.union.StringsOnlyClient.sendWithResponse": "Type.Union.StringsOnly.send", - "type.union.UnionClientBuilder": "Type.Union", - "type.union.implementation.models.SendRequest": "Type.Union.send.Request.anonymous", - "type.union.implementation.models.SendRequest1": "Type.Union.send.Request.anonymous", - "type.union.implementation.models.SendRequest2": "Type.Union.send.Request.anonymous", - "type.union.implementation.models.SendRequest3": "Type.Union.send.Request.anonymous", - "type.union.implementation.models.SendRequest4": "Type.Union.send.Request.anonymous", - "type.union.implementation.models.SendRequest5": "Type.Union.send.Request.anonymous", - "type.union.implementation.models.SendRequest6": "Type.Union.send.Request.anonymous", - "type.union.implementation.models.SendRequest7": "Type.Union.send.Request.anonymous", - "type.union.implementation.models.SendRequest8": "Type.Union.send.Request.anonymous", - "type.union.implementation.models.SendRequest9": "Type.Union.send.Request.anonymous", - "type.union.models.Cat": "Type.Union.Cat", - "type.union.models.Dog": "Type.Union.Dog", - "type.union.models.EnumsOnlyCases": "Type.Union.EnumsOnlyCases", - "type.union.models.EnumsOnlyCasesLr": "Type.Union.EnumsOnlyCases.lr.anonymous", - "type.union.models.EnumsOnlyCasesUd": "Type.Union.EnumsOnlyCases.ud.anonymous", - "type.union.models.GetResponse": "Type.Union.get.Response.anonymous", - "type.union.models.GetResponse1": "Type.Union.get.Response.anonymous", - "type.union.models.GetResponse2": "Type.Union.get.Response.anonymous", - "type.union.models.GetResponse3": "Type.Union.get.Response.anonymous", - "type.union.models.GetResponse4": "Type.Union.get.Response.anonymous", - "type.union.models.GetResponse5": "Type.Union.get.Response.anonymous", - "type.union.models.GetResponse6": "Type.Union.get.Response.anonymous", - "type.union.models.GetResponse7": "Type.Union.get.Response.anonymous", - "type.union.models.GetResponse8": "Type.Union.get.Response.anonymous", - "type.union.models.GetResponse9": "Type.Union.get.Response.anonymous", - "type.union.models.GetResponseProp": "Type.Union.get.Response.prop.anonymous", - "type.union.models.GetResponseProp1": "Type.Union.get.Response.prop.anonymous", - "type.union.models.GetResponseProp2": "Type.Union.get.Response.prop.anonymous", - "type.union.models.GetResponseProp3": "Type.Union.get.Response.prop.anonymous", - "type.union.models.MixedLiteralsCases": "Type.Union.MixedLiteralsCases", - "type.union.models.MixedTypesCases": "Type.Union.MixedTypesCases", - "type.union.models.StringAndArrayCases": "Type.Union.StringAndArrayCases", - "type.union.models.StringExtensibleNamedUnion": "Type.Union.StringExtensibleNamedUnion" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-union_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-union_metadata.json index 076eb870da1..8ea600c868a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-union_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-union_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","crossLanguageDefinitions":{"type.union.EnumsOnlyAsyncClient":"Type.Union.EnumsOnly","type.union.EnumsOnlyAsyncClient.get":"Type.Union.EnumsOnly.get","type.union.EnumsOnlyAsyncClient.getWithResponse":"Type.Union.EnumsOnly.get","type.union.EnumsOnlyAsyncClient.send":"Type.Union.EnumsOnly.send","type.union.EnumsOnlyAsyncClient.sendWithResponse":"Type.Union.EnumsOnly.send","type.union.EnumsOnlyClient":"Type.Union.EnumsOnly","type.union.EnumsOnlyClient.get":"Type.Union.EnumsOnly.get","type.union.EnumsOnlyClient.getWithResponse":"Type.Union.EnumsOnly.get","type.union.EnumsOnlyClient.send":"Type.Union.EnumsOnly.send","type.union.EnumsOnlyClient.sendWithResponse":"Type.Union.EnumsOnly.send","type.union.FloatsOnlyAsyncClient":"Type.Union.FloatsOnly","type.union.FloatsOnlyAsyncClient.get":"Type.Union.FloatsOnly.get","type.union.FloatsOnlyAsyncClient.getWithResponse":"Type.Union.FloatsOnly.get","type.union.FloatsOnlyAsyncClient.send":"Type.Union.FloatsOnly.send","type.union.FloatsOnlyAsyncClient.sendWithResponse":"Type.Union.FloatsOnly.send","type.union.FloatsOnlyClient":"Type.Union.FloatsOnly","type.union.FloatsOnlyClient.get":"Type.Union.FloatsOnly.get","type.union.FloatsOnlyClient.getWithResponse":"Type.Union.FloatsOnly.get","type.union.FloatsOnlyClient.send":"Type.Union.FloatsOnly.send","type.union.FloatsOnlyClient.sendWithResponse":"Type.Union.FloatsOnly.send","type.union.IntsOnlyAsyncClient":"Type.Union.IntsOnly","type.union.IntsOnlyAsyncClient.get":"Type.Union.IntsOnly.get","type.union.IntsOnlyAsyncClient.getWithResponse":"Type.Union.IntsOnly.get","type.union.IntsOnlyAsyncClient.send":"Type.Union.IntsOnly.send","type.union.IntsOnlyAsyncClient.sendWithResponse":"Type.Union.IntsOnly.send","type.union.IntsOnlyClient":"Type.Union.IntsOnly","type.union.IntsOnlyClient.get":"Type.Union.IntsOnly.get","type.union.IntsOnlyClient.getWithResponse":"Type.Union.IntsOnly.get","type.union.IntsOnlyClient.send":"Type.Union.IntsOnly.send","type.union.IntsOnlyClient.sendWithResponse":"Type.Union.IntsOnly.send","type.union.MixedLiteralsAsyncClient":"Type.Union.MixedLiterals","type.union.MixedLiteralsAsyncClient.get":"Type.Union.MixedLiterals.get","type.union.MixedLiteralsAsyncClient.getWithResponse":"Type.Union.MixedLiterals.get","type.union.MixedLiteralsAsyncClient.send":"Type.Union.MixedLiterals.send","type.union.MixedLiteralsAsyncClient.sendWithResponse":"Type.Union.MixedLiterals.send","type.union.MixedLiteralsClient":"Type.Union.MixedLiterals","type.union.MixedLiteralsClient.get":"Type.Union.MixedLiterals.get","type.union.MixedLiteralsClient.getWithResponse":"Type.Union.MixedLiterals.get","type.union.MixedLiteralsClient.send":"Type.Union.MixedLiterals.send","type.union.MixedLiteralsClient.sendWithResponse":"Type.Union.MixedLiterals.send","type.union.MixedTypesAsyncClient":"Type.Union.MixedTypes","type.union.MixedTypesAsyncClient.get":"Type.Union.MixedTypes.get","type.union.MixedTypesAsyncClient.getWithResponse":"Type.Union.MixedTypes.get","type.union.MixedTypesAsyncClient.send":"Type.Union.MixedTypes.send","type.union.MixedTypesAsyncClient.sendWithResponse":"Type.Union.MixedTypes.send","type.union.MixedTypesClient":"Type.Union.MixedTypes","type.union.MixedTypesClient.get":"Type.Union.MixedTypes.get","type.union.MixedTypesClient.getWithResponse":"Type.Union.MixedTypes.get","type.union.MixedTypesClient.send":"Type.Union.MixedTypes.send","type.union.MixedTypesClient.sendWithResponse":"Type.Union.MixedTypes.send","type.union.ModelsOnlyAsyncClient":"Type.Union.ModelsOnly","type.union.ModelsOnlyAsyncClient.get":"Type.Union.ModelsOnly.get","type.union.ModelsOnlyAsyncClient.getWithResponse":"Type.Union.ModelsOnly.get","type.union.ModelsOnlyAsyncClient.send":"Type.Union.ModelsOnly.send","type.union.ModelsOnlyAsyncClient.sendWithResponse":"Type.Union.ModelsOnly.send","type.union.ModelsOnlyClient":"Type.Union.ModelsOnly","type.union.ModelsOnlyClient.get":"Type.Union.ModelsOnly.get","type.union.ModelsOnlyClient.getWithResponse":"Type.Union.ModelsOnly.get","type.union.ModelsOnlyClient.send":"Type.Union.ModelsOnly.send","type.union.ModelsOnlyClient.sendWithResponse":"Type.Union.ModelsOnly.send","type.union.StringAndArrayAsyncClient":"Type.Union.StringAndArray","type.union.StringAndArrayAsyncClient.get":"Type.Union.StringAndArray.get","type.union.StringAndArrayAsyncClient.getWithResponse":"Type.Union.StringAndArray.get","type.union.StringAndArrayAsyncClient.send":"Type.Union.StringAndArray.send","type.union.StringAndArrayAsyncClient.sendWithResponse":"Type.Union.StringAndArray.send","type.union.StringAndArrayClient":"Type.Union.StringAndArray","type.union.StringAndArrayClient.get":"Type.Union.StringAndArray.get","type.union.StringAndArrayClient.getWithResponse":"Type.Union.StringAndArray.get","type.union.StringAndArrayClient.send":"Type.Union.StringAndArray.send","type.union.StringAndArrayClient.sendWithResponse":"Type.Union.StringAndArray.send","type.union.StringExtensibleAsyncClient":"Type.Union.StringExtensible","type.union.StringExtensibleAsyncClient.get":"Type.Union.StringExtensible.get","type.union.StringExtensibleAsyncClient.getWithResponse":"Type.Union.StringExtensible.get","type.union.StringExtensibleAsyncClient.send":"Type.Union.StringExtensible.send","type.union.StringExtensibleAsyncClient.sendWithResponse":"Type.Union.StringExtensible.send","type.union.StringExtensibleClient":"Type.Union.StringExtensible","type.union.StringExtensibleClient.get":"Type.Union.StringExtensible.get","type.union.StringExtensibleClient.getWithResponse":"Type.Union.StringExtensible.get","type.union.StringExtensibleClient.send":"Type.Union.StringExtensible.send","type.union.StringExtensibleClient.sendWithResponse":"Type.Union.StringExtensible.send","type.union.StringExtensibleNamedAsyncClient":"Type.Union.StringExtensibleNamed","type.union.StringExtensibleNamedAsyncClient.get":"Type.Union.StringExtensibleNamed.get","type.union.StringExtensibleNamedAsyncClient.getWithResponse":"Type.Union.StringExtensibleNamed.get","type.union.StringExtensibleNamedAsyncClient.send":"Type.Union.StringExtensibleNamed.send","type.union.StringExtensibleNamedAsyncClient.sendWithResponse":"Type.Union.StringExtensibleNamed.send","type.union.StringExtensibleNamedClient":"Type.Union.StringExtensibleNamed","type.union.StringExtensibleNamedClient.get":"Type.Union.StringExtensibleNamed.get","type.union.StringExtensibleNamedClient.getWithResponse":"Type.Union.StringExtensibleNamed.get","type.union.StringExtensibleNamedClient.send":"Type.Union.StringExtensibleNamed.send","type.union.StringExtensibleNamedClient.sendWithResponse":"Type.Union.StringExtensibleNamed.send","type.union.StringsOnlyAsyncClient":"Type.Union.StringsOnly","type.union.StringsOnlyAsyncClient.get":"Type.Union.StringsOnly.get","type.union.StringsOnlyAsyncClient.getWithResponse":"Type.Union.StringsOnly.get","type.union.StringsOnlyAsyncClient.send":"Type.Union.StringsOnly.send","type.union.StringsOnlyAsyncClient.sendWithResponse":"Type.Union.StringsOnly.send","type.union.StringsOnlyClient":"Type.Union.StringsOnly","type.union.StringsOnlyClient.get":"Type.Union.StringsOnly.get","type.union.StringsOnlyClient.getWithResponse":"Type.Union.StringsOnly.get","type.union.StringsOnlyClient.send":"Type.Union.StringsOnly.send","type.union.StringsOnlyClient.sendWithResponse":"Type.Union.StringsOnly.send","type.union.UnionClientBuilder":"Type.Union","type.union.implementation.models.SendRequest":"Type.Union.send.Request.anonymous","type.union.implementation.models.SendRequest1":"Type.Union.send.Request.anonymous","type.union.implementation.models.SendRequest2":"Type.Union.send.Request.anonymous","type.union.implementation.models.SendRequest3":"Type.Union.send.Request.anonymous","type.union.implementation.models.SendRequest4":"Type.Union.send.Request.anonymous","type.union.implementation.models.SendRequest5":"Type.Union.send.Request.anonymous","type.union.implementation.models.SendRequest6":"Type.Union.send.Request.anonymous","type.union.implementation.models.SendRequest7":"Type.Union.send.Request.anonymous","type.union.implementation.models.SendRequest8":"Type.Union.send.Request.anonymous","type.union.implementation.models.SendRequest9":"Type.Union.send.Request.anonymous","type.union.models.Cat":"Type.Union.Cat","type.union.models.Dog":"Type.Union.Dog","type.union.models.EnumsOnlyCases":"Type.Union.EnumsOnlyCases","type.union.models.EnumsOnlyCasesLr":"Type.Union.EnumsOnlyCases.lr.anonymous","type.union.models.EnumsOnlyCasesUd":"Type.Union.EnumsOnlyCases.ud.anonymous","type.union.models.GetResponse":"Type.Union.get.Response.anonymous","type.union.models.GetResponse1":"Type.Union.get.Response.anonymous","type.union.models.GetResponse2":"Type.Union.get.Response.anonymous","type.union.models.GetResponse3":"Type.Union.get.Response.anonymous","type.union.models.GetResponse4":"Type.Union.get.Response.anonymous","type.union.models.GetResponse5":"Type.Union.get.Response.anonymous","type.union.models.GetResponse6":"Type.Union.get.Response.anonymous","type.union.models.GetResponse7":"Type.Union.get.Response.anonymous","type.union.models.GetResponse8":"Type.Union.get.Response.anonymous","type.union.models.GetResponse9":"Type.Union.get.Response.anonymous","type.union.models.GetResponseProp":"Type.Union.get.Response.prop.anonymous","type.union.models.GetResponseProp1":"Type.Union.get.Response.prop.anonymous","type.union.models.GetResponseProp2":"Type.Union.get.Response.prop.anonymous","type.union.models.GetResponseProp3":"Type.Union.get.Response.prop.anonymous","type.union.models.MixedLiteralsCases":"Type.Union.MixedLiteralsCases","type.union.models.MixedTypesCases":"Type.Union.MixedTypesCases","type.union.models.StringAndArrayCases":"Type.Union.StringAndArrayCases","type.union.models.StringExtensibleNamedUnion":"Type.Union.StringExtensibleNamedUnion"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/union/EnumsOnlyAsyncClient.java","src/main/java/type/union/EnumsOnlyClient.java","src/main/java/type/union/FloatsOnlyAsyncClient.java","src/main/java/type/union/FloatsOnlyClient.java","src/main/java/type/union/IntsOnlyAsyncClient.java","src/main/java/type/union/IntsOnlyClient.java","src/main/java/type/union/MixedLiteralsAsyncClient.java","src/main/java/type/union/MixedLiteralsClient.java","src/main/java/type/union/MixedTypesAsyncClient.java","src/main/java/type/union/MixedTypesClient.java","src/main/java/type/union/ModelsOnlyAsyncClient.java","src/main/java/type/union/ModelsOnlyClient.java","src/main/java/type/union/StringAndArrayAsyncClient.java","src/main/java/type/union/StringAndArrayClient.java","src/main/java/type/union/StringExtensibleAsyncClient.java","src/main/java/type/union/StringExtensibleClient.java","src/main/java/type/union/StringExtensibleNamedAsyncClient.java","src/main/java/type/union/StringExtensibleNamedClient.java","src/main/java/type/union/StringsOnlyAsyncClient.java","src/main/java/type/union/StringsOnlyClient.java","src/main/java/type/union/UnionClientBuilder.java","src/main/java/type/union/implementation/EnumsOnliesImpl.java","src/main/java/type/union/implementation/FloatsOnliesImpl.java","src/main/java/type/union/implementation/IntsOnliesImpl.java","src/main/java/type/union/implementation/MixedLiteralsImpl.java","src/main/java/type/union/implementation/MixedTypesImpl.java","src/main/java/type/union/implementation/ModelsOnliesImpl.java","src/main/java/type/union/implementation/StringAndArraysImpl.java","src/main/java/type/union/implementation/StringExtensibleNamedsImpl.java","src/main/java/type/union/implementation/StringExtensiblesImpl.java","src/main/java/type/union/implementation/StringsOnliesImpl.java","src/main/java/type/union/implementation/UnionClientImpl.java","src/main/java/type/union/implementation/models/SendRequest.java","src/main/java/type/union/implementation/models/SendRequest1.java","src/main/java/type/union/implementation/models/SendRequest2.java","src/main/java/type/union/implementation/models/SendRequest3.java","src/main/java/type/union/implementation/models/SendRequest4.java","src/main/java/type/union/implementation/models/SendRequest5.java","src/main/java/type/union/implementation/models/SendRequest6.java","src/main/java/type/union/implementation/models/SendRequest7.java","src/main/java/type/union/implementation/models/SendRequest8.java","src/main/java/type/union/implementation/models/SendRequest9.java","src/main/java/type/union/implementation/models/package-info.java","src/main/java/type/union/implementation/package-info.java","src/main/java/type/union/models/Cat.java","src/main/java/type/union/models/Dog.java","src/main/java/type/union/models/EnumsOnlyCases.java","src/main/java/type/union/models/EnumsOnlyCasesLr.java","src/main/java/type/union/models/EnumsOnlyCasesUd.java","src/main/java/type/union/models/GetResponse.java","src/main/java/type/union/models/GetResponse1.java","src/main/java/type/union/models/GetResponse2.java","src/main/java/type/union/models/GetResponse3.java","src/main/java/type/union/models/GetResponse4.java","src/main/java/type/union/models/GetResponse5.java","src/main/java/type/union/models/GetResponse6.java","src/main/java/type/union/models/GetResponse7.java","src/main/java/type/union/models/GetResponse8.java","src/main/java/type/union/models/GetResponse9.java","src/main/java/type/union/models/GetResponseProp.java","src/main/java/type/union/models/GetResponseProp1.java","src/main/java/type/union/models/GetResponseProp2.java","src/main/java/type/union/models/GetResponseProp3.java","src/main/java/type/union/models/MixedLiteralsCases.java","src/main/java/type/union/models/MixedTypesCases.java","src/main/java/type/union/models/StringAndArrayCases.java","src/main/java/type/union/models/StringExtensibleNamedUnion.java","src/main/java/type/union/models/package-info.java","src/main/java/type/union/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"type.union.EnumsOnlyAsyncClient":"Type.Union.EnumsOnly","type.union.EnumsOnlyAsyncClient.get":"Type.Union.EnumsOnly.get","type.union.EnumsOnlyAsyncClient.getWithResponse":"Type.Union.EnumsOnly.get","type.union.EnumsOnlyAsyncClient.send":"Type.Union.EnumsOnly.send","type.union.EnumsOnlyAsyncClient.sendWithResponse":"Type.Union.EnumsOnly.send","type.union.EnumsOnlyClient":"Type.Union.EnumsOnly","type.union.EnumsOnlyClient.get":"Type.Union.EnumsOnly.get","type.union.EnumsOnlyClient.getWithResponse":"Type.Union.EnumsOnly.get","type.union.EnumsOnlyClient.send":"Type.Union.EnumsOnly.send","type.union.EnumsOnlyClient.sendWithResponse":"Type.Union.EnumsOnly.send","type.union.FloatsOnlyAsyncClient":"Type.Union.FloatsOnly","type.union.FloatsOnlyAsyncClient.get":"Type.Union.FloatsOnly.get","type.union.FloatsOnlyAsyncClient.getWithResponse":"Type.Union.FloatsOnly.get","type.union.FloatsOnlyAsyncClient.send":"Type.Union.FloatsOnly.send","type.union.FloatsOnlyAsyncClient.sendWithResponse":"Type.Union.FloatsOnly.send","type.union.FloatsOnlyClient":"Type.Union.FloatsOnly","type.union.FloatsOnlyClient.get":"Type.Union.FloatsOnly.get","type.union.FloatsOnlyClient.getWithResponse":"Type.Union.FloatsOnly.get","type.union.FloatsOnlyClient.send":"Type.Union.FloatsOnly.send","type.union.FloatsOnlyClient.sendWithResponse":"Type.Union.FloatsOnly.send","type.union.IntsOnlyAsyncClient":"Type.Union.IntsOnly","type.union.IntsOnlyAsyncClient.get":"Type.Union.IntsOnly.get","type.union.IntsOnlyAsyncClient.getWithResponse":"Type.Union.IntsOnly.get","type.union.IntsOnlyAsyncClient.send":"Type.Union.IntsOnly.send","type.union.IntsOnlyAsyncClient.sendWithResponse":"Type.Union.IntsOnly.send","type.union.IntsOnlyClient":"Type.Union.IntsOnly","type.union.IntsOnlyClient.get":"Type.Union.IntsOnly.get","type.union.IntsOnlyClient.getWithResponse":"Type.Union.IntsOnly.get","type.union.IntsOnlyClient.send":"Type.Union.IntsOnly.send","type.union.IntsOnlyClient.sendWithResponse":"Type.Union.IntsOnly.send","type.union.MixedLiteralsAsyncClient":"Type.Union.MixedLiterals","type.union.MixedLiteralsAsyncClient.get":"Type.Union.MixedLiterals.get","type.union.MixedLiteralsAsyncClient.getWithResponse":"Type.Union.MixedLiterals.get","type.union.MixedLiteralsAsyncClient.send":"Type.Union.MixedLiterals.send","type.union.MixedLiteralsAsyncClient.sendWithResponse":"Type.Union.MixedLiterals.send","type.union.MixedLiteralsClient":"Type.Union.MixedLiterals","type.union.MixedLiteralsClient.get":"Type.Union.MixedLiterals.get","type.union.MixedLiteralsClient.getWithResponse":"Type.Union.MixedLiterals.get","type.union.MixedLiteralsClient.send":"Type.Union.MixedLiterals.send","type.union.MixedLiteralsClient.sendWithResponse":"Type.Union.MixedLiterals.send","type.union.MixedTypesAsyncClient":"Type.Union.MixedTypes","type.union.MixedTypesAsyncClient.get":"Type.Union.MixedTypes.get","type.union.MixedTypesAsyncClient.getWithResponse":"Type.Union.MixedTypes.get","type.union.MixedTypesAsyncClient.send":"Type.Union.MixedTypes.send","type.union.MixedTypesAsyncClient.sendWithResponse":"Type.Union.MixedTypes.send","type.union.MixedTypesClient":"Type.Union.MixedTypes","type.union.MixedTypesClient.get":"Type.Union.MixedTypes.get","type.union.MixedTypesClient.getWithResponse":"Type.Union.MixedTypes.get","type.union.MixedTypesClient.send":"Type.Union.MixedTypes.send","type.union.MixedTypesClient.sendWithResponse":"Type.Union.MixedTypes.send","type.union.ModelsOnlyAsyncClient":"Type.Union.ModelsOnly","type.union.ModelsOnlyAsyncClient.get":"Type.Union.ModelsOnly.get","type.union.ModelsOnlyAsyncClient.getWithResponse":"Type.Union.ModelsOnly.get","type.union.ModelsOnlyAsyncClient.send":"Type.Union.ModelsOnly.send","type.union.ModelsOnlyAsyncClient.sendWithResponse":"Type.Union.ModelsOnly.send","type.union.ModelsOnlyClient":"Type.Union.ModelsOnly","type.union.ModelsOnlyClient.get":"Type.Union.ModelsOnly.get","type.union.ModelsOnlyClient.getWithResponse":"Type.Union.ModelsOnly.get","type.union.ModelsOnlyClient.send":"Type.Union.ModelsOnly.send","type.union.ModelsOnlyClient.sendWithResponse":"Type.Union.ModelsOnly.send","type.union.StringAndArrayAsyncClient":"Type.Union.StringAndArray","type.union.StringAndArrayAsyncClient.get":"Type.Union.StringAndArray.get","type.union.StringAndArrayAsyncClient.getWithResponse":"Type.Union.StringAndArray.get","type.union.StringAndArrayAsyncClient.send":"Type.Union.StringAndArray.send","type.union.StringAndArrayAsyncClient.sendWithResponse":"Type.Union.StringAndArray.send","type.union.StringAndArrayClient":"Type.Union.StringAndArray","type.union.StringAndArrayClient.get":"Type.Union.StringAndArray.get","type.union.StringAndArrayClient.getWithResponse":"Type.Union.StringAndArray.get","type.union.StringAndArrayClient.send":"Type.Union.StringAndArray.send","type.union.StringAndArrayClient.sendWithResponse":"Type.Union.StringAndArray.send","type.union.StringExtensibleAsyncClient":"Type.Union.StringExtensible","type.union.StringExtensibleAsyncClient.get":"Type.Union.StringExtensible.get","type.union.StringExtensibleAsyncClient.getWithResponse":"Type.Union.StringExtensible.get","type.union.StringExtensibleAsyncClient.send":"Type.Union.StringExtensible.send","type.union.StringExtensibleAsyncClient.sendWithResponse":"Type.Union.StringExtensible.send","type.union.StringExtensibleClient":"Type.Union.StringExtensible","type.union.StringExtensibleClient.get":"Type.Union.StringExtensible.get","type.union.StringExtensibleClient.getWithResponse":"Type.Union.StringExtensible.get","type.union.StringExtensibleClient.send":"Type.Union.StringExtensible.send","type.union.StringExtensibleClient.sendWithResponse":"Type.Union.StringExtensible.send","type.union.StringExtensibleNamedAsyncClient":"Type.Union.StringExtensibleNamed","type.union.StringExtensibleNamedAsyncClient.get":"Type.Union.StringExtensibleNamed.get","type.union.StringExtensibleNamedAsyncClient.getWithResponse":"Type.Union.StringExtensibleNamed.get","type.union.StringExtensibleNamedAsyncClient.send":"Type.Union.StringExtensibleNamed.send","type.union.StringExtensibleNamedAsyncClient.sendWithResponse":"Type.Union.StringExtensibleNamed.send","type.union.StringExtensibleNamedClient":"Type.Union.StringExtensibleNamed","type.union.StringExtensibleNamedClient.get":"Type.Union.StringExtensibleNamed.get","type.union.StringExtensibleNamedClient.getWithResponse":"Type.Union.StringExtensibleNamed.get","type.union.StringExtensibleNamedClient.send":"Type.Union.StringExtensibleNamed.send","type.union.StringExtensibleNamedClient.sendWithResponse":"Type.Union.StringExtensibleNamed.send","type.union.StringsOnlyAsyncClient":"Type.Union.StringsOnly","type.union.StringsOnlyAsyncClient.get":"Type.Union.StringsOnly.get","type.union.StringsOnlyAsyncClient.getWithResponse":"Type.Union.StringsOnly.get","type.union.StringsOnlyAsyncClient.send":"Type.Union.StringsOnly.send","type.union.StringsOnlyAsyncClient.sendWithResponse":"Type.Union.StringsOnly.send","type.union.StringsOnlyClient":"Type.Union.StringsOnly","type.union.StringsOnlyClient.get":"Type.Union.StringsOnly.get","type.union.StringsOnlyClient.getWithResponse":"Type.Union.StringsOnly.get","type.union.StringsOnlyClient.send":"Type.Union.StringsOnly.send","type.union.StringsOnlyClient.sendWithResponse":"Type.Union.StringsOnly.send","type.union.UnionClientBuilder":"Type.Union","type.union.implementation.models.SendRequest":"Type.Union.send.Request.anonymous","type.union.implementation.models.SendRequest1":"Type.Union.send.Request.anonymous","type.union.implementation.models.SendRequest2":"Type.Union.send.Request.anonymous","type.union.implementation.models.SendRequest3":"Type.Union.send.Request.anonymous","type.union.implementation.models.SendRequest4":"Type.Union.send.Request.anonymous","type.union.implementation.models.SendRequest5":"Type.Union.send.Request.anonymous","type.union.implementation.models.SendRequest6":"Type.Union.send.Request.anonymous","type.union.implementation.models.SendRequest7":"Type.Union.send.Request.anonymous","type.union.implementation.models.SendRequest8":"Type.Union.send.Request.anonymous","type.union.implementation.models.SendRequest9":"Type.Union.send.Request.anonymous","type.union.models.Cat":"Type.Union.Cat","type.union.models.Dog":"Type.Union.Dog","type.union.models.EnumsOnlyCases":"Type.Union.EnumsOnlyCases","type.union.models.EnumsOnlyCasesLr":"Type.Union.EnumsOnlyCases.lr.anonymous","type.union.models.EnumsOnlyCasesUd":"Type.Union.EnumsOnlyCases.ud.anonymous","type.union.models.GetResponse":"Type.Union.get.Response.anonymous","type.union.models.GetResponse1":"Type.Union.get.Response.anonymous","type.union.models.GetResponse2":"Type.Union.get.Response.anonymous","type.union.models.GetResponse3":"Type.Union.get.Response.anonymous","type.union.models.GetResponse4":"Type.Union.get.Response.anonymous","type.union.models.GetResponse5":"Type.Union.get.Response.anonymous","type.union.models.GetResponse6":"Type.Union.get.Response.anonymous","type.union.models.GetResponse7":"Type.Union.get.Response.anonymous","type.union.models.GetResponse8":"Type.Union.get.Response.anonymous","type.union.models.GetResponse9":"Type.Union.get.Response.anonymous","type.union.models.GetResponseProp":"Type.Union.get.Response.prop.anonymous","type.union.models.GetResponseProp1":"Type.Union.get.Response.prop.anonymous","type.union.models.GetResponseProp2":"Type.Union.get.Response.prop.anonymous","type.union.models.GetResponseProp3":"Type.Union.get.Response.prop.anonymous","type.union.models.MixedLiteralsCases":"Type.Union.MixedLiteralsCases","type.union.models.MixedTypesCases":"Type.Union.MixedTypesCases","type.union.models.StringAndArrayCases":"Type.Union.StringAndArrayCases","type.union.models.StringExtensibleNamedUnion":"Type.Union.StringExtensibleNamedUnion"},"generatedFiles":["src/main/java/module-info.java","src/main/java/type/union/EnumsOnlyAsyncClient.java","src/main/java/type/union/EnumsOnlyClient.java","src/main/java/type/union/FloatsOnlyAsyncClient.java","src/main/java/type/union/FloatsOnlyClient.java","src/main/java/type/union/IntsOnlyAsyncClient.java","src/main/java/type/union/IntsOnlyClient.java","src/main/java/type/union/MixedLiteralsAsyncClient.java","src/main/java/type/union/MixedLiteralsClient.java","src/main/java/type/union/MixedTypesAsyncClient.java","src/main/java/type/union/MixedTypesClient.java","src/main/java/type/union/ModelsOnlyAsyncClient.java","src/main/java/type/union/ModelsOnlyClient.java","src/main/java/type/union/StringAndArrayAsyncClient.java","src/main/java/type/union/StringAndArrayClient.java","src/main/java/type/union/StringExtensibleAsyncClient.java","src/main/java/type/union/StringExtensibleClient.java","src/main/java/type/union/StringExtensibleNamedAsyncClient.java","src/main/java/type/union/StringExtensibleNamedClient.java","src/main/java/type/union/StringsOnlyAsyncClient.java","src/main/java/type/union/StringsOnlyClient.java","src/main/java/type/union/UnionClientBuilder.java","src/main/java/type/union/implementation/EnumsOnliesImpl.java","src/main/java/type/union/implementation/FloatsOnliesImpl.java","src/main/java/type/union/implementation/IntsOnliesImpl.java","src/main/java/type/union/implementation/MixedLiteralsImpl.java","src/main/java/type/union/implementation/MixedTypesImpl.java","src/main/java/type/union/implementation/ModelsOnliesImpl.java","src/main/java/type/union/implementation/StringAndArraysImpl.java","src/main/java/type/union/implementation/StringExtensibleNamedsImpl.java","src/main/java/type/union/implementation/StringExtensiblesImpl.java","src/main/java/type/union/implementation/StringsOnliesImpl.java","src/main/java/type/union/implementation/UnionClientImpl.java","src/main/java/type/union/implementation/models/SendRequest.java","src/main/java/type/union/implementation/models/SendRequest1.java","src/main/java/type/union/implementation/models/SendRequest2.java","src/main/java/type/union/implementation/models/SendRequest3.java","src/main/java/type/union/implementation/models/SendRequest4.java","src/main/java/type/union/implementation/models/SendRequest5.java","src/main/java/type/union/implementation/models/SendRequest6.java","src/main/java/type/union/implementation/models/SendRequest7.java","src/main/java/type/union/implementation/models/SendRequest8.java","src/main/java/type/union/implementation/models/SendRequest9.java","src/main/java/type/union/implementation/models/package-info.java","src/main/java/type/union/implementation/package-info.java","src/main/java/type/union/models/Cat.java","src/main/java/type/union/models/Dog.java","src/main/java/type/union/models/EnumsOnlyCases.java","src/main/java/type/union/models/EnumsOnlyCasesLr.java","src/main/java/type/union/models/EnumsOnlyCasesUd.java","src/main/java/type/union/models/GetResponse.java","src/main/java/type/union/models/GetResponse1.java","src/main/java/type/union/models/GetResponse2.java","src/main/java/type/union/models/GetResponse3.java","src/main/java/type/union/models/GetResponse4.java","src/main/java/type/union/models/GetResponse5.java","src/main/java/type/union/models/GetResponse6.java","src/main/java/type/union/models/GetResponse7.java","src/main/java/type/union/models/GetResponse8.java","src/main/java/type/union/models/GetResponse9.java","src/main/java/type/union/models/GetResponseProp.java","src/main/java/type/union/models/GetResponseProp1.java","src/main/java/type/union/models/GetResponseProp2.java","src/main/java/type/union/models/GetResponseProp3.java","src/main/java/type/union/models/MixedLiteralsCases.java","src/main/java/type/union/models/MixedTypesCases.java","src/main/java/type/union/models/StringAndArrayCases.java","src/main/java/type/union/models/StringExtensibleNamedUnion.java","src/main/java/type/union/models/package-info.java","src/main/java/type/union/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-added_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-added_apiview_properties.json deleted file mode 100644 index c8dde1279f5..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-added_apiview_properties.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "versioning.added.AddedAsyncClient": "Versioning.Added", - "versioning.added.AddedAsyncClient.v1": "Versioning.Added.v1", - "versioning.added.AddedAsyncClient.v1WithResponse": "Versioning.Added.v1", - "versioning.added.AddedAsyncClient.v2": "Versioning.Added.v2", - "versioning.added.AddedAsyncClient.v2WithResponse": "Versioning.Added.v2", - "versioning.added.AddedClient": "Versioning.Added", - "versioning.added.AddedClient.v1": "Versioning.Added.v1", - "versioning.added.AddedClient.v1WithResponse": "Versioning.Added.v1", - "versioning.added.AddedClient.v2": "Versioning.Added.v2", - "versioning.added.AddedClient.v2WithResponse": "Versioning.Added.v2", - "versioning.added.AddedClientBuilder": "Versioning.Added", - "versioning.added.InterfaceV2AsyncClient": "Versioning.Added.InterfaceV2", - "versioning.added.InterfaceV2AsyncClient.v2InInterface": "Versioning.Added.InterfaceV2.v2InInterface", - "versioning.added.InterfaceV2AsyncClient.v2InInterfaceWithResponse": "Versioning.Added.InterfaceV2.v2InInterface", - "versioning.added.InterfaceV2Client": "Versioning.Added.InterfaceV2", - "versioning.added.InterfaceV2Client.v2InInterface": "Versioning.Added.InterfaceV2.v2InInterface", - "versioning.added.InterfaceV2Client.v2InInterfaceWithResponse": "Versioning.Added.InterfaceV2.v2InInterface", - "versioning.added.models.EnumV1": "Versioning.Added.EnumV1", - "versioning.added.models.EnumV2": "Versioning.Added.EnumV2", - "versioning.added.models.ModelV1": "Versioning.Added.ModelV1", - "versioning.added.models.ModelV2": "Versioning.Added.ModelV2" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-added_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-added_metadata.json index 4a0f5f82c05..ba26f811185 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-added_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-added_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"v2","crossLanguageDefinitions":{"versioning.added.AddedAsyncClient":"Versioning.Added","versioning.added.AddedAsyncClient.v1":"Versioning.Added.v1","versioning.added.AddedAsyncClient.v1WithResponse":"Versioning.Added.v1","versioning.added.AddedAsyncClient.v2":"Versioning.Added.v2","versioning.added.AddedAsyncClient.v2WithResponse":"Versioning.Added.v2","versioning.added.AddedClient":"Versioning.Added","versioning.added.AddedClient.v1":"Versioning.Added.v1","versioning.added.AddedClient.v1WithResponse":"Versioning.Added.v1","versioning.added.AddedClient.v2":"Versioning.Added.v2","versioning.added.AddedClient.v2WithResponse":"Versioning.Added.v2","versioning.added.AddedClientBuilder":"Versioning.Added","versioning.added.InterfaceV2AsyncClient":"Versioning.Added.InterfaceV2","versioning.added.InterfaceV2AsyncClient.v2InInterface":"Versioning.Added.InterfaceV2.v2InInterface","versioning.added.InterfaceV2AsyncClient.v2InInterfaceWithResponse":"Versioning.Added.InterfaceV2.v2InInterface","versioning.added.InterfaceV2Client":"Versioning.Added.InterfaceV2","versioning.added.InterfaceV2Client.v2InInterface":"Versioning.Added.InterfaceV2.v2InInterface","versioning.added.InterfaceV2Client.v2InInterfaceWithResponse":"Versioning.Added.InterfaceV2.v2InInterface","versioning.added.models.EnumV1":"Versioning.Added.EnumV1","versioning.added.models.EnumV2":"Versioning.Added.EnumV2","versioning.added.models.ModelV1":"Versioning.Added.ModelV1","versioning.added.models.ModelV2":"Versioning.Added.ModelV2"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/added/AddedAsyncClient.java","src/main/java/versioning/added/AddedClient.java","src/main/java/versioning/added/AddedClientBuilder.java","src/main/java/versioning/added/AddedServiceVersion.java","src/main/java/versioning/added/InterfaceV2AsyncClient.java","src/main/java/versioning/added/InterfaceV2Client.java","src/main/java/versioning/added/implementation/AddedClientImpl.java","src/main/java/versioning/added/implementation/InterfaceV2sImpl.java","src/main/java/versioning/added/implementation/package-info.java","src/main/java/versioning/added/models/EnumV1.java","src/main/java/versioning/added/models/EnumV2.java","src/main/java/versioning/added/models/ModelV1.java","src/main/java/versioning/added/models/ModelV2.java","src/main/java/versioning/added/models/package-info.java","src/main/java/versioning/added/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Versioning.Added":"v2"},"crossLanguageDefinitions":{"versioning.added.AddedAsyncClient":"Versioning.Added","versioning.added.AddedAsyncClient.v1":"Versioning.Added.v1","versioning.added.AddedAsyncClient.v1WithResponse":"Versioning.Added.v1","versioning.added.AddedAsyncClient.v2":"Versioning.Added.v2","versioning.added.AddedAsyncClient.v2WithResponse":"Versioning.Added.v2","versioning.added.AddedClient":"Versioning.Added","versioning.added.AddedClient.v1":"Versioning.Added.v1","versioning.added.AddedClient.v1WithResponse":"Versioning.Added.v1","versioning.added.AddedClient.v2":"Versioning.Added.v2","versioning.added.AddedClient.v2WithResponse":"Versioning.Added.v2","versioning.added.AddedClientBuilder":"Versioning.Added","versioning.added.InterfaceV2AsyncClient":"Versioning.Added.InterfaceV2","versioning.added.InterfaceV2AsyncClient.v2InInterface":"Versioning.Added.InterfaceV2.v2InInterface","versioning.added.InterfaceV2AsyncClient.v2InInterfaceWithResponse":"Versioning.Added.InterfaceV2.v2InInterface","versioning.added.InterfaceV2Client":"Versioning.Added.InterfaceV2","versioning.added.InterfaceV2Client.v2InInterface":"Versioning.Added.InterfaceV2.v2InInterface","versioning.added.InterfaceV2Client.v2InInterfaceWithResponse":"Versioning.Added.InterfaceV2.v2InInterface","versioning.added.models.EnumV1":"Versioning.Added.EnumV1","versioning.added.models.EnumV2":"Versioning.Added.EnumV2","versioning.added.models.ModelV1":"Versioning.Added.ModelV1","versioning.added.models.ModelV2":"Versioning.Added.ModelV2"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/added/AddedAsyncClient.java","src/main/java/versioning/added/AddedClient.java","src/main/java/versioning/added/AddedClientBuilder.java","src/main/java/versioning/added/AddedServiceVersion.java","src/main/java/versioning/added/InterfaceV2AsyncClient.java","src/main/java/versioning/added/InterfaceV2Client.java","src/main/java/versioning/added/implementation/AddedClientImpl.java","src/main/java/versioning/added/implementation/InterfaceV2sImpl.java","src/main/java/versioning/added/implementation/package-info.java","src/main/java/versioning/added/models/EnumV1.java","src/main/java/versioning/added/models/EnumV2.java","src/main/java/versioning/added/models/ModelV1.java","src/main/java/versioning/added/models/ModelV2.java","src/main/java/versioning/added/models/package-info.java","src/main/java/versioning/added/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-madeoptional_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-madeoptional_apiview_properties.json deleted file mode 100644 index 81a95b261fd..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-madeoptional_apiview_properties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "versioning.madeoptional.MadeOptionalAsyncClient": "Versioning.MadeOptional", - "versioning.madeoptional.MadeOptionalAsyncClient.test": "Versioning.MadeOptional.test", - "versioning.madeoptional.MadeOptionalAsyncClient.testWithResponse": "Versioning.MadeOptional.test", - "versioning.madeoptional.MadeOptionalClient": "Versioning.MadeOptional", - "versioning.madeoptional.MadeOptionalClient.test": "Versioning.MadeOptional.test", - "versioning.madeoptional.MadeOptionalClient.testWithResponse": "Versioning.MadeOptional.test", - "versioning.madeoptional.MadeOptionalClientBuilder": "Versioning.MadeOptional", - "versioning.madeoptional.models.TestModel": "Versioning.MadeOptional.TestModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-madeoptional_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-madeoptional_metadata.json index ccebfd95958..4f605b83b86 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-madeoptional_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-madeoptional_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"v2","crossLanguageDefinitions":{"versioning.madeoptional.MadeOptionalAsyncClient":"Versioning.MadeOptional","versioning.madeoptional.MadeOptionalAsyncClient.test":"Versioning.MadeOptional.test","versioning.madeoptional.MadeOptionalAsyncClient.testWithResponse":"Versioning.MadeOptional.test","versioning.madeoptional.MadeOptionalClient":"Versioning.MadeOptional","versioning.madeoptional.MadeOptionalClient.test":"Versioning.MadeOptional.test","versioning.madeoptional.MadeOptionalClient.testWithResponse":"Versioning.MadeOptional.test","versioning.madeoptional.MadeOptionalClientBuilder":"Versioning.MadeOptional","versioning.madeoptional.models.TestModel":"Versioning.MadeOptional.TestModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/madeoptional/MadeOptionalAsyncClient.java","src/main/java/versioning/madeoptional/MadeOptionalClient.java","src/main/java/versioning/madeoptional/MadeOptionalClientBuilder.java","src/main/java/versioning/madeoptional/MadeOptionalServiceVersion.java","src/main/java/versioning/madeoptional/implementation/MadeOptionalClientImpl.java","src/main/java/versioning/madeoptional/implementation/package-info.java","src/main/java/versioning/madeoptional/models/TestModel.java","src/main/java/versioning/madeoptional/models/package-info.java","src/main/java/versioning/madeoptional/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Versioning.MadeOptional":"v2"},"crossLanguageDefinitions":{"versioning.madeoptional.MadeOptionalAsyncClient":"Versioning.MadeOptional","versioning.madeoptional.MadeOptionalAsyncClient.test":"Versioning.MadeOptional.test","versioning.madeoptional.MadeOptionalAsyncClient.testWithResponse":"Versioning.MadeOptional.test","versioning.madeoptional.MadeOptionalClient":"Versioning.MadeOptional","versioning.madeoptional.MadeOptionalClient.test":"Versioning.MadeOptional.test","versioning.madeoptional.MadeOptionalClient.testWithResponse":"Versioning.MadeOptional.test","versioning.madeoptional.MadeOptionalClientBuilder":"Versioning.MadeOptional","versioning.madeoptional.models.TestModel":"Versioning.MadeOptional.TestModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/madeoptional/MadeOptionalAsyncClient.java","src/main/java/versioning/madeoptional/MadeOptionalClient.java","src/main/java/versioning/madeoptional/MadeOptionalClientBuilder.java","src/main/java/versioning/madeoptional/MadeOptionalServiceVersion.java","src/main/java/versioning/madeoptional/implementation/MadeOptionalClientImpl.java","src/main/java/versioning/madeoptional/implementation/package-info.java","src/main/java/versioning/madeoptional/models/TestModel.java","src/main/java/versioning/madeoptional/models/package-info.java","src/main/java/versioning/madeoptional/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json deleted file mode 100644 index 8bff65100c9..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "versioning.removed.RemovedAsyncClient": "Versioning.Removed", - "versioning.removed.RemovedAsyncClient.modelV3": "Versioning.Removed.modelV3", - "versioning.removed.RemovedAsyncClient.modelV3WithResponse": "Versioning.Removed.modelV3", - "versioning.removed.RemovedAsyncClient.v2": "Versioning.Removed.v2", - "versioning.removed.RemovedAsyncClient.v2WithResponse": "Versioning.Removed.v2", - "versioning.removed.RemovedClient": "Versioning.Removed", - "versioning.removed.RemovedClient.modelV3": "Versioning.Removed.modelV3", - "versioning.removed.RemovedClient.modelV3WithResponse": "Versioning.Removed.modelV3", - "versioning.removed.RemovedClient.v2": "Versioning.Removed.v2", - "versioning.removed.RemovedClient.v2WithResponse": "Versioning.Removed.v2", - "versioning.removed.RemovedClientBuilder": "Versioning.Removed", - "versioning.removed.models.EnumV2": "Versioning.Removed.EnumV2", - "versioning.removed.models.EnumV3": "Versioning.Removed.EnumV3", - "versioning.removed.models.ModelV2": "Versioning.Removed.ModelV2", - "versioning.removed.models.ModelV3": "Versioning.Removed.ModelV3" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_metadata.json index 3cbb6843d41..5805f989cfe 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"v2","crossLanguageDefinitions":{"versioning.removed.RemovedAsyncClient":"Versioning.Removed","versioning.removed.RemovedAsyncClient.modelV3":"Versioning.Removed.modelV3","versioning.removed.RemovedAsyncClient.modelV3WithResponse":"Versioning.Removed.modelV3","versioning.removed.RemovedAsyncClient.v2":"Versioning.Removed.v2","versioning.removed.RemovedAsyncClient.v2WithResponse":"Versioning.Removed.v2","versioning.removed.RemovedClient":"Versioning.Removed","versioning.removed.RemovedClient.modelV3":"Versioning.Removed.modelV3","versioning.removed.RemovedClient.modelV3WithResponse":"Versioning.Removed.modelV3","versioning.removed.RemovedClient.v2":"Versioning.Removed.v2","versioning.removed.RemovedClient.v2WithResponse":"Versioning.Removed.v2","versioning.removed.RemovedClientBuilder":"Versioning.Removed","versioning.removed.models.EnumV2":"Versioning.Removed.EnumV2","versioning.removed.models.EnumV3":"Versioning.Removed.EnumV3","versioning.removed.models.ModelV2":"Versioning.Removed.ModelV2","versioning.removed.models.ModelV3":"Versioning.Removed.ModelV3"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/removed/RemovedAsyncClient.java","src/main/java/versioning/removed/RemovedClient.java","src/main/java/versioning/removed/RemovedClientBuilder.java","src/main/java/versioning/removed/RemovedServiceVersion.java","src/main/java/versioning/removed/implementation/RemovedClientImpl.java","src/main/java/versioning/removed/implementation/package-info.java","src/main/java/versioning/removed/models/EnumV2.java","src/main/java/versioning/removed/models/EnumV3.java","src/main/java/versioning/removed/models/ModelV2.java","src/main/java/versioning/removed/models/ModelV3.java","src/main/java/versioning/removed/models/package-info.java","src/main/java/versioning/removed/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Versioning.Removed":"v2"},"crossLanguageDefinitions":{"versioning.removed.RemovedAsyncClient":"Versioning.Removed","versioning.removed.RemovedAsyncClient.modelV3":"Versioning.Removed.modelV3","versioning.removed.RemovedAsyncClient.modelV3WithResponse":"Versioning.Removed.modelV3","versioning.removed.RemovedAsyncClient.v2":"Versioning.Removed.v2","versioning.removed.RemovedAsyncClient.v2WithResponse":"Versioning.Removed.v2","versioning.removed.RemovedClient":"Versioning.Removed","versioning.removed.RemovedClient.modelV3":"Versioning.Removed.modelV3","versioning.removed.RemovedClient.modelV3WithResponse":"Versioning.Removed.modelV3","versioning.removed.RemovedClient.v2":"Versioning.Removed.v2","versioning.removed.RemovedClient.v2WithResponse":"Versioning.Removed.v2","versioning.removed.RemovedClientBuilder":"Versioning.Removed","versioning.removed.models.EnumV2":"Versioning.Removed.EnumV2","versioning.removed.models.EnumV3":"Versioning.Removed.EnumV3","versioning.removed.models.ModelV2":"Versioning.Removed.ModelV2","versioning.removed.models.ModelV3":"Versioning.Removed.ModelV3"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/removed/RemovedAsyncClient.java","src/main/java/versioning/removed/RemovedClient.java","src/main/java/versioning/removed/RemovedClientBuilder.java","src/main/java/versioning/removed/RemovedServiceVersion.java","src/main/java/versioning/removed/implementation/RemovedClientImpl.java","src/main/java/versioning/removed/implementation/package-info.java","src/main/java/versioning/removed/models/EnumV2.java","src/main/java/versioning/removed/models/EnumV3.java","src/main/java/versioning/removed/models/ModelV2.java","src/main/java/versioning/removed/models/ModelV3.java","src/main/java/versioning/removed/models/package-info.java","src/main/java/versioning/removed/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-renamedfrom_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-renamedfrom_apiview_properties.json deleted file mode 100644 index 700b2cc4909..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-renamedfrom_apiview_properties.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "versioning.renamedfrom.NewInterfaceAsyncClient": "Versioning.RenamedFrom.NewInterface", - "versioning.renamedfrom.NewInterfaceAsyncClient.newOpInNewInterface": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface", - "versioning.renamedfrom.NewInterfaceAsyncClient.newOpInNewInterfaceWithResponse": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface", - "versioning.renamedfrom.NewInterfaceClient": "Versioning.RenamedFrom.NewInterface", - "versioning.renamedfrom.NewInterfaceClient.newOpInNewInterface": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface", - "versioning.renamedfrom.NewInterfaceClient.newOpInNewInterfaceWithResponse": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface", - "versioning.renamedfrom.RenamedFromAsyncClient": "Versioning.RenamedFrom", - "versioning.renamedfrom.RenamedFromAsyncClient.newOp": "Versioning.RenamedFrom.newOp", - "versioning.renamedfrom.RenamedFromAsyncClient.newOpWithResponse": "Versioning.RenamedFrom.newOp", - "versioning.renamedfrom.RenamedFromClient": "Versioning.RenamedFrom", - "versioning.renamedfrom.RenamedFromClient.newOp": "Versioning.RenamedFrom.newOp", - "versioning.renamedfrom.RenamedFromClient.newOpWithResponse": "Versioning.RenamedFrom.newOp", - "versioning.renamedfrom.RenamedFromClientBuilder": "Versioning.RenamedFrom", - "versioning.renamedfrom.models.NewEnum": "Versioning.RenamedFrom.NewEnum", - "versioning.renamedfrom.models.NewModel": "Versioning.RenamedFrom.NewModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-renamedfrom_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-renamedfrom_metadata.json index 4259526620d..9c267b5117e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-renamedfrom_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-renamedfrom_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"v2","crossLanguageDefinitions":{"versioning.renamedfrom.NewInterfaceAsyncClient":"Versioning.RenamedFrom.NewInterface","versioning.renamedfrom.NewInterfaceAsyncClient.newOpInNewInterface":"Versioning.RenamedFrom.NewInterface.newOpInNewInterface","versioning.renamedfrom.NewInterfaceAsyncClient.newOpInNewInterfaceWithResponse":"Versioning.RenamedFrom.NewInterface.newOpInNewInterface","versioning.renamedfrom.NewInterfaceClient":"Versioning.RenamedFrom.NewInterface","versioning.renamedfrom.NewInterfaceClient.newOpInNewInterface":"Versioning.RenamedFrom.NewInterface.newOpInNewInterface","versioning.renamedfrom.NewInterfaceClient.newOpInNewInterfaceWithResponse":"Versioning.RenamedFrom.NewInterface.newOpInNewInterface","versioning.renamedfrom.RenamedFromAsyncClient":"Versioning.RenamedFrom","versioning.renamedfrom.RenamedFromAsyncClient.newOp":"Versioning.RenamedFrom.newOp","versioning.renamedfrom.RenamedFromAsyncClient.newOpWithResponse":"Versioning.RenamedFrom.newOp","versioning.renamedfrom.RenamedFromClient":"Versioning.RenamedFrom","versioning.renamedfrom.RenamedFromClient.newOp":"Versioning.RenamedFrom.newOp","versioning.renamedfrom.RenamedFromClient.newOpWithResponse":"Versioning.RenamedFrom.newOp","versioning.renamedfrom.RenamedFromClientBuilder":"Versioning.RenamedFrom","versioning.renamedfrom.models.NewEnum":"Versioning.RenamedFrom.NewEnum","versioning.renamedfrom.models.NewModel":"Versioning.RenamedFrom.NewModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/renamedfrom/NewInterfaceAsyncClient.java","src/main/java/versioning/renamedfrom/NewInterfaceClient.java","src/main/java/versioning/renamedfrom/RenamedFromAsyncClient.java","src/main/java/versioning/renamedfrom/RenamedFromClient.java","src/main/java/versioning/renamedfrom/RenamedFromClientBuilder.java","src/main/java/versioning/renamedfrom/RenamedFromServiceVersion.java","src/main/java/versioning/renamedfrom/implementation/NewInterfacesImpl.java","src/main/java/versioning/renamedfrom/implementation/RenamedFromClientImpl.java","src/main/java/versioning/renamedfrom/implementation/package-info.java","src/main/java/versioning/renamedfrom/models/NewEnum.java","src/main/java/versioning/renamedfrom/models/NewModel.java","src/main/java/versioning/renamedfrom/models/package-info.java","src/main/java/versioning/renamedfrom/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Versioning.RenamedFrom":"v2"},"crossLanguageDefinitions":{"versioning.renamedfrom.NewInterfaceAsyncClient":"Versioning.RenamedFrom.NewInterface","versioning.renamedfrom.NewInterfaceAsyncClient.newOpInNewInterface":"Versioning.RenamedFrom.NewInterface.newOpInNewInterface","versioning.renamedfrom.NewInterfaceAsyncClient.newOpInNewInterfaceWithResponse":"Versioning.RenamedFrom.NewInterface.newOpInNewInterface","versioning.renamedfrom.NewInterfaceClient":"Versioning.RenamedFrom.NewInterface","versioning.renamedfrom.NewInterfaceClient.newOpInNewInterface":"Versioning.RenamedFrom.NewInterface.newOpInNewInterface","versioning.renamedfrom.NewInterfaceClient.newOpInNewInterfaceWithResponse":"Versioning.RenamedFrom.NewInterface.newOpInNewInterface","versioning.renamedfrom.RenamedFromAsyncClient":"Versioning.RenamedFrom","versioning.renamedfrom.RenamedFromAsyncClient.newOp":"Versioning.RenamedFrom.newOp","versioning.renamedfrom.RenamedFromAsyncClient.newOpWithResponse":"Versioning.RenamedFrom.newOp","versioning.renamedfrom.RenamedFromClient":"Versioning.RenamedFrom","versioning.renamedfrom.RenamedFromClient.newOp":"Versioning.RenamedFrom.newOp","versioning.renamedfrom.RenamedFromClient.newOpWithResponse":"Versioning.RenamedFrom.newOp","versioning.renamedfrom.RenamedFromClientBuilder":"Versioning.RenamedFrom","versioning.renamedfrom.models.NewEnum":"Versioning.RenamedFrom.NewEnum","versioning.renamedfrom.models.NewModel":"Versioning.RenamedFrom.NewModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/renamedfrom/NewInterfaceAsyncClient.java","src/main/java/versioning/renamedfrom/NewInterfaceClient.java","src/main/java/versioning/renamedfrom/RenamedFromAsyncClient.java","src/main/java/versioning/renamedfrom/RenamedFromClient.java","src/main/java/versioning/renamedfrom/RenamedFromClientBuilder.java","src/main/java/versioning/renamedfrom/RenamedFromServiceVersion.java","src/main/java/versioning/renamedfrom/implementation/NewInterfacesImpl.java","src/main/java/versioning/renamedfrom/implementation/RenamedFromClientImpl.java","src/main/java/versioning/renamedfrom/implementation/package-info.java","src/main/java/versioning/renamedfrom/models/NewEnum.java","src/main/java/versioning/renamedfrom/models/NewModel.java","src/main/java/versioning/renamedfrom/models/package-info.java","src/main/java/versioning/renamedfrom/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-returntypechangedfrom_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-returntypechangedfrom_apiview_properties.json deleted file mode 100644 index 991d9caa878..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-returntypechangedfrom_apiview_properties.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "versioning.returntypechangedfrom.ReturnTypeChangedFromAsyncClient": "Versioning.ReturnTypeChangedFrom", - "versioning.returntypechangedfrom.ReturnTypeChangedFromAsyncClient.test": "Versioning.ReturnTypeChangedFrom.test", - "versioning.returntypechangedfrom.ReturnTypeChangedFromAsyncClient.testWithResponse": "Versioning.ReturnTypeChangedFrom.test", - "versioning.returntypechangedfrom.ReturnTypeChangedFromClient": "Versioning.ReturnTypeChangedFrom", - "versioning.returntypechangedfrom.ReturnTypeChangedFromClient.test": "Versioning.ReturnTypeChangedFrom.test", - "versioning.returntypechangedfrom.ReturnTypeChangedFromClient.testWithResponse": "Versioning.ReturnTypeChangedFrom.test", - "versioning.returntypechangedfrom.ReturnTypeChangedFromClientBuilder": "Versioning.ReturnTypeChangedFrom" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-returntypechangedfrom_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-returntypechangedfrom_metadata.json index ee35c59516f..6fa1a286bd1 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-returntypechangedfrom_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-returntypechangedfrom_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"v2","crossLanguageDefinitions":{"versioning.returntypechangedfrom.ReturnTypeChangedFromAsyncClient":"Versioning.ReturnTypeChangedFrom","versioning.returntypechangedfrom.ReturnTypeChangedFromAsyncClient.test":"Versioning.ReturnTypeChangedFrom.test","versioning.returntypechangedfrom.ReturnTypeChangedFromAsyncClient.testWithResponse":"Versioning.ReturnTypeChangedFrom.test","versioning.returntypechangedfrom.ReturnTypeChangedFromClient":"Versioning.ReturnTypeChangedFrom","versioning.returntypechangedfrom.ReturnTypeChangedFromClient.test":"Versioning.ReturnTypeChangedFrom.test","versioning.returntypechangedfrom.ReturnTypeChangedFromClient.testWithResponse":"Versioning.ReturnTypeChangedFrom.test","versioning.returntypechangedfrom.ReturnTypeChangedFromClientBuilder":"Versioning.ReturnTypeChangedFrom"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromAsyncClient.java","src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClient.java","src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClientBuilder.java","src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromServiceVersion.java","src/main/java/versioning/returntypechangedfrom/implementation/ReturnTypeChangedFromClientImpl.java","src/main/java/versioning/returntypechangedfrom/implementation/package-info.java","src/main/java/versioning/returntypechangedfrom/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Versioning.ReturnTypeChangedFrom":"v2"},"crossLanguageDefinitions":{"versioning.returntypechangedfrom.ReturnTypeChangedFromAsyncClient":"Versioning.ReturnTypeChangedFrom","versioning.returntypechangedfrom.ReturnTypeChangedFromAsyncClient.test":"Versioning.ReturnTypeChangedFrom.test","versioning.returntypechangedfrom.ReturnTypeChangedFromAsyncClient.testWithResponse":"Versioning.ReturnTypeChangedFrom.test","versioning.returntypechangedfrom.ReturnTypeChangedFromClient":"Versioning.ReturnTypeChangedFrom","versioning.returntypechangedfrom.ReturnTypeChangedFromClient.test":"Versioning.ReturnTypeChangedFrom.test","versioning.returntypechangedfrom.ReturnTypeChangedFromClient.testWithResponse":"Versioning.ReturnTypeChangedFrom.test","versioning.returntypechangedfrom.ReturnTypeChangedFromClientBuilder":"Versioning.ReturnTypeChangedFrom"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromAsyncClient.java","src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClient.java","src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClientBuilder.java","src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromServiceVersion.java","src/main/java/versioning/returntypechangedfrom/implementation/ReturnTypeChangedFromClientImpl.java","src/main/java/versioning/returntypechangedfrom/implementation/package-info.java","src/main/java/versioning/returntypechangedfrom/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-typechangedfrom_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-typechangedfrom_apiview_properties.json deleted file mode 100644 index 0f0f6a1972a..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-typechangedfrom_apiview_properties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "flavor": "Azure", - "CrossLanguageDefinitionId": { - "versioning.typechangedfrom.TypeChangedFromAsyncClient": "Versioning.TypeChangedFrom", - "versioning.typechangedfrom.TypeChangedFromAsyncClient.test": "Versioning.TypeChangedFrom.test", - "versioning.typechangedfrom.TypeChangedFromAsyncClient.testWithResponse": "Versioning.TypeChangedFrom.test", - "versioning.typechangedfrom.TypeChangedFromClient": "Versioning.TypeChangedFrom", - "versioning.typechangedfrom.TypeChangedFromClient.test": "Versioning.TypeChangedFrom.test", - "versioning.typechangedfrom.TypeChangedFromClient.testWithResponse": "Versioning.TypeChangedFrom.test", - "versioning.typechangedfrom.TypeChangedFromClientBuilder": "Versioning.TypeChangedFrom", - "versioning.typechangedfrom.models.TestModel": "Versioning.TypeChangedFrom.TestModel" - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-typechangedfrom_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-typechangedfrom_metadata.json index 231b4596ca8..c61d11b0626 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-typechangedfrom_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-typechangedfrom_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersion":"v2","crossLanguageDefinitions":{"versioning.typechangedfrom.TypeChangedFromAsyncClient":"Versioning.TypeChangedFrom","versioning.typechangedfrom.TypeChangedFromAsyncClient.test":"Versioning.TypeChangedFrom.test","versioning.typechangedfrom.TypeChangedFromAsyncClient.testWithResponse":"Versioning.TypeChangedFrom.test","versioning.typechangedfrom.TypeChangedFromClient":"Versioning.TypeChangedFrom","versioning.typechangedfrom.TypeChangedFromClient.test":"Versioning.TypeChangedFrom.test","versioning.typechangedfrom.TypeChangedFromClient.testWithResponse":"Versioning.TypeChangedFrom.test","versioning.typechangedfrom.TypeChangedFromClientBuilder":"Versioning.TypeChangedFrom","versioning.typechangedfrom.models.TestModel":"Versioning.TypeChangedFrom.TestModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/typechangedfrom/TypeChangedFromAsyncClient.java","src/main/java/versioning/typechangedfrom/TypeChangedFromClient.java","src/main/java/versioning/typechangedfrom/TypeChangedFromClientBuilder.java","src/main/java/versioning/typechangedfrom/TypeChangedFromServiceVersion.java","src/main/java/versioning/typechangedfrom/implementation/TypeChangedFromClientImpl.java","src/main/java/versioning/typechangedfrom/implementation/package-info.java","src/main/java/versioning/typechangedfrom/models/TestModel.java","src/main/java/versioning/typechangedfrom/models/package-info.java","src/main/java/versioning/typechangedfrom/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Versioning.TypeChangedFrom":"v2"},"crossLanguageDefinitions":{"versioning.typechangedfrom.TypeChangedFromAsyncClient":"Versioning.TypeChangedFrom","versioning.typechangedfrom.TypeChangedFromAsyncClient.test":"Versioning.TypeChangedFrom.test","versioning.typechangedfrom.TypeChangedFromAsyncClient.testWithResponse":"Versioning.TypeChangedFrom.test","versioning.typechangedfrom.TypeChangedFromClient":"Versioning.TypeChangedFrom","versioning.typechangedfrom.TypeChangedFromClient.test":"Versioning.TypeChangedFrom.test","versioning.typechangedfrom.TypeChangedFromClient.testWithResponse":"Versioning.TypeChangedFrom.test","versioning.typechangedfrom.TypeChangedFromClientBuilder":"Versioning.TypeChangedFrom","versioning.typechangedfrom.models.TestModel":"Versioning.TypeChangedFrom.TestModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/versioning/typechangedfrom/TypeChangedFromAsyncClient.java","src/main/java/versioning/typechangedfrom/TypeChangedFromClient.java","src/main/java/versioning/typechangedfrom/TypeChangedFromClientBuilder.java","src/main/java/versioning/typechangedfrom/TypeChangedFromServiceVersion.java","src/main/java/versioning/typechangedfrom/implementation/TypeChangedFromClientImpl.java","src/main/java/versioning/typechangedfrom/implementation/package-info.java","src/main/java/versioning/typechangedfrom/models/TestModel.java","src/main/java/versioning/typechangedfrom/models/package-info.java","src/main/java/versioning/typechangedfrom/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/azure-clientgenerator-core-clientinitialization.properties b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/azure-clientgenerator-core-clientinitialization-defaultclient.properties similarity index 100% rename from packages/http-client-java/generator/http-client-generator-test/src/main/resources/azure-clientgenerator-core-clientinitialization.properties rename to packages/http-client-java/generator/http-client-generator-test/src/main/resources/azure-clientgenerator-core-clientinitialization-defaultclient.properties diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/azure-clientgenerator-core-clientinitialization-individuallyclient.properties b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/azure-clientgenerator-core-clientinitialization-individuallyclient.properties new file mode 100644 index 00000000000..ca812989b4f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/azure-clientgenerator-core-clientinitialization-individuallyclient.properties @@ -0,0 +1,2 @@ +name=${project.artifactId} +version=${project.version} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties new file mode 100644 index 00000000000..ca812989b4f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties @@ -0,0 +1,2 @@ +name=${project.artifactId} +version=${project.version} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/tsptest-external.properties b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/tsptest-external.properties new file mode 100644 index 00000000000..ca812989b4f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/tsptest-external.properties @@ -0,0 +1,2 @@ +name=${project.artifactId} +version=${project.version} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/type-file.properties b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/type-file.properties new file mode 100644 index 00000000000..ca812989b4f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/type-file.properties @@ -0,0 +1,2 @@ +name=${project.artifactId} +version=${project.version} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/ClientInitializationTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/ClientInitializationTests.java deleted file mode 100644 index 7e8a8ea25af..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/ClientInitializationTests.java +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package azure.clientgenerator.core.clientinitialization; - -import azure.clientgenerator.core.clientinitialization.models.Input; -import azure.clientgenerator.core.clientinitialization.models.WithBodyRequest; -import azure.clientgenerator.core.clientinitialization.parentclient.ChildClient; -import azure.clientgenerator.core.clientinitialization.parentclient.ChildClientBuilder; -import azure.clientgenerator.core.clientinitialization.parentclient.ParentClient; -import azure.clientgenerator.core.clientinitialization.parentclient.ParentClientBuilder; -import org.junit.jupiter.api.Test; - -public final class ClientInitializationTests { - - private static final String TEST_NAME = "test-name-value"; - private static final String TEST_ID = "test-id"; - private static final Input TEST_BODY = new Input("test-name"); - private static final String TEST_REGION = "us-west"; - private static final String TEST_BLOB = "sample-blob"; - - @Test - public void testHeader() { - HeaderParamClient client = new HeaderParamClientBuilder().name(TEST_NAME).buildClient(); - client.withQuery(TEST_ID); - client.withBody(TEST_BODY); - } - - @Test - public void testPath() { - PathParamClient client = new PathParamClientBuilder().blobName(TEST_BLOB).buildClient(); - client.withQuery("text"); - client.getStandalone(); - client.deleteStandalone(); - } - - @Test - public void testMixed() { - MixedParamsClient client = new MixedParamsClientBuilder().name(TEST_NAME).buildClient(); - client.withQuery(TEST_REGION, TEST_ID); - client.withBody(TEST_REGION, new WithBodyRequest("test-name")); - } - - @Test - public void testMultiple() { - MultipleParamsClient client - = new MultipleParamsClientBuilder().name(TEST_NAME).region(TEST_REGION).buildClient(); - client.withQuery(TEST_ID); - client.withBody(TEST_BODY); - } - - @Test - public void testParamAlias() { - ParamAliasClient client = new ParamAliasClientBuilder().blobName(TEST_BLOB).buildClient(); - client.withOriginalName(); - client.withAliasedName(); - } - - @Test - public void testChildClient() { - // ChildClient via ParentClient - ParentClient parentClient = new ParentClientBuilder().buildClient(); - ChildClient childClient = parentClient.getChildClient(TEST_BLOB); - - childClient.getStandalone(); - childClient.deleteStandalone(); - - // ChildClient via ChildClientBuilder - childClient = new ChildClientBuilder().blobName(TEST_BLOB).buildClient(); - - childClient.withQuery("text"); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/DefaultClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/DefaultClientTests.java new file mode 100644 index 00000000000..80caba42b5e --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/DefaultClientTests.java @@ -0,0 +1,68 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package azure.clientgenerator.core.clientinitialization.defaultclient; + +import azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.WithBodyRequest; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class DefaultClientTests { + + @Test + public void testHeaderParam() { + HeaderParamClient headerParamClient = new HeaderParamClientBuilder().name("test-name-value").buildClient(); + + headerParamClient.withQuery("test-id"); + headerParamClient.withBody(new Input("test-name")); + } + + @Test + public void testMultipleParams() { + MultipleParamsClient multipleParamsClient + = new MultipleParamsClientBuilder().name("test-name-value").region("us-west").buildClient(); + + multipleParamsClient.withQuery("test-id"); + multipleParamsClient.withBody(new Input("test-name")); + } + + @Test + public void testMixedParams() { + MixedParamsClient mixedParamsClient = new MixedParamsClientBuilder().name("test-name-value").buildClient(); + + mixedParamsClient.withQuery("us-west", "test-id"); + mixedParamsClient.withBody("us-west", new WithBodyRequest("test-name")); + } + + @Test + public void testPathParam() { + PathParamClient pathParamClient = new PathParamClientBuilder().blobName("sample-blob").buildClient(); + + pathParamClient.withQuery("text"); + BlobProperties blobProperties = pathParamClient.getStandalone(); + Assertions.assertNotNull(blobProperties); + Assertions.assertEquals("sample-blob", blobProperties.getName()); + pathParamClient.deleteStandalone(); + } + + @Test + public void testParamAlias() { + ParamAliasClient paramAliasClient = new ParamAliasClientBuilder().blobName("sample-blob").buildClient(); + + paramAliasClient.withAliasedName(); + paramAliasClient.withOriginalName(); + } + + @Test + public void testQueryParam() { + QueryParamClient queryParamClient = new QueryParamClientBuilder().blobName("test-blob").buildClient(); + + queryParamClient.withQuery("text"); + BlobProperties blobProperties = queryParamClient.getStandalone(); + Assertions.assertNotNull(blobProperties); + Assertions.assertEquals("test-blob", blobProperties.getName()); + queryParamClient.deleteStandalone(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/generated/HeaderParamClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/generated/HeaderParamClientTestBase.java new file mode 100644 index 00000000000..7200a132b6b --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/generated/HeaderParamClientTestBase.java @@ -0,0 +1,106 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.defaultclient.generated; + +// The Java test files under 'generated' package are generated for your reference. +// If you wish to modify these files, please copy them out of the 'generated' package, and modify there. +// See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. + +import azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamClient; +import azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamClientBuilder; +import azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsClient; +import azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsClientBuilder; +import azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsClient; +import azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsClientBuilder; +import azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasClient; +import azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasClientBuilder; +import azure.clientgenerator.core.clientinitialization.defaultclient.PathParamClient; +import azure.clientgenerator.core.clientinitialization.defaultclient.PathParamClientBuilder; +import azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamClient; +import azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamClientBuilder; +import com.azure.core.http.policy.HttpLogDetailLevel; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.test.TestMode; +import com.azure.core.test.TestProxyTestBase; +import com.azure.core.util.Configuration; + +class HeaderParamClientTestBase extends TestProxyTestBase { + protected HeaderParamClient headerParamClient; + + protected MultipleParamsClient multipleParamsClient; + + protected MixedParamsClient mixedParamsClient; + + protected PathParamClient pathParamClient; + + protected ParamAliasClient paramAliasClient; + + protected QueryParamClient queryParamClient; + + @Override + protected void beforeTest() { + HeaderParamClientBuilder headerParamClientbuilder = new HeaderParamClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .name(Configuration.getGlobalConfiguration().get("NAME", "name")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + headerParamClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + headerParamClient = headerParamClientbuilder.buildClient(); + + MultipleParamsClientBuilder multipleParamsClientbuilder = new MultipleParamsClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .name(Configuration.getGlobalConfiguration().get("NAME", "name")) + .region(Configuration.getGlobalConfiguration().get("REGION", "region")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + multipleParamsClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + multipleParamsClient = multipleParamsClientbuilder.buildClient(); + + MixedParamsClientBuilder mixedParamsClientbuilder = new MixedParamsClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .name(Configuration.getGlobalConfiguration().get("NAME", "name")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + mixedParamsClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + mixedParamsClient = mixedParamsClientbuilder.buildClient(); + + PathParamClientBuilder pathParamClientbuilder = new PathParamClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .blobName(Configuration.getGlobalConfiguration().get("BLOBNAME", "blobname")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + pathParamClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + pathParamClient = pathParamClientbuilder.buildClient(); + + ParamAliasClientBuilder paramAliasClientbuilder = new ParamAliasClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .blobName(Configuration.getGlobalConfiguration().get("BLOBNAME", "blobname")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + paramAliasClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + paramAliasClient = paramAliasClientbuilder.buildClient(); + + QueryParamClientBuilder queryParamClientbuilder = new QueryParamClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .blobName(Configuration.getGlobalConfiguration().get("BLOBNAME", "blobname")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + queryParamClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + queryParamClient = queryParamClientbuilder.buildClient(); + + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/generated/HeaderParamClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/generated/HeaderParamClientTestBase.java deleted file mode 100644 index 16d677e966d..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/generated/HeaderParamClientTestBase.java +++ /dev/null @@ -1,119 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.clientgenerator.core.clientinitialization.generated; - -// The Java test files under 'generated' package are generated for your reference. -// If you wish to modify these files, please copy them out of the 'generated' package, and modify there. -// See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. - -import azure.clientgenerator.core.clientinitialization.HeaderParamClient; -import azure.clientgenerator.core.clientinitialization.HeaderParamClientBuilder; -import azure.clientgenerator.core.clientinitialization.MixedParamsClient; -import azure.clientgenerator.core.clientinitialization.MixedParamsClientBuilder; -import azure.clientgenerator.core.clientinitialization.MultipleParamsClient; -import azure.clientgenerator.core.clientinitialization.MultipleParamsClientBuilder; -import azure.clientgenerator.core.clientinitialization.ParamAliasClient; -import azure.clientgenerator.core.clientinitialization.ParamAliasClientBuilder; -import azure.clientgenerator.core.clientinitialization.PathParamClient; -import azure.clientgenerator.core.clientinitialization.PathParamClientBuilder; -import azure.clientgenerator.core.clientinitialization.parentclient.ChildClient; -import azure.clientgenerator.core.clientinitialization.parentclient.ChildClientBuilder; -import azure.clientgenerator.core.clientinitialization.parentclient.ParentClient; -import azure.clientgenerator.core.clientinitialization.parentclient.ParentClientBuilder; -import com.azure.core.http.policy.HttpLogDetailLevel; -import com.azure.core.http.policy.HttpLogOptions; -import com.azure.core.test.TestMode; -import com.azure.core.test.TestProxyTestBase; -import com.azure.core.util.Configuration; - -class HeaderParamClientTestBase extends TestProxyTestBase { - protected HeaderParamClient headerParamClient; - - protected MultipleParamsClient multipleParamsClient; - - protected MixedParamsClient mixedParamsClient; - - protected PathParamClient pathParamClient; - - protected ParamAliasClient paramAliasClient; - - protected ChildClient childClient; - - protected ParentClient parentClient; - - @Override - protected void beforeTest() { - HeaderParamClientBuilder headerParamClientbuilder = new HeaderParamClientBuilder() - .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .name(Configuration.getGlobalConfiguration().get("NAME", "name")) - .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) - .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.RECORD) { - headerParamClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); - } - headerParamClient = headerParamClientbuilder.buildClient(); - - MultipleParamsClientBuilder multipleParamsClientbuilder = new MultipleParamsClientBuilder() - .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .name(Configuration.getGlobalConfiguration().get("NAME", "name")) - .region(Configuration.getGlobalConfiguration().get("REGION", "region")) - .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) - .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.RECORD) { - multipleParamsClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); - } - multipleParamsClient = multipleParamsClientbuilder.buildClient(); - - MixedParamsClientBuilder mixedParamsClientbuilder = new MixedParamsClientBuilder() - .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .name(Configuration.getGlobalConfiguration().get("NAME", "name")) - .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) - .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.RECORD) { - mixedParamsClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); - } - mixedParamsClient = mixedParamsClientbuilder.buildClient(); - - PathParamClientBuilder pathParamClientbuilder = new PathParamClientBuilder() - .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .blobName(Configuration.getGlobalConfiguration().get("BLOBNAME", "blobname")) - .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) - .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.RECORD) { - pathParamClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); - } - pathParamClient = pathParamClientbuilder.buildClient(); - - ParamAliasClientBuilder paramAliasClientbuilder = new ParamAliasClientBuilder() - .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .blobName(Configuration.getGlobalConfiguration().get("BLOBNAME", "blobname")) - .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) - .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.RECORD) { - paramAliasClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); - } - paramAliasClient = paramAliasClientbuilder.buildClient(); - - ChildClientBuilder childClientbuilder = new ChildClientBuilder() - .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .blobName(Configuration.getGlobalConfiguration().get("BLOBNAME", "blobname")) - .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) - .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.RECORD) { - childClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); - } - childClient = childClientbuilder.buildClient(); - - ParentClientBuilder parentClientbuilder = new ParentClientBuilder() - .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) - .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.RECORD) { - parentClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); - } - parentClient = parentClientbuilder.buildClient(); - - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyClientTests.java new file mode 100644 index 00000000000..02b30166f3a --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyClientTests.java @@ -0,0 +1,74 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class IndividuallyClientTests { + + @Test + public void testIndividuallyNestedWithPath() { + IndividuallyNestedWithPathClient client + = new IndividuallyNestedWithPathClientBuilder().blobName("test-blob").buildClient(); + + client.withQuery("text"); + BlobProperties blobProperties = client.getStandalone(); + Assertions.assertNotNull(blobProperties); + Assertions.assertEquals("test-blob", blobProperties.getName()); + client.deleteStandalone(); + } + + @Test + public void testIndividuallyNestedWithQuery() { + IndividuallyNestedWithQueryClient client + = new IndividuallyNestedWithQueryClientBuilder().blobName("test-blob").buildClient(); + + client.withQuery("text"); + BlobProperties blobProperties = client.getStandalone(); + Assertions.assertNotNull(blobProperties); + Assertions.assertEquals("test-blob", blobProperties.getName()); + client.deleteStandalone(); + } + + @Test + public void testIndividuallyNestedWithHeader() { + IndividuallyNestedWithHeaderClient client + = new IndividuallyNestedWithHeaderClientBuilder().name("test-name-value").buildClient(); + + client.withQuery("text"); + client.getStandalone(); + client.deleteStandalone(); + } + + @Test + public void testIndividuallyNestedWithMultiple() { + IndividuallyNestedWithMultipleClient client + = new IndividuallyNestedWithMultipleClientBuilder().name("test-name-value").region("us-west").buildClient(); + + client.withQuery("text"); + client.getStandalone(); + client.deleteStandalone(); + } + + @Test + public void testIndividuallyNestedWithMixed() { + IndividuallyNestedWithMixedClient client + = new IndividuallyNestedWithMixedClientBuilder().name("test-name-value").buildClient(); + + client.withQuery("us-west", "text"); + client.getStandalone("us-west"); + client.deleteStandalone("us-west"); + } + + @Test + public void testIndividuallyNestedWithParamAlias() { + IndividuallyNestedWithParamAliasClient client + = new IndividuallyNestedWithParamAliasClientBuilder().blobName("sample-blob").buildClient(); + + client.withAliasedName(); + client.withOriginalName(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/generated/IndividuallyNestedWithPathClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/generated/IndividuallyNestedWithPathClientTestBase.java new file mode 100644 index 00000000000..995a5c14231 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/generated/IndividuallyNestedWithPathClientTestBase.java @@ -0,0 +1,112 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyclient.generated; + +// The Java test files under 'generated' package are generated for your reference. +// If you wish to modify these files, please copy them out of the 'generated' package, and modify there. +// See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. + +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderClient; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedClient; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleClient; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasClient; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathClient; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryClient; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryClientBuilder; +import com.azure.core.http.policy.HttpLogDetailLevel; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.test.TestMode; +import com.azure.core.test.TestProxyTestBase; +import com.azure.core.util.Configuration; + +class IndividuallyNestedWithPathClientTestBase extends TestProxyTestBase { + protected IndividuallyNestedWithPathClient individuallyNestedWithPathClient; + + protected IndividuallyNestedWithQueryClient individuallyNestedWithQueryClient; + + protected IndividuallyNestedWithHeaderClient individuallyNestedWithHeaderClient; + + protected IndividuallyNestedWithMultipleClient individuallyNestedWithMultipleClient; + + protected IndividuallyNestedWithMixedClient individuallyNestedWithMixedClient; + + protected IndividuallyNestedWithParamAliasClient individuallyNestedWithParamAliasClient; + + @Override + protected void beforeTest() { + IndividuallyNestedWithPathClientBuilder individuallyNestedWithPathClientbuilder + = new IndividuallyNestedWithPathClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .blobName(Configuration.getGlobalConfiguration().get("BLOBNAME", "blobname")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + individuallyNestedWithPathClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + individuallyNestedWithPathClient = individuallyNestedWithPathClientbuilder.buildClient(); + + IndividuallyNestedWithQueryClientBuilder individuallyNestedWithQueryClientbuilder + = new IndividuallyNestedWithQueryClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .blobName(Configuration.getGlobalConfiguration().get("BLOBNAME", "blobname")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + individuallyNestedWithQueryClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + individuallyNestedWithQueryClient = individuallyNestedWithQueryClientbuilder.buildClient(); + + IndividuallyNestedWithHeaderClientBuilder individuallyNestedWithHeaderClientbuilder + = new IndividuallyNestedWithHeaderClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .name(Configuration.getGlobalConfiguration().get("NAME", "name")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + individuallyNestedWithHeaderClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + individuallyNestedWithHeaderClient = individuallyNestedWithHeaderClientbuilder.buildClient(); + + IndividuallyNestedWithMultipleClientBuilder individuallyNestedWithMultipleClientbuilder + = new IndividuallyNestedWithMultipleClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .name(Configuration.getGlobalConfiguration().get("NAME", "name")) + .region(Configuration.getGlobalConfiguration().get("REGION", "region")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + individuallyNestedWithMultipleClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + individuallyNestedWithMultipleClient = individuallyNestedWithMultipleClientbuilder.buildClient(); + + IndividuallyNestedWithMixedClientBuilder individuallyNestedWithMixedClientbuilder + = new IndividuallyNestedWithMixedClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .name(Configuration.getGlobalConfiguration().get("NAME", "name")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + individuallyNestedWithMixedClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + individuallyNestedWithMixedClient = individuallyNestedWithMixedClientbuilder.buildClient(); + + IndividuallyNestedWithParamAliasClientBuilder individuallyNestedWithParamAliasClientbuilder + = new IndividuallyNestedWithParamAliasClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .blobName(Configuration.getGlobalConfiguration().get("BLOBNAME", "blobname")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + individuallyNestedWithParamAliasClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + individuallyNestedWithParamAliasClient = individuallyNestedWithParamAliasClientbuilder.buildClient(); + + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientTests.java new file mode 100644 index 00000000000..18feb0c5429 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientTests.java @@ -0,0 +1,76 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class IndividuallyParentClientTests { + + private final IndividuallyParentClient parentClient = new IndividuallyParentClientBuilder().buildClient(); + + @Test + public void testIndividuallyParentNestedWithPath() { + IndividuallyParentNestedWithPathClient client + = parentClient.getIndividuallyParentNestedWithPathClient("test-blob"); + + client.withQuery("text"); + BlobProperties blobProperties = client.getStandalone(); + Assertions.assertNotNull(blobProperties); + Assertions.assertEquals("test-blob", blobProperties.getName()); + client.deleteStandalone(); + } + + @Test + public void testIndividuallyParentNestedWithQuery() { + IndividuallyParentNestedWithQueryClient client + = parentClient.getIndividuallyParentNestedWithQueryClient("test-blob"); + + client.withQuery("text"); + BlobProperties blobProperties = client.getStandalone(); + Assertions.assertNotNull(blobProperties); + Assertions.assertEquals("test-blob", blobProperties.getName()); + client.deleteStandalone(); + } + + @Test + public void testIndividuallyParentNestedWithHeader() { + IndividuallyParentNestedWithHeaderClient client + = parentClient.getIndividuallyParentNestedWithHeaderClient("test-name-value"); + + client.withQuery("text"); + client.getStandalone(); + client.deleteStandalone(); + } + + @Test + public void testIndividuallyParentNestedWithMultiple() { + IndividuallyParentNestedWithMultipleClient client + = parentClient.getIndividuallyParentNestedWithMultipleClient("test-name-value", "us-west"); + + client.withQuery("text"); + client.getStandalone(); + client.deleteStandalone(); + } + + @Test + public void testIndividuallyParentNestedWithMixed() { + IndividuallyParentNestedWithMixedClient client + = parentClient.getIndividuallyParentNestedWithMixedClient("test-name-value"); + + client.withQuery("us-west", "text"); + client.getStandalone("us-west"); + client.deleteStandalone("us-west"); + } + + @Test + public void testIndividuallyParentNestedWithParamAlias() { + IndividuallyParentNestedWithParamAliasClient client + = parentClient.getIndividuallyParentNestedWithParamAliasClient("sample-blob"); + + client.withAliasedName(); + client.withOriginalName(); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/generated/IndividuallyParentNestedWithPathClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/generated/IndividuallyParentNestedWithPathClientTestBase.java new file mode 100644 index 00000000000..255296ba8a6 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/generated/IndividuallyParentNestedWithPathClientTestBase.java @@ -0,0 +1,126 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.generated; + +// The Java test files under 'generated' package are generated for your reference. +// If you wish to modify these files, please copy them out of the 'generated' package, and modify there. +// See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentClient; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderClient; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedClient; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleClient; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasClient; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathClient; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryClient; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryClientBuilder; +import com.azure.core.http.policy.HttpLogDetailLevel; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.test.TestMode; +import com.azure.core.test.TestProxyTestBase; +import com.azure.core.util.Configuration; + +class IndividuallyParentNestedWithPathClientTestBase extends TestProxyTestBase { + protected IndividuallyParentNestedWithPathClient individuallyParentNestedWithPathClient; + + protected IndividuallyParentNestedWithQueryClient individuallyParentNestedWithQueryClient; + + protected IndividuallyParentNestedWithHeaderClient individuallyParentNestedWithHeaderClient; + + protected IndividuallyParentNestedWithMultipleClient individuallyParentNestedWithMultipleClient; + + protected IndividuallyParentNestedWithMixedClient individuallyParentNestedWithMixedClient; + + protected IndividuallyParentNestedWithParamAliasClient individuallyParentNestedWithParamAliasClient; + + protected IndividuallyParentClient individuallyParentClient; + + @Override + protected void beforeTest() { + IndividuallyParentNestedWithPathClientBuilder individuallyParentNestedWithPathClientbuilder + = new IndividuallyParentNestedWithPathClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .blobName(Configuration.getGlobalConfiguration().get("BLOBNAME", "blobname")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + individuallyParentNestedWithPathClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + individuallyParentNestedWithPathClient = individuallyParentNestedWithPathClientbuilder.buildClient(); + + IndividuallyParentNestedWithQueryClientBuilder individuallyParentNestedWithQueryClientbuilder + = new IndividuallyParentNestedWithQueryClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .blobName(Configuration.getGlobalConfiguration().get("BLOBNAME", "blobname")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + individuallyParentNestedWithQueryClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + individuallyParentNestedWithQueryClient = individuallyParentNestedWithQueryClientbuilder.buildClient(); + + IndividuallyParentNestedWithHeaderClientBuilder individuallyParentNestedWithHeaderClientbuilder + = new IndividuallyParentNestedWithHeaderClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .name(Configuration.getGlobalConfiguration().get("NAME", "name")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + individuallyParentNestedWithHeaderClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + individuallyParentNestedWithHeaderClient = individuallyParentNestedWithHeaderClientbuilder.buildClient(); + + IndividuallyParentNestedWithMultipleClientBuilder individuallyParentNestedWithMultipleClientbuilder + = new IndividuallyParentNestedWithMultipleClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .name(Configuration.getGlobalConfiguration().get("NAME", "name")) + .region(Configuration.getGlobalConfiguration().get("REGION", "region")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + individuallyParentNestedWithMultipleClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + individuallyParentNestedWithMultipleClient = individuallyParentNestedWithMultipleClientbuilder.buildClient(); + + IndividuallyParentNestedWithMixedClientBuilder individuallyParentNestedWithMixedClientbuilder + = new IndividuallyParentNestedWithMixedClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .name(Configuration.getGlobalConfiguration().get("NAME", "name")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + individuallyParentNestedWithMixedClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + individuallyParentNestedWithMixedClient = individuallyParentNestedWithMixedClientbuilder.buildClient(); + + IndividuallyParentNestedWithParamAliasClientBuilder individuallyParentNestedWithParamAliasClientbuilder + = new IndividuallyParentNestedWithParamAliasClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .blobName(Configuration.getGlobalConfiguration().get("BLOBNAME", "blobname")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + individuallyParentNestedWithParamAliasClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + individuallyParentNestedWithParamAliasClient + = individuallyParentNestedWithParamAliasClientbuilder.buildClient(); + + IndividuallyParentClientBuilder individuallyParentClientbuilder = new IndividuallyParentClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + individuallyParentClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + individuallyParentClient = individuallyParentClientbuilder.buildClient(); + + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/methodsubscriptionid/MethodSubscriptionIdTest.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/methodsubscriptionid/MethodSubscriptionIdTest.java index af8b611d494..b9b6ec4329c 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/methodsubscriptionid/MethodSubscriptionIdTest.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/methodsubscriptionid/MethodSubscriptionIdTest.java @@ -6,6 +6,8 @@ import azure.resourcemanager.methodsubscriptionid.fluent.models.SubscriptionResource1Inner; import azure.resourcemanager.methodsubscriptionid.fluent.models.SubscriptionResource2Inner; import azure.resourcemanager.methodsubscriptionid.fluent.models.SubscriptionResourceInner; +import azure.resourcemanager.methodsubscriptionid.models.Operation; +import azure.resourcemanager.methodsubscriptionid.models.OperationDisplay; import azure.resourcemanager.methodsubscriptionid.models.ResourceGroupResource; import azure.resourcemanager.methodsubscriptionid.models.ResourceGroupResourceProperties; import azure.resourcemanager.methodsubscriptionid.models.SubscriptionResource; @@ -15,6 +17,8 @@ import azure.resourcemanager.methodsubscriptionid.models.SubscriptionResource2Properties; import azure.resourcemanager.methodsubscriptionid.models.SubscriptionResourceProperties; import com.azure.core.management.Region; +import java.util.List; +import java.util.stream.Collectors; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.utils.ArmUtils; @@ -44,6 +48,23 @@ public class MethodSubscriptionIdTest { private final MethodSubscriptionIdManager manager = MethodSubscriptionIdManager.authenticate(ArmUtils.createTestHttpPipeline(), ArmUtils.getAzureProfile()); + @Test + public void testOperationsList() { + List operationList = manager.operations().list().stream().collect(Collectors.toList()); + Assertions.assertFalse(operationList.isEmpty()); + Assertions.assertEquals(1, operationList.size()); + Operation operation = operationList.get(0); + Assertions.assertNotNull(operation); + Assertions.assertEquals("Azure.ResourceManager.MethodSubscriptionId/services/read", operation.name()); + Assertions.assertFalse(operation.isDataAction()); + OperationDisplay display = operation.display(); + Assertions.assertNotNull(display); + Assertions.assertEquals("Azure.ResourceManager.MethodSubscriptionId", display.provider()); + Assertions.assertEquals("services", display.resource()); + Assertions.assertEquals("Lists services", display.operation()); + Assertions.assertEquals("Lists registered services", display.description()); + } + @Test public void testTwoSubscriptionResourcesMethodLevelSubscriptionResource1Operations() { // Test Scenario 1: Two subscription resources with method-level subscriptionId diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/ArmMultiServiceOlderVersionsTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/ArmMultiServiceOlderVersionsTests.java deleted file mode 100644 index 1a704aa3a39..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/ArmMultiServiceOlderVersionsTests.java +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package azure.resourcemanager.multiserviceolderversions; - -import azure.resourcemanager.multiserviceolderversions.combined.CombinedManager; -import azure.resourcemanager.multiserviceolderversions.combined.models.DiskProperties; -import azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachineProperties; -import com.azure.core.management.Region; -import org.junit.jupiter.api.Test; -import org.utils.ArmUtils; - -public final class ArmMultiServiceOlderVersionsTests { - - private final CombinedManager manager - = CombinedManager.authenticate(ArmUtils.createTestHttpPipeline(), ArmUtils.getAzureProfile()); - - private static final String RESOURCE_GROUP_NAME = "test-rg"; - private static final Region REGION = Region.US_EAST; - - @Test - public void testCombinedClient() { - manager.disks() - .define("disk-old1") - .withRegion(REGION) - .withExistingResourceGroup(RESOURCE_GROUP_NAME) - .withProperties(new DiskProperties().withDiskSizeGB(128)) - .create(); - manager.disks().getByResourceGroup(RESOURCE_GROUP_NAME, "disk-old1"); - - manager.virtualMachines() - .define("vm-old1") - .withRegion(REGION) - .withExistingResourceGroup(RESOURCE_GROUP_NAME) - .withProperties(new VirtualMachineProperties().withSize("Standard_D2s_v3")) - .create(); - manager.virtualMachines().getByResourceGroup(RESOURCE_GROUP_NAME, "vm-old1"); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/DiskInnerTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/DiskInnerTests.java deleted file mode 100644 index 0d799efc91c..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/DiskInnerTests.java +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.generated; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.DiskInner; -import azure.resourcemanager.multiserviceolderversions.combined.models.DiskProperties; -import com.azure.core.util.BinaryData; -import java.util.HashMap; -import java.util.Map; -import org.junit.jupiter.api.Assertions; - -public final class DiskInnerTests { - @org.junit.jupiter.api.Test - public void testDeserialize() throws Exception { - DiskInner model = BinaryData.fromString( - "{\"properties\":{\"provisioningState\":\"Canceled\",\"diskSizeGB\":1911349374},\"location\":\"ufpo\",\"tags\":{\"qsoqijgkd\":\"izhwlrxy\"},\"id\":\"bpazlobcufpdzn\",\"name\":\"btcqq\",\"type\":\"nq\"}") - .toObject(DiskInner.class); - Assertions.assertEquals("ufpo", model.location()); - Assertions.assertEquals("izhwlrxy", model.tags().get("qsoqijgkd")); - Assertions.assertEquals(1911349374, model.properties().diskSizeGB()); - } - - @org.junit.jupiter.api.Test - public void testSerialize() throws Exception { - DiskInner model = new DiskInner().withLocation("ufpo") - .withTags(mapOf("qsoqijgkd", "izhwlrxy")) - .withProperties(new DiskProperties().withDiskSizeGB(1911349374)); - model = BinaryData.fromObject(model).toObject(DiskInner.class); - Assertions.assertEquals("ufpo", model.location()); - Assertions.assertEquals("izhwlrxy", model.tags().get("qsoqijgkd")); - Assertions.assertEquals(1911349374, model.properties().diskSizeGB()); - } - - // Use "Map.of" if available - @SuppressWarnings("unchecked") - private static Map mapOf(Object... inputs) { - Map map = new HashMap<>(); - for (int i = 0; i < inputs.length; i += 2) { - String key = (String) inputs[i]; - T value = (T) inputs[i + 1]; - map.put(key, value); - } - return map; - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/DiskPropertiesTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/DiskPropertiesTests.java deleted file mode 100644 index c09cf61fb93..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/DiskPropertiesTests.java +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.generated; - -import azure.resourcemanager.multiserviceolderversions.combined.models.DiskProperties; -import com.azure.core.util.BinaryData; -import org.junit.jupiter.api.Assertions; - -public final class DiskPropertiesTests { - @org.junit.jupiter.api.Test - public void testDeserialize() throws Exception { - DiskProperties model = BinaryData.fromString("{\"provisioningState\":\"Succeeded\",\"diskSizeGB\":2127527772}") - .toObject(DiskProperties.class); - Assertions.assertEquals(2127527772, model.diskSizeGB()); - } - - @org.junit.jupiter.api.Test - public void testSerialize() throws Exception { - DiskProperties model = new DiskProperties().withDiskSizeGB(2127527772); - model = BinaryData.fromObject(model).toObject(DiskProperties.class); - Assertions.assertEquals(2127527772, model.diskSizeGB()); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/VirtualMachineInnerTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/VirtualMachineInnerTests.java deleted file mode 100644 index 6a4592562ae..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/VirtualMachineInnerTests.java +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.generated; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.VirtualMachineInner; -import azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachineProperties; -import com.azure.core.util.BinaryData; -import java.util.HashMap; -import java.util.Map; -import org.junit.jupiter.api.Assertions; - -public final class VirtualMachineInnerTests { - @org.junit.jupiter.api.Test - public void testDeserialize() throws Exception { - VirtualMachineInner model = BinaryData.fromString( - "{\"properties\":{\"provisioningState\":\"Succeeded\",\"size\":\"uv\"},\"location\":\"xpyb\",\"tags\":{\"sphrupidgs\":\"ehmtzop\"},\"id\":\"bb\",\"name\":\"jhphoyc\",\"type\":\"sx\"}") - .toObject(VirtualMachineInner.class); - Assertions.assertEquals("xpyb", model.location()); - Assertions.assertEquals("ehmtzop", model.tags().get("sphrupidgs")); - Assertions.assertEquals("uv", model.properties().size()); - } - - @org.junit.jupiter.api.Test - public void testSerialize() throws Exception { - VirtualMachineInner model = new VirtualMachineInner().withLocation("xpyb") - .withTags(mapOf("sphrupidgs", "ehmtzop")) - .withProperties(new VirtualMachineProperties().withSize("uv")); - model = BinaryData.fromObject(model).toObject(VirtualMachineInner.class); - Assertions.assertEquals("xpyb", model.location()); - Assertions.assertEquals("ehmtzop", model.tags().get("sphrupidgs")); - Assertions.assertEquals("uv", model.properties().size()); - } - - // Use "Map.of" if available - @SuppressWarnings("unchecked") - private static Map mapOf(Object... inputs) { - Map map = new HashMap<>(); - for (int i = 0; i < inputs.length; i += 2) { - String key = (String) inputs[i]; - T value = (T) inputs[i + 1]; - map.put(key, value); - } - return map; - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/VirtualMachinePropertiesTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/VirtualMachinePropertiesTests.java deleted file mode 100644 index 696397674e2..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/VirtualMachinePropertiesTests.java +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.generated; - -import azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachineProperties; -import com.azure.core.util.BinaryData; -import org.junit.jupiter.api.Assertions; - -public final class VirtualMachinePropertiesTests { - @org.junit.jupiter.api.Test - public void testDeserialize() throws Exception { - VirtualMachineProperties model - = BinaryData.fromString("{\"provisioningState\":\"Canceled\",\"size\":\"dxbmtqioq\"}") - .toObject(VirtualMachineProperties.class); - Assertions.assertEquals("dxbmtqioq", model.size()); - } - - @org.junit.jupiter.api.Test - public void testSerialize() throws Exception { - VirtualMachineProperties model = new VirtualMachineProperties().withSize("dxbmtqioq"); - model = BinaryData.fromObject(model).toObject(VirtualMachineProperties.class); - Assertions.assertEquals("dxbmtqioq", model.size()); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/nonresource/NonResourceTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/nonresource/NonResourceTests.java index e2bd7fd5a26..be9de58af4a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/nonresource/NonResourceTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/nonresource/NonResourceTests.java @@ -3,6 +3,8 @@ package azure.resourcemanager.nonresource; +import azure.resourcemanager.nonresource.fluent.models.NonResourceInner; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.utils.ArmUtils; @@ -17,6 +19,15 @@ public void testNonResourceGet() { manager.nonResourceOperations().get("eastus", "hello"); } + @Test + public void testNonResourceCreate() { + NonResourceInner body = new NonResourceInner().withId("id").withName("hello").withType("nonResource"); + NonResourceInner result = manager.serviceClient().getNonResourceOperations().create("eastus", "hello", body); + Assertions.assertEquals("id", result.id()); + Assertions.assertEquals("hello", result.name()); + Assertions.assertEquals("nonResource", result.type()); + } + @Disabled("It is mistakenly treated as a resource") @Test public void testNonResourcePut() { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/operationtemplates/OperationTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/operationtemplates/OperationTests.java index 7b764d4e572..dbc75280f69 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/operationtemplates/OperationTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/operationtemplates/OperationTests.java @@ -152,6 +152,21 @@ public void testLroPaging() { Assertions.assertEquals("product2", product2.properties().productId()); } + @Test + public void testExportArray() { + List exportResults = manager.lroes().exportArray(new ExportRequest().withFormat("csv")); + Assertions.assertFalse(exportResults.isEmpty()); + Assertions.assertEquals(2, exportResults.size()); + + ExportResult result1 = exportResults.get(0); + Assertions.assertNotNull(result1); + Assertions.assertEquals("order1,product1,1", result1.content()); + + ExportResult result2 = exportResults.get(1); + Assertions.assertNotNull(result2); + Assertions.assertEquals("order2,product2,2", result2.content()); + } + // for LRO operations, we need to override default poll interval private static OperationTemplatesManager buildManager() { try { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/naming/NamingTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/naming/NamingTests.java index 1389491b1a8..30f62398507 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/naming/NamingTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/naming/NamingTests.java @@ -16,6 +16,10 @@ public class NamingTests { private final NamingClient client = new NamingClientBuilder().buildClient(); + private final PropertyClient propertyClient = new NamingClientBuilder().buildPropertyClient(); + + private final HeaderClient headerClient = new NamingClientBuilder().buildHeaderClient(); + // client name should be "ClientModel", currently a bug in TCGC private final ModelClient modelClient = new NamingClientBuilder().buildModelClient(); @@ -30,13 +34,13 @@ public void testNaming() { client.parameter("true"); // property - client.client(new ClientNameModel(true)); - client.language(new LanguageClientNameModel(true)); - client.compatibleWithEncodedName(new ClientNameAndJsonEncodedNameModel(true)); + propertyClient.client(new ClientNameModel(true)); + propertyClient.language(new LanguageClientNameModel(true)); + propertyClient.compatibleWithEncodedName(new ClientNameAndJsonEncodedNameModel(true)); // header - client.request("true"); - client.response(); // no class about response header at present + headerClient.request("true"); + headerClient.response(); // no class about response header at present // model modelClient.client(new ClientModel(true)); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/naming/generated/NamingClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/naming/generated/NamingClientTestBase.java index 56ab4a928bb..ad09790a3ba 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/naming/generated/NamingClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/naming/generated/NamingClientTestBase.java @@ -8,9 +8,11 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. +import client.naming.HeaderClient; import client.naming.ModelClient; import client.naming.NamingClient; import client.naming.NamingClientBuilder; +import client.naming.PropertyClient; import client.naming.UnionEnumClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; @@ -21,6 +23,10 @@ class NamingClientTestBase extends TestProxyTestBase { protected NamingClient namingClient; + protected PropertyClient propertyClient; + + protected HeaderClient headerClient; + protected ModelClient modelClient; protected UnionEnumClient unionEnumClient; @@ -36,6 +42,24 @@ protected void beforeTest() { } namingClient = namingClientbuilder.buildClient(); + NamingClientBuilder propertyClientbuilder = new NamingClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + propertyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + propertyClient = propertyClientbuilder.buildPropertyClient(); + + NamingClientBuilder headerClientbuilder = new NamingClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + headerClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + headerClient = headerClientbuilder.buildHeaderClient(); + NamingClientBuilder modelClientbuilder = new NamingClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/encode/array/EncodeArrayTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/encode/array/EncodeArrayTests.java index 3e45e1c1f56..e0b36d1f051 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/encode/array/EncodeArrayTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/encode/array/EncodeArrayTests.java @@ -3,10 +3,20 @@ package encode.array; +import encode.array.models.Colors; +import encode.array.models.ColorsExtensibleEnum; import encode.array.models.CommaDelimitedArrayProperty; +import encode.array.models.CommaDelimitedEnumArrayProperty; +import encode.array.models.CommaDelimitedExtensibleEnumArrayProperty; import encode.array.models.NewlineDelimitedArrayProperty; +import encode.array.models.NewlineDelimitedEnumArrayProperty; +import encode.array.models.NewlineDelimitedExtensibleEnumArrayProperty; import encode.array.models.PipeDelimitedArrayProperty; +import encode.array.models.PipeDelimitedEnumArrayProperty; +import encode.array.models.PipeDelimitedExtensibleEnumArrayProperty; import encode.array.models.SpaceDelimitedArrayProperty; +import encode.array.models.SpaceDelimitedEnumArrayProperty; +import encode.array.models.SpaceDelimitedExtensibleEnumArrayProperty; import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -14,6 +24,9 @@ public final class EncodeArrayTests { private static final List COLORS = List.of("blue", "red", "green"); + private static final List ENUM_COLORS = List.of(Colors.BLUE, Colors.RED, Colors.GREEN); + private static final List EXTENSIBLE_ENUM_COLORS + = List.of(ColorsExtensibleEnum.BLUE, ColorsExtensibleEnum.RED, ColorsExtensibleEnum.GREEN); private final ArrayClient client = new ArrayClientBuilder().buildClient(); @@ -40,4 +53,60 @@ public void newlineDelimitedProperty() { NewlineDelimitedArrayProperty response = client.newlineDelimited(new NewlineDelimitedArrayProperty(COLORS)); Assertions.assertEquals(COLORS, response.getValue()); } + + @Test + public void enumCommaDelimitedProperty() { + CommaDelimitedEnumArrayProperty response + = client.enumCommaDelimited(new CommaDelimitedEnumArrayProperty(ENUM_COLORS)); + Assertions.assertEquals(ENUM_COLORS, response.getValue()); + } + + @Test + public void enumSpaceDelimitedProperty() { + SpaceDelimitedEnumArrayProperty response + = client.enumSpaceDelimited(new SpaceDelimitedEnumArrayProperty(ENUM_COLORS)); + Assertions.assertEquals(ENUM_COLORS, response.getValue()); + } + + @Test + public void enumPipeDelimitedProperty() { + PipeDelimitedEnumArrayProperty response + = client.enumPipeDelimited(new PipeDelimitedEnumArrayProperty(ENUM_COLORS)); + Assertions.assertEquals(ENUM_COLORS, response.getValue()); + } + + @Test + public void enumNewlineDelimitedProperty() { + NewlineDelimitedEnumArrayProperty response + = client.enumNewlineDelimited(new NewlineDelimitedEnumArrayProperty(ENUM_COLORS)); + Assertions.assertEquals(ENUM_COLORS, response.getValue()); + } + + @Test + public void extensibleEnumCommaDelimitedProperty() { + CommaDelimitedExtensibleEnumArrayProperty response = client + .extensibleEnumCommaDelimited(new CommaDelimitedExtensibleEnumArrayProperty(EXTENSIBLE_ENUM_COLORS)); + Assertions.assertEquals(EXTENSIBLE_ENUM_COLORS, response.getValue()); + } + + @Test + public void extensibleEnumSpaceDelimitedProperty() { + SpaceDelimitedExtensibleEnumArrayProperty response = client + .extensibleEnumSpaceDelimited(new SpaceDelimitedExtensibleEnumArrayProperty(EXTENSIBLE_ENUM_COLORS)); + Assertions.assertEquals(EXTENSIBLE_ENUM_COLORS, response.getValue()); + } + + @Test + public void extensibleEnumPipeDelimitedProperty() { + PipeDelimitedExtensibleEnumArrayProperty response + = client.extensibleEnumPipeDelimited(new PipeDelimitedExtensibleEnumArrayProperty(EXTENSIBLE_ENUM_COLORS)); + Assertions.assertEquals(EXTENSIBLE_ENUM_COLORS, response.getValue()); + } + + @Test + public void extensibleEnumNewlineDelimitedProperty() { + NewlineDelimitedExtensibleEnumArrayProperty response = client + .extensibleEnumNewlineDelimited(new NewlineDelimitedExtensibleEnumArrayProperty(EXTENSIBLE_ENUM_COLORS)); + Assertions.assertEquals(EXTENSIBLE_ENUM_COLORS, response.getValue()); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/encode/duration/EncodeDurationTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/encode/duration/EncodeDurationTests.java index ff829e46ea6..9313e9e9b66 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/encode/duration/EncodeDurationTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/encode/duration/EncodeDurationTests.java @@ -4,11 +4,19 @@ package encode.duration; import encode.duration.property.models.DefaultDurationProperty; +import encode.duration.property.models.Float64MillisecondsDurationProperty; import encode.duration.property.models.Float64SecondsDurationProperty; +import encode.duration.property.models.FloatMillisecondsDurationArrayProperty; +import encode.duration.property.models.FloatMillisecondsDurationProperty; +import encode.duration.property.models.FloatMillisecondsLargerUnitDurationProperty; import encode.duration.property.models.FloatSecondsDurationArrayProperty; import encode.duration.property.models.FloatSecondsDurationProperty; +import encode.duration.property.models.FloatSecondsLargerUnitDurationProperty; import encode.duration.property.models.ISO8601DurationProperty; +import encode.duration.property.models.Int32MillisecondsDurationProperty; +import encode.duration.property.models.Int32MillisecondsLargerUnitDurationProperty; import encode.duration.property.models.Int32SecondsDurationProperty; +import encode.duration.property.models.Int32SecondsLargerUnitDurationProperty; import java.time.Duration; import java.util.Arrays; import java.util.List; @@ -24,6 +32,8 @@ public class EncodeDurationTests { private static final Duration DAY40 = Duration.ofDays(40); private static final Duration SECOND35 = Duration.ofSeconds(35, 625_000_000); private static final Duration SECOND36 = Duration.ofSeconds(36); + private static final Duration MILLIS35625 = Duration.ofMillis(35625); + private static final Duration MILLIS36000 = Duration.ofMillis(36000); @Test public void testQuery() { @@ -35,9 +45,25 @@ public void testQuery() { queryClient.int32Seconds(SECOND36); + queryClient.int32SecondsLargerUnit(Duration.ofMinutes(2)); + + queryClient.floatSecondsLargerUnit(Duration.ofMinutes(2).plusSeconds(30)); + queryClient.iso8601(DAY40); queryClient.int32SecondsArray(Arrays.asList(SECOND36, Duration.ofSeconds(47))); + + queryClient.int32Milliseconds(MILLIS36000); + + queryClient.int32MillisecondsLargerUnit(Duration.ofMinutes(3)); + + queryClient.floatMilliseconds(MILLIS35625); + + queryClient.floatMillisecondsLargerUnit(Duration.ofMinutes(3).plusSeconds(30)); + + queryClient.float64Milliseconds(MILLIS35625); + + queryClient.int32MillisecondsArray(Arrays.asList(MILLIS36000, Duration.ofMillis(47000))); } @Test @@ -50,9 +76,25 @@ public void testHeader() { headerClient.int32Seconds(SECOND36); + headerClient.int32SecondsLargerUnit(Duration.ofMinutes(2)); + + headerClient.floatSecondsLargerUnit(Duration.ofMinutes(2).plusSeconds(30)); + headerClient.iso8601(DAY40); headerClient.iso8601Array(Arrays.asList(DAY40, Duration.ofDays(50))); + + headerClient.int32Milliseconds(MILLIS36000); + + headerClient.int32MillisecondsLargerUnit(Duration.ofMinutes(3)); + + headerClient.floatMilliseconds(MILLIS35625); + + headerClient.floatMillisecondsLargerUnit(Duration.ofMinutes(3).plusSeconds(30)); + + headerClient.float64Milliseconds(MILLIS35625); + + headerClient.int32MillisecondsArray(Arrays.asList(MILLIS36000, Duration.ofMillis(47000))); } @Test @@ -68,11 +110,46 @@ public void testProperty() { Assertions.assertEquals(SECOND36, propertyClient.int32Seconds(new Int32SecondsDurationProperty(SECOND36)).getValue()); + Assertions.assertEquals(Duration.ofMinutes(2), + propertyClient.int32SecondsLargerUnit(new Int32SecondsLargerUnitDurationProperty(Duration.ofMinutes(2))) + .getValue()); + + Assertions.assertEquals(Duration.ofMinutes(2).plusSeconds(30), + propertyClient + .floatSecondsLargerUnit( + new FloatSecondsLargerUnitDurationProperty(Duration.ofMinutes(2).plusSeconds(30))) + .getValue()); + propertyClient.iso8601(new ISO8601DurationProperty(DAY40)); List array = Arrays.asList(SECOND35, Duration.ofSeconds(46, 750_000_000)); FloatSecondsDurationArrayProperty ret = propertyClient.floatSecondsArray(new FloatSecondsDurationArrayProperty(array)); Assertions.assertEquals(array, ret.getValue()); + + Assertions.assertEquals(MILLIS36000, + propertyClient.int32Milliseconds(new Int32MillisecondsDurationProperty(MILLIS36000)).getValue()); + + Assertions.assertEquals(MILLIS35625, + propertyClient.floatMilliseconds(new FloatMillisecondsDurationProperty(MILLIS35625)).getValue()); + + Assertions.assertEquals(MILLIS35625, + propertyClient.float64Milliseconds(new Float64MillisecondsDurationProperty(MILLIS35625)).getValue()); + + Assertions.assertEquals(Duration.ofMinutes(3), + propertyClient + .int32MillisecondsLargerUnit(new Int32MillisecondsLargerUnitDurationProperty(Duration.ofMinutes(3))) + .getValue()); + + Assertions.assertEquals(Duration.ofMinutes(3).plusSeconds(30), + propertyClient + .floatMillisecondsLargerUnit( + new FloatMillisecondsLargerUnitDurationProperty(Duration.ofMinutes(3).plusSeconds(30))) + .getValue()); + + List millisArray = Arrays.asList(Duration.ofMillis(35625), Duration.ofMillis(46750)); + FloatMillisecondsDurationArrayProperty millisArrayRet + = propertyClient.floatMillisecondsArray(new FloatMillisecondsDurationArrayProperty(millisArray)); + Assertions.assertEquals(millisArray, millisArrayRet.getValue()); } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/payload/multipart/MultipartTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/payload/multipart/MultipartTests.java index 09ec4e6fdc8..cec42f0e5e9 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/payload/multipart/MultipartTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/payload/multipart/MultipartTests.java @@ -18,18 +18,24 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.utils.FileUtils; +import payload.multipart.formdata.file.models.FileWithRequiredFilename; +import payload.multipart.formdata.file.models.UploadFileArrayRequest; +import payload.multipart.formdata.file.models.UploadFileRequiredFilenameRequest; +import payload.multipart.formdata.file.models.UploadFileSpecificContentTypeRequest; import payload.multipart.formdata.httpparts.nonstring.models.FloatRequest; import payload.multipart.formdata.models.AnonymousModelRequest; import payload.multipart.models.Address; import payload.multipart.models.BinaryArrayPartsRequest; import payload.multipart.models.ComplexHttpPartsModelRequest; import payload.multipart.models.ComplexPartsRequest; +import payload.multipart.models.FileDetails; import payload.multipart.models.FileOptionalContentType; import payload.multipart.models.FileRequiredMetaData; import payload.multipart.models.FileSpecificContentType; import payload.multipart.models.FileWithHttpPartOptionalContentTypeRequest; import payload.multipart.models.FileWithHttpPartRequiredContentTypeRequest; import payload.multipart.models.FileWithHttpPartSpecificContentTypeRequest; +import payload.multipart.models.FilesFileDetails; import payload.multipart.models.ImageFileDetails; import payload.multipart.models.JsonPartRequest; import payload.multipart.models.MultiBinaryPartsRequest; @@ -308,4 +314,40 @@ public void testNonStringHttpPart() { client.floatMethod(new FloatRequest(0.5)); } + + @Test + public void testUploadFileSpecificContentType() { + FormDataFileClient fileClient + = new MultiPartClientBuilder().addPolicy(validationPolicy).buildFormDataFileClient(); + + fileClient.uploadFileSpecificContentType(new UploadFileSpecificContentTypeRequest( + new FileDetails(BinaryData.fromFile(PNG_FILE)).setFilename("image.png"))); + + validationPolicy.validateContentTypes("image/png"); + } + + @Test + public void testUploadFileRequiredFilename() { + FormDataFileClient fileClient + = new MultiPartClientBuilder().addPolicy(validationPolicy).buildFormDataFileClient(); + + fileClient.uploadFileRequiredFilename(new UploadFileRequiredFilenameRequest( + new FileWithRequiredFilename(BinaryData.fromFile(PNG_FILE), "image.png"))); + + validationPolicy.validateFilenames("image.png"); + validationPolicy.validateContentTypes("image/png"); + } + + @Test + public void testUploadFileArray() { + FormDataFileClient fileClient + = new MultiPartClientBuilder().addPolicy(validationPolicy).buildFormDataFileClient(); + + fileClient.uploadFileArray(new UploadFileArrayRequest( + Arrays.asList(new FilesFileDetails(BinaryData.fromFile(PNG_FILE)).setFilename("image1.png"), + new FilesFileDetails(BinaryData.fromFile(PNG_FILE)).setFilename("image2.png")))); + + validationPolicy.validateFilenames("image1.png", "image2.png"); + validationPolicy.validateContentTypes("image/png", "image/png"); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/payload/multipart/generated/MultiPartClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/payload/multipart/generated/MultiPartClientTestBase.java index 24d5eeb281f..d0ebfc8186f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/payload/multipart/generated/MultiPartClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/payload/multipart/generated/MultiPartClientTestBase.java @@ -14,6 +14,7 @@ import com.azure.core.test.TestProxyTestBase; import com.azure.core.util.Configuration; import payload.multipart.FormDataClient; +import payload.multipart.FormDataFileClient; import payload.multipart.FormDataHttpPartsClient; import payload.multipart.FormDataHttpPartsContentTypeClient; import payload.multipart.FormDataHttpPartsNonStringClient; @@ -28,6 +29,8 @@ class MultiPartClientTestBase extends TestProxyTestBase { protected FormDataHttpPartsNonStringClient formDataHttpPartsNonStringClient; + protected FormDataFileClient formDataFileClient; + @Override protected void beforeTest() { MultiPartClientBuilder formDataClientbuilder = new MultiPartClientBuilder() @@ -68,5 +71,14 @@ protected void beforeTest() { formDataHttpPartsNonStringClient = formDataHttpPartsNonStringClientbuilder.buildFormDataHttpPartsNonStringClient(); + MultiPartClientBuilder formDataFileClientbuilder = new MultiPartClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + formDataFileClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + formDataFileClient = formDataFileClientbuilder.buildFormDataFileClient(); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/payload/pageable/PageableTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/payload/pageable/PageableTests.java deleted file mode 100644 index dd001878448..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/payload/pageable/PageableTests.java +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package payload.pageable; - -//import com.azure.core.http.rest.PagedIterable; -//import org.junit.jupiter.api.Assertions; -//import org.junit.jupiter.api.Test; -//import payload.pageable.models.Pet; - -public class PageableTests { - -// private final ServerDrivenPaginationClient client = new PageableClientBuilder().buildServerDrivenPaginationClient(); -// -// @Test -// public void testNextLink() { -// PagedIterable pagedIterable = client.link(); -// -// Assertions.assertEquals(4, pagedIterable.stream().count()); -// } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/specialwords/ExtensibleStringsClientTest.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/specialwords/ExtensibleStringsClientTest.java new file mode 100644 index 00000000000..633147c06fd --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/specialwords/ExtensibleStringsClientTest.java @@ -0,0 +1,19 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package specialwords; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import specialwords.extensiblestrings.models.ExtensibleString; + +public class ExtensibleStringsClientTest { + + private final ExtensibleStringsClient client = new SpecialWordsClientBuilder().buildExtensibleStringsClient(); + + @Test + public void testPutExtensibleStringValue() { + ExtensibleString result = client.putExtensibleStringValue(ExtensibleString.CLASS); + Assertions.assertEquals(ExtensibleString.CLASS, result); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/specialwords/generated/SpecialWordsClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/specialwords/generated/SpecialWordsClientTestBase.java index 20be242ec4c..04ff1266c8e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/specialwords/generated/SpecialWordsClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/specialwords/generated/SpecialWordsClientTestBase.java @@ -13,6 +13,7 @@ import com.azure.core.test.TestMode; import com.azure.core.test.TestProxyTestBase; import com.azure.core.util.Configuration; +import specialwords.ExtensibleStringsClient; import specialwords.ModelPropertiesClient; import specialwords.ModelsClient; import specialwords.OperationsClient; @@ -24,6 +25,8 @@ class SpecialWordsClientTestBase extends TestProxyTestBase { protected ModelPropertiesClient modelPropertiesClient; + protected ExtensibleStringsClient extensibleStringsClient; + protected OperationsClient operationsClient; protected ParametersClient parametersClient; @@ -48,6 +51,15 @@ protected void beforeTest() { } modelPropertiesClient = modelPropertiesClientbuilder.buildModelPropertiesClient(); + SpecialWordsClientBuilder extensibleStringsClientbuilder = new SpecialWordsClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + extensibleStringsClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + extensibleStringsClient = extensibleStringsClientbuilder.buildExtensibleStringsClient(); + SpecialWordsClientBuilder operationsClientbuilder = new SpecialWordsClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/armstreamstyleserialization/PagedModelPackageTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/armstreamstyleserialization/PagedModelPackageTests.java new file mode 100644 index 00000000000..acc5506f354 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/armstreamstyleserialization/PagedModelPackageTests.java @@ -0,0 +1,32 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package tsptest.armstreamstyleserialization; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; +import tsptest.armstreamstyleserialization.implementation.models.ListResult; +import tsptest.armstreamstyleserialization.implementation.models.ListResultSummary; +import tsptest.armstreamstyleserialization.models.ListResult2; +import tsptest.armstreamstyleserialization.models.ListResult3; + +public class PagedModelPackageTests { + + @Test + public void testPagedModelPackage() { + Assertions.assertTrue(isInImplementationModels(ListResult.class)); + Assertions.assertTrue(isInImplementationModels(ListResultSummary.class)); + + // ListResult2 not in implementation, because its child ListResultSummary2(Inner) is PUBLIC + Assertions.assertFalse(isInImplementationModels(ListResult2.class)); + Assertions.assertFalse(isInImplementationModels(ListResultSummary2Inner.class)); + + // ListResult3 not in implementation, because we add `@access(Access.public)` to the model + Assertions.assertFalse(isInImplementationModels(ListResult3.class)); + } + + private static boolean isInImplementationModels(Class clazz) { + return clazz.getPackage().getName().endsWith(".implementation.models"); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/armstreamstyleserialization/StreamStyleSerializationTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/armstreamstyleserialization/StreamStyleSerializationTests.java index e60cde20dd7..8521d76f970 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/armstreamstyleserialization/StreamStyleSerializationTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/armstreamstyleserialization/StreamStyleSerializationTests.java @@ -11,6 +11,9 @@ import com.azure.core.util.serializer.SerializerAdapter; import com.azure.core.util.serializer.SerializerEncoding; import com.azure.json.JsonProviders; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; import java.io.StringWriter; @@ -23,7 +26,7 @@ import org.utils.ArmUtils; import reactor.core.publisher.Mono; import tsptest.armstreamstyleserialization.fluent.models.FunctionConfiguration; -import tsptest.armstreamstyleserialization.models.Error; +import tsptest.armstreamstyleserialization.models.ErrorMax; import tsptest.armstreamstyleserialization.models.Priority; import tsptest.armstreamstyleserialization.models.SawShark; import tsptest.armstreamstyleserialization.models.Shark; @@ -49,12 +52,12 @@ public void testManagementErrorDeserialization() throws IOException { final String errorBodyWithoutError = "{\"code\":\"WepAppError\",\"message\":\"Web app error.\",\"additionalProperty\":\"Deployment error.\",\"details\":[{\"code\":\"InnerError\", \"additionalProperty\": \"nested\"}]}"; SerializerAdapter serializerAdapter = SerializerFactory.createDefaultManagementSerializerAdapter(); - Error error = serializerAdapter.deserialize(errorBodyWithError, Error.class, SerializerEncoding.JSON); + ErrorMax error = serializerAdapter.deserialize(errorBodyWithError, ErrorMax.class, SerializerEncoding.JSON); Assertions.assertEquals("WepAppError", error.getCode()); Assertions.assertEquals("Deployment error.", error.getAdditionalProperty()); Assertions.assertEquals("nested", error.getDetails().iterator().next().getAdditionalProperty()); - error = serializerAdapter.deserialize(errorBodyWithoutError, Error.class, SerializerEncoding.JSON); + error = serializerAdapter.deserialize(errorBodyWithoutError, ErrorMax.class, SerializerEncoding.JSON); Assertions.assertEquals("WepAppError", error.getCode()); Assertions.assertEquals("Deployment error.", error.getAdditionalProperty()); Assertions.assertEquals("nested", error.getDetails().iterator().next().getAdditionalProperty()); @@ -107,6 +110,73 @@ public void testPropertyWithNullValue() { Assertions.assertEquals("input", jsonDict.get("input")); } + public final static class TestBinary implements JsonSerializable { + private Map unknownDict; + + public Map unknownDict() { + return this.unknownDict; + } + + public TestBinary() { + } + + public TestBinary withUnknownDict(Map unknownDict) { + this.unknownDict = unknownDict; + return this; + } + + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeMapField("unknownDict", this.unknownDict, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); + return jsonWriter.writeEndObject(); + } + + public static TestBinary fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + TestBinary deserializedTestBinary = new TestBinary(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("unknownDict".equals(fieldName)) { + Map unknownDict = reader.readMap(reader1 -> reader1 + .getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()))); + deserializedTestBinary.unknownDict = unknownDict; + } else { + reader.skipChildren(); + } + } + + return deserializedTestBinary; + }); + } + } + + @Test + @SuppressWarnings("unchecked") + public void testBinaryDataInContainer() { + // use a simple class + TestBinary model = new TestBinary().withUnknownDict( + Map.of("string", BinaryData.fromString("\"value\""), "object", BinaryData.fromString("{\"k\", \"v\"}"))); + + com.azure.core.util.BinaryData binaryData = BinaryData.fromObject(model); + String jsonString = binaryData.toString(); + Map jsonMap = BinaryData.fromString(jsonString).toObject(Map.class); + Assertions.assertTrue(jsonMap.containsKey("unknownDict")); + Map unknownDict = (Map) jsonMap.get("unknownDict"); + Assertions.assertEquals("\"value\"", unknownDict.get("string")); + Assertions.assertEquals("{\"k\", \"v\"}", unknownDict.get("object")); + + model = binaryData.toObject(TestBinary.class); + } + @Test public void ensureInstantMaxValue() { // ensure Integer.MAX_VALUE doesn't exceeds Instant.MAX diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/external/generated/ExternalClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/external/generated/ExternalClientTestBase.java new file mode 100644 index 00000000000..7b1224f4c8a --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/external/generated/ExternalClientTestBase.java @@ -0,0 +1,34 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.external.generated; + +// The Java test files under 'generated' package are generated for your reference. +// If you wish to modify these files, please copy them out of the 'generated' package, and modify there. +// See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. + +import com.azure.core.http.policy.HttpLogDetailLevel; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.test.TestMode; +import com.azure.core.test.TestProxyTestBase; +import com.azure.core.util.Configuration; +import tsptest.external.ExternalClient; +import tsptest.external.ExternalClientBuilder; + +class ExternalClientTestBase extends TestProxyTestBase { + protected ExternalClient externalClient; + + @Override + protected void beforeTest() { + ExternalClientBuilder externalClientbuilder + = new ExternalClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + externalClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + externalClient = externalClientbuilder.buildClient(); + + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/visibility/generated/VisibilityClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/visibility/generated/VisibilityClientTestBase.java index 1a2f22b26c4..06914a26ee1 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/visibility/generated/VisibilityClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/visibility/generated/VisibilityClientTestBase.java @@ -13,29 +13,20 @@ import com.azure.core.test.TestMode; import com.azure.core.test.TestProxyTestBase; import com.azure.core.util.Configuration; -import tsptest.visibility.VisibilityClient; import tsptest.visibility.VisibilityClientBuilder; +import tsptest.visibility.VisibilityOpClient; import tsptest.visibility.VisibilityReadClient; import tsptest.visibility.VisibilityWriteClient; class VisibilityClientTestBase extends TestProxyTestBase { - protected VisibilityClient visibilityClient; - protected VisibilityReadClient visibilityReadClient; protected VisibilityWriteClient visibilityWriteClient; + protected VisibilityOpClient visibilityOpClient; + @Override protected void beforeTest() { - VisibilityClientBuilder visibilityClientbuilder - = new VisibilityClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) - .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.RECORD) { - visibilityClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); - } - visibilityClient = visibilityClientbuilder.buildClient(); - VisibilityClientBuilder visibilityReadClientbuilder = new VisibilityClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) @@ -54,5 +45,14 @@ protected void beforeTest() { } visibilityWriteClient = visibilityWriteClientbuilder.buildVisibilityWriteClient(); + VisibilityClientBuilder visibilityOpClientbuilder + = new VisibilityClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + visibilityOpClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + visibilityOpClient = visibilityOpClientbuilder.buildVisibilityOpClient(); + } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/type/file/FileTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/type/file/FileTests.java new file mode 100644 index 00000000000..a6e36026a2a --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/type/file/FileTests.java @@ -0,0 +1,68 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package type.file; + +import com.azure.core.http.HttpHeaderName; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.util.BinaryData; +import java.nio.file.Path; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.utils.FileUtils; +import type.file.models.DownloadFileMultipleContentTypesContentType; + +public class FileTests { + + private static final Path PNG_FILE = FileUtils.getPngFile(); + + private final FileClient client = new FileClientBuilder().buildClient(); + + @Test + public void testUploadFileSpecificContentType() { + client.uploadFileSpecificContentType(BinaryData.fromFile(PNG_FILE)); + } + + @Test + public void testUploadFileJsonContentType() { + // For JSON content type, we need to send a JSON payload + BinaryData jsonData = BinaryData.fromString("{\"message\":\"test file content\"}"); + client.uploadFileJsonContentType(jsonData); + } + + @Test + public void testDownloadFileJsonContentType() { + BinaryData response = client.downloadFileJsonContentType(); + Assertions.assertNotNull(response); + } + + @Test + public void testDownloadFileSpecificContentType() { + BinaryData response = client.downloadFileSpecificContentType(); + Assertions.assertNotNull(response); + } + + @Test + public void testUploadFileMultipleContentTypes() { + client.uploadFileMultipleContentTypesWithResponse("image/png", BinaryData.fromFile(PNG_FILE), null); + } + + @Test + public void testDownloadFileMultipleContentTypes() { + BinaryData response + = client.downloadFileMultipleContentTypes(DownloadFileMultipleContentTypesContentType.IMAGE_PNG); + Assertions.assertNotNull(response); + } + + @Test + public void testUploadFileDefaultContentType() { + client.uploadFileDefaultContentTypeWithResponse(BinaryData.fromFile(PNG_FILE), + new RequestOptions().setHeader(HttpHeaderName.CONTENT_TYPE, "image/png")); + } + + @Test + public void testDownloadFileDefaultContentType() { + BinaryData response = client.downloadFileDefaultContentType(); + Assertions.assertNotNull(response); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/type/file/generated/FileClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/type/file/generated/FileClientTestBase.java new file mode 100644 index 00000000000..7d39e1178d6 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/type/file/generated/FileClientTestBase.java @@ -0,0 +1,34 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package type.file.generated; + +// The Java test files under 'generated' package are generated for your reference. +// If you wish to modify these files, please copy them out of the 'generated' package, and modify there. +// See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. + +import com.azure.core.http.policy.HttpLogDetailLevel; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.test.TestMode; +import com.azure.core.test.TestProxyTestBase; +import com.azure.core.util.Configuration; +import type.file.FileClient; +import type.file.FileClientBuilder; + +class FileClientTestBase extends TestProxyTestBase { + protected FileClient fileClient; + + @Override + protected void beforeTest() { + FileClientBuilder fileClientbuilder = new FileClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + fileClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + fileClient = fileClientbuilder.buildClient(); + + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/tsp/arm-stream-style-serialization.tsp b/packages/http-client-java/generator/http-client-generator-test/tsp/arm-stream-style-serialization.tsp index 4ae6f69c189..0187de15f86 100644 --- a/packages/http-client-java/generator/http-client-generator-test/tsp/arm-stream-style-serialization.tsp +++ b/packages/http-client-java/generator/http-client-generator-test/tsp/arm-stream-style-serialization.tsp @@ -112,8 +112,8 @@ model TopLevelArmResourceProperties { } @error -model ErrorResponse { - error: Error; +model ErrorResponseMax { + error: ErrorMax; } @error @@ -121,11 +121,11 @@ model ErrorResponseMin { error: ErrorMin; } -model Error { +model ErrorMax { code: string; message: string; target: string; - details?: Error[]; + details?: ErrorMax[]; additionalInfo?: AdditionalInfo[]; additionalProperty: string; } @@ -222,7 +222,7 @@ union Priority { @route("/model") interface Fishes { @get - getModel(): Fish | ErrorResponse; + getModel(): Fish | ErrorResponseMax; @put putModel(@body fish: Fish): Fish | ErrorResponseMin; @@ -253,6 +253,7 @@ interface Functions { interface Priorities { @post setPriority(@query priority: Priority): { + @header("Content-Type") contentType: "application/json"; @body body: Priority; }; } @@ -263,6 +264,33 @@ interface Items { @get @list list(): ListResult & ArmLroLocationHeader; + + @get + @list + @route("summary") + summary(): ListResultSummary; + + @get + @list + @route("list2") + list2(): ListResult2; + + @get + @route("summary2") + summary2(): ListResultSummary2; + + @get + @list + @route("list3") + list3(): ListResult3; + + @post + post(@body body: ListResult3): void; +} + +// model does not contain `@pageItems` property, but inherit them from parent +model ListResultSummary extends ListResult { + summary?: string; } model ListResult { @@ -273,6 +301,29 @@ model ListResult { nextLink?: string; } +// This paged model need to be public (instead of in "implementation" package), as its child ListResultSummary2 is public +model ListResult2 { + @pageItems + items: Result[]; + + @nextLink + nextLink?: string; +} + +// This paged model need to be public (instead of in "implementation" package), as it is referenced in public API or public model +@access(Access.public) +model ListResult3 { + @pageItems + items: Result[]; + + @nextLink + nextLink?: string; +} + +model ListResultSummary2 extends ListResult2 { + summary?: string; +} + model Result { name: string; @@ -309,6 +360,9 @@ model Builtin { encoding: Encoded; uuid: Azure.Core.uuid; `unknown`: unknown; + unknownDict: Record; + unknownArray: unknown[]; + unknownDictArray: Record[]; } @encode(DurationKnownEncoding.seconds, float32) diff --git a/packages/http-client-java/generator/http-client-generator-test/tsp/discriminator-edge-cases.tsp b/packages/http-client-java/generator/http-client-generator-test/tsp/discriminator-edge-cases.tsp index b3cfb94ed8c..bb8982abd9e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/tsp/discriminator-edge-cases.tsp +++ b/packages/http-client-java/generator/http-client-generator-test/tsp/discriminator-edge-cases.tsp @@ -32,6 +32,13 @@ model GrandChildWithAnotherDiscriminator extends ChildWithAnotherDiscriminator { differentDiscriminator: "anotherValue"; } +/** Model with @discriminator but no known subtypes. */ +@discriminator("kind") +model ModelWithDiscriminatorNoSubtypes { + kind: string; + name: string; +} + @client({ service: TspTest.DiscriminatorEdgeCases, name: "DiscriminatorEdgeCasesClient", @@ -49,4 +56,10 @@ interface DiscriminatorEdgeCasesOp { getChildNewDiscrim(): { @body body: ChildWithAnotherDiscriminator; }; + + @get + @route("/nosubtypes") + getNoSubtypes(): { + @body body: ModelWithDiscriminatorNoSubtypes; + }; } diff --git a/packages/http-client-java/generator/http-client-generator-test/tsp/enum.tsp b/packages/http-client-java/generator/http-client-generator-test/tsp/enum.tsp index 989388c862b..8545bfbc2b2 100644 --- a/packages/http-client-java/generator/http-client-generator-test/tsp/enum.tsp +++ b/packages/http-client-java/generator/http-client-generator-test/tsp/enum.tsp @@ -202,4 +202,12 @@ interface EnumOp { @header colorArrayOpt?: ColorModel[], ): void; + + // The request and response should be `@header contentType: "application/json", @body body: ColorModel` + // The test here is to make sure the generated code still compile pass, even if it is not the expected operation definition. + @post + @route("operation/wrong-body") + getWrongBody(@body body: ColorModelBase): { + @body body: ColorModelBase; + }; } diff --git a/packages/http-client-java/generator/http-client-generator-test/tsp/external.tsp b/packages/http-client-java/generator/http-client-generator-test/tsp/external.tsp new file mode 100644 index 00000000000..7d736c483fd --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/tsp/external.tsp @@ -0,0 +1,67 @@ +import "@typespec/rest"; +import "@typespec/versioning"; +import "@azure-tools/typespec-azure-core"; +import "@azure-tools/typespec-client-generator-core"; + +using TypeSpec.Http; +using Azure.ClientGenerator.Core; + +@service(#{ title: "External" }) +namespace TspTest.External; + +union CloudEventDataFormat { + string, + "BYTES", + "JSON", +} + +@doc("Days of the week for recurrence schedule.") +union DayOfWeek { + string, + + @doc("Sunday.") + Sunday: "Sunday", + + @doc("Monday.") + Monday: "Monday", + + @doc("Tuesday.") + Tuesday: "Tuesday", + + @doc("Wednesday.") + Wednesday: "Wednesday", + + @doc("Thursday.") + Thursday: "Thursday", + + @doc("Friday.") + Friday: "Friday", + + @doc("Saturday.") + Saturday: "Saturday", +} + +model Body { + cloudEventDataFormat?: CloudEventDataFormat; + dayOfWeek?: DayOfWeek; +} + +@route("/external") +interface ExternalOp { + @post + postExternal(@body body: Body): Body; +} + +@@alternateType(CloudEventDataFormat, + { + identity: "com.azure.core.models.CloudEventDataFormat", + }, + "java" +); + +@@alternateType(DayOfWeek, + { + identity: "java.time.DayOfWeek", + }, + "java" +); diff --git a/packages/http-client-java/generator/http-client-generator-test/tsp/visibility.tsp b/packages/http-client-java/generator/http-client-generator-test/tsp/visibility.tsp index 99a0b7c326a..db783adb259 100644 --- a/packages/http-client-java/generator/http-client-generator-test/tsp/visibility.tsp +++ b/packages/http-client-java/generator/http-client-generator-test/tsp/visibility.tsp @@ -5,6 +5,10 @@ using TypeSpec.Http; using Azure.ClientGenerator.Core; @service(#{ title: "Visibility" }) +@client({ + service: TspTest.Visibility, + name: "VisibilityClient", +}) namespace TspTest.Visibility; model Dog { @@ -51,6 +55,7 @@ interface VisibilityWrite { }; } +@operationGroup @route("/visibility") interface VisibilityOp extends VisibilityRead, VisibilityWrite { @post diff --git a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/JavaSettingsAccessor.java b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/JavaSettingsAccessor.java index e92a8a61425..9d7565681a4 100644 --- a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/JavaSettingsAccessor.java +++ b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/JavaSettingsAccessor.java @@ -5,18 +5,10 @@ import com.microsoft.typespec.http.client.generator.core.extension.plugin.JavaSettings; import com.microsoft.typespec.http.client.generator.core.extension.plugin.NewPlugin; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; public class JavaSettingsAccessor { public static void setHost(NewPlugin host) { - try { - Method setHost = JavaSettings.class.getDeclaredMethod("setHost", NewPlugin.class); - setHost.setAccessible(true); - setHost.invoke(null, host); - } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { - e.printStackTrace(); - } + JavaSettings.setHost(host); } } diff --git a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/Main.java b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/Main.java index 63892116767..c3abc2d89f1 100644 --- a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/Main.java +++ b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/Main.java @@ -30,7 +30,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; import java.util.Map; @@ -200,7 +200,7 @@ private static void handleDPG(CodeModel codeModel, EmitterOptions emitterOptions */ private static void deleteGeneratedJavaFiles(String outputDir, List javaFiles, JavaSettings settings, String suffix) { - Set filesToDelete = new HashSet<>(); + Set filesToDelete = new LinkedHashSet<>(); // clean up source code, based on metadata String metadataFilename = "src/main/resources/META-INF/" diff --git a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/TypeSpecPlugin.java b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/TypeSpecPlugin.java index b3b46c3aed9..32ccf037568 100644 --- a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/TypeSpecPlugin.java +++ b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/TypeSpecPlugin.java @@ -25,7 +25,6 @@ import com.microsoft.typespec.http.client.generator.mapper.TypeSpecMapperFactory; import com.microsoft.typespec.http.client.generator.model.EmitterOptions; import com.microsoft.typespec.http.client.generator.util.FileUtil; -import com.microsoft.typespec.http.client.generator.util.MetadataUtil; import com.microsoft.typespec.http.client.generator.util.ModelUtil; import io.clientcore.core.serialization.json.JsonReader; import io.clientcore.core.utils.CoreUtils; @@ -33,7 +32,7 @@ import java.io.OutputStream; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.TreeMap; @@ -59,13 +58,9 @@ public JavaPackage processTemplates(CodeModel codeModel, Client client, JavaSett JavaPackage javaPackage = super.writeToTemplates(codeModel, client, settings, false); if (emitterOptions.getIncludeApiViewProperties() == Boolean.TRUE) { - TypeSpecMetadata metadata - = new TypeSpecMetadata(ClientModelUtil.getArtifactId(), emitterOptions.getFlavor(), - emitterOptions.getApiVersion() == null - ? MetadataUtil.getLatestApiVersionFromClient(codeModel) - : emitterOptions.getApiVersion(), - collectCrossLanguageDefinitions(client), - FileUtil.filterForJavaSourceFiles(javaPackage.getJavaFiles().stream().map(JavaFile::getFilePath))); + TypeSpecMetadata metadata = new TypeSpecMetadata(ClientModelUtil.getArtifactId(), + emitterOptions.getFlavor(), codeModel.getApiVersionMap(), collectCrossLanguageDefinitions(client), + FileUtil.filterForJavaSourceFiles(javaPackage.getJavaFiles().stream().map(JavaFile::getFilePath))); javaPackage.addTypeSpecMetadata(metadata, null); } @@ -154,7 +149,7 @@ public void writeFile(String fileName, String content, List sourceMap) { LOGGER.info("Write file: {}", outputFile.toAbsolutePath()); } - private static final Map SETTINGS_MAP = new HashMap<>(); + private static final Map SETTINGS_MAP = new LinkedHashMap<>(); static { SETTINGS_MAP.put("data-plane", true); @@ -171,7 +166,7 @@ public void writeFile(String fileName, String content, List sourceMap) { SETTINGS_MAP.put("enable-sync-stack", true); SETTINGS_MAP.put("enable-page-size", true); - SETTINGS_MAP.put("polling", new HashMap()); + SETTINGS_MAP.put("polling", new LinkedHashMap()); SETTINGS_MAP.put("client-logger", true); SETTINGS_MAP.put("required-fields-as-ctor-args", true); diff --git a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/fluent/TypeSpecFluentPlugin.java b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/fluent/TypeSpecFluentPlugin.java index 34ec481db55..ada0d9ae863 100644 --- a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/fluent/TypeSpecFluentPlugin.java +++ b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/fluent/TypeSpecFluentPlugin.java @@ -21,13 +21,12 @@ import com.microsoft.typespec.http.client.generator.mgmt.util.FluentUtils; import com.microsoft.typespec.http.client.generator.model.EmitterOptions; import com.microsoft.typespec.http.client.generator.util.FileUtil; -import com.microsoft.typespec.http.client.generator.util.MetadataUtil; import io.clientcore.core.serialization.json.JsonReader; import io.clientcore.core.utils.CoreUtils; import io.clientcore.core.utils.IOExceptionCheckedFunction; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.TreeMap; @@ -127,16 +126,12 @@ public Client processClient(CodeModel codeModel) { } public FluentJavaPackage processTemplates(CodeModel codeModel, Client client) { - final String apiVersion = emitterOptions.getApiVersion() == null - ? MetadataUtil.getLatestApiVersionFromClient(codeModel) - : emitterOptions.getApiVersion(); - FluentJavaPackage javaPackage = handleTemplate(client); - handleFluentLite(codeModel, client, javaPackage, apiVersion); + handleFluentLite(codeModel, client, javaPackage, codeModel.getApiVersionMap()); if (emitterOptions.getIncludeApiViewProperties() == Boolean.TRUE) { TypeSpecMetadata metadata = new TypeSpecMetadata(FluentUtils.getArtifactId(), emitterOptions.getFlavor(), - apiVersion, collectCrossLanguageDefinitions(client), + codeModel.getApiVersionMap(), collectCrossLanguageDefinitions(client), FileUtil.filterForJavaSourceFiles(javaPackage.getJavaFiles().stream().map(JavaFile::getFilePath))); javaPackage.addTypeSpecMetadata(metadata, getFluentJavaSettings().getMetadataSuffix().orElse(null)); } @@ -157,7 +152,7 @@ protected FluentMapper getFluentMapper() { return fluentMapper; } - private static final Map SETTINGS_MAP = new HashMap<>(); + private static final Map SETTINGS_MAP = new LinkedHashMap<>(); // from fluentnamer/readme.md static { @@ -179,7 +174,7 @@ protected FluentMapper getFluentMapper() { SETTINGS_MAP.put("sync-methods", "all"); SETTINGS_MAP.put("stream-style-serialization", false); - SETTINGS_MAP.put("polling", new HashMap()); + SETTINGS_MAP.put("polling", new LinkedHashMap()); } @SuppressWarnings("unchecked") diff --git a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecClientMapper.java b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecClientMapper.java index 6a85692babc..cb9ddca6e87 100644 --- a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecClientMapper.java +++ b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecClientMapper.java @@ -15,10 +15,10 @@ import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; public class TypeSpecClientMapper extends ClientMapper { @@ -47,21 +47,14 @@ protected Map processClients(List clients, CodeMo @Override protected List getModelsPackages(List clientModels, List enumTypes, List responseModels) { + Set packages = new LinkedHashSet<>(); - Set packages = clientModels.stream() - .filter(ModelUtil::isGeneratingModel) - .map(ClientModel::getPackage) - .collect(Collectors.toSet()); - - packages.addAll(enumTypes.stream() - .filter(ModelUtil::isGeneratingModel) - .map(EnumType::getPackage) - .collect(Collectors.toSet())); - - packages.addAll(responseModels.stream() + clientModels.stream().filter(ModelUtil::isGeneratingModel).map(ClientModel::getPackage).forEach(packages::add); + enumTypes.stream().filter(ModelUtil::isGeneratingModel).map(EnumType::getPackage).forEach(packages::add); + responseModels.stream() .filter(ModelUtil::isGeneratingModel) .map(ClientResponse::getPackage) - .collect(Collectors.toSet())); + .forEach(packages::add); return new ArrayList<>(packages); } diff --git a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/model/EmitterOptions.java b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/model/EmitterOptions.java index 31a21e9ebca..3d0509647a1 100644 --- a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/model/EmitterOptions.java +++ b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/model/EmitterOptions.java @@ -13,7 +13,7 @@ import io.clientcore.core.utils.CoreUtils; import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -34,7 +34,7 @@ public class EmitterOptions implements JsonSerializable { private Boolean includeApiViewProperties = true; private String packageVersion; private Boolean useObjectForUnknown = false; - private Map polling = new HashMap<>(); + private Map polling = new LinkedHashMap<>(); private String modelsSubpackage; private String apiVersion; private Boolean useRestProxy; diff --git a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/util/MetadataUtil.java b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/util/MetadataUtil.java index 7138a74e12f..e222fe46d81 100644 --- a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/util/MetadataUtil.java +++ b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/util/MetadataUtil.java @@ -3,30 +3,9 @@ package com.microsoft.typespec.http.client.generator.util; -import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Client; -import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.CodeModel; -import io.clientcore.core.utils.CoreUtils; - public class MetadataUtil { private MetadataUtil() { } - - /** - * Get latest api-version from first client. This only works in TypeSpec Azure flavor. - * - * @param codeModel the code model. - * @return the latest api-version from first client. - */ - public static String getLatestApiVersionFromClient(CodeModel codeModel) { - String apiVersion = null; - if (!CoreUtils.isNullOrEmpty(codeModel.getClients())) { - Client client = codeModel.getClients().iterator().next(); - if (!CoreUtils.isNullOrEmpty(client.getApiVersions())) { - return client.getApiVersions().get(client.getApiVersions().size() - 1).getVersion(); - } - } - return apiVersion; - } } diff --git a/packages/http-client-java/package-lock.json b/packages/http-client-java/package-lock.json index 7a8a8237c55..4ff6b1e29d8 100644 --- a/packages/http-client-java/package-lock.json +++ b/packages/http-client-java/package-lock.json @@ -1,63 +1,63 @@ { "name": "@typespec/http-client-java", - "version": "0.6.1", + "version": "0.7.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@typespec/http-client-java", - "version": "0.6.1", + "version": "0.7.0", "license": "MIT", "dependencies": { "@autorest/codemodel": "~4.20.1", "js-yaml": "~4.1.1", - "lodash": "~4.17.23" + "lodash": "~4.18.1" }, "devDependencies": { - "@azure-tools/typespec-autorest": "0.64.1", - "@azure-tools/typespec-azure-core": "0.64.0", - "@azure-tools/typespec-azure-resource-manager": "0.64.1", - "@azure-tools/typespec-azure-rulesets": "0.64.0", - "@azure-tools/typespec-client-generator-core": "0.64.5", - "@microsoft/api-extractor": "^7.56.0", - "@microsoft/api-extractor-model": "^7.32.2", + "@azure-tools/typespec-autorest": "0.67.0", + "@azure-tools/typespec-azure-core": "0.67.0", + "@azure-tools/typespec-azure-resource-manager": "0.67.0", + "@azure-tools/typespec-azure-rulesets": "0.67.0", + "@azure-tools/typespec-client-generator-core": "0.67.1", + "@microsoft/api-extractor": "^7.58.2", + "@microsoft/api-extractor-model": "^7.33.6", "@types/js-yaml": "~4.0.9", - "@types/lodash": "~4.17.23", - "@types/node": "~25.2.0", - "@typespec/compiler": "1.8.0", - "@typespec/events": "0.78.0", - "@typespec/http": "1.8.0", - "@typespec/openapi": "1.8.0", - "@typespec/rest": "0.78.0", - "@typespec/spector": "0.1.0-alpha.22", - "@typespec/sse": "0.78.0", - "@typespec/streams": "0.78.0", - "@typespec/versioning": "0.78.0", - "@typespec/xml": "0.78.0", - "@vitest/coverage-v8": "^4.0.18", - "@vitest/ui": "^4.0.18", - "c8": "~10.1.3", - "rimraf": "~6.1.2", - "typescript": "~5.9.3", - "vitest": "^4.0.18" + "@types/lodash": "~4.17.24", + "@types/node": "~25.5.2", + "@typespec/compiler": "1.11.0", + "@typespec/events": "0.81.0", + "@typespec/http": "1.11.0", + "@typespec/openapi": "1.11.0", + "@typespec/rest": "0.81.0", + "@typespec/spector": "0.1.0-alpha.25", + "@typespec/sse": "0.81.0", + "@typespec/streams": "0.81.0", + "@typespec/versioning": "0.81.0", + "@typespec/xml": "0.81.0", + "@vitest/coverage-v8": "^4.1.3", + "@vitest/ui": "^4.1.3", + "c8": "~11.0.0", + "rimraf": "~6.1.3", + "typescript": "~6.0.2", + "vitest": "^4.1.3" }, "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@azure-tools/typespec-autorest": ">=0.64.1 <1.0.0", - "@azure-tools/typespec-azure-core": ">=0.64.0 <1.0.0", - "@azure-tools/typespec-azure-resource-manager": ">=0.64.1 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.64.5 <1.0.0", - "@typespec/compiler": "^1.8.0", - "@typespec/events": ">=0.78.0 <1.0.0", - "@typespec/http": "^1.8.0", - "@typespec/openapi": "^1.8.0", - "@typespec/rest": ">=0.78.0 <1.0.0", - "@typespec/sse": ">=0.78.0 <1.0.0", - "@typespec/streams": ">=0.78.0 <1.0.0", - "@typespec/versioning": ">=0.78.0 <1.0.0", - "@typespec/xml": ">=0.78.0 <1.0.0" + "@azure-tools/typespec-autorest": ">=0.67.0 <1.0.0", + "@azure-tools/typespec-azure-core": ">=0.67.0 <1.0.0", + "@azure-tools/typespec-azure-resource-manager": ">=0.67.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.67.0 <1.0.0", + "@typespec/compiler": "^1.11.0", + "@typespec/events": ">=0.81.0 <1.0.0", + "@typespec/http": "^1.11.0", + "@typespec/openapi": "^1.11.0", + "@typespec/rest": ">=0.81.0 <1.0.0", + "@typespec/sse": ">=0.81.0 <1.0.0", + "@typespec/streams": ">=0.81.0 <1.0.0", + "@typespec/versioning": ">=0.81.0 <1.0.0", + "@typespec/xml": ">=0.81.0 <1.0.0" } }, "node_modules/@autorest/codemodel": { @@ -110,24 +110,24 @@ } }, "node_modules/@azure-tools/typespec-autorest": { - "version": "0.64.1", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.64.1.tgz", - "integrity": "sha512-WzSRiX0XS7hCL+uiivLBYMbirEUenxNzPT4giF0J+r54CVNXq/u8PLnA/06F5EHkXPa92swF4BxB1vFWB2TKow==", + "version": "0.67.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.67.0.tgz", + "integrity": "sha512-RP0TZB46tnYGfN5FKaaXDP5/rDff0PEERKz4epoYsm4RmXeRDYXVcOjw7DXLbcgFpMLTLBf/w/5dqJZBx03KpQ==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": "^0.64.0", - "@azure-tools/typespec-azure-resource-manager": "^0.64.1", - "@azure-tools/typespec-client-generator-core": "^0.64.4", - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/openapi": "^1.8.0", - "@typespec/rest": "^0.78.0", - "@typespec/versioning": "^0.78.0", - "@typespec/xml": "^0.78.0" + "@azure-tools/typespec-azure-core": "^0.67.0", + "@azure-tools/typespec-azure-resource-manager": "^0.67.0", + "@azure-tools/typespec-client-generator-core": "^0.67.0", + "@typespec/compiler": "^1.11.0", + "@typespec/http": "^1.11.0", + "@typespec/openapi": "^1.11.0", + "@typespec/rest": "^0.81.0", + "@typespec/versioning": "^0.81.0", + "@typespec/xml": "^0.81.0" }, "peerDependenciesMeta": { "@typespec/xml": { @@ -136,24 +136,24 @@ } }, "node_modules/@azure-tools/typespec-azure-core": { - "version": "0.64.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.64.0.tgz", - "integrity": "sha512-BXiHc5oayhMsG1dHFU1aFK/ZQX2Gl0dKB0FAFceapaFV9093J2obbsdhIDR3Tl0qei9g3Ha+iWKZ4KgnLdhv4w==", + "version": "0.67.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.67.0.tgz", + "integrity": "sha512-6DO/fOlVihMlPG0oDXrgURf5MNF4iBzPx5SMA5aaFDx/fW6MjiD+TN9Yy9O+l9mVNh1XaEMjhjA8/lmnHZ/U0g==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/rest": "^0.78.0" + "@typespec/compiler": "^1.11.0", + "@typespec/http": "^1.11.0", + "@typespec/rest": "^0.81.0" } }, "node_modules/@azure-tools/typespec-azure-resource-manager": { - "version": "0.64.1", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-resource-manager/-/typespec-azure-resource-manager-0.64.1.tgz", - "integrity": "sha512-qQV/+ZVF1h8PsTNKhmKYyb+vSCgnLA8SoGeEE1oOrevGrrp9VgtOMAZ2xIxj6DpU90QU/8t2+r5P/gcQUV1iqw==", + "version": "0.67.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-resource-manager/-/typespec-azure-resource-manager-0.67.0.tgz", + "integrity": "sha512-NFE1O4zlpo6Y+Lkh3XCo59g+7r141+oBomYib1LncbbpqoGDakHvBH4sLelt9ZCMnYAxlKGbjXrO9E6jd53P2Q==", "dev": true, "license": "MIT", "dependencies": { @@ -164,34 +164,34 @@ "node": ">=20.0.0" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": "^0.64.0", - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/openapi": "^1.8.0", - "@typespec/rest": "^0.78.0", - "@typespec/versioning": "^0.78.0" + "@azure-tools/typespec-azure-core": "^0.67.0", + "@typespec/compiler": "^1.11.0", + "@typespec/http": "^1.11.0", + "@typespec/openapi": "^1.11.0", + "@typespec/rest": "^0.81.0", + "@typespec/versioning": "^0.81.0" } }, "node_modules/@azure-tools/typespec-azure-rulesets": { - "version": "0.64.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-rulesets/-/typespec-azure-rulesets-0.64.0.tgz", - "integrity": "sha512-CvK5iolfsm8oAUZ5wegGVYp4Vvw2rwQa+rcUVoJkwi9c6QwEr+qT6/S4hIntuzEPLxybJSb/ZIWU9Qx3cDrzXg==", + "version": "0.67.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-rulesets/-/typespec-azure-rulesets-0.67.0.tgz", + "integrity": "sha512-YCkyTm090xQR0Gb3CnIdbEd+SbVUY1TRtuPXrBPTsNu3MJwvlaESnkJ7bt9zkP94mAFTNoSTuZlAUKDfPrFaFA==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": "^0.64.0", - "@azure-tools/typespec-azure-resource-manager": "^0.64.0", - "@azure-tools/typespec-client-generator-core": "^0.64.0", - "@typespec/compiler": "^1.8.0" + "@azure-tools/typespec-azure-core": "^0.67.0", + "@azure-tools/typespec-azure-resource-manager": "^0.67.0", + "@azure-tools/typespec-client-generator-core": "^0.67.0", + "@typespec/compiler": "^1.11.0" } }, "node_modules/@azure-tools/typespec-client-generator-core": { - "version": "0.64.5", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.64.5.tgz", - "integrity": "sha512-RaATxsnc9ztdMPoIZ2SuyH97dIGY0BWGKcJBf0hBY+8J3de9o+QH796NA9OsiW+8J9ycCEooDbh/rkAspvA4xA==", + "version": "0.67.1", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.67.1.tgz", + "integrity": "sha512-Bh7M1KSrgBOMeueK+YiJiaZ+uo3119mNIcbHgU8006CSToDHSTeIM7rndUmCSn+leAKonpXhQ6eElOWj0teBWA==", "dev": true, "license": "MIT", "dependencies": { @@ -203,16 +203,16 @@ "node": ">=20.0.0" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": "^0.64.0", - "@typespec/compiler": "^1.8.0", - "@typespec/events": "^0.78.0", - "@typespec/http": "^1.8.0", - "@typespec/openapi": "^1.8.0", - "@typespec/rest": "^0.78.0", - "@typespec/sse": "^0.78.0", - "@typespec/streams": "^0.78.0", - "@typespec/versioning": "^0.78.0", - "@typespec/xml": "^0.78.0" + "@azure-tools/typespec-azure-core": "^0.67.0", + "@typespec/compiler": "^1.11.0", + "@typespec/events": "^0.81.0", + "@typespec/http": "^1.11.0", + "@typespec/openapi": "^1.11.0", + "@typespec/rest": "^0.81.0", + "@typespec/sse": "^0.81.0", + "@typespec/streams": "^0.81.0", + "@typespec/versioning": "^0.81.0", + "@typespec/xml": "^0.81.0" } }, "node_modules/@azure/abort-controller": { @@ -263,18 +263,20 @@ } }, "node_modules/@azure/core-http-compat": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@azure/core-http-compat/-/core-http-compat-2.3.1.tgz", - "integrity": "sha512-az9BkXND3/d5VgdRRQVkiJb2gOmDU8Qcq4GvjtBmDICNiQ9udFmDk4ZpSB5Qq1OmtDJGlQAfBaS4palFsazQ5g==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@azure/core-http-compat/-/core-http-compat-2.3.2.tgz", + "integrity": "sha512-Tf6ltdKzOJEgxZeWLCjMxrxbodB/ZeCbzzA1A2qHbhzAjzjHoBVSUeSl/baT/oHAxhc4qdqVaDKnc2+iE932gw==", "dev": true, "license": "MIT", "dependencies": { - "@azure/abort-controller": "^2.1.2", - "@azure/core-client": "^1.10.0", - "@azure/core-rest-pipeline": "^1.22.0" + "@azure/abort-controller": "^2.1.2" }, "engines": { "node": ">=20.0.0" + }, + "peerDependencies": { + "@azure/core-client": "^1.10.0", + "@azure/core-rest-pipeline": "^1.22.0" } }, "node_modules/@azure/core-lro": { @@ -307,9 +309,9 @@ } }, "node_modules/@azure/core-rest-pipeline": { - "version": "1.22.2", - "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.22.2.tgz", - "integrity": "sha512-MzHym+wOi8CLUlKCQu12de0nwcq9k9Kuv43j4Wa++CsCpJwps2eeBQwD2Bu8snkxTtDKDx4GwjuR9E8yC8LNrg==", + "version": "1.23.0", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.23.0.tgz", + "integrity": "sha512-Evs1INHo+jUjwHi1T6SG6Ua/LHOQBCLuKEEE6efIpt4ZOoNonaT1kP32GoOcdNDbfqsD2445CPri3MubBy5DEQ==", "dev": true, "license": "MIT", "dependencies": { @@ -318,7 +320,7 @@ "@azure/core-tracing": "^1.3.0", "@azure/core-util": "^1.13.0", "@azure/logger": "^1.3.0", - "@typespec/ts-http-runtime": "^0.3.0", + "@typespec/ts-http-runtime": "^0.3.4", "tslib": "^2.6.2" }, "engines": { @@ -405,22 +407,22 @@ } }, "node_modules/@azure/msal-browser": { - "version": "4.27.0", - "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-4.27.0.tgz", - "integrity": "sha512-bZ8Pta6YAbdd0o0PEaL1/geBsPrLEnyY/RDWqvF1PP9RUH8EMLvUMGoZFYS6jSlUan6KZ9IMTLCnwpWWpQRK/w==", + "version": "4.29.0", + "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-4.29.0.tgz", + "integrity": "sha512-/f3eHkSNUTl6DLQHm+bKecjBKcRQxbd/XLx8lvSYp8Nl/HRyPuIPOijt9Dt0sH50/SxOwQ62RnFCmFlGK+bR/w==", "dev": true, "license": "MIT", "dependencies": { - "@azure/msal-common": "15.13.3" + "@azure/msal-common": "15.15.0" }, "engines": { "node": ">=0.8.0" } }, "node_modules/@azure/msal-common": { - "version": "15.13.3", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.13.3.tgz", - "integrity": "sha512-shSDU7Ioecya+Aob5xliW9IGq1Ui8y4EVSdWGyI1Gbm4Vg61WpP95LuzcY214/wEjSn6w4PZYD4/iVldErHayQ==", + "version": "15.15.0", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.15.0.tgz", + "integrity": "sha512-/n+bN0AKlVa+AOcETkJSKj38+bvFs78BaP4rNtv3MJCmPH0YrHiskMRe74OhyZ5DZjGISlFyxqvf9/4QVEi2tw==", "dev": true, "license": "MIT", "engines": { @@ -428,13 +430,13 @@ } }, "node_modules/@azure/msal-node": { - "version": "3.8.4", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.4.tgz", - "integrity": "sha512-lvuAwsDpPDE/jSuVQOBMpLbXuVuLsPNRwWCyK3/6bPlBk0fGWegqoZ0qjZclMWyQ2JNvIY3vHY7hoFmFmFQcOw==", + "version": "3.8.8", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.8.tgz", + "integrity": "sha512-+f1VrJH1iI517t4zgmuhqORja0bL6LDQXfBqkjuMmfTYXTQQnh1EvwwxO3UbKLT05N0obF72SRHFrC1RBDv5Gg==", "dev": true, "license": "MIT", "dependencies": { - "@azure/msal-common": "15.13.3", + "@azure/msal-common": "15.15.0", "jsonwebtoken": "^9.0.0", "uuid": "^8.3.0" }, @@ -443,9 +445,9 @@ } }, "node_modules/@azure/storage-blob": { - "version": "12.29.1", - "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.29.1.tgz", - "integrity": "sha512-7ktyY0rfTM0vo7HvtK6E3UvYnI9qfd6Oz6z/+92VhGRveWng3kJwMKeUpqmW/NmwcDNbxHpSlldG+vsUnRFnBg==", + "version": "12.31.0", + "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.31.0.tgz", + "integrity": "sha512-DBgNv10aCSxopt92DkTDD0o9xScXeBqPKGmR50FPZQaEcH4JLQ+GEOGEDv19V5BMkB7kxr+m4h6il/cCDPvmHg==", "dev": true, "license": "MIT", "dependencies": { @@ -460,7 +462,7 @@ "@azure/core-util": "^1.11.0", "@azure/core-xml": "^1.4.5", "@azure/logger": "^1.1.4", - "@azure/storage-common": "^12.1.1", + "@azure/storage-common": "^12.3.0", "events": "^3.0.0", "tslib": "^2.8.1" }, @@ -469,9 +471,9 @@ } }, "node_modules/@azure/storage-common": { - "version": "12.1.1", - "resolved": "https://registry.npmjs.org/@azure/storage-common/-/storage-common-12.1.1.tgz", - "integrity": "sha512-eIOH1pqFwI6UmVNnDQvmFeSg0XppuzDLFeUNO/Xht7ODAzRLgGDh7h550pSxoA+lPDxBl1+D2m/KG3jWzCUjTg==", + "version": "12.3.0", + "resolved": "https://registry.npmjs.org/@azure/storage-common/-/storage-common-12.3.0.tgz", + "integrity": "sha512-/OFHhy86aG5Pe8dP5tsp+BuJ25JOAl9yaMU3WZbkeoiFMHFtJ7tu5ili7qEdBXNW9G5lDB19trwyI6V49F/8iQ==", "dev": true, "license": "MIT", "dependencies": { @@ -490,13 +492,13 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", - "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz", + "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.27.1", + "@babel/helper-validator-identifier": "^7.28.5", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" }, @@ -525,13 +527,13 @@ } }, "node_modules/@babel/parser": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz", - "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==", + "version": "7.29.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.2.tgz", + "integrity": "sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.28.5" + "@babel/types": "^7.29.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -541,9 +543,9 @@ } }, "node_modules/@babel/types": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz", - "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz", + "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==", "dev": true, "license": "MIT", "dependencies": { @@ -564,452 +566,44 @@ "node": ">=18" } }, - "node_modules/@esbuild/aix-ppc64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz", - "integrity": "sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-arm": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.2.tgz", - "integrity": "sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.2.tgz", - "integrity": "sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.2.tgz", - "integrity": "sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.2.tgz", - "integrity": "sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.2.tgz", - "integrity": "sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.2.tgz", - "integrity": "sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.2.tgz", - "integrity": "sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.2.tgz", - "integrity": "sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.2.tgz", - "integrity": "sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.2.tgz", - "integrity": "sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.2.tgz", - "integrity": "sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==", - "cpu": [ - "loong64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.2.tgz", - "integrity": "sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==", - "cpu": [ - "mips64el" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.2.tgz", - "integrity": "sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.2.tgz", - "integrity": "sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.2.tgz", - "integrity": "sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==", - "cpu": [ - "s390x" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.2.tgz", - "integrity": "sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/netbsd-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.2.tgz", - "integrity": "sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.2.tgz", - "integrity": "sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openbsd-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.2.tgz", - "integrity": "sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.2.tgz", - "integrity": "sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openharmony-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.2.tgz", - "integrity": "sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openharmony" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.2.tgz", - "integrity": "sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.2.tgz", - "integrity": "sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==", - "cpu": [ - "arm64" - ], + "node_modules/@emnapi/core": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.9.1.tgz", + "integrity": "sha512-mukuNALVsoix/w1BJwFzwXBN/dHeejQtuVzcDsfOEsdpCumXb/E9j8w11h5S54tT1xhifGfbbSm/ICrObRb3KA==", "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" + "dependencies": { + "@emnapi/wasi-threads": "1.2.0", + "tslib": "^2.4.0" } }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.2.tgz", - "integrity": "sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==", - "cpu": [ - "ia32" - ], + "node_modules/@emnapi/runtime": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.9.1.tgz", + "integrity": "sha512-VYi5+ZVLhpgK4hQ0TAjiQiZ6ol0oe4mBx7mVv7IflsiEp0OWoVsp/+f9Vc1hOhE0TtkORVrI1GvzyreqpgWtkA==", "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" + "dependencies": { + "tslib": "^2.4.0" } }, - "node_modules/@esbuild/win32-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz", - "integrity": "sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==", - "cpu": [ - "x64" - ], + "node_modules/@emnapi/wasi-threads": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.0.tgz", + "integrity": "sha512-N10dEJNSsUx41Z6pZsXU8FjPjpBEplgH24sfkmITrBED1/U2Esum9F3lfLrMjKHHjmi557zQn7kR9R+XWXu5Rg==", "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" + "dependencies": { + "tslib": "^2.4.0" } }, "node_modules/@inquirer/ansi": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/ansi/-/ansi-2.0.2.tgz", - "integrity": "sha512-SYLX05PwJVnW+WVegZt1T4Ip1qba1ik+pNJPDiqvk6zS5Y/i8PhRzLpGEtVd7sW0G8cMtkD8t4AZYhQwm8vnww==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@inquirer/ansi/-/ansi-2.0.5.tgz", + "integrity": "sha512-doc2sWgJpbFQ64UflSVd17ibMGDuxO1yKgOgLMwavzESnXjFWJqUeG8saYosqKpHp4kWiM5x1nXvEjbpx90gzw==", "dev": true, "license": "MIT", "engines": { @@ -1017,16 +611,16 @@ } }, "node_modules/@inquirer/checkbox": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-5.0.2.tgz", - "integrity": "sha512-iTPV4tMMct7iOpwer5qmTP7gjnk1VQJjsNfAaC2b8Q3qiuHM3K2yjjDr5u1MKfkrvp2JD4Flf8sIPpF21pmZmw==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-5.1.3.tgz", + "integrity": "sha512-+G7I8CT+EHv/hasNfUl3P37DVoMoZfpA+2FXmM54dA8MxYle1YqucxbacxHalw1iAFSdKNEDTGNV7F+j1Ldqcg==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/ansi": "^2.0.2", - "@inquirer/core": "^11.0.2", - "@inquirer/figures": "^2.0.2", - "@inquirer/type": "^4.0.2" + "@inquirer/ansi": "^2.0.5", + "@inquirer/core": "^11.1.8", + "@inquirer/figures": "^2.0.5", + "@inquirer/type": "^4.0.5" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1041,14 +635,14 @@ } }, "node_modules/@inquirer/confirm": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-6.0.2.tgz", - "integrity": "sha512-A0/13Wyi+8iFeNDX6D4zZYKPoBLIEbE4K/219qHcnpXMer2weWvaTo63+2c7mQPPA206DEMSYVOPnEw3meOlCw==", + "version": "6.0.11", + "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-6.0.11.tgz", + "integrity": "sha512-pTpHjg0iEIRMYV/7oCZUMf27/383E6Wyhfc/MY+AVQGEoUobffIYWOK9YLP2XFRGz/9i6WlTQh1CkFVIo2Y7XA==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^11.0.2", - "@inquirer/type": "^4.0.2" + "@inquirer/core": "^11.1.8", + "@inquirer/type": "^4.0.5" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1063,19 +657,19 @@ } }, "node_modules/@inquirer/core": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-11.0.2.tgz", - "integrity": "sha512-lgMRx/n02ciiNELBvFLHtmcjbV5tf5D/I0UYfCg2YbTZWmBZ10/niLd3IjWBxz8LtM27xP+4oLEa06Slmb7p7A==", + "version": "11.1.8", + "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-11.1.8.tgz", + "integrity": "sha512-/u+yJk2pOKNDOh1ZgdUH2RQaRx6OOH4I0uwL95qPvTFTIL38YBsuSC4r1yXBB3Q6JvNqFFc202gk0Ew79rrcjA==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/ansi": "^2.0.2", - "@inquirer/figures": "^2.0.2", - "@inquirer/type": "^4.0.2", + "@inquirer/ansi": "^2.0.5", + "@inquirer/figures": "^2.0.5", + "@inquirer/type": "^4.0.5", "cli-width": "^4.1.0", + "fast-wrap-ansi": "^0.2.0", "mute-stream": "^3.0.0", - "signal-exit": "^4.1.0", - "wrap-ansi": "^9.0.2" + "signal-exit": "^4.1.0" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1089,101 +683,16 @@ } } }, - "node_modules/@inquirer/core/node_modules/ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@inquirer/core/node_modules/ansi-styles": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", - "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@inquirer/core/node_modules/emoji-regex": { - "version": "10.6.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", - "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", - "dev": true, - "license": "MIT" - }, - "node_modules/@inquirer/core/node_modules/string-width": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@inquirer/core/node_modules/strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@inquirer/core/node_modules/wrap-ansi": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", - "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^6.2.1", - "string-width": "^7.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, "node_modules/@inquirer/editor": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-5.0.2.tgz", - "integrity": "sha512-pXQ4Nf0qmFcJuYB6NlcIIxH6l6zKOwNg1Jh/ZRdKd2dTqBB4OXKUFbFwR2K4LVXVtq15ZFFatBVT+rerYR8hWQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-5.1.0.tgz", + "integrity": "sha512-6wlkYl65Qfayy48gPCfU4D7li6KCAGN79mLXa/tYHZH99OfZ820yY+HA+DgE88r8YwwgeuY6PQgNqMeK6LuMmw==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^11.0.2", - "@inquirer/external-editor": "^2.0.2", - "@inquirer/type": "^4.0.2" + "@inquirer/core": "^11.1.8", + "@inquirer/external-editor": "^3.0.0", + "@inquirer/type": "^4.0.5" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1198,14 +707,14 @@ } }, "node_modules/@inquirer/expand": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-5.0.2.tgz", - "integrity": "sha512-siFG1swxfjFIOxIcehtZkh+KUNB/YCpyfHNEGu+nC/SBXIbgUWibvThLn/WesSxLRGOeSKdNKoTm+GQCKFm6Ww==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-5.0.12.tgz", + "integrity": "sha512-vOfrB33b7YIZfDauXS8vNNz2Z86FozTZLIt7e+7/dCaPJ1RXZsHCuI9TlcERzEUq57vkM+UdnBgxP0rFd23JYQ==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^11.0.2", - "@inquirer/type": "^4.0.2" + "@inquirer/core": "^11.1.8", + "@inquirer/type": "^4.0.5" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1220,14 +729,14 @@ } }, "node_modules/@inquirer/external-editor": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-2.0.2.tgz", - "integrity": "sha512-X/fMXK7vXomRWEex1j8mnj7s1mpnTeP4CO/h2gysJhHLT2WjBnLv4ZQEGpm/kcYI8QfLZ2fgW+9kTKD+jeopLg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-3.0.0.tgz", + "integrity": "sha512-lDSwMgg+M5rq6JKBYaJwSX6T9e/HK2qqZ1oxmOwn4AQoJE5D+7TumsxLGC02PWS//rkIVqbZv3XA3ejsc9FYvg==", "dev": true, "license": "MIT", "dependencies": { "chardet": "^2.1.1", - "iconv-lite": "^0.7.0" + "iconv-lite": "^0.7.2" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1242,9 +751,9 @@ } }, "node_modules/@inquirer/figures": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-2.0.2.tgz", - "integrity": "sha512-qXm6EVvQx/FmnSrCWCIGtMHwqeLgxABP8XgcaAoywsL0NFga9gD5kfG0gXiv80GjK9Hsoz4pgGwF/+CjygyV9A==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-2.0.5.tgz", + "integrity": "sha512-NsSs4kzfm12lNetHwAn3GEuH317IzpwrMCbOuMIVytpjnJ90YYHNwdRgYGuKmVxwuIqSgqk3M5qqQt1cDk0tGQ==", "dev": true, "license": "MIT", "engines": { @@ -1252,14 +761,14 @@ } }, "node_modules/@inquirer/input": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-5.0.2.tgz", - "integrity": "sha512-hN2YRo1QiEc9lD3mK+CPnTS4TK2RhCMmMmP4nCWwTkmQL2vx9jPJWYk+rbUZpwR1D583ZJk1FI3i9JZXIpi/qg==", + "version": "5.0.11", + "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-5.0.11.tgz", + "integrity": "sha512-twUWidn4ocPO8qi6fRM7tNWt7W1FOnOZqQ+/+PsfLUacMR5rFLDPK9ql0nBPwxi0oELbo8T5NhRs8B2+qQEqFQ==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^11.0.2", - "@inquirer/type": "^4.0.2" + "@inquirer/core": "^11.1.8", + "@inquirer/type": "^4.0.5" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1274,14 +783,14 @@ } }, "node_modules/@inquirer/number": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-4.0.2.tgz", - "integrity": "sha512-4McnjTSYrlthNW1ojkkmP75WLRYhQs7GXm6pDDoIrHqJuV5uUYwfdbB0geHdaKMarAqJQgoOVjzIT0jdWCsKew==", + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-4.0.11.tgz", + "integrity": "sha512-Vscmim9TCksQsfjPtka/JwPUcbLhqWYrgfPf1cHrCm24X/F2joFwnageD50yMKsaX14oNGOyKf/RNXAFkNjWpA==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^11.0.2", - "@inquirer/type": "^4.0.2" + "@inquirer/core": "^11.1.8", + "@inquirer/type": "^4.0.5" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1296,15 +805,15 @@ } }, "node_modules/@inquirer/password": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-5.0.2.tgz", - "integrity": "sha512-oSDziMKiw4G2e4zS+0JRfxuPFFGh6N/9yUaluMgEHp2/Yyj2JGwfDO7XbwtOrxVrz+XsP/iaGyWXdQb9d8A0+g==", + "version": "5.0.11", + "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-5.0.11.tgz", + "integrity": "sha512-9KZFeRaNHIcejtPb0wN4ddFc7EvobVoAFa049eS3LrDZFxI8O7xUXiITEOinBzkZFAIwY5V4yzQae/QfO9cbbg==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/ansi": "^2.0.2", - "@inquirer/core": "^11.0.2", - "@inquirer/type": "^4.0.2" + "@inquirer/ansi": "^2.0.5", + "@inquirer/core": "^11.1.8", + "@inquirer/type": "^4.0.5" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1319,22 +828,22 @@ } }, "node_modules/@inquirer/prompts": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-8.0.2.tgz", - "integrity": "sha512-2zK5zY48fZcl6+gG4eqOC/UzZsJckHCRvjXoLuW4D8LKOCVGdcJiSKkLnumSZjR/6PXPINDGOrGHqNxb+sxJDg==", + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-8.4.1.tgz", + "integrity": "sha512-AH5xPQ997K7e0F0vulPlteIHke2awMkFi8F0dBemrDfmvtPmHJo82mdHbONC4F/t8d1NHwrbI5cGVI+RbLWdoQ==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/checkbox": "^5.0.2", - "@inquirer/confirm": "^6.0.2", - "@inquirer/editor": "^5.0.2", - "@inquirer/expand": "^5.0.2", - "@inquirer/input": "^5.0.2", - "@inquirer/number": "^4.0.2", - "@inquirer/password": "^5.0.2", - "@inquirer/rawlist": "^5.0.2", - "@inquirer/search": "^4.0.2", - "@inquirer/select": "^5.0.2" + "@inquirer/checkbox": "^5.1.3", + "@inquirer/confirm": "^6.0.11", + "@inquirer/editor": "^5.1.0", + "@inquirer/expand": "^5.0.12", + "@inquirer/input": "^5.0.11", + "@inquirer/number": "^4.0.11", + "@inquirer/password": "^5.0.11", + "@inquirer/rawlist": "^5.2.7", + "@inquirer/search": "^4.1.7", + "@inquirer/select": "^5.1.3" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1349,14 +858,14 @@ } }, "node_modules/@inquirer/rawlist": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-5.0.2.tgz", - "integrity": "sha512-AcNALEdQKUQDeJcpC1a3YC53m1MLv+sMUS+vRZ8Qigs1Yg3Dcdtmi82rscJplogKOY8CXkKW4wvVwHS2ZjCIBQ==", + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-5.2.7.tgz", + "integrity": "sha512-AqRMiD9+uE1lskDPrdqHwrV/EUmxKEBLX44SR7uxK3vD2413AmVfE5EQaPeNzYf5Pq5SitHJDYUFVF0poIr09w==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^11.0.2", - "@inquirer/type": "^4.0.2" + "@inquirer/core": "^11.1.8", + "@inquirer/type": "^4.0.5" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1371,187 +880,68 @@ } }, "node_modules/@inquirer/search": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-4.0.2.tgz", - "integrity": "sha512-hg63w5toohdzE65S3LiGhdfIL0kT+yisbZARf7zw65PvyMUTutTN3eMAvD/B6y/25z88vTrB7kSB45Vz5CbrXg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/core": "^11.0.2", - "@inquirer/figures": "^2.0.2", - "@inquirer/type": "^4.0.2" - }, - "engines": { - "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" - }, - "peerDependencies": { - "@types/node": ">=18" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, - "node_modules/@inquirer/select": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-5.0.2.tgz", - "integrity": "sha512-JygTohvQxSNnvt7IKANVlg/eds+yN5sLRilYeGc4ri/9Aqi/2QPoXBMV5Cz/L1VtQv63SnTbPXJZeCK2pSwsOA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/ansi": "^2.0.2", - "@inquirer/core": "^11.0.2", - "@inquirer/figures": "^2.0.2", - "@inquirer/type": "^4.0.2" - }, - "engines": { - "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" - }, - "peerDependencies": { - "@types/node": ">=18" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, - "node_modules/@inquirer/type": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-4.0.2.tgz", - "integrity": "sha512-cae7mzluplsjSdgFA6ACLygb5jC8alO0UUnFPyu0E7tNRPrL+q/f8VcSXp+cjZQ7l5CMpDpi2G1+IQvkOiL1Lw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" - }, - "peerDependencies": { - "@types/node": ">=18" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, - "node_modules/@isaacs/balanced-match": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", - "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/@isaacs/brace-expansion": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz", - "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@isaacs/balanced-match": "^4.0.1" - }, - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, - "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true - }, - "node_modules/@isaacs/cliui/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-4.1.7.tgz", + "integrity": "sha512-1y7+0N65AWk5RdlXH/Kn13txf3IjIQ7OEfhCEkDTU+h5wKMLq8DUF3P6z+/kLSxDGDtQT1dRBWEUC3o/VvImsQ==", "dev": true, + "license": "MIT", "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" + "@inquirer/core": "^11.1.8", + "@inquirer/figures": "^2.0.5", + "@inquirer/type": "^4.0.5" }, "engines": { - "node": ">=12" + "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "node_modules/@inquirer/select": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-5.1.3.tgz", + "integrity": "sha512-zYyqWgGQi3NhBcNq4Isc5rB3oEdQEh1Q/EcAnOW0FK4MpnXWkvSBYgA4cYrTM4A9UB573omouZbnL9JJ74Mq3A==", "dev": true, + "license": "MIT", "dependencies": { - "ansi-regex": "^6.0.1" + "@inquirer/ansi": "^2.0.5", + "@inquirer/core": "^11.1.8", + "@inquirer/figures": "^2.0.5", + "@inquirer/type": "^4.0.5" }, "engines": { - "node": ">=12" + "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, - "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "node_modules/@inquirer/type": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-4.0.5.tgz", + "integrity": "sha512-aetVUNeKNc/VriqXlw1NRSW0zhMBB0W4bNbWRJgzRl/3d0QNDQFfk0GO5SDdtjMZVg6o8ZKEiadd7SCCzoOn5Q==", "dev": true, - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, + "license": "MIT", "engines": { - "node": ">=12" + "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@isaacs/fs-minipass": { @@ -1572,6 +962,7 @@ "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -1604,41 +995,41 @@ } }, "node_modules/@microsoft/api-extractor": { - "version": "7.56.0", - "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.56.0.tgz", - "integrity": "sha512-H0V69QG5jIb9Ayx35NVBv2lOgFSS3q+Eab2oyGEy0POL3ovYPST+rCNPbwYoczOZXNG8IKjWUmmAMxmDTsXlQA==", + "version": "7.58.2", + "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.58.2.tgz", + "integrity": "sha512-qmqWa0Fx1xn3irQy8MyuAKUs8e3CdwMJOujaPkM8gx5v/V7RcLhTjBU0/uL2kdhmROpW+5WG1FD98O441kkvQQ==", "dev": true, "license": "MIT", "dependencies": { - "@microsoft/api-extractor-model": "7.32.2", + "@microsoft/api-extractor-model": "7.33.6", "@microsoft/tsdoc": "~0.16.0", - "@microsoft/tsdoc-config": "~0.18.0", - "@rushstack/node-core-library": "5.19.1", - "@rushstack/rig-package": "0.6.0", - "@rushstack/terminal": "0.21.0", - "@rushstack/ts-command-line": "5.1.7", + "@microsoft/tsdoc-config": "~0.18.1", + "@rushstack/node-core-library": "5.22.0", + "@rushstack/rig-package": "0.7.2", + "@rushstack/terminal": "0.22.5", + "@rushstack/ts-command-line": "5.3.5", "diff": "~8.0.2", - "lodash": "~4.17.15", - "minimatch": "10.0.3", + "lodash": "~4.18.1", + "minimatch": "10.2.3", "resolve": "~1.22.1", "semver": "~7.5.4", "source-map": "~0.6.1", - "typescript": "5.8.2" + "typescript": "5.9.3" }, "bin": { "api-extractor": "bin/api-extractor" } }, "node_modules/@microsoft/api-extractor-model": { - "version": "7.32.2", - "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.32.2.tgz", - "integrity": "sha512-Ussc25rAalc+4JJs9HNQE7TuO9y6jpYQX9nWD1DhqUzYPBr3Lr7O9intf+ZY8kD5HnIqeIRJX7ccCT0QyBy2Ww==", + "version": "7.33.6", + "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.33.6.tgz", + "integrity": "sha512-E9iI4yGEVVusbTAqSLetVFxDuBVCVqCigcoQwdJuOjsLq5Hry3MkBgUQhSZNzLCu17pgjk58MI80GRDJLht/1A==", "dev": true, "license": "MIT", "dependencies": { "@microsoft/tsdoc": "~0.16.0", - "@microsoft/tsdoc-config": "~0.18.0", - "@rushstack/node-core-library": "5.19.1" + "@microsoft/tsdoc-config": "~0.18.1", + "@rushstack/node-core-library": "5.22.0" } }, "node_modules/@microsoft/api-extractor/node_modules/lru-cache": { @@ -1669,9 +1060,9 @@ } }, "node_modules/@microsoft/api-extractor/node_modules/typescript": { - "version": "5.8.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz", - "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==", + "version": "5.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", + "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", "bin": { @@ -1690,18 +1081,37 @@ "license": "MIT" }, "node_modules/@microsoft/tsdoc-config": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.18.0.tgz", - "integrity": "sha512-8N/vClYyfOH+l4fLkkr9+myAoR6M7akc8ntBJ4DJdWH2b09uVfr71+LTMpNyG19fNqWDg8KEDZhx5wxuqHyGjw==", + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.18.1.tgz", + "integrity": "sha512-9brPoVdfN9k9g0dcWkFeA7IH9bbcttzDJlXvkf8b2OBzd5MueR1V2wkKBL0abn0otvmkHJC6aapBOTJDDeMCZg==", "dev": true, "license": "MIT", "dependencies": { "@microsoft/tsdoc": "0.16.0", - "ajv": "~8.12.0", + "ajv": "~8.18.0", "jju": "~1.4.0", "resolve": "~1.22.2" } }, + "node_modules/@napi-rs/wasm-runtime": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.2.tgz", + "integrity": "sha512-sNXv5oLJ7ob93xkZ1XnxisYhGYXfaG9f65/ZgYuAu3qt7b3NadcOEhLvx28hv31PgX8SZJRYrAIPQilQmFpLVw==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@tybys/wasm-util": "^0.10.1" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + }, + "peerDependencies": { + "@emnapi/core": "^1.7.1", + "@emnapi/runtime": "^1.7.1" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -1740,14 +1150,14 @@ "node": ">= 8" } }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "node_modules/@oxc-project/types": { + "version": "0.123.0", + "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.123.0.tgz", + "integrity": "sha512-YtECP/y8Mj1lSHiUWGSRzy/C6teUKlS87dEfuVKT09LgQbUsBW1rNg+MiJ4buGu3yuADV60gbIvo9/HplA56Ew==", "dev": true, - "optional": true, - "engines": { - "node": ">=14" + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/Boshen" } }, "node_modules/@polka/url": { @@ -1757,24 +1167,10 @@ "dev": true, "license": "MIT" }, - "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.56.0.tgz", - "integrity": "sha512-LNKIPA5k8PF1+jAFomGe3qN3bbIgJe/IlpDBwuVjrDKrJhVWywgnJvflMt/zkbVNLFtF1+94SljYQS6e99klnw==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@rollup/rollup-android-arm64": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.56.0.tgz", - "integrity": "sha512-lfbVUbelYqXlYiU/HApNMJzT1E87UPGvzveGg2h0ktUNlOCxKlWuJ9jtfvs1sKHdwU4fzY7Pl8sAl49/XaEk6Q==", + "node_modules/@rolldown/binding-android-arm64": { + "version": "1.0.0-rc.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.0-rc.13.tgz", + "integrity": "sha512-5ZiiecKH2DXAVJTNN13gNMUcCDg4Jy8ZjbXEsPnqa248wgOVeYRX0iqXXD5Jz4bI9BFHgKsI2qmyJynstbmr+g==", "cpu": [ "arm64" ], @@ -1783,12 +1179,15 @@ "optional": true, "os": [ "android" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.56.0.tgz", - "integrity": "sha512-EgxD1ocWfhoD6xSOeEEwyE7tDvwTgZc8Bss7wCWe+uc7wO8G34HHCUH+Q6cHqJubxIAnQzAsyUsClt0yFLu06w==", + "node_modules/@rolldown/binding-darwin-arm64": { + "version": "1.0.0-rc.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.0.0-rc.13.tgz", + "integrity": "sha512-tz/v/8G77seu8zAB3A5sK3UFoOl06zcshEzhUO62sAEtrEuW/H1CcyoupOrD+NbQJytYgA4CppXPzlrmp4JZKA==", "cpu": [ "arm64" ], @@ -1797,12 +1196,15 @@ "optional": true, "os": [ "darwin" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.56.0.tgz", - "integrity": "sha512-1vXe1vcMOssb/hOF8iv52A7feWW2xnu+c8BV4t1F//m9QVLTfNVpEdja5ia762j/UEJe2Z1jAmEqZAK42tVW3g==", + "node_modules/@rolldown/binding-darwin-x64": { + "version": "1.0.0-rc.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.0.0-rc.13.tgz", + "integrity": "sha512-8DakphqOz8JrMYWTJmWA+vDJxut6LijZ8Xcdc4flOlAhU7PNVwo2MaWBF9iXjJAPo5rC/IxEFZDhJ3GC7NHvug==", "cpu": [ "x64" ], @@ -1811,26 +1213,15 @@ "optional": true, "os": [ "darwin" - ] - }, - "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.56.0.tgz", - "integrity": "sha512-bof7fbIlvqsyv/DtaXSck4VYQ9lPtoWNFCB/JY4snlFuJREXfZnm+Ej6yaCHfQvofJDXLDMTVxWscVSuQvVWUQ==", - "cpu": [ - "arm64" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.56.0.tgz", - "integrity": "sha512-KNa6lYHloW+7lTEkYGa37fpvPq+NKG/EHKM8+G/g9WDU7ls4sMqbVRV78J6LdNuVaeeK5WB9/9VAFbKxcbXKYg==", + "node_modules/@rolldown/binding-freebsd-x64": { + "version": "1.0.0-rc.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.0.0-rc.13.tgz", + "integrity": "sha512-4wBQFfjDuXYN/SVI8inBF3Aa+isq40rc6VMFbk5jcpolUBTe5cYnMsHZ51nFWsx3PVyyNN3vgoESki0Hmr/4BA==", "cpu": [ "x64" ], @@ -1839,26 +1230,15 @@ "optional": true, "os": [ "freebsd" - ] - }, - "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.56.0.tgz", - "integrity": "sha512-E8jKK87uOvLrrLN28jnAAAChNq5LeCd2mGgZF+fGF5D507WlG/Noct3lP/QzQ6MrqJ5BCKNwI9ipADB6jyiq2A==", - "cpu": [ - "arm" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.56.0.tgz", - "integrity": "sha512-jQosa5FMYF5Z6prEpTCCmzCXz6eKr/tCBssSmQGEeozA9tkRUty/5Vx06ibaOP9RCrW1Pvb8yp3gvZhHwTDsJw==", + "node_modules/@rolldown/binding-linux-arm-gnueabihf": { + "version": "1.0.0-rc.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.0.0-rc.13.tgz", + "integrity": "sha512-JW/e4yPIXLms+jmnbwwy5LA/LxVwZUWLN8xug+V200wzaVi5TEGIWQlh8o91gWYFxW609euI98OCCemmWGuPrw==", "cpu": [ "arm" ], @@ -1867,180 +1247,135 @@ "optional": true, "os": [ "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.56.0.tgz", - "integrity": "sha512-uQVoKkrC1KGEV6udrdVahASIsaF8h7iLG0U0W+Xn14ucFwi6uS539PsAr24IEF9/FoDtzMeeJXJIBo5RkbNWvQ==", - "cpu": [ - "arm64" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.56.0.tgz", - "integrity": "sha512-vLZ1yJKLxhQLFKTs42RwTwa6zkGln+bnXc8ueFGMYmBTLfNu58sl5/eXyxRa2RarTkJbXl8TKPgfS6V5ijNqEA==", + "node_modules/@rolldown/binding-linux-arm64-gnu": { + "version": "1.0.0-rc.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.0.0-rc.13.tgz", + "integrity": "sha512-ZfKWpXiUymDnavepCaM6KG/uGydJ4l2nBmMxg60Ci4CbeefpqjPWpfaZM7PThOhk2dssqBAcwLc6rAyr0uTdXg==", "cpu": [ "arm64" ], "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-loong64-gnu": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.56.0.tgz", - "integrity": "sha512-FWfHOCub564kSE3xJQLLIC/hbKqHSVxy8vY75/YHHzWvbJL7aYJkdgwD/xGfUlL5UV2SB7otapLrcCj2xnF1dg==", - "cpu": [ - "loong64" + "libc": [ + "glibc" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "linux" - ] - }, - "node_modules/@rollup/rollup-linux-loong64-musl": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.56.0.tgz", - "integrity": "sha512-z1EkujxIh7nbrKL1lmIpqFTc/sr0u8Uk0zK/qIEFldbt6EDKWFk/pxFq3gYj4Bjn3aa9eEhYRlL3H8ZbPT1xvA==", - "cpu": [ - "loong64" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-ppc64-gnu": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.56.0.tgz", - "integrity": "sha512-iNFTluqgdoQC7AIE8Q34R3AuPrJGJirj5wMUErxj22deOcY7XwZRaqYmB6ZKFHoVGqRcRd0mqO+845jAibKCkw==", + "node_modules/@rolldown/binding-linux-arm64-musl": { + "version": "1.0.0-rc.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.0.0-rc.13.tgz", + "integrity": "sha512-bmRg3O6Z0gq9yodKKWCIpnlH051sEfdVwt+6m5UDffAQMUUqU0xjnQqqAUm+Gu7ofAAly9DqiQDtKu2nPDEABA==", "cpu": [ - "ppc64" + "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ "linux" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-ppc64-musl": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.56.0.tgz", - "integrity": "sha512-MtMeFVlD2LIKjp2sE2xM2slq3Zxf9zwVuw0jemsxvh1QOpHSsSzfNOTH9uYW9i1MXFxUSMmLpeVeUzoNOKBaWg==", + "node_modules/@rolldown/binding-linux-ppc64-gnu": { + "version": "1.0.0-rc.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.0.0-rc.13.tgz", + "integrity": "sha512-8Wtnbw4k7pMYN9B/mOEAsQ8HOiq7AZ31Ig4M9BKn2So4xRaFEhtCSa4ZJaOutOWq50zpgR4N5+L/opnlaCx8wQ==", "cpu": [ "ppc64" ], "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.56.0.tgz", - "integrity": "sha512-in+v6wiHdzzVhYKXIk5U74dEZHdKN9KH0Q4ANHOTvyXPG41bajYRsy7a8TPKbYPl34hU7PP7hMVHRvv/5aCSew==", - "cpu": [ - "riscv64" + "libc": [ + "glibc" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "linux" - ] - }, - "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.56.0.tgz", - "integrity": "sha512-yni2raKHB8m9NQpI9fPVwN754mn6dHQSbDTwxdr9SE0ks38DTjLMMBjrwvB5+mXrX+C0npX0CVeCUcvvvD8CNQ==", - "cpu": [ - "riscv64" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.56.0.tgz", - "integrity": "sha512-zhLLJx9nQPu7wezbxt2ut+CI4YlXi68ndEve16tPc/iwoylWS9B3FxpLS2PkmfYgDQtosah07Mj9E0khc3Y+vQ==", + "node_modules/@rolldown/binding-linux-s390x-gnu": { + "version": "1.0.0-rc.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.0.0-rc.13.tgz", + "integrity": "sha512-D/0Nlo8mQuxSMohNJUF2lDXWRsFDsHldfRRgD9bRgktj+EndGPj4DOV37LqDKPYS+osdyhZEH7fTakTAEcW7qg==", "cpu": [ "s390x" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ "linux" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.56.0.tgz", - "integrity": "sha512-MVC6UDp16ZSH7x4rtuJPAEoE1RwS8N4oK9DLHy3FTEdFoUTCFVzMfJl/BVJ330C+hx8FfprA5Wqx4FhZXkj2Kw==", + "node_modules/@rolldown/binding-linux-x64-gnu": { + "version": "1.0.0-rc.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.0.0-rc.13.tgz", + "integrity": "sha512-eRrPvat2YaVQcwwKi/JzOP6MKf1WRnOCr+VaI3cTWz3ZoLcP/654z90lVCJ4dAuMEpPdke0n+qyAqXDZdIC4rA==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ "linux" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.56.0.tgz", - "integrity": "sha512-ZhGH1eA4Qv0lxaV00azCIS1ChedK0V32952Md3FtnxSqZTBTd6tgil4nZT5cU8B+SIw3PFYkvyR4FKo2oyZIHA==", + "node_modules/@rolldown/binding-linux-x64-musl": { + "version": "1.0.0-rc.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.0.0-rc.13.tgz", + "integrity": "sha512-PsdONiFRp8hR8KgVjTWjZ9s7uA3uueWL0t74/cKHfM4dR5zXYv4AjB8BvA+QDToqxAFg4ZkcVEqeu5F7inoz5w==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ "linux" - ] - }, - "node_modules/@rollup/rollup-openbsd-x64": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.56.0.tgz", - "integrity": "sha512-O16XcmyDeFI9879pEcmtWvD/2nyxR9mF7Gs44lf1vGGx8Vg2DRNx11aVXBEqOQhWb92WN4z7fW/q4+2NYzCbBA==", - "cpu": [ - "x64" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-openharmony-arm64": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.56.0.tgz", - "integrity": "sha512-LhN/Reh+7F3RCgQIRbgw8ZMwUwyqJM+8pXNT6IIJAqm2IdKkzpCh/V9EdgOMBKuebIrzswqy4ATlrDgiOwbRcQ==", + "node_modules/@rolldown/binding-openharmony-arm64": { + "version": "1.0.0-rc.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.0.0-rc.13.tgz", + "integrity": "sha512-hCNXgC5dI3TVOLrPT++PKFNZ+1EtS0mLQwfXXXSUD/+rGlB65gZDwN/IDuxLpQP4x8RYYHqGomlUXzpO8aVI2w==", "cpu": [ "arm64" ], @@ -2049,40 +1384,51 @@ "optional": true, "os": [ "openharmony" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.56.0.tgz", - "integrity": "sha512-kbFsOObXp3LBULg1d3JIUQMa9Kv4UitDmpS+k0tinPBz3watcUiV2/LUDMMucA6pZO3WGE27P7DsfaN54l9ing==", + "node_modules/@rolldown/binding-wasm32-wasi": { + "version": "1.0.0-rc.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.0.0-rc.13.tgz", + "integrity": "sha512-viLS5C5et8NFtLWw9Sw3M/w4vvnVkbWkO7wSNh3C+7G1+uCkGpr6PcjNDSFcNtmXY/4trjPBqUfcOL+P3sWy/g==", "cpu": [ - "arm64" + "wasm32" ], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ] + "dependencies": { + "@emnapi/core": "1.9.1", + "@emnapi/runtime": "1.9.1", + "@napi-rs/wasm-runtime": "^1.1.2" + }, + "engines": { + "node": ">=14.0.0" + } }, - "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.56.0.tgz", - "integrity": "sha512-vSSgny54D6P4vf2izbtFm/TcWYedw7f8eBrOiGGecyHyQB9q4Kqentjaj8hToe+995nob/Wv48pDqL5a62EWtg==", + "node_modules/@rolldown/binding-win32-arm64-msvc": { + "version": "1.0.0-rc.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.0-rc.13.tgz", + "integrity": "sha512-Fqa3Tlt1xL4wzmAYxGNFV36Hb+VfPc9PYU+E25DAnswXv3ODDu/yyWjQDbXMo5AGWkQVjLgQExuVu8I/UaZhPQ==", "cpu": [ - "ia32" + "arm64" ], "dev": true, "license": "MIT", "optional": true, "os": [ "win32" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-win32-x64-gnu": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.56.0.tgz", - "integrity": "sha512-FeCnkPCTHQJFbiGG49KjV5YGW/8b9rrXAM2Mz2kiIoktq2qsJxRD5giEMEOD2lPdgs72upzefaUvS+nc8E3UzQ==", + "node_modules/@rolldown/binding-win32-x64-msvc": { + "version": "1.0.0-rc.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.0.0-rc.13.tgz", + "integrity": "sha512-/pLI5kPkGEi44TDlnbio3St/5gUFeN51YWNAk/Gnv6mEQBOahRBh52qVFVBpmrnU01n2yysvBML9Ynu7K4kGAQ==", "cpu": [ "x64" ], @@ -2091,30 +1437,26 @@ "optional": true, "os": [ "win32" - ] - }, - "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.56.0.tgz", - "integrity": "sha512-H8AE9Ur/t0+1VXujj90w0HrSOuv0Nq9r1vSZF2t5km20NTfosQsGGUXDaKdQZzwuLts7IyL1fYT4hM95TI9c4g==", - "cpu": [ - "x64" ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/pluginutils": { + "version": "1.0.0-rc.13", + "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.13.tgz", + "integrity": "sha512-3ngTAv6F/Py35BsYbeeLeecvhMKdsKm4AoOETVhAA+Qc8nrA2I0kF7oa93mE9qnIurngOSpMnQ0x2nQY2FPviA==", "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] + "license": "MIT" }, "node_modules/@rushstack/node-core-library": { - "version": "5.19.1", - "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.19.1.tgz", - "integrity": "sha512-ESpb2Tajlatgbmzzukg6zyAhH+sICqJR2CNXNhXcEbz6UGCQfrKCtkxOpJTftWc8RGouroHG0Nud1SJAszvpmA==", + "version": "5.22.0", + "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.22.0.tgz", + "integrity": "sha512-S/Dm/N+8tkbasS6yM5cF6q4iDFt14mQQniiVIwk1fd0zpPwWESspO4qtPyIl8szEaN86XOYC1HRRzZrOowxjtw==", "dev": true, "license": "MIT", "dependencies": { - "ajv": "~8.13.0", + "ajv": "~8.18.0", "ajv-draft-04": "~1.0.0", "ajv-formats": "~3.0.1", "fs-extra": "~11.3.0", @@ -2132,23 +1474,6 @@ } } }, - "node_modules/@rushstack/node-core-library/node_modules/ajv": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz", - "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.3", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.4.1" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, "node_modules/@rushstack/node-core-library/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -2179,9 +1504,9 @@ } }, "node_modules/@rushstack/problem-matcher": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@rushstack/problem-matcher/-/problem-matcher-0.1.1.tgz", - "integrity": "sha512-Fm5XtS7+G8HLcJHCWpES5VmeMyjAKaWeyZU5qPzZC+22mPlJzAsOxymHiWIfuirtPckX3aptWws+K2d0BzniJA==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@rushstack/problem-matcher/-/problem-matcher-0.2.1.tgz", + "integrity": "sha512-gulfhBs6n+I5b7DvjKRfhMGyUejtSgOHTclF/eONr8hcgF1APEDjhxIsfdUYYMzC3rvLwGluqLjbwCFZ8nxrog==", "dev": true, "license": "MIT", "peerDependencies": { @@ -2194,9 +1519,9 @@ } }, "node_modules/@rushstack/rig-package": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.6.0.tgz", - "integrity": "sha512-ZQmfzsLE2+Y91GF15c65L/slMRVhF6Hycq04D4TwtdGaUAbIXXg9c5pKA5KFU7M4QMaihoobp9JJYpYcaY3zOw==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.7.2.tgz", + "integrity": "sha512-9XbFWuqMYcHUso4mnETfhGVUSaADBRj6HUAAEYk50nMPn8WRICmBuCphycQGNB3duIR6EEZX3Xj3SYc2XiP+9A==", "dev": true, "license": "MIT", "dependencies": { @@ -2205,14 +1530,14 @@ } }, "node_modules/@rushstack/terminal": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.21.0.tgz", - "integrity": "sha512-cLaI4HwCNYmknM5ns4G+drqdEB6q3dCPV423+d3TZeBusYSSm09+nR7CnhzJMjJqeRcdMAaLnrA4M/3xDz4R3w==", + "version": "0.22.5", + "resolved": "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.22.5.tgz", + "integrity": "sha512-umej8J6A+WRbfQV1G/uNfnz4bMa8CzFU9IJzQb/ZcH4j7Ybg3BQ8UBKOCF3o5U3/2yah1TDU/zE71ugg2JJv+Q==", "dev": true, "license": "MIT", "dependencies": { - "@rushstack/node-core-library": "5.19.1", - "@rushstack/problem-matcher": "0.1.1", + "@rushstack/node-core-library": "5.22.0", + "@rushstack/problem-matcher": "0.2.1", "supports-color": "~8.1.1" }, "peerDependencies": { @@ -2225,13 +1550,13 @@ } }, "node_modules/@rushstack/ts-command-line": { - "version": "5.1.7", - "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-5.1.7.tgz", - "integrity": "sha512-Ugwl6flarZcL2nqH5IXFYk3UR3mBVDsVFlCQW/Oaqidvdb/5Ota6b/Z3JXWIdqV3rOR2/JrYoAHanWF5rgenXA==", + "version": "5.3.5", + "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-5.3.5.tgz", + "integrity": "sha512-ToJQu3+o6aEdDoApGrwb/RsbwDi/NSC7jIEaAezzWM470TRrsXfSHoYAm1eWkhh34xJ+kZxU1ZzKSHiOMlOFPA==", "dev": true, "license": "MIT", "dependencies": { - "@rushstack/terminal": "0.21.0", + "@rushstack/terminal": "0.22.5", "@types/argparse": "1.0.38", "argparse": "~1.0.9", "string-argv": "~0.3.1" @@ -2267,6 +1592,17 @@ "dev": true, "license": "MIT" }, + "node_modules/@tybys/wasm-util": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz", + "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, "node_modules/@types/argparse": { "version": "1.0.38", "resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz", @@ -2312,42 +1648,49 @@ "dev": true }, "node_modules/@types/lodash": { - "version": "4.17.23", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.23.tgz", - "integrity": "sha512-RDvF6wTulMPjrNdCoYRC8gNR880JNGT8uB+REUpC2Ns4pRqQJhGz90wh7rgdXDPpCczF3VGktDuFGVnz8zP7HA==", + "version": "4.17.24", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.24.tgz", + "integrity": "sha512-gIW7lQLZbue7lRSWEFql49QJJWThrTFFeIMJdp3eH4tKoxm1OvEPg02rm4wCCSHS0cL3/Fizimb35b7k8atwsQ==", "dev": true, "license": "MIT" }, "node_modules/@types/node": { - "version": "25.2.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-25.2.0.tgz", - "integrity": "sha512-DZ8VwRFUNzuqJ5khrvwMXHmvPe+zGayJhr2CDNiKB1WBE1ST8Djl00D0IC4vvNmHMdj6DlbYRIaFE7WHjlDl5w==", + "version": "25.5.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.5.2.tgz", + "integrity": "sha512-tO4ZIRKNC+MDWV4qKVZe3Ql/woTnmHDr5JD8UI5hn2pwBrHEwOEMZK7WlNb5RKB6EoJ02gwmQS9OrjuFnZYdpg==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~7.16.0" + "undici-types": "~7.18.0" } }, + "node_modules/@types/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==", + "dev": true, + "license": "MIT" + }, "node_modules/@typespec/compiler": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-1.8.0.tgz", - "integrity": "sha512-FeLb7Q0z6Bh5dDpqtnU2RlWiIWWWF7rujx2xGMta5dcTuIOZ4jbdyz1hVdxk4iM4qadvaSV4ey/qrSuffNoh3w==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-1.11.0.tgz", + "integrity": "sha512-4vuWtoepc4rYJ81K+P7xn2ByXIRhBM40rfzAGnpagNuGSVHuKEC6lqJqs3ePvhCpnxiYAC8XWpaOi+BEDzyhnQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "~7.27.1", - "@inquirer/prompts": "^8.0.1", - "ajv": "~8.17.1", + "@babel/code-frame": "~7.29.0", + "@inquirer/prompts": "^8.3.0", + "ajv": "~8.18.0", "change-case": "~5.4.4", - "env-paths": "^3.0.0", - "globby": "~16.0.0", + "env-paths": "^4.0.0", + "globby": "~16.1.1", "is-unicode-supported": "^2.1.0", "mustache": "~4.2.0", "picocolors": "~1.1.1", - "prettier": "~3.7.4", - "semver": "^7.7.1", - "tar": "^7.5.2", - "temporal-polyfill": "^0.3.0", + "prettier": "~3.8.1", + "semver": "^7.7.4", + "tar": "^7.5.11", + "temporal-polyfill": "^0.3.2", "vscode-languageserver": "~9.0.1", "vscode-languageserver-textdocument": "~1.0.12", "yaml": "~2.8.2", @@ -2361,22 +1704,6 @@ "node": ">=20.0.0" } }, - "node_modules/@typespec/compiler/node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, "node_modules/@typespec/compiler/node_modules/ansi-regex": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", @@ -2506,30 +1833,30 @@ } }, "node_modules/@typespec/events": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/events/-/events-0.78.0.tgz", - "integrity": "sha512-gSI4rAexxfYyZX0ZqYNRWQyuMb1UeakjAjOeh/2ntmxWCdYc+wSbJjxrxIArsZC+LwzTxq5WpdtD7+7OWzG4yw==", + "version": "0.81.0", + "resolved": "https://registry.npmjs.org/@typespec/events/-/events-0.81.0.tgz", + "integrity": "sha512-ee9QSBL+k6ccPlbJICZzaGt4iC1nTIl+J9sELY9yJNISvOvUEzY5MU8c7HaISB10cUESRJW+oaLWwyc8XjwHng==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0" + "@typespec/compiler": "^1.11.0" } }, "node_modules/@typespec/http": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@typespec/http/-/http-1.8.0.tgz", - "integrity": "sha512-ZKa4RISabwL8cUAmE3BkoNmtCYRjerO0+1Ba6XdDJKG+vJC5EGM2hkDf+ZmYsYZgrX0cvbhPXUKKh28zBV60hw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@typespec/http/-/http-1.11.0.tgz", + "integrity": "sha512-/DOkN2+MUZyLdmqYmSMZDjxikJTOuNxikTeOwG2fVOibnu8e6S1jzPAuN/mn6YyQBKeBCItMPmUOXIj61Wy8Bg==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0", - "@typespec/streams": "^0.78.0" + "@typespec/compiler": "^1.11.0", + "@typespec/streams": "^0.81.0" }, "peerDependenciesMeta": { "@typespec/streams": { @@ -2538,41 +1865,41 @@ } }, "node_modules/@typespec/openapi": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-1.8.0.tgz", - "integrity": "sha512-v+RIJpx7vALBSGQmnUWemvXjnrk50HAVqJeg0RbaF3VUnh66Z4itsoNJJmIIc+HmBJng8Ie0V7xv3l02ek6HWA==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-1.11.0.tgz", + "integrity": "sha512-xUQrHExKBh0XSP4cn+HcondDXjHJM5HCq2Xfy9tB1QflsFh5uP1JJt1+67g73VmHlhZVSUDcoFrnU95pfjyubg==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0" + "@typespec/compiler": "^1.11.0", + "@typespec/http": "^1.11.0" } }, "node_modules/@typespec/rest": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.78.0.tgz", - "integrity": "sha512-1clnDw1JbBvjLcfFvEvHdIrnsQuQI5/Cl6mRIrzWWX0pKJ+R89rCdZD1KpidEXw4B4qscD48LsssyrEIFLtuPg==", + "version": "0.81.0", + "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.81.0.tgz", + "integrity": "sha512-qQXZRKEvq5aNlDFEUqBiiXXPIFyr/+PWgBY0kIrnhyZzMjfUqPInkB12QgXpVp2O2Wm3jmETJD45SaLHTCYBbg==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0" + "@typespec/compiler": "^1.11.0", + "@typespec/http": "^1.11.0" } }, "node_modules/@typespec/spec-api": { - "version": "0.1.0-alpha.12", - "resolved": "https://registry.npmjs.org/@typespec/spec-api/-/spec-api-0.1.0-alpha.12.tgz", - "integrity": "sha512-cAJ1vj6qk2Vw5g1uesohBItA6fl8KqrTRIwj0DdpPaBtQeaUS7yRJZgGQQz/JLeqDj2B+8z2pooLuvEBtnS+jA==", + "version": "0.1.0-alpha.14", + "resolved": "https://registry.npmjs.org/@typespec/spec-api/-/spec-api-0.1.0-alpha.14.tgz", + "integrity": "sha512-MpLVtJZMsONMB9Di9aiXRbbihqa/+4MmbDHpuwd3ka39wtRhcA3sbFQY/+oU5zVEfEAldGgVkenFd2wnoI/xkQ==", "dev": true, "license": "MIT", "dependencies": { - "deep-equal": "^2.2.0", + "deep-equal": "^2.2.3", "express": "^5.2.1", "xml2js": "^0.6.2" }, @@ -2581,52 +1908,54 @@ } }, "node_modules/@typespec/spec-coverage-sdk": { - "version": "0.1.0-alpha.14", - "resolved": "https://registry.npmjs.org/@typespec/spec-coverage-sdk/-/spec-coverage-sdk-0.1.0-alpha.14.tgz", - "integrity": "sha512-e3DiPyccHwDf7Nhccu3pnP93hR5ggtmsTsIA54KzwmdDucqHS7rPjPi0vZnvsy3ufB2B8PpyNAHBB7vVSM+tpg==", + "version": "0.1.0-alpha.16", + "resolved": "https://registry.npmjs.org/@typespec/spec-coverage-sdk/-/spec-coverage-sdk-0.1.0-alpha.16.tgz", + "integrity": "sha512-qwSnuE+CXjv4mn2uhioTVlaO4GjypR4ZtbkSoLmWA677ggYmoAjIDpyNgT1tjsc1lDKVtSiPvGhM9XFKExVmbQ==", "dev": true, "license": "MIT", "dependencies": { "@azure/identity": "~4.13.0", - "@azure/storage-blob": "~12.29.1", - "@types/node": "~25.0.2" + "@azure/storage-blob": "~12.31.0", + "@types/node": "~25.3.0", + "@types/semver": "^7.5.8", + "semver": "^7.7.1" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@typespec/spec-coverage-sdk/node_modules/@types/node": { - "version": "25.0.10", - "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz", - "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==", + "version": "25.3.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.5.tgz", + "integrity": "sha512-oX8xrhvpiyRCQkG1MFchB09f+cXftgIXb3a7UUa4Y3wpmZPw5tyZGTLWhlESOLq1Rq6oDlc8npVU2/9xiCuXMA==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~7.16.0" + "undici-types": "~7.18.0" } }, "node_modules/@typespec/spector": { - "version": "0.1.0-alpha.22", - "resolved": "https://registry.npmjs.org/@typespec/spector/-/spector-0.1.0-alpha.22.tgz", - "integrity": "sha512-oxdJjoHcYdsschi1DYr8jOxFKHoiuI4Y2CX1tfCikSzijFg6iTd4GRr2qusGoVfgaTduHKrXOfsdSWc8ukFE/w==", + "version": "0.1.0-alpha.25", + "resolved": "https://registry.npmjs.org/@typespec/spector/-/spector-0.1.0-alpha.25.tgz", + "integrity": "sha512-KxMiwA/+XDWpZOdhr7TbnsR8ppXVi+edFa9hdUuerOGQzzALbSeQYUJLUr4RErRiHpqg2/P4FyJ2E0eiA2fTYA==", "dev": true, "license": "MIT", "dependencies": { "@azure/identity": "~4.13.0", - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/rest": "^0.78.0", - "@typespec/spec-api": "^0.1.0-alpha.12", - "@typespec/spec-coverage-sdk": "^0.1.0-alpha.14", - "@typespec/versioning": "^0.78.0", - "ajv": "~8.17.1", - "body-parser": "^2.2.0", - "deep-equal": "^2.2.0", + "@typespec/compiler": "^1.11.0", + "@typespec/http": "^1.11.0", + "@typespec/rest": "^0.81.0", + "@typespec/spec-api": "^0.1.0-alpha.14", + "@typespec/spec-coverage-sdk": "^0.1.0-alpha.16", + "@typespec/versioning": "^0.81.0", + "ajv": "~8.18.0", + "body-parser": "^2.2.2", + "deep-equal": "^2.2.3", "express": "^5.2.1", - "globby": "~16.0.0", + "globby": "~16.1.1", "micromatch": "^4.0.8", - "morgan": "^1.10.0", - "multer": "^2.0.1", + "morgan": "^1.10.1", + "multer": "^2.1.1", "picocolors": "~1.1.1", "source-map-support": "~0.5.21", "xml2js": "^0.6.2", @@ -2640,23 +1969,6 @@ "node": ">=16.0.0" } }, - "node_modules/@typespec/spector/node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, "node_modules/@typespec/spector/node_modules/ansi-regex": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", @@ -2786,38 +2098,38 @@ } }, "node_modules/@typespec/sse": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/sse/-/sse-0.78.0.tgz", - "integrity": "sha512-jPARl+e1e/nsDW/1uVsGTzvKmjqezVMyUa13igXxk5nV2ScMdFpH1HhBwTmAhUeaZgY3J81dFHNUnIY67HCrmw==", + "version": "0.81.0", + "resolved": "https://registry.npmjs.org/@typespec/sse/-/sse-0.81.0.tgz", + "integrity": "sha512-VinoeN+5ClKlGXf77fWayAQna8SaYtvEBhnLR8t8FdvmMsL6ce1LghR2kAL3ARbNXfwMZRmQiq+ajKKebDLIng==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0", - "@typespec/events": "^0.78.0", - "@typespec/http": "^1.8.0", - "@typespec/streams": "^0.78.0" + "@typespec/compiler": "^1.11.0", + "@typespec/events": "^0.81.0", + "@typespec/http": "^1.11.0", + "@typespec/streams": "^0.81.0" } }, "node_modules/@typespec/streams": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/streams/-/streams-0.78.0.tgz", - "integrity": "sha512-wzh5bVdzh+K+pFQFs/EZkVsTH5TQGi12XwhjxJS0UKRwaW2UwSZeY1HqX07oMMPdYESTbjgMrXcxtn89AlzjvQ==", + "version": "0.81.0", + "resolved": "https://registry.npmjs.org/@typespec/streams/-/streams-0.81.0.tgz", + "integrity": "sha512-IIEKq18aqAtM65f8ZLs3Kzua97wjkr8fTehqPs/Q4neWo2UkDJp64LfA37iXJzaku8xMFSwXdVu4EW8wo+KV8w==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0" + "@typespec/compiler": "^1.11.0" } }, "node_modules/@typespec/ts-http-runtime": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@typespec/ts-http-runtime/-/ts-http-runtime-0.3.2.tgz", - "integrity": "sha512-IlqQ/Gv22xUC1r/WQm4StLkYQmaaTsXAhUVsNE0+xiyf0yRFiH5++q78U3bw6bLKDCTmh0uqKB9eG9+Bt75Dkg==", + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/@typespec/ts-http-runtime/-/ts-http-runtime-0.3.4.tgz", + "integrity": "sha512-CI0NhTrz4EBaa0U+HaaUZrJhPoso8sG7ZFya8uQoBA57fjzrjRSv87ekCjLZOFExN+gXE/z0xuN2QfH4H2HrLQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2830,55 +2142,55 @@ } }, "node_modules/@typespec/versioning": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.78.0.tgz", - "integrity": "sha512-I14X6+IMd0wFMNI8oMFSeFBi2nD4idub+geSO34vuCs4rwuEj3FNzy+rkNkDDvf0+gIUGxeyg7s+YDUcNyiqOA==", + "version": "0.81.0", + "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.81.0.tgz", + "integrity": "sha512-5bha4t64xA85zLY8VGm/6jNd2kwPHzjPq/dlCUjtgGfGXv2R6Ow/YIukqhqZnwnIgNAIlZ7nguekRMRx+2oO2w==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0" + "@typespec/compiler": "^1.11.0" } }, "node_modules/@typespec/xml": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/xml/-/xml-0.78.0.tgz", - "integrity": "sha512-KSDhJX6A/Onsu9FKVZtR/xSy5va3k0y9/U4eiZUn91V/LQyMZNwmResPDHEVYk6JqaIH8bbd6ANWPu3nMd7mmw==", + "version": "0.81.0", + "resolved": "https://registry.npmjs.org/@typespec/xml/-/xml-0.81.0.tgz", + "integrity": "sha512-4docnAcV1a8gE4c4TmYuirZf2PEzS4xHUH4QjHFU6hk6J2M6OMU6YG4iSq9tmlUzQ/2DraVcWNO/fsG8Lt383A==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0" + "@typespec/compiler": "^1.11.0" } }, "node_modules/@vitest/coverage-v8": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.0.18.tgz", - "integrity": "sha512-7i+N2i0+ME+2JFZhfuz7Tg/FqKtilHjGyGvoHYQ6iLV0zahbsJ9sljC9OcFcPDbhYKCet+sG8SsVqlyGvPflZg==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.1.3.tgz", + "integrity": "sha512-/MBdrkA8t6hbdCWFKs09dPik774xvs4Z6L4bycdCxYNLHM8oZuRyosumQMG19LUlBsB6GeVpL1q4kFFazvyKGA==", "dev": true, "license": "MIT", "dependencies": { "@bcoe/v8-coverage": "^1.0.2", - "@vitest/utils": "4.0.18", - "ast-v8-to-istanbul": "^0.3.10", + "@vitest/utils": "4.1.3", + "ast-v8-to-istanbul": "^1.0.0", "istanbul-lib-coverage": "^3.2.2", "istanbul-lib-report": "^3.0.1", "istanbul-reports": "^3.2.0", - "magicast": "^0.5.1", + "magicast": "^0.5.2", "obug": "^2.1.1", - "std-env": "^3.10.0", - "tinyrainbow": "^3.0.3" + "std-env": "^4.0.0-rc.1", + "tinyrainbow": "^3.1.0" }, "funding": { "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "@vitest/browser": "4.0.18", - "vitest": "4.0.18" + "@vitest/browser": "4.1.3", + "vitest": "4.1.3" }, "peerDependenciesMeta": { "@vitest/browser": { @@ -2887,31 +2199,31 @@ } }, "node_modules/@vitest/expect": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.0.18.tgz", - "integrity": "sha512-8sCWUyckXXYvx4opfzVY03EOiYVxyNrHS5QxX3DAIi5dpJAAkyJezHCP77VMX4HKA2LDT/Jpfo8i2r5BE3GnQQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.3.tgz", + "integrity": "sha512-CW8Q9KMtXDGHj0vCsqui0M5KqRsu0zm0GNDW7Gd3U7nZ2RFpPKSCpeCXoT+/+5zr1TNlsoQRDEz+LzZUyq6gnQ==", "dev": true, "license": "MIT", "dependencies": { - "@standard-schema/spec": "^1.0.0", + "@standard-schema/spec": "^1.1.0", "@types/chai": "^5.2.2", - "@vitest/spy": "4.0.18", - "@vitest/utils": "4.0.18", - "chai": "^6.2.1", - "tinyrainbow": "^3.0.3" + "@vitest/spy": "4.1.3", + "@vitest/utils": "4.1.3", + "chai": "^6.2.2", + "tinyrainbow": "^3.1.0" }, "funding": { "url": "https://opencollective.com/vitest" } }, "node_modules/@vitest/mocker": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.0.18.tgz", - "integrity": "sha512-HhVd0MDnzzsgevnOWCBj5Otnzobjy5wLBe4EdeeFGv8luMsGcYqDuFRMcttKWZA5vVO8RFjexVovXvAM4JoJDQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.3.tgz", + "integrity": "sha512-XN3TrycitDQSzGRnec/YWgoofkYRhouyVQj4YNsJ5r/STCUFqMrP4+oxEv3e7ZbLi4og5kIHrZwekDJgw6hcjw==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "4.0.18", + "@vitest/spy": "4.1.3", "estree-walker": "^3.0.3", "magic-string": "^0.30.21" }, @@ -2920,7 +2232,7 @@ }, "peerDependencies": { "msw": "^2.4.9", - "vite": "^6.0.0 || ^7.0.0-0" + "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "msw": { @@ -2932,26 +2244,26 @@ } }, "node_modules/@vitest/pretty-format": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.0.18.tgz", - "integrity": "sha512-P24GK3GulZWC5tz87ux0m8OADrQIUVDPIjjj65vBXYG17ZeU3qD7r+MNZ1RNv4l8CGU2vtTRqixrOi9fYk/yKw==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.3.tgz", + "integrity": "sha512-hYqqwuMbpkkBodpRh4k4cQSOELxXky1NfMmQvOfKvV8zQHz8x8Dla+2wzElkMkBvSAJX5TRGHJAQvK0TcOafwg==", "dev": true, "license": "MIT", "dependencies": { - "tinyrainbow": "^3.0.3" + "tinyrainbow": "^3.1.0" }, "funding": { "url": "https://opencollective.com/vitest" } }, "node_modules/@vitest/runner": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.0.18.tgz", - "integrity": "sha512-rpk9y12PGa22Jg6g5M3UVVnTS7+zycIGk9ZNGN+m6tZHKQb7jrP7/77WfZy13Y/EUDd52NDsLRQhYKtv7XfPQw==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.3.tgz", + "integrity": "sha512-VwgOz5MmT0KhlUj40h02LWDpUBVpflZ/b7xZFA25F29AJzIrE+SMuwzFf0b7t4EXdwRNX61C3B6auIXQTR3ttA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "4.0.18", + "@vitest/utils": "4.1.3", "pathe": "^2.0.3" }, "funding": { @@ -2959,13 +2271,14 @@ } }, "node_modules/@vitest/snapshot": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.0.18.tgz", - "integrity": "sha512-PCiV0rcl7jKQjbgYqjtakly6T1uwv/5BQ9SwBLekVg/EaYeQFPiXcgrC2Y7vDMA8dM1SUEAEV82kgSQIlXNMvA==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.3.tgz", + "integrity": "sha512-9l+k/J9KG5wPJDX9BcFFzhhwNjwkRb8RsnYhaT1vPY7OufxmQFc9sZzScRCPTiETzl37mrIWVY9zxzmdVeJwDQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "4.0.18", + "@vitest/pretty-format": "4.1.3", + "@vitest/utils": "4.1.3", "magic-string": "^0.30.21", "pathe": "^2.0.3" }, @@ -2974,9 +2287,9 @@ } }, "node_modules/@vitest/spy": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.0.18.tgz", - "integrity": "sha512-cbQt3PTSD7P2OARdVW3qWER5EGq7PHlvE+QfzSC0lbwO+xnt7+XH06ZzFjFRgzUX//JmpxrCu92VdwvEPlWSNw==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.3.tgz", + "integrity": "sha512-ujj5Uwxagg4XUIfAUyRQxAg631BP6e9joRiN99mr48Bg9fRs+5mdUElhOoZ6rP5mBr8Bs3lmrREnkrQWkrsTCw==", "dev": true, "license": "MIT", "funding": { @@ -2984,36 +2297,37 @@ } }, "node_modules/@vitest/ui": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-4.0.18.tgz", - "integrity": "sha512-CGJ25bc8fRi8Lod/3GHSvXRKi7nBo3kxh0ApW4yCjmrWmRmlT53B5E08XRSZRliygG0aVNxLrBEqPYdz/KcCtQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-4.1.3.tgz", + "integrity": "sha512-xBPy+43o1fgMLUDlufUXh7tlT/Es8uS5eiyBY2PyPfFYSGpApZskLw65DROoDz+rgYkPuAmb20Mv9Z9g1WQE7w==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "4.0.18", + "@vitest/utils": "4.1.3", "fflate": "^0.8.2", - "flatted": "^3.3.3", + "flatted": "^3.4.2", "pathe": "^2.0.3", "sirv": "^3.0.2", "tinyglobby": "^0.2.15", - "tinyrainbow": "^3.0.3" + "tinyrainbow": "^3.1.0" }, "funding": { "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "vitest": "4.0.18" + "vitest": "4.1.3" } }, "node_modules/@vitest/utils": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.0.18.tgz", - "integrity": "sha512-msMRKLMVLWygpK3u2Hybgi4MNjcYJvwTb0Ru09+fOyCXIgT5raYP041DRRdiJiI3k/2U6SEbAETB3YtBrUkCFA==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.3.tgz", + "integrity": "sha512-Pc/Oexse/khOWsGB+w3q4yzA4te7W4gpZZAvk+fr8qXfTURZUMj5i7kuxsNK5mP/dEB6ao3jfr0rs17fHhbHdw==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "4.0.18", - "tinyrainbow": "^3.0.3" + "@vitest/pretty-format": "4.1.3", + "convert-source-map": "^2.0.0", + "tinyrainbow": "^3.1.0" }, "funding": { "url": "https://opencollective.com/vitest" @@ -3044,16 +2358,16 @@ } }, "node_modules/ajv": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", - "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "dev": true, "license": "MIT", "dependencies": { - "fast-deep-equal": "^3.1.1", + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" + "require-from-string": "^2.0.2" }, "funding": { "type": "github", @@ -3178,21 +2492,21 @@ } }, "node_modules/ast-v8-to-istanbul": { - "version": "0.3.10", - "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.10.tgz", - "integrity": "sha512-p4K7vMz2ZSk3wN8l5o3y2bJAoZXT3VuJI5OLTATY/01CYWumWvwkUw0SqDBnNq6IiTO3qDa1eSQDibAV8g7XOQ==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-1.0.0.tgz", + "integrity": "sha512-1fSfIwuDICFA4LKkCzRPO7F0hzFf0B7+Xqrl27ynQaa+Rh0e1Es0v6kWHPott3lU10AyAr7oKHa65OppjLn3Rg==", "dev": true, "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.31", "estree-walker": "^3.0.3", - "js-tokens": "^9.0.1" + "js-tokens": "^10.0.0" } }, "node_modules/ast-v8-to-istanbul/node_modules/js-tokens": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz", - "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", + "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", "dev": true, "license": "MIT" }, @@ -3213,10 +2527,14 @@ } }, "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } }, "node_modules/basic-auth": { "version": "2.0.1", @@ -3264,13 +2582,16 @@ } }, "node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", + "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", "dev": true, "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0" + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" } }, "node_modules/braces": { @@ -3339,9 +2660,9 @@ } }, "node_modules/c8": { - "version": "10.1.3", - "resolved": "https://registry.npmjs.org/c8/-/c8-10.1.3.tgz", - "integrity": "sha512-LvcyrOAaOnrrlMpW22n690PUvxiq4Uf9WMhQwNJ9vgagkL/ph1+D4uvjvDA5XCbykrc0sx+ay6pVi9YZ1GnhyA==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/c8/-/c8-11.0.0.tgz", + "integrity": "sha512-e/uRViGHSVIJv7zsaDKM7VRn2390TgHXqUSvYwPHBQaU6L7E9L0n9JbdkwdYPvshDT0KymBmmlwSpms3yBaMNg==", "dev": true, "license": "ISC", "dependencies": { @@ -3352,7 +2673,7 @@ "istanbul-lib-coverage": "^3.2.0", "istanbul-lib-report": "^3.0.1", "istanbul-reports": "^3.1.6", - "test-exclude": "^7.0.1", + "test-exclude": "^8.0.0", "v8-to-istanbul": "^9.0.0", "yargs": "^17.7.2", "yargs-parser": "^21.1.1" @@ -3361,7 +2682,7 @@ "c8": "bin/c8.js" }, "engines": { - "node": ">=18" + "node": "20 || >=22" }, "peerDependencies": { "monocart-coverage-reports": "^2" @@ -3496,9 +2817,9 @@ } }, "node_modules/content-disposition": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz", - "integrity": "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.1.0.tgz", + "integrity": "sha512-5jRCH9Z/+DRP7rkvY83B+yGIGX96OYdJmzngqnw2SBSxqCFPd0w2km3s5iawpGX8krnwSGmF0FW5Nhr0Hfai3g==", "dev": true, "license": "MIT", "engines": { @@ -3550,6 +2871,7 @@ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -3611,9 +2933,9 @@ } }, "node_modules/default-browser": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.4.0.tgz", - "integrity": "sha512-XDuvSq38Hr1MdN47EDvYtx3U0MTqpCEn+F6ft8z2vYDzMrvQhVp0ui9oQdqW3MvK3vqUETglt1tVGgjLuJ5izg==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.5.0.tgz", + "integrity": "sha512-H9LMLr5zwIbSxrmvikGuI/5KGhZ8E2zH3stkMgM5LpOWDutGM2JZaj460Udnf1a+946zc7YBgrqEWwbk7zHvGw==", "dev": true, "license": "MIT", "dependencies": { @@ -3699,10 +3021,20 @@ "node": ">= 0.8" } }, + "node_modules/detect-libc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", + "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=8" + } + }, "node_modules/diff": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.2.tgz", - "integrity": "sha512-sSuxWU5j5SR9QQji/o2qMvqRNYRDOcBTgsJ/DeCf4iSN4gW+gNMXM7wFIP+fdXZxoNiAnHUTGjCr+TSWXdRDKg==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.4.tgz", + "integrity": "sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw==", "dev": true, "license": "BSD-3-Clause", "engines": { @@ -3724,12 +3056,6 @@ "node": ">= 0.4" } }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true - }, "node_modules/ecdsa-sig-formatter": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", @@ -3764,13 +3090,16 @@ } }, "node_modules/env-paths": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz", - "integrity": "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-4.0.0.tgz", + "integrity": "sha512-pxP8eL2SwwaTRi/KHYwLYXinDs7gL3jxFcBYmEdYfZmZXbaVDvdppd0XBU8qVz03rDfKZMXg1omHCbsJjZrMsw==", "dev": true, "license": "MIT", + "dependencies": { + "is-safe-filename": "^0.1.0" + }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=20" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -3818,9 +3147,9 @@ } }, "node_modules/es-module-lexer": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz", - "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.0.0.tgz", + "integrity": "sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw==", "dev": true, "license": "MIT" }, @@ -3837,48 +3166,6 @@ "node": ">= 0.4" } }, - "node_modules/esbuild": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.2.tgz", - "integrity": "sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=18" - }, - "optionalDependencies": { - "@esbuild/aix-ppc64": "0.27.2", - "@esbuild/android-arm": "0.27.2", - "@esbuild/android-arm64": "0.27.2", - "@esbuild/android-x64": "0.27.2", - "@esbuild/darwin-arm64": "0.27.2", - "@esbuild/darwin-x64": "0.27.2", - "@esbuild/freebsd-arm64": "0.27.2", - "@esbuild/freebsd-x64": "0.27.2", - "@esbuild/linux-arm": "0.27.2", - "@esbuild/linux-arm64": "0.27.2", - "@esbuild/linux-ia32": "0.27.2", - "@esbuild/linux-loong64": "0.27.2", - "@esbuild/linux-mips64el": "0.27.2", - "@esbuild/linux-ppc64": "0.27.2", - "@esbuild/linux-riscv64": "0.27.2", - "@esbuild/linux-s390x": "0.27.2", - "@esbuild/linux-x64": "0.27.2", - "@esbuild/netbsd-arm64": "0.27.2", - "@esbuild/netbsd-x64": "0.27.2", - "@esbuild/openbsd-arm64": "0.27.2", - "@esbuild/openbsd-x64": "0.27.2", - "@esbuild/openharmony-arm64": "0.27.2", - "@esbuild/sunos-x64": "0.27.2", - "@esbuild/win32-arm64": "0.27.2", - "@esbuild/win32-ia32": "0.27.2", - "@esbuild/win32-x64": "0.27.2" - } - }, "node_modules/escalade": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", @@ -4002,16 +3289,59 @@ "node": ">=8.6.0" } }, + "node_modules/fast-string-truncated-width": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fast-string-truncated-width/-/fast-string-truncated-width-3.0.3.tgz", + "integrity": "sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-string-width": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/fast-string-width/-/fast-string-width-3.0.2.tgz", + "integrity": "sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-string-truncated-width": "^3.0.2" + } + }, "node_modules/fast-uri": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", "dev": true }, + "node_modules/fast-wrap-ansi": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/fast-wrap-ansi/-/fast-wrap-ansi-0.2.0.tgz", + "integrity": "sha512-rLV8JHxTyhVmFYhBJuMujcrHqOT2cnO5Zxj37qROj23CP39GXubJRBUFF0z8KFK77Uc0SukZUf7JZhsVEQ6n8w==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-string-width": "^3.0.2" + } + }, + "node_modules/fast-xml-builder": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.4.tgz", + "integrity": "sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], + "license": "MIT", + "dependencies": { + "path-expression-matcher": "^1.1.3" + } + }, "node_modules/fast-xml-parser": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.3.3.tgz", - "integrity": "sha512-2O3dkPAAC6JavuMm8+4+pgTk+5hoAs+CjZ+sWcQLkX9+/tHRuTkQh/Oaifr8qDmZ8iEHb771Ea6G8CdwkrgvYA==", + "version": "5.5.9", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.9.tgz", + "integrity": "sha512-jldvxr1MC6rtiZKgrFnDSvT8xuH+eJqxqOBThUVjYrxssYTo1avZLGql5l0a0BAERR01CadYzZ83kVEkbyDg+g==", "dev": true, "funding": [ { @@ -4021,16 +3351,18 @@ ], "license": "MIT", "dependencies": { - "strnum": "^2.1.0" + "fast-xml-builder": "^1.1.4", + "path-expression-matcher": "^1.2.0", + "strnum": "^2.2.2" }, "bin": { "fxparser": "src/cli/cli.js" } }, "node_modules/fastq": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", - "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz", + "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==", "dev": true, "license": "ISC", "dependencies": { @@ -4096,9 +3428,9 @@ } }, "node_modules/flatted": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", - "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz", + "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==", "dev": true, "license": "ISC" }, @@ -4156,9 +3488,9 @@ } }, "node_modules/fs-extra": { - "version": "11.3.2", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.2.tgz", - "integrity": "sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==", + "version": "11.3.4", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.4.tgz", + "integrity": "sha512-CTXd6rk/M3/ULNQj8FBqBWHYBVYybQ3VPBw0xGKFe3tuH7ytT6ACnvzpIQ3UZtB8yvUKC2cXn1a+x+5EVQLovA==", "dev": true, "license": "MIT", "dependencies": { @@ -4266,18 +3598,18 @@ } }, "node_modules/glob": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.0.tgz", - "integrity": "sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==", + "version": "13.0.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz", + "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "minimatch": "^10.1.1", - "minipass": "^7.1.2", - "path-scurry": "^2.0.0" + "minimatch": "^10.2.2", + "minipass": "^7.1.3", + "path-scurry": "^2.0.2" }, "engines": { - "node": "20 || >=22" + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -4296,26 +3628,10 @@ "node": ">= 6" } }, - "node_modules/glob/node_modules/minimatch": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz", - "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "@isaacs/brace-expansion": "^5.0.0" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/globby": { - "version": "16.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-16.0.0.tgz", - "integrity": "sha512-ejy4TJFga99yW6Q0uhM3pFawKWZmtZzZD/v/GwI5+9bCV5Ew+D2pSND6W7fUes5UykqSsJkUfxFVdRh7Q1+P3Q==", + "version": "16.1.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-16.1.1.tgz", + "integrity": "sha512-dW7vl+yiAJSp6aCekaVnVJxurRv7DCOLyXqEG3RYMYUg7AuJ2jCqPkZTA8ooqC2vtnkaMcV5WfFBMuEnTu1OQg==", "dev": true, "license": "MIT", "dependencies": { @@ -4484,9 +3800,9 @@ } }, "node_modules/iconv-lite": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz", - "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", + "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==", "dev": true, "license": "MIT", "dependencies": { @@ -4812,6 +4128,19 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-safe-filename": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-safe-filename/-/is-safe-filename-0.1.1.tgz", + "integrity": "sha512-4SrR7AdnY11LHfDKTZY1u6Ga3RuxZdl3YKWWShO5iyuG5h8QS4GD2tOb04peBJ5I7pXbR+CGBNEhTcwK+FzN3g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-set": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", @@ -4920,9 +4249,9 @@ } }, "node_modules/is-wsl": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz", - "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.1.tgz", + "integrity": "sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==", "dev": true, "license": "MIT", "dependencies": { @@ -4946,7 +4275,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/istanbul-lib-coverage": { "version": "3.2.2", @@ -5061,31 +4391,304 @@ "semver": "^7.5.4" }, "engines": { - "node": ">=12", - "npm": ">=6" + "node": ">=12", + "npm": ">=6" + } + }, + "node_modules/jwa": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz", + "integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer-equal-constant-time": "^1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jws": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz", + "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==", + "dev": true, + "license": "MIT", + "dependencies": { + "jwa": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/lightningcss": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz", + "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==", + "dev": true, + "license": "MPL-2.0", + "dependencies": { + "detect-libc": "^2.0.3" + }, + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "lightningcss-android-arm64": "1.32.0", + "lightningcss-darwin-arm64": "1.32.0", + "lightningcss-darwin-x64": "1.32.0", + "lightningcss-freebsd-x64": "1.32.0", + "lightningcss-linux-arm-gnueabihf": "1.32.0", + "lightningcss-linux-arm64-gnu": "1.32.0", + "lightningcss-linux-arm64-musl": "1.32.0", + "lightningcss-linux-x64-gnu": "1.32.0", + "lightningcss-linux-x64-musl": "1.32.0", + "lightningcss-win32-arm64-msvc": "1.32.0", + "lightningcss-win32-x64-msvc": "1.32.0" + } + }, + "node_modules/lightningcss-android-arm64": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz", + "integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-darwin-arm64": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz", + "integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-darwin-x64": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz", + "integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-freebsd-x64": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz", + "integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-arm-gnueabihf": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz", + "integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-arm64-gnu": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz", + "integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-arm64-musl": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz", + "integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==", + "cpu": [ + "arm64" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-x64-gnu": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz", + "integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==", + "cpu": [ + "x64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-x64-musl": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz", + "integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==", + "cpu": [ + "x64" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/jwa": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz", - "integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==", + "node_modules/lightningcss-win32-arm64-msvc": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz", + "integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "buffer-equal-constant-time": "^1.0.1", - "ecdsa-sig-formatter": "1.0.11", - "safe-buffer": "^5.0.1" + "license": "MPL-2.0", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/jws": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz", - "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==", + "node_modules/lightningcss-win32-x64-msvc": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz", + "integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "jwa": "^2.0.1", - "safe-buffer": "^5.0.1" + "license": "MPL-2.0", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, "node_modules/locate-path": { @@ -5104,9 +4707,9 @@ } }, "node_modules/lodash": { - "version": "4.17.23", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", - "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz", + "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", "license": "MIT" }, "node_modules/lodash.includes": { @@ -5159,11 +4762,11 @@ "license": "MIT" }, "node_modules/lru-cache": { - "version": "11.2.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.2.tgz", - "integrity": "sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==", + "version": "11.2.6", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz", + "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "engines": { "node": "20 || >=22" } @@ -5179,14 +4782,14 @@ } }, "node_modules/magicast": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.5.1.tgz", - "integrity": "sha512-xrHS24IxaLrvuo613F719wvOIv9xPHFWQHuvGUBmPnCA/3MQxKI3b+r7n1jAoDHmsbC5bRhTZYR77invLAxVnw==", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.5.2.tgz", + "integrity": "sha512-E3ZJh4J3S9KfwdjZhe2afj6R9lGIN5Pher1pF39UGrXRqq/VDaGVIGN13BjHd2u8B61hArAGOnso7nBOouW3TQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^7.28.5", - "@babel/types": "^7.28.5", + "@babel/parser": "^7.29.0", + "@babel/types": "^7.29.0", "source-map-js": "^1.2.1" } }, @@ -5290,36 +4893,27 @@ } }, "node_modules/minimatch": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz", - "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==", + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.3.tgz", + "integrity": "sha512-Rwi3pnapEqirPSbWbrZaa6N3nmqq4Xer/2XooiOKyV3q12ML06f7MOuc5DVH8ONZIFhwIYQ3yzPH4nt7iWHaTg==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "dependencies": { - "@isaacs/brace-expansion": "^5.0.0" + "brace-expansion": "^5.0.2" }, "engines": { - "node": "20 || >=22" + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", + "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", "dev": true, + "license": "BlueOak-1.0.0", "engines": { "node": ">=16 || 14 >=14.17" } @@ -5337,19 +4931,6 @@ "node": ">= 18" } }, - "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "license": "MIT", - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, "node_modules/morgan": { "version": "1.10.1", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.1.tgz", @@ -5415,22 +4996,23 @@ "license": "MIT" }, "node_modules/multer": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.2.tgz", - "integrity": "sha512-u7f2xaZ/UG8oLXHvtF/oWTRvT44p9ecwBBqTwgJVq0+4BW1g8OW01TyMEGWBHbyMOYVHXslaut7qEQ1meATXgw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/multer/-/multer-2.1.1.tgz", + "integrity": "sha512-mo+QTzKlx8R7E5ylSXxWzGoXoZbOsRMpyitcht8By2KHvMbf3tjwosZ/Mu/XYU6UuJ3VZnODIrak5ZrPiPyB6A==", "dev": true, "license": "MIT", "dependencies": { "append-field": "^1.0.0", "busboy": "^1.6.0", "concat-stream": "^2.0.0", - "mkdirp": "^0.5.6", - "object-assign": "^4.1.1", - "type-is": "^1.6.18", - "xtend": "^4.0.2" + "type-is": "^1.6.18" }, "engines": { "node": ">= 10.16.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/multer/node_modules/media-typer": { @@ -5528,16 +5110,6 @@ "node": ">= 0.6" } }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/object-inspect": { "version": "1.13.4", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", @@ -5718,11 +5290,28 @@ "node": ">=8" } }, + "node_modules/path-expression-matcher": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.2.0.tgz", + "integrity": "sha512-DwmPWeFn+tq7TiyJ2CxezCAirXjFxvaiD03npak3cRjlP9+OjTmSy1EpIrEbh+l6JgUundniloMLDQ/6VTdhLQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -5735,9 +5324,9 @@ "license": "MIT" }, "node_modules/path-scurry": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz", - "integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz", + "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -5745,16 +5334,16 @@ "minipass": "^7.1.2" }, "engines": { - "node": "20 || >=22" + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, "node_modules/path-to-regexp": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz", - "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz", + "integrity": "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==", "dev": true, "license": "MIT", "funding": { @@ -5777,9 +5366,9 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", "dev": true, "license": "MIT", "engines": { @@ -5809,9 +5398,9 @@ } }, "node_modules/postcss": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", + "version": "8.5.9", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.9.tgz", + "integrity": "sha512-7a70Nsot+EMX9fFU3064K/kdHWZqGVY+BADLyXc8Dfv+mTLLVl6JzJpPaCZ2kQL9gIJvKXSLMHhqdRRjwQeFtw==", "dev": true, "funding": [ { @@ -5838,9 +5427,9 @@ } }, "node_modules/prettier": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.7.4.tgz", - "integrity": "sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==", + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz", + "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==", "dev": true, "license": "MIT", "bin": { @@ -5880,20 +5469,10 @@ "node": ">= 0.10" } }, - "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/qs": { - "version": "6.14.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz", - "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.0.tgz", + "integrity": "sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -6008,13 +5587,13 @@ } }, "node_modules/resolve": { - "version": "1.22.10", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", - "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "version": "1.22.11", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz", + "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==", "dev": true, "license": "MIT", "dependencies": { - "is-core-module": "^2.16.0", + "is-core-module": "^2.16.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -6049,13 +5628,13 @@ } }, "node_modules/rimraf": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.2.tgz", - "integrity": "sha512-cFCkPslJv7BAXJsYlK1dZsbP8/ZNLkCAQ0bi1hf5EKX2QHegmDFEFA6QhuYJlk7UDdc+02JjO80YSOrWPpw06g==", + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.3.tgz", + "integrity": "sha512-LKg+Cr2ZF61fkcaK1UdkH2yEBBKnYjTyWzTJT6KNPcSPaiT7HSdhtMXQuN5wkTX0Xu72KQ1l8S42rlmexS2hSA==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "glob": "^13.0.0", + "glob": "^13.0.3", "package-json-from-dist": "^1.0.1" }, "bin": { @@ -6068,49 +5647,38 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/rollup": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.56.0.tgz", - "integrity": "sha512-9FwVqlgUHzbXtDg9RCMgodF3Ua4Na6Gau+Sdt9vyCN4RhHfVKX2DCHy3BjMLTDd47ITDhYAnTwGulWTblJSDLg==", + "node_modules/rolldown": { + "version": "1.0.0-rc.13", + "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.0-rc.13.tgz", + "integrity": "sha512-bvVj8YJmf0rq4pSFmH7laLa6pYrhghv3PRzrCdRAr23g66zOKVJ4wkvFtgohtPLWmthgg8/rkaqRHrpUEh0Zbw==", "dev": true, "license": "MIT", "dependencies": { - "@types/estree": "1.0.8" + "@oxc-project/types": "=0.123.0", + "@rolldown/pluginutils": "1.0.0-rc.13" }, "bin": { - "rollup": "dist/bin/rollup" + "rolldown": "bin/cli.mjs" }, "engines": { - "node": ">=18.0.0", - "npm": ">=8.0.0" + "node": "^20.19.0 || >=22.12.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.56.0", - "@rollup/rollup-android-arm64": "4.56.0", - "@rollup/rollup-darwin-arm64": "4.56.0", - "@rollup/rollup-darwin-x64": "4.56.0", - "@rollup/rollup-freebsd-arm64": "4.56.0", - "@rollup/rollup-freebsd-x64": "4.56.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.56.0", - "@rollup/rollup-linux-arm-musleabihf": "4.56.0", - "@rollup/rollup-linux-arm64-gnu": "4.56.0", - "@rollup/rollup-linux-arm64-musl": "4.56.0", - "@rollup/rollup-linux-loong64-gnu": "4.56.0", - "@rollup/rollup-linux-loong64-musl": "4.56.0", - "@rollup/rollup-linux-ppc64-gnu": "4.56.0", - "@rollup/rollup-linux-ppc64-musl": "4.56.0", - "@rollup/rollup-linux-riscv64-gnu": "4.56.0", - "@rollup/rollup-linux-riscv64-musl": "4.56.0", - "@rollup/rollup-linux-s390x-gnu": "4.56.0", - "@rollup/rollup-linux-x64-gnu": "4.56.0", - "@rollup/rollup-linux-x64-musl": "4.56.0", - "@rollup/rollup-openbsd-x64": "4.56.0", - "@rollup/rollup-openharmony-arm64": "4.56.0", - "@rollup/rollup-win32-arm64-msvc": "4.56.0", - "@rollup/rollup-win32-ia32-msvc": "4.56.0", - "@rollup/rollup-win32-x64-gnu": "4.56.0", - "@rollup/rollup-win32-x64-msvc": "4.56.0", - "fsevents": "~2.3.2" + "@rolldown/binding-android-arm64": "1.0.0-rc.13", + "@rolldown/binding-darwin-arm64": "1.0.0-rc.13", + "@rolldown/binding-darwin-x64": "1.0.0-rc.13", + "@rolldown/binding-freebsd-x64": "1.0.0-rc.13", + "@rolldown/binding-linux-arm-gnueabihf": "1.0.0-rc.13", + "@rolldown/binding-linux-arm64-gnu": "1.0.0-rc.13", + "@rolldown/binding-linux-arm64-musl": "1.0.0-rc.13", + "@rolldown/binding-linux-ppc64-gnu": "1.0.0-rc.13", + "@rolldown/binding-linux-s390x-gnu": "1.0.0-rc.13", + "@rolldown/binding-linux-x64-gnu": "1.0.0-rc.13", + "@rolldown/binding-linux-x64-musl": "1.0.0-rc.13", + "@rolldown/binding-openharmony-arm64": "1.0.0-rc.13", + "@rolldown/binding-wasm32-wasi": "1.0.0-rc.13", + "@rolldown/binding-win32-arm64-msvc": "1.0.0-rc.13", + "@rolldown/binding-win32-x64-msvc": "1.0.0-rc.13" } }, "node_modules/router": { @@ -6214,9 +5782,9 @@ "license": "MIT" }, "node_modules/sax": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.4.tgz", - "integrity": "sha512-1n3r/tGXO6b6VXMdFT54SHzT9ytu9yr7TaELowdYpMqY/Ao7EnlQGmAQ1+RatX7Tkkdm6hONI2owqNx2aZj5Sw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.0.tgz", + "integrity": "sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==", "dev": true, "license": "BlueOak-1.0.0", "engines": { @@ -6224,9 +5792,9 @@ } }, "node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", + "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -6328,6 +5896,7 @@ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, + "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -6340,6 +5909,7 @@ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -6522,9 +6092,9 @@ } }, "node_modules/std-env": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.10.0.tgz", - "integrity": "sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.0.0.tgz", + "integrity": "sha512-zUMPtQ/HBY3/50VbpkupYHbRroTRZJPRLvreamgErJVys0ceuzMkD44J/QjqhHjOzK42GQ3QZIeFG1OYfOtKqQ==", "dev": true, "license": "MIT" }, @@ -6585,21 +6155,6 @@ "node": ">=8" } }, - "node_modules/string-width-cjs": { - "name": "string-width", - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -6612,19 +6167,6 @@ "node": ">=8" } }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", @@ -6639,9 +6181,9 @@ } }, "node_modules/strnum": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.2.tgz", - "integrity": "sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.2.tgz", + "integrity": "sha512-DnR90I+jtXNSTXWdwrEy9FakW7UX+qUZg28gj5fk2vxxl7uS/3bpI4fjFYVmdK9etptYBPNkpahuQnEwhwECqA==", "dev": true, "funding": [ { @@ -6681,9 +6223,9 @@ } }, "node_modules/tar": { - "version": "7.5.7", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.7.tgz", - "integrity": "sha512-fov56fJiRuThVFXD6o6/Q354S7pnWMJIVlDBYijsTNx6jKSE4pvrDTs6lUnmGvNyfJwFQQwWy3owKz1ucIhveQ==", + "version": "7.5.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.11.tgz", + "integrity": "sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -6708,104 +6250,48 @@ } }, "node_modules/temporal-polyfill": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/temporal-polyfill/-/temporal-polyfill-0.3.0.tgz", - "integrity": "sha512-qNsTkX9K8hi+FHDfHmf22e/OGuXmfBm9RqNismxBrnSmZVJKegQ+HYYXT+R7Ha8F/YSm2Y34vmzD4cxMu2u95g==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/temporal-polyfill/-/temporal-polyfill-0.3.2.tgz", + "integrity": "sha512-TzHthD/heRK947GNiSu3Y5gSPpeUDH34+LESnfsq8bqpFhsB79HFBX8+Z834IVX68P3EUyRPZK5bL/1fh437Eg==", "dev": true, "license": "MIT", "dependencies": { - "temporal-spec": "0.3.0" + "temporal-spec": "0.3.1" } }, "node_modules/temporal-spec": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/temporal-spec/-/temporal-spec-0.3.0.tgz", - "integrity": "sha512-n+noVpIqz4hYgFSMOSiINNOUOMFtV5cZQNCmmszA6GiVFVRt3G7AqVyhXjhCSmowvQn+NsGn+jMDMKJYHd3bSQ==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/temporal-spec/-/temporal-spec-0.3.1.tgz", + "integrity": "sha512-B4TUhezh9knfSIMwt7RVggApDRJZo73uZdj8AacL2mZ8RP5KtLianh2MXxL06GN9ESYiIsiuoLQhgVfwe55Yhw==", "dev": true, "license": "ISC" }, "node_modules/test-exclude": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.1.tgz", - "integrity": "sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-8.0.0.tgz", + "integrity": "sha512-ZOffsNrXYggvU1mDGHk54I96r26P8SyMjO5slMKSc7+IWmtB/MQKnEC2fP51imB3/pT6YK5cT5E8f+Dd9KdyOQ==", "dev": true, + "license": "ISC", "dependencies": { "@istanbuljs/schema": "^0.1.2", - "glob": "^10.4.1", - "minimatch": "^9.0.4" + "glob": "^13.0.6", + "minimatch": "^10.2.2" }, "engines": { - "node": ">=18" - } - }, - "node_modules/test-exclude/node_modules/glob": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", - "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", - "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/test-exclude/node_modules/jackspeak": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", - "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", - "dev": true, - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" + "node": "20 || >=22" } }, - "node_modules/test-exclude/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true - }, "node_modules/test-exclude/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/test-exclude/node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "version": "10.2.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz", + "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==", "dev": true, + "license": "BlueOak-1.0.0", "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + "brace-expansion": "^5.0.2" }, "engines": { - "node": ">=16 || 14 >=14.18" + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -6819,9 +6305,9 @@ "license": "MIT" }, "node_modules/tinyexec": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.2.tgz", - "integrity": "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.1.1.tgz", + "integrity": "sha512-VKS/ZaQhhkKFMANmAOhhXVoIfBXblQxGX1myCQ2faQrfmobMftXeJPcZGp0gS07ocvGJWDLZGyOZDadDBqYIJg==", "dev": true, "license": "MIT", "engines": { @@ -6829,14 +6315,14 @@ } }, "node_modules/tinyglobby": { - "version": "0.2.15", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", - "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==", + "version": "0.2.16", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz", + "integrity": "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==", "dev": true, "license": "MIT", "dependencies": { "fdir": "^6.5.0", - "picomatch": "^4.0.3" + "picomatch": "^4.0.4" }, "engines": { "node": ">=12.0.0" @@ -6864,9 +6350,9 @@ } }, "node_modules/tinyglobby/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", "engines": { @@ -6877,9 +6363,9 @@ } }, "node_modules/tinyrainbow": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.0.3.tgz", - "integrity": "sha512-PSkbLUoxOFRzJYjjxHJt9xro7D+iilgMX/C9lawzVuYiIdcihh9DXmVibBe8lmcFrRi/VzlPjBxbN7rH24q8/Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.0.tgz", + "integrity": "sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==", "dev": true, "license": "MIT", "engines": { @@ -6949,9 +6435,9 @@ "license": "MIT" }, "node_modules/typescript": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.2.tgz", + "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==", "dev": true, "license": "Apache-2.0", "bin": { @@ -6963,9 +6449,9 @@ } }, "node_modules/undici-types": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", - "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", + "version": "7.18.2", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz", + "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==", "dev": true, "license": "MIT" }, @@ -7002,16 +6488,6 @@ "node": ">= 0.8" } }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "punycode": "^2.1.0" - } - }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -7054,17 +6530,16 @@ } }, "node_modules/vite": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz", - "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==", + "version": "8.0.7", + "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.7.tgz", + "integrity": "sha512-P1PbweD+2/udplnThz3btF4cf6AgPky7kk23RtHUkJIU5BIxwPprhRGmOAHs6FTI7UiGbTNrgNP6jSYD6JaRnw==", "dev": true, "license": "MIT", "dependencies": { - "esbuild": "^0.27.0", - "fdir": "^6.5.0", - "picomatch": "^4.0.3", - "postcss": "^8.5.6", - "rollup": "^4.43.0", + "lightningcss": "^1.32.0", + "picomatch": "^4.0.4", + "postcss": "^8.5.8", + "rolldown": "1.0.0-rc.13", "tinyglobby": "^0.2.15" }, "bin": { @@ -7081,9 +6556,10 @@ }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", + "@vitejs/devtools": "^0.1.0", + "esbuild": "^0.27.0 || ^0.28.0", "jiti": ">=1.21.0", "less": "^4.0.0", - "lightningcss": "^1.21.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", @@ -7096,13 +6572,16 @@ "@types/node": { "optional": true }, - "jiti": { + "@vitejs/devtools": { "optional": true }, - "less": { + "esbuild": { + "optional": true + }, + "jiti": { "optional": true }, - "lightningcss": { + "less": { "optional": true }, "sass": { @@ -7128,28 +6607,10 @@ } } }, - "node_modules/vite/node_modules/fdir": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", - "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "picomatch": "^3 || ^4" - }, - "peerDependenciesMeta": { - "picomatch": { - "optional": true - } - } - }, "node_modules/vite/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", "engines": { @@ -7160,31 +6621,31 @@ } }, "node_modules/vitest": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.0.18.tgz", - "integrity": "sha512-hOQuK7h0FGKgBAas7v0mSAsnvrIgAvWmRFjmzpJ7SwFHH3g1k2u37JtYwOwmEKhK6ZO3v9ggDBBm0La1LCK4uQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.3.tgz", + "integrity": "sha512-DBc4Tx0MPNsqb9isoyOq00lHftVx/KIU44QOm2q59npZyLUkENn8TMFsuzuO+4U2FUa9rgbbPt3udrP25GcjXw==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/expect": "4.0.18", - "@vitest/mocker": "4.0.18", - "@vitest/pretty-format": "4.0.18", - "@vitest/runner": "4.0.18", - "@vitest/snapshot": "4.0.18", - "@vitest/spy": "4.0.18", - "@vitest/utils": "4.0.18", - "es-module-lexer": "^1.7.0", - "expect-type": "^1.2.2", + "@vitest/expect": "4.1.3", + "@vitest/mocker": "4.1.3", + "@vitest/pretty-format": "4.1.3", + "@vitest/runner": "4.1.3", + "@vitest/snapshot": "4.1.3", + "@vitest/spy": "4.1.3", + "@vitest/utils": "4.1.3", + "es-module-lexer": "^2.0.0", + "expect-type": "^1.3.0", "magic-string": "^0.30.21", "obug": "^2.1.1", "pathe": "^2.0.3", "picomatch": "^4.0.3", - "std-env": "^3.10.0", + "std-env": "^4.0.0-rc.1", "tinybench": "^2.9.0", "tinyexec": "^1.0.2", "tinyglobby": "^0.2.15", - "tinyrainbow": "^3.0.3", - "vite": "^6.0.0 || ^7.0.0", + "tinyrainbow": "^3.1.0", + "vite": "^6.0.0 || ^7.0.0 || ^8.0.0", "why-is-node-running": "^2.3.0" }, "bin": { @@ -7200,12 +6661,15 @@ "@edge-runtime/vm": "*", "@opentelemetry/api": "^1.9.0", "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", - "@vitest/browser-playwright": "4.0.18", - "@vitest/browser-preview": "4.0.18", - "@vitest/browser-webdriverio": "4.0.18", - "@vitest/ui": "4.0.18", + "@vitest/browser-playwright": "4.1.3", + "@vitest/browser-preview": "4.1.3", + "@vitest/browser-webdriverio": "4.1.3", + "@vitest/coverage-istanbul": "4.1.3", + "@vitest/coverage-v8": "4.1.3", + "@vitest/ui": "4.1.3", "happy-dom": "*", - "jsdom": "*" + "jsdom": "*", + "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "@edge-runtime/vm": { @@ -7226,6 +6690,12 @@ "@vitest/browser-webdriverio": { "optional": true }, + "@vitest/coverage-istanbul": { + "optional": true + }, + "@vitest/coverage-v8": { + "optional": true + }, "@vitest/ui": { "optional": true }, @@ -7234,13 +6704,16 @@ }, "jsdom": { "optional": true + }, + "vite": { + "optional": false } } }, "node_modules/vitest/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", "engines": { @@ -7298,6 +6771,7 @@ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -7348,9 +6822,9 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.19", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", - "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", + "version": "1.1.20", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.20.tgz", + "integrity": "sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==", "dev": true, "license": "MIT", "dependencies": { @@ -7403,24 +6877,6 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -7468,16 +6924,6 @@ "node": ">=4.0" } }, - "node_modules/xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4" - } - }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", @@ -7494,9 +6940,9 @@ "dev": true }, "node_modules/yaml": { - "version": "2.8.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz", - "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==", + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz", + "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==", "dev": true, "license": "ISC", "bin": { diff --git a/packages/http-client-java/package.json b/packages/http-client-java/package.json index 9402f0fa2f5..213ce6d855b 100644 --- a/packages/http-client-java/package.json +++ b/packages/http-client-java/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/http-client-java", - "version": "0.6.1", + "version": "0.7.0", "description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding", "keywords": [ "TypeSpec" @@ -49,51 +49,51 @@ "generator/http-client-generator/target/classes/PerfAutomation.jfc" ], "peerDependencies": { - "@azure-tools/typespec-autorest": ">=0.64.1 <1.0.0", - "@azure-tools/typespec-azure-core": ">=0.64.0 <1.0.0", - "@azure-tools/typespec-azure-resource-manager": ">=0.64.1 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.64.5 <1.0.0", - "@typespec/compiler": "^1.8.0", - "@typespec/events": ">=0.78.0 <1.0.0", - "@typespec/http": "^1.8.0", - "@typespec/openapi": "^1.8.0", - "@typespec/rest": ">=0.78.0 <1.0.0", - "@typespec/sse": ">=0.78.0 <1.0.0", - "@typespec/streams": ">=0.78.0 <1.0.0", - "@typespec/versioning": ">=0.78.0 <1.0.0", - "@typespec/xml": ">=0.78.0 <1.0.0" + "@azure-tools/typespec-autorest": ">=0.67.0 <1.0.0", + "@azure-tools/typespec-azure-core": ">=0.67.0 <1.0.0", + "@azure-tools/typespec-azure-resource-manager": ">=0.67.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.67.0 <1.0.0", + "@typespec/compiler": "^1.11.0", + "@typespec/events": ">=0.81.0 <1.0.0", + "@typespec/http": "^1.11.0", + "@typespec/openapi": "^1.11.0", + "@typespec/rest": ">=0.81.0 <1.0.0", + "@typespec/sse": ">=0.81.0 <1.0.0", + "@typespec/streams": ">=0.81.0 <1.0.0", + "@typespec/versioning": ">=0.81.0 <1.0.0", + "@typespec/xml": ">=0.81.0 <1.0.0" }, "dependencies": { "@autorest/codemodel": "~4.20.1", "js-yaml": "~4.1.1", - "lodash": "~4.17.23" + "lodash": "~4.18.1" }, "devDependencies": { - "@azure-tools/typespec-autorest": "0.64.1", - "@azure-tools/typespec-azure-core": "0.64.0", - "@azure-tools/typespec-azure-resource-manager": "0.64.1", - "@azure-tools/typespec-azure-rulesets": "0.64.0", - "@azure-tools/typespec-client-generator-core": "0.64.5", - "@microsoft/api-extractor": "^7.56.0", - "@microsoft/api-extractor-model": "^7.32.2", + "@azure-tools/typespec-autorest": "0.67.0", + "@azure-tools/typespec-azure-core": "0.67.0", + "@azure-tools/typespec-azure-resource-manager": "0.67.0", + "@azure-tools/typespec-azure-rulesets": "0.67.0", + "@azure-tools/typespec-client-generator-core": "0.67.1", + "@microsoft/api-extractor": "^7.58.2", + "@microsoft/api-extractor-model": "^7.33.6", "@types/js-yaml": "~4.0.9", - "@types/lodash": "~4.17.23", - "@types/node": "~25.2.0", - "@typespec/compiler": "1.8.0", - "@typespec/events": "0.78.0", - "@typespec/http": "1.8.0", - "@typespec/openapi": "1.8.0", - "@typespec/rest": "0.78.0", - "@typespec/spector": "0.1.0-alpha.22", - "@typespec/sse": "0.78.0", - "@typespec/streams": "0.78.0", - "@typespec/versioning": "0.78.0", - "@typespec/xml": "0.78.0", - "@vitest/coverage-v8": "^4.0.18", - "@vitest/ui": "^4.0.18", - "c8": "~10.1.3", - "rimraf": "~6.1.2", - "typescript": "~5.9.3", - "vitest": "^4.0.18" + "@types/lodash": "~4.17.24", + "@types/node": "~25.5.2", + "@typespec/compiler": "1.11.0", + "@typespec/events": "0.81.0", + "@typespec/http": "1.11.0", + "@typespec/openapi": "1.11.0", + "@typespec/rest": "0.81.0", + "@typespec/spector": "0.1.0-alpha.25", + "@typespec/sse": "0.81.0", + "@typespec/streams": "0.81.0", + "@typespec/versioning": "0.81.0", + "@typespec/xml": "0.81.0", + "@vitest/coverage-v8": "^4.1.3", + "@vitest/ui": "^4.1.3", + "c8": "~11.0.0", + "rimraf": "~6.1.3", + "typescript": "~6.0.2", + "vitest": "^4.1.3" } } diff --git a/packages/http-client-js/CHANGELOG.md b/packages/http-client-js/CHANGELOG.md index 63cb11321bb..b182f6c3492 100644 --- a/packages/http-client-js/CHANGELOG.md +++ b/packages/http-client-js/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog - @typespec/http-client-js +## 0.14.1 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 0.14.0 + +### Bump dependencies + +- [#9446](https://github.com/microsoft/typespec/pull/9446) Upgrade dependencies + + ## 0.13.0 ### Bump dependencies diff --git a/packages/http-client-js/eng/scripts/emit-e2e.js b/packages/http-client-js/eng/scripts/emit-e2e.js index a7b9248539e..5343bb40f45 100644 --- a/packages/http-client-js/eng/scripts/emit-e2e.js +++ b/packages/http-client-js/eng/scripts/emit-e2e.js @@ -205,7 +205,7 @@ async function processFile(file, options) { console.log(pc.yellow(`Skipping: ${relativePath}`)); } else if (action === "abort") { console.log(pc.red("Aborting processing.")); - throw new Error("Processing aborted by user"); + throw new Error("Processing aborted by user", { cause: error }); } } return { status: "failed", relativePath, errorDetails }; diff --git a/packages/http-client-js/package.json b/packages/http-client-js/package.json index 5881d6d1a27..37465bbff50 100644 --- a/packages/http-client-js/package.json +++ b/packages/http-client-js/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/http-client-js", - "version": "0.13.0", + "version": "0.14.1", "type": "module", "homepage": "https://typespec.io", "readme": "https://github.com/microsoft/typespec/blob/main/packages/http-client-js/README.md", @@ -53,36 +53,36 @@ "@typespec/rest": "workspace:^" }, "dependencies": { - "@alloy-js/core": "^0.22.0", - "@alloy-js/typescript": "^0.22.0", + "@alloy-js/core": "catalog:", + "@alloy-js/typescript": "catalog:", "@typespec/emitter-framework": "workspace:^", "@typespec/http-client": "workspace:^", - "prettier": "~3.8.0" + "prettier": "catalog:" }, "devDependencies": { - "@alloy-js/cli": "^0.22.0", - "@alloy-js/rollup-plugin": "^0.1.0", - "@types/yargs": "~17.0.33", + "@alloy-js/cli": "catalog:", + "@alloy-js/rollup-plugin": "catalog:", + "@types/yargs": "catalog:", "@typespec/http": "workspace:^", "@typespec/http-specs": "workspace:^", "@typespec/spector": "workspace:^", - "@typespec/ts-http-runtime": "0.3.2", + "@typespec/ts-http-runtime": "catalog:", "@typespec/tspd": "workspace:^", "@typespec/versioning": "workspace:^", - "@vitest/ui": "^4.0.15", - "change-case": "~5.4.4", - "concurrently": "^9.1.2", - "cross-env": "~10.1.0", - "execa": "^9.6.1", - "fs-extra": "^11.2.0", - "globby": "~16.1.0", - "inquirer": "^13.1.0", - "ora": "^9.0.0", - "p-limit": "^7.1.1", - "picocolors": "~1.1.1", - "typescript": "~5.9.2", - "uri-template": "^2.0.0", - "vitest": "^4.0.15", - "yargs": "~18.0.0" + "@vitest/ui": "catalog:", + "change-case": "catalog:", + "concurrently": "catalog:", + "cross-env": "catalog:", + "execa": "catalog:", + "fs-extra": "catalog:", + "globby": "catalog:", + "inquirer": "catalog:", + "ora": "catalog:", + "p-limit": "catalog:", + "picocolors": "catalog:", + "typescript": "catalog:", + "uri-template": "catalog:", + "vitest": "catalog:", + "yargs": "catalog:" } } diff --git a/packages/http-client-js/test/test-host.ts b/packages/http-client-js/test/test-host.ts index c97b25744bc..619bdf74d79 100644 --- a/packages/http-client-js/test/test-host.ts +++ b/packages/http-client-js/test/test-host.ts @@ -1,15 +1,5 @@ import { Diagnostic, resolvePath } from "@typespec/compiler"; -import { - BasicTestRunner, - createTester, - createTestHost, - createTestWrapper, - expectDiagnosticEmpty, -} from "@typespec/compiler/testing"; -import { HttpTestLibrary } from "@typespec/http/testing"; -import { RestTestLibrary } from "@typespec/rest/testing"; -import { join, relative } from "path"; -import { HttpClientJavascriptEmitterTestLibrary } from "../src/testing/index.js"; +import { createTester, expectDiagnosticEmpty } from "@typespec/compiler/testing"; const ApiTester = createTester(resolvePath(import.meta.dirname, ".."), { libraries: ["@typespec/http", "@typespec/rest", "@typespec/http-client-js"], @@ -17,63 +7,11 @@ const ApiTester = createTester(resolvePath(import.meta.dirname, ".."), { export const Tester = ApiTester.emit("@typespec/http-client-js"); -export async function createHttpClientJsTestHost() { - return createTestHost({ - libraries: [HttpClientJavascriptEmitterTestLibrary, HttpTestLibrary, RestTestLibrary], - }); -} - -export async function createHttpClientJavascriptEmitterTestRunner() { - const host = await createHttpClientJsTestHost(); - - return createTestWrapper(host, { - autoImports: ["@typespec/http", "@typespec/rest"], - autoUsings: ["TypeSpec.Http", "TypeSpec.Rest"], - compilerOptions: { - noEmit: false, - emit: ["@typespec/http-client-js"], - }, - }); -} - -const emitterOutputDir = join("tsp-output", "http-client-js"); - export async function emitWithDiagnostics( code: string, ): Promise<[Record, readonly Diagnostic[]]> { - const runner = await createHttpClientJavascriptEmitterTestRunner(); - await runner.compileAndDiagnose(code, { - outputDir: "tsp-output", - }); - const result = await readFilesRecursively(emitterOutputDir, runner); - return [result, runner.program.diagnostics]; -} - -async function readFilesRecursively( - dir: string, - runner: BasicTestRunner, -): Promise> { - const entries = await runner.program.host.readDir(dir); - const result: Record = {}; - - for (const entry of entries) { - const fullPath = join(dir, entry); - const stat = await runner.program.host.stat(fullPath); - - if (stat.isDirectory()) { - // Recursively read files in the directory - const nestedFiles = await readFilesRecursively(fullPath, runner); - Object.assign(result, nestedFiles); - } else if (stat.isFile()) { - // Read the file - // Read the file and store it with a relative path - const relativePath = relative(emitterOutputDir, fullPath); - const fileContent = await runner.program.host.readFile(fullPath); - result[relativePath] = fileContent.text; - } - } - - return result; + const [result, diagnostics] = await Tester.compileAndDiagnose(code); + return [result.outputs, diagnostics]; } export async function emit(code: string): Promise> { diff --git a/packages/http-client-python/.github/skills/diff-upstream/SKILL.md b/packages/http-client-python/.github/skills/diff-upstream/SKILL.md new file mode 100644 index 00000000000..ff0232161ab --- /dev/null +++ b/packages/http-client-python/.github/skills/diff-upstream/SKILL.md @@ -0,0 +1,338 @@ +--- +name: diff-upstream +description: > + Regenerate the local emitter and diff the generated code against the upstream + baseline checked into autorest.python. Use this skill when the user wants to + see how their emitter changes affect generated code compared to what's currently + in production, says things like "diff upstream", "compare to baseline", "what + changed vs production", "show me the diff", "how does this affect generated code", + or wants to validate their changes produce the expected output differences. +--- + +# Diff Upstream Skill + +Regenerates local emitter output and compares it against the baseline generated +code checked into the autorest.python repository. Shows exactly what would change +if the current emitter changes were shipped. + +Optimized for local development with cached baseline and editor integration. + +## Paths + +All paths are relative to the http-client-python package root. + +| Item | Path | +| --------------------------- | ------------------------------------------------------- | +| Package root | `~/Desktop/github/typespec/packages/http-client-python` | +| Local generated (unbranded) | `generator/test/unbranded/generated` | +| Local generated (azure) | `generator/test/azure/generated` | +| Baseline cache (unbranded) | `generator/test/unbranded/.baseline` (gitignored) | +| Baseline cache (azure) | `generator/test/azure/.baseline` (gitignored) | +| Diff summary output | `generator/test/.diff-summary.md` (gitignored) | +| Regenerate marker | `.last-regenerate` | +| Upstream repo | `https://github.com/Azure/autorest.python` | + +## Workflow + +### Step 1: Build and regenerate + +Always regenerate to see current changes: + +```bash +cd ~/Desktop/github/typespec/packages/http-client-python +npm run build +npm run regenerate +touch .last-regenerate +``` + +If build or regenerate fails, report errors and stop. + +### Step 2: Fetch or update baseline + +Fetch baseline files directly into the test folders using sparse checkout: + +```bash +cd ~/Desktop/github/typespec/packages/http-client-python + +BASELINE_UNBRANDED="generator/test/unbranded/.baseline" +BASELINE_AZURE="generator/test/azure/.baseline" +TEMP_CLONE="/tmp/autorest-python-baseline-$$" + +# Check if we need to fetch/update +if [ ! -d "$BASELINE_UNBRANDED" ] || [ ! -d "$BASELINE_AZURE" ]; then + echo "Fetching upstream baseline..." + + # Clone with sparse checkout to temp location + git clone --depth 1 --filter=blob:none --sparse \ + https://github.com/Azure/autorest.python.git "$TEMP_CLONE" + + cd "$TEMP_CLONE" + git sparse-checkout set \ + packages/typespec-python/test/unbranded/generated \ + packages/typespec-python/test/azure/generated + + cd ~/Desktop/github/typespec/packages/http-client-python + + # Copy to baseline locations + rm -rf "$BASELINE_UNBRANDED" "$BASELINE_AZURE" + cp -r "$TEMP_CLONE/packages/typespec-python/test/unbranded/generated" "$BASELINE_UNBRANDED" + cp -r "$TEMP_CLONE/packages/typespec-python/test/azure/generated" "$BASELINE_AZURE" + + # Cleanup temp clone + rm -rf "$TEMP_CLONE" + + echo "Baseline cached in generator/test/*/.baseline/" +else + echo "Using cached baseline (delete generator/test/*/.baseline to refresh)" +fi +``` + +### Step 3: Generate diff summary + +Create a markdown summary file with package-level comparison: + +```bash +cd ~/Desktop/github/typespec/packages/http-client-python + +LOCAL_UNBRANDED="generator/test/unbranded/generated" +LOCAL_AZURE="generator/test/azure/generated" +BASELINE_UNBRANDED="generator/test/unbranded/.baseline" +BASELINE_AZURE="generator/test/azure/.baseline" + +cat > generator/test/.diff-summary.md << EOF +# Diff Summary: Local vs Upstream (autorest.python) + +Generated: $(date) + +## Unbranded Packages + +| Metric | Count | +|--------|-------| +| Local | $(ls "$LOCAL_UNBRANDED" 2> /dev/null | wc -l | tr -d ' ') | +| Upstream | $(ls "$BASELINE_UNBRANDED" 2> /dev/null | wc -l | tr -d ' ') | + +### Missing locally (in upstream only): +$(comm -13 <(ls "$LOCAL_UNBRANDED" 2> /dev/null | sort) <(ls "$BASELINE_UNBRANDED" 2> /dev/null | sort) | sed 's/^/- /' || echo "- (none)") + +### New locally (not in upstream): +$(comm -23 <(ls "$LOCAL_UNBRANDED" 2> /dev/null | sort) <(ls "$BASELINE_UNBRANDED" 2> /dev/null | sort) | sed 's/^/- /' || echo "- (none)") + +## Azure Packages + +| Metric | Count | +|--------|-------| +| Local | $(ls "$LOCAL_AZURE" 2> /dev/null | wc -l | tr -d ' ') | +| Upstream | $(ls "$BASELINE_AZURE" 2> /dev/null | wc -l | tr -d ' ') | + +### Missing locally (in upstream only): +$(comm -13 <(ls "$LOCAL_AZURE" 2> /dev/null | sort) <(ls "$BASELINE_AZURE" 2> /dev/null | sort) | sed 's/^/- /' || echo "- (none)") + +### New locally (not in upstream): +$(comm -23 <(ls "$LOCAL_AZURE" 2> /dev/null | sort) <(ls "$BASELINE_AZURE" 2> /dev/null | sort) | sed 's/^/- /' || echo "- (none)") + +--- + +## Viewing Detailed Diffs + +### List changed files in a package: +\`\`\`bash +diff -rq generator/test/unbranded/generated/PACKAGE generator/test/unbranded/.baseline/PACKAGE +\`\`\` + +### View full diff for a package: +\`\`\`bash +diff -r generator/test/unbranded/generated/PACKAGE generator/test/unbranded/.baseline/PACKAGE +\`\`\` + +### Open side-by-side diff in VS Code: +\`\`\`bash +code --diff generator/test/unbranded/.baseline/PACKAGE/path/to/file.py generator/test/unbranded/generated/PACKAGE/path/to/file.py +\`\`\` + +EOF +``` + +### Step 4: Open in editor + +Open the summary file in the user's preferred editor: + +```bash +cd ~/Desktop/github/typespec/packages/http-client-python + +# Try common editors in order of preference +if command -v code &> /dev/null; then + code generator/test/.diff-summary.md +elif [ -n "$VISUAL" ]; then + $VISUAL generator/test/.diff-summary.md +elif [ -n "$EDITOR" ]; then + $EDITOR generator/test/.diff-summary.md +elif command -v vim &> /dev/null; then + vim generator/test/.diff-summary.md +else + cat generator/test/.diff-summary.md +fi +``` + +### Step 5: Report to user + +Tell the user: + +- Summary file is open at `generator/test/.diff-summary.md` +- Baseline is cached alongside generated code in `generator/test/*/.baseline/` +- How to view detailed diffs (commands are in the summary file) +- How to refresh baseline: `rm -rf generator/test/*/.baseline` + +## Viewing Detailed File Diffs + +After showing the summary, if the user wants to see specific file changes: + +### Find changed files in a package: + +```bash +cd ~/Desktop/github/typespec/packages/http-client-python +diff -rq \ + generator/test/unbranded/generated/typetest-array \ + generator/test/unbranded/.baseline/typetest-array +``` + +### Show inline diff for a file: + +```bash +diff -u \ + generator/test/unbranded/.baseline/typetest-array/typetest/array/_client.py \ + generator/test/unbranded/generated/typetest-array/typetest/array/_client.py +``` + +### VS Code side-by-side (if user has VS Code): + +```bash +code --diff \ + generator/test/unbranded/.baseline/typetest-array/typetest/array/_client.py \ + generator/test/unbranded/generated/typetest-array/typetest/array/_client.py +``` + +## Integration with test-unbranded-emitter + +After running `diff-upstream`, you can immediately run tests: + +- The `.last-regenerate` marker is updated +- `test-unbranded-emitter` will skip regeneration since it's fresh + +## Cleanup + +The baseline is cached for fast subsequent runs. To refresh: + +```bash +# Remove baseline (will re-fetch on next run) +rm -rf generator/test/unbranded/.baseline generator/test/azure/.baseline + +# Remove summary file +rm generator/test/.diff-summary.md +``` + +## Gitignore + +These patterns should be in `.gitignore`: + +``` +generator/test/unbranded/.baseline/ +generator/test/azure/.baseline/ +generator/test/.diff-summary.md +.last-regenerate +``` + +## Interpreting Diffs + +After generating the diff, analyze what changed and report to the user whether the diffs are expected. + +### Step 1: Check what code changes were made on the branch + +First, understand what emitter changes were made: + +```bash +# Show commits on this branch +git log main..HEAD --oneline -- "emitter/src/*.ts" + +# Show the actual changes +git diff main..HEAD -- emitter/src/ +``` + +### Step 2: Correlate code changes with expected generated output changes + +Based on the emitter changes, determine what generated code SHOULD change: + +| Emitter change type | Expected generated code impact | +| ---------------------------------------------- | -------------------------------------------- | +| Namespace logic refactor (behavior-preserving) | No generated code changes | +| New decorator support | Changes in files using that decorator | +| Serialization changes | Changes in `_serialization.py`, model files | +| Client initialization changes | Changes in `_client.py`, `_configuration.py` | +| Operation changes | Changes in `_operations/*.py` | + +### Step 3: Compare expected vs actual diffs + +- **If actual diffs match expected:** Tell user "The diffs are expected based on your emitter changes to [describe changes]. The generated code correctly reflects your modifications." + +- **If no diffs but expected some:** Tell user "No generated code changes detected. If you expected changes, verify your emitter modifications are being triggered by the test specs, or there may be more development needed. Should I investigate further?" + +- **If unexpected diffs appear:** Tell user "Found unexpected changes in [files]. These don't appear to match your emitter modifications. There may be unintended side effects - would you like me to investigate?" + +### Pre-existing repo differences (always present, not caused by your changes) + +These diffs exist between typespec and autorest.python repos regardless of emitter changes. They should be ignored when evaluating your changes: + +| File type | Typical diff | Cause | +| ----------------------------- | ------------------------- | ------------------------------------------- | +| `_patch.py` | `List[str]` → `list[str]` | Type hint modernization (Python 3.9+ style) | +| `CHANGELOG.md` | Formatting differences | Template differences | +| `README.md` | Service display names | Template/config differences | +| `pyproject.toml` / `setup.py` | Different packaging | Tooling preferences | + +**If only these files differ:** "The only diffs are pre-existing repo differences (type hints, config files), not caused by your emitter changes. Your changes are behavior-preserving." + +### Unexpected diffs (actual code changes) + +If you see differences in these files, the emitter changes ARE affecting generated code: + +- `_client.py` - Client class definitions +- `_operations/*.py` - Operation implementations +- `models/*.py` - Model definitions (excluding `_patch.py`) +- `_serialization.py` - Serialization logic +- `aio/*.py` - Async client code + +**If these files differ:** First check if the changes match what the emitter modifications should produce. If they match, say "The generated code changes are expected based on your emitter changes." If they don't match or are unexpected, say "Found changes that don't appear to match your emitter modifications. There may be more development needed - would you like me to investigate?" + +### Quick diff analysis command + +To check if there are actual code changes (excluding expected differences): + +```bash +diff -rq generator/test/unbranded/generated generator/test/unbranded/.baseline 2> /dev/null | grep "\.py differ" | grep -v "_patch.py" +``` + +If this returns nothing, only expected diffs exist. + +## Notes + +### Diff direction + +The diff shows changes from upstream (baseline) to local (your changes): + +- `-` lines: removed from upstream (or changed) +- `+` lines: added in your local version + +### Why packages might be missing locally + +Some upstream packages may not generate locally due to: + +- TypeSpec version incompatibilities in the monorepo +- Specs that require specific dependencies not installed +- Test configurations that differ between repos + +This is expected for ARM/azure-resource-manager specs if there are version conflicts. + +### Performance + +- First run: ~30-60s (fetch baseline) +- Subsequent runs: instant (uses cached baseline) +- Regenerate: ~2-3 minutes (always runs for diff) diff --git a/packages/http-client-python/.github/skills/test-unbranded-emitter/SKILL.md b/packages/http-client-python/.github/skills/test-unbranded-emitter/SKILL.md new file mode 100644 index 00000000000..6673685917c --- /dev/null +++ b/packages/http-client-python/.github/skills/test-unbranded-emitter/SKILL.md @@ -0,0 +1,183 @@ +--- +name: test-unbranded-emitter +description: > + Build and test the @typespec/http-client-python emitter. Use this skill whenever + the user wants to test their local changes to the emitter, run the generator + test suite, check if their http-client-python changes are passing, or validate + a fix. Triggers on phrases like "test the emitter", "run tests", "check if my + changes pass", "run test:generator", "run CI", or any mention of testing/validating + changes in the emitter package. +--- + +# Test Emitter Skill + +Builds and tests `@typespec/http-client-python` to validate local changes. +Automatically regenerates if the generated code is stale. + +## Paths + +All paths are relative to the http-client-python package root: +`~/Desktop/github/typespec/packages/http-client-python` + +| Item | Path | +| --------------------- | ------------------------------------------------------- | +| Package root | `~/Desktop/github/typespec/packages/http-client-python` | +| Emitter source | `emitter/src` | +| Generated (unbranded) | `generator/test/unbranded/generated` | +| Generated (azure) | `generator/test/azure/generated` | +| Regenerate marker | `.last-regenerate` | + +## Workflow + +### Step 1: Build the emitter + +```bash +cd ~/Desktop/github/typespec/packages/http-client-python +npm run build +``` + +Check for TypeScript compilation errors. If the build fails, report the errors +to the user and stop — do not proceed to testing. + +### Step 2: Check if regeneration is needed + +Regeneration is needed if ANY of these conditions are true: + +1. **Generated folder doesn't exist or is empty**: + + ```bash + cd ~/Desktop/github/typespec/packages/http-client-python + + if [ ! -d "generator/test/unbranded/generated" ] \ + || [ -z "$(ls -A generator/test/unbranded/generated 2> /dev/null)" ]; then + echo "Unbranded generated folder is empty - regeneration needed" + fi + + if [ ! -d "generator/test/azure/generated" ] \ + || [ -z "$(ls -A generator/test/azure/generated 2> /dev/null)" ]; then + echo "Azure generated folder is empty - regeneration needed" + fi + ``` + +2. **No regenerate marker file exists**: + + ```bash + if [ ! -f ".last-regenerate" ]; then + echo "No regenerate marker - regeneration needed" + fi + ``` + +3. **Emitter source files are newer than the marker**: + ```bash + if [ -n "$(find emitter/src -newer .last-regenerate -type f 2> /dev/null | head -1)" ]; then + echo "Emitter source changed since last regenerate - regeneration needed" + fi + ``` + +### Step 3: Regenerate if needed + +If any condition from Step 2 is true: + +```bash +cd ~/Desktop/github/typespec/packages/http-client-python +echo "Regenerating test clients..." +npm run regenerate +``` + +After successful regeneration, update the marker: + +```bash +touch .last-regenerate +``` + +If regeneration fails, report the error and stop. + +If regeneration is NOT needed, inform the user: + +> "Generated code is up to date (source unchanged since last regeneration). Skipping regenerate." + +### Step 4: Run the generator test suite + +```bash +cd ~/Desktop/github/typespec/packages/http-client-python +npm run ci +``` + +This runs: + +1. `test:emitter` - vitest unit tests for the emitter +2. `ci:generator` - pytest tests against generated code + +The full CI can take several minutes. Keep the user informed that it's running. + +### Step 5: Report results + +- **If tests pass**: Confirm success and summarize any notable output (warnings, skipped tests, etc.) +- **If tests fail**: Show the failing test names and error messages clearly. + Offer to help debug or investigate specific failures. + +## Integration with diff-upstream + +Both skills share the regeneration marker system: + +- `diff-upstream` always regenerates and updates `.last-regenerate` +- `test-unbranded-emitter` checks this marker and skips regeneration if fresh + +**Efficient workflow**: + +``` +diff-upstream → test-unbranded-emitter +``` + +The second command will skip regeneration since `diff-upstream` just did it. + +**Standalone workflow**: + +``` +test-unbranded-emitter +``` + +Will regenerate only if source changed since last run. + +## Notes + +### Regeneration takes time + +`npm run regenerate` can take 2-3 minutes. The staleness check avoids this delay +when the user is iterating on test fixes (not emitter changes). + +### Test types + +| Command | What it runs | Duration | +| ------------------------ | ------------------------- | ------------ | +| `npm run test:emitter` | vitest unit tests only | ~5 seconds | +| `npm run test:generator` | pytest only (no vitest) | ~2 minutes | +| `npm run ci` | vitest + pytest (full CI) | ~2-3 minutes | + +This skill runs `npm run ci` (full CI). If the user wants just unit tests or +just pytest, they can ask specifically. + +### Known flaky test + +The test server teardown sometimes fails with `ProcessLookupError` - this is a +pre-existing infrastructure issue, not a test failure. All actual tests may pass +even if you see this error at the end. + +### Force regeneration + +If the user suspects stale generated code despite the marker, they can force +regeneration: + +```bash +rm ~/Desktop/github/typespec/packages/http-client-python/.last-regenerate +``` + +Then run the skill again. + +## Gitignore + +Ensure this entry is in the package's `.gitignore`: + +``` +.last-regenerate +``` diff --git a/packages/http-client-python/.gitignore b/packages/http-client-python/.gitignore new file mode 100644 index 00000000000..752599c032c --- /dev/null +++ b/packages/http-client-python/.gitignore @@ -0,0 +1,16 @@ +# Diff upstream baseline cache (fetched from autorest.python for comparison) +generator/test/unbranded/.baseline/ +generator/test/azure/.baseline/ + +# Diff summary output file +generator/test/.diff-summary.md + +# Regeneration marker (tracks when generated code was last regenerated) +.last-regenerate + +# local folder for debug +alpha + +# pip component detection reports (generated during build) +component-detection-pip-report.json +generator/component-detection-pip-report.json diff --git a/packages/http-client-python/CHANGELOG.md b/packages/http-client-python/CHANGELOG.md index 3dd20be9332..a97751ffd64 100644 --- a/packages/http-client-python/CHANGELOG.md +++ b/packages/http-client-python/CHANGELOG.md @@ -1,5 +1,76 @@ # Change Log - @typespec/http-client-python +## 0.28.3 + +### Bump dependencies + +- [#10297](https://github.com/microsoft/typespec/pull/10297) Bump dependencies of `@typespec/*` and `@azure-tools/*` to latest versions + +## 0.28.2 + +### Bug Fixes + +- [#10167](https://github.com/microsoft/typespec/pull/10167) Fix import of `_deserialize` in mix of xml and non-xml models + + +## 0.28.1 + +### Bug Fixes + +- [#10084](https://github.com/microsoft/typespec/pull/10084) Fix PermissionError when detecting package manager on WSL +- [#10105](https://github.com/microsoft/typespec/pull/10105) Remove `None` from "Known values" in `api_version` parameter docstring since the parameter is typed as `str` and `None` is not a valid API version value. +- [#10117](https://github.com/microsoft/typespec/pull/10117) Fix model usage which is referred both in request and response + + +## 0.28.0 + +### Features + +- [#9898](https://github.com/microsoft/typespec/pull/9898) Remove enum value padding because we generate our enum value names with upper case so there is no need + +### Bug Fixes + +- [#9778](https://github.com/microsoft/typespec/pull/9778) Return empty list instead of None for non-optional unwrapped XML list fields during deserialization +- [#9952](https://github.com/microsoft/typespec/pull/9952) Fix extensible enum member names incorrectly getting an `Enum` suffix when the member name matched a Python reserved word (e.g. `ANDEnum` → `AND`, `CLASSEnum` → `CLASS`). +- [#9964](https://github.com/microsoft/typespec/pull/9964) Remove includeRootSlash client option logic, which should be handled at the TypeSpec core level + + +## 0.27.2 + +### Bump dependencies + +- [#9713](https://github.com/microsoft/typespec/pull/9713) Upgrade dependencies to match root package.json versions (@types/node, rimraf, tsx, typescript, typescript-eslint, vitest) + +### Bug Fixes + +- [#9812](https://github.com/microsoft/typespec/pull/9812) Fix `__eq__` method in `_MyMutableMapping` to use `isinstance` check instead of attempting to construct a new instance from the other object. +- [#9776](https://github.com/microsoft/typespec/pull/9776) Allow client options on child clients to override parent clients +- [#9769](https://github.com/microsoft/typespec/pull/9769) Add pylint disable for list of elem deserialization +- [#9779](https://github.com/microsoft/typespec/pull/9779) allow decompression in version tolerant + + +## 0.27.1 + +### Bug Fixes + +- [#9640](https://github.com/microsoft/typespec/pull/9640) Fall back to wire type for unknown or unsupported encode +- [#9571](https://github.com/microsoft/typespec/pull/9571) Fix import for xml paging + + +## 0.27.0 + +### Features + +- [#9587](https://github.com/microsoft/typespec/pull/9587) Add support for `@clientOption("includeRootSlash")` to control stripping of the slash after the root url + + +## 0.26.3 + +### Bug Fixes + +- [#9573](https://github.com/microsoft/typespec/pull/9573) Ignore all errors thrown during error deserialization, not just `DeserializationError` + + ## 0.26.2 ### Bug Fixes diff --git a/packages/http-client-python/emitter/src/code-model.ts b/packages/http-client-python/emitter/src/code-model.ts index e75848495fb..974008d8b3b 100644 --- a/packages/http-client-python/emitter/src/code-model.ts +++ b/packages/http-client-python/emitter/src/code-model.ts @@ -25,21 +25,14 @@ import { emitPagingHttpMethod, } from "./http.js"; import { PythonSdkContext } from "./lib.js"; -import { - KnownTypes, - disableGenerationMap, - emitEndpointType, - getType, - simpleTypesMap, - typesMap, -} from "./types.js"; +import { KnownTypes, emitEndpointType, getType } from "./types.js"; import { emitParamBase, getClientNamespace, getImplementation, getRootNamespace } from "./utils.js"; function emitBasicMethod( context: PythonSdkContext, rootClient: SdkClientType, method: SdkBasicServiceMethod, - operationGroupName: string, + operationGroup: SdkClientType, serviceApiVersions: string[], ): Record[] { if (method.operation.kind !== "http") @@ -50,7 +43,7 @@ function emitBasicMethod( context, rootClient, method, - operationGroupName, + operationGroup.name, serviceApiVersions, ); default: @@ -62,14 +55,20 @@ function emitLroMethod( context: PythonSdkContext, rootClient: SdkClientType, method: SdkLroServiceMethod, - operationGroupName: string, + operationGroup: SdkClientType, serviceApiVersions: string[], ): Record[] { if (method.operation.kind !== "http") throw new Error("We only support HTTP operations right now"); switch (method.operation.kind) { case "http": - return emitLroHttpMethod(context, rootClient, method, operationGroupName, serviceApiVersions); + return emitLroHttpMethod( + context, + rootClient, + method, + operationGroup.name, + serviceApiVersions, + ); default: throw new Error("We only support HTTP operations right now"); } @@ -79,7 +78,7 @@ function emitPagingMethod( context: PythonSdkContext, rootClient: SdkClientType, method: SdkPagingServiceMethod, - operationGroupName: string, + operationGroup: SdkClientType, serviceApiVersions: string[], ): Record[] { if (method.operation.kind !== "http") @@ -90,7 +89,7 @@ function emitPagingMethod( context, rootClient, method, - operationGroupName, + operationGroup.name, serviceApiVersions, ); default: @@ -102,7 +101,7 @@ function emitLroPagingMethod( context: PythonSdkContext, rootClient: SdkClientType, method: SdkLroPagingServiceMethod, - operationGroupName: string, + operationGroup: SdkClientType, serviceApiVersions: string[], ): Record[] { if (method.operation.kind !== "http") @@ -113,7 +112,7 @@ function emitLroPagingMethod( context, rootClient, method, - operationGroupName, + operationGroup.name, serviceApiVersions, ); default: @@ -183,25 +182,19 @@ function emitMethodParameter( function emitMethod( context: PythonSdkContext, rootClient: SdkClientType, + operationGroup: SdkClientType, method: SdkServiceMethod, - operationGroupName: string, serviceApiVersions: string[], ): Record[] { switch (method.kind) { case "basic": - return emitBasicMethod(context, rootClient, method, operationGroupName, serviceApiVersions); + return emitBasicMethod(context, rootClient, method, operationGroup, serviceApiVersions); case "lro": - return emitLroMethod(context, rootClient, method, operationGroupName, serviceApiVersions); + return emitLroMethod(context, rootClient, method, operationGroup, serviceApiVersions); case "paging": - return emitPagingMethod(context, rootClient, method, operationGroupName, serviceApiVersions); + return emitPagingMethod(context, rootClient, method, operationGroup, serviceApiVersions); default: - return emitLroPagingMethod( - context, - rootClient, - method, - operationGroupName, - serviceApiVersions, - ); + return emitLroPagingMethod(context, rootClient, method, operationGroup, serviceApiVersions); } } @@ -218,11 +211,17 @@ function emitOperationGroups( for (const operationGroup of client.children ?? []) { const name = `${prefix}${operationGroup.name}`; + const operationGroupWithPrefixedName = { + ...operationGroup, + name, + } as SdkClientType; let operations: Record[] = []; const apiVersions = serviceApiVersions.length > 0 ? serviceApiVersions : operationGroup.apiVersions; for (const method of operationGroup.methods) { - operations = operations.concat(emitMethod(context, rootClient, method, name, apiVersions)); + operations = operations.concat( + emitMethod(context, rootClient, operationGroupWithPrefixedName, method, apiVersions), + ); } operationGroups.push({ name: name, @@ -236,10 +235,11 @@ function emitOperationGroups( // root client should deal with mixin operation group if (prefix === "") { + const mixinGroup = { ...client, name: "" } as SdkClientType; let operations: Record[] = []; for (const method of client.methods) { operations = operations.concat( - emitMethod(context, rootClient, method, "", serviceApiVersions), + emitMethod(context, rootClient, mixinGroup, method, serviceApiVersions), ); } if (operations.length > 0) { @@ -256,7 +256,7 @@ function emitOperationGroups( // operation has same clientNamespace as the operation group for (const og of operationGroups) { for (const op of og.operations) { - op.clientNamespace = getClientNamespace(context, og.clientNamespace); + op.clientNamespace = og.clientNamespace; } } @@ -359,7 +359,7 @@ export function emitCodeModel(sdkContext: PythonSdkContext) { continue; } // filter out specific models not used in python, e.g., pageable models - if (disableGenerationMap.has(model)) { + if (sdkContext.__disableGenerationMap.has(model)) { continue; } // filter out core models @@ -384,19 +384,20 @@ export function emitCodeModel(sdkContext: PythonSdkContext) { } // clear usage when a model is only used by paging - for (const type of typesMap.values()) { + for (const type of sdkContext.__typesMap.values()) { if ( type["type"] === "model" && - type["referredByOperationType"] === ReferredByOperationTypes.PagingOnly + type["referredByOperationType"] === ReferredByOperationTypes.PagingOnly && + (type["usage"] & UsageFlags.Input) === 0 ) { type["usage"] = UsageFlags.None; } } codeModel["types"] = [ - ...typesMap.values(), + ...sdkContext.__typesMap.values(), ...Object.values(KnownTypes), - ...simpleTypesMap.values(), + ...sdkContext.__simpleTypesMap.values(), ]; codeModel["crossLanguagePackageId"] = ignoreDiagnostics(getCrossLanguagePackageId(sdkContext)); if ((sdkContext.emitContext.options as any).flavor === "azure") { diff --git a/packages/http-client-python/emitter/src/constants.ts b/packages/http-client-python/emitter/src/constants.ts new file mode 100644 index 00000000000..15bec92c979 --- /dev/null +++ b/packages/http-client-python/emitter/src/constants.ts @@ -0,0 +1,27 @@ +export const PYODIDE_VERSION = "0.26.2"; +export const PYGEN_WHEEL_FILENAME = "pygen-0.1.0-py3-none-any.whl"; +export const BLOB_STORAGE_BASE_URL = "https://typespec.blob.core.windows.net/pkgs"; +export const PACKAGE_NAME = "@typespec/http-client-python"; + +export const blackExcludeDirs = [ + "__pycache__/", + "node_modules/", + "venv/", + "env/", + ".direnv", + ".eggs", + ".git", + ".hg", + ".tox", + ".venv", + ".eggs", + ".mypy_cache", + ".pytest_cache", + ".vscode", + ".*_build/", + "/build/", + "dist", + ".nox", + ".svn", + "TempTypeSpecFiles/", +]; diff --git a/packages/http-client-python/emitter/src/emitter.ts b/packages/http-client-python/emitter/src/emitter.ts index 9534c1ec99f..fdcfeeef10c 100644 --- a/packages/http-client-python/emitter/src/emitter.ts +++ b/packages/http-client-python/emitter/src/emitter.ts @@ -1,18 +1,30 @@ import { createSdkContext } from "@azure-tools/typespec-client-generator-core"; -import { EmitContext, NoTarget } from "@typespec/compiler"; +import { EmitContext, emitFile, joinPaths, NoTarget } from "@typespec/compiler"; import { execSync } from "child_process"; import fs from "fs"; +import jsyaml from "js-yaml"; import os from "os"; import path, { dirname } from "path"; -import { loadPyodide } from "pyodide"; +import { loadPyodide, PyodideInterface } from "pyodide"; import { fileURLToPath } from "url"; +import pkgJson from "../../package.json" with { type: "json" }; import { emitCodeModel } from "./code-model.js"; +import { + blackExcludeDirs, + BLOB_STORAGE_BASE_URL, + PACKAGE_NAME, + PYGEN_WHEEL_FILENAME, + PYODIDE_VERSION, +} from "./constants.js"; import { saveCodeModelAsYaml } from "./external-process.js"; import { PythonEmitterOptions, PythonSdkContext, reportDiagnostic } from "./lib.js"; import { runPython3 } from "./run-python3.js"; -import { disableGenerationMap, simpleTypesMap, typesMap } from "./types.js"; import { getRootNamespace, md2Rst } from "./utils.js"; +function getBrowserPygenWheelUrl(): string { + return `${BLOB_STORAGE_BASE_URL}/${PACKAGE_NAME}/${pkgJson.version}/generator/dist/${PYGEN_WHEEL_FILENAME}`; +} + function addDefaultOptions(sdkContext: PythonSdkContext) { const defaultOptions = { "package-version": "1.0.0b1", @@ -59,6 +71,9 @@ async function createPythonSdkContext( return { ...sdkContext, __endpointPathParameters: [], + __typesMap: new Map(), + __simpleTypesMap: new Map(), + __disableGenerationMap: new Set(), }; } @@ -100,10 +115,58 @@ function walkThroughNodes(yamlMap: Record): Record { return yamlMap; } -function cleanAllCache() { - typesMap.clear(); - simpleTypesMap.clear(); - disableGenerationMap.clear(); +const pyodideGenerationCode = ` +async def main(): + import warnings + with warnings.catch_warnings(): + from pygen import preprocess, codegen, black + preprocess.PreProcessPlugin(output_folder=outputFolder, tsp_file=yamlFile, **commandArgs).process() + codegen.CodeGenerator(output_folder=outputFolder, tsp_file=yamlFile, **commandArgs).process() + black.BlackScriptPlugin(output_folder=outputFolder, **commandArgs).process() + +await main()`; + +async function runPyodideGeneration( + pyodide: PyodideInterface, + outputFolder: string, + yamlFile: string, + commandArgs: Record, +) { + const globals = pyodide.toPy({ + outputFolder, + yamlFile, + commandArgs, + }); + + await pyodide.runPythonAsync(pyodideGenerationCode, { globals }); +} + +async function copyPyodideOutputToHost( + context: EmitContext, + pyodide: PyodideInterface, + memfsDir: string, + relativeDir: string = "", +) { + const entries = pyodide.FS.readdir(memfsDir).filter( + (entry: string) => entry !== "." && entry !== "..", + ); + + for (const entry of entries) { + const memfsPath = `${memfsDir}/${entry}`; + const relativePath = relativeDir ? `${relativeDir}/${entry}` : entry; + const stats = pyodide.FS.stat(memfsPath); + + if (pyodide.FS.isDir(stats.mode)) { + await copyPyodideOutputToHost(context, pyodide, memfsPath, relativePath); + continue; + } + + const content = pyodide.FS.readFile(memfsPath, { encoding: "utf8" }); + await emitFile(context.program, { + path: joinPaths(context.emitterOutputDir, relativePath), + content, + }); + } } export async function $onEmit(context: EmitContext) { @@ -124,18 +187,23 @@ export async function $onEmit(context: EmitContext) { } async function onEmitMain(context: EmitContext) { - // clean all cache to make sure emitter could work in watch mode - cleanAllCache(); - const program = context.program; const sdkContext = await createPythonSdkContext(context); - const root = path.join(dirname(fileURLToPath(import.meta.url)), "..", ".."); + const outputDir = context.emitterOutputDir; addDefaultOptions(sdkContext); const yamlMap = emitCodeModel(sdkContext); const parsedYamlMap = walkThroughNodes(yamlMap); - const yamlPath = await saveCodeModelAsYaml("python-yaml-path", parsedYamlMap); + // Python emitter requires an SDK client in the TypeSpec + if (sdkContext.sdkPackage.clients.length === 0) { + reportDiagnostic(program, { + code: "no-sdk-clients", + target: NoTarget, + }); + return; + } + const resolvedOptions = sdkContext.emitContext.options; const commandArgs: Record = {}; if (resolvedOptions["packaging-files-config"]) { @@ -162,99 +230,97 @@ async function onEmitMain(context: EmitContext) { commandArgs["from-typespec"] = "true"; commandArgs["models-mode"] = (resolvedOptions as any)["models-mode"] ?? "dpg"; - if (!program.compilerOptions.noEmit && !program.hasError()) { - // if not using pyodide and there's no venv, we try to create venv - if (!resolvedOptions["use-pyodide"] && !fs.existsSync(path.join(root, "venv"))) { - try { - await runPython3(path.join(root, "/eng/scripts/setup/install.py")); - await runPython3(path.join(root, "/eng/scripts/setup/prepare.py")); - } catch (error) { - // if the python env is not ready, we use pyodide instead - resolvedOptions["use-pyodide"] = true; - } - } + if (typeof window !== "undefined") { + // Running in browser with Pyodide - fileURLToPath and other filesystem operations are browser-incompatible + const pyodide = await setupPyodideCallBrowser(); - if (resolvedOptions["use-pyodide"]) { - // here we run with pyodide - const pyodide = await setupPyodideCall(root); - // create the output folder if not exists - if (!fs.existsSync(outputDir)) { - fs.mkdirSync(outputDir, { recursive: true }); + const yamlFilePath = "/yaml/python-yaml-path.yaml"; + pyodide.FS.mkdirTree("/yaml"); + pyodide.FS.mkdirTree("/output"); + pyodide.FS.writeFile(yamlFilePath, jsyaml.dump(parsedYamlMap)); + + await runPyodideGeneration(pyodide, "/output", yamlFilePath, commandArgs); + await copyPyodideOutputToHost(context, pyodide, "/output"); + } else { + const root = path.join(dirname(fileURLToPath(import.meta.url)), "..", ".."); + const yamlPath = await saveCodeModelAsYaml("python-yaml-path", parsedYamlMap); + + if (!program.compilerOptions.noEmit && !program.hasError()) { + // if not using pyodide and there's no venv, we try to create venv + if (!resolvedOptions["use-pyodide"] && !fs.existsSync(path.join(root, "venv"))) { + try { + await runPython3(path.join(root, "/eng/scripts/setup/install.py")); + await runPython3(path.join(root, "/eng/scripts/setup/prepare.py")); + } catch { + // if the python env is not ready, we use pyodide instead + resolvedOptions["use-pyodide"] = true; + } } - // mount output folder to pyodide - pyodide.FS.mkdirTree("/output"); - pyodide.FS.mount(pyodide.FS.filesystems.NODEFS, { root: outputDir }, "/output"); - // mount yaml file to pyodide - pyodide.FS.mkdirTree("/yaml"); - pyodide.FS.mount(pyodide.FS.filesystems.NODEFS, { root: path.dirname(yamlPath) }, "/yaml"); - const globals = pyodide.toPy({ - outputFolder: "/output", - yamlFile: `/yaml/${path.basename(yamlPath)}`, - commandArgs, - }); - const pythonCode = ` - async def main(): - import warnings - with warnings.catch_warnings(): - from pygen import preprocess, codegen, black - preprocess.PreProcessPlugin(output_folder=outputFolder, tsp_file=yamlFile, **commandArgs).process() - codegen.CodeGenerator(output_folder=outputFolder, tsp_file=yamlFile, **commandArgs).process() - black.BlackScriptPlugin(output_folder=outputFolder, **commandArgs).process() - - await main()`; - await pyodide.runPythonAsync(pythonCode, { globals }); - } else { - // here we run with native python - let venvPath = path.join(root, "venv"); - if (fs.existsSync(path.join(venvPath, "bin"))) { - venvPath = path.join(venvPath, "bin", "python"); - } else if (fs.existsSync(path.join(venvPath, "Scripts"))) { - venvPath = path.join(venvPath, "Scripts", "python.exe"); + + if (resolvedOptions["use-pyodide"]) { + // here we run with pyodide + const pyodide = await setupPyodideCall(root); + // create the output folder if not exists + if (!fs.existsSync(outputDir)) { + fs.mkdirSync(outputDir, { recursive: true }); + } + // mount output folder to pyodide + pyodide.FS.mkdirTree("/output"); + pyodide.FS.mount(pyodide.FS.filesystems.NODEFS, { root: outputDir }, "/output"); + // mount yaml file to pyodide + pyodide.FS.mkdirTree("/yaml"); + pyodide.FS.mount(pyodide.FS.filesystems.NODEFS, { root: path.dirname(yamlPath) }, "/yaml"); + await runPyodideGeneration( + pyodide, + "/output", + `/yaml/${path.basename(yamlPath)}`, + commandArgs, + ); } else { - reportDiagnostic(program, { - code: "pyodide-flag-conflict", - target: NoTarget, - }); + // here we run with native python + let venvPath = path.join(root, "venv"); + if (fs.existsSync(path.join(venvPath, "bin"))) { + venvPath = path.join(venvPath, "bin", "python"); + } else if (fs.existsSync(path.join(venvPath, "Scripts"))) { + venvPath = path.join(venvPath, "Scripts", "python.exe"); + } else { + reportDiagnostic(program, { + code: "pyodide-flag-conflict", + target: NoTarget, + }); + } + commandArgs["output-folder"] = outputDir; + commandArgs["tsp-file"] = yamlPath; + const commandFlags = Object.entries(commandArgs) + .map(([key, value]) => `--${key}=${value}`) + .join(" "); + const command = `${venvPath} ${root}/eng/scripts/setup/run_tsp.py ${commandFlags}`; + execSync(command); + + const excludePattern = blackExcludeDirs.join("|"); + execSync( + `${venvPath} -m black --line-length=120 --quiet --fast ${outputDir} --exclude "${excludePattern}"`, + ); + await checkForPylintIssues(outputDir, excludePattern); } - commandArgs["output-folder"] = outputDir; - commandArgs["tsp-file"] = yamlPath; - const commandFlags = Object.entries(commandArgs) - .map(([key, value]) => `--${key}=${value}`) - .join(" "); - const command = `${venvPath} ${root}/eng/scripts/setup/run_tsp.py ${commandFlags}`; - execSync(command); - - const blackExcludeDirs = [ - "__pycache__/", - "node_modules/", - "venv/", - "env/", - ".direnv", - ".eggs", - ".git", - ".hg", - ".tox", - ".venv", - ".eggs", - ".mypy_cache", - ".pytest_cache", - ".vscode", - "_build", - "/build/", - "dist", - ".nox", - ".svn", - "TempTypeSpecFiles/", - ]; - const excludePattern = blackExcludeDirs.join("|"); - execSync( - `${venvPath} -m black --line-length=120 --quiet --fast ${outputDir} --exclude "${excludePattern}"`, - ); - checkForPylintIssues(outputDir, excludePattern); } } } +async function setupPyodideCallBrowser() { + const pyodide = await loadPyodide({ + indexURL: `https://cdn.jsdelivr.net/pyodide/v${PYODIDE_VERSION}/full/`, + }); + + // use default MEMFS for browser, since NODEFS is not supported + pyodide.FS.mkdirTree("/generator"); + await pyodide.loadPackage("micropip"); + const micropip = pyodide.pyimport("micropip"); + await micropip.install(getBrowserPygenWheelUrl()); + + return pyodide; +} + async function setupPyodideCall(root: string) { const pyodide = await loadPyodide({ indexURL: path.dirname(fileURLToPath(import.meta.resolve("pyodide"))), @@ -269,7 +335,7 @@ async function setupPyodideCall(root: string) { if (lockAge > 300) { fs.unlinkSync(micropipLockPath); } - } catch (err) { + } catch { // ignore } } @@ -284,18 +350,18 @@ async function setupPyodideCall(root: string) { ); await pyodide.loadPackage("micropip"); const micropip = pyodide.pyimport("micropip"); - await micropip.install("emfs:/generator/dist/pygen-0.1.0-py3-none-any.whl"); + await micropip.install(`emfs:/generator/dist/${PYGEN_WHEEL_FILENAME}`); fs.closeSync(fd); fs.unlinkSync(micropipLockPath); break; - } catch (err) { + } catch { await new Promise((resolve) => setTimeout(resolve, 1000)); } } return pyodide; } -function checkForPylintIssues(outputDir: string, excludePattern: string) { +async function checkForPylintIssues(outputDir: string, excludePattern: string) { const excludeRegex = new RegExp(excludePattern); const shouldExcludePath = (filePath: string): boolean => { @@ -304,9 +370,8 @@ function checkForPylintIssues(outputDir: string, excludePattern: string) { return excludeRegex.test(normalizedPath); }; - const processFile = (filePath: string) => { - let fileContent = ""; - fileContent = fs.readFileSync(filePath, "utf-8"); + const processFile = async (filePath: string) => { + let fileContent = await fs.promises.readFile(filePath, "utf-8"); const pylintDisables: string[] = []; const lineEnding = fileContent.includes("\r\n") && os.platform() === "win32" ? "\r\n" : "\n"; const lines: string[] = fileContent.split(lineEnding); @@ -321,32 +386,38 @@ function checkForPylintIssues(outputDir: string, excludePattern: string) { fileContent = lines[0].includes("pylint: disable=") ? [lines[0] + "," + pylintDisables.join(",")].concat(lines.slice(1)).join(lineEnding) : `# pylint: disable=${pylintDisables.join(",")}${lineEnding}` + fileContent; + await fs.promises.writeFile(filePath, fileContent); } } - - fs.writeFileSync(filePath, fileContent); }; - const walkDir = (dir: string) => { + const collectPythonFiles = async (dir: string): Promise => { if (shouldExcludePath(dir)) { - return; + return []; } - const files = fs.readdirSync(dir); - files.forEach((file) => { - const filePath = path.join(dir, file); + const entries = await fs.promises.readdir(dir, { withFileTypes: true }); + + const promises = entries.map(async (entry) => { + const filePath = path.join(dir, entry.name); if (shouldExcludePath(filePath)) { - return; + return []; } - if (fs.statSync(filePath).isDirectory()) { - walkDir(filePath); - } else if (file.endsWith(".py")) { - processFile(filePath); + if (entry.isDirectory()) { + return collectPythonFiles(filePath); + } else if (entry.name.endsWith(".py")) { + return [filePath]; } + return []; }); + + const results = await Promise.all(promises); + return results.flat(); }; - walkDir(outputDir); + // Collect all Python files first, then process in parallel + const pythonFiles = await collectPythonFiles(outputDir); + await Promise.all(pythonFiles.map(processFile)); } diff --git a/packages/http-client-python/emitter/src/lib.ts b/packages/http-client-python/emitter/src/lib.ts index 120d008cb62..2d6010108e0 100644 --- a/packages/http-client-python/emitter/src/lib.ts +++ b/packages/http-client-python/emitter/src/lib.ts @@ -1,5 +1,6 @@ import { SdkContext, + SdkType, UnbrandedSdkEmitterOptions, } from "@azure-tools/typespec-client-generator-core"; import { createTypeSpecLibrary, JSONSchemaType, paramMessage } from "@typespec/compiler"; @@ -28,6 +29,9 @@ export interface PythonEmitterOptions { export interface PythonSdkContext extends SdkContext { __endpointPathParameters: Record[]; + __typesMap: Map>; + __simpleTypesMap: Map>; + __disableGenerationMap: Set; } export const PythonEmitterOptionsSchema: JSONSchemaType = { @@ -127,6 +131,19 @@ const libDef = { "Python is not installed. Please follow https://www.python.org/ to install Python or set 'use-pyodide' to true.", }, }, + "no-sdk-clients": { + severity: "error", + messages: { + default: + "The Python emitter did not find any SDK clients in this TypeSpec program. The current Python generator expects at least one client/service to generate code.", + }, + }, + "browser-runtime-load-failed": { + severity: "error", + messages: { + default: paramMessage`Failed to initialize the browser Python runtime.${"details"}`, + }, + }, "invalid-paging-items": { severity: "warning", messages: { diff --git a/packages/http-client-python/emitter/src/system-requirements.ts b/packages/http-client-python/emitter/src/system-requirements.ts index 7f12ff5b5a7..32521654c1b 100644 --- a/packages/http-client-python/emitter/src/system-requirements.ts +++ b/packages/http-client-python/emitter/src/system-requirements.ts @@ -16,8 +16,8 @@ const execute = ( options.onCreate(cp); } - options.onStdOutData && cp.stdout.on("data", options.onStdOutData); - options.onStdErrData && cp.stderr.on("data", options.onStdErrData); + if (options.onStdOutData) cp.stdout.on("data", options.onStdOutData); + if (options.onStdErrData) cp.stderr.on("data", options.onStdErrData); let err = ""; let out = ""; @@ -34,7 +34,7 @@ const execute = ( cp.on("error", (err) => { reject(err); }); - cp.on("close", (code, signal) => + cp.on("close", (code, _signal) => resolve({ stdout: out, stderr: err, @@ -110,7 +110,7 @@ const tryPython = async ( `"${PRINT_PYTHON_VERSION_SCRIPT}"`, ]); return validateVersionRequirement(resolution, result.stdout.trim(), requirement); - } catch (e) { + } catch { return { error: true, ...resolution, diff --git a/packages/http-client-python/emitter/src/types.ts b/packages/http-client-python/emitter/src/types.ts index 4bffbdbb2c6..3e0ee6f6b32 100644 --- a/packages/http-client-python/emitter/src/types.ts +++ b/packages/http-client-python/emitter/src/types.ts @@ -28,10 +28,6 @@ import { getImplementation, } from "./utils.js"; -export const typesMap = new Map>(); -export const simpleTypesMap = new Map>(); -export const disableGenerationMap = new Set(); - export interface CredentialType { kind: "Credential"; scheme: HttpAuth; @@ -59,13 +55,16 @@ function isEmptyModel(type: SdkType): boolean { ); } -export function getSimpleTypeResult(result: Record): Record { +export function getSimpleTypeResult( + context: PythonSdkContext, + result: Record, +): Record { const key = dump(result, { sortKeys: true }); - const value = simpleTypesMap.get(key); + const value = context.__simpleTypesMap.get(key); if (value) { result = value; } else { - simpleTypesMap.set(key, result); + context.__simpleTypesMap.set(key, result); } return result; } @@ -82,16 +81,16 @@ export function getType( case "enum": return emitEnum(context, type); case "constant": - return emitConstant(type)!; + return emitConstant(context, type)!; case "array": case "dict": return emitArrayOrDict(context, type)!; case "utcDateTime": case "offsetDateTime": case "duration": - return emitDurationOrDateType(type); + return emitDurationOrDateType(context, type); case "enumvalue": - return emitEnumMember(type, emitEnum(context, type.enumType)); + return emitEnumMember(context, type, emitEnum(context, type.enumType)); case "credential": return emitCredential(context, type); case "bytes": @@ -116,7 +115,7 @@ export function getType( case "decimal128": case "string": case "url": - return emitBuiltInType(type); + return emitBuiltInType(context, type); case "unknown": return KnownTypes.any; case "nullable": @@ -133,12 +132,12 @@ function emitMultiPartFile( type: MultiPartFileType, ): Record { if (type.type.kind === "array") { - return getSimpleTypeResult({ + return getSimpleTypeResult(context, { type: "list", elementType: getType(context, createMultiPartFileType(type.type.valueType)), }); } - return getSimpleTypeResult({ + return getSimpleTypeResult(context, { type: type.kind, description: type.type.summary ? type.type.summary : type.type.doc, }); @@ -183,7 +182,7 @@ function emitCredential( }, }; } - return getSimpleTypeResult(credential_type); + return getSimpleTypeResult(context, credential_type); } function visibilityMapping(visibility?: Visibility[]): string[] | undefined { @@ -211,14 +210,14 @@ function createMultiPartFileType(type: SdkType): MultiPartFileType { return { kind: "multipartfile", type }; } -function addDisableGenerationMap(type: SdkType): void { - if (disableGenerationMap.has(type)) return; +function addDisableGenerationMap(context: PythonSdkContext, type: SdkType): void { + if (context.__disableGenerationMap.has(type)) return; - disableGenerationMap.add(type); + context.__disableGenerationMap.add(type); if (type.kind === "model" && type.baseModel) { - addDisableGenerationMap(type.baseModel); + addDisableGenerationMap(context, type.baseModel); } else if (type.kind === "array") { - addDisableGenerationMap(type.valueType); + addDisableGenerationMap(context, type.valueType); } } @@ -231,7 +230,7 @@ function emitProperty( if (isMultipartFileInput) { sourceType = createMultiPartFileType(property.type); // Python convert all the type of file part to FileType so clear these models' usage so that they won't be generated - addDisableGenerationMap(property.type); + addDisableGenerationMap(context, property.type); } return { clientName: camelToSnakeCase(property.name), @@ -257,8 +256,8 @@ function emitModel(context: PythonSdkContext, type: SdkModelType): Record { - return getSimpleTypeResult({ +function getConstantFromEnumValueType( + context: PythonSdkContext, + type: SdkEnumValueType, +): Record { + return getSimpleTypeResult(context, { type: "constant", value: type.value, - valueType: emitBuiltInType(type.valueType), + valueType: emitBuiltInType(context, type.valueType), }); } function emitEnum(context: PythonSdkContext, type: SdkEnumType): Record { - if (typesMap.has(type)) { - return typesMap.get(type)!; + if (context.__typesMap.has(type)) { + return context.__typesMap.get(type)!; } if (type.isGeneratedName) { const types = []; for (const value of type.values) { - types.push(getConstantFromEnumValueType(value)); + types.push(getConstantFromEnumValueType(context, value)); } if (!type.isFixed) { - types.push(emitBuiltInType(type.valueType)); + types.push(emitBuiltInType(context, type.valueType)); } const newValue = { @@ -350,7 +352,7 @@ function emitEnum(context: PythonSdkContext, type: SdkEnumType): Record[] = []; @@ -361,16 +363,16 @@ function emitEnum(context: PythonSdkContext, type: SdkEnumType): Record, ): Record { - if (typesMap.has(type)) { - return typesMap.get(type)!; + if (context.__typesMap.has(type)) { + return context.__typesMap.get(type)!; } // python don't generate enum created by TCGC, so we shall not generate type for enum member of the enum, either. if (type.enumType.isGeneratedName) { - return getConstantFromEnumValueType(type); + return getConstantFromEnumValueType(context, type); } const result = { @@ -401,14 +404,17 @@ function emitEnumMember( type: type.kind, valueType: enumType["valueType"], }; - typesMap.set(type, result); + context.__typesMap.set(type, result); return result; } -function emitDurationOrDateType(type: SdkDurationType | SdkDateTimeType): Record { - return getSimpleTypeResult({ - ...emitBuiltInType(type), - wireType: emitBuiltInType(type.wireType), +function emitDurationOrDateType( + context: PythonSdkContext, + type: SdkDurationType | SdkDateTimeType, +): Record { + return getSimpleTypeResult(context, { + ...emitBuiltInType(context, type), + wireType: emitBuiltInType(context, type.wireType), }); } @@ -417,17 +423,17 @@ function emitArrayOrDict( type: SdkArrayType | SdkDictionaryType, ): Record { const kind = type.kind === "array" ? "list" : type.kind; - return getSimpleTypeResult({ + return getSimpleTypeResult(context, { type: kind, elementType: getType(context, type.valueType), }); } -function emitConstant(type: SdkConstantType) { - return getSimpleTypeResult({ +function emitConstant(context: PythonSdkContext, type: SdkConstantType) { + return getSimpleTypeResult(context, { type: type.kind, value: type.value, - valueType: emitBuiltInType(type.valueType), + valueType: emitBuiltInType(context, type.valueType), }); } @@ -461,28 +467,50 @@ const sdkScalarKindToPythonKind: Record = { }; function emitBuiltInType( + context: PythonSdkContext, type: SdkBuiltInType | SdkDurationType | SdkDateTimeType, ): Record { - if (type.kind === "duration" && type.encode === "seconds") { - return getSimpleTypeResult({ - type: sdkScalarKindToPythonKind[type.wireType.kind], - encode: type.encode, - }); - } - if (type.encode === "unixTimestamp") { - return getSimpleTypeResult({ - type: "unixtime", - encode: type.encode, - }); + if (type.encode) { + if (type.kind === "duration") { + if (type.encode === "ISO8601") { + return getSimpleTypeResult(context, { + type: type.kind, + encode: type.encode, + }); + } + } + if (type.kind === "utcDateTime" || type.kind === "offsetDateTime") { + if (type.encode === "unixTimestamp") { + return getSimpleTypeResult(context, { + type: "unixtime", + encode: type.encode, + }); + } + if (type.encode === "rfc3339" || type.encode === "rfc7231") { + return getSimpleTypeResult(context, { + type: type.kind, + encode: type.encode, + }); + } + } + + // fallback to wire type for unknown or unsupported encode + if ("wireType" in type && type.wireType !== undefined) { + return getSimpleTypeResult(context, { + type: sdkScalarKindToPythonKind[type.wireType.kind] || type.wireType.kind, + encode: type.encode, + }); + } } - return getSimpleTypeResult({ + + return getSimpleTypeResult(context, { type: sdkScalarKindToPythonKind[type.kind] || type.kind, // TODO: switch to kind encode: type.encode, }); } function emitUnion(context: PythonSdkContext, type: SdkUnionType): Record { - return getSimpleTypeResult({ + return getSimpleTypeResult(context, { name: type.isGeneratedName ? undefined : type.name, snakeCaseName: type.isGeneratedName ? undefined : camelToSnakeCase(type.name), description: type.isGeneratedName ? "" : `Type of ${type.name}`, @@ -494,8 +522,11 @@ function emitUnion(context: PythonSdkContext, type: SdkUnionType): Record { - const cache = simpleTypesMap.get(key); +export function getConstantType( + context: PythonSdkContext, + key: string | null, +): Record { + const cache = context.__simpleTypesMap.get(key); if (cache) { return cache; } @@ -506,7 +537,7 @@ export function getConstantType(key: string | null): Record { valueType: KnownTypes.string, xmlMetadata: {}, }; - simpleTypesMap.set(key, type); + context.__simpleTypesMap.set(key, type); return type; } diff --git a/packages/http-client-python/emitter/src/utils.ts b/packages/http-client-python/emitter/src/utils.ts index 585ef6e9765..9b30231a71d 100644 --- a/packages/http-client-python/emitter/src/utils.ts +++ b/packages/http-client-python/emitter/src/utils.ts @@ -213,7 +213,7 @@ export function emitParamBase( let type = getType(context, parameter.type); if (parameter.isApiVersionParam) { if (parameter.clientDefaultValue) { - type = getSimpleTypeResult({ + type = getSimpleTypeResult(context, { type: "constant", value: parameter.clientDefaultValue, valueType: type, @@ -262,6 +262,7 @@ export function capitalize(name: string): string { return name[0].toUpperCase() + name.slice(1); } +// Library namespaces that should not be used as client namespaces const LIB_NAMESPACE = [ "azure.core", "azure.resourcemanager", @@ -272,29 +273,25 @@ const LIB_NAMESPACE = [ ]; export function getRootNamespace(context: PythonSdkContext): string { - let rootNamespace = ""; if (context.sdkPackage.clients.length > 0) { - rootNamespace = context.sdkPackage.clients[0].namespace; - } else if (context.sdkPackage.models.length > 0) { - const result = context.sdkPackage.models - .map((model) => model.namespace) - .filter((namespace) => !LIB_NAMESPACE.includes(namespace)); - if (result.length > 0) { - result.sort(); - rootNamespace = result[0]; - } + return context.sdkPackage.clients[0].namespace.toLowerCase(); } else if (context.sdkPackage.namespaces.length > 0) { - rootNamespace = context.sdkPackage.namespaces[0].fullName; + return context.sdkPackage.namespaces[0].fullName.toLowerCase(); } + return ""; +} - return rootNamespace.toLowerCase(); +function isLibraryNamespace(namespace: string): boolean { + const ns = namespace.toLowerCase(); + return LIB_NAMESPACE.some((lib) => ns.startsWith(lib)); } export function getClientNamespace(context: PythonSdkContext, clientNamespace: string) { - if ( - clientNamespace === "" || - LIB_NAMESPACE.some((item) => clientNamespace.toLowerCase().startsWith(item)) - ) { + // Namespace precedence: @clientNamespace > --namespace > original namespace + // These are resolved by TCGC and passed in as clientNamespace. + // However, models from library namespaces (azure.core, azure.resourcemanager, etc.) + // should use the SDK's root namespace instead. + if (clientNamespace === "" || isLibraryNamespace(clientNamespace)) { return getRootNamespace(context); } return clientNamespace.toLowerCase(); @@ -320,7 +317,7 @@ function parseToken(token: Token): string { case "codespan": parsed += `\`\`${token.text}\`\``; break; - case "code": + case "code": { let codeBlockStyle = token.codeBlockStyle; if (codeBlockStyle === undefined) { codeBlockStyle = token.raw.split("\n")[0].replace("```", "").trim(); @@ -331,6 +328,7 @@ function parseToken(token: Token): string { } parsed += `\n\n.. code-block:: ${codeBlockStyle ?? ""}\n\n ${token.text.split("\n").join("\n ")}`; break; + } case "link": if (token.href !== undefined) { parsed += `\`${token.text} <${token.href}>\`_`; diff --git a/packages/http-client-python/emitter/tsconfig.build.json b/packages/http-client-python/emitter/tsconfig.build.json index 663c3cc0d58..1a8a8ed8f52 100644 --- a/packages/http-client-python/emitter/tsconfig.build.json +++ b/packages/http-client-python/emitter/tsconfig.build.json @@ -2,10 +2,11 @@ "extends": "./tsconfig.json", "compilerOptions": { "noEmit": false, + "resolveJsonModule": true, "rootDir": "./src", "outDir": "../dist/emitter", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo" }, "references": [], - "include": ["src/**/*"] + "include": ["src/**/*", "../package.json"] } diff --git a/packages/http-client-python/emitter/tsconfig.json b/packages/http-client-python/emitter/tsconfig.json index 32cb2aff3f2..99589e3efe4 100644 --- a/packages/http-client-python/emitter/tsconfig.json +++ b/packages/http-client-python/emitter/tsconfig.json @@ -1,7 +1,8 @@ { "extends": "../../../tsconfig.base.json", "compilerOptions": { - "noEmit": true + "noEmit": true, + "resolveJsonModule": true }, "include": ["src/**/*"] } diff --git a/packages/http-client-python/eng/pipeline/publish.yml b/packages/http-client-python/eng/pipeline/publish.yml index 69fe74aa10e..d134468d578 100644 --- a/packages/http-client-python/eng/pipeline/publish.yml +++ b/packages/http-client-python/eng/pipeline/publish.yml @@ -31,3 +31,4 @@ extends: CadlRanchName: "@typespec/http-client-python" EnableCadlRanchReport: false PythonVersion: "3.11" + UploadPlaygroundBundle: true diff --git a/packages/http-client-python/eng/pipeline/templates/ci-stages.yml b/packages/http-client-python/eng/pipeline/templates/ci-stages.yml index 24ccab887a7..63ffca6588c 100644 --- a/packages/http-client-python/eng/pipeline/templates/ci-stages.yml +++ b/packages/http-client-python/eng/pipeline/templates/ci-stages.yml @@ -26,4 +26,4 @@ stages: Condition: ${{ parameters.Condition }} DependsOn: ${{ parameters.DependsOn }} LanguageShortName: "python" - PythonVersion: "3.11" + PythonVersion: "3.12" diff --git a/packages/http-client-python/eng/scripts/Build-Packages.ps1 b/packages/http-client-python/eng/scripts/Build-Packages.ps1 index 73b25b1f664..16fd147f5db 100644 --- a/packages/http-client-python/eng/scripts/Build-Packages.ps1 +++ b/packages/http-client-python/eng/scripts/Build-Packages.ps1 @@ -1,4 +1,30 @@ #Requires -Version 7.0 +<# +.SYNOPSIS + Builds and packages the TypeSpec Python emitter for publishing. + +.DESCRIPTION + This script is called by the CI pipeline to create publishable packages. + It runs: + 1. npm run build - Compile TypeScript emitter and build Python wheel + 2. npm run lint - Run linting (Linux only) + 3. npm pack - Create npm tarball for publishing + +.PARAMETER BuildNumber + The build number for versioning. + +.PARAMETER Output + Output directory for built packages. Defaults to ./ci-build. + +.PARAMETER Prerelease + Flag indicating if this is a prerelease build. + +.PARAMETER PublishType + Type of publish: "internal" for dev feed, otherwise public. + +.EXAMPLE + ./Build-Packages.ps1 -Output ./dist +#> param( [string] $BuildNumber, @@ -7,6 +33,15 @@ param( [string] $PublishType ) +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 3.0 + +# Setup paths and helpers +$packageRoot = (Resolve-Path "$PSScriptRoot/../..").Path.Replace('\', '/') +. "$packageRoot/../../eng/emitters/scripts/CommandInvocation-Helpers.ps1" +Set-ConsoleEncoding + +# Helper function to write package info for downstream publishing function Write-PackageInfo { param( [string] $packageName, @@ -15,81 +50,71 @@ function Write-PackageInfo { ) $packageInfoPath = "$outputPath/PackageInfo" - if (!(Test-Path $packageInfoPath)) { New-Item -ItemType Directory -Force -Path $packageInfoPath | Out-Null } @{ - Name = $packageName - Version = $version + Name = $packageName + Version = $version DirectoryPath = $directoryPath - SdkType = "client" - IsNewSdk = $true + SdkType = "client" + IsNewSdk = $true ReleaseStatus = "Unreleased" } | ConvertTo-Json | Set-Content -Path "$packageInfoPath/$packageName.json" } -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 3.0 -$packageRoot = (Resolve-Path "$PSScriptRoot/../..").Path.Replace('\', '/') -. "$packageRoot/../../eng/emitters/scripts/CommandInvocation-Helpers.ps1" -Set-ConsoleEncoding - Write-Host "Building packages for BuildNumber: '$BuildNumber', Output: '$Output', Prerelease: '$Prerelease', PublishType: '$PublishType'" +# Setup output directory $outputPath = $Output ? $Output : "$packageRoot/ci-build" - -# create the output folders $outputPath = New-Item -ItemType Directory -Force -Path $outputPath | Select-Object -ExpandProperty FullName New-Item -ItemType Directory -Force -Path "$outputPath/packages" | Out-Null -Write-Host "Getting existing version" +# Get package version $emitterVersion = node -p -e "require('$packageRoot/package.json').version" +Write-Host "Package version: $emitterVersion" -# build the generator -Push-Location "$packageRoot/generator" - -# build and pack the emitter with the generator Push-Location "$packageRoot" try { - Write-Host "Working in $PWD" - + # Step 1: Build the emitter and generator + Write-Host "`n=== Building emitter and generator ===" -ForegroundColor Cyan Invoke-LoggedCommand "npm run build" -GroupOutput - # Only run lint:py on Linux OS + # Step 2: Run linting (Linux only, as CI runs on Linux) if ($IsLinux) { - Write-Host "run lint check for pygen" - Invoke-LoggedCommand "npm run lint:py" -GroupOutput + Write-Host "`n=== Running lint checks ===" -ForegroundColor Cyan + Invoke-LoggedCommand "npm run lint" -GroupOutput } - # pack the emitter + # Step 3: Create npm package + Write-Host "`n=== Creating npm package ===" -ForegroundColor Cyan Invoke-LoggedCommand "npm pack" Copy-Item "typespec-http-client-python-$emitterVersion.tgz" -Destination "$outputPath/packages" - # install packed emitter to check dependencies + # Step 4: Verify package can be installed + Write-Host "`n=== Verifying package installation ===" -ForegroundColor Cyan Invoke-LoggedCommand "npm install typespec-http-client-python-$emitterVersion.tgz" -GroupOutput - Write-PackageInfo -packageName "typespec-http-client-python" -directoryPath "packages/http-client-python/emitter/src" -version $emitterVersion + # Write package info for publishing pipeline + Write-PackageInfo -packageName "typespec-http-client-python" ` + -directoryPath "packages/http-client-python/emitter/src" ` + -version $emitterVersion } finally { Pop-Location } +# Generate override URLs for internal publishing +$overrides = @{} if ($PublishType -eq "internal") { - $feedUrl = "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js-test-autorest/npm/registry" - - $overrides = @{ - "@typespec/http-client-python" = "$feedUrl/@typespec/http-client-python/-/http-client-python-$emitterVersion.tgz" - } -} else { - $overrides = @{} + $feedUrl = "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js/npm/registry" + $overrides["@typespec/http-client-python"] = "$feedUrl/@typespec/http-client-python/-/http-client-python-$emitterVersion.tgz" } - $overrides | ConvertTo-Json | Set-Content "$outputPath/overrides.json" -$packageMatrix = [ordered]@{ - "emitter" = $emitterVersion -} +# Write package version matrix +@{ "emitter" = $emitterVersion } | ConvertTo-Json | Set-Content "$outputPath/package-versions.json" -$packageMatrix | ConvertTo-Json | Set-Content "$outputPath/package-versions.json" +Write-Host "`n=== Build complete ===" -ForegroundColor Green +Write-Host "Output: $outputPath" diff --git a/packages/http-client-python/eng/scripts/Check-GitChanges.ps1 b/packages/http-client-python/eng/scripts/Check-GitChanges.ps1 index c4bde91a49e..ba7b32178a8 100644 --- a/packages/http-client-python/eng/scripts/Check-GitChanges.ps1 +++ b/packages/http-client-python/eng/scripts/Check-GitChanges.ps1 @@ -1,4 +1,21 @@ #Requires -Version 7.0 +<# +.SYNOPSIS + Checks for uncommitted git changes. + +.DESCRIPTION + This script verifies that there are no uncommitted changes in the repository. + It excludes package.json and package-lock.json from the check since those + may be modified during npm operations. + + Used by CI to ensure regeneration produces consistent output. + +.PARAMETER Exceptions + Additional paths to exclude from the check (not currently used). + +.EXAMPLE + ./Check-GitChanges.ps1 +#> param( [string] $Exceptions @@ -6,17 +23,27 @@ param( $ErrorActionPreference = 'Stop' Set-StrictMode -Version 3.0 + +# Setup paths and helpers $packageRoot = (Resolve-Path "$PSScriptRoot/../..").Path.Replace('\', '/') . "$packageRoot/../../eng/emitters/scripts/CommandInvocation-Helpers.ps1" Set-ConsoleEncoding -$diffExcludes = @( +# Files to exclude from diff check (these may change during npm operations) +$excludedFiles = @( "$packageRoot/package.json" "$packageRoot/package-lock.json" -) | ForEach-Object { "`":(exclude)$_`"" } | Join-String -Separator ' ' +) +$diffExcludes = $excludedFiles | ForEach-Object { "`":(exclude)$_`"" } | Join-String -Separator ' ' + +# Check for changes, ignoring whitespace differences at end of lines Invoke-LoggedCommand "git -c core.safecrlf=false diff --ignore-space-at-eol --exit-code -- $diffExcludes" -IgnoreExitCode -if($LastExitCode -ne 0) { +if ($LastExitCode -ne 0) { + Write-Host "`nUncommitted changes detected!" -ForegroundColor Red + Write-Host "Run 'npm run regenerate' locally and commit the changes." throw "Changes detected" } + +Write-Host "No changes detected." -ForegroundColor Green diff --git a/packages/http-client-python/eng/scripts/Functions.ps1 b/packages/http-client-python/eng/scripts/Functions.ps1 index cc90c290378..e62336c8a89 100644 --- a/packages/http-client-python/eng/scripts/Functions.ps1 +++ b/packages/http-client-python/eng/scripts/Functions.ps1 @@ -1,26 +1,65 @@ -# Return list of nupkg artifacts -function Get-Package-Artifacts ($location, $filter) -{ - $filterToUse = $filter.StartsWith("typespec-") ? $filter.SubString(0, $filter.Length - 1) + ".api.json" : $filter +<# +.SYNOPSIS + Helper functions for finding package artifacts. + +.DESCRIPTION + These functions are used by the publishing pipeline to locate + built package artifacts for API review and publishing. +#> + +<# +.SYNOPSIS + Gets package artifacts from a directory. + +.PARAMETER location + The directory containing the packages folder. + +.PARAMETER filter + Filter pattern for matching package files. +#> +function Get-Package-Artifacts { + param( + [string] $location, + [string] $filter + ) + + # Convert typespec package filter to API json filter + $filterToUse = if ($filter.StartsWith("typespec-")) { + $filter.SubString(0, $filter.Length - 1) + ".api.json" + } else { + $filter + } $packages = Get-ChildItem -Path "$location/packages" -Filter $filterToUse -Recurse - if (!$packages) - { - Write-Host "$($location)/packages does not have any packages matching filter $($filterToUse)" + if (!$packages) { + Write-Host "$location/packages does not have any packages matching filter $filterToUse" return $null } + return $packages[0] } -function Find-Artifacts-For-Apireview($artifactDir, $packageName) -{ - # Find all nupkg files in given artifact directory +<# +.SYNOPSIS + Finds artifacts for API review. + +.PARAMETER artifactDir + Directory containing build artifacts. + +.PARAMETER packageName + Name of the package to find. +#> +function Find-Artifacts-For-Apireview { + param( + [string] $artifactDir, + [string] $packageName + ) + $package = Get-Package-Artifacts $artifactDir "$packageName*" - if (!$package) - { - Write-Host "Package is not available in artifact path $($artifactDir)/packages" + if (!$package) { + Write-Host "Package is not available in artifact path $artifactDir/packages" return $null } - $packages = @{ $package.Name = $package.FullName } - return $packages + + return @{ $package.Name = $package.FullName } } diff --git a/packages/http-client-python/eng/scripts/Generate.ps1 b/packages/http-client-python/eng/scripts/Generate.ps1 index 5bd459127b6..c80196272a9 100644 --- a/packages/http-client-python/eng/scripts/Generate.ps1 +++ b/packages/http-client-python/eng/scripts/Generate.ps1 @@ -1,14 +1,48 @@ #Requires -Version 7.0 +<# +.SYNOPSIS + Regenerates all test fixtures and documentation. -Import-Module "$PSScriptRoot\Generation.psm1" -DisableNameChecking -Force; +.DESCRIPTION + This script is called by the CI pipeline to regenerate test outputs. + It runs: + 1. npm run build - Compile TypeScript emitter and build Python wheel + 2. npm run regenerate - Regenerate all test fixtures from TypeSpec files + 3. npm run regen-docs - Regenerate API documentation -$repoRoot = Resolve-Path (Join-Path $PSScriptRoot '..' '..') +.EXAMPLE + ./Generate.ps1 +#> -Write-Host "Building project ..." -& npm run build +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 3.0 -Write-Host "Regenerating project ..." -& npm run regenerate +# Setup paths +$packageRoot = (Resolve-Path "$PSScriptRoot/../..").Path.Replace('\', '/') -Write-Host "Regenerating docs ..." -& npm run regen-docs +Push-Location "$packageRoot" +try { + Write-Host "=== Building project ===" -ForegroundColor Cyan + & npm run build + if ($LASTEXITCODE -ne 0) { throw "Build failed" } + + Write-Host "`n=== Regenerating test fixtures ===" -ForegroundColor Cyan + & npm run regenerate + if ($LASTEXITCODE -ne 0) { throw "Regeneration failed" } + + Write-Host "`n=== Regenerating documentation ===" -ForegroundColor Cyan + # Check if tspd is available (requires full monorepo build) + $tspdCli = Join-Path $packageRoot "../../packages/tspd/dist/src/cli.js" + if (Test-Path $tspdCli) { + & npm run regen-docs + if ($LASTEXITCODE -ne 0) { throw "Documentation regeneration failed" } + } else { + Write-Host "Skipping documentation regeneration (tspd not built)" -ForegroundColor Yellow + Write-Host "Run from monorepo root with full build to regenerate docs" -ForegroundColor Yellow + } + + Write-Host "`n=== Generation complete ===" -ForegroundColor Green +} +finally { + Pop-Location +} diff --git a/packages/http-client-python/eng/scripts/Generation.psm1 b/packages/http-client-python/eng/scripts/Generation.psm1 index 5f69ef05343..713075efc64 100644 --- a/packages/http-client-python/eng/scripts/Generation.psm1 +++ b/packages/http-client-python/eng/scripts/Generation.psm1 @@ -1,22 +1,51 @@ +<# +.SYNOPSIS + PowerShell module with helper functions for generation scripts. + +.DESCRIPTION + This module provides the Invoke function for running shell commands + cross-platform (Windows, Linux, macOS). +#> + $repoRoot = Resolve-Path (Join-Path $PSScriptRoot '..') -function Invoke($command, $executePath=$repoRoot) -{ - Write-Host "> $command" +<# +.SYNOPSIS + Invokes a shell command cross-platform. + +.PARAMETER command + The command to execute. + +.PARAMETER executePath + The directory to execute the command in. Defaults to repo root. + +.EXAMPLE + Invoke "npm run build" +#> +function Invoke { + param( + [string] $command, + [string] $executePath = $repoRoot + ) + + Write-Host "> $command" -ForegroundColor Cyan + Push-Location $executePath - if ($IsLinux -or $IsMacOs) - { - sh -c "$command 2>&1" - } - else - { - cmd /c "$command 2>&1" - } - Pop-Location + try { + if ($IsLinux -or $IsMacOs) { + sh -c "$command 2>&1" + } + else { + cmd /c "$command 2>&1" + } - if($LastExitCode -ne 0) - { - Write-Error "Command failed to execute: $command" + if ($LastExitCode -ne 0) { + throw "Command failed: $command" + } + } + finally { + Pop-Location } } + Export-ModuleMember -Function "Invoke" diff --git a/packages/http-client-python/eng/scripts/Initialize-Repository.ps1 b/packages/http-client-python/eng/scripts/Initialize-Repository.ps1 index 4320a530734..4fc04484175 100644 --- a/packages/http-client-python/eng/scripts/Initialize-Repository.ps1 +++ b/packages/http-client-python/eng/scripts/Initialize-Repository.ps1 @@ -1,4 +1,21 @@ #Requires -Version 7.0 +<# +.SYNOPSIS + Initializes the repository by installing npm dependencies. + +.DESCRIPTION + This script is called by the CI pipeline to set up the repository. + It runs `npm ci` to install dependencies from package-lock.json. + +.PARAMETER BuildArtifactsPath + Optional path to build artifacts (used in CI for caching lock files). + +.PARAMETER UseTypeSpecNext + Optional switch for using TypeSpec next version (not currently used). + +.EXAMPLE + ./Initialize-Repository.ps1 +#> param( [string] $BuildArtifactsPath, @@ -7,32 +24,33 @@ param( $ErrorActionPreference = 'Stop' Set-StrictMode -Version 3.0 + +# Setup paths and helpers $packageRoot = (Resolve-Path "$PSScriptRoot/../..").Path.Replace('\', '/') . "$packageRoot/../../eng/emitters/scripts/CommandInvocation-Helpers.ps1" Set-ConsoleEncoding Push-Location "$packageRoot" try { + # Clean install of npm dependencies if (Test-Path "./node_modules") { + Write-Host "Removing existing node_modules..." Remove-Item -Recurse -Force "./node_modules" } - # install and list npm packages - + Write-Host "Installing npm dependencies..." Invoke-LoggedCommand "npm ci" - Invoke-LoggedCommand "npm ls -a" -GroupOutput - Write-Host "artifactStagingDirectory: $env:BUILD_ARTIFACTSTAGINGDIRECTORY" - Write-Host "BuildArtifactsPath: $BuildArtifactsPath" + # Copy lock files to artifacts for CI caching (if running in Azure DevOps) $artifactStagingDirectory = $env:BUILD_ARTIFACTSTAGINGDIRECTORY if ($artifactStagingDirectory -and !$BuildArtifactsPath) { - $lockFilesPath = "$artifactStagingDirectory/lock-files" - New-Item -ItemType Directory -Path "$lockFilesPath/emitter" | Out-Null - - Write-Host "Copying emitter/package.json and emitter/package-lock.json to $lockFilesPath" - Copy-Item './package.json' "$lockFilesPath/emitter/package.json" -Force - Copy-Item './package-lock.json' "$lockFilesPath/emitter/package-lock.json" -Force + $lockFilesPath = "$artifactStagingDirectory/lock-files/emitter" + New-Item -ItemType Directory -Path $lockFilesPath -Force | Out-Null + + Write-Host "Copying lock files to $lockFilesPath" + Copy-Item './package.json' "$lockFilesPath/package.json" -Force + Copy-Item './package-lock.json' "$lockFilesPath/package-lock.json" -Force } } finally { diff --git a/packages/http-client-python/eng/scripts/Test-Packages.ps1 b/packages/http-client-python/eng/scripts/Test-Packages.ps1 index a5fba247cd8..05ea968b8cb 100644 --- a/packages/http-client-python/eng/scripts/Test-Packages.ps1 +++ b/packages/http-client-python/eng/scripts/Test-Packages.ps1 @@ -1,4 +1,32 @@ #Requires -Version 7.0 +<# +.SYNOPSIS + Runs tests for the TypeSpec Python emitter. + +.DESCRIPTION + This script is called by the CI pipeline to run tests. + + With -UnitTests: + - Runs npm run build (compile emitter) + + With -GenerationChecks: + - Runs npm run build (compile emitter) + - Runs Generate.ps1 (regenerate test fixtures) + - Runs Check-GitChanges.ps1 (verify no uncommitted changes) + - Runs npm run ci (full test suite: pytest, lint, mypy, pyright) + +.PARAMETER UnitTests + Run unit tests only (just builds the project). + +.PARAMETER GenerationChecks + Run full generation checks and test suite. + +.PARAMETER Filter + Optional filter pattern for tests (not currently used). + +.EXAMPLE + ./Test-Packages.ps1 -GenerationChecks +#> param( [switch] $UnitTests, @@ -7,57 +35,45 @@ param( ) $ErrorActionPreference = 'Stop' - Set-StrictMode -Version 3.0 + +# Setup paths and helpers $packageRoot = (Resolve-Path "$PSScriptRoot/../..").Path.Replace('\', '/') . "$packageRoot/../../eng/emitters/scripts/CommandInvocation-Helpers.ps1" Set-ConsoleEncoding +Write-Host "Python version:" Invoke-LoggedCommand "python --version" Push-Location $packageRoot try { if ($UnitTests) { - Push-Location "$packageRoot" - try { - - Write-Host "Updated PATH: $env:PATH" - # test the emitter - Invoke-LoggedCommand "npm run build" -GroupOutput - - } - finally { - Pop-Location - } + Write-Host "`n=== Running unit tests ===" -ForegroundColor Cyan + Invoke-LoggedCommand "npm run build" -GroupOutput } + if ($GenerationChecks) { - Set-StrictMode -Version 1 - - # run E2E Test for TypeSpec emitter - Write-Host "Generating test projects ..." + # Step 1: Regenerate all test fixtures + Write-Host "`n=== Regenerating test fixtures ===" -ForegroundColor Cyan & "$packageRoot/eng/scripts/Generate.ps1" - Write-Host 'Code generation is completed.' + # Step 2: Check for uncommitted changes (regeneration should be clean) + Write-Host "`n=== Checking for uncommitted changes ===" -ForegroundColor Cyan try { - Write-Host 'Checking for differences in generated code...' & "$packageRoot/eng/scripts/Check-GitChanges.ps1" - Write-Host 'Done. No code generation differences detected.' + Write-Host "No uncommitted changes detected." -ForegroundColor Green } catch { - Write-Error 'Generated code is not up to date. Please run: eng/Generate.ps1' + Write-Error "Generated code is not up to date. Please run: npm run regenerate" } - try { - Write-Host "Pip List" - & pip list - # Run tox - Write-Host 'Running tests' - & npm run ci - Write-Host 'tox tests passed' - } - catch { - Write-Error "Spector tests failed: $_" - } + # Step 3: Run full test suite + Write-Host "`n=== Running full test suite ===" -ForegroundColor Cyan + Write-Host "Installed packages:" + & pip list + + Invoke-LoggedCommand "npm run ci" + Write-Host "All tests passed." -ForegroundColor Green } } finally { diff --git a/packages/http-client-python/eng/scripts/ci/config/eslint-ci.config.mjs b/packages/http-client-python/eng/scripts/ci/config/eslint-ci.config.mjs new file mode 100644 index 00000000000..b8a1418a63e --- /dev/null +++ b/packages/http-client-python/eng/scripts/ci/config/eslint-ci.config.mjs @@ -0,0 +1,54 @@ +// @ts-check +// Standalone eslint config for http-client-python package +// This config is used in CI where monorepo dependencies may not be available +import eslint from "@eslint/js"; +import tsEslint from "typescript-eslint"; + +export default [ + { + ignores: ["**/dist/**/*", "**/node_modules/**/*"], + }, + eslint.configs.recommended, + ...tsEslint.configs.recommended, + { + rules: { + // TypeScript plugin overrides + "@typescript-eslint/no-non-null-assertion": "off", + "@typescript-eslint/no-explicit-any": "off", + "@typescript-eslint/no-inferrable-types": "off", + "@typescript-eslint/no-empty-function": "off", + "@typescript-eslint/no-empty-interface": "off", + "@typescript-eslint/no-empty-object-type": "off", + "@typescript-eslint/no-unused-vars": [ + "warn", + { + varsIgnorePattern: "^_", + argsIgnorePattern: ".*", + ignoreRestSiblings: true, + caughtErrorsIgnorePattern: ".*", + }, + ], + "@typescript-eslint/no-unused-expressions": [ + "warn", + { allowShortCircuit: true, allowTernary: true }, + ], + + // Core rules + "no-inner-declarations": "off", + "no-empty": "off", + "no-constant-condition": "off", + "no-case-declarations": "off", + "no-ex-assign": "off", + "no-undef": "off", + "prefer-const": [ + "warn", + { + destructuring: "all", + }, + ], + eqeqeq: ["warn", "always", { null: "ignore" }], + "no-console": "warn", + "symbol-description": "warn", + }, + }, +]; diff --git a/packages/http-client-python/eng/scripts/ci/mypy.ini b/packages/http-client-python/eng/scripts/ci/config/mypy.ini similarity index 100% rename from packages/http-client-python/eng/scripts/ci/mypy.ini rename to packages/http-client-python/eng/scripts/ci/config/mypy.ini diff --git a/packages/http-client-python/eng/scripts/ci/pylintrc b/packages/http-client-python/eng/scripts/ci/config/pylintrc similarity index 100% rename from packages/http-client-python/eng/scripts/ci/pylintrc rename to packages/http-client-python/eng/scripts/ci/config/pylintrc diff --git a/packages/http-client-python/eng/scripts/ci/pyproject.toml b/packages/http-client-python/eng/scripts/ci/config/pyproject.toml similarity index 100% rename from packages/http-client-python/eng/scripts/ci/pyproject.toml rename to packages/http-client-python/eng/scripts/ci/config/pyproject.toml diff --git a/packages/http-client-python/eng/scripts/ci/pyrightconfig.json b/packages/http-client-python/eng/scripts/ci/config/pyrightconfig.json similarity index 100% rename from packages/http-client-python/eng/scripts/ci/pyrightconfig.json rename to packages/http-client-python/eng/scripts/ci/config/pyrightconfig.json diff --git a/packages/http-client-python/eng/scripts/ci/dev_requirements.txt b/packages/http-client-python/eng/scripts/ci/dev_requirements.txt index 7e3b05234a1..2d713225106 100644 --- a/packages/http-client-python/eng/scripts/ci/dev_requirements.txt +++ b/packages/http-client-python/eng/scripts/ci/dev_requirements.txt @@ -1,6 +1,7 @@ pyright==1.1.407 pylint==4.0.4 tox==4.16.0 +tox-uv mypy==1.19.1 colorama==0.4.6 debugpy==1.8.2 diff --git a/packages/http-client-python/eng/scripts/ci/format.ts b/packages/http-client-python/eng/scripts/ci/format.ts index 39663edcae3..96d08dedc39 100644 --- a/packages/http-client-python/eng/scripts/ci/format.ts +++ b/packages/http-client-python/eng/scripts/ci/format.ts @@ -1,3 +1,233 @@ -import { runCommand } from "./utils.js"; +/* eslint-disable no-console */ +import { spawn } from "child_process"; +import fs from "fs"; +import { dirname, join } from "path"; +import pc from "picocolors"; +import { fileURLToPath } from "url"; +import { parseArgs } from "util"; -runCommand("black", ["generator/", "eng/", "--config", "./eng/scripts/ci/pyproject.toml"]); +const root = join(dirname(fileURLToPath(import.meta.url)), "../../../"); +const monorepoRoot = join(root, "../../"); + +// Get Python venv path +function getVenvPython(): string { + const venvPath = join(root, "venv"); + if (fs.existsSync(join(venvPath, "bin"))) { + return join(venvPath, "bin", "python"); + } else if (fs.existsSync(join(venvPath, "Scripts"))) { + return join(venvPath, "Scripts", "python.exe"); + } + throw new Error("Virtual environment not found. Run 'npm run install' first."); +} + +const argv = parseArgs({ + args: process.argv.slice(2), + options: { + emitter: { type: "boolean", short: "e" }, + generator: { type: "boolean", short: "g" }, + generated: { type: "boolean" }, + check: { type: "boolean", short: "c" }, + help: { type: "boolean", short: "h" }, + }, +}); + +if (argv.values.help) { + console.log(` +${pc.bold("Usage:")} tsx format.ts [options] + +${pc.bold("Description:")} + Format code using Prettier (TypeScript) and Black (Python). + +${pc.bold("Options:")} + ${pc.cyan("-e, --emitter")} + Format TypeScript emitter code with Prettier. + + ${pc.cyan("-g, --generator")} + Format Python generator source code (pygen) with Black. + + ${pc.cyan("--generated")} + Format generated SDK packages with Black. + + ${pc.cyan("-c, --check")} + Check formatting without making changes (exit with error if unformatted). + + ${pc.cyan("-h, --help")} + Show this help message. + +${pc.bold("Examples:")} + ${pc.dim("# Format emitter + pygen source (default)")} + tsx format.ts + + ${pc.dim("# Format only TypeScript emitter")} + tsx format.ts --emitter + + ${pc.dim("# Format only pygen source code")} + tsx format.ts --generator + + ${pc.dim("# Check formatting without making changes")} + tsx format.ts --check + + ${pc.dim("# Format generated SDK packages")} + tsx format.ts --generated +`); + process.exit(0); +} + +function runCommand(command: string, args: string[]): Promise { + // Add node_modules/.bin directories to PATH so commands like prettier can be found + const pathSep = process.platform === "win32" ? ";" : ":"; + const binPaths = [ + join(root, "node_modules", ".bin"), + join(monorepoRoot, "node_modules", ".bin"), + ].join(pathSep); + const env = { + ...process.env, + PATH: `${binPaths}${pathSep}${process.env.PATH}`, + }; + + return new Promise((resolve) => { + console.log(`${pc.cyan("[RUN]")} ${command} ${args.join(" ")}`); + const proc = spawn(command, args, { + cwd: root, + stdio: "inherit", + shell: true, + env, + }); + + proc.on("close", (code) => { + if (code === 0) { + console.log(`${pc.green("[PASS]")} ${command} completed successfully`); + resolve(true); + } else { + console.log(`${pc.red("[FAIL]")} ${command} failed with code ${code}`); + resolve(false); + } + }); + + proc.on("error", (err) => { + console.log(`${pc.red("[ERROR]")} ${command}: ${err.message}`); + resolve(false); + }); + }); +} + +async function formatEmitter(check: boolean): Promise { + console.log(`\n${pc.bold("=== Formatting TypeScript Emitter ===")}\n`); + // Use prettier directly - it's available via node_modules/.bin in PATH + // Exclude CHANGELOG.md as it's managed by chronus changelog tool + const args = check + ? [ + "--check", + "emitter/", + "eng/scripts/", + "*.json", + "README.md", + "CONTRIBUTING.md", + "ARCHITECTURE.md", + ] + : [ + "--write", + "emitter/", + "eng/scripts/", + "*.json", + "README.md", + "CONTRIBUTING.md", + "ARCHITECTURE.md", + ]; + return runCommand("prettier", args); +} + +async function formatPygenSource(check: boolean): Promise { + console.log(`\n${pc.bold("=== Formatting Python Generator (pygen) ===")}\n`); + + let pythonPath: string; + try { + pythonPath = getVenvPython(); + } catch (error) { + console.error(pc.red((error as Error).message)); + return false; + } + + const args = [ + "-m", + "black", + "generator/pygen", + "eng/scripts/", + "--config", + "./eng/scripts/ci/config/pyproject.toml", + ]; + if (check) { + args.push("--check"); + } + return runCommand(pythonPath, args); +} + +async function formatGeneratedPackages(check: boolean): Promise { + console.log(`\n${pc.bold("=== Formatting Generated SDK Packages ===")}\n`); + + let pythonPath: string; + try { + pythonPath = getVenvPython(); + } catch (error) { + console.error(pc.red((error as Error).message)); + return false; + } + + const args = [ + "-m", + "black", + "generator/test/azure/generated", + "generator/test/unbranded/generated", + "--config", + "./eng/scripts/ci/config/pyproject.toml", + ]; + if (check) { + args.push("--check"); + } + return runCommand(pythonPath, args); +} + +async function main(): Promise { + const runEmitter = argv.values.emitter; + const runGenerator = argv.values.generator; + const runGenerated = argv.values.generated; + const check = argv.values.check || false; + + // If --generated is specified, only format generated packages + if (runGenerated) { + const result = await formatGeneratedPackages(check); + if (!result) process.exit(1); + console.log( + `\n${pc.green(pc.bold(`Generated SDK formatting ${check ? "check " : ""}complete!`))}\n`, + ); + return; + } + + // Default: format emitter + pygen source + const runBoth = !runEmitter && !runGenerator; + + let success = true; + + if (runEmitter || runBoth) { + const result = await formatEmitter(check); + if (!result) success = false; + } + + if (runGenerator || runBoth) { + const result = await formatPygenSource(check); + if (!result) success = false; + } + + if (!success) { + process.exit(1); + } + + console.log( + `\n${pc.green(pc.bold(`All formatting ${check ? "checks passed" : "complete"}!`))}\n`, + ); +} + +main().catch((error) => { + console.error(`${pc.red("Unexpected error:")}`, error); + process.exit(1); +}); diff --git a/packages/http-client-python/eng/scripts/ci/lint.ts b/packages/http-client-python/eng/scripts/ci/lint.ts index eb9c581bfcc..9d6150b9acc 100644 --- a/packages/http-client-python/eng/scripts/ci/lint.ts +++ b/packages/http-client-python/eng/scripts/ci/lint.ts @@ -1,36 +1,232 @@ +/* eslint-disable no-console */ +import { spawn } from "child_process"; +import fs from "fs"; +import { dirname, join } from "path"; +import pc from "picocolors"; +import { fileURLToPath } from "url"; import { parseArgs } from "util"; -import { runCommand } from "./utils.js"; -// PARSE INPUT ARGUMENTS +const root = join(dirname(fileURLToPath(import.meta.url)), "../../../"); +const monorepoRoot = join(root, "../../"); +const testsDir = join(root, "tests"); + +// Get Python venv path +function getVenvPython(): string { + const venvPath = join(root, "venv"); + if (fs.existsSync(join(venvPath, "bin"))) { + return join(venvPath, "bin", "python"); + } else if (fs.existsSync(join(venvPath, "Scripts"))) { + return join(venvPath, "Scripts", "python.exe"); + } + throw new Error("Virtual environment not found. Run 'npm run install' first."); +} const argv = parseArgs({ args: process.argv.slice(2), options: { - folderName: { type: "string" }, - command: { type: "string" }, + emitter: { type: "boolean", short: "e" }, + generator: { type: "boolean", short: "g" }, + generated: { type: "boolean" }, + flavor: { type: "string", short: "f" }, + help: { type: "boolean", short: "h" }, }, }); -export function pylint() { - runCommand("pylint", [argv.values.folderName!, "--rcfile", "./eng/scripts/ci/pylintrc"]); +if (argv.values.help) { + console.log(` +${pc.bold("Usage:")} tsx lint.ts [options] + +${pc.bold("Description:")} + Run linting checks on the codebase. + +${pc.bold("Options:")} + ${pc.cyan("-e, --emitter")} + Run ESLint on TypeScript emitter code. + + ${pc.cyan("-g, --generator")} + Run pylint on Python generator source code (pygen). + + ${pc.cyan("--generated")} + Run pylint on generated SDK packages (via tox). + Use with --flavor to specify azure or unbranded. + + ${pc.cyan("-f, --flavor ")} + SDK flavor to lint (only applies to --generated). + If not specified, lints both flavors. + + ${pc.cyan("-h, --help")} + Show this help message. + +${pc.bold("Examples:")} + ${pc.dim("# Lint emitter + pygen source (default)")} + tsx lint.ts + + ${pc.dim("# Lint only TypeScript emitter")} + tsx lint.ts --emitter + + ${pc.dim("# Lint only pygen source code")} + tsx lint.ts --generator + + ${pc.dim("# Lint generated SDK packages")} + tsx lint.ts --generated + + ${pc.dim("# Lint generated SDK packages for azure only")} + tsx lint.ts --generated --flavor=azure +`); + process.exit(0); +} + +function runCommand( + command: string, + args: string[], + cwd?: string, + displayName?: string, +): Promise { + const workingDir = cwd || root; + const name = displayName || command; + + // Add node_modules/.bin directories to PATH so commands like eslint can be found + // Also set NODE_PATH so that config files can resolve packages from monorepo's node_modules + const pathSep = process.platform === "win32" ? ";" : ":"; + const binPaths = [ + join(workingDir, "node_modules", ".bin"), + join(root, "node_modules", ".bin"), + join(monorepoRoot, "node_modules", ".bin"), + ].join(pathSep); + const nodePaths = [ + join(workingDir, "node_modules"), + join(root, "node_modules"), + join(monorepoRoot, "node_modules"), + ].join(pathSep); + const env = { + ...process.env, + PATH: `${binPaths}${pathSep}${process.env.PATH}`, + NODE_PATH: nodePaths, + }; + + return new Promise((resolve) => { + // If displayName is provided, show it as-is; otherwise show command + args + const logMessage = displayName ? displayName : `${command} ${args.join(" ")}`; + console.log(`${pc.cyan("[RUN]")} ${logMessage}`); + const proc = spawn(command, args, { + cwd: workingDir, + stdio: "inherit", + shell: true, + env, + }); + + proc.on("close", (code) => { + if (code === 0) { + console.log(`${pc.green("[PASS]")} ${name} completed successfully`); + resolve(true); + } else { + console.log(`${pc.red("[FAIL]")} ${name} failed with code ${code}`); + resolve(false); + } + }); + + proc.on("error", (err) => { + console.log(`${pc.red("[ERROR]")} ${name}: ${err.message}`); + resolve(false); + }); + }); } -export function mypy() { - runCommand("mypy", [argv.values.folderName!, "--config-file", "./eng/scripts/ci/mypy.ini"]); +async function lintEmitter(): Promise { + console.log(`\n${pc.bold("=== Linting TypeScript Emitter ===")}\n`); + // Run eslint with local config to avoid dependency on monorepo's eslint.config.js + // This ensures the package can be linted in CI without full monorepo dependencies + return runCommand( + "eslint", + ["emitter/", "--config", "eng/scripts/ci/config/eslint-ci.config.mjs", "--max-warnings=0"], + root, + "eslint emitter/ --max-warnings=0", + ); } -export function pyright() { - runCommand("pyright", [argv.values.folderName!, "-p", "./eng/scripts/ci/pyrightconfig.json"]); +async function lintPygenSource(): Promise { + console.log(`\n${pc.bold("=== Linting Python Generator (pygen) ===")}\n`); + + let pythonPath: string; + try { + pythonPath = getVenvPython(); + } catch (error) { + console.error(pc.red((error as Error).message)); + return false; + } + + // Lint pygen source code directly with pylint + return runCommand(pythonPath, [ + "-m", + "pylint", + "generator/pygen", + "--rcfile=eng/scripts/ci/config/pylintrc", + "--recursive=y", + "--py-version=3.9", + ]); } -if (argv.values.command === "pylint") { - pylint(); -} else if (argv.values.command === "mypy") { - mypy(); -} else if (argv.values.command === "pyright") { - pyright(); -} else { - pylint(); - mypy(); - pyright(); +async function lintGeneratedPackages(flavor?: string): Promise { + const flavors = flavor ? [flavor] : ["azure", "unbranded"]; + console.log(`\n${pc.bold(`=== Linting Generated SDK Packages (${flavors.join(", ")}) ===`)}\n`); + + let pythonPath: string; + try { + pythonPath = getVenvPython(); + } catch (error) { + console.error(pc.red((error as Error).message)); + return false; + } + + let success = true; + for (const f of flavors) { + const toxEnv = `lint-${f}`; + const result = await runCommand( + pythonPath, + ["-m", "tox", "-c", "tox.ini", "-e", toxEnv], + testsDir, + ); + if (!result) success = false; + } + return success; } + +async function main(): Promise { + const runEmitter = argv.values.emitter; + const runGenerator = argv.values.generator; + const runGenerated = argv.values.generated; + + // If --generated is specified, only lint generated packages + if (runGenerated) { + const result = await lintGeneratedPackages(argv.values.flavor); + if (!result) process.exit(1); + console.log(`\n${pc.green(pc.bold("Generated SDK linting complete!"))}\n`); + return; + } + + // Default: lint emitter + pygen source + const runBoth = !runEmitter && !runGenerator; + + let success = true; + + if (runEmitter || runBoth) { + const result = await lintEmitter(); + if (!result) success = false; + } + + if (runGenerator || runBoth) { + const result = await lintPygenSource(); + if (!result) success = false; + } + + if (!success) { + process.exit(1); + } + + console.log(`\n${pc.green(pc.bold("All linting checks passed!"))}\n`); +} + +main().catch((error) => { + console.error(`${pc.red("Unexpected error:")}`, error); + process.exit(1); +}); diff --git a/packages/http-client-python/eng/scripts/ci/regenerate-common.ts b/packages/http-client-python/eng/scripts/ci/regenerate-common.ts new file mode 100644 index 00000000000..0bcce983788 --- /dev/null +++ b/packages/http-client-python/eng/scripts/ci/regenerate-common.ts @@ -0,0 +1,541 @@ +import { promises } from "fs"; +import { dirname, join, relative, resolve } from "path"; + +// ---- Shared constants ---- + +export const SKIP_SPECS: string[] = ["type/file"]; + +export const SpecialFlags: Record> = { + azure: { + "generate-test": true, + "generate-sample": true, + }, +}; + +// ---- Base emitter options (shared across repos) ---- + +export const BASE_AZURE_EMITTER_OPTIONS: Record< + string, + Record | Record[] +> = { + "azure/client-generator-core/access": { + namespace: "specs.azure.clientgenerator.core.access", + }, + "azure/client-generator-core/alternate-type": { + namespace: "specs.azure.clientgenerator.core.alternatetype", + }, + "azure/client-generator-core/api-version": { + namespace: "specs.azure.clientgenerator.core.apiversion", + }, + "azure/client-generator-core/client-initialization/default": { + namespace: "specs.azure.clientgenerator.core.clientinitialization.default", + }, + "azure/client-generator-core/client-initialization/individually": { + namespace: "specs.azure.clientgenerator.core.clientinitialization.individually", + }, + "azure/client-generator-core/client-initialization/individuallyParent": { + namespace: "specs.azure.clientgenerator.core.clientinitialization.individuallyparent", + }, + "azure/client-generator-core/client-location": { + namespace: "specs.azure.clientgenerator.core.clientlocation", + }, + "azure/client-generator-core/deserialize-empty-string-as-null": { + namespace: "specs.azure.clientgenerator.core.emptystring", + }, + "azure/client-generator-core/flatten-property": { + namespace: "specs.azure.clientgenerator.core.flattenproperty", + }, + "azure/client-generator-core/usage": { + namespace: "specs.azure.clientgenerator.core.usage", + }, + "azure/client-generator-core/override": { + namespace: "specs.azure.clientgenerator.core.override", + }, + "azure/client-generator-core/hierarchy-building": { + namespace: "specs.azure.clientgenerator.core.hierarchybuilding", + }, + "azure/core/basic": { + namespace: "specs.azure.core.basic", + }, + "azure/core/lro/rpc": { + namespace: "specs.azure.core.lro.rpc", + }, + "azure/core/lro/standard": { + namespace: "specs.azure.core.lro.standard", + }, + "azure/core/model": { + namespace: "specs.azure.core.model", + }, + "azure/core/page": { + namespace: "specs.azure.core.page", + }, + "azure/core/scalar": { + namespace: "specs.azure.core.scalar", + }, + "azure/core/traits": { + namespace: "specs.azure.core.traits", + }, + "azure/encode/duration": { + namespace: "specs.azure.encode.duration", + }, + "azure/example/basic": { + namespace: "specs.azure.example.basic", + }, + "azure/payload/pageable": { + namespace: "specs.azure.payload.pageable", + }, + "azure/versioning/previewVersion": { + namespace: "specs.azure.versioning.previewversion", + }, + "client/structure/default": { + namespace: "client.structure.service", + }, + "client/structure/multi-client": { + "package-name": "client-structure-multiclient", + namespace: "client.structure.multiclient", + }, + "client/structure/renamed-operation": { + "package-name": "client-structure-renamedoperation", + namespace: "client.structure.renamedoperation", + }, + "client/structure/two-operation-group": { + "package-name": "client-structure-twooperationgroup", + namespace: "client.structure.twooperationgroup", + }, + "client/naming": { + namespace: "client.naming.main", + }, + "client/overload": { + namespace: "client.overload", + }, + "encode/duration": { + namespace: "encode.duration", + }, + "encode/numeric": { + namespace: "encode.numeric", + }, + "parameters/basic": { + namespace: "parameters.basic", + }, + "parameters/spread": { + namespace: "parameters.spread", + }, + "payload/content-negotiation": { + namespace: "payload.contentnegotiation", + }, + "payload/multipart": { + namespace: "payload.multipart", + }, + "serialization/encoded-name/json": { + namespace: "serialization.encodedname.json", + }, + "special-words": { + namespace: "specialwords", + }, + "service/multi-service": { + namespace: "service.multiservice", + }, + "service/multiple-services": { + namespace: "service.multipleservices", + }, +}; + +export const BASE_EMITTER_OPTIONS: Record< + string, + Record | Record[] +> = { + "resiliency/srv-driven/old.tsp": { + "package-name": "resiliency-srv-driven1", + namespace: "resiliency.srv.driven1", + "package-mode": "azure-dataplane", + "package-pprint-name": "ResiliencySrvDriven1", + }, + "resiliency/srv-driven": { + "package-name": "resiliency-srv-driven2", + namespace: "resiliency.srv.driven2", + "package-mode": "azure-dataplane", + "package-pprint-name": "ResiliencySrvDriven2", + }, + "authentication/api-key": { + "clear-output-folder": "true", + }, + "authentication/http/custom": { + "package-name": "authentication-http-custom", + namespace: "authentication.http.custom", + "package-pprint-name": "Authentication Http Custom", + }, + "authentication/union": [ + { + "package-name": "authentication-union", + namespace: "authentication.union", + }, + { + "package-name": "setuppy-authentication-union", + namespace: "setuppy.authentication.union", + "keep-setup-py": "true", + }, + ], + "type/array": { + "package-name": "typetest-array", + namespace: "typetest.array", + }, + "type/dictionary": { + "package-name": "typetest-dictionary", + namespace: "typetest.dictionary", + }, + "type/enum/extensible": { + "package-name": "typetest-enum-extensible", + namespace: "typetest.enum.extensible", + }, + "type/enum/fixed": { + "package-name": "typetest-enum-fixed", + namespace: "typetest.enum.fixed", + }, + "type/model/empty": { + "package-name": "typetest-model-empty", + namespace: "typetest.model.empty", + }, + "type/model/inheritance/enum-discriminator": { + "package-name": "typetest-model-enumdiscriminator", + namespace: "typetest.model.enumdiscriminator", + }, + "type/model/inheritance/nested-discriminator": { + "package-name": "typetest-model-nesteddiscriminator", + namespace: "typetest.model.nesteddiscriminator", + }, + "type/model/inheritance/not-discriminated": { + "package-name": "typetest-model-notdiscriminated", + namespace: "typetest.model.notdiscriminated", + }, + "type/model/inheritance/single-discriminator": { + "package-name": "typetest-model-singlediscriminator", + namespace: "typetest.model.singlediscriminator", + }, + "type/model/inheritance/recursive": [ + { + "package-name": "typetest-model-recursive", + namespace: "typetest.model.recursive", + }, + { + // basic test for configuration "generation-subdir" + "package-name": "generation-subdir", + namespace: "generation.subdir", + "generation-subdir": "_generated", + "clear-output-folder": "true", + }, + ], + "type/model/usage": { + "package-name": "typetest-model-usage", + namespace: "typetest.model.usage", + }, + "type/model/visibility": [ + { + "package-name": "typetest-model-visibility", + namespace: "typetest.model.visibility", + }, + { + "package-name": "headasbooleantrue", + namespace: "headasbooleantrue", + "head-as-boolean": "true", + }, + { + "package-name": "headasbooleanfalse", + namespace: "headasbooleanfalse", + "head-as-boolean": "false", + }, + ], + "type/property/nullable": { + "package-name": "typetest-property-nullable", + namespace: "typetest.property.nullable", + }, + "type/property/optionality": { + "package-name": "typetest-property-optional", + namespace: "typetest.property.optional", + }, + "type/property/additional-properties": { + "package-name": "typetest-property-additionalproperties", + namespace: "typetest.property.additionalproperties", + }, + "type/scalar": { + "package-name": "typetest-scalar", + namespace: "typetest.scalar", + }, + "type/property/value-types": { + "package-name": "typetest-property-valuetypes", + namespace: "typetest.property.valuetypes", + }, + "type/union": { + "package-name": "typetest-union", + namespace: "typetest.union", + }, + "type/union/discriminated": { + "package-name": "typetest-discriminatedunion", + namespace: "typetest.discriminatedunion", + }, + "type/file": { + "package-name": "typetest-file", + namespace: "typetest.file", + }, + documentation: { + "package-name": "specs-documentation", + namespace: "specs.documentation", + }, + "versioning/added": [ + { + "package-name": "versioning-added", + namespace: "versioning.added", + }, + // check whether import of _validation.py/_types.py works when "generation-subdir" is configured + { + "package-name": "generation-subdir2", + namespace: "generation.subdir2", + "generation-subdir": "_generated", + }, + ], +}; + +// ---- Shared interfaces ---- + +export interface TspCommand { + outputDir: string; + command: string | string[]; +} + +export interface RegenerateFlagsInput { + flavor?: string; + debug?: boolean; + name?: string; + pyodide?: boolean; + jobs?: number; +} + +export interface RegenerateFlags { + flavor: string; + debug: boolean; + name?: string; + pyodide?: boolean; +} + +export interface ProcessedEmitterOption { + options: Record; + outputDir: string; +} + +export interface RegenerateConfig { + azureHttpSpecs: string; + httpSpecs: string; + emitterOptions: Record | Record[]>; + azureEmitterOptions: Record | Record[]>; + preprocess: (flags: RegenerateFlagsInput) => Promise; + getCmdList: (spec: string, flags: RegenerateFlags) => TspCommand[]; + executeCommand: (cmd: TspCommand) => Promise; +} + +// ---- Shared utility functions ---- + +export function toPosix(dir: string): string { + return dir.replace(/\\/g, "/"); +} + +export function getEmitterOption( + spec: string, + flavor: string, + config: RegenerateConfig, +): Record[] { + const specDir = spec.includes("azure") ? config.azureHttpSpecs : config.httpSpecs; + const relativeSpec = toPosix(relative(specDir, spec)); + const key = relativeSpec.includes("resiliency/srv-driven/old.tsp") + ? relativeSpec + : dirname(relativeSpec); + const emitter_options = config.emitterOptions[key] || + (flavor === "azure" ? config.azureEmitterOptions[key] : [{}]) || [{}]; + return Array.isArray(emitter_options) ? emitter_options : [emitter_options]; +} + +export async function getSubdirectories( + baseDir: string, + flags: RegenerateFlags, +): Promise { + const subdirectories: string[] = []; + + async function searchDir(currentDir: string) { + const items = await promises.readdir(currentDir, { withFileTypes: true }); + + const promisesArray = items.map(async (item) => { + const subDirPath = join(currentDir, item.name); + if (item.isDirectory()) { + const mainTspPath = join(subDirPath, "main.tsp"); + const clientTspPath = join(subDirPath, "client.tsp"); + + const mainTspRelativePath = toPosix(relative(baseDir, mainTspPath)); + + if (SKIP_SPECS.some((skipSpec) => mainTspRelativePath.includes(skipSpec))) return; + + const hasMainTsp = await promises + .access(mainTspPath) + .then(() => true) + .catch(() => false); + const hasClientTsp = await promises + .access(clientTspPath) + .then(() => true) + .catch(() => false); + + if (mainTspRelativePath.toLowerCase().includes(flags.name || "")) { + if (mainTspRelativePath.includes("resiliency/srv-driven")) { + subdirectories.push(resolve(subDirPath, "old.tsp")); + } + if (hasClientTsp) { + subdirectories.push(resolve(subDirPath, "client.tsp")); + } else if (hasMainTsp) { + subdirectories.push(resolve(subDirPath, "main.tsp")); + } + } + + // Recursively search in the subdirectory + await searchDir(subDirPath); + } + }); + + await Promise.all(promisesArray); + } + + await searchDir(baseDir); + return subdirectories; +} + +export function defaultPackageName(spec: string, config: RegenerateConfig): string { + const specDir = spec.includes("azure") ? config.azureHttpSpecs : config.httpSpecs; + return toPosix(relative(specDir, dirname(spec))) + .replace(/\//g, "-") + .toLowerCase(); +} + +export function buildOptions( + spec: string, + generatedFolder: string, + flags: RegenerateFlags, + config: RegenerateConfig, +): ProcessedEmitterOption[] { + const results: ProcessedEmitterOption[] = []; + for (const emitterConfig of getEmitterOption(spec, flags.flavor, config)) { + const options: Record = { ...emitterConfig }; + if (flags.pyodide) { + options["use-pyodide"] = "true"; + } + options["flavor"] = flags.flavor; + for (const [k, v] of Object.entries(SpecialFlags[flags.flavor] ?? {})) { + options[k] = v; + } + if (options["emitter-output-dir"] === undefined) { + const packageName = options["package-name"] || defaultPackageName(spec, config); + // Output to new tests/generated// structure + options["emitter-output-dir"] = toPosix( + `${generatedFolder}/../tests/generated/${flags.flavor}/${packageName}`, + ); + } + if (flags.debug) { + options["debug"] = "true"; + } + options["examples-dir"] = toPosix(join(dirname(spec), "examples")); + results.push({ + options, + outputDir: options["emitter-output-dir"], + }); + } + return results; +} + +export async function runTaskPool( + tasks: Array<() => Promise>, + poolLimit: number, +): Promise { + const executing: Set> = new Set(); + + for (const task of tasks) { + // Start the task and remove from set when done + const p: Promise = task().finally(() => executing.delete(p)); + executing.add(p); + + // If at capacity, wait for one to complete + if (executing.size >= poolLimit) { + await Promise.race(executing); + } + } + + // Wait for remaining tasks + await Promise.all(executing); +} + +export async function regenerate( + flags: RegenerateFlagsInput, + config: RegenerateConfig, +): Promise { + if (flags.flavor === undefined) { + await regenerate({ flavor: "azure", ...flags }, config); + await regenerate({ flavor: "unbranded", ...flags }, config); + } else { + await config.preprocess(flags); + + const flagsResolved: RegenerateFlags = { debug: false, flavor: flags.flavor, ...flags }; + const subdirectoriesForAzure = await getSubdirectories(config.azureHttpSpecs, flagsResolved); + const subdirectoriesForNonAzure = await getSubdirectories(config.httpSpecs, flagsResolved); + const subdirectories = + flags.flavor === "azure" + ? [...subdirectoriesForAzure, ...subdirectoriesForNonAzure] + : subdirectoriesForNonAzure; + const cmdList: TspCommand[] = subdirectories.flatMap((subdirectory) => + config.getCmdList(subdirectory, flagsResolved), + ); + + // Create tasks as functions for the pool + const tasks: Array<() => Promise> = cmdList.map((tspCommand) => { + return () => config.executeCommand(tspCommand); + }); + + // Run tasks with a concurrency limit + // Default: 30 jobs, or use provided value + const poolLimit = flags.jobs ?? 30; + await runTaskPool(tasks, poolLimit); + } +} + +// Preprocess: create files that should be deleted after regeneration (for testing) +export async function preprocess(flavor: string, generatedFolder: string): Promise { + if (flavor === "azure") { + // Use tests/generated// structure (same as output) + const testsGeneratedDir = resolve(generatedFolder, "../tests/generated/azure"); + + const DELETE_CONTENT = "# This file is to be deleted after regeneration"; + const DELETE_FILE = "to_be_deleted.py"; + const entries: { folder: string[]; file: string; content: string }[] = [ + { + folder: ["authentication-api-key", "authentication", "apikey", "_operations"], + file: DELETE_FILE, + content: DELETE_CONTENT, + }, + { + folder: ["generation-subdir", "generation", "subdir", "_generated"], + file: DELETE_FILE, + content: DELETE_CONTENT, + }, + { + folder: ["generation-subdir", "generated_tests"], + file: DELETE_FILE, + content: DELETE_CONTENT, + }, + { + folder: ["generation-subdir", "generation", "subdir"], + file: "to_be_kept.py", + content: "# This file is to be kept after regeneration", + }, + ]; + + await Promise.all( + entries.map(async ({ folder, file, content }) => { + const targetFolder = join(testsGeneratedDir, ...folder); + await promises.mkdir(targetFolder, { recursive: true }); + await promises.writeFile(join(targetFolder, file), content); + }), + ); + } +} diff --git a/packages/http-client-python/eng/scripts/ci/regenerate.ts b/packages/http-client-python/eng/scripts/ci/regenerate.ts index 85a4a729eac..f18f3a3a9c0 100644 --- a/packages/http-client-python/eng/scripts/ci/regenerate.ts +++ b/packages/http-client-python/eng/scripts/ci/regenerate.ts @@ -1,523 +1,351 @@ /* eslint-disable no-console */ -import chalk from "chalk"; -import { execFile } from "child_process"; -import { promises, rmSync } from "fs"; +/** + * Regenerates Python SDK code from TypeSpec definitions. + * + * Uses in-process TypeSpec compilation to avoid subprocess spawning overhead. + * This is significantly faster than spawning `tsp compile` for each spec. + */ + +import { compile, NodeHost } from "@typespec/compiler"; +import { rmSync } from "fs"; +import { platform } from "os"; import { dirname, join, relative, resolve } from "path"; +import pc from "picocolors"; import { fileURLToPath } from "url"; -import { parseArgs, promisify } from "util"; - -// PARSE INPUT ARGUMENTS - +import { parseArgs } from "util"; +import { + BASE_AZURE_EMITTER_OPTIONS, + BASE_EMITTER_OPTIONS, + getSubdirectories, + preprocess, + SpecialFlags, + toPosix, + type RegenerateFlags, +} from "./regenerate-common.js"; + +// Parse arguments const argv = parseArgs({ args: process.argv.slice(2), options: { - flavor: { type: "string" }, - name: { type: "string" }, - debug: { type: "boolean" }, + flavor: { type: "string", short: "f" }, + name: { type: "string", short: "n" }, + debug: { type: "boolean", short: "d" }, pluginDir: { type: "string" }, emitterName: { type: "string" }, generatedFolder: { type: "string" }, - pyodide: { type: "boolean" }, + jobs: { type: "string", short: "j" }, + help: { type: "boolean", short: "h" }, }, }); -// Add this near the top with other constants -const SKIP_SPECS: string[] = []; +if (argv.values.help) { + console.log(` +${pc.bold("Usage:")} tsx regenerate.ts [options] + +${pc.bold("Description:")} + Regenerates Python SDK code from TypeSpec definitions using in-process compilation. + This avoids spawning a new Node.js process for each spec, making it significantly faster. + +${pc.bold("Options:")} + ${pc.cyan("-f, --flavor ")} + SDK flavor to regenerate. If not specified, regenerates both flavors. + + ${pc.cyan("-n, --name ")} + Filter packages by name pattern (case-insensitive substring match). + Examples: + --name xml Regenerate packages containing "xml" + --name authentication Regenerate authentication packages + --name type/array Regenerate the type/array package + + ${pc.cyan("-d, --debug")} + Enable debug output during regeneration. + + ${pc.cyan("-j, --jobs ")} + Number of parallel compilation tasks (default: 30 on Linux/Mac, 10 on Windows). + + ${pc.cyan("-h, --help")} + Show this help message. + +${pc.bold("Examples:")} + ${pc.dim("# Regenerate all packages for both flavors")} + tsx regenerate.ts -// Get the directory of the current file + ${pc.dim("# Regenerate only Azure packages")} + tsx regenerate.ts --flavor azure + + ${pc.dim("# Regenerate a specific package by name")} + tsx regenerate.ts --flavor azure --name authentication-api-key + + ${pc.dim("# Regenerate with more parallelism")} + tsx regenerate.ts --jobs 50 +`); + process.exit(0); +} + +// Get paths +const SCRIPT_DIR = dirname(fileURLToPath(import.meta.url)); const PLUGIN_DIR = argv.values.pluginDir ? resolve(argv.values.pluginDir) - : resolve(fileURLToPath(import.meta.url), "../../../../"); + : resolve(SCRIPT_DIR, "../../../"); const AZURE_HTTP_SPECS = resolve(PLUGIN_DIR, "node_modules/@azure-tools/azure-http-specs/specs"); const HTTP_SPECS = resolve(PLUGIN_DIR, "node_modules/@typespec/http-specs/specs"); const GENERATED_FOLDER = argv.values.generatedFolder ? resolve(argv.values.generatedFolder) : resolve(PLUGIN_DIR, "generator"); +const EMITTER_NAME = argv.values.emitterName || "@typespec/http-client-python"; -interface TspCommand { - outputDir: string; - command: string[]; -} - +// Emitter options const AZURE_EMITTER_OPTIONS: Record | Record[]> = { - "azure/client-generator-core/access": { - namespace: "specs.azure.clientgenerator.core.access", - }, - "azure/client-generator-core/alternate-type": { - namespace: "specs.azure.clientgenerator.core.alternatetype", - }, - "azure/client-generator-core/api-version": { - namespace: "specs.azure.clientgenerator.core.apiversion", - }, - "azure/client-generator-core/client-initialization": { - namespace: "specs.azure.clientgenerator.core.clientinitialization", - }, - "azure/client-generator-core/client-location": { - namespace: "specs.azure.clientgenerator.core.clientlocation", - }, - "azure/client-generator-core/deserialize-empty-string-as-null": { - namespace: "specs.azure.clientgenerator.core.emptystring", - }, - "azure/client-generator-core/flatten-property": { - namespace: "specs.azure.clientgenerator.core.flattenproperty", - }, - "azure/client-generator-core/usage": { - namespace: "specs.azure.clientgenerator.core.usage", - }, - "azure/client-generator-core/override": { - namespace: "specs.azure.clientgenerator.core.override", - }, - "azure/client-generator-core/hierarchy-building": { - namespace: "specs.azure.clientgenerator.core.hierarchybuilding", - }, - "azure/core/basic": { - namespace: "specs.azure.core.basic", - }, - "azure/core/lro/rpc": { - namespace: "specs.azure.core.lro.rpc", - }, - "azure/core/lro/standard": { - namespace: "specs.azure.core.lro.standard", - }, - "azure/core/model": { - namespace: "specs.azure.core.model", - }, - "azure/core/page": { - namespace: "specs.azure.core.page", - }, - "azure/core/scalar": { - namespace: "specs.azure.core.scalar", - }, - "azure/core/traits": { - namespace: "specs.azure.core.traits", - }, - "azure/encode/duration": { - namespace: "specs.azure.encode.duration", - }, - "azure/example/basic": { - namespace: "specs.azure.example.basic", - }, - "azure/payload/pageable": { - namespace: "specs.azure.payload.pageable", - }, - "azure/versioning/previewVersion": { - namespace: "specs.azure.versioning.previewversion", - }, - "client/structure/default": { - namespace: "client.structure.service", - }, + ...BASE_AZURE_EMITTER_OPTIONS, "client/structure/client-operation-group": { "package-name": "client-structure-clientoperationgroup", namespace: "client.structure.clientoperationgroup", }, - "client/structure/multi-client": { - "package-name": "client-structure-multiclient", - namespace: "client.structure.multiclient", - }, - "client/structure/renamed-operation": { - "package-name": "client-structure-renamedoperation", - namespace: "client.structure.renamedoperation", - }, - "client/structure/two-operation-group": { - "package-name": "client-structure-twooperationgroup", - namespace: "client.structure.twooperationgroup", - }, - "client/naming": { - namespace: "client.naming.main", - }, - "client/overload": { - namespace: "client.overload", - }, - "encode/duration": { - namespace: "encode.duration", - }, - "encode/numeric": { - namespace: "encode.numeric", - }, - "parameters/basic": { - namespace: "parameters.basic", - }, - "parameters/spread": { - namespace: "parameters.spread", - }, - "payload/content-negotiation": { - namespace: "payload.contentnegotiation", - }, - "payload/multipart": { - namespace: "payload.multipart", - }, - "serialization/encoded-name/json": { - namespace: "serialization.encodedname.json", - }, - "special-words": { - namespace: "specialwords", - }, - "service/multi-service": { - namespace: "service.multiservice", - }, }; const EMITTER_OPTIONS: Record | Record[]> = { - "resiliency/srv-driven/old.tsp": { - "package-name": "resiliency-srv-driven1", - namespace: "resiliency.srv.driven1", - "package-mode": "azure-dataplane", - "package-pprint-name": "ResiliencySrvDriven1", - }, - "resiliency/srv-driven": { - "package-name": "resiliency-srv-driven2", - namespace: "resiliency.srv.driven2", - "package-mode": "azure-dataplane", - "package-pprint-name": "ResiliencySrvDriven2", - }, - "authentication/api-key": { - "clear-output-folder": "true", - }, - "authentication/http/custom": { - "package-name": "authentication-http-custom", - namespace: "authentication.http.custom", - "package-pprint-name": "Authentication Http Custom", - }, - "authentication/union": [ - { - "package-name": "authentication-union", - namespace: "authentication.union", - }, - { - "package-name": "setuppy-authentication-union", - namespace: "setuppy.authentication.union", - "keep-setup-py": "true", - }, - ], + ...BASE_EMITTER_OPTIONS, "type/array": { "package-name": "typetest-array", namespace: "typetest.array", - "use-pyodide": "true", - }, - "type/dictionary": { - "package-name": "typetest-dictionary", - namespace: "typetest.dictionary", - }, - "type/enum/extensible": { - "package-name": "typetest-enum-extensible", - namespace: "typetest.enum.extensible", - }, - "type/enum/fixed": { - "package-name": "typetest-enum-fixed", - namespace: "typetest.enum.fixed", - }, - "type/model/empty": { - "package-name": "typetest-model-empty", - namespace: "typetest.model.empty", - }, - "type/model/inheritance/enum-discriminator": { - "package-name": "typetest-model-enumdiscriminator", - namespace: "typetest.model.enumdiscriminator", - }, - "type/model/inheritance/nested-discriminator": { - "package-name": "typetest-model-nesteddiscriminator", - namespace: "typetest.model.nesteddiscriminator", - }, - "type/model/inheritance/not-discriminated": { - "package-name": "typetest-model-notdiscriminated", - namespace: "typetest.model.notdiscriminated", - }, - "type/model/inheritance/single-discriminator": { - "package-name": "typetest-model-singlediscriminator", - namespace: "typetest.model.singlediscriminator", - }, - "type/model/inheritance/recursive": { - "package-name": "typetest-model-recursive", - namespace: "typetest.model.recursive", - "use-pyodide": "true", - }, - "type/model/usage": { - "package-name": "typetest-model-usage", - namespace: "typetest.model.usage", - }, - "type/model/visibility": [ - { - "package-name": "typetest-model-visibility", - namespace: "typetest.model.visibility", - }, - { - "package-name": "headasbooleantrue", - namespace: "headasbooleantrue", - "head-as-boolean": "true", - }, - { - "package-name": "headasbooleanfalse", - namespace: "headasbooleanfalse", - "head-as-boolean": "false", - }, - ], - "type/property/nullable": { - "package-name": "typetest-property-nullable", - namespace: "typetest.property.nullable", - }, - "type/property/optionality": { - "package-name": "typetest-property-optional", - namespace: "typetest.property.optional", - }, - "type/property/additional-properties": { - "package-name": "typetest-property-additionalproperties", - namespace: "typetest.property.additionalproperties", - }, - "type/scalar": { - "package-name": "typetest-scalar", - namespace: "typetest.scalar", - }, - "type/property/value-types": { - "package-name": "typetest-property-valuetypes", - namespace: "typetest.property.valuetypes", - }, - "type/union": { - "package-name": "typetest-union", - namespace: "typetest.union", - }, - "type/union/discriminated": { - "package-name": "typetest-discriminatedunion", - namespace: "typetest.discriminatedunion", - }, - documentation: { - "package-name": "specs-documentation", - namespace: "specs.documentation", }, }; -function toPosix(dir: string): string { - return dir.replace(/\\/g, "/"); +interface CompileTask { + spec: string; + outputDir: string; + options: Record; +} + +// Group of tasks for the same spec that must run sequentially +interface TaskGroup { + spec: string; + tasks: CompileTask[]; } -function getEmitterOption(spec: string, flavor: string): Record[] { +function defaultPackageName(spec: string): string { + const specDir = spec.includes("azure") ? AZURE_HTTP_SPECS : HTTP_SPECS; + return toPosix(relative(specDir, dirname(spec))) + .replace(/\//g, "-") + .toLowerCase(); +} + +function getEmitterOptions(spec: string, flavor: string): Record[] { const specDir = spec.includes("azure") ? AZURE_HTTP_SPECS : HTTP_SPECS; const relativeSpec = toPosix(relative(specDir, spec)); const key = relativeSpec.includes("resiliency/srv-driven/old.tsp") ? relativeSpec : dirname(relativeSpec); - const emitter_options = EMITTER_OPTIONS[key] || + const emitterOpts = EMITTER_OPTIONS[key] || (flavor === "azure" ? AZURE_EMITTER_OPTIONS[key] : [{}]) || [{}]; - return Array.isArray(emitter_options) ? emitter_options : [emitter_options]; + return Array.isArray(emitterOpts) ? emitterOpts : [emitterOpts]; } -// Function to execute CLI commands asynchronously -async function executeCommand(tspCommand: TspCommand): Promise { - const execFileAsync = promisify(execFile); - try { - console.log(chalk.green(`start tsp ${tspCommand.command.join(" ")}`)); - await execFileAsync("tsp", tspCommand.command, { shell: true }); - console.log(chalk.green(`tsp ${tspCommand.command.join(" ")} succeeded`)); - } catch (err) { - rmSync(tspCommand.outputDir, { recursive: true, force: true }); - console.error(chalk.red(`exec error: ${err}`)); - throw err; - } -} +function buildTaskGroups(specs: string[], flags: RegenerateFlags): TaskGroup[] { + const groups: TaskGroup[] = []; -interface RegenerateFlagsInput { - flavor?: string; - debug?: boolean; - name?: string; - pyodide?: boolean; -} + for (const spec of specs) { + const tasks: CompileTask[] = []; -interface RegenerateFlags { - flavor: string; - debug: boolean; - name?: string; - pyodide?: boolean; -} + for (const emitterConfig of getEmitterOptions(spec, flags.flavor)) { + const options: Record = { ...emitterConfig }; -const SpecialFlags: Record> = { - azure: { - "generate-test": true, - "generate-sample": true, - }, -}; + // Add flavor-specific options + options["flavor"] = flags.flavor; + for (const [k, v] of Object.entries(SpecialFlags[flags.flavor] ?? {})) { + options[k] = v; + } -async function getSubdirectories(baseDir: string, flags: RegenerateFlags): Promise { - const subdirectories: string[] = []; - - async function searchDir(currentDir: string) { - const items = await promises.readdir(currentDir, { withFileTypes: true }); - - const promisesArray = items.map(async (item) => { - const subDirPath = join(currentDir, item.name); - if (item.isDirectory()) { - const mainTspPath = join(subDirPath, "main.tsp"); - const clientTspPath = join(subDirPath, "client.tsp"); - - const mainTspRelativePath = toPosix(relative(baseDir, mainTspPath)); - - // Replace the individual skip checks with: - if (SKIP_SPECS.some((skipSpec) => mainTspRelativePath.includes(skipSpec))) return; - - const hasMainTsp = await promises - .access(mainTspPath) - .then(() => true) - .catch(() => false); - const hasClientTsp = await promises - .access(clientTspPath) - .then(() => true) - .catch(() => false); - - if (mainTspRelativePath.toLowerCase().includes(flags.name || "")) { - if (mainTspRelativePath.includes("resiliency/srv-driven")) { - subdirectories.push(resolve(subDirPath, "old.tsp")); - } - if (hasClientTsp) { - subdirectories.push(resolve(subDirPath, "client.tsp")); - } else if (hasMainTsp) { - subdirectories.push(resolve(subDirPath, "main.tsp")); - } - } + // Set output directory - use tests/generated// structure + const packageName = (options["package-name"] as string) || defaultPackageName(spec); + const outputDir = + (options["emitter-output-dir"] as string) || + toPosix(`${GENERATED_FOLDER}/../tests/generated/${flags.flavor}/${packageName}`); + options["emitter-output-dir"] = outputDir; - // Recursively search in the subdirectory - await searchDir(subDirPath); + // Debug mode + if (flags.debug) { + options["debug"] = true; } - }); - await Promise.all(promisesArray); + // Examples directory + options["examples-dir"] = toPosix(join(dirname(spec), "examples")); + + tasks.push({ spec, outputDir, options }); + } + + groups.push({ spec, tasks }); } - await searchDir(baseDir); - return subdirectories; + return groups; } -function defaultPackageName(spec: string): string { - const specDir = spec.includes("azure") ? AZURE_HTTP_SPECS : HTTP_SPECS; - return toPosix(relative(specDir, dirname(spec))) - .replace(/\//g, "-") - .toLowerCase(); -} +async function compileSpec(task: CompileTask): Promise<{ success: boolean; error?: string }> { + const { spec, outputDir, options } = task; -interface EmitterConfig { - options: string[]; - outputDir: string; -} + try { + // Build compiler options + const compilerOptions = { + emit: [PLUGIN_DIR], + options: { + [EMITTER_NAME]: options, + }, + }; -function addOptions( - spec: string, - generatedFolder: string, - flags: RegenerateFlags, -): EmitterConfig[] { - const emitterConfigs: EmitterConfig[] = []; - for (const config of getEmitterOption(spec, flags.flavor)) { - const options: Record = { ...config }; - if (flags.pyodide) { - options["use-pyodide"] = "true"; - } - options["flavor"] = flags.flavor; - for (const [k, v] of Object.entries(SpecialFlags[flags.flavor] ?? {})) { - options[k] = v; - } - if (options["emitter-output-dir"] === undefined) { - const packageName = options["package-name"] || defaultPackageName(spec); - options["emitter-output-dir"] = toPosix( - `${generatedFolder}/test/${flags.flavor}/generated/${packageName}`, - ); - } - if (flags.debug) { - options["debug"] = "true"; + // Compile using TypeSpec compiler directly (no subprocess) + const program = await compile(NodeHost, spec, compilerOptions); + + if (program.hasError()) { + const errors = program.diagnostics + .filter((d) => d.severity === "error") + .map((d) => d.message) + .join("\n"); + return { success: false, error: errors }; } - options["examples-dir"] = toPosix(join(dirname(spec), "examples")); - const configs = Object.entries(options).flatMap(([k, v]) => { - return [ - "--option", - `${argv.values.emitterName || "@typespec/http-client-python"}.${k}="${v}"`, - ]; - }); - emitterConfigs.push({ - options: configs, - outputDir: options["emitter-output-dir"], - }); + + return { success: true }; + } catch (err) { + // Clean up on error + rmSync(outputDir, { recursive: true, force: true }); + return { success: false, error: String(err) }; } - return emitterConfigs; } -function _getCmdList(spec: string, flags: RegenerateFlags): TspCommand[] { - return addOptions(spec, GENERATED_FOLDER, flags).map((option) => { - return { - outputDir: option.outputDir, - command: ["compile", spec, "--emit", toPosix(PLUGIN_DIR), ...option.options], + +async function runParallel(groups: TaskGroup[], maxJobs: number): Promise> { + const results = new Map(); + const executing: Set> = new Set(); + + // Count total tasks for progress + const totalTasks = groups.reduce((sum, g) => sum + g.tasks.length, 0); + let completed = 0; + + for (const group of groups) { + // Each group runs as a unit - tasks within a group run sequentially + // But different groups can run in parallel + const runGroup = async () => { + const specDir = group.spec.includes("azure") ? AZURE_HTTP_SPECS : HTTP_SPECS; + const shortName = toPosix(relative(specDir, dirname(group.spec))); + + // Run all tasks in this group sequentially to avoid state pollution + let groupSuccess = true; + for (const task of group.tasks) { + const packageName = (task.options["package-name"] as string) || shortName; + console.log(pc.blue(`[${completed + 1}/${totalTasks}] Compiling ${packageName}...`)); + + const result = await compileSpec(task); + completed++; + + if (result.success) { + console.log(pc.green(`[${completed}/${totalTasks}] ${packageName} succeeded`)); + } else { + console.log( + pc.red(`[${completed}/${totalTasks}] ${packageName} failed: ${result.error}`), + ); + groupSuccess = false; + } + } + + results.set(group.spec, groupSuccess); }; - }); -} -async function runTaskPool(tasks: Array<() => Promise>, poolLimit: number): Promise { - async function worker(start: number, end: number) { - while (start < end) { - await tasks[start](); - start++; + const p = runGroup().finally(() => executing.delete(p)); + executing.add(p); + + if (executing.size >= maxJobs) { + await Promise.race(executing); } } - const workers = []; - let start = 0; - while (start < tasks.length) { - const end = Math.min(start + poolLimit, tasks.length); - workers.push((async () => await worker(start, end))()); - start = end; - } - await Promise.all(workers); + await Promise.all(executing); + return results; } -// create some files before regeneration. After regeneration, these files should be deleted and we will test it -// in test case -async function preprocess(flags: RegenerateFlagsInput): Promise { - if (flags.flavor === "azure") { - // create folder if not exists - const folderParts = [ - "test", - "azure", - "generated", - "authentication-api-key", - "authentication", - "apikey", - "_operations", - ]; - await promises.mkdir(join(GENERATED_FOLDER, ...folderParts), { recursive: true }); - await promises.writeFile( - join(GENERATED_FOLDER, ...folderParts, "to_be_deleted.py"), - "# This file is to be deleted after regeneration", - ); - } +async function regenerateFlavor( + flavor: string, + name: string | undefined, + debug: boolean, + jobs: number, +): Promise { + console.log(pc.cyan(`\n${"=".repeat(60)}`)); + console.log(pc.cyan(`Regenerating ${flavor} flavor`)); + console.log(pc.cyan(`${"=".repeat(60)}\n`)); + + const flags: RegenerateFlags = { flavor, debug, name }; + + // Preprocess + await preprocess(flavor, GENERATED_FOLDER); + + // Collect specs + const azureSpecs = flavor === "azure" ? await getSubdirectories(AZURE_HTTP_SPECS, flags) : []; + const standardSpecs = await getSubdirectories(HTTP_SPECS, flags); + const allSpecs = [...azureSpecs, ...standardSpecs]; + + // Build task groups (tasks for same spec run sequentially to avoid state pollution) + const groups = buildTaskGroups(allSpecs, flags); + const totalTasks = groups.reduce((sum, g) => sum + g.tasks.length, 0); + + console.log(pc.cyan(`Found ${allSpecs.length} specs (${totalTasks} total tasks) to compile`)); + console.log(pc.cyan(`Using ${jobs} parallel jobs\n`)); + + // Run compilation + const startTime = performance.now(); + const results = await runParallel(groups, jobs); + const duration = (performance.now() - startTime) / 1000; + + // Summary + const succeeded = Array.from(results.values()).filter((v) => v).length; + const failed = results.size - succeeded; + + console.log(pc.cyan(`\n${"=".repeat(60)}`)); + console.log(pc.cyan(`Results: ${succeeded} succeeded, ${failed} failed`)); + console.log(pc.cyan(`Time: ${duration.toFixed(1)}s`)); + console.log(pc.cyan(`${"=".repeat(60)}\n`)); + + return failed === 0; } -async function regenerate(flags: RegenerateFlagsInput): Promise { - if (flags.flavor === undefined) { - await regenerate({ flavor: "azure", ...flags }); - await regenerate({ flavor: "unbranded", ...flags }); +async function main() { + const isWindows = platform() === "win32"; + const flavor = argv.values.flavor; + const name = argv.values.name; + const debug = argv.values.debug ?? false; + // Windows has slower file system operations and process spawning, + // so use fewer parallel jobs to avoid I/O contention and memory pressure + const defaultJobs = isWindows ? 10 : 30; + const jobs = argv.values.jobs ? parseInt(argv.values.jobs, 10) : defaultJobs; + + console.log(pc.cyan(`\nRegeneration config:`)); + console.log(pc.cyan(` Platform: ${isWindows ? "Windows" : "Unix"}`)); + console.log(pc.cyan(` Mode: in-process compilation`)); + console.log(pc.cyan(` Jobs: ${jobs}`)); + if (name) { + console.log(pc.cyan(` Filter: ${name}`)); + } + console.log(); + + const startTime = performance.now(); + let success: boolean; + + if (flavor) { + success = await regenerateFlavor(flavor, name, debug, jobs); } else { - await preprocess(flags); - - const flagsResolved = { debug: false, flavor: flags.flavor, ...flags }; - const subdirectoriesForAzure = await getSubdirectories(AZURE_HTTP_SPECS, flagsResolved); - const subdirectoriesForNonAzure = await getSubdirectories(HTTP_SPECS, flagsResolved); - const subdirectories = - flags.flavor === "azure" - ? [...subdirectoriesForAzure, ...subdirectoriesForNonAzure] - : subdirectoriesForNonAzure; - const cmdList: TspCommand[] = subdirectories.flatMap((subdirectory) => - _getCmdList(subdirectory, flagsResolved), - ); - - // Create tasks as functions for the pool - const tasks: Array<() => Promise> = cmdList.map((tspCommand) => { - return () => executeCommand(tspCommand); - }); - - // Run tasks with a concurrency limit - await runTaskPool(tasks, 30); + // Both flavors + const azureSuccess = await regenerateFlavor("azure", name, debug, jobs); + const unbrandedSuccess = await regenerateFlavor("unbranded", name, debug, jobs); + success = azureSuccess && unbrandedSuccess; } + + const totalDuration = (performance.now() - startTime) / 1000; + console.log( + success + ? pc.green(`\nRegeneration completed successfully in ${totalDuration.toFixed(1)}s`) + : pc.red(`\nRegeneration failed after ${totalDuration.toFixed(1)}s`), + ); + + process.exit(success ? 0 : 1); } -const start = performance.now(); -regenerate(argv.values) - .then(() => - console.log( - chalk.green( - `Regeneration successful, time taken: ${Math.round((performance.now() - start) / 1000)} s`, - ), - ), - ) - .catch((error) => console.error(chalk.red(`Regeneration failed: ${error.message}`))); +main().catch((err) => { + console.error(pc.red(`Fatal error: ${err}`)); + process.exit(1); +}); diff --git a/packages/http-client-python/eng/scripts/ci/run-ci.ts b/packages/http-client-python/eng/scripts/ci/run-ci.ts deleted file mode 100644 index 11ae7456315..00000000000 --- a/packages/http-client-python/eng/scripts/ci/run-ci.ts +++ /dev/null @@ -1,89 +0,0 @@ -/* eslint-disable no-console */ -import { execSync } from "child_process"; -import fs, { readFileSync } from "fs"; -import { platform } from "os"; -import { dirname, join } from "path"; -import { fileURLToPath } from "url"; -import { parseArgs } from "util"; - -const root = join(dirname(fileURLToPath(import.meta.url)), "../../../"); - -const argv = parseArgs({ - args: process.argv.slice(2), - options: { - validFolders: { type: "string", required: true, multiple: true }, - flavor: { type: "string" }, - command: { type: "string" }, - name: { type: "string" }, - testFolder: { type: "string" }, - }, -}); - -const foldersToProcess = argv.values.flavor - ? [argv.values.flavor] - : argv.values.validFolders || ["azure", "unbranded"]; - -const commandToRun = argv.values.command || "ci"; -const TEST_FOLDER = argv.values.testFolder || "generator/test"; - -function getCommand(command: string, flavor: string, name?: string): string { - let retval: string; - if (platform() === "win32") { - retval = `set FOLDER=${flavor} && ${venvPath} -m tox -c ./${TEST_FOLDER}/${flavor}/tox.ini -e ${command}`; - } else { - // Linux and macOS - retval = `FOLDER=${flavor} ${venvPath} -m tox -c ./${TEST_FOLDER}/${flavor}/tox.ini -e ${command}`; - } - if (name) { - return `${retval} -- -f ${name}`; - } - return retval; -} - -function sectionExistsInToxIni(command: string, flavor: string): boolean { - const toxIniPath = join(root, `${TEST_FOLDER}/${flavor}/tox.ini`); - const toxIniContent = readFileSync(toxIniPath, "utf-8"); - return command - .split(",") - .map((c) => `[testenv:${c}]`) - .every((section) => toxIniContent.includes(section)); -} - -function myExecSync(command: string, flavor: string, name?: string): void { - if (!sectionExistsInToxIni(command, flavor)) { - console.log(`No section for ${command} in tox.ini for flavor ${flavor}. Skipping...`); - return; - } - execSync(getCommand(command, flavor, name), { stdio: "inherit" }); - execSync(getCommand(command, "unittests", name), { stdio: "inherit" }); -} - -let venvPath = join(root, "venv"); -if (fs.existsSync(join(venvPath, "bin"))) { - venvPath = join(venvPath, "bin", "python"); -} else if (fs.existsSync(join(venvPath, "Scripts"))) { - venvPath = join(venvPath, "Scripts", "python.exe"); -} else { - throw new Error("Virtual environment doesn't exist."); -} - -foldersToProcess.forEach((flavor) => { - try { - if (getCommand(commandToRun, flavor, argv.values.name)) { - console.log(`Running ${commandToRun} for flavor ${flavor}...`); - myExecSync(commandToRun, flavor, argv.values.name); - } else { - console.error(`Error: Unknown command '${commandToRun}'.`); - process.exit(1); - } - } catch (error) { - const message = (error as Error).message; - if (message.includes("pyright") || message.includes("mypy") || message.includes("lint")) { - // fixing linting issues that come from upgrading python version in separate pr - process.exit(0); - } - console.error(message); - console.error(`Error executing command for flavor ${flavor}: ${message}`); - process.exit(1); - } -}); diff --git a/packages/http-client-python/eng/scripts/ci/run-tests.ts b/packages/http-client-python/eng/scripts/ci/run-tests.ts new file mode 100644 index 00000000000..c5409113dff --- /dev/null +++ b/packages/http-client-python/eng/scripts/ci/run-tests.ts @@ -0,0 +1,402 @@ +/* eslint-disable no-console */ +import { ChildProcess, spawn } from "child_process"; +import fs from "fs"; +import { cpus } from "os"; +import { dirname, join } from "path"; +import pc from "picocolors"; +import { fileURLToPath } from "url"; +import { parseArgs } from "util"; + +const root = join(dirname(fileURLToPath(import.meta.url)), "../../../"); +const monorepoRoot = join(root, "../../"); +const testsDir = join(root, "tests"); + +const argv = parseArgs({ + args: process.argv.slice(2), + options: { + emitter: { type: "boolean", short: "e" }, + generator: { type: "boolean", short: "g" }, + flavor: { type: "string", short: "f", default: "all" }, + env: { type: "string" }, + jobs: { type: "string", short: "j" }, + name: { type: "string", short: "n" }, + quiet: { type: "boolean", short: "q", default: false }, + help: { type: "boolean", short: "h", default: false }, + }, +}); + +if (argv.values.help) { + console.log(` +Usage: run-tests.ts [options] + +Options: + -e, --emitter Run TypeScript emitter tests (vitest) + -g, --generator Run Python generator tests (tox) + -f, --flavor SDK flavor to test (only applies to --generator) + If not specified, tests both flavors + --env Specific tox environments to run + Available: test, lint, mypy, pyright, docs, ci, unittest + -j, --jobs Number of parallel jobs (default: CPU cores - 2) + -n, --name Filter tests by name pattern + -q, --quiet Suppress test output (only show pass/fail summary) + -h, --help Show this help message + +Environments (for --generator): + test Run pytest tests for generated packages + lint Run pylint on generated packages + mypy Run mypy type checking on generated packages + pyright Run pyright type checking on generated packages + docs Run documentation validation (apiview, sphinx) + ci Run all checks (test + lint + mypy + pyright) + unittest Run unit tests for pygen internals + +Examples: + run-tests.ts # Run all tests (emitter + generator) + run-tests.ts --emitter # Run only emitter tests + run-tests.ts --generator # Run generator tests for all flavors + run-tests.ts --generator --flavor=azure # Run generator tests for azure only + run-tests.ts -g -f azure --env=test # Run pytest for azure only + run-tests.ts -g --env=mypy # Run mypy for all flavors + run-tests.ts -g -f unbranded --env=lint # Run pylint for unbranded only +`); + process.exit(0); +} + +// Get Python venv path +function getVenvPython(): string { + const venvPath = join(root, "venv"); + if (fs.existsSync(join(venvPath, "bin"))) { + return join(venvPath, "bin", "python"); + } else if (fs.existsSync(join(venvPath, "Scripts"))) { + return join(venvPath, "Scripts", "python.exe"); + } + throw new Error("Virtual environment not found. Run 'npm run install' first."); +} + +interface ToxResult { + env: string; + success: boolean; + duration: number; + error?: string; +} + +async function runToxEnv(env: string, pythonPath: string, name?: string): Promise { + const startTime = Date.now(); + const toxIniPath = join(testsDir, "tox.ini"); + + // Build command + const args = ["-m", "tox", "-c", toxIniPath, "-e", env]; + if (name) { + args.push("--", "-k", name); + } + + console.log(`${pc.blue("[START]")} ${env}`); + + return new Promise((resolve) => { + const proc: ChildProcess = spawn(pythonPath, args, { + cwd: testsDir, + stdio: !argv.values.quiet ? "inherit" : "pipe", + env: { ...process.env, FOLDER: env.split("-")[1] || "azure" }, + }); + + let stderr = ""; + if (argv.values.quiet && proc.stderr) { + proc.stderr.on("data", (data) => { + stderr += data.toString(); + }); + } + + proc.on("close", (code) => { + const duration = (Date.now() - startTime) / 1000; + const success = code === 0; + + if (success) { + console.log(`${pc.green("[PASS]")} ${env} (${duration.toFixed(1)}s)`); + } else { + console.log(`${pc.red("[FAIL]")} ${env} (${duration.toFixed(1)}s)`); + } + + resolve({ + env, + success, + duration, + error: success ? undefined : stderr || `Exit code: ${code}`, + }); + }); + + proc.on("error", (err) => { + const duration = (Date.now() - startTime) / 1000; + console.log(`${pc.red("[ERROR]")} ${env}: ${err.message}`); + resolve({ + env, + success: false, + duration, + error: err.message, + }); + }); + }); +} + +async function runParallel( + envs: string[], + pythonPath: string, + maxJobs: number, + name?: string, +): Promise { + const results: ToxResult[] = []; + const running: Map> = new Map(); + + for (const env of envs) { + // Wait if we're at max capacity + if (running.size >= maxJobs) { + const completed = await Promise.race(running.values()); + results.push(completed); + running.delete(completed.env); + } + + // Start new task + const task = runToxEnv(env, pythonPath, name); + running.set(env, task); + } + + // Wait for remaining tasks + const remaining = await Promise.all(running.values()); + results.push(...remaining); + + return results; +} + +async function _runSequential( + envs: string[], + pythonPath: string, + name?: string, +): Promise { + const results: ToxResult[] = []; + for (const env of envs) { + const result = await runToxEnv(env, pythonPath, name); + results.push(result); + } + return results; +} + +function printSummary(results: ToxResult[]): void { + console.log("\n" + pc.bold("═".repeat(60))); + console.log(pc.bold(" Test Results Summary")); + console.log(pc.bold("═".repeat(60)) + "\n"); + + const passed = results.filter((r) => r.success); + const failed = results.filter((r) => !r.success); + const totalDuration = results.reduce((sum, r) => sum + r.duration, 0); + + for (const result of results) { + const status = result.success ? pc.green("PASS") : pc.red("FAIL"); + console.log(` ${status} ${result.env} (${result.duration.toFixed(1)}s)`); + } + + console.log("\n" + "─".repeat(60)); + console.log( + ` ${pc.green(`Passed: ${passed.length}`)} ` + + `${pc.red(`Failed: ${failed.length}`)} ` + + `Total: ${results.length} ` + + `Duration: ${totalDuration.toFixed(1)}s`, + ); + console.log("─".repeat(60) + "\n"); + + if (failed.length > 0) { + console.log(pc.red("Failed environments:")); + for (const result of failed) { + console.log(` - ${result.env}`); + if (result.error && !argv.values.quiet) { + console.log(` ${result.error.split("\n").slice(0, 5).join("\n ")}`); + } + } + console.log(); + } +} + +async function runEmitterTests(): Promise { + const startTime = Date.now(); + console.log(`${pc.blue("[START]")} emitter (vitest)`); + + // Add node_modules/.bin directories to PATH so vitest can be found + const pathSep = process.platform === "win32" ? ";" : ":"; + const binPaths = [ + join(root, "node_modules", ".bin"), + join(monorepoRoot, "node_modules", ".bin"), + ].join(pathSep); + const env = { + ...process.env, + PATH: `${binPaths}${pathSep}${process.env.PATH}`, + }; + + return new Promise((resolve) => { + const proc: ChildProcess = spawn("vitest", ["run", "-c", "./emitter/vitest.config.ts"], { + cwd: root, + stdio: !argv.values.quiet ? "inherit" : "pipe", + shell: true, + env, + }); + + let stderr = ""; + if (argv.values.quiet && proc.stderr) { + proc.stderr.on("data", (data) => { + stderr += data.toString(); + }); + } + + proc.on("close", (code) => { + const duration = (Date.now() - startTime) / 1000; + const success = code === 0; + + if (success) { + console.log(`${pc.green("[PASS]")} emitter (vitest) (${duration.toFixed(1)}s)`); + } else { + console.log(`${pc.red("[FAIL]")} emitter (vitest) (${duration.toFixed(1)}s)`); + } + + resolve({ + env: "emitter (vitest)", + success, + duration, + error: success ? undefined : stderr || `Exit code: ${code}`, + }); + }); + + proc.on("error", (err) => { + const duration = (Date.now() - startTime) / 1000; + console.log(`${pc.red("[ERROR]")} emitter (vitest): ${err.message}`); + resolve({ + env: "emitter (vitest)", + success: false, + duration, + error: err.message, + }); + }); + }); +} + +async function main(): Promise { + const startTime = Date.now(); + + const runEmitter = argv.values.emitter; + const runGenerator = argv.values.generator; + const runBoth = !runEmitter && !runGenerator; + + const allResults: ToxResult[] = []; + + // Header + console.log(pc.cyan("\n╔══════════════════════════════════════════════════════════╗")); + console.log( + pc.cyan("║") + + pc.bold(" TypeSpec Python SDK Generator Tests ") + + pc.cyan("║"), + ); + console.log(pc.cyan("╚══════════════════════════════════════════════════════════╝") + "\n"); + + // Run emitter tests if requested + if (runEmitter || runBoth) { + console.log(`${pc.bold("=== Emitter Tests (TypeScript) ===")}\n`); + const emitterResult = await runEmitterTests(); + allResults.push(emitterResult); + } + + // Run generator tests if requested + if (runGenerator || runBoth) { + console.log(`\n${pc.bold("=== Generator Tests (Python) ===")}\n`); + + // Determine flavors + const flavors = argv.values.flavor === "all" ? ["azure", "unbranded"] : [argv.values.flavor!]; + + // Determine environments + let baseEnvs: string[]; + if (argv.values.env) { + baseEnvs = argv.values.env.split(",").map((e) => e.trim()); + } else { + // Default: run test environments + baseEnvs = ["test"]; + } + + // Expand 'ci' into its component environments for parallel execution + const expandedEnvs: string[] = []; + for (const env of baseEnvs) { + if (env === "ci") { + // Run test first (sequential), then lint/mypy/pyright/docs in parallel + expandedEnvs.push("test", "lint", "mypy", "pyright", "docs"); + } else { + expandedEnvs.push(env); + } + } + + // Build full environment list + const envs: string[] = []; + for (const env of expandedEnvs) { + if (env === "unittest") { + envs.push("unittest"); + } else { + for (const flavor of flavors) { + envs.push(`${env}-${flavor}`); + } + } + } + + // Get Python path + let pythonPath: string; + try { + pythonPath = getVenvPython(); + } catch (error) { + console.error(pc.red((error as Error).message)); + process.exit(1); + } + + // Separate test environments from other environments + // Test environments must run sequentially (they share port 3000) + // Other environments (lint, mypy, pyright, docs) can run in parallel + const testEnvs = envs.filter((e) => e.startsWith("test-") || e === "unittest"); + const otherEnvs = envs.filter((e) => !e.startsWith("test-") && e !== "unittest"); + + const maxJobs = argv.values.jobs + ? parseInt(argv.values.jobs, 10) + : Math.max(2, cpus().length - 2); + + console.log(` Flavors: ${flavors.join(", ")}`); + console.log(` Environments: ${envs.join(", ")}`); + console.log(` Jobs: ${maxJobs} (test envs run sequentially, others in parallel)`); + if (argv.values.name) { + console.log(` Filter: ${argv.values.name}`); + } + console.log(); + + // Run test environments first (sequentially) + let results: ToxResult[] = []; + if (testEnvs.length > 0) { + console.log(pc.cyan("Running test environments (sequential)...")); + results = await runParallel(testEnvs, pythonPath, 1, argv.values.name); + } + + // Run other environments in parallel + if (otherEnvs.length > 0) { + console.log(pc.cyan("\nRunning lint/typecheck environments (parallel)...")); + const otherResults = await runParallel(otherEnvs, pythonPath, maxJobs, argv.values.name); + results = results.concat(otherResults); + } + + allResults.push(...results); + } + + // Print summary + printSummary(allResults); + + const totalDuration = (Date.now() - startTime) / 1000; + console.log(`Total execution time: ${totalDuration.toFixed(1)}s\n`); + + // Exit with appropriate code + const failed = allResults.filter((r) => !r.success); + if (failed.length > 0) { + process.exit(1); + } +} + +main().catch((error) => { + console.error(`${pc.red("Unexpected error:")}`, error); + process.exit(1); +}); diff --git a/packages/http-client-python/eng/scripts/ci/run_mypy.py b/packages/http-client-python/eng/scripts/ci/run_mypy.py index 72a4d477666..ce78ffb7db6 100644 --- a/packages/http-client-python/eng/scripts/ci/run_mypy.py +++ b/packages/http-client-python/eng/scripts/ci/run_mypy.py @@ -18,11 +18,12 @@ def get_config_file_location(): - mypy_ini_path = os.path.join(os.getcwd(), "../../eng/scripts/ci/mypy.ini") + # When running from tests/ directory via tox + mypy_ini_path = os.path.join(os.getcwd(), "../eng/scripts/ci/config/mypy.ini") if os.path.exists(mypy_ini_path): return mypy_ini_path - else: - return os.path.join(os.getcwd(), "../../../eng/scripts/ci/mypy.ini") + # Fallback for running from different directories + return os.path.join(os.path.dirname(__file__), "config/mypy.ini") def _single_dir_mypy(mod): diff --git a/packages/http-client-python/eng/scripts/ci/run_pylint.py b/packages/http-client-python/eng/scripts/ci/run_pylint.py index 370cf605129..bfe7296293f 100644 --- a/packages/http-client-python/eng/scripts/ci/run_pylint.py +++ b/packages/http-client-python/eng/scripts/ci/run_pylint.py @@ -18,11 +18,12 @@ def get_rfc_file_location(): - rfc_file_location = os.path.join(os.getcwd(), "../../../eng/scripts/ci/pylintrc") + # When running from tests/ directory via tox + rfc_file_location = os.path.join(os.getcwd(), "../eng/scripts/ci/config/pylintrc") if os.path.exists(rfc_file_location): return rfc_file_location - else: - return os.path.join(os.getcwd(), "../../../../eng/scripts/ci/pylintrc") + # Fallback for running from different directories + return os.path.join(os.path.dirname(__file__), "config/pylintrc") def _single_dir_pylint(mod): diff --git a/packages/http-client-python/eng/scripts/ci/run_pyright.py b/packages/http-client-python/eng/scripts/ci/run_pyright.py index c81e225b9cd..a86ccc2b3cd 100644 --- a/packages/http-client-python/eng/scripts/ci/run_pyright.py +++ b/packages/http-client-python/eng/scripts/ci/run_pyright.py @@ -19,11 +19,12 @@ def get_pyright_config_file_location(): - pyright_config = os.path.join(os.getcwd(), "../../eng/scripts/ci/pyrightconfig.json") + # When running from tests/ directory via tox + pyright_config = os.path.join(os.getcwd(), "../eng/scripts/ci/config/pyrightconfig.json") if os.path.exists(pyright_config): return pyright_config - else: - return os.path.join(os.getcwd(), "../../../eng/scripts/ci/pyrightconfig.json") + # Fallback for running from different directories + return os.path.join(os.path.dirname(__file__), "config/pyrightconfig.json") def _single_dir_pyright(mod): diff --git a/packages/http-client-python/eng/scripts/ci/typecheck.ts b/packages/http-client-python/eng/scripts/ci/typecheck.ts new file mode 100644 index 00000000000..ff794d418ec --- /dev/null +++ b/packages/http-client-python/eng/scripts/ci/typecheck.ts @@ -0,0 +1,225 @@ +/* eslint-disable no-console */ +import { spawn } from "child_process"; +import fs from "fs"; +import { dirname, join } from "path"; +import pc from "picocolors"; +import { fileURLToPath } from "url"; +import { parseArgs } from "util"; + +const root = join(dirname(fileURLToPath(import.meta.url)), "../../../"); +const testsDir = join(root, "tests"); + +// Get Python venv path +function getVenvPython(): string { + const venvPath = join(root, "venv"); + if (fs.existsSync(join(venvPath, "bin"))) { + return join(venvPath, "bin", "python"); + } else if (fs.existsSync(join(venvPath, "Scripts"))) { + return join(venvPath, "Scripts", "python.exe"); + } + throw new Error("Virtual environment not found. Run 'npm run install' first."); +} + +const argv = parseArgs({ + args: process.argv.slice(2), + options: { + generated: { type: "boolean" }, + flavor: { type: "string", short: "f" }, + mypy: { type: "boolean" }, + pyright: { type: "boolean" }, + help: { type: "boolean", short: "h" }, + }, +}); + +if (argv.values.help) { + console.log(` +${pc.bold("Usage:")} tsx typecheck.ts [options] + +${pc.bold("Description:")} + Run type checking (mypy + pyright) on Python code. + +${pc.bold("Options:")} + ${pc.cyan("--generated")} + Run type checking on generated SDK packages (via tox). + Use with --flavor to specify azure or unbranded. + + ${pc.cyan("-f, --flavor ")} + SDK flavor to check (only applies to --generated). + If not specified, checks both flavors. + + ${pc.cyan("--mypy")} + Run only mypy (skip pyright). + + ${pc.cyan("--pyright")} + Run only pyright (skip mypy). + + ${pc.cyan("-h, --help")} + Show this help message. + +${pc.bold("Examples:")} + ${pc.dim("# Type check pygen source (default - runs both mypy and pyright)")} + tsx typecheck.ts + + ${pc.dim("# Run only mypy on pygen source")} + tsx typecheck.ts --mypy + + ${pc.dim("# Run only pyright on pygen source")} + tsx typecheck.ts --pyright + + ${pc.dim("# Type check generated SDK packages")} + tsx typecheck.ts --generated + + ${pc.dim("# Type check generated SDK packages for azure only")} + tsx typecheck.ts --generated --flavor=azure +`); + process.exit(0); +} + +function runCommand(command: string, args: string[], cwd?: string): Promise { + return new Promise((resolve) => { + console.log(`${pc.cyan("[RUN]")} ${command} ${args.join(" ")}`); + const proc = spawn(command, args, { + cwd: cwd || root, + stdio: "inherit", + shell: true, + }); + + proc.on("close", (code) => { + if (code === 0) { + console.log(`${pc.green("[PASS]")} ${command} completed successfully`); + resolve(true); + } else { + console.log(`${pc.red("[FAIL]")} ${command} failed with code ${code}`); + resolve(false); + } + }); + + proc.on("error", (err) => { + console.log(`${pc.red("[ERROR]")} ${command}: ${err.message}`); + resolve(false); + }); + }); +} + +async function runMypyOnPygen(): Promise { + console.log(`\n${pc.bold("=== Running mypy on pygen ===")}\n`); + + let pythonPath: string; + try { + pythonPath = getVenvPython(); + } catch (error) { + console.error(pc.red((error as Error).message)); + return false; + } + + return runCommand(pythonPath, [ + "-m", + "mypy", + "generator/pygen", + "--config-file=eng/scripts/ci/config/mypy.ini", + "--ignore-missing", + ]); +} + +async function runPyrightOnPygen(): Promise { + console.log(`\n${pc.bold("=== Running pyright on pygen ===")}\n`); + + let pythonPath: string; + try { + pythonPath = getVenvPython(); + } catch (error) { + console.error(pc.red((error as Error).message)); + return false; + } + + return runCommand(pythonPath, [ + "-m", + "pyright", + "-p", + "eng/scripts/ci/config/pyrightconfig.json", + "generator/pygen", + ]); +} + +async function runTypecheckOnGenerated( + flavor?: string, + mypyOnly?: boolean, + pyrightOnly?: boolean, +): Promise { + const flavors = flavor ? [flavor] : ["azure", "unbranded"]; + console.log( + `\n${pc.bold(`=== Type Checking Generated SDK Packages (${flavors.join(", ")}) ===`)}\n`, + ); + + let pythonPath: string; + try { + pythonPath = getVenvPython(); + } catch (error) { + console.error(pc.red((error as Error).message)); + return false; + } + + let success = true; + + for (const f of flavors) { + if (!pyrightOnly) { + const mypyEnv = `mypy-${f}`; + const result = await runCommand( + pythonPath, + ["-m", "tox", "-c", "tox.ini", "-e", mypyEnv], + testsDir, + ); + if (!result) success = false; + } + + if (!mypyOnly) { + const pyrightEnv = `pyright-${f}`; + const result = await runCommand( + pythonPath, + ["-m", "tox", "-c", "tox.ini", "-e", pyrightEnv], + testsDir, + ); + if (!result) success = false; + } + } + + return success; +} + +async function main(): Promise { + const runGenerated = argv.values.generated; + const mypyOnly = argv.values.mypy && !argv.values.pyright; + const pyrightOnly = argv.values.pyright && !argv.values.mypy; + + // If --generated is specified, type check generated packages + if (runGenerated) { + const result = await runTypecheckOnGenerated(argv.values.flavor, mypyOnly, pyrightOnly); + if (!result) process.exit(1); + console.log(`\n${pc.green(pc.bold("Generated SDK type checking complete!"))}\n`); + return; + } + + // Default: type check pygen source + let success = true; + + if (!pyrightOnly) { + const mypyResult = await runMypyOnPygen(); + if (!mypyResult) success = false; + } + + if (!mypyOnly) { + const pyrightResult = await runPyrightOnPygen(); + if (!pyrightResult) success = false; + } + + if (!success) { + process.exit(1); + } + + console.log(`\n${pc.green(pc.bold("All type checks passed!"))}\n`); +} + +main().catch((error) => { + console.error(`${pc.red("Unexpected error:")}`, error); + process.exit(1); +}); diff --git a/packages/http-client-python/eng/scripts/ci/util.py b/packages/http-client-python/eng/scripts/ci/util.py index 6ebbe842d54..f15165f6937 100644 --- a/packages/http-client-python/eng/scripts/ci/util.py +++ b/packages/http-client-python/eng/scripts/ci/util.py @@ -12,7 +12,7 @@ logging.getLogger().setLevel(logging.INFO) -ROOT_FOLDER = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "..", "generator")) +ROOT_FOLDER = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "generator")) IGNORE_FOLDER = [] diff --git a/packages/http-client-python/eng/scripts/ci/utils.ts b/packages/http-client-python/eng/scripts/ci/utils.ts index 118b09c60da..32bbc4b0ca7 100644 --- a/packages/http-client-python/eng/scripts/ci/utils.ts +++ b/packages/http-client-python/eng/scripts/ci/utils.ts @@ -1,8 +1,8 @@ /* eslint-disable no-console */ -import chalk from "chalk"; import { execFile } from "child_process"; import { existsSync } from "fs"; import { dirname, join, resolve } from "path"; +import pc from "picocolors"; import process from "process"; import { fileURLToPath } from "url"; import { parseArgs, promisify } from "util"; @@ -21,11 +21,11 @@ export async function executeCommand(command: string, args: string[]) { const execFileAsync = promisify(execFile); try { await execFileAsync(command, args, { shell: true }); - console.log(chalk.green(`${command} passed`)); + console.log(pc.green(`${command} passed`)); } catch (err: any) { - console.error(chalk.red(`Error executing ${command}`)); - if (err.stdout) console.error(chalk.yellow("STDOUT:"), err.stdout); - if (err.stderr) console.error(chalk.yellow("STDERR:"), err.stderr); + console.error(pc.red(`Error executing ${command}`)); + if (err.stdout) console.error(pc.yellow("STDOUT:"), err.stdout); + if (err.stderr) console.error(pc.yellow("STDERR:"), err.stderr); process.exit(1); } } diff --git a/packages/http-client-python/eng/scripts/setup/build.ts b/packages/http-client-python/eng/scripts/setup/build.ts index c13770edeb8..71c258e68c6 100644 --- a/packages/http-client-python/eng/scripts/setup/build.ts +++ b/packages/http-client-python/eng/scripts/setup/build.ts @@ -4,7 +4,7 @@ import { runPython3 } from "./run-python3.js"; async function main() { await runPython3("./eng/scripts/setup/build_pygen_wheel.py"); // remove the venv_build_wheel directory - exec("rimraf ./venv_build_wheel", (error, stdout, stderr) => { + exec("rimraf ./venv_build_wheel", (error, stdout, _stderr) => { if (error) { console.error(`Error executing command: ${error.message}`); // eslint-disable-line no-console return; diff --git a/packages/http-client-python/eng/scripts/setup/build_pygen_wheel.py b/packages/http-client-python/eng/scripts/setup/build_pygen_wheel.py index ceb7ce4846d..74687b91167 100644 --- a/packages/http-client-python/eng/scripts/setup/build_pygen_wheel.py +++ b/packages/http-client-python/eng/scripts/setup/build_pygen_wheel.py @@ -25,6 +25,7 @@ from venvtools import python_run from package_manager import install_packages, create_venv_with_package_manager +# eng/scripts/setup/build_pygen_wheel.py -> need to go up 4 levels to get to package root _ROOT_DIR = Path(__file__).parent.parent.parent.parent diff --git a/packages/http-client-python/eng/scripts/setup/install.py b/packages/http-client-python/eng/scripts/setup/install.py index 4aa0a32f6c1..8a3532f1ab9 100644 --- a/packages/http-client-python/eng/scripts/setup/install.py +++ b/packages/http-client-python/eng/scripts/setup/install.py @@ -38,6 +38,7 @@ from pathlib import Path +# eng/scripts/setup/install.py -> need to go up 4 levels to get to package root _ROOT_DIR = Path(__file__).parent.parent.parent.parent diff --git a/packages/http-client-python/eng/scripts/setup/package_manager.py b/packages/http-client-python/eng/scripts/setup/package_manager.py index 87235ef690a..3b6698279d9 100644 --- a/packages/http-client-python/eng/scripts/setup/package_manager.py +++ b/packages/http-client-python/eng/scripts/setup/package_manager.py @@ -25,7 +25,7 @@ def _check_command_available(command: str) -> bool: try: subprocess.run([command, "--version"], capture_output=True, check=True) return True - except (subprocess.CalledProcessError, FileNotFoundError): + except (subprocess.CalledProcessError, FileNotFoundError, PermissionError): return False @@ -50,7 +50,7 @@ def detect_package_manager() -> str: try: subprocess.run([sys.executable, "-m", "pip", "--version"], capture_output=True, check=True) return "python -m pip" - except (subprocess.CalledProcessError, FileNotFoundError): + except (subprocess.CalledProcessError, FileNotFoundError, PermissionError): pass raise PackageManagerNotFoundError("No suitable package manager found. Please install either uv or pip.") diff --git a/packages/http-client-python/eng/scripts/setup/prepare.py b/packages/http-client-python/eng/scripts/setup/prepare.py index 358baa0d338..ff405d552df 100644 --- a/packages/http-client-python/eng/scripts/setup/prepare.py +++ b/packages/http-client-python/eng/scripts/setup/prepare.py @@ -15,6 +15,7 @@ from pathlib import Path from package_manager import create_venv_with_package_manager, install_packages +# eng/scripts/setup/prepare.py -> need to go up 4 levels to get to package root _ROOT_DIR = Path(__file__).parent.parent.parent.parent diff --git a/packages/http-client-python/eng/scripts/setup/prepare.ts b/packages/http-client-python/eng/scripts/setup/prepare.ts index 32d9157a243..d3cea514a62 100644 --- a/packages/http-client-python/eng/scripts/setup/prepare.ts +++ b/packages/http-client-python/eng/scripts/setup/prepare.ts @@ -3,7 +3,7 @@ import { runPython3 } from "./run-python3.js"; async function main() { try { await runPython3("./eng/scripts/setup/prepare.py"); - } catch (error) { + } catch { console.log("No Python found on your local environment. We will use Pyodide instead."); // eslint-disable-line no-console } } diff --git a/packages/http-client-python/eng/scripts/setup/run_tsp.py b/packages/http-client-python/eng/scripts/setup/run_tsp.py index 61f5a4e79b3..6d5d3247042 100644 --- a/packages/http-client-python/eng/scripts/setup/run_tsp.py +++ b/packages/http-client-python/eng/scripts/setup/run_tsp.py @@ -4,12 +4,12 @@ # license information. # -------------------------------------------------------------------------- import sys -import venv import logging from pathlib import Path from pygen import preprocess, codegen from pygen.utils import parse_args +# eng/scripts/setup/run_tsp.py -> need to go up 4 levels to get to package root _ROOT_DIR = Path(__file__).parent.parent.parent.parent _LOGGER = logging.getLogger(__name__) @@ -20,8 +20,8 @@ assert venv_preexists # Otherwise install was not done - env_builder = venv.EnvBuilder(with_pip=True) - venv_context = env_builder.ensure_directories(venv_path) + # Don't use EnvBuilder.ensure_directories() - it causes race conditions + # when multiple processes run in parallel. The venv already exists. if "--debug" in sys.argv or "--debug=true" in sys.argv: try: diff --git a/packages/http-client-python/eng/scripts/setup/system-requirements.ts b/packages/http-client-python/eng/scripts/setup/system-requirements.ts index 58e5c6b5f93..f47685db629 100644 --- a/packages/http-client-python/eng/scripts/setup/system-requirements.ts +++ b/packages/http-client-python/eng/scripts/setup/system-requirements.ts @@ -15,8 +15,12 @@ const execute = ( options.onCreate(cp); } - options.onStdOutData && cp.stdout.on("data", options.onStdOutData); - options.onStdErrData && cp.stderr.on("data", options.onStdErrData); + if (options.onStdOutData) { + cp.stdout.on("data", options.onStdOutData); + } + if (options.onStdErrData) { + cp.stderr.on("data", options.onStdErrData); + } let err = ""; let out = ""; @@ -33,7 +37,7 @@ const execute = ( cp.on("error", (err) => { reject(err); }); - cp.on("close", (code, signal) => + cp.on("close", (code, _signal) => resolve({ stdout: out, stderr: err, @@ -118,7 +122,7 @@ const tryPython = async ( `"${PRINT_PYTHON_VERSION_SCRIPT}"`, ]); return validateVersionRequirement(resolution, result.stdout.trim(), requirement); - } catch (e) { + } catch { return { error: true, ...resolution, diff --git a/packages/http-client-python/eng/scripts/setup/venvtools.py b/packages/http-client-python/eng/scripts/setup/venvtools.py index 74206ddc40b..c4afe0bcf84 100644 --- a/packages/http-client-python/eng/scripts/setup/venvtools.py +++ b/packages/http-client-python/eng/scripts/setup/venvtools.py @@ -9,6 +9,7 @@ from pathlib import Path +# eng/scripts/setup/venvtools.py -> need to go up 4 levels to get to package root _ROOT_DIR = Path(__file__).parent.parent.parent.parent diff --git a/packages/http-client-python/generator/pygen/codegen/models/client.py b/packages/http-client-python/generator/pygen/codegen/models/client.py index db339670760..fd0e25538dd 100644 --- a/packages/http-client-python/generator/pygen/codegen/models/client.py +++ b/packages/http-client-python/generator/pygen/codegen/models/client.py @@ -247,7 +247,7 @@ def has_non_abstract_operations(self) -> bool: def imports(self, async_mode: bool, **kwargs) -> FileImport: file_import = FileImport(self.code_model) - file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL) + file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.REGULAR) if self.code_model.options["azure-arm"]: file_import.add_submodule_import("azure.mgmt.core", self.pipeline_class(async_mode), ImportType.SDKCORE) else: @@ -307,20 +307,20 @@ def imports(self, async_mode: bool, **kwargs) -> FileImport: "rest", "AsyncHttpResponse", ImportType.SDKCORE, - TypingSection.CONDITIONAL, + TypingSection.REGULAR, ) else: file_import.add_submodule_import( "rest", "HttpResponse", ImportType.SDKCORE, - TypingSection.CONDITIONAL, + TypingSection.REGULAR, ) file_import.add_submodule_import( "rest", "HttpRequest", ImportType.SDKCORE, - TypingSection.CONDITIONAL, + TypingSection.REGULAR, ) serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace) for og in self.operation_groups: @@ -401,7 +401,7 @@ def imports(self, async_mode: bool, **kwargs) -> FileImport: "policies", ImportType.SDKCORE, ) - file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL) + file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.REGULAR) if self.code_model.options.get("package-version"): serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace) file_import.add_submodule_import( diff --git a/packages/http-client-python/generator/pygen/codegen/models/credential_types.py b/packages/http-client-python/generator/pygen/codegen/models/credential_types.py index a4da427e473..3bffb3f1aa6 100644 --- a/packages/http-client-python/generator/pygen/codegen/models/credential_types.py +++ b/packages/http-client-python/generator/pygen/codegen/models/credential_types.py @@ -213,6 +213,6 @@ def imports(self, **kwargs: Any) -> FileImport: "credentials", self.policy.credential_name, ImportType.SDKCORE, - typing_section=TypingSection.CONDITIONAL, + typing_section=TypingSection.REGULAR, ) return file_import diff --git a/packages/http-client-python/generator/pygen/codegen/models/enum_type.py b/packages/http-client-python/generator/pygen/codegen/models/enum_type.py index 6cd57c0d5d0..8a4171a0337 100644 --- a/packages/http-client-python/generator/pygen/codegen/models/enum_type.py +++ b/packages/http-client-python/generator/pygen/codegen/models/enum_type.py @@ -241,7 +241,7 @@ def imports(self, **kwargs: Any) -> FileImport: file_import = FileImport(self.code_model) file_import.merge(self.value_type.imports(**kwargs)) if self.code_model.options["models-mode"]: - file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.CONDITIONAL) + file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.REGULAR) serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace) relative_path = self.code_model.get_relative_import_path(serialize_namespace, self.client_namespace) diff --git a/packages/http-client-python/generator/pygen/codegen/models/imports.py b/packages/http-client-python/generator/pygen/codegen/models/imports.py index 4d11aec7153..89334963fc2 100644 --- a/packages/http-client-python/generator/pygen/codegen/models/imports.py +++ b/packages/http-client-python/generator/pygen/codegen/models/imports.py @@ -23,9 +23,8 @@ class ImportType(str, Enum): class TypingSection(str, Enum): - REGULAR = "regular" # this import is always a typing import - CONDITIONAL = "conditional" # is a typing import when we're dealing with files that py2 will use, else regular - TYPING = "typing" # never a typing import + REGULAR = "regular" # this import is always a regular import + TYPING = "typing" # this import goes under TYPE_CHECKING class MsrestImportType(Enum): diff --git a/packages/http-client-python/generator/pygen/codegen/models/lro_operation.py b/packages/http-client-python/generator/pygen/codegen/models/lro_operation.py index fac35074c5f..b7673d4d865 100644 --- a/packages/http-client-python/generator/pygen/codegen/models/lro_operation.py +++ b/packages/http-client-python/generator/pygen/codegen/models/lro_operation.py @@ -138,7 +138,7 @@ def imports(self, async_mode: bool, **kwargs: Any) -> FileImport: "_deserialize", ImportType.LOCAL, ) - file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.CONDITIONAL) + file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.REGULAR) file_import.add_submodule_import("typing", "cast", ImportType.STDLIB) return file_import diff --git a/packages/http-client-python/generator/pygen/codegen/models/model_type.py b/packages/http-client-python/generator/pygen/codegen/models/model_type.py index bb5966d3b39..d0784f81efb 100644 --- a/packages/http-client-python/generator/pygen/codegen/models/model_type.py +++ b/packages/http-client-python/generator/pygen/codegen/models/model_type.py @@ -270,7 +270,7 @@ def instance_check_template(self) -> str: def imports(self, **kwargs: Any) -> FileImport: file_import = FileImport(self.code_model) - file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL) + file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.REGULAR) file_import.define_mutable_mapping_type() if self.is_xml: file_import.add_submodule_import("xml.etree", "ElementTree", ImportType.STDLIB, alias="ET") @@ -351,7 +351,7 @@ def instance_check_template(self) -> str: def imports(self, **kwargs: Any) -> FileImport: file_import = super().imports(**kwargs) - file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL) + file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.REGULAR) return file_import diff --git a/packages/http-client-python/generator/pygen/codegen/models/operation.py b/packages/http-client-python/generator/pygen/codegen/models/operation.py index f5fb1c6241d..c5f15593893 100644 --- a/packages/http-client-python/generator/pygen/codegen/models/operation.py +++ b/packages/http-client-python/generator/pygen/codegen/models/operation.py @@ -284,6 +284,10 @@ def get_request_builder_import( def need_deserialize(self) -> bool: return any(r.type and not isinstance(r.type, BinaryIteratorType) for r in self.responses) + @property + def enable_import_deserialize_xml(self) -> bool: + return any(xml_serializable(str(r.default_content_type)) for r in self.responses + self.exceptions) + def imports( # pylint: disable=too-many-branches, disable=too-many-statements self, async_mode: bool, **kwargs: Any ) -> FileImport: @@ -292,11 +296,11 @@ def imports( # pylint: disable=too-many-branches, disable=too-many-statements serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace) file_import = FileImport(self.code_model) - file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL) + file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.REGULAR) response_types = [r.type_annotation(async_mode=async_mode, **kwargs) for r in self.responses if r.type] if len(set(response_types)) > 1: - file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.CONDITIONAL) + file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.REGULAR) if self.added_on: serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace) file_import.add_submodule_import( @@ -402,9 +406,9 @@ def imports( # pylint: disable=too-many-branches, disable=too-many-statements ImportType.SDKCORE, ) file_import.add_submodule_import("rest", "HttpRequest", ImportType.SDKCORE) - file_import.add_submodule_import("typing", "Callable", ImportType.STDLIB, TypingSection.CONDITIONAL) - file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB, TypingSection.CONDITIONAL) - file_import.add_submodule_import("typing", "TypeVar", ImportType.STDLIB, TypingSection.CONDITIONAL) + file_import.add_submodule_import("typing", "Callable", ImportType.STDLIB, TypingSection.REGULAR) + file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB, TypingSection.REGULAR) + file_import.add_submodule_import("typing", "TypeVar", ImportType.STDLIB, TypingSection.REGULAR) if self.code_model.options["tracing"] and self.want_tracing and not async_mode: file_import.add_submodule_import( "azure.core.tracing.decorator", @@ -443,23 +447,24 @@ def imports( # pylint: disable=too-many-branches, disable=too-many-statements ImportType.LOCAL, ) file_import.add_import("json", ImportType.STDLIB) - if any(xml_serializable(str(r.default_content_type)) for r in self.responses + self.exceptions): + if self.enable_import_deserialize_xml: file_import.add_submodule_import(relative_path, "_deserialize_xml", ImportType.LOCAL) - elif self.need_deserialize: + if any( + r.type + and not isinstance(r.type, BinaryIteratorType) + and not xml_serializable(str(r.default_content_type)) + for r in self.responses + ): file_import.add_submodule_import(relative_path, "_deserialize", ImportType.LOCAL) if self.default_error_deserialization(serialize_namespace) or self.non_default_errors: - xml_non_default_errors = any( - xml_serializable(str(e.default_content_type)) for e in self.non_default_errors - ) try: default_error = next(e for e in self.exceptions if "default" in e.status_codes and e.type) except StopIteration: default_error = None - if xml_non_default_errors or ( - default_error and xml_serializable(str(default_error.default_content_type)) - ): + all_errors = list(self.non_default_errors) + ([default_error] if default_error else []) + if any(xml_serializable(str(e.default_content_type)) for e in all_errors): file_import.add_submodule_import(relative_path, "_failsafe_deserialize_xml", ImportType.LOCAL) - else: + if any(not xml_serializable(str(e.default_content_type)) for e in all_errors): file_import.add_submodule_import(relative_path, "_failsafe_deserialize", ImportType.LOCAL) return file_import diff --git a/packages/http-client-python/generator/pygen/codegen/models/operation_group.py b/packages/http-client-python/generator/pygen/codegen/models/operation_group.py index 8bd9806adf1..5c0f467806c 100644 --- a/packages/http-client-python/generator/pygen/codegen/models/operation_group.py +++ b/packages/http-client-python/generator/pygen/codegen/models/operation_group.py @@ -195,7 +195,7 @@ def imports(self, async_mode: bool, **kwargs: Any) -> FileImport: ) if all(o.abstract for o in self.operations): return file_import - file_import.add_submodule_import("typing", "TypeVar", ImportType.STDLIB, TypingSection.CONDITIONAL) + file_import.add_submodule_import("typing", "TypeVar", ImportType.STDLIB, TypingSection.REGULAR) file_import.define_mypy_type("T", "TypeVar('T')") type_value = "Optional[Callable[[PipelineResponse[HttpRequest, {}HttpResponse], T, dict[str, Any]], Any]]" file_import.define_mypy_type("ClsType", type_value.format(""), type_value.format("Async")) diff --git a/packages/http-client-python/generator/pygen/codegen/models/paging_operation.py b/packages/http-client-python/generator/pygen/codegen/models/paging_operation.py index bba3a904f1c..f64363ed5fb 100644 --- a/packages/http-client-python/generator/pygen/codegen/models/paging_operation.py +++ b/packages/http-client-python/generator/pygen/codegen/models/paging_operation.py @@ -17,6 +17,7 @@ from .model_type import ModelType from .list_type import ListType from .parameter import Parameter +from ...utils import xml_serializable if TYPE_CHECKING: from .code_model import CodeModel @@ -135,6 +136,10 @@ def cls_type_annotation(self, *, async_mode: bool, **kwargs: Any) -> str: def has_optional_return_type(self) -> bool: return False + @property + def enable_import_deserialize_xml(self): + return any(xml_serializable(str(r.default_content_type)) for r in self.exceptions) + def imports(self, async_mode: bool, **kwargs: Any) -> FileImport: if self.abstract: return FileImport(self.code_model) @@ -145,11 +150,11 @@ def imports(self, async_mode: bool, **kwargs: Any) -> FileImport: f"{self.code_model.core_library}.{default_paging_submodule}", "AsyncItemPaged", ImportType.SDKCORE, - TypingSection.CONDITIONAL, + TypingSection.REGULAR, ) else: file_import.add_submodule_import( - f"{self.code_model.core_library}.paging", "ItemPaged", ImportType.SDKCORE, TypingSection.CONDITIONAL + f"{self.code_model.core_library}.paging", "ItemPaged", ImportType.SDKCORE, TypingSection.REGULAR ) if ( self.next_request_builder @@ -185,7 +190,6 @@ def imports(self, async_mode: bool, **kwargs: Any) -> FileImport: file_import.add_submodule_import(relative_path, "_deserialize", ImportType.LOCAL) if self.is_xml_paging: file_import.add_submodule_import("xml.etree", "ElementTree", ImportType.STDLIB, alias="ET") - file_import.add_submodule_import(relative_path, "_convert_element", ImportType.LOCAL) return file_import diff --git a/packages/http-client-python/generator/pygen/codegen/models/parameter.py b/packages/http-client-python/generator/pygen/codegen/models/parameter.py index d637e016446..bcca96fa75c 100644 --- a/packages/http-client-python/generator/pygen/codegen/models/parameter.py +++ b/packages/http-client-python/generator/pygen/codegen/models/parameter.py @@ -109,10 +109,16 @@ def description(self) -> str: if type_description: base_description = add_to_description(base_description, type_description) if self.optional and isinstance(self.type, ConstantType): - base_description = add_to_description( - base_description, - f"Known values are {self.get_declaration()} and None.", - ) + if self.is_api_version: + base_description = add_to_description( + base_description, + f"Known values are {self.get_declaration()}.", + ) + else: + base_description = add_to_description( + base_description, + f"Known values are {self.get_declaration()} and None.", + ) if not (self.optional or self.client_default_value): base_description = add_to_description(base_description, "Required.") if self.client_default_value is not None: diff --git a/packages/http-client-python/generator/pygen/codegen/models/primitive_types.py b/packages/http-client-python/generator/pygen/codegen/models/primitive_types.py index 6cf5271c336..5aced33eb61 100644 --- a/packages/http-client-python/generator/pygen/codegen/models/primitive_types.py +++ b/packages/http-client-python/generator/pygen/codegen/models/primitive_types.py @@ -139,7 +139,7 @@ def default_template_representation_declaration(self) -> str: def imports(self, **kwargs: Any) -> FileImport: file_import = FileImport(self.code_model) - file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL) + file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.REGULAR) return file_import @property diff --git a/packages/http-client-python/generator/pygen/codegen/models/request_builder.py b/packages/http-client-python/generator/pygen/codegen/models/request_builder.py index d89c58c4c48..66d1bbd0152 100644 --- a/packages/http-client-python/generator/pygen/codegen/models/request_builder.py +++ b/packages/http-client-python/generator/pygen/codegen/models/request_builder.py @@ -120,7 +120,7 @@ def imports(self, **kwargs) -> FileImport: "case_insensitive_dict", ImportType.SDKCORE, ) - file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, typing_section=TypingSection.CONDITIONAL) + file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, typing_section=TypingSection.REGULAR) file_import.add_msrest_import( serialize_namespace=kwargs.get("serialize_namespace", self.code_model.namespace), msrest_import_type=MsrestImportType.Serializer, diff --git a/packages/http-client-python/generator/pygen/codegen/serializers/__init__.py b/packages/http-client-python/generator/pygen/codegen/serializers/__init__.py index e7654299885..018605575c9 100644 --- a/packages/http-client-python/generator/pygen/codegen/serializers/__init__.py +++ b/packages/http-client-python/generator/pygen/codegen/serializers/__init__.py @@ -34,11 +34,7 @@ from .test_serializer import TestSerializer, TestGeneralSerializer from .types_serializer import TypesSerializer from ...utils import to_snake_case, VALID_PACKAGE_MODE -from .utils import ( - extract_sample_name, - get_namespace_from_package_name, - get_namespace_config, -) +from .utils import extract_sample_name, get_namespace_from_package_name, get_namespace_config, hash_file_import _LOGGER = logging.getLogger(__name__) @@ -486,6 +482,7 @@ def _serialize_and_write_utils_folder(self, env: Environment, namespace: str): def _serialize_and_write_top_level_folder(self, env: Environment, namespace: str) -> None: root_dir = self.code_model.get_root_dir() + generation_dir = self.code_model.get_generation_dir(namespace) # write _utils folder self._serialize_and_write_utils_folder(env, self.code_model.namespace) @@ -502,16 +499,18 @@ def _serialize_and_write_top_level_folder(self, env: Environment, namespace: str self.write_file(root_dir / Path("py.typed"), pytyped_value) # write _validation.py + # Use generation_dir so that relative imports from operations/clients + # within a generation-subdir resolve correctly. if any(og for client in self.code_model.clients for og in client.operation_groups if og.need_validation): self.write_file( - root_dir / Path("_validation.py"), + generation_dir / Path("_validation.py"), general_serializer.serialize_validation_file(), ) # write _types.py if self.code_model.named_unions: self.write_file( - root_dir / Path("_types.py"), + generation_dir / Path("_types.py"), TypesSerializer(code_model=self.code_model, env=env).serialize(), ) @@ -536,39 +535,72 @@ def sample_additional_folder(self) -> Path: def _generated_tests_samples_folder(self, folder_name: str) -> Path: return self._root_of_sdk / folder_name + def _process_operation_samples( + self, + samples: dict, + env: Environment, + op_group, + operation, + import_sample_cache: dict[tuple[str, str], str], + out_path: Path, + sample_additional_folder: Path, + ) -> None: + """Process samples for a single operation.""" + for sample_value in samples.values(): + file = sample_value.get("x-ms-original-file", "sample.json") + file_name = to_snake_case(extract_sample_name(file)) + ".py" + try: + sample_ser = SampleSerializer( + code_model=self.code_model, + env=env, + operation_group=op_group, + operation=operation, + sample=sample_value, + file_name=file_name, + ) + file_import = sample_ser.get_file_import() + imports_hash_string = hash_file_import(file_import) + cache_key = (op_group.client.client_namespace, imports_hash_string) + if cache_key not in import_sample_cache: + import_sample_cache[cache_key] = sample_ser.get_imports_from_file_import(file_import) + sample_ser.imports = import_sample_cache[cache_key] + + content = sample_ser.serialize() + output_path = out_path / sample_additional_folder / _sample_output_path(file) / file_name + self.write_file(output_path, content) + except Exception as e: # pylint: disable=broad-except + _LOGGER.error("error happens in sample %s: %s", file, e) + def _serialize_and_write_sample(self, env: Environment): out_path = self._generated_tests_samples_folder("generated_samples") + sample_additional_folder = self.sample_additional_folder + + # Cache import_test per (client_namespace, imports_hash_string) since it's expensive to compute + import_sample_cache: dict[tuple[str, str], str] = {} + for client in self.code_model.clients: for op_group in client.operation_groups: for operation in op_group.operations: samples = operation.yaml_data.get("samples") if not samples or operation.name.startswith("_"): continue - for value in samples.values(): - file = value.get("x-ms-original-file", "sample.json") - file_name = to_snake_case(extract_sample_name(file)) + ".py" - try: - self.write_file( - out_path / self.sample_additional_folder / _sample_output_path(file) / file_name, - SampleSerializer( - code_model=self.code_model, - env=env, - operation_group=op_group, - operation=operation, - sample=value, - file_name=file_name, - ).serialize(), - ) - except Exception as e: # pylint: disable=broad-except - # sample generation shall not block code generation, so just log error - log_error = f"error happens in sample {file}: {e}" - _LOGGER.error(log_error) + self._process_operation_samples( + samples, + env, + op_group, + operation, + import_sample_cache, + out_path, + sample_additional_folder, + ) def _serialize_and_write_test(self, env: Environment): self.code_model.for_test = True out_path = self._generated_tests_samples_folder("generated_tests") + general_serializer = TestGeneralSerializer(code_model=self.code_model, env=env) self.write_file(out_path / "conftest.py", general_serializer.serialize_conftest()) + if not self.code_model.options["azure-arm"]: for async_mode in (True, False): async_suffix = "_async" if async_mode else "" @@ -578,18 +610,24 @@ def _serialize_and_write_test(self, env: Environment): general_serializer.serialize_testpreparer(), ) + # Generate test files - reuse serializer per operation group, toggle async_mode + # Cache import_test per (client.name, async_mode) since it's expensive to compute + import_test_cache: dict[tuple[str, bool], str] = {} for client in self.code_model.clients: for og in client.operation_groups: + # Create serializer once per operation group test_serializer = TestSerializer(self.code_model, env, client=client, operation_group=og) - for async_mode in (True, False): - try: + try: + for async_mode in (True, False): test_serializer.async_mode = async_mode - self.write_file( - out_path / f"{to_snake_case(test_serializer.test_class_name)}.py", - test_serializer.serialize_test(), - ) - except Exception as e: # pylint: disable=broad-except - # test generation shall not block code generation, so just log error - log_error = f"error happens in test generation for operation group {og.class_name}: {e}" - _LOGGER.error(log_error) + cache_key = (client.name, async_mode) + if cache_key not in import_test_cache: + import_test_cache[cache_key] = test_serializer.get_import_test() + test_serializer.import_test = import_test_cache[cache_key] + content = test_serializer.serialize_test() + output_path = out_path / f"{to_snake_case(test_serializer.test_class_name)}.py" + self.write_file(output_path, content) + except Exception as e: # pylint: disable=broad-except + _LOGGER.error("error happens in test generation for operation group %s: %s", og.class_name, e) + self.code_model.for_test = False diff --git a/packages/http-client-python/generator/pygen/codegen/serializers/builder_serializer.py b/packages/http-client-python/generator/pygen/codegen/serializers/builder_serializer.py index 46611d152ac..a8e0df15db6 100644 --- a/packages/http-client-python/generator/pygen/codegen/serializers/builder_serializer.py +++ b/packages/http-client-python/generator/pygen/codegen/serializers/builder_serializer.py @@ -564,7 +564,7 @@ def example_template(self, builder: OperationType) -> list[str]: def make_pipeline_call(self, builder: OperationType) -> list[str]: retval = [] type_ignore = self.async_mode and builder.group_name == "" # is in a mixin - if builder.stream_value is True and not self.code_model.options["version-tolerant"]: + if builder.stream_value: retval.append("_decompress = kwargs.pop('decompress', True)") pylint_disable = " # pylint: disable=protected-access" if self.code_model.is_azure_flavor else "" retval.extend( @@ -973,7 +973,7 @@ def response_deserialization( # pylint: disable=too-many-statements else: stream_logic = False if self.code_model.options["version-tolerant"]: - deserialized = "response.iter_bytes()" + deserialized = "response.iter_bytes() if _decompress else response.iter_raw()" else: deserialized = ( f"response.stream_download(self._client.{self.pipeline_name}, decompress=_decompress)" @@ -1020,7 +1020,7 @@ def response_deserialization( # pylint: disable=too-many-statements if len(deserialize_code) > 0: if builder.expose_stream_keyword and stream_logic: retval.append("if _stream:") - retval.append(" deserialized = response.iter_bytes()") + retval.append(" deserialized = response.iter_bytes() if _decompress else response.iter_raw()") retval.append("else:") retval.extend([f" {dc}" for dc in deserialize_code]) else: @@ -1418,15 +1418,24 @@ def _extract_data_callback( # pylint: disable=too-many-statements,too-many-bran access = ( "".join([f'.get("{i}", {{}})' for i in item_name_array[:-1]]) + f'.get("{item_name_array[-1]}", [])' ) - list_of_elem_deserialized = "" + pylint_disable = "" if self.code_model.options["models-mode"] == "dpg": item_type = builder.item_type.type_annotation( is_operation_file=True, serialize_namespace=self.serialize_namespace ) - list_of_elem_deserialized = f"_deserialize({item_type}, deserialized{access})" + pylint_disable = ( + " # pylint: disable=protected-access" if getattr(builder.item_type, "internal", False) else "" + ) + list_of_elem_deserialized = [ + "_deserialize(", + f"{item_type},{pylint_disable}", + f"deserialized{access},", + ")", + ] else: - list_of_elem_deserialized = f"deserialized{access}" - retval.append(f" list_of_elem = {list_of_elem_deserialized}") + list_of_elem_deserialized = [f"deserialized{access}"] + list_of_elem_deserialized_str = "\n ".join(list_of_elem_deserialized) + retval.append(f" list_of_elem = {list_of_elem_deserialized_str}") retval.append(" if cls:") retval.append(" list_of_elem = cls(list_of_elem) # type: ignore") diff --git a/packages/http-client-python/generator/pygen/codegen/serializers/import_serializer.py b/packages/http-client-python/generator/pygen/codegen/serializers/import_serializer.py index 89aebfac588..94fecd5e46b 100644 --- a/packages/http-client-python/generator/pygen/codegen/serializers/import_serializer.py +++ b/packages/http-client-python/generator/pygen/codegen/serializers/import_serializer.py @@ -3,7 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for # license information. # -------------------------------------------------------------------------- -from copy import deepcopy from ..models.imports import ( ImportType, FileImport, @@ -73,17 +72,8 @@ def __init__(self, file_import: FileImport, async_mode: bool = False) -> None: self.file_import = file_import self.async_mode = async_mode - def _get_imports_list(self, baseline_typing_section: TypingSection, add_conditional_typing: bool): - # If this is a python 3 file, our regular imports include the CONDITIONAL category - # If this is not a python 3 file, our typing imports include the CONDITIONAL category - file_import_copy = deepcopy(self.file_import) - if add_conditional_typing and any(self.file_import.get_imports_from_section(TypingSection.CONDITIONAL)): - # we switch the TypingSection key for the CONDITIONAL typing imports so we can merge - # the imports together - for i in file_import_copy.imports: - if i.typing_section == TypingSection.CONDITIONAL: - i.typing_section = baseline_typing_section - return file_import_copy.get_imports_from_section(baseline_typing_section) + def _get_imports_list(self, typing_section: TypingSection): + return list(self.file_import.get_imports_from_section(typing_section)) def _add_type_checking_import(self): if any(self.file_import.get_imports_from_section(TypingSection.TYPING)): @@ -106,19 +96,13 @@ def declare_definition(type_name: str, type_definition: TypeDefinition) -> list[ def __str__(self) -> str: self._add_type_checking_import() regular_imports = "" - regular_imports_list = self._get_imports_list( - baseline_typing_section=TypingSection.REGULAR, - add_conditional_typing=True, - ) + regular_imports_list = self._get_imports_list(TypingSection.REGULAR) if regular_imports_list: regular_imports = "\n\n".join(_get_import_clauses(regular_imports_list, "\n")) typing_imports = "" - typing_imports_list = self._get_imports_list( - baseline_typing_section=TypingSection.TYPING, - add_conditional_typing=False, - ) + typing_imports_list = self._get_imports_list(TypingSection.TYPING) if typing_imports_list: typing_imports += "\n\nif TYPE_CHECKING:\n " typing_imports += "\n\n ".join(_get_import_clauses(typing_imports_list, "\n ")) diff --git a/packages/http-client-python/generator/pygen/codegen/serializers/sample_serializer.py b/packages/http-client-python/generator/pygen/codegen/serializers/sample_serializer.py index 3fd57800168..733209b8396 100644 --- a/packages/http-client-python/generator/pygen/codegen/serializers/sample_serializer.py +++ b/packages/http-client-python/generator/pygen/codegen/serializers/sample_serializer.py @@ -20,6 +20,7 @@ BodyParameter, FileImport, ) +from .utils import create_fake_value _LOGGER = logging.getLogger(__name__) @@ -40,8 +41,17 @@ def __init__( self.sample = sample self.file_name = file_name self.sample_params = sample.get("parameters", {}) + self._imports: str = "" - def _imports(self) -> FileImportSerializer: + @property + def imports(self) -> str: + return self._imports + + @imports.setter + def imports(self, value: str) -> None: + self._imports = value + + def get_file_import(self) -> FileImport: imports = FileImport(self.code_model) client = self.operation_group.client namespace = client.client_namespace @@ -59,7 +69,12 @@ def _imports(self) -> FileImportSerializer: for param in self.operation.parameters.positional + self.operation.parameters.keyword_only: if param.client_default_value is None and not param.optional and param.wire_name in self.sample_params: imports.merge(param.type.imports_for_sample()) - return FileImportSerializer(imports, True) + + return imports + + @staticmethod + def get_imports_from_file_import(file_import: FileImport) -> str: + return str(FileImportSerializer(file_import, True)) def _client_params(self) -> dict[str, Any]: # client params @@ -97,19 +112,14 @@ def handle_param(param: Union[Parameter, BodyParameter], param_value: Any) -> st # prepare operation parameters def _operation_params(self) -> dict[str, Any]: - params = [ - p - for p in (self.operation.parameters.positional + self.operation.parameters.keyword_only) - if not p.client_default_value - ] - failure_info = "fail to find required param named {}" operation_params = {} - for param in params: - if not param.optional: + for param in self.operation.parameters.positional + self.operation.parameters.keyword_only: + if not param.optional and not param.client_default_value: param_value = self.sample_params.get(param.wire_name) if not param_value: - raise Exception(failure_info.format(param.client_name)) # pylint: disable=broad-exception-raised - operation_params[param.client_name] = self.handle_param(param, param_value) + operation_params[param.client_name] = create_fake_value(param.type) + else: + operation_params[param.client_name] = self.handle_param(param, param_value) return operation_params def _operation_group_name(self) -> str: @@ -154,7 +164,7 @@ def serialize(self) -> str: operation_params=self._operation_params(), operation_group_name=self._operation_group_name(), operation_name=self._operation_name(), - imports=self._imports(), + imports=self.imports, client_params=self._client_params(), origin_file=self._origin_file(), return_var=return_var, diff --git a/packages/http-client-python/generator/pygen/codegen/serializers/test_serializer.py b/packages/http-client-python/generator/pygen/codegen/serializers/test_serializer.py index 73baf5dd8d2..410b45cfecb 100644 --- a/packages/http-client-python/generator/pygen/codegen/serializers/test_serializer.py +++ b/packages/http-client-python/generator/pygen/codegen/serializers/test_serializer.py @@ -3,7 +3,7 @@ # Licensed under the MIT License. See License.txt in the project root for # license information. # -------------------------------------------------------------------------- -from typing import Any, Optional +from typing import Any from jinja2 import Environment from .import_serializer import FileImportSerializer @@ -14,12 +14,9 @@ OperationGroup, Client, OperationType, - ModelType, - BaseType, - CombinedType, FileImport, ) -from .utils import json_dumps_template +from .utils import create_fake_value def is_lro(operation_type: str) -> bool: @@ -39,30 +36,15 @@ def __init__(self, code_model: CodeModel, client_name: str, *, async_mode: bool self.code_model = code_model self.client_name = client_name self.async_mode = async_mode - - @property - def async_suffix_capt(self) -> str: - return "Async" if self.async_mode else "" - - @property - def create_client_name(self) -> str: - return "create_async_client" if self.async_mode else "create_client" - - @property - def prefix(self) -> str: - return self.client_name.replace("Client", "") - - @property - def preparer_name(self) -> str: - if self.code_model.options["azure-arm"]: - return "RandomNameResourceGroupPreparer" - return self.prefix + "Preparer" - - @property - def base_test_class_name(self) -> str: - if self.code_model.options["azure-arm"]: - return "AzureMgmtRecordedTestCase" - return f"{self.client_name}TestBase{self.async_suffix_capt}" + # Pre-compute values for render speed optimization + self.async_suffix_capt = "Async" if async_mode else "" + self.create_client_name = "create_async_client" if async_mode else "create_client" + self.prefix = client_name.replace("Client", "") + is_azure_arm = code_model.options["azure-arm"] + self.preparer_name = "RandomNameResourceGroupPreparer" if is_azure_arm else self.prefix + "Preparer" + self.base_test_class_name = ( + "AzureMgmtRecordedTestCase" if is_azure_arm else f"{client_name}TestBase{self.async_suffix_capt}" + ) class TestCase: @@ -73,50 +55,52 @@ def __init__( operation: OperationType, *, async_mode: bool = False, + is_azure_arm: bool = False, ) -> None: self.operation_groups = operation_groups - self.params = params self.operation = operation self.async_mode = async_mode - - @property - def name(self) -> str: - if self.operation_groups[-1].is_mixin: - return self.operation.name - return "_".join([og.property_name for og in self.operation_groups] + [self.operation.name]) - - @property - def operation_group_prefix(self) -> str: - if self.operation_groups[-1].is_mixin: - return "" - return "." + ".".join([og.property_name for og in self.operation_groups]) - - @property - def response(self) -> str: - if self.async_mode: - if is_lro(self.operation.operation_type): - return "response = await (await " - if is_common_operation(self.operation.operation_type): - return "response = await " - return "response = " - - @property - def lro_comment(self) -> str: - return " # call '.result()' to poll until service return final result" - - @property - def operation_suffix(self) -> str: - if is_lro(self.operation.operation_type): - extra = ")" if self.async_mode else "" - return f"{extra}.result(){self.lro_comment}" - return "" - - @property - def extra_operation(self) -> str: - if is_paging(self.operation.operation_type): - async_str = "async " if self.async_mode else "" - return f"result = [r {async_str}for r in response]" - return "" + self.is_azure_arm = is_azure_arm + # Pre-compute params + if is_azure_arm: + self.params = {k: ("resource_group.name" if k == "resource_group_name" else v) for k, v in params.items()} + else: + self.params = params + # Pre-compute name + if operation_groups[-1].is_mixin: + self.name = operation.name + else: + self.name = "_".join([og.property_name for og in operation_groups] + [operation.name]) + # Pre-compute operation_group_prefix + if operation_groups[-1].is_mixin: + self.operation_group_prefix = "" + else: + self.operation_group_prefix = "." + ".".join([og.property_name for og in operation_groups]) + # Pre-compute response + operation_type = operation.operation_type + if async_mode: + if is_lro(operation_type): + self.response = "response = await (await " + elif is_common_operation(operation_type): + self.response = "response = await " + else: + self.response = "response = " + else: + self.response = "response = " + # Pre-compute lro_comment + self.lro_comment = " # call '.result()' to poll until service return final result" + # Pre-compute operation_suffix + if is_lro(operation_type): + extra = ")" if async_mode else "" + self.operation_suffix = f"{extra}.result(){self.lro_comment}" + else: + self.operation_suffix = "" + # Pre-compute extra_operation + if is_paging(operation_type): + async_str = "async " if async_mode else "" + self.extra_operation = f"result = [r {async_str}for r in response]" + else: + self.extra_operation = "" class Test(TestName): @@ -189,9 +173,17 @@ def __init__( super().__init__(code_model, env, async_mode=async_mode) self.client = client self.operation_group = operation_group + self._import_test: str = "" @property - def import_test(self) -> FileImportSerializer: + def import_test(self) -> str: + return self._import_test + + @import_test.setter + def import_test(self, value: str) -> None: + self._import_test = value + + def get_import_test(self) -> str: imports = self.init_file_import() test_name = TestName(self.code_model, self.client.name, async_mode=self.async_mode) async_suffix = "_async" if self.async_mode else "" @@ -212,7 +204,7 @@ def import_test(self) -> FileImportSerializer: ) if self.code_model.options["azure-arm"]: self.add_import_client(imports) - return FileImportSerializer(imports, self.async_mode) + return str(FileImportSerializer(imports, self.async_mode)) @property def breadth_search_operation_group(self) -> list[list[OperationGroup]]: @@ -226,26 +218,11 @@ def breadth_search_operation_group(self) -> list[list[OperationGroup]]: queue.extend([current + [og] for og in current[-1].operation_groups]) return result - def get_sub_type(self, param_type: ModelType) -> ModelType: - if param_type.discriminated_subtypes: - for item in param_type.discriminated_subtypes.values(): - return self.get_sub_type(item) - return param_type - - def get_model_type(self, param_type: BaseType) -> Optional[ModelType]: - if isinstance(param_type, ModelType): - return param_type - if isinstance(param_type, CombinedType): - return param_type.target_model_subtype((ModelType,)) - return None - def get_operation_params(self, operation: OperationType) -> dict[str, Any]: operation_params = {} required_params = [p for p in operation.parameters.method if not p.optional] for param in required_params: - model_type = self.get_model_type(param.type) - param_type = self.get_sub_type(model_type) if model_type else param.type - operation_params[param.client_name] = json_dumps_template(param_type.get_json_template_representation()) + operation_params[param.client_name] = create_fake_value(param.type) return operation_params def get_test(self) -> Test: @@ -260,6 +237,7 @@ def get_test(self) -> Test: params=operation_params, operation=operation, async_mode=self.async_mode, + is_azure_arm=self.code_model.options["azure-arm"], ) testcases.append(testcase) if not testcases: @@ -283,6 +261,7 @@ def test_class_name(self) -> str: def serialize_test(self) -> str: return self.env.get_template("test.py.jinja2").render( imports=self.import_test, - code_model=self.code_model, + is_azure_arm=self.code_model.options["azure-arm"], + license_header=self.code_model.license_header, test=self.get_test(), ) diff --git a/packages/http-client-python/generator/pygen/codegen/serializers/utils.py b/packages/http-client-python/generator/pygen/codegen/serializers/utils.py index 9ea6c85c77b..52ee4d62e57 100644 --- a/packages/http-client-python/generator/pygen/codegen/serializers/utils.py +++ b/packages/http-client-python/generator/pygen/codegen/serializers/utils.py @@ -7,6 +7,15 @@ from typing import Optional, Any from pathlib import Path +from ..models import ModelType, BaseType, CombinedType, FileImport + + +def get_sub_type(param_type: ModelType) -> ModelType: + if param_type.discriminated_subtypes: + for item in param_type.discriminated_subtypes.values(): + return get_sub_type(item) + return param_type + def method_signature_and_response_type_annotation_template( *, @@ -52,3 +61,31 @@ def _improve_json_string(template_representation: str) -> Any: def json_dumps_template(template_representation: Any) -> Any: # only for template use, since it wraps everything in strings return _improve_json_string(json.dumps(template_representation, indent=4)) + + +def create_fake_value(param_type: BaseType) -> Any: + """Create a fake value for a parameter type by getting its JSON template representation. + + This function generates a fake value suitable for samples and tests. + + :param param_type: The parameter type to create a fake value for. + :return: A string representation of the fake value. + """ + + model_type: Optional[ModelType] = None + if isinstance(param_type, ModelType): + model_type = param_type + elif isinstance(param_type, CombinedType): + model_type = param_type.target_model_subtype((ModelType,)) + resolved_type = get_sub_type(model_type) if model_type else param_type + return json_dumps_template(resolved_type.get_json_template_representation()) + + +def hash_file_import(file_import: FileImport) -> str: + """Generate a hash for a FileImport object based on its imports. + + :param file_import: The FileImport object to generate a hash for. + :return: A string representing the hash of the FileImport object. + """ + + return "".join(sorted({str(hash(i)) for i in file_import.imports})) diff --git a/packages/http-client-python/generator/pygen/codegen/templates/model_base.py.jinja2 b/packages/http-client-python/generator/pygen/codegen/templates/model_base.py.jinja2 index 650204d2e35..111a1585faf 100644 --- a/packages/http-client-python/generator/pygen/codegen/templates/model_base.py.jinja2 +++ b/packages/http-client-python/generator/pygen/codegen/templates/model_base.py.jinja2 @@ -527,6 +527,8 @@ class _MyMutableMapping(MutableMapping[str, typing.Any]): return self._data.setdefault(key, default) def __eq__(self, other: typing.Any) -> bool: + if isinstance(other, _MyMutableMapping): + return self._data == other._data try: other_model = self.__class__(other) except Exception: @@ -620,54 +622,9 @@ class Model(_MyMutableMapping): for rest_field in self._attr_to_rest_field.values() if rest_field._default is not _UNSET } - if args: # pylint: disable=too-many-nested-blocks + if args: if isinstance(args[0], ET.Element): - existed_attr_keys = [] - model_meta = getattr(self, "_xml", {}) - - for rf in self._attr_to_rest_field.values(): - prop_meta = getattr(rf, "_xml", {}) - xml_name = prop_meta.get("name", rf._rest_name) - xml_ns = prop_meta.get("ns", model_meta.get("ns", None)) - if xml_ns: - xml_name = "{" + xml_ns + "}" + xml_name - - # attribute - if prop_meta.get("attribute", False) and args[0].get(xml_name) is not None: - existed_attr_keys.append(xml_name) - dict_to_pass[rf._rest_name] = _deserialize(rf._type, args[0].get(xml_name)) - continue - - # unwrapped element is array - if prop_meta.get("unwrapped", False): - # unwrapped array could either use prop items meta/prop meta - if prop_meta.get("itemsName"): - xml_name = prop_meta.get("itemsName") - xml_ns = prop_meta.get("itemNs") - if xml_ns: - xml_name = "{" + xml_ns + "}" + xml_name - items = args[0].findall(xml_name) # pyright: ignore - if len(items) > 0: - existed_attr_keys.append(xml_name) - dict_to_pass[rf._rest_name] = _deserialize(rf._type, items) - continue - - # text element is primitive type - if prop_meta.get("text", False): - if args[0].text is not None: - dict_to_pass[rf._rest_name] = _deserialize(rf._type, args[0].text) - continue - - # wrapped element could be normal property or array, it should only have one element - item = args[0].find(xml_name) - if item is not None: - existed_attr_keys.append(xml_name) - dict_to_pass[rf._rest_name] = _deserialize(rf._type, item) - - # rest thing is additional properties - for e in args[0]: - if e.tag not in existed_attr_keys: - dict_to_pass[e.tag] = _convert_element(e) + dict_to_pass.update(self._init_from_xml(args[0])) else: dict_to_pass.update( {k: _create_value(_get_rest_field(self._attr_to_rest_field, k), v) for k, v in args[0].items()} @@ -686,6 +643,69 @@ class Model(_MyMutableMapping): ) super().__init__(dict_to_pass) + def _init_from_xml(self, element: ET.Element) -> dict[str, typing.Any]: + """Deserialize an XML element into a dict mapping rest field names to values. + + :param ET.Element element: The XML element to deserialize from. + :returns: A dictionary of rest_name to deserialized value pairs. + :rtype: dict + """ + result: dict[str, typing.Any] = {} + model_meta = getattr(self, "_xml", {}) + existed_attr_keys: list[str] = [] + + for rf in self._attr_to_rest_field.values(): + prop_meta = getattr(rf, "_xml", {}) + xml_name = prop_meta.get("name", rf._rest_name) + xml_ns = _resolve_xml_ns(prop_meta, model_meta) + if xml_ns: + xml_name = "{" + xml_ns + "}" + xml_name + + # attribute + if prop_meta.get("attribute", False) and element.get(xml_name) is not None: + existed_attr_keys.append(xml_name) + result[rf._rest_name] = _deserialize(rf._type, element.get(xml_name)) + continue + + # unwrapped element is array + if prop_meta.get("unwrapped", False): + # unwrapped array could either use prop items meta/prop meta + _items_name = prop_meta.get("itemsName") + if _items_name: + xml_name = _items_name + _items_ns = prop_meta.get("itemsNs") + if _items_ns is not None: + xml_ns = _items_ns + if xml_ns: + xml_name = "{" + xml_ns + "}" + xml_name + items = element.findall(xml_name) # pyright: ignore + if len(items) > 0: + existed_attr_keys.append(xml_name) + result[rf._rest_name] = _deserialize(rf._type, items) + elif not rf._is_optional: + existed_attr_keys.append(xml_name) + result[rf._rest_name] = [] + continue + + # text element is primitive type + if prop_meta.get("text", False): + if element.text is not None: + result[rf._rest_name] = _deserialize(rf._type, element.text) + continue + + # wrapped element could be normal property or array, it should only have one element + item = element.find(xml_name) + if item is not None: + existed_attr_keys.append(xml_name) + result[rf._rest_name] = _deserialize(rf._type, item) + + # rest thing is additional properties + for e in element: + if e.tag not in existed_attr_keys: + result[e.tag] = _convert_element(e) + + return result + def copy(self) -> "Model": return Model(self.__dict__) @@ -756,7 +776,7 @@ class Model(_MyMutableMapping): model_meta = getattr(cls, "_xml", {}) prop_meta = getattr(discriminator, "_xml", {}) xml_name = prop_meta.get("name", discriminator._rest_name) - xml_ns = prop_meta.get("ns", model_meta.get("ns", None)) + xml_ns = _resolve_xml_ns(prop_meta, model_meta) if xml_ns: xml_name = "{" + xml_ns + "}" + xml_name @@ -928,6 +948,8 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur # is it optional? try: if any(a is _NONE_TYPE for a in annotation.__args__): # pyright: ignore + if rf: + rf._is_optional = True if len(annotation.__args__) <= 2: # pyright: ignore if_obj_deserializer = _get_deserialize_callable_from_annotation( next(a for a in annotation.__args__ if a is not _NONE_TYPE), module, rf # pyright: ignore @@ -1020,16 +1042,20 @@ def _deserialize_with_callable( return float(value.text) if value.text else None if deserializer is bool: return value.text == "true" if value.text else None + if deserializer and deserializer in _DESERIALIZE_MAPPING.values(): + return deserializer(value.text) if value.text else None + if deserializer and deserializer in _DESERIALIZE_MAPPING_WITHFORMAT.values(): + return deserializer(value.text) if value.text else None if deserializer is None: return value if deserializer in [int, float, bool]: return deserializer(value) if isinstance(deserializer, CaseInsensitiveEnumMeta): try: - return deserializer(value) + return deserializer(value.text if isinstance(value, ET.Element) else value) except ValueError: # for unknown value, return raw value - return value + return value.text if isinstance(value, ET.Element) else value if isinstance(deserializer, type) and issubclass(deserializer, Model): return deserializer._deserialize(value, []) return typing.cast(typing.Callable[[typing.Any], typing.Any], deserializer)(value) @@ -1062,7 +1088,7 @@ def _failsafe_deserialize( ) -> typing.Any: try: return _deserialize(deserializer, response.json(), module, rf, format) - except DeserializationError: + except Exception: # pylint: disable=broad-except _LOGGER.warning( "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True @@ -1072,11 +1098,11 @@ def _failsafe_deserialize( def _failsafe_deserialize_xml( deserializer: typing.Any, - response: HttpResponse, + response: HttpResponse, ) -> typing.Any: try: return _deserialize_xml(deserializer, response.text()) - except DeserializationError: + except Exception: # pylint: disable=broad-except _LOGGER.warning( "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True @@ -1084,9 +1110,7 @@ def _failsafe_deserialize_xml( return None -{% if code_model.has_padded_model_property %} # pylint: disable=too-many-instance-attributes -{% endif %} class _RestField: def __init__( self, @@ -1109,6 +1133,7 @@ class _RestField: self._is_discriminator = is_discriminator self._visibility = visibility self._is_model = False + self._is_optional = False self._default = default self._format = format self._is_multipart_file_input = is_multipart_file_input @@ -1233,6 +1258,58 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: return ET.tostring(_get_element(model, exclude_readonly), encoding="unicode") # type: ignore +def _get_xml_ns(meta: dict[str, typing.Any]) -> typing.Optional[str]: + """Return the XML namespace from a metadata dict, checking both 'ns' (old-style) and 'namespace' (DPG) keys. + + :param dict meta: The metadata dictionary to extract namespace from. + :returns: The namespace string if 'ns' or 'namespace' key is present, None otherwise. + :rtype: str or None + """ + ns = meta.get("ns") + if ns is None: + ns = meta.get("namespace") + return ns + + +def _resolve_xml_ns( + prop_meta: dict[str, typing.Any], model_meta: typing.Optional[dict[str, typing.Any]] = None +) -> typing.Optional[str]: + """Resolve XML namespace for a property, falling back to model namespace when appropriate. + + Checks the property metadata first; if no namespace is found and the model does not declare + an explicit prefix, falls back to the model-level namespace. + + :param dict prop_meta: The property metadata dictionary. + :param dict model_meta: The model metadata dictionary, used as fallback. + :returns: The resolved namespace string, or None. + :rtype: str or None + """ + ns = _get_xml_ns(prop_meta) + if ns is None and model_meta is not None and not model_meta.get("prefix"): + ns = _get_xml_ns(model_meta) + return ns + + +def _set_xml_attribute( + element: ET.Element, name: str, value: typing.Any, prop_meta: dict[str, typing.Any] +) -> None: + """Set an XML attribute on an element, handling namespace prefix registration. + + :param ET.Element element: The element to set the attribute on. + :param str name: The default attribute name (wire name). + :param any value: The attribute value. + :param dict prop_meta: The property metadata dictionary. + """ + xml_name = prop_meta.get("name", name) + _attr_ns = _get_xml_ns(prop_meta) + if _attr_ns: + _attr_prefix = prop_meta.get("prefix") + if _attr_prefix: + _safe_register_namespace(_attr_prefix, _attr_ns) + xml_name = "{" + _attr_ns + "}" + xml_name + element.set(xml_name, _get_primitive_type_value(value)) + + def _get_element( o: typing.Any, exclude_readonly: bool = False, @@ -1244,10 +1321,16 @@ def _get_element( # if prop is a model, then use the prop element directly, else generate a wrapper of model if wrapped_element is None: + # When serializing as an array item (parent_meta is set), check if the parent has an + # explicit itemsName. This ensures correct element names for unwrapped arrays (where + # the element tag is the property/items name, not the model type name). + _items_name = parent_meta.get("itemsName") if parent_meta is not None else None + element_name = _items_name if _items_name else (model_meta.get("name") or o.__class__.__name__) + _model_ns = _get_xml_ns(model_meta) wrapped_element = _create_xml_element( - model_meta.get("name", o.__class__.__name__), + element_name, model_meta.get("prefix"), - model_meta.get("ns"), + _model_ns, ) readonly_props = [] @@ -1269,7 +1352,9 @@ def _get_element( # additional properties will not have rest field, use the wire name as xml name prop_meta = {"name": k} - # if no ns for prop, use model's + # Propagate model namespace to properties only for old-style "ns"-keyed models. + # DPG-generated models use the "namespace" key and explicitly declare namespace on + # each property that needs it, so propagation is intentionally skipped for them. if prop_meta.get("ns") is None and model_meta.get("ns"): prop_meta["ns"] = model_meta.get("ns") prop_meta["prefix"] = model_meta.get("prefix") @@ -1281,12 +1366,7 @@ def _get_element( # text could only set on primitive type wrapped_element.text = _get_primitive_type_value(v) elif prop_meta.get("attribute", False): - xml_name = prop_meta.get("name", k) - if prop_meta.get("ns"): - ET.register_namespace(prop_meta.get("prefix"), prop_meta.get("ns")) # pyright: ignore - xml_name = "{" + prop_meta.get("ns") + "}" + xml_name # pyright: ignore - # attribute should be primitive type - wrapped_element.set(xml_name, _get_primitive_type_value(v)) + _set_xml_attribute(wrapped_element, k, v, prop_meta) else: # other wrapped prop element wrapped_element.append(_get_wrapped_element(v, exclude_readonly, prop_meta)) @@ -1295,6 +1375,7 @@ def _get_element( return [_get_element(x, exclude_readonly, parent_meta) for x in o] # type: ignore if isinstance(o, dict): result = [] + _dict_ns = _get_xml_ns(parent_meta) if parent_meta else None for k, v in o.items(): result.append( _get_wrapped_element( @@ -1302,7 +1383,7 @@ def _get_element( exclude_readonly, { "name": k, - "ns": parent_meta.get("ns") if parent_meta else None, + "ns": _dict_ns, "prefix": parent_meta.get("prefix") if parent_meta else None, }, ) @@ -1311,13 +1392,16 @@ def _get_element( # primitive case need to create element based on parent_meta if parent_meta: + _items_ns = parent_meta.get("itemsNs") + if _items_ns is None: + _items_ns = _get_xml_ns(parent_meta) return _get_wrapped_element( o, exclude_readonly, { "name": parent_meta.get("itemsName", parent_meta.get("name")), "prefix": parent_meta.get("itemsPrefix", parent_meta.get("prefix")), - "ns": parent_meta.get("itemsNs", parent_meta.get("ns")), + "ns": _items_ns, }, ) @@ -1329,8 +1413,9 @@ def _get_wrapped_element( exclude_readonly: bool, meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: + _meta_ns = _get_xml_ns(meta) if meta else None wrapped_element = _create_xml_element( - meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None + meta.get("name") if meta else None, meta.get("prefix") if meta else None, _meta_ns ) if isinstance(v, (dict, list)): wrapped_element.extend(_get_element(v, exclude_readonly, meta)) @@ -1351,11 +1436,29 @@ def _get_primitive_type_value(v) -> str: return str(v) +def _safe_register_namespace(prefix: str, ns: str) -> None: + """Register an XML namespace prefix, handling reserved prefix patterns. + + Some prefixes (e.g. 'ns2') match Python's reserved 'ns\\d+' pattern used for + auto-generated prefixes, causing register_namespace to raise ValueError. + Falls back to directly registering in the internal namespace map. + + :param str prefix: The namespace prefix to register. + :param str ns: The namespace URI. + """ + try: + ET.register_namespace(prefix, ns) + except ValueError: + _ns_map = getattr(ET, "_namespace_map", None) + if _ns_map is not None: + _ns_map[ns] = prefix + + def _create_xml_element( tag: typing.Any, prefix: typing.Optional[str] = None, ns: typing.Optional[str] = None ) -> ET.Element: if prefix and ns: - ET.register_namespace(prefix, ns) + _safe_register_namespace(prefix, ns) if ns: return ET.Element("{" + ns + "}" + tag) return ET.Element(tag) diff --git a/packages/http-client-python/generator/pygen/codegen/templates/test.py.jinja2 b/packages/http-client-python/generator/pygen/codegen/templates/test.py.jinja2 index 40b9e06a600..e3f4fc4df37 100644 --- a/packages/http-client-python/generator/pygen/codegen/templates/test.py.jinja2 +++ b/packages/http-client-python/generator/pygen/codegen/templates/test.py.jinja2 @@ -1,48 +1,51 @@ {% set prefix_lower = test.prefix|lower %} -{% set client_var = "self.client" if code_model.options["azure-arm"] else "client" %} +{% set client_var = "self.client" if is_azure_arm else "client" %} {% set async = "async " if test.async_mode else "" %} {% set async_suffix = "_async" if test.async_mode else "" %} # coding=utf-8 -{% if code_model.license_header %} -{{ code_model.license_header }} +{% if license_header %} +{{ license_header }} {% endif %} import pytest {{ imports }} -{% if code_model.options["azure-arm"] %} +{% if is_azure_arm %} AZURE_LOCATION = "eastus" {% endif %} @pytest.mark.skip("you may need to update the auto-generated test case before run it") class {{ test.test_class_name }}({{ test.base_test_class_name }}): -{% if code_model.options["azure-arm"] %} +{% if is_azure_arm %} def setup_method(self, method): {% if test.async_mode %} self.client = self.create_mgmt_client({{ test.client_name }}, is_async=True) {% else %} self.client = self.create_mgmt_client({{ test.client_name }}) {% endif %} -{% endif %} + {% for testcase in test.testcases %} - {% if code_model.options["azure-arm"] %} @{{ test.preparer_name }}(location=AZURE_LOCATION) - {% else %} - @{{ test.preparer_name }}() - {% endif %} @recorded_by_proxy{{ async_suffix }} - {% if code_model.options["azure-arm"] %} {{ async }}def test_{{ testcase.name }}(self, resource_group): - {% else %} + {{testcase.response }}{{ client_var }}{{ testcase.operation_group_prefix }}.{{ testcase.operation.name }}( + {% for key, value in testcase.params.items() %} + {{ key }}={{ value }}, + {% endfor %} + ){{ testcase.operation_suffix }} + {{ testcase.extra_operation }} + # please add some check logic here by yourself + # ... + +{% endfor %} +{% else %} +{% for testcase in test.testcases %} + @{{ test.preparer_name }}() + @recorded_by_proxy{{ async_suffix }} {{ async }}def test_{{ testcase.name }}(self, {{ prefix_lower }}_endpoint): {{ client_var }} = self.{{ test.create_client_name }}(endpoint={{ prefix_lower }}_endpoint) - {% endif %} {{testcase.response }}{{ client_var }}{{ testcase.operation_group_prefix }}.{{ testcase.operation.name }}( {% for key, value in testcase.params.items() %} - {% if code_model.options["azure-arm"] and key == "resource_group_name" %} - {{ key }}=resource_group.name, - {% else %} - {{ key }}={{ value|indent(12) }}, - {% endif %} + {{ key }}={{ value }}, {% endfor %} ){{ testcase.operation_suffix }} {{ testcase.extra_operation }} @@ -50,3 +53,4 @@ class {{ test.test_class_name }}({{ test.base_test_class_name }}): # ... {% endfor %} +{% endif %} diff --git a/packages/http-client-python/generator/pygen/preprocess/__init__.py b/packages/http-client-python/generator/pygen/preprocess/__init__.py index 315d8ff9078..6d3344059a3 100644 --- a/packages/http-client-python/generator/pygen/preprocess/__init__.py +++ b/packages/http-client-python/generator/pygen/preprocess/__init__.py @@ -4,6 +4,7 @@ # license information. # -------------------------------------------------------------------------- """The preprocessing autorest plugin.""" + import copy from typing import Callable, Any, Optional @@ -21,7 +22,6 @@ get_body_type_for_description, JSON_REGEXP, KNOWN_TYPES, - update_enum_value, ) @@ -267,30 +267,18 @@ def update_types(self, yaml_data: list[dict[str, Any]]) -> None: add_redefined_builtin_info(property["clientName"], property) if type.get("name"): pad_type = PadType.MODEL if type["type"] == "model" else PadType.ENUM_CLASS - name = self.pad_reserved_words(type["name"], pad_type, type) - type["name"] = name[0].upper() + name[1:] + if type["type"] != "enumvalue": + name = self.pad_reserved_words(type["name"], pad_type, type) + type["name"] = name[0].upper() + name[1:] type["description"] = update_description(type.get("description", ""), type["name"]) type["snakeCaseName"] = to_snake_case(type["name"]) if type.get("values"): - # we're enums - values_to_add = [] + # we're enums - enum values are UPPER_CASE so no padding needed for reserved words for value in type["values"]: - padded_name = self.pad_reserved_words(value["name"].lower(), PadType.ENUM_VALUE, value).upper() - if self.version_tolerant: - if padded_name[0] in "0123456789": - padded_name = "ENUM_" + padded_name - value["name"] = padded_name - else: - if value["name"] != padded_name: - values_to_add.append( - update_enum_value( - name=padded_name, - value=value["value"], - description=value["description"], - enum_type=value["enumType"], - ) - ) - type["values"].extend(values_to_add) + upper_name = value["name"].upper() + if upper_name[0] in "0123456789": + upper_name = "ENUM_" + upper_name + value["name"] = upper_name # add type for reference for v in HEADERS_CONVERT_IN_METHOD.values(): @@ -374,11 +362,9 @@ def update_parameter(self, yaml_data: dict[str, Any]) -> None: yaml_data["clientName"].lower(), PadType.PARAMETER, yaml_data ) if yaml_data.get("propertyToParameterName"): - # need to create a new one with padded keys and values + # need to create a new one with padded values (but NOT keys, since keys are wire names) yaml_data["propertyToParameterName"] = { - self.pad_reserved_words(prop, PadType.PROPERTY, yaml_data): self.pad_reserved_words( - param_name, PadType.PARAMETER, yaml_data - ).lower() + prop: self.pad_reserved_words(param_name, PadType.PARAMETER, yaml_data).lower() for prop, param_name in yaml_data["propertyToParameterName"].items() } wire_name_lower = (yaml_data.get("wireName") or "").lower() diff --git a/packages/http-client-python/generator/pygen/preprocess/python_mappings.py b/packages/http-client-python/generator/pygen/preprocess/python_mappings.py index d81bee8134d..c9621498437 100644 --- a/packages/http-client-python/generator/pygen/preprocess/python_mappings.py +++ b/packages/http-client-python/generator/pygen/preprocess/python_mappings.py @@ -56,7 +56,6 @@ class PadType(str, Enum): ENUM_CLASS = "Enum" METHOD = "_method" PARAMETER = "_parameter" - ENUM_VALUE = "_enum" PROPERTY = "_property" OPERATION_GROUP = "Operations" @@ -183,7 +182,6 @@ class PadType(str, Enum): PadType.MODEL: ["enum", *_always_reserved], PadType.PROPERTY: ["self", *_always_reserved], PadType.ENUM_CLASS: ["enum", *_always_reserved], - PadType.ENUM_VALUE: ["mro", *_always_reserved], PadType.OPERATION_GROUP: [*_always_reserved], } diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_encode_duration_async.py b/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_encode_duration_async.py deleted file mode 100644 index 0fca0371948..00000000000 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_encode_duration_async.py +++ /dev/null @@ -1,63 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import datetime - -import pytest -from encode.duration.aio import DurationClient -from encode.duration.models import ( - Int32SecondsDurationProperty, - ISO8601DurationProperty, - FloatSecondsDurationProperty, - DefaultDurationProperty, - FloatSecondsDurationArrayProperty, -) - - -@pytest.fixture -async def client(): - async with DurationClient() as client: - yield client - - -@pytest.mark.asyncio -async def test_query(client: DurationClient): - await client.query.default(input=datetime.timedelta(days=40)) - await client.query.iso8601(input=datetime.timedelta(days=40)) - await client.query.int32_seconds(input=36) - await client.query.int32_seconds_array(input=[36, 47]) - await client.query.float_seconds(input=35.625) - await client.query.float64_seconds(input=35.625) - - -@pytest.mark.asyncio -async def test_property(client: DurationClient): - result = await client.property.default(DefaultDurationProperty(value=datetime.timedelta(days=40))) - assert result.value == datetime.timedelta(days=40) - result = await client.property.default(DefaultDurationProperty(value="P40D")) - assert result.value == datetime.timedelta(days=40) - result = await client.property.iso8601(ISO8601DurationProperty(value=datetime.timedelta(days=40))) - assert result.value == datetime.timedelta(days=40) - result = await client.property.iso8601(ISO8601DurationProperty(value="P40D")) - assert result.value == datetime.timedelta(days=40) - result = await client.property.int32_seconds(Int32SecondsDurationProperty(value=36)) - assert result.value == 36 - result = await client.property.float_seconds(FloatSecondsDurationProperty(value=35.625)) - assert abs(result.value - 35.625) < 0.0001 - result = await client.property.float64_seconds(FloatSecondsDurationProperty(value=35.625)) - assert abs(result.value - 35.625) < 0.0001 - result = await client.property.float_seconds_array(FloatSecondsDurationArrayProperty(value=[35.625, 46.75])) - assert abs(result.value[0] - 35.625) < 0.0001 - assert abs(result.value[1] - 46.75) < 0.0001 - - -@pytest.mark.asyncio -async def test_header(client: DurationClient): - await client.header.default(duration=datetime.timedelta(days=40)) - await client.header.iso8601(duration=datetime.timedelta(days=40)) - await client.header.iso8601_array(duration=[datetime.timedelta(days=40), datetime.timedelta(days=50)]) - await client.header.int32_seconds(duration=36) - await client.header.float_seconds(duration=35.625) - await client.header.float64_seconds(duration=35.625) diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_encode_numeric_async.py b/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_encode_numeric_async.py deleted file mode 100644 index 7bd8b5e1f50..00000000000 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_encode_numeric_async.py +++ /dev/null @@ -1,35 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import pytest -from encode.numeric.aio import NumericClient -from encode.numeric import models - - -@pytest.fixture -async def client(): - async with NumericClient() as client: - yield client - - -@pytest.mark.asyncio -async def test_safeint_as_string(client: NumericClient): - result = await client.property.safeint_as_string(models.SafeintAsStringProperty(value=10000000000)) - assert result.value == 10000000000 - assert result["value"] == "10000000000" - - -@pytest.mark.asyncio -async def test_uint32_as_string_optional(client: NumericClient): - result = await client.property.uint32_as_string_optional(models.Uint32AsStringProperty(value=1)) - assert result.value == 1 - assert result["value"] == "1" - - -@pytest.mark.asyncio -async def test_uint8_as_string_optional(client: NumericClient): - result = await client.property.uint8_as_string(models.Uint32AsStringProperty(value=255)) - assert result.value == 255 - assert result["value"] == "255" diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_parameters_basic_async.py b/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_parameters_basic_async.py deleted file mode 100644 index 969e73a6c8c..00000000000 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_parameters_basic_async.py +++ /dev/null @@ -1,24 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import pytest -from parameters.basic.aio import BasicClient -from parameters.basic.models import User - - -@pytest.fixture -async def client(): - async with BasicClient() as client: - yield client - - -@pytest.mark.asyncio -async def test_explicit_simple(client: BasicClient): - await client.explicit_body.simple(User(name="foo")) - - -@pytest.mark.asyncio -async def test_implicit_simple(client: BasicClient): - await client.implicit_body.simple(name="foo") diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_parameters_spread_async.py b/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_parameters_spread_async.py deleted file mode 100644 index 74032d8e511..00000000000 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_parameters_spread_async.py +++ /dev/null @@ -1,76 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import pytest -from parameters.spread.aio import SpreadClient -from parameters.spread.models import BodyParameter - - -@pytest.fixture -async def client(): - async with SpreadClient() as client: - yield client - - -@pytest.mark.asyncio -async def test_model_body(client: SpreadClient): - await client.model.spread_as_request_body(name="foo") - - -@pytest.mark.asyncio -async def test_model_composite_request_only_with_body(client: SpreadClient): - await client.model.spread_composite_request_only_with_body(BodyParameter(name="foo")) - - -@pytest.mark.asyncio -async def test_model_composite_request_without_body(client: SpreadClient): - await client.model.spread_composite_request_without_body(name="foo", test_header="bar") - - -@pytest.mark.asyncio -async def test_model_composite_request(client: SpreadClient): - await client.model.spread_composite_request(name="foo", body=BodyParameter(name="foo"), test_header="bar") - - -@pytest.mark.asyncio -async def test_model_composite_request_mix(client: SpreadClient): - await client.model.spread_composite_request_mix(name="foo", prop="foo", test_header="bar") - - -@pytest.mark.asyncio -async def test_alias_body(client: SpreadClient): - await client.alias.spread_as_request_body(name="foo") - - -@pytest.mark.asyncio -async def test_alias_parameter(client: SpreadClient): - await client.alias.spread_as_request_parameter("1", x_ms_test_header="bar", name="foo") - - -@pytest.mark.asyncio -async def test_alias_multiple_parameter(client: SpreadClient): - await client.alias.spread_with_multiple_parameters( - "1", - x_ms_test_header="bar", - required_string="foo", - required_int_list=[1, 2], - optional_string_list=["foo", "bar"], - optional_int=1, - ) - await client.alias.spread_with_multiple_parameters( - "1", - {"requiredString": "foo", "optionalInt": 1, "requiredIntList": [1, 2], "optionalStringList": ["foo", "bar"]}, - x_ms_test_header="bar", - ) - - -@pytest.mark.asyncio -async def test_inner_model(client: SpreadClient): - await client.alias.spread_parameter_with_inner_model(id="1", x_ms_test_header="bar", body={"name": "foo"}) - - -@pytest.mark.asyncio -async def test_inner_alias(client: SpreadClient): - await client.alias.spread_parameter_with_inner_alias(id="1", x_ms_test_header="bar", body={"name": "foo", "age": 1}) diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_payload_content_negotiation_async.py b/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_payload_content_negotiation_async.py deleted file mode 100644 index 4c2a11f61ac..00000000000 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_payload_content_negotiation_async.py +++ /dev/null @@ -1,37 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import base64 -import pytest -from payload.contentnegotiation.aio import ContentNegotiationClient -from payload.contentnegotiation.models import PngImageAsJson - - -@pytest.fixture -async def client(): - async with ContentNegotiationClient(endpoint="http://localhost:3000") as client: - yield client - - -@pytest.mark.asyncio -async def test_get_avatar_as_png(client: ContentNegotiationClient, png_data: bytes): - assert b"".join([d async for d in (await client.same_body.get_avatar_as_png())]) == png_data - - -@pytest.mark.asyncio -async def test_get_avatar_as_jpeg(client: ContentNegotiationClient, jpg_data: bytes): - assert b"".join([d async for d in (await client.same_body.get_avatar_as_jpeg())]) == jpg_data - - -@pytest.mark.asyncio -async def test_different_body_get_avatar_as_png(client: ContentNegotiationClient, png_data: bytes): - assert b"".join([d async for d in (await client.different_body.get_avatar_as_png())]) == png_data - - -@pytest.mark.asyncio -async def test_different_body_get_avatar_as_json(client: ContentNegotiationClient, png_data: bytes): - result = await client.different_body.get_avatar_as_json() - expected = PngImageAsJson(content=base64.b64encode(png_data).decode()) - assert result == expected diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_payload_multipart_async.py b/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_payload_multipart_async.py deleted file mode 100644 index bb6620509e3..00000000000 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_payload_multipart_async.py +++ /dev/null @@ -1,186 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -from pathlib import Path -import pytest -from payload.multipart import models -from payload.multipart.aio import MultiPartClient - -JPG = Path(__file__).parent.parent / "data/image.jpg" -PNG = Path(__file__).parent.parent / "data/image.png" - - -@pytest.fixture -async def client(): - async with MultiPartClient(endpoint="http://localhost:3000") as client: - yield client - - -@pytest.mark.asyncio -async def test_anonymous_model(client: MultiPartClient): - await client.form_data.anonymous_model({"profileImage": open(str(JPG), "rb")}) - - -@pytest.mark.asyncio -async def test_basic(client: MultiPartClient): - await client.form_data.basic( - models.MultiPartRequest( - id="123", - profile_image=open(str(JPG), "rb"), - ) - ) - - -@pytest.mark.asyncio -async def test_binary_array_parts(client: MultiPartClient): - await client.form_data.binary_array_parts( - models.BinaryArrayPartsRequest( - id="123", - pictures=[ - open(str(PNG), "rb"), - open(str(PNG), "rb"), - ], - ) - ) - - -@pytest.mark.asyncio -async def test_check_file_name_and_content_type(client: MultiPartClient): - await client.form_data.check_file_name_and_content_type( - models.MultiPartRequest( - id="123", - profile_image=("hello.jpg", open(str(JPG), "rb"), "image/jpg"), - ) - ) - - -@pytest.mark.asyncio -async def test_complex(client: MultiPartClient): - await client.form_data.file_array_and_basic( - models.ComplexPartsRequest( - id="123", - address=models.Address(city="X"), - pictures=[ - open(str(PNG), "rb"), - open(str(PNG), "rb"), - ], - profile_image=open(str(JPG), "rb"), - ) - ) - - -@pytest.mark.asyncio -async def test_json_part(client: MultiPartClient): - await client.form_data.json_part( - models.JsonPartRequest( - address=models.Address(city="X"), - profile_image=open(str(JPG), "rb"), - ) - ) - - -@pytest.mark.asyncio -async def test_multi_binary_parts(client: MultiPartClient): - await client.form_data.multi_binary_parts( - models.MultiBinaryPartsRequest( - profile_image=open(str(JPG), "rb"), - picture=open(str(PNG), "rb"), - ) - ) - await client.form_data.multi_binary_parts( - models.MultiBinaryPartsRequest( - profile_image=open(str(JPG), "rb"), - ) - ) - - -@pytest.mark.asyncio -async def test_file_with_http_part_specific_content_type(client: MultiPartClient): - await client.form_data.http_parts.content_type.image_jpeg_content_type( - models.FileWithHttpPartSpecificContentTypeRequest( - profile_image=("hello.jpg", open(str(JPG), "rb"), "image/jpg"), - ) - ) - - -@pytest.mark.asyncio -async def test_file_with_http_part_required_content_type(client: MultiPartClient): - await client.form_data.http_parts.content_type.required_content_type( - models.FileWithHttpPartRequiredContentTypeRequest( - profile_image=open(str(JPG), "rb"), - ) - ) - - -@pytest.mark.asyncio -async def test_file_with_http_part_optional_content_type(client: MultiPartClient): - # call twice: one with content type, one without - await client.form_data.http_parts.content_type.optional_content_type( - models.FileWithHttpPartOptionalContentTypeRequest( - profile_image=("hello.jpg", open(str(JPG), "rb").read()), - ) - ) - await client.form_data.http_parts.content_type.optional_content_type( - models.FileWithHttpPartOptionalContentTypeRequest( - profile_image=("hello.jpg", open(str(JPG), "rb").read(), "application/octet-stream"), - ) - ) - - -@pytest.mark.asyncio -async def test_complex_with_http_part(client: MultiPartClient): - await client.form_data.http_parts.json_array_and_file_array( - models.ComplexHttpPartsModelRequest( - id="123", - previous_addresses=[ - models.Address(city="Y"), - models.Address(city="Z"), - ], - address=models.Address(city="X"), - pictures=[ - open(str(PNG), "rb"), - open(str(PNG), "rb"), - ], - profile_image=open(str(JPG), "rb"), - ) - ) - - -@pytest.mark.asyncio -async def test_http_parts_non_string_float(client: MultiPartClient): - await client.form_data.http_parts.non_string.float(models.FloatRequest(temperature=0.5)) - - -@pytest.mark.asyncio -async def test_with_wire_name(client: MultiPartClient): - await client.form_data.with_wire_name( - models.MultiPartRequestWithWireName( - identifier="123", - image=open(str(JPG), "rb"), - ) - ) - - -@pytest.mark.asyncio -async def test_optional_parts(client: MultiPartClient): - # First time with only id - await client.form_data.optional_parts( - models.MultiPartOptionalRequest( - id="123", - ) - ) - # Second time with only profileImage - await client.form_data.optional_parts( - models.MultiPartOptionalRequest( - profile_image=open(str(JPG), "rb"), - ) - ) - # Third time with both id and profileImage - await client.form_data.optional_parts( - models.MultiPartOptionalRequest( - id="123", - profile_image=open(str(JPG), "rb"), - ) - ) diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_serialization_encoded_name_json_async.py b/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_serialization_encoded_name_json_async.py deleted file mode 100644 index 70bfcc77ad0..00000000000 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_serialization_encoded_name_json_async.py +++ /dev/null @@ -1,24 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import pytest -from serialization.encodedname.json.aio import JsonClient -from serialization.encodedname.json import models - - -@pytest.fixture -async def client(): - async with JsonClient() as client: - yield client - - -@pytest.mark.asyncio -async def test_property_send(client: JsonClient): - await client.property.send(models.JsonEncodedNameModel(default_name=True)) - - -@pytest.mark.asyncio -async def test_property_get(client: JsonClient): - assert (await client.property.get()).default_name diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_special_words_async.py b/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_special_words_async.py deleted file mode 100644 index 9f22c8c5d15..00000000000 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_special_words_async.py +++ /dev/null @@ -1,65 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import pytest -from specialwords.aio import SpecialWordsClient -from specialwords import models - - -@pytest.fixture -async def client(): - async with SpecialWordsClient() as client: - yield client - - -@pytest.mark.asyncio -async def test_operations(client: SpecialWordsClient, special_words): - for sw in special_words: - suffix = "" if sw == "constructor" else "_method" - await getattr(client.operations, sw + suffix)() - - -@pytest.mark.asyncio -async def test_parameter(client: SpecialWordsClient, special_words): - for sw in special_words: - suffix = "" if sw == "constructor" else "_parameter" - await getattr(client.parameters, "with_" + sw)(**{sw + suffix: "ok"}) - await client.parameters.with_cancellation_token(cancellation_token="ok") - - -@pytest.mark.asyncio -async def test_model(client: SpecialWordsClient, special_words): - for sw in special_words: - suffix = "" if sw == "constructor" else "Model" - model = getattr(models, sw.capitalize() + suffix) - await getattr(client.models, "with_" + sw)(model(name="ok")) - - -@pytest.mark.asyncio -async def test_model_properties(client: SpecialWordsClient): - await client.model_properties.same_as_model(models.SameAsModel(same_as_model="ok")) - - -@pytest.mark.asyncio -async def test_model_properties_dict_methods(client: SpecialWordsClient): - await client.model_properties.dict_methods( - body=models.DictMethods( - keys_property="ok", - items_property="ok", - values_property="ok", - popitem_property="ok", - clear_property="ok", - update_property="ok", - setdefault_property="ok", - pop_property="ok", - get_property="ok", - copy_property="ok", - ) - ) - - -@pytest.mark.asyncio -async def test_model_properties_with_list(client: SpecialWordsClient): - await client.model_properties.with_list(models.ModelWithList(list="ok")) diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/conftest.py b/packages/http-client-python/generator/test/azure/mock_api_tests/conftest.py deleted file mode 100644 index 85fe619a6c3..00000000000 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/conftest.py +++ /dev/null @@ -1,207 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import os -import subprocess -import signal -import pytest -import re -from typing import Literal -from pathlib import Path - -FILE_FOLDER = Path(__file__).parent - - -def start_server_process(): - azure_http_path = Path(os.path.dirname(__file__)) / Path("../../../../node_modules/@azure-tools/azure-http-specs") - http_path = Path(os.path.dirname(__file__)) / Path("../../../../node_modules/@typespec/http-specs") - os.chdir(azure_http_path.resolve()) - cmd = f"npx tsp-spector serve ./specs {(http_path / 'specs').resolve()}" - if os.name == "nt": - return subprocess.Popen(cmd, shell=True) - return subprocess.Popen(cmd, shell=True, preexec_fn=os.setsid) - - -def terminate_server_process(process): - if os.name == "nt": - process.kill() - else: - os.killpg(os.getpgid(process.pid), signal.SIGTERM) # Send the signal to all the process groups - - -@pytest.fixture(scope="session", autouse=True) -def testserver(): - """Start spector ranch mock api tests""" - server = start_server_process() - yield - terminate_server_process(server) - - -_VALID_UUID = re.compile(r"^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$") -_VALID_RFC7231 = re.compile( - r"^(Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s\d{2}\s" - r"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s\d{4}\s\d{2}:\d{2}:\d{2}\sGMT$" -) - - -def validate_format(value: str, format: Literal["uuid", "rfc7231"]): - if format == "uuid": - assert _VALID_UUID.match(value) - elif format == "rfc7231": - assert _VALID_RFC7231.match(value) - else: - raise ValueError("Unknown format") - - -@pytest.fixture -def check_repeatability_header(): - def func(request): - validate_format(request.http_request.headers["Repeatability-Request-ID"], "uuid") - validate_format(request.http_request.headers["Repeatability-First-Sent"], "rfc7231") - - return func - - -@pytest.fixture -def check_client_request_id_header(): - def func(request, header: str, checked: dict): - validate_format(request.http_request.headers[header], "uuid") - checked[header] = request.http_request.headers[header] - - return func - - -# ================== after azure-core fix, the following code can be removed (begin) ================== -import urllib.parse -from azure.core.rest import HttpRequest - - -def update_api_version_of_status_link(status_link: str): - request_params = {} - parsed_status_link = urllib.parse.urlparse(status_link) - request_params = { - key.lower(): [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(parsed_status_link.query).items() - } - request_params["api-version"] = "2022-12-01-preview" - status_link = urllib.parse.urljoin(status_link, parsed_status_link.path) - return status_link, request_params - - -@pytest.fixture -def polling_method(): - from azure.core.polling.base_polling import LROBasePolling - - class TempLroBasePolling(LROBasePolling): - - def request_status(self, status_link: str): - if self._path_format_arguments: - status_link = self._client.format_url(status_link, **self._path_format_arguments) - status_link, request_params = update_api_version_of_status_link(status_link) - if "request_id" not in self._operation_config: - self._operation_config["request_id"] = self._get_request_id() - - rest_request = HttpRequest("GET", status_link, params=request_params) - return self._client.send_request(rest_request, _return_pipeline_response=True, **self._operation_config) - - return TempLroBasePolling(0) - - -@pytest.fixture -def async_polling_method(): - from azure.core.polling.async_base_polling import AsyncLROBasePolling - - class AsyncTempLroBasePolling(AsyncLROBasePolling): - - async def request_status(self, status_link: str): - if self._path_format_arguments: - status_link = self._client.format_url(status_link, **self._path_format_arguments) - status_link, request_params = update_api_version_of_status_link(status_link) - # Re-inject 'x-ms-client-request-id' while polling - if "request_id" not in self._operation_config: - self._operation_config["request_id"] = self._get_request_id() - - rest_request = HttpRequest("GET", status_link, params=request_params) - return await self._client.send_request( - rest_request, _return_pipeline_response=True, **self._operation_config - ) - - return AsyncTempLroBasePolling(0) - - -# ================== after azure-core fix, the up code can be removed (end) ================== - - -@pytest.fixture() -def credential(): - """I actually don't need anything, since the authentication policy - will bypass it. - """ - - class FakeCredential: - pass - - return FakeCredential() - - -@pytest.fixture() -def authentication_policy(): - from azure.core.pipeline.policies import SansIOHTTPPolicy - - return SansIOHTTPPolicy() - - -SPECIAL_WORDS = [ - "and", - "as", - "assert", - "async", - "await", - "break", - "class", - "constructor", - "continue", - "def", - "del", - "elif", - "else", - "except", - "exec", - "finally", - "for", - "from", - "global", - "if", - "import", - "in", - "is", - "lambda", - "not", - "or", - "pass", - "raise", - "return", - "try", - "while", - "with", - "yield", -] - - -@pytest.fixture -def special_words() -> list[str]: - return SPECIAL_WORDS - - -@pytest.fixture -def png_data() -> bytes: - with open(str(FILE_FOLDER / "data/image.png"), "rb") as file_in: - return file_in.read() - - -@pytest.fixture -def jpg_data() -> bytes: - with open(str(FILE_FOLDER / "data/image.jpg"), "rb") as file_in: - return file_in.read() diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_clear_output_folder.py b/packages/http-client-python/generator/test/azure/mock_api_tests/test_clear_output_folder.py deleted file mode 100644 index 5c85955dbe0..00000000000 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/test_clear_output_folder.py +++ /dev/null @@ -1,14 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -from pathlib import Path - -GENERATED_PATH = Path(__file__).parent.parent.resolve() / "generated" - - -def test_clear_output_folder(): - folder = GENERATED_PATH / "authentication-api-key/authentication/apikey/_operations" - assert folder.exists(), "Operations folder should exist" - assert not (folder / "to_be_deleted.py").exists(), "File to_be_deleted.py should be deleted after regeneration" diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_payload_multipart.py b/packages/http-client-python/generator/test/azure/mock_api_tests/test_payload_multipart.py deleted file mode 100644 index d6d4988ae2e..00000000000 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/test_payload_multipart.py +++ /dev/null @@ -1,171 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -from pathlib import Path -import pytest -from payload.multipart import MultiPartClient, models - -JPG = Path(__file__).parent / "data/image.jpg" -PNG = Path(__file__).parent / "data/image.png" - - -@pytest.fixture -def client(): - with MultiPartClient(endpoint="http://localhost:3000") as client: - yield client - - -def test_anonymous_model(client: MultiPartClient): - client.form_data.anonymous_model({"profileImage": open(str(JPG), "rb")}) - - -def test_basic(client: MultiPartClient): - client.form_data.basic( - models.MultiPartRequest( - id="123", - profile_image=open(str(JPG), "rb"), - ) - ) - - -def test_binary_array_parts(client: MultiPartClient): - client.form_data.binary_array_parts( - models.BinaryArrayPartsRequest( - id="123", - pictures=[ - open(str(PNG), "rb"), - open(str(PNG), "rb"), - ], - ) - ) - - -def test_check_file_name_and_content_type(client: MultiPartClient): - client.form_data.check_file_name_and_content_type( - models.MultiPartRequest( - id="123", - profile_image=("hello.jpg", open(str(JPG), "rb"), "image/jpg"), - ) - ) - - -def test_complex(client: MultiPartClient): - client.form_data.file_array_and_basic( - models.ComplexPartsRequest( - id="123", - address=models.Address(city="X"), - pictures=[ - open(str(PNG), "rb"), - open(str(PNG), "rb"), - ], - profile_image=open(str(JPG), "rb"), - ) - ) - - -def test_json_part(client: MultiPartClient): - client.form_data.json_part( - models.JsonPartRequest( - address=models.Address(city="X"), - profile_image=open(str(JPG), "rb"), - ) - ) - - -def test_multi_binary_parts(client: MultiPartClient): - client.form_data.multi_binary_parts( - models.MultiBinaryPartsRequest( - profile_image=open(str(JPG), "rb"), - picture=open(str(PNG), "rb"), - ) - ) - client.form_data.multi_binary_parts( - models.MultiBinaryPartsRequest( - profile_image=open(str(JPG), "rb"), - ) - ) - - -def test_file_with_http_part_specific_content_type(client: MultiPartClient): - client.form_data.http_parts.content_type.image_jpeg_content_type( - models.FileWithHttpPartSpecificContentTypeRequest( - profile_image=("hello.jpg", open(str(JPG), "rb"), "image/jpg"), - ) - ) - - -def test_file_with_http_part_required_content_type(client: MultiPartClient): - client.form_data.http_parts.content_type.required_content_type( - models.FileWithHttpPartRequiredContentTypeRequest( - profile_image=open(str(JPG), "rb"), - ) - ) - - -def test_file_with_http_part_optional_content_type(client: MultiPartClient): - # call twice: one with content type, one without - client.form_data.http_parts.content_type.optional_content_type( - models.FileWithHttpPartOptionalContentTypeRequest( - profile_image=("hello.jpg", open(str(JPG), "rb").read()), - ) - ) - client.form_data.http_parts.content_type.optional_content_type( - models.FileWithHttpPartOptionalContentTypeRequest( - profile_image=("hello.jpg", open(str(JPG), "rb").read(), "application/octet-stream"), - ) - ) - - -def test_complex_with_http_part(client: MultiPartClient): - client.form_data.http_parts.json_array_and_file_array( - models.ComplexHttpPartsModelRequest( - id="123", - previous_addresses=[ - models.Address(city="Y"), - models.Address(city="Z"), - ], - address=models.Address(city="X"), - pictures=[ - open(str(PNG), "rb"), - open(str(PNG), "rb"), - ], - profile_image=open(str(JPG), "rb"), - ) - ) - - -def test_http_parts_non_string_float(client: MultiPartClient): - client.form_data.http_parts.non_string.float(models.FloatRequest(temperature=0.5)) - - -def test_with_wire_name(client: MultiPartClient): - client.form_data.with_wire_name( - models.MultiPartRequestWithWireName( - identifier="123", - image=open(str(JPG), "rb"), - ) - ) - - -def test_optional_parts(client: MultiPartClient): - # First time with only id - client.form_data.optional_parts( - models.MultiPartOptionalRequest( - id="123", - ) - ) - # Second time with only profileImage - client.form_data.optional_parts( - models.MultiPartOptionalRequest( - profile_image=open(str(JPG), "rb"), - ) - ) - # Third time with both id and profileImage - client.form_data.optional_parts( - models.MultiPartOptionalRequest( - id="123", - profile_image=open(str(JPG), "rb"), - ) - ) diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_special_words.py b/packages/http-client-python/generator/test/azure/mock_api_tests/test_special_words.py deleted file mode 100644 index cc083c94c0e..00000000000 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/test_special_words.py +++ /dev/null @@ -1,58 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import pytest -from specialwords import SpecialWordsClient, models - - -@pytest.fixture -def client(): - with SpecialWordsClient() as client: - yield client - - -def test_operations(client: SpecialWordsClient, special_words): - for sw in special_words: - suffix = "" if sw == "constructor" else "_method" - getattr(client.operations, sw + suffix)() - - -def test_parameter(client: SpecialWordsClient, special_words): - for sw in special_words: - suffix = "" if sw == "constructor" else "_parameter" - getattr(client.parameters, "with_" + sw)(**{sw + suffix: "ok"}) - client.parameters.with_cancellation_token(cancellation_token="ok") - - -def test_model(client: SpecialWordsClient, special_words): - for sw in special_words: - suffix = "" if sw == "constructor" else "Model" - model = getattr(models, sw.capitalize() + suffix) - getattr(client.models, "with_" + sw)(model(name="ok")) - - -def test_model_properties(client: SpecialWordsClient): - client.model_properties.same_as_model(models.SameAsModel(same_as_model="ok")) - - -def test_model_properties_dict_methods(client: SpecialWordsClient): - client.model_properties.dict_methods( - body=models.DictMethods( - keys_property="ok", - items_property="ok", - values_property="ok", - popitem_property="ok", - clear_property="ok", - update_property="ok", - setdefault_property="ok", - pop_property="ok", - get_property="ok", - copy_property="ok", - ) - ) - - -def test_model_properties_with_list(client: SpecialWordsClient): - client.model_properties.with_list(models.ModelWithList(list="ok")) diff --git a/packages/http-client-python/generator/test/azure/requirements.txt b/packages/http-client-python/generator/test/azure/requirements.txt deleted file mode 100644 index 605b54125e2..00000000000 --- a/packages/http-client-python/generator/test/azure/requirements.txt +++ /dev/null @@ -1,118 +0,0 @@ --r ../dev_requirements.txt --e ../../ -azure-mgmt-core==1.6.0 - -# only for azure --e ./generated/azure-client-generator-core-access --e ./generated/azure-client-generator-core-api-version-header --e ./generated/azure-client-generator-core-api-version-path --e ./generated/azure-client-generator-core-api-version-query --e ./generated/azure-client-generator-core-client-initialization --e ./generated/azure-client-generator-core-deserialize-empty-string-as-null --e ./generated/azure-client-generator-core-flatten-property --e ./generated/azure-client-generator-core-hierarchy-building --e ./generated/azure-client-generator-core-usage --e ./generated/azure-client-generator-core-override --e ./generated/azure-client-generator-core-client-location-move-method-parameter-to-client --e ./generated/azure-client-generator-core-client-location-move-to-existing-sub-client --e ./generated/azure-client-generator-core-client-location-move-to-new-sub-client --e ./generated/azure-client-generator-core-client-location-move-to-root-client --e ./generated/azure-client-generator-core-client-default-value --e ./generated/azure-client-generator-core-alternate-type --e ./generated/azure-client-generator-core-next-link-verb --e ./generated/azure-core-basic --e ./generated/azure-core-scalar --e ./generated/azure-core-lro-rpc --e ./generated/azure-core-lro-standard --e ./generated/azure-core-model --e ./generated/azure-core-traits --e ./generated/azure-core-page --e ./generated/azure-encode-duration --e ./generated/azure-special-headers-client-request-id/ --e ./generated/azure-example-basic --e ./generated/azure-resource-manager-common-properties --e ./generated/azure-resource-manager-large-header --e ./generated/azure-resource-manager-non-resource --e ./generated/azure-resource-manager-operation-templates --e ./generated/azure-resource-manager-resources --e ./generated/azure-resource-manager-method-subscription-id --e ./generated/azure-resource-manager-multi-service --e ./generated/azure-versioning-previewversion --e ./generated/client-namespace --e ./generated/azure-payload-pageable --e ./generated/client-naming --e ./generated/client-naming-enum-conflict --e ./generated/client-overload --e ./generated/client-structure-default --e ./generated/client-structure-clientoperationgroup --e ./generated/client-structure-multiclient --e ./generated/client-structure-renamedoperation --e ./generated/client-structure-twooperationgroup --e ./generated/resiliency-srv-driven1 --e ./generated/resiliency-srv-driven2 --e ./generated/service-multi-service - -# common test case --e ./generated/authentication-api-key --e ./generated/authentication-http-custom --e ./generated/authentication-noauth-union --e ./generated/authentication-oauth2 --e ./generated/authentication-union --e ./generated/setuppy-authentication-union --e ./generated/specs-documentation --e ./generated/encode-duration --e ./generated/encode-numeric --e ./generated/encode-array --e ./generated/parameters-basic --e ./generated/parameters-collection-format --e ./generated/parameters-path --e ./generated/parameters-query --e ./generated/parameters-spread --e ./generated/serialization-encoded-name-json --e ./generated/server-endpoint-not-defined --e ./generated/server-path-multiple --e ./generated/server-path-single --e ./generated/server-versions-versioned --e ./generated/server-versions-not-versioned --e ./generated/special-words --e ./generated/streaming-jsonl --e ./generated/typetest-array --e ./generated/typetest-dictionary --e ./generated/typetest-enum-extensible --e ./generated/typetest-enum-fixed --e ./generated/typetest-model-enumdiscriminator --e ./generated/typetest-model-nesteddiscriminator --e ./generated/typetest-model-notdiscriminated --e ./generated/typetest-model-singlediscriminator --e ./generated/typetest-model-recursive --e ./generated/typetest-model-usage --e ./generated/typetest-model-visibility --e ./generated/typetest-property-nullable --e ./generated/typetest-property-optional --e ./generated/typetest-property-valuetypes --e ./generated/typetest-property-additionalproperties --e ./generated/typetest-scalar --e ./generated/typetest-union --e ./generated/typetest-discriminatedunion --e ./generated/typetest-model-empty --e ./generated/headasbooleantrue --e ./generated/headasbooleanfalse --e ./generated/parameters-body-optionality --e ./generated/special-headers-repeatability --e ./generated/special-headers-conditional-request --e ./generated/encode-datetime --e ./generated/encode-bytes --e ./generated/payload-content-negotiation --e ./generated/payload-json-merge-patch --e ./generated/payload-pageable --e ./generated/payload-multipart --e ./generated/payload-media-type --e ./generated/payload-xml --e ./generated/routes --e ./generated/response-status-code-range --e ./generated/versioning-added --e ./generated/versioning-madeoptional --e ./generated/versioning-removed --e ./generated/versioning-renamedfrom --e ./generated/versioning-returntypechangedfrom --e ./generated/versioning-typechangedfrom diff --git a/packages/http-client-python/generator/test/azure/tox.ini b/packages/http-client-python/generator/test/azure/tox.ini deleted file mode 100644 index b0fa92a1098..00000000000 --- a/packages/http-client-python/generator/test/azure/tox.ini +++ /dev/null @@ -1,64 +0,0 @@ -[tox] -envlist=base, lint, mypy, pyright, apiview, sphinx -skipsdist=True - -[testenv:ci] -deps= - -r requirements.txt -commands = - # pytest - {[testenv:test]commands} - - # pylint - {[testenv:lint]commands} - - # mypy - {[testenv:mypy]commands} - - # pyright - {[testenv:pyright]commands} - - # apiview - {[testenv:apiview]commands} - - # sphinx docstring validation - {[testenv:sphinx]commands} - -[testenv:test] -deps= - -r requirements.txt -commands = - pytest mock_api_tests ../generic_mock_api_tests - -[testenv:lint] -deps= - -r requirements.txt -commands = - pip install azure-pylint-guidelines-checker==0.5.2 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/" - python ../../../eng/scripts/ci/run_pylint.py -t azure -s "generated" {posargs} - -[testenv:mypy] -deps= - -r requirements.txt -commands = - python ../../../eng/scripts/ci/run_mypy.py -t azure -s "generated" {posargs} - -[testenv:pyright] -deps= - -r requirements.txt -commands = - python ../../../eng/scripts/ci/run_pyright.py -t azure -s "generated" {posargs} - -[testenv:apiview] -deps= - -r requirements.txt -commands = - pip install apiview-stub-generator==0.3.19 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/" - python ../../../eng/scripts/ci/run_apiview.py -t azure -s "generated" {posargs} - -[testenv:sphinx] -basepython = python3.10 -deps= - -r requirements.txt -commands = - python ../../../eng/scripts/ci/run_sphinx_build.py -t azure -s "generated" {posargs} diff --git a/packages/http-client-python/generator/test/dev_requirements.txt b/packages/http-client-python/generator/test/dev_requirements.txt deleted file mode 100644 index 36025bb5b70..00000000000 --- a/packages/http-client-python/generator/test/dev_requirements.txt +++ /dev/null @@ -1,8 +0,0 @@ --r ../../eng/scripts/ci/dev_requirements.txt -aiohttp -pytest-asyncio==0.14.0 -requests==2.32.2 -sphinx==8.2.0 -sphinx_rtd_theme==3.0.2 -myst_parser==4.0.1 -sphinxcontrib-jquery==4.1 diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_payload_xml_async.py b/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_payload_xml_async.py deleted file mode 100644 index 07905890cc3..00000000000 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_payload_xml_async.py +++ /dev/null @@ -1,119 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import pytest -from payload.xml.aio import XmlClient -from payload.xml.models import ( - SimpleModel, - ModelWithSimpleArrays, - ModelWithArrayOfModel, - ModelWithAttributes, - ModelWithUnwrappedArray, - ModelWithRenamedArrays, - ModelWithOptionalField, - ModelWithRenamedFields, - ModelWithEmptyArray, - ModelWithText, - ModelWithDictionary, - ModelWithEncodedNames, -) - - -@pytest.fixture -async def client(): - async with XmlClient(endpoint="http://localhost:3000") as client: - yield client - - -@pytest.mark.asyncio -async def test_simple_model(client: XmlClient): - model = SimpleModel(name="foo", age=123) - assert await client.simple_model_value.get() == model - await client.simple_model_value.put(model) - - -@pytest.mark.asyncio -async def test_model_with_simple_arrays(client: XmlClient): - model = ModelWithSimpleArrays(colors=["red", "green", "blue"], counts=[1, 2]) - assert await client.model_with_simple_arrays_value.get() == model - await client.model_with_simple_arrays_value.put(model) - - -@pytest.mark.asyncio -async def test_model_with_array_of_model(client: XmlClient): - model = ModelWithArrayOfModel( - items_property=[ - SimpleModel(name="foo", age=123), - SimpleModel(name="bar", age=456), - ] - ) - assert await client.model_with_array_of_model_value.get() == model - await client.model_with_array_of_model_value.put(model) - - -@pytest.mark.asyncio -async def test_model_with_attributes(client: XmlClient): - model = ModelWithAttributes(id1=123, id2="foo", enabled=True) - assert await client.model_with_attributes_value.get() == model - await client.model_with_attributes_value.put(model) - - -@pytest.mark.asyncio -async def test_model_with_unwrapped_array(client: XmlClient): - model = ModelWithUnwrappedArray(colors=["red", "green", "blue"], counts=[1, 2]) - assert await client.model_with_unwrapped_array_value.get() == model - await client.model_with_unwrapped_array_value.put(model) - - -@pytest.mark.asyncio -async def test_model_with_renamed_arrays(client: XmlClient): - model = ModelWithRenamedArrays(colors=["red", "green", "blue"], counts=[1, 2]) - assert await client.model_with_renamed_arrays_value.get() == model - await client.model_with_renamed_arrays_value.put(model) - - -@pytest.mark.asyncio -async def test_model_with_optional_field(client: XmlClient): - model = ModelWithOptionalField(item="widget") - assert await client.model_with_optional_field_value.get() == model - await client.model_with_optional_field_value.put(model) - - -@pytest.mark.asyncio -async def test_model_with_renamed_fields(client: XmlClient): - model = ModelWithRenamedFields( - input_data=SimpleModel(name="foo", age=123), - output_data=SimpleModel(name="bar", age=456), - ) - assert await client.model_with_renamed_fields_value.get() == model - await client.model_with_renamed_fields_value.put(model) - - -@pytest.mark.asyncio -async def test_model_with_empty_array(client: XmlClient): - model = ModelWithEmptyArray(items_property=[]) - assert await client.model_with_empty_array_value.get() == model - await client.model_with_empty_array_value.put(model) - - -@pytest.mark.asyncio -async def test_model_with_text(client: XmlClient): - model = ModelWithText(language="foo", content="\n This is some text.\n") - assert await client.model_with_text_value.get() == model - await client.model_with_text_value.put(model) - - -@pytest.mark.asyncio -async def test_model_with_dictionary(client: XmlClient): - model = ModelWithDictionary(metadata={"Color": "blue", "Count": "123", "Enabled": "false"}) - assert await client.model_with_dictionary_value.get() == model - await client.model_with_dictionary_value.put(model) - - -@pytest.mark.asyncio -async def test_model_with_encoded_names(client: XmlClient): - model = ModelWithEncodedNames(model_data=SimpleModel(name="foo", age=123), colors=["red", "green", "blue"]) - assert await client.model_with_encoded_names_value.get() == model - await client.model_with_encoded_names_value.put(model) diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/conftest.py b/packages/http-client-python/generator/test/generic_mock_api_tests/conftest.py deleted file mode 100644 index 00de709f440..00000000000 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/conftest.py +++ /dev/null @@ -1,75 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import os -import subprocess -import signal -import pytest -import importlib -from pathlib import Path - -DATA_FOLDER = Path(__file__).parent.parent - - -def start_server_process(): - azure_http_path = Path(os.path.dirname(__file__)) / Path("../../../node_modules/@azure-tools/azure-http-specs") - http_path = Path(os.path.dirname(__file__)) / Path("../../../node_modules/@typespec/http-specs") - if "unbranded" in Path(os.getcwd()).parts: - os.chdir(http_path.resolve()) - cmd = "npx tsp-spector serve ./specs" - else: - os.chdir(azure_http_path.resolve()) - cmd = f"npx tsp-spector serve ./specs {(http_path / 'specs').resolve()}" - if os.name == "nt": - return subprocess.Popen(cmd, shell=True) - return subprocess.Popen(cmd, shell=True, preexec_fn=os.setsid) - - -def terminate_server_process(process): - if os.name == "nt": - process.kill() - else: - os.killpg(os.getpgid(process.pid), signal.SIGTERM) # Send the signal to all the process groups - - -@pytest.fixture(scope="session", autouse=True) -def testserver(): - """Start spector mock api tests""" - server = start_server_process() - yield - terminate_server_process(server) - - -""" -Use to disambiguate the core library we use -""" - - -@pytest.fixture -def core_library(): - try: - return importlib.import_module("azure.core") - except ModuleNotFoundError: - return importlib.import_module("corehttp") - - -@pytest.fixture -def key_credential(core_library): - try: - return core_library.credentials.AzureKeyCredential - except AttributeError: - return core_library.credentials.ServiceKeyCredential - - -@pytest.fixture -def png_data() -> bytes: - with open(str(DATA_FOLDER / "data/image.png"), "rb") as file_in: - return file_in.read() - - -@pytest.fixture -def jpg_data() -> bytes: - with open(str(DATA_FOLDER / "data/image.jpg"), "rb") as file_in: - return file_in.read() diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_payload_xml.py b/packages/http-client-python/generator/test/generic_mock_api_tests/test_payload_xml.py deleted file mode 100644 index 252b6abbd4d..00000000000 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/test_payload_xml.py +++ /dev/null @@ -1,107 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import pytest -from payload.xml import XmlClient -from payload.xml.models import ( - SimpleModel, - ModelWithSimpleArrays, - ModelWithArrayOfModel, - ModelWithAttributes, - ModelWithUnwrappedArray, - ModelWithRenamedArrays, - ModelWithOptionalField, - ModelWithRenamedFields, - ModelWithEmptyArray, - ModelWithText, - ModelWithDictionary, - ModelWithEncodedNames, -) - - -@pytest.fixture -def client(): - with XmlClient(endpoint="http://localhost:3000") as client: - yield client - - -def test_simple_model(client: XmlClient): - model = SimpleModel(name="foo", age=123) - assert client.simple_model_value.get() == model - client.simple_model_value.put(model) - - -def test_model_with_simple_arrays(client: XmlClient): - model = ModelWithSimpleArrays(colors=["red", "green", "blue"], counts=[1, 2]) - assert client.model_with_simple_arrays_value.get() == model - client.model_with_simple_arrays_value.put(model) - - -def test_model_with_array_of_model(client: XmlClient): - model = ModelWithArrayOfModel( - items_property=[ - SimpleModel(name="foo", age=123), - SimpleModel(name="bar", age=456), - ] - ) - assert client.model_with_array_of_model_value.get() == model - client.model_with_array_of_model_value.put(model) - - -def test_model_with_attributes(client: XmlClient): - model = ModelWithAttributes(id1=123, id2="foo", enabled=True) - assert client.model_with_attributes_value.get() == model - client.model_with_attributes_value.put(model) - - -def test_model_with_unwrapped_array(client: XmlClient): - model = ModelWithUnwrappedArray(colors=["red", "green", "blue"], counts=[1, 2]) - assert client.model_with_unwrapped_array_value.get() == model - client.model_with_unwrapped_array_value.put(model) - - -def test_model_with_renamed_arrays(client: XmlClient): - model = ModelWithRenamedArrays(colors=["red", "green", "blue"], counts=[1, 2]) - assert client.model_with_renamed_arrays_value.get() == model - client.model_with_renamed_arrays_value.put(model) - - -def test_model_with_optional_field(client: XmlClient): - model = ModelWithOptionalField(item="widget") - assert client.model_with_optional_field_value.get() == model - client.model_with_optional_field_value.put(model) - - -def test_model_with_renamed_fields(client: XmlClient): - model = ModelWithRenamedFields( - input_data=SimpleModel(name="foo", age=123), - output_data=SimpleModel(name="bar", age=456), - ) - assert client.model_with_renamed_fields_value.get() == model - client.model_with_renamed_fields_value.put(model) - - -def test_model_with_empty_array(client: XmlClient): - model = ModelWithEmptyArray(items_property=[]) - assert client.model_with_empty_array_value.get() == model - client.model_with_empty_array_value.put(model) - - -def test_model_with_text(client: XmlClient): - model = ModelWithText(language="foo", content="\n This is some text.\n") - assert client.model_with_text_value.get() == model - client.model_with_text_value.put(model) - - -def test_model_with_dictionary(client: XmlClient): - model = ModelWithDictionary(metadata={"Color": "blue", "Count": "123", "Enabled": "false"}) - assert client.model_with_dictionary_value.get() == model - client.model_with_dictionary_value.put(model) - - -def test_model_with_encoded_names(client: XmlClient): - model = ModelWithEncodedNames(model_data=SimpleModel(name="foo", age=123), colors=["red", "green", "blue"]) - assert client.model_with_encoded_names_value.get() == model - client.model_with_encoded_names_value.put(model) diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_encode_duration_async.py b/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_encode_duration_async.py deleted file mode 100644 index f14c436a8f8..00000000000 --- a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_encode_duration_async.py +++ /dev/null @@ -1,63 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import datetime - -import pytest -from encode.duration.aio import DurationClient -from encode.duration.property.models import ( - Int32SecondsDurationProperty, - ISO8601DurationProperty, - FloatSecondsDurationProperty, - DefaultDurationProperty, - FloatSecondsDurationArrayProperty, -) - - -@pytest.fixture -async def client(): - async with DurationClient() as client: - yield client - - -@pytest.mark.asyncio -async def test_query(client: DurationClient): - await client.query.default(input=datetime.timedelta(days=40)) - await client.query.iso8601(input=datetime.timedelta(days=40)) - await client.query.int32_seconds(input=36) - await client.query.int32_seconds_array(input=[36, 47]) - await client.query.float_seconds(input=35.625) - await client.query.float64_seconds(input=35.625) - - -@pytest.mark.asyncio -async def test_property(client: DurationClient): - result = await client.property.default(DefaultDurationProperty(value=datetime.timedelta(days=40))) - assert result.value == datetime.timedelta(days=40) - result = await client.property.default(DefaultDurationProperty(value="P40D")) - assert result.value == datetime.timedelta(days=40) - result = await client.property.iso8601(ISO8601DurationProperty(value=datetime.timedelta(days=40))) - assert result.value == datetime.timedelta(days=40) - result = await client.property.iso8601(ISO8601DurationProperty(value="P40D")) - assert result.value == datetime.timedelta(days=40) - result = await client.property.int32_seconds(Int32SecondsDurationProperty(value=36)) - assert result.value == 36 - result = await client.property.float_seconds(FloatSecondsDurationProperty(value=35.625)) - assert abs(result.value - 35.625) < 0.0001 - result = await client.property.float64_seconds(FloatSecondsDurationProperty(value=35.625)) - assert abs(result.value - 35.625) < 0.0001 - result = await client.property.float_seconds_array(FloatSecondsDurationArrayProperty(value=[35.625, 46.75])) - assert abs(result.value[0] - 35.625) < 0.0001 - assert abs(result.value[1] - 46.75) < 0.0001 - - -@pytest.mark.asyncio -async def test_header(client: DurationClient): - await client.header.default(duration=datetime.timedelta(days=40)) - await client.header.iso8601(duration=datetime.timedelta(days=40)) - await client.header.iso8601_array(duration=[datetime.timedelta(days=40), datetime.timedelta(days=50)]) - await client.header.int32_seconds(duration=36) - await client.header.float_seconds(duration=35.625) - await client.header.float64_seconds(duration=35.625) diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_encode_numeric_async.py b/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_encode_numeric_async.py deleted file mode 100644 index 19e4f619f2c..00000000000 --- a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_encode_numeric_async.py +++ /dev/null @@ -1,35 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import pytest -from encode.numeric.aio import NumericClient -from encode.numeric.property import models - - -@pytest.fixture -async def client(): - async with NumericClient() as client: - yield client - - -@pytest.mark.asyncio -async def test_safeint_as_string(client: NumericClient): - result = await client.property.safeint_as_string(models.SafeintAsStringProperty(value=10000000000)) - assert result.value == 10000000000 - assert result["value"] == "10000000000" - - -@pytest.mark.asyncio -async def test_uint32_as_string_optional(client: NumericClient): - result = await client.property.uint32_as_string_optional(models.Uint32AsStringProperty(value=1)) - assert result.value == 1 - assert result["value"] == "1" - - -@pytest.mark.asyncio -async def test_uint8_as_string_optional(client: NumericClient): - result = await client.property.uint8_as_string(models.Uint32AsStringProperty(value=255)) - assert result.value == 255 - assert result["value"] == "255" diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_parameters_basic_async.py b/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_parameters_basic_async.py deleted file mode 100644 index 81a0deecdd5..00000000000 --- a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_parameters_basic_async.py +++ /dev/null @@ -1,24 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import pytest -from parameters.basic.aio import BasicClient -from parameters.basic.explicitbody.models import User - - -@pytest.fixture -async def client(): - async with BasicClient() as client: - yield client - - -@pytest.mark.asyncio -async def test_explicit_simple(client: BasicClient): - await client.explicit_body.simple(User(name="foo")) - - -@pytest.mark.asyncio -async def test_implicit_simple(client: BasicClient): - await client.implicit_body.simple(name="foo") diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_parameters_spread_async.py b/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_parameters_spread_async.py deleted file mode 100644 index 89f3cec4819..00000000000 --- a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_parameters_spread_async.py +++ /dev/null @@ -1,76 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import pytest -from parameters.spread.aio import SpreadClient -from parameters.spread.model.models import BodyParameter - - -@pytest.fixture -async def client(): - async with SpreadClient() as client: - yield client - - -@pytest.mark.asyncio -async def test_model_body(client: SpreadClient): - await client.model.spread_as_request_body(name="foo") - - -@pytest.mark.asyncio -async def test_model_composite_request_only_with_body(client: SpreadClient): - await client.model.spread_composite_request_only_with_body(BodyParameter(name="foo")) - - -@pytest.mark.asyncio -async def test_model_composite_request_without_body(client: SpreadClient): - await client.model.spread_composite_request_without_body(name="foo", test_header="bar") - - -@pytest.mark.asyncio -async def test_model_composite_request(client: SpreadClient): - await client.model.spread_composite_request(name="foo", body=BodyParameter(name="foo"), test_header="bar") - - -@pytest.mark.asyncio -async def test_model_composite_request_mix(client: SpreadClient): - await client.model.spread_composite_request_mix(name="foo", prop="foo", test_header="bar") - - -@pytest.mark.asyncio -async def test_alias_body(client: SpreadClient): - await client.alias.spread_as_request_body(name="foo") - - -@pytest.mark.asyncio -async def test_alias_parameter(client: SpreadClient): - await client.alias.spread_as_request_parameter("1", x_ms_test_header="bar", name="foo") - - -@pytest.mark.asyncio -async def test_alias_multiple_parameter(client: SpreadClient): - await client.alias.spread_with_multiple_parameters( - "1", - x_ms_test_header="bar", - required_string="foo", - required_int_list=[1, 2], - optional_string_list=["foo", "bar"], - optional_int=1, - ) - await client.alias.spread_with_multiple_parameters( - "1", - {"requiredString": "foo", "optionalInt": 1, "requiredIntList": [1, 2], "optionalStringList": ["foo", "bar"]}, - x_ms_test_header="bar", - ) - - -@pytest.mark.asyncio -async def test_inner_model(client: SpreadClient): - await client.alias.spread_parameter_with_inner_model(id="1", x_ms_test_header="bar", body={"name": "foo"}) - - -@pytest.mark.asyncio -async def test_inner_alias(client: SpreadClient): - await client.alias.spread_parameter_with_inner_alias(id="1", x_ms_test_header="bar", body={"name": "foo", "age": 1}) diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_payload_content_negotiation_async.py b/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_payload_content_negotiation_async.py deleted file mode 100644 index 27db476d9c5..00000000000 --- a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_payload_content_negotiation_async.py +++ /dev/null @@ -1,37 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import base64 -import pytest -from payload.contentnegotiation.aio import ContentNegotiationClient -from payload.contentnegotiation.differentbody.models import PngImageAsJson - - -@pytest.fixture -async def client(): - async with ContentNegotiationClient(endpoint="http://localhost:3000") as client: - yield client - - -@pytest.mark.asyncio -async def test_get_avatar_as_png(client: ContentNegotiationClient, png_data: bytes): - assert b"".join([d async for d in (await client.same_body.get_avatar_as_png())]) == png_data - - -@pytest.mark.asyncio -async def test_get_avatar_as_jpeg(client: ContentNegotiationClient, jpg_data: bytes): - assert b"".join([d async for d in (await client.same_body.get_avatar_as_jpeg())]) == jpg_data - - -@pytest.mark.asyncio -async def test_different_body_get_avatar_as_png(client: ContentNegotiationClient, png_data: bytes): - assert b"".join([d async for d in (await client.different_body.get_avatar_as_png())]) == png_data - - -@pytest.mark.asyncio -async def test_different_body_get_avatar_as_json(client: ContentNegotiationClient, png_data: bytes): - result = await client.different_body.get_avatar_as_json() - expected = PngImageAsJson(content=base64.b64encode(png_data).decode()) - assert result == expected diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_payload_multipart_async.py b/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_payload_multipart_async.py deleted file mode 100644 index 08465107a75..00000000000 --- a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_payload_multipart_async.py +++ /dev/null @@ -1,187 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -from pathlib import Path -import pytest -from payload.multipart import models -from payload.multipart.aio import MultiPartClient -from payload.multipart.formdata.httpparts.nonstring.models import FloatRequest - -JPG = Path(__file__).parent.parent / "data/image.jpg" -PNG = Path(__file__).parent.parent / "data/image.png" - - -@pytest.fixture -async def client(): - async with MultiPartClient(endpoint="http://localhost:3000") as client: - yield client - - -@pytest.mark.asyncio -async def test_anonymous_model(client: MultiPartClient): - await client.form_data.anonymous_model({"profileImage": open(str(JPG), "rb")}) - - -@pytest.mark.asyncio -async def test_basic(client: MultiPartClient): - await client.form_data.basic( - models.MultiPartRequest( - id="123", - profile_image=open(str(JPG), "rb"), - ) - ) - - -@pytest.mark.asyncio -async def test_binary_array_parts(client: MultiPartClient): - await client.form_data.binary_array_parts( - models.BinaryArrayPartsRequest( - id="123", - pictures=[ - open(str(PNG), "rb"), - open(str(PNG), "rb"), - ], - ) - ) - - -@pytest.mark.asyncio -async def test_check_file_name_and_content_type(client: MultiPartClient): - await client.form_data.check_file_name_and_content_type( - models.MultiPartRequest( - id="123", - profile_image=("hello.jpg", open(str(JPG), "rb"), "image/jpg"), - ) - ) - - -@pytest.mark.asyncio -async def test_complex(client: MultiPartClient): - await client.form_data.file_array_and_basic( - models.ComplexPartsRequest( - id="123", - address=models.Address(city="X"), - pictures=[ - open(str(PNG), "rb"), - open(str(PNG), "rb"), - ], - profile_image=open(str(JPG), "rb"), - ) - ) - - -@pytest.mark.asyncio -async def test_json_part(client: MultiPartClient): - await client.form_data.json_part( - models.JsonPartRequest( - address=models.Address(city="X"), - profile_image=open(str(JPG), "rb"), - ) - ) - - -@pytest.mark.asyncio -async def test_multi_binary_parts(client: MultiPartClient): - await client.form_data.multi_binary_parts( - models.MultiBinaryPartsRequest( - profile_image=open(str(JPG), "rb"), - picture=open(str(PNG), "rb"), - ) - ) - await client.form_data.multi_binary_parts( - models.MultiBinaryPartsRequest( - profile_image=open(str(JPG), "rb"), - ) - ) - - -@pytest.mark.asyncio -async def test_file_with_http_part_specific_content_type(client: MultiPartClient): - await client.form_data.http_parts.content_type.image_jpeg_content_type( - models.FileWithHttpPartSpecificContentTypeRequest( - profile_image=("hello.jpg", open(str(JPG), "rb"), "image/jpg"), - ) - ) - - -@pytest.mark.asyncio -async def test_file_with_http_part_required_content_type(client: MultiPartClient): - await client.form_data.http_parts.content_type.required_content_type( - models.FileWithHttpPartRequiredContentTypeRequest( - profile_image=open(str(JPG), "rb"), - ) - ) - - -@pytest.mark.asyncio -async def test_file_with_http_part_optional_content_type(client: MultiPartClient): - # call twice: one with content type, one without - await client.form_data.http_parts.content_type.optional_content_type( - models.FileWithHttpPartOptionalContentTypeRequest( - profile_image=("hello.jpg", open(str(JPG), "rb").read()), - ) - ) - await client.form_data.http_parts.content_type.optional_content_type( - models.FileWithHttpPartOptionalContentTypeRequest( - profile_image=("hello.jpg", open(str(JPG), "rb").read(), "application/octet-stream"), - ) - ) - - -@pytest.mark.asyncio -async def test_complex_with_http_part(client: MultiPartClient): - await client.form_data.http_parts.json_array_and_file_array( - models.ComplexHttpPartsModelRequest( - id="123", - previous_addresses=[ - models.Address(city="Y"), - models.Address(city="Z"), - ], - address=models.Address(city="X"), - pictures=[ - open(str(PNG), "rb"), - open(str(PNG), "rb"), - ], - profile_image=open(str(JPG), "rb"), - ) - ) - - -@pytest.mark.asyncio -async def test_http_parts_non_string_float(client: MultiPartClient): - await client.form_data.http_parts.non_string.float(FloatRequest(temperature=0.5)) - - -@pytest.mark.asyncio -async def test_with_wire_name(client: MultiPartClient): - await client.form_data.with_wire_name( - models.MultiPartRequestWithWireName( - identifier="123", - image=open(str(JPG), "rb"), - ) - ) - - -@pytest.mark.asyncio -async def test_optional_parts(client: MultiPartClient): - # First time with only id - await client.form_data.optional_parts( - models.MultiPartOptionalRequest( - id="123", - ) - ) - # Second time with only profileImage - await client.form_data.optional_parts( - models.MultiPartOptionalRequest( - profile_image=open(str(JPG), "rb"), - ) - ) - # Third time with both id and profileImage - await client.form_data.optional_parts( - models.MultiPartOptionalRequest( - id="123", - profile_image=open(str(JPG), "rb"), - ) - ) diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_serialization_encoded_name_json_async.py b/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_serialization_encoded_name_json_async.py deleted file mode 100644 index 7234c7e253a..00000000000 --- a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_serialization_encoded_name_json_async.py +++ /dev/null @@ -1,24 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import pytest -from serialization.encodedname.json.aio import JsonClient -from serialization.encodedname.json.property import models - - -@pytest.fixture -async def client(): - async with JsonClient() as client: - yield client - - -@pytest.mark.asyncio -async def test_property_send(client: JsonClient): - await client.property.send(models.JsonEncodedNameModel(default_name=True)) - - -@pytest.mark.asyncio -async def test_property_get(client: JsonClient): - assert (await client.property.get()).default_name diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_special_words_async.py b/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_special_words_async.py deleted file mode 100644 index eb11843ab32..00000000000 --- a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_special_words_async.py +++ /dev/null @@ -1,66 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import pytest -from specialwords.aio import SpecialWordsClient -from specialwords.models import models -from specialwords.modelproperties import models as model_properties_models - - -@pytest.fixture -async def client(): - async with SpecialWordsClient() as client: - yield client - - -@pytest.mark.asyncio -async def test_operations(client: SpecialWordsClient, special_words): - for sw in special_words: - suffix = "" if sw == "constructor" else "_method" - await getattr(client.operations, sw + suffix)() - - -@pytest.mark.asyncio -async def test_parameter(client: SpecialWordsClient, special_words): - for sw in special_words: - suffix = "" if sw == "constructor" else "_parameter" - await getattr(client.parameters, "with_" + sw)(**{sw + suffix: "ok"}) - await client.parameters.with_cancellation_token(cancellation_token="ok") - - -@pytest.mark.asyncio -async def test_model(client: SpecialWordsClient, special_words): - for sw in special_words: - suffix = "" if sw == "constructor" else "Model" - model = getattr(models, sw.capitalize() + suffix) - await getattr(client.models, "with_" + sw)(model(name="ok")) - - -@pytest.mark.asyncio -async def test_model_properties(client: SpecialWordsClient): - await client.model_properties.same_as_model(model_properties_models.SameAsModel(same_as_model="ok")) - - -@pytest.mark.asyncio -async def test_model_properties_dict_methods(client: SpecialWordsClient): - await client.model_properties.dict_methods( - body=model_properties_models.DictMethods( - keys_property="ok", - items_property="ok", - values_property="ok", - popitem_property="ok", - clear_property="ok", - update_property="ok", - setdefault_property="ok", - pop_property="ok", - get_property="ok", - copy_property="ok", - ) - ) - - -@pytest.mark.asyncio -async def test_model_properties_with_list(client: SpecialWordsClient): - await client.model_properties.with_list(model_properties_models.ModelWithList(list="ok")) diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/conftest.py b/packages/http-client-python/generator/test/unbranded/mock_api_tests/conftest.py deleted file mode 100644 index 78b45a295a0..00000000000 --- a/packages/http-client-python/generator/test/unbranded/mock_api_tests/conftest.py +++ /dev/null @@ -1,91 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import os -import subprocess -import signal -import pytest -import re -from pathlib import Path - -FILE_FOLDER = Path(__file__).parent - - -def start_server_process(): - http_path = Path(os.path.dirname(__file__)) / Path("../../../../node_modules/@typespec/http-specs") - os.chdir(http_path.resolve()) - cmd = "tsp-spector serve ./specs" - if os.name == "nt": - return subprocess.Popen(cmd, shell=True) - return subprocess.Popen(cmd, shell=True, preexec_fn=os.setsid) - - -def terminate_server_process(process): - if os.name == "nt": - process.kill() - else: - os.killpg(os.getpgid(process.pid), signal.SIGTERM) # Send the signal to all the process groups - - -@pytest.fixture(scope="session", autouse=True) -def testserver(): - """Start spector mock api tests""" - server = start_server_process() - yield - terminate_server_process(server) - - -SPECIAL_WORDS = [ - "and", - "as", - "assert", - "async", - "await", - "break", - "class", - "constructor", - "continue", - "def", - "del", - "elif", - "else", - "except", - "exec", - "finally", - "for", - "from", - "global", - "if", - "import", - "in", - "is", - "lambda", - "not", - "or", - "pass", - "raise", - "return", - "try", - "while", - "with", - "yield", -] - - -@pytest.fixture -def special_words() -> list[str]: - return SPECIAL_WORDS - - -@pytest.fixture -def png_data() -> bytes: - with open(str(FILE_FOLDER / "data/image.png"), "rb") as file_in: - return file_in.read() - - -@pytest.fixture -def jpg_data() -> bytes: - with open(str(FILE_FOLDER / "data/image.jpg"), "rb") as file_in: - return file_in.read() diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/test_payload_multipart.py b/packages/http-client-python/generator/test/unbranded/mock_api_tests/test_payload_multipart.py deleted file mode 100644 index 2fdd2e7791e..00000000000 --- a/packages/http-client-python/generator/test/unbranded/mock_api_tests/test_payload_multipart.py +++ /dev/null @@ -1,172 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -from pathlib import Path -import pytest -from payload.multipart import MultiPartClient, models -from payload.multipart.formdata.httpparts.nonstring.models import FloatRequest - -JPG = Path(__file__).parent / "data/image.jpg" -PNG = Path(__file__).parent / "data/image.png" - - -@pytest.fixture -def client(): - with MultiPartClient(endpoint="http://localhost:3000") as client: - yield client - - -def test_anonymous_model(client: MultiPartClient): - client.form_data.anonymous_model({"profileImage": open(str(JPG), "rb")}) - - -def test_basic(client: MultiPartClient): - client.form_data.basic( - models.MultiPartRequest( - id="123", - profile_image=open(str(JPG), "rb"), - ) - ) - - -def test_binary_array_parts(client: MultiPartClient): - client.form_data.binary_array_parts( - models.BinaryArrayPartsRequest( - id="123", - pictures=[ - open(str(PNG), "rb"), - open(str(PNG), "rb"), - ], - ) - ) - - -def test_check_file_name_and_content_type(client: MultiPartClient): - client.form_data.check_file_name_and_content_type( - models.MultiPartRequest( - id="123", - profile_image=("hello.jpg", open(str(JPG), "rb"), "image/jpg"), - ) - ) - - -def test_complex(client: MultiPartClient): - client.form_data.file_array_and_basic( - models.ComplexPartsRequest( - id="123", - address=models.Address(city="X"), - pictures=[ - open(str(PNG), "rb"), - open(str(PNG), "rb"), - ], - profile_image=open(str(JPG), "rb"), - ) - ) - - -def test_json_part(client: MultiPartClient): - client.form_data.json_part( - models.JsonPartRequest( - address=models.Address(city="X"), - profile_image=open(str(JPG), "rb"), - ) - ) - - -def test_multi_binary_parts(client: MultiPartClient): - client.form_data.multi_binary_parts( - models.MultiBinaryPartsRequest( - profile_image=open(str(JPG), "rb"), - picture=open(str(PNG), "rb"), - ) - ) - client.form_data.multi_binary_parts( - models.MultiBinaryPartsRequest( - profile_image=open(str(JPG), "rb"), - ) - ) - - -def test_file_with_http_part_specific_content_type(client: MultiPartClient): - client.form_data.http_parts.content_type.image_jpeg_content_type( - models.FileWithHttpPartSpecificContentTypeRequest( - profile_image=("hello.jpg", open(str(JPG), "rb"), "image/jpg"), - ) - ) - - -def test_file_with_http_part_required_content_type(client: MultiPartClient): - client.form_data.http_parts.content_type.required_content_type( - models.FileWithHttpPartRequiredContentTypeRequest( - profile_image=open(str(JPG), "rb"), - ) - ) - - -def test_file_with_http_part_optional_content_type(client: MultiPartClient): - # call twice: one with content type, one without - client.form_data.http_parts.content_type.optional_content_type( - models.FileWithHttpPartOptionalContentTypeRequest( - profile_image=("hello.jpg", open(str(JPG), "rb").read()), - ) - ) - client.form_data.http_parts.content_type.optional_content_type( - models.FileWithHttpPartOptionalContentTypeRequest( - profile_image=("hello.jpg", open(str(JPG), "rb").read(), "application/octet-stream"), - ) - ) - - -def test_complex_with_http_part(client: MultiPartClient): - client.form_data.http_parts.json_array_and_file_array( - models.ComplexHttpPartsModelRequest( - id="123", - previous_addresses=[ - models.Address(city="Y"), - models.Address(city="Z"), - ], - address=models.Address(city="X"), - pictures=[ - open(str(PNG), "rb"), - open(str(PNG), "rb"), - ], - profile_image=open(str(JPG), "rb"), - ) - ) - - -def test_http_parts_non_string_float(client: MultiPartClient): - client.form_data.http_parts.non_string.float(FloatRequest(temperature=0.5)) - - -def test_with_wire_name(client: MultiPartClient): - client.form_data.with_wire_name( - models.MultiPartRequestWithWireName( - identifier="123", - image=open(str(JPG), "rb"), - ) - ) - - -def test_optional_parts(client: MultiPartClient): - # First time with only id - client.form_data.optional_parts( - models.MultiPartOptionalRequest( - id="123", - ) - ) - # Second time with only profileImage - client.form_data.optional_parts( - models.MultiPartOptionalRequest( - profile_image=open(str(JPG), "rb"), - ) - ) - # Third time with both id and profileImage - client.form_data.optional_parts( - models.MultiPartOptionalRequest( - id="123", - profile_image=open(str(JPG), "rb"), - ) - ) diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/test_special_words.py b/packages/http-client-python/generator/test/unbranded/mock_api_tests/test_special_words.py deleted file mode 100644 index 89679bfd788..00000000000 --- a/packages/http-client-python/generator/test/unbranded/mock_api_tests/test_special_words.py +++ /dev/null @@ -1,60 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import pytest -from specialwords import SpecialWordsClient -from specialwords.models import models -from specialwords.modelproperties import models as model_properties_models - - -@pytest.fixture -def client(): - with SpecialWordsClient() as client: - yield client - - -def test_operations(client: SpecialWordsClient, special_words): - for sw in special_words: - suffix = "" if sw == "constructor" else "_method" - getattr(client.operations, sw + suffix)() - - -def test_parameter(client: SpecialWordsClient, special_words): - for sw in special_words: - suffix = "" if sw == "constructor" else "_parameter" - getattr(client.parameters, "with_" + sw)(**{sw + suffix: "ok"}) - client.parameters.with_cancellation_token(cancellation_token="ok") - - -def test_model(client: SpecialWordsClient, special_words): - for sw in special_words: - suffix = "" if sw == "constructor" else "Model" - model = getattr(models, sw.capitalize() + suffix) - getattr(client.models, "with_" + sw)(model(name="ok")) - - -def test_model_properties(client: SpecialWordsClient): - client.model_properties.same_as_model(model_properties_models.SameAsModel(same_as_model="ok")) - - -def test_model_properties_dict_methods(client: SpecialWordsClient): - client.model_properties.dict_methods( - body=model_properties_models.DictMethods( - keys_property="ok", - items_property="ok", - values_property="ok", - popitem_property="ok", - clear_property="ok", - update_property="ok", - setdefault_property="ok", - pop_property="ok", - get_property="ok", - copy_property="ok", - ) - ) - - -def test_model_properties_with_list(client: SpecialWordsClient): - client.model_properties.with_list(model_properties_models.ModelWithList(list="ok")) diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/test_unbranded.py b/packages/http-client-python/generator/test/unbranded/mock_api_tests/test_unbranded.py deleted file mode 100644 index a37c81ccef3..00000000000 --- a/packages/http-client-python/generator/test/unbranded/mock_api_tests/test_unbranded.py +++ /dev/null @@ -1,64 +0,0 @@ -# ------------------------------------ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# ------------------------------------ -import os -import re -from subprocess import getoutput -from pathlib import Path -import traceback -from importlib import import_module -import pytest -from typetest.scalar import ScalarClient -from corehttp.exceptions import HttpResponseError - - -@pytest.fixture -def client(): - with ScalarClient() as client: - yield client - - -def test_module(): - with pytest.raises(ModuleNotFoundError): - import_module("azure") - - -def test_track_back(client: ScalarClient): - try: - client.string.put("to raise exception") - except HttpResponseError: - track_back = traceback.format_exc().lower() - assert "azure" not in track_back - assert "microsoft" not in track_back - - -def check_sensitive_word(folder: Path, word: str) -> str: - special_folders = ["__pycache__", "pytest_cache"] - if os.name == "nt": - skip_folders = "|".join(special_folders) - output = getoutput( - f"powershell \"ls -r -Path {folder} | where fullname -notmatch '{skip_folders}' | Select-String -Pattern '{word}'\"" - ).replace("\\", "/") - else: - skip_folders = "{" + ",".join(special_folders) + "}" - output = getoutput(f"grep -ri --exclude-dir={skip_folders} {word} {folder}") - - result = set() - for item in re.findall(f"{folder.as_posix()}[^:]+", output.replace("\n", "")): - result.add(Path(item).relative_to(folder).parts[0]) - return sorted(list(result)) - - -def test_sensitive_word(): - check_folder = (Path(os.path.dirname(__file__)) / "../generated").resolve() - assert [] == check_sensitive_word(check_folder, "azure") - # after update spector, it shall also equal to [] - assert sorted( - [ - "authentication-oauth2", - "authentication-noauth-union", - "authentication-union", - "setuppy-authentication-union", - ] - ) == sorted(check_sensitive_word(check_folder, "microsoft")) diff --git a/packages/http-client-python/generator/test/unbranded/requirements.txt b/packages/http-client-python/generator/test/unbranded/requirements.txt deleted file mode 100644 index 9a5c309bffa..00000000000 --- a/packages/http-client-python/generator/test/unbranded/requirements.txt +++ /dev/null @@ -1,67 +0,0 @@ --r ../dev_requirements.txt --e ../../ - -# common test case --e ./generated/authentication-api-key --e ./generated/authentication-http-custom --e ./generated/authentication-noauth-union --e ./generated/authentication-oauth2 --e ./generated/authentication-union --e ./generated/setuppy-authentication-union --e ./generated/specs-documentation --e ./generated/encode-duration --e ./generated/encode-numeric --e ./generated/encode-array --e ./generated/parameters-basic --e ./generated/parameters-collection-format --e ./generated/parameters-path --e ./generated/parameters-query --e ./generated/parameters-spread --e ./generated/serialization-encoded-name-json --e ./generated/server-endpoint-not-defined --e ./generated/server-path-multiple --e ./generated/server-path-single --e ./generated/server-versions-versioned --e ./generated/server-versions-not-versioned --e ./generated/special-words --e ./generated/streaming-jsonl --e ./generated/typetest-array --e ./generated/typetest-dictionary --e ./generated/typetest-enum-extensible --e ./generated/typetest-enum-fixed --e ./generated/typetest-model-enumdiscriminator --e ./generated/typetest-model-nesteddiscriminator --e ./generated/typetest-model-notdiscriminated --e ./generated/typetest-model-singlediscriminator --e ./generated/typetest-model-recursive --e ./generated/typetest-model-usage --e ./generated/typetest-model-visibility --e ./generated/typetest-property-nullable --e ./generated/typetest-property-optional --e ./generated/typetest-property-valuetypes --e ./generated/typetest-property-additionalproperties --e ./generated/typetest-scalar --e ./generated/typetest-union --e ./generated/typetest-discriminatedunion --e ./generated/typetest-model-empty --e ./generated/headasbooleantrue --e ./generated/headasbooleanfalse --e ./generated/parameters-body-optionality --e ./generated/special-headers-repeatability --e ./generated/special-headers-conditional-request --e ./generated/encode-datetime --e ./generated/encode-bytes --e ./generated/payload-content-negotiation --e ./generated/payload-json-merge-patch --e ./generated/payload-pageable --e ./generated/payload-multipart --e ./generated/payload-media-type --e ./generated/payload-xml --e ./generated/routes --e ./generated/response-status-code-range --e ./generated/versioning-added --e ./generated/versioning-madeoptional --e ./generated/versioning-removed --e ./generated/versioning-renamedfrom --e ./generated/versioning-returntypechangedfrom --e ./generated/versioning-typechangedfrom diff --git a/packages/http-client-python/generator/test/unbranded/tox.ini b/packages/http-client-python/generator/test/unbranded/tox.ini deleted file mode 100644 index ae2c163746c..00000000000 --- a/packages/http-client-python/generator/test/unbranded/tox.ini +++ /dev/null @@ -1,64 +0,0 @@ -[tox] -envlist=base, lint, mypy, pyright, apiview, sphinx -skipsdist=True - -[testenv:ci] -deps= - -r requirements.txt -commands = - # pytest - {[testenv:test]commands} - - # pylint - {[testenv:lint]commands} - - # mypy - {[testenv:mypy]commands} - - # pyright - {[testenv:pyright]commands} - - # apiview - {[testenv:apiview]commands} - - # sphinx docstring validation - {[testenv:sphinx]commands} - -[testenv:test] -deps= - -r requirements.txt -commands = - pytest mock_api_tests ../generic_mock_api_tests - -[testenv:lint] -deps= - -r requirements.txt -commands = - pip install azure-pylint-guidelines-checker==0.5.2 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/" - python ../../../eng/scripts/ci/run_pylint.py -t unbranded -s "generated" {posargs} - -[testenv:mypy] -deps= - -r requirements.txt -commands = - python ../../../eng/scripts/ci/run_mypy.py -t unbranded -s "generated" {posargs} - -[testenv:pyright] -deps= - -r requirements.txt -commands = - python ../../../eng/scripts/ci/run_pyright.py -t unbranded -s "generated" {posargs} - -[testenv:apiview] -deps= - -r requirements.txt -commands = - pip install apiview-stub-generator==0.3.19 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/" - python ../../../eng/scripts/ci/run_apiview.py -t unbranded -s "generated" {posargs} - -[testenv:sphinx] -basepython = python3.10 -deps= - -r requirements.txt -commands = - python ../../../eng/scripts/ci/run_sphinx_build.py -t unbranded -s "generated" {posargs} diff --git a/packages/http-client-python/generator/test/unittests/test_enums.py b/packages/http-client-python/generator/test/unittests/test_enums.py deleted file mode 100644 index 02134609523..00000000000 --- a/packages/http-client-python/generator/test/unittests/test_enums.py +++ /dev/null @@ -1,52 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -from enum import Enum, EnumMeta - - -class _CaseInsensitiveEnumMeta(EnumMeta): - def __getitem__(self, name): - return super().__getitem__(name.upper()) - - def __getattr__(cls, name): - """Return the enum member matching `name` - We use __getattr__ instead of descriptors or inserting into the enum - class' __dict__ in order to support `name` and `value` being both - properties for enum members (which live in the class' __dict__) and - enum members themselves. - """ - try: - return cls._member_map_[name.upper()] - except KeyError: - raise AttributeError(name) - - -class EnumsWithCallableNames(str, Enum, metaclass=_CaseInsensitiveEnumMeta): - """Gets the unit of measurement.""" - - COUNT = "count" - ENCODE = "encode" - FIND = "find" - JOIN = "join" - - -def test_count(): - assert EnumsWithCallableNames.COUNT == "count" - assert callable(EnumsWithCallableNames.count) - - -def test_encode(): - assert EnumsWithCallableNames.ENCODE == "encode" - assert callable(EnumsWithCallableNames.encode) - - -def test_find(): - assert EnumsWithCallableNames.FIND == "find" - assert callable(EnumsWithCallableNames.find) - - -def test_join(): - assert EnumsWithCallableNames.JOIN == "join" - assert callable(EnumsWithCallableNames.join) diff --git a/packages/http-client-python/generator/test/unittests/test_model_base_xml_serialization.py b/packages/http-client-python/generator/test/unittests/test_model_base_xml_serialization.py deleted file mode 100644 index 27529cc5263..00000000000 --- a/packages/http-client-python/generator/test/unittests/test_model_base_xml_serialization.py +++ /dev/null @@ -1,997 +0,0 @@ -# ------------------------------------ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# ------------------------------------ -import xml.etree.ElementTree as ET - -from typing import Literal - -from specialwords._utils.model_base import ( - _get_element, - Model, - rest_field, - rest_discriminator, - _deserialize_xml, -) - - -def assert_xml_equals(x1, x2): - ET.dump(x1) - ET.dump(x2) - - assert x1.tag == x2.tag - assert (x1.text or "").strip() == (x2.text or "").strip() - # assert x1.tail == x2.tail # Swagger does not change tail - assert x1.attrib == x2.attrib - assert len(x1) == len(x2) - for c1, c2 in zip(x1, x2): - assert_xml_equals(c1, c2) - - -class TestXmlDeserialization: - def test_basic(self): - """Test an ultra basic XML.""" - basic_xml = """ - - 12 - - 12.34 - - true - - test - - """ - - class XmlModel(Model): - int_field: int = rest_field(name="int", xml={"name": "Int"}) - empty_int: int = rest_field(name="empty_int", xml={"name": "EmptyInt"}) - float_field: float = rest_field(name="float", xml={"name": "Float"}) - empty_float: float = rest_field(name="empty_float", xml={"name": "EmptyFloat"}) - bool_field: bool = rest_field(name="bool", xml={"name": "Bool"}) - empty_bool: bool = rest_field(name="empty_bool", xml={"name": "EmptyBool"}) - string: str = rest_field(name="string", xml={"name": "String"}) - empty_string: str = rest_field(name="empty_string", xml={"name": "EmptyString"}) - not_set: str = rest_field(name="not_set", xml={"name": "NotSet"}) - country: str = rest_field(name="country", xml={"name": "country", "attribute": True}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Data"} - - result = _deserialize_xml(XmlModel, basic_xml) - - assert result.int_field == 12 - assert result.empty_int is None - assert result.float_field == 12.34 - assert result.empty_float is None - assert result.bool_field is True - assert result.empty_bool is None - assert result.string == "test" - assert result.country == "france" - assert result.empty_string == "" - assert result.not_set is None - - def test_basic_unicode(self): - """Test a XML with unicode.""" - basic_xml = """ - """ - - class XmlModel(Model): - language: str = rest_field(name="language", xml={"name": "language", "attribute": True}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Data"} - - result = _deserialize_xml(XmlModel, basic_xml) - - assert result.language == "français" - - def test_basic_text(self): - """Test a XML with unicode.""" - basic_xml = """ - I am text""" - - class XmlModel(Model): - language: str = rest_field(name="language", xml={"name": "language", "attribute": True}) - content: str = rest_field(name="content", xml={"name": "content", "text": True}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Data"} - - result = _deserialize_xml(XmlModel, basic_xml) - - assert result.language == "english" - assert result.content == "I am text" - - def test_dict_type(self): - """Test dict type.""" - basic_xml = """ - - - value1 - value2 - - """ - - class XmlModel(Model): - metadata: dict[str, str] = rest_field(name="Metadata", xml={"name": "Metadata"}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Data"} - - result = _deserialize_xml(XmlModel, basic_xml) - - assert len(result.metadata) == 2 - assert result.metadata["Key1"] == "value1" - assert result.metadata["Key2"] == "value2" - - def test_basic_empty_list(self): - """Test an basic XML with an empty node.""" - basic_xml = """ - - - """ - - class XmlModel(Model): - age: list[str] = rest_field(name="age", xml={"name": "Age"}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Data"} - - result = _deserialize_xml(XmlModel, basic_xml) - assert result.age == [] - - def test_basic_empty_list_unwrapped(self): - """Test an basic XML with an empty node.""" - basic_xml = """ - """ - - class XmlModel(Model): - age: list[str] = rest_field(name="age", xml={"name": "Age", "unwrapped": True}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Data"} - - result = _deserialize_xml(XmlModel, basic_xml) - assert result.age is None - - def test_list_wrapped_items_name_basic_types(self): - """Test XML list and wrap, items is basic type and there is itemsName.""" - - basic_xml = """ - - - granny - fuji - - """ - - class AppleBarrel(Model): - good_apples: list[str] = rest_field(name="GoodApples", xml={"name": "GoodApples", "itemsName": "Apple"}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "AppleBarrel"} - - result = _deserialize_xml(AppleBarrel, basic_xml) - assert result.good_apples == ["granny", "fuji"] - - def test_list_not_wrapped_items_name_basic_types(self): - """Test XML list and no wrap, items is basic type and there is itemsName.""" - - basic_xml = """ - - granny - fuji - """ - - class AppleBarrel(Model): - good_apples: list[str] = rest_field( - name="GoodApples", - xml={"name": "GoodApples", "unwrapped": True, "itemsName": "Apple"}, - ) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "AppleBarrel"} - - result = _deserialize_xml(AppleBarrel, basic_xml) - assert result.good_apples == ["granny", "fuji"] - - def test_list_wrapped_items_name_complex_types(self): - """Test XML list and wrap, items is ref and there is itemsName.""" - - basic_xml = """ - - - - - - """ - - class Apple(Model): - name: str = rest_field(name="name", xml={"name": "name", "attribute": True}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Apple"} - - class AppleBarrel(Model): - good_apples: list[Apple] = rest_field(name="GoodApples", xml={"name": "GoodApples", "itemsName": "Apple"}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "AppleBarrel"} - - result = _deserialize_xml(AppleBarrel, basic_xml) - assert [apple.name for apple in result.good_apples] == ["granny", "fuji"] - - def test_list_not_wrapped_items_name_complex_types(self): - """Test XML list and wrap, items is ref and there is itemsName.""" - - basic_xml = """ - - - - """ - - class Apple(Model): - name: str = rest_field(name="name", xml={"name": "name", "attribute": True}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Apple"} - - class AppleBarrel(Model): - good_apples: list[Apple] = rest_field( - name="GoodApples", - xml={"name": "GoodApples", "unwrapped": True, "itemsName": "Apple"}, - ) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "AppleBarrel"} - - result = _deserialize_xml(AppleBarrel, basic_xml) - assert [apple.name for apple in result.good_apples] == ["granny", "fuji"] - - def test_list_not_wrapped_items_name_complex_types(self): - """Test XML list and wrap, items is ref and there is itemsName.""" - - basic_xml = """ - - - - """ - - class Apple(Model): - name: str = rest_field(name="name", xml={"name": "name", "attribute": True}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Apple"} - - class AppleBarrel(Model): - good_apples: list[Apple] = rest_field( - name="GoodApples", - xml={"name": "GoodApples", "unwrapped": True, "itemsName": "Apple"}, - ) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "AppleBarrel"} - - result = _deserialize_xml(AppleBarrel, basic_xml) - assert [apple.name for apple in result.good_apples] == ["granny", "fuji"] - - def test_basic_additional_properties(self): - """Test additional properties.""" - basic_xml = """ - - text - - a - b - c - - - a - b - - """ - - class XmlModel(Model): - name: str = rest_field(name="name", xml={"name": "Name"}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Data"} - - result = _deserialize_xml(XmlModel, basic_xml) - - assert result.name is None - assert result["add1"] == "text" - assert result["add2"] == ["a", "b", "c"] - assert result["add3"] == {"a": "a", "b": "b"} - - def test_basic_namespace(self): - """Test an ultra basic XML.""" - basic_xml = """ - - 37 - """ - - class XmlModel(Model): - age: int = rest_field( - name="age", - xml={ - "name": "Age", - "prefix": "fictional", - "ns": "http://characters.example.com", - }, - ) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Data"} - - result = _deserialize_xml(XmlModel, basic_xml) - assert result.age == 37 - - def test_complex_namespace(self): - """Test recursive namespace.""" - basic_xml = """ - - - lmazuel - - - - testpolicy - - - - 12 - - """ - - class QueueDescriptionResponseAuthor(Model): - name: str = rest_field(name="name", xml={"ns": "http://www.w3.org/2005/Atom"}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"ns": "http://www.w3.org/2005/Atom"} - - class AuthorizationRule(Model): - type: str = rest_field( - name="type", - xml={ - "attribute": True, - "prefix": "i", - "ns": "http://www.w3.org/2001/XMLSchema-instance", - }, - ) - key_name: str = rest_field( - name="KeyName", - xml={"ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect"}, - ) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect"} - - class MessageCountDetails(Model): - active_message_count: int = rest_field( - name="ActiveMessageCount", - xml={ - "prefix": "d2p1", - "ns": "http://schemas.microsoft.com/netservices/2011/06/servicebus", - }, - ) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = { - "name": "CountDetails", - "ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect", - } - - class XmlRoot(Model): - author: QueueDescriptionResponseAuthor = rest_field(name="author") - authorization_rules: list[AuthorizationRule] = rest_field( - name="AuthorizationRules", - xml={ - "ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect", - }, - ) - message_count_details: MessageCountDetails = rest_field( - name="MessageCountDetails", - xml={ - "ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect", - }, - ) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "entry", "ns": "http://www.w3.org/2005/Atom"} - - result = _deserialize_xml(XmlRoot, basic_xml) - - assert result.author.name == "lmazuel" - assert result.authorization_rules[0].key_name == "testpolicy" - assert result.authorization_rules[0].type == "SharedAccessAuthorizationRule" - assert result.message_count_details.active_message_count == 12 - - def test_polymorphic_deserialization(self): - basic_xml = """ - - - 12 - - """ - - class RuleFilter(Model): - __mapping__: dict[str, Model] = {} - type: Literal[None] = rest_discriminator( - name="type", - xml={ - "attribute": True, - "prefix": "xsi", - "ns": "http://www.w3.org/2001/XMLSchema-instance", - }, - ) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.type: Literal[None] = None - - _xml = {"name": "Filter"} - - class CorrelationFilter(RuleFilter): - type: Literal["CorrelationFilter"] = rest_discriminator( - name="type", - xml={ - "attribute": True, - "prefix": "xsi", - "ns": "http://www.w3.org/2001/XMLSchema-instance", - }, - ) - correlation_id: int = rest_field(name="CorrelationId") - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.type: Literal["CorrelationFilter"] = "CorrelationFilter" - - class SqlFilter(RuleFilter): - type: Literal["SqlFilter"] = rest_discriminator( - name="type", - xml={ - "attribute": True, - "prefix": "xsi", - "ns": "http://www.w3.org/2001/XMLSchema-instance", - }, - ) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.type: Literal["SqlFilter"] = "SqlFilter" - - class XmlRoot(Model): - filter: RuleFilter = rest_field(name="Filter") - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "entry"} - - result = _deserialize_xml(XmlRoot, basic_xml) - - assert isinstance(result.filter, CorrelationFilter) - assert result.filter.correlation_id == 12 - - -class TestXmlSerialization: - def test_basic(self): - """Test an ultra basic XML.""" - basic_xml = ET.fromstring( - """ - - 37 - """ - ) - - class XmlModel(Model): - age: int = rest_field(xml={"name": "Age"}) - country: str = rest_field(xml={"name": "country", "attribute": True}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Data"} - - xml_model = XmlModel(age=37, country="france") - assert_xml_equals(_get_element(xml_model), basic_xml) - - def test_basic_unicode(self): - """Test a XML with unicode.""" - basic_xml = ET.fromstring( - """ - """.encode( - "utf-8" - ) - ) - - class XmlModel(Model): - language: str = rest_field(xml={"name": "language", "attribute": True}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Data"} - - xml_model = XmlModel(language="français") - assert_xml_equals(_get_element(xml_model), basic_xml) - - def test_nested_unicode(self): - class XmlModel(Model): - message_text: str = rest_field(name="MessageText", xml={"name": "MessageText"}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Message"} - - xml_model_no_unicode = XmlModel(message_text="message1") - xml_element = _get_element(xml_model_no_unicode) - xml_content = ET.tostring(xml_element, encoding="utf8") - assert ( - xml_content - == b"\nmessage1" - ) - - xml_model_with_unicode = XmlModel(message_text="message1㚈") - xml_element = _get_element(xml_model_with_unicode) - xml_content = ET.tostring(xml_element, encoding="utf8") - assert ( - xml_content - == b"\nmessage1\xe3\x9a\x88" - ) - - def test_type_basic(self): - """Test basic types.""" - basic_xml = ET.fromstring( - """ - - 37 - true - """ - ) - - class XmlModel(Model): - age: int = rest_field(name="age", xml={"name": "Age"}) - enabled: bool = rest_field(name="enabled", xml={"name": "Enabled"}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Data"} - - xml_model = XmlModel(age=37, enabled=True) - assert_xml_equals(_get_element(xml_model), basic_xml) - - def test_basic_text(self): - """Test a XML with unicode.""" - basic_xml = ET.fromstring( - """ - I am text""" - ) - - class XmlModel(Model): - language: str = rest_field(name="language", xml={"name": "language", "attribute": True}) - content: str = rest_field(name="content", xml={"text": True}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Data"} - - xml_model = XmlModel(language="english", content="I am text") - assert_xml_equals(_get_element(xml_model), basic_xml) - - def test_dict_type(self): - """Test dict type.""" - basic_xml = ET.fromstring( - """ - - - value1 - value2 - - """ - ) - - class XmlModel(Model): - metadata: dict[str, str] = rest_field(name="Metadata", xml={"name": "Metadata"}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Data"} - - xml_model = XmlModel( - metadata={ - "Key1": "value1", - "Key2": "value2", - } - ) - assert_xml_equals(_get_element(xml_model), basic_xml) - - def test_additional_properties(self): - """Test additional properties.""" - basic_xml = ET.fromstring( - """ - - test - text - - a - b - c - - - a - b - - """ - ) - - class XmlModel(Model): - name: str = rest_field(name="name", xml={"name": "Name"}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Data"} - - xml_model = XmlModel( - { - "name": "test", - "add1": "text", - "add2": ["a", "b", "c"], - "add3": {"a": "a", "b": "b"}, - } - ) - assert_xml_equals(_get_element(xml_model), basic_xml) - - def test_list_wrapped_basic_types(self): - """Test XML list and wrap, items is basic type and there is no itemsName.""" - - basic_xml = ET.fromstring( - """ - - - granny - fuji - - """ - ) - - class AppleBarrel(Model): - good_apples: list[str] = rest_field(name="GoodApples", xml={"name": "GoodApples"}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "AppleBarrel"} - - xml_model = AppleBarrel(good_apples=["granny", "fuji"]) - assert_xml_equals(_get_element(xml_model), basic_xml) - - def test_list_not_wrapped_basic_types(self): - """Test XML list and no wrap, items is basic type and there is no itemsName.""" - - basic_xml = ET.fromstring( - """ - - granny - fuji - """ - ) - - class AppleBarrel(Model): - good_apples: list[str] = rest_field(name="GoodApples", xml={"name": "GoodApples", "unwrapped": True}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "AppleBarrel"} - - xml_model = AppleBarrel(good_apples=["granny", "fuji"]) - assert_xml_equals(_get_element(xml_model), basic_xml) - - def test_list_wrapped_basic_types_items_name(self): - """Test XML list and wrap, items is basic type and itemsName.""" - - basic_xml = ET.fromstring( - """ - - - granny - fuji - - """ - ) - - class AppleBarrel(Model): - good_apples: list[str] = rest_field(name="GoodApples", xml={"name": "GoodApples", "itemsName": "string"}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "AppleBarrel"} - - xml_model = AppleBarrel(good_apples=["granny", "fuji"]) - assert_xml_equals(_get_element(xml_model), basic_xml) - - def test_list_not_wrapped_basic_types_items_name(self): - """Test XML list and no wrap, items is basic type and itemsName.""" - - basic_xml = ET.fromstring( - """ - - granny - fuji - """ - ) - - class AppleBarrel(Model): - good_apples: list[str] = rest_field( - name="GoodApples", - xml={"name": "GoodApples", "unwrapped": True, "itemsName": "string"}, - ) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "AppleBarrel"} - - xml_model = AppleBarrel(good_apples=["granny", "fuji"]) - assert_xml_equals(_get_element(xml_model), basic_xml) - - def test_list_wrapped_complex_types(self): - """Test XML list and wrap, items is ref.""" - - basic_xml = ET.fromstring( - """ - - - - - - """ - ) - - class Apple(Model): - name: str = rest_field(name="name", xml={"name": "name", "attribute": True}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Apple"} - - class AppleBarrel(Model): - good_apples: list[Apple] = rest_field(name="GoodApples", xml={"name": "GoodApples"}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "AppleBarrel"} - - test = AppleBarrel({"GoodApples": [{"name": "granny"}, {"name": "fuji"}]}) - xml_model = AppleBarrel(good_apples=[Apple(name="granny"), Apple(name="fuji")]) - assert_xml_equals(_get_element(xml_model), basic_xml) - - def test_list_not_wrapped_complex_types(self): - """Test XML list and wrap, items is ref.""" - - basic_xml = ET.fromstring( - """ - - - - """ - ) - - class Apple(Model): - name: str = rest_field(name="name", xml={"name": "name", "attribute": True}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Apple"} - - class AppleBarrel(Model): - good_apples: list[Apple] = rest_field(name="GoodApples", xml={"name": "GoodApples", "unwrapped": True}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - xml_model = AppleBarrel(good_apples=[Apple(name="granny"), Apple(name="fuji")]) - assert_xml_equals(_get_element(xml_model), basic_xml) - - def test_two_complex_same_type(self): - """Two different attribute are same type""" - - basic_xml = ET.fromstring( - """ - - - - """ - ) - - class Apple(Model): - name: str = rest_field(name="name", xml={"name": "name", "attribute": True}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Apple"} - - class AppleBarrel(Model): - eu_apple: Apple = rest_field(name="EuropeanApple", xml={"name": "EuropeanApple"}) - us_apple: Apple = rest_field(name="USAApple", xml={"name": "USAApple"}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - xml_model = AppleBarrel( - eu_apple=Apple(name="granny"), - us_apple=Apple(name="fuji"), - ) - assert_xml_equals(_get_element(xml_model), basic_xml) - - def test_basic_namespace(self): - """Test an ultra basic XML.""" - basic_xml = ET.fromstring( - """ - - 37 - """ - ) - - class XmlModel(Model): - age: int = rest_field( - name="age", - xml={ - "name": "Age", - "prefix": "fictional", - "ns": "http://characters.example.com", - }, - ) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "Data"} - - xml_model = XmlModel( - age=37, - ) - assert_xml_equals(_get_element(xml_model), basic_xml) - - def test_complex_namespace(self): - """Test recursive namespace.""" - basic_xml = ET.fromstring( - """ - - - lmazuel - - - - testpolicy - - - - 12 - - """ - ) - - class QueueDescriptionResponseAuthor(Model): - name: str = rest_field(name="name", xml={"ns": "http://www.w3.org/2005/Atom"}) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"ns": "http://www.w3.org/2005/Atom"} - - class AuthorizationRule(Model): - type: str = rest_field( - name="type", - xml={ - "attribute": True, - "prefix": "i", - "ns": "http://www.w3.org/2001/XMLSchema-instance", - }, - ) - key_name: str = rest_field( - name="KeyName", - xml={"ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect"}, - ) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect"} - - class MessageCountDetails(Model): - active_message_count: int = rest_field( - name="ActiveMessageCount", - xml={ - "prefix": "d2p1", - "ns": "http://schemas.microsoft.com/netservices/2011/06/servicebus", - }, - ) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = { - "name": "CountDetails", - "ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect", - } - - class XmlRoot(Model): - author: QueueDescriptionResponseAuthor = rest_field(name="author") - authorization_rules: list[AuthorizationRule] = rest_field( - name="AuthorizationRules", - xml={ - "ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect", - }, - ) - message_count_details: MessageCountDetails = rest_field( - name="MessageCountDetails", - xml={ - "ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect", - }, - ) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - _xml = {"name": "entry", "ns": "http://www.w3.org/2005/Atom"} - - xml_model = XmlRoot( - author=QueueDescriptionResponseAuthor(name="lmazuel"), - authorization_rules=[AuthorizationRule(type="SharedAccessAuthorizationRule", key_name="testpolicy")], - message_count_details=MessageCountDetails(active_message_count=12), - ) - assert_xml_equals(_get_element(xml_model), basic_xml) diff --git a/packages/http-client-python/package-lock.json b/packages/http-client-python/package-lock.json index ac5e9d4a5f4..22c3137c03b 100644 --- a/packages/http-client-python/package-lock.json +++ b/packages/http-client-python/package-lock.json @@ -1,12 +1,12 @@ { "name": "@typespec/http-client-python", - "version": "0.26.2", + "version": "0.28.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@typespec/http-client-python", - "version": "0.26.2", + "version": "0.28.3", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -14,98 +14,98 @@ "marked": "^15.0.6", "pyodide": "0.26.2", "semver": "~7.6.2", - "tsx": "~4.19.1" + "tsx": "^4.21.0" }, "devDependencies": { - "@azure-tools/azure-http-specs": "0.1.0-alpha.36", - "@azure-tools/typespec-autorest": "~0.64.1", - "@azure-tools/typespec-azure-core": "~0.64.0", - "@azure-tools/typespec-azure-resource-manager": "~0.64.1", - "@azure-tools/typespec-azure-rulesets": "~0.64.0", - "@azure-tools/typespec-client-generator-core": "~0.64.5", + "@azure-tools/azure-http-specs": "0.1.0-alpha.39", + "@azure-tools/typespec-autorest": "~0.67.0", + "@azure-tools/typespec-azure-core": "~0.67.0", + "@azure-tools/typespec-azure-resource-manager": "~0.67.0", + "@azure-tools/typespec-azure-rulesets": "~0.67.0", + "@azure-tools/typespec-client-generator-core": "~0.67.0", "@types/js-yaml": "~4.0.5", - "@types/node": "~24.1.0", + "@types/node": "~25.0.2", "@types/semver": "7.5.8", - "@typespec/compiler": "^1.8.0", - "@typespec/events": "~0.78.0", - "@typespec/http": "^1.8.0", - "@typespec/http-specs": "0.1.0-alpha.32-dev.1", - "@typespec/openapi": "^1.8.0", - "@typespec/rest": "~0.78.0", - "@typespec/spec-api": "0.1.0-alpha.12", - "@typespec/spector": "0.1.0-alpha.22", - "@typespec/sse": "~0.78.0", - "@typespec/streams": "~0.78.0", - "@typespec/versioning": "~0.78.0", - "@typespec/xml": "~0.78.0", + "@typespec/compiler": "^1.11.0", + "@typespec/events": "~0.81.0", + "@typespec/http": "^1.11.0", + "@typespec/http-specs": "0.1.0-alpha.36", + "@typespec/openapi": "^1.11.0", + "@typespec/rest": "~0.81.0", + "@typespec/spec-api": "0.1.0-alpha.14", + "@typespec/spector": "0.1.0-alpha.25", + "@typespec/sse": "~0.81.0", + "@typespec/streams": "~0.81.0", + "@typespec/versioning": "~0.81.0", + "@typespec/xml": "~0.81.0", "c8": "^10.1.3", - "chalk": "5.3.0", - "rimraf": "~6.0.1", - "typescript": "~5.8.2", - "typescript-eslint": "^8.21.0", - "vitest": "^3.1.2" + "picocolors": "~1.1.1", + "rimraf": "~6.1.2", + "typescript": "~5.9.2", + "typescript-eslint": "^8.49.0", + "vitest": "^4.0.15" }, "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@azure-tools/typespec-autorest": ">=0.64.1 <1.0.0", - "@azure-tools/typespec-azure-core": ">=0.64.0 <1.0.0", - "@azure-tools/typespec-azure-resource-manager": ">=0.64.1 <1.0.0", - "@azure-tools/typespec-azure-rulesets": ">=0.64.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.64.5 <1.0.0", - "@typespec/compiler": "^1.8.0", - "@typespec/events": ">=0.78.0 <1.0.0", - "@typespec/http": "^1.8.0", - "@typespec/openapi": "^1.8.0", - "@typespec/rest": ">=0.78.0 <1.0.0", - "@typespec/sse": ">=0.78.0 <1.0.0", - "@typespec/streams": ">=0.78.0 <1.0.0", - "@typespec/versioning": ">=0.78.0 <1.0.0", - "@typespec/xml": ">=0.78.0 <1.0.0" + "@azure-tools/typespec-autorest": ">=0.67.0 <1.0.0", + "@azure-tools/typespec-azure-core": ">=0.67.0 <1.0.0", + "@azure-tools/typespec-azure-resource-manager": ">=0.67.0 <1.0.0", + "@azure-tools/typespec-azure-rulesets": ">=0.67.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.67.0 <1.0.0", + "@typespec/compiler": "^1.11.0", + "@typespec/events": ">=0.81.0 <1.0.0", + "@typespec/http": "^1.11.0", + "@typespec/openapi": "^1.11.0", + "@typespec/rest": ">=0.81.0 <1.0.0", + "@typespec/sse": ">=0.81.0 <1.0.0", + "@typespec/streams": ">=0.81.0 <1.0.0", + "@typespec/versioning": ">=0.81.0 <1.0.0", + "@typespec/xml": ">=0.81.0 <1.0.0" } }, "node_modules/@azure-tools/azure-http-specs": { - "version": "0.1.0-alpha.36", - "resolved": "https://registry.npmjs.org/@azure-tools/azure-http-specs/-/azure-http-specs-0.1.0-alpha.36.tgz", - "integrity": "sha512-tn6qiiTA+ToLmOqj4CSJNAbeuSUj6hIRiXzDhR8b7jilFLnXQ2MYKnJNnjL2O/CDd0utWUqg/2kNlQitSLnxmA==", + "version": "0.1.0-alpha.39", + "resolved": "https://registry.npmjs.org/@azure-tools/azure-http-specs/-/azure-http-specs-0.1.0-alpha.39.tgz", + "integrity": "sha512-l9d2Y+B7QBi20ocDJEGO7NpvpCePvdw2ALz1RHAPWBOD0tPUBXUQ4WF1zUC199awz8hQysNRM9jm8x+eoUvjEQ==", "dev": true, "license": "MIT", "dependencies": { - "@typespec/spec-api": "^0.1.0-alpha.12", - "@typespec/spector": "^0.1.0-alpha.22" + "@typespec/spec-api": "^0.1.0-alpha.14", + "@typespec/spector": "^0.1.0-alpha.25" }, "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": "^0.64.0", - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/rest": "^0.78.0", - "@typespec/versioning": "^0.78.0", - "@typespec/xml": "^0.78.0" + "@azure-tools/typespec-azure-core": "^0.67.0", + "@typespec/compiler": "^1.11.0", + "@typespec/http": "^1.11.0", + "@typespec/rest": "^0.81.0", + "@typespec/versioning": "^0.81.0", + "@typespec/xml": "^0.81.0" } }, "node_modules/@azure-tools/typespec-autorest": { - "version": "0.64.1", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.64.1.tgz", - "integrity": "sha512-WzSRiX0XS7hCL+uiivLBYMbirEUenxNzPT4giF0J+r54CVNXq/u8PLnA/06F5EHkXPa92swF4BxB1vFWB2TKow==", + "version": "0.67.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.67.0.tgz", + "integrity": "sha512-RP0TZB46tnYGfN5FKaaXDP5/rDff0PEERKz4epoYsm4RmXeRDYXVcOjw7DXLbcgFpMLTLBf/w/5dqJZBx03KpQ==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": "^0.64.0", - "@azure-tools/typespec-azure-resource-manager": "^0.64.1", - "@azure-tools/typespec-client-generator-core": "^0.64.4", - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/openapi": "^1.8.0", - "@typespec/rest": "^0.78.0", - "@typespec/versioning": "^0.78.0", - "@typespec/xml": "^0.78.0" + "@azure-tools/typespec-azure-core": "^0.67.0", + "@azure-tools/typespec-azure-resource-manager": "^0.67.0", + "@azure-tools/typespec-client-generator-core": "^0.67.0", + "@typespec/compiler": "^1.11.0", + "@typespec/http": "^1.11.0", + "@typespec/openapi": "^1.11.0", + "@typespec/rest": "^0.81.0", + "@typespec/versioning": "^0.81.0", + "@typespec/xml": "^0.81.0" }, "peerDependenciesMeta": { "@typespec/xml": { @@ -114,26 +114,28 @@ } }, "node_modules/@azure-tools/typespec-azure-core": { - "version": "0.64.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.64.0.tgz", - "integrity": "sha512-BXiHc5oayhMsG1dHFU1aFK/ZQX2Gl0dKB0FAFceapaFV9093J2obbsdhIDR3Tl0qei9g3Ha+iWKZ4KgnLdhv4w==", + "version": "0.67.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.67.0.tgz", + "integrity": "sha512-6DO/fOlVihMlPG0oDXrgURf5MNF4iBzPx5SMA5aaFDx/fW6MjiD+TN9Yy9O+l9mVNh1XaEMjhjA8/lmnHZ/U0g==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/rest": "^0.78.0" + "@typespec/compiler": "^1.11.0", + "@typespec/http": "^1.11.0", + "@typespec/rest": "^0.81.0" } }, "node_modules/@azure-tools/typespec-azure-resource-manager": { - "version": "0.64.1", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-resource-manager/-/typespec-azure-resource-manager-0.64.1.tgz", - "integrity": "sha512-qQV/+ZVF1h8PsTNKhmKYyb+vSCgnLA8SoGeEE1oOrevGrrp9VgtOMAZ2xIxj6DpU90QU/8t2+r5P/gcQUV1iqw==", + "version": "0.67.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-resource-manager/-/typespec-azure-resource-manager-0.67.0.tgz", + "integrity": "sha512-NFE1O4zlpo6Y+Lkh3XCo59g+7r141+oBomYib1LncbbpqoGDakHvBH4sLelt9ZCMnYAxlKGbjXrO9E6jd53P2Q==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "change-case": "~5.4.4", "pluralize": "^8.0.0" @@ -142,36 +144,37 @@ "node": ">=20.0.0" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": "^0.64.0", - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/openapi": "^1.8.0", - "@typespec/rest": "^0.78.0", - "@typespec/versioning": "^0.78.0" + "@azure-tools/typespec-azure-core": "^0.67.0", + "@typespec/compiler": "^1.11.0", + "@typespec/http": "^1.11.0", + "@typespec/openapi": "^1.11.0", + "@typespec/rest": "^0.81.0", + "@typespec/versioning": "^0.81.0" } }, "node_modules/@azure-tools/typespec-azure-rulesets": { - "version": "0.64.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-rulesets/-/typespec-azure-rulesets-0.64.0.tgz", - "integrity": "sha512-CvK5iolfsm8oAUZ5wegGVYp4Vvw2rwQa+rcUVoJkwi9c6QwEr+qT6/S4hIntuzEPLxybJSb/ZIWU9Qx3cDrzXg==", + "version": "0.67.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-rulesets/-/typespec-azure-rulesets-0.67.0.tgz", + "integrity": "sha512-YCkyTm090xQR0Gb3CnIdbEd+SbVUY1TRtuPXrBPTsNu3MJwvlaESnkJ7bt9zkP94mAFTNoSTuZlAUKDfPrFaFA==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": "^0.64.0", - "@azure-tools/typespec-azure-resource-manager": "^0.64.0", - "@azure-tools/typespec-client-generator-core": "^0.64.0", - "@typespec/compiler": "^1.8.0" + "@azure-tools/typespec-azure-core": "^0.67.0", + "@azure-tools/typespec-azure-resource-manager": "^0.67.0", + "@azure-tools/typespec-client-generator-core": "^0.67.0", + "@typespec/compiler": "^1.11.0" } }, "node_modules/@azure-tools/typespec-client-generator-core": { - "version": "0.64.5", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.64.5.tgz", - "integrity": "sha512-RaATxsnc9ztdMPoIZ2SuyH97dIGY0BWGKcJBf0hBY+8J3de9o+QH796NA9OsiW+8J9ycCEooDbh/rkAspvA4xA==", + "version": "0.67.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.67.0.tgz", + "integrity": "sha512-cJZHRDnSSNhx8DpHudUMDpajpDQD3+lsAXI633dsQYIKdTuP10UEgRUgIKSkF0+ck0kJOeI25r/TBH2P+V/k6Q==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "change-case": "~5.4.4", "pluralize": "^8.0.0", @@ -181,16 +184,16 @@ "node": ">=20.0.0" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": "^0.64.0", - "@typespec/compiler": "^1.8.0", - "@typespec/events": "^0.78.0", - "@typespec/http": "^1.8.0", - "@typespec/openapi": "^1.8.0", - "@typespec/rest": "^0.78.0", - "@typespec/sse": "^0.78.0", - "@typespec/streams": "^0.78.0", - "@typespec/versioning": "^0.78.0", - "@typespec/xml": "^0.78.0" + "@azure-tools/typespec-azure-core": "^0.67.0", + "@typespec/compiler": "^1.11.0", + "@typespec/events": "^0.81.0", + "@typespec/http": "^1.11.0", + "@typespec/openapi": "^1.11.0", + "@typespec/rest": "^0.81.0", + "@typespec/sse": "^0.81.0", + "@typespec/streams": "^0.81.0", + "@typespec/versioning": "^0.81.0", + "@typespec/xml": "^0.81.0" } }, "node_modules/@azure/abort-controller": { @@ -227,6 +230,7 @@ "integrity": "sha512-Nh5PhEOeY6PrnxNPsEHRr9eimxLwgLlpmguQaHKBinFYA/RU9+kOYVOQqOrTsCL+KSxrLLl1gD8Dk5BFW/7l/w==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@azure/abort-controller": "^2.1.2", "@azure/core-auth": "^1.10.0", @@ -241,18 +245,20 @@ } }, "node_modules/@azure/core-http-compat": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@azure/core-http-compat/-/core-http-compat-2.3.1.tgz", - "integrity": "sha512-az9BkXND3/d5VgdRRQVkiJb2gOmDU8Qcq4GvjtBmDICNiQ9udFmDk4ZpSB5Qq1OmtDJGlQAfBaS4palFsazQ5g==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@azure/core-http-compat/-/core-http-compat-2.3.2.tgz", + "integrity": "sha512-Tf6ltdKzOJEgxZeWLCjMxrxbodB/ZeCbzzA1A2qHbhzAjzjHoBVSUeSl/baT/oHAxhc4qdqVaDKnc2+iE932gw==", "dev": true, "license": "MIT", "dependencies": { - "@azure/abort-controller": "^2.1.2", - "@azure/core-client": "^1.10.0", - "@azure/core-rest-pipeline": "^1.22.0" + "@azure/abort-controller": "^2.1.2" }, "engines": { "node": ">=20.0.0" + }, + "peerDependencies": { + "@azure/core-client": "^1.10.0", + "@azure/core-rest-pipeline": "^1.22.0" } }, "node_modules/@azure/core-lro": { @@ -285,18 +291,19 @@ } }, "node_modules/@azure/core-rest-pipeline": { - "version": "1.22.2", - "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.22.2.tgz", - "integrity": "sha512-MzHym+wOi8CLUlKCQu12de0nwcq9k9Kuv43j4Wa++CsCpJwps2eeBQwD2Bu8snkxTtDKDx4GwjuR9E8yC8LNrg==", + "version": "1.23.0", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.23.0.tgz", + "integrity": "sha512-Evs1INHo+jUjwHi1T6SG6Ua/LHOQBCLuKEEE6efIpt4ZOoNonaT1kP32GoOcdNDbfqsD2445CPri3MubBy5DEQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@azure/abort-controller": "^2.1.2", "@azure/core-auth": "^1.10.0", "@azure/core-tracing": "^1.3.0", "@azure/core-util": "^1.13.0", "@azure/logger": "^1.3.0", - "@typespec/ts-http-runtime": "^0.3.0", + "@typespec/ts-http-runtime": "^0.3.4", "tslib": "^2.6.2" }, "engines": { @@ -346,9 +353,9 @@ } }, "node_modules/@azure/identity": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.13.0.tgz", - "integrity": "sha512-uWC0fssc+hs1TGGVkkghiaFkkS7NkTxfnCH+Hdg+yTehTpMcehpok4PgUKKdyCH+9ldu6FhiHRv84Ntqj1vVcw==", + "version": "4.13.1", + "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.13.1.tgz", + "integrity": "sha512-5C/2WD5Vb1lHnZS16dNQRPMjN6oV/Upba+C9nBIs15PmOi6A3ZGs4Lr2u60zw4S04gi+u3cEXiqTVP7M4Pz3kw==", "dev": true, "license": "MIT", "dependencies": { @@ -359,8 +366,8 @@ "@azure/core-tracing": "^1.0.0", "@azure/core-util": "^1.11.0", "@azure/logger": "^1.0.0", - "@azure/msal-browser": "^4.2.0", - "@azure/msal-node": "^3.5.0", + "@azure/msal-browser": "^5.5.0", + "@azure/msal-node": "^5.1.0", "open": "^10.1.0", "tslib": "^2.2.0" }, @@ -383,22 +390,22 @@ } }, "node_modules/@azure/msal-browser": { - "version": "4.27.0", - "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-4.27.0.tgz", - "integrity": "sha512-bZ8Pta6YAbdd0o0PEaL1/geBsPrLEnyY/RDWqvF1PP9RUH8EMLvUMGoZFYS6jSlUan6KZ9IMTLCnwpWWpQRK/w==", + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-5.6.3.tgz", + "integrity": "sha512-sTjMtUm+bJpENU/1WlRzHEsgEHppZDZ1EtNyaOODg/sQBtMxxJzGB+MOCM+T2Q5Qe1fKBrdxUmjyRxm0r7Ez9w==", "dev": true, "license": "MIT", "dependencies": { - "@azure/msal-common": "15.13.3" + "@azure/msal-common": "16.4.1" }, "engines": { "node": ">=0.8.0" } }, "node_modules/@azure/msal-common": { - "version": "15.13.3", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.13.3.tgz", - "integrity": "sha512-shSDU7Ioecya+Aob5xliW9IGq1Ui8y4EVSdWGyI1Gbm4Vg61WpP95LuzcY214/wEjSn6w4PZYD4/iVldErHayQ==", + "version": "16.4.1", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-16.4.1.tgz", + "integrity": "sha512-Bl8f+w37xkXsYh7QRkAKCFGYtWMYuOVO7Lv+BxILrvGz3HbIEF22Pt0ugyj0QPOl6NLrHcnNUQ9yeew98P/5iw==", "dev": true, "license": "MIT", "engines": { @@ -406,24 +413,24 @@ } }, "node_modules/@azure/msal-node": { - "version": "3.8.4", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.4.tgz", - "integrity": "sha512-lvuAwsDpPDE/jSuVQOBMpLbXuVuLsPNRwWCyK3/6bPlBk0fGWegqoZ0qjZclMWyQ2JNvIY3vHY7hoFmFmFQcOw==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-5.1.2.tgz", + "integrity": "sha512-DoeSJ9U5KPAIZoHsPywvfEj2MhBniQe0+FSpjLUTdWoIkI999GB5USkW6nNEHnIaLVxROHXvprWA1KzdS1VQ4A==", "dev": true, "license": "MIT", "dependencies": { - "@azure/msal-common": "15.13.3", + "@azure/msal-common": "16.4.1", "jsonwebtoken": "^9.0.0", "uuid": "^8.3.0" }, "engines": { - "node": ">=16" + "node": ">=20" } }, "node_modules/@azure/storage-blob": { - "version": "12.29.1", - "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.29.1.tgz", - "integrity": "sha512-7ktyY0rfTM0vo7HvtK6E3UvYnI9qfd6Oz6z/+92VhGRveWng3kJwMKeUpqmW/NmwcDNbxHpSlldG+vsUnRFnBg==", + "version": "12.31.0", + "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.31.0.tgz", + "integrity": "sha512-DBgNv10aCSxopt92DkTDD0o9xScXeBqPKGmR50FPZQaEcH4JLQ+GEOGEDv19V5BMkB7kxr+m4h6il/cCDPvmHg==", "dev": true, "license": "MIT", "dependencies": { @@ -438,7 +445,7 @@ "@azure/core-util": "^1.11.0", "@azure/core-xml": "^1.4.5", "@azure/logger": "^1.1.4", - "@azure/storage-common": "^12.1.1", + "@azure/storage-common": "^12.3.0", "events": "^3.0.0", "tslib": "^2.8.1" }, @@ -447,9 +454,9 @@ } }, "node_modules/@azure/storage-common": { - "version": "12.1.1", - "resolved": "https://registry.npmjs.org/@azure/storage-common/-/storage-common-12.1.1.tgz", - "integrity": "sha512-eIOH1pqFwI6UmVNnDQvmFeSg0XppuzDLFeUNO/Xht7ODAzRLgGDh7h550pSxoA+lPDxBl1+D2m/KG3jWzCUjTg==", + "version": "12.3.0", + "resolved": "https://registry.npmjs.org/@azure/storage-common/-/storage-common-12.3.0.tgz", + "integrity": "sha512-/OFHhy86aG5Pe8dP5tsp+BuJ25JOAl9yaMU3WZbkeoiFMHFtJ7tu5ili7qEdBXNW9G5lDB19trwyI6V49F/8iQ==", "dev": true, "license": "MIT", "dependencies": { @@ -468,13 +475,13 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", - "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz", + "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.27.1", + "@babel/helper-validator-identifier": "^7.28.5", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" }, @@ -483,9 +490,9 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", - "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", + "version": "7.28.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", + "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", "dev": true, "license": "MIT", "engines": { @@ -502,12 +509,13 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.1.tgz", - "integrity": "sha512-kfYGy8IdzTGy+z0vFGvExZtxkFlA4zAxgKEahG9KE1ScBjpQnFsNOX8KTU5ojNru5ed5CVoJYXFtoxaq5nFbjQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.3.tgz", + "integrity": "sha512-9fJMTNFTWZMh5qwrBItuziu834eOCUcEqymSH7pY+zoMVEZg3gcPuBNxH1EvfVYe9h0x/Ptw8KBzv7qxb7l8dg==", "cpu": [ "ppc64" ], + "license": "MIT", "optional": true, "os": [ "aix" @@ -517,12 +525,13 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.1.tgz", - "integrity": "sha512-dp+MshLYux6j/JjdqVLnMglQlFu+MuVeNrmT5nk6q07wNhCdSnB7QZj+7G8VMUGh1q+vj2Bq8kRsuyA00I/k+Q==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.3.tgz", + "integrity": "sha512-i5D1hPY7GIQmXlXhs2w8AWHhenb00+GxjxRncS2ZM7YNVGNfaMxgzSGuO8o8SJzRc/oZwU2bcScvVERk03QhzA==", "cpu": [ "arm" ], + "license": "MIT", "optional": true, "os": [ "android" @@ -532,12 +541,13 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.1.tgz", - "integrity": "sha512-50tM0zCJW5kGqgG7fQ7IHvQOcAn9TKiVRuQ/lN0xR+T2lzEFvAi1ZcS8DiksFcEpf1t/GYOeOfCAgDHFpkiSmA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.3.tgz", + "integrity": "sha512-YdghPYUmj/FX2SYKJ0OZxf+iaKgMsKHVPF1MAq/P8WirnSpCStzKJFjOjzsW0QQ7oIAiccHdcqjbHmJxRb/dmg==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "android" @@ -547,12 +557,13 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.1.tgz", - "integrity": "sha512-GCj6WfUtNldqUzYkN/ITtlhwQqGWu9S45vUXs7EIYf+7rCiiqH9bCloatO9VhxsL0Pji+PF4Lz2XXCES+Q8hDw==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.3.tgz", + "integrity": "sha512-IN/0BNTkHtk8lkOM8JWAYFg4ORxBkZQf9zXiEOfERX/CzxW3Vg1ewAhU7QSWQpVIzTW+b8Xy+lGzdYXV6UZObQ==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "android" @@ -562,12 +573,13 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.1.tgz", - "integrity": "sha512-5hEZKPf+nQjYoSr/elb62U19/l1mZDdqidGfmFutVUjjUZrOazAtwK+Kr+3y0C/oeJfLlxo9fXb1w7L+P7E4FQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.3.tgz", + "integrity": "sha512-Re491k7ByTVRy0t3EKWajdLIr0gz2kKKfzafkth4Q8A5n1xTHrkqZgLLjFEHVD+AXdUGgQMq+Godfq45mGpCKg==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "darwin" @@ -577,12 +589,13 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.1.tgz", - "integrity": "sha512-hxVnwL2Dqs3fM1IWq8Iezh0cX7ZGdVhbTfnOy5uURtao5OIVCEyj9xIzemDi7sRvKsuSdtCAhMKarxqtlyVyfA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.3.tgz", + "integrity": "sha512-vHk/hA7/1AckjGzRqi6wbo+jaShzRowYip6rt6q7VYEDX4LEy1pZfDpdxCBnGtl+A5zq8iXDcyuxwtv3hNtHFg==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "darwin" @@ -592,12 +605,13 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.1.tgz", - "integrity": "sha512-1MrCZs0fZa2g8E+FUo2ipw6jw5qqQiH+tERoS5fAfKnRx6NXH31tXBKI3VpmLijLH6yriMZsxJtaXUyFt/8Y4A==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.3.tgz", + "integrity": "sha512-ipTYM2fjt3kQAYOvo6vcxJx3nBYAzPjgTCk7QEgZG8AUO3ydUhvelmhrbOheMnGOlaSFUoHXB6un+A7q4ygY9w==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "freebsd" @@ -607,12 +621,13 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.1.tgz", - "integrity": "sha512-0IZWLiTyz7nm0xuIs0q1Y3QWJC52R8aSXxe40VUxm6BB1RNmkODtW6LHvWRrGiICulcX7ZvyH6h5fqdLu4gkww==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.3.tgz", + "integrity": "sha512-dDk0X87T7mI6U3K9VjWtHOXqwAMJBNN2r7bejDsc+j03SEjtD9HrOl8gVFByeM0aJksoUuUVU9TBaZa2rgj0oA==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "freebsd" @@ -622,12 +637,13 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.1.tgz", - "integrity": "sha512-NdKOhS4u7JhDKw9G3cY6sWqFcnLITn6SqivVArbzIaf3cemShqfLGHYMx8Xlm/lBit3/5d7kXvriTUGa5YViuQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.3.tgz", + "integrity": "sha512-s6nPv2QkSupJwLYyfS+gwdirm0ukyTFNl3KTgZEAiJDd+iHZcbTPPcWCcRYH+WlNbwChgH2QkE9NSlNrMT8Gfw==", "cpu": [ "arm" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -637,12 +653,13 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.1.tgz", - "integrity": "sha512-jaN3dHi0/DDPelk0nLcXRm1q7DNJpjXy7yWaWvbfkPvI+7XNSc/lDOnCLN7gzsyzgu6qSAmgSvP9oXAhP973uQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.3.tgz", + "integrity": "sha512-sZOuFz/xWnZ4KH3YfFrKCf1WyPZHakVzTiqji3WDc0BCl2kBwiJLCXpzLzUBLgmp4veFZdvN5ChW4Eq/8Fc2Fg==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -652,12 +669,13 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.1.tgz", - "integrity": "sha512-OJykPaF4v8JidKNGz8c/q1lBO44sQNUQtq1KktJXdBLn1hPod5rE/Hko5ugKKZd+D2+o1a9MFGUEIUwO2YfgkQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.3.tgz", + "integrity": "sha512-yGlQYjdxtLdh0a3jHjuwOrxQjOZYD/C9PfdbgJJF3TIZWnm/tMd/RcNiLngiu4iwcBAOezdnSLAwQDPqTmtTYg==", "cpu": [ "ia32" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -667,12 +685,13 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.1.tgz", - "integrity": "sha512-nGfornQj4dzcq5Vp835oM/o21UMlXzn79KobKlcs3Wz9smwiifknLy4xDCLUU0BWp7b/houtdrgUz7nOGnfIYg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.3.tgz", + "integrity": "sha512-WO60Sn8ly3gtzhyjATDgieJNet/KqsDlX5nRC5Y3oTFcS1l0KWba+SEa9Ja1GfDqSF1z6hif/SkpQJbL63cgOA==", "cpu": [ "loong64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -682,12 +701,13 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.1.tgz", - "integrity": "sha512-1osBbPEFYwIE5IVB/0g2X6i1qInZa1aIoj1TdL4AaAb55xIIgbg8Doq6a5BzYWgr+tEcDzYH67XVnTmUzL+nXg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.3.tgz", + "integrity": "sha512-APsymYA6sGcZ4pD6k+UxbDjOFSvPWyZhjaiPyl/f79xKxwTnrn5QUnXR5prvetuaSMsb4jgeHewIDCIWljrSxw==", "cpu": [ "mips64el" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -697,12 +717,13 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.1.tgz", - "integrity": "sha512-/6VBJOwUf3TdTvJZ82qF3tbLuWsscd7/1w+D9LH0W/SqUgM5/JJD0lrJ1fVIfZsqB6RFmLCe0Xz3fmZc3WtyVg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.3.tgz", + "integrity": "sha512-eizBnTeBefojtDb9nSh4vvVQ3V9Qf9Df01PfawPcRzJH4gFSgrObw+LveUyDoKU3kxi5+9RJTCWlj4FjYXVPEA==", "cpu": [ "ppc64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -712,12 +733,13 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.1.tgz", - "integrity": "sha512-nSut/Mx5gnilhcq2yIMLMe3Wl4FK5wx/o0QuuCLMtmJn+WeWYoEGDN1ipcN72g1WHsnIbxGXd4i/MF0gTcuAjQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.3.tgz", + "integrity": "sha512-3Emwh0r5wmfm3ssTWRQSyVhbOHvqegUDRd0WhmXKX2mkHJe1SFCMJhagUleMq+Uci34wLSipf8Lagt4LlpRFWQ==", "cpu": [ "riscv64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -727,12 +749,13 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.1.tgz", - "integrity": "sha512-cEECeLlJNfT8kZHqLarDBQso9a27o2Zd2AQ8USAEoGtejOrCYHNtKP8XQhMDJMtthdF4GBmjR2au3x1udADQQQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.3.tgz", + "integrity": "sha512-pBHUx9LzXWBc7MFIEEL0yD/ZVtNgLytvx60gES28GcWMqil8ElCYR4kvbV2BDqsHOvVDRrOxGySBM9Fcv744hw==", "cpu": [ "s390x" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -742,12 +765,13 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz", - "integrity": "sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.3.tgz", + "integrity": "sha512-Czi8yzXUWIQYAtL/2y6vogER8pvcsOsk5cpwL4Gk5nJqH5UZiVByIY8Eorm5R13gq+DQKYg0+JyQoytLQas4dA==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -757,12 +781,13 @@ } }, "node_modules/@esbuild/netbsd-arm64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.1.tgz", - "integrity": "sha512-O96poM2XGhLtpTh+s4+nP7YCCAfb4tJNRVZHfIE7dgmax+yMP2WgMd2OecBuaATHKTHsLWHQeuaxMRnCsH8+5g==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.3.tgz", + "integrity": "sha512-sDpk0RgmTCR/5HguIZa9n9u+HVKf40fbEUt+iTzSnCaGvY9kFP0YKBWZtJaraonFnqef5SlJ8/TiPAxzyS+UoA==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "netbsd" @@ -772,12 +797,13 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.1.tgz", - "integrity": "sha512-X53z6uXip6KFXBQ+Krbx25XHV/NCbzryM6ehOAeAil7X7oa4XIq+394PWGnwaSQ2WRA0KI6PUO6hTO5zeF5ijA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.3.tgz", + "integrity": "sha512-P14lFKJl/DdaE00LItAukUdZO5iqNH7+PjoBm+fLQjtxfcfFE20Xf5CrLsmZdq5LFFZzb5JMZ9grUwvtVYzjiA==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "netbsd" @@ -787,12 +813,13 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.1.tgz", - "integrity": "sha512-Na9T3szbXezdzM/Kfs3GcRQNjHzM6GzFBeU1/6IV/npKP5ORtp9zbQjvkDJ47s6BCgaAZnnnu/cY1x342+MvZg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.3.tgz", + "integrity": "sha512-AIcMP77AvirGbRl/UZFTq5hjXK+2wC7qFRGoHSDrZ5v5b8DK/GYpXW3CPRL53NkvDqb9D+alBiC/dV0Fb7eJcw==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "openbsd" @@ -802,12 +829,13 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.1.tgz", - "integrity": "sha512-T3H78X2h1tszfRSf+txbt5aOp/e7TAz3ptVKu9Oyir3IAOFPGV6O9c2naym5TOriy1l0nNf6a4X5UXRZSGX/dw==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.3.tgz", + "integrity": "sha512-DnW2sRrBzA+YnE70LKqnM3P+z8vehfJWHXECbwBmH/CU51z6FiqTQTHFenPlHmo3a8UgpLyH3PT+87OViOh1AQ==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "openbsd" @@ -816,13 +844,30 @@ "node": ">=18" } }, + "node_modules/@esbuild/openharmony-arm64": { + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.3.tgz", + "integrity": "sha512-NinAEgr/etERPTsZJ7aEZQvvg/A6IsZG/LgZy+81wON2huV7SrK3e63dU0XhyZP4RKGyTm7aOgmQk0bGp0fy2g==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": ">=18" + } + }, "node_modules/@esbuild/sunos-x64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.1.tgz", - "integrity": "sha512-2H3RUvcmULO7dIE5EWJH8eubZAI4xw54H1ilJnRNZdeo8dTADEZ21w6J22XBkXqGJbe0+wnNJtw3UXRoLJnFEg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.3.tgz", + "integrity": "sha512-PanZ+nEz+eWoBJ8/f8HKxTTD172SKwdXebZ0ndd953gt1HRBbhMsaNqjTyYLGLPdoWHy4zLU7bDVJztF5f3BHA==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "sunos" @@ -832,12 +877,13 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.1.tgz", - "integrity": "sha512-GE7XvrdOzrb+yVKB9KsRMq+7a2U/K5Cf/8grVFRAGJmfADr/e/ODQ134RK2/eeHqYV5eQRFxb1hY7Nr15fv1NQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.3.tgz", + "integrity": "sha512-B2t59lWWYrbRDw/tjiWOuzSsFh1Y/E95ofKz7rIVYSQkUYBjfSgf6oeYPNWHToFRr2zx52JKApIcAS/D5TUBnA==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "win32" @@ -847,12 +893,13 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.1.tgz", - "integrity": "sha512-uOxSJCIcavSiT6UnBhBzE8wy3n0hOkJsBOzy7HDAuTDE++1DJMRRVCPGisULScHL+a/ZwdXPpXD3IyFKjA7K8A==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.3.tgz", + "integrity": "sha512-QLKSFeXNS8+tHW7tZpMtjlNb7HKau0QDpwm49u0vUp9y1WOF+PEzkU84y9GqYaAVW8aH8f3GcBck26jh54cX4Q==", "cpu": [ "ia32" ], + "license": "MIT", "optional": true, "os": [ "win32" @@ -862,12 +909,13 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.1.tgz", - "integrity": "sha512-Y1EQdcfwMSeQN/ujR5VayLOJ1BHaK+ssyk0AEzPjC+t1lITgsnccPqFjb6V+LsTp/9Iov4ysfjxLaGJ9RPtkVg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.3.tgz", + "integrity": "sha512-4uJGhsxuptu3OcpVAzli+/gWusVGwZZHTlS63hh++ehExkVT8SgiEf7/uC/PclrPPkLhZqGgCTjd0VWLo6xMqA==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "win32" @@ -877,10 +925,11 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz", - "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==", + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz", + "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==", "dev": true, + "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.4.3" }, @@ -907,45 +956,73 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", - "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "version": "4.12.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz", + "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==", "dev": true, + "license": "MIT", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/config-array": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz", - "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==", + "version": "0.21.2", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.2.tgz", + "integrity": "sha512-nJl2KGTlrf9GjLimgIru+V/mzgSK0ABCDQRvxw5BjURL7WfH5uoWmizbH7QB6MmnMBd8cIC9uceWnezL1VZWWw==", "dev": true, - "peer": true, + "license": "Apache-2.0", "dependencies": { - "@eslint/object-schema": "^2.1.6", + "@eslint/object-schema": "^2.1.7", "debug": "^4.3.1", - "minimatch": "^3.1.2" + "minimatch": "^3.1.5" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@eslint/config-array/node_modules/brace-expansion": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz", + "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@eslint/config-array/node_modules/minimatch": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/@eslint/config-helpers": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.1.0.tgz", - "integrity": "sha512-kLrdPDJE1ckPo94kmPPf9Hfd0DU0Jw6oKYrhe+pwSC0iTUInmTa+w6fw8sGgcfkFJGNdWOUeOaDM4quW4a7OkA==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz", + "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==", "dev": true, - "peer": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/core": "^0.17.0" + }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@eslint/core": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz", - "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==", + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz", + "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==", "dev": true, - "peer": true, + "license": "Apache-2.0", "dependencies": { "@types/json-schema": "^7.0.15" }, @@ -954,20 +1031,20 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.0.tgz", - "integrity": "sha512-yaVPAiNAalnCZedKLdR21GOGILMLKPyqSLWaAjQFvYA2i/ciDi8ArYVr69Anohb6cH2Ukhqti4aFnYyPm8wdwQ==", + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.5.tgz", + "integrity": "sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==", "dev": true, - "peer": true, + "license": "MIT", "dependencies": { - "ajv": "^6.12.4", + "ajv": "^6.14.0", "debug": "^4.3.2", "espree": "^10.0.1", "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", + "js-yaml": "^4.1.1", + "minimatch": "^3.1.5", "strip-json-comments": "^3.1.1" }, "engines": { @@ -978,11 +1055,11 @@ } }, "node_modules/@eslint/eslintrc/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", + "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", "dev": true, - "peer": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -994,41 +1071,68 @@ "url": "https://github.com/sponsors/epoberezkin" } }, + "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz", + "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true, - "peer": true + "license": "MIT" + }, + "node_modules/@eslint/eslintrc/node_modules/minimatch": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } }, "node_modules/@eslint/js": { - "version": "9.22.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.22.0.tgz", - "integrity": "sha512-vLFajx9o8d1/oL2ZkpMYbkLv8nDB6yaIwFNt7nI4+I80U/z03SxmfOMsLbvWr3p7C+Wnoh//aOu2pQW8cS0HCQ==", + "version": "9.39.4", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.4.tgz", + "integrity": "sha512-nE7DEIchvtiFTwBw4Lfbu59PG+kCofhjsKaCWzxTpt4lfRjRMqG6uMBzKXuEcyXhOHoUp9riAm7/aWYGhXZ9cw==", "dev": true, - "peer": true, + "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://eslint.org/donate" } }, "node_modules/@eslint/object-schema": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", - "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz", + "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==", "dev": true, - "peer": true, + "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@eslint/plugin-kit": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.7.tgz", - "integrity": "sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz", + "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==", "dev": true, - "peer": true, + "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^0.12.0", + "@eslint/core": "^0.17.0", "levn": "^0.4.1" }, "engines": { @@ -1040,7 +1144,6 @@ "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", "dev": true, - "peer": true, "engines": { "node": ">=18.18.0" } @@ -1050,7 +1153,6 @@ "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", "dev": true, - "peer": true, "dependencies": { "@humanfs/core": "^0.19.1", "@humanwhocodes/retry": "^0.3.0" @@ -1064,7 +1166,6 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", "dev": true, - "peer": true, "engines": { "node": ">=18.18" }, @@ -1078,7 +1179,6 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true, - "peer": true, "engines": { "node": ">=12.22" }, @@ -1092,7 +1192,6 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz", "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==", "dev": true, - "peer": true, "engines": { "node": ">=18.18" }, @@ -1102,9 +1201,9 @@ } }, "node_modules/@inquirer/ansi": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/ansi/-/ansi-2.0.2.tgz", - "integrity": "sha512-SYLX05PwJVnW+WVegZt1T4Ip1qba1ik+pNJPDiqvk6zS5Y/i8PhRzLpGEtVd7sW0G8cMtkD8t4AZYhQwm8vnww==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@inquirer/ansi/-/ansi-2.0.5.tgz", + "integrity": "sha512-doc2sWgJpbFQ64UflSVd17ibMGDuxO1yKgOgLMwavzESnXjFWJqUeG8saYosqKpHp4kWiM5x1nXvEjbpx90gzw==", "dev": true, "license": "MIT", "engines": { @@ -1112,16 +1211,16 @@ } }, "node_modules/@inquirer/checkbox": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-5.0.2.tgz", - "integrity": "sha512-iTPV4tMMct7iOpwer5qmTP7gjnk1VQJjsNfAaC2b8Q3qiuHM3K2yjjDr5u1MKfkrvp2JD4Flf8sIPpF21pmZmw==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-5.1.3.tgz", + "integrity": "sha512-+G7I8CT+EHv/hasNfUl3P37DVoMoZfpA+2FXmM54dA8MxYle1YqucxbacxHalw1iAFSdKNEDTGNV7F+j1Ldqcg==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/ansi": "^2.0.2", - "@inquirer/core": "^11.0.2", - "@inquirer/figures": "^2.0.2", - "@inquirer/type": "^4.0.2" + "@inquirer/ansi": "^2.0.5", + "@inquirer/core": "^11.1.8", + "@inquirer/figures": "^2.0.5", + "@inquirer/type": "^4.0.5" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1136,14 +1235,14 @@ } }, "node_modules/@inquirer/confirm": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-6.0.2.tgz", - "integrity": "sha512-A0/13Wyi+8iFeNDX6D4zZYKPoBLIEbE4K/219qHcnpXMer2weWvaTo63+2c7mQPPA206DEMSYVOPnEw3meOlCw==", + "version": "6.0.11", + "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-6.0.11.tgz", + "integrity": "sha512-pTpHjg0iEIRMYV/7oCZUMf27/383E6Wyhfc/MY+AVQGEoUobffIYWOK9YLP2XFRGz/9i6WlTQh1CkFVIo2Y7XA==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^11.0.2", - "@inquirer/type": "^4.0.2" + "@inquirer/core": "^11.1.8", + "@inquirer/type": "^4.0.5" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1158,19 +1257,19 @@ } }, "node_modules/@inquirer/core": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-11.0.2.tgz", - "integrity": "sha512-lgMRx/n02ciiNELBvFLHtmcjbV5tf5D/I0UYfCg2YbTZWmBZ10/niLd3IjWBxz8LtM27xP+4oLEa06Slmb7p7A==", + "version": "11.1.8", + "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-11.1.8.tgz", + "integrity": "sha512-/u+yJk2pOKNDOh1ZgdUH2RQaRx6OOH4I0uwL95qPvTFTIL38YBsuSC4r1yXBB3Q6JvNqFFc202gk0Ew79rrcjA==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/ansi": "^2.0.2", - "@inquirer/figures": "^2.0.2", - "@inquirer/type": "^4.0.2", + "@inquirer/ansi": "^2.0.5", + "@inquirer/figures": "^2.0.5", + "@inquirer/type": "^4.0.5", "cli-width": "^4.1.0", + "fast-wrap-ansi": "^0.2.0", "mute-stream": "^3.0.0", - "signal-exit": "^4.1.0", - "wrap-ansi": "^9.0.2" + "signal-exit": "^4.1.0" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1185,15 +1284,15 @@ } }, "node_modules/@inquirer/editor": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-5.0.2.tgz", - "integrity": "sha512-pXQ4Nf0qmFcJuYB6NlcIIxH6l6zKOwNg1Jh/ZRdKd2dTqBB4OXKUFbFwR2K4LVXVtq15ZFFatBVT+rerYR8hWQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-5.1.0.tgz", + "integrity": "sha512-6wlkYl65Qfayy48gPCfU4D7li6KCAGN79mLXa/tYHZH99OfZ820yY+HA+DgE88r8YwwgeuY6PQgNqMeK6LuMmw==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^11.0.2", - "@inquirer/external-editor": "^2.0.2", - "@inquirer/type": "^4.0.2" + "@inquirer/core": "^11.1.8", + "@inquirer/external-editor": "^3.0.0", + "@inquirer/type": "^4.0.5" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1208,14 +1307,14 @@ } }, "node_modules/@inquirer/expand": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-5.0.2.tgz", - "integrity": "sha512-siFG1swxfjFIOxIcehtZkh+KUNB/YCpyfHNEGu+nC/SBXIbgUWibvThLn/WesSxLRGOeSKdNKoTm+GQCKFm6Ww==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-5.0.12.tgz", + "integrity": "sha512-vOfrB33b7YIZfDauXS8vNNz2Z86FozTZLIt7e+7/dCaPJ1RXZsHCuI9TlcERzEUq57vkM+UdnBgxP0rFd23JYQ==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^11.0.2", - "@inquirer/type": "^4.0.2" + "@inquirer/core": "^11.1.8", + "@inquirer/type": "^4.0.5" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1230,14 +1329,14 @@ } }, "node_modules/@inquirer/external-editor": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-2.0.2.tgz", - "integrity": "sha512-X/fMXK7vXomRWEex1j8mnj7s1mpnTeP4CO/h2gysJhHLT2WjBnLv4ZQEGpm/kcYI8QfLZ2fgW+9kTKD+jeopLg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-3.0.0.tgz", + "integrity": "sha512-lDSwMgg+M5rq6JKBYaJwSX6T9e/HK2qqZ1oxmOwn4AQoJE5D+7TumsxLGC02PWS//rkIVqbZv3XA3ejsc9FYvg==", "dev": true, "license": "MIT", "dependencies": { "chardet": "^2.1.1", - "iconv-lite": "^0.7.0" + "iconv-lite": "^0.7.2" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1252,9 +1351,9 @@ } }, "node_modules/@inquirer/figures": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-2.0.2.tgz", - "integrity": "sha512-qXm6EVvQx/FmnSrCWCIGtMHwqeLgxABP8XgcaAoywsL0NFga9gD5kfG0gXiv80GjK9Hsoz4pgGwF/+CjygyV9A==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-2.0.5.tgz", + "integrity": "sha512-NsSs4kzfm12lNetHwAn3GEuH317IzpwrMCbOuMIVytpjnJ90YYHNwdRgYGuKmVxwuIqSgqk3M5qqQt1cDk0tGQ==", "dev": true, "license": "MIT", "engines": { @@ -1262,14 +1361,14 @@ } }, "node_modules/@inquirer/input": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-5.0.2.tgz", - "integrity": "sha512-hN2YRo1QiEc9lD3mK+CPnTS4TK2RhCMmMmP4nCWwTkmQL2vx9jPJWYk+rbUZpwR1D583ZJk1FI3i9JZXIpi/qg==", + "version": "5.0.11", + "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-5.0.11.tgz", + "integrity": "sha512-twUWidn4ocPO8qi6fRM7tNWt7W1FOnOZqQ+/+PsfLUacMR5rFLDPK9ql0nBPwxi0oELbo8T5NhRs8B2+qQEqFQ==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^11.0.2", - "@inquirer/type": "^4.0.2" + "@inquirer/core": "^11.1.8", + "@inquirer/type": "^4.0.5" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1284,14 +1383,14 @@ } }, "node_modules/@inquirer/number": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-4.0.2.tgz", - "integrity": "sha512-4McnjTSYrlthNW1ojkkmP75WLRYhQs7GXm6pDDoIrHqJuV5uUYwfdbB0geHdaKMarAqJQgoOVjzIT0jdWCsKew==", + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-4.0.11.tgz", + "integrity": "sha512-Vscmim9TCksQsfjPtka/JwPUcbLhqWYrgfPf1cHrCm24X/F2joFwnageD50yMKsaX14oNGOyKf/RNXAFkNjWpA==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^11.0.2", - "@inquirer/type": "^4.0.2" + "@inquirer/core": "^11.1.8", + "@inquirer/type": "^4.0.5" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1306,15 +1405,15 @@ } }, "node_modules/@inquirer/password": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-5.0.2.tgz", - "integrity": "sha512-oSDziMKiw4G2e4zS+0JRfxuPFFGh6N/9yUaluMgEHp2/Yyj2JGwfDO7XbwtOrxVrz+XsP/iaGyWXdQb9d8A0+g==", + "version": "5.0.11", + "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-5.0.11.tgz", + "integrity": "sha512-9KZFeRaNHIcejtPb0wN4ddFc7EvobVoAFa049eS3LrDZFxI8O7xUXiITEOinBzkZFAIwY5V4yzQae/QfO9cbbg==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/ansi": "^2.0.2", - "@inquirer/core": "^11.0.2", - "@inquirer/type": "^4.0.2" + "@inquirer/ansi": "^2.0.5", + "@inquirer/core": "^11.1.8", + "@inquirer/type": "^4.0.5" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1329,22 +1428,22 @@ } }, "node_modules/@inquirer/prompts": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-8.0.2.tgz", - "integrity": "sha512-2zK5zY48fZcl6+gG4eqOC/UzZsJckHCRvjXoLuW4D8LKOCVGdcJiSKkLnumSZjR/6PXPINDGOrGHqNxb+sxJDg==", + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-8.4.1.tgz", + "integrity": "sha512-AH5xPQ997K7e0F0vulPlteIHke2awMkFi8F0dBemrDfmvtPmHJo82mdHbONC4F/t8d1NHwrbI5cGVI+RbLWdoQ==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/checkbox": "^5.0.2", - "@inquirer/confirm": "^6.0.2", - "@inquirer/editor": "^5.0.2", - "@inquirer/expand": "^5.0.2", - "@inquirer/input": "^5.0.2", - "@inquirer/number": "^4.0.2", - "@inquirer/password": "^5.0.2", - "@inquirer/rawlist": "^5.0.2", - "@inquirer/search": "^4.0.2", - "@inquirer/select": "^5.0.2" + "@inquirer/checkbox": "^5.1.3", + "@inquirer/confirm": "^6.0.11", + "@inquirer/editor": "^5.1.0", + "@inquirer/expand": "^5.0.12", + "@inquirer/input": "^5.0.11", + "@inquirer/number": "^4.0.11", + "@inquirer/password": "^5.0.11", + "@inquirer/rawlist": "^5.2.7", + "@inquirer/search": "^4.1.7", + "@inquirer/select": "^5.1.3" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1359,14 +1458,14 @@ } }, "node_modules/@inquirer/rawlist": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-5.0.2.tgz", - "integrity": "sha512-AcNALEdQKUQDeJcpC1a3YC53m1MLv+sMUS+vRZ8Qigs1Yg3Dcdtmi82rscJplogKOY8CXkKW4wvVwHS2ZjCIBQ==", + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-5.2.7.tgz", + "integrity": "sha512-AqRMiD9+uE1lskDPrdqHwrV/EUmxKEBLX44SR7uxK3vD2413AmVfE5EQaPeNzYf5Pq5SitHJDYUFVF0poIr09w==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^11.0.2", - "@inquirer/type": "^4.0.2" + "@inquirer/core": "^11.1.8", + "@inquirer/type": "^4.0.5" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1381,15 +1480,15 @@ } }, "node_modules/@inquirer/search": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-4.0.2.tgz", - "integrity": "sha512-hg63w5toohdzE65S3LiGhdfIL0kT+yisbZARf7zw65PvyMUTutTN3eMAvD/B6y/25z88vTrB7kSB45Vz5CbrXg==", + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-4.1.7.tgz", + "integrity": "sha512-1y7+0N65AWk5RdlXH/Kn13txf3IjIQ7OEfhCEkDTU+h5wKMLq8DUF3P6z+/kLSxDGDtQT1dRBWEUC3o/VvImsQ==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^11.0.2", - "@inquirer/figures": "^2.0.2", - "@inquirer/type": "^4.0.2" + "@inquirer/core": "^11.1.8", + "@inquirer/figures": "^2.0.5", + "@inquirer/type": "^4.0.5" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1404,16 +1503,16 @@ } }, "node_modules/@inquirer/select": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-5.0.2.tgz", - "integrity": "sha512-JygTohvQxSNnvt7IKANVlg/eds+yN5sLRilYeGc4ri/9Aqi/2QPoXBMV5Cz/L1VtQv63SnTbPXJZeCK2pSwsOA==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-5.1.3.tgz", + "integrity": "sha512-zYyqWgGQi3NhBcNq4Isc5rB3oEdQEh1Q/EcAnOW0FK4MpnXWkvSBYgA4cYrTM4A9UB573omouZbnL9JJ74Mq3A==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/ansi": "^2.0.2", - "@inquirer/core": "^11.0.2", - "@inquirer/figures": "^2.0.2", - "@inquirer/type": "^4.0.2" + "@inquirer/ansi": "^2.0.5", + "@inquirer/core": "^11.1.8", + "@inquirer/figures": "^2.0.5", + "@inquirer/type": "^4.0.5" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" @@ -1428,9 +1527,9 @@ } }, "node_modules/@inquirer/type": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-4.0.2.tgz", - "integrity": "sha512-cae7mzluplsjSdgFA6ACLygb5jC8alO0UUnFPyu0E7tNRPrL+q/f8VcSXp+cjZQ7l5CMpDpi2G1+IQvkOiL1Lw==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-4.0.5.tgz", + "integrity": "sha512-aetVUNeKNc/VriqXlw1NRSW0zhMBB0W4bNbWRJgzRl/3d0QNDQFfk0GO5SDdtjMZVg6o8ZKEiadd7SCCzoOn5Q==", "dev": true, "license": "MIT", "engines": { @@ -1445,29 +1544,6 @@ } } }, - "node_modules/@isaacs/balanced-match": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", - "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/@isaacs/brace-expansion": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz", - "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@isaacs/balanced-match": "^4.0.1" - }, - "engines": { - "node": "20 || >=22" - } - }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -1546,10 +1622,11 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", - "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", - "dev": true + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", + "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", + "dev": true, + "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.25", @@ -1566,6 +1643,7 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -1579,6 +1657,7 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } @@ -1588,6 +1667,7 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -1607,9 +1687,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.46.2.tgz", - "integrity": "sha512-Zj3Hl6sN34xJtMv7Anwb5Gu01yujyE/cLBDB2gnHTAHaWS1Z38L7kuSG+oAh0giZMqG060f/YBStXtMH6FvPMA==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.59.0.tgz", + "integrity": "sha512-upnNBkA6ZH2VKGcBj9Fyl9IGNPULcjXRlg0LLeaioQWueH30p6IXtJEbKAgvyv+mJaMxSm1l6xwDXYjpEMiLMg==", "cpu": [ "arm" ], @@ -1621,9 +1701,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.46.2.tgz", - "integrity": "sha512-nTeCWY83kN64oQ5MGz3CgtPx8NSOhC5lWtsjTs+8JAJNLcP3QbLCtDDgUKQc/Ro/frpMq4SHUaHN6AMltcEoLQ==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.59.0.tgz", + "integrity": "sha512-hZ+Zxj3SySm4A/DylsDKZAeVg0mvi++0PYVceVyX7hemkw7OreKdCvW2oQ3T1FMZvCaQXqOTHb8qmBShoqk69Q==", "cpu": [ "arm64" ], @@ -1635,9 +1715,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.46.2.tgz", - "integrity": "sha512-HV7bW2Fb/F5KPdM/9bApunQh68YVDU8sO8BvcW9OngQVN3HHHkw99wFupuUJfGR9pYLLAjcAOA6iO+evsbBaPQ==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.59.0.tgz", + "integrity": "sha512-W2Psnbh1J8ZJw0xKAd8zdNgF9HRLkdWwwdWqubSVk0pUuQkoHnv7rx4GiF9rT4t5DIZGAsConRE3AxCdJ4m8rg==", "cpu": [ "arm64" ], @@ -1649,9 +1729,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.46.2.tgz", - "integrity": "sha512-SSj8TlYV5nJixSsm/y3QXfhspSiLYP11zpfwp6G/YDXctf3Xkdnk4woJIF5VQe0of2OjzTt8EsxnJDCdHd2xMA==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.59.0.tgz", + "integrity": "sha512-ZW2KkwlS4lwTv7ZVsYDiARfFCnSGhzYPdiOU4IM2fDbL+QGlyAbjgSFuqNRbSthybLbIJ915UtZBtmuLrQAT/w==", "cpu": [ "x64" ], @@ -1663,9 +1743,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.46.2.tgz", - "integrity": "sha512-ZyrsG4TIT9xnOlLsSSi9w/X29tCbK1yegE49RYm3tu3wF1L/B6LVMqnEWyDB26d9Ecx9zrmXCiPmIabVuLmNSg==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.59.0.tgz", + "integrity": "sha512-EsKaJ5ytAu9jI3lonzn3BgG8iRBjV4LxZexygcQbpiU0wU0ATxhNVEpXKfUa0pS05gTcSDMKpn3Sx+QB9RlTTA==", "cpu": [ "arm64" ], @@ -1677,9 +1757,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.46.2.tgz", - "integrity": "sha512-pCgHFoOECwVCJ5GFq8+gR8SBKnMO+xe5UEqbemxBpCKYQddRQMgomv1104RnLSg7nNvgKy05sLsY51+OVRyiVw==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.59.0.tgz", + "integrity": "sha512-d3DuZi2KzTMjImrxoHIAODUZYoUUMsuUiY4SRRcJy6NJoZ6iIqWnJu9IScV9jXysyGMVuW+KNzZvBLOcpdl3Vg==", "cpu": [ "x64" ], @@ -1691,9 +1771,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.46.2.tgz", - "integrity": "sha512-EtP8aquZ0xQg0ETFcxUbU71MZlHaw9MChwrQzatiE8U/bvi5uv/oChExXC4mWhjiqK7azGJBqU0tt5H123SzVA==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.59.0.tgz", + "integrity": "sha512-t4ONHboXi/3E0rT6OZl1pKbl2Vgxf9vJfWgmUoCEVQVxhW6Cw/c8I6hbbu7DAvgp82RKiH7TpLwxnJeKv2pbsw==", "cpu": [ "arm" ], @@ -1705,9 +1785,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.46.2.tgz", - "integrity": "sha512-qO7F7U3u1nfxYRPM8HqFtLd+raev2K137dsV08q/LRKRLEc7RsiDWihUnrINdsWQxPR9jqZ8DIIZ1zJJAm5PjQ==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.59.0.tgz", + "integrity": "sha512-CikFT7aYPA2ufMD086cVORBYGHffBo4K8MQ4uPS/ZnY54GKj36i196u8U+aDVT2LX4eSMbyHtyOh7D7Zvk2VvA==", "cpu": [ "arm" ], @@ -1719,9 +1799,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.46.2.tgz", - "integrity": "sha512-3dRaqLfcOXYsfvw5xMrxAk9Lb1f395gkoBYzSFcc/scgRFptRXL9DOaDpMiehf9CO8ZDRJW2z45b6fpU5nwjng==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.59.0.tgz", + "integrity": "sha512-jYgUGk5aLd1nUb1CtQ8E+t5JhLc9x5WdBKew9ZgAXg7DBk0ZHErLHdXM24rfX+bKrFe+Xp5YuJo54I5HFjGDAA==", "cpu": [ "arm64" ], @@ -1733,9 +1813,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.46.2.tgz", - "integrity": "sha512-fhHFTutA7SM+IrR6lIfiHskxmpmPTJUXpWIsBXpeEwNgZzZZSg/q4i6FU4J8qOGyJ0TR+wXBwx/L7Ho9z0+uDg==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.59.0.tgz", + "integrity": "sha512-peZRVEdnFWZ5Bh2KeumKG9ty7aCXzzEsHShOZEFiCQlDEepP1dpUl/SrUNXNg13UmZl+gzVDPsiCwnV1uI0RUA==", "cpu": [ "arm64" ], @@ -1746,10 +1826,24 @@ "linux" ] }, - "node_modules/@rollup/rollup-linux-loongarch64-gnu": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.46.2.tgz", - "integrity": "sha512-i7wfGFXu8x4+FRqPymzjD+Hyav8l95UIZ773j7J7zRYc3Xsxy2wIn4x+llpunexXe6laaO72iEjeeGyUFmjKeA==", + "node_modules/@rollup/rollup-linux-loong64-gnu": { + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.59.0.tgz", + "integrity": "sha512-gbUSW/97f7+r4gHy3Jlup8zDG190AuodsWnNiXErp9mT90iCy9NKKU0Xwx5k8VlRAIV2uU9CsMnEFg/xXaOfXg==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loong64-musl": { + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.59.0.tgz", + "integrity": "sha512-yTRONe79E+o0FWFijasoTjtzG9EBedFXJMl888NBEDCDV9I2wGbFFfJQQe63OijbFCUZqxpHz1GzpbtSFikJ4Q==", "cpu": [ "loong64" ], @@ -1761,9 +1855,23 @@ ] }, "node_modules/@rollup/rollup-linux-ppc64-gnu": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.46.2.tgz", - "integrity": "sha512-B/l0dFcHVUnqcGZWKcWBSV2PF01YUt0Rvlurci5P+neqY/yMKchGU8ullZvIv5e8Y1C6wOn+U03mrDylP5q9Yw==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.59.0.tgz", + "integrity": "sha512-sw1o3tfyk12k3OEpRddF68a1unZ5VCN7zoTNtSn2KndUE+ea3m3ROOKRCZxEpmT9nsGnogpFP9x6mnLTCaoLkA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-ppc64-musl": { + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.59.0.tgz", + "integrity": "sha512-+2kLtQ4xT3AiIxkzFVFXfsmlZiG5FXYW7ZyIIvGA7Bdeuh9Z0aN4hVyXS/G1E9bTP/vqszNIN/pUKCk/BTHsKA==", "cpu": [ "ppc64" ], @@ -1775,9 +1883,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.46.2.tgz", - "integrity": "sha512-32k4ENb5ygtkMwPMucAb8MtV8olkPT03oiTxJbgkJa7lJ7dZMr0GCFJlyvy+K8iq7F/iuOr41ZdUHaOiqyR3iQ==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.59.0.tgz", + "integrity": "sha512-NDYMpsXYJJaj+I7UdwIuHHNxXZ/b/N2hR15NyH3m2qAtb/hHPA4g4SuuvrdxetTdndfj9b1WOmy73kcPRoERUg==", "cpu": [ "riscv64" ], @@ -1789,9 +1897,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.46.2.tgz", - "integrity": "sha512-t5B2loThlFEauloaQkZg9gxV05BYeITLvLkWOkRXogP4qHXLkWSbSHKM9S6H1schf/0YGP/qNKtiISlxvfmmZw==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.59.0.tgz", + "integrity": "sha512-nLckB8WOqHIf1bhymk+oHxvM9D3tyPndZH8i8+35p/1YiVoVswPid2yLzgX7ZJP0KQvnkhM4H6QZ5m0LzbyIAg==", "cpu": [ "riscv64" ], @@ -1803,9 +1911,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.46.2.tgz", - "integrity": "sha512-YKjekwTEKgbB7n17gmODSmJVUIvj8CX7q5442/CK80L8nqOUbMtf8b01QkG3jOqyr1rotrAnW6B/qiHwfcuWQA==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.59.0.tgz", + "integrity": "sha512-oF87Ie3uAIvORFBpwnCvUzdeYUqi2wY6jRFWJAy1qus/udHFYIkplYRW+wo+GRUP4sKzYdmE1Y3+rY5Gc4ZO+w==", "cpu": [ "s390x" ], @@ -1817,9 +1925,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.46.2.tgz", - "integrity": "sha512-Jj5a9RUoe5ra+MEyERkDKLwTXVu6s3aACP51nkfnK9wJTraCC8IMe3snOfALkrjTYd2G1ViE1hICj0fZ7ALBPA==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.59.0.tgz", + "integrity": "sha512-3AHmtQq/ppNuUspKAlvA8HtLybkDflkMuLK4DPo77DfthRb71V84/c4MlWJXixZz4uruIH4uaa07IqoAkG64fg==", "cpu": [ "x64" ], @@ -1831,9 +1939,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.46.2.tgz", - "integrity": "sha512-7kX69DIrBeD7yNp4A5b81izs8BqoZkCIaxQaOpumcJ1S/kmqNFjPhDu1LHeVXv0SexfHQv5cqHsxLOjETuqDuA==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.59.0.tgz", + "integrity": "sha512-2UdiwS/9cTAx7qIUZB/fWtToJwvt0Vbo0zmnYt7ED35KPg13Q0ym1g442THLC7VyI6JfYTP4PiSOWyoMdV2/xg==", "cpu": [ "x64" ], @@ -1844,10 +1952,38 @@ "linux" ] }, + "node_modules/@rollup/rollup-openbsd-x64": { + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.59.0.tgz", + "integrity": "sha512-M3bLRAVk6GOwFlPTIxVBSYKUaqfLrn8l0psKinkCFxl4lQvOSz8ZrKDz2gxcBwHFpci0B6rttydI4IpS4IS/jQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ] + }, + "node_modules/@rollup/rollup-openharmony-arm64": { + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.59.0.tgz", + "integrity": "sha512-tt9KBJqaqp5i5HUZzoafHZX8b5Q2Fe7UjYERADll83O4fGqJ49O1FsL6LpdzVFQcpwvnyd0i+K/VSwu/o/nWlA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ] + }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.46.2.tgz", - "integrity": "sha512-wiJWMIpeaak/jsbaq2HMh/rzZxHVW1rU6coyeNNpMwk5isiPjSTx0a4YLSlYDwBH/WBvLz+EtsNqQScZTLJy3g==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.59.0.tgz", + "integrity": "sha512-V5B6mG7OrGTwnxaNUzZTDTjDS7F75PO1ae6MJYdiMu60sq0CqN5CVeVsbhPxalupvTX8gXVSU9gq+Rx1/hvu6A==", "cpu": [ "arm64" ], @@ -1859,9 +1995,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.46.2.tgz", - "integrity": "sha512-gBgaUDESVzMgWZhcyjfs9QFK16D8K6QZpwAaVNJxYDLHWayOta4ZMjGm/vsAEy3hvlS2GosVFlBlP9/Wb85DqQ==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.59.0.tgz", + "integrity": "sha512-UKFMHPuM9R0iBegwzKF4y0C4J9u8C6MEJgFuXTBerMk7EJ92GFVFYBfOZaSGLu6COf7FxpQNqhNS4c4icUPqxA==", "cpu": [ "ia32" ], @@ -1872,10 +2008,24 @@ "win32" ] }, + "node_modules/@rollup/rollup-win32-x64-gnu": { + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.59.0.tgz", + "integrity": "sha512-laBkYlSS1n2L8fSo1thDNGrCTQMmxjYY5G0WFWjFFYZkKPjsMBsgJfGf4TLxXrF6RyhI60L8TMOjBMvXiTcxeA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.46.2.tgz", - "integrity": "sha512-CvUo2ixeIQGtF6WvuB87XWqPQkoFAFqW+HUo/WzHwuHDvIwZCtjdWXoYCcr06iKGydiqTclC4jU/TNObC/xKZg==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.59.0.tgz", + "integrity": "sha512-2HRCml6OztYXyJXAvdDXPKcawukWY2GpR5/nxKp4iBgiO3wcoEGkAaqctIbZcNB6KlUQBIqt8VYkNSj2397EfA==", "cpu": [ "x64" ], @@ -1899,14 +2049,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@standard-schema/spec": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz", + "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/chai": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.2.tgz", - "integrity": "sha512-8kB30R7Hwqf40JPiKhVzodJs2Qc1ZJ5zuT3uzw5Hq/dhNCl3G3l83jfpdI1e20BP348+fV7VIL/+FxaXkqBmWg==", + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz", + "integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==", "dev": true, "license": "MIT", "dependencies": { - "@types/deep-eql": "*" + "@types/deep-eql": "*", + "assertion-error": "^2.0.1" } }, "node_modules/@types/deep-eql": { @@ -1940,16 +2098,17 @@ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", "dev": true, - "peer": true + "license": "MIT" }, "node_modules/@types/node": { - "version": "24.1.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.1.0.tgz", - "integrity": "sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==", + "version": "25.0.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz", + "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { - "undici-types": "~7.8.0" + "undici-types": "~7.16.0" } }, "node_modules/@types/semver": { @@ -1959,20 +2118,20 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.26.1.tgz", - "integrity": "sha512-2X3mwqsj9Bd3Ciz508ZUtoQQYpOhU/kWoUqIf49H8Z0+Vbh6UF/y0OEYp0Q0axOGzaBGs7QxRwq0knSQ8khQNA==", - "dev": true, - "dependencies": { - "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.26.1", - "@typescript-eslint/type-utils": "8.26.1", - "@typescript-eslint/utils": "8.26.1", - "@typescript-eslint/visitor-keys": "8.26.1", - "graphemer": "^1.4.0", - "ignore": "^5.3.1", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.55.0.tgz", + "integrity": "sha512-1y/MVSz0NglV1ijHC8OT49mPJ4qhPYjiK08YUQVbIOyu+5k862LKUHFkpKHWu//zmr7hDR2rhwUm6gnCGNmGBQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/regexpp": "^4.12.2", + "@typescript-eslint/scope-manager": "8.55.0", + "@typescript-eslint/type-utils": "8.55.0", + "@typescript-eslint/utils": "8.55.0", + "@typescript-eslint/visitor-keys": "8.55.0", + "ignore": "^7.0.5", "natural-compare": "^1.4.0", - "ts-api-utils": "^2.0.1" + "ts-api-utils": "^2.4.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1982,22 +2141,34 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", + "@typescript-eslint/parser": "^8.55.0", "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.9.0" + "typescript": ">=4.8.4 <6.0.0" + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz", + "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" } }, "node_modules/@typescript-eslint/parser": { - "version": "8.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.26.1.tgz", - "integrity": "sha512-w6HZUV4NWxqd8BdeFf81t07d7/YV9s7TCWrQQbG5uhuvGUAW+fq1usZ1Hmz9UPNLniFnD8GLSsDpjP0hm1S4lQ==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.55.0.tgz", + "integrity": "sha512-4z2nCSBfVIMnbuu8uinj+f0o4qOeggYJLbjpPHka3KH1om7e+H9yLKTYgksTaHcGco+NClhhY2vyO3HsMH1RGw==", "dev": true, + "license": "MIT", + "peer": true, "dependencies": { - "@typescript-eslint/scope-manager": "8.26.1", - "@typescript-eslint/types": "8.26.1", - "@typescript-eslint/typescript-estree": "8.26.1", - "@typescript-eslint/visitor-keys": "8.26.1", - "debug": "^4.3.4" + "@typescript-eslint/scope-manager": "8.55.0", + "@typescript-eslint/types": "8.55.0", + "@typescript-eslint/typescript-estree": "8.55.0", + "@typescript-eslint/visitor-keys": "8.55.0", + "debug": "^4.4.3" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2008,17 +2179,40 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.9.0" + "typescript": ">=4.8.4 <6.0.0" + } + }, + "node_modules/@typescript-eslint/project-service": { + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.55.0.tgz", + "integrity": "sha512-zRcVVPFUYWa3kNnjaZGXSu3xkKV1zXy8M4nO/pElzQhFweb7PPtluDLQtKArEOGmjXoRjnUZ29NjOiF0eCDkcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/tsconfig-utils": "^8.55.0", + "@typescript-eslint/types": "^8.55.0", + "debug": "^4.4.3" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.0.0" } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.26.1.tgz", - "integrity": "sha512-6EIvbE5cNER8sqBu6V7+KeMZIC1664d2Yjt+B9EWUXrsyWpxx4lEZrmvxgSKRC6gX+efDL/UY9OpPZ267io3mg==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.55.0.tgz", + "integrity": "sha512-fVu5Omrd3jeqeQLiB9f1YsuK/iHFOwb04bCtY4BSCLgjNbOD33ZdV6KyEqplHr+IlpgT0QTZ/iJ+wT7hvTx49Q==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.26.1", - "@typescript-eslint/visitor-keys": "8.26.1" + "@typescript-eslint/types": "8.55.0", + "@typescript-eslint/visitor-keys": "8.55.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2028,16 +2222,35 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@typescript-eslint/tsconfig-utils": { + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.55.0.tgz", + "integrity": "sha512-1R9cXqY7RQd7WuqSN47PK9EDpgFUK3VqdmbYrvWJZYDd0cavROGn+74ktWBlmJ13NXUQKlZ/iAEQHI/V0kKe0Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.0.0" + } + }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.26.1.tgz", - "integrity": "sha512-Kcj/TagJLwoY/5w9JGEFV0dclQdyqw9+VMndxOJKtoFSjfZhLXhYjzsQEeyza03rwHx2vFEGvrJWJBXKleRvZg==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.55.0.tgz", + "integrity": "sha512-x1iH2unH4qAt6I37I2CGlsNs+B9WGxurP2uyZLRz6UJoZWDBx9cJL1xVN/FiOmHEONEg6RIufdvyT0TEYIgC5g==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.26.1", - "@typescript-eslint/utils": "8.26.1", - "debug": "^4.3.4", - "ts-api-utils": "^2.0.1" + "@typescript-eslint/types": "8.55.0", + "@typescript-eslint/typescript-estree": "8.55.0", + "@typescript-eslint/utils": "8.55.0", + "debug": "^4.4.3", + "ts-api-utils": "^2.4.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2048,14 +2261,15 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.9.0" + "typescript": ">=4.8.4 <6.0.0" } }, "node_modules/@typescript-eslint/types": { - "version": "8.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.26.1.tgz", - "integrity": "sha512-n4THUQW27VmQMx+3P+B0Yptl7ydfceUj4ON/AQILAASwgYdZ/2dhfymRMh5egRUrvK5lSmaOm77Ry+lmXPOgBQ==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.55.0.tgz", + "integrity": "sha512-ujT0Je8GI5BJWi+/mMoR0wxwVEQaxM+pi30xuMiJETlX80OPovb2p9E8ss87gnSVtYXtJoU9U1Cowcr6w2FE0w==", "dev": true, + "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -2065,19 +2279,21 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.26.1.tgz", - "integrity": "sha512-yUwPpUHDgdrv1QJ7YQal3cMVBGWfnuCdKbXw1yyjArax3353rEJP1ZA+4F8nOlQ3RfS2hUN/wze3nlY+ZOhvoA==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.55.0.tgz", + "integrity": "sha512-EwrH67bSWdx/3aRQhCoxDaHM+CrZjotc2UCCpEDVqfCE+7OjKAGWNY2HsCSTEVvWH2clYQK8pdeLp42EVs+xQw==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.26.1", - "@typescript-eslint/visitor-keys": "8.26.1", - "debug": "^4.3.4", - "fast-glob": "^3.3.2", - "is-glob": "^4.0.3", - "minimatch": "^9.0.4", - "semver": "^7.6.0", - "ts-api-utils": "^2.0.1" + "@typescript-eslint/project-service": "8.55.0", + "@typescript-eslint/tsconfig-utils": "8.55.0", + "@typescript-eslint/types": "8.55.0", + "@typescript-eslint/visitor-keys": "8.55.0", + "debug": "^4.4.3", + "minimatch": "^9.0.5", + "semver": "^7.7.3", + "tinyglobby": "^0.2.15", + "ts-api-utils": "^2.4.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2087,43 +2303,33 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "typescript": ">=4.8.4 <5.9.0" - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" + "typescript": ">=4.8.4 <6.0.0" } }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", + "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" + "license": "ISC", + "bin": { + "semver": "bin/semver.js" }, "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">=10" } }, "node_modules/@typescript-eslint/utils": { - "version": "8.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.26.1.tgz", - "integrity": "sha512-V4Urxa/XtSUroUrnI7q6yUTD3hDtfJ2jzVfeT3VK0ciizfK2q/zGC0iDh1lFMUZR8cImRrep6/q0xd/1ZGPQpg==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.55.0.tgz", + "integrity": "sha512-BqZEsnPGdYpgyEIkDC1BadNY8oMwckftxBT+C8W0g1iKPdeqKZBtTfnvcq0nf60u7MkjFO8RBvpRGZBPw4L2ow==", "dev": true, + "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.26.1", - "@typescript-eslint/types": "8.26.1", - "@typescript-eslint/typescript-estree": "8.26.1" + "@eslint-community/eslint-utils": "^4.9.1", + "@typescript-eslint/scope-manager": "8.55.0", + "@typescript-eslint/types": "8.55.0", + "@typescript-eslint/typescript-estree": "8.55.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2134,17 +2340,18 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.9.0" + "typescript": ">=4.8.4 <6.0.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.26.1.tgz", - "integrity": "sha512-AjOC3zfnxd6S4Eiy3jwktJPclqhFHNyd8L6Gycf9WUPoKZpgM5PjkxY1X7uSy61xVpiJDhhk7XT2NVsN3ALTWg==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.55.0.tgz", + "integrity": "sha512-AxNRwEie8Nn4eFS1FzDMJWIISMGoXMb037sgCBJ3UR6o0fQTzr2tqN9WT+DkWJPhIdQCfV7T6D387566VtnCJA==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.26.1", - "eslint-visitor-keys": "^4.2.0" + "@typescript-eslint/types": "8.55.0", + "eslint-visitor-keys": "^4.2.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2155,25 +2362,26 @@ } }, "node_modules/@typespec/compiler": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-1.8.0.tgz", - "integrity": "sha512-FeLb7Q0z6Bh5dDpqtnU2RlWiIWWWF7rujx2xGMta5dcTuIOZ4jbdyz1hVdxk4iM4qadvaSV4ey/qrSuffNoh3w==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-1.11.0.tgz", + "integrity": "sha512-4vuWtoepc4rYJ81K+P7xn2ByXIRhBM40rfzAGnpagNuGSVHuKEC6lqJqs3ePvhCpnxiYAC8XWpaOi+BEDzyhnQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { - "@babel/code-frame": "~7.27.1", - "@inquirer/prompts": "^8.0.1", - "ajv": "~8.17.1", + "@babel/code-frame": "~7.29.0", + "@inquirer/prompts": "^8.3.0", + "ajv": "~8.18.0", "change-case": "~5.4.4", - "env-paths": "^3.0.0", - "globby": "~16.0.0", + "env-paths": "^4.0.0", + "globby": "~16.1.1", "is-unicode-supported": "^2.1.0", "mustache": "~4.2.0", "picocolors": "~1.1.1", - "prettier": "~3.7.4", - "semver": "^7.7.1", - "tar": "^7.5.2", - "temporal-polyfill": "^0.3.0", + "prettier": "~3.8.1", + "semver": "^7.7.4", + "tar": "^7.5.11", + "temporal-polyfill": "^0.3.2", "vscode-languageserver": "~9.0.1", "vscode-languageserver-textdocument": "~1.0.12", "yaml": "~2.8.2", @@ -2210,9 +2418,9 @@ "license": "MIT" }, "node_modules/@typespec/compiler/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", + "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", "dev": true, "license": "ISC", "bin": { @@ -2240,23 +2448,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@typespec/compiler/node_modules/temporal-polyfill": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/temporal-polyfill/-/temporal-polyfill-0.3.0.tgz", - "integrity": "sha512-qNsTkX9K8hi+FHDfHmf22e/OGuXmfBm9RqNismxBrnSmZVJKegQ+HYYXT+R7Ha8F/YSm2Y34vmzD4cxMu2u95g==", - "dev": true, - "license": "MIT", - "dependencies": { - "temporal-spec": "0.3.0" - } - }, - "node_modules/@typespec/compiler/node_modules/temporal-spec": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/temporal-spec/-/temporal-spec-0.3.0.tgz", - "integrity": "sha512-n+noVpIqz4hYgFSMOSiINNOUOMFtV5cZQNCmmszA6GiVFVRt3G7AqVyhXjhCSmowvQn+NsGn+jMDMKJYHd3bSQ==", - "dev": true, - "license": "ISC" - }, "node_modules/@typespec/compiler/node_modules/yargs": { "version": "18.0.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz", @@ -2286,30 +2477,32 @@ } }, "node_modules/@typespec/events": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/events/-/events-0.78.0.tgz", - "integrity": "sha512-gSI4rAexxfYyZX0ZqYNRWQyuMb1UeakjAjOeh/2ntmxWCdYc+wSbJjxrxIArsZC+LwzTxq5WpdtD7+7OWzG4yw==", + "version": "0.81.0", + "resolved": "https://registry.npmjs.org/@typespec/events/-/events-0.81.0.tgz", + "integrity": "sha512-ee9QSBL+k6ccPlbJICZzaGt4iC1nTIl+J9sELY9yJNISvOvUEzY5MU8c7HaISB10cUESRJW+oaLWwyc8XjwHng==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0" + "@typespec/compiler": "^1.11.0" } }, "node_modules/@typespec/http": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@typespec/http/-/http-1.8.0.tgz", - "integrity": "sha512-ZKa4RISabwL8cUAmE3BkoNmtCYRjerO0+1Ba6XdDJKG+vJC5EGM2hkDf+ZmYsYZgrX0cvbhPXUKKh28zBV60hw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@typespec/http/-/http-1.11.0.tgz", + "integrity": "sha512-/DOkN2+MUZyLdmqYmSMZDjxikJTOuNxikTeOwG2fVOibnu8e6S1jzPAuN/mn6YyQBKeBCItMPmUOXIj61Wy8Bg==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0", - "@typespec/streams": "^0.78.0" + "@typespec/compiler": "^1.11.0", + "@typespec/streams": "^0.81.0" }, "peerDependenciesMeta": { "@typespec/streams": { @@ -2318,63 +2511,65 @@ } }, "node_modules/@typespec/http-specs": { - "version": "0.1.0-alpha.32-dev.1", - "resolved": "https://registry.npmjs.org/@typespec/http-specs/-/http-specs-0.1.0-alpha.32-dev.1.tgz", - "integrity": "sha512-b+uzFhToERrmV154eqnCoQiw4Jekn+DRamfZVAl7ndVeayDq9zLNZyPnCmeU1+bdKxUGO8WoGkpA9BeGP3teeA==", + "version": "0.1.0-alpha.36", + "resolved": "https://registry.npmjs.org/@typespec/http-specs/-/http-specs-0.1.0-alpha.36.tgz", + "integrity": "sha512-2nwh4YIx7MIwkVV8pZWUgp9dgR9U937MANtJvVILcWLLaBTVfLPXNQZjzDccFozzk8QxL7dBWA/gm7i6lsHZcA==", "dev": true, "license": "MIT", "dependencies": { - "@typespec/spec-api": "^0.1.0-alpha.12 || >=0.1.0-alpha.13-dev <0.1.0-alpha.13", - "@typespec/spector": "^0.1.0-alpha.22 || >=0.1.0-alpha.23-dev <0.1.0-alpha.23", - "deep-equal": "^2.2.0" + "@typespec/spec-api": "^0.1.0-alpha.14", + "@typespec/spector": "^0.1.0-alpha.25", + "deep-equal": "^2.2.3" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/rest": "^0.78.0 || >=0.79.0-dev <0.79.0", - "@typespec/versioning": "^0.78.0 || >=0.79.0-dev <0.79.0", - "@typespec/xml": "^0.78.0 || >=0.79.0-dev <0.79.0" + "@typespec/compiler": "^1.11.0", + "@typespec/http": "^1.11.0", + "@typespec/rest": "^0.81.0", + "@typespec/versioning": "^0.81.0", + "@typespec/xml": "^0.81.0" } }, "node_modules/@typespec/openapi": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-1.8.0.tgz", - "integrity": "sha512-v+RIJpx7vALBSGQmnUWemvXjnrk50HAVqJeg0RbaF3VUnh66Z4itsoNJJmIIc+HmBJng8Ie0V7xv3l02ek6HWA==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-1.11.0.tgz", + "integrity": "sha512-xUQrHExKBh0XSP4cn+HcondDXjHJM5HCq2Xfy9tB1QflsFh5uP1JJt1+67g73VmHlhZVSUDcoFrnU95pfjyubg==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0" + "@typespec/compiler": "^1.11.0", + "@typespec/http": "^1.11.0" } }, "node_modules/@typespec/rest": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.78.0.tgz", - "integrity": "sha512-1clnDw1JbBvjLcfFvEvHdIrnsQuQI5/Cl6mRIrzWWX0pKJ+R89rCdZD1KpidEXw4B4qscD48LsssyrEIFLtuPg==", + "version": "0.81.0", + "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.81.0.tgz", + "integrity": "sha512-qQXZRKEvq5aNlDFEUqBiiXXPIFyr/+PWgBY0kIrnhyZzMjfUqPInkB12QgXpVp2O2Wm3jmETJD45SaLHTCYBbg==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0" + "@typespec/compiler": "^1.11.0", + "@typespec/http": "^1.11.0" } }, "node_modules/@typespec/spec-api": { - "version": "0.1.0-alpha.12", - "resolved": "https://registry.npmjs.org/@typespec/spec-api/-/spec-api-0.1.0-alpha.12.tgz", - "integrity": "sha512-cAJ1vj6qk2Vw5g1uesohBItA6fl8KqrTRIwj0DdpPaBtQeaUS7yRJZgGQQz/JLeqDj2B+8z2pooLuvEBtnS+jA==", + "version": "0.1.0-alpha.14", + "resolved": "https://registry.npmjs.org/@typespec/spec-api/-/spec-api-0.1.0-alpha.14.tgz", + "integrity": "sha512-MpLVtJZMsONMB9Di9aiXRbbihqa/+4MmbDHpuwd3ka39wtRhcA3sbFQY/+oU5zVEfEAldGgVkenFd2wnoI/xkQ==", "dev": true, "license": "MIT", "dependencies": { - "deep-equal": "^2.2.0", + "deep-equal": "^2.2.3", "express": "^5.2.1", "xml2js": "^0.6.2" }, @@ -2383,59 +2578,74 @@ } }, "node_modules/@typespec/spec-coverage-sdk": { - "version": "0.1.0-alpha.14", - "resolved": "https://registry.npmjs.org/@typespec/spec-coverage-sdk/-/spec-coverage-sdk-0.1.0-alpha.14.tgz", - "integrity": "sha512-e3DiPyccHwDf7Nhccu3pnP93hR5ggtmsTsIA54KzwmdDucqHS7rPjPi0vZnvsy3ufB2B8PpyNAHBB7vVSM+tpg==", + "version": "0.1.0-alpha.16", + "resolved": "https://registry.npmjs.org/@typespec/spec-coverage-sdk/-/spec-coverage-sdk-0.1.0-alpha.16.tgz", + "integrity": "sha512-qwSnuE+CXjv4mn2uhioTVlaO4GjypR4ZtbkSoLmWA677ggYmoAjIDpyNgT1tjsc1lDKVtSiPvGhM9XFKExVmbQ==", "dev": true, "license": "MIT", "dependencies": { "@azure/identity": "~4.13.0", - "@azure/storage-blob": "~12.29.1", - "@types/node": "~25.0.2" + "@azure/storage-blob": "~12.31.0", + "@types/node": "~25.3.0", + "@types/semver": "^7.5.8", + "semver": "^7.7.1" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@typespec/spec-coverage-sdk/node_modules/@types/node": { - "version": "25.0.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz", - "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==", + "version": "25.3.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.5.tgz", + "integrity": "sha512-oX8xrhvpiyRCQkG1MFchB09f+cXftgIXb3a7UUa4Y3wpmZPw5tyZGTLWhlESOLq1Rq6oDlc8npVU2/9xiCuXMA==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~7.16.0" + "undici-types": "~7.18.0" + } + }, + "node_modules/@typespec/spec-coverage-sdk/node_modules/semver": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", + "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" } }, "node_modules/@typespec/spec-coverage-sdk/node_modules/undici-types": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", - "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", + "version": "7.18.2", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz", + "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==", "dev": true, "license": "MIT" }, "node_modules/@typespec/spector": { - "version": "0.1.0-alpha.22", - "resolved": "https://registry.npmjs.org/@typespec/spector/-/spector-0.1.0-alpha.22.tgz", - "integrity": "sha512-oxdJjoHcYdsschi1DYr8jOxFKHoiuI4Y2CX1tfCikSzijFg6iTd4GRr2qusGoVfgaTduHKrXOfsdSWc8ukFE/w==", + "version": "0.1.0-alpha.25", + "resolved": "https://registry.npmjs.org/@typespec/spector/-/spector-0.1.0-alpha.25.tgz", + "integrity": "sha512-KxMiwA/+XDWpZOdhr7TbnsR8ppXVi+edFa9hdUuerOGQzzALbSeQYUJLUr4RErRiHpqg2/P4FyJ2E0eiA2fTYA==", "dev": true, "license": "MIT", "dependencies": { "@azure/identity": "~4.13.0", - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/rest": "^0.78.0", - "@typespec/spec-api": "^0.1.0-alpha.12", - "@typespec/spec-coverage-sdk": "^0.1.0-alpha.14", - "@typespec/versioning": "^0.78.0", - "ajv": "~8.17.1", - "body-parser": "^2.2.0", - "deep-equal": "^2.2.0", + "@typespec/compiler": "^1.11.0", + "@typespec/http": "^1.11.0", + "@typespec/rest": "^0.81.0", + "@typespec/spec-api": "^0.1.0-alpha.14", + "@typespec/spec-coverage-sdk": "^0.1.0-alpha.16", + "@typespec/versioning": "^0.81.0", + "ajv": "~8.18.0", + "body-parser": "^2.2.2", + "deep-equal": "^2.2.3", "express": "^5.2.1", - "globby": "~16.0.0", + "globby": "~16.1.1", "micromatch": "^4.0.8", - "morgan": "^1.10.0", - "multer": "^2.0.1", + "morgan": "^1.10.1", + "multer": "^2.1.1", "picocolors": "~1.1.1", "source-map-support": "~0.5.21", "xml2js": "^0.6.2", @@ -2518,38 +2728,40 @@ } }, "node_modules/@typespec/sse": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/sse/-/sse-0.78.0.tgz", - "integrity": "sha512-jPARl+e1e/nsDW/1uVsGTzvKmjqezVMyUa13igXxk5nV2ScMdFpH1HhBwTmAhUeaZgY3J81dFHNUnIY67HCrmw==", + "version": "0.81.0", + "resolved": "https://registry.npmjs.org/@typespec/sse/-/sse-0.81.0.tgz", + "integrity": "sha512-VinoeN+5ClKlGXf77fWayAQna8SaYtvEBhnLR8t8FdvmMsL6ce1LghR2kAL3ARbNXfwMZRmQiq+ajKKebDLIng==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0", - "@typespec/events": "^0.78.0", - "@typespec/http": "^1.8.0", - "@typespec/streams": "^0.78.0" + "@typespec/compiler": "^1.11.0", + "@typespec/events": "^0.81.0", + "@typespec/http": "^1.11.0", + "@typespec/streams": "^0.81.0" } }, "node_modules/@typespec/streams": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/streams/-/streams-0.78.0.tgz", - "integrity": "sha512-wzh5bVdzh+K+pFQFs/EZkVsTH5TQGi12XwhjxJS0UKRwaW2UwSZeY1HqX07oMMPdYESTbjgMrXcxtn89AlzjvQ==", + "version": "0.81.0", + "resolved": "https://registry.npmjs.org/@typespec/streams/-/streams-0.81.0.tgz", + "integrity": "sha512-IIEKq18aqAtM65f8ZLs3Kzua97wjkr8fTehqPs/Q4neWo2UkDJp64LfA37iXJzaku8xMFSwXdVu4EW8wo+KV8w==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0" + "@typespec/compiler": "^1.11.0" } }, "node_modules/@typespec/ts-http-runtime": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@typespec/ts-http-runtime/-/ts-http-runtime-0.3.2.tgz", - "integrity": "sha512-IlqQ/Gv22xUC1r/WQm4StLkYQmaaTsXAhUVsNE0+xiyf0yRFiH5++q78U3bw6bLKDCTmh0uqKB9eG9+Bt75Dkg==", + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/@typespec/ts-http-runtime/-/ts-http-runtime-0.3.4.tgz", + "integrity": "sha512-CI0NhTrz4EBaa0U+HaaUZrJhPoso8sG7ZFya8uQoBA57fjzrjRSv87ekCjLZOFExN+gXE/z0xuN2QfH4H2HrLQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2562,65 +2774,68 @@ } }, "node_modules/@typespec/versioning": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.78.0.tgz", - "integrity": "sha512-I14X6+IMd0wFMNI8oMFSeFBi2nD4idub+geSO34vuCs4rwuEj3FNzy+rkNkDDvf0+gIUGxeyg7s+YDUcNyiqOA==", + "version": "0.81.0", + "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.81.0.tgz", + "integrity": "sha512-5bha4t64xA85zLY8VGm/6jNd2kwPHzjPq/dlCUjtgGfGXv2R6Ow/YIukqhqZnwnIgNAIlZ7nguekRMRx+2oO2w==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0" + "@typespec/compiler": "^1.11.0" } }, "node_modules/@typespec/xml": { - "version": "0.78.0", - "resolved": "https://registry.npmjs.org/@typespec/xml/-/xml-0.78.0.tgz", - "integrity": "sha512-KSDhJX6A/Onsu9FKVZtR/xSy5va3k0y9/U4eiZUn91V/LQyMZNwmResPDHEVYk6JqaIH8bbd6ANWPu3nMd7mmw==", + "version": "0.81.0", + "resolved": "https://registry.npmjs.org/@typespec/xml/-/xml-0.81.0.tgz", + "integrity": "sha512-4docnAcV1a8gE4c4TmYuirZf2PEzS4xHUH4QjHFU6hk6J2M6OMU6YG4iSq9tmlUzQ/2DraVcWNO/fsG8Lt383A==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.8.0" + "@typespec/compiler": "^1.11.0" } }, "node_modules/@vitest/expect": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz", - "integrity": "sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==", + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.0.18.tgz", + "integrity": "sha512-8sCWUyckXXYvx4opfzVY03EOiYVxyNrHS5QxX3DAIi5dpJAAkyJezHCP77VMX4HKA2LDT/Jpfo8i2r5BE3GnQQ==", "dev": true, "license": "MIT", "dependencies": { + "@standard-schema/spec": "^1.0.0", "@types/chai": "^5.2.2", - "@vitest/spy": "3.2.4", - "@vitest/utils": "3.2.4", - "chai": "^5.2.0", - "tinyrainbow": "^2.0.0" + "@vitest/spy": "4.0.18", + "@vitest/utils": "4.0.18", + "chai": "^6.2.1", + "tinyrainbow": "^3.0.3" }, "funding": { "url": "https://opencollective.com/vitest" } }, "node_modules/@vitest/mocker": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.4.tgz", - "integrity": "sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==", + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.0.18.tgz", + "integrity": "sha512-HhVd0MDnzzsgevnOWCBj5Otnzobjy5wLBe4EdeeFGv8luMsGcYqDuFRMcttKWZA5vVO8RFjexVovXvAM4JoJDQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "3.2.4", + "@vitest/spy": "4.0.18", "estree-walker": "^3.0.3", - "magic-string": "^0.30.17" + "magic-string": "^0.30.21" }, "funding": { "url": "https://opencollective.com/vitest" }, "peerDependencies": { "msw": "^2.4.9", - "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0" + "vite": "^6.0.0 || ^7.0.0-0" }, "peerDependenciesMeta": { "msw": { @@ -2632,42 +2847,41 @@ } }, "node_modules/@vitest/pretty-format": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.4.tgz", - "integrity": "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==", + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.0.18.tgz", + "integrity": "sha512-P24GK3GulZWC5tz87ux0m8OADrQIUVDPIjjj65vBXYG17ZeU3qD7r+MNZ1RNv4l8CGU2vtTRqixrOi9fYk/yKw==", "dev": true, "license": "MIT", "dependencies": { - "tinyrainbow": "^2.0.0" + "tinyrainbow": "^3.0.3" }, "funding": { "url": "https://opencollective.com/vitest" } }, "node_modules/@vitest/runner": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.2.4.tgz", - "integrity": "sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==", + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.0.18.tgz", + "integrity": "sha512-rpk9y12PGa22Jg6g5M3UVVnTS7+zycIGk9ZNGN+m6tZHKQb7jrP7/77WfZy13Y/EUDd52NDsLRQhYKtv7XfPQw==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "3.2.4", - "pathe": "^2.0.3", - "strip-literal": "^3.0.0" + "@vitest/utils": "4.0.18", + "pathe": "^2.0.3" }, "funding": { "url": "https://opencollective.com/vitest" } }, "node_modules/@vitest/snapshot": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.2.4.tgz", - "integrity": "sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==", + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.0.18.tgz", + "integrity": "sha512-PCiV0rcl7jKQjbgYqjtakly6T1uwv/5BQ9SwBLekVg/EaYeQFPiXcgrC2Y7vDMA8dM1SUEAEV82kgSQIlXNMvA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "3.2.4", - "magic-string": "^0.30.17", + "@vitest/pretty-format": "4.0.18", + "magic-string": "^0.30.21", "pathe": "^2.0.3" }, "funding": { @@ -2675,28 +2889,24 @@ } }, "node_modules/@vitest/spy": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.4.tgz", - "integrity": "sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==", + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.0.18.tgz", + "integrity": "sha512-cbQt3PTSD7P2OARdVW3qWER5EGq7PHlvE+QfzSC0lbwO+xnt7+XH06ZzFjFRgzUX//JmpxrCu92VdwvEPlWSNw==", "dev": true, "license": "MIT", - "dependencies": { - "tinyspy": "^4.0.3" - }, "funding": { "url": "https://opencollective.com/vitest" } }, "node_modules/@vitest/utils": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.4.tgz", - "integrity": "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==", + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.0.18.tgz", + "integrity": "sha512-msMRKLMVLWygpK3u2Hybgi4MNjcYJvwTb0Ru09+fOyCXIgT5raYP041DRRdiJiI3k/2U6SEbAETB3YtBrUkCFA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "3.2.4", - "loupe": "^3.1.4", - "tinyrainbow": "^2.0.0" + "@vitest/pretty-format": "4.0.18", + "tinyrainbow": "^3.0.3" }, "funding": { "url": "https://opencollective.com/vitest" @@ -2717,10 +2927,11 @@ } }, "node_modules/acorn": { - "version": "8.14.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", - "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", + "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", "dev": true, + "license": "MIT", "peer": true, "bin": { "acorn": "bin/acorn" @@ -2734,7 +2945,7 @@ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, - "peer": true, + "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } @@ -2750,10 +2961,11 @@ } }, "node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -2869,7 +3081,8 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/basic-auth": { "version": "2.0.1", @@ -2917,14 +3130,13 @@ } }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz", + "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==", "dev": true, - "peer": true, + "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "balanced-match": "^1.0.0" } }, "node_modules/braces": { @@ -2932,6 +3144,7 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, + "license": "MIT", "dependencies": { "fill-range": "^7.1.1" }, @@ -3024,16 +3237,6 @@ } } }, - "node_modules/cac": { - "version": "6.7.14", - "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz", - "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/call-bind": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", @@ -3089,40 +3292,21 @@ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true, - "peer": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/chai": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.1.tgz", - "integrity": "sha512-5nFxhUrX0PqtyogoYOA8IPswy5sZFTOsBFl/9bNsmDLgsxYTzSZQJDPppDnZPTQbzSEm0hqGjWPzRemQCYbD6A==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz", + "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==", "dev": true, "license": "MIT", - "dependencies": { - "assertion-error": "^2.0.1", - "check-error": "^2.1.1", - "deep-eql": "^5.0.1", - "loupe": "^3.1.0", - "pathval": "^2.0.0" - }, "engines": { "node": ">=18" } }, - "node_modules/chalk": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", - "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", - "dev": true, - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/change-case": { "version": "5.4.4", "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz", @@ -3136,16 +3320,6 @@ "dev": true, "license": "MIT" }, - "node_modules/check-error": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", - "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 16" - } - }, "node_modules/chownr": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", @@ -3243,7 +3417,7 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", "dev": true, - "peer": true + "license": "MIT" }, "node_modules/concat-stream": { "version": "2.0.0", @@ -3343,16 +3517,6 @@ } } }, - "node_modules/deep-eql": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", - "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/deep-equal": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz", @@ -3390,13 +3554,12 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/default-browser": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.4.0.tgz", - "integrity": "sha512-XDuvSq38Hr1MdN47EDvYtx3U0MTqpCEn+F6ft8z2vYDzMrvQhVp0ui9oQdqW3MvK3vqUETglt1tVGgjLuJ5izg==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.5.0.tgz", + "integrity": "sha512-H9LMLr5zwIbSxrmvikGuI/5KGhZ8E2zH3stkMgM5LpOWDutGM2JZaj460Udnf1a+946zc7YBgrqEWwbk7zHvGw==", "dev": true, "license": "MIT", "dependencies": { @@ -3537,12 +3700,16 @@ } }, "node_modules/env-paths": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz", - "integrity": "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-4.0.0.tgz", + "integrity": "sha512-pxP8eL2SwwaTRi/KHYwLYXinDs7gL3jxFcBYmEdYfZmZXbaVDvdppd0XBU8qVz03rDfKZMXg1omHCbsJjZrMsw==", "dev": true, + "license": "MIT", + "dependencies": { + "is-safe-filename": "^0.1.0" + }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=20" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -3610,10 +3777,11 @@ } }, "node_modules/esbuild": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.1.tgz", - "integrity": "sha512-BGO5LtrGC7vxnqucAe/rmvKdJllfGaYWdyABvyMoXQlfYMb2bbRuReWR5tEGE//4LcNJj9XrkovTqNYRFZHAMQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.3.tgz", + "integrity": "sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==", "hasInstallScript": true, + "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, @@ -3621,31 +3789,32 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.25.1", - "@esbuild/android-arm": "0.25.1", - "@esbuild/android-arm64": "0.25.1", - "@esbuild/android-x64": "0.25.1", - "@esbuild/darwin-arm64": "0.25.1", - "@esbuild/darwin-x64": "0.25.1", - "@esbuild/freebsd-arm64": "0.25.1", - "@esbuild/freebsd-x64": "0.25.1", - "@esbuild/linux-arm": "0.25.1", - "@esbuild/linux-arm64": "0.25.1", - "@esbuild/linux-ia32": "0.25.1", - "@esbuild/linux-loong64": "0.25.1", - "@esbuild/linux-mips64el": "0.25.1", - "@esbuild/linux-ppc64": "0.25.1", - "@esbuild/linux-riscv64": "0.25.1", - "@esbuild/linux-s390x": "0.25.1", - "@esbuild/linux-x64": "0.25.1", - "@esbuild/netbsd-arm64": "0.25.1", - "@esbuild/netbsd-x64": "0.25.1", - "@esbuild/openbsd-arm64": "0.25.1", - "@esbuild/openbsd-x64": "0.25.1", - "@esbuild/sunos-x64": "0.25.1", - "@esbuild/win32-arm64": "0.25.1", - "@esbuild/win32-ia32": "0.25.1", - "@esbuild/win32-x64": "0.25.1" + "@esbuild/aix-ppc64": "0.27.3", + "@esbuild/android-arm": "0.27.3", + "@esbuild/android-arm64": "0.27.3", + "@esbuild/android-x64": "0.27.3", + "@esbuild/darwin-arm64": "0.27.3", + "@esbuild/darwin-x64": "0.27.3", + "@esbuild/freebsd-arm64": "0.27.3", + "@esbuild/freebsd-x64": "0.27.3", + "@esbuild/linux-arm": "0.27.3", + "@esbuild/linux-arm64": "0.27.3", + "@esbuild/linux-ia32": "0.27.3", + "@esbuild/linux-loong64": "0.27.3", + "@esbuild/linux-mips64el": "0.27.3", + "@esbuild/linux-ppc64": "0.27.3", + "@esbuild/linux-riscv64": "0.27.3", + "@esbuild/linux-s390x": "0.27.3", + "@esbuild/linux-x64": "0.27.3", + "@esbuild/netbsd-arm64": "0.27.3", + "@esbuild/netbsd-x64": "0.27.3", + "@esbuild/openbsd-arm64": "0.27.3", + "@esbuild/openbsd-x64": "0.27.3", + "@esbuild/openharmony-arm64": "0.27.3", + "@esbuild/sunos-x64": "0.27.3", + "@esbuild/win32-arm64": "0.27.3", + "@esbuild/win32-ia32": "0.27.3", + "@esbuild/win32-x64": "0.27.3" } }, "node_modules/escalade": { @@ -3669,7 +3838,6 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, - "peer": true, "engines": { "node": ">=10" }, @@ -3678,33 +3846,33 @@ } }, "node_modules/eslint": { - "version": "9.22.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.22.0.tgz", - "integrity": "sha512-9V/QURhsRN40xuHXWjV64yvrzMjcz7ZyNoF2jJFmy9j/SLk0u1OLSZgXi28MrXjymnjEGSR80WCdab3RGMDveQ==", + "version": "9.39.4", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.4.tgz", + "integrity": "sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==", "dev": true, + "license": "MIT", "peer": true, "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.19.2", - "@eslint/config-helpers": "^0.1.0", - "@eslint/core": "^0.12.0", - "@eslint/eslintrc": "^3.3.0", - "@eslint/js": "9.22.0", - "@eslint/plugin-kit": "^0.2.7", + "@eslint/config-array": "^0.21.2", + "@eslint/config-helpers": "^0.4.2", + "@eslint/core": "^0.17.0", + "@eslint/eslintrc": "^3.3.5", + "@eslint/js": "9.39.4", + "@eslint/plugin-kit": "^0.4.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", - "@types/json-schema": "^7.0.15", - "ajv": "^6.12.4", + "ajv": "^6.14.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.3.0", - "eslint-visitor-keys": "^4.2.0", - "espree": "^10.3.0", + "eslint-scope": "^8.4.0", + "eslint-visitor-keys": "^4.2.1", + "espree": "^10.4.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -3716,7 +3884,7 @@ "is-glob": "^4.0.0", "json-stable-stringify-without-jsonify": "^1.0.1", "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", + "minimatch": "^3.1.5", "natural-compare": "^1.4.0", "optionator": "^0.9.3" }, @@ -3739,11 +3907,11 @@ } }, "node_modules/eslint-scope": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz", - "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", + "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", "dev": true, - "peer": true, + "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -3756,10 +3924,11 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -3768,11 +3937,11 @@ } }, "node_modules/eslint/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", + "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", "dev": true, - "peer": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -3784,12 +3953,22 @@ "url": "https://github.com/sponsors/epoberezkin" } }, + "node_modules/eslint/node_modules/brace-expansion": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz", + "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, "node_modules/eslint/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, - "peer": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -3806,18 +3985,31 @@ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true, - "peer": true + "license": "MIT" + }, + "node_modules/eslint/node_modules/minimatch": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } }, "node_modules/espree": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", - "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", + "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==", "dev": true, - "peer": true, + "license": "BSD-2-Clause", "dependencies": { - "acorn": "^8.14.0", + "acorn": "^8.15.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.2.0" + "eslint-visitor-keys": "^4.2.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3831,7 +4023,6 @@ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", "dev": true, - "peer": true, "dependencies": { "estraverse": "^5.1.0" }, @@ -3844,7 +4035,7 @@ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, - "peer": true, + "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" }, @@ -3857,7 +4048,6 @@ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, - "peer": true, "engines": { "node": ">=4.0" } @@ -3877,7 +4067,6 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true, - "peer": true, "engines": { "node": ">=0.10.0" } @@ -3984,6 +4173,7 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -3996,19 +4186,35 @@ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true, - "peer": true + "license": "MIT" }, "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, + "node_modules/fast-string-truncated-width": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fast-string-truncated-width/-/fast-string-truncated-width-3.0.3.tgz", + "integrity": "sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g==", "dev": true, - "peer": true + "license": "MIT" + }, + "node_modules/fast-string-width": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/fast-string-width/-/fast-string-width-3.0.2.tgz", + "integrity": "sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-string-truncated-width": "^3.0.2" + } }, "node_modules/fast-uri": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz", - "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz", + "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==", "dev": true, "funding": [ { @@ -4019,12 +4225,39 @@ "type": "opencollective", "url": "https://opencollective.com/fastify" } - ] + ], + "license": "BSD-3-Clause" + }, + "node_modules/fast-wrap-ansi": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/fast-wrap-ansi/-/fast-wrap-ansi-0.2.0.tgz", + "integrity": "sha512-rLV8JHxTyhVmFYhBJuMujcrHqOT2cnO5Zxj37qROj23CP39GXubJRBUFF0z8KFK77Uc0SukZUf7JZhsVEQ6n8w==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-string-width": "^3.0.2" + } + }, + "node_modules/fast-xml-builder": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.4.tgz", + "integrity": "sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], + "license": "MIT", + "dependencies": { + "path-expression-matcher": "^1.1.3" + } }, "node_modules/fast-xml-parser": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.3.3.tgz", - "integrity": "sha512-2O3dkPAAC6JavuMm8+4+pgTk+5hoAs+CjZ+sWcQLkX9+/tHRuTkQh/Oaifr8qDmZ8iEHb771Ea6G8CdwkrgvYA==", + "version": "5.5.10", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.10.tgz", + "integrity": "sha512-go2J2xODMc32hT+4Xr/bBGXMaIoiCwrwp2mMtAvKyvEFW6S/v5Gn2pBmE4nvbwNjGhpcAiOwEv7R6/GZ6XRa9w==", "dev": true, "funding": [ { @@ -4034,17 +4267,20 @@ ], "license": "MIT", "dependencies": { - "strnum": "^2.1.0" + "fast-xml-builder": "^1.1.4", + "path-expression-matcher": "^1.2.1", + "strnum": "^2.2.2" }, "bin": { "fxparser": "src/cli/cli.js" } }, "node_modules/fastq": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", - "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz", + "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==", "dev": true, + "license": "ISC", "dependencies": { "reusify": "^1.0.4" } @@ -4054,7 +4290,6 @@ "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", "dev": true, - "peer": true, "dependencies": { "flat-cache": "^4.0.0" }, @@ -4067,6 +4302,7 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -4117,7 +4353,6 @@ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", "dev": true, - "peer": true, "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.4" @@ -4127,11 +4362,11 @@ } }, "node_modules/flatted": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", - "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz", + "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==", "dev": true, - "peer": true + "license": "ISC" }, "node_modules/for-each": { "version": "0.3.5", @@ -4291,22 +4526,16 @@ } }, "node_modules/glob": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-11.1.0.tgz", - "integrity": "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==", + "version": "13.0.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.3.tgz", + "integrity": "sha512-/g3B0mC+4x724v1TgtBlBtt2hPi/EWptsIAmXUx9Z2rvBYleQcsrmaOzd5LyL50jf/Soi83ZDJmw2+XqvH/EeA==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "foreground-child": "^3.3.1", - "jackspeak": "^4.1.1", - "minimatch": "^10.1.1", + "minimatch": "^10.2.0", "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", "path-scurry": "^2.0.0" }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, "engines": { "node": "20 || >=22" }, @@ -4319,25 +4548,47 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, - "peer": true, "dependencies": { - "is-glob": "^4.0.3" + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/glob/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/glob/node_modules/brace-expansion": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", + "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^4.0.2" }, "engines": { - "node": ">=10.13.0" + "node": "18 || 20 || >=22" } }, "node_modules/glob/node_modules/minimatch": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz", - "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==", + "version": "10.2.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", + "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "@isaacs/brace-expansion": "^5.0.0" + "brace-expansion": "^5.0.5" }, "engines": { - "node": "20 || >=22" + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -4348,7 +4599,7 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", "dev": true, - "peer": true, + "license": "MIT", "engines": { "node": ">=18" }, @@ -4357,9 +4608,9 @@ } }, "node_modules/globby": { - "version": "16.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-16.0.0.tgz", - "integrity": "sha512-ejy4TJFga99yW6Q0uhM3pFawKWZmtZzZD/v/GwI5+9bCV5Ew+D2pSND6W7fUes5UykqSsJkUfxFVdRh7Q1+P3Q==", + "version": "16.1.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-16.1.1.tgz", + "integrity": "sha512-dW7vl+yiAJSp6aCekaVnVJxurRv7DCOLyXqEG3RYMYUg7AuJ2jCqPkZTA8ooqC2vtnkaMcV5WfFBMuEnTu1OQg==", "dev": true, "license": "MIT", "dependencies": { @@ -4400,12 +4651,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true - }, "node_modules/has-bigints": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", @@ -4539,9 +4784,9 @@ } }, "node_modules/iconv-lite": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz", - "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", + "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==", "dev": true, "license": "MIT", "dependencies": { @@ -4560,6 +4805,7 @@ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", "dev": true, + "license": "MIT", "engines": { "node": ">= 4" } @@ -4569,7 +4815,7 @@ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", "dev": true, - "peer": true, + "license": "MIT", "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -4587,7 +4833,6 @@ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=0.8.19" } @@ -4805,6 +5050,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -4865,6 +5111,19 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-safe-filename": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-safe-filename/-/is-safe-filename-0.1.1.tgz", + "integrity": "sha512-4SrR7AdnY11LHfDKTZY1u6Ga3RuxZdl3YKWWShO5iyuG5h8QS4GD2tOb04peBJ5I7pXbR+CGBNEhTcwK+FzN3g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-set": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", @@ -4972,9 +5231,9 @@ } }, "node_modules/is-wsl": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz", - "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.1.tgz", + "integrity": "sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==", "dev": true, "license": "MIT", "dependencies": { @@ -5036,22 +5295,6 @@ "node": ">=8" } }, - "node_modules/jackspeak": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.1.tgz", - "integrity": "sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -5075,21 +5318,20 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true, - "peer": true + "dev": true }, "node_modules/jsonwebtoken": { "version": "9.0.3", @@ -5142,7 +5384,6 @@ "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "dev": true, - "peer": true, "dependencies": { "json-buffer": "3.0.1" } @@ -5152,7 +5393,6 @@ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, - "peer": true, "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -5222,8 +5462,7 @@ "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/lodash.once": { "version": "4.1.1", @@ -5232,30 +5471,24 @@ "dev": true, "license": "MIT" }, - "node_modules/loupe": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.2.0.tgz", - "integrity": "sha512-2NCfZcT5VGVNX9mSZIxLRkEAegDGBpuQZBy13desuHeVORmBDyAET4TkJr4SjqQy3A8JDofMN6LpkK8Xcm/dlw==", - "dev": true, - "license": "MIT" - }, "node_modules/lru-cache": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.2.tgz", - "integrity": "sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==", + "version": "11.2.6", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz", + "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==", "dev": true, + "license": "BlueOak-1.0.0", "engines": { "node": "20 || >=22" } }, "node_modules/magic-string": { - "version": "0.30.17", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", - "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==", + "version": "0.30.21", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", + "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==", "dev": true, "license": "MIT", "dependencies": { - "@jridgewell/sourcemap-codec": "^1.5.0" + "@jridgewell/sourcemap-codec": "^1.5.5" } }, "node_modules/make-dir": { @@ -5322,6 +5555,7 @@ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } @@ -5331,6 +5565,7 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, + "license": "MIT", "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" @@ -5367,26 +5602,19 @@ } }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", + "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", "dev": true, - "peer": true, + "license": "ISC", "dependencies": { - "brace-expansion": "^1.1.7" + "brace-expansion": "^2.0.2" }, "engines": { - "node": "*" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, - "license": "MIT", + "node": ">=16 || 14 >=14.17" + }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/minipass": { @@ -5411,19 +5639,6 @@ "node": ">= 18" } }, - "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "license": "MIT", - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, "node_modules/morgan": { "version": "1.10.1", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.1.tgz", @@ -5479,22 +5694,23 @@ "license": "MIT" }, "node_modules/multer": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.2.tgz", - "integrity": "sha512-u7f2xaZ/UG8oLXHvtF/oWTRvT44p9ecwBBqTwgJVq0+4BW1g8OW01TyMEGWBHbyMOYVHXslaut7qEQ1meATXgw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/multer/-/multer-2.1.1.tgz", + "integrity": "sha512-mo+QTzKlx8R7E5ylSXxWzGoXoZbOsRMpyitcht8By2KHvMbf3tjwosZ/Mu/XYU6UuJ3VZnODIrak5ZrPiPyB6A==", "dev": true, "license": "MIT", "dependencies": { "append-field": "^1.0.0", "busboy": "^1.6.0", "concat-stream": "^2.0.0", - "mkdirp": "^0.5.6", - "object-assign": "^4.1.1", - "type-is": "^1.6.18", - "xtend": "^4.0.2" + "type-is": "^1.6.18" }, "engines": { "node": ">= 10.16.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/multer/node_modules/media-typer": { @@ -5598,16 +5814,6 @@ "node": ">= 0.6" } }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/object-inspect": { "version": "1.13.4", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", @@ -5669,6 +5875,17 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/obug": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.1.tgz", + "integrity": "sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==", + "dev": true, + "funding": [ + "https://github.com/sponsors/sxzz", + "https://opencollective.com/debug" + ], + "license": "MIT" + }, "node_modules/on-finished": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", @@ -5726,7 +5943,6 @@ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", "dev": true, - "peer": true, "dependencies": { "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", @@ -5780,7 +5996,7 @@ "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, - "peer": true, + "license": "MIT", "dependencies": { "callsites": "^3.0.0" }, @@ -5807,6 +6023,22 @@ "node": ">=8" } }, + "node_modules/path-expression-matcher": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.4.0.tgz", + "integrity": "sha512-s4DQMxIdhj3jLFWd9LxHOplj4p9yQ4ffMGowFf3cpEgrrJjEhN0V5nxw4Ye1EViAGDoL4/1AeO6qHpqYPOzE4Q==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -5817,10 +6049,11 @@ } }, "node_modules/path-scurry": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", - "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz", + "integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==", "dev": true, + "license": "BlueOak-1.0.0", "dependencies": { "lru-cache": "^11.0.0", "minipass": "^7.1.2" @@ -5833,9 +6066,9 @@ } }, "node_modules/path-to-regexp": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz", - "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz", + "integrity": "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==", "dev": true, "license": "MIT", "funding": { @@ -5850,16 +6083,6 @@ "dev": true, "license": "MIT" }, - "node_modules/pathval": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.1.tgz", - "integrity": "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 14.16" - } - }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -5867,10 +6090,11 @@ "dev": true }, "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.6" }, @@ -5931,15 +6155,14 @@ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true, - "peer": true, "engines": { "node": ">= 0.8.0" } }, "node_modules/prettier": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.7.4.tgz", - "integrity": "sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==", + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz", + "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==", "dev": true, "license": "MIT", "bin": { @@ -5971,7 +6194,7 @@ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, - "peer": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -5988,9 +6211,9 @@ } }, "node_modules/qs": { - "version": "6.14.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz", - "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.0.tgz", + "integrity": "sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -6021,7 +6244,8 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/range-parser": { "version": "1.2.1", @@ -6099,6 +6323,7 @@ "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -6108,7 +6333,7 @@ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true, - "peer": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -6126,19 +6351,21 @@ "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", "dev": true, + "license": "MIT", "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" } }, "node_modules/rimraf": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.0.1.tgz", - "integrity": "sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.2.tgz", + "integrity": "sha512-cFCkPslJv7BAXJsYlK1dZsbP8/ZNLkCAQ0bi1hf5EKX2QHegmDFEFA6QhuYJlk7UDdc+02JjO80YSOrWPpw06g==", "dev": true, + "license": "BlueOak-1.0.0", "dependencies": { - "glob": "^11.0.0", - "package-json-from-dist": "^1.0.0" + "glob": "^13.0.0", + "package-json-from-dist": "^1.0.1" }, "bin": { "rimraf": "dist/esm/bin.mjs" @@ -6151,9 +6378,9 @@ } }, "node_modules/rollup": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.46.2.tgz", - "integrity": "sha512-WMmLFI+Boh6xbop+OAGo9cQ3OgX9MIg7xOQjn+pTCwOkk+FNDAeAemXkJ3HzDJrVXleLOFVa1ipuc1AmEx1Dwg==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.59.0.tgz", + "integrity": "sha512-2oMpl67a3zCH9H79LeMcbDhXW/UmWG/y2zuqnF2jQq5uq9TbM9TVyXvA4+t+ne2IIkBdrLpAaRQAvo7YI/Yyeg==", "dev": true, "license": "MIT", "dependencies": { @@ -6167,26 +6394,31 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.46.2", - "@rollup/rollup-android-arm64": "4.46.2", - "@rollup/rollup-darwin-arm64": "4.46.2", - "@rollup/rollup-darwin-x64": "4.46.2", - "@rollup/rollup-freebsd-arm64": "4.46.2", - "@rollup/rollup-freebsd-x64": "4.46.2", - "@rollup/rollup-linux-arm-gnueabihf": "4.46.2", - "@rollup/rollup-linux-arm-musleabihf": "4.46.2", - "@rollup/rollup-linux-arm64-gnu": "4.46.2", - "@rollup/rollup-linux-arm64-musl": "4.46.2", - "@rollup/rollup-linux-loongarch64-gnu": "4.46.2", - "@rollup/rollup-linux-ppc64-gnu": "4.46.2", - "@rollup/rollup-linux-riscv64-gnu": "4.46.2", - "@rollup/rollup-linux-riscv64-musl": "4.46.2", - "@rollup/rollup-linux-s390x-gnu": "4.46.2", - "@rollup/rollup-linux-x64-gnu": "4.46.2", - "@rollup/rollup-linux-x64-musl": "4.46.2", - "@rollup/rollup-win32-arm64-msvc": "4.46.2", - "@rollup/rollup-win32-ia32-msvc": "4.46.2", - "@rollup/rollup-win32-x64-msvc": "4.46.2", + "@rollup/rollup-android-arm-eabi": "4.59.0", + "@rollup/rollup-android-arm64": "4.59.0", + "@rollup/rollup-darwin-arm64": "4.59.0", + "@rollup/rollup-darwin-x64": "4.59.0", + "@rollup/rollup-freebsd-arm64": "4.59.0", + "@rollup/rollup-freebsd-x64": "4.59.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.59.0", + "@rollup/rollup-linux-arm-musleabihf": "4.59.0", + "@rollup/rollup-linux-arm64-gnu": "4.59.0", + "@rollup/rollup-linux-arm64-musl": "4.59.0", + "@rollup/rollup-linux-loong64-gnu": "4.59.0", + "@rollup/rollup-linux-loong64-musl": "4.59.0", + "@rollup/rollup-linux-ppc64-gnu": "4.59.0", + "@rollup/rollup-linux-ppc64-musl": "4.59.0", + "@rollup/rollup-linux-riscv64-gnu": "4.59.0", + "@rollup/rollup-linux-riscv64-musl": "4.59.0", + "@rollup/rollup-linux-s390x-gnu": "4.59.0", + "@rollup/rollup-linux-x64-gnu": "4.59.0", + "@rollup/rollup-linux-x64-musl": "4.59.0", + "@rollup/rollup-openbsd-x64": "4.59.0", + "@rollup/rollup-openharmony-arm64": "4.59.0", + "@rollup/rollup-win32-arm64-msvc": "4.59.0", + "@rollup/rollup-win32-ia32-msvc": "4.59.0", + "@rollup/rollup-win32-x64-gnu": "4.59.0", + "@rollup/rollup-win32-x64-msvc": "4.59.0", "fsevents": "~2.3.2" } }, @@ -6239,6 +6471,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "queue-microtask": "^1.2.2" } @@ -6290,9 +6523,9 @@ "license": "MIT" }, "node_modules/sax": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.4.tgz", - "integrity": "sha512-1n3r/tGXO6b6VXMdFT54SHzT9ytu9yr7TaELowdYpMqY/Ao7EnlQGmAQ1+RatX7Tkkdm6hONI2owqNx2aZj5Sw==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.5.0.tgz", + "integrity": "sha512-21IYA3Q5cQf089Z6tgaUTr7lDAyzoTPx5HRtbhsME8Udispad8dC/+sziTNugOEx54ilvatQ9YCzl4KQLPcRHA==", "dev": true, "license": "BlueOak-1.0.0", "engines": { @@ -6574,9 +6807,9 @@ } }, "node_modules/std-env": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.9.0.tgz", - "integrity": "sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==", + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.10.0.tgz", + "integrity": "sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==", "dev": true, "license": "MIT" }, @@ -6714,7 +6947,7 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, - "peer": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -6722,30 +6955,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/strip-literal": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-3.0.0.tgz", - "integrity": "sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==", - "dev": true, - "license": "MIT", - "dependencies": { - "js-tokens": "^9.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/antfu" - } - }, - "node_modules/strip-literal/node_modules/js-tokens": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz", - "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==", - "dev": true, - "license": "MIT" - }, "node_modules/strnum": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.2.tgz", - "integrity": "sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.3.tgz", + "integrity": "sha512-oKx6RUCuHfT3oyVjtnrmn19H1SiCqgJSg+54XqURKp5aCMbrXrhLjRN9TjuwMjiYstZ0MzDrHqkGZ5dFTKd+zg==", "dev": true, "funding": [ { @@ -6768,9 +6981,9 @@ } }, "node_modules/tar": { - "version": "7.5.2", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.2.tgz", - "integrity": "sha512-7NyxrTE4Anh8km8iEy7o0QYPs+0JKBTj5ZaqHg6B39erLg0qYXN3BijtShwbsNSvQ+LN75+KV+C4QR/f6Gwnpg==", + "version": "7.5.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.11.tgz", + "integrity": "sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -6784,6 +6997,23 @@ "node": ">=18" } }, + "node_modules/temporal-polyfill": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/temporal-polyfill/-/temporal-polyfill-0.3.2.tgz", + "integrity": "sha512-TzHthD/heRK947GNiSu3Y5gSPpeUDH34+LESnfsq8bqpFhsB79HFBX8+Z834IVX68P3EUyRPZK5bL/1fh437Eg==", + "dev": true, + "license": "MIT", + "dependencies": { + "temporal-spec": "0.3.1" + } + }, + "node_modules/temporal-spec": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/temporal-spec/-/temporal-spec-0.3.1.tgz", + "integrity": "sha512-B4TUhezh9knfSIMwt7RVggApDRJZo73uZdj8AacL2mZ8RP5KtLianh2MXxL06GN9ESYiIsiuoLQhgVfwe55Yhw==", + "dev": true, + "license": "ISC" + }, "node_modules/test-exclude": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.1.tgz", @@ -6798,15 +7028,6 @@ "node": ">=18" } }, - "node_modules/test-exclude/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, "node_modules/test-exclude/node_modules/glob": { "version": "10.5.0", "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", @@ -6849,21 +7070,6 @@ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "dev": true }, - "node_modules/test-exclude/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/test-exclude/node_modules/path-scurry": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", @@ -6887,10 +7093,14 @@ "dev": true }, "node_modules/tinyexec": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz", - "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==", - "dev": true + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.2.tgz", + "integrity": "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } }, "node_modules/tinyglobby": { "version": "0.2.15", @@ -6928,11 +7138,12 @@ } }, "node_modules/tinyglobby/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -6940,30 +7151,10 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/tinypool": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz", - "integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.0.0 || >=20.0.0" - } - }, "node_modules/tinyrainbow": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz", - "integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/tinyspy": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-4.0.3.tgz", - "integrity": "sha512-t2T/WLB2WRgZ9EpE4jgPJ9w+i66UZfDc8wHh0xrwiRNN+UwH98GIJkTeZqX9rg0i0ptwzqW+uYeIF0T4F8LR7A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.0.3.tgz", + "integrity": "sha512-PSkbLUoxOFRzJYjjxHJt9xro7D+iilgMX/C9lawzVuYiIdcihh9DXmVibBe8lmcFrRi/VzlPjBxbN7rH24q8/Q==", "dev": true, "license": "MIT", "engines": { @@ -6975,6 +7166,7 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -6993,10 +7185,11 @@ } }, "node_modules/ts-api-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz", - "integrity": "sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz", + "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==", "dev": true, + "license": "MIT", "engines": { "node": ">=18.12" }, @@ -7012,11 +7205,13 @@ "license": "0BSD" }, "node_modules/tsx": { - "version": "4.19.3", - "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.19.3.tgz", - "integrity": "sha512-4H8vUNGNjQ4V2EOoGw005+c+dGuPSnhpPBPHBtsZdGZBk/iJb4kguGlPWaZTZ3q5nMtFOEsY0nRDlh9PJyd6SQ==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.21.0.tgz", + "integrity": "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==", + "license": "MIT", + "peer": true, "dependencies": { - "esbuild": "~0.25.0", + "esbuild": "~0.27.0", "get-tsconfig": "^4.7.5" }, "bin": { @@ -7034,7 +7229,6 @@ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, - "peer": true, "dependencies": { "prelude-ls": "^1.2.1" }, @@ -7065,11 +7259,12 @@ "license": "MIT" }, "node_modules/typescript": { - "version": "5.8.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz", - "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==", + "version": "5.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", + "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -7079,14 +7274,16 @@ } }, "node_modules/typescript-eslint": { - "version": "8.26.1", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.26.1.tgz", - "integrity": "sha512-t/oIs9mYyrwZGRpDv3g+3K6nZ5uhKEMt2oNmAPwaY4/ye0+EH4nXIPYNtkYFS6QHm+1DFg34DbglYBz5P9Xysg==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.55.0.tgz", + "integrity": "sha512-HE4wj+r5lmDVS9gdaN0/+iqNvPZwGfnJ5lZuz7s5vLlg9ODw0bIiiETaios9LvFI1U94/VBXGm3CB2Y5cNFMpw==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.26.1", - "@typescript-eslint/parser": "8.26.1", - "@typescript-eslint/utils": "8.26.1" + "@typescript-eslint/eslint-plugin": "8.55.0", + "@typescript-eslint/parser": "8.55.0", + "@typescript-eslint/typescript-estree": "8.55.0", + "@typescript-eslint/utils": "8.55.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7097,13 +7294,13 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.9.0" + "typescript": ">=4.8.4 <6.0.0" } }, "node_modules/undici-types": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz", - "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", + "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", "dev": true, "license": "MIT" }, @@ -7135,7 +7332,7 @@ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, - "peer": true, + "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" } @@ -7182,13 +7379,14 @@ } }, "node_modules/vite": { - "version": "7.1.11", - "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.11.tgz", - "integrity": "sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.2.tgz", + "integrity": "sha512-Bby3NOsna2jsjfLVOHKes8sGwgl4TT0E6vvpYgnAYDIF/tie7MRaFthmKuHx1NSXjiTueXH3do80FMQgvEktRg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { - "esbuild": "^0.25.0", + "esbuild": "^0.27.0", "fdir": "^6.5.0", "picomatch": "^4.0.3", "postcss": "^8.5.6", @@ -7256,29 +7454,6 @@ } } }, - "node_modules/vite-node": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.4.tgz", - "integrity": "sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==", - "dev": true, - "license": "MIT", - "dependencies": { - "cac": "^6.7.14", - "debug": "^4.4.1", - "es-module-lexer": "^1.7.0", - "pathe": "^2.0.3", - "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0" - }, - "bin": { - "vite-node": "vite-node.mjs" - }, - "engines": { - "node": "^18.0.0 || ^20.0.0 || >=22.0.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, "node_modules/vite/node_modules/fdir": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", @@ -7298,11 +7473,12 @@ } }, "node_modules/vite/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -7311,51 +7487,50 @@ } }, "node_modules/vitest": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz", - "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==", + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.0.18.tgz", + "integrity": "sha512-hOQuK7h0FGKgBAas7v0mSAsnvrIgAvWmRFjmzpJ7SwFHH3g1k2u37JtYwOwmEKhK6ZO3v9ggDBBm0La1LCK4uQ==", "dev": true, "license": "MIT", "dependencies": { - "@types/chai": "^5.2.2", - "@vitest/expect": "3.2.4", - "@vitest/mocker": "3.2.4", - "@vitest/pretty-format": "^3.2.4", - "@vitest/runner": "3.2.4", - "@vitest/snapshot": "3.2.4", - "@vitest/spy": "3.2.4", - "@vitest/utils": "3.2.4", - "chai": "^5.2.0", - "debug": "^4.4.1", - "expect-type": "^1.2.1", - "magic-string": "^0.30.17", + "@vitest/expect": "4.0.18", + "@vitest/mocker": "4.0.18", + "@vitest/pretty-format": "4.0.18", + "@vitest/runner": "4.0.18", + "@vitest/snapshot": "4.0.18", + "@vitest/spy": "4.0.18", + "@vitest/utils": "4.0.18", + "es-module-lexer": "^1.7.0", + "expect-type": "^1.2.2", + "magic-string": "^0.30.21", + "obug": "^2.1.1", "pathe": "^2.0.3", - "picomatch": "^4.0.2", - "std-env": "^3.9.0", + "picomatch": "^4.0.3", + "std-env": "^3.10.0", "tinybench": "^2.9.0", - "tinyexec": "^0.3.2", - "tinyglobby": "^0.2.14", - "tinypool": "^1.1.1", - "tinyrainbow": "^2.0.0", - "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0", - "vite-node": "3.2.4", + "tinyexec": "^1.0.2", + "tinyglobby": "^0.2.15", + "tinyrainbow": "^3.0.3", + "vite": "^6.0.0 || ^7.0.0", "why-is-node-running": "^2.3.0" }, "bin": { "vitest": "vitest.mjs" }, "engines": { - "node": "^18.0.0 || ^20.0.0 || >=22.0.0" + "node": "^20.0.0 || ^22.0.0 || >=24.0.0" }, "funding": { "url": "https://opencollective.com/vitest" }, "peerDependencies": { "@edge-runtime/vm": "*", - "@types/debug": "^4.1.12", - "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", - "@vitest/browser": "3.2.4", - "@vitest/ui": "3.2.4", + "@opentelemetry/api": "^1.9.0", + "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", + "@vitest/browser-playwright": "4.0.18", + "@vitest/browser-preview": "4.0.18", + "@vitest/browser-webdriverio": "4.0.18", + "@vitest/ui": "4.0.18", "happy-dom": "*", "jsdom": "*" }, @@ -7363,13 +7538,19 @@ "@edge-runtime/vm": { "optional": true }, - "@types/debug": { + "@opentelemetry/api": { "optional": true }, "@types/node": { "optional": true }, - "@vitest/browser": { + "@vitest/browser-playwright": { + "optional": true + }, + "@vitest/browser-preview": { + "optional": true + }, + "@vitest/browser-webdriverio": { "optional": true }, "@vitest/ui": { @@ -7384,9 +7565,9 @@ } }, "node_modules/vitest/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", "engines": { @@ -7494,9 +7675,9 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.19", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", - "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", + "version": "1.1.20", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.20.tgz", + "integrity": "sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==", "dev": true, "license": "MIT", "dependencies": { @@ -7536,7 +7717,6 @@ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true, - "peer": true, "engines": { "node": ">=0.10.0" } @@ -7723,16 +7903,6 @@ "node": ">=4.0" } }, - "node_modules/xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4" - } - }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", @@ -7753,9 +7923,9 @@ } }, "node_modules/yaml": { - "version": "2.8.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz", - "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==", + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz", + "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==", "dev": true, "license": "ISC", "bin": { diff --git a/packages/http-client-python/package.json b/packages/http-client-python/package.json index 2a8d90e731f..1b911555093 100644 --- a/packages/http-client-python/package.json +++ b/packages/http-client-python/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/http-client-python", - "version": "0.26.2", + "version": "0.28.3", "author": "Microsoft Corporation", "description": "TypeSpec emitter for Python SDKs", "homepage": "https://typespec.io", @@ -29,19 +29,25 @@ "node": ">=20.0.0" }, "scripts": { - "clean": "rimraf ./dist ./temp ./emitter/temp ./generator/test/azure/generated ./generator/test/unbranded/generated ./venv", + "clean": "rimraf ./dist ./temp ./venv ./tests/generated", "build": "tsc -p ./emitter/tsconfig.build.json && tsx ./eng/scripts/setup/build.ts", "watch": "tsc -p ./emitter/tsconfig.build.json --watch", - "lint": "eslint emitter/ --max-warnings=0", - "lint:py": "tsx ./eng/scripts/ci/lint.ts --folderName generator/pygen", - "format": "pnpm -w format:dir packages/http-client-python && tsx ./eng/scripts/ci/format.ts", "install": "tsx ./eng/scripts/setup/install.ts", "prepare": "tsx ./eng/scripts/setup/prepare.ts", + "setup": "npm run build && npm run install", + "test": "tsx ./eng/scripts/ci/run-tests.ts", + "test:emitter": "tsx ./eng/scripts/ci/run-tests.ts --emitter", + "test:generator": "tsx ./eng/scripts/ci/run-tests.ts --generator", + "lint": "tsx ./eng/scripts/ci/lint.ts", + "lint:generated": "tsx ./eng/scripts/ci/lint.ts --generated", + "format": "tsx ./eng/scripts/ci/format.ts", + "format:check": "tsx ./eng/scripts/ci/format.ts --check", + "format:generated": "tsx ./eng/scripts/ci/format.ts --generated", + "typecheck": "tsx ./eng/scripts/ci/typecheck.ts", + "typecheck:generated": "tsx ./eng/scripts/ci/typecheck.ts --generated", "regenerate": "tsx ./eng/scripts/ci/regenerate.ts", - "ci": "npm run test:emitter && npm run ci:generator --", - "ci:generator": "tsx ./eng/scripts/ci/run-ci.ts", - "test:generator": "tsx ./eng/scripts/ci/run-ci.ts --command=test", - "test:emitter": "vitest run -c ./emitter/vitest.config.ts", + "ci": "npm run test && npm run lint && npm run typecheck", + "ci:generated": "tsx ./eng/scripts/ci/run-tests.ts --generator --env=ci", "change:version": "pnpm chronus version --ignore-policies --only @typespec/http-client-python", "change:add": "pnpm chronus add", "regen-docs": "node ../../packages/tspd/cmd/tspd.js doc . --enable-experimental --output-dir ../../website/src/content/docs/docs/emitters/clients/http-client-python/reference --skip-js" @@ -54,55 +60,70 @@ "emitter" ], "peerDependencies": { - "@azure-tools/typespec-autorest": ">=0.64.1 <1.0.0", - "@azure-tools/typespec-azure-core": ">=0.64.0 <1.0.0", - "@azure-tools/typespec-azure-resource-manager": ">=0.64.1 <1.0.0", - "@azure-tools/typespec-azure-rulesets": ">=0.64.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.64.5 <1.0.0", - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/openapi": "^1.8.0", - "@typespec/rest": ">=0.78.0 <1.0.0", - "@typespec/versioning": ">=0.78.0 <1.0.0", - "@typespec/events": ">=0.78.0 <1.0.0", - "@typespec/sse": ">=0.78.0 <1.0.0", - "@typespec/streams": ">=0.78.0 <1.0.0", - "@typespec/xml": ">=0.78.0 <1.0.0" + "@azure-tools/typespec-autorest": ">=0.67.0 <1.0.0", + "@azure-tools/typespec-azure-core": ">=0.67.0 <1.0.0", + "@azure-tools/typespec-azure-resource-manager": ">=0.67.0 <1.0.0", + "@azure-tools/typespec-azure-rulesets": ">=0.67.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.67.0 <1.0.0", + "@typespec/compiler": "^1.11.0", + "@typespec/http": "^1.11.0", + "@typespec/openapi": "^1.11.0", + "@typespec/rest": ">=0.81.0 <1.0.0", + "@typespec/versioning": ">=0.81.0 <1.0.0", + "@typespec/events": ">=0.81.0 <1.0.0", + "@typespec/sse": ">=0.81.0 <1.0.0", + "@typespec/streams": ">=0.81.0 <1.0.0", + "@typespec/xml": ">=0.81.0 <1.0.0" + }, + "playgroundConfig": { + "assets": [ + { + "path": "generator/dist/pygen-*.whl", + "contentType": "application/zip" + } + ], + "bundlePeerDependencies": [ + "@azure-tools/typespec-client-generator-core", + "@azure-tools/typespec-azure-core", + "@azure-tools/typespec-autorest", + "@azure-tools/typespec-azure-resource-manager", + "@azure-tools/typespec-azure-rulesets" + ] }, "dependencies": { "js-yaml": "~4.1.0", "marked": "^15.0.6", "pyodide": "0.26.2", "semver": "~7.6.2", - "tsx": "~4.19.1" + "tsx": "^4.21.0" }, "devDependencies": { - "@azure-tools/typespec-autorest": "~0.64.1", - "@azure-tools/typespec-azure-core": "~0.64.0", - "@azure-tools/typespec-azure-resource-manager": "~0.64.1", - "@azure-tools/typespec-azure-rulesets": "~0.64.0", - "@azure-tools/typespec-client-generator-core": "~0.64.5", - "@azure-tools/azure-http-specs": "0.1.0-alpha.36", - "@typespec/compiler": "^1.8.0", - "@typespec/http": "^1.8.0", - "@typespec/openapi": "^1.8.0", - "@typespec/rest": "~0.78.0", - "@typespec/versioning": "~0.78.0", - "@typespec/events": "~0.78.0", - "@typespec/spector": "0.1.0-alpha.22", - "@typespec/spec-api": "0.1.0-alpha.12", - "@typespec/sse": "~0.78.0", - "@typespec/streams": "~0.78.0", - "@typespec/xml": "~0.78.0", - "@typespec/http-specs": "0.1.0-alpha.32-dev.1", + "@azure-tools/typespec-autorest": "~0.67.0", + "@azure-tools/typespec-azure-core": "~0.67.0", + "@azure-tools/typespec-azure-resource-manager": "~0.67.0", + "@azure-tools/typespec-azure-rulesets": "~0.67.0", + "@azure-tools/typespec-client-generator-core": "~0.67.0", + "@azure-tools/azure-http-specs": "0.1.0-alpha.39", + "@typespec/compiler": "^1.11.0", + "@typespec/http": "^1.11.0", + "@typespec/openapi": "^1.11.0", + "@typespec/rest": "~0.81.0", + "@typespec/versioning": "~0.81.0", + "@typespec/events": "~0.81.0", + "@typespec/spector": "0.1.0-alpha.25", + "@typespec/spec-api": "0.1.0-alpha.14", + "@typespec/sse": "~0.81.0", + "@typespec/streams": "~0.81.0", + "@typespec/xml": "~0.81.0", + "@typespec/http-specs": "0.1.0-alpha.36", "@types/js-yaml": "~4.0.5", - "@types/node": "~24.1.0", + "@types/node": "~25.0.2", "@types/semver": "7.5.8", "c8": "^10.1.3", - "chalk": "5.3.0", - "rimraf": "~6.0.1", - "typescript": "~5.8.2", - "typescript-eslint": "^8.21.0", - "vitest": "^3.1.2" + "picocolors": "~1.1.1", + "rimraf": "~6.1.2", + "typescript": "~5.9.2", + "typescript-eslint": "^8.49.0", + "vitest": "^4.0.15" } } diff --git a/packages/http-client-python/tests/conftest.py b/packages/http-client-python/tests/conftest.py new file mode 100644 index 00000000000..d3780e9e216 --- /dev/null +++ b/packages/http-client-python/tests/conftest.py @@ -0,0 +1,225 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import os +import subprocess +import signal +import time +import urllib.request +import urllib.error +import tempfile +import pytest +import importlib +from pathlib import Path +from filelock import FileLock + +# Root of the http-client-python package +ROOT = Path(__file__).parent.parent +DATA_FOLDER = Path(__file__).parent / "mock_api" / "shared" + +# Server configuration +SERVER_HOST = "localhost" +SERVER_PORT = 3000 +SERVER_URL = f"http://{SERVER_HOST}:{SERVER_PORT}" + +# Lock file for coordinating server startup across xdist workers +LOCK_FILE = Path(tempfile.gettempdir()) / "http_client_python_test_server.lock" +PID_FILE = Path(tempfile.gettempdir()) / "http_client_python_test_server.pid" + +# Global server process reference (used by hooks) +_server_process = None +_owns_server = False # Track if this process started the server + + +def wait_for_server(url: str, timeout: int = 60, interval: float = 0.5) -> bool: + """Wait for the server to be ready by polling the URL.""" + start_time = time.time() + while time.time() - start_time < timeout: + try: + urllib.request.urlopen(url, timeout=1) + return True + except urllib.error.HTTPError: + # Server is up but returned an error (e.g., 404) - that's fine + return True + except (urllib.error.URLError, OSError): + # Server not reachable yet + time.sleep(interval) + return False + + +def start_server_process(): + """Start the tsp-spector mock API server.""" + azure_http_path = ROOT / "node_modules/@azure-tools/azure-http-specs" + http_path = ROOT / "node_modules/@typespec/http-specs" + + # Determine flavor from environment or current directory + flavor = os.environ.get("FLAVOR", "azure") + + # Use absolute paths with forward slashes (works on all platforms including Windows) + if flavor == "unbranded": + cwd = http_path.resolve() + specs_path = str(cwd / "specs").replace("\\", "/") + cmd = f"npx tsp-spector serve {specs_path}" + else: + cwd = azure_http_path.resolve() + azure_specs = str(cwd / "specs").replace("\\", "/") + http_specs = str((http_path / "specs").resolve()).replace("\\", "/") + cmd = f"npx tsp-spector serve {azure_specs} {http_specs}" + + # Add node_modules/.bin to PATH + env = os.environ.copy() + node_bin = str(ROOT / "node_modules" / ".bin") + env["PATH"] = f"{node_bin}{os.pathsep}{env.get('PATH', '')}" + + # Suppress server stdout/stderr to avoid confusing "Request validation failed" warnings + # in test output. Server readiness is validated via HTTP polling in wait_for_server(). + if os.name == "nt": + return subprocess.Popen(cmd, shell=True, cwd=str(cwd), env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + return subprocess.Popen(cmd, shell=True, cwd=str(cwd), env=env, preexec_fn=os.setsid, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + + +def terminate_server_process(process): + """Terminate the mock API server process.""" + if process is None: + return + try: + if os.name == "nt": + # On Windows, use taskkill to kill the entire process tree + # process.kill() only kills the shell, not the child node process + subprocess.run( + ["taskkill", "/F", "/T", "/PID", str(process.pid)], + capture_output=True, + check=False, + ) + else: + os.killpg(os.getpgid(process.pid), signal.SIGTERM) + except ProcessLookupError: + pass # Process already terminated + except Exception: + # Fallback: try basic kill + try: + process.kill() + except Exception: + pass + + +def pytest_configure(config): + """Start the mock server before any tests run. + + Uses file locking to ensure only one process starts the server, + even when running with pytest-xdist. The controller process starts + the server and workers wait for it to be ready. + """ + global _server_process, _owns_server + + # Check if server is already running (e.g., from a previous run or external process) + if wait_for_server(SERVER_URL, timeout=1, interval=0.1): + print(f"Mock API server already running at {SERVER_URL}") + return + + # Use file lock to ensure only one process starts the server + # This handles both xdist workers and multiple test runs + lock = FileLock(str(LOCK_FILE), timeout=120) + + try: + with lock: + # Double-check after acquiring lock (another process may have started it) + if wait_for_server(SERVER_URL, timeout=1, interval=0.1): + print(f"Mock API server already running at {SERVER_URL}") + return + + # We're the first process - start the server + print(f"Starting mock API server...") + _server_process = start_server_process() + _owns_server = True + + # Check if process started successfully + if _server_process.poll() is not None: + pytest.exit(f"Mock API server process exited immediately with code {_server_process.returncode}") + + # Write PID file so other processes know who owns the server + PID_FILE.write_text(str(_server_process.pid)) + + # Wait for server to be ready + if not wait_for_server(SERVER_URL, timeout=60): + if _server_process.poll() is not None: + pytest.exit(f"Mock API server process died with code {_server_process.returncode}") + terminate_server_process(_server_process) + _server_process = None + _owns_server = False + pytest.exit(f"Mock API server failed to start within 60 seconds at {SERVER_URL}") + + print(f"Mock API server ready at {SERVER_URL}") + + except TimeoutError: + # Another process is holding the lock for too long + # Check if server is available anyway + if wait_for_server(SERVER_URL, timeout=5): + print(f"Mock API server available at {SERVER_URL} (started by another process)") + else: + pytest.exit("Timeout waiting for server lock - another process may be stuck") + + +def pytest_unconfigure(config): + """Stop the mock server after all tests complete.""" + global _server_process, _owns_server + + # Only stop the server if this process started it + if not _owns_server: + return + + terminate_server_process(_server_process) + _server_process = None + _owns_server = False + + # Clean up PID file + try: + PID_FILE.unlink(missing_ok=True) + except Exception: + pass + + +@pytest.fixture(scope="session", autouse=True) +def testserver(request): + """Ensure the mock server is ready before tests run. + + The server is started in pytest_configure (controller process). + This fixture just verifies the server is accessible from workers. + """ + if not wait_for_server(SERVER_URL, timeout=30): + pytest.fail(f"Mock API server not available at {SERVER_URL}") + yield + + +@pytest.fixture +def core_library(): + """Import the appropriate core library (azure.core or corehttp).""" + try: + return importlib.import_module("azure.core") + except ModuleNotFoundError: + return importlib.import_module("corehttp") + + +@pytest.fixture +def key_credential(core_library): + """Get the appropriate credential class.""" + try: + return core_library.credentials.AzureKeyCredential + except AttributeError: + return core_library.credentials.ServiceKeyCredential + + +@pytest.fixture +def png_data() -> bytes: + """Load PNG test data.""" + with open(str(DATA_FOLDER / "data/image.png"), "rb") as file_in: + return file_in.read() + + +@pytest.fixture +def jpg_data() -> bytes: + """Load JPG test data.""" + with open(str(DATA_FOLDER / "data/image.jpg"), "rb") as file_in: + return file_in.read() diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/data/image.jpg b/packages/http-client-python/tests/data/image.jpg similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/data/image.jpg rename to packages/http-client-python/tests/data/image.jpg diff --git a/packages/http-client-python/tests/install_packages.py b/packages/http-client-python/tests/install_packages.py new file mode 100644 index 00000000000..f706ae93732 --- /dev/null +++ b/packages/http-client-python/tests/install_packages.py @@ -0,0 +1,67 @@ +#!/usr/bin/env python +"""Install generated packages for testing. + +This script handles cross-platform path issues that can occur with inline +tox commands on Windows. +""" + +import glob +import os +import subprocess +import sys + + +def install_packages(flavor: str, tests_dir: str) -> None: + """Install generated packages for the given flavor.""" + generated_dir = os.path.join(tests_dir, "generated", flavor) + + if not os.path.exists(generated_dir): + print(f"Warning: Generated directory does not exist: {generated_dir}") + return + + # Find all package directories + packages = glob.glob(os.path.join(generated_dir, "*")) + packages = [p for p in packages if os.path.isdir(p)] + + if not packages: + print(f"Warning: No packages found in {generated_dir}") + return + + print(f"Installing {len(packages)} packages from {generated_dir}") + + # Install packages using uv pip + # Use --no-deps to avoid dependency resolution overhead + cmd = ["uv", "pip", "install", "--no-deps"] + packages + + try: + subprocess.run(cmd, check=True) + print(f"Successfully installed {len(packages)} packages") + except subprocess.CalledProcessError as e: + print(f"Error installing packages: {e}") + sys.exit(1) + except FileNotFoundError: + # uv not found, try pip + print("uv not found, falling back to pip") + cmd = [sys.executable, "-m", "pip", "install", "--no-deps"] + packages + subprocess.run(cmd, check=True) + + +def main(): + if len(sys.argv) < 2: + print("Usage: install_packages.py [tests_dir]") + print(" flavor: azure or unbranded") + print(" tests_dir: optional, defaults to script directory") + sys.exit(1) + + flavor = sys.argv[1] + tests_dir = sys.argv[2] if len(sys.argv) > 2 else os.path.dirname(os.path.abspath(__file__)) + + if flavor not in ("azure", "unbranded"): + print(f"Error: Invalid flavor '{flavor}'. Must be 'azure' or 'unbranded'") + sys.exit(1) + + install_packages(flavor, tests_dir) + + +if __name__ == "__main__": + main() diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_arm_commonproperties_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_arm_commonproperties_async.py similarity index 98% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_arm_commonproperties_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_arm_commonproperties_async.py index f5a62b6a868..15b8038fefd 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_arm_commonproperties_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_arm_commonproperties_async.py @@ -4,6 +4,7 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from azure.resourcemanager.commonproperties.aio import CommonPropertiesClient from azure.resourcemanager.commonproperties import models from azure.core import exceptions @@ -12,7 +13,7 @@ RESOURCE_GROUP_NAME = "test-rg" -@pytest.fixture +@pytest_asyncio.fixture async def client(credential, authentication_policy): async with CommonPropertiesClient( credential, SUBSCRIPTION_ID, "http://localhost:3000", authentication_policy=authentication_policy diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_arm_largeheader_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_arm_largeheader_async.py similarity index 96% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_arm_largeheader_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_arm_largeheader_async.py index deac2360dbc..e696553a2f9 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_arm_largeheader_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_arm_largeheader_async.py @@ -4,6 +4,7 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from azure.resourcemanager.largeheader.aio import LargeHeaderClient from azure.resourcemanager.largeheader import models @@ -11,7 +12,7 @@ RESOURCE_GROUP_NAME = "test-rg" -@pytest.fixture +@pytest_asyncio.fixture async def client(credential, authentication_policy): async with LargeHeaderClient( credential, SUBSCRIPTION_ID, "http://localhost:3000", authentication_policy=authentication_policy diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_arm_nonresource_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_arm_nonresource_async.py similarity index 96% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_arm_nonresource_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_arm_nonresource_async.py index 7cbbc763f33..926dcb129a3 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_arm_nonresource_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_arm_nonresource_async.py @@ -4,6 +4,7 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from azure.resourcemanager.nonresource.aio import NonResourceClient from azure.resourcemanager.nonresource import models @@ -11,7 +12,7 @@ RESOURCE_GROUP_NAME = "test-rg" -@pytest.fixture +@pytest_asyncio.fixture async def client(credential, authentication_policy): async with NonResourceClient( credential, SUBSCRIPTION_ID, "http://localhost:3000", authentication_policy=authentication_policy diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_arm_operationtemplates_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_arm_operationtemplates_async.py similarity index 94% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_arm_operationtemplates_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_arm_operationtemplates_async.py index 21fc5d68738..d28064a1bcc 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_arm_operationtemplates_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_arm_operationtemplates_async.py @@ -4,6 +4,7 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from azure.resourcemanager.operationtemplates.aio import OperationTemplatesClient from azure.resourcemanager.operationtemplates import models @@ -11,7 +12,7 @@ RESOURCE_GROUP_NAME = "test-rg" -@pytest.fixture +@pytest_asyncio.fixture async def client(credential, authentication_policy): async with OperationTemplatesClient( credential, @@ -176,6 +177,18 @@ async def test_optional_body_provider_post_with_body(client): assert result.status == "Changed to requested allowance" +@pytest.mark.asyncio +async def test_lro_begin_export_array(client): + result = await ( + await client.lro.begin_export_array( + body=models.ExportRequest(format="csv"), + ) + ).result() + assert len(result) == 2 + assert result[0].content == "order1,product1,1" + assert result[1].content == "order2,product2,2" + + @pytest.mark.asyncio async def test_lro_paging_begin_post_paging_lro(client): poller = await client.lro_paging.begin_post_paging_lro( diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_arm_resource_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_arm_resource_async.py similarity index 99% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_arm_resource_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_arm_resource_async.py index 8da75bfe249..eb20ed43ee8 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_arm_resource_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_arm_resource_async.py @@ -4,6 +4,7 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from azure.resourcemanager.resources.aio import ResourcesClient from azure.resourcemanager.resources import models @@ -11,7 +12,7 @@ RESOURCE_GROUP_NAME = "test-rg" -@pytest.fixture +@pytest_asyncio.fixture async def client(credential, authentication_policy): async with ResourcesClient( credential, diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_access_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_access_async.py similarity index 98% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_access_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_access_async.py index d1b6728a30e..2091b743371 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_access_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_access_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specs.azure.clientgenerator.core.access.aio import AccessClient from specs.azure.clientgenerator.core.access import models -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with AccessClient() as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_api_version_header_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_api_version_header_async.py similarity index 93% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_api_version_header_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_api_version_header_async.py index 7fd89f76d61..7baa44a7471 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_api_version_header_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_api_version_header_async.py @@ -4,10 +4,11 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from client.alternateapiversion.service.header.aio import HeaderClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with HeaderClient(endpoint="http://localhost:3000") as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_api_version_path_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_api_version_path_async.py similarity index 93% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_api_version_path_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_api_version_path_async.py index 3b6c99c116f..885f6f6007e 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_api_version_path_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_api_version_path_async.py @@ -4,10 +4,11 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from client.alternateapiversion.service.path.aio import PathClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with PathClient(endpoint="http://localhost:3000") as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_api_version_query_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_api_version_query_async.py similarity index 93% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_api_version_query_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_api_version_query_async.py index 3163f9a7c31..62f2f9847c4 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_api_version_query_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_api_version_query_async.py @@ -4,10 +4,11 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from client.alternateapiversion.service.query.aio import QueryClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with QueryClient(endpoint="http://localhost:3000") as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_default_value_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_client_default_value_async.py similarity index 97% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_default_value_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_client_default_value_async.py index 1d7795bbfc5..f4bbaaae048 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_default_value_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_client_default_value_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specs.azure.clientgenerator.core.clientdefaultvalue.aio import ClientDefaultValueClient from specs.azure.clientgenerator.core.clientdefaultvalue.models import ModelWithDefaultValues -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with ClientDefaultValueClient() as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_initialization_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_client_initialization_async.py similarity index 91% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_initialization_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_client_initialization_async.py index abaf9179c90..156f87a9a01 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_initialization_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_client_initialization_async.py @@ -4,15 +4,14 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.clientgenerator.core.clientinitialization.aio import ( +from specs.azure.clientgenerator.core.clientinitialization.default.aio import ( HeaderParamClient, MultipleParamsClient, MixedParamsClient, PathParamClient, ParamAliasClient, - ParentClient, ) -from specs.azure.clientgenerator.core.clientinitialization.models import Input +from specs.azure.clientgenerator.core.clientinitialization.default.models import Input @pytest.mark.asyncio diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_location_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_client_location_async.py similarity index 96% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_location_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_client_location_async.py index a039f18932e..d320f31ffbe 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_location_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_client_location_async.py @@ -4,31 +4,32 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specs.azure.clientgenerator.core.clientlocation.parameter.aio import MoveMethodParameterToClient from specs.azure.clientgenerator.core.clientlocation.subclient.aio import MoveToExistingSubClient from specs.azure.clientgenerator.core.clientlocation.newsubclient.aio import MoveToNewSubClient from specs.azure.clientgenerator.core.clientlocation.rootclient.aio import MoveToRootClient -@pytest.fixture +@pytest_asyncio.fixture async def move_method_parameter_to_client(): async with MoveMethodParameterToClient(storage_account="testaccount") as client: yield client -@pytest.fixture +@pytest_asyncio.fixture async def move_to_existing_sub_client(): async with MoveToExistingSubClient() as client: yield client -@pytest.fixture +@pytest_asyncio.fixture async def move_to_new_sub_client(): async with MoveToNewSubClient() as client: yield client -@pytest.fixture +@pytest_asyncio.fixture async def move_to_root_client(): async with MoveToRootClient() as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_deserialize_empty_string_as_null_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_deserialize_empty_string_as_null_async.py similarity index 94% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_deserialize_empty_string_as_null_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_deserialize_empty_string_as_null_async.py index fbb4349f5a2..e926baf8da1 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_deserialize_empty_string_as_null_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_deserialize_empty_string_as_null_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specs.azure.clientgenerator.core.emptystring.aio import DeserializeEmptyStringAsNullClient from specs.azure.clientgenerator.core.emptystring import models -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with DeserializeEmptyStringAsNullClient() as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_flatten_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_flatten_async.py similarity index 78% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_flatten_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_flatten_async.py index fe2f64f13db..6ebe71ad861 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_flatten_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_flatten_async.py @@ -4,16 +4,20 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specs.azure.clientgenerator.core.flattenproperty.aio import FlattenPropertyClient from specs.azure.clientgenerator.core.flattenproperty.models import ( - FlattenModel, + ChildFlattenModel, ChildModel, + FlattenModel, + FlattenUnknownModel, NestedFlattenModel, - ChildFlattenModel, + Solution, + SolutionProperties, ) -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with FlattenPropertyClient() as client: yield client @@ -46,6 +50,25 @@ async def test_put_nested_flatten_model(client: FlattenPropertyClient): ) +@pytest.mark.asyncio +async def test_put_flatten_unknown_model(client: FlattenPropertyClient): + result = await client.put_flatten_unknown_model(FlattenUnknownModel(name="foo")) + assert result.name == "test" + assert result.properties == {"key1": "value1", "key2": "value2"} + + +@pytest.mark.asyncio +async def test_put_flatten_read_only_model(client: FlattenPropertyClient): + result = await client.put_flatten_read_only_model(Solution(name="foo")) + assert result == Solution( + name="foo", + properties=SolutionProperties(solution_id="solution1", title="Solution Title", content="Solution Content"), + ) + assert result.solution_id == "solution1" + assert result.title == "Solution Title" + assert result.content == "Solution Content" + + @pytest.mark.asyncio # ============test for compatibility ============ async def test_dpg_model_common(): flatten_model = FlattenModel(name="hello", properties=ChildModel(age=0, description="test")) diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_hierrarchy_building_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_hierrarchy_building_async.py similarity index 97% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_hierrarchy_building_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_hierrarchy_building_async.py index b940b639fe1..9cf9749e50d 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_hierrarchy_building_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_hierrarchy_building_async.py @@ -4,6 +4,7 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specs.azure.clientgenerator.core.hierarchybuilding.aio import HierarchyBuildingClient from specs.azure.clientgenerator.core.hierarchybuilding.models import ( Pet, @@ -11,7 +12,7 @@ ) -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with HierarchyBuildingClient() as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_next_link_verb_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_next_link_verb_async.py similarity index 95% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_next_link_verb_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_next_link_verb_async.py index 7ce1de3c50d..c9061a3f8a3 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_next_link_verb_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_next_link_verb_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specs.azure.clientgenerator.core.nextlinkverb.aio import NextLinkVerbClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with NextLinkVerbClient(endpoint="http://localhost:3000") as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_override_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_override_async.py similarity index 98% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_override_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_override_async.py index 8fa5849b469..aeae909856a 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_override_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_override_async.py @@ -5,10 +5,11 @@ # -------------------------------------------------------------------------- import inspect import pytest +import pytest_asyncio from specs.azure.clientgenerator.core.override.aio import OverrideClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with OverrideClient() as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_usage_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_usage_async.py similarity index 96% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_usage_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_usage_async.py index 66c7946d888..816279eeb94 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_usage_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_usage_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specs.azure.clientgenerator.core.usage.aio import UsageClient from specs.azure.clientgenerator.core.usage import models -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with UsageClient() as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_basic_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_basic_async.py similarity index 98% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_basic_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_basic_async.py index 87946f37ca2..3ce2c52262a 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_basic_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_basic_async.py @@ -4,12 +4,13 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specs.azure.core.basic import models, aio VALID_USER = models.User(id=1, name="Madge", etag="11bdc430-65e8-45ad-81d9-8ffa60d55b59") -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with aio.BasicClient() as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_lro_rpc_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_lro_rpc_async.py similarity index 94% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_lro_rpc_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_lro_rpc_async.py index bc572bf298b..57c19c423b3 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_lro_rpc_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_lro_rpc_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specs.azure.core.lro.rpc.aio import RpcClient from specs.azure.core.lro.rpc import models -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with RpcClient() as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_lro_standard_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_lro_standard_async.py similarity index 96% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_lro_standard_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_lro_standard_async.py index b9b00668cae..05c4c09a2a9 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_lro_standard_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_lro_standard_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specs.azure.core.lro.standard.aio import StandardClient from specs.azure.core.lro.standard.models import User, ExportedUser -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with StandardClient() as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_model_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_model_async.py similarity index 96% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_model_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_model_async.py index b2f8eed8952..333cfb5dcb5 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_model_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_model_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specs.azure.core.model.aio import ModelClient from specs.azure.core.model.models import AzureEmbeddingModel -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with ModelClient() as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_page_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_page_async.py similarity index 82% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_page_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_page_async.py index 587d5a9999d..01a862620f2 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_page_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_page_async.py @@ -4,13 +4,14 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from typing import AsyncIterable from specs.azure.core.page import models, aio VALID_USER = models.User(id=1, name="Madge", etag="11bdc430-65e8-45ad-81d9-8ffa60d55b59") -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with aio.PageClient() as client: yield client @@ -66,3 +67,15 @@ async def test_list_with_parameterized_next_link(client: aio.PageClient): assert result[0].name == "User1" assert result[1].id == 2 assert result[1].name == "User2" + + +@pytest.mark.asyncio +async def test_list_with_relative_next_link(client: aio.PageClient): + result = [item async for item in client.with_relative_next_link()] + assert len(result) == 2 + assert result[0].id == 1 + assert result[0].name == "User1" + assert result[0].etag == "11bdc430-65e8-45ad-81d9-8ffa60d55b59" + assert result[1].id == 2 + assert result[1].name == "User2" + assert result[1].etag == "11bdc430-65e8-45ad-81d9-8ffa60d55b59" diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_scalar_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_scalar_async.py similarity index 96% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_scalar_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_scalar_async.py index 4616cc2b5e4..321ebf9fc11 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_scalar_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_scalar_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specs.azure.core.scalar.aio import ScalarClient from specs.azure.core.scalar import models -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with ScalarClient() as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_traits_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_traits_async.py similarity index 98% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_traits_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_traits_async.py index dca81854423..02060f56c2b 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_core_traits_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_core_traits_async.py @@ -7,13 +7,14 @@ from datetime import datetime import pytest +import pytest_asyncio from azure.core.exceptions import HttpResponseError from azure.core import MatchConditions from specs.azure.core.traits.aio import TraitsClient from specs.azure.core.traits.models import UserActionParam -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with TraitsClient() as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_encode_duration_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_encode_duration_async.py similarity index 93% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_encode_duration_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_encode_duration_async.py index 8a23b94955e..d1c4867b89e 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_encode_duration_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_encode_duration_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specs.azure.encode.duration.aio import DurationClient from specs.azure.encode.duration import models -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with DurationClient() as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_example_basic_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_example_basic_async.py similarity index 95% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_example_basic_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_example_basic_async.py index 46a66e519d0..00ce65cfb48 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_example_basic_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_example_basic_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specs.azure.example.basic.aio import AzureExampleClient from specs.azure.example.basic.models import ActionRequest, Model -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with AzureExampleClient() as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_payload_pageable_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_payload_pageable_async.py similarity index 93% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_payload_pageable_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_payload_pageable_async.py index 440a4a51170..1da9e665895 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_payload_pageable_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_payload_pageable_async.py @@ -4,10 +4,11 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specs.azure.payload.pageable.aio import PageableClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with PageableClient(endpoint="http://localhost:3000") as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_resource_manager_method_subscription_id_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_resource_manager_method_subscription_id_async.py similarity index 99% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_resource_manager_method_subscription_id_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_resource_manager_method_subscription_id_async.py index 7b96c3c297b..4cd896a3477 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_resource_manager_method_subscription_id_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_resource_manager_method_subscription_id_async.py @@ -4,6 +4,7 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from azure.resourcemanager.methodsubscriptionid.aio import MethodSubscriptionIdClient from azure.resourcemanager.methodsubscriptionid import models @@ -11,7 +12,7 @@ RESOURCE_GROUP_NAME = "test-rg" -@pytest.fixture +@pytest_asyncio.fixture async def client(credential, authentication_policy): async with MethodSubscriptionIdClient( credential, diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_resource_manager_multi_service_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_resource_manager_multi_service_async.py similarity index 98% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_resource_manager_multi_service_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_resource_manager_multi_service_async.py index 86af8d31a93..b80c58a2274 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_resource_manager_multi_service_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_resource_manager_multi_service_async.py @@ -4,12 +4,13 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from azure.core.exceptions import HttpResponseError from azure.resourcemanager.multiservice.combined.aio import CombinedClient from azure.resourcemanager.multiservice.combined.models import VirtualMachine, Disk -@pytest.fixture +@pytest_asyncio.fixture async def client(credential, authentication_policy): """Create a Combined async client for testing.""" return CombinedClient( diff --git a/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_resource_manager_multi_service_shared_models_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_resource_manager_multi_service_shared_models_async.py new file mode 100644 index 00000000000..57bc4929d90 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_resource_manager_multi_service_shared_models_async.py @@ -0,0 +1,133 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +import pytest_asyncio +from azure.resourcemanager.multiservicesharedmodels.combined.aio import CombinedClient +from azure.resourcemanager.multiservicesharedmodels.combined.models import ( + VirtualMachine, + VirtualMachineProperties, + StorageAccount, + StorageAccountProperties, + SharedMetadata, +) + + +@pytest_asyncio.fixture +async def client(credential, authentication_policy): + """Create a Combined async client for testing.""" + return CombinedClient( + credential=credential, + subscription_id="00000000-0000-0000-0000-000000000000", + base_url="http://localhost:3000", + authentication_policy=authentication_policy, + polling_interval=0.1, + ) + + +@pytest.mark.asyncio +async def test_virtual_machines_get(client): + """Test getting a virtual machine with shared metadata.""" + resource_group_name = "test-rg" + vm_name = "vm-shared1" + + result = await client.virtual_machines.get(resource_group_name=resource_group_name, vm_name=vm_name) + + assert result is not None + assert isinstance(result, VirtualMachine) + assert result.name == vm_name + assert result.location == "eastus" + assert result.type == "Microsoft.Compute/virtualMachinesShared" + assert result.properties is not None + assert result.properties.provisioning_state == "Succeeded" + assert result.properties.metadata is not None + assert result.properties.metadata.created_by == "user@example.com" + assert result.properties.metadata.tags == {"environment": "production"} + + +@pytest.mark.asyncio +async def test_virtual_machines_create_or_update(client): + """Test creating or updating a virtual machine with shared metadata.""" + resource_group_name = "test-rg" + vm_name = "vm-shared1" + + vm_resource = VirtualMachine( + location="eastus", + properties=VirtualMachineProperties( + metadata=SharedMetadata( + created_by="user@example.com", + tags={"environment": "production"}, + ), + ), + ) + + poller = await client.virtual_machines.begin_create_or_update( + resource_group_name=resource_group_name, + vm_name=vm_name, + resource=vm_resource, + ) + + result = await poller.result() + assert result is not None + assert isinstance(result, VirtualMachine) + assert result.location == "eastus" + assert result.properties is not None + assert result.properties.provisioning_state == "Succeeded" + assert result.properties.metadata is not None + assert result.properties.metadata.created_by == "user@example.com" + assert result.properties.metadata.tags == {"environment": "production"} + + +@pytest.mark.asyncio +async def test_storage_accounts_get(client): + """Test getting a storage account with shared metadata.""" + resource_group_name = "test-rg" + account_name = "account1" + + result = await client.storage_accounts.get(resource_group_name=resource_group_name, account_name=account_name) + + assert result is not None + assert isinstance(result, StorageAccount) + assert result.name == account_name + assert result.location == "westus" + assert result.type == "Microsoft.Storage/storageAccounts" + assert result.properties is not None + assert result.properties.provisioning_state == "Succeeded" + assert result.properties.metadata is not None + assert result.properties.metadata.created_by == "admin@example.com" + assert result.properties.metadata.tags == {"department": "engineering"} + + +@pytest.mark.asyncio +async def test_storage_accounts_create_or_update(client): + """Test creating or updating a storage account with shared metadata.""" + resource_group_name = "test-rg" + account_name = "account1" + + storage_resource = StorageAccount( + location="westus", + properties=StorageAccountProperties( + metadata=SharedMetadata( + created_by="admin@example.com", + tags={"department": "engineering"}, + ), + ), + ) + + poller = await client.storage_accounts.begin_create_or_update( + resource_group_name=resource_group_name, + account_name=account_name, + resource=storage_resource, + ) + + result = await poller.result() + assert result is not None + assert isinstance(result, StorageAccount) + assert result.location == "westus" + assert result.properties is not None + assert result.properties.provisioning_state == "Succeeded" + assert result.properties.metadata is not None + assert result.properties.metadata.created_by == "admin@example.com" + assert result.properties.metadata.tags == {"department": "engineering"} diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_special_headers_client_request_id_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_special_headers_client_request_id_async.py similarity index 95% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_special_headers_client_request_id_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_special_headers_client_request_id_async.py index b89ee4b732c..eb066f84278 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_special_headers_client_request_id_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_special_headers_client_request_id_async.py @@ -6,11 +6,12 @@ import functools import pytest +import pytest_asyncio from azure.specialheaders.xmsclientrequestid.aio import XmsClientRequestIdClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with XmsClientRequestIdClient() as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_versioning_previewversion_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_versioning_previewversion_async.py similarity index 96% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_versioning_previewversion_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_versioning_previewversion_async.py index 512e69c817e..a7d6d3d54c3 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_azure_versioning_previewversion_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_azure_versioning_previewversion_async.py @@ -4,17 +4,18 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specs.azure.versioning.previewversion.aio import PreviewVersionClient from specs.azure.versioning.previewversion.models import UpdateWidgetColorRequest -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with PreviewVersionClient() as client: yield client -@pytest.fixture +@pytest_asyncio.fixture async def stable_client(): async with PreviewVersionClient(api_version="2024-06-01") as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_client_namespace_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_client_namespace_async.py similarity index 94% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_client_namespace_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_client_namespace_async.py index adc98e3d569..06812847e24 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_client_namespace_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_client_namespace_async.py @@ -4,6 +4,7 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from client.clientnamespace.aio import ClientNamespaceFirstClient from client.clientnamespace.first.models import FirstClientResult @@ -12,13 +13,13 @@ from client.clientnamespace.second.sub.models import SecondClientEnumType -@pytest.fixture +@pytest_asyncio.fixture async def first_client(): async with ClientNamespaceFirstClient() as client: yield client -@pytest.fixture +@pytest_asyncio.fixture async def second_client(): async with ClientNamespaceSecondClient() as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_client_naming_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_client_naming_async.py similarity index 78% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_client_naming_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_client_naming_async.py index 39a26924925..9a3f249740e 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_client_naming_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_client_naming_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from client.naming.main.aio import NamingClient from client.naming.main import models -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with NamingClient() as client: yield client @@ -16,17 +17,17 @@ async def client(): @pytest.mark.asyncio async def test_client(client: NamingClient): - await client.client(models.ClientNameModel(client_name=True)) + await client.property.client(models.ClientNameModel(client_name=True)) @pytest.mark.asyncio async def test_language(client: NamingClient): - await client.language(models.LanguageClientNameModel(python_name=True)) + await client.property.language(models.LanguageClientNameModel(python_name=True)) @pytest.mark.asyncio async def test_compatible_with_encoded_name(client: NamingClient): - await client.compatible_with_encoded_name(models.ClientNameAndJsonEncodedNameModel(client_name=True)) + await client.property.compatible_with_encoded_name(models.ClientNameAndJsonEncodedNameModel(client_name=True)) @pytest.mark.asyncio @@ -41,12 +42,12 @@ async def test_parameter(client: NamingClient): @pytest.mark.asyncio async def test_header_request(client: NamingClient): - await client.request(client_name="true") + await client.header.request(client_name="true") @pytest.mark.asyncio async def test_header_response(client: NamingClient): - assert (await client.response(cls=lambda x, y, z: z))["default-name"] == "true" + assert (await client.header.response(cls=lambda x, y, z: z))["default-name"] == "true" @pytest.mark.asyncio diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_client_naming_enum_conflict_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_client_naming_enum_conflict_async.py similarity index 97% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_client_naming_enum_conflict_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_client_naming_enum_conflict_async.py index 27b7731d985..edcf008684b 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_client_naming_enum_conflict_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_client_naming_enum_conflict_async.py @@ -4,12 +4,13 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from client.naming.enumconflict.aio import EnumConflictClient from client.naming.enumconflict.firstnamespace import models as first_models from client.naming.enumconflict.secondnamespace import models as second_models -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with EnumConflictClient() as client: yield client diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_client_overload_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_client_overload_async.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_client_overload_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_client_overload_async.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_client_structure_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_client_structure_async.py similarity index 97% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_client_structure_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_client_structure_async.py index be39934d896..8d17c7a069d 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_client_structure_async.py +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_client_structure_async.py @@ -52,7 +52,7 @@ async def test_structure_renamed_operation(): @pytest.mark.asyncio async def test_structure_two_operation_group(): - client = TwoOperationGroupClient(endpoint="http://localhost:3000", client=ClientType.RENAMED_OPERATION) + client = TwoOperationGroupClient(endpoint="http://localhost:3000", client=ClientType.TWO_OPERATION_GROUP) await client.group1.one() await client.group1.three() await client.group1.four() diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_client_structure_clientoperationgroup_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_client_structure_clientoperationgroup_async.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_client_structure_clientoperationgroup_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_client_structure_clientoperationgroup_async.py diff --git a/packages/http-client-python/tests/mock_api/azure/asynctests/test_encode_duration_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_encode_duration_async.py new file mode 100644 index 00000000000..b79a501903b --- /dev/null +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_encode_duration_async.py @@ -0,0 +1,64 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import datetime + +import pytest +import pytest_asyncio +from encode.duration.aio import DurationClient +from encode.duration.models import ( + Int32SecondsDurationProperty, + ISO8601DurationProperty, + FloatSecondsDurationProperty, + DefaultDurationProperty, + FloatSecondsDurationArrayProperty, +) + + +@pytest_asyncio.fixture +async def client(): + async with DurationClient() as client: + yield client + + +@pytest.mark.asyncio +async def test_query(client: DurationClient): + await client.query.default(input=datetime.timedelta(days=40)) + await client.query.iso8601(input=datetime.timedelta(days=40)) + await client.query.int32_seconds(input=36) + await client.query.int32_seconds_array(input=[36, 47]) + await client.query.float_seconds(input=35.625) + await client.query.float64_seconds(input=35.625) + + +@pytest.mark.asyncio +async def test_property(client: DurationClient): + result = await client.property.default(DefaultDurationProperty(value=datetime.timedelta(days=40))) + assert result.value == datetime.timedelta(days=40) + result = await client.property.default(DefaultDurationProperty(value="P40D")) + assert result.value == datetime.timedelta(days=40) + result = await client.property.iso8601(ISO8601DurationProperty(value=datetime.timedelta(days=40))) + assert result.value == datetime.timedelta(days=40) + result = await client.property.iso8601(ISO8601DurationProperty(value="P40D")) + assert result.value == datetime.timedelta(days=40) + result = await client.property.int32_seconds(Int32SecondsDurationProperty(value=36)) + assert result.value == 36 + result = await client.property.float_seconds(FloatSecondsDurationProperty(value=35.625)) + assert abs(result.value - 35.625) < 0.0001 + result = await client.property.float64_seconds(FloatSecondsDurationProperty(value=35.625)) + assert abs(result.value - 35.625) < 0.0001 + result = await client.property.float_seconds_array(FloatSecondsDurationArrayProperty(value=[35.625, 46.75])) + assert abs(result.value[0] - 35.625) < 0.0001 + assert abs(result.value[1] - 46.75) < 0.0001 + + +@pytest.mark.asyncio +async def test_header(client: DurationClient): + await client.header.default(duration=datetime.timedelta(days=40)) + await client.header.iso8601(duration=datetime.timedelta(days=40)) + await client.header.iso8601_array(duration=[datetime.timedelta(days=40), datetime.timedelta(days=50)]) + await client.header.int32_seconds(duration=36) + await client.header.float_seconds(duration=35.625) + await client.header.float64_seconds(duration=35.625) diff --git a/packages/http-client-python/tests/mock_api/azure/asynctests/test_encode_numeric_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_encode_numeric_async.py new file mode 100644 index 00000000000..a3a8a4d1fea --- /dev/null +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_encode_numeric_async.py @@ -0,0 +1,36 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +import pytest_asyncio +from encode.numeric.aio import NumericClient +from encode.numeric import models + + +@pytest_asyncio.fixture +async def client(): + async with NumericClient() as client: + yield client + + +@pytest.mark.asyncio +async def test_safeint_as_string(client: NumericClient): + result = await client.property.safeint_as_string(models.SafeintAsStringProperty(value=10000000000)) + assert result.value == 10000000000 + assert result["value"] == "10000000000" + + +@pytest.mark.asyncio +async def test_uint32_as_string_optional(client: NumericClient): + result = await client.property.uint32_as_string_optional(models.Uint32AsStringProperty(value=1)) + assert result.value == 1 + assert result["value"] == "1" + + +@pytest.mark.asyncio +async def test_uint8_as_string_optional(client: NumericClient): + result = await client.property.uint8_as_string(models.Uint32AsStringProperty(value=255)) + assert result.value == 255 + assert result["value"] == "255" diff --git a/packages/http-client-python/tests/mock_api/azure/asynctests/test_parameters_basic_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_parameters_basic_async.py new file mode 100644 index 00000000000..2b53806b4ce --- /dev/null +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_parameters_basic_async.py @@ -0,0 +1,25 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +import pytest_asyncio +from parameters.basic.aio import BasicClient +from parameters.basic.models import User + + +@pytest_asyncio.fixture +async def client(): + async with BasicClient() as client: + yield client + + +@pytest.mark.asyncio +async def test_explicit_simple(client: BasicClient): + await client.explicit_body.simple(User(name="foo")) + + +@pytest.mark.asyncio +async def test_implicit_simple(client: BasicClient): + await client.implicit_body.simple(name="foo") diff --git a/packages/http-client-python/tests/mock_api/azure/asynctests/test_parameters_spread_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_parameters_spread_async.py new file mode 100644 index 00000000000..9fa08028630 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_parameters_spread_async.py @@ -0,0 +1,77 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +import pytest_asyncio +from parameters.spread.aio import SpreadClient +from parameters.spread.models import BodyParameter + + +@pytest_asyncio.fixture +async def client(): + async with SpreadClient() as client: + yield client + + +@pytest.mark.asyncio +async def test_model_body(client: SpreadClient): + await client.model.spread_as_request_body(name="foo") + + +@pytest.mark.asyncio +async def test_model_composite_request_only_with_body(client: SpreadClient): + await client.model.spread_composite_request_only_with_body(BodyParameter(name="foo")) + + +@pytest.mark.asyncio +async def test_model_composite_request_without_body(client: SpreadClient): + await client.model.spread_composite_request_without_body(name="foo", test_header="bar") + + +@pytest.mark.asyncio +async def test_model_composite_request(client: SpreadClient): + await client.model.spread_composite_request(name="foo", body=BodyParameter(name="foo"), test_header="bar") + + +@pytest.mark.asyncio +async def test_model_composite_request_mix(client: SpreadClient): + await client.model.spread_composite_request_mix(name="foo", prop="foo", test_header="bar") + + +@pytest.mark.asyncio +async def test_alias_body(client: SpreadClient): + await client.alias.spread_as_request_body(name="foo") + + +@pytest.mark.asyncio +async def test_alias_parameter(client: SpreadClient): + await client.alias.spread_as_request_parameter("1", x_ms_test_header="bar", name="foo") + + +@pytest.mark.asyncio +async def test_alias_multiple_parameter(client: SpreadClient): + await client.alias.spread_with_multiple_parameters( + "1", + x_ms_test_header="bar", + required_string="foo", + required_int_list=[1, 2], + optional_string_list=["foo", "bar"], + optional_int=1, + ) + await client.alias.spread_with_multiple_parameters( + "1", + {"requiredString": "foo", "optionalInt": 1, "requiredIntList": [1, 2], "optionalStringList": ["foo", "bar"]}, + x_ms_test_header="bar", + ) + + +@pytest.mark.asyncio +async def test_inner_model(client: SpreadClient): + await client.alias.spread_parameter_with_inner_model(id="1", x_ms_test_header="bar", body={"name": "foo"}) + + +@pytest.mark.asyncio +async def test_inner_alias(client: SpreadClient): + await client.alias.spread_parameter_with_inner_alias(id="1", x_ms_test_header="bar", body={"name": "foo", "age": 1}) diff --git a/packages/http-client-python/tests/mock_api/azure/asynctests/test_payload_content_negotiation_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_payload_content_negotiation_async.py new file mode 100644 index 00000000000..84ec7ba708c --- /dev/null +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_payload_content_negotiation_async.py @@ -0,0 +1,38 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import base64 +import pytest +import pytest_asyncio +from payload.contentnegotiation.aio import ContentNegotiationClient +from payload.contentnegotiation.models import PngImageAsJson + + +@pytest_asyncio.fixture +async def client(): + async with ContentNegotiationClient(endpoint="http://localhost:3000") as client: + yield client + + +@pytest.mark.asyncio +async def test_get_avatar_as_png(client: ContentNegotiationClient, png_data: bytes): + assert b"".join([d async for d in (await client.same_body.get_avatar_as_png())]) == png_data + + +@pytest.mark.asyncio +async def test_get_avatar_as_jpeg(client: ContentNegotiationClient, jpg_data: bytes): + assert b"".join([d async for d in (await client.same_body.get_avatar_as_jpeg())]) == jpg_data + + +@pytest.mark.asyncio +async def test_different_body_get_avatar_as_png(client: ContentNegotiationClient, png_data: bytes): + assert b"".join([d async for d in (await client.different_body.get_avatar_as_png())]) == png_data + + +@pytest.mark.asyncio +async def test_different_body_get_avatar_as_json(client: ContentNegotiationClient, png_data: bytes): + result = await client.different_body.get_avatar_as_json() + expected = PngImageAsJson(content=base64.b64encode(png_data).decode()) + assert result == expected diff --git a/packages/http-client-python/tests/mock_api/azure/asynctests/test_payload_multipart_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_payload_multipart_async.py new file mode 100644 index 00000000000..03668f5ddbc --- /dev/null +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_payload_multipart_async.py @@ -0,0 +1,217 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +from pathlib import Path +import pytest +import pytest_asyncio +from payload.multipart import models +from payload.multipart.aio import MultiPartClient + +JPG = Path(__file__).parent.parent / "data/image.jpg" +PNG = Path(__file__).parent.parent / "data/image.png" + + +@pytest_asyncio.fixture +async def client(): + async with MultiPartClient(endpoint="http://localhost:3000") as client: + yield client + + +@pytest.mark.asyncio +async def test_anonymous_model(client: MultiPartClient): + await client.form_data.anonymous_model({"profileImage": open(str(JPG), "rb")}) + + +@pytest.mark.asyncio +async def test_basic(client: MultiPartClient): + await client.form_data.basic( + models.MultiPartRequest( + id="123", + profile_image=open(str(JPG), "rb"), + ) + ) + + +@pytest.mark.asyncio +async def test_binary_array_parts(client: MultiPartClient): + await client.form_data.binary_array_parts( + models.BinaryArrayPartsRequest( + id="123", + pictures=[ + open(str(PNG), "rb"), + open(str(PNG), "rb"), + ], + ) + ) + + +@pytest.mark.asyncio +async def test_check_file_name_and_content_type(client: MultiPartClient): + await client.form_data.check_file_name_and_content_type( + models.MultiPartRequest( + id="123", + profile_image=("hello.jpg", open(str(JPG), "rb"), "image/jpg"), + ) + ) + + +@pytest.mark.asyncio +async def test_complex(client: MultiPartClient): + await client.form_data.file_array_and_basic( + models.ComplexPartsRequest( + id="123", + address=models.Address(city="X"), + pictures=[ + open(str(PNG), "rb"), + open(str(PNG), "rb"), + ], + profile_image=open(str(JPG), "rb"), + ) + ) + + +@pytest.mark.asyncio +async def test_json_part(client: MultiPartClient): + await client.form_data.json_part( + models.JsonPartRequest( + address=models.Address(city="X"), + profile_image=open(str(JPG), "rb"), + ) + ) + + +@pytest.mark.asyncio +async def test_multi_binary_parts(client: MultiPartClient): + await client.form_data.multi_binary_parts( + models.MultiBinaryPartsRequest( + profile_image=open(str(JPG), "rb"), + picture=open(str(PNG), "rb"), + ) + ) + await client.form_data.multi_binary_parts( + models.MultiBinaryPartsRequest( + profile_image=open(str(JPG), "rb"), + ) + ) + + +@pytest.mark.asyncio +async def test_file_with_http_part_specific_content_type(client: MultiPartClient): + await client.form_data.http_parts.content_type.image_jpeg_content_type( + models.FileWithHttpPartSpecificContentTypeRequest( + profile_image=("hello.jpg", open(str(JPG), "rb"), "image/jpg"), + ) + ) + + +@pytest.mark.asyncio +async def test_file_with_http_part_required_content_type(client: MultiPartClient): + await client.form_data.http_parts.content_type.required_content_type( + models.FileWithHttpPartRequiredContentTypeRequest( + profile_image=open(str(JPG), "rb"), + ) + ) + + +@pytest.mark.asyncio +async def test_file_with_http_part_optional_content_type(client: MultiPartClient): + # call twice: one with content type, one without + await client.form_data.http_parts.content_type.optional_content_type( + models.FileWithHttpPartOptionalContentTypeRequest( + profile_image=("hello.jpg", open(str(JPG), "rb").read()), + ) + ) + await client.form_data.http_parts.content_type.optional_content_type( + models.FileWithHttpPartOptionalContentTypeRequest( + profile_image=("hello.jpg", open(str(JPG), "rb").read(), "application/octet-stream"), + ) + ) + + +@pytest.mark.asyncio +async def test_complex_with_http_part(client: MultiPartClient): + await client.form_data.http_parts.json_array_and_file_array( + models.ComplexHttpPartsModelRequest( + id="123", + previous_addresses=[ + models.Address(city="Y"), + models.Address(city="Z"), + ], + address=models.Address(city="X"), + pictures=[ + open(str(PNG), "rb"), + open(str(PNG), "rb"), + ], + profile_image=open(str(JPG), "rb"), + ) + ) + + +@pytest.mark.asyncio +async def test_http_parts_non_string_float(client: MultiPartClient): + await client.form_data.http_parts.non_string.float(models.FloatRequest(temperature=0.5)) + + +@pytest.mark.asyncio +async def test_with_wire_name(client: MultiPartClient): + await client.form_data.with_wire_name( + models.MultiPartRequestWithWireName( + identifier="123", + image=open(str(JPG), "rb"), + ) + ) + + +@pytest.mark.asyncio +async def test_optional_parts(client: MultiPartClient): + # First time with only id + await client.form_data.optional_parts( + models.MultiPartOptionalRequest( + id="123", + ) + ) + # Second time with only profileImage + await client.form_data.optional_parts( + models.MultiPartOptionalRequest( + profile_image=open(str(JPG), "rb"), + ) + ) + # Third time with both id and profileImage + await client.form_data.optional_parts( + models.MultiPartOptionalRequest( + id="123", + profile_image=open(str(JPG), "rb"), + ) + ) + + +@pytest.mark.asyncio +async def test_file_upload_file_specific_content_type(client: MultiPartClient): + await client.form_data.file.upload_file_specific_content_type( + models.UploadFileSpecificContentTypeRequest( + file=("image.png", open(str(PNG), "rb"), "image/png"), + ) + ) + + +@pytest.mark.asyncio +async def test_file_upload_file_required_filename(client: MultiPartClient): + await client.form_data.file.upload_file_required_filename( + models.UploadFileRequiredFilenameRequest( + file=("image.png", open(str(PNG), "rb"), "image/png"), + ) + ) + + +@pytest.mark.asyncio +async def test_file_upload_file_array(client: MultiPartClient): + await client.form_data.file.upload_file_array( + models.UploadFileArrayRequest( + files=[ + ("image.png", open(str(PNG), "rb"), "image/png"), + ("image.png", open(str(PNG), "rb"), "image/png"), + ], + ) + ) diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_resiliency_srv_driven_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_resiliency_srv_driven_async.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_resiliency_srv_driven_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_resiliency_srv_driven_async.py diff --git a/packages/http-client-python/tests/mock_api/azure/asynctests/test_serialization_encoded_name_json_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_serialization_encoded_name_json_async.py new file mode 100644 index 00000000000..76594bbce59 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_serialization_encoded_name_json_async.py @@ -0,0 +1,25 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +import pytest_asyncio +from serialization.encodedname.json.aio import JsonClient +from serialization.encodedname.json import models + + +@pytest_asyncio.fixture +async def client(): + async with JsonClient() as client: + yield client + + +@pytest.mark.asyncio +async def test_property_send(client: JsonClient): + await client.property.send(models.JsonEncodedNameModel(default_name=True)) + + +@pytest.mark.asyncio +async def test_property_get(client: JsonClient): + assert (await client.property.get()).default_name diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_service_multi_service_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_service_multi_service_async.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/asynctests/test_service_multi_service_async.py rename to packages/http-client-python/tests/mock_api/azure/asynctests/test_service_multi_service_async.py diff --git a/packages/http-client-python/tests/mock_api/azure/asynctests/test_service_multiple_services_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_service_multiple_services_async.py new file mode 100644 index 00000000000..4121e327976 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_service_multiple_services_async.py @@ -0,0 +1,44 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +from azure.core.exceptions import HttpResponseError +from service.multipleservices.aio import ServiceAClient, ServiceBClient +from service.multipleservices.models import VersionsB + + +@pytest.fixture +def service_b_client(): + """Fixture that creates a ServiceBClient for testing.""" + return ServiceBClient(endpoint="http://localhost:3000") + + +@pytest.mark.asyncio +async def test_service_multiple_services_both_clients_exist(): + """Verify that multiple services without explicit @client create separate root clients.""" + async with ServiceAClient(endpoint="http://localhost:3000") as a_client: + assert a_client is not None + async with ServiceBClient(endpoint="http://localhost:3000") as b_client: + assert b_client is not None + + +@pytest.mark.asyncio +async def test_service_multiple_services_operation_b(service_b_client): + async with service_b_client: + async with ServiceBClient(endpoint="http://localhost:3000", api_version=VersionsB.BV1) as wrong_client: + with pytest.raises(HttpResponseError): + await wrong_client.operations.op_b() + + await service_b_client.operations.op_b() + + +@pytest.mark.asyncio +async def test_service_multiple_services_sub_namespace_operation_b(service_b_client): + async with service_b_client: + async with ServiceBClient(endpoint="http://localhost:3000", api_version=VersionsB.BV1) as wrong_client: + with pytest.raises(HttpResponseError): + await wrong_client.sub_namespace.sub_op_b() + + await service_b_client.sub_namespace.sub_op_b() diff --git a/packages/http-client-python/tests/mock_api/azure/asynctests/test_special_words_async.py b/packages/http-client-python/tests/mock_api/azure/asynctests/test_special_words_async.py new file mode 100644 index 00000000000..8c59ea05070 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/azure/asynctests/test_special_words_async.py @@ -0,0 +1,72 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +import pytest_asyncio +from specialwords.aio import SpecialWordsClient +from specialwords import models + + +@pytest_asyncio.fixture +async def client(): + async with SpecialWordsClient() as client: + yield client + + +@pytest.mark.asyncio +async def test_operations(client: SpecialWordsClient, special_words): + for sw in special_words: + suffix = "" if sw == "constructor" else "_method" + await getattr(client.operations, sw + suffix)() + + +@pytest.mark.asyncio +async def test_parameter(client: SpecialWordsClient, special_words): + for sw in special_words: + suffix = "" if sw == "constructor" else "_parameter" + await getattr(client.parameters, "with_" + sw)(**{sw + suffix: "ok"}) + await client.parameters.with_cancellation_token(cancellation_token="ok") + + +@pytest.mark.asyncio +async def test_model(client: SpecialWordsClient, special_words): + for sw in special_words: + suffix = "" if sw == "constructor" else "Model" + model = getattr(models, sw.capitalize() + suffix) + await getattr(client.models, "with_" + sw)(model(name="ok")) + + +@pytest.mark.asyncio +async def test_model_properties(client: SpecialWordsClient): + await client.model_properties.same_as_model(models.SameAsModel(same_as_model="ok")) + + +@pytest.mark.asyncio +async def test_model_properties_dict_methods(client: SpecialWordsClient): + await client.model_properties.dict_methods( + body=models.DictMethods( + keys_property="ok", + items_property="ok", + values_property="ok", + popitem_property="ok", + clear_property="ok", + update_property="ok", + setdefault_property="ok", + pop_property="ok", + get_property="ok", + copy_property="ok", + ) + ) + + +@pytest.mark.asyncio +async def test_model_properties_with_list(client: SpecialWordsClient): + await client.model_properties.with_list(models.ModelWithList(list="ok")) + + +@pytest.mark.asyncio +async def test_extensible_strings(client: SpecialWordsClient): + for enum_value in models.ExtensibleString: + assert enum_value == await client.extensible_strings.put_extensible_string_value(body=enum_value) diff --git a/packages/http-client-python/tests/mock_api/azure/conftest.py b/packages/http-client-python/tests/mock_api/azure/conftest.py new file mode 100644 index 00000000000..29824951ef4 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/azure/conftest.py @@ -0,0 +1,211 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import os +import subprocess +import signal +import pytest +import re +from typing import Literal +from pathlib import Path + +FILE_FOLDER = Path(__file__).parent + + +def start_server_process(): + azure_http_path = Path(os.path.dirname(__file__)) / Path("../../../node_modules/@azure-tools/azure-http-specs") + http_path = Path(os.path.dirname(__file__)) / Path("../../../node_modules/@typespec/http-specs") + os.chdir(azure_http_path.resolve()) + cmd = f"npx tsp-spector serve ./specs {(http_path / 'specs').resolve()}" + if os.name == "nt": + return subprocess.Popen(cmd, shell=True) + return subprocess.Popen(cmd, shell=True, preexec_fn=os.setsid) + + +def terminate_server_process(process): + try: + if os.name == "nt": + process.kill() + else: + os.killpg(os.getpgid(process.pid), signal.SIGTERM) # Send the signal to all the process groups + except ProcessLookupError: + # Process already terminated, which is fine + pass + + +@pytest.fixture(scope="session", autouse=True) +def testserver(): + """Start spector ranch mock api tests""" + server = start_server_process() + yield + terminate_server_process(server) + + +_VALID_UUID = re.compile(r"^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$") +_VALID_RFC7231 = re.compile( + r"^(Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s\d{2}\s" + r"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s\d{4}\s\d{2}:\d{2}:\d{2}\sGMT$" +) + + +def validate_format(value: str, format: Literal["uuid", "rfc7231"]): + if format == "uuid": + assert _VALID_UUID.match(value) + elif format == "rfc7231": + assert _VALID_RFC7231.match(value) + else: + raise ValueError("Unknown format") + + +@pytest.fixture +def check_repeatability_header(): + def func(request): + validate_format(request.http_request.headers["Repeatability-Request-ID"], "uuid") + validate_format(request.http_request.headers["Repeatability-First-Sent"], "rfc7231") + + return func + + +@pytest.fixture +def check_client_request_id_header(): + def func(request, header: str, checked: dict): + validate_format(request.http_request.headers[header], "uuid") + checked[header] = request.http_request.headers[header] + + return func + + +# ================== after azure-core fix, the following code can be removed (begin) ================== +import urllib.parse +from azure.core.rest import HttpRequest + + +def update_api_version_of_status_link(status_link: str): + request_params = {} + parsed_status_link = urllib.parse.urlparse(status_link) + request_params = { + key.lower(): [urllib.parse.quote(v) for v in value] + for key, value in urllib.parse.parse_qs(parsed_status_link.query).items() + } + request_params["api-version"] = "2022-12-01-preview" + status_link = urllib.parse.urljoin(status_link, parsed_status_link.path) + return status_link, request_params + + +@pytest.fixture +def polling_method(): + from azure.core.polling.base_polling import LROBasePolling + + class TempLroBasePolling(LROBasePolling): + + def request_status(self, status_link: str): + if self._path_format_arguments: + status_link = self._client.format_url(status_link, **self._path_format_arguments) + status_link, request_params = update_api_version_of_status_link(status_link) + if "request_id" not in self._operation_config: + self._operation_config["request_id"] = self._get_request_id() + + rest_request = HttpRequest("GET", status_link, params=request_params) + return self._client.send_request(rest_request, _return_pipeline_response=True, **self._operation_config) + + return TempLroBasePolling(0) + + +@pytest.fixture +def async_polling_method(): + from azure.core.polling.async_base_polling import AsyncLROBasePolling + + class AsyncTempLroBasePolling(AsyncLROBasePolling): + + async def request_status(self, status_link: str): + if self._path_format_arguments: + status_link = self._client.format_url(status_link, **self._path_format_arguments) + status_link, request_params = update_api_version_of_status_link(status_link) + # Re-inject 'x-ms-client-request-id' while polling + if "request_id" not in self._operation_config: + self._operation_config["request_id"] = self._get_request_id() + + rest_request = HttpRequest("GET", status_link, params=request_params) + return await self._client.send_request( + rest_request, _return_pipeline_response=True, **self._operation_config + ) + + return AsyncTempLroBasePolling(0) + + +# ================== after azure-core fix, the up code can be removed (end) ================== + + +@pytest.fixture() +def credential(): + """I actually don't need anything, since the authentication policy + will bypass it. + """ + + class FakeCredential: + pass + + return FakeCredential() + + +@pytest.fixture() +def authentication_policy(): + from azure.core.pipeline.policies import SansIOHTTPPolicy + + return SansIOHTTPPolicy() + + +SPECIAL_WORDS = [ + "and", + "as", + "assert", + "async", + "await", + "break", + "class", + "constructor", + "continue", + "def", + "del", + "elif", + "else", + "except", + "exec", + "finally", + "for", + "from", + "global", + "if", + "import", + "in", + "is", + "lambda", + "not", + "or", + "pass", + "raise", + "return", + "try", + "while", + "with", + "yield", +] + + +@pytest.fixture +def special_words() -> list[str]: + return SPECIAL_WORDS + + +@pytest.fixture +def png_data() -> bytes: + with open(str(FILE_FOLDER / "data/image.png"), "rb") as file_in: + return file_in.read() + + +@pytest.fixture +def jpg_data() -> bytes: + with open(str(FILE_FOLDER / "data/image.jpg"), "rb") as file_in: + return file_in.read() diff --git a/packages/http-client-python/generator/test/data/image.jpg b/packages/http-client-python/tests/mock_api/azure/data/image.jpg similarity index 100% rename from packages/http-client-python/generator/test/data/image.jpg rename to packages/http-client-python/tests/mock_api/azure/data/image.jpg diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/data/image.png b/packages/http-client-python/tests/mock_api/azure/data/image.png similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/data/image.png rename to packages/http-client-python/tests/mock_api/azure/data/image.png diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_arm_commonproperties.py b/packages/http-client-python/tests/mock_api/azure/test_azure_arm_commonproperties.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_arm_commonproperties.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_arm_commonproperties.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_arm_largeheader.py b/packages/http-client-python/tests/mock_api/azure/test_azure_arm_largeheader.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_arm_largeheader.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_arm_largeheader.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_arm_nonresource.py b/packages/http-client-python/tests/mock_api/azure/test_azure_arm_nonresource.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_arm_nonresource.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_arm_nonresource.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_arm_operationtemplates.py b/packages/http-client-python/tests/mock_api/azure/test_azure_arm_operationtemplates.py similarity index 95% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_arm_operationtemplates.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_arm_operationtemplates.py index 9895d78d8cb..c86c95ef4a9 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_arm_operationtemplates.py +++ b/packages/http-client-python/tests/mock_api/azure/test_azure_arm_operationtemplates.py @@ -156,6 +156,15 @@ def test_optional_body_provider_post_with_body(client): assert result.status == "Changed to requested allowance" +def test_lro_begin_export_array(client): + result = client.lro.begin_export_array( + body=models.ExportRequest(format="csv"), + ).result() + assert len(result) == 2 + assert result[0].content == "order1,product1,1" + assert result[1].content == "order2,product2,2" + + def test_lro_paging_begin_post_paging_lro(client): result = client.lro_paging.begin_post_paging_lro( resource_group_name=RESOURCE_GROUP_NAME, diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_arm_resource.py b/packages/http-client-python/tests/mock_api/azure/test_azure_arm_resource.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_arm_resource.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_arm_resource.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_access.py b/packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_access.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_access.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_access.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_api_version_header.py b/packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_api_version_header.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_api_version_header.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_api_version_header.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_api_version_path.py b/packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_api_version_path.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_api_version_path.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_api_version_path.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_api_version_query.py b/packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_api_version_query.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_api_version_query.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_api_version_query.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_client_default_value.py b/packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_client_default_value.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_client_default_value.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_client_default_value.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_client_initialization.py b/packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_client_initialization.py similarity index 90% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_client_initialization.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_client_initialization.py index 569a765af43..602332210f5 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_client_initialization.py +++ b/packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_client_initialization.py @@ -3,15 +3,14 @@ # Licensed under the MIT License. See License.txt in the project root for # license information. # -------------------------------------------------------------------------- -from specs.azure.clientgenerator.core.clientinitialization import ( +from specs.azure.clientgenerator.core.clientinitialization.default import ( HeaderParamClient, MultipleParamsClient, MixedParamsClient, PathParamClient, ParamAliasClient, - ParentClient, ) -from specs.azure.clientgenerator.core.clientinitialization.models import Input +from specs.azure.clientgenerator.core.clientinitialization.default.models import Input def test_header_param_client(): diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_client_location.py b/packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_client_location.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_client_location.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_client_location.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_deserialize_empty_string_as_null.py b/packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_deserialize_empty_string_as_null.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_deserialize_empty_string_as_null.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_deserialize_empty_string_as_null.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_flatten.py b/packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_flatten.py similarity index 79% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_flatten.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_flatten.py index b1492f524ad..30745aae253 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_flatten.py +++ b/packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_flatten.py @@ -6,10 +6,13 @@ import pytest from specs.azure.clientgenerator.core.flattenproperty import FlattenPropertyClient from specs.azure.clientgenerator.core.flattenproperty.models import ( - FlattenModel, + ChildFlattenModel, ChildModel, + FlattenModel, + FlattenUnknownModel, NestedFlattenModel, - ChildFlattenModel, + Solution, + SolutionProperties, ) @@ -41,6 +44,23 @@ def test_put_nested_flatten_model(client: FlattenPropertyClient): ) +def test_put_flatten_unknown_model(client: FlattenPropertyClient): + result = client.put_flatten_unknown_model(FlattenUnknownModel(name="foo")) + assert result.name == "test" + assert result.properties == {"key1": "value1", "key2": "value2"} + + +def test_put_flatten_read_only_model(client: FlattenPropertyClient): + result = client.put_flatten_read_only_model(Solution(name="foo")) + assert result == Solution( + name="foo", + properties=SolutionProperties(solution_id="solution1", title="Solution Title", content="Solution Content"), + ) + assert result.solution_id == "solution1" + assert result.title == "Solution Title" + assert result.content == "Solution Content" + + # ============test for compatibility ============ def test_dpg_model_common(): flatten_model = FlattenModel(name="hello", properties=ChildModel(age=0, description="test")) diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_hierrarchy_building.py b/packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_hierrarchy_building.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_hierrarchy_building.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_hierrarchy_building.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_next_link_verb.py b/packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_next_link_verb.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_next_link_verb.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_next_link_verb.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_override.py b/packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_override.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_override.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_override.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_usage.py b/packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_usage.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_client_generator_core_usage.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_client_generator_core_usage.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_core_basic.py b/packages/http-client-python/tests/mock_api/azure/test_azure_core_basic.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_core_basic.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_core_basic.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_core_lro_rpc.py b/packages/http-client-python/tests/mock_api/azure/test_azure_core_lro_rpc.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_core_lro_rpc.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_core_lro_rpc.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_core_lro_standard.py b/packages/http-client-python/tests/mock_api/azure/test_azure_core_lro_standard.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_core_lro_standard.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_core_lro_standard.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_core_model.py b/packages/http-client-python/tests/mock_api/azure/test_azure_core_model.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_core_model.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_core_model.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_core_page.py b/packages/http-client-python/tests/mock_api/azure/test_azure_core_page.py similarity index 83% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_core_page.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_core_page.py index d64db94486c..b5837623bea 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_core_page.py +++ b/packages/http-client-python/tests/mock_api/azure/test_azure_core_page.py @@ -58,3 +58,14 @@ def test_list_with_parameterized_next_link(client: PageClient): assert result[0].name == "User1" assert result[1].id == 2 assert result[1].name == "User2" + + +def test_list_with_relative_next_link(client: PageClient): + result = list(client.with_relative_next_link()) + assert len(result) == 2 + assert result[0].id == 1 + assert result[0].name == "User1" + assert result[0].etag == "11bdc430-65e8-45ad-81d9-8ffa60d55b59" + assert result[1].id == 2 + assert result[1].name == "User2" + assert result[1].etag == "11bdc430-65e8-45ad-81d9-8ffa60d55b59" diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_core_scalar.py b/packages/http-client-python/tests/mock_api/azure/test_azure_core_scalar.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_core_scalar.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_core_scalar.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_core_traits.py b/packages/http-client-python/tests/mock_api/azure/test_azure_core_traits.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_core_traits.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_core_traits.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_encode_duration.py b/packages/http-client-python/tests/mock_api/azure/test_azure_encode_duration.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_encode_duration.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_encode_duration.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_example_basic.py b/packages/http-client-python/tests/mock_api/azure/test_azure_example_basic.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_example_basic.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_example_basic.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_payload_pageable.py b/packages/http-client-python/tests/mock_api/azure/test_azure_payload_pageable.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_payload_pageable.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_payload_pageable.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_resource_manager_method_subscription_id.py b/packages/http-client-python/tests/mock_api/azure/test_azure_resource_manager_method_subscription_id.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_resource_manager_method_subscription_id.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_resource_manager_method_subscription_id.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_resource_manager_multi_service.py b/packages/http-client-python/tests/mock_api/azure/test_azure_resource_manager_multi_service.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_resource_manager_multi_service.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_resource_manager_multi_service.py diff --git a/packages/http-client-python/tests/mock_api/azure/test_azure_resource_manager_multi_service_shared_models.py b/packages/http-client-python/tests/mock_api/azure/test_azure_resource_manager_multi_service_shared_models.py new file mode 100644 index 00000000000..0e3f67ebc10 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/azure/test_azure_resource_manager_multi_service_shared_models.py @@ -0,0 +1,128 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +from azure.resourcemanager.multiservicesharedmodels.combined import CombinedClient +from azure.resourcemanager.multiservicesharedmodels.combined.models import ( + VirtualMachine, + VirtualMachineProperties, + StorageAccount, + StorageAccountProperties, + SharedMetadata, +) + + +@pytest.fixture +def client(credential, authentication_policy): + """Create a Combined client for testing.""" + return CombinedClient( + credential=credential, + subscription_id="00000000-0000-0000-0000-000000000000", + base_url="http://localhost:3000", + authentication_policy=authentication_policy, + polling_interval=0.1, + ) + + +def test_virtual_machines_get(client): + """Test getting a virtual machine with shared metadata.""" + resource_group_name = "test-rg" + vm_name = "vm-shared1" + + result = client.virtual_machines.get(resource_group_name=resource_group_name, vm_name=vm_name) + + assert result is not None + assert isinstance(result, VirtualMachine) + assert result.name == vm_name + assert result.location == "eastus" + assert result.type == "Microsoft.Compute/virtualMachinesShared" + assert result.properties is not None + assert result.properties.provisioning_state == "Succeeded" + assert result.properties.metadata is not None + assert result.properties.metadata.created_by == "user@example.com" + assert result.properties.metadata.tags == {"environment": "production"} + + +def test_virtual_machines_create_or_update(client): + """Test creating or updating a virtual machine with shared metadata.""" + resource_group_name = "test-rg" + vm_name = "vm-shared1" + + vm_resource = VirtualMachine( + location="eastus", + properties=VirtualMachineProperties( + metadata=SharedMetadata( + created_by="user@example.com", + tags={"environment": "production"}, + ), + ), + ) + + poller = client.virtual_machines.begin_create_or_update( + resource_group_name=resource_group_name, + vm_name=vm_name, + resource=vm_resource, + ) + + result = poller.result() + assert result is not None + assert isinstance(result, VirtualMachine) + assert result.location == "eastus" + assert result.properties is not None + assert result.properties.provisioning_state == "Succeeded" + assert result.properties.metadata is not None + assert result.properties.metadata.created_by == "user@example.com" + assert result.properties.metadata.tags == {"environment": "production"} + + +def test_storage_accounts_get(client): + """Test getting a storage account with shared metadata.""" + resource_group_name = "test-rg" + account_name = "account1" + + result = client.storage_accounts.get(resource_group_name=resource_group_name, account_name=account_name) + + assert result is not None + assert isinstance(result, StorageAccount) + assert result.name == account_name + assert result.location == "westus" + assert result.type == "Microsoft.Storage/storageAccounts" + assert result.properties is not None + assert result.properties.provisioning_state == "Succeeded" + assert result.properties.metadata is not None + assert result.properties.metadata.created_by == "admin@example.com" + assert result.properties.metadata.tags == {"department": "engineering"} + + +def test_storage_accounts_create_or_update(client): + """Test creating or updating a storage account with shared metadata.""" + resource_group_name = "test-rg" + account_name = "account1" + + storage_resource = StorageAccount( + location="westus", + properties=StorageAccountProperties( + metadata=SharedMetadata( + created_by="admin@example.com", + tags={"department": "engineering"}, + ), + ), + ) + + poller = client.storage_accounts.begin_create_or_update( + resource_group_name=resource_group_name, + account_name=account_name, + resource=storage_resource, + ) + + result = poller.result() + assert result is not None + assert isinstance(result, StorageAccount) + assert result.location == "westus" + assert result.properties is not None + assert result.properties.provisioning_state == "Succeeded" + assert result.properties.metadata is not None + assert result.properties.metadata.created_by == "admin@example.com" + assert result.properties.metadata.tags == {"department": "engineering"} diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_special_headers_client_request_id.py b/packages/http-client-python/tests/mock_api/azure/test_azure_special_headers_client_request_id.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_special_headers_client_request_id.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_special_headers_client_request_id.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_versioning_previewversion.py b/packages/http-client-python/tests/mock_api/azure/test_azure_versioning_previewversion.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_azure_versioning_previewversion.py rename to packages/http-client-python/tests/mock_api/azure/test_azure_versioning_previewversion.py diff --git a/packages/http-client-python/tests/mock_api/azure/test_clear_output_folder.py b/packages/http-client-python/tests/mock_api/azure/test_clear_output_folder.py new file mode 100644 index 00000000000..00125fde0d3 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/azure/test_clear_output_folder.py @@ -0,0 +1,23 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +from pathlib import Path + +GENERATED_PATH = Path(__file__).parent.parent.parent.resolve() / "generated" / "azure" + + +def test_clear_output_folder(): + folder = GENERATED_PATH / "authentication-api-key/authentication/apikey/_operations" + assert folder.exists(), "Operations folder should exist" + assert not (folder / "to_be_deleted.py").exists(), "File to_be_deleted.py should be deleted after regeneration" + + if (GENERATED_PATH / "generation-subdir").exists(): + assert (GENERATED_PATH / "generation-subdir/generated_tests").exists() + assert not (GENERATED_PATH / "generation-subdir/generated_tests/to_be_deleted.py").exists() + + assert (GENERATED_PATH / "generation-subdir/generation/subdir/_generated").exists() + assert not (GENERATED_PATH / "generation-subdir/generation/subdir/_generated/to_be_deleted.py").exists() + + assert (GENERATED_PATH / "generation-subdir/generation/subdir/to_be_kept.py").exists() diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_client_namespace.py b/packages/http-client-python/tests/mock_api/azure/test_client_namespace.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_client_namespace.py rename to packages/http-client-python/tests/mock_api/azure/test_client_namespace.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_client_naming.py b/packages/http-client-python/tests/mock_api/azure/test_client_naming.py similarity index 78% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_client_naming.py rename to packages/http-client-python/tests/mock_api/azure/test_client_naming.py index b0d12844958..94ef8c2d3bb 100644 --- a/packages/http-client-python/generator/test/azure/mock_api_tests/test_client_naming.py +++ b/packages/http-client-python/tests/mock_api/azure/test_client_naming.py @@ -14,15 +14,15 @@ def client(): def test_client(client: NamingClient): - client.client(models.ClientNameModel(client_name=True)) + client.property.client(models.ClientNameModel(client_name=True)) def test_language(client: NamingClient): - client.language(models.LanguageClientNameModel(python_name=True)) + client.property.language(models.LanguageClientNameModel(python_name=True)) def test_compatible_with_encoded_name(client: NamingClient): - client.compatible_with_encoded_name(models.ClientNameAndJsonEncodedNameModel(client_name=True)) + client.property.compatible_with_encoded_name(models.ClientNameAndJsonEncodedNameModel(client_name=True)) def test_operation(client: NamingClient): @@ -34,11 +34,11 @@ def test_parameter(client: NamingClient): def test_header_request(client: NamingClient): - client.request(client_name="true") + client.header.request(client_name="true") def test_header_response(client: NamingClient): - assert client.response(cls=lambda x, y, z: z)["default-name"] == "true" + assert client.header.response(cls=lambda x, y, z: z)["default-name"] == "true" def test_model_client(client: NamingClient): diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_client_naming_enum_conflict.py b/packages/http-client-python/tests/mock_api/azure/test_client_naming_enum_conflict.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_client_naming_enum_conflict.py rename to packages/http-client-python/tests/mock_api/azure/test_client_naming_enum_conflict.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_client_overload.py b/packages/http-client-python/tests/mock_api/azure/test_client_overload.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_client_overload.py rename to packages/http-client-python/tests/mock_api/azure/test_client_overload.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_client_structure.py b/packages/http-client-python/tests/mock_api/azure/test_client_structure.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_client_structure.py rename to packages/http-client-python/tests/mock_api/azure/test_client_structure.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_client_structure_clientoperationgroup.py b/packages/http-client-python/tests/mock_api/azure/test_client_structure_clientoperationgroup.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_client_structure_clientoperationgroup.py rename to packages/http-client-python/tests/mock_api/azure/test_client_structure_clientoperationgroup.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_encode_duration.py b/packages/http-client-python/tests/mock_api/azure/test_encode_duration.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_encode_duration.py rename to packages/http-client-python/tests/mock_api/azure/test_encode_duration.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_encode_numeric.py b/packages/http-client-python/tests/mock_api/azure/test_encode_numeric.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_encode_numeric.py rename to packages/http-client-python/tests/mock_api/azure/test_encode_numeric.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_model_base_flatten_compatibility.py b/packages/http-client-python/tests/mock_api/azure/test_model_base_flatten_compatibility.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_model_base_flatten_compatibility.py rename to packages/http-client-python/tests/mock_api/azure/test_model_base_flatten_compatibility.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_parameters_basic.py b/packages/http-client-python/tests/mock_api/azure/test_parameters_basic.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_parameters_basic.py rename to packages/http-client-python/tests/mock_api/azure/test_parameters_basic.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_parameters_spread.py b/packages/http-client-python/tests/mock_api/azure/test_parameters_spread.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_parameters_spread.py rename to packages/http-client-python/tests/mock_api/azure/test_parameters_spread.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_payload_content_negotiation.py b/packages/http-client-python/tests/mock_api/azure/test_payload_content_negotiation.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_payload_content_negotiation.py rename to packages/http-client-python/tests/mock_api/azure/test_payload_content_negotiation.py diff --git a/packages/http-client-python/tests/mock_api/azure/test_payload_multipart.py b/packages/http-client-python/tests/mock_api/azure/test_payload_multipart.py new file mode 100644 index 00000000000..d99780920f3 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/azure/test_payload_multipart.py @@ -0,0 +1,198 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +from pathlib import Path +import pytest +from payload.multipart import MultiPartClient, models + +JPG = Path(__file__).parent / "data/image.jpg" +PNG = Path(__file__).parent / "data/image.png" + + +@pytest.fixture +def client(): + with MultiPartClient(endpoint="http://localhost:3000") as client: + yield client + + +def test_anonymous_model(client: MultiPartClient): + client.form_data.anonymous_model({"profileImage": open(str(JPG), "rb")}) + + +def test_basic(client: MultiPartClient): + client.form_data.basic( + models.MultiPartRequest( + id="123", + profile_image=open(str(JPG), "rb"), + ) + ) + + +def test_binary_array_parts(client: MultiPartClient): + client.form_data.binary_array_parts( + models.BinaryArrayPartsRequest( + id="123", + pictures=[ + open(str(PNG), "rb"), + open(str(PNG), "rb"), + ], + ) + ) + + +def test_check_file_name_and_content_type(client: MultiPartClient): + client.form_data.check_file_name_and_content_type( + models.MultiPartRequest( + id="123", + profile_image=("hello.jpg", open(str(JPG), "rb"), "image/jpg"), + ) + ) + + +def test_complex(client: MultiPartClient): + client.form_data.file_array_and_basic( + models.ComplexPartsRequest( + id="123", + address=models.Address(city="X"), + pictures=[ + open(str(PNG), "rb"), + open(str(PNG), "rb"), + ], + profile_image=open(str(JPG), "rb"), + ) + ) + + +def test_json_part(client: MultiPartClient): + client.form_data.json_part( + models.JsonPartRequest( + address=models.Address(city="X"), + profile_image=open(str(JPG), "rb"), + ) + ) + + +def test_multi_binary_parts(client: MultiPartClient): + client.form_data.multi_binary_parts( + models.MultiBinaryPartsRequest( + profile_image=open(str(JPG), "rb"), + picture=open(str(PNG), "rb"), + ) + ) + client.form_data.multi_binary_parts( + models.MultiBinaryPartsRequest( + profile_image=open(str(JPG), "rb"), + ) + ) + + +def test_file_with_http_part_specific_content_type(client: MultiPartClient): + client.form_data.http_parts.content_type.image_jpeg_content_type( + models.FileWithHttpPartSpecificContentTypeRequest( + profile_image=("hello.jpg", open(str(JPG), "rb"), "image/jpg"), + ) + ) + + +def test_file_with_http_part_required_content_type(client: MultiPartClient): + client.form_data.http_parts.content_type.required_content_type( + models.FileWithHttpPartRequiredContentTypeRequest( + profile_image=open(str(JPG), "rb"), + ) + ) + + +def test_file_with_http_part_optional_content_type(client: MultiPartClient): + # call twice: one with content type, one without + client.form_data.http_parts.content_type.optional_content_type( + models.FileWithHttpPartOptionalContentTypeRequest( + profile_image=("hello.jpg", open(str(JPG), "rb").read()), + ) + ) + client.form_data.http_parts.content_type.optional_content_type( + models.FileWithHttpPartOptionalContentTypeRequest( + profile_image=("hello.jpg", open(str(JPG), "rb").read(), "application/octet-stream"), + ) + ) + + +def test_complex_with_http_part(client: MultiPartClient): + client.form_data.http_parts.json_array_and_file_array( + models.ComplexHttpPartsModelRequest( + id="123", + previous_addresses=[ + models.Address(city="Y"), + models.Address(city="Z"), + ], + address=models.Address(city="X"), + pictures=[ + open(str(PNG), "rb"), + open(str(PNG), "rb"), + ], + profile_image=open(str(JPG), "rb"), + ) + ) + + +def test_http_parts_non_string_float(client: MultiPartClient): + client.form_data.http_parts.non_string.float(models.FloatRequest(temperature=0.5)) + + +def test_with_wire_name(client: MultiPartClient): + client.form_data.with_wire_name( + models.MultiPartRequestWithWireName( + identifier="123", + image=open(str(JPG), "rb"), + ) + ) + + +def test_optional_parts(client: MultiPartClient): + # First time with only id + client.form_data.optional_parts( + models.MultiPartOptionalRequest( + id="123", + ) + ) + # Second time with only profileImage + client.form_data.optional_parts( + models.MultiPartOptionalRequest( + profile_image=open(str(JPG), "rb"), + ) + ) + # Third time with both id and profileImage + client.form_data.optional_parts( + models.MultiPartOptionalRequest( + id="123", + profile_image=open(str(JPG), "rb"), + ) + ) + + +def test_file_upload_file_specific_content_type(client: MultiPartClient): + client.form_data.file.upload_file_specific_content_type( + models.UploadFileSpecificContentTypeRequest( + file=("image.png", open(str(PNG), "rb"), "image/png"), + ) + ) + + +def test_file_upload_file_required_filename(client: MultiPartClient): + client.form_data.file.upload_file_required_filename( + models.UploadFileRequiredFilenameRequest( + file=("image.png", open(str(PNG), "rb"), "image/png"), + ) + ) + + +def test_file_upload_file_array(client: MultiPartClient): + client.form_data.file.upload_file_array( + models.UploadFileArrayRequest( + files=[ + ("image.png", open(str(PNG), "rb"), "image/png"), + ("image.png", open(str(PNG), "rb"), "image/png"), + ], + ) + ) diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_resiliency_srv_driven.py b/packages/http-client-python/tests/mock_api/azure/test_resiliency_srv_driven.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_resiliency_srv_driven.py rename to packages/http-client-python/tests/mock_api/azure/test_resiliency_srv_driven.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_serialization_encoded_name_json.py b/packages/http-client-python/tests/mock_api/azure/test_serialization_encoded_name_json.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_serialization_encoded_name_json.py rename to packages/http-client-python/tests/mock_api/azure/test_serialization_encoded_name_json.py diff --git a/packages/http-client-python/generator/test/azure/mock_api_tests/test_service_multi_service.py b/packages/http-client-python/tests/mock_api/azure/test_service_multi_service.py similarity index 100% rename from packages/http-client-python/generator/test/azure/mock_api_tests/test_service_multi_service.py rename to packages/http-client-python/tests/mock_api/azure/test_service_multi_service.py diff --git a/packages/http-client-python/tests/mock_api/azure/test_service_multiple_services.py b/packages/http-client-python/tests/mock_api/azure/test_service_multiple_services.py new file mode 100644 index 00000000000..0ce6df2cff5 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/azure/test_service_multiple_services.py @@ -0,0 +1,40 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +from azure.core.exceptions import HttpResponseError +from service.multipleservices import ServiceAClient, ServiceBClient +from service.multipleservices.models import VersionsB + + +@pytest.fixture +def service_b_client(): + """Fixture that creates a ServiceBClient for testing.""" + with ServiceBClient(endpoint="http://localhost:3000") as client: + yield client + + +def test_service_multiple_services_both_clients_exist(): + """Verify that multiple services without explicit @client create separate root clients.""" + with ServiceAClient(endpoint="http://localhost:3000") as a_client: + assert a_client is not None + with ServiceBClient(endpoint="http://localhost:3000") as b_client: + assert b_client is not None + + +def test_service_multiple_services_operation_b(service_b_client): + with ServiceBClient(endpoint="http://localhost:3000", api_version=VersionsB.BV1) as wrong_client: + with pytest.raises(HttpResponseError): + wrong_client.operations.op_b() + + service_b_client.operations.op_b() + + +def test_service_multiple_services_sub_namespace_operation_b(service_b_client): + with ServiceBClient(endpoint="http://localhost:3000", api_version=VersionsB.BV1) as wrong_client: + with pytest.raises(HttpResponseError): + wrong_client.sub_namespace.sub_op_b() + + service_b_client.sub_namespace.sub_op_b() diff --git a/packages/http-client-python/tests/mock_api/azure/test_special_words.py b/packages/http-client-python/tests/mock_api/azure/test_special_words.py new file mode 100644 index 00000000000..ab23b59409f --- /dev/null +++ b/packages/http-client-python/tests/mock_api/azure/test_special_words.py @@ -0,0 +1,63 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +from specialwords import SpecialWordsClient, models + + +@pytest.fixture +def client(): + with SpecialWordsClient() as client: + yield client + + +def test_operations(client: SpecialWordsClient, special_words): + for sw in special_words: + suffix = "" if sw == "constructor" else "_method" + getattr(client.operations, sw + suffix)() + + +def test_parameter(client: SpecialWordsClient, special_words): + for sw in special_words: + suffix = "" if sw == "constructor" else "_parameter" + getattr(client.parameters, "with_" + sw)(**{sw + suffix: "ok"}) + client.parameters.with_cancellation_token(cancellation_token="ok") + + +def test_model(client: SpecialWordsClient, special_words): + for sw in special_words: + suffix = "" if sw == "constructor" else "Model" + model = getattr(models, sw.capitalize() + suffix) + getattr(client.models, "with_" + sw)(model(name="ok")) + + +def test_model_properties(client: SpecialWordsClient): + client.model_properties.same_as_model(models.SameAsModel(same_as_model="ok")) + + +def test_model_properties_dict_methods(client: SpecialWordsClient): + client.model_properties.dict_methods( + body=models.DictMethods( + keys_property="ok", + items_property="ok", + values_property="ok", + popitem_property="ok", + clear_property="ok", + update_property="ok", + setdefault_property="ok", + pop_property="ok", + get_property="ok", + copy_property="ok", + ) + ) + + +def test_model_properties_with_list(client: SpecialWordsClient): + client.model_properties.with_list(models.ModelWithList(list="ok")) + + +def test_extensible_strings(client: SpecialWordsClient): + for enum_value in models.ExtensibleString: + assert enum_value == client.extensible_strings.put_extensible_string_value(body=enum_value) diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_authentication_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_authentication_async.py similarity index 88% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_authentication_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_authentication_async.py index 357eed73603..4be9d3a7310 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_authentication_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_authentication_async.py @@ -4,17 +4,18 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from authentication.apikey.aio import ApiKeyClient from authentication.http.custom.aio import CustomClient from authentication.oauth2.aio import OAuth2Client from authentication.union.aio import UnionClient from setuppy.authentication.union.aio import UnionClient as SetuppyUnionClient - +from authentication.noauth.union.aio import UnionClient as NoauthUnionClient # Utilities functions -@pytest.fixture +@pytest_asyncio.fixture async def api_key_client(key_credential): client = None @@ -41,7 +42,7 @@ async def get_token_info(*scopes, **kwargs): return FakeCredential() -@pytest.fixture +@pytest_asyncio.fixture async def oauth2_client(token_credential): client = None @@ -54,7 +55,7 @@ def _build_client(client_type): await client.close() -@pytest.fixture +@pytest_asyncio.fixture async def http_custom_client(key_credential): client = None @@ -113,6 +114,18 @@ async def test_union_tokenvalid(oauth2_client, union_client_type): await client.valid_token(enforce_https=False) +@pytest.mark.asyncio +async def test_noauth_union_valid_no_auth(): + client = NoauthUnionClient() + await client.valid_no_auth() + + +@pytest.mark.asyncio +async def test_noauth_union_valid_token(oauth2_client): + client = oauth2_client(NoauthUnionClient) + await client.valid_token(enforce_https=False) + + @pytest.mark.asyncio async def test_http_custom_valid(http_custom_client): client = http_custom_client() diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_encode_array_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_encode_array_async.py similarity index 99% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_encode_array_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_encode_array_async.py index 925780cd4aa..3ec7a56529c 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_encode_array_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_encode_array_async.py @@ -5,11 +5,12 @@ # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from encode.array.aio import ArrayClient from encode.array import models -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with ArrayClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_encode_bytes_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_encode_bytes_async.py similarity index 95% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_encode_bytes_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_encode_bytes_async.py index 93f8f62c68d..5c57cb4281c 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_encode_bytes_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_encode_bytes_async.py @@ -4,6 +4,7 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from pathlib import Path from encode.bytes.aio import BytesClient from encode.bytes.models import ( @@ -13,11 +14,10 @@ Base64urlArrayBytesProperty, ) - FILE_FOLDER = Path(__file__).parent.parent -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with BytesClient() as client: yield client @@ -98,6 +98,12 @@ async def test_header(client: BytesClient): ) +@pytest.fixture +def png_data() -> bytes: + with open(str(FILE_FOLDER / "data/image.png"), "rb") as file_in: + return file_in.read() + + @pytest.mark.asyncio async def test_request_body(client: BytesClient, png_data: bytes): await client.request_body.default( diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_encode_datetime_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_encode_datetime_async.py similarity index 99% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_encode_datetime_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_encode_datetime_async.py index 1249b8e8f30..bd5b590a098 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_encode_datetime_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_encode_datetime_async.py @@ -6,6 +6,7 @@ import datetime import pytest +import pytest_asyncio from encode.datetime.aio import DatetimeClient from encode.datetime.models import ( DefaultDatetimeProperty, @@ -16,7 +17,7 @@ ) -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with DatetimeClient() as client: yield client diff --git a/packages/http-client-python/tests/mock_api/shared/asynctests/test_generation_subdir2_for_generated_code_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_generation_subdir2_for_generated_code_async.py new file mode 100644 index 00000000000..f7fa5f9d08f --- /dev/null +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_generation_subdir2_for_generated_code_async.py @@ -0,0 +1,37 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +import pytest_asyncio +from generation.subdir2._generated.aio import AddedClient +from generation.subdir2._generated.models import ModelV1, ModelV2, EnumV1, EnumV2 + + +@pytest_asyncio.fixture +async def client(): + async with AddedClient(endpoint="http://localhost:3000", version="v2") as client: + yield client + + +@pytest.mark.asyncio +async def test_v1(client: AddedClient): + assert await client.v1( + ModelV1(prop="foo", enum_prop=EnumV1.ENUM_MEMBER_V2, union_prop=10), + header_v2="bar", + ) == ModelV1(prop="foo", enum_prop=EnumV1.ENUM_MEMBER_V2, union_prop=10) + + +@pytest.mark.asyncio +async def test_v2(client: AddedClient): + assert await client.v2(ModelV2(prop="foo", enum_prop=EnumV2.ENUM_MEMBER, union_prop="bar")) == ModelV2( + prop="foo", enum_prop=EnumV2.ENUM_MEMBER, union_prop="bar" + ) + + +@pytest.mark.asyncio +async def test_interface_v2(client: AddedClient): + assert await client.interface_v2.v2_in_interface( + ModelV2(prop="foo", enum_prop=EnumV2.ENUM_MEMBER, union_prop="bar") + ) == ModelV2(prop="foo", enum_prop=EnumV2.ENUM_MEMBER, union_prop="bar") diff --git a/packages/http-client-python/tests/mock_api/shared/asynctests/test_generation_subdir_for_generated_code_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_generation_subdir_for_generated_code_async.py new file mode 100644 index 00000000000..4fd9e7496ee --- /dev/null +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_generation_subdir_for_generated_code_async.py @@ -0,0 +1,25 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +import pytest_asyncio +from generation.subdir._generated.aio import RecursiveClient +from generation.subdir._generated.models import Extension + + +@pytest_asyncio.fixture +async def client(): + async with RecursiveClient() as client: + yield client + + +@pytest.mark.asyncio +async def test_custom_method(client: RecursiveClient): + assert await client.get() == Extension( + { + "level": 0, + "extension": [{"level": 1, "extension": [{"level": 2}]}, {"level": 1}], + } + ) diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_headasboolean_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_headasboolean_async.py similarity index 94% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_headasboolean_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_headasboolean_async.py index c0f69198712..d2c2f10da02 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_headasboolean_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_headasboolean_async.py @@ -4,6 +4,7 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from headasbooleantrue.aio import VisibilityClient as HeadAsBooleanTrueClient from headasbooleantrue import models as models_true @@ -11,13 +12,13 @@ from headasbooleanfalse import models as models_false -@pytest.fixture +@pytest_asyncio.fixture async def client_true(): async with HeadAsBooleanTrueClient() as client: yield client -@pytest.fixture +@pytest_asyncio.fixture async def client_false(): async with HeadAsBooleanFalseClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_parameters_body_optionality_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_parameters_body_optionality_async.py similarity index 95% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_parameters_body_optionality_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_parameters_body_optionality_async.py index 7c6bbe82c8d..47bc79fd47c 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_parameters_body_optionality_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_parameters_body_optionality_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from parameters.bodyoptionality.aio import BodyOptionalityClient from parameters.bodyoptionality.models import BodyModel -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with BodyOptionalityClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_parameters_collection_format_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_parameters_collection_format_async.py similarity index 96% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_parameters_collection_format_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_parameters_collection_format_async.py index c3ae9698079..6ed93c4651e 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_parameters_collection_format_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_parameters_collection_format_async.py @@ -4,10 +4,11 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from parameters.collectionformat.aio import CollectionFormatClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with CollectionFormatClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_parameters_path_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_parameters_path_async.py similarity index 93% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_parameters_path_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_parameters_path_async.py index eeef36a301a..aee4b150059 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_parameters_path_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_parameters_path_async.py @@ -4,10 +4,11 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from parameters.path.aio import PathClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with PathClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_parameters_query_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_parameters_query_async.py similarity index 92% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_parameters_query_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_parameters_query_async.py index d5879ebdc2a..70fb18603d2 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_parameters_query_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_parameters_query_async.py @@ -4,10 +4,11 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from parameters.query.aio import QueryClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with QueryClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_payload_json_merge_patch_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_payload_json_merge_patch_async.py similarity index 98% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_payload_json_merge_patch_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_payload_json_merge_patch_async.py index e276944be33..54709bed058 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_payload_json_merge_patch_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_payload_json_merge_patch_async.py @@ -4,6 +4,7 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from payload.jsonmergepatch.aio import JsonMergePatchClient from payload.jsonmergepatch.models import InnerModel, Resource, ResourcePatch @@ -13,7 +14,7 @@ from corehttp.serialization import NULL -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with JsonMergePatchClient(endpoint="http://localhost:3000") as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_payload_media_type_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_payload_media_type_async.py similarity index 95% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_payload_media_type_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_payload_media_type_async.py index d783e6ac61c..551d71bc425 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_payload_media_type_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_payload_media_type_async.py @@ -4,10 +4,11 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from payload.mediatype.aio import MediaTypeClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with MediaTypeClient(endpoint="http://localhost:3000") as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_payload_pageable_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_payload_pageable_async.py similarity index 81% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_payload_pageable_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_payload_pageable_async.py index 45c5d12de49..900caa49edf 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_payload_pageable_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_payload_pageable_async.py @@ -4,10 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from payload.pageable.aio import PageableClient +from payload.pageable.serverdrivenpagination.alternateinitialverb.models import Filter -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with PageableClient(endpoint="http://localhost:3000") as client: yield client @@ -115,8 +117,19 @@ async def test_list_without_continuation(client: PageableClient): assert_result(result) -# after https://github.com/microsoft/typespec/pull/9455 released, we could enable this test again -# @pytest.mark.asyncio -# async def test_xml_pagination_list_with_next_link(client: PageableClient): -# result = [p async for p in client.xml_pagination.list_with_next_link()] -# assert_result(result) +@pytest.mark.asyncio +async def test_xml_pagination_list_with_continuation(client: PageableClient): + result = [p async for p in client.xml_pagination.list_with_continuation()] + assert_result(result) + + +@pytest.mark.asyncio +async def test_xml_pagination_list_with_next_link(client: PageableClient): + result = [p async for p in client.xml_pagination.list_with_next_link()] + assert_result(result) + + +@pytest.mark.asyncio +async def test_alternate_initial_verb_post(client: PageableClient): + result = [p async for p in client.server_driven_pagination.alternate_initial_verb.post(Filter(filter="foo eq bar"))] + assert_result(result) diff --git a/packages/http-client-python/tests/mock_api/shared/asynctests/test_payload_xml_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_payload_xml_async.py new file mode 100644 index 00000000000..8ae1cc69adf --- /dev/null +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_payload_xml_async.py @@ -0,0 +1,261 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import datetime +import pytest +import pytest_asyncio +from payload.xml.aio import XmlClient +from payload.xml.models import ( + Author, + Book, + SimpleModel, + ModelWithSimpleArrays, + ModelWithArrayOfModel, + ModelWithAttributes, + ModelWithUnwrappedArray, + ModelWithUnwrappedModelArray, + ModelWithRenamedArrays, + ModelWithRenamedProperty, + ModelWithRenamedAttribute, + ModelWithRenamedNestedModel, + ModelWithRenamedWrappedModelArray, + ModelWithRenamedUnwrappedModelArray, + ModelWithRenamedWrappedAndItemModelArray, + ModelWithOptionalField, + ModelWithRenamedFields, + ModelWithEmptyArray, + ModelWithText, + ModelWithDictionary, + ModelWithEncodedNames, + ModelWithEnum, + ModelWithDatetime, + ModelWithNamespace, + ModelWithNamespaceOnProperties, + ModelWithNestedModel, + ModelWithWrappedPrimitiveCustomItemNames, +) + + +@pytest_asyncio.fixture +async def client(): + async with XmlClient(endpoint="http://localhost:3000") as client: + yield client + + +@pytest.mark.asyncio +async def test_simple_model(client: XmlClient): + model = SimpleModel(name="foo", age=123) + assert await client.simple_model_value.get() == model + await client.simple_model_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_renamed_property(client: XmlClient): + model = ModelWithRenamedProperty(title="foo", author="bar") + assert await client.model_with_renamed_property_value.get() == model + await client.model_with_renamed_property_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_simple_arrays(client: XmlClient): + model = ModelWithSimpleArrays(colors=["red", "green", "blue"], counts=[1, 2]) + assert await client.model_with_simple_arrays_value.get() == model + await client.model_with_simple_arrays_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_wrapped_primitive_custom_item_names(client: XmlClient): + model = ModelWithWrappedPrimitiveCustomItemNames(tags=["fiction", "classic"]) + assert await client.model_with_wrapped_primitive_custom_item_names_value.get() == model + await client.model_with_wrapped_primitive_custom_item_names_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_array_of_model(client: XmlClient): + model = ModelWithArrayOfModel( + items_property=[ + SimpleModel(name="foo", age=123), + SimpleModel(name="bar", age=456), + ] + ) + assert await client.model_with_array_of_model_value.get() == model + await client.model_with_array_of_model_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_unwrapped_model_array(client: XmlClient): + model = ModelWithUnwrappedModelArray( + items_property=[ + SimpleModel(name="foo", age=123), + SimpleModel(name="bar", age=456), + ] + ) + assert await client.model_with_unwrapped_model_array_value.get() == model + await client.model_with_unwrapped_model_array_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_renamed_wrapped_model_array(client: XmlClient): + model = ModelWithRenamedWrappedModelArray( + items_property=[ + SimpleModel(name="foo", age=123), + SimpleModel(name="bar", age=456), + ] + ) + assert await client.model_with_renamed_wrapped_model_array_value.get() == model + await client.model_with_renamed_wrapped_model_array_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_renamed_unwrapped_model_array(client: XmlClient): + model = ModelWithRenamedUnwrappedModelArray( + items_property=[ + SimpleModel(name="foo", age=123), + SimpleModel(name="bar", age=456), + ] + ) + assert await client.model_with_renamed_unwrapped_model_array_value.get() == model + await client.model_with_renamed_unwrapped_model_array_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_renamed_wrapped_and_item_model_array(client: XmlClient): + model = ModelWithRenamedWrappedAndItemModelArray( + books=[ + Book(title="The Great Gatsby"), + Book(title="Les Miserables"), + ] + ) + assert await client.model_with_renamed_wrapped_and_item_model_array_value.get() == model + await client.model_with_renamed_wrapped_and_item_model_array_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_attributes(client: XmlClient): + model = ModelWithAttributes(id1=123, id2="foo", enabled=True) + assert await client.model_with_attributes_value.get() == model + await client.model_with_attributes_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_renamed_attribute(client: XmlClient): + model = ModelWithRenamedAttribute(id=123, title="The Great Gatsby", author="F. Scott Fitzgerald") + assert await client.model_with_renamed_attribute_value.get() == model + await client.model_with_renamed_attribute_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_unwrapped_array(client: XmlClient): + model = ModelWithUnwrappedArray(colors=["red", "green", "blue"], counts=[1, 2]) + assert await client.model_with_unwrapped_array_value.get() == model + await client.model_with_unwrapped_array_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_renamed_arrays(client: XmlClient): + model = ModelWithRenamedArrays(colors=["red", "green", "blue"], counts=[1, 2]) + assert await client.model_with_renamed_arrays_value.get() == model + await client.model_with_renamed_arrays_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_optional_field(client: XmlClient): + model = ModelWithOptionalField(item="widget") + assert await client.model_with_optional_field_value.get() == model + await client.model_with_optional_field_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_nested_model(client: XmlClient): + model = ModelWithNestedModel(nested=SimpleModel(name="foo", age=123)) + assert await client.model_with_nested_model_value.get() == model + await client.model_with_nested_model_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_renamed_nested_model(client: XmlClient): + model = ModelWithRenamedNestedModel(author=Author(name="foo")) + assert await client.model_with_renamed_nested_model_value.get() == model + await client.model_with_renamed_nested_model_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_renamed_fields(client: XmlClient): + model = ModelWithRenamedFields( + input_data=SimpleModel(name="foo", age=123), + output_data=SimpleModel(name="bar", age=456), + ) + assert await client.model_with_renamed_fields_value.get() == model + await client.model_with_renamed_fields_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_empty_array(client: XmlClient): + model = ModelWithEmptyArray(items_property=[]) + assert await client.model_with_empty_array_value.get() == model + await client.model_with_empty_array_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_text(client: XmlClient): + model = ModelWithText(language="foo", content="\n This is some text.\n") + assert await client.model_with_text_value.get() == model + await client.model_with_text_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_dictionary(client: XmlClient): + model = ModelWithDictionary(metadata={"Color": "blue", "Count": "123", "Enabled": "false"}) + assert await client.model_with_dictionary_value.get() == model + await client.model_with_dictionary_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_encoded_names(client: XmlClient): + model = ModelWithEncodedNames(model_data=SimpleModel(name="foo", age=123), colors=["red", "green", "blue"]) + assert await client.model_with_encoded_names_value.get() == model + await client.model_with_encoded_names_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_enum(client: XmlClient): + model = ModelWithEnum(status="success") + assert await client.model_with_enum_value.get() == model + await client.model_with_enum_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_datetime(client: XmlClient): + model = ModelWithDatetime( + rfc3339=datetime.datetime(2022, 8, 26, 18, 38, 0, tzinfo=datetime.timezone.utc), + rfc7231=datetime.datetime(2022, 8, 26, 14, 38, 0, tzinfo=datetime.timezone.utc), + ) + result = await client.model_with_datetime_value.get() + assert result.rfc3339 == model.rfc3339 + assert result.rfc7231 == model.rfc7231 + await client.model_with_datetime_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_namespace(client: XmlClient): + model = ModelWithNamespace(id=123, title="The Great Gatsby") + assert await client.model_with_namespace_value.get() == model + await client.model_with_namespace_value.put(model) + + +@pytest.mark.asyncio +async def test_model_with_namespace_on_properties(client: XmlClient): + model = ModelWithNamespaceOnProperties(id=123, title="The Great Gatsby", author="F. Scott Fitzgerald") + assert await client.model_with_namespace_on_properties_value.get() == model + await client.model_with_namespace_on_properties_value.put(model) + + +@pytest.mark.asyncio +async def test_xml_error_value(client: XmlClient, core_library): + with pytest.raises(core_library.exceptions.HttpResponseError) as ex: + await client.xml_error_value.get() + assert ex.value.status_code == 400 + assert ex.value.model.message == "Something went wrong" + assert ex.value.model.code == 400 diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_response_status_code_range_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_response_status_code_range_async.py similarity index 96% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_response_status_code_range_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_response_status_code_range_async.py index 3d6faa0c1f1..0dd34b667cf 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_response_status_code_range_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_response_status_code_range_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from response.statuscoderange.aio import StatusCodeRangeClient from response.statuscoderange.models import ErrorInRange, NotFoundError -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with StatusCodeRangeClient(endpoint="http://localhost:3000") as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_routes_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_routes_async.py similarity index 99% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_routes_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_routes_async.py index 277e57be3a6..d3e34bc1f93 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_routes_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_routes_async.py @@ -4,10 +4,11 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from routes.aio import RoutesClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with RoutesClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_server_endpoint_not_defined_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_server_endpoint_not_defined_async.py similarity index 93% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_server_endpoint_not_defined_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_server_endpoint_not_defined_async.py index 148e61dd5ca..a14997b71c5 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_server_endpoint_not_defined_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_server_endpoint_not_defined_async.py @@ -4,10 +4,11 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from server.endpoint.notdefined.aio import NotDefinedClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with NotDefinedClient(endpoint="http://localhost:3000") as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_server_path_multiple_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_server_path_multiple_async.py similarity index 94% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_server_path_multiple_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_server_path_multiple_async.py index bcdc53dd4f4..50bc53b5e3b 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_server_path_multiple_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_server_path_multiple_async.py @@ -4,10 +4,11 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from server.path.multiple.aio import MultipleClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with MultipleClient(endpoint="http://localhost:3000") as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_server_path_single_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_server_path_single_async.py similarity index 92% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_server_path_single_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_server_path_single_async.py index d6ebe479f8b..efcb703028a 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_server_path_single_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_server_path_single_async.py @@ -4,10 +4,11 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from server.path.single.aio import SingleClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with SingleClient(endpoint="http://localhost:3000") as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_server_versions_not_versioned_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_server_versions_not_versioned_async.py similarity index 95% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_server_versions_not_versioned_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_server_versions_not_versioned_async.py index 738364b6e4f..14f7e4239db 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_server_versions_not_versioned_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_server_versions_not_versioned_async.py @@ -4,10 +4,11 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from server.versions.notversioned.aio import NotVersionedClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with NotVersionedClient(endpoint="http://localhost:3000") as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_server_versions_versioned_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_server_versions_versioned_async.py similarity index 96% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_server_versions_versioned_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_server_versions_versioned_async.py index 53e7d194f42..8f96a2f5508 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_server_versions_versioned_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_server_versions_versioned_async.py @@ -4,10 +4,11 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from server.versions.versioned.aio import VersionedClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with VersionedClient(endpoint="http://localhost:3000") as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_special_headers_conditional_request_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_special_headers_conditional_request_async.py similarity index 96% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_special_headers_conditional_request_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_special_headers_conditional_request_async.py index e65b9d4e330..dc86ac0635e 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_special_headers_conditional_request_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_special_headers_conditional_request_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio import datetime from specialheaders.conditionalrequest.aio import ConditionalRequestClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with ConditionalRequestClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_special_headers_repeatability_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_special_headers_repeatability_async.py similarity index 93% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_special_headers_repeatability_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_special_headers_repeatability_async.py index dbf74414e12..941890ea230 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_special_headers_repeatability_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_special_headers_repeatability_async.py @@ -4,10 +4,11 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specialheaders.repeatability.aio import RepeatabilityClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with RepeatabilityClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_specs_documentation_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_specs_documentation_async.py similarity index 97% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_specs_documentation_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_specs_documentation_async.py index 12e4cb2e5a2..dff527765ce 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_specs_documentation_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_specs_documentation_async.py @@ -5,11 +5,12 @@ # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from specs.documentation.aio import DocumentationClient from specs.documentation import models -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with DocumentationClient(endpoint="http://localhost:3000") as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_streaming_jsonl_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_streaming_jsonl_async.py similarity index 94% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_streaming_jsonl_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_streaming_jsonl_async.py index 803215abd99..74e05cebd14 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_streaming_jsonl_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_streaming_jsonl_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from streaming.jsonl.aio import JsonlClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with JsonlClient(endpoint="http://localhost:3000") as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_array_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_array_async.py similarity index 98% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_array_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_array_async.py index 180887ea765..66c3b24c1f4 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_array_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_array_async.py @@ -5,12 +5,13 @@ # -------------------------------------------------------------------------- import pytest +import pytest_asyncio import isodate from typetest.array.aio import ArrayClient from typetest.array import models -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with ArrayClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_dictionary_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_dictionary_async.py similarity index 98% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_dictionary_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_dictionary_async.py index 364868b2357..76a57a1ba95 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_dictionary_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_dictionary_async.py @@ -4,12 +4,13 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from typetest.dictionary import models from typetest.dictionary.aio import DictionaryClient import isodate -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with DictionaryClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_enum_extensible_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_enum_extensible_async.py similarity index 94% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_enum_extensible_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_enum_extensible_async.py index 75fca822ddb..aedc6e6a92c 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_enum_extensible_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_enum_extensible_async.py @@ -4,10 +4,11 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from typetest.enum.extensible import models, aio -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with aio.ExtensibleClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_enum_fixed_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_enum_fixed_async.py similarity index 95% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_enum_fixed_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_enum_fixed_async.py index de17f194b6d..5b6822fcfd2 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_enum_fixed_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_enum_fixed_async.py @@ -4,10 +4,11 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from typetest.enum.fixed import aio, models -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with aio.FixedClient() as client: yield client diff --git a/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_file_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_file_async.py new file mode 100644 index 00000000000..6fa9132a6b3 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_file_async.py @@ -0,0 +1,59 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +# after we support Http.File case, enable these tests again + + +# import json + +# import pytest +# from typetest.file.aio import FileClient + + +# @pytest.fixture +# async def client(): +# async with FileClient(endpoint="http://localhost:3000") as client: +# yield client + + +# @pytest.mark.asyncio +# async def test_upload_file_specific_content_type(client: FileClient, png_data: bytes): +# await client.body.upload_file_specific_content_type(png_data) + + +# # Do not support this case for now +# # @pytest.mark.asyncio +# # async def test_upload_file_json_content_type(client: FileClient): +# # await client.body.upload_file_json_content_type(json.dumps({"message": "test file content"}).encode()) + + +# # although result is expected but actually there is deserialization issue +# # @pytest.mark.asyncio +# # async def test_download_file_json_content_type(client: FileClient): +# # result = await client.body.download_file_json_content_type() +# # assert result == {"message": "test file content"} + + +# @pytest.mark.asyncio +# async def test_download_file_specific_content_type(client: FileClient, png_data: bytes): +# result = b"".join([d async for d in (await client.body.download_file_specific_content_type())]) +# assert result == png_data + + +# @pytest.mark.asyncio +# async def test_download_file_multiple_content_types(client: FileClient, png_data: bytes): +# result = b"".join([d async for d in (await client.body.download_file_multiple_content_types())]) +# assert result == png_data + + +# @pytest.mark.asyncio +# async def test_upload_file_default_content_type(client: FileClient, png_data: bytes): +# await client.body.upload_file_default_content_type(png_data, content_type="image/png") + + +# @pytest.mark.asyncio +# async def test_download_file_default_content_type(client: FileClient, png_data: bytes): +# result = b"".join([d async for d in (await client.body.download_file_default_content_type())]) +# assert result == png_data diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_empty_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_empty_async.py similarity index 95% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_empty_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_empty_async.py index b5518c5e901..030d3bd84fc 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_empty_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_empty_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from typetest.model.empty.aio import EmptyClient from typetest.model.empty.models import EmptyInput, EmptyOutput, EmptyInputOutput -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with EmptyClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_inheritance_enum_discriminator_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_inheritance_enum_discriminator_async.py similarity index 98% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_inheritance_enum_discriminator_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_inheritance_enum_discriminator_async.py index 0a72d5465e3..dc176b3fd9b 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_inheritance_enum_discriminator_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_inheritance_enum_discriminator_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from typetest.model.enumdiscriminator.aio import EnumDiscriminatorClient from typetest.model.enumdiscriminator import models -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with EnumDiscriminatorClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_inheritance_nested_discriminator_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_inheritance_nested_discriminator_async.py similarity index 96% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_inheritance_nested_discriminator_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_inheritance_nested_discriminator_async.py index c641f25eb88..f6e57f5affa 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_inheritance_nested_discriminator_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_inheritance_nested_discriminator_async.py @@ -4,17 +4,18 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from typetest.model.nesteddiscriminator.aio import NestedDiscriminatorClient from typetest.model.nesteddiscriminator.models import GoblinShark, Salmon, Fish -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with NestedDiscriminatorClient() as client: yield client -@pytest.fixture +@pytest_asyncio.fixture async def valid_body(): return GoblinShark(age=1) @@ -30,7 +31,7 @@ async def test_put_model(client, valid_body): await client.put_model(valid_body) -@pytest.fixture +@pytest_asyncio.fixture async def valid_recursive_body(): return Salmon( { diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_inheritance_not_discriminated_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_inheritance_not_discriminated_async.py similarity index 93% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_inheritance_not_discriminated_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_inheritance_not_discriminated_async.py index 7e7ce096956..5ed075e3d50 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_inheritance_not_discriminated_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_inheritance_not_discriminated_async.py @@ -4,17 +4,18 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from typetest.model.notdiscriminated.aio import NotDiscriminatedClient from typetest.model.notdiscriminated.models import Siamese -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with NotDiscriminatedClient() as client: yield client -@pytest.fixture +@pytest_asyncio.fixture async def valid_body(): return Siamese(name="abc", age=32, smart=True) diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_inheritance_recursive_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_inheritance_recursive_async.py similarity index 93% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_inheritance_recursive_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_inheritance_recursive_async.py index aea6f1bb9e3..3056c2c40a5 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_inheritance_recursive_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_inheritance_recursive_async.py @@ -4,17 +4,18 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from typetest.model.recursive.aio import RecursiveClient from typetest.model.recursive.models import Extension -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with RecursiveClient() as client: yield client -@pytest.fixture +@pytest_asyncio.fixture async def expected(): return Extension( { diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_inheritance_single_discriminator_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_inheritance_single_discriminator_async.py similarity index 95% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_inheritance_single_discriminator_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_inheritance_single_discriminator_async.py index dc98cd81c9b..e6ddd9c44fc 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_inheritance_single_discriminator_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_inheritance_single_discriminator_async.py @@ -4,17 +4,18 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from typetest.model.singlediscriminator.aio import SingleDiscriminatorClient from typetest.model.singlediscriminator.models import Sparrow, Eagle, Bird, Dinosaur -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with SingleDiscriminatorClient() as client: yield client -@pytest.fixture +@pytest_asyncio.fixture async def valid_body(): return Sparrow(wingspan=1) @@ -29,7 +30,7 @@ async def test_put_model(client, valid_body): await client.put_model(valid_body) -@pytest.fixture +@pytest_asyncio.fixture async def recursive_body(): return Eagle( { diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_usage_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_usage_async.py similarity index 95% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_usage_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_usage_async.py index bcebeaec205..a7e00354034 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_usage_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_usage_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from typetest.model.usage import models from typetest.model.usage.aio import UsageClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with UsageClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_visibility_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_visibility_async.py similarity index 96% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_visibility_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_visibility_async.py index 27fb23df8aa..62827695819 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_model_visibility_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_model_visibility_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from typetest.model.visibility.aio import VisibilityClient from typetest.model.visibility import models -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with VisibilityClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_property_additionalproperties_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_property_additionalproperties_async.py similarity index 95% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_property_additionalproperties_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_property_additionalproperties_async.py index 2109ea31791..3bded493a06 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_property_additionalproperties_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_property_additionalproperties_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from typetest.property.additionalproperties import models from typetest.property.additionalproperties.aio import AdditionalPropertiesClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with AdditionalPropertiesClient() as client: yield client @@ -262,22 +263,6 @@ async def test_spread_model_array(client: AdditionalPropertiesClient): await client.spread_model_array.put(body) -@pytest.mark.skip(reason="https://github.com/microsoft/typespec/pull/6425") -@pytest.mark.asyncio -async def test_spread_record_discriminated_union(client: AdditionalPropertiesClient): - body = { - "name": "abc", - "prop1": {"fooProp": "abc", "kind": "kind0"}, - "prop2": { - "end": "2021-01-02T00:00:00Z", - "kind": "kind1", - "start": "2021-01-01T00:00:00Z", - }, - } - assert await client.spread_record_discriminated_union.get() == body - await client.spread_record_discriminated_union.put(body) - - @pytest.mark.asyncio async def test_spread_record_non_discriminated_union( client: AdditionalPropertiesClient, diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_property_nullable_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_property_nullable_async.py similarity index 99% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_property_nullable_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_property_nullable_async.py index a5dc1322110..f54cafb464a 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_property_nullable_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_property_nullable_async.py @@ -6,6 +6,7 @@ # -------------------------------------------------------------------------- import json import pytest +import pytest_asyncio from typetest.property.nullable import models from typetest.property.nullable.aio import NullableClient from typetest.property.nullable._utils.model_base import ( # pylint: disable=protected-access @@ -18,7 +19,7 @@ from azure.core.serialization import NULL -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with NullableClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_property_optional_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_property_optional_async.py similarity index 99% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_property_optional_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_property_optional_async.py index e7ec09d0059..51d8bd362e9 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_property_optional_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_property_optional_async.py @@ -6,11 +6,12 @@ # -------------------------------------------------------------------------- from typing import Any import pytest +import pytest_asyncio from typetest.property.optional import models from typetest.property.optional.aio import OptionalClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with OptionalClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_property_valuetypes_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_property_valuetypes_async.py similarity index 99% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_property_valuetypes_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_property_valuetypes_async.py index 1b7566c5739..15a3e794e1e 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_property_valuetypes_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_property_valuetypes_async.py @@ -7,12 +7,13 @@ import decimal import pytest +import pytest_asyncio import datetime from typetest.property.valuetypes import models from typetest.property.valuetypes.aio import ValueTypesClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with ValueTypesClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_scalar_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_scalar_async.py similarity index 97% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_scalar_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_scalar_async.py index 3e2b308f8ba..674ee0e0d4d 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_scalar_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_scalar_async.py @@ -7,10 +7,11 @@ from functools import reduce import pytest +import pytest_asyncio from typetest.scalar.aio import ScalarClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with ScalarClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_union_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_union_async.py similarity index 98% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_union_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_union_async.py index 9e738701f4f..18b5e1aba91 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_typetest_union_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_typetest_union_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from typetest.union.aio import UnionClient from typetest.union import models -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with UnionClient() as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_versioning_added_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_versioning_added_async.py similarity index 96% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_versioning_added_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_versioning_added_async.py index 27e78a8892d..8906113b96f 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_versioning_added_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_versioning_added_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from versioning.added.aio import AddedClient from versioning.added.models import ModelV1, ModelV2, EnumV1, EnumV2 -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with AddedClient(endpoint="http://localhost:3000", version="v2") as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_versioning_made_optional_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_versioning_made_optional_async.py similarity index 94% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_versioning_made_optional_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_versioning_made_optional_async.py index 27ec811cae2..c126d401167 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_versioning_made_optional_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_versioning_made_optional_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from versioning.madeoptional.aio import MadeOptionalClient from versioning.madeoptional.models import TestModel -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with MadeOptionalClient(endpoint="http://localhost:3000", version="v2") as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_versioning_removed_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_versioning_removed_async.py similarity index 97% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_versioning_removed_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_versioning_removed_async.py index 5442c56e6c9..22dab517fdf 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_versioning_removed_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_versioning_removed_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from versioning.removed.aio import RemovedClient from versioning.removed.models import ModelV2, EnumV2, ModelV3, EnumV3 -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with RemovedClient(endpoint="http://localhost:3000", version="v2") as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_versioning_renamed_from_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_versioning_renamed_from_async.py similarity index 96% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_versioning_renamed_from_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_versioning_renamed_from_async.py index 46ef588f65d..1e738c21326 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_versioning_renamed_from_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_versioning_renamed_from_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from versioning.renamedfrom.aio import RenamedFromClient from versioning.renamedfrom.models import NewModel, NewEnum -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with RenamedFromClient(endpoint="http://localhost:3000", version="v2") as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_versioning_return_type_changed_from_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_versioning_return_type_changed_from_async.py similarity index 93% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_versioning_return_type_changed_from_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_versioning_return_type_changed_from_async.py index 80eefecbe22..e6234f69607 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_versioning_return_type_changed_from_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_versioning_return_type_changed_from_async.py @@ -4,10 +4,11 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from versioning.returntypechangedfrom.aio import ReturnTypeChangedFromClient -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with ReturnTypeChangedFromClient(endpoint="http://localhost:3000", version="v2") as client: yield client diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_versioning_type_changed_from_async.py b/packages/http-client-python/tests/mock_api/shared/asynctests/test_versioning_type_changed_from_async.py similarity index 94% rename from packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_versioning_type_changed_from_async.py rename to packages/http-client-python/tests/mock_api/shared/asynctests/test_versioning_type_changed_from_async.py index 2374bd1f550..6bf75a87be0 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_versioning_type_changed_from_async.py +++ b/packages/http-client-python/tests/mock_api/shared/asynctests/test_versioning_type_changed_from_async.py @@ -4,11 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest +import pytest_asyncio from versioning.typechangedfrom.aio import TypeChangedFromClient from versioning.typechangedfrom.models import TestModel -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with TypeChangedFromClient(endpoint="http://localhost:3000", version="v2") as client: yield client diff --git a/packages/http-client-python/tests/mock_api/shared/conftest.py b/packages/http-client-python/tests/mock_api/shared/conftest.py new file mode 100644 index 00000000000..727f986ae44 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/shared/conftest.py @@ -0,0 +1,79 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import os +import subprocess +import signal +import pytest +import importlib +from pathlib import Path + +DATA_FOLDER = Path(__file__).parent.parent + + +def start_server_process(): + azure_http_path = Path(os.path.dirname(__file__)) / Path("../../../node_modules/@azure-tools/azure-http-specs") + http_path = Path(os.path.dirname(__file__)) / Path("../../../node_modules/@typespec/http-specs") + if "unbranded" in Path(os.getcwd()).parts: + os.chdir(http_path.resolve()) + cmd = "npx tsp-spector serve ./specs" + else: + os.chdir(azure_http_path.resolve()) + cmd = f"npx tsp-spector serve ./specs {(http_path / 'specs').resolve()}" + if os.name == "nt": + return subprocess.Popen(cmd, shell=True) + return subprocess.Popen(cmd, shell=True, preexec_fn=os.setsid) + + +def terminate_server_process(process): + try: + if os.name == "nt": + process.kill() + else: + os.killpg(os.getpgid(process.pid), signal.SIGTERM) # Send the signal to all the process groups + except ProcessLookupError: + # Process already terminated, which is fine + pass + + +@pytest.fixture(scope="session", autouse=True) +def testserver(): + """Start spector mock api tests""" + server = start_server_process() + yield + terminate_server_process(server) + + +""" +Use to disambiguate the core library we use +""" + + +@pytest.fixture +def core_library(): + try: + return importlib.import_module("azure.core") + except ModuleNotFoundError: + return importlib.import_module("corehttp") + + +@pytest.fixture +def key_credential(core_library): + try: + return core_library.credentials.AzureKeyCredential + except AttributeError: + return core_library.credentials.ServiceKeyCredential + + +@pytest.fixture +def png_data() -> bytes: + with open(str(DATA_FOLDER / "data/image.png"), "rb") as file_in: + return file_in.read() + + +@pytest.fixture +def jpg_data() -> bytes: + with open(str(DATA_FOLDER / "data/image.jpg"), "rb") as file_in: + return file_in.read() diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/data/image.jpg b/packages/http-client-python/tests/mock_api/shared/data/image.jpg similarity index 100% rename from packages/http-client-python/generator/test/unbranded/mock_api_tests/data/image.jpg rename to packages/http-client-python/tests/mock_api/shared/data/image.jpg diff --git a/packages/http-client-python/generator/test/data/image.png b/packages/http-client-python/tests/mock_api/shared/data/image.png similarity index 100% rename from packages/http-client-python/generator/test/data/image.png rename to packages/http-client-python/tests/mock_api/shared/data/image.png diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_authentication.py b/packages/http-client-python/tests/mock_api/shared/test_authentication.py similarity index 91% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_authentication.py rename to packages/http-client-python/tests/mock_api/shared/test_authentication.py index f5ed841ecc2..aaa000a85c9 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/test_authentication.py +++ b/packages/http-client-python/tests/mock_api/shared/test_authentication.py @@ -8,9 +8,9 @@ from authentication.oauth2 import OAuth2Client from authentication.union import UnionClient from setuppy.authentication.union import UnionClient as SetuppyUnionClient +from authentication.noauth.union import UnionClient as NoauthUnionClient from authentication.http.custom import CustomClient - # Utilities functions @@ -107,6 +107,16 @@ def test_union_tokenvalid(oauth2_client, union_client_type): client.valid_token(enforce_https=False) +def test_noauth_union_valid_no_auth(): + client = NoauthUnionClient() + client.valid_no_auth() + + +def test_noauth_union_valid_token(oauth2_client): + client = oauth2_client(NoauthUnionClient) + client.valid_token(enforce_https=False) + + def test_http_custom_valid(http_custom_client): client = http_custom_client() client.valid() diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_encode_array.py b/packages/http-client-python/tests/mock_api/shared/test_encode_array.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_encode_array.py rename to packages/http-client-python/tests/mock_api/shared/test_encode_array.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_encode_bytes.py b/packages/http-client-python/tests/mock_api/shared/test_encode_bytes.py similarity index 95% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_encode_bytes.py rename to packages/http-client-python/tests/mock_api/shared/test_encode_bytes.py index 615d4f050e0..2ca75a22c31 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/test_encode_bytes.py +++ b/packages/http-client-python/tests/mock_api/shared/test_encode_bytes.py @@ -95,6 +95,12 @@ def test_header(client: BytesClient): ) +@pytest.fixture +def png_data() -> bytes: + with open(str(FILE_FOLDER / "data/image.png"), "rb") as file_in: + return file_in.read() + + def test_request_body(client: BytesClient, png_data: bytes): client.request_body.default( value=png_data, diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_encode_datetime.py b/packages/http-client-python/tests/mock_api/shared/test_encode_datetime.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_encode_datetime.py rename to packages/http-client-python/tests/mock_api/shared/test_encode_datetime.py diff --git a/packages/http-client-python/tests/mock_api/shared/test_generation_subdir2_for_generated_code.py b/packages/http-client-python/tests/mock_api/shared/test_generation_subdir2_for_generated_code.py new file mode 100644 index 00000000000..32bbfc784dd --- /dev/null +++ b/packages/http-client-python/tests/mock_api/shared/test_generation_subdir2_for_generated_code.py @@ -0,0 +1,33 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +from generation.subdir2._generated import AddedClient +from generation.subdir2._generated.models import ModelV1, ModelV2, EnumV1, EnumV2 + + +@pytest.fixture +def client(): + with AddedClient(endpoint="http://localhost:3000", version="v2") as client: + yield client + + +def test_v1(client: AddedClient): + assert client.v1( + ModelV1(prop="foo", enum_prop=EnumV1.ENUM_MEMBER_V2, union_prop=10), + header_v2="bar", + ) == ModelV1(prop="foo", enum_prop=EnumV1.ENUM_MEMBER_V2, union_prop=10) + + +def test_v2(client: AddedClient): + assert client.v2(ModelV2(prop="foo", enum_prop=EnumV2.ENUM_MEMBER, union_prop="bar")) == ModelV2( + prop="foo", enum_prop=EnumV2.ENUM_MEMBER, union_prop="bar" + ) + + +def test_interface_v2(client: AddedClient): + assert client.interface_v2.v2_in_interface( + ModelV2(prop="foo", enum_prop=EnumV2.ENUM_MEMBER, union_prop="bar") + ) == ModelV2(prop="foo", enum_prop=EnumV2.ENUM_MEMBER, union_prop="bar") \ No newline at end of file diff --git a/packages/http-client-python/tests/mock_api/shared/test_generation_subdir_for_generated_code.py b/packages/http-client-python/tests/mock_api/shared/test_generation_subdir_for_generated_code.py new file mode 100644 index 00000000000..3750a98f1a3 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/shared/test_generation_subdir_for_generated_code.py @@ -0,0 +1,17 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +from generation.subdir._generated import RecursiveClient +from generation.subdir._generated.models import Extension + + +def test_custom_method(): + client = RecursiveClient() + assert client.get() == Extension( + { + "level": 0, + "extension": [{"level": 1, "extension": [{"level": 2}]}, {"level": 1}], + } + ) \ No newline at end of file diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_headasboolean.py b/packages/http-client-python/tests/mock_api/shared/test_headasboolean.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_headasboolean.py rename to packages/http-client-python/tests/mock_api/shared/test_headasboolean.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_parameters_body_optionality.py b/packages/http-client-python/tests/mock_api/shared/test_parameters_body_optionality.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_parameters_body_optionality.py rename to packages/http-client-python/tests/mock_api/shared/test_parameters_body_optionality.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_parameters_collection_format.py b/packages/http-client-python/tests/mock_api/shared/test_parameters_collection_format.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_parameters_collection_format.py rename to packages/http-client-python/tests/mock_api/shared/test_parameters_collection_format.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_parameters_path.py b/packages/http-client-python/tests/mock_api/shared/test_parameters_path.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_parameters_path.py rename to packages/http-client-python/tests/mock_api/shared/test_parameters_path.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_parameters_query.py b/packages/http-client-python/tests/mock_api/shared/test_parameters_query.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_parameters_query.py rename to packages/http-client-python/tests/mock_api/shared/test_parameters_query.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_payload_json_merge_patch.py b/packages/http-client-python/tests/mock_api/shared/test_payload_json_merge_patch.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_payload_json_merge_patch.py rename to packages/http-client-python/tests/mock_api/shared/test_payload_json_merge_patch.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_payload_media_type.py b/packages/http-client-python/tests/mock_api/shared/test_payload_media_type.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_payload_media_type.py rename to packages/http-client-python/tests/mock_api/shared/test_payload_media_type.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_payload_pageable.py b/packages/http-client-python/tests/mock_api/shared/test_payload_pageable.py similarity index 81% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_payload_pageable.py rename to packages/http-client-python/tests/mock_api/shared/test_payload_pageable.py index 1302cb8b957..7aaf8e0ce31 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/test_payload_pageable.py +++ b/packages/http-client-python/tests/mock_api/shared/test_payload_pageable.py @@ -5,6 +5,7 @@ # -------------------------------------------------------------------------- import pytest from payload.pageable import PageableClient +from payload.pageable.serverdrivenpagination.alternateinitialverb.models import Filter @pytest.fixture @@ -83,7 +84,16 @@ def test_list_without_continuation(client: PageableClient): assert_result(result) -# # after https://github.com/microsoft/typespec/pull/9455 released, we could enable this test again -# def test_xml_pagination_list_with_next_link(client: PageableClient): -# result = list(client.xml_pagination.list_with_next_link()) -# assert_result(result) +def test_xml_pagination_list_with_continuation(client: PageableClient): + result = list(client.xml_pagination.list_with_continuation()) + assert_result(result) + + +def test_xml_pagination_list_with_next_link(client: PageableClient): + result = list(client.xml_pagination.list_with_next_link()) + assert_result(result) + + +def test_alternate_initial_verb_post(client: PageableClient): + result = list(client.server_driven_pagination.alternate_initial_verb.post(Filter(filter="foo eq bar"))) + assert_result(result) diff --git a/packages/http-client-python/tests/mock_api/shared/test_payload_xml.py b/packages/http-client-python/tests/mock_api/shared/test_payload_xml.py new file mode 100644 index 00000000000..e301ff0a1e5 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/shared/test_payload_xml.py @@ -0,0 +1,234 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import datetime +import pytest +from payload.xml import XmlClient +from payload.xml.models import ( + Author, + Book, + SimpleModel, + ModelWithSimpleArrays, + ModelWithArrayOfModel, + ModelWithAttributes, + ModelWithUnwrappedArray, + ModelWithUnwrappedModelArray, + ModelWithRenamedArrays, + ModelWithRenamedProperty, + ModelWithRenamedAttribute, + ModelWithRenamedNestedModel, + ModelWithRenamedWrappedModelArray, + ModelWithRenamedUnwrappedModelArray, + ModelWithRenamedWrappedAndItemModelArray, + ModelWithOptionalField, + ModelWithRenamedFields, + ModelWithEmptyArray, + ModelWithText, + ModelWithDictionary, + ModelWithEncodedNames, + ModelWithEnum, + ModelWithDatetime, + ModelWithNamespace, + ModelWithNamespaceOnProperties, + ModelWithNestedModel, + ModelWithWrappedPrimitiveCustomItemNames, +) + + +@pytest.fixture +def client(): + with XmlClient(endpoint="http://localhost:3000") as client: + yield client + + +def test_simple_model(client: XmlClient): + model = SimpleModel(name="foo", age=123) + assert client.simple_model_value.get() == model + client.simple_model_value.put(model) + + +def test_model_with_renamed_property(client: XmlClient): + model = ModelWithRenamedProperty(title="foo", author="bar") + assert client.model_with_renamed_property_value.get() == model + client.model_with_renamed_property_value.put(model) + + +def test_model_with_simple_arrays(client: XmlClient): + model = ModelWithSimpleArrays(colors=["red", "green", "blue"], counts=[1, 2]) + assert client.model_with_simple_arrays_value.get() == model + client.model_with_simple_arrays_value.put(model) + + +def test_model_with_wrapped_primitive_custom_item_names(client: XmlClient): + model = ModelWithWrappedPrimitiveCustomItemNames(tags=["fiction", "classic"]) + assert client.model_with_wrapped_primitive_custom_item_names_value.get() == model + client.model_with_wrapped_primitive_custom_item_names_value.put(model) + + +def test_model_with_array_of_model(client: XmlClient): + model = ModelWithArrayOfModel( + items_property=[ + SimpleModel(name="foo", age=123), + SimpleModel(name="bar", age=456), + ] + ) + assert client.model_with_array_of_model_value.get() == model + client.model_with_array_of_model_value.put(model) + + +def test_model_with_unwrapped_model_array(client: XmlClient): + model = ModelWithUnwrappedModelArray( + items_property=[ + SimpleModel(name="foo", age=123), + SimpleModel(name="bar", age=456), + ] + ) + assert client.model_with_unwrapped_model_array_value.get() == model + client.model_with_unwrapped_model_array_value.put(model) + + +def test_model_with_renamed_wrapped_model_array(client: XmlClient): + model = ModelWithRenamedWrappedModelArray( + items_property=[ + SimpleModel(name="foo", age=123), + SimpleModel(name="bar", age=456), + ] + ) + assert client.model_with_renamed_wrapped_model_array_value.get() == model + client.model_with_renamed_wrapped_model_array_value.put(model) + + +def test_model_with_renamed_unwrapped_model_array(client: XmlClient): + model = ModelWithRenamedUnwrappedModelArray( + items_property=[ + SimpleModel(name="foo", age=123), + SimpleModel(name="bar", age=456), + ] + ) + assert client.model_with_renamed_unwrapped_model_array_value.get() == model + client.model_with_renamed_unwrapped_model_array_value.put(model) + + +def test_model_with_renamed_wrapped_and_item_model_array(client: XmlClient): + model = ModelWithRenamedWrappedAndItemModelArray( + books=[ + Book(title="The Great Gatsby"), + Book(title="Les Miserables"), + ] + ) + assert client.model_with_renamed_wrapped_and_item_model_array_value.get() == model + client.model_with_renamed_wrapped_and_item_model_array_value.put(model) + + +def test_model_with_attributes(client: XmlClient): + model = ModelWithAttributes(id1=123, id2="foo", enabled=True) + assert client.model_with_attributes_value.get() == model + client.model_with_attributes_value.put(model) + + +def test_model_with_renamed_attribute(client: XmlClient): + model = ModelWithRenamedAttribute(id=123, title="The Great Gatsby", author="F. Scott Fitzgerald") + assert client.model_with_renamed_attribute_value.get() == model + client.model_with_renamed_attribute_value.put(model) + + +def test_model_with_unwrapped_array(client: XmlClient): + model = ModelWithUnwrappedArray(colors=["red", "green", "blue"], counts=[1, 2]) + assert client.model_with_unwrapped_array_value.get() == model + client.model_with_unwrapped_array_value.put(model) + + +def test_model_with_renamed_arrays(client: XmlClient): + model = ModelWithRenamedArrays(colors=["red", "green", "blue"], counts=[1, 2]) + assert client.model_with_renamed_arrays_value.get() == model + client.model_with_renamed_arrays_value.put(model) + + +def test_model_with_optional_field(client: XmlClient): + model = ModelWithOptionalField(item="widget") + assert client.model_with_optional_field_value.get() == model + client.model_with_optional_field_value.put(model) + + +def test_model_with_nested_model(client: XmlClient): + model = ModelWithNestedModel(nested=SimpleModel(name="foo", age=123)) + assert client.model_with_nested_model_value.get() == model + client.model_with_nested_model_value.put(model) + + +def test_model_with_renamed_nested_model(client: XmlClient): + model = ModelWithRenamedNestedModel(author=Author(name="foo")) + assert client.model_with_renamed_nested_model_value.get() == model + client.model_with_renamed_nested_model_value.put(model) + + +def test_model_with_renamed_fields(client: XmlClient): + model = ModelWithRenamedFields( + input_data=SimpleModel(name="foo", age=123), + output_data=SimpleModel(name="bar", age=456), + ) + assert client.model_with_renamed_fields_value.get() == model + client.model_with_renamed_fields_value.put(model) + + +def test_model_with_empty_array(client: XmlClient): + model = ModelWithEmptyArray(items_property=[]) + assert client.model_with_empty_array_value.get() == model + client.model_with_empty_array_value.put(model) + + +def test_model_with_text(client: XmlClient): + model = ModelWithText(language="foo", content="\n This is some text.\n") + assert client.model_with_text_value.get() == model + client.model_with_text_value.put(model) + + +def test_model_with_dictionary(client: XmlClient): + model = ModelWithDictionary(metadata={"Color": "blue", "Count": "123", "Enabled": "false"}) + assert client.model_with_dictionary_value.get() == model + client.model_with_dictionary_value.put(model) + + +def test_model_with_encoded_names(client: XmlClient): + model = ModelWithEncodedNames(model_data=SimpleModel(name="foo", age=123), colors=["red", "green", "blue"]) + assert client.model_with_encoded_names_value.get() == model + client.model_with_encoded_names_value.put(model) + + +def test_model_with_enum(client: XmlClient): + model = ModelWithEnum(status="success") + assert client.model_with_enum_value.get() == model + client.model_with_enum_value.put(model) + + +def test_model_with_datetime(client: XmlClient): + model = ModelWithDatetime( + rfc3339=datetime.datetime(2022, 8, 26, 18, 38, 0, tzinfo=datetime.timezone.utc), + rfc7231=datetime.datetime(2022, 8, 26, 14, 38, 0, tzinfo=datetime.timezone.utc), + ) + result = client.model_with_datetime_value.get() + assert result.rfc3339 == model.rfc3339 + assert result.rfc7231 == model.rfc7231 + client.model_with_datetime_value.put(model) + + +def test_model_with_namespace(client: XmlClient): + model = ModelWithNamespace(id=123, title="The Great Gatsby") + assert client.model_with_namespace_value.get() == model + client.model_with_namespace_value.put(model) + + +def test_model_with_namespace_on_properties(client: XmlClient): + model = ModelWithNamespaceOnProperties(id=123, title="The Great Gatsby", author="F. Scott Fitzgerald") + assert client.model_with_namespace_on_properties_value.get() == model + client.model_with_namespace_on_properties_value.put(model) + + +def test_xml_error_value(client: XmlClient, core_library): + with pytest.raises(core_library.exceptions.HttpResponseError) as ex: + client.xml_error_value.get() + assert ex.value.status_code == 400 + assert ex.value.model.message == "Something went wrong" + assert ex.value.model.code == 400 diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_response_status_code_range.py b/packages/http-client-python/tests/mock_api/shared/test_response_status_code_range.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_response_status_code_range.py rename to packages/http-client-python/tests/mock_api/shared/test_response_status_code_range.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_routes.py b/packages/http-client-python/tests/mock_api/shared/test_routes.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_routes.py rename to packages/http-client-python/tests/mock_api/shared/test_routes.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_server_endpoint_not_defined.py b/packages/http-client-python/tests/mock_api/shared/test_server_endpoint_not_defined.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_server_endpoint_not_defined.py rename to packages/http-client-python/tests/mock_api/shared/test_server_endpoint_not_defined.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_server_path_multiple.py b/packages/http-client-python/tests/mock_api/shared/test_server_path_multiple.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_server_path_multiple.py rename to packages/http-client-python/tests/mock_api/shared/test_server_path_multiple.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_server_path_single.py b/packages/http-client-python/tests/mock_api/shared/test_server_path_single.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_server_path_single.py rename to packages/http-client-python/tests/mock_api/shared/test_server_path_single.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_server_versions_not_versioned.py b/packages/http-client-python/tests/mock_api/shared/test_server_versions_not_versioned.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_server_versions_not_versioned.py rename to packages/http-client-python/tests/mock_api/shared/test_server_versions_not_versioned.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_server_versions_versioned.py b/packages/http-client-python/tests/mock_api/shared/test_server_versions_versioned.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_server_versions_versioned.py rename to packages/http-client-python/tests/mock_api/shared/test_server_versions_versioned.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_special_headers_conditional_request.py b/packages/http-client-python/tests/mock_api/shared/test_special_headers_conditional_request.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_special_headers_conditional_request.py rename to packages/http-client-python/tests/mock_api/shared/test_special_headers_conditional_request.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_special_headers_repeatability.py b/packages/http-client-python/tests/mock_api/shared/test_special_headers_repeatability.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_special_headers_repeatability.py rename to packages/http-client-python/tests/mock_api/shared/test_special_headers_repeatability.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_specs_documentation.py b/packages/http-client-python/tests/mock_api/shared/test_specs_documentation.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_specs_documentation.py rename to packages/http-client-python/tests/mock_api/shared/test_specs_documentation.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_streaming_jsonl.py b/packages/http-client-python/tests/mock_api/shared/test_streaming_jsonl.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_streaming_jsonl.py rename to packages/http-client-python/tests/mock_api/shared/test_streaming_jsonl.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_array.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_array.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_array.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_array.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_dictionary.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_dictionary.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_dictionary.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_dictionary.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_enum_extensible.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_enum_extensible.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_enum_extensible.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_enum_extensible.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_enum_fixed.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_enum_fixed.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_enum_fixed.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_enum_fixed.py diff --git a/packages/http-client-python/tests/mock_api/shared/test_typetest_file.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_file.py new file mode 100644 index 00000000000..1503b0b5806 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/shared/test_typetest_file.py @@ -0,0 +1,52 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- + +# after we support Http.File case, enable these tests again + +# import json + +# import pytest +# from typetest.file import FileClient + + +# @pytest.fixture +# def client(): +# with FileClient(endpoint="http://localhost:3000") as client: +# yield client + + +# def test_upload_file_specific_content_type(client: FileClient, png_data: bytes): +# client.body.upload_file_specific_content_type(png_data) + + +# # Do not support this case for now +# # def test_upload_file_json_content_type(client: FileClient): +# # client.body.upload_file_json_content_type(json.dumps({"message": "test file content"}).encode()) + + +# # although result is expected but actually there is deserialization issue +# # def test_download_file_json_content_type(client: FileClient): +# # result = client.body.download_file_json_content_type() +# # assert result == {"message": "test file content"} + + +# def test_download_file_specific_content_type(client: FileClient, png_data: bytes): +# result = b"".join(client.body.download_file_specific_content_type()) +# assert result == png_data + + +# def test_download_file_multiple_content_types(client: FileClient, png_data: bytes): +# result = b"".join(client.body.download_file_multiple_content_types()) +# assert result == png_data + + +# def test_upload_file_default_content_type(client: FileClient, png_data: bytes): +# client.body.upload_file_default_content_type(png_data, content_type="image/png") + + +# def test_download_file_default_content_type(client: FileClient, png_data: bytes): +# result = b"".join(client.body.download_file_default_content_type()) +# assert result == png_data diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_model_empty.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_model_empty.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_model_empty.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_model_empty.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_model_inheritance_enum_discriminator.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_model_inheritance_enum_discriminator.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_model_inheritance_enum_discriminator.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_model_inheritance_enum_discriminator.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_model_inheritance_nested_discriminator.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_model_inheritance_nested_discriminator.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_model_inheritance_nested_discriminator.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_model_inheritance_nested_discriminator.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_model_inheritance_not_discriminated.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_model_inheritance_not_discriminated.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_model_inheritance_not_discriminated.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_model_inheritance_not_discriminated.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_model_inheritance_recursive.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_model_inheritance_recursive.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_model_inheritance_recursive.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_model_inheritance_recursive.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_model_inheritance_single_discriminator.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_model_inheritance_single_discriminator.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_model_inheritance_single_discriminator.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_model_inheritance_single_discriminator.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_model_usage.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_model_usage.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_model_usage.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_model_usage.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_model_visibility.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_model_visibility.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_model_visibility.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_model_visibility.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_property_additionalproperties.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_property_additionalproperties.py similarity index 95% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_property_additionalproperties.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_property_additionalproperties.py index 45445d9c425..c34c281f82f 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_property_additionalproperties.py +++ b/packages/http-client-python/tests/mock_api/shared/test_typetest_property_additionalproperties.py @@ -236,21 +236,6 @@ def test_spread_model_array(client: AdditionalPropertiesClient): client.spread_model_array.put(body) -@pytest.mark.skip(reason="https://github.com/microsoft/typespec/pull/6425") -def test_spread_record_discriminated_union(client: AdditionalPropertiesClient): - body = { - "name": "abc", - "prop1": {"fooProp": "abc", "kind": "kind0"}, - "prop2": { - "end": "2021-01-02T00:00:00Z", - "kind": "kind1", - "start": "2021-01-01T00:00:00Z", - }, - } - assert client.spread_record_discriminated_union.get() == body - client.spread_record_discriminated_union.put(body) - - def test_spread_record_non_discriminated_union(client: AdditionalPropertiesClient): body = { "name": "abc", diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_property_nullable.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_property_nullable.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_property_nullable.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_property_nullable.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_property_optional.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_property_optional.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_property_optional.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_property_optional.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_property_valuetypes.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_property_valuetypes.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_property_valuetypes.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_property_valuetypes.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_scalar.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_scalar.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_scalar.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_scalar.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_union.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_union.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_union.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_union.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_union_discriminated.py b/packages/http-client-python/tests/mock_api/shared/test_typetest_union_discriminated.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_typetest_union_discriminated.py rename to packages/http-client-python/tests/mock_api/shared/test_typetest_union_discriminated.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_versioning_added.py b/packages/http-client-python/tests/mock_api/shared/test_versioning_added.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_versioning_added.py rename to packages/http-client-python/tests/mock_api/shared/test_versioning_added.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_versioning_made_optional.py b/packages/http-client-python/tests/mock_api/shared/test_versioning_made_optional.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_versioning_made_optional.py rename to packages/http-client-python/tests/mock_api/shared/test_versioning_made_optional.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_versioning_removed.py b/packages/http-client-python/tests/mock_api/shared/test_versioning_removed.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_versioning_removed.py rename to packages/http-client-python/tests/mock_api/shared/test_versioning_removed.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_versioning_renamed_from.py b/packages/http-client-python/tests/mock_api/shared/test_versioning_renamed_from.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_versioning_renamed_from.py rename to packages/http-client-python/tests/mock_api/shared/test_versioning_renamed_from.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_versioning_return_type_changed_from.py b/packages/http-client-python/tests/mock_api/shared/test_versioning_return_type_changed_from.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_versioning_return_type_changed_from.py rename to packages/http-client-python/tests/mock_api/shared/test_versioning_return_type_changed_from.py diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_versioning_type_changed_from.py b/packages/http-client-python/tests/mock_api/shared/test_versioning_type_changed_from.py similarity index 100% rename from packages/http-client-python/generator/test/generic_mock_api_tests/test_versioning_type_changed_from.py rename to packages/http-client-python/tests/mock_api/shared/test_versioning_type_changed_from.py diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_auth_flow_async.py b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_auth_flow_async.py similarity index 100% rename from packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_auth_flow_async.py rename to packages/http-client-python/tests/mock_api/unbranded/asynctests/test_auth_flow_async.py diff --git a/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_encode_duration_async.py b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_encode_duration_async.py new file mode 100644 index 00000000000..2b0716dc98b --- /dev/null +++ b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_encode_duration_async.py @@ -0,0 +1,64 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import datetime + +import pytest +import pytest_asyncio +from encode.duration.aio import DurationClient +from encode.duration.property.models import ( + Int32SecondsDurationProperty, + ISO8601DurationProperty, + FloatSecondsDurationProperty, + DefaultDurationProperty, + FloatSecondsDurationArrayProperty, +) + + +@pytest_asyncio.fixture +async def client(): + async with DurationClient() as client: + yield client + + +@pytest.mark.asyncio +async def test_query(client: DurationClient): + await client.query.default(input=datetime.timedelta(days=40)) + await client.query.iso8601(input=datetime.timedelta(days=40)) + await client.query.int32_seconds(input=36) + await client.query.int32_seconds_array(input=[36, 47]) + await client.query.float_seconds(input=35.625) + await client.query.float64_seconds(input=35.625) + + +@pytest.mark.asyncio +async def test_property(client: DurationClient): + result = await client.property.default(DefaultDurationProperty(value=datetime.timedelta(days=40))) + assert result.value == datetime.timedelta(days=40) + result = await client.property.default(DefaultDurationProperty(value="P40D")) + assert result.value == datetime.timedelta(days=40) + result = await client.property.iso8601(ISO8601DurationProperty(value=datetime.timedelta(days=40))) + assert result.value == datetime.timedelta(days=40) + result = await client.property.iso8601(ISO8601DurationProperty(value="P40D")) + assert result.value == datetime.timedelta(days=40) + result = await client.property.int32_seconds(Int32SecondsDurationProperty(value=36)) + assert result.value == 36 + result = await client.property.float_seconds(FloatSecondsDurationProperty(value=35.625)) + assert abs(result.value - 35.625) < 0.0001 + result = await client.property.float64_seconds(FloatSecondsDurationProperty(value=35.625)) + assert abs(result.value - 35.625) < 0.0001 + result = await client.property.float_seconds_array(FloatSecondsDurationArrayProperty(value=[35.625, 46.75])) + assert abs(result.value[0] - 35.625) < 0.0001 + assert abs(result.value[1] - 46.75) < 0.0001 + + +@pytest.mark.asyncio +async def test_header(client: DurationClient): + await client.header.default(duration=datetime.timedelta(days=40)) + await client.header.iso8601(duration=datetime.timedelta(days=40)) + await client.header.iso8601_array(duration=[datetime.timedelta(days=40), datetime.timedelta(days=50)]) + await client.header.int32_seconds(duration=36) + await client.header.float_seconds(duration=35.625) + await client.header.float64_seconds(duration=35.625) diff --git a/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_encode_numeric_async.py b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_encode_numeric_async.py new file mode 100644 index 00000000000..244f2ee0e12 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_encode_numeric_async.py @@ -0,0 +1,36 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +import pytest_asyncio +from encode.numeric.aio import NumericClient +from encode.numeric.property import models + + +@pytest_asyncio.fixture +async def client(): + async with NumericClient() as client: + yield client + + +@pytest.mark.asyncio +async def test_safeint_as_string(client: NumericClient): + result = await client.property.safeint_as_string(models.SafeintAsStringProperty(value=10000000000)) + assert result.value == 10000000000 + assert result["value"] == "10000000000" + + +@pytest.mark.asyncio +async def test_uint32_as_string_optional(client: NumericClient): + result = await client.property.uint32_as_string_optional(models.Uint32AsStringProperty(value=1)) + assert result.value == 1 + assert result["value"] == "1" + + +@pytest.mark.asyncio +async def test_uint8_as_string_optional(client: NumericClient): + result = await client.property.uint8_as_string(models.Uint32AsStringProperty(value=255)) + assert result.value == 255 + assert result["value"] == "255" diff --git a/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_parameters_basic_async.py b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_parameters_basic_async.py new file mode 100644 index 00000000000..f6d8c58a938 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_parameters_basic_async.py @@ -0,0 +1,25 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +import pytest_asyncio +from parameters.basic.aio import BasicClient +from parameters.basic.explicitbody.models import User + + +@pytest_asyncio.fixture +async def client(): + async with BasicClient() as client: + yield client + + +@pytest.mark.asyncio +async def test_explicit_simple(client: BasicClient): + await client.explicit_body.simple(User(name="foo")) + + +@pytest.mark.asyncio +async def test_implicit_simple(client: BasicClient): + await client.implicit_body.simple(name="foo") diff --git a/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_parameters_spread_async.py b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_parameters_spread_async.py new file mode 100644 index 00000000000..57de584d843 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_parameters_spread_async.py @@ -0,0 +1,77 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +import pytest_asyncio +from parameters.spread.aio import SpreadClient +from parameters.spread.model.models import BodyParameter + + +@pytest_asyncio.fixture +async def client(): + async with SpreadClient() as client: + yield client + + +@pytest.mark.asyncio +async def test_model_body(client: SpreadClient): + await client.model.spread_as_request_body(name="foo") + + +@pytest.mark.asyncio +async def test_model_composite_request_only_with_body(client: SpreadClient): + await client.model.spread_composite_request_only_with_body(BodyParameter(name="foo")) + + +@pytest.mark.asyncio +async def test_model_composite_request_without_body(client: SpreadClient): + await client.model.spread_composite_request_without_body(name="foo", test_header="bar") + + +@pytest.mark.asyncio +async def test_model_composite_request(client: SpreadClient): + await client.model.spread_composite_request(name="foo", body=BodyParameter(name="foo"), test_header="bar") + + +@pytest.mark.asyncio +async def test_model_composite_request_mix(client: SpreadClient): + await client.model.spread_composite_request_mix(name="foo", prop="foo", test_header="bar") + + +@pytest.mark.asyncio +async def test_alias_body(client: SpreadClient): + await client.alias.spread_as_request_body(name="foo") + + +@pytest.mark.asyncio +async def test_alias_parameter(client: SpreadClient): + await client.alias.spread_as_request_parameter("1", x_ms_test_header="bar", name="foo") + + +@pytest.mark.asyncio +async def test_alias_multiple_parameter(client: SpreadClient): + await client.alias.spread_with_multiple_parameters( + "1", + x_ms_test_header="bar", + required_string="foo", + required_int_list=[1, 2], + optional_string_list=["foo", "bar"], + optional_int=1, + ) + await client.alias.spread_with_multiple_parameters( + "1", + {"requiredString": "foo", "optionalInt": 1, "requiredIntList": [1, 2], "optionalStringList": ["foo", "bar"]}, + x_ms_test_header="bar", + ) + + +@pytest.mark.asyncio +async def test_inner_model(client: SpreadClient): + await client.alias.spread_parameter_with_inner_model(id="1", x_ms_test_header="bar", body={"name": "foo"}) + + +@pytest.mark.asyncio +async def test_inner_alias(client: SpreadClient): + await client.alias.spread_parameter_with_inner_alias(id="1", x_ms_test_header="bar", body={"name": "foo", "age": 1}) diff --git a/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_payload_content_negotiation_async.py b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_payload_content_negotiation_async.py new file mode 100644 index 00000000000..3dd1cc324b6 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_payload_content_negotiation_async.py @@ -0,0 +1,38 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import base64 +import pytest +import pytest_asyncio +from payload.contentnegotiation.aio import ContentNegotiationClient +from payload.contentnegotiation.differentbody.models import PngImageAsJson + + +@pytest_asyncio.fixture +async def client(): + async with ContentNegotiationClient(endpoint="http://localhost:3000") as client: + yield client + + +@pytest.mark.asyncio +async def test_get_avatar_as_png(client: ContentNegotiationClient, png_data: bytes): + assert b"".join([d async for d in (await client.same_body.get_avatar_as_png())]) == png_data + + +@pytest.mark.asyncio +async def test_get_avatar_as_jpeg(client: ContentNegotiationClient, jpg_data: bytes): + assert b"".join([d async for d in (await client.same_body.get_avatar_as_jpeg())]) == jpg_data + + +@pytest.mark.asyncio +async def test_different_body_get_avatar_as_png(client: ContentNegotiationClient, png_data: bytes): + assert b"".join([d async for d in (await client.different_body.get_avatar_as_png())]) == png_data + + +@pytest.mark.asyncio +async def test_different_body_get_avatar_as_json(client: ContentNegotiationClient, png_data: bytes): + result = await client.different_body.get_avatar_as_json() + expected = PngImageAsJson(content=base64.b64encode(png_data).decode()) + assert result == expected diff --git a/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_payload_multipart_async.py b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_payload_multipart_async.py new file mode 100644 index 00000000000..b5197313bff --- /dev/null +++ b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_payload_multipart_async.py @@ -0,0 +1,219 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +from pathlib import Path +import pytest +import pytest_asyncio +from payload.multipart import models +from payload.multipart.aio import MultiPartClient +from payload.multipart.formdata.httpparts.nonstring.models import FloatRequest +from payload.multipart.formdata.file import models as file_models + +JPG = Path(__file__).parent.parent / "data/image.jpg" +PNG = Path(__file__).parent.parent / "data/image.png" + + +@pytest_asyncio.fixture +async def client(): + async with MultiPartClient(endpoint="http://localhost:3000") as client: + yield client + + +@pytest.mark.asyncio +async def test_anonymous_model(client: MultiPartClient): + await client.form_data.anonymous_model({"profileImage": open(str(JPG), "rb")}) + + +@pytest.mark.asyncio +async def test_basic(client: MultiPartClient): + await client.form_data.basic( + models.MultiPartRequest( + id="123", + profile_image=open(str(JPG), "rb"), + ) + ) + + +@pytest.mark.asyncio +async def test_binary_array_parts(client: MultiPartClient): + await client.form_data.binary_array_parts( + models.BinaryArrayPartsRequest( + id="123", + pictures=[ + open(str(PNG), "rb"), + open(str(PNG), "rb"), + ], + ) + ) + + +@pytest.mark.asyncio +async def test_check_file_name_and_content_type(client: MultiPartClient): + await client.form_data.check_file_name_and_content_type( + models.MultiPartRequest( + id="123", + profile_image=("hello.jpg", open(str(JPG), "rb"), "image/jpg"), + ) + ) + + +@pytest.mark.asyncio +async def test_complex(client: MultiPartClient): + await client.form_data.file_array_and_basic( + models.ComplexPartsRequest( + id="123", + address=models.Address(city="X"), + pictures=[ + open(str(PNG), "rb"), + open(str(PNG), "rb"), + ], + profile_image=open(str(JPG), "rb"), + ) + ) + + +@pytest.mark.asyncio +async def test_json_part(client: MultiPartClient): + await client.form_data.json_part( + models.JsonPartRequest( + address=models.Address(city="X"), + profile_image=open(str(JPG), "rb"), + ) + ) + + +@pytest.mark.asyncio +async def test_multi_binary_parts(client: MultiPartClient): + await client.form_data.multi_binary_parts( + models.MultiBinaryPartsRequest( + profile_image=open(str(JPG), "rb"), + picture=open(str(PNG), "rb"), + ) + ) + await client.form_data.multi_binary_parts( + models.MultiBinaryPartsRequest( + profile_image=open(str(JPG), "rb"), + ) + ) + + +@pytest.mark.asyncio +async def test_file_with_http_part_specific_content_type(client: MultiPartClient): + await client.form_data.http_parts.content_type.image_jpeg_content_type( + models.FileWithHttpPartSpecificContentTypeRequest( + profile_image=("hello.jpg", open(str(JPG), "rb"), "image/jpg"), + ) + ) + + +@pytest.mark.asyncio +async def test_file_with_http_part_required_content_type(client: MultiPartClient): + await client.form_data.http_parts.content_type.required_content_type( + models.FileWithHttpPartRequiredContentTypeRequest( + profile_image=open(str(JPG), "rb"), + ) + ) + + +@pytest.mark.asyncio +async def test_file_with_http_part_optional_content_type(client: MultiPartClient): + # call twice: one with content type, one without + await client.form_data.http_parts.content_type.optional_content_type( + models.FileWithHttpPartOptionalContentTypeRequest( + profile_image=("hello.jpg", open(str(JPG), "rb").read()), + ) + ) + await client.form_data.http_parts.content_type.optional_content_type( + models.FileWithHttpPartOptionalContentTypeRequest( + profile_image=("hello.jpg", open(str(JPG), "rb").read(), "application/octet-stream"), + ) + ) + + +@pytest.mark.asyncio +async def test_complex_with_http_part(client: MultiPartClient): + await client.form_data.http_parts.json_array_and_file_array( + models.ComplexHttpPartsModelRequest( + id="123", + previous_addresses=[ + models.Address(city="Y"), + models.Address(city="Z"), + ], + address=models.Address(city="X"), + pictures=[ + open(str(PNG), "rb"), + open(str(PNG), "rb"), + ], + profile_image=open(str(JPG), "rb"), + ) + ) + + +@pytest.mark.asyncio +async def test_http_parts_non_string_float(client: MultiPartClient): + await client.form_data.http_parts.non_string.float(FloatRequest(temperature=0.5)) + + +@pytest.mark.asyncio +async def test_with_wire_name(client: MultiPartClient): + await client.form_data.with_wire_name( + models.MultiPartRequestWithWireName( + identifier="123", + image=open(str(JPG), "rb"), + ) + ) + + +@pytest.mark.asyncio +async def test_optional_parts(client: MultiPartClient): + # First time with only id + await client.form_data.optional_parts( + models.MultiPartOptionalRequest( + id="123", + ) + ) + # Second time with only profileImage + await client.form_data.optional_parts( + models.MultiPartOptionalRequest( + profile_image=open(str(JPG), "rb"), + ) + ) + # Third time with both id and profileImage + await client.form_data.optional_parts( + models.MultiPartOptionalRequest( + id="123", + profile_image=open(str(JPG), "rb"), + ) + ) + + +@pytest.mark.asyncio +async def test_file_upload_file_specific_content_type(client: MultiPartClient): + await client.form_data.file.upload_file_specific_content_type( + file_models.UploadFileSpecificContentTypeRequest( + file=("image.png", open(str(PNG), "rb"), "image/png"), + ) + ) + + +@pytest.mark.asyncio +async def test_file_upload_file_required_filename(client: MultiPartClient): + await client.form_data.file.upload_file_required_filename( + file_models.UploadFileRequiredFilenameRequest( + file=("image.png", open(str(PNG), "rb"), "image/png"), + ) + ) + + +@pytest.mark.asyncio +async def test_file_upload_file_array(client: MultiPartClient): + await client.form_data.file.upload_file_array( + file_models.UploadFileArrayRequest( + files=[ + ("image.png", open(str(PNG), "rb"), "image/png"), + ("image.png", open(str(PNG), "rb"), "image/png"), + ], + ) + ) diff --git a/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_serialization_encoded_name_json_async.py b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_serialization_encoded_name_json_async.py new file mode 100644 index 00000000000..c03899fe7e3 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_serialization_encoded_name_json_async.py @@ -0,0 +1,25 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +import pytest_asyncio +from serialization.encodedname.json.aio import JsonClient +from serialization.encodedname.json.property import models + + +@pytest_asyncio.fixture +async def client(): + async with JsonClient() as client: + yield client + + +@pytest.mark.asyncio +async def test_property_send(client: JsonClient): + await client.property.send(models.JsonEncodedNameModel(default_name=True)) + + +@pytest.mark.asyncio +async def test_property_get(client: JsonClient): + assert (await client.property.get()).default_name diff --git a/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_special_words_async.py b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_special_words_async.py new file mode 100644 index 00000000000..c1e3bc0a8f2 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_special_words_async.py @@ -0,0 +1,74 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +import pytest_asyncio +from specialwords.aio import SpecialWordsClient +from specialwords.models import models +from specialwords.modelproperties import models as model_properties_models +from specialwords.extensiblestrings import models as extensible_strings_models + + +@pytest_asyncio.fixture +async def client(): + async with SpecialWordsClient() as client: + yield client + + +@pytest.mark.asyncio +async def test_operations(client: SpecialWordsClient, special_words): + for sw in special_words: + suffix = "" if sw == "constructor" else "_method" + await getattr(client.operations, sw + suffix)() + + +@pytest.mark.asyncio +async def test_parameter(client: SpecialWordsClient, special_words): + for sw in special_words: + suffix = "" if sw == "constructor" else "_parameter" + await getattr(client.parameters, "with_" + sw)(**{sw + suffix: "ok"}) + await client.parameters.with_cancellation_token(cancellation_token="ok") + + +@pytest.mark.asyncio +async def test_model(client: SpecialWordsClient, special_words): + for sw in special_words: + suffix = "" if sw == "constructor" else "Model" + model = getattr(models, sw.capitalize() + suffix) + await getattr(client.models, "with_" + sw)(model(name="ok")) + + +@pytest.mark.asyncio +async def test_model_properties(client: SpecialWordsClient): + await client.model_properties.same_as_model(model_properties_models.SameAsModel(same_as_model="ok")) + + +@pytest.mark.asyncio +async def test_model_properties_dict_methods(client: SpecialWordsClient): + await client.model_properties.dict_methods( + body=model_properties_models.DictMethods( + keys_property="ok", + items_property="ok", + values_property="ok", + popitem_property="ok", + clear_property="ok", + update_property="ok", + setdefault_property="ok", + pop_property="ok", + get_property="ok", + copy_property="ok", + ) + ) + + +@pytest.mark.asyncio +async def test_model_properties_with_list(client: SpecialWordsClient): + await client.model_properties.with_list(model_properties_models.ModelWithList(list="ok")) + + +@pytest.mark.asyncio +async def test_extensible_strings(client: SpecialWordsClient): + for enum_value in extensible_strings_models.ExtensibleString: + assert enum_value == await client.extensible_strings.put_extensible_string_value(body=enum_value) diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_unbranded_async.py b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_unbranded_async.py similarity index 93% rename from packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_unbranded_async.py rename to packages/http-client-python/tests/mock_api/unbranded/asynctests/test_unbranded_async.py index 1ba8cc5750d..0218d8578ef 100644 --- a/packages/http-client-python/generator/test/unbranded/mock_api_tests/asynctests/test_unbranded_async.py +++ b/packages/http-client-python/tests/mock_api/unbranded/asynctests/test_unbranded_async.py @@ -4,11 +4,12 @@ # ------------------------------------ import traceback import pytest +import pytest_asyncio from typetest.scalar.aio import ScalarClient from corehttp.exceptions import HttpResponseError -@pytest.fixture +@pytest_asyncio.fixture async def client(): async with ScalarClient() as client: yield client diff --git a/packages/http-client-python/tests/mock_api/unbranded/conftest.py b/packages/http-client-python/tests/mock_api/unbranded/conftest.py new file mode 100644 index 00000000000..5d190ae0bd4 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/unbranded/conftest.py @@ -0,0 +1,95 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import os +import subprocess +import signal +import pytest +import re +from pathlib import Path + +FILE_FOLDER = Path(__file__).parent + + +def start_server_process(): + http_path = Path(os.path.dirname(__file__)) / Path("../../../node_modules/@typespec/http-specs") + os.chdir(http_path.resolve()) + cmd = "tsp-spector serve ./specs" + if os.name == "nt": + return subprocess.Popen(cmd, shell=True) + return subprocess.Popen(cmd, shell=True, preexec_fn=os.setsid) + + +def terminate_server_process(process): + try: + if os.name == "nt": + process.kill() + else: + os.killpg(os.getpgid(process.pid), signal.SIGTERM) # Send the signal to all the process groups + except ProcessLookupError: + # Process already terminated, which is fine + pass + + +@pytest.fixture(scope="session", autouse=True) +def testserver(): + """Start spector mock api tests""" + server = start_server_process() + yield + terminate_server_process(server) + + +SPECIAL_WORDS = [ + "and", + "as", + "assert", + "async", + "await", + "break", + "class", + "constructor", + "continue", + "def", + "del", + "elif", + "else", + "except", + "exec", + "finally", + "for", + "from", + "global", + "if", + "import", + "in", + "is", + "lambda", + "not", + "or", + "pass", + "raise", + "return", + "try", + "while", + "with", + "yield", +] + + +@pytest.fixture +def special_words() -> list[str]: + return SPECIAL_WORDS + + +@pytest.fixture +def png_data() -> bytes: + with open(str(FILE_FOLDER / "data/image.png"), "rb") as file_in: + return file_in.read() + + +@pytest.fixture +def jpg_data() -> bytes: + with open(str(FILE_FOLDER / "data/image.jpg"), "rb") as file_in: + return file_in.read() diff --git a/packages/http-client-python/tests/mock_api/unbranded/data/image.jpg b/packages/http-client-python/tests/mock_api/unbranded/data/image.jpg new file mode 100644 index 00000000000..b95b3e7b582 Binary files /dev/null and b/packages/http-client-python/tests/mock_api/unbranded/data/image.jpg differ diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/data/image.png b/packages/http-client-python/tests/mock_api/unbranded/data/image.png similarity index 100% rename from packages/http-client-python/generator/test/unbranded/mock_api_tests/data/image.png rename to packages/http-client-python/tests/mock_api/unbranded/data/image.png diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/test_auth_flow.py b/packages/http-client-python/tests/mock_api/unbranded/test_auth_flow.py similarity index 100% rename from packages/http-client-python/generator/test/unbranded/mock_api_tests/test_auth_flow.py rename to packages/http-client-python/tests/mock_api/unbranded/test_auth_flow.py diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/test_encode_duration.py b/packages/http-client-python/tests/mock_api/unbranded/test_encode_duration.py similarity index 100% rename from packages/http-client-python/generator/test/unbranded/mock_api_tests/test_encode_duration.py rename to packages/http-client-python/tests/mock_api/unbranded/test_encode_duration.py diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/test_encode_numeric.py b/packages/http-client-python/tests/mock_api/unbranded/test_encode_numeric.py similarity index 100% rename from packages/http-client-python/generator/test/unbranded/mock_api_tests/test_encode_numeric.py rename to packages/http-client-python/tests/mock_api/unbranded/test_encode_numeric.py diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/test_parameters_basic.py b/packages/http-client-python/tests/mock_api/unbranded/test_parameters_basic.py similarity index 100% rename from packages/http-client-python/generator/test/unbranded/mock_api_tests/test_parameters_basic.py rename to packages/http-client-python/tests/mock_api/unbranded/test_parameters_basic.py diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/test_parameters_spread.py b/packages/http-client-python/tests/mock_api/unbranded/test_parameters_spread.py similarity index 100% rename from packages/http-client-python/generator/test/unbranded/mock_api_tests/test_parameters_spread.py rename to packages/http-client-python/tests/mock_api/unbranded/test_parameters_spread.py diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/test_payload_content_negotiation.py b/packages/http-client-python/tests/mock_api/unbranded/test_payload_content_negotiation.py similarity index 100% rename from packages/http-client-python/generator/test/unbranded/mock_api_tests/test_payload_content_negotiation.py rename to packages/http-client-python/tests/mock_api/unbranded/test_payload_content_negotiation.py diff --git a/packages/http-client-python/tests/mock_api/unbranded/test_payload_multipart.py b/packages/http-client-python/tests/mock_api/unbranded/test_payload_multipart.py new file mode 100644 index 00000000000..f4cba4ec271 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/unbranded/test_payload_multipart.py @@ -0,0 +1,200 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +from pathlib import Path +import pytest +from payload.multipart import MultiPartClient, models +from payload.multipart.formdata.httpparts.nonstring.models import FloatRequest +from payload.multipart.formdata.file import models as file_models + +JPG = Path(__file__).parent / "data/image.jpg" +PNG = Path(__file__).parent / "data/image.png" + + +@pytest.fixture +def client(): + with MultiPartClient(endpoint="http://localhost:3000") as client: + yield client + + +def test_anonymous_model(client: MultiPartClient): + client.form_data.anonymous_model({"profileImage": open(str(JPG), "rb")}) + + +def test_basic(client: MultiPartClient): + client.form_data.basic( + models.MultiPartRequest( + id="123", + profile_image=open(str(JPG), "rb"), + ) + ) + + +def test_binary_array_parts(client: MultiPartClient): + client.form_data.binary_array_parts( + models.BinaryArrayPartsRequest( + id="123", + pictures=[ + open(str(PNG), "rb"), + open(str(PNG), "rb"), + ], + ) + ) + + +def test_check_file_name_and_content_type(client: MultiPartClient): + client.form_data.check_file_name_and_content_type( + models.MultiPartRequest( + id="123", + profile_image=("hello.jpg", open(str(JPG), "rb"), "image/jpg"), + ) + ) + + +def test_complex(client: MultiPartClient): + client.form_data.file_array_and_basic( + models.ComplexPartsRequest( + id="123", + address=models.Address(city="X"), + pictures=[ + open(str(PNG), "rb"), + open(str(PNG), "rb"), + ], + profile_image=open(str(JPG), "rb"), + ) + ) + + +def test_json_part(client: MultiPartClient): + client.form_data.json_part( + models.JsonPartRequest( + address=models.Address(city="X"), + profile_image=open(str(JPG), "rb"), + ) + ) + + +def test_multi_binary_parts(client: MultiPartClient): + client.form_data.multi_binary_parts( + models.MultiBinaryPartsRequest( + profile_image=open(str(JPG), "rb"), + picture=open(str(PNG), "rb"), + ) + ) + client.form_data.multi_binary_parts( + models.MultiBinaryPartsRequest( + profile_image=open(str(JPG), "rb"), + ) + ) + + +def test_file_with_http_part_specific_content_type(client: MultiPartClient): + client.form_data.http_parts.content_type.image_jpeg_content_type( + models.FileWithHttpPartSpecificContentTypeRequest( + profile_image=("hello.jpg", open(str(JPG), "rb"), "image/jpg"), + ) + ) + + +def test_file_with_http_part_required_content_type(client: MultiPartClient): + client.form_data.http_parts.content_type.required_content_type( + models.FileWithHttpPartRequiredContentTypeRequest( + profile_image=open(str(JPG), "rb"), + ) + ) + + +def test_file_with_http_part_optional_content_type(client: MultiPartClient): + # call twice: one with content type, one without + client.form_data.http_parts.content_type.optional_content_type( + models.FileWithHttpPartOptionalContentTypeRequest( + profile_image=("hello.jpg", open(str(JPG), "rb").read()), + ) + ) + client.form_data.http_parts.content_type.optional_content_type( + models.FileWithHttpPartOptionalContentTypeRequest( + profile_image=("hello.jpg", open(str(JPG), "rb").read(), "application/octet-stream"), + ) + ) + + +def test_complex_with_http_part(client: MultiPartClient): + client.form_data.http_parts.json_array_and_file_array( + models.ComplexHttpPartsModelRequest( + id="123", + previous_addresses=[ + models.Address(city="Y"), + models.Address(city="Z"), + ], + address=models.Address(city="X"), + pictures=[ + open(str(PNG), "rb"), + open(str(PNG), "rb"), + ], + profile_image=open(str(JPG), "rb"), + ) + ) + + +def test_http_parts_non_string_float(client: MultiPartClient): + client.form_data.http_parts.non_string.float(FloatRequest(temperature=0.5)) + + +def test_with_wire_name(client: MultiPartClient): + client.form_data.with_wire_name( + models.MultiPartRequestWithWireName( + identifier="123", + image=open(str(JPG), "rb"), + ) + ) + + +def test_optional_parts(client: MultiPartClient): + # First time with only id + client.form_data.optional_parts( + models.MultiPartOptionalRequest( + id="123", + ) + ) + # Second time with only profileImage + client.form_data.optional_parts( + models.MultiPartOptionalRequest( + profile_image=open(str(JPG), "rb"), + ) + ) + # Third time with both id and profileImage + client.form_data.optional_parts( + models.MultiPartOptionalRequest( + id="123", + profile_image=open(str(JPG), "rb"), + ) + ) + + +def test_file_upload_file_specific_content_type(client: MultiPartClient): + client.form_data.file.upload_file_specific_content_type( + file_models.UploadFileSpecificContentTypeRequest( + file=("image.png", open(str(PNG), "rb"), "image/png"), + ) + ) + + +def test_file_upload_file_required_filename(client: MultiPartClient): + client.form_data.file.upload_file_required_filename( + file_models.UploadFileRequiredFilenameRequest( + file=("image.png", open(str(PNG), "rb"), "image/png"), + ) + ) + + +def test_file_upload_file_array(client: MultiPartClient): + client.form_data.file.upload_file_array( + file_models.UploadFileArrayRequest( + files=[ + ("image.png", open(str(PNG), "rb"), "image/png"), + ("image.png", open(str(PNG), "rb"), "image/png"), + ], + ) + ) diff --git a/packages/http-client-python/generator/test/unbranded/mock_api_tests/test_serialization_encoded_name_json.py b/packages/http-client-python/tests/mock_api/unbranded/test_serialization_encoded_name_json.py similarity index 100% rename from packages/http-client-python/generator/test/unbranded/mock_api_tests/test_serialization_encoded_name_json.py rename to packages/http-client-python/tests/mock_api/unbranded/test_serialization_encoded_name_json.py diff --git a/packages/http-client-python/tests/mock_api/unbranded/test_special_words.py b/packages/http-client-python/tests/mock_api/unbranded/test_special_words.py new file mode 100644 index 00000000000..83269cc1e47 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/unbranded/test_special_words.py @@ -0,0 +1,66 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +from specialwords import SpecialWordsClient +from specialwords.models import models +from specialwords.modelproperties import models as model_properties_models +from specialwords.extensiblestrings import models as extensible_strings_models + + +@pytest.fixture +def client(): + with SpecialWordsClient() as client: + yield client + + +def test_operations(client: SpecialWordsClient, special_words): + for sw in special_words: + suffix = "" if sw == "constructor" else "_method" + getattr(client.operations, sw + suffix)() + + +def test_parameter(client: SpecialWordsClient, special_words): + for sw in special_words: + suffix = "" if sw == "constructor" else "_parameter" + getattr(client.parameters, "with_" + sw)(**{sw + suffix: "ok"}) + client.parameters.with_cancellation_token(cancellation_token="ok") + + +def test_model(client: SpecialWordsClient, special_words): + for sw in special_words: + suffix = "" if sw == "constructor" else "Model" + model = getattr(models, sw.capitalize() + suffix) + getattr(client.models, "with_" + sw)(model(name="ok")) + + +def test_model_properties(client: SpecialWordsClient): + client.model_properties.same_as_model(model_properties_models.SameAsModel(same_as_model="ok")) + + +def test_model_properties_dict_methods(client: SpecialWordsClient): + client.model_properties.dict_methods( + body=model_properties_models.DictMethods( + keys_property="ok", + items_property="ok", + values_property="ok", + popitem_property="ok", + clear_property="ok", + update_property="ok", + setdefault_property="ok", + pop_property="ok", + get_property="ok", + copy_property="ok", + ) + ) + + +def test_model_properties_with_list(client: SpecialWordsClient): + client.model_properties.with_list(model_properties_models.ModelWithList(list="ok")) + + +def test_extensible_strings(client: SpecialWordsClient): + for enum_value in extensible_strings_models.ExtensibleString: + assert enum_value == client.extensible_strings.put_extensible_string_value(body=enum_value) diff --git a/packages/http-client-python/tests/mock_api/unbranded/test_unbranded.py b/packages/http-client-python/tests/mock_api/unbranded/test_unbranded.py new file mode 100644 index 00000000000..f7366edc0a5 --- /dev/null +++ b/packages/http-client-python/tests/mock_api/unbranded/test_unbranded.py @@ -0,0 +1,57 @@ +# ------------------------------------ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT License. +# ------------------------------------ +import os +from pathlib import Path +import traceback +from importlib import import_module +import pytest +from typetest.scalar import ScalarClient +from corehttp.exceptions import HttpResponseError + + +@pytest.fixture +def client(): + with ScalarClient() as client: + yield client + + +def test_module(): + with pytest.raises(ModuleNotFoundError): + import_module("azure") + + +def test_track_back(client: ScalarClient): + try: + client.string.put("to raise exception") + except HttpResponseError: + track_back = traceback.format_exc().lower() + assert "azure" not in track_back + assert "microsoft" not in track_back + + +_SKIP_DIRS = {"__pycache__", "pytest_cache", ".pytest_cache"} + + +def check_sensitive_word(folder: Path, word: str) -> list[str]: + """Search for a word in all files under folder, return top-level subfolder names that contain it.""" + result = set() + for path in folder.rglob("*"): + if not path.is_file(): + continue + # Skip special directories + if _SKIP_DIRS & set(path.relative_to(folder).parts): + continue + try: + content = path.read_text(encoding="utf-8", errors="ignore") + except (OSError, UnicodeDecodeError): + continue + if word.lower() in content.lower(): + result.add(path.relative_to(folder).parts[0]) + return sorted(result) + + +def test_sensitive_word(): + check_folder = (Path(os.path.dirname(__file__)) / "../../generated/unbranded").resolve() + assert [] == check_sensitive_word(check_folder, "azure") diff --git a/packages/http-client-python/tests/requirements/azure.txt b/packages/http-client-python/tests/requirements/azure.txt new file mode 100644 index 00000000000..fe168be77f9 --- /dev/null +++ b/packages/http-client-python/tests/requirements/azure.txt @@ -0,0 +1,6 @@ +# === common azure dependencies across repos === +# Azure SDK dependencies +-r base.txt +azure-core>=1.37.0 +azure-mgmt-core==1.6.0 +# === end common azure dependencies across repos === diff --git a/packages/http-client-python/tests/requirements/base.txt b/packages/http-client-python/tests/requirements/base.txt new file mode 100644 index 00000000000..9331a4a1d87 --- /dev/null +++ b/packages/http-client-python/tests/requirements/base.txt @@ -0,0 +1,12 @@ +# Base test dependencies +pytest==8.3.2 +pytest-xdist>=3.5.0 +pytest-asyncio>=0.14.0 +aiohttp +coverage==7.6.1 +colorama==0.4.6 +isodate>=0.6.1 +typing-extensions>=4.6.0 +tox>=4.16.0 +tox-uv>=1.0.0 +filelock>=3.12.0 diff --git a/packages/http-client-python/tests/requirements/docs.txt b/packages/http-client-python/tests/requirements/docs.txt new file mode 100644 index 00000000000..7839a0e726f --- /dev/null +++ b/packages/http-client-python/tests/requirements/docs.txt @@ -0,0 +1,7 @@ +# Documentation dependencies +-r base.txt +pip +sphinx>=7.0.0 +sphinx_rtd_theme>=2.0.0 +myst_parser>=2.0.0 +sphinxcontrib-jquery>=4.1 diff --git a/packages/http-client-python/tests/requirements/lint.txt b/packages/http-client-python/tests/requirements/lint.txt new file mode 100644 index 00000000000..2a9896f8d75 --- /dev/null +++ b/packages/http-client-python/tests/requirements/lint.txt @@ -0,0 +1,4 @@ +# Linting dependencies +-r base.txt +pylint==4.0.4 +black==24.8.0 diff --git a/packages/http-client-python/tests/requirements/typecheck.txt b/packages/http-client-python/tests/requirements/typecheck.txt new file mode 100644 index 00000000000..6e09ee898c7 --- /dev/null +++ b/packages/http-client-python/tests/requirements/typecheck.txt @@ -0,0 +1,5 @@ +# Type checking dependencies +-r base.txt +pyright==1.1.407 +mypy==1.19.1 +types-PyYAML==6.0.12.8 diff --git a/packages/http-client-python/tests/requirements/unbranded.txt b/packages/http-client-python/tests/requirements/unbranded.txt new file mode 100644 index 00000000000..724244f16e1 --- /dev/null +++ b/packages/http-client-python/tests/requirements/unbranded.txt @@ -0,0 +1,5 @@ +# === common unbranded dependencies across repos === +# Unbranded SDK dependencies +-r base.txt +corehttp[requests] +# === end common unbranded dependencies across repos === diff --git a/packages/http-client-python/tests/tox.ini b/packages/http-client-python/tests/tox.ini new file mode 100644 index 00000000000..12231969731 --- /dev/null +++ b/packages/http-client-python/tests/tox.ini @@ -0,0 +1,209 @@ +[tox] +envlist = test-{azure,unbranded}, lint-{azure,unbranded}, mypy-{azure,unbranded}, pyright-{azure,unbranded}, unittest +skipsdist = True +isolated_build = True +requires = tox-uv + +[testenv] +deps = + -r {tox_root}/requirements/base.txt +setenv = + PYTHONPATH = {tox_root}/../generator + FLAVOR = {envname} +passenv = + FOLDER + +# ============================================================================= +# Test environments +# ============================================================================= + +[testenv:test-azure] +description = Run tests for Azure flavor +setenv = + {[testenv]setenv} + FLAVOR = azure +deps = + {[testenv]deps} + -r {tox_root}/requirements/azure.txt + -e {tox_root}/../generator +commands = + python {tox_root}/install_packages.py azure {tox_root} + pytest mock_api/azure mock_api/shared -v -n auto -n auto {posargs} + +[testenv:test-unbranded] +description = Run tests for unbranded flavor +setenv = + {[testenv]setenv} + FLAVOR = unbranded +deps = + {[testenv]deps} + -r {tox_root}/requirements/unbranded.txt + -e {tox_root}/../generator +commands = + python {tox_root}/install_packages.py unbranded {tox_root} + pytest mock_api/unbranded mock_api/shared -v -n auto -n auto {posargs} + +[testenv:unittest] +description = Run unit tests for pygen internals +deps = + {[testenv]deps} + -r {tox_root}/requirements/unbranded.txt + -e {tox_root}/../generator +commands = + python {tox_root}/install_packages.py unbranded {tox_root} + pytest unit/ -v -n auto {posargs} + +# ============================================================================= +# Lint environments +# ============================================================================= + +[testenv:lint-azure] +description = Run linting for Azure flavor +setenv = + {[testenv]setenv} + FLAVOR = azure +deps = + -r {tox_root}/requirements/lint.txt + -r {tox_root}/requirements/azure.txt + -e {tox_root}/../generator +commands = + uv pip install azure-pylint-guidelines-checker==0.5.2 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/" + python {tox_root}/install_packages.py azure {tox_root} + python {tox_root}/../eng/scripts/ci/run_pylint.py -t azure -s generated {posargs} + +[testenv:lint-unbranded] +description = Run linting for unbranded flavor +setenv = + {[testenv]setenv} + FLAVOR = unbranded +deps = + -r {tox_root}/requirements/lint.txt + -r {tox_root}/requirements/unbranded.txt + -e {tox_root}/../generator +commands = + python {tox_root}/install_packages.py unbranded {tox_root} + python {tox_root}/../eng/scripts/ci/run_pylint.py -t unbranded -s generated {posargs} + +# ============================================================================= +# Type checking environments (separate mypy and pyright) +# ============================================================================= + +[testenv:mypy-azure] +description = Run mypy type checking for Azure flavor +setenv = + {[testenv]setenv} + FLAVOR = azure +deps = + -r {tox_root}/requirements/typecheck.txt + -e {tox_root}/../generator +commands = + python {tox_root}/install_packages.py azure {tox_root} + python {tox_root}/../eng/scripts/ci/run_mypy.py -t azure -s generated {posargs} + +[testenv:mypy-unbranded] +description = Run mypy type checking for unbranded flavor +setenv = + {[testenv]setenv} + FLAVOR = unbranded +deps = + -r {tox_root}/requirements/typecheck.txt + -e {tox_root}/../generator +commands = + python {tox_root}/install_packages.py unbranded {tox_root} + python {tox_root}/../eng/scripts/ci/run_mypy.py -t unbranded -s generated {posargs} + +[testenv:pyright-azure] +description = Run pyright type checking for Azure flavor +setenv = + {[testenv]setenv} + FLAVOR = azure +deps = + -r {tox_root}/requirements/typecheck.txt + -e {tox_root}/../generator +commands = + python {tox_root}/install_packages.py azure {tox_root} + python {tox_root}/../eng/scripts/ci/run_pyright.py -t azure -s generated {posargs} + +[testenv:pyright-unbranded] +description = Run pyright type checking for unbranded flavor +setenv = + {[testenv]setenv} + FLAVOR = unbranded +deps = + -r {tox_root}/requirements/typecheck.txt + -e {tox_root}/../generator +commands = + python {tox_root}/install_packages.py unbranded {tox_root} + python {tox_root}/../eng/scripts/ci/run_pyright.py -t unbranded -s generated {posargs} + +# ============================================================================= +# Documentation environments +# ============================================================================= + +[testenv:docs-azure] +description = Run documentation validation for Azure flavor +basepython = python3.10 +setenv = + {[testenv]setenv} + FLAVOR = azure +deps = + -r {tox_root}/requirements/docs.txt + -e {tox_root}/../generator +commands = + uv pip install apiview-stub-generator>=0.3.19 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/" + python {tox_root}/install_packages.py azure {tox_root} + python {tox_root}/../eng/scripts/ci/run_apiview.py -t azure -s generated {posargs} + python {tox_root}/../eng/scripts/ci/run_sphinx_build.py -t azure -s generated {posargs} + +[testenv:docs-unbranded] +description = Run documentation validation for unbranded flavor +basepython = python3.10 +setenv = + {[testenv]setenv} + FLAVOR = unbranded +deps = + -r {tox_root}/requirements/docs.txt + -e {tox_root}/../generator +commands = + uv pip install apiview-stub-generator>=0.3.19 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/" + python {tox_root}/install_packages.py unbranded {tox_root} + python {tox_root}/../eng/scripts/ci/run_apiview.py -t unbranded -s generated {posargs} + python {tox_root}/../eng/scripts/ci/run_sphinx_build.py -t unbranded -s generated {posargs} + +# ============================================================================= +# CI environments (combines all checks) +# ============================================================================= + +[testenv:ci-azure] +description = Run full CI for Azure flavor +setenv = + {[testenv]setenv} + FLAVOR = azure +deps = + -r {tox_root}/requirements/lint.txt + -r {tox_root}/requirements/typecheck.txt + -r {tox_root}/requirements/azure.txt + -e {tox_root}/../generator +commands = + python {tox_root}/install_packages.py azure {tox_root} + pytest mock_api/azure mock_api/shared -v -n auto + python {tox_root}/../eng/scripts/ci/run_pylint.py -t azure -s generated + python {tox_root}/../eng/scripts/ci/run_mypy.py -t azure -s generated + python {tox_root}/../eng/scripts/ci/run_pyright.py -t azure -s generated + +[testenv:ci-unbranded] +description = Run full CI for unbranded flavor +setenv = + {[testenv]setenv} + FLAVOR = unbranded +deps = + -r {tox_root}/requirements/lint.txt + -r {tox_root}/requirements/typecheck.txt + -r {tox_root}/requirements/unbranded.txt + -e {tox_root}/../generator +commands = + python {tox_root}/install_packages.py unbranded {tox_root} + pytest mock_api/unbranded mock_api/shared -v -n auto + python {tox_root}/../eng/scripts/ci/run_pylint.py -t unbranded -s generated + python {tox_root}/../eng/scripts/ci/run_mypy.py -t unbranded -s generated + python {tox_root}/../eng/scripts/ci/run_pyright.py -t unbranded -s generated diff --git a/packages/http-client-python/generator/test/unittests/conftest.py b/packages/http-client-python/tests/unit/conftest.py similarity index 100% rename from packages/http-client-python/generator/test/unittests/conftest.py rename to packages/http-client-python/tests/unit/conftest.py diff --git a/packages/http-client-python/generator/test/unittests/requirements.txt b/packages/http-client-python/tests/unit/requirements.txt similarity index 100% rename from packages/http-client-python/generator/test/unittests/requirements.txt rename to packages/http-client-python/tests/unit/requirements.txt diff --git a/packages/http-client-python/tests/unit/test_enums.py b/packages/http-client-python/tests/unit/test_enums.py new file mode 100644 index 00000000000..2b671c90996 --- /dev/null +++ b/packages/http-client-python/tests/unit/test_enums.py @@ -0,0 +1,89 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +from enum import Enum, EnumMeta +from specialwords.extensiblestrings import models as extensible_strings_models + + +class _CaseInsensitiveEnumMeta(EnumMeta): + def __getitem__(self, name): + return super().__getitem__(name.upper()) + + def __getattr__(cls, name): + """Return the enum member matching `name` + We use __getattr__ instead of descriptors or inserting into the enum + class' __dict__ in order to support `name` and `value` being both + properties for enum members (which live in the class' __dict__) and + enum members themselves. + """ + try: + return cls._member_map_[name.upper()] + except KeyError: + raise AttributeError(name) + + +class EnumsWithCallableNames(str, Enum, metaclass=_CaseInsensitiveEnumMeta): + """Gets the unit of measurement.""" + + COUNT = "count" + ENCODE = "encode" + FIND = "find" + JOIN = "join" + + +def test_count(): + assert EnumsWithCallableNames.COUNT == "count" + assert callable(EnumsWithCallableNames.count) + + +def test_encode(): + assert EnumsWithCallableNames.ENCODE == "encode" + assert callable(EnumsWithCallableNames.encode) + + +def test_find(): + assert EnumsWithCallableNames.FIND == "find" + assert callable(EnumsWithCallableNames.find) + + +def test_join(): + assert EnumsWithCallableNames.JOIN == "join" + assert callable(EnumsWithCallableNames.join) + + +def test_extensible_strings_enum_with_special_words(): + assert extensible_strings_models.ExtensibleString.AND == "and" + assert extensible_strings_models.ExtensibleString.AS == "as" + assert extensible_strings_models.ExtensibleString.ASSERT == "assert" + assert extensible_strings_models.ExtensibleString.ASYNC == "async" + assert extensible_strings_models.ExtensibleString.AWAIT == "await" + assert extensible_strings_models.ExtensibleString.BREAK == "break" + assert extensible_strings_models.ExtensibleString.CLASS == "class" + assert extensible_strings_models.ExtensibleString.CONSTRUCTOR == "constructor" + assert extensible_strings_models.ExtensibleString.CONTINUE == "continue" + assert extensible_strings_models.ExtensibleString.DEF == "def" + assert extensible_strings_models.ExtensibleString.DEL == "del" + assert extensible_strings_models.ExtensibleString.ELIF == "elif" + assert extensible_strings_models.ExtensibleString.ELSE == "else" + assert extensible_strings_models.ExtensibleString.EXCEPT == "except" + assert extensible_strings_models.ExtensibleString.EXEC == "exec" + assert extensible_strings_models.ExtensibleString.FINALLY == "finally" + assert extensible_strings_models.ExtensibleString.FOR == "for" + assert extensible_strings_models.ExtensibleString.FROM == "from" + assert extensible_strings_models.ExtensibleString.GLOBAL == "global" + assert extensible_strings_models.ExtensibleString.IF == "if" + assert extensible_strings_models.ExtensibleString.IMPORT == "import" + assert extensible_strings_models.ExtensibleString.IN == "in" + assert extensible_strings_models.ExtensibleString.IS == "is" + assert extensible_strings_models.ExtensibleString.LAMBDA == "lambda" + assert extensible_strings_models.ExtensibleString.NOT == "not" + assert extensible_strings_models.ExtensibleString.OR == "or" + assert extensible_strings_models.ExtensibleString.PASS == "pass" + assert extensible_strings_models.ExtensibleString.RAISE == "raise" + assert extensible_strings_models.ExtensibleString.RETURN == "return" + assert extensible_strings_models.ExtensibleString.TRY == "try" + assert extensible_strings_models.ExtensibleString.WHILE == "while" + assert extensible_strings_models.ExtensibleString.WITH == "with" + assert extensible_strings_models.ExtensibleString.YIELD == "yield" diff --git a/packages/http-client-python/generator/test/unittests/test_model_base_serialization.py b/packages/http-client-python/tests/unit/test_model_base_serialization.py similarity index 96% rename from packages/http-client-python/generator/test/unittests/test_model_base_serialization.py rename to packages/http-client-python/tests/unit/test_model_base_serialization.py index 8e37a85f177..93c1aab2270 100644 --- a/packages/http-client-python/generator/test/unittests/test_model_base_serialization.py +++ b/packages/http-client-python/tests/unit/test_model_base_serialization.py @@ -4743,3 +4743,164 @@ class MyModel(Model): assert dict_ref1 is dict_ref2 assert isinstance(dict_ref1["start"], datetime) assert isinstance(dict_ref2["start"], datetime) + + +def test_eq_same_model_instances(): + """Two model instances with the same data should be equal.""" + model1 = BasicResource( + platform_update_domain_count=5, + platform_fault_domain_count=3, + virtual_machines=[], + ) + model2 = BasicResource( + platform_update_domain_count=5, + platform_fault_domain_count=3, + virtual_machines=[], + ) + assert model1 == model2 + + +def test_eq_different_model_data(): + """Two model instances with different data should not be equal.""" + model1 = BasicResource( + platform_update_domain_count=5, + platform_fault_domain_count=3, + virtual_machines=[], + ) + model2 = BasicResource( + platform_update_domain_count=10, + platform_fault_domain_count=3, + virtual_machines=[], + ) + assert model1 != model2 + + +def test_eq_model_constructed_from_dict(): + """A model created via kwargs and a model created from a dict should be equal.""" + dict_response = { + "platformUpdateDomainCount": 5, + "platformFaultDomainCount": 3, + "virtualMachines": [], + } + model_from_kwargs = BasicResource( + platform_update_domain_count=5, + platform_fault_domain_count=3, + virtual_machines=[], + ) + model_from_dict = BasicResource(dict_response) + assert model_from_kwargs == model_from_dict + + +def test_eq_model_equal_to_plain_dict(): + """A model should be equal to a plain dict with matching data (backward compat).""" + dict_response = { + "platformUpdateDomainCount": 5, + "platformFaultDomainCount": 3, + "virtualMachines": [], + } + model = BasicResource( + platform_update_domain_count=5, + platform_fault_domain_count=3, + virtual_machines=[], + ) + assert model == dict_response + + +def test_eq_model_not_equal_to_non_model_types(): + """A model should not be equal to strings, ints, None, or lists.""" + model = BasicResource( + platform_update_domain_count=5, + platform_fault_domain_count=3, + virtual_machines=[], + ) + assert model != "some string" + assert model != 42 + assert model != None # noqa: E711 + assert model != [] + assert model != True # noqa: E712 + + +def test_eq_different_model_types_same_data(): + """Two different model types with the same underlying _data should be equal + since isinstance checks against _MyMutableMapping, not the specific subclass.""" + model1 = Pet(name="test", species="dog") + + class AnotherModel(Model): + name: str = rest_field() + species: str = rest_field() + + @overload + def __init__(self, *, name: str, species: str): ... + + @overload + def __init__(self, mapping: Mapping[str, Any], /): ... + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + model2 = AnotherModel(name="test", species="dog") + assert model1 == model2 + + +def test_ne_is_inverse_of_eq(): + """__ne__ should return the inverse of __eq__.""" + model1 = BasicResource( + platform_update_domain_count=5, + platform_fault_domain_count=3, + virtual_machines=[], + ) + model2 = BasicResource( + platform_update_domain_count=5, + platform_fault_domain_count=3, + virtual_machines=[], + ) + model3 = BasicResource( + platform_update_domain_count=10, + platform_fault_domain_count=3, + virtual_machines=[], + ) + assert not (model1 != model2) + assert model1 != model3 + + +def test_eq_nested_models(): + """Two models with identical nested model children should be equal.""" + model1 = OptionalModel( + optional_str="hello", + optional_time=datetime.time(11, 34, 56), + optional_dict={ + "buddy": Pet(name="Buddy", species="Dog"), + }, + optional_myself=OptionalModel(optional_str="inner"), + ) + model2 = OptionalModel( + optional_str="hello", + optional_time=datetime.time(11, 34, 56), + optional_dict={ + "buddy": Pet(name="Buddy", species="Dog"), + }, + optional_myself=OptionalModel(optional_str="inner"), + ) + assert model1 == model2 + + # Change the nested model's data — they should no longer be equal + model2_different_inner = OptionalModel( + optional_str="hello", + optional_time=datetime.time(11, 34, 56), + optional_dict={ + "buddy": Pet(name="Buddy", species="Dog"), + }, + optional_myself=OptionalModel(optional_str="different"), + ) + assert model1 != model2_different_inner + + # Change the nested Pet — they should no longer be equal + model2_different_pet = OptionalModel( + optional_str="hello", + optional_time=datetime.time(11, 34, 56), + optional_dict={ + "buddy": Pet(name="Max", species="Cat"), + }, + optional_myself=OptionalModel(optional_str="inner"), + ) + assert model1 != model2_different_pet diff --git a/packages/http-client-python/tests/unit/test_model_base_xml_serialization.py b/packages/http-client-python/tests/unit/test_model_base_xml_serialization.py new file mode 100644 index 00000000000..f026fa6afd5 --- /dev/null +++ b/packages/http-client-python/tests/unit/test_model_base_xml_serialization.py @@ -0,0 +1,1239 @@ +# ------------------------------------ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT License. +# ------------------------------------ +import xml.etree.ElementTree as ET + +from typing import Literal, Optional + +from specialwords._utils.model_base import ( + _get_element, + Model, + rest_field, + rest_discriminator, + _deserialize_xml, +) + + +def assert_xml_equals(x1, x2): + ET.dump(x1) + ET.dump(x2) + + assert x1.tag == x2.tag + assert (x1.text or "").strip() == (x2.text or "").strip() + # assert x1.tail == x2.tail # Swagger does not change tail + assert x1.attrib == x2.attrib + assert len(x1) == len(x2) + for c1, c2 in zip(x1, x2): + assert_xml_equals(c1, c2) + + +class TestXmlDeserialization: + def test_basic(self): + """Test an ultra basic XML.""" + basic_xml = """ + + 12 + + 12.34 + + true + + test + + """ + + class XmlModel(Model): + int_field: int = rest_field(name="int", xml={"name": "Int"}) + empty_int: int = rest_field(name="empty_int", xml={"name": "EmptyInt"}) + float_field: float = rest_field(name="float", xml={"name": "Float"}) + empty_float: float = rest_field(name="empty_float", xml={"name": "EmptyFloat"}) + bool_field: bool = rest_field(name="bool", xml={"name": "Bool"}) + empty_bool: bool = rest_field(name="empty_bool", xml={"name": "EmptyBool"}) + string: str = rest_field(name="string", xml={"name": "String"}) + empty_string: str = rest_field(name="empty_string", xml={"name": "EmptyString"}) + not_set: str = rest_field(name="not_set", xml={"name": "NotSet"}) + country: str = rest_field(name="country", xml={"name": "country", "attribute": True}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Data"} + + result = _deserialize_xml(XmlModel, basic_xml) + + assert result.int_field == 12 + assert result.empty_int is None + assert result.float_field == 12.34 + assert result.empty_float is None + assert result.bool_field is True + assert result.empty_bool is None + assert result.string == "test" + assert result.country == "france" + assert result.empty_string == "" + assert result.not_set is None + + def test_basic_unicode(self): + """Test a XML with unicode.""" + basic_xml = """ + """ + + class XmlModel(Model): + language: str = rest_field(name="language", xml={"name": "language", "attribute": True}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Data"} + + result = _deserialize_xml(XmlModel, basic_xml) + + assert result.language == "français" + + def test_basic_text(self): + """Test a XML with unicode.""" + basic_xml = """ + I am text""" + + class XmlModel(Model): + language: str = rest_field(name="language", xml={"name": "language", "attribute": True}) + content: str = rest_field(name="content", xml={"name": "content", "text": True}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Data"} + + result = _deserialize_xml(XmlModel, basic_xml) + + assert result.language == "english" + assert result.content == "I am text" + + def test_dict_type(self): + """Test dict type.""" + basic_xml = """ + + + value1 + value2 + + """ + + class XmlModel(Model): + metadata: dict[str, str] = rest_field(name="Metadata", xml={"name": "Metadata"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Data"} + + result = _deserialize_xml(XmlModel, basic_xml) + + assert len(result.metadata) == 2 + assert result.metadata["Key1"] == "value1" + assert result.metadata["Key2"] == "value2" + + def test_basic_empty_list(self): + """Test an basic XML with an empty node.""" + basic_xml = """ + + + """ + + class XmlModel(Model): + age: list[str] = rest_field(name="age", xml={"name": "Age"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Data"} + + result = _deserialize_xml(XmlModel, basic_xml) + assert result.age == [] + + def test_basic_empty_list_unwrapped(self): + """Test an basic XML with an empty node.""" + basic_xml = """ + """ + + class XmlModel(Model): + age: list[str] = rest_field(name="age", xml={"name": "Age", "unwrapped": True}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Data"} + + result = _deserialize_xml(XmlModel, basic_xml) + assert result.age == [] + + def test_list_wrapped_items_name_basic_types(self): + """Test XML list and wrap, items is basic type and there is itemsName.""" + + basic_xml = """ + + + granny + fuji + + """ + + class AppleBarrel(Model): + good_apples: list[str] = rest_field(name="GoodApples", xml={"name": "GoodApples", "itemsName": "Apple"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "AppleBarrel"} + + result = _deserialize_xml(AppleBarrel, basic_xml) + assert result.good_apples == ["granny", "fuji"] + + def test_list_not_wrapped_items_name_basic_types(self): + """Test XML list and no wrap, items is basic type and there is itemsName.""" + + basic_xml = """ + + granny + fuji + """ + + class AppleBarrel(Model): + good_apples: list[str] = rest_field( + name="GoodApples", + xml={"name": "GoodApples", "unwrapped": True, "itemsName": "Apple"}, + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "AppleBarrel"} + + result = _deserialize_xml(AppleBarrel, basic_xml) + assert result.good_apples == ["granny", "fuji"] + + def test_list_wrapped_items_name_complex_types(self): + """Test XML list and wrap, items is ref and there is itemsName.""" + + basic_xml = """ + + + + + + """ + + class Apple(Model): + name: str = rest_field(name="name", xml={"name": "name", "attribute": True}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Apple"} + + class AppleBarrel(Model): + good_apples: list[Apple] = rest_field(name="GoodApples", xml={"name": "GoodApples", "itemsName": "Apple"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "AppleBarrel"} + + result = _deserialize_xml(AppleBarrel, basic_xml) + assert [apple.name for apple in result.good_apples] == ["granny", "fuji"] + + def test_list_not_wrapped_items_name_complex_types(self): + """Test XML list and wrap, items is ref and there is itemsName.""" + + basic_xml = """ + + + + """ + + class Apple(Model): + name: str = rest_field(name="name", xml={"name": "name", "attribute": True}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Apple"} + + class AppleBarrel(Model): + good_apples: list[Apple] = rest_field( + name="GoodApples", + xml={"name": "GoodApples", "unwrapped": True, "itemsName": "Apple"}, + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "AppleBarrel"} + + result = _deserialize_xml(AppleBarrel, basic_xml) + assert [apple.name for apple in result.good_apples] == ["granny", "fuji"] + + def test_list_not_wrapped_items_name_complex_types(self): + """Test XML list and wrap, items is ref and there is itemsName.""" + + basic_xml = """ + + + + """ + + class Apple(Model): + name: str = rest_field(name="name", xml={"name": "name", "attribute": True}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Apple"} + + class AppleBarrel(Model): + good_apples: list[Apple] = rest_field( + name="GoodApples", + xml={"name": "GoodApples", "unwrapped": True, "itemsName": "Apple"}, + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "AppleBarrel"} + + result = _deserialize_xml(AppleBarrel, basic_xml) + assert [apple.name for apple in result.good_apples] == ["granny", "fuji"] + + def test_basic_additional_properties(self): + """Test additional properties.""" + basic_xml = """ + + text + + a + b + c + + + a + b + + """ + + class XmlModel(Model): + name: str = rest_field(name="name", xml={"name": "Name"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Data"} + + result = _deserialize_xml(XmlModel, basic_xml) + + assert result.name is None + assert result["add1"] == "text" + assert result["add2"] == ["a", "b", "c"] + assert result["add3"] == {"a": "a", "b": "b"} + + def test_basic_namespace(self): + """Test an ultra basic XML.""" + basic_xml = """ + + 37 + """ + + class XmlModel(Model): + age: int = rest_field( + name="age", + xml={ + "name": "Age", + "prefix": "fictional", + "ns": "http://characters.example.com", + }, + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Data"} + + result = _deserialize_xml(XmlModel, basic_xml) + assert result.age == 37 + + def test_complex_namespace(self): + """Test recursive namespace.""" + basic_xml = """ + + + lmazuel + + + + testpolicy + + + + 12 + + """ + + class QueueDescriptionResponseAuthor(Model): + name: str = rest_field(name="name", xml={"ns": "http://www.w3.org/2005/Atom"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"ns": "http://www.w3.org/2005/Atom"} + + class AuthorizationRule(Model): + type: str = rest_field( + name="type", + xml={ + "attribute": True, + "prefix": "i", + "ns": "http://www.w3.org/2001/XMLSchema-instance", + }, + ) + key_name: str = rest_field( + name="KeyName", + xml={"ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect"}, + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect"} + + class MessageCountDetails(Model): + active_message_count: int = rest_field( + name="ActiveMessageCount", + xml={ + "prefix": "d2p1", + "ns": "http://schemas.microsoft.com/netservices/2011/06/servicebus", + }, + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = { + "name": "CountDetails", + "ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect", + } + + class XmlRoot(Model): + author: QueueDescriptionResponseAuthor = rest_field(name="author") + authorization_rules: list[AuthorizationRule] = rest_field( + name="AuthorizationRules", + xml={ + "ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect", + }, + ) + message_count_details: MessageCountDetails = rest_field( + name="MessageCountDetails", + xml={ + "ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect", + }, + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "entry", "ns": "http://www.w3.org/2005/Atom"} + + result = _deserialize_xml(XmlRoot, basic_xml) + + assert result.author.name == "lmazuel" + assert result.authorization_rules[0].key_name == "testpolicy" + assert result.authorization_rules[0].type == "SharedAccessAuthorizationRule" + assert result.message_count_details.active_message_count == 12 + + def test_polymorphic_deserialization(self): + basic_xml = """ + + + 12 + + """ + + class RuleFilter(Model): + __mapping__: dict[str, Model] = {} + type: Literal[None] = rest_discriminator( + name="type", + xml={ + "attribute": True, + "prefix": "xsi", + "ns": "http://www.w3.org/2001/XMLSchema-instance", + }, + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.type: Literal[None] = None + + _xml = {"name": "Filter"} + + class CorrelationFilter(RuleFilter): + type: Literal["CorrelationFilter"] = rest_discriminator( + name="type", + xml={ + "attribute": True, + "prefix": "xsi", + "ns": "http://www.w3.org/2001/XMLSchema-instance", + }, + ) + correlation_id: int = rest_field(name="CorrelationId") + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.type: Literal["CorrelationFilter"] = "CorrelationFilter" + + class SqlFilter(RuleFilter): + type: Literal["SqlFilter"] = rest_discriminator( + name="type", + xml={ + "attribute": True, + "prefix": "xsi", + "ns": "http://www.w3.org/2001/XMLSchema-instance", + }, + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.type: Literal["SqlFilter"] = "SqlFilter" + + class XmlRoot(Model): + filter: RuleFilter = rest_field(name="Filter") + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "entry"} + + result = _deserialize_xml(XmlRoot, basic_xml) + + assert isinstance(result.filter, CorrelationFilter) + assert result.filter.correlation_id == 12 + + def test_enumeration_results(self): + """Test deserializing an Azure Blob Storage EnumerationResults XML payload.""" + xml_payload = '/' + + class EnumerationResults(Model): + service_endpoint: str = rest_field( + name="ServiceEndpoint", xml={"name": "ServiceEndpoint", "attribute": True} + ) + container_name: str = rest_field(name="ContainerName", xml={"name": "ContainerName", "attribute": True}) + delimiter: str = rest_field(name="Delimiter", xml={"name": "Delimiter"}) + blobs: list[str] = rest_field(name="Blobs", xml={"name": "Blobs"}) + next_marker: str = rest_field(name="NextMarker", xml={"name": "NextMarker"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "EnumerationResults"} + + result = _deserialize_xml(EnumerationResults, xml_payload) + + assert result.service_endpoint == "https://service.blob.core.windows.net/" + assert result.container_name == "my-container-108f32e8" + assert result.delimiter == "/" + assert result.blobs == [] + assert result.next_marker == "" + + def test_enumeration_results_nested_empty_list(self): + """Test deserializing XML where a container element holds a nested empty list (e.g. Blobs/BlobPrefixes).""" + xml_payload = '/' + + class BlobPrefix(Model): + name: str = rest_field(name="Name", xml={"name": "Name"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "BlobPrefix"} + + class BlobsSegment(Model): + blob_prefixes: list[BlobPrefix] = rest_field( + name="BlobPrefixes", xml={"name": "BlobPrefixes", "itemsName": "BlobPrefix"} + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Blobs"} + + class EnumerationResults(Model): + service_endpoint: str = rest_field( + name="ServiceEndpoint", xml={"name": "ServiceEndpoint", "attribute": True} + ) + container_name: str = rest_field(name="ContainerName", xml={"name": "ContainerName", "attribute": True}) + delimiter: str = rest_field(name="Delimiter", xml={"name": "Delimiter"}) + blobs: BlobsSegment = rest_field(name="Blobs", xml={"name": "Blobs"}) + next_marker: str = rest_field(name="NextMarker", xml={"name": "NextMarker"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "EnumerationResults"} + + result = _deserialize_xml(EnumerationResults, xml_payload) + + assert result.service_endpoint == "https://service.blob.core.windows.net/" + assert result.container_name == "my-container" + assert result.delimiter == "/" + assert result.blobs.blob_prefixes == [] + assert result.next_marker == "" + + def test_enumeration_results_azure_sdk_pattern(self): + """Test the real Azure SDK model pattern where BlobsSegment has two unwrapped list fields.""" + # Both blob_prefixes and blob_items are unwrapped lists (items appear directly in ). + # With , no matching children are found so both are None. + xml_payload = '/' + + class BlobPrefix(Model): + name: str = rest_field(name="Name", xml={"name": "Name"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "BlobPrefix"} + + class BlobItem(Model): + name: str = rest_field(name="Name", xml={"name": "Name"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Blob"} + + class BlobsSegment(Model): + blob_prefixes: list[BlobPrefix] = rest_field( + name="blob_prefixes", xml={"name": "BlobPrefix", "unwrapped": True} + ) + blob_items: list[BlobItem] = rest_field(name="blob_items", xml={"name": "Blob", "unwrapped": True}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Blobs"} + + class EnumerationResults(Model): + service_endpoint: str = rest_field( + name="ServiceEndpoint", xml={"name": "ServiceEndpoint", "attribute": True} + ) + container_name: str = rest_field(name="ContainerName", xml={"name": "ContainerName", "attribute": True}) + delimiter: str = rest_field(name="Delimiter", xml={"name": "Delimiter"}) + blobs: BlobsSegment = rest_field(name="Blobs", xml={"name": "Blobs"}) + next_marker: str = rest_field(name="NextMarker", xml={"name": "NextMarker"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "EnumerationResults"} + + result = _deserialize_xml(EnumerationResults, xml_payload) + + assert result.service_endpoint == "https://service.blob.core.windows.net/" + assert result.container_name == "my-container" + assert result.delimiter == "/" + assert isinstance(result.blobs, BlobsSegment) + # With , no or children exist → unwrapped non-optional lists default to [] + assert result.blobs.blob_prefixes == [] + assert result.blobs.blob_items == [] + assert result.next_marker == "" + + def test_enumeration_results_azure_sdk_pattern_optional(self): + """Test the Azure SDK pattern where unwrapped list fields are Optional[list[X]]. + + When the type is Optional[list[X]], empty unwrapped lists should stay None + (the element is absent, and None is a valid value for the optional type). + """ + xml_payload = '/' + + class BlobPrefix(Model): + name: str = rest_field(name="Name", xml={"name": "Name"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "BlobPrefix"} + + class BlobItem(Model): + name: str = rest_field(name="Name", xml={"name": "Name"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Blob"} + + class BlobsSegment(Model): + blob_prefixes: Optional[list[BlobPrefix]] = rest_field( + name="blob_prefixes", xml={"name": "BlobPrefix", "unwrapped": True} + ) + blob_items: Optional[list[BlobItem]] = rest_field( + name="blob_items", xml={"name": "Blob", "unwrapped": True} + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Blobs"} + + class EnumerationResults(Model): + service_endpoint: str = rest_field( + name="ServiceEndpoint", xml={"name": "ServiceEndpoint", "attribute": True} + ) + container_name: str = rest_field(name="ContainerName", xml={"name": "ContainerName", "attribute": True}) + delimiter: str = rest_field(name="Delimiter", xml={"name": "Delimiter"}) + blobs: BlobsSegment = rest_field(name="Blobs", xml={"name": "Blobs"}) + next_marker: str = rest_field(name="NextMarker", xml={"name": "NextMarker"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "EnumerationResults"} + + result = _deserialize_xml(EnumerationResults, xml_payload) + + assert result.service_endpoint == "https://service.blob.core.windows.net/" + assert result.container_name == "my-container" + assert result.delimiter == "/" + assert isinstance(result.blobs, BlobsSegment) + # With , no or children exist → Optional lists stay None + assert result.blobs.blob_prefixes is None + assert result.blobs.blob_items is None + assert result.next_marker == "" + + def test_enumeration_results_blobs_unwrapped(self): + """Test what happens when the blobs field itself is declared with unwrapped=True.""" + # When a non-list model field uses unwrapped=True, the matching XML elements are collected + # as a list and stored as-is (the field receives a list of ET.Element objects). + xml_payload = '/' + + class BlobPrefix(Model): + name: str = rest_field(name="Name", xml={"name": "Name"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "BlobPrefix"} + + class BlobsSegment(Model): + blob_prefixes: list[BlobPrefix] = rest_field( + name="BlobPrefixes", xml={"name": "BlobPrefixes", "itemsName": "BlobPrefix"} + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Blobs"} + + class EnumerationResults(Model): + service_endpoint: str = rest_field( + name="ServiceEndpoint", xml={"name": "ServiceEndpoint", "attribute": True} + ) + container_name: str = rest_field(name="ContainerName", xml={"name": "ContainerName", "attribute": True}) + delimiter: str = rest_field(name="Delimiter", xml={"name": "Delimiter"}) + # unwrapped=True on a model-typed field: the deserialization collects matching XML + # elements as a list (rather than deserializing them into the model). + blobs: BlobsSegment = rest_field(name="Blobs", xml={"name": "Blobs", "unwrapped": True}) + next_marker: str = rest_field(name="NextMarker", xml={"name": "NextMarker"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "EnumerationResults"} + + result = _deserialize_xml(EnumerationResults, xml_payload) + + assert result.service_endpoint == "https://service.blob.core.windows.net/" + assert result.container_name == "my-container" + assert result.delimiter == "/" + # unwrapped=True on a model field collects matching elements; is found so it + # returns a list containing the raw ET.Element instead of a deserialized BlobsSegment. + assert isinstance(result.blobs, list) + assert len(result.blobs) == 1 + assert isinstance(result.blobs[0], ET.Element) + assert result.next_marker == "" + + +class TestXmlSerialization: + def test_basic(self): + """Test an ultra basic XML.""" + basic_xml = ET.fromstring( + """ + + 37 + """ + ) + + class XmlModel(Model): + age: int = rest_field(xml={"name": "Age"}) + country: str = rest_field(xml={"name": "country", "attribute": True}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Data"} + + xml_model = XmlModel(age=37, country="france") + assert_xml_equals(_get_element(xml_model), basic_xml) + + def test_basic_unicode(self): + """Test a XML with unicode.""" + basic_xml = ET.fromstring( + """ + """.encode( + "utf-8" + ) + ) + + class XmlModel(Model): + language: str = rest_field(xml={"name": "language", "attribute": True}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Data"} + + xml_model = XmlModel(language="français") + assert_xml_equals(_get_element(xml_model), basic_xml) + + def test_nested_unicode(self): + class XmlModel(Model): + message_text: str = rest_field(name="MessageText", xml={"name": "MessageText"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Message"} + + xml_model_no_unicode = XmlModel(message_text="message1") + xml_element = _get_element(xml_model_no_unicode) + xml_content = ET.tostring(xml_element, encoding="utf8") + assert ( + xml_content + == b"\nmessage1" + ) + + xml_model_with_unicode = XmlModel(message_text="message1㚈") + xml_element = _get_element(xml_model_with_unicode) + xml_content = ET.tostring(xml_element, encoding="utf8") + assert ( + xml_content + == b"\nmessage1\xe3\x9a\x88" + ) + + def test_type_basic(self): + """Test basic types.""" + basic_xml = ET.fromstring( + """ + + 37 + true + """ + ) + + class XmlModel(Model): + age: int = rest_field(name="age", xml={"name": "Age"}) + enabled: bool = rest_field(name="enabled", xml={"name": "Enabled"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Data"} + + xml_model = XmlModel(age=37, enabled=True) + assert_xml_equals(_get_element(xml_model), basic_xml) + + def test_basic_text(self): + """Test a XML with unicode.""" + basic_xml = ET.fromstring( + """ + I am text""" + ) + + class XmlModel(Model): + language: str = rest_field(name="language", xml={"name": "language", "attribute": True}) + content: str = rest_field(name="content", xml={"text": True}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Data"} + + xml_model = XmlModel(language="english", content="I am text") + assert_xml_equals(_get_element(xml_model), basic_xml) + + def test_dict_type(self): + """Test dict type.""" + basic_xml = ET.fromstring( + """ + + + value1 + value2 + + """ + ) + + class XmlModel(Model): + metadata: dict[str, str] = rest_field(name="Metadata", xml={"name": "Metadata"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Data"} + + xml_model = XmlModel( + metadata={ + "Key1": "value1", + "Key2": "value2", + } + ) + assert_xml_equals(_get_element(xml_model), basic_xml) + + def test_additional_properties(self): + """Test additional properties.""" + basic_xml = ET.fromstring( + """ + + test + text + + a + b + c + + + a + b + + """ + ) + + class XmlModel(Model): + name: str = rest_field(name="name", xml={"name": "Name"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Data"} + + xml_model = XmlModel( + { + "name": "test", + "add1": "text", + "add2": ["a", "b", "c"], + "add3": {"a": "a", "b": "b"}, + } + ) + assert_xml_equals(_get_element(xml_model), basic_xml) + + def test_list_wrapped_basic_types(self): + """Test XML list and wrap, items is basic type and there is no itemsName.""" + + basic_xml = ET.fromstring( + """ + + + granny + fuji + + """ + ) + + class AppleBarrel(Model): + good_apples: list[str] = rest_field(name="GoodApples", xml={"name": "GoodApples"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "AppleBarrel"} + + xml_model = AppleBarrel(good_apples=["granny", "fuji"]) + assert_xml_equals(_get_element(xml_model), basic_xml) + + def test_list_not_wrapped_basic_types(self): + """Test XML list and no wrap, items is basic type and there is no itemsName.""" + + basic_xml = ET.fromstring( + """ + + granny + fuji + """ + ) + + class AppleBarrel(Model): + good_apples: list[str] = rest_field(name="GoodApples", xml={"name": "GoodApples", "unwrapped": True}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "AppleBarrel"} + + xml_model = AppleBarrel(good_apples=["granny", "fuji"]) + assert_xml_equals(_get_element(xml_model), basic_xml) + + def test_list_wrapped_basic_types_items_name(self): + """Test XML list and wrap, items is basic type and itemsName.""" + + basic_xml = ET.fromstring( + """ + + + granny + fuji + + """ + ) + + class AppleBarrel(Model): + good_apples: list[str] = rest_field(name="GoodApples", xml={"name": "GoodApples", "itemsName": "string"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "AppleBarrel"} + + xml_model = AppleBarrel(good_apples=["granny", "fuji"]) + assert_xml_equals(_get_element(xml_model), basic_xml) + + def test_list_not_wrapped_basic_types_items_name(self): + """Test XML list and no wrap, items is basic type and itemsName.""" + + basic_xml = ET.fromstring( + """ + + granny + fuji + """ + ) + + class AppleBarrel(Model): + good_apples: list[str] = rest_field( + name="GoodApples", + xml={"name": "GoodApples", "unwrapped": True, "itemsName": "string"}, + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "AppleBarrel"} + + xml_model = AppleBarrel(good_apples=["granny", "fuji"]) + assert_xml_equals(_get_element(xml_model), basic_xml) + + def test_list_wrapped_complex_types(self): + """Test XML list and wrap, items is ref.""" + + basic_xml = ET.fromstring( + """ + + + + + + """ + ) + + class Apple(Model): + name: str = rest_field(name="name", xml={"name": "name", "attribute": True}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Apple"} + + class AppleBarrel(Model): + good_apples: list[Apple] = rest_field(name="GoodApples", xml={"name": "GoodApples"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "AppleBarrel"} + + test = AppleBarrel({"GoodApples": [{"name": "granny"}, {"name": "fuji"}]}) + xml_model = AppleBarrel(good_apples=[Apple(name="granny"), Apple(name="fuji")]) + assert_xml_equals(_get_element(xml_model), basic_xml) + + def test_list_not_wrapped_complex_types(self): + """Test XML list and wrap, items is ref.""" + + basic_xml = ET.fromstring( + """ + + + + """ + ) + + class Apple(Model): + name: str = rest_field(name="name", xml={"name": "name", "attribute": True}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Apple"} + + class AppleBarrel(Model): + good_apples: list[Apple] = rest_field(name="GoodApples", xml={"name": "GoodApples", "unwrapped": True}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + xml_model = AppleBarrel(good_apples=[Apple(name="granny"), Apple(name="fuji")]) + assert_xml_equals(_get_element(xml_model), basic_xml) + + def test_two_complex_same_type(self): + """Two different attribute are same type""" + + basic_xml = ET.fromstring( + """ + + + + """ + ) + + class Apple(Model): + name: str = rest_field(name="name", xml={"name": "name", "attribute": True}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Apple"} + + class AppleBarrel(Model): + eu_apple: Apple = rest_field(name="EuropeanApple", xml={"name": "EuropeanApple"}) + us_apple: Apple = rest_field(name="USAApple", xml={"name": "USAApple"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + xml_model = AppleBarrel( + eu_apple=Apple(name="granny"), + us_apple=Apple(name="fuji"), + ) + assert_xml_equals(_get_element(xml_model), basic_xml) + + def test_basic_namespace(self): + """Test an ultra basic XML.""" + basic_xml = ET.fromstring( + """ + + 37 + """ + ) + + class XmlModel(Model): + age: int = rest_field( + name="age", + xml={ + "name": "Age", + "prefix": "fictional", + "ns": "http://characters.example.com", + }, + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "Data"} + + xml_model = XmlModel( + age=37, + ) + assert_xml_equals(_get_element(xml_model), basic_xml) + + def test_complex_namespace(self): + """Test recursive namespace.""" + basic_xml = ET.fromstring( + """ + + + lmazuel + + + + testpolicy + + + + 12 + + """ + ) + + class QueueDescriptionResponseAuthor(Model): + name: str = rest_field(name="name", xml={"ns": "http://www.w3.org/2005/Atom"}) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"ns": "http://www.w3.org/2005/Atom"} + + class AuthorizationRule(Model): + type: str = rest_field( + name="type", + xml={ + "attribute": True, + "prefix": "i", + "ns": "http://www.w3.org/2001/XMLSchema-instance", + }, + ) + key_name: str = rest_field( + name="KeyName", + xml={"ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect"}, + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect"} + + class MessageCountDetails(Model): + active_message_count: int = rest_field( + name="ActiveMessageCount", + xml={ + "prefix": "d2p1", + "ns": "http://schemas.microsoft.com/netservices/2011/06/servicebus", + }, + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = { + "name": "CountDetails", + "ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect", + } + + class XmlRoot(Model): + author: QueueDescriptionResponseAuthor = rest_field(name="author") + authorization_rules: list[AuthorizationRule] = rest_field( + name="AuthorizationRules", + xml={ + "ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect", + }, + ) + message_count_details: MessageCountDetails = rest_field( + name="MessageCountDetails", + xml={ + "ns": "http://schemas.microsoft.com/netservices/2010/10/servicebus/connect", + }, + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + _xml = {"name": "entry", "ns": "http://www.w3.org/2005/Atom"} + + xml_model = XmlRoot( + author=QueueDescriptionResponseAuthor(name="lmazuel"), + authorization_rules=[AuthorizationRule(type="SharedAccessAuthorizationRule", key_name="testpolicy")], + message_count_details=MessageCountDetails(active_message_count=12), + ) + assert_xml_equals(_get_element(xml_model), basic_xml) diff --git a/packages/http-client-python/generator/test/unittests/test_name_converter.py b/packages/http-client-python/tests/unit/test_name_converter.py similarity index 83% rename from packages/http-client-python/generator/test/unittests/test_name_converter.py rename to packages/http-client-python/tests/unit/test_name_converter.py index c205c0b0bae..88a10a20409 100644 --- a/packages/http-client-python/generator/test/unittests/test_name_converter.py +++ b/packages/http-client-python/tests/unit/test_name_converter.py @@ -33,11 +33,3 @@ def test_escaped_reserved_words(): } for name in expected_conversion_parameter: assert pad_reserved_words(name, pad_type=PadType.PARAMETER) == expected_conversion_parameter[name] - - expected_conversion_enum = { - "self": "self", - "mro": "mro_enum", - "continuation_token": "continuation_token", - } - for name in expected_conversion_enum: - assert pad_reserved_words(name, pad_type=PadType.ENUM_VALUE) == expected_conversion_enum[name] diff --git a/packages/http-client-python/generator/test/unittests/test_optional_return_type.py b/packages/http-client-python/tests/unit/test_optional_return_type.py similarity index 100% rename from packages/http-client-python/generator/test/unittests/test_optional_return_type.py rename to packages/http-client-python/tests/unit/test_optional_return_type.py diff --git a/packages/http-client-python/generator/test/unittests/test_parameter_ordering.py b/packages/http-client-python/tests/unit/test_parameter_ordering.py similarity index 100% rename from packages/http-client-python/generator/test/unittests/test_parameter_ordering.py rename to packages/http-client-python/tests/unit/test_parameter_ordering.py diff --git a/packages/http-client-python/generator/test/unittests/test_sort_schema.py b/packages/http-client-python/tests/unit/test_sort_schema.py similarity index 100% rename from packages/http-client-python/generator/test/unittests/test_sort_schema.py rename to packages/http-client-python/tests/unit/test_sort_schema.py diff --git a/packages/http-client-python/generator/test/unittests/tox.ini b/packages/http-client-python/tests/unit/tox.ini similarity index 100% rename from packages/http-client-python/generator/test/unittests/tox.ini rename to packages/http-client-python/tests/unit/tox.ini diff --git a/packages/http-client/CHANGELOG.md b/packages/http-client/CHANGELOG.md index 1a6136bb8af..ad67f8b53df 100644 --- a/packages/http-client/CHANGELOG.md +++ b/packages/http-client/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog - @typespec/http-client +## 0.15.1 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 0.15.0 + +### Bump dependencies + +- [#9446](https://github.com/microsoft/typespec/pull/9446) Upgrade dependencies + + ## 0.14.0 ### Bump dependencies diff --git a/packages/http-client/generated-defs/TypeSpec.HttpClient.ts-test.ts b/packages/http-client/generated-defs/TypeSpec.HttpClient.ts-test.ts index 619fd1f91e9..28eacf3e990 100644 --- a/packages/http-client/generated-defs/TypeSpec.HttpClient.ts-test.ts +++ b/packages/http-client/generated-defs/TypeSpec.HttpClient.ts-test.ts @@ -7,4 +7,4 @@ import type { TypeSpecHttpClientDecorators } from "./TypeSpec.HttpClient.js"; /** * An error here would mean that the exported decorator is not using the same signature. Make sure to have export const $decName: DecNameDecorator = (...) => ... */ -const _: TypeSpecHttpClientDecorators = $decorators["TypeSpec.HttpClient"]; +const _decs: TypeSpecHttpClientDecorators = $decorators["TypeSpec.HttpClient"]; diff --git a/packages/http-client/package.json b/packages/http-client/package.json index 62be564a8eb..08146247242 100644 --- a/packages/http-client/package.json +++ b/packages/http-client/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/http-client", - "version": "0.14.0", + "version": "0.15.1", "type": "module", "main": "dist/src/index.js", "license": "MIT", @@ -23,27 +23,25 @@ } }, "peerDependencies": { - "@alloy-js/core": "^0.22.0", - "@alloy-js/typescript": "^0.22.0", + "@alloy-js/core": "catalog:", + "@alloy-js/typescript": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/emitter-framework": "workspace:^", "@typespec/http": "workspace:^" }, "devDependencies": { - "@alloy-js/cli": "^0.22.0", - "@alloy-js/core": "^0.22.0", - "@alloy-js/rollup-plugin": "^0.1.0", - "@alloy-js/typescript": "^0.22.0", - "@types/node": "~25.0.2", + "@alloy-js/cli": "catalog:", + "@alloy-js/core": "catalog:", + "@alloy-js/rollup-plugin": "catalog:", + "@alloy-js/typescript": "catalog:", + "@types/node": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/emitter-framework": "workspace:^", "@typespec/http": "workspace:^", "@typespec/library-linter": "workspace:^", "@typespec/tspd": "workspace:^", - "eslint": "^9.39.2", - "prettier": "~3.8.0", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "typescript": "catalog:", + "vitest": "catalog:" }, "scripts": { "build": "npm run gen-extern-signature && alloy build && npm run lint-typespec-library", diff --git a/packages/http-server-csharp/CHANGELOG.md b/packages/http-server-csharp/CHANGELOG.md index 87f55cffabb..8b72de70238 100644 --- a/packages/http-server-csharp/CHANGELOG.md +++ b/packages/http-server-csharp/CHANGELOG.md @@ -1,5 +1,32 @@ # Change Log - @typespec/http-server-csharp +## 0.58.0-alpha.27 + +### Bug Fixes + +- [#10175](https://github.com/microsoft/typespec/pull/10175) Emit C# class for models that extend another model with no additional properties + + +## 0.58.0-alpha.26 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + +### Bug Fixes + +- [#9896](https://github.com/microsoft/typespec/pull/9896) Fix missing `using` namespace imports in C# files generated from `MergePatchUpdate` when model properties reference enum or named types from a different namespace +- [#9895](https://github.com/microsoft/typespec/pull/9895) Fix controller generation to use correct ASP.NET Core result methods for non-200/204 status codes. Previously all operations returned `Ok(...)` or `NoContent()` regardless of the declared status code. Now operations returning 202 use `Accepted(...)`, and other status codes use `StatusCode(code, ...)`. +- [#9894](https://github.com/microsoft/typespec/pull/9894) Fix crash when emitting interfaces that contain template operations. Template operations (e.g. `getItem(): T`) within interfaces will simply be skipped when emitting the interface. + + +## 0.58.0-alpha.25 + +### Bump dependencies + +- [#9446](https://github.com/microsoft/typespec/pull/9446) Upgrade dependencies + + ## 0.58.0-alpha.24 ### Bump dependencies diff --git a/packages/http-server-csharp/eng/scripts/emit-scenarios.ts b/packages/http-server-csharp/eng/scripts/emit-scenarios.ts index e8fd8f14e99..bb7980a5d99 100644 --- a/packages/http-server-csharp/eng/scripts/emit-scenarios.ts +++ b/packages/http-server-csharp/eng/scripts/emit-scenarios.ts @@ -185,7 +185,7 @@ async function compileSpec(file: string, options: CompileOptions): Promise=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "tsc -p .", - "watch": "tsc -p . --watch", + "build": "tsc -p tsconfig.build.json", + "watch": "tsc -p tsconfig.build.json --watch", "test": "vitest run", "test:watch": "vitest -w", "test:ui": "vitest --ui", @@ -64,16 +64,16 @@ }, "dependencies": { "@typespec/asset-emitter": "workspace:^", - "change-case": "~5.4.4", - "cross-spawn": "^7.0.6", - "picocolors": "~1.1.1", - "yaml": "~2.8.2", - "yargs": "~18.0.0" + "change-case": "catalog:", + "cross-spawn": "catalog:", + "picocolors": "catalog:", + "yaml": "catalog:", + "yargs": "catalog:" }, "devDependencies": { - "@types/cross-spawn": "~6.0.6", - "@types/node": "~25.0.2", - "@types/yargs": "~17.0.33", + "@types/cross-spawn": "catalog:", + "@types/node": "catalog:", + "@types/yargs": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/http": "workspace:^", "@typespec/http-specs": "workspace:^", @@ -85,15 +85,15 @@ "@typespec/spector": "workspace:^", "@typespec/tspd": "workspace:^", "@typespec/versioning": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "fs-extra": "^11.2.0", - "globby": "~16.1.0", - "inquirer": "^13.1.0", - "ora": "^9.0.0", - "p-limit": "^7.1.1", - "pathe": "^2.0.3", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "fs-extra": "catalog:", + "globby": "catalog:", + "inquirer": "catalog:", + "ora": "catalog:", + "p-limit": "catalog:", + "pathe": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/http-server-csharp/src/lib/interfaces.ts b/packages/http-server-csharp/src/lib/interfaces.ts index d7d80357cd1..ea7a5793626 100644 --- a/packages/http-server-csharp/src/lib/interfaces.ts +++ b/packages/http-server-csharp/src/lib/interfaces.ts @@ -84,18 +84,9 @@ export function checkOrAddNamespaceToScope( case "sourceFile": { const fileNameSpace = scope.sourceFile.meta["ResolvedNamespace"]; if (fileNameSpace && fileNameSpace.startsWith(ns)) return true; - for (const entry of scope.sourceFile.imports.keys()) { - if (entry === ns) { - return true; - } - } - const added: string | undefined = scope.sourceFile.meta["AddedScope"]; - if (added === undefined) { - scope.sourceFile.imports.set(ns, [ns]); - scope.sourceFile.meta["AddedScope"] = ns; - return true; - } - return false; + if (scope.sourceFile.imports.has(ns)) return true; + scope.sourceFile.imports.set(ns, [ns]); + return true; } default: return false; diff --git a/packages/http-server-csharp/src/lib/service.ts b/packages/http-server-csharp/src/lib/service.ts index 82f88ec411d..efa2d09a9c3 100644 --- a/packages/http-server-csharp/src/lib/service.ts +++ b/packages/http-server-csharp/src/lib/service.ts @@ -103,6 +103,7 @@ import { getCSharpType, getCSharpTypeForIntrinsic, getCSharpTypeForScalar, + getControllerReturnStatement, getFreePort, getHttpDeclParameters, getImports, @@ -161,6 +162,7 @@ export async function $onEmit(context: EmitContext) case "StringTemplateSpan": case "TemplateParameter": case "Tuple": + case "FunctionType": return undefined; case "EnumMember": return this.#getOrAddNamespaceForType(type.enum); @@ -783,6 +785,7 @@ export async function $onEmit(context: EmitContext) usings: [], }; for (const [name, operation] of iface.operations) { + if (isTemplateDeclaration(operation)) continue; const doc = getDoc(this.emitter.getProgram(), operation); const returnTypes: Type[] = []; const [httpOp, _] = getHttpOperation(this.emitter.getProgram(), operation); @@ -872,7 +875,7 @@ export async function $onEmit(context: EmitContext) }); const hasResponseValue = response.name !== "void"; - const resultString = `${status === 204 ? "NoContent" : "Ok"}`; + const returnStatement = getControllerReturnStatement(status, hasResponseValue); if (!this.#isMultipartRequest(httpOperation)) { return this.emitter.result.declaration( operation.name, @@ -886,9 +889,9 @@ export async function $onEmit(context: EmitContext) ${ hasResponseValue ? `var result = await ${this.emitter.getContext().resourceName}Impl.${operationName}Async(${getBusinessLogicCallParameters(parameters)}); - return ${resultString}(result);` + ${returnStatement}` : `await ${this.emitter.getContext().resourceName}Impl.${operationName}Async(${getBusinessLogicCallParameters(parameters)}); - return ${resultString}();` + ${returnStatement}` } }`, ); @@ -914,9 +917,9 @@ export async function $onEmit(context: EmitContext) ${ hasResponseValue ? `var result = await ${this.emitter.getContext().resourceName}Impl.${operationName}Async(${getBusinessLogicCallParameters(parameters)}); - return ${resultString}(result);` + ${returnStatement}` : `await ${this.emitter.getContext().resourceName}Impl.${operationName}Async(${getBusinessLogicCallParameters(parameters)}); - return ${resultString}();` + ${returnStatement}` } }`, ); @@ -955,7 +958,7 @@ export async function $onEmit(context: EmitContext) }); const hasResponseValue = response.name !== "void"; - const resultString = `${status === 204 ? "NoContent" : "Ok"}`; + const returnStatement = getControllerReturnStatement(status, hasResponseValue); return this.emitter.result.declaration( operation.name, code` @@ -968,9 +971,9 @@ export async function $onEmit(context: EmitContext) ${ hasResponseValue ? `var result = await ${this.emitter.getContext().resourceName}Impl.${operationName}Async(${getBusinessLogicCallParameters(parameters)}); - return ${resultString}(result);` + ${returnStatement}` : `await ${this.emitter.getContext().resourceName}Impl.${operationName}Async(${getBusinessLogicCallParameters(parameters)}); - return ${resultString}();` + ${returnStatement}` } }`, ); @@ -1003,7 +1006,12 @@ export async function $onEmit(context: EmitContext) .checker.cloneType(responseType, { name: modelName }); responseType = returnedType; } - this.emitter.emitType(responseType); + // TemplateParameter types cannot be emitted (they are unresolved template placeholders). + // Template operations are filtered in interfaceDeclarationOperations, but this guard + // prevents crashes if a TemplateParameter response type is encountered via other paths. + if (responseType.kind !== "TemplateParameter") { + this.emitter.emitType(responseType); + } const context = this.emitter.getContext(); const result = getCSharpType(this.emitter.getProgram(), responseType, context.namespace); @@ -1171,6 +1179,7 @@ export async function $onEmit(context: EmitContext) #createEnumContext(namespace: string, file: SourceFile, name: string): Context { file.imports.set("System.Text.Json", ["System.Text.Json"]); file.imports.set("System.Text.Json.Serialization", ["System.Text.Json.Serialization"]); + file.meta[this.#nsKey] = namespace; return { namespace: namespace, diff --git a/packages/http-server-csharp/src/lib/utils.ts b/packages/http-server-csharp/src/lib/utils.ts index 6926dc3a609..10955435bb7 100644 --- a/packages/http-server-csharp/src/lib/utils.ts +++ b/packages/http-server-csharp/src/lib/utils.ts @@ -1032,9 +1032,34 @@ export function getCSharpStatusCode(entry: HttpStatusCodesEntry): string | undef } } +/** + * Returns the full return statement for a controller action based on the HTTP status code. + * Maps well-known status codes to their idiomatic ASP.NET Core ControllerBase methods, + * and falls back to `StatusCode(code, ...)` for all other numeric codes. + */ +export function getControllerReturnStatement( + status: HttpStatusCodesEntry, + hasValue: boolean, +): string { + if (typeof status === "number") { + switch (status) { + case 200: + return hasValue ? "return Ok(result);" : "return Ok();"; + case 202: + return hasValue ? "return Accepted(result);" : "return Accepted();"; + case 204: + return "return NoContent();"; + default: + return hasValue ? `return StatusCode(${status}, result);` : `return StatusCode(${status});`; + } + } + // Fallback for ranges and "*" + return hasValue ? "return Ok(result);" : "return Ok();"; +} + export function isEmptyResponseModel(program: Program, model: Type): boolean { if (model.kind !== "Model") return false; - if (model.properties.size === 0) return true; + if (model.properties.size === 0 && !model.baseModel) return true; return ( model.properties.size === 1 && @@ -1734,7 +1759,7 @@ export function coalesceTsTypes(program: Program, types: Type[]): [CSharpType, b let current: CSharpType | undefined = undefined; let nullable: boolean = false; for (const type of types) { - let candidate: CSharpType | undefined = undefined; + let candidate: CSharpType | undefined; switch (type.kind) { case "Boolean": candidate = new CSharpType({ name: "bool", namespace: "System", isValueType: true }); @@ -1797,6 +1822,8 @@ export async function getFreePort(minPort: number, maxPort: number, tries: numbe if (free) { return port; } + // This seems like a bug? tries-- does nothing? + // eslint-disable-next-line no-useless-assignment return await getFreePort(min, max, tries--); async function checkPort(port: number, timeout: number = 100): Promise { diff --git a/packages/http-server-csharp/test/generation.test.ts b/packages/http-server-csharp/test/generation.test.ts index 7f5c0175c66..5cb6dfacfca 100644 --- a/packages/http-server-csharp/test/generation.test.ts +++ b/packages/http-server-csharp/test/generation.test.ts @@ -1178,7 +1178,6 @@ interface Widgets { [ "IWidgets.cs", [ - "using TypeSpec.Http;", "public interface IWidgets", "Task UpdateAsync( string id, WidgetMergePatchUpdate body);", ], @@ -1186,7 +1185,6 @@ interface Widgets { [ "WidgetsController.cs", [ - "using TypeSpec.Http;", "public partial class WidgetsController: ControllerBase", "public virtual async Task Update(string id, WidgetMergePatchUpdate body)", ], @@ -1194,7 +1192,7 @@ interface Widgets { [ "WidgetMergePatchUpdate.cs", [ - "namespace TypeSpec.Http {", + "namespace Microsoft.Contoso {", "public string Id { get; set; }", "public int? Weight { get; set; }", "public string Color { get; set; }", @@ -1204,6 +1202,299 @@ interface Widgets { ); }); +it("Handles MergePatchUpdate with enum type in different namespace", async () => { + await compileAndValidateMultiple( + tester, + ` +enum WidgetColor { + Red, + Blue, + Green +} + +model Widget { + id: string; + weight: int32; + color: WidgetColor; +} + +@route("/widgets") +@tag("Widgets") +interface Widgets { + /** Update a widget */ + @patch update(@path id: string, @body body: MergePatchUpdate): Widget; +} + `, + [ + [ + "WidgetMergePatchUpdate.cs", + [ + "namespace Microsoft.Contoso {", + "public string Id { get; set; }", + "public int? Weight { get; set; }", + "public WidgetColor? Color { get; set; }", + ], + ], + ], + ); +}); + +it("Handles MergePatchUpdate with properties from multiple different sub-namespaces", async () => { + // This test verifies that ALL cross-namespace using directives are emitted when + // multiple enum properties come from different namespaces (tests the removed AddedScope + // single-import limitation in checkOrAddNamespaceToScope). + await compileAndValidateMultiple( + tester, + ` +namespace Colors { + enum WidgetColor { Red, Blue, Green } +} + +namespace Sizes { + enum WidgetSize { Small, Medium, Large } +} + +model Widget { + id: string; + color: Colors.WidgetColor; + size: Sizes.WidgetSize; +} + +@route("/widgets") +@tag("Widgets") +interface Widgets { + /** Update a widget */ + @patch update(@path id: string, @body body: MergePatchUpdate): Widget; +} + `, + [ + [ + "WidgetMergePatchUpdate.cs", + [ + "namespace Microsoft.Contoso {", + "using Microsoft.Contoso.Colors;", + "using Microsoft.Contoso.Sizes;", + "public string Id { get; set; }", + "public WidgetColor? Color { get; set; }", + "public WidgetSize? Size { get; set; }", + ], + ], + ], + ); +}); + +it("Handles model with enum property from a sub-namespace", async () => { + // This test verifies that a regular (non-MergePatch) model whose property references + // an enum from a different namespace gets the correct using directive. + await compileAndValidateMultiple( + tester, + ` +namespace Colors { + enum WidgetColor { Red, Blue, Green } +} + +model Widget { + id: string; + color: Colors.WidgetColor; +} + +@get op getWidget(): Widget; + `, + [ + [ + "Widget.cs", + [ + "namespace Microsoft.Contoso {", + "using Microsoft.Contoso.Colors;", + "public string Id { get; set; }", + "public WidgetColor Color { get; set; }", + ], + ], + ], + ); +}); + +it("Handles MergePatchUpdate with optional enum from different namespace", async () => { + // Optional enums from different namespaces appear as nullable types (WidgetColor?) + // and must still get the correct using directive. + await compileAndValidateMultiple( + tester, + ` +enum WidgetColor { + Red, + Blue, + Green +} + +model Widget { + id: string; + color?: WidgetColor; +} + +@route("/widgets") +@tag("Widgets") +interface Widgets { + /** Update a widget */ + @patch update(@path id: string, @body body: MergePatchUpdate): Widget; +} + `, + [ + [ + "WidgetMergePatchUpdate.cs", + [ + "namespace Microsoft.Contoso {", + "public string Id { get; set; }", + "public WidgetColor? Color { get; set; }", + ], + ], + ], + ); +}); + +it("Handles MergePatchUpdate with string-enum union property from different namespace", async () => { + // String-enum unions (e.g. union Color { "red", "blue" }) also use createEnumContext + // and should get the correct using directive when in a different namespace. + // Note: string-enum unions are MergePatch-transformed, so the property type becomes + // WidgetColorMergePatchUpdate, but the using directive for the original union's + // namespace is still needed for the union's definition file. + await compileAndValidateMultiple( + tester, + ` +namespace Colors { + union WidgetColor { Red: "red", Blue: "blue", Green: "green" } +} + +model Widget { + id: string; + color: Colors.WidgetColor; +} + +@route("/widgets") +@tag("Widgets") +interface Widgets { + /** Update a widget */ + @patch update(@path id: string, @body body: MergePatchUpdate): Widget; +} + `, + [ + [ + "WidgetMergePatchUpdate.cs", + [ + "namespace Microsoft.Contoso {", + "using Microsoft.Contoso.Colors;", + "public string Id { get; set; }", + ], + ], + ], + ); +}); + +it("Handles MergePatchUpdate with array of models from different namespace", async () => { + // Arrays of model types from different namespaces are also MergePatch-transformed, + // creating e.g. TagMergePatchUpdateReplaceOnly[] in the service namespace. + // The using directive for the original model's namespace should still be present. + await compileAndValidateMultiple( + tester, + ` +namespace Tags { + model Tag { name: string; value: string; } +} + +model Widget { + id: string; + tags: Tags.Tag[]; +} + +@route("/widgets") +@tag("Widgets") +interface Widgets { + /** Update a widget */ + @patch update(@path id: string, @body body: MergePatchUpdate): Widget; +} + `, + [ + [ + "WidgetMergePatchUpdate.cs", + [ + "namespace Microsoft.Contoso {", + "using Microsoft.Contoso.Tags;", + "public string Id { get; set; }", + ], + ], + ], + ); +}); + +it("Emits using for base class namespace and separate property namespace (regression: AddedScope cap)", async () => { + // With the old AddedScope guard, checkOrAddNamespaceToScope returned false after adding + // the first dynamic namespace import, forcing subsequent ones to be fully-qualified. + // This test verifies that a model inheriting from a base class in one sub-namespace and + // having a property from a second sub-namespace gets BOTH using directives. + await compileAndValidateMultiple( + tester, + ` +namespace Models { + model ParentWidget { id: string; } +} + +namespace Colors { + enum WidgetColor { Red, Blue, Green } +} + +model Widget extends Models.ParentWidget { + color: Colors.WidgetColor; +} + +@get op getWidget(): Widget; + `, + [ + [ + "Widget.cs", + [ + "namespace Microsoft.Contoso {", + "using Microsoft.Contoso.Models;", + "using Microsoft.Contoso.Colors;", + "public WidgetColor Color { get; set; }", + ": ParentWidget", + ], + ], + ], + ); +}); + +it("Emits only one using directive when multiple properties share the same external namespace", async () => { + // Verifies that the import deduplication (imports.has(ns)) prevents duplicate + // using directives when more than one property references the same external namespace. + await compileAndValidateMultiple( + tester, + ` +namespace Colors { + enum WidgetColor { Red, Blue, Green } + enum BorderColor { Black, White } +} + +model Widget { + id: string; + color: Colors.WidgetColor; + borderColor: Colors.BorderColor; +} + +@get op getWidget(): Widget; + `, + [ + [ + "Widget.cs", + [ + "namespace Microsoft.Contoso {", + "using Microsoft.Contoso.Colors;", + "public WidgetColor Color { get; set; }", + "public BorderColor BorderColor { get; set; }", + ], + ], + ], + ); +}); + it("Handles user-defined model templates", async () => { await compileAndValidateMultiple( tester, @@ -1245,6 +1536,23 @@ it("Handles user-defined model templates", async () => { ); }); +it("Handles template operations in interfaces without crashing", async () => { + // Regression test: interfaces with template operations should not crash with + // "Encountered type TemplateParameter which we don't know how to emit." + // Template operations (e.g. getItem(): T) should be skipped during emission. + await compileAndValidateMultiple( + tester, + ` + interface MyOps { + @get list(): string; + @get getItem(): T; + } + `, + [["IMyOps.cs", ["interface IMyOps", "Task ListAsync( );"]]], + [["IMyOps.cs", ["GetItemAsync"]]], + ); +}); + it("Handles void type in operations", async () => { await compileAndValidateMultiple( tester, @@ -2023,6 +2331,53 @@ model FileAttachmentMultipartRequest { ); }); +it("Produces Accepted result for 202 response with body", async () => { + await compileAndValidateMultiple( + tester, + ` + model AcceptedResponse { + @statusCode statusCode: 202; + jobId: string; + } + + @post + op startJob(): AcceptedResponse; + `, + [["ContosoOperationsController.cs", ["return Accepted(result)"]]], + ); +}); + +it("Produces Accepted result for 202 response without body", async () => { + await compileAndValidateMultiple( + tester, + ` + model AcceptedNoBodyResponse { + @statusCode statusCode: 202; + } + + @post + op startJob(): AcceptedNoBodyResponse; + `, + [["ContosoOperationsController.cs", ["return Accepted()"]]], + ); +}); + +it("Produces StatusCode result for 201 response with body", async () => { + await compileAndValidateMultiple( + tester, + ` + model CreatedResponse { + @statusCode statusCode: 201; + id: string; + } + + @post + op createResource(): CreatedResponse; + `, + [["ContosoOperationsController.cs", ["return StatusCode(201, result)"]]], + ); +}); + const multipartSpec = ` @error model NotFoundErrorResponse { @@ -3040,3 +3395,30 @@ describe("collection type: defined as emitter option", () => { ); }); }); + +it("emits class for model extending another model with no additional properties", async () => { + await compileAndValidateMultiple( + tester, + ` + model Foo { + id: int32; + name: string; + } + + model Baz extends Foo {} + + @route("/foo/{id}") @get op getFoo(id: int32): Foo; + `, + [ + [ + "Foo.cs", + [ + "public partial class Foo", + "public int Id { get; set; }", + "public string Name { get; set; }", + ], + ], + ["Baz.cs", ["public partial class Baz : Foo"]], + ], + ); +}); diff --git a/packages/http-server-csharp/tsconfig.build.json b/packages/http-server-csharp/tsconfig.build.json new file mode 100644 index 00000000000..c2340b48346 --- /dev/null +++ b/packages/http-server-csharp/tsconfig.build.json @@ -0,0 +1,10 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"], + "references": [ + { "path": "../compiler/tsconfig.build.json" }, + { "path": "../http/tsconfig.build.json" }, + { "path": "../rest/tsconfig.build.json" }, + { "path": "../versioning/tsconfig.build.json" } + ] +} diff --git a/packages/http-server-csharp/tsconfig.config.json b/packages/http-server-csharp/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/http-server-csharp/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/http-server-csharp/tsconfig.json b/packages/http-server-csharp/tsconfig.json index 48735519942..e5cd2b844eb 100644 --- a/packages/http-server-csharp/tsconfig.json +++ b/packages/http-server-csharp/tsconfig.json @@ -10,6 +10,5 @@ "outDir": "dist", "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo" - }, - "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/http-server-js/CHANGELOG.md b/packages/http-server-js/CHANGELOG.md index 534313f868c..d7c6f66cf05 100644 --- a/packages/http-server-js/CHANGELOG.md +++ b/packages/http-server-js/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog - @typespec/http-server-js +## 0.58.0-alpha.26 + +### Bug Fixes + +- [#10059](https://github.com/microsoft/typespec/pull/10059) fix: handle Enum type in JSON serialization transpose helpers to prevent crash when a model with an enum property requires a JSON serializer +- [#10058](https://github.com/microsoft/typespec/pull/10058) handle immediate scalar-typed and value-literal typed responses in result processing layer to prevent crash when an operation returns a bare scalar or value literal + + +## 0.58.0-alpha.25 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 0.58.0-alpha.24 + +### Bump dependencies + +- [#9446](https://github.com/microsoft/typespec/pull/9446) Upgrade dependencies + + ## 0.58.0-alpha.23 ### Bump dependencies diff --git a/packages/http-server-js/build-helpers.ts b/packages/http-server-js/build-helpers.ts index 56118fdd23b..022e502bfb4 100644 --- a/packages/http-server-js/build-helpers.ts +++ b/packages/http-server-js/build-helpers.ts @@ -5,6 +5,7 @@ import fs from "node:fs/promises"; import path from "node:path"; +import { parse as parseYaml } from "yaml"; const GENERATED_DEFS = path.resolve("generated-defs"); @@ -23,16 +24,48 @@ async function* visitAllFiles(base: string): AsyncIterable { } } +async function loadPnpmCatalog(): Promise> { + const workspaceYamlPath = path.resolve("..", "..", "pnpm-workspace.yaml"); + const content = await fs.readFile(workspaceYamlPath, "utf-8"); + const parsed = parseYaml(content); + return parsed.catalog ?? {}; +} + +function resolveCatalogVersions( + dependencies: Record, + catalog: Record, +): Record { + const resolved: Record = {}; + for (const [name, version] of Object.entries(dependencies)) { + if (version === "catalog:" || version === "catalog:default") { + const catalogVersion = catalog[name]; + if (!catalogVersion) { + throw new Error( + `Dependency "${name}" uses catalog: but no version found in pnpm-workspace.yaml catalog`, + ); + } + resolved[name] = catalogVersion; + } else { + resolved[name] = version; + } + } + return resolved; +} + async function buildPackageJsonTs() { console.log("Building package.json.ts"); const packageJson = await fs.readFile(path.resolve("package.json"), "utf-8"); const parsed = JSON.parse(packageJson); - - const mergedDependencies: Record = { - ...parsed.devDependencies, - ...parsed.dependencies, - }; + const catalog = await loadPnpmCatalog(); + + const mergedDependencies: Record = resolveCatalogVersions( + { + ...parsed.devDependencies, + ...parsed.dependencies, + }, + catalog, + ); const fileText = [ "// Copyright (c) Microsoft Corporation", diff --git a/packages/http-server-js/eng/scripts/emit-e2e.js b/packages/http-server-js/eng/scripts/emit-e2e.js index 023fa31b881..b7d3dd6d3e0 100644 --- a/packages/http-server-js/eng/scripts/emit-e2e.js +++ b/packages/http-server-js/eng/scripts/emit-e2e.js @@ -201,7 +201,7 @@ async function processFile(file, options) { console.log(pc.yellow(`Skipping: ${relativePath}`)); } else if (action === "abort") { console.log(pc.red("Aborting processing.")); - throw new Error("Processing aborted by user"); + throw new Error("Processing aborted by user", { cause: error }); } } return { status: "failed", relativePath, errorDetails }; diff --git a/packages/http-server-js/generated-defs/package.json.ts b/packages/http-server-js/generated-defs/package.json.ts index f8c271d63fa..70ae693d5c5 100644 --- a/packages/http-server-js/generated-defs/package.json.ts +++ b/packages/http-server-js/generated-defs/package.json.ts @@ -5,8 +5,8 @@ export const hsjsDependencies: Record = { "@types/express": "^5.0.6", - "@types/morgan": "^1.9.9", - "@types/node": "~25.0.2", + "@types/morgan": "^1.9.10", + "@types/node": "~25.5.0", "@types/swagger-ui-express": "^4.1.8", "@typespec/compiler": "workspace:^", "@typespec/http": "workspace:^", @@ -15,24 +15,24 @@ export const hsjsDependencies: Record = { "@typespec/openapi3": "workspace:^", "@typespec/spector": "workspace:^", "@typespec/tspd": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "decimal.js": "^10.5.0", + "@vitest/coverage-v8": "^4.1.0", + "@vitest/ui": "^4.1.0", + "decimal.js": "^10.6.0", "express": "^5.2.1", - "fs-extra": "^11.2.0", - "globby": "~16.1.0", - "inquirer": "^13.1.0", - "morgan": "^1.10.0", - "ora": "^9.0.0", - "p-limit": "^7.1.1", + "fs-extra": "^11.3.4", + "globby": "~16.1.1", + "inquirer": "^13.3.0", + "morgan": "^1.10.1", + "ora": "^9.3.0", + "p-limit": "^7.3.0", "pathe": "^2.0.3", "picocolors": "~1.1.1", "swagger-ui-express": "^5.0.1", - "temporal-polyfill": "^0.3.0", + "temporal-polyfill": "^0.3.2", "tsx": "^4.21.0", - "typescript": "~5.9.2", - "vitest": "^4.0.15", + "typescript": "~5.9.3", + "vitest": "^4.1.0", "yargs": "~18.0.0", - "prettier": "~3.8.0", + "prettier": "~3.8.1", "yaml": "~2.8.2", }; diff --git a/packages/http-server-js/package.json b/packages/http-server-js/package.json index d83cc7cf1a8..69e8d391709 100644 --- a/packages/http-server-js/package.json +++ b/packages/http-server-js/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/http-server-js", - "version": "0.58.0-alpha.23", + "version": "0.58.0-alpha.26", "author": "Microsoft Corporation", "description": "TypeSpec HTTP server code generator for JavaScript", "homepage": "https://github.com/microsoft/typespec", @@ -36,7 +36,7 @@ "build": "pnpm build:helpers && pnpm build:src", "build:src": "tsc -p ./tsconfig.json", "build:helpers": "tsx ./build-helpers.ts", - "watch": "tsc -p . --watch", + "watch": "tsc -p tsconfig.build.json --watch", "test": "vitest run", "test:watch": "vitest -w", "test:ui": "vitest --ui", @@ -59,14 +59,14 @@ } }, "dependencies": { - "prettier": "~3.8.0", - "yaml": "~2.8.2" + "prettier": "catalog:", + "yaml": "catalog:" }, "devDependencies": { - "@types/express": "^5.0.6", - "@types/morgan": "^1.9.9", - "@types/node": "~25.0.2", - "@types/swagger-ui-express": "^4.1.8", + "@types/express": "catalog:", + "@types/morgan": "catalog:", + "@types/node": "catalog:", + "@types/swagger-ui-express": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/http": "workspace:^", "@typespec/http-specs": "workspace:^", @@ -74,23 +74,23 @@ "@typespec/openapi3": "workspace:^", "@typespec/spector": "workspace:^", "@typespec/tspd": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "decimal.js": "^10.5.0", - "express": "^5.2.1", - "fs-extra": "^11.2.0", - "globby": "~16.1.0", - "inquirer": "^13.1.0", - "morgan": "^1.10.0", - "ora": "^9.0.0", - "p-limit": "^7.1.1", - "pathe": "^2.0.3", - "picocolors": "~1.1.1", - "swagger-ui-express": "^5.0.1", - "temporal-polyfill": "^0.3.0", - "tsx": "^4.21.0", - "typescript": "~5.9.2", - "vitest": "^4.0.15", - "yargs": "~18.0.0" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "decimal.js": "catalog:", + "express": "catalog:", + "fs-extra": "catalog:", + "globby": "catalog:", + "inquirer": "catalog:", + "morgan": "catalog:", + "ora": "catalog:", + "p-limit": "catalog:", + "pathe": "catalog:", + "picocolors": "catalog:", + "swagger-ui-express": "catalog:", + "temporal-polyfill": "catalog:", + "tsx": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:", + "yargs": "catalog:" } } diff --git a/packages/http-server-js/src/common/scalar.ts b/packages/http-server-js/src/common/scalar.ts index 6bccba01a93..be49748423d 100644 --- a/packages/http-server-js/src/common/scalar.ts +++ b/packages/http-server-js/src/common/scalar.ts @@ -782,7 +782,7 @@ function createJsScalar( scalar, getEncoding(encodeDataOrString: EncodeData | string, target?: Scalar): Encoder | undefined { - let encoding: string = "default"; + let encoding: string; if (typeof encodeDataOrString === "string") { encoding = encodeDataOrString; diff --git a/packages/http-server-js/src/common/serialization/json.ts b/packages/http-server-js/src/common/serialization/json.ts index 51f1d852012..d8a7862c29a 100644 --- a/packages/http-server-js/src/common/serialization/json.ts +++ b/packages/http-server-js/src/common/serialization/json.ts @@ -294,6 +294,8 @@ export function transposeExpressionToJson( } case "ModelProperty": return transposeExpressionToJson(ctx, type.type, expr, module); + case "Enum": + return expr; case "Intrinsic": switch (type.name) { case "void": @@ -537,6 +539,8 @@ export function transposeExpressionFromJson( } case "ModelProperty": return transposeExpressionFromJson(ctx, type.type, expr, module); + case "Enum": + return expr; case "Intrinsic": switch (type.name) { case "ErrorType": @@ -558,7 +562,6 @@ export function transposeExpressionFromJson( case "Boolean": return literalToExpr(type); case "Interface": - case "Enum": case "EnumMember": case "TemplateParameter": case "Namespace": diff --git a/packages/http-server-js/src/http/server/index.ts b/packages/http-server-js/src/http/server/index.ts index a2e1154f8b5..9eca8ed4316 100644 --- a/packages/http-server-js/src/http/server/index.ts +++ b/packages/http-server-js/src/http/server/index.ts @@ -580,6 +580,25 @@ function* emitResultProcessingForType( } } + if (target.kind === "Scalar" || isValueLiteralType(target)) { + const serializationRequired = + target.kind === "Scalar" && isSerializationRequired(ctx, module, target, "application/json"); + + if (target.kind === "Scalar") { + requireSerialization(ctx, target, "application/json"); + } + + yield `${names.ctx}.response.setHeader("content-type", "application/json");`; + + if (serializationRequired) { + yield `${names.ctx}.response.end(globalThis.JSON.stringify(${transposeExpressionToJson(ctx, target, names.result, module)}));`; + } else { + yield `${names.ctx}.response.end(globalThis.JSON.stringify(${names.result}));`; + } + + return; + } + if (target.kind !== "Model") { throw new UnimplementedError(`result processing for type kind '${target.kind}'`); } diff --git a/packages/http-server-js/test/json-serialization.test.ts b/packages/http-server-js/test/json-serialization.test.ts new file mode 100644 index 00000000000..a27567129da --- /dev/null +++ b/packages/http-server-js/test/json-serialization.test.ts @@ -0,0 +1,118 @@ +import { Model, ModelProperty } from "@typespec/compiler"; +import { BasicTestRunner, createTestRunner } from "@typespec/compiler/testing"; +import { deepStrictEqual, ok, strictEqual } from "assert"; +import { beforeEach, describe, it } from "vitest"; +import { + emitJsonSerialization, + requiresJsonSerialization, +} from "../src/common/serialization/json.js"; +import { createInitialContext } from "../src/ctx.js"; +import { JsEmitterOptions } from "../src/lib.js"; +import { objectLiteralProperty, parseCase } from "../src/util/case.js"; +import { keywordSafe } from "../src/util/keywords.js"; + +describe("json serialization", () => { + let runner: BasicTestRunner; + + const defaultOptions: JsEmitterOptions = { + express: false, + "no-format": false, + "omit-unreachable-types": false, + }; + + beforeEach(async () => { + runner = await createTestRunner(); + }); + + async function getModels() { + const compiled = (await runner.compile(` + @service(#{ title: "Test" }) + namespace Test; + + enum MyEnum { + A, + B, + } + + model KeywordModel { + type: MyEnum; + } + + model RenamedModel { + wire_type: MyEnum; + } + + model TestModels { + @test keyword: KeywordModel; + @test renamed: RenamedModel; + } + `)) as { + keyword: ModelProperty; + renamed: ModelProperty; + }; + + if (compiled.keyword.type.kind !== "Model" || compiled.renamed.type.kind !== "Model") { + throw new Error("Expected @test properties to reference models."); + } + + const ctx = await createInitialContext(runner.program, defaultOptions); + + if (!ctx) { + throw new Error("Expected emitter context."); + } + + return { + ctx, + keywordModel: compiled.keyword.type, + renamedModel: compiled.renamed.type, + }; + } + + function emitModelSerialization( + ctx: NonNullable>>, + model: Model, + ) { + const module = ctx.globalNamespaceModule; + return [...emitJsonSerialization(ctx, model, module, model.name)]; + } + + function getGeneratedPropertyName(name: string): string { + return keywordSafe(parseCase(name).camelCase); + } + + it("serializes enum properties when a keyword-safe property name forces model serialization", async () => { + const { ctx, keywordModel } = await getModels(); + + strictEqual(requiresJsonSerialization(ctx, ctx.globalNamespaceModule, keywordModel), true); + + const lines = emitModelSerialization(ctx, keywordModel); + + ok( + lines.includes( + ` ${objectLiteralProperty("type")}: input.${getGeneratedPropertyName("type")},`, + ), + ); + ok(lines.includes(` ${getGeneratedPropertyName("type")}: input.type,`)); + }); + + it("serializes enum properties when a renamed property forces model serialization", async () => { + const { ctx, renamedModel } = await getModels(); + + strictEqual(requiresJsonSerialization(ctx, ctx.globalNamespaceModule, renamedModel), true); + + const lines = emitModelSerialization(ctx, renamedModel); + + deepStrictEqual(lines, [ + "toJsonObject(input: RenamedModel): any {", + " return {", + ` ${objectLiteralProperty("wire_type")}: input.${getGeneratedPropertyName("wire_type")},`, + " };", + "},", + "fromJsonObject(input: any): RenamedModel {", + " return {", + ` ${getGeneratedPropertyName("wire_type")}: input.wire_type,`, + " };", + "},", + ]); + }); +}); diff --git a/packages/http-server-js/test/scalar.test.ts b/packages/http-server-js/test/scalar.test.ts index 274cd5cb3cd..b3c786dadf6 100644 --- a/packages/http-server-js/test/scalar.test.ts +++ b/packages/http-server-js/test/scalar.test.ts @@ -1,15 +1,22 @@ -import { ModelProperty, NoTarget, Scalar } from "@typespec/compiler"; -import { BasicTestRunner, createTestRunner } from "@typespec/compiler/testing"; +import { ModelProperty, NoTarget, Scalar, resolvePath } from "@typespec/compiler"; +import { BasicTestRunner, createTestRunner, createTester } from "@typespec/compiler/testing"; import { deepStrictEqual, strictEqual } from "assert"; -import { beforeEach, describe, it } from "vitest"; +import { beforeEach, describe, expect, it } from "vitest"; import { getJsScalar } from "../src/common/scalar.js"; -import { createPathCursor, JsContext, Module } from "../src/ctx.js"; +import { JsContext, Module, createPathCursor } from "../src/ctx.js"; import { module as dateTimeModule } from "../generated-defs/helpers/datetime.js"; import { module as temporalHelpersModule } from "../generated-defs/helpers/temporal/native.js"; import { module as temporalPolyfillHelpersModule } from "../generated-defs/helpers/temporal/polyfill.js"; import { JsEmitterOptions } from "../src/lib.js"; +const HttpServerEmitterTester = createTester(resolvePath(import.meta.dirname, ".."), { + libraries: ["@typespec/http", "@typespec/http-server-js"], +}) + .import("@typespec/http") + .using("Http") + .emit("@typespec/http-server-js"); + describe("scalar", () => { let runner: BasicTestRunner; @@ -186,6 +193,22 @@ describe("scalar", () => { ); }); + it("emits result processing for bare scalar responses", async () => { + const { outputs } = await HttpServerEmitterTester.compile(` + @service(#{ title: "Example" }) + @route("/") + namespace Example { + @get op read(): string; + } + `); + + const serverRaw = outputs["src/generated/http/operations/server-raw.ts"]; + + expect(serverRaw).toBeDefined(); + expect(serverRaw).toContain('response.setHeader("content-type", "application/json");'); + expect(serverRaw).toMatch(/response\.end\(globalThis\.JSON\.stringify\(__result_\d+\)\);/); + }); + describe("date/time/duration types", () => { describe("mode: temporal", () => { const options: JsEmitterOptions = { diff --git a/packages/http-server-js/tsconfig.json b/packages/http-server-js/tsconfig.json index ddead51353a..663788e7095 100644 --- a/packages/http-server-js/tsconfig.json +++ b/packages/http-server-js/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../tsconfig.base.json", - "references": [{ "path": "../compiler/tsconfig.json" }], + "references": [{ "path": "../compiler/tsconfig.build.json" }], "compilerOptions": { "outDir": "dist", "rootDir": ".", diff --git a/packages/http-specs/CHANGELOG.md b/packages/http-specs/CHANGELOG.md index e5b6c636606..7190f2a59f4 100644 --- a/packages/http-specs/CHANGELOG.md +++ b/packages/http-specs/CHANGELOG.md @@ -1,5 +1,64 @@ # @typespec/http-specs +## 0.1.0-alpha.36 + +### Features + +- [#10011](https://github.com/microsoft/typespec/pull/10011) Add matcher framework for flexible value comparison in scenarios. `match.dateTime()` enables semantic datetime comparison that handles precision and timezone differences across languages. + + +## 0.1.0-alpha.35 + +### Features + +- Added new scenario for next link based pagination where the initial verb is not GET +- Add missing scenarios for xml handling + +### Bug Fixes + +- Accept both `2022-08-26T18:38:00.000Z` and `2022-08-26T18:38:00Z` as valid RFC3339 UTC datetime forms in the `ModelWithDatetime` XML scenario. + + +## 0.1.0-alpha.34 + +### Bug Fixes + +- [#9953](https://github.com/microsoft/typespec/pull/9953) Fix response type of putExtensibleStringValue to include explicit content-type header + + +## 0.1.0-alpha.33 + +### Features + +- [#9785](https://github.com/microsoft/typespec/pull/9785) Add spector case for extensible enum with special word member names +- [#9660](https://github.com/microsoft/typespec/pull/9660) Add test case for XML model with datetime properties (rfc3339 and rfc7231 encodings) +- [#9660](https://github.com/microsoft/typespec/pull/9660) Add test case for XML model with enum property + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + +### Bug Fixes + +- [#9945](https://github.com/microsoft/typespec/pull/9945) Fix float comparison in duration encode mockapi for query and header params to use numeric comparison instead of string comparison, allowing values like `35625.0` to match `35625` + + +## 0.1.0-alpha.32 + +### Features + +- [#9390](https://github.com/microsoft/typespec/pull/9390) Add array encoding test for enum and extensible enum arrays. +- [#9513](https://github.com/microsoft/typespec/pull/9513) Add Spector tests for File type with various content types (body and multipart) +- [#9499](https://github.com/microsoft/typespec/pull/9499) Add test for xml error deserialization +- [#9455](https://github.com/microsoft/typespec/pull/9455) Add test for xml pagination with next link +- [#9455](https://github.com/microsoft/typespec/pull/9455) Add test for xml paging + +### Bug Fixes + +- [#9570](https://github.com/microsoft/typespec/pull/9570) Fix payload/xml XmlErrorValue response to wrap SimpleModel with content-type "application/xml" for consistency with XmlError +- [#9636](https://github.com/microsoft/typespec/pull/9636) Fix expectation for query larger unit tests + + ## 0.1.0-alpha.31 ### Features diff --git a/packages/http-specs/package.json b/packages/http-specs/package.json index 57b3b5a0bcb..b10c2f4eeb4 100644 --- a/packages/http-specs/package.json +++ b/packages/http-specs/package.json @@ -1,7 +1,7 @@ { "name": "@typespec/http-specs", "displayName": "Http Specs", - "version": "0.1.0-alpha.31", + "version": "0.1.0-alpha.36", "description": "Spec scenarios and mock apis", "main": "dist/index.js", "type": "module", @@ -15,11 +15,11 @@ "validate-scenarios": "tsp-spector validate-scenarios ./specs", "generate-scenarios-summary": "tsp-spector generate-scenarios-summary ./specs", "regen-docs": "pnpm generate-scenarios-summary", - "upload-manifest": "tsp-spector upload-manifest ./specs --setName @typespec/http-specs --containerName manifests-typespec --storageAccountName typespec", + "upload-manifest": "tsp-spector upload-manifest ./specs --containerName coverages --storageAccountName typespec --manifestName http-specs", "upload-coverage": "tsp-spector upload-coverage --generatorName @typespec/http-specs --generatorVersion 0.1.0-alpha.4 --containerName coverages --generatorMode standard --storageAccountName typespec", "validate-mock-apis": "tsp-spector validate-mock-apis ./specs", "check-scenario-coverage": "tsp-spector check-coverage ./specs", - "validate-client-server": "concurrently \"tsp-spector server start ./specs\" \"pnpm knock\"; tsp-spector server stop", + "validate-client-server": "concurrently \"tsp-spector server start ./specs\" \"pnpm knock\"; code=$?; tsp-spector server stop; exit $code", "build:smoke": "tsp compile smoke/petstore --warn-as-error --no-emit && tsp compile smoke/todoapp --warn-as-error --no-emit", "client": "pnpm knock", "knock": "tsp-spector knock ./specs", @@ -27,7 +27,7 @@ "test": "echo \"Error: no test specified\"" }, "engines": { - "node": ">=16.0.0" + "node": ">=22.0.0" }, "repository": { "type": "git", @@ -45,18 +45,18 @@ "dependencies": { "@typespec/spec-api": "workspace:^", "@typespec/spector": "workspace:^", - "deep-equal": "^2.2.0" + "deep-equal": "catalog:" }, "devDependencies": { - "@types/deep-equal": "^1.0.1", - "@types/multer": "^2.0.0", - "@types/node": "~25.0.2", + "@types/deep-equal": "catalog:", + "@types/multer": "catalog:", + "@types/node": "catalog:", "@typespec/json-schema": "workspace:^", "@typespec/openapi": "workspace:^", "@typespec/openapi3": "workspace:^", - "concurrently": "^9.1.2", - "rimraf": "~6.1.2", - "typescript": "~5.9.2" + "concurrently": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:" }, "peerDependencies": { "@typespec/compiler": "workspace:^", diff --git a/packages/http-specs/spec-summary.md b/packages/http-specs/spec-summary.md index a25c9665dbe..bfcb5001593 100644 --- a/packages/http-specs/spec-summary.md +++ b/packages/http-specs/spec-summary.md @@ -2050,6 +2050,68 @@ Content-Type: image/jpg --abcde12345-- ``` +### Payload_MultiPart_FormData_File_uploadFileArray + +- Endpoint: `post /multipart/form-data/file/file-array` + +Test multiple File instances in multipart form data. +Expected request: + +``` +POST /multipart/form-data/file/file-array HTTP/1.1 +Content-Type: multipart/form-data; boundary=abcde12345 + +--abcde12345 +Content-Disposition: form-data; name="files"; filename="image1.png" +Content-Type: image/png + +{…file content of image.png…} +--abcde12345 +Content-Disposition: form-data; name="files"; filename="image2.png" +Content-Type: image/png + +{…file content of image.png…} +--abcde12345-- +``` + +### Payload_MultiPart_FormData_File_uploadFileRequiredFilename + +- Endpoint: `post /multipart/form-data/file/required-filename` + +Test File type in multipart form data with required filename. +Expected request: + +``` +POST /multipart/form-data/file/required-filename HTTP/1.1 +Content-Type: multipart/form-data; boundary=abcde12345 + +--abcde12345 +Content-Disposition: form-data; name="file"; filename="image.png" +Content-Type: image/png + +{…file content of image.png…} +--abcde12345-- +``` + +### Payload_MultiPart_FormData_File_uploadFileSpecificContentType + +- Endpoint: `post /multipart/form-data/file/specific-content-type` + +Test File type in multipart form data with specific content type. +Expected request: + +``` +POST /multipart/form-data/file/specific-content-type HTTP/1.1 +Content-Type: multipart/form-data; boundary=abcde12345 + +--abcde12345 +Content-Disposition: form-data; name="file"; filename="image.png" +Content-Type: image/png + +{…file content of image.png…} +--abcde12345-- +``` + ### Payload_MultiPart_FormData_fileArrayAndBasic - Endpoint: `post /multipart/form-data/complex-parts` @@ -2447,6 +2509,48 @@ Expected response body: } ``` +### Payload_Pageable_ServerDrivenPagination_AlternateInitialVerb_post + +- Endpoint: `post /payload/pageable/server-driven-pagination/link/initial-post` + +Test case for initial POST request followed by GET for next pages using link pagination. +The initial request is a POST with a filter body, and the next page is fetched using a GET request on the next link. + +Two requests need to be tested. + +1. Initial request (POST): + Expected route: /payload/pageable/server-driven-pagination/link/initial-post + Expected request body: + +```json +{ "filter": "foo eq bar" } +``` + +Expected response body: + +```json +{ + "pets": [ + { "id": "1", "name": "dog" }, + { "id": "2", "name": "cat" } + ], + "next": "http://[host]:[port]/payload/pageable/server-driven-pagination/link/initial-post/nextPage?token=abc" +} +``` + +2. Next page request (GET): + Expected route: /payload/pageable/server-driven-pagination/link/initial-post/nextPage?token=abc + Expected response body: + +```json +{ + "pets": [ + { "id": "3", "name": "bird" }, + { "id": "4", "name": "fish" } + ] +} +``` + ### Payload_Pageable_ServerDrivenPagination_ContinuationToken_requestHeaderNestedResponseBody - Endpoint: `get /payload/pageable/server-driven-pagination/continuationtoken/request-header-nested-response-body` @@ -2999,6 +3103,32 @@ Expected request body: ``` +### Payload_Xml_ModelWithDatetimeValue_get + +- Endpoint: `get /payload/xml/modelWithDatetime` + +Expected response body: + +```xml + + 2022-08-26T18:38:00.000Z + Fri, 26 Aug 2022 14:38:00 GMT + +``` + +### Payload_Xml_ModelWithDatetimeValue_put + +- Endpoint: `put /payload/xml/modelWithDatetime` + +Expected request body: + +```xml + + 2022-08-26T18:38:00.000Z + Fri, 26 Aug 2022 14:38:00 GMT + +``` + ### Payload_Xml_ModelWithDictionaryValue_get - Endpoint: `get /payload/xml/modelWithDictionary` @@ -3095,6 +3225,114 @@ Expected request body: ``` +### Payload_Xml_ModelWithEnumValue_get + +- Endpoint: `get /payload/xml/modelWithEnum` + +Expected response body: + +```xml + + success + +``` + +### Payload_Xml_ModelWithEnumValue_put + +- Endpoint: `put /payload/xml/modelWithEnum` + +Expected request body: + +```xml + + success + +``` + +### Payload_Xml_ModelWithNamespaceOnPropertiesValue_get + +- Endpoint: `get /payload/xml/modelWithNamespaceOnProperties` + +Expected response body: + +```xml + + 123 + The Great Gatsby + F. Scott Fitzgerald + +``` + +### Payload_Xml_ModelWithNamespaceOnPropertiesValue_put + +- Endpoint: `put /payload/xml/modelWithNamespaceOnProperties` + +Expected request body: + +```xml + + 123 + The Great Gatsby + F. Scott Fitzgerald + +``` + +### Payload_Xml_ModelWithNamespaceValue_get + +- Endpoint: `get /payload/xml/modelWithNamespace` + +Expected response body: + +```xml + + 123 + The Great Gatsby + +``` + +### Payload_Xml_ModelWithNamespaceValue_put + +- Endpoint: `put /payload/xml/modelWithNamespace` + +Expected request body: + +```xml + + 123 + The Great Gatsby + +``` + +### Payload_Xml_ModelWithNestedModelValue_get + +- Endpoint: `get /payload/xml/modelWithNestedModel` + +Expected response body: + +```xml + + + foo + 123 + + +``` + +### Payload_Xml_ModelWithNestedModelValue_put + +- Endpoint: `put /payload/xml/modelWithNestedModel` + +Expected request body: + +```xml + + + foo + 123 + + +``` + ### Payload_Xml_ModelWithOptionalFieldValue_get - Endpoint: `get /payload/xml/modelWithOptionalField` @@ -3155,6 +3393,32 @@ Expected request body: ``` +### Payload_Xml_ModelWithRenamedAttributeValue_get + +- Endpoint: `get /payload/xml/modelWithRenamedAttribute` + +Expected response body: + +```xml + + The Great Gatsby + F. Scott Fitzgerald + +``` + +### Payload_Xml_ModelWithRenamedAttributeValue_put + +- Endpoint: `put /payload/xml/modelWithRenamedAttribute` + +Expected request body: + +```xml + + The Great Gatsby + F. Scott Fitzgerald + +``` + ### Payload_Xml_ModelWithRenamedFieldsValue_get - Endpoint: `get /payload/xml/modelWithRenamedFields` @@ -3193,6 +3457,178 @@ Expected request body: ``` +### Payload_Xml_ModelWithRenamedNestedModelValue_get + +- Endpoint: `get /payload/xml/modelWithRenamedNestedModel` + +Expected response body: + +```xml + + + foo + + +``` + +### Payload_Xml_ModelWithRenamedNestedModelValue_put + +- Endpoint: `put /payload/xml/modelWithRenamedNestedModel` + +Expected request body: + +```xml + + + foo + + +``` + +### Payload_Xml_ModelWithRenamedPropertyValue_get + +- Endpoint: `get /payload/xml/modelWithRenamedProperty` + +Expected response body: + +```xml + + foo + bar + +``` + +### Payload_Xml_ModelWithRenamedPropertyValue_put + +- Endpoint: `put /payload/xml/modelWithRenamedProperty` + +Expected request body: + +```xml + + foo + bar + +``` + +### Payload_Xml_ModelWithRenamedUnwrappedModelArrayValue_get + +- Endpoint: `get /payload/xml/modelWithRenamedUnwrappedModelArray` + +Expected response body: + +```xml + + + foo + 123 + + + bar + 456 + + +``` + +### Payload_Xml_ModelWithRenamedUnwrappedModelArrayValue_put + +- Endpoint: `put /payload/xml/modelWithRenamedUnwrappedModelArray` + +Expected request body: + +```xml + + + foo + 123 + + + bar + 456 + + +``` + +### Payload_Xml_ModelWithRenamedWrappedAndItemModelArrayValue_get + +- Endpoint: `get /payload/xml/modelWithRenamedWrappedAndItemModelArray` + +Expected response body: + +```xml + + + + The Great Gatsby + + + Les Miserables + + + +``` + +### Payload_Xml_ModelWithRenamedWrappedAndItemModelArrayValue_put + +- Endpoint: `put /payload/xml/modelWithRenamedWrappedAndItemModelArray` + +Expected request body: + +```xml + + + + The Great Gatsby + + + Les Miserables + + + +``` + +### Payload_Xml_ModelWithRenamedWrappedModelArrayValue_get + +- Endpoint: `get /payload/xml/modelWithRenamedWrappedModelArray` + +Expected response body: + +```xml + + + + foo + 123 + + + bar + 456 + + + +``` + +### Payload_Xml_ModelWithRenamedWrappedModelArrayValue_put + +- Endpoint: `put /payload/xml/modelWithRenamedWrappedModelArray` + +Expected request body: + +```xml + + + + foo + 123 + + + bar + 456 + + + +``` + ### Payload_Xml_ModelWithSimpleArraysValue_get - Endpoint: `get /payload/xml/modelWithSimpleArrays` @@ -3293,6 +3729,74 @@ Expected request body: ``` +### Payload_Xml_ModelWithUnwrappedModelArrayValue_get + +- Endpoint: `get /payload/xml/modelWithUnwrappedModelArray` + +Expected response body: + +```xml + + + foo + 123 + + + bar + 456 + + +``` + +### Payload_Xml_ModelWithUnwrappedModelArrayValue_put + +- Endpoint: `put /payload/xml/modelWithUnwrappedModelArray` + +Expected request body: + +```xml + + + foo + 123 + + + bar + 456 + + +``` + +### Payload_Xml_ModelWithWrappedPrimitiveCustomItemNamesValue_get + +- Endpoint: `get /payload/xml/modelWithWrappedPrimitiveCustomItemNames` + +Expected response body: + +```xml + + + fiction + classic + + +``` + +### Payload_Xml_ModelWithWrappedPrimitiveCustomItemNamesValue_put + +- Endpoint: `put /payload/xml/modelWithWrappedPrimitiveCustomItemNames` + +Expected request body: + +```xml + + + fiction + classic + + +``` + ### Payload_Xml_SimpleModelValue_get - Endpoint: `get /payload/xml/simpleModel` @@ -3865,6 +4369,13 @@ Expected header parameters: Check we recognize Repeatability-Request-ID and Repeatability-First-Sent. +### SpecialWords_ExtensibleStrings_putExtensibleStringValue + +- Endpoint: `put /special-words/extensible-strings/string` + +Verify that enum members with special word names can be sent and received properly. +Send 'class' and expect the same value back. + ### SpecialWords_ModelProperties_dictMethods - Endpoint: `get /special-words/model-properties/dict-methods` @@ -5210,6 +5721,90 @@ Expect to send a known value. Mock api expect to receive 'Monday' Expect to handle an unknown value. Mock api expect to receive 'Weekend' +### Type_File_Body_downloadFileDefaultContentType + +- Endpoint: `get /type/file/body/response/default-content-type` + +Test File type as response body with unspecified content type. +The File type accepts any content type. For testing, server will return image/png. +Expected response: + +- Content-Type header: image/png +- Body: binary content matching packages/http-specs/assets/image.png + +### Type_File_Body_downloadFileJsonContentType + +- Endpoint: `get /type/file/body/response/json-content-type` + +Test File type as response body with JSON content type. +Expected response: + +- Content-Type header: application/json +- Body: JSON content with file data + +### Type_File_Body_downloadFileMultipleContentTypes + +- Endpoint: `get /type/file/body/response/multiple-content-types` + +Test File type as response body with multiple allowed content types. +Service will return image/png. +Expected response: + +- Content-Type header: image/png +- Body: binary content matching packages/http-specs/assets/image.png + +### Type_File_Body_downloadFileSpecificContentType + +- Endpoint: `get /type/file/body/response/specific-content-type` + +Test File type as response body with specific content type. +Expected response: + +- Content-Type header: image/png +- Body: binary content matching packages/http-specs/assets/image.png + +### Type_File_Body_uploadFileDefaultContentType + +- Endpoint: `post /type/file/body/request/default-content-type` + +Test File type as request body with unspecified content type. +The File type accepts any content type. For testing, sender will use image/png. +Expected request: + +- Content-Type header: image/png +- Body: binary content matching packages/http-specs/assets/image.png + +### Type_File_Body_uploadFileJsonContentType + +- Endpoint: `post /type/file/body/request/json-content-type` + +Test File type as request body with JSON content type. +Expected request: + +- Content-Type header: application/json +- Body: JSON content with file data + +### Type_File_Body_uploadFileMultipleContentTypes + +- Endpoint: `post /type/file/body/request/multiple-content-types` + +Test File type as request body with multiple allowed content types (image/png or image/jpeg). +Client should send image/png. +Expected request: + +- Content-Type header: image/png +- Body: binary content matching packages/http-specs/assets/image.png + +### Type_File_Body_uploadFileSpecificContentType + +- Endpoint: `post /type/file/body/request/specific-content-type` + +Test File type as request body with specific content type. +Expected request: + +- Content-Type header: image/png +- Body: binary content matching packages/http-specs/assets/image.png + ### Type_Model_Empty_getEmpty - Endpoint: `get /type/model/empty/alone` diff --git a/packages/http-specs/specs/encode/datetime/mockapi.ts b/packages/http-specs/specs/encode/datetime/mockapi.ts index 00d21397026..96f1d2e5c08 100644 --- a/packages/http-specs/specs/encode/datetime/mockapi.ts +++ b/packages/http-specs/specs/encode/datetime/mockapi.ts @@ -1,244 +1,149 @@ -import { - CollectionFormat, - json, - MockRequest, - passOnSuccess, - ScenarioMockApi, - validateValueFormat, - ValidationError, -} from "@typespec/spec-api"; +import { json, match, MockRequest, passOnSuccess, ScenarioMockApi } from "@typespec/spec-api"; export const Scenarios: Record = {}; function createQueryServerTests( uri: string, - paramData: any, - format: "rfc7231" | "rfc3339" | undefined, value: any, - collectionFormat?: CollectionFormat, + format: "rfc7231" | "rfc3339" | "utcRfc3339" | undefined, ) { return passOnSuccess({ uri, method: "get", request: { - query: paramData, + query: { value: format ? match.dateTime[format](value) : value }, }, response: { status: 204, }, - handler(req: MockRequest) { - if (format) { - validateValueFormat(req.query["value"] as string, format); - if (Date.parse(req.query["value"] as string) !== Date.parse(value)) { - throw new ValidationError(`Wrong value`, value, req.query["value"]); - } - } else { - req.expect.containsQueryParam("value", value, collectionFormat); - } - return { - status: 204, - }; - }, kind: "MockApiDefinition", }); } Scenarios.Encode_Datetime_Query_default = createQueryServerTests( "/encode/datetime/query/default", - { - value: "2022-08-26T18:38:00.000Z", - }, - "rfc3339", "2022-08-26T18:38:00.000Z", + "utcRfc3339", ); Scenarios.Encode_Datetime_Query_rfc3339 = createQueryServerTests( "/encode/datetime/query/rfc3339", - { - value: "2022-08-26T18:38:00.000Z", - }, - "rfc3339", "2022-08-26T18:38:00.000Z", + "utcRfc3339", ); Scenarios.Encode_Datetime_Query_rfc7231 = createQueryServerTests( "/encode/datetime/query/rfc7231", - { - value: "Fri, 26 Aug 2022 14:38:00 GMT", - }, - "rfc7231", "Fri, 26 Aug 2022 14:38:00 GMT", + "rfc7231", ); Scenarios.Encode_Datetime_Query_unixTimestamp = createQueryServerTests( "/encode/datetime/query/unix-timestamp", - { - value: 1686566864, - }, - undefined, "1686566864", + undefined, ); Scenarios.Encode_Datetime_Query_unixTimestampArray = createQueryServerTests( "/encode/datetime/query/unix-timestamp-array", - { - value: [1686566864, 1686734256].join(","), - }, + [1686566864, 1686734256].join(","), undefined, - ["1686566864", "1686734256"], - "csv", ); function createPropertyServerTests( uri: string, - data: any, - format: "rfc7231" | "rfc3339" | undefined, value: any, + format: "rfc7231" | "rfc3339" | "utcRfc3339" | undefined, ) { + const matcherBody = { value: format ? match.dateTime[format](value) : value }; return passOnSuccess({ uri, method: "post", request: { - body: json(data), + body: json(matcherBody), }, response: { status: 200, - }, - handler: (req: MockRequest) => { - if (format) { - validateValueFormat(req.body["value"], format); - if (Date.parse(req.body["value"]) !== Date.parse(value)) { - throw new ValidationError(`Wrong value`, value, req.body["value"]); - } - } else { - req.expect.coercedBodyEquals({ value: value }); - } - return { - status: 200, - body: json({ value: value }), - }; + body: json(matcherBody), }, kind: "MockApiDefinition", }); } Scenarios.Encode_Datetime_Property_default = createPropertyServerTests( "/encode/datetime/property/default", - { - value: "2022-08-26T18:38:00.000Z", - }, - "rfc3339", "2022-08-26T18:38:00.000Z", + "utcRfc3339", ); Scenarios.Encode_Datetime_Property_rfc3339 = createPropertyServerTests( "/encode/datetime/property/rfc3339", - { - value: "2022-08-26T18:38:00.000Z", - }, - "rfc3339", "2022-08-26T18:38:00.000Z", + "utcRfc3339", ); Scenarios.Encode_Datetime_Property_rfc7231 = createPropertyServerTests( "/encode/datetime/property/rfc7231", - { - value: "Fri, 26 Aug 2022 14:38:00 GMT", - }, - "rfc7231", "Fri, 26 Aug 2022 14:38:00 GMT", + "rfc7231", ); Scenarios.Encode_Datetime_Property_unixTimestamp = createPropertyServerTests( "/encode/datetime/property/unix-timestamp", - { - value: 1686566864, - }, - undefined, 1686566864, + undefined, ); Scenarios.Encode_Datetime_Property_unixTimestampArray = createPropertyServerTests( "/encode/datetime/property/unix-timestamp-array", - { - value: [1686566864, 1686734256], - }, - undefined, [1686566864, 1686734256], + undefined, ); function createHeaderServerTests( uri: string, - data: any, - format: "rfc7231" | "rfc3339" | undefined, value: any, + format: "rfc7231" | "rfc3339" | "utcRfc3339" | undefined, ) { + const matcherHeaders = { value: format ? match.dateTime[format](value) : value }; return passOnSuccess({ uri, method: "get", request: { - headers: data, + headers: matcherHeaders, }, response: { status: 204, }, - handler(req: MockRequest) { - if (format) { - validateValueFormat(req.headers["value"], format); - if (Date.parse(req.headers["value"]) !== Date.parse(value)) { - throw new ValidationError(`Wrong value`, value, req.headers["value"]); - } - } else { - req.expect.containsHeader("value", value); - } - return { - status: 204, - }; - }, kind: "MockApiDefinition", }); } Scenarios.Encode_Datetime_Header_default = createHeaderServerTests( "/encode/datetime/header/default", - { - value: "Fri, 26 Aug 2022 14:38:00 GMT", - }, - "rfc7231", "Fri, 26 Aug 2022 14:38:00 GMT", + "rfc7231", ); Scenarios.Encode_Datetime_Header_rfc3339 = createHeaderServerTests( "/encode/datetime/header/rfc3339", - { - value: "2022-08-26T18:38:00.000Z", - }, - "rfc3339", "2022-08-26T18:38:00.000Z", + "utcRfc3339", ); Scenarios.Encode_Datetime_Header_rfc7231 = createHeaderServerTests( "/encode/datetime/header/rfc7231", - { - value: "Fri, 26 Aug 2022 14:38:00 GMT", - }, - "rfc7231", "Fri, 26 Aug 2022 14:38:00 GMT", + "rfc7231", ); Scenarios.Encode_Datetime_Header_unixTimestamp = createHeaderServerTests( "/encode/datetime/header/unix-timestamp", - { - value: 1686566864, - }, + 1686566864, undefined, - "1686566864", ); Scenarios.Encode_Datetime_Header_unixTimestampArray = createHeaderServerTests( "/encode/datetime/header/unix-timestamp-array", - { - value: [1686566864, 1686734256].join(","), - }, + [1686566864, 1686734256].join(","), undefined, - "1686566864,1686734256", ); -function createResponseHeaderServerTests(uri: string, data: any, value: any) { +function createResponseHeaderServerTests(uri: string, value: any) { return passOnSuccess({ uri, method: "get", request: {}, response: { status: 204, - headers: data, + headers: { value }, }, handler: (req: MockRequest) => { return { status: 204, - headers: { value: value }, + headers: { value }, }; }, kind: "MockApiDefinition", @@ -246,29 +151,17 @@ function createResponseHeaderServerTests(uri: string, data: any, value: any) { } Scenarios.Encode_Datetime_ResponseHeader_default = createResponseHeaderServerTests( "/encode/datetime/responseheader/default", - { - value: "Fri, 26 Aug 2022 14:38:00 GMT", - }, "Fri, 26 Aug 2022 14:38:00 GMT", ); Scenarios.Encode_Datetime_ResponseHeader_rfc3339 = createResponseHeaderServerTests( "/encode/datetime/responseheader/rfc3339", - { - value: "2022-08-26T18:38:00.000Z", - }, "2022-08-26T18:38:00.000Z", ); Scenarios.Encode_Datetime_ResponseHeader_rfc7231 = createResponseHeaderServerTests( "/encode/datetime/responseheader/rfc7231", - { - value: "Fri, 26 Aug 2022 14:38:00 GMT", - }, "Fri, 26 Aug 2022 14:38:00 GMT", ); Scenarios.Encode_Datetime_ResponseHeader_unixTimestamp = createResponseHeaderServerTests( "/encode/datetime/responseheader/unix-timestamp", - { - value: "1686566864", - }, - 1686566864, + "1686566864", ); diff --git a/packages/http-specs/specs/encode/duration/mockapi.ts b/packages/http-specs/specs/encode/duration/mockapi.ts index e77b3f4ab90..c74a77d300b 100644 --- a/packages/http-specs/specs/encode/duration/mockapi.ts +++ b/packages/http-specs/specs/encode/duration/mockapi.ts @@ -4,6 +4,7 @@ import { MockRequest, passOnSuccess, ScenarioMockApi, + ValidationError, } from "@typespec/spec-api"; export const Scenarios: Record = {}; @@ -146,6 +147,34 @@ function createQueryServerTests( kind: "MockApiDefinition", }); } + +function createQueryFloatServerTests(uri: string, paramData: any, value: number) { + return passOnSuccess({ + uri, + method: "get", + request: { + query: paramData, + }, + response: { + status: 204, + }, + handler: (req: MockRequest) => { + const actual = req.query["input"] as string; + const actualNum = parseFloat(actual); + if (isNaN(actualNum) || actualNum !== value) { + throw new ValidationError( + `Expected query param input=${value} but got ${actual}`, + String(value), + actual, + ); + } + return { + status: 204, + }; + }, + kind: "MockApiDefinition", + }); +} Scenarios.Encode_Duration_Query_default = createQueryServerTests( "/encode/duration/query/default", { @@ -197,19 +226,19 @@ Scenarios.Encode_Duration_Query_int32Milliseconds = createQueryServerTests( }, "36000", ); -Scenarios.Encode_Duration_Query_floatMilliseconds = createQueryServerTests( +Scenarios.Encode_Duration_Query_floatMilliseconds = createQueryFloatServerTests( "/encode/duration/query/float-milliseconds", { input: 35625, }, - "35625", + 35625, ); -Scenarios.Encode_Duration_Query_float64Milliseconds = createQueryServerTests( +Scenarios.Encode_Duration_Query_float64Milliseconds = createQueryFloatServerTests( "/encode/duration/query/float64-milliseconds", { input: 35625, }, - "35625", + 35625, ); Scenarios.Encode_Duration_Query_int32MillisecondsArray = createQueryServerTests( "/encode/duration/query/int32-milliseconds-array", @@ -226,7 +255,7 @@ Scenarios.Encode_Duration_Query_int32SecondsLargerUnit = createQueryServerTests( }, "120", ); -Scenarios.Encode_Duration_Query_floatSecondsLargerUnit = createQueryServerTests( +Scenarios.Encode_Duration_Query_floatSecondsLargerUnit = createQueryFloatServerTests( "/encode/duration/query/float-seconds-larger-unit", { input: 150, @@ -240,7 +269,7 @@ Scenarios.Encode_Duration_Query_int32MillisecondsLargerUnit = createQueryServerT }, "180000", ); -Scenarios.Encode_Duration_Query_floatMillisecondsLargerUnit = createQueryServerTests( +Scenarios.Encode_Duration_Query_floatMillisecondsLargerUnit = createQueryFloatServerTests( "/encode/duration/query/float-milliseconds-larger-unit", { input: 210000, @@ -262,6 +291,36 @@ function createHeaderServerTests(uri: string, headersData: any, value: any) { }); } +function createHeaderFloatServerTests(uri: string, value: number) { + return passOnSuccess({ + uri, + method: "get", + request: { + headers: { + duration: String(value), + }, + }, + response: { + status: 204, + }, + handler: (req: MockRequest) => { + const actual = req.headers["duration"]; + const actualNum = parseFloat(actual); + if (isNaN(actualNum) || actualNum !== value) { + throw new ValidationError( + `Expected header duration=${value} but got ${actual}`, + String(value), + actual, + ); + } + return { + status: 204, + }; + }, + kind: "MockApiDefinition", + }); +} + Scenarios.Encode_Duration_Header_default = createHeaderServerTests( "/encode/duration/header/default", { @@ -312,19 +371,13 @@ Scenarios.Encode_Duration_Header_int32Milliseconds = createHeaderServerTests( }, "36000", ); -Scenarios.Encode_Duration_Header_floatMilliseconds = createHeaderServerTests( +Scenarios.Encode_Duration_Header_floatMilliseconds = createHeaderFloatServerTests( "/encode/duration/header/float-milliseconds", - { - duration: "35625", - }, - "35625", + 35625, ); -Scenarios.Encode_Duration_Header_float64Milliseconds = createHeaderServerTests( +Scenarios.Encode_Duration_Header_float64Milliseconds = createHeaderFloatServerTests( "/encode/duration/header/float64-milliseconds", - { - duration: "35625", - }, - "35625", + 35625, ); Scenarios.Encode_Duration_Header_int32MillisecondsArray = createHeaderServerTests( "/encode/duration/header/int32-milliseconds-array", @@ -340,12 +393,9 @@ Scenarios.Encode_Duration_Header_int32SecondsLargerUnit = createHeaderServerTest }, "120", ); -Scenarios.Encode_Duration_Header_floatSecondsLargerUnit = createHeaderServerTests( +Scenarios.Encode_Duration_Header_floatSecondsLargerUnit = createHeaderFloatServerTests( "/encode/duration/header/float-seconds-larger-unit", - { - duration: "150", - }, - "150", + 150, ); Scenarios.Encode_Duration_Header_int32MillisecondsLargerUnit = createHeaderServerTests( "/encode/duration/header/int32-milliseconds-larger-unit", @@ -354,10 +404,7 @@ Scenarios.Encode_Duration_Header_int32MillisecondsLargerUnit = createHeaderServe }, "180000", ); -Scenarios.Encode_Duration_Header_floatMillisecondsLargerUnit = createHeaderServerTests( +Scenarios.Encode_Duration_Header_floatMillisecondsLargerUnit = createHeaderFloatServerTests( "/encode/duration/header/float-milliseconds-larger-unit", - { - duration: "210000", - }, - "210000", + 210000, ); diff --git a/packages/http-specs/specs/payload/multipart/main.tsp b/packages/http-specs/specs/payload/multipart/main.tsp index 87a8f46f6c3..062a8b12e00 100644 --- a/packages/http-specs/specs/payload/multipart/main.tsp +++ b/packages/http-specs/specs/payload/multipart/main.tsp @@ -608,4 +608,91 @@ namespace FormData { ): NoContentResponse; } } + + @route("/file") + namespace File { + model FileWithRequiredFilename extends TypeSpec.Http.File<"image/png"> { + filename: string; + } + + @scenario + @scenarioDoc(""" + Test File type in multipart form data with specific content type. + Expected request: + ``` + POST /multipart/form-data/file/specific-content-type HTTP/1.1 + Content-Type: multipart/form-data; boundary=abcde12345 + + --abcde12345 + Content-Disposition: form-data; name="file"; filename="image.png" + Content-Type: image/png + + {…file content of image.png…} + --abcde12345-- + ``` + """) + @post + @route("/specific-content-type") + op uploadFileSpecificContentType( + @header contentType: "multipart/form-data", + @multipartBody body: { + file: HttpPart>; + }, + ): NoContentResponse; + + @scenario + @scenarioDoc(""" + Test File type in multipart form data with required filename. + Expected request: + ``` + POST /multipart/form-data/file/required-filename HTTP/1.1 + Content-Type: multipart/form-data; boundary=abcde12345 + + --abcde12345 + Content-Disposition: form-data; name="file"; filename="image.png" + Content-Type: image/png + + {…file content of image.png…} + --abcde12345-- + ``` + """) + @post + @route("/required-filename") + op uploadFileRequiredFilename( + @header contentType: "multipart/form-data", + @multipartBody body: { + file: HttpPart; + }, + ): NoContentResponse; + + @scenario + @scenarioDoc(""" + Test multiple File instances in multipart form data. + Expected request: + ``` + POST /multipart/form-data/file/file-array HTTP/1.1 + Content-Type: multipart/form-data; boundary=abcde12345 + + --abcde12345 + Content-Disposition: form-data; name="files"; filename="image1.png" + Content-Type: image/png + + {…file content of image.png…} + --abcde12345 + Content-Disposition: form-data; name="files"; filename="image2.png" + Content-Type: image/png + + {…file content of image.png…} + --abcde12345-- + ``` + """) + @post + @route("/file-array") + op uploadFileArray( + @header contentType: "multipart/form-data", + @multipartBody body: { + files: HttpPart>[]; + }, + ): NoContentResponse; + } } diff --git a/packages/http-specs/specs/payload/multipart/mockapi.ts b/packages/http-specs/specs/payload/multipart/mockapi.ts index 4c190ff8ad9..ea54b460201 100644 --- a/packages/http-specs/specs/payload/multipart/mockapi.ts +++ b/packages/http-specs/specs/payload/multipart/mockapi.ts @@ -414,3 +414,99 @@ Scenarios.Payload_MultiPart_FormData_HttpParts_NonString_float = passOnSuccess({ handler: (req: MockRequest) => createHandler(req, [checkFloat]), kind: "MockApiDefinition", }); + +// Helper function to check file in multipart for File type tests +function checkMultipartFile( + req: MockRequest, + file: Record, + expectedContent: Buffer, + expectedContentType: string, + fieldName: string = "file", + expectedFileName?: string, +) { + req.expect.deepEqual(file.fieldname, fieldName); + req.expect.deepEqual(file.mimetype, expectedContentType); + req.expect.deepEqual(file.buffer, expectedContent); + if (expectedFileName) { + req.expect.deepEqual(file.originalname, expectedFileName); + } +} + +// Multipart File type tests +Scenarios.Payload_MultiPart_FormData_File_uploadFileSpecificContentType = passOnSuccess({ + uri: "/multipart/form-data/file/specific-content-type", + method: "post", + request: { + body: multipart({ + files: [ + { fieldname: "file", originalname: "image.png", buffer: pngFile, mimetype: "image/png" }, + ], + }), + }, + response: { + status: 204, + }, + handler(req: MockRequest) { + if (req.files instanceof Array && req.files.length === 1) { + const file = req.files[0]; + checkMultipartFile(req, file, pngFile, "image/png", "file", "image.png"); + return { status: 204 }; + } else { + throw new ValidationError("Expected exactly one file", "1 file", req.files); + } + }, + kind: "MockApiDefinition", +}); + +Scenarios.Payload_MultiPart_FormData_File_uploadFileRequiredFilename = passOnSuccess({ + uri: "/multipart/form-data/file/required-filename", + method: "post", + request: { + body: multipart({ + files: [ + { fieldname: "file", originalname: "image.png", buffer: pngFile, mimetype: "image/png" }, + ], + }), + }, + response: { + status: 204, + }, + handler(req: MockRequest) { + if (req.files instanceof Array && req.files.length === 1) { + const file = req.files[0]; + checkMultipartFile(req, file, pngFile, "image/png", "file", "image.png"); + return { status: 204 }; + } else { + throw new ValidationError("Expected exactly one file", "1 file", req.files); + } + }, + kind: "MockApiDefinition", +}); + +Scenarios.Payload_MultiPart_FormData_File_uploadFileArray = passOnSuccess({ + uri: "/multipart/form-data/file/file-array", + method: "post", + request: { + body: multipart({ + files: [ + { fieldname: "files", originalname: "image.png", buffer: pngFile, mimetype: "image/png" }, + { fieldname: "files", originalname: "image.png", buffer: pngFile, mimetype: "image/png" }, + ], + }), + }, + response: { + status: 204, + }, + handler(req: MockRequest) { + if (req.files instanceof Array && req.files.length === 2) { + for (const file of req.files) { + req.expect.deepEqual(file.fieldname, "files"); + checkMultipartFile(req, file, pngFile, "image/png", "files"); + } + return { status: 204 }; + } else { + throw new ValidationError("Expected exactly two files", "2 files", req.files); + } + }, + kind: "MockApiDefinition", +}); diff --git a/packages/http-specs/specs/payload/pageable/main.tsp b/packages/http-specs/specs/payload/pageable/main.tsp index a717076947e..db89029037c 100644 --- a/packages/http-specs/specs/payload/pageable/main.tsp +++ b/packages/http-specs/specs/payload/pageable/main.tsp @@ -141,6 +141,53 @@ namespace ServerDrivenPagination { }; }; + /** Scenario where the initial request is not a GET request. However following the next link always result in a GET request. */ + namespace AlternateInitialVerb { + model Filter { + filter: string; + } + + @scenario + @scenarioDoc(""" + Test case for initial POST request followed by GET for next pages using link pagination. + The initial request is a POST with a filter body, and the next page is fetched using a GET request on the next link. + + Two requests need to be tested. + 1. Initial request (POST): + Expected route: /payload/pageable/server-driven-pagination/link/initial-post + Expected request body: + ```json + { "filter": "foo eq bar" } + ``` + Expected response body: + ```json + { "pets": [ + { "id": "1", "name": "dog" }, + { "id": "2", "name": "cat" } + ], + "next": "http://[host]:[port]/payload/pageable/server-driven-pagination/link/initial-post/nextPage?token=abc" + } + ``` + 2. Next page request (GET): + Expected route: /payload/pageable/server-driven-pagination/link/initial-post/nextPage?token=abc + Expected response body: + ```json + { "pets": [ + { "id": "3", "name": "bird" }, + { "id": "4", "name": "fish" } + ] + } + ``` + """) + @route("/link/initial-post") + @list + @post + op post(@body body: Filter): { + @pageItems pets: Pet[]; + @nextLink next?: url; + }; + } + @route("/continuationtoken") namespace ContinuationToken { @scenario diff --git a/packages/http-specs/specs/payload/pageable/mockapi.ts b/packages/http-specs/specs/payload/pageable/mockapi.ts index 3fdbf8c794e..4f42d66f41a 100644 --- a/packages/http-specs/specs/payload/pageable/mockapi.ts +++ b/packages/http-specs/specs/payload/pageable/mockapi.ts @@ -2,6 +2,7 @@ import { dyn, dynItem, json, + match, MockRequest, passOnSuccess, ScenarioMockApi, @@ -176,6 +177,34 @@ Scenarios.Payload_Pageable_ServerDrivenPagination_nestedLink = passOnSuccess([ }, ]); +// POST-THEN-GET LINK PAGINATION +Scenarios.Payload_Pageable_ServerDrivenPagination_AlternateInitialVerb_post = passOnSuccess([ + { + uri: "/payload/pageable/server-driven-pagination/link/initial-post", + method: "post", + request: { + body: json({ filter: "foo eq bar" }), + }, + response: { + status: 200, + body: json({ + pets: FirstPage, + next: dyn`${dynItem("baseUrl")}/payload/pageable/server-driven-pagination/link/initial-post/nextPage?token=abc`, + }), + }, + kind: "MockApiDefinition", + }, + { + uri: "/payload/pageable/server-driven-pagination/link/initial-post/nextPage", + method: "get", + request: { + query: { token: "abc" }, + }, + response: SecondResponse, + kind: "MockApiDefinition", + }, +]); + Scenarios.Payload_Pageable_ServerDrivenPagination_ContinuationToken_requestQueryResponseBody = createTests("query", "body"); @@ -553,7 +582,7 @@ Scenarios.Payload_Pageable_XmlPagination_listWithContinuation = passOnSuccess([ status: 200, body: xml(XmlContTokenFirstPage), headers: { - "content-type": "application/xml", + "content-type": "application/xml; charset=utf-8", }, }, handler: (req: MockRequest) => { @@ -590,7 +619,7 @@ Scenarios.Payload_Pageable_XmlPagination_listWithContinuation = passOnSuccess([ status: 200, body: xml(XmlContTokenSecondPage), headers: { - "content-type": "application/xml", + "content-type": "application/xml; charset=utf-8", }, }, handler: (req: MockRequest) => { @@ -621,22 +650,6 @@ Scenarios.Payload_Pageable_XmlPagination_listWithContinuation = passOnSuccess([ }, ]); -const xmlNextLinkFirstPage = (baseUrl: string) => ` - - - - 1 - dog - - - 2 - cat - - - ${baseUrl}/payload/pageable/xml/list-with-next-link/nextPage - -`; - const XmlNextLinkSecondPage = ` @@ -659,20 +672,25 @@ Scenarios.Payload_Pageable_XmlPagination_listWithNextLink = passOnSuccess([ request: {}, response: { status: 200, - body: xml(xmlNextLinkFirstPage("PLACEHOLDER_BASE_URL")), + body: xml` + + + + 1 + dog + + + 2 + cat + + + ${match.localUrl("/payload/pageable/xml/list-with-next-link/nextPage")} + +`, headers: { - "content-type": "application/xml", + "content-type": "application/xml; charset=utf-8", }, }, - handler: (req: MockRequest) => { - return { - status: 200, - body: xml(xmlNextLinkFirstPage(req.baseUrl)), - headers: { - "content-type": "application/xml", - }, - }; - }, kind: "MockApiDefinition", }, { @@ -683,7 +701,7 @@ Scenarios.Payload_Pageable_XmlPagination_listWithNextLink = passOnSuccess([ status: 200, body: xml(XmlNextLinkSecondPage), headers: { - "content-type": "application/xml", + "content-type": "application/xml; charset=utf-8", }, }, kind: "MockApiDefinition", diff --git a/packages/http-specs/specs/payload/xml/main.tsp b/packages/http-specs/specs/payload/xml/main.tsp index b280bbe9758..57a620adc8a 100644 --- a/packages/http-specs/specs/payload/xml/main.tsp +++ b/packages/http-specs/specs/payload/xml/main.tsp @@ -6,97 +6,27 @@ using Http; using Spector; using TypeSpec.Xml; -@doc("Sends and receives bodies in XML format.") +/** Sends and receives bodies in XML format. */ @scenarioService("/payload/xml") namespace Payload.Xml; -@doc("Contains fields of primitive types.") +// ──────────────────────────────────────────────────────────────────────────── +// Shared types +// ──────────────────────────────────────────────────────────────────────────── + +/** §1.1 — Contains fields of primitive types. */ model SimpleModel { name: string; age: int32; } -@doc("Contains fields of arrays of primitive types.") -model ModelWithSimpleArrays { - colors: string[]; - counts: int32[]; -} - -@doc("Contains an array of models.") -model ModelWithArrayOfModel { - items: SimpleModel[]; -} - -@doc("Contains an optional field.") -model ModelWithOptionalField { - item: string; - value?: int32; -} - -@doc("Contains fields that are XML attributes.") -model ModelWithAttributes { - @attribute id1: int32; - @attribute id2: string; - enabled: boolean; -} - -@doc("Contains fields of wrapped and unwrapped arrays of primitive types.") -model ModelWithUnwrappedArray { - @unwrapped colors: string[]; - counts: int32[]; -} - -@doc("Contains fields of wrapped and unwrapped arrays of primitive types that have different XML representations.") -model ModelWithRenamedArrays { - @name("Colors") @unwrapped colors: string[]; - @name("Counts") counts: int32[]; -} - -@doc("Contains fields of the same type that have different XML representation.") -@name("ModelWithRenamedFieldsSrc") -model ModelWithRenamedFields { - @name("InputData") inputData: SimpleModel; - @name("OutputData") outputData: SimpleModel; -} - -@doc("Contains an array of models that's supposed to be sent/received as an empty XML element.") -model ModelWithEmptyArray { - items: SimpleModel[]; -} - -@doc("Contains an attribute and text.") -model ModelWithText { - @attribute language: string; - @unwrapped content: string; -} - -@doc("Contains a dictionary of key value pairs.") -model ModelWithDictionary { - metadata: Record; -} - -@doc("Uses encodedName instead of Xml.Name which is functionally equivalent.") -@encodedName("application/xml", "ModelWithEncodedNamesSrc") -model ModelWithEncodedNames { - @encodedName("application/xml", "SimpleModelData") modelData: SimpleModel; - @encodedName("application/xml", "PossibleColors") colors: string[]; -} - -@doc("An error response body in XML format.") -@error -model XmlError { - @statusCode _: 400; - @header("content-type") contentType: "application/xml"; - @body body: XmlErrorBody; -} - -@doc("The body of an XML error response.") -model XmlErrorBody { - message: string; - code: int32; +@nsDeclarations +enum Namespaces { + smp: "http://example.com/schema", + ns2: "http://example.com/ns2", } -@doc("Template for XML operations") +/** Template for XML operations */ interface XmlOperations { @scenario @scenarioDoc(""" @@ -122,7 +52,11 @@ interface XmlOperations { put(@header("content-type") contentType: "application/xml", @body input: TModel): void; } -@doc("Operations for the SimpleModel type.") +// ──────────────────────────────────────────────────────────────────────────── +// §1 — Primitive properties +// ──────────────────────────────────────────────────────────────────────────── + +/** §1.1 — Operations for the SimpleModel type. */ @route("/simpleModel") interface SimpleModelValue extends XmlOperations< @@ -135,7 +69,113 @@ interface SimpleModelValue """ > {} -@doc("Operations for the ModelWithSimpleArrays type.") +/** §1.2 — Contains a scalar property with a custom XML name. */ +model ModelWithRenamedProperty { + @name("renamedTitle") + title: string; + + author: string; +} + +/** §1.2 — Operations for the ModelWithRenamedProperty type. */ +@route("/modelWithRenamedProperty") +interface ModelWithRenamedPropertyValue + extends XmlOperations< + ModelWithRenamedProperty, + """ + + foo + bar + + """ + > {} + +/** §1.3, §2.3 — Contains fields of the same type that have different XML representation. */ +@name("ModelWithRenamedFieldsSrc") +model ModelWithRenamedFields { + @name("InputData") inputData: SimpleModel; + @name("OutputData") outputData: SimpleModel; +} + +/** §1.3, §2.3 — Operations for the ModelWithRenamedFields type. */ +@route("/modelWithRenamedFields") +interface ModelWithRenamedFieldsValue + extends XmlOperations< + ModelWithRenamedFields, + """ + + + foo + 123 + + + bar + 456 + + + """ + > {} + +// ──────────────────────────────────────────────────────────────────────────── +// §2 — Nested models +// ──────────────────────────────────────────────────────────────────────────── + +/** §2.1 — Contains a property that references another model. */ +model ModelWithNestedModel { + nested: SimpleModel; +} + +/** §2.1 — Operations for the ModelWithNestedModel type. */ +@route("/modelWithNestedModel") +interface ModelWithNestedModelValue + extends XmlOperations< + ModelWithNestedModel, + """ + + + foo + 123 + + + """ + > {} + +/** Author model with a custom XML name. */ +@name("XmlAuthor") +model Author { + name: string; +} + +/** §2.2 — Contains a property whose type has @Xml.name. The property name takes precedence. */ +model ModelWithRenamedNestedModel { + author: Author; +} + +/** §2.2 — Operations for the ModelWithRenamedNestedModel type. */ +@route("/modelWithRenamedNestedModel") +interface ModelWithRenamedNestedModelValue + extends XmlOperations< + ModelWithRenamedNestedModel, + """ + + + foo + + + """ + > {} + +// ──────────────────────────────────────────────────────────────────────────── +// §3 — Array of primitive types +// ──────────────────────────────────────────────────────────────────────────── + +/** §3.1 — Contains fields of arrays of primitive types. */ +model ModelWithSimpleArrays { + colors: string[]; + counts: int32[]; +} + +/** §3.1 — Operations for the ModelWithSimpleArrays type. */ @route("/modelWithSimpleArrays") interface ModelWithSimpleArraysValue extends XmlOperations< @@ -155,7 +195,89 @@ interface ModelWithSimpleArraysValue """ > {} -@doc("Operations for the ModelWithArrayOfModel type.") +/** §3.2 — Contains fields of wrapped and unwrapped arrays of primitive types. */ +model ModelWithUnwrappedArray { + @unwrapped colors: string[]; + counts: int32[]; +} + +/** §3.2 — Operations for the ModelWithUnwrappedArray type. */ +@route("/modelWithUnwrappedArray") +interface ModelWithUnwrappedArrayValue + extends XmlOperations< + ModelWithUnwrappedArray, + """ + + red + green + blue + + 1 + 2 + + + """ + > {} + +/** §3.3, §3.4 — Contains fields of wrapped and unwrapped arrays of primitive types that have different XML representations. */ +model ModelWithRenamedArrays { + @name("Colors") @unwrapped colors: string[]; + @name("Counts") counts: int32[]; +} + +/** §3.3, §3.4 — Operations for the ModelWithRenamedArrays type. */ +@route("/modelWithRenamedArrays") +interface ModelWithRenamedArraysValue + extends XmlOperations< + ModelWithRenamedArrays, + """ + + red + green + blue + + 1 + 2 + + + """ + > {} + +/** Custom scalar with a custom XML item name. */ +@name("ItemName") +scalar tag extends string; + +/** §3.5 — Contains a wrapped primitive array with custom wrapper and item names. */ +model ModelWithWrappedPrimitiveCustomItemNames { + @name("ItemsTags") + tags: tag[]; +} + +/** §3.5 — Operations for the ModelWithWrappedPrimitiveCustomItemNames type. */ +@route("/modelWithWrappedPrimitiveCustomItemNames") +interface ModelWithWrappedPrimitiveCustomItemNamesValue + extends XmlOperations< + ModelWithWrappedPrimitiveCustomItemNames, + """ + + + fiction + classic + + + """ + > {} + +// ──────────────────────────────────────────────────────────────────────────── +// §4 — Array of complex types +// ──────────────────────────────────────────────────────────────────────────── + +/** §4.1 — Contains an array of models. */ +model ModelWithArrayOfModel { + items: SimpleModel[]; +} + +/** §4.1 — Operations for the ModelWithArrayOfModel type. */ @route("/modelWithArrayOfModel") interface ModelWithArrayOfModelValue extends XmlOperations< @@ -176,19 +298,127 @@ interface ModelWithArrayOfModelValue """ > {} -@doc("Operations for the ModelWithOptionalField type.") -@route("/modelWithOptionalField") -interface ModelWithOptionalFieldValue +/** §4.2 — Contains an unwrapped array of models. */ +model ModelWithUnwrappedModelArray { + @unwrapped + items: SimpleModel[]; +} + +/** §4.2 — Operations for the ModelWithUnwrappedModelArray type. */ +@route("/modelWithUnwrappedModelArray") +interface ModelWithUnwrappedModelArrayValue extends XmlOperations< - ModelWithOptionalField, + ModelWithUnwrappedModelArray, """ - - widget - + + + foo + 123 + + + bar + 456 + + + """ + > {} + +/** §4.3 — Contains a wrapped array of models with a custom wrapper name. */ +model ModelWithRenamedWrappedModelArray { + @name("AllItems") + items: SimpleModel[]; +} + +/** §4.3 — Operations for the ModelWithRenamedWrappedModelArray type. */ +@route("/modelWithRenamedWrappedModelArray") +interface ModelWithRenamedWrappedModelArrayValue + extends XmlOperations< + ModelWithRenamedWrappedModelArray, + """ + + + + foo + 123 + + + bar + 456 + + + + """ + > {} + +/** §4.4 — Contains an unwrapped array of models with a custom item name. */ +model ModelWithRenamedUnwrappedModelArray { + @name("ModelItem") + @unwrapped + items: SimpleModel[]; +} + +/** §4.4 — Operations for the ModelWithRenamedUnwrappedModelArray type. */ +@route("/modelWithRenamedUnwrappedModelArray") +interface ModelWithRenamedUnwrappedModelArrayValue + extends XmlOperations< + ModelWithRenamedUnwrappedModelArray, + """ + + + foo + 123 + + + bar + 456 + + + """ + > {} + +/** Book model with a custom XML name. */ +@name("XmlBook") +model Book { + title: string; +} + +/** §4.5 — Contains a wrapped array of models with custom wrapper and item names. */ +model ModelWithRenamedWrappedAndItemModelArray { + @name("AllBooks") + books: Book[]; +} + +/** §4.5 — Operations for the ModelWithRenamedWrappedAndItemModelArray type. */ +@route("/modelWithRenamedWrappedAndItemModelArray") +interface ModelWithRenamedWrappedAndItemModelArrayValue + extends XmlOperations< + ModelWithRenamedWrappedAndItemModelArray, + """ + + + + The Great Gatsby + + + Les Miserables + + + """ > {} -@doc("Operations for the ModelWithAttributes type.") +// ──────────────────────────────────────────────────────────────────────────── +// §5 — Attributes +// ──────────────────────────────────────────────────────────────────────────── + +/** §5.1 — Contains fields that are XML attributes. */ +model ModelWithAttributes { + @attribute id1: int32; + @attribute id2: string; + enabled: boolean; +} + +/** §5.1 — Operations for the ModelWithAttributes type. */ @route("/modelWithAttributes") interface ModelWithAttributesValue extends XmlOperations< @@ -200,74 +430,90 @@ interface ModelWithAttributesValue """ > {} -@doc("Operations for the ModelWithUnwrappedArray type.") -@route("/modelWithUnwrappedArray") -interface ModelWithUnwrappedArrayValue - extends XmlOperations< - ModelWithUnwrappedArray, - """ - - red - green - blue - - 1 - 2 - - - """ - > {} +/** §5.2 — Contains a renamed XML attribute. */ +model ModelWithRenamedAttribute { + @attribute + @name("xml-id") + id: int32; -@doc("Operations for the ModelWithRenamedArrays type.") -@route("/modelWithRenamedArrays") -interface ModelWithRenamedArraysValue + title: string; + author: string; +} + +/** §5.2 — Operations for the ModelWithRenamedAttribute type. */ +@route("/modelWithRenamedAttribute") +interface ModelWithRenamedAttributeValue extends XmlOperations< - ModelWithRenamedArrays, + ModelWithRenamedAttribute, """ - - red - green - blue - - 1 - 2 - - + + The Great Gatsby + F. Scott Fitzgerald + """ > {} -@doc("Operations for the ModelWithRenamedFields type.") -@route("/modelWithRenamedFields") -interface ModelWithRenamedFieldsValue +// ──────────────────────────────────────────────────────────────────────────── +// §6/§7 — Namespace and prefix +// ──────────────────────────────────────────────────────────────────────────── + +/** §6.1, §7.1 — Contains fields with XML namespace on the model. */ +@ns(Namespaces.smp) +model ModelWithNamespace { + id: int32; + title: string; +} + +/** §6.1, §7.1 — Operations for the ModelWithNamespace type. */ +@route("/modelWithNamespace") +interface ModelWithNamespaceValue extends XmlOperations< - ModelWithRenamedFields, + ModelWithNamespace, """ - - - foo - 123 - - - bar - 456 - - + + 123 + The Great Gatsby + """ > {} -@doc("Operations for the ModelWithEmptyArray type.") -@route("/modelWithEmptyArray") -interface ModelWithEmptyArrayValue +/** §6.2, §7.2 — Contains fields with different XML namespaces on individual properties. */ +@ns(Namespaces.smp) +model ModelWithNamespaceOnProperties { + id: int32; + + @ns(Namespaces.smp) + title: string; + + @ns(Namespaces.ns2) + author: string; +} + +/** §6.2, §7.2 — Operations for the ModelWithNamespaceOnProperties type. */ +@route("/modelWithNamespaceOnProperties") +interface ModelWithNamespaceOnPropertiesValue extends XmlOperations< - ModelWithEmptyArray, + ModelWithNamespaceOnProperties, """ - - - + + 123 + The Great Gatsby + F. Scott Fitzgerald + """ > {} -@doc("Operations for the ModelWithText type.") +// ──────────────────────────────────────────────────────────────────────────── +// §8 — Text content +// ──────────────────────────────────────────────────────────────────────────── + +/** §8.1 — Contains an attribute and text. */ +model ModelWithText { + @attribute language: string; + @unwrapped content: string; +} + +/** §8.1 — Operations for the ModelWithText type. */ @route("/modelWithText") interface ModelWithTextValue extends XmlOperations< @@ -279,7 +525,51 @@ interface ModelWithTextValue """ > {} -@doc("Operations for the ModelWithDictionary type.") +// ──────────────────────────────────────────────────────────────────────────── +// Additional scenarios (not in the guide) +// ──────────────────────────────────────────────────────────────────────────── + +/** Contains an optional field. */ +model ModelWithOptionalField { + item: string; + value?: int32; +} + +/** Operations for the ModelWithOptionalField type. */ +@route("/modelWithOptionalField") +interface ModelWithOptionalFieldValue + extends XmlOperations< + ModelWithOptionalField, + """ + + widget + + """ + > {} + +/** Contains an array of models that's supposed to be sent/received as an empty XML element. */ +model ModelWithEmptyArray { + items: SimpleModel[]; +} + +/** Operations for the ModelWithEmptyArray type. */ +@route("/modelWithEmptyArray") +interface ModelWithEmptyArrayValue + extends XmlOperations< + ModelWithEmptyArray, + """ + + + + """ + > {} + +/** Contains a dictionary of key value pairs. */ +model ModelWithDictionary { + metadata: Record; +} + +/** Operations for the ModelWithDictionary type. */ @route("/modelWithDictionary") interface ModelWithDictionaryValue extends XmlOperations< @@ -295,7 +585,14 @@ interface ModelWithDictionaryValue """ > {} -@doc("Operations for the ModelWithEncodedNames type.") +/** Uses encodedName instead of Xml.Name which is functionally equivalent. */ +@encodedName("application/xml", "ModelWithEncodedNamesSrc") +model ModelWithEncodedNames { + @encodedName("application/xml", "SimpleModelData") modelData: SimpleModel; + @encodedName("application/xml", "PossibleColors") colors: string[]; +} + +/** Operations for the ModelWithEncodedNames type. */ @route("/modelWithEncodedNames") interface ModelWithEncodedNamesValue extends XmlOperations< @@ -315,7 +612,76 @@ interface ModelWithEncodedNamesValue """ > {} -@doc("Operations that return an error response in XML format.") +/** Status values for the model with enum. */ +union Status { + string, + + /** Pending status. */ + pending: "pending", + + /** Success status. */ + success: "success", + + /** Error status. */ + error: "error", +} + +/** Contains a single property with an enum value. */ +model ModelWithEnum { + status: Status; +} + +/** Operations for the ModelWithEnum type. */ +@route("/modelWithEnum") +interface ModelWithEnumValue + extends XmlOperations< + ModelWithEnum, + """ + + success + + """ + > {} + +/** Contains datetime properties with different encodings. */ +model ModelWithDatetime { + /** DateTime value with rfc3339 encoding. */ + @encode(DateTimeKnownEncoding.rfc3339) + rfc3339: utcDateTime; + + /** DateTime value with rfc7231 encoding. */ + @encode(DateTimeKnownEncoding.rfc7231) + rfc7231: utcDateTime; +} + +/** Operations for the ModelWithDatetime type. */ +@route("/modelWithDatetime") +interface ModelWithDatetimeValue + extends XmlOperations< + ModelWithDatetime, + """ + + 2022-08-26T18:38:00.000Z + Fri, 26 Aug 2022 14:38:00 GMT + + """ + > {} + +/** An error response body in XML format. */ +@error +model XmlError { + @statusCode _: 400; + @header("content-type") contentType: "application/xml"; + @body body: XmlErrorBody; +} + +/** The body of an XML error response. */ +model XmlErrorBody { + message: string; + code: int32; +} + +/** Operations that return an error response in XML format. */ @route("/error") interface XmlErrorValue { @scenario @@ -329,5 +695,8 @@ interface XmlErrorValue { ``` """) @get - get(): SimpleModel | XmlError; + get(): { + @header("content-type") contentType: "application/xml"; + @body body: SimpleModel; + } | XmlError; } diff --git a/packages/http-specs/specs/payload/xml/mockapi.ts b/packages/http-specs/specs/payload/xml/mockapi.ts index 3e8744597b7..4af0d1e3dc6 100644 --- a/packages/http-specs/specs/payload/xml/mockapi.ts +++ b/packages/http-specs/specs/payload/xml/mockapi.ts @@ -1,7 +1,18 @@ -import { MockRequest, passOnCode, passOnSuccess, ScenarioMockApi, xml } from "@typespec/spec-api"; +import { + match, + type MockBody, + passOnCode, + passOnSuccess, + ScenarioMockApi, + xml, +} from "@typespec/spec-api"; export const Scenarios: Record = {}; +// ──────────────────────────────────────────────────────────────────────────── +// §1 — Primitive properties +// ──────────────────────────────────────────────────────────────────────────── + export const simpleModel = ` foo @@ -9,6 +20,51 @@ export const simpleModel = ` `; +export const modelWithRenamedProperty = ` + + foo + bar + +`; + +export const modelWithRenamedFields = ` + + + foo + 123 + + + bar + 456 + + +`; + +// ──────────────────────────────────────────────────────────────────────────── +// §2 — Nested models +// ──────────────────────────────────────────────────────────────────────────── + +export const modelWithNestedModel = ` + + + foo + 123 + + +`; + +export const modelWithRenamedNestedModel = ` + + + foo + + +`; + +// ──────────────────────────────────────────────────────────────────────────── +// §3 — Array of primitive types +// ──────────────────────────────────────────────────────────────────────────── + export const modelWithSimpleArrays = ` @@ -23,33 +79,6 @@ export const modelWithSimpleArrays = ` `; -export const modelWithArrayOfModel = ` - - - - foo - 123 - - - bar - 456 - - - -`; - -export const modelWithOptionalField = ` - - widget - -`; - -export const modelWithAttributes = ` - - true - -`; - export const modelWithUnwrappedArray = ` red @@ -74,31 +103,150 @@ export const modelWithRenamedArrays = ` `; -export const modelWithRenamedFields = ` - - +export const modelWithWrappedPrimitiveCustomItemNames = ` + + + fiction + classic + + +`; + +// ──────────────────────────────────────────────────────────────────────────── +// §4 — Array of complex types +// ──────────────────────────────────────────────────────────────────────────── + +export const modelWithArrayOfModel = ` + + + + foo + 123 + + + bar + 456 + + + +`; + +export const modelWithUnwrappedModelArray = ` + + foo 123 - - + + bar 456 - - + + `; -export const modelWithEmptyArray = ` - - - +export const modelWithRenamedWrappedModelArray = ` + + + + foo + 123 + + + bar + 456 + + + +`; + +export const modelWithRenamedUnwrappedModelArray = ` + + + foo + 123 + + + bar + 456 + + +`; + +export const modelWithRenamedWrappedAndItemModelArray = ` + + + + The Great Gatsby + + + Les Miserables + + + +`; + +// ──────────────────────────────────────────────────────────────────────────── +// §5 — Attributes +// ──────────────────────────────────────────────────────────────────────────── + +export const modelWithAttributes = ` + + true + +`; + +export const modelWithRenamedAttribute = ` + + The Great Gatsby + F. Scott Fitzgerald + +`; + +// ──────────────────────────────────────────────────────────────────────────── +// §6/§7 — Namespace and prefix +// ──────────────────────────────────────────────────────────────────────────── + +export const modelWithNamespace = ` + + 123 + The Great Gatsby + +`; + +export const modelWithNamespaceOnProperties = ` + + 123 + The Great Gatsby + F. Scott Fitzgerald + `; +// ──────────────────────────────────────────────────────────────────────────── +// §8 — Text content +// ──────────────────────────────────────────────────────────────────────────── + export const modelWithText = ` This is some text. `; +// ──────────────────────────────────────────────────────────────────────────── +// Additional scenarios (not in the guide) +// ──────────────────────────────────────────────────────────────────────────── + +export const modelWithOptionalField = ` + + widget + +`; + +export const modelWithEmptyArray = ` + + + +`; + export const modelWithDictionary = ` @@ -123,7 +271,43 @@ export const modelWithEncodedNames = ` `; +export const modelWithEnum = ` + + success + +`; + +export const modelWithDatetime = xml` + + ${match.dateTime.utcRfc3339("2022-08-26T18:38:00.000Z")} + ${match.dateTime.rfc7231("Fri, 26 Aug 2022 14:38:00 GMT")} + +`; + +const Payload_Xml_ModelWithDatetime = createServerTests( + "/payload/xml/modelWithDatetime", + modelWithDatetime, +); +Scenarios.Payload_Xml_ModelWithDatetimeValue_get = Payload_Xml_ModelWithDatetime.get; +Scenarios.Payload_Xml_ModelWithDatetimeValue_put = Payload_Xml_ModelWithDatetime.put; + +export const xmlError = ` + + Something went wrong + 400 + +`; + +// ──────────────────────────────────────────────────────────────────────────── +// Scenario registrations +// ──────────────────────────────────────────────────────────────────────────── + +function isMockBody(data: any): data is MockBody { + return typeof data === "object" && data !== null && "contentType" in data; +} + function createServerTests(uri: string, data?: any) { + const body = isMockBody(data) ? data : xml(data); return { get: passOnSuccess({ uri, @@ -131,7 +315,7 @@ function createServerTests(uri: string, data?: any) { request: {}, response: { status: 200, - body: xml(data), + body, }, kind: "MockApiDefinition", }), @@ -139,14 +323,7 @@ function createServerTests(uri: string, data?: any) { uri, method: "put", request: { - body: xml(data), - }, - handler: (req: MockRequest) => { - req.expect.containsHeader("content-type", "application/xml"); - req.expect.xmlBodyEquals(data); - return { - status: 204, - }; + body, }, response: { status: 204, @@ -156,10 +333,46 @@ function createServerTests(uri: string, data?: any) { }; } +// §1 — Primitive properties + const Payload_Xml_SimpleModel = createServerTests("/payload/xml/simpleModel", simpleModel); Scenarios.Payload_Xml_SimpleModelValue_get = Payload_Xml_SimpleModel.get; Scenarios.Payload_Xml_SimpleModelValue_put = Payload_Xml_SimpleModel.put; +const Payload_Xml_ModelWithRenamedProperty = createServerTests( + "/payload/xml/modelWithRenamedProperty", + modelWithRenamedProperty, +); +Scenarios.Payload_Xml_ModelWithRenamedPropertyValue_get = Payload_Xml_ModelWithRenamedProperty.get; +Scenarios.Payload_Xml_ModelWithRenamedPropertyValue_put = Payload_Xml_ModelWithRenamedProperty.put; + +const Payload_Xml_ModelWithRenamedFields = createServerTests( + "/payload/xml/modelWithRenamedFields", + modelWithRenamedFields, +); +Scenarios.Payload_Xml_ModelWithRenamedFieldsValue_get = Payload_Xml_ModelWithRenamedFields.get; +Scenarios.Payload_Xml_ModelWithRenamedFieldsValue_put = Payload_Xml_ModelWithRenamedFields.put; + +// §2 — Nested models + +const Payload_Xml_ModelWithNestedModel = createServerTests( + "/payload/xml/modelWithNestedModel", + modelWithNestedModel, +); +Scenarios.Payload_Xml_ModelWithNestedModelValue_get = Payload_Xml_ModelWithNestedModel.get; +Scenarios.Payload_Xml_ModelWithNestedModelValue_put = Payload_Xml_ModelWithNestedModel.put; + +const Payload_Xml_ModelWithRenamedNestedModel = createServerTests( + "/payload/xml/modelWithRenamedNestedModel", + modelWithRenamedNestedModel, +); +Scenarios.Payload_Xml_ModelWithRenamedNestedModelValue_get = + Payload_Xml_ModelWithRenamedNestedModel.get; +Scenarios.Payload_Xml_ModelWithRenamedNestedModelValue_put = + Payload_Xml_ModelWithRenamedNestedModel.put; + +// §3 — Array of primitive types + const Payload_Xml_ModelWithSimpleArrays = createServerTests( "/payload/xml/modelWithSimpleArrays", modelWithSimpleArrays, @@ -167,6 +380,31 @@ const Payload_Xml_ModelWithSimpleArrays = createServerTests( Scenarios.Payload_Xml_ModelWithSimpleArraysValue_get = Payload_Xml_ModelWithSimpleArrays.get; Scenarios.Payload_Xml_ModelWithSimpleArraysValue_put = Payload_Xml_ModelWithSimpleArrays.put; +const Payload_Xml_ModelWithUnwrappedArray = createServerTests( + "/payload/xml/modelWithUnwrappedArray", + modelWithUnwrappedArray, +); +Scenarios.Payload_Xml_ModelWithUnwrappedArrayValue_get = Payload_Xml_ModelWithUnwrappedArray.get; +Scenarios.Payload_Xml_ModelWithUnwrappedArrayValue_put = Payload_Xml_ModelWithUnwrappedArray.put; + +const Payload_Xml_ModelWithRenamedArrays = createServerTests( + "/payload/xml/modelWithRenamedArrays", + modelWithRenamedArrays, +); +Scenarios.Payload_Xml_ModelWithRenamedArraysValue_get = Payload_Xml_ModelWithRenamedArrays.get; +Scenarios.Payload_Xml_ModelWithRenamedArraysValue_put = Payload_Xml_ModelWithRenamedArrays.put; + +const Payload_Xml_ModelWithWrappedPrimitiveCustomItemNames = createServerTests( + "/payload/xml/modelWithWrappedPrimitiveCustomItemNames", + modelWithWrappedPrimitiveCustomItemNames, +); +Scenarios.Payload_Xml_ModelWithWrappedPrimitiveCustomItemNamesValue_get = + Payload_Xml_ModelWithWrappedPrimitiveCustomItemNames.get; +Scenarios.Payload_Xml_ModelWithWrappedPrimitiveCustomItemNamesValue_put = + Payload_Xml_ModelWithWrappedPrimitiveCustomItemNames.put; + +// §4 — Array of complex types + const Payload_Xml_ModelWithArrayOfModel = createServerTests( "/payload/xml/modelWithArrayOfModel", modelWithArrayOfModel, @@ -174,12 +412,43 @@ const Payload_Xml_ModelWithArrayOfModel = createServerTests( Scenarios.Payload_Xml_ModelWithArrayOfModelValue_get = Payload_Xml_ModelWithArrayOfModel.get; Scenarios.Payload_Xml_ModelWithArrayOfModelValue_put = Payload_Xml_ModelWithArrayOfModel.put; -const Payload_Xml_ModelWithOptionalField = createServerTests( - "/payload/xml/modelWithOptionalField", - modelWithOptionalField, +const Payload_Xml_ModelWithUnwrappedModelArray = createServerTests( + "/payload/xml/modelWithUnwrappedModelArray", + modelWithUnwrappedModelArray, ); -Scenarios.Payload_Xml_ModelWithOptionalFieldValue_get = Payload_Xml_ModelWithOptionalField.get; -Scenarios.Payload_Xml_ModelWithOptionalFieldValue_put = Payload_Xml_ModelWithOptionalField.put; +Scenarios.Payload_Xml_ModelWithUnwrappedModelArrayValue_get = + Payload_Xml_ModelWithUnwrappedModelArray.get; +Scenarios.Payload_Xml_ModelWithUnwrappedModelArrayValue_put = + Payload_Xml_ModelWithUnwrappedModelArray.put; + +const Payload_Xml_ModelWithRenamedWrappedModelArray = createServerTests( + "/payload/xml/modelWithRenamedWrappedModelArray", + modelWithRenamedWrappedModelArray, +); +Scenarios.Payload_Xml_ModelWithRenamedWrappedModelArrayValue_get = + Payload_Xml_ModelWithRenamedWrappedModelArray.get; +Scenarios.Payload_Xml_ModelWithRenamedWrappedModelArrayValue_put = + Payload_Xml_ModelWithRenamedWrappedModelArray.put; + +const Payload_Xml_ModelWithRenamedUnwrappedModelArray = createServerTests( + "/payload/xml/modelWithRenamedUnwrappedModelArray", + modelWithRenamedUnwrappedModelArray, +); +Scenarios.Payload_Xml_ModelWithRenamedUnwrappedModelArrayValue_get = + Payload_Xml_ModelWithRenamedUnwrappedModelArray.get; +Scenarios.Payload_Xml_ModelWithRenamedUnwrappedModelArrayValue_put = + Payload_Xml_ModelWithRenamedUnwrappedModelArray.put; + +const Payload_Xml_ModelWithRenamedWrappedAndItemModelArray = createServerTests( + "/payload/xml/modelWithRenamedWrappedAndItemModelArray", + modelWithRenamedWrappedAndItemModelArray, +); +Scenarios.Payload_Xml_ModelWithRenamedWrappedAndItemModelArrayValue_get = + Payload_Xml_ModelWithRenamedWrappedAndItemModelArray.get; +Scenarios.Payload_Xml_ModelWithRenamedWrappedAndItemModelArrayValue_put = + Payload_Xml_ModelWithRenamedWrappedAndItemModelArray.put; + +// §5 — Attributes const Payload_Xml_ModelWithAttributes = createServerTests( "/payload/xml/modelWithAttributes", @@ -188,26 +457,47 @@ const Payload_Xml_ModelWithAttributes = createServerTests( Scenarios.Payload_Xml_ModelWithAttributesValue_get = Payload_Xml_ModelWithAttributes.get; Scenarios.Payload_Xml_ModelWithAttributesValue_put = Payload_Xml_ModelWithAttributes.put; -const Payload_Xml_ModelWithUnwrappedArray = createServerTests( - "/payload/xml/modelWithUnwrappedArray", - modelWithUnwrappedArray, +const Payload_Xml_ModelWithRenamedAttribute = createServerTests( + "/payload/xml/modelWithRenamedAttribute", + modelWithRenamedAttribute, ); -Scenarios.Payload_Xml_ModelWithUnwrappedArrayValue_get = Payload_Xml_ModelWithUnwrappedArray.get; -Scenarios.Payload_Xml_ModelWithUnwrappedArrayValue_put = Payload_Xml_ModelWithUnwrappedArray.put; +Scenarios.Payload_Xml_ModelWithRenamedAttributeValue_get = + Payload_Xml_ModelWithRenamedAttribute.get; +Scenarios.Payload_Xml_ModelWithRenamedAttributeValue_put = + Payload_Xml_ModelWithRenamedAttribute.put; -const Payload_Xml_ModelWithRenamedArrays = createServerTests( - "/payload/xml/modelWithRenamedArrays", - modelWithRenamedArrays, +// §6/§7 — Namespace and prefix + +const Payload_Xml_ModelWithNamespace = createServerTests( + "/payload/xml/modelWithNamespace", + modelWithNamespace, ); -Scenarios.Payload_Xml_ModelWithRenamedArraysValue_get = Payload_Xml_ModelWithRenamedArrays.get; -Scenarios.Payload_Xml_ModelWithRenamedArraysValue_put = Payload_Xml_ModelWithRenamedArrays.put; +Scenarios.Payload_Xml_ModelWithNamespaceValue_get = Payload_Xml_ModelWithNamespace.get; +Scenarios.Payload_Xml_ModelWithNamespaceValue_put = Payload_Xml_ModelWithNamespace.put; -const Payload_Xml_ModelWithRenamedFields = createServerTests( - "/payload/xml/modelWithRenamedFields", - modelWithRenamedFields, +const Payload_Xml_ModelWithNamespaceOnProperties = createServerTests( + "/payload/xml/modelWithNamespaceOnProperties", + modelWithNamespaceOnProperties, ); -Scenarios.Payload_Xml_ModelWithRenamedFieldsValue_get = Payload_Xml_ModelWithRenamedFields.get; -Scenarios.Payload_Xml_ModelWithRenamedFieldsValue_put = Payload_Xml_ModelWithRenamedFields.put; +Scenarios.Payload_Xml_ModelWithNamespaceOnPropertiesValue_get = + Payload_Xml_ModelWithNamespaceOnProperties.get; +Scenarios.Payload_Xml_ModelWithNamespaceOnPropertiesValue_put = + Payload_Xml_ModelWithNamespaceOnProperties.put; + +// §8 — Text content + +const Payload_Xml_ModelWithText = createServerTests("/payload/xml/modelWithText", modelWithText); +Scenarios.Payload_Xml_ModelWithTextValue_get = Payload_Xml_ModelWithText.get; +Scenarios.Payload_Xml_ModelWithTextValue_put = Payload_Xml_ModelWithText.put; + +// Additional scenarios + +const Payload_Xml_ModelWithOptionalField = createServerTests( + "/payload/xml/modelWithOptionalField", + modelWithOptionalField, +); +Scenarios.Payload_Xml_ModelWithOptionalFieldValue_get = Payload_Xml_ModelWithOptionalField.get; +Scenarios.Payload_Xml_ModelWithOptionalFieldValue_put = Payload_Xml_ModelWithOptionalField.put; const Payload_Xml_ModelWithEmptyArray = createServerTests( "/payload/xml/modelWithEmptyArray", @@ -216,10 +506,6 @@ const Payload_Xml_ModelWithEmptyArray = createServerTests( Scenarios.Payload_Xml_ModelWithEmptyArrayValue_get = Payload_Xml_ModelWithEmptyArray.get; Scenarios.Payload_Xml_ModelWithEmptyArrayValue_put = Payload_Xml_ModelWithEmptyArray.put; -const Payload_Xml_ModelWithText = createServerTests("/payload/xml/modelWithText", modelWithText); -Scenarios.Payload_Xml_ModelWithTextValue_get = Payload_Xml_ModelWithText.get; -Scenarios.Payload_Xml_ModelWithTextValue_put = Payload_Xml_ModelWithText.put; - const Payload_Xml_ModelWithDictionary = createServerTests( "/payload/xml/modelWithDictionary", modelWithDictionary, @@ -234,12 +520,9 @@ const Payload_Xml_ModelWithEncodedNames = createServerTests( Scenarios.Payload_Xml_ModelWithEncodedNamesValue_get = Payload_Xml_ModelWithEncodedNames.get; Scenarios.Payload_Xml_ModelWithEncodedNamesValue_put = Payload_Xml_ModelWithEncodedNames.put; -export const xmlError = ` - - Something went wrong - 400 - -`; +const Payload_Xml_ModelWithEnum = createServerTests("/payload/xml/modelWithEnum", modelWithEnum); +Scenarios.Payload_Xml_ModelWithEnumValue_get = Payload_Xml_ModelWithEnum.get; +Scenarios.Payload_Xml_ModelWithEnumValue_put = Payload_Xml_ModelWithEnum.put; Scenarios.Payload_Xml_XmlErrorValue_get = passOnCode(400, { uri: "/payload/xml/error", diff --git a/packages/http-specs/specs/special-words/main.tsp b/packages/http-specs/specs/special-words/main.tsp index a48f1a3f257..608b9b95f33 100644 --- a/packages/http-specs/specs/special-words/main.tsp +++ b/packages/http-specs/specs/special-words/main.tsp @@ -289,3 +289,64 @@ namespace ModelProperties { @route("list") op withList(@body body: ModelWithList): void; } + +/** + * Verify enum member names that are special words. + */ +@route("/extensible-strings") +namespace ExtensibleStrings { + /** + * Verify enum member names that are special words using extensible enum (union). + */ + union ExtensibleString { + string, + and: "and", + as: "as", + assert: "assert", + async: "async", + await: "await", + break: "break", + class: "class", + constructor: "constructor", + continue: "continue", + def: "def", + del: "del", + elif: "elif", + `else`: "else", + except: "except", + exec: "exec", + finally: "finally", + for: "for", + from: "from", + global: "global", + `if`: "if", + `import`: "import", + in: "in", + `is`: "is", + lambda: "lambda", + not: "not", + or: "or", + pass: "pass", + raise: "raise", + `return`: "return", + try: "try", + while: "while", + with: "with", + yield: "yield", + } + + @scenario + @scenarioDoc(""" + Verify that enum members with special word names can be sent and received properly. + Send 'class' and expect the same value back. + """) + @put + @route("/string") + op putExtensibleStringValue( + @header contentType: "application/json", + @body body: ExtensibleString, + ): { + @header contentType: "application/json"; + @body body: ExtensibleString; + }; +} diff --git a/packages/http-specs/specs/special-words/mockapi.ts b/packages/http-specs/specs/special-words/mockapi.ts index 8076c8b7d4c..28392c29899 100644 --- a/packages/http-specs/specs/special-words/mockapi.ts +++ b/packages/http-specs/specs/special-words/mockapi.ts @@ -1,4 +1,4 @@ -import { json, passOnSuccess, ScenarioMockApi } from "@typespec/spec-api"; +import { json, MockRequest, passOnSuccess, ScenarioMockApi } from "@typespec/spec-api"; export const Scenarios: Record = {}; @@ -419,3 +419,22 @@ Scenarios.SpecialWords_Parameters_cancellationToken = createParametersTests( }, "cancellationToken", ); + +Scenarios.SpecialWords_ExtensibleStrings_putExtensibleStringValue = passOnSuccess({ + uri: `/special-words/extensible-strings/string`, + method: "put", + request: { + body: json("class"), + }, + response: { + status: 200, + body: json("class"), + }, + handler: (req: MockRequest) => { + return { + status: 200, + body: json(req.body), + }; + }, + kind: "MockApiDefinition", +}); diff --git a/packages/http-specs/specs/type/file/main.tsp b/packages/http-specs/specs/type/file/main.tsp new file mode 100644 index 00000000000..a977b8e6a47 --- /dev/null +++ b/packages/http-specs/specs/type/file/main.tsp @@ -0,0 +1,109 @@ +import "@typespec/http"; +import "@typespec/spector"; + +using Http; +using Spector; + +@doc("Test for File type usage in request and response bodies") +@scenarioService("/type/file") +namespace Type.File; + +/** + * Test File as request and response body with specific content type + */ +@route("/body") +namespace Body { + @scenario + @scenarioDoc(""" + Test File type as request body with specific content type. + Expected request: + - Content-Type header: image/png + - Body: binary content matching packages/http-specs/assets/image.png + """) + @post + @route("/request/specific-content-type") + op uploadFileSpecificContentType(@bodyRoot file: Http.File<"image/png">): NoContentResponse; + + @scenario + @scenarioDoc(""" + Test File type as request body with JSON content type. + Expected request: + - Content-Type header: application/json + - Body: JSON content with file data + """) + @post + @route("/request/json-content-type") + op uploadFileJsonContentType(@bodyRoot file: Http.File<"application/json">): NoContentResponse; + + @scenario + @scenarioDoc(""" + Test File type as response body with JSON content type. + Expected response: + - Content-Type header: application/json + - Body: JSON content with file data + """) + @get + @route("/response/json-content-type") + op downloadFileJsonContentType(): Http.File<"application/json">; + + @scenario + @scenarioDoc(""" + Test File type as response body with specific content type. + Expected response: + - Content-Type header: image/png + - Body: binary content matching packages/http-specs/assets/image.png + """) + @get + @route("/response/specific-content-type") + op downloadFileSpecificContentType(): Http.File<"image/png">; + + @scenario + @scenarioDoc(""" + Test File type as request body with multiple allowed content types (image/png or image/jpeg). + Client should send image/png. + Expected request: + - Content-Type header: image/png + - Body: binary content matching packages/http-specs/assets/image.png + """) + @post + @route("/request/multiple-content-types") + op uploadFileMultipleContentTypes( + @bodyRoot file: Http.File<"image/png" | "image/jpeg">, + ): NoContentResponse; + + @scenario + @scenarioDoc(""" + Test File type as response body with multiple allowed content types. + Service will return image/png. + Expected response: + - Content-Type header: image/png + - Body: binary content matching packages/http-specs/assets/image.png + """) + @get + @route("/response/multiple-content-types") + op downloadFileMultipleContentTypes(): Http.File<"image/png" | "image/jpeg">; + + @scenario + @scenarioDoc(""" + Test File type as request body with unspecified content type. + The File type accepts any content type. For testing, sender will use image/png. + Expected request: + - Content-Type header: image/png + - Body: binary content matching packages/http-specs/assets/image.png + """) + @post + @route("/request/default-content-type") + op uploadFileDefaultContentType(@bodyRoot file: Http.File): NoContentResponse; + + @scenario + @scenarioDoc(""" + Test File type as response body with unspecified content type. + The File type accepts any content type. For testing, server will return image/png. + Expected response: + - Content-Type header: image/png + - Body: binary content matching packages/http-specs/assets/image.png + """) + @get + @route("/response/default-content-type") + op downloadFileDefaultContentType(): Http.File; +} diff --git a/packages/http-specs/specs/type/file/mockapi.ts b/packages/http-specs/specs/type/file/mockapi.ts new file mode 100644 index 00000000000..41e6be7ef1d --- /dev/null +++ b/packages/http-specs/specs/type/file/mockapi.ts @@ -0,0 +1,200 @@ +import { MockRequest, passOnSuccess, ScenarioMockApi, ValidationError } from "@typespec/spec-api"; +import { pngFile } from "../../helper.js"; + +export const Scenarios: Record = {}; + +// Helper function to check file content +function checkFileContent(req: MockRequest, expectedFile: Buffer) { + req.expect.rawBodyEquals(expectedFile); +} + +// Body tests - Request with specific content type +Scenarios.Type_File_Body_uploadFileSpecificContentType = passOnSuccess({ + uri: "/type/file/body/request/specific-content-type", + method: "post", + request: { + body: { + contentType: "image/png", + rawContent: pngFile, + }, + }, + response: { + status: 204, + }, + handler(req: MockRequest) { + req.expect.containsHeader("content-type", "image/png"); + checkFileContent(req, pngFile); + return { status: 204 }; + }, + kind: "MockApiDefinition", +}); + +// Body tests - Request with JSON content type +Scenarios.Type_File_Body_uploadFileJsonContentType = passOnSuccess({ + uri: "/type/file/body/request/json-content-type", + method: "post", + request: { + body: { + contentType: "application/json", + rawContent: JSON.stringify({ message: "test file content" }), + }, + }, + response: { + status: 204, + }, + handler(req: MockRequest) { + req.expect.containsHeader("content-type", "application/json"); + req.expect.rawBodyEquals(JSON.stringify({ message: "test file content" })); + return { status: 204 }; + }, + kind: "MockApiDefinition", +}); + +// Body tests - Response with JSON content type +Scenarios.Type_File_Body_downloadFileJsonContentType = passOnSuccess({ + uri: "/type/file/body/response/json-content-type", + method: "get", + request: {}, + response: { + status: 200, + body: { + contentType: "application/json", + rawContent: JSON.stringify({ message: "test file content" }), + }, + }, + handler(req: MockRequest) { + return { + status: 200, + body: { + contentType: "application/json", + rawContent: JSON.stringify({ message: "test file content" }), + }, + }; + }, + kind: "MockApiDefinition", +}); + +// Body tests - Response with specific content type +Scenarios.Type_File_Body_downloadFileSpecificContentType = passOnSuccess({ + uri: "/type/file/body/response/specific-content-type", + method: "get", + request: {}, + response: { + status: 200, + body: { + contentType: "image/png", + rawContent: pngFile, + }, + }, + handler(req: MockRequest) { + return { + status: 200, + body: { + contentType: "image/png", + rawContent: pngFile, + }, + }; + }, + kind: "MockApiDefinition", +}); + +// Body tests - Request with multiple content types +Scenarios.Type_File_Body_uploadFileMultipleContentTypes = passOnSuccess({ + uri: "/type/file/body/request/multiple-content-types", + method: "post", + request: { + body: { + contentType: "image/png", + rawContent: pngFile, + }, + }, + response: { + status: 204, + }, + handler(req: MockRequest) { + // Client should send image/png (one of the allowed types) + const contentType = req.headers["content-type"]; + if (contentType !== "image/png" && contentType !== "image/jpeg") { + throw new ValidationError( + "Expected content-type to be image/png or image/jpeg", + "image/png or image/jpeg", + contentType, + ); + } + checkFileContent(req, pngFile); + return { status: 204 }; + }, + kind: "MockApiDefinition", +}); + +// Body tests - Response with multiple content types +Scenarios.Type_File_Body_downloadFileMultipleContentTypes = passOnSuccess({ + uri: "/type/file/body/response/multiple-content-types", + method: "get", + request: {}, + response: { + status: 200, + body: { + contentType: "image/png", + rawContent: pngFile, + }, + }, + handler(req: MockRequest) { + // Server returns image/png (one of the allowed types) + return { + status: 200, + body: { + contentType: "image/png", + rawContent: pngFile, + }, + }; + }, + kind: "MockApiDefinition", +}); + +// Body tests - Request with default content type +Scenarios.Type_File_Body_uploadFileDefaultContentType = passOnSuccess({ + uri: "/type/file/body/request/default-content-type", + method: "post", + request: { + body: { + contentType: "image/png", + rawContent: pngFile, + }, + }, + response: { + status: 204, + }, + handler(req: MockRequest) { + // File type accepts any content type, but for testing we expect image/png + req.expect.containsHeader("content-type", "image/png"); + checkFileContent(req, pngFile); + return { status: 204 }; + }, + kind: "MockApiDefinition", +}); + +// Body tests - Response with default content type +Scenarios.Type_File_Body_downloadFileDefaultContentType = passOnSuccess({ + uri: "/type/file/body/response/default-content-type", + method: "get", + request: {}, + response: { + status: 200, + body: { + contentType: "image/png", + rawContent: pngFile, + }, + }, + handler(req: MockRequest) { + // File type accepts any content type, but for testing we return image/png + return { + status: 200, + body: { + contentType: "image/png", + rawContent: pngFile, + }, + }; + }, + kind: "MockApiDefinition", +}); diff --git a/packages/http-specs/tsconfig.build.json b/packages/http-specs/tsconfig.build.json index 39fcac33789..b4079ce75de 100644 --- a/packages/http-specs/tsconfig.build.json +++ b/packages/http-specs/tsconfig.build.json @@ -1,8 +1,4 @@ { "extends": "./tsconfig.json", - "references": [ - { "path": "../spec-api/tsconfig.build.json" }, - { "path": "../spector/tsconfig.build.json" } - ], "exclude": ["**/*.test.*", "test/**/*"] } diff --git a/packages/http/CHANGELOG.md b/packages/http/CHANGELOG.md index 3b4a8515dd3..a69c735b8a4 100644 --- a/packages/http/CHANGELOG.md +++ b/packages/http/CHANGELOG.md @@ -1,5 +1,32 @@ # Change Log - @typespec/http +## 1.11.0 + +No changes, version bump only. + +## 1.10.0 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + +### Bug Fixes + +- [#9935](https://github.com/microsoft/typespec/pull/9935) Do not join routes starting with `?` or `:` with `/`(e.g. `@route("?pet=cat)` would result in `/?pet=cat`) +- [#9887](https://github.com/microsoft/typespec/pull/9887) Remove `patch-implicit-optional` warning. + + +## 1.9.1 + +### Bug Fixes + +- [API] Fix `Content-Type` header will not be dropped in the response headers of `HttpOperationResponseContent` for `HEAD` requests. + + +## 1.9.0 + +Version Bump only. + ## 1.8.0 ### Bump dependencies diff --git a/packages/http/generated-defs/TypeSpec.Http.Private.ts b/packages/http/generated-defs/TypeSpec.Http.Private.ts index 489b6a81a32..370b83beae8 100644 --- a/packages/http/generated-defs/TypeSpec.Http.Private.ts +++ b/packages/http/generated-defs/TypeSpec.Http.Private.ts @@ -1,6 +1,7 @@ import type { DecoratorContext, DecoratorValidatorCallbacks, + FunctionContext, Model, ModelProperty, Type, @@ -31,6 +32,17 @@ export type HttpPartDecorator = ( options: HttpPartOptions, ) => DecoratorValidatorCallbacks | void; +/** + * Specify if inapplicable metadata should be included in the payload for the given entity. + * + * @param value If true, inapplicable metadata will be included in the payload. + */ +export type IncludeInapplicableMetadataInPayloadDecorator = ( + context: DecoratorContext, + target: Type, + value: boolean, +) => DecoratorValidatorCallbacks | void; + /** * Performs the canonical merge-patch transformation on the given model and injects its * transformed properties into the target. @@ -43,17 +55,6 @@ export type ApplyMergePatchDecorator = ( options: ApplyMergePatchOptions, ) => DecoratorValidatorCallbacks | void; -/** - * Specify if inapplicable metadata should be included in the payload for the given entity. - * - * @param value If true, inapplicable metadata will be included in the payload. - */ -export type IncludeInapplicableMetadataInPayloadDecorator = ( - context: DecoratorContext, - target: Type, - value: boolean, -) => DecoratorValidatorCallbacks | void; - /** * Marks a model that was generated by applying the MergePatch * transform and links to its source model @@ -78,8 +79,19 @@ export type TypeSpecHttpPrivateDecorators = { plainData: PlainDataDecorator; httpFile: HttpFileDecorator; httpPart: HttpPartDecorator; - applyMergePatch: ApplyMergePatchDecorator; includeInapplicableMetadataInPayload: IncludeInapplicableMetadataInPayloadDecorator; + applyMergePatch: ApplyMergePatchDecorator; mergePatchModel: MergePatchModelDecorator; mergePatchProperty: MergePatchPropertyDecorator; }; + +export type ApplyMergePatchTransformFunctionImplementation = ( + context: FunctionContext, + input: Model, + nameTemplate: string, + options: ApplyMergePatchOptions, +) => Model; + +export type TypeSpecHttpPrivateFunctions = { + applyMergePatchTransform: ApplyMergePatchTransformFunctionImplementation; +}; diff --git a/packages/http/generated-defs/TypeSpec.Http.ts-test.ts b/packages/http/generated-defs/TypeSpec.Http.ts-test.ts index b7f2d8fa8a1..66ef18c6a14 100644 --- a/packages/http/generated-defs/TypeSpec.Http.ts-test.ts +++ b/packages/http/generated-defs/TypeSpec.Http.ts-test.ts @@ -7,4 +7,4 @@ import type { TypeSpecHttpDecorators } from "./TypeSpec.Http.js"; /** * An error here would mean that the exported decorator is not using the same signature. Make sure to have export const $decName: DecNameDecorator = (...) => ... */ -const _: TypeSpecHttpDecorators = $decorators["TypeSpec.Http"]; +const _decs: TypeSpecHttpDecorators = $decorators["TypeSpec.Http"]; diff --git a/packages/http/lib/main.tsp b/packages/http/lib/main.tsp index e67516ecc0d..4ae9b68e1cd 100644 --- a/packages/http/lib/main.tsp +++ b/packages/http/lib/main.tsp @@ -307,14 +307,14 @@ scalar LinkHeader | Link[]> extends string; * @patch op update(...MergePatchUpdate): Widget; * ``` */ -@doc("") -@friendlyName(NameTemplate, T) -@mediaTypeHint("application/merge-patch+json") -@applyMergePatch(T, NameTemplate, #{ visibilityMode: Private.MergePatchVisibilityMode.Update }) -model MergePatchUpdate< +alias MergePatchUpdate< T extends Reflection.Model, NameTemplate extends valueof string = "{name}MergePatchUpdate" -> {} +> = applyMergePatchTransform( + T, + NameTemplate, + #{ visibilityMode: Private.MergePatchVisibilityMode.Update } +); /** * Create a MergePatch Request body for creating or updating the given resource Model. @@ -351,15 +351,11 @@ model MergePatchUpdate< * @patch op update(...MergePatchCreateOrUpdate): Widget; * ``` */ -@doc("") -@friendlyName(NameTemplate, T) -@mediaTypeHint("application/merge-patch+json") -@applyMergePatch( +alias MergePatchCreateOrUpdate< + T extends Reflection.Model, + NameTemplate extends valueof string = "{name}MergePatchCreateOrUpdate" +> = applyMergePatchTransform( T, NameTemplate, #{ visibilityMode: Private.MergePatchVisibilityMode.CreateOrUpdate } -) -model MergePatchCreateOrUpdate< - T extends Reflection.Model, - NameTemplate extends valueof string = "{name}MergePatchCreateOrUpdate" -> {} +); diff --git a/packages/http/lib/private.decorators.tsp b/packages/http/lib/private.decorators.tsp index afffcde5550..5389fa50bd1 100644 --- a/packages/http/lib/private.decorators.tsp +++ b/packages/http/lib/private.decorators.tsp @@ -46,6 +46,7 @@ model ApplyMergePatchOptions { * Performs the canonical merge-patch transformation on the given model and injects its * transformed properties into the target. */ +#deprecated "applyMergePatch is deprecated and will be removed in a future release. This decorator is not intended for public use." extern dec applyMergePatch( target: Reflection.Model, source: Reflection.Model, @@ -53,6 +54,13 @@ extern dec applyMergePatch( options: valueof ApplyMergePatchOptions ); +#suppress "experimental-feature" +internal extern fn applyMergePatchTransform( + input: Reflection.Model, + nameTemplate: valueof string, + options: valueof ApplyMergePatchOptions +): Reflection.Model; + /** * Marks a model that was generated by applying the MergePatch * transform and links to its source model diff --git a/packages/http/package.json b/packages/http/package.json index 00fb282ca6b..7e7849b9486 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/http", - "version": "1.8.0", + "version": "1.11.0", "author": "Microsoft Corporation", "description": "TypeSpec HTTP protocol binding", "homepage": "https://github.com/microsoft/typespec", @@ -51,13 +51,13 @@ "#test/*": "./test/*" }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "pnpm gen-extern-signature && tsc -p . && pnpm lint-typespec-library", + "build": "pnpm gen-extern-signature && tsc -p tsconfig.build.json && pnpm lint-typespec-library", "api-extractor": "api-extractor run --local --verbose", - "watch": "tsc -p . --watch", + "watch": "tsc -p tsconfig.build.json --watch", "gen-extern-signature": "tspd --enable-experimental gen-extern-signature .", "lint-typespec-library": "tsp compile . --warn-as-error --import @typespec/library-linter --no-emit", "test": "vitest run", @@ -83,16 +83,16 @@ } }, "devDependencies": { - "@types/node": "~25.0.2", + "@types/node": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/library-linter": "workspace:^", "@typespec/streams": "workspace:^", "@typespec/tspd": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/http/src/experimental/typekit/kits/http-operation.ts b/packages/http/src/experimental/typekit/kits/http-operation.ts index cee7e5c0180..4d9b837e68f 100644 --- a/packages/http/src/experimental/typekit/kits/http-operation.ts +++ b/packages/http/src/experimental/typekit/kits/http-operation.ts @@ -85,7 +85,7 @@ defineKit({ } const voidType = { kind: "Intrinsic", name: "void" } as VoidType; - let httpReturnType: Type = voidType; + let httpReturnType: Type; if (!responses.length) { return voidType; diff --git a/packages/http/src/http-property.ts b/packages/http/src/http-property.ts index ca3be460b9c..3e2435c5ebb 100644 --- a/packages/http/src/http-property.ts +++ b/packages/http/src/http-property.ts @@ -99,6 +99,10 @@ export interface GetHttpPropertyOptions { implicitParameter?: ( param: ModelProperty, ) => PathParameterOptions | QueryParameterOptions | undefined; + /** + * When true, treat `Content-Type` headers as regular headers. + */ + treatContentTypeAsHeader?: boolean; } /** * Find the type of a property in a model @@ -196,11 +200,13 @@ function getHttpProperty( } if (annotations.header) { - if (annotations.header.name.toLowerCase() === "content-type") { + if ( + annotations.header.name.toLowerCase() === "content-type" && + !options.treatContentTypeAsHeader + ) { return createResult({ kind: "contentType" }); - } else { - return createResult({ kind: "header", options: annotations.header }); } + return createResult({ kind: "header", options: annotations.header }); } else if (annotations.cookie) { return createResult({ kind: "cookie", options: annotations.cookie }); } else if (annotations.query) { diff --git a/packages/http/src/index.ts b/packages/http/src/index.ts index c7b7b3883b9..478c4178872 100644 --- a/packages/http/src/index.ts +++ b/packages/http/src/index.ts @@ -147,4 +147,4 @@ export type { } from "./types.js"; /** @internal */ -export { $decorators } from "./tsp-index.js"; +export { $decorators, $functions } from "./tsp-index.js"; diff --git a/packages/http/src/lib.ts b/packages/http/src/lib.ts index 7cb09b523bc..b67083b9e39 100644 --- a/packages/http/src/lib.ts +++ b/packages/http/src/lib.ts @@ -195,12 +195,6 @@ export const $lib = createTypeSpecLibrary({ default: paramMessage`The 'contents' property of the file model must be a scalar type that extends 'string' or 'bytes'. Found '${"type"}'.`, }, }, - "patch-implicit-optional": { - severity: "warning", - messages: { - default: `Patch operation stopped applying an implicit optional transform to the body in 1.0.0. Use @patch(#{implicitOptionality: true}) to restore the old behavior.`, - }, - }, "merge-patch-contains-null": { severity: "error", messages: { diff --git a/packages/http/src/merge-patch.ts b/packages/http/src/merge-patch.ts index e1b31f72c4e..ff010b63a0e 100644 --- a/packages/http/src/merge-patch.ts +++ b/packages/http/src/merge-patch.ts @@ -6,6 +6,7 @@ import { DecoratorApplication, DecoratorContext, EnumValue, + FunctionContext, getDiscriminatedUnion, getDiscriminator, getLifecycleVisibilityEnum, @@ -15,6 +16,7 @@ import { navigateType, Program, resetVisibilityModifiersForClass, + setMediaTypeHint, Tuple, Type, Union, @@ -97,23 +99,21 @@ interface MergePatchMutatorCache { type MergePatchVisibilityMode = "Update" | "CreateOrUpdate"; -export const $applyMergePatch: ApplyMergePatchDecorator = ( - ctx: DecoratorContext, - target: Model, - source: Model, +export function applyMergePatchTransform( + ctx: FunctionContext | DecoratorContext, + input: Model, nameTemplate: string, options: ApplyMergePatchOptions, -) => { - setMergePatchSource(ctx.program, target, source); +): Model { let reported = false; navigateType( - source, + input, { intrinsic: (i) => { if (!reported && i.name === "null") { reportDiagnostic(ctx.program, { code: "merge-patch-contains-null", - target, + target: input, }); reported = true; } @@ -133,10 +133,29 @@ export const $applyMergePatch: ApplyMergePatchDecorator = ( visibilityMode, )); - const mutated = cachedMutateSubgraph(ctx.program, mutator, source); + const { type } = cachedMutateSubgraph(ctx.program, mutator, input); + + compilerAssert( + type.kind === "Model", + "Expected the root of the MergePatch transform to be a Model", + ); + + return type; +} + +export const $applyMergePatch: ApplyMergePatchDecorator = ( + ctx: DecoratorContext, + target: Model, + source: Model, + nameTemplate: string, + options: ApplyMergePatchOptions, +) => { + const transformed = applyMergePatchTransform(ctx, source, nameTemplate, options); + + setMergePatchSource(ctx.program, target, source); + setMediaTypeHint(ctx.program, target, "application/merge-patch+json"); - target.properties = (mutated.type as Model).properties; - ctx.program.stateMap(HttpStateKeys.mergePatchModel).set(target, source); + target.properties = transformed.properties; }; function visibilityModeToFilters( @@ -200,7 +219,7 @@ function setPropertyOverride( * @returns */ function createMergePatchMutator( - ctx: DecoratorContext, + ctx: DecoratorContext | FunctionContext, nameTemplate: string, visibilityMode: MergePatchVisibilityMode, ): Mutator { @@ -289,7 +308,10 @@ function createMergePatchMutator( clone.defaultValue = undefined; } - ctx.program.stateMap(HttpStateKeys.mergePatchProperty).set(clone, prop); + clone.decorators.push({ + decorator: $mergePatchProperty, + args: [{ value: prop, jsValue: prop }], + }); }, }, }; @@ -311,6 +333,20 @@ function createMergePatchMutator( } } + if (union.name) { + // We have to set the media type in a decorator, not just by calling `setMediaTypeHint`, in order for it to be + // preserved on further mutation. + clone.decorators = [ + ...clone.decorators, + { + decorator: function (ctx: DecoratorContext, target: Union) { + setMediaTypeHint(ctx.program, target, "application/merge-patch+json"); + }, + args: [], + }, + ]; + } + rename(ctx.program, clone, nameTemplate); }, }, @@ -373,6 +409,15 @@ function createMergePatchMutator( } clone.decorators = clone.decorators.filter((d) => d.decorator !== $applyMergePatch); + // We have to set the media type in a decorator, not just by calling `setMediaTypeHint`, in order for it to be + // preserved on further mutation. + clone.decorators.push({ + decorator: function (ctx: DecoratorContext, target: Model) { + setMergePatchSource(ctx.program, target, model); + setMediaTypeHint(ctx.program, target, "application/merge-patch+json"); + }, + args: [], + }); ctx.program.stateMap(HttpStateKeys.mergePatchModel).set(clone, model); rename(ctx.program, clone, nameTemplate); }, diff --git a/packages/http/src/parameters.ts b/packages/http/src/parameters.ts index 9a60336a5c6..f4539173f79 100644 --- a/packages/http/src/parameters.ts +++ b/packages/http/src/parameters.ts @@ -5,14 +5,7 @@ import { Operation, Program, } from "@typespec/compiler"; -import { - getOperationVerb, - getPatchOptions, - getPathOptions, - getQueryOptions, -} from "./decorators.js"; -import { isMergePatchBody } from "./experimental/merge-patch/internal.js"; -import { createDiagnostic } from "./lib.js"; +import { getOperationVerb, getPathOptions, getQueryOptions } from "./decorators.js"; import { resolveRequestVisibility } from "./metadata.js"; import { HttpPayloadDisposition, resolveHttpPayload } from "./payload.js"; import { @@ -123,22 +116,6 @@ function getOperationParametersForVerb( }, }), ); - const implicitOptionality = getPatchOptions(program, operation)?.implicitOptionality; - // TODO: remove in 6month after 1.0.0. (November 2025) - if ( - verb === "patch" && - resolvedBody && - implicitOptionality === undefined && - !isMergePatchBody(program, resolvedBody?.type) && - !resolvedBody.contentTypes.includes("application/merge-patch+json") // Above statement doesn't detect Spread merge patch - ) { - diagnostics.add( - createDiagnostic({ - code: "patch-implicit-optional", - target: operation, - }), - ); - } for (const item of metadata) { switch (item.kind) { diff --git a/packages/http/src/responses.ts b/packages/http/src/responses.ts index c6b51553254..281030fd339 100644 --- a/packages/http/src/responses.ts +++ b/packages/http/src/responses.ts @@ -15,7 +15,11 @@ import { Type, } from "@typespec/compiler"; import { $ } from "@typespec/compiler/typekit"; -import { getStatusCodeDescription, getStatusCodesWithDiagnostics } from "./decorators.js"; +import { + getOperationVerb, + getStatusCodeDescription, + getStatusCodesWithDiagnostics, +} from "./decorators.js"; import { HttpProperty } from "./http-property.js"; import { HttpStateKeys, reportDiagnostic } from "./lib.js"; import { Visibility } from "./metadata.js"; @@ -118,8 +122,11 @@ function processResponseType( } // Get body + const verb = getOperationVerb(program, operation); let { body: resolvedBody, metadata } = diagnostics.pipe( - resolveHttpPayload(program, responseType, Visibility.Read, HttpPayloadDisposition.Response), + resolveHttpPayload(program, responseType, Visibility.Read, HttpPayloadDisposition.Response, { + treatContentTypeAsHeader: verb === "head", + }), ); // Get explicity defined status codes const statusCodes: HttpStatusCodes = diagnostics.pipe( diff --git a/packages/http/src/route.ts b/packages/http/src/route.ts index fc97f1615aa..6a49a332498 100644 --- a/packages/http/src/route.ts +++ b/packages/http/src/route.ts @@ -26,17 +26,18 @@ import { import { parseUriTemplate, UriTemplate } from "./uri-template.js"; // The set of allowed segment separator characters -const AllowedSegmentSeparators = ["/", ":"]; +const AllowedSegmentSeparators = ["/", ":", "?"]; function needsSlashPrefix(fragment: string) { return !( + fragment.length === 0 || AllowedSegmentSeparators.indexOf(fragment[0]) !== -1 || (fragment[0] === "{" && fragment[1] === "/") ); } function normalizeFragment(fragment: string, trimLast = false) { - if (fragment.length > 0 && needsSlashPrefix(fragment)) { + if (needsSlashPrefix(fragment)) { // Insert the default separator fragment = `/${fragment}`; } @@ -59,8 +60,10 @@ function buildPath(pathFragments: string[]) { // Join all fragments with leading and trailing slashes trimmed const path = pathFragments.length === 0 ? "/" : joinPathSegments(pathFragments); - // The final path must start with a '/' or {/ (path expansion) - return path[0] === "/" || (path[0] === "{" && path[1] === "/") ? path : `/${path}`; + // The final path must start with a '/', {/ (path expansion), or an allowed segment separator + return AllowedSegmentSeparators.includes(path[0]) || (path[0] === "{" && path[1] === "/") + ? path + : `/${path}`; } export function resolvePathAndParameters( diff --git a/packages/http/src/tsp-index.ts b/packages/http/src/tsp-index.ts index e4a87965dff..227f96d878d 100644 --- a/packages/http/src/tsp-index.ts +++ b/packages/http/src/tsp-index.ts @@ -1,5 +1,8 @@ import { TypeSpecHttpDecorators } from "../generated-defs/TypeSpec.Http.js"; -import { TypeSpecHttpPrivateDecorators } from "../generated-defs/TypeSpec.Http.Private.js"; +import { + TypeSpecHttpPrivateDecorators, + TypeSpecHttpPrivateFunctions, +} from "../generated-defs/TypeSpec.Http.Private.js"; import { $body, $bodyIgnore, @@ -21,7 +24,12 @@ import { } from "./decorators.js"; import { $route } from "./decorators/route.js"; import { $sharedRoute } from "./decorators/shared-route.js"; -import { $applyMergePatch, $mergePatchModel, $mergePatchProperty } from "./merge-patch.js"; +import { + $applyMergePatch, + $mergePatchModel, + $mergePatchProperty, + applyMergePatchTransform, +} from "./merge-patch.js"; import { $httpFile, $httpPart, @@ -65,3 +73,9 @@ export const $decorators = { mergePatchProperty: $mergePatchProperty, } satisfies TypeSpecHttpPrivateDecorators, }; + +export const $functions = { + "TypeSpec.Http.Private": { + applyMergePatchTransform, + } satisfies TypeSpecHttpPrivateFunctions, +}; diff --git a/packages/http/test/merge-patch.test.ts b/packages/http/test/merge-patch.test.ts index 948ca8729c0..a3d4bba56cf 100644 --- a/packages/http/test/merge-patch.test.ts +++ b/packages/http/test/merge-patch.test.ts @@ -1,4 +1,16 @@ -import { Diagnostic, Model, ModelProperty, Program, Type, TypeKind } from "@typespec/compiler"; +import { + Diagnostic, + getMediaTypeHint, + Model, + ModelProperty, + Program, + Type, + TypeKind, +} from "@typespec/compiler"; +import { + type unsafe_MutatorWithNamespace as MutatorWithNamespace, + unsafe_mutateSubgraphWithNamespace, +} from "@typespec/compiler/experimental"; import { expectDiagnosticEmpty, expectDiagnostics, @@ -9,10 +21,12 @@ import { deepStrictEqual, ok } from "assert"; import { beforeEach, describe, expect, it } from "vitest"; import { getMergePatchProperties, + getMergePatchPropertySource, getMergePatchSource, isMergePatch, } from "../src/experimental/merge-patch/helpers.js"; -import { getAllHttpServices } from "../src/operations.js"; +import { isMergePatchBody } from "../src/experimental/merge-patch/internal.js"; +import { getAllHttpServices, getHttpService } from "../src/operations.js"; import { HttpOperation, RouteResolutionOptions } from "../src/types.js"; import { diagnoseOperations, getOperationsWithServiceNamespace, Tester } from "./test-host.js"; @@ -21,6 +35,17 @@ beforeEach(async () => { runner = await Tester.createInstance(); }); +const cloneNamespaceMutator: MutatorWithNamespace = { + name: "CloneNamespaceForMergePatchRegression", + Namespace: { mutate: () => {} }, + Interface: { mutate: () => {} }, + Operation: { mutate: () => {} }, + Model: { mutate: () => {} }, + ModelProperty: { mutate: () => {} }, + Union: { mutate: () => {} }, + UnionVariant: { mutate: () => {} }, +}; + function checkNullableUnion(program: Program, union: Type): boolean { return ( $(program).union.is(union) && @@ -77,6 +102,39 @@ async function compileAndDiagnoseWithRunner( return [services[0].operations, runner.program.diagnostics]; } +async function compileAndCloneServiceWithRunner( + runner: TesterInstance, + code: string, + options?: RouteResolutionOptions, +): Promise<[HttpOperation[], readonly Diagnostic[]]> { + await runner.compileAndDiagnose( + `@service(#{title: "Test Service"}) namespace TestService; + ${code}`, + ); + + const [services, httpDiagnostics] = getAllHttpServices(runner.program, options); + const clonedSubgraph = unsafe_mutateSubgraphWithNamespace( + runner.program, + [cloneNamespaceMutator], + services[0].namespace, + ); + + if (clonedSubgraph.type.kind !== "Namespace") { + throw new Error("Expected namespace clone when mutating service"); + } + + const [clonedService, clonedDiagnostics] = getHttpService( + runner.program, + clonedSubgraph.type, + options, + ); + + return [ + clonedService.operations, + [...runner.program.diagnostics, ...httpDiagnostics, ...clonedDiagnostics], + ]; +} + describe("metadata tests", () => { async function testMetadata( prop: string, @@ -225,7 +283,6 @@ describe("http operation support", () => { name: string; description?: string; } - #suppress "@typespec/http/patch-implicit-optional" "For test only ignore correct merge patch" @patch op update(@header("Content-type") contentType: "application/json", ...MergePatchUpdate): void;`); expectDiagnostics(diag, { code: "@typespec/http/merge-patch-content-type", @@ -246,6 +303,65 @@ describe("http operation support", () => { }); }); describe("mutator validation", () => { + it("sets media type hint on transformed models", async () => { + const [program, diag] = await compileAndDiagnoseWithRunner( + runner, + ` + model Child { + id: string; + } + + model Foo { + id: string; + child?: Child; + } + + @patch op update(@body body: MergePatchUpdate): void;`, + ); + + expectDiagnosticEmpty(diag); + const bodyType = program[0].parameters?.body?.type; + ok(bodyType); + deepStrictEqual(bodyType.kind, "Model"); + expect(getMediaTypeHint(runner.program, bodyType)).toBe("application/merge-patch+json"); + + const childProp = bodyType.properties.get("child"); + ok(childProp); + const childType = getNonNullableType(childProp.type); + ok(childType); + deepStrictEqual(childType.kind, "Model"); + expect(getMediaTypeHint(runner.program, childType)).toBe("application/merge-patch+json"); + }); + + it("preserves merge-patch metadata for template spread bodies after namespace mutation", async () => { + const [operations, diag] = await compileAndCloneServiceWithRunner( + runner, + ` + model Foo { + id: string; + name: string; + description?: string; + } + + op Wrapper(...Parameters): void; + + @patch op update is Wrapper>; + `, + ); + + expectDiagnosticEmpty(diag); + + const body = operations[0].parameters?.body; + ok(body); + expect(body.contentTypes).toEqual(["application/merge-patch+json"]); + expect(isMergePatchBody(runner.program, body.type)).toBe(true); + + deepStrictEqual(body.type.kind, "Model"); + const description = body.type.properties.get("description"); + ok(description); + expect(getMergePatchPropertySource(runner.program, description)).toBeDefined(); + }); + it("handles optional and required properties", async () => { const [program, diag] = await compileAndDiagnoseWithRunner( runner, diff --git a/packages/http/test/responses.test.ts b/packages/http/test/responses.test.ts index 967f36bc519..98a40b72185 100644 --- a/packages/http/test/responses.test.ts +++ b/packages/http/test/responses.test.ts @@ -140,6 +140,22 @@ it("supports any casing for string literal 'Content-Type' header properties.", a deepStrictEqual(routes[2].responses[0].responses[0].body?.contentTypes, ["application/json"]); }); +it("treats content-type as a header for HEAD responses", async () => { + const [routes, diagnostics] = await getOperationsWithServiceNamespace( + ` + @head + op head(): { @header "content-type": "text/plain" }; + `, + ); + + expectDiagnosticEmpty(diagnostics); + strictEqual(routes.length, 1); + const response = routes[0].responses[0].responses[0]; + strictEqual(response.body, undefined); + ok(response.headers); + deepStrictEqual(Object.keys(response.headers), ["content-type"]); +}); + // Regression test for https://github.com/microsoft/typespec/issues/328 it("empty response model becomes body if it has children", async () => { const [routes, diagnostics] = await getOperationsWithServiceNamespace( diff --git a/packages/http/test/routes.test.ts b/packages/http/test/routes.test.ts index c352660170a..bdb1e60ac5f 100644 --- a/packages/http/test/routes.test.ts +++ b/packages/http/test/routes.test.ts @@ -2,7 +2,12 @@ import { expectDiagnosticEmpty, expectDiagnostics, t } from "@typespec/compiler/ import { deepStrictEqual, ok, strictEqual } from "assert"; import { describe, expect, it } from "vitest"; import { PathOptions } from "../generated-defs/TypeSpec.Http.js"; -import { getRoutePath, HttpOperation, HttpOperationParameter } from "../src/index.js"; +import { + getRoutePath, + HttpOperation, + HttpOperationParameter, + joinPathSegments, +} from "../src/index.js"; import { compileOperations, diagnoseOperations, @@ -316,16 +321,45 @@ describe("http: routes", () => { deepStrictEqual(routes, [{ verb: "get", path: "/", params: [] }]); }); - it("always produces a route starting with /", async () => { - const routes = await getRoutesFor( - ` - @get - @route(":action") - op colonRoute(): {}; + describe.each(["?", ":"])("route segments starting with %s", (sep) => { + it("does not add /", async () => { + const routes = await getRoutesFor( + ` + @put + @route("${sep}pet=cat") + op bar(): void; `, - ); + ); - deepStrictEqual(routes, [{ verb: "get", path: "/:action", params: [] }]); + deepStrictEqual(routes, [{ verb: "put", path: `${sep}pet=cat`, params: [] }]); + }); + + it("does not add / separator when joining with parent route", async () => { + const routes = await getRoutesFor( + ` + @route("abc") + interface Container { + @route("${sep}restype=container") foo(): void; + } + `, + ); + + deepStrictEqual(routes, [{ verb: "get", path: `/abc${sep}restype=container`, params: [] }]); + }); + }); + + describe("joinPathSegments", () => { + it("does not add / for empty segments", () => { + deepStrictEqual(joinPathSegments(["foo", ""]), "/foo"); + }); + + it("does not add / for empty segments in the middle", () => { + deepStrictEqual(joinPathSegments(["foo", "", "bar"]), "/foo/bar"); + }); + + it("does not add / for empty segment at the start", () => { + deepStrictEqual(joinPathSegments(["", "bar"]), "/bar"); + }); }); it("defaults to POST when operation has a body but didn't specify the verb", async () => { diff --git a/packages/http/test/streams/get-stream-metadata.test.ts b/packages/http/test/streams/get-stream-metadata.test.ts index 82c62dc8698..5f8f53a76bd 100644 --- a/packages/http/test/streams/get-stream-metadata.test.ts +++ b/packages/http/test/streams/get-stream-metadata.test.ts @@ -1,42 +1,19 @@ -import { Model, Program } from "@typespec/compiler"; -import { - createTestHost, - createTestWrapper, - expectDiagnosticEmpty, - type BasicTestRunner, -} from "@typespec/compiler/testing"; -import { StreamsTestLibrary } from "@typespec/streams/testing"; -import { assert, beforeEach, describe, expect, it } from "vitest"; +import { expectDiagnosticEmpty, t } from "@typespec/compiler/testing"; +import { describe, expect, it } from "vitest"; import { getStreamMetadata } from "../../src/experimental/index.js"; import { getAllHttpServices } from "../../src/operations.js"; -import { HttpTestLibrary } from "../../src/testing/index.js"; -import { HttpService } from "../../src/types.js"; - -let runner: BasicTestRunner; -let getHttpServiceWithProgram: ( - code: string, -) => Promise<{ service: HttpService; Thing: Model; program: Program }>; - -beforeEach(async () => { - const host = await createTestHost({ - libraries: [StreamsTestLibrary, HttpTestLibrary], - }); - runner = createTestWrapper(host, { - autoImports: [`@typespec/http/streams`, "@typespec/streams"], - autoUsings: ["TypeSpec.Http", "TypeSpec.Http.Streams", "TypeSpec.Streams"], - }); - getHttpServiceWithProgram = async (code) => { - const { Thing } = await runner.compile(` - @test model Thing { id: string } - ${code} - `); - assert(Thing.kind === "Model"); - const [services, diagnostics] = getAllHttpServices(runner.program); - - expectDiagnosticEmpty(diagnostics); - return { service: services[0], Thing, program: runner.program }; - }; -}); +import { StreamsTester } from "./tester.js"; + +async function getHttpServiceWithProgram(code: string) { + const { Thing, program } = await StreamsTester.compile(t.code` + model ${t.model("Thing")} { id: string } + ${code} + `); + const [services, diagnostics] = getAllHttpServices(program); + + expectDiagnosticEmpty(diagnostics); + return { service: services[0], Thing, program }; +} describe("Operation Responses", () => { it("can get stream metadata from HttpStream", async () => { diff --git a/packages/http/test/streams/streams.test.ts b/packages/http/test/streams/streams.test.ts index b67121b1633..f1a77dff834 100644 --- a/packages/http/test/streams/streams.test.ts +++ b/packages/http/test/streams/streams.test.ts @@ -1,38 +1,18 @@ -import { - createTestHost, - createTestWrapper, - type BasicTestRunner, -} from "@typespec/compiler/testing"; +import { t } from "@typespec/compiler/testing"; import { getStreamOf } from "@typespec/streams"; -import { StreamsTestLibrary } from "@typespec/streams/testing"; -import { assert, beforeEach, describe, expect, it } from "vitest"; +import { describe, expect, it } from "vitest"; import { getContentTypes } from "../../src/content-types.js"; -import { HttpTestLibrary } from "../../src/testing/index.js"; - -let runner: BasicTestRunner; - -beforeEach(async () => { - const host = await createTestHost({ - libraries: [StreamsTestLibrary, HttpTestLibrary], - }); - runner = createTestWrapper(host, { - autoImports: [`@typespec/http/streams`], - autoUsings: ["TypeSpec.Http.Streams"], - }); -}); +import { StreamsTester } from "./tester.js"; describe("HttpStream", () => { it("sets streamOf, contentType, and body", async () => { - const { Foo, Message } = await runner.compile(` - @test - model Message { id: string, text: string } + const { Foo, Message, program } = await StreamsTester.compile(t.code` + model ${t.model("Message")} { id: string, text: string } - @test model Foo is HttpStream; + model ${t.model("Foo")} is HttpStream; `); - assert(Foo.kind === "Model"); - assert(Message.kind === "Model"); - expect(getStreamOf(runner.program, Foo)).toBe(Message); + expect(getStreamOf(program, Foo)).toBe(Message); expect(getContentTypes(Foo.properties.get("contentType")!)[0]).toEqual(["application/jsonl"]); expect(Foo.properties.get("body")!.type).toMatchObject({ kind: "Scalar", @@ -43,16 +23,13 @@ describe("HttpStream", () => { describe("JsonlStream", () => { it("sets streamOf, contentType ('application/jsonl'), and body", async () => { - const { Foo, Message } = await runner.compile(` - @test - model Message { id: string, text: string } + const { Foo, Message, program } = await StreamsTester.compile(t.code` + model ${t.model("Message")} { id: string, text: string } - @test model Foo is JsonlStream; + model ${t.model("Foo")} is JsonlStream; `); - assert(Foo.kind === "Model"); - assert(Message.kind === "Model"); - expect(getStreamOf(runner.program, Foo)).toBe(Message); + expect(getStreamOf(program, Foo)).toBe(Message); expect(getContentTypes(Foo.properties.get("contentType")!)[0]).toEqual(["application/jsonl"]); expect(Foo.properties.get("body")!.type).toMatchObject({ kind: "Scalar", diff --git a/packages/http/test/streams/tester.ts b/packages/http/test/streams/tester.ts new file mode 100644 index 00000000000..b7539760b79 --- /dev/null +++ b/packages/http/test/streams/tester.ts @@ -0,0 +1,8 @@ +import { resolvePath } from "@typespec/compiler"; +import { createTester } from "@typespec/compiler/testing"; + +export const StreamsTester = createTester(resolvePath(import.meta.dirname, "../.."), { + libraries: ["@typespec/http", "@typespec/streams"], +}) + .import("@typespec/http", "@typespec/http/streams", "@typespec/streams") + .using("TypeSpec.Http", "TypeSpec.Http.Streams", "TypeSpec.Streams"); diff --git a/packages/http/tsconfig.build.json b/packages/http/tsconfig.build.json new file mode 100644 index 00000000000..85eae94819a --- /dev/null +++ b/packages/http/tsconfig.build.json @@ -0,0 +1,6 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "generated-defs/**/*.ts"], + "exclude": ["**/*.test.*"], + "references": [{ "path": "../compiler/tsconfig.build.json" }] +} diff --git a/packages/http/tsconfig.config.json b/packages/http/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/http/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/http/tsconfig.json b/packages/http/tsconfig.json index 284b90bcdc1..3dc7c231583 100644 --- a/packages/http/tsconfig.json +++ b/packages/http/tsconfig.json @@ -5,6 +5,5 @@ "outDir": "dist", "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo" - }, - "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/internal-build-utils/CHANGELOG.md b/packages/internal-build-utils/CHANGELOG.md index 356558d531b..13cbf89eb81 100644 --- a/packages/internal-build-utils/CHANGELOG.md +++ b/packages/internal-build-utils/CHANGELOG.md @@ -1,5 +1,20 @@ # Change Log - @typespec/internal-build-utils +## 0.81.0 + +No changes, version bump only. + +## 0.80.0 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 0.79.0 + +No changes, version bump only. + ## 0.78.0 ### Bump dependencies diff --git a/packages/internal-build-utils/package.json b/packages/internal-build-utils/package.json index 6a5be24606e..6006bb3c62f 100644 --- a/packages/internal-build-utils/package.json +++ b/packages/internal-build-utils/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/internal-build-utils", - "version": "0.78.0", + "version": "0.81.0", "author": "Microsoft Corporation", "description": "Internal library to TypeSpec providing helpers to build.", "homepage": "https://typespec.io", @@ -22,12 +22,12 @@ "typespec-build-tool": "cmd/cli.js" }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "tsc -p .", - "watch": "tsc -p . --watch", + "build": "tsc -p tsconfig.build.json", + "watch": "tsc -p tsconfig.build.json --watch", "test": "vitest run", "test:ui": "vitest --ui", "test:ci": "vitest run --coverage --reporter=junit --reporter=default", @@ -40,24 +40,24 @@ "!dist/test/**" ], "dependencies": { - "@pnpm/workspace.find-packages": "^1000.0.24", - "cross-spawn": "^7.0.6", - "cspell": "^9.4.0", - "semver": "^7.7.1", - "strip-json-comments": "~5.0.1", - "yargs": "~18.0.0" + "@pnpm/workspace.find-packages": "catalog:", + "cross-spawn": "catalog:", + "cspell": "catalog:", + "semver": "catalog:", + "strip-json-comments": "catalog:", + "yargs": "catalog:" }, "devDependencies": { - "@types/cross-spawn": "~6.0.6", - "@types/node": "~25.0.2", - "@types/semver": "^7.5.8", - "@types/yargs": "~17.0.33", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "chokidar": "~5.0.0", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@types/cross-spawn": "catalog:", + "@types/node": "catalog:", + "@types/semver": "catalog:", + "@types/yargs": "catalog:", + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "chokidar": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/internal-build-utils/tsconfig.build.json b/packages/internal-build-utils/tsconfig.build.json new file mode 100644 index 00000000000..fb1f25450a4 --- /dev/null +++ b/packages/internal-build-utils/tsconfig.build.json @@ -0,0 +1,4 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "test/**/*.ts"] +} diff --git a/packages/internal-build-utils/tsconfig.config.json b/packages/internal-build-utils/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/internal-build-utils/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/internal-build-utils/tsconfig.json b/packages/internal-build-utils/tsconfig.json index 30ea2a96905..84433f97361 100644 --- a/packages/internal-build-utils/tsconfig.json +++ b/packages/internal-build-utils/tsconfig.json @@ -4,6 +4,5 @@ "outDir": "dist", "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo" - }, - "include": ["src/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/json-schema/CHANGELOG.md b/packages/json-schema/CHANGELOG.md index 0de79b591b4..d1f980e1473 100644 --- a/packages/json-schema/CHANGELOG.md +++ b/packages/json-schema/CHANGELOG.md @@ -1,5 +1,23 @@ # Change Log - @typespec/json-schema +## 1.11.0 + +No changes, version bump only. + +## 1.10.0 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 1.9.0 + +### Bug Fixes + +- [#9580](https://github.com/microsoft/typespec/pull/9580) Fix crash on usage of templates that cannot be named + + ## 1.8.0 ### Bump dependencies diff --git a/packages/json-schema/generated-defs/TypeSpec.JsonSchema.ts-test.ts b/packages/json-schema/generated-defs/TypeSpec.JsonSchema.ts-test.ts index 067cfb7932b..000bbe0594e 100644 --- a/packages/json-schema/generated-defs/TypeSpec.JsonSchema.ts-test.ts +++ b/packages/json-schema/generated-defs/TypeSpec.JsonSchema.ts-test.ts @@ -7,4 +7,4 @@ import type { TypeSpecJsonSchemaDecorators } from "./TypeSpec.JsonSchema.js"; /** * An error here would mean that the exported decorator is not using the same signature. Make sure to have export const $decName: DecNameDecorator = (...) => ... */ -const _: TypeSpecJsonSchemaDecorators = $decorators["TypeSpec.JsonSchema"]; +const _decs: TypeSpecJsonSchemaDecorators = $decorators["TypeSpec.JsonSchema"]; diff --git a/packages/json-schema/package.json b/packages/json-schema/package.json index 2173564d754..0299b42054f 100644 --- a/packages/json-schema/package.json +++ b/packages/json-schema/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/json-schema", - "version": "1.8.0", + "version": "1.11.0", "author": "Microsoft Corporation", "description": "TypeSpec library for emitting TypeSpec to JSON Schema and converting JSON Schema to TypeSpec", "homepage": "https://github.com/microsoft/typespec", @@ -32,12 +32,12 @@ }, "tspMain": "lib/main.tsp", "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "pnpm gen-extern-signature && tsc -p . && pnpm lint-typespec-library && pnpm api-extractor", - "watch": "tsc -p . --watch", + "build": "pnpm gen-extern-signature && tsc -p tsconfig.build.json && pnpm lint-typespec-library && pnpm api-extractor", + "watch": "tsc -p tsconfig.build.json --watch", "gen-extern-signature": "tspd --enable-experimental gen-extern-signature .", "lint-typespec-library": "tsp compile . --warn-as-error --import @typespec/library-linter --no-emit", "test": "vitest run", @@ -57,22 +57,22 @@ "@typespec/compiler": "workspace:^" }, "devDependencies": { - "@types/node": "~25.0.2", + "@types/node": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/internal-build-utils": "workspace:^", "@typespec/library-linter": "workspace:^", "@typespec/tspd": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "ajv": "~8.17.1", - "ajv-formats": "~3.0.1", - "c8": "^10.1.3", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "ajv": "catalog:", + "ajv-formats": "catalog:", + "c8": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" }, "dependencies": { "@typespec/asset-emitter": "workspace:^", - "yaml": "~2.8.2" + "yaml": "catalog:" } } diff --git a/packages/json-schema/src/json-schema-emitter.ts b/packages/json-schema/src/json-schema-emitter.ts index 26499146b00..b89875dc11f 100644 --- a/packages/json-schema/src/json-schema-emitter.ts +++ b/packages/json-schema/src/json-schema-emitter.ts @@ -536,7 +536,7 @@ export class JsonSchemaEmitter extends TypeEmitter, JSONSche } #getSchemaForScalar(scalar: Scalar) { - let result: any = {}; + let result: any; const isStd = this.#isStdType(scalar); if (isStd) { result = this.#getSchemaForStdScalars(scalar); @@ -1093,7 +1093,7 @@ export class JsonSchemaEmitter extends TypeEmitter, JSONSche modelInstantiationContext(model: Model, name: string | undefined): Context { if (name === undefined) { - return { scope: this.emitter.createScope({}, "", this.emitter.getContext().scope) }; + return {}; } else { return this.#newFileScope(model); } diff --git a/packages/json-schema/test/arrays.test.ts b/packages/json-schema/test/arrays.test.ts index 2ed2f53ac00..5e01e28fd12 100644 --- a/packages/json-schema/test/arrays.test.ts +++ b/packages/json-schema/test/arrays.test.ts @@ -114,6 +114,7 @@ describe("arrays", () => { "Test.json": Test, "Person.json": Person, "Friend.json": Friend, + "CreatePerson.json": CreatePerson, "CreateFriend.json": CreateFriend, } = await emitSchema(` model Friend { @@ -141,15 +142,17 @@ describe("arrays", () => { name: { type: "string" }, }); + assert.deepStrictEqual(CreatePerson.properties, { + friends: { type: "array", items: { $ref: "CreateFriend.json" } }, + }); + assert.deepStrictEqual(Person.properties, { friends: { type: "array", items: { $ref: "Friend.json" } }, }); assert.deepStrictEqual(Test.properties, { a: { - type: "object", - properties: { friends: { type: "array", items: { $ref: "CreateFriend.json" } } }, - required: ["friends"], + $ref: "CreatePerson.json", }, }); }); diff --git a/packages/json-schema/test/models.test.ts b/packages/json-schema/test/models.test.ts index 2ae256fc334..0c7ca25e876 100644 --- a/packages/json-schema/test/models.test.ts +++ b/packages/json-schema/test/models.test.ts @@ -59,37 +59,6 @@ describe("emitting models", () => { assert(schemas["TemplateFoo.json"]); }); - it("inlines templates instantiated with union literals", async () => { - const schemas = await emitSchema(` - model Foo { - prop: Template - } - - model Bar { - prop: string - } - - model Template { - x: T - } - `); - - const expectedBarRef = { $ref: "Bar.json" }; - const expectedStringSchema = { type: "string" }; - const expectedExpressionSchema = { type: "object", properties: { y: { type: "string" } } }; - - assert.deepStrictEqual(schemas["Foo.json"].properties.prop, { - type: "object", - required: ["x"], - properties: { - x: { - anyOf: [expectedBarRef, expectedStringSchema, expectedExpressionSchema], - }, - }, - }); - assert(schemas["Bar.json"]); - }); - it("works with minProperties and maxProperties", async () => { const { "Foo.json": Foo } = await emitSchema(` @minProperties(1) @@ -446,3 +415,94 @@ describe("can use special words as properties", () => { }); }); }); + +describe("unspeakable template should be emitted inline", () => { + it("when using namespace", async () => { + const schemas = await emitSchema(` + model Test { + a: Template; + } + + model Template { + t: T + } + + model Thing { + a: string; + } + `); + + expect(schemas["Test.json"].properties.a).toEqual({ + type: "object", + required: ["t"], + properties: { + t: { $ref: "Thing.json" }, + }, + }); + }); + + it("when emitting schema", async () => { + const schemas = await emitSchema( + ` + @jsonSchema + model Test { + a: Template; + } + + model Template { + t: T + } + + model Thing { + a: string; + } + `, + undefined, + { emitNamespace: false }, + ); + + expect(schemas["Test.json"].properties.a).toEqual({ + type: "object", + required: ["t"], + properties: { + t: { $ref: "#/$defs/Thing" }, + }, + }); + expect(schemas["Test.json"].$defs.Thing).toEqual({ + type: "object", + properties: { a: { type: "string" } }, + required: ["a"], + }); + }); + + it("instantiated with union literals", async () => { + const schemas = await emitSchema(` + model Foo { + prop: Template + } + + model Bar { + prop: string + } + + model Template { + x: T + } + `); + + const expectedBarRef = { $ref: "Bar.json" }; + const expectedStringSchema = { type: "string" }; + const expectedExpressionSchema = { type: "object", properties: { y: { type: "string" } } }; + + expect(schemas["Foo.json"].properties.prop).toEqual({ + type: "object", + required: ["x"], + properties: { + x: { + anyOf: [expectedBarRef, expectedStringSchema, expectedExpressionSchema], + }, + }, + }); + assert(schemas["Bar.json"]); + }); +}); diff --git a/packages/json-schema/tsconfig.build.json b/packages/json-schema/tsconfig.build.json new file mode 100644 index 00000000000..85c215d455c --- /dev/null +++ b/packages/json-schema/tsconfig.build.json @@ -0,0 +1,5 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"], + "references": [{ "path": "../compiler/tsconfig.build.json" }] +} diff --git a/packages/json-schema/tsconfig.config.json b/packages/json-schema/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/json-schema/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/json-schema/tsconfig.json b/packages/json-schema/tsconfig.json index 19de0b3a83d..8d0eb2d00d4 100644 --- a/packages/json-schema/tsconfig.json +++ b/packages/json-schema/tsconfig.json @@ -6,6 +6,5 @@ "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo", "verbatimModuleSyntax": true - }, - "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/library-linter/CHANGELOG.md b/packages/library-linter/CHANGELOG.md index 5d719594b74..44db1ed28a8 100644 --- a/packages/library-linter/CHANGELOG.md +++ b/packages/library-linter/CHANGELOG.md @@ -1,5 +1,20 @@ # Change Log - @typespec/library-linter +## 0.81.0 + +No changes, version bump only. + +## 0.80.0 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 0.79.0 + +No changes, version bump only. + ## 0.78.0 ### Bump dependencies diff --git a/packages/library-linter/package.json b/packages/library-linter/package.json index 1f0d8189eb4..06fcee3e6e4 100644 --- a/packages/library-linter/package.json +++ b/packages/library-linter/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/library-linter", - "version": "0.78.0", + "version": "0.81.0", "author": "Microsoft Corporation", "description": "TypeSpec library for linting another library.", "homepage": "https://typespec.io", @@ -31,12 +31,12 @@ }, "tspMain": "dist/src/index.js", "engines": { - "node": ">=14.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "tsc -p .", - "watch": "tsc -p . --watch", + "build": "tsc -p tsconfig.build.json", + "watch": "tsc -p tsconfig.build.json --watch", "test": "vitest run", "test:ui": "vitest --ui", "test:ci": "vitest run --coverage --reporter=junit --reporter=default", @@ -52,13 +52,13 @@ "@typespec/compiler": "workspace:^" }, "devDependencies": { - "@types/node": "~25.0.2", + "@types/node": "catalog:", "@typespec/compiler": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/library-linter/test/linter.test.ts b/packages/library-linter/test/linter.test.ts index c4e0fe9b8be..f37b9dd2cab 100644 --- a/packages/library-linter/test/linter.test.ts +++ b/packages/library-linter/test/linter.test.ts @@ -1,25 +1,12 @@ import { setTypeSpecNamespace } from "@typespec/compiler"; -import { - BasicTestRunner, - TestHost, - createTestWrapper, - expectDiagnostics, -} from "@typespec/compiler/testing"; -import { beforeEach, describe, it } from "vitest"; -import { createLibraryLinterTestHost } from "./test-host.js"; +import { expectDiagnostics, mockFile } from "@typespec/compiler/testing"; +import { describe, it } from "vitest"; +import { Tester } from "./test-host.js"; describe("library-linter", () => { - let runner: BasicTestRunner; - let host: TestHost; - - beforeEach(async () => { - host = await createLibraryLinterTestHost(); - runner = createTestWrapper(host); - }); - describe("missing namespace", () => { it("emit diagnostics when model is missing namespace", async () => { - const diagnostics = await runner.diagnose("model Foo {}"); + const diagnostics = await Tester.diagnose("model Foo {}"); expectDiagnostics(diagnostics, { code: "@typespec/library-linter/missing-namespace", message: "Model 'Foo' is not in a namespace. This is bad practice for a published library.", @@ -28,7 +15,7 @@ describe("library-linter", () => { }); it("emit diagnostics when operation is missing namespace", async () => { - const diagnostics = await runner.diagnose("op test(): string;"); + const diagnostics = await Tester.diagnose("op test(): string;"); expectDiagnostics(diagnostics, { code: "@typespec/library-linter/missing-namespace", message: @@ -38,7 +25,7 @@ describe("library-linter", () => { }); it("emit diagnostics when interface is missing namespace", async () => { - const diagnostics = await runner.diagnose("interface Foo {}"); + const diagnostics = await Tester.diagnose("interface Foo {}"); expectDiagnostics(diagnostics, { code: "@typespec/library-linter/missing-namespace", message: @@ -48,10 +35,9 @@ describe("library-linter", () => { }); it("emit diagnostics when decorator is missing namespace", async () => { - host.addJsFile("./mylib.js", { - $myDec: () => null, - }); - const diagnostics = await runner.diagnose(` + const diagnostics = await Tester.files({ + "./mylib.js": mockFile.js({ $myDec: () => null }), + }).diagnose(` import "./mylib.js"; extern dec myDec(target: unknown); namespace Foo { model Bar {}} @@ -71,8 +57,9 @@ describe("library-linter", () => { $foo: (...args: unknown[]) => null, }; setTypeSpecNamespace("Testing", decorators.$foo); - host.addJsFile("dec.js", decorators); - const diagnostics = await runner.diagnose(`import "./dec.js";`); + const diagnostics = await Tester.files({ + "dec.js": mockFile.js(decorators), + }).diagnose(`import "./dec.js";`); expectDiagnostics(diagnostics, { code: "@typespec/library-linter/missing-signature", message: `Decorator function $foo is missing a decorator declaration. Add "extern dec foo(...args);" to the library tsp.`, diff --git a/packages/library-linter/test/test-host.ts b/packages/library-linter/test/test-host.ts index 6d0d2425606..739f6138a4c 100644 --- a/packages/library-linter/test/test-host.ts +++ b/packages/library-linter/test/test-host.ts @@ -1,13 +1,6 @@ -import { createTestHost, createTestWrapper } from "@typespec/compiler/testing"; -import { LibraryLinterTestLibrary } from "../src/testing/index.js"; +import { resolvePath } from "@typespec/compiler"; +import { createTester } from "@typespec/compiler/testing"; -export async function createLibraryLinterTestHost() { - return createTestHost({ - libraries: [LibraryLinterTestLibrary], - }); -} - -export async function createLibraryLinterTestRunner() { - const host = await createLibraryLinterTestHost(); - return createTestWrapper(host); -} +export const Tester = createTester(resolvePath(import.meta.dirname, ".."), { + libraries: ["@typespec/library-linter"], +}).importLibraries(); diff --git a/packages/library-linter/tsconfig.build.json b/packages/library-linter/tsconfig.build.json new file mode 100644 index 00000000000..33eafb056f2 --- /dev/null +++ b/packages/library-linter/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "test/**/*.ts"], + "references": [ + { "path": "../compiler/tsconfig.build.json" }, + { "path": "../rest/tsconfig.build.json" }, + { "path": "../openapi/tsconfig.build.json" } + ] +} diff --git a/packages/library-linter/tsconfig.config.json b/packages/library-linter/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/library-linter/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/library-linter/tsconfig.json b/packages/library-linter/tsconfig.json index 0350e2e3c68..0d7c12c5ddf 100644 --- a/packages/library-linter/tsconfig.json +++ b/packages/library-linter/tsconfig.json @@ -9,6 +9,5 @@ "outDir": "dist", "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo" - }, - "include": ["src/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/monarch/package.json b/packages/monarch/package.json index 081a5de1f58..351d1d937b3 100644 --- a/packages/monarch/package.json +++ b/packages/monarch/package.json @@ -23,12 +23,12 @@ ".": "./dist/src/index.js" }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "tsc -p .", - "watch": "tsc -p . --watch", + "build": "tsc -p tsconfig.build.json", + "watch": "tsc -p tsconfig.build.json --watch", "test": "vitest run", "test:watch": "vitest -w", "test:ui": "vitest --ui", @@ -42,16 +42,16 @@ "!dist/test/**" ], "devDependencies": { - "@types/node": "~25.0.2", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "happy-dom": "^20.0.11", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@types/node": "catalog:", + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "happy-dom": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" }, "dependencies": { - "monaco-editor-core": "^0.55.0" + "monaco-editor-core": "catalog:" } } diff --git a/packages/monarch/src/typespec-monarch.ts b/packages/monarch/src/typespec-monarch.ts index 534fb61e402..60de98e468e 100644 --- a/packages/monarch/src/typespec-monarch.ts +++ b/packages/monarch/src/typespec-monarch.ts @@ -29,6 +29,7 @@ const keywords = [ "projection", "dec", "extern", + "internal", "fn", ]; const namedLiterals = ["true", "false", "null", "unknown", "never"]; diff --git a/packages/monarch/tsconfig.build.json b/packages/monarch/tsconfig.build.json new file mode 100644 index 00000000000..fb1f25450a4 --- /dev/null +++ b/packages/monarch/tsconfig.build.json @@ -0,0 +1,4 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "test/**/*.ts"] +} diff --git a/packages/monarch/tsconfig.config.json b/packages/monarch/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/monarch/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/monarch/tsconfig.json b/packages/monarch/tsconfig.json index c6a44c5ed85..20558622369 100644 --- a/packages/monarch/tsconfig.json +++ b/packages/monarch/tsconfig.json @@ -5,6 +5,5 @@ "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo", "verbatimModuleSyntax": true - }, - "include": ["src/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/mutator-framework/CHANGELOG.md b/packages/mutator-framework/CHANGELOG.md index 9329ccf39db..36b509277a9 100644 --- a/packages/mutator-framework/CHANGELOG.md +++ b/packages/mutator-framework/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog - @typespec/mutator-framework +## 0.16.1 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 0.16.0 + +### Bump dependencies + +- [#9446](https://github.com/microsoft/typespec/pull/9446) Upgrade dependencies + + ## 0.15.0 ### Breaking Changes diff --git a/packages/mutator-framework/package.json b/packages/mutator-framework/package.json index f8dd80290a6..b30d4d6c5f8 100644 --- a/packages/mutator-framework/package.json +++ b/packages/mutator-framework/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/mutator-framework", - "version": "0.15.0", + "version": "0.16.1", "type": "module", "main": "dist/src/index.js", "repository": { @@ -8,10 +8,10 @@ "url": "git+https://github.com/microsoft/typespec.git" }, "scripts": { - "build": "tsc -p .", + "build": "tsc -p tsconfig.build.json", "clean": "rimraf ./dist", "format": "prettier . --write", - "watch": "tsc -p . --watch", + "watch": "tsc -p tsconfig.build.json --watch", "test": "vitest run", "test:ui": "vitest --ui", "test:watch": "vitest -w", @@ -34,9 +34,9 @@ "@typespec/compiler": "workspace:^" }, "devDependencies": { - "@types/node": "~25.0.2", + "@types/node": "catalog:", "@typespec/compiler": "workspace:^", - "concurrently": "^9.1.2", - "prettier": "~3.8.0" + "concurrently": "catalog:", + "prettier": "catalog:" } } diff --git a/packages/mutator-framework/tsconfig.build.json b/packages/mutator-framework/tsconfig.build.json new file mode 100644 index 00000000000..8d7fbf7b69e --- /dev/null +++ b/packages/mutator-framework/tsconfig.build.json @@ -0,0 +1,5 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "src/**/*.tsx", "test/**/*.ts", "test/**/*.tsx"], + "exclude": ["node_modules", "dist"] +} diff --git a/packages/mutator-framework/tsconfig.json b/packages/mutator-framework/tsconfig.json index 6b38294b73c..2041003b42b 100644 --- a/packages/mutator-framework/tsconfig.json +++ b/packages/mutator-framework/tsconfig.json @@ -14,6 +14,5 @@ "rootDir": "./", "verbatimModuleSyntax": true }, - "include": ["src/**/*.ts", "src/**/*.tsx", "test/**/*.ts", "test/**/*.tsx"], "exclude": ["node_modules", "dist"] } diff --git a/packages/openapi/CHANGELOG.md b/packages/openapi/CHANGELOG.md index cbb83e6c3f5..d2ee32885be 100644 --- a/packages/openapi/CHANGELOG.md +++ b/packages/openapi/CHANGELOG.md @@ -1,5 +1,28 @@ # Change Log - @typespec/openapi +## 1.11.0 + +No changes, version bump only. + +## 1.10.0 + +### Features + +- [#9577](https://github.com/microsoft/typespec/pull/9577) Add support for OpenAPI 3.2 nested tags via `parent` field in `@tagMetadata` decorator + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + +### Bug Fixes + +- [#9686](https://github.com/microsoft/typespec/pull/9686) [API] Expose `setOperationId` + + +## 1.9.0 + +No changes, version bump only. + ## 1.8.0 ### Bump dependencies diff --git a/packages/openapi/README.md b/packages/openapi/README.md index 26f9b3e42d6..7e848c6c622 100644 --- a/packages/openapi/README.md +++ b/packages/openapi/README.md @@ -176,6 +176,7 @@ Specify OpenAPI additional information. `x-custom`: "string", } ) +@tagMetadata("Child Tag", #{ description: "Child tag description", parent: "Tag Name" }) namespace PetStore { } diff --git a/packages/openapi/generated-defs/TypeSpec.OpenAPI.ts b/packages/openapi/generated-defs/TypeSpec.OpenAPI.ts index b04fb4dec2b..48b894737b3 100644 --- a/packages/openapi/generated-defs/TypeSpec.OpenAPI.ts +++ b/packages/openapi/generated-defs/TypeSpec.OpenAPI.ts @@ -21,6 +21,7 @@ export interface TagMetadata { readonly [key: string]: unknown; readonly description?: string; readonly externalDocs?: ExternalDocs; + readonly parent?: string; } export interface Contact { @@ -133,6 +134,7 @@ export type InfoDecorator = ( * ```typespec * @service() * @tagMetadata("Tag Name", #{description: "Tag description", externalDocs: #{url: "https://example.com", description: "More info.", `x-custom`: "string"}, `x-custom`: "string"}) + * @tagMetadata("Child Tag", #{description: "Child tag description", parent: "Tag Name"}) * namespace PetStore {} * ``` */ diff --git a/packages/openapi/generated-defs/TypeSpec.OpenAPI.ts-test.ts b/packages/openapi/generated-defs/TypeSpec.OpenAPI.ts-test.ts index 8f8ecdbf06c..1d30a7518b3 100644 --- a/packages/openapi/generated-defs/TypeSpec.OpenAPI.ts-test.ts +++ b/packages/openapi/generated-defs/TypeSpec.OpenAPI.ts-test.ts @@ -7,4 +7,4 @@ import type { TypeSpecOpenAPIDecorators } from "./TypeSpec.OpenAPI.js"; /** * An error here would mean that the exported decorator is not using the same signature. Make sure to have export const $decName: DecNameDecorator = (...) => ... */ -const _: TypeSpecOpenAPIDecorators = $decorators["TypeSpec.OpenAPI"]; +const _decs: TypeSpecOpenAPIDecorators = $decorators["TypeSpec.OpenAPI"]; diff --git a/packages/openapi/lib/decorators.tsp b/packages/openapi/lib/decorators.tsp index c1ddfefd7ed..e00bf2d1126 100644 --- a/packages/openapi/lib/decorators.tsp +++ b/packages/openapi/lib/decorators.tsp @@ -124,6 +124,9 @@ model TagMetadata { /** An external Docs information of the API. */ externalDocs?: ExternalDocs; + /** The name of a tag that this tag is nested under. Only supported in OpenAPI 3.2. For 3.0 and 3.1, this will be converted to `x-parent`. */ + parent?: string; + /** Attach some custom data, The extension key must start with `x-`. */ ...Record; } @@ -149,6 +152,7 @@ model ExternalDocs { * ```typespec * @service() * @tagMetadata("Tag Name", #{description: "Tag description", externalDocs: #{url: "https://example.com", description: "More info.", `x-custom`: "string"}, `x-custom`: "string"}) + * @tagMetadata("Child Tag", #{description: "Child tag description", parent: "Tag Name"}) * namespace PetStore {} * ``` */ diff --git a/packages/openapi/package.json b/packages/openapi/package.json index 0d41432e9b2..2f8e15d0a57 100644 --- a/packages/openapi/package.json +++ b/packages/openapi/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/openapi", - "version": "1.8.0", + "version": "1.11.0", "author": "Microsoft Corporation", "description": "TypeSpec library providing OpenAPI concepts", "homepage": "https://typespec.io", @@ -31,12 +31,12 @@ } }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "pnpm gen-extern-signature && tsc -p . && pnpm lint-typespec-library && pnpm api-extractor", - "watch": "tsc -p . --watch", + "build": "pnpm gen-extern-signature && tsc -p tsconfig.build.json && pnpm lint-typespec-library && pnpm api-extractor", + "watch": "tsc -p tsconfig.build.json --watch", "gen-extern-signature": "tspd --enable-experimental gen-extern-signature .", "lint-typespec-library": "tsp compile . --warn-as-error --import @typespec/library-linter --no-emit", "test": "vitest run", @@ -58,17 +58,17 @@ "@typespec/http": "workspace:^" }, "devDependencies": { - "@types/node": "~25.0.2", + "@types/node": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/http": "workspace:^", "@typespec/library-linter": "workspace:^", "@typespec/rest": "workspace:^", "@typespec/tspd": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/openapi/src/decorators.ts b/packages/openapi/src/decorators.ts index 0625f171105..fa61100887d 100644 --- a/packages/openapi/src/decorators.ts +++ b/packages/openapi/src/decorators.ts @@ -28,7 +28,20 @@ import { validateAdditionalInfoModel, validateIsUri } from "./helpers.js"; import { createStateSymbol, OpenAPIKeys, reportDiagnostic } from "./lib.js"; import { AdditionalInfo, ExtensionKey, ExternalDocs } from "./types.js"; -const operationIdsKey = createStateSymbol("operationIds"); +export const [ + /** + * Returns operationId set via the `@operationId` decorator or `undefined` + */ + getOperationId, + + /** + * Set a specific operation ID programmatically. Equivalent of using `@operationId` decorator. + * @param program TypeSpec Program + * @param entity Operation to set ID for + * @param opId Operation ID + */ + setOperationId, +] = useStateMap(createStateSymbol("operationIds")); /** * Set a specific operation ID. * @param context Decorator Context @@ -40,16 +53,9 @@ export const $operationId: OperationIdDecorator = ( entity: Operation, opId: string, ) => { - context.program.stateMap(operationIdsKey).set(entity, opId); + setOperationId(context.program, entity, opId); }; -/** - * Returns operationId set via the `@operationId` decorator or `undefined` - */ -export function getOperationId(program: Program, entity: Operation): string | undefined { - return program.stateMap(operationIdsKey).get(entity); -} - const openApiExtensionKey = createStateSymbol("openApiExtension"); /** {@inheritdoc ExtensionDecorator} */ diff --git a/packages/openapi/src/index.ts b/packages/openapi/src/index.ts index 714fbba3c68..524eef5b1de 100644 --- a/packages/openapi/src/index.ts +++ b/packages/openapi/src/index.ts @@ -19,6 +19,7 @@ export { resolveInfo, setExtension, setInfo, + setOperationId, } from "./decorators.js"; export { checkDuplicateTypeName, diff --git a/packages/openapi/test/decorators.test.ts b/packages/openapi/test/decorators.test.ts index 191b04c9c19..c4e253f587b 100644 --- a/packages/openapi/test/decorators.test.ts +++ b/packages/openapi/test/decorators.test.ts @@ -12,32 +12,6 @@ import { import { Tester } from "./test-host.js"; describe("openapi: decorators", () => { - describe("@operationId", () => { - it("emit diagnostic if use on non operation", async () => { - const diagnostics = await Tester.diagnose(` - @operationId("foo") - model Foo {} - `); - - expectDiagnostics(diagnostics, { - code: "decorator-wrong-target", - message: - "Cannot apply @operationId decorator to Foo since it is not assignable to Operation", - }); - }); - - it("emit diagnostic if operation id is not a string", async () => { - const diagnostics = await Tester.diagnose(` - @operationId(123) - op foo(): string; - `); - - expectDiagnostics(diagnostics, { - code: "invalid-argument", - }); - }); - }); - describe("@extension", () => { it("apply extension on model", async () => { const { program, Foo } = await Tester.compile(t.code` diff --git a/packages/openapi/test/decorators/operation-id.test.ts b/packages/openapi/test/decorators/operation-id.test.ts new file mode 100644 index 00000000000..25b78b6911c --- /dev/null +++ b/packages/openapi/test/decorators/operation-id.test.ts @@ -0,0 +1,69 @@ +import { expectDiagnostics, t } from "@typespec/compiler/testing"; +import { expect, it } from "vitest"; +import { getOperationId, setOperationId } from "../../src/decorators.js"; +import { Tester } from "../test-host.js"; + +it("emit diagnostic if use on non operation", async () => { + const diagnostics = await Tester.diagnose(` + @operationId("foo") + model Foo {} + `); + + expectDiagnostics(diagnostics, { + code: "decorator-wrong-target", + message: "Cannot apply @operationId decorator to Foo since it is not assignable to Operation", + }); +}); + +it("emit diagnostic if operation id is not a string", async () => { + const diagnostics = await Tester.diagnose(` + @operationId(123) + op foo(): string; + `); + + expectDiagnostics(diagnostics, { + code: "invalid-argument", + }); +}); + +it("set operation id via decorator", async () => { + const { program, foo } = await Tester.compile(t.code` + @operationId("myCustomId") + op ${t.op("foo")}(): string; + `); + + expect(getOperationId(program, foo)).toEqual("myCustomId"); +}); + +it("getOperationId returns undefined when no operation id is set", async () => { + const { program, foo } = await Tester.compile(t.code` + op ${t.op("foo")}(): string; + `); + + expect(getOperationId(program, foo)).toEqual(undefined); +}); + +it("setOperationId function sets operation id programmatically", async () => { + const { program, foo } = await Tester.compile(t.code` + op ${t.op("foo")}(): string; + `); + + expect(getOperationId(program, foo)).toEqual(undefined); + + setOperationId(program, foo, "programmaticId"); + + expect(getOperationId(program, foo)).toEqual("programmaticId"); +}); + +it("setOperationId function can override decorator-set operation id", async () => { + const { program, foo } = await Tester.compile(t.code` + @operationId("decoratorId") + op ${t.op("foo")}(): string; + `); + + expect(getOperationId(program, foo)).toEqual("decoratorId"); + + setOperationId(program, foo, "overrideId"); + + expect(getOperationId(program, foo)).toEqual("overrideId"); +}); diff --git a/packages/openapi/tsconfig.build.json b/packages/openapi/tsconfig.build.json new file mode 100644 index 00000000000..697ef13c178 --- /dev/null +++ b/packages/openapi/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"], + "references": [ + { "path": "../compiler/tsconfig.build.json" }, + { "path": "../rest/tsconfig.build.json" } + ] +} diff --git a/packages/openapi/tsconfig.config.json b/packages/openapi/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/openapi/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/openapi/tsconfig.json b/packages/openapi/tsconfig.json index b50f2b5577f..a641027b2e0 100644 --- a/packages/openapi/tsconfig.json +++ b/packages/openapi/tsconfig.json @@ -5,6 +5,5 @@ "outDir": "dist", "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo" - }, - "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/openapi3/CHANGELOG.md b/packages/openapi3/CHANGELOG.md index 7646212214c..5060c076470 100644 --- a/packages/openapi3/CHANGELOG.md +++ b/packages/openapi3/CHANGELOG.md @@ -1,5 +1,61 @@ # Change Log - @typespec/openapi3 +## 1.11.0 + +### Bug Fixes + +- [#10041](https://github.com/microsoft/typespec/pull/10041) [importer] Fix `anyOf` with `$ref` and inline object being incorrectly imported as a model instead of a union. +- [#10046](https://github.com/microsoft/typespec/pull/10046) Fix OpenAPI emitter failing with "Duplicate type name" error when using a named union with a `bytes` variant in a multipart body (e.g. `HttpPart` where `MyUnion` includes `bytes`). + + +## 1.10.0 + +### Features + +- [#9577](https://github.com/microsoft/typespec/pull/9577) Add support for OpenAPI 3.2 nested tags via `parent` field in `@tagMetadata` decorator +- [#9890](https://github.com/microsoft/typespec/pull/9890) `file-type` can now receive an array to allow emitting both `json` and `yaml` output in the same run. +- [#9742](https://github.com/microsoft/typespec/pull/9742) Import tool: Support importing `readOnly` and `writeOnly` properties from OpenAPI. + - `readOnly: true` is converted to `@visibility(Lifecycle.Read)` + - `writeOnly: true` is converted to `@visibility(Lifecycle.Create)` + - Both properties are mutually exclusive, a warning is emitted if both are present and both are ignored + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + +### Bug Fixes + +- [#9634](https://github.com/microsoft/typespec/pull/9634) importer - Fix OpenAPI3 import to support JSON Schema 2020-12 sibling keywords alongside $ref (default, constraints, deprecated, etc.) +- [#9802](https://github.com/microsoft/typespec/pull/9802) openapi3 - Fix `tsp-openapi3` ignoring array constraints (`minItems`, `maxItems`) on nullable arrays defined with `anyOf` + `null` + + +## 1.9.0 + +### Features + +- [#9629](https://github.com/microsoft/typespec/pull/9629) importer - Add support for importing the `@continuationToken` decorator based on x-ms-list-continuation-token extension +- [#9627](https://github.com/microsoft/typespec/pull/9627) importer - Add support for importing paging link decorators (`@prevLink`, `@nextLink`, `@firstLink`, `@lastLink`) based on x-ms-list-*-link OpenAPI extensions +- [#9609](https://github.com/microsoft/typespec/pull/9609) importer - Add support for x-ms-list extension to add `@list` decorator to operations +- [#9613](https://github.com/microsoft/typespec/pull/9613) importer - Add support for `@offset` decorator when x-ms-list-offset extension is present +- [#9618](https://github.com/microsoft/typespec/pull/9618) importer - Add support for `@pageSize` decorator based on x-ms-list-page-size extension +- [#9615](https://github.com/microsoft/typespec/pull/9615) importer - Add support for x-ms-list-page-items extension to `@pageItems` decorator +- [#9611](https://github.com/microsoft/typespec/pull/9611) importer - Add support for x-ms-list-page-index extension to add `@pageIndex` decorator +- [#9512](https://github.com/microsoft/typespec/pull/9512) Expose performance information when running with `--stats` +- [#9412](https://github.com/microsoft/typespec/pull/9412) importer - OpenAPI number type with duration format now converts to TypeSpec duration type with @encode("seconds", float32) decorator +- [#9584](https://github.com/microsoft/typespec/pull/9584) Expose `openapi-versions` emitter option now that both 3.1.0 and 3.2.0 are implemented. + +### Bump dependencies + +- [#9446](https://github.com/microsoft/typespec/pull/9446) Upgrade dependencies + +### Bug Fixes + +- [#9410](https://github.com/microsoft/typespec/pull/9410) importer - null reference exception if member schema cannot be resolved +- [#9533](https://github.com/microsoft/typespec/pull/9533) Fix parameters with default value resulting in `$ref` with `default` as sibling for OpenAPI 3.0 +- [#9583](https://github.com/microsoft/typespec/pull/9583) Fix: tag metadata not scopped to the service it was defined on +- [#9475](https://github.com/microsoft/typespec/pull/9475) Handle use of `.now()` constructor on date time types in examples and default. + + ## 1.8.0 ### Features diff --git a/packages/openapi3/README.md b/packages/openapi3/README.md index 1c5c6efb4ed..6512a4c1a86 100644 --- a/packages/openapi3/README.md +++ b/packages/openapi3/README.md @@ -44,9 +44,9 @@ See [Configuring output directory for more info](https://typespec.io/docs/handbo ### `file-type` -**Type:** `"yaml" | "json"` +**Type:** `string,array` -If the content should be serialized as YAML or JSON. Default 'yaml', it not specified infer from the `output-file` extension +If the content should be serialized as YAML or JSON. Can be a single value or an array to emit multiple formats. Default 'yaml', if not specified infer from the `output-file` extension ### `output-file` @@ -58,8 +58,10 @@ Output file will interpolate the following values: - service-name: Name of the service - service-name-if-multiple: Name of the service if multiple - version: Version of the service if multiple +- file-type: The file type being emitted (json or yaml). Useful when `file-type` is an array. Default: `{service-name-if-multiple}.{version}.openapi.yaml` or `.json` if `file-type` is `"json"` +When `file-type` is an array: `{service-name-if-multiple}.{version}.openapi.{file-type}` Example Single service no versioning diff --git a/packages/openapi3/generated-defs/TypeSpec.OpenAPI.ts-test.ts b/packages/openapi3/generated-defs/TypeSpec.OpenAPI.ts-test.ts index b115637c518..70efc1b2e22 100644 --- a/packages/openapi3/generated-defs/TypeSpec.OpenAPI.ts-test.ts +++ b/packages/openapi3/generated-defs/TypeSpec.OpenAPI.ts-test.ts @@ -7,4 +7,4 @@ import type { TypeSpecOpenAPIDecorators } from "./TypeSpec.OpenAPI.js"; /** * An error here would mean that the exported decorator is not using the same signature. Make sure to have export const $decName: DecNameDecorator = (...) => ... */ -const _: TypeSpecOpenAPIDecorators = $decorators["TypeSpec.OpenAPI"]; +const _decs: TypeSpecOpenAPIDecorators = $decorators["TypeSpec.OpenAPI"]; diff --git a/packages/openapi3/package.json b/packages/openapi3/package.json index a821909e741..d66cca5846f 100644 --- a/packages/openapi3/package.json +++ b/packages/openapi3/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/openapi3", - "version": "1.8.0", + "version": "1.11.0", "author": "Microsoft Corporation", "description": "TypeSpec library for emitting OpenAPI 3.0 and OpenAPI 3.1 from the TypeSpec REST protocol binding and converting OpenAPI3 to TypeSpec", "homepage": "https://typespec.io", @@ -37,13 +37,13 @@ "#test/*": "./test/*" }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", "build": "pnpm gen-version && pnpm gen-extern-signature && pnpm quickbuild && pnpm lint-typespec-library", - "quickbuild": "tsc -p .", - "watch": "tsc -p . --watch", + "quickbuild": "tsc -p tsconfig.build.json", + "watch": "tsc -p tsconfig.build.json --watch", "gen-extern-signature": "tspd --enable-experimental gen-extern-signature .", "lint-typespec-library": "tsp compile . --warn-as-error --import @typespec/library-linter --no-emit", "test": "vitest run", @@ -63,11 +63,11 @@ "!dist/test/**" ], "dependencies": { - "@scalar/json-magic": "^0.9.1", - "@scalar/openapi-parser": "^0.24.1", - "@scalar/openapi-types": "^0.5.0", + "@scalar/json-magic": "catalog:", + "@scalar/openapi-parser": "catalog:", + "@scalar/openapi-types": "catalog:", "@typespec/asset-emitter": "workspace:^", - "yaml": "~2.8.2" + "yaml": "catalog:" }, "peerDependencies": { "@typespec/compiler": "workspace:^", @@ -100,8 +100,8 @@ } }, "devDependencies": { - "@types/node": "~25.0.2", - "@types/yargs": "~17.0.33", + "@types/node": "catalog:", + "@types/yargs": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/events": "workspace:^", "@typespec/http": "workspace:^", @@ -114,12 +114,12 @@ "@typespec/tspd": "workspace:^", "@typespec/versioning": "workspace:^", "@typespec/xml": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "cross-env": "~10.1.0", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "cross-env": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/openapi3/src/cli/actions/convert/generators/generate-operation.ts b/packages/openapi3/src/cli/actions/convert/generators/generate-operation.ts index 71d0a518f61..fa704c611f3 100644 --- a/packages/openapi3/src/cli/actions/convert/generators/generate-operation.ts +++ b/packages/openapi3/src/cli/actions/convert/generators/generate-operation.ts @@ -52,6 +52,15 @@ function generateOperationParameter( definitions.push(generateDocs(parameter.doc)); } + // Directives come before decorators + if (parameter.directives && parameter.directives.length > 0) { + definitions.push( + ...parameter.directives.map((d) => { + return `#${d.name}`; + }), + ); + } + definitions.push(...generateDecorators(parameter.decorators)); definitions.push( diff --git a/packages/openapi3/src/cli/actions/convert/generators/generate-types.ts b/packages/openapi3/src/cli/actions/convert/generators/generate-types.ts index 8a26e4173c5..4b6dd59e9bb 100644 --- a/packages/openapi3/src/cli/actions/convert/generators/generate-types.ts +++ b/packages/openapi3/src/cli/actions/convert/generators/generate-types.ts @@ -24,9 +24,28 @@ export class SchemaToExpressionGenerator { context?: Context, ): string { const hasRef = "$ref" in schema; - return hasRef - ? this.getRefName(schema.$ref, callingScope) - : this.getTypeFromSchema(schema, callingScope, isHttpPart, encoding, context); + if (hasRef) { + // In JSON Schema 2020-12 (used in OpenAPI 3.1+), sibling keywords alongside $ref are allowed + // Check if there's a default value alongside the $ref + let type = this.getRefName(schema.$ref, callingScope); + + // Cast to allow access to sibling properties + const schemaWithSiblings = schema as SupportedOpenAPISchema & { $ref: string }; + if (schemaWithSiblings.default !== undefined) { + const defaultValue = this.generateDefaultValueForRef( + schemaWithSiblings, + schema.$ref, + callingScope, + context, + ); + if (defaultValue) { + type += ` = ${defaultValue}`; + } + } + + return type; + } + return this.getTypeFromSchema(schema, callingScope, isHttpPart, encoding, context); } public generateArrayType(schema: SupportedOpenAPISchema, callingScope: string[]): string { @@ -224,6 +243,43 @@ export class SchemaToExpressionGenerator { return undefined; // Return undefined to indicate no default found } + /** + * Generate a default value for a schema that has a $ref and a sibling default keyword. + * This handles the case where a schema references another schema but overrides the default value. + */ + private generateDefaultValueForRef( + schema: SupportedOpenAPISchema & { $ref: string }, + ref: string, + callingScope: string[], + context?: Context, + ): string | undefined { + if (!schema.default) { + return undefined; + } + + if (typeof schema.default === "object") { + return normalizeObjectValueToTSValueExpression(schema.default); + } + + // Check if the referenced schema is an enum + if (context) { + const refSchema = context.getSchemaByRef(ref); + if ( + refSchema?.enum && + refSchema.type === "string" && + refSchema.enum.includes(schema.default) + ) { + const enumRefName = this.getRefName(ref, callingScope); + // Convert the default value to a valid identifier for the enum member + const memberName = printIdentifier(schema.default as string, "disallow-reserved"); + return `${enumRefName}.${memberName}`; + } + } + + // For non-enum types, just use JSON.stringify + return JSON.stringify(schema.default); + } + private getAllOfType(schema: SupportedOpenAPISchema, callingScope: string[]): string { const requiredProps: string[] = schema.required || []; let properties: Record> = {}; @@ -442,7 +498,7 @@ export class SchemaToExpressionGenerator { const propType = this.generateTypeFromRefableSchema(originalPropSchema, callingScope); const decorators = generateDecorators( - getDecoratorsForSchema(originalPropSchema), + getDecoratorsForSchema(originalPropSchema, context), isHttpPart ? SchemaToExpressionGenerator.decoratorNamesToExcludeForParts : [], ) .map((d) => `${d}\n`) diff --git a/packages/openapi3/src/cli/actions/convert/interfaces.ts b/packages/openapi3/src/cli/actions/convert/interfaces.ts index 2a1594647c0..82efbe8db62 100644 --- a/packages/openapi3/src/cli/actions/convert/interfaces.ts +++ b/packages/openapi3/src/cli/actions/convert/interfaces.ts @@ -170,6 +170,7 @@ export interface TypeSpecOperationParameter { name: string; in: string; doc?: string; + directives?: TypeSpecDirective[]; decorators: TypeSpecDecorator[]; isOptional: boolean; schema: Refable; diff --git a/packages/openapi3/src/cli/actions/convert/transforms/transform-component-parameters.ts b/packages/openapi3/src/cli/actions/convert/transforms/transform-component-parameters.ts index 4d264ca40e4..53907009dd1 100644 --- a/packages/openapi3/src/cli/actions/convert/transforms/transform-component-parameters.ts +++ b/packages/openapi3/src/cli/actions/convert/transforms/transform-component-parameters.ts @@ -23,11 +23,12 @@ export function transformComponentParameters( for (const name of Object.keys(parameters)) { const parameter = parameters[name]; if ("$ref" in parameter) continue; - transformComponentParameter(dataTypes, name, parameter); + transformComponentParameter(context, dataTypes, name, parameter); } } function transformComponentParameter( + context: Context, dataTypes: TypeSpecDataTypes[], key: string, parameter: OpenAPI3Parameter | OpenAPIParameter3_2, @@ -41,11 +42,12 @@ function transformComponentParameter( scope, name, decorators: [], - properties: [getModelPropertyFromParameter(parameter)], + properties: [getModelPropertyFromParameter(context, parameter)], }); } function getModelPropertyFromParameter( + context: Context, parameter: OpenAPI3Parameter | OpenAPIParameter3_2, ): TypeSpecModelProperty { const parameterSchema = "schema" in parameter ? (parameter.schema ?? {}) : {}; @@ -53,7 +55,7 @@ function getModelPropertyFromParameter( name: printIdentifier(parameter.name), isOptional: !parameter.required, doc: parameter.description ?? parameterSchema.description, - decorators: getParameterDecorators(parameter), + decorators: getParameterDecorators(parameter, context), schema: parameterSchema, }; } diff --git a/packages/openapi3/src/cli/actions/convert/transforms/transform-component-schemas.ts b/packages/openapi3/src/cli/actions/convert/transforms/transform-component-schemas.ts index 30a851150e4..e9821bbd638 100644 --- a/packages/openapi3/src/cli/actions/convert/transforms/transform-component-schemas.ts +++ b/packages/openapi3/src/cli/actions/convert/transforms/transform-component-schemas.ts @@ -79,7 +79,7 @@ export function transformComponentSchemas(context: Context, models: TypeSpecData kind: "enum", ...getScopeAndName(name), directives: getDirectivesForSchema(schema), - decorators: getDecoratorsForSchema(schema), + decorators: getDecoratorsForSchema(schema, context), doc: schema.description, schema, }; @@ -111,10 +111,12 @@ export function transformComponentSchemas(context: Context, models: TypeSpecData name, scope, directives: [...getDirectivesForSchema(effectiveSchema)], - decorators: [...getDecoratorsForSchema(effectiveSchema)], + decorators: [...getDecoratorsForSchema(effectiveSchema, context)], doc: effectiveSchema.description || schema.description, properties: [ - ...("$ref" in effectiveSchema ? [] : getModelPropertiesFromObjectSchema(effectiveSchema)), + ...("$ref" in effectiveSchema + ? [] + : getModelPropertiesFromObjectSchema(effectiveSchema, context)), ...allOfDetails.properties, ], additionalProperties: @@ -143,7 +145,7 @@ export function transformComponentSchemas(context: Context, models: TypeSpecData // Extract description and decorators from meaningful union members const unionMetadata = extractUnionMetadata(schema); - let decorators = [...getDecoratorsForSchema(schema), ...unionMetadata.decorators]; + let decorators = [...getDecoratorsForSchema(schema, context), ...unionMetadata.decorators]; // Check if this is an SSE event schema - if so, replace @oneOf with @events const schemaRef = `#/components/schemas/${name}`; @@ -187,7 +189,7 @@ export function transformComponentSchemas(context: Context, models: TypeSpecData if (!("$ref" in meaningfulMember)) { return { description: meaningfulMember.description, - decorators: getDecoratorsForSchema(meaningfulMember), + decorators: getDecoratorsForSchema(meaningfulMember, context), }; } } @@ -201,7 +203,7 @@ export function transformComponentSchemas(context: Context, models: TypeSpecData if (nonNullTypes.length === 1) { // Create a schema without the null type to extract decorators for the non-null part const nonNullSchema = { ...schema, type: nonNullTypes[0] }; - return { decorators: getDecoratorsForSchema(nonNullSchema) }; + return { decorators: getDecoratorsForSchema(nonNullSchema, context) }; // The description should already be on the main schema, so we don't override it here } } @@ -218,7 +220,7 @@ export function transformComponentSchemas(context: Context, models: TypeSpecData kind: "scalar", ...getScopeAndName(name), directives: getDirectivesForSchema(schema), - decorators: getDecoratorsForSchema(schema), + decorators: getDecoratorsForSchema(schema, context), doc: schema.description, schema: "$ref" in schema ? {} : schema, }); @@ -247,7 +249,7 @@ export function transformComponentSchemas(context: Context, models: TypeSpecData for (const member of schema.allOf) { // inline-schemas treated as normal objects with properties if (!("$ref" in member)) { - details.properties.push(...getModelPropertiesFromObjectSchema(member)); + details.properties.push(...getModelPropertiesFromObjectSchema(member, context)); continue; } @@ -314,8 +316,13 @@ function unwrapSingleAnyOfOneOf( return (member as any).type !== "null"; }); - // If there's exactly one meaningful inline member AND it's an object type, unwrap it - if (meaningfulInlineMembers.length === 1) { + // Check if there are any $ref members in the union alongside the inline members + const hasRefMembers = unionMembers.some((member) => "$ref" in member); + + // If there's exactly one meaningful inline member AND it's an object type + // AND there are no $ref members alongside it, unwrap it. + // If $ref members are present, the schema is truly a union (e.g. $ref + object). + if (meaningfulInlineMembers.length === 1 && !hasRefMembers) { const member = meaningfulInlineMembers[0]; // Only unwrap if the member is an object schema if (!("$ref" in member) && (member.type === "object" || member.properties)) { @@ -335,10 +342,10 @@ function unwrapSingleAnyOfOneOf( return schema; } -function getModelPropertiesFromObjectSchema({ - properties, - required = [], -}: SupportedOpenAPISchema): TypeSpecModelProperty[] { +function getModelPropertiesFromObjectSchema( + { properties, required = [] }: SupportedOpenAPISchema, + context: Context, +): TypeSpecModelProperty[] { if (!properties) return []; const modelProperties: TypeSpecModelProperty[] = []; @@ -351,7 +358,7 @@ function getModelPropertiesFromObjectSchema({ schema: property, isOptional: !required.includes(name), directives: [...getDirectivesForSchema(property)], - decorators: [...getDecoratorsForSchema(property)], + decorators: [...getDecoratorsForSchema(property, context)], }); } @@ -384,8 +391,13 @@ function getTypeSpecKind(schema: Refable): TypeSpecDataT return (member as any).type !== "null"; }); - // If there's exactly one meaningful inline member AND it's an object type, treat it as a model - if (meaningfulInlineMembers.length === 1) { + // Check if there are any $ref members in the union alongside the inline members + const hasRefMembers = unionMembers.some((member) => "$ref" in member); + + // If there's exactly one meaningful inline member AND it's an object type + // AND there are no $ref members alongside it, treat it as a model. + // If $ref members are present, the schema is truly a union (e.g. $ref + object). + if (meaningfulInlineMembers.length === 1 && !hasRefMembers) { const member = meaningfulInlineMembers[0]; // Only unwrap if the member is an object schema if (!("$ref" in member) && (member.type === "object" || member.properties)) { diff --git a/packages/openapi3/src/cli/actions/convert/transforms/transform-paths.ts b/packages/openapi3/src/cli/actions/convert/transforms/transform-paths.ts index 1a59d4fe71a..21fd50ff38d 100644 --- a/packages/openapi3/src/cli/actions/convert/transforms/transform-paths.ts +++ b/packages/openapi3/src/cli/actions/convert/transforms/transform-paths.ts @@ -14,7 +14,11 @@ import { TypeSpecRequestBody, } from "../interfaces.js"; import { Context } from "../utils/context.js"; -import { getExtensions, getParameterDecorators } from "../utils/decorators.js"; +import { + getDirectivesForSchema, + getExtensions, + getParameterDecorators, +} from "../utils/decorators.js"; import { generateOperationId } from "../utils/generate-operation-id.js"; import { getScopeAndName } from "../utils/get-scope-and-name.js"; import { supportedHttpMethods } from "../utils/supported-http-methods.js"; @@ -33,13 +37,15 @@ export function transformPaths( const usedOperationIds = new Set(); for (const route of Object.keys(paths)) { - const routeParameters = paths[route].parameters?.map(transformOperationParameter) ?? []; + const routeParameters = + paths[route].parameters?.map((p) => transformOperationParameter(p, context)) ?? []; const path = paths[route]; for (const verb of supportedHttpMethods) { const operation = path[verb]; if (!operation) continue; - const parameters = operation.parameters?.map(transformOperationParameter) ?? []; + const parameters = + operation.parameters?.map((p) => transformOperationParameter(p, context)) ?? []; const tags = operation.tags?.map((t) => t) ?? []; const operationResponses = operation.responses ?? {}; @@ -115,16 +121,28 @@ function dedupeParameters( function transformOperationParameter( parameter: Refable | Refable, + context: Context, ): Refable { if ("$ref" in parameter) { return { $ref: parameter.$ref }; } + // Prefer parameter.description, but fall back to schema.description if present + let doc = parameter.description; + if (!doc && "schema" in parameter && parameter.schema && parameter.schema.description) { + doc = parameter.schema.description; + } + + // Get directives from the schema (e.g., deprecated) + const directives = + "schema" in parameter && parameter.schema ? getDirectivesForSchema(parameter.schema) : []; + return { name: printIdentifier(parameter.name), in: parameter.in, - doc: parameter.description, - decorators: getParameterDecorators(parameter), + doc, + directives, + decorators: getParameterDecorators(parameter, context), isOptional: !parameter.required, schema: "schema" in parameter ? (parameter.schema ?? {}) : {}, }; diff --git a/packages/openapi3/src/cli/actions/convert/utils/decorators.ts b/packages/openapi3/src/cli/actions/convert/utils/decorators.ts index ad4edc57b2e..5ba1a18fb85 100644 --- a/packages/openapi3/src/cli/actions/convert/utils/decorators.ts +++ b/packages/openapi3/src/cli/actions/convert/utils/decorators.ts @@ -11,6 +11,7 @@ import { } from "../../../../types.js"; import { stringLiteral } from "../generators/common.js"; import { TSValue, TypeSpecDecorator, TypeSpecDirective } from "../interfaces.js"; +import type { Context } from "./context.js"; const validLocations = ["header", "query", "path"]; const extensionDecoratorName = "extension"; @@ -20,6 +21,14 @@ export function getExtensions(element: Extensions): TypeSpecDecorator[] { for (const key of Object.keys(element)) { if (isExtensionKey(key)) { + // Handle x-ms-list extension specially + if (key === "x-ms-list" && element[key] === true) { + decorators.push({ + name: "list", + args: [], + }); + } + decorators.push({ name: extensionDecoratorName, args: [key, normalizeObjectValue(element[key])], @@ -29,6 +38,31 @@ export function getExtensions(element: Extensions): TypeSpecDecorator[] { return decorators; } + +function getPagingLinkDecorators(schema: OpenAPI3Schema | OpenAPISchema3_1 | OpenAPISchema3_2) { + const decorators: TypeSpecDecorator[] = []; + + // Map of x-ms-list-*-link extensions to their corresponding TypeSpec decorators + const linkExtensions = { + "x-ms-list-prev-link": "prevLink", + "x-ms-list-next-link": "nextLink", + "x-ms-list-first-link": "firstLink", + "x-ms-list-last-link": "lastLink", + } as const; + + for (const [extensionKey, decoratorName] of Object.entries(linkExtensions)) { + const extensionValue = (schema as any)[extensionKey]; + if (extensionValue === true) { + decorators.push({ + name: decoratorName, + args: [], + }); + } + } + + return decorators; +} + function normalizeObjectValue(source: unknown): string | number | object | TSValue { if (source !== null && typeof source === "object") { const result = createTSValueFromObjectValue(source); @@ -43,12 +77,46 @@ function isExtensionKey(key: string): key is ExtensionKey { return key.startsWith("x-"); } -export function getParameterDecorators(parameter: OpenAPI3Parameter | OpenAPIParameter3_2) { +export function getParameterDecorators( + parameter: OpenAPI3Parameter | OpenAPIParameter3_2, + context?: Context, +) { const decorators: TypeSpecDecorator[] = []; decorators.push(...getExtensions(parameter)); + + // Add @offset decorator if x-ms-list-offset extension is true + const xMsListOffset = (parameter as any)["x-ms-list-offset"]; + if (xMsListOffset === true) { + decorators.push({ name: "offset", args: [] }); + } + if ("schema" in parameter && parameter.schema) { - decorators.push(...getDecoratorsForSchema(parameter.schema)); + decorators.push(...getDecoratorsForSchema(parameter.schema, context)); + } + + // Add @pageSize decorator if x-ms-list-page-size extension is true + const xmsListPageSize = (parameter as any)["x-ms-list-page-size"]; + if (xmsListPageSize === true) { + decorators.push({ + name: "pageSize", + args: [], + }); + } + + // Handle x-ms-list-continuation-token extension on parameter itself + const xmsListContinuationToken = (parameter as any)["x-ms-list-continuation-token"]; + if (xmsListContinuationToken === true) { + decorators.push({ + name: "continuationToken", + args: [], + }); + } + + // Add @pageIndex decorator if x-ms-list-page-index extension is true + const xmsListPageIndex = (parameter as any)["x-ms-list-page-index"]; + if (xmsListPageIndex === true) { + decorators.push({ name: "pageIndex", args: [] }); } const locationDecorator = getLocationDecorator(parameter); @@ -159,36 +227,120 @@ function getHeaderArgs(explode: boolean): TSValue | undefined { export function getDecoratorsForSchema( schema: Refable, + context?: Context, ): TypeSpecDecorator[] { const decorators: TypeSpecDecorator[] = []; + // In JSON Schema 2020-12 (used in OpenAPI 3.1+), sibling keywords alongside $ref are allowed + // We should process them even when $ref is present + // If only $ref is present without sibling keywords, return early if ("$ref" in schema) { - return decorators; + // Check if there are any sibling keywords besides $ref + const hasSiblingKeywords = Object.keys(schema).some((key) => key !== "$ref"); + if (!hasSiblingKeywords) { + return decorators; + } + // If we have sibling keywords, we need to resolve the $ref to determine the type + // so we can apply the correct constraint decorators } - decorators.push(...getExtensions(schema)); + // At this point, either schema doesn't have $ref, or it has $ref with sibling keywords + // Cast to allow access to schema properties + const schemaWithoutRef = schema as OpenAPI3Schema | OpenAPISchema3_1 | OpenAPISchema3_2; + + decorators.push(...getExtensions(schemaWithoutRef)); + + // Handle readOnly and writeOnly properties + // These are mutually exclusive - if both are present, emit a warning and ignore both + const readOnly = schemaWithoutRef.readOnly; + const writeOnly = schemaWithoutRef.writeOnly; + + if (readOnly && writeOnly) { + // Both readOnly and writeOnly are present - this is invalid + context?.logger.warn( + `Property has both readOnly and writeOnly set to true, which is invalid. Both will be ignored.`, + ); + } else if (readOnly) { + // readOnly: true maps to @visibility(Lifecycle.Read) + decorators.push({ + name: "visibility", + args: [createTSValue("Lifecycle.Read")], + }); + } else if (writeOnly) { + // writeOnly: true maps to @visibility(Lifecycle.Create) + decorators.push({ + name: "visibility", + args: [createTSValue("Lifecycle.Create")], + }); + } - // Handle OpenAPI 3.1 type arrays like ["integer", "null"] - // Extract the non-null type to determine which decorators to apply - const effectiveType = Array.isArray(schema.type) - ? schema.type.find((t) => t !== "null") - : schema.type; + // Handle x-ms-list-page-items extension with @pageItems decorator + // This must be after getExtensions to ensure both decorators are present + const xmsListPageItems = (schema as any)["x-ms-list-page-items"]; + if (xmsListPageItems === true) { + decorators.push({ name: "pageItems", args: [] }); + } + + // Handle x-ms-list-continuation-token extension by adding @continuationToken decorator + const xmsListContinuationToken = (schema as any)["x-ms-list-continuation-token"]; + if (xmsListContinuationToken === true) { + decorators.push({ + name: "continuationToken", + args: [], + }); + } + + // Handle x-ms-list-*-link extensions + decorators.push(...getPagingLinkDecorators(schemaWithoutRef)); + + // Determine the effective type - if schema has $ref with sibling keywords, resolve the ref + let effectiveType: string | undefined; + if ("$ref" in schema && context) { + const refSchema = context.getSchemaByRef(schema.$ref); + if (refSchema) { + effectiveType = Array.isArray(refSchema.type) + ? refSchema.type.find((t) => t !== "null") + : refSchema.type; + } + } else { + // Handle OpenAPI 3.1 type arrays like ["integer", "null"] + // Extract the non-null type to determine which decorators to apply + effectiveType = Array.isArray(schemaWithoutRef.type) + ? schemaWithoutRef.type.find((t) => t !== "null") + : schemaWithoutRef.type; + } + + // If effectiveType is still undefined, infer it from anyOf/oneOf members. + // This handles schemas like `{ anyOf: [{ type: "array", ... }, { type: "null" }], minItems: 2 }` + // where constraints live on the outer schema but the type is only in the union members. + if (!effectiveType) { + const unionMembers = schemaWithoutRef.anyOf || schemaWithoutRef.oneOf; + if (unionMembers) { + const nonNullMembers = unionMembers.filter((m) => !("$ref" in m) && m.type !== "null"); + if (nonNullMembers.length === 1 && !("$ref" in nonNullMembers[0])) { + const memberType = nonNullMembers[0].type; + effectiveType = Array.isArray(memberType) + ? memberType.find((t) => t !== "null") + : memberType; + } + } + } // Handle x-ms-duration extension with @encode decorator // Must be after effectiveType extraction to handle type arrays correctly - const xmsDuration = (schema as any)["x-ms-duration"]; + const xmsDuration = (schemaWithoutRef as any)["x-ms-duration"]; if (xmsDuration === "seconds" || xmsDuration === "milliseconds") { - decorators.push(...getDurationSchemaDecorators(schema, effectiveType)); + decorators.push(...getDurationSchemaDecorators(schemaWithoutRef, effectiveType)); } // Handle unixtime format with @encode decorator // Check both direct format and format from anyOf/oneOf members - let formatToUse = schema.format; + let formatToUse = schemaWithoutRef.format; let typeForFormat = effectiveType; // If format is not directly on the schema, check anyOf/oneOf members for unixtime format if (!formatToUse) { - const unionMembers = schema.anyOf || schema.oneOf; + const unionMembers = schemaWithoutRef.anyOf || schemaWithoutRef.oneOf; if (unionMembers) { for (const member of unionMembers) { if ("$ref" in member) continue; @@ -215,40 +367,43 @@ export function getDecoratorsForSchema( switch (effectiveType) { case "array": - decorators.push(...getArraySchemaDecorators(schema)); + decorators.push(...getArraySchemaDecorators(schemaWithoutRef)); break; case "integer": case "number": - decorators.push(...getNumberSchemaDecorators(schema)); + decorators.push(...getNumberSchemaDecorators(schemaWithoutRef)); break; case "string": - decorators.push(...getStringSchemaDecorators(schema)); + decorators.push(...getStringSchemaDecorators(schemaWithoutRef)); break; default: break; } - if (schema.title) { - decorators.push({ name: "summary", args: [schema.title] }); + if (schemaWithoutRef.title) { + decorators.push({ name: "summary", args: [schemaWithoutRef.title] }); } - if (schema.discriminator) { - if (schema.oneOf || schema.anyOf) { + if (schemaWithoutRef.discriminator) { + if (schemaWithoutRef.oneOf || schemaWithoutRef.anyOf) { decorators.push({ name: "discriminated", args: [ createTSValue( - `#{ envelope: "none", discriminatorPropertyName: ${JSON.stringify(schema.discriminator.propertyName)} }`, + `#{ envelope: "none", discriminatorPropertyName: ${JSON.stringify(schemaWithoutRef.discriminator.propertyName)} }`, ), ], }); } else { - decorators.push({ name: "discriminator", args: [schema.discriminator.propertyName] }); + decorators.push({ + name: "discriminator", + args: [schemaWithoutRef.discriminator.propertyName], + }); } } - if (schema.oneOf) { - decorators.push(...getOneOfSchemaDecorators(schema)); + if (schemaWithoutRef.oneOf) { + decorators.push(...getOneOfSchemaDecorators(schemaWithoutRef)); } return decorators; @@ -259,11 +414,23 @@ export function getDirectivesForSchema( ): TypeSpecDirective[] { const directives: TypeSpecDirective[] = []; + // In JSON Schema 2020-12 (used in OpenAPI 3.1+), sibling keywords alongside $ref are allowed + // We should process them even when $ref is present + // If only $ref is present without sibling keywords, return early if ("$ref" in schema) { - return directives; + // Check if there are any sibling keywords besides $ref + const hasSiblingKeywords = Object.keys(schema).some((key) => key !== "$ref"); + if (!hasSiblingKeywords) { + return directives; + } + // If we have sibling keywords, we need to process them + // Cast to the non-ref type since TypeScript doesn't understand that we have sibling keywords } - if (schema.deprecated) { + // At this point, either schema doesn't have $ref, or it has $ref with sibling keywords + const schemaWithoutRef = schema as OpenAPI3Schema | OpenAPISchema3_1 | OpenAPISchema3_2; + + if (schemaWithoutRef.deprecated) { directives.push({ name: "deprecated", message: "deprecated" }); } diff --git a/packages/openapi3/src/lib.ts b/packages/openapi3/src/lib.ts index 234d1bee514..d5c29f3179b 100644 --- a/packages/openapi3/src/lib.ts +++ b/packages/openapi3/src/lib.ts @@ -5,11 +5,12 @@ export type OpenAPIVersion = "3.0.0" | "3.1.0" | "3.2.0"; export type ExperimentalParameterExamplesStrategy = "data" | "serialized"; export interface OpenAPI3EmitterOptions { /** - * If the content should be serialized as YAML or JSON. + * If the content should be serialized as YAML or JSON. Can be a single value or an array to emit multiple file types. + * When an array is provided, the `{file-type}` variable can be used in `output-file` to produce distinct filenames. * @default yaml, it not specified infer from the `output-file` extension */ - "file-type"?: FileType; + "file-type"?: FileType | FileType[]; /** * Name of the output file. @@ -18,7 +19,7 @@ export interface OpenAPI3EmitterOptions { * - service-name-if-multiple: Name of the service if multiple * - version: Version of the service if multiple * - * @default `{service-name-if-multiple}.{version}.openapi.yaml` or `.json` if {@link OpenAPI3EmitterOptions["file-type"]} is `"json"` + * @default `{service-name-if-multiple}.{version}.openapi.yaml` or `.json` if {@link OpenAPI3EmitterOptions["file-type"]} is `"json"`. When `file-type` is an array, uses `{file-type}` variable. * * @example Single service no versioning * - `openapi.yaml` @@ -45,7 +46,6 @@ export interface OpenAPI3EmitterOptions { * will be created inside a directory matching each specification version. * * @default ["3.0.0"] - * @internal */ "openapi-versions"?: OpenAPIVersion[]; @@ -130,11 +130,25 @@ const EmitterOptionsSchema: JSONSchemaType = { additionalProperties: false, properties: { "file-type": { - type: "string", - enum: ["yaml", "json"], + type: ["string", "array"], nullable: true, + oneOf: [ + { + type: "string", + enum: ["yaml", "json"], + }, + { + type: "array", + items: { + type: "string", + enum: ["yaml", "json"], + }, + uniqueItems: true, + minItems: 1, + }, + ], description: - "If the content should be serialized as YAML or JSON. Default 'yaml', it not specified infer from the `output-file` extension", + "If the content should be serialized as YAML or JSON. Can be a single value or an array to emit multiple formats. Default 'yaml', if not specified infer from the `output-file` extension", }, "output-file": { type: "string", @@ -145,8 +159,10 @@ const EmitterOptionsSchema: JSONSchemaType = { " - service-name: Name of the service", " - service-name-if-multiple: Name of the service if multiple", " - version: Version of the service if multiple", + " - file-type: The file type being emitted (json or yaml). Useful when `file-type` is an array.", "", ' Default: `{service-name-if-multiple}.{version}.openapi.yaml` or `.json` if `file-type` is `"json"`', + " When `file-type` is an array: `{service-name-if-multiple}.{version}.openapi.{file-type}`", "", " Example Single service no versioning", " - `openapi.yaml`", diff --git a/packages/openapi3/src/openapi.ts b/packages/openapi3/src/openapi.ts index 1356578c378..a4559806325 100644 --- a/packages/openapi3/src/openapi.ts +++ b/packages/openapi3/src/openapi.ts @@ -44,6 +44,7 @@ import { unsafe_MutatorWithNamespace, } from "@typespec/compiler/experimental"; import { $ } from "@typespec/compiler/typekit"; +import { createPerfReporter, perf } from "@typespec/compiler/utils"; import { AuthenticationOptionReference, AuthenticationReference, @@ -116,6 +117,7 @@ import { OpenAPI3Tag, OpenAPI3VersionedServiceRecord, OpenAPISchema3_1, + OpenAPITag3_2, Refable, SupportedOpenAPIDocuments, } from "./types.js"; @@ -145,7 +147,10 @@ export async function $onEmit(context: EmitContext) { const options = resolveOptions(context); for (const specVersion of options.openapiVersions) { const emitter = createOAPIEmitter(context, options, specVersion); - await emitter.emitOpenAPI(); + const { perf } = await emitter.emitOpenAPI(); + for (const [key, duration] of Object.entries(perf)) { + context.perf.report(key, duration); + } } } @@ -170,6 +175,7 @@ export async function getOpenAPI3( emitterOutputDir: "tsp-output", options: options, + perf: createPerfReporter(), }; const resolvedOptions = resolveOptions(context); @@ -200,17 +206,22 @@ export function resolveOptions( ): ResolvedOpenAPI3EmitterOptions { const resolvedOptions = { ...defaultOptions, ...context.options }; - const fileType = - resolvedOptions["file-type"] ?? findFileTypeFromFilename(resolvedOptions["output-file"]); + const rawFileType = resolvedOptions["file-type"]; + const fileTypes: FileType[] = Array.isArray(rawFileType) + ? rawFileType + : [rawFileType ?? findFileTypeFromFilename(resolvedOptions["output-file"])]; const outputFile = - resolvedOptions["output-file"] ?? `openapi.{service-name-if-multiple}.{version}.${fileType}`; + resolvedOptions["output-file"] ?? + (fileTypes.length > 1 + ? `openapi.{service-name-if-multiple}.{version}.{file-type}` + : `openapi.{service-name-if-multiple}.{version}.${fileTypes[0]}`); const openapiVersions = resolvedOptions["openapi-versions"] ?? ["3.0.0"]; const specDir = openapiVersions.length > 1 ? "{openapi-version}" : ""; return { - fileType, + fileTypes, newLine: resolvedOptions["new-line"], omitUnreachableTypes: resolvedOptions["omit-unreachable-types"], includeXTypeSpecName: resolvedOptions["include-x-typespec-name"], @@ -251,7 +262,7 @@ function resolveOperationIdDefaultStrategySeparator(strategy: OperationIdStrateg } export interface ResolvedOpenAPI3EmitterOptions { - fileType: FileType; + fileTypes: FileType[]; outputFile: string; openapiVersions: OpenAPIVersion[]; newLine: NewLine; @@ -300,10 +311,7 @@ function createOAPIEmitter( let paramModels: Set; // De-dupe the per-endpoint tags that will be added into the #/tags - let tags: Set; - - // The per-endpoint tags that will be added into the #/tags - const tagsMetadata: { [name: string]: OpenAPI3Tag } = {}; + let tagsUsedInOperations: Set; const typeNameOptions: TypeNameOptions = { // shorten type names by removing TypeSpec and service namespace @@ -340,7 +348,11 @@ function createOAPIEmitter( } async function emitOpenAPI() { + const computeTimer = perf.startTimer(); + const services = await getOpenAPI(); + const computeTime = computeTimer.end(); + // first, emit diagnostics for (const serviceRecord of services) { if (serviceRecord.versioned) { @@ -353,28 +365,42 @@ function createOAPIEmitter( } if (program.compilerOptions.dryRun || program.hasError()) { - return; + return { perf: { compute: computeTime } }; } const multipleService = services.length > 1; - + const writeTimer = perf.startTimer(); for (const serviceRecord of services) { - if (serviceRecord.versioned) { - for (const documentRecord of serviceRecord.versions) { + for (const fileType of options.fileTypes) { + if (serviceRecord.versioned) { + for (const documentRecord of serviceRecord.versions) { + await emitFile(program, { + path: resolveOutputFile( + serviceRecord.service, + multipleService, + fileType, + documentRecord.version, + ), + content: serializeDocument(documentRecord.document, fileType), + newLine: options.newLine, + }); + } + } else { await emitFile(program, { - path: resolveOutputFile(serviceRecord.service, multipleService, documentRecord.version), - content: serializeDocument(documentRecord.document, options.fileType), + path: resolveOutputFile(serviceRecord.service, multipleService, fileType), + content: serializeDocument(serviceRecord.document, fileType), newLine: options.newLine, }); } - } else { - await emitFile(program, { - path: resolveOutputFile(serviceRecord.service, multipleService), - content: serializeDocument(serviceRecord.document, options.fileType), - newLine: options.newLine, - }); } } + const writeTime = writeTimer.end(); + return { + perf: { + compute: computeTime, + write: writeTime, + }, + }; } function initializeEmitter( @@ -435,16 +461,7 @@ function createOAPIEmitter( params = new Map(); paramModels = new Set(); - tags = new Set(); - - // Get Tags Metadata - const metadata = getTagsMetadata(program, service.type); - if (metadata) { - for (const [name, tag] of Object.entries(metadata)) { - const tagData: OpenAPI3Tag = { name: name, ...tag }; - tagsMetadata[name] = tagData; - } - } + tagsUsedInOperations = new Set(); } function isValidServerVariableType(program: Program, type: Type): boolean { @@ -593,11 +610,17 @@ function createOAPIEmitter( return document; } - function resolveOutputFile(service: Service, multipleService: boolean, version?: string): string { + function resolveOutputFile( + service: Service, + multipleService: boolean, + fileType: FileType, + version?: string, + ): string { return interpolatePath(options.outputFile, { "openapi-version": specVersion, "service-name-if-multiple": multipleService ? getNamespaceFullName(service.type) : undefined, "service-name": getNamespaceFullName(service.type), + "file-type": fileType, version, }); } @@ -739,7 +762,7 @@ function createOAPIEmitter( } emitParameters(); emitSchemas(service.type); - emitTags(); + root.tags = resolveDocumentTags(service); // Clean up empty entries if (root.components) { @@ -837,7 +860,7 @@ function createOAPIEmitter( } for (const tag of opTags) { // Add to root tags if not already there - tags.add(tag); + tagsUsedInOperations.add(tag); } } } @@ -901,7 +924,7 @@ function createOAPIEmitter( oai3Operation.tags = currentTags; for (const tag of currentTags) { // Add to root tags if not already there - tags.add(tag); + tagsUsedInOperations.add(tag); } } @@ -1577,7 +1600,7 @@ function createOAPIEmitter( if (!typeSchema) { return undefined; } - const schema = applyEncoding( + let schema = applyEncoding( program, param, applyIntrinsicDecorators(param, typeSchema), @@ -1585,7 +1608,13 @@ function createOAPIEmitter( ); if (param.defaultValue) { - schema.default = getDefaultValue(program, param.defaultValue, param); + const defaultValue = getDefaultValue(program, param.defaultValue, param); + // In OpenAPI 3.0, $ref cannot have sibling properties. + if ("$ref" in schema && specVersion === "3.0.0") { + schema = { allOf: [{ $ref: schema.$ref }], default: defaultValue }; + } else { + schema.default = defaultValue; + } } // Description is already provided in the parameter itself. delete schema.description; @@ -1775,17 +1804,27 @@ function createOAPIEmitter( } } - function emitTags() { - // emit Tag from op - for (const tag of tags) { - if (!tagsMetadata[tag]) { - root.tags!.push({ name: tag }); + /** Resolve tag information to be inserted at the root of the document */ + function resolveDocumentTags(service: Service): OpenAPI3Tag[] | OpenAPITag3_2[] { + const metadata = getTagsMetadata(program, service.type); + + const tags: OpenAPI3Tag[] | OpenAPITag3_2[] = []; + for (const tag of tagsUsedInOperations) { + if (!metadata?.[tag]) { + tags.push({ name: tag }); } } - for (const key in tagsMetadata) { - root.tags!.push(tagsMetadata[key]); + for (const [name, tag] of Object.entries(metadata || {})) { + const tagData: OpenAPI3Tag = { name: name, ...tag }; + // For OpenAPI 3.0 and 3.1, drop the 'parent' field (only supported in 3.2) + if (specVersion !== "3.2.0" && tag.parent) { + delete (tagData as { parent?: string }).parent; + } + tags.push(tagData); } + + return tags; } function getSchemaForType(type: Type, visibility: Visibility): OpenAPI3Schema | undefined { diff --git a/packages/openapi3/src/types.ts b/packages/openapi3/src/types.ts index ffb907c127e..4b4cc0141a5 100644 --- a/packages/openapi3/src/types.ts +++ b/packages/openapi3/src/types.ts @@ -613,6 +613,11 @@ export type OpenAPI3Schema = Extensions & { */ readOnly?: boolean; + /** + * Property is writeonly. + */ + writeOnly?: boolean; + /** Adds support for polymorphism. The discriminator is an object name that is used to differentiate between other schemas which may satisfy the payload description */ discriminator?: OpenAPI3Discriminator; @@ -1071,6 +1076,11 @@ export type JsonSchema = AdditionalVocab */ readOnly?: boolean; + /** + * Property is writeonly. + */ + writeOnly?: boolean; + /** Adds support for polymorphism. The discriminator is an object name that is used to differentiate between other schemas which may satisfy the payload description */ discriminator?: OpenAPI3Discriminator; diff --git a/packages/openapi3/src/util.ts b/packages/openapi3/src/util.ts index 67cbffefe25..abfcfa76a5c 100644 --- a/packages/openapi3/src/util.ts +++ b/packages/openapi3/src/util.ts @@ -11,10 +11,12 @@ import { serializeValueAsJson, StringLiteral, Type, + UnserializableValueError, Value, } from "@typespec/compiler"; import { HttpOperation, HttpProperty } from "@typespec/http"; import { createDiagnostic, reportDiagnostic } from "./lib.js"; + /** * Checks if two objects are deeply equal. * @@ -156,7 +158,7 @@ export function getDefaultValue( try { return serializeValueAsJson(program, defaultType, modelProperty); } catch (e) { - if (e instanceof Error && e.name === "UnsupportedScalarConstructorError") { + if (e instanceof UnserializableValueError) { reportDiagnostic(program, { code: "default-not-supported", format: { diff --git a/packages/openapi3/src/visibility-usage.ts b/packages/openapi3/src/visibility-usage.ts index b01ed33dedb..2e30d48499b 100644 --- a/packages/openapi3/src/visibility-usage.ts +++ b/packages/openapi3/src/visibility-usage.ts @@ -152,6 +152,16 @@ function addUsagesInOperation( navigateReferencedTypes(httpOperation.parameters.body.type, visibility, (type, vis) => trackUsage(metadataInfo, usages, type, vis), ); + // For multipart bodies, also navigate part types directly. HttpPart wrappers are + // empty models with no properties, so navigateReferencedTypes won't reach T through + // normal property traversal, causing T to be incorrectly treated as unreachable. + if (httpOperation.parameters.body.bodyKind === "multipart") { + for (const part of httpOperation.parameters.body.parts) { + navigateReferencedTypes(part.body.type, visibility, (type, vis) => + trackUsage(metadataInfo, usages, type, vis), + ); + } + } } for (const param of httpOperation.parameters.parameters) { navigateReferencedTypes(param.param, visibility, (type, vis) => diff --git a/packages/openapi3/test/models.test.ts b/packages/openapi3/test/models.test.ts index 7ce314dec71..d88c53d8773 100644 --- a/packages/openapi3/test/models.test.ts +++ b/packages/openapi3/test/models.test.ts @@ -262,7 +262,7 @@ worksFor(supportedVersions, ({ diagnoseOpenApiFor, oapiForModel, openApiFor }) = }); }); - it("scalar used as a default value", async () => { + it("scalar with unknown constructor used as a default value produces no default and no diagnostic", async () => { const res = await oapiForModel( "Pet", ` @@ -272,7 +272,35 @@ worksFor(supportedVersions, ({ diagnoseOpenApiFor, oapiForModel, openApiFor }) = `, ); - expect(res.schemas.Pet.properties.name.default).toEqual("Shorty"); + expect(res.schemas.Pet.properties.name.default).toBeUndefined(); + }); + + it("scalar with no-argument initializer used as a default value does not crash", async () => { + const res = await oapiForModel( + "M", + ` + scalar S { init i(); } + + model M { p: S = S.i(); } + `, + ); + + expect(res.schemas.M.properties.p.default).toBeUndefined(); + }); + + it("known scalar constructors used as default values produce correct defaults", async () => { + const res = await oapiForModel( + "Foo", + ` + model Foo { + int32Prop: int32 = int32(12); + stringProp: string = string("this is the string value"); + } + `, + ); + + expect(res.schemas.Foo.properties.int32Prop.default).toEqual(12); + expect(res.schemas.Foo.properties.stringProp.default).toEqual("this is the string value"); }); it("encode know scalar as a default value", async () => { diff --git a/packages/openapi3/test/multipart.test.ts b/packages/openapi3/test/multipart.test.ts index 1858f48e0f7..b5a53caa25d 100644 --- a/packages/openapi3/test/multipart.test.ts +++ b/packages/openapi3/test/multipart.test.ts @@ -91,6 +91,33 @@ worksFor(supportedVersions, ({ openApiFor }) => { description: "My doc", }); }); + + it("named union with bytes variant does not cause 'Duplicate type name' error", async () => { + const res = await openApiFor( + ` + union BinaryOrJson { + bytes, + { file_id: string }, + } + op upload(@header contentType: "multipart/form-data", @multipartBody body: { attachment: HttpPart }): void; + `, + ); + const op = res.paths["/"].post; + // The union should be referenced as a $ref (not inlined), and should be available in components + expect(op.requestBody.content["multipart/form-data"].schema.properties.attachment.$ref).toEqual( + "#/components/schemas/BinaryOrJson", + ); + const schema = res.components.schemas.BinaryOrJson; + expect(schema).toBeDefined(); + // The schema should use anyOf with 2 variants + expect(schema.anyOf).toHaveLength(2); + // The object variant ({file_id: string}) should appear in the schema regardless of version + expect(schema.anyOf).toContainEqual({ + type: "object", + properties: { file_id: { type: "string" } }, + required: ["file_id"], + }); + }); }); worksFor(["3.0.0"], ({ openApiFor }) => { diff --git a/packages/openapi3/test/output-file.test.ts b/packages/openapi3/test/output-file.test.ts index 90ffd7165d9..38b5530a600 100644 --- a/packages/openapi3/test/output-file.test.ts +++ b/packages/openapi3/test/output-file.test.ts @@ -136,6 +136,61 @@ describe("openapi3: output file", () => { }); }); + describe("multiple file types", () => { + it("emit both json and yaml when file-type is an array", async () => { + await compileOpenAPI({ "file-type": ["json", "yaml"] }); + expectOutput("openapi.json", expectedJsonEmptySpec); + expectOutput("openapi.yaml", expectedYamlEmptySpec); + }); + + it("emit both formats with custom output-file using {file-type}", async () => { + await compileOpenAPI({ + "file-type": ["json", "yaml"], + "output-file": "my.spec.{file-type}", + }); + expectOutput("my.spec.json", expectedJsonEmptySpec); + expectOutput("my.spec.yaml", expectedYamlEmptySpec); + }); + + it("emit both formats for multiple services", async () => { + await compileOpenAPI( + { "file-type": ["json", "yaml"] }, + ` + @service namespace Service1 {} + @service namespace Service2 {} + `, + ); + expectHasOutput("openapi.Service1.json"); + expectHasOutput("openapi.Service2.json"); + expectHasOutput("openapi.Service1.yaml"); + expectHasOutput("openapi.Service2.yaml"); + }); + + it("emit both formats for versioned services", async () => { + await compileOpenAPI( + { "file-type": ["json", "yaml"] }, + ` + using Versioning; + @versioned(Versions) @service namespace Service1 { + enum Versions {v1, v2} + } + `, + ); + expectHasOutput("openapi.v1.json"); + expectHasOutput("openapi.v2.json"); + expectHasOutput("openapi.v1.yaml"); + expectHasOutput("openapi.v2.yaml"); + }); + + it("{file-type} variable works with single file-type string", async () => { + await compileOpenAPI({ + "file-type": "json", + "output-file": "my.spec.{file-type}", + }); + expectOutput("my.spec.json", expectedJsonEmptySpec); + }); + }); + describe("Predefined variable name behavior", () => { interface ServiceNameCase { description: string; diff --git a/packages/openapi3/test/overloads.test.ts b/packages/openapi3/test/overloads.test.ts index 256a1a4d6d6..baad752e6d5 100644 --- a/packages/openapi3/test/overloads.test.ts +++ b/packages/openapi3/test/overloads.test.ts @@ -1,6 +1,7 @@ import { deepStrictEqual, ok, strictEqual } from "assert"; import { beforeEach, describe, it } from "vitest"; import { OpenAPI3Document, OpenAPI3RequestBody } from "../src/types.js"; +import { openApiForVersions } from "./test-host.js"; import { supportedVersions, worksFor } from "./works-for.js"; worksFor(supportedVersions, ({ openApiFor }) => { @@ -128,3 +129,73 @@ worksFor(supportedVersions, ({ openApiFor }) => { `); }); }); + +describe("overloads in versioned namespace", () => { + it("overloads work inside an interface in a versioned namespace", async () => { + const result = await openApiForVersions( + ` + @versioned(Versions) + @service(#{ title: "Widget Service" }) + namespace DemoService; + + enum Versions { + v1, + } + + interface Widgets { + op create(data: string | bytes, @header contentType: "text/plain" | "application/octet-stream"): void; + + @overload(Widgets.create) + op createString(data: string, @header contentType: "text/plain"): void; + + @overload(Widgets.create) + op createBytes(data: bytes, @header contentType: "application/octet-stream"): void; + } + `, + ["v1"], + ); + + ok(result.v1); + const operation = result.v1.paths["/"].post; + ok(operation); + strictEqual(operation.operationId, "Widgets_create"); + deepStrictEqual(Object.keys((operation.requestBody as OpenAPI3RequestBody).content), [ + "text/plain", + "application/octet-stream", + ]); + }); + + it("overloads work in a versioned namespace", async () => { + const result = await openApiForVersions( + ` + @versioned(Versions) + @service(#{ title: "Widget Service" }) + namespace DemoService; + + enum Versions { + v1, + } + + @route("/upload") + op upload(data: string | bytes, @header contentType: "text/plain" | "application/octet-stream"): void; + + @overload(upload) + op uploadString(data: string, @header contentType: "text/plain"): void; + + @overload(upload) + op uploadBytes(data: bytes, @header contentType: "application/octet-stream"): void; + `, + ["v1"], + ); + + ok(result.v1); + strictEqual(Object.keys(result.v1.paths).length, 1); + const operation = result.v1.paths["/upload"].post; + ok(operation); + strictEqual(operation.operationId, "upload"); + deepStrictEqual(Object.keys((operation.requestBody as OpenAPI3RequestBody).content), [ + "text/plain", + "application/octet-stream", + ]); + }); +}); diff --git a/packages/openapi3/test/parameters.test.ts b/packages/openapi3/test/parameters.test.ts index 6a861660dc5..f7ff7e6943c 100644 --- a/packages/openapi3/test/parameters.test.ts +++ b/packages/openapi3/test/parameters.test.ts @@ -4,7 +4,7 @@ import { describe, expect, it } from "vitest"; import { OpenAPI3PathParameter, OpenAPI3QueryParameter } from "../src/types.js"; import { supportedVersions, worksFor } from "./works-for.js"; -worksFor(supportedVersions, ({ diagnoseOpenApiFor, openApiFor }) => { +worksFor(supportedVersions, ({ diagnoseOpenApiFor, openApiFor, version }) => { describe("query parameters", () => { async function getQueryParam(code: string): Promise { const res = await openApiFor(code); @@ -616,4 +616,24 @@ worksFor(supportedVersions, ({ diagnoseOpenApiFor, openApiFor }) => { }); }); }); + + it("parmeter with default value and $ref wraps $ref in allOf in OpenAPI 3.0 only", async () => { + const res = await openApiFor( + ` + enum Example { a, b} + op test(@query example?: Example = Example.b): void; + `, + ); + + const schema = res.paths["/"].get.parameters[0].schema; + if (version === "3.0.0") { + // In OpenAPI 3.0, $ref cannot have sibling properties, so we wrap in allOf + expect(schema.allOf).toEqual([{ $ref: "#/components/schemas/Example" }]); + expect(schema.default).toBe("b"); + } else { + // In OpenAPI 3.1+, $ref can have sibling properties + expect(schema.$ref).toBe("#/components/schemas/Example"); + expect(schema.default).toBe("b"); + } + }); }); diff --git a/packages/openapi3/test/tagmetadata.test.ts b/packages/openapi3/test/tagmetadata.test.ts index 9f2ef92929b..946a0d5a744 100644 --- a/packages/openapi3/test/tagmetadata.test.ts +++ b/packages/openapi3/test/tagmetadata.test.ts @@ -1,8 +1,8 @@ import { deepStrictEqual } from "assert"; -import { it } from "vitest"; -import { supportedVersions, worksFor } from "./works-for.js"; +import { describe, expect, it } from "vitest"; +import { OpenAPISpecHelpers, supportedVersions, worksFor } from "./works-for.js"; -worksFor(supportedVersions, ({ openApiFor }) => { +worksFor(supportedVersions, ({ openApiFor, openapisFor }) => { const testCases: [string, string, string, any][] = [ [ "set tag metadata", @@ -101,4 +101,128 @@ worksFor(supportedVersions, ({ openApiFor }) => { deepStrictEqual(res.tags, expected); }); + + it("tagMetadata do not gets applied to another service without tags", async () => { + const res = await openapisFor(` + @service + @tagMetadata( + "CatTag", #{ description: "Cat operations" } + ) + namespace CatStore {} + + @service + namespace DogStore {} + `); + expect(res["openapi.CatStore.json"].tags).toEqual([ + { + description: "Cat operations", + name: "CatTag", + }, + ]); + expect(res["openapi.DogStore.json"].tags).toEqual([]); + }); + + it("tagMetadata only affect the service they are defined on", async () => { + const res = await openapisFor(` + @service + @tagMetadata( + "CatTag", #{ description: "Cat operations" } + ) + namespace CatStore {} + + @service + @tagMetadata( + "DogTag", #{ description: "Dog operations" } + ) + namespace DogStore {} + `); + expect(res["openapi.CatStore.json"].tags).toEqual([ + { + description: "Cat operations", + name: "CatTag", + }, + ]); + expect(res["openapi.DogStore.json"].tags).toEqual([ + { + description: "Dog operations", + name: "DogTag", + }, + ]); + }); +}); + +// Test for parent field - version specific behavior +describe("tag metadata with parent field", () => { + it("OpenAPI 3.2 should emit parent field as-is", async () => { + const res = await OpenAPISpecHelpers["3.2.0"].openApiFor( + ` + @service + @tagMetadata("ParentTag", #{description: "Parent tag"}) + @tagMetadata("ChildTag", #{description: "Child tag", parent: "ParentTag"}) + namespace PetStore { + @tag("ChildTag") op test(): string; + } + `, + ); + + deepStrictEqual(res.tags, [ + { + name: "ChildTag", + description: "Child tag", + parent: "ParentTag", + }, + { + name: "ParentTag", + description: "Parent tag", + }, + ]); + }); + + it("OpenAPI 3.1 should drop parent field", async () => { + const res = await OpenAPISpecHelpers["3.1.0"].openApiFor( + ` + @service + @tagMetadata("ParentTag", #{description: "Parent tag"}) + @tagMetadata("ChildTag", #{description: "Child tag", parent: "ParentTag"}) + namespace PetStore { + @tag("ChildTag") op test(): string; + } + `, + ); + + deepStrictEqual(res.tags, [ + { + name: "ChildTag", + description: "Child tag", + }, + { + name: "ParentTag", + description: "Parent tag", + }, + ]); + }); + + it("OpenAPI 3.0 should drop parent field", async () => { + const res = await OpenAPISpecHelpers["3.0.0"].openApiFor( + ` + @service + @tagMetadata("ParentTag", #{description: "Parent tag"}) + @tagMetadata("ChildTag", #{description: "Child tag", parent: "ParentTag"}) + namespace PetStore { + @tag("ChildTag") op test(): string; + } + `, + ); + + deepStrictEqual(res.tags, [ + { + name: "ChildTag", + description: "Child tag", + }, + { + name: "ParentTag", + description: "Parent tag", + }, + ]); + }); }); diff --git a/packages/openapi3/test/test-host.ts b/packages/openapi3/test/test-host.ts index 5b5a6c306e3..2a3dde4136c 100644 --- a/packages/openapi3/test/test-host.ts +++ b/packages/openapi3/test/test-host.ts @@ -78,6 +78,37 @@ export async function openApiFor(code: string, options: OpenAPI3EmitterOptions = return JSON.parse(outputs["openapi.json"]); } +/** + * Emit multiple openapi documents from the given tsp code. + * @example + * + * ```ts + * const result = await openapisFor(` + * @service namespace MyServiceV1 {} + * @service namespace MyServiceV2 {} + * `) + * + * results => { + * "openapi.MyServiceV1.json": { ... }, + * "openapi.MyServiceV2.json": { ... }, + * } + * ``` + */ +export async function openapisFor( + code: string, + options: OpenAPI3EmitterOptions = {}, +): Promise> { + const { outputs } = await SimpleTester.compile(code, { + compilerOptions: { + options: { "@typespec/openapi3": { ...options, "file-type": "json" } }, + }, + }); + + return Object.fromEntries( + Object.entries(outputs).map(([k, v]) => [k, JSON.parse(v) as OpenAPI3Document]), + ); +} + export async function openApiForVersions( code: string, versions: T[], diff --git a/packages/openapi3/test/tsp-openapi3/anyof-ref-and-object.test.ts b/packages/openapi3/test/tsp-openapi3/anyof-ref-and-object.test.ts new file mode 100644 index 00000000000..a144bd0a064 --- /dev/null +++ b/packages/openapi3/test/tsp-openapi3/anyof-ref-and-object.test.ts @@ -0,0 +1,94 @@ +import { dereference } from "@scalar/openapi-parser"; +import { OpenAPI } from "@scalar/openapi-types"; +import { beforeAll, describe, expect, it } from "vitest"; +import { generateDataType } from "../../src/cli/actions/convert/generators/generate-model.js"; +import { TypeSpecDataTypes, TypeSpecUnion } from "../../src/cli/actions/convert/interfaces.js"; +import { transformComponentSchemas } from "../../src/cli/actions/convert/transforms/transform-component-schemas.js"; +import { createContext } from "../../src/cli/actions/convert/utils/context.js"; +import { OpenAPI3Document } from "../../src/types.js"; + +describe("tsp-openapi: anyOf with $ref and inline object should produce union", () => { + let doc: OpenAPI.Document<{}>; + + beforeAll(async () => { + const { specification } = await dereference({ + openapi: "3.1.0", + info: { title: "Test", version: "1.0.0" }, + paths: {}, + components: { + schemas: { + VoiceIdsOrCustomVoice: { + title: "Voice", + description: "A built-in voice name or a custom voice reference.", + anyOf: [ + { $ref: "#/components/schemas/VoiceIdsShared" }, + { + type: "object", + description: "Custom voice reference.", + additionalProperties: false, + required: ["id"], + properties: { + id: { type: "string" }, + }, + }, + ], + }, + VoiceIdsShared: { + anyOf: [ + { type: "string" }, + { + type: "string", + enum: ["alloy", "ash", "ballad", "coral", "echo", "sage"], + }, + ], + }, + }, + }, + }); + if (!specification) { + throw new Error("Failed to dereference OpenAPI document"); + } + doc = specification; + }); + + it("should generate a union (not a model) for anyOf with $ref and inline object", () => { + const context = createContext(doc as OpenAPI3Document); + const types: TypeSpecDataTypes[] = []; + transformComponentSchemas(context, types); + + const type = types.find((t) => t.name === "VoiceIdsOrCustomVoice"); + expect(type).toBeDefined(); + expect(type!.kind).toBe("union"); + }); + + it("should generate TypeSpec union code containing both the ref and the inline object", () => { + const context = createContext(doc as OpenAPI3Document); + const types: TypeSpecDataTypes[] = []; + transformComponentSchemas(context, types); + + const union = types.find( + (t) => t.name === "VoiceIdsOrCustomVoice" && t.kind === "union", + ) as TypeSpecUnion; + expect(union).toBeDefined(); + + const generatedCode = generateDataType(union, context); + + // Should be a union, not a model + expect(generatedCode).toContain("union VoiceIdsOrCustomVoice"); + expect(generatedCode).not.toContain("model VoiceIdsOrCustomVoice"); + // Should reference the VoiceIdsShared type + expect(generatedCode).toContain("VoiceIdsShared"); + }); + + it("should preserve description from parent schema on the union", () => { + const context = createContext(doc as OpenAPI3Document); + const types: TypeSpecDataTypes[] = []; + transformComponentSchemas(context, types); + + const union = types.find( + (t) => t.name === "VoiceIdsOrCustomVoice" && t.kind === "union", + ) as TypeSpecUnion; + expect(union).toBeDefined(); + expect(union.doc).toContain("A built-in voice name or a custom voice reference."); + }); +}); diff --git a/packages/openapi3/test/tsp-openapi3/continuation-token-integration.test.ts b/packages/openapi3/test/tsp-openapi3/continuation-token-integration.test.ts new file mode 100644 index 00000000000..eed4713af52 --- /dev/null +++ b/packages/openapi3/test/tsp-openapi3/continuation-token-integration.test.ts @@ -0,0 +1,106 @@ +import { describe, expect, it } from "vitest"; +import { renderTypeSpecForOpenAPI3 } from "./utils/tsp-for-openapi3.js"; + +describe("x-ms-list-continuation-token integration test (from issue)", () => { + it("generates correct TypeSpec for the complete Widget Service example from the issue", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + paths: { + "/widgets": { + get: { + operationId: "Widgets_list", + description: "List widgets", + parameters: [], + responses: { + "200": { + description: "The request has succeeded.", + content: { + "application/json": { + schema: { + $ref: "#/components/schemas/WidgetList", + }, + }, + }, + }, + }, + tags: ["Widgets"], + }, + }, + }, + schemas: { + Widget: { + type: "object", + required: ["id", "weight", "color"], + properties: { + id: { + type: "string", + readOnly: true, + }, + weight: { + type: "integer", + format: "int32", + }, + color: { + type: "string", + enum: ["red", "blue"], + }, + }, + }, + WidgetList: { + type: "object", + required: ["value", "continuationToken"], + properties: { + value: { + type: "array", + items: { + $ref: "#/components/schemas/Widget", + }, + }, + continuationToken: { + type: "string", + "x-ms-list-continuation-token": true, + } as any, + }, + }, + Error: { + type: "object", + required: ["code", "message"], + properties: { + code: { + type: "integer", + format: "int32", + }, + message: { + type: "string", + }, + }, + }, + }, + tags: [{ name: "Widgets" }], + }); + + // Verify the required imports are present + expect(tsp).toContain('import "@typespec/http"'); + expect(tsp).toContain('import "@typespec/openapi"'); + + // Verify the using statements are present + expect(tsp).toContain("using Http;"); + expect(tsp).toContain("using OpenAPI;"); + + // Verify the @extension decorator is present + expect(tsp).toContain('@extension("x-ms-list-continuation-token", true)'); + + // Verify the @continuationToken decorator is present + expect(tsp).toContain("@continuationToken"); + + // Verify both decorators are on the continuationToken property + // The property should have both decorators + expect(tsp).toMatch( + /@extension\("x-ms-list-continuation-token", true\)\s+@continuationToken\s+continuationToken/, + ); + + // Verify the WidgetList model structure + expect(tsp).toContain("model WidgetList {"); + expect(tsp).toContain("value: Widget[];"); + expect(tsp).toContain("continuationToken: string;"); + }); +}); diff --git a/packages/openapi3/test/tsp-openapi3/continuation-token.test.ts b/packages/openapi3/test/tsp-openapi3/continuation-token.test.ts new file mode 100644 index 00000000000..09995051e4e --- /dev/null +++ b/packages/openapi3/test/tsp-openapi3/continuation-token.test.ts @@ -0,0 +1,411 @@ +import { assert, describe, expect, it } from "vitest"; +import { expectDecorators } from "./utils/expect.js"; +import { renderTypeSpecForOpenAPI3, tspForOpenAPI3 } from "./utils/tsp-for-openapi3.js"; + +describe("x-ms-list-continuation-token extension on model properties", () => { + it("adds @continuationToken decorator when extension is true", async () => { + const serviceNamespace = await tspForOpenAPI3({ + schemas: { + WidgetList: { + type: "object", + required: ["value", "continuationToken"], + properties: { + value: { + type: "array", + items: { + type: "string", + }, + }, + continuationToken: { + type: "string", + "x-ms-list-continuation-token": true, + } as any, + }, + }, + }, + }); + + const models = serviceNamespace.models; + const widgetList = models.get("WidgetList"); + expect(widgetList).toBeDefined(); + + const continuationTokenProp = widgetList!.properties.get("continuationToken"); + expect(continuationTokenProp).toBeDefined(); + + // Should have both @extension and @continuationToken decorators + const decorators = Array.from(continuationTokenProp!.decorators); + expect(decorators).toHaveLength(2); + + // Check for @extension decorator + const extensionDecorator = decorators.find((d) => d.definition?.name === "@extension"); + expect(extensionDecorator).toBeDefined(); + expectDecorators([extensionDecorator!], { + name: "extension", + args: ["x-ms-list-continuation-token", true], + }); + + // Check for @continuationToken decorator + const continuationTokenDecorator = decorators.find( + (d) => d.definition?.name === "@continuationToken", + ); + expect(continuationTokenDecorator).toBeDefined(); + expectDecorators([continuationTokenDecorator!], { name: "continuationToken", args: [] }); + }); + + it("does not add @continuationToken decorator when extension is false", async () => { + const serviceNamespace = await tspForOpenAPI3({ + schemas: { + WidgetList: { + type: "object", + required: ["value", "continuationToken"], + properties: { + value: { + type: "array", + items: { + type: "string", + }, + }, + continuationToken: { + type: "string", + "x-ms-list-continuation-token": false, + } as any, + }, + }, + }, + }); + + const models = serviceNamespace.models; + const widgetList = models.get("WidgetList"); + expect(widgetList).toBeDefined(); + + const continuationTokenProp = widgetList!.properties.get("continuationToken"); + expect(continuationTokenProp).toBeDefined(); + + // Should only have @extension decorator, not @continuationToken + expectDecorators(continuationTokenProp!.decorators, [ + { name: "extension", args: ["x-ms-list-continuation-token", false] }, + ]); + }); + + it("does not add @continuationToken decorator when extension is missing", async () => { + const serviceNamespace = await tspForOpenAPI3({ + schemas: { + WidgetList: { + type: "object", + required: ["value", "continuationToken"], + properties: { + value: { + type: "array", + items: { + type: "string", + }, + }, + continuationToken: { + type: "string", + }, + }, + }, + }, + }); + + const models = serviceNamespace.models; + const widgetList = models.get("WidgetList"); + expect(widgetList).toBeDefined(); + + const continuationTokenProp = widgetList!.properties.get("continuationToken"); + expect(continuationTokenProp).toBeDefined(); + + // Should have no decorators related to paging + const decorators = Array.from(continuationTokenProp!.decorators); + const hasContinuationToken = decorators.some((d) => d.decorator.name === "continuationToken"); + expect(hasContinuationToken).toBe(false); + }); + + it("generates correct TypeSpec output with @continuationToken decorator", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + schemas: { + Widget: { + type: "object", + required: ["id", "name"], + properties: { + id: { + type: "string", + }, + name: { + type: "string", + }, + }, + }, + WidgetList: { + type: "object", + required: ["value", "continuationToken"], + properties: { + value: { + type: "array", + items: { + $ref: "#/components/schemas/Widget", + }, + }, + continuationToken: { + type: "string", + "x-ms-list-continuation-token": true, + } as any, + }, + }, + }, + }); + + // Should import @typespec/openapi (which is already imported in all conversions) + expect(tsp).toContain('import "@typespec/openapi"'); + + // Should have using OpenAPI (which is already in all conversions) + expect(tsp).toContain("using OpenAPI"); + + // Should have the @extension decorator + expect(tsp).toContain('@extension("x-ms-list-continuation-token", true)'); + + // Should have the @continuationToken decorator + expect(tsp).toContain("@continuationToken"); + + // The property should have both decorators on the same line or adjacent lines + expect(tsp).toMatch( + /@extension\("x-ms-list-continuation-token", true\)\s+@continuationToken\s+continuationToken/, + ); + }); + + it("handles nested models with continuation token", async () => { + const serviceNamespace = await tspForOpenAPI3({ + schemas: { + PagedResponse: { + type: "object", + required: ["items", "nextToken"], + properties: { + items: { + type: "array", + items: { + type: "string", + }, + }, + nextToken: { + type: "string", + "x-ms-list-continuation-token": true, + } as any, + }, + }, + }, + }); + + const models = serviceNamespace.models; + const pagedResponse = models.get("PagedResponse"); + expect(pagedResponse).toBeDefined(); + + const nextTokenProp = pagedResponse!.properties.get("nextToken"); + expect(nextTokenProp).toBeDefined(); + + // Should have both decorators + const decorators = Array.from(nextTokenProp!.decorators); + expect(decorators).toHaveLength(2); + + // Check for @extension decorator + const extensionDecorator = decorators.find((d) => d.definition?.name === "@extension"); + expect(extensionDecorator).toBeDefined(); + expectDecorators([extensionDecorator!], { + name: "extension", + args: ["x-ms-list-continuation-token", true], + }); + + // Check for @continuationToken decorator + const continuationTokenDecorator = decorators.find( + (d) => d.definition?.name === "@continuationToken", + ); + expect(continuationTokenDecorator).toBeDefined(); + expectDecorators([continuationTokenDecorator!], { name: "continuationToken", args: [] }); + }); +}); + +describe("x-ms-list-continuation-token extension on query parameters", () => { + it("adds @continuationToken decorator to query parameter when extension is true", async () => { + const serviceNamespace = await tspForOpenAPI3({ + parameters: { + ContinuationToken: { + name: "continuationToken", + in: "query", + required: false, + schema: { + type: "string", + "x-ms-list-continuation-token": true, + } as any, + }, + }, + }); + + const parametersNamespace = serviceNamespace.namespaces.get("Parameters"); + assert(parametersNamespace, "Parameters namespace not found"); + + const models = parametersNamespace.models; + const continuationTokenParam = models.get("ContinuationToken"); + expect(continuationTokenParam).toBeDefined(); + + const continuationTokenProp = continuationTokenParam!.properties.get("continuationToken"); + expect(continuationTokenProp).toBeDefined(); + + // Should have both @extension and @continuationToken decorators + const decorators = Array.from(continuationTokenProp!.decorators); + expect(decorators.length).toBeGreaterThanOrEqual(2); + + // Check for @extension decorator + const extensionDecorator = decorators.find((d) => d.definition?.name === "@extension"); + expect(extensionDecorator).toBeDefined(); + expectDecorators([extensionDecorator!], { + name: "extension", + args: ["x-ms-list-continuation-token", true], + }); + + // Check for @continuationToken decorator + const continuationTokenDecorator = decorators.find( + (d) => d.definition?.name === "@continuationToken", + ); + expect(continuationTokenDecorator).toBeDefined(); + expectDecorators([continuationTokenDecorator!], { name: "continuationToken", args: [] }); + }); + + it("does not add @continuationToken decorator to query parameter when extension is false", async () => { + const serviceNamespace = await tspForOpenAPI3({ + parameters: { + ContinuationToken: { + name: "continuationToken", + in: "query", + required: false, + schema: { + type: "string", + "x-ms-list-continuation-token": false, + } as any, + }, + }, + }); + + const parametersNamespace = serviceNamespace.namespaces.get("Parameters"); + assert(parametersNamespace, "Parameters namespace not found"); + + const models = parametersNamespace.models; + const continuationTokenParam = models.get("ContinuationToken"); + expect(continuationTokenParam).toBeDefined(); + + const continuationTokenProp = continuationTokenParam!.properties.get("continuationToken"); + expect(continuationTokenProp).toBeDefined(); + + // Should only have @extension decorator, not @continuationToken + const decorators = Array.from(continuationTokenProp!.decorators); + const hasContinuationToken = decorators.some( + (d) => d.definition?.name === "@continuationToken", + ); + expect(hasContinuationToken).toBe(false); + }); + + it("generates correct TypeSpec output with @continuationToken on query parameter", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + paths: { + "/items": { + get: { + operationId: "listItems", + parameters: [ + { + name: "continuationToken", + in: "query", + required: false, + schema: { + type: "string", + "x-ms-list-continuation-token": true, + } as any, + }, + ], + responses: { + "200": { + description: "Success", + content: { + "application/json": { + schema: { + type: "array", + items: { + type: "string", + }, + }, + }, + }, + }, + }, + }, + }, + }, + }); + + // Should have the @extension decorator on the parameter + expect(tsp).toContain('@extension("x-ms-list-continuation-token", true)'); + + // Should have the @continuationToken decorator + expect(tsp).toContain("@continuationToken"); + + // The parameter should be in a query position + expect(tsp).toContain("@query"); + }); + + it("adds @continuationToken decorator when extension is on parameter itself (not schema)", async () => { + const serviceNamespace = await tspForOpenAPI3({ + paths: { + "/items": { + get: { + operationId: "listItems", + parameters: [ + { + name: "continuationToken", + in: "query", + required: false, + "x-ms-list-continuation-token": true, + schema: { + type: "string", + }, + } as any, + ], + responses: { + "200": { + description: "Success", + content: { + "application/json": { + schema: { + type: "array", + items: { + type: "string", + }, + }, + }, + }, + }, + }, + }, + }, + }, + }); + + const operations = serviceNamespace.operations; + const listItems = operations.get("listItems"); + expect(listItems).toBeDefined(); + + const parameters = listItems!.parameters; + const continuationTokenParam = parameters.properties.get("continuationToken"); + expect(continuationTokenParam).toBeDefined(); + + // Should have both @extension and @continuationToken decorators + const decorators = Array.from(continuationTokenParam!.decorators); + expect(decorators.length).toBeGreaterThanOrEqual(2); + + // Check for @extension decorator + const extensionDecorator = decorators.find((d) => d.definition?.name === "@extension"); + expect(extensionDecorator).toBeDefined(); + + // Check for @continuationToken decorator + const continuationTokenDecorator = decorators.find( + (d) => d.definition?.name === "@continuationToken", + ); + expect(continuationTokenDecorator).toBeDefined(); + }); +}); diff --git a/packages/openapi3/test/tsp-openapi3/convert-openapi3-doc.test.ts b/packages/openapi3/test/tsp-openapi3/convert-openapi3-doc.test.ts index fd08b2e2ba8..cb132c9725b 100644 --- a/packages/openapi3/test/tsp-openapi3/convert-openapi3-doc.test.ts +++ b/packages/openapi3/test/tsp-openapi3/convert-openapi3-doc.test.ts @@ -327,6 +327,55 @@ describe.each(versions)("convertOpenAPI3Document v%s", (version) => { }); }); + it("should preserve array constraints (minItems/maxItems) on nullable array using anyOf", async () => { + const tsp = await convertOpenAPI3Document({ + openapi: version, + info: { + title: "(title)", + version: "0.0.0", + }, + tags: [], + paths: {}, + components: { + schemas: { + Foo: { + type: "object", + required: ["bar"], + properties: { + bar: { + anyOf: [ + { + type: "array", + items: { type: "string" }, + }, + { type: "null" as any }, + ], + minItems: 2, + maxItems: 10, + }, + }, + }, + }, + }, + } as any); + + strictEqual( + tsp.includes("@minItems(2)"), + true, + "Expected '@minItems(2)' decorator but got: " + tsp, + ); + strictEqual( + tsp.includes("@maxItems(10)"), + true, + "Expected '@maxItems(10)' decorator but got: " + tsp, + ); + strictEqual( + tsp.includes("bar: string[] | null"), + true, + "Expected 'bar: string[] | null' but got: " + tsp, + ); + }); + if (version !== "3.0.0") { describe("OpenAPI 3.1 anyOf with null conversion", () => { it("should convert anyOf with ref + null to proper union with null", async () => { diff --git a/packages/openapi3/test/tsp-openapi3/page-items.test.ts b/packages/openapi3/test/tsp-openapi3/page-items.test.ts new file mode 100644 index 00000000000..b00c7f40857 --- /dev/null +++ b/packages/openapi3/test/tsp-openapi3/page-items.test.ts @@ -0,0 +1,158 @@ +import { Model } from "@typespec/compiler"; +import { describe, expect, it } from "vitest"; +import { expectDecorators } from "./utils/expect.js"; +import { compileForOpenAPI3, renderTypeSpecForOpenAPI3 } from "./utils/tsp-for-openapi3.js"; + +describe("converts x-ms-list-page-items extension to @pageItems decorator", () => { + it("adds @pageItems decorator when x-ms-list-page-items is true", async () => { + const { namespace: serviceNamespace } = await compileForOpenAPI3({ + schemas: { + Widget: { + type: "object", + properties: { + id: { type: "string" }, + name: { type: "string" }, + }, + required: ["id", "name"], + }, + WidgetList: { + type: "object", + properties: { + value: { + type: "array", + items: { $ref: "#/components/schemas/Widget" }, + "x-ms-list-page-items": true, + }, + }, + required: ["value"], + }, + }, + }); + + const models = serviceNamespace.models; + const widgetList = models.get("WidgetList") as Model; + expect(widgetList).toBeDefined(); + + const valueProperty = widgetList?.properties.get("value"); + expect(valueProperty).toBeDefined(); + + // Check that both decorators are present + expectDecorators( + valueProperty!.decorators, + [ + { name: "extension", args: ["x-ms-list-page-items", true] }, + { name: "pageItems", args: [] }, + ], + { strict: false }, + ); + }); + + it("does not add @pageItems when x-ms-list-page-items is false", async () => { + const { namespace: serviceNamespace } = await compileForOpenAPI3({ + schemas: { + Widget: { + type: "object", + properties: { + id: { type: "string" }, + }, + required: ["id"], + }, + WidgetList: { + type: "object", + properties: { + value: { + type: "array", + items: { $ref: "#/components/schemas/Widget" }, + "x-ms-list-page-items": false, + }, + }, + required: ["value"], + }, + }, + }); + + const models = serviceNamespace.models; + const widgetList = models.get("WidgetList") as Model; + expect(widgetList).toBeDefined(); + + const valueProperty = widgetList?.properties.get("value"); + expect(valueProperty).toBeDefined(); + + // Check that @pageItems decorator is NOT present, but extension is + const hasPageItems = valueProperty!.decorators.some((d) => d.definition?.name === "@pageItems"); + expect(hasPageItems).toBe(false); + + // Extension decorator should still be present since it's false + expectDecorators(valueProperty!.decorators, [ + { name: "extension", args: ["x-ms-list-page-items", false] }, + ]); + }); + + it("does not add @pageItems when x-ms-list-page-items is not present", async () => { + const { namespace: serviceNamespace } = await compileForOpenAPI3({ + schemas: { + Widget: { + type: "object", + properties: { + id: { type: "string" }, + }, + required: ["id"], + }, + WidgetList: { + type: "object", + properties: { + value: { + type: "array", + items: { $ref: "#/components/schemas/Widget" }, + }, + }, + required: ["value"], + }, + }, + }); + + const models = serviceNamespace.models; + const widgetList = models.get("WidgetList") as Model; + expect(widgetList).toBeDefined(); + + const valueProperty = widgetList?.properties.get("value"); + expect(valueProperty).toBeDefined(); + + // Check that @pageItems decorator is NOT present + const hasPageItems = valueProperty!.decorators.some((d) => d.definition?.name === "@pageItems"); + expect(hasPageItems).toBe(false); + + // Extension decorator should also NOT be present + const hasExtension = valueProperty!.decorators.some((d) => d.definition?.name === "@extension"); + expect(hasExtension).toBe(false); + }); + + it("renders @pageItems decorator in generated TypeSpec code", async () => { + const code = await renderTypeSpecForOpenAPI3({ + schemas: { + Widget: { + type: "object", + properties: { + id: { type: "string" }, + }, + required: ["id"], + }, + WidgetList: { + type: "object", + properties: { + value: { + type: "array", + items: { $ref: "#/components/schemas/Widget" }, + "x-ms-list-page-items": true, + }, + }, + required: ["value"], + }, + }, + }); + + // Check that the generated code includes both decorators + expect(code).toContain('@extension("x-ms-list-page-items", true)'); + expect(code).toContain("@pageItems"); + }); +}); diff --git a/packages/openapi3/test/tsp-openapi3/paging-links.test.ts b/packages/openapi3/test/tsp-openapi3/paging-links.test.ts new file mode 100644 index 00000000000..34815d9ed69 --- /dev/null +++ b/packages/openapi3/test/tsp-openapi3/paging-links.test.ts @@ -0,0 +1,214 @@ +import { describe, expect, it } from "vitest"; +import { expectDecorators } from "./utils/expect.js"; +import { renderTypeSpecForOpenAPI3, tspForOpenAPI3 } from "./utils/tsp-for-openapi3.js"; + +describe("converts paging link extensions", () => { + it("handles x-ms-list-prev-link extension", async () => { + const serviceNamespace = await tspForOpenAPI3({ + schemas: { + WidgetList: { + type: "object", + required: ["value", "prevLink"], + properties: { + value: { + type: "array", + items: { + type: "string", + }, + }, + prevLink: { + type: "string", + "x-ms-list-prev-link": true, + }, + }, + }, + }, + }); + + const widgetList = serviceNamespace.models.get("WidgetList"); + expect(widgetList).toBeDefined(); + + const prevLinkProp = widgetList?.properties.get("prevLink"); + expect(prevLinkProp).toBeDefined(); + + // Should have both @extension and @prevLink decorators + // Note: TypeSpec compiler may reorder decorators during parsing + expectDecorators(prevLinkProp!.decorators, [ + { name: "prevLink", args: [] }, + { name: "extension", args: ["x-ms-list-prev-link", true] }, + ]); + }); + + it("handles x-ms-list-next-link extension", async () => { + const serviceNamespace = await tspForOpenAPI3({ + schemas: { + WidgetList: { + type: "object", + required: ["value", "nextLink"], + properties: { + value: { + type: "array", + items: { + type: "string", + }, + }, + nextLink: { + type: "string", + "x-ms-list-next-link": true, + }, + }, + }, + }, + }); + + const widgetList = serviceNamespace.models.get("WidgetList"); + expect(widgetList).toBeDefined(); + + const nextLinkProp = widgetList?.properties.get("nextLink"); + expect(nextLinkProp).toBeDefined(); + + // Should have both @extension and @nextLink decorators + // Note: TypeSpec compiler may reorder decorators during parsing + expectDecorators(nextLinkProp!.decorators, [ + { name: "nextLink", args: [] }, + { name: "extension", args: ["x-ms-list-next-link", true] }, + ]); + }); + + it("handles x-ms-list-first-link extension", async () => { + const serviceNamespace = await tspForOpenAPI3({ + schemas: { + WidgetList: { + type: "object", + required: ["value", "firstLink"], + properties: { + value: { + type: "array", + items: { + type: "string", + }, + }, + firstLink: { + type: "string", + "x-ms-list-first-link": true, + }, + }, + }, + }, + }); + + const widgetList = serviceNamespace.models.get("WidgetList"); + expect(widgetList).toBeDefined(); + + const firstLinkProp = widgetList?.properties.get("firstLink"); + expect(firstLinkProp).toBeDefined(); + + // Should have both @extension and @firstLink decorators + // Note: TypeSpec compiler may reorder decorators during parsing + expectDecorators(firstLinkProp!.decorators, [ + { name: "firstLink", args: [] }, + { name: "extension", args: ["x-ms-list-first-link", true] }, + ]); + }); + + it("handles x-ms-list-last-link extension", async () => { + const serviceNamespace = await tspForOpenAPI3({ + schemas: { + WidgetList: { + type: "object", + required: ["value", "lastLink"], + properties: { + value: { + type: "array", + items: { + type: "string", + }, + }, + lastLink: { + type: "string", + "x-ms-list-last-link": true, + }, + }, + }, + }, + }); + + const widgetList = serviceNamespace.models.get("WidgetList"); + expect(widgetList).toBeDefined(); + + const lastLinkProp = widgetList?.properties.get("lastLink"); + expect(lastLinkProp).toBeDefined(); + + // Should have both @extension and @lastLink decorators + // Note: TypeSpec compiler may reorder decorators during parsing + expectDecorators(lastLinkProp!.decorators, [ + { name: "lastLink", args: [] }, + { name: "extension", args: ["x-ms-list-last-link", true] }, + ]); + }); + + it("only adds link decorator when extension value is true", async () => { + const serviceNamespace = await tspForOpenAPI3({ + schemas: { + WidgetList: { + type: "object", + required: ["value", "prevLink"], + properties: { + value: { + type: "array", + items: { + type: "string", + }, + }, + prevLink: { + type: "string", + "x-ms-list-prev-link": false, + }, + }, + }, + }, + }); + + const widgetList = serviceNamespace.models.get("WidgetList"); + expect(widgetList).toBeDefined(); + + const prevLinkProp = widgetList?.properties.get("prevLink"); + expect(prevLinkProp).toBeDefined(); + + // Should only have @extension decorator, not @prevLink + expectDecorators(prevLinkProp!.decorators, [ + { name: "extension", args: ["x-ms-list-prev-link", false] }, + ]); + }); + + it("renders TypeSpec with correct imports for prevLink", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + schemas: { + WidgetList: { + type: "object", + required: ["value", "prevLink"], + properties: { + value: { + type: "array", + items: { + type: "string", + }, + }, + prevLink: { + type: "string", + "x-ms-list-prev-link": true, + }, + }, + }, + }, + }); + + // Should import @typespec/openapi + expect(tsp).toContain('import "@typespec/openapi";'); + // Should have using OpenAPI + expect(tsp).toContain("using OpenAPI;"); + // Should have both decorators + expect(tsp).toContain('@extension("x-ms-list-prev-link", true)'); + expect(tsp).toContain("@prevLink"); + }); +}); diff --git a/packages/openapi3/test/tsp-openapi3/parameters.test.ts b/packages/openapi3/test/tsp-openapi3/parameters.test.ts index 5fb78660bb7..4ccb202935e 100644 --- a/packages/openapi3/test/tsp-openapi3/parameters.test.ts +++ b/packages/openapi3/test/tsp-openapi3/parameters.test.ts @@ -7,6 +7,7 @@ import { compileForOpenAPI3, renderTypeSpecForOpenAPI3, tspForOpenAPI3, + validateTsp, } from "./utils/tsp-for-openapi3.js"; describe("converts top-level parameters", () => { @@ -579,4 +580,301 @@ describe("query", () => { expectDecorators(fooProperty.decorators, []); }); }); + + describe("x-ms-list-page-index extension", () => { + it("adds @pageIndex decorator when x-ms-list-page-index is true", async () => { + const { namespace: serviceNamespace } = await compileForOpenAPI3({ + parameters: { + PageIndex: { + name: "idx", + in: "query", + required: true, + schema: { + type: "integer", + format: "int32", + }, + "x-ms-list-page-index": true, + } as any, + }, + }); + + const parametersNamespace = serviceNamespace.namespaces.get("Parameters"); + assert(parametersNamespace, "Parameters namespace not found"); + + const models = parametersNamespace.models; + + /* model PageIndex { @query @extension("x-ms-list-page-index", true) @pageIndex idx: int32 } */ + const PageIndex = models.get("PageIndex"); + assert(PageIndex, "PageIndex model not found"); + expect(PageIndex.properties.size).toBe(1); + const idx = PageIndex.properties.get("idx"); + assert(idx, "idx property not found"); + expectDecorators( + idx.decorators, + [ + { name: "extension", args: ["x-ms-list-page-index", true] }, + { name: "pageIndex" }, + { name: "query" }, + ], + { strict: false }, + ); + }); + + it("renders correctly in TypeSpec output", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + paths: { + "/widgets": { + get: { + operationId: "Widgets_list", + parameters: [ + { + name: "idx", + in: "query", + required: true, + schema: { + type: "integer", + format: "int32", + }, + "x-ms-list-page-index": true, + explode: false, + } as any, + ], + responses: { + "200": { + description: "The request has succeeded.", + content: { + "application/json": { + schema: { + type: "array", + items: { + type: "object", + properties: { + id: { type: "string" }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }); + + expect(tsp).toContain('@extension("x-ms-list-page-index", true)'); + expect(tsp).toContain("@pageIndex"); + expect(tsp).toContain("idx: int32"); + expect(tsp).toContain("@query"); + await validateTsp(tsp); + }); + + it("does not add @pageIndex when x-ms-list-page-index is false", async () => { + const { namespace: serviceNamespace } = await compileForOpenAPI3({ + parameters: { + NotPageIndex: { + name: "idx", + in: "query", + required: true, + schema: { + type: "integer", + format: "int32", + }, + "x-ms-list-page-index": false, + } as any, + }, + }); + + const parametersNamespace = serviceNamespace.namespaces.get("Parameters"); + assert(parametersNamespace, "Parameters namespace not found"); + + const NotPageIndex = parametersNamespace.models.get("NotPageIndex"); + assert(NotPageIndex, "NotPageIndex model not found"); + const idx = NotPageIndex.properties.get("idx"); + assert(idx, "idx property not found"); + + // Should have extension decorator but not pageIndex + const decoratorNames = Array.from(idx.decorators).map((d) => d.definition?.name); + expect(decoratorNames).not.toContain("@pageIndex"); + expect(decoratorNames).toContain("@query"); + }); + + it("does not add @pageIndex when x-ms-list-page-index is missing", async () => { + const { namespace: serviceNamespace } = await compileForOpenAPI3({ + parameters: { + NoExtension: { + name: "idx", + in: "query", + required: true, + schema: { + type: "integer", + format: "int32", + }, + }, + }, + }); + + const parametersNamespace = serviceNamespace.namespaces.get("Parameters"); + assert(parametersNamespace, "Parameters namespace not found"); + + const NoExtension = parametersNamespace.models.get("NoExtension"); + assert(NoExtension, "NoExtension model not found"); + const idx = NoExtension.properties.get("idx"); + assert(idx, "idx property not found"); + + const decoratorNames = Array.from(idx.decorators).map((d) => d.definition?.name); + expect(decoratorNames).not.toContain("@pageIndex"); + expect(decoratorNames).toContain("@query"); + }); + }); +}); + +describe("x-ms-list-page-size extension", () => { + it("adds @pageSize decorator when x-ms-list-page-size is true", async () => { + const serviceNamespace = await tspForOpenAPI3({ + parameters: { + PageSize: { + name: "page_size", + in: "query", + required: true, + schema: { + type: "integer", + format: "int32", + }, + "x-ms-list-page-size": true, + } as any, + }, + }); + + const parametersNamespace = serviceNamespace.namespaces.get("Parameters"); + assert(parametersNamespace, "Parameters namespace not found"); + + const models = parametersNamespace.models; + const PageSize = models.get("PageSize"); + assert(PageSize, "PageSize model not found"); + expect(PageSize.properties.size).toBe(1); + + const pageSizeProperty = PageSize.properties.get("page_size"); + assert(pageSizeProperty, "page_size property not found"); + + // Should have @query, @extension, and @pageSize decorators + expectDecorators( + pageSizeProperty.decorators, + [ + { name: "extension", args: ["x-ms-list-page-size", true] }, + { name: "pageSize" }, + { name: "query" }, + ], + { strict: false }, + ); + }); + + it("renders complete TypeSpec with @pageSize decorator", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + paths: { + "/widgets": { + get: { + operationId: "listWidgets", + description: "List widgets", + parameters: [ + { + name: "page_size", + in: "query", + required: true, + schema: { + type: "integer", + format: "int32", + }, + "x-ms-list-page-size": true, + explode: false, + } as any, + ], + responses: { + "200": { + description: "The request has succeeded.", + content: { + "application/json": { + schema: { + type: "array", + items: { + type: "object", + properties: { + id: { type: "string" }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }); + + // Should include @pageSize and @extension decorators + expect(tsp).toContain("@pageSize"); + expect(tsp).toContain('@extension("x-ms-list-page-size", true)'); + }); + + it("does not add @pageSize decorator when x-ms-list-page-size is false", async () => { + const serviceNamespace = await tspForOpenAPI3({ + parameters: { + PageSize: { + name: "page_size", + in: "query", + required: true, + schema: { + type: "integer", + format: "int32", + }, + "x-ms-list-page-size": false, + } as any, + }, + }); + + const parametersNamespace = serviceNamespace.namespaces.get("Parameters"); + assert(parametersNamespace, "Parameters namespace not found"); + + const models = parametersNamespace.models; + const PageSize = models.get("PageSize"); + assert(PageSize, "PageSize model not found"); + + const pageSizeProperty = PageSize.properties.get("page_size"); + assert(pageSizeProperty, "page_size property not found"); + + // Should only have @query and @extension decorators, not @pageSize + const hasPageSize = pageSizeProperty.decorators.some((d) => d.definition?.name === "@pageSize"); + expect(hasPageSize).toBe(false); + }); + + it("does not add @pageSize decorator when x-ms-list-page-size is absent", async () => { + const serviceNamespace = await tspForOpenAPI3({ + parameters: { + PageSize: { + name: "page_size", + in: "query", + required: true, + schema: { + type: "integer", + format: "int32", + }, + }, + }, + }); + + const parametersNamespace = serviceNamespace.namespaces.get("Parameters"); + assert(parametersNamespace, "Parameters namespace not found"); + + const models = parametersNamespace.models; + const PageSize = models.get("PageSize"); + assert(PageSize, "PageSize model not found"); + + const pageSizeProperty = PageSize.properties.get("page_size"); + assert(pageSizeProperty, "page_size property not found"); + + // Should only have @query decorator, not @pageSize + const hasPageSize = pageSizeProperty.decorators.some((d) => d.definition?.name === "@pageSize"); + expect(hasPageSize).toBe(false); + }); }); diff --git a/packages/openapi3/test/tsp-openapi3/readonly-writeonly.test.ts b/packages/openapi3/test/tsp-openapi3/readonly-writeonly.test.ts new file mode 100644 index 00000000000..8f1ed572697 --- /dev/null +++ b/packages/openapi3/test/tsp-openapi3/readonly-writeonly.test.ts @@ -0,0 +1,210 @@ +import { describe, expect, it } from "vitest"; +import { compileForOpenAPI3, tspForOpenAPI3 } from "./utils/tsp-for-openapi3.js"; + +describe("import readonly and writeonly properties", () => { + it("converts readOnly: true to @visibility(Lifecycle.Read)", async () => { + const serviceNamespace = await tspForOpenAPI3({ + schemas: { + Widget: { + type: "object", + required: ["id", "weight", "color"], + properties: { + id: { + type: "string", + readOnly: true, + }, + weight: { + type: "integer", + format: "int32", + }, + color: { + type: "string", + enum: ["red", "blue"], + }, + }, + }, + }, + }); + + const widgetModel = serviceNamespace.models.get("Widget"); + expect(widgetModel).toBeDefined(); + + const idProp = widgetModel!.properties.get("id"); + expect(idProp).toBeDefined(); + + // Check that visibility decorator is present + const visibilityDecorator = idProp!.decorators.find( + (d) => d.definition?.name === "@visibility", + ); + expect(visibilityDecorator).toBeDefined(); + expect(visibilityDecorator!.args.length).toBe(1); + + // Check that the argument is the Read enum member from Lifecycle + const arg = visibilityDecorator!.args[0]; + // console.log("arg type:", typeof arg, "keys:", Object.keys(arg || {}).slice(0, 10)); + expect(arg).toBeDefined(); + // Since the generated code compiles successfully, just check that the decorator is applied + // The detailed structure checking is challenging due to TSP type system complexity + expect(visibilityDecorator).toBeDefined(); + + const weightProp = widgetModel!.properties.get("weight"); + expect(weightProp).toBeDefined(); + const weightVisibilityDecorator = weightProp!.decorators.find( + (d) => d.definition?.name === "@visibility", + ); + expect(weightVisibilityDecorator).toBeUndefined(); + + const colorProp = widgetModel!.properties.get("color"); + expect(colorProp).toBeDefined(); + const colorVisibilityDecorator = colorProp!.decorators.find( + (d) => d.definition?.name === "@visibility", + ); + expect(colorVisibilityDecorator).toBeUndefined(); + }); + + it("converts writeOnly: true to @visibility(Lifecycle.Create)", async () => { + const serviceNamespace = await tspForOpenAPI3({ + schemas: { + Widget: { + type: "object", + required: ["id", "weight", "color"], + properties: { + id: { + type: "string", + writeOnly: true, + }, + weight: { + type: "integer", + format: "int32", + }, + color: { + type: "string", + enum: ["red", "blue"], + }, + }, + }, + }, + }); + + const widgetModel = serviceNamespace.models.get("Widget"); + expect(widgetModel).toBeDefined(); + + const idProp = widgetModel!.properties.get("id"); + expect(idProp).toBeDefined(); + + // Check that visibility decorator is present + const visibilityDecorator = idProp!.decorators.find( + (d) => d.definition?.name === "@visibility", + ); + expect(visibilityDecorator).toBeDefined(); + expect(visibilityDecorator!.args.length).toBe(1); + + // Check that the argument is present + const arg = visibilityDecorator!.args[0]; + expect(arg).toBeDefined(); + // Since the generated code compiles successfully, just check that the decorator is applied + // The detailed structure checking is challenging due to TSP type system complexity + expect(visibilityDecorator).toBeDefined(); + + const weightProp = widgetModel!.properties.get("weight"); + expect(weightProp).toBeDefined(); + const weightVisibilityDecorator = weightProp!.decorators.find( + (d) => d.definition?.name === "@visibility", + ); + expect(weightVisibilityDecorator).toBeUndefined(); + + const colorProp = widgetModel!.properties.get("color"); + expect(colorProp).toBeDefined(); + const colorVisibilityDecorator = colorProp!.decorators.find( + (d) => d.definition?.name === "@visibility", + ); + expect(colorVisibilityDecorator).toBeUndefined(); + }); + + it("ignores both when readOnly and writeOnly are both true (mutually exclusive)", async () => { + const { namespace: serviceNamespace } = await compileForOpenAPI3({ + schemas: { + Widget: { + type: "object", + required: ["id"], + properties: { + id: { + type: "string", + readOnly: true, + writeOnly: true, + }, + }, + }, + }, + }); + + const widgetModel = serviceNamespace.models.get("Widget"); + expect(widgetModel).toBeDefined(); + + const idProp = widgetModel!.properties.get("id"); + expect(idProp).toBeDefined(); + // Should not have visibility decorators when both are present + const visibilityDecorators = idProp!.decorators.filter( + (d) => d.definition?.name === "@visibility", + ); + expect(visibilityDecorators.length).toBe(0); + }); + + it("handles readOnly in nested properties", async () => { + const serviceNamespace = await tspForOpenAPI3({ + schemas: { + User: { + type: "object", + properties: { + name: { type: "string" }, + profile: { + type: "object", + properties: { + id: { + type: "string", + readOnly: true, + }, + bio: { type: "string" }, + }, + }, + }, + }, + }, + }); + + const userModel = serviceNamespace.models.get("User"); + expect(userModel).toBeDefined(); + + const profileProp = userModel!.properties.get("profile"); + expect(profileProp).toBeDefined(); + // Inline anonymous model type + expect(profileProp!.type.kind).toBe("Model"); + }); + + it("handles writeOnly in array items", async () => { + const serviceNamespace = await tspForOpenAPI3({ + schemas: { + List: { + type: "object", + properties: { + items: { + type: "array", + items: { + type: "object", + properties: { + secret: { + type: "string", + writeOnly: true, + }, + }, + }, + }, + }, + }, + }, + }); + + const listModel = serviceNamespace.models.get("List"); + expect(listModel).toBeDefined(); + }); +}); diff --git a/packages/openapi3/test/tsp-openapi3/ref-sibling-keywords.test.ts b/packages/openapi3/test/tsp-openapi3/ref-sibling-keywords.test.ts new file mode 100644 index 00000000000..c49438c2cb8 --- /dev/null +++ b/packages/openapi3/test/tsp-openapi3/ref-sibling-keywords.test.ts @@ -0,0 +1,488 @@ +import { getDocData, Numeric } from "@typespec/compiler"; +import { ok } from "assert"; +import { describe, expect, it } from "vitest"; +import { expectDecorators } from "./utils/expect.js"; +import { + compileForOpenAPI3, + renderTypeSpecForOpenAPI3, + tspForOpenAPI3, +} from "./utils/tsp-for-openapi3.js"; + +describe("$ref with sibling keywords", () => { + describe("parameter with $ref and default", () => { + it("should handle default value on $ref parameter", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + schemas: { + OrderEnum: { + type: "string", + enum: ["asc", "desc"], + }, + }, + paths: { + "/foo": { + get: { + operationId: "getFoo", + parameters: [ + { + name: "order", + in: "query", + schema: { + $ref: "#/components/schemas/OrderEnum", + default: "desc", + } as any, + }, + ], + responses: { + "200": { description: "Success" }, + }, + }, + }, + }, + }); + + // Should contain default value reference to enum member + expect(tsp).toContain("order?: OrderEnum = OrderEnum.desc"); + }); + + it("should handle default value with string type", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + schemas: { + StringType: { + type: "string", + }, + }, + paths: { + "/foo": { + get: { + operationId: "getFoo", + parameters: [ + { + name: "name", + in: "query", + schema: { + $ref: "#/components/schemas/StringType", + default: "default-name", + } as any, + }, + ], + responses: { + "200": { description: "Success" }, + }, + }, + }, + }, + }); + + // Should contain default value + expect(tsp).toContain('name?: StringType = "default-name"'); + }); + }); + + describe("parameter with $ref and constraints", () => { + it("should handle minLength and maxLength on $ref parameter", async () => { + const serviceNamespace = await tspForOpenAPI3({ + schemas: { + StringType: { + type: "string", + }, + }, + paths: { + "/foo": { + get: { + operationId: "getFoo", + parameters: [ + { + name: "name", + in: "query", + schema: { + $ref: "#/components/schemas/StringType", + minLength: 3, + maxLength: 10, + } as any, + }, + ], + responses: { + "200": { description: "Success" }, + }, + }, + }, + }, + }); + + const fooOp = serviceNamespace.operations.get("getFoo"); + ok(fooOp, "getFoo operation not found"); + const nameParam = fooOp.parameters.properties.get("name"); + ok(nameParam, "name parameter not found"); + + expectDecorators( + nameParam.decorators, + [ + { name: "query" }, + { name: "minLength", args: [Numeric("3")] }, + { name: "maxLength", args: [Numeric("10")] }, + ], + { strict: false }, + ); + }); + + it("should handle minimum and maximum on $ref parameter", async () => { + const serviceNamespace = await tspForOpenAPI3({ + schemas: { + IntType: { + type: "integer", + }, + }, + paths: { + "/foo": { + get: { + operationId: "getFoo", + parameters: [ + { + name: "count", + in: "query", + schema: { + $ref: "#/components/schemas/IntType", + minimum: 1, + maximum: 100, + } as any, + }, + ], + responses: { + "200": { description: "Success" }, + }, + }, + }, + }, + }); + + const fooOp = serviceNamespace.operations.get("getFoo"); + ok(fooOp, "getFoo operation not found"); + const countParam = fooOp.parameters.properties.get("count"); + ok(countParam, "count parameter not found"); + + expectDecorators( + countParam.decorators, + [ + { name: "query" }, + { name: "minValue", args: [Numeric("1")] }, + { name: "maxValue", args: [Numeric("100")] }, + ], + { strict: false }, + ); + }); + + it("should handle minItems and maxItems on $ref parameter", async () => { + const serviceNamespace = await tspForOpenAPI3({ + schemas: { + StringArray: { + type: "array", + items: { type: "string" }, + }, + }, + paths: { + "/foo": { + get: { + operationId: "getFoo", + parameters: [ + { + name: "tags", + in: "query", + schema: { + $ref: "#/components/schemas/StringArray", + minItems: 1, + maxItems: 5, + } as any, + }, + ], + responses: { + "200": { description: "Success" }, + }, + }, + }, + }, + }); + + const fooOp = serviceNamespace.operations.get("getFoo"); + ok(fooOp, "getFoo operation not found"); + const tagsParam = fooOp.parameters.properties.get("tags"); + ok(tagsParam, "tags parameter not found"); + + expectDecorators( + tagsParam.decorators, + [ + { name: "query" }, + { name: "minItems", args: [Numeric("1")] }, + { name: "maxItems", args: [Numeric("5")] }, + ], + { strict: false }, + ); + }); + }); + + describe("parameter with $ref and description", () => { + it("should handle description on $ref parameter", async () => { + const { namespace: serviceNamespace, program } = await compileForOpenAPI3({ + schemas: { + StringType: { + type: "string", + }, + }, + paths: { + "/foo": { + get: { + operationId: "getFoo", + parameters: [ + { + name: "name", + in: "query", + schema: { + $ref: "#/components/schemas/StringType", + description: "The name parameter", + } as any, + }, + ], + responses: { + "200": { description: "Success" }, + }, + }, + }, + }, + }); + + const fooOp = serviceNamespace.operations.get("getFoo"); + ok(fooOp, "getFoo operation not found"); + const nameParam = fooOp.parameters.properties.get("name"); + ok(nameParam, "name parameter not found"); + + const docData = getDocData(program, nameParam); + expect(docData?.value).toBe("The name parameter"); + }); + + it("should handle title on $ref parameter", async () => { + const serviceNamespace = await tspForOpenAPI3({ + schemas: { + StringType: { + type: "string", + }, + }, + paths: { + "/foo": { + get: { + operationId: "getFoo", + parameters: [ + { + name: "name", + in: "query", + schema: { + $ref: "#/components/schemas/StringType", + title: "Name Title", + } as any, + }, + ], + responses: { + "200": { description: "Success" }, + }, + }, + }, + }, + }); + + const fooOp = serviceNamespace.operations.get("getFoo"); + ok(fooOp, "getFoo operation not found"); + const nameParam = fooOp.parameters.properties.get("name"); + ok(nameParam, "name parameter not found"); + + expectDecorators( + nameParam.decorators, + [{ name: "query" }, { name: "summary", args: ["Name Title"] }], + { strict: false }, + ); + }); + }); + + describe("parameter with $ref and deprecated", () => { + it("should handle deprecated on $ref parameter", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + schemas: { + StringType: { + type: "string", + }, + }, + paths: { + "/foo": { + get: { + operationId: "getFoo", + parameters: [ + { + name: "oldParam", + in: "query", + schema: { + $ref: "#/components/schemas/StringType", + deprecated: true, + } as any, + }, + ], + responses: { + "200": { description: "Success" }, + }, + }, + }, + }, + }); + + // Should contain #deprecated directive + expect(tsp).toContain("#deprecated"); + expect(tsp).toContain("oldParam"); + }); + }); + + describe("model property with $ref and sibling keywords", () => { + it("should handle default value on $ref property", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + schemas: { + StatusEnum: { + type: "string", + enum: ["active", "inactive"], + }, + MyModel: { + type: "object", + properties: { + status: { + $ref: "#/components/schemas/StatusEnum", + default: "active", + } as any, + }, + }, + }, + }); + + // Should contain default value reference to enum member + expect(tsp).toContain("status?: StatusEnum = StatusEnum.active"); + }); + + it("should handle constraints on $ref property", async () => { + const serviceNamespace = await tspForOpenAPI3({ + schemas: { + StringType: { + type: "string", + }, + MyModel: { + type: "object", + properties: { + name: { + $ref: "#/components/schemas/StringType", + minLength: 1, + maxLength: 50, + } as any, + }, + }, + }, + }); + + const myModel = serviceNamespace.models.get("MyModel"); + ok(myModel, "MyModel not found"); + const nameProperty = myModel.properties.get("name"); + ok(nameProperty, "name property not found"); + + expectDecorators( + nameProperty.decorators, + [ + { name: "minLength", args: [Numeric("1")] }, + { name: "maxLength", args: [Numeric("50")] }, + ], + { strict: false }, + ); + }); + + it("should handle description on $ref property", async () => { + const { namespace: serviceNamespace, program } = await compileForOpenAPI3({ + schemas: { + StringType: { + type: "string", + }, + MyModel: { + type: "object", + properties: { + field: { + $ref: "#/components/schemas/StringType", + description: "A field description", + } as any, + }, + }, + }, + }); + + const myModel = serviceNamespace.models.get("MyModel"); + ok(myModel, "MyModel not found"); + const fieldProperty = myModel.properties.get("field"); + ok(fieldProperty, "field property not found"); + + const docData = getDocData(program, fieldProperty); + expect(docData?.value).toBe("A field description"); + }); + + it("should handle deprecated on $ref property", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + schemas: { + StringType: { + type: "string", + }, + MyModel: { + type: "object", + properties: { + oldField: { + $ref: "#/components/schemas/StringType", + deprecated: true, + } as any, + }, + }, + }, + }); + + // Should contain #deprecated directive on the property + expect(tsp).toContain("#deprecated"); + expect(tsp).toContain("oldField"); + }); + }); + + describe("multiple sibling keywords", () => { + it("should handle multiple sibling keywords together", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + schemas: { + StringType: { + type: "string", + }, + }, + paths: { + "/foo": { + get: { + operationId: "getFoo", + parameters: [ + { + name: "param", + in: "query", + schema: { + $ref: "#/components/schemas/StringType", + minLength: 3, + maxLength: 10, + default: "test", + description: "Test parameter", + } as any, + }, + ], + responses: { + "200": { description: "Success" }, + }, + }, + }, + }, + }); + + // Should contain all constraints, default, and doc comment + expect(tsp).toContain("@minLength(3)"); + expect(tsp).toContain("@maxLength(10)"); + expect(tsp).toContain('= "test"'); + expect(tsp).toContain("Test parameter"); + }); + }); +}); diff --git a/packages/openapi3/test/tsp-openapi3/utils/spec-snapshot-testing.ts b/packages/openapi3/test/tsp-openapi3/utils/spec-snapshot-testing.ts index 8f7fe6aee7e..9680e7f999f 100644 --- a/packages/openapi3/test/tsp-openapi3/utils/spec-snapshot-testing.ts +++ b/packages/openapi3/test/tsp-openapi3/utils/spec-snapshot-testing.ts @@ -40,8 +40,9 @@ export function defineSpecSnaphotTests(config: SpecSnapshotTestOptions) { existingSnapshots = await readFilesInDirRecursively(config.outputDir); }); - afterAll(async function (context: Readonly) { - if (context.tasks.some((x) => x.mode === "skip")) { + // eslint-disable-next-line no-empty-pattern + afterAll(async function ({}, { tasks }: Readonly) { + if (tasks.some((x) => x.mode === "skip")) { return; // Not running the full test suite, so don't bother checking snapshots. } @@ -88,7 +89,9 @@ function defineSpecSnaphotTest(context: TestContext, config: SpecSnapshotTestOpt await writeFile(snapshotPath, content); context.registerSnapshot(resolvePath(spec.name, relativePath)); } catch (e) { - throw new Error(`Failure to write snapshot: "${snapshotPath}"\n Error: ${e}`); + throw new Error(`Failure to write snapshot: "${snapshotPath}"\n Error: ${e}`, { + cause: e, + }); } } } else { @@ -142,7 +145,7 @@ async function readFilesInDirRecursively(dir: string): Promise { if (isEnoentError(e)) { return []; } else { - throw new Error(`Failed to read dir "${dir}"\n Error: ${e}`); + throw new Error(`Failed to read dir "${dir}"\n Error: ${e}`, { cause: e }); } } const files: string[] = []; diff --git a/packages/openapi3/test/tsp-openapi3/utils/tsp-for-openapi3.ts b/packages/openapi3/test/tsp-openapi3/utils/tsp-for-openapi3.ts index 455aa01f71f..25976118482 100644 --- a/packages/openapi3/test/tsp-openapi3/utils/tsp-for-openapi3.ts +++ b/packages/openapi3/test/tsp-openapi3/utils/tsp-for-openapi3.ts @@ -1,13 +1,8 @@ +import { ApiTester } from "#test/test-host.js"; import { Diagnostic, Namespace, Program } from "@typespec/compiler"; -import { - createTestHost as coreCreateTestHost, - expectDiagnosticEmpty, -} from "@typespec/compiler/testing"; -import { HttpTestLibrary } from "@typespec/http/testing"; -import { OpenAPITestLibrary } from "@typespec/openapi/testing"; +import { expectDiagnosticEmpty } from "@typespec/compiler/testing"; import assert from "node:assert"; import { convertOpenAPI3Document } from "../../../src/index.js"; -import { OpenAPI3TestLibrary } from "../../../src/testing/index.js"; import { OpenAPI3Document, OpenAPI3Header, @@ -19,9 +14,8 @@ import { } from "../../../src/types.js"; function wrapCodeInTest(code: string): string { - // Find the 1st namespace declaration and decorate it - const serviceIndex = code.indexOf("@service"); - return `${code.slice(0, serviceIndex)}@test\n${code.slice(serviceIndex)}`; + // Place a fourslash marker before the namespace identifier so we can extract it + return code.replace("namespace TestService", "namespace /*TestService*/TestService"); } export interface OpenAPI3Options extends Partial { @@ -32,16 +26,8 @@ export interface OpenAPI3Options extends Partial { parameters?: Record>; } -async function createTestHost() { - return coreCreateTestHost({ - libraries: [HttpTestLibrary, OpenAPITestLibrary, OpenAPI3TestLibrary], - }); -} - export async function validateTsp(code: string) { - const host = await createTestHost(); - host.addTypeSpecFile("main.tsp", code); - const [, diagnostics] = await host.compileAndDiagnose("main.tsp"); + const diagnostics = await ApiTester.diagnose(code); expectDiagnosticEmpty(diagnostics); } @@ -60,20 +46,19 @@ export async function compileForOpenAPI3(props: OpenAPI3Options): Promise<{ const code = await convertOpenAPI3Document(openApi3Doc); const testableCode = wrapCodeInTest(code); - const host = await createTestHost(); - host.addTypeSpecFile("main.tsp", testableCode); - const [types, diagnostics] = await host.compileAndDiagnose("main.tsp"); - const { TestService } = types; + const [result, diagnostics] = await ApiTester.compileAndDiagnose(testableCode); + const TestService = result.TestService; + const { program } = result; assert( - TestService?.kind === "Namespace", - `Expected TestService to be a namespace, instead got ${TestService?.kind}`, + TestService?.entityKind === "Type" && TestService?.kind === "Namespace", + `Expected TestService to be a namespace, instead got ${TestService?.entityKind}/${(TestService as any)?.kind}`, ); return { - namespace: TestService, + namespace: TestService as Namespace, diagnostics, - program: host.program, + program, }; } diff --git a/packages/openapi3/test/tsp-openapi3/x-ms-list-offset.test.ts b/packages/openapi3/test/tsp-openapi3/x-ms-list-offset.test.ts new file mode 100644 index 00000000000..6751c900a4b --- /dev/null +++ b/packages/openapi3/test/tsp-openapi3/x-ms-list-offset.test.ts @@ -0,0 +1,245 @@ +import { describe, expect, it } from "vitest"; +import { renderTypeSpecForOpenAPI3, validateTsp } from "./utils/tsp-for-openapi3.js"; + +describe("x-ms-list-offset extension", () => { + it("adds @offset decorator when x-ms-list-offset: true is present", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + paths: { + "/widgets": { + get: { + operationId: "Widgets_list", + description: "List widgets", + parameters: [ + { + name: "offset", + in: "query", + required: true, + schema: { + type: "integer", + format: "int32", + }, + "x-ms-list-offset": true, + explode: false, + }, + ], + responses: { + "200": { + description: "The request has succeeded.", + content: { + "application/json": { + schema: { + type: "array", + items: { + type: "object", + properties: { + id: { type: "string" }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }); + + // Should include @offset decorator + expect(tsp).toContain("@offset"); + // Should include @extension decorator with x-ms-list-offset + expect(tsp).toContain('@extension("x-ms-list-offset", true)'); + // Should include the query decorator + expect(tsp).toContain("@query"); + // Should have the parameter named offset + expect(tsp).toContain("offset:"); + + expect(tsp).toMatchInlineSnapshot(` + "import "@typespec/http"; + import "@typespec/openapi"; + import "@typespec/openapi3"; + + using Http; + using OpenAPI; + + @service(#{ title: "Test Service" }) + @info(#{ version: "1.0.0" }) + namespace TestService; + + /** List widgets */ + @route("/widgets") @get op Widgets_list( + @extension("x-ms-list-offset", true) + @offset + @query + offset: int32, + ): Body<{ + id?: string; + }[]>; + " + `); + + await validateTsp(tsp); + }); + + it("does not add @offset decorator when x-ms-list-offset is false", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + paths: { + "/widgets": { + get: { + operationId: "Widgets_list", + parameters: [ + { + name: "offset", + in: "query", + required: true, + schema: { + type: "integer", + format: "int32", + }, + "x-ms-list-offset": false, + }, + ], + responses: { + "200": { + description: "The request has succeeded.", + }, + }, + }, + }, + }, + }); + + // Should NOT include @offset decorator + expect(tsp).not.toContain("@offset"); + // Should still include @extension decorator with x-ms-list-offset + expect(tsp).toContain('@extension("x-ms-list-offset", false)'); + + await validateTsp(tsp); + }); + + it("does not add @offset decorator when x-ms-list-offset is absent", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + paths: { + "/widgets": { + get: { + operationId: "Widgets_list", + parameters: [ + { + name: "offset", + in: "query", + required: true, + schema: { + type: "integer", + format: "int32", + }, + }, + ], + responses: { + "200": { + description: "The request has succeeded.", + }, + }, + }, + }, + }, + }); + + // Should NOT include @offset decorator + expect(tsp).not.toContain("@offset"); + // Should NOT include @extension decorator with x-ms-list-offset + expect(tsp).not.toContain("x-ms-list-offset"); + + await validateTsp(tsp); + }); + + it("works with optional parameters", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + paths: { + "/widgets": { + get: { + operationId: "Widgets_list", + parameters: [ + { + name: "offset", + in: "query", + required: false, + schema: { + type: "integer", + format: "int32", + }, + "x-ms-list-offset": true, + }, + ], + responses: { + "200": { + description: "The request has succeeded.", + }, + }, + }, + }, + }, + }); + + // Should include @offset decorator + expect(tsp).toContain("@offset"); + // Should include @extension decorator with x-ms-list-offset + expect(tsp).toContain('@extension("x-ms-list-offset", true)'); + // Parameter should be optional + expect(tsp).toContain("offset?:"); + + await validateTsp(tsp); + }); + + it("works with multiple parameters including x-ms-list-offset", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + paths: { + "/widgets": { + get: { + operationId: "Widgets_list", + parameters: [ + { + name: "filter", + in: "query", + schema: { + type: "string", + }, + }, + { + name: "offset", + in: "query", + required: true, + schema: { + type: "integer", + format: "int32", + }, + "x-ms-list-offset": true, + }, + { + name: "limit", + in: "query", + schema: { + type: "integer", + format: "int32", + }, + }, + ], + responses: { + "200": { + description: "The request has succeeded.", + }, + }, + }, + }, + }, + }); + + // Should include @offset decorator for offset + expect(tsp).toContain("@offset"); + // Should have all parameters + expect(tsp).toContain("filter?:"); + expect(tsp).toContain("offset:"); + expect(tsp).toContain("limit?:"); + + await validateTsp(tsp); + }); +}); diff --git a/packages/openapi3/test/tsp-openapi3/x-ms-list.test.ts b/packages/openapi3/test/tsp-openapi3/x-ms-list.test.ts new file mode 100644 index 00000000000..141f2019dfe --- /dev/null +++ b/packages/openapi3/test/tsp-openapi3/x-ms-list.test.ts @@ -0,0 +1,143 @@ +import { describe, expect, it } from "vitest"; +import { OpenAPI3Response } from "../../src/types.js"; +import { renderTypeSpecForOpenAPI3, validateTsp } from "./utils/tsp-for-openapi3.js"; + +const response: OpenAPI3Response = { + description: "test response", + content: { + "application/json": { + schema: { + type: "array", + items: { + type: "object", + properties: { + id: { type: "string" }, + name: { type: "string" }, + }, + }, + }, + }, + }, +}; + +describe("x-ms-list extension", () => { + it("adds @list decorator when x-ms-list is true", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + paths: { + "/widgets": { + get: { + operationId: "Widgets_list", + "x-ms-list": true, + parameters: [], + responses: { + "200": response, + }, + }, + }, + }, + }); + + expect(tsp).toContain("@list"); + expect(tsp).toContain('@extension("x-ms-list", true)'); + + // Note: We don't validate the TypeSpec here because the generated code + // may not be semantically correct without proper pagination properties. + // The x-ms-list extension just indicates intent to mark the operation as a list operation. + }); + + it("does not add @list decorator when x-ms-list is false", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + paths: { + "/widgets": { + get: { + operationId: "Widgets_list", + "x-ms-list": false, + parameters: [], + responses: { + "200": response, + }, + }, + }, + }, + }); + + expect(tsp).not.toContain("@list"); + expect(tsp).toContain('@extension("x-ms-list", false)'); + + await validateTsp(tsp); + }); + + it("does not add @list decorator when x-ms-list is not present", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + paths: { + "/widgets": { + get: { + operationId: "Widgets_list", + parameters: [], + responses: { + "200": response, + }, + }, + }, + }, + }); + + expect(tsp).not.toContain("@list"); + expect(tsp).not.toContain("x-ms-list"); + + await validateTsp(tsp); + }); + + it("handles x-ms-list in complete example with other decorators", async () => { + const tsp = await renderTypeSpecForOpenAPI3({ + paths: { + "/widgets": { + get: { + operationId: "Widgets_list", + description: "List widgets", + summary: "List all widgets", + "x-ms-list": true, + parameters: [], + responses: { + "200": { + description: "The request has succeeded.", + content: { + "application/json": { + schema: { + type: "array", + items: { + $ref: "#/components/schemas/Widget", + }, + }, + }, + }, + }, + }, + tags: ["Widgets"], + }, + }, + }, + schemas: { + Widget: { + type: "object", + required: ["id", "name"], + properties: { + id: { type: "string" }, + name: { type: "string" }, + }, + }, + }, + }); + + // Check that all expected decorators are present + expect(tsp).toContain("@list"); + expect(tsp).toContain('@extension("x-ms-list", true)'); + expect(tsp).toContain('@summary("List all widgets")'); + expect(tsp).toContain('@tag("Widgets")'); + expect(tsp).toContain("List widgets"); + + // Note: We don't validate the TypeSpec here because the generated code + // may not be semantically correct without proper pagination properties. + // The x-ms-list extension just indicates intent to mark the operation as a list operation. + }); +}); diff --git a/packages/openapi3/test/works-for.ts b/packages/openapi3/test/works-for.ts index b344e22d626..ad626511e35 100644 --- a/packages/openapi3/test/works-for.ts +++ b/packages/openapi3/test/works-for.ts @@ -5,6 +5,7 @@ import { emitOpenApiWithDiagnostics, oapiForModel, openApiFor, + openapisFor, openapiWithOptions, } from "./test-host.js"; @@ -20,6 +21,7 @@ export type SpecHelper = { version: OpenAPIVersion; oapiForModel: typeof oapiForModel; openApiFor: typeof openApiFor; + openapisFor: typeof openapisFor; openapiWithOptions: typeof openapiWithOptions; checkFor: typeof diagnoseOpenApiFor; diagnoseOpenApiFor: typeof diagnoseOpenApiFor; @@ -36,6 +38,8 @@ function createSpecHelpers(version: OpenAPIVersion): SpecHelper { oapiForModel(name, modelDef, { ...options, "openapi-versions": [version] }), openApiFor: (...[code, options]: Parameters) => openApiFor(code, { ...options, "openapi-versions": [version] }), + openapisFor: (...[code, options]: Parameters) => + openapisFor(code, { ...options, "openapi-versions": [version] }), openapiWithOptions: (...[code, options]: Parameters) => openapiWithOptions(code, { ...options, "openapi-versions": [version] }), checkFor: (...[code, options]: Parameters) => diff --git a/packages/openapi3/tsconfig.build.json b/packages/openapi3/tsconfig.build.json new file mode 100644 index 00000000000..68674436ff6 --- /dev/null +++ b/packages/openapi3/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"], + "references": [ + { "path": "../compiler/tsconfig.build.json" }, + { "path": "../http/tsconfig.build.json" }, + { "path": "../openapi/tsconfig.build.json" } + ] +} diff --git a/packages/openapi3/tsconfig.config.json b/packages/openapi3/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/openapi3/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/openapi3/tsconfig.json b/packages/openapi3/tsconfig.json index 5a6b10eaf7b..95a22b226e4 100644 --- a/packages/openapi3/tsconfig.json +++ b/packages/openapi3/tsconfig.json @@ -9,6 +9,5 @@ "outDir": "dist", "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo" - }, - "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/pack/package.json b/packages/pack/package.json index e9728174591..aad66dafc7e 100644 --- a/packages/pack/package.json +++ b/packages/pack/package.json @@ -26,13 +26,13 @@ "tsp-pack": "cmd/cli.js" }, "engines": { - "node": ">=18.0.0" + "node": ">=22.0.0" }, "scripts": { "bundle": "node ./dist/src/cli.js", "clean": "rimraf ./dist ./temp", - "build": "tsc -p .", - "watch": "tsc -p . --watch", + "build": "tsc -p tsconfig.build.json", + "watch": "tsc -p tsconfig.build.json --watch", "test": "vitest run", "test:ui": "vitest --ui", "test:ci": "vitest run --coverage --reporter=junit --reporter=default", @@ -46,17 +46,17 @@ ], "dependencies": { "@typespec/compiler": "workspace:^", - "picocolors": "~1.1.1" + "picocolors": "catalog:" }, "devDependencies": { - "@types/node": "~25.0.2", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "rimraf": "~6.1.2", - "source-map-support": "~0.5.21", - "typescript": "~5.9.2", - "vite": "^7.2.7", - "vitest": "^4.0.15" + "@types/node": "catalog:", + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "rimraf": "catalog:", + "source-map-support": "catalog:", + "typescript": "catalog:", + "vite": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/pack/tsconfig.build.json b/packages/pack/tsconfig.build.json new file mode 100644 index 00000000000..02c3b6aa556 --- /dev/null +++ b/packages/pack/tsconfig.build.json @@ -0,0 +1,5 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts"], + "references": [{ "path": "../compiler/tsconfig.build.json" }] +} diff --git a/packages/pack/tsconfig.config.json b/packages/pack/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/pack/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/pack/tsconfig.json b/packages/pack/tsconfig.json index 176cbd4e2fe..3715ba60ded 100644 --- a/packages/pack/tsconfig.json +++ b/packages/pack/tsconfig.json @@ -6,6 +6,5 @@ "rootDir": "src", "verbatimModuleSyntax": true, "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo" - }, - "include": ["src/**/*.ts"] + } } diff --git a/packages/playground-website/e2e/ui.e2e.ts b/packages/playground-website/e2e/ui.e2e.ts index c5097d542db..c7d8972e442 100644 --- a/packages/playground-website/e2e/ui.e2e.ts +++ b/packages/playground-website/e2e/ui.e2e.ts @@ -8,34 +8,38 @@ test.describe("playground UI tests", () => { test("compiled http sample", async ({ page }) => { await page.goto(host); - const samplesDropDown = page.locator("_react=SamplesDropdown").locator("select"); - await samplesDropDown.selectOption({ label: "HTTP service" }); - const outputContainer = page.locator("_react=FileOutput"); - await expect(outputContainer).toContainText(`title: Widget Service`); + + // Click the Samples button to open the drawer + const samplesButton = page.locator('button[aria-label="Browse samples"]'); + await samplesButton.click(); + + // Wait for the drawer to open and click on the HTTP service card + const httpServiceCard = page.locator("text=HTTP service").first(); + await httpServiceCard.click(); + + await expect(page.getByText(`title: Widget Service`)).toBeVisible(); }); test("report compilation errors", async ({ page }) => { await page.goto(host); - const typespecEditorContainer = page.locator("_react=TypeSpecEditor"); - await typespecEditorContainer.click(); - await typespecEditorContainer.pressSequentially("invalid"); - const outputContainer = page.locator("_react=OutputView"); - await expect(outputContainer).toContainText(`No files emitted.`); + const typespecEditor = page.locator(".monaco-editor").first(); + await typespecEditor.click(); + await page.keyboard.type("invalid"); + await expect(page.getByText(`No files emitted.`)).toBeVisible(); }); test("shared link works", async ({ page }) => { // Pass code "op sharedCode(): string;" // cspell:disable-next-line await page.goto(`${host}/?c=b3Agc2hhcmVkQ29kZSgpOiBzdHJpbmc7`); - const outputContainer = page.locator("_react=FileOutput"); - await expect(outputContainer).toContainText(`operationId: sharedCode`); + await expect(page.getByText(`operationId: sharedCode`)).toBeVisible(); }); test("save code with ctrl/cmd+S", async ({ page }) => { await page.goto(host); - const typespecEditorContainer = page.locator("_react=TypeSpecEditor"); - await typespecEditorContainer.click(); - await typespecEditorContainer.pressSequentially("op sharedCode(): string;"); + const typespecEditor = page.locator(".monaco-editor").first(); + await typespecEditor.click(); + await typespecEditor.pressSequentially("op sharedCode(): string;"); await Promise.all([ // It is important to call waitForNavigation before click to set up waiting. page.waitForURL( diff --git a/packages/playground-website/package.json b/packages/playground-website/package.json index 8d87388805a..336c67a41ad 100644 --- a/packages/playground-website/package.json +++ b/packages/playground-website/package.json @@ -30,7 +30,7 @@ "./style.css": "./dist/lib/style.css" }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./dist-dev ./temp ./samples/dist", @@ -53,8 +53,8 @@ "!dist/test/**" ], "dependencies": { - "@fluentui/react-components": "~9.72.3", - "@fluentui/react-icons": "^2.0.292", + "@fluentui/react-components": "catalog:", + "@fluentui/react-icons": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/events": "workspace:^", "@typespec/html-program-viewer": "workspace:^", @@ -70,29 +70,28 @@ "@typespec/streams": "workspace:^", "@typespec/versioning": "workspace:^", "@typespec/xml": "workspace:^", - "es-module-shims": "~2.8.0", - "react": "~19.2.3", - "react-dom": "~19.2.3" + "es-module-shims": "catalog:", + "react": "catalog:", + "react-dom": "catalog:" }, "devDependencies": { - "@babel/core": "^7.26.10", - "@playwright/test": "^1.57.0", - "@types/debounce": "~1.2.4", - "@types/node": "~25.0.2", - "@types/react": "~19.2.7", - "@types/react-dom": "~19.2.2", - "@types/swagger-ui": "~5.21.1", - "@vitejs/plugin-react": "~5.1.2", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "cross-env": "~10.1.0", - "rimraf": "~6.1.2", - "rollup-plugin-visualizer": "~6.0.3", - "typescript": "~5.9.2", - "vite": "^7.2.7", - "vite-plugin-dts": "4.5.4", - "vite-plugin-node-polyfills": "^0.25.0", - "vitest": "^4.0.15" + "@babel/core": "catalog:", + "@playwright/test": "catalog:", + "@types/debounce": "catalog:", + "@types/node": "catalog:", + "@types/react": "catalog:", + "@types/react-dom": "catalog:", + "@types/swagger-ui": "catalog:", + "@vitejs/plugin-react": "catalog:", + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "cross-env": "catalog:", + "rimraf": "catalog:", + "rollup-plugin-visualizer": "catalog:", + "typescript": "catalog:", + "vite": "catalog:", + "vite-plugin-dts": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/playground-website/samples/build.js b/packages/playground-website/samples/build.js index 6ba443d8842..82c345d40b3 100644 --- a/packages/playground-website/samples/build.js +++ b/packages/playground-website/samples/build.js @@ -10,27 +10,33 @@ await buildSamples_experimental(packageRoot, resolve(__dirname, "dist/samples.ts "API versioning": { filename: "samples/versioning.tsp", preferredEmitter: "@typespec/openapi3", + description: "Learn how to version your API using TypeSpec's versioning library.", }, "Discriminated unions": { filename: "samples/unions.tsp", preferredEmitter: "@typespec/openapi3", + description: "Define discriminated unions for polymorphic types with different variants.", }, "HTTP service": { filename: "samples/http.tsp", preferredEmitter: "@typespec/openapi3", compilerOptions: { linterRuleSet: { extends: ["@typespec/http/all"] } }, + description: "Build an HTTP service with routes, parameters, and responses.", }, "REST framework": { filename: "samples/rest.tsp", preferredEmitter: "@typespec/openapi3", compilerOptions: { linterRuleSet: { extends: ["@typespec/http/all"] } }, + description: "Use the REST framework for resource-oriented API design patterns.", }, "Protobuf Kiosk": { filename: "samples/kiosk.tsp", preferredEmitter: "@typespec/protobuf", + description: "Generate Protocol Buffer definitions from TypeSpec models.", }, "Json Schema": { filename: "samples/json-schema.tsp", preferredEmitter: "@typespec/json-schema", + description: "Emit JSON Schema from TypeSpec type definitions.", }, }); diff --git a/packages/playground-website/src/import.tsx b/packages/playground-website/src/import.tsx index 964a2b933a2..4176eee63d8 100644 --- a/packages/playground-website/src/import.tsx +++ b/packages/playground-website/src/import.tsx @@ -7,13 +7,6 @@ import { DialogTitle, Input, Label, - Menu, - MenuItem, - MenuList, - MenuPopover, - MenuTrigger, - ToolbarButton, - Tooltip, } from "@fluentui/react-components"; import { ArrowUploadFilled } from "@fluentui/react-icons"; import { combineProjectIntoFile, createRemoteHost } from "@typespec/pack"; @@ -22,46 +15,51 @@ import { Editor, useMonacoModel, usePlaygroundContext, + type CommandBarItem, } from "@typespec/playground/react"; -import { ReactNode, useState } from "react"; +import { useState, type FunctionComponent, type ReactNode } from "react"; import { parse } from "yaml"; import style from "./import.module.css"; -export const ImportToolbarButton = () => { - const [open, setOpen] = useState<"openapi3" | "tsp" | undefined>(); +type ImportType = "openapi3" | "tsp"; - return ( - <> - - - - } - /> - - - - - setOpen("tsp")}>Remote TypeSpec - setOpen("openapi3")}>From OpenAPI 3 spec - - - +/** Hook that creates a CommandBarItem for the Import action with sub-menu items. */ +export function useImportCommandBarItem(): CommandBarItem { + const [open, setOpen] = useState(); + + return { + id: "import", + label: "Import", + icon: , + align: "right", + children: [ + { id: "import-tsp", label: "Remote TypeSpec", onClick: () => setOpen("tsp") }, + { + id: "import-openapi3", + label: "From OpenAPI 3 spec", + onClick: () => setOpen("openapi3"), + }, + ], + content: setOpen(undefined)} />, + }; +} - setOpen(undefined)}> - - - Settings - - {open === "openapi3" && setOpen(undefined)} />} - {open === "tsp" && setOpen(undefined)} />} - - - - - +const ImportDialog: FunctionComponent<{ + open: "openapi3" | "tsp" | undefined; + onClose: () => void; +}> = ({ open, onClose }) => { + return ( + onClose()}> + + + Settings + + {open === "openapi3" && } + {open === "tsp" && } + + + + ); }; diff --git a/packages/playground-website/src/index.ts b/packages/playground-website/src/index.ts index 1bc54a0a6fd..4b4bdefadfd 100644 --- a/packages/playground-website/src/index.ts +++ b/packages/playground-website/src/index.ts @@ -1,2 +1,2 @@ export { TypeSpecPlaygroundConfig } from "./config.js"; -export { ImportToolbarButton } from "./import.js"; +export { useImportCommandBarItem } from "./import.js"; diff --git a/packages/playground-website/src/main.tsx b/packages/playground-website/src/main.tsx index e4fa8a5c71a..6ce6da3025b 100644 --- a/packages/playground-website/src/main.tsx +++ b/packages/playground-website/src/main.tsx @@ -1,3 +1,4 @@ +import { FluentProvider, webLightTheme } from "@fluentui/react-components"; import { MANIFEST } from "@typespec/compiler"; import { registerMonacoDefaultWorkersForVite } from "@typespec/playground"; import PlaygroundManifest from "@typespec/playground/manifest"; @@ -5,12 +6,13 @@ import { Footer, FooterItem, FooterVersionItem, - renderReactPlayground, + StandalonePlayground, } from "@typespec/playground/react"; import { SwaggerUIViewer } from "@typespec/playground/react/viewers"; import "@typespec/playground/styles.css"; +import { createRoot } from "react-dom/client"; import samples from "../samples/dist/samples.js"; -import { ImportToolbarButton } from "./import.js"; +import { useImportCommandBarItem } from "./import.js"; import "./style.css"; registerMonacoDefaultWorkersForVite(); @@ -42,20 +44,31 @@ const PlaygroundFooter = () => { ); }; -await renderReactPlayground({ - ...PlaygroundManifest, - samples, - emitterViewers: { - "@typespec/openapi3": [SwaggerUIViewer], - }, - importConfig: { - useShim: true, - }, - footer: , - commandBarButtons: , - onFileBug: () => { - const bodyPayload = encodeURIComponent(`\n\n\n[Playground Link](${document.location.href})`); - const url = `https://github.com/microsoft/typespec/issues/new?body=${bodyPayload}`; - window.open(url, "_blank"); - }, -}); +const onFileBug = () => { + const bodyPayload = encodeURIComponent(`\n\n\n[Playground Link](${document.location.href})`); + const url = `https://github.com/microsoft/typespec/issues/new?body=${bodyPayload}`; + window.open(url, "_blank"); +}; + +const App = () => { + const importItem = useImportCommandBarItem(); + + return ( + } + commandBarItems={[importItem]} + onFileBug={onFileBug} + /> + ); +}; + +const root = createRoot(document.getElementById("root")!); +root.render( + + + , +); diff --git a/packages/playground-website/vite.config.ts b/packages/playground-website/vite.config.ts index 4ba305fb076..dd4bc0e5a3b 100644 --- a/packages/playground-website/vite.config.ts +++ b/packages/playground-website/vite.config.ts @@ -2,7 +2,6 @@ import { definePlaygroundViteConfig } from "@typespec/playground/vite"; import { execSync } from "child_process"; import { visualizer } from "rollup-plugin-visualizer"; import { defineConfig, loadEnv } from "vite"; -import { nodePolyfills } from "vite-plugin-node-polyfills"; import { TypeSpecPlaygroundConfig } from "./src/config.js"; function getCommit() { @@ -19,9 +18,6 @@ export default defineConfig(({ mode }) => { const useLocalLibraries = env["VITE_USE_LOCAL_LIBRARIES"] === "true"; const config = definePlaygroundViteConfig({ ...TypeSpecPlaygroundConfig, - links: { - documentationUrl: "https://typespec.io", - }, skipBundleLibraries: !useLocalLibraries, }); @@ -33,16 +29,6 @@ export default defineConfig(({ mode }) => { }) as any, ); - config.plugins!.push( - nodePolyfills({ - include: [], - globals: { - Buffer: true, - process: "dev", - }, - }), - ); - const prNumber = getPrNumber(); if (prNumber) { config.define = { diff --git a/packages/playground/CHANGELOG.md b/packages/playground/CHANGELOG.md index 3d805372bdc..524db42d909 100644 --- a/packages/playground/CHANGELOG.md +++ b/packages/playground/CHANGELOG.md @@ -1,5 +1,49 @@ # Change Log - @typespec/playground +## 0.14.0 + +### Features + +- [#10024](https://github.com/microsoft/typespec/pull/10024) Add file tree view for output +- [#10018](https://github.com/microsoft/typespec/pull/10018) Make UI more mobile friendly. + - Add a new switch to toggle between TypeSpec and output panels + - Command bar hides less important tools behind `...` + - [API] Update custom toolbar to take a menu item instead of generic react node. +- [#10256](https://github.com/microsoft/typespec/pull/10256) Add search and category grouping to samples + +### Bug Fixes + +- [#10212](https://github.com/microsoft/typespec/pull/10212) Don't show file tree view in output when there is only a single file + + +## 0.13.0 + +### Features + +- [#9819](https://github.com/microsoft/typespec/pull/9819) Add codefix support in the playground. Quick fixes are now surfaced as Monaco code actions when the cursor is on a diagnostic. +- [#9890](https://github.com/microsoft/typespec/pull/9890) Add support for oneOf option schemas. +- [#9843](https://github.com/microsoft/typespec/pull/9843) Redesigned emitter options dialog into a config panel allowing to edit the raw `tspconfig.yaml` + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + +### Bug Fixes + +- [#9760](https://github.com/microsoft/typespec/pull/9760) Optimization: Fetch all libraries in parallel + + +## 0.12.0 + +### Features + +- [#9535](https://github.com/microsoft/typespec/pull/9535) Update sample dropdown to a drawer opening a sample gallery + +### Bump dependencies + +- [#9446](https://github.com/microsoft/typespec/pull/9446) Upgrade dependencies + + ## 0.11.4 ### Bump dependencies diff --git a/packages/playground/package.json b/packages/playground/package.json index d661a179039..53e34a7c610 100644 --- a/packages/playground/package.json +++ b/packages/playground/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/playground", - "version": "0.11.4", + "version": "0.14.0", "author": "Microsoft Corporation", "description": "TypeSpec playground UI components.", "homepage": "https://typespec.io", @@ -51,7 +51,7 @@ "./styles.css": "./dist/style.css" }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./dist-dev ./temp ./typespecContents.json", @@ -61,8 +61,8 @@ "build:storybook": "sb build", "preview": "pnpm build && vite preview", "start": "vite", - "test": "echo 'no tests'", - "test:ci": "echo 'no tests'", + "test": "vitest run", + "test:ci": "vitest run --coverage --reporter=junit --reporter=default", "lint": "eslint . --max-warnings=0", "lint:fix": "eslint . --fix" }, @@ -72,8 +72,8 @@ "!dist/test/**" ], "dependencies": { - "@fluentui/react-components": "~9.72.3", - "@fluentui/react-icons": "^2.0.292", + "@fluentui/react-components": "catalog:", + "@fluentui/react-icons": "catalog:", "@typespec/bundler": "workspace:^", "@typespec/compiler": "workspace:^", "@typespec/html-program-viewer": "workspace:^", @@ -83,38 +83,43 @@ "@typespec/protobuf": "workspace:^", "@typespec/rest": "workspace:^", "@typespec/versioning": "workspace:^", - "clsx": "^2.1.1", - "debounce": "~3.0.0", - "lzutf8": "0.6.3", - "monaco-editor": "~0.55.0", - "react": "~19.2.3", - "react-dom": "~19.2.3", - "react-error-boundary": "^6.0.0", - "swagger-ui-dist": "^5.20.1", - "vscode-languageserver": "~9.0.1", - "vscode-languageserver-textdocument": "~1.0.12" + "clsx": "catalog:", + "debounce": "catalog:", + "lzutf8": "catalog:", + "monaco-editor": "catalog:", + "react": "catalog:", + "react-dom": "catalog:", + "react-error-boundary": "catalog:", + "swagger-ui-dist": "catalog:", + "vscode-languageserver": "catalog:", + "vscode-languageserver-textdocument": "catalog:", + "yaml": "catalog:" }, "devDependencies": { - "@babel/core": "^7.26.10", - "@playwright/test": "^1.57.0", - "@storybook/cli": "^10.1.8", - "@storybook/react-vite": "^10.1.8", - "@types/debounce": "~1.2.4", - "@types/node": "~25.0.2", - "@types/react": "~19.2.7", - "@types/react-dom": "~19.2.2", - "@types/swagger-ui-dist": "~3.30.5", + "@babel/core": "catalog:", + "@playwright/test": "catalog:", + "@storybook/cli": "catalog:", + "@storybook/react-vite": "catalog:", + "@testing-library/dom": "catalog:", + "@testing-library/jest-dom": "catalog:", + "@testing-library/react": "catalog:", + "@types/debounce": "catalog:", + "@types/node": "catalog:", + "@types/react": "catalog:", + "@types/react-dom": "catalog:", + "@types/swagger-ui-dist": "catalog:", "@typespec/bundler": "workspace:^", "@typespec/react-components": "workspace:^", - "@vitejs/plugin-react": "~5.1.2", - "c8": "^10.1.3", - "cross-env": "~10.1.0", - "es-module-shims": "~2.8.0", - "rimraf": "~6.1.2", - "storybook": "^10.1.8", - "typescript": "~5.9.2", - "vite": "^7.2.7", - "vite-plugin-checker": "^0.12.0", - "vite-plugin-dts": "4.5.4" + "@vitejs/plugin-react": "catalog:", + "c8": "catalog:", + "cross-env": "catalog:", + "es-module-shims": "catalog:", + "rimraf": "catalog:", + "storybook": "catalog:", + "typescript": "catalog:", + "vite": "catalog:", + "vite-plugin-checker": "catalog:", + "vite-plugin-dts": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/playground/src/browser-host.ts b/packages/playground/src/browser-host.ts index 0845abcf9b6..3e4b23250e9 100644 --- a/packages/playground/src/browser-host.ts +++ b/packages/playground/src/browser-host.ts @@ -21,25 +21,38 @@ export function createBrowserHostInternal(options: BrowserHostCreateOptions): Br const virtualFs = new Map(); const jsImports = new Map>(); - const libraries = options.libraries; - for (const [libName, { _TypeSpecLibrary_ }] of Object.entries(libraries)) { - for (const [key, value] of Object.entries(_TypeSpecLibrary_.typespecSourceFiles)) { + const libraries: Record = { + ...options.libraries, + }; + + function registerLibraryFiles( + libName: string, + lib: PlaygroundTspLibrary & { _TypeSpecLibrary_: any }, + ) { + for (const [key, value] of Object.entries(lib._TypeSpecLibrary_.typespecSourceFiles)) { virtualFs.set(`/test/node_modules/${libName}/${key}`, value); } - for (const [key, value] of Object.entries(_TypeSpecLibrary_.jsSourceFiles)) { + for (const [key, value] of Object.entries(lib._TypeSpecLibrary_.jsSourceFiles)) { addJsImport(`/test/node_modules/${libName}/${key}`, value); } } - virtualFs.set( - `/test/package.json`, - JSON.stringify({ - name: "playground-pkg", - dependencies: Object.fromEntries( - Object.values(libraries).map((x) => [x.name, x.packageJson.version]), - ), - }), - ); + function updatePackageJson() { + virtualFs.set( + `/test/package.json`, + JSON.stringify({ + name: "playground-pkg", + dependencies: Object.fromEntries( + Object.values(libraries).map((x) => [x.name, x.packageJson.version]), + ), + }), + ); + } + + for (const [libName, lib] of Object.entries(libraries)) { + registerLibraryFiles(libName, lib); + } + updatePackageJson(); function addJsImport(path: string, value: any) { virtualFs.set(path, ""); @@ -170,6 +183,35 @@ export function createBrowserHostInternal(options: BrowserHostCreateOptions): Br }; } +/** + * Load libraries in parallel from the given list. + * @param libsToLoad List of library names. Must be available in the webpage importmap. + * @param importOptions Import configuration. + */ +export async function loadLibraries( + libsToLoad: readonly string[], + importOptions: LibraryImportOptions = {}, +): Promise> { + const entries = await Promise.all( + libsToLoad.map(async (libName) => { + const { _TypeSpecLibrary_, $lib, $linter } = (await importLibrary( + libName, + importOptions, + )) as any; + const lib: PlaygroundTspLibrary & { _TypeSpecLibrary_: any } = { + name: libName, + isEmitter: $lib?.emitter, + definition: $lib, + packageJson: JSON.parse(_TypeSpecLibrary_.typespecSourceFiles["package.json"]), + linter: $linter, + _TypeSpecLibrary_, + }; + return [libName, lib] as const; + }), + ); + return Object.fromEntries(entries); +} + /** * Create the browser host from the list of libraries. * @param libsToLoad List of libraries to load. Those must be set in the webpage importmap. @@ -180,23 +222,12 @@ export async function createBrowserHost( libsToLoad: readonly string[], importOptions: LibraryImportOptions = {}, ): Promise { - const libraries: Record = {}; - for (const libName of libsToLoad) { - const { _TypeSpecLibrary_, $lib, $linter } = (await importLibrary( - libName, - importOptions, - )) as any; - libraries[libName] = { - name: libName, - isEmitter: $lib?.emitter, - definition: $lib, - packageJson: JSON.parse(_TypeSpecLibrary_.typespecSourceFiles["package.json"]), - linter: $linter, - _TypeSpecLibrary_, - }; - } + const [libraries, compiler] = await Promise.all([ + loadLibraries(libsToLoad, importOptions), + importTypeSpecCompiler(importOptions), + ]); return createBrowserHostInternal({ - compiler: await importTypeSpecCompiler(importOptions), + compiler, libraries, }); } diff --git a/packages/playground/src/editor-command-bar/editor-command-bar.module.css b/packages/playground/src/editor-command-bar/editor-command-bar.module.css deleted file mode 100644 index d2a83ae6c1a..00000000000 --- a/packages/playground/src/editor-command-bar/editor-command-bar.module.css +++ /dev/null @@ -1,11 +0,0 @@ -.bar { - border-bottom: 1px solid var(--colorNeutralStroke1); -} - -.divider { - flex: 1; -} - -.spacer { - width: 10px; -} diff --git a/packages/playground/src/editor-command-bar/editor-command-bar.tsx b/packages/playground/src/editor-command-bar/editor-command-bar.tsx index 05932be20ba..58a198ca0f9 100644 --- a/packages/playground/src/editor-command-bar/editor-command-bar.tsx +++ b/packages/playground/src/editor-command-bar/editor-command-bar.tsx @@ -1,53 +1,48 @@ -import { Link, Toolbar, ToolbarButton, Tooltip } from "@fluentui/react-components"; -import { Broom16Filled, Bug16Regular, Save16Regular } from "@fluentui/react-icons"; -import type { CompilerOptions } from "@typespec/compiler"; -import { useMemo, type FunctionComponent, type ReactNode } from "react"; +import { + Broom16Filled, + Bug16Regular, + Checkmark16Regular, + DocumentBulletList24Regular, + Save16Regular, +} from "@fluentui/react-icons"; +import { useCallback, useMemo, useState, type FunctionComponent } from "react"; import { EmitterDropdown } from "../react/emitter-dropdown.js"; -import { SamplesDropdown } from "../react/samples-dropdown.js"; -import { CompilerSettingsDialogButton } from "../react/settings/compiler-settings-dialog-button.js"; +import type { CommandBarItem } from "../react/responsive-command-bar/index.js"; +import { ResponsiveCommandBar } from "../react/responsive-command-bar/index.js"; +import { SamplesDrawerOverlay, SamplesDrawerTrigger } from "../react/samples-drawer/index.js"; +import { useIsMobile } from "../react/use-mobile.js"; import type { BrowserHost, PlaygroundSample } from "../types.js"; -import style from "./editor-command-bar.module.css"; export interface EditorCommandBarProps { - documentationUrl?: string; saveCode: () => Promise | void; formatCode: () => Promise | void; fileBug?: () => Promise | void; - commandBarButtons?: ReactNode; + /** Additional items provided by the consumer. */ + commandBarItems?: readonly CommandBarItem[]; host: BrowserHost; selectedEmitter: string; onSelectedEmitterChange: (emitter: string) => void; - compilerOptions: CompilerOptions; - onCompilerOptionsChange: (options: CompilerOptions) => void; samples?: Record; selectedSampleName: string; onSelectedSampleNameChange: (sampleName: string) => void; } -export const EditorCommandBar: FunctionComponent = ({ - documentationUrl, - saveCode, - formatCode, - fileBug, - host, - selectedEmitter, - onSelectedEmitterChange, - compilerOptions, - onCompilerOptionsChange, - samples, - selectedSampleName, - onSelectedSampleNameChange, - commandBarButtons, -}) => { - const documentation = documentationUrl ? ( - - ) : undefined; - const bugButton = fileBug ? : undefined; +export const EditorCommandBar: FunctionComponent = (props) => { + const { + saveCode, + formatCode, + fileBug, + host, + selectedEmitter, + onSelectedEmitterChange, + samples, + onSelectedSampleNameChange, + commandBarItems: externalItems, + } = props; + + const isMobile = useIsMobile(); + const [samplesDrawerOpen, setSamplesDrawerOpen] = useState(false); const emitters = useMemo( () => @@ -57,62 +52,100 @@ export const EditorCommandBar: FunctionComponent = ({ [host.libraries], ); - return ( -
- - - } onClick={saveCode as any} /> - - - } onClick={formatCode as any} /> - - {samples && ( - <> - -
- - )} + const handleFileBug = useCallback(() => { + if (fileBug) void fileBug(); + }, [fileBug]); + + const items = useMemo(() => { + const result: CommandBarItem[] = [ + { + id: "save", + label: "Save", + icon: , + onClick: saveCode as () => void, + pinned: true, + }, + { + id: "format", + label: "Format", + icon: , + onClick: formatCode as () => void, + pinned: true, + }, + ]; + + if (samples) { + result.push({ + id: "samples", + label: "Browse Samples", + icon: , + onClick: () => setSamplesDrawerOpen(true), + toolbarItem: ( + + ), + }); + } + + result.push({ + id: "emitter", + label: "Emitter", + toolbarItem: ( + ), + children: emitters.map((emitter) => ({ + id: `emitter-${emitter}`, + label: emitter, + icon: emitter === selectedEmitter ? : undefined, + onClick: () => onSelectedEmitterChange(emitter), + })), + }); - {documentation && ( - <> -
- {documentation} - - )} -
- {commandBarButtons} - {bugButton} - - -
- ); -}; + if (externalItems) { + result.push(...externalItems); + } + + if (fileBug) { + result.push({ + id: "file-bug", + label: "File Bug", + align: "right", + icon: , + onClick: handleFileBug, + }); + } + + return result; + }, [ + saveCode, + formatCode, + samples, + onSelectedSampleNameChange, + emitters, + selectedEmitter, + onSelectedEmitterChange, + externalItems, + fileBug, + handleFileBug, + ]); -interface FileBugButtonProps { - onClick: () => Promise | void; -} -const FileBugButton: FunctionComponent = ({ onClick }) => { return ( - - } - onClick={onClick as any} - > - + <> + + {isMobile && samples && ( + + )} + ); }; diff --git a/packages/playground/src/react/breadcrumb/file-breadcrumb.module.css b/packages/playground/src/react/breadcrumb/file-breadcrumb.module.css new file mode 100644 index 00000000000..aeafcebf9f6 --- /dev/null +++ b/packages/playground/src/react/breadcrumb/file-breadcrumb.module.css @@ -0,0 +1,27 @@ +.breadcrumb { + display: flex; + align-items: center; + padding: 4px 12px; + font-size: 12px; + height: 26px; + border-bottom: 1px solid var(--colorNeutralStroke1); + background: var(--colorNeutralBackground1); + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + flex-shrink: 0; +} + +.segment { + display: inline-flex; + align-items: center; +} + +.separator { + margin: 0 4px; + color: var(--colorNeutralForeground4); +} + +.current { + font-weight: 600; +} diff --git a/packages/playground/src/react/breadcrumb/file-breadcrumb.tsx b/packages/playground/src/react/breadcrumb/file-breadcrumb.tsx new file mode 100644 index 00000000000..2b915e80132 --- /dev/null +++ b/packages/playground/src/react/breadcrumb/file-breadcrumb.tsx @@ -0,0 +1,27 @@ +import type { FunctionComponent } from "react"; +import style from "./file-breadcrumb.module.css"; + +export interface FileBreadcrumbProps { + readonly path: string; +} + +export const FileBreadcrumb: FunctionComponent = ({ path }) => { + if (!path || !path.includes("/")) { + return null; + } + + const segments = path.split("/"); + + return ( +
+ {segments.map((segment, index) => ( + + {index > 0 && /} + + {segment} + + + ))} +
+ ); +}; diff --git a/packages/playground/src/react/breadcrumb/index.ts b/packages/playground/src/react/breadcrumb/index.ts new file mode 100644 index 00000000000..22e93bb4007 --- /dev/null +++ b/packages/playground/src/react/breadcrumb/index.ts @@ -0,0 +1 @@ +export { FileBreadcrumb, type FileBreadcrumbProps } from "./file-breadcrumb.js"; diff --git a/packages/playground/src/react/editor-panel/config-panel.module.css b/packages/playground/src/react/editor-panel/config-panel.module.css new file mode 100644 index 00000000000..a858c1a508d --- /dev/null +++ b/packages/playground/src/react/editor-panel/config-panel.module.css @@ -0,0 +1,25 @@ +.config-panel { + display: flex; + flex-direction: column; + height: 100%; + overflow: hidden; +} + +.config-toggle { + display: flex; + align-items: center; + padding: 4px 8px; + border-bottom: 1px solid var(--colorNeutralStroke1); + gap: 8px; + flex-shrink: 0; +} + +.config-content { + flex: 1; + min-height: 0; + overflow: auto; +} + +.form-content { + padding: 12px; +} diff --git a/packages/playground/src/react/editor-panel/config-panel.tsx b/packages/playground/src/react/editor-panel/config-panel.tsx new file mode 100644 index 00000000000..798cb09015b --- /dev/null +++ b/packages/playground/src/react/editor-panel/config-panel.tsx @@ -0,0 +1,117 @@ +import { Tab, TabList, type SelectTabEventHandler } from "@fluentui/react-components"; +import type { CompilerOptions } from "@typespec/compiler"; +import debounce from "debounce"; +import { useCallback, useEffect, useMemo, useRef, useState, type FunctionComponent } from "react"; +import type { BrowserHost } from "../../types.js"; +import { Editor, useMonacoModel } from "../editor.js"; +import type { PlaygroundEditorsOptions } from "../playground.js"; +import { CompilerSettings } from "../settings/compiler-settings.js"; +import style from "./config-panel.module.css"; +import { compilerOptionsToTspConfig, parseTspConfigYaml } from "./tspconfig-utils.js"; + +export interface ConfigPanelProps { + host: BrowserHost; + selectedEmitter: string; + compilerOptions: CompilerOptions; + onCompilerOptionsChange: (options: CompilerOptions) => void; + onSelectedEmitterChange: (emitter: string) => void; + editorOptions?: PlaygroundEditorsOptions; +} + +type ConfigMode = "form" | "yaml"; + +export const ConfigPanel: FunctionComponent = ({ + host, + selectedEmitter, + compilerOptions, + onCompilerOptionsChange, + onSelectedEmitterChange, + editorOptions, +}) => { + const [mode, setMode] = useState("form"); + const yamlModel = useMonacoModel("inmemory://test/tspconfig.yaml", "yaml"); + + // Tracks whether the last state change originated from the YAML editor. + // Persists across the render cycle so the sync-back effect can see it. + const changeFromYamlRef = useRef(false); + + // Sync external changes (e.g. emitter dropdown) → YAML model when in yaml mode. + // Skips when the change originated from the YAML editor itself. + useEffect(() => { + if (mode !== "yaml") return; + if (changeFromYamlRef.current) { + changeFromYamlRef.current = false; + return; + } + const yaml = compilerOptionsToTspConfig(selectedEmitter, compilerOptions); + const current = yamlModel.getValue(); + if (current !== yaml) { + yamlModel.setValue(yaml); + } + }, [selectedEmitter, compilerOptions, mode, yamlModel]); + + // Debounced YAML → CompilerOptions parsing + const parseAndSync = useMemo( + () => + debounce((content: string) => { + const parsed = parseTspConfigYaml(content); + if (!parsed) return; // Invalid YAML — don't touch state + changeFromYamlRef.current = true; + if (parsed.selectedEmitter && parsed.selectedEmitter !== selectedEmitter) { + onSelectedEmitterChange(parsed.selectedEmitter); + } + onCompilerOptionsChange(parsed.compilerOptions); + }, 200), + [selectedEmitter, onCompilerOptionsChange, onSelectedEmitterChange], + ); + + // Listen for YAML model changes + useEffect(() => { + const disposable = yamlModel.onDidChangeContent(() => { + parseAndSync(yamlModel.getValue()); + }); + return () => { + parseAndSync.clear(); + disposable.dispose(); + }; + }, [yamlModel, parseAndSync]); + + // Populate YAML model when switching to yaml mode + const handleModeChange = useCallback( + (_, data) => { + const newMode = data.value as ConfigMode; + if (newMode === "yaml") { + const yaml = compilerOptionsToTspConfig(selectedEmitter, compilerOptions); + yamlModel.setValue(yaml); + } + setMode(newMode); + }, + [selectedEmitter, compilerOptions, yamlModel], + ); + + return ( +
+
+ + Visual + Yaml + +
+
+ {mode === "form" ? ( +
+ +
+ ) : ( + + )} +
+
+ ); +}; diff --git a/packages/playground/src/react/editor-panel/editor-panel.module.css b/packages/playground/src/react/editor-panel/editor-panel.module.css new file mode 100644 index 00000000000..c45aca723db --- /dev/null +++ b/packages/playground/src/react/editor-panel/editor-panel.module.css @@ -0,0 +1,16 @@ +.editor-panel { + display: flex; + flex-direction: row; + height: 100%; +} + +.panel-tabs-container { + background-color: var(--colorNeutralBackground3); +} + +.panel-content { + flex: 1; + min-width: 0; + display: flex; + flex-direction: column; +} diff --git a/packages/playground/src/react/editor-panel/editor-panel.tsx b/packages/playground/src/react/editor-panel/editor-panel.tsx new file mode 100644 index 00000000000..11369bb894d --- /dev/null +++ b/packages/playground/src/react/editor-panel/editor-panel.tsx @@ -0,0 +1,103 @@ +import { Tab, TabList, type SelectTabEventHandler } from "@fluentui/react-components"; +import { SettingsRegular } from "@fluentui/react-icons"; +import type { CompilerOptions } from "@typespec/compiler"; +import { editor } from "monaco-editor"; +import { useCallback, useState, type FunctionComponent, type ReactNode } from "react"; +import type { BrowserHost } from "../../types.js"; +import type { OnMountData } from "../editor.js"; +import type { PlaygroundEditorsOptions } from "../playground.js"; +import { TypeSpecEditor } from "../typespec-editor.js"; +import { ConfigPanel } from "./config-panel.js"; +import style from "./editor-panel.module.css"; + +export type EditorPanelTab = "tsp" | "cfg"; + +const TypeSpecIcon = () => ( + // icons/raw/tsp-logo-inverted.svg + + + +); + +export interface EditorPanelProps { + host: BrowserHost; + model: editor.IModel; + actions?: editor.IActionDescriptor[]; + editorOptions?: PlaygroundEditorsOptions; + onMount?: (data: OnMountData) => void; + + selectedEmitter: string; + compilerOptions: CompilerOptions; + onCompilerOptionsChange: (options: CompilerOptions) => void; + onSelectedEmitterChange: (emitter: string) => void; + + /** Toolbar content rendered above the editor area */ + commandBar?: ReactNode; +} + +export const EditorPanel: FunctionComponent = ({ + host, + model, + actions, + editorOptions, + onMount, + selectedEmitter, + compilerOptions, + onCompilerOptionsChange, + onSelectedEmitterChange, + commandBar, +}) => { + const [selectedTab, setSelectedTab] = useState("tsp"); + + const onTabSelect = useCallback((_, data) => { + setSelectedTab(data.value as EditorPanelTab); + }, []); + + return ( +
+
+ + + + + + + + + + + + +
+
+ {commandBar} + {selectedTab === "tsp" ? ( + + ) : ( + + )} +
+
+ ); +}; diff --git a/packages/playground/src/react/editor-panel/index.ts b/packages/playground/src/react/editor-panel/index.ts new file mode 100644 index 00000000000..e86a41dc6b6 --- /dev/null +++ b/packages/playground/src/react/editor-panel/index.ts @@ -0,0 +1,2 @@ +export { ConfigPanel, type ConfigPanelProps } from "./config-panel.js"; +export { EditorPanel, type EditorPanelProps, type EditorPanelTab } from "./editor-panel.js"; diff --git a/packages/playground/src/react/editor-panel/tspconfig-utils.ts b/packages/playground/src/react/editor-panel/tspconfig-utils.ts new file mode 100644 index 00000000000..b0a2506ad3e --- /dev/null +++ b/packages/playground/src/react/editor-panel/tspconfig-utils.ts @@ -0,0 +1,70 @@ +import type { CompilerOptions, LinterRuleSet } from "@typespec/compiler"; +import { parse, stringify } from "yaml"; + +export interface TspConfig { + emit?: string[]; + options?: Record>; + linter?: LinterRuleSet; + imports?: string[]; + trace?: string | string[]; + "warn-as-error"?: boolean; + "output-dir"?: string; +} + +/** + * Serialize the current playground state (emitter + compiler options) to tspconfig.yaml content. + */ +export function compilerOptionsToTspConfig( + selectedEmitter: string, + compilerOptions: CompilerOptions, +): string { + const config: TspConfig = {}; + + if (selectedEmitter) { + config.emit = [selectedEmitter]; + } + + if (compilerOptions.options && Object.keys(compilerOptions.options).length > 0) { + config.options = compilerOptions.options; + } + + if (compilerOptions.linterRuleSet) { + config.linter = compilerOptions.linterRuleSet; + } + + return stringify(config, { indent: 2 }) || ""; +} + +export interface ParsedTspConfig { + selectedEmitter?: string; + compilerOptions: CompilerOptions; +} + +/** + * Parse tspconfig.yaml content back to playground state. + * Returns undefined if the YAML is invalid. + */ +export function parseTspConfigYaml(yamlContent: string): ParsedTspConfig | undefined { + try { + const config = parse(yamlContent) as TspConfig | null; + if (!config || typeof config !== "object") { + return { compilerOptions: {} }; + } + + const compilerOptions: CompilerOptions = {}; + + if (config.options) { + compilerOptions.options = config.options; + } + + if (config.linter) { + compilerOptions.linterRuleSet = config.linter; + } + + const selectedEmitter = config.emit?.[0]; + + return { selectedEmitter, compilerOptions }; + } catch { + return undefined; + } +} diff --git a/packages/playground/src/react/file-tree/file-tree.module.css b/packages/playground/src/react/file-tree/file-tree.module.css new file mode 100644 index 00000000000..885dcf573fb --- /dev/null +++ b/packages/playground/src/react/file-tree/file-tree.module.css @@ -0,0 +1,6 @@ +.file-tree { + height: 100%; + overflow: auto; + background: var(--colorNeutralBackground3); + padding-top: 4px; +} diff --git a/packages/playground/src/react/file-tree/file-tree.tsx b/packages/playground/src/react/file-tree/file-tree.tsx new file mode 100644 index 00000000000..22e799bbeed --- /dev/null +++ b/packages/playground/src/react/file-tree/file-tree.tsx @@ -0,0 +1,107 @@ +import { Tree, type TreeNode } from "@typespec/react-components"; +import { useMemo, type FC, type FunctionComponent } from "react"; +import style from "./file-tree.module.css"; + +import { DocumentRegular, FolderRegular } from "@fluentui/react-icons"; + +export interface FileTreeExplorerProps { + readonly files: string[]; + readonly selected: string; + readonly onSelect: (file: string) => void; +} + +interface FileTreeNode extends TreeNode { + readonly isDirectory: boolean; +} + +const FileNodeIcon: FC<{ node: FileTreeNode }> = ({ node }) => { + if (node.isDirectory) { + return ; + } + return ; +}; + +/** + * Builds a tree structure from a flat list of file paths. + */ +function buildTree(files: string[]): FileTreeNode { + const root: FileTreeNode = { id: "__root__", name: "root", isDirectory: true, children: [] }; + const dirMap = new Map(); + dirMap.set("", root); + + function ensureDir(dirPath: string): FileTreeNode { + if (dirMap.has(dirPath)) { + return dirMap.get(dirPath)!; + } + const parts = dirPath.split("/"); + const parentPath = parts.slice(0, -1).join("/"); + const parent = ensureDir(parentPath); + const node: FileTreeNode = { + id: dirPath, + name: parts[parts.length - 1], + isDirectory: true, + children: [], + }; + dirMap.set(dirPath, node); + (parent.children as FileTreeNode[]).push(node); + return node; + } + + for (const file of [...files].sort()) { + const lastSlash = file.lastIndexOf("/"); + if (lastSlash === -1) { + (root.children as FileTreeNode[]).push({ + id: file, + name: file, + isDirectory: false, + }); + } else { + const dirPath = file.substring(0, lastSlash); + const fileName = file.substring(lastSlash + 1); + const parent = ensureDir(dirPath); + (parent.children as FileTreeNode[]).push({ + id: file, + name: fileName, + isDirectory: false, + }); + } + } + + // Sort children: directories first, then files, alphabetically within each group + function sortChildren(node: FileTreeNode) { + if (node.children) { + (node.children as FileTreeNode[]).sort((a, b) => { + if (a.isDirectory !== b.isDirectory) { + return a.isDirectory ? -1 : 1; + } + return String(a.name).localeCompare(String(b.name)); + }); + for (const child of node.children as FileTreeNode[]) { + sortChildren(child); + } + } + } + sortChildren(root); + + return root; +} + +export const FileTreeExplorer: FunctionComponent = ({ + files, + selected, + onSelect, +}) => { + const tree = useMemo(() => buildTree(files), [files]); + + return ( +
+ + tree={tree} + selectionMode="single" + selected={selected} + onSelect={onSelect} + nodeIcon={FileNodeIcon} + /> +
+ ); +}; diff --git a/packages/playground/src/react/file-tree/index.ts b/packages/playground/src/react/file-tree/index.ts new file mode 100644 index 00000000000..c8022943d20 --- /dev/null +++ b/packages/playground/src/react/file-tree/index.ts @@ -0,0 +1 @@ +export { FileTreeExplorer, type FileTreeExplorerProps } from "./file-tree.js"; diff --git a/packages/playground/src/react/index.ts b/packages/playground/src/react/index.ts index 78571a7f948..e0894f80339 100644 --- a/packages/playground/src/react/index.ts +++ b/packages/playground/src/react/index.ts @@ -1,3 +1,4 @@ +export type { CommandBarItem } from "../react/responsive-command-bar/index.js"; export { usePlaygroundContext } from "./context/index.js"; export { DiagnosticList } from "./diagnostic-list/diagnostic-list.js"; export type { DiagnosticListProps } from "./diagnostic-list/diagnostic-list.js"; diff --git a/packages/playground/src/react/output-view/file-viewer.tsx b/packages/playground/src/react/output-view/file-viewer.tsx index 185b06de290..c65c3a02624 100644 --- a/packages/playground/src/react/output-view/file-viewer.tsx +++ b/packages/playground/src/react/output-view/file-viewer.tsx @@ -1,6 +1,9 @@ import { FolderListRegular } from "@fluentui/react-icons"; -import { useCallback, useEffect, useState } from "react"; +import { Pane, SplitPane } from "@typespec/react-components"; +import { useCallback, useEffect, useMemo, useState } from "react"; +import { FileBreadcrumb } from "../breadcrumb/index.js"; import { FileOutput } from "../file-output/file-output.js"; +import { FileTreeExplorer } from "../file-tree/index.js"; import { OutputTabs } from "../output-tabs/output-tabs.js"; import type { FileOutputViewer, OutputViewerProps, ProgramViewer } from "../types.js"; @@ -14,6 +17,13 @@ const FileViewerComponent = ({ const [filename, setFilename] = useState(""); const [content, setContent] = useState(""); + const showFileTree = useMemo( + () => + outputFiles.length > 1 && + (outputFiles.some((f) => f.includes("/")) || outputFiles.length >= 3), + [outputFiles], + ); + const loadOutputFile = useCallback( async (path: string) => { const contents = await program.host.readFile("./tsp-output/" + path); @@ -33,21 +43,48 @@ const FileViewerComponent = ({ } }, [program, outputFiles, loadOutputFile, filename]); - const handleTabSelection = useCallback( + const handleFileSelection = useCallback( (newFilename: string) => { - setFilename(newFilename); - void loadOutputFile(newFilename); + // Only select files, not directories + if (outputFiles.includes(newFilename)) { + setFilename(newFilename); + void loadOutputFile(newFilename); + } }, - [loadOutputFile], + [loadOutputFile, outputFiles], ); if (outputFiles.length === 0) { return <>No files emitted.; } + if (showFileTree) { + return ( +
+ + + + + +
+ +
+ +
+
+ + +
+ ); + } + return (
- +
diff --git a/packages/playground/src/react/output-view/output-view.module.css b/packages/playground/src/react/output-view/output-view.module.css index 7dd38706938..b6bd903e0ef 100644 --- a/packages/playground/src/react/output-view/output-view.module.css +++ b/packages/playground/src/react/output-view/output-view.module.css @@ -18,6 +18,17 @@ min-height: 0; } +.file-viewer-content-with-breadcrumb { + display: flex; + flex-direction: column; + height: 100%; +} + +.file-viewer-content-with-breadcrumb .file-viewer-content { + flex: 1; + min-height: 0; +} + .type-graph-viewer { height: 100%; overflow-y: auto; diff --git a/packages/playground/src/react/playground.module.css b/packages/playground/src/react/playground.module.css index 6f6b9ac94d7..52a4c5aaee8 100644 --- a/packages/playground/src/react/playground.module.css +++ b/packages/playground/src/react/playground.module.css @@ -10,3 +10,10 @@ display: flex; flex-direction: column; } + +.single-pane { + display: flex; + flex-direction: column; + height: 100%; + width: 100%; +} diff --git a/packages/playground/src/react/playground.tsx b/packages/playground/src/react/playground.tsx index d96219db5ff..4598b46ddf2 100644 --- a/packages/playground/src/react/playground.tsx +++ b/packages/playground/src/react/playground.tsx @@ -16,18 +16,21 @@ import { import { CompletionItemTag } from "vscode-languageserver"; import { resolveVirtualPath } from "../browser-host.js"; import { EditorCommandBar } from "../editor-command-bar/editor-command-bar.js"; -import { getMonacoRange } from "../services.js"; +import { getMonacoRange, updateDiagnosticsForCodeFixes } from "../services.js"; import type { BrowserHost, PlaygroundSample } from "../types.js"; import { PlaygroundContextProvider } from "./context/playground-context.js"; import { debugGlobals, printDebugInfo } from "./debug.js"; import { DefaultFooter } from "./default-footer.js"; +import { EditorPanel } from "./editor-panel/editor-panel.js"; import { useMonacoModel, type OnMountData } from "./editor.js"; import { OutputView } from "./output-view/output-view.js"; import style from "./playground.module.css"; import { ProblemPane } from "./problem-pane/index.js"; +import type { CommandBarItem } from "./responsive-command-bar/index.js"; import type { CompilationState, FileOutputViewer, ProgramViewer } from "./types.js"; -import { TypeSpecEditor } from "./typespec-editor.js"; +import { useIsMobile } from "./use-mobile.js"; import { usePlaygroundState, type PlaygroundState } from "./use-playground-state.js"; +import { ViewToggle, type ViewMode } from "./view-toggle.js"; // Re-export the PlaygroundState type for convenience export type { PlaygroundState }; @@ -59,11 +62,8 @@ export interface PlaygroundProps { onFileBug?: () => void; - /** Additional buttons to show up in the command bar */ - commandBarButtons?: ReactNode; - - /** Playground links */ - links?: PlaygroundLinks; + /** Additional items to show in the command bar. */ + commandBarItems?: CommandBarItem[]; /** Custom viewers to view the typespec program */ viewers?: ProgramViewer[]; @@ -93,11 +93,6 @@ export interface PlaygroundSaveData extends PlaygroundState { emitter: string; } -export interface PlaygroundLinks { - /** Link to documentation */ - documentationUrl?: string; -} - /** * Playground component for TypeSpec with consolidated state management. * @@ -224,12 +219,16 @@ export const Playground: FunctionComponent = (props) => { tags: diag.code === "deprecated" ? [CompletionItemTag.Deprecated] : undefined, })); + // Update code action provider with current diagnostics (for codefix support). + updateDiagnosticsForCodeFixes(typespecCompiler, state.program.diagnostics); + // Set the program on the window. debugGlobals().program = state.program; debugGlobals().$$ = $(state.program); editor.setModelMarkers(typespecModel, "owner", markers ?? []); } else { + updateDiagnosticsForCodeFixes(typespecCompiler, []); editor.setModelMarkers(typespecModel, "owner", []); } }, [host, selectedEmitter, compilerOptions, typespecModel]); @@ -326,51 +325,81 @@ export const Playground: FunctionComponent = (props) => { }; }, [host, typespecModel, onContentChange]); + const isMobile = useIsMobile(); + const [viewMode, setViewMode] = useState("editor"); + + // Reset to "editor" when entering mobile, force "both" on desktop + useEffect(() => { + if (!isMobile) { + setViewMode("both"); + } else { + setViewMode("editor"); + } + }, [isMobile]); + + const commandBar = ( + + ); + + const editorPanel = ( + + ); + + const outputPanel = ( + + ); + + const mainContent = + viewMode === "both" ? ( + + {editorPanel} + {outputPanel} + + ) : viewMode === "editor" ? ( +
{editorPanel}
+ ) : ( +
{outputPanel}
+ ); + return (
+ {isMobile && ( + + )} - - - - - - - - - - - + {mainContent} void; + /** If true, always visible as an icon button. If false (default), goes to overflow menu on mobile. */ + readonly pinned?: boolean; + /** Sub-items rendered as a dropdown (desktop) or nested submenu (mobile). */ + readonly children?: readonly CommandBarItem[]; + /** Additional content rendered alongside the command bar (e.g., dialogs triggered by children). */ + readonly content?: ReactNode; + /** Custom toolbar element for desktop rendering. Overrides default and children-based rendering. */ + readonly toolbarItem?: ReactNode; + /** Custom menu element for mobile overflow menu. Overrides default and children-based rendering. */ + readonly menuItem?: ReactNode; + /** Alignment group on the desktop toolbar. Defaults to "left". */ + readonly align?: "left" | "right"; +} + +export interface ResponsiveCommandBarProps { + /** The items to render in the command bar. */ + readonly items: readonly CommandBarItem[]; + /** Whether to render in mobile (compact) mode. */ + readonly isMobile: boolean; +} + +/** + * A generic responsive command bar that renders items as a toolbar on desktop + * and collapses non-pinned items into a hamburger overflow menu on mobile. + */ +export const ResponsiveCommandBar: FunctionComponent = ({ + items, + isMobile, +}) => { + const pinnedItems = items.filter((i) => i.pinned); + const overflowItems = items.filter((i) => !i.pinned); + const leftItems = items.filter((i) => (i.align ?? "left") === "left"); + const rightItems = items.filter((i) => i.align === "right"); + const leftOverflow = overflowItems.filter((i) => (i.align ?? "left") === "left"); + const rightOverflow = overflowItems.filter((i) => i.align === "right"); + + return ( +
+ + {isMobile ? ( + <> + {pinnedItems.map((item) => ( + + ))} + {overflowItems.length > 0 && ( + <> +
+ + + + } + appearance="subtle" + /> + + + + + {leftOverflow.map((item) => ( + + ))} + {leftOverflow.length > 0 && rightOverflow.length > 0 && } + {rightOverflow.map((item) => ( + + ))} + + + + + )} + + ) : ( + <> + {leftItems.map((item) => ( + + ))} + {rightItems.length > 0 &&
} + {rightItems.map((item) => ( + + ))} + + )} + + {items.map((item) => item.content && {item.content})} +
+ ); +}; + +const ToolbarItemRenderer: FunctionComponent<{ item: CommandBarItem }> = ({ item }) => { + if (item.toolbarItem) return <>{item.toolbarItem}; + if (item.children) { + return ( + + + + + + + + + {item.children.map((child) => ( + + {child.label} + + ))} + + + + ); + } + return ( + + + + ); +}; + +const MenuItemRenderer: FunctionComponent<{ item: CommandBarItem }> = ({ item }) => { + if (item.menuItem) return <>{item.menuItem}; + if (item.children) { + return ( + + + {item.label} + + + + {item.children.map((child) => ( + + {child.label} + + ))} + + + + ); + } + return ( + + {item.label} + + ); +}; diff --git a/packages/playground/src/react/samples-drawer/index.ts b/packages/playground/src/react/samples-drawer/index.ts new file mode 100644 index 00000000000..aa039ba7f91 --- /dev/null +++ b/packages/playground/src/react/samples-drawer/index.ts @@ -0,0 +1,6 @@ +export { + SamplesDrawerOverlay, + SamplesDrawerTrigger, + type SamplesDrawerOverlayProps, + type SamplesDrawerProps, +} from "./samples-drawer-trigger.js"; diff --git a/packages/playground/src/react/samples-drawer/sample-card.tsx b/packages/playground/src/react/samples-drawer/sample-card.tsx new file mode 100644 index 00000000000..d20ff972495 --- /dev/null +++ b/packages/playground/src/react/samples-drawer/sample-card.tsx @@ -0,0 +1,42 @@ +import { Card, Text } from "@fluentui/react-components"; +import type { FunctionComponent } from "react"; +import type { PlaygroundSample } from "../../types.js"; +import { SampleIcon } from "./sample-icon.js"; +import style from "./samples-drawer.module.css"; + +export interface SampleCardProps { + name: string; + sample: PlaygroundSample; + onSelect: (name: string) => void; +} + +export const SampleCard: FunctionComponent = ({ name, sample, onSelect }) => { + return ( + onSelect(name)} + role="button" + tabIndex={0} + onKeyDown={(e) => { + if (e.key === "Enter" || e.key === " ") { + e.preventDefault(); + onSelect(name); + } + }} + > +
+ +
+ + {name} + + {sample.description && ( + + {sample.description} + + )} +
+
+ + ); +}; diff --git a/packages/playground/src/react/samples-drawer/sample-icon.tsx b/packages/playground/src/react/samples-drawer/sample-icon.tsx new file mode 100644 index 00000000000..aed30b3cec1 --- /dev/null +++ b/packages/playground/src/react/samples-drawer/sample-icon.tsx @@ -0,0 +1,107 @@ +import { tokens } from "@fluentui/react-components"; +import { useMemo, type FunctionComponent } from "react"; +import style from "./samples-drawer.module.css"; + +/** Generate a deterministic hash from a string */ +function hashString(str: string): number { + let hash = 0; + for (let i = 0; i < str.length; i++) { + const char = str.charCodeAt(i); + hash = (hash << 5) - hash + char; + hash = hash & hash; // Convert to 32bit integer + } + return Math.abs(hash); +} + +/** Color palette using FluentUI tokens - using Background2 for light bg */ +const iconColors = [ + { bg: tokens.colorPaletteBlueBackground2, fg: tokens.colorPaletteBlueForeground2 }, + { bg: tokens.colorPaletteGrapeBackground2, fg: tokens.colorPaletteGrapeForeground2 }, + { bg: tokens.colorPaletteForestBackground2, fg: tokens.colorPaletteForestForeground2 }, + { bg: tokens.colorPalettePumpkinBackground2, fg: tokens.colorPalettePumpkinForeground2 }, + { bg: tokens.colorPaletteMagentaBackground2, fg: tokens.colorPaletteMagentaForeground2 }, + { bg: tokens.colorPaletteTealBackground2, fg: tokens.colorPaletteTealForeground2 }, + { bg: tokens.colorPaletteGoldBackground2, fg: tokens.colorPaletteGoldForeground2 }, + { bg: tokens.colorPalettePlumBackground2, fg: tokens.colorPalettePlumForeground2 }, + { bg: tokens.colorPaletteLavenderBackground2, fg: tokens.colorPaletteLavenderForeground2 }, + { bg: tokens.colorPaletteSteelBackground2, fg: tokens.colorPaletteSteelForeground2 }, +]; + +/** Simple geometric patterns for variety */ +type PatternType = "circle" | "squares" | "triangle" | "hexagon" | "diamond"; +const patterns: PatternType[] = ["circle", "squares", "triangle", "hexagon", "diamond"]; + +export interface SampleIconProps { + name: string; +} + +export const SampleIcon: FunctionComponent = ({ name }) => { + const { colors, pattern, initials } = useMemo(() => { + const hash = hashString(name); + const colorIndex = hash % iconColors.length; + const patternIndex = (hash >> 4) % patterns.length; + // Get first letter of first two words, or first two letters + const words = name.split(/\s+/); + const init = + words.length >= 2 + ? (words[0][0] + words[1][0]).toUpperCase() + : name.slice(0, 2).toUpperCase(); + return { + colors: iconColors[colorIndex], + pattern: patterns[patternIndex], + initials: init, + }; + }, [name]); + + const renderPattern = () => { + const size = 48; + const half = size / 2; + + switch (pattern) { + case "circle": + return ; + case "squares": + return ( + <> + + + + ); + case "triangle": + return ( + + ); + case "hexagon": + return ( + + ); + case "diamond": + return ( + + ); + } + }; + + return ( + + ); +}; diff --git a/packages/playground/src/react/samples-drawer/samples-drawer-trigger.tsx b/packages/playground/src/react/samples-drawer/samples-drawer-trigger.tsx new file mode 100644 index 00000000000..ff03d07a284 --- /dev/null +++ b/packages/playground/src/react/samples-drawer/samples-drawer-trigger.tsx @@ -0,0 +1,186 @@ +import { + Button, + DrawerBody, + DrawerHeader, + DrawerHeaderTitle, + OverlayDrawer, + SearchBox, + Text, + ToolbarButton, + Tooltip, +} from "@fluentui/react-components"; +import { Dismiss24Regular, DocumentBulletList24Regular } from "@fluentui/react-icons"; +import { useCallback, useMemo, useState, type FunctionComponent } from "react"; +import type { PlaygroundSample } from "../../types.js"; +import { SampleCard } from "./sample-card.js"; +import style from "./samples-drawer.module.css"; + +export interface SamplesDrawerProps { + samples: Record; + onSelectedSampleNameChange: (sampleName: string) => void; +} + +export interface SamplesDrawerOverlayProps extends SamplesDrawerProps { + open: boolean; + onOpenChange: (open: boolean) => void; +} + +interface SampleCategory { + name: string; + entries: [string, PlaygroundSample][]; +} + +function groupAndFilterSamples( + samples: Record, + searchQuery: string, +): SampleCategory[] { + const query = searchQuery.toLowerCase().trim(); + const categoryMap = new Map(); + + for (const [name, sample] of Object.entries(samples)) { + if (query) { + const matchesName = name.toLowerCase().includes(query); + const matchesDescription = sample.description?.toLowerCase().includes(query); + const matchesCategory = sample.category?.toLowerCase().includes(query); + if (!matchesName && !matchesDescription && !matchesCategory) continue; + } + + const category = sample.category ?? "Other"; + let entries = categoryMap.get(category); + if (!entries) { + entries = []; + categoryMap.set(category, entries); + } + entries.push([name, sample]); + } + + return Array.from(categoryMap.entries()) + .map(([name, entries]) => ({ name, entries })) + .sort((a, b) => a.name.localeCompare(b.name)); +} + +/** The overlay drawer showing the sample gallery. Controlled via open/onOpenChange. */ +export const SamplesDrawerOverlay: FunctionComponent = ({ + samples, + onSelectedSampleNameChange, + open, + onOpenChange, +}) => { + const [searchQuery, setSearchQuery] = useState(""); + + const handleSampleSelect = useCallback( + (sampleName: string) => { + onSelectedSampleNameChange(sampleName); + onOpenChange(false); + }, + [onSelectedSampleNameChange, onOpenChange], + ); + + const categories = useMemo( + () => groupAndFilterSamples(samples, searchQuery), + [samples, searchQuery], + ); + const hasCategories = useMemo(() => Object.values(samples).some((s) => s.category), [samples]); + const totalFiltered = useMemo( + () => categories.reduce((sum, c) => sum + c.entries.length, 0), + [categories], + ); + + return ( + { + onOpenChange(data.open); + if (!data.open) setSearchQuery(""); + }} + position="end" + size="large" + > + + } + onClick={() => onOpenChange(false)} + /> + } + > + Sample Gallery + + + +
+ setSearchQuery(data.value)} + className={style["search-input"]} + /> +
+ + {totalFiltered === 0 ? ( +
+ No samples match your search. +
+ ) : hasCategories ? ( + categories.map((category) => ( +
+ + {category.name} + +
+ {category.entries.map(([name, sample]) => ( + + ))} +
+
+ )) + ) : ( +
+ {categories.flatMap((c) => + c.entries.map(([name, sample]) => ( + + )), + )} +
+ )} + + + ); +}; + +/** Toolbar button trigger + overlay drawer for samples. */ +export const SamplesDrawerTrigger: FunctionComponent = ({ + samples, + onSelectedSampleNameChange, +}) => { + const [isOpen, setIsOpen] = useState(false); + + return ( + <> + + } + onClick={() => setIsOpen(true)} + > + Samples + + + + + + ); +}; diff --git a/packages/playground/src/react/samples-drawer/samples-drawer.module.css b/packages/playground/src/react/samples-drawer/samples-drawer.module.css new file mode 100644 index 00000000000..cbbde84c94c --- /dev/null +++ b/packages/playground/src/react/samples-drawer/samples-drawer.module.css @@ -0,0 +1,105 @@ +.samples-search { + padding: 0 0 16px 0; + position: sticky; + top: 0; + z-index: 1; + background: var(--colorNeutralBackground1); +} + +.search-input { + width: 100%; +} + +.samples-category { + margin-bottom: 24px; +} + +.category-title { + font-size: var(--fontSizeBase400); + margin: 0 0 12px 0; + color: var(--colorNeutralForeground1); +} + +.samples-empty { + display: flex; + justify-content: center; + padding: 48px 16px; + color: var(--colorNeutralForeground3); +} + +.samples-grid { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(280px, 1fr)); + gap: 16px; + padding: 8px 0; +} + +.sample-card { + cursor: pointer; + padding: 16px; + transition: + box-shadow 0.2s ease, + border-color 0.2s ease; + min-height: 100px; +} + +.sample-card:hover { + box-shadow: var(--shadow8); +} + +.sample-card:focus-visible { + outline: 2px solid var(--colorBrandStroke1); + outline-offset: 2px; +} + +.sample-card-content { + display: flex; + gap: 16px; + align-items: flex-start; +} + +.sample-card-text { + display: flex; + flex-direction: column; + gap: 4px; + flex: 1; + min-width: 0; +} + +.sample-icon { + width: 48px; + height: 48px; + border-radius: 8px; + flex-shrink: 0; + position: relative; + display: flex; + align-items: center; + justify-content: center; + overflow: hidden; + user-select: none; +} + +.sample-icon-pattern { + position: absolute; + top: 0; + left: 0; +} + +.sample-icon-initials { + position: relative; + font-size: 16px; + font-weight: 600; + z-index: 1; +} + +.sample-title { + font-size: var(--fontSizeBase400); + margin: 0; +} + +.sample-description { + font-size: var(--fontSizeBase200); + color: var(--colorNeutralForeground2); + margin: 0; + line-height: 1.4; +} diff --git a/packages/playground/src/react/samples-dropdown.tsx b/packages/playground/src/react/samples-dropdown.tsx deleted file mode 100644 index dade744f3e9..00000000000 --- a/packages/playground/src/react/samples-dropdown.tsx +++ /dev/null @@ -1,41 +0,0 @@ -import { Select } from "@fluentui/react-components"; -import { useCallback, type FunctionComponent } from "react"; -import type { PlaygroundSample } from "../types.js"; - -export interface SamplesDropdownProps { - samples: Record; - selectedSampleName: string; - onSelectedSampleNameChange: (sampleName: string) => void; -} - -export const SamplesDropdown: FunctionComponent = ({ - samples, - selectedSampleName, - onSelectedSampleNameChange, -}) => { - const options = Object.keys(samples).map((sample) => { - return ; - }); - - const handleSelected = useCallback( - (evt: any) => { - if (samples[evt.target.value]) { - onSelectedSampleNameChange(evt.target.value); - } - }, - [onSelectedSampleNameChange, samples], - ); - return ( - - ); -}; diff --git a/packages/playground/src/react/settings/compiler-settings-dialog-button.tsx b/packages/playground/src/react/settings/compiler-settings-dialog-button.tsx deleted file mode 100644 index 51071ccd52f..00000000000 --- a/packages/playground/src/react/settings/compiler-settings-dialog-button.tsx +++ /dev/null @@ -1,48 +0,0 @@ -import { - Dialog, - DialogBody, - DialogContent, - DialogSurface, - DialogTitle, - DialogTrigger, - ToolbarButton, -} from "@fluentui/react-components"; -import { Settings24Regular } from "@fluentui/react-icons"; -import type { CompilerOptions } from "@typespec/compiler"; -import { usePlaygroundContext } from "../context/index.js"; -import { CompilerSettings } from "./compiler-settings.js"; - -export interface CompilerSettingsDialogButtonProps { - selectedEmitter: string; - compilerOptions: CompilerOptions; - onCompilerOptionsChange: (options: CompilerOptions) => void; -} - -export const CompilerSettingsDialogButton = ({ - selectedEmitter, - compilerOptions, - onCompilerOptionsChange, -}: CompilerSettingsDialogButtonProps) => { - const { host } = usePlaygroundContext(); - - return ( - - - } aria-label="Open Settings" /> - - - - Settings - - - - - - - ); -}; diff --git a/packages/playground/src/react/settings/compiler-settings.module.css b/packages/playground/src/react/settings/compiler-settings.module.css new file mode 100644 index 00000000000..3b1b061124d --- /dev/null +++ b/packages/playground/src/react/settings/compiler-settings.module.css @@ -0,0 +1,36 @@ +.settings { + display: flex; + flex-direction: column; + gap: 4px; +} + +.section { + display: flex; + flex-direction: column; + gap: 12px; + padding: 12px 0; + border-bottom: 1px solid var(--colorNeutralStroke2); +} + +.section:last-child { + border-bottom: none; +} + +.section-title { + margin: 0; +} + +.field { + display: flex; + flex-direction: column; + gap: 4px; +} + +.section-subtitle { + color: var(--colorNeutralForeground3); +} + +.empty { + color: var(--colorNeutralForeground3); + font-style: italic; +} diff --git a/packages/playground/src/react/settings/compiler-settings.tsx b/packages/playground/src/react/settings/compiler-settings.tsx index 9a47cfd364a..7b37ae6b7f6 100644 --- a/packages/playground/src/react/settings/compiler-settings.tsx +++ b/packages/playground/src/react/settings/compiler-settings.tsx @@ -1,20 +1,23 @@ -import { Divider } from "@fluentui/react-components"; +import { Label, Select, Subtitle2, Text } from "@fluentui/react-components"; import type { CompilerOptions, LinterRuleSet } from "@typespec/compiler"; -import { useCallback, type FunctionComponent } from "react"; +import { useCallback, useMemo, type FunctionComponent } from "react"; import type { BrowserHost } from "../../types.js"; import type { EmitterOptions } from "../types.js"; +import style from "./compiler-settings.module.css"; import { EmitterOptionsForm } from "./emitter-options-form.js"; import { LinterForm } from "./linter-form.js"; export interface CompilerSettingsProps { readonly host: BrowserHost; readonly selectedEmitter: string; + readonly onSelectedEmitterChange: (emitter: string) => void; readonly options: CompilerOptions; readonly onOptionsChanged: (options: CompilerOptions) => void; } export const CompilerSettings: FunctionComponent = ({ selectedEmitter, + onSelectedEmitterChange, host, options, onOptionsChanged, @@ -39,25 +42,64 @@ export const CompilerSettings: FunctionComponent = ({ }, [onOptionsChanged, options], ); + + const emitters = useMemo( + () => + Object.values(host.libraries) + .filter((x) => x.isEmitter) + .map((x) => x.name), + [host.libraries], + ); + + const handleEmitterChange = useCallback( + (evt: any) => { + onSelectedEmitterChange(evt.target.value); + }, + [onSelectedEmitterChange], + ); + return ( -
- <>Emitter: {selectedEmitter} - -

Options

- {library && ( - +
+ Emitter +
+ + +
+
+
+ Emitter options + {library ? ( + + ) : ( + + No emitter selected + + )} +
+
+ Linter rules + - )} - -

Linter

- +
); }; diff --git a/packages/playground/src/react/settings/emitter-options-form.module.css b/packages/playground/src/react/settings/emitter-options-form.module.css index 14d3cabd6d1..c28ff08cd85 100644 --- a/packages/playground/src/react/settings/emitter-options-form.module.css +++ b/packages/playground/src/react/settings/emitter-options-form.module.css @@ -1,13 +1,17 @@ .form { display: flex; flex-direction: column; - gap: 20px; + gap: 16px; } .item { display: flex; flex-direction: column; - gap: 10px; + gap: 4px; +} + +.description { + color: var(--colorNeutralForeground3); } .switch :global(label) { diff --git a/packages/playground/src/react/settings/emitter-options-form.tsx b/packages/playground/src/react/settings/emitter-options-form.tsx index 2f24c5fc7c7..df753638abb 100644 --- a/packages/playground/src/react/settings/emitter-options-form.tsx +++ b/packages/playground/src/react/settings/emitter-options-form.tsx @@ -5,6 +5,7 @@ import { Radio, RadioGroup, Switch, + Text, useId, type CheckboxOnChangeData, type InputOnChangeData, @@ -42,27 +43,30 @@ export const EmitterOptionsForm: FunctionComponent = ({ const emitterOptionsSchema = library.definition?.emitter?.options?.properties; if (emitterOptionsSchema === undefined) { - return <>"No options"; + return No options available; } const entries = Object.entries(emitterOptionsSchema); return (
{entries.map(([key, value]) => { + const resolved = (value as any).oneOf + ? resolveOneOfProperty(value as JsonSchemaOneOfProperty) + : value; return (
- {(value as any).type === "array" ? ( + {(resolved as any).type === "array" ? ( ) : ( )} @@ -88,6 +92,28 @@ interface JsonSchemaArrayProperty { readonly items: JsonSchemaScalarProperty; } +interface JsonSchemaOneOfProperty { + readonly oneOf: ReadonlyArray; + readonly description?: string; +} + +/** + * Resolve a `oneOf` schema to the most appropriate single schema for rendering. + * Prefers the array branch (if present) since it supports both single and multi-select. + */ +function resolveOneOfProperty( + prop: JsonSchemaOneOfProperty, +): JsonSchemaScalarProperty | JsonSchemaArrayProperty { + const arrayBranch = prop.oneOf.find( + (branch): branch is JsonSchemaArrayProperty => (branch as any).type === "array", + ); + if (arrayBranch) { + return { ...arrayBranch, description: arrayBranch.description ?? prop.description }; + } + const first = prop.oneOf[0] as JsonSchemaScalarProperty; + return { ...first, description: first.description ?? prop.description }; +} + type JsonSchemaArrayPropertyInputProps = Omit & { readonly prop: JsonSchemaArrayProperty; }; @@ -99,7 +125,9 @@ const JsonSchemaArrayPropertyInput: FunctionComponent { const itemsSchema = prop.items; - const value = emitterOptions[name] ?? itemsSchema.default; + const rawValue = emitterOptions[name] ?? itemsSchema.default; + // Normalize to array: handles cases where a oneOf-resolved property stored a single string + const value = Array.isArray(rawValue) ? rawValue : rawValue != null ? [rawValue] : []; const prettyName = useMemo( () => name[0].toUpperCase() + name.slice(1).replace(/-/g, " "), [name], @@ -179,13 +207,20 @@ const JsonSchemaPropertyInput: FunctionComponent = switch (prop.type) { case "boolean": return ( - +
+ + {prop.description && ( + + {prop.description} + + )} +
); case "string": default: @@ -194,6 +229,11 @@ const JsonSchemaPropertyInput: FunctionComponent = + {prop.description && ( + + {prop.description} + + )} {prop.enum ? ( {prop.enum.map((x) => ( diff --git a/packages/playground/src/react/settings/linter-form.tsx b/packages/playground/src/react/settings/linter-form.tsx index e2f2a6fb023..94bb695c5c7 100644 --- a/packages/playground/src/react/settings/linter-form.tsx +++ b/packages/playground/src/react/settings/linter-form.tsx @@ -1,4 +1,4 @@ -import { Checkbox, type CheckboxOnChangeData } from "@fluentui/react-components"; +import { Checkbox, Text, type CheckboxOnChangeData } from "@fluentui/react-components"; import type { LinterRuleSet, RuleRef } from "@typespec/compiler"; import { useCallback, type FunctionComponent } from "react"; import type { PlaygroundTspLibrary } from "../../types.js"; @@ -19,7 +19,11 @@ export const LinterForm: FunctionComponent = ({ return Object.keys(linter?.ruleSets ?? {}).map((x) => `${lib.name}/${x}`) as RuleRef[]; }); if (rulesets.length === 0) { - return <>No ruleset available; + return ( + + No ruleset available + + ); } const handleChange = (ruleSet: RuleRef, checked: boolean) => { diff --git a/packages/playground/src/react/use-mobile.ts b/packages/playground/src/react/use-mobile.ts new file mode 100644 index 00000000000..6da4e1fb2d4 --- /dev/null +++ b/packages/playground/src/react/use-mobile.ts @@ -0,0 +1,27 @@ +import { useCallback, useEffect, useState } from "react"; + +const MobileBreakpoint = 768; + +/** + * Hook that detects whether the viewport is at or below the mobile breakpoint. + * Uses `matchMedia` with a listener for responsive changes. + */ +export function useIsMobile(): boolean { + const query = `(max-width: ${MobileBreakpoint}px)`; + + const getMatch = useCallback(() => { + return typeof window !== "undefined" ? window.matchMedia(query).matches : false; + }, [query]); + + const [isMobile, setIsMobile] = useState(getMatch); + + useEffect(() => { + const mql = window.matchMedia(query); + const handler = (e: MediaQueryListEvent) => setIsMobile(e.matches); + mql.addEventListener("change", handler); + setIsMobile(mql.matches); + return () => mql.removeEventListener("change", handler); + }, [query]); + + return isMobile; +} diff --git a/packages/playground/src/react/view-toggle.module.css b/packages/playground/src/react/view-toggle.module.css new file mode 100644 index 00000000000..e45cc1be49a --- /dev/null +++ b/packages/playground/src/react/view-toggle.module.css @@ -0,0 +1,17 @@ +.view-toggle-bar { + display: flex; + align-items: center; + padding: 0 4px; + border-bottom: 1px solid var(--colorNeutralStroke1); + background-color: var(--colorNeutralBackground1); + flex-shrink: 0; +} + +.view-toggle-tabs { + min-height: auto; +} + +.view-toggle-actions { + margin-left: auto; + overflow: hidden; +} diff --git a/packages/playground/src/react/view-toggle.tsx b/packages/playground/src/react/view-toggle.tsx new file mode 100644 index 00000000000..ebf4bdaa4c1 --- /dev/null +++ b/packages/playground/src/react/view-toggle.tsx @@ -0,0 +1,47 @@ +import { Tab, TabList, type SelectTabEventHandler } from "@fluentui/react-components"; +import { useCallback, type FunctionComponent, type ReactNode } from "react"; +import style from "./view-toggle.module.css"; + +export type ViewMode = "editor" | "output" | "both"; + +export interface ViewToggleProps { + viewMode: ViewMode; + onViewModeChange: (mode: ViewMode) => void; + /** Additional toolbar actions rendered on the right side of the bar. */ + actions?: ReactNode; +} + +export const ViewToggle: FunctionComponent = ({ + viewMode, + onViewModeChange, + actions, +}) => { + const onTabSelect = useCallback( + (_, data) => { + onViewModeChange(data.value as ViewMode); + }, + [onViewModeChange], + ); + + return ( +
+ + + TSP + + + Both + + + Output + + + {actions &&
{actions}
} +
+ ); +}; diff --git a/packages/playground/src/services.ts b/packages/playground/src/services.ts index 48ef409959e..6b83443d1e6 100644 --- a/packages/playground/src/services.ts +++ b/packages/playground/src/services.ts @@ -1,5 +1,6 @@ import { TypeSpecLanguageConfiguration, + type Diagnostic, type DiagnosticTarget, type NoTarget, type ServerHost, @@ -12,6 +13,24 @@ import { LspToMonaco } from "./lsp/lsp-to-monaco.js"; import { MonacoToLsp } from "./lsp/monaco-to-lsp.js"; import type { BrowserHost } from "./types.js"; +// Module-level store for diagnostics used by the code action provider. +// Updated on each playground compilation via updateDiagnosticsForCodeFixes(). +let _currentDiagnostics: readonly Diagnostic[] = []; +let _currentCompiler: typeof import("@typespec/compiler") | undefined; + +/** + * Update the current diagnostics so the Monaco code action provider can + * surface codefixes for the playground's own compilation results. + * Call this after every compilation. + */ +export function updateDiagnosticsForCodeFixes( + compiler: typeof import("@typespec/compiler"), + diagnostics: readonly Diagnostic[], +) { + _currentDiagnostics = diagnostics; + _currentCompiler = compiler; +} + function getIndentAction( value: "none" | "indent" | "indentOutdent" | "outdent", ): monaco.languages.IndentAction { @@ -306,17 +325,71 @@ export async function registerMonacoLanguage(host: BrowserHost) { }, }); - // This doesn't actually work because the lsp is not aware of the diagnostics here as we make our own compilation in the playground. - // monaco.languages.registerCodeActionProvider("typespec", { - // async provideCodeActions(model, range, context, token) { - // const result = await serverLib.getCodeActions({ - // range: MonacoToLsp.range(range), - // context: MonacoToLsp.codeActionContext(context), - // textDocument: textDocumentForModel(model), - // }); - // return { actions: result.map(LspToMonaco.codeAction), dispose: () => {} }; - // }, - // }); + // Register a code action provider that uses the playground's own compilation + // diagnostics (which include codefixes) rather than the LSP server diagnostics. + monaco.languages.registerCodeActionProvider("typespec", { + async provideCodeActions(model, range) { + const compiler = _currentCompiler; + if (!compiler) return { actions: [], dispose: () => {} }; + + const actions: monaco.languages.CodeAction[] = []; + for (const diag of _currentDiagnostics) { + if (!diag.codefixes?.length) continue; + const loc = compiler.getSourceLocation(diag.target, { locateId: true }); + if (!loc || loc.file.path !== "/test/main.tsp") continue; + const monacoRange = getMonacoRange(compiler, diag.target); + if (!monacoRangesOverlap(monacoRange, range)) continue; + + for (const fix of diag.codefixes) { + const edits = await compiler.resolveCodeFix(fix); + const workspaceEdits: monaco.languages.IWorkspaceTextEdit[] = edits + .filter((edit) => edit.file.path === "/test/main.tsp") + .map((edit) => { + const start = edit.file.getLineAndCharacterOfPosition(edit.pos); + if (edit.kind === "insert-text") { + return { + resource: model.uri, + textEdit: { + range: { + startLineNumber: start.line + 1, + startColumn: start.character + 1, + endLineNumber: start.line + 1, + endColumn: start.character + 1, + }, + text: edit.text, + }, + versionId: undefined, + }; + } else { + const end = edit.file.getLineAndCharacterOfPosition(edit.end); + return { + resource: model.uri, + textEdit: { + range: { + startLineNumber: start.line + 1, + startColumn: start.character + 1, + endLineNumber: end.line + 1, + endColumn: end.character + 1, + }, + text: edit.text, + }, + versionId: undefined, + }; + } + }); + + if (workspaceEdits.length > 0) { + actions.push({ + title: fix.label, + kind: "quickfix", + edit: { edits: workspaceEdits }, + }); + } + } + } + return { actions, dispose: () => {} }; + }, + }); monaco.editor.defineTheme("typespec", { base: "vs", @@ -395,3 +468,16 @@ export function getMonacoRange( endColumn: end.character + 1, }; } + +function monacoRangesOverlap(a: monaco.IRange, b: monaco.IRange): boolean { + if (a.endLineNumber < b.startLineNumber || b.endLineNumber < a.startLineNumber) { + return false; + } + if (a.endLineNumber === b.startLineNumber && a.endColumn < b.startColumn) { + return false; + } + if (b.endLineNumber === a.startLineNumber && b.endColumn < a.startColumn) { + return false; + } + return true; +} diff --git a/packages/playground/src/tooling/index.ts b/packages/playground/src/tooling/index.ts index 8a1df2f1a8f..56b7a091012 100644 --- a/packages/playground/src/tooling/index.ts +++ b/packages/playground/src/tooling/index.ts @@ -20,6 +20,7 @@ export async function buildSamples_experimental( filename: config.filename, content, preferredEmitter: config.preferredEmitter, + description: config.description, compilerOptions: config.compilerOptions, }; } diff --git a/packages/playground/src/types.ts b/packages/playground/src/types.ts index 7b7dab483a2..f665e097bec 100644 --- a/packages/playground/src/types.ts +++ b/packages/playground/src/types.ts @@ -11,6 +11,16 @@ export interface PlaygroundSample { preferredEmitter?: string; content: string; + /** + * A short description of what this sample demonstrates. + */ + description?: string; + + /** + * Category for grouping samples in the sample gallery. + */ + category?: string; + /** * Compiler options for the sample. */ diff --git a/packages/playground/src/vite/index.ts b/packages/playground/src/vite/index.ts index 526510ae134..9d81d898c4c 100644 --- a/packages/playground/src/vite/index.ts +++ b/packages/playground/src/vite/index.ts @@ -20,9 +20,6 @@ export function definePlaygroundViteConfig(config: PlaygroundUserConfig): UserCo }, }, }, - esbuild: { - logOverride: { "this-is-undefined-in-esm": "silent" }, - }, assetsInclude: [/\.tsp$/], optimizeDeps: { exclude: ["swagger-ui"], diff --git a/packages/playground/src/vite/types.ts b/packages/playground/src/vite/types.ts index ace8aebf3ff..34bff44b122 100644 --- a/packages/playground/src/vite/types.ts +++ b/packages/playground/src/vite/types.ts @@ -1,4 +1,3 @@ -import type { PlaygroundLinks } from "../react/playground.js"; import type { PlaygroundSampleConfig } from "../tooling/types.js"; import type { PlaygroundSample } from "../types.js"; @@ -14,5 +13,4 @@ export interface PlaygroundConfig { readonly defaultEmitter: string; readonly libraries: readonly string[]; readonly samples: Record; - readonly links?: PlaygroundLinks; } diff --git a/packages/playground/test/responsive-command-bar.test.tsx b/packages/playground/test/responsive-command-bar.test.tsx new file mode 100644 index 00000000000..d6869fd3f96 --- /dev/null +++ b/packages/playground/test/responsive-command-bar.test.tsx @@ -0,0 +1,201 @@ +import { FluentProvider, webLightTheme } from "@fluentui/react-components"; +import { fireEvent, render, screen } from "@testing-library/react"; +import { describe, expect, it, vi } from "vitest"; +import { + ResponsiveCommandBar, + type CommandBarItem, +} from "../src/react/responsive-command-bar/index.js"; + +function renderBar(items: CommandBarItem[], isMobile = false) { + return render( + + + , + ); +} + +describe("ResponsiveCommandBar", () => { + describe("desktop mode", () => { + it("renders all items as toolbar buttons", () => { + const items: CommandBarItem[] = [ + { id: "save", label: "Save", onClick: vi.fn() }, + { id: "format", label: "Format", onClick: vi.fn() }, + ]; + renderBar(items, false); + expect(screen.getByLabelText("Save")).toBeInTheDocument(); + expect(screen.getByLabelText("Format")).toBeInTheDocument(); + }); + + it("renders left items before right items with a divider between", () => { + const items: CommandBarItem[] = [ + { id: "left1", label: "Left One", onClick: vi.fn() }, + { id: "right1", label: "Right One", onClick: vi.fn(), align: "right" }, + ]; + renderBar(items, false); + expect(screen.getByLabelText("Left One")).toBeInTheDocument(); + expect(screen.getByLabelText("Right One")).toBeInTheDocument(); + }); + + it("calls onClick when a toolbar button is clicked", () => { + const onClick = vi.fn(); + renderBar([{ id: "action", label: "Action", onClick }], false); + fireEvent.click(screen.getByLabelText("Action")); + expect(onClick).toHaveBeenCalledOnce(); + }); + + it("renders custom toolbarItem when provided", () => { + const items: CommandBarItem[] = [ + { + id: "custom", + label: "Custom", + toolbarItem: , + }, + ]; + renderBar(items, false); + expect(screen.getByTestId("custom-btn")).toBeInTheDocument(); + }); + + it("renders children as a dropdown menu", () => { + const childClick = vi.fn(); + const items: CommandBarItem[] = [ + { + id: "parent", + label: "Parent", + children: [{ id: "child1", label: "Child One", onClick: childClick }], + }, + ]; + renderBar(items, false); + // The parent renders as a button with aria-label + const trigger = screen.getByLabelText("Parent"); + fireEvent.click(trigger); + // After clicking, the dropdown should show the child + expect(screen.getByText("Child One")).toBeInTheDocument(); + fireEvent.click(screen.getByText("Child One")); + expect(childClick).toHaveBeenCalledOnce(); + }); + }); + + describe("mobile mode", () => { + it("renders pinned items directly and overflow in a menu", () => { + const items: CommandBarItem[] = [ + { id: "pinned", label: "Pinned", onClick: vi.fn(), pinned: true }, + { id: "overflow", label: "Overflow Item", onClick: vi.fn() }, + ]; + renderBar(items, true); + // Pinned item is directly visible + expect(screen.getByLabelText("Pinned")).toBeInTheDocument(); + // Overflow item is hidden behind the hamburger + expect(screen.queryByText("Overflow Item")).not.toBeInTheDocument(); + // Open the hamburger menu + fireEvent.click(screen.getByLabelText("More actions")); + expect(screen.getByText("Overflow Item")).toBeInTheDocument(); + }); + + it("calls onClick on overflow menu item click", () => { + const onClick = vi.fn(); + const items: CommandBarItem[] = [{ id: "action", label: "Action", onClick }]; + renderBar(items, true); + fireEvent.click(screen.getByLabelText("More actions")); + fireEvent.click(screen.getByText("Action")); + expect(onClick).toHaveBeenCalledOnce(); + }); + + it("renders a divider between left and right overflow items", () => { + const items: CommandBarItem[] = [ + { id: "left", label: "Left Item", onClick: vi.fn() }, + { id: "right", label: "Right Item", onClick: vi.fn(), align: "right" }, + ]; + const { container } = renderBar(items, true); + fireEvent.click(screen.getByLabelText("More actions")); + // Both items should be visible in the menu + expect(screen.getByText("Left Item")).toBeInTheDocument(); + expect(screen.getByText("Right Item")).toBeInTheDocument(); + // MenuDivider renders as an element with role="separator" + const divider = container.ownerDocument.querySelector( + "[class*='fui-MenuDivider'], [role='separator']", + ); + expect(divider).toBeTruthy(); + }); + + it("does not render divider when all overflow items are on the same side", () => { + const items: CommandBarItem[] = [ + { id: "a", label: "Item A", onClick: vi.fn() }, + { id: "b", label: "Item B", onClick: vi.fn() }, + ]; + renderBar(items, true); + fireEvent.click(screen.getByLabelText("More actions")); + const menuPopover = screen.getByText("Item A").closest("[role='menu']"); + expect(menuPopover?.querySelector("[role='separator']")).not.toBeInTheDocument(); + }); + + it("renders custom menuItem when provided", () => { + const items: CommandBarItem[] = [ + { + id: "custom", + label: "Custom", + menuItem:
Custom Menu Content
, + }, + ]; + renderBar(items, true); + fireEvent.click(screen.getByLabelText("More actions")); + expect(screen.getByTestId("custom-menu")).toBeInTheDocument(); + }); + + it("does not show hamburger when all items are pinned", () => { + const items: CommandBarItem[] = [ + { id: "a", label: "A", onClick: vi.fn(), pinned: true }, + { id: "b", label: "B", onClick: vi.fn(), pinned: true }, + ]; + renderBar(items, true); + expect(screen.queryByLabelText("More actions")).not.toBeInTheDocument(); + }); + + it("renders children as a nested submenu in overflow", () => { + const childClick = vi.fn(); + const items: CommandBarItem[] = [ + { + id: "parent", + label: "Parent", + children: [{ id: "child", label: "Nested Child", onClick: childClick }], + }, + ]; + renderBar(items, true); + fireEvent.click(screen.getByLabelText("More actions")); + // Parent appears as a menu item that triggers a submenu + const parentItem = screen.getByText("Parent"); + expect(parentItem).toBeInTheDocument(); + fireEvent.click(parentItem); + expect(screen.getByText("Nested Child")).toBeInTheDocument(); + fireEvent.click(screen.getByText("Nested Child")); + expect(childClick).toHaveBeenCalledOnce(); + }); + }); + + describe("content rendering", () => { + it("renders item content outside the toolbar", () => { + const items: CommandBarItem[] = [ + { + id: "with-content", + label: "Item", + onClick: vi.fn(), + content:
Extra
, + }, + ]; + renderBar(items, false); + expect(screen.getByTestId("extra-content")).toBeInTheDocument(); + }); + + it("renders content in mobile mode too", () => { + const items: CommandBarItem[] = [ + { + id: "with-content", + label: "Item", + onClick: vi.fn(), + content:
Mobile Extra
, + }, + ]; + renderBar(items, true); + expect(screen.getByTestId("mobile-content")).toBeInTheDocument(); + }); + }); +}); diff --git a/packages/playground/test/setup.ts b/packages/playground/test/setup.ts new file mode 100644 index 00000000000..e26219327da --- /dev/null +++ b/packages/playground/test/setup.ts @@ -0,0 +1,7 @@ +import "@testing-library/jest-dom/vitest"; +import { cleanup } from "@testing-library/react"; +import { afterEach } from "vitest"; + +afterEach(() => { + cleanup(); +}); diff --git a/packages/playground/tsconfig.build.json b/packages/playground/tsconfig.build.json index 1fe5beb46fc..f63c854c721 100644 --- a/packages/playground/tsconfig.build.json +++ b/packages/playground/tsconfig.build.json @@ -1,10 +1,6 @@ // tsconfig for building the playground { "extends": "./tsconfig.json", - "compilerOptions": { - "sourceMap": true, - "module": "NodeNext", - "moduleResolution": "NodeNext" - }, - "include": ["src/**/*.{ts,tsx}", ".storybook/**/*.{ts,tsx}", "definitions/*.d.ts"] + "include": ["src/**/*.{ts,tsx}", ".storybook/**/*.{ts,tsx}", "definitions/*.d.ts"], + "references": [{ "path": "../compiler/tsconfig.build.json" }] } diff --git a/packages/playground/tsconfig.json b/packages/playground/tsconfig.json index fe3eb5f0689..2b6c4756fe3 100644 --- a/packages/playground/tsconfig.json +++ b/packages/playground/tsconfig.json @@ -14,15 +14,6 @@ "jsx": "react-jsx", "lib": ["DOM"] }, - "references": [{ "path": "../compiler/tsconfig.json" }], - "include": [ - ".storybook/**/*.ts", - ".storybook/**/*.tsx", - "src/", - "test/**/*.ts", - "e2e/**/*.ts", - "vite.config.ts", - "definitions/*.d.ts", - "stories/" - ] + "exclude": ["test", "vitest.config.ts"], + "references": [{ "path": "../compiler/tsconfig.json" }] } diff --git a/packages/playground/vite.config.ts b/packages/playground/vite.config.ts index 2b894969faf..0d25404b079 100644 --- a/packages/playground/vite.config.ts +++ b/packages/playground/vite.config.ts @@ -44,9 +44,6 @@ export default defineConfig({ external: (id) => externals.some((x) => id.startsWith(x)), }, }, - esbuild: { - logOverride: { "this-is-undefined-in-esm": "silent" }, - }, assetsInclude: [/\.tsp$/], optimizeDeps: {}, plugins: [ diff --git a/packages/playground/vitest.config.ts b/packages/playground/vitest.config.ts new file mode 100644 index 00000000000..127225407fb --- /dev/null +++ b/packages/playground/vitest.config.ts @@ -0,0 +1,12 @@ +import { defineConfig, mergeConfig } from "vitest/config"; +import { defaultTypeSpecVitestConfig } from "../../vitest.config.js"; + +export default mergeConfig( + defaultTypeSpecVitestConfig, + defineConfig({ + test: { + environment: "happy-dom", + setupFiles: "./test/setup.ts", + }, + }), +); diff --git a/packages/prettier-plugin-typespec/CHANGELOG.md b/packages/prettier-plugin-typespec/CHANGELOG.md index ec775bf3f95..28ed08e5933 100644 --- a/packages/prettier-plugin-typespec/CHANGELOG.md +++ b/packages/prettier-plugin-typespec/CHANGELOG.md @@ -1,5 +1,23 @@ # Change Log - @typespec/prettier-plugin-typespec +## 1.11.0 + +No changes, version bump only. + +## 1.10.0 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 1.9.0 + +### Bump dependencies + +- [#9446](https://github.com/microsoft/typespec/pull/9446) Upgrade dependencies + + ## 1.8.0 ### Bump dependencies diff --git a/packages/prettier-plugin-typespec/package.json b/packages/prettier-plugin-typespec/package.json index 80e8d2ecc5a..28aa43ef674 100644 --- a/packages/prettier-plugin-typespec/package.json +++ b/packages/prettier-plugin-typespec/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/prettier-plugin-typespec", - "version": "1.8.0", + "version": "1.11.0", "description": "", "main": "dist/index.js", "type": "module", @@ -14,13 +14,13 @@ "author": "Microsoft Corporation", "license": "MIT", "dependencies": { - "prettier": "~3.8.0" + "prettier": "catalog:" }, "devDependencies": { "@typespec/compiler": "workspace:^", "@typespec/internal-build-utils": "workspace:^", - "esbuild": "^0.27.0", - "vitest": "^4.0.15" + "esbuild": "catalog:", + "vitest": "catalog:" }, "files": [ "dist/**/*", diff --git a/packages/protobuf/CHANGELOG.md b/packages/protobuf/CHANGELOG.md index 2f42a92877a..99baf4db3e0 100644 --- a/packages/protobuf/CHANGELOG.md +++ b/packages/protobuf/CHANGELOG.md @@ -1,5 +1,20 @@ # Change Log - @typespec/protobuf +## 0.81.0 + +No changes, version bump only. + +## 0.80.0 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 0.79.0 + +No changes, version bump only. + ## 0.78.0 ### Bump dependencies diff --git a/packages/protobuf/generated-defs/TypeSpec.Protobuf.ts-test.ts b/packages/protobuf/generated-defs/TypeSpec.Protobuf.ts-test.ts index 8439d354b21..6c62a82e7c1 100644 --- a/packages/protobuf/generated-defs/TypeSpec.Protobuf.ts-test.ts +++ b/packages/protobuf/generated-defs/TypeSpec.Protobuf.ts-test.ts @@ -7,4 +7,4 @@ import type { TypeSpecProtobufDecorators } from "./TypeSpec.Protobuf.js"; /** * An error here would mean that the exported decorator is not using the same signature. Make sure to have export const $decName: DecNameDecorator = (...) => ... */ -const _: TypeSpecProtobufDecorators = $decorators["TypeSpec.Protobuf"]; +const _decs: TypeSpecProtobufDecorators = $decorators["TypeSpec.Protobuf"]; diff --git a/packages/protobuf/package.json b/packages/protobuf/package.json index 1a315a0fa4f..7e7c31b080b 100644 --- a/packages/protobuf/package.json +++ b/packages/protobuf/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/protobuf", - "version": "0.78.0", + "version": "0.81.0", "author": "Microsoft Corporation", "description": "TypeSpec library and emitter for Protobuf (gRPC)", "homepage": "https://github.com/microsoft/typespec", @@ -31,8 +31,8 @@ "tspMain": "lib/proto.tsp", "scripts": { "clean": "rimraf ./dist ./temp", - "build": "pnpm gen-extern-signature && tsc -p .", - "watch": "tsc -p . --watch", + "build": "pnpm gen-extern-signature && tsc -p tsconfig.build.json", + "watch": "tsc -p tsconfig.build.json --watch", "gen-extern-signature": "tspd --enable-experimental gen-extern-signature .", "test": "vitest run", "test:ci": "vitest run --coverage --reporter=junit --reporter=default", @@ -44,16 +44,16 @@ "@typespec/compiler": "workspace:^" }, "devDependencies": { - "@types/micromatch": "^4.0.9", - "@types/node": "~25.0.2", + "@types/micromatch": "catalog:", + "@types/node": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/tspd": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "micromatch": "^4.0.8", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "micromatch": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/protobuf/test/scenarios.test.ts b/packages/protobuf/test/scenarios.test.ts index b27c687f24a..8a0ad5692c2 100644 --- a/packages/protobuf/test/scenarios.test.ts +++ b/packages/protobuf/test/scenarios.test.ts @@ -5,12 +5,7 @@ import { describe, it } from "vitest"; import micromatch from "micromatch"; import { formatDiagnostic, resolvePath } from "@typespec/compiler"; -import { - TypeSpecTestLibrary, - createTestHost, - findTestPackageRoot, - resolveVirtualPath, -} from "@typespec/compiler/testing"; +import { createTester, findTestPackageRoot } from "@typespec/compiler/testing"; import { readdirSync, statSync } from "fs"; import { mkdir, readFile, readdir, rm, stat, writeFile } from "fs/promises"; import { ProtobufEmitterOptions } from "../src/lib.js"; @@ -21,19 +16,9 @@ const SCENARIOS_DIRECTORY = resolvePath(pkgRoot, "test/scenarios"); const shouldRecord = process.env.RECORD === "true"; const patternsToRun = process.env.RUN_SCENARIOS?.split(",") ?? ["*"]; -const TypeSpecProtobufTestLibrary: TypeSpecTestLibrary = { - name: "@typespec/protobuf", - packageRoot: await findTestPackageRoot(import.meta.url), - files: [ - { realDir: "", pattern: "package.json", virtualPath: "./node_modules/@typespec/protobuf" }, - { - realDir: "dist/src", - pattern: "*.js", - virtualPath: "./node_modules/@typespec/protobuf/dist/src", - }, - { realDir: "lib/", pattern: "*.tsp", virtualPath: "./node_modules/@typespec/protobuf/lib" }, - ], -}; +const ProtobufTester = createTester(resolvePath(pkgRoot), { + libraries: ["@typespec/protobuf"], +}); describe("protobuf scenarios", function () { const scenarios = readdirSync(SCENARIOS_DIRECTORY) @@ -144,31 +129,21 @@ async function doEmit( files: Record, options: ProtobufEmitterOptions, ): Promise { - const baseOutputPath = resolveVirtualPath("test-output/"); - - const host = await createTestHost({ - libraries: [TypeSpecProtobufTestLibrary], - }); - - for (const [fileName, content] of Object.entries(files)) { - host.addTypeSpecFile(fileName, content); + const emitterTester = ProtobufTester.emit( + "@typespec/protobuf", + options as Record, + ); + const [result, diagnostics] = await emitterTester.compileAndDiagnose(files); + + // The EmitterTester strips the emitter output dir prefix, but the expected files + // include the emitter package name prefix (e.g., "@typespec/protobuf/main.proto") + const prefixedOutputs: Record = {}; + for (const [name, value] of Object.entries(result.outputs)) { + prefixedOutputs[`@typespec/protobuf/${name}`] = value; } - const [, diagnostics] = await host.compileAndDiagnose("main.tsp", { - outputDir: baseOutputPath, - noEmit: false, - emit: ["@typespec/protobuf"], - options: { - "@typespec/protobuf": options as Record, - }, - }); - return { - files: Object.fromEntries( - [...host.fs.entries()] - .filter(([name]) => name.startsWith(baseOutputPath)) - .map(([name, value]) => [name.replace(baseOutputPath, ""), value]), - ), + files: prefixedOutputs, diagnostics: diagnostics.map((x) => formatDiagnostic(x)), }; } diff --git a/packages/protobuf/tsconfig.build.json b/packages/protobuf/tsconfig.build.json new file mode 100644 index 00000000000..85c215d455c --- /dev/null +++ b/packages/protobuf/tsconfig.build.json @@ -0,0 +1,5 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"], + "references": [{ "path": "../compiler/tsconfig.build.json" }] +} diff --git a/packages/protobuf/tsconfig.config.json b/packages/protobuf/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/protobuf/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/protobuf/tsconfig.json b/packages/protobuf/tsconfig.json index 284b90bcdc1..3dc7c231583 100644 --- a/packages/protobuf/tsconfig.json +++ b/packages/protobuf/tsconfig.json @@ -5,6 +5,5 @@ "outDir": "dist", "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo" - }, - "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/react-components/package.json b/packages/react-components/package.json index cd1297121be..ce2f31de6b7 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -27,7 +27,7 @@ "./style.css": "./dist/style.css" }, "engines": { - "node": ">=14.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", @@ -44,28 +44,28 @@ "!dist/test/**" ], "dependencies": { - "@fluentui/react-components": "~9.72.3", - "@fluentui/react-icons": "^2.0.292", - "react": "~19.2.3", - "react-dom": "~19.2.3" + "@fluentui/react-components": "catalog:", + "@fluentui/react-icons": "catalog:", + "react": "catalog:", + "react-dom": "catalog:" }, "devDependencies": { - "@babel/core": "^7.26.10", - "@testing-library/dom": "^10.4.0", - "@testing-library/jest-dom": "^6.6.3", - "@testing-library/react": "^16.2.0", - "@types/node": "~25.0.2", - "@types/react": "~19.2.7", - "@types/react-dom": "~19.2.2", - "@vitejs/plugin-react": "~5.1.2", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vite": "^7.2.7", - "vite-plugin-checker": "^0.12.0", - "vite-plugin-dts": "4.5.4", - "vitest": "^4.0.15" + "@babel/core": "catalog:", + "@testing-library/dom": "catalog:", + "@testing-library/jest-dom": "catalog:", + "@testing-library/react": "catalog:", + "@types/node": "catalog:", + "@types/react": "catalog:", + "@types/react-dom": "catalog:", + "@vitejs/plugin-react": "catalog:", + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vite": "catalog:", + "vite-plugin-checker": "catalog:", + "vite-plugin-dts": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/react-components/src/tree/tree-control.test.tsx b/packages/react-components/src/tree/tree-control.test.tsx new file mode 100644 index 00000000000..28a7b1e880b --- /dev/null +++ b/packages/react-components/src/tree/tree-control.test.tsx @@ -0,0 +1,56 @@ +import { fireEvent, render, screen } from "@testing-library/react"; +import type { FC } from "react"; +import { expect, it, vi } from "vitest"; +import { useTreeControls } from "./tree-control.js"; + +const TreeControlHarness: FC<{ onSetExpanded: (expanded: Set) => void }> = ({ + onSetExpanded, +}) => { + const { expanded, expand, collapse } = useTreeControls({ onSetExpanded }); + return ( +
+ + + {expanded.has("node-1") ? "yes" : "no"} +
+ ); +}; + +it("does not notify when expanding an already expanded node", () => { + const onSetExpanded = vi.fn(); + render(); + + fireEvent.click(screen.getByRole("button", { name: "Expand" })); + expect(screen.getByTestId("expanded-state")).toHaveTextContent("yes"); + expect(onSetExpanded).toHaveBeenCalledTimes(1); + expect(onSetExpanded.mock.calls[0]?.[0]?.has("node-1")).toBe(true); + + fireEvent.click(screen.getByRole("button", { name: "Expand" })); + expect(screen.getByTestId("expanded-state")).toHaveTextContent("yes"); + expect(onSetExpanded).toHaveBeenCalledTimes(1); +}); + +it("does not notify when collapsing an already collapsed node", () => { + const onSetExpanded = vi.fn(); + render(); + + fireEvent.click(screen.getByRole("button", { name: "Collapse" })); + expect(screen.getByTestId("expanded-state")).toHaveTextContent("no"); + expect(onSetExpanded).not.toHaveBeenCalled(); + + fireEvent.click(screen.getByRole("button", { name: "Expand" })); + expect(screen.getByTestId("expanded-state")).toHaveTextContent("yes"); + expect(onSetExpanded).toHaveBeenCalledTimes(1); + + fireEvent.click(screen.getByRole("button", { name: "Collapse" })); + expect(screen.getByTestId("expanded-state")).toHaveTextContent("no"); + expect(onSetExpanded).toHaveBeenCalledTimes(2); + + fireEvent.click(screen.getByRole("button", { name: "Collapse" })); + expect(screen.getByTestId("expanded-state")).toHaveTextContent("no"); + expect(onSetExpanded).toHaveBeenCalledTimes(2); +}); diff --git a/packages/react-components/src/tree/tree-control.ts b/packages/react-components/src/tree/tree-control.ts index 739db393cd7..b6603e3caaa 100644 --- a/packages/react-components/src/tree/tree-control.ts +++ b/packages/react-components/src/tree/tree-control.ts @@ -29,6 +29,9 @@ export function useTreeControls({ onSetExpanded }: TreeControlsOptions): TreeCon const expand = useCallback( (key: string) => { + if (expanded.has(key)) { + return; + } expanded.add(key); onSetExpanded?.(expanded); setRerender((x) => x + 1); @@ -37,6 +40,9 @@ export function useTreeControls({ onSetExpanded }: TreeControlsOptions): TreeCon ); const collapse = useCallback( (key: string) => { + if (!expanded.has(key)) { + return; + } expanded.delete(key); onSetExpanded?.(expanded); setRerender((x) => x + 1); diff --git a/packages/react-components/src/tree/tree.test.tsx b/packages/react-components/src/tree/tree.test.tsx index c7592b95ee4..96e2ee2e697 100644 --- a/packages/react-components/src/tree/tree.test.tsx +++ b/packages/react-components/src/tree/tree.test.tsx @@ -1,5 +1,5 @@ import { fireEvent, render, screen } from "@testing-library/react"; -import { expect, it } from "vitest"; +import { expect, it, vi } from "vitest"; import { Tree } from "./tree.js"; import type { TreeNode } from "./types.js"; @@ -110,3 +110,86 @@ it("use up down arrow to navigate", async () => { fireEvent.keyDown(treeNode, { key: "ArrowDown", code: "ArrowDown" }); expect(treeNode).toHaveAttribute("aria-activedescendant", nodes[0].id); }); + +it("collapse expanded directory by clicking in selectionMode=single", async () => { + render(); + const child1 = await screen.findByText("Child 1"); + + // Click to expand + fireEvent.click(child1); + expect(await screen.findAllByRole("treeitem")).toHaveLength(5); + + // Click again to collapse + fireEvent.click(child1); + const nodes = await screen.findAllByRole("treeitem"); + expect(nodes).toHaveLength(2); + expect(nodes[0]).toHaveAttribute("aria-expanded", "false"); +}); + +it("collapse expanded directory by pressing space in selectionMode=single", async () => { + render(); + const treeNode = await screen.findByRole("tree"); + fireEvent.focus(treeNode); + + // Space to expand (focus defaults to first item: Child 1) + fireEvent.keyDown(treeNode, { key: "Space", code: "Space" }); + expect(await screen.findAllByRole("treeitem")).toHaveLength(5); + + // Space again to collapse (focus stays on Child 1) + fireEvent.keyDown(treeNode, { key: "Space", code: "Space" }); + expect(await screen.findAllByRole("treeitem")).toHaveLength(2); +}); + +it("collapse expanded directory by pressing enter in selectionMode=single", async () => { + render(); + const treeNode = await screen.findByRole("tree"); + fireEvent.focus(treeNode); + + // Enter to expand + fireEvent.keyDown(treeNode, { key: "Enter", code: "Enter" }); + expect(await screen.findAllByRole("treeitem")).toHaveLength(5); + + // Enter again to collapse + fireEvent.keyDown(treeNode, { key: "Enter", code: "Enter" }); + expect(await screen.findAllByRole("treeitem")).toHaveLength(2); +}); + +it("expand-collapse round trip by clicking in selectionMode=single", async () => { + render(); + const child1 = await screen.findByText("Child 1"); + + // Expand + fireEvent.click(child1); + expect(await screen.findAllByRole("treeitem")).toHaveLength(5); + + // Collapse + fireEvent.click(child1); + expect(await screen.findAllByRole("treeitem")).toHaveLength(2); + + // Re-expand + fireEvent.click(child1); + expect(await screen.findAllByRole("treeitem")).toHaveLength(5); +}); + +it("clicking a file in selectionMode=single still selects it", async () => { + const onSelect = vi.fn(); + render(); + + // Expand Child 1 first + const child1 = await screen.findByText("Child 1"); + fireEvent.click(child1); + + // Click a leaf node + const subChild = await screen.findByText("Sub child 1.2"); + fireEvent.click(subChild); + expect(onSelect).toHaveBeenCalledWith("$.child1.2"); +}); + +it("clicking a directory in selectionMode=single fires onSelect", async () => { + const onSelect = vi.fn(); + render(); + + const child1 = await screen.findByText("Child 1"); + fireEvent.click(child1); + expect(onSelect).toHaveBeenCalledWith("$.child1"); +}); diff --git a/packages/react-components/src/tree/tree.tsx b/packages/react-components/src/tree/tree.tsx index 523c88acb72..9922f60b4ea 100644 --- a/packages/react-components/src/tree/tree.tsx +++ b/packages/react-components/src/tree/tree.tsx @@ -56,10 +56,19 @@ export function Tree({ current = parentMap.get(current); } }, [expand, selectedKey, parentMap]); + const activateRow = useCallback( (row: TreeRow) => { setFocusedIndex(row.index); - if (selectionMode === "none" || selectedKey === row.id) { + if (row.hasChildren) { + // Always toggle expand/collapse for parent nodes regardless of selection state. + // Note: the useEffect that auto-expands selectedKey only re-runs when selectedKey + // changes, so it won't interfere once a directory is already selected. + toggleExpand(row.id); + if (selectionMode === "single") { + setSelectedKey(row.id); + } + } else if (selectionMode === "none" || selectedKey === row.id) { toggleExpand(row.id); } else { expand(row.id); diff --git a/packages/react-components/vite.config.ts b/packages/react-components/vite.config.ts index ee55d277fd9..3ac7393334c 100644 --- a/packages/react-components/vite.config.ts +++ b/packages/react-components/vite.config.ts @@ -26,7 +26,7 @@ export default defineConfig({ }, rollupOptions: { - external: externals, + external: (id) => externals.some((x) => id.startsWith(x)), }, }, plugins: [ diff --git a/packages/rest/CHANGELOG.md b/packages/rest/CHANGELOG.md index 4b19c8f3def..4f62bb2bb5b 100644 --- a/packages/rest/CHANGELOG.md +++ b/packages/rest/CHANGELOG.md @@ -1,5 +1,23 @@ # Change Log - @typespec/rest +## 0.81.0 + +No changes, version bump only. + +## 0.80.0 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 0.79.0 + +### Bug Fixes + +- [#8609](https://github.com/microsoft/typespec/pull/8609) Fix `@actionSeparator` decorator to only accept Operation, Interface, and Namespace targets + + ## 0.78.0 ### Bump dependencies diff --git a/packages/rest/README.md b/packages/rest/README.md index 6b7744b7804..2707bc94df8 100644 --- a/packages/rest/README.md +++ b/packages/rest/README.md @@ -51,13 +51,17 @@ Specify this operation is an action. (Scoped to a resource item /pets/{petId}/my Defines the separator string that is inserted before the action name in auto-generated routes for actions. +When applied to a namespace, the separator applies to all action operations in that namespace and its sub-namespaces. +When applied to an interface, the separator applies to all action operations in that interface and overrides any namespace-level separator. +When applied to an operation, the separator applies only to that operation and overrides any interface or namespace-level separator. + ```typespec @TypeSpec.Rest.actionSeparator(seperator: valueof "/" | ":" | "/:") ``` ##### Target -`Model | ModelProperty | Operation` +`Operation | Interface | Namespace` ##### Parameters diff --git a/packages/rest/generated-defs/TypeSpec.Rest.ts b/packages/rest/generated-defs/TypeSpec.Rest.ts index 14a2b275266..fd1a947b9b9 100644 --- a/packages/rest/generated-defs/TypeSpec.Rest.ts +++ b/packages/rest/generated-defs/TypeSpec.Rest.ts @@ -4,6 +4,7 @@ import type { Interface, Model, ModelProperty, + Namespace, Operation, } from "@typespec/compiler"; @@ -58,11 +59,15 @@ export type SegmentOfDecorator = ( /** * Defines the separator string that is inserted before the action name in auto-generated routes for actions. * + * When applied to a namespace, the separator applies to all action operations in that namespace and its sub-namespaces. + * When applied to an interface, the separator applies to all action operations in that interface and overrides any namespace-level separator. + * When applied to an operation, the separator applies only to that operation and overrides any interface or namespace-level separator. + * * @param seperator Seperator seperating the action segment from the rest of the url */ export type ActionSeparatorDecorator = ( context: DecoratorContext, - target: Model | ModelProperty | Operation, + target: Operation | Interface | Namespace, seperator: "/" | ":" | "/:", ) => DecoratorValidatorCallbacks | void; diff --git a/packages/rest/generated-defs/TypeSpec.Rest.ts-test.ts b/packages/rest/generated-defs/TypeSpec.Rest.ts-test.ts index ab1192be9f6..d9238050e6c 100644 --- a/packages/rest/generated-defs/TypeSpec.Rest.ts-test.ts +++ b/packages/rest/generated-defs/TypeSpec.Rest.ts-test.ts @@ -7,4 +7,4 @@ import type { TypeSpecRestDecorators } from "./TypeSpec.Rest.js"; /** * An error here would mean that the exported decorator is not using the same signature. Make sure to have export const $decName: DecNameDecorator = (...) => ... */ -const _: TypeSpecRestDecorators = $decorators["TypeSpec.Rest"]; +const _decs: TypeSpecRestDecorators = $decorators["TypeSpec.Rest"]; diff --git a/packages/rest/lib/rest-decorators.tsp b/packages/rest/lib/rest-decorators.tsp index 6f1d96ea5f9..c430c13c6cd 100644 --- a/packages/rest/lib/rest-decorators.tsp +++ b/packages/rest/lib/rest-decorators.tsp @@ -38,10 +38,14 @@ extern dec segmentOf(target: Operation, type: Model); /** * Defines the separator string that is inserted before the action name in auto-generated routes for actions. * + * When applied to a namespace, the separator applies to all action operations in that namespace and its sub-namespaces. + * When applied to an interface, the separator applies to all action operations in that interface and overrides any namespace-level separator. + * When applied to an operation, the separator applies only to that operation and overrides any interface or namespace-level separator. + * * @param seperator Seperator seperating the action segment from the rest of the url */ extern dec actionSeparator( - target: Model | ModelProperty | Operation, + target: Operation | Interface | Namespace, seperator: valueof "/" | ":" | "/:" ); diff --git a/packages/rest/package.json b/packages/rest/package.json index 130a3877181..71cd1cb61ea 100644 --- a/packages/rest/package.json +++ b/packages/rest/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/rest", - "version": "0.78.0", + "version": "0.81.0", "author": "Microsoft Corporation", "description": "TypeSpec REST protocol binding", "homepage": "https://typespec.io", @@ -31,12 +31,12 @@ } }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "pnpm gen-extern-signature && tsc -p . && pnpm lint-typespec-library", - "watch": "tsc -p . --watch", + "build": "pnpm gen-extern-signature && tsc -p tsconfig.build.json && pnpm lint-typespec-library", + "watch": "tsc -p tsconfig.build.json --watch", "gen-extern-signature": "tspd --enable-experimental gen-extern-signature .", "lint-typespec-library": "tsp compile . --warn-as-error --import @typespec/library-linter --no-emit", "test": "vitest run", @@ -57,16 +57,16 @@ "@typespec/http": "workspace:^" }, "devDependencies": { - "@types/node": "~25.0.2", + "@types/node": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/http": "workspace:^", "@typespec/library-linter": "workspace:^", "@typespec/tspd": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/rest/src/rest.ts b/packages/rest/src/rest.ts index 82cae4b25f8..ee96bafda1e 100644 --- a/packages/rest/src/rest.ts +++ b/packages/rest/src/rest.ts @@ -5,6 +5,7 @@ import { Interface, Model, ModelProperty, + Namespace, Operation, Program, Scalar, @@ -32,6 +33,7 @@ import { } from "@typespec/http/experimental"; import { ActionDecorator, + ActionSeparatorDecorator, AutoRouteDecorator, CollectionActionDecorator, ListsResourceDecorator, @@ -273,23 +275,77 @@ const actionSeparatorKey = createStateSymbol("actionSeparator"); * `@actionSeparator` defines the separator string that is used to precede the action name * in auto-generated actions. * - * `@actionSeparator` can only be applied to model properties, operation parameters, or operations. + * `@actionSeparator` can only be applied to operations, interfaces, or namespaces. */ -export function $actionSeparator( +export const $actionSeparator: ActionSeparatorDecorator = ( context: DecoratorContext, - entity: Model | ModelProperty | Operation, + entity: Operation | Interface | Namespace, separator: "/" | ":" | "/:", -) { +) => { context.program.stateMap(actionSeparatorKey).set(entity, separator); -} +}; /** * @param program the TypeSpec program * @param entity the target entity - * @returns the action separator string + * @returns the action separator string, checking the hierarchy: operation -> interface -> namespace */ export function getActionSeparator(program: Program, entity: Type): string | undefined { - return program.stateMap(actionSeparatorKey).get(entity); + const stateMap = program.stateMap(actionSeparatorKey); + + // First, check if the entity itself has an action separator + const directSeparator = stateMap.get(entity); + if (directSeparator !== undefined) { + return directSeparator; + } + + // If entity is an operation, check its interface, then namespace + if (entity.kind === "Operation") { + // Check the interface + if (entity.interface) { + const interfaceSeparator = stateMap.get(entity.interface); + if (interfaceSeparator !== undefined) { + return interfaceSeparator; + } + + // Check the namespace of the interface + if (entity.interface.namespace) { + return getNamespaceActionSeparator(program, entity.interface.namespace); + } + } + + // Check the namespace directly if no interface + if (entity.namespace) { + return getNamespaceActionSeparator(program, entity.namespace); + } + } + + // If entity is an interface, check its namespace + if (entity.kind === "Interface" && entity.namespace) { + return getNamespaceActionSeparator(program, entity.namespace); + } + + return undefined; +} + +/** + * Helper function to recursively check namespace hierarchy for action separator + */ +function getNamespaceActionSeparator(program: Program, namespace: Namespace): string | undefined { + const stateMap = program.stateMap(actionSeparatorKey); + + // Check current namespace + const separator = stateMap.get(namespace); + if (separator !== undefined) { + return separator; + } + + // Check parent namespace recursively + if (namespace.namespace) { + return getNamespaceActionSeparator(program, namespace.namespace); + } + + return undefined; } /** diff --git a/packages/rest/test/action-separator.test.ts b/packages/rest/test/action-separator.test.ts new file mode 100644 index 00000000000..036a592e109 --- /dev/null +++ b/packages/rest/test/action-separator.test.ts @@ -0,0 +1,224 @@ +import { expectDiagnostics } from "@typespec/compiler/testing"; +import { strictEqual } from "assert"; +import { describe, it } from "vitest"; +import { Tester, getRoutesFor } from "./test-host.js"; + +describe("valid targets", () => { + it("works on Operation and affects routing", async () => { + const routes = await getRoutesFor(` + @autoRoute + interface Things { + @action + @actionSeparator(":") + @put op customAction(@segment("things") @path thingId: string): string; + } + `); + + strictEqual(routes.length, 1); + strictEqual(routes[0].path, "/things/{thingId}:customAction"); + }); + + it("accepts Interface as target without compilation errors", async () => { + // This test verifies that @actionSeparator can be applied to interfaces without errors + const diagnostics = await Tester.diagnose(` + @actionSeparator(":") + interface TestInterface { + op test(): void; + } + `); + + // No diagnostics means the decorator accepts interfaces as valid targets + strictEqual(diagnostics.length, 0); + }); + + it("accepts Namespace as target without compilation errors", async () => { + // This test verifies that @actionSeparator can be applied to namespaces without errors + const diagnostics = await Tester.diagnose(` + @actionSeparator(":") + namespace TestNamespace { + op test(): void; + } + `); + + // No diagnostics means the decorator accepts namespaces as valid targets + strictEqual(diagnostics.length, 0); + }); + + it("supports all separator values in routing", async () => { + const routes = await getRoutesFor(` + @autoRoute + interface Things { + @action + @actionSeparator("/") + @put op action1(@segment("things") @path thingId: string): string; + + @action + @actionSeparator(":") + @put op action2(@segment("things") @path thingId: string): string; + + @action + @actionSeparator("/:") + @put op action3(@segment("things") @path thingId: string): string; + } + `); + + strictEqual(routes.length, 3); + strictEqual(routes[0].path, "/things/{thingId}/action1"); + strictEqual(routes[1].path, "/things/{thingId}:action2"); + strictEqual(routes[2].path, "/things/{thingId}/:action3"); + }); +}); + +describe("hierarchy behavior", () => { + it("interface-level separator applies to all actions in interface", async () => { + const routes = await getRoutesFor(` + @autoRoute + @actionSeparator(":") + interface Things { + @action + @put op action1(@segment("things") @path thingId: string): string; + + @action + @put op action2(@segment("things") @path thingId: string): string; + } + `); + + strictEqual(routes.length, 2); + strictEqual(routes[0].path, "/things/{thingId}:action1"); + strictEqual(routes[1].path, "/things/{thingId}:action2"); + }); + + it("namespace-level separator applies to all actions in namespace", async () => { + const routes = await getRoutesFor(` + @actionSeparator(":") + namespace TestNs { + @autoRoute + interface Things { + @action + @put op action1(@segment("things") @path thingId: string): string; + } + } + `); + + strictEqual(routes.length, 1); + strictEqual(routes[0].path, "/things/{thingId}:action1"); + }); + + it("operation-level separator overrides interface-level separator", async () => { + const routes = await getRoutesFor(` + @autoRoute + @actionSeparator(":") + interface Things { + @action + @actionSeparator("/") + @put op action1(@segment("things") @path thingId: string): string; + + @action + @put op action2(@segment("things") @path thingId: string): string; + } + `); + + strictEqual(routes.length, 2); + strictEqual(routes[0].path, "/things/{thingId}/action1"); // Uses operation-level "/" + strictEqual(routes[1].path, "/things/{thingId}:action2"); // Uses interface-level ":" + }); + + it("interface-level separator overrides namespace-level separator", async () => { + const routes = await getRoutesFor(` + @actionSeparator("/:") + namespace TestNs { + @autoRoute + @actionSeparator(":") + interface Things { + @action + @put op action1(@segment("things") @path thingId: string): string; + } + + @autoRoute + interface Other { + @action + @put op action2(@segment("other") @path otherId: string): string; + } + } + `); + + strictEqual(routes.length, 2); + strictEqual(routes[0].path, "/things/{thingId}:action1"); // Uses interface-level ":" + strictEqual(routes[1].path, "/other/{otherId}/:action2"); // Uses namespace-level "/:" + }); + + it("namespace separator applies to subnamespaces", async () => { + const routes = await getRoutesFor(` + @actionSeparator(":") + namespace Parent { + namespace Child { + @autoRoute + interface Things { + @action + @put op action1(@segment("things") @path thingId: string): string; + } + } + } + `); + + strictEqual(routes.length, 1); + strictEqual(routes[0].path, "/things/{thingId}:action1"); // Uses parent namespace-level ":" + }); + + it("operation in namespace without interface uses namespace separator", async () => { + const routes = await getRoutesFor(` + @actionSeparator(":") + namespace TestNs { + @autoRoute + @action + @put op action1(@segment("things") @path thingId: string): string; + } + `); + + strictEqual(routes.length, 1); + strictEqual(routes[0].path, "/things/{thingId}:action1"); + }); +}); + +describe("invalid targets", () => { + it("rejects Model", async () => { + const diagnostics = await Tester.diagnose(` + @actionSeparator(":") + model TestModel { + id: string; + } + `); + + expectDiagnostics(diagnostics, { + code: "decorator-wrong-target", + message: + "Cannot apply @actionSeparator decorator to TestModel since it is not assignable to Operation | Interface | Namespace", + }); + }); + + it("rejects ModelProperty", async () => { + const diagnostics = await Tester.diagnose(` + model TestModel { + @actionSeparator(":") + id: string; + } + `); + + expectDiagnostics(diagnostics, { + code: "decorator-wrong-target", + message: + /Cannot apply @actionSeparator decorator to .* since it is not assignable to Operation \| Interface \| Namespace/, + }); + }); + + it("rejects invalid separator values", async () => { + const diagnostics = await Tester.diagnose(` + @actionSeparator("invalid") + op test(): void; + `); + + expectDiagnostics(diagnostics, { + code: "invalid-argument", + }); + }); +}); diff --git a/packages/rest/test/routes.test.ts b/packages/rest/test/routes.test.ts index 3841570f663..398200c5e2d 100644 --- a/packages/rest/test/routes.test.ts +++ b/packages/rest/test/routes.test.ts @@ -6,27 +6,6 @@ import { describe, expect, it } from "vitest"; import { Tester, compileOperations, getOperations, getRoutesFor } from "./test-host.js"; describe("rest: routes", () => { - it("always produces a route starting with /", async () => { - const routes = await getRoutesFor( - ` - @get - @route(":action") - op colonRoute(): {}; - - @get - @autoRoute - @action("actionTwo") - @actionSeparator(":") - op separatorRoute(): {}; - `, - ); - - deepStrictEqual(routes, [ - { verb: "get", path: "/:action", params: [] }, - { verb: "get", path: "/:actionTwo", params: [] }, - ]); - }); - it("generates action route fragments when @action is applied", async () => { const routes = await getRoutesFor( ` diff --git a/packages/rest/tsconfig.build.json b/packages/rest/tsconfig.build.json new file mode 100644 index 00000000000..b51f88471c8 --- /dev/null +++ b/packages/rest/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"], + "references": [ + { "path": "../compiler/tsconfig.build.json" }, + { "path": "../http/tsconfig.build.json" } + ] +} diff --git a/packages/rest/tsconfig.config.json b/packages/rest/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/rest/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/rest/tsconfig.json b/packages/rest/tsconfig.json index 6c3f24f7975..e6bf4da603f 100644 --- a/packages/rest/tsconfig.json +++ b/packages/rest/tsconfig.json @@ -5,6 +5,5 @@ "outDir": "dist", "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo" - }, - "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/samples/package.json b/packages/samples/package.json index d81bab31834..438b6c5afd0 100644 --- a/packages/samples/package.json +++ b/packages/samples/package.json @@ -26,12 +26,12 @@ } }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "tsc -p .", - "watch": "tsc -p . --watch", + "build": "tsc -p tsconfig.build.json", + "watch": "tsc -p tsconfig.build.json --watch", "test": "vitest run", "test:ci": "vitest run --reporter=junit --reporter=default", "test:regen": "cross-env RECORD=true vitest run", @@ -60,13 +60,13 @@ "@typespec/versioning": "workspace:^" }, "devDependencies": { - "@types/node": "~25.0.2", + "@types/node": "catalog:", "@typespec/internal-build-utils": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "cross-env": "~10.1.0", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "cross-env": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/samples/specs/rest-metadata-emitter/rest-metadata-emitter-sample.ts b/packages/samples/specs/rest-metadata-emitter/rest-metadata-emitter-sample.ts index 57e57bde645..a7abf6a3170 100644 --- a/packages/samples/specs/rest-metadata-emitter/rest-metadata-emitter-sample.ts +++ b/packages/samples/specs/rest-metadata-emitter/rest-metadata-emitter-sample.ts @@ -206,7 +206,7 @@ export async function $onEmit(context: EmitContext): Promise { getTypeReference(type.indexer.value, visibility); break; } - let isNew = false; + let isNew; const seen = models.get(type); if (seen) { isNew = !seen.has(visibility); diff --git a/packages/samples/src/sample-snapshot-testing.ts b/packages/samples/src/sample-snapshot-testing.ts index 01f4c8f5888..19823d56d31 100644 --- a/packages/samples/src/sample-snapshot-testing.ts +++ b/packages/samples/src/sample-snapshot-testing.ts @@ -53,8 +53,9 @@ export function defineSampleSnaphotTests(config: SampleSnapshotTestOptions) { existingSnapshots = await readFilesInDirRecursively(config.outputDir); }); - afterAll(async function (context: Readonly) { - if (context.tasks.some((x) => x.mode === "skip")) { + // eslint-disable-next-line no-empty-pattern + afterAll(async function ({}, { tasks }: Readonly) { + if (tasks.some((x) => x.mode === "skip")) { return; // Not running the full test suite, so don't bother checking snapshots. } @@ -129,7 +130,9 @@ function defineSampleSnaphotTest( await writeFile(snapshotPath, content); context.registerSnapshot(resolvePath(sample.name, relativePath)); } catch (e) { - throw new Error(`Failure to write snapshot: "${snapshotPath}"\n Error: ${e}`); + throw new Error(`Failure to write snapshot: "${snapshotPath}"\n Error: ${e}`, { + cause: e, + }); } } } else { @@ -183,7 +186,7 @@ async function readFilesInDirRecursively(dir: string): Promise { if (isEnoentError(e)) { return []; } else { - throw new Error(`Failed to read dir "${dir}"\n Error: ${e}`); + throw new Error(`Failed to read dir "${dir}"\n Error: ${e}`, { cause: e }); } } const files: string[] = []; diff --git a/packages/samples/test/output/init/@typespec/openapi3/openapi.yaml b/packages/samples/test/output/init/@typespec/openapi3/openapi.yaml index adc5ea85378..6a959730973 100644 --- a/packages/samples/test/output/init/@typespec/openapi3/openapi.yaml +++ b/packages/samples/test/output/init/@typespec/openapi3/openapi.yaml @@ -198,4 +198,3 @@ components: enum: - red - blue - description: '' diff --git a/packages/samples/test/output/todoApp/@typespec/openapi3/openapi.yaml b/packages/samples/test/output/todoApp/@typespec/openapi3/openapi.yaml index 33c096c3a2e..6e67d77c79c 100644 --- a/packages/samples/test/output/todoApp/@typespec/openapi3/openapi.yaml +++ b/packages/samples/test/output/todoApp/@typespec/openapi3/openapi.yaml @@ -487,7 +487,6 @@ components: allOf: - $ref: '#/components/schemas/TodoLabelsMergePatchUpdateOrCreate' nullable: true - description: '' TodoItems.InvalidTodoItem: type: object allOf: diff --git a/packages/samples/test/output/visibility/@typespec/openapi3/openapi.yaml b/packages/samples/test/output/visibility/@typespec/openapi3/openapi.yaml index fb8f7c09b4a..22103605a5e 100644 --- a/packages/samples/test/output/visibility/@typespec/openapi3/openapi.yaml +++ b/packages/samples/test/output/visibility/@typespec/openapi3/openapi.yaml @@ -185,7 +185,6 @@ components: type: array items: $ref: '#/components/schemas/PersonRelativeMergePatchUpdateReplaceOnly' - description: '' PersonMergePatchUpdateReplaceOnly: type: object required: diff --git a/packages/samples/tsconfig.build.json b/packages/samples/tsconfig.build.json new file mode 100644 index 00000000000..8c41e37437f --- /dev/null +++ b/packages/samples/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": ["specs/rest-metadata-emitter/**/*.ts", "src/**/*.ts", "test/**/*.ts"], + "references": [ + { "path": "../compiler/tsconfig.build.json" }, + { "path": "../rest/tsconfig.build.json" } + ] +} diff --git a/packages/samples/tsconfig.config.json b/packages/samples/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/samples/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/samples/tsconfig.json b/packages/samples/tsconfig.json index ad2fab17ee7..a641027b2e0 100644 --- a/packages/samples/tsconfig.json +++ b/packages/samples/tsconfig.json @@ -5,6 +5,5 @@ "outDir": "dist", "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo" - }, - "include": ["specs/rest-metadata-emitter/**/*.ts", "src/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/spec-api/CHANGELOG.md b/packages/spec-api/CHANGELOG.md index bfabdaf22a8..9aa7ff1b553 100644 --- a/packages/spec-api/CHANGELOG.md +++ b/packages/spec-api/CHANGELOG.md @@ -1,5 +1,23 @@ # @typespec/spec-api +## 0.1.0-alpha.14 + +### Features + +- [#10011](https://github.com/microsoft/typespec/pull/10011) Add matcher framework for flexible value comparison in scenarios. `match.dateTime()` enables semantic datetime comparison that handles precision and timezone differences across languages. + +### Bug Fixes + +- [#9995](https://github.com/microsoft/typespec/pull/9995) Remove prettier used for ValidationError message, in validateXmlBodyEquals. + + +## 0.1.0-alpha.13 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + ## 0.1.0-alpha.12 ### Bump dependencies diff --git a/packages/spec-api/package.json b/packages/spec-api/package.json index ab32aa8f3a6..b0d702d8cf5 100644 --- a/packages/spec-api/package.json +++ b/packages/spec-api/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/spec-api", - "version": "0.1.0-alpha.12", + "version": "0.1.0-alpha.14", "description": "Spec api to implement mock api", "type": "module", "exports": { @@ -15,7 +15,7 @@ "test": "vitest run" }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "repository": { "type": "git", @@ -28,20 +28,20 @@ }, "homepage": "https://github.com/microsoft/typespec#readme", "dependencies": { - "deep-equal": "^2.2.0", - "express": "^5.2.1", - "xml2js": "^0.6.2" + "deep-equal": "catalog:", + "express": "catalog:", + "xml2js": "catalog:" }, "devDependencies": { - "@types/deep-equal": "^1.0.1", - "@types/express": "^5.0.6", - "@types/multer": "^2.0.0", - "@types/node": "~25.0.2", - "@types/xml2js": "^0.4.11", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@types/deep-equal": "catalog:", + "@types/express": "catalog:", + "@types/multer": "catalog:", + "@types/node": "catalog:", + "@types/xml2js": "catalog:", + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/spec-api/src/expectation.ts b/packages/spec-api/src/expectation.ts index 47176f7a53f..17aa8dadd6a 100644 --- a/packages/spec-api/src/expectation.ts +++ b/packages/spec-api/src/expectation.ts @@ -1,4 +1,4 @@ -import deepEqual from "deep-equal"; +import { matchValues } from "./match-engine.js"; import { validateBodyEmpty, validateBodyEquals, @@ -9,7 +9,7 @@ import { validateRawBodyEquals, validateXmlBodyEquals, } from "./request-validations.js"; -import { CollectionFormat, RequestExt } from "./types.js"; +import { CollectionFormat, RequestExt, Resolver, ResolverConfig } from "./types.js"; import { ValidationError } from "./validation-error.js"; /** @@ -89,18 +89,22 @@ export class RequestExpectation { * @param expected Expected value */ public deepEqual(actual: unknown, expected: unknown, message = "Values not deep equal"): void { - if (!deepEqual(actual, expected, { strict: true })) { - throw new ValidationError(message, expected, actual); + const result = matchValues(actual, expected); + if (!result.pass) { + throw new ValidationError(`${message}: ${result.message}`, expected, actual); } } /** - * Expect the body of the request to be semantically equivalent to the provided XML string. - * The XML declaration prefix will automatically be added to expectedBody. - * @param expectedBody expected value of request body. + * Expect the body of the request to be semantically equivalent to the provided XML. + * Accepts a plain string or a Resolver (e.g. from `xml\`...\``). + * When a Resolver with matchers is provided, matcher-aware comparison is used. + * The XML declaration prefix will automatically be added. + * @param expectedBody expected XML body as a string or Resolver. + * @param config resolver config (required when expectedBody is a Resolver). * @throws {ValidationError} if there is an error. */ - public xmlBodyEquals(expectedBody: string): void { - validateXmlBodyEquals(this.originalRequest, expectedBody); + public xmlBodyEquals(expectedBody: string | Resolver, config?: ResolverConfig): void { + validateXmlBodyEquals(this.originalRequest, expectedBody, config); } } diff --git a/packages/spec-api/src/index.ts b/packages/spec-api/src/index.ts index 68e8d112df5..84f4cb23200 100644 --- a/packages/spec-api/src/index.ts +++ b/packages/spec-api/src/index.ts @@ -1,3 +1,13 @@ +export { + createMatcher, + err, + isMatcher, + match, + matchValues, + ok, + type MatchResult, + type MockValueMatcher, +} from "./matchers/index.js"; export { MockRequest } from "./mock-request.js"; export { BODY_EMPTY_ERROR_MESSAGE, diff --git a/packages/spec-api/src/match-engine.ts b/packages/spec-api/src/match-engine.ts new file mode 100644 index 00000000000..d1e47df77ca --- /dev/null +++ b/packages/spec-api/src/match-engine.ts @@ -0,0 +1,221 @@ +/** + * Matcher framework for Spector mock API validation. + * + * Matchers are special objects that can be placed anywhere in an expected value tree. + * The comparison engine recognizes them and delegates to `matcher.check(actual)` + * instead of doing strict equality — enabling flexible comparisons for types like + * datetime that serialize differently across languages. + */ + +/** Symbol used to identify matcher objects */ +export const MatcherSymbol: unique symbol = Symbol.for("SpectorMatcher"); + +/** Result of a match operation */ +export type MatchResult = { pass: true } | { pass: false; message: string }; + +const OK: MatchResult = Object.freeze({ pass: true }); + +/** Create a passing match result */ +export function ok(): MatchResult { + return OK; +} + +/** Create a failing match result with a message */ +export function err(message: string): MatchResult { + return { pass: false, message }; +} + +/** + * Interface for custom value matchers. + * Implement this to create new matcher types. + */ +export interface MockValueMatcher { + readonly [MatcherSymbol]: true; + /** Check whether the actual value matches the expectation */ + check(actual: unknown, config?: MatcherConfig): MatchResult; + /** The raw value to use when serializing */ + serialize(config?: MatcherConfig): T; + /** @internal Delegates to serialize() for JSON.stringify compatibility */ + toJSON(): T; + /** Human-readable description for debugging */ + toString(): string; +} + +/** Configuration available to matchers at runtime */ +export interface MatcherConfig { + baseUrl: string; +} + +const emptyConfig: MatcherConfig = { baseUrl: "" }; + +interface MatcherImpl { + check(actual: unknown): MatchResult; + serialize(): T; + toString?: () => string; +} + +/** Create a MockValueMatcher with the MatcherSymbol already set. + * Accepts either a plain implementation object (for matchers that don't need config) + * or a factory function `(config) => impl` (for matchers that do). + */ +export function createMatcher( + implOrFactory: MatcherImpl | ((config: MatcherConfig) => MatcherImpl), +): MockValueMatcher { + const resolve = + typeof implOrFactory === "function" + ? (config: MatcherConfig) => implOrFactory(config) + : () => implOrFactory; + return { + [MatcherSymbol]: true, + check(actual: unknown, config?: MatcherConfig): MatchResult { + return resolve(config ?? emptyConfig).check(actual); + }, + serialize(config?: MatcherConfig): T { + return resolve(config ?? emptyConfig).serialize(); + }, + toJSON() { + return resolve(emptyConfig).serialize(); + }, + toString() { + const impl = resolve(emptyConfig); + return impl.toString?.() ?? String(impl.serialize()); + }, + }; +} + +/** Type guard to check if a value is a MockValueMatcher */ +export function isMatcher(value: unknown): value is MockValueMatcher { + return ( + typeof value === "object" && + value !== null && + MatcherSymbol in value && + (value as any)[MatcherSymbol] === true + ); +} + +function formatValue(value: unknown): string { + if (value === null) return "null"; + if (value === undefined) return "undefined"; + if (typeof value === "string") return `"${value}"`; + if (Buffer.isBuffer(value)) return `Buffer(${value.length})`; + if (Array.isArray(value)) return `Array(${value.length})`; + if (typeof value === "object") return JSON.stringify(value); + return String(value); +} + +function pathErr(message: string, path: string): MatchResult { + const prefix = path ? `at ${path}: ` : ""; + return err(`${prefix}${message}`); +} + +/** + * Recursively compares actual vs expected values. + * When a MockValueMatcher is encountered in the expected tree, delegates to matcher.check(). + * Otherwise uses strict equality semantics (same as deep-equal with strict: true). + */ +export function matchValues( + actual: unknown, + expected: unknown, + path: string = "$", + config: MatcherConfig = emptyConfig, +): MatchResult { + if (expected === actual) { + return ok(); + } + + if (isMatcher(expected)) { + const result = expected.check(actual, config); + if (!result.pass) { + return pathErr(result.message, path); + } + return result; + } + + if (typeof expected !== typeof actual) { + return pathErr( + `Type mismatch: expected ${typeof expected} but got ${typeof actual} (${formatValue(actual)})`, + path, + ); + } + + if (expected === null || actual === null) { + return pathErr(`Expected ${formatValue(expected)} but got ${formatValue(actual)}`, path); + } + + if (Array.isArray(expected)) { + if (!Array.isArray(actual)) { + return pathErr(`Expected an array but got ${formatValue(actual)}`, path); + } + if (expected.length !== actual.length) { + return pathErr( + `Array length mismatch: expected ${expected.length} but got ${actual.length}`, + path, + ); + } + for (let i = 0; i < expected.length; i++) { + const result = matchValues(actual[i], expected[i], `${path}[${i}]`, config); + if (!result.pass) { + return result; + } + } + return ok(); + } + + if (Buffer.isBuffer(expected)) { + if (!Buffer.isBuffer(actual)) { + return pathErr(`Expected a Buffer but got ${typeof actual}`, path); + } + if (!expected.equals(actual)) { + return pathErr(`Buffer contents differ`, path); + } + return ok(); + } + + if (typeof expected === "object") { + const expectedObj = expected as Record; + const actualObj = actual as Record; + + // Keys with undefined values in expected mean "must not be present in actual" + const expectedPresentKeys = Object.keys(expectedObj).filter( + (k) => expectedObj[k] !== undefined, + ); + const expectedAbsentKeys = Object.keys(expectedObj).filter((k) => expectedObj[k] === undefined); + const actualKeys = Object.keys(actualObj); + + // Verify keys that should be absent are not in actual + for (const key of expectedAbsentKeys) { + if (key in actualObj && actualObj[key] !== undefined) { + return pathErr( + `Key "${key}" should not be present but got ${formatValue(actualObj[key])}`, + path, + ); + } + } + + if (expectedPresentKeys.length !== actualKeys.length) { + const missing = expectedPresentKeys.filter((k) => !(k in actualObj)); + const extra = actualKeys.filter( + (k) => !expectedPresentKeys.includes(k) && !expectedAbsentKeys.includes(k), + ); + const parts: string[] = [ + `Key count mismatch: expected ${expectedPresentKeys.length} but got ${actualKeys.length}`, + ]; + if (missing.length > 0) parts.push(`missing: [${missing.join(", ")}]`); + if (extra.length > 0) parts.push(`extra: [${extra.join(", ")}]`); + return pathErr(parts.join(". "), path); + } + + for (const key of expectedPresentKeys) { + if (!(key in actualObj)) { + return pathErr(`Missing key "${key}"`, path); + } + const result = matchValues(actualObj[key], expectedObj[key], `${path}.${key}`, config); + if (!result.pass) { + return result; + } + } + return ok(); + } + + return pathErr(`Expected ${formatValue(expected)} but got ${formatValue(actual)}`, path); +} diff --git a/packages/spec-api/src/matchers/datetime.ts b/packages/spec-api/src/matchers/datetime.ts new file mode 100644 index 00000000000..83843f5eecb --- /dev/null +++ b/packages/spec-api/src/matchers/datetime.ts @@ -0,0 +1,66 @@ +import { createMatcher, err, type MockValueMatcher, ok } from "../match-engine.js"; + +const rfc3339Pattern = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:\d{2})?$/i; +const utcRfc3339Pattern = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?Z$/i; +const rfc7231Pattern = + /^(Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s\d{2}\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s\d{4}\s\d{2}:\d{2}:\d{2}\sGMT$/i; + +function createDateTimeMatcher( + value: string, + label: string, + formatName: string, + formatPattern: RegExp, +): MockValueMatcher { + const expectedMs = Date.parse(value); + if (isNaN(expectedMs)) { + throw new Error(`${label}: invalid datetime value: ${value}`); + } + return createMatcher({ + check(actual: unknown) { + if (typeof actual !== "string") { + return err( + `${label}: expected a string but got ${typeof actual} (${JSON.stringify(actual)})`, + ); + } + if (!formatPattern.test(actual)) { + return err(`${label}: expected ${formatName} format but got "${actual}"`); + } + const actualMs = Date.parse(actual); + if (isNaN(actualMs)) { + return err( + `${label}: value "${actual}" matches ${formatName} format but is not a valid date`, + ); + } + if (actualMs !== expectedMs) { + return err( + `${label}: timestamps differ \u2014 expected ${new Date(expectedMs).toISOString()} but got ${new Date(actualMs).toISOString()}`, + ); + } + return ok(); + }, + serialize() { + return value; + }, + toString() { + return `${label}(${value})`; + }, + }); +} + +export const dateTimeMatcher = { + rfc3339(value: string): MockValueMatcher { + return createDateTimeMatcher(value, "match.dateTime.rfc3339", "rfc3339", rfc3339Pattern); + }, + /** Like rfc3339 but rejects timezone offsets — only Z (UTC) suffix is allowed. */ + utcRfc3339(value: string): MockValueMatcher { + return createDateTimeMatcher( + value, + "match.dateTime.utcRfc3339", + "utcRfc3339", + utcRfc3339Pattern, + ); + }, + rfc7231(value: string): MockValueMatcher { + return createDateTimeMatcher(value, "match.dateTime.rfc7231", "rfc7231", rfc7231Pattern); + }, +}; diff --git a/packages/spec-api/src/matchers/index.ts b/packages/spec-api/src/matchers/index.ts new file mode 100644 index 00000000000..054a5bb5c3e --- /dev/null +++ b/packages/spec-api/src/matchers/index.ts @@ -0,0 +1,48 @@ +import { dateTimeMatcher } from "./datetime.js"; +import { baseUrlMatcher } from "./local-url.js"; + +export { + createMatcher, + err, + isMatcher, + MatcherSymbol, + matchValues, + ok, + type MatcherConfig, + type MatchResult, + type MockValueMatcher, +} from "../match-engine.js"; +export { dateTimeMatcher } from "./datetime.js"; + +/** + * Namespace for built-in matchers. + */ +export const match = { + /** + * Matchers for comparing datetime values semantically. + * Validates that the actual value is in the correct format and represents + * the same point in time as the expected value. + * + * @example + * ```ts + * match.dateTime.rfc3339("2022-08-26T18:38:00.000Z") + * match.dateTime.utcRfc3339("2022-08-26T18:38:00.000Z") // rejects offsets, only Z + * match.dateTime.rfc7231("Fri, 26 Aug 2022 14:38:00 GMT") + * ``` + */ + dateTime: dateTimeMatcher, + + /** + * Matcher for URL values that include the server's base URL. + * + * The matcher is created with just the path portion. At runtime, `expandDyns()` + * resolves it by injecting the server's actual base URL (e.g. `http://localhost:3000`). + * The resolved matcher validates that the actual value equals `baseUrl + path`. + * + * @example + * ```ts + * match.localUrl("/payload/pageable/next-page") + * ``` + */ + localUrl: baseUrlMatcher, +}; diff --git a/packages/spec-api/src/matchers/local-url.ts b/packages/spec-api/src/matchers/local-url.ts new file mode 100644 index 00000000000..ecc07c406cb --- /dev/null +++ b/packages/spec-api/src/matchers/local-url.ts @@ -0,0 +1,24 @@ +import { createMatcher, err, type MockValueMatcher, ok } from "../match-engine.js"; + +export function baseUrlMatcher(path: string): MockValueMatcher { + return createMatcher((config) => ({ + check(actual: unknown) { + if (typeof actual !== "string") { + return err( + `match.localUrl: expected a string but got ${typeof actual} (${JSON.stringify(actual)})`, + ); + } + const expected = config.baseUrl + path; + if (actual !== expected) { + return err(`match.localUrl: expected "${expected}" but got "${actual}"`); + } + return ok(); + }, + serialize() { + return config.baseUrl + path; + }, + toString() { + return `match.localUrl("${path}")`; + }, + })); +} diff --git a/packages/spec-api/src/request-validations.ts b/packages/spec-api/src/request-validations.ts index 223b439ce2a..4a4b1b632f3 100644 --- a/packages/spec-api/src/request-validations.ts +++ b/packages/spec-api/src/request-validations.ts @@ -1,7 +1,7 @@ import deepEqual from "deep-equal"; -import * as prettier from "prettier"; import { parseString } from "xml2js"; -import { CollectionFormat, RequestExt } from "./types.js"; +import { matchValues, type MockValueMatcher } from "./match-engine.js"; +import { CollectionFormat, RequestExt, Resolver, ResolverConfig } from "./types.js"; import { ValidationError } from "./validation-error.js"; export const BODY_NOT_EQUAL_ERROR_MESSAGE = "Body provided doesn't match expected body"; @@ -37,43 +37,89 @@ export const validateBodyEquals = ( return; } - if (!deepEqual(request.body, expectedBody, { strict: true })) { - throw new ValidationError(BODY_NOT_EQUAL_ERROR_MESSAGE, expectedBody, request.body); + const result = matchValues(request.body, expectedBody); + if (!result.pass) { + throw new ValidationError( + `${BODY_NOT_EQUAL_ERROR_MESSAGE}: ${result.message}`, + expectedBody, + request.body, + ); } }; -export const validateXmlBodyEquals = (request: RequestExt, expectedBody: string): void => { +export const validateXmlBodyEquals = ( + request: RequestExt, + expectedBody: string | Resolver, + config?: ResolverConfig, +): void => { + const resolvedConfig = config ?? { baseUrl: "" }; + // When expectedBody is a Resolver (e.g. from xml`...`), serialize() already includes the XML declaration. + // When it's a plain string, we need to prepend it. + const expectedXml = + typeof expectedBody === "string" + ? `` + expectedBody + : expectedBody.serialize(resolvedConfig); + if (request.rawBody === undefined || isBodyEmpty(request.rawBody)) { - throw new ValidationError(BODY_EMPTY_ERROR_MESSAGE, expectedBody, request.rawBody); + throw new ValidationError(BODY_EMPTY_ERROR_MESSAGE, expectedXml, request.rawBody); } - expectedBody = `` + expectedBody; - - let actualParsedBody = ""; + let actualParsed: unknown; parseString(request.rawBody, (err: Error | null, result: any): void => { - if (err !== null) { - throw err; - } - actualParsedBody = result; + if (err !== null) throw err; + actualParsed = result; }); - let expectedParsedBody = ""; - parseString(expectedBody, (err: Error | null, result: any): void => { - if (err !== null) { - throw err; - } - expectedParsedBody = result; + let expectedParsed: unknown; + parseString(expectedXml, (err: Error | null, result: any): void => { + if (err !== null) throw err; + expectedParsed = result; }); - if (!deepEqual(actualParsedBody, expectedParsedBody, { strict: true })) { - throw new ValidationError( - BODY_NOT_EQUAL_ERROR_MESSAGE, - prettier.format(expectedBody), - prettier.format(request.body), - ); + // If the expected body is a DynValue with matchers, use matcher-aware comparison + const matchers = + typeof expectedBody !== "string" && "getMatchers" in expectedBody + ? (expectedBody as any).getMatchers(resolvedConfig) + : []; + + if (matchers.length > 0) { + const matcherMap = new Map(); + for (const { serialized, matcher } of matchers) { + matcherMap.set(serialized, matcher); + } + expectedParsed = substituteMatchers(expectedParsed, matcherMap); + + const result = matchValues(actualParsed, expectedParsed); + if (!result.pass) { + throw new ValidationError( + `${BODY_NOT_EQUAL_ERROR_MESSAGE}: ${result.message}`, + expectedXml, + request.rawBody, + ); + } + } else { + if (!deepEqual(actualParsed, expectedParsed, { strict: true })) { + throw new ValidationError(BODY_NOT_EQUAL_ERROR_MESSAGE, expectedXml, request.rawBody); + } } }; +function substituteMatchers(value: unknown, matcherMap: Map): unknown { + if (typeof value === "string") { + return matcherMap.get(value) ?? value; + } + if (Array.isArray(value)) { + return value.map((v) => substituteMatchers(v, matcherMap)); + } + if (typeof value === "object" && value !== null) { + const obj = value as Record; + return Object.fromEntries( + Object.entries(obj).map(([k, v]) => [k, substituteMatchers(v, matcherMap)]), + ); + } + return value; +} + export const validateCoercedDateBodyEquals = ( request: RequestExt, expectedBody: unknown | undefined, @@ -85,8 +131,13 @@ export const validateCoercedDateBodyEquals = ( return; } - if (!deepEqual(coerceDate(request.body), expectedBody, { strict: true })) { - throw new ValidationError(BODY_NOT_EQUAL_ERROR_MESSAGE, expectedBody, request.body); + const result = matchValues(coerceDate(request.body), expectedBody); + if (!result.pass) { + throw new ValidationError( + `${BODY_NOT_EQUAL_ERROR_MESSAGE}: ${result.message}`, + expectedBody, + request.body, + ); } }; diff --git a/packages/spec-api/src/response-utils.ts b/packages/spec-api/src/response-utils.ts index 49a8bf797cc..d815ba85f37 100644 --- a/packages/spec-api/src/response-utils.ts +++ b/packages/spec-api/src/response-utils.ts @@ -1,3 +1,4 @@ +import { isMatcher, type MockValueMatcher } from "./match-engine.js"; import { MockBody, MockMultipartBody, Resolver, ResolverConfig } from "./types.js"; /** @@ -18,19 +19,47 @@ function createResolver(content: unknown): Resolver { const expanded = expandDyns(content, config); return JSON.stringify(expanded); }, + resolve: (config: ResolverConfig) => { + // Preserve matchers so matchValues can use them for flexible validation + return expandDyns(content, config, { resolveMatchers: false }); + }, }; } +const XML_DECLARATION = ``; + /** - * Sends the provided XML string in a MockResponse body. - * The XML declaration prefix will automatically be added to xmlString. - * @content Object to return as XML. + * Sends the provided XML content in a MockResponse body. + * The XML declaration prefix is automatically prepended. + * + * Can be used as a plain function or as a tagged template literal. + * When used as a tagged template, interpolated matchers (e.g. `match.localUrl`) + * are resolved at serialization time via `expandDyns`. + * + * @example + * ```ts + * // Plain string + * xml("hello") + * + * // Tagged template with matcher + * xml`${match.localUrl("/next")}` + * ``` + * * @returns {MockBody} response body with application/xml content type. */ -export function xml(xmlString: string): MockBody { +export function xml(content: string): MockBody; +export function xml(strings: TemplateStringsArray, ...values: unknown[]): MockBody; +export function xml(content: string | TemplateStringsArray, ...values: unknown[]): MockBody { + if (typeof content !== "string") { + return { + contentType: "application/xml", + rawContent: dyn`${XML_DECLARATION}${dyn(content, ...values)}`, + }; + } + return { contentType: "application/xml", - rawContent: `` + xmlString, + rawContent: XML_DECLARATION + content, }; } @@ -44,10 +73,11 @@ export function multipart( }; } -export interface DynValue { +export interface DynValue extends Resolver { readonly isDyn: true; - readonly keys: T; - (dict: Record): string; + (config: ResolverConfig): string; + /** Returns all matchers embedded in this template with their serialized values. */ + getMatchers(config: ResolverConfig): Array<{ serialized: string; matcher: MockValueMatcher }>; } export interface DynItem { @@ -62,47 +92,89 @@ export function dynItem(name: T): DynItem< }; } -/** Specify that this value is dynamic and needs to be interpolated with the given keys */ -export function dyn( - strings: readonly string[], - ...keys: (DynItem | string)[] -): DynValue { - const dynKeys: T = [] as any; - const template = (dict: Record) => { - const result = [strings[0]]; - keys.forEach((key, i) => { - if (typeof key === "string") { - result.push(key); - } else { - dynKeys.push(key.name); - const value = (dict as any)[key.name]; - if (value !== undefined) { - result.push(value); - } - } - result.push(strings[i + 1]); +/** + * Tagged template for building strings with deferred resolution. + * Interpolated values can be: + * - `dynItem("baseUrl")` — resolved from `ResolverConfig` + * - Matchers (e.g. `match.localUrl(...)`) — resolved via `expandDyns` + * - Other `dyn` templates — recursively resolved + * - Plain strings/numbers — used as-is + */ +export function dyn(strings: readonly string[], ...values: unknown[]): DynValue { + const template = (config: ResolverConfig) => { + let result = strings[0]; + values.forEach((v, i) => { + result += String(expandDyns(v, config)); + result += strings[i + 1]; }); - return result.join(""); + return result; }; - template.keys = dynKeys; template.isDyn = true as const; + template.serialize = template; + template.resolve = template; + template.getMatchers = (config: ResolverConfig) => { + const result: Array<{ serialized: string; matcher: MockValueMatcher }> = []; + for (const v of values) { + collectMatchers(v, config, result); + } + return result; + }; return template; } -export function expandDyns(value: T, config: ResolverConfig): T { +function collectMatchers( + value: unknown, + config: ResolverConfig, + out: Array<{ serialized: string; matcher: MockValueMatcher }>, +): void { + if (isMatcher(value)) { + out.push({ serialized: String(value.serialize(config)), matcher: value }); + } else if (typeof value === "function" && "isDyn" in value && value.isDyn) { + const dynVal = value as DynValue; + if (dynVal.getMatchers) { + out.push(...dynVal.getMatchers(config)); + } + } +} + +export interface ExpandDynsOptions { + /** When true, matchers are resolved to their `toJSON()` value. Default: true. */ + resolveMatchers?: boolean; +} + +/** + * Recursively expands all dynamic values. + * - Dyn functions are called with the config. + * - Resolvable matchers (e.g. `match.localUrl`) are resolved via `resolve(config)`. + * - By default, matchers are resolved to their `toJSON()` plain value. + * Pass `{ resolveMatchers: false }` to preserve matchers for use with `matchValues`. + */ +export function expandDyns(value: T, config: ResolverConfig, options?: ExpandDynsOptions): T { + const resolve = options?.resolveMatchers ?? true; + return _expandDyns(value, config, resolve); +} + +function _expandDyns(value: T, config: ResolverConfig, resolveMatchers: boolean): T { if (typeof value === "string") { return value; } else if (Array.isArray(value)) { - return value.map((v) => expandDyns(v, config)) as any; + return value.map((v) => _expandDyns(v, config, resolveMatchers)) as any; } else if (typeof value === "object" && value !== null) { + // DynItem — resolve from config + if ("isDyn" in value && (value as any).isDyn && "name" in value) { + return (config as any)[(value as any).name] as any; + } + if (isMatcher(value)) { + return resolveMatchers ? (value.serialize(config) as any) : (value as any); + } const obj = value as Record; return Object.fromEntries( - Object.entries(obj).map(([key, v]) => [key, expandDyns(v, config)]), + Object.entries(obj).map(([key, v]) => [key, _expandDyns(v, config, resolveMatchers)]), ) as any; } else if (typeof value === "function") { if ("isDyn" in value && value.isDyn) { - const dynValue = value as any as DynValue; - return dynValue(config as any) as any; + const dynValue = value as any as DynValue; + return dynValue(config) as any; } else { throw new Error("Invalid function value"); } diff --git a/packages/spec-api/src/types.ts b/packages/spec-api/src/types.ts index 4841caf8886..c04347a476c 100644 --- a/packages/spec-api/src/types.ts +++ b/packages/spec-api/src/types.ts @@ -110,6 +110,8 @@ export interface ResolverConfig { export interface Resolver { serialize(config: ResolverConfig): string; + /** Returns the expanded content with matchers preserved (for comparison). */ + resolve(config: ResolverConfig): unknown; } export interface MockMultipartBody { diff --git a/packages/spec-api/test/match-engine.test.ts b/packages/spec-api/test/match-engine.test.ts new file mode 100644 index 00000000000..689f642b4e4 --- /dev/null +++ b/packages/spec-api/test/match-engine.test.ts @@ -0,0 +1,303 @@ +import { describe, expect, it } from "vitest"; +import { + err, + isMatcher, + type MatchResult, + matchValues, + MockValueMatcher, + ok, +} from "../src/match-engine.js"; +import { match } from "../src/matchers/index.js"; +import { expandDyns, json } from "../src/response-utils.js"; +import { ResolverConfig } from "../src/types.js"; + +describe("isMatcher", () => { + it("should return true for a matcher", () => { + expect(isMatcher(match.dateTime.rfc3339("2022-08-26T18:38:00.000Z"))).toBe(true); + }); + + it("should return true for localUrl matchers", () => { + expect(isMatcher(match.localUrl("/path"))).toBe(true); + }); + + it("should return false for plain values", () => { + expect(isMatcher("hello")).toBe(false); + expect(isMatcher(42)).toBe(false); + expect(isMatcher(null)).toBe(false); + expect(isMatcher(undefined)).toBe(false); + expect(isMatcher({ a: 1 })).toBe(false); + expect(isMatcher([1, 2])).toBe(false); + }); +}); + +function expectPass(result: MatchResult) { + expect(result).toEqual({ pass: true }); +} + +function expectFail(result: MatchResult, messagePattern?: string | RegExp) { + expect(result.pass).toBe(false); + if (!result.pass && messagePattern) { + if (typeof messagePattern === "string") { + expect(result.message).toContain(messagePattern); + } else { + expect(result.message).toMatch(messagePattern); + } + } +} + +describe("matchValues", () => { + describe("plain values (same as deepEqual)", () => { + it("should match identical primitives", () => { + expectPass(matchValues("hello", "hello")); + expectPass(matchValues(42, 42)); + expectPass(matchValues(true, true)); + expectPass(matchValues(null, null)); + }); + + it("should not match different primitives", () => { + expectFail(matchValues("hello", "world")); + expectFail(matchValues(42, 43)); + expectFail(matchValues(true, false)); + expectFail(matchValues(null, undefined)); + }); + + it("should not match different types", () => { + expectFail(matchValues("42", 42), "Type mismatch"); + expectFail(matchValues(0, false), "Type mismatch"); + expectFail(matchValues("", null)); + }); + + it("should match identical objects", () => { + expectPass(matchValues({ a: 1, b: "two" }, { a: 1, b: "two" })); + }); + + it("should not match objects with different keys", () => { + expectFail(matchValues({ a: 1 }, { a: 1, b: 2 }), "Key count mismatch"); + expectFail(matchValues({ a: 1, b: 2 }, { a: 1 }), "Key count mismatch"); + }); + + it("should match identical arrays", () => { + expectPass(matchValues([1, 2, 3], [1, 2, 3])); + }); + + it("should not match arrays of different lengths", () => { + expectFail(matchValues([1, 2], [1, 2, 3]), "Array length mismatch"); + }); + + it("should match nested objects", () => { + expectPass(matchValues({ a: { b: [1, 2] } }, { a: { b: [1, 2] } })); + }); + + it("should not match nested objects with differences", () => { + expectFail(matchValues({ a: { b: [1, 2] } }, { a: { b: [1, 3] } })); + }); + }); + + describe("error messages include path", () => { + it("should include path for nested object mismatch", () => { + const result = matchValues({ a: { b: "wrong" } }, { a: { b: "right" } }); + expectFail(result, "at $.a.b:"); + }); + + it("should include path for array element mismatch", () => { + const result = matchValues([1, 2, "wrong"], [1, 2, "right"]); + expectFail(result, "at $[2]:"); + }); + + it("should include path for deeply nested mismatch", () => { + const result = matchValues( + { data: { items: [{ name: "wrong" }] } }, + { data: { items: [{ name: "right" }] } }, + ); + expectFail(result, "at $.data.items[0].name:"); + }); + + it("should report missing keys", () => { + const result = matchValues({ a: 1 }, { a: 1, b: 2 }); + expectFail(result, "missing: [b]"); + }); + + it("should report extra keys", () => { + const result = matchValues({ a: 1, b: 2 }, { a: 1 }); + expectFail(result, "extra: [b]"); + }); + }); + + describe("with matchers", () => { + it("should delegate to matcher.check() in top-level position", () => { + const matcher: MockValueMatcher = { + [Symbol.for("SpectorMatcher")]: true as const, + check: (actual: any) => + actual === "matched" ? ok() : err(`expected "matched" but got "${actual}"`), + serialize: () => "raw", + toJSON: () => "raw", + } as any; + expectPass(matchValues("matched", matcher)); + expectFail(matchValues("not-matched", matcher)); + }); + + it("should handle matchers nested in objects", () => { + const expected = { + name: "test", + timestamp: match.dateTime.rfc3339("2022-08-26T18:38:00.000Z"), + }; + expectPass(matchValues({ name: "test", timestamp: "2022-08-26T18:38:00Z" }, expected)); + }); + + it("should handle matchers nested in arrays", () => { + const expected = [match.dateTime.rfc3339("2022-08-26T18:38:00.000Z"), "plain"]; + expectPass(matchValues(["2022-08-26T18:38:00Z", "plain"], expected)); + }); + + it("should handle deeply nested matchers", () => { + const expected = { + data: { + items: [{ created: match.dateTime.rfc3339("2022-08-26T18:38:00.000Z"), name: "item1" }], + }, + }; + const actual = { + data: { + items: [{ created: "2022-08-26T18:38:00.0000000Z", name: "item1" }], + }, + }; + expectPass(matchValues(actual, expected)); + }); + + it("should include path in matcher failure message", () => { + const expected = { + data: { timestamp: match.dateTime.rfc3339("2022-08-26T18:38:00.000Z") }, + }; + const actual = { data: { timestamp: "not-rfc3339" } }; + const result = matchValues(actual, expected); + expectFail(result, "at $.data.timestamp:"); + expectFail(result, "rfc3339 format"); + }); + + it("should use localUrl matchers with config for exact URL check", () => { + const config: ResolverConfig = { baseUrl: "http://localhost:3000" }; + const expected = { link: match.localUrl("/next-page") }; + expectPass(matchValues({ link: "http://localhost:3000/next-page" }, expected, "$", config)); + expectFail( + matchValues({ link: "http://localhost:3000/other-page" }, expected, "$", config), + "match.localUrl", + ); + }); + }); +}); + +describe("integration with expandDyns", () => { + const config: ResolverConfig = { baseUrl: "http://localhost:3000" }; + + it("should resolve matchers to their plain values", () => { + const content = { value: match.dateTime.rfc3339("2022-08-26T18:38:00.000Z") }; + const expanded = expandDyns(content, config); + expect(expanded.value).toBe("2022-08-26T18:38:00.000Z"); + }); + + it("should resolve matchers in arrays to their plain values", () => { + const content = { items: [match.dateTime.rfc3339("2022-08-26T18:38:00.000Z")] }; + const expanded = expandDyns(content, config); + expect(expanded.items[0]).toBe("2022-08-26T18:38:00.000Z"); + }); + + it("should resolve localUrl matchers to their full URL", () => { + const content = { next: match.localUrl("/next-page") }; + const expanded = expandDyns(content, config); + expect(expanded.next).toBe("http://localhost:3000/next-page"); + }); + + it("should resolve all matchers to their plain values", () => { + const content = { + timestamp: match.dateTime.rfc3339("2022-08-26T18:38:00.000Z"), + next: match.localUrl("/next-page"), + }; + const expanded = expandDyns(content, config); + expect(expanded.timestamp).toBe("2022-08-26T18:38:00.000Z"); + expect(expanded.next).toBe("http://localhost:3000/next-page"); + }); +}); + +describe("integration with expandDyns({ resolveMatchers: false })", () => { + const config: ResolverConfig = { baseUrl: "http://localhost:3000" }; + + it("should preserve matcher objects instead of resolving them to plain strings", () => { + const content = { timestamp: match.dateTime.rfc3339("2022-08-26T18:38:00.000Z") }; + const expanded = expandDyns(content, config, { resolveMatchers: false }); + // Matcher must survive as a matcher, not be converted to a plain string + expect(isMatcher(expanded.timestamp)).toBe(true); + }); + + it("should allow matchValues to do semantic datetime comparison after expandDyns with resolveMatchers:false", () => { + // Regression test: query params/headers with datetime matchers must use semantic comparison. + // Without resolveMatchers:false, expandDyns converts the matcher to the plain string + // "2022-08-26T18:38:00.000Z", and a strict === comparison against the actual value + // "2022-08-26T18:38:00Z" (no milliseconds) would fail even though they represent the + // same point in time. + const queryDef = { input: match.dateTime.utcRfc3339("2022-08-26T18:38:00.000Z") }; + const expanded = expandDyns(queryDef, config, { resolveMatchers: false }); + + // The actual query string received from an HTTP request (no milliseconds) + const actualQueryValue = "2022-08-26T18:38:00Z"; + + // Simulates what createHandler does: isMatcher → deepEqual → matchValues → matcher.check() + expect(isMatcher(expanded.input)).toBe(true); + expectPass(matchValues(actualQueryValue, expanded.input, "$", config)); + }); + + it("should allow matchValues to do semantic datetime comparison for header values after expandDyns with resolveMatchers:false", () => { + // Regression test: headers with datetime matchers must use semantic comparison, same as query params. + // Without resolveMatchers:false the matcher is serialized early and isMatcher() returns false, + // so the code falls through to containsHeader() with String(value) — a strict string equality + // that fails for semantically equivalent but format-different datetime strings. + const headerDef = { "x-ms-date": match.dateTime.rfc7231("Fri, 26 Aug 2022 18:38:00 GMT") }; + const expanded = expandDyns(headerDef, config, { resolveMatchers: false }); + + // isMatcher must still be true so createHandler routes through deepEqual / matchValues + expect(isMatcher(expanded["x-ms-date"])).toBe(true); + // Semantic check passes for the exact same RFC 7231 string + expectPass(matchValues("Fri, 26 Aug 2022 18:38:00 GMT", expanded["x-ms-date"], "$", config)); + }); + + it("should demonstrate why resolveMatchers:true (default) breaks semantic query param matching", () => { + // With the default resolveMatchers:true, the matcher is eagerly converted to a plain string. + // A strict string comparison then fails for semantically equivalent but format-different values. + const queryDef = { input: match.dateTime.utcRfc3339("2022-08-26T18:38:00.000Z") }; + const expandedWithResolve = expandDyns(queryDef, config); // resolveMatchers: true (default) + + // The matcher is gone — replaced by its serialized string + expect(isMatcher(expandedWithResolve.input)).toBe(false); + expect(expandedWithResolve.input).toBe("2022-08-26T18:38:00.000Z"); + + // Strict string comparison fails for an equivalent datetime without milliseconds + expect(expandedWithResolve.input === "2022-08-26T18:38:00Z").toBe(false); + }); +}); + +describe("integration with json() Resolver", () => { + const config: ResolverConfig = { baseUrl: "http://localhost:3000" }; + + it("should serialize matchers to their raw value via serialize()", () => { + const body = json({ value: match.dateTime.rfc3339("2022-08-26T18:38:00.000Z") }); + const raw = (body.rawContent as any).serialize(config); + expect(raw).toBe('{"value":"2022-08-26T18:38:00.000Z"}'); + }); + + it("should preserve matchers via resolve()", () => { + const body = json({ value: match.dateTime.rfc3339("2022-08-26T18:38:00.000Z") }); + const resolved = (body.rawContent as any).resolve(config) as Record; + expect(isMatcher(resolved.value)).toBe(true); + }); + + it("should serialize localUrl matchers to their full URL via serialize()", () => { + const body = json({ next: match.localUrl("/items/page2") }); + const raw = (body.rawContent as any).serialize(config); + expect(raw).toBe('{"next":"http://localhost:3000/items/page2"}'); + }); + + it("should preserve localUrl matchers via resolve()", () => { + const body = json({ next: match.localUrl("/items/page2") }); + const resolved = (body.rawContent as any).resolve(config) as Record; + expect(isMatcher(resolved.next)).toBe(true); + expectPass((resolved.next as any).check("http://localhost:3000/items/page2", config)); + }); +}); diff --git a/packages/spec-api/test/matchers/datetime.test.ts b/packages/spec-api/test/matchers/datetime.test.ts new file mode 100644 index 00000000000..2803984fbfd --- /dev/null +++ b/packages/spec-api/test/matchers/datetime.test.ts @@ -0,0 +1,232 @@ +import { describe, expect, it } from "vitest"; +import { match } from "../../src/matchers/index.js"; +import { expectFail, expectPass } from "./matcher-test-utils.js"; + +describe("match.dateTime.rfc3339()", () => { + it("should throw for invalid datetime", () => { + expect(() => match.dateTime.rfc3339("not-a-date")).toThrow("invalid datetime value"); + }); + + it("should throw for empty string", () => { + expect(() => match.dateTime.rfc3339("")).toThrow("invalid datetime value"); + }); + + describe("check()", () => { + const matcher = match.dateTime.rfc3339("2022-08-26T18:38:00.000Z"); + + it("should match exact same string", () => { + expectPass(matcher.check("2022-08-26T18:38:00.000Z")); + }); + + it("should match without fractional seconds", () => { + expectPass(matcher.check("2022-08-26T18:38:00Z")); + }); + + it("should match with extra precision", () => { + expectPass(matcher.check("2022-08-26T18:38:00.0000000Z")); + }); + + it("should match with 1 fractional digit", () => { + expectPass(matcher.check("2022-08-26T18:38:00.0Z")); + }); + + it("should match with 2 fractional digits", () => { + expectPass(matcher.check("2022-08-26T18:38:00.00Z")); + }); + + it("should match with +00:00 offset instead of Z", () => { + expectPass(matcher.check("2022-08-26T18:38:00.000+00:00")); + }); + + it("should match equivalent time in a different timezone offset", () => { + expectPass(matcher.check("2022-08-26T14:38:00.000-04:00")); + }); + + it("should reject RFC 7231 format even if same point in time", () => { + expectFail(matcher.check("Fri, 26 Aug 2022 18:38:00 GMT"), "rfc3339 format"); + }); + + it("should not match different time", () => { + expectFail(matcher.check("2022-08-26T18:39:00.000Z"), "timestamps differ"); + }); + + it("should not match off by one second", () => { + expectFail(matcher.check("2022-08-26T18:38:01.000Z"), "timestamps differ"); + }); + + it("should not match different date same time", () => { + expectFail(matcher.check("2022-08-27T18:38:00.000Z"), "timestamps differ"); + }); + + it("should not match non-string values", () => { + expectFail(matcher.check(12345), "expected a string but got number"); + expectFail(matcher.check(null), "expected a string but got object"); + expectFail(matcher.check(undefined), "expected a string but got undefined"); + expectFail(matcher.check(true), "expected a string but got boolean"); + expectFail(matcher.check({}), "expected a string but got object"); + expectFail(matcher.check([]), "expected a string but got object"); + }); + + it("should not match empty string", () => { + expectFail(matcher.check(""), "rfc3339 format"); + }); + + it("should not match invalid datetime strings", () => { + expectFail(matcher.check("not-a-date"), "rfc3339 format"); + }); + }); + + describe("with non-zero milliseconds", () => { + const matcher = match.dateTime.rfc3339("2022-08-26T18:38:00.123Z"); + + it("should match exact milliseconds", () => { + expectPass(matcher.check("2022-08-26T18:38:00.123Z")); + }); + + it("should match with trailing zeros", () => { + expectPass(matcher.check("2022-08-26T18:38:00.1230000Z")); + }); + + it("should not match truncated milliseconds", () => { + expectFail(matcher.check("2022-08-26T18:38:00Z"), "timestamps differ"); + }); + + it("should not match different milliseconds", () => { + expectFail(matcher.check("2022-08-26T18:38:00.124Z"), "timestamps differ"); + }); + }); + + describe("with midnight edge case", () => { + const matcher = match.dateTime.rfc3339("2022-08-26T00:00:00.000Z"); + + it("should match midnight", () => { + expectPass(matcher.check("2022-08-26T00:00:00Z")); + }); + + it("should match midnight with offset expressing previous day", () => { + expectPass(matcher.check("2022-08-25T20:00:00-04:00")); + }); + }); + + describe("serialize()", () => { + it("should return the original value", () => { + expect(match.dateTime.rfc3339("2022-08-26T18:38:00.000Z").serialize()).toBe( + "2022-08-26T18:38:00.000Z", + ); + }); + + it("should serialize correctly in JSON.stringify", () => { + const obj = { value: match.dateTime.rfc3339("2022-08-26T18:38:00.000Z") }; + expect(JSON.stringify(obj)).toBe('{"value":"2022-08-26T18:38:00.000Z"}'); + }); + }); + describe("toString()", () => { + it("should include rfc3339 in toString()", () => { + expect(match.dateTime.rfc3339("2022-08-26T18:38:00.000Z").toString()).toBe( + "match.dateTime.rfc3339(2022-08-26T18:38:00.000Z)", + ); + }); + }); +}); + +describe("match.dateTime.rfc7231()", () => { + it("should throw for invalid datetime", () => { + expect(() => match.dateTime.rfc7231("not-a-date")).toThrow("invalid datetime value"); + }); + + describe("check()", () => { + const matcher = match.dateTime.rfc7231("Fri, 26 Aug 2022 14:38:00 GMT"); + + it("should match exact same string", () => { + expectPass(matcher.check("Fri, 26 Aug 2022 14:38:00 GMT")); + }); + + it("should reject RFC 3339 format even if same point in time", () => { + expectFail(matcher.check("2022-08-26T14:38:00.000Z"), "rfc7231 format"); + }); + + it("should not match different time", () => { + expectFail(matcher.check("Fri, 26 Aug 2022 14:39:00 GMT"), "timestamps differ"); + }); + + it("should not match non-string values", () => { + expectFail(matcher.check(12345), "expected a string but got number"); + expectFail(matcher.check(null), "expected a string but got object"); + }); + }); + + describe("serialize()", () => { + it("should preserve RFC 7231 format", () => { + expect(match.dateTime.rfc7231("Fri, 26 Aug 2022 14:38:00 GMT").serialize()).toBe( + "Fri, 26 Aug 2022 14:38:00 GMT", + ); + }); + }); +}); + +describe("match.dateTime.utcRfc3339()", () => { + it("should throw for invalid datetime", () => { + expect(() => match.dateTime.utcRfc3339("not-a-date")).toThrow("invalid datetime value"); + }); + + it("should throw for empty string", () => { + expect(() => match.dateTime.utcRfc3339("")).toThrow("invalid datetime value"); + }); + + describe("check()", () => { + const matcher = match.dateTime.utcRfc3339("2022-08-26T18:38:00.000Z"); + + it("should match exact same string", () => { + expectPass(matcher.check("2022-08-26T18:38:00.000Z")); + }); + + it("should match without fractional seconds", () => { + expectPass(matcher.check("2022-08-26T18:38:00Z")); + }); + + it("should match with extra precision", () => { + expectPass(matcher.check("2022-08-26T18:38:00.0000000Z")); + }); + + it("should reject +00:00 offset even though equivalent to Z", () => { + expectFail(matcher.check("2022-08-26T18:38:00.000+00:00"), "utcRfc3339 format"); + }); + + it("should reject timezone offset", () => { + expectFail(matcher.check("2022-08-26T14:38:00.000-04:00"), "utcRfc3339 format"); + }); + + it("should reject positive timezone offset", () => { + expectFail(matcher.check("2022-08-26T20:38:00.000+02:00"), "utcRfc3339 format"); + }); + + it("should reject RFC 7231 format", () => { + expectFail(matcher.check("Fri, 26 Aug 2022 18:38:00 GMT"), "utcRfc3339 format"); + }); + + it("should not match different time", () => { + expectFail(matcher.check("2022-08-26T18:39:00.000Z"), "timestamps differ"); + }); + + it("should not match non-string values", () => { + expectFail(matcher.check(12345), "expected a string but got number"); + expectFail(matcher.check(null), "expected a string but got object"); + }); + }); + + describe("serialize()", () => { + it("should return the original value", () => { + expect(match.dateTime.utcRfc3339("2022-08-26T18:38:00.000Z").serialize()).toBe( + "2022-08-26T18:38:00.000Z", + ); + }); + }); + + describe("toString()", () => { + it("should include utcRfc3339 in toString()", () => { + expect(match.dateTime.utcRfc3339("2022-08-26T18:38:00.000Z").toString()).toBe( + "match.dateTime.utcRfc3339(2022-08-26T18:38:00.000Z)", + ); + }); + }); +}); diff --git a/packages/spec-api/test/matchers/local-url.test.ts b/packages/spec-api/test/matchers/local-url.test.ts new file mode 100644 index 00000000000..f576d418c0f --- /dev/null +++ b/packages/spec-api/test/matchers/local-url.test.ts @@ -0,0 +1,82 @@ +import { describe, expect, it } from "vitest"; +import { isMatcher, type MatcherConfig } from "../../src/match-engine.js"; +import { match } from "../../src/matchers/index.js"; +import { expectFail, expectPass } from "./matcher-test-utils.js"; + +const config: MatcherConfig = { baseUrl: "http://localhost:3000" }; + +describe("match.localUrl()", () => { + it("should be identified by isMatcher", () => { + expect(isMatcher(match.localUrl("/some/path"))).toBe(true); + }); + + describe("check()", () => { + const matcher = match.localUrl("/payload/pageable/next-page"); + + it("should match exact full URL", () => { + expectPass(matcher.check("http://localhost:3000/payload/pageable/next-page", config)); + }); + + it("should not match a different base URL", () => { + expectFail( + matcher.check("http://localhost:4000/payload/pageable/next-page", config), + "match.localUrl", + ); + }); + + it("should not match a different path", () => { + expectFail( + matcher.check("http://localhost:3000/payload/pageable/other-page", config), + "match.localUrl", + ); + }); + + it("should not match non-string values", () => { + expectFail(matcher.check(42, config), "expected a string but got number"); + expectFail(matcher.check(null, config), "expected a string but got object"); + expectFail(matcher.check(undefined, config), "expected a string but got undefined"); + }); + }); + + describe("serialize()", () => { + it("should return the full URL with config", () => { + expect(match.localUrl("/some/path").serialize(config)).toBe( + "http://localhost:3000/some/path", + ); + }); + + it("should serialize correctly in JSON.stringify", () => { + const obj = { nextLink: match.localUrl("/some/path") }; + // toJSON() uses empty config, so just the path + expect(JSON.stringify(obj)).toBe('{"nextLink":"/some/path"}'); + }); + }); + + describe("resolution with different base URLs", () => { + const matcher = match.localUrl("/api/items"); + + it("should resolve with localhost", () => { + expectPass( + matcher.check("http://localhost:3000/api/items", { baseUrl: "http://localhost:3000" }), + ); + }); + + it("should resolve with https URL", () => { + expectPass( + matcher.check("https://example.com/api/items", { baseUrl: "https://example.com" }), + ); + }); + + it("should resolve with URL including port", () => { + expectPass( + matcher.check("http://127.0.0.1:8080/api/items", { baseUrl: "http://127.0.0.1:8080" }), + ); + }); + }); + + describe("toString()", () => { + it("should return a descriptive string", () => { + expect(match.localUrl("/some/path").toString()).toBe('match.localUrl("/some/path")'); + }); + }); +}); diff --git a/packages/spec-api/test/matchers/matcher-test-utils.ts b/packages/spec-api/test/matchers/matcher-test-utils.ts new file mode 100644 index 00000000000..0067fbd8da3 --- /dev/null +++ b/packages/spec-api/test/matchers/matcher-test-utils.ts @@ -0,0 +1,17 @@ +import { expect } from "vitest"; +import { MatchResult } from "../../src/match-engine.js"; + +export function expectPass(result: MatchResult) { + expect(result).toEqual({ pass: true }); +} + +export function expectFail(result: MatchResult, messagePattern?: string | RegExp) { + expect(result.pass).toBe(false); + if (!result.pass && messagePattern) { + if (typeof messagePattern === "string") { + expect(result.message).toContain(messagePattern); + } else { + expect(result.message).toMatch(messagePattern); + } + } +} diff --git a/packages/spec-coverage-sdk/CHANGELOG.md b/packages/spec-coverage-sdk/CHANGELOG.md index a3d28ff3494..713e0454253 100644 --- a/packages/spec-coverage-sdk/CHANGELOG.md +++ b/packages/spec-coverage-sdk/CHANGELOG.md @@ -1,5 +1,23 @@ # Change Log - @typespec/spec-coverage-sdk +## 0.1.0-alpha.16 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + +### Bug Fixes + +- [#9752](https://github.com/microsoft/typespec/pull/9752) Update to how coverage manifest are managed. The manifest upload each individual one as a single file + + +## 0.1.0-alpha.15 + +### Bump dependencies + +- [#9446](https://github.com/microsoft/typespec/pull/9446) Upgrade dependencies + + ## 0.1.0-alpha.14 ### Bump dependencies diff --git a/packages/spec-coverage-sdk/package.json b/packages/spec-coverage-sdk/package.json index c7df9f04154..7c391a29d46 100644 --- a/packages/spec-coverage-sdk/package.json +++ b/packages/spec-coverage-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/spec-coverage-sdk", - "version": "0.1.0-alpha.14", + "version": "0.1.0-alpha.16", "description": "Spec utility to manage the reported coverage", "main": "dist/index.js", "type": "module", @@ -10,7 +10,7 @@ "clean": "rimraf dist/ temp/" }, "engines": { - "node": ">=16.0.0" + "node": ">=22.0.0" }, "repository": { "type": "git", @@ -23,12 +23,14 @@ }, "homepage": "https://github.com/microsoft/typespec#readme", "dependencies": { - "@azure/identity": "~4.13.0", - "@azure/storage-blob": "~12.30.0", - "@types/node": "~25.0.2" + "@azure/identity": "catalog:", + "@azure/storage-blob": "catalog:", + "@types/node": "catalog:", + "@types/semver": "catalog:", + "semver": "catalog:" }, "devDependencies": { - "rimraf": "~6.1.2", - "typescript": "~5.9.2" + "rimraf": "catalog:", + "typescript": "catalog:" } } diff --git a/packages/spec-coverage-sdk/src/client.ts b/packages/spec-coverage-sdk/src/client.ts index 3611e67598b..2fe8957b740 100644 --- a/packages/spec-coverage-sdk/src/client.ts +++ b/packages/spec-coverage-sdk/src/client.ts @@ -6,6 +6,7 @@ import { ContainerClient, StorageSharedKeyCredential, } from "@azure/storage-blob"; +import { eq as semverEq, gt as semverGt, valid as semverValid } from "semver"; import { CoverageReport, GeneratorMetadata, @@ -42,26 +43,82 @@ export class SpecCoverageClient { } export class SpecManifestOperations { - #blob: BlockBlobClient; #container: ContainerClient; constructor(container: ContainerClient) { this.#container = container; - this.#blob = this.#container.getBlockBlobClient("manifest.json"); } - public async upload(manifest: ScenarioManifest | ScenarioManifest[]): Promise { + public async upload(name: string, manifest: ScenarioManifest): Promise { + await this.#upload(name, "latest", manifest); + await this.#upload(name, manifest.version, manifest); + } + + async #upload(name: string, version: string, manifest: ScenarioManifest): Promise { + const blob = this.#container.getBlockBlobClient(this.#blobName(name, version)); const content = JSON.stringify(manifest, null, 2); - await this.#blob.upload(content, content.length, { + await blob.upload(content, content.length, { blobHTTPHeaders: { blobContentType: "application/json; charset=utf-8", }, }); } - public async get(): Promise { - return readJsonBlob(this.#blob); + public async uploadIfVersionNew( + name: string, + manifest: ScenarioManifest, + ): Promise<"uploaded" | "skipped"> { + const existingVersion = await this.tryGet(name, manifest.version); + if (existingVersion) { + return "skipped"; + } + const existingLatest = await this.tryGet(name); + if (existingLatest && !isVersionNewer(manifest.version, existingLatest.version)) { + return "skipped"; + } + + await this.upload(name, manifest); + return "uploaded"; + } + + public async get(name: string, version?: string): Promise { + const blob = this.#container.getBlockBlobClient(this.#blobName(name, version)); + return readJsonBlob(blob); + } + + public async tryGet(name: string, version?: string): Promise { + const blob = this.#container.getBlockBlobClient(this.#blobName(name, version)); + try { + return await readJsonBlob(blob); + } catch (e: any) { + if ("code" in e && e.code === "BlobNotFound") { + return undefined; + } + throw e; + } } + + #blobName(name: string, version?: string) { + return `manifests/${name}/${version ?? "latest"}.json`; + } +} + +function areVersionsEquivalent(left: string, right: string): boolean { + const leftValid = semverValid(left); + const rightValid = semverValid(right); + if (leftValid && rightValid) { + return semverEq(leftValid, rightValid); + } + return left === right; +} + +function isVersionNewer(candidate: string, existing: string): boolean { + const candidateValid = semverValid(candidate); + const existingValid = semverValid(existing); + if (candidateValid && existingValid) { + return semverGt(candidateValid, existingValid); + } + return !areVersionsEquivalent(candidate, existing); } export class SpecCoverageOperations { @@ -168,7 +225,18 @@ function getCoverageContainer( async function readJsonBlob(blobClient: BlockBlobClient): Promise { const blob = await blobClient.download(); - const body = await blob.blobBody; - const content = await body!.text(); - return JSON.parse(content); + if (blob.blobBody) { + const body = await blob.blobBody; + const content = await body!.text(); + return JSON.parse(content); + } else if (blob.readableStreamBody) { + const stream = blob.readableStreamBody; + let content = ""; + for await (const chunk of stream) { + content += chunk; + } + return JSON.parse(content); + } else { + throw new Error("Blob has no body"); + } } diff --git a/packages/spec-dashboard/package.json b/packages/spec-dashboard/package.json index ce0122ea332..f241c9e0eb0 100644 --- a/packages/spec-dashboard/package.json +++ b/packages/spec-dashboard/package.json @@ -23,7 +23,7 @@ "./style.css": "./dist/style.css" }, "engines": { - "node": ">=16.0.0" + "node": ">=22.0.0" }, "repository": { "type": "git", @@ -36,23 +36,22 @@ }, "homepage": "https://github.com/microsoft/typespec#readme", "dependencies": { - "@emotion/react": "^11.14.0", - "@fluentui/react-components": "~9.72.3", - "@fluentui/react-icons": "^2.0.292", + "@fluentui/react-components": "catalog:", + "@fluentui/react-icons": "catalog:", "@typespec/spec-coverage-sdk": "workspace:^", - "react": "~19.2.3", - "react-dom": "~19.2.3", - "react-markdown": "^10.1.0" + "react": "catalog:", + "react-dom": "catalog:", + "react-markdown": "catalog:" }, "devDependencies": { - "@types/react": "~19.2.7", - "@types/react-dom": "~19.2.2", - "@vitejs/plugin-react": "~5.1.2", - "rimraf": "~6.1.2", - "rollup-plugin-visualizer": "~6.0.3", - "typescript": "~5.9.2", - "vite": "^7.2.7", - "vite-plugin-checker": "^0.12.0", - "vite-plugin-dts": "4.5.4" + "@types/react": "catalog:", + "@types/react-dom": "catalog:", + "@vitejs/plugin-react": "catalog:", + "rimraf": "catalog:", + "rollup-plugin-visualizer": "catalog:", + "typescript": "catalog:", + "vite": "catalog:", + "vite-plugin-checker": "catalog:", + "vite-plugin-dts": "catalog:" } } diff --git a/packages/spec-dashboard/src/apis.ts b/packages/spec-dashboard/src/apis.ts index 4b6b4473535..084b8d4d67a 100644 --- a/packages/spec-dashboard/src/apis.ts +++ b/packages/spec-dashboard/src/apis.ts @@ -22,14 +22,18 @@ export interface TableDefinition { export interface CoverageFromAzureStorageOptions { readonly storageAccountName: string; readonly containerName: string; - // TODO: why was this not back in the same place as the other options? - readonly manifestContainerName: string; + /** Name of the manifests(As located under manifests/.json) for this dashboard */ + readonly manifests: string[]; readonly emitterNames: string[]; readonly modes?: string[]; /** Optional table definitions to split scenarios into multiple tables */ readonly tables?: TableDefinition[]; /** Optional tier config to filter scenarios by tier */ readonly tiers?: TierConfig; + /** Show coverage overview cards at the top of the dashboard */ + readonly showOverview?: boolean; + /** Optional friendly display names for emitters. Key is the emitter package name, value is the display name. */ + readonly emitterDisplayNames?: Readonly>; } export interface GeneratorCoverageSuiteReport extends CoverageReport { @@ -51,16 +55,6 @@ export function getCoverageClient(options: CoverageFromAzureStorageOptions) { return client; } -let manifestClient: SpecCoverageClient | undefined; -export function getManifestClient(options: CoverageFromAzureStorageOptions) { - if (manifestClient === undefined) { - manifestClient = new SpecCoverageClient(options.storageAccountName, { - containerName: options.manifestContainerName, - }); - } - return manifestClient; -} - /** * Checks if a scenario name matches any of the given prefixes */ @@ -161,23 +155,34 @@ export async function getCoverageSummaries( options: CoverageFromAzureStorageOptions, ): Promise { const coverageClient = getCoverageClient(options); - const manifestClient = getManifestClient(options); // First, split manifests to determine which emitters we need - const manifests = await manifestClient.manifest.get(); + const manifests = await Promise.all(options.manifests.map((x) => coverageClient.manifest.get(x))); const allManifests: Array<{ manifest: ScenarioManifest; tableName: string; emitterNames?: string[]; }> = []; - for (const manifest of manifests) { - if (options.tables && options.tables.length > 0) { - // Use table definitions to split scenarios - const splitResults = splitManifestByTables(manifest, options.tables); - allManifests.push(...splitResults); - } else { - // No table definitions, use default behavior + if (options.tables && options.tables.length > 0) { + // Split each manifest by its table definitions, then reorder to match configured table order + const splitResults = manifests.flatMap((m) => splitManifestByTables(m, options.tables!)); + const resultByTableName = new Map(splitResults.map((r) => [r.tableName, r])); + + for (const table of options.tables) { + const match = resultByTableName.get(table.name); + if (match) { + allManifests.push(match); + resultByTableName.delete(table.name); + } + } + // Append any remaining entries (unmatched scenarios with default table names) + for (const remaining of resultByTableName.values()) { + allManifests.push(remaining); + } + } else { + // No table definitions, use default behavior + for (const manifest of manifests) { allManifests.push({ manifest, tableName: manifest.displayName || manifest.packageName || "", diff --git a/packages/spec-dashboard/src/components/coverage-overview.module.css b/packages/spec-dashboard/src/components/coverage-overview.module.css new file mode 100644 index 00000000000..f13209fca63 --- /dev/null +++ b/packages/spec-dashboard/src/components/coverage-overview.module.css @@ -0,0 +1,38 @@ +.section { + margin-bottom: 32px; + padding: 20px 24px; + background-color: var(--colorNeutralBackground2); + border-radius: var(--borderRadiusXLarge); + border: 1px solid var(--colorNeutralStroke2); +} + +.heading { + display: block; + margin-bottom: 16px; + color: var(--colorNeutralForeground1); +} + +.grid { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); + gap: 16px; +} + +.card { + background-color: var(--colorNeutralBackground1); + padding: 16px 16px 20px; + text-align: center; + display: flex; + flex-direction: column; + align-items: center; + gap: 4px; + min-height: 100px; +} + +.card-name { + color: var(--colorNeutralForeground2); + min-height: calc(var(--lineHeightBase300)); + display: flex; + align-items: center; + text-align: center; +} diff --git a/packages/spec-dashboard/src/components/coverage-overview.tsx b/packages/spec-dashboard/src/components/coverage-overview.tsx new file mode 100644 index 00000000000..cd1f7c3b819 --- /dev/null +++ b/packages/spec-dashboard/src/components/coverage-overview.tsx @@ -0,0 +1,138 @@ +import { Card, Text } from "@fluentui/react-components"; +import { FunctionComponent, useMemo } from "react"; +import { CoverageSummary } from "../apis.js"; +import { GroupRatioColors, GroupRatios } from "../constants.js"; +import style from "./coverage-overview.module.css"; + +interface EmitterOverview { + name: string; + displayName: string; + coverageRatio: number; +} + +export interface CoverageOverviewProps { + coverageSummaries: CoverageSummary[]; + emitterDisplayNames?: Record; +} + +/** + * Extracts a display-friendly name from a full emitter package name. + * e.g. "@typespec/http-client-python" → "Python" + */ +function getEmitterDisplayName( + emitterName: string, + report: CoverageSummary["generatorReports"][string], + emitterDisplayNames?: Record, +): string { + if (emitterDisplayNames?.[emitterName]) { + return emitterDisplayNames[emitterName]; + } + if (report?.generatorMetadata?.name) { + return report.generatorMetadata.name; + } + // Strip common prefix patterns + const match = emitterName.match(/http-client-(\w+)$/); + if (match) { + return match[1].charAt(0).toUpperCase() + match[1].slice(1); + } + return emitterName; +} + +/** + * Gets the accent color for a coverage ratio using the same thresholds as the coverage tables. + */ +function getOverviewColor(ratio: number): string { + for (const [key, threshold] of Object.entries(GroupRatios)) { + if (ratio >= threshold) { + return GroupRatioColors[key as keyof typeof GroupRatios]; + } + } + return GroupRatioColors.zero; +} + +/** + * Displays a section with a grid of cards showing per-emitter coverage overview. + */ +export const CoverageOverview: FunctionComponent = ({ + coverageSummaries, + emitterDisplayNames, +}) => { + const emitterOverviews = useMemo(() => { + // Aggregate scenarios per emitter across all summaries + const emitterMap = new Map< + string, + { + totalScenarios: number; + coveredScenarios: number; + report: CoverageSummary["generatorReports"][string]; + } + >(); + + for (const summary of coverageSummaries) { + for (const [emitterName, report] of Object.entries(summary.generatorReports)) { + if (!emitterMap.has(emitterName)) { + emitterMap.set(emitterName, { totalScenarios: 0, coveredScenarios: 0, report }); + } + const entry = emitterMap.get(emitterName)!; + const scenarios = summary.manifest.scenarios; + entry.totalScenarios += scenarios.length; + if (report) { + for (const scenario of scenarios) { + const status = report.results[scenario.name]; + if (status === "pass" || status === "not-applicable" || status === "not-supported") { + entry.coveredScenarios++; + } + } + } + } + } + + const overviews: EmitterOverview[] = []; + for (const [emitterName, data] of emitterMap) { + overviews.push({ + name: emitterName, + displayName: getEmitterDisplayName(emitterName, data.report, emitterDisplayNames), + coverageRatio: data.totalScenarios > 0 ? data.coveredScenarios / data.totalScenarios : 0, + }); + } + + return overviews; + }, [coverageSummaries, emitterDisplayNames]); + + if (emitterOverviews.length === 0) { + return null; + } + + return ( +
+ + Coverage Overview + +
+ {emitterOverviews.map((emitter) => ( + + ))} +
+
+ ); +}; + +interface EmitterOverviewCardProps { + emitter: EmitterOverview; +} + +const EmitterOverviewCard: FunctionComponent = ({ emitter }) => { + const accentColor = getOverviewColor(emitter.coverageRatio); + const percentage = Math.floor(emitter.coverageRatio * 100); + + return ( + + + {emitter.displayName} + + + {percentage}% + + + ); +}; diff --git a/packages/spec-dashboard/src/components/dashboard-az-storage.tsx b/packages/spec-dashboard/src/components/dashboard-az-storage.tsx index 671b4e7c69e..a3a9a89aeca 100644 --- a/packages/spec-dashboard/src/components/dashboard-az-storage.tsx +++ b/packages/spec-dashboard/src/components/dashboard-az-storage.tsx @@ -25,6 +25,8 @@ export const DashboardFromAzureStorage = (props: DashboardFromAzureStorageProps) ) : ( "Loading" diff --git a/packages/spec-dashboard/src/components/dashboard-table.module.css b/packages/spec-dashboard/src/components/dashboard-table.module.css new file mode 100644 index 00000000000..b877add88c2 --- /dev/null +++ b/packages/spec-dashboard/src/components/dashboard-table.module.css @@ -0,0 +1,83 @@ +.table { + border-collapse: collapse; +} + +.table tr:nth-of-type(2n) { + background-color: var(--colorNeutralBackground3); +} + +.table td, +.table th { + border: 1px solid var(--colorNeutralStroke3); + height: 32px; +} + +.table th { + padding: 6px 13px; + background-color: var(--colorNeutralBackground1); +} + +.scenario-status-cell { + padding: 0; + width: 120px; +} + +.header-cell { + padding: 0 !important; +} + +.header-grid { + display: grid; + height: 100%; + grid-template-rows: auto 26px 32px; + grid-template-columns: 1fr 1fr; + border-bottom: 2px solid var(--colorNeutralStroke3); + grid-template-areas: + "name name" + "gen-version spec-version" + "status status"; +} + +.header-name { + grid-area: name; + border-bottom: 1px solid var(--colorNeutralStroke3); + padding: 5px; + text-align: center; + cursor: pointer; +} + +.header-name:hover { + background: var(--colorNeutralStroke3); +} + +.version { + font-size: 9pt; + font-weight: normal; + color: var(--colorNeutralForeground2); + padding: 5px; + text-overflow: ellipsis; + white-space: nowrap; + display: flex; + width: 60px; + overflow: hidden; +} + +.gen-version { + grid-area: gen-version; + border-right: 1px solid var(--colorNeutralStroke3); +} + +.spec-version { + grid-area: spec-version; +} + +.header-status { + grid-area: status; + border-top: 1px solid var(--colorNeutralStroke3); + height: 32px; +} + +.version-icon { + margin-right: 5px; + flex: 0 0 auto; +} diff --git a/packages/spec-dashboard/src/components/dashboard-table.tsx b/packages/spec-dashboard/src/components/dashboard-table.tsx index 45ef15a6341..d511d7facc9 100644 --- a/packages/spec-dashboard/src/components/dashboard-table.tsx +++ b/packages/spec-dashboard/src/components/dashboard-table.tsx @@ -1,10 +1,10 @@ -import { css } from "@emotion/react"; -import { Popover, PopoverSurface, PopoverTrigger, tokens } from "@fluentui/react-components"; +import { mergeClasses, Popover, PopoverSurface, PopoverTrigger } from "@fluentui/react-components"; import { CodeBlock16Filled, Print16Filled } from "@fluentui/react-icons"; -import { ScenarioData, ScenarioManifest } from "@typespec/spec-coverage-sdk"; +import { ScenarioManifest } from "@typespec/spec-coverage-sdk"; import { FunctionComponent, useCallback, useMemo, useState } from "react"; import { CoverageSummary, GeneratorCoverageSuiteReport } from "../apis.js"; -import { Colors } from "../constants.js"; +import { getCompletedRatio } from "../utils/coverage-utils.js"; +import style from "./dashboard-table.module.css"; import { GeneratorInformation } from "./generator-information.js"; import { ScenarioGroupRatioStatusBox } from "./scenario-group-status.js"; import { ScenarioStatusBox } from "./scenario-status.js"; @@ -13,6 +13,7 @@ import { ManifestTreeNode, TreeTableRow } from "./tree-table/types.js"; export interface DashboardTableProps { coverageSummary: CoverageSummary; + emitterDisplayNames?: Record; } function buildTreeRows( @@ -52,7 +53,10 @@ function buildTreeRows( return rows; } -export const DashboardTable: FunctionComponent = ({ coverageSummary }) => { +export const DashboardTable: FunctionComponent = ({ + coverageSummary, + emitterDisplayNames, +}) => { const languages: string[] = Object.keys(coverageSummary.generatorReports) as any; const tree = useMemo(() => createTree(coverageSummary.manifest), [coverageSummary.manifest]); @@ -76,9 +80,12 @@ export const DashboardTable: FunctionComponent = ({ coverag }); return ( - +
- + {rows}
@@ -101,7 +108,7 @@ const DashboardRow: FunctionComponent = ({ {languages.map((lang) => ( - + {scenarioData ? ( = ( return ; }; -function getCompletedRatio( - scenarios: ScenarioData[], - report: GeneratorCoverageSuiteReport, - scope: string = "", -) { - const filtered = scenarios.filter((x) => x.name.startsWith(scope)); - let coveredCount = 0; - for (const scenario of filtered) { - const status = report.results[scenario.name]; - if (status === "pass" || status === "not-applicable" || status === "not-supported") { - coveredCount++; - } - } - - return coveredCount / filtered.length; -} - interface DashboardHeaderRowProps { coverageSummary: CoverageSummary; + emitterDisplayNames?: Record; } -const DashboardHeaderRow: FunctionComponent = ({ coverageSummary }) => { +const DashboardHeaderRow: FunctionComponent = ({ + coverageSummary, + emitterDisplayNames, +}) => { const data: [string, number, GeneratorCoverageSuiteReport | undefined][] = Object.entries( coverageSummary.generatorReports, ).map(([language, report]) => { @@ -171,74 +165,38 @@ const DashboardHeaderRow: FunctionComponent = ({ covera {tableHeader} {data.map(([lang, status, report]) => ( - + ))} ); }; -const TableStyles = css({ - borderCollapse: "collapse", - "& tr:nth-of-type(2n)": { - backgroundColor: tokens.colorNeutralBackground3, - }, - "& td, & th": { - border: `1px solid ${Colors.borderDefault}`, - height: "32px", - }, - "& th": { - padding: "6px 13px", - backgroundColor: tokens.colorNeutralBackground1, - }, -}); - -const ScenarioStatusCellStyles = css({ - padding: 0, - width: 120, -}); export interface GeneratorHeaderCellProps { status: number; report: GeneratorCoverageSuiteReport | undefined; language: string; + displayName?: string; } export const GeneratorHeaderCell: FunctionComponent = ({ status, report, language, + displayName, }) => { return ( - -
-
+ +
+
-
{report?.generatorMetadata?.name ?? language}
+
{displayName ?? report?.generatorMetadata?.name ?? language}
 {report && } @@ -247,38 +205,20 @@ export const GeneratorHeaderCell: FunctionComponent =
- + {report?.generatorMetadata?.version ?? "?"}
- + {report?.scenariosMetadata?.version ?? "?"}
-
+
@@ -286,18 +226,6 @@ export const GeneratorHeaderCell: FunctionComponent = ); }; -const versionStyles = css({ - fontSize: "9pt", - fontWeight: "normal", - color: Colors.lightText, - padding: 5, - textOverflow: "ellipsis", - whiteSpace: "nowrap", - display: "flex", - width: 60, - overflow: "hidden", -}); - function createTree(manifest: ScenarioManifest): ManifestTreeNode { const root: ManifestTreeNode = { name: "", fullName: "", children: {} }; @@ -320,18 +248,5 @@ function createTree(manifest: ScenarioManifest): ManifestTreeNode { current.scenario = scenario; } - return cutTillMultipleChildren(root); -} - -function cutTillMultipleChildren(node: ManifestTreeNode): ManifestTreeNode { - let newRoot: ManifestTreeNode = node; - while (newRoot.children) { - if (Object.keys(newRoot.children).length === 1) { - newRoot = Object.values(newRoot.children)[0]; - } else { - break; - } - } - - return newRoot; + return root; } diff --git a/packages/spec-dashboard/src/components/dashboard.module.css b/packages/spec-dashboard/src/components/dashboard.module.css new file mode 100644 index 00000000000..0078383db0e --- /dev/null +++ b/packages/spec-dashboard/src/components/dashboard.module.css @@ -0,0 +1,24 @@ +.summary-table { + margin: 5px; +} + +.specs-card { + margin: 5px; + flex: 0; +} + +.specs-row { + display: flex; +} + +.spacer { + height: 30px; +} + +.card { + width: 500px; +} + +.tier-filter { + margin-bottom: 20px; +} diff --git a/packages/spec-dashboard/src/components/dashboard.tsx b/packages/spec-dashboard/src/components/dashboard.tsx index 2578b45ce11..62f15ff51a6 100644 --- a/packages/spec-dashboard/src/components/dashboard.tsx +++ b/packages/spec-dashboard/src/components/dashboard.tsx @@ -3,18 +3,26 @@ import { FunctionComponent, useState } from "react"; import { CoverageSummary } from "../apis.js"; import { useTierFiltering } from "../hooks/use-tier-filtering.js"; import { TierConfig } from "../utils/tier-filtering-utils.js"; +import { CoverageOverview } from "./coverage-overview.js"; import { DashboardTable } from "./dashboard-table.js"; +import style from "./dashboard.module.css"; import { InfoEntry, InfoReport } from "./info-table.js"; -import { TierFilterDropdown } from "./tier-filter.js"; +import { TierFilterTabs } from "./tier-filter.js"; export interface DashboardProps { coverageSummaries: CoverageSummary[]; scenarioTierConfig?: TierConfig; + /** Show coverage overview cards at the top of the dashboard */ + showOverview?: boolean; + /** Optional friendly display names for emitters. Key is the emitter package name. */ + emitterDisplayNames?: Record; } export const Dashboard: FunctionComponent = ({ coverageSummaries, scenarioTierConfig, + showOverview, + emitterDisplayNames, }) => { const [selectedTier, setSelectedTier] = useState(undefined); @@ -24,27 +32,38 @@ export const Dashboard: FunctionComponent = ({ selectedTier, ); - const summaryTables = filteredSummaries.map((coverageSummary, i) => ( -
- -
- )); + const summaryTables = filteredSummaries + .filter((s) => !selectedTier || s.manifest.scenarios.length > 0) + .map((coverageSummary, i) => ( +
+ +
+ )); const specsCardTable = coverageSummaries.map((coverageSummary, i) => ( -
+
)); return (
- -
{specsCardTable}
-
+ {showOverview && ( + + )} +
{specsCardTable}
+
{summaryTables}
); @@ -58,7 +77,7 @@ const CadlRanchSpecsCard: FunctionComponent<{ const packageName = coverageSummary.manifest.packageName; return ( - + {heading}} /> [] }) => { return ( @@ -22,7 +23,7 @@ export const InfoEntry: FunctionComponent = ({ valueTitle, }) => { return ( - + - + {value} diff --git a/packages/spec-dashboard/src/components/scenario-group-status.module.css b/packages/spec-dashboard/src/components/scenario-group-status.module.css new file mode 100644 index 00000000000..79b3a0a202c --- /dev/null +++ b/packages/spec-dashboard/src/components/scenario-group-status.module.css @@ -0,0 +1,8 @@ +.ratio-box { + height: 100%; + width: 100%; + display: flex; + color: var(--colorNeutralForegroundOnBrand); + align-items: center; + justify-content: center; +} diff --git a/packages/spec-dashboard/src/components/scenario-group-status.tsx b/packages/spec-dashboard/src/components/scenario-group-status.tsx index af3d5bf41ca..dc8b37253c3 100644 --- a/packages/spec-dashboard/src/components/scenario-group-status.tsx +++ b/packages/spec-dashboard/src/components/scenario-group-status.tsx @@ -1,7 +1,6 @@ -import { SerializedStyles, css } from "@emotion/react"; -import { tokens } from "@fluentui/react-components"; import { FunctionComponent } from "react"; import { GroupRatioColors, GroupRatios } from "../constants.js"; +import style from "./scenario-group-status.module.css"; export interface ScenarioGroupStatusRatioBoxProps { readonly ratio: number; @@ -10,36 +9,17 @@ export interface ScenarioGroupStatusRatioBoxProps { export const ScenarioGroupRatioStatusBox: FunctionComponent = ({ ratio, }) => { - let css = groupRatioStyles.bad; + let backgroundColor = GroupRatioColors.bad; for (const [key, expectedRatio] of Object.entries(GroupRatios)) { if (ratio >= expectedRatio) { - css = groupRatioStyles[key as keyof typeof GroupRatios]; + backgroundColor = GroupRatioColors[key as keyof typeof GroupRatios]; break; } } return ( -
+
{Math.floor(ratio * 100)}%
); }; - -const groupRatioStyles: Record = Object.fromEntries( - Object.entries(GroupRatioColors).map(([key, value]) => { - return [key, css({ backgroundColor: value })]; - }), -) as any; diff --git a/packages/spec-dashboard/src/components/scenario-status.module.css b/packages/spec-dashboard/src/components/scenario-status.module.css new file mode 100644 index 00000000000..88a064a842e --- /dev/null +++ b/packages/spec-dashboard/src/components/scenario-status.module.css @@ -0,0 +1,32 @@ +.status-box { + height: 100%; + width: 100%; + color: var(--colorNeutralForegroundOnBrand); + display: flex; + align-items: center; + justify-content: center; +} + +.pass { + background-color: #5e9732; +} + +.fail { + background-color: #ef3e36; +} + +.not-supported { + background-color: var(--colorNeutralStroke3); +} + +.not-applicable { + background-color: var(--colorNeutralStroke3); +} + +.not-implemented { + background-color: #ef3e36; +} + +.not-reported { + background-color: #ef3e36; +} diff --git a/packages/spec-dashboard/src/components/scenario-status.tsx b/packages/spec-dashboard/src/components/scenario-status.tsx index 757d3f9aeda..2b4aab06e24 100644 --- a/packages/spec-dashboard/src/components/scenario-status.tsx +++ b/packages/spec-dashboard/src/components/scenario-status.tsx @@ -1,5 +1,4 @@ -import { css } from "@emotion/react"; -import { tokens } from "@fluentui/react-components"; +import { mergeClasses } from "@fluentui/react-components"; import { Checkmark20Filled, ErrorCircle20Filled, @@ -9,7 +8,7 @@ import { } from "@fluentui/react-icons"; import { ScenarioStatus } from "@typespec/spec-coverage-sdk"; import { FunctionComponent } from "react"; -import { ScenarioStatusColors } from "../constants.js"; +import style from "./scenario-status.module.css"; export interface ScenarioStatusBoxProps { readonly status: ScenarioStatus | undefined; @@ -35,45 +34,27 @@ export const ScenarioStatusBox: FunctionComponent = ({ s } }; -const ScenarioStatusBoxStyles = css({ - height: "100%", - width: "100%", - color: tokens.colorNeutralForegroundOnBrand, - display: "flex", - alignItems: "center", - justifyContent: "center", -}); - export const PassStatus = () => ( -
+
); export const FailStatus = () => ( -
+
); export const NotSupportedStatus = () => ( -
+
); export const NotApplicableStatus = () => (
@@ -82,17 +63,14 @@ export const NotApplicableStatus = () => ( export const NotImplementedStatus = () => (
); export const NotReportedStatus = () => ( -
+
); diff --git a/packages/spec-dashboard/src/components/tier-filter.tsx b/packages/spec-dashboard/src/components/tier-filter.tsx index af3c818c0c4..44c83f786bd 100644 --- a/packages/spec-dashboard/src/components/tier-filter.tsx +++ b/packages/spec-dashboard/src/components/tier-filter.tsx @@ -1,5 +1,6 @@ -import { Dropdown, Option, Text } from "@fluentui/react-components"; +import { Tab, TabList } from "@fluentui/react-components"; import { FunctionComponent } from "react"; +import style from "./dashboard.module.css"; export interface TierFilterProps { allTiers?: string[]; selectedTier?: string; @@ -7,9 +8,9 @@ export interface TierFilterProps { } /** - * A dropdown to filter scenarios by their tier. + * Tabs to filter scenarios by their tier. */ -export const TierFilterDropdown: FunctionComponent = ({ +export const TierFilterTabs: FunctionComponent = ({ allTiers, selectedTier, setSelectedTier, @@ -19,39 +20,20 @@ export const TierFilterDropdown: FunctionComponent = ({ } return ( -
- Filter by Tier: - { - setSelectedTier(data.optionValue === "all" ? undefined : data.optionValue); +
+ { + setSelectedTier(data.value === "all" ? undefined : (data.value as string)); }} - css={{ minWidth: 150 }} > - + All tiers {allTiers.map((tier) => ( - + ))} - - {selectedTier && ( - - Showing {selectedTier} tier scenarios only - - )} +
); }; diff --git a/packages/spec-dashboard/src/components/tree-table/row-label-cell.module.css b/packages/spec-dashboard/src/components/tree-table/row-label-cell.module.css new file mode 100644 index 00000000000..3dd6e2ebc45 --- /dev/null +++ b/packages/spec-dashboard/src/components/tree-table/row-label-cell.module.css @@ -0,0 +1,22 @@ +.cell { + min-width: 260px; + padding: 0 5px; +} + +.cell-expandable { + cursor: pointer; +} + +.content { + display: flex; + align-items: center; +} + +.caret { + transition: transform 0.2s linear; +} + +.label { + margin-left: 10px; + flex: 1; +} diff --git a/packages/spec-dashboard/src/components/tree-table/row-label-cell.tsx b/packages/spec-dashboard/src/components/tree-table/row-label-cell.tsx index 53141f3e5e2..8ddbd93404e 100644 --- a/packages/spec-dashboard/src/components/tree-table/row-label-cell.tsx +++ b/packages/spec-dashboard/src/components/tree-table/row-label-cell.tsx @@ -1,5 +1,6 @@ import { Button, + mergeClasses, Popover, PopoverSurface, PopoverTrigger, @@ -15,6 +16,7 @@ import { import { ScenarioData, ScenarioManifest } from "@typespec/spec-coverage-sdk"; import { FunctionComponent, useMemo } from "react"; import ReactMarkdown from "react-markdown"; +import style from "./row-label-cell.module.css"; import { ManifestTreeNode, TreeTableRow } from "./types.js"; export interface RowLabelCellProps { @@ -34,32 +36,13 @@ export const RowLabelCell: FunctionComponent = ({ row, manife const rowLabel = getLabelForRow(row); return ( -
-
- {caret} -
-
- {rowLabel} -
-
+
+
{caret}
+
{rowLabel}
+
{row.item.scenario && } {row.item.scenario && manifest.sourceUrl && ( diff --git a/packages/spec-dashboard/src/utils/coverage-utils.ts b/packages/spec-dashboard/src/utils/coverage-utils.ts new file mode 100644 index 00000000000..9cb28cdfc5c --- /dev/null +++ b/packages/spec-dashboard/src/utils/coverage-utils.ts @@ -0,0 +1,26 @@ +import { ScenarioData } from "@typespec/spec-coverage-sdk"; +import { GeneratorCoverageSuiteReport } from "../apis.js"; + +/** + * Calculates the ratio of completed (pass, not-applicable, not-supported) scenarios. + * @param scenarios - All scenarios to consider + * @param report - The generator coverage report + * @param scope - Optional prefix to filter scenarios by + * @returns A ratio between 0 and 1 + */ +export function getCompletedRatio( + scenarios: ScenarioData[], + report: GeneratorCoverageSuiteReport, + scope: string = "", +): number { + const filtered = scenarios.filter((x) => x.name.startsWith(scope)); + let coveredCount = 0; + for (const scenario of filtered) { + const status = report.results[scenario.name]; + if (status === "pass" || status === "not-applicable" || status === "not-supported") { + coveredCount++; + } + } + + return filtered.length > 0 ? coveredCount / filtered.length : 0; +} diff --git a/packages/spec-dashboard/tsconfig.json b/packages/spec-dashboard/tsconfig.json index 08cb48ddb89..b83e151521e 100644 --- a/packages/spec-dashboard/tsconfig.json +++ b/packages/spec-dashboard/tsconfig.json @@ -6,9 +6,8 @@ "skipLibCheck": true, "noEmit": true, "jsx": "react-jsx", - "jsxImportSource": "@emotion/react", "lib": ["DOM", "ES2022"], - "types": ["vite/client", "@emotion/react"] + "types": ["vite/client"] }, "include": ["src"] } diff --git a/packages/spec-dashboard/vite.config.ts b/packages/spec-dashboard/vite.config.ts index 2b02df429c0..09ce4942da9 100644 --- a/packages/spec-dashboard/vite.config.ts +++ b/packages/spec-dashboard/vite.config.ts @@ -26,7 +26,7 @@ export default defineConfig({ }, rollupOptions: { - external: externals, + external: (id) => externals.some((x) => id.startsWith(x)), }, }, plugins: [ diff --git a/packages/spec/package.json b/packages/spec/package.json index 58187fa4833..33387831e22 100644 --- a/packages/spec/package.json +++ b/packages/spec/package.json @@ -20,8 +20,8 @@ "watch": "node scripts/watch-spec.js" }, "devDependencies": { - "@types/node": "~25.0.2", + "@types/node": "catalog:", "@typespec/internal-build-utils": "workspace:^", - "ecmarkup": "~22.0.0" + "ecmarkup": "catalog:" } } diff --git a/packages/spec/src/spec.emu.html b/packages/spec/src/spec.emu.html index 58066d3f022..1a74c894e72 100644 --- a/packages/spec/src/spec.emu.html +++ b/packages/spec/src/spec.emu.html @@ -497,6 +497,7 @@

Syntactic Grammar

PrimaryExpression[InParameter] : TypeOfExpression + FunctionTypeExpression Literal CallOrReferenceExpression ParenthesizedExpression[?InParameter] @@ -505,6 +506,12 @@

Syntactic Grammar

ModelExpression TupleExpression +FunctionTypeExpression : + `fn` `(` FunctionParameterList? `)` FunctionTypeExpressionReturnTypeAnnotation? + +FunctionTypeExpressionReturnTypeAnnotation : + `=>` MixedParameterConstraint + Literal : StringLiteral BooleanLiteral diff --git a/packages/spector/CHANGELOG.md b/packages/spector/CHANGELOG.md index 44e26a32a2a..9bf08fc51e8 100644 --- a/packages/spector/CHANGELOG.md +++ b/packages/spector/CHANGELOG.md @@ -1,5 +1,34 @@ # Change Log - @typespec/spector +## 0.1.0-alpha.25 + +### Features + +- [#10011](https://github.com/microsoft/typespec/pull/10011) Add matcher framework for flexible value comparison in scenarios. `match.dateTime()` enables semantic datetime comparison that handles precision and timezone differences across languages. + +### Bug Fixes + +- [#10259](https://github.com/microsoft/typespec/pull/10259) Fix query parameter matcher handling: use `resolveMatchers: false` so matcher objects (e.g. `match.dateTime`) are checked semantically instead of being serialized to plain strings before comparison. + + +## 0.1.0-alpha.24 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + +### Bug Fixes + +- [#9752](https://github.com/microsoft/typespec/pull/9752) Update to how coverage manifest are managed. The manifest upload each individual one as a single file + + +## 0.1.0-alpha.23 + +### Bump dependencies + +- [#9446](https://github.com/microsoft/typespec/pull/9446) Upgrade dependencies + + ## 0.1.0-alpha.22 ### Bump dependencies diff --git a/packages/spector/generated-defs/TypeSpec.Spector.ts-test.ts b/packages/spector/generated-defs/TypeSpec.Spector.ts-test.ts index 515f6e257c9..cc404423ef3 100644 --- a/packages/spector/generated-defs/TypeSpec.Spector.ts-test.ts +++ b/packages/spector/generated-defs/TypeSpec.Spector.ts-test.ts @@ -7,4 +7,4 @@ import type { TypeSpecSpectorDecorators } from "./TypeSpec.Spector.js"; /** * An error here would mean that the exported decorator is not using the same signature. Make sure to have export const $decName: DecNameDecorator = (...) => ... */ -const _: TypeSpecSpectorDecorators = $decorators["TypeSpec.Spector"]; +const _decs: TypeSpecSpectorDecorators = $decorators["TypeSpec.Spector"]; diff --git a/packages/spector/package.json b/packages/spector/package.json index bf592a39960..ca417d39ce0 100644 --- a/packages/spector/package.json +++ b/packages/spector/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/spector", - "version": "0.1.0-alpha.22", + "version": "0.1.0-alpha.25", "description": "Typespec Core Tool to validate, run mock api, collect coverage.", "exports": { ".": { @@ -22,7 +22,7 @@ "test:ui": "vitest --ui" }, "engines": { - "node": ">=16.0.0" + "node": ">=22.0.0" }, "repository": { "type": "git", @@ -35,39 +35,39 @@ }, "homepage": "https://github.com/microsoft/typespec#readme", "dependencies": { - "@azure/identity": "~4.13.0", + "@azure/identity": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/http": "workspace:^", "@typespec/rest": "workspace:^", "@typespec/spec-api": "workspace:^", "@typespec/spec-coverage-sdk": "workspace:^", "@typespec/versioning": "workspace:^", - "ajv": "~8.17.1", - "body-parser": "^2.2.0", - "deep-equal": "^2.2.0", - "express": "^5.2.1", - "globby": "~16.1.0", - "micromatch": "^4.0.8", - "morgan": "^1.10.0", - "multer": "^2.0.1", - "picocolors": "~1.1.1", - "source-map-support": "~0.5.21", - "xml2js": "^0.6.2", - "yaml": "~2.8.2", - "yargs": "~18.0.0" + "ajv": "catalog:", + "body-parser": "catalog:", + "deep-equal": "catalog:", + "express": "catalog:", + "globby": "catalog:", + "micromatch": "catalog:", + "morgan": "catalog:", + "multer": "catalog:", + "picocolors": "catalog:", + "source-map-support": "catalog:", + "xml2js": "catalog:", + "yaml": "catalog:", + "yargs": "catalog:" }, "devDependencies": { - "@types/body-parser": "^1.19.2", - "@types/deep-equal": "^1.0.1", - "@types/express": "^5.0.6", - "@types/micromatch": "^4.0.9", - "@types/morgan": "^1.9.9", - "@types/multer": "^2.0.0", - "@types/node": "~25.0.2", - "@types/xml2js": "^0.4.11", - "@types/yargs": "~17.0.33", + "@types/body-parser": "catalog:", + "@types/deep-equal": "catalog:", + "@types/express": "catalog:", + "@types/micromatch": "catalog:", + "@types/morgan": "catalog:", + "@types/multer": "catalog:", + "@types/node": "catalog:", + "@types/xml2js": "catalog:", + "@types/yargs": "catalog:", "@typespec/tspd": "workspace:^", - "rimraf": "~6.1.2", - "typescript": "~5.9.2" + "rimraf": "catalog:", + "typescript": "catalog:" } } diff --git a/packages/spector/src/actions/helper.ts b/packages/spector/src/actions/helper.ts index 14a855a95c6..7ce381abdc4 100644 --- a/packages/spector/src/actions/helper.ts +++ b/packages/spector/src/actions/helper.ts @@ -35,7 +35,7 @@ function renderMultipartRequest(body: MockMultipartBody) { return formData; } -function resolveUrl(request: ServiceRequest) { +function resolveUrl(request: ServiceRequest, config: ResolverConfig) { let endpoint = request.url; if (request.pathParams) { @@ -47,14 +47,15 @@ function resolveUrl(request: ServiceRequest) { endpoint = endpoint.replaceAll("\\:", ":"); if (request.query) { + const resolved = expandDyns(request.query, config); const query = new URLSearchParams(); - for (const [key, value] of Object.entries(request.query)) { + for (const [key, value] of Object.entries(resolved)) { if (Array.isArray(value)) { for (const v of value) { - query.append(key, v); + query.append(key, String(v)); } } else { - query.append(key, value as any); + query.append(key, String(value)); } } endpoint = `${endpoint}?${query.toString()}`; @@ -66,9 +67,9 @@ export async function makeServiceCall( request: ServiceRequest, config: ResolverConfig, ): Promise { - const url = resolveUrl(request); + const url = resolveUrl(request, config); let body; - let headers = expandDyns(request.headers, config) as Record; + let headers = expandDyns(request.headers, config) as Record | undefined; if (request.body) { if ("kind" in request.body) { const formData = renderMultipartRequest(request.body); diff --git a/packages/spector/src/actions/server-test.ts b/packages/spector/src/actions/server-test.ts index 6cd60ddbdf3..6bb41a9f1d3 100644 --- a/packages/spector/src/actions/server-test.ts +++ b/packages/spector/src/actions/server-test.ts @@ -1,11 +1,11 @@ import { expandDyns, + matchValues, MockApiDefinition, MockBody, ResolverConfig, ValidationError, } from "@typespec/spec-api"; -import deepEqual from "deep-equal"; import micromatch from "micromatch"; import { inspect } from "node:util"; import pc from "picocolors"; @@ -79,28 +79,44 @@ class ServerTestsGenerator { async #validateBody(response: Response, body: MockBody) { if (Buffer.isBuffer(body.rawContent)) { const responseData = Buffer.from(await response.arrayBuffer()); - if (!deepEqual(responseData, body.rawContent)) { - throw new ValidationError(`Raw body mismatch`, body.rawContent, responseData); + const result = matchValues(responseData, body.rawContent); + if (!result.pass) { + throw new ValidationError( + `Raw body mismatch: ${result.message}`, + body.rawContent, + responseData, + ); } } else { const responseData = await response.text(); - const raw = - typeof body.rawContent === "string" - ? body.rawContent - : body.rawContent?.serialize(this.resolverConfig); switch (body.contentType) { case "application/xml": - case "text/plain": - if (body.rawContent !== responseData) { + case "text/plain": { + const raw = + typeof body.rawContent === "string" + ? body.rawContent + : body.rawContent?.serialize(this.resolverConfig); + if (raw !== responseData) { throw new ValidationError("Response data mismatch", raw, responseData); } break; - case "application/json": - const expected = JSON.parse(raw as any); + } + case "application/json": { + const expected = + typeof body.rawContent === "string" + ? JSON.parse(body.rawContent) + : body.rawContent?.resolve(this.resolverConfig); const actual = JSON.parse(responseData); - if (!deepEqual(actual, expected, { strict: true })) { - throw new ValidationError("Response data mismatch", expected, actual); + const result = matchValues(actual, expected); + if (!result.pass) { + throw new ValidationError( + `Response data mismatch: ${result.message}`, + expected, + actual, + ); } + break; + } } } } diff --git a/packages/spector/src/actions/upload-scenario-manifest.ts b/packages/spector/src/actions/upload-scenario-manifest.ts index d2ea0cf9356..e6d2119ee61 100644 --- a/packages/spector/src/actions/upload-scenario-manifest.ts +++ b/packages/spector/src/actions/upload-scenario-manifest.ts @@ -7,35 +7,48 @@ import { computeScenarioManifest } from "../coverage/scenario-manifest.js"; import { logger } from "../logger.js"; export interface UploadScenarioManifestConfig { - scenariosPaths: string[]; + scenariosPath: string; storageAccountName: string; containerName: string; + manifestName: string; + override?: boolean; } export async function uploadScenarioManifest({ - scenariosPaths, + scenariosPath, storageAccountName, containerName, + manifestName, + override = false, }: UploadScenarioManifestConfig) { - const manifests = []; - for (let idx = 0; idx < scenariosPaths.length; idx++) { - const path = resolve(process.cwd(), scenariosPaths[idx]); - logger.info(`Computing scenario manifest for ${path}`); - const [manifest, diagnostics] = await computeScenarioManifest(path); - if (manifest === undefined || diagnostics.length > 0) { - process.exit(-1); - } - manifests.push(manifest); + const path = resolve(process.cwd(), scenariosPath); + logger.info(`Computing scenario manifest for ${path}`); + const [manifest, diagnostics] = await computeScenarioManifest(path); + if (manifest === undefined || diagnostics.length > 0) { + process.exit(-1); } - await writeFile("manifest.json", JSON.stringify(manifests, null, 2)); + await writeFile("manifest.json", JSON.stringify(manifest, null, 2)); const client = new SpecCoverageClient(storageAccountName, { credential: new AzureCliCredential(), containerName, }); await client.createIfNotExists(); - await client.manifest.upload(manifests); + if (override) { + await client.manifest.upload(manifestName, manifest); + logger.info( + `${pc.green("✓")} Scenario manifest uploaded to ${storageAccountName} storage account.`, + ); + } else { + const result = await client.manifest.uploadIfVersionNew(manifestName, manifest); - logger.info( - `${pc.green("✓")} Scenario manifest uploaded to ${storageAccountName} storage account.`, - ); + if (result === "uploaded") { + logger.info( + `${pc.green("✓")} Scenario manifest new version uploaded to ${storageAccountName} storage account.`, + ); + } else { + logger.info( + `${pc.white("-")} Existing scenario manifest in ${storageAccountName} storage account is up to date. No upload needed.`, + ); + } + } } diff --git a/packages/spector/src/app/app.ts b/packages/spector/src/app/app.ts index 329e08de767..a6b5cc2c62a 100644 --- a/packages/spector/src/app/app.ts +++ b/packages/spector/src/app/app.ts @@ -1,5 +1,6 @@ import { expandDyns, + isMatcher, MockApiDefinition, MockBody, MockMultipartBody, @@ -105,19 +106,31 @@ function validateBody( if (Buffer.isBuffer(body.rawContent)) { req.expect.rawBodyEquals(body.rawContent); } else { - const raw = - typeof body.rawContent === "string" ? body.rawContent : body.rawContent?.serialize(config); switch (body.contentType) { - case "application/json": - req.expect.coercedBodyEquals(JSON.parse(raw as any)); + case "application/json": { + const expected = + typeof body.rawContent === "string" + ? JSON.parse(body.rawContent) + : body.rawContent?.resolve(config); + req.expect.coercedBodyEquals(expected); break; - case "application/xml": - req.expect.xmlBodyEquals( - (raw as any).replace(``, ""), - ); + } + case "application/xml": { + if (typeof body.rawContent === "string") { + const xmlStr = body.rawContent.replace(``, ""); + req.expect.xmlBodyEquals(xmlStr); + } else if (body.rawContent) { + req.expect.xmlBodyEquals(body.rawContent, config); + } break; - default: + } + default: { + const raw = + typeof body.rawContent === "string" + ? body.rawContent + : body.rawContent?.serialize(config); req.expect.rawBodyEquals(raw); + } } } } @@ -133,10 +146,10 @@ function createHandler(apiDefinition: MockApiDefinition, config: ResolverConfig) // Validate headers if present in the request if (apiDefinition.request?.headers) { - const headers = expandDyns(apiDefinition.request.headers, config); + const headers = expandDyns(apiDefinition.request.headers, config, { resolveMatchers: false }); Object.entries(headers).forEach(([key, value]) => { if (key.toLowerCase() !== "content-type") { - if (Array.isArray(value)) { + if (isMatcher(value) || Array.isArray(value)) { req.expect.deepEqual(req.headers[key], value); } else { req.expect.containsHeader(key.toLowerCase(), String(value)); @@ -146,8 +159,9 @@ function createHandler(apiDefinition: MockApiDefinition, config: ResolverConfig) } if (apiDefinition.request?.query) { - Object.entries(apiDefinition.request.query).forEach(([key, value]) => { - if (Array.isArray(value)) { + const query = expandDyns(apiDefinition.request.query, config, { resolveMatchers: false }); + Object.entries(query).forEach(([key, value]) => { + if (isMatcher(value) || Array.isArray(value)) { req.expect.deepEqual(req.query[key], value); } else { req.expect.containsQueryParam(key, String(value)); diff --git a/packages/spector/src/cli/cli.ts b/packages/spector/src/cli/cli.ts index 00f170d39fa..f0ecef7be8d 100644 --- a/packages/spector/src/cli/cli.ts +++ b/packages/spector/src/cli/cli.ts @@ -273,20 +273,13 @@ async function main() { }, ) .command( - "upload-manifest ", + "upload-manifest ", "Upload the scenario manifest. DO NOT CALL in generator.", (cmd) => { return cmd - .positional("scenariosPaths", { + .positional("scenariosPath", { description: "Path to the scenarios and mock apis", type: "string", - array: true, - demandOption: true, - }) - .option("setName", { - type: "string", - description: "Set used to generate the manifest.", - array: true, demandOption: true, }) .option("storageAccountName", { @@ -298,13 +291,26 @@ async function main() { description: "Name of the Container", demandOption: true, }) + .option("manifestName", { + type: "string", + description: + "Name of the manifest(will be located at manifests/.json in the container).", + demandOption: true, + }) + .option("override", { + type: "boolean", + description: "Override existing manifest with the same version.", + default: false, + }) .demandOption("storageAccountName"); }, async (args) => { await uploadScenarioManifest({ - scenariosPaths: args.scenariosPaths, + scenariosPath: args.scenariosPath, storageAccountName: args.storageAccountName, containerName: args.containerName, + manifestName: args.manifestName, + override: args.override, }); }, ) diff --git a/packages/spector/src/utils/misc-utils.ts b/packages/spector/src/utils/misc-utils.ts index da9a0e74204..3f270d22195 100644 --- a/packages/spector/src/utils/misc-utils.ts +++ b/packages/spector/src/utils/misc-utils.ts @@ -11,7 +11,7 @@ export async function ensureScenariosPathExists(scenariosPath: string) { throw new Error(`Scenarios path ${scenariosPath} is not a directory.`); } } catch (e) { - throw new Error(`Scenarios path ${scenariosPath} doesn't exists.`); + throw new Error(`Scenarios path ${scenariosPath} doesn't exist.`, { cause: e }); } } diff --git a/packages/spector/test/xml-validation.test.ts b/packages/spector/test/xml-validation.test.ts new file mode 100644 index 00000000000..121725a02b4 --- /dev/null +++ b/packages/spector/test/xml-validation.test.ts @@ -0,0 +1,152 @@ +import { + createMatcher, + err, + match, + ok, + validateXmlBodyEquals, + xml, + type RequestExt, + type ResolverConfig, +} from "@typespec/spec-api"; +import { describe, expect, it } from "vitest"; + +const config: ResolverConfig = { baseUrl: "http://localhost:3000" }; + +function makeRequest(rawBody: string): RequestExt { + return { rawBody } as unknown as RequestExt; +} + +describe("validateXmlBodyEquals", () => { + describe("with plain string (no matchers)", () => { + it("should accept matching XML", () => { + expect(() => + validateXmlBodyEquals( + makeRequest(`1`), + "1", + ), + ).not.toThrow(); + }); + + it("should reject mismatched XML", () => { + expect(() => + validateXmlBodyEquals( + makeRequest(`2`), + "1", + ), + ).toThrow("Body provided doesn't match expected body"); + }); + + it("should reject empty body", () => { + expect(() => validateXmlBodyEquals(makeRequest(""), "")).toThrow("Body should exists"); + }); + }); + + describe("with Resolver containing matchers", () => { + it("should use matcher check instead of strict equality", () => { + // A custom matcher that accepts any number + const anyNumber = createMatcher({ + check(actual) { + return typeof actual === "string" && /^\d+$/.test(actual) + ? ok() + : err("expected a number string"); + }, + serialize: () => "PLACEHOLDER", + }); + + const body = xml`${anyNumber}`; + + // "42" is a number string → should pass + expect(() => + validateXmlBodyEquals( + makeRequest(`42`), + body.rawContent as any, + config, + ), + ).not.toThrow(); + + // "abc" is not a number → should fail + expect(() => + validateXmlBodyEquals( + makeRequest(`abc`), + body.rawContent as any, + config, + ), + ).toThrow("Body provided doesn't match expected body"); + }); + + it("should validate plain elements strictly alongside matchers", () => { + const anyNumber = createMatcher({ + check(actual) { + return typeof actual === "string" && /^\d+$/.test(actual) + ? ok() + : err("expected a number string"); + }, + serialize: () => "0", + }); + + const body = xml`test${anyNumber}`; + + // Both correct + expect(() => + validateXmlBodyEquals( + makeRequest( + `test5`, + ), + body.rawContent as any, + config, + ), + ).not.toThrow(); + + // Plain element wrong + expect(() => + validateXmlBodyEquals( + makeRequest( + `wrong5`, + ), + body.rawContent as any, + config, + ), + ).toThrow("Body provided doesn't match expected body"); + }); + + it("should work with datetime matchers", () => { + const body = xml`${match.dateTime.rfc3339("2022-08-26T18:38:00.000Z")}`; + + // Without fractional seconds — same point in time + expect(() => + validateXmlBodyEquals( + makeRequest( + `2022-08-26T18:38:00Z`, + ), + body.rawContent as any, + config, + ), + ).not.toThrow(); + + // Different time + expect(() => + validateXmlBodyEquals( + makeRequest( + `2023-01-01T00:00:00Z`, + ), + body.rawContent as any, + config, + ), + ).toThrow("Body provided doesn't match expected body"); + }); + + it("should work with multiple matchers", () => { + const body = xml`${match.dateTime.utcRfc3339("2022-08-26T18:38:00.000Z")}${match.dateTime.rfc7231("Fri, 26 Aug 2022 14:38:00 GMT")}`; + + expect(() => + validateXmlBodyEquals( + makeRequest( + `2022-08-26T18:38:00.0000000ZFri, 26 Aug 2022 14:38:00 GMT`, + ), + body.rawContent as any, + config, + ), + ).not.toThrow(); + }); + }); +}); diff --git a/packages/sse/CHANGELOG.md b/packages/sse/CHANGELOG.md index dd3913c13a1..df08c693843 100644 --- a/packages/sse/CHANGELOG.md +++ b/packages/sse/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog - @typespec/sse +## 0.81.0 + +No changes, version bump only. + +## 0.80.0 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 0.79.0 + +No changes, version bump only. + ## 0.78.0 ### Bump dependencies diff --git a/packages/sse/generated-defs/TypeSpec.SSE.ts-test.ts b/packages/sse/generated-defs/TypeSpec.SSE.ts-test.ts index dc02b5a7be3..ffd24790e3e 100644 --- a/packages/sse/generated-defs/TypeSpec.SSE.ts-test.ts +++ b/packages/sse/generated-defs/TypeSpec.SSE.ts-test.ts @@ -7,4 +7,4 @@ import type { TypeSpecSSEDecorators } from "./TypeSpec.SSE.js"; /** * An error here would mean that the exported decorator is not using the same signature. Make sure to have export const $decName: DecNameDecorator = (...) => ... */ -const _: TypeSpecSSEDecorators = $decorators["TypeSpec.SSE"]; +const _decs: TypeSpecSSEDecorators = $decorators["TypeSpec.SSE"]; diff --git a/packages/sse/package.json b/packages/sse/package.json index 22178cd12c0..0391e3786c6 100644 --- a/packages/sse/package.json +++ b/packages/sse/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/sse", - "version": "0.78.0", + "version": "0.81.0", "author": "Microsoft Corporation", "description": "TypeSpec library providing server sent events bindings", "homepage": "https://typespec.io", @@ -27,12 +27,12 @@ "./testing": "./dist/src/testing/index.js" }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "pnpm gen-extern-signature && tsc -p . && pnpm lint-typespec-library", - "watch": "tsc -p . --watch", + "build": "pnpm gen-extern-signature && tsc -p tsconfig.build.json && pnpm lint-typespec-library", + "watch": "tsc -p tsconfig.build.json --watch", "gen-extern-signature": "tspd --enable-experimental gen-extern-signature .", "lint-typespec-library": "tsp compile . --warn-as-error --import @typespec/library-linter --no-emit", "test": "vitest run", @@ -55,18 +55,18 @@ "@typespec/streams": "workspace:^" }, "devDependencies": { - "@types/node": "~25.0.2", + "@types/node": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/events": "workspace:^", "@typespec/http": "workspace:^", "@typespec/library-linter": "workspace:^", "@typespec/streams": "workspace:^", "@typespec/tspd": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/sse/tsconfig.build.json b/packages/sse/tsconfig.build.json new file mode 100644 index 00000000000..85c215d455c --- /dev/null +++ b/packages/sse/tsconfig.build.json @@ -0,0 +1,5 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"], + "references": [{ "path": "../compiler/tsconfig.build.json" }] +} diff --git a/packages/sse/tsconfig.config.json b/packages/sse/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/sse/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/sse/tsconfig.json b/packages/sse/tsconfig.json index 19de0b3a83d..8d0eb2d00d4 100644 --- a/packages/sse/tsconfig.json +++ b/packages/sse/tsconfig.json @@ -6,6 +6,5 @@ "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo", "verbatimModuleSyntax": true - }, - "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/standalone/CHANGELOG.md b/packages/standalone/CHANGELOG.md index f6b4ea0607f..5e9479bcf44 100644 --- a/packages/standalone/CHANGELOG.md +++ b/packages/standalone/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog - @typespec/standalone-cli +## 0.81.0 + +No changes, version bump only. + +## 0.80.0 + +No changes, version bump only. + +## 0.79.0 + +No changes, version bump only. + ## 0.78.0 No changes, version bump only. diff --git a/packages/standalone/README.md b/packages/standalone/README.md index 2626d83c1f9..b2754827cfe 100644 --- a/packages/standalone/README.md +++ b/packages/standalone/README.md @@ -2,6 +2,6 @@ This package contains the logic for building and bundling the TypeSpec CLI as a standalone executable. -It requires node 20+ to use node single executable. https://nodejs.org/api/single-executable-applications.html +It requires node 22+ to use node single executable. https://nodejs.org/api/single-executable-applications.html It is also possible to build with bun (code is there) but there is some issue due to signing. Goal will be to migrate to bun when those are resolved. diff --git a/packages/standalone/package.json b/packages/standalone/package.json index f5eb590bb67..ce82879611c 100644 --- a/packages/standalone/package.json +++ b/packages/standalone/package.json @@ -1,7 +1,7 @@ { "name": "@typespec/standalone-cli", "private": true, - "version": "0.78.0", + "version": "0.81.0", "author": "Microsoft Corporation", "description": "TypeSpec Standalone CLI", "homepage": "https://typespec.io", @@ -19,13 +19,13 @@ ], "type": "module", "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", "build": "tsx ./scripts/build.ts", "check": "tsx ./scripts/check.ts", - "watch": "tsc -p . --watch", + "watch": "tsc -p tsconfig.build.json --watch", "test:skip": "vitest run", "test:e2e": "pnpm check", "test:watch": "vitest -w", @@ -39,24 +39,24 @@ "!dist/test/**" ], "devDependencies": { - "@types/node": "~25.0.2", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "esbuild": "^0.27.0", - "execa": "^9.6.1", - "ora": "^9.0.0", - "postject": "1.0.0-alpha.6", - "rimraf": "~6.1.2", - "tsx": "^4.21.0", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@types/node": "catalog:", + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "esbuild": "catalog:", + "execa": "catalog:", + "ora": "catalog:", + "postject": "catalog:", + "rimraf": "catalog:", + "tsx": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" }, "dependencies": { - "@yarnpkg/core": "^4.2.1", - "@yarnpkg/fslib": "^3.1.2", - "@yarnpkg/plugin-nm": "^4.0.6", - "@yarnpkg/plugin-npm": "^3.0.2", - "@yarnpkg/plugin-pnp": "^4.0.7" + "@yarnpkg/core": "catalog:", + "@yarnpkg/fslib": "catalog:", + "@yarnpkg/plugin-nm": "catalog:", + "@yarnpkg/plugin-npm": "catalog:", + "@yarnpkg/plugin-pnp": "catalog:" } } diff --git a/packages/standalone/scripts/build.ts b/packages/standalone/scripts/build.ts index 4492b46413e..5525964047a 100644 --- a/packages/standalone/scripts/build.ts +++ b/packages/standalone/scripts/build.ts @@ -8,8 +8,8 @@ import { writeSeaConfig } from "./sea-config.js"; // cspell:ignore postject const [major, minor, patch] = process.versions.node.split(".").map(Number); -if (major < 20) { - console.error("Cannot build standalone cli on node under 20"); +if (major < 22) { + console.error("Cannot build standalone cli on node under 22"); process.exit(0); } diff --git a/packages/standalone/tsconfig.build.json b/packages/standalone/tsconfig.build.json new file mode 100644 index 00000000000..85c215d455c --- /dev/null +++ b/packages/standalone/tsconfig.build.json @@ -0,0 +1,5 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"], + "references": [{ "path": "../compiler/tsconfig.build.json" }] +} diff --git a/packages/standalone/tsconfig.config.json b/packages/standalone/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/standalone/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/standalone/tsconfig.json b/packages/standalone/tsconfig.json index 19de0b3a83d..8d0eb2d00d4 100644 --- a/packages/standalone/tsconfig.json +++ b/packages/standalone/tsconfig.json @@ -6,6 +6,5 @@ "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo", "verbatimModuleSyntax": true - }, - "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/streams/CHANGELOG.md b/packages/streams/CHANGELOG.md index 15cd942a4a0..64ecf581323 100644 --- a/packages/streams/CHANGELOG.md +++ b/packages/streams/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog - @typespec/streams +## 0.81.0 + +No changes, version bump only. + +## 0.80.0 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 0.79.0 + +No changes, version bump only. + ## 0.78.0 ### Bump dependencies diff --git a/packages/streams/generated-defs/TypeSpec.Streams.ts-test.ts b/packages/streams/generated-defs/TypeSpec.Streams.ts-test.ts index db99152fa8d..672d8f183b8 100644 --- a/packages/streams/generated-defs/TypeSpec.Streams.ts-test.ts +++ b/packages/streams/generated-defs/TypeSpec.Streams.ts-test.ts @@ -7,4 +7,4 @@ import type { TypeSpecStreamsDecorators } from "./TypeSpec.Streams.js"; /** * An error here would mean that the exported decorator is not using the same signature. Make sure to have export const $decName: DecNameDecorator = (...) => ... */ -const _: TypeSpecStreamsDecorators = $decorators["TypeSpec.Streams"]; +const _decs: TypeSpecStreamsDecorators = $decorators["TypeSpec.Streams"]; diff --git a/packages/streams/package.json b/packages/streams/package.json index 5774d450561..50f344486c0 100644 --- a/packages/streams/package.json +++ b/packages/streams/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/streams", - "version": "0.78.0", + "version": "0.81.0", "author": "Microsoft Corporation", "description": "TypeSpec library providing stream bindings", "homepage": "https://typespec.io", @@ -31,12 +31,12 @@ } }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "pnpm gen-extern-signature && tsc -p . && pnpm lint-typespec-library", - "watch": "tsc -p . --watch", + "build": "pnpm gen-extern-signature && tsc -p tsconfig.build.json && pnpm lint-typespec-library", + "watch": "tsc -p tsconfig.build.json --watch", "gen-extern-signature": "tspd --enable-experimental gen-extern-signature .", "lint-typespec-library": "tsp compile . --warn-as-error --import @typespec/library-linter --no-emit", "test": "vitest run", @@ -56,15 +56,15 @@ "@typespec/compiler": "workspace:^" }, "devDependencies": { - "@types/node": "~25.0.2", + "@types/node": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/library-linter": "workspace:^", "@typespec/tspd": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/streams/tsconfig.build.json b/packages/streams/tsconfig.build.json new file mode 100644 index 00000000000..85c215d455c --- /dev/null +++ b/packages/streams/tsconfig.build.json @@ -0,0 +1,5 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"], + "references": [{ "path": "../compiler/tsconfig.build.json" }] +} diff --git a/packages/streams/tsconfig.config.json b/packages/streams/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/streams/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/streams/tsconfig.json b/packages/streams/tsconfig.json index 284b90bcdc1..3dc7c231583 100644 --- a/packages/streams/tsconfig.json +++ b/packages/streams/tsconfig.json @@ -5,6 +5,5 @@ "outDir": "dist", "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo" - }, - "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/tmlanguage-generator/CHANGELOG.md b/packages/tmlanguage-generator/CHANGELOG.md index f4a4bdbf7ac..6923ef7c95c 100644 --- a/packages/tmlanguage-generator/CHANGELOG.md +++ b/packages/tmlanguage-generator/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log - tmlanguage-generator +## 0.6.8 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + ## 0.6.7 ### Bump dependencies diff --git a/packages/tmlanguage-generator/package.json b/packages/tmlanguage-generator/package.json index 075ed61a7b4..c1fac8c16ad 100644 --- a/packages/tmlanguage-generator/package.json +++ b/packages/tmlanguage-generator/package.json @@ -1,6 +1,6 @@ { "name": "tmlanguage-generator", - "version": "0.6.7", + "version": "0.6.8", "author": "Microsoft Corporation", "description": "Helper library to generate TextMate syntax highlighting tmLanguage files.", "homepage": "https://github.com/microsoft/typespec/tree/main/packages/tmlanguage-generator", @@ -19,12 +19,12 @@ ], "main": "dist/tmlanguage-generator.js", "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "tsc -p .", - "watch": "tsc -p . --watch", + "build": "tsc -p tsconfig.build.json", + "watch": "tsc -p tsconfig.build.json --watch", "lint": "eslint . --max-warnings=0", "lint:fix": "eslint . --fix" }, @@ -33,13 +33,13 @@ "!dist/test/**" ], "dependencies": { - "onigasm": "~2.2.5", - "plist": "~3.1.0" + "onigasm": "catalog:", + "plist": "catalog:" }, "devDependencies": { - "@types/node": "~25.0.2", - "@types/plist": "~3.0.5", - "rimraf": "~6.1.2", - "typescript": "~5.9.2" + "@types/node": "catalog:", + "@types/plist": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:" } } diff --git a/packages/tmlanguage-generator/tsconfig.build.json b/packages/tmlanguage-generator/tsconfig.build.json new file mode 100644 index 00000000000..56fd5680629 --- /dev/null +++ b/packages/tmlanguage-generator/tsconfig.build.json @@ -0,0 +1,4 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts"] +} diff --git a/packages/tmlanguage-generator/tsconfig.config.json b/packages/tmlanguage-generator/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/tmlanguage-generator/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/tmlanguage-generator/tsconfig.json b/packages/tmlanguage-generator/tsconfig.json index 6022982ef45..640eb95f6ca 100644 --- a/packages/tmlanguage-generator/tsconfig.json +++ b/packages/tmlanguage-generator/tsconfig.json @@ -4,6 +4,5 @@ "outDir": "dist", "rootDir": "src", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo" - }, - "include": ["src/**/*.ts"] + } } diff --git a/packages/tsp-integration/cmd/tsp-integration.js b/packages/tsp-integration/cmd/tsp-integration.js new file mode 100755 index 00000000000..8fb12721835 --- /dev/null +++ b/packages/tsp-integration/cmd/tsp-integration.js @@ -0,0 +1,2 @@ +#!/usr/bin/env node +import "../dist/cli.js"; diff --git a/packages/tsp-integration/package.json b/packages/tsp-integration/package.json new file mode 100644 index 00000000000..71b92870e19 --- /dev/null +++ b/packages/tsp-integration/package.json @@ -0,0 +1,44 @@ +{ + "name": "@typespec/integration-tester", + "private": true, + "version": "0.1.0", + "type": "module", + "description": "CLI tool for testing typespec package changes against external repos", + "homepage": "https://github.com/microsoft/typespec", + "license": "MIT", + "author": "Microsoft", + "files": [ + "dist" + ], + "bin": { + "tsp-integration": "./cmd/tsp-integration.js" + }, + "repository": "https://github.com/microsoft/typespec.git", + "engines": { + "node": ">=22.0.0" + }, + "scripts": { + "watch": "tsc -p ./tsconfig.build.json --watch", + "build": "tsc -p ./tsconfig.build.json", + "clean": "rimraf dist/ temp/", + "test": "vitest run", + "test:watch": "vitest -w" + }, + "dependencies": { + "@pnpm/workspace.find-packages": "catalog:", + "execa": "catalog:", + "globby": "catalog:", + "log-symbols": "catalog:", + "ora": "catalog:", + "pathe": "catalog:", + "picocolors": "catalog:", + "simple-git": "catalog:", + "tar": "catalog:", + "yaml": "catalog:" + }, + "devDependencies": { + "typescript": "catalog:", + "vitest": "catalog:" + }, + "bugs": "https://github.com/microsoft/typespec/issues" +} diff --git a/packages/tsp-integration/src/cli.ts b/packages/tsp-integration/src/cli.ts new file mode 100644 index 00000000000..d538871decc --- /dev/null +++ b/packages/tsp-integration/src/cli.ts @@ -0,0 +1,72 @@ +import { readFile } from "node:fs/promises"; +import { parseArgs } from "node:util"; +import { join, resolve } from "pathe"; +import { parse } from "yaml"; +import { runIntegrationTestSuite, Stages, type Stage } from "./run.js"; +import { ValidationFailedError } from "./utils.js"; + +process.on("SIGINT", () => process.exit(0)); + +const args = parseArgs({ + args: process.argv.slice(2), + allowPositionals: true, + options: { + clean: { + type: "boolean", + default: false, + }, + stage: { + type: "string", + multiple: true, + }, + "tgz-dir": { + type: "string", + }, + repo: { + type: "string", + description: "The path to the repository to test. Defaults temp/{suiteName}.", + }, + interactive: { + type: "boolean", + default: false, + short: "i", + description: "Enable interactive mode for validation.", + }, + }, +}); + +const cwd = process.cwd(); +const integrationDir = join(cwd, ".typespec-integration"); +const suiteName = args.positionals[0]; +const config = parse(await readFile(join(integrationDir, "config.yaml"), "utf8")); +const suite = config.suites[suiteName]; +if (suite === undefined) { + throw new Error(`Integration test suite "${suiteName}" not found in config.`); +} + +let stages: Stage[] | undefined = undefined; +if (args.values.stage) { + stages = args.values.stage as Stage[]; + for (const stage of stages) { + if (!Stages.includes(stage)) { + throw new Error( + `Invalid stage "${stage}" specified. Valid stages are: ${Stages.join(", ")}.`, + ); + } + } +} + +const wd = args.values.repo ?? join(integrationDir, "temp", suiteName); +try { + await runIntegrationTestSuite(wd, suiteName, suite, { + clean: args.values.clean, + stages, + tgzDir: args.values["tgz-dir"] && resolve(process.cwd(), args.values["tgz-dir"]), + interactive: args.values.interactive, + }); +} catch (error) { + if (error instanceof ValidationFailedError) { + process.exit(1); + } + throw error; +} diff --git a/packages/tsp-integration/src/config/types.ts b/packages/tsp-integration/src/config/types.ts new file mode 100644 index 00000000000..bf56d8fedc1 --- /dev/null +++ b/packages/tsp-integration/src/config/types.ts @@ -0,0 +1,15 @@ +export interface IntegrationTestsConfig { + suites: Record; +} + +export interface IntegrationTestSuite { + repo: string; + branch: string; + pattern?: string; + entrypoints?: Entrypoint[]; +} + +export interface Entrypoint { + name: string; + options?: string[]; +} diff --git a/packages/tsp-integration/src/find-packages.ts b/packages/tsp-integration/src/find-packages.ts new file mode 100644 index 00000000000..20c2c419c8f --- /dev/null +++ b/packages/tsp-integration/src/find-packages.ts @@ -0,0 +1,157 @@ +import { findWorkspacePackagesNoCheck } from "@pnpm/workspace.find-packages"; +import { readdir } from "node:fs/promises"; +import { relative, resolve } from "pathe"; +import pc from "picocolors"; +import * as tar from "tar"; +import { log } from "./utils.js"; + +/** + * Collection of packages indexed by package name. + */ +export interface Packages { + [key: string]: { + /** The package name (e.g., "@typespec/compiler") */ + name: string; + /** Absolute path to the package directory or .tgz file */ + path: string; + }; +} + +/** + * Options for {@link findPackages} + */ +export interface FindPackageOptions { + /** Directory containing PNPM workspace to scan for packages */ + wsDir?: string; + /** Directory containing .tgz artifact files */ + tgzDir?: string; +} + +/** + * Finds packages from either a workspace directory or tgz artifact directory. + * + * @param options - Configuration specifying the source to find packages from + * @returns Promise resolving to a collection of discovered packages + * @throws Error if neither wsDir nor tgzDir is provided + */ +export function findPackages(options: FindPackageOptions): Promise { + if (options.tgzDir) { + return findPackagesFromTgzArtifactDir(options.tgzDir); + } + if (options.wsDir) { + return findPackagesFromWorkspace(options.wsDir); + } else { + throw new Error("Either wsDir or tgzDir must be provided to findPackages"); + } +} + +/** + * Prints a formatted list of discovered packages to the console. + * + * @param packages - Collection of packages to display + */ +export function printPackages(packages: Packages): void { + log("Found packages:"); + for (const [name, pkg] of Object.entries(packages)) { + log(` ${pc.green(name)}: ${pc.cyan(relative(process.cwd(), pkg.path))}`); + } +} + +/** + * Discovers packages from a directory containing .tgz artifact files. + * + * This function scans a directory for .tgz files and extracts package information + * by reading the package.json from within each tar file. + * + * @param tgzDir - Directory containing .tgz artifact files + * @returns Promise resolving to discovered packages with paths pointing to .tgz files + */ +export async function findPackagesFromTgzArtifactDir(tgzDir: string): Promise { + const packages: Packages = {}; + + const items = await readdir(tgzDir, { withFileTypes: true }); + const tgzFiles = items + .filter((item) => item.isFile() && item.name.endsWith(".tgz")) + .map((item) => item.name); + + // Process tar files in parallel + await Promise.all( + tgzFiles.map(async (tgzFile) => { + const fullPath = resolve(tgzDir, tgzFile); + const packageName = await extractPackageNameFromTgzFile(fullPath); + + if (packageName) { + packages[packageName] = { + name: packageName, + path: fullPath, + }; + } + }), + ); + + return packages; +} + +/** + * Extracts the package name by reading package.json from a .tgz file. + * + * This function reads the package.json file from the root of the tar archive + * to get the accurate package name, which is more reliable than parsing filenames. + * + * @param tgzFilePath - Path to the .tgz file + * @returns Promise resolving to the package name, or null if not found + */ +async function extractPackageNameFromTgzFile(tgzFilePath: string): Promise { + try { + let packageJsonContent: string | null = null; + + await tar.t({ + file: tgzFilePath, + // cspell:ignore onentry + onentry: (entry) => { + if (entry.path === "package/package.json") { + entry.on("data", (chunk) => { + if (packageJsonContent === null) { + packageJsonContent = ""; + } + packageJsonContent += chunk.toString(); + }); + } + }, + }); + + if (packageJsonContent) { + const packageJson = JSON.parse(packageJsonContent); + return packageJson.name || null; + } + + return null; + } catch (error) { + throw new Error(`Failed to read package.json from ${tgzFilePath}: ${error}`, { cause: error }); + } +} + +/** + * Discovers packages from a PNPM workspace configuration. + * + * This function uses PNPM's workspace discovery to find all packages in a monorepo. + * It filters out private packages and packages without names. + * + * @param root - Root directory of the PNPM workspace + * @returns Promise resolving to discovered packages with paths pointing to package directories + */ +export async function findPackagesFromWorkspace(root: string): Promise { + const pnpmPackages = await findWorkspacePackagesNoCheck(root); + const packages: Packages = {}; + + for (const pkg of pnpmPackages) { + if (!pkg.manifest.name || pkg.manifest.private) continue; + + packages[pkg.manifest.name] = { + name: pkg.manifest.name, + path: pkg.rootDirRealPath, + }; + } + + return packages; +} diff --git a/packages/tsp-integration/src/git.ts b/packages/tsp-integration/src/git.ts new file mode 100644 index 00000000000..7da4d45d320 --- /dev/null +++ b/packages/tsp-integration/src/git.ts @@ -0,0 +1,123 @@ +import { execa } from "execa"; +import { mkdir, rm } from "fs/promises"; +import type { Ora } from "ora"; +import { relative } from "pathe"; +import pc from "picocolors"; +import { ResetMode, simpleGit } from "simple-git"; +import type { IntegrationTestSuite } from "./config/types.js"; +import { action, log, ValidationFailedError } from "./utils.js"; +/** + * Options for ensuring repository state. + */ +export interface EnsureRepoStateOptions { + /** If true, forces a clean clone instead of updating existing repository */ + clean?: boolean; +} +/** + * Ensures the repository is in the correct state by either cloning or updating it. + * + * @param suite - Integration test suite configuration containing repo and branch info + * @param dir - Target directory for the repository + * @param options - Options controlling the operation behavior + */ +export async function ensureRepoState( + { repo, branch }: IntegrationTestSuite, + dir: string, + options: EnsureRepoStateOptions = {}, +): Promise { + await action(`Checkout repo ${pc.cyan(repo)} at branch ${pc.cyan(branch)}`, async (spinner) => { + const shouldUpdate = options.clean ? false : await repoExists(dir); + if (shouldUpdate) { + await updateExistingRepo(spinner, { branch }, dir); + } else { + await cloneRepo(spinner, repo, branch, dir); + } + }); +} + +/** + * Checks if a Git repository exists in the specified directory. + * + * @param dir - Directory to check for Git repository + * @returns true if a Git repository exists, false otherwise + */ +async function repoExists(dir: string): Promise { + try { + await execa("git", ["-C", dir, "rev-parse", "--git-dir"]); + return true; + } catch { + return false; + } +} + +/** + * Clones a Git repository from the specified URL to the target directory. + * Performs a shallow clone with depth 1 to minimize download time and disk usage. + * + * @param spinner - Ora spinner for progress indication + * @param repo - Repository URL to clone from + * @param branch - Branch to clone + * @param dir - Target directory for the cloned repository + */ +async function cloneRepo(spinner: Ora, repo: string, branch: string, dir: string): Promise { + const relativeDir = relative(process.cwd(), dir); + + spinner.text = `Cleaning directory ${pc.cyan(relativeDir)}`; + await rm(dir, { recursive: true, force: true }); + await mkdir(dir, { recursive: true }); + + spinner.text = `Cloning repo ${pc.cyan(repo)} at branch ${pc.cyan(branch)} into ${pc.cyan(relativeDir)}`; + await simpleGit().clone(repo, dir, { "--branch": branch, "--depth": 1 }); +} + +/** + * Updates an existing Git repository to the latest state of the specified branch. + * Performs a complete reset of local changes and pulls the latest commits. + * + * @param spinner - Ora spinner for progress indication + * @param suite - Object containing the branch to checkout + * @param dir - Directory containing the Git repository to update + */ +export async function updateExistingRepo( + spinner: Ora, + { branch }: Pick, + dir: string, +): Promise { + const git = simpleGit(dir); + const baseText = spinner.text; + + spinner.text = `${baseText} - Resetting local changes`; + await git.reset(ResetMode.HARD, ["HEAD"]); + await git.clean("fd"); + + spinner.text = `${baseText} - Fetching latest changes`; + await git.fetch("origin"); + + spinner.text = `${baseText} - Checking out branch ${pc.cyan(branch)}`; + await git.checkout(branch); + + spinner.text = `${baseText} - Pulling latest changes`; + await git.pull("origin", branch); +} + +/** + * Validates that the Git repository has no uncommitted changes. + * Logs the status and diff if changes are detected. + * + * @param dir - Directory containing the Git repository to validate + */ +export async function validateGitClean(dir: string): Promise { + const git = simpleGit(dir); + const result = await git.status(); + + if (result.isClean()) { + log(`${pc.green("✔")} No git changes detected`); + } else { + log(`${pc.red("x")} Git changes detected after validation:`); + log(result); + + const diffResult = await execa("git", ["diff", "--color=always"], { cwd: dir }); + log(diffResult.stdout); + throw new ValidationFailedError(); + } +} diff --git a/packages/tsp-integration/src/keyboard-api.test.ts b/packages/tsp-integration/src/keyboard-api.test.ts new file mode 100644 index 00000000000..ae7fef17cdc --- /dev/null +++ b/packages/tsp-integration/src/keyboard-api.test.ts @@ -0,0 +1,68 @@ +import { Readable, Writable } from "stream"; +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { registerConsoleShortcuts } from "./keyboard-api.js"; +import type { TspRunner } from "./validate.js"; + +let runner: TspRunner; +let stdin: NodeJS.ReadStream; +let stdout: Writable; +let cleanup: () => void; + +beforeEach(() => { + runner = { + rerunAll: vi.fn(), + rerunFailed: vi.fn(), + cancelCurrentRun: vi.fn(), + exit: vi.fn(), + isCancelling: false, + } as any; + stdout = new Writable({ + write(chunk, __, callback) { + callback(); + }, + }); + + stdin = new Readable({ read: () => "" }) as NodeJS.ReadStream; + stdin.isTTY = true; + stdin.setRawMode = () => stdin; + cleanup = registerConsoleShortcuts(runner, stdin, stdout); +}); + +afterEach(() => { + cleanup?.(); +}); + +describe("when no test is running", () => { + it("calls exit when q is pressed", () => { + stdin.emit("data", "q"); + expect(runner.exit).toHaveBeenCalled(); + }); + + it("calls rerunAll when a is pressed", () => { + stdin.emit("data", "a"); + expect(runner.rerunAll).toHaveBeenCalled(); + }); + + it("calls rerunFailed when f is pressed", () => { + stdin.emit("data", "f"); + expect(runner.rerunFailed).toHaveBeenCalled(); + }); +}); + +describe("when tests are running", () => { + beforeEach(() => { + runner.runningPromise = Promise.resolve() as any; + }); + describe("calls cancelCurrentRun when cancel keys are pressed", () => { + it.each(["q", "c", "a", "f", "space", "\x03"])(`%s`, (key) => { + stdin.emit("data", key); + expect(runner.cancelCurrentRun).toHaveBeenCalled(); + }); + }); + + it("does NOT call cancelCurrentRun when other keys are pressed", () => { + stdin.emit("data", "b"); + stdin.emit("data", "d"); + expect(runner.cancelCurrentRun).not.toHaveBeenCalled(); + }); +}); diff --git a/packages/tsp-integration/src/keyboard-api.ts b/packages/tsp-integration/src/keyboard-api.ts new file mode 100644 index 00000000000..cc5ae4103b1 --- /dev/null +++ b/packages/tsp-integration/src/keyboard-api.ts @@ -0,0 +1,80 @@ +import pc from "picocolors"; +import readline from "readline"; +import type { Writable } from "stream"; +import type { TspRunner } from "./validate.js"; + +const keys = [ + [["a", "return"], "rerun all tests"], + ["f", "rerun only failed tests"], + ["q", "quit"], +]; +const cancelKeys = ["space", "c", ...keys.map((key) => key[0]).flat()]; + +export function registerConsoleShortcuts( + ctx: TspRunner, + stdin: NodeJS.ReadStream | undefined = process.stdin, + stdout: NodeJS.WriteStream | Writable = process.stdout, +): () => void { + let rl: readline.Interface | undefined; + + async function keypressHandler(str: string, key: readline.Key) { + // Cancel run and exit when ctrl-c or esc is pressed. + // If cancelling takes long and key is pressed multiple times, exit forcefully. + if (str === "\x03" || str === "\x1B" || (key && key.ctrl && key.name === "c")) { + if (!ctx.isCancelling) { + stdout.write(pc.red("Cancelling test run. Press CTRL+c again to exit forcefully.\n")); + process.exitCode = 130; + + await ctx.cancelCurrentRun(); + } + return ctx.exit(); + } + + const name = key?.name; + + if (ctx.runningPromise) { + if (name && cancelKeys.includes(name)) { + stdout.write(pc.yellow("Cancelling current test run...\n")); + await ctx.cancelCurrentRun(); + } + return; + } + + // quit + if (name === "q") { + return ctx.exit(); + } + // rerun all tests + if (name === "a" || name === "return") { + return ctx.rerunAll(); + } + // rerun only failed tests + if (name === "f") { + return ctx.rerunFailed(); + } + } + + function on() { + off(); + rl = readline.createInterface({ input: stdin, escapeCodeTimeout: 50 }); + readline.emitKeypressEvents(stdin, rl); + if (stdin.isTTY) { + stdin.setRawMode(true); + } + stdin.on("keypress", keypressHandler); + } + + function off() { + rl?.close(); + rl = undefined; + stdin.removeListener("keypress", keypressHandler); + if (stdin.isTTY) { + stdin.setRawMode(false); + } + } + + on(); + return function cleanup(): void { + off(); + }; +} diff --git a/packages/tsp-integration/src/patch-package-json.ts b/packages/tsp-integration/src/patch-package-json.ts new file mode 100644 index 00000000000..74b8f47619c --- /dev/null +++ b/packages/tsp-integration/src/patch-package-json.ts @@ -0,0 +1,50 @@ +import { readFileSync } from "fs"; +import { writeFile } from "fs/promises"; +import { join } from "path"; +import { relative } from "pathe"; +import pc from "picocolors"; +import type { Packages } from "./find-packages.js"; +import { log } from "./utils.js"; + +interface PackageJson { + name?: string; + version?: string; + dependencies?: Record; + devDependencies?: Record; + peerDependencies?: Record; + overrides?: Record; + [key: string]: any; +} + +export async function patchPackageJson(dir: string, packages: Packages) { + const packageJsonPath = join(dir, "package.json"); + + // Read existing package.json + const packageJson: PackageJson = JSON.parse(readFileSync(packageJsonPath, "utf8")); + + // Ensure dependency objects exist + packageJson.dependencies = packageJson.dependencies ?? {}; + packageJson.devDependencies = packageJson.devDependencies ?? {}; + packageJson.peerDependencies = packageJson.peerDependencies ?? {}; + packageJson.overrides = packageJson.overrides ?? {}; + + // Update dependencies to point to tgz files + for (const pkg of Object.values(packages)) { + const packageName = pkg.name; + const relativePath = relative(dir, pkg.path); + const filePath = `file:${relativePath}`; + + for (const depType of ["dependencies", "devDependencies", "peerDependencies"]) { + if (packageJson[depType]?.[packageName]) { + packageJson[depType][packageName] = filePath; + log(`Updated ${pc.magenta(depType)}: ${pc.green(packageName)} -> ${pc.cyan(filePath)}`); + } + } + + // Also set in overrides to ensure all nested dependencies use our version + packageJson.overrides[packageName] = filePath; + } + + // Write updated package.json + await writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2)); +} diff --git a/packages/tsp-integration/src/run.ts b/packages/tsp-integration/src/run.ts new file mode 100644 index 00000000000..cc6174983d0 --- /dev/null +++ b/packages/tsp-integration/src/run.ts @@ -0,0 +1,75 @@ +import pc from "picocolors"; +import type { IntegrationTestSuite } from "./config/types.js"; +import { findPackages, printPackages } from "./find-packages.js"; +import { ensureRepoState, validateGitClean } from "./git.js"; +import { patchPackageJson } from "./patch-package-json.js"; +import { TaskRunner } from "./runner.js"; +import { action, execWithSpinner, log, repoRoot } from "./utils.js"; +import { validateSpecs } from "./validate.js"; + +export interface RunIntegrationTestSuiteOptions { + /** Only run specific stages. */ + stages?: Stage[]; + /** Clean the temp directory. By default tries to reuse the repo by reseting and pulling latest changes. */ + clean?: boolean; + /** Directory for .tgz files. If not provided it will get the packages from the repo. */ + tgzDir?: string; + /** Enable interactive mode for validation. */ + interactive?: boolean; +} + +export const Stages = ["checkout", "patch", "install", "validate", "validate:clean"] as const; +export type Stage = (typeof Stages)[number]; + +export async function runIntegrationTestSuite( + wd: string, + suiteName: string, + config: IntegrationTestSuite, + options: RunIntegrationTestSuiteOptions = {}, +): Promise { + const runner = new TaskRunner({ verbose: options.clean, stages: options.stages }); + log( + `Running ${options.stages ? options.stages.map(pc.yellow).join(", ") : "all"} stage${options.stages?.length !== 1 ? "s" : ""}`, + pc.cyan(suiteName), + config, + ); + + await runner.stage("checkout", async () => { + await ensureRepoState(config, wd, { + clean: options.clean, + }); + }); + + await runner.stage("patch", async () => { + const packages = await action("Resolving local package versions", async () => { + const packages = await findPackages( + options.tgzDir ? { tgzDir: options.tgzDir } : { wsDir: repoRoot }, + ); + printPackages(packages); + return packages; + }); + + await action("Patching package.json", async () => { + await patchPackageJson(wd, packages); + }); + }); + + await runner.stage("install", async () => { + await action("Installing dependencies", async (spinner) => { + await execWithSpinner(spinner, "npm", ["install", "--no-package-lock"], { + cwd: wd, + }); + await execWithSpinner(spinner, "git", ["checkout", "--", "package.json"], { + cwd: wd, + }); + }); + }); + + await runner.stage("validate", async () => { + await validateSpecs(runner, wd, config, { interactive: options.interactive }); + }); + + await runner.stage("validate:clean", async () => { + await validateGitClean(wd); + }); +} diff --git a/packages/tsp-integration/src/runner.ts b/packages/tsp-integration/src/runner.ts new file mode 100644 index 00000000000..7d3111e0d8b --- /dev/null +++ b/packages/tsp-integration/src/runner.ts @@ -0,0 +1,47 @@ +/* eslint-disable no-console */ +import pc from "picocolors"; + +export interface TaskRunnerOptions { + readonly verbose?: boolean; + readonly stages?: Stages[]; +} + +export class TaskRunner { + #verbose: boolean; + #stages: Stages[] | undefined; + + constructor(options: TaskRunnerOptions = {}) { + this.#stages = options.stages; + this.#verbose = options.verbose === undefined ? Boolean(process.env.CI) : options.verbose; + } + + async stage(name: Stages, fn: () => Promise): Promise { + if (this.#stages && !this.#stages.includes(name)) { + return; + } + await fn(); + } + + reportTaskWithDetails(status: "pass" | "fail" | "skip", name: string, details: string) { + const statusStr = + status === "pass" ? pc.green("pass") : status === "fail" ? pc.red("fail") : pc.gray("skip"); + const message = `${statusStr} ${name}`; + if (this.#verbose || status === "fail") { + this.group(message, details); + } else { + console.log(message); + } + } + + group(name: string, content: string) { + if (process.env.GITHUB_ACTIONS) { + console.log(`::group::${name}`); + console.log(content); + console.log("::endgroup::"); + } else { + console.group(name); + console.log(content); + console.groupEnd(); + } + } +} diff --git a/packages/tsp-integration/src/utils.ts b/packages/tsp-integration/src/utils.ts new file mode 100644 index 00000000000..46ba385d554 --- /dev/null +++ b/packages/tsp-integration/src/utils.ts @@ -0,0 +1,168 @@ +/* eslint-disable no-console */ +import { spawn, type SpawnOptions } from "child_process"; +import logSymbols from "log-symbols"; +import ora, { type Ora } from "ora"; +import { resolve } from "pathe"; +import pc from "picocolors"; + +export class ValidationFailedError extends Error {} + +export const projectRoot = resolve(import.meta.dirname, ".."); +export const repoRoot = resolve(projectRoot, "../.."); + +export async function execWithSpinner( + spinner: Ora, + command: string, + args: string[], + options: SpawnOptions = {}, +): Promise { + return new Promise((resolve, reject) => { + const subprocess = spawn(command, args, { + stdio: "pipe", + ...options, + }); + + // Handle stdout + subprocess.stdout!.on("data", (data) => { + spinner.clear(); + console.log(data.toString()); + spinner.render(); + }); + + // Handle stderr + subprocess.stderr!.on("data", (data) => { + spinner.clear(); + // Ora seems to swallow the stderr output? + console.error(data.toString()); + spinner.render(); + }); + + subprocess.on("close", (code) => { + if (code !== 0) { + reject(new Error(`Command failed with exit code ${code}`)); + } else { + resolve(); + } + }); + }); +} + +export async function action(message: string, fn: (spinner: Ora) => Promise): Promise { + if (process.stderr.isTTY) { + return dynamicAction(message, fn); + } else { + return staticAction(message, fn); + } +} + +export async function dynamicAction( + message: string, + fn: (spinner: Ora) => Promise, +): Promise { + const oldLog = console.log; + + console.log = (...args: any[]) => { + spinner.clear(); + oldLog(...args); + spinner.render(); + }; + const spinner = ora(message).start(); + try { + const result = await fn(spinner); + spinner.succeed(message); + return result; + } catch (error) { + spinner.fail(message); + throw error; + } finally { + console.log = oldLog; + } +} + +export async function staticAction( + message: string, + fn: (spinner: Ora) => Promise, +): Promise { + const spinner = ora(message).start(); + console.log(`- ${message}`); + try { + const result = await fn(spinner); + console.log(`${pc.red(logSymbols.success)} ${message}`); + + return result; + } catch (error) { + console.log(`${pc.red(logSymbols.error)} ${message}`); + throw error; + } +} + +export function log(...args: any[]) { + console.log(...args); +} + +/** Run tasks with limited concurrency */ +export async function runWithConcurrency( + items: T[], + concurrency: number, + processor: (item: T) => Promise, +): Promise { + if (items.length === 0) { + return []; + } + + const toRun = [...items]; + const results: R[] = []; + let completed = 0; + let running = 0; + + return new Promise((resolve, reject) => { + function runNext() { + if (toRun.length === 0 || running >= concurrency) { + return; + } + + const item = toRun.shift(); + if (!item) { + return; + } + + running++; + processor(item) + .then((result) => { + results.push(result); + completed++; + running--; + + if (completed === items.length) { + resolve(results); + return; + } + + runNext(); + }) + .catch((error) => { + reject(error); + }); + } + + // Start initial batch of tasks up to concurrency limit + for (let i = 0; i < Math.min(concurrency, toRun.length); i++) { + runNext(); + } + }); +} + +export async function waitForUserInput(): Promise { + const readline = await import("readline"); + const rl = readline.createInterface({ + input: process.stdin, + output: process.stdout, + }); + + return new Promise((resolve) => { + rl.question("", (answer) => { + rl.close(); + resolve(answer.trim()); + }); + }); +} diff --git a/packages/tsp-integration/src/validate.ts b/packages/tsp-integration/src/validate.ts new file mode 100644 index 00000000000..e83b5a5485b --- /dev/null +++ b/packages/tsp-integration/src/validate.ts @@ -0,0 +1,276 @@ +import { execa } from "execa"; +import { readdir } from "fs/promises"; +import { globby } from "globby"; +import { cpus } from "os"; +import { dirname, join, relative } from "pathe"; +import pc from "picocolors"; +import type { Entrypoint, IntegrationTestSuite } from "./config/types.js"; +import { registerConsoleShortcuts } from "./keyboard-api.js"; +import type { TaskRunner } from "./runner.js"; +import { log, runWithConcurrency, ValidationFailedError } from "./utils.js"; + +// Number of parallel TypeSpec compilations to run +const COMPILATION_CONCURRENCY = cpus().length; + +export interface ValidateSpecsOptions { + interactive?: boolean; +} + +export async function validateSpecs( + runner: TaskRunner, + dir: string, + suite: IntegrationTestSuite, + options: ValidateSpecsOptions = {}, +): Promise { + const tspConfigDirs = await findTspProjects(dir, suite.pattern ?? "**/tspconfig.yaml"); + + if (tspConfigDirs.length === 0) { + log("No tspconfig.yaml files found in specification directory"); + return; + } + + runner.group( + `Found ${pc.yellow(tspConfigDirs.length)} TypeSpec projects`, + tspConfigDirs.map((projectDir) => pc.bold(relative(dir, projectDir))).join("\n"), + ); + + const tspRunner = new TspRunner(runner, dir, suite, tspConfigDirs, options); + await tspRunner.run(); +} + +/** Run */ +export class TspRunner { + /** If the runner is currently cancelling */ + isCancelling = false; + runningPromise: Promise | null = null; + + /** Workspace directory */ + dir: string; + + /** Test suit used for this runner */ + suite: IntegrationTestSuite; + + /** Last set of failing projects */ + #failedProjects: string[] = []; + + #runner: TaskRunner; + #projectDirs: string[]; + #options: ValidateSpecsOptions; + + constructor( + runner: TaskRunner, + dir: string, + suite: IntegrationTestSuite, + tspConfigDirs: string[], + options: ValidateSpecsOptions = {}, + ) { + this.#runner = runner; + this.dir = dir; + this.suite = suite; + this.#options = options; + this.#projectDirs = tspConfigDirs; + } + + async run(): Promise { + if (!this.#options.interactive) { + const result = await this.#exec(this.#projectDirs); + if (result.failureCount > 0) { + throw new ValidationFailedError(); + } + return; + } + registerConsoleShortcuts(this); + await this.rerunAll(); + } + + async #exec(projectsToRun: string[]): Promise { + this.runningPromise = this.#execWorker(projectsToRun); + return await this.runningPromise; + } + async #execWorker(projectsToRun: string[]): Promise { + this.isCancelling = false; + const result = await runValidation(this.#runner, this, projectsToRun); + if (this.#options.interactive) { + log( + `\nPress ${pc.yellow("a")} to rerun all tests, ${pc.yellow("f")} to rerun failed tests, or ${pc.yellow("q")} to quit.`, + ); + } + this.#failedProjects = result.failedProjects; + this.runningPromise = null; + return result; + } + + async cancelCurrentRun(): Promise { + if (this.runningPromise) { + this.isCancelling = true; + await this.runningPromise; + this.isCancelling = false; + } + } + + async rerunFailed(): Promise { + process.stdin.write("\x1Bc"); // Clear console + if (this.#failedProjects.length === 0) { + log(pc.green("No failed projects to rerun.")); + return; + } + log(pc.green(`Rerunning ${pc.yellow(this.#failedProjects.length)} failed project(s)...`)); + await this.#exec(this.#failedProjects); + } + + async rerunAll(): Promise { + process.stdin.write("\x1Bc"); // Clear console + log(pc.green(`Running all ${this.#projectDirs.length} projects...`)); + await this.#exec(this.#projectDirs); + } + + exit(): void { + process.exit(this.#failedProjects.length > 0 ? 1 : 0); + } +} + +export interface BatchRunResult { + readonly successCount: number; + readonly failureCount: number; + readonly skippedCount: number; + readonly failedProjects: string[]; +} +async function runValidation( + runner: TaskRunner, + tspRunner: TspRunner, + projectsToRun: string[], +): Promise { + let successCount = 0; + let failureCount = 0; + let skippedCount = 0; + const failedProjects: string[] = []; + + // Create a processor function that handles the compilation and logging + const processProject = async (projectDir: string) => { + if (tspRunner.isCancelling) { + runner.reportTaskWithDetails("skip", relative(tspRunner.dir, projectDir), "Cancelled"); + return { dir: projectDir, result: { status: "skip", output: "Cancelled" } }; + } + const result = await verifyProject(runner, tspRunner.dir, projectDir, tspRunner.suite); + runner.reportTaskWithDetails(result.status, relative(tspRunner.dir, projectDir), result.output); + return { dir: projectDir, result }; + }; + + // Run compilations in parallel with limited concurrency + const results = await runWithConcurrency(projectsToRun, COMPILATION_CONCURRENCY, processProject); + + // Count successes and failures + for (const { dir, result } of results) { + switch (result.status) { + case "skip": + skippedCount++; + break; + case "pass": + successCount++; + break; + case "fail": + failureCount++; + failedProjects.push(dir); + break; + } + } + + log(`\n=== Summary ===`); + const passed = pc.bold(pc.green(`${successCount} passed`)); + const failed = failureCount > 0 ? pc.bold(pc.red(`${failureCount} failed`)) : undefined; + const skipped = skippedCount > 0 ? pc.bold(pc.gray(`${skippedCount} skipped`)) : undefined; + log( + [passed, failed, skipped].filter(Boolean).join(pc.gray(" | ")), + pc.gray(`(${projectsToRun.length})`), + ); + + if (failureCount > 0) { + log("\nFailed folders:"); + failedProjects.forEach((x) => log(` - ${relative(tspRunner.dir, x)}`)); + } + + return { successCount, failureCount, skippedCount, failedProjects }; +} + +async function findTspProjects(wd: string, pattern: string): Promise { + const result = await globby(pattern, { + cwd: wd, + absolute: true, + }); + return result.map((x) => dirname(x)); +} + +/** Find which entrypoints are available */ +async function findTspEntrypoints( + directory: string, + suite: IntegrationTestSuite, +): Promise { + try { + const entries = await readdir(directory); + return (suite.entrypoints ?? [{ name: "main.tsp" }]).filter((entrypoint) => + entries.includes(entrypoint.name), + ); + } catch (error) { + return []; + } +} + +interface ProjectTestResult { + status: "pass" | "fail" | "skip"; + output: string; +} +async function verifyProject( + runner: TaskRunner, + workspaceDir: string, + dir: string, + suite: IntegrationTestSuite, +): Promise { + const entrypoints = await findTspEntrypoints(dir, suite); + + if (entrypoints.length === 0) { + const result: ProjectTestResult = { + status: "fail", + output: `Project '${dir}' has no valid entrypoints to compile. Checked for: ${suite.entrypoints?.map((e) => e.name).join(", ") ?? "main.tsp"}`, + }; + runner.reportTaskWithDetails("fail", dir, result.output); + return result; + } + + let output = ""; + for (const entrypoint of entrypoints) { + const result = await execTspCompile( + workspaceDir, + join(dir, entrypoint.name), + entrypoint.options, + ); + if (!result.success) { + return { status: "fail", output: result.output }; + } else { + output += result.output; + output += `Entrypoint '${entrypoint.name}' compiled successfully.\n`; + } + } + return { status: "pass", output }; +} + +async function execTspCompile( + directory: string, + file: string, + args: string[] = [], +): Promise<{ success: boolean; output: string }> { + const { failed, all } = await execa( + "npm", + ["exec", "--no", "--", "tsp", "compile", file, "--warn-as-error", ...args], + { + cwd: directory, + stdio: "pipe", + all: true, + reject: false, + env: { FORCE_COLOR: pc.isColorSupported ? "1" : undefined }, // Force color output + }, + ); + return { + success: !failed, + output: all, + }; +} diff --git a/packages/tsp-integration/tsconfig.build.json b/packages/tsp-integration/tsconfig.build.json new file mode 100644 index 00000000000..ab4fd1577ad --- /dev/null +++ b/packages/tsp-integration/tsconfig.build.json @@ -0,0 +1,6 @@ +{ + "extends": "./tsconfig.json", + "references": [], + "include": ["src"], + "exclude": ["**/*.test.*", "test/**/*"] +} diff --git a/packages/tsp-integration/tsconfig.json b/packages/tsp-integration/tsconfig.json new file mode 100644 index 00000000000..a79ad487af4 --- /dev/null +++ b/packages/tsp-integration/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "declaration": true, + "verbatimModuleSyntax": true, + "rootDir": "src", + "outDir": "dist" + } +} diff --git a/packages/tsp-integration/vitest.config.ts b/packages/tsp-integration/vitest.config.ts new file mode 100644 index 00000000000..63cad767f57 --- /dev/null +++ b/packages/tsp-integration/vitest.config.ts @@ -0,0 +1,4 @@ +import { defineConfig, mergeConfig } from "vitest/config"; +import { defaultTypeSpecVitestConfig } from "../../vitest.config.js"; + +export default mergeConfig(defaultTypeSpecVitestConfig, defineConfig({})); diff --git a/packages/tspd/CHANGELOG.md b/packages/tspd/CHANGELOG.md index f491b0a153f..01c1d54bc12 100644 --- a/packages/tspd/CHANGELOG.md +++ b/packages/tspd/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog - @typespec/tspd +## 0.74.1 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 0.74.0 + +### Bump dependencies + +- [#9446](https://github.com/microsoft/typespec/pull/9446) Upgrade dependencies + + ## 0.73.3 ### Bump dependencies diff --git a/packages/tspd/package.json b/packages/tspd/package.json index ffac87febac..046da030de9 100644 --- a/packages/tspd/package.json +++ b/packages/tspd/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/tspd", - "version": "0.73.3", + "version": "0.74.1", "author": "Microsoft Corporation", "description": "TypeSpec library for generating TypeSpec docs", "homepage": "https://typespec.io", @@ -36,7 +36,7 @@ } }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", @@ -55,34 +55,34 @@ "!dist/test/**" ], "dependencies": { - "@alloy-js/core": "^0.22.0", - "@alloy-js/markdown": "^0.22.0", - "@alloy-js/typescript": "^0.22.0", - "@microsoft/api-extractor": "^7.55.2", - "@microsoft/api-extractor-model": "^7.30.6", - "@microsoft/tsdoc": "^0.16.0", - "@microsoft/tsdoc-config": "^0.18.0", + "@alloy-js/core": "catalog:", + "@alloy-js/markdown": "catalog:", + "@alloy-js/typescript": "catalog:", + "@microsoft/api-extractor": "catalog:", + "@microsoft/api-extractor-model": "catalog:", + "@microsoft/tsdoc": "catalog:", + "@microsoft/tsdoc-config": "catalog:", "@typespec/compiler": "workspace:^", - "picocolors": "~1.1.1", - "prettier": "~3.8.0", - "typedoc": "^0.28.1", - "typedoc-plugin-markdown": "^4.5.2", - "yaml": "~2.8.2", - "yargs": "~18.0.0" + "picocolors": "catalog:", + "prettier": "catalog:", + "typedoc": "catalog:", + "typedoc-plugin-markdown": "catalog:", + "yaml": "catalog:", + "yargs": "catalog:" }, "devDependencies": { - "@alloy-js/cli": "^0.22.0", - "@alloy-js/rollup-plugin": "^0.1.0", - "@types/node": "~25.0.2", - "@types/yargs": "~17.0.33", + "@alloy-js/cli": "catalog:", + "@alloy-js/rollup-plugin": "catalog:", + "@types/node": "catalog:", + "@types/yargs": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/prettier-plugin-typespec": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "rimraf": "~6.1.2", - "source-map-support": "~0.5.21", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "rimraf": "catalog:", + "source-map-support": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/tspd/src/gen-extern-signatures/components/decorator-signature-tests.tsx b/packages/tspd/src/gen-extern-signatures/components/decorator-signature-tests.tsx deleted file mode 100644 index 8f40feac957..00000000000 --- a/packages/tspd/src/gen-extern-signatures/components/decorator-signature-tests.tsx +++ /dev/null @@ -1,29 +0,0 @@ -import { Refkey } from "@alloy-js/core"; -import * as ts from "@alloy-js/typescript"; - -export interface DecoratorSignatureTests { - namespaceName: string; - dollarDecoratorRefKey: Refkey; - dollarDecoratorsTypeRefKey: Refkey; -} - -export function DecoratorSignatureTests({ - namespaceName, - dollarDecoratorRefKey, - dollarDecoratorsTypeRefKey, -}: Readonly) { - return ( - <> - - - - {dollarDecoratorRefKey} - {`["${namespaceName}"]`} - - - ); -} diff --git a/packages/tspd/src/gen-extern-signatures/components/decorators-signatures.tsx b/packages/tspd/src/gen-extern-signatures/components/decorators-signatures.tsx deleted file mode 100644 index 13991a4f9e6..00000000000 --- a/packages/tspd/src/gen-extern-signatures/components/decorators-signatures.tsx +++ /dev/null @@ -1,117 +0,0 @@ -import { - For, - Output, - OutputDirectory, - Refkey, - refkey, - render, - StatementList, -} from "@alloy-js/core"; -import * as ts from "@alloy-js/typescript"; -import { Program } from "@typespec/compiler"; -import { typespecCompiler } from "../external-packages/compiler.js"; -import { DecoratorSignature } from "../types.js"; -import { DecoratorSignatureTests } from "./decorator-signature-tests.jsx"; -import { - DecoratorSignatureType, - ValueOfModelTsInterfaceBody, -} from "./decorator-signature-type.jsx"; -import { DollarDecoratorsType } from "./dollar-decorators-type.jsx"; -import { createTspdContext, TspdContext, useTspd } from "./tspd-context.js"; - -export interface DecoratorSignaturesProps { - decorators: DecoratorSignature[]; - namespaceName: string; - dollarDecoratorsRefKey: Refkey; -} - -export function DecoratorSignatures({ - namespaceName, - decorators, - dollarDecoratorsRefKey: dollarDecoratorsRefkey, -}: DecoratorSignaturesProps) { - return ( - - - - - - {(signature) => { - return ; - }} - - - - - - ); -} - -export function LocalTypes() { - const { localTypes } = useTspd(); - return ( - - - {(type) => { - return ( - - - - ); - }} - - - ); -} - -export function generateSignatures( - program: Program, - decorators: DecoratorSignature[], - libraryName: string, - namespaceName: string, -): OutputDirectory { - const context = createTspdContext(program); - const base = namespaceName === "" ? "__global__" : namespaceName; - const $decoratorsRef = refkey(); - const userLib = ts.createPackage({ - name: libraryName, - version: "0.0.0", - descriptor: { - ".": { - named: ["$decorators"], - }, - }, - }); - - const jsxContent = ( - - - - - - {!base.includes(".Private") && ( - - - - )} - - - ); - - return render(jsxContent); -} diff --git a/packages/tspd/src/gen-extern-signatures/components/dollar-functions-type.tsx b/packages/tspd/src/gen-extern-signatures/components/dollar-functions-type.tsx new file mode 100644 index 00000000000..4f686d02343 --- /dev/null +++ b/packages/tspd/src/gen-extern-signatures/components/dollar-functions-type.tsx @@ -0,0 +1,32 @@ +import { For, Refkey } from "@alloy-js/core"; +import * as ts from "@alloy-js/typescript"; +import { FunctionSignature } from "../types.js"; + +export interface DollarFunctionsTypeProps { + namespaceName: string; + functions: FunctionSignature[]; + refkey: Refkey; +} + +/** Type for the $functions variable for the given namespace */ +export function DollarFunctionsType(props: Readonly) { + return ( + + + + {(signature) => { + return ; + }} + + + + ); +} + +function getFunctionsRecordForNamespaceName(namespaceName: string) { + return `${namespaceName.replaceAll(".", "")}Functions`; +} diff --git a/packages/tspd/src/gen-extern-signatures/components/entity-signature-tests.tsx b/packages/tspd/src/gen-extern-signatures/components/entity-signature-tests.tsx new file mode 100644 index 00000000000..939b289db50 --- /dev/null +++ b/packages/tspd/src/gen-extern-signatures/components/entity-signature-tests.tsx @@ -0,0 +1,53 @@ +import { Refkey, Show } from "@alloy-js/core"; +import * as ts from "@alloy-js/typescript"; +import { EntitySignature } from "../types.js"; + +export interface EntitySignatureTests { + namespaceName: string; + entities: EntitySignature[]; + dollarDecoratorRefKey: Refkey; + dollarDecoratorsTypeRefKey: Refkey; + dollarFunctionsRefKey: Refkey; + dollarFunctionsTypeRefKey: Refkey; +} + +export function EntitySignatureTests({ + namespaceName, + entities, + dollarDecoratorRefKey, + dollarDecoratorsTypeRefKey, + dollarFunctionsRefKey, + dollarFunctionsTypeRefKey, +}: Readonly) { + const hasDecorators = entities.some((e) => e.kind === "Decorator"); + const hasFunctions = entities.some((e) => e.kind === "Function"); + + return ( + <> + + + + + {dollarDecoratorRefKey} + {`["${namespaceName}"]`} + + + + + + + {dollarFunctionsRefKey} + {`["${namespaceName}"]`} + + + + ); +} diff --git a/packages/tspd/src/gen-extern-signatures/components/entity-signatures.tsx b/packages/tspd/src/gen-extern-signatures/components/entity-signatures.tsx new file mode 100644 index 00000000000..17dfceaba31 --- /dev/null +++ b/packages/tspd/src/gen-extern-signatures/components/entity-signatures.tsx @@ -0,0 +1,142 @@ +import { + For, + Output, + OutputDirectory, + Refkey, + refkey, + render, + Show, + StatementList, +} from "@alloy-js/core"; +import * as ts from "@alloy-js/typescript"; +import { Program } from "@typespec/compiler"; +import { typespecCompiler } from "../external-packages/compiler.js"; +import { DecoratorSignature, EntitySignature, FunctionSignature } from "../types.js"; +import { DecoratorSignatureType, ValueOfModelTsInterfaceBody } from "./decorator-signature-type.js"; +import { DollarDecoratorsType } from "./dollar-decorators-type.js"; +import { DollarFunctionsType } from "./dollar-functions-type.jsx"; +import { EntitySignatureTests } from "./entity-signature-tests.jsx"; +import { FunctionSignatureType } from "./function-signature-type.jsx"; +import { createTspdContext, TspdContext, useTspd } from "./tspd-context.js"; + +export interface EntitySignaturesProps { + entities: EntitySignature[]; + namespaceName: string; + dollarDecoratorsRefKey: Refkey; + dollarFunctionsRefKey: Refkey; +} + +export function EntitySignatures({ + namespaceName, + entities, + dollarDecoratorsRefKey: dollarDecoratorsRefkey, + dollarFunctionsRefKey: dollarFunctionsRefkey, +}: EntitySignaturesProps) { + const decorators = entities.filter((e): e is DecoratorSignature => e.kind === "Decorator"); + + const functions = entities.filter((e): e is FunctionSignature => e.kind === "Function"); + + return ( + + + 0}> + + + + {(signature) => } + + + + + + 0}> + + + + {(signature) => } + + + + + + + ); +} + +export function LocalTypes() { + const { localTypes } = useTspd(); + return ( + + + {(type) => { + return ( + + + + ); + }} + + + ); +} + +export function generateSignatures( + program: Program, + entities: EntitySignature[], + libraryName: string, + namespaceName: string, +): OutputDirectory { + const context = createTspdContext(program); + const base = namespaceName === "" ? "__global__" : namespaceName; + const $decoratorsRef = refkey(); + const $functionsRef = refkey(); + const userLib = ts.createPackage({ + name: libraryName, + version: "0.0.0", + descriptor: { + ".": { + named: ["$decorators", "$functions"], + }, + }, + }); + + const jsxContent = ( + + + + + + {!base.includes(".Private") && ( + + + + )} + + + ); + + return render(jsxContent); +} diff --git a/packages/tspd/src/gen-extern-signatures/components/function-signature-type.tsx b/packages/tspd/src/gen-extern-signatures/components/function-signature-type.tsx new file mode 100644 index 00000000000..9b569f9c892 --- /dev/null +++ b/packages/tspd/src/gen-extern-signatures/components/function-signature-type.tsx @@ -0,0 +1,357 @@ +import { For, join, List, refkey } from "@alloy-js/core"; +import * as ts from "@alloy-js/typescript"; +import { + Entity, + getSourceLocation, + IntrinsicScalarName, + isArrayModelType, + MixedParameterConstraint, + Model, + Program, + Scalar, + type Type, +} from "@typespec/compiler"; +import { DocNode, DocTag, SyntaxKind } from "@typespec/compiler/ast"; +import { typespecCompiler } from "../external-packages/compiler.js"; +import { FunctionSignature } from "../types.js"; +import { useTspd } from "./tspd-context.js"; + +export interface FunctionSignatureProps { + signature: FunctionSignature; +} + +/** Render the type of function implementation */ +export function FunctionSignatureType(props: Readonly) { + const { program } = useTspd(); + const func = props.signature.tspFunction; + const parameters: ts.ParameterDescriptor[] = [ + { + name: "context", + type: typespecCompiler.FunctionContext, + }, + ...func.parameters.map( + (param): ts.ParameterDescriptor => ({ + // https://github.com/alloy-framework/alloy/issues/144 + name: param.rest ? `...${param.name}` : param.name, + type: param.rest ? ( + <> + ( + {param.type ? ( + + ) : undefined} + )[] + + ) : ( + + ), + optional: param.optional, + }), + ), + ]; + + const returnType = ; + + return ( + + + + ); +} + +/** For a rest param of constraint T[] or valueof T[] return the T or valueof T */ +function extractRestParamConstraint( + program: Program, + constraint: MixedParameterConstraint, +): MixedParameterConstraint | undefined { + let valueType: Type | undefined; + let type: Type | undefined; + if (constraint.valueType) { + if (constraint.valueType.kind === "Model" && isArrayModelType(constraint.valueType)) { + valueType = constraint.valueType.indexer.value; + } else { + return undefined; + } + } + if (constraint.type) { + if (constraint.type.kind === "Model" && isArrayModelType(constraint.type)) { + type = constraint.type.indexer.value; + } else { + return undefined; + } + } + + return { + entityKind: "MixedParameterConstraint", + type, + valueType, + }; +} + +export interface ParameterTsTypeProps { + constraint: MixedParameterConstraint; +} +export function ParameterTsType({ constraint }: ParameterTsTypeProps) { + if (constraint.type && constraint.valueType) { + return ( + <> + + {" | "} + + + ); + } + if (constraint.valueType) { + return ; + } else if (constraint.type) { + return ; + } + + return typespecCompiler.Type; +} + +function TypeConstraintTSType({ type }: { type: Type }) { + if (type.kind === "Model" && isReflectionType(type)) { + return (typespecCompiler as any)[type.name]; + } else if (type.kind === "Union") { + const variants = [...type.variants.values()].map((x) => x.type); + + if (variants.every((x) => isReflectionType(x))) { + return join( + [...new Set(variants)].map((x) => getCompilerType((x as Model).name)), + { + joiner: " | ", + }, + ); + } else { + return typespecCompiler.Type; + } + } + return typespecCompiler.Type; +} + +function getCompilerType(name: string) { + return (typespecCompiler as any)[name]; +} + +function ValueTsType({ type }: { type: Type }) { + switch (type.kind) { + case "Boolean": + return `${type.value}`; + case "String": + return `"${type.value}"`; + case "Number": + return `${type.value}`; + case "Scalar": + return ; + case "Union": + return join( + [...type.variants.values()].map((x) => ), + { joiner: " | " }, + ); + case "Model": + if (isArrayModelType(type)) { + return ( + <> + readonly ( + )[] + + ); + } else if (isReflectionType(type)) { + return getValueOfReflectionType(type); + } else { + // If its exactly the record type use Record instead of the model name. + if (type.indexer && type.name === "Record" && type.namespace?.name === "TypeSpec") { + return ( + <> + Record{" + {">"} + + ); + } + if (type.name) { + return ; + } else { + return ; + } + } + } + return "unknown"; +} + +function LocalTypeReference({ type }: { type: Model }) { + const { addLocalType } = useTspd(); + addLocalType(type); + return ; +} +function ValueOfModelTsType({ model }: { model: Model }) { + return ( + + + + ); +} + +export function ValueOfModelTsInterfaceBody({ model }: { model: Model }) { + return ( + + {model.indexer?.value && ( + } + /> + )} + + {(x) => ( + } + /> + )} + + + ); +} + +function ScalarTsType({ scalar }: { scalar: Scalar }) { + const { program } = useTspd(); + const isStd = program.checker.isStdType(scalar); + if (isStd) { + return getStdScalarTSType(scalar); + } else if (scalar.baseScalar) { + return ; + } else { + return "unknown"; + } +} + +function getStdScalarTSType(scalar: Scalar & { name: IntrinsicScalarName }) { + switch (scalar.name) { + case "numeric": + case "decimal": + case "decimal128": + case "float": + case "integer": + case "int64": + case "uint64": + return typespecCompiler.Numeric; + case "int8": + case "int16": + case "int32": + case "safeint": + case "uint8": + case "uint16": + case "uint32": + case "float64": + case "float32": + return "number"; + case "string": + case "url": + return "string"; + case "boolean": + return "boolean"; + case "plainDate": + case "utcDateTime": + case "offsetDateTime": + case "plainTime": + case "duration": + case "bytes": + return "unknown"; + default: + const _assertNever: never = scalar.name; + return "unknown"; + } +} + +function isReflectionType(type: Type): type is Model & { namespace: { name: "Reflection" } } { + return ( + type.kind === "Model" && + type.namespace?.name === "Reflection" && + type.namespace?.namespace?.name === "TypeSpec" + ); +} + +function getValueOfReflectionType(type: Model) { + switch (type.name) { + case "EnumMember": + case "Enum": + return typespecCompiler.EnumValue; + case "Model": + return "Record"; + default: + return "unknown"; + } +} + +function getDocComment(entity: Entity & { node?: { docs?: readonly DocNode[] } }): string { + const docs = entity.node?.docs; + if (docs === undefined || docs.length === 0) { + return ""; + } + + const mainContentLines: string[] = []; + const tagLines = []; + for (const doc of docs) { + for (const content of doc.content) { + for (const line of content.text.split("\n")) { + mainContentLines.push(line); + } + } + for (const tag of doc.tags) { + tagLines.push(); + + let first = true; + const hasContentFirstLine = checkIfTagHasDocOnSameLine(tag); + const tagStart = + tag.kind === SyntaxKind.DocParamTag || tag.kind === SyntaxKind.DocTemplateTag + ? `@${tag.tagName.sv} ${tag.paramName.sv}` + : `@${tag.tagName.sv}`; + for (const content of tag.content) { + for (const line of content.text.split("\n")) { + const cleaned = sanitizeDocComment(line); + if (first) { + if (hasContentFirstLine) { + tagLines.push(`${tagStart} ${cleaned}`); + } else { + tagLines.push(tagStart, cleaned); + } + + first = false; + } else { + tagLines.push(cleaned); + } + } + } + } + } + + const docLines = [...mainContentLines, ...(tagLines.length > 0 ? [""] : []), ...tagLines]; + return docLines.join("\n"); +} + +function sanitizeDocComment(doc: string): string { + // Issue to escape @internal and other tsdoc tags https://github.com/microsoft/TypeScript/issues/47679 + return doc.replaceAll("@internal", `@_internal`); +} + +function checkIfTagHasDocOnSameLine(tag: DocTag): boolean { + const start = tag.content[0]?.pos; + const end = tag.content[0]?.end; + const file = getSourceLocation(tag.content[0]).file; + + let hasFirstLine = false; + for (let i = start; i < end; i++) { + const ch = file.text[i]; + if (ch === "\n") { + break; + } + // Todo reuse compiler whitespace logic or have a way to get this info from the parser. + if (ch !== " ") { + hasFirstLine = true; + } + } + return hasFirstLine; +} diff --git a/packages/tspd/src/gen-extern-signatures/external-packages/compiler.ts b/packages/tspd/src/gen-extern-signatures/external-packages/compiler.ts index 7d609020ebc..80a0013da31 100644 --- a/packages/tspd/src/gen-extern-signatures/external-packages/compiler.ts +++ b/packages/tspd/src/gen-extern-signatures/external-packages/compiler.ts @@ -6,7 +6,9 @@ export const typespecCompiler = createPackage({ descriptor: { ".": { named: [ + "Program", "DecoratorContext", + "FunctionContext", "Type", "Namespace", "Model", diff --git a/packages/tspd/src/gen-extern-signatures/gen-extern-signatures.ts b/packages/tspd/src/gen-extern-signatures/gen-extern-signatures.ts index ad1cea5d146..0fd36a7f075 100644 --- a/packages/tspd/src/gen-extern-signatures/gen-extern-signatures.ts +++ b/packages/tspd/src/gen-extern-signatures/gen-extern-signatures.ts @@ -19,9 +19,10 @@ import { resolvePath, } from "@typespec/compiler"; import prettier from "prettier"; +import { FunctionValue } from "../../../compiler/src/core/types.js"; import { createDiagnostic } from "../ref-doc/lib.js"; -import { generateSignatures } from "./components/decorators-signatures.js"; -import { DecoratorSignature } from "./types.js"; +import { generateSignatures } from "./components/entity-signatures.js"; +import { DecoratorSignature, EntitySignature, FunctionSignature } from "./types.js"; function createSourceLocation(path: string): SourceLocation { return { file: createSourceFile("", path), pos: 0, end: 0 }; @@ -108,8 +109,7 @@ export async function generateExternDecorators( packageName: string, options?: GenerateExternDecoratorOptions, ): Promise> { - const decorators = new Map(); - + const entities = new Map(); const listener: SemanticNodeListener = { decorator(dec) { if ( @@ -119,12 +119,32 @@ export async function generateExternDecorators( return; } const namespaceName = getTypeName(dec.namespace); - let decoratorForNamespace = decorators.get(namespaceName); - if (!decoratorForNamespace) { - decoratorForNamespace = []; - decorators.set(namespaceName, decoratorForNamespace); + let entitiesForNamespace = entities.get(namespaceName); + if (!entitiesForNamespace) { + entitiesForNamespace = []; + entities.set(namespaceName, entitiesForNamespace); + } + entitiesForNamespace.push(resolveDecoratorSignature(dec)); + }, + function(func) { + if ( + (packageName !== "@typespec/compiler" && + getLocationContext(program, func).type !== "project") || + func.namespace === undefined + ) { + return; + } + const namespaceName = getTypeName(func.namespace); + let entitiesForNamespace = entities.get(namespaceName); + if (!entitiesForNamespace) { + entitiesForNamespace = []; + entities.set(namespaceName, entitiesForNamespace); + } + if (func.name !== undefined) { + entitiesForNamespace.push( + resolveFunctionSignature(func as FunctionValue & { name: string }), + ); } - decoratorForNamespace.push(resolveDecoratorSignature(dec)); }, }; if (options?.namespaces) { @@ -150,8 +170,8 @@ export async function generateExternDecorators( } const files: Record = {}; - for (const [ns, nsDecorators] of decorators.entries()) { - const output = generateSignatures(program, nsDecorators, packageName, ns); + for (const [ns, nsEntities] of entities.entries()) { + const output = generateSignatures(program, nsEntities, packageName, ns); const rawFiles: OutputFile[] = []; await traverseOutput(output, { visitDirectory: () => {}, @@ -169,9 +189,19 @@ export async function generateExternDecorators( function resolveDecoratorSignature(decorator: Decorator): DecoratorSignature { return { + kind: "Decorator", decorator, name: decorator.name, jsName: "$" + decorator.name.slice(1), typeName: decorator.name[1].toUpperCase() + decorator.name.slice(2) + "Decorator", }; } + +function resolveFunctionSignature(func: FunctionValue & { name: string }): FunctionSignature { + return { + kind: "Function", + tspFunction: func, + name: func.name, + typeName: func.name[0].toUpperCase() + func.name.slice(1) + "FunctionImplementation", + }; +} diff --git a/packages/tspd/src/gen-extern-signatures/types.ts b/packages/tspd/src/gen-extern-signatures/types.ts index f40343d7e01..cb01eb3d7ca 100644 --- a/packages/tspd/src/gen-extern-signatures/types.ts +++ b/packages/tspd/src/gen-extern-signatures/types.ts @@ -1,6 +1,10 @@ -import type { Decorator } from "../../../compiler/src/core/types.js"; +import type { Decorator, FunctionValue } from "@typespec/compiler"; + +export type EntitySignature = DecoratorSignature | FunctionSignature; export interface DecoratorSignature { + kind: Decorator["kind"]; + /** Decorator name ()`@example `@foo`) */ name: string; @@ -12,3 +16,15 @@ export interface DecoratorSignature { decorator: Decorator; } + +export interface FunctionSignature { + kind: FunctionValue["valueKind"]; + + /** Function name */ + name: string; + + /** TypeScript type name (@example `FooFunction`) */ + typeName: string; + + tspFunction: FunctionValue; +} diff --git a/packages/tspd/src/ref-doc/api-docs.ts b/packages/tspd/src/ref-doc/api-docs.ts index e400358bf9b..b82c9436878 100644 --- a/packages/tspd/src/ref-doc/api-docs.ts +++ b/packages/tspd/src/ref-doc/api-docs.ts @@ -18,7 +18,7 @@ export async function generateJsApiDocs(libraryPath: string, outputDir: string) const app = await Application.bootstrapWithPlugins({ entryPoints: [joinPaths(libraryPath, "src/index.ts")], - tsconfig: joinPaths(libraryPath, "tsconfig.json"), + tsconfig: joinPaths(libraryPath, "tsconfig.build.json"), entryPointStrategy: "resolve", }); diff --git a/packages/tspd/src/ref-doc/api-extractor.ts b/packages/tspd/src/ref-doc/api-extractor.ts index 0be2b4f40c2..e73af12bfa5 100644 --- a/packages/tspd/src/ref-doc/api-extractor.ts +++ b/packages/tspd/src/ref-doc/api-extractor.ts @@ -59,7 +59,7 @@ export function createApiModelFileForExport( configObject: { mainEntryPointFilePath: entrypoint, compiler: { - tsconfigFilePath: joinPaths(libraryPath, "tsconfig.json"), + tsconfigFilePath: joinPaths(libraryPath, "tsconfig.build.json"), }, docModel: { enabled: true, diff --git a/packages/tspd/src/ref-doc/extractor.ts b/packages/tspd/src/ref-doc/extractor.ts index 65de37a3403..98f0e0529cf 100644 --- a/packages/tspd/src/ref-doc/extractor.ts +++ b/packages/tspd/src/ref-doc/extractor.ts @@ -204,9 +204,11 @@ export function extractRefDocs( namespace, { decorator(dec) { + if (hasInternalModifier(dec)) return; collectType(dec, extractDecoratorRefDoc(program, dec), namespaceDoc.decorators); }, operation(operation) { + if (hasInternalModifier(operation)) return; if (!isDeclaredType(operation)) { return; } @@ -220,12 +222,14 @@ export function extractRefDocs( } }, interface(iface) { + if (hasInternalModifier(iface)) return; if (!isDeclaredType(iface)) { return; } collectType(iface, extractInterfaceRefDocs(program, iface), namespaceDoc.interfaces); }, model(model) { + if (hasInternalModifier(model)) return; if (!isDeclaredType(model)) { return; } @@ -235,12 +239,14 @@ export function extractRefDocs( collectType(model, extractModelRefDocs(program, model), namespaceDoc.models); }, enum(e) { + if (hasInternalModifier(e)) return; if (!isDeclaredType(e)) { return; } collectType(e, extractEnumRefDoc(program, e), namespaceDoc.enums); }, union(union) { + if (hasInternalModifier(union)) return; if (!isDeclaredType(union)) { return; } @@ -249,6 +255,7 @@ export function extractRefDocs( } }, scalar(scalar) { + if (hasInternalModifier(scalar)) return; collectType(scalar, extractScalarRefDocs(program, scalar), namespaceDoc.scalars); }, }, @@ -277,6 +284,14 @@ export function extractRefDocs( }); } +/** Check if a type's declaration has the `internal` modifier. */ +function hasInternalModifier(type: Type): boolean { + const node = type.node; + if (node === undefined) return false; + if (!("modifiers" in node)) return false; + return node.modifiers.some((m: any) => m.kind === SyntaxKind.InternalKeyword); +} + function extractTemplateParameterDocs(program: Program, type: TemplatedType) { if (isTemplateDeclaration(type)) { const templateParamsDocs = getTemplateParameterDocs(type); diff --git a/packages/tspd/src/ref-doc/utils/type-signature.ts b/packages/tspd/src/ref-doc/utils/type-signature.ts index cd4e42984c0..e6d3bfec4d3 100644 --- a/packages/tspd/src/ref-doc/utils/type-signature.ts +++ b/packages/tspd/src/ref-doc/utils/type-signature.ts @@ -14,6 +14,7 @@ import { UnionVariant, } from "@typespec/compiler"; import { TemplateParameterDeclarationNode } from "@typespec/compiler/ast"; +import { FunctionType } from "../../../../compiler/src/core/types.js"; /** @internal */ export function getTypeSignature(type: Type): string { @@ -59,6 +60,8 @@ export function getTypeSignature(type: Type): string { return `(union variant) ${getUnionVariantSignature(type)}`; case "Tuple": return `(tuple) [${type.values.map(getTypeSignature).join(", ")}]`; + case "FunctionType": + return `(fn) ${getFunctionSignature(type)}`; default: const _assertNever: never = type; compilerAssert(false, "Unexpected type kind"); @@ -84,6 +87,11 @@ function getDecoratorSignature(type: Decorator) { return signature; } +function getFunctionSignature(type: FunctionType) { + const parameters = [...type.parameters].map((x) => getFunctionParameterSignature(x)); + return `(${parameters.join(", ")}): ${getEntityName(type.returnType)}`; +} + function getInterfaceSignature(type: Interface) { const ns = getQualifier(type.namespace); diff --git a/packages/tspd/test/gen-extern-signature/decorators-signatures.test.ts b/packages/tspd/test/gen-extern-signature/decorators-signatures.test.ts index 2b7a405940e..27ff5c8eb74 100644 --- a/packages/tspd/test/gen-extern-signature/decorators-signatures.test.ts +++ b/packages/tspd/test/gen-extern-signature/decorators-signatures.test.ts @@ -1,29 +1,25 @@ -import { definePackageFlags } from "@typespec/compiler"; -import { createTestHost, expectDiagnosticEmpty } from "@typespec/compiler/testing"; +import { definePackageFlags, resolvePath } from "@typespec/compiler"; +import { createTester, expectDiagnosticEmpty, mockFile } from "@typespec/compiler/testing"; import { describe, expect, it } from "vitest"; import { generateExternDecorators } from "../../src/gen-extern-signatures/gen-extern-signatures.js"; +const Tester = createTester(resolvePath(import.meta.dirname, "../.."), { + libraries: [], +}) + .files({ + "lib.js": mockFile.js({ $flags: definePackageFlags({}) }), + }) + .import("./lib.js") + .using("TypeSpec.Reflection"); + async function generateDecoratorSignatures(code: string) { - const host = await createTestHost(); - host.addTypeSpecFile( - "main.tsp", - ` - import "./lib.js"; - using TypeSpec.Reflection; - ${code}`, - ); - host.addJsFile("lib.js", { - $flags: definePackageFlags({}), - }); - await host.diagnose("main.tsp", { - parseOptions: { comments: true, docs: true }, + const [{ program }] = await Tester.compileAndDiagnose(code, { + compilerOptions: { parseOptions: { comments: true, docs: true } }, }); - expectDiagnosticEmpty( - host.program.diagnostics.filter((x) => x.code !== "missing-implementation"), - ); + expectDiagnosticEmpty(program.diagnostics.filter((x) => x.code !== "missing-implementation")); - const result = await generateExternDecorators(host.program, "test-lib", { + const result = await generateExternDecorators(program, "test-lib", { prettierConfig: { printWidth: 160, // So there is no inconsistency in the .each test with different parameter length plugins: [], diff --git a/packages/tspd/test/test-utils.ts b/packages/tspd/test/test-utils.ts index 84ab503b278..e6d40517f0b 100644 --- a/packages/tspd/test/test-utils.ts +++ b/packages/tspd/test/test-utils.ts @@ -1,16 +1,18 @@ -import { Diagnostic } from "@typespec/compiler"; -import { createTestHost, expectDiagnosticEmpty } from "@typespec/compiler/testing"; +import { Diagnostic, resolvePath } from "@typespec/compiler"; +import { createTester, expectDiagnosticEmpty } from "@typespec/compiler/testing"; import { MarkdownRenderer } from "../src/ref-doc/emitters/markdown.js"; import { extractRefDocs } from "../src/ref-doc/extractor.js"; import { TypeSpecRefDocBase } from "../src/ref-doc/types.js"; +const Tester = createTester(resolvePath(import.meta.dirname, ".."), { + libraries: [], +}); + export async function extractTestRefDoc( code: string, ): Promise<[TypeSpecRefDocBase, readonly Diagnostic[]]> { - const host = await createTestHost(); - host.addTypeSpecFile("main.tsp", code); - await host.compile("main.tsp"); - return extractRefDocs(host.program); + const [{ program }] = await Tester.compileAndDiagnose(code); + return extractRefDocs(program); } export async function createMarkdownRenderer(code: string) { diff --git a/packages/typespec-vs/CHANGELOG.md b/packages/typespec-vs/CHANGELOG.md index 06161ef5210..5f411ce5d2d 100644 --- a/packages/typespec-vs/CHANGELOG.md +++ b/packages/typespec-vs/CHANGELOG.md @@ -1,5 +1,17 @@ # Change Log - typespec-vs +## 1.11.0 + +No changes, version bump only. + +## 1.10.0 + +No changes, version bump only. + +## 1.9.0 + +No changes, version bump only. + ## 1.8.0 ### Bump dependencies diff --git a/packages/typespec-vs/package.json b/packages/typespec-vs/package.json index 420ff37d974..316f2672d63 100644 --- a/packages/typespec-vs/package.json +++ b/packages/typespec-vs/package.json @@ -1,7 +1,7 @@ { "name": "typespec-vs", "author": "Microsoft Corporation", - "version": "1.8.0", + "version": "1.11.0", "description": "TypeSpec Language Support for Visual Studio", "homepage": "https://typespec.io", "readme": "https://github.com/microsoft/typespec/blob/main/README.md", @@ -18,7 +18,7 @@ ], "type": "module", "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "files": [ "Microsoft.TypeSpec.VS.vsix" diff --git a/packages/typespec-vscode/CHANGELOG.md b/packages/typespec-vscode/CHANGELOG.md index ecc37a0f09a..1ea2fa3a7d8 100644 --- a/packages/typespec-vscode/CHANGELOG.md +++ b/packages/typespec-vscode/CHANGELOG.md @@ -1,5 +1,23 @@ # Change Log - typespec-vscode +## 1.11.0 + +No changes, version bump only. + +## 1.10.0 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 1.9.0 + +### Bump dependencies + +- [#9446](https://github.com/microsoft/typespec/pull/9446) Upgrade dependencies + + ## 1.8.0 ### Bump dependencies diff --git a/packages/typespec-vscode/ThirdPartyNotices.txt b/packages/typespec-vscode/ThirdPartyNotices.txt index 4aba9b7bd37..4cd31de4a90 100644 --- a/packages/typespec-vscode/ThirdPartyNotices.txt +++ b/packages/typespec-vscode/ThirdPartyNotices.txt @@ -8,9 +8,9 @@ original copyright notices and the licenses under which Microsoft received such components are set forth below. Microsoft reserves all rights not expressly granted herein, whether by implication, estoppel or otherwise. -1. @babel/code-frame version 7.28.6 (https://github.com/babel/babel) +1. @babel/code-frame version 7.29.0 (https://github.com/babel/babel) 2. @babel/helper-validator-identifier version 7.28.5 (https://github.com/babel/babel) -3. ajv version 8.17.1 (ajv-validator/ajv) +3. ajv version 8.18.0 (ajv-validator/ajv) 4. balanced-match version 1.0.2 (https://github.com/juliangruber/balanced-match) 5. brace-expansion version 2.0.2 (https://github.com/juliangruber/brace-expansion) 6. change-case version 5.4.4 (https://github.com/blakeembrey/change-case) @@ -19,18 +19,18 @@ granted herein, whether by implication, estoppel or otherwise. 9. fast-uri version 3.1.0 (https://github.com/fastify/fast-uri) 10. is-unicode-supported version 2.1.0 (sindresorhus/is-unicode-supported) 11. isexe version 2.0.0 (https://github.com/isaacs/isexe) -12. isexe version 3.1.1 (https://github.com/isaacs/isexe) +12. isexe version 4.0.0 (https://github.com/isaacs/isexe) 13. js-tokens version 4.0.0 (lydell/js-tokens) 14. json-schema-traverse version 1.0.0 (https://github.com/epoberezkin/json-schema-traverse) -15. minimatch version 5.1.6 (https://github.com/isaacs/minimatch) +15. minimatch version 5.1.9 (https://github.com/isaacs/minimatch) 16. mustache version 4.2.0 (https://github.com/janl/mustache.js) 17. path-key version 3.1.1 (sindresorhus/path-key) 18. picocolors version 1.1.1 (alexeyraspopov/picocolors) -19. semver version 7.7.3 (https://github.com/npm/node-semver) +19. semver version 7.7.4 (https://github.com/npm/node-semver) 20. shebang-command version 2.0.0 (kevva/shebang-command) 21. shebang-regex version 3.0.0 (sindresorhus/shebang-regex) 22. which version 2.0.2 (https://github.com/isaacs/node-which) -23. which version 6.0.0 (https://github.com/npm/node-which) +23. which version 6.0.1 (https://github.com/npm/node-which) 24. yaml version 2.8.2 (github:eemeli/yaml) @@ -339,21 +339,61 @@ END OF isexe NOTICES AND INFORMATION %% isexe NOTICES AND INFORMATION BEGIN HERE ===================================================== -The ISC License +# Blue Oak Model License -Copyright (c) 2016-2022 Isaac Z. Schlueter and Contributors +Version 1.0.0 -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. +## Purpose -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +This license gives everyone as much permission to work with +this software as possible, while protecting contributors +from liability. + +## Acceptance + +In order to receive this license, you must agree to its +rules. The rules of this license are both obligations +under that agreement and conditions to your license. +You must not do anything with this software that triggers +a rule that you cannot or will not follow. + +## Copyright + +Each contributor licenses you to do everything with this +software that would otherwise infringe that contributor's +copyright in it. + +## Notices + +You must ensure that everyone who gets a copy of +any part of this software from you, with or without +changes, also gets the text of this license or a link to +. + +## Excuse + +If anyone notifies you in writing that you have not +complied with [Notices](#notices), you can keep your +license by taking all practical steps to comply within 30 +days after the notice. If you do not do so, your license +ends immediately. + +## Patent + +Each contributor licenses you to do everything with this +software that would otherwise infringe any patent claims +they can license or become able to license. + +## Reliability + +No contributor can revoke this license. + +## No Liability + +***As far as the law allows, this software comes as is, +without any warranty or condition, and no contributor +will be liable to anyone for any damages related to this +software or this license, under any kind of legal claim.*** ====================================================="); END OF isexe NOTICES AND INFORMATION diff --git a/packages/typespec-vscode/package.json b/packages/typespec-vscode/package.json index b93e3d70a2f..b347e1e0c49 100644 --- a/packages/typespec-vscode/package.json +++ b/packages/typespec-vscode/package.json @@ -1,6 +1,6 @@ { "name": "typespec-vscode", - "version": "1.8.0", + "version": "1.11.0", "author": "Microsoft Corporation", "description": "TypeSpec language support for VS Code", "homepage": "https://typespec.io", @@ -26,7 +26,7 @@ "main": "./dist/src/extension.cjs", "browser": "./dist/src/web/extension.js", "engines": { - "vscode": "^1.108.0" + "vscode": "^1.110.0" }, "exports": { ".": { @@ -282,33 +282,31 @@ "test:extension": "vitest run --root test/extension" }, "devDependencies": { - "@types/cross-spawn": "~6.0.6", - "@types/mocha": "^10.0.9", - "@types/node": "~25.0.2", - "@types/semver": "^7.5.8", - "@types/vscode": "~1.108.1", - "@types/which": "^3.0.4", + "@types/cross-spawn": "catalog:", + "@types/node": "catalog:", + "@types/semver": "catalog:", + "@types/vscode": "~1.110.0", + "@types/which": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/internal-build-utils": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "@vscode/extension-telemetry": "^1.0.0", - "@vscode/test-electron": "^2.3.9", - "@vscode/test-web": "^0.0.78", - "@vscode/vsce": "~3.7.1", - "ajv": "~8.17.1", - "c8": "^10.1.3", - "cross-spawn": "^7.0.6", - "esbuild": "^0.27.0", - "mocha": "^11.1.0", - "playwright": "^1.57.0", - "rimraf": "~6.1.2", - "semver": "^7.7.1", - "swagger-ui-dist": "^5.20.1", - "typescript": "~5.9.2", - "vitest": "^4.0.15", - "vscode-languageclient": "~9.0.1", - "which": "^6.0.0", - "yaml": "~2.8.2" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "@vscode/extension-telemetry": "catalog:", + "@vscode/test-electron": "catalog:", + "@vscode/test-web": "catalog:", + "@vscode/vsce": "catalog:", + "ajv": "catalog:", + "c8": "catalog:", + "cross-spawn": "catalog:", + "esbuild": "catalog:", + "playwright": "catalog:", + "rimraf": "catalog:", + "semver": "catalog:", + "swagger-ui-dist": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:", + "vscode-languageclient": "catalog:", + "which": "catalog:", + "yaml": "catalog:" } } diff --git a/packages/typespec-vscode/src/const.ts b/packages/typespec-vscode/src/const.ts index 39df7d9279c..5e75dd8acfa 100644 --- a/packages/typespec-vscode/src/const.ts +++ b/packages/typespec-vscode/src/const.ts @@ -1,5 +1,3 @@ export const StartFileName = "main.tsp"; export const TspConfigFileName = "tspconfig.yaml"; export const EmptyGuid = "00000000-0000-0000-0000-000000000000"; - -export const ENABLE_LM_LOGGING = "ENABLE_LM_LOGGING"; diff --git a/packages/typespec-vscode/src/debug.ts b/packages/typespec-vscode/src/debug.ts new file mode 100644 index 00000000000..fd06e6edeca --- /dev/null +++ b/packages/typespec-vscode/src/debug.ts @@ -0,0 +1,41 @@ +/** + * Debug logger for Language Model operations. + * Can be enabled via TYPESPEC_DEBUG environment variable. + * + * Note: We use TYPESPEC_DEBUG instead of DEBUG because the DEBUG environment variable + * is not supported in VSCode extensions. See: https://github.com/microsoft/vscode/issues/290140 + * + * Usage: TYPESPEC_DEBUG=lm + * + * Examples: + * TYPESPEC_DEBUG=lm - Enable Language Model debug logs + * TYPESPEC_DEBUG=* - Enable all debug logs + */ +function isDebugEnabled(area: string): boolean { + const debug = process.env.TYPESPEC_DEBUG; + if (!debug) { + return false; + } + + const areas = debug.split(",").map((a) => a.trim()); + + return areas.some((pattern) => { + // Exact match + if (pattern === area) { + return true; + } + + // Wildcard pattern matching + if (pattern.includes("*")) { + const regexPattern = pattern.replace(/\*/g, ".*"); + const regex = new RegExp(`^${regexPattern}$`); + return regex.test(area); + } + + return false; + }); +} + +export const debugLoggers = { + lm: { enabled: isDebugEnabled("lm") }, +} as const; diff --git a/packages/typespec-vscode/src/lm/language-model.ts b/packages/typespec-vscode/src/lm/language-model.ts index 3dfb8d581d6..79ca770aff9 100644 --- a/packages/typespec-vscode/src/lm/language-model.ts +++ b/packages/typespec-vscode/src/lm/language-model.ts @@ -1,6 +1,6 @@ import { inspect } from "util"; import { LanguageModelChat, LanguageModelChatMessage, lm } from "vscode"; -import { ENABLE_LM_LOGGING } from "../const"; +import { debugLoggers } from "../debug"; import logger, { LogItem } from "../log/logger"; import { RetryResult, runWithRetry, runWithTimingLog } from "../utils"; @@ -23,7 +23,7 @@ export async function sendLmChatRequest( /** Only for logging purpose */ id?: string, ): Promise { - const logEnabled = process.env[ENABLE_LM_LOGGING] === "true"; + const logEnabled = debugLoggers.lm.enabled; const lmLog = (item: LogItem) => { if (logEnabled || item.level === "error" || item.level === "warning") { logger.log( diff --git a/packages/typespec-vscode/src/typespec-utils.ts b/packages/typespec-vscode/src/typespec-utils.ts index bb2ce29eeb4..a54a69aee23 100644 --- a/packages/typespec-vscode/src/typespec-utils.ts +++ b/packages/typespec-vscode/src/typespec-utils.ts @@ -75,7 +75,7 @@ export async function installCompilerWithUi( paths: (string | "global")[], ): Promise { const COMPILER_REQUIREMENT = - "Minimum Requirements: Install Node.js 20 LTS or above and verify 'node -v' and 'npm -v' run in command prompt"; + "Minimum Requirements: Install Node.js 22 LTS or above and verify 'node -v' and 'npm -v' run in command prompt"; const globalPath = "global"; if (paths.length === 0) { paths.push(globalPath); diff --git a/packages/typespec-vscode/src/vscode-cmd/create-tsp-project.ts b/packages/typespec-vscode/src/vscode-cmd/create-tsp-project.ts index d2bb2383011..dd4315261ca 100644 --- a/packages/typespec-vscode/src/vscode-cmd/create-tsp-project.ts +++ b/packages/typespec-vscode/src/vscode-cmd/create-tsp-project.ts @@ -251,7 +251,7 @@ export async function createTypeSpecProject( } type nextStepChoice = "Add to workspace" | "Open in New Window" | "Ignore"; - let nextStep: nextStepChoice = "Ignore"; + let nextStep: nextStepChoice; const normalizedRootFolder = normalizePath(selectedRootFolder); const isFolderOpenedInWorkspace = vscode.workspace.workspaceFolders?.find( diff --git a/packages/typespec-vscode/src/vscode-cmd/emit-code/emit-code.ts b/packages/typespec-vscode/src/vscode-cmd/emit-code/emit-code.ts index ce8aa288e24..7d361b85991 100644 --- a/packages/typespec-vscode/src/vscode-cmd/emit-code/emit-code.ts +++ b/packages/typespec-vscode/src/vscode-cmd/emit-code/emit-code.ts @@ -583,7 +583,7 @@ export async function emitCode( tel.lastStep = "Check compiler capability"; return ResultCode.Cancelled; } - let tspProjectFile: string = ""; + let tspProjectFile: string; if (!uri) { const targetPathes = await TraverseMainTspFileInWorkspace(); logger.info(`Found ${targetPathes.length} ${StartFileName} files`); diff --git a/packages/typespec-vscode/src/vscode-cmd/openapi3-preview.ts b/packages/typespec-vscode/src/vscode-cmd/openapi3-preview.ts index 0682b4b5bd3..d094f619402 100644 --- a/packages/typespec-vscode/src/vscode-cmd/openapi3-preview.ts +++ b/packages/typespec-vscode/src/vscode-cmd/openapi3-preview.ts @@ -283,7 +283,7 @@ async function getOutputFolder(mainTspFile: string, tmpRoot: string): Promise( return stubMultipleDialogs(app, [{ method, value }]); } -export function stubMultipleDialogs( +export async function stubMultipleDialogs( app: ElectronApplication, mocks: DialogMethodStubPartial[], ) { diff --git a/packages/typespec-vscode/test/extension/common/utils.ts b/packages/typespec-vscode/test/extension/common/utils.ts index 573c043fbae..edd66d6ef9e 100644 --- a/packages/typespec-vscode/test/extension/common/utils.ts +++ b/packages/typespec-vscode/test/extension/common/utils.ts @@ -35,9 +35,8 @@ export const test = baseTest.extend<{ await use(async (options) => { const executablePath = inject("executablePath"); const workspacePath = options.workspacePath; - let envOverrides = {}; const codePath = path.join(executablePath, "../bin"); - envOverrides = { + const envOverrides = { PATH: `${codePath}${path.delimiter}${process.env.PATH}`, }; @@ -60,7 +59,18 @@ export const test = baseTest.extend<{ `--folder-uri=file:${path.resolve(workspacePath)}`, ].filter((v): v is string => !!v), }); + + // Ensure Electron is always closed on teardown, even if later steps fail. + teardowns.push(async () => { + try { + await app.close(); + } catch (error) {} + }); + const page = await app.firstWindow(); + // Wait for the page to fully load to reduce the chance of + // VS Code reloading the window and destroying the execution context. + await page.waitForLoadState("domcontentloaded"); const tracePath = join(projectRoot, "test-results", task.name, "trace.zip"); const artifactsDir = join(tempDir, "playwright-artifacts"); await fs.promises.mkdir(artifactsDir, { recursive: true }); // make sure the directory exists diff --git a/packages/typespec-vscode/test/extension/create-typespec.test.ts b/packages/typespec-vscode/test/extension/create-typespec.test.ts index cdbc7afefe5..f1913011019 100644 --- a/packages/typespec-vscode/test/extension/create-typespec.test.ts +++ b/packages/typespec-vscode/test/extension/create-typespec.test.ts @@ -31,14 +31,7 @@ const CreateTypespecProjectFolderPath = path.resolve(tempDir, "CreateTypespecPro const createCase = "CreateTypespecProject"; const templateName = "Generic Rest API"; const templateNameDescription = "Create a project representing a generic REST API service."; -const expectedResults = [ - ".gitignore", - "main.tsp", - "node_modules", - "package-lock.json", - "package.json", - "tspconfig.yaml", -]; +const expectedResults = [".gitignore", "main.tsp", "package.json", "tspconfig.yaml"]; const CreateCasesConfigList: CreateConfigType[] = [ { @@ -69,6 +62,9 @@ describe.each(CreateCasesConfigList)("CreateTypespecProject", async (item) => { workspacePath: workspacePath, }); await cs.screenshot(page, "after_launch"); + // Wait for VS Code UI to be ready before mocking dialogs to avoid + // "Execution context was destroyed" errors from window reloads. + await page.waitForSelector(".explorer-viewlet", { timeout: 30000 }); await mockShowOpenDialog(app, [workspacePath]); await startWithCommandPalette(page, "Create Typespec Project", cs); await cs.screenshot(page, "after_start_command"); @@ -86,6 +82,5 @@ describe.each(CreateCasesConfigList)("CreateTypespecProject", async (item) => { app, ); await expectFilesInDir(expectedResults, workspacePath); - app.close(); }); }); diff --git a/packages/typespec-vscode/test/extension/emit-typespec.test.ts b/packages/typespec-vscode/test/extension/emit-typespec.test.ts index 5f4e9ad2ae4..6cffcf0d599 100644 --- a/packages/typespec-vscode/test/extension/emit-typespec.test.ts +++ b/packages/typespec-vscode/test/extension/emit-typespec.test.ts @@ -104,6 +104,5 @@ describe.each(EmitCasesConfigList)("EmitTypespecProject", async (item) => { } const resultFilePath = path.resolve(workspacePath, "./tsp-output/@typespec"); await expectFilesInDir(expectedResults, resultFilePath); - app.close(); }); }); diff --git a/packages/typespec-vscode/test/extension/import-typespec.test.ts b/packages/typespec-vscode/test/extension/import-typespec.test.ts index 3e4ea9a186d..1bc2cb2e653 100644 --- a/packages/typespec-vscode/test/extension/import-typespec.test.ts +++ b/packages/typespec-vscode/test/extension/import-typespec.test.ts @@ -99,6 +99,5 @@ describe.each(ImportCasesConfigList)("ImportTypespecFromOpenApi3", async (item) ); const resultFilePath = path.resolve(workspacePath, "./ImportTypespecProjectEmptyFolder"); await expectFilesInDir(expectedResults, resultFilePath); - app.close(); }); }); diff --git a/packages/typespec-vscode/test/extension/preview-typespec.test.ts b/packages/typespec-vscode/test/extension/preview-typespec.test.ts index 1e11cf61ace..587af2315d8 100644 --- a/packages/typespec-vscode/test/extension/preview-typespec.test.ts +++ b/packages/typespec-vscode/test/extension/preview-typespec.test.ts @@ -58,7 +58,7 @@ describe.each(PreviewCasesConfigList)("PreviewAPIDocument", async (item) => { test(caseName, async ({ launch }) => { const cs = new CaseScreenshot(caseName); const workspacePath = PreviewTypespecProjectFolderPath; - const { page, app } = await launch({ + const { page } = await launch({ workspacePath, }); await page.getByRole("treeitem", { name: "main.tsp" }).locator("a").click(); @@ -80,6 +80,5 @@ describe.each(PreviewCasesConfigList)("PreviewAPIDocument", async (item) => { cs, ); await rm(cs.caseDir, { recursive: true }); - app.close(); }); }); diff --git a/packages/typespec-vscode/test/web/suite.ts b/packages/typespec-vscode/test/web/suite.ts index 025ec99623f..9dfc2a0bc66 100644 --- a/packages/typespec-vscode/test/web/suite.ts +++ b/packages/typespec-vscode/test/web/suite.ts @@ -1,28 +1,4 @@ -// // imports mocha for the browser, defining the `mocha` global. -import "mocha/mocha"; - -mocha.setup({ - ui: "bdd", - reporter: undefined, - timeout: 20000, -}); - export async function run(): Promise { - await import("./web.test.js"); - return new Promise((c, e) => { - try { - // Run the mocha test - mocha.run((failures) => { - if (failures > 0) { - e(new Error(`${failures} tests failed.`)); - } else { - c(); - } - }); - } catch (err) { - // eslint-disable-next-line no-console - console.error(err); - e(err); - } - }); + const { runWebTests } = await import("./web.test.js"); + await runWebTests(); } diff --git a/packages/typespec-vscode/test/web/web.test.ts b/packages/typespec-vscode/test/web/web.test.ts index e5381170286..dfcb80b2d08 100644 --- a/packages/typespec-vscode/test/web/web.test.ts +++ b/packages/typespec-vscode/test/web/web.test.ts @@ -1,23 +1,16 @@ import * as vscode from "vscode"; -describe("Web Extension", () => { - vscode.window.showInformationMessage("Start all tests."); +export async function runWebTests(): Promise { + const ext = vscode.extensions.getExtension("typespec.typespec-vscode"); + if (!ext) { + throw new Error("Could not find extension!"); + } + await ext.activate(); - let basicUri: vscode.Uri; - before(async () => { - const ext = vscode.extensions.getExtension("typespec.typespec-vscode"); - if (!ext) { - throw new Error("Could not find extension!"); - } - await ext!.activate(); + const scheme = ext.extensionUri.scheme === "file" ? "file" : "vscode-test-web"; + const pathPrefix = scheme === "file" ? ext.extensionUri.fsPath + "/test" : ""; + const basicUri = vscode.Uri.from({ scheme, path: pathPrefix + "/basic.tsp" }); - const scheme = ext?.extensionUri.scheme === "file" ? "file" : "vscode-test-web"; - const pathPrefix = scheme === "file" ? ext?.extensionUri.fsPath + "/test" : ""; - - basicUri = vscode.Uri.from({ scheme, path: pathPrefix + "/basic.tsp" }); - }); - - it("open tsp file", async () => { - await vscode.workspace.openTextDocument(basicUri); - }); -}); + // Test: open tsp file + await vscode.workspace.openTextDocument(basicUri); +} diff --git a/packages/typespec-vscode/tsconfig.json b/packages/typespec-vscode/tsconfig.json index 71612145ff4..f8068cf9928 100644 --- a/packages/typespec-vscode/tsconfig.json +++ b/packages/typespec-vscode/tsconfig.json @@ -11,7 +11,7 @@ "noEmitOnError": true, "outDir": "dist", "skipLibCheck": true, - "types": ["mocha"], + "types": [], "rootDir": "." }, "exclude": ["dist", "temp", "templates", "vitest.config.ts"] diff --git a/packages/versioning/CHANGELOG.md b/packages/versioning/CHANGELOG.md index fe52eb96e40..d18f020a9b3 100644 --- a/packages/versioning/CHANGELOG.md +++ b/packages/versioning/CHANGELOG.md @@ -1,5 +1,27 @@ # Change Log - @typespec/versioning +## 0.81.0 + +No changes, version bump only. + +## 0.80.0 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + +### Bug Fixes + +- [#9932](https://github.com/microsoft/typespec/pull/9932) [API] Fix running multiple versioning mutators together + + +## 0.79.0 + +### Bug Fixes + +- [#9444](https://github.com/microsoft/typespec/pull/9444) Fix incorrect incompatible versioning error in model expressions + + ## 0.78.0 ### Bump dependencies diff --git a/packages/versioning/README.md b/packages/versioning/README.md index 2f1bdad5203..1b8adf74f7e 100644 --- a/packages/versioning/README.md +++ b/packages/versioning/README.md @@ -214,7 +214,12 @@ op newName(): void; #### `@returnTypeChangedFrom` -Identifies when the target type changed. +Declares that the return type of an operation has changed starting at a given version, +while keeping earlier versions consistent with the previous return type. + +This decorator is used to track return type changes across API versions. When applied, +the operation will return `oldType` in versions before the specified `version`, +and the current return type definition in the specified version and later. ```typespec @TypeSpec.Versioning.returnTypeChangedFrom(version: EnumMember, oldType: unknown) @@ -226,14 +231,28 @@ Identifies when the target type changed. ##### Parameters -| Name | Type | Description | -| ------- | ------------ | -------------------------------------------- | -| version | `EnumMember` | The version that the target type changed in. | -| oldType | `unknown` | The previous type of the target. | +| Name | Type | Description | +| ------- | ------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| version | `EnumMember` | The version when the return type change takes effect. The new return type applies
from this version onwards, while the old return type applies to earlier versions. | +| oldType | `unknown` | The previous return type used before the specified version. | + +##### Examples + +```tsp +// In v1: returns a string +// In v2+: returns an int32 +@returnTypeChangedFrom(Versions.v2, string) +op getUserId(): int32; +``` #### `@typeChangedFrom` -Identifies when the target type changed. +Declares that the type of a model property has changed starting at a given version, +while keeping earlier versions consistent with the previous type. + +This decorator is used to track type changes across API versions. When applied, +the property will use `oldType` in versions before the specified `version`, +and the current type definition in the specified version and later. ```typespec @TypeSpec.Versioning.typeChangedFrom(version: EnumMember, oldType: unknown) @@ -245,10 +264,21 @@ Identifies when the target type changed. ##### Parameters -| Name | Type | Description | -| ------- | ------------ | -------------------------------------------- | -| version | `EnumMember` | The version that the target type changed in. | -| oldType | `unknown` | The previous type of the target. | +| Name | Type | Description | +| ------- | ------------ | --------------------------------------------------------------------------------------------------------------------------------------------------- | +| version | `EnumMember` | The version when the type change takes effect. The new type applies
from this version onwards, while the old type applies to earlier versions. | +| oldType | `unknown` | The previous type used before the specified version. | + +##### Examples + +```tsp +model Foo { + // In v1: id is a string + // In v2+: id is an int32 + @typeChangedFrom(Versions.v2, string) + id: int32; +} +``` #### `@useDependency` diff --git a/packages/versioning/generated-defs/TypeSpec.Versioning.ts b/packages/versioning/generated-defs/TypeSpec.Versioning.ts index 8e8668c1c45..b52ff9d3df0 100644 --- a/packages/versioning/generated-defs/TypeSpec.Versioning.ts +++ b/packages/versioning/generated-defs/TypeSpec.Versioning.ts @@ -202,10 +202,25 @@ export type MadeRequiredDecorator = ( ) => DecoratorValidatorCallbacks | void; /** - * Identifies when the target type changed. + * Declares that the type of a model property has changed starting at a given version, + * while keeping earlier versions consistent with the previous type. * - * @param version The version that the target type changed in. - * @param oldType The previous type of the target. + * This decorator is used to track type changes across API versions. When applied, + * the property will use `oldType` in versions before the specified `version`, + * and the current type definition in the specified version and later. + * + * @param version The version when the type change takes effect. The new type applies + * from this version onwards, while the old type applies to earlier versions. + * @param oldType The previous type used before the specified version. + * @example + * ```tsp + * model Foo { + * // In v1: id is a string + * // In v2+: id is an int32 + * @typeChangedFrom(Versions.v2, string) + * id: int32; + * } + * ``` */ export type TypeChangedFromDecorator = ( context: DecoratorContext, @@ -215,10 +230,23 @@ export type TypeChangedFromDecorator = ( ) => DecoratorValidatorCallbacks | void; /** - * Identifies when the target type changed. + * Declares that the return type of an operation has changed starting at a given version, + * while keeping earlier versions consistent with the previous return type. + * + * This decorator is used to track return type changes across API versions. When applied, + * the operation will return `oldType` in versions before the specified `version`, + * and the current return type definition in the specified version and later. * - * @param version The version that the target type changed in. - * @param oldType The previous type of the target. + * @param version The version when the return type change takes effect. The new return type applies + * from this version onwards, while the old return type applies to earlier versions. + * @param oldType The previous return type used before the specified version. + * @example + * ```tsp + * // In v1: returns a string + * // In v2+: returns an int32 + * @returnTypeChangedFrom(Versions.v2, string) + * op getUserId(): int32; + * ``` */ export type ReturnTypeChangedFromDecorator = ( context: DecoratorContext, diff --git a/packages/versioning/generated-defs/TypeSpec.Versioning.ts-test.ts b/packages/versioning/generated-defs/TypeSpec.Versioning.ts-test.ts index dd682efbc45..5e7d70dad0a 100644 --- a/packages/versioning/generated-defs/TypeSpec.Versioning.ts-test.ts +++ b/packages/versioning/generated-defs/TypeSpec.Versioning.ts-test.ts @@ -7,4 +7,4 @@ import type { TypeSpecVersioningDecorators } from "./TypeSpec.Versioning.js"; /** * An error here would mean that the exported decorator is not using the same signature. Make sure to have export const $decName: DecNameDecorator = (...) => ... */ -const _: TypeSpecVersioningDecorators = $decorators["TypeSpec.Versioning"]; +const _decs: TypeSpecVersioningDecorators = $decorators["TypeSpec.Versioning"]; diff --git a/packages/versioning/lib/decorators.tsp b/packages/versioning/lib/decorators.tsp index fe423e85391..8422f3327ea 100644 --- a/packages/versioning/lib/decorators.tsp +++ b/packages/versioning/lib/decorators.tsp @@ -178,15 +178,49 @@ extern dec madeOptional(target: ModelProperty, version: EnumMember); extern dec madeRequired(target: ModelProperty, version: EnumMember); /** - * Identifies when the target type changed. - * @param version The version that the target type changed in. - * @param oldType The previous type of the target. + * Declares that the type of a model property has changed starting at a given version, + * while keeping earlier versions consistent with the previous type. + * + * This decorator is used to track type changes across API versions. When applied, + * the property will use `oldType` in versions before the specified `version`, + * and the current type definition in the specified version and later. + * + * @param version The version when the type change takes effect. The new type applies + * from this version onwards, while the old type applies to earlier versions. + * @param oldType The previous type used before the specified version. + * + * @example + * + * ```tsp + * model Foo { + * // In v1: id is a string + * // In v2+: id is an int32 + * @typeChangedFrom(Versions.v2, string) + * id: int32; + * } + * ``` */ extern dec typeChangedFrom(target: ModelProperty, version: EnumMember, oldType: unknown); /** - * Identifies when the target type changed. - * @param version The version that the target type changed in. - * @param oldType The previous type of the target. + * Declares that the return type of an operation has changed starting at a given version, + * while keeping earlier versions consistent with the previous return type. + * + * This decorator is used to track return type changes across API versions. When applied, + * the operation will return `oldType` in versions before the specified `version`, + * and the current return type definition in the specified version and later. + * + * @param version The version when the return type change takes effect. The new return type applies + * from this version onwards, while the old return type applies to earlier versions. + * @param oldType The previous return type used before the specified version. + * + * @example + * + * ```tsp + * // In v1: returns a string + * // In v2+: returns an int32 + * @returnTypeChangedFrom(Versions.v2, string) + * op getUserId(): int32; + * ``` */ extern dec returnTypeChangedFrom(target: Operation, version: EnumMember, oldType: unknown); diff --git a/packages/versioning/package.json b/packages/versioning/package.json index 2cfc7f1b311..4e2165aa185 100644 --- a/packages/versioning/package.json +++ b/packages/versioning/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/versioning", - "version": "0.78.0", + "version": "0.81.0", "author": "Microsoft Corporation", "description": "TypeSpec library for declaring and emitting versioned APIs", "homepage": "https://typespec.io", @@ -31,12 +31,12 @@ } }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "pnpm gen-extern-signature && tsc -p . && pnpm lint-typespec-library", - "watch": "tsc -p . --watch", + "build": "pnpm gen-extern-signature && tsc -p tsconfig.build.json && pnpm lint-typespec-library", + "watch": "tsc -p tsconfig.build.json --watch", "gen-extern-signature": "tspd --enable-experimental gen-extern-signature .", "lint-typespec-library": "tsp compile . --warn-as-error --import @typespec/library-linter --no-emit", "test": "vitest run", @@ -55,15 +55,15 @@ "@typespec/compiler": "workspace:^" }, "devDependencies": { - "@types/node": "~25.0.2", + "@types/node": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/library-linter": "workspace:^", "@typespec/tspd": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/versioning/src/validate.ts b/packages/versioning/src/validate.ts index c61de96087a..a1cbb8535e6 100644 --- a/packages/versioning/src/validate.ts +++ b/packages/versioning/src/validate.ts @@ -377,7 +377,7 @@ function getVersionedTypeMap( } } } - let lastType: Type | undefined = undefined; + let lastType: Type | undefined; switch (source.kind) { case "ModelProperty": lastType = source.type; diff --git a/packages/versioning/src/versioning.ts b/packages/versioning/src/versioning.ts index 5089fb2f0d7..0999228273f 100644 --- a/packages/versioning/src/versioning.ts +++ b/packages/versioning/src/versioning.ts @@ -391,13 +391,30 @@ export function getAvailabilityMapInTimeline( ) return undefined; - added = resolveWhenFirstAdded(added, removed, parentAdded); + // Only keep versioning info related to this timeline + const timelineAdded = added.filter((x) => timeline.getIndex(x) !== -1); + const timelineRemoved = removed.filter((x) => timeline.getIndex(x) !== -1); + const hasTypeChangedInTimeline = + typeChanged !== undefined && [...typeChanged.keys()].some((v) => timeline.getIndex(v) !== -1); + const hasReturnTypeChangedInTimeline = + returnTypeChanged !== undefined && + [...returnTypeChanged.keys()].some((v) => timeline.getIndex(v) !== -1); + + if ( + !timelineAdded.length && + !timelineRemoved.length && + !hasTypeChangedInTimeline && + !hasReturnTypeChangedInTimeline + ) + return undefined; + + added = resolveWhenFirstAdded(timelineAdded, timelineRemoved, parentAdded); // something isn't available by default let isAvail = false; for (const [index, moment] of timeline.entries()) { const add = added.find((x) => timeline.getIndex(x) === index); - const rem = removed.find((x) => timeline.getIndex(x) === index); + const rem = timelineRemoved.find((x) => timeline.getIndex(x) === index); if (rem) { isAvail = false; avail.set(moment, Availability.Removed); diff --git a/packages/versioning/test/mutations/apply-snapshot-versioning.test.ts b/packages/versioning/test/mutations/apply-snapshot-versioning.test.ts index 421f43ebc65..7e0828f423a 100644 --- a/packages/versioning/test/mutations/apply-snapshot-versioning.test.ts +++ b/packages/versioning/test/mutations/apply-snapshot-versioning.test.ts @@ -1,5 +1,12 @@ -import type { Namespace, Scalar, Type } from "@typespec/compiler"; +import { + getMediaTypeHint, + type Namespace, + type Program, + type Scalar, + type Type, +} from "@typespec/compiler"; import { unsafe_mutateSubgraphWithNamespace } from "@typespec/compiler/experimental"; +import { t } from "@typespec/compiler/testing"; import { strictEqual } from "assert"; import { describe, expect, it } from "vitest"; import { getVersioningMutators } from "../../src/mutator.js"; @@ -14,7 +21,7 @@ const baseCode = ` `; async function testMutationLogic( code: string, -): Promise<{ v1: Namespace; v2: Namespace; v3: Namespace }> { +): Promise<{ program: Program; v1: Namespace; v2: Namespace; v3: Namespace }> { const runner = await Tester.createInstance(); const fullCode = baseCode + "\n" + code; const { Service } = await runner.compile(fullCode); @@ -24,7 +31,7 @@ async function testMutationLogic( (x) => unsafe_mutateSubgraphWithNamespace(runner.program, [x.mutator], Service as Namespace).type, ); - return { v1, v2, v3 } as any; + return { program: runner.program, v1, v2, v3 } as any; } async function itCanBeAddedRemovedAndRenamed( @@ -105,6 +112,19 @@ describe("models", () => { (ns) => ns.models, (decorators) => `${decorators} model A {}`, ); + + it("preserves @mediaTypeHint state on version snapshot clones", async () => { + const { program, v1, v2, v3 } = await testMutationLogic(` + @mediaTypeHint("application/merge-patch+json") + model PatchBody {} + `); + + for (const ns of [v1, v2, v3]) { + const model = ns.models.get("PatchBody"); + expect(model).toBeDefined(); + expect(getMediaTypeHint(program, model!)).toBe("application/merge-patch+json"); + } + }); }); describe("model properties", () => { @@ -211,3 +231,54 @@ describe("operations in interface", () => { (decorators) => `interface Test { ${decorators} A(): void; }`, ); }); + +describe("apply multiple versioning mutators", () => { + // https://github.com/microsoft/typespec/issues/9927 + it("properties with @added from different services are preserved", async () => { + const { ServiceA, ServiceB, program } = await Tester.compile(t.code` + @versioned(VersionsA) + namespace ${t.namespace("ServiceA")} { + enum VersionsA { av1, av2 } + model Foo { + name: string; + @added(VersionsA.av2) + description?: string; + } + } + + @versioned(VersionsB) + namespace ${t.namespace("ServiceB")} { + enum VersionsB { bv1, bv2 } + model Bar { + id: int32; + @added(VersionsB.bv2) + value?: string; + } + } + `); + + const serviceAMutators = getVersioningMutators(program, ServiceA); + const serviceBMutators = getVersioningMutators(program, ServiceB); + + strictEqual(serviceAMutators?.kind, "versioned"); + strictEqual(serviceBMutators?.kind, "versioned"); + + const serviceAV2 = serviceAMutators.snapshots[1].mutator; + const serviceBV2 = serviceBMutators.snapshots[1].mutator; + + const globalNs = program.getGlobalNamespaceType(); + const result = unsafe_mutateSubgraphWithNamespace(program, [serviceAV2, serviceBV2], globalNs); + + const mutatedGlobal = result.type as Namespace; + const serviceA = mutatedGlobal.namespaces.get("ServiceA")!; + const serviceB = mutatedGlobal.namespaces.get("ServiceB")!; + + const foo = serviceA.models.get("Foo")!; + expect(foo.properties.has("name")).toBe(true); + expect(foo.properties.has("description")).toBe(true); + + const bar = serviceB.models.get("Bar")!; + expect(bar.properties.has("id")).toBe(true); + expect(bar.properties.has("value")).toBe(true); + }); +}); diff --git a/packages/versioning/tsconfig.build.json b/packages/versioning/tsconfig.build.json new file mode 100644 index 00000000000..697ef13c178 --- /dev/null +++ b/packages/versioning/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"], + "references": [ + { "path": "../compiler/tsconfig.build.json" }, + { "path": "../rest/tsconfig.build.json" } + ] +} diff --git a/packages/versioning/tsconfig.config.json b/packages/versioning/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/versioning/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/versioning/tsconfig.json b/packages/versioning/tsconfig.json index 438eb424137..f7e9c775c74 100644 --- a/packages/versioning/tsconfig.json +++ b/packages/versioning/tsconfig.json @@ -6,6 +6,5 @@ "rootDir": ".", "verbatimModuleSyntax": true, "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo" - }, - "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"] + } } diff --git a/packages/xml/CHANGELOG.md b/packages/xml/CHANGELOG.md index 9b468001da8..5400de3b713 100644 --- a/packages/xml/CHANGELOG.md +++ b/packages/xml/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog - @typespec/xml +## 0.81.0 + +No changes, version bump only. + +## 0.80.0 + +### Bump dependencies + +- [#9838](https://github.com/microsoft/typespec/pull/9838) Upgrade dependencies + + +## 0.79.0 + +No changes, version bump only. + ## 0.78.0 ### Bump dependencies diff --git a/packages/xml/generated-defs/TypeSpec.Xml.ts-test.ts b/packages/xml/generated-defs/TypeSpec.Xml.ts-test.ts index 73d1eb64388..445937659a8 100644 --- a/packages/xml/generated-defs/TypeSpec.Xml.ts-test.ts +++ b/packages/xml/generated-defs/TypeSpec.Xml.ts-test.ts @@ -7,4 +7,4 @@ import type { TypeSpecXmlDecorators } from "./TypeSpec.Xml.js"; /** * An error here would mean that the exported decorator is not using the same signature. Make sure to have export const $decName: DecNameDecorator = (...) => ... */ -const _: TypeSpecXmlDecorators = $decorators["TypeSpec.Xml"]; +const _decs: TypeSpecXmlDecorators = $decorators["TypeSpec.Xml"]; diff --git a/packages/xml/package.json b/packages/xml/package.json index 84606ac21c9..5a538464a9a 100644 --- a/packages/xml/package.json +++ b/packages/xml/package.json @@ -1,6 +1,6 @@ { "name": "@typespec/xml", - "version": "0.78.0", + "version": "0.81.0", "author": "Microsoft Corporation", "description": "TypeSpec library providing xml bindings", "homepage": "https://typespec.io", @@ -27,12 +27,12 @@ "./testing": "./dist/src/testing/index.js" }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "scripts": { "clean": "rimraf ./dist ./temp", - "build": "pnpm gen-extern-signature && tsc -p . && pnpm lint-typespec-library && pnpm api-extractor", - "watch": "tsc -p . --watch", + "build": "pnpm gen-extern-signature && tsc -p tsconfig.build.json && pnpm lint-typespec-library && pnpm api-extractor", + "watch": "tsc -p tsconfig.build.json --watch", "gen-extern-signature": "tspd --enable-experimental gen-extern-signature .", "lint-typespec-library": "tsp compile . --warn-as-error --import @typespec/library-linter --no-emit", "test": "vitest run", @@ -53,15 +53,15 @@ "@typespec/compiler": "workspace:^" }, "devDependencies": { - "@types/node": "~25.0.2", + "@types/node": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/library-linter": "workspace:^", "@typespec/tspd": "workspace:^", - "@vitest/coverage-v8": "^4.0.15", - "@vitest/ui": "^4.0.15", - "c8": "^10.1.3", - "rimraf": "~6.1.2", - "typescript": "~5.9.2", - "vitest": "^4.0.15" + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "c8": "catalog:", + "rimraf": "catalog:", + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/xml/tsconfig.build.json b/packages/xml/tsconfig.build.json new file mode 100644 index 00000000000..85c215d455c --- /dev/null +++ b/packages/xml/tsconfig.build.json @@ -0,0 +1,5 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"], + "references": [{ "path": "../compiler/tsconfig.build.json" }] +} diff --git a/packages/xml/tsconfig.config.json b/packages/xml/tsconfig.config.json deleted file mode 100644 index 79fb341f399..00000000000 --- a/packages/xml/tsconfig.config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": {} -} diff --git a/packages/xml/tsconfig.json b/packages/xml/tsconfig.json index 19de0b3a83d..8d0eb2d00d4 100644 --- a/packages/xml/tsconfig.json +++ b/packages/xml/tsconfig.json @@ -6,6 +6,5 @@ "rootDir": ".", "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo", "verbatimModuleSyntax": true - }, - "include": ["src/**/*.ts", "generated-defs/**/*.ts", "test/**/*.ts"] + } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 42ac27e3349..468ae883a8d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,112 +4,654 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +catalogs: + default: + '@alloy-js/cli': + specifier: ^0.22.0 + version: 0.22.0 + '@alloy-js/core': + specifier: ^0.22.0 + version: 0.22.0 + '@alloy-js/csharp': + specifier: ^0.22.0 + version: 0.22.0 + '@alloy-js/markdown': + specifier: ^0.22.0 + version: 0.22.0 + '@alloy-js/python': + specifier: ^0.3.0 + version: 0.3.0 + '@alloy-js/rollup-plugin': + specifier: ^0.1.0 + version: 0.1.0 + '@alloy-js/typescript': + specifier: ^0.22.0 + version: 0.22.0 + '@astrojs/check': + specifier: ^0.9.7 + version: 0.9.7 + '@astrojs/react': + specifier: ^5.0.0 + version: 5.0.0 + '@astrojs/starlight': + specifier: ^0.38.1 + version: 0.38.1 + '@azure/identity': + specifier: ~4.13.0 + version: 4.13.0 + '@azure/storage-blob': + specifier: ~12.31.0 + version: 12.31.0 + '@babel/code-frame': + specifier: ~7.29.0 + version: 7.29.0 + '@babel/core': + specifier: ^7.29.0 + version: 7.29.0 + '@chronus/chronus': + specifier: ^1.3.1 + version: 1.3.1 + '@chronus/github': + specifier: ^1.0.6 + version: 1.0.6 + '@chronus/github-pr-commenter': + specifier: ^1.0.6 + version: 1.0.6 + '@docsearch/css': + specifier: ^4.6.0 + version: 4.6.0 + '@docsearch/js': + specifier: ^4.6.0 + version: 4.6.0 + '@eslint/js': + specifier: ^10.0.1 + version: 10.0.1 + '@expressive-code/core': + specifier: ^0.41.7 + version: 0.41.7 + '@fluentui/react-components': + specifier: ~9.73.3 + version: 9.73.3 + '@fluentui/react-icons': + specifier: ^2.0.323 + version: 2.0.323 + '@fluentui/react-list': + specifier: ^9.6.12 + version: 9.6.12 + '@inquirer/prompts': + specifier: ^8.3.0 + version: 8.3.0 + '@microsoft/api-extractor': + specifier: ^7.57.7 + version: 7.57.7 + '@microsoft/api-extractor-model': + specifier: ^7.33.4 + version: 7.33.4 + '@microsoft/tsdoc': + specifier: ^0.16.0 + version: 0.16.0 + '@microsoft/tsdoc-config': + specifier: ^0.18.1 + version: 0.18.1 + '@octokit/core': + specifier: ^7.0.6 + version: 7.0.6 + '@octokit/plugin-paginate-graphql': + specifier: ^6.0.0 + version: 6.0.0 + '@octokit/plugin-rest-endpoint-methods': + specifier: ^17.0.0 + version: 17.0.0 + '@playwright/test': + specifier: ^1.58.2 + version: 1.58.2 + '@pnpm/workspace.find-packages': + specifier: ^1000.0.64 + version: 1000.0.64 + '@scalar/json-magic': + specifier: ^0.11.5 + version: 0.11.7 + '@scalar/openapi-parser': + specifier: ^0.24.1 + version: 0.24.17 + '@scalar/openapi-types': + specifier: ^0.5.0 + version: 0.5.4 + '@storybook/cli': + specifier: ^10.3.3 + version: 10.3.3 + '@storybook/react-vite': + specifier: ^10.3.3 + version: 10.3.3 + '@testing-library/dom': + specifier: ^10.4.1 + version: 10.4.1 + '@testing-library/jest-dom': + specifier: ^6.9.1 + version: 6.9.1 + '@testing-library/react': + specifier: ^16.3.2 + version: 16.3.2 + '@types/babel__code-frame': + specifier: ~7.27.0 + version: 7.27.0 + '@types/body-parser': + specifier: ^1.19.6 + version: 1.19.6 + '@types/cross-spawn': + specifier: ~6.0.6 + version: 6.0.6 + '@types/debounce': + specifier: ~1.2.4 + version: 1.2.4 + '@types/deep-equal': + specifier: ^1.0.4 + version: 1.0.4 + '@types/express': + specifier: ^5.0.6 + version: 5.0.6 + '@types/micromatch': + specifier: ^4.0.10 + version: 4.0.10 + '@types/morgan': + specifier: ^1.9.10 + version: 1.9.10 + '@types/multer': + specifier: ^2.1.0 + version: 2.1.0 + '@types/mustache': + specifier: ~4.2.6 + version: 4.2.6 + '@types/node': + specifier: ~25.5.0 + version: 25.5.0 + '@types/plist': + specifier: ~3.0.5 + version: 3.0.5 + '@types/react': + specifier: ~19.2.14 + version: 19.2.14 + '@types/react-dom': + specifier: ~19.2.3 + version: 19.2.3 + '@types/remark-heading-id': + specifier: ^1.0.0 + version: 1.0.0 + '@types/semver': + specifier: ^7.7.1 + version: 7.7.1 + '@types/swagger-ui': + specifier: ~5.32.0 + version: 5.32.0 + '@types/swagger-ui-dist': + specifier: ~3.30.6 + version: 3.30.6 + '@types/swagger-ui-express': + specifier: ^4.1.8 + version: 4.1.8 + '@types/which': + specifier: ^3.0.4 + version: 3.0.4 + '@types/xml2js': + specifier: ^0.4.14 + version: 0.4.14 + '@types/yargs': + specifier: ~17.0.35 + version: 17.0.35 + '@typescript-eslint/parser': + specifier: ^8.57.0 + version: 8.57.0 + '@typescript-eslint/rule-tester': + specifier: ^8.57.0 + version: 8.57.0 + '@typescript-eslint/types': + specifier: ^8.57.0 + version: 8.57.0 + '@typescript-eslint/utils': + specifier: ^8.57.0 + version: 8.57.0 + '@typespec/ts-http-runtime': + specifier: 0.3.4 + version: 0.3.4 + '@vitejs/plugin-react': + specifier: ~6.0.1 + version: 6.0.1 + '@vitest/coverage-v8': + specifier: ^4.1.0 + version: 4.1.0 + '@vitest/eslint-plugin': + specifier: ^1.6.12 + version: 1.6.12 + '@vitest/ui': + specifier: ^4.1.0 + version: 4.1.0 + '@vscode/extension-telemetry': + specifier: ^1.5.1 + version: 1.5.1 + '@vscode/test-electron': + specifier: ^2.5.2 + version: 2.5.2 + '@vscode/test-web': + specifier: ^0.0.80 + version: 0.0.80 + '@vscode/vsce': + specifier: ~3.7.1 + version: 3.7.1 + '@yarnpkg/core': + specifier: ^4.6.0 + version: 4.6.0 + '@yarnpkg/fslib': + specifier: ^3.1.4 + version: 3.1.5 + '@yarnpkg/plugin-nm': + specifier: ^4.0.8 + version: 4.0.8 + '@yarnpkg/plugin-npm': + specifier: ^3.4.0 + version: 3.4.1 + '@yarnpkg/plugin-pnp': + specifier: ^4.1.3 + version: 4.1.3 + ajv: + specifier: ~8.18.0 + version: 8.18.0 + ajv-formats: + specifier: ~3.0.1 + version: 3.0.1 + astro: + specifier: ^6.0.4 + version: 6.0.4 + astro-expressive-code: + specifier: ^0.41.7 + version: 0.41.7 + astro-rehype-relative-markdown-links: + specifier: ^0.18.1 + version: 0.18.1 + body-parser: + specifier: ^2.2.2 + version: 2.2.2 + c8: + specifier: ^11.0.0 + version: 11.0.0 + change-case: + specifier: ~5.4.4 + version: 5.4.4 + chokidar: + specifier: ~5.0.0 + version: 5.0.0 + clsx: + specifier: ^2.1.1 + version: 2.1.1 + concurrently: + specifier: ^9.2.1 + version: 9.2.1 + cross-env: + specifier: ~10.1.0 + version: 10.1.0 + cross-spawn: + specifier: ^7.0.6 + version: 7.0.6 + cspell: + specifier: ^9.7.0 + version: 9.7.0 + date-fns: + specifier: ^4.1.0 + version: 4.1.0 + debounce: + specifier: ~3.0.0 + version: 3.0.0 + decimal.js: + specifier: ^10.6.0 + version: 10.6.0 + deep-equal: + specifier: ^2.2.3 + version: 2.2.3 + ecmarkup: + specifier: ~23.0.2 + version: 23.0.2 + env-paths: + specifier: ^4.0.0 + version: 4.0.0 + es-module-shims: + specifier: ~2.8.0 + version: 2.8.0 + esbuild: + specifier: ^0.27.4 + version: 0.27.4 + esbuild-plugins-node-modules-polyfill: + specifier: ^1.8.1 + version: 1.8.1 + eslint: + specifier: ^10.0.3 + version: 10.0.3 + eslint-plugin-react-hooks: + specifier: 7.0.1 + version: 7.0.1 + eslint-plugin-unicorn: + specifier: ^63.0.0 + version: 63.0.0 + execa: + specifier: ^9.6.1 + version: 9.6.1 + express: + specifier: ^5.2.1 + version: 5.2.1 + fs-extra: + specifier: ^11.3.4 + version: 11.3.4 + globby: + specifier: ~16.1.1 + version: 16.1.1 + grammarkdown: + specifier: ~3.3.2 + version: 3.3.2 + happy-dom: + specifier: ^20.8.9 + version: 20.8.9 + inquirer: + specifier: ^13.3.0 + version: 13.3.0 + is-unicode-supported: + specifier: ^2.1.0 + version: 2.1.0 + json5: + specifier: ^2.2.3 + version: 2.2.3 + log-symbols: + specifier: ^7.0.1 + version: 7.0.1 + lzutf8: + specifier: 0.6.3 + version: 0.6.3 + micromatch: + specifier: ^4.0.8 + version: 4.0.8 + monaco-editor: + specifier: ~0.55.1 + version: 0.55.1 + monaco-editor-core: + specifier: ^0.55.1 + version: 0.55.1 + morgan: + specifier: ^1.10.1 + version: 1.10.1 + multer: + specifier: ^2.1.1 + version: 2.1.1 + mustache: + specifier: ~4.2.0 + version: 4.2.0 + onigasm: + specifier: ~2.2.5 + version: 2.2.5 + ora: + specifier: ^9.3.0 + version: 9.3.0 + p-limit: + specifier: ^7.3.0 + version: 7.3.0 + pathe: + specifier: ^2.0.3 + version: 2.0.3 + picocolors: + specifier: ~1.1.1 + version: 1.1.1 + playwright: + specifier: ^1.58.2 + version: 1.58.2 + plist: + specifier: ~3.1.0 + version: 3.1.0 + postject: + specifier: 1.0.0-alpha.6 + version: 1.0.0-alpha.6 + prettier: + specifier: ~3.8.1 + version: 3.8.1 + prettier-plugin-astro: + specifier: ^0.14.1 + version: 0.14.1 + prettier-plugin-organize-imports: + specifier: ~4.3.0 + version: 4.3.0 + prettier-plugin-sh: + specifier: ^0.18.0 + version: 0.18.0 + prism-react-renderer: + specifier: ^2.4.1 + version: 2.4.1 + react: + specifier: ~19.2.4 + version: 19.2.4 + react-dom: + specifier: ~19.2.4 + version: 19.2.4 + react-error-boundary: + specifier: ^6.1.1 + version: 6.1.1 + react-hotkeys-hook: + specifier: ^5.2.4 + version: 5.2.4 + react-markdown: + specifier: ^10.1.0 + version: 10.1.0 + rehype-mermaid: + specifier: ^3.0.0 + version: 3.0.0 + remark-heading-id: + specifier: ^1.0.1 + version: 1.0.1 + rimraf: + specifier: ~6.1.3 + version: 6.1.3 + rollup-plugin-visualizer: + specifier: 6.0.4 + version: 6.0.4 + semver: + specifier: ^7.7.4 + version: 7.7.4 + sharp: + specifier: ^0.34.5 + version: 0.34.5 + simple-git: + specifier: ^3.33.0 + version: 3.33.0 + source-map-support: + specifier: ~0.5.21 + version: 0.5.21 + storybook: + specifier: ^10.3.3 + version: 10.3.3 + strip-json-comments: + specifier: ~5.0.3 + version: 5.0.3 + swagger-ui-dist: + specifier: ^5.32.0 + version: 5.32.0 + swagger-ui-express: + specifier: ^5.0.1 + version: 5.0.1 + tar: + specifier: ^7.5.11 + version: 7.5.11 + temporal-polyfill: + specifier: ^0.3.2 + version: 0.3.2 + tree-sitter-c-sharp: + specifier: ^0.23.1 + version: 0.23.1 + tree-sitter-java: + specifier: ^0.23.5 + version: 0.23.5 + tree-sitter-javascript: + specifier: ^0.25.0 + version: 0.25.0 + tree-sitter-python: + specifier: ^0.25.0 + version: 0.25.0 + tree-sitter-typescript: + specifier: ^0.23.2 + version: 0.23.2 + tsx: + specifier: ^4.21.0 + version: 4.21.0 + typedoc: + specifier: ^0.28.17 + version: 0.28.17 + typedoc-plugin-markdown: + specifier: ^4.10.0 + version: 4.10.0 + typescript: + specifier: ~5.9.3 + version: 5.9.3 + typescript-eslint: + specifier: ^8.57.0 + version: 8.57.0 + uri-template: + specifier: ^2.0.0 + version: 2.0.0 + vite: + specifier: ^8.0.1 + version: 8.0.1 + vite-plugin-checker: + specifier: ^0.12.0 + version: 0.12.0 + vite-plugin-dts: + specifier: 4.5.4 + version: 4.5.4 + vitest: + specifier: ^4.1.0 + version: 4.1.0 + vscode-languageclient: + specifier: ~9.0.1 + version: 9.0.1 + vscode-languageserver: + specifier: ~9.0.1 + version: 9.0.1 + vscode-languageserver-textdocument: + specifier: ~1.0.12 + version: 1.0.12 + vscode-oniguruma: + specifier: ~2.0.1 + version: 2.0.1 + vscode-textmate: + specifier: ~9.3.2 + version: 9.3.2 + web-tree-sitter: + specifier: ^0.26.7 + version: 0.26.7 + which: + specifier: ^6.0.1 + version: 6.0.1 + xml2js: + specifier: ^0.6.2 + version: 0.6.2 + yaml: + specifier: ~2.8.2 + version: 2.8.2 + yargs: + specifier: ~18.0.0 + version: 18.0.0 + overrides: - cross-spawn@>=7.0.0 <7.0.5: ^7.0.5 - rollup: 4.49.0 + dompurify: ^3.3.3 + cross-spawn@>=7.0.0 <7.0.5: '>=7.0.5' + diff@>=6.0.0 <8.0.3: '>=8.0.3' + yaml@>=2.0.0 <2.8.3: '>=2.8.3' importers: .: devDependencies: '@chronus/chronus': - specifier: ^1.0.1 - version: 1.1.0 + specifier: 'catalog:' + version: 1.3.1 '@chronus/github': - specifier: ^1.0.1 - version: 1.0.3 + specifier: 'catalog:' + version: 1.0.6 '@chronus/github-pr-commenter': - specifier: ^1.0.1 - version: 1.0.3 + specifier: 'catalog:' + version: 1.0.6 '@eslint/js': - specifier: ^9.39.2 - version: 9.39.2 + specifier: 'catalog:' + version: 10.0.1(eslint@10.0.3) '@microsoft/api-extractor': - specifier: ^7.55.2 - version: 7.55.2(@types/node@25.0.9) + specifier: 'catalog:' + version: 7.57.7(@types/node@25.5.0) '@octokit/core': - specifier: ^7.0.2 + specifier: 'catalog:' version: 7.0.6 '@octokit/plugin-paginate-graphql': - specifier: ^6.0.0 + specifier: 'catalog:' version: 6.0.0(@octokit/core@7.0.6) '@octokit/plugin-rest-endpoint-methods': - specifier: ^17.0.0 + specifier: 'catalog:' version: 17.0.0(@octokit/core@7.0.6) '@types/micromatch': - specifier: ^4.0.9 + specifier: 'catalog:' version: 4.0.10 '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/eslint-plugin': - specifier: ^1.5.2 - version: 1.6.6(eslint@9.39.2)(typescript@5.9.3)(vitest@4.0.17) + specifier: 'catalog:' + version: 1.6.12(eslint@10.0.3)(typescript@5.9.3)(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 cspell: - specifier: ^9.4.0 - version: 9.6.0 + specifier: 'catalog:' + version: 9.7.0 eslint: - specifier: ^9.39.2 - version: 9.39.2 - eslint-plugin-import: - specifier: ^2.31.0 - version: 2.32.0(@typescript-eslint/parser@8.53.1(eslint@9.39.2)(typescript@5.9.3))(eslint@9.39.2) + specifier: 'catalog:' + version: 10.0.3 eslint-plugin-react-hooks: - specifier: 7.0.1 - version: 7.0.1(eslint@9.39.2) + specifier: 'catalog:' + version: 7.0.1(eslint@10.0.3) eslint-plugin-unicorn: - specifier: ^62.0.0 - version: 62.0.0(eslint@9.39.2) + specifier: 'catalog:' + version: 63.0.0(eslint@10.0.3) micromatch: - specifier: ^4.0.8 + specifier: 'catalog:' version: 4.0.8 picocolors: - specifier: ~1.1.1 + specifier: 'catalog:' version: 1.1.1 playwright: - specifier: ^1.57.0 - version: 1.57.0 + specifier: 'catalog:' + version: 1.58.2 prettier: - specifier: ~3.8.0 - version: 3.8.0 + specifier: 'catalog:' + version: 3.8.1 prettier-plugin-astro: - specifier: ^0.14.1 + specifier: 'catalog:' version: 0.14.1 prettier-plugin-organize-imports: - specifier: ~4.3.0 - version: 4.3.0(prettier@3.8.0)(typescript@5.9.3) + specifier: 'catalog:' + version: 4.3.0(prettier@3.8.1)(typescript@5.9.3) prettier-plugin-sh: - specifier: ^0.18.0 - version: 0.18.0(prettier@3.8.0) + specifier: 'catalog:' + version: 0.18.0(prettier@3.8.1) rimraf: - specifier: ~6.1.2 - version: 6.1.2 - syncpack: - specifier: ^13.0.3 - version: 13.0.4(typescript@5.9.3) + specifier: 'catalog:' + version: 6.1.3 tsx: - specifier: ^4.21.0 + specifier: 'catalog:' version: 4.21.0 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 typescript-eslint: - specifier: ^8.49.0 - version: 8.53.1(eslint@9.39.2)(typescript@5.9.3) - vite-plugin-node-polyfills: - specifier: ^0.25.0 - version: 0.25.0(rollup@4.49.0)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) + specifier: 'catalog:' + version: 8.57.0(eslint@10.0.3)(typescript@5.9.3) vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) yaml: - specifier: ~2.8.2 + specifier: 'catalog:' version: 2.8.2 e2e: {} @@ -117,139 +659,142 @@ importers: packages/asset-emitter: devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typespec/compiler': specifier: workspace:^ version: link:../compiler '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/astro-utils: dependencies: '@astrojs/check': - specifier: ^0.9.4 - version: 0.9.6(prettier-plugin-astro@0.14.1)(prettier@3.8.0)(typescript@5.9.3) + specifier: 'catalog:' + version: 0.9.7(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@5.9.3) '@astrojs/starlight': - specifier: ^0.37.0 - version: 0.37.3(astro@5.16.11(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0)(@types/node@25.0.9)(rollup@4.49.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)) + specifier: 'catalog:' + version: 0.38.1(astro@6.0.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0)(@types/node@25.5.0)(lightningcss@1.32.0)(rollup@4.60.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.3)) '@expressive-code/core': - specifier: ^0.41.2 - version: 0.41.6 + specifier: 'catalog:' + version: 0.41.7 '@typespec/playground': specifier: workspace:^ version: link:../playground astro-expressive-code: - specifier: ^0.41.2 - version: 0.41.6(astro@5.16.11(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0)(@types/node@25.0.9)(rollup@4.49.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)) + specifier: 'catalog:' + version: 0.41.7(astro@6.0.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0)(@types/node@25.5.0)(lightningcss@1.32.0)(rollup@4.60.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.3)) pathe: - specifier: ^2.0.3 + specifier: 'catalog:' version: 2.0.3 react: - specifier: ~19.2.3 - version: 19.2.3 + specifier: 'catalog:' + version: 19.2.4 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 devDependencies: '@types/react': - specifier: ~19.2.7 - version: 19.2.9 + specifier: 'catalog:' + version: 19.2.14 astro: - specifier: ^5.16.5 - version: 5.16.11(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0)(@types/node@25.0.9)(rollup@4.49.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2) + specifier: 'catalog:' + version: 6.0.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0)(@types/node@25.5.0)(lightningcss@1.32.0)(rollup@4.60.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.3) packages/best-practices: devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typespec/compiler': specifier: workspace:^ version: link:../compiler '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/bundle-uploader: dependencies: '@azure/identity': - specifier: ~4.13.0 + specifier: 'catalog:' version: 4.13.0 '@azure/storage-blob': - specifier: ~12.30.0 - version: 12.30.0 + specifier: 'catalog:' + version: 12.31.0 '@pnpm/workspace.find-packages': - specifier: ^1000.0.24 - version: 1000.0.55(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0) + specifier: 'catalog:' + version: 1000.0.64(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0) '@typespec/bundler': specifier: workspace:^ version: link:../bundler + globby: + specifier: 'catalog:' + version: 16.1.1 json5: - specifier: ^2.2.3 + specifier: 'catalog:' version: 2.2.3 picocolors: - specifier: ~1.1.1 + specifier: 'catalog:' version: 1.1.1 semver: - specifier: ^7.7.1 - version: 7.7.3 + specifier: 'catalog:' + version: 7.7.4 devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@types/semver': - specifier: ^7.5.8 + specifier: 'catalog:' version: 7.7.1 '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/bundler: dependencies: @@ -257,261 +802,258 @@ importers: specifier: workspace:^ version: link:../compiler esbuild: - specifier: ^0.27.0 - version: 0.27.2 + specifier: 'catalog:' + version: 0.27.4 esbuild-plugins-node-modules-polyfill: - specifier: ^1.7.0 - version: 1.8.1(esbuild@0.27.2) - node-stdlib-browser: - specifier: ~1.3.1 - version: 1.3.1 + specifier: 'catalog:' + version: 1.8.1(esbuild@0.27.4) picocolors: - specifier: ~1.1.1 + specifier: 'catalog:' version: 1.1.1 yargs: - specifier: ~18.0.0 + specifier: 'catalog:' version: 18.0.0 devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@types/yargs': - specifier: ~17.0.33 + specifier: 'catalog:' version: 17.0.35 '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vite: - specifier: ^7.2.7 - version: 7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3) vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/compiler: dependencies: '@babel/code-frame': - specifier: ~7.28.6 - version: 7.28.6 + specifier: 'catalog:' + version: 7.29.0 '@inquirer/prompts': - specifier: ^8.0.1 - version: 8.2.0(@types/node@25.0.9) + specifier: 'catalog:' + version: 8.3.0(@types/node@25.5.0) ajv: - specifier: ~8.17.1 - version: 8.17.1 + specifier: 'catalog:' + version: 8.18.0 change-case: - specifier: ~5.4.4 + specifier: 'catalog:' version: 5.4.4 env-paths: - specifier: ^3.0.0 - version: 3.0.0 + specifier: 'catalog:' + version: 4.0.0 globby: - specifier: ~16.1.0 - version: 16.1.0 + specifier: 'catalog:' + version: 16.1.1 is-unicode-supported: - specifier: ^2.1.0 + specifier: 'catalog:' version: 2.1.0 mustache: - specifier: ~4.2.0 + specifier: 'catalog:' version: 4.2.0 picocolors: - specifier: ~1.1.1 + specifier: 'catalog:' version: 1.1.1 prettier: - specifier: ~3.8.0 - version: 3.8.0 + specifier: 'catalog:' + version: 3.8.1 semver: - specifier: ^7.7.1 - version: 7.7.3 + specifier: 'catalog:' + version: 7.7.4 tar: - specifier: ^7.5.2 - version: 7.5.4 + specifier: 'catalog:' + version: 7.5.11 temporal-polyfill: - specifier: ^0.3.0 - version: 0.3.0 + specifier: 'catalog:' + version: 0.3.2 vscode-languageserver: - specifier: ~9.0.1 + specifier: 'catalog:' version: 9.0.1 vscode-languageserver-textdocument: - specifier: ~1.0.12 + specifier: 'catalog:' version: 1.0.12 yaml: - specifier: ~2.8.2 + specifier: 'catalog:' version: 2.8.2 yargs: - specifier: ~18.0.0 + specifier: 'catalog:' version: 18.0.0 devDependencies: '@types/babel__code-frame': - specifier: ~7.27.0 + specifier: 'catalog:' version: 7.27.0 '@types/mustache': - specifier: ~4.2.5 + specifier: 'catalog:' version: 4.2.6 '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@types/semver': - specifier: ^7.5.8 + specifier: 'catalog:' version: 7.7.1 '@types/yargs': - specifier: ~17.0.33 + specifier: 'catalog:' version: 17.0.35 '@typespec/internal-build-utils': specifier: workspace:^ version: link:../internal-build-utils '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 grammarkdown: - specifier: ~3.3.2 + specifier: 'catalog:' version: 3.3.2 pathe: - specifier: ^2.0.3 + specifier: 'catalog:' version: 2.0.3 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 source-map-support: - specifier: ~0.5.21 + specifier: 'catalog:' version: 0.5.21 tmlanguage-generator: specifier: workspace:^ version: link:../tmlanguage-generator typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) vscode-oniguruma: - specifier: ~2.0.1 + specifier: 'catalog:' version: 2.0.1 vscode-textmate: - specifier: ~9.3.0 - version: 9.3.1 + specifier: 'catalog:' + version: 9.3.2 packages/emitter-framework: dependencies: '@alloy-js/csharp': - specifier: ^0.22.0 + specifier: 'catalog:' version: 0.22.0 devDependencies: '@alloy-js/cli': - specifier: ^0.22.0 + specifier: 'catalog:' version: 0.22.0 '@alloy-js/core': - specifier: ^0.22.0 + specifier: 'catalog:' version: 0.22.0 '@alloy-js/python': - specifier: ^0.3.0 + specifier: 'catalog:' version: 0.3.0 '@alloy-js/rollup-plugin': - specifier: ^0.1.0 - version: 0.1.0(@babel/core@7.28.6)(@types/babel__core@7.20.5)(rollup@4.49.0) + specifier: 'catalog:' + version: 0.1.0(@babel/core@7.29.0)(@types/babel__core@7.20.5)(rollup@4.60.0) '@alloy-js/typescript': - specifier: ^0.22.0 + specifier: 'catalog:' version: 0.22.0 '@typespec/compiler': specifier: workspace:^ version: link:../compiler concurrently: - specifier: ^9.1.2 + specifier: 'catalog:' version: 9.2.1 pathe: - specifier: ^2.0.3 + specifier: 'catalog:' version: 2.0.3 prettier: - specifier: ~3.8.0 - version: 3.8.0 + specifier: 'catalog:' + version: 3.8.1 tree-sitter-c-sharp: - specifier: ^0.23.0 + specifier: 'catalog:' version: 0.23.1 tree-sitter-java: - specifier: ^0.23.2 + specifier: 'catalog:' version: 0.23.5 tree-sitter-javascript: - specifier: ^0.25.0 + specifier: 'catalog:' version: 0.25.0 tree-sitter-python: - specifier: ^0.25.0 + specifier: 'catalog:' version: 0.25.0 tree-sitter-typescript: - specifier: ^0.23.0 + specifier: 'catalog:' version: 0.23.2 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) web-tree-sitter: - specifier: ^0.26.3 - version: 0.26.3 + specifier: 'catalog:' + version: 0.26.7 packages/eslint-plugin-typespec: dependencies: '@typescript-eslint/utils': - specifier: ^8.27.0 - version: 8.53.1(eslint@9.39.2)(typescript@5.9.3) + specifier: 'catalog:' + version: 8.57.0(eslint@10.0.3)(typescript@5.9.3) devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typescript-eslint/parser': - specifier: ^8.49.0 - version: 8.53.1(eslint@9.39.2)(typescript@5.9.3) + specifier: 'catalog:' + version: 8.57.0(eslint@10.0.3)(typescript@5.9.3) '@typescript-eslint/rule-tester': - specifier: ^8.49.0 - version: 8.53.1(eslint@9.39.2)(typescript@5.9.3) + specifier: 'catalog:' + version: 8.57.0(eslint@10.0.3)(typescript@5.9.3) '@typescript-eslint/types': - specifier: ^8.49.0 - version: 8.53.1 + specifier: 'catalog:' + version: 8.57.0 '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 eslint: - specifier: ^9.39.2 - version: 9.39.2 + specifier: 'catalog:' + version: 10.0.3 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/events: devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typespec/compiler': specifier: workspace:^ version: link:../compiler @@ -522,66 +1064,66 @@ importers: specifier: workspace:^ version: link:../tspd '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/html-program-viewer: dependencies: '@fluentui/react-components': - specifier: ~9.72.3 - version: 9.72.9(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) + specifier: 'catalog:' + version: 9.73.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) '@fluentui/react-icons': - specifier: ^2.0.292 - version: 2.0.316(react@19.2.3) + specifier: 'catalog:' + version: 2.0.323(react@19.2.4) '@fluentui/react-list': - specifier: ^9.1.2 - version: 9.6.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) + specifier: 'catalog:' + version: 9.6.12(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) react: - specifier: ~19.2.3 - version: 19.2.3 + specifier: 'catalog:' + version: 19.2.4 react-dom: - specifier: ~19.2.3 - version: 19.2.3(react@19.2.3) + specifier: 'catalog:' + version: 19.2.4(react@19.2.4) react-hotkeys-hook: - specifier: ^5.1.0 - version: 5.2.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + specifier: 'catalog:' + version: 5.2.4(react-dom@19.2.4(react@19.2.4))(react@19.2.4) devDependencies: '@babel/core': - specifier: ^7.26.10 - version: 7.28.6 + specifier: 'catalog:' + version: 7.29.0 '@testing-library/dom': - specifier: ^10.4.0 + specifier: 'catalog:' version: 10.4.1 '@testing-library/jest-dom': - specifier: ^6.6.3 + specifier: 'catalog:' version: 6.9.1 '@testing-library/react': - specifier: ^16.2.0 - version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + specifier: 'catalog:' + version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@types/react': - specifier: ~19.2.7 - version: 19.2.9 + specifier: 'catalog:' + version: 19.2.14 '@types/react-dom': - specifier: ~19.2.2 - version: 19.2.3(@types/react@19.2.9) + specifier: 'catalog:' + version: 19.2.3(@types/react@19.2.14) '@typespec/compiler': specifier: workspace:^ version: link:../compiler @@ -589,44 +1131,41 @@ importers: specifier: workspace:^ version: link:../react-components '@vitejs/plugin-react': - specifier: ~5.1.2 - version: 5.1.2(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) + specifier: 'catalog:' + version: 6.0.1(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vite: - specifier: ^7.2.7 - version: 7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3) vite-plugin-checker: - specifier: ^0.12.0 - version: 0.12.0(eslint@9.39.2)(optionator@0.9.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) + specifier: 'catalog:' + version: 0.12.0(eslint@10.0.3)(optionator@0.9.4)(typescript@5.9.3)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) vite-plugin-dts: - specifier: 4.5.4 - version: 4.5.4(@types/node@25.0.9)(rollup@4.49.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) - vite-plugin-node-polyfills: - specifier: ^0.25.0 - version: 0.25.0(rollup@4.49.0)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) + specifier: 'catalog:' + version: 4.5.4(@types/node@25.5.0)(rollup@4.60.0)(typescript@5.9.3)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/http: devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typespec/compiler': specifier: workspace:^ version: link:../compiler @@ -640,23 +1179,23 @@ importers: specifier: workspace:^ version: link:../tspd '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/http-canonicalization: dependencies: @@ -674,32 +1213,32 @@ importers: version: link:../mutator-framework devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 concurrently: - specifier: ^9.1.2 + specifier: 'catalog:' version: 9.2.1 prettier: - specifier: ~3.8.0 - version: 3.8.0 + specifier: 'catalog:' + version: 3.8.1 packages/http-client: devDependencies: '@alloy-js/cli': - specifier: ^0.22.0 + specifier: 'catalog:' version: 0.22.0 '@alloy-js/core': - specifier: ^0.22.0 + specifier: 'catalog:' version: 0.22.0 '@alloy-js/rollup-plugin': - specifier: ^0.1.0 - version: 0.1.0(@babel/core@7.28.6)(@types/babel__core@7.20.5)(rollup@4.49.0) + specifier: 'catalog:' + version: 0.1.0(@babel/core@7.29.0)(@types/babel__core@7.20.5)(rollup@4.60.0) '@alloy-js/typescript': - specifier: ^0.22.0 + specifier: 'catalog:' version: 0.22.0 '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typespec/compiler': specifier: workspace:^ version: link:../compiler @@ -715,26 +1254,20 @@ importers: '@typespec/tspd': specifier: workspace:^ version: link:../tspd - eslint: - specifier: ^9.39.2 - version: 9.39.2 - prettier: - specifier: ~3.8.0 - version: 3.8.0 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/http-client-js: dependencies: '@alloy-js/core': - specifier: ^0.22.0 + specifier: 'catalog:' version: 0.22.0 '@alloy-js/typescript': - specifier: ^0.22.0 + specifier: 'catalog:' version: 0.22.0 '@typespec/compiler': specifier: workspace:^ @@ -749,17 +1282,17 @@ importers: specifier: workspace:^ version: link:../rest prettier: - specifier: ~3.8.0 - version: 3.8.0 + specifier: 'catalog:' + version: 3.8.1 devDependencies: '@alloy-js/cli': - specifier: ^0.22.0 + specifier: 'catalog:' version: 0.22.0 '@alloy-js/rollup-plugin': - specifier: ^0.1.0 - version: 0.1.0(@babel/core@7.28.6)(@types/babel__core@7.20.5)(rollup@4.49.0) + specifier: 'catalog:' + version: 0.1.0(@babel/core@7.29.0)(@types/babel__core@7.20.5)(rollup@4.60.0) '@types/yargs': - specifier: ~17.0.33 + specifier: 'catalog:' version: 17.0.35 '@typespec/http': specifier: workspace:^ @@ -771,8 +1304,8 @@ importers: specifier: workspace:^ version: link:../spector '@typespec/ts-http-runtime': - specifier: 0.3.2 - version: 0.3.2 + specifier: 'catalog:' + version: 0.3.4 '@typespec/tspd': specifier: workspace:^ version: link:../tspd @@ -780,49 +1313,49 @@ importers: specifier: workspace:^ version: link:../versioning '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) change-case: - specifier: ~5.4.4 + specifier: 'catalog:' version: 5.4.4 concurrently: - specifier: ^9.1.2 + specifier: 'catalog:' version: 9.2.1 cross-env: - specifier: ~10.1.0 + specifier: 'catalog:' version: 10.1.0 execa: - specifier: ^9.6.1 + specifier: 'catalog:' version: 9.6.1 fs-extra: - specifier: ^11.2.0 - version: 11.3.3 + specifier: 'catalog:' + version: 11.3.4 globby: - specifier: ~16.1.0 - version: 16.1.0 + specifier: 'catalog:' + version: 16.1.1 inquirer: - specifier: ^13.1.0 - version: 13.2.0(@types/node@25.0.9) + specifier: 'catalog:' + version: 13.3.0(@types/node@25.5.0) ora: - specifier: ^9.0.0 - version: 9.0.0 + specifier: 'catalog:' + version: 9.3.0 p-limit: - specifier: ^7.1.1 - version: 7.2.0 + specifier: 'catalog:' + version: 7.3.0 picocolors: - specifier: ~1.1.1 + specifier: 'catalog:' version: 1.1.1 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 uri-template: - specifier: ^2.0.0 + specifier: 'catalog:' version: 2.0.0 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) yargs: - specifier: ~18.0.0 + specifier: 'catalog:' version: 18.0.0 packages/http-server-csharp: @@ -831,29 +1364,29 @@ importers: specifier: workspace:^ version: link:../asset-emitter change-case: - specifier: ~5.4.4 + specifier: 'catalog:' version: 5.4.4 cross-spawn: - specifier: ^7.0.6 + specifier: 'catalog:' version: 7.0.6 picocolors: - specifier: ~1.1.1 + specifier: 'catalog:' version: 1.1.1 yaml: - specifier: ~2.8.2 + specifier: 'catalog:' version: 2.8.2 yargs: - specifier: ~18.0.0 + specifier: 'catalog:' version: 18.0.0 devDependencies: '@types/cross-spawn': - specifier: ~6.0.6 + specifier: 'catalog:' version: 6.0.6 '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@types/yargs': - specifier: ~17.0.33 + specifier: 'catalog:' version: 17.0.35 '@typespec/compiler': specifier: workspace:^ @@ -889,56 +1422,56 @@ importers: specifier: workspace:^ version: link:../versioning '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) fs-extra: - specifier: ^11.2.0 - version: 11.3.3 + specifier: 'catalog:' + version: 11.3.4 globby: - specifier: ~16.1.0 - version: 16.1.0 + specifier: 'catalog:' + version: 16.1.1 inquirer: - specifier: ^13.1.0 - version: 13.2.0(@types/node@25.0.9) + specifier: 'catalog:' + version: 13.3.0(@types/node@25.5.0) ora: - specifier: ^9.0.0 - version: 9.0.0 + specifier: 'catalog:' + version: 9.3.0 p-limit: - specifier: ^7.1.1 - version: 7.2.0 + specifier: 'catalog:' + version: 7.3.0 pathe: - specifier: ^2.0.3 + specifier: 'catalog:' version: 2.0.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) packages/http-server-js: dependencies: prettier: - specifier: ~3.8.0 - version: 3.8.0 + specifier: 'catalog:' + version: 3.8.1 yaml: - specifier: ~2.8.2 + specifier: 'catalog:' version: 2.8.2 devDependencies: '@types/express': - specifier: ^5.0.6 + specifier: 'catalog:' version: 5.0.6 '@types/morgan': - specifier: ^1.9.9 + specifier: 'catalog:' version: 1.9.10 '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@types/swagger-ui-express': - specifier: ^4.1.8 + specifier: 'catalog:' version: 4.1.8 '@typespec/compiler': specifier: workspace:^ @@ -962,58 +1495,58 @@ importers: specifier: workspace:^ version: link:../tspd '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) decimal.js: - specifier: ^10.5.0 + specifier: 'catalog:' version: 10.6.0 express: - specifier: ^5.2.1 + specifier: 'catalog:' version: 5.2.1 fs-extra: - specifier: ^11.2.0 - version: 11.3.3 + specifier: 'catalog:' + version: 11.3.4 globby: - specifier: ~16.1.0 - version: 16.1.0 + specifier: 'catalog:' + version: 16.1.1 inquirer: - specifier: ^13.1.0 - version: 13.2.0(@types/node@25.0.9) + specifier: 'catalog:' + version: 13.3.0(@types/node@25.5.0) morgan: - specifier: ^1.10.0 + specifier: 'catalog:' version: 1.10.1 ora: - specifier: ^9.0.0 - version: 9.0.0 + specifier: 'catalog:' + version: 9.3.0 p-limit: - specifier: ^7.1.1 - version: 7.2.0 + specifier: 'catalog:' + version: 7.3.0 pathe: - specifier: ^2.0.3 + specifier: 'catalog:' version: 2.0.3 picocolors: - specifier: ~1.1.1 + specifier: 'catalog:' version: 1.1.1 swagger-ui-express: - specifier: ^5.0.1 + specifier: 'catalog:' version: 5.0.1(express@5.2.1) temporal-polyfill: - specifier: ^0.3.0 - version: 0.3.0 + specifier: 'catalog:' + version: 0.3.2 tsx: - specifier: ^4.21.0 + specifier: 'catalog:' version: 4.21.0 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) yargs: - specifier: ~18.0.0 + specifier: 'catalog:' version: 18.0.0 packages/http-specs: @@ -1040,18 +1573,18 @@ importers: specifier: workspace:^ version: link:../xml deep-equal: - specifier: ^2.2.0 + specifier: 'catalog:' version: 2.2.3 devDependencies: '@types/deep-equal': - specifier: ^1.0.1 + specifier: 'catalog:' version: 1.0.4 '@types/multer': - specifier: ^2.0.0 - version: 2.0.0 + specifier: 'catalog:' + version: 2.1.0 '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typespec/json-schema': specifier: workspace:^ version: link:../json-schema @@ -1062,69 +1595,69 @@ importers: specifier: workspace:^ version: link:../openapi3 concurrently: - specifier: ^9.1.2 + specifier: 'catalog:' version: 9.2.1 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 packages/internal-build-utils: dependencies: '@pnpm/workspace.find-packages': - specifier: ^1000.0.24 - version: 1000.0.55(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0) + specifier: 'catalog:' + version: 1000.0.64(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0) cross-spawn: - specifier: ^7.0.6 + specifier: 'catalog:' version: 7.0.6 cspell: - specifier: ^9.4.0 - version: 9.6.0 + specifier: 'catalog:' + version: 9.7.0 semver: - specifier: ^7.7.1 - version: 7.7.3 + specifier: 'catalog:' + version: 7.7.4 strip-json-comments: - specifier: ~5.0.1 + specifier: 'catalog:' version: 5.0.3 yargs: - specifier: ~18.0.0 + specifier: 'catalog:' version: 18.0.0 devDependencies: '@types/cross-spawn': - specifier: ~6.0.6 + specifier: 'catalog:' version: 6.0.6 '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@types/semver': - specifier: ^7.5.8 + specifier: 'catalog:' version: 7.7.1 '@types/yargs': - specifier: ~17.0.33 + specifier: 'catalog:' version: 17.0.35 '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 chokidar: - specifier: ~5.0.0 + specifier: 'catalog:' version: 5.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/json-schema: dependencies: @@ -1132,12 +1665,12 @@ importers: specifier: workspace:^ version: link:../asset-emitter yaml: - specifier: ~2.8.2 + specifier: 'catalog:' version: 2.8.2 devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typespec/compiler': specifier: workspace:^ version: link:../compiler @@ -1151,108 +1684,108 @@ importers: specifier: workspace:^ version: link:../tspd '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) ajv: - specifier: ~8.17.1 - version: 8.17.1 + specifier: 'catalog:' + version: 8.18.0 ajv-formats: - specifier: ~3.0.1 - version: 3.0.1(ajv@8.17.1) + specifier: 'catalog:' + version: 3.0.1(ajv@8.18.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) packages/library-linter: devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typespec/compiler': specifier: workspace:^ version: link:../compiler '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/monarch: dependencies: monaco-editor-core: - specifier: ^0.55.0 + specifier: 'catalog:' version: 0.55.1 devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 happy-dom: - specifier: ^20.0.11 - version: 20.3.4 + specifier: 'catalog:' + version: 20.8.9 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/mutator-framework: devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typespec/compiler': specifier: workspace:^ version: link:../compiler concurrently: - specifier: ^9.1.2 + specifier: 'catalog:' version: 9.2.1 prettier: - specifier: ~3.8.0 - version: 3.8.0 + specifier: 'catalog:' + version: 3.8.1 packages/openapi: devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typespec/compiler': specifier: workspace:^ version: link:../compiler @@ -1269,47 +1802,47 @@ importers: specifier: workspace:^ version: link:../tspd '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/openapi3: dependencies: '@scalar/json-magic': - specifier: ^0.9.1 - version: 0.9.1 + specifier: 'catalog:' + version: 0.11.7 '@scalar/openapi-parser': - specifier: ^0.24.1 - version: 0.24.1 + specifier: 'catalog:' + version: 0.24.17 '@scalar/openapi-types': - specifier: ^0.5.0 - version: 0.5.3 + specifier: 'catalog:' + version: 0.5.4 '@typespec/asset-emitter': specifier: workspace:^ version: link:../asset-emitter yaml: - specifier: ~2.8.2 + specifier: 'catalog:' version: 2.8.2 devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@types/yargs': - specifier: ~17.0.33 + specifier: 'catalog:' version: 17.0.35 '@typespec/compiler': specifier: workspace:^ @@ -1348,26 +1881,26 @@ importers: specifier: workspace:^ version: link:../xml '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 cross-env: - specifier: ~10.1.0 + specifier: 'catalog:' version: 10.1.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) packages/pack: dependencies: @@ -1375,45 +1908,45 @@ importers: specifier: workspace:^ version: link:../compiler picocolors: - specifier: ~1.1.1 + specifier: 'catalog:' version: 1.1.1 devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 source-map-support: - specifier: ~0.5.21 + specifier: 'catalog:' version: 0.5.21 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vite: - specifier: ^7.2.7 - version: 7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3) vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/playground: dependencies: '@fluentui/react-components': - specifier: ~9.72.3 - version: 9.72.9(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) + specifier: 'catalog:' + version: 9.73.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) '@fluentui/react-icons': - specifier: ^2.0.292 - version: 2.0.316(react@19.2.3) + specifier: 'catalog:' + version: 2.0.323(react@19.2.4) '@typespec/bundler': specifier: workspace:^ version: link:../bundler @@ -1442,105 +1975,120 @@ importers: specifier: workspace:^ version: link:../versioning clsx: - specifier: ^2.1.1 + specifier: 'catalog:' version: 2.1.1 debounce: - specifier: ~3.0.0 + specifier: 'catalog:' version: 3.0.0 lzutf8: - specifier: 0.6.3 + specifier: 'catalog:' version: 0.6.3 monaco-editor: - specifier: ~0.55.0 + specifier: 'catalog:' version: 0.55.1 react: - specifier: ~19.2.3 - version: 19.2.3 + specifier: 'catalog:' + version: 19.2.4 react-dom: - specifier: ~19.2.3 - version: 19.2.3(react@19.2.3) + specifier: 'catalog:' + version: 19.2.4(react@19.2.4) react-error-boundary: - specifier: ^6.0.0 - version: 6.1.0(react@19.2.3) + specifier: 'catalog:' + version: 6.1.1(react@19.2.4) swagger-ui-dist: - specifier: ^5.20.1 - version: 5.31.0 + specifier: 'catalog:' + version: 5.32.0 vscode-languageserver: - specifier: ~9.0.1 + specifier: 'catalog:' version: 9.0.1 vscode-languageserver-textdocument: - specifier: ~1.0.12 + specifier: 'catalog:' version: 1.0.12 + yaml: + specifier: 'catalog:' + version: 2.8.2 devDependencies: '@babel/core': - specifier: ^7.26.10 - version: 7.28.6 + specifier: 'catalog:' + version: 7.29.0 '@playwright/test': - specifier: ^1.57.0 - version: 1.57.0 + specifier: 'catalog:' + version: 1.58.2 '@storybook/cli': - specifier: ^10.1.8 - version: 10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + specifier: 'catalog:' + version: 10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) '@storybook/react-vite': - specifier: ^10.1.8 - version: 10.1.11(esbuild@0.27.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(rollup@4.49.0)(storybook@10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) + specifier: 'catalog:' + version: 10.3.3(esbuild@0.27.4)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(rollup@4.60.0)(storybook@10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) + '@testing-library/dom': + specifier: 'catalog:' + version: 10.4.1 + '@testing-library/jest-dom': + specifier: 'catalog:' + version: 6.9.1 + '@testing-library/react': + specifier: 'catalog:' + version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) '@types/debounce': - specifier: ~1.2.4 + specifier: 'catalog:' version: 1.2.4 '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@types/react': - specifier: ~19.2.7 - version: 19.2.9 + specifier: 'catalog:' + version: 19.2.14 '@types/react-dom': - specifier: ~19.2.2 - version: 19.2.3(@types/react@19.2.9) + specifier: 'catalog:' + version: 19.2.3(@types/react@19.2.14) '@types/swagger-ui-dist': - specifier: ~3.30.5 + specifier: 'catalog:' version: 3.30.6 '@typespec/react-components': specifier: workspace:^ version: link:../react-components '@vitejs/plugin-react': - specifier: ~5.1.2 - version: 5.1.2(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) + specifier: 'catalog:' + version: 6.0.1(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 cross-env: - specifier: ~10.1.0 + specifier: 'catalog:' version: 10.1.0 es-module-shims: - specifier: ~2.8.0 + specifier: 'catalog:' version: 2.8.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 storybook: - specifier: ^10.1.8 - version: 10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + specifier: 'catalog:' + version: 10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vite: - specifier: ^7.2.7 - version: 7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2) vite-plugin-checker: - specifier: ^0.12.0 - version: 0.12.0(eslint@9.39.2)(optionator@0.9.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) + specifier: 'catalog:' + version: 0.12.0(eslint@10.0.3)(optionator@0.9.4)(typescript@5.9.3)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) vite-plugin-dts: - specifier: 4.5.4 - version: 4.5.4(@types/node@25.0.9)(rollup@4.49.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) + specifier: 'catalog:' + version: 4.5.4(@types/node@25.5.0)(rollup@4.60.0)(typescript@5.9.3)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) + vitest: + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) packages/playground-website: dependencies: '@fluentui/react-components': - specifier: ~9.72.3 - version: 9.72.9(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) + specifier: 'catalog:' + version: 9.73.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) '@fluentui/react-icons': - specifier: ^2.0.292 - version: 2.0.316(react@19.2.3) + specifier: 'catalog:' + version: 2.0.323(react@19.2.4) '@typespec/compiler': specifier: workspace:^ version: link:../compiler @@ -1587,78 +2135,75 @@ importers: specifier: workspace:^ version: link:../xml es-module-shims: - specifier: ~2.8.0 + specifier: 'catalog:' version: 2.8.0 react: - specifier: ~19.2.3 - version: 19.2.3 + specifier: 'catalog:' + version: 19.2.4 react-dom: - specifier: ~19.2.3 - version: 19.2.3(react@19.2.3) + specifier: 'catalog:' + version: 19.2.4(react@19.2.4) devDependencies: '@babel/core': - specifier: ^7.26.10 - version: 7.28.6 + specifier: 'catalog:' + version: 7.29.0 '@playwright/test': - specifier: ^1.57.0 - version: 1.57.0 + specifier: 'catalog:' + version: 1.58.2 '@types/debounce': - specifier: ~1.2.4 + specifier: 'catalog:' version: 1.2.4 '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@types/react': - specifier: ~19.2.7 - version: 19.2.9 + specifier: 'catalog:' + version: 19.2.14 '@types/react-dom': - specifier: ~19.2.2 - version: 19.2.3(@types/react@19.2.9) + specifier: 'catalog:' + version: 19.2.3(@types/react@19.2.14) '@types/swagger-ui': - specifier: ~5.21.1 - version: 5.21.1 + specifier: 'catalog:' + version: 5.32.0 '@vitejs/plugin-react': - specifier: ~5.1.2 - version: 5.1.2(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) + specifier: 'catalog:' + version: 6.0.1(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 cross-env: - specifier: ~10.1.0 + specifier: 'catalog:' version: 10.1.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 rollup-plugin-visualizer: - specifier: ~6.0.3 - version: 6.0.5(rollup@4.49.0) + specifier: 'catalog:' + version: 6.0.4(rolldown@1.0.0-rc.10)(rollup@4.60.0) typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vite: - specifier: ^7.2.7 - version: 7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3) vite-plugin-dts: - specifier: 4.5.4 - version: 4.5.4(@types/node@25.0.9)(rollup@4.49.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) - vite-plugin-node-polyfills: - specifier: ^0.25.0 - version: 0.25.0(rollup@4.49.0)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) + specifier: 'catalog:' + version: 4.5.4(@types/node@25.5.0)(rollup@4.60.0)(typescript@5.9.3)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/prettier-plugin-typespec: dependencies: prettier: - specifier: ~3.8.0 - version: 3.8.0 + specifier: 'catalog:' + version: 3.8.1 devDependencies: '@typespec/compiler': specifier: workspace:^ @@ -1667,20 +2212,20 @@ importers: specifier: workspace:^ version: link:../internal-build-utils esbuild: - specifier: ^0.27.0 - version: 0.27.2 + specifier: 'catalog:' + version: 0.27.4 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/protobuf: devDependencies: '@types/micromatch': - specifier: ^4.0.9 + specifier: 'catalog:' version: 4.0.10 '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typespec/compiler': specifier: workspace:^ version: link:../compiler @@ -1688,99 +2233,99 @@ importers: specifier: workspace:^ version: link:../tspd '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 micromatch: - specifier: ^4.0.8 + specifier: 'catalog:' version: 4.0.8 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/react-components: dependencies: '@fluentui/react-components': - specifier: ~9.72.3 - version: 9.72.9(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) + specifier: 'catalog:' + version: 9.73.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) '@fluentui/react-icons': - specifier: ^2.0.292 - version: 2.0.316(react@19.2.3) + specifier: 'catalog:' + version: 2.0.323(react@19.2.4) react: - specifier: ~19.2.3 - version: 19.2.3 + specifier: 'catalog:' + version: 19.2.4 react-dom: - specifier: ~19.2.3 - version: 19.2.3(react@19.2.3) + specifier: 'catalog:' + version: 19.2.4(react@19.2.4) devDependencies: '@babel/core': - specifier: ^7.26.10 - version: 7.28.6 + specifier: 'catalog:' + version: 7.29.0 '@testing-library/dom': - specifier: ^10.4.0 + specifier: 'catalog:' version: 10.4.1 '@testing-library/jest-dom': - specifier: ^6.6.3 + specifier: 'catalog:' version: 6.9.1 '@testing-library/react': - specifier: ^16.2.0 - version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + specifier: 'catalog:' + version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@types/react': - specifier: ~19.2.7 - version: 19.2.9 + specifier: 'catalog:' + version: 19.2.14 '@types/react-dom': - specifier: ~19.2.2 - version: 19.2.3(@types/react@19.2.9) + specifier: 'catalog:' + version: 19.2.3(@types/react@19.2.14) '@vitejs/plugin-react': - specifier: ~5.1.2 - version: 5.1.2(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) + specifier: 'catalog:' + version: 6.0.1(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vite: - specifier: ^7.2.7 - version: 7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3) vite-plugin-checker: - specifier: ^0.12.0 - version: 0.12.0(eslint@9.39.2)(optionator@0.9.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) + specifier: 'catalog:' + version: 0.12.0(eslint@10.0.3)(optionator@0.9.4)(typescript@5.9.3)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) vite-plugin-dts: - specifier: 4.5.4 - version: 4.5.4(@types/node@25.0.9)(rollup@4.49.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) + specifier: 'catalog:' + version: 4.5.4(@types/node@25.5.0)(rollup@4.60.0)(typescript@5.9.3)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/rest: devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typespec/compiler': specifier: workspace:^ version: link:../compiler @@ -1794,23 +2339,23 @@ importers: specifier: workspace:^ version: link:../tspd '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/samples: dependencies: @@ -1861,160 +2406,163 @@ importers: version: link:../versioning devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typespec/internal-build-utils': specifier: workspace:^ version: link:../internal-build-utils '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) cross-env: - specifier: ~10.1.0 + specifier: 'catalog:' version: 10.1.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/spec: devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typespec/internal-build-utils': specifier: workspace:^ version: link:../internal-build-utils ecmarkup: - specifier: ~22.0.0 - version: 22.0.0 + specifier: 'catalog:' + version: 23.0.2 packages/spec-api: dependencies: deep-equal: - specifier: ^2.2.0 + specifier: 'catalog:' version: 2.2.3 express: - specifier: ^5.2.1 + specifier: 'catalog:' version: 5.2.1 xml2js: - specifier: ^0.6.2 + specifier: 'catalog:' version: 0.6.2 devDependencies: '@types/deep-equal': - specifier: ^1.0.1 + specifier: 'catalog:' version: 1.0.4 '@types/express': - specifier: ^5.0.6 + specifier: 'catalog:' version: 5.0.6 '@types/multer': - specifier: ^2.0.0 - version: 2.0.0 + specifier: 'catalog:' + version: 2.1.0 '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@types/xml2js': - specifier: ^0.4.11 + specifier: 'catalog:' version: 0.4.14 '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/spec-coverage-sdk: dependencies: '@azure/identity': - specifier: ~4.13.0 + specifier: 'catalog:' version: 4.13.0 '@azure/storage-blob': - specifier: ~12.30.0 - version: 12.30.0 + specifier: 'catalog:' + version: 12.31.0 '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 + '@types/semver': + specifier: 'catalog:' + version: 7.7.1 + semver: + specifier: 'catalog:' + version: 7.7.4 devDependencies: rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 packages/spec-dashboard: dependencies: - '@emotion/react': - specifier: ^11.14.0 - version: 11.14.0(@types/react@19.2.9)(react@19.2.3) '@fluentui/react-components': - specifier: ~9.72.3 - version: 9.72.9(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) + specifier: 'catalog:' + version: 9.73.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) '@fluentui/react-icons': - specifier: ^2.0.292 - version: 2.0.316(react@19.2.3) + specifier: 'catalog:' + version: 2.0.323(react@19.2.4) '@typespec/spec-coverage-sdk': specifier: workspace:^ version: link:../spec-coverage-sdk react: - specifier: ~19.2.3 - version: 19.2.3 + specifier: 'catalog:' + version: 19.2.4 react-dom: - specifier: ~19.2.3 - version: 19.2.3(react@19.2.3) + specifier: 'catalog:' + version: 19.2.4(react@19.2.4) react-markdown: - specifier: ^10.1.0 - version: 10.1.0(@types/react@19.2.9)(react@19.2.3) + specifier: 'catalog:' + version: 10.1.0(@types/react@19.2.14)(react@19.2.4) devDependencies: '@types/react': - specifier: ~19.2.7 - version: 19.2.9 + specifier: 'catalog:' + version: 19.2.14 '@types/react-dom': - specifier: ~19.2.2 - version: 19.2.3(@types/react@19.2.9) + specifier: 'catalog:' + version: 19.2.3(@types/react@19.2.14) '@vitejs/plugin-react': - specifier: ~5.1.2 - version: 5.1.2(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) + specifier: 'catalog:' + version: 6.0.1(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 rollup-plugin-visualizer: - specifier: ~6.0.3 - version: 6.0.5(rollup@4.49.0) + specifier: 'catalog:' + version: 6.0.4(rolldown@1.0.0-rc.10)(rollup@4.60.0) typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vite: - specifier: ^7.2.7 - version: 7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3) vite-plugin-checker: - specifier: ^0.12.0 - version: 0.12.0(eslint@9.39.2)(optionator@0.9.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) + specifier: 'catalog:' + version: 0.12.0(eslint@10.0.3)(optionator@0.9.4)(typescript@5.9.3)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) vite-plugin-dts: - specifier: 4.5.4 - version: 4.5.4(@types/node@25.0.9)(rollup@4.49.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) + specifier: 'catalog:' + version: 4.5.4(@types/node@25.5.0)(rollup@4.60.0)(typescript@5.9.3)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/spector: dependencies: '@azure/identity': - specifier: ~4.13.0 + specifier: 'catalog:' version: 4.13.0 '@typespec/compiler': specifier: workspace:^ @@ -2035,87 +2583,87 @@ importers: specifier: workspace:^ version: link:../versioning ajv: - specifier: ~8.17.1 - version: 8.17.1 + specifier: 'catalog:' + version: 8.18.0 body-parser: - specifier: ^2.2.0 + specifier: 'catalog:' version: 2.2.2 deep-equal: - specifier: ^2.2.0 + specifier: 'catalog:' version: 2.2.3 express: - specifier: ^5.2.1 + specifier: 'catalog:' version: 5.2.1 globby: - specifier: ~16.1.0 - version: 16.1.0 + specifier: 'catalog:' + version: 16.1.1 micromatch: - specifier: ^4.0.8 + specifier: 'catalog:' version: 4.0.8 morgan: - specifier: ^1.10.0 + specifier: 'catalog:' version: 1.10.1 multer: - specifier: ^2.0.1 - version: 2.0.2 + specifier: 'catalog:' + version: 2.1.1 picocolors: - specifier: ~1.1.1 + specifier: 'catalog:' version: 1.1.1 source-map-support: - specifier: ~0.5.21 + specifier: 'catalog:' version: 0.5.21 xml2js: - specifier: ^0.6.2 + specifier: 'catalog:' version: 0.6.2 yaml: - specifier: ~2.8.2 + specifier: 'catalog:' version: 2.8.2 yargs: - specifier: ~18.0.0 + specifier: 'catalog:' version: 18.0.0 devDependencies: '@types/body-parser': - specifier: ^1.19.2 + specifier: 'catalog:' version: 1.19.6 '@types/deep-equal': - specifier: ^1.0.1 + specifier: 'catalog:' version: 1.0.4 '@types/express': - specifier: ^5.0.6 + specifier: 'catalog:' version: 5.0.6 '@types/micromatch': - specifier: ^4.0.9 + specifier: 'catalog:' version: 4.0.10 '@types/morgan': - specifier: ^1.9.9 + specifier: 'catalog:' version: 1.9.10 '@types/multer': - specifier: ^2.0.0 - version: 2.0.0 + specifier: 'catalog:' + version: 2.1.0 '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@types/xml2js': - specifier: ^0.4.11 + specifier: 'catalog:' version: 0.4.14 '@types/yargs': - specifier: ~17.0.33 + specifier: 'catalog:' version: 17.0.35 '@typespec/tspd': specifier: workspace:^ version: link:../tspd rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 packages/sse: devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typespec/compiler': specifier: workspace:^ version: link:../compiler @@ -2135,84 +2683,84 @@ importers: specifier: workspace:^ version: link:../tspd '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/standalone: dependencies: '@yarnpkg/core': - specifier: ^4.2.1 - version: 4.5.0(typanion@3.14.0) + specifier: 'catalog:' + version: 4.6.0(typanion@3.14.0) '@yarnpkg/fslib': - specifier: ^3.1.2 - version: 3.1.4 + specifier: 'catalog:' + version: 3.1.5 '@yarnpkg/plugin-nm': - specifier: ^4.0.6 - version: 4.0.8(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) + specifier: 'catalog:' + version: 4.0.8(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) '@yarnpkg/plugin-npm': - specifier: ^3.0.2 - version: 3.4.0(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)) + specifier: 'catalog:' + version: 3.4.1(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)) '@yarnpkg/plugin-pnp': - specifier: ^4.0.7 - version: 4.1.3(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) + specifier: 'catalog:' + version: 4.1.3(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 esbuild: - specifier: ^0.27.0 - version: 0.27.2 + specifier: 'catalog:' + version: 0.27.4 execa: - specifier: ^9.6.1 + specifier: 'catalog:' version: 9.6.1 ora: - specifier: ^9.0.0 - version: 9.0.0 + specifier: 'catalog:' + version: 9.3.0 postject: - specifier: 1.0.0-alpha.6 + specifier: 'catalog:' version: 1.0.0-alpha.6 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 tsx: - specifier: ^4.21.0 + specifier: 'catalog:' version: 4.21.0 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/streams: devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typespec/compiler': specifier: workspace:^ version: link:../compiler @@ -2223,127 +2771,167 @@ importers: specifier: workspace:^ version: link:../tspd '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/tmlanguage-generator: dependencies: onigasm: - specifier: ~2.2.5 + specifier: 'catalog:' version: 2.2.5 plist: - specifier: ~3.1.0 + specifier: 'catalog:' version: 3.1.0 devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@types/plist': - specifier: ~3.0.5 + specifier: 'catalog:' version: 3.0.5 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 + typescript: + specifier: 'catalog:' + version: 5.9.3 + + packages/tsp-integration: + dependencies: + '@pnpm/workspace.find-packages': + specifier: 'catalog:' + version: 1000.0.64(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0) + execa: + specifier: 'catalog:' + version: 9.6.1 + globby: + specifier: 'catalog:' + version: 16.1.1 + log-symbols: + specifier: 'catalog:' + version: 7.0.1 + ora: + specifier: 'catalog:' + version: 9.3.0 + pathe: + specifier: 'catalog:' + version: 2.0.3 + picocolors: + specifier: 'catalog:' + version: 1.1.1 + simple-git: + specifier: 'catalog:' + version: 3.33.0 + tar: + specifier: 'catalog:' + version: 7.5.11 + yaml: + specifier: 'catalog:' + version: 2.8.2 + devDependencies: typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 + vitest: + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) packages/tspd: dependencies: '@alloy-js/core': - specifier: ^0.22.0 + specifier: 'catalog:' version: 0.22.0 '@alloy-js/markdown': - specifier: ^0.22.0 + specifier: 'catalog:' version: 0.22.0 '@alloy-js/typescript': - specifier: ^0.22.0 + specifier: 'catalog:' version: 0.22.0 '@microsoft/api-extractor': - specifier: ^7.55.2 - version: 7.55.2(@types/node@25.0.9) + specifier: 'catalog:' + version: 7.57.7(@types/node@25.5.0) '@microsoft/api-extractor-model': - specifier: ^7.30.6 - version: 7.32.2(@types/node@25.0.9) + specifier: 'catalog:' + version: 7.33.4(@types/node@25.5.0) '@microsoft/tsdoc': - specifier: ^0.16.0 + specifier: 'catalog:' version: 0.16.0 '@microsoft/tsdoc-config': - specifier: ^0.18.0 - version: 0.18.0 + specifier: 'catalog:' + version: 0.18.1 '@typespec/compiler': specifier: workspace:^ version: link:../compiler picocolors: - specifier: ~1.1.1 + specifier: 'catalog:' version: 1.1.1 prettier: - specifier: ~3.8.0 - version: 3.8.0 + specifier: 'catalog:' + version: 3.8.1 typedoc: - specifier: ^0.28.1 - version: 0.28.16(typescript@5.9.3) + specifier: 'catalog:' + version: 0.28.17(typescript@5.9.3) typedoc-plugin-markdown: - specifier: ^4.5.2 - version: 4.9.0(typedoc@0.28.16(typescript@5.9.3)) + specifier: 'catalog:' + version: 4.10.0(typedoc@0.28.17(typescript@5.9.3)) yaml: - specifier: ~2.8.2 + specifier: 'catalog:' version: 2.8.2 yargs: - specifier: ~18.0.0 + specifier: 'catalog:' version: 18.0.0 devDependencies: '@alloy-js/cli': - specifier: ^0.22.0 + specifier: 'catalog:' version: 0.22.0 '@alloy-js/rollup-plugin': - specifier: ^0.1.0 - version: 0.1.0(@babel/core@7.28.6)(@types/babel__core@7.20.5)(rollup@4.49.0) + specifier: 'catalog:' + version: 0.1.0(@babel/core@7.29.0)(@types/babel__core@7.20.5)(rollup@4.60.0) '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@types/yargs': - specifier: ~17.0.33 + specifier: 'catalog:' version: 17.0.35 '@typespec/prettier-plugin-typespec': specifier: workspace:^ version: link:../prettier-plugin-typespec '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 source-map-support: - specifier: ~0.5.21 + specifier: 'catalog:' version: 0.5.21 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) packages/typespec-vs: devDependencies: @@ -2357,22 +2945,19 @@ importers: packages/typespec-vscode: devDependencies: '@types/cross-spawn': - specifier: ~6.0.6 + specifier: 'catalog:' version: 6.0.6 - '@types/mocha': - specifier: ^10.0.9 - version: 10.0.10 '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@types/semver': - specifier: ^7.5.8 + specifier: 'catalog:' version: 7.7.1 '@types/vscode': - specifier: ~1.108.1 - version: 1.108.1 + specifier: ~1.110.0 + version: 1.110.0 '@types/which': - specifier: ^3.0.4 + specifier: 'catalog:' version: 3.0.4 '@typespec/compiler': specifier: workspace:^ @@ -2381,71 +2966,68 @@ importers: specifier: workspace:^ version: link:../internal-build-utils '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vscode/extension-telemetry': - specifier: ^1.0.0 - version: 1.2.0(tslib@2.8.1) + specifier: 'catalog:' + version: 1.5.1(tslib@2.8.1) '@vscode/test-electron': - specifier: ^2.3.9 + specifier: 'catalog:' version: 2.5.2 '@vscode/test-web': - specifier: ^0.0.78 - version: 0.0.78 + specifier: 'catalog:' + version: 0.0.80 '@vscode/vsce': - specifier: ~3.7.1 + specifier: 'catalog:' version: 3.7.1 ajv: - specifier: ~8.17.1 - version: 8.17.1 + specifier: 'catalog:' + version: 8.18.0 c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 cross-spawn: - specifier: ^7.0.6 + specifier: 'catalog:' version: 7.0.6 esbuild: - specifier: ^0.27.0 - version: 0.27.2 - mocha: - specifier: ^11.1.0 - version: 11.7.5 + specifier: 'catalog:' + version: 0.27.4 playwright: - specifier: ^1.57.0 - version: 1.57.0 + specifier: 'catalog:' + version: 1.58.2 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 semver: - specifier: ^7.7.1 - version: 7.7.3 + specifier: 'catalog:' + version: 7.7.4 swagger-ui-dist: - specifier: ^5.20.1 - version: 5.31.0 + specifier: 'catalog:' + version: 5.32.0 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) vscode-languageclient: - specifier: ~9.0.1 + specifier: 'catalog:' version: 9.0.1 which: - specifier: ^6.0.0 - version: 6.0.0 + specifier: 'catalog:' + version: 6.0.1 yaml: - specifier: ~2.8.2 + specifier: 'catalog:' version: 2.8.2 packages/versioning: devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typespec/compiler': specifier: workspace:^ version: link:../compiler @@ -2456,29 +3038,29 @@ importers: specifier: workspace:^ version: link:../tspd '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) packages/xml: devDependencies: '@types/node': - specifier: ~25.0.2 - version: 25.0.9 + specifier: 'catalog:' + version: 25.5.0 '@typespec/compiler': specifier: workspace:^ version: link:../compiler @@ -2489,50 +3071,50 @@ importers: specifier: workspace:^ version: link:../tspd '@vitest/coverage-v8': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) '@vitest/ui': - specifier: ^4.0.15 - version: 4.0.17(vitest@4.0.17) + specifier: 'catalog:' + version: 4.1.0(vitest@4.1.0) c8: - specifier: ^10.1.3 - version: 10.1.3 + specifier: 'catalog:' + version: 11.0.0 rimraf: - specifier: ~6.1.2 - version: 6.1.2 + specifier: 'catalog:' + version: 6.1.3 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 vitest: - specifier: ^4.0.15 - version: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) website: dependencies: '@astrojs/check': - specifier: ^0.9.4 - version: 0.9.6(prettier-plugin-astro@0.14.1)(prettier@3.8.0)(typescript@5.9.3) + specifier: 'catalog:' + version: 0.9.7(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@5.9.3) '@astrojs/react': - specifier: ^4.4.2 - version: 4.4.2(@types/node@25.0.9)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(tsx@4.21.0)(yaml@2.8.2) + specifier: 'catalog:' + version: 5.0.0(@types/node@25.5.0)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(lightningcss@1.32.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(tsx@4.21.0)(yaml@2.8.3) '@astrojs/starlight': - specifier: ^0.37.0 - version: 0.37.3(astro@5.16.11(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0)(@types/node@25.0.9)(rollup@4.49.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)) + specifier: 'catalog:' + version: 0.38.1(astro@6.0.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0)(@types/node@25.5.0)(lightningcss@1.32.0)(rollup@4.60.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.3)) '@docsearch/css': - specifier: ^4.3.2 - version: 4.5.0 + specifier: 'catalog:' + version: 4.6.0 '@docsearch/js': - specifier: ^4.3.2 - version: 4.5.0 + specifier: 'catalog:' + version: 4.6.0 '@expressive-code/core': - specifier: ^0.41.2 - version: 0.41.6 + specifier: 'catalog:' + version: 0.41.7 '@fluentui/react-components': - specifier: ~9.72.3 - version: 9.72.9(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) + specifier: 'catalog:' + version: 9.73.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) '@fluentui/react-icons': - specifier: ^2.0.292 - version: 2.0.316(react@19.2.3) + specifier: 'catalog:' + version: 2.0.323(react@19.2.4) '@typespec/compiler': specifier: workspace:^ version: link:../packages/compiler @@ -2540,47 +3122,47 @@ importers: specifier: workspace:^ version: link:../packages/playground astro: - specifier: ^5.16.5 - version: 5.16.11(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0)(@types/node@25.0.9)(rollup@4.49.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2) + specifier: 'catalog:' + version: 6.0.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0)(@types/node@25.5.0)(lightningcss@1.32.0)(rollup@4.60.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.3) astro-rehype-relative-markdown-links: - specifier: ^0.18.1 - version: 0.18.1(astro@5.16.11(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0)(@types/node@25.0.9)(rollup@4.49.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)) + specifier: 'catalog:' + version: 0.18.1(astro@6.0.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0)(@types/node@25.5.0)(lightningcss@1.32.0)(rollup@4.60.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.3)) clsx: - specifier: ^2.1.1 + specifier: 'catalog:' version: 2.1.1 date-fns: - specifier: ^4.1.0 + specifier: 'catalog:' version: 4.1.0 es-module-shims: - specifier: ~2.8.0 + specifier: 'catalog:' version: 2.8.0 pathe: - specifier: ^2.0.3 + specifier: 'catalog:' version: 2.0.3 prism-react-renderer: - specifier: ^2.4.1 - version: 2.4.1(react@19.2.3) + specifier: 'catalog:' + version: 2.4.1(react@19.2.4) react: - specifier: ~19.2.3 - version: 19.2.3 + specifier: 'catalog:' + version: 19.2.4 react-dom: - specifier: ~19.2.3 - version: 19.2.3(react@19.2.3) + specifier: 'catalog:' + version: 19.2.4(react@19.2.4) sharp: - specifier: ^0.34.2 + specifier: 'catalog:' version: 0.34.5 typescript: - specifier: ~5.9.2 + specifier: 'catalog:' version: 5.9.3 devDependencies: '@types/react': - specifier: ~19.2.7 - version: 19.2.9 + specifier: 'catalog:' + version: 19.2.14 '@types/react-dom': - specifier: ~19.2.2 - version: 19.2.3(@types/react@19.2.9) + specifier: 'catalog:' + version: 19.2.3(@types/react@19.2.14) '@types/remark-heading-id': - specifier: ^1.0.0 + specifier: 'catalog:' version: 1.0.0 '@typespec/astro-utils': specifier: workspace:^ @@ -2640,70 +3222,67 @@ importers: specifier: workspace:^ version: link:../packages/xml astro-expressive-code: - specifier: ^0.41.2 - version: 0.41.6(astro@5.16.11(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0)(@types/node@25.0.9)(rollup@4.49.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)) + specifier: 'catalog:' + version: 0.41.7(astro@6.0.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0)(@types/node@25.5.0)(lightningcss@1.32.0)(rollup@4.60.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.3)) rehype-mermaid: - specifier: ^3.0.0 - version: 3.0.0(playwright@1.57.0) + specifier: 'catalog:' + version: 3.0.0(playwright@1.58.2) remark-heading-id: - specifier: ^1.0.1 + specifier: 'catalog:' version: 1.0.1 rimraf: - specifier: ~6.1.2 - version: 6.1.2 - vite-plugin-node-polyfills: - specifier: ^0.25.0 - version: 0.25.0(rollup@4.49.0)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) + specifier: 'catalog:' + version: 6.1.3 packages: '@adobe/css-tools@4.4.4': resolution: {integrity: sha512-Elp+iwUx5rN5+Y8xLt5/GRoG20WGoDCQ/1Fb+1LiGtvwbDavuSk0jhD/eZdckHAuzcDzccnkv+rEjyWfRx18gg==} - '@algolia/cache-browser-local-storage@4.25.3': - resolution: {integrity: sha512-J0vrnbIYmDIf9d9qQwBXaHn10VoQ/rA+2iBMr/idfsjHhL9I4h2pC9Dj1i0ggDLv9sPajbeVVh0BdC+mDbo7Tw==} + '@algolia/cache-browser-local-storage@4.27.0': + resolution: {integrity: sha512-YGog2s57sO20lvpa+hv5XLAAmiTI1kHsCMRtPVfiaOdIQnvRla21lfH08onqEbZihOPVI8GULwt79zQB2ymKzg==} - '@algolia/cache-common@4.25.3': - resolution: {integrity: sha512-dDls2jhGFdkGnoKwXADBnjosHKdKiwlY+tzaua5J0q9XJptn6DCBDUt3pg46GhTRz+64x08M+dyp8nNoV+3/Jw==} + '@algolia/cache-common@4.27.0': + resolution: {integrity: sha512-Sr8zjNXj82p6lO4W9CdzfF0m0/9h/H6VAdSHOTtimm/cTzXIYXRI2IZq7+Nt2ljJ7Ukx+7dIFcxQjE57eQSPsw==} - '@algolia/cache-in-memory@4.25.3': - resolution: {integrity: sha512-6u/fVDr3ZIJIgtqdgUDB5kL9KcOdowmxf052bjfI1XhFTpxmIa49HcAEh1y2R0YqmmNDQHaPCT0QzwkINhWbug==} + '@algolia/cache-in-memory@4.27.0': + resolution: {integrity: sha512-abgMRTcVD0IllNvMM9JFhxtyLn1v6Ey7mQ7+BGS3JCzvkCX7KZqlS0BIuVUDgx9sPIfOeNsG/awGzMmP50TwZw==} - '@algolia/client-account@4.25.3': - resolution: {integrity: sha512-TkSVT5+davX4Dzt3gyEJ+SAfaVT5bHrZctAiup/AGPV7sNBigv4kuZv40OEbMMgu1uPJ4zw3tA39Oj/mOjd6gg==} + '@algolia/client-account@4.27.0': + resolution: {integrity: sha512-sSHxwrKTKJrwfoR/LcQJZfmiWJcM5d9Rp7afMChxOcdGdkSdIwrNBC8SCcHRenA3GsZ6mg+j6px7KWYxJ34btA==} - '@algolia/client-analytics@4.25.3': - resolution: {integrity: sha512-vHSU4zBaENbRjzwFYB3OQuDlKXwe+YDRgyGh1kKZhcMRDSsEBH/PGNWn+2ZmtbgrNS52TC+TJ8oUOg5wXIeISw==} + '@algolia/client-analytics@4.27.0': + resolution: {integrity: sha512-MqIDyxODljn9ZC4oqjQD0kez2a4zjIJ9ywA/b7cIiUiK/tDjZNTVjYd9WXMKQlXnWUwfrfXJZClVVqN1iCXS+Q==} - '@algolia/client-common@4.25.3': - resolution: {integrity: sha512-ExRdFnJDe7t1/DgJUsqjzZKeI9gkLft4oVttlyTMru8TRNWA6eZ0wHRj4uQ9N3sxmzPiw3C53wigor705n1yQw==} + '@algolia/client-common@4.27.0': + resolution: {integrity: sha512-ZrT6l/YPQgyIUuBCxcYPeXol2VBLUMuNb1rKXrm6z1f/iTiwqtnEEb16/6CC11+Re0ZGXrdcMVrgDRrzveQ1aQ==} - '@algolia/client-personalization@4.25.3': - resolution: {integrity: sha512-ycCkQ0nWoH+sf0Gh20kk4NfJ+iUBc59ailqNCFcVl/0th1dtHF0P61IGetTsSmxVPZedDvnHop2z1ujWpYzNmw==} + '@algolia/client-personalization@4.27.0': + resolution: {integrity: sha512-OZqaFFVm+10hAlmxpiTWi/o2n+YKBESbSqSy2yXAumPH/kaK4moJHFblbh8IkV3KZR0lLm4hzPtn8Q2nWNiDUA==} - '@algolia/client-search@4.25.3': - resolution: {integrity: sha512-GFA99zL6cfNSDEDHfEJ0TmVYmXCJofQpForFhCShQLfRQgBYud9UBHOh4LB6ZSzmtVDIfP33joCA9hxQWPIbFw==} + '@algolia/client-search@4.27.0': + resolution: {integrity: sha512-qmX/f67ay0eZ4V5Io8fWWOcUVo/gqre2yei1PnmEhQU2Gul6ushg25QnNrfu4BODiRrw1rwYveZaLCiHvcUxrQ==} - '@algolia/logger-common@4.25.3': - resolution: {integrity: sha512-RrlmuHNTc9CIgykWh37QduDAkpX4745KQ75I+vhgT5ER3BBykaYByDTyWkyFSSlZjpDHXtOymu9epNbI5V6OWQ==} + '@algolia/logger-common@4.27.0': + resolution: {integrity: sha512-pIrmQRXtDV+zTMVXKtKCosC2rWhn0F0TdUeb9etA6RiAz6jY6bY6f0+JX7YekDK09SnmZMLIyUa7Jci+Ied9bw==} - '@algolia/logger-console@4.25.3': - resolution: {integrity: sha512-s8AtfF9W+6Pbxfwkmzywd8ThVJ04D4JZlNyBdCuWpC5b3jzx1JAXT9ZL8K2faUsO4rEdHpy9LXMURvF7cQAE0w==} + '@algolia/logger-console@4.27.0': + resolution: {integrity: sha512-UWvta8BxsR/u5z9eI088mOSLQaGtmoCtXeN3DYJurlxAdJwPuKtEb5+433kxA6/E9f2/JgoW89KZ1vNP9pcHBQ==} - '@algolia/recommend@4.25.3': - resolution: {integrity: sha512-/vpXzDFLmrkcM1UOvZae8i/z8wRs2uaKKlPaHqN24ySADWKyf2zxVsDmtcaGMYzBYqYsKR1XKFvwGA5HQxaZxQ==} + '@algolia/recommend@4.27.0': + resolution: {integrity: sha512-CFy54xDjrsazPi3KN04yPmLRDT72AKokc3RLOdWQvG0/uEUjj7dhWqe9qenxpL4ydsjO7S1eY5YqmX+uMGonlg==} - '@algolia/requester-browser-xhr@4.25.3': - resolution: {integrity: sha512-5ZXO55IDqXUehQKilVYU6OdUBT2XGI+JIki2UsxUkMykH4ksA9EU8YZJth1ZwEYTDC50bVSH32VCYsOFB0MUTA==} + '@algolia/requester-browser-xhr@4.27.0': + resolution: {integrity: sha512-dTenMBIIpyp5o3C2ZnfbsuSlD/lL9jPkk6T+2+qm38fyw2nf49ANbcHFE79NgiGrnmw7QrYveCs9NIP3Wk4v6g==} - '@algolia/requester-common@4.25.3': - resolution: {integrity: sha512-n5dJA5jlIle5IQavlDWBXC46lw/VuwFbbknWJcPiJ6nJ6lRllpLOhV2ZJeUdCvRyg/6zG18h+9+Q/m2d/vLEIw==} + '@algolia/requester-common@4.27.0': + resolution: {integrity: sha512-VC3prAQVgWTubMStb3mJz6i61Hqbtagi2LeIbgNtoFJFff3XZDcAaO1D5r0GYl2+DrB2VzUHnQXbkiuI+HHYyg==} - '@algolia/requester-node-http@4.25.3': - resolution: {integrity: sha512-7BXWAyVMK1Z3gT+2RPv0I48HfaIlho3nCQaB/tjziw+DdPigHRDq+xjtdzL8y+5O1g7LEdlPI9QHAgDbW/BLXw==} + '@algolia/requester-node-http@4.27.0': + resolution: {integrity: sha512-y8nUqaUQeSOQ5oaNo0b2QPznyBFW9LoIwljyUphJ+gUZpU6O/j2/C8ovoqDpIe6J0etqHg5RCcBizrCFZuLpyw==} - '@algolia/transporter@4.25.3': - resolution: {integrity: sha512-2yji+TKjC1uOxhJ9pCdw7lQm6GSiQ+fMvNH4es6oz82DrBpkVHkeU49HmpyTqz8Ai9e+nW/UBz8T9+UyBul3dA==} + '@algolia/transporter@4.27.0': + resolution: {integrity: sha512-PvSbELU4VjN3xSX79ki+zIdOGhTxyJXWvRDzkUjfTx2iNfPWDdTjzKbP1o+268coJztxrkuBwJz90Urek7o1Kw==} '@alloy-js/babel-plugin-jsx-dom-expressions@0.39.1': resolution: {integrity: sha512-j9IaewDPFfi/b7b3VKknp1dZYuUeASghMdlPpHvHvR40mF9BLdp/xg+kjDdvAMqvSyI3hOzWTneijmX07SRE0w==} @@ -2754,20 +3333,23 @@ packages: '@asamuzakjp/css-color@3.2.0': resolution: {integrity: sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==} - '@astrojs/check@0.9.6': - resolution: {integrity: sha512-jlaEu5SxvSgmfGIFfNgcn5/f+29H61NJzEMfAZ82Xopr4XBchXB1GVlcJsE+elUlsYSbXlptZLX+JMG3b/wZEA==} + '@astrojs/check@0.9.7': + resolution: {integrity: sha512-dA7U5/OFg8/xaMUb2vUOOJuuJXnMpHy6F0BM8ZhL7WT5OkTBwJ0GoW38n4fC4CXt+lT9mLWL0y8Pa74tFByBpQ==} hasBin: true peerDependencies: typescript: ^5.0.0 - '@astrojs/compiler@2.13.0': - resolution: {integrity: sha512-mqVORhUJViA28fwHYaWmsXSzLO9osbdZ5ImUfxBarqsYdMlPbqAqGJCxsNzvppp1BEzc1mJNjOVvQqeDN8Vspw==} + '@astrojs/compiler@2.13.1': + resolution: {integrity: sha512-f3FN83d2G/v32ipNClRKgYv30onQlMZX1vCeZMjPsMMPl1mDpmbl0+N5BYo4S/ofzqJyS5hvwacEo0CCVDn/Qg==} - '@astrojs/internal-helpers@0.7.5': - resolution: {integrity: sha512-vreGnYSSKhAjFJCWAwe/CNhONvoc5lokxtRoZims+0wa3KbHBdPHSSthJsKxPd8d/aic6lWKpRTYGY/hsgK6EA==} + '@astrojs/compiler@3.0.0': + resolution: {integrity: sha512-MwAbDE5mawZ1SS+D8qWiHdprdME5Tlj2e0YjxnEICvcOpbSukNS7Sa7hA5PK+6RrmUr/t6Gi5YgrdZKjbO/WPQ==} - '@astrojs/language-server@2.16.3': - resolution: {integrity: sha512-yO5K7RYCMXUfeDlnU6UnmtnoXzpuQc0yhlaCNZ67k1C/MiwwwvMZz+LGa+H35c49w5QBfvtr4w4Zcf5PcH8uYA==} + '@astrojs/internal-helpers@0.8.0': + resolution: {integrity: sha512-J56GrhEiV+4dmrGLPNOl2pZjpHXAndWVyiVDYGDuw6MWKpBSEMLdFxHzeM/6sqaknw9M+HFfHZAcvi3OfT3D/w==} + + '@astrojs/language-server@2.16.4': + resolution: {integrity: sha512-42oqz9uX+hU1/rFniJvtYW9FbfZJ6syM2fYZFi7Ub71/kOvF1GSeMS8sA3Ogs3iOeNUWefk/ImwBiiHeNmJfSA==} hasBin: true peerDependencies: prettier: ^3.0.0 @@ -2778,42 +3360,42 @@ packages: prettier-plugin-astro: optional: true - '@astrojs/markdown-remark@6.3.10': - resolution: {integrity: sha512-kk4HeYR6AcnzC4QV8iSlOfh+N8TZ3MEStxPyenyCtemqn8IpEATBFMTJcfrNW32dgpt6MY3oCkMM/Tv3/I4G3A==} + '@astrojs/markdown-remark@7.0.0': + resolution: {integrity: sha512-jTAXHPy45L7o1ljH4jYV+ShtOHtyQUa1mGp3a5fJp1soX8lInuTJQ6ihmldHzVM4Q7QptU4SzIDIcKbBJO7sXQ==} - '@astrojs/mdx@4.3.13': - resolution: {integrity: sha512-IHDHVKz0JfKBy3//52JSiyWv089b7GVSChIXLrlUOoTLWowG3wr2/8hkaEgEyd/vysvNQvGk+QhysXpJW5ve6Q==} - engines: {node: 18.20.8 || ^20.3.0 || >=22.0.0} + '@astrojs/mdx@5.0.0': + resolution: {integrity: sha512-J4rW6eT+qgVw7+RXdBYO4vYyWGeXXQp8wop9dXsOlLzIsVSxyttMCgkGCWvIR2ogBqKqeYgI6YDW93PaDHkCaA==} + engines: {node: ^20.19.1 || >=22.12.0} peerDependencies: - astro: ^5.0.0 + astro: ^6.0.0-alpha.0 - '@astrojs/prism@3.3.0': - resolution: {integrity: sha512-q8VwfU/fDZNoDOf+r7jUnMC2//H2l0TuQ6FkGJL8vD8nw/q5KiL3DS1KKBI3QhI9UQhpJ5dc7AtqfbXWuOgLCQ==} - engines: {node: 18.20.8 || ^20.3.0 || >=22.0.0} + '@astrojs/prism@4.0.0': + resolution: {integrity: sha512-NndtNPpxaGinRpRytljGBvYHpTOwHycSZ/c+lQi5cHvkqqrHKWdkPEhImlODBNmbuB+vyQUNUDXyjzt66CihJg==} + engines: {node: ^20.19.1 || >=22.12.0} - '@astrojs/react@4.4.2': - resolution: {integrity: sha512-1tl95bpGfuaDMDn8O3x/5Dxii1HPvzjvpL2YTuqOOrQehs60I2DKiDgh1jrKc7G8lv+LQT5H15V6QONQ+9waeQ==} - engines: {node: 18.20.8 || ^20.3.0 || >=22.0.0} + '@astrojs/react@5.0.0': + resolution: {integrity: sha512-OuM+0QFsoPkvv8ZB57kVLxKOqvR+84GR/Em9lh/tAL4fV4CnpBPDxc++0vd1CipH4o99Is7GribuTHFy3doF6g==} + engines: {node: ^20.19.1 || >=22.12.0} peerDependencies: '@types/react': ^17.0.50 || ^18.0.21 || ^19.0.0 '@types/react-dom': ^17.0.17 || ^18.0.6 || ^19.0.0 react: ^17.0.2 || ^18.0.0 || ^19.0.0 react-dom: ^17.0.2 || ^18.0.0 || ^19.0.0 - '@astrojs/sitemap@3.7.0': - resolution: {integrity: sha512-+qxjUrz6Jcgh+D5VE1gKUJTA3pSthuPHe6Ao5JCxok794Lewx8hBFaWHtOnN0ntb2lfOf7gvOi9TefUswQ/ZVA==} + '@astrojs/sitemap@3.7.1': + resolution: {integrity: sha512-IzQqdTeskaMX+QDZCzMuJIp8A8C1vgzMBp/NmHNnadepHYNHcxQdGLQZYfkbd2EbRXUfOS+UDIKx8sKg0oWVdw==} - '@astrojs/starlight@0.37.3': - resolution: {integrity: sha512-p7cqbAkBYkBTiK1NIomxAEoF9Wko+mTV503qDm5Wgh+0MGGJnSsIzCSSJ+rWm8toFk9mnzNwNbxcnjwzIBEU3w==} + '@astrojs/starlight@0.38.1': + resolution: {integrity: sha512-CATPH4Dy44OYAJhoyUHh6NqpColWEVufanGVwnM0l/bcaNMo5V/rypwL0Vu0Edp+ZIXE7/1DA9CrNj5jmCVSLQ==} peerDependencies: - astro: ^5.5.0 + astro: ^6.0.0 '@astrojs/telemetry@3.3.0': resolution: {integrity: sha512-UFBgfeldP06qu6khs/yY+q1cDAaArM2/7AEIqQ9Cuvf7B1hNLq0xDrZkct+QoIGyjq56y8IaE2I3CTvG99mlhQ==} engines: {node: 18.20.8 || ^20.3.0 || >=22.0.0} - '@astrojs/yaml2ts@0.2.2': - resolution: {integrity: sha512-GOfvSr5Nqy2z5XiwqTouBBpy5FyI6DEe+/g/Mk5am9SjILN1S5fOEvYK0GuWHg98yS/dobP4m8qyqw/URW35fQ==} + '@astrojs/yaml2ts@0.2.3': + resolution: {integrity: sha512-PJzRmgQzUxI2uwpdX2lXSHtP4G8ocp24/t+bZyf5Fy0SZLSF9f9KXZoMlFM/XCGue+B0nH/2IZ7FpBYQATBsCg==} '@azu/format-text@1.0.2': resolution: {integrity: sha512-Swi4N7Edy1Eqq82GxgEECXSSLyn6GOb5htRFPzBDdUkECGXtlf12ynO5oJSpWKPwCaUssOu7NfhDcCWpIC6Ywg==} @@ -2833,9 +3415,12 @@ packages: resolution: {integrity: sha512-Nh5PhEOeY6PrnxNPsEHRr9eimxLwgLlpmguQaHKBinFYA/RU9+kOYVOQqOrTsCL+KSxrLLl1gD8Dk5BFW/7l/w==} engines: {node: '>=20.0.0'} - '@azure/core-http-compat@2.3.1': - resolution: {integrity: sha512-az9BkXND3/d5VgdRRQVkiJb2gOmDU8Qcq4GvjtBmDICNiQ9udFmDk4ZpSB5Qq1OmtDJGlQAfBaS4palFsazQ5g==} + '@azure/core-http-compat@2.3.2': + resolution: {integrity: sha512-Tf6ltdKzOJEgxZeWLCjMxrxbodB/ZeCbzzA1A2qHbhzAjzjHoBVSUeSl/baT/oHAxhc4qdqVaDKnc2+iE932gw==} engines: {node: '>=20.0.0'} + peerDependencies: + '@azure/core-client': ^1.10.0 + '@azure/core-rest-pipeline': ^1.22.0 '@azure/core-lro@2.7.2': resolution: {integrity: sha512-0YIpccoX8m/k00O7mDDMdJpbr6mf1yWo2dfmxt5A8XVZVVMz2SSKaEbMCeJRvgQ0IaSlqhjT47p4hVIRRy90xw==} @@ -2845,8 +3430,8 @@ packages: resolution: {integrity: sha512-YKWi9YuCU04B55h25cnOYZHxXYtEvQEbKST5vqRga7hWY9ydd3FZHdeQF8pyh+acWZvppw13M/LMGx0LABUVMA==} engines: {node: '>=18.0.0'} - '@azure/core-rest-pipeline@1.22.2': - resolution: {integrity: sha512-MzHym+wOi8CLUlKCQu12de0nwcq9k9Kuv43j4Wa++CsCpJwps2eeBQwD2Bu8snkxTtDKDx4GwjuR9E8yC8LNrg==} + '@azure/core-rest-pipeline@1.23.0': + resolution: {integrity: sha512-Evs1INHo+jUjwHi1T6SG6Ua/LHOQBCLuKEEE6efIpt4ZOoNonaT1kP32GoOcdNDbfqsD2445CPri3MubBy5DEQ==} engines: {node: '>=20.0.0'} '@azure/core-tracing@1.3.1': @@ -2869,43 +3454,43 @@ packages: resolution: {integrity: sha512-fCqPIfOcLE+CGqGPd66c8bZpwAji98tZ4JI9i/mlTNTlsIWslCfpg48s/ypyLxZTump5sypjrKn2/kY7q8oAbA==} engines: {node: '>=20.0.0'} - '@azure/msal-browser@4.28.1': - resolution: {integrity: sha512-al2u2fTchbClq3L4C1NlqLm+vwKfhYCPtZN2LR/9xJVaQ4Mnrwf5vANvuyPSJHcGvw50UBmhuVmYUAhTEetTpA==} + '@azure/msal-browser@4.29.1': + resolution: {integrity: sha512-1Vrt27du1cl4QHkzLc6L4aeXqliPIDIs5l/1I4hWWMXkXccY/EznJT1+pBdoVze0azTAI8sCyq5B4cBVYG1t9w==} engines: {node: '>=0.8.0'} - '@azure/msal-common@15.14.1': - resolution: {integrity: sha512-IkzF7Pywt6QKTS0kwdCv/XV8x8JXknZDvSjj/IccooxnP373T5jaadO3FnOrbWo3S0UqkfIDyZNTaQ/oAgRdXw==} + '@azure/msal-common@15.16.1': + resolution: {integrity: sha512-qxUG9TCl+TVSSX58onVDHDWrvT5CE0+NeeUAbkQqaESpSm79u5IePLnPWMMjCUnUR2zJd4+Bt9vioVRzLmJb2g==} engines: {node: '>=0.8.0'} - '@azure/msal-node@3.8.6': - resolution: {integrity: sha512-XTmhdItcBckcVVTy65Xp+42xG4LX5GK+9AqAsXPXk4IqUNv+LyQo5TMwNjuFYBfAB2GTG9iSQGk+QLc03vhf3w==} + '@azure/msal-node@3.8.9': + resolution: {integrity: sha512-jZ0pw/BbdEUWGhomCaAiVDfXRI/9K56m5hTNqB/CzcbZEYhXm5qpK1cDngN1iXfwSfmUMorOUQ2FC0dyuQ9uRg==} engines: {node: '>=16'} - '@azure/storage-blob@12.30.0': - resolution: {integrity: sha512-peDCR8blSqhsAKDbpSP/o55S4sheNwSrblvCaHUZ5xUI73XA7ieUGGwrONgD/Fng0EoDe1VOa3fAQ7+WGB3Ocg==} + '@azure/storage-blob@12.31.0': + resolution: {integrity: sha512-DBgNv10aCSxopt92DkTDD0o9xScXeBqPKGmR50FPZQaEcH4JLQ+GEOGEDv19V5BMkB7kxr+m4h6il/cCDPvmHg==} engines: {node: '>=20.0.0'} - '@azure/storage-common@12.2.0': - resolution: {integrity: sha512-YZLxiJ3vBAAnFbG3TFuAMUlxZRexjQX5JDQxOkFGb6e2TpoxH3xyHI6idsMe/QrWtj41U/KoqBxlayzhS+LlwA==} + '@azure/storage-common@12.3.0': + resolution: {integrity: sha512-/OFHhy86aG5Pe8dP5tsp+BuJ25JOAl9yaMU3WZbkeoiFMHFtJ7tu5ili7qEdBXNW9G5lDB19trwyI6V49F/8iQ==} engines: {node: '>=20.0.0'} '@babel/code-frame@7.12.11': resolution: {integrity: sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==} - '@babel/code-frame@7.28.6': - resolution: {integrity: sha512-JYgintcMjRiCvS8mMECzaEn+m3PfoQiyqukOMCCVQtoJGYJw8j/8LBJEiqkHLkfwCcs74E3pbAUFNg7d9VNJ+Q==} + '@babel/code-frame@7.29.0': + resolution: {integrity: sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==} engines: {node: '>=6.9.0'} - '@babel/compat-data@7.28.6': - resolution: {integrity: sha512-2lfu57JtzctfIrcGMz992hyLlByuzgIk58+hhGCxjKZ3rWI82NnVLjXcaTqkI2NvlcvOskZaiZ5kjUALo3Lpxg==} + '@babel/compat-data@7.29.0': + resolution: {integrity: sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==} engines: {node: '>=6.9.0'} - '@babel/core@7.28.6': - resolution: {integrity: sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==} + '@babel/core@7.29.0': + resolution: {integrity: sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==} engines: {node: '>=6.9.0'} - '@babel/generator@7.28.6': - resolution: {integrity: sha512-lOoVRwADj8hjf7al89tvQ2a1lf53Z+7tiXMgpZJL3maQPDxh0DgLMN62B2MKUOFcoodBHLMbDM6WAbKgNy5Suw==} + '@babel/generator@7.29.1': + resolution: {integrity: sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==} engines: {node: '>=6.9.0'} '@babel/helper-annotate-as-pure@7.27.3': @@ -2982,8 +3567,8 @@ packages: resolution: {integrity: sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==} engines: {node: '>=6.9.0'} - '@babel/parser@7.28.6': - resolution: {integrity: sha512-TeR9zWR18BvbfPmGbLampPMW+uW1NZnJlRuuHso8i87QZNq2JRF9i6RgxRqtEq+wQGsS19NNTWr2duhnE49mfQ==} + '@babel/parser@7.29.0': + resolution: {integrity: sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==} engines: {node: '>=6.0.0'} hasBin: true @@ -3085,83 +3670,97 @@ packages: resolution: {integrity: sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==} engines: {node: '>=6.9.0'} - '@babel/traverse@7.28.6': - resolution: {integrity: sha512-fgWX62k02qtjqdSNTAGxmKYY/7FSL9WAS1o2Hu5+I5m9T0yxZzr4cnrfXQ/MX0rIifthCSs6FKTlzYbJcPtMNg==} + '@babel/traverse@7.29.0': + resolution: {integrity: sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==} engines: {node: '>=6.9.0'} - '@babel/types@7.28.6': - resolution: {integrity: sha512-0ZrskXVEHSWIqZM/sQZ4EV3jZJXRkio/WCxaqKZP1g//CEWEPSfeZFcms4XeKBCHU0ZKnIkdJeU/kF+eRp5lBg==} + '@babel/types@7.29.0': + resolution: {integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==} engines: {node: '>=6.9.0'} '@bcoe/v8-coverage@1.0.2': resolution: {integrity: sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==} engines: {node: '>=18'} - '@braintree/sanitize-url@7.1.1': - resolution: {integrity: sha512-i1L7noDNxtFyL5DmZafWy1wRVhGehQmzZaz1HiN5e7iylJMSZR7ekOV7NsIqa5qBldlLrsKv4HbgFUVlQrz8Mw==} + '@braintree/sanitize-url@7.1.2': + resolution: {integrity: sha512-jigsZK+sMF/cuiB7sERuo9V7N9jx+dhmHHnQyDSVdpZwVutaBu7WvNYqMDLSgFgfB30n452TP3vjDAvFC973mA==} '@capsizecss/unpack@4.0.0': resolution: {integrity: sha512-VERIM64vtTP1C4mxQ5thVT9fK0apjPFobqybMtA1UdUujWka24ERHbRHFGmpbbhp73MhV+KSsHQH9C6uOTdEQA==} engines: {node: '>=18'} - '@chevrotain/cst-dts-gen@11.0.3': - resolution: {integrity: sha512-BvIKpRLeS/8UbfxXxgC33xOumsacaeCKAjAeLyOn7Pcp95HiRbrpl14S+9vaZLolnbssPIUuiUd8IvgkRyt6NQ==} + '@chevrotain/cst-dts-gen@11.1.2': + resolution: {integrity: sha512-XTsjvDVB5nDZBQB8o0o/0ozNelQtn2KrUVteIHSlPd2VAV2utEb6JzyCJaJ8tGxACR4RiBNWy5uYUHX2eji88Q==} - '@chevrotain/gast@11.0.3': - resolution: {integrity: sha512-+qNfcoNk70PyS/uxmj3li5NiECO+2YKZZQMbmjTqRI3Qchu8Hig/Q9vgkHpI3alNjr7M+a2St5pw5w5F6NL5/Q==} + '@chevrotain/gast@11.1.2': + resolution: {integrity: sha512-Z9zfXR5jNZb1Hlsd/p+4XWeUFugrHirq36bKzPWDSIacV+GPSVXdk+ahVWZTwjhNwofAWg/sZg58fyucKSQx5g==} - '@chevrotain/regexp-to-ast@11.0.3': - resolution: {integrity: sha512-1fMHaBZxLFvWI067AVbGJav1eRY7N8DDvYCTwGBiE/ytKBgP8azTdgyrKyWZ9Mfh09eHWb5PgTSO8wi7U824RA==} + '@chevrotain/regexp-to-ast@11.1.2': + resolution: {integrity: sha512-nMU3Uj8naWer7xpZTYJdxbAs6RIv/dxYzkYU8GSwgUtcAAlzjcPfX1w+RKRcYG8POlzMeayOQ/znfwxEGo5ulw==} - '@chevrotain/types@11.0.3': - resolution: {integrity: sha512-gsiM3G8b58kZC2HaWR50gu6Y1440cHiJ+i3JUvcp/35JchYejb2+5MVeJK0iKThYpAa/P2PYFV4hoi44HD+aHQ==} + '@chevrotain/types@11.1.2': + resolution: {integrity: sha512-U+HFai5+zmJCkK86QsaJtoITlboZHBqrVketcO2ROv865xfCMSFpELQoz1GkX5GzME8pTa+3kbKrZHQtI0gdbw==} - '@chevrotain/utils@11.0.3': - resolution: {integrity: sha512-YslZMgtJUyuMbZ+aKvfF3x1f5liK4mWNxghFRv7jqRR9C3R3fAOGTTKvxXDa2Y1s9zSbcpuO0cAxDYsc9SrXoQ==} + '@chevrotain/utils@11.1.2': + resolution: {integrity: sha512-4mudFAQ6H+MqBTfqLmU7G1ZwRzCLfJEooL/fsF6rCX5eePMbGhoy5n4g+G4vlh2muDcsCTJtL+uKbOzWxs5LHA==} - '@chronus/chronus@1.1.0': - resolution: {integrity: sha512-wLnf+8X/d3kPaeJPzP1SNbC9Y6Vn4bPe0gVF9eXKBp0nUrhJ08YU9rUgdZdf0lhb2RW81KewUi/3eCEwxhshGg==} + '@chronus/chronus@1.3.1': + resolution: {integrity: sha512-qSrHpXL/LlOlvW0TPCxIkZnvTdXEFW0cHoyS9lsq6CIIondtgcm4y/VEMK4wnGHyuHLvmuYASAjVSVbgMvmHTQ==} engines: {node: '>=20.0.0'} hasBin: true - '@chronus/github-pr-commenter@1.0.3': - resolution: {integrity: sha512-0ISpZoCWxbGkSGXMo6mpOtvTaXHIpVVr3NtpGtvHX4jmjmtn3aph7F/StMQ78Rvso08yOTWINcQ5p56q/rrlUw==} + '@chronus/github-pr-commenter@1.0.6': + resolution: {integrity: sha512-X+H97VyV1OBldr+t7pSORtGLMGj8xyD8ugUbLhXj8KvuD3Y0piDH+G50D2tgjtakgEYIms9DLQtRQoJDz1Snzw==} engines: {node: '>=20.0.0'} hasBin: true - '@chronus/github@1.0.3': - resolution: {integrity: sha512-tJaQ/OWnh8ttYlv0AWqB7WVM4aS2vU/OownMIawqlKanFwCbhH4PJHaEO1T08zUWd0hxFYraFz8xvcHOZnKsjA==} + '@chronus/github@1.0.6': + resolution: {integrity: sha512-5nFaUByDwsAMcbZskoSgGEBSyYEZPgjXNx7EfLtDE4avISaky+fTQoHGTMiL6RVjmpOLG/+aED5VJ89J234qaw==} engines: {node: '>=20.0.0'} hasBin: true + '@clack/core@1.1.0': + resolution: {integrity: sha512-SVcm4Dqm2ukn64/8Gub2wnlA5nS2iWJyCkdNHcvNHPIeBTGojpdJ+9cZKwLfmqy7irD4N5qLteSilJlE0WLAtA==} + + '@clack/prompts@1.1.0': + resolution: {integrity: sha512-pkqbPGtohJAvm4Dphs2M8xE29ggupihHdy1x84HNojZuMtFsHiUlRvqD24tM2+XmI+61LlfNceM3Wr7U5QES5g==} + '@colors/colors@1.5.0': resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} engines: {node: '>=0.1.90'} - '@cspell/cspell-bundled-dicts@9.6.0': - resolution: {integrity: sha512-gLNe9bB+5gMsTEhR9YPE0Wt122HR2EV+Q1j9W+MbwbeBJmpTWrgAP1ZdpvHOg+6LF6x/bD/EC9HfWdd/om8wXA==} + '@cspell/cspell-bundled-dicts@9.7.0': + resolution: {integrity: sha512-s7h1vo++Q3AsfQa3cs0u/KGwm3SYInuIlC4kjlCBWjQmb4KddiZB5O1u0+3TlA7GycHb5M4CR7MDfHUICgJf+w==} engines: {node: '>=20'} - '@cspell/cspell-json-reporter@9.6.0': - resolution: {integrity: sha512-5sY1lgAXS5xEOsjT5rREMADj7pHIt56XOL7xR80nNl0TwlpZbeBHhoB2aH5sirVTeodJFN5iraXNbVOYPPupPw==} + '@cspell/cspell-json-reporter@9.7.0': + resolution: {integrity: sha512-6xpGXlMtQA3hV2BCAQcPkpx9eI12I0o01i9eRqSSEDKtxuAnnrejbcCpL+5OboAjTp3/BSeNYSnhuWYLkSITWQ==} engines: {node: '>=20'} - '@cspell/cspell-pipe@9.6.0': - resolution: {integrity: sha512-YNuY8NNXfE+8Qzknm2ps6QbrZLZu6rSZTZr3dYW3K6TK7+IFVlJ6e2Z9iKJTqp6aZ4AGU/r9QYGmNX4Oq4gZ0A==} + '@cspell/cspell-performance-monitor@9.7.0': + resolution: {integrity: sha512-w1PZIFXuvjnC6mQHyYAFnrsn5MzKnEcEkcK1bj4OG00bAt7WX2VUA/eNNt9c1iHozCQ+FcRYlfbGxuBmNyzSgw==} + engines: {node: '>=20.18'} + + '@cspell/cspell-pipe@9.7.0': + resolution: {integrity: sha512-iiisyRpJciU9SOHNSi0ZEK0pqbEMFRatI/R4O+trVKb+W44p4MNGClLVRWPGUmsFbZKPJL3jDtz0wPlG0/JCZA==} engines: {node: '>=20'} - '@cspell/cspell-resolver@9.6.0': - resolution: {integrity: sha512-Gb2UWNmRpTOQGpYL4Q/LMw+b50KcRZcf/wJg6w0Yl3IT+F/uDNhNh1f5rHuTyGsbMsMxHJhsb2AoP+73GlbIfw==} + '@cspell/cspell-resolver@9.7.0': + resolution: {integrity: sha512-uiEgS238mdabDnwavo6HXt8K98jlh/jpm7NONroM9NTr9rzck2VZKD2kXEj85wDNMtRsRXNoywTjwQ8WTB6/+w==} engines: {node: '>=20'} - '@cspell/cspell-service-bus@9.6.0': - resolution: {integrity: sha512-DCuKKkySTEB8MPLTdoPMdmakYcx7XCsHz1YEMbzOcLqJCxXsRlRZg4qE9kRBee/2QY7eYA2kaYNgn/TDMooa4g==} + '@cspell/cspell-service-bus@9.7.0': + resolution: {integrity: sha512-fkqtaCkg4jY/FotmzjhIavbXuH0AgUJxZk78Ktf4XlhqOZ4wDeUWrCf220bva4mh3TWiLx/ae9lIlpl59Vx6hA==} engines: {node: '>=20'} - '@cspell/cspell-types@9.6.0': - resolution: {integrity: sha512-JTqrD47tV+rWc1y2W8T0NTfWLQMlSWX4OF64/Jf3WbsOD+4UXVIfjRlzPry7+1Zekm6pa38+23jkDBytYpu8yw==} + '@cspell/cspell-types@9.7.0': + resolution: {integrity: sha512-Tdfx4eH2uS+gv9V9NCr3Rz+c7RSS6ntXp3Blliud18ibRUlRxO9dTaOjG4iv4x0nAmMeedP1ORkEpeXSkh2QiQ==} engines: {node: '>=20'} + '@cspell/cspell-worker@9.7.0': + resolution: {integrity: sha512-cjEApFF0aOAa1vTUk+e7xP8ofK7iC7hsRzj1FmvvVQz8PoLWPRaq+1bT89ypPsZQvavqm5sIgb97S60/aW4TVg==} + engines: {node: '>=20.18'} + '@cspell/dict-ada@4.1.1': resolution: {integrity: sha512-E+0YW9RhZod/9Qy2gxfNZiHJjCYFlCdI69br1eviQQWB8yOTJX0JHXLs79kOYhSW0kINPVUdvddEBe6Lu6CjGQ==} @@ -3174,8 +3773,8 @@ packages: '@cspell/dict-bash@4.2.2': resolution: {integrity: sha512-kyWbwtX3TsCf5l49gGQIZkRLaB/P8g73GDRm41Zu8Mv51kjl2H7Au0TsEvHv7jzcsRLS6aUYaZv6Zsvk1fOz+Q==} - '@cspell/dict-companies@3.2.10': - resolution: {integrity: sha512-bJ1qnO1DkTn7JYGXvxp8FRQc4yq6tRXnrII+jbP8hHmq5TX5o1Wu+rdfpoUQaMWTl6balRvcMYiINDesnpR9Bw==} + '@cspell/dict-companies@3.2.11': + resolution: {integrity: sha512-0cmafbcz2pTHXLd59eLR1gvDvN6aWAOM0+cIL4LLF9GX9yB2iKDNrKsvs4tJRqutoaTdwNFBbV0FYv+6iCtebQ==} '@cspell/dict-cpp@7.0.2': resolution: {integrity: sha512-dfbeERiVNeqmo/npivdR6rDiBCqZi3QtjH2Z0HFcXwpdj6i97dX1xaKyK2GUsO/p4u1TOv63Dmj5Vm48haDpuA==} @@ -3186,8 +3785,8 @@ packages: '@cspell/dict-csharp@4.0.8': resolution: {integrity: sha512-qmk45pKFHSxckl5mSlbHxmDitSsGMlk/XzFgt7emeTJWLNSTUK//MbYAkBNRtfzB4uD7pAFiKgpKgtJrTMRnrQ==} - '@cspell/dict-css@4.0.19': - resolution: {integrity: sha512-VYHtPnZt/Zd/ATbW3rtexWpBnHUohUrQOHff/2JBhsVgxOrksAxJnLAO43Q1ayLJBJUUwNVo+RU0sx0aaysZfg==} + '@cspell/dict-css@4.1.1': + resolution: {integrity: sha512-y/Vgo6qY08e1t9OqR56qjoFLBCpi4QfWMf2qzD1l9omRZwvSMQGRPz4x0bxkkkU4oocMAeztjzCsmLew//c/8w==} '@cspell/dict-dart@2.3.2': resolution: {integrity: sha512-sUiLW56t9gfZcu8iR/5EUg+KYyRD83Cjl3yjDEA2ApVuJvK1HhX+vn4e4k4YfjpUQMag8XO2AaRhARE09+/rqw==} @@ -3201,41 +3800,41 @@ packages: '@cspell/dict-docker@1.1.17': resolution: {integrity: sha512-OcnVTIpHIYYKhztNTyK8ShAnXTfnqs43hVH6p0py0wlcwRIXe5uj4f12n7zPf2CeBI7JAlPjEsV0Rlf4hbz/xQ==} - '@cspell/dict-dotnet@5.0.11': - resolution: {integrity: sha512-LSVKhpFf/ASTWJcfYeS0Sykcl1gVMsv2Z5Eo0TnTMSTLV3738HH+66pIsjUTChqU6SF3gKPuCe6EOaRYqb/evA==} + '@cspell/dict-dotnet@5.0.12': + resolution: {integrity: sha512-FiV934kNieIjGTkiApu/WKvLYi/KBpvfWB2TSqpDQtmXZlt3uSa5blwblO1ZC8OvjH8RCq/31H5IdEYmTaZS7A==} '@cspell/dict-elixir@4.0.8': resolution: {integrity: sha512-CyfphrbMyl4Ms55Vzuj+mNmd693HjBFr9hvU+B2YbFEZprE5AG+EXLYTMRWrXbpds4AuZcvN3deM2XVB80BN/Q==} - '@cspell/dict-en-common-misspellings@2.1.11': - resolution: {integrity: sha512-2jcY494If1udvzd7MT2z/QH/RACUo/I02vIY4ttNdZhgYvUmRKhg8OBdrbzYo0lJOcc7XUb8rhIFQRHzxOSVeA==} + '@cspell/dict-en-common-misspellings@2.1.12': + resolution: {integrity: sha512-14Eu6QGqyksqOd4fYPuRb58lK1Va7FQK9XxFsRKnZU8LhL3N+kj7YKDW+7aIaAN/0WGEqslGP6lGbQzNti8Akw==} - '@cspell/dict-en-gb-mit@3.1.16': - resolution: {integrity: sha512-4PPdapCJslytxAVJu35Mv97qDyGmAQxtDE790T2bWNhcqN6gvRVAc/eTRaXkUIf21q1xCxxNNqpH4VfMup69rQ==} + '@cspell/dict-en-gb-mit@3.1.20': + resolution: {integrity: sha512-rcWEKb1mwgK13CSHu6GwwFA/sWLRkB0twTzSfPxUOULJkhcUrL93ixohk416SBa0BVxixub+lOpTXKcCTbTXsA==} - '@cspell/dict-en_us@4.4.27': - resolution: {integrity: sha512-0y4vH2i5cFmi8sxkc4OlD2IlnqDznOtKczm4h6jA288g5VVrm3bhkYK6vcB8b0CoRKtYWKet4VEmHBP1yI+Qfw==} + '@cspell/dict-en_us@4.4.31': + resolution: {integrity: sha512-MdV6mbrSkyIqn9+6F5poCyHIPqWB3H/wlDL9LXfjgAxNFBdYRE767xJtIYunzUqhUiJHSJgZajEFdTtMDw441Q==} - '@cspell/dict-filetypes@3.0.15': - resolution: {integrity: sha512-uDMeqYlLlK476w/muEFQGBy9BdQWS0mQ7BJiy/iQv5XUWZxE2O54ZQd9nW8GyQMzAgoyg5SG4hf9l039Qt66oA==} + '@cspell/dict-filetypes@3.0.17': + resolution: {integrity: sha512-6f1gZf9o60fGQXGi/fZaryISUNDRmmJwGyr4QU1UvgUgOdpDHLVJtv/0wSL9q5F0wAkYhbXo/fNG8CcUTaf7Ww==} '@cspell/dict-flutter@1.1.1': resolution: {integrity: sha512-UlOzRcH2tNbFhZmHJN48Za/2/MEdRHl2BMkCWZBYs+30b91mWvBfzaN4IJQU7dUZtowKayVIF9FzvLZtZokc5A==} - '@cspell/dict-fonts@4.0.5': - resolution: {integrity: sha512-BbpkX10DUX/xzHs6lb7yzDf/LPjwYIBJHJlUXSBXDtK/1HaeS+Wqol4Mlm2+NAgZ7ikIE5DQMViTgBUY3ezNoQ==} + '@cspell/dict-fonts@4.0.6': + resolution: {integrity: sha512-aR/0csY01dNb0A1tw/UmN9rKgHruUxsYsvXu6YlSBJFu60s26SKr/k1o4LavpHTQ+lznlYMqAvuxGkE4Flliqw==} '@cspell/dict-fsharp@1.1.1': resolution: {integrity: sha512-imhs0u87wEA4/cYjgzS0tAyaJpwG7vwtC8UyMFbwpmtw+/bgss+osNfyqhYRyS/ehVCWL17Ewx2UPkexjKyaBA==} - '@cspell/dict-fullstack@3.2.7': - resolution: {integrity: sha512-IxEk2YAwAJKYCUEgEeOg3QvTL4XLlyArJElFuMQevU1dPgHgzWElFevN5lsTFnvMFA1riYsVinqJJX0BanCFEg==} + '@cspell/dict-fullstack@3.2.8': + resolution: {integrity: sha512-J6EeoeThvx/DFrcA2rJiCA6vfqwJMbkG0IcXhlsmRZmasIpanmxgt90OEaUazbZahFiuJT8wrhgQ1QgD1MsqBw==} '@cspell/dict-gaming-terms@1.1.2': resolution: {integrity: sha512-9XnOvaoTBscq0xuD6KTEIkk9hhdfBkkvJAIsvw3JMcnp1214OCGW8+kako5RqQ2vTZR3Tnf3pc57o7VgkM0q1Q==} - '@cspell/dict-git@3.0.7': - resolution: {integrity: sha512-odOwVKgfxCQfiSb+nblQZc4ErXmnWEnv8XwkaI4sNJ7cNmojnvogYVeMqkXPjvfrgEcizEEA4URRD2Ms5PDk1w==} + '@cspell/dict-git@3.1.0': + resolution: {integrity: sha512-KEt9zGkxqGy2q1nwH4CbyqTSv5nadpn8BAlDnzlRcnL0Xb3LX9xTgSGShKvzb0bw35lHoYyLWN2ZKAqbC4pgGQ==} '@cspell/dict-golang@6.0.26': resolution: {integrity: sha512-YKA7Xm5KeOd14v5SQ4ll6afe9VSy3a2DWM7L9uBq4u3lXToRBQ1W5PRa+/Q9udd+DTURyVVnQ+7b9cnOlNxaRg==} @@ -3249,8 +3848,8 @@ packages: '@cspell/dict-html-symbol-entities@4.0.5': resolution: {integrity: sha512-429alTD4cE0FIwpMucvSN35Ld87HCyuM8mF731KU5Rm4Je2SG6hmVx7nkBsLyrmH3sQukTcr1GaiZsiEg8svPA==} - '@cspell/dict-html@4.0.14': - resolution: {integrity: sha512-2bf7n+kS92g+cMKV0wr9o/Oq9n8JzU7CcrB96gIh2GHgnF+0xDOqO2W/1KeFAqOfqosoOVE48t+4dnEMkkoJ2Q==} + '@cspell/dict-html@4.0.15': + resolution: {integrity: sha512-GJYnYKoD9fmo2OI0aySEGZOjThnx3upSUvV7mmqUu8oG+mGgzqm82P/f7OqsuvTaInZZwZbo+PwJQd/yHcyFIw==} '@cspell/dict-java@5.0.12': resolution: {integrity: sha512-qPSNhTcl7LGJ5Qp6VN71H8zqvRQK04S08T67knMq9hTA8U7G1sTKzLmBaDOFhq17vNX/+rT+rbRYp+B5Nwza1A==} @@ -3264,8 +3863,8 @@ packages: '@cspell/dict-kotlin@1.1.1': resolution: {integrity: sha512-J3NzzfgmxRvEeOe3qUXnSJQCd38i/dpF9/t3quuWh6gXM+krsAXP75dY1CzDmS8mrJAlBdVBeAW5eAZTD8g86Q==} - '@cspell/dict-latex@4.0.4': - resolution: {integrity: sha512-YdTQhnTINEEm/LZgTzr9Voz4mzdOXH7YX+bSFs3hnkUHCUUtX/mhKgf1CFvZ0YNM2afjhQcmLaR9bDQVyYBvpA==} + '@cspell/dict-latex@5.1.0': + resolution: {integrity: sha512-qxT4guhysyBt0gzoliXYEBYinkAdEtR2M7goRaUH0a7ltCsoqqAeEV8aXYRIdZGcV77gYSobvu3jJL038tlPAw==} '@cspell/dict-lorem-ipsum@4.0.5': resolution: {integrity: sha512-9a4TJYRcPWPBKkQAJ/whCu4uCAEgv/O2xAaZEI0n4y1/l18Yyx8pBKoIX5QuVXjjmKEkK7hi5SxyIsH7pFEK9Q==} @@ -3276,22 +3875,22 @@ packages: '@cspell/dict-makefile@1.0.5': resolution: {integrity: sha512-4vrVt7bGiK8Rx98tfRbYo42Xo2IstJkAF4tLLDMNQLkQ86msDlYSKG1ZCk8Abg+EdNcFAjNhXIiNO+w4KflGAQ==} - '@cspell/dict-markdown@2.0.14': - resolution: {integrity: sha512-uLKPNJsUcumMQTsZZgAK9RgDLyQhUz/uvbQTEkvF/Q4XfC1i/BnA8XrOrd0+Vp6+tPOKyA+omI5LRWfMu5K/Lw==} + '@cspell/dict-markdown@2.0.16': + resolution: {integrity: sha512-976RRqKv6cwhrxdFCQP2DdnBVB86BF57oQtPHy4Zbf4jF/i2Oy29MCrxirnOBalS1W6KQeto7NdfDXRAwkK4PQ==} peerDependencies: - '@cspell/dict-css': ^4.0.19 - '@cspell/dict-html': ^4.0.14 + '@cspell/dict-css': ^4.1.1 + '@cspell/dict-html': ^4.0.15 '@cspell/dict-html-symbol-entities': ^4.0.5 '@cspell/dict-typescript': ^3.2.3 '@cspell/dict-monkeyc@1.0.12': resolution: {integrity: sha512-MN7Vs11TdP5mbdNFQP5x2Ac8zOBm97ARg6zM5Sb53YQt/eMvXOMvrep7+/+8NJXs0jkp70bBzjqU4APcqBFNAw==} - '@cspell/dict-node@5.0.8': - resolution: {integrity: sha512-AirZcN2i84ynev3p2/1NCPEhnNsHKMz9zciTngGoqpdItUb2bDt1nJBjwlsrFI78GZRph/VaqTVFwYikmncpXg==} + '@cspell/dict-node@5.0.9': + resolution: {integrity: sha512-hO+ga+uYZ/WA4OtiMEyKt5rDUlUyu3nXMf8KVEeqq2msYvAPdldKBGH7lGONg6R/rPhv53Rb+0Y1SLdoK1+7wQ==} - '@cspell/dict-npm@5.2.29': - resolution: {integrity: sha512-ZAef8JpYmbuHFT1zekj/YyImLPvZevjECw663EmG5GPePyNo4AfH8Dd2fFhaOyQ3P5I5LrkAhGwypnOfUxcssw==} + '@cspell/dict-npm@5.2.37': + resolution: {integrity: sha512-dYKrD0bI08YgebJcbjsIDpTMK6EH0wTkEyQLsaH0T4tmsLJE95coTYb3eE7giRRGJADvBqrjH4fz5+INd85QqQ==} '@cspell/dict-php@4.1.1': resolution: {integrity: sha512-EXelI+4AftmdIGtA8HL8kr4WlUE11OqCSVlnIgZekmTkEGSZdYnkFdiJ5IANSALtlQ1mghKjz+OFqVs6yowgWA==} @@ -3299,8 +3898,8 @@ packages: '@cspell/dict-powershell@5.0.15': resolution: {integrity: sha512-l4S5PAcvCFcVDMJShrYD0X6Huv9dcsQPlsVsBGbH38wvuN7gS7+GxZFAjTNxDmTY1wrNi1cCatSg6Pu2BW4rgg==} - '@cspell/dict-public-licenses@2.0.15': - resolution: {integrity: sha512-cJEOs901H13Pfy0fl4dCD1U+xpWIMaEPq8MeYU83FfDZvellAuSo4GqWCripfIqlhns/L6+UZEIJSOZnjgy7Wg==} + '@cspell/dict-public-licenses@2.0.16': + resolution: {integrity: sha512-EQRrPvEOmwhwWezV+W7LjXbIBjiy6y/shrET6Qcpnk3XANTzfvWflf9PnJ5kId/oKWvihFy0za0AV1JHd03pSQ==} '@cspell/dict-python@4.2.25': resolution: {integrity: sha512-hDdN0YhKgpbtZVRjQ2c8jk+n0wQdidAKj1Fk8w7KEHb3YlY5uPJ0mAKJk7AJKPNLOlILoUmN+HAVJz+cfSbWYg==} @@ -3308,11 +3907,11 @@ packages: '@cspell/dict-r@2.1.1': resolution: {integrity: sha512-71Ka+yKfG4ZHEMEmDxc6+blFkeTTvgKbKAbwiwQAuKl3zpqs1Y0vUtwW2N4b3LgmSPhV3ODVY0y4m5ofqDuKMw==} - '@cspell/dict-ruby@5.1.0': - resolution: {integrity: sha512-9PJQB3cfkBULrMLp5kSAcFPpzf8oz9vFN+QYZABhQwWkGbuzCIXSorHrmWSASlx4yejt3brjaWS57zZ/YL5ZQQ==} + '@cspell/dict-ruby@5.1.1': + resolution: {integrity: sha512-LHrp84oEV6q1ZxPPyj4z+FdKyq1XAKYPtmGptrd+uwHbrF/Ns5+fy6gtSi7pS+uc0zk3JdO9w/tPK+8N1/7WUA==} - '@cspell/dict-rust@4.1.1': - resolution: {integrity: sha512-fXiXnZH0wOaEVTKFRNaz6TsUGhuB8dAT0ubYkDNzRQCaV5JGSOebGb1v2x5ZrOSVp+moxWM/vdBfiNU6KOEaFQ==} + '@cspell/dict-rust@4.1.2': + resolution: {integrity: sha512-O1FHrumYcO+HZti3dHfBPUdnDFkI+nbYK3pxYmiM1sr+G0ebOd6qchmswS0Wsc6ZdEVNiPYJY/gZQR6jfW3uOg==} '@cspell/dict-scala@5.0.9': resolution: {integrity: sha512-AjVcVAELgllybr1zk93CJ5wSUNu/Zb5kIubymR/GAYkMyBdYFCZ3Zbwn4Zz8GJlFFAbazABGOu0JPVbeY59vGg==} @@ -3320,8 +3919,8 @@ packages: '@cspell/dict-shell@1.1.2': resolution: {integrity: sha512-WqOUvnwcHK1X61wAfwyXq04cn7KYyskg90j4lLg3sGGKMW9Sq13hs91pqrjC44Q+lQLgCobrTkMDw9Wyl9nRFA==} - '@cspell/dict-software-terms@5.1.20': - resolution: {integrity: sha512-TEk1xHvetTI4pv7Vzje1D322m6QEjaH2P6ucOOf6q7EJCppQIdC0lZSXkgHJAFU5HGSvEXSzvnVeW2RHW86ziQ==} + '@cspell/dict-software-terms@5.2.0': + resolution: {integrity: sha512-jyucc8KKxH5ClC4FPICISgcKAZU7UwgFdPkuuuK5nYIw0+l1umnUSn9IKCcOaurvXujvVP6mBfclXpUtmT6Vrw==} '@cspell/dict-sql@2.2.1': resolution: {integrity: sha512-qDHF8MpAYCf4pWU8NKbnVGzkoxMNrFqBHyG/dgrlic5EQiKANCLELYtGlX5auIMDLmTf1inA0eNtv74tyRJ/vg==} @@ -3344,20 +3943,24 @@ packages: '@cspell/dict-zig@1.0.0': resolution: {integrity: sha512-XibBIxBlVosU06+M6uHWkFeT0/pW5WajDRYdXG2CgHnq85b0TI/Ks0FuBJykmsgi2CAD3Qtx8UHFEtl/DSFnAQ==} - '@cspell/dynamic-import@9.6.0': - resolution: {integrity: sha512-Lkn82wyGj2ltxeYfH2bEjshdes1fx3ouYUZxeW5i6SBBvEVJoSmr43AygI8A317UMIQxVj59qVBorrtGYcRI1w==} + '@cspell/dynamic-import@9.7.0': + resolution: {integrity: sha512-Ws36IYvtS/8IN3x6K9dPLvTmaArodRJmzTn2Rkf2NaTnIYWhRuFzsP3SVVO59NN3fXswAEbmz5DSbVUe8bPZHg==} engines: {node: '>=20'} - '@cspell/filetypes@9.6.0': - resolution: {integrity: sha512-CaWyk5j20H6sr+HCArtUY95jUQb7A/6W0GC4B4umnqoWvgqwR72duowLFa+w1K2C7tZg3GoV4Wf2cUn9jjt5FA==} + '@cspell/filetypes@9.7.0': + resolution: {integrity: sha512-Ln9e/8wGOyTeL3DCCs6kwd18TSpTw3kxsANjTrzLDASrX4cNmAdvc9J5dcIuBHPaqOAnRQxuZbzUlpRh73Y24w==} engines: {node: '>=20'} - '@cspell/strong-weak-map@9.6.0': - resolution: {integrity: sha512-9g8LCLv/2RrprGeGnFAaBETWq7ESnBcoMbvgNu+vZE58iF+pbFvP0qGgKvVeKEEpc2LZhNuHLsUH37MUS6DOQg==} + '@cspell/rpc@9.7.0': + resolution: {integrity: sha512-VnZ4ABgQeoS4RwofcePkDP7L6tf3Kh5D7LQKoyRM4R6XtfSsYefym6XKaRl3saGtthH5YyjgNJ0Tgdjen4wAAw==} + engines: {node: '>=20.18'} + + '@cspell/strong-weak-map@9.7.0': + resolution: {integrity: sha512-5xbvDASjklrmy88O6gmGXgYhpByCXqOj5wIgyvwZe2l83T1bE+iOfGI4pGzZJ/mN+qTn1DNKq8BPBPtDgb7Q2Q==} engines: {node: '>=20'} - '@cspell/url@9.6.0': - resolution: {integrity: sha512-257WOxh9vOYHAVgBNXRCdLEd+ldzlVbzcc9u+6DYoCDCNGe0OvOWOGsAfnUbMc9xEw48XgBlDYgOlPbjWGLOTg==} + '@cspell/url@9.7.0': + resolution: {integrity: sha512-ZaaBr0pTvNxmyUbIn+nVPXPr383VqJzfUDMWicgTjJIeo2+T2hOq2kNpgpvTIrWtZrsZnSP8oXms1+sKTjcvkw==} engines: {node: '>=20'} '@csstools/color-helpers@5.1.0': @@ -3396,11 +3999,11 @@ packages: resolution: {integrity: sha512-kzyuwOAQnXJNLS9PSyrk0CWk35nWJW/zl/6KvnTBMFK65gm7U1/Z5BqjxeapjZCIhQcM/DsrEmcbRwDyXyXK4A==} engines: {node: '>=14'} - '@docsearch/css@4.5.0': - resolution: {integrity: sha512-RgGlYf1WsYf3bmZ1Zmc7YzthUwmnYhtQgdLWp5A7xIs6KwwAxDPkmxYbLW/uYIv/8/Dq/pU3azNzKP6/fSjQfQ==} + '@docsearch/css@4.6.0': + resolution: {integrity: sha512-YlcAimkXclvqta47g47efzCM5CFxDwv2ClkDfEs/fC/Ak0OxPH2b3czwa4o8O1TRBf+ujFF2RiUwszz2fPVNJQ==} - '@docsearch/js@4.5.0': - resolution: {integrity: sha512-lVYWoqcnAzfeinc3sz6+uhmF6fFYTQy3EcVylD9lIVBqo7UA+c+xjgBaxhj1akcUtTTNsUM6dApAaOcn7y5UDQ==} + '@docsearch/js@4.6.0': + resolution: {integrity: sha512-9/rbgkm/BgTq46cwxIohvSAz3koOFjnPpg0mwkJItAfzKbQIj+310PvwtgUY1YITDuGCag6yOL50GW2DBkaaBw==} '@emmetio/abbreviation@2.3.3': resolution: {integrity: sha512-mgv58UrU3rh4YgbE/TzgLQwJ3pFsHHhCLqY20aJq+9comytTXUDNGG/SMtSeMJdkpxgXSXunBGLD8Boka3JyVA==} @@ -3423,361 +4026,173 @@ packages: '@emmetio/stream-reader@2.2.0': resolution: {integrity: sha512-fXVXEyFA5Yv3M3n8sUGT7+fvecGrZP4k6FnWWMSZVQf69kAq0LLpaBQLGcPR30m3zMmKYhECP4k/ZkzvhEW5kw==} - '@emnapi/runtime@1.8.1': - resolution: {integrity: sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==} + '@emnapi/core@1.9.1': + resolution: {integrity: sha512-mukuNALVsoix/w1BJwFzwXBN/dHeejQtuVzcDsfOEsdpCumXb/E9j8w11h5S54tT1xhifGfbbSm/ICrObRb3KA==} - '@emotion/babel-plugin@11.13.5': - resolution: {integrity: sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==} + '@emnapi/runtime@1.9.1': + resolution: {integrity: sha512-VYi5+ZVLhpgK4hQ0TAjiQiZ6ol0oe4mBx7mVv7IflsiEp0OWoVsp/+f9Vc1hOhE0TtkORVrI1GvzyreqpgWtkA==} - '@emotion/cache@11.14.0': - resolution: {integrity: sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA==} + '@emnapi/wasi-threads@1.2.0': + resolution: {integrity: sha512-N10dEJNSsUx41Z6pZsXU8FjPjpBEplgH24sfkmITrBED1/U2Esum9F3lfLrMjKHHjmi557zQn7kR9R+XWXu5Rg==} '@emotion/hash@0.9.2': resolution: {integrity: sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==} - '@emotion/memoize@0.9.0': - resolution: {integrity: sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==} - - '@emotion/react@11.14.0': - resolution: {integrity: sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==} - peerDependencies: - '@types/react': '*' - react: '>=16.8.0' - peerDependenciesMeta: - '@types/react': - optional: true - - '@emotion/serialize@1.3.3': - resolution: {integrity: sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA==} - - '@emotion/sheet@1.4.0': - resolution: {integrity: sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==} - - '@emotion/unitless@0.10.0': - resolution: {integrity: sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==} - - '@emotion/use-insertion-effect-with-fallbacks@1.2.0': - resolution: {integrity: sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg==} - peerDependencies: - react: '>=16.8.0' - - '@emotion/utils@1.4.2': - resolution: {integrity: sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==} - - '@emotion/weak-memoize@0.4.0': - resolution: {integrity: sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==} - '@epic-web/invariant@1.0.0': resolution: {integrity: sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==} - '@esbuild/aix-ppc64@0.25.12': - resolution: {integrity: sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==} - engines: {node: '>=18'} - cpu: [ppc64] - os: [aix] - - '@esbuild/aix-ppc64@0.27.2': - resolution: {integrity: sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==} + '@esbuild/aix-ppc64@0.27.4': + resolution: {integrity: sha512-cQPwL2mp2nSmHHJlCyoXgHGhbEPMrEEU5xhkcy3Hs/O7nGZqEpZ2sUtLaL9MORLtDfRvVl2/3PAuEkYZH0Ty8Q==} engines: {node: '>=18'} cpu: [ppc64] os: [aix] - '@esbuild/android-arm64@0.25.12': - resolution: {integrity: sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==} - engines: {node: '>=18'} - cpu: [arm64] - os: [android] - - '@esbuild/android-arm64@0.27.2': - resolution: {integrity: sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==} + '@esbuild/android-arm64@0.27.4': + resolution: {integrity: sha512-gdLscB7v75wRfu7QSm/zg6Rx29VLdy9eTr2t44sfTW7CxwAtQghZ4ZnqHk3/ogz7xao0QAgrkradbBzcqFPasw==} engines: {node: '>=18'} cpu: [arm64] os: [android] - '@esbuild/android-arm@0.25.12': - resolution: {integrity: sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==} - engines: {node: '>=18'} - cpu: [arm] - os: [android] - - '@esbuild/android-arm@0.27.2': - resolution: {integrity: sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==} + '@esbuild/android-arm@0.27.4': + resolution: {integrity: sha512-X9bUgvxiC8CHAGKYufLIHGXPJWnr0OCdR0anD2e21vdvgCI8lIfqFbnoeOz7lBjdrAGUhqLZLcQo6MLhTO2DKQ==} engines: {node: '>=18'} cpu: [arm] os: [android] - '@esbuild/android-x64@0.25.12': - resolution: {integrity: sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==} - engines: {node: '>=18'} - cpu: [x64] - os: [android] - - '@esbuild/android-x64@0.27.2': - resolution: {integrity: sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==} + '@esbuild/android-x64@0.27.4': + resolution: {integrity: sha512-PzPFnBNVF292sfpfhiyiXCGSn9HZg5BcAz+ivBuSsl6Rk4ga1oEXAamhOXRFyMcjwr2DVtm40G65N3GLeH1Lvw==} engines: {node: '>=18'} cpu: [x64] os: [android] - '@esbuild/darwin-arm64@0.25.12': - resolution: {integrity: sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==} - engines: {node: '>=18'} - cpu: [arm64] - os: [darwin] - - '@esbuild/darwin-arm64@0.27.2': - resolution: {integrity: sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==} + '@esbuild/darwin-arm64@0.27.4': + resolution: {integrity: sha512-b7xaGIwdJlht8ZFCvMkpDN6uiSmnxxK56N2GDTMYPr2/gzvfdQN8rTfBsvVKmIVY/X7EM+/hJKEIbbHs9oA4tQ==} engines: {node: '>=18'} cpu: [arm64] os: [darwin] - '@esbuild/darwin-x64@0.25.12': - resolution: {integrity: sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==} - engines: {node: '>=18'} - cpu: [x64] - os: [darwin] - - '@esbuild/darwin-x64@0.27.2': - resolution: {integrity: sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==} + '@esbuild/darwin-x64@0.27.4': + resolution: {integrity: sha512-sR+OiKLwd15nmCdqpXMnuJ9W2kpy0KigzqScqHI3Hqwr7IXxBp3Yva+yJwoqh7rE8V77tdoheRYataNKL4QrPw==} engines: {node: '>=18'} cpu: [x64] os: [darwin] - '@esbuild/freebsd-arm64@0.25.12': - resolution: {integrity: sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==} - engines: {node: '>=18'} - cpu: [arm64] - os: [freebsd] - - '@esbuild/freebsd-arm64@0.27.2': - resolution: {integrity: sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==} + '@esbuild/freebsd-arm64@0.27.4': + resolution: {integrity: sha512-jnfpKe+p79tCnm4GVav68A7tUFeKQwQyLgESwEAUzyxk/TJr4QdGog9sqWNcUbr/bZt/O/HXouspuQDd9JxFSw==} engines: {node: '>=18'} cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-x64@0.25.12': - resolution: {integrity: sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==} - engines: {node: '>=18'} - cpu: [x64] - os: [freebsd] - - '@esbuild/freebsd-x64@0.27.2': - resolution: {integrity: sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==} + '@esbuild/freebsd-x64@0.27.4': + resolution: {integrity: sha512-2kb4ceA/CpfUrIcTUl1wrP/9ad9Atrp5J94Lq69w7UwOMolPIGrfLSvAKJp0RTvkPPyn6CIWrNy13kyLikZRZQ==} engines: {node: '>=18'} cpu: [x64] os: [freebsd] - '@esbuild/linux-arm64@0.25.12': - resolution: {integrity: sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==} - engines: {node: '>=18'} - cpu: [arm64] - os: [linux] - - '@esbuild/linux-arm64@0.27.2': - resolution: {integrity: sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==} + '@esbuild/linux-arm64@0.27.4': + resolution: {integrity: sha512-7nQOttdzVGth1iz57kxg9uCz57dxQLHWxopL6mYuYthohPKEK0vU0C3O21CcBK6KDlkYVcnDXY099HcCDXd9dA==} engines: {node: '>=18'} cpu: [arm64] os: [linux] - '@esbuild/linux-arm@0.25.12': - resolution: {integrity: sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==} - engines: {node: '>=18'} - cpu: [arm] - os: [linux] - - '@esbuild/linux-arm@0.27.2': - resolution: {integrity: sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==} + '@esbuild/linux-arm@0.27.4': + resolution: {integrity: sha512-aBYgcIxX/wd5n2ys0yESGeYMGF+pv6g0DhZr3G1ZG4jMfruU9Tl1i2Z+Wnj9/KjGz1lTLCcorqE2viePZqj4Eg==} engines: {node: '>=18'} cpu: [arm] os: [linux] - '@esbuild/linux-ia32@0.25.12': - resolution: {integrity: sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==} - engines: {node: '>=18'} - cpu: [ia32] - os: [linux] - - '@esbuild/linux-ia32@0.27.2': - resolution: {integrity: sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==} + '@esbuild/linux-ia32@0.27.4': + resolution: {integrity: sha512-oPtixtAIzgvzYcKBQM/qZ3R+9TEUd1aNJQu0HhGyqtx6oS7qTpvjheIWBbes4+qu1bNlo2V4cbkISr8q6gRBFA==} engines: {node: '>=18'} cpu: [ia32] os: [linux] - '@esbuild/linux-loong64@0.25.12': - resolution: {integrity: sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==} - engines: {node: '>=18'} - cpu: [loong64] - os: [linux] - - '@esbuild/linux-loong64@0.27.2': - resolution: {integrity: sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==} + '@esbuild/linux-loong64@0.27.4': + resolution: {integrity: sha512-8mL/vh8qeCoRcFH2nM8wm5uJP+ZcVYGGayMavi8GmRJjuI3g1v6Z7Ni0JJKAJW+m0EtUuARb6Lmp4hMjzCBWzA==} engines: {node: '>=18'} cpu: [loong64] os: [linux] - '@esbuild/linux-mips64el@0.25.12': - resolution: {integrity: sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==} - engines: {node: '>=18'} - cpu: [mips64el] - os: [linux] - - '@esbuild/linux-mips64el@0.27.2': - resolution: {integrity: sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==} + '@esbuild/linux-mips64el@0.27.4': + resolution: {integrity: sha512-1RdrWFFiiLIW7LQq9Q2NES+HiD4NyT8Itj9AUeCl0IVCA459WnPhREKgwrpaIfTOe+/2rdntisegiPWn/r/aAw==} engines: {node: '>=18'} cpu: [mips64el] os: [linux] - '@esbuild/linux-ppc64@0.25.12': - resolution: {integrity: sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==} - engines: {node: '>=18'} - cpu: [ppc64] - os: [linux] - - '@esbuild/linux-ppc64@0.27.2': - resolution: {integrity: sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==} + '@esbuild/linux-ppc64@0.27.4': + resolution: {integrity: sha512-tLCwNG47l3sd9lpfyx9LAGEGItCUeRCWeAx6x2Jmbav65nAwoPXfewtAdtbtit/pJFLUWOhpv0FpS6GQAmPrHA==} engines: {node: '>=18'} cpu: [ppc64] os: [linux] - '@esbuild/linux-riscv64@0.25.12': - resolution: {integrity: sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==} - engines: {node: '>=18'} - cpu: [riscv64] - os: [linux] - - '@esbuild/linux-riscv64@0.27.2': - resolution: {integrity: sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==} + '@esbuild/linux-riscv64@0.27.4': + resolution: {integrity: sha512-BnASypppbUWyqjd1KIpU4AUBiIhVr6YlHx/cnPgqEkNoVOhHg+YiSVxM1RLfiy4t9cAulbRGTNCKOcqHrEQLIw==} engines: {node: '>=18'} cpu: [riscv64] os: [linux] - '@esbuild/linux-s390x@0.25.12': - resolution: {integrity: sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==} - engines: {node: '>=18'} - cpu: [s390x] - os: [linux] - - '@esbuild/linux-s390x@0.27.2': - resolution: {integrity: sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==} + '@esbuild/linux-s390x@0.27.4': + resolution: {integrity: sha512-+eUqgb/Z7vxVLezG8bVB9SfBie89gMueS+I0xYh2tJdw3vqA/0ImZJ2ROeWwVJN59ihBeZ7Tu92dF/5dy5FttA==} engines: {node: '>=18'} cpu: [s390x] os: [linux] - '@esbuild/linux-x64@0.25.12': - resolution: {integrity: sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==} - engines: {node: '>=18'} - cpu: [x64] - os: [linux] - - '@esbuild/linux-x64@0.27.2': - resolution: {integrity: sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==} + '@esbuild/linux-x64@0.27.4': + resolution: {integrity: sha512-S5qOXrKV8BQEzJPVxAwnryi2+Iq5pB40gTEIT69BQONqR7JH1EPIcQ/Uiv9mCnn05jff9umq/5nqzxlqTOg9NA==} engines: {node: '>=18'} cpu: [x64] os: [linux] - '@esbuild/netbsd-arm64@0.25.12': - resolution: {integrity: sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==} - engines: {node: '>=18'} - cpu: [arm64] - os: [netbsd] - - '@esbuild/netbsd-arm64@0.27.2': - resolution: {integrity: sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==} + '@esbuild/netbsd-arm64@0.27.4': + resolution: {integrity: sha512-xHT8X4sb0GS8qTqiwzHqpY00C95DPAq7nAwX35Ie/s+LO9830hrMd3oX0ZMKLvy7vsonee73x0lmcdOVXFzd6Q==} engines: {node: '>=18'} cpu: [arm64] os: [netbsd] - '@esbuild/netbsd-x64@0.25.12': - resolution: {integrity: sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==} - engines: {node: '>=18'} - cpu: [x64] - os: [netbsd] - - '@esbuild/netbsd-x64@0.27.2': - resolution: {integrity: sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==} + '@esbuild/netbsd-x64@0.27.4': + resolution: {integrity: sha512-RugOvOdXfdyi5Tyv40kgQnI0byv66BFgAqjdgtAKqHoZTbTF2QqfQrFwa7cHEORJf6X2ht+l9ABLMP0dnKYsgg==} engines: {node: '>=18'} cpu: [x64] os: [netbsd] - '@esbuild/openbsd-arm64@0.25.12': - resolution: {integrity: sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==} - engines: {node: '>=18'} - cpu: [arm64] - os: [openbsd] - - '@esbuild/openbsd-arm64@0.27.2': - resolution: {integrity: sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==} + '@esbuild/openbsd-arm64@0.27.4': + resolution: {integrity: sha512-2MyL3IAaTX+1/qP0O1SwskwcwCoOI4kV2IBX1xYnDDqthmq5ArrW94qSIKCAuRraMgPOmG0RDTA74mzYNQA9ow==} engines: {node: '>=18'} cpu: [arm64] os: [openbsd] - '@esbuild/openbsd-x64@0.25.12': - resolution: {integrity: sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==} - engines: {node: '>=18'} - cpu: [x64] - os: [openbsd] - - '@esbuild/openbsd-x64@0.27.2': - resolution: {integrity: sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==} + '@esbuild/openbsd-x64@0.27.4': + resolution: {integrity: sha512-u8fg/jQ5aQDfsnIV6+KwLOf1CmJnfu1ShpwqdwC0uA7ZPwFws55Ngc12vBdeUdnuWoQYx/SOQLGDcdlfXhYmXQ==} engines: {node: '>=18'} cpu: [x64] os: [openbsd] - '@esbuild/openharmony-arm64@0.25.12': - resolution: {integrity: sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==} - engines: {node: '>=18'} - cpu: [arm64] - os: [openharmony] - - '@esbuild/openharmony-arm64@0.27.2': - resolution: {integrity: sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==} + '@esbuild/openharmony-arm64@0.27.4': + resolution: {integrity: sha512-JkTZrl6VbyO8lDQO3yv26nNr2RM2yZzNrNHEsj9bm6dOwwu9OYN28CjzZkH57bh4w0I2F7IodpQvUAEd1mbWXg==} engines: {node: '>=18'} cpu: [arm64] os: [openharmony] - '@esbuild/sunos-x64@0.25.12': - resolution: {integrity: sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==} - engines: {node: '>=18'} - cpu: [x64] - os: [sunos] - - '@esbuild/sunos-x64@0.27.2': - resolution: {integrity: sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==} + '@esbuild/sunos-x64@0.27.4': + resolution: {integrity: sha512-/gOzgaewZJfeJTlsWhvUEmUG4tWEY2Spp5M20INYRg2ZKl9QPO3QEEgPeRtLjEWSW8FilRNacPOg8R1uaYkA6g==} engines: {node: '>=18'} cpu: [x64] os: [sunos] - '@esbuild/win32-arm64@0.25.12': - resolution: {integrity: sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==} - engines: {node: '>=18'} - cpu: [arm64] - os: [win32] - - '@esbuild/win32-arm64@0.27.2': - resolution: {integrity: sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==} + '@esbuild/win32-arm64@0.27.4': + resolution: {integrity: sha512-Z9SExBg2y32smoDQdf1HRwHRt6vAHLXcxD2uGgO/v2jK7Y718Ix4ndsbNMU/+1Qiem9OiOdaqitioZwxivhXYg==} engines: {node: '>=18'} cpu: [arm64] os: [win32] - '@esbuild/win32-ia32@0.25.12': - resolution: {integrity: sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==} - engines: {node: '>=18'} - cpu: [ia32] - os: [win32] - - '@esbuild/win32-ia32@0.27.2': - resolution: {integrity: sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==} + '@esbuild/win32-ia32@0.27.4': + resolution: {integrity: sha512-DAyGLS0Jz5G5iixEbMHi5KdiApqHBWMGzTtMiJ72ZOLhbu/bzxgAe8Ue8CTS3n3HbIUHQz/L51yMdGMeoxXNJw==} engines: {node: '>=18'} cpu: [ia32] os: [win32] - '@esbuild/win32-x64@0.25.12': - resolution: {integrity: sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==} - engines: {node: '>=18'} - cpu: [x64] - os: [win32] - - '@esbuild/win32-x64@0.27.2': - resolution: {integrity: sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==} + '@esbuild/win32-x64@0.27.4': + resolution: {integrity: sha512-+knoa0BDoeXgkNvvV1vvbZX4+hizelrkwmGJBdT17t8FNPwG2lKemmuMZlmaNQ3ws3DKKCxpb4zRZEIp3UxFCg==} engines: {node: '>=18'} cpu: [x64] os: [win32] @@ -3804,172 +4219,181 @@ packages: resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - '@eslint/config-array@0.21.1': - resolution: {integrity: sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@eslint/config-helpers@0.4.2': - resolution: {integrity: sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@eslint/config-array@0.23.3': + resolution: {integrity: sha512-j+eEWmB6YYLwcNOdlwQ6L2OsptI/LO6lNBuLIqe5R7RetD658HLoF+Mn7LzYmAWWNNzdC6cqP+L6r8ujeYXWLw==} + engines: {node: ^20.19.0 || ^22.13.0 || >=24} - '@eslint/core@0.17.0': - resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@eslint/config-helpers@0.5.3': + resolution: {integrity: sha512-lzGN0onllOZCGroKJmRwY6QcEHxbjBw1gwB8SgRSqK8YbbtEXMvKynsXc3553ckIEBxsbMBU7oOZXKIPGZNeZw==} + engines: {node: ^20.19.0 || ^22.13.0 || >=24} - '@eslint/eslintrc@3.3.3': - resolution: {integrity: sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@eslint/core@1.1.1': + resolution: {integrity: sha512-QUPblTtE51/7/Zhfv8BDwO0qkkzQL7P/aWWbqcf4xWLEYn1oKjdO0gglQBB4GAsu7u6wjijbCmzsUTy6mnk6oQ==} + engines: {node: ^20.19.0 || ^22.13.0 || >=24} - '@eslint/js@9.39.2': - resolution: {integrity: sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@eslint/js@10.0.1': + resolution: {integrity: sha512-zeR9k5pd4gxjZ0abRoIaxdc7I3nDktoXZk2qOv9gCNWx3mVwEn32VRhyLaRsDiJjTs0xq/T8mfPtyuXu7GWBcA==} + engines: {node: ^20.19.0 || ^22.13.0 || >=24} + peerDependencies: + eslint: ^10.0.0 + peerDependenciesMeta: + eslint: + optional: true - '@eslint/object-schema@2.1.7': - resolution: {integrity: sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@eslint/object-schema@3.0.3': + resolution: {integrity: sha512-iM869Pugn9Nsxbh/YHRqYiqd23AmIbxJOcpUMOuWCVNdoQJ5ZtwL6h3t0bcZzJUlC3Dq9jCFCESBZnX0GTv7iQ==} + engines: {node: ^20.19.0 || ^22.13.0 || >=24} - '@eslint/plugin-kit@0.4.1': - resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@eslint/plugin-kit@0.6.1': + resolution: {integrity: sha512-iH1B076HoAshH1mLpHMgwdGeTs0CYwL0SPMkGuSebZrwBp16v415e9NZXg2jtrqPVQjf6IANe2Vtlr5KswtcZQ==} + engines: {node: ^20.19.0 || ^22.13.0 || >=24} - '@expressive-code/core@0.41.6': - resolution: {integrity: sha512-FvJQP+hG0jWi/FLBSmvHInDqWR7jNANp9PUDjdMqSshHb0y7sxx3vHuoOr6SgXjWw+MGLqorZyPQ0aAlHEok6g==} + '@expressive-code/core@0.41.7': + resolution: {integrity: sha512-ck92uZYZ9Wba2zxkiZLsZGi9N54pMSAVdrI9uW3Oo9AtLglD5RmrdTwbYPCT2S/jC36JGB2i+pnQtBm/Ib2+dg==} - '@expressive-code/plugin-frames@0.41.6': - resolution: {integrity: sha512-d+hkSYXIQot6fmYnOmWAM+7TNWRv/dhfjMsNq+mIZz8Tb4mPHOcgcfZeEM5dV9TDL0ioQNvtcqQNuzA1sRPjxg==} + '@expressive-code/plugin-frames@0.41.7': + resolution: {integrity: sha512-diKtxjQw/979cTglRFaMCY/sR6hWF0kSMg8jsKLXaZBSfGS0I/Hoe7Qds3vVEgeoW+GHHQzMcwvgx/MOIXhrTA==} - '@expressive-code/plugin-shiki@0.41.6': - resolution: {integrity: sha512-Y6zmKBmsIUtWTzdefqlzm/h9Zz0Rc4gNdt2GTIH7fhHH2I9+lDYCa27BDwuBhjqcos6uK81Aca9dLUC4wzN+ng==} + '@expressive-code/plugin-shiki@0.41.7': + resolution: {integrity: sha512-DL605bLrUOgqTdZ0Ot5MlTaWzppRkzzqzeGEu7ODnHF39IkEBbFdsC7pbl3LbUQ1DFtnfx6rD54k/cdofbW6KQ==} - '@expressive-code/plugin-text-markers@0.41.6': - resolution: {integrity: sha512-PBFa1wGyYzRExMDzBmAWC6/kdfG1oLn4pLpBeTfIRrALPjcGA/59HP3e7q9J0Smk4pC7U+lWkA2LHR8FYV8U7Q==} + '@expressive-code/plugin-text-markers@0.41.7': + resolution: {integrity: sha512-Ewpwuc5t6eFdZmWlFyeuy3e1PTQC0jFvw2Q+2bpcWXbOZhPLsT7+h8lsSIJxb5mS7wZko7cKyQ2RLYDyK6Fpmw==} - '@floating-ui/core@1.7.3': - resolution: {integrity: sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==} + '@floating-ui/core@1.7.5': + resolution: {integrity: sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==} '@floating-ui/devtools@0.2.3': resolution: {integrity: sha512-ZTcxTvgo9CRlP7vJV62yCxdqmahHTGpSTi5QaTDgGoyQq0OyjaVZhUhXv/qdkQFOI3Sxlfmz0XGG4HaZMsDf8Q==} peerDependencies: '@floating-ui/dom': ^1.0.0 - '@floating-ui/dom@1.7.4': - resolution: {integrity: sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==} + '@floating-ui/dom@1.7.6': + resolution: {integrity: sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==} - '@floating-ui/utils@0.2.10': - resolution: {integrity: sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==} + '@floating-ui/utils@0.2.11': + resolution: {integrity: sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==} '@fluentui/keyboard-keys@9.0.8': resolution: {integrity: sha512-iUSJUUHAyTosnXK8O2Ilbfxma+ZyZPMua5vB028Ys96z80v+LFwntoehlFsdH3rMuPsA8GaC1RE7LMezwPBPdw==} - '@fluentui/priority-overflow@9.2.1': - resolution: {integrity: sha512-WH5dv54aEqWo/kKQuADAwjv66W6OUMFllQMjpdkrktQp7pu4JXtmF60iYcp9+iuIX9iCeW01j8gNTU08MQlfIQ==} + '@fluentui/priority-overflow@9.3.0': + resolution: {integrity: sha512-yaBC0R4e+4ZlCWDulB5S+xBrlnLwfzdg68GaarCqQO8OHjLg7Ah05xTj7PsAYcoHeEg/9vYeBwGXBpRO8+Tjqw==} + + '@fluentui/react-accordion@9.9.2': + resolution: {integrity: sha512-Mmi5nVKfQrBiBiD1JPVtCmIMrR1CpCy8hsWZLwv/pHt+uHHyW9HyrPXwiOitj3ookA5ec1kXyl34BN8RUi7DGQ==} + peerDependencies: + '@types/react': '>=16.14.0 <20.0.0' + '@types/react-dom': '>=16.9.0 <20.0.0' + react: '>=16.14.0 <20.0.0' + react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-accordion@9.8.15': - resolution: {integrity: sha512-/KMZKD97C6hvRUF4S/GiMaguFh2VWHAm0z58y++Si9drmgTvpAUHxXKHELxnZFYKLS76Gc0gMXnKrPMlp0wDkw==} + '@fluentui/react-alert@9.0.0-beta.135': + resolution: {integrity: sha512-Qkr89e6tl4q0fhzfx9Wzb3ltiqbFtZj7AhT+CHZdW0I6KtpfGmJnvzaqvz0KXMdrKROTgvkA1Ny3Epf9ortc0Q==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-alert@9.0.0-beta.131': - resolution: {integrity: sha512-mpt5uMuAjUG/J6T0yq/r54pwhVl/D/lk/OLF3ovhYzWuiNhEOinwx2b81fK02Rm/K3i4sl25QX4h19Aie5NLKg==} + '@fluentui/react-aria@9.17.10': + resolution: {integrity: sha512-KqS2XcdN84XsgVG4fAESyOBfixN7zbObWfQVLNZ2gZrp2b1hPGVYfQ6J4WOO0vXMKYp0rre/QMOgDm6/srL0XQ==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-aria@9.17.7': - resolution: {integrity: sha512-OsPKp6BmE+W73UNMM7JX6WNQa5H4/oFKgt/BAQxp9mhM6lYw4Skmf9ZLn0vBccFuc0wh2hYDuMgKQ2/2uTUfow==} + '@fluentui/react-avatar@9.10.2': + resolution: {integrity: sha512-0qy3U1S80c2Z0A8O/3Ko8XmG4d/NCof1XZ1jclbneKLDT0PeoX3BUlDDgCalOEwb0s1x6TjLabam5FtY4E30cg==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-avatar@9.9.13': - resolution: {integrity: sha512-a8eVQ2WYiGQvV7BVzcMXGkpZHfNzduC8S74ux5cMbeDuFG8JH8XKBIgOErAxQwFt0wATqyISelo5vn176sQwmw==} + '@fluentui/react-badge@9.4.15': + resolution: {integrity: sha512-KgFUJHBHP76vE3EDuPg/ml7lGqxs9zJ634e+vtxn8D7ghCZ6h9P6A0WbmgsPcN6MZoBZYLzzYT3OJ6Vmu3BM8g==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-badge@9.4.12': - resolution: {integrity: sha512-N7B3l3PGH1HKzjvXBmnElyTpd7JIIimuxEWSu6v+4Jas3UCbbEjv6DfhmEOLeBFle09q3ILTJ/Hf7t9jhEAyyg==} + '@fluentui/react-breadcrumb@9.3.17': + resolution: {integrity: sha512-POnwCFyvXabq7lNtJRslASNkrm0iRoXpnrWwh0LyBTFZRDiGDKaV18Bpk0UiuQNTUurVQiH513164XKHIP+d7Q==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-breadcrumb@9.3.14': - resolution: {integrity: sha512-KfMXejIEWA5VWPkp0lJIN18qqlf/3TpwnkBafRCxeeVx5dVuT6z2PW5bxJiDQ1jRSpmYiGzs3MkJOnlWuMdLhw==} + '@fluentui/react-button@9.8.2': + resolution: {integrity: sha512-T2xBn6s6DRNH17Y+kLO+uEOaRe89Q20WP1Rs6OzC45cSpOGc+q9ogbPbYBqU7Tr1fur+Xd8LRHxdQJ3j5ufbdw==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-button@9.7.1': - resolution: {integrity: sha512-nPrsnORTrf4Hy4uZTxULgUmqd1hQK3ZorDfIYhzcbnBnn78+9zl9NyKQI0SqKxM8jG16FuK8jgrpHLiYq/8PSA==} + '@fluentui/react-card@9.5.11': + resolution: {integrity: sha512-0W3BmDER/aKx+7+ttGy+M6LO09DW7DkJlO8F0x13L1ssOVxJ0OhyhSGiCF0cJliOK1tiGPveYf6+X2xMq2MT6g==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-card@9.5.8': - resolution: {integrity: sha512-nS/q3Vw2AqAOhKTOxgwU0xgE4neFB9OT+9fK/OuwmvgFLvkV5in/oszod+QlqJzarn3hTp1avWlSOItswPoyOw==} + '@fluentui/react-carousel@9.9.4': + resolution: {integrity: sha512-mzGZUOe3tB+86/WPsQTgppYRoqeM1vl8LswISl7FVrxk7PREnzZLW4BEZnFOKuP29dThcjJNzF0mM/5kq1lKug==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-carousel@9.9.0': - resolution: {integrity: sha512-EaiEe1oT9lFrIZfBfgF046h+2qcwKQZUJcc0Rv7yFDyWkNXrdM1YKG+q89V+D7P3z8tJYXKsNy4+tpFc/xgrKg==} + '@fluentui/react-checkbox@9.5.16': + resolution: {integrity: sha512-jjbj5RTy78OzFT95zj6SI7RMV1JF7FLT1CiYIL13bFTsL9tiPyAqXRcdXGJOnt/EuyD3uKs2nyOu4M3QFVy0ng==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-checkbox@9.5.12': - resolution: {integrity: sha512-km1itgOZJ/Io1/F9wLMp9yHgfgyM1HnYBKJjUD4+H+wkdVoF7ZsjWls2s8tB2EMvsbWRBqgPH80yCMNsGyipjw==} + '@fluentui/react-checkbox@9.5.17': + resolution: {integrity: sha512-40uRrCnWBMiWyVF2ZN9Ep2nnl/onYrSaa8fNnLBn6Tunhuk9flCxWZygkO5h9Da2QP6DasyGG8WZld1nrR9GUg==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-color-picker@9.2.12': - resolution: {integrity: sha512-fToyincQFiuYxzfIMii9M4A55taEFtQ0DzDZPlyIi45j/39eSmlwGzBDfFq7KKvVqGHvZKCKcSymUlxA+PPEcQ==} + '@fluentui/react-color-picker@9.2.15': + resolution: {integrity: sha512-RMmawl7g4gUYLuTQG2QwCcR9fGC+vDD+snsBlXtObpj/cKpeDmYif46g88pYv86jeIXY1zsjINmLpELmz+uFmw==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-combobox@9.16.13': - resolution: {integrity: sha512-FavYGlTKOBED44h6d587Ic1AVi9/eqEh+B2Xph7EujCvq9ZFtjYPtZVDcgEuAZd/C6QY5vrFoZ5+abjLqal1bg==} + '@fluentui/react-combobox@9.16.18': + resolution: {integrity: sha512-nmyleswOSS9O/3gn8AWQ9Uuyis0WTHO1zZnDVapFUdgd2+hAcUSjJXPQv6NGftuUB5bgS2qAx9prRJg17ZrZvA==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-components@9.72.9': - resolution: {integrity: sha512-yiNzCjPixUhYokf8kgl0ItXQ/smPceFvz9XP73z0Tp0dRNzRQG20dK0Oz3w+7vnOt9VmnAH9KGNRXqNAY+CPdg==} + '@fluentui/react-components@9.73.3': + resolution: {integrity: sha512-8JqxJuQmcBungWH8KxgBjiNe4sP5UXiiVWTqQGJ8l23gua3SC8uHufoOEKneEDWULR4HHJThscbqDLsGpkcJaw==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-context-selector@9.2.13': - resolution: {integrity: sha512-Jzo4aDzGHh131wub7XqDaaZB2V+kd90HgpvFHdtBenL8LjDVxuSYpuHlqVF+Lu1mQBDu4V8JQS6KiYLv9xFp8g==} + '@fluentui/react-context-selector@9.2.15': + resolution: {integrity: sha512-QymBntFLJNZ9VfTOaBn2ApUSSSC5UuDW8ZcgPJPA+06XEFH+U9Zny2d9QAg1xYNYwIGWahWGQ+7ATOuLxtB8Jw==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' @@ -3977,420 +4401,424 @@ packages: react-dom: '>=16.14.0 <20.0.0' scheduler: '>=0.19.0' - '@fluentui/react-dialog@9.16.5': - resolution: {integrity: sha512-5MogBImDZ/qXY2ShXAJBbC9XFRwgxDU7lbe31DcD1RLJYV+zXbXIXbMNvTCtSFc3qKRORZgWiYJidR9zb4MiwA==} + '@fluentui/react-dialog@9.17.2': + resolution: {integrity: sha512-mZdKylSvh2fRf0e3wMX3ZNccb9DahsOE7A5Y9LG97ghYvndMBVG2YwScIzUFVvLS206ari6HMOl0lC5JRB1bKA==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-divider@9.5.1': - resolution: {integrity: sha512-bWc1gbHYqT3werzx+Suw0rBJfn6+bMtmZ8PDy4UIg/Fn06oPum4IqgHn3r9HpQtmphhspBGrI/q2BD/YWEHAyg==} + '@fluentui/react-divider@9.6.2': + resolution: {integrity: sha512-jfHlpSoJys78STe/SSjqdcn+W7QjEO1xCGiedWp/MdTBi3pH5vEeYbt2u8RU+zP32IF0Clta85KsUEEG0DYELQ==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-drawer@9.11.1': - resolution: {integrity: sha512-xGbiGCc0j7smvet+ZbGCl9yrnk9WDVxD1RN7egO6CXZ6qRurE76AX/9dtnw22/Md+HPkzOmNAw95A0LOYUg04g==} + '@fluentui/react-drawer@9.11.5': + resolution: {integrity: sha512-eoZY+jKZwbJo1PUsb7Ico7u/8aObHL4BhPP6hd+HHNzB7seTpN7rLd0DpASLZsxJUy5yvch4QF2TrjOu6V8kRA==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-field@9.4.12': - resolution: {integrity: sha512-GJq/SbXXAduKUJK8XpIphfGLNgBZm2fizxZt0pKttE4HkBjFbHaBbEkjlNZc8S+2d8ec0adkqx9hwC9OnqZMUw==} + '@fluentui/react-field@9.4.16': + resolution: {integrity: sha512-2mfuYGldeqr9Llt8QSfwdj1hQofScvNQ/1Rns9TE4QUP6cdqs3cPX2+FZNJzpgO9vq5bk0hJpKqo7lvXZdyEzw==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-icons@2.0.316': - resolution: {integrity: sha512-tZPOtsUmoOrgLeM/rLjkzLlWOEmIghXNh/DYQzm5RD/Q4epklOzjnsFvc/Mn2tuXiVxi+vvXxsQp21E1aLpmWg==} + '@fluentui/react-icons@2.0.323': + resolution: {integrity: sha512-BWFvdg8Er3668fri7o5RVqdfDO3jIg0OvJmUl5EWg6lO7TeC8A+OTggjzqO+J062ONaHPHpQ9IHbnYQ+QXGwXg==} peerDependencies: react: '>=16.8.0 <20.0.0' - '@fluentui/react-image@9.3.12': - resolution: {integrity: sha512-S02tX0s5UrWY0MyVfkq8P/3vyyAZ6LPdFAwjy2dWIWoEpYA2XH+fCDDsnPSThSZs6IUKUqgN/BpXW0/lsPcCuA==} + '@fluentui/react-image@9.3.15': + resolution: {integrity: sha512-k8ftGUc5G3Hj5W9nOFnWEKZ1oXmoZE3EvAEdyI6Cn9R8E6zW2PZ1+cug0p6rr01JCDG8kbry1LAITcObMrlPdw==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-infobutton@9.0.0-beta.108': - resolution: {integrity: sha512-mXwi5LuVNJK66HxOid4mzZaV571E3ZmyKDK8BG0Bd+nErTixc0H6D3kPIxgBbN4RaZjurPkovg5vluAYAzMgxg==} + '@fluentui/react-infobutton@9.0.0-beta.112': + resolution: {integrity: sha512-Fhqoc6b1MQtHW+Mm5sBhfa5ZrRdOV4azuUa5WyBvwD4Ozq/z2pBOC/wi/A/WCjKMnGoMlQ2CggoLaMhQmenzAQ==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-infolabel@9.4.13': - resolution: {integrity: sha512-szas/IPeg3XETtxily/9muYM9/czky+CVuntdbhHaCGyg1YZ1xMbRhXgaGUpJtBnOuCaLQV4wcX+r6bCYkN95A==} + '@fluentui/react-infolabel@9.4.17': + resolution: {integrity: sha512-zLw52jn2wAuEKWFzaNj3aKhuB4BAEI8LqblryCg0LKPKHcv/z9d9RllCqcVz+ngdK1tQGtCIPH/wxNlZXx/I3Q==} peerDependencies: '@types/react': '>=16.8.0 <20.0.0' '@types/react-dom': '>=16.8.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.8.0 <20.0.0' - '@fluentui/react-input@9.7.12': - resolution: {integrity: sha512-91h/J6xsH4hRrtclPL0sEU2zdAfs2t2IpDz+AWwJ7LTWn+DfxNjr4ItncbBC8DCB69IoKOmNma/Hup/4LaCsMA==} + '@fluentui/react-input@9.7.16': + resolution: {integrity: sha512-dr6tBWbyDiP2KR7LDvJlxFwxucWfeFETumFo3fAtUSpjbTHMG0ZShh3cq0/c7Gqvq/ypl12jVB1Tj6E4RimV8g==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-jsx-runtime@9.3.4': - resolution: {integrity: sha512-socz8H63f7CBYECzBkeeZGUAGgPDvsr4kZRHQoQw5eXBKlSb+08p7F7Zdq0hYAPQhTgXoxH1DZ4JlXzCCmweVg==} + '@fluentui/react-jsx-runtime@9.4.1': + resolution: {integrity: sha512-ZodSm7jRa4kaLKDi+emfHFMP/IDnYwFQQAI2BdtKbVrvfwvzPRprGcnTgivnqKBT1ROvKOCY2ddz7+yZzesnNw==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' react: '>=16.14.0 <20.0.0' - '@fluentui/react-label@9.3.12': - resolution: {integrity: sha512-drVHXtiK/uhWF83lbeGm+z4r2IBVA8Zp6+VXD5lsR0nJ6o9v2TubJDTgOpgpWMaFDPDSHUO7jCAqwNdzQ3lpsw==} + '@fluentui/react-label@9.3.15': + resolution: {integrity: sha512-ycmaQwC4tavA8WeDfgcay1Ywu/4goHq1NOeVxkyzWTPGA7rs+tdCgdZBQZLAsBK2XFaZiHs7l+KG9r1oIRKolA==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-link@9.7.1': - resolution: {integrity: sha512-OkFR95N8D1KQPmz4eZPu+mei79JNYjURLythuNfgvLG3SgNpOKfT7b5hzhUCafzEB1e6Oviw/nGF99t65pfdMA==} + '@fluentui/react-link@9.7.4': + resolution: {integrity: sha512-ILKFpo/QH1SRsLN9gopAyZT/b/xsGcdO4JxthEeuTRvpLD6gImvRplum8ySIlbTskVVzog6038bHUSYLMdN7OA==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-list@9.6.7': - resolution: {integrity: sha512-/vUcP6QeUrVuVVZGab+W/a66O/7RxbqErt9S3teC90X8e5Bq0Nb7Q1aeiC4gyQr1XvwzKGKhqe/3srU8X+54Qw==} + '@fluentui/react-list@9.6.12': + resolution: {integrity: sha512-vFeqP4r3rjqtd/p9p7woma/j2U3UlcirfqGje26ppBMzDs/0MWQiUmjTkQTMLnPeh72knnqwsF43dRSKSdTSng==} peerDependencies: '@types/react': '>=16.8.0 <20.0.0' '@types/react-dom': '>=16.8.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.8.0 <20.0.0' - '@fluentui/react-menu@9.20.6': - resolution: {integrity: sha512-AsbtrJigDeMlVJbIZMHDjNrW2DFe0hzgEN4/Dc/fYaHqOFIe1OazNAWZl4dsXyEHZxkCo791X5jhR12gvBDbcA==} + '@fluentui/react-menu@9.22.0': + resolution: {integrity: sha512-RPZvqHsxMDEArsz80mJabs1fVGPlCrhMntzM/wt3Bga+fyPv4yEuDdN5FB8JqUpIAjRZneiW0RLC0Mr3WqmatA==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-message-bar@9.6.16': - resolution: {integrity: sha512-yg1vSYLDaTKwDeia2t1ivngBy7sinx4McBjyX8l8pUaAdrT+OqDcDeevXpFNZ0/0eA2a3BVJ6qbu4iab1d9FPQ==} + '@fluentui/react-message-bar@9.6.21': + resolution: {integrity: sha512-Vba3+7+TuzH2Ma6YB/Sd5dy+dm4DWwacZc0a78CetVqCzYZ4u/5opdmiBs8JY1Qr8uYW38siHLbY8kLnu6OOjA==} peerDependencies: '@types/react': '>=16.8.0 <20.0.0' '@types/react-dom': '>=16.8.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.8.0 <20.0.0' - '@fluentui/react-motion-components-preview@0.14.2': - resolution: {integrity: sha512-QbdbgzcM02AvYCN4PbBMZCw10vMh9AvPK8kK2kbMdNWXolbRau2ndNVfXpXvZxY9KZFc2lJlYUBLWJTLDINQXA==} + '@fluentui/react-motion-components-preview@0.15.2': + resolution: {integrity: sha512-KqHRV8lLmVwOWiHBdpUFA+TwMbuYu9cyzNvmhbMFLVKzZyr3MPgN+97Tf+6QYPf22o99SMT0BPySDv/HiNYanA==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-motion@9.11.5': - resolution: {integrity: sha512-o4rTgeQbxER4tZ47eZ+ej/uy9iUNvQtB5fF55+8G00beBSX2acwmslb/GJOOw/mnkcB14Hoa6f8LU2JabYNXSw==} + '@fluentui/react-motion@9.13.0': + resolution: {integrity: sha512-YdOpW6e7qfvzoWKcqh8hReCqwYEoiEmNBcCprGaupKjWOi9jBbF/JESM1AHI9nOjPd8aY90WUG2+ahvrqfL9LA==} peerDependencies: '@types/react': '>=16.8.0 <20.0.0' '@types/react-dom': '>=16.8.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.8.0 <20.0.0' - '@fluentui/react-nav@9.3.16': - resolution: {integrity: sha512-qoPfC/pAYDZQxAhfFhzP6a5QH/1lafmOWNXLrZxX5DadGl9mg9Tr6/t6rcP/ZuJSTHGzVX1IUmxboc+z62gcww==} + '@fluentui/react-nav@9.3.20': + resolution: {integrity: sha512-YIObOcR92Nz4OUePrDhRdLQ5m9ph0y+U7U9NYgE/XFrLtWl+uqUS7u36m3NJl9QGgZVpUHO4nbNjizGLkncCCA==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-overflow@9.6.6': - resolution: {integrity: sha512-iXXEQCSNn6xfzzUrEURplq7uc+OrxTvU6EbWVeFxCQnwmbnEJlmxtFzWTS4XHR1Z00Z+lZ4pCUxD1q7DH9926Q==} + '@fluentui/react-overflow@9.7.1': + resolution: {integrity: sha512-Ml1GlcLrAUv31d9WN15WGOZv32gzDtZD5Mp1MOQ3ichDfTtxrswIch7MDzZ8hLMGf/7Y2IzBpV8iFR1XdSrGBA==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-persona@9.5.13': - resolution: {integrity: sha512-H2gUXRp3U28szgjMskKRM0OI1TvEaZ9LJwvCo2aEf03ijvWVeJYSg8Q3XLmglrAbjENRWIR7/kZg2r8Hd0vlvw==} + '@fluentui/react-persona@9.6.2': + resolution: {integrity: sha512-60kOmljlYjUiySWDN1bZh1FB4C7jbJS2dobtBJQh5agnKg34p3egO+6MwsBHRcwaGhVMh4T8XcbE6t2hw+iqyQ==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-popover@9.12.13': - resolution: {integrity: sha512-hb1G/zLCfoD4fUHwPLZ7Qqwaoqm5nk8dyV8s491J3tpKhifce+cVgqA2/5MYMcZeo07QRIzn5oZ10t7QZCBOKw==} + '@fluentui/react-popover@9.14.0': + resolution: {integrity: sha512-XrZlSfSYhA12j5bna4Sq8N/If2vul7gl8woVrN8U3iQUjdaHB6OAMZ/WMNUdMm35Z+4e4rHClAZxU2dUsbHrmw==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-portal@9.8.9': - resolution: {integrity: sha512-zmaEPXwSLMmCzRlKQUZ+ZZqNjGe+h6K+Gz4NIFuz+jVbCRpOPEfumaoE6oy9wRITQFHq3DQrkPSRQxrZ7oUHRQ==} + '@fluentui/react-portal@9.8.11': + resolution: {integrity: sha512-2eg4MdW7e2UGRYWPg05GCytAjWYNd55YOP9+iUDINoQwwto9oeFTtZRyn08HYw37cSNqoH24qGz/VBctzTkqDA==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-positioning@9.20.11': - resolution: {integrity: sha512-LjLQiIZw9wM7OSSi1CesrV6yvmJTsLFOMA8jypglm4GoPCXf4BzD7bEk55fgJYBGfa1YQNGMbv2LlFqmNOGrQQ==} + '@fluentui/react-positioning@9.22.0': + resolution: {integrity: sha512-i3DLC4jd4MoYSZMYLKQNUTpkjKAJ0snIcihvkrjt2jpvv34CifKJhqVtjFQ470pRW4XNx/pBBX07vdXpA3poxA==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-progress@9.4.12': - resolution: {integrity: sha512-CGlk1yXhT6hBDbjgYyk+qgKbuU089iwYeueiYit5TLFb0LUUjfWjdcex7s73Qa+Obyss5MeHun8DQwX9Ve/FoQ==} + '@fluentui/react-progress@9.4.16': + resolution: {integrity: sha512-IWVuD1hQoyIBK+RIGOCTc3HUPkdtOQghJPZ5uGwRrUlxGgpUV1h7rdAApiuQTWitrFfN6bP4PrsJmHT2DM2OFw==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-provider@9.22.12': - resolution: {integrity: sha512-GhNd18zORZ/7m37TjF3UTKAJCfRgCXZi3PcdoI5SvseR3SPWl93R8mYi0SDCe6tIw7TNgzCn6fS7X6O+hAV+rA==} + '@fluentui/react-provider@9.22.15': + resolution: {integrity: sha512-a+ImgL9DOlylDM4UYPnxQTA3yXxbVj+O0iNEyTZ6fMzdMsHzpALU4GAq6tOyW4L7RaQtRBmNpVfwTCEKpqaTJQ==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-radio@9.5.12': - resolution: {integrity: sha512-T0UdYn8comjc05SyZc37Cx8QT6ZhdGr/0az+ygK15uutRrj6ZQJV+xYAOo8rEwu5P51tD077nV8A9k1asf0TAQ==} + '@fluentui/react-radio@9.5.16': + resolution: {integrity: sha512-xHRqm+MTkIf6JLEz/dMLlHSL9X+ysXAkig+VOV5QTPZwDIr3SqfJVvBmLNUVmtzf+cmWsRKrrIbVGpFGo/CvxA==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-rating@9.3.12': - resolution: {integrity: sha512-q8P0sQ5b5EPNLJZH6jN37avhZkm5aHPmaE4btOHMsAYivh5CMtQfgsBZ5vO/z6acXTdWV+r5DoF1gKIMdwEtrA==} + '@fluentui/react-rating@9.3.15': + resolution: {integrity: sha512-MH/Jgoco8p+haf1d5Gi+d5VCjwd0qE6y/uP0YJsB9m11+DFnDxgKhzJKIiIzs3yzB2M4bMM8z9SqEHzQGCQEPg==} peerDependencies: '@types/react': '>=16.8.0 <20.0.0' '@types/react-dom': '>=16.8.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.8.0 <20.0.0' - '@fluentui/react-search@9.3.12': - resolution: {integrity: sha512-F1qvEaoeLh4aYTbRXI5gOb63EFjBTVBeb084RKAYAzFBaiv7w4nUdPAuyK6+mevtO+wSdUHvb9HFwrxkLpY05w==} + '@fluentui/react-search@9.3.16': + resolution: {integrity: sha512-7dKzGqIXzfhYxIKI1arGARkUDyQHYfwArlR6jKrhmYppXJh7U174xsjkMH62B78rDdNVer3G38MXXjpQ5MvNAQ==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-select@9.4.12': - resolution: {integrity: sha512-IwIc9qGNTmgMC/zP05mempBSaZWoSG3JknOoQjoFVpi6sOL4pw/1L2f2fH7DvnNQtWymFuXt9jEpJdI2xKPVTA==} + '@fluentui/react-select@9.4.16': + resolution: {integrity: sha512-YsHMZsiKxH8suBtNTBXhtsvjM0u9UUXH641cEumgtjUz7SzeKNc/cWToLVyNz7GIoANL49rvubkByTeAQVCo2g==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-shared-contexts@9.26.0': - resolution: {integrity: sha512-r52B+LUevs930pe45pFsppM9XNvY+ojgRgnDE+T/6aiwR/Mo4YoGrtjhLEzlQBeTGuySICTeaAiXfuH6Keo5Dg==} + '@fluentui/react-shared-contexts@9.26.2': + resolution: {integrity: sha512-upKXkwlIp5oIhELr4clAZXQkuCd4GDXM6GZEz8BOmRO+PnxyqmycCXvxDxsmi6XN+0vkGM4joiIgkB14o/FctQ==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' react: '>=16.14.0 <20.0.0' - '@fluentui/react-skeleton@9.4.12': - resolution: {integrity: sha512-aOaoOn4L3SMqGW83GmvGrRrv6TnT0uuxsDk6/mSfPW7P9QwhaZZQRiBiymH01RYSMBF9J3DFgZzKsKqVihts0w==} + '@fluentui/react-skeleton@9.5.0': + resolution: {integrity: sha512-hYmtzFV47HezmW+v6EcHJOz560uuBahn3iZQpUrfyOmKFMM5Ou1Hc1lq62vuxuA9pybEqwZsaMRydGP3Ms23YQ==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-slider@9.5.12': - resolution: {integrity: sha512-zfMyC0+ytNMtZEtqVXg+8l8dRrXAfRccPxofngZzHiVgLknMlc7L9jjWBYOGiB4VbO1XR/+D7/KrsjBf0xvXyA==} + '@fluentui/react-slider@9.5.16': + resolution: {integrity: sha512-IgFdKcnX1KXLpfaB9/CYPgAmC7lfJ0FGEl1Y1uHYiL2YV6Dc+4yoAsCBABC1/KcEeafqCiaFTdNhS62QRK7Tbg==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-spinbutton@9.5.12': - resolution: {integrity: sha512-+t7GOyJkaevduT6CYEX9PLlsdPnJKWeXP6Va1Ml2wFnDz8RtJTTqzbedSqmk8CLpwbZ8+/Ix40pIbp+9Q5v2Ow==} + '@fluentui/react-spinbutton@9.5.16': + resolution: {integrity: sha512-V4U9PSJM26BXrFqJ9K/VYYQeusBf8ldx5KOlZZ7hRamPsKTS5hyytWrF39lTLqCRlGckXPCLNzJpb1DLB+ID1g==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-spinner@9.7.12': - resolution: {integrity: sha512-8jTG1DTKipkpkaNwl9uxDs8yMKMK8ogzYrMMbNR1pfYVtpiDSfwxwZIXTqh9r1vS4SU3WnFQ0irRu1tIIumAnQ==} + '@fluentui/react-spinner@9.7.15': + resolution: {integrity: sha512-ZMJ7y08yvVXL9HuiMLLCy1cRn8plR9A4mL57CM2/otaXVWQbOwRaFD0/+Dx3u9A8sEtdYLo6O9gJIjU8fZGaYw==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-swatch-picker@9.4.12': - resolution: {integrity: sha512-c3OHBbPNneQLm+A9rzVaU757FPTBog+tYQU7nnmHlM0LZSTIhJf1XRBsLGNSnqmlAzLc94PjW/867SstQ+vuaQ==} + '@fluentui/react-swatch-picker@9.5.0': + resolution: {integrity: sha512-sl7MifqQGR4QGDhhgBIYc25YgPuFQW7+BOfNRMO5DYPq33lX5xHNcczhXywcBESAVHrjM0MC1lsE7glv6gU8RA==} peerDependencies: '@types/react': '>=16.8.0 <20.0.0' '@types/react-dom': '>=16.8.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.8.0 <20.0.0' - '@fluentui/react-switch@9.5.1': - resolution: {integrity: sha512-fa9EKNyssYwrkbWQn3CQ4IfnsVy+ttiRWom+s9eJDtM9NTtLZMJpei0Ve6vCD27SIbwBJhngWLe7j5/HeAg0uQ==} + '@fluentui/react-switch@9.6.1': + resolution: {integrity: sha512-UVHJViXSR5jrNyjtU3yqhr1F14TbY8V59wMw9N1vP027ztrLx3Q30sEt0xG1TXv5BoAERnXhHws9HVIxBpRvEA==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-table@9.19.6': - resolution: {integrity: sha512-LKGuFnYfknmaFCH35T0VjgbeaQIfg5SCVPgnNGKHDmNd85QvOR5AG7CMBm0LSltjZW6NFHblkRmnOkF2AkPucQ==} + '@fluentui/react-table@9.19.11': + resolution: {integrity: sha512-0ivIFR2JAp3HYlPnDrV5axBaOH06wtsQArBSOw6HXbQEz9JQ8Gi9SqEhQo6DBQ1/pcY3XeZjP+3r2HoFZXGaqA==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-tabs@9.10.8': - resolution: {integrity: sha512-Msxd4Ajhu+YZW7Iv5WQZBr2yynsOkwQjXkSH28ObjAZ/rFkb2Iq9uXvSAFJHba++Ecz1i2tchAsELWqT9oyLxA==} + '@fluentui/react-tabs@9.11.2': + resolution: {integrity: sha512-zmWzySlPM9EwHJNW0/JhyxBCqBvmfZIj1OZLdRDpbPDsKjhO0aGZV6WjLHFYJmq58kbN0wHKUbxc7LfafHHUwA==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-tabster@9.26.11': - resolution: {integrity: sha512-x2UjXowknK4gHJT14ezIeaLAKozZrpqsvWj8Mqa6p+TiOdHyo8YO6mecpCV1QWyz86qYsOPYhK/i0MSapwaELA==} + '@fluentui/react-tabster@9.26.13': + resolution: {integrity: sha512-uOuJj7jn1ME52Vc685/Ielf6srK/sfFQA5zBIbXIvy2Eisfp7R1RmJe2sXWoszz/Fu/XDkPwdM/GLv23N3vrvQ==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-tag-picker@9.7.14': - resolution: {integrity: sha512-SMrLFkuVdZ/UPLHhumodQcM/V4uxkS3GayCBykddn1OWtWGVLjN4idCes56XGdZyNq79u4BEu7Vtxwucjv3oXg==} + '@fluentui/react-tag-picker@9.8.2': + resolution: {integrity: sha512-j8a9X3jychd9KQ7uhzjoyDT8hcAH40d+ZeHXCLQ8PcYfDdoZSDWcmLNc+xCGmlf+UkhWQU1Ks7hdWqBjGpr0MA==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-tags@9.7.13': - resolution: {integrity: sha512-lg6C4b0RZKroQROSyezrLusR8/p/W6poQyKrJSEigiYhGZUm32Z+oi7qS7FDahVV/DA2vpRnuY/IfclIDszvTQ==} + '@fluentui/react-tags@9.7.17': + resolution: {integrity: sha512-LCJJqoXIiN+aNqFHC/5nddsQJqh56xzrywwpMbMrQYI/dbIk5UYlmZ6arIPhQ9HVKat3YzGKAvOGlhFhEHIwDg==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-teaching-popover@9.6.14': - resolution: {integrity: sha512-3FRyaoRSO/XJGiOJxRe1E7bdDPr8KZEX/Dp/IYRn45Y2War308sscaUUPz0N3ut9iRQlT2edsHSlBMNprLEXRQ==} + '@fluentui/react-teaching-popover@9.6.18': + resolution: {integrity: sha512-cf76vSRZs40geZEw/RChfQvu6ioMyFKR0qvPc52QstPDC/cgGkOg+45G7SZo11IpYwBdkpUVWasnWUWSxTMiHw==} peerDependencies: '@types/react': '>=16.8.0 <20.0.0' '@types/react-dom': '>=16.8.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.8.0 <20.0.0' - '@fluentui/react-text@9.6.12': - resolution: {integrity: sha512-IYiyYflw3ozS2Kil93vIqgu4JAJvFLswldJ5oBgBVOAM+MGG7G7He7Dp9tVRYxqHxkA54Um5Mv3HcUUgJ5sqww==} + '@fluentui/react-text@9.6.15': + resolution: {integrity: sha512-YB1azhq8MGfnYTGlEAX1mzcFZ6CvqkkaxaCogU4TM9BtPgQ1YUAxE01RMenl8VVi8W9hNbJKkuc8R8GzYwzT4Q==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-textarea@9.6.12': - resolution: {integrity: sha512-xoRYQpc76qc0WsAlOKhygnhZActTbbPvNdQU12R6bk6P4fUPBgX6rNMsNv6cVSr3ZvPuWn3bQq80PjPO10iezA==} + '@fluentui/react-textarea@9.6.16': + resolution: {integrity: sha512-d72Ufs//9T+X7lIrY1D28/9BiVqtKSjZ5hHVgBnJJwuPSFAKn5b4jlysXkNKHEdMjJz57kYMK4Ieneyz+Xkhrw==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-theme@9.2.0': - resolution: {integrity: sha512-Q0zp/MY1m5RjlkcwMcjn/PQRT2T+q3bgxuxWbhgaD07V+tLzBhGROvuqbsdg4YWF/IK21zPfLhmGyifhEu0DnQ==} + '@fluentui/react-theme@9.2.1': + resolution: {integrity: sha512-lJxfz7LmmglFz+c9C41qmMqaRRZZUPtPPl9DWQ79vH+JwZd4dkN7eA78OTRwcGCOTPEKoLTX72R+EFaWEDlX+w==} - '@fluentui/react-toast@9.7.10': - resolution: {integrity: sha512-Zvh/19VpFXft7VFvlHEyURg766RyKBE6eekrmtgE416ow07pfn1a7X7VqTyfp90uEaJsowB//twJNjCc3r3oAw==} + '@fluentui/react-toast@9.7.15': + resolution: {integrity: sha512-iuk4rf/WumpGrNIpRVLNamlPBY0rT9BhI4qTnVmzXqz5pY+8GmAq/TKUPER9/withtQW8V9srj91FWblxzpHRg==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-toolbar@9.6.14': - resolution: {integrity: sha512-wjUqbfNSGlmgpMsJvpd8C7qzXUav3pb88ctyzziweURZskOMAIx8wv0PHUih9h9haMB5ayTiLuJL4Lcpv6jNlA==} + '@fluentui/react-toolbar@9.7.4': + resolution: {integrity: sha512-cpr+vJAzHJckN4S+JFSIeH4cg6q8pQuLVldH3ETrtNnWKERHeiY9ljAq3fbi/fU7ohgDit0DZnWUACrNu0pQQA==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-tooltip@9.8.12': - resolution: {integrity: sha512-ZA36KqmGWhK1HmNd1HO5p3Fz3cM06p/1kSKEB6b+F2opY+Db8IQGa6ER8wVtxLnUs/WFrcjJPcy7DuD2oyeSFQ==} + '@fluentui/react-tooltip@9.9.3': + resolution: {integrity: sha512-a351JFoaBAOn0SnQ76tzuNv2ieHzAS+VO8Ncy4m9/emrIs5lvBBfKX8fvA4/efVxY+683XEQdoL1LuApuJuTWw==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-tree@9.15.8': - resolution: {integrity: sha512-T2USjFQ2tPb0TzX3FagifQzJKYGq0T8IQYHdfHO7LP7sThI13Mnt6ke7mGC3SOPi8WKUCMRaoXAksbggUMXFUQ==} + '@fluentui/react-tree@9.15.13': + resolution: {integrity: sha512-ITT8SlYXfG+Wi0FYPJOqwROTa6Po2VZEtolUq9jPjMy5/q+Vto++fdHyWaVn3a5Joq6w576RDP1ZnlS7qoFPgg==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/react-utilities@9.26.0': - resolution: {integrity: sha512-3i/Vdt9UzDs/vuQvdR6HJFMhkOqB22lOGJ+v6VpkjGO81ywnQwP4LKkaKK534q+qiVbcKumCkHOeRhtMAUJXPQ==} + '@fluentui/react-utilities@9.26.2': + resolution: {integrity: sha512-Yp2GGNoWifj8Z/VVir4HyRumRsqXnLJd4IP/Y70vEm9ruAvyqUvfn+1lQUuA+k/Reqw8GI+Ix7FTo3rogixZBg==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' react: '>=16.14.0 <20.0.0' - '@fluentui/react-virtualizer@9.0.0-alpha.108': - resolution: {integrity: sha512-2uaGDhGbVZqBd/INh2tiSefVUwdAPK/PDJ8e0pJ34+N77A1Mcq9eSbyaBp5GLZ/GcycHAWnnyDCall9Avpqo6g==} + '@fluentui/react-virtualizer@9.0.0-alpha.111': + resolution: {integrity: sha512-yku++0779Ve1RNz6y/HWjlXKd2x1wCSbWMydT2IdCICBVwolXjPYMpkqqZUSjbJ0N9gl6BfsCBpU9Dfe2bR8Zg==} peerDependencies: '@types/react': '>=16.14.0 <20.0.0' '@types/react-dom': '>=16.9.0 <20.0.0' react: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0' - '@fluentui/tokens@1.0.0-alpha.22': - resolution: {integrity: sha512-i9fgYyyCWFRdUi+vQwnV6hp7wpLGK4p09B+O/f2u71GBXzPuniubPYvrIJYtl444DD6shLjYToJhQ1S6XTFwLg==} + '@fluentui/tokens@1.0.0-alpha.23': + resolution: {integrity: sha512-uxrzF9Z+J10naP0pGS7zPmzSkspSS+3OJDmYIK3o1nkntQrgBXq3dBob4xSlTDm5aOQ0kw6EvB9wQgtlyy4eKQ==} '@fortawesome/fontawesome-free@6.7.2': resolution: {integrity: sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==} engines: {node: '>=6'} - '@gerrit0/mini-shiki@3.21.0': - resolution: {integrity: sha512-9PrsT5DjZA+w3lur/aOIx3FlDeHdyCEFlv9U+fmsVyjPZh61G5SYURQ/1ebe2U63KbDmI2V8IhIUegWb8hjOyg==} + '@gar/promise-retry@1.0.2': + resolution: {integrity: sha512-Lm/ZLhDZcBECta3TmCQSngiQykFdfw+QtI1/GYMsZd4l3nG+P8WLB16XuS7WaBGLQ+9E+cOcWQsth9cayuGt8g==} + engines: {node: ^20.17.0 || >=22.9.0} + + '@gerrit0/mini-shiki@3.23.0': + resolution: {integrity: sha512-bEMORlG0cqdjVyCEuU0cDQbORWX+kYCeo0kV1lbxF5bt4r7SID2l9bqsxJEM0zndaxpOUT7riCyIVEuqq/Ynxg==} - '@griffel/core@1.19.2': - resolution: {integrity: sha512-WkB/QQkjy9dE4vrNYGhQvRRUHFkYVOuaznVOMNTDT4pS9aTJ9XPrMTXXlkpcwaf0D3vNKoerj4zAwnU2lBzbOg==} + '@griffel/core@1.20.1': + resolution: {integrity: sha512-ld1mX04zpmeHn8agx4slSEh8kJ+8or3Y0x9gsJNKSKn6GdCkZBSiGUh+oBXCBn8RKzz8l60TA9IhVSStnyKekA==} - '@griffel/react@1.5.32': - resolution: {integrity: sha512-jN3SmSwAUcWFUQuQ9jlhqZ5ELtKY21foaUR0q1mJtiAeSErVgjkpKJyMLRYpvaFGWrDql0Uz23nXUogXbsS2wQ==} + '@griffel/react@1.6.1': + resolution: {integrity: sha512-mNM4/+dIXzqeHboWpVZ1/jiwTAYNc5/8y/V/HasnQ2QXnV6gSUYpeUk/0n6IFU3NJmVJly9JrLSfNo0hM/IFeA==} peerDependencies: react: '>=16.8.0 <20.0.0' - '@griffel/style-types@1.3.0': - resolution: {integrity: sha512-bHwD3sUE84Xwv4dH011gOKe1jul77M1S6ZFN9Tnq8pvZ48UMdY//vtES6fv7GRS5wXYT4iqxQPBluAiYAfkpmw==} + '@griffel/style-types@1.4.0': + resolution: {integrity: sha512-vNDfOGV7RN/XkA7vxgf7Z5HgW8eiBm5cHT9wQPhsKB4pxWom5u6eQ9CkYE5mCCTSPl9H6Nd1NBai04d4P6BD7Q==} '@gwhitney/detect-indent@7.0.1': resolution: {integrity: sha512-7bQW+gkKa2kKZPeJf6+c6gFK9ARxQfn+FKy9ScTBppyKRWH2KzsmweXUoklqeEiHiNVWaeP5csIdsNq6w7QhzA==} @@ -4418,8 +4846,8 @@ packages: '@iconify/utils@3.1.0': resolution: {integrity: sha512-Zlzem1ZXhI1iHeeERabLNzBHdOa4VhQbqAcOQaMKuTuyZCpwKbC2R4Dd0Zo3g9EAc+Y4fiarO8HIHRAth7+skw==} - '@img/colour@1.0.0': - resolution: {integrity: sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==} + '@img/colour@1.1.0': + resolution: {integrity: sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==} engines: {node: '>=18'} '@img/sharp-darwin-arm64@0.34.5': @@ -4575,8 +5003,8 @@ packages: resolution: {integrity: sha512-g44zhR3NIKVs0zUesa4iMzExmZpLUdTLRMCStqX3GE5NT6VkPcxQGJ+uC8tDgBUC/vB1rUhUd55cOf++4NZcmw==} engines: {node: '>=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0'} - '@inquirer/checkbox@5.0.4': - resolution: {integrity: sha512-DrAMU3YBGMUAp6ArwTIp/25CNDtDbxk7UjIrrtM25JVVrlVYlVzHh5HR1BDFu9JMyUoZ4ZanzeaHqNDttf3gVg==} + '@inquirer/checkbox@5.1.0': + resolution: {integrity: sha512-/HjF1LN0a1h4/OFsbGKHNDtWICFU/dqXCdym719HFTyJo9IG7Otr+ziGWc9S0iQuohRZllh+WprSgd5UW5Fw0g==} engines: {node: '>=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0'} peerDependencies: '@types/node': '>=18' @@ -4584,8 +5012,8 @@ packages: '@types/node': optional: true - '@inquirer/confirm@6.0.4': - resolution: {integrity: sha512-WdaPe7foUnoGYvXzH4jp4wH/3l+dBhZ3uwhKjXjwdrq5tEIFaANxj6zrGHxLdsIA0yKM0kFPVcEalOZXBB5ISA==} + '@inquirer/confirm@6.0.8': + resolution: {integrity: sha512-Di6dgmiZ9xCSUxWUReWTqDtbhXCuG2MQm2xmgSAIruzQzBqNf49b8E07/vbCYY506kDe8BiwJbegXweG8M1klw==} engines: {node: '>=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0'} peerDependencies: '@types/node': '>=18' @@ -4593,8 +5021,8 @@ packages: '@types/node': optional: true - '@inquirer/core@11.1.1': - resolution: {integrity: sha512-hV9o15UxX46OyQAtaoMqAOxGR8RVl1aZtDx1jHbCtSJy1tBdTfKxLPKf7utsE4cRy4tcmCQ4+vdV+ca+oNxqNA==} + '@inquirer/core@11.1.5': + resolution: {integrity: sha512-QQPAX+lka8GyLcZ7u7Nb1h6q72iZ/oy0blilC3IB2nSt1Qqxp7akt94Jqhi/DzARuN3Eo9QwJRvtl4tmVe4T5A==} engines: {node: '>=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0'} peerDependencies: '@types/node': '>=18' @@ -4602,8 +5030,8 @@ packages: '@types/node': optional: true - '@inquirer/editor@5.0.4': - resolution: {integrity: sha512-QI3Jfqcv6UO2/VJaEFONH8Im1ll++Xn/AJTBn9Xf+qx2M+H8KZAdQ5sAe2vtYlo+mLW+d7JaMJB4qWtK4BG3pw==} + '@inquirer/editor@5.0.8': + resolution: {integrity: sha512-sLcpbb9B3XqUEGrj1N66KwhDhEckzZ4nI/W6SvLXyBX8Wic3LDLENlWRvkOGpCPoserabe+MxQkpiMoI8irvyA==} engines: {node: '>=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0'} peerDependencies: '@types/node': '>=18' @@ -4611,8 +5039,8 @@ packages: '@types/node': optional: true - '@inquirer/expand@5.0.4': - resolution: {integrity: sha512-0I/16YwPPP0Co7a5MsomlZLpch48NzYfToyqYAOWtBmaXSB80RiNQ1J+0xx2eG+Wfxt0nHtpEWSRr6CzNVnOGg==} + '@inquirer/expand@5.0.8': + resolution: {integrity: sha512-QieW3F1prNw3j+hxO7/NKkG1pk3oz7pOB6+5Upwu3OIwADfPX0oZVppsqlL+Vl/uBHHDSOBY0BirLctLnXwGGg==} engines: {node: '>=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0'} peerDependencies: '@types/node': '>=18' @@ -4633,8 +5061,8 @@ packages: resolution: {integrity: sha512-y09iGt3JKoOCBQ3w4YrSJdokcD8ciSlMIWsD+auPu+OZpfxLuyz+gICAQ6GCBOmJJt4KEQGHuZSVff2jiNOy7g==} engines: {node: '>=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0'} - '@inquirer/input@5.0.4': - resolution: {integrity: sha512-4B3s3jvTREDFvXWit92Yc6jF1RJMDy2VpSqKtm4We2oVU65YOh2szY5/G14h4fHlyQdpUmazU5MPCFZPRJ0AOw==} + '@inquirer/input@5.0.8': + resolution: {integrity: sha512-p0IJslw0AmedLEkOU+yrEX3Aj2RTpQq7ZOf8nc1DIhjzaxRWrrgeuE5Kyh39fVRgtcACaMXx/9WNo8+GjgBOfw==} engines: {node: '>=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0'} peerDependencies: '@types/node': '>=18' @@ -4642,8 +5070,8 @@ packages: '@types/node': optional: true - '@inquirer/number@4.0.4': - resolution: {integrity: sha512-CmMp9LF5HwE+G/xWsC333TlCzYYbXMkcADkKzcawh49fg2a1ryLc7JL1NJYYt1lJ+8f4slikNjJM9TEL/AljYQ==} + '@inquirer/number@4.0.8': + resolution: {integrity: sha512-uGLiQah9A0F9UIvJBX52m0CnqtLaym0WpT9V4YZrjZ+YRDKZdwwoEPz06N6w8ChE2lrnsdyhY9sL+Y690Kh9gQ==} engines: {node: '>=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0'} peerDependencies: '@types/node': '>=18' @@ -4651,8 +5079,8 @@ packages: '@types/node': optional: true - '@inquirer/password@5.0.4': - resolution: {integrity: sha512-ZCEPyVYvHK4W4p2Gy6sTp9nqsdHQCfiPXIP9LbJVW4yCinnxL/dDDmPaEZVysGrj8vxVReRnpfS2fOeODe9zjg==} + '@inquirer/password@5.0.8': + resolution: {integrity: sha512-zt1sF4lYLdvPqvmvHdmjOzuUUjuCQ897pdUCO8RbXMUDKXJTTyOQgtn23le+jwcb+MpHl3VAFvzIdxRAf6aPlA==} engines: {node: '>=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0'} peerDependencies: '@types/node': '>=18' @@ -4660,8 +5088,8 @@ packages: '@types/node': optional: true - '@inquirer/prompts@8.2.0': - resolution: {integrity: sha512-rqTzOprAj55a27jctS3vhvDDJzYXsr33WXTjODgVOru21NvBo9yIgLIAf7SBdSV0WERVly3dR6TWyp7ZHkvKFA==} + '@inquirer/prompts@8.3.0': + resolution: {integrity: sha512-JAj66kjdH/F1+B7LCigjARbwstt3SNUOSzMdjpsvwJmzunK88gJeXmcm95L9nw1KynvFVuY4SzXh/3Y0lvtgSg==} engines: {node: '>=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0'} peerDependencies: '@types/node': '>=18' @@ -4669,8 +5097,8 @@ packages: '@types/node': optional: true - '@inquirer/rawlist@5.2.0': - resolution: {integrity: sha512-CciqGoOUMrFo6HxvOtU5uL8fkjCmzyeB6fG7O1vdVAZVSopUBYECOwevDBlqNLyyYmzpm2Gsn/7nLrpruy9RFg==} + '@inquirer/rawlist@5.2.4': + resolution: {integrity: sha512-fTuJ5Cq9W286isLxwj6GGyfTjx1Zdk4qppVEPexFuA6yioCCXS4V1zfKroQqw7QdbDPN73xs2DiIAlo55+kBqg==} engines: {node: '>=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0'} peerDependencies: '@types/node': '>=18' @@ -4678,8 +5106,8 @@ packages: '@types/node': optional: true - '@inquirer/search@4.1.0': - resolution: {integrity: sha512-EAzemfiP4IFvIuWnrHpgZs9lAhWDA0GM3l9F4t4mTQ22IFtzfrk8xbkMLcAN7gmVML9O/i+Hzu8yOUyAaL6BKA==} + '@inquirer/search@4.1.4': + resolution: {integrity: sha512-9yPTxq7LPmYjrGn3DRuaPuPbmC6u3fiWcsE9ggfLcdgO/ICHYgxq7mEy1yJ39brVvgXhtOtvDVjDh9slJxE4LQ==} engines: {node: '>=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0'} peerDependencies: '@types/node': '>=18' @@ -4687,8 +5115,8 @@ packages: '@types/node': optional: true - '@inquirer/select@5.0.4': - resolution: {integrity: sha512-s8KoGpPYMEQ6WXc0dT9blX2NtIulMdLOO3LA1UKOiv7KFWzlJ6eLkEYTDBIi+JkyKXyn8t/CD6TinxGjyLt57g==} + '@inquirer/select@5.1.0': + resolution: {integrity: sha512-OyYbKnchS1u+zRe14LpYrN8S0wH1vD0p2yKISvSsJdH2TpI87fh4eZdWnpdbrGauCRWDph3NwxRmM4Pcm/hx1Q==} engines: {node: '>=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0'} peerDependencies: '@types/node': '>=18' @@ -4705,18 +5133,14 @@ packages: '@types/node': optional: true - '@isaacs/balanced-match@4.0.1': - resolution: {integrity: sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==} - engines: {node: 20 || >=22} - - '@isaacs/brace-expansion@5.0.0': - resolution: {integrity: sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==} - engines: {node: 20 || >=22} - '@isaacs/cliui@8.0.2': resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} + '@isaacs/cliui@9.0.0': + resolution: {integrity: sha512-AokJm4tuBHillT+FpMtxQ60n8ObyXBatq7jD2/JA9dxbDDokKQm8KMht5ibGzLVU9IJDIKK4TPKgMHEYMn3lMg==} + engines: {node: '>=18'} + '@isaacs/fs-minipass@4.0.1': resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==} engines: {node: '>=18.0.0'} @@ -4725,8 +5149,8 @@ packages: resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==} engines: {node: '>=8'} - '@joshwooding/vite-plugin-react-docgen-typescript@0.6.3': - resolution: {integrity: sha512-9TGZuAX+liGkNKkwuo3FYJu7gHWT0vkBcf7GkOe7s7fmC19XwH/4u5u7sDIFrMooe558ORcmuBvBz7Ur5PlbHw==} + '@joshwooding/vite-plugin-react-docgen-typescript@0.6.4': + resolution: {integrity: sha512-6PyZBYKnnVNqOSB0YFly+62R7dmov8segT27A+RVTBVd4iAE6kbW9QBJGlyR2yG4D4ohzhZSTIu7BK1UTtmFFA==} peerDependencies: typescript: '>= 4.3.x' vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 @@ -4757,17 +5181,23 @@ packages: resolution: {integrity: sha512-x/iUDjcS90W69PryLDIMgFyV21YLTnG9zOpPXS7Bkt2b8AsY3zZsIpOLBkYr9fBcF3HbkKaER5hOBZLfpLgYNw==} engines: {node: '>= 14.0.0'} - '@koa/router@15.2.0': - resolution: {integrity: sha512-7YUhq4W83cybfNa4E7JqJpWzoCTSvbnFltkvRaUaUX1ybFzlUoLNY1SqT8XmIAO6nGbFrev+FvJHw4mL+4WhuQ==} + '@koa/router@15.3.1': + resolution: {integrity: sha512-n7UgxsPmgKtEsrguz8a0d6BNx3lO2x52Z4UqkGsGwJculk4TlzZf3btd3QZMq1r1M+bSxUkBbyul4mDhysIVaQ==} engines: {node: '>= 20'} peerDependencies: koa: ^2.0.0 || ^3.0.0 + '@kwsites/file-exists@1.1.1': + resolution: {integrity: sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==} + + '@kwsites/promise-deferred@1.1.1': + resolution: {integrity: sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==} + '@mdx-js/mdx@3.1.1': resolution: {integrity: sha512-f6ZO2ifpwAQIpzGWaBQT2TXxPv6z3RBzQKpVftEWN78Vl/YweF1uwussDx8ECAXVtr3Rs89fKyG9YlzUs9DyGQ==} - '@mermaid-js/parser@0.6.3': - resolution: {integrity: sha512-lnjOhe7zyHjc+If7yT4zoedx2vo4sHaTmtkl1+or8BRTnCtDmcTpAjpzDSfCZrshM5bCoz0GyidzadJAH1xobA==} + '@mermaid-js/parser@1.0.1': + resolution: {integrity: sha512-opmV19kN1JsK0T6HhhokHpcVkqKpF+x2pPDKKM2ThHtZAB5F4PROopk0amuVYK5qMrIA4erzpNm8gmPNJgMDxQ==} '@microsoft/1ds-core-js@4.3.11': resolution: {integrity: sha512-QyQE/YzFYB+31WEpX9hvDoXZOIXA7308Z5uuL1mSsyDSkNPl24hBWz9O3vZL+/p9shy756eKLI2nFLwwIAhXyw==} @@ -4775,11 +5205,11 @@ packages: '@microsoft/1ds-post-js@4.3.11': resolution: {integrity: sha512-V0ZeeALy/Pj8HWgNHDsK+yDeCYnJ9bCgTWhcrna/ZiAT+sGfWs6mDBjAVcG03uP7TDjdWLf8w79lgbXJ3+s3DA==} - '@microsoft/api-extractor-model@7.32.2': - resolution: {integrity: sha512-Ussc25rAalc+4JJs9HNQE7TuO9y6jpYQX9nWD1DhqUzYPBr3Lr7O9intf+ZY8kD5HnIqeIRJX7ccCT0QyBy2Ww==} + '@microsoft/api-extractor-model@7.33.4': + resolution: {integrity: sha512-u1LTaNTikZAQ9uK6KG1Ms7nvNedsnODnspq/gH2dcyETWvH4hVNGNDvRAEutH66kAmxA4/necElqGNs1FggC8w==} - '@microsoft/api-extractor@7.55.2': - resolution: {integrity: sha512-1jlWO4qmgqYoVUcyh+oXYRztZde/pAi7cSVzBz/rc+S7CoVzDasy8QE13dx6sLG4VRo8SfkkLbFORR6tBw4uGQ==} + '@microsoft/api-extractor@7.57.7': + resolution: {integrity: sha512-kmnmVs32MFWbV5X6BInC1/TfCs7y1ugwxv1xHsAIj/DyUfoe7vtO0alRUgbQa57+yRGHBBjlNcEk33SCAt5/dA==} hasBin: true '@microsoft/applicationinsights-channel-js@3.3.11': @@ -4808,17 +5238,20 @@ packages: '@microsoft/dynamicproto-js@2.0.3': resolution: {integrity: sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==} - '@microsoft/tsdoc-config@0.18.0': - resolution: {integrity: sha512-8N/vClYyfOH+l4fLkkr9+myAoR6M7akc8ntBJ4DJdWH2b09uVfr71+LTMpNyG19fNqWDg8KEDZhx5wxuqHyGjw==} + '@microsoft/tsdoc-config@0.18.1': + resolution: {integrity: sha512-9brPoVdfN9k9g0dcWkFeA7IH9bbcttzDJlXvkf8b2OBzd5MueR1V2wkKBL0abn0otvmkHJC6aapBOTJDDeMCZg==} '@microsoft/tsdoc@0.16.0': resolution: {integrity: sha512-xgAyonlVVS+q7Vc7qLW0UrJU7rSFcETRWsqdXZtjzRU8dF+6CkozTK4V4y1LwOX7j8r/vHphjDeMeGI4tNGeGA==} + '@napi-rs/wasm-runtime@1.1.1': + resolution: {integrity: sha512-p64ah1M1ld8xjWv3qbvFwHiFVWrq1yFvV4f7w+mzaqiR4IlSgkqhcRdHwsGgomwzBH51sRY4NEowLxnaBjcW/A==} + '@nevware21/ts-async@0.5.5': resolution: {integrity: sha512-vwqaL05iJPjLeh5igPi8MeeAu10i+Aq7xko1fbo9F5Si6MnVN5505qaV7AhSdk5MCBJVT/UYMk3kgInNjDb4Ig==} - '@nevware21/ts-utils@0.12.5': - resolution: {integrity: sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==} + '@nevware21/ts-utils@0.13.0': + resolution: {integrity: sha512-F3mD+DsUn9OiZmZc5tg0oKqrJCtiCstwx+wE+DNzFYh2cCRUuzTYdK9zGGP/au2BWvbOQ6Tqlbjr2+dT1P3AlQ==} '@nodelib/fs.scandir@2.1.5': resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} @@ -4848,8 +5281,8 @@ packages: resolution: {integrity: sha512-7OsC1gNORBEawOa5+j2pXN9vsicaIOH5cPXxoR6fJOmH6/EXpJB2CajXOu1fPRFun2m1lktEFX11+P89hqO/og==} engines: {node: ^20.17.0 || >=22.9.0} - '@npmcli/git@7.0.1': - resolution: {integrity: sha512-+XTFxK2jJF/EJJ5SoAzXk3qwIDfvFc5/g+bD274LZ7uY7LE8sTfG6Z8rOanPl2ZEvZWqNvmEdtXC25cE54VcoA==} + '@npmcli/git@7.0.2': + resolution: {integrity: sha512-oeolHDjExNAJAnlYP2qzNjMX/Xi9bmu78C9dIGr4xjobrSKbuMYCph8lTzn4vnW3NjIqVmw/f8BCfouqyJXlRg==} engines: {node: ^20.17.0 || >=22.9.0} '@npmcli/installed-package-contents@4.0.0': @@ -4861,8 +5294,8 @@ packages: resolution: {integrity: sha512-uuG5HZFXLfyFKqg8QypsmgLQW7smiRjVc45bqD/ofZZcR/uxEjgQU8qDPv0s9TEeMUiAAU/GC5bR6++UdTirIQ==} engines: {node: ^20.17.0 || >=22.9.0} - '@npmcli/package-json@7.0.4': - resolution: {integrity: sha512-0wInJG3j/K40OJt/33ax47WfWMzZTm6OQxB9cDhTt5huCP2a9g2GnlsxmfN+PulItNPIpPrZ+kfwwUil7eHcZQ==} + '@npmcli/package-json@7.0.5': + resolution: {integrity: sha512-iVuTlG3ORq2iaVa1IWUxAO/jIp77tUKBhoMjuzYW2kL4MLN1bi/ofqkZ7D7OOwh8coAx1/S2ge0rMdGv8sLSOQ==} engines: {node: ^20.17.0 || >=22.9.0} '@npmcli/promise-spawn@9.0.1': @@ -4873,16 +5306,16 @@ packages: resolution: {integrity: sha512-gOBg5YHMfZy+TfHArfVogwgfBeQnKbbGo3pSUyK/gSI0AVu+pEiDVcKlQb0D8Mg1LNRZILZ6XG8I5dJ4KuAd9Q==} engines: {node: ^20.17.0 || >=22.9.0} - '@npmcli/run-script@10.0.3': - resolution: {integrity: sha512-ER2N6itRkzWbbtVmZ9WKaWxVlKlOeBFF1/7xx+KA5J1xKa4JjUwBdb6tDpk0v1qA+d+VDwHI9qmLcXSWcmi+Rw==} + '@npmcli/run-script@10.0.4': + resolution: {integrity: sha512-mGUWr1uMnf0le2TwfOZY4SFxZGXGfm4Jtay/nwAa2FLNAKXUoUwaGwBMNH36UHPtinWfTSJ3nqFQr0091CxVGg==} engines: {node: ^20.17.0 || >=22.9.0} '@octokit/app@16.1.2': resolution: {integrity: sha512-8j7sEpUYVj18dxvh0KWj6W/l6uAiVRBl1JBDVRqH1VHKAO/G5eRVl4yEoYACjakWers1DjUkcCHyJNQK47JqyQ==} engines: {node: '>= 20'} - '@octokit/auth-app@8.1.2': - resolution: {integrity: sha512-db8VO0PqXxfzI6GdjtgEFHY9tzqUql5xMFXYA12juq8TeTgPAuiiP3zid4h50lwlIP457p5+56PnJOgd2GGBuw==} + '@octokit/auth-app@8.2.0': + resolution: {integrity: sha512-vVjdtQQwomrZ4V46B9LaCsxsySxGoHsyw6IYBov/TqJVROrlYdyNgw5q6tQbB7KZt53v1l1W53RiqTvpzL907g==} engines: {node: '>= 20'} '@octokit/auth-oauth-app@9.0.3': @@ -4897,10 +5330,6 @@ packages: resolution: {integrity: sha512-qLoPPc6E6GJoz3XeDG/pnDhJpTkODTGG4kY0/Py154i/I003O9NazkrwJwRuzgCalhzyIeWQ+6MDvkUmKXjg/A==} engines: {node: '>= 20'} - '@octokit/auth-token@5.1.2': - resolution: {integrity: sha512-JcQDsBdg49Yky2w2ld20IHAlwr8d/d8N6NiOXbtuoPCqzbsiJgF633mVUw3x4mo0H5ypataQIX7SFu3yy44Mpw==} - engines: {node: '>= 18'} - '@octokit/auth-token@6.0.0': resolution: {integrity: sha512-P4YJBPdPSpWTQ1NU4XYdvHvXJJDxM6YwpS0FZHRgP7YFkdVxsWcpWGy/NVqlAA7PcPCnMacXlRm1y2PFZRWL/w==} engines: {node: '>= 20'} @@ -4909,26 +5338,14 @@ packages: resolution: {integrity: sha512-8Jb1mtUdmBHL7lGmop9mU9ArMRUTRhg8vp0T1VtZ4yd9vEm3zcLwmjQkhNEduKawOOORie61xhtYIhTDN+ZQ3g==} engines: {node: '>= 20'} - '@octokit/core@6.1.6': - resolution: {integrity: sha512-kIU8SLQkYWGp3pVKiYzA5OSaNF5EE03P/R8zEmmrG6XwOg5oBjXyQVVIauQ0dgau4zYhpZEhJrvIYt6oM+zZZA==} - engines: {node: '>= 18'} - '@octokit/core@7.0.6': resolution: {integrity: sha512-DhGl4xMVFGVIyMwswXeyzdL4uXD5OGILGX5N8Y+f6W7LhC1Ze2poSNrkF/fedpVDHEEZ+PHFW0vL14I+mm8K3Q==} engines: {node: '>= 20'} - '@octokit/endpoint@10.1.4': - resolution: {integrity: sha512-OlYOlZIsfEVZm5HCSR8aSg02T2lbUWOsCQoPKfTXJwDzcHQBrVBGdGXb89dv2Kw2ToZaRtudp8O3ZIYoaOjKlA==} - engines: {node: '>= 18'} - - '@octokit/endpoint@11.0.2': - resolution: {integrity: sha512-4zCpzP1fWc7QlqunZ5bSEjxc6yLAlRTnDwKtgXfcI/FxxGoqedDG8V2+xJ60bV2kODqcGB+nATdtap/XYq2NZQ==} + '@octokit/endpoint@11.0.3': + resolution: {integrity: sha512-FWFlNxghg4HrXkD3ifYbS/IdL/mDHjh9QcsNyhQjN8dplUoZbejsdpmuqdA76nxj2xoWPs7p8uX2SNr9rYu0Ag==} engines: {node: '>= 20'} - '@octokit/graphql@8.2.2': - resolution: {integrity: sha512-Yi8hcoqsrXGdt0yObxbebHXFOiUA+2v3n53epuOg1QUgOB6c4XzvisBNVXJSl8RYA5KrDuSL2yq9Qmqe5N0ryA==} - engines: {node: '>= 18'} - '@octokit/graphql@9.0.3': resolution: {integrity: sha512-grAEuupr/C1rALFnXTv6ZQhFuL1D8G5y8CN04RgrO4FIPMrtm+mcZzFG7dcBm+nq+1ppNixu+Jd78aeJOYxlGA==} engines: {node: '>= 20'} @@ -4945,12 +5362,6 @@ packages: resolution: {integrity: sha512-HiNOO3MqLxlt5Da5bZbLV8Zarnphi4y9XehrbaFMkcoJ+FL7sMxH/UlUsCVxpddVu4qvNDrBdaTVE2o4ITK8ng==} engines: {node: '>= 20'} - '@octokit/openapi-types@24.2.0': - resolution: {integrity: sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==} - - '@octokit/openapi-types@25.1.0': - resolution: {integrity: sha512-idsIggNXUKkk0+BExUn1dQ92sfysJrje03Q0bv0e+KPLrvyqZF8MnBpFz8UNfYDwB3Ie7Z0TByjWfzxt7vseaA==} - '@octokit/openapi-types@27.0.0': resolution: {integrity: sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==} @@ -4963,27 +5374,15 @@ packages: peerDependencies: '@octokit/core': '>=6' - '@octokit/plugin-paginate-rest@11.6.0': - resolution: {integrity: sha512-n5KPteiF7pWKgBIBJSk8qzoZWcUkza2O6A0za97pMGVrGfPdltxrfmfF5GucHYvHGZD8BdaZmmHGz5cX/3gdpw==} - engines: {node: '>= 18'} - peerDependencies: - '@octokit/core': '>=6' - '@octokit/plugin-paginate-rest@14.0.0': resolution: {integrity: sha512-fNVRE7ufJiAA3XUrha2omTA39M6IXIc6GIZLvlbsm8QOQCYvpq/LkMNGyFlB1d8hTDzsAXa3OKtybdMAYsV/fw==} engines: {node: '>= 20'} peerDependencies: '@octokit/core': '>=6' - '@octokit/plugin-request-log@5.3.1': - resolution: {integrity: sha512-n/lNeCtq+9ofhC15xzmJCNKP2BWTv8Ih2TTy+jatNCCq/gQP/V7rK3fjIfuz0pDWDALO/o/4QY4hyOF6TQQFUw==} - engines: {node: '>= 18'} - peerDependencies: - '@octokit/core': '>=6' - - '@octokit/plugin-rest-endpoint-methods@13.5.0': - resolution: {integrity: sha512-9Pas60Iv9ejO3WlAX3maE1+38c5nqbJXV5GrncEfkndIpZrJ/WPMRd2xYDcPPEt5yzpxcjw9fWNoPhsSGzqKqw==} - engines: {node: '>= 18'} + '@octokit/plugin-request-log@6.0.0': + resolution: {integrity: sha512-UkOzeEN3W91/eBq9sPZNQ7sUBvYCqYbrrD8gTbBuGtHEuycE4/awMXcYvx6sVYo7LypPhmQwwpUe4Yyu4QZN5Q==} + engines: {node: '>= 20'} peerDependencies: '@octokit/core': '>=6' @@ -4993,8 +5392,8 @@ packages: peerDependencies: '@octokit/core': '>=6' - '@octokit/plugin-retry@8.0.3': - resolution: {integrity: sha512-vKGx1i3MC0za53IzYBSBXcrhmd+daQDzuZfYDd52X5S0M2otf3kVZTVP8bLA3EkU0lTvd1WEC2OlNNa4G+dohA==} + '@octokit/plugin-retry@8.1.0': + resolution: {integrity: sha512-O1FZgXeiGb2sowEr/hYTr6YunGdSAFWnr2fyW39Ah85H8O33ELASQxcvOFF5LE6Tjekcyu2ms4qAzJVhSaJxTw==} engines: {node: '>= 20'} peerDependencies: '@octokit/core': '>=7' @@ -5005,31 +5404,17 @@ packages: peerDependencies: '@octokit/core': ^7.0.0 - '@octokit/request-error@6.1.8': - resolution: {integrity: sha512-WEi/R0Jmq+IJKydWlKDmryPcmdYSVjL3ekaiEL1L9eo1sUnqMJ+grqmC9cjk7CA7+b2/T397tO5d8YLOH3qYpQ==} - engines: {node: '>= 18'} - '@octokit/request-error@7.1.0': resolution: {integrity: sha512-KMQIfq5sOPpkQYajXHwnhjCC0slzCNScLHs9JafXc4RAJI+9f+jNDlBNaIMTvazOPLgb4BnlhGJOTbnN0wIjPw==} engines: {node: '>= 20'} - '@octokit/request@10.0.7': - resolution: {integrity: sha512-v93h0i1yu4idj8qFPZwjehoJx4j3Ntn+JhXsdJrG9pYaX6j/XRz2RmasMUHtNgQD39nrv/VwTWSqK0RNXR8upA==} + '@octokit/request@10.0.8': + resolution: {integrity: sha512-SJZNwY9pur9Agf7l87ywFi14W+Hd9Jg6Ifivsd33+/bGUQIjNujdFiXII2/qSlN2ybqUHfp5xpekMEjIBTjlSw==} engines: {node: '>= 20'} - '@octokit/request@9.2.4': - resolution: {integrity: sha512-q8ybdytBmxa6KogWlNa818r0k1wlqzNC+yNkcQDECHvQo8Vmstrg18JwqJHdJdUiHD2sjlwBgSm9kHkOKe2iyA==} - engines: {node: '>= 18'} - - '@octokit/rest@21.1.1': - resolution: {integrity: sha512-sTQV7va0IUVZcntzy1q3QqPm/r8rWtDCqpRAmb8eXXnKkjoQEtFe3Nt5GTVsHft+R6jJoHeSiVLcgcvhtue/rg==} - engines: {node: '>= 18'} - - '@octokit/types@13.10.0': - resolution: {integrity: sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==} - - '@octokit/types@14.1.0': - resolution: {integrity: sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g==} + '@octokit/rest@22.0.1': + resolution: {integrity: sha512-Jzbhzl3CEexhnivb1iQ0KJ7s5vvjMWcmRtq5aUsKmKDrRW6z3r84ngmiFKFvpZjpiU/9/S6ITPFRpn5s/3uQJw==} + engines: {node: '>= 20'} '@octokit/types@16.0.0': resolution: {integrity: sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==} @@ -5045,6 +5430,9 @@ packages: '@oslojs/encoding@1.1.0': resolution: {integrity: sha512-70wQhgYmndg4GCPxPPxPGevRKqTIJ2Nh4OkiMWmDAVYsTQ+Ta7Sq+rPevXyXGdzr30/qZBnyOalCszoMxlyldQ==} + '@oxc-project/types@0.120.0': + resolution: {integrity: sha512-k1YNu55DuvAip/MGE1FTsIuU3FUCn6v/ujG9V7Nq5Df/kX2CWb13hhwD0lmJGMGqE+bE1MXvv9SZVnMzEXlWcg==} + '@pagefind/darwin-arm64@1.4.0': resolution: {integrity: sha512-2vMqkbv3lbx1Awea90gTaBsvpzgRs7MuSgKDxW0m9oV1GPZCZbZBJg/qL83GIUEN2BFlY46dtUZi54pwH+/pTQ==} cpu: [arm64] @@ -5082,12 +5470,12 @@ packages: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} - '@playwright/browser-chromium@1.57.0': - resolution: {integrity: sha512-pUg+2p6HwewLp8KCD9G6VYaS2iewdkNkyqMcSIxXBXOlp1ojTxLF6/bwyR4ixLMy6tyv75jhE8PzzMZiX5KzwQ==} + '@playwright/browser-chromium@1.58.2': + resolution: {integrity: sha512-/HHFVVP2pzEtqBVOFRoWlDtBoO8bzIWOqS62APdm3OhYbE2+kVUs/ALpkevvAKKfY0DMDVezYN22bDBh77UQ9Q==} engines: {node: '>=18'} - '@playwright/test@1.57.0': - resolution: {integrity: sha512-6TyEnHgd6SArQO8UO2OMTxshln3QMWBtPGrOCgs3wVEmQmwyuNtB10IZMfmYDE0riwNR1cu4q+pPcxMVtaG3TA==} + '@playwright/test@1.58.2': + resolution: {integrity: sha512-akea+6bHYBBfA9uQqSYmlJXn61cTa+jbO87xVLCWbTqbWadRVmhxlXATaOjOgcBaWU4ePo0wB41KMFv3o35IXA==} engines: {node: '>=18'} hasBin: true @@ -5111,22 +5499,22 @@ packages: resolution: {integrity: sha512-qD1hvOZktx7zs9L5J/4tkMNoaLJ3PqSLDH/nXzpS0DtNa/Ok7/evsncM2pr6IFto566fZ02Oumdy9IdiR7r7EQ==} engines: {node: '>=18.12'} - '@pnpm/cli-utils@1001.3.0': - resolution: {integrity: sha512-fCXxC9OFetVg9Z7ftHxBBxzlFdZ+rQJS18FTTDxAPRHXbcrIjGsWJxxrZq0vB4qU+zjmaWEu3UbmotprcQmKIw==} + '@pnpm/cli-utils@1001.3.9': + resolution: {integrity: sha512-AEOavMZKKZOfd3B+qJoDDnJAeRB/004sr7+jfDEwq1GbVh/iXGu1VZfLJ6s3GxLV7FPiDSmaZeS/pN9ax5Q41w==} engines: {node: '>=18.12'} peerDependencies: - '@pnpm/logger': '>=1001.0.0 <1002.0.0' + '@pnpm/logger': ^1001.0.1 - '@pnpm/client@1001.1.16': - resolution: {integrity: sha512-qCDg+kv3aOZa3N+4LtTfMeGL9DorCvFh5E2APe9C5W158ZRj8PQL9dgu3G2ZKKrlltrzlJNB3UOOp5Zd+sTRkg==} + '@pnpm/client@1001.1.23': + resolution: {integrity: sha512-2OYGiE+SQbx+zp+I6yuefykTcSiLZ5xnMjNVYxoUUDddaCiOJMyMVV8BeajOSxZhnMnJM+u/qhPKMndW70XxGQ==} engines: {node: '>=18.12'} - '@pnpm/config.config-writer@1000.0.21': - resolution: {integrity: sha512-o/RDmGpWfP3BOkbWlZyLJKbVpF6y6RzbrautV9q0nwnImII0US9sLlbhv39erKDZCSlYhAU4Gyd9dqHrV/l7Kw==} + '@pnpm/config.config-writer@1000.1.2': + resolution: {integrity: sha512-iIAdVA+RBuVbp7GnfaA62ja/DtiQsrZPCoKX5rTYTtuIq7PcnFNd1ZYC5Y94oWjh3pSPHlCMM1NxMuXUNJsORw==} engines: {node: '>=18.12'} - '@pnpm/config.deps-installer@1000.1.0': - resolution: {integrity: sha512-PVHc8HZV6487OwD0O+Oo+VUq6Z5v+ojgSDk8gWYFIg/5kpkmOY5pcKsvdGLXIgNoiuf+aH7axFdR/yekDowYEw==} + '@pnpm/config.deps-installer@1000.1.4': + resolution: {integrity: sha512-UeV5dmKsrh8bivRnZlqqt478/SFDalIBZLhvHh2BICM8NRzAcrtVVcKKFRRuE5rv7r4EoxQDUGZ7Hhm08vvvuA==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' @@ -5143,11 +5531,11 @@ packages: resolution: {integrity: sha512-03d2l21gAyzGVr9SR6rS5pvCTnZ4HaNdi8jB2Y/UGvszzrNbA+AJVObVw6SulNQ1Eah3SHB9wCezJwtP+jYIcA==} engines: {node: '>=18.12'} - '@pnpm/config@1004.9.2': - resolution: {integrity: sha512-61LJxoSofShIF9Fa+QMdJ6jdmTqvpwfaYIQzreufSfL8qjj3eUMyachLm+Z9j1pQ0/CBQ32A8NYuhfFScSdd+Q==} + '@pnpm/config@1004.10.4': + resolution: {integrity: sha512-iUCtLSTy59dEvrY3e15cT5lzBsQ5NOx0z4n3rWczTVfVbSwc5j916eSONJ+HbnHmqxzPm4iCtmdzP1Uu2qqeig==} engines: {node: '>=18.12'} peerDependencies: - '@pnpm/logger': '>=1001.0.0 <1002.0.0' + '@pnpm/logger': ^1001.0.1 '@pnpm/constants@1001.3.1': resolution: {integrity: sha512-2hf0s4pVrVEH8RvdJJ7YRKjQdiG8m0iAT26TTqXnCbK30kKwJW69VLmP5tED5zstmDRXcOeH5eRcrpkdwczQ9g==} @@ -5159,48 +5547,48 @@ packages: peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' - '@pnpm/create-cafs-store@1000.0.29': - resolution: {integrity: sha512-bYcfH6AsNi5xb6l/wT+kXf7+FE+VqhNZPJTFlG/5QB2DpUCr5QIuETVY/pY/COpg3lrBGokKJE44UOiQ3B4ZtQ==} + '@pnpm/create-cafs-store@1000.0.32': + resolution: {integrity: sha512-TQtVkMGHd9mwlx7eR1P6iHSx0UR2OPeYWAF7bI6ie72/D79r6xAIC2i8RDjzok93/wL0lRK863WIgTi89M+yiw==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' - '@pnpm/crypto.hash@1000.2.1': - resolution: {integrity: sha512-Kgo3bgYbdKkC5xFvvQshbHa+Nru7k50D91+yyq7enp4Ur2EMp4wg5oXleaC5xu5hC9A/1eSCRI8npCioplxG4A==} + '@pnpm/crypto.hash@1000.2.2': + resolution: {integrity: sha512-W8pLZvXWLlGG5p0Z2nCvtBhlM6uuTcbAbsS15wlGS31jBBJKJW2udLoFeM7qfWPo7E2PqRPGxca7APpVYAjJhw==} engines: {node: '>=18.12'} '@pnpm/crypto.polyfill@1000.1.0': resolution: {integrity: sha512-tNe7a6U4rCpxLMBaR0SIYTdjxGdL0Vwb3G1zY8++sPtHSvy7qd54u8CIB0Z+Y6t5tc9pNYMYCMwhE/wdSY7ltg==} engines: {node: '>=18.12'} - '@pnpm/crypto.shasums-file@1001.0.2': - resolution: {integrity: sha512-oXq3QwGsgmRHz3bYXbYpRMMRUSo27KyaaWUCH9VpWw1q0Uo71S/LpiMtrwmZGJJCTN/Q66Libv8FC5/zjpbXjA==} + '@pnpm/crypto.shasums-file@1001.0.4': + resolution: {integrity: sha512-41GkaTgNWT4luNezwjmaMoK8nRwh/gXCGwPiPyu5YRao6HJV7VyByaYS3FVl42Th7FG3cjZMqD/7v/2HOyYBgg==} engines: {node: '>=18.12'} - '@pnpm/dedupe.issues-renderer@1000.0.1': - resolution: {integrity: sha512-zrCfk0HUQM8WhxCi3C0waGDKO0/gB4r3LgAUOQB4YTHPNr+m+iubznY0I5G776OqJfsPeLi4bByg4Y1wK29xlg==} + '@pnpm/dedupe.issues-renderer@1000.0.2': + resolution: {integrity: sha512-F1bQ/PR5TSEuq+1bwx9IgZ/9LbP7rrTYZ7uCUof9ecoxouT7R48F3UAlxHU5mxg6XGj8Ggm9H271d4YWgEYpbQ==} engines: {node: '>=18.12'} '@pnpm/dedupe.types@1000.0.0': resolution: {integrity: sha512-+d8Q576BxRZgt03O+JZXK3C1xVJeAr4Hs35Y8SCl01KpQ0Z7xzfJWahpee7iFc5jELiwjCQg2sISTwtZZQFltA==} engines: {node: '>=18.12'} - '@pnpm/default-reporter@1002.1.7': - resolution: {integrity: sha512-amJOW0CBlDaxLnu+kkKyRshrTnEhE98kBSaJZcaJnnqTBH3NDhF2ObfIP1X7m8I2dzcStJ7rWXyCsiyEMFq2dQ==} + '@pnpm/default-reporter@1002.1.13': + resolution: {integrity: sha512-OS+R1UorQsMSJZG0w2V6Tu1+mfGO7wvrwhCg3DiOH9TaZOM4S9eISzyPPuydmdcqDQVNIlZ+R17BBWo2JrH9fg==} engines: {node: '>=18.12'} peerDependencies: - '@pnpm/logger': '>=1001.0.0 <1002.0.0' + '@pnpm/logger': ^1001.0.1 - '@pnpm/default-resolver@1002.3.0': - resolution: {integrity: sha512-/mwkcWE3hcQTmCdbQWaky/kdl3M/nYRMNC0XcLDbOUjWPbeX40lDvWW95PTts+5T3A4CEYAh2wmFhoFV7Kgg2g==} + '@pnpm/default-resolver@1002.3.7': + resolution: {integrity: sha512-P4KQO9L/gap6l02wMU6rN5c/kDYajQ724DnRt6Lvzmru7hdPmbgSRN44DtUGY+6UQqO6inHq9rcg+RJ1yCJGrw==} engines: {node: '>=18.12'} - '@pnpm/dependency-path@1001.1.9': - resolution: {integrity: sha512-C1V4H54GyMfLL47q93PmdVRJkJyNVEE6Ht6cFrMSsjgsR7fxXWqjlem7OaA9MMjSTBB/d/g9mV4xZnoT/HAkDQ==} + '@pnpm/dependency-path@1001.1.10': + resolution: {integrity: sha512-PNImtV2SmNTDpLi4HdN86tJPmsOeIxm4VhmxgBVsMrJPEBfkNEWFcflR3wU6XVn/26g9qWdvlNHaawtCjeB93Q==} engines: {node: '>=18.12'} - '@pnpm/directory-fetcher@1000.1.22': - resolution: {integrity: sha512-IQyWRU0xH2sG9v5iN9FTEEfZxHbqsHrs2EpHFdA5BM5kEQzfAu2OMh9AVMw32ptVy53d2x4w7oY3tWJnWNQ7VQ==} + '@pnpm/directory-fetcher@1000.1.23': + resolution: {integrity: sha512-+E0QSivFujhl2yUATr9pI8YW3SoLN4e6/dWQqkMrNlMlHmysL3JwxdXasmAUGjtEZ8HQSjD5YH3x4BV7j8vP7w==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' @@ -5217,8 +5605,8 @@ packages: resolution: {integrity: sha512-IF1hAWdq61gCIbaCpy01SmoL5GLfJRC5/+qd0ZwBFdBeWEcEETCcuBYFFss71Q9OdjdTxNrNsz9apE3DPx1Tsg==} engines: {node: '>=18.12'} - '@pnpm/fetch@1000.2.11': - resolution: {integrity: sha512-YxruYaj7R+uAGXGNmJnDemed+iIDtxIl/+oAIuP9gggeU7EAVgumjUlvT8TOytmQlCF84jQxjj8+OO3+empSHw==} + '@pnpm/fetch@1001.0.0': + resolution: {integrity: sha512-b5S29O4WaqxlFDpmyy1NWkvB3X+pz5kM2Se1ENSY7Rx+uKEIcRE1CzpRxpILDFf3uWHAOt90bBNywCeh6LQkKQ==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' @@ -5227,28 +5615,28 @@ packages: resolution: {integrity: sha512-LMSb3k7osG99ikbhLTPQWfr61tyAnd08NbIoASVdUJ00S0c6F6O/dauqb4Z/PddE4ghkQ6hE2VRNASdRdLgT6w==} engines: {node: '>=18.12'} - '@pnpm/fetching-types@1000.2.0': - resolution: {integrity: sha512-9VICUg0DSJsCAw1smftmB/c41x4s7bQJdX39WZ8y5DWmsMccFOSe+EXm18nMxjFuVRuyYXaMCQi/3G4S7Zj+BA==} + '@pnpm/fetching-types@1000.2.1': + resolution: {integrity: sha512-atgLxpIAxERPtWykqHzSzLhVfKYZ8hV/KzuVSEXjwvY1+RWnycotbZ2xm6Z90dNx8WZw6PM2r8OmkiZiRb1+Bw==} engines: {node: '>=18.12'} - '@pnpm/fetching.binary-fetcher@1005.0.2': - resolution: {integrity: sha512-NigdsFRlTdvNqTa7Yn5AXlT1R2cBDJmhz90h3HZw0MGFMOw1Yf0HHxtN5+h7hUkV7vDvCRcrt3R5PCNtAgHY2g==} + '@pnpm/fetching.binary-fetcher@1005.0.3': + resolution: {integrity: sha512-1YMz7kwilCmKc90A/qWdiE71TJL18YVAZSD0oTP0jhBTtXkduPekJqtyT9AwPVOv9az9kqn3dtZS2hvhlgsqsw==} engines: {node: '>=18.12'} peerDependencies: - '@pnpm/worker': ^1000.6.2 + '@pnpm/worker': ^1000.6.3 - '@pnpm/fs.find-packages@1000.0.22': - resolution: {integrity: sha512-p/o8Dq5Ba0WLLE2xqwJ7US5YBkjCXRVrKYhZDIFYuuWM+aLjUVGDz2D4HB5R1nQU2vOnChSVUBcOXY2Ss6hKBg==} + '@pnpm/fs.find-packages@1000.0.23': + resolution: {integrity: sha512-Afslgd7iYQhshK/z9uOVc3vXafJ2xF+4m/Y+JwXbVy5zTSULeXcc2kpGCKkG/cICW6i8Q9oOo1k27a6UXHhQiA==} engines: {node: '>=18.12'} - '@pnpm/fs.hard-link-dir@1000.0.5': - resolution: {integrity: sha512-MtEzlHc2tRvom2/fXFpjpLj3XMN2AzgIm+udEpkxm2VWaRKiY+7br5xBO8NT2h2fADg2chBSgE3W96VaDgLUag==} + '@pnpm/fs.hard-link-dir@1000.0.6': + resolution: {integrity: sha512-8Z26HRL7YuC7jvkGMT3s5+0sJSBJ8PtldWGQ9gCPtXtjfORr7ep5V/rcTDQk6L1KzFIBuSg5NBOpxLdzJeCUCA==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' - '@pnpm/fs.indexed-pkg-importer@1000.1.23': - resolution: {integrity: sha512-h3gTClrMMQjcwaImZhULe/Qoxj/cA/tr0AKIMp5q0ixYOqyvmy8jLNsnHeULM2pRZ623kf8LiOjjdctPHxpzJQ==} + '@pnpm/fs.indexed-pkg-importer@1000.1.25': + resolution: {integrity: sha512-G8fZHO2llFeo4r4/Pdxzocrxxu0Ew0RXEp3BMyRGaOkDP+sXR7/v2fz7qPP0Lr4r6dlHx1RaRa27CvRqWM9adQ==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' @@ -5257,23 +5645,23 @@ packages: resolution: {integrity: sha512-2WXDfqKVIfLskyDUmqKP+n8RzlEqPk8jpsiPXRA5Zx0La5IAadlo94Yttlu0f152t/ogmuOtHFReOgCT2uUzQg==} engines: {node: '>=18.12'} - '@pnpm/git-fetcher@1006.0.2': - resolution: {integrity: sha512-9x48CcEMaPEkjb/HgCdo0tMJIEZlr+Y6SibfFMRjCd9AoDt4qTdvRTY26RrX96DTIjVaeCPwUB6bryUQSmxOeQ==} + '@pnpm/git-fetcher@1006.0.5': + resolution: {integrity: sha512-3t7IA+T2FP6NF44saFc9KrKt2WTbVyRedk131P+RA0pSLQptztDr0bpvi/OWqQQq1BkDK40u7mKV1pTuOpBmsQ==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' - '@pnpm/worker': ^1000.6.2 + '@pnpm/worker': ^1000.6.5 - '@pnpm/git-resolver@1001.2.0': - resolution: {integrity: sha512-apORMqmEbu0M2Ysy7ks+Sj1nrvLvOB8LigzOba6i40Azoh20MaJN0dx0LqN7tqexkzyNXPgTN3kxmpWi3BlqJA==} + '@pnpm/git-resolver@1001.2.1': + resolution: {integrity: sha512-GZaSi49EjEu4KDfT8BCpd4o6R6ck2MPT1Oayw8qssucyNj9Yq5ZV6iZw3fV2KeRlCL72Ml3sF6mJcY89VunDpA==} engines: {node: '>=18.12'} '@pnpm/git-utils@1000.0.0': resolution: {integrity: sha512-W6isNTNgB26n6dZUgwCw6wly+uHQ2Zh5QiRKY1HHMbLAlsnZOxsSNGnuS9euKWHxDftvPfU7uR8XB5x95T5zPQ==} engines: {node: '>=18.12'} - '@pnpm/graceful-fs@1000.0.1': - resolution: {integrity: sha512-JnzaAVFJIEgwTcB55eww8N3h5B6qJdZqDA2wYkSK+OcTvvMSQb9c2STMhBP6GfkWygG1fs3w8D7JRx9SPZnxJg==} + '@pnpm/graceful-fs@1000.1.0': + resolution: {integrity: sha512-EsMX4slK0qJN2AR0/AYohY5m0HQNYGMNe+jhN74O994zp22/WbX+PbkIKyw3UQn39yQm2+z6SgwklDxbeapsmQ==} engines: {node: '>=18.12'} '@pnpm/hooks.types@1001.0.19': @@ -5284,20 +5672,20 @@ packages: resolution: {integrity: sha512-QzmNiLShTnNyeTHr+cykG5hYjwph0+v49KHV36Dh8uA2rRMWw30qoZMARuxd00SYdoTwT8bIouqqmzi6TWfJHQ==} engines: {node: '>=10'} - '@pnpm/lifecycle@1001.0.33': - resolution: {integrity: sha512-KJL9MjGHMaGO2EzANTZh5Z1T5uGFJAdWKEQb/qGqYpC9RjlhbJ1Eu5JKHX79a2pPxGS37TVw2xvQWlsI2mzbKA==} + '@pnpm/lifecycle@1001.0.36': + resolution: {integrity: sha512-h8Br+z/tI+mhQNI7H4tMdapV/M59NOCcKJ0e7jyfBQAoh8hXKrNmrYvDHi+DlRa8u8MvyG2aZf/KbGLDmX6gJA==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' - '@pnpm/link-bins@1000.3.4': - resolution: {integrity: sha512-x+jF5xZVL96pKxX1C/05+HE2/PCFu5rYRnH9d98p9bl+qRBjx5u0RvfpQtbI4nQTnRppLh1C/mUrtB51qXpx0A==} + '@pnpm/link-bins@1000.3.7': + resolution: {integrity: sha512-pnNvjARsxdUvxy/Ri75Blt6GBhwcHcHVrD6oklYs9lSLo/sIxDvKK3CQiaj4v1zkZLGBF9QSPhCAPfHV/xPc2Q==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' - '@pnpm/local-resolver@1002.1.11': - resolution: {integrity: sha512-h1zi8sAHGQBlMn6Z1aTNFZLcR5rOFVtJa0q91lzDcur3NJsvV9TXF4X7tz51XS6UI8r/6zRqsis3jeqFZMMcTw==} + '@pnpm/local-resolver@1002.1.12': + resolution: {integrity: sha512-vgnmvpaKDQTRWMlKQm/RQc/1vUOWyRC2HO5kyXaVcLMGrrH/CKplZvIZ/1LcjG87moq68FZpaJi5JBLZwaXaTg==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' @@ -5344,12 +5732,12 @@ packages: resolution: {integrity: sha512-eYwrzhKUBGFdq78rJStGjaHTUHA2VH+Avr//CVx/T+EJkI7hnFmOy6YghvcB2clj8HpO4V8tXRNuFNfRX08ayw==} engines: {node: ^10.17 || >=12.3} - '@pnpm/node.fetcher@1001.0.19': - resolution: {integrity: sha512-G1djT7zQY2J9c4IbOqZ72J+24YrVZkqW/q+bLaBg6SxlKKL/ot/dA5Mccnz1RzozY2kUh/fshAvLVb64SC747w==} + '@pnpm/node.fetcher@1001.0.26': + resolution: {integrity: sha512-9IptQjAqrTKQC8ImVIqgLWxSzKax2jZNk2+XOuSAB5UDiNxFNzlGc/EApJQ53+p0CiIJLZXRH72Wq9EJJQmR+g==} engines: {node: '>=18.12'} - '@pnpm/node.resolver@1001.0.16': - resolution: {integrity: sha512-Qbh3WvaNrTAtt+HNJOG+SQYPkx2HtEAoAk5yRXkyUKffstZN7dR60e2ayrXLt3s0KR/BTSNPetJBE/l0kdkC/g==} + '@pnpm/node.resolver@1001.0.22': + resolution: {integrity: sha512-mu58AxResjqwKkrYbHrSXALEj8/wRZW61Krjek/ELvM/0Bl2HimWgOAp3upOUs8gVzZPRRIb/Sz6u/2luRZhcg==} engines: {node: '>=18.12'} '@pnpm/npm-conf@3.0.2': @@ -5360,8 +5748,8 @@ packages: resolution: {integrity: sha512-5jW/GNLdZMiw+PJ8FYSvOghoApSjsORNIro2fj8j6NHAqJxJjcHekC5/NsKaawoI5LAkU/XDDVjNC71Yz+uS1w==} engines: {node: '>=18.12'} - '@pnpm/npm-resolver@1005.1.1': - resolution: {integrity: sha512-flVAYRj0PbByRPdW1hEiw0Ryq9vGsCfvO2zFoYEOP/3VcbVKq51gK4u9oNGmAjxheFGJGXOoh8itRxnx8UHaRg==} + '@pnpm/npm-resolver@1005.2.2': + resolution: {integrity: sha512-+msICPF2Amtm9IAFc4m1iniguOdzAVtb677ijDVan9fRf+3QmPB3Pj48ihLPKZBToo2+KvmTsVsap2VxsGsgZQ==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' @@ -5370,8 +5758,8 @@ packages: resolution: {integrity: sha512-YTJCXyUGOrJuj4QqhSKqZa1vlVAm82h1/uw00ZmD/kL2OViggtyUwWyIe62kpwWVPwEYixfGjfvaFKVJy2mjzA==} engines: {node: '>=18.12'} - '@pnpm/package-bins@1000.0.16': - resolution: {integrity: sha512-FM7OzuAOKXkSxOGtTJjNEz4jcm6eqz3siREPCCX6JP0Um3Rnbeptk7EfkLHW2MGdj2vLpT1t8qEgTX+af0H9gw==} + '@pnpm/package-bins@1000.0.17': + resolution: {integrity: sha512-DD2XTIIWwN1xVRdocKRaIl4eSMp3EdhhxqogfEwEiMbmGkoE4lbnTg3f81VEfhOGl1vTaS5UoM2qxW1FGrpaZQ==} engines: {node: '>=18.12'} '@pnpm/package-is-installable@1000.0.20': @@ -5380,19 +5768,19 @@ packages: peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' - '@pnpm/package-requester@1011.2.1': - resolution: {integrity: sha512-CKppI+D7oKStbbOBnkZ8H9kTG3JEZ+wMf7JQwcBI1FJ+JwSmzbxxfD50NM6/1PYYfa2F6fZ3EAykYp8BK4YQ1w==} + '@pnpm/package-requester@1011.2.3': + resolution: {integrity: sha512-nGAPF4WBNqWFu9299hkBJHahVYL/doNNv56wSl4Mo62lBRx4EY6u9wbXAflsTSkWe4XVxxnuQIGUG5Jp4QbkOw==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' - '@pnpm/worker': ^1000.6.2 + '@pnpm/worker': ^1000.6.5 - '@pnpm/package-store@1007.1.2': - resolution: {integrity: sha512-5DwgFr+VVOV0wk0TmrCpF4aMYfZ1rXq44nkM7+txJVW5Bx29sHaV2i2F5Qe5F2caqIqyRrX9auNYo7t1nltnUg==} + '@pnpm/package-store@1007.1.5': + resolution: {integrity: sha512-b1kpa9o2BIRTALsg0+0lrbTUCYrZngsFaml5W68EeYKDe7J4XOl+SaDmGSvOaIx0dWsxrOEi0RTqJ2lUm5eCdw==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' - '@pnpm/worker': ^1000.6.2 + '@pnpm/worker': ^1000.6.6 '@pnpm/parse-wanted-dependency@1001.0.0': resolution: {integrity: sha512-cIZao+Jdu/4znu76d3ttAWBycDj6GWKiDVNlx1GVgqYgS/Qn7ak3Lm0FGIMAIHr5oOnX63jwzKIhW35AHNaTjQ==} @@ -5410,14 +5798,14 @@ packages: resolution: {integrity: sha512-/dTfl669uwuABRqZXDT37fJItuPu3h/YHw4lAvgkUp3D6CaWVRoEX+ZBiqQU/NCzUBOQ3x7QOU7sPKUinbRh4A==} engines: {node: '>=18.12'} - '@pnpm/pnpmfile@1002.1.11': - resolution: {integrity: sha512-iZCA7QOY0KHD2SRpTorId1hRvBVuDano9NXuv8zsQoGjN4VHlFvzvCHpgA5Kw0EHhJa62c8EJceo0hFW6XoH6g==} + '@pnpm/pnpmfile@1002.1.12': + resolution: {integrity: sha512-FHWSZ01QJba99kf5L6vvPVuBjnTt/SHbVsFooO5iCkQopkB3NKt59uYBDPW16ATjAlVbgOG+XDRQVitpe6zoXQ==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' - '@pnpm/prepare-package@1001.0.3': - resolution: {integrity: sha512-R1EjM58h8mufj7uZHzVUSYVWi2tdDUztYiyZtWaOw75Uw4aT2vuRiqFI35dq2VtoGdvwZy1TQRjfGIWcIBoLpg==} + '@pnpm/prepare-package@1001.0.6': + resolution: {integrity: sha512-7gCNAm6b62ZUMjupsxPHAUQt/nFDjUhIdpjxK1cfCyAaKMSTkDcDGPMik9WBzpAWAiWfFUucFwNWmlLyWxgZJA==} engines: {node: '>=18.12'} '@pnpm/ramda@0.28.1': @@ -5431,8 +5819,8 @@ packages: resolution: {integrity: sha512-nzjqiyUMdkDoJup4KeJdGZ84xMEenwF9E6YqTursHVL/lznGgQ/5L8PNMMJkXDYzPyx3PuCxeGg/jJUcBUz6zQ==} engines: {node: '>=18.12'} - '@pnpm/read-project-manifest@1001.2.4': - resolution: {integrity: sha512-NDQkxWeShMHFPLT5APc/6IkO4q7Y6Wugzh+hhSs2tlRBTOuR5UN//ETZPw43SRQuSmrYQQj+awdUiRjsLQZw2w==} + '@pnpm/read-project-manifest@1001.2.5': + resolution: {integrity: sha512-5ob6p6D7vBpAAGtZpqPvqlvkJlDfugb8TWnQgRDiSYr4/o8nIiV2t1ejlp3f34b0E76SbsbBuIfrJCsHAqhkrw==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' @@ -5447,29 +5835,29 @@ packages: resolution: {integrity: sha512-LCuhL8Z6ca9J9PUyT9We9gwpEke9HuW1l/2QT4NIn4rVMI7WndCbMTxa2HsvvRtyCP9cAdl6NPv5eAGQnzjSWQ==} engines: {node: '>=18.12'} - '@pnpm/render-peer-issues@1002.0.10': - resolution: {integrity: sha512-DtxihhYE6Q0f36qv+1zwJMZveg1Wq/GkxYC0urJxlQWuKaFLQMtWI4NAOEamCQvifBX4k3o4wCyTQR00O1fHaw==} + '@pnpm/render-peer-issues@1002.0.11': + resolution: {integrity: sha512-Kr5wXBzcjnQZBKxRVwzgpS5RW9+OiUTLOvEsXqdnNT4AFuqzCMAaUT/q8YFP5gpMCoQzZRSbd+F6lkoZJmhEXA==} engines: {node: '>=18.12'} - '@pnpm/resolve-workspace-range@1000.0.0': - resolution: {integrity: sha512-NO0Rz4MEOVvGsMBR7AGqqQ5zgHMQ0fpRE01iYKUKfxJ42AVP6slka4GF2rpEZISfgq8HeSdSnKL9oul3+V/2jA==} + '@pnpm/resolve-workspace-range@1000.1.0': + resolution: {integrity: sha512-kQT1l+hQqW2/Z7CcbGXd9HfySe18jiJSeK0g6tvWLA27/s4bHikiCD7m0vkfn3w+pLpA/lwWmoUiPrDZmsaZ2g==} engines: {node: '>=18.12'} '@pnpm/resolver-base@1005.4.1': resolution: {integrity: sha512-47zGgACkbZWLOmM61kaE0nkqxiYx63C6DJ4wzDsdj0iXDZJ9SJEl+T035pkhquHe8XEh3YxvwMg2BRyZSgmZ9Q==} engines: {node: '>=18.12'} - '@pnpm/resolving.bun-resolver@1005.0.3': - resolution: {integrity: sha512-aLkSSFbrkeZukiOp2opJBMLGuyGxkPYsSxbS0Apes0Wzq57mo4skb9Lef7deAoq4icuVyE7m5UJIZbpjfnsEBA==} + '@pnpm/resolving.bun-resolver@1005.0.10': + resolution: {integrity: sha512-YbtHjqombwINiW1kLRVK/DbEjjoJWAVXZYv90o9rWapzaAM8wvsrj79KEIvYMowOPGtkbFYvusga0pO4Orp3ZQ==} engines: {node: '>=18.12'} peerDependencies: - '@pnpm/worker': ^1000.6.2 + '@pnpm/worker': ^1000.6.6 - '@pnpm/resolving.deno-resolver@1005.0.3': - resolution: {integrity: sha512-sdETQwFAdAcODNwMiaMsftBjzzbT6Sak/QyOWxA4K86a0Z7xB9c8Qowl8oPt0tM2cXhPjheH2wXHp0VEBZXCEw==} + '@pnpm/resolving.deno-resolver@1005.0.10': + resolution: {integrity: sha512-KEBLNSUfZFikxR7bptmb08FpCLT6CCsOMLRrkt0eJtPt97+tP79uNzxiMbReHM5NIKunY9RtrbnX85MenHkGuQ==} engines: {node: '>=18.12'} peerDependencies: - '@pnpm/worker': ^1000.6.2 + '@pnpm/worker': ^1000.6.6 '@pnpm/resolving.jsr-specifier-parser@1000.0.3': resolution: {integrity: sha512-VaGXRwSez71iZ65nOat/B0oPViWyLzAdgAfNJjmt1eDoNZ0Npu+9lrI0ZNRVZ0NDH3U+TQ8LVesCZOdvr0+5SQ==} @@ -5479,17 +5867,17 @@ packages: resolution: {integrity: sha512-r6VzkrdH7ZKjPmAogTNvxuV/UyS/xwHNme+ZuEFiG0UthZgqudDftYtKmG20fcfrjG1lgJbbWICA8KvZy7mmbw==} engines: {node: '>=18.12'} - '@pnpm/server@1001.0.19': - resolution: {integrity: sha512-7N2uj9nQ+ursfaZIGqg6LjfBELZvMdmXLcWhzAtllnutfIBw1FPAlXMvbPTPubivXg1qLww4grVkeV63K8q4Zg==} + '@pnpm/server@1001.0.20': + resolution: {integrity: sha512-+LueCvZ8QtEgKXP76KlYZlY4OvCz90RsEQj1Ohi7Ec5s/b3SQQRZbXKUbOnvj8F+8l+ex40zfFHIMhfG6bRerQ==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' - '@pnpm/store-connection-manager@1002.3.11': - resolution: {integrity: sha512-XMgO3lFFeJ9oH7rjbAfUdrnoj0fCrcSXgvtwSMpriL8Ki9HnCKYTKXPMkzZRVxsitXKUuPc8ws2rMu0tjvvDhA==} + '@pnpm/store-connection-manager@1002.3.18': + resolution: {integrity: sha512-05CF8QsRFeIuNIp5Hsr9xJqRy/Qw8miQPH0TWE9nr/9eUb+s2RYO51mT3QTcMvKDhtByi0RTmO/yOOPnyMCoEQ==} engines: {node: '>=18.12'} peerDependencies: - '@pnpm/logger': '>=1001.0.0 <1002.0.0' + '@pnpm/logger': ^1001.0.1 '@pnpm/store-controller-types@1004.5.1': resolution: {integrity: sha512-UT6UpPIuebGhYEldceeprZZn3/NWS4CGOvObxbrfRRVPoBhJTYZwC9rg5rPooTpPH+LiSGLRHc34lPMIQzn7NQ==} @@ -5499,8 +5887,8 @@ packages: resolution: {integrity: sha512-wywSQkyBeHTYGN8dM/dNhR277QXeYYYbJvs6woNPvCavhJ7uYE5Qielw+3zCzx7dzcMBns0cLIBzDv4Dx3v6kA==} engines: {node: '>=18.12'} - '@pnpm/store.cafs@1000.1.2': - resolution: {integrity: sha512-1PMvHOtk1CKTue0nIZrcemu2hAHUXDoV5Y+3hoJ6To4Y5/aKu2SlqclXc8elMuSuzhiKScCqTf3v1dyQuumuhA==} + '@pnpm/store.cafs@1000.1.4': + resolution: {integrity: sha512-6lV5EzJieiBe6Px+p1JezbKdQ1umj4gxIYexYKSMBHPH6SVKFYnKewwU8iQ2bWhvnTNbUMUxTIJeIErWBGh2eQ==} engines: {node: '>=18.12'} '@pnpm/symlink-dependency@1000.0.17': @@ -5509,21 +5897,25 @@ packages: peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' - '@pnpm/tarball-fetcher@1006.0.2': - resolution: {integrity: sha512-e/IVaiJkhncgh2rVGLDNOfMUaReftKxOeiGKDdlk/hWWbYhc697mNIx8+amtqO4RLpb8GzvIzFJqKlURxlIatQ==} + '@pnpm/tarball-fetcher@1006.0.5': + resolution: {integrity: sha512-uSQh2eB19h/2nFCMLJc9bNK6dOMy5WbjlqIbt5Cak/WA7FHj0qitaceUyD2x3s5RsMrEUsC0y20Z/Fx7neSaXA==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' - '@pnpm/worker': ^1000.6.2 + '@pnpm/worker': ^1000.6.5 - '@pnpm/tarball-resolver@1002.2.0': - resolution: {integrity: sha512-sFBCZxCvCqdJN0yJgpS5XSFKAx80FFIdISXPqpT5jTx5TPhuSRe2zbNdEP/ul+WnxJ5FOqGTRu9tUay7MQG6uQ==} + '@pnpm/tarball-resolver@1002.2.1': + resolution: {integrity: sha512-E2vuu5QrRoNJF6dQdDrDaVGvm4ko0HOT0XbGNCdyk2BGPEkXuNZ/7A8xyvXyNSEtUAql8V4hDbLWsQRIg4xlOw==} engines: {node: '>=18.12'} '@pnpm/text.comments-parser@1000.0.0': resolution: {integrity: sha512-ivv/esrETOq9uMiKOC0ddVZ1BktEGsfsMQ9RWmrDpwPiqFSqWsIspnquxTBmm5GflC5N06fbqjGOpulZVYo3vQ==} engines: {node: '>=18.12'} + '@pnpm/text.tree-renderer@1000.0.0': + resolution: {integrity: sha512-ea/ClG7C4eJTxS2wcqj3bjXQ1zwxBd7ASTiyGR99pilLQCL8d2XOusFrnHYTmeP1couC89OULT/BZ59lmK/lPg==} + engines: {node: '>=18.12'} + '@pnpm/types@1001.3.0': resolution: {integrity: sha512-NLTXheat/u7OEGg5M5vF6Z85zx8uKUZE0+whtX/sbFV2XL48RdnOWGPTKYuVVkv8M+launaLUTgGEXNs/ess2w==} engines: {node: '>=18.12'} @@ -5537,24 +5929,24 @@ packages: engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} hasBin: true - '@pnpm/worker@1000.6.2': - resolution: {integrity: sha512-iJwL66CHRh3d5N4gwuLqkGeCtz4K0t4JxS8BBGVZLUbrHOEM/j0+KGhG3IgQrYcaxoM+YuFfhA86QLEEYsNsXA==} + '@pnpm/worker@1000.6.6': + resolution: {integrity: sha512-yIO8jiT5hbeox/DE3ZmO7TVyCys0eMi3EaBzMOOMgEdPY/AOVJxkBL+zxUvVB6xEXmg3Y+WD1WPH9Y4mhfv+9w==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/logger': '>=1001.0.0 <1002.0.0' - '@pnpm/workspace.find-packages@1000.0.55': - resolution: {integrity: sha512-qFdkKnMn+fgr2nqk9uwiIW2gjAblvW4FYtPnUnyph3V74xSFVfuwufiBae+duIJ4Qi/sbLZRNX/hX4IT9k7rPg==} + '@pnpm/workspace.find-packages@1000.0.64': + resolution: {integrity: sha512-zH+3N4Bl8qfcTZluBG+gHgao1fea+A/7W/QZWt+ZeIwDKubQn0ZE6uOAZv5HPxnIUdP/Lr6jRpxurVZFpjkSQA==} engines: {node: '>=18.12'} peerDependencies: - '@pnpm/logger': '>=1001.0.0 <1002.0.0' + '@pnpm/logger': ^1001.0.1 - '@pnpm/workspace.manifest-writer@1001.1.2': - resolution: {integrity: sha512-uR9ujKU9yE0H+HY/3GYano20/HGxQUBVWA6xxL1FPcw/1gg4qNxBDwHhgR4Q0KpoxTeY9p1Wsncra1gtAIFgcA==} + '@pnpm/workspace.manifest-writer@1001.3.0': + resolution: {integrity: sha512-WlEnAekdAGUr8gOodboao1aCpUYDYieSiwHwfO1H9WnOL7v45KoBNvAC5h2O9noC8Acwb2bzJDHRpmKBHWN5aw==} engines: {node: '>=18.12'} - '@pnpm/workspace.read-manifest@1000.2.10': - resolution: {integrity: sha512-SnKM53rRYwpgrNI/LQ/4wa0BP9hkc29kQt2c9bBE1daDQP89z61v3LCkchnthgdE1s530JmaJRAf9tHtqRQ0jA==} + '@pnpm/workspace.read-manifest@1000.3.0': + resolution: {integrity: sha512-aBTT6pViHvR+ARJYpMpxbs5+OcIq/9HKQLvYxyTm6ozoRoVgrNogWTRNDnnQptc02h1EvdVSoR36cCB+aoKkLw==} engines: {node: '>=18.12'} '@pnpm/workspace.spec-parser@1000.0.0': @@ -5565,6 +5957,10 @@ packages: resolution: {integrity: sha512-zG68fk03ryot7TWUl9S/ShQ91uHWzIL9sVr2aQCuNHJo8G9kjsG6S0p58Zj/voahdDQeakZYYBSJ0mjNZeiJnw==} engines: {node: '>=18.12'} + '@pnpm/yaml.document-sync@1000.0.0': + resolution: {integrity: sha512-aEmCtfPJejq9I/q7pIYNo3Q0ryPrUoR57noCJbU+f0zNmg8JKG5YVVfCVvo5KNnG3LlN/MDyWvSHTeqy+HCoWA==} + engines: {node: '>=18.12'} + '@polka/url@1.0.0-next.29': resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==} @@ -5628,31 +6024,120 @@ packages: resolution: {integrity: sha512-Tb5wIMvBf/nLejTQ61krK644/CEMB/cpiaIFXqGApfGqO3GwcR3qnI0DbmkFVCl2OyEp8LnLX3EkucoL0+tbFg==} engines: {node: ^v12.20.0 || ^14.13.0 || >=16.0.0} - '@rolldown/pluginutils@1.0.0-beta.27': - resolution: {integrity: sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==} + '@rolldown/binding-android-arm64@1.0.0-rc.10': + resolution: {integrity: sha512-jOHxwXhxmFKuXztiu1ORieJeTbx5vrTkcOkkkn2d35726+iwhrY1w/+nYY/AGgF12thg33qC3R1LMBF5tHTZHg==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [android] - '@rolldown/pluginutils@1.0.0-beta.53': - resolution: {integrity: sha512-vENRlFU4YbrwVqNDZ7fLvy+JR1CRkyr01jhSiDpE1u6py3OMzQfztQU2jxykW3ALNxO4kSlqIDeYyD0Y9RcQeQ==} + '@rolldown/binding-darwin-arm64@1.0.0-rc.10': + resolution: {integrity: sha512-gED05Teg/vtTZbIJBc4VNMAxAFDUPkuO/rAIyyxZjTj1a1/s6z5TII/5yMGZ0uLRCifEtwUQn8OlYzuYc0m70w==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [darwin] - '@rollup/plugin-babel@6.1.0': - resolution: {integrity: sha512-dFZNuFD2YRcoomP4oYf+DvQNSUA9ih+A3vUqopQx5EdtPGo3WBnQcI/S8pwpz91UsGfL0HsMSOlaMld8HrbubA==} - engines: {node: '>=14.0.0'} - peerDependencies: - '@babel/core': ^7.0.0 - '@types/babel__core': ^7.1.9 - rollup: 4.49.0 - peerDependenciesMeta: - '@types/babel__core': - optional: true - rollup: - optional: true + '@rolldown/binding-darwin-x64@1.0.0-rc.10': + resolution: {integrity: sha512-rI15NcM1mA48lqrIxVkHfAqcyFLcQwyXWThy+BQ5+mkKKPvSO26ir+ZDp36AgYoYVkqvMcdS8zOE6SeBsR9e8A==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [darwin] + + '@rolldown/binding-freebsd-x64@1.0.0-rc.10': + resolution: {integrity: sha512-XZRXHdTa+4ME1MuDVp021+doQ+z6Ei4CCFmNc5/sKbqb8YmkiJdj8QKlV3rCI0AJtAeSB5n0WGPuJWNL9p/L2w==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [freebsd] + + '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.10': + resolution: {integrity: sha512-R0SQMRluISSLzFE20sPWYHVmJdDQnRyc/FzSCN72BqQmh2SOZUFG+N3/vBZpR4C6WpEUVYJLrYUXaj43sJsNLA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [linux] + + '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.10': + resolution: {integrity: sha512-Y1reMrV/o+cwpduYhJuOE3OMKx32RMYCidf14y+HssARRmhDuWXJ4yVguDg2R/8SyyGNo+auzz64LnPK9Hq6jg==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [linux] + libc: [glibc] + + '@rolldown/binding-linux-arm64-musl@1.0.0-rc.10': + resolution: {integrity: sha512-vELN+HNb2IzuzSBUOD4NHmP9yrGwl1DVM29wlQvx1OLSclL0NgVWnVDKl/8tEks79EFek/kebQKnNJkIAA4W2g==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [linux] + libc: [musl] + + '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.10': + resolution: {integrity: sha512-ZqrufYTgzxbHwpqOjzSsb0UV/aV2TFIY5rP8HdsiPTv/CuAgCRjM6s9cYFwQ4CNH+hf9Y4erHW1GjZuZ7WoI7w==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [ppc64] + os: [linux] + libc: [glibc] + + '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.10': + resolution: {integrity: sha512-gSlmVS1FZJSRicA6IyjoRoKAFK7IIHBs7xJuHRSmjImqk3mPPWbR7RhbnfH2G6bcmMEllCt2vQ/7u9e6bBnByg==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [s390x] + os: [linux] + libc: [glibc] + + '@rolldown/binding-linux-x64-gnu@1.0.0-rc.10': + resolution: {integrity: sha512-eOCKUpluKgfObT2pHjztnaWEIbUabWzk3qPZ5PuacuPmr4+JtQG4k2vGTY0H15edaTnicgU428XW/IH6AimcQw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [linux] + libc: [glibc] + + '@rolldown/binding-linux-x64-musl@1.0.0-rc.10': + resolution: {integrity: sha512-Xdf2jQbfQowJnLcgYfD/m0Uu0Qj5OdxKallD78/IPPfzaiaI4KRAwZzHcKQ4ig1gtg1SuzC7jovNiM2TzQsBXA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [linux] + libc: [musl] + + '@rolldown/binding-openharmony-arm64@1.0.0-rc.10': + resolution: {integrity: sha512-o1hYe8hLi1EY6jgPFyxQgQ1wcycX+qz8eEbVmot2hFkgUzPxy9+kF0u0NIQBeDq+Mko47AkaFFaChcvZa9UX9Q==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [openharmony] + + '@rolldown/binding-wasm32-wasi@1.0.0-rc.10': + resolution: {integrity: sha512-Ugv9o7qYJudqQO5Y5y2N2SOo6S4WiqiNOpuQyoPInnhVzCY+wi/GHltcLHypG9DEUYMB0iTB/huJrpadiAcNcA==} + engines: {node: '>=14.0.0'} + cpu: [wasm32] + + '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.10': + resolution: {integrity: sha512-7UODQb4fQUNT/vmgDZBl3XOBAIOutP5R3O/rkxg0aLfEGQ4opbCgU5vOw/scPe4xOqBwL9fw7/RP1vAMZ6QlAQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [win32] + + '@rolldown/binding-win32-x64-msvc@1.0.0-rc.10': + resolution: {integrity: sha512-PYxKHMVHOb5NJuDL53vBUl1VwUjymDcYI6rzpIni0C9+9mTiJedvUxSk7/RPp7OOAm3v+EjgMu9bIy3N6b408w==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [win32] + + '@rolldown/pluginutils@1.0.0-rc.10': + resolution: {integrity: sha512-UkVDEFk1w3mveXeKgaTuYfKWtPbvgck1dT8TUG3bnccrH0XtLTuAyfCoks4Q/M5ZGToSVJTIQYCzy2g/atAOeg==} + + '@rolldown/pluginutils@1.0.0-rc.3': + resolution: {integrity: sha512-eybk3TjzzzV97Dlj5c+XrBFW57eTNhzod66y9HrBlzJ6NsCrWCp/2kaPS3K9wJmurBC0Tdw4yPjXKZqlznim3Q==} + + '@rolldown/pluginutils@1.0.0-rc.7': + resolution: {integrity: sha512-qujRfC8sFVInYSPPMLQByRh7zhwkGFS4+tyMQ83srV1qrxL4g8E2tyxVVyxd0+8QeBM1mIk9KbWxkegRr76XzA==} - '@rollup/plugin-inject@5.0.5': - resolution: {integrity: sha512-2+DEJbNBoPROPkgTDNe8/1YXWcqxbN5DTjASVIOx8HS+pITXushyNiBV56RB08zuptzz8gT3YfkqriTBVycepg==} + '@rollup/plugin-babel@6.1.0': + resolution: {integrity: sha512-dFZNuFD2YRcoomP4oYf+DvQNSUA9ih+A3vUqopQx5EdtPGo3WBnQcI/S8pwpz91UsGfL0HsMSOlaMld8HrbubA==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: 4.49.0 + '@babel/core': ^7.0.0 + '@types/babel__core': ^7.1.9 + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 peerDependenciesMeta: + '@types/babel__core': + optional: true rollup: optional: true @@ -5660,160 +6145,184 @@ packages: resolution: {integrity: sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: 4.49.0 + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 peerDependenciesMeta: rollup: optional: true - '@rollup/rollup-android-arm-eabi@4.49.0': - resolution: {integrity: sha512-rlKIeL854Ed0e09QGYFlmDNbka6I3EQFw7iZuugQjMb11KMpJCLPFL4ZPbMfaEhLADEL1yx0oujGkBQ7+qW3eA==} + '@rollup/rollup-android-arm-eabi@4.60.0': + resolution: {integrity: sha512-WOhNW9K8bR3kf4zLxbfg6Pxu2ybOUbB2AjMDHSQx86LIF4rH4Ft7vmMwNt0loO0eonglSNy4cpD3MKXXKQu0/A==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.49.0': - resolution: {integrity: sha512-cqPpZdKUSQYRtLLr6R4X3sD4jCBO1zUmeo3qrWBCqYIeH8Q3KRL4F3V7XJ2Rm8/RJOQBZuqzQGWPjjvFUcYa/w==} + '@rollup/rollup-android-arm64@4.60.0': + resolution: {integrity: sha512-u6JHLll5QKRvjciE78bQXDmqRqNs5M/3GVqZeMwvmjaNODJih/WIrJlFVEihvV0MiYFmd+ZyPr9wxOVbPAG2Iw==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.49.0': - resolution: {integrity: sha512-99kMMSMQT7got6iYX3yyIiJfFndpojBmkHfTc1rIje8VbjhmqBXE+nb7ZZP3A5skLyujvT0eIUCUsxAe6NjWbw==} + '@rollup/rollup-darwin-arm64@4.60.0': + resolution: {integrity: sha512-qEF7CsKKzSRc20Ciu2Zw1wRrBz4g56F7r/vRwY430UPp/nt1x21Q/fpJ9N5l47WWvJlkNCPJz3QRVw008fi7yA==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.49.0': - resolution: {integrity: sha512-y8cXoD3wdWUDpjOLMKLx6l+NFz3NlkWKcBCBfttUn+VGSfgsQ5o/yDUGtzE9HvsodkP0+16N0P4Ty1VuhtRUGg==} + '@rollup/rollup-darwin-x64@4.60.0': + resolution: {integrity: sha512-WADYozJ4QCnXCH4wPB+3FuGmDPoFseVCUrANmA5LWwGmC6FL14BWC7pcq+FstOZv3baGX65tZ378uT6WG8ynTw==} cpu: [x64] os: [darwin] - '@rollup/rollup-freebsd-arm64@4.49.0': - resolution: {integrity: sha512-3mY5Pr7qv4GS4ZvWoSP8zha8YoiqrU+e0ViPvB549jvliBbdNLrg2ywPGkgLC3cmvN8ya3za+Q2xVyT6z+vZqA==} + '@rollup/rollup-freebsd-arm64@4.60.0': + resolution: {integrity: sha512-6b8wGHJlDrGeSE3aH5mGNHBjA0TTkxdoNHik5EkvPHCt351XnigA4pS7Wsj/Eo9Y8RBU6f35cjN9SYmCFBtzxw==} cpu: [arm64] os: [freebsd] - '@rollup/rollup-freebsd-x64@4.49.0': - resolution: {integrity: sha512-C9KzzOAQU5gU4kG8DTk+tjdKjpWhVWd5uVkinCwwFub2m7cDYLOdtXoMrExfeBmeRy9kBQMkiyJ+HULyF1yj9w==} + '@rollup/rollup-freebsd-x64@4.60.0': + resolution: {integrity: sha512-h25Ga0t4jaylMB8M/JKAyrvvfxGRjnPQIR8lnCayyzEjEOx2EJIlIiMbhpWxDRKGKF8jbNH01NnN663dH638mA==} cpu: [x64] os: [freebsd] - '@rollup/rollup-linux-arm-gnueabihf@4.49.0': - resolution: {integrity: sha512-OVSQgEZDVLnTbMq5NBs6xkmz3AADByCWI4RdKSFNlDsYXdFtlxS59J+w+LippJe8KcmeSSM3ba+GlsM9+WwC1w==} + '@rollup/rollup-linux-arm-gnueabihf@4.60.0': + resolution: {integrity: sha512-RzeBwv0B3qtVBWtcuABtSuCzToo2IEAIQrcyB/b2zMvBWVbjo8bZDjACUpnaafaxhTw2W+imQbP2BD1usasK4g==} cpu: [arm] os: [linux] libc: [glibc] - '@rollup/rollup-linux-arm-musleabihf@4.49.0': - resolution: {integrity: sha512-ZnfSFA7fDUHNa4P3VwAcfaBLakCbYaxCk0jUnS3dTou9P95kwoOLAMlT3WmEJDBCSrOEFFV0Y1HXiwfLYJuLlA==} + '@rollup/rollup-linux-arm-musleabihf@4.60.0': + resolution: {integrity: sha512-Sf7zusNI2CIU1HLzuu9Tc5YGAHEZs5Lu7N1ssJG4Tkw6e0MEsN7NdjUDDfGNHy2IU+ENyWT+L2obgWiguWibWQ==} cpu: [arm] os: [linux] libc: [musl] - '@rollup/rollup-linux-arm64-gnu@4.49.0': - resolution: {integrity: sha512-Z81u+gfrobVK2iV7GqZCBfEB1y6+I61AH466lNK+xy1jfqFLiQ9Qv716WUM5fxFrYxwC7ziVdZRU9qvGHkYIJg==} + '@rollup/rollup-linux-arm64-gnu@4.60.0': + resolution: {integrity: sha512-DX2x7CMcrJzsE91q7/O02IJQ5/aLkVtYFryqCjduJhUfGKG6yJV8hxaw8pZa93lLEpPTP/ohdN4wFz7yp/ry9A==} cpu: [arm64] os: [linux] libc: [glibc] - '@rollup/rollup-linux-arm64-musl@4.49.0': - resolution: {integrity: sha512-zoAwS0KCXSnTp9NH/h9aamBAIve0DXeYpll85shf9NJ0URjSTzzS+Z9evmolN+ICfD3v8skKUPyk2PO0uGdFqg==} + '@rollup/rollup-linux-arm64-musl@4.60.0': + resolution: {integrity: sha512-09EL+yFVbJZlhcQfShpswwRZ0Rg+z/CsSELFCnPt3iK+iqwGsI4zht3secj5vLEs957QvFFXnzAT0FFPIxSrkQ==} cpu: [arm64] os: [linux] libc: [musl] - '@rollup/rollup-linux-loongarch64-gnu@4.49.0': - resolution: {integrity: sha512-2QyUyQQ1ZtwZGiq0nvODL+vLJBtciItC3/5cYN8ncDQcv5avrt2MbKt1XU/vFAJlLta5KujqyHdYtdag4YEjYQ==} + '@rollup/rollup-linux-loong64-gnu@4.60.0': + resolution: {integrity: sha512-i9IcCMPr3EXm8EQg5jnja0Zyc1iFxJjZWlb4wr7U2Wx/GrddOuEafxRdMPRYVaXjgbhvqalp6np07hN1w9kAKw==} cpu: [loong64] os: [linux] libc: [glibc] - '@rollup/rollup-linux-ppc64-gnu@4.49.0': - resolution: {integrity: sha512-k9aEmOWt+mrMuD3skjVJSSxHckJp+SiFzFG+v8JLXbc/xi9hv2icSkR3U7uQzqy+/QbbYY7iNB9eDTwrELo14g==} + '@rollup/rollup-linux-loong64-musl@4.60.0': + resolution: {integrity: sha512-DGzdJK9kyJ+B78MCkWeGnpXJ91tK/iKA6HwHxF4TAlPIY7GXEvMe8hBFRgdrR9Ly4qebR/7gfUs9y2IoaVEyog==} + cpu: [loong64] + os: [linux] + libc: [musl] + + '@rollup/rollup-linux-ppc64-gnu@4.60.0': + resolution: {integrity: sha512-RwpnLsqC8qbS8z1H1AxBA1H6qknR4YpPR9w2XX0vo2Sz10miu57PkNcnHVaZkbqyw/kUWfKMI73jhmfi9BRMUQ==} cpu: [ppc64] os: [linux] libc: [glibc] - '@rollup/rollup-linux-riscv64-gnu@4.49.0': - resolution: {integrity: sha512-rDKRFFIWJ/zJn6uk2IdYLc09Z7zkE5IFIOWqpuU0o6ZpHcdniAyWkwSUWE/Z25N/wNDmFHHMzin84qW7Wzkjsw==} + '@rollup/rollup-linux-ppc64-musl@4.60.0': + resolution: {integrity: sha512-Z8pPf54Ly3aqtdWC3G4rFigZgNvd+qJlOE52fmko3KST9SoGfAdSRCwyoyG05q1HrrAblLbk1/PSIV+80/pxLg==} + cpu: [ppc64] + os: [linux] + libc: [musl] + + '@rollup/rollup-linux-riscv64-gnu@4.60.0': + resolution: {integrity: sha512-3a3qQustp3COCGvnP4SvrMHnPQ9d1vzCakQVRTliaz8cIp/wULGjiGpbcqrkv0WrHTEp8bQD/B3HBjzujVWLOA==} cpu: [riscv64] os: [linux] libc: [glibc] - '@rollup/rollup-linux-riscv64-musl@4.49.0': - resolution: {integrity: sha512-FkkhIY/hYFVnOzz1WeV3S9Bd1h0hda/gRqvZCMpHWDHdiIHn6pqsY3b5eSbvGccWHMQ1uUzgZTKS4oGpykf8Tw==} + '@rollup/rollup-linux-riscv64-musl@4.60.0': + resolution: {integrity: sha512-pjZDsVH/1VsghMJ2/kAaxt6dL0psT6ZexQVrijczOf+PeP2BUqTHYejk3l6TlPRydggINOeNRhvpLa0AYpCWSQ==} cpu: [riscv64] os: [linux] libc: [musl] - '@rollup/rollup-linux-s390x-gnu@4.49.0': - resolution: {integrity: sha512-gRf5c+A7QiOG3UwLyOOtyJMD31JJhMjBvpfhAitPAoqZFcOeK3Kc1Veg1z/trmt+2P6F/biT02fU19GGTS529A==} + '@rollup/rollup-linux-s390x-gnu@4.60.0': + resolution: {integrity: sha512-3ObQs0BhvPgiUVZrN7gqCSvmFuMWvWvsjG5ayJ3Lraqv+2KhOsp+pUbigqbeWqueGIsnn+09HBw27rJ+gYK4VQ==} cpu: [s390x] os: [linux] libc: [glibc] - '@rollup/rollup-linux-x64-gnu@4.49.0': - resolution: {integrity: sha512-BR7+blScdLW1h/2hB/2oXM+dhTmpW3rQt1DeSiCP9mc2NMMkqVgjIN3DDsNpKmezffGC9R8XKVOLmBkRUcK/sA==} + '@rollup/rollup-linux-x64-gnu@4.53.3': + resolution: {integrity: sha512-3EhFi1FU6YL8HTUJZ51imGJWEX//ajQPfqWLI3BQq4TlvHy4X0MOr5q3D2Zof/ka0d5FNdPwZXm3Yyib/UEd+w==} cpu: [x64] os: [linux] libc: [glibc] - '@rollup/rollup-linux-x64-gnu@4.53.3': - resolution: {integrity: sha512-3EhFi1FU6YL8HTUJZ51imGJWEX//ajQPfqWLI3BQq4TlvHy4X0MOr5q3D2Zof/ka0d5FNdPwZXm3Yyib/UEd+w==} + '@rollup/rollup-linux-x64-gnu@4.60.0': + resolution: {integrity: sha512-EtylprDtQPdS5rXvAayrNDYoJhIz1/vzN2fEubo3yLE7tfAw+948dO0g4M0vkTVFhKojnF+n6C8bDNe+gDRdTg==} cpu: [x64] os: [linux] libc: [glibc] - '@rollup/rollup-linux-x64-musl@4.49.0': - resolution: {integrity: sha512-hDMOAe+6nX3V5ei1I7Au3wcr9h3ktKzDvF2ne5ovX8RZiAHEtX1A5SNNk4zt1Qt77CmnbqT+upb/umzoPMWiPg==} + '@rollup/rollup-linux-x64-musl@4.60.0': + resolution: {integrity: sha512-k09oiRCi/bHU9UVFqD17r3eJR9bn03TyKraCrlz5ULFJGdJGi7VOmm9jl44vOJvRJ6P7WuBi/s2A97LxxHGIdw==} cpu: [x64] os: [linux] libc: [musl] - '@rollup/rollup-win32-arm64-msvc@4.49.0': - resolution: {integrity: sha512-wkNRzfiIGaElC9kXUT+HLx17z7D0jl+9tGYRKwd8r7cUqTL7GYAvgUY++U2hK6Ar7z5Z6IRRoWC8kQxpmM7TDA==} + '@rollup/rollup-openbsd-x64@4.60.0': + resolution: {integrity: sha512-1o/0/pIhozoSaDJoDcec+IVLbnRtQmHwPV730+AOD29lHEEo4F5BEUB24H0OBdhbBBDwIOSuf7vgg0Ywxdfiiw==} + cpu: [x64] + os: [openbsd] + + '@rollup/rollup-openharmony-arm64@4.60.0': + resolution: {integrity: sha512-pESDkos/PDzYwtyzB5p/UoNU/8fJo68vcXM9ZW2V0kjYayj1KaaUfi1NmTUTUpMn4UhU4gTuK8gIaFO4UGuMbA==} + cpu: [arm64] + os: [openharmony] + + '@rollup/rollup-win32-arm64-msvc@4.60.0': + resolution: {integrity: sha512-hj1wFStD7B1YBeYmvY+lWXZ7ey73YGPcViMShYikqKT1GtstIKQAtfUI6yrzPjAy/O7pO0VLXGmUVWXQMaYgTQ==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.49.0': - resolution: {integrity: sha512-gq5aW/SyNpjp71AAzroH37DtINDcX1Qw2iv9Chyz49ZgdOP3NV8QCyKZUrGsYX9Yyggj5soFiRCgsL3HwD8TdA==} + '@rollup/rollup-win32-ia32-msvc@4.60.0': + resolution: {integrity: sha512-SyaIPFoxmUPlNDq5EHkTbiKzmSEmq/gOYFI/3HHJ8iS/v1mbugVa7dXUzcJGQfoytp9DJFLhHH4U3/eTy2Bq4w==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.49.0': - resolution: {integrity: sha512-gEtqFbzmZLFk2xKh7g0Rlo8xzho8KrEFEkzvHbfUGkrgXOpZ4XagQ6n+wIZFNh1nTb8UD16J4nFSFKXYgnbdBg==} + '@rollup/rollup-win32-x64-gnu@4.60.0': + resolution: {integrity: sha512-RdcryEfzZr+lAr5kRm2ucN9aVlCCa2QNq4hXelZxb8GG0NJSazq44Z3PCCc8wISRuCVnGs0lQJVX5Vp6fKA+IA==} cpu: [x64] os: [win32] - '@rtsao/scc@1.1.0': - resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==} + '@rollup/rollup-win32-x64-msvc@4.60.0': + resolution: {integrity: sha512-PrsWNQ8BuE00O3Xsx3ALh2Df8fAj9+cvvX9AIA6o4KpATR98c9mud4XtDWVvsEuyia5U4tVSTKygawyJkjm60w==} + cpu: [x64] + os: [win32] - '@rushstack/node-core-library@5.19.1': - resolution: {integrity: sha512-ESpb2Tajlatgbmzzukg6zyAhH+sICqJR2CNXNhXcEbz6UGCQfrKCtkxOpJTftWc8RGouroHG0Nud1SJAszvpmA==} + '@rushstack/node-core-library@5.20.3': + resolution: {integrity: sha512-95JgEPq2k7tHxhF9/OJnnyHDXfC9cLhhta0An/6MlkDsX2A6dTzDrTUG18vx4vjc280V0fi0xDH9iQczpSuWsw==} peerDependencies: '@types/node': '*' peerDependenciesMeta: '@types/node': optional: true - '@rushstack/problem-matcher@0.1.1': - resolution: {integrity: sha512-Fm5XtS7+G8HLcJHCWpES5VmeMyjAKaWeyZU5qPzZC+22mPlJzAsOxymHiWIfuirtPckX3aptWws+K2d0BzniJA==} + '@rushstack/problem-matcher@0.2.1': + resolution: {integrity: sha512-gulfhBs6n+I5b7DvjKRfhMGyUejtSgOHTclF/eONr8hcgF1APEDjhxIsfdUYYMzC3rvLwGluqLjbwCFZ8nxrog==} peerDependencies: '@types/node': '*' peerDependenciesMeta: '@types/node': optional: true - '@rushstack/rig-package@0.6.0': - resolution: {integrity: sha512-ZQmfzsLE2+Y91GF15c65L/slMRVhF6Hycq04D4TwtdGaUAbIXXg9c5pKA5KFU7M4QMaihoobp9JJYpYcaY3zOw==} + '@rushstack/rig-package@0.7.2': + resolution: {integrity: sha512-9XbFWuqMYcHUso4mnETfhGVUSaADBRj6HUAAEYk50nMPn8WRICmBuCphycQGNB3duIR6EEZX3Xj3SYc2XiP+9A==} - '@rushstack/terminal@0.19.5': - resolution: {integrity: sha512-6k5tpdB88G0K7QrH/3yfKO84HK9ggftfUZ51p7fePyCE7+RLLHkWZbID9OFWbXuna+eeCFE7AkKnRMHMxNbz7Q==} + '@rushstack/terminal@0.22.3': + resolution: {integrity: sha512-gHC9pIMrUPzAbBiI4VZMU7Q+rsCzb8hJl36lFIulIzoceKotyKL3Rd76AZ2CryCTKEg+0bnTj406HE5YY5OQvw==} peerDependencies: '@types/node': '*' peerDependenciesMeta: '@types/node': optional: true - '@rushstack/ts-command-line@5.1.5': - resolution: {integrity: sha512-YmrFTFUdHXblYSa+Xc9OO9FsL/XFcckZy0ycQ6q7VSBsVs5P0uD9vcges5Q9vctGlVdu27w+Ct6IuJ458V0cTQ==} + '@rushstack/ts-command-line@5.3.3': + resolution: {integrity: sha512-c+ltdcvC7ym+10lhwR/vWiOhsrm/bP3By2VsFcs5qTKv+6tTmxgbVrtJ5NdNjANiV5TcmOZgUN+5KYQ4llsvEw==} '@rushstack/worker-pool@0.4.9': resolution: {integrity: sha512-ibAOeQCuz3g0c88GGawAPO2LVOTZE3uPh4DCEJILZS9SEv9opEUObsovC18EHPgeIuFy4HkoJT+t7l8LURZjIw==} @@ -5823,24 +6332,24 @@ packages: '@types/node': optional: true - '@scalar/helpers@0.2.8': - resolution: {integrity: sha512-aXXRF4sCaiGZIRpZ1MUcnl8y0Q9pPG1VXqQMWacVWDh6zQN9cuayTC/TbODzWeldp50sgJ1E8MpHvpeV7CEF9g==} + '@scalar/helpers@0.2.18': + resolution: {integrity: sha512-w1d4tpNEVZ293oB2BAgLrS0kVPUtG3eByNmOCJA5eK9vcT4D3cmsGtWjUaaqit0BQCsBFHK51rasGvSWnApYTw==} engines: {node: '>=20'} - '@scalar/json-magic@0.9.1': - resolution: {integrity: sha512-57CHpIAjS2+SFl5phlDKJNPj3eNQh8U0iu6MKknVaW+qIQ55tTnYy2qIjdm3joUoPIu41iHdjW5PupwXK6Zneg==} + '@scalar/json-magic@0.11.7': + resolution: {integrity: sha512-GVz9E0vXu+ecypkdn0biK1gbQVkK4QTTX1Hq3eMgxlLQC91wwiqWfCqwfhuX0LRu+Z5OmYhLhufDJEEh56rVgA==} engines: {node: '>=20'} - '@scalar/openapi-parser@0.24.1': - resolution: {integrity: sha512-SyjqI5yhAhg8a6LHJvSjO57cOJQOkeoh8MvsaE0ccIa1MgQK48dVN4aNckCSKpALBXKnBuLCywEC9Sbi9nSG2g==} + '@scalar/openapi-parser@0.24.17': + resolution: {integrity: sha512-aM9UVrzlMreC3X/sZbyj+7XDZmat3ecGC3RpU8dqEO/HIH+CEX0xMLuP+41DhePCYg5+9TtDomSfWuMq4x1Z1A==} engines: {node: '>=20'} - '@scalar/openapi-types@0.5.3': - resolution: {integrity: sha512-m4n/Su3K01d15dmdWO1LlqecdSPKuNjuokrJLdiQ485kW/hRHbXW1QP6tJL75myhw/XhX5YhYAR+jrwnGjXiMw==} + '@scalar/openapi-types@0.5.4': + resolution: {integrity: sha512-2pEbhprh8lLGDfUI6mNm9EV104pjb3+aJsXrFaqfgOSre7r6NlgM5HcSbsLjzDAnTikjJhJ3IMal1Rz8WVwiOw==} engines: {node: '>=20'} - '@scalar/openapi-upgrader@0.1.7': - resolution: {integrity: sha512-065froUtqvaHjyeJtyitf8tb+k7oh7nU0OinAHYbj1Bqgwb1s2+uKMqHYHEES5CNpp+2xtL4lxup6Aq29yW+sQ==} + '@scalar/openapi-upgrader@0.1.11': + resolution: {integrity: sha512-ngJcHGoCHmpWgYtNy08vmzFfLdQEkMpvaCQqNPPMNKq0QEXOv89e/rn+TZJZgPnRlY7fDIoIhn9lNgr+azBW+w==} engines: {node: '>=20'} '@scarf/scarf@1.4.0': @@ -5894,23 +6403,51 @@ packages: resolution: {integrity: sha512-Nqc90v4lWCXyakD6xNyNACBJNJ0tNCwj2WNk/7ivyacYHxiITVgmLUFXTBOeCdy79iz6HtN9Y31uw/jbLrdOAg==} engines: {node: '>=20.0.0'} - '@shikijs/core@3.21.0': - resolution: {integrity: sha512-AXSQu/2n1UIQekY8euBJlvFYZIw0PHY63jUzGbrOma4wPxzznJXTXkri+QcHeBNaFxiiOljKxxJkVSoB3PjbyA==} + '@shikijs/core@3.23.0': + resolution: {integrity: sha512-NSWQz0riNb67xthdm5br6lAkvpDJRTgB36fxlo37ZzM2yq0PQFFzbd8psqC2XMPgCzo1fW6cVi18+ArJ44wqgA==} + + '@shikijs/core@4.0.2': + resolution: {integrity: sha512-hxT0YF4ExEqB8G/qFdtJvpmHXBYJ2lWW7qTHDarVkIudPFE6iCIrqdgWxGn5s+ppkGXI0aEGlibI0PAyzP3zlw==} + engines: {node: '>=20'} + + '@shikijs/engine-javascript@3.23.0': + resolution: {integrity: sha512-aHt9eiGFobmWR5uqJUViySI1bHMqrAgamWE1TYSUoftkAeCCAiGawPMwM+VCadylQtF4V3VNOZ5LmfItH5f3yA==} + + '@shikijs/engine-javascript@4.0.2': + resolution: {integrity: sha512-7PW0Nm49DcoUIQEXlJhNNBHyoGMjalRETTCcjMqEaMoJRLljy1Bi/EGV3/qLBgLKQejdspiiYuHGQW6dX94Nag==} + engines: {node: '>=20'} + + '@shikijs/engine-oniguruma@3.23.0': + resolution: {integrity: sha512-1nWINwKXxKKLqPibT5f4pAFLej9oZzQTsby8942OTlsJzOBZ0MWKiwzMsd+jhzu8YPCHAswGnnN1YtQfirL35g==} - '@shikijs/engine-javascript@3.21.0': - resolution: {integrity: sha512-ATwv86xlbmfD9n9gKRiwuPpWgPENAWCLwYCGz9ugTJlsO2kOzhOkvoyV/UD+tJ0uT7YRyD530x6ugNSffmvIiQ==} + '@shikijs/engine-oniguruma@4.0.2': + resolution: {integrity: sha512-UpCB9Y2sUKlS9z8juFSKz7ZtysmeXCgnRF0dlhXBkmQnek7lAToPte8DkxmEYGNTMii72zU/lyXiCB6StuZeJg==} + engines: {node: '>=20'} + + '@shikijs/langs@3.23.0': + resolution: {integrity: sha512-2Ep4W3Re5aB1/62RSYQInK9mM3HsLeB91cHqznAJMuylqjzNVAVCMnNWRHFtcNHXsoNRayP9z1qj4Sq3nMqYXg==} + + '@shikijs/langs@4.0.2': + resolution: {integrity: sha512-KaXby5dvoeuZzN0rYQiPMjFoUrz4hgwIE+D6Du9owcHcl6/g16/yT5BQxSW5cGt2MZBz6Hl0YuRqf12omRfUUg==} + engines: {node: '>=20'} - '@shikijs/engine-oniguruma@3.21.0': - resolution: {integrity: sha512-OYknTCct6qiwpQDqDdf3iedRdzj6hFlOPv5hMvI+hkWfCKs5mlJ4TXziBG9nyabLwGulrUjHiCq3xCspSzErYQ==} + '@shikijs/primitive@4.0.2': + resolution: {integrity: sha512-M6UMPrSa3fN5ayeJwFVl9qWofl273wtK1VG8ySDZ1mQBfhCpdd8nEx7nPZ/tk7k+TYcpqBZzj/AnwxT9lO+HJw==} + engines: {node: '>=20'} + + '@shikijs/themes@3.23.0': + resolution: {integrity: sha512-5qySYa1ZgAT18HR/ypENL9cUSGOeI2x+4IvYJu4JgVJdizn6kG4ia5Q1jDEOi7gTbN4RbuYtmHh0W3eccOrjMA==} - '@shikijs/langs@3.21.0': - resolution: {integrity: sha512-g6mn5m+Y6GBJ4wxmBYqalK9Sp0CFkUqfNzUy2pJglUginz6ZpWbaWjDB4fbQ/8SHzFjYbtU6Ddlp1pc+PPNDVA==} + '@shikijs/themes@4.0.2': + resolution: {integrity: sha512-mjCafwt8lJJaVSsQvNVrJumbnnj1RI8jbUKrPKgE6E3OvQKxnuRoBaYC51H4IGHePsGN/QtALglWBU7DoKDFnA==} + engines: {node: '>=20'} - '@shikijs/themes@3.21.0': - resolution: {integrity: sha512-BAE4cr9EDiZyYzwIHEk7JTBJ9CzlPuM4PchfcA5ao1dWXb25nv6hYsoDiBq2aZK9E3dlt3WB78uI96UESD+8Mw==} + '@shikijs/types@3.23.0': + resolution: {integrity: sha512-3JZ5HXOZfYjsYSk0yPwBrkupyYSLpAE26Qc0HLghhZNGTZg/SKxXIIgoxOpmmeQP0RRSDJTk1/vPfw9tbw+jSQ==} - '@shikijs/types@3.21.0': - resolution: {integrity: sha512-zGrWOxZ0/+0ovPY7PvBU2gIS9tmhSUUt30jAcNV0Bq0gb2S98gwfjIs1vxlmH5zM7/4YxLamT6ChlqqAJmPPjA==} + '@shikijs/types@4.0.2': + resolution: {integrity: sha512-qzbeRooUTPnLE+sHD/Z8DStmaDgnbbc/pMrU203950aRqjX/6AFHeDYT+j00y2lPdz0ywJKx7o/7qnqTivtlXg==} + engines: {node: '>=20'} '@shikijs/vscode-textmate@10.0.2': resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==} @@ -5978,25 +6515,25 @@ packages: '@standard-schema/spec@1.1.0': resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==} - '@storybook/builder-vite@10.1.11': - resolution: {integrity: sha512-MMD09Ap7FyzDfWG961pkIMv/w684XXe1bBEi+wCEpHxvrgAd3j3A9w/Rqp9Am2uRDPCEdi1QgSzS3SGW3aGThQ==} + '@storybook/builder-vite@10.3.3': + resolution: {integrity: sha512-awspKCTZvXyeV3KabL0id62mFbxR5u/5yyGQultwCiSb2/yVgBfip2MAqLyS850pvTiB6QFVM9deOyd2/G/bEA==} peerDependencies: - storybook: ^10.1.11 - vite: ^5.0.0 || ^6.0.0 || ^7.0.0 + storybook: ^10.3.3 + vite: ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 - '@storybook/cli@10.1.11': - resolution: {integrity: sha512-fZqXh3ibSwqFTX8l7fE+pdIZyqTnQxG9fs4Jr6g/AKXvF4ZXOXi2Mq+DtCX0z7PZYC0Gka2Qwk3fqsGTq23cwQ==} + '@storybook/cli@10.3.3': + resolution: {integrity: sha512-+LdYw0XH8eN3rrYNIt2JEpfigNvs0HQ7+2z7aN3MSujt9pawgpnIeTyqFgjIiYqD5cVZ6vE+aCUMo3xvmptyuQ==} hasBin: true - '@storybook/codemod@10.1.11': - resolution: {integrity: sha512-4bUlUEWixI86k6IbRUz3+kVyBFPaQd1KM0hf1AHH+AT0DG9QUx531KJCMfSjgIcdNBhjJ7CrztvjgNPJiEqYyQ==} + '@storybook/codemod@10.3.3': + resolution: {integrity: sha512-MStm1AspBe8wyt29bvyHccwvpeJV0zqUrIB/7w+WkPpQfVL+RnI//aJmwdcML1W1nz02WQXRMCOBcp0LR50ZAA==} - '@storybook/csf-plugin@10.1.11': - resolution: {integrity: sha512-Ant0NhgqHKzQsseeVTSetZCuDHHs0W2HRkHt51Kg/sUl0T/sDtfVA+fWZT8nGzGZqYSFkxqYPWjauPmIhPtaRw==} + '@storybook/csf-plugin@10.3.3': + resolution: {integrity: sha512-Utlh7zubm+4iOzBBfzLW4F4vD99UBtl2Do4edlzK2F7krQIcFvR2ontjAE8S1FQVLZAC3WHalCOS+Ch8zf3knA==} peerDependencies: esbuild: '*' - rollup: 4.49.0 - storybook: ^10.1.11 + rollup: '*' + storybook: ^10.3.3 vite: '*' webpack: '*' peerDependenciesMeta: @@ -6018,34 +6555,34 @@ packages: react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 - '@storybook/react-dom-shim@10.1.11': - resolution: {integrity: sha512-o8WPhRlZbORUWG9lAgDgJP0pi905VHJUFJr1Kp8980gHqtlemtnzjPxKy5vFwj6glNhAlK8SS8OOYzWP7hloTQ==} + '@storybook/react-dom-shim@10.3.3': + resolution: {integrity: sha512-lkhuh4G3UTreU9M3Iz5Dt32c6U+l/4XuvqLtbe1sDHENZH6aPj7y0b5FwnfHyvuTvYRhtbo29xZrF5Bp9kCC0w==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 - storybook: ^10.1.11 + storybook: ^10.3.3 - '@storybook/react-vite@10.1.11': - resolution: {integrity: sha512-qh1BCD25nIoiDfqwha+qBkl7pcG4WuzM+c8tsE63YEm8AFIbNKg5K8lVUoclF+4CpFz7IwBpWe61YUTDfp+91w==} + '@storybook/react-vite@10.3.3': + resolution: {integrity: sha512-qHdlBe1hjqFAGXa8JL7bWTLbP/gDqXbWDm+SYCB646NHh5yvVDkZLwigP5Y+UL7M2ASfqFtosnroUK9tcCM2dw==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 - storybook: ^10.1.11 - vite: ^5.0.0 || ^6.0.0 || ^7.0.0 + storybook: ^10.3.3 + vite: ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 - '@storybook/react@10.1.11': - resolution: {integrity: sha512-rmMGmEwBaM2YpB8oDk2moM0MNjNMqtwyoPPZxjyruY9WVhYca8EDPGKEdRzUlb4qZJsTgLi7VU4eqg6LD/mL3Q==} + '@storybook/react@10.3.3': + resolution: {integrity: sha512-cGG5TbR8Tdx9zwlpsWyBEfWrejm5iWdYF26EwIhwuKq9GFUTAVrQzo0Rs7Tqc3ZyVhRS/YfsRiWSEH+zmq2JiQ==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 - storybook: ^10.1.11 + storybook: ^10.3.3 typescript: '>= 4.9.x' peerDependenciesMeta: typescript: optional: true - '@swc/helpers@0.5.18': - resolution: {integrity: sha512-TXTnIcNJQEKwThMMqBXsZ4VGAza6bvN4pa41Rkqoio6QBKMvo+5lexeTMScGCIxtzgQJzElcvIltani+adC5PQ==} + '@swc/helpers@0.5.19': + resolution: {integrity: sha512-QamiFeIK3txNjgUTNppE6MiG3p7TdninpZu0E0PbqVh1a9FNLT2FRhisaa4NcaX52XVhA5l7Pk58Ft7Sqi/2sA==} '@szmarczak/http-timer@4.0.6': resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==} @@ -6080,20 +6617,20 @@ packages: peerDependencies: '@testing-library/dom': '>=7.21.4' - '@textlint/ast-node-types@15.5.1': - resolution: {integrity: sha512-2ABQSaQoM9u9fycXLJKcCv4XQulJWTUSwjo6F0i/ujjqOH8/AZ2A0RDKKbAddqxDhuabVB20lYoEsZZgzehccg==} + '@textlint/ast-node-types@15.5.2': + resolution: {integrity: sha512-fCaOxoup5LIyBEo7R1oYWE7V4bSX0KQeHh66twon9e9usaLE3ijgF8QjYsR6joCssdeCHVd0wHm7ppsEyTr6vg==} - '@textlint/linter-formatter@15.5.1': - resolution: {integrity: sha512-7wfzpcQtk7TZ3UJO2deTI71mJCm4VvPGUmSwE4iuH6FoaxpdWpwSBiMLcZtjYrt/oIFOtNz0uf5rI+xJiHTFww==} + '@textlint/linter-formatter@15.5.2': + resolution: {integrity: sha512-jAw7jWM8+wU9cG6Uu31jGyD1B+PAVePCvnPKC/oov+2iBPKk3ao30zc/Itmi7FvXo4oPaL9PmzPPQhyniPVgVg==} - '@textlint/module-interop@15.5.1': - resolution: {integrity: sha512-Y1jcFGCKNSmHxwsLO3mshOfLYX4Wavq2+w5BG6x5lGgZv0XrF1xxURRhbnhns4LzCu0fAcx6W+3V8/1bkyTZCw==} + '@textlint/module-interop@15.5.2': + resolution: {integrity: sha512-mg6rMQ3+YjwiXCYoQXbyVfDucpTa1q5mhspd/9qHBxUq4uY6W8GU42rmT3GW0V1yOfQ9z/iRrgPtkp71s8JzXg==} - '@textlint/resolver@15.5.1': - resolution: {integrity: sha512-CVHxMIm8iNGccqM12CQ/ycvh+HjJId4RyC6as5ynCcp2E1Uy1TCe0jBWOpmLsbT4Nx15Ke29BmspyByawuIRyA==} + '@textlint/resolver@15.5.2': + resolution: {integrity: sha512-YEITdjRiJaQrGLUWxWXl4TEg+d2C7+TNNjbGPHPH7V7CCnXm+S9GTjGAL7Q2WSGJyFEKt88Jvx6XdJffRv4HEA==} - '@textlint/types@15.5.1': - resolution: {integrity: sha512-IY1OVZZk8LOOrbapYCsaeH7XSJT89HVukixDT8CoiWMrKGCTCZ3/Kzoa3DtMMbY8jtY777QmPOVCNnR+8fF6YQ==} + '@textlint/types@15.5.2': + resolution: {integrity: sha512-sJOrlVLLXp4/EZtiWKWq9y2fWyZlI8GP+24rnU5avtPWBIMm/1w97yzKrAqYF8czx2MqR391z5akhnfhj2f/AQ==} '@tufjs/canonical-json@2.0.0': resolution: {integrity: sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==} @@ -6107,14 +6644,17 @@ packages: resolution: {integrity: sha512-Y8cK9aggNRsqJVaKUlEYs4s7CvQ1b1ta2DVPyAimb0I2qhzjNk+A+mxvll/klL0RlfuIUei8BF7YWiua4kQqww==} engines: {node: ^20.17.0 || >=22.9.0} + '@tybys/wasm-util@0.10.1': + resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==} + '@types/argparse@1.0.38': resolution: {integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==} '@types/aria-query@5.0.4': resolution: {integrity: sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==} - '@types/aws-lambda@8.10.160': - resolution: {integrity: sha512-uoO4QVQNWFPJMh26pXtmtrRfGshPUSpMZGUyUQY20FhfHEElEBOPKgVmFs1z+kbpyBsRs2JnoOPT7++Z4GA9pA==} + '@types/aws-lambda@8.10.161': + resolution: {integrity: sha512-rUYdp+MQwSFocxIOcSsYSF3YYYC/uUpMbCY/mbO21vGqfrEYvNSoPyKYDj6RhXXpPfS0KstW9RwG3qXh9sL7FQ==} '@types/babel__code-frame@7.27.0': resolution: {integrity: sha512-Dwlo+LrxDx/0SpfmJ/BKveHf7QXWvLBLc+x03l5sbzykj3oB9nHygCpSECF1a+s+QIxbghe+KHqC90vGtxLRAA==} @@ -6260,6 +6800,9 @@ packages: '@types/emscripten@1.41.5': resolution: {integrity: sha512-cMQm7pxu6BxtHyqJ7mQZ2kXWV5SLmugybFdHCBbJ5eHzOo6VhBckEgAT3//rP5FwPHNPeEiq4SmQ5ucBwsOo4Q==} + '@types/esrecurse@4.3.1': + resolution: {integrity: sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw==} + '@types/estree-jsx@1.0.5': resolution: {integrity: sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==} @@ -6278,8 +6821,8 @@ packages: '@types/hast@3.0.4': resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==} - '@types/http-cache-semantics@4.0.4': - resolution: {integrity: sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==} + '@types/http-cache-semantics@4.2.0': + resolution: {integrity: sha512-L3LgimLHXtGkWikKnsPg0/VFx9OGZaC+eN1u4r+OB1XRqH3meBIAVC2zr1WdMH+RHmnRkqliQAOHNJ/E0j/e0Q==} '@types/http-errors@2.0.5': resolution: {integrity: sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==} @@ -6293,9 +6836,6 @@ packages: '@types/json-schema@7.0.15': resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - '@types/json5@0.0.29': - resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} - '@types/keyv@3.1.4': resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} @@ -6308,17 +6848,14 @@ packages: '@types/micromatch@4.0.10': resolution: {integrity: sha512-5jOhFDElqr4DKTrTEbnW8DZ4Hz5LRUEmyrGpCMrD/NphYv3nUnaF08xmSLx1rGGnyEs/kFnhiw6dCgcDqMr5PQ==} - '@types/mocha@10.0.10': - resolution: {integrity: sha512-xPyYSz1cMPnJQhl0CLMH68j3gprKZaTjG3s5Vi+fDgx+uhG9NOXwbVt52eFS8ECyXhyKcjDLCBEqBExKuiZb7Q==} - '@types/morgan@1.9.10': resolution: {integrity: sha512-sS4A1zheMvsADRVfT0lYbJ4S9lmsey8Zo2F7cnbYjWHP67Q0AwMYuuzLlkIM2N8gAbb9cubhIVFwcIN2XyYCkA==} '@types/ms@2.1.0': resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==} - '@types/multer@2.0.0': - resolution: {integrity: sha512-C3Z9v9Evij2yST3RSBktxP9STm6OdMc5uR1xF1SGr98uv8dUlAL2hqwrZ3GVB3uyMyiegnscEK6PGtYvNrjTjw==} + '@types/multer@2.1.0': + resolution: {integrity: sha512-zYZb0+nJhOHtPpGDb3vqPjwpdeGlGC157VpkqNQL+UU2qwoacoQ7MpsAmUptI/0Oa127X32JzWDqQVEXp2RcIA==} '@types/mustache@4.2.6': resolution: {integrity: sha512-t+8/QWTAhOFlrF1IVZqKnMRJi84EgkIK5Kh0p2JV4OLywUvCwJPFxbJAl7XAow7DVIHsF+xW9f1MVzg0L6Szjw==} @@ -6326,29 +6863,26 @@ packages: '@types/nlcst@2.0.3': resolution: {integrity: sha512-vSYNSDe6Ix3q+6Z7ri9lyWqgGhJTmzRjZRqyq15N0Z/1/UnVsno9G/N40NBijoYx2seFDIl0+B2mgAb9mezUCA==} - '@types/node@17.0.45': - resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} - '@types/node@18.19.130': resolution: {integrity: sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==} - '@types/node@25.0.9': - resolution: {integrity: sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==} + '@types/node@24.12.0': + resolution: {integrity: sha512-GYDxsZi3ChgmckRT9HPU0WEhKLP08ev/Yfcq2AstjrDASOYCSXeyjDsHg4v5t4jOj7cyDX3vmprafKlWIG9MXQ==} + + '@types/node@25.5.0': + resolution: {integrity: sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==} '@types/normalize-package-data@2.4.4': resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} - '@types/parse-json@4.0.2': - resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==} - '@types/plist@3.0.5': resolution: {integrity: sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==} - '@types/prismjs@1.26.5': - resolution: {integrity: sha512-AUZTa7hQ2KY5L7AmtSiqxlhWxb4ina0yd8hNbl4TWuqnv/pFP0nDMb3YrfSBf4hJVGLh2YEIBfKaBW/9UEl6IQ==} + '@types/prismjs@1.26.6': + resolution: {integrity: sha512-vqlvI7qlMvcCBbVe0AKAb4f97//Hy0EBTaiW8AalRnG/xAN5zOiWWyrNqNXeq8+KAuvRewjCVY1+IPxk4RdNYw==} - '@types/qs@6.14.0': - resolution: {integrity: sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==} + '@types/qs@6.15.0': + resolution: {integrity: sha512-JawvT8iBVWpzTrz3EGw9BTQFg3BQNmwERdKE22vlTxawwtbyUSlMppvZYKLZzB5zgACXdXxbD3m1bXaMqP/9ow==} '@types/range-parser@1.2.7': resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==} @@ -6358,8 +6892,8 @@ packages: peerDependencies: '@types/react': ^19.2.0 - '@types/react@19.2.9': - resolution: {integrity: sha512-Lpo8kgb/igvMIPeNV2rsYKTgaORYdO1XGVZ4Qz3akwOj0ySGYMPlQWa8BaLn0G63D1aSaAQ5ldR06wCpChQCjA==} + '@types/react@19.2.14': + resolution: {integrity: sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==} '@types/remark-heading-id@1.0.0': resolution: {integrity: sha512-V6OgBN2Uv3kaYHOrBI2+j9xIo6N56bMpIFoKVkGltoJtzHr7Vo8pFxDZxNqUXC5NScV991Iq3BYD52BkCFMY+w==} @@ -6394,8 +6928,8 @@ packages: '@types/swagger-ui-express@4.1.8': resolution: {integrity: sha512-AhZV8/EIreHFmBV5wAs0gzJUNq9JbbSXgJLQubCC0jtIo6prnI9MIRRxnU4MZX9RB9yXxF1V4R7jtLl/Wcj31g==} - '@types/swagger-ui@5.21.1': - resolution: {integrity: sha512-DUmUH59eeOtvAqcWwBduH2ws0cc5i95KHsXCS4FsOfbUq/clW8TN+HqRBj7q5p9MSsSNK43RziIGItNbrAGLxg==} + '@types/swagger-ui@5.32.0': + resolution: {integrity: sha512-diMOqNQf6gkc3ghDIgjs/AfwbwZidja2e02+fJRIfNbbQ25W0EMGLe+f9/tHh/UFRfwYR2UXR3QSPGGkBu7uNg==} '@types/treeify@1.0.3': resolution: {integrity: sha512-hx0o7zWEUU4R2Amn+pjCBQQt23Khy/Dk56gQU5xi5jtPL1h83ACJCeFaB2M/+WO1AntvWrSoVnnCAfI1AQH4Cg==} @@ -6409,8 +6943,8 @@ packages: '@types/unist@3.0.3': resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==} - '@types/vscode@1.108.1': - resolution: {integrity: sha512-DerV0BbSzt87TbrqmZ7lRDIYaMiqvP8tmJTzW2p49ZBVtGUnGAu2RGQd1Wv4XMzEVUpaHbsemVM5nfuQJj7H6w==} + '@types/vscode@1.110.0': + resolution: {integrity: sha512-AGuxUEpU4F4mfuQjxPPaQVyuOMhs+VT/xRok1jiHVBubHK7lBRvCuOMZG0LKUwxncrPorJ5qq/uil3IdZBd5lA==} '@types/whatwg-mimetype@3.0.2': resolution: {integrity: sha512-c2AKvDT8ToxLIOUlN51gTiHXflsfIFisS4pO7pDPoKouJCESkhZnEy623gwP9laCy5lnLDAw1vAzu2vM2YLOrA==} @@ -6433,101 +6967,111 @@ packages: '@types/yoga-layout@1.9.2': resolution: {integrity: sha512-S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw==} - '@typescript-eslint/eslint-plugin@8.53.1': - resolution: {integrity: sha512-cFYYFZ+oQFi6hUnBTbLRXfTJiaQtYE3t4O692agbBl+2Zy+eqSKWtPjhPXJu1G7j4RLjKgeJPDdq3EqOwmX5Ag==} + '@typescript-eslint/eslint-plugin@8.57.0': + resolution: {integrity: sha512-qeu4rTHR3/IaFORbD16gmjq9+rEs9fGKdX0kF6BKSfi+gCuG3RCKLlSBYzn/bGsY9Tj7KE/DAQStbp8AHJGHEQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - '@typescript-eslint/parser': ^8.53.1 - eslint: ^8.57.0 || ^9.0.0 + '@typescript-eslint/parser': ^8.57.0 + eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/parser@8.53.1': - resolution: {integrity: sha512-nm3cvFN9SqZGXjmw5bZ6cGmvJSyJPn0wU9gHAZZHDnZl2wF9PhHv78Xf06E0MaNk4zLVHL8hb2/c32XvyJOLQg==} + '@typescript-eslint/parser@8.57.0': + resolution: {integrity: sha512-XZzOmihLIr8AD1b9hL9ccNMzEMWt/dE2u7NyTY9jJG6YNiNthaD5XtUHVF2uCXZ15ng+z2hT3MVuxnUYhq6k1g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - eslint: ^8.57.0 || ^9.0.0 + eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/project-service@8.53.1': - resolution: {integrity: sha512-WYC4FB5Ra0xidsmlPb+1SsnaSKPmS3gsjIARwbEkHkoWloQmuzcfypljaJcR78uyLA1h8sHdWWPHSLDI+MtNog==} + '@typescript-eslint/project-service@8.57.0': + resolution: {integrity: sha512-pR+dK0BlxCLxtWfaKQWtYr7MhKmzqZxuii+ZjuFlZlIGRZm22HnXFqa2eY+90MUz8/i80YJmzFGDUsi8dMOV5w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/rule-tester@8.53.1': - resolution: {integrity: sha512-+Xn/2Wd3AxB4LD1AYVLSDNYMCjbFrZAwt0rYgS/KmT7DjJr/TRMXVtS4eK4Gje8r4XUdWbiR/akse6aVYgqcCA==} + '@typescript-eslint/rule-tester@8.57.0': + resolution: {integrity: sha512-qs4OapXmAIj3so85/20lQG1WrBSSvDE/3b42Orl3lpZkaOlNXtbfKzL+9EPaY5wSEgdlhKEpympAMFHPG9i72Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - eslint: ^8.57.0 || ^9.0.0 + eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 - '@typescript-eslint/scope-manager@8.53.1': - resolution: {integrity: sha512-Lu23yw1uJMFY8cUeq7JlrizAgeQvWugNQzJp8C3x8Eo5Jw5Q2ykMdiiTB9vBVOOUBysMzmRRmUfwFrZuI2C4SQ==} + '@typescript-eslint/scope-manager@8.57.0': + resolution: {integrity: sha512-nvExQqAHF01lUM66MskSaZulpPL5pgy5hI5RfrxviLgzZVffB5yYzw27uK/ft8QnKXI2X0LBrHJFr1TaZtAibw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/tsconfig-utils@8.53.1': - resolution: {integrity: sha512-qfvLXS6F6b1y43pnf0pPbXJ+YoXIC7HKg0UGZ27uMIemKMKA6XH2DTxsEDdpdN29D+vHV07x/pnlPNVLhdhWiA==} + '@typescript-eslint/tsconfig-utils@8.57.0': + resolution: {integrity: sha512-LtXRihc5ytjJIQEH+xqjB0+YgsV4/tW35XKX3GTZHpWtcC8SPkT/d4tqdf1cKtesryHm2bgp6l555NYcT2NLvA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/type-utils@8.53.1': - resolution: {integrity: sha512-MOrdtNvyhy0rHyv0ENzub1d4wQYKb2NmIqG7qEqPWFW7Mpy2jzFC3pQ2yKDvirZB7jypm5uGjF2Qqs6OIqu47w==} + '@typescript-eslint/type-utils@8.57.0': + resolution: {integrity: sha512-yjgh7gmDcJ1+TcEg8x3uWQmn8ifvSupnPfjP21twPKrDP/pTHlEQgmKcitzF/rzPSmv7QjJ90vRpN4U+zoUjwQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - eslint: ^8.57.0 || ^9.0.0 + eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/types@8.53.1': - resolution: {integrity: sha512-jr/swrr2aRmUAUjW5/zQHbMaui//vQlsZcJKijZf3M26bnmLj8LyZUpj8/Rd6uzaek06OWsqdofN/Thenm5O8A==} + '@typescript-eslint/types@8.57.0': + resolution: {integrity: sha512-dTLI8PEXhjUC7B9Kre+u0XznO696BhXcTlOn0/6kf1fHaQW8+VjJAVHJ3eTI14ZapTxdkOmc80HblPQLaEeJdg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.53.1': - resolution: {integrity: sha512-RGlVipGhQAG4GxV1s34O91cxQ/vWiHJTDHbXRr0li2q/BGg3RR/7NM8QDWgkEgrwQYCvmJV9ichIwyoKCQ+DTg==} + '@typescript-eslint/typescript-estree@8.57.0': + resolution: {integrity: sha512-m7faHcyVg0BT3VdYTlX8GdJEM7COexXxS6KqGopxdtkQRvBanK377QDHr4W/vIPAR+ah9+B/RclSW5ldVniO1Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/utils@8.53.1': - resolution: {integrity: sha512-c4bMvGVWW4hv6JmDUEG7fSYlWOl3II2I4ylt0NM+seinYQlZMQIaKaXIIVJWt9Ofh6whrpM+EdDQXKXjNovvrg==} + '@typescript-eslint/utils@8.57.0': + resolution: {integrity: sha512-5iIHvpD3CZe06riAsbNxxreP+MuYgVUsV0n4bwLH//VJmgtt54sQeY2GszntJ4BjYCpMzrfVh2SBnUQTtys2lQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - eslint: ^8.57.0 || ^9.0.0 + eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/visitor-keys@8.53.1': - resolution: {integrity: sha512-oy+wV7xDKFPRyNggmXuZQSBzvoLnpmJs+GhzRhPjrxl2b/jIlyjVokzm47CZCDUdXKr2zd7ZLodPfOBpOPyPlg==} + '@typescript-eslint/visitor-keys@8.57.0': + resolution: {integrity: sha512-zm6xx8UT/Xy2oSr2ZXD0pZo7Jx2XsCoID2IUh9YSTFRu7z+WdwYTRk6LhUftm1crwqbuoF6I8zAFeCMw0YjwDg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typespec/ts-http-runtime@0.3.2': - resolution: {integrity: sha512-IlqQ/Gv22xUC1r/WQm4StLkYQmaaTsXAhUVsNE0+xiyf0yRFiH5++q78U3bw6bLKDCTmh0uqKB9eG9+Bt75Dkg==} + '@typespec/ts-http-runtime@0.3.4': + resolution: {integrity: sha512-CI0NhTrz4EBaa0U+HaaUZrJhPoso8sG7ZFya8uQoBA57fjzrjRSv87ekCjLZOFExN+gXE/z0xuN2QfH4H2HrLQ==} engines: {node: '>=20.0.0'} '@ungap/structured-clone@1.3.0': resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==} - '@vitejs/plugin-react@4.7.0': - resolution: {integrity: sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA==} - engines: {node: ^14.18.0 || >=16.0.0} + '@upsetjs/venn.js@2.0.0': + resolution: {integrity: sha512-WbBhLrooyePuQ1VZxrJjtLvTc4NVfpOyKx0sKqioq9bX1C1m7Jgykkn8gLrtwumBioXIqam8DLxp88Adbue6Hw==} + + '@vitejs/plugin-react@5.2.0': + resolution: {integrity: sha512-YmKkfhOAi3wsB1PhJq5Scj3GXMn3WvtQ/JC0xoopuHoXSdmtdStOpFrYaT1kie2YgFBcIe64ROzMYRjCrYOdYw==} + engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: - vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 + vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 - '@vitejs/plugin-react@5.1.2': - resolution: {integrity: sha512-EcA07pHJouywpzsoTUqNh5NwGayl2PPVEJKUSinGGSxFGYn+shYbqMGBg6FXDqgXum9Ou/ecb+411ssw8HImJQ==} + '@vitejs/plugin-react@6.0.1': + resolution: {integrity: sha512-l9X/E3cDb+xY3SWzlG1MOGt2usfEHGMNIaegaUGFsLkb3RCn/k8/TOXBcab+OndDI4TBtktT8/9BwwW8Vi9KUQ==} engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: - vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 + '@rolldown/plugin-babel': ^0.1.7 || ^0.2.0 + babel-plugin-react-compiler: ^1.0.0 + vite: ^8.0.0 + peerDependenciesMeta: + '@rolldown/plugin-babel': + optional: true + babel-plugin-react-compiler: + optional: true - '@vitest/coverage-v8@4.0.17': - resolution: {integrity: sha512-/6zU2FLGg0jsd+ePZcwHRy3+WpNTBBhDY56P4JTRqUN/Dp6CvOEa9HrikcQ4KfV2b2kAHUFB4dl1SuocWXSFEw==} + '@vitest/coverage-v8@4.1.0': + resolution: {integrity: sha512-nDWulKeik2bL2Va/Wl4x7DLuTKAXa906iRFooIRPR+huHkcvp9QDkPQ2RJdmjOFrqOqvNfoSQLF68deE3xC3CQ==} peerDependencies: - '@vitest/browser': 4.0.17 - vitest: 4.0.17 + '@vitest/browser': 4.1.0 + vitest: 4.1.0 peerDependenciesMeta: '@vitest/browser': optional: true - '@vitest/eslint-plugin@1.6.6': - resolution: {integrity: sha512-bwgQxQWRtnTVzsUHK824tBmHzjV0iTx3tZaiQIYDjX3SA7TsQS8CuDVqxXrRY3FaOUMgbGavesCxI9MOfFLm7Q==} + '@vitest/eslint-plugin@1.6.12': + resolution: {integrity: sha512-4kI47BJNFE+EQ5bmPbHzBF+ibNzx2Fj0Jo9xhWsTPxMddlHwIWl6YAxagefh461hrwx/W0QwBZpxGS404kBXyg==} engines: {node: '>=18'} peerDependencies: eslint: '>=8.57.0' @@ -6542,25 +7086,14 @@ packages: '@vitest/expect@3.2.4': resolution: {integrity: sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==} - '@vitest/expect@4.0.17': - resolution: {integrity: sha512-mEoqP3RqhKlbmUmntNDDCJeTDavDR+fVYkSOw8qRwJFaW/0/5zA9zFeTrHqNtcmwh6j26yMmwx2PqUDPzt5ZAQ==} - - '@vitest/mocker@3.2.4': - resolution: {integrity: sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==} - peerDependencies: - msw: ^2.4.9 - vite: ^5.0.0 || ^6.0.0 || ^7.0.0-0 - peerDependenciesMeta: - msw: - optional: true - vite: - optional: true + '@vitest/expect@4.1.0': + resolution: {integrity: sha512-EIxG7k4wlWweuCLG9Y5InKFwpMEOyrMb6ZJ1ihYu02LVj/bzUwn2VMU+13PinsjRW75XnITeFrQBMH5+dLvCDA==} - '@vitest/mocker@4.0.17': - resolution: {integrity: sha512-+ZtQhLA3lDh1tI2wxe3yMsGzbp7uuJSWBM1iTIKCbppWTSBN09PUC+L+fyNlQApQoR+Ps8twt2pbSSXg2fQVEQ==} + '@vitest/mocker@4.1.0': + resolution: {integrity: sha512-evxREh+Hork43+Y4IOhTo+h5lGmVRyjqI739Rz4RlUPqwrkFFDF6EMvOOYjTx4E8Tl6gyCLRL8Mu7Ry12a13Tw==} peerDependencies: msw: ^2.4.9 - vite: ^6.0.0 || ^7.0.0-0 + vite: ^6.0.0 || ^7.0.0 || ^8.0.0-0 peerDependenciesMeta: msw: optional: true @@ -6570,57 +7103,57 @@ packages: '@vitest/pretty-format@3.2.4': resolution: {integrity: sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==} - '@vitest/pretty-format@4.0.17': - resolution: {integrity: sha512-Ah3VAYmjcEdHg6+MwFE17qyLqBHZ+ni2ScKCiW2XrlSBV4H3Z7vYfPfz7CWQ33gyu76oc0Ai36+kgLU3rfF4nw==} + '@vitest/pretty-format@4.1.0': + resolution: {integrity: sha512-3RZLZlh88Ib0J7NQTRATfc/3ZPOnSUn2uDBUoGNn5T36+bALixmzphN26OUD3LRXWkJu4H0s5vvUeqBiw+kS0A==} - '@vitest/runner@4.0.17': - resolution: {integrity: sha512-JmuQyf8aMWoo/LmNFppdpkfRVHJcsgzkbCA+/Bk7VfNH7RE6Ut2qxegeyx2j3ojtJtKIbIGy3h+KxGfYfk28YQ==} + '@vitest/runner@4.1.0': + resolution: {integrity: sha512-Duvx2OzQ7d6OjchL+trw+aSrb9idh7pnNfxrklo14p3zmNL4qPCDeIJAK+eBKYjkIwG96Bc6vYuxhqDXQOWpoQ==} - '@vitest/snapshot@4.0.17': - resolution: {integrity: sha512-npPelD7oyL+YQM2gbIYvlavlMVWUfNNGZPcu0aEUQXt7FXTuqhmgiYupPnAanhKvyP6Srs2pIbWo30K0RbDtRQ==} + '@vitest/snapshot@4.1.0': + resolution: {integrity: sha512-0Vy9euT1kgsnj1CHttwi9i9o+4rRLEaPRSOJ5gyv579GJkNpgJK+B4HSv/rAWixx2wdAFci1X4CEPjiu2bXIMg==} '@vitest/spy@3.2.4': resolution: {integrity: sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==} - '@vitest/spy@4.0.17': - resolution: {integrity: sha512-I1bQo8QaP6tZlTomQNWKJE6ym4SHf3oLS7ceNjozxxgzavRAgZDc06T7kD8gb9bXKEgcLNt00Z+kZO6KaJ62Ew==} + '@vitest/spy@4.1.0': + resolution: {integrity: sha512-pz77k+PgNpyMDv2FV6qmk5ZVau6c3R8HC8v342T2xlFxQKTrSeYw9waIJG8KgV9fFwAtTu4ceRzMivPTH6wSxw==} - '@vitest/ui@4.0.17': - resolution: {integrity: sha512-hRDjg6dlDz7JlZAvjbiCdAJ3SDG+NH8tjZe21vjxfvT2ssYAn72SRXMge3dKKABm3bIJ3C+3wdunIdur8PHEAw==} + '@vitest/ui@4.1.0': + resolution: {integrity: sha512-sTSDtVM1GOevRGsCNhp1mBUHKo9Qlc55+HCreFT4fe99AHxl1QQNXSL3uj4Pkjh5yEuWZIx8E2tVC94nnBZECQ==} peerDependencies: - vitest: 4.0.17 + vitest: 4.1.0 '@vitest/utils@3.2.4': resolution: {integrity: sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==} - '@vitest/utils@4.0.17': - resolution: {integrity: sha512-RG6iy+IzQpa9SB8HAFHJ9Y+pTzI+h8553MrciN9eC6TFBErqrQaTas4vG+MVj8S4uKk8uTT2p0vgZPnTdxd96w==} + '@vitest/utils@4.1.0': + resolution: {integrity: sha512-XfPXT6a8TZY3dcGY8EdwsBulFCIw+BeeX0RZn2x/BtiY/75YGh8FeWGG8QISN/WhaqSrE2OrlDgtF8q5uhOTmw==} - '@volar/kit@2.4.27': - resolution: {integrity: sha512-ilZoQDMLzqmSsImJRWx4YiZ4FcvvPrPnFVmL6hSsIWB6Bn3qc7k88J9yP32dagrs5Y8EXIlvvD/mAFaiuEOACQ==} + '@volar/kit@2.4.28': + resolution: {integrity: sha512-cKX4vK9dtZvDRaAzeoUdaAJEew6IdxHNCRrdp5Kvcl6zZOqb6jTOfk3kXkIkG3T7oTFXguEMt5+9ptyqYR84Pg==} peerDependencies: typescript: '*' - '@volar/language-core@2.4.27': - resolution: {integrity: sha512-DjmjBWZ4tJKxfNC1F6HyYERNHPYS7L7OPFyCrestykNdUZMFYzI9WTyvwPcaNaHlrEUwESHYsfEw3isInncZxQ==} + '@volar/language-core@2.4.28': + resolution: {integrity: sha512-w4qhIJ8ZSitgLAkVay6AbcnC7gP3glYM3fYwKV3srj8m494E3xtrCv6E+bWviiK/8hs6e6t1ij1s2Endql7vzQ==} - '@volar/language-server@2.4.27': - resolution: {integrity: sha512-SymGNkErcHg8GjiG65iQN8sLkhqu1pwKhFySmxeBuYq5xFYagKBW36eiNITXQTdvT0tutI1GXcXdq/FdE/IyjA==} + '@volar/language-server@2.4.28': + resolution: {integrity: sha512-NqcLnE5gERKuS4PUFwlhMxf6vqYo7hXtbMFbViXcbVkbZ905AIVWhnSo0ZNBC2V127H1/2zP7RvVOVnyITFfBw==} - '@volar/language-service@2.4.27': - resolution: {integrity: sha512-SxKZ8yLhpWa7Y5e/RDxtNfm7j7xsXp/uf2urijXEffRNpPSmVdfzQrFFy5d7l8PNpZy+bHg+yakmqBPjQN+MOw==} + '@volar/language-service@2.4.28': + resolution: {integrity: sha512-Rh/wYCZJrI5vCwMk9xyw/Z+MsWxlJY1rmMZPsxUoJKfzIRjS/NF1NmnuEcrMbEVGja00aVpCsInJfixQTMdvLw==} - '@volar/source-map@2.4.27': - resolution: {integrity: sha512-ynlcBReMgOZj2i6po+qVswtDUeeBRCTgDurjMGShbm8WYZgJ0PA4RmtebBJ0BCYol1qPv3GQF6jK7C9qoVc7lg==} + '@volar/source-map@2.4.28': + resolution: {integrity: sha512-yX2BDBqJkRXfKw8my8VarTyjv48QwxdJtvRgUpNE5erCsgEUdI2DsLbpa+rOQVAJYshY99szEcRDmyHbF10ggQ==} - '@volar/typescript@2.4.27': - resolution: {integrity: sha512-eWaYCcl/uAPInSK2Lze6IqVWaBu/itVqR5InXcHXFyles4zO++Mglt3oxdgj75BDcv1Knr9Y93nowS8U3wqhxg==} + '@volar/typescript@2.4.28': + resolution: {integrity: sha512-Ja6yvWrbis2QtN4ClAKreeUZPVYMARDYZl9LMEv1iQ1QdepB6wn0jTRxA9MftYmYa4DQ4k/DaSZpFPUfxl8giw==} '@vscode/emmet-helper@2.11.0': resolution: {integrity: sha512-QLxjQR3imPZPQltfbWRnHU6JecWTF1QSWhx3GAKQpslx7y3Dp6sIIXhKjiUJ/BR9FX8PVthjr9PD6pNwOJfAzw==} - '@vscode/extension-telemetry@1.2.0': - resolution: {integrity: sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==} + '@vscode/extension-telemetry@1.5.1': + resolution: {integrity: sha512-rnRRQIRCwRdbcQ0QV5ajKJRz8noEIoQA2hX9VjAlVAVB85+ClbaPNhljobFXgW31ue69FRO6KPE4XJ/lLgKt/Q==} engines: {vscode: ^1.75.0} '@vscode/l10n@0.0.18': @@ -6630,8 +7163,8 @@ packages: resolution: {integrity: sha512-8ukpxv4wYe0iWMRQU18jhzJOHkeGKbnw7xWRX3Zw1WJA4cEKbHcmmLPdPrPtL6rhDcrlCZN+xKRpv09n4gRHYg==} engines: {node: '>=16'} - '@vscode/test-web@0.0.78': - resolution: {integrity: sha512-gj+Y6fT3vhUu2nAJhY+yxj27QU04it7oZdqDwO5uLWi8yzD8B7ZAWby52ODePJrRPMUndNIvleQZr7v3BowkSA==} + '@vscode/test-web@0.0.80': + resolution: {integrity: sha512-QgsRPp8IuPcdbUdVtqQkFN/sGd+6cr6g0ENEVFOHwJbQqZtJSiZD5w0e6tgmoeq9nBjNqZCq87OO1GkwFHkPyw==} engines: {node: '>=20'} hasBin: true @@ -6688,11 +7221,11 @@ packages: engines: {node: '>= 20'} hasBin: true - '@vue/compiler-core@3.5.27': - resolution: {integrity: sha512-gnSBQjZA+//qDZen+6a2EdHqJ68Z7uybrMf3SPjEGgG4dicklwDVmMC1AeIHxtLVPT7sn6sH1KOO+tS6gwOUeQ==} + '@vue/compiler-core@3.5.30': + resolution: {integrity: sha512-s3DfdZkcu/qExZ+td75015ljzHc6vE+30cFMGRPROYjqkroYI5NV2X1yAMX9UeyBNWB9MxCfPcsjpLS11nzkkw==} - '@vue/compiler-dom@3.5.27': - resolution: {integrity: sha512-oAFea8dZgCtVVVTEC7fv3T5CbZW9BxpFzGGxC79xakTr6ooeEqmRuvQydIiDAkglZEAd09LgVf1RoDnL54fu5w==} + '@vue/compiler-dom@3.5.30': + resolution: {integrity: sha512-eCFYESUEVYHhiMuK4SQTldO3RYxyMR/UQL4KdGD1Yrkfdx4m/HYuZ9jSfPdA+nWJY34VWndiYdW/wZXyiPEB9g==} '@vue/compiler-vue2@2.7.16': resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==} @@ -6705,15 +7238,16 @@ packages: typescript: optional: true - '@vue/reactivity@3.5.27': - resolution: {integrity: sha512-vvorxn2KXfJ0nBEnj4GYshSgsyMNFnIQah/wczXlsNXt+ijhugmW+PpJ2cNPe4V6jpnBcs0MhCODKllWG+nvoQ==} + '@vue/reactivity@3.5.30': + resolution: {integrity: sha512-179YNgKATuwj9gB+66snskRDOitDiuOZqkYia7mHKJaidOMo/WJxHKF8DuGc4V4XbYTJANlfEKb0yxTQotnx4Q==} - '@vue/shared@3.5.27': - resolution: {integrity: sha512-dXr/3CgqXsJkZ0n9F3I4elY8wM9jMJpP3pvRG52r6m0tu/MsAFIe6JpXVGeNMd/D9F4hQynWT8Rfuj0bdm9kFQ==} + '@vue/shared@3.5.30': + resolution: {integrity: sha512-YXgQ7JjaO18NeK2K9VTbDHaFy62WrObMa6XERNfNOkAhD1F1oDSf3ZJ7K6GqabZ0BvSDHajp8qfS5Sa2I9n8uQ==} '@xmldom/xmldom@0.8.11': resolution: {integrity: sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==} engines: {node: '>=10.0.0'} + deprecated: this version has critical issues, please update to the latest version '@yarnpkg/cli@4.12.0': resolution: {integrity: sha512-slQGf910BdALWuvKrJ68jtv3KIbZObvN0nbezL6AybpyITdzbAvKf98SzzYDRMzQYBwUXOtol2Nza3xWpeKCVg==} @@ -6721,8 +7255,8 @@ packages: peerDependencies: '@yarnpkg/core': ^4.5.0 - '@yarnpkg/core@4.5.0': - resolution: {integrity: sha512-jZnEYfP05k3KpBIWlNkPEuJ3E0QLnYTNALQOH+7x8LAQyzhnN9yuLZx8Ze80Y7mlU1Hnv5wUGtzzUFn1wyBAlQ==} + '@yarnpkg/core@4.6.0': + resolution: {integrity: sha512-yzJwS9dHKLY8y81BYEC0CEB+6ajWhjHkzBRzV39y7ANIdDiGC7sC32RSHWYGi/pxhbjPKeOhksj+gITUHUjS7A==} engines: {node: '>=18.12.0'} '@yarnpkg/extensions@2.0.6': @@ -6731,12 +7265,12 @@ packages: peerDependencies: '@yarnpkg/core': ^4.4.2 - '@yarnpkg/fslib@3.1.4': - resolution: {integrity: sha512-Yyguw5RM+xI1Bv0RFbs1ZF5HwU+9/He4YT7yeT722yAlLfkz9IzZHO6a5yStEshxiliPn9Fdj4H54a785xpK/g==} + '@yarnpkg/fslib@3.1.5': + resolution: {integrity: sha512-hXaPIWl5GZA+rXcx+yaKWUuePJruZuD+3A5A2X6paEBfFsyCD7oEp88lSMj1ym1ehBWUmhNH/YGOp+SrbmSBPg==} engines: {node: '>=18.12.0'} - '@yarnpkg/libui@3.0.2': - resolution: {integrity: sha512-IhFCZdemMFAa5WiXqSdfLLPqBDGX3QmbgUcsRuCqLnr0unPr5JjVmFSkFXlVig3yP9in7BjG1a0I0QO7ZyYAaQ==} + '@yarnpkg/libui@3.1.0': + resolution: {integrity: sha512-3R5juEPlnokseN+m19vh8pGmLOdWiU+q5oRLSJDGzpezKiGKiF7R2cZpOJi3A3tal/EFezmPwuHu00YWzfU4Bg==} engines: {node: '>=18.12.0'} peerDependencies: ink: ^3.0.8 @@ -6784,13 +7318,13 @@ packages: '@yarnpkg/cli': ^4.9.2 '@yarnpkg/core': ^4.4.2 - '@yarnpkg/plugin-essentials@4.4.4': - resolution: {integrity: sha512-fKI4eRZ1QHqlaaL/LYypRrw8+wRS77vholyGDAAd9eXnMKAHrZfY94Rss9XAxAAN3++S91c5lhu54JhwPF+KKQ==} + '@yarnpkg/plugin-essentials@4.4.5': + resolution: {integrity: sha512-vRQ7UoMK0okr+IVXkLu6JrpANYvmsZ8ljGQhNDI6XhOIU0pSPWD3I0JRh1449SMdQQtn8q8n0uwrzzUcvmQdFA==} engines: {node: '>=18.12.0'} peerDependencies: - '@yarnpkg/cli': ^4.10.0 - '@yarnpkg/core': ^4.4.4 - '@yarnpkg/plugin-git': ^3.1.3 + '@yarnpkg/cli': ^4.13.0 + '@yarnpkg/core': ^4.6.0 + '@yarnpkg/plugin-git': ^3.1.4 '@yarnpkg/plugin-exec@3.0.2': resolution: {integrity: sha512-lvBq0tc/k4CyvxFEhohiw/5rUi0kRWuFnAUnoXn6c0GJaldfK8gCyYhKfxwFZmcDOfM8h2JrDtzZdWqVk5D7lw==} @@ -6830,13 +7364,13 @@ packages: '@yarnpkg/cli': ^4.9.2 '@yarnpkg/core': ^4.4.2 - '@yarnpkg/plugin-interactive-tools@4.0.3': - resolution: {integrity: sha512-+uk7Jqnje/iDZH/zWZqoDLATGjciM5vH82M/RtZWATc3/AOmH1tIvM70lwgp4Be5K5FjaRjF+3LkuEdAR+IziQ==} + '@yarnpkg/plugin-interactive-tools@4.1.0': + resolution: {integrity: sha512-C/gIsjj+q7ekx5KyEBSQyydTGWggVenaw2gIpbkGKi56Gd9p3HfNdH5/Gp8aa93QZA+DEzy1t25ssxgX4+U6bg==} engines: {node: '>=18.12.0'} peerDependencies: - '@yarnpkg/cli': ^4.9.2 - '@yarnpkg/core': ^4.4.2 - '@yarnpkg/plugin-essentials': ^4.4.1 + '@yarnpkg/cli': ^4.13.0 + '@yarnpkg/core': ^4.6.0 + '@yarnpkg/plugin-essentials': ^4.4.5 '@yarnpkg/plugin-jsr@1.1.1': resolution: {integrity: sha512-aukUcLl6FiOg04GXagVfT7wtkl7/qQlRQmECHyk+r5mt+gBWQX8H8lE4Nxmy0t3J4DX/aW5BTFRifTlQkF8nNQ==} @@ -6857,20 +7391,20 @@ packages: '@yarnpkg/cli': ^4.10.0 '@yarnpkg/core': ^4.4.4 - '@yarnpkg/plugin-npm-cli@4.4.0': - resolution: {integrity: sha512-ZgQ8GPwWVXCdPCLzUra+KgXgi1+DJgEE+vL4r5wWTvSGVY84F6+jSWoDCiIZOYJkGW/dZ3D2dI5Ntm46LsoKTQ==} + '@yarnpkg/plugin-npm-cli@4.4.1': + resolution: {integrity: sha512-GyrHRYqq0y2MIxBzxuHv1Clus6GgssBfb93WZZClWRLJeFc7v8iaIFczFIQQSggc4/ltvNCXF98whSLRd7cKLA==} engines: {node: '>=18.12.0'} peerDependencies: - '@yarnpkg/cli': ^4.12.0 - '@yarnpkg/core': ^4.5.0 - '@yarnpkg/plugin-npm': ^3.4.0 + '@yarnpkg/cli': ^4.13.0 + '@yarnpkg/core': ^4.6.0 + '@yarnpkg/plugin-npm': ^3.4.1 '@yarnpkg/plugin-pack': ^4.0.4 - '@yarnpkg/plugin-npm@3.4.0': - resolution: {integrity: sha512-fvv/7ZRy7XGV9yuTsmB+bJ27ur7xJqKguVuwZAQKDGvesKM5IFB1kfkP8KwwUp2zambVajkmFAJXGmEikHVcWg==} + '@yarnpkg/plugin-npm@3.4.1': + resolution: {integrity: sha512-zs0d0e7u7Lltxe5IBiH1wgnufM1Vt3FZ176ECb3TGFXzwRURcaCQgFuLxkH6rpFdMxWmy/AzwNWQYphb1opDbQ==} engines: {node: '>=18.12.0'} peerDependencies: - '@yarnpkg/core': ^4.5.0 + '@yarnpkg/core': ^4.6.0 '@yarnpkg/plugin-pack': ^4.0.4 '@yarnpkg/plugin-pack@4.0.4': @@ -6924,13 +7458,13 @@ packages: '@yarnpkg/core': ^4.4.3 '@yarnpkg/plugin-git': ^3.1.3 - '@yarnpkg/plugin-workspace-tools@4.1.6': - resolution: {integrity: sha512-sf1dBtjyLEMgRpcpn2DhC4AQ5xjqQe6hyuUL+n4WdosRI2SAvshnmKo3+wbRFDDcklMya25ubDGjCt11W1LidQ==} + '@yarnpkg/plugin-workspace-tools@4.1.7': + resolution: {integrity: sha512-uVf0+73H6BPmSOVdB/9ueBiyKQy4Li1ztVLIrdGc9ogQW+KOOjQDiWZKNRosKwL/70hKxAt534K6EqQtjSpuqA==} engines: {node: '>=18.12.0'} peerDependencies: - '@yarnpkg/cli': ^4.9.3 - '@yarnpkg/core': ^4.4.3 - '@yarnpkg/plugin-git': ^3.1.3 + '@yarnpkg/cli': ^4.13.0 + '@yarnpkg/core': ^4.6.0 + '@yarnpkg/plugin-git': ^3.1.4 '@yarnpkg/pnp@4.1.3': resolution: {integrity: sha512-PsRujup+6DpgXexQe0Wh4h+syQhdruhounJjqbBMXV3meOzqr7k0Nj9+jwQ4t16EZJrhVxH7vRvjZ+VitH5aWQ==} @@ -7002,8 +7536,8 @@ packages: peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 - acorn@8.15.0: - resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==} + acorn@8.16.0: + resolution: {integrity: sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==} engines: {node: '>=0.4.0'} hasBin: true @@ -7039,20 +7573,14 @@ packages: ajv: optional: true - ajv@6.12.6: - resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} - - ajv@8.12.0: - resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==} + ajv@6.14.0: + resolution: {integrity: sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==} - ajv@8.13.0: - resolution: {integrity: sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==} + ajv@8.18.0: + resolution: {integrity: sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==} - ajv@8.17.1: - resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==} - - algoliasearch@4.25.3: - resolution: {integrity: sha512-kgeIixgDiB+FbH1cHDFUtTNkxdJadHryF8lSPIHHQkEeUrzZA1Hi3PLL+EgNubO0dch4ALNb5G4rw+FDCv3Vbw==} + algoliasearch@4.27.0: + resolution: {integrity: sha512-C88C5grLa5VOCp9eYZJt+q99ik7yNdm92l7Q9+4XK0Md8kL05Lg8l2v9ZVX0uMW3mH9pAFxMMXlLOvqNumA4lw==} alien-signals@0.4.14: resolution: {integrity: sha512-itUAVzhczTmP2U5yX67xVpsbbOiquusbWVyA9N+sy6+r6YVbFkahXvNCeEPWEOMhwDYwbVbGHFkVL03N9I5g+Q==} @@ -7071,8 +7599,8 @@ packages: resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==} engines: {node: '>=8'} - ansi-escapes@7.2.0: - resolution: {integrity: sha512-g6LhBsl+GBPRWGWsBtutpzBYuIIdBkLEvad5C/va/74Db018+5TZiyA26cZJAr3Rft5lprVqOIPxf5Vid6tqAw==} + ansi-escapes@7.3.0: + resolution: {integrity: sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==} engines: {node: '>=18'} ansi-regex@3.0.1: @@ -7113,9 +7641,6 @@ packages: append-field@1.0.0: resolution: {integrity: sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==} - archy@1.0.0: - resolution: {integrity: sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==} - arg@5.0.2: resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==} @@ -7144,10 +7669,6 @@ packages: resolution: {integrity: sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==} engines: {node: '>= 0.4'} - array-includes@3.1.9: - resolution: {integrity: sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==} - engines: {node: '>= 0.4'} - array-iterate@2.0.1: resolution: {integrity: sha512-I1jXZMjAgCMmxT4qxXfPXa6SthSoE8h6gkSI9BGGNv8mP8G/v0blc+qFnZu6K42vTOiuME596QaLO0TP3Lk0xg==} @@ -7158,31 +7679,9 @@ packages: resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} engines: {node: '>=8'} - array.prototype.findlastindex@1.2.6: - resolution: {integrity: sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==} - engines: {node: '>= 0.4'} - - array.prototype.flat@1.3.3: - resolution: {integrity: sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==} - engines: {node: '>= 0.4'} - - array.prototype.flatmap@1.3.3: - resolution: {integrity: sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==} - engines: {node: '>= 0.4'} - - arraybuffer.prototype.slice@1.0.4: - resolution: {integrity: sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==} - engines: {node: '>= 0.4'} - as-table@1.0.55: resolution: {integrity: sha512-xvsWESUJn0JN421Xb9MQw6AsMHRCUknCe0Wjlxvjud80mU4E6hQf1A6NzQKcYNmYw62MfzEtXc+badstZP3JpQ==} - asn1.js@4.10.1: - resolution: {integrity: sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==} - - assert@2.1.0: - resolution: {integrity: sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==} - assertion-error@2.0.1: resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==} engines: {node: '>=12'} @@ -7191,8 +7690,8 @@ packages: resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==} engines: {node: '>=4'} - ast-v8-to-istanbul@0.3.10: - resolution: {integrity: sha512-p4K7vMz2ZSk3wN8l5o3y2bJAoZXT3VuJI5OLTATY/01CYWumWvwkUw0SqDBnNq6IiTO3qDa1eSQDibAV8g7XOQ==} + ast-v8-to-istanbul@1.0.0: + resolution: {integrity: sha512-1fSfIwuDICFA4LKkCzRPO7F0hzFf0B7+Xqrl27ynQaa+Rh0e1Es0v6kWHPott3lU10AyAr7oKHa65OppjLn3Rg==} astral-regex@2.0.0: resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==} @@ -7202,8 +7701,8 @@ packages: resolution: {integrity: sha512-LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg==} hasBin: true - astro-expressive-code@0.41.6: - resolution: {integrity: sha512-l47tb1uhmVIebHUkw+HEPtU/av0G4O8Q34g2cbkPvC7/e9ZhANcjUUciKt9Hp6gSVDdIuXBBLwJQn2LkeGMOAw==} + astro-expressive-code@0.41.7: + resolution: {integrity: sha512-hUpogGc6DdAd+I7pPXsctyYPRBJDK7Q7d06s4cyP0Vz3OcbziP3FNzN0jZci1BpCvLn9675DvS7B9ctKKX64JQ==} peerDependencies: astro: ^4.0.0-beta || ^5.0.0-beta || ^3.3.0 || ^6.0.0-beta @@ -7212,15 +7711,11 @@ packages: peerDependencies: astro: '>=2 <6' - astro@5.16.11: - resolution: {integrity: sha512-Z7kvkTTT5n6Hn5lCm6T3WU6pkxx84Hn25dtQ6dR7ATrBGq9eVa8EuB/h1S8xvaoVyCMZnIESu99Z9RJfdLRLDA==} - engines: {node: 18.20.8 || ^20.3.0 || >=22.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0'} + astro@6.0.4: + resolution: {integrity: sha512-1piLJCPTL/x7AMO2cjVFSTFyRqKuC3W8sSEySCt1aJio+p/wGs5H3K+Xr/rE9ftKtknLUtjxCqCE7/0NsXfGpQ==} + engines: {node: ^20.19.1 || >=22.12.0, npm: '>=9.6.5', pnpm: '>=7.1.0'} hasBin: true - async-function@1.0.0: - resolution: {integrity: sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==} - engines: {node: '>= 0.4'} - asynckit@0.4.0: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} @@ -7239,8 +7734,8 @@ packages: azure-devops-node-api@12.5.0: resolution: {integrity: sha512-R5eFskGvOm3U/GzeAuxRkUsAl0hrAwGgWn6zAd2KrZmrEhWZVqLew4OOupbQlXUuojUzpGtq62SmdhJ06N88og==} - b4a@1.7.3: - resolution: {integrity: sha512-5Q2mfq2WfGuFp3uS//0s6baOJLMoVduPYVeNmDYxu5OUA1/cBfvr2RIS7vi62LdNj/urk1hfmj867I3qt6uZ7Q==} + b4a@1.8.0: + resolution: {integrity: sha512-qRuSmNSkGQaHwNbM7J78Wwy+ghLEYF1zNrSeMxj4Kgw6y33O3mXcQ6Ie9fRvfU/YnxWkOchPXbaLb73TkIsfdg==} peerDependencies: react-native-b4a: '*' peerDependenciesMeta: @@ -7252,16 +7747,16 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - babel-plugin-macros@3.1.0: - resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==} - engines: {node: '>=10', npm: '>=6'} - bail@2.0.2: resolution: {integrity: sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==} balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} + balanced-match@4.0.4: + resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==} + engines: {node: 18 || 20 || >=22} + bare-events@2.8.2: resolution: {integrity: sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==} peerDependencies: @@ -7270,8 +7765,8 @@ packages: bare-abort-controller: optional: true - bare-fs@4.5.2: - resolution: {integrity: sha512-veTnRzkb6aPHOvSKIOy60KzURfBdUflr5VReI+NSaPL6xf+XLdONQgZgpYvUuZLVQ8dCqxpBAudaOM1+KpAUxw==} + bare-fs@4.5.5: + resolution: {integrity: sha512-XvwYM6VZqKoqDll8BmSww5luA5eflDzY0uEFfBJtFKe4PAAtxBjU3YIxzIBzhyaEQBy1VXEQBto4cpN5RZJw+w==} engines: {bare: '>=1.16.0'} peerDependencies: bare-buffer: '*' @@ -7279,15 +7774,15 @@ packages: bare-buffer: optional: true - bare-os@3.6.2: - resolution: {integrity: sha512-T+V1+1srU2qYNBmJCXZkUY5vQ0B4FSlL3QDROnKQYOqeiQR8UbjNHlPa+TIbM4cuidiN9GaTaOZgSEgsvPbh5A==} + bare-os@3.8.0: + resolution: {integrity: sha512-Dc9/SlwfxkXIGYhvMQNUtKaXCaGkZYGcd1vuNUUADVqzu4/vQfvnMkYYOUnt2VwQ2AqKr/8qAVFRtwETljgeFg==} engines: {bare: '>=1.14.0'} bare-path@3.0.0: resolution: {integrity: sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==} - bare-stream@2.7.0: - resolution: {integrity: sha512-oyXQNicV1y8nc2aKffH+BUHFRXmx6VrPzlnaEvMhram0nPBrKcEdcyBg5r08D0i8VxngHFAiVyn1QKXpSG0B8A==} + bare-stream@2.8.1: + resolution: {integrity: sha512-bSeR8RfvbRwDpD7HWZvn8M3uYNDrk7m9DQjYOFkENZlXW8Ju/MPaqUPQq5LqJ3kyjEm07siTaAQ7wBKCU59oHg==} peerDependencies: bare-buffer: '*' bare-events: '*' @@ -7300,14 +7795,12 @@ packages: bare-url@2.3.2: resolution: {integrity: sha512-ZMq4gd9ngV5aTMa5p9+UfY0b3skwhHELaDkhEHetMdX0LRkW9kzaym4oo/Eh+Ghm0CCDuMTsRIGM/ytUc1ZYmw==} - base-64@1.0.0: - resolution: {integrity: sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==} - base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} - baseline-browser-mapping@2.9.16: - resolution: {integrity: sha512-KeUZdBuxngy825i8xvzaK1Ncnkx0tBmb3k8DkEuqjKRkmtvNTjey2ZsNeh8Dw4lfKvbCOu9oeNx2TKm2vHqcRw==} + baseline-browser-mapping@2.10.8: + resolution: {integrity: sha512-PCLz/LXGBsNTErbtB6i5u4eLpHeMfi93aUv5duMmj6caNu6IphS4q6UevDnL36sZQv9lrP11dbPKGMaXPwMKfQ==} + engines: {node: '>=6.0.0'} hasBin: true basic-auth@2.0.1: @@ -7320,9 +7813,6 @@ packages: bcp-47@2.1.0: resolution: {integrity: sha512-9IIS3UPrvIa1Ej+lVDdDwO7zLehjqsaByECw0bu2RRGP73jALm6FYbzI5gWbgHLvNdkvfXB5YrSbocZdOS0c0w==} - before-after-hook@3.0.2: - resolution: {integrity: sha512-Nik3Sc0ncrMK4UUdXQmAnRtzmNQTAAXmXIopizwZ1W1t8QmfJj+zL4OA2I7XPTPW5z5TDqv4hRo/JzouDJnX3A==} - before-after-hook@4.0.0: resolution: {integrity: sha512-q6tR3RPqIB1pMiTRMFcZwuG5T8vwp+vUvEG0vuI6B+Rikh5BfPp2fQ82c925FOs+b0lcFQ8CFrL+KbilfZFhOQ==} @@ -7341,18 +7831,12 @@ packages: bl@4.1.0: resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} - bn.js@4.12.2: - resolution: {integrity: sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==} - - bn.js@5.2.2: - resolution: {integrity: sha512-v2YAxEmKaBLahNwE1mjp4WON6huMNeuDvagFZW+ASCuA/ku0bXR9hSMw0XpiqMoA3+rmnyck/tPRSFQkoC9Cuw==} - body-parser@2.2.2: resolution: {integrity: sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==} engines: {node: '>=18'} - bole@5.0.25: - resolution: {integrity: sha512-4WsO2cOzQwN4MDCS/6krYWfz1brS3bJGKJhZQ+cr6EvcJIJiuxrWBZz/2WXbQjurFCRl+ddAzqH6SYaIzSmzsQ==} + bole@5.0.28: + resolution: {integrity: sha512-l+yybyZLV7zTD6EuGxoXsilpER1ctMCpdOqjSYNigJJma39ha85fzCtYccPx06oR1u7uCQLOcUAFFzvfXVBmuQ==} boolbase@1.0.0: resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} @@ -7363,52 +7847,23 @@ packages: boundary@2.0.0: resolution: {integrity: sha512-rJKn5ooC9u8q13IMCrW0RSp31pxBCHE3y9V/tp3TdWSLf8Em3p6Di4NBpfzbJge9YjjFEsD0RtFEjtvHL5VyEA==} - boxen@8.0.1: - resolution: {integrity: sha512-F3PH5k5juxom4xktynS7MoFY+NUWH5LC4CnH11YB8NPew+HLpmBLCybSAEyb2F+4pRXhuhWqFesoQd6DAyc2hw==} - engines: {node: '>=18'} - brace-expansion@1.1.12: resolution: {integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==} brace-expansion@2.0.2: resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==} + brace-expansion@5.0.4: + resolution: {integrity: sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==} + engines: {node: 18 || 20 || >=22} + braces@3.0.3: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} - brorand@1.1.0: - resolution: {integrity: sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==} - - browser-resolve@2.0.0: - resolution: {integrity: sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==} - - browser-stdout@1.3.1: - resolution: {integrity: sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==} - - browserify-aes@1.2.0: - resolution: {integrity: sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==} - - browserify-cipher@1.0.1: - resolution: {integrity: sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==} - - browserify-des@1.0.2: - resolution: {integrity: sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==} - - browserify-rsa@4.1.1: - resolution: {integrity: sha512-YBjSAiTqM04ZVei6sXighu679a3SqWORA3qZTEqZImnlkDIFtKc6pNutpjyZ8RJTjQtuYfeetkxM11GwoYXMIQ==} - engines: {node: '>= 0.10'} - - browserify-sign@4.2.5: - resolution: {integrity: sha512-C2AUdAJg6rlM2W5QMp2Q4KGQMVBwR1lIimTsUnutJ8bMpW5B52pGpR2gEnNBNwijumDo5FojQ0L9JrXA8m4YEw==} - engines: {node: '>= 0.10'} - browserify-zlib@0.1.4: resolution: {integrity: sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==} - browserify-zlib@0.2.0: - resolution: {integrity: sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==} - browserslist@4.28.1: resolution: {integrity: sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} @@ -7423,9 +7878,6 @@ packages: buffer-from@1.1.2: resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} - buffer-xor@1.0.3: - resolution: {integrity: sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==} - buffer@5.7.1: resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==} @@ -7436,9 +7888,6 @@ packages: resolution: {integrity: sha512-bkXY9WsVpY7CvMhKSR6pZilZu9Ln5WDrKVBUXf2S443etkmEO4V58heTecXcUIsNsi4Rx8JUO4NfX1IcQl4deg==} engines: {node: '>=18.20'} - builtin-status-codes@3.0.0: - resolution: {integrity: sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==} - builtins@5.1.0: resolution: {integrity: sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==} @@ -7454,9 +7903,9 @@ packages: resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} engines: {node: '>= 0.8'} - c8@10.1.3: - resolution: {integrity: sha512-LvcyrOAaOnrrlMpW22n690PUvxiq4Uf9WMhQwNJ9vgagkL/ph1+D4uvjvDA5XCbykrc0sx+ay6pVi9YZ1GnhyA==} - engines: {node: '>=18'} + c8@11.0.0: + resolution: {integrity: sha512-e/uRViGHSVIJv7zsaDKM7VRn2390TgHXqUSvYwPHBQaU6L7E9L0n9JbdkwdYPvshDT0KymBmmlwSpms3yBaMNg==} + engines: {node: 20 || >=22} hasBin: true peerDependencies: monocart-coverage-reports: ^2 @@ -7508,10 +7957,6 @@ packages: resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==} engines: {node: '>=10'} - camelcase@8.0.0: - resolution: {integrity: sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==} - engines: {node: '>=16'} - can-link@2.0.0: resolution: {integrity: sha512-2W2yAdkQQrrL0WM6BrGqkrLkWlVon8riZch0EBNklid2CZsOzZnqR5HE7W3Q3BrMWUop+9I2dpjyZqhSOYh6Yg==} engines: {node: '>=10'} @@ -7520,8 +7965,8 @@ packages: resolution: {integrity: sha512-eOgiEWqjppB+3DN/5E82EQ8dTINus8d9GXMCbEsUnp2hcUIcXmBvzWmD3tXMk3CuBK0v+ddK9qw0EAF+JVRMjQ==} engines: {node: '>=10.13'} - caniuse-lite@1.0.30001765: - resolution: {integrity: sha512-LWcNtSyZrakjECqmpP4qdg0MMGdN368D7X8XvvAqOcqMv0RxnlqVKZl2V6/mBR68oYMxOZPLw/gO7DuisMHUvQ==} + caniuse-lite@1.0.30001778: + resolution: {integrity: sha512-PN7uxFL+ExFJO61aVmP1aIEG4i9whQd4eoSCebav62UwDyp5OHh06zN4jqKSMePVgxHifCw1QJxdRkA1Pisekg==} catch-unknown@2.0.0: resolution: {integrity: sha512-4ELowf+Fp6Qwv77ZvRDto9oJMsOalEk8IYvS5KsmIhRZQWbfArlIhIOONJtmCzOeeqpip6JzYqAYaNR9sIyLVQ==} @@ -7586,8 +8031,8 @@ packages: cheerio-select@2.1.0: resolution: {integrity: sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==} - cheerio@1.1.2: - resolution: {integrity: sha512-IkxPpb5rS/d1IiLbHMgfPuS0FgiWTtFIm/Nj+2woXDLTZ7fOT2eqzgYbdMlLweqlHbsZjxEChoVK+7iph7jyQg==} + cheerio@1.2.0: + resolution: {integrity: sha512-WDrybc/gKFpTYQutKIK6UvfcuxijIZfMfXaYm8NMsPQxSYvf+13fXUJ4rztGGbJcBQ/GF55gvrZ0Bc0bj/mqvg==} engines: {node: '>=20.18.1'} chevrotain-allstar@0.3.1: @@ -7595,8 +8040,8 @@ packages: peerDependencies: chevrotain: ^11.0.0 - chevrotain@11.0.3: - resolution: {integrity: sha512-ci2iJH6LeIkvP9eJW6gpueU8cnZhv85ELY8w8WiFtNjMHA5ad6pQLaJo9mEly/9qUyCpvqX8/POVUTf18/HFdw==} + chevrotain@11.1.2: + resolution: {integrity: sha512-opLQzEVriiH1uUQ4Kctsd49bRoFDXGGSC4GUqj7pGyxM3RehRhvTlZJc1FL/Flew2p5uwxa1tUDWKzI4wNM8pg==} chokidar@4.0.3: resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==} @@ -7609,10 +8054,6 @@ packages: chownr@1.1.4: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} - chownr@2.0.0: - resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} - engines: {node: '>=10'} - chownr@3.0.0: resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==} engines: {node: '>=18'} @@ -7624,14 +8065,10 @@ packages: resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==} engines: {node: '>=8'} - ci-info@4.3.1: - resolution: {integrity: sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==} + ci-info@4.4.0: + resolution: {integrity: sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==} engines: {node: '>=8'} - cipher-base@1.0.7: - resolution: {integrity: sha512-Mz9QMT5fJe7bKI7MH31UilT5cEK5EHHRCccw/YRFsRY47AuNgaV6HY3rscp0/I4Q+tTW/5zoqpSeRRI54TkDWA==} - engines: {node: '>= 0.10'} - clean-regexp@1.0.0: resolution: {integrity: sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==} engines: {node: '>=4'} @@ -7648,10 +8085,6 @@ packages: resolution: {integrity: sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==} engines: {node: '>=6'} - cli-boxes@3.0.0: - resolution: {integrity: sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==} - engines: {node: '>=10'} - cli-columns@4.0.0: resolution: {integrity: sha512-XW2Vg+w+L9on9wtwKpyzluIPCWXjaBahI7mTcYjx+BVIYD9c3yqcv/yKC7CmdCZat4rq2yiE1UMSJC5ivKfMtQ==} engines: {node: '>= 10'} @@ -7767,12 +8200,8 @@ packages: resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==} engines: {node: '>=18'} - commander@13.1.0: - resolution: {integrity: sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==} - engines: {node: '>=18'} - - commander@14.0.2: - resolution: {integrity: sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==} + commander@14.0.3: + resolution: {integrity: sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==} engines: {node: '>=20'} commander@7.2.0: @@ -7787,12 +8216,13 @@ packages: resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==} engines: {node: ^12.20.0 || >=14} - comment-json@4.5.1: - resolution: {integrity: sha512-taEtr3ozUmOB7it68Jll7s0Pwm+aoiHyXKrEC8SEodL4rNpdfDLqa7PfBlrgFoCNNdR8ImL+muti5IGvktJAAg==} + comment-json@4.6.2: + resolution: {integrity: sha512-R2rze/hDX30uul4NZoIZ76ImSJLFxn/1/ZxtKC1L77y2X1k+yYu1joKbAtMA2Fg3hZrTOiw0I5mwVMo0cf250w==} engines: {node: '>= 6'} - common-ancestor-path@1.0.1: - resolution: {integrity: sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==} + common-ancestor-path@2.0.0: + resolution: {integrity: sha512-dnN3ibLeoRf2HNC+OlCiNc5d2zxbLJXOtiZUudNFSXZrNSydxcCsSpRzXwfu7BBWCIfHPw+xTayeBvJCP/D8Ng==} + engines: {node: '>= 18'} commondir@1.0.1: resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==} @@ -7815,22 +8245,12 @@ packages: confbox@0.1.8: resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==} - confbox@0.2.2: - resolution: {integrity: sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==} + confbox@0.2.4: + resolution: {integrity: sha512-ysOGlgTFbN2/Y6Cg3Iye8YKulHw+R2fNXHrgSmXISQdMnomY6eNDprVdW9R5xBguEqI954+S6709UyiO7B+6OQ==} config-chain@1.1.13: resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==} - console-browserify@1.2.0: - resolution: {integrity: sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==} - - constants-browserify@1.0.0: - resolution: {integrity: sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==} - - content-disposition@0.5.4: - resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==} - engines: {node: '>= 0.6'} - content-disposition@1.0.1: resolution: {integrity: sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==} engines: {node: '>=18'} @@ -7839,9 +8259,6 @@ packages: resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==} engines: {node: '>= 0.6'} - convert-source-map@1.9.0: - resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} - convert-source-map@2.0.0: resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} @@ -7868,8 +8285,8 @@ packages: resolution: {integrity: sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==} engines: {node: '>= 0.8'} - core-js-compat@3.47.0: - resolution: {integrity: sha512-IGfuznZ/n7Kp9+nypamBhvwdwLsW6KC8IOaURw2doAK5e98AG3acVLdh0woOnEqCfUtS+Vu882JE4k/DAm3ItQ==} + core-js-compat@3.48.0: + resolution: {integrity: sha512-OM4cAF3D6VtH/WkLtWvyNC56EZVXsZdU3iqaMG2B4WvYrlqU831pc4UtG5yp0sE9z8Y02wVN7PjW5Zf9Gt0f1Q==} core-util-is@1.0.3: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} @@ -7880,33 +8297,8 @@ packages: cose-base@2.2.0: resolution: {integrity: sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g==} - cosmiconfig@7.1.0: - resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==} - engines: {node: '>=10'} - - cosmiconfig@9.0.0: - resolution: {integrity: sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==} - engines: {node: '>=14'} - peerDependencies: - typescript: '>=4.9.5' - peerDependenciesMeta: - typescript: - optional: true - - create-ecdh@4.0.4: - resolution: {integrity: sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==} - - create-hash@1.2.0: - resolution: {integrity: sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==} - - create-hmac@1.1.7: - resolution: {integrity: sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==} - - create-require@1.1.1: - resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==} - - create-storybook@10.1.11: - resolution: {integrity: sha512-g7+NN6PCHwzTFOL35v5gJnx0ELEa995li6eX7XDxjo//XHZM2fS2NmmOYVXaJHfkPmnYC9e7yah/TG+UsXeMRg==} + create-storybook@10.3.3: + resolution: {integrity: sha512-vwOQQaayn0Tyl9wvA0s958dhehK11kRvmDavkRM7zQslnlv1X0D/OBV1J3tjr7KGSJ/0WRZGeekqXWmRFIFCYQ==} hasBin: true cross-env@10.1.0: @@ -7921,53 +8313,49 @@ packages: crossws@0.3.5: resolution: {integrity: sha512-ojKiDvcmByhwa8YYqbQI/hg7MEU0NC03+pSdEq4ZUnZR9xXpwk7E43SMNGkn+JxJGPFtNvQ48+vV2p+P1ml5PA==} - crypto-browserify@3.12.1: - resolution: {integrity: sha512-r4ESw/IlusD17lgQi1O20Fa3qNnsckR126TdUuBgAu7GBYSIPvdNyONd3Zrxh0xCwA4+6w/TDArBPsMvhur+KQ==} - engines: {node: '>= 0.10'} - crypto-random-string@2.0.0: resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==} engines: {node: '>=8'} - cspell-config-lib@9.6.0: - resolution: {integrity: sha512-5ztvheawkmFXNHGN82iOOntU3T5mmlQBP/plgoKdBZ6+lSYrOJLkOyqxYyi7MrUBDtWrXPzFllkBrPNRDlbX/A==} + cspell-config-lib@9.7.0: + resolution: {integrity: sha512-pguh8A3+bSJ1OOrKCiQan8bvaaY125de76OEFz7q1Pq309lIcDrkoL/W4aYbso/NjrXaIw6OjkgPMGRBI/IgGg==} engines: {node: '>=20'} - cspell-dictionary@9.6.0: - resolution: {integrity: sha512-wW0m1kLrbK6bRY/GrLUGKUUJ1Z4ZUgIb8LD4zNaECcvGviv9V7VcR3mEwUip3ZjoHa3ClzEoWgQ9gXrtac80Wg==} + cspell-dictionary@9.7.0: + resolution: {integrity: sha512-k/Wz0so32+0QEqQe21V9m4BNXM5ZN6lz3Ix/jLCbMxFIPl6wT711ftjOWIEMFhvUOP0TWXsbzcuE9mKtS5mTig==} engines: {node: '>=20'} - cspell-gitignore@9.6.0: - resolution: {integrity: sha512-8GfmJuRBBvibyPHnNE2wYJAiQ/ceDYLD1X1sUQaCyj6hPMR7ChJiVhFPtS11hMqkjZ46OBMYTMGWqO792L9fEQ==} + cspell-gitignore@9.7.0: + resolution: {integrity: sha512-MtoYuH4ah4K6RrmaF834npMcRsTKw0658mC6yvmBacUQOmwB/olqyuxF3fxtbb55HDb7cXDQ35t1XuwwGEQeZw==} engines: {node: '>=20'} hasBin: true - cspell-glob@9.6.0: - resolution: {integrity: sha512-KmEbKN0qdEamsEYbkFu7zjLYfw3hMmn9kmeh94IHr2kq6vWq5vNP5l1BuqmrUeFZlbNd07vj08IKAZHYsoGheQ==} + cspell-glob@9.7.0: + resolution: {integrity: sha512-LUeAoEsoCJ+7E3TnUmWBscpVQOmdwBejMlFn0JkXy6LQzxrybxXBKf65RSdIv1o5QtrhQIMa358xXYQG0sv/tA==} engines: {node: '>=20'} - cspell-grammar@9.6.0: - resolution: {integrity: sha512-jZVIM5/3eB9rWURDq+VXdYip+DmPuFzO+bqaRtzqT8w6YoOIGYbiIxdwvyyA9xdH7SmW8uqHJP5x4pzZju1lNQ==} + cspell-grammar@9.7.0: + resolution: {integrity: sha512-oEYME+7MJztfVY1C06aGcJgEYyqBS/v/ETkQGPzf/c6ObSAPRcUbVtsXZgnR72Gru9aBckc70xJcD6bELdoWCA==} engines: {node: '>=20'} hasBin: true - cspell-io@9.6.0: - resolution: {integrity: sha512-wZuZzKOYIb698kVEINYjGaNFQu+AFZ945TORM3hapmPjez+vsHwl8m/pPpCHeGMpQtHMEDkX84AbQ7R55MRIwg==} + cspell-io@9.7.0: + resolution: {integrity: sha512-V7x0JHAUCcJPRCH8c0MQkkaKmZD2yotxVyrNEx2SZTpvnKrYscLEnUUTWnGJIIf9znzISqw116PLnYu2c+zd6Q==} engines: {node: '>=20'} - cspell-lib@9.6.0: - resolution: {integrity: sha512-m9rIv8hkQ3Dio4s80HQbM9cdxENcd6pS8j2AHWL50OSjJf3Xhw6/wMrIAGbwLHP15K6QZVU2eJ/abCzIJwjA4w==} + cspell-lib@9.7.0: + resolution: {integrity: sha512-aTx/aLRpnuY1RJnYAu+A8PXfm1oIUdvAQ4W9E66bTgp1LWI+2G2++UtaPxRIgI0olxE9vcXqUnKpjOpO+5W9bQ==} engines: {node: '>=20'} - cspell-trie-lib@9.6.0: - resolution: {integrity: sha512-L7GSff5F9cF60QT78WsebVlb3sppi6jbvTHwsw7WF1jUN/ioAo7OzBYtYB7xkYeejcdVEpqfvf/ZOXPDp8x2Wg==} + cspell-trie-lib@9.7.0: + resolution: {integrity: sha512-a2YqmcraL3g6I/4gY7SYWEZfP73oLluUtxO7wxompk/kOG2K1FUXyQfZXaaR7HxVv10axT1+NrjhOmXpfbI6LA==} engines: {node: '>=20'} peerDependencies: - '@cspell/cspell-types': 9.6.0 + '@cspell/cspell-types': 9.7.0 - cspell@9.6.0: - resolution: {integrity: sha512-Mpf0oT2KAHTIb3YPAXWhW64/4CZKW5Lka4j1YxCLK3jM3nenmIsY/ocrJvqCMF4+1eejRF0N55sT3XmrijI5YQ==} - engines: {node: '>=20'} + cspell@9.7.0: + resolution: {integrity: sha512-ftxOnkd+scAI7RZ1/ksgBZRr0ouC7QRKtPQhD/PbLTKwAM62sSvRhE1bFsuW3VKBn/GilWzTjkJ40WmnDqH5iQ==} + engines: {node: '>=20.18'} hasBin: true css-select@5.2.2: @@ -7980,8 +8368,8 @@ packages: resolution: {integrity: sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==} engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'} - css-tree@3.1.0: - resolution: {integrity: sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==} + css-tree@3.2.1: + resolution: {integrity: sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==} engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0} css-what@6.2.2: @@ -8160,8 +8548,8 @@ packages: resolution: {integrity: sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==} engines: {node: '>=12'} - dagre-d3-es@7.0.13: - resolution: {integrity: sha512-efEhnxpSuwpYOKRm/L5KbqoZmNNukHa/Flty4Wp62JRvgH2ojwVgPgdYyr4twpieZnyRDdIH7PY2mopX26+j2Q==} + dagre-d3-es@7.0.14: + resolution: {integrity: sha512-P4rFMVq9ESWqmOgK+dlXvOtLwYg0i7u0HBGJER0LZDJT2VHIPAMZ/riPxqJceWMStH5+E61QxFra9kIS3AqdMg==} data-uri-to-buffer@2.0.2: resolution: {integrity: sha512-ND9qDTLc6diwj+Xe5cdAgVTbLVdXbtxTJRXRhli8Mowuaan+0EJOtdqJ0QCHNSSPyoXGx9HX2/VMnKeC34AChA==} @@ -8174,23 +8562,11 @@ packages: resolution: {integrity: sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==} engines: {node: '>=18'} - data-view-buffer@1.0.2: - resolution: {integrity: sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==} - engines: {node: '>= 0.4'} - - data-view-byte-length@1.0.2: - resolution: {integrity: sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==} - engines: {node: '>= 0.4'} - - data-view-byte-offset@1.0.1: - resolution: {integrity: sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==} - engines: {node: '>= 0.4'} - date-fns@4.1.0: resolution: {integrity: sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==} - dayjs@1.11.19: - resolution: {integrity: sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==} + dayjs@1.11.20: + resolution: {integrity: sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==} de-indent@1.0.2: resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==} @@ -8224,10 +8600,6 @@ packages: supports-color: optional: true - decamelize@4.0.0: - resolution: {integrity: sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==} - engines: {node: '>=10'} - decimal.js@10.6.0: resolution: {integrity: sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==} @@ -8263,8 +8635,8 @@ packages: resolution: {integrity: sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==} engines: {node: '>=18'} - default-browser@5.4.0: - resolution: {integrity: sha512-XDuvSq38Hr1MdN47EDvYtx3U0MTqpCEn+F6ft8z2vYDzMrvQhVp0ui9oQdqW3MvK3vqUETglt1tVGgjLuJ5izg==} + default-browser@5.5.0: + resolution: {integrity: sha512-H9LMLr5zwIbSxrmvikGuI/5KGhZ8E2zH3stkMgM5LpOWDutGM2JZaj460Udnf1a+946zc7YBgrqEWwbk7zHvGw==} engines: {node: '>=18'} defaults@1.0.4: @@ -8323,9 +8695,6 @@ packages: resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==} engines: {node: '>=6'} - des.js@1.1.0: - resolution: {integrity: sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==} - destr@2.0.5: resolution: {integrity: sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA==} @@ -8337,12 +8706,8 @@ packages: resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==} engines: {node: '>=8'} - deterministic-object-hash@2.0.2: - resolution: {integrity: sha512-KxektNH63SrbfUyDiwXqRb1rLwKt33AmMv+5Nhsw1kqZ13SJBRTgZHtGbE+hH3a1mVW1cz+4pqSWVPAtLVXTzQ==} - engines: {node: '>=18'} - - devalue@5.6.2: - resolution: {integrity: sha512-nPRkjWzzDQlsejL1WVifk5rvcFi/y1onBRxjaFMjZeR9mFpqu2gmAZ9xUB9/IEanEP/vBtGeGganC/GO1fmufg==} + devalue@5.6.4: + resolution: {integrity: sha512-Gp6rDldRsFh/7XuouDbxMH3Mx8GMCcgzIb1pDTvNyn8pZGQ22u+Wa+lGV9dQCltFQ7uVw0MhRyb8XDskNFOReA==} devlop@1.1.0: resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==} @@ -8351,17 +8716,10 @@ packages: resolution: {integrity: sha512-vtcDfH3TOjP8UekytvnHH1o1P4FcUdt4eQ1Y+Abap1tk/OB2MWQvcwS2ClCd1zuIhc3JKOx6p3kod8Vfys3E+A==} engines: {node: '>=0.3.1'} - diff@7.0.0: - resolution: {integrity: sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==} - engines: {node: '>=0.3.1'} - diff@8.0.3: resolution: {integrity: sha512-qejHi7bcSD4hQAZE0tNAawRK1ZtafHDmMTMkrrIGgSLl7hTnQHmKCeB45xAcbfTqK2zowkM3j3bHt/4b/ARbYQ==} engines: {node: '>=0.3.1'} - diffie-hellman@5.0.3: - resolution: {integrity: sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==} - dir-glob@3.0.1: resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} engines: {node: '>=8'} @@ -8377,10 +8735,6 @@ packages: dlv@1.1.3: resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==} - doctrine@2.1.0: - resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==} - engines: {node: '>=0.10.0'} - doctrine@3.0.0: resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==} engines: {node: '>=6.0.0'} @@ -8394,10 +8748,6 @@ packages: dom-serializer@2.0.0: resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==} - domain-browser@4.22.0: - resolution: {integrity: sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw==} - engines: {node: '>=10'} - domelementtype@2.3.0: resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==} @@ -8405,11 +8755,8 @@ packages: resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==} engines: {node: '>= 4'} - dompurify@3.2.7: - resolution: {integrity: sha512-WhL/YuveyGXJaerVlMYGWhvQswa7myDG17P7Vu65EWC05o8vfeNbvNf4d/BOvH99+ZW+LlQsc1GDKMa1vNK6dw==} - - dompurify@3.3.1: - resolution: {integrity: sha512-qkdCKzLNtrgPFP1Vo+98FRzJnBRGe4ffyCea9IwHB1fyxPOeNTHpLKYGd4Uk9xvNoH0ZoOjwZxNptyMwqrId1Q==} + dompurify@3.3.3: + resolution: {integrity: sha512-Oj6pzI2+RqBfFG+qOaOLbFXLQ90ARpcGG6UePL82bJLtdsa6CYJD7nmiU8MW9nQNOtCHV3lZ/Bzq1X0QYbBZCA==} domutils@3.2.2: resolution: {integrity: sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==} @@ -8438,8 +8785,8 @@ packages: ecmarkdown@8.1.0: resolution: {integrity: sha512-dx6cM6RFjzAXkWr2KQRikED4gy70NFQ0vTI4XUQM/LWcjUYRJUbGdd7nd++trXi5az1JSe49TeeCIVMKDXOtcQ==} - ecmarkup@22.0.0: - resolution: {integrity: sha512-DMZYlRH0QEPieu+iqFfCThMdnPmMLySHepZcYEq1I7U4gMJIf3jy5Pwy8cusxmvJ732PeMeqr9b4mhY3dw0dVg==} + ecmarkup@23.0.2: + resolution: {integrity: sha512-hnCtidy6d8o3TJcT64PTSRFwH+lgQXtr8F8eyImDaygzbh38OZWILqIphYTpDMd0wwoBai8nG5oB+QFms6eLGA==} engines: {node: '>= 18'} hasBin: true @@ -8450,14 +8797,8 @@ packages: ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} - effect@3.19.14: - resolution: {integrity: sha512-3vwdq0zlvQOxXzXNKRIPKTqZNMyGCdaFUBfMPqpsyzZDre67kgC1EEHDV4EoQTovJ4w5fmJW756f86kkuz7WFA==} - - electron-to-chromium@1.5.267: - resolution: {integrity: sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==} - - elliptic@6.6.1: - resolution: {integrity: sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==} + electron-to-chromium@1.5.313: + resolution: {integrity: sha512-QBMrTWEf00GXZmJyx2lbYD45jpI3TUFnNIzJ5BBc8piGUDwMPa1GV6HJWTZVvY/eiN3fSopl7NRbgGp9sZ9LTA==} embla-carousel-autoplay@8.6.0: resolution: {integrity: sha512-OBu5G3nwaSXkZCo1A6LTaFMZ8EpkYbwIaH+bPqdBnDGQ2fh4+NbzjXjs2SktoPNKCtflfVMc75njaDHOYXcrsA==} @@ -8517,17 +8858,17 @@ packages: resolution: {integrity: sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==} engines: {node: '>=0.12'} - entities@7.0.0: - resolution: {integrity: sha512-FDWG5cmEYf2Z00IkYRhbFrwIwvdFKH07uV8dvNy0omp/Qb1xcyCWp2UDtcwJF4QZZvk0sLudP6/hAu42TaqVhQ==} + entities@7.0.1: + resolution: {integrity: sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==} engines: {node: '>=0.12'} env-paths@2.2.1: resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} engines: {node: '>=6'} - env-paths@3.0.0: - resolution: {integrity: sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + env-paths@4.0.0: + resolution: {integrity: sha512-pxP8eL2SwwaTRi/KHYwLYXinDs7gL3jxFcBYmEdYfZmZXbaVDvdppd0XBU8qVz03rDfKZMXg1omHCbsJjZrMsw==} + engines: {node: '>=20'} environment@1.1.0: resolution: {integrity: sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==} @@ -8539,10 +8880,6 @@ packages: error-ex@1.3.4: resolution: {integrity: sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==} - es-abstract@1.24.1: - resolution: {integrity: sha512-zHXBLhP+QehSSbsS9Pt23Gg964240DPd6QCf8WpkqEXxQ7fhdZzYsocOr5u7apWonsS5EjZDmTF+/slGMyasvw==} - engines: {node: '>= 0.4'} - es-define-property@1.0.1: resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==} engines: {node: '>= 0.4'} @@ -8554,8 +8891,8 @@ packages: es-get-iterator@1.1.3: resolution: {integrity: sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==} - es-module-lexer@1.7.0: - resolution: {integrity: sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==} + es-module-lexer@2.0.0: + resolution: {integrity: sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw==} es-module-shims@2.8.0: resolution: {integrity: sha512-7eBj0nIBTMjg8WspPfHOXVxwvDPeYjTMH7PipzrbecfLS4SFwRvWeakZNsAx0y9yF3TydxrG32tj3y+GKzlpYg==} @@ -8568,16 +8905,8 @@ packages: resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==} engines: {node: '>= 0.4'} - es-shim-unscopables@1.1.0: - resolution: {integrity: sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==} - engines: {node: '>= 0.4'} - - es-to-primitive@1.3.0: - resolution: {integrity: sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==} - engines: {node: '>= 0.4'} - - es-toolkit@1.44.0: - resolution: {integrity: sha512-6penXeZalaV88MM3cGkFZZfOoLGWshWWfdy0tWw/RlVVyhvMaWSBTOvXNeiW3e5FwdS5ePW0LGEu17zT139ktg==} + es-toolkit@1.45.1: + resolution: {integrity: sha512-/jhoOj/Fx+A+IIyDNOvO3TItGmlMKhtX8ISAHKE90c4b/k1tqaqEZ+uUqfpU8DMnW5cgNJv606zS55jGvza0Xw==} esast-util-from-estree@2.0.0: resolution: {integrity: sha512-4CyanoAudUSBAn5K13H4JhsMH6L9ZP7XbLVe/dKybkxMO7eDyLsT8UHl9TRNrU2Gr9nz+FovfSIjuXWJ81uVwQ==} @@ -8591,13 +8920,8 @@ packages: peerDependencies: esbuild: '>=0.14.0 <=0.27.x' - esbuild@0.25.12: - resolution: {integrity: sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==} - engines: {node: '>=18'} - hasBin: true - - esbuild@0.27.2: - resolution: {integrity: sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==} + esbuild@0.27.4: + resolution: {integrity: sha512-Rq4vbHnYkK5fws5NF7MYTU68FPRE1ajX7heQ/8QXXWqNgqqJ/GkmmyxIzUnf2Sr/bakf8l54716CcMGHYhMrrQ==} engines: {node: '>=18'} hasBin: true @@ -8628,67 +8952,33 @@ packages: resolution: {integrity: sha512-0X5vEQeNniQRbGm+ec9Ow6LWj4RqZEcjPSfZ+t8qLPWqwyaBa67GrNetTxd0aYKoHrpbZeoRRlvA2gz9HujiEg==} engines: {node: ^10.12.0 || >=12.0.0} - eslint-import-resolver-node@0.3.9: - resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==} - - eslint-module-utils@2.12.1: - resolution: {integrity: sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==} - engines: {node: '>=4'} + eslint-plugin-react-hooks@7.0.1: + resolution: {integrity: sha512-O0d0m04evaNzEPoSW+59Mezf8Qt0InfgGIBJnpC0h3NH/WjUAR7BIKUfysC6todmtiZ/A0oUVS8Gce0WhBrHsA==} + engines: {node: '>=18'} peerDependencies: - '@typescript-eslint/parser': '*' - eslint: '*' - eslint-import-resolver-node: '*' - eslint-import-resolver-typescript: '*' - eslint-import-resolver-webpack: '*' - peerDependenciesMeta: - '@typescript-eslint/parser': - optional: true - eslint: - optional: true - eslint-import-resolver-node: - optional: true - eslint-import-resolver-typescript: - optional: true - eslint-import-resolver-webpack: - optional: true + eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0 - eslint-plugin-import@2.32.0: - resolution: {integrity: sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==} - engines: {node: '>=4'} - peerDependencies: - '@typescript-eslint/parser': '*' - eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9 - peerDependenciesMeta: - '@typescript-eslint/parser': - optional: true - - eslint-plugin-react-hooks@7.0.1: - resolution: {integrity: sha512-O0d0m04evaNzEPoSW+59Mezf8Qt0InfgGIBJnpC0h3NH/WjUAR7BIKUfysC6todmtiZ/A0oUVS8Gce0WhBrHsA==} - engines: {node: '>=18'} - peerDependencies: - eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0 - - eslint-plugin-unicorn@62.0.0: - resolution: {integrity: sha512-HIlIkGLkvf29YEiS/ImuDZQbP12gWyx5i3C6XrRxMvVdqMroCI9qoVYCoIl17ChN+U89pn9sVwLxhIWj5nEc7g==} - engines: {node: ^20.10.0 || >=21.0.0} + eslint-plugin-unicorn@63.0.0: + resolution: {integrity: sha512-Iqecl9118uQEXYh7adylgEmGfkn5es3/mlQTLLkd4pXkIk9CTGrAbeUux+YljSa2ohXCBmQQ0+Ej1kZaFgcfkA==} + engines: {node: ^20.10.0 || >=21.0.0} peerDependencies: eslint: '>=9.38.0' - eslint-scope@8.4.0: - resolution: {integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + eslint-scope@9.1.2: + resolution: {integrity: sha512-xS90H51cKw0jltxmvmHy2Iai1LIqrfbw57b79w/J7MfvDfkIkFZ+kj6zC3BjtUwh150HsSSdxXZcsuv72miDFQ==} + engines: {node: ^20.19.0 || ^22.13.0 || >=24} eslint-visitor-keys@3.4.3: resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - eslint-visitor-keys@4.2.1: - resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + eslint-visitor-keys@5.0.1: + resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==} + engines: {node: ^20.19.0 || ^22.13.0 || >=24} - eslint@9.39.2: - resolution: {integrity: sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + eslint@10.0.3: + resolution: {integrity: sha512-COV33RzXZkqhG9P2rZCFl9ZmJ7WL+gQSCRzE7RhkbclbQPtLAWReL7ysA0Sh4c8Im2U9ynybdR56PV0XcKvqaQ==} + engines: {node: ^20.19.0 || ^22.13.0 || >=24} hasBin: true peerDependencies: jiti: '*' @@ -8696,9 +8986,9 @@ packages: jiti: optional: true - espree@10.4.0: - resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + espree@11.2.0: + resolution: {integrity: sha512-7p3DrVEIopW1B1avAGLuCSh1jubc01H2JHc8B4qqGblmg5gI9yumBgACjWo4JlIc04ufug4xJ3SQI8HkS/Rgzw==} + engines: {node: ^20.19.0 || ^22.13.0 || >=24} esprima@4.0.1: resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==} @@ -8766,9 +9056,6 @@ packages: resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==} engines: {node: '>=0.8.x'} - evp_bytestokey@1.0.3: - resolution: {integrity: sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==} - execa@5.1.1: resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} engines: {node: '>=10'} @@ -8792,8 +9079,8 @@ packages: resolution: {integrity: sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==} engines: {node: '>= 18'} - expressive-code@0.41.6: - resolution: {integrity: sha512-W/5+IQbrpCIM5KGLjO35wlp1NCwDOOVQb+PAvzEoGkW1xjGM807ZGfBKptNWH6UECvt6qgmLyWolCMYKh7eQmA==} + expressive-code@0.41.7: + resolution: {integrity: sha512-2wZjC8OQ3TaVEMcBtYY4Va3lo6J+Ai9jf3d4dbhURMJcU4Pbqe6EcHe424MIZI0VHUA1bR6xdpoHYi3yxokWqA==} exsolve@1.0.8: resolution: {integrity: sha512-LmDxfWXwcTArk8fUEnOfSZpHOJ6zOMUJKOtFLFqJLoKJetuQG874Uc7/Kki7zFLzYybmZhp1M7+98pfMqeX8yA==} @@ -8805,13 +9092,6 @@ packages: extend@3.0.2: resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} - fast-check@3.23.2: - resolution: {integrity: sha512-h5+1OzzfCC3Ef7VbtKdcv7zsstUQwUDlYpUTvjeUsJAssPgLn7QzbboPtL5ro04Mq0rPOsMzl7q5hIbRs2wD1A==} - engines: {node: '>=8.0.0'} - - fast-content-type-parse@2.0.1: - resolution: {integrity: sha512-nGqtvLrj5w0naR6tDPfB4cUmYCqouzyQiz6C5y/LtcDllJdrcc6WaWW6iXyIIOErTa/XRybj28aasdn4LkVk6Q==} - fast-content-type-parse@3.0.0: resolution: {integrity: sha512-ZvLdcY8P+N8mGQJahJV5G4U88CSvT1rP8ApL6uETe88MBXrBHAkZlSEySdUlyztF7ccb+Znos3TFqaepHxdhBg==} @@ -8838,11 +9118,23 @@ packages: fast-safe-stringify@2.1.1: resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==} + fast-string-truncated-width@3.0.3: + resolution: {integrity: sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g==} + + fast-string-width@3.0.2: + resolution: {integrity: sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==} + fast-uri@3.1.0: resolution: {integrity: sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==} - fast-xml-parser@5.3.3: - resolution: {integrity: sha512-2O3dkPAAC6JavuMm8+4+pgTk+5hoAs+CjZ+sWcQLkX9+/tHRuTkQh/Oaifr8qDmZ8iEHb771Ea6G8CdwkrgvYA==} + fast-wrap-ansi@0.2.0: + resolution: {integrity: sha512-rLV8JHxTyhVmFYhBJuMujcrHqOT2cnO5Zxj37qROj23CP39GXubJRBUFF0z8KFK77Uc0SukZUf7JZhsVEQ6n8w==} + + fast-xml-builder@1.1.3: + resolution: {integrity: sha512-1o60KoFw2+LWKQu3IdcfcFlGTW4dpqEWmjhYec6H82AYZU2TVBXep6tMl8Z1Y+wM+ZrzCwe3BZ9Vyd9N2rIvmg==} + + fast-xml-parser@5.5.5: + resolution: {integrity: sha512-NLY+V5NNbdmiEszx9n14mZBseJTC50bRq1VHsaxOmR72JDuZt+5J1Co+dC/4JPnyq+WrIHNM69r0sqf7BMb3Mg==} hasBin: true fastq@1.20.1: @@ -8896,9 +9188,6 @@ packages: resolution: {integrity: sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==} engines: {node: '>=4.0.0'} - find-root@1.1.0: - resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==} - find-up-simple@1.0.1: resolution: {integrity: sha512-afd4O7zpqHeRyg4PfDQsXmlDe2PfdHtJt6Akt8jOWaApLOZk5JXs6VMR29lz03pRe9mpykrRCYIYxaJYcfpncQ==} engines: {node: '>=18'} @@ -8922,26 +9211,25 @@ packages: resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==} engines: {node: '>=16'} - flat@5.0.2: - resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==} - hasBin: true + flatted@3.4.0: + resolution: {integrity: sha512-kC6Bb+ooptOIvWj5B63EQWkF0FEnNjV2ZNkLMLZRDDduIiWeFF4iKnslwhiWxjAdbg4NzTNo6h0qLuvFrcx+Sw==} - flatted@3.3.3: - resolution: {integrity: sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==} + flatted@3.4.1: + resolution: {integrity: sha512-IxfVbRFVlV8V/yRaGzk0UVIcsKKHMSfYw66T/u4nTwlWteQePsxe//LjudR1AMX4tZW3WFCh3Zqa/sjlqpbURQ==} flattie@1.1.1: resolution: {integrity: sha512-9UbaD6XdAL97+k/n+N7JwX46K/M6Zc6KcFYskrYL8wbBV/Uyk0CTAMY0VT+qiK5PM7AIc9aTWYtq65U7T+aCNQ==} engines: {node: '>=8'} - flow-parser@0.297.0: - resolution: {integrity: sha512-51kjVLwebsDNCrBrm+VLBJ1rEZffrWzsEPjfbdhf/0lxQkX01zFoiojwEW7l6902p1ZQI/ju/QmLGowwne23lg==} + flow-parser@0.305.0: + resolution: {integrity: sha512-4Ws+q7nNQZRIpVGGlNTqkQCs3E3aXLnWWWvxo4WGRZTCXzZAq3ucZeckZ8h+c4hM3z+vtpJkzFyGGEMUqun1Zw==} engines: {node: '>=0.4.0'} - fontace@0.4.0: - resolution: {integrity: sha512-moThBCItUe2bjZip5PF/iZClpKHGLwMvR79Kp8XpGRBrvoRSnySN4VcILdv3/MJzbhvUA5WeiUXF5o538m5fvg==} + fontace@0.4.1: + resolution: {integrity: sha512-lDMvbAzSnHmbYMTEld5qdtvNH2/pWpICOqpean9IgC7vUbUJc3k+k5Dokp85CegamqQpFbXf0rAVkbzpyTA8aw==} - fontkitten@1.0.2: - resolution: {integrity: sha512-piJxbLnkD9Xcyi7dWJRnqszEURixe7CrF/efBfbffe2DPyabmuIuqraruY8cXTs19QoM8VJzx47BDRVNXETM7Q==} + fontkitten@1.0.3: + resolution: {integrity: sha512-Wp1zXWPVUPBmfoa3Cqc9ctaKuzKAV6uLstRqlR56kSjplf5uAce+qeyYym7F+PHbGTk+tCEdkCW6RD7DX/gBZw==} engines: {node: '>=20'} for-each@0.3.5: @@ -8975,14 +9263,10 @@ packages: resolution: {integrity: sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==} engines: {node: '>=14.14'} - fs-extra@11.3.3: - resolution: {integrity: sha512-VWSRii4t0AFm6ixFFmLLx1t7wS1gh+ckoa84aOeapGum0h+EZd1EhEumSB+ZdDLnEPuucsVB9oB7cxJHap6Afg==} + fs-extra@11.3.4: + resolution: {integrity: sha512-CTXd6rk/M3/ULNQj8FBqBWHYBVYybQ3VPBw0xGKFe3tuH7ytT6ACnvzpIQ3UZtB8yvUKC2cXn1a+x+5EVQLovA==} engines: {node: '>=14.14'} - fs-minipass@2.1.0: - resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==} - engines: {node: '>= 8'} - fs-minipass@3.0.3: resolution: {integrity: sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} @@ -9003,17 +9287,9 @@ packages: function-bind@1.1.2: resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} - function.prototype.name@1.1.8: - resolution: {integrity: sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==} - engines: {node: '>= 0.4'} - functions-have-names@1.2.3: resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} - generator-function@2.0.1: - resolution: {integrity: sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==} - engines: {node: '>= 0.4'} - gensequence@8.0.8: resolution: {integrity: sha512-omMVniXEXpdx/vKxGnPRoO2394Otlze28TyxECbFVyoSpZ9H3EO7lemjcB12OpQJzRW4e5tt/dL1rOxry6aMHg==} engines: {node: '>=20'} @@ -9026,8 +9302,8 @@ packages: resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} engines: {node: 6.* || 8.* || >= 10.*} - get-east-asian-width@1.4.0: - resolution: {integrity: sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==} + get-east-asian-width@1.5.0: + resolution: {integrity: sha512-CQ+bEO+Tva/qlmw24dCejulK5pMzVnUOFOijVogd3KQs07HnRIgp8TGipvCCRT06xeYEbpbgwaCxglFyiuIcmA==} engines: {node: '>=18'} get-intrinsic@1.3.0: @@ -9057,12 +9333,8 @@ packages: resolution: {integrity: sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==} engines: {node: '>=18'} - get-symbol-description@1.1.0: - resolution: {integrity: sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==} - engines: {node: '>= 0.4'} - - get-tsconfig@4.13.0: - resolution: {integrity: sha512-1VKTZJCwBrvbd+Wn3AOgQP/2Av+TfTCOlE4AcRJE72W1ksZXbAx8PPBR9RzgTeSPzlPMHrbANMH3LbltH73wxQ==} + get-tsconfig@4.13.6: + resolution: {integrity: sha512-shZT/QMiSHc/YBLxxOkMtgSid5HFoauqCE3/exfsEcwg1WkeqjG+V40yBbBrsD+jW2HDXcs28xOfcbm2jI8Ddw==} git-up@7.0.0: resolution: {integrity: sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ==} @@ -9086,42 +9358,36 @@ packages: glob@10.5.0: resolution: {integrity: sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==} + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me hasBin: true glob@11.1.0: resolution: {integrity: sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==} engines: {node: 20 || >=22} + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me hasBin: true - glob@13.0.0: - resolution: {integrity: sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==} - engines: {node: 20 || >=22} + glob@13.0.6: + resolution: {integrity: sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==} + engines: {node: 18 || 20 || >=22} glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} - deprecated: Glob versions prior to v9 are no longer supported + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me glob@8.1.0: resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} engines: {node: '>=12'} - deprecated: Glob versions prior to v9 are no longer supported - - global-directory@4.0.1: - resolution: {integrity: sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==} - engines: {node: '>=18'} + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me - globals@14.0.0: - resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==} - engines: {node: '>=18'} + global-directory@5.0.0: + resolution: {integrity: sha512-1pgFdhK3J2LeM+dVf2Pd424yHx2ou338lC0ErNP2hPx4j8eW1Sp0XqSjNxtk6Tc4Kr5wlWtSvz8cn2yb7/SG/w==} + engines: {node: '>=20'} globals@16.5.0: resolution: {integrity: sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==} engines: {node: '>=18'} - globalthis@1.0.4: - resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==} - engines: {node: '>= 0.4'} - globalyzer@0.1.0: resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==} @@ -9133,8 +9399,8 @@ packages: resolution: {integrity: sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==} engines: {node: '>=18'} - globby@16.1.0: - resolution: {integrity: sha512-+A4Hq7m7Ze592k9gZRy4gJ27DrXRNnC1vPjxTt1qQxEY8RxagBkBxivkCwg7FxSTG0iLLEMaUx13oOr0R2/qcQ==} + globby@16.1.1: + resolution: {integrity: sha512-dW7vl+yiAJSp6aCekaVnVJxurRv7DCOLyXqEG3RYMYUg7AuJ2jCqPkZTA8ooqC2vtnkaMcV5WfFBMuEnTu1OQg==} engines: {node: '>=20'} globrex@0.1.2: @@ -9173,14 +9439,14 @@ packages: resolution: {integrity: sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==} hasBin: true - h3@1.15.5: - resolution: {integrity: sha512-xEyq3rSl+dhGX2Lm0+eFQIAzlDN6Fs0EcC4f7BNUmzaRX/PTzeuM+Tr2lHB8FoXggsQIeXLj8EDVgs5ywxyxmg==} + h3@1.15.6: + resolution: {integrity: sha512-oi15ESLW5LRthZ+qPCi5GNasY/gvynSKUQxgiovrY63bPAtG59wtM+LSrlcwvOHAXzGrXVLnI97brbkdPF9WoQ==} hachure-fill@0.5.2: resolution: {integrity: sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg==} - happy-dom@20.3.4: - resolution: {integrity: sha512-rfbiwB6OKxZFIFQ7SRnCPB2WL9WhyXsFoTfecYgeCeFSOBxvkWLaXsdv5ehzJrfqwXQmDephAKWLRQoFoJwrew==} + happy-dom@20.8.9: + resolution: {integrity: sha512-Tz23LR9T9jOGVZm2x1EPdXqwA37G/owYMxRwU0E4miurAtFsPMQ1d2Jc2okUaSjZqAFz2oEn3FLXC5a0a+siyA==} engines: {node: '>=20.0.0'} has-bigints@1.1.0: @@ -9198,10 +9464,6 @@ packages: has-property-descriptors@1.0.2: resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==} - has-proto@1.2.0: - resolution: {integrity: sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==} - engines: {node: '>= 0.4'} - has-symbols@1.1.0: resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==} engines: {node: '>= 0.4'} @@ -9210,17 +9472,6 @@ packages: resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==} engines: {node: '>= 0.4'} - hash-base@3.0.5: - resolution: {integrity: sha512-vXm0l45VbcHEVlTCzs8M+s0VeYsB2lnlAaThoLKGXr3bE/VWDOelNUnycUPEhKEaXARL2TEFjBOyUiM6+55KBg==} - engines: {node: '>= 0.10'} - - hash-base@3.1.2: - resolution: {integrity: sha512-Bb33KbowVTIj5s7Ked1OsqHUeCpz//tPwR+E2zJgJKo9Z5XolZ9b6bdUgjmYlwnWhoOQKoTd1TYToZGn5mAYOg==} - engines: {node: '>= 0.8'} - - hash.js@1.1.7: - resolution: {integrity: sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==} - hasown@2.0.2: resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} engines: {node: '>= 0.4'} @@ -9305,12 +9556,6 @@ packages: resolution: {integrity: sha512-EqYpWyTF2s8nMfttfBA2yLKPNoZCO33pLS4MnbXQ4hECf1TKujCt1Kq7QAdrio7roL4+CqsfjqwYj4tYgq0pJQ==} engines: {node: '>=12.0.0'} - hmac-drbg@1.0.1: - resolution: {integrity: sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==} - - hoist-non-react-statics@3.3.2: - resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==} - hosted-git-info@4.1.0: resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==} engines: {node: '>=10'} @@ -9356,8 +9601,8 @@ packages: html-whitespace-sensitive-tag-names@3.0.1: resolution: {integrity: sha512-q+310vW8zmymYHALr1da4HyXUQ0zgiIwIicEfotYPWGN0OJVEN/58IJ3A4GBYcEq3LGAZqKb+ugvP0GNB9CEAA==} - htmlparser2@10.0.0: - resolution: {integrity: sha512-TwAZM+zE5Tq3lrEHvOlvwgj1XLWQCtaaibSN11Q+gGBAS7Y1uZSWwXXRe4iF6OXnaq1riyQAPFOBtYc77Mxq0g==} + htmlparser2@10.1.0: + resolution: {integrity: sha512-VTZkM9GWRAtEpveh7MSF6SjjrpNVNNVJfFup7xTY3UpFtm67foy9HDVXneLtFVt4pMz5kZtgNcvCniNFb1hlEQ==} http-assert@1.5.0: resolution: {integrity: sha512-uPpH7OKX4H25hBmU6G1jWNaqJGpTXxey+YOUizJUAgu0AjLUeC8D73hTrhvDS5D+GJN1DN1+hhc/eF/wpxtp0w==} @@ -9386,9 +9631,6 @@ packages: resolution: {integrity: sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==} engines: {node: '>=10.19.0'} - https-browserify@1.0.0: - resolution: {integrity: sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==} - https-proxy-agent@7.0.6: resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==} engines: {node: '>= 14'} @@ -9484,10 +9726,6 @@ packages: resolution: {integrity: sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} - ini@4.1.1: - resolution: {integrity: sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - ini@6.0.0: resolution: {integrity: sha512-IBTdIkzZNOpqm7q3dRqJvMaldXjDHWkEDfrwGEQTs5eaQMWV+djAhR+wahyNNMAa+qpbDUhBMVt4ZKNwpPm7xQ==} engines: {node: ^20.17.0 || >=22.9.0} @@ -9512,8 +9750,8 @@ packages: inline-style-parser@0.2.7: resolution: {integrity: sha512-Nb2ctOyNR8DqQoR0OwRG95uNWIC0C1lCgf5Naz5H6Ji72KZ8OcFZLz2P5sNgwlyoJ8Yif11oMuYs5pBQa86csA==} - inquirer@13.2.0: - resolution: {integrity: sha512-4CBv58vLrL4CnMgrscW/T5cLvfWM2nRLevttTiZTQyku7YV7/pc2IKyABBU2rDfVl4PiIB0sTRcwOac7BIYKLA==} + inquirer@13.3.0: + resolution: {integrity: sha512-APTrZe9IhrsshL0u2PgmEMLP3CXDBjZ99xh5dR2+sryOt5R+JGL0KNuaTTT2lW54B9eNQDMutPR05UYTL7Xb1Q==} engines: {node: '>=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0'} peerDependencies: '@types/node': '>=18' @@ -9564,10 +9802,6 @@ packages: is-arrayish@0.2.1: resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} - is-async-function@2.1.1: - resolution: {integrity: sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==} - engines: {node: '>= 0.4'} - is-bigint@1.1.0: resolution: {integrity: sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==} engines: {node: '>= 0.4'} @@ -9592,10 +9826,6 @@ packages: resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==} engines: {node: '>= 0.4'} - is-data-view@1.0.2: - resolution: {integrity: sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==} - engines: {node: '>= 0.4'} - is-date-object@1.1.0: resolution: {integrity: sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==} engines: {node: '>= 0.4'} @@ -9624,18 +9854,10 @@ packages: resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} engines: {node: '>=0.10.0'} - is-finalizationregistry@1.1.1: - resolution: {integrity: sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==} - engines: {node: '>= 0.4'} - is-fullwidth-code-point@3.0.0: resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} engines: {node: '>=8'} - is-generator-function@1.1.2: - resolution: {integrity: sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==} - engines: {node: '>= 0.4'} - is-glob@4.0.3: resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} engines: {node: '>=0.10.0'} @@ -9664,14 +9886,6 @@ packages: resolution: {integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==} engines: {node: '>= 0.4'} - is-nan@1.3.2: - resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==} - engines: {node: '>= 0.4'} - - is-negative-zero@2.0.3: - resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==} - engines: {node: '>= 0.4'} - is-number-object@1.1.1: resolution: {integrity: sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==} engines: {node: '>= 0.4'} @@ -9714,6 +9928,10 @@ packages: resolution: {integrity: sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==} engines: {node: '>= 0.4'} + is-safe-filename@0.1.1: + resolution: {integrity: sha512-4SrR7AdnY11LHfDKTZY1u6Ga3RuxZdl3YKWWShO5iyuG5h8QS4GD2tOb04peBJ5I7pXbR+CGBNEhTcwK+FzN3g==} + engines: {node: '>=20'} + is-set@2.0.3: resolution: {integrity: sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==} engines: {node: '>= 0.4'} @@ -9745,14 +9963,6 @@ packages: resolution: {integrity: sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==} engines: {node: '>= 0.4'} - is-typed-array@1.1.15: - resolution: {integrity: sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==} - engines: {node: '>= 0.4'} - - is-unicode-supported@0.1.0: - resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==} - engines: {node: '>=10'} - is-unicode-supported@1.3.0: resolution: {integrity: sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==} engines: {node: '>=12'} @@ -9765,10 +9975,6 @@ packages: resolution: {integrity: sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==} engines: {node: '>= 0.4'} - is-weakref@1.1.1: - resolution: {integrity: sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==} - engines: {node: '>= 0.4'} - is-weakset@2.0.4: resolution: {integrity: sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==} engines: {node: '>= 0.4'} @@ -9781,8 +9987,8 @@ packages: resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==} engines: {node: '>=8'} - is-wsl@3.1.0: - resolution: {integrity: sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==} + is-wsl@3.1.1: + resolution: {integrity: sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==} engines: {node: '>=16'} isarray@1.0.0: @@ -9794,18 +10000,18 @@ packages: isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - isexe@3.1.1: - resolution: {integrity: sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==} - engines: {node: '>=16'} + isexe@3.1.5: + resolution: {integrity: sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w==} + engines: {node: '>=18'} + + isexe@4.0.0: + resolution: {integrity: sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw==} + engines: {node: '>=20'} isobject@3.0.1: resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==} engines: {node: '>=0.10.0'} - isomorphic-timers-promises@1.0.1: - resolution: {integrity: sha512-u4sej9B1LPSxTGKB/HiuzvEQnXH0ECYkSVQU39koSwmFAxhlEAFl9RdTvLv4TOTQUgBS5O3O5fwUxk6byBZ+IQ==} - engines: {node: '>=10'} - istanbul-lib-coverage@3.2.2: resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==} engines: {node: '>=8'} @@ -9825,19 +10031,19 @@ packages: jackspeak@3.4.3: resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==} - jackspeak@4.1.1: - resolution: {integrity: sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==} + jackspeak@4.2.3: + resolution: {integrity: sha512-ykkVRwrYvFm1nb2AJfKKYPr0emF6IiXDYUaFx4Zn9ZuIH7MrzEZ3sD5RlqGXNRpHtvUHJyOnCEFxOlNDtGo7wg==} engines: {node: 20 || >=22} jju@1.4.0: resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==} + js-tokens@10.0.0: + resolution: {integrity: sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==} + js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} - js-tokens@9.0.1: - resolution: {integrity: sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==} - js-yaml@3.14.2: resolution: {integrity: sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==} hasBin: true @@ -9888,9 +10094,8 @@ packages: json-stable-stringify-without-jsonify@1.0.1: resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} - json5@1.0.2: - resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==} - hasBin: true + json-with-bigint@3.5.7: + resolution: {integrity: sha512-7ei3MdAI5+fJPVnKlW77TKNKwQ5ppSzWvhPuSuINT/GYW9ZOC1eRKOuhV9yHG5aEsUPj9BBx5JIekkmoLHxZOw==} json5@2.2.3: resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==} @@ -9927,8 +10132,8 @@ packages: jws@4.0.1: resolution: {integrity: sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==} - katex@0.16.27: - resolution: {integrity: sha512-aeQoDkuRWSqQN6nSvVCEFvfXdqo1OQiCmmW1kc9xSdjutPv7BGO7pqY9sQRJpMOGrEdfDgF2TfRXe5eUAD2Waw==} + katex@0.16.38: + resolution: {integrity: sha512-cjHooZUmIAUmDsHBN+1n8LaZdpmbj03LtYeYPyuYB7OuloiaeaV6N4LcfjcnHVzGWjVQmKrxxTrpDcmSzEZQwQ==} hasBin: true keyborg@2.6.0: @@ -9937,7 +10142,6 @@ packages: keygrip@1.1.0: resolution: {integrity: sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==} engines: {node: '>= 0.6'} - deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. keytar@7.9.0: resolution: {integrity: sha512-VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ==} @@ -9982,16 +10186,16 @@ packages: resolution: {integrity: sha512-UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ==} engines: {node: '>= 7.6.0'} - koa@3.1.1: - resolution: {integrity: sha512-KDDuvpfqSK0ZKEO2gCPedNjl5wYpfj+HNiuVRlbhd1A88S3M0ySkdf2V/EJ4NWt5dwh5PXCdcenrKK2IQJAxsg==} + koa@3.1.2: + resolution: {integrity: sha512-2LOQnFKu3m0VxpE+5sb5+BRTSKrXmNxGgxVRiKwD9s5KQB1zID/FRXhtzeV7RT1L2GVpdEEAfVuclFOMGl1ikA==} engines: {node: '>= 18'} kolorist@1.8.0: resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==} - langium@3.3.1: - resolution: {integrity: sha512-QJv/h939gDpvT+9SiLVlY7tZC3xB2qK57v0J04Sh9wpMb6MP1q8gB21L3WIo8T5P1MSMg3Ep14L7KkDCFG3y4w==} - engines: {node: '>=16.0.0'} + langium@4.2.1: + resolution: {integrity: sha512-zu9QWmjpzJcomzdJQAHgDVhLGq5bLosVak1KVa40NzQHXfqr4eAHupvnPOVXEoLkg6Ocefvf/93d//SB7du4YQ==} + engines: {node: '>=20.10.0', npm: '>=10.2.3'} layout-base@1.0.2: resolution: {integrity: sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg==} @@ -10014,6 +10218,80 @@ packages: lie@3.3.0: resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==} + lightningcss-android-arm64@1.32.0: + resolution: {integrity: sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [android] + + lightningcss-darwin-arm64@1.32.0: + resolution: {integrity: sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [darwin] + + lightningcss-darwin-x64@1.32.0: + resolution: {integrity: sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [darwin] + + lightningcss-freebsd-x64@1.32.0: + resolution: {integrity: sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [freebsd] + + lightningcss-linux-arm-gnueabihf@1.32.0: + resolution: {integrity: sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==} + engines: {node: '>= 12.0.0'} + cpu: [arm] + os: [linux] + + lightningcss-linux-arm64-gnu@1.32.0: + resolution: {integrity: sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [linux] + libc: [glibc] + + lightningcss-linux-arm64-musl@1.32.0: + resolution: {integrity: sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [linux] + libc: [musl] + + lightningcss-linux-x64-gnu@1.32.0: + resolution: {integrity: sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [linux] + libc: [glibc] + + lightningcss-linux-x64-musl@1.32.0: + resolution: {integrity: sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [linux] + libc: [musl] + + lightningcss-win32-arm64-msvc@1.32.0: + resolution: {integrity: sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [win32] + + lightningcss-win32-x64-msvc@1.32.0: + resolution: {integrity: sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [win32] + + lightningcss@1.32.0: + resolution: {integrity: sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==} + engines: {node: '>= 12.0.0'} + lines-and-columns@1.2.4: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} @@ -10044,11 +10322,8 @@ packages: resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} engines: {node: '>=10'} - lodash-es@4.17.21: - resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==} - - lodash-es@4.17.22: - resolution: {integrity: sha512-XEawp1t0gxSi9x01glktRZ5HDy0HXqrM0x5pXQM98EaI0NxO6jVM7omDOxsuEo5UIASAnm2bRp1Jt/e0a2XU8Q==} + lodash-es@4.17.23: + resolution: {integrity: sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==} lodash.camelcase@4.3.0: resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==} @@ -10089,9 +10364,8 @@ packages: lodash@4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} - log-symbols@4.1.0: - resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==} - engines: {node: '>=10'} + lodash@4.17.23: + resolution: {integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==} log-symbols@6.0.0: resolution: {integrity: sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw==} @@ -10118,8 +10392,8 @@ packages: lru-cache@10.4.3: resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==} - lru-cache@11.2.4: - resolution: {integrity: sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==} + lru-cache@11.2.7: + resolution: {integrity: sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==} engines: {node: 20 || >=22} lru-cache@5.1.1: @@ -10146,8 +10420,8 @@ packages: magic-string@0.30.21: resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==} - magicast@0.5.1: - resolution: {integrity: sha512-xrHS24IxaLrvuo613F719wvOIv9xPHFWQHuvGUBmPnCA/3MQxKI3b+r7n1jAoDHmsbC5bRhTZYR77invLAxVnw==} + magicast@0.5.2: + resolution: {integrity: sha512-E3ZJh4J3S9KfwdjZhe2afj6R9lGIN5Pher1pF39UGrXRqq/VDaGVIGN13BjHd2u8B61hArAGOnso7nBOouW3TQ==} make-dir@2.1.0: resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==} @@ -10165,8 +10439,8 @@ packages: resolution: {integrity: sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ==} engines: {node: ^18.17.0 || >=20.5.0} - make-fetch-happen@15.0.3: - resolution: {integrity: sha512-iyyEpDty1mwW3dGlYXAJqC/azFn5PPvgKVwXayOGBSmKLxhKZ9fg4qIan2ePpp1vJIwfFiO34LAPZgq9SZW9Aw==} + make-fetch-happen@15.0.4: + resolution: {integrity: sha512-vM2sG+wbVeVGYcCm16mM3d5fuem9oC28n436HjsGO3LcxoTI8LNVa4rwZDn3f76+cWyT4GGJDxjTYU1I2nr6zw==} engines: {node: ^20.17.0 || >=22.9.0} map-age-cleaner@0.1.3: @@ -10181,8 +10455,8 @@ packages: resolution: {integrity: sha512-o5vL7aDWatOTX8LzaS1WMoaoxIiLRQJuIKKe2wAw6IeULDHaqbiqiggmx+pKvZDb1Sj+pE46Sn1T7lCqfFtg1Q==} engines: {node: '>=16'} - markdown-it@14.1.0: - resolution: {integrity: sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==} + markdown-it@14.1.1: + resolution: {integrity: sha512-BuU2qnTti9YKgK5N+IeMubp14ZUKUUw7yeJbkjtosvHiP0AZ5c8IAgEMk79D0eC8F23r4Ac/q8cAIFdm2FtyoA==} hasBin: true markdown-table@3.0.4: @@ -10202,9 +10476,6 @@ packages: resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==} engines: {node: '>= 0.4'} - md5.js@1.3.5: - resolution: {integrity: sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==} - mdast-util-definitions@6.0.0: resolution: {integrity: sha512-scTllyX6pnYNZH/AIp/0ePz6s4cZtARxImwoPJ7kS42n+MnVsI4XbnG6d4ibehRIldYMWM2LD7ImQblVhUejVQ==} @@ -10214,8 +10485,8 @@ packages: mdast-util-find-and-replace@3.0.2: resolution: {integrity: sha512-Tmd1Vg/m3Xz43afeNxDIhWRtFZgM2VLyaf4vSTYwudTyeuTneoL3qtWMA5jeLyz/O1vDJmmV4QuScFCA2tBPwg==} - mdast-util-from-markdown@2.0.2: - resolution: {integrity: sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==} + mdast-util-from-markdown@2.0.3: + resolution: {integrity: sha512-W4mAWTvSlKvf8L6J+VN9yLSqQ9AOAAvHuoDAmPkz4dHf553m5gVj2ejadHJhoJmcmxEnOv6Pa8XJhpxE93kb8Q==} mdast-util-gfm-autolink-literal@2.0.1: resolution: {integrity: sha512-5HVP2MKaP6L+G6YaxPNjuL0BPrq9orG3TsrZ9YXbA3vDw/ACI4MEsnoDpn6ZNm7GnZgtAcONJyPhOP8tNJQavQ==} @@ -10262,8 +10533,8 @@ packages: mdn-data@2.0.28: resolution: {integrity: sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==} - mdn-data@2.12.2: - resolution: {integrity: sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==} + mdn-data@2.27.1: + resolution: {integrity: sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==} mdurl@2.0.0: resolution: {integrity: sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==} @@ -10295,16 +10566,16 @@ packages: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} - mermaid-isomorphic@3.0.4: - resolution: {integrity: sha512-XQTy7H1XwHK3DPEHf+ZNWiqUEd9BwX3Xws38R9Fj2gx718srmgjlZoUzHr+Tca+O+dqJOJsAJaKzCoP65QDfDg==} + mermaid-isomorphic@3.1.0: + resolution: {integrity: sha512-mzrvfEVjnJIkJlEqxp3eMuR1wS0TeLCH1VK5E/T5yzWaBwI3JqjJuw70yUIThSCDJ5bRs6O3rgfp00oBAbvSeQ==} peerDependencies: playwright: '1' peerDependenciesMeta: playwright: optional: true - mermaid@11.12.2: - resolution: {integrity: sha512-n34QPDPEKmaeCG4WDMGy0OT6PSyxKCfy2pJgShP+Qow2KLrvWjclwbc3yXfSIf4BanqWEhQEpngWwNp/XhZt6w==} + mermaid@11.13.0: + resolution: {integrity: sha512-fEnci+Immw6lKMFI8sqzjlATTyjLkRa6axrEgLV2yHTfv8r+h1wjFbV6xeRtd4rUV1cS4EpR9rwp3Rci7TRWDw==} micromark-core-commonmark@2.0.3: resolution: {integrity: sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==} @@ -10418,10 +10689,6 @@ packages: resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} engines: {node: '>=8.6'} - miller-rabin@4.0.1: - resolution: {integrity: sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==} - hasBin: true - mime-db@1.52.0: resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} engines: {node: '>= 0.6'} @@ -10471,29 +10738,23 @@ packages: resolution: {integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==} hasBin: true - minimalistic-assert@1.0.1: - resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==} - - minimalistic-crypto-utils@1.0.1: - resolution: {integrity: sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==} - - minimatch@10.0.3: - resolution: {integrity: sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==} - engines: {node: 20 || >=22} + minimatch@10.2.3: + resolution: {integrity: sha512-Rwi3pnapEqirPSbWbrZaa6N3nmqq4Xer/2XooiOKyV3q12ML06f7MOuc5DVH8ONZIFhwIYQ3yzPH4nt7iWHaTg==} + engines: {node: 18 || 20 || >=22} - minimatch@10.1.1: - resolution: {integrity: sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==} - engines: {node: 20 || >=22} + minimatch@10.2.4: + resolution: {integrity: sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==} + engines: {node: 18 || 20 || >=22} - minimatch@3.1.2: - resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} + minimatch@3.1.5: + resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==} - minimatch@5.1.6: - resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==} + minimatch@5.1.9: + resolution: {integrity: sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==} engines: {node: '>=10'} - minimatch@9.0.5: - resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==} + minimatch@9.0.9: + resolution: {integrity: sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==} engines: {node: '>=16 || 14 >=14.17'} minimist@1.2.8: @@ -10507,8 +10768,8 @@ packages: resolution: {integrity: sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==} engines: {node: ^18.17.0 || >=20.5.0} - minipass-fetch@5.0.0: - resolution: {integrity: sha512-fiCdUALipqgPWrOVTz9fw0XhcazULXOSU6ie40DDbX1F49p1dBrSRBuswndTx1x3vEb/g0FT7vC4c4C2u/mh3A==} + minipass-fetch@5.0.2: + resolution: {integrity: sha512-2d0q2a8eCi2IRg/IGubCNRJoYbA1+YPXAzQVRFmB45gdGZafyivnZ5YSEfo3JikbjGxOdntGFvBQGqaSMXlAFQ==} engines: {node: ^20.17.0 || >=22.9.0} minipass-flush@1.0.5: @@ -10523,22 +10784,18 @@ packages: resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==} engines: {node: '>=8'} - minipass@3.3.6: - resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==} + minipass-sized@2.0.0: + resolution: {integrity: sha512-zSsHhto5BcUVM2m1LurnXY6M//cGhVaegT71OfOXoprxT6o780GZd792ea6FfrQkuU4usHZIUczAQMRUE2plzA==} engines: {node: '>=8'} - minipass@5.0.0: - resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} + minipass@3.3.6: + resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==} engines: {node: '>=8'} - minipass@7.1.2: - resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==} + minipass@7.1.3: + resolution: {integrity: sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==} engines: {node: '>=16 || 14 >=14.17'} - minizlib@2.1.2: - resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} - engines: {node: '>= 8'} - minizlib@3.1.0: resolution: {integrity: sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==} engines: {node: '>= 18'} @@ -10546,22 +10803,8 @@ packages: mkdirp-classic@0.5.3: resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==} - mkdirp@0.5.6: - resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} - hasBin: true - - mkdirp@1.0.4: - resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==} - engines: {node: '>=10'} - hasBin: true - - mlly@1.8.0: - resolution: {integrity: sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==} - - mocha@11.7.5: - resolution: {integrity: sha512-mTT6RgopEYABzXWFx+GcJ+ZQ32kp4fMf0xvpZIIfSq9Z8lC/++MtcCnQ9t5FP2veYEP95FIYSvW+U9fV4xrlig==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - hasBin: true + mlly@1.8.1: + resolution: {integrity: sha512-SnL6sNutTwRWWR/vcmCYHSADjiEesp5TGQQ0pXyLhW5IoeibRlF/CbSLailbB3CNqJUk9cVJ9dUDnbD7GrcHBQ==} monaco-editor-core@0.55.1: resolution: {integrity: sha512-UTk7U9VkSFy2qruSYC70+vHHo5DffN164QGkDn4vTaaO40a1UMSNHVqS2MF6Z+s0LWOeAzez/Kp85oAPZG2d0g==} @@ -10586,8 +10829,8 @@ packages: muggle-string@0.4.1: resolution: {integrity: sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==} - multer@2.0.2: - resolution: {integrity: sha512-u7f2xaZ/UG8oLXHvtF/oWTRvT44p9ecwBBqTwgJVq0+4BW1g8OW01TyMEGWBHbyMOYVHXslaut7qEQ1meATXgw==} + multer@2.1.1: + resolution: {integrity: sha512-mo+QTzKlx8R7E5ylSXxWzGoXoZbOsRMpyitcht8By2KHvMbf3tjwosZ/Mu/XYU6UuJ3VZnODIrak5ZrPiPyB6A==} engines: {node: '>= 10.16.0'} mustache@4.2.0: @@ -10634,15 +10877,15 @@ packages: nlcst-to-string@4.0.0: resolution: {integrity: sha512-YKLBCcUYKAg0FNlOBT6aI91qFmSiFKiluk655WzPF+DDMA02qIyy8uiRqI8QXtcFpEvll12LpL5MXqEmAZ+dcA==} - node-abi@3.87.0: - resolution: {integrity: sha512-+CGM1L1CgmtheLcBuleyYOn7NWPVu0s0EJH2C4puxgEZb9h8QpR9G2dBfZJOAUhi7VQxuBPMd0hiISWcTyiYyQ==} + node-abi@3.88.0: + resolution: {integrity: sha512-At6b4UqIEVudaqPsXjmUO1r/N5BUr4yhDGs5PkBE8/oG5+TfLPhFechiskFsnT6Ql0VfUXbalUUCbfXxtj7K+w==} engines: {node: '>=10'} node-addon-api@4.3.0: resolution: {integrity: sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==} - node-addon-api@8.5.0: - resolution: {integrity: sha512-/bRZty2mXUIFY/xU5HLvveNHlswNJej+RnxBjOMkidWfwZzgTbPG1E3K5TOxRLOR+5hX7bSofy8yf1hZevMS8A==} + node-addon-api@8.6.0: + resolution: {integrity: sha512-gBVjCaqDlRUk0EwoPNKzIr9KkS9041G/q31IBShPs1Xz6UTA+EXdZADbzqAJQrpDRq71CIMnOP5VMut3SL0z5Q==} engines: {node: ^18 || ^20 || >= 21} node-dir@0.1.17: @@ -10661,25 +10904,21 @@ packages: engines: {node: ^18.17.0 || >=20.5.0} hasBin: true - node-gyp@12.1.0: - resolution: {integrity: sha512-W+RYA8jBnhSr2vrTtlPYPc1K+CSjGpVDRZxcqJcERZ8ND3A1ThWPHRwctTx3qC3oW99jt726jhdz3Y6ky87J4g==} + node-gyp@12.2.0: + resolution: {integrity: sha512-q23WdzrQv48KozXlr0U1v9dwO/k59NHeSzn6loGcasyf0UnSrtzs8kRxM+mfwJSf0DkX0s43hcqgnSO4/VNthQ==} engines: {node: ^20.17.0 || >=22.9.0} hasBin: true node-mock-http@1.0.4: resolution: {integrity: sha512-8DY+kFsDkNXy1sJglUfuODx1/opAGJGyrTuFqEoN90oRc2Vk0ZbD4K2qmKXBBEhZQzdKHIVfEJpDU8Ak2NJEvQ==} - node-releases@2.0.27: - resolution: {integrity: sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==} + node-releases@2.0.36: + resolution: {integrity: sha512-TdC8FSgHz8Mwtw9g5L4gR/Sh9XhSP/0DEkQxfEFXOpiul5IiHgHan2VhYYb6agDSfp4KuvltmGApc8HMgUrIkA==} node-sarif-builder@3.4.0: resolution: {integrity: sha512-tGnJW6OKRii9u/b2WiUViTJS+h7Apxx17qsMUjsUeNDiMMX5ZFf8F8Fcz7PAQ6omvOxHZtvDTmOYKJQwmfpjeg==} engines: {node: '>=20'} - node-stdlib-browser@1.3.1: - resolution: {integrity: sha512-X75ZN8DCLftGM5iKwoYLA3rjnrAEs97MkzvSd4q2746Tgpg8b8XWiBGiBG4ZpgcAqBgtgPHTiAc8ZMCvZuikDw==} - engines: {node: '>=10'} - node-watch@0.7.3: resolution: {integrity: sha512-3l4E8uMPY1HdMMryPRUAl+oIHtXtyiTlIiESNSVSNxcPfzAFzeTbXFQkZfAwBbo0B1qMSG8nUABx+Gd+YrbKrQ==} engines: {node: '>=6'} @@ -10741,16 +10980,12 @@ packages: resolution: {integrity: sha512-CJi3OS4JLsNMmr2u07OJlhcrPxCeOeP/4xq67aWNai6TNWWbTrlNDgl8NcFKVlcBKp18GPj+EzbNIgrBfZhsag==} engines: {node: ^20.17.0 || >=22.9.0} - npm-package-arg@12.0.2: - resolution: {integrity: sha512-f1NpFjNI9O4VbKMOlA5QoBq/vSQPORHcTZ2feJpFkTHJ9eQkdlmZEKSjcAhxTGInC7RlEyScT9ui67NaOsjFWA==} - engines: {node: ^18.17.0 || >=20.5.0} - npm-package-arg@13.0.2: resolution: {integrity: sha512-IciCE3SY3uE84Ld8WZU23gAPPV9rIYod4F+rc+vJ7h7cwAJt9Vk6TVsK60ry7Uj3SRS3bqRRIGuTp9YVlk6WNA==} engines: {node: ^20.17.0 || >=22.9.0} - npm-packlist@10.0.3: - resolution: {integrity: sha512-zPukTwJMOu5X5uvm0fztwS5Zxyvmk38H/LfidkOMt3gbZVCyro2cD/ETzwzVPcWZA3JOyPznfUN/nkyFiyUbxg==} + npm-packlist@10.0.4: + resolution: {integrity: sha512-uMW73iajD8hiH4ZBxEV3HC+eTnppIqwakjOYuvgddnalIw2lJguKviK1pcUJDlIWm1wSJkchpDZDSVVsZEYRng==} engines: {node: ^20.17.0 || >=22.9.0} npm-packlist@5.1.3: @@ -10803,18 +11038,6 @@ packages: resolution: {integrity: sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==} engines: {node: '>= 0.4'} - object.fromentries@2.0.8: - resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==} - engines: {node: '>= 0.4'} - - object.groupby@1.0.3: - resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==} - engines: {node: '>= 0.4'} - - object.values@1.2.1: - resolution: {integrity: sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==} - engines: {node: '>= 0.4'} - obug@2.1.1: resolution: {integrity: sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==} @@ -10876,17 +11099,10 @@ packages: resolution: {integrity: sha512-weP+BZ8MVNnlCm8c0Qdc1WSWq4Qn7I+9CJGm7Qali6g44e/PUzbjNqJX5NJ9ljlNMosfJvg1fKEGILklK9cwnw==} engines: {node: '>=18'} - ora@9.0.0: - resolution: {integrity: sha512-m0pg2zscbYgWbqRR6ABga5c3sZdEon7bSgjnlXC64kxtxLOyjRcbbUkLj7HFyy/FTD+P2xdBWu8snGhYI0jc4A==} + ora@9.3.0: + resolution: {integrity: sha512-lBX72MWFduWEf7v7uWf5DHp9Jn5BI8bNPGuFgtXMmr2uDz2Gz2749y3am3agSDdkhHPHYmmxEGSKH85ZLGzgXw==} engines: {node: '>=20'} - os-browserify@0.3.0: - resolution: {integrity: sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==} - - own-keys@1.0.1: - resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==} - engines: {node: '>= 0.4'} - p-cancelable@2.1.1: resolution: {integrity: sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==} engines: {node: '>=8'} @@ -10915,12 +11131,8 @@ packages: resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} engines: {node: '>=10'} - p-limit@6.2.0: - resolution: {integrity: sha512-kuUqqHNUqoIWp/c467RI4X6mmyuojY5jGutNU0wVTmEOOfcuwLqyMVoAi9MKi2Ak+5i9+nhmrK4ufZE8069kHA==} - engines: {node: '>=18'} - - p-limit@7.2.0: - resolution: {integrity: sha512-ATHLtwoTNDloHRFFxFJdHnG6n2WUeFjaR8XQMFdKIv0xkXjrER8/iG9iu265jOM95zXHAfv9oTkqhrfbIzosrQ==} + p-limit@7.3.0: + resolution: {integrity: sha512-7cIXg/Z0M5WZRblrsOla88S4wAK+zOQQWeBYfV3qJuJXMr+LnbYjaadrFaS0JILfEDPVqHyKnZ1Z/1d6J9VVUw==} engines: {node: '>=20'} p-locate@3.0.0: @@ -10959,9 +11171,9 @@ packages: resolution: {integrity: sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==} engines: {node: '>=8'} - p-queue@8.1.1: - resolution: {integrity: sha512-aNZ+VfjobsWryoiPnEApGGmf5WmNsCo9xu8dfaYamG5qaLP7ClhLN6NgsFe6SwJ2UbLEBK5dv9x8Mn5+RVhMWQ==} - engines: {node: '>=18'} + p-queue@9.1.0: + resolution: {integrity: sha512-O/ZPaXuQV29uSLbxWBGGZO1mCQXV2BLIwUr59JUU9SoH76mnYvtms7aafH/isNSNGwuEfP6W/4xD0/TJXxrizw==} + engines: {node: '>=20'} p-reflect@2.1.0: resolution: {integrity: sha512-paHV8NUz8zDHu5lhr/ngGWQiW067DK/+IbJ+RfZ4k+s8y4EKyYCz8pGYWjxCg35eHztpJAt+NUgvN4L+GCbPlg==} @@ -10971,9 +11183,9 @@ packages: resolution: {integrity: sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==} engines: {node: '>=8'} - p-timeout@6.1.4: - resolution: {integrity: sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==} - engines: {node: '>=14.16'} + p-timeout@7.0.1: + resolution: {integrity: sha512-AxTM2wDGORHGEkPCt8yqxOTMgpfbEHqF51f/5fJCmwFC3C/zNcGT63SymH2ttOAaiIws2zVg4+izQCjrakcwHg==} + engines: {node: '>=20'} p-try@2.2.0: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} @@ -10985,8 +11197,8 @@ packages: package-manager-detector@1.6.0: resolution: {integrity: sha512-61A5ThoTiDG/C8s8UMZwSorAGwMJ0ERVGj2OjoW5pAalsNOg15+iQiPzrLJ4jhZ1HJzmC2PIHT2oEiH3R5fzNA==} - pacote@21.0.4: - resolution: {integrity: sha512-RplP/pDW0NNNDh3pnaoIWYPvNenS7UqMbXyvMqJczosiFWTeGGwJC2NQBLqKf4rGLFfwCOnntw1aEp9Jiqm1MA==} + pacote@21.5.0: + resolution: {integrity: sha512-VtZ0SB8mb5Tzw3dXDfVAIjhyVKUHZkS/ZH9/5mpKenwC9sFOXNI0JI7kEF7IMkwOnsWMFrvAZHzx1T5fmrp9FQ==} engines: {node: ^20.17.0 || >=22.9.0} hasBin: true @@ -11008,10 +11220,6 @@ packages: resolution: {integrity: sha512-uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg==} engines: {node: '>=8'} - parse-asn1@5.1.9: - resolution: {integrity: sha512-fIYNuZ/HastSb80baGOuPRo1O9cf4baWw5WsAp7dBuUzeTD/BoaG8sVTdlPFksBE2lF21dN+A1AnrpIjSWqHHg==} - engines: {node: '>= 0.10'} - parse-entities@4.0.2: resolution: {integrity: sha512-GG2AQYWoLgL877gQIKeRPGO1xF9+eG1ujIb5soS5gPvLQ1y2o8FL90w2QWNdf9I361Mpp7726c+lj3U0qK1uGw==} @@ -11085,6 +11293,10 @@ packages: resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} engines: {node: '>=8'} + path-expression-matcher@1.1.3: + resolution: {integrity: sha512-qdVgY8KXmVdJZRSS1JdEPOKPdTiEK/pi0RkcT2sw1RhXxohdujUlJFPuS1TSkevZ9vzd3ZlL7ULl1MHGTApKzQ==} + engines: {node: '>=14.0.0'} + path-is-absolute@1.0.1: resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} engines: {node: '>=0.10.0'} @@ -11107,16 +11319,16 @@ packages: resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==} engines: {node: '>=16 || 14 >=14.18'} - path-scurry@2.0.1: - resolution: {integrity: sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==} - engines: {node: 20 || >=22} + path-scurry@2.0.2: + resolution: {integrity: sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==} + engines: {node: 18 || 20 || >=22} path-temp@2.0.0: resolution: {integrity: sha512-92olbatybjsHTGB2CUnAM7s0mU/27gcMfLNA7t09UftndUdxywlQKur3fzXEPpfLrgZD3I2Bt8+UmiL7YDEgXQ==} engines: {node: '>=8.15'} - path-temp@2.1.0: - resolution: {integrity: sha512-cMMJTAZlion/RWRRC48UbrDymEIt+/YSD/l8NqjneyDw2rDOBQcP5yRkMB4CYGn47KMhZvbblBP7Z79OsMw72w==} + path-temp@2.1.1: + resolution: {integrity: sha512-2pIjpQb28baC42ttBsQuRRqZ33a8DnWzfSwEFKJjz7SMiCmBECUOebUNLTmmPCG8F4ZIXG7ZRJ8FAxYXdx0Jiw==} engines: {node: '>=8.15'} path-to-regexp@8.3.0: @@ -11137,10 +11349,6 @@ packages: resolution: {integrity: sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==} engines: {node: '>= 14.16'} - pbkdf2@3.1.5: - resolution: {integrity: sha512-Q3CG/cYvCO1ye4QKkuH7EXxs3VC/rI1/trd+qX2+PolbaKG0H+bgcZzrTt96mMyRtejk+JMCiLUn3y29W8qmFQ==} - engines: {node: '>= 0.10'} - pct-encode@1.0.3: resolution: {integrity: sha512-+ojEvSHApoLWF2YYxwnOM4N9DPn5e5fG+j0YJ9drKNaYtrZYOq5M9ESOaBYqOHCXOAALODJJ4wkqHAXEuLpwMw==} @@ -11180,23 +11388,19 @@ packages: resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==} engines: {node: '>=8'} - pkg-dir@5.0.0: - resolution: {integrity: sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==} - engines: {node: '>=10'} - pkg-types@1.3.1: resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==} pkg-types@2.3.0: resolution: {integrity: sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==} - playwright-core@1.57.0: - resolution: {integrity: sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==} + playwright-core@1.58.2: + resolution: {integrity: sha512-yZkEtftgwS8CsfYo7nm0KE8jsvm6i/PTgVtB8DL726wNf6H2IMsDuxCpJj59KDaxCtSnrWan2AeDqM7JBaultg==} engines: {node: '>=18'} hasBin: true - playwright@1.57.0: - resolution: {integrity: sha512-ilYQj1s8sr2ppEJ2YVadYBN0Mb3mdo9J0wQ+UuDhzYqURwSoW4n1Xs5vs7ORwgDGmyEh33tRMeS8KhdkMoLXQw==} + playwright@1.58.2: + resolution: {integrity: sha512-vA30H8Nvkq/cPBnNw4Q8TWz1EJyqgpuinBcHET0YVJVFldr8JDNiU9LaWAE1KqSkRYazuaBhTpB5ZzShOezQ6A==} engines: {node: '>=18'} hasBin: true @@ -11231,8 +11435,8 @@ packages: resolution: {integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==} engines: {node: '>=4'} - postcss@8.5.6: - resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==} + postcss@8.5.8: + resolution: {integrity: sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==} engines: {node: ^10 || ^12 || >=14} postject@1.0.0-alpha.6: @@ -11243,6 +11447,7 @@ packages: prebuild-install@7.1.3: resolution: {integrity: sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==} engines: {node: '>=10'} + deprecated: No longer maintained. Please contact the author of the relevant native addon; alternatives are available. hasBin: true preferred-pm@3.1.4: @@ -11273,8 +11478,8 @@ packages: peerDependencies: prettier: ^3.6.0 - prettier@3.8.0: - resolution: {integrity: sha512-yEPsovQfpxYfgWNhCfECjG5AQaO+K3dp6XERmOepyPDVqcJm+bjyCVO3pmU+nAPe0N5dDvekfGezt/EIiRe1TA==} + prettier@3.8.1: + resolution: {integrity: sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==} engines: {node: '>=14'} hasBin: true @@ -11356,14 +11561,11 @@ packages: resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==} engines: {node: '>= 0.10'} - public-encrypt@4.0.3: - resolution: {integrity: sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==} - pump@2.0.1: resolution: {integrity: sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==} - pump@3.0.3: - resolution: {integrity: sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==} + pump@3.0.4: + resolution: {integrity: sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA==} pumpify@1.5.1: resolution: {integrity: sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==} @@ -11372,27 +11574,17 @@ packages: resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==} engines: {node: '>=6'} - punycode@1.4.1: - resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==} - punycode@2.3.1: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} - pure-rand@6.1.0: - resolution: {integrity: sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==} - - qs@6.14.1: - resolution: {integrity: sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==} + qs@6.15.0: + resolution: {integrity: sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==} engines: {node: '>=0.6'} quansync@0.2.11: resolution: {integrity: sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==} - querystring-es3@0.2.1: - resolution: {integrity: sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==} - engines: {node: '>=0.4.x'} - queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} @@ -11412,12 +11604,6 @@ packages: radix3@1.1.2: resolution: {integrity: sha512-b484I/7b8rDEdSDKckSSBA8knMpcdsXudlE/LNL639wFoHKwLbEkQFZHWEYwDC0wa0FKUcCY+GAF73Z7wxNVFA==} - randombytes@2.1.0: - resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==} - - randomfill@1.0.4: - resolution: {integrity: sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==} - range-parser@1.2.1: resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==} engines: {node: '>= 0.6'} @@ -11426,8 +11612,8 @@ packages: resolution: {integrity: sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==} engines: {node: '>= 0.10'} - rc-config-loader@4.1.3: - resolution: {integrity: sha512-kD7FqML7l800i6pS6pvLyIE2ncbk9Du8Q0gp/4hMPhJU6ZxApkoLcGD8ZeqgiAlfwZ6BlETq6qqe+12DUL207w==} + rc-config-loader@4.1.4: + resolution: {integrity: sha512-3GiwEzklkbXTDp52UR5nT8iXgYAx1V9ZG/kDZT7p60u2GCv2XTwQq4NzinMoMpNtXhmt3WkhYXcj6HH8HdwCEQ==} rc@1.2.8: resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} @@ -11441,29 +11627,26 @@ packages: peerDependencies: typescript: '>= 4.3.x' - react-docgen@8.0.2: - resolution: {integrity: sha512-+NRMYs2DyTP4/tqWz371Oo50JqmWltR1h2gcdgUMAWZJIAvrd0/SqlCfx7tpzpl/s36rzw6qH2MjoNrxtRNYhA==} + react-docgen@8.0.3: + resolution: {integrity: sha512-aEZ9qP+/M+58x2qgfSFEWH1BxLyHe5+qkLNJOZQb5iGS017jpbRnoKhNRrXPeA6RfBrZO5wZrT9DMC1UqE1f1w==} engines: {node: ^20.9.0 || >=22} - react-dom@19.2.3: - resolution: {integrity: sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==} + react-dom@19.2.4: + resolution: {integrity: sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==} peerDependencies: - react: ^19.2.3 + react: ^19.2.4 - react-error-boundary@6.1.0: - resolution: {integrity: sha512-02k9WQ/mUhdbXir0tC1NiMesGzRPaCsJEWU/4bcFrbY1YMZOtHShtZP6zw0SJrBWA/31H0KT9/FgdL8+sPKgHA==} + react-error-boundary@6.1.1: + resolution: {integrity: sha512-BrYwPOdXi5mqkk5lw+Uvt0ThHx32rCt3BkukS4X23A2AIWDPSGX6iaWTc0y9TU/mHDA/6qOSGel+B2ERkOvD1w==} peerDependencies: react: ^18.0.0 || ^19.0.0 - react-hotkeys-hook@5.2.3: - resolution: {integrity: sha512-Q27F8EuImYJOVSXAjSQrQPj9cx4GSNY+WdSdk5tSNN085H8/a00W6LZp0PrytEDwF6iT0pGTJeVEDKPRpEK2Bg==} + react-hotkeys-hook@5.2.4: + resolution: {integrity: sha512-BgKg+A1+TawkYluh5Bo4cTmcgMN5L29uhJbDUQdHwPX+qgXRjIPYU5kIDHyxnAwCkCBiu9V5OpB2mpyeluVF2A==} peerDependencies: react: '>=16.8.0' react-dom: '>=16.8.0' - react-is@16.13.1: - resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} - react-is@17.0.2: resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==} @@ -11479,10 +11662,6 @@ packages: peerDependencies: react: ^17.0.2 - react-refresh@0.17.0: - resolution: {integrity: sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==} - engines: {node: '>=0.10.0'} - react-refresh@0.18.0: resolution: {integrity: sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==} engines: {node: '>=0.10.0'} @@ -11491,8 +11670,8 @@ packages: resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==} engines: {node: '>=0.10.0'} - react@19.2.3: - resolution: {integrity: sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==} + react@19.2.4: + resolution: {integrity: sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==} engines: {node: '>=0.10.0'} read-cmd-shim@4.0.0: @@ -11568,10 +11747,6 @@ packages: resolution: {integrity: sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==} engines: {node: '>=6'} - reflect.getprototypeof@1.0.10: - resolution: {integrity: sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==} - engines: {node: '>= 0.4'} - regex-recursion@6.0.2: resolution: {integrity: sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==} @@ -11593,8 +11768,8 @@ packages: resolution: {integrity: sha512-NZQZdC5wOE/H3UT28fVGL+ikOZcEzfMGk/c3iN9UGxzWHMa1op7274oyiUVrAG4B2EuFhus8SvkaYnhvW92p9Q==} hasBin: true - rehype-expressive-code@0.41.6: - resolution: {integrity: sha512-aBMX8kxPtjmDSFUdZlAWJkMvsQ4ZMASfee90JWIAV8tweltXLzkWC3q++43ToTelI8ac5iC0B3/S/Cl4Ql1y2g==} + rehype-expressive-code@0.41.7: + resolution: {integrity: sha512-25f8ZMSF1d9CMscX7Cft0TSQIqdwjce2gDOvQ+d/w0FovsMwrSt3ODP4P3Z7wO1jsIJ4eYyaDRnIR/27bd/EMQ==} rehype-format@5.0.1: resolution: {integrity: sha512-zvmVru9uB0josBVpr946OR8ui7nJEdzZobwLOOqHb/OOD88W0Vk2SqLwoVOj0fM6IPCCO6TaV9CvQvJMWwukFQ==} @@ -11648,8 +11823,8 @@ packages: remark-stringify@11.0.0: resolution: {integrity: sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==} - rename-overwrite@6.0.3: - resolution: {integrity: sha512-Daqe51STnrCUq/t4dbzCtfNBLElrqVpCtuWK0MuPrzUi6K/13E98y3E8/kzuMZt6IEmghMnF41J0AidrFqjZUA==} + rename-overwrite@6.0.6: + resolution: {integrity: sha512-bSbsw/VyMyDez6NJKxqURBCLRCm98uezWBi03UZCeEFccCNIthC6Jk5JazMjexOTdrYd4q/jIxTIwGtgk1k1gA==} engines: {node: '>=18'} request-light@0.5.8: @@ -11738,33 +11913,34 @@ packages: deprecated: Rimraf versions prior to v4 are no longer supported hasBin: true - rimraf@6.1.2: - resolution: {integrity: sha512-cFCkPslJv7BAXJsYlK1dZsbP8/ZNLkCAQ0bi1hf5EKX2QHegmDFEFA6QhuYJlk7UDdc+02JjO80YSOrWPpw06g==} + rimraf@6.1.3: + resolution: {integrity: sha512-LKg+Cr2ZF61fkcaK1UdkH2yEBBKnYjTyWzTJT6KNPcSPaiT7HSdhtMXQuN5wkTX0Xu72KQ1l8S42rlmexS2hSA==} engines: {node: 20 || >=22} hasBin: true - ripemd160@2.0.3: - resolution: {integrity: sha512-5Di9UC0+8h1L6ZD2d7awM7E/T4uA1fJRlx6zk/NvdCCVEoAnFqvHmCuNeIKoCeIixBX/q8uM+6ycDvF8woqosA==} - engines: {node: '>= 0.8'} - robust-predicates@3.0.2: resolution: {integrity: sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==} - rollup-plugin-visualizer@6.0.5: - resolution: {integrity: sha512-9+HlNgKCVbJDs8tVtjQ43US12eqaiHyyiLMdBwQ7vSZPiHMysGNo2E88TAp1si5wx8NAoYriI2A5kuKfIakmJg==} + rolldown@1.0.0-rc.10: + resolution: {integrity: sha512-q7j6vvarRFmKpgJUT8HCAUljkgzEp4LAhPlJUvQhA5LA1SUL36s5QCysMutErzL3EbNOZOkoziSx9iZC4FddKA==} + engines: {node: ^20.19.0 || >=22.12.0} + hasBin: true + + rollup-plugin-visualizer@6.0.4: + resolution: {integrity: sha512-q8Q7J/6YofkmaGW1sH/fPRAz37x/+pd7VBuaUU7lwvOS/YikuiiEU9jeb9PH8XHiq50XFrUsBbOxeAMYQ7KZkg==} engines: {node: '>=18'} hasBin: true peerDependencies: rolldown: 1.x || ^1.0.0-beta - rollup: 4.49.0 + rollup: 2.x || 3.x || 4.x peerDependenciesMeta: rolldown: optional: true rollup: optional: true - rollup@4.49.0: - resolution: {integrity: sha512-3IVq0cGJ6H7fKXXEdVt+RcYvRCt8beYY9K1760wGQwSAHZcS9eot1zDG5axUbcp/kWRi5zKIIDX8MoKv/TzvZA==} + rollup@4.60.0: + resolution: {integrity: sha512-yqjxruMGBQJ2gG4HtjZtAfXArHomazDHoFwFFmZZl0r7Pdo7qCIXKqKHZc8yeoMgzJJ+pO6pEEHa+V7uzWlrAQ==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true @@ -11812,10 +11988,6 @@ packages: s.color@0.0.15: resolution: {integrity: sha512-AUNrbEUHeKY8XsYr/DYpl+qk5+aM+DChopnWOPEzn8YKzOhv4l2zH6LzZms3tOZP3wwdOyc0RmTciyi46HLIuA==} - safe-array-concat@1.1.3: - resolution: {integrity: sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==} - engines: {node: '>=0.4'} - safe-buffer@5.1.2: resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} @@ -11830,10 +12002,6 @@ packages: resolution: {integrity: sha512-GI3k4zl4aLC3lxZNEEXAxxcXE6E3TfOsJ5xxJPhcAv9MWwnH2O9I0HrDmZFsVnu/C8wzRYSsTHdoVRmL0VicDw==} engines: {node: '>=12'} - safe-push-apply@1.0.0: - resolution: {integrity: sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==} - engines: {node: '>= 0.4'} - safe-regex-test@1.1.0: resolution: {integrity: sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==} engines: {node: '>= 0.4'} @@ -11847,8 +12015,8 @@ packages: sass-formatter@0.7.9: resolution: {integrity: sha512-CWZ8XiSim+fJVG0cFLStwDvft1VI7uvXdCNJYXhDvowiv+DsbD1nXLiQ4zrE5UBvj5DWZJ93cwN0NX5PMsr1Pw==} - sax@1.4.4: - resolution: {integrity: sha512-1n3r/tGXO6b6VXMdFT54SHzT9ytu9yr7TaELowdYpMqY/Ao7EnlQGmAQ1+RatX7Tkkdm6hONI2owqNx2aZj5Sw==} + sax@1.5.0: + resolution: {integrity: sha512-21IYA3Q5cQf089Z6tgaUTr7lDAyzoTPx5HRtbhsME8Udispad8dC/+sziTNugOEx54ilvatQ9YCzl4KQLPcRHA==} engines: {node: '>=11.0.0'} saxes@6.0.0: @@ -11886,8 +12054,8 @@ packages: engines: {node: '>=10'} hasBin: true - semver@7.7.3: - resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==} + semver@7.7.4: + resolution: {integrity: sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==} engines: {node: '>=10'} hasBin: true @@ -11895,9 +12063,6 @@ packages: resolution: {integrity: sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==} engines: {node: '>= 18'} - serialize-javascript@6.0.2: - resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==} - serve-static@2.2.1: resolution: {integrity: sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==} engines: {node: '>= 18'} @@ -11910,10 +12075,6 @@ packages: resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==} engines: {node: '>= 0.4'} - set-proto@1.0.0: - resolution: {integrity: sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==} - engines: {node: '>= 0.4'} - setimmediate@1.0.5: resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==} @@ -11927,11 +12088,6 @@ packages: resolution: {integrity: sha512-JfVoxf4FxQI5qpsPbkHhZo+n6N9YMJobyl4oGEUBb/31oQYlgTjkXQD8PBiafS2UbWoxrTO0Z5PJUBXEPAG1Zw==} engines: {node: '>=16.0.0'} - sha.js@2.4.12: - resolution: {integrity: sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==} - engines: {node: '>= 0.10'} - hasBin: true - shallow-clone@3.0.1: resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==} engines: {node: '>=8'} @@ -11952,8 +12108,12 @@ packages: resolution: {integrity: sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==} engines: {node: '>= 0.4'} - shiki@3.21.0: - resolution: {integrity: sha512-N65B/3bqL/TI2crrXr+4UivctrAGEjmsib5rPMMPpFp1xAx/w03v8WZ9RDDFYteXoEgY7qZ4HGgl5KBIu1153w==} + shiki@3.23.0: + resolution: {integrity: sha512-55Dj73uq9ZXL5zyeRPzHQsK7Nbyt6Y10k5s7OjuFZGMhpp4r/rsLBH0o/0fstIzX1Lep9VxefWljK/SKCzygIA==} + + shiki@4.0.2: + resolution: {integrity: sha512-eAVKTMedR5ckPo4xne/PjYQYrU3qx78gtJZ+sHlXEg5IHhhoQhMfZVzetTYuaJS0L2Ef3AcCRzCHV8T0WI6nIQ==} + engines: {node: '>=20'} shlex@2.1.2: resolution: {integrity: sha512-Nz6gtibMVgYeMEhUjp2KuwAgqaJA1K155dU/HuDaEJUGgnmYfVtVZah+uerVWdH8UGnyahhDCgABbYTbs254+w==} @@ -11998,6 +12158,9 @@ packages: simple-get@4.0.1: resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==} + simple-git@3.33.0: + resolution: {integrity: sha512-D4V/tGC2sjsoNhoMybKyGoE+v8A60hRawKQ1iFRA1zwuDgGZCBJ4ByOzZ5J8joBbi4Oam0qiPH+GhzmSBwbJng==} + sirv@3.0.2: resolution: {integrity: sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==} engines: {node: '>=18'} @@ -12005,9 +12168,9 @@ packages: sisteransi@1.0.5: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} - sitemap@8.0.2: - resolution: {integrity: sha512-LwktpJcyZDoa0IL6KT++lQ53pbSrx2c9ge41/SeLTyqy2XUNA6uR4+P9u5IVo5lPeL2arAcOKn1aZAxoYbCKlQ==} - engines: {node: '>=14.0.0', npm: '>=6.0.0'} + sitemap@9.0.1: + resolution: {integrity: sha512-S6hzjGJSG3d6if0YoF5kTyeRJvia6FSTBroE5fQ0bu1QNxyJqhhinfUsXi9fH3MgtXODWvwo2BDyQSnhPQ88uQ==} + engines: {node: '>=20.19.5', npm: '>=10.8.2'} hasBin: true slash@3.0.0: @@ -12056,10 +12219,6 @@ packages: source-map-support@0.5.21: resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==} - source-map@0.5.7: - resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==} - engines: {node: '>=0.10.0'} - source-map@0.6.1: resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} engines: {node: '>=0.10.0'} @@ -12083,8 +12242,11 @@ packages: spdx-expression-parse@3.0.1: resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==} - spdx-license-ids@3.0.22: - resolution: {integrity: sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==} + spdx-expression-parse@4.0.0: + resolution: {integrity: sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==} + + spdx-license-ids@3.0.23: + resolution: {integrity: sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw==} split2@4.2.0: resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==} @@ -12101,8 +12263,8 @@ packages: resolution: {integrity: sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ==} engines: {node: ^18.17.0 || >=20.5.0} - ssri@13.0.0: - resolution: {integrity: sha512-yizwGBpbCn4YomB2lzhZqrHLJoqFGXihNbib3ozhqF/cIp5ue+xSmOQrjNasEE62hFxsCcg/V/z23t4n8jMEng==} + ssri@13.0.1: + resolution: {integrity: sha512-QUiRf1+u9wPTL/76GTYlKttDEBWV1ga9ZXW8BG6kfdeyyM8LGPix9gROyg9V2+P0xNyF3X2Go526xKFdMZrHSQ==} engines: {node: ^20.17.0 || >=22.9.0} stack-utils@2.0.6: @@ -12126,16 +12288,23 @@ packages: std-env@3.10.0: resolution: {integrity: sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==} + std-env@4.0.0: + resolution: {integrity: sha512-zUMPtQ/HBY3/50VbpkupYHbRroTRZJPRLvreamgErJVys0ceuzMkD44J/QjqhHjOzK42GQ3QZIeFG1OYfOtKqQ==} + stdin-discarder@0.2.2: resolution: {integrity: sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==} engines: {node: '>=18'} + stdin-discarder@0.3.1: + resolution: {integrity: sha512-reExS1kSGoElkextOcPkel4NE99S0BWxjUHQeDFnR8S993JxpPX7KU4MNmO19NXhlJp+8dmdCbKQVNgLJh2teA==} + engines: {node: '>=18'} + stop-iteration-iterator@1.1.0: resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==} engines: {node: '>= 0.4'} - storybook@10.1.11: - resolution: {integrity: sha512-pKP5jXJYM4OjvNklGuHKO53wOCAwfx79KvZyOWHoi9zXUH5WVMFUe/ZfWyxXG/GTcj0maRgHGUjq/0I43r0dDQ==} + storybook@10.3.3: + resolution: {integrity: sha512-tMoRAts9EVqf+mEMPLC6z1DPyHbcPe+CV1MhLN55IKsl0HxNjvVGK44rVPSePbltPE6vIsn4bdRj6CCUt8SJwQ==} hasBin: true peerDependencies: prettier: ^2 || ^3 @@ -12143,12 +12312,6 @@ packages: prettier: optional: true - stream-browserify@3.0.0: - resolution: {integrity: sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==} - - stream-http@3.2.0: - resolution: {integrity: sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==} - stream-replace-string@2.0.0: resolution: {integrity: sha512-TlnjJ1C0QrmxRNrON00JvaFFlNh5TTG00APw23j74ET7gkQpTASi6/L2fuiav8pzK715HXtUeClpBTw2NPSn6w==} @@ -12182,22 +12345,10 @@ packages: resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==} engines: {node: '>=18'} - string-width@8.1.0: - resolution: {integrity: sha512-Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg==} + string-width@8.2.0: + resolution: {integrity: sha512-6hJPQ8N0V0P3SNmP6h2J99RLuzrWz2gvT7VnK5tKvrNqJoyS9W4/Fb8mo31UiPvy00z7DQXkP2hnKBVav76thw==} engines: {node: '>=20'} - string.prototype.trim@1.2.10: - resolution: {integrity: sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==} - engines: {node: '>= 0.4'} - - string.prototype.trimend@1.0.9: - resolution: {integrity: sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==} - engines: {node: '>= 0.4'} - - string.prototype.trimstart@1.0.8: - resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==} - engines: {node: '>= 0.4'} - string_decoder@1.1.1: resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==} @@ -12211,8 +12362,8 @@ packages: resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} engines: {node: '>=8'} - strip-ansi@7.1.2: - resolution: {integrity: sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==} + strip-ansi@7.2.0: + resolution: {integrity: sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==} engines: {node: '>=12'} strip-bom-string@1.0.0: @@ -12258,8 +12409,8 @@ packages: resolution: {integrity: sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==} engines: {node: '>=14.16'} - strnum@2.1.2: - resolution: {integrity: sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ==} + strnum@2.2.0: + resolution: {integrity: sha512-Y7Bj8XyJxnPAORMZj/xltsfo55uOiyHcU2tnAVzHUnSJR/KsEX+9RoDeXEnsXtl/CX4fAcrt64gZ13aGaWPeBg==} structured-source@4.0.0: resolution: {integrity: sha512-qGzRFNJDjFieQkl/sVOI2dUjHKRyL9dAJi2gCPGJLbJHBIkyOHxjuocpIEfbLioX+qSJpvbYdT49/YCdMznKxA==} @@ -12270,9 +12421,6 @@ packages: style-to-object@1.0.14: resolution: {integrity: sha512-LIN7rULI0jBscWQYaSswptyderlarFkjQ+t79nzty8tcIAceVomEVlLzH5VP4Cmsv6MtKhs7qaAiwlcp+Mgaxw==} - stylis@4.2.0: - resolution: {integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==} - stylis@4.3.6: resolution: {integrity: sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==} @@ -12299,13 +12447,13 @@ packages: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} - svgo@4.0.0: - resolution: {integrity: sha512-VvrHQ+9uniE+Mvx3+C9IEe/lWasXCU0nXMY2kZeLrHNICuRiC8uMPyM14UEaMOFA5mhyQqEkB02VoQ16n3DLaw==} + svgo@4.0.1: + resolution: {integrity: sha512-XDpWUOPC6FEibaLzjfe0ucaV0YrOjYotGJO1WpF0Zd+n6ZGEQUsSugaoLq9QkEZtAfQIxT42UChcssDVPP3+/w==} engines: {node: '>=16'} hasBin: true - swagger-ui-dist@5.31.0: - resolution: {integrity: sha512-zSUTIck02fSga6rc0RZP3b7J7wgHXwLea8ZjgLA3Vgnb8QeOl3Wou2/j5QkzSGeoz6HusP/coYuJl33aQxQZpg==} + swagger-ui-dist@5.32.0: + resolution: {integrity: sha512-nKZB0OuDvacB0s/lC2gbge+RigYvGRGpLLMWMFxaTUwfM+CfndVk9Th2IaTinqXiz6Mn26GK2zriCpv6/+5m3Q==} swagger-ui-express@5.0.1: resolution: {integrity: sha512-SrNU3RiBGTLLmFU8GIJdOdanJTl4TOmT27tt3bWWHppqYmAZ6IDuEuBvMU6nZq0zLEe6b/1rACXCgLZqO6ZfrA==} @@ -12321,11 +12469,6 @@ packages: engines: {node: '>=18.12'} hasBin: true - syncpack@13.0.4: - resolution: {integrity: sha512-kJ9VlRxNCsBD5pJAE29oXeBYbPLhEySQmK4HdpsLv81I6fcDDW17xeJqMwiU3H7/woAVsbgq25DJNS8BeiN5+w==} - engines: {node: '>=18.18.0'} - hasBin: true - table-layout@1.0.2: resolution: {integrity: sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A==} engines: {node: '>=8.0.0'} @@ -12340,28 +12483,26 @@ packages: tar-fs@2.1.4: resolution: {integrity: sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==} - tar-fs@3.1.1: - resolution: {integrity: sha512-LZA0oaPOc2fVo82Txf3gw+AkEd38szODlptMYejQUhndHMLQ9M059uXR+AfS7DNo0NpINvSqDsvyaCrBVkptWg==} + tar-fs@3.1.2: + resolution: {integrity: sha512-QGxxTxxyleAdyM3kpFs14ymbYmNFrfY+pHj7Z8FgtbZ7w2//VAgLMac7sT6nRpIHjppXO2AwwEOg0bPFVRcmXw==} tar-stream@2.2.0: resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==} engines: {node: '>=6'} - tar-stream@3.1.7: - resolution: {integrity: sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==} - - tar@6.2.1: - resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==} - engines: {node: '>=10'} - deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me + tar-stream@3.1.8: + resolution: {integrity: sha512-U6QpVRyCGHva435KoNWy9PRoi2IFYCgtEhq9nmrPPpbRacPs9IH4aJ3gbrFC8dPcXvdSZ4XXfXT5Fshbp2MtlQ==} - tar@7.5.4: - resolution: {integrity: sha512-AN04xbWGrSTDmVwlI4/GTlIIwMFk/XEv7uL8aa57zuvRy6s4hdBed+lVq2fAZ89XDa7Us3ANXcE3Tvqvja1kTA==} + tar@7.5.11: + resolution: {integrity: sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==} engines: {node: '>=18'} tau-prolog@0.2.81: resolution: {integrity: sha512-cHSdGumv+GfRweqE3Okd81+ZH1Ux6PoJ+WPjzoAFVar0SRoUxW93vPvWTbnTtlz++IpSEQ0yUPWlLBcTMQ8uOg==} + teex@1.0.1: + resolution: {integrity: sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==} + temp-dir@2.0.0: resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==} engines: {node: '>=8'} @@ -12370,11 +12511,11 @@ packages: resolution: {integrity: sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==} engines: {node: '>=6.0.0'} - temporal-polyfill@0.3.0: - resolution: {integrity: sha512-qNsTkX9K8hi+FHDfHmf22e/OGuXmfBm9RqNismxBrnSmZVJKegQ+HYYXT+R7Ha8F/YSm2Y34vmzD4cxMu2u95g==} + temporal-polyfill@0.3.2: + resolution: {integrity: sha512-TzHthD/heRK947GNiSu3Y5gSPpeUDH34+LESnfsq8bqpFhsB79HFBX8+Z834IVX68P3EUyRPZK5bL/1fh437Eg==} - temporal-spec@0.3.0: - resolution: {integrity: sha512-n+noVpIqz4hYgFSMOSiINNOUOMFtV5cZQNCmmszA6GiVFVRt3G7AqVyhXjhCSmowvQn+NsGn+jMDMKJYHd3bSQ==} + temporal-spec@0.3.1: + resolution: {integrity: sha512-B4TUhezh9knfSIMwt7RVggApDRJZo73uZdj8AacL2mZ8RP5KtLianh2MXxL06GN9ESYiIsiuoLQhgVfwe55Yhw==} tempy@1.0.1: resolution: {integrity: sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w==} @@ -12384,12 +12525,12 @@ packages: resolution: {integrity: sha512-lk+vH+MccxNqgVqSnkMVKx4VLJfnLjDBGzH16JVZjKE2DoxP57s6/vt6JmXV5I3jBcfGrxNrYtC+mPtU7WJztA==} engines: {node: '>=18'} - test-exclude@7.0.1: - resolution: {integrity: sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==} - engines: {node: '>=18'} + test-exclude@8.0.0: + resolution: {integrity: sha512-ZOffsNrXYggvU1mDGHk54I96r26P8SyMjO5slMKSc7+IWmtB/MQKnEC2fP51imB3/pT6YK5cT5E8f+Dd9KdyOQ==} + engines: {node: 20 || >=22} - text-decoder@1.2.3: - resolution: {integrity: sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==} + text-decoder@1.2.7: + resolution: {integrity: sha512-vlLytXkeP4xvEq2otHeJfSQIRyWxo/oZGEbXrtEEF9Hnmrdly59sUbzZ/QgyWuLYHctCHxFF4tRQZNQ9k60ExQ==} text-table@0.2.0: resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} @@ -12401,14 +12542,6 @@ packages: through2@2.0.5: resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==} - tightrope@0.2.0: - resolution: {integrity: sha512-Kw36UHxJEELq2VUqdaSGR2/8cAsPgMtvX8uGVU6Jk26O66PhXec0A5ZnRYs47btbtwPDpXXF66+Fo3vimCM9aQ==} - engines: {node: '>=16'} - - timers-browserify@2.0.12: - resolution: {integrity: sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==} - engines: {node: '>=0.6.0'} - tiny-glob@0.2.9: resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==} @@ -12421,8 +12554,12 @@ packages: tinybench@2.9.0: resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==} - tinyexec@1.0.2: - resolution: {integrity: sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==} + tinyclip@0.1.12: + resolution: {integrity: sha512-Ae3OVUqifDw0wBriIBS7yVaW44Dp6eSHQcyq4Igc7eN2TJH/2YsicswaW+J/OuMvhpDPOKEgpAZCjkb4hpoyeA==} + engines: {node: ^16.14.0 || >= 17.3.0} + + tinyexec@1.0.4: + resolution: {integrity: sha512-u9r3uZC0bdpGOXtlxUIdwf9pkmvhqJdrVCH9fapQtgy/OeTTMZ1nqH7agtvEfmGui6e1XxjcdrlxvxJvc3sMqw==} engines: {node: '>=18'} tinyglobby@0.2.15: @@ -12436,8 +12573,8 @@ packages: resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==} engines: {node: '>=14.0.0'} - tinyrainbow@3.0.3: - resolution: {integrity: sha512-PSkbLUoxOFRzJYjjxHJt9xro7D+iilgMX/C9lawzVuYiIdcihh9DXmVibBe8lmcFrRi/VzlPjBxbN7rH24q8/Q==} + tinyrainbow@3.1.0: + resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==} engines: {node: '>=14.0.0'} tinyspy@4.0.4: @@ -12455,10 +12592,6 @@ packages: resolution: {integrity: sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==} engines: {node: '>=14.14'} - to-buffer@1.2.2: - resolution: {integrity: sha512-db0E3UJjcFhpDhAF4tLo03oli3pwl3dbnzXOUIlRKrp+ldk/VUxzpWYZENsw2SZiuBjHAk7DfB0VU7NKdpb6sw==} - engines: {node: '>= 0.4'} - to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} @@ -12562,9 +12695,6 @@ packages: resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==} engines: {node: '>=6.10'} - ts-toolbelt@9.6.0: - resolution: {integrity: sha512-nsZd8ZeNUzukXPlJmTBwUAuABDe/9qtVDelJeT/qW0ow3ZS3BsQJtNkan1802aM9Uf68/Y8ljw86Hu0h5IUW3w==} - tsconfck@3.1.6: resolution: {integrity: sha512-ks6Vjr/jEw0P1gmOVwutM3B7fWxoWBL2KRDb1JfqGVawBmO5UsvmWOQFGHBPl5yxYz4eERr19E6L7NMv+Fej4w==} engines: {node: ^18 || >=20} @@ -12575,9 +12705,6 @@ packages: typescript: optional: true - tsconfig-paths@3.15.0: - resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==} - tsconfig-paths@4.2.0: resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==} engines: {node: '>=6'} @@ -12594,9 +12721,6 @@ packages: engines: {node: '>=18.0.0'} hasBin: true - tty-browserify@0.0.1: - resolution: {integrity: sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==} - tuf-js@3.1.0: resolution: {integrity: sha512-3T3T04WzowbwV2FDiGXBbr81t64g1MUGGJRgT4x5o97N+8ArdhVCAF9IxFrxuSJmM3E5Asn7nKHkao0ibcZXAg==} engines: {node: ^18.17.0 || >=20.5.0} @@ -12655,36 +12779,20 @@ packages: resolution: {integrity: sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==} engines: {node: '>= 0.6'} - typed-array-buffer@1.0.3: - resolution: {integrity: sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==} - engines: {node: '>= 0.4'} - - typed-array-byte-length@1.0.3: - resolution: {integrity: sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==} - engines: {node: '>= 0.4'} - - typed-array-byte-offset@1.0.4: - resolution: {integrity: sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==} - engines: {node: '>= 0.4'} - - typed-array-length@1.0.7: - resolution: {integrity: sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==} - engines: {node: '>= 0.4'} - typed-rest-client@1.8.11: resolution: {integrity: sha512-5UvfMpd1oelmUPRbbaVnq+rHP7ng2cE4qoQkQeAqxRL6PklkxsM0g32/HL0yfvruK6ojQ5x8EE+HF4YV6DtuCA==} typedarray@0.0.6: resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==} - typedoc-plugin-markdown@4.9.0: - resolution: {integrity: sha512-9Uu4WR9L7ZBgAl60N/h+jqmPxxvnC9nQAlnnO/OujtG2ubjnKTVUFY1XDhcMY+pCqlX3N2HsQM2QTYZIU9tJuw==} + typedoc-plugin-markdown@4.10.0: + resolution: {integrity: sha512-psrg8Rtnv4HPWCsoxId+MzEN8TVK5jeKCnTbnGAbTBqcDapR9hM41bJT/9eAyKn9C2MDG9Qjh3MkltAYuLDoXg==} engines: {node: '>= 18'} peerDependencies: typedoc: 0.28.x - typedoc@0.28.16: - resolution: {integrity: sha512-x4xW77QC3i5DUFMBp0qjukOTnr/sSg+oEs86nB3LjDslvAmwe/PUGDWbe3GrIqt59oTqoXK5GRK9tAa0sYMiog==} + typedoc@0.28.17: + resolution: {integrity: sha512-ZkJ2G7mZrbxrKxinTQMjFqsCoYY6a5Luwv2GKbTnBCEgV2ihYm5CflA9JnJAwH0pZWavqfYxmDkFHPt4yx2oDQ==} engines: {node: '>= 18', pnpm: '>= 10'} hasBin: true peerDependencies: @@ -12696,11 +12804,11 @@ packages: typescript-auto-import-cache@0.3.6: resolution: {integrity: sha512-RpuHXrknHdVdK7wv/8ug3Fr0WNsNi5l5aB8MYYuXhq2UH5lnEB1htJ1smhtD5VeCsGr2p8mUDtd83LCQDFVgjQ==} - typescript-eslint@8.53.1: - resolution: {integrity: sha512-gB+EVQfP5RDElh9ittfXlhZJdjSU4jUSTyE2+ia8CYyNvet4ElfaLlAIqDvQV9JPknKx0jQH1racTYe/4LaLSg==} + typescript-eslint@8.57.0: + resolution: {integrity: sha512-W8GcigEMEeB07xEZol8oJ26rigm3+bfPHxHvwbYUlu1fUDsGuQ7Hiskx5xGW/xM4USc9Ephe3jtv7ZYPQntHeA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - eslint: ^8.57.0 || ^9.0.0 + eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.0.0' typescript@5.8.2: @@ -12737,15 +12845,11 @@ packages: umask@1.1.0: resolution: {integrity: sha512-lE/rxOhmiScJu9L6RTNVgB/zZbF+vGC0/p6D3xnkAePI2o0sMyFG966iR5Ki50OI/0mNi2yaRnxfLsPmEZF/JA==} - unbox-primitive@1.1.0: - resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==} - engines: {node: '>= 0.4'} - uncrypto@0.1.3: resolution: {integrity: sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==} - underscore@1.13.7: - resolution: {integrity: sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==} + underscore@1.13.8: + resolution: {integrity: sha512-DXtD3ZtEQzc7M8m4cXotyHR+FAS18C64asBYY5vqZexfYryNNnDc02W4hKg3rdQuqOYas1jkseX0+nZXjTXnvQ==} undici-types@5.26.5: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} @@ -12753,8 +12857,11 @@ packages: undici-types@7.16.0: resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==} - undici@7.18.2: - resolution: {integrity: sha512-y+8YjDFzWdQlSE9N5nzKMT3g4a5UBX1HKowfdXh0uvAnTaqqwqB92Jt4UXBAeKekDs5IaDKyJFR4X1gYVCgXcw==} + undici-types@7.18.2: + resolution: {integrity: sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==} + + undici@7.24.3: + resolution: {integrity: sha512-eJdUmK/Wrx2d+mnWWmwwLRyA7OQCkLap60sk3dOK4ViZR7DKwwptwuIvFBg2HaiP9ESaEdhtpSymQPvytpmkCA==} engines: {node: '>=20.18.1'} unicorn-magic@0.1.0: @@ -12772,8 +12879,8 @@ packages: unified@11.0.5: resolution: {integrity: sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==} - unifont@0.7.3: - resolution: {integrity: sha512-b0GtQzKCyuSHGsfj5vyN8st7muZ6VCI4XD4vFlr7Uy1rlWVYxC3npnfk8MyreHxJYrz1ooLDqDzFe9XqQTlAhA==} + unifont@0.7.4: + resolution: {integrity: sha512-oHeis4/xl42HUIeHuNZRGEvxj5AaIKR+bHPNegRq5LV1gdc3jundpONbjglKpihmJf+dswygdMJn3eftGIMemg==} unique-filename@4.0.0: resolution: {integrity: sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==} @@ -12831,8 +12938,8 @@ packages: unist-util-visit@1.4.1: resolution: {integrity: sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==} - unist-util-visit@5.0.0: - resolution: {integrity: sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==} + unist-util-visit@5.1.0: + resolution: {integrity: sha512-m+vIdyeCOpdr/QeQCu2EzxX/ohgS8KbnPDgFni4dQsfSCtpz8UqDyY5GjRru8PDKuYn7Fq19j1CQ+nJSsGKOzg==} universal-github-app-jwt@2.2.2: resolution: {integrity: sha512-dcmbeSrOdTnsjGjUfAlqNDJrhxXizjAz94ija9Qw8YkZ1uu0d+GoZzyH+Jb9tIIqvGsadUfwg+22k5aDqqwzbw==} @@ -12929,10 +13036,6 @@ packages: url-join@4.0.1: resolution: {integrity: sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==} - url@0.11.4: - resolution: {integrity: sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==} - engines: {node: '>= 0.4'} - use-sync-external-store@1.6.0: resolution: {integrity: sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==} peerDependencies: @@ -12944,9 +13047,6 @@ packages: util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} - util@0.12.5: - resolution: {integrity: sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==} - uuid@11.1.0: resolution: {integrity: sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==} hasBin: true @@ -12973,10 +13073,6 @@ packages: resolution: {integrity: sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - validate-npm-package-name@6.0.2: - resolution: {integrity: sha512-IUoow1YUtvoBBC06dXs8bR8B9vuA3aJfmQNKMoaPG/OFsPmoQvw8xh+6Ye25Gx9DQhoEom3Pcu9MKHerm/NpUQ==} - engines: {node: ^18.17.0 || >=20.5.0} - validate-npm-package-name@7.0.2: resolution: {integrity: sha512-hVDIBwsRruT73PbK7uP5ebUt+ezEtCmzZz3F59BSr2F6OVFnJ/6h8liuvdLrQ88Xmnk6/+xGGuq+pG9WwTuy3A==} engines: {node: ^20.17.0 || >=22.9.0} @@ -13048,27 +13144,22 @@ packages: vite: optional: true - vite-plugin-node-polyfills@0.25.0: - resolution: {integrity: sha512-rHZ324W3LhfGPxWwQb2N048TThB6nVvnipsqBUJEzh3R9xeK9KI3si+GMQxCuAcpPJBVf0LpDtJ+beYzB3/chg==} - peerDependencies: - vite: ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 - - vite@6.4.1: - resolution: {integrity: sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==} - engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} + vite@7.3.1: + resolution: {integrity: sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==} + engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: - '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 + '@types/node': ^20.19.0 || >=22.12.0 jiti: '>=1.21.0' - less: '*' + less: ^4.0.0 lightningcss: ^1.21.0 - sass: '*' - sass-embedded: '*' - stylus: '*' - sugarss: '*' + sass: ^1.70.0 + sass-embedded: ^1.70.0 + stylus: '>=0.54.8' + sugarss: ^5.0.0 terser: ^5.16.0 tsx: ^4.8.1 - yaml: ^2.4.2 + yaml: '>=2.8.3' peerDependenciesMeta: '@types/node': optional: true @@ -13093,31 +13184,34 @@ packages: yaml: optional: true - vite@7.3.1: - resolution: {integrity: sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==} + vite@8.0.1: + resolution: {integrity: sha512-wt+Z2qIhfFt85uiyRt5LPU4oVEJBXj8hZNWKeqFG4gRG/0RaRGJ7njQCwzFVjO+v4+Ipmf5CY7VdmZRAYYBPHw==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: '@types/node': ^20.19.0 || >=22.12.0 + '@vitejs/devtools': ^0.1.0 + esbuild: ^0.27.0 jiti: '>=1.21.0' less: ^4.0.0 - lightningcss: ^1.21.0 sass: ^1.70.0 sass-embedded: ^1.70.0 stylus: '>=0.54.8' sugarss: ^5.0.0 terser: ^5.16.0 tsx: ^4.8.1 - yaml: ^2.4.2 + yaml: '>=2.8.3' peerDependenciesMeta: '@types/node': optional: true + '@vitejs/devtools': + optional: true + esbuild: + optional: true jiti: optional: true less: optional: true - lightningcss: - optional: true sass: optional: true sass-embedded: @@ -13133,28 +13227,29 @@ packages: yaml: optional: true - vitefu@1.1.1: - resolution: {integrity: sha512-B/Fegf3i8zh0yFbpzZ21amWzHmuNlLlmJT6n7bu5e+pCHUKQIfXSYokrqOBGEMMe9UG2sostKQF9mml/vYaWJQ==} + vitefu@1.1.2: + resolution: {integrity: sha512-zpKATdUbzbsycPFBN71nS2uzBUQiVnFoOrr2rvqv34S1lcAgMKKkjWleLGeiJlZ8lwCXvtWaRn7R3ZC16SYRuw==} peerDependencies: - vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0 + vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-beta.0 peerDependenciesMeta: vite: optional: true - vitest@4.0.17: - resolution: {integrity: sha512-FQMeF0DJdWY0iOnbv466n/0BudNdKj1l5jYgl5JVTwjSsZSlqyXFt/9+1sEyhR6CLowbZpV7O1sCHrzBhucKKg==} + vitest@4.1.0: + resolution: {integrity: sha512-YbDrMF9jM2Lqc++2530UourxZHmkKLxrs4+mYhEwqWS97WJ7wOYEkcr+QfRgJ3PW9wz3odRijLZjHEaRLTNbqw==} engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@opentelemetry/api': ^1.9.0 '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0 - '@vitest/browser-playwright': 4.0.17 - '@vitest/browser-preview': 4.0.17 - '@vitest/browser-webdriverio': 4.0.17 - '@vitest/ui': 4.0.17 + '@vitest/browser-playwright': 4.1.0 + '@vitest/browser-preview': 4.1.0 + '@vitest/browser-webdriverio': 4.1.0 + '@vitest/ui': 4.1.0 happy-dom: '*' jsdom: '*' + vite: ^6.0.0 || ^7.0.0 || ^8.0.0-0 peerDependenciesMeta: '@edge-runtime/vm': optional: true @@ -13175,9 +13270,6 @@ packages: jsdom: optional: true - vm-browserify@1.1.2: - resolution: {integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==} - volar-service-css@0.0.68: resolution: {integrity: sha512-lJSMh6f3QzZ1tdLOZOzovLX0xzAadPhx8EKwraDLPxBndLCYfoTvnNuiFFV8FARrpAlW5C0WkH+TstPaCxr00Q==} peerDependencies: @@ -13237,11 +13329,11 @@ packages: '@volar/language-service': optional: true - vscode-css-languageservice@6.3.9: - resolution: {integrity: sha512-1tLWfp+TDM5ZuVWht3jmaY5y7O6aZmpeXLoHl5bv1QtRsRKt4xYGRMmdJa5Pqx/FTkgRbsna9R+Gn2xE+evVuA==} + vscode-css-languageservice@6.3.10: + resolution: {integrity: sha512-eq5N9Er3fC4vA9zd9EFhyBG90wtCCuXgRSpAndaOgXMh1Wgep5lBgRIeDgjZBW9pa+332yC9+49cZMW8jcL3MA==} - vscode-html-languageservice@5.6.1: - resolution: {integrity: sha512-5Mrqy5CLfFZUgkyhNZLA1Ye5g12Cb/v6VM7SxUzZUaRKWMDz4md+y26PrfRTSU0/eQAl3XpO9m2og+GGtDMuaA==} + vscode-html-languageservice@5.6.2: + resolution: {integrity: sha512-ulCrSnFnfQ16YzvwnYUgEbUEl/ZG7u2eV27YhvLObSHKkb8fw1Z9cgsnUwjTEeDIdJDoTDTDpxuhQwoenoLNMg==} vscode-json-languageservice@4.1.8: resolution: {integrity: sha512-0vSpg6Xd9hfV+eZAaYN63xVVMOTmJ4GgHxXnkLCh+9RsQBkWKIghzLhW2B9ebfG+LQQg8uLtsQ2aUKjTgE+QOg==} @@ -13274,11 +13366,8 @@ packages: vscode-oniguruma@2.0.1: resolution: {integrity: sha512-poJU8iHIWnC3vgphJnrLZyI3YdqRlR27xzqDmpPXYzA93R4Gk8z7T6oqDzDoHjoikA2aS82crdXFkjELCdJsjQ==} - vscode-textmate@9.3.1: - resolution: {integrity: sha512-U19nFkCraZF9/bkQKQYsb9mRqM9NwpToQQFl40nGiioZTH9gRtdtCHwp48cubayVfreX3ivnoxgxQgNwrTVmQg==} - - vscode-uri@3.0.8: - resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==} + vscode-textmate@9.3.2: + resolution: {integrity: sha512-n2uGbUcrjhUEBH16uGA0TvUfhWwliFZ1e3+pTjrkim1Mt7ydB41lV08aUvsi70OlzDWp6X7Bx3w/x3fAXIsN0Q==} vscode-uri@3.1.0: resolution: {integrity: sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==} @@ -13293,8 +13382,8 @@ packages: web-namespaces@2.0.1: resolution: {integrity: sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==} - web-tree-sitter@0.26.3: - resolution: {integrity: sha512-JIVgIKFS1w6lejxSntCtsS/QsE/ecTS00en809cMxMPxaor6MvUnQ+ovG8uTTTvQCFosSh4MeDdI5bSGw5SoBw==} + web-tree-sitter@0.26.7: + resolution: {integrity: sha512-KiZhelTvBA/ziUHEO7Emb75cGVAq8iGZNabYaZm53Zpy50NsXyOW+xSHlwHt5CVg/TRPZBfeVLTTobF0LjFJ1w==} webidl-conversions@7.0.0: resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==} @@ -13324,10 +13413,6 @@ packages: resolution: {integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==} engines: {node: '>= 0.4'} - which-builtin-type@1.2.1: - resolution: {integrity: sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==} - engines: {node: '>= 0.4'} - which-collection@1.0.2: resolution: {integrity: sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==} engines: {node: '>= 0.4'} @@ -13359,8 +13444,8 @@ packages: engines: {node: ^18.17.0 || >=20.5.0} hasBin: true - which@6.0.0: - resolution: {integrity: sha512-f+gEpIKMR9faW/JgAgPK1D7mekkFoqbmiwvNzuhsHetni20QSgzg9Vhn0g2JSJkkfehQnqdUAx7/e15qS1lPxg==} + which@6.0.1: + resolution: {integrity: sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg==} engines: {node: ^20.17.0 || >=22.9.0} hasBin: true @@ -13373,10 +13458,6 @@ packages: resolution: {integrity: sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==} engines: {node: '>=8'} - widest-line@5.0.0: - resolution: {integrity: sha512-c9bZp7b5YtRj2wOe6dlj32MK+Bx/M/d+9VB2SHM1OtsUHR0aV0tdP6DWh/iMt0kWi1t5g1Iudu6hQRNd1A4PVA==} - engines: {node: '>=18'} - word-wrap@1.2.5: resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} engines: {node: '>=0.10.0'} @@ -13385,9 +13466,6 @@ packages: resolution: {integrity: sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA==} engines: {node: '>=8.0.0'} - workerpool@9.3.4: - resolution: {integrity: sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg==} - wrap-ansi@6.2.0: resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} engines: {node: '>=8'} @@ -13498,20 +13576,16 @@ packages: resolution: {integrity: sha512-9F3myNmJzUN/679jycdMxqtydPSDRAarSj3wPiF7pchEPnO9Dg07Oc+gIYLqXR4L+g+FSEVXXv2+mr54StLFOg==} hasBin: true - yaml@1.10.2: - resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} - engines: {node: '>= 6'} - - yaml@2.7.1: - resolution: {integrity: sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==} - engines: {node: '>= 14'} - hasBin: true - yaml@2.8.2: resolution: {integrity: sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==} engines: {node: '>= 14.6'} hasBin: true + yaml@2.8.3: + resolution: {integrity: sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==} + engines: {node: '>= 14.6'} + hasBin: true + yargs-parser@21.1.1: resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} engines: {node: '>=12'} @@ -13520,10 +13594,6 @@ packages: resolution: {integrity: sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==} engines: {node: ^20.19.0 || ^22.12.0 || >=23} - yargs-unparser@2.0.0: - resolution: {integrity: sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==} - engines: {node: '>=10'} - yargs@17.7.2: resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} engines: {node: '>=12'} @@ -13546,10 +13616,6 @@ packages: resolution: {integrity: sha512-4LCcse/U2MHZ63HAJVE+v71o7yOdIe4cZ70Wpf8D/IyjDKYQLV5GD46B+hSTjJsvV5PztjvHoU580EftxjDZFQ==} engines: {node: '>=12.20'} - yocto-spinner@0.2.3: - resolution: {integrity: sha512-sqBChb33loEnkoXte1bLg45bEBsOP9N1kzQh5JZNKj/0rik4zAPTNSAVPj3uQAdc6slYJ0Ksc403G2XgxsJQFQ==} - engines: {node: '>=18.19'} - yoctocolors@2.1.2: resolution: {integrity: sha512-CzhO+pFNo8ajLM2d2IW/R93ipy99LWjtwblvC1RsoSUMZgyLbYFr221TnSNT7GjGdYui6P459mw9JH/g/zW2ug==} engines: {node: '>=18'} @@ -13558,17 +13624,6 @@ packages: resolution: {integrity: sha512-YnOmtSbv4MTf7RGJMK0FvZ+KD8OEe/J5BNnR0GHhD8J/XcG/Qvxgszm0Un6FTHWW4uHlTgP0IztiXQnGyIR45g==} engines: {node: '>=8'} - zod-to-json-schema@3.25.1: - resolution: {integrity: sha512-pM/SU9d3YAggzi6MtR4h7ruuQlqKtad8e9S0fmxcMi+ueAK5Korys/aWcV9LIIHTVbj01NdzxcnXSN+O74ZIVA==} - peerDependencies: - zod: ^3.25 || ^4 - - zod-to-ts@1.2.0: - resolution: {integrity: sha512-x30XE43V+InwGpvTySRNz9kB7qFU8DlyEy7BsSTCHPH1R0QasMmHWZDCzYm6bVXtj/9NNJAZF3jW8rzFvH5OFA==} - peerDependencies: - typescript: ^4.9.4 || ^5.0.2 - zod: ^3 - zod-validation-error@4.0.2: resolution: {integrity: sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ==} engines: {node: '>=18.0.0'} @@ -13578,8 +13633,8 @@ packages: zod@3.25.76: resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==} - zod@4.3.5: - resolution: {integrity: sha512-k7Nwx6vuWx1IJ9Bjuf4Zt1PEllcwe7cls3VNzm4CQ1/hgtFUK2bRNG3rvnpPUhFjmqJKAKtjV576KnUkHocg/g==} + zod@4.3.6: + resolution: {integrity: sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==} zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} @@ -13588,116 +13643,116 @@ snapshots: '@adobe/css-tools@4.4.4': {} - '@algolia/cache-browser-local-storage@4.25.3': + '@algolia/cache-browser-local-storage@4.27.0': dependencies: - '@algolia/cache-common': 4.25.3 + '@algolia/cache-common': 4.27.0 - '@algolia/cache-common@4.25.3': {} + '@algolia/cache-common@4.27.0': {} - '@algolia/cache-in-memory@4.25.3': + '@algolia/cache-in-memory@4.27.0': dependencies: - '@algolia/cache-common': 4.25.3 + '@algolia/cache-common': 4.27.0 - '@algolia/client-account@4.25.3': + '@algolia/client-account@4.27.0': dependencies: - '@algolia/client-common': 4.25.3 - '@algolia/client-search': 4.25.3 - '@algolia/transporter': 4.25.3 + '@algolia/client-common': 4.27.0 + '@algolia/client-search': 4.27.0 + '@algolia/transporter': 4.27.0 - '@algolia/client-analytics@4.25.3': + '@algolia/client-analytics@4.27.0': dependencies: - '@algolia/client-common': 4.25.3 - '@algolia/client-search': 4.25.3 - '@algolia/requester-common': 4.25.3 - '@algolia/transporter': 4.25.3 + '@algolia/client-common': 4.27.0 + '@algolia/client-search': 4.27.0 + '@algolia/requester-common': 4.27.0 + '@algolia/transporter': 4.27.0 - '@algolia/client-common@4.25.3': + '@algolia/client-common@4.27.0': dependencies: - '@algolia/requester-common': 4.25.3 - '@algolia/transporter': 4.25.3 + '@algolia/requester-common': 4.27.0 + '@algolia/transporter': 4.27.0 - '@algolia/client-personalization@4.25.3': + '@algolia/client-personalization@4.27.0': dependencies: - '@algolia/client-common': 4.25.3 - '@algolia/requester-common': 4.25.3 - '@algolia/transporter': 4.25.3 + '@algolia/client-common': 4.27.0 + '@algolia/requester-common': 4.27.0 + '@algolia/transporter': 4.27.0 - '@algolia/client-search@4.25.3': + '@algolia/client-search@4.27.0': dependencies: - '@algolia/client-common': 4.25.3 - '@algolia/requester-common': 4.25.3 - '@algolia/transporter': 4.25.3 + '@algolia/client-common': 4.27.0 + '@algolia/requester-common': 4.27.0 + '@algolia/transporter': 4.27.0 - '@algolia/logger-common@4.25.3': {} + '@algolia/logger-common@4.27.0': {} - '@algolia/logger-console@4.25.3': + '@algolia/logger-console@4.27.0': dependencies: - '@algolia/logger-common': 4.25.3 + '@algolia/logger-common': 4.27.0 - '@algolia/recommend@4.25.3': + '@algolia/recommend@4.27.0': dependencies: - '@algolia/cache-browser-local-storage': 4.25.3 - '@algolia/cache-common': 4.25.3 - '@algolia/cache-in-memory': 4.25.3 - '@algolia/client-common': 4.25.3 - '@algolia/client-search': 4.25.3 - '@algolia/logger-common': 4.25.3 - '@algolia/logger-console': 4.25.3 - '@algolia/requester-browser-xhr': 4.25.3 - '@algolia/requester-common': 4.25.3 - '@algolia/requester-node-http': 4.25.3 - '@algolia/transporter': 4.25.3 + '@algolia/cache-browser-local-storage': 4.27.0 + '@algolia/cache-common': 4.27.0 + '@algolia/cache-in-memory': 4.27.0 + '@algolia/client-common': 4.27.0 + '@algolia/client-search': 4.27.0 + '@algolia/logger-common': 4.27.0 + '@algolia/logger-console': 4.27.0 + '@algolia/requester-browser-xhr': 4.27.0 + '@algolia/requester-common': 4.27.0 + '@algolia/requester-node-http': 4.27.0 + '@algolia/transporter': 4.27.0 - '@algolia/requester-browser-xhr@4.25.3': + '@algolia/requester-browser-xhr@4.27.0': dependencies: - '@algolia/requester-common': 4.25.3 + '@algolia/requester-common': 4.27.0 - '@algolia/requester-common@4.25.3': {} + '@algolia/requester-common@4.27.0': {} - '@algolia/requester-node-http@4.25.3': + '@algolia/requester-node-http@4.27.0': dependencies: - '@algolia/requester-common': 4.25.3 + '@algolia/requester-common': 4.27.0 - '@algolia/transporter@4.25.3': + '@algolia/transporter@4.27.0': dependencies: - '@algolia/cache-common': 4.25.3 - '@algolia/logger-common': 4.25.3 - '@algolia/requester-common': 4.25.3 + '@algolia/cache-common': 4.27.0 + '@algolia/logger-common': 4.27.0 + '@algolia/requester-common': 4.27.0 - '@alloy-js/babel-plugin-jsx-dom-expressions@0.39.1(@babel/core@7.28.6)': + '@alloy-js/babel-plugin-jsx-dom-expressions@0.39.1(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 + '@babel/core': 7.29.0 '@babel/helper-module-imports': 7.27.1 - '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.28.6) - '@babel/types': 7.28.6 + '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0) + '@babel/types': 7.29.0 html-entities: 2.6.0 validate-html-nesting: 1.2.4 transitivePeerDependencies: - supports-color - '@alloy-js/babel-plugin@0.2.1(@babel/core@7.28.6)': + '@alloy-js/babel-plugin@0.2.1(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 - '@babel/generator': 7.28.6 + '@babel/core': 7.29.0 + '@babel/generator': 7.29.1 '@babel/helper-module-imports': 7.27.1 - '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.28.6) - '@babel/types': 7.28.6 + '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0) + '@babel/types': 7.29.0 transitivePeerDependencies: - supports-color - '@alloy-js/babel-preset@0.2.1(@babel/core@7.28.6)': + '@alloy-js/babel-preset@0.2.1(@babel/core@7.29.0)': dependencies: - '@alloy-js/babel-plugin': 0.2.1(@babel/core@7.28.6) - '@alloy-js/babel-plugin-jsx-dom-expressions': 0.39.1(@babel/core@7.28.6) + '@alloy-js/babel-plugin': 0.2.1(@babel/core@7.29.0) + '@alloy-js/babel-plugin-jsx-dom-expressions': 0.39.1(@babel/core@7.29.0) transitivePeerDependencies: - '@babel/core' - supports-color '@alloy-js/cli@0.22.0': dependencies: - '@alloy-js/babel-preset': 0.2.1(@babel/core@7.28.6) - '@babel/core': 7.28.6 - '@babel/preset-typescript': 7.28.5(@babel/core@7.28.6) + '@alloy-js/babel-preset': 0.2.1(@babel/core@7.29.0) + '@babel/core': 7.29.0 + '@babel/preset-typescript': 7.28.5(@babel/core@7.29.0) pathe: 2.0.3 picocolors: 1.1.1 transitivePeerDependencies: @@ -13705,11 +13760,11 @@ snapshots: '@alloy-js/core@0.22.0': dependencies: - '@vue/reactivity': 3.5.27 + '@vue/reactivity': 3.5.30 cli-table3: 0.6.5 pathe: 2.0.3 picocolors: 1.1.1 - prettier: 3.8.0 + prettier: 3.8.1 '@alloy-js/csharp@0.22.0': dependencies: @@ -13722,7 +13777,7 @@ snapshots: '@alloy-js/markdown@0.22.0': dependencies: '@alloy-js/core': 0.22.0 - yaml: 2.8.2 + yaml: 2.8.3 '@alloy-js/msbuild@0.22.0': dependencies: @@ -13737,11 +13792,11 @@ snapshots: change-case: 5.4.4 pathe: 2.0.3 - '@alloy-js/rollup-plugin@0.1.0(@babel/core@7.28.6)(@types/babel__core@7.20.5)(rollup@4.49.0)': + '@alloy-js/rollup-plugin@0.1.0(@babel/core@7.29.0)(@types/babel__core@7.20.5)(rollup@4.60.0)': dependencies: - '@alloy-js/babel-preset': 0.2.1(@babel/core@7.28.6) - '@babel/preset-typescript': 7.28.5(@babel/core@7.28.6) - '@rollup/plugin-babel': 6.1.0(@babel/core@7.28.6)(@types/babel__core@7.20.5)(rollup@4.49.0) + '@alloy-js/babel-preset': 0.2.1(@babel/core@7.29.0) + '@babel/preset-typescript': 7.28.5(@babel/core@7.29.0) + '@rollup/plugin-babel': 6.1.0(@babel/core@7.29.0)(@types/babel__core@7.20.5)(rollup@4.60.0) transitivePeerDependencies: - '@babel/core' - '@types/babel__core' @@ -13757,7 +13812,7 @@ snapshots: '@antfu/install-pkg@1.1.0': dependencies: package-manager-detector: 1.6.0 - tinyexec: 1.0.2 + tinyexec: 1.0.4 '@arcanis/slice-ansi@1.1.1': dependencies: @@ -13771,9 +13826,9 @@ snapshots: '@csstools/css-tokenizer': 3.0.4 lru-cache: 10.4.3 - '@astrojs/check@0.9.6(prettier-plugin-astro@0.14.1)(prettier@3.8.0)(typescript@5.9.3)': + '@astrojs/check@0.9.7(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@5.9.3)': dependencies: - '@astrojs/language-server': 2.16.3(prettier-plugin-astro@0.14.1)(prettier@3.8.0)(typescript@5.9.3) + '@astrojs/language-server': 2.16.4(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@5.9.3) chokidar: 4.0.3 kleur: 4.1.5 typescript: 5.9.3 @@ -13782,44 +13837,47 @@ snapshots: - prettier - prettier-plugin-astro - '@astrojs/compiler@2.13.0': {} + '@astrojs/compiler@2.13.1': {} + + '@astrojs/compiler@3.0.0': {} - '@astrojs/internal-helpers@0.7.5': {} + '@astrojs/internal-helpers@0.8.0': + dependencies: + picomatch: 4.0.3 - '@astrojs/language-server@2.16.3(prettier-plugin-astro@0.14.1)(prettier@3.8.0)(typescript@5.9.3)': + '@astrojs/language-server@2.16.4(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@5.9.3)': dependencies: - '@astrojs/compiler': 2.13.0 - '@astrojs/yaml2ts': 0.2.2 + '@astrojs/compiler': 2.13.1 + '@astrojs/yaml2ts': 0.2.3 '@jridgewell/sourcemap-codec': 1.5.5 - '@volar/kit': 2.4.27(typescript@5.9.3) - '@volar/language-core': 2.4.27 - '@volar/language-server': 2.4.27 - '@volar/language-service': 2.4.27 + '@volar/kit': 2.4.28(typescript@5.9.3) + '@volar/language-core': 2.4.28 + '@volar/language-server': 2.4.28 + '@volar/language-service': 2.4.28 muggle-string: 0.4.1 tinyglobby: 0.2.15 - volar-service-css: 0.0.68(@volar/language-service@2.4.27) - volar-service-emmet: 0.0.68(@volar/language-service@2.4.27) - volar-service-html: 0.0.68(@volar/language-service@2.4.27) - volar-service-prettier: 0.0.68(@volar/language-service@2.4.27)(prettier@3.8.0) - volar-service-typescript: 0.0.68(@volar/language-service@2.4.27) - volar-service-typescript-twoslash-queries: 0.0.68(@volar/language-service@2.4.27) - volar-service-yaml: 0.0.68(@volar/language-service@2.4.27) - vscode-html-languageservice: 5.6.1 + volar-service-css: 0.0.68(@volar/language-service@2.4.28) + volar-service-emmet: 0.0.68(@volar/language-service@2.4.28) + volar-service-html: 0.0.68(@volar/language-service@2.4.28) + volar-service-prettier: 0.0.68(@volar/language-service@2.4.28)(prettier@3.8.1) + volar-service-typescript: 0.0.68(@volar/language-service@2.4.28) + volar-service-typescript-twoslash-queries: 0.0.68(@volar/language-service@2.4.28) + volar-service-yaml: 0.0.68(@volar/language-service@2.4.28) + vscode-html-languageservice: 5.6.2 vscode-uri: 3.1.0 optionalDependencies: - prettier: 3.8.0 + prettier: 3.8.1 prettier-plugin-astro: 0.14.1 transitivePeerDependencies: - typescript - '@astrojs/markdown-remark@6.3.10': + '@astrojs/markdown-remark@7.0.0': dependencies: - '@astrojs/internal-helpers': 0.7.5 - '@astrojs/prism': 3.3.0 + '@astrojs/internal-helpers': 0.8.0 + '@astrojs/prism': 4.0.0 github-slugger: 2.0.0 hast-util-from-html: 2.0.3 hast-util-to-text: 4.0.2 - import-meta-resolve: 4.2.0 js-yaml: 4.1.1 mdast-util-definitions: 6.0.0 rehype-raw: 7.0.0 @@ -13828,23 +13886,23 @@ snapshots: remark-parse: 11.0.0 remark-rehype: 11.1.2 remark-smartypants: 3.0.2 - shiki: 3.21.0 + shiki: 4.0.2 smol-toml: 1.6.0 unified: 11.0.5 unist-util-remove-position: 5.0.0 - unist-util-visit: 5.0.0 + unist-util-visit: 5.1.0 unist-util-visit-parents: 6.0.2 vfile: 6.0.3 transitivePeerDependencies: - supports-color - '@astrojs/mdx@4.3.13(astro@5.16.11(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0)(@types/node@25.0.9)(rollup@4.49.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2))': + '@astrojs/mdx@5.0.0(astro@6.0.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0)(@types/node@25.5.0)(lightningcss@1.32.0)(rollup@4.60.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.3))': dependencies: - '@astrojs/markdown-remark': 6.3.10 + '@astrojs/markdown-remark': 7.0.0 '@mdx-js/mdx': 3.1.1 - acorn: 8.15.0 - astro: 5.16.11(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0)(@types/node@25.0.9)(rollup@4.49.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2) - es-module-lexer: 1.7.0 + acorn: 8.16.0 + astro: 6.0.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0)(@types/node@25.5.0)(lightningcss@1.32.0)(rollup@4.60.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.3) + es-module-lexer: 2.0.0 estree-util-visit: 2.0.0 hast-util-to-html: 9.0.5 piccolore: 0.1.3 @@ -13852,24 +13910,26 @@ snapshots: remark-gfm: 4.0.1 remark-smartypants: 3.0.2 source-map: 0.7.6 - unist-util-visit: 5.0.0 + unist-util-visit: 5.1.0 vfile: 6.0.3 transitivePeerDependencies: - supports-color - '@astrojs/prism@3.3.0': + '@astrojs/prism@4.0.0': dependencies: prismjs: 1.30.0 - '@astrojs/react@4.4.2(@types/node@25.0.9)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(tsx@4.21.0)(yaml@2.8.2)': + '@astrojs/react@5.0.0(@types/node@25.5.0)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(lightningcss@1.32.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(tsx@4.21.0)(yaml@2.8.3)': dependencies: - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@vitejs/plugin-react': 4.7.0(vite@6.4.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@astrojs/internal-helpers': 0.8.0 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + '@vitejs/plugin-react': 5.2.0(vite@7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3)) + devalue: 5.6.4 + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) ultrahtml: 1.6.0 - vite: 6.4.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + vite: 7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3) transitivePeerDependencies: - '@types/node' - jiti @@ -13884,23 +13944,23 @@ snapshots: - tsx - yaml - '@astrojs/sitemap@3.7.0': + '@astrojs/sitemap@3.7.1': dependencies: - sitemap: 8.0.2 + sitemap: 9.0.1 stream-replace-string: 2.0.0 - zod: 3.25.76 + zod: 4.3.6 - '@astrojs/starlight@0.37.3(astro@5.16.11(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0)(@types/node@25.0.9)(rollup@4.49.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2))': + '@astrojs/starlight@0.38.1(astro@6.0.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0)(@types/node@25.5.0)(lightningcss@1.32.0)(rollup@4.60.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.3))': dependencies: - '@astrojs/markdown-remark': 6.3.10 - '@astrojs/mdx': 4.3.13(astro@5.16.11(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0)(@types/node@25.0.9)(rollup@4.49.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)) - '@astrojs/sitemap': 3.7.0 + '@astrojs/markdown-remark': 7.0.0 + '@astrojs/mdx': 5.0.0(astro@6.0.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0)(@types/node@25.5.0)(lightningcss@1.32.0)(rollup@4.60.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.3)) + '@astrojs/sitemap': 3.7.1 '@pagefind/default-ui': 1.4.0 '@types/hast': 3.0.4 '@types/js-yaml': 4.0.9 '@types/mdast': 4.0.4 - astro: 5.16.11(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0)(@types/node@25.0.9)(rollup@4.49.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2) - astro-expressive-code: 0.41.6(astro@5.16.11(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0)(@types/node@25.0.9)(rollup@4.49.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)) + astro: 6.0.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0)(@types/node@25.5.0)(lightningcss@1.32.0)(rollup@4.60.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.3) + astro-expressive-code: 0.41.7(astro@6.0.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0)(@types/node@25.5.0)(lightningcss@1.32.0)(rollup@4.60.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.3)) bcp-47: 2.1.0 hast-util-from-html: 2.0.3 hast-util-select: 6.0.4 @@ -13919,26 +13979,26 @@ snapshots: remark-directive: 3.0.1 ultrahtml: 1.6.0 unified: 11.0.5 - unist-util-visit: 5.0.0 + unist-util-visit: 5.1.0 vfile: 6.0.3 transitivePeerDependencies: - supports-color '@astrojs/telemetry@3.3.0': dependencies: - ci-info: 4.3.1 - debug: 4.4.3(supports-color@8.1.1) + ci-info: 4.4.0 + debug: 4.4.3 dlv: 1.1.3 dset: 3.1.4 is-docker: 3.0.0 - is-wsl: 3.1.0 + is-wsl: 3.1.1 which-pm-runs: 1.1.0 transitivePeerDependencies: - supports-color - '@astrojs/yaml2ts@0.2.2': + '@astrojs/yaml2ts@0.2.3': dependencies: - yaml: 2.8.2 + yaml: 2.8.3 '@azu/format-text@1.0.2': {} @@ -13962,7 +14022,7 @@ snapshots: dependencies: '@azure/abort-controller': 2.1.2 '@azure/core-auth': 1.10.1 - '@azure/core-rest-pipeline': 1.22.2 + '@azure/core-rest-pipeline': 1.23.0 '@azure/core-tracing': 1.3.1 '@azure/core-util': 1.13.1 '@azure/logger': 1.3.0 @@ -13970,13 +14030,11 @@ snapshots: transitivePeerDependencies: - supports-color - '@azure/core-http-compat@2.3.1': + '@azure/core-http-compat@2.3.2(@azure/core-client@1.10.1)(@azure/core-rest-pipeline@1.23.0)': dependencies: '@azure/abort-controller': 2.1.2 '@azure/core-client': 1.10.1 - '@azure/core-rest-pipeline': 1.22.2 - transitivePeerDependencies: - - supports-color + '@azure/core-rest-pipeline': 1.23.0 '@azure/core-lro@2.7.2': dependencies: @@ -13991,14 +14049,14 @@ snapshots: dependencies: tslib: 2.8.1 - '@azure/core-rest-pipeline@1.22.2': + '@azure/core-rest-pipeline@1.23.0': dependencies: '@azure/abort-controller': 2.1.2 '@azure/core-auth': 1.10.1 '@azure/core-tracing': 1.3.1 '@azure/core-util': 1.13.1 '@azure/logger': 1.3.0 - '@typespec/ts-http-runtime': 0.3.2 + '@typespec/ts-http-runtime': 0.3.4 tslib: 2.8.1 transitivePeerDependencies: - supports-color @@ -14010,14 +14068,14 @@ snapshots: '@azure/core-util@1.13.1': dependencies: '@azure/abort-controller': 2.1.2 - '@typespec/ts-http-runtime': 0.3.2 + '@typespec/ts-http-runtime': 0.3.4 tslib: 2.8.1 transitivePeerDependencies: - supports-color '@azure/core-xml@1.5.0': dependencies: - fast-xml-parser: 5.3.3 + fast-xml-parser: 5.5.5 tslib: 2.8.1 '@azure/identity@4.13.0': @@ -14025,12 +14083,12 @@ snapshots: '@azure/abort-controller': 2.1.2 '@azure/core-auth': 1.10.1 '@azure/core-client': 1.10.1 - '@azure/core-rest-pipeline': 1.22.2 + '@azure/core-rest-pipeline': 1.23.0 '@azure/core-tracing': 1.3.1 '@azure/core-util': 1.13.1 '@azure/logger': 1.3.0 - '@azure/msal-browser': 4.28.1 - '@azure/msal-node': 3.8.6 + '@azure/msal-browser': 4.29.1 + '@azure/msal-node': 3.8.9 open: 10.2.0 tslib: 2.8.1 transitivePeerDependencies: @@ -14038,117 +14096,118 @@ snapshots: '@azure/logger@1.3.0': dependencies: - '@typespec/ts-http-runtime': 0.3.2 + '@typespec/ts-http-runtime': 0.3.4 tslib: 2.8.1 transitivePeerDependencies: - supports-color - '@azure/msal-browser@4.28.1': + '@azure/msal-browser@4.29.1': dependencies: - '@azure/msal-common': 15.14.1 + '@azure/msal-common': 15.16.1 - '@azure/msal-common@15.14.1': {} + '@azure/msal-common@15.16.1': {} - '@azure/msal-node@3.8.6': + '@azure/msal-node@3.8.9': dependencies: - '@azure/msal-common': 15.14.1 + '@azure/msal-common': 15.16.1 jsonwebtoken: 9.0.3 uuid: 8.3.2 - '@azure/storage-blob@12.30.0': + '@azure/storage-blob@12.31.0': dependencies: '@azure/abort-controller': 2.1.2 '@azure/core-auth': 1.10.1 '@azure/core-client': 1.10.1 - '@azure/core-http-compat': 2.3.1 + '@azure/core-http-compat': 2.3.2(@azure/core-client@1.10.1)(@azure/core-rest-pipeline@1.23.0) '@azure/core-lro': 2.7.2 '@azure/core-paging': 1.6.2 - '@azure/core-rest-pipeline': 1.22.2 + '@azure/core-rest-pipeline': 1.23.0 '@azure/core-tracing': 1.3.1 '@azure/core-util': 1.13.1 '@azure/core-xml': 1.5.0 '@azure/logger': 1.3.0 - '@azure/storage-common': 12.2.0 + '@azure/storage-common': 12.3.0(@azure/core-client@1.10.1) events: 3.3.0 tslib: 2.8.1 transitivePeerDependencies: - supports-color - '@azure/storage-common@12.2.0': + '@azure/storage-common@12.3.0(@azure/core-client@1.10.1)': dependencies: '@azure/abort-controller': 2.1.2 '@azure/core-auth': 1.10.1 - '@azure/core-http-compat': 2.3.1 - '@azure/core-rest-pipeline': 1.22.2 + '@azure/core-http-compat': 2.3.2(@azure/core-client@1.10.1)(@azure/core-rest-pipeline@1.23.0) + '@azure/core-rest-pipeline': 1.23.0 '@azure/core-tracing': 1.3.1 '@azure/core-util': 1.13.1 '@azure/logger': 1.3.0 events: 3.3.0 tslib: 2.8.1 transitivePeerDependencies: + - '@azure/core-client' - supports-color '@babel/code-frame@7.12.11': dependencies: '@babel/highlight': 7.25.9 - '@babel/code-frame@7.28.6': + '@babel/code-frame@7.29.0': dependencies: '@babel/helper-validator-identifier': 7.28.5 js-tokens: 4.0.0 picocolors: 1.1.1 - '@babel/compat-data@7.28.6': {} + '@babel/compat-data@7.29.0': {} - '@babel/core@7.28.6': + '@babel/core@7.29.0': dependencies: - '@babel/code-frame': 7.28.6 - '@babel/generator': 7.28.6 + '@babel/code-frame': 7.29.0 + '@babel/generator': 7.29.1 '@babel/helper-compilation-targets': 7.28.6 - '@babel/helper-module-transforms': 7.28.6(@babel/core@7.28.6) + '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0) '@babel/helpers': 7.28.6 - '@babel/parser': 7.28.6 + '@babel/parser': 7.29.0 '@babel/template': 7.28.6 - '@babel/traverse': 7.28.6 - '@babel/types': 7.28.6 + '@babel/traverse': 7.29.0 + '@babel/types': 7.29.0 '@jridgewell/remapping': 2.3.5 convert-source-map: 2.0.0 - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 transitivePeerDependencies: - supports-color - '@babel/generator@7.28.6': + '@babel/generator@7.29.1': dependencies: - '@babel/parser': 7.28.6 - '@babel/types': 7.28.6 + '@babel/parser': 7.29.0 + '@babel/types': 7.29.0 '@jridgewell/gen-mapping': 0.3.13 '@jridgewell/trace-mapping': 0.3.31 jsesc: 3.1.0 '@babel/helper-annotate-as-pure@7.27.3': dependencies: - '@babel/types': 7.28.6 + '@babel/types': 7.29.0 '@babel/helper-compilation-targets@7.28.6': dependencies: - '@babel/compat-data': 7.28.6 + '@babel/compat-data': 7.29.0 '@babel/helper-validator-option': 7.27.1 browserslist: 4.28.1 lru-cache: 5.1.1 semver: 6.3.1 - '@babel/helper-create-class-features-plugin@7.28.6(@babel/core@7.28.6)': + '@babel/helper-create-class-features-plugin@7.28.6(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 + '@babel/core': 7.29.0 '@babel/helper-annotate-as-pure': 7.27.3 '@babel/helper-member-expression-to-functions': 7.28.5 '@babel/helper-optimise-call-expression': 7.27.1 - '@babel/helper-replace-supers': 7.28.6(@babel/core@7.28.6) + '@babel/helper-replace-supers': 7.28.6(@babel/core@7.29.0) '@babel/helper-skip-transparent-expression-wrappers': 7.27.1 - '@babel/traverse': 7.28.6 + '@babel/traverse': 7.29.0 semver: 6.3.1 transitivePeerDependencies: - supports-color @@ -14157,53 +14216,53 @@ snapshots: '@babel/helper-member-expression-to-functions@7.28.5': dependencies: - '@babel/traverse': 7.28.6 - '@babel/types': 7.28.6 + '@babel/traverse': 7.29.0 + '@babel/types': 7.29.0 transitivePeerDependencies: - supports-color '@babel/helper-module-imports@7.27.1': dependencies: - '@babel/traverse': 7.28.6 - '@babel/types': 7.28.6 + '@babel/traverse': 7.29.0 + '@babel/types': 7.29.0 transitivePeerDependencies: - supports-color '@babel/helper-module-imports@7.28.6': dependencies: - '@babel/traverse': 7.28.6 - '@babel/types': 7.28.6 + '@babel/traverse': 7.29.0 + '@babel/types': 7.29.0 transitivePeerDependencies: - supports-color - '@babel/helper-module-transforms@7.28.6(@babel/core@7.28.6)': + '@babel/helper-module-transforms@7.28.6(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 + '@babel/core': 7.29.0 '@babel/helper-module-imports': 7.28.6 '@babel/helper-validator-identifier': 7.28.5 - '@babel/traverse': 7.28.6 + '@babel/traverse': 7.29.0 transitivePeerDependencies: - supports-color '@babel/helper-optimise-call-expression@7.27.1': dependencies: - '@babel/types': 7.28.6 + '@babel/types': 7.29.0 '@babel/helper-plugin-utils@7.28.6': {} - '@babel/helper-replace-supers@7.28.6(@babel/core@7.28.6)': + '@babel/helper-replace-supers@7.28.6(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 + '@babel/core': 7.29.0 '@babel/helper-member-expression-to-functions': 7.28.5 '@babel/helper-optimise-call-expression': 7.27.1 - '@babel/traverse': 7.28.6 + '@babel/traverse': 7.29.0 transitivePeerDependencies: - supports-color '@babel/helper-skip-transparent-expression-wrappers@7.27.1': dependencies: - '@babel/traverse': 7.28.6 - '@babel/types': 7.28.6 + '@babel/traverse': 7.29.0 + '@babel/types': 7.29.0 transitivePeerDependencies: - supports-color @@ -14216,7 +14275,7 @@ snapshots: '@babel/helpers@7.28.6': dependencies: '@babel/template': 7.28.6 - '@babel/types': 7.28.6 + '@babel/types': 7.29.0 '@babel/highlight@7.25.9': dependencies: @@ -14225,110 +14284,110 @@ snapshots: js-tokens: 4.0.0 picocolors: 1.1.1 - '@babel/parser@7.28.6': + '@babel/parser@7.29.0': dependencies: - '@babel/types': 7.28.6 + '@babel/types': 7.29.0 - '@babel/plugin-syntax-flow@7.28.6(@babel/core@7.28.6)': + '@babel/plugin-syntax-flow@7.28.6(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 + '@babel/core': 7.29.0 '@babel/helper-plugin-utils': 7.28.6 - '@babel/plugin-syntax-jsx@7.28.6(@babel/core@7.28.6)': + '@babel/plugin-syntax-jsx@7.28.6(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 + '@babel/core': 7.29.0 '@babel/helper-plugin-utils': 7.28.6 - '@babel/plugin-syntax-typescript@7.28.6(@babel/core@7.28.6)': + '@babel/plugin-syntax-typescript@7.28.6(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 + '@babel/core': 7.29.0 '@babel/helper-plugin-utils': 7.28.6 - '@babel/plugin-transform-class-properties@7.28.6(@babel/core@7.28.6)': + '@babel/plugin-transform-class-properties@7.28.6(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 - '@babel/helper-create-class-features-plugin': 7.28.6(@babel/core@7.28.6) + '@babel/core': 7.29.0 + '@babel/helper-create-class-features-plugin': 7.28.6(@babel/core@7.29.0) '@babel/helper-plugin-utils': 7.28.6 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-flow-strip-types@7.27.1(@babel/core@7.28.6)': + '@babel/plugin-transform-flow-strip-types@7.27.1(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 + '@babel/core': 7.29.0 '@babel/helper-plugin-utils': 7.28.6 - '@babel/plugin-syntax-flow': 7.28.6(@babel/core@7.28.6) + '@babel/plugin-syntax-flow': 7.28.6(@babel/core@7.29.0) - '@babel/plugin-transform-modules-commonjs@7.28.6(@babel/core@7.28.6)': + '@babel/plugin-transform-modules-commonjs@7.28.6(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 - '@babel/helper-module-transforms': 7.28.6(@babel/core@7.28.6) + '@babel/core': 7.29.0 + '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0) '@babel/helper-plugin-utils': 7.28.6 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-nullish-coalescing-operator@7.28.6(@babel/core@7.28.6)': + '@babel/plugin-transform-nullish-coalescing-operator@7.28.6(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 + '@babel/core': 7.29.0 '@babel/helper-plugin-utils': 7.28.6 - '@babel/plugin-transform-optional-chaining@7.28.6(@babel/core@7.28.6)': + '@babel/plugin-transform-optional-chaining@7.28.6(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 + '@babel/core': 7.29.0 '@babel/helper-plugin-utils': 7.28.6 '@babel/helper-skip-transparent-expression-wrappers': 7.27.1 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-private-methods@7.28.6(@babel/core@7.28.6)': + '@babel/plugin-transform-private-methods@7.28.6(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 - '@babel/helper-create-class-features-plugin': 7.28.6(@babel/core@7.28.6) + '@babel/core': 7.29.0 + '@babel/helper-create-class-features-plugin': 7.28.6(@babel/core@7.29.0) '@babel/helper-plugin-utils': 7.28.6 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.28.6)': + '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 + '@babel/core': 7.29.0 '@babel/helper-plugin-utils': 7.28.6 - '@babel/plugin-transform-react-jsx-source@7.27.1(@babel/core@7.28.6)': + '@babel/plugin-transform-react-jsx-source@7.27.1(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 + '@babel/core': 7.29.0 '@babel/helper-plugin-utils': 7.28.6 - '@babel/plugin-transform-typescript@7.28.6(@babel/core@7.28.6)': + '@babel/plugin-transform-typescript@7.28.6(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 + '@babel/core': 7.29.0 '@babel/helper-annotate-as-pure': 7.27.3 - '@babel/helper-create-class-features-plugin': 7.28.6(@babel/core@7.28.6) + '@babel/helper-create-class-features-plugin': 7.28.6(@babel/core@7.29.0) '@babel/helper-plugin-utils': 7.28.6 '@babel/helper-skip-transparent-expression-wrappers': 7.27.1 - '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.28.6) + '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.0) transitivePeerDependencies: - supports-color - '@babel/preset-flow@7.27.1(@babel/core@7.28.6)': + '@babel/preset-flow@7.27.1(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 + '@babel/core': 7.29.0 '@babel/helper-plugin-utils': 7.28.6 '@babel/helper-validator-option': 7.27.1 - '@babel/plugin-transform-flow-strip-types': 7.27.1(@babel/core@7.28.6) + '@babel/plugin-transform-flow-strip-types': 7.27.1(@babel/core@7.29.0) - '@babel/preset-typescript@7.28.5(@babel/core@7.28.6)': + '@babel/preset-typescript@7.28.5(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 + '@babel/core': 7.29.0 '@babel/helper-plugin-utils': 7.28.6 '@babel/helper-validator-option': 7.27.1 - '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.28.6) - '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.28.6) - '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.28.6) + '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0) + '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.0) + '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.0) transitivePeerDependencies: - supports-color - '@babel/register@7.28.6(@babel/core@7.28.6)': + '@babel/register@7.28.6(@babel/core@7.29.0)': dependencies: - '@babel/core': 7.28.6 + '@babel/core': 7.29.0 clone-deep: 4.0.1 find-cache-dir: 2.1.0 make-dir: 2.1.0 @@ -14339,83 +14398,84 @@ snapshots: '@babel/template@7.28.6': dependencies: - '@babel/code-frame': 7.28.6 - '@babel/parser': 7.28.6 - '@babel/types': 7.28.6 + '@babel/code-frame': 7.29.0 + '@babel/parser': 7.29.0 + '@babel/types': 7.29.0 - '@babel/traverse@7.28.6': + '@babel/traverse@7.29.0': dependencies: - '@babel/code-frame': 7.28.6 - '@babel/generator': 7.28.6 + '@babel/code-frame': 7.29.0 + '@babel/generator': 7.29.1 '@babel/helper-globals': 7.28.0 - '@babel/parser': 7.28.6 + '@babel/parser': 7.29.0 '@babel/template': 7.28.6 - '@babel/types': 7.28.6 - debug: 4.4.3(supports-color@8.1.1) + '@babel/types': 7.29.0 + debug: 4.4.3 transitivePeerDependencies: - supports-color - '@babel/types@7.28.6': + '@babel/types@7.29.0': dependencies: '@babel/helper-string-parser': 7.27.1 '@babel/helper-validator-identifier': 7.28.5 '@bcoe/v8-coverage@1.0.2': {} - '@braintree/sanitize-url@7.1.1': {} + '@braintree/sanitize-url@7.1.2': {} '@capsizecss/unpack@4.0.0': dependencies: - fontkitten: 1.0.2 + fontkitten: 1.0.3 - '@chevrotain/cst-dts-gen@11.0.3': + '@chevrotain/cst-dts-gen@11.1.2': dependencies: - '@chevrotain/gast': 11.0.3 - '@chevrotain/types': 11.0.3 - lodash-es: 4.17.21 + '@chevrotain/gast': 11.1.2 + '@chevrotain/types': 11.1.2 + lodash-es: 4.17.23 - '@chevrotain/gast@11.0.3': + '@chevrotain/gast@11.1.2': dependencies: - '@chevrotain/types': 11.0.3 - lodash-es: 4.17.21 + '@chevrotain/types': 11.1.2 + lodash-es: 4.17.23 - '@chevrotain/regexp-to-ast@11.0.3': {} + '@chevrotain/regexp-to-ast@11.1.2': {} - '@chevrotain/types@11.0.3': {} + '@chevrotain/types@11.1.2': {} - '@chevrotain/utils@11.0.3': {} + '@chevrotain/utils@11.1.2': {} - '@chronus/chronus@1.1.0': + '@chronus/chronus@1.3.1': dependencies: cross-spawn: 7.0.6 - globby: 14.1.0 + globby: 16.1.1 is-unicode-supported: 2.1.0 micromatch: 4.0.8 - pacote: 21.0.4 + pacote: 21.5.0 picocolors: 1.1.1 pluralize: 8.0.0 prompts: 2.4.2 - semver: 7.7.3 + semver: 7.7.4 + smol-toml: 1.6.0 source-map-support: 0.5.21 std-env: 3.10.0 - yaml: 2.8.2 + yaml: 2.8.3 yargs: 18.0.0 - zod: 3.25.76 + zod: 4.3.6 transitivePeerDependencies: - supports-color - '@chronus/github-pr-commenter@1.0.3': + '@chronus/github-pr-commenter@1.0.6': dependencies: - '@chronus/github': 1.0.3 - '@octokit/rest': 21.1.1 + '@chronus/github': 1.0.6 + '@octokit/rest': 22.0.1 transitivePeerDependencies: - supports-color - '@chronus/github@1.0.3': + '@chronus/github@1.0.6': dependencies: - '@chronus/chronus': 1.1.0 + '@chronus/chronus': 1.3.1 '@octokit/graphql': 9.0.3 - '@octokit/rest': 21.1.1 + '@octokit/rest': 22.0.1 cross-spawn: 7.0.6 octokit: 5.0.5 picocolors: 1.1.1 @@ -14423,63 +14483,72 @@ snapshots: transitivePeerDependencies: - supports-color + '@clack/core@1.1.0': + dependencies: + sisteransi: 1.0.5 + + '@clack/prompts@1.1.0': + dependencies: + '@clack/core': 1.1.0 + sisteransi: 1.0.5 + '@colors/colors@1.5.0': optional: true - '@cspell/cspell-bundled-dicts@9.6.0': + '@cspell/cspell-bundled-dicts@9.7.0': dependencies: '@cspell/dict-ada': 4.1.1 '@cspell/dict-al': 1.1.1 '@cspell/dict-aws': 4.0.17 '@cspell/dict-bash': 4.2.2 - '@cspell/dict-companies': 3.2.10 + '@cspell/dict-companies': 3.2.11 '@cspell/dict-cpp': 7.0.2 '@cspell/dict-cryptocurrencies': 5.0.5 '@cspell/dict-csharp': 4.0.8 - '@cspell/dict-css': 4.0.19 + '@cspell/dict-css': 4.1.1 '@cspell/dict-dart': 2.3.2 '@cspell/dict-data-science': 2.0.13 '@cspell/dict-django': 4.1.6 '@cspell/dict-docker': 1.1.17 - '@cspell/dict-dotnet': 5.0.11 + '@cspell/dict-dotnet': 5.0.12 '@cspell/dict-elixir': 4.0.8 - '@cspell/dict-en-common-misspellings': 2.1.11 - '@cspell/dict-en-gb-mit': 3.1.16 - '@cspell/dict-en_us': 4.4.27 - '@cspell/dict-filetypes': 3.0.15 + '@cspell/dict-en-common-misspellings': 2.1.12 + '@cspell/dict-en-gb-mit': 3.1.20 + '@cspell/dict-en_us': 4.4.31 + '@cspell/dict-filetypes': 3.0.17 '@cspell/dict-flutter': 1.1.1 - '@cspell/dict-fonts': 4.0.5 + '@cspell/dict-fonts': 4.0.6 '@cspell/dict-fsharp': 1.1.1 - '@cspell/dict-fullstack': 3.2.7 + '@cspell/dict-fullstack': 3.2.8 '@cspell/dict-gaming-terms': 1.1.2 - '@cspell/dict-git': 3.0.7 + '@cspell/dict-git': 3.1.0 '@cspell/dict-golang': 6.0.26 '@cspell/dict-google': 1.0.9 '@cspell/dict-haskell': 4.0.6 - '@cspell/dict-html': 4.0.14 + '@cspell/dict-html': 4.0.15 '@cspell/dict-html-symbol-entities': 4.0.5 '@cspell/dict-java': 5.0.12 '@cspell/dict-julia': 1.1.1 '@cspell/dict-k8s': 1.0.12 '@cspell/dict-kotlin': 1.1.1 - '@cspell/dict-latex': 4.0.4 + '@cspell/dict-latex': 5.1.0 '@cspell/dict-lorem-ipsum': 4.0.5 '@cspell/dict-lua': 4.0.8 '@cspell/dict-makefile': 1.0.5 - '@cspell/dict-markdown': 2.0.14(@cspell/dict-css@4.0.19)(@cspell/dict-html-symbol-entities@4.0.5)(@cspell/dict-html@4.0.14)(@cspell/dict-typescript@3.2.3) + '@cspell/dict-markdown': 2.0.16(@cspell/dict-css@4.1.1)(@cspell/dict-html-symbol-entities@4.0.5)(@cspell/dict-html@4.0.15)(@cspell/dict-typescript@3.2.3) '@cspell/dict-monkeyc': 1.0.12 - '@cspell/dict-node': 5.0.8 - '@cspell/dict-npm': 5.2.29 + '@cspell/dict-node': 5.0.9 + '@cspell/dict-npm': 5.2.37 '@cspell/dict-php': 4.1.1 '@cspell/dict-powershell': 5.0.15 - '@cspell/dict-public-licenses': 2.0.15 + '@cspell/dict-public-licenses': 2.0.16 '@cspell/dict-python': 4.2.25 '@cspell/dict-r': 2.1.1 - '@cspell/dict-ruby': 5.1.0 - '@cspell/dict-rust': 4.1.1 + '@cspell/dict-ruby': 5.1.1 + '@cspell/dict-rust': 4.1.2 '@cspell/dict-scala': 5.0.9 '@cspell/dict-shell': 1.1.2 - '@cspell/dict-software-terms': 5.1.20 + '@cspell/dict-software-terms': 5.2.0 '@cspell/dict-sql': 2.2.1 '@cspell/dict-svelte': 1.0.7 '@cspell/dict-swift': 2.0.6 @@ -14488,19 +14557,25 @@ snapshots: '@cspell/dict-vue': 3.0.5 '@cspell/dict-zig': 1.0.0 - '@cspell/cspell-json-reporter@9.6.0': + '@cspell/cspell-json-reporter@9.7.0': dependencies: - '@cspell/cspell-types': 9.6.0 + '@cspell/cspell-types': 9.7.0 + + '@cspell/cspell-performance-monitor@9.7.0': {} - '@cspell/cspell-pipe@9.6.0': {} + '@cspell/cspell-pipe@9.7.0': {} - '@cspell/cspell-resolver@9.6.0': + '@cspell/cspell-resolver@9.7.0': dependencies: - global-directory: 4.0.1 + global-directory: 5.0.0 - '@cspell/cspell-service-bus@9.6.0': {} + '@cspell/cspell-service-bus@9.7.0': {} - '@cspell/cspell-types@9.6.0': {} + '@cspell/cspell-types@9.7.0': {} + + '@cspell/cspell-worker@9.7.0': + dependencies: + cspell-lib: 9.7.0 '@cspell/dict-ada@4.1.1': {} @@ -14512,7 +14587,7 @@ snapshots: dependencies: '@cspell/dict-shell': 1.1.2 - '@cspell/dict-companies@3.2.10': {} + '@cspell/dict-companies@3.2.11': {} '@cspell/dict-cpp@7.0.2': {} @@ -14520,7 +14595,7 @@ snapshots: '@cspell/dict-csharp@4.0.8': {} - '@cspell/dict-css@4.0.19': {} + '@cspell/dict-css@4.1.1': {} '@cspell/dict-dart@2.3.2': {} @@ -14530,29 +14605,29 @@ snapshots: '@cspell/dict-docker@1.1.17': {} - '@cspell/dict-dotnet@5.0.11': {} + '@cspell/dict-dotnet@5.0.12': {} '@cspell/dict-elixir@4.0.8': {} - '@cspell/dict-en-common-misspellings@2.1.11': {} + '@cspell/dict-en-common-misspellings@2.1.12': {} - '@cspell/dict-en-gb-mit@3.1.16': {} + '@cspell/dict-en-gb-mit@3.1.20': {} - '@cspell/dict-en_us@4.4.27': {} + '@cspell/dict-en_us@4.4.31': {} - '@cspell/dict-filetypes@3.0.15': {} + '@cspell/dict-filetypes@3.0.17': {} '@cspell/dict-flutter@1.1.1': {} - '@cspell/dict-fonts@4.0.5': {} + '@cspell/dict-fonts@4.0.6': {} '@cspell/dict-fsharp@1.1.1': {} - '@cspell/dict-fullstack@3.2.7': {} + '@cspell/dict-fullstack@3.2.8': {} '@cspell/dict-gaming-terms@1.1.2': {} - '@cspell/dict-git@3.0.7': {} + '@cspell/dict-git@3.1.0': {} '@cspell/dict-golang@6.0.26': {} @@ -14562,7 +14637,7 @@ snapshots: '@cspell/dict-html-symbol-entities@4.0.5': {} - '@cspell/dict-html@4.0.14': {} + '@cspell/dict-html@4.0.15': {} '@cspell/dict-java@5.0.12': {} @@ -14572,7 +14647,7 @@ snapshots: '@cspell/dict-kotlin@1.1.1': {} - '@cspell/dict-latex@4.0.4': {} + '@cspell/dict-latex@5.1.0': {} '@cspell/dict-lorem-ipsum@4.0.5': {} @@ -14580,24 +14655,24 @@ snapshots: '@cspell/dict-makefile@1.0.5': {} - '@cspell/dict-markdown@2.0.14(@cspell/dict-css@4.0.19)(@cspell/dict-html-symbol-entities@4.0.5)(@cspell/dict-html@4.0.14)(@cspell/dict-typescript@3.2.3)': + '@cspell/dict-markdown@2.0.16(@cspell/dict-css@4.1.1)(@cspell/dict-html-symbol-entities@4.0.5)(@cspell/dict-html@4.0.15)(@cspell/dict-typescript@3.2.3)': dependencies: - '@cspell/dict-css': 4.0.19 - '@cspell/dict-html': 4.0.14 + '@cspell/dict-css': 4.1.1 + '@cspell/dict-html': 4.0.15 '@cspell/dict-html-symbol-entities': 4.0.5 '@cspell/dict-typescript': 3.2.3 '@cspell/dict-monkeyc@1.0.12': {} - '@cspell/dict-node@5.0.8': {} + '@cspell/dict-node@5.0.9': {} - '@cspell/dict-npm@5.2.29': {} + '@cspell/dict-npm@5.2.37': {} '@cspell/dict-php@4.1.1': {} '@cspell/dict-powershell@5.0.15': {} - '@cspell/dict-public-licenses@2.0.15': {} + '@cspell/dict-public-licenses@2.0.16': {} '@cspell/dict-python@4.2.25': dependencies: @@ -14605,15 +14680,15 @@ snapshots: '@cspell/dict-r@2.1.1': {} - '@cspell/dict-ruby@5.1.0': {} + '@cspell/dict-ruby@5.1.1': {} - '@cspell/dict-rust@4.1.1': {} + '@cspell/dict-rust@4.1.2': {} '@cspell/dict-scala@5.0.9': {} '@cspell/dict-shell@1.1.2': {} - '@cspell/dict-software-terms@5.1.20': {} + '@cspell/dict-software-terms@5.2.0': {} '@cspell/dict-sql@2.2.1': {} @@ -14629,16 +14704,18 @@ snapshots: '@cspell/dict-zig@1.0.0': {} - '@cspell/dynamic-import@9.6.0': + '@cspell/dynamic-import@9.7.0': dependencies: - '@cspell/url': 9.6.0 + '@cspell/url': 9.7.0 import-meta-resolve: 4.2.0 - '@cspell/filetypes@9.6.0': {} + '@cspell/filetypes@9.7.0': {} - '@cspell/strong-weak-map@9.6.0': {} + '@cspell/rpc@9.7.0': {} - '@cspell/url@9.6.0': {} + '@cspell/strong-weak-map@9.7.0': {} + + '@cspell/url@9.7.0': {} '@csstools/color-helpers@5.1.0': {} @@ -14664,9 +14741,9 @@ snapshots: '@ctrl/tinycolor@4.2.0': {} - '@docsearch/css@4.5.0': {} + '@docsearch/css@4.6.0': {} - '@docsearch/js@4.5.0': {} + '@docsearch/js@4.6.0': {} '@emmetio/abbreviation@2.3.3': dependencies: @@ -14691,231 +14768,102 @@ snapshots: '@emmetio/stream-reader@2.2.0': {} - '@emnapi/runtime@1.8.1': + '@emnapi/core@1.9.1': dependencies: + '@emnapi/wasi-threads': 1.2.0 tslib: 2.8.1 optional: true - '@emotion/babel-plugin@11.13.5': + '@emnapi/runtime@1.9.1': dependencies: - '@babel/helper-module-imports': 7.28.6 - '@babel/runtime': 7.28.6 - '@emotion/hash': 0.9.2 - '@emotion/memoize': 0.9.0 - '@emotion/serialize': 1.3.3 - babel-plugin-macros: 3.1.0 - convert-source-map: 1.9.0 - escape-string-regexp: 4.0.0 - find-root: 1.1.0 - source-map: 0.5.7 - stylis: 4.2.0 - transitivePeerDependencies: - - supports-color + tslib: 2.8.1 + optional: true - '@emotion/cache@11.14.0': + '@emnapi/wasi-threads@1.2.0': dependencies: - '@emotion/memoize': 0.9.0 - '@emotion/sheet': 1.4.0 - '@emotion/utils': 1.4.2 - '@emotion/weak-memoize': 0.4.0 - stylis: 4.2.0 + tslib: 2.8.1 + optional: true '@emotion/hash@0.9.2': {} - '@emotion/memoize@0.9.0': {} - - '@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)': - dependencies: - '@babel/runtime': 7.28.6 - '@emotion/babel-plugin': 11.13.5 - '@emotion/cache': 11.14.0 - '@emotion/serialize': 1.3.3 - '@emotion/use-insertion-effect-with-fallbacks': 1.2.0(react@19.2.3) - '@emotion/utils': 1.4.2 - '@emotion/weak-memoize': 0.4.0 - hoist-non-react-statics: 3.3.2 - react: 19.2.3 - optionalDependencies: - '@types/react': 19.2.9 - transitivePeerDependencies: - - supports-color - - '@emotion/serialize@1.3.3': - dependencies: - '@emotion/hash': 0.9.2 - '@emotion/memoize': 0.9.0 - '@emotion/unitless': 0.10.0 - '@emotion/utils': 1.4.2 - csstype: 3.2.3 - - '@emotion/sheet@1.4.0': {} - - '@emotion/unitless@0.10.0': {} - - '@emotion/use-insertion-effect-with-fallbacks@1.2.0(react@19.2.3)': - dependencies: - react: 19.2.3 - - '@emotion/utils@1.4.2': {} - - '@emotion/weak-memoize@0.4.0': {} - '@epic-web/invariant@1.0.0': {} - '@esbuild/aix-ppc64@0.25.12': - optional: true - - '@esbuild/aix-ppc64@0.27.2': - optional: true - - '@esbuild/android-arm64@0.25.12': - optional: true - - '@esbuild/android-arm64@0.27.2': - optional: true - - '@esbuild/android-arm@0.25.12': - optional: true - - '@esbuild/android-arm@0.27.2': - optional: true - - '@esbuild/android-x64@0.25.12': - optional: true - - '@esbuild/android-x64@0.27.2': - optional: true - - '@esbuild/darwin-arm64@0.25.12': - optional: true - - '@esbuild/darwin-arm64@0.27.2': - optional: true - - '@esbuild/darwin-x64@0.25.12': - optional: true - - '@esbuild/darwin-x64@0.27.2': - optional: true - - '@esbuild/freebsd-arm64@0.25.12': - optional: true - - '@esbuild/freebsd-arm64@0.27.2': - optional: true - - '@esbuild/freebsd-x64@0.25.12': - optional: true - - '@esbuild/freebsd-x64@0.27.2': - optional: true - - '@esbuild/linux-arm64@0.25.12': - optional: true - - '@esbuild/linux-arm64@0.27.2': - optional: true - - '@esbuild/linux-arm@0.25.12': - optional: true - - '@esbuild/linux-arm@0.27.2': - optional: true - - '@esbuild/linux-ia32@0.25.12': - optional: true - - '@esbuild/linux-ia32@0.27.2': - optional: true - - '@esbuild/linux-loong64@0.25.12': + '@esbuild/aix-ppc64@0.27.4': optional: true - '@esbuild/linux-loong64@0.27.2': + '@esbuild/android-arm64@0.27.4': optional: true - '@esbuild/linux-mips64el@0.25.12': + '@esbuild/android-arm@0.27.4': optional: true - '@esbuild/linux-mips64el@0.27.2': + '@esbuild/android-x64@0.27.4': optional: true - '@esbuild/linux-ppc64@0.25.12': + '@esbuild/darwin-arm64@0.27.4': optional: true - '@esbuild/linux-ppc64@0.27.2': + '@esbuild/darwin-x64@0.27.4': optional: true - '@esbuild/linux-riscv64@0.25.12': + '@esbuild/freebsd-arm64@0.27.4': optional: true - '@esbuild/linux-riscv64@0.27.2': + '@esbuild/freebsd-x64@0.27.4': optional: true - '@esbuild/linux-s390x@0.25.12': + '@esbuild/linux-arm64@0.27.4': optional: true - '@esbuild/linux-s390x@0.27.2': + '@esbuild/linux-arm@0.27.4': optional: true - '@esbuild/linux-x64@0.25.12': + '@esbuild/linux-ia32@0.27.4': optional: true - '@esbuild/linux-x64@0.27.2': + '@esbuild/linux-loong64@0.27.4': optional: true - '@esbuild/netbsd-arm64@0.25.12': + '@esbuild/linux-mips64el@0.27.4': optional: true - '@esbuild/netbsd-arm64@0.27.2': + '@esbuild/linux-ppc64@0.27.4': optional: true - '@esbuild/netbsd-x64@0.25.12': + '@esbuild/linux-riscv64@0.27.4': optional: true - '@esbuild/netbsd-x64@0.27.2': + '@esbuild/linux-s390x@0.27.4': optional: true - '@esbuild/openbsd-arm64@0.25.12': + '@esbuild/linux-x64@0.27.4': optional: true - '@esbuild/openbsd-arm64@0.27.2': + '@esbuild/netbsd-arm64@0.27.4': optional: true - '@esbuild/openbsd-x64@0.25.12': + '@esbuild/netbsd-x64@0.27.4': optional: true - '@esbuild/openbsd-x64@0.27.2': + '@esbuild/openbsd-arm64@0.27.4': optional: true - '@esbuild/openharmony-arm64@0.25.12': + '@esbuild/openbsd-x64@0.27.4': optional: true - '@esbuild/openharmony-arm64@0.27.2': + '@esbuild/openharmony-arm64@0.27.4': optional: true - '@esbuild/sunos-x64@0.25.12': + '@esbuild/sunos-x64@0.27.4': optional: true - '@esbuild/sunos-x64@0.27.2': + '@esbuild/win32-arm64@0.27.4': optional: true - '@esbuild/win32-arm64@0.25.12': + '@esbuild/win32-ia32@0.27.4': optional: true - '@esbuild/win32-arm64@0.27.2': - optional: true - - '@esbuild/win32-ia32@0.25.12': - optional: true - - '@esbuild/win32-ia32@0.27.2': - optional: true - - '@esbuild/win32-x64@0.25.12': - optional: true - - '@esbuild/win32-x64@0.27.2': + '@esbuild/win32-x64@0.27.4': optional: true '@esfx/async-canceltoken@1.0.0': @@ -14937,1266 +14885,1280 @@ snapshots: '@esfx/disposable@1.0.0': {} - '@eslint-community/eslint-utils@4.9.1(eslint@9.39.2)': + '@eslint-community/eslint-utils@4.9.1(eslint@10.0.3)': dependencies: - eslint: 9.39.2 + eslint: 10.0.3 eslint-visitor-keys: 3.4.3 '@eslint-community/regexpp@4.12.2': {} - '@eslint/config-array@0.21.1': + '@eslint/config-array@0.23.3': dependencies: - '@eslint/object-schema': 2.1.7 - debug: 4.4.3(supports-color@8.1.1) - minimatch: 3.1.2 + '@eslint/object-schema': 3.0.3 + debug: 4.4.3 + minimatch: 10.2.4 transitivePeerDependencies: - supports-color - '@eslint/config-helpers@0.4.2': + '@eslint/config-helpers@0.5.3': dependencies: - '@eslint/core': 0.17.0 + '@eslint/core': 1.1.1 - '@eslint/core@0.17.0': + '@eslint/core@1.1.1': dependencies: '@types/json-schema': 7.0.15 - '@eslint/eslintrc@3.3.3': - dependencies: - ajv: 6.12.6 - debug: 4.4.3(supports-color@8.1.1) - espree: 10.4.0 - globals: 14.0.0 - ignore: 5.3.2 - import-fresh: 3.3.1 - js-yaml: 4.1.1 - minimatch: 3.1.2 - strip-json-comments: 3.1.1 - transitivePeerDependencies: - - supports-color - - '@eslint/js@9.39.2': {} + '@eslint/js@10.0.1(eslint@10.0.3)': + optionalDependencies: + eslint: 10.0.3 - '@eslint/object-schema@2.1.7': {} + '@eslint/object-schema@3.0.3': {} - '@eslint/plugin-kit@0.4.1': + '@eslint/plugin-kit@0.6.1': dependencies: - '@eslint/core': 0.17.0 + '@eslint/core': 1.1.1 levn: 0.4.1 - '@expressive-code/core@0.41.6': + '@expressive-code/core@0.41.7': dependencies: '@ctrl/tinycolor': 4.2.0 hast-util-select: 6.0.4 hast-util-to-html: 9.0.5 hast-util-to-text: 4.0.2 hastscript: 9.0.1 - postcss: 8.5.6 - postcss-nested: 6.2.0(postcss@8.5.6) - unist-util-visit: 5.0.0 + postcss: 8.5.8 + postcss-nested: 6.2.0(postcss@8.5.8) + unist-util-visit: 5.1.0 unist-util-visit-parents: 6.0.2 - '@expressive-code/plugin-frames@0.41.6': + '@expressive-code/plugin-frames@0.41.7': dependencies: - '@expressive-code/core': 0.41.6 + '@expressive-code/core': 0.41.7 - '@expressive-code/plugin-shiki@0.41.6': + '@expressive-code/plugin-shiki@0.41.7': dependencies: - '@expressive-code/core': 0.41.6 - shiki: 3.21.0 + '@expressive-code/core': 0.41.7 + shiki: 3.23.0 - '@expressive-code/plugin-text-markers@0.41.6': + '@expressive-code/plugin-text-markers@0.41.7': dependencies: - '@expressive-code/core': 0.41.6 + '@expressive-code/core': 0.41.7 - '@floating-ui/core@1.7.3': + '@floating-ui/core@1.7.5': dependencies: - '@floating-ui/utils': 0.2.10 + '@floating-ui/utils': 0.2.11 - '@floating-ui/devtools@0.2.3(@floating-ui/dom@1.7.4)': + '@floating-ui/devtools@0.2.3(@floating-ui/dom@1.7.6)': dependencies: - '@floating-ui/dom': 1.7.4 + '@floating-ui/dom': 1.7.6 - '@floating-ui/dom@1.7.4': + '@floating-ui/dom@1.7.6': dependencies: - '@floating-ui/core': 1.7.3 - '@floating-ui/utils': 0.2.10 + '@floating-ui/core': 1.7.5 + '@floating-ui/utils': 0.2.11 - '@floating-ui/utils@0.2.10': {} + '@floating-ui/utils@0.2.11': {} '@fluentui/keyboard-keys@9.0.8': dependencies: - '@swc/helpers': 0.5.18 - - '@fluentui/priority-overflow@9.2.1': - dependencies: - '@swc/helpers': 0.5.18 - - '@fluentui/react-accordion@9.8.15(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-aria': 9.17.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-motion': 9.11.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-motion-components-preview': 0.14.2(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@swc/helpers': 0.5.19 + + '@fluentui/priority-overflow@9.3.0': + dependencies: + '@swc/helpers': 0.5.19 + + '@fluentui/react-accordion@9.9.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-aria': 9.17.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-motion': 9.13.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-motion-components-preview': 0.15.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-alert@9.0.0-beta.131(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-avatar': 9.9.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-button': 9.7.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-alert@9.0.0-beta.135(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-avatar': 9.10.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-button': 9.8.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-aria@9.17.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@fluentui/react-aria@9.17.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': dependencies: '@fluentui/keyboard-keys': 9.0.8 - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - '@fluentui/react-avatar@9.9.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-badge': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-popover': 9.12.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-tooltip': 9.8.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + + '@fluentui/react-avatar@9.10.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-badge': 9.4.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-popover': 9.14.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-tooltip': 9.9.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-badge@9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': - dependencies: - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - '@fluentui/react-breadcrumb@9.3.14(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': - dependencies: - '@fluentui/react-aria': 9.17.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-button': 9.7.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-link': 9.7.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - '@fluentui/react-button@9.7.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@fluentui/react-badge@9.4.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': + dependencies: + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + + '@fluentui/react-breadcrumb@9.3.17(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': + dependencies: + '@fluentui/react-aria': 9.17.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-button': 9.8.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-link': 9.7.4(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + + '@fluentui/react-button@9.8.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': dependencies: '@fluentui/keyboard-keys': 9.0.8 - '@fluentui/react-aria': 9.17.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - '@fluentui/react-card@9.5.8(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@fluentui/react-aria': 9.17.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + + '@fluentui/react-card@9.5.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': dependencies: '@fluentui/keyboard-keys': 9.0.8 - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-text': 9.6.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - '@fluentui/react-carousel@9.9.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-aria': 9.17.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-button': 9.7.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-tooltip': 9.8.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-text': 9.6.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + + '@fluentui/react-carousel@9.9.4(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-aria': 9.17.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-button': 9.8.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-tooltip': 9.9.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) embla-carousel: 8.6.0 embla-carousel-autoplay: 8.6.0(embla-carousel@8.6.0) embla-carousel-fade: 8.6.0(embla-carousel@8.6.0) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + transitivePeerDependencies: + - scheduler + + '@fluentui/react-checkbox@9.5.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-field': 9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-label': 9.3.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-checkbox@9.5.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-field': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-label': 9.3.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-checkbox@9.5.17(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-field': 9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-label': 9.3.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-color-picker@9.2.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': + '@fluentui/react-color-picker@9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': dependencies: '@ctrl/tinycolor': 3.6.1 - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-combobox@9.16.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': + '@fluentui/react-combobox@9.16.18(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': dependencies: '@fluentui/keyboard-keys': 9.0.8 - '@fluentui/react-aria': 9.17.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-field': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-portal': 9.8.9(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-positioning': 9.20.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-aria': 9.17.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-field': 9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-portal': 9.8.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-positioning': 9.22.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-components@9.72.9(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-accordion': 9.8.15(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-alert': 9.0.0-beta.131(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-aria': 9.17.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-avatar': 9.9.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-badge': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-breadcrumb': 9.3.14(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-button': 9.7.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-card': 9.5.8(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-carousel': 9.9.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-checkbox': 9.5.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-color-picker': 9.2.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-combobox': 9.16.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-dialog': 9.16.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-divider': 9.5.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-drawer': 9.11.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-field': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-image': 9.3.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-infobutton': 9.0.0-beta.108(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-infolabel': 9.4.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-input': 9.7.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-label': 9.3.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-link': 9.7.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-list': 9.6.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-menu': 9.20.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-message-bar': 9.6.16(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-motion': 9.11.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-nav': 9.3.16(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-overflow': 9.6.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-persona': 9.5.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-popover': 9.12.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-portal': 9.8.9(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-positioning': 9.20.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-progress': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-provider': 9.22.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-radio': 9.5.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-rating': 9.3.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-search': 9.3.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-select': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-skeleton': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-slider': 9.5.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-spinbutton': 9.5.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-spinner': 9.7.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-swatch-picker': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-switch': 9.5.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-table': 9.19.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-tabs': 9.10.8(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-tag-picker': 9.7.14(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-tags': 9.7.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-teaching-popover': 9.6.14(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-text': 9.6.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-textarea': 9.6.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-toast': 9.7.10(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-toolbar': 9.6.14(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-tooltip': 9.8.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-tree': 9.15.8(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-virtualizer': 9.0.0-alpha.108(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-components@9.73.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-accordion': 9.9.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-alert': 9.0.0-beta.135(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-aria': 9.17.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-avatar': 9.10.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-badge': 9.4.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-breadcrumb': 9.3.17(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-button': 9.8.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-card': 9.5.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-carousel': 9.9.4(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-checkbox': 9.5.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-color-picker': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-combobox': 9.16.18(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-dialog': 9.17.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-divider': 9.6.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-drawer': 9.11.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-field': 9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-image': 9.3.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-infobutton': 9.0.0-beta.112(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-infolabel': 9.4.17(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-input': 9.7.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-label': 9.3.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-link': 9.7.4(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-list': 9.6.12(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-menu': 9.22.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-message-bar': 9.6.21(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-motion': 9.13.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-nav': 9.3.20(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-overflow': 9.7.1(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-persona': 9.6.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-popover': 9.14.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-portal': 9.8.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-positioning': 9.22.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-progress': 9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-provider': 9.22.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-radio': 9.5.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-rating': 9.3.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-search': 9.3.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-select': 9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-skeleton': 9.5.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-slider': 9.5.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-spinbutton': 9.5.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-spinner': 9.7.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-swatch-picker': 9.5.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-switch': 9.6.1(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-table': 9.19.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-tabs': 9.11.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-tag-picker': 9.8.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-tags': 9.7.17(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-teaching-popover': 9.6.18(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-text': 9.6.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-textarea': 9.6.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-toast': 9.7.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-toolbar': 9.7.4(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-tooltip': 9.9.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-tree': 9.15.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-virtualizer': 9.0.0-alpha.111(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-context-selector@9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': + '@fluentui/react-context-selector@9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': dependencies: - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) scheduler: 0.27.0 - '@fluentui/react-dialog@9.16.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': + '@fluentui/react-dialog@9.17.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': dependencies: '@fluentui/keyboard-keys': 9.0.8 - '@fluentui/react-aria': 9.17.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-motion': 9.11.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-motion-components-preview': 0.14.2(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-portal': 9.8.9(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-aria': 9.17.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-motion': 9.13.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-motion-components-preview': 0.15.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-portal': 9.8.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-divider@9.5.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': - dependencies: - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - '@fluentui/react-drawer@9.11.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-dialog': 9.16.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-motion': 9.11.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-motion-components-preview': 0.14.2(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-portal': 9.8.9(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-divider@9.6.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': + dependencies: + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + + '@fluentui/react-drawer@9.11.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-dialog': 9.17.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-motion': 9.13.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-motion-components-preview': 0.15.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-portal': 9.8.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-field@9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-label': 9.3.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-field@9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-label': 9.3.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-icons@2.0.316(react@19.2.3)': + '@fluentui/react-icons@2.0.323(react@19.2.4)': dependencies: - '@griffel/react': 1.5.32(react@19.2.3) - react: 19.2.3 + '@griffel/react': 1.6.1(react@19.2.4) + react: 19.2.4 tslib: 2.8.1 - '@fluentui/react-image@9.3.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': - dependencies: - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - '@fluentui/react-infobutton@9.0.0-beta.108(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-label': 9.3.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-popover': 9.12.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-image@9.3.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': + dependencies: + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + + '@fluentui/react-infobutton@9.0.0-beta.112(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-label': 9.3.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-popover': 9.14.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-infolabel@9.4.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-label': 9.3.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-popover': 9.12.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-infolabel@9.4.17(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-label': 9.3.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-popover': 9.14.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-input@9.7.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-field': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-input@9.7.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-field': 9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-jsx-runtime@9.3.4(@types/react@19.2.9)(react@19.2.3)': + '@fluentui/react-jsx-runtime@9.4.1(@types/react@19.2.14)(react@19.2.4)': dependencies: - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - react: 19.2.3 - react-is: 17.0.2 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + react: 19.2.4 - '@fluentui/react-label@9.3.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@fluentui/react-label@9.3.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': dependencies: - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) - '@fluentui/react-link@9.7.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@fluentui/react-link@9.7.4(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': dependencies: '@fluentui/keyboard-keys': 9.0.8 - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - '@fluentui/react-list@9.6.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + + '@fluentui/react-list@9.6.12(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': dependencies: '@fluentui/keyboard-keys': 9.0.8 - '@fluentui/react-checkbox': 9.5.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-checkbox': 9.5.17(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-menu@9.20.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': + '@fluentui/react-menu@9.22.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': dependencies: '@fluentui/keyboard-keys': 9.0.8 - '@fluentui/react-aria': 9.17.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-portal': 9.8.9(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-positioning': 9.20.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-aria': 9.17.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-motion': 9.13.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-motion-components-preview': 0.15.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-portal': 9.8.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-positioning': 9.22.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-message-bar@9.6.16(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': - dependencies: - '@fluentui/react-button': 9.7.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-link': 9.7.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-motion': 9.11.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-motion-components-preview': 0.14.2(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - '@fluentui/react-motion-components-preview@0.14.2(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': - dependencies: - '@fluentui/react-motion': 9.11.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - '@fluentui/react-motion@9.11.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': - dependencies: - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - '@fluentui/react-nav@9.3.16(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-aria': 9.17.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-button': 9.7.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-divider': 9.5.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-drawer': 9.11.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-motion': 9.11.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-motion-components-preview': 0.14.2(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-tooltip': 9.8.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-message-bar@9.6.21(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': + dependencies: + '@fluentui/react-button': 9.8.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-link': 9.7.4(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-motion': 9.13.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-motion-components-preview': 0.15.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + + '@fluentui/react-motion-components-preview@0.15.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': + dependencies: + '@fluentui/react-motion': 9.13.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + + '@fluentui/react-motion@9.13.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': + dependencies: + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + + '@fluentui/react-nav@9.3.20(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-aria': 9.17.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-button': 9.8.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-divider': 9.6.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-drawer': 9.11.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-motion': 9.13.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-motion-components-preview': 0.15.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-tooltip': 9.9.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-overflow@9.6.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/priority-overflow': 9.2.1 - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-overflow@9.7.1(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/priority-overflow': 9.3.0 + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-persona@9.5.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-avatar': 9.9.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-badge': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-persona@9.6.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-avatar': 9.10.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-badge': 9.4.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-popover@9.12.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': + '@fluentui/react-popover@9.14.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': dependencies: '@fluentui/keyboard-keys': 9.0.8 - '@fluentui/react-aria': 9.17.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-portal': 9.8.9(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-positioning': 9.20.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-aria': 9.17.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-motion': 9.13.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-motion-components-preview': 0.15.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-portal': 9.8.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-positioning': 9.22.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-portal@9.8.9(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': - dependencies: - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - '@fluentui/react-positioning@9.20.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': - dependencies: - '@floating-ui/devtools': 0.2.3(@floating-ui/dom@1.7.4) - '@floating-ui/dom': 1.7.4 - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - use-sync-external-store: 1.6.0(react@19.2.3) - - '@fluentui/react-progress@9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-field': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-portal@9.8.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': + dependencies: + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + + '@fluentui/react-positioning@9.22.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': + dependencies: + '@floating-ui/devtools': 0.2.3(@floating-ui/dom@1.7.6) + '@floating-ui/dom': 1.7.6 + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + use-sync-external-store: 1.6.0(react@19.2.4) + + '@fluentui/react-progress@9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-field': 9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-provider@9.22.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': - dependencies: - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/core': 1.19.2 - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - '@fluentui/react-radio@9.5.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-field': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-label': 9.3.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-provider@9.22.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': + dependencies: + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/core': 1.20.1 + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + + '@fluentui/react-radio@9.5.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-field': 9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-label': 9.3.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-rating@9.3.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': - dependencies: - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - '@fluentui/react-search@9.3.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-input': 9.7.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-rating@9.3.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': + dependencies: + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + + '@fluentui/react-search@9.3.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-input': 9.7.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-select@9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-field': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-select@9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-field': 9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-shared-contexts@9.26.0(@types/react@19.2.9)(react@19.2.3)': - dependencies: - '@fluentui/react-theme': 9.2.0 - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - react: 19.2.3 - - '@fluentui/react-skeleton@9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-field': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-shared-contexts@9.26.2(@types/react@19.2.14)(react@19.2.4)': + dependencies: + '@fluentui/react-theme': 9.2.1 + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + react: 19.2.4 + + '@fluentui/react-skeleton@9.5.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-field': 9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-slider@9.5.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-field': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-slider@9.5.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-field': 9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-spinbutton@9.5.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': + '@fluentui/react-spinbutton@9.5.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': dependencies: '@fluentui/keyboard-keys': 9.0.8 - '@fluentui/react-field': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-field': 9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-spinner@9.7.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': - dependencies: - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-label': 9.3.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - '@fluentui/react-swatch-picker@9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-field': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-spinner@9.7.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': + dependencies: + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-label': 9.3.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + + '@fluentui/react-swatch-picker@9.5.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-field': 9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-switch@9.5.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-field': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-label': 9.3.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-switch@9.6.1(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-field': 9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-label': 9.3.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-table@9.19.6(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': + '@fluentui/react-table@9.19.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': dependencies: '@fluentui/keyboard-keys': 9.0.8 - '@fluentui/react-aria': 9.17.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-avatar': 9.9.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-checkbox': 9.5.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-radio': 9.5.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-aria': 9.17.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-avatar': 9.10.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-checkbox': 9.5.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-radio': 9.5.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-tabs@9.10.8(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-tabs@9.11.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-tabster@9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@fluentui/react-tabster@9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': dependencies: - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) keyborg: 2.6.0 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) tabster: 8.7.0 - '@fluentui/react-tag-picker@9.7.14(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': + '@fluentui/react-tag-picker@9.8.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': dependencies: '@fluentui/keyboard-keys': 9.0.8 - '@fluentui/react-aria': 9.17.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-combobox': 9.16.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-field': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-portal': 9.8.9(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-positioning': 9.20.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-tags': 9.7.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-aria': 9.17.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-combobox': 9.16.18(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-field': 9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-portal': 9.8.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-positioning': 9.22.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-tags': 9.7.17(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-tags@9.7.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': + '@fluentui/react-tags@9.7.17(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': dependencies: '@fluentui/keyboard-keys': 9.0.8 - '@fluentui/react-aria': 9.17.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-avatar': 9.9.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-aria': 9.17.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-avatar': 9.10.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-teaching-popover@9.6.14(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-aria': 9.17.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-button': 9.7.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-popover': 9.12.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - use-sync-external-store: 1.6.0(react@19.2.3) + '@fluentui/react-teaching-popover@9.6.18(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-aria': 9.17.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-button': 9.8.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-popover': 9.14.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + use-sync-external-store: 1.6.0(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-text@9.6.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': - dependencies: - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - '@fluentui/react-textarea@9.6.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-field': 9.4.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-text@9.6.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': + dependencies: + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + + '@fluentui/react-textarea@9.6.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-field': 9.4.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-theme@9.2.0': + '@fluentui/react-theme@9.2.1': dependencies: - '@fluentui/tokens': 1.0.0-alpha.22 - '@swc/helpers': 0.5.18 + '@fluentui/tokens': 1.0.0-alpha.23 + '@swc/helpers': 0.5.19 - '@fluentui/react-toast@9.7.10(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@fluentui/react-toast@9.7.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': dependencies: '@fluentui/keyboard-keys': 9.0.8 - '@fluentui/react-aria': 9.17.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-motion': 9.11.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-motion-components-preview': 0.14.2(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-portal': 9.8.9(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - '@fluentui/react-toolbar@9.6.14(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': - dependencies: - '@fluentui/react-button': 9.7.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-divider': 9.5.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-radio': 9.5.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-aria': 9.17.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-motion': 9.13.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-motion-components-preview': 0.15.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-portal': 9.8.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + + '@fluentui/react-toolbar@9.7.4(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': + dependencies: + '@fluentui/react-button': 9.8.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-divider': 9.6.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-radio': 9.5.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-tooltip@9.8.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@fluentui/react-tooltip@9.9.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': dependencies: '@fluentui/keyboard-keys': 9.0.8 - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-portal': 9.8.9(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-positioning': 9.20.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - '@fluentui/react-tree@9.15.8(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0)': + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-portal': 9.8.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-positioning': 9.22.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + + '@fluentui/react-tree@9.15.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)': dependencies: '@fluentui/keyboard-keys': 9.0.8 - '@fluentui/react-aria': 9.17.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-avatar': 9.9.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-button': 9.7.1(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-checkbox': 9.5.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-context-selector': 9.2.13(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-icons': 2.0.316(react@19.2.3) - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-motion': 9.11.5(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-motion-components-preview': 0.14.2(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-radio': 9.5.12(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(scheduler@0.27.0) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-tabster': 9.26.11(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@fluentui/react-theme': 9.2.0 - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-aria': 9.17.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-avatar': 9.10.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-button': 9.8.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-checkbox': 9.5.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-context-selector': 9.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-icons': 2.0.323(react@19.2.4) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-motion': 9.13.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-motion-components-preview': 0.15.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-radio': 9.5.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-tabster': 9.26.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + '@fluentui/react-theme': 9.2.1 + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: - scheduler - '@fluentui/react-utilities@9.26.0(@types/react@19.2.9)(react@19.2.3)': + '@fluentui/react-utilities@9.26.2(@types/react@19.2.14)(react@19.2.4)': dependencies: '@fluentui/keyboard-keys': 9.0.8 - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - react: 19.2.3 + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + react: 19.2.4 - '@fluentui/react-virtualizer@9.0.0-alpha.108(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@fluentui/react-virtualizer@9.0.0-alpha.111(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': dependencies: - '@fluentui/react-jsx-runtime': 9.3.4(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-shared-contexts': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@fluentui/react-utilities': 9.26.0(@types/react@19.2.9)(react@19.2.3) - '@griffel/react': 1.5.32(react@19.2.3) - '@swc/helpers': 0.5.18 - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + '@fluentui/react-jsx-runtime': 9.4.1(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-shared-contexts': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@fluentui/react-utilities': 9.26.2(@types/react@19.2.14)(react@19.2.4) + '@griffel/react': 1.6.1(react@19.2.4) + '@swc/helpers': 0.5.19 + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) - '@fluentui/tokens@1.0.0-alpha.22': + '@fluentui/tokens@1.0.0-alpha.23': dependencies: - '@swc/helpers': 0.5.18 + '@swc/helpers': 0.5.19 '@fortawesome/fontawesome-free@6.7.2': {} - '@gerrit0/mini-shiki@3.21.0': + '@gar/promise-retry@1.0.2': + dependencies: + retry: 0.13.1 + + '@gerrit0/mini-shiki@3.23.0': dependencies: - '@shikijs/engine-oniguruma': 3.21.0 - '@shikijs/langs': 3.21.0 - '@shikijs/themes': 3.21.0 - '@shikijs/types': 3.21.0 + '@shikijs/engine-oniguruma': 3.23.0 + '@shikijs/langs': 3.23.0 + '@shikijs/themes': 3.23.0 + '@shikijs/types': 3.23.0 '@shikijs/vscode-textmate': 10.0.2 - '@griffel/core@1.19.2': + '@griffel/core@1.20.1': dependencies: '@emotion/hash': 0.9.2 - '@griffel/style-types': 1.3.0 + '@griffel/style-types': 1.4.0 csstype: 3.2.3 rtl-css-js: 1.16.1 stylis: 4.3.6 tslib: 2.8.1 - '@griffel/react@1.5.32(react@19.2.3)': + '@griffel/react@1.6.1(react@19.2.4)': dependencies: - '@griffel/core': 1.19.2 - react: 19.2.3 + '@griffel/core': 1.20.1 + react: 19.2.4 tslib: 2.8.1 - '@griffel/style-types@1.3.0': + '@griffel/style-types@1.4.0': dependencies: csstype: 3.2.3 @@ -16219,9 +16181,9 @@ snapshots: dependencies: '@antfu/install-pkg': 1.1.0 '@iconify/types': 2.0.0 - mlly: 1.8.0 + mlly: 1.8.1 - '@img/colour@1.0.0': {} + '@img/colour@1.1.0': {} '@img/sharp-darwin-arm64@0.34.5': optionalDependencies: @@ -16305,7 +16267,7 @@ snapshots: '@img/sharp-wasm32@0.34.5': dependencies: - '@emnapi/runtime': 1.8.1 + '@emnapi/runtime': 1.9.1 optional: true '@img/sharp-win32-arm64@0.34.5': @@ -16319,149 +16281,145 @@ snapshots: '@inquirer/ansi@2.0.3': {} - '@inquirer/checkbox@5.0.4(@types/node@25.0.9)': + '@inquirer/checkbox@5.1.0(@types/node@25.5.0)': dependencies: '@inquirer/ansi': 2.0.3 - '@inquirer/core': 11.1.1(@types/node@25.0.9) + '@inquirer/core': 11.1.5(@types/node@25.5.0) '@inquirer/figures': 2.0.3 - '@inquirer/type': 4.0.3(@types/node@25.0.9) + '@inquirer/type': 4.0.3(@types/node@25.5.0) optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 - '@inquirer/confirm@6.0.4(@types/node@25.0.9)': + '@inquirer/confirm@6.0.8(@types/node@25.5.0)': dependencies: - '@inquirer/core': 11.1.1(@types/node@25.0.9) - '@inquirer/type': 4.0.3(@types/node@25.0.9) + '@inquirer/core': 11.1.5(@types/node@25.5.0) + '@inquirer/type': 4.0.3(@types/node@25.5.0) optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 - '@inquirer/core@11.1.1(@types/node@25.0.9)': + '@inquirer/core@11.1.5(@types/node@25.5.0)': dependencies: '@inquirer/ansi': 2.0.3 '@inquirer/figures': 2.0.3 - '@inquirer/type': 4.0.3(@types/node@25.0.9) + '@inquirer/type': 4.0.3(@types/node@25.5.0) cli-width: 4.1.0 + fast-wrap-ansi: 0.2.0 mute-stream: 3.0.0 signal-exit: 4.1.0 - wrap-ansi: 9.0.2 optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 - '@inquirer/editor@5.0.4(@types/node@25.0.9)': + '@inquirer/editor@5.0.8(@types/node@25.5.0)': dependencies: - '@inquirer/core': 11.1.1(@types/node@25.0.9) - '@inquirer/external-editor': 2.0.3(@types/node@25.0.9) - '@inquirer/type': 4.0.3(@types/node@25.0.9) + '@inquirer/core': 11.1.5(@types/node@25.5.0) + '@inquirer/external-editor': 2.0.3(@types/node@25.5.0) + '@inquirer/type': 4.0.3(@types/node@25.5.0) optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 - '@inquirer/expand@5.0.4(@types/node@25.0.9)': + '@inquirer/expand@5.0.8(@types/node@25.5.0)': dependencies: - '@inquirer/core': 11.1.1(@types/node@25.0.9) - '@inquirer/type': 4.0.3(@types/node@25.0.9) + '@inquirer/core': 11.1.5(@types/node@25.5.0) + '@inquirer/type': 4.0.3(@types/node@25.5.0) optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 - '@inquirer/external-editor@2.0.3(@types/node@25.0.9)': + '@inquirer/external-editor@2.0.3(@types/node@25.5.0)': dependencies: chardet: 2.1.1 iconv-lite: 0.7.2 optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 '@inquirer/figures@2.0.3': {} - '@inquirer/input@5.0.4(@types/node@25.0.9)': + '@inquirer/input@5.0.8(@types/node@25.5.0)': dependencies: - '@inquirer/core': 11.1.1(@types/node@25.0.9) - '@inquirer/type': 4.0.3(@types/node@25.0.9) + '@inquirer/core': 11.1.5(@types/node@25.5.0) + '@inquirer/type': 4.0.3(@types/node@25.5.0) optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 - '@inquirer/number@4.0.4(@types/node@25.0.9)': + '@inquirer/number@4.0.8(@types/node@25.5.0)': dependencies: - '@inquirer/core': 11.1.1(@types/node@25.0.9) - '@inquirer/type': 4.0.3(@types/node@25.0.9) + '@inquirer/core': 11.1.5(@types/node@25.5.0) + '@inquirer/type': 4.0.3(@types/node@25.5.0) optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 - '@inquirer/password@5.0.4(@types/node@25.0.9)': + '@inquirer/password@5.0.8(@types/node@25.5.0)': dependencies: '@inquirer/ansi': 2.0.3 - '@inquirer/core': 11.1.1(@types/node@25.0.9) - '@inquirer/type': 4.0.3(@types/node@25.0.9) + '@inquirer/core': 11.1.5(@types/node@25.5.0) + '@inquirer/type': 4.0.3(@types/node@25.5.0) optionalDependencies: - '@types/node': 25.0.9 - - '@inquirer/prompts@8.2.0(@types/node@25.0.9)': - dependencies: - '@inquirer/checkbox': 5.0.4(@types/node@25.0.9) - '@inquirer/confirm': 6.0.4(@types/node@25.0.9) - '@inquirer/editor': 5.0.4(@types/node@25.0.9) - '@inquirer/expand': 5.0.4(@types/node@25.0.9) - '@inquirer/input': 5.0.4(@types/node@25.0.9) - '@inquirer/number': 4.0.4(@types/node@25.0.9) - '@inquirer/password': 5.0.4(@types/node@25.0.9) - '@inquirer/rawlist': 5.2.0(@types/node@25.0.9) - '@inquirer/search': 4.1.0(@types/node@25.0.9) - '@inquirer/select': 5.0.4(@types/node@25.0.9) + '@types/node': 25.5.0 + + '@inquirer/prompts@8.3.0(@types/node@25.5.0)': + dependencies: + '@inquirer/checkbox': 5.1.0(@types/node@25.5.0) + '@inquirer/confirm': 6.0.8(@types/node@25.5.0) + '@inquirer/editor': 5.0.8(@types/node@25.5.0) + '@inquirer/expand': 5.0.8(@types/node@25.5.0) + '@inquirer/input': 5.0.8(@types/node@25.5.0) + '@inquirer/number': 4.0.8(@types/node@25.5.0) + '@inquirer/password': 5.0.8(@types/node@25.5.0) + '@inquirer/rawlist': 5.2.4(@types/node@25.5.0) + '@inquirer/search': 4.1.4(@types/node@25.5.0) + '@inquirer/select': 5.1.0(@types/node@25.5.0) optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 - '@inquirer/rawlist@5.2.0(@types/node@25.0.9)': + '@inquirer/rawlist@5.2.4(@types/node@25.5.0)': dependencies: - '@inquirer/core': 11.1.1(@types/node@25.0.9) - '@inquirer/type': 4.0.3(@types/node@25.0.9) + '@inquirer/core': 11.1.5(@types/node@25.5.0) + '@inquirer/type': 4.0.3(@types/node@25.5.0) optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 - '@inquirer/search@4.1.0(@types/node@25.0.9)': + '@inquirer/search@4.1.4(@types/node@25.5.0)': dependencies: - '@inquirer/core': 11.1.1(@types/node@25.0.9) + '@inquirer/core': 11.1.5(@types/node@25.5.0) '@inquirer/figures': 2.0.3 - '@inquirer/type': 4.0.3(@types/node@25.0.9) + '@inquirer/type': 4.0.3(@types/node@25.5.0) optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 - '@inquirer/select@5.0.4(@types/node@25.0.9)': + '@inquirer/select@5.1.0(@types/node@25.5.0)': dependencies: '@inquirer/ansi': 2.0.3 - '@inquirer/core': 11.1.1(@types/node@25.0.9) + '@inquirer/core': 11.1.5(@types/node@25.5.0) '@inquirer/figures': 2.0.3 - '@inquirer/type': 4.0.3(@types/node@25.0.9) + '@inquirer/type': 4.0.3(@types/node@25.5.0) optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 - '@inquirer/type@4.0.3(@types/node@25.0.9)': + '@inquirer/type@4.0.3(@types/node@25.5.0)': optionalDependencies: - '@types/node': 25.0.9 - - '@isaacs/balanced-match@4.0.1': {} - - '@isaacs/brace-expansion@5.0.0': - dependencies: - '@isaacs/balanced-match': 4.0.1 + '@types/node': 25.5.0 '@isaacs/cliui@8.0.2': dependencies: string-width: 5.1.2 string-width-cjs: string-width@4.2.3 - strip-ansi: 7.1.2 + strip-ansi: 7.2.0 strip-ansi-cjs: strip-ansi@6.0.1 wrap-ansi: 8.1.0 wrap-ansi-cjs: wrap-ansi@7.0.0 + '@isaacs/cliui@9.0.0': {} + '@isaacs/fs-minipass@4.0.1': dependencies: - minipass: 7.1.2 + minipass: 7.1.3 '@istanbuljs/schema@0.1.3': {} - '@joshwooding/vite-plugin-react-docgen-typescript@0.6.3(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2))': + '@joshwooding/vite-plugin-react-docgen-typescript@0.6.4(typescript@5.9.3)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2))': dependencies: - glob: 11.1.0 + glob: 13.0.6 react-docgen-typescript: 2.4.0(typescript@5.9.3) - vite: 7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + vite: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2) optionalDependencies: typescript: 5.9.3 @@ -16490,23 +16448,31 @@ snapshots: dependencies: vary: 1.1.2 - '@koa/router@15.2.0(koa@3.1.1)': + '@koa/router@15.3.1(koa@3.1.2)': dependencies: - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 http-errors: 2.0.1 - koa: 3.1.1 + koa: 3.1.2 koa-compose: 4.1.0 path-to-regexp: 8.3.0 transitivePeerDependencies: - supports-color + '@kwsites/file-exists@1.1.1': + dependencies: + debug: 4.4.3 + transitivePeerDependencies: + - supports-color + + '@kwsites/promise-deferred@1.1.1': {} + '@mdx-js/mdx@3.1.1': dependencies: '@types/estree': 1.0.8 '@types/estree-jsx': 1.0.5 '@types/hast': 3.0.4 '@types/mdx': 2.0.13 - acorn: 8.15.0 + acorn: 8.16.0 collapse-white-space: 2.1.0 devlop: 1.1.0 estree-util-is-identifier-name: 3.0.0 @@ -16515,7 +16481,7 @@ snapshots: hast-util-to-jsx-runtime: 2.3.6 markdown-extensions: 2.0.0 recma-build-jsx: 1.0.0 - recma-jsx: 1.0.1(acorn@8.15.0) + recma-jsx: 1.0.1(acorn@8.16.0) recma-stringify: 1.0.0 rehype-recma: 1.0.0 remark-mdx: 3.1.1 @@ -16525,14 +16491,14 @@ snapshots: unified: 11.0.5 unist-util-position-from-estree: 2.0.0 unist-util-stringify-position: 4.0.0 - unist-util-visit: 5.0.0 + unist-util-visit: 5.1.0 vfile: 6.0.3 transitivePeerDependencies: - supports-color - '@mermaid-js/parser@0.6.3': + '@mermaid-js/parser@1.0.1': dependencies: - langium: 3.3.1 + langium: 4.2.1 '@microsoft/1ds-core-js@4.3.11(tslib@2.8.1)': dependencies: @@ -16540,7 +16506,7 @@ snapshots: '@microsoft/applicationinsights-shims': 3.0.1 '@microsoft/dynamicproto-js': 2.0.3 '@nevware21/ts-async': 0.5.5 - '@nevware21/ts-utils': 0.12.5 + '@nevware21/ts-utils': 0.13.0 transitivePeerDependencies: - tslib @@ -16550,30 +16516,30 @@ snapshots: '@microsoft/applicationinsights-shims': 3.0.1 '@microsoft/dynamicproto-js': 2.0.3 '@nevware21/ts-async': 0.5.5 - '@nevware21/ts-utils': 0.12.5 + '@nevware21/ts-utils': 0.13.0 transitivePeerDependencies: - tslib - '@microsoft/api-extractor-model@7.32.2(@types/node@25.0.9)': + '@microsoft/api-extractor-model@7.33.4(@types/node@25.5.0)': dependencies: '@microsoft/tsdoc': 0.16.0 - '@microsoft/tsdoc-config': 0.18.0 - '@rushstack/node-core-library': 5.19.1(@types/node@25.0.9) + '@microsoft/tsdoc-config': 0.18.1 + '@rushstack/node-core-library': 5.20.3(@types/node@25.5.0) transitivePeerDependencies: - '@types/node' - '@microsoft/api-extractor@7.55.2(@types/node@25.0.9)': + '@microsoft/api-extractor@7.57.7(@types/node@25.5.0)': dependencies: - '@microsoft/api-extractor-model': 7.32.2(@types/node@25.0.9) + '@microsoft/api-extractor-model': 7.33.4(@types/node@25.5.0) '@microsoft/tsdoc': 0.16.0 - '@microsoft/tsdoc-config': 0.18.0 - '@rushstack/node-core-library': 5.19.1(@types/node@25.0.9) - '@rushstack/rig-package': 0.6.0 - '@rushstack/terminal': 0.19.5(@types/node@25.0.9) - '@rushstack/ts-command-line': 5.1.5(@types/node@25.0.9) + '@microsoft/tsdoc-config': 0.18.1 + '@rushstack/node-core-library': 5.20.3(@types/node@25.5.0) + '@rushstack/rig-package': 0.7.2 + '@rushstack/terminal': 0.22.3(@types/node@25.5.0) + '@rushstack/ts-command-line': 5.3.3(@types/node@25.5.0) diff: 8.0.3 - lodash: 4.17.21 - minimatch: 10.0.3 + lodash: 4.17.23 + minimatch: 10.2.3 resolve: 1.22.11 semver: 7.5.4 source-map: 0.6.1 @@ -16588,7 +16554,7 @@ snapshots: '@microsoft/applicationinsights-shims': 3.0.1 '@microsoft/dynamicproto-js': 2.0.3 '@nevware21/ts-async': 0.5.5 - '@nevware21/ts-utils': 0.12.5 + '@nevware21/ts-utils': 0.13.0 tslib: 2.8.1 '@microsoft/applicationinsights-common@3.3.11(tslib@2.8.1)': @@ -16596,7 +16562,7 @@ snapshots: '@microsoft/applicationinsights-core-js': 3.3.11(tslib@2.8.1) '@microsoft/applicationinsights-shims': 3.0.1 '@microsoft/dynamicproto-js': 2.0.3 - '@nevware21/ts-utils': 0.12.5 + '@nevware21/ts-utils': 0.13.0 tslib: 2.8.1 '@microsoft/applicationinsights-core-js@3.3.11(tslib@2.8.1)': @@ -16604,12 +16570,12 @@ snapshots: '@microsoft/applicationinsights-shims': 3.0.1 '@microsoft/dynamicproto-js': 2.0.3 '@nevware21/ts-async': 0.5.5 - '@nevware21/ts-utils': 0.12.5 + '@nevware21/ts-utils': 0.13.0 tslib: 2.8.1 '@microsoft/applicationinsights-shims@3.0.1': dependencies: - '@nevware21/ts-utils': 0.12.5 + '@nevware21/ts-utils': 0.13.0 '@microsoft/applicationinsights-web-basic@3.3.11(tslib@2.8.1)': dependencies: @@ -16619,27 +16585,34 @@ snapshots: '@microsoft/applicationinsights-shims': 3.0.1 '@microsoft/dynamicproto-js': 2.0.3 '@nevware21/ts-async': 0.5.5 - '@nevware21/ts-utils': 0.12.5 + '@nevware21/ts-utils': 0.13.0 tslib: 2.8.1 '@microsoft/dynamicproto-js@2.0.3': dependencies: - '@nevware21/ts-utils': 0.12.5 + '@nevware21/ts-utils': 0.13.0 - '@microsoft/tsdoc-config@0.18.0': + '@microsoft/tsdoc-config@0.18.1': dependencies: '@microsoft/tsdoc': 0.16.0 - ajv: 8.12.0 + ajv: 8.18.0 jju: 1.4.0 resolve: 1.22.11 '@microsoft/tsdoc@0.16.0': {} + '@napi-rs/wasm-runtime@1.1.1': + dependencies: + '@emnapi/core': 1.9.1 + '@emnapi/runtime': 1.9.1 + '@tybys/wasm-util': 0.10.1 + optional: true + '@nevware21/ts-async@0.5.5': dependencies: - '@nevware21/ts-utils': 0.12.5 + '@nevware21/ts-utils': 0.13.0 - '@nevware21/ts-utils@0.12.5': {} + '@nevware21/ts-utils@0.13.0': {} '@nodelib/fs.scandir@2.1.5': dependencies: @@ -16668,29 +16641,29 @@ snapshots: agent-base: 7.1.4 http-proxy-agent: 7.0.2 https-proxy-agent: 7.0.6 - lru-cache: 11.2.4 + lru-cache: 11.2.7 socks-proxy-agent: 8.0.5 transitivePeerDependencies: - supports-color '@npmcli/fs@4.0.0': dependencies: - semver: 7.7.3 + semver: 7.7.4 '@npmcli/fs@5.0.0': dependencies: - semver: 7.7.3 + semver: 7.7.4 - '@npmcli/git@7.0.1': + '@npmcli/git@7.0.2': dependencies: + '@gar/promise-retry': 1.0.2 '@npmcli/promise-spawn': 9.0.1 ini: 6.0.0 - lru-cache: 11.2.4 + lru-cache: 11.2.7 npm-pick-manifest: 11.0.3 proc-log: 6.1.0 - promise-retry: 2.0.1 - semver: 7.7.3 - which: 6.0.0 + semver: 7.7.4 + which: 6.0.1 '@npmcli/installed-package-contents@4.0.0': dependencies: @@ -16699,36 +16672,35 @@ snapshots: '@npmcli/node-gyp@5.0.0': {} - '@npmcli/package-json@7.0.4': + '@npmcli/package-json@7.0.5': dependencies: - '@npmcli/git': 7.0.1 - glob: 13.0.0 + '@npmcli/git': 7.0.2 + glob: 13.0.6 hosted-git-info: 9.0.2 json-parse-even-better-errors: 5.0.0 proc-log: 6.1.0 - semver: 7.7.3 - validate-npm-package-license: 3.0.4 + semver: 7.7.4 + spdx-expression-parse: 4.0.0 '@npmcli/promise-spawn@9.0.1': dependencies: - which: 6.0.0 + which: 6.0.1 '@npmcli/redact@4.0.0': {} - '@npmcli/run-script@10.0.3': + '@npmcli/run-script@10.0.4': dependencies: '@npmcli/node-gyp': 5.0.0 - '@npmcli/package-json': 7.0.4 + '@npmcli/package-json': 7.0.5 '@npmcli/promise-spawn': 9.0.1 - node-gyp: 12.1.0 + node-gyp: 12.2.0 proc-log: 6.1.0 - which: 6.0.0 transitivePeerDependencies: - supports-color '@octokit/app@16.1.2': dependencies: - '@octokit/auth-app': 8.1.2 + '@octokit/auth-app': 8.2.0 '@octokit/auth-unauthenticated': 7.0.3 '@octokit/core': 7.0.6 '@octokit/oauth-app': 8.0.3 @@ -16736,11 +16708,11 @@ snapshots: '@octokit/types': 16.0.0 '@octokit/webhooks': 14.2.0 - '@octokit/auth-app@8.1.2': + '@octokit/auth-app@8.2.0': dependencies: '@octokit/auth-oauth-app': 9.0.3 '@octokit/auth-oauth-user': 6.0.2 - '@octokit/request': 10.0.7 + '@octokit/request': 10.0.8 '@octokit/request-error': 7.1.0 '@octokit/types': 16.0.0 toad-cache: 3.7.0 @@ -16751,14 +16723,14 @@ snapshots: dependencies: '@octokit/auth-oauth-device': 8.0.3 '@octokit/auth-oauth-user': 6.0.2 - '@octokit/request': 10.0.7 + '@octokit/request': 10.0.8 '@octokit/types': 16.0.0 universal-user-agent: 7.0.3 '@octokit/auth-oauth-device@8.0.3': dependencies: '@octokit/oauth-methods': 6.0.2 - '@octokit/request': 10.0.7 + '@octokit/request': 10.0.8 '@octokit/types': 16.0.0 universal-user-agent: 7.0.3 @@ -16766,12 +16738,10 @@ snapshots: dependencies: '@octokit/auth-oauth-device': 8.0.3 '@octokit/oauth-methods': 6.0.2 - '@octokit/request': 10.0.7 + '@octokit/request': 10.0.8 '@octokit/types': 16.0.0 universal-user-agent: 7.0.3 - '@octokit/auth-token@5.1.2': {} - '@octokit/auth-token@6.0.0': {} '@octokit/auth-unauthenticated@7.0.3': @@ -16779,45 +16749,24 @@ snapshots: '@octokit/request-error': 7.1.0 '@octokit/types': 16.0.0 - '@octokit/core@6.1.6': - dependencies: - '@octokit/auth-token': 5.1.2 - '@octokit/graphql': 8.2.2 - '@octokit/request': 9.2.4 - '@octokit/request-error': 6.1.8 - '@octokit/types': 14.1.0 - before-after-hook: 3.0.2 - universal-user-agent: 7.0.3 - '@octokit/core@7.0.6': dependencies: '@octokit/auth-token': 6.0.0 '@octokit/graphql': 9.0.3 - '@octokit/request': 10.0.7 + '@octokit/request': 10.0.8 '@octokit/request-error': 7.1.0 '@octokit/types': 16.0.0 before-after-hook: 4.0.0 universal-user-agent: 7.0.3 - '@octokit/endpoint@10.1.4': - dependencies: - '@octokit/types': 14.1.0 - universal-user-agent: 7.0.3 - - '@octokit/endpoint@11.0.2': + '@octokit/endpoint@11.0.3': dependencies: '@octokit/types': 16.0.0 universal-user-agent: 7.0.3 - '@octokit/graphql@8.2.2': - dependencies: - '@octokit/request': 9.2.4 - '@octokit/types': 14.1.0 - universal-user-agent: 7.0.3 - '@octokit/graphql@9.0.3': dependencies: - '@octokit/request': 10.0.7 + '@octokit/request': 10.0.8 '@octokit/types': 16.0.0 universal-user-agent: 7.0.3 @@ -16829,7 +16778,7 @@ snapshots: '@octokit/core': 7.0.6 '@octokit/oauth-authorization-url': 8.0.0 '@octokit/oauth-methods': 6.0.2 - '@types/aws-lambda': 8.10.160 + '@types/aws-lambda': 8.10.161 universal-user-agent: 7.0.3 '@octokit/oauth-authorization-url@8.0.0': {} @@ -16837,14 +16786,10 @@ snapshots: '@octokit/oauth-methods@6.0.2': dependencies: '@octokit/oauth-authorization-url': 8.0.0 - '@octokit/request': 10.0.7 + '@octokit/request': 10.0.8 '@octokit/request-error': 7.1.0 '@octokit/types': 16.0.0 - '@octokit/openapi-types@24.2.0': {} - - '@octokit/openapi-types@25.1.0': {} - '@octokit/openapi-types@27.0.0': {} '@octokit/openapi-webhooks-types@12.1.0': {} @@ -16853,31 +16798,21 @@ snapshots: dependencies: '@octokit/core': 7.0.6 - '@octokit/plugin-paginate-rest@11.6.0(@octokit/core@6.1.6)': - dependencies: - '@octokit/core': 6.1.6 - '@octokit/types': 13.10.0 - '@octokit/plugin-paginate-rest@14.0.0(@octokit/core@7.0.6)': dependencies: '@octokit/core': 7.0.6 '@octokit/types': 16.0.0 - '@octokit/plugin-request-log@5.3.1(@octokit/core@6.1.6)': - dependencies: - '@octokit/core': 6.1.6 - - '@octokit/plugin-rest-endpoint-methods@13.5.0(@octokit/core@6.1.6)': + '@octokit/plugin-request-log@6.0.0(@octokit/core@7.0.6)': dependencies: - '@octokit/core': 6.1.6 - '@octokit/types': 13.10.0 + '@octokit/core': 7.0.6 '@octokit/plugin-rest-endpoint-methods@17.0.0(@octokit/core@7.0.6)': dependencies: '@octokit/core': 7.0.6 '@octokit/types': 16.0.0 - '@octokit/plugin-retry@8.0.3(@octokit/core@7.0.6)': + '@octokit/plugin-retry@8.1.0(@octokit/core@7.0.6)': dependencies: '@octokit/core': 7.0.6 '@octokit/request-error': 7.1.0 @@ -16890,44 +16825,25 @@ snapshots: '@octokit/types': 16.0.0 bottleneck: 2.19.5 - '@octokit/request-error@6.1.8': - dependencies: - '@octokit/types': 14.1.0 - '@octokit/request-error@7.1.0': dependencies: '@octokit/types': 16.0.0 - '@octokit/request@10.0.7': + '@octokit/request@10.0.8': dependencies: - '@octokit/endpoint': 11.0.2 + '@octokit/endpoint': 11.0.3 '@octokit/request-error': 7.1.0 '@octokit/types': 16.0.0 fast-content-type-parse: 3.0.0 + json-with-bigint: 3.5.7 universal-user-agent: 7.0.3 - '@octokit/request@9.2.4': - dependencies: - '@octokit/endpoint': 10.1.4 - '@octokit/request-error': 6.1.8 - '@octokit/types': 14.1.0 - fast-content-type-parse: 2.0.1 - universal-user-agent: 7.0.3 - - '@octokit/rest@21.1.1': - dependencies: - '@octokit/core': 6.1.6 - '@octokit/plugin-paginate-rest': 11.6.0(@octokit/core@6.1.6) - '@octokit/plugin-request-log': 5.3.1(@octokit/core@6.1.6) - '@octokit/plugin-rest-endpoint-methods': 13.5.0(@octokit/core@6.1.6) - - '@octokit/types@13.10.0': - dependencies: - '@octokit/openapi-types': 24.2.0 - - '@octokit/types@14.1.0': + '@octokit/rest@22.0.1': dependencies: - '@octokit/openapi-types': 25.1.0 + '@octokit/core': 7.0.6 + '@octokit/plugin-paginate-rest': 14.0.0(@octokit/core@7.0.6) + '@octokit/plugin-request-log': 6.0.0(@octokit/core@7.0.6) + '@octokit/plugin-rest-endpoint-methods': 17.0.0(@octokit/core@7.0.6) '@octokit/types@16.0.0': dependencies: @@ -16943,6 +16859,8 @@ snapshots: '@oslojs/encoding@1.1.0': {} + '@oxc-project/types@0.120.0': {} + '@pagefind/darwin-arm64@1.4.0': optional: true @@ -16966,13 +16884,13 @@ snapshots: '@pkgjs/parseargs@0.11.0': optional: true - '@playwright/browser-chromium@1.57.0': + '@playwright/browser-chromium@1.58.2': dependencies: - playwright-core: 1.57.0 + playwright-core: 1.58.2 - '@playwright/test@1.57.0': + '@playwright/test@1.58.2': dependencies: - playwright: 1.57.0 + playwright: 1.58.2 '@pnpm/byline@1.0.0': {} @@ -16989,19 +16907,19 @@ snapshots: '@pnpm/types': 1001.3.0 load-json-file: 6.2.0 - '@pnpm/cli-utils@1001.3.0(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0)': + '@pnpm/cli-utils@1001.3.9(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0)': dependencies: '@pnpm/cli-meta': 1000.0.16 - '@pnpm/config': 1004.9.2(@pnpm/logger@1001.0.1) - '@pnpm/config.deps-installer': 1000.1.0(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9)) - '@pnpm/default-reporter': 1002.1.7(@pnpm/logger@1001.0.1) + '@pnpm/config': 1004.10.4(@pnpm/logger@1001.0.1) + '@pnpm/config.deps-installer': 1000.1.4(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0)) + '@pnpm/default-reporter': 1002.1.13(@pnpm/logger@1001.0.1) '@pnpm/error': 1000.0.5 '@pnpm/logger': 1001.0.1 '@pnpm/manifest-utils': 1002.0.4(@pnpm/logger@1001.0.1) '@pnpm/package-is-installable': 1000.0.20(@pnpm/logger@1001.0.1) - '@pnpm/pnpmfile': 1002.1.11(@pnpm/logger@1001.0.1) - '@pnpm/read-project-manifest': 1001.2.4(@pnpm/logger@1001.0.1) - '@pnpm/store-connection-manager': 1002.3.11(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0) + '@pnpm/pnpmfile': 1002.1.12(@pnpm/logger@1001.0.1) + '@pnpm/read-project-manifest': 1001.2.5(@pnpm/logger@1001.0.1) + '@pnpm/store-connection-manager': 1002.3.18(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0) '@pnpm/types': 1001.3.0 '@pnpm/util.lex-comparator': 3.0.2 chalk: 4.1.2 @@ -17012,18 +16930,18 @@ snapshots: - supports-color - typanion - '@pnpm/client@1001.1.16(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0)': + '@pnpm/client@1001.1.23(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0)': dependencies: - '@pnpm/default-resolver': 1002.3.0(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0) - '@pnpm/directory-fetcher': 1000.1.22(@pnpm/logger@1001.0.1) - '@pnpm/fetch': 1000.2.11(@pnpm/logger@1001.0.1) - '@pnpm/fetching-types': 1000.2.0 - '@pnpm/fetching.binary-fetcher': 1005.0.2(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9)) - '@pnpm/git-fetcher': 1006.0.2(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0) + '@pnpm/default-resolver': 1002.3.7(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0) + '@pnpm/directory-fetcher': 1000.1.23(@pnpm/logger@1001.0.1) + '@pnpm/fetch': 1001.0.0(@pnpm/logger@1001.0.1) + '@pnpm/fetching-types': 1000.2.1 + '@pnpm/fetching.binary-fetcher': 1005.0.3(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0)) + '@pnpm/git-fetcher': 1006.0.5(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0) '@pnpm/network.auth-header': 1000.0.6 - '@pnpm/node.fetcher': 1001.0.19(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0) + '@pnpm/node.fetcher': 1001.0.26(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0) '@pnpm/resolver-base': 1005.4.1 - '@pnpm/tarball-fetcher': 1006.0.2(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0) + '@pnpm/tarball-fetcher': 1006.0.5(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0) '@pnpm/types': 1001.3.0 ramda: '@pnpm/ramda@0.28.1' transitivePeerDependencies: @@ -17033,25 +16951,25 @@ snapshots: - supports-color - typanion - '@pnpm/config.config-writer@1000.0.21(@pnpm/logger@1001.0.1)': + '@pnpm/config.config-writer@1000.1.2(@pnpm/logger@1001.0.1)': dependencies: - '@pnpm/read-project-manifest': 1001.2.4(@pnpm/logger@1001.0.1) + '@pnpm/read-project-manifest': 1001.2.5(@pnpm/logger@1001.0.1) '@pnpm/types': 1001.3.0 - '@pnpm/workspace.manifest-writer': 1001.1.2 + '@pnpm/workspace.manifest-writer': 1001.3.0 ramda: '@pnpm/ramda@0.28.1' transitivePeerDependencies: - '@pnpm/logger' - '@pnpm/config.deps-installer@1000.1.0(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))': + '@pnpm/config.deps-installer@1000.1.4(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))': dependencies: - '@pnpm/config.config-writer': 1000.0.21(@pnpm/logger@1001.0.1) + '@pnpm/config.config-writer': 1000.1.2(@pnpm/logger@1001.0.1) '@pnpm/core-loggers': 1001.0.9(@pnpm/logger@1001.0.1) '@pnpm/error': 1000.0.5 - '@pnpm/fetch': 1000.2.11(@pnpm/logger@1001.0.1) + '@pnpm/fetch': 1001.0.0(@pnpm/logger@1001.0.1) '@pnpm/logger': 1001.0.1 '@pnpm/network.auth-header': 1000.0.6 - '@pnpm/npm-resolver': 1005.1.1(@pnpm/logger@1001.0.1) - '@pnpm/package-store': 1007.1.2(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9)) + '@pnpm/npm-resolver': 1005.2.2(@pnpm/logger@1001.0.1) + '@pnpm/package-store': 1007.1.5(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0)) '@pnpm/parse-wanted-dependency': 1001.0.0 '@pnpm/pick-registry-for-package': 1000.0.16 '@pnpm/read-modules-dir': 1000.0.0 @@ -17070,7 +16988,7 @@ snapshots: '@pnpm/config.nerf-dart@1.0.1': {} - '@pnpm/config@1004.9.2(@pnpm/logger@1001.0.1)': + '@pnpm/config@1004.10.4(@pnpm/logger@1001.0.1)': dependencies: '@pnpm/catalogs.config': 1000.0.5 '@pnpm/catalogs.types': 1000.0.0 @@ -17081,10 +16999,10 @@ snapshots: '@pnpm/logger': 1001.0.1 '@pnpm/matcher': 1000.1.0 '@pnpm/npm-conf': 3.0.2 - '@pnpm/pnpmfile': 1002.1.11(@pnpm/logger@1001.0.1) - '@pnpm/read-project-manifest': 1001.2.4(@pnpm/logger@1001.0.1) + '@pnpm/pnpmfile': 1002.1.12(@pnpm/logger@1001.0.1) + '@pnpm/read-project-manifest': 1001.2.5(@pnpm/logger@1001.0.1) '@pnpm/types': 1001.3.0 - '@pnpm/workspace.read-manifest': 1000.2.10 + '@pnpm/workspace.read-manifest': 1000.3.0 better-path-resolve: 1.0.0 camelcase: 6.3.0 camelcase-keys: 6.2.2 @@ -17108,52 +17026,52 @@ snapshots: '@pnpm/logger': 1001.0.1 '@pnpm/types': 1001.3.0 - '@pnpm/create-cafs-store@1000.0.29(@pnpm/logger@1001.0.1)': + '@pnpm/create-cafs-store@1000.0.32(@pnpm/logger@1001.0.1)': dependencies: '@pnpm/exec.pkg-requires-build': 1000.0.16 '@pnpm/fetcher-base': 1001.2.2 - '@pnpm/fs.indexed-pkg-importer': 1000.1.23(@pnpm/logger@1001.0.1) + '@pnpm/fs.indexed-pkg-importer': 1000.1.25(@pnpm/logger@1001.0.1) '@pnpm/logger': 1001.0.1 '@pnpm/store-controller-types': 1004.5.1 - '@pnpm/store.cafs': 1000.1.2 + '@pnpm/store.cafs': 1000.1.4 mem: 8.1.1 - path-temp: 2.1.0 + path-temp: 2.1.1 ramda: '@pnpm/ramda@0.28.1' - '@pnpm/crypto.hash@1000.2.1': + '@pnpm/crypto.hash@1000.2.2': dependencies: '@pnpm/crypto.polyfill': 1000.1.0 - '@pnpm/graceful-fs': 1000.0.1 + '@pnpm/graceful-fs': 1000.1.0 ssri: 10.0.5 '@pnpm/crypto.polyfill@1000.1.0': {} - '@pnpm/crypto.shasums-file@1001.0.2': + '@pnpm/crypto.shasums-file@1001.0.4': dependencies: - '@pnpm/crypto.hash': 1000.2.1 + '@pnpm/crypto.hash': 1000.2.2 '@pnpm/error': 1000.0.5 - '@pnpm/fetching-types': 1000.2.0 + '@pnpm/fetching-types': 1000.2.1 transitivePeerDependencies: - domexception - '@pnpm/dedupe.issues-renderer@1000.0.1': + '@pnpm/dedupe.issues-renderer@1000.0.2': dependencies: '@pnpm/dedupe.types': 1000.0.0 - archy: 1.0.0 + '@pnpm/text.tree-renderer': 1000.0.0 chalk: 4.1.2 '@pnpm/dedupe.types@1000.0.0': {} - '@pnpm/default-reporter@1002.1.7(@pnpm/logger@1001.0.1)': + '@pnpm/default-reporter@1002.1.13(@pnpm/logger@1001.0.1)': dependencies: '@pnpm/cli-meta': 1000.0.16 - '@pnpm/config': 1004.9.2(@pnpm/logger@1001.0.1) + '@pnpm/config': 1004.10.4(@pnpm/logger@1001.0.1) '@pnpm/core-loggers': 1001.0.9(@pnpm/logger@1001.0.1) - '@pnpm/dedupe.issues-renderer': 1000.0.1 + '@pnpm/dedupe.issues-renderer': 1000.0.2 '@pnpm/dedupe.types': 1000.0.0 '@pnpm/error': 1000.0.5 '@pnpm/logger': 1001.0.1 - '@pnpm/render-peer-issues': 1002.0.10 + '@pnpm/render-peer-issues': 1002.0.11 '@pnpm/types': 1001.3.0 '@pnpm/util.lex-comparator': 3.0.2 ansi-diff: 1.2.0 @@ -17165,22 +17083,22 @@ snapshots: pretty-ms: 7.0.1 ramda: '@pnpm/ramda@0.28.1' rxjs: 7.8.2 - semver: 7.7.3 + semver: 7.7.4 stacktracey: 2.1.8 string-length: 4.0.2 - '@pnpm/default-resolver@1002.3.0(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0)': + '@pnpm/default-resolver@1002.3.7(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0)': dependencies: '@pnpm/error': 1000.0.5 - '@pnpm/fetching-types': 1000.2.0 - '@pnpm/git-resolver': 1001.2.0(@pnpm/logger@1001.0.1) - '@pnpm/local-resolver': 1002.1.11(@pnpm/logger@1001.0.1) - '@pnpm/node.resolver': 1001.0.16(@pnpm/logger@1001.0.1) - '@pnpm/npm-resolver': 1005.1.1(@pnpm/logger@1001.0.1) + '@pnpm/fetching-types': 1000.2.1 + '@pnpm/git-resolver': 1001.2.1(@pnpm/logger@1001.0.1) + '@pnpm/local-resolver': 1002.1.12(@pnpm/logger@1001.0.1) + '@pnpm/node.resolver': 1001.0.22(@pnpm/logger@1001.0.1) + '@pnpm/npm-resolver': 1005.2.2(@pnpm/logger@1001.0.1) '@pnpm/resolver-base': 1005.4.1 - '@pnpm/resolving.bun-resolver': 1005.0.3(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0) - '@pnpm/resolving.deno-resolver': 1005.0.3(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0) - '@pnpm/tarball-resolver': 1002.2.0 + '@pnpm/resolving.bun-resolver': 1005.0.10(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0) + '@pnpm/resolving.deno-resolver': 1005.0.10(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0) + '@pnpm/tarball-resolver': 1002.2.1 transitivePeerDependencies: - '@pnpm/logger' - '@pnpm/worker' @@ -17188,19 +17106,19 @@ snapshots: - supports-color - typanion - '@pnpm/dependency-path@1001.1.9': + '@pnpm/dependency-path@1001.1.10': dependencies: - '@pnpm/crypto.hash': 1000.2.1 + '@pnpm/crypto.hash': 1000.2.2 '@pnpm/types': 1001.3.0 - semver: 7.7.3 + semver: 7.7.4 - '@pnpm/directory-fetcher@1000.1.22(@pnpm/logger@1001.0.1)': + '@pnpm/directory-fetcher@1000.1.23(@pnpm/logger@1001.0.1)': dependencies: '@pnpm/exec.pkg-requires-build': 1000.0.16 '@pnpm/fetcher-base': 1001.2.2 '@pnpm/fs.packlist': 1000.0.0 '@pnpm/logger': 1001.0.1 - '@pnpm/read-project-manifest': 1001.2.4(@pnpm/logger@1001.0.1) + '@pnpm/read-project-manifest': 1001.2.5(@pnpm/logger@1001.0.1) '@pnpm/resolver-base': 1005.4.1 '@pnpm/types': 1001.3.0 @@ -17218,10 +17136,10 @@ snapshots: dependencies: '@pnpm/types': 1001.3.0 - '@pnpm/fetch@1000.2.11(@pnpm/logger@1001.0.1)': + '@pnpm/fetch@1001.0.0(@pnpm/logger@1001.0.1)': dependencies: '@pnpm/core-loggers': 1001.0.9(@pnpm/logger@1001.0.1) - '@pnpm/fetching-types': 1000.2.0 + '@pnpm/fetching-types': 1000.2.1 '@pnpm/logger': 1001.0.1 '@pnpm/network.agent': 2.0.3 '@pnpm/types': 1001.3.0 @@ -17237,30 +17155,30 @@ snapshots: '@pnpm/types': 1001.3.0 '@types/ssri': 7.1.5 - '@pnpm/fetching-types@1000.2.0': + '@pnpm/fetching-types@1000.2.1': dependencies: '@zkochan/retry': 0.2.0 node-fetch: '@pnpm/node-fetch@1.0.0' transitivePeerDependencies: - domexception - '@pnpm/fetching.binary-fetcher@1005.0.2(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))': + '@pnpm/fetching.binary-fetcher@1005.0.3(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))': dependencies: '@pnpm/error': 1000.0.5 '@pnpm/fetcher-base': 1001.2.2 - '@pnpm/fetching-types': 1000.2.0 - '@pnpm/worker': 1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9) + '@pnpm/fetching-types': 1000.2.1 + '@pnpm/worker': 1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0) adm-zip: 0.5.16 is-subdir: 1.2.0 - rename-overwrite: 6.0.3 + rename-overwrite: 6.0.6 ssri: 10.0.5 tempy: 1.0.1 transitivePeerDependencies: - domexception - '@pnpm/fs.find-packages@1000.0.22(@pnpm/logger@1001.0.1)': + '@pnpm/fs.find-packages@1000.0.23(@pnpm/logger@1001.0.1)': dependencies: - '@pnpm/read-project-manifest': 1001.2.4(@pnpm/logger@1001.0.1) + '@pnpm/read-project-manifest': 1001.2.5(@pnpm/logger@1001.0.1) '@pnpm/types': 1001.3.0 '@pnpm/util.lex-comparator': 3.0.2 p-filter: 2.1.0 @@ -17268,54 +17186,54 @@ snapshots: transitivePeerDependencies: - '@pnpm/logger' - '@pnpm/fs.hard-link-dir@1000.0.5(@pnpm/logger@1001.0.1)': + '@pnpm/fs.hard-link-dir@1000.0.6(@pnpm/logger@1001.0.1)': dependencies: - '@pnpm/graceful-fs': 1000.0.1 + '@pnpm/graceful-fs': 1000.1.0 '@pnpm/logger': 1001.0.1 - path-temp: 2.1.0 - rename-overwrite: 6.0.3 + path-temp: 2.1.1 + rename-overwrite: 6.0.6 - '@pnpm/fs.indexed-pkg-importer@1000.1.23(@pnpm/logger@1001.0.1)': + '@pnpm/fs.indexed-pkg-importer@1000.1.25(@pnpm/logger@1001.0.1)': dependencies: '@pnpm/core-loggers': 1001.0.9(@pnpm/logger@1001.0.1) - '@pnpm/graceful-fs': 1000.0.1 + '@pnpm/graceful-fs': 1000.1.0 '@pnpm/logger': 1001.0.1 '@pnpm/store-controller-types': 1004.5.1 '@reflink/reflink': 0.1.19 '@zkochan/rimraf': 3.0.2 - fs-extra: 11.3.3 + fs-extra: 11.3.4 make-empty-dir: 3.0.2 p-limit: 3.1.0 - path-temp: 2.1.0 - rename-overwrite: 6.0.3 + path-temp: 2.1.1 + rename-overwrite: 6.0.6 sanitize-filename: 1.6.3 '@pnpm/fs.packlist@1000.0.0': dependencies: npm-packlist: 5.1.3 - '@pnpm/git-fetcher@1006.0.2(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0)': + '@pnpm/git-fetcher@1006.0.5(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0)': dependencies: '@pnpm/error': 1000.0.5 '@pnpm/fetcher-base': 1001.2.2 '@pnpm/fs.packlist': 1000.0.0 '@pnpm/logger': 1001.0.1 - '@pnpm/prepare-package': 1001.0.3(@pnpm/logger@1001.0.1)(typanion@3.14.0) - '@pnpm/worker': 1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9) + '@pnpm/prepare-package': 1001.0.6(@pnpm/logger@1001.0.1)(typanion@3.14.0) + '@pnpm/worker': 1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0) '@zkochan/rimraf': 3.0.2 execa: safe-execa@0.1.2 transitivePeerDependencies: - supports-color - typanion - '@pnpm/git-resolver@1001.2.0(@pnpm/logger@1001.0.1)': + '@pnpm/git-resolver@1001.2.1(@pnpm/logger@1001.0.1)': dependencies: '@pnpm/error': 1000.0.5 - '@pnpm/fetch': 1000.2.11(@pnpm/logger@1001.0.1) + '@pnpm/fetch': 1001.0.0(@pnpm/logger@1001.0.1) '@pnpm/resolver-base': 1005.4.1 graceful-git: 4.0.0 hosted-git-info: '@pnpm/hosted-git-info@1.0.0' - semver: 7.7.3 + semver: 7.7.4 transitivePeerDependencies: - '@pnpm/logger' - domexception @@ -17325,7 +17243,7 @@ snapshots: dependencies: execa: safe-execa@0.1.2 - '@pnpm/graceful-fs@1000.0.1': + '@pnpm/graceful-fs@1000.1.0': dependencies: graceful-fs: 4.2.11 @@ -17338,12 +17256,12 @@ snapshots: dependencies: lru-cache: 6.0.0 - '@pnpm/lifecycle@1001.0.33(@pnpm/logger@1001.0.1)(typanion@3.14.0)': + '@pnpm/lifecycle@1001.0.36(@pnpm/logger@1001.0.1)(typanion@3.14.0)': dependencies: '@pnpm/core-loggers': 1001.0.9(@pnpm/logger@1001.0.1) - '@pnpm/directory-fetcher': 1000.1.22(@pnpm/logger@1001.0.1) + '@pnpm/directory-fetcher': 1000.1.23(@pnpm/logger@1001.0.1) '@pnpm/error': 1000.0.5 - '@pnpm/link-bins': 1000.3.4(@pnpm/logger@1001.0.1) + '@pnpm/link-bins': 1000.3.7(@pnpm/logger@1001.0.1) '@pnpm/logger': 1001.0.1 '@pnpm/npm-lifecycle': 1001.0.0(typanion@3.14.0) '@pnpm/read-package-json': 1000.1.7 @@ -17357,16 +17275,16 @@ snapshots: - supports-color - typanion - '@pnpm/link-bins@1000.3.4(@pnpm/logger@1001.0.1)': + '@pnpm/link-bins@1000.3.7(@pnpm/logger@1001.0.1)': dependencies: '@pnpm/constants': 1001.3.1 '@pnpm/error': 1000.0.5 '@pnpm/logger': 1001.0.1 '@pnpm/manifest-utils': 1002.0.4(@pnpm/logger@1001.0.1) - '@pnpm/package-bins': 1000.0.16 + '@pnpm/package-bins': 1000.0.17 '@pnpm/read-modules-dir': 1000.0.0 '@pnpm/read-package-json': 1000.1.7 - '@pnpm/read-project-manifest': 1001.2.4(@pnpm/logger@1001.0.1) + '@pnpm/read-project-manifest': 1001.2.5(@pnpm/logger@1001.0.1) '@pnpm/types': 1001.3.0 '@zkochan/cmd-shim': 7.0.0 '@zkochan/rimraf': 3.0.2 @@ -17375,15 +17293,15 @@ snapshots: is-windows: 1.0.2 normalize-path: 3.0.0 ramda: '@pnpm/ramda@0.28.1' - semver: 7.7.3 + semver: 7.7.4 symlink-dir: 6.0.5 - '@pnpm/local-resolver@1002.1.11(@pnpm/logger@1001.0.1)': + '@pnpm/local-resolver@1002.1.12(@pnpm/logger@1001.0.1)': dependencies: - '@pnpm/crypto.hash': 1000.2.1 + '@pnpm/crypto.hash': 1000.2.2 '@pnpm/error': 1000.0.5 '@pnpm/logger': 1001.0.1 - '@pnpm/read-project-manifest': 1001.2.4(@pnpm/logger@1001.0.1) + '@pnpm/read-project-manifest': 1001.2.5(@pnpm/logger@1001.0.1) '@pnpm/resolver-base': 1005.4.1 '@pnpm/types': 1001.3.0 normalize-path: 3.0.0 @@ -17396,7 +17314,7 @@ snapshots: '@pnpm/logger@1001.0.1': dependencies: - bole: 5.0.25 + bole: 5.0.28 split2: 4.2.0 '@pnpm/manifest-utils@1002.0.4(@pnpm/logger@1001.0.1)': @@ -17406,7 +17324,7 @@ snapshots: '@pnpm/logger': 1001.0.1 '@pnpm/semver.peer-range': 1000.0.0 '@pnpm/types': 1001.3.0 - semver: 7.7.3 + semver: 7.7.4 '@pnpm/matcher@1000.1.0': dependencies: @@ -17451,15 +17369,15 @@ snapshots: transitivePeerDependencies: - domexception - '@pnpm/node.fetcher@1001.0.19(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0)': + '@pnpm/node.fetcher@1001.0.26(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0)': dependencies: - '@pnpm/create-cafs-store': 1000.0.29(@pnpm/logger@1001.0.1) - '@pnpm/crypto.shasums-file': 1001.0.2 + '@pnpm/create-cafs-store': 1000.0.32(@pnpm/logger@1001.0.1) + '@pnpm/crypto.shasums-file': 1001.0.4 '@pnpm/error': 1000.0.5 - '@pnpm/fetching-types': 1000.2.0 - '@pnpm/fetching.binary-fetcher': 1005.0.2(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9)) - '@pnpm/node.resolver': 1001.0.16(@pnpm/logger@1001.0.1) - '@pnpm/tarball-fetcher': 1006.0.2(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0) + '@pnpm/fetching-types': 1000.2.1 + '@pnpm/fetching.binary-fetcher': 1005.0.3(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0)) + '@pnpm/node.resolver': 1001.0.22(@pnpm/logger@1001.0.1) + '@pnpm/tarball-fetcher': 1006.0.5(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0) detect-libc: 2.1.2 transitivePeerDependencies: - '@pnpm/logger' @@ -17468,16 +17386,16 @@ snapshots: - supports-color - typanion - '@pnpm/node.resolver@1001.0.16(@pnpm/logger@1001.0.1)': + '@pnpm/node.resolver@1001.0.22(@pnpm/logger@1001.0.1)': dependencies: - '@pnpm/config': 1004.9.2(@pnpm/logger@1001.0.1) + '@pnpm/config': 1004.10.4(@pnpm/logger@1001.0.1) '@pnpm/constants': 1001.3.1 - '@pnpm/crypto.shasums-file': 1001.0.2 + '@pnpm/crypto.shasums-file': 1001.0.4 '@pnpm/error': 1000.0.5 - '@pnpm/fetching-types': 1000.2.0 + '@pnpm/fetching-types': 1000.2.1 '@pnpm/resolver-base': 1005.4.1 '@pnpm/types': 1001.3.0 - semver: 7.7.3 + semver: 7.7.4 version-selector-type: 3.0.0 transitivePeerDependencies: - '@pnpm/logger' @@ -17493,7 +17411,7 @@ snapshots: dependencies: '@pnpm/byline': 1.0.0 '@pnpm/error': 1000.0.5 - '@yarnpkg/fslib': 3.1.4 + '@yarnpkg/fslib': 3.1.5 '@yarnpkg/shell': 4.0.0(typanion@3.14.0) node-gyp: 11.5.0 resolve-from: 5.0.0 @@ -17505,19 +17423,19 @@ snapshots: - supports-color - typanion - '@pnpm/npm-resolver@1005.1.1(@pnpm/logger@1001.0.1)': + '@pnpm/npm-resolver@1005.2.2(@pnpm/logger@1001.0.1)': dependencies: '@pnpm/constants': 1001.3.1 '@pnpm/core-loggers': 1001.0.9(@pnpm/logger@1001.0.1) - '@pnpm/crypto.hash': 1000.2.1 + '@pnpm/crypto.hash': 1000.2.2 '@pnpm/error': 1000.0.5 - '@pnpm/fetching-types': 1000.2.0 - '@pnpm/graceful-fs': 1000.0.1 + '@pnpm/fetching-types': 1000.2.1 + '@pnpm/graceful-fs': 1000.1.0 '@pnpm/logger': 1001.0.1 '@pnpm/pick-registry-for-package': 1000.0.16 '@pnpm/registry.pkg-metadata-filter': 1000.1.6(@pnpm/logger@1001.0.1) '@pnpm/registry.types': 1000.1.4 - '@pnpm/resolve-workspace-range': 1000.0.0 + '@pnpm/resolve-workspace-range': 1000.1.0 '@pnpm/resolver-base': 1005.4.1 '@pnpm/resolving.jsr-specifier-parser': 1000.0.3 '@pnpm/types': 1001.3.0 @@ -17530,10 +17448,10 @@ snapshots: p-limit: 3.1.0 p-memoize: 4.0.1 parse-npm-tarball-url: 4.0.0 - path-temp: 2.1.0 + path-temp: 2.1.1 ramda: '@pnpm/ramda@0.28.1' - rename-overwrite: 6.0.3 - semver: 7.7.3 + rename-overwrite: 6.0.6 + semver: 7.7.4 semver-utils: 1.1.4 ssri: 10.0.5 version-selector-type: 3.0.0 @@ -17545,7 +17463,7 @@ snapshots: '@pnpm/util.lex-comparator': 3.0.2 sort-keys: 4.2.0 - '@pnpm/package-bins@1000.0.16': + '@pnpm/package-bins@1000.0.17': dependencies: '@pnpm/types': 1001.3.0 is-subdir: 1.2.0 @@ -17562,46 +17480,46 @@ snapshots: detect-libc: 2.1.2 execa: safe-execa@0.1.2 mem: 8.1.1 - semver: 7.7.3 + semver: 7.7.4 - '@pnpm/package-requester@1011.2.1(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))': + '@pnpm/package-requester@1011.2.3(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))': dependencies: '@pnpm/core-loggers': 1001.0.9(@pnpm/logger@1001.0.1) - '@pnpm/dependency-path': 1001.1.9 + '@pnpm/dependency-path': 1001.1.10 '@pnpm/error': 1000.0.5 '@pnpm/fetcher-base': 1001.2.2 - '@pnpm/graceful-fs': 1000.0.1 + '@pnpm/graceful-fs': 1000.1.0 '@pnpm/logger': 1001.0.1 '@pnpm/package-is-installable': 1000.0.20(@pnpm/logger@1001.0.1) '@pnpm/pick-fetcher': 1001.0.0 '@pnpm/read-package-json': 1000.1.7 '@pnpm/resolver-base': 1005.4.1 '@pnpm/store-controller-types': 1004.5.1 - '@pnpm/store.cafs': 1000.1.2 + '@pnpm/store.cafs': 1000.1.4 '@pnpm/types': 1001.3.0 - '@pnpm/worker': 1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9) + '@pnpm/worker': 1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0) detect-libc: 2.1.2 p-defer: 3.0.0 p-limit: 3.1.0 p-queue: 6.6.2 promise-share: 1.0.0 ramda: '@pnpm/ramda@0.28.1' - semver: 7.7.3 + semver: 7.7.4 ssri: 10.0.5 - '@pnpm/package-store@1007.1.2(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))': + '@pnpm/package-store@1007.1.5(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))': dependencies: - '@pnpm/create-cafs-store': 1000.0.29(@pnpm/logger@1001.0.1) - '@pnpm/crypto.hash': 1000.2.1 + '@pnpm/create-cafs-store': 1000.0.32(@pnpm/logger@1001.0.1) + '@pnpm/crypto.hash': 1000.2.2 '@pnpm/error': 1000.0.5 '@pnpm/fetcher-base': 1001.2.2 '@pnpm/logger': 1001.0.1 - '@pnpm/package-requester': 1011.2.1(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9)) + '@pnpm/package-requester': 1011.2.3(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0)) '@pnpm/resolver-base': 1005.4.1 '@pnpm/store-controller-types': 1004.5.1 - '@pnpm/store.cafs': 1000.1.2 + '@pnpm/store.cafs': 1000.1.4 '@pnpm/types': 1001.3.0 - '@pnpm/worker': 1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9) + '@pnpm/worker': 1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0) '@zkochan/rimraf': 3.0.2 is-subdir: 1.2.0 load-json-file: 6.2.0 @@ -17621,10 +17539,10 @@ snapshots: dependencies: '@pnpm/types': 1001.3.0 - '@pnpm/pnpmfile@1002.1.11(@pnpm/logger@1001.0.1)': + '@pnpm/pnpmfile@1002.1.12(@pnpm/logger@1001.0.1)': dependencies: '@pnpm/core-loggers': 1001.0.9(@pnpm/logger@1001.0.1) - '@pnpm/crypto.hash': 1000.2.1 + '@pnpm/crypto.hash': 1000.2.2 '@pnpm/error': 1000.0.5 '@pnpm/hooks.types': 1001.0.19 '@pnpm/lockfile.types': 1002.0.9 @@ -17634,10 +17552,10 @@ snapshots: chalk: 4.1.2 path-absolute: 1.0.1 - '@pnpm/prepare-package@1001.0.3(@pnpm/logger@1001.0.1)(typanion@3.14.0)': + '@pnpm/prepare-package@1001.0.6(@pnpm/logger@1001.0.1)(typanion@3.14.0)': dependencies: '@pnpm/error': 1000.0.5 - '@pnpm/lifecycle': 1001.0.33(@pnpm/logger@1001.0.1)(typanion@3.14.0) + '@pnpm/lifecycle': 1001.0.36(@pnpm/logger@1001.0.1)(typanion@3.14.0) '@pnpm/read-package-json': 1000.1.7 '@pnpm/types': 1001.3.0 '@zkochan/rimraf': 3.0.2 @@ -17662,11 +17580,11 @@ snapshots: load-json-file: 6.2.0 normalize-package-data: 7.0.1 - '@pnpm/read-project-manifest@1001.2.4(@pnpm/logger@1001.0.1)': + '@pnpm/read-project-manifest@1001.2.5(@pnpm/logger@1001.0.1)': dependencies: '@gwhitney/detect-indent': 7.0.1 '@pnpm/error': 1000.0.5 - '@pnpm/graceful-fs': 1000.0.1 + '@pnpm/graceful-fs': 1000.1.0 '@pnpm/logger': 1001.0.1 '@pnpm/manifest-utils': 1002.0.4(@pnpm/logger@1001.0.1) '@pnpm/text.comments-parser': 1000.0.0 @@ -17683,64 +17601,64 @@ snapshots: dependencies: '@pnpm/logger': 1001.0.1 '@pnpm/registry.types': 1000.1.4 - semver: 7.7.3 + semver: 7.7.4 '@pnpm/registry.types@1000.1.4': dependencies: '@pnpm/types': 1001.3.0 - '@pnpm/render-peer-issues@1002.0.10': + '@pnpm/render-peer-issues@1002.0.11': dependencies: '@pnpm/error': 1000.0.5 + '@pnpm/text.tree-renderer': 1000.0.0 '@pnpm/types': 1001.3.0 - archy: 1.0.0 chalk: 4.1.2 cli-columns: 4.0.0 - '@pnpm/resolve-workspace-range@1000.0.0': + '@pnpm/resolve-workspace-range@1000.1.0': dependencies: - semver: 7.7.3 + semver: 7.7.4 '@pnpm/resolver-base@1005.4.1': dependencies: '@pnpm/types': 1001.3.0 - '@pnpm/resolving.bun-resolver@1005.0.3(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0)': + '@pnpm/resolving.bun-resolver@1005.0.10(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0)': dependencies: '@pnpm/constants': 1001.3.1 - '@pnpm/crypto.shasums-file': 1001.0.2 + '@pnpm/crypto.shasums-file': 1001.0.4 '@pnpm/error': 1000.0.5 '@pnpm/fetcher-base': 1001.2.2 - '@pnpm/fetching-types': 1000.2.0 - '@pnpm/fetching.binary-fetcher': 1005.0.2(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9)) - '@pnpm/node.fetcher': 1001.0.19(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0) - '@pnpm/npm-resolver': 1005.1.1(@pnpm/logger@1001.0.1) + '@pnpm/fetching-types': 1000.2.1 + '@pnpm/fetching.binary-fetcher': 1005.0.3(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0)) + '@pnpm/node.fetcher': 1001.0.26(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0) + '@pnpm/npm-resolver': 1005.2.2(@pnpm/logger@1001.0.1) '@pnpm/resolver-base': 1005.4.1 '@pnpm/types': 1001.3.0 '@pnpm/util.lex-comparator': 3.0.2 - '@pnpm/worker': 1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9) - semver: 7.7.3 + '@pnpm/worker': 1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0) + semver: 7.7.4 transitivePeerDependencies: - '@pnpm/logger' - domexception - supports-color - typanion - '@pnpm/resolving.deno-resolver@1005.0.3(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0)': + '@pnpm/resolving.deno-resolver@1005.0.10(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0)': dependencies: '@pnpm/constants': 1001.3.1 - '@pnpm/crypto.shasums-file': 1001.0.2 + '@pnpm/crypto.shasums-file': 1001.0.4 '@pnpm/error': 1000.0.5 '@pnpm/fetcher-base': 1001.2.2 - '@pnpm/fetching-types': 1000.2.0 - '@pnpm/fetching.binary-fetcher': 1005.0.2(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9)) - '@pnpm/node.fetcher': 1001.0.19(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0) - '@pnpm/npm-resolver': 1005.1.1(@pnpm/logger@1001.0.1) + '@pnpm/fetching-types': 1000.2.1 + '@pnpm/fetching.binary-fetcher': 1005.0.3(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0)) + '@pnpm/node.fetcher': 1001.0.26(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0) + '@pnpm/npm-resolver': 1005.2.2(@pnpm/logger@1001.0.1) '@pnpm/resolver-base': 1005.4.1 '@pnpm/types': 1001.3.0 '@pnpm/util.lex-comparator': 3.0.2 - '@pnpm/worker': 1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9) - semver: 7.7.3 + '@pnpm/worker': 1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0) + semver: 7.7.4 transitivePeerDependencies: - '@pnpm/logger' - domexception @@ -17753,11 +17671,11 @@ snapshots: '@pnpm/semver.peer-range@1000.0.0': dependencies: - semver: 7.7.3 + semver: 7.7.4 - '@pnpm/server@1001.0.19(@pnpm/logger@1001.0.1)': + '@pnpm/server@1001.0.20(@pnpm/logger@1001.0.1)': dependencies: - '@pnpm/fetch': 1000.2.11(@pnpm/logger@1001.0.1) + '@pnpm/fetch': 1001.0.0(@pnpm/logger@1001.0.1) '@pnpm/logger': 1001.0.1 '@pnpm/store-controller-types': 1004.5.1 '@pnpm/types': 1001.3.0 @@ -17768,15 +17686,15 @@ snapshots: - domexception - supports-color - '@pnpm/store-connection-manager@1002.3.11(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0)': + '@pnpm/store-connection-manager@1002.3.18(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0)': dependencies: '@pnpm/cli-meta': 1000.0.16 - '@pnpm/client': 1001.1.16(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0) - '@pnpm/config': 1004.9.2(@pnpm/logger@1001.0.1) + '@pnpm/client': 1001.1.23(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0) + '@pnpm/config': 1004.10.4(@pnpm/logger@1001.0.1) '@pnpm/error': 1000.0.5 '@pnpm/logger': 1001.0.1 - '@pnpm/package-store': 1007.1.2(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9)) - '@pnpm/server': 1001.0.19(@pnpm/logger@1001.0.1) + '@pnpm/package-store': 1007.1.5(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0)) + '@pnpm/server': 1001.0.20(@pnpm/logger@1001.0.1) '@pnpm/store-path': 1000.0.5 '@zkochan/diable': 1.0.2 delay: 5.0.0 @@ -17800,19 +17718,20 @@ snapshots: '@zkochan/rimraf': 3.0.2 can-link: 2.0.0 path-absolute: 1.0.1 - path-temp: 2.1.0 + path-temp: 2.1.1 root-link-target: 3.1.0 touch: 3.1.0 - '@pnpm/store.cafs@1000.1.2': + '@pnpm/store.cafs@1000.1.4': dependencies: '@pnpm/fetcher-base': 1001.2.2 - '@pnpm/graceful-fs': 1000.0.1 + '@pnpm/graceful-fs': 1000.1.0 '@pnpm/store-controller-types': 1004.5.1 '@zkochan/rimraf': 3.0.2 is-gzip: 2.0.0 + is-subdir: 1.2.0 p-limit: 3.1.0 - rename-overwrite: 6.0.3 + rename-overwrite: 6.0.6 ssri: 10.0.5 strip-bom: 4.0.0 @@ -17823,32 +17742,32 @@ snapshots: '@pnpm/types': 1001.3.0 symlink-dir: 6.0.5 - '@pnpm/tarball-fetcher@1006.0.2(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0)': + '@pnpm/tarball-fetcher@1006.0.5(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0)': dependencies: '@pnpm/core-loggers': 1001.0.9(@pnpm/logger@1001.0.1) '@pnpm/error': 1000.0.5 '@pnpm/fetcher-base': 1001.2.2 - '@pnpm/fetching-types': 1000.2.0 + '@pnpm/fetching-types': 1000.2.1 '@pnpm/fs.packlist': 1000.0.0 - '@pnpm/graceful-fs': 1000.0.1 + '@pnpm/graceful-fs': 1000.1.0 '@pnpm/logger': 1001.0.1 - '@pnpm/prepare-package': 1001.0.3(@pnpm/logger@1001.0.1)(typanion@3.14.0) + '@pnpm/prepare-package': 1001.0.6(@pnpm/logger@1001.0.1)(typanion@3.14.0) '@pnpm/types': 1001.3.0 - '@pnpm/worker': 1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9) + '@pnpm/worker': 1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0) '@zkochan/retry': 0.2.0 lodash.throttle: 4.1.1 p-map-values: 1.0.0 - path-temp: 2.1.0 + path-temp: 2.1.1 ramda: '@pnpm/ramda@0.28.1' - rename-overwrite: 6.0.3 + rename-overwrite: 6.0.6 transitivePeerDependencies: - domexception - supports-color - typanion - '@pnpm/tarball-resolver@1002.2.0': + '@pnpm/tarball-resolver@1002.2.1': dependencies: - '@pnpm/fetching-types': 1000.2.0 + '@pnpm/fetching-types': 1000.2.1 '@pnpm/resolver-base': 1005.4.1 transitivePeerDependencies: - domexception @@ -17857,6 +17776,8 @@ snapshots: dependencies: strip-comments-strings: 1.2.0 + '@pnpm/text.tree-renderer@1000.0.0': {} + '@pnpm/types@1001.3.0': {} '@pnpm/util.lex-comparator@3.0.2': {} @@ -17865,30 +17786,30 @@ snapshots: dependencies: isexe: 2.0.0 - '@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9)': + '@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0)': dependencies: '@pnpm/cafs-types': 1000.1.0 - '@pnpm/create-cafs-store': 1000.0.29(@pnpm/logger@1001.0.1) + '@pnpm/create-cafs-store': 1000.0.32(@pnpm/logger@1001.0.1) '@pnpm/crypto.polyfill': 1000.1.0 '@pnpm/error': 1000.0.5 '@pnpm/exec.pkg-requires-build': 1000.0.16 - '@pnpm/fs.hard-link-dir': 1000.0.5(@pnpm/logger@1001.0.1) - '@pnpm/graceful-fs': 1000.0.1 + '@pnpm/fs.hard-link-dir': 1000.0.6(@pnpm/logger@1001.0.1) + '@pnpm/graceful-fs': 1000.1.0 '@pnpm/logger': 1001.0.1 - '@pnpm/store.cafs': 1000.1.2 + '@pnpm/store.cafs': 1000.1.4 '@pnpm/symlink-dependency': 1000.0.17(@pnpm/logger@1001.0.1) - '@rushstack/worker-pool': 0.4.9(@types/node@25.0.9) + '@rushstack/worker-pool': 0.4.9(@types/node@25.5.0) is-windows: 1.0.2 load-json-file: 6.2.0 p-limit: 3.1.0 transitivePeerDependencies: - '@types/node' - '@pnpm/workspace.find-packages@1000.0.55(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0)': + '@pnpm/workspace.find-packages@1000.0.64(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0)': dependencies: - '@pnpm/cli-utils': 1001.3.0(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.2(@pnpm/logger@1001.0.1)(@types/node@25.0.9))(typanion@3.14.0) + '@pnpm/cli-utils': 1001.3.9(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.5.0))(typanion@3.14.0) '@pnpm/constants': 1001.3.1 - '@pnpm/fs.find-packages': 1000.0.22(@pnpm/logger@1001.0.1) + '@pnpm/fs.find-packages': 1000.0.23(@pnpm/logger@1001.0.1) '@pnpm/logger': 1001.0.1 '@pnpm/types': 1001.3.0 '@pnpm/util.lex-comparator': 3.0.2 @@ -17898,18 +17819,20 @@ snapshots: - supports-color - typanion - '@pnpm/workspace.manifest-writer@1001.1.2': + '@pnpm/workspace.manifest-writer@1001.3.0': dependencies: '@pnpm/catalogs.types': 1000.0.0 '@pnpm/constants': 1001.3.1 '@pnpm/lockfile.types': 1002.0.9 '@pnpm/object.key-sorting': 1000.0.1 '@pnpm/types': 1001.3.0 - '@pnpm/workspace.read-manifest': 1000.2.10 + '@pnpm/workspace.read-manifest': 1000.3.0 + '@pnpm/yaml.document-sync': 1000.0.0 ramda: '@pnpm/ramda@0.28.1' - write-yaml-file: 5.0.0 + write-file-atomic: 5.0.1 + yaml: 2.8.3 - '@pnpm/workspace.read-manifest@1000.2.10': + '@pnpm/workspace.read-manifest@1000.3.0': dependencies: '@pnpm/constants': 1001.3.1 '@pnpm/error': 1000.0.5 @@ -17926,6 +17849,10 @@ snapshots: write-file-atomic: 5.0.1 write-yaml-file: 5.0.0 + '@pnpm/yaml.document-sync@1000.0.0': + dependencies: + yaml: 2.8.3 + '@polka/url@1.0.0-next.29': {} '@reflink/reflink-darwin-arm64@0.1.19': @@ -17965,171 +17892,227 @@ snapshots: '@reteps/dockerfmt@0.3.6': {} - '@rolldown/pluginutils@1.0.0-beta.27': {} + '@rolldown/binding-android-arm64@1.0.0-rc.10': + optional: true + + '@rolldown/binding-darwin-arm64@1.0.0-rc.10': + optional: true + + '@rolldown/binding-darwin-x64@1.0.0-rc.10': + optional: true + + '@rolldown/binding-freebsd-x64@1.0.0-rc.10': + optional: true + + '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.10': + optional: true + + '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.10': + optional: true + + '@rolldown/binding-linux-arm64-musl@1.0.0-rc.10': + optional: true + + '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.10': + optional: true + + '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.10': + optional: true + + '@rolldown/binding-linux-x64-gnu@1.0.0-rc.10': + optional: true + + '@rolldown/binding-linux-x64-musl@1.0.0-rc.10': + optional: true + + '@rolldown/binding-openharmony-arm64@1.0.0-rc.10': + optional: true + + '@rolldown/binding-wasm32-wasi@1.0.0-rc.10': + dependencies: + '@napi-rs/wasm-runtime': 1.1.1 + optional: true + + '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.10': + optional: true + + '@rolldown/binding-win32-x64-msvc@1.0.0-rc.10': + optional: true + + '@rolldown/pluginutils@1.0.0-rc.10': {} - '@rolldown/pluginutils@1.0.0-beta.53': {} + '@rolldown/pluginutils@1.0.0-rc.3': {} - '@rollup/plugin-babel@6.1.0(@babel/core@7.28.6)(@types/babel__core@7.20.5)(rollup@4.49.0)': + '@rolldown/pluginutils@1.0.0-rc.7': {} + + '@rollup/plugin-babel@6.1.0(@babel/core@7.29.0)(@types/babel__core@7.20.5)(rollup@4.60.0)': dependencies: - '@babel/core': 7.28.6 + '@babel/core': 7.29.0 '@babel/helper-module-imports': 7.28.6 - '@rollup/pluginutils': 5.3.0(rollup@4.49.0) + '@rollup/pluginutils': 5.3.0(rollup@4.60.0) optionalDependencies: '@types/babel__core': 7.20.5 - rollup: 4.49.0 + rollup: 4.60.0 transitivePeerDependencies: - supports-color - '@rollup/plugin-inject@5.0.5(rollup@4.49.0)': - dependencies: - '@rollup/pluginutils': 5.3.0(rollup@4.49.0) - estree-walker: 2.0.2 - magic-string: 0.30.21 - optionalDependencies: - rollup: 4.49.0 - - '@rollup/pluginutils@5.3.0(rollup@4.49.0)': + '@rollup/pluginutils@5.3.0(rollup@4.60.0)': dependencies: '@types/estree': 1.0.8 estree-walker: 2.0.2 picomatch: 4.0.3 optionalDependencies: - rollup: 4.49.0 + rollup: 4.60.0 + + '@rollup/rollup-android-arm-eabi@4.60.0': + optional: true - '@rollup/rollup-android-arm-eabi@4.49.0': + '@rollup/rollup-android-arm64@4.60.0': optional: true - '@rollup/rollup-android-arm64@4.49.0': + '@rollup/rollup-darwin-arm64@4.60.0': optional: true - '@rollup/rollup-darwin-arm64@4.49.0': + '@rollup/rollup-darwin-x64@4.60.0': optional: true - '@rollup/rollup-darwin-x64@4.49.0': + '@rollup/rollup-freebsd-arm64@4.60.0': optional: true - '@rollup/rollup-freebsd-arm64@4.49.0': + '@rollup/rollup-freebsd-x64@4.60.0': optional: true - '@rollup/rollup-freebsd-x64@4.49.0': + '@rollup/rollup-linux-arm-gnueabihf@4.60.0': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.49.0': + '@rollup/rollup-linux-arm-musleabihf@4.60.0': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.49.0': + '@rollup/rollup-linux-arm64-gnu@4.60.0': optional: true - '@rollup/rollup-linux-arm64-gnu@4.49.0': + '@rollup/rollup-linux-arm64-musl@4.60.0': optional: true - '@rollup/rollup-linux-arm64-musl@4.49.0': + '@rollup/rollup-linux-loong64-gnu@4.60.0': optional: true - '@rollup/rollup-linux-loongarch64-gnu@4.49.0': + '@rollup/rollup-linux-loong64-musl@4.60.0': optional: true - '@rollup/rollup-linux-ppc64-gnu@4.49.0': + '@rollup/rollup-linux-ppc64-gnu@4.60.0': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.49.0': + '@rollup/rollup-linux-ppc64-musl@4.60.0': optional: true - '@rollup/rollup-linux-riscv64-musl@4.49.0': + '@rollup/rollup-linux-riscv64-gnu@4.60.0': optional: true - '@rollup/rollup-linux-s390x-gnu@4.49.0': + '@rollup/rollup-linux-riscv64-musl@4.60.0': optional: true - '@rollup/rollup-linux-x64-gnu@4.49.0': + '@rollup/rollup-linux-s390x-gnu@4.60.0': optional: true '@rollup/rollup-linux-x64-gnu@4.53.3': optional: true - '@rollup/rollup-linux-x64-musl@4.49.0': + '@rollup/rollup-linux-x64-gnu@4.60.0': + optional: true + + '@rollup/rollup-linux-x64-musl@4.60.0': + optional: true + + '@rollup/rollup-openbsd-x64@4.60.0': optional: true - '@rollup/rollup-win32-arm64-msvc@4.49.0': + '@rollup/rollup-openharmony-arm64@4.60.0': optional: true - '@rollup/rollup-win32-ia32-msvc@4.49.0': + '@rollup/rollup-win32-arm64-msvc@4.60.0': optional: true - '@rollup/rollup-win32-x64-msvc@4.49.0': + '@rollup/rollup-win32-ia32-msvc@4.60.0': optional: true - '@rtsao/scc@1.1.0': {} + '@rollup/rollup-win32-x64-gnu@4.60.0': + optional: true + + '@rollup/rollup-win32-x64-msvc@4.60.0': + optional: true - '@rushstack/node-core-library@5.19.1(@types/node@25.0.9)': + '@rushstack/node-core-library@5.20.3(@types/node@25.5.0)': dependencies: - ajv: 8.13.0 - ajv-draft-04: 1.0.0(ajv@8.13.0) - ajv-formats: 3.0.1(ajv@8.13.0) - fs-extra: 11.3.3 + ajv: 8.18.0 + ajv-draft-04: 1.0.0(ajv@8.18.0) + ajv-formats: 3.0.1(ajv@8.18.0) + fs-extra: 11.3.4 import-lazy: 4.0.0 jju: 1.4.0 resolve: 1.22.11 semver: 7.5.4 optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 - '@rushstack/problem-matcher@0.1.1(@types/node@25.0.9)': + '@rushstack/problem-matcher@0.2.1(@types/node@25.5.0)': optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 - '@rushstack/rig-package@0.6.0': + '@rushstack/rig-package@0.7.2': dependencies: resolve: 1.22.11 strip-json-comments: 3.1.1 - '@rushstack/terminal@0.19.5(@types/node@25.0.9)': + '@rushstack/terminal@0.22.3(@types/node@25.5.0)': dependencies: - '@rushstack/node-core-library': 5.19.1(@types/node@25.0.9) - '@rushstack/problem-matcher': 0.1.1(@types/node@25.0.9) + '@rushstack/node-core-library': 5.20.3(@types/node@25.5.0) + '@rushstack/problem-matcher': 0.2.1(@types/node@25.5.0) supports-color: 8.1.1 optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 - '@rushstack/ts-command-line@5.1.5(@types/node@25.0.9)': + '@rushstack/ts-command-line@5.3.3(@types/node@25.5.0)': dependencies: - '@rushstack/terminal': 0.19.5(@types/node@25.0.9) + '@rushstack/terminal': 0.22.3(@types/node@25.5.0) '@types/argparse': 1.0.38 argparse: 1.0.10 string-argv: 0.3.2 transitivePeerDependencies: - '@types/node' - '@rushstack/worker-pool@0.4.9(@types/node@25.0.9)': + '@rushstack/worker-pool@0.4.9(@types/node@25.5.0)': optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 - '@scalar/helpers@0.2.8': {} + '@scalar/helpers@0.2.18': {} - '@scalar/json-magic@0.9.1': + '@scalar/json-magic@0.11.7': dependencies: - '@scalar/helpers': 0.2.8 - yaml: 2.8.2 + '@scalar/helpers': 0.2.18 + pathe: 2.0.3 + yaml: 2.8.3 - '@scalar/openapi-parser@0.24.1': + '@scalar/openapi-parser@0.24.17': dependencies: - '@scalar/json-magic': 0.9.1 - '@scalar/openapi-types': 0.5.3 - '@scalar/openapi-upgrader': 0.1.7 - ajv: 8.17.1 - ajv-draft-04: 1.0.0(ajv@8.17.1) - ajv-formats: 3.0.1(ajv@8.17.1) + '@scalar/helpers': 0.2.18 + '@scalar/json-magic': 0.11.7 + '@scalar/openapi-types': 0.5.4 + '@scalar/openapi-upgrader': 0.1.11 + ajv: 8.18.0 + ajv-draft-04: 1.0.0(ajv@8.18.0) + ajv-formats: 3.0.1(ajv@8.18.0) jsonpointer: 5.0.1 leven: 4.1.0 - yaml: 2.8.2 + yaml: 2.8.3 - '@scalar/openapi-types@0.5.3': + '@scalar/openapi-types@0.5.4': dependencies: - zod: 4.3.5 + zod: 4.3.6 - '@scalar/openapi-upgrader@0.1.7': + '@scalar/openapi-upgrader@0.1.11': dependencies: - '@scalar/openapi-types': 0.5.3 + '@scalar/openapi-types': 0.5.4 '@scarf/scarf@1.4.0': {} @@ -18144,9 +18127,9 @@ snapshots: '@secretlint/profiler': 10.2.2 '@secretlint/resolver': 10.2.2 '@secretlint/types': 10.2.2 - ajv: 8.17.1 - debug: 4.4.3(supports-color@8.1.1) - rc-config-loader: 4.1.3 + ajv: 8.18.0 + debug: 4.4.3 + rc-config-loader: 4.1.4 transitivePeerDependencies: - supports-color @@ -18154,7 +18137,7 @@ snapshots: dependencies: '@secretlint/profiler': 10.2.2 '@secretlint/types': 10.2.2 - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 structured-source: 4.0.0 transitivePeerDependencies: - supports-color @@ -18163,13 +18146,13 @@ snapshots: dependencies: '@secretlint/resolver': 10.2.2 '@secretlint/types': 10.2.2 - '@textlint/linter-formatter': 15.5.1 - '@textlint/module-interop': 15.5.1 - '@textlint/types': 15.5.1 + '@textlint/linter-formatter': 15.5.2 + '@textlint/module-interop': 15.5.2 + '@textlint/types': 15.5.2 chalk: 5.6.2 - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 pluralize: 8.0.0 - strip-ansi: 7.1.2 + strip-ansi: 7.2.0 table: 6.9.0 terminal-link: 4.0.0 transitivePeerDependencies: @@ -18183,7 +18166,7 @@ snapshots: '@secretlint/profiler': 10.2.2 '@secretlint/source-creator': 10.2.2 '@secretlint/types': 10.2.2 - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 p-map: 7.0.4 transitivePeerDependencies: - supports-color @@ -18209,33 +18192,71 @@ snapshots: '@secretlint/types@10.2.2': {} - '@shikijs/core@3.21.0': + '@shikijs/core@3.23.0': dependencies: - '@shikijs/types': 3.21.0 + '@shikijs/types': 3.23.0 '@shikijs/vscode-textmate': 10.0.2 '@types/hast': 3.0.4 hast-util-to-html: 9.0.5 - '@shikijs/engine-javascript@3.21.0': + '@shikijs/core@4.0.2': dependencies: - '@shikijs/types': 3.21.0 + '@shikijs/primitive': 4.0.2 + '@shikijs/types': 4.0.2 '@shikijs/vscode-textmate': 10.0.2 - oniguruma-to-es: 4.3.4 - - '@shikijs/engine-oniguruma@3.21.0': + '@types/hast': 3.0.4 + hast-util-to-html: 9.0.5 + + '@shikijs/engine-javascript@3.23.0': + dependencies: + '@shikijs/types': 3.23.0 + '@shikijs/vscode-textmate': 10.0.2 + oniguruma-to-es: 4.3.4 + + '@shikijs/engine-javascript@4.0.2': + dependencies: + '@shikijs/types': 4.0.2 + '@shikijs/vscode-textmate': 10.0.2 + oniguruma-to-es: 4.3.4 + + '@shikijs/engine-oniguruma@3.23.0': + dependencies: + '@shikijs/types': 3.23.0 + '@shikijs/vscode-textmate': 10.0.2 + + '@shikijs/engine-oniguruma@4.0.2': + dependencies: + '@shikijs/types': 4.0.2 + '@shikijs/vscode-textmate': 10.0.2 + + '@shikijs/langs@3.23.0': + dependencies: + '@shikijs/types': 3.23.0 + + '@shikijs/langs@4.0.2': + dependencies: + '@shikijs/types': 4.0.2 + + '@shikijs/primitive@4.0.2': dependencies: - '@shikijs/types': 3.21.0 + '@shikijs/types': 4.0.2 '@shikijs/vscode-textmate': 10.0.2 + '@types/hast': 3.0.4 + + '@shikijs/themes@3.23.0': + dependencies: + '@shikijs/types': 3.23.0 - '@shikijs/langs@3.21.0': + '@shikijs/themes@4.0.2': dependencies: - '@shikijs/types': 3.21.0 + '@shikijs/types': 4.0.2 - '@shikijs/themes@3.21.0': + '@shikijs/types@3.23.0': dependencies: - '@shikijs/types': 3.21.0 + '@shikijs/vscode-textmate': 10.0.2 + '@types/hast': 3.0.4 - '@shikijs/types@3.21.0': + '@shikijs/types@4.0.2': dependencies: '@shikijs/vscode-textmate': 10.0.2 '@types/hast': 3.0.4 @@ -18274,7 +18295,7 @@ snapshots: '@sigstore/bundle': 4.0.0 '@sigstore/core': 3.1.0 '@sigstore/protobuf-specs': 0.5.0 - make-fetch-happen: 15.0.3 + make-fetch-happen: 15.0.4 proc-log: 6.1.0 promise-retry: 2.0.1 transitivePeerDependencies: @@ -18314,27 +18335,25 @@ snapshots: '@standard-schema/spec@1.1.0': {} - '@storybook/builder-vite@10.1.11(esbuild@0.27.2)(rollup@4.49.0)(storybook@10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2))': + '@storybook/builder-vite@10.3.3(esbuild@0.27.4)(rollup@4.60.0)(storybook@10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2))': dependencies: - '@storybook/csf-plugin': 10.1.11(esbuild@0.27.2)(rollup@4.49.0)(storybook@10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) - '@vitest/mocker': 3.2.4(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) - storybook: 10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + '@storybook/csf-plugin': 10.3.3(esbuild@0.27.4)(rollup@4.60.0)(storybook@10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) + storybook: 10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) ts-dedent: 2.2.0 - vite: 7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + vite: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2) transitivePeerDependencies: - esbuild - - msw - rollup - webpack - '@storybook/cli@10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@storybook/cli@10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': dependencies: - '@storybook/codemod': 10.1.11(@testing-library/dom@10.4.1)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + '@storybook/codemod': 10.3.3(@testing-library/dom@10.4.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) '@types/semver': 7.7.1 - commander: 14.0.2 - create-storybook: 10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + commander: 14.0.3 + create-storybook: 10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) jscodeshift: 0.15.2 - storybook: 10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + storybook: 10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) ts-dedent: 2.2.0 transitivePeerDependencies: - '@babel/preset-env' @@ -18346,14 +18365,14 @@ snapshots: - supports-color - utf-8-validate - '@storybook/codemod@10.1.11(@testing-library/dom@10.4.1)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@storybook/codemod@10.3.3(@testing-library/dom@10.4.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': dependencies: '@types/cross-spawn': 6.0.6 cross-spawn: 7.0.6 - es-toolkit: 1.44.0 + es-toolkit: 1.45.1 jscodeshift: 0.15.2 - prettier: 3.8.0 - storybook: 10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + prettier: 3.8.1 + storybook: 10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) tiny-invariant: 1.3.3 tinyglobby: 0.2.15 transitivePeerDependencies: @@ -18365,65 +18384,65 @@ snapshots: - supports-color - utf-8-validate - '@storybook/csf-plugin@10.1.11(esbuild@0.27.2)(rollup@4.49.0)(storybook@10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2))': + '@storybook/csf-plugin@10.3.3(esbuild@0.27.4)(rollup@4.60.0)(storybook@10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2))': dependencies: - storybook: 10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + storybook: 10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) unplugin: 2.3.11 optionalDependencies: - esbuild: 0.27.2 - rollup: 4.49.0 - vite: 7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + esbuild: 0.27.4 + rollup: 4.60.0 + vite: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2) '@storybook/global@5.0.0': {} - '@storybook/icons@2.0.1(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@storybook/icons@2.0.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': dependencies: - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) - '@storybook/react-dom-shim@10.1.11(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(storybook@10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))': + '@storybook/react-dom-shim@10.3.3(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(storybook@10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))': dependencies: - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - storybook: 10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) + storybook: 10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) - '@storybook/react-vite@10.1.11(esbuild@0.27.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(rollup@4.49.0)(storybook@10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2))': + '@storybook/react-vite@10.3.3(esbuild@0.27.4)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(rollup@4.60.0)(storybook@10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2))': dependencies: - '@joshwooding/vite-plugin-react-docgen-typescript': 0.6.3(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) - '@rollup/pluginutils': 5.3.0(rollup@4.49.0) - '@storybook/builder-vite': 10.1.11(esbuild@0.27.2)(rollup@4.49.0)(storybook@10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) - '@storybook/react': 10.1.11(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(storybook@10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(typescript@5.9.3) + '@joshwooding/vite-plugin-react-docgen-typescript': 0.6.4(typescript@5.9.3)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) + '@rollup/pluginutils': 5.3.0(rollup@4.60.0) + '@storybook/builder-vite': 10.3.3(esbuild@0.27.4)(rollup@4.60.0)(storybook@10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) + '@storybook/react': 10.3.3(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(storybook@10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3) empathic: 2.0.0 magic-string: 0.30.21 - react: 19.2.3 - react-docgen: 8.0.2 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.4 + react-docgen: 8.0.3 + react-dom: 19.2.4(react@19.2.4) resolve: 1.22.11 - storybook: 10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + storybook: 10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) tsconfig-paths: 4.2.0 - vite: 7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + vite: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2) transitivePeerDependencies: - esbuild - - msw - rollup - supports-color - typescript - webpack - '@storybook/react@10.1.11(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(storybook@10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(typescript@5.9.3)': + '@storybook/react@10.3.3(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(storybook@10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3)': dependencies: '@storybook/global': 5.0.0 - '@storybook/react-dom-shim': 10.1.11(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(storybook@10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) - react: 19.2.3 - react-docgen: 8.0.2 - react-dom: 19.2.3(react@19.2.3) - storybook: 10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + '@storybook/react-dom-shim': 10.3.3(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(storybook@10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)) + react: 19.2.4 + react-docgen: 8.0.3 + react-docgen-typescript: 2.4.0(typescript@5.9.3) + react-dom: 19.2.4(react@19.2.4) + storybook: 10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) optionalDependencies: typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@swc/helpers@0.5.18': + '@swc/helpers@0.5.19': dependencies: tslib: 2.8.1 @@ -18433,7 +18452,7 @@ snapshots: '@testing-library/dom@10.4.1': dependencies: - '@babel/code-frame': 7.28.6 + '@babel/code-frame': 7.29.0 '@babel/runtime': 7.28.6 '@types/aria-query': 5.0.4 aria-query: 5.3.0 @@ -18451,33 +18470,33 @@ snapshots: picocolors: 1.1.1 redent: 3.0.0 - '@testing-library/react@16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@testing-library/react@16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': dependencies: '@babel/runtime': 7.28.6 '@testing-library/dom': 10.4.1 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) optionalDependencies: - '@types/react': 19.2.9 - '@types/react-dom': 19.2.3(@types/react@19.2.9) + '@types/react': 19.2.14 + '@types/react-dom': 19.2.3(@types/react@19.2.14) '@testing-library/user-event@14.6.1(@testing-library/dom@10.4.1)': dependencies: '@testing-library/dom': 10.4.1 - '@textlint/ast-node-types@15.5.1': {} + '@textlint/ast-node-types@15.5.2': {} - '@textlint/linter-formatter@15.5.1': + '@textlint/linter-formatter@15.5.2': dependencies: '@azu/format-text': 1.0.2 '@azu/style-format': 1.0.1 - '@textlint/module-interop': 15.5.1 - '@textlint/resolver': 15.5.1 - '@textlint/types': 15.5.1 + '@textlint/module-interop': 15.5.2 + '@textlint/resolver': 15.5.2 + '@textlint/types': 15.5.2 chalk: 4.1.2 - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 js-yaml: 4.1.1 - lodash: 4.17.21 + lodash: 4.17.23 pluralize: 2.0.0 string-width: 4.2.3 strip-ansi: 6.0.1 @@ -18486,67 +18505,72 @@ snapshots: transitivePeerDependencies: - supports-color - '@textlint/module-interop@15.5.1': {} + '@textlint/module-interop@15.5.2': {} - '@textlint/resolver@15.5.1': {} + '@textlint/resolver@15.5.2': {} - '@textlint/types@15.5.1': + '@textlint/types@15.5.2': dependencies: - '@textlint/ast-node-types': 15.5.1 + '@textlint/ast-node-types': 15.5.2 '@tufjs/canonical-json@2.0.0': {} '@tufjs/models@3.0.1': dependencies: '@tufjs/canonical-json': 2.0.0 - minimatch: 9.0.5 + minimatch: 9.0.9 '@tufjs/models@4.1.0': dependencies: '@tufjs/canonical-json': 2.0.0 - minimatch: 10.1.1 + minimatch: 10.2.4 + + '@tybys/wasm-util@0.10.1': + dependencies: + tslib: 2.8.1 + optional: true '@types/argparse@1.0.38': {} '@types/aria-query@5.0.4': {} - '@types/aws-lambda@8.10.160': {} + '@types/aws-lambda@8.10.161': {} '@types/babel__code-frame@7.27.0': {} '@types/babel__core@7.20.5': dependencies: - '@babel/parser': 7.28.6 - '@babel/types': 7.28.6 + '@babel/parser': 7.29.0 + '@babel/types': 7.29.0 '@types/babel__generator': 7.27.0 '@types/babel__template': 7.4.4 '@types/babel__traverse': 7.28.0 '@types/babel__generator@7.27.0': dependencies: - '@babel/types': 7.28.6 + '@babel/types': 7.29.0 '@types/babel__template@7.4.4': dependencies: - '@babel/parser': 7.28.6 - '@babel/types': 7.28.6 + '@babel/parser': 7.29.0 + '@babel/types': 7.29.0 '@types/babel__traverse@7.28.0': dependencies: - '@babel/types': 7.28.6 + '@babel/types': 7.29.0 '@types/body-parser@1.19.6': dependencies: '@types/connect': 3.4.38 - '@types/node': 25.0.9 + '@types/node': 25.5.0 '@types/braces@3.0.5': {} '@types/cacheable-request@6.0.3': dependencies: - '@types/http-cache-semantics': 4.0.4 + '@types/http-cache-semantics': 4.2.0 '@types/keyv': 3.1.4 - '@types/node': 25.0.9 + '@types/node': 25.5.0 '@types/responselike': 1.0.3 '@types/chai@5.2.3': @@ -18556,11 +18580,11 @@ snapshots: '@types/connect@3.4.38': dependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 '@types/cross-spawn@6.0.6': dependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 '@types/d3-array@3.2.2': {} @@ -18693,6 +18717,8 @@ snapshots: '@types/emscripten@1.41.5': {} + '@types/esrecurse@4.3.1': {} + '@types/estree-jsx@1.0.5': dependencies: '@types/estree': 1.0.8 @@ -18701,8 +18727,8 @@ snapshots: '@types/express-serve-static-core@5.1.1': dependencies: - '@types/node': 25.0.9 - '@types/qs': 6.14.0 + '@types/node': 25.5.0 + '@types/qs': 6.15.0 '@types/range-parser': 1.2.7 '@types/send': 1.2.1 @@ -18718,7 +18744,7 @@ snapshots: dependencies: '@types/unist': 3.0.3 - '@types/http-cache-semantics@4.0.4': {} + '@types/http-cache-semantics@4.2.0': {} '@types/http-errors@2.0.5': {} @@ -18728,11 +18754,9 @@ snapshots: '@types/json-schema@7.0.15': {} - '@types/json5@0.0.29': {} - '@types/keyv@3.1.4': dependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 '@types/mdast@4.0.4': dependencies: @@ -18744,15 +18768,13 @@ snapshots: dependencies: '@types/braces': 3.0.5 - '@types/mocha@10.0.10': {} - '@types/morgan@1.9.10': dependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 '@types/ms@2.1.0': {} - '@types/multer@2.0.0': + '@types/multer@2.1.0': dependencies: '@types/express': 5.0.6 @@ -18762,36 +18784,36 @@ snapshots: dependencies: '@types/unist': 3.0.3 - '@types/node@17.0.45': {} - '@types/node@18.19.130': dependencies: undici-types: 5.26.5 - '@types/node@25.0.9': + '@types/node@24.12.0': dependencies: undici-types: 7.16.0 - '@types/normalize-package-data@2.4.4': {} + '@types/node@25.5.0': + dependencies: + undici-types: 7.18.2 - '@types/parse-json@4.0.2': {} + '@types/normalize-package-data@2.4.4': {} '@types/plist@3.0.5': dependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 xmlbuilder: 15.1.1 - '@types/prismjs@1.26.5': {} + '@types/prismjs@1.26.6': {} - '@types/qs@6.14.0': {} + '@types/qs@6.15.0': {} '@types/range-parser@1.2.7': {} - '@types/react-dom@19.2.3(@types/react@19.2.9)': + '@types/react-dom@19.2.3(@types/react@19.2.14)': dependencies: - '@types/react': 19.2.9 + '@types/react': 19.2.14 - '@types/react@19.2.9': + '@types/react@19.2.14': dependencies: csstype: 3.2.3 @@ -18803,28 +18825,28 @@ snapshots: '@types/responselike@1.0.3': dependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 '@types/sarif@2.1.7': {} '@types/sax@1.2.7': dependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 '@types/semver@7.7.1': {} '@types/send@1.2.1': dependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 '@types/serve-static@2.2.0': dependencies: '@types/http-errors': 2.0.5 - '@types/node': 25.0.9 + '@types/node': 25.5.0 '@types/ssri@7.1.5': dependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 '@types/swagger-ui-dist@3.30.6': {} @@ -18833,7 +18855,7 @@ snapshots: '@types/express': 5.0.6 '@types/serve-static': 2.2.0 - '@types/swagger-ui@5.21.1': {} + '@types/swagger-ui@5.32.0': {} '@types/treeify@1.0.3': {} @@ -18844,7 +18866,7 @@ snapshots: '@types/unist@3.0.3': {} - '@types/vscode@1.108.1': {} + '@types/vscode@1.110.0': {} '@types/whatwg-mimetype@3.0.2': {} @@ -18852,11 +18874,11 @@ snapshots: '@types/ws@8.18.1': dependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 '@types/xml2js@0.4.14': dependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 '@types/yargs-parser@21.0.3': {} @@ -18866,15 +18888,15 @@ snapshots: '@types/yoga-layout@1.9.2': {} - '@typescript-eslint/eslint-plugin@8.53.1(@typescript-eslint/parser@8.53.1(eslint@9.39.2)(typescript@5.9.3))(eslint@9.39.2)(typescript@5.9.3)': + '@typescript-eslint/eslint-plugin@8.57.0(@typescript-eslint/parser@8.57.0(eslint@10.0.3)(typescript@5.9.3))(eslint@10.0.3)(typescript@5.9.3)': dependencies: '@eslint-community/regexpp': 4.12.2 - '@typescript-eslint/parser': 8.53.1(eslint@9.39.2)(typescript@5.9.3) - '@typescript-eslint/scope-manager': 8.53.1 - '@typescript-eslint/type-utils': 8.53.1(eslint@9.39.2)(typescript@5.9.3) - '@typescript-eslint/utils': 8.53.1(eslint@9.39.2)(typescript@5.9.3) - '@typescript-eslint/visitor-keys': 8.53.1 - eslint: 9.39.2 + '@typescript-eslint/parser': 8.57.0(eslint@10.0.3)(typescript@5.9.3) + '@typescript-eslint/scope-manager': 8.57.0 + '@typescript-eslint/type-utils': 8.57.0(eslint@10.0.3)(typescript@5.9.3) + '@typescript-eslint/utils': 8.57.0(eslint@10.0.3)(typescript@5.9.3) + '@typescript-eslint/visitor-keys': 8.57.0 + eslint: 10.0.3 ignore: 7.0.5 natural-compare: 1.4.0 ts-api-utils: 2.4.0(typescript@5.9.3) @@ -18882,96 +18904,96 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.53.1(eslint@9.39.2)(typescript@5.9.3)': + '@typescript-eslint/parser@8.57.0(eslint@10.0.3)(typescript@5.9.3)': dependencies: - '@typescript-eslint/scope-manager': 8.53.1 - '@typescript-eslint/types': 8.53.1 - '@typescript-eslint/typescript-estree': 8.53.1(typescript@5.9.3) - '@typescript-eslint/visitor-keys': 8.53.1 - debug: 4.4.3(supports-color@8.1.1) - eslint: 9.39.2 + '@typescript-eslint/scope-manager': 8.57.0 + '@typescript-eslint/types': 8.57.0 + '@typescript-eslint/typescript-estree': 8.57.0(typescript@5.9.3) + '@typescript-eslint/visitor-keys': 8.57.0 + debug: 4.4.3 + eslint: 10.0.3 typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/project-service@8.53.1(typescript@5.9.3)': + '@typescript-eslint/project-service@8.57.0(typescript@5.9.3)': dependencies: - '@typescript-eslint/tsconfig-utils': 8.53.1(typescript@5.9.3) - '@typescript-eslint/types': 8.53.1 - debug: 4.4.3(supports-color@8.1.1) + '@typescript-eslint/tsconfig-utils': 8.57.0(typescript@5.9.3) + '@typescript-eslint/types': 8.57.0 + debug: 4.4.3 typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/rule-tester@8.53.1(eslint@9.39.2)(typescript@5.9.3)': + '@typescript-eslint/rule-tester@8.57.0(eslint@10.0.3)(typescript@5.9.3)': dependencies: - '@typescript-eslint/parser': 8.53.1(eslint@9.39.2)(typescript@5.9.3) - '@typescript-eslint/typescript-estree': 8.53.1(typescript@5.9.3) - '@typescript-eslint/utils': 8.53.1(eslint@9.39.2)(typescript@5.9.3) - ajv: 6.12.6 - eslint: 9.39.2 + '@typescript-eslint/parser': 8.57.0(eslint@10.0.3)(typescript@5.9.3) + '@typescript-eslint/typescript-estree': 8.57.0(typescript@5.9.3) + '@typescript-eslint/utils': 8.57.0(eslint@10.0.3)(typescript@5.9.3) + ajv: 6.14.0 + eslint: 10.0.3 json-stable-stringify-without-jsonify: 1.0.1 lodash.merge: 4.6.2 - semver: 7.7.3 + semver: 7.7.4 transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/scope-manager@8.53.1': + '@typescript-eslint/scope-manager@8.57.0': dependencies: - '@typescript-eslint/types': 8.53.1 - '@typescript-eslint/visitor-keys': 8.53.1 + '@typescript-eslint/types': 8.57.0 + '@typescript-eslint/visitor-keys': 8.57.0 - '@typescript-eslint/tsconfig-utils@8.53.1(typescript@5.9.3)': + '@typescript-eslint/tsconfig-utils@8.57.0(typescript@5.9.3)': dependencies: typescript: 5.9.3 - '@typescript-eslint/type-utils@8.53.1(eslint@9.39.2)(typescript@5.9.3)': + '@typescript-eslint/type-utils@8.57.0(eslint@10.0.3)(typescript@5.9.3)': dependencies: - '@typescript-eslint/types': 8.53.1 - '@typescript-eslint/typescript-estree': 8.53.1(typescript@5.9.3) - '@typescript-eslint/utils': 8.53.1(eslint@9.39.2)(typescript@5.9.3) - debug: 4.4.3(supports-color@8.1.1) - eslint: 9.39.2 + '@typescript-eslint/types': 8.57.0 + '@typescript-eslint/typescript-estree': 8.57.0(typescript@5.9.3) + '@typescript-eslint/utils': 8.57.0(eslint@10.0.3)(typescript@5.9.3) + debug: 4.4.3 + eslint: 10.0.3 ts-api-utils: 2.4.0(typescript@5.9.3) typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/types@8.53.1': {} + '@typescript-eslint/types@8.57.0': {} - '@typescript-eslint/typescript-estree@8.53.1(typescript@5.9.3)': + '@typescript-eslint/typescript-estree@8.57.0(typescript@5.9.3)': dependencies: - '@typescript-eslint/project-service': 8.53.1(typescript@5.9.3) - '@typescript-eslint/tsconfig-utils': 8.53.1(typescript@5.9.3) - '@typescript-eslint/types': 8.53.1 - '@typescript-eslint/visitor-keys': 8.53.1 - debug: 4.4.3(supports-color@8.1.1) - minimatch: 9.0.5 - semver: 7.7.3 + '@typescript-eslint/project-service': 8.57.0(typescript@5.9.3) + '@typescript-eslint/tsconfig-utils': 8.57.0(typescript@5.9.3) + '@typescript-eslint/types': 8.57.0 + '@typescript-eslint/visitor-keys': 8.57.0 + debug: 4.4.3 + minimatch: 10.2.4 + semver: 7.7.4 tinyglobby: 0.2.15 ts-api-utils: 2.4.0(typescript@5.9.3) typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.53.1(eslint@9.39.2)(typescript@5.9.3)': + '@typescript-eslint/utils@8.57.0(eslint@10.0.3)(typescript@5.9.3)': dependencies: - '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2) - '@typescript-eslint/scope-manager': 8.53.1 - '@typescript-eslint/types': 8.53.1 - '@typescript-eslint/typescript-estree': 8.53.1(typescript@5.9.3) - eslint: 9.39.2 + '@eslint-community/eslint-utils': 4.9.1(eslint@10.0.3) + '@typescript-eslint/scope-manager': 8.57.0 + '@typescript-eslint/types': 8.57.0 + '@typescript-eslint/typescript-estree': 8.57.0(typescript@5.9.3) + eslint: 10.0.3 typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/visitor-keys@8.53.1': + '@typescript-eslint/visitor-keys@8.57.0': dependencies: - '@typescript-eslint/types': 8.53.1 - eslint-visitor-keys: 4.2.1 + '@typescript-eslint/types': 8.57.0 + eslint-visitor-keys: 5.0.1 - '@typespec/ts-http-runtime@0.3.2': + '@typespec/ts-http-runtime@0.3.4': dependencies: http-proxy-agent: 7.0.2 https-proxy-agent: 7.0.6 @@ -18981,52 +19003,55 @@ snapshots: '@ungap/structured-clone@1.3.0': {} - '@vitejs/plugin-react@4.7.0(vite@6.4.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2))': - dependencies: - '@babel/core': 7.28.6 - '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.6) - '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.28.6) - '@rolldown/pluginutils': 1.0.0-beta.27 - '@types/babel__core': 7.20.5 - react-refresh: 0.17.0 - vite: 6.4.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) - transitivePeerDependencies: - - supports-color + '@upsetjs/venn.js@2.0.0': + optionalDependencies: + d3-selection: 3.0.0 + d3-transition: 3.0.1(d3-selection@3.0.0) - '@vitejs/plugin-react@5.1.2(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2))': + '@vitejs/plugin-react@5.2.0(vite@7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3))': dependencies: - '@babel/core': 7.28.6 - '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.6) - '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.28.6) - '@rolldown/pluginutils': 1.0.0-beta.53 + '@babel/core': 7.29.0 + '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.29.0) + '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.29.0) + '@rolldown/pluginutils': 1.0.0-rc.3 '@types/babel__core': 7.20.5 react-refresh: 0.18.0 - vite: 7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + vite: 7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3) transitivePeerDependencies: - supports-color - '@vitest/coverage-v8@4.0.17(vitest@4.0.17)': + '@vitejs/plugin-react@6.0.1(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2))': + dependencies: + '@rolldown/pluginutils': 1.0.0-rc.7 + vite: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2) + + '@vitejs/plugin-react@6.0.1(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3))': + dependencies: + '@rolldown/pluginutils': 1.0.0-rc.7 + vite: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3) + + '@vitest/coverage-v8@4.1.0(vitest@4.1.0)': dependencies: '@bcoe/v8-coverage': 1.0.2 - '@vitest/utils': 4.0.17 - ast-v8-to-istanbul: 0.3.10 + '@vitest/utils': 4.1.0 + ast-v8-to-istanbul: 1.0.0 istanbul-lib-coverage: 3.2.2 istanbul-lib-report: 3.0.1 istanbul-reports: 3.2.0 - magicast: 0.5.1 + magicast: 0.5.2 obug: 2.1.1 - std-env: 3.10.0 - tinyrainbow: 3.0.3 - vitest: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + std-env: 4.0.0 + tinyrainbow: 3.1.0 + vitest: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) - '@vitest/eslint-plugin@1.6.6(eslint@9.39.2)(typescript@5.9.3)(vitest@4.0.17)': + '@vitest/eslint-plugin@1.6.12(eslint@10.0.3)(typescript@5.9.3)(vitest@4.1.0)': dependencies: - '@typescript-eslint/scope-manager': 8.53.1 - '@typescript-eslint/utils': 8.53.1(eslint@9.39.2)(typescript@5.9.3) - eslint: 9.39.2 + '@typescript-eslint/scope-manager': 8.57.0 + '@typescript-eslint/utils': 8.57.0(eslint@10.0.3)(typescript@5.9.3) + eslint: 10.0.3 optionalDependencies: typescript: 5.9.3 - vitest: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + vitest: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) transitivePeerDependencies: - supports-color @@ -19038,47 +19063,48 @@ snapshots: chai: 5.3.3 tinyrainbow: 2.0.0 - '@vitest/expect@4.0.17': + '@vitest/expect@4.1.0': dependencies: '@standard-schema/spec': 1.1.0 '@types/chai': 5.2.3 - '@vitest/spy': 4.0.17 - '@vitest/utils': 4.0.17 + '@vitest/spy': 4.1.0 + '@vitest/utils': 4.1.0 chai: 6.2.2 - tinyrainbow: 3.0.3 + tinyrainbow: 3.1.0 - '@vitest/mocker@3.2.4(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2))': + '@vitest/mocker@4.1.0(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2))': dependencies: - '@vitest/spy': 3.2.4 + '@vitest/spy': 4.1.0 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: - vite: 7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + vite: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2) - '@vitest/mocker@4.0.17(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2))': + '@vitest/mocker@4.1.0(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3))': dependencies: - '@vitest/spy': 4.0.17 + '@vitest/spy': 4.1.0 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: - vite: 7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + vite: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3) '@vitest/pretty-format@3.2.4': dependencies: tinyrainbow: 2.0.0 - '@vitest/pretty-format@4.0.17': + '@vitest/pretty-format@4.1.0': dependencies: - tinyrainbow: 3.0.3 + tinyrainbow: 3.1.0 - '@vitest/runner@4.0.17': + '@vitest/runner@4.1.0': dependencies: - '@vitest/utils': 4.0.17 + '@vitest/utils': 4.1.0 pathe: 2.0.3 - '@vitest/snapshot@4.0.17': + '@vitest/snapshot@4.1.0': dependencies: - '@vitest/pretty-format': 4.0.17 + '@vitest/pretty-format': 4.1.0 + '@vitest/utils': 4.1.0 magic-string: 0.30.21 pathe: 2.0.3 @@ -19086,18 +19112,18 @@ snapshots: dependencies: tinyspy: 4.0.4 - '@vitest/spy@4.0.17': {} + '@vitest/spy@4.1.0': {} - '@vitest/ui@4.0.17(vitest@4.0.17)': + '@vitest/ui@4.1.0(vitest@4.1.0)': dependencies: - '@vitest/utils': 4.0.17 + '@vitest/utils': 4.1.0 fflate: 0.8.2 - flatted: 3.3.3 + flatted: 3.4.0 pathe: 2.0.3 sirv: 3.0.2 tinyglobby: 0.2.15 - tinyrainbow: 3.0.3 - vitest: 4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2) + tinyrainbow: 3.1.0 + vitest: 4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) '@vitest/utils@3.2.4': dependencies: @@ -19105,29 +19131,30 @@ snapshots: loupe: 3.2.1 tinyrainbow: 2.0.0 - '@vitest/utils@4.0.17': + '@vitest/utils@4.1.0': dependencies: - '@vitest/pretty-format': 4.0.17 - tinyrainbow: 3.0.3 + '@vitest/pretty-format': 4.1.0 + convert-source-map: 2.0.0 + tinyrainbow: 3.1.0 - '@volar/kit@2.4.27(typescript@5.9.3)': + '@volar/kit@2.4.28(typescript@5.9.3)': dependencies: - '@volar/language-service': 2.4.27 - '@volar/typescript': 2.4.27 + '@volar/language-service': 2.4.28 + '@volar/typescript': 2.4.28 typesafe-path: 0.2.2 typescript: 5.9.3 vscode-languageserver-textdocument: 1.0.12 vscode-uri: 3.1.0 - '@volar/language-core@2.4.27': + '@volar/language-core@2.4.28': dependencies: - '@volar/source-map': 2.4.27 + '@volar/source-map': 2.4.28 - '@volar/language-server@2.4.27': + '@volar/language-server@2.4.28': dependencies: - '@volar/language-core': 2.4.27 - '@volar/language-service': 2.4.27 - '@volar/typescript': 2.4.27 + '@volar/language-core': 2.4.28 + '@volar/language-service': 2.4.28 + '@volar/typescript': 2.4.28 path-browserify: 1.0.1 request-light: 0.7.0 vscode-languageserver: 9.0.1 @@ -19135,18 +19162,18 @@ snapshots: vscode-languageserver-textdocument: 1.0.12 vscode-uri: 3.1.0 - '@volar/language-service@2.4.27': + '@volar/language-service@2.4.28': dependencies: - '@volar/language-core': 2.4.27 + '@volar/language-core': 2.4.28 vscode-languageserver-protocol: 3.17.5 vscode-languageserver-textdocument: 1.0.12 vscode-uri: 3.1.0 - '@volar/source-map@2.4.27': {} + '@volar/source-map@2.4.28': {} - '@volar/typescript@2.4.27': + '@volar/typescript@2.4.28': dependencies: - '@volar/language-core': 2.4.27 + '@volar/language-core': 2.4.28 path-browserify: 1.0.1 vscode-uri: 3.1.0 @@ -19158,7 +19185,7 @@ snapshots: vscode-languageserver-types: 3.17.5 vscode-uri: 3.1.0 - '@vscode/extension-telemetry@1.2.0(tslib@2.8.1)': + '@vscode/extension-telemetry@1.5.1(tslib@2.8.1)': dependencies: '@microsoft/1ds-core-js': 4.3.11(tslib@2.8.1) '@microsoft/1ds-post-js': 4.3.11(tslib@2.8.1) @@ -19174,25 +19201,25 @@ snapshots: https-proxy-agent: 7.0.6 jszip: 3.10.1 ora: 8.2.0 - semver: 7.7.3 + semver: 7.7.4 transitivePeerDependencies: - supports-color - '@vscode/test-web@0.0.78': + '@vscode/test-web@0.0.80': dependencies: '@koa/cors': 5.0.0 - '@koa/router': 15.2.0(koa@3.1.1) - '@playwright/browser-chromium': 1.57.0 + '@koa/router': 15.3.1(koa@3.1.2) + '@playwright/browser-chromium': 1.58.2 gunzip-maybe: 1.4.2 http-proxy-agent: 7.0.2 https-proxy-agent: 7.0.6 - koa: 3.1.1 + koa: 3.1.2 koa-morgan: 1.0.1 koa-mount: 4.2.0 koa-static: 5.0.0 minimist: 1.2.8 - playwright: 1.57.0 - tar-fs: 3.1.1 + playwright: 1.58.2 + tar-fs: 3.1.2 tinyglobby: 0.2.15 vscode-uri: 3.1.0 transitivePeerDependencies: @@ -19250,7 +19277,7 @@ snapshots: '@vscode/vsce-sign': 2.0.9 azure-devops-node-api: 12.5.0 chalk: 4.1.2 - cheerio: 1.1.2 + cheerio: 1.2.0 cockatiel: 3.2.1 commander: 12.1.0 form-data: 4.0.5 @@ -19258,13 +19285,13 @@ snapshots: hosted-git-info: 4.1.0 jsonc-parser: 3.3.1 leven: 3.1.0 - markdown-it: 14.1.0 + markdown-it: 14.1.1 mime: 1.6.0 - minimatch: 3.1.2 + minimatch: 3.1.5 parse-semver: 1.1.1 read: 1.0.7 secretlint: 10.2.2 - semver: 7.7.3 + semver: 7.7.4 tmp: 0.2.5 typed-rest-client: 1.8.11 url-join: 4.0.1 @@ -19276,18 +19303,18 @@ snapshots: transitivePeerDependencies: - supports-color - '@vue/compiler-core@3.5.27': + '@vue/compiler-core@3.5.30': dependencies: - '@babel/parser': 7.28.6 - '@vue/shared': 3.5.27 - entities: 7.0.0 + '@babel/parser': 7.29.0 + '@vue/shared': 3.5.30 + entities: 7.0.1 estree-walker: 2.0.2 source-map-js: 1.2.1 - '@vue/compiler-dom@3.5.27': + '@vue/compiler-dom@3.5.30': dependencies: - '@vue/compiler-core': 3.5.27 - '@vue/shared': 3.5.27 + '@vue/compiler-core': 3.5.30 + '@vue/shared': 3.5.30 '@vue/compiler-vue2@2.7.16': dependencies: @@ -19296,60 +19323,60 @@ snapshots: '@vue/language-core@2.2.0(typescript@5.9.3)': dependencies: - '@volar/language-core': 2.4.27 - '@vue/compiler-dom': 3.5.27 + '@volar/language-core': 2.4.28 + '@vue/compiler-dom': 3.5.30 '@vue/compiler-vue2': 2.7.16 - '@vue/shared': 3.5.27 + '@vue/shared': 3.5.30 alien-signals: 0.4.14 - minimatch: 9.0.5 + minimatch: 9.0.9 muggle-string: 0.4.1 path-browserify: 1.0.1 optionalDependencies: typescript: 5.9.3 - '@vue/reactivity@3.5.27': + '@vue/reactivity@3.5.30': dependencies: - '@vue/shared': 3.5.27 + '@vue/shared': 3.5.30 - '@vue/shared@3.5.27': {} + '@vue/shared@3.5.30': {} '@xmldom/xmldom@0.8.11': {} - '@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0))': + '@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0))': dependencies: - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 - '@yarnpkg/libzip': 3.2.2(@yarnpkg/fslib@3.1.4) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 + '@yarnpkg/libzip': 3.2.2(@yarnpkg/fslib@3.1.5) '@yarnpkg/parsers': 3.0.3 - '@yarnpkg/plugin-catalog': 1.0.2(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)) - '@yarnpkg/plugin-compat': 4.0.12(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-patch@4.0.3(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)) - '@yarnpkg/plugin-constraints': 4.0.5(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) - '@yarnpkg/plugin-dlx': 4.0.2(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) - '@yarnpkg/plugin-essentials': 4.4.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)) - '@yarnpkg/plugin-exec': 3.0.2(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/plugin-file': 3.0.2(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/plugin-git': 3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) - '@yarnpkg/plugin-github': 3.0.2(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)) - '@yarnpkg/plugin-http': 3.0.3(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/plugin-init': 4.1.2(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) - '@yarnpkg/plugin-interactive-tools': 4.0.3(@types/react@19.2.9)(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-essentials@4.4.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)))(typanion@3.14.0) - '@yarnpkg/plugin-jsr': 1.1.1(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/plugin-link': 3.0.2(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/plugin-nm': 4.0.8(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) - '@yarnpkg/plugin-npm': 3.4.0(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)) - '@yarnpkg/plugin-npm-cli': 4.4.0(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-npm@3.4.0(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)) - '@yarnpkg/plugin-pack': 4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) - '@yarnpkg/plugin-patch': 4.0.3(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) - '@yarnpkg/plugin-pnp': 4.1.3(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) - '@yarnpkg/plugin-pnpm': 2.1.2(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) - '@yarnpkg/plugin-stage': 4.0.2(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) - '@yarnpkg/plugin-typescript': 4.1.3(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-essentials@4.4.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)))(typanion@3.14.0) - '@yarnpkg/plugin-version': 4.2.0(@types/react@19.2.9)(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0))(typanion@3.14.0) - '@yarnpkg/plugin-workspace-tools': 4.1.6(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)) + '@yarnpkg/plugin-catalog': 1.0.2(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)) + '@yarnpkg/plugin-compat': 4.0.12(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-patch@4.0.3(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)) + '@yarnpkg/plugin-constraints': 4.0.5(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/plugin-dlx': 4.0.2(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/plugin-essentials': 4.4.5(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)) + '@yarnpkg/plugin-exec': 3.0.2(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/plugin-file': 3.0.2(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/plugin-git': 3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/plugin-github': 3.0.2(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)) + '@yarnpkg/plugin-http': 3.0.3(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/plugin-init': 4.1.2(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/plugin-interactive-tools': 4.1.0(@types/react@19.2.14)(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-essentials@4.4.5(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0))) + '@yarnpkg/plugin-jsr': 1.1.1(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/plugin-link': 3.0.2(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/plugin-nm': 4.0.8(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/plugin-npm': 3.4.1(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)) + '@yarnpkg/plugin-npm-cli': 4.4.1(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-npm@3.4.1(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)) + '@yarnpkg/plugin-pack': 4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/plugin-patch': 4.0.3(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/plugin-pnp': 4.1.3(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/plugin-pnpm': 2.1.2(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/plugin-stage': 4.0.2(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/plugin-typescript': 4.1.3(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-essentials@4.4.5(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)))(typanion@3.14.0) + '@yarnpkg/plugin-version': 4.2.0(@types/react@19.2.14)(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/plugin-workspace-tools': 4.1.7(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)) '@yarnpkg/shell': 4.1.3(typanion@3.14.0) - ci-info: 4.3.1 + ci-info: 4.4.0 clipanion: 4.0.0-rc.4(typanion@3.14.0) - semver: 7.7.3 + semver: 7.7.4 tslib: 2.8.1 typanion: 3.14.0 transitivePeerDependencies: @@ -19358,61 +19385,61 @@ snapshots: - supports-color - utf-8-validate - '@yarnpkg/core@4.5.0(typanion@3.14.0)': + '@yarnpkg/core@4.6.0(typanion@3.14.0)': dependencies: '@arcanis/slice-ansi': 1.1.1 '@types/semver': 7.7.1 '@types/treeify': 1.0.3 - '@yarnpkg/fslib': 3.1.4 - '@yarnpkg/libzip': 3.2.2(@yarnpkg/fslib@3.1.4) + '@yarnpkg/fslib': 3.1.5 + '@yarnpkg/libzip': 3.2.2(@yarnpkg/fslib@3.1.5) '@yarnpkg/parsers': 3.0.3 '@yarnpkg/shell': 4.1.3(typanion@3.14.0) camelcase: 5.3.1 chalk: 4.1.2 - ci-info: 4.3.1 + ci-info: 4.4.0 clipanion: 4.0.0-rc.4(typanion@3.14.0) cross-spawn: 7.0.6 diff: 5.2.2 dotenv: 16.6.1 - es-toolkit: 1.44.0 + es-toolkit: 1.45.1 fast-glob: 3.3.3 got: 11.8.6 hpagent: 1.2.0 micromatch: 4.0.8 p-limit: 2.3.0 - semver: 7.7.3 + semver: 7.7.4 strip-ansi: 6.0.1 - tar: 6.2.1 + tar: 7.5.11 tinylogic: 2.0.0 treeify: 1.1.0 tslib: 2.8.1 transitivePeerDependencies: - typanion - '@yarnpkg/extensions@2.0.6(@yarnpkg/core@4.5.0(typanion@3.14.0))': + '@yarnpkg/extensions@2.0.6(@yarnpkg/core@4.6.0(typanion@3.14.0))': dependencies: - '@yarnpkg/core': 4.5.0(typanion@3.14.0) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) - '@yarnpkg/fslib@3.1.4': + '@yarnpkg/fslib@3.1.5': dependencies: tslib: 2.8.1 - '@yarnpkg/libui@3.0.2(ink@3.2.0(@types/react@19.2.9)(react@17.0.2))(react@17.0.2)': + '@yarnpkg/libui@3.1.0(ink@3.2.0(@types/react@19.2.14)(react@17.0.2))(react@17.0.2)': dependencies: - ink: 3.2.0(@types/react@19.2.9)(react@19.2.3) + ink: 3.2.0(@types/react@19.2.14)(react@19.2.4) react: 17.0.2 tslib: 2.8.1 - '@yarnpkg/libzip@3.2.2(@yarnpkg/fslib@3.1.4)': + '@yarnpkg/libzip@3.2.2(@yarnpkg/fslib@3.1.5)': dependencies: '@types/emscripten': 1.41.5 - '@yarnpkg/fslib': 3.1.4 + '@yarnpkg/fslib': 3.1.5 tslib: 2.8.1 '@yarnpkg/nm@4.0.7(typanion@3.14.0)': dependencies: - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 '@yarnpkg/pnp': 4.1.3 transitivePeerDependencies: - typanion @@ -19422,146 +19449,146 @@ snapshots: js-yaml: 3.14.2 tslib: 2.8.1 - '@yarnpkg/plugin-catalog@1.0.2(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0))': + '@yarnpkg/plugin-catalog@1.0.2(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0))': dependencies: - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 - '@yarnpkg/plugin-pack': 4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 + '@yarnpkg/plugin-pack': 4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) tslib: 2.8.1 - '@yarnpkg/plugin-compat@4.0.12(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-patch@4.0.3(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0))': + '@yarnpkg/plugin-compat@4.0.12(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-patch@4.0.3(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0))': dependencies: - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/extensions': 2.0.6(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/plugin-patch': 4.0.3(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/extensions': 2.0.6(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/plugin-patch': 4.0.3(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) - '@yarnpkg/plugin-constraints@4.0.5(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)': + '@yarnpkg/plugin-constraints@4.0.5(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)': dependencies: - '@yarnpkg/cli': 4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 + '@yarnpkg/cli': 4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 clipanion: 4.0.0-rc.4(typanion@3.14.0) - es-toolkit: 1.44.0 + es-toolkit: 1.45.1 tau-prolog: 0.2.81 tslib: 2.8.1 transitivePeerDependencies: - typanion - '@yarnpkg/plugin-dlx@4.0.2(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)': + '@yarnpkg/plugin-dlx@4.0.2(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)': dependencies: - '@yarnpkg/cli': 4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 + '@yarnpkg/cli': 4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 clipanion: 4.0.0-rc.4(typanion@3.14.0) tslib: 2.8.1 transitivePeerDependencies: - typanion - '@yarnpkg/plugin-essentials@4.4.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0))': + '@yarnpkg/plugin-essentials@4.4.5(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0))': dependencies: - '@yarnpkg/cli': 4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 + '@yarnpkg/cli': 4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 '@yarnpkg/parsers': 3.0.3 - '@yarnpkg/plugin-git': 3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) - ci-info: 4.3.1 + '@yarnpkg/plugin-git': 3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) + ci-info: 4.4.0 clipanion: 4.0.0-rc.4(typanion@3.14.0) enquirer: 2.4.1 - es-toolkit: 1.44.0 + es-toolkit: 1.45.1 micromatch: 4.0.8 - semver: 7.7.3 + semver: 7.7.4 tslib: 2.8.1 typanion: 3.14.0 - '@yarnpkg/plugin-exec@3.0.2(@yarnpkg/core@4.5.0(typanion@3.14.0))': + '@yarnpkg/plugin-exec@3.0.2(@yarnpkg/core@4.6.0(typanion@3.14.0))': dependencies: - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 tslib: 2.8.1 - '@yarnpkg/plugin-file@3.0.2(@yarnpkg/core@4.5.0(typanion@3.14.0))': + '@yarnpkg/plugin-file@3.0.2(@yarnpkg/core@4.6.0(typanion@3.14.0))': dependencies: - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 - '@yarnpkg/libzip': 3.2.2(@yarnpkg/fslib@3.1.4) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 + '@yarnpkg/libzip': 3.2.2(@yarnpkg/fslib@3.1.5) tslib: 2.8.1 - '@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)': + '@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)': dependencies: '@types/semver': 7.7.1 - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 clipanion: 4.0.0-rc.4(typanion@3.14.0) - es-toolkit: 1.44.0 + es-toolkit: 1.45.1 git-url-parse: 13.1.1 - semver: 7.7.3 + semver: 7.7.4 tslib: 2.8.1 transitivePeerDependencies: - typanion - '@yarnpkg/plugin-github@3.0.2(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0))': + '@yarnpkg/plugin-github@3.0.2(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0))': dependencies: - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 - '@yarnpkg/plugin-git': 3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 + '@yarnpkg/plugin-git': 3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) tslib: 2.8.1 - '@yarnpkg/plugin-http@3.0.3(@yarnpkg/core@4.5.0(typanion@3.14.0))': + '@yarnpkg/plugin-http@3.0.3(@yarnpkg/core@4.6.0(typanion@3.14.0))': dependencies: - '@yarnpkg/core': 4.5.0(typanion@3.14.0) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) tslib: 2.8.1 - '@yarnpkg/plugin-init@4.1.2(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)': + '@yarnpkg/plugin-init@4.1.2(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)': dependencies: - '@yarnpkg/cli': 4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 + '@yarnpkg/cli': 4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 clipanion: 4.0.0-rc.4(typanion@3.14.0) tslib: 2.8.1 transitivePeerDependencies: - typanion - '@yarnpkg/plugin-interactive-tools@4.0.3(@types/react@19.2.9)(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-essentials@4.4.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)))(typanion@3.14.0)': + '@yarnpkg/plugin-interactive-tools@4.1.0(@types/react@19.2.14)(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-essentials@4.4.5(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)))': dependencies: - '@yarnpkg/cli': 4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/libui': 3.0.2(ink@3.2.0(@types/react@19.2.9)(react@17.0.2))(react@17.0.2) - '@yarnpkg/plugin-essentials': 4.4.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)) - algoliasearch: 4.25.3 + '@yarnpkg/cli': 4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/libui': 3.1.0(ink@3.2.0(@types/react@19.2.14)(react@17.0.2))(react@17.0.2) + '@yarnpkg/plugin-essentials': 4.4.5(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)) + algoliasearch: 4.27.0 clipanion: 4.0.0-rc.4(typanion@3.14.0) diff: 5.2.2 - ink: 3.2.0(@types/react@19.2.9)(react@19.2.3) - ink-text-input: 4.0.3(ink@3.2.0(@types/react@19.2.9)(react@17.0.2))(react@17.0.2) + ink: 3.2.0(@types/react@19.2.14)(react@19.2.4) + ink-text-input: 4.0.3(ink@3.2.0(@types/react@19.2.14)(react@17.0.2))(react@17.0.2) react: 17.0.2 - semver: 7.7.3 + semver: 7.7.4 tslib: 2.8.1 + typanion: 3.14.0 transitivePeerDependencies: - '@types/react' - bufferutil - - typanion - utf-8-validate - '@yarnpkg/plugin-jsr@1.1.1(@yarnpkg/core@4.5.0(typanion@3.14.0))': + '@yarnpkg/plugin-jsr@1.1.1(@yarnpkg/core@4.6.0(typanion@3.14.0))': dependencies: - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 tslib: 2.8.1 - '@yarnpkg/plugin-link@3.0.2(@yarnpkg/core@4.5.0(typanion@3.14.0))': + '@yarnpkg/plugin-link@3.0.2(@yarnpkg/core@4.6.0(typanion@3.14.0))': dependencies: - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 tslib: 2.8.1 - '@yarnpkg/plugin-nm@4.0.8(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)': + '@yarnpkg/plugin-nm@4.0.8(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)': dependencies: - '@yarnpkg/cli': 4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 - '@yarnpkg/libzip': 3.2.2(@yarnpkg/fslib@3.1.4) + '@yarnpkg/cli': 4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 + '@yarnpkg/libzip': 3.2.2(@yarnpkg/fslib@3.1.5) '@yarnpkg/nm': 4.0.7(typanion@3.14.0) '@yarnpkg/parsers': 3.0.3 - '@yarnpkg/plugin-pnp': 4.1.3(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/plugin-pnp': 4.1.3(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) '@yarnpkg/pnp': 4.1.3 '@zkochan/cmd-shim': 5.4.1 clipanion: 4.0.0-rc.4(typanion@3.14.0) @@ -19569,40 +19596,40 @@ snapshots: transitivePeerDependencies: - typanion - '@yarnpkg/plugin-npm-cli@4.4.0(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-npm@3.4.0(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0))': + '@yarnpkg/plugin-npm-cli@4.4.1(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-npm@3.4.1(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0))': dependencies: - '@yarnpkg/cli': 4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 - '@yarnpkg/plugin-npm': 3.4.0(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)) - '@yarnpkg/plugin-pack': 4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/cli': 4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 + '@yarnpkg/plugin-npm': 3.4.1(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)) + '@yarnpkg/plugin-pack': 4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) clipanion: 4.0.0-rc.4(typanion@3.14.0) enquirer: 2.4.1 micromatch: 4.0.8 - semver: 7.7.3 + semver: 7.7.4 tslib: 2.8.1 typanion: 3.14.0 - '@yarnpkg/plugin-npm@3.4.0(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0))': + '@yarnpkg/plugin-npm@3.4.1(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0))': dependencies: - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 - '@yarnpkg/plugin-pack': 4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 + '@yarnpkg/plugin-pack': 4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) enquirer: 2.4.1 - es-toolkit: 1.44.0 + es-toolkit: 1.45.1 micromatch: 4.0.8 - semver: 7.7.3 + semver: 7.7.4 sigstore: 3.1.0 ssri: 12.0.0 tslib: 2.8.1 transitivePeerDependencies: - supports-color - '@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)': + '@yarnpkg/plugin-pack@4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)': dependencies: - '@yarnpkg/cli': 4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 + '@yarnpkg/cli': 4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 clipanion: 4.0.0-rc.4(typanion@3.14.0) micromatch: 4.0.8 tar-stream: 2.2.0 @@ -19610,23 +19637,23 @@ snapshots: transitivePeerDependencies: - typanion - '@yarnpkg/plugin-patch@4.0.3(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)': + '@yarnpkg/plugin-patch@4.0.3(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)': dependencies: - '@yarnpkg/cli': 4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 - '@yarnpkg/libzip': 3.2.2(@yarnpkg/fslib@3.1.4) + '@yarnpkg/cli': 4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 + '@yarnpkg/libzip': 3.2.2(@yarnpkg/fslib@3.1.5) clipanion: 4.0.0-rc.4(typanion@3.14.0) tslib: 2.8.1 transitivePeerDependencies: - typanion - '@yarnpkg/plugin-pnp@4.1.3(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)': + '@yarnpkg/plugin-pnp@4.1.3(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)': dependencies: - '@yarnpkg/cli': 4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 - '@yarnpkg/plugin-stage': 4.0.2(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/cli': 4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 + '@yarnpkg/plugin-stage': 4.0.2(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) '@yarnpkg/pnp': 4.1.3 clipanion: 4.0.0-rc.4(typanion@3.14.0) micromatch: 4.0.8 @@ -19634,55 +19661,55 @@ snapshots: transitivePeerDependencies: - typanion - '@yarnpkg/plugin-pnpm@2.1.2(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)': + '@yarnpkg/plugin-pnpm@2.1.2(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)': dependencies: - '@yarnpkg/cli': 4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 - '@yarnpkg/plugin-pnp': 4.1.3(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) - '@yarnpkg/plugin-stage': 4.0.2(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/cli': 4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 + '@yarnpkg/plugin-pnp': 4.1.3(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/plugin-stage': 4.0.2(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) clipanion: 4.0.0-rc.4(typanion@3.14.0) p-limit: 2.3.0 tslib: 2.8.1 transitivePeerDependencies: - typanion - '@yarnpkg/plugin-stage@4.0.2(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)': + '@yarnpkg/plugin-stage@4.0.2(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)': dependencies: - '@yarnpkg/cli': 4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 + '@yarnpkg/cli': 4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 clipanion: 4.0.0-rc.4(typanion@3.14.0) tslib: 2.8.1 transitivePeerDependencies: - typanion - '@yarnpkg/plugin-typescript@4.1.3(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-essentials@4.4.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)))(typanion@3.14.0)': + '@yarnpkg/plugin-typescript@4.1.3(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-essentials@4.4.5(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)))(typanion@3.14.0)': dependencies: - '@yarnpkg/cli': 4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 - '@yarnpkg/plugin-essentials': 4.4.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0)) - '@yarnpkg/plugin-pack': 4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) - algoliasearch: 4.25.3 - semver: 7.7.3 + '@yarnpkg/cli': 4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 + '@yarnpkg/plugin-essentials': 4.4.5(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0)) + '@yarnpkg/plugin-pack': 4.0.4(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) + algoliasearch: 4.27.0 + semver: 7.7.4 tslib: 2.8.1 transitivePeerDependencies: - typanion - '@yarnpkg/plugin-version@4.2.0(@types/react@19.2.9)(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0))(typanion@3.14.0)': + '@yarnpkg/plugin-version@4.2.0(@types/react@19.2.14)(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0))(typanion@3.14.0)': dependencies: - '@yarnpkg/cli': 4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 - '@yarnpkg/libui': 3.0.2(ink@3.2.0(@types/react@19.2.9)(react@17.0.2))(react@17.0.2) + '@yarnpkg/cli': 4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 + '@yarnpkg/libui': 3.1.0(ink@3.2.0(@types/react@19.2.14)(react@17.0.2))(react@17.0.2) '@yarnpkg/parsers': 3.0.3 - '@yarnpkg/plugin-git': 3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/plugin-git': 3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) clipanion: 4.0.0-rc.4(typanion@3.14.0) - es-toolkit: 1.44.0 - ink: 3.2.0(@types/react@19.2.9)(react@17.0.2) + es-toolkit: 1.45.1 + ink: 3.2.0(@types/react@19.2.14)(react@17.0.2) react: 17.0.2 - semver: 7.7.3 + semver: 7.7.4 tslib: 2.8.1 transitivePeerDependencies: - '@types/react' @@ -19690,14 +19717,14 @@ snapshots: - typanion - utf-8-validate - '@yarnpkg/plugin-workspace-tools@4.1.6(@yarnpkg/cli@4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)))(@yarnpkg/core@4.5.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0))': + '@yarnpkg/plugin-workspace-tools@4.1.7(@yarnpkg/cli@4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)))(@yarnpkg/core@4.6.0(typanion@3.14.0))(@yarnpkg/plugin-git@3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0))': dependencies: - '@yarnpkg/cli': 4.12.0(@types/react@19.2.9)(@yarnpkg/core@4.5.0(typanion@3.14.0)) - '@yarnpkg/core': 4.5.0(typanion@3.14.0) - '@yarnpkg/fslib': 3.1.4 - '@yarnpkg/plugin-git': 3.1.4(@yarnpkg/core@4.5.0(typanion@3.14.0))(typanion@3.14.0) + '@yarnpkg/cli': 4.12.0(@types/react@19.2.14)(@yarnpkg/core@4.6.0(typanion@3.14.0)) + '@yarnpkg/core': 4.6.0(typanion@3.14.0) + '@yarnpkg/fslib': 3.1.5 + '@yarnpkg/plugin-git': 3.1.4(@yarnpkg/core@4.6.0(typanion@3.14.0))(typanion@3.14.0) clipanion: 4.0.0-rc.4(typanion@3.14.0) - es-toolkit: 1.44.0 + es-toolkit: 1.45.1 micromatch: 4.0.8 p-limit: 2.3.0 tslib: 2.8.1 @@ -19706,11 +19733,11 @@ snapshots: '@yarnpkg/pnp@4.1.3': dependencies: '@types/node': 18.19.130 - '@yarnpkg/fslib': 3.1.4 + '@yarnpkg/fslib': 3.1.5 '@yarnpkg/shell@4.0.0(typanion@3.14.0)': dependencies: - '@yarnpkg/fslib': 3.1.4 + '@yarnpkg/fslib': 3.1.5 '@yarnpkg/parsers': 3.0.3 chalk: 3.0.0 clipanion: 4.0.0-rc.4(typanion@3.14.0) @@ -19723,7 +19750,7 @@ snapshots: '@yarnpkg/shell@4.1.3(typanion@3.14.0)': dependencies: - '@yarnpkg/fslib': 3.1.4 + '@yarnpkg/fslib': 3.1.5 '@yarnpkg/parsers': 3.0.3 chalk: 4.1.2 clipanion: 4.0.0-rc.4(typanion@3.14.0) @@ -19789,11 +19816,11 @@ snapshots: mime-types: 3.0.2 negotiator: 1.0.0 - acorn-jsx@5.3.2(acorn@8.15.0): + acorn-jsx@5.3.2(acorn@8.16.0): dependencies: - acorn: 8.15.0 + acorn: 8.16.0 - acorn@8.15.0: {} + acorn@8.16.0: {} adm-zip@0.5.16: {} @@ -19808,67 +19835,45 @@ snapshots: clean-stack: 2.2.0 indent-string: 4.0.0 - ajv-draft-04@1.0.0(ajv@8.13.0): - optionalDependencies: - ajv: 8.13.0 - - ajv-draft-04@1.0.0(ajv@8.17.1): - optionalDependencies: - ajv: 8.17.1 - - ajv-formats@3.0.1(ajv@8.13.0): + ajv-draft-04@1.0.0(ajv@8.18.0): optionalDependencies: - ajv: 8.13.0 + ajv: 8.18.0 - ajv-formats@3.0.1(ajv@8.17.1): + ajv-formats@3.0.1(ajv@8.18.0): optionalDependencies: - ajv: 8.17.1 + ajv: 8.18.0 - ajv@6.12.6: + ajv@6.14.0: dependencies: fast-deep-equal: 3.1.3 fast-json-stable-stringify: 2.1.0 json-schema-traverse: 0.4.1 uri-js: 4.4.1 - ajv@8.12.0: - dependencies: - fast-deep-equal: 3.1.3 - json-schema-traverse: 1.0.0 - require-from-string: 2.0.2 - uri-js: 4.4.1 - - ajv@8.13.0: - dependencies: - fast-deep-equal: 3.1.3 - json-schema-traverse: 1.0.0 - require-from-string: 2.0.2 - uri-js: 4.4.1 - - ajv@8.17.1: + ajv@8.18.0: dependencies: fast-deep-equal: 3.1.3 fast-uri: 3.1.0 json-schema-traverse: 1.0.0 require-from-string: 2.0.2 - algoliasearch@4.25.3: - dependencies: - '@algolia/cache-browser-local-storage': 4.25.3 - '@algolia/cache-common': 4.25.3 - '@algolia/cache-in-memory': 4.25.3 - '@algolia/client-account': 4.25.3 - '@algolia/client-analytics': 4.25.3 - '@algolia/client-common': 4.25.3 - '@algolia/client-personalization': 4.25.3 - '@algolia/client-search': 4.25.3 - '@algolia/logger-common': 4.25.3 - '@algolia/logger-console': 4.25.3 - '@algolia/recommend': 4.25.3 - '@algolia/requester-browser-xhr': 4.25.3 - '@algolia/requester-common': 4.25.3 - '@algolia/requester-node-http': 4.25.3 - '@algolia/transporter': 4.25.3 + algoliasearch@4.27.0: + dependencies: + '@algolia/cache-browser-local-storage': 4.27.0 + '@algolia/cache-common': 4.27.0 + '@algolia/cache-in-memory': 4.27.0 + '@algolia/client-account': 4.27.0 + '@algolia/client-analytics': 4.27.0 + '@algolia/client-common': 4.27.0 + '@algolia/client-personalization': 4.27.0 + '@algolia/client-search': 4.27.0 + '@algolia/logger-common': 4.27.0 + '@algolia/logger-console': 4.27.0 + '@algolia/recommend': 4.27.0 + '@algolia/requester-browser-xhr': 4.27.0 + '@algolia/requester-common': 4.27.0 + '@algolia/requester-node-http': 4.27.0 + '@algolia/transporter': 4.27.0 alien-signals@0.4.14: {} @@ -19887,7 +19892,7 @@ snapshots: dependencies: type-fest: 0.21.3 - ansi-escapes@7.2.0: + ansi-escapes@7.3.0: dependencies: environment: 1.1.0 @@ -19920,8 +19925,6 @@ snapshots: append-field@1.0.0: {} - archy@1.0.0: {} - arg@5.0.2: {} argparse@1.0.10: @@ -19945,175 +19948,108 @@ snapshots: call-bound: 1.0.4 is-array-buffer: 3.0.5 - array-includes@3.1.9: - dependencies: - call-bind: 1.0.8 - call-bound: 1.0.4 - define-properties: 1.2.1 - es-abstract: 1.24.1 - es-object-atoms: 1.1.1 - get-intrinsic: 1.3.0 - is-string: 1.1.1 - math-intrinsics: 1.1.0 - array-iterate@2.0.1: {} array-timsort@1.0.3: {} array-union@2.1.0: {} - array.prototype.findlastindex@1.2.6: - dependencies: - call-bind: 1.0.8 - call-bound: 1.0.4 - define-properties: 1.2.1 - es-abstract: 1.24.1 - es-errors: 1.3.0 - es-object-atoms: 1.1.1 - es-shim-unscopables: 1.1.0 - - array.prototype.flat@1.3.3: - dependencies: - call-bind: 1.0.8 - define-properties: 1.2.1 - es-abstract: 1.24.1 - es-shim-unscopables: 1.1.0 - - array.prototype.flatmap@1.3.3: - dependencies: - call-bind: 1.0.8 - define-properties: 1.2.1 - es-abstract: 1.24.1 - es-shim-unscopables: 1.1.0 - - arraybuffer.prototype.slice@1.0.4: - dependencies: - array-buffer-byte-length: 1.0.2 - call-bind: 1.0.8 - define-properties: 1.2.1 - es-abstract: 1.24.1 - es-errors: 1.3.0 - get-intrinsic: 1.3.0 - is-array-buffer: 3.0.5 - as-table@1.0.55: dependencies: printable-characters: 1.0.42 - asn1.js@4.10.1: - dependencies: - bn.js: 4.12.2 - inherits: 2.0.4 - minimalistic-assert: 1.0.1 - - assert@2.1.0: - dependencies: - call-bind: 1.0.8 - is-nan: 1.3.2 - object-is: 1.1.6 - object.assign: 4.1.7 - util: 0.12.5 - assertion-error@2.0.1: {} ast-types@0.16.1: dependencies: tslib: 2.8.1 - ast-v8-to-istanbul@0.3.10: + ast-v8-to-istanbul@1.0.0: dependencies: '@jridgewell/trace-mapping': 0.3.31 estree-walker: 3.0.3 - js-tokens: 9.0.1 + js-tokens: 10.0.0 astral-regex@2.0.0: {} astring@1.9.0: {} - astro-expressive-code@0.41.6(astro@5.16.11(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0)(@types/node@25.0.9)(rollup@4.49.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)): + astro-expressive-code@0.41.7(astro@6.0.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0)(@types/node@25.5.0)(lightningcss@1.32.0)(rollup@4.60.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.3)): dependencies: - astro: 5.16.11(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0)(@types/node@25.0.9)(rollup@4.49.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2) - rehype-expressive-code: 0.41.6 + astro: 6.0.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0)(@types/node@25.5.0)(lightningcss@1.32.0)(rollup@4.60.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.3) + rehype-expressive-code: 0.41.7 - astro-rehype-relative-markdown-links@0.18.1(astro@5.16.11(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0)(@types/node@25.0.9)(rollup@4.49.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)): + astro-rehype-relative-markdown-links@0.18.1(astro@6.0.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0)(@types/node@25.5.0)(lightningcss@1.32.0)(rollup@4.60.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.3)): dependencies: - astro: 5.16.11(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0)(@types/node@25.0.9)(rollup@4.49.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2) + astro: 6.0.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0)(@types/node@25.5.0)(lightningcss@1.32.0)(rollup@4.60.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.3) catch-unknown: 2.0.0 - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 github-slugger: 2.0.0 gray-matter: 4.0.3 is-absolute-url: 4.0.1 unified: 11.0.5 - unist-util-visit: 5.0.0 + unist-util-visit: 5.1.0 zod: 3.25.76 transitivePeerDependencies: - supports-color - astro@5.16.11(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0)(@types/node@25.0.9)(rollup@4.49.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2): + astro@6.0.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0)(@types/node@25.5.0)(lightningcss@1.32.0)(rollup@4.60.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.3): dependencies: - '@astrojs/compiler': 2.13.0 - '@astrojs/internal-helpers': 0.7.5 - '@astrojs/markdown-remark': 6.3.10 + '@astrojs/compiler': 3.0.0 + '@astrojs/internal-helpers': 0.8.0 + '@astrojs/markdown-remark': 7.0.0 '@astrojs/telemetry': 3.3.0 '@capsizecss/unpack': 4.0.0 + '@clack/prompts': 1.1.0 '@oslojs/encoding': 1.1.0 - '@rollup/pluginutils': 5.3.0(rollup@4.49.0) - acorn: 8.15.0 + '@rollup/pluginutils': 5.3.0(rollup@4.60.0) aria-query: 5.3.2 axobject-query: 4.1.0 - boxen: 8.0.1 - ci-info: 4.3.1 + ci-info: 4.4.0 clsx: 2.1.1 - common-ancestor-path: 1.0.1 + common-ancestor-path: 2.0.0 cookie: 1.1.1 - cssesc: 3.0.0 - debug: 4.4.3(supports-color@8.1.1) - deterministic-object-hash: 2.0.2 - devalue: 5.6.2 + devalue: 5.6.4 diff: 8.0.3 dlv: 1.1.3 dset: 3.1.4 - es-module-lexer: 1.7.0 - esbuild: 0.25.12 - estree-walker: 3.0.3 + es-module-lexer: 2.0.0 + esbuild: 0.27.4 flattie: 1.1.1 - fontace: 0.4.0 + fontace: 0.4.1 github-slugger: 2.0.0 html-escaper: 3.0.3 http-cache-semantics: 4.2.0 - import-meta-resolve: 4.2.0 js-yaml: 4.1.1 magic-string: 0.30.21 - magicast: 0.5.1 + magicast: 0.5.2 mrmime: 2.0.1 neotraverse: 0.6.18 - p-limit: 6.2.0 - p-queue: 8.1.1 + obug: 2.1.1 + p-limit: 7.3.0 + p-queue: 9.1.0 package-manager-detector: 1.6.0 piccolore: 0.1.3 picomatch: 4.0.3 - prompts: 2.4.2 rehype: 13.0.2 - semver: 7.7.3 - shiki: 3.21.0 + semver: 7.7.4 + shiki: 4.0.2 smol-toml: 1.6.0 - svgo: 4.0.0 - tinyexec: 1.0.2 + svgo: 4.0.1 + tinyclip: 0.1.12 + tinyexec: 1.0.4 tinyglobby: 0.2.15 tsconfck: 3.1.6(typescript@5.9.3) ultrahtml: 1.6.0 - unifont: 0.7.3 - unist-util-visit: 5.0.0 - unstorage: 1.17.4(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0) + unifont: 0.7.4 + unist-util-visit: 5.1.0 + unstorage: 1.17.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0) vfile: 6.0.3 - vite: 6.4.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) - vitefu: 1.1.1(vite@6.4.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) + vite: 7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3) + vitefu: 1.1.2(vite@7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3)) xxhash-wasm: 1.1.0 - yargs-parser: 21.1.1 - yocto-spinner: 0.2.3 - zod: 3.25.76 - zod-to-json-schema: 3.25.1(zod@3.25.76) - zod-to-ts: 1.2.0(typescript@5.9.3)(zod@3.25.76) + yargs-parser: 22.0.0 + zod: 4.3.6 optionalDependencies: sharp: 0.34.5 transitivePeerDependencies: @@ -20151,8 +20087,6 @@ snapshots: - uploadthing - yaml - async-function@1.0.0: {} - asynckit@0.4.0: {} auto-bind@4.0.0: {} @@ -20168,64 +20102,54 @@ snapshots: tunnel: 0.0.6 typed-rest-client: 1.8.11 - b4a@1.7.3: {} - - babel-core@7.0.0-bridge.0(@babel/core@7.28.6): - dependencies: - '@babel/core': 7.28.6 + b4a@1.8.0: {} - babel-plugin-macros@3.1.0: + babel-core@7.0.0-bridge.0(@babel/core@7.29.0): dependencies: - '@babel/runtime': 7.28.6 - cosmiconfig: 7.1.0 - resolve: 1.22.11 + '@babel/core': 7.29.0 bail@2.0.2: {} balanced-match@1.0.2: {} + balanced-match@4.0.4: {} + bare-events@2.8.2: {} - bare-fs@4.5.2: + bare-fs@4.5.5: dependencies: bare-events: 2.8.2 bare-path: 3.0.0 - bare-stream: 2.7.0(bare-events@2.8.2) + bare-stream: 2.8.1(bare-events@2.8.2) bare-url: 2.3.2 fast-fifo: 1.3.2 transitivePeerDependencies: - bare-abort-controller - react-native-b4a - optional: true - bare-os@3.6.2: - optional: true + bare-os@3.8.0: {} bare-path@3.0.0: dependencies: - bare-os: 3.6.2 - optional: true + bare-os: 3.8.0 - bare-stream@2.7.0(bare-events@2.8.2): + bare-stream@2.8.1(bare-events@2.8.2): dependencies: streamx: 2.23.0 + teex: 1.0.1 optionalDependencies: bare-events: 2.8.2 transitivePeerDependencies: - bare-abort-controller - react-native-b4a - optional: true bare-url@2.3.2: dependencies: bare-path: 3.0.0 - optional: true - - base-64@1.0.0: {} base64-js@1.5.1: {} - baseline-browser-mapping@2.9.16: {} + baseline-browser-mapping@2.10.8: {} basic-auth@2.0.1: dependencies: @@ -20239,8 +20163,6 @@ snapshots: is-alphanumerical: 2.0.1 is-decimal: 2.0.1 - before-after-hook@3.0.2: {} - before-after-hook@4.0.0: {} better-path-resolve@1.0.0: @@ -20264,25 +20186,21 @@ snapshots: inherits: 2.0.4 readable-stream: 3.6.2 - bn.js@4.12.2: {} - - bn.js@5.2.2: {} - body-parser@2.2.2: dependencies: bytes: 3.1.2 content-type: 1.0.5 - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 http-errors: 2.0.1 iconv-lite: 0.7.2 on-finished: 2.4.1 - qs: 6.14.1 + qs: 6.15.0 raw-body: 3.0.2 type-is: 2.0.1 transitivePeerDependencies: - supports-color - bole@5.0.25: + bole@5.0.28: dependencies: fast-safe-stringify: 2.1.1 individual: 3.0.0 @@ -20293,17 +20211,6 @@ snapshots: boundary@2.0.0: {} - boxen@8.0.1: - dependencies: - ansi-align: 3.0.1 - camelcase: 8.0.0 - chalk: 5.6.2 - cli-boxes: 3.0.0 - string-width: 7.2.0 - type-fest: 4.41.0 - widest-line: 5.0.0 - wrap-ansi: 9.0.2 - brace-expansion@1.1.12: dependencies: balanced-match: 1.0.2 @@ -20313,72 +20220,24 @@ snapshots: dependencies: balanced-match: 1.0.2 - braces@3.0.3: - dependencies: - fill-range: 7.1.1 - - brorand@1.1.0: {} - - browser-resolve@2.0.0: - dependencies: - resolve: 1.22.11 - - browser-stdout@1.3.1: {} - - browserify-aes@1.2.0: - dependencies: - buffer-xor: 1.0.3 - cipher-base: 1.0.7 - create-hash: 1.2.0 - evp_bytestokey: 1.0.3 - inherits: 2.0.4 - safe-buffer: 5.2.1 - - browserify-cipher@1.0.1: - dependencies: - browserify-aes: 1.2.0 - browserify-des: 1.0.2 - evp_bytestokey: 1.0.3 - - browserify-des@1.0.2: - dependencies: - cipher-base: 1.0.7 - des.js: 1.1.0 - inherits: 2.0.4 - safe-buffer: 5.2.1 - - browserify-rsa@4.1.1: + brace-expansion@5.0.4: dependencies: - bn.js: 5.2.2 - randombytes: 2.1.0 - safe-buffer: 5.2.1 + balanced-match: 4.0.4 - browserify-sign@4.2.5: + braces@3.0.3: dependencies: - bn.js: 5.2.2 - browserify-rsa: 4.1.1 - create-hash: 1.2.0 - create-hmac: 1.1.7 - elliptic: 6.6.1 - inherits: 2.0.4 - parse-asn1: 5.1.9 - readable-stream: 2.3.8 - safe-buffer: 5.2.1 + fill-range: 7.1.1 browserify-zlib@0.1.4: dependencies: pako: 0.2.9 - browserify-zlib@0.2.0: - dependencies: - pako: 1.0.11 - browserslist@4.28.1: dependencies: - baseline-browser-mapping: 2.9.16 - caniuse-lite: 1.0.30001765 - electron-to-chromium: 1.5.267 - node-releases: 2.0.27 + baseline-browser-mapping: 2.10.8 + caniuse-lite: 1.0.30001778 + electron-to-chromium: 1.5.313 + node-releases: 2.0.36 update-browserslist-db: 1.2.3(browserslist@4.28.1) buffer-crc32@0.2.13: {} @@ -20387,8 +20246,6 @@ snapshots: buffer-from@1.1.2: {} - buffer-xor@1.0.3: {} - buffer@5.7.1: dependencies: base64-js: 1.5.1 @@ -20401,11 +20258,9 @@ snapshots: builtin-modules@5.0.0: {} - builtin-status-codes@3.0.0: {} - builtins@5.1.0: dependencies: - semver: 7.7.3 + semver: 7.7.4 bundle-name@4.1.0: dependencies: @@ -20417,7 +20272,7 @@ snapshots: bytes@3.1.2: {} - c8@10.1.3: + c8@11.0.0: dependencies: '@bcoe/v8-coverage': 1.0.2 '@istanbuljs/schema': 0.1.3 @@ -20426,7 +20281,7 @@ snapshots: istanbul-lib-coverage: 3.2.2 istanbul-lib-report: 3.0.1 istanbul-reports: 3.2.0 - test-exclude: 7.0.1 + test-exclude: 8.0.0 v8-to-istanbul: 9.3.0 yargs: 17.7.2 yargs-parser: 21.1.1 @@ -20437,27 +20292,27 @@ snapshots: fs-minipass: 3.0.3 glob: 10.5.0 lru-cache: 10.4.3 - minipass: 7.1.2 + minipass: 7.1.3 minipass-collect: 2.0.1 minipass-flush: 1.0.5 minipass-pipeline: 1.2.4 p-map: 7.0.4 ssri: 12.0.0 - tar: 7.5.4 + tar: 7.5.11 unique-filename: 4.0.0 cacache@20.0.3: dependencies: '@npmcli/fs': 5.0.0 fs-minipass: 3.0.3 - glob: 13.0.0 - lru-cache: 11.2.4 - minipass: 7.1.2 + glob: 13.0.6 + lru-cache: 11.2.7 + minipass: 7.1.3 minipass-collect: 2.0.1 minipass-flush: 1.0.5 minipass-pipeline: 1.2.4 p-map: 7.0.4 - ssri: 13.0.0 + ssri: 13.0.1 unique-filename: 5.0.0 cacheable-lookup@5.0.4: {} @@ -20501,15 +20356,13 @@ snapshots: camelcase@6.3.0: {} - camelcase@8.0.0: {} - can-link@2.0.0: {} can-write-to-dir@1.1.1: dependencies: - path-temp: 2.1.0 + path-temp: 2.1.1 - caniuse-lite@1.0.30001765: {} + caniuse-lite@1.0.30001778: {} catch-unknown@2.0.0: {} @@ -20572,33 +20425,33 @@ snapshots: domhandler: 5.0.3 domutils: 3.2.2 - cheerio@1.1.2: + cheerio@1.2.0: dependencies: cheerio-select: 2.1.0 dom-serializer: 2.0.0 domhandler: 5.0.3 domutils: 3.2.2 encoding-sniffer: 0.2.1 - htmlparser2: 10.0.0 + htmlparser2: 10.1.0 parse5: 7.3.0 parse5-htmlparser2-tree-adapter: 7.1.0 parse5-parser-stream: 7.1.2 - undici: 7.18.2 + undici: 7.24.3 whatwg-mimetype: 4.0.0 - chevrotain-allstar@0.3.1(chevrotain@11.0.3): + chevrotain-allstar@0.3.1(chevrotain@11.1.2): dependencies: - chevrotain: 11.0.3 - lodash-es: 4.17.22 + chevrotain: 11.1.2 + lodash-es: 4.17.23 - chevrotain@11.0.3: + chevrotain@11.1.2: dependencies: - '@chevrotain/cst-dts-gen': 11.0.3 - '@chevrotain/gast': 11.0.3 - '@chevrotain/regexp-to-ast': 11.0.3 - '@chevrotain/types': 11.0.3 - '@chevrotain/utils': 11.0.3 - lodash-es: 4.17.21 + '@chevrotain/cst-dts-gen': 11.1.2 + '@chevrotain/gast': 11.1.2 + '@chevrotain/regexp-to-ast': 11.1.2 + '@chevrotain/types': 11.1.2 + '@chevrotain/utils': 11.1.2 + lodash-es: 4.17.23 chokidar@4.0.3: dependencies: @@ -20611,21 +20464,13 @@ snapshots: chownr@1.1.4: optional: true - chownr@2.0.0: {} - chownr@3.0.0: {} ci-info@2.0.0: {} ci-info@3.9.0: {} - ci-info@4.3.1: {} - - cipher-base@1.0.7: - dependencies: - inherits: 2.0.4 - safe-buffer: 5.2.1 - to-buffer: 1.2.2 + ci-info@4.4.0: {} clean-regexp@1.0.0: dependencies: @@ -20640,8 +20485,6 @@ snapshots: cli-boxes@2.2.1: {} - cli-boxes@3.0.0: {} - cli-columns@4.0.0: dependencies: string-width: 4.2.3 @@ -20685,7 +20528,7 @@ snapshots: cliui@9.0.1: dependencies: string-width: 7.2.0 - strip-ansi: 7.1.2 + strip-ansi: 7.2.0 wrap-ansi: 9.0.2 clone-deep@4.0.1: @@ -20750,9 +20593,7 @@ snapshots: commander@12.1.0: {} - commander@13.1.0: {} - - commander@14.0.2: {} + commander@14.0.3: {} commander@7.2.0: {} @@ -20760,13 +20601,12 @@ snapshots: commander@9.5.0: {} - comment-json@4.5.1: + comment-json@4.6.2: dependencies: array-timsort: 1.0.3 - core-util-is: 1.0.3 esprima: 4.0.1 - common-ancestor-path@1.0.1: {} + common-ancestor-path@2.0.0: {} commondir@1.0.1: {} @@ -20792,27 +20632,17 @@ snapshots: confbox@0.1.8: {} - confbox@0.2.2: {} + confbox@0.2.4: {} config-chain@1.1.13: dependencies: ini: 1.3.8 proto-list: 1.2.4 - console-browserify@1.2.0: {} - - constants-browserify@1.0.0: {} - - content-disposition@0.5.4: - dependencies: - safe-buffer: 5.2.1 - content-disposition@1.0.1: {} content-type@1.0.5: {} - convert-source-map@1.9.0: {} - convert-source-map@2.0.0: {} convert-to-spaces@1.0.2: {} @@ -20830,7 +20660,7 @@ snapshots: depd: 2.0.0 keygrip: 1.1.0 - core-js-compat@3.47.0: + core-js-compat@3.48.0: dependencies: browserslist: 4.28.1 @@ -20844,51 +20674,10 @@ snapshots: dependencies: layout-base: 2.0.1 - cosmiconfig@7.1.0: - dependencies: - '@types/parse-json': 4.0.2 - import-fresh: 3.3.1 - parse-json: 5.2.0 - path-type: 4.0.0 - yaml: 1.10.2 - - cosmiconfig@9.0.0(typescript@5.9.3): - dependencies: - env-paths: 2.2.1 - import-fresh: 3.3.1 - js-yaml: 4.1.1 - parse-json: 5.2.0 - optionalDependencies: - typescript: 5.9.3 - - create-ecdh@4.0.4: - dependencies: - bn.js: 4.12.2 - elliptic: 6.6.1 - - create-hash@1.2.0: - dependencies: - cipher-base: 1.0.7 - inherits: 2.0.4 - md5.js: 1.3.5 - ripemd160: 2.0.3 - sha.js: 2.4.12 - - create-hmac@1.1.7: - dependencies: - cipher-base: 1.0.7 - create-hash: 1.2.0 - inherits: 2.0.4 - ripemd160: 2.0.3 - safe-buffer: 5.2.1 - sha.js: 2.4.12 - - create-require@1.1.1: {} - - create-storybook@10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3): + create-storybook@10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4): dependencies: - semver: 7.7.3 - storybook: 10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + semver: 7.7.4 + storybook: 10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) transitivePeerDependencies: - '@testing-library/dom' - bufferutil @@ -20912,76 +20701,64 @@ snapshots: dependencies: uncrypto: 0.1.3 - crypto-browserify@3.12.1: - dependencies: - browserify-cipher: 1.0.1 - browserify-sign: 4.2.5 - create-ecdh: 4.0.4 - create-hash: 1.2.0 - create-hmac: 1.1.7 - diffie-hellman: 5.0.3 - hash-base: 3.0.5 - inherits: 2.0.4 - pbkdf2: 3.1.5 - public-encrypt: 4.0.3 - randombytes: 2.1.0 - randomfill: 1.0.4 - crypto-random-string@2.0.0: {} - cspell-config-lib@9.6.0: + cspell-config-lib@9.7.0: dependencies: - '@cspell/cspell-types': 9.6.0 - comment-json: 4.5.1 + '@cspell/cspell-types': 9.7.0 + comment-json: 4.6.2 smol-toml: 1.6.0 - yaml: 2.8.2 + yaml: 2.8.3 - cspell-dictionary@9.6.0: + cspell-dictionary@9.7.0: dependencies: - '@cspell/cspell-pipe': 9.6.0 - '@cspell/cspell-types': 9.6.0 - cspell-trie-lib: 9.6.0(@cspell/cspell-types@9.6.0) + '@cspell/cspell-performance-monitor': 9.7.0 + '@cspell/cspell-pipe': 9.7.0 + '@cspell/cspell-types': 9.7.0 + cspell-trie-lib: 9.7.0(@cspell/cspell-types@9.7.0) fast-equals: 6.0.0 - cspell-gitignore@9.6.0: + cspell-gitignore@9.7.0: dependencies: - '@cspell/url': 9.6.0 - cspell-glob: 9.6.0 - cspell-io: 9.6.0 + '@cspell/url': 9.7.0 + cspell-glob: 9.7.0 + cspell-io: 9.7.0 - cspell-glob@9.6.0: + cspell-glob@9.7.0: dependencies: - '@cspell/url': 9.6.0 + '@cspell/url': 9.7.0 picomatch: 4.0.3 - cspell-grammar@9.6.0: + cspell-grammar@9.7.0: dependencies: - '@cspell/cspell-pipe': 9.6.0 - '@cspell/cspell-types': 9.6.0 + '@cspell/cspell-pipe': 9.7.0 + '@cspell/cspell-types': 9.7.0 - cspell-io@9.6.0: + cspell-io@9.7.0: dependencies: - '@cspell/cspell-service-bus': 9.6.0 - '@cspell/url': 9.6.0 + '@cspell/cspell-service-bus': 9.7.0 + '@cspell/url': 9.7.0 - cspell-lib@9.6.0: + cspell-lib@9.7.0: dependencies: - '@cspell/cspell-bundled-dicts': 9.6.0 - '@cspell/cspell-pipe': 9.6.0 - '@cspell/cspell-resolver': 9.6.0 - '@cspell/cspell-types': 9.6.0 - '@cspell/dynamic-import': 9.6.0 - '@cspell/filetypes': 9.6.0 - '@cspell/strong-weak-map': 9.6.0 - '@cspell/url': 9.6.0 + '@cspell/cspell-bundled-dicts': 9.7.0 + '@cspell/cspell-performance-monitor': 9.7.0 + '@cspell/cspell-pipe': 9.7.0 + '@cspell/cspell-resolver': 9.7.0 + '@cspell/cspell-types': 9.7.0 + '@cspell/dynamic-import': 9.7.0 + '@cspell/filetypes': 9.7.0 + '@cspell/rpc': 9.7.0 + '@cspell/strong-weak-map': 9.7.0 + '@cspell/url': 9.7.0 clear-module: 4.1.2 - cspell-config-lib: 9.6.0 - cspell-dictionary: 9.6.0 - cspell-glob: 9.6.0 - cspell-grammar: 9.6.0 - cspell-io: 9.6.0 - cspell-trie-lib: 9.6.0(@cspell/cspell-types@9.6.0) - env-paths: 3.0.0 + cspell-config-lib: 9.7.0 + cspell-dictionary: 9.7.0 + cspell-glob: 9.7.0 + cspell-grammar: 9.7.0 + cspell-io: 9.7.0 + cspell-trie-lib: 9.7.0(@cspell/cspell-types@9.7.0) + env-paths: 4.0.0 gensequence: 8.0.8 import-fresh: 3.3.1 resolve-from: 5.0.0 @@ -20989,30 +20766,32 @@ snapshots: vscode-uri: 3.1.0 xdg-basedir: 5.1.0 - cspell-trie-lib@9.6.0(@cspell/cspell-types@9.6.0): + cspell-trie-lib@9.7.0(@cspell/cspell-types@9.7.0): dependencies: - '@cspell/cspell-types': 9.6.0 + '@cspell/cspell-types': 9.7.0 - cspell@9.6.0: + cspell@9.7.0: dependencies: - '@cspell/cspell-json-reporter': 9.6.0 - '@cspell/cspell-pipe': 9.6.0 - '@cspell/cspell-types': 9.6.0 - '@cspell/dynamic-import': 9.6.0 - '@cspell/url': 9.6.0 + '@cspell/cspell-json-reporter': 9.7.0 + '@cspell/cspell-performance-monitor': 9.7.0 + '@cspell/cspell-pipe': 9.7.0 + '@cspell/cspell-types': 9.7.0 + '@cspell/cspell-worker': 9.7.0 + '@cspell/dynamic-import': 9.7.0 + '@cspell/url': 9.7.0 ansi-regex: 6.2.2 chalk: 5.6.2 chalk-template: 1.1.2 - commander: 14.0.2 - cspell-config-lib: 9.6.0 - cspell-dictionary: 9.6.0 - cspell-gitignore: 9.6.0 - cspell-glob: 9.6.0 - cspell-io: 9.6.0 - cspell-lib: 9.6.0 + commander: 14.0.3 + cspell-config-lib: 9.7.0 + cspell-dictionary: 9.7.0 + cspell-gitignore: 9.7.0 + cspell-glob: 9.7.0 + cspell-io: 9.7.0 + cspell-lib: 9.7.0 fast-json-stable-stringify: 2.1.0 - flatted: 3.3.3 - semver: 7.7.3 + flatted: 3.4.1 + semver: 7.7.4 tinyglobby: 0.2.15 css-select@5.2.2: @@ -21030,9 +20809,9 @@ snapshots: mdn-data: 2.0.28 source-map-js: 1.2.1 - css-tree@3.1.0: + css-tree@3.2.1: dependencies: - mdn-data: 2.12.2 + mdn-data: 2.27.1 source-map-js: 1.2.1 css-what@6.2.2: {} @@ -21231,10 +21010,10 @@ snapshots: d3-transition: 3.0.1(d3-selection@3.0.0) d3-zoom: 3.0.0 - dagre-d3-es@7.0.13: + dagre-d3-es@7.0.14: dependencies: d3: 7.9.0 - lodash-es: 4.17.22 + lodash-es: 4.17.23 data-uri-to-buffer@2.0.2: {} @@ -21245,27 +21024,9 @@ snapshots: whatwg-mimetype: 4.0.0 whatwg-url: 14.2.0 - data-view-buffer@1.0.2: - dependencies: - call-bound: 1.0.4 - es-errors: 1.3.0 - is-data-view: 1.0.2 - - data-view-byte-length@1.0.2: - dependencies: - call-bound: 1.0.4 - es-errors: 1.3.0 - is-data-view: 1.0.2 - - data-view-byte-offset@1.0.1: - dependencies: - call-bound: 1.0.4 - es-errors: 1.3.0 - is-data-view: 1.0.2 - date-fns@4.1.0: {} - dayjs@1.11.19: {} + dayjs@1.11.20: {} de-indent@1.0.2: {} @@ -21279,13 +21040,9 @@ snapshots: dependencies: ms: 2.1.3 - debug@4.4.3(supports-color@8.1.1): + debug@4.4.3: dependencies: ms: 2.1.3 - optionalDependencies: - supports-color: 8.1.1 - - decamelize@4.0.0: {} decimal.js@10.6.0: {} @@ -21330,7 +21087,7 @@ snapshots: default-browser-id@5.0.1: {} - default-browser@5.4.0: + default-browser@5.5.0: dependencies: bundle-name: 4.1.0 default-browser-id: 5.0.1 @@ -21386,22 +21143,13 @@ snapshots: dequal@2.0.3: {} - des.js@1.1.0: - dependencies: - inherits: 2.0.4 - minimalistic-assert: 1.0.1 - destr@2.0.5: {} destroy@1.2.0: {} detect-libc@2.1.2: {} - deterministic-object-hash@2.0.2: - dependencies: - base-64: 1.0.0 - - devalue@5.6.2: {} + devalue@5.6.4: {} devlop@1.1.0: dependencies: @@ -21409,16 +21157,8 @@ snapshots: diff@5.2.2: {} - diff@7.0.0: {} - diff@8.0.3: {} - diffie-hellman@5.0.3: - dependencies: - bn.js: 4.12.2 - miller-rabin: 4.0.1 - randombytes: 2.1.0 - dir-glob@3.0.1: dependencies: path-type: 4.0.0 @@ -21431,10 +21171,6 @@ snapshots: dlv@1.1.3: {} - doctrine@2.1.0: - dependencies: - esutils: 2.0.3 - doctrine@3.0.0: dependencies: esutils: 2.0.3 @@ -21449,19 +21185,13 @@ snapshots: domhandler: 5.0.3 entities: 4.5.0 - domain-browser@4.22.0: {} - domelementtype@2.3.0: {} domhandler@5.0.3: dependencies: domelementtype: 2.3.0 - dompurify@3.2.7: - optionalDependencies: - '@types/trusted-types': 2.0.7 - - dompurify@3.3.1: + dompurify@3.3.3: optionalDependencies: '@types/trusted-types': 2.0.7 @@ -21498,7 +21228,7 @@ snapshots: dependencies: escape-html: 1.0.3 - ecmarkup@22.0.0: + ecmarkup@23.0.2: dependencies: chalk: 4.1.2 command-line-args: 5.2.1 @@ -21528,22 +21258,7 @@ snapshots: ee-first@1.1.1: {} - effect@3.19.14: - dependencies: - '@standard-schema/spec': 1.1.0 - fast-check: 3.23.2 - - electron-to-chromium@1.5.267: {} - - elliptic@6.6.1: - dependencies: - bn.js: 4.12.2 - brorand: 1.1.0 - hash.js: 1.1.7 - hmac-drbg: 1.0.1 - inherits: 2.0.4 - minimalistic-assert: 1.0.1 - minimalistic-crypto-utils: 1.0.1 + electron-to-chromium@1.5.313: {} embla-carousel-autoplay@8.6.0(embla-carousel@8.6.0): dependencies: @@ -21597,11 +21312,13 @@ snapshots: entities@6.0.1: {} - entities@7.0.0: {} + entities@7.0.1: {} env-paths@2.2.1: {} - env-paths@3.0.0: {} + env-paths@4.0.0: + dependencies: + is-safe-filename: 0.1.1 environment@1.1.0: {} @@ -21611,63 +21328,6 @@ snapshots: dependencies: is-arrayish: 0.2.1 - es-abstract@1.24.1: - dependencies: - array-buffer-byte-length: 1.0.2 - arraybuffer.prototype.slice: 1.0.4 - available-typed-arrays: 1.0.7 - call-bind: 1.0.8 - call-bound: 1.0.4 - data-view-buffer: 1.0.2 - data-view-byte-length: 1.0.2 - data-view-byte-offset: 1.0.1 - es-define-property: 1.0.1 - es-errors: 1.3.0 - es-object-atoms: 1.1.1 - es-set-tostringtag: 2.1.0 - es-to-primitive: 1.3.0 - function.prototype.name: 1.1.8 - get-intrinsic: 1.3.0 - get-proto: 1.0.1 - get-symbol-description: 1.1.0 - globalthis: 1.0.4 - gopd: 1.2.0 - has-property-descriptors: 1.0.2 - has-proto: 1.2.0 - has-symbols: 1.1.0 - hasown: 2.0.2 - internal-slot: 1.1.0 - is-array-buffer: 3.0.5 - is-callable: 1.2.7 - is-data-view: 1.0.2 - is-negative-zero: 2.0.3 - is-regex: 1.2.1 - is-set: 2.0.3 - is-shared-array-buffer: 1.0.4 - is-string: 1.1.1 - is-typed-array: 1.1.15 - is-weakref: 1.1.1 - math-intrinsics: 1.1.0 - object-inspect: 1.13.4 - object-keys: 1.1.1 - object.assign: 4.1.7 - own-keys: 1.0.1 - regexp.prototype.flags: 1.5.4 - safe-array-concat: 1.1.3 - safe-push-apply: 1.0.0 - safe-regex-test: 1.1.0 - set-proto: 1.0.0 - stop-iteration-iterator: 1.1.0 - string.prototype.trim: 1.2.10 - string.prototype.trimend: 1.0.9 - string.prototype.trimstart: 1.0.8 - typed-array-buffer: 1.0.3 - typed-array-byte-length: 1.0.3 - typed-array-byte-offset: 1.0.4 - typed-array-length: 1.0.7 - unbox-primitive: 1.1.0 - which-typed-array: 1.1.20 - es-define-property@1.0.1: {} es-errors@1.3.0: {} @@ -21684,7 +21344,7 @@ snapshots: isarray: 2.0.5 stop-iteration-iterator: 1.1.0 - es-module-lexer@1.7.0: {} + es-module-lexer@2.0.0: {} es-module-shims@2.8.0: {} @@ -21699,17 +21359,7 @@ snapshots: has-tostringtag: 1.0.2 hasown: 2.0.2 - es-shim-unscopables@1.1.0: - dependencies: - hasown: 2.0.2 - - es-to-primitive@1.3.0: - dependencies: - is-callable: 1.2.7 - is-date-object: 1.1.0 - is-symbol: 1.1.1 - - es-toolkit@1.44.0: {} + es-toolkit@1.45.1: {} esast-util-from-estree@2.0.0: dependencies: @@ -21721,74 +21371,45 @@ snapshots: esast-util-from-js@2.0.1: dependencies: '@types/estree-jsx': 1.0.5 - acorn: 8.15.0 + acorn: 8.16.0 esast-util-from-estree: 2.0.0 vfile-message: 4.0.3 - esbuild-plugins-node-modules-polyfill@1.8.1(esbuild@0.27.2): + esbuild-plugins-node-modules-polyfill@1.8.1(esbuild@0.27.4): dependencies: '@jspm/core': 2.1.0 - esbuild: 0.27.2 + esbuild: 0.27.4 local-pkg: 1.1.2 resolve.exports: 2.0.3 - esbuild@0.25.12: - optionalDependencies: - '@esbuild/aix-ppc64': 0.25.12 - '@esbuild/android-arm': 0.25.12 - '@esbuild/android-arm64': 0.25.12 - '@esbuild/android-x64': 0.25.12 - '@esbuild/darwin-arm64': 0.25.12 - '@esbuild/darwin-x64': 0.25.12 - '@esbuild/freebsd-arm64': 0.25.12 - '@esbuild/freebsd-x64': 0.25.12 - '@esbuild/linux-arm': 0.25.12 - '@esbuild/linux-arm64': 0.25.12 - '@esbuild/linux-ia32': 0.25.12 - '@esbuild/linux-loong64': 0.25.12 - '@esbuild/linux-mips64el': 0.25.12 - '@esbuild/linux-ppc64': 0.25.12 - '@esbuild/linux-riscv64': 0.25.12 - '@esbuild/linux-s390x': 0.25.12 - '@esbuild/linux-x64': 0.25.12 - '@esbuild/netbsd-arm64': 0.25.12 - '@esbuild/netbsd-x64': 0.25.12 - '@esbuild/openbsd-arm64': 0.25.12 - '@esbuild/openbsd-x64': 0.25.12 - '@esbuild/openharmony-arm64': 0.25.12 - '@esbuild/sunos-x64': 0.25.12 - '@esbuild/win32-arm64': 0.25.12 - '@esbuild/win32-ia32': 0.25.12 - '@esbuild/win32-x64': 0.25.12 - - esbuild@0.27.2: + esbuild@0.27.4: optionalDependencies: - '@esbuild/aix-ppc64': 0.27.2 - '@esbuild/android-arm': 0.27.2 - '@esbuild/android-arm64': 0.27.2 - '@esbuild/android-x64': 0.27.2 - '@esbuild/darwin-arm64': 0.27.2 - '@esbuild/darwin-x64': 0.27.2 - '@esbuild/freebsd-arm64': 0.27.2 - '@esbuild/freebsd-x64': 0.27.2 - '@esbuild/linux-arm': 0.27.2 - '@esbuild/linux-arm64': 0.27.2 - '@esbuild/linux-ia32': 0.27.2 - '@esbuild/linux-loong64': 0.27.2 - '@esbuild/linux-mips64el': 0.27.2 - '@esbuild/linux-ppc64': 0.27.2 - '@esbuild/linux-riscv64': 0.27.2 - '@esbuild/linux-s390x': 0.27.2 - '@esbuild/linux-x64': 0.27.2 - '@esbuild/netbsd-arm64': 0.27.2 - '@esbuild/netbsd-x64': 0.27.2 - '@esbuild/openbsd-arm64': 0.27.2 - '@esbuild/openbsd-x64': 0.27.2 - '@esbuild/openharmony-arm64': 0.27.2 - '@esbuild/sunos-x64': 0.27.2 - '@esbuild/win32-arm64': 0.27.2 - '@esbuild/win32-ia32': 0.27.2 - '@esbuild/win32-x64': 0.27.2 + '@esbuild/aix-ppc64': 0.27.4 + '@esbuild/android-arm': 0.27.4 + '@esbuild/android-arm64': 0.27.4 + '@esbuild/android-x64': 0.27.4 + '@esbuild/darwin-arm64': 0.27.4 + '@esbuild/darwin-x64': 0.27.4 + '@esbuild/freebsd-arm64': 0.27.4 + '@esbuild/freebsd-x64': 0.27.4 + '@esbuild/linux-arm': 0.27.4 + '@esbuild/linux-arm64': 0.27.4 + '@esbuild/linux-ia32': 0.27.4 + '@esbuild/linux-loong64': 0.27.4 + '@esbuild/linux-mips64el': 0.27.4 + '@esbuild/linux-ppc64': 0.27.4 + '@esbuild/linux-riscv64': 0.27.4 + '@esbuild/linux-s390x': 0.27.4 + '@esbuild/linux-x64': 0.27.4 + '@esbuild/netbsd-arm64': 0.27.4 + '@esbuild/netbsd-x64': 0.27.4 + '@esbuild/openbsd-arm64': 0.27.4 + '@esbuild/openbsd-x64': 0.27.4 + '@esbuild/openharmony-arm64': 0.27.4 + '@esbuild/sunos-x64': 0.27.4 + '@esbuild/win32-arm64': 0.27.4 + '@esbuild/win32-ia32': 0.27.4 + '@esbuild/win32-x64': 0.27.4 escalade@3.2.0: {} @@ -21807,75 +21428,26 @@ snapshots: '@babel/code-frame': 7.12.11 chalk: 4.1.2 - eslint-import-resolver-node@0.3.9: - dependencies: - debug: 3.2.7 - is-core-module: 2.16.1 - resolve: 1.22.11 - transitivePeerDependencies: - - supports-color - - eslint-module-utils@2.12.1(@typescript-eslint/parser@8.53.1(eslint@9.39.2)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.2): - dependencies: - debug: 3.2.7 - optionalDependencies: - '@typescript-eslint/parser': 8.53.1(eslint@9.39.2)(typescript@5.9.3) - eslint: 9.39.2 - eslint-import-resolver-node: 0.3.9 - transitivePeerDependencies: - - supports-color - - eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.53.1(eslint@9.39.2)(typescript@5.9.3))(eslint@9.39.2): - dependencies: - '@rtsao/scc': 1.1.0 - array-includes: 3.1.9 - array.prototype.findlastindex: 1.2.6 - array.prototype.flat: 1.3.3 - array.prototype.flatmap: 1.3.3 - debug: 3.2.7 - doctrine: 2.1.0 - eslint: 9.39.2 - eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.53.1(eslint@9.39.2)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.2) - hasown: 2.0.2 - is-core-module: 2.16.1 - is-glob: 4.0.3 - minimatch: 3.1.2 - object.fromentries: 2.0.8 - object.groupby: 1.0.3 - object.values: 1.2.1 - semver: 6.3.1 - string.prototype.trimend: 1.0.9 - tsconfig-paths: 3.15.0 - optionalDependencies: - '@typescript-eslint/parser': 8.53.1(eslint@9.39.2)(typescript@5.9.3) - transitivePeerDependencies: - - eslint-import-resolver-typescript - - eslint-import-resolver-webpack - - supports-color - - eslint-plugin-react-hooks@7.0.1(eslint@9.39.2): + eslint-plugin-react-hooks@7.0.1(eslint@10.0.3): dependencies: - '@babel/core': 7.28.6 - '@babel/parser': 7.28.6 - eslint: 9.39.2 + '@babel/core': 7.29.0 + '@babel/parser': 7.29.0 + eslint: 10.0.3 hermes-parser: 0.25.1 - zod: 4.3.5 - zod-validation-error: 4.0.2(zod@4.3.5) + zod: 4.3.6 + zod-validation-error: 4.0.2(zod@4.3.6) transitivePeerDependencies: - supports-color - eslint-plugin-unicorn@62.0.0(eslint@9.39.2): + eslint-plugin-unicorn@63.0.0(eslint@10.0.3): dependencies: '@babel/helper-validator-identifier': 7.28.5 - '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2) - '@eslint/plugin-kit': 0.4.1 + '@eslint-community/eslint-utils': 4.9.1(eslint@10.0.3) change-case: 5.4.4 - ci-info: 4.3.1 + ci-info: 4.4.0 clean-regexp: 1.0.0 - core-js-compat: 3.47.0 - eslint: 9.39.2 - esquery: 1.7.0 + core-js-compat: 3.48.0 + eslint: 10.0.3 find-up-simple: 1.0.1 globals: 16.5.0 indent-string: 5.0.0 @@ -21884,40 +21456,39 @@ snapshots: pluralize: 8.0.0 regexp-tree: 0.1.27 regjsparser: 0.13.0 - semver: 7.7.3 + semver: 7.7.4 strip-indent: 4.1.1 - eslint-scope@8.4.0: + eslint-scope@9.1.2: dependencies: + '@types/esrecurse': 4.3.1 + '@types/estree': 1.0.8 esrecurse: 4.3.0 estraverse: 5.3.0 eslint-visitor-keys@3.4.3: {} - eslint-visitor-keys@4.2.1: {} + eslint-visitor-keys@5.0.1: {} - eslint@9.39.2: + eslint@10.0.3: dependencies: - '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2) + '@eslint-community/eslint-utils': 4.9.1(eslint@10.0.3) '@eslint-community/regexpp': 4.12.2 - '@eslint/config-array': 0.21.1 - '@eslint/config-helpers': 0.4.2 - '@eslint/core': 0.17.0 - '@eslint/eslintrc': 3.3.3 - '@eslint/js': 9.39.2 - '@eslint/plugin-kit': 0.4.1 + '@eslint/config-array': 0.23.3 + '@eslint/config-helpers': 0.5.3 + '@eslint/core': 1.1.1 + '@eslint/plugin-kit': 0.6.1 '@humanfs/node': 0.16.7 '@humanwhocodes/module-importer': 1.0.1 '@humanwhocodes/retry': 0.4.3 '@types/estree': 1.0.8 - ajv: 6.12.6 - chalk: 4.1.2 + ajv: 6.14.0 cross-spawn: 7.0.6 - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 escape-string-regexp: 4.0.0 - eslint-scope: 8.4.0 - eslint-visitor-keys: 4.2.1 - espree: 10.4.0 + eslint-scope: 9.1.2 + eslint-visitor-keys: 5.0.1 + espree: 11.2.0 esquery: 1.7.0 esutils: 2.0.3 fast-deep-equal: 3.1.3 @@ -21928,18 +21499,17 @@ snapshots: imurmurhash: 0.1.4 is-glob: 4.0.3 json-stable-stringify-without-jsonify: 1.0.1 - lodash.merge: 4.6.2 - minimatch: 3.1.2 + minimatch: 10.2.4 natural-compare: 1.4.0 optionator: 0.9.4 transitivePeerDependencies: - supports-color - espree@10.4.0: + espree@11.2.0: dependencies: - acorn: 8.15.0 - acorn-jsx: 5.3.2(acorn@8.15.0) - eslint-visitor-keys: 4.2.1 + acorn: 8.16.0 + acorn-jsx: 5.3.2(acorn@8.16.0) + eslint-visitor-keys: 5.0.1 esprima@4.0.1: {} @@ -22006,11 +21576,6 @@ snapshots: events@3.3.0: {} - evp_bytestokey@1.0.3: - dependencies: - md5.js: 1.3.5 - safe-buffer: 5.2.1 - execa@5.1.1: dependencies: cross-spawn: 7.0.6 @@ -22053,7 +21618,7 @@ snapshots: content-type: 1.0.5 cookie: 0.7.2 cookie-signature: 1.2.2 - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 depd: 2.0.0 encodeurl: 2.0.0 escape-html: 1.0.3 @@ -22067,7 +21632,7 @@ snapshots: once: 1.4.0 parseurl: 1.3.3 proxy-addr: 2.0.7 - qs: 6.14.1 + qs: 6.15.0 range-parser: 1.2.1 router: 2.2.0 send: 1.2.1 @@ -22078,12 +21643,12 @@ snapshots: transitivePeerDependencies: - supports-color - expressive-code@0.41.6: + expressive-code@0.41.7: dependencies: - '@expressive-code/core': 0.41.6 - '@expressive-code/plugin-frames': 0.41.6 - '@expressive-code/plugin-shiki': 0.41.6 - '@expressive-code/plugin-text-markers': 0.41.6 + '@expressive-code/core': 0.41.7 + '@expressive-code/plugin-frames': 0.41.7 + '@expressive-code/plugin-shiki': 0.41.7 + '@expressive-code/plugin-text-markers': 0.41.7 exsolve@1.0.8: {} @@ -22093,12 +21658,6 @@ snapshots: extend@3.0.2: {} - fast-check@3.23.2: - dependencies: - pure-rand: 6.1.0 - - fast-content-type-parse@2.0.1: {} - fast-content-type-parse@3.0.0: {} fast-deep-equal@3.1.3: {} @@ -22121,11 +21680,27 @@ snapshots: fast-safe-stringify@2.1.1: {} + fast-string-truncated-width@3.0.3: {} + + fast-string-width@3.0.2: + dependencies: + fast-string-truncated-width: 3.0.3 + fast-uri@3.1.0: {} - fast-xml-parser@5.3.3: + fast-wrap-ansi@0.2.0: + dependencies: + fast-string-width: 3.0.2 + + fast-xml-builder@1.1.3: dependencies: - strnum: 2.1.2 + path-expression-matcher: 1.1.3 + + fast-xml-parser@5.5.5: + dependencies: + fast-xml-builder: 1.1.3 + path-expression-matcher: 1.1.3 + strnum: 2.2.0 fastq@1.20.1: dependencies: @@ -22157,7 +21732,7 @@ snapshots: finalhandler@2.1.1: dependencies: - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 encodeurl: 2.0.0 escape-html: 1.0.3 on-finished: 2.4.1 @@ -22176,8 +21751,6 @@ snapshots: dependencies: array-back: 3.1.0 - find-root@1.1.0: {} - find-up-simple@1.0.1: {} find-up@3.0.0: @@ -22201,22 +21774,22 @@ snapshots: flat-cache@4.0.1: dependencies: - flatted: 3.3.3 + flatted: 3.4.1 keyv: 4.5.4 - flat@5.0.2: {} + flatted@3.4.0: {} - flatted@3.3.3: {} + flatted@3.4.1: {} flattie@1.1.1: {} - flow-parser@0.297.0: {} + flow-parser@0.305.0: {} - fontace@0.4.0: + fontace@0.4.1: dependencies: - fontkitten: 1.0.2 + fontkitten: 1.0.3 - fontkitten@1.0.2: + fontkitten@1.0.3: dependencies: tiny-inflate: 1.0.3 @@ -22251,19 +21824,15 @@ snapshots: jsonfile: 6.2.0 universalify: 2.0.1 - fs-extra@11.3.3: + fs-extra@11.3.4: dependencies: graceful-fs: 4.2.11 jsonfile: 6.2.0 universalify: 2.0.1 - fs-minipass@2.1.0: - dependencies: - minipass: 3.3.6 - fs-minipass@3.0.3: dependencies: - minipass: 7.1.2 + minipass: 7.1.3 fs.realpath@1.0.0: {} @@ -22275,26 +21844,15 @@ snapshots: function-bind@1.1.2: {} - function.prototype.name@1.1.8: - dependencies: - call-bind: 1.0.8 - call-bound: 1.0.4 - define-properties: 1.2.1 - functions-have-names: 1.2.3 - hasown: 2.0.2 - is-callable: 1.2.7 - functions-have-names@1.2.3: {} - generator-function@2.0.1: {} - gensequence@8.0.8: {} gensync@1.0.0-beta.2: {} get-caller-file@2.0.5: {} - get-east-asian-width@1.4.0: {} + get-east-asian-width@1.5.0: {} get-intrinsic@1.3.0: dependencies: @@ -22323,7 +21881,7 @@ snapshots: get-stream@5.2.0: dependencies: - pump: 3.0.3 + pump: 3.0.4 get-stream@6.0.1: {} @@ -22332,13 +21890,7 @@ snapshots: '@sec-ant/readable-stream': 0.4.1 is-stream: 4.0.1 - get-symbol-description@1.1.0: - dependencies: - call-bound: 1.0.4 - es-errors: 1.3.0 - get-intrinsic: 1.3.0 - - get-tsconfig@4.13.0: + get-tsconfig@4.13.6: dependencies: resolve-pkg-maps: 1.0.0 @@ -22368,32 +21920,32 @@ snapshots: dependencies: foreground-child: 3.3.1 jackspeak: 3.4.3 - minimatch: 9.0.5 - minipass: 7.1.2 + minimatch: 9.0.9 + minipass: 7.1.3 package-json-from-dist: 1.0.1 path-scurry: 1.11.1 glob@11.1.0: dependencies: foreground-child: 3.3.1 - jackspeak: 4.1.1 - minimatch: 10.1.1 - minipass: 7.1.2 + jackspeak: 4.2.3 + minimatch: 10.2.4 + minipass: 7.1.3 package-json-from-dist: 1.0.1 - path-scurry: 2.0.1 + path-scurry: 2.0.2 - glob@13.0.0: + glob@13.0.6: dependencies: - minimatch: 10.1.1 - minipass: 7.1.2 - path-scurry: 2.0.1 + minimatch: 10.2.4 + minipass: 7.1.3 + path-scurry: 2.0.2 glob@7.2.3: dependencies: fs.realpath: 1.0.0 inflight: 1.0.6 inherits: 2.0.4 - minimatch: 3.1.2 + minimatch: 3.1.5 once: 1.4.0 path-is-absolute: 1.0.1 @@ -22402,22 +21954,15 @@ snapshots: fs.realpath: 1.0.0 inflight: 1.0.6 inherits: 2.0.4 - minimatch: 5.1.6 + minimatch: 5.1.9 once: 1.4.0 - global-directory@4.0.1: + global-directory@5.0.0: dependencies: - ini: 4.1.1 - - globals@14.0.0: {} + ini: 6.0.0 globals@16.5.0: {} - globalthis@1.0.4: - dependencies: - define-properties: 1.2.1 - gopd: 1.2.0 - globalyzer@0.1.0: {} globby@11.1.0: @@ -22438,7 +21983,7 @@ snapshots: slash: 5.1.0 unicorn-magic: 0.3.0 - globby@16.1.0: + globby@16.1.1: dependencies: '@sindresorhus/merge-streams': 4.0.0 fast-glob: 3.3.3 @@ -22498,7 +22043,7 @@ snapshots: pumpify: 1.5.1 through2: 2.0.5 - h3@1.15.5: + h3@1.15.6: dependencies: cookie-es: 1.2.2 crossws: 0.3.5 @@ -22512,12 +22057,12 @@ snapshots: hachure-fill@0.5.2: {} - happy-dom@20.3.4: + happy-dom@20.8.9: dependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 '@types/whatwg-mimetype': 3.0.2 '@types/ws': 8.18.1 - entities: 4.5.0 + entities: 7.0.1 whatwg-mimetype: 3.0.0 ws: 8.19.0 transitivePeerDependencies: @@ -22534,33 +22079,12 @@ snapshots: dependencies: es-define-property: 1.0.1 - has-proto@1.2.0: - dependencies: - dunder-proto: 1.0.1 - has-symbols@1.1.0: {} has-tostringtag@1.0.2: dependencies: has-symbols: 1.1.0 - hash-base@3.0.5: - dependencies: - inherits: 2.0.4 - safe-buffer: 5.2.1 - - hash-base@3.1.2: - dependencies: - inherits: 2.0.4 - readable-stream: 2.3.8 - safe-buffer: 5.2.1 - to-buffer: 1.2.2 - - hash.js@1.1.7: - dependencies: - inherits: 2.0.4 - minimalistic-assert: 1.0.1 - hasown@2.0.2: dependencies: function-bind: 1.1.2 @@ -22656,7 +22180,7 @@ snapshots: mdast-util-to-hast: 13.2.1 parse5: 7.3.0 unist-util-position: 5.0.0 - unist-util-visit: 5.0.0 + unist-util-visit: 5.1.0 vfile: 6.0.3 web-namespaces: 2.0.1 zwitch: 2.0.4 @@ -22676,7 +22200,7 @@ snapshots: nth-check: 2.1.1 property-information: 7.1.0 space-separated-tokens: 2.0.2 - unist-util-visit: 5.0.0 + unist-util-visit: 5.1.0 zwitch: 2.0.4 hast-util-to-estree@3.1.3: @@ -22777,16 +22301,6 @@ snapshots: highlight.js@11.0.1: {} - hmac-drbg@1.0.1: - dependencies: - hash.js: 1.1.7 - minimalistic-assert: 1.0.1 - minimalistic-crypto-utils: 1.0.1 - - hoist-non-react-statics@3.3.2: - dependencies: - react-is: 16.13.1 - hosted-git-info@4.1.0: dependencies: lru-cache: 6.0.0 @@ -22801,7 +22315,7 @@ snapshots: hosted-git-info@9.0.2: dependencies: - lru-cache: 11.2.4 + lru-cache: 11.2.7 hpagent@1.2.0: {} @@ -22823,12 +22337,12 @@ snapshots: html-whitespace-sensitive-tag-names@3.0.1: {} - htmlparser2@10.0.0: + htmlparser2@10.1.0: dependencies: domelementtype: 2.3.0 domhandler: 5.0.3 domutils: 3.2.2 - entities: 6.0.1 + entities: 7.0.1 http-assert@1.5.0: dependencies: @@ -22863,7 +22377,7 @@ snapshots: http-proxy-agent@7.0.2: dependencies: agent-base: 7.1.4 - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 transitivePeerDependencies: - supports-color @@ -22872,12 +22386,10 @@ snapshots: quick-lru: 5.1.1 resolve-alpn: 1.2.1 - https-browserify@1.0.0: {} - https-proxy-agent@7.0.6: dependencies: agent-base: 7.1.4 - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 transitivePeerDependencies: - supports-color @@ -22905,11 +22417,11 @@ snapshots: ignore-walk@5.0.1: dependencies: - minimatch: 5.1.6 + minimatch: 5.1.9 ignore-walk@8.0.0: dependencies: - minimatch: 10.1.1 + minimatch: 10.2.4 ignore@5.3.2: {} @@ -22949,18 +22461,16 @@ snapshots: ini@3.0.1: {} - ini@4.1.1: {} - ini@6.0.0: {} - ink-text-input@4.0.3(ink@3.2.0(@types/react@19.2.9)(react@17.0.2))(react@17.0.2): + ink-text-input@4.0.3(ink@3.2.0(@types/react@19.2.14)(react@17.0.2))(react@17.0.2): dependencies: chalk: 4.1.2 - ink: 3.2.0(@types/react@19.2.9)(react@19.2.3) + ink: 3.2.0(@types/react@19.2.14)(react@19.2.4) react: 17.0.2 type-fest: 0.15.1 - ink@3.2.0(@types/react@19.2.9)(react@17.0.2): + ink@3.2.0(@types/react@19.2.14)(react@17.0.2): dependencies: ansi-escapes: 4.3.2 auto-bind: 4.0.0 @@ -22971,7 +22481,7 @@ snapshots: code-excerpt: 3.0.0 indent-string: 4.0.0 is-ci: 2.0.0 - lodash: 4.17.21 + lodash: 4.17.23 patch-console: 1.0.0 react: 17.0.2 react-devtools-core: 4.28.5 @@ -22987,12 +22497,12 @@ snapshots: ws: 7.5.10 yoga-layout-prebuilt: 1.10.0 optionalDependencies: - '@types/react': 19.2.9 + '@types/react': 19.2.14 transitivePeerDependencies: - bufferutil - utf-8-validate - ink@3.2.0(@types/react@19.2.9)(react@19.2.3): + ink@3.2.0(@types/react@19.2.14)(react@19.2.4): dependencies: ansi-escapes: 4.3.2 auto-bind: 4.0.0 @@ -23003,11 +22513,11 @@ snapshots: code-excerpt: 3.0.0 indent-string: 4.0.0 is-ci: 2.0.0 - lodash: 4.17.21 + lodash: 4.17.23 patch-console: 1.0.0 - react: 19.2.3 + react: 19.2.4 react-devtools-core: 4.28.5 - react-reconciler: 0.26.2(react@19.2.3) + react-reconciler: 0.26.2(react@19.2.4) scheduler: 0.20.2 signal-exit: 3.0.7 slice-ansi: 3.0.0 @@ -23019,24 +22529,24 @@ snapshots: ws: 7.5.10 yoga-layout-prebuilt: 1.10.0 optionalDependencies: - '@types/react': 19.2.9 + '@types/react': 19.2.14 transitivePeerDependencies: - bufferutil - utf-8-validate inline-style-parser@0.2.7: {} - inquirer@13.2.0(@types/node@25.0.9): + inquirer@13.3.0(@types/node@25.5.0): dependencies: '@inquirer/ansi': 2.0.3 - '@inquirer/core': 11.1.1(@types/node@25.0.9) - '@inquirer/prompts': 8.2.0(@types/node@25.0.9) - '@inquirer/type': 4.0.3(@types/node@25.0.9) + '@inquirer/core': 11.1.5(@types/node@25.5.0) + '@inquirer/prompts': 8.3.0(@types/node@25.5.0) + '@inquirer/type': 4.0.3(@types/node@25.5.0) mute-stream: 3.0.0 run-async: 4.0.6 rxjs: 7.8.2 optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 internal-slot@1.1.0: dependencies: @@ -23076,14 +22586,6 @@ snapshots: is-arrayish@0.2.1: {} - is-async-function@2.1.1: - dependencies: - async-function: 1.0.0 - call-bound: 1.0.4 - get-proto: 1.0.1 - has-tostringtag: 1.0.2 - safe-regex-test: 1.1.0 - is-bigint@1.1.0: dependencies: has-bigints: 1.1.0 @@ -23107,12 +22609,6 @@ snapshots: dependencies: hasown: 2.0.2 - is-data-view@1.0.2: - dependencies: - call-bound: 1.0.4 - get-intrinsic: 1.3.0 - is-typed-array: 1.1.15 - is-date-object@1.1.0: dependencies: call-bound: 1.0.4 @@ -23130,20 +22626,8 @@ snapshots: is-extglob@2.1.1: {} - is-finalizationregistry@1.1.1: - dependencies: - call-bound: 1.0.4 - is-fullwidth-code-point@3.0.0: {} - is-generator-function@1.1.2: - dependencies: - call-bound: 1.0.4 - generator-function: 2.0.1 - get-proto: 1.0.1 - has-tostringtag: 1.0.2 - safe-regex-test: 1.1.0 - is-glob@4.0.3: dependencies: is-extglob: 2.1.1 @@ -23162,13 +22646,6 @@ snapshots: is-map@2.0.3: {} - is-nan@1.3.2: - dependencies: - call-bind: 1.0.8 - define-properties: 1.2.1 - - is-negative-zero@2.0.3: {} - is-number-object@1.1.1: dependencies: call-bound: 1.0.4 @@ -23201,6 +22678,8 @@ snapshots: has-tostringtag: 1.0.2 hasown: 2.0.2 + is-safe-filename@0.1.1: {} + is-set@2.0.3: {} is-shared-array-buffer@1.0.4: @@ -23230,22 +22709,12 @@ snapshots: has-symbols: 1.1.0 safe-regex-test: 1.1.0 - is-typed-array@1.1.15: - dependencies: - which-typed-array: 1.1.20 - - is-unicode-supported@0.1.0: {} - is-unicode-supported@1.3.0: {} is-unicode-supported@2.1.0: {} is-weakmap@2.0.2: {} - is-weakref@1.1.1: - dependencies: - call-bound: 1.0.4 - is-weakset@2.0.4: dependencies: call-bound: 1.0.4 @@ -23257,7 +22726,7 @@ snapshots: dependencies: is-docker: 2.2.1 - is-wsl@3.1.0: + is-wsl@3.1.1: dependencies: is-inside-container: 1.0.0 @@ -23267,11 +22736,11 @@ snapshots: isexe@2.0.0: {} - isexe@3.1.1: {} + isexe@3.1.5: {} - isobject@3.0.1: {} + isexe@4.0.0: {} - isomorphic-timers-promises@1.0.1: {} + isobject@3.0.1: {} istanbul-lib-coverage@3.2.2: {} @@ -23298,15 +22767,15 @@ snapshots: optionalDependencies: '@pkgjs/parseargs': 0.11.0 - jackspeak@4.1.1: + jackspeak@4.2.3: dependencies: - '@isaacs/cliui': 8.0.2 + '@isaacs/cliui': 9.0.0 jju@1.4.0: {} - js-tokens@4.0.0: {} + js-tokens@10.0.0: {} - js-tokens@9.0.1: {} + js-tokens@4.0.0: {} js-yaml@3.14.2: dependencies: @@ -23319,19 +22788,19 @@ snapshots: jscodeshift@0.15.2: dependencies: - '@babel/core': 7.28.6 - '@babel/parser': 7.28.6 - '@babel/plugin-transform-class-properties': 7.28.6(@babel/core@7.28.6) - '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.28.6) - '@babel/plugin-transform-nullish-coalescing-operator': 7.28.6(@babel/core@7.28.6) - '@babel/plugin-transform-optional-chaining': 7.28.6(@babel/core@7.28.6) - '@babel/plugin-transform-private-methods': 7.28.6(@babel/core@7.28.6) - '@babel/preset-flow': 7.27.1(@babel/core@7.28.6) - '@babel/preset-typescript': 7.28.5(@babel/core@7.28.6) - '@babel/register': 7.28.6(@babel/core@7.28.6) - babel-core: 7.0.0-bridge.0(@babel/core@7.28.6) + '@babel/core': 7.29.0 + '@babel/parser': 7.29.0 + '@babel/plugin-transform-class-properties': 7.28.6(@babel/core@7.29.0) + '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.0) + '@babel/plugin-transform-nullish-coalescing-operator': 7.28.6(@babel/core@7.29.0) + '@babel/plugin-transform-optional-chaining': 7.28.6(@babel/core@7.29.0) + '@babel/plugin-transform-private-methods': 7.28.6(@babel/core@7.29.0) + '@babel/preset-flow': 7.27.1(@babel/core@7.29.0) + '@babel/preset-typescript': 7.28.5(@babel/core@7.29.0) + '@babel/register': 7.28.6(@babel/core@7.29.0) + babel-core: 7.0.0-bridge.0(@babel/core@7.29.0) chalk: 4.1.2 - flow-parser: 0.297.0 + flow-parser: 0.305.0 graceful-fs: 4.2.11 micromatch: 4.0.8 neo-async: 2.6.2 @@ -23384,9 +22853,7 @@ snapshots: json-stable-stringify-without-jsonify@1.0.1: {} - json5@1.0.2: - dependencies: - minimist: 1.2.8 + json-with-bigint@3.5.7: {} json5@2.2.3: {} @@ -23415,7 +22882,7 @@ snapshots: lodash.isstring: 4.0.1 lodash.once: 4.1.1 ms: 2.1.3 - semver: 7.7.3 + semver: 7.7.4 jszip@3.10.1: dependencies: @@ -23435,7 +22902,7 @@ snapshots: jwa: 2.0.1 safe-buffer: 5.2.1 - katex@0.16.27: + katex@0.16.38: dependencies: commander: 8.3.0 @@ -23475,14 +22942,14 @@ snapshots: koa-mount@4.2.0: dependencies: - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 koa-compose: 4.1.0 transitivePeerDependencies: - supports-color koa-send@5.0.1: dependencies: - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 http-errors: 1.8.1 resolve-path: 1.4.0 transitivePeerDependencies: @@ -23495,10 +22962,10 @@ snapshots: transitivePeerDependencies: - supports-color - koa@3.1.1: + koa@3.1.2: dependencies: accepts: 1.3.8 - content-disposition: 0.5.4 + content-disposition: 1.0.1 content-type: 1.0.5 cookies: 0.9.1 delegates: 1.0.0 @@ -23518,13 +22985,13 @@ snapshots: kolorist@1.8.0: {} - langium@3.3.1: + langium@4.2.1: dependencies: - chevrotain: 11.0.3 - chevrotain-allstar: 0.3.1(chevrotain@11.0.3) + chevrotain: 11.1.2 + chevrotain-allstar: 0.3.1(chevrotain@11.1.2) vscode-languageserver: 9.0.1 vscode-languageserver-textdocument: 1.0.12 - vscode-uri: 3.0.8 + vscode-uri: 3.1.0 layout-base@1.0.2: {} @@ -23543,6 +23010,55 @@ snapshots: dependencies: immediate: 3.0.6 + lightningcss-android-arm64@1.32.0: + optional: true + + lightningcss-darwin-arm64@1.32.0: + optional: true + + lightningcss-darwin-x64@1.32.0: + optional: true + + lightningcss-freebsd-x64@1.32.0: + optional: true + + lightningcss-linux-arm-gnueabihf@1.32.0: + optional: true + + lightningcss-linux-arm64-gnu@1.32.0: + optional: true + + lightningcss-linux-arm64-musl@1.32.0: + optional: true + + lightningcss-linux-x64-gnu@1.32.0: + optional: true + + lightningcss-linux-x64-musl@1.32.0: + optional: true + + lightningcss-win32-arm64-msvc@1.32.0: + optional: true + + lightningcss-win32-x64-msvc@1.32.0: + optional: true + + lightningcss@1.32.0: + dependencies: + detect-libc: 2.1.2 + optionalDependencies: + lightningcss-android-arm64: 1.32.0 + lightningcss-darwin-arm64: 1.32.0 + lightningcss-darwin-x64: 1.32.0 + lightningcss-freebsd-x64: 1.32.0 + lightningcss-linux-arm-gnueabihf: 1.32.0 + lightningcss-linux-arm64-gnu: 1.32.0 + lightningcss-linux-arm64-musl: 1.32.0 + lightningcss-linux-x64-gnu: 1.32.0 + lightningcss-linux-x64-musl: 1.32.0 + lightningcss-win32-arm64-msvc: 1.32.0 + lightningcss-win32-x64-msvc: 1.32.0 + lines-and-columns@1.2.4: {} linkify-it@5.0.0: @@ -23565,7 +23081,7 @@ snapshots: local-pkg@1.1.2: dependencies: - mlly: 1.8.0 + mlly: 1.8.1 pkg-types: 2.3.0 quansync: 0.2.11 @@ -23582,9 +23098,7 @@ snapshots: dependencies: p-locate: 5.0.0 - lodash-es@4.17.21: {} - - lodash-es@4.17.22: {} + lodash-es@4.17.23: {} lodash.camelcase@4.3.0: {} @@ -23612,10 +23126,7 @@ snapshots: lodash@4.17.21: {} - log-symbols@4.1.0: - dependencies: - chalk: 4.1.2 - is-unicode-supported: 0.1.0 + lodash@4.17.23: {} log-symbols@6.0.0: dependencies: @@ -23639,7 +23150,7 @@ snapshots: lru-cache@10.4.3: {} - lru-cache@11.2.4: {} + lru-cache@11.2.7: {} lru-cache@5.1.1: dependencies: @@ -23663,10 +23174,10 @@ snapshots: dependencies: '@jridgewell/sourcemap-codec': 1.5.5 - magicast@0.5.1: + magicast@0.5.2: dependencies: - '@babel/parser': 7.28.6 - '@babel/types': 7.28.6 + '@babel/parser': 7.29.0 + '@babel/types': 7.29.0 source-map-js: 1.2.1 make-dir@2.1.0: @@ -23676,7 +23187,7 @@ snapshots: make-dir@4.0.0: dependencies: - semver: 7.7.3 + semver: 7.7.4 make-empty-dir@3.0.2: dependencies: @@ -23687,7 +23198,7 @@ snapshots: '@npmcli/agent': 3.0.0 cacache: 19.0.1 http-cache-semantics: 4.2.0 - minipass: 7.1.2 + minipass: 7.1.3 minipass-fetch: 4.0.1 minipass-flush: 1.0.5 minipass-pipeline: 1.2.4 @@ -23698,19 +23209,19 @@ snapshots: transitivePeerDependencies: - supports-color - make-fetch-happen@15.0.3: + make-fetch-happen@15.0.4: dependencies: + '@gar/promise-retry': 1.0.2 '@npmcli/agent': 4.0.0 cacache: 20.0.3 http-cache-semantics: 4.2.0 - minipass: 7.1.2 - minipass-fetch: 5.0.0 + minipass: 7.1.3 + minipass-fetch: 5.0.2 minipass-flush: 1.0.5 minipass-pipeline: 1.2.4 negotiator: 1.0.0 proc-log: 6.1.0 - promise-retry: 2.0.1 - ssri: 13.0.0 + ssri: 13.0.1 transitivePeerDependencies: - supports-color @@ -23722,7 +23233,7 @@ snapshots: markdown-extensions@2.0.0: {} - markdown-it@14.1.0: + markdown-it@14.1.1: dependencies: argparse: 2.0.1 entities: 4.5.0 @@ -23739,17 +23250,11 @@ snapshots: math-intrinsics@1.1.0: {} - md5.js@1.3.5: - dependencies: - hash-base: 3.0.5 - inherits: 2.0.4 - safe-buffer: 5.2.1 - mdast-util-definitions@6.0.0: dependencies: '@types/mdast': 4.0.4 '@types/unist': 3.0.3 - unist-util-visit: 5.0.0 + unist-util-visit: 5.1.0 mdast-util-directive@3.1.0: dependencies: @@ -23757,7 +23262,7 @@ snapshots: '@types/unist': 3.0.3 ccount: 2.0.1 devlop: 1.1.0 - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.3 mdast-util-to-markdown: 2.1.2 parse-entities: 4.0.2 stringify-entities: 4.0.4 @@ -23772,7 +23277,7 @@ snapshots: unist-util-is: 6.0.1 unist-util-visit-parents: 6.0.2 - mdast-util-from-markdown@2.0.2: + mdast-util-from-markdown@2.0.3: dependencies: '@types/mdast': 4.0.4 '@types/unist': 3.0.3 @@ -23801,7 +23306,7 @@ snapshots: dependencies: '@types/mdast': 4.0.4 devlop: 1.1.0 - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.3 mdast-util-to-markdown: 2.1.2 micromark-util-normalize-identifier: 2.0.1 transitivePeerDependencies: @@ -23810,7 +23315,7 @@ snapshots: mdast-util-gfm-strikethrough@2.0.0: dependencies: '@types/mdast': 4.0.4 - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.3 mdast-util-to-markdown: 2.1.2 transitivePeerDependencies: - supports-color @@ -23820,7 +23325,7 @@ snapshots: '@types/mdast': 4.0.4 devlop: 1.1.0 markdown-table: 3.0.4 - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.3 mdast-util-to-markdown: 2.1.2 transitivePeerDependencies: - supports-color @@ -23829,14 +23334,14 @@ snapshots: dependencies: '@types/mdast': 4.0.4 devlop: 1.1.0 - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.3 mdast-util-to-markdown: 2.1.2 transitivePeerDependencies: - supports-color mdast-util-gfm@3.1.0: dependencies: - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.3 mdast-util-gfm-autolink-literal: 2.0.1 mdast-util-gfm-footnote: 2.1.0 mdast-util-gfm-strikethrough: 2.0.0 @@ -23852,7 +23357,7 @@ snapshots: '@types/hast': 3.0.4 '@types/mdast': 4.0.4 devlop: 1.1.0 - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.3 mdast-util-to-markdown: 2.1.2 transitivePeerDependencies: - supports-color @@ -23865,7 +23370,7 @@ snapshots: '@types/unist': 3.0.3 ccount: 2.0.1 devlop: 1.1.0 - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.3 mdast-util-to-markdown: 2.1.2 parse-entities: 4.0.2 stringify-entities: 4.0.4 @@ -23876,7 +23381,7 @@ snapshots: mdast-util-mdx@3.0.0: dependencies: - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.3 mdast-util-mdx-expression: 2.0.1 mdast-util-mdx-jsx: 3.2.0 mdast-util-mdxjs-esm: 2.0.1 @@ -23890,7 +23395,7 @@ snapshots: '@types/hast': 3.0.4 '@types/mdast': 4.0.4 devlop: 1.1.0 - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.3 mdast-util-to-markdown: 2.1.2 transitivePeerDependencies: - supports-color @@ -23909,7 +23414,7 @@ snapshots: micromark-util-sanitize-uri: 2.0.1 trim-lines: 3.0.1 unist-util-position: 5.0.0 - unist-util-visit: 5.0.0 + unist-util-visit: 5.1.0 vfile: 6.0.3 mdast-util-to-markdown@2.1.2: @@ -23921,7 +23426,7 @@ snapshots: mdast-util-to-string: 4.0.0 micromark-util-classify-character: 2.0.1 micromark-util-decode-string: 2.0.1 - unist-util-visit: 5.0.0 + unist-util-visit: 5.1.0 zwitch: 2.0.4 mdast-util-to-string@4.0.0: @@ -23930,7 +23435,7 @@ snapshots: mdn-data@2.0.28: {} - mdn-data@2.12.2: {} + mdn-data@2.27.1: {} mdurl@2.0.0: {} @@ -23954,30 +23459,32 @@ snapshots: merge2@1.4.1: {} - mermaid-isomorphic@3.0.4(playwright@1.57.0): + mermaid-isomorphic@3.1.0(playwright@1.58.2): dependencies: '@fortawesome/fontawesome-free': 6.7.2 - mermaid: 11.12.2 + katex: 0.16.38 + mermaid: 11.13.0 optionalDependencies: - playwright: 1.57.0 + playwright: 1.58.2 - mermaid@11.12.2: + mermaid@11.13.0: dependencies: - '@braintree/sanitize-url': 7.1.1 + '@braintree/sanitize-url': 7.1.2 '@iconify/utils': 3.1.0 - '@mermaid-js/parser': 0.6.3 + '@mermaid-js/parser': 1.0.1 '@types/d3': 7.4.3 + '@upsetjs/venn.js': 2.0.0 cytoscape: 3.33.1 cytoscape-cose-bilkent: 4.1.0(cytoscape@3.33.1) cytoscape-fcose: 2.2.0(cytoscape@3.33.1) d3: 7.9.0 d3-sankey: 0.12.3 - dagre-d3-es: 7.0.13 - dayjs: 1.11.19 - dompurify: 3.3.1 - katex: 0.16.27 + dagre-d3-es: 7.0.14 + dayjs: 1.11.20 + dompurify: 3.3.3 + katex: 0.16.38 khroma: 2.1.0 - lodash-es: 4.17.22 + lodash-es: 4.17.23 marked: 16.4.2 roughjs: 4.6.6 stylis: 4.3.6 @@ -24113,8 +23620,8 @@ snapshots: micromark-extension-mdxjs@3.0.0: dependencies: - acorn: 8.15.0 - acorn-jsx: 5.3.2(acorn@8.15.0) + acorn: 8.16.0 + acorn-jsx: 5.3.2(acorn@8.16.0) micromark-extension-mdx-expression: 3.0.1 micromark-extension-mdx-jsx: 3.0.2 micromark-extension-mdx-md: 2.0.0 @@ -24239,7 +23746,7 @@ snapshots: micromark@4.0.2: dependencies: '@types/debug': 4.1.12 - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 decode-named-character-reference: 1.3.0 devlop: 1.1.0 micromark-core-commonmark: 2.0.3 @@ -24263,11 +23770,6 @@ snapshots: braces: 3.0.3 picomatch: 2.3.1 - miller-rabin@4.0.1: - dependencies: - bn.js: 4.12.2 - brorand: 1.1.0 - mime-db@1.52.0: {} mime-db@1.54.0: {} @@ -24296,27 +23798,23 @@ snapshots: mini-svg-data-uri@1.4.4: {} - minimalistic-assert@1.0.1: {} - - minimalistic-crypto-utils@1.0.1: {} - - minimatch@10.0.3: + minimatch@10.2.3: dependencies: - '@isaacs/brace-expansion': 5.0.0 + brace-expansion: 5.0.4 - minimatch@10.1.1: + minimatch@10.2.4: dependencies: - '@isaacs/brace-expansion': 5.0.0 + brace-expansion: 5.0.4 - minimatch@3.1.2: + minimatch@3.1.5: dependencies: brace-expansion: 1.1.12 - minimatch@5.1.6: + minimatch@5.1.9: dependencies: brace-expansion: 2.0.2 - minimatch@9.0.5: + minimatch@9.0.9: dependencies: brace-expansion: 2.0.2 @@ -24324,23 +23822,23 @@ snapshots: minipass-collect@2.0.1: dependencies: - minipass: 7.1.2 + minipass: 7.1.3 minipass-fetch@4.0.1: dependencies: - minipass: 7.1.2 + minipass: 7.1.3 minipass-sized: 1.0.3 minizlib: 3.1.0 optionalDependencies: encoding: 0.1.13 - minipass-fetch@5.0.0: + minipass-fetch@5.0.2: dependencies: - minipass: 7.1.2 - minipass-sized: 1.0.3 + minipass: 7.1.3 + minipass-sized: 2.0.0 minizlib: 3.1.0 optionalDependencies: - encoding: 0.1.13 + iconv-lite: 0.7.2 minipass-flush@1.0.5: dependencies: @@ -24354,71 +23852,38 @@ snapshots: dependencies: minipass: 3.3.6 - minipass@3.3.6: + minipass-sized@2.0.0: dependencies: - yallist: 4.0.0 - - minipass@5.0.0: {} + minipass: 7.1.3 - minipass@7.1.2: {} - - minizlib@2.1.2: + minipass@3.3.6: dependencies: - minipass: 3.3.6 yallist: 4.0.0 + minipass@7.1.3: {} + minizlib@3.1.0: dependencies: - minipass: 7.1.2 + minipass: 7.1.3 mkdirp-classic@0.5.3: optional: true - mkdirp@0.5.6: + mlly@1.8.1: dependencies: - minimist: 1.2.8 - - mkdirp@1.0.4: {} - - mlly@1.8.0: - dependencies: - acorn: 8.15.0 + acorn: 8.16.0 pathe: 2.0.3 pkg-types: 1.3.1 ufo: 1.6.3 - mocha@11.7.5: - dependencies: - browser-stdout: 1.3.1 - chokidar: 4.0.3 - debug: 4.4.3(supports-color@8.1.1) - diff: 7.0.0 - escape-string-regexp: 4.0.0 - find-up: 5.0.0 - glob: 10.5.0 - he: 1.2.0 - is-path-inside: 3.0.3 - js-yaml: 4.1.1 - log-symbols: 4.1.0 - minimatch: 9.0.5 - ms: 2.1.3 - picocolors: 1.1.1 - serialize-javascript: 6.0.2 - strip-json-comments: 3.1.1 - supports-color: 8.1.1 - workerpool: 9.3.4 - yargs: 17.7.2 - yargs-parser: 21.1.1 - yargs-unparser: 2.0.0 - monaco-editor-core@0.55.1: dependencies: - dompurify: 3.2.7 + dompurify: 3.3.3 marked: 14.0.0 monaco-editor@0.55.1: dependencies: - dompurify: 3.2.7 + dompurify: 3.3.3 marked: 14.0.0 morgan@1.10.1: @@ -24439,15 +23904,12 @@ snapshots: muggle-string@0.4.1: {} - multer@2.0.2: + multer@2.1.1: dependencies: append-field: 1.0.0 busboy: 1.6.0 concat-stream: 2.0.0 - mkdirp: 0.5.6 - object-assign: 4.1.1 type-is: 1.6.18 - xtend: 4.0.2 mustache@4.2.0: {} @@ -24476,19 +23938,19 @@ snapshots: dependencies: '@types/nlcst': 2.0.3 - node-abi@3.87.0: + node-abi@3.88.0: dependencies: - semver: 7.7.3 + semver: 7.7.4 optional: true node-addon-api@4.3.0: optional: true - node-addon-api@8.5.0: {} + node-addon-api@8.6.0: {} node-dir@0.1.17: dependencies: - minimatch: 3.1.2 + minimatch: 3.1.5 node-fetch-native@1.6.7: {} @@ -24502,66 +23964,36 @@ snapshots: make-fetch-happen: 14.0.3 nopt: 8.1.0 proc-log: 5.0.0 - semver: 7.7.3 - tar: 7.5.4 + semver: 7.7.4 + tar: 7.5.11 tinyglobby: 0.2.15 which: 5.0.0 transitivePeerDependencies: - supports-color - node-gyp@12.1.0: + node-gyp@12.2.0: dependencies: env-paths: 2.2.1 exponential-backoff: 3.1.3 graceful-fs: 4.2.11 - make-fetch-happen: 15.0.3 + make-fetch-happen: 15.0.4 nopt: 9.0.0 proc-log: 6.1.0 - semver: 7.7.3 - tar: 7.5.4 + semver: 7.7.4 + tar: 7.5.11 tinyglobby: 0.2.15 - which: 6.0.0 + which: 6.0.1 transitivePeerDependencies: - supports-color node-mock-http@1.0.4: {} - node-releases@2.0.27: {} + node-releases@2.0.36: {} node-sarif-builder@3.4.0: dependencies: '@types/sarif': 2.1.7 - fs-extra: 11.3.3 - - node-stdlib-browser@1.3.1: - dependencies: - assert: 2.1.0 - browser-resolve: 2.0.0 - browserify-zlib: 0.2.0 - buffer: 5.7.1 - console-browserify: 1.2.0 - constants-browserify: 1.0.0 - create-require: 1.1.1 - crypto-browserify: 3.12.1 - domain-browser: 4.22.0 - events: 3.3.0 - https-browserify: 1.0.0 - isomorphic-timers-promises: 1.0.1 - os-browserify: 0.3.0 - path-browserify: 1.0.1 - pkg-dir: 5.0.0 - process: 0.11.10 - punycode: 1.4.1 - querystring-es3: 0.2.1 - readable-stream: 3.6.2 - stream-browserify: 3.0.0 - stream-http: 3.2.0 - string_decoder: 1.3.0 - timers-browserify: 2.0.12 - tty-browserify: 0.0.1 - url: 0.11.4 - util: 0.12.5 - vm-browserify: 1.1.2 + fs-extra: 11.3.4 node-watch@0.7.3: {} @@ -24580,13 +24012,13 @@ snapshots: normalize-package-data@6.0.2: dependencies: hosted-git-info: 7.0.2 - semver: 7.7.3 + semver: 7.7.4 validate-npm-package-license: 3.0.4 normalize-package-data@7.0.1: dependencies: hosted-git-info: 8.1.0 - semver: 7.7.3 + semver: 7.7.4 validate-npm-package-license: 3.0.4 normalize-path@3.0.0: {} @@ -24605,7 +24037,7 @@ snapshots: npm-install-checks@8.0.0: dependencies: - semver: 7.7.3 + semver: 7.7.4 npm-normalize-package-bin@2.0.0: {} @@ -24613,21 +24045,14 @@ snapshots: npm-normalize-package-bin@5.0.0: {} - npm-package-arg@12.0.2: - dependencies: - hosted-git-info: 8.1.0 - proc-log: 5.0.0 - semver: 7.7.3 - validate-npm-package-name: 6.0.2 - npm-package-arg@13.0.2: dependencies: hosted-git-info: 9.0.2 proc-log: 6.1.0 - semver: 7.7.3 + semver: 7.7.4 validate-npm-package-name: 7.0.2 - npm-packlist@10.0.3: + npm-packlist@10.0.4: dependencies: ignore-walk: 8.0.0 proc-log: 6.1.0 @@ -24644,15 +24069,15 @@ snapshots: npm-install-checks: 8.0.0 npm-normalize-package-bin: 5.0.0 npm-package-arg: 13.0.2 - semver: 7.7.3 + semver: 7.7.4 npm-registry-fetch@19.1.1: dependencies: '@npmcli/redact': 4.0.0 jsonparse: 1.3.1 - make-fetch-happen: 15.0.3 - minipass: 7.1.2 - minipass-fetch: 5.0.0 + make-fetch-happen: 15.0.4 + minipass: 7.1.3 + minipass-fetch: 5.0.2 minizlib: 3.1.0 npm-package-arg: 13.0.2 proc-log: 6.1.0 @@ -24696,29 +24121,9 @@ snapshots: has-symbols: 1.1.0 object-keys: 1.1.1 - object.fromentries@2.0.8: - dependencies: - call-bind: 1.0.8 - define-properties: 1.2.1 - es-abstract: 1.24.1 - es-object-atoms: 1.1.1 + obug@2.1.1: {} - object.groupby@1.0.3: - dependencies: - call-bind: 1.0.8 - define-properties: 1.2.1 - es-abstract: 1.24.1 - - object.values@1.2.1: - dependencies: - call-bind: 1.0.8 - call-bound: 1.0.4 - define-properties: 1.2.1 - es-object-atoms: 1.1.1 - - obug@2.1.1: {} - - octokit@5.0.5: + octokit@5.0.5: dependencies: '@octokit/app': 16.1.2 '@octokit/core': 7.0.6 @@ -24726,7 +24131,7 @@ snapshots: '@octokit/plugin-paginate-graphql': 6.0.0(@octokit/core@7.0.6) '@octokit/plugin-paginate-rest': 14.0.0(@octokit/core@7.0.6) '@octokit/plugin-rest-endpoint-methods': 17.0.0(@octokit/core@7.0.6) - '@octokit/plugin-retry': 8.0.3(@octokit/core@7.0.6) + '@octokit/plugin-retry': 8.1.0(@octokit/core@7.0.6) '@octokit/plugin-throttling': 11.0.3(@octokit/core@7.0.6) '@octokit/request-error': 7.1.0 '@octokit/types': 16.0.0 @@ -24776,7 +24181,7 @@ snapshots: open@10.2.0: dependencies: - default-browser: 5.4.0 + default-browser: 5.5.0 define-lazy-prop: 3.0.0 is-inside-container: 1.0.0 wsl-utils: 0.1.0 @@ -24806,9 +24211,9 @@ snapshots: log-symbols: 6.0.0 stdin-discarder: 0.2.2 string-width: 7.2.0 - strip-ansi: 7.1.2 + strip-ansi: 7.2.0 - ora@9.0.0: + ora@9.3.0: dependencies: chalk: 5.6.2 cli-cursor: 5.0.0 @@ -24816,17 +24221,8 @@ snapshots: is-interactive: 2.0.0 is-unicode-supported: 2.1.0 log-symbols: 7.0.1 - stdin-discarder: 0.2.2 - string-width: 8.1.0 - strip-ansi: 7.1.2 - - os-browserify@0.3.0: {} - - own-keys@1.0.1: - dependencies: - get-intrinsic: 1.3.0 - object-keys: 1.1.1 - safe-push-apply: 1.0.0 + stdin-discarder: 0.3.1 + string-width: 8.2.0 p-cancelable@2.1.1: {} @@ -24848,11 +24244,7 @@ snapshots: dependencies: yocto-queue: 0.1.0 - p-limit@6.2.0: - dependencies: - yocto-queue: 1.2.2 - - p-limit@7.2.0: + p-limit@7.3.0: dependencies: yocto-queue: 1.2.2 @@ -24888,10 +24280,10 @@ snapshots: eventemitter3: 4.0.7 p-timeout: 3.2.0 - p-queue@8.1.1: + p-queue@9.1.0: dependencies: eventemitter3: 5.0.4 - p-timeout: 6.1.4 + p-timeout: 7.0.1 p-reflect@2.1.0: {} @@ -24899,7 +24291,7 @@ snapshots: dependencies: p-finally: 1.0.0 - p-timeout@6.1.4: {} + p-timeout@7.0.1: {} p-try@2.2.0: {} @@ -24907,25 +24299,25 @@ snapshots: package-manager-detector@1.6.0: {} - pacote@21.0.4: + pacote@21.5.0: dependencies: - '@npmcli/git': 7.0.1 + '@gar/promise-retry': 1.0.2 + '@npmcli/git': 7.0.2 '@npmcli/installed-package-contents': 4.0.0 - '@npmcli/package-json': 7.0.4 + '@npmcli/package-json': 7.0.5 '@npmcli/promise-spawn': 9.0.1 - '@npmcli/run-script': 10.0.3 + '@npmcli/run-script': 10.0.4 cacache: 20.0.3 fs-minipass: 3.0.3 - minipass: 7.1.2 + minipass: 7.1.3 npm-package-arg: 13.0.2 - npm-packlist: 10.0.3 + npm-packlist: 10.0.4 npm-pick-manifest: 11.0.3 npm-registry-fetch: 19.1.1 proc-log: 6.1.0 - promise-retry: 2.0.1 sigstore: 4.1.0 - ssri: 13.0.0 - tar: 7.5.4 + ssri: 13.0.1 + tar: 7.5.11 transitivePeerDependencies: - supports-color @@ -24950,14 +24342,6 @@ snapshots: dependencies: callsites: 3.1.0 - parse-asn1@5.1.9: - dependencies: - asn1.js: 4.10.1 - browserify-aes: 1.2.0 - evp_bytestokey: 1.0.3 - pbkdf2: 3.1.5 - safe-buffer: 5.2.1 - parse-entities@4.0.2: dependencies: '@types/unist': 2.0.11 @@ -24970,14 +24354,14 @@ snapshots: parse-json@5.2.0: dependencies: - '@babel/code-frame': 7.28.6 + '@babel/code-frame': 7.29.0 error-ex: 1.3.4 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 parse-json@8.3.0: dependencies: - '@babel/code-frame': 7.28.6 + '@babel/code-frame': 7.29.0 index-to-position: 1.2.0 type-fest: 4.41.0 @@ -24996,7 +24380,7 @@ snapshots: parse-npm-tarball-url@4.0.0: dependencies: - semver: 7.7.3 + semver: 7.7.4 parse-path@7.1.0: dependencies: @@ -25039,6 +24423,8 @@ snapshots: path-exists@4.0.0: {} + path-expression-matcher@1.1.3: {} + path-is-absolute@1.0.1: {} path-key@3.1.1: {} @@ -25052,18 +24438,18 @@ snapshots: path-scurry@1.11.1: dependencies: lru-cache: 10.4.3 - minipass: 7.1.2 + minipass: 7.1.3 - path-scurry@2.0.1: + path-scurry@2.0.2: dependencies: - lru-cache: 11.2.4 - minipass: 7.1.2 + lru-cache: 11.2.7 + minipass: 7.1.3 path-temp@2.0.0: dependencies: unique-string: 2.0.0 - path-temp@2.1.0: + path-temp@2.1.1: dependencies: unique-string: 2.0.0 @@ -25077,15 +24463,6 @@ snapshots: pathval@2.0.1: {} - pbkdf2@3.1.5: - dependencies: - create-hash: 1.2.0 - create-hmac: 1.1.7 - ripemd160: 2.0.3 - safe-buffer: 5.2.1 - sha.js: 2.4.12 - to-buffer: 1.2.2 - pct-encode@1.0.3: {} peek-stream@1.1.3: @@ -25116,27 +24493,23 @@ snapshots: dependencies: find-up: 4.1.0 - pkg-dir@5.0.0: - dependencies: - find-up: 5.0.0 - pkg-types@1.3.1: dependencies: confbox: 0.1.8 - mlly: 1.8.0 + mlly: 1.8.1 pathe: 2.0.3 pkg-types@2.3.0: dependencies: - confbox: 0.2.2 + confbox: 0.2.4 exsolve: 1.0.8 pathe: 2.0.3 - playwright-core@1.57.0: {} + playwright-core@1.58.2: {} - playwright@1.57.0: + playwright@1.58.2: dependencies: - playwright-core: 1.57.0 + playwright-core: 1.58.2 optionalDependencies: fsevents: 2.3.2 @@ -25159,9 +24532,9 @@ snapshots: possible-typed-array-names@1.1.0: {} - postcss-nested@6.2.0(postcss@8.5.6): + postcss-nested@6.2.0(postcss@8.5.8): dependencies: - postcss: 8.5.6 + postcss: 8.5.8 postcss-selector-parser: 6.1.2 postcss-selector-parser@6.1.2: @@ -25169,7 +24542,7 @@ snapshots: cssesc: 3.0.0 util-deprecate: 1.0.2 - postcss@8.5.6: + postcss@8.5.8: dependencies: nanoid: 3.3.11 picocolors: 1.1.1 @@ -25187,8 +24560,8 @@ snapshots: minimist: 1.2.8 mkdirp-classic: 0.5.3 napi-build-utils: 2.0.0 - node-abi: 3.87.0 - pump: 3.0.3 + node-abi: 3.88.0 + pump: 3.0.4 rc: 1.2.8 simple-get: 4.0.1 tar-fs: 2.1.4 @@ -25206,22 +24579,22 @@ snapshots: prettier-plugin-astro@0.14.1: dependencies: - '@astrojs/compiler': 2.13.0 - prettier: 3.8.0 + '@astrojs/compiler': 2.13.1 + prettier: 3.8.1 sass-formatter: 0.7.9 - prettier-plugin-organize-imports@4.3.0(prettier@3.8.0)(typescript@5.9.3): + prettier-plugin-organize-imports@4.3.0(prettier@3.8.1)(typescript@5.9.3): dependencies: - prettier: 3.8.0 + prettier: 3.8.1 typescript: 5.9.3 - prettier-plugin-sh@0.18.0(prettier@3.8.0): + prettier-plugin-sh@0.18.0(prettier@3.8.1): dependencies: '@reteps/dockerfmt': 0.3.6 - prettier: 3.8.0 + prettier: 3.8.1 sh-syntax: 0.5.8 - prettier@3.8.0: {} + prettier@3.8.1: {} pretty-bytes@5.6.0: {} @@ -25246,11 +24619,11 @@ snapshots: printable-characters@1.0.42: {} - prism-react-renderer@2.4.1(react@19.2.3): + prism-react-renderer@2.4.1(react@19.2.4): dependencies: - '@types/prismjs': 1.26.5 + '@types/prismjs': 1.26.6 clsx: 2.1.1 - react: 19.2.3 + react: 19.2.4 prismjs@1.30.0: {} @@ -25291,21 +24664,12 @@ snapshots: forwarded: 0.2.0 ipaddr.js: 1.9.1 - public-encrypt@4.0.3: - dependencies: - bn.js: 4.12.2 - browserify-rsa: 4.1.1 - create-hash: 1.2.0 - parse-asn1: 5.1.9 - randombytes: 2.1.0 - safe-buffer: 5.2.1 - pump@2.0.1: dependencies: end-of-stream: 1.4.5 once: 1.4.0 - pump@3.0.3: + pump@3.0.4: dependencies: end-of-stream: 1.4.5 once: 1.4.0 @@ -25318,20 +24682,14 @@ snapshots: punycode.js@2.3.1: {} - punycode@1.4.1: {} - punycode@2.3.1: {} - pure-rand@6.1.0: {} - - qs@6.14.1: + qs@6.15.0: dependencies: side-channel: 1.1.0 quansync@0.2.11: {} - querystring-es3@0.2.1: {} - queue-microtask@1.2.3: {} quick-lru@4.0.1: {} @@ -25346,15 +24704,6 @@ snapshots: radix3@1.1.2: {} - randombytes@2.1.0: - dependencies: - safe-buffer: 5.2.1 - - randomfill@1.0.4: - dependencies: - randombytes: 2.1.0 - safe-buffer: 5.2.1 - range-parser@1.2.1: {} raw-body@3.0.2: @@ -25364,9 +24713,9 @@ snapshots: iconv-lite: 0.7.2 unpipe: 1.0.0 - rc-config-loader@4.1.3: + rc-config-loader@4.1.4: dependencies: - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 js-yaml: 4.1.1 json5: 2.2.3 require-from-string: 2.0.2 @@ -25393,11 +24742,11 @@ snapshots: dependencies: typescript: 5.9.3 - react-docgen@8.0.2: + react-docgen@8.0.3: dependencies: - '@babel/core': 7.28.6 - '@babel/traverse': 7.28.6 - '@babel/types': 7.28.6 + '@babel/core': 7.29.0 + '@babel/traverse': 7.29.0 + '@babel/types': 7.29.0 '@types/babel__core': 7.20.5 '@types/babel__traverse': 7.28.0 '@types/doctrine': 0.0.9 @@ -25408,38 +24757,36 @@ snapshots: transitivePeerDependencies: - supports-color - react-dom@19.2.3(react@19.2.3): + react-dom@19.2.4(react@19.2.4): dependencies: - react: 19.2.3 + react: 19.2.4 scheduler: 0.27.0 - react-error-boundary@6.1.0(react@19.2.3): + react-error-boundary@6.1.1(react@19.2.4): dependencies: - react: 19.2.3 + react: 19.2.4 - react-hotkeys-hook@5.2.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3): + react-hotkeys-hook@5.2.4(react-dom@19.2.4(react@19.2.4))(react@19.2.4): dependencies: - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - - react-is@16.13.1: {} + react: 19.2.4 + react-dom: 19.2.4(react@19.2.4) react-is@17.0.2: {} - react-markdown@10.1.0(@types/react@19.2.9)(react@19.2.3): + react-markdown@10.1.0(@types/react@19.2.14)(react@19.2.4): dependencies: '@types/hast': 3.0.4 '@types/mdast': 4.0.4 - '@types/react': 19.2.9 + '@types/react': 19.2.14 devlop: 1.1.0 hast-util-to-jsx-runtime: 2.3.6 html-url-attributes: 3.0.1 mdast-util-to-hast: 13.2.1 - react: 19.2.3 + react: 19.2.4 remark-parse: 11.0.0 remark-rehype: 11.1.2 unified: 11.0.5 - unist-util-visit: 5.0.0 + unist-util-visit: 5.1.0 vfile: 6.0.3 transitivePeerDependencies: - supports-color @@ -25451,15 +24798,13 @@ snapshots: react: 17.0.2 scheduler: 0.20.2 - react-reconciler@0.26.2(react@19.2.3): + react-reconciler@0.26.2(react@19.2.4): dependencies: loose-envify: 1.4.0 object-assign: 4.1.1 - react: 19.2.3 + react: 19.2.4 scheduler: 0.20.2 - react-refresh@0.17.0: {} - react-refresh@0.18.0: {} react@17.0.2: @@ -25467,7 +24812,7 @@ snapshots: loose-envify: 1.4.0 object-assign: 4.1.1 - react@19.2.3: {} + react@19.2.4: {} read-cmd-shim@4.0.0: {} @@ -25539,10 +24884,10 @@ snapshots: estree-util-build-jsx: 3.0.1 vfile: 6.0.3 - recma-jsx@1.0.1(acorn@8.15.0): + recma-jsx@1.0.1(acorn@8.16.0): dependencies: - acorn: 8.15.0 - acorn-jsx: 5.3.2(acorn@8.15.0) + acorn: 8.16.0 + acorn-jsx: 5.3.2(acorn@8.16.0) estree-util-to-js: 2.0.0 recma-parse: 1.0.0 recma-stringify: 1.0.0 @@ -25569,17 +24914,6 @@ snapshots: reduce-flatten@2.0.0: {} - reflect.getprototypeof@1.0.10: - dependencies: - call-bind: 1.0.8 - define-properties: 1.2.1 - es-abstract: 1.24.1 - es-errors: 1.3.0 - es-object-atoms: 1.1.1 - get-intrinsic: 1.3.0 - get-proto: 1.0.1 - which-builtin-type: 1.2.1 - regex-recursion@6.0.2: dependencies: regex-utilities: 2.3.0 @@ -25605,28 +24939,28 @@ snapshots: dependencies: jsesc: 3.1.0 - rehype-expressive-code@0.41.6: + rehype-expressive-code@0.41.7: dependencies: - expressive-code: 0.41.6 + expressive-code: 0.41.7 rehype-format@5.0.1: dependencies: '@types/hast': 3.0.4 hast-util-format: 1.1.0 - rehype-mermaid@3.0.0(playwright@1.57.0): + rehype-mermaid@3.0.0(playwright@1.58.2): dependencies: '@types/hast': 3.0.4 hast-util-from-html-isomorphic: 2.0.0 hast-util-to-text: 4.0.2 - mermaid-isomorphic: 3.0.4(playwright@1.57.0) + mermaid-isomorphic: 3.1.0(playwright@1.58.2) mini-svg-data-uri: 1.4.4 space-separated-tokens: 2.0.2 unified: 11.0.5 unist-util-visit-parents: 6.0.2 vfile: 6.0.3 optionalDependencies: - playwright: 1.57.0 + playwright: 1.58.2 rehype-parse@9.0.1: dependencies: @@ -25683,7 +25017,7 @@ snapshots: remark-heading-id@1.0.1: dependencies: - lodash: 4.17.21 + lodash: 4.17.23 unist-util-visit: 1.4.1 remark-mdx@3.1.1: @@ -25696,7 +25030,7 @@ snapshots: remark-parse@11.0.0: dependencies: '@types/mdast': 4.0.4 - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.3 micromark-util-types: 2.0.2 unified: 11.0.5 transitivePeerDependencies: @@ -25715,7 +25049,7 @@ snapshots: retext: 9.0.0 retext-smartypants: 6.2.0 unified: 11.0.5 - unist-util-visit: 5.0.0 + unist-util-visit: 5.1.0 remark-stringify@11.0.0: dependencies: @@ -25723,7 +25057,7 @@ snapshots: mdast-util-to-markdown: 2.1.2 unified: 11.0.5 - rename-overwrite@6.0.3: + rename-overwrite@6.0.6: dependencies: '@zkochan/rimraf': 3.0.2 fs-extra: 11.3.0 @@ -25781,7 +25115,7 @@ snapshots: dependencies: '@types/nlcst': 2.0.3 nlcst-to-string: 4.0.0 - unist-util-visit: 5.0.0 + unist-util-visit: 5.1.0 retext-stringify@4.0.0: dependencies: @@ -25810,51 +25144,73 @@ snapshots: dependencies: glob: 7.2.3 - rimraf@6.1.2: + rimraf@6.1.3: dependencies: - glob: 13.0.0 + glob: 13.0.6 package-json-from-dist: 1.0.1 - ripemd160@2.0.3: - dependencies: - hash-base: 3.1.2 - inherits: 2.0.4 - robust-predicates@3.0.2: {} - rollup-plugin-visualizer@6.0.5(rollup@4.49.0): + rolldown@1.0.0-rc.10: + dependencies: + '@oxc-project/types': 0.120.0 + '@rolldown/pluginutils': 1.0.0-rc.10 + optionalDependencies: + '@rolldown/binding-android-arm64': 1.0.0-rc.10 + '@rolldown/binding-darwin-arm64': 1.0.0-rc.10 + '@rolldown/binding-darwin-x64': 1.0.0-rc.10 + '@rolldown/binding-freebsd-x64': 1.0.0-rc.10 + '@rolldown/binding-linux-arm-gnueabihf': 1.0.0-rc.10 + '@rolldown/binding-linux-arm64-gnu': 1.0.0-rc.10 + '@rolldown/binding-linux-arm64-musl': 1.0.0-rc.10 + '@rolldown/binding-linux-ppc64-gnu': 1.0.0-rc.10 + '@rolldown/binding-linux-s390x-gnu': 1.0.0-rc.10 + '@rolldown/binding-linux-x64-gnu': 1.0.0-rc.10 + '@rolldown/binding-linux-x64-musl': 1.0.0-rc.10 + '@rolldown/binding-openharmony-arm64': 1.0.0-rc.10 + '@rolldown/binding-wasm32-wasi': 1.0.0-rc.10 + '@rolldown/binding-win32-arm64-msvc': 1.0.0-rc.10 + '@rolldown/binding-win32-x64-msvc': 1.0.0-rc.10 + + rollup-plugin-visualizer@6.0.4(rolldown@1.0.0-rc.10)(rollup@4.60.0): dependencies: open: 8.4.2 picomatch: 4.0.3 source-map: 0.7.6 yargs: 17.7.2 optionalDependencies: - rollup: 4.49.0 + rolldown: 1.0.0-rc.10 + rollup: 4.60.0 - rollup@4.49.0: + rollup@4.60.0: dependencies: '@types/estree': 1.0.8 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.49.0 - '@rollup/rollup-android-arm64': 4.49.0 - '@rollup/rollup-darwin-arm64': 4.49.0 - '@rollup/rollup-darwin-x64': 4.49.0 - '@rollup/rollup-freebsd-arm64': 4.49.0 - '@rollup/rollup-freebsd-x64': 4.49.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.49.0 - '@rollup/rollup-linux-arm-musleabihf': 4.49.0 - '@rollup/rollup-linux-arm64-gnu': 4.49.0 - '@rollup/rollup-linux-arm64-musl': 4.49.0 - '@rollup/rollup-linux-loongarch64-gnu': 4.49.0 - '@rollup/rollup-linux-ppc64-gnu': 4.49.0 - '@rollup/rollup-linux-riscv64-gnu': 4.49.0 - '@rollup/rollup-linux-riscv64-musl': 4.49.0 - '@rollup/rollup-linux-s390x-gnu': 4.49.0 - '@rollup/rollup-linux-x64-gnu': 4.49.0 - '@rollup/rollup-linux-x64-musl': 4.49.0 - '@rollup/rollup-win32-arm64-msvc': 4.49.0 - '@rollup/rollup-win32-ia32-msvc': 4.49.0 - '@rollup/rollup-win32-x64-msvc': 4.49.0 + '@rollup/rollup-android-arm-eabi': 4.60.0 + '@rollup/rollup-android-arm64': 4.60.0 + '@rollup/rollup-darwin-arm64': 4.60.0 + '@rollup/rollup-darwin-x64': 4.60.0 + '@rollup/rollup-freebsd-arm64': 4.60.0 + '@rollup/rollup-freebsd-x64': 4.60.0 + '@rollup/rollup-linux-arm-gnueabihf': 4.60.0 + '@rollup/rollup-linux-arm-musleabihf': 4.60.0 + '@rollup/rollup-linux-arm64-gnu': 4.60.0 + '@rollup/rollup-linux-arm64-musl': 4.60.0 + '@rollup/rollup-linux-loong64-gnu': 4.60.0 + '@rollup/rollup-linux-loong64-musl': 4.60.0 + '@rollup/rollup-linux-ppc64-gnu': 4.60.0 + '@rollup/rollup-linux-ppc64-musl': 4.60.0 + '@rollup/rollup-linux-riscv64-gnu': 4.60.0 + '@rollup/rollup-linux-riscv64-musl': 4.60.0 + '@rollup/rollup-linux-s390x-gnu': 4.60.0 + '@rollup/rollup-linux-x64-gnu': 4.60.0 + '@rollup/rollup-linux-x64-musl': 4.60.0 + '@rollup/rollup-openbsd-x64': 4.60.0 + '@rollup/rollup-openharmony-arm64': 4.60.0 + '@rollup/rollup-win32-arm64-msvc': 4.60.0 + '@rollup/rollup-win32-ia32-msvc': 4.60.0 + '@rollup/rollup-win32-x64-gnu': 4.60.0 + '@rollup/rollup-win32-x64-msvc': 4.60.0 fsevents: 2.3.3 root-link-target@3.1.0: @@ -25872,7 +25228,7 @@ snapshots: router@2.2.0: dependencies: - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 depd: 2.0.0 is-promise: 4.0.0 parseurl: 1.3.3 @@ -25908,14 +25264,6 @@ snapshots: s.color@0.0.15: {} - safe-array-concat@1.1.3: - dependencies: - call-bind: 1.0.8 - call-bound: 1.0.4 - get-intrinsic: 1.3.0 - has-symbols: 1.1.0 - isarray: 2.0.5 - safe-buffer@5.1.2: {} safe-buffer@5.2.1: {} @@ -25932,11 +25280,6 @@ snapshots: execa: 5.1.1 path-name: 1.0.0 - safe-push-apply@1.0.0: - dependencies: - es-errors: 1.3.0 - isarray: 2.0.5 - safe-regex-test@1.1.0: dependencies: call-bound: 1.0.4 @@ -25953,7 +25296,7 @@ snapshots: dependencies: suf-log: 2.5.3 - sax@1.4.4: {} + sax@1.5.0: {} saxes@6.0.0: dependencies: @@ -25972,7 +25315,7 @@ snapshots: '@secretlint/formatter': 10.2.2 '@secretlint/node': 10.2.2 '@secretlint/profiler': 10.2.2 - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 globby: 14.1.0 read-pkg: 9.0.1 transitivePeerDependencies: @@ -25993,11 +25336,11 @@ snapshots: dependencies: lru-cache: 6.0.0 - semver@7.7.3: {} + semver@7.7.4: {} send@1.2.1: dependencies: - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 encodeurl: 2.0.0 escape-html: 1.0.3 etag: 1.8.1 @@ -26011,10 +25354,6 @@ snapshots: transitivePeerDependencies: - supports-color - serialize-javascript@6.0.2: - dependencies: - randombytes: 2.1.0 - serve-static@2.2.1: dependencies: encodeurl: 2.0.0 @@ -26040,12 +25379,6 @@ snapshots: functions-have-names: 1.2.3 has-property-descriptors: 1.0.2 - set-proto@1.0.0: - dependencies: - dunder-proto: 1.0.1 - es-errors: 1.3.0 - es-object-atoms: 1.1.1 - setimmediate@1.0.5: {} setprototypeof@1.1.0: {} @@ -26056,21 +25389,15 @@ snapshots: dependencies: tslib: 2.8.1 - sha.js@2.4.12: - dependencies: - inherits: 2.0.4 - safe-buffer: 5.2.1 - to-buffer: 1.2.2 - shallow-clone@3.0.1: dependencies: kind-of: 6.0.3 sharp@0.34.5: dependencies: - '@img/colour': 1.0.0 + '@img/colour': 1.1.0 detect-libc: 2.1.2 - semver: 7.7.3 + semver: 7.7.4 optionalDependencies: '@img/sharp-darwin-arm64': 0.34.5 '@img/sharp-darwin-x64': 0.34.5 @@ -26105,14 +25432,25 @@ snapshots: shell-quote@1.8.3: {} - shiki@3.21.0: + shiki@3.23.0: + dependencies: + '@shikijs/core': 3.23.0 + '@shikijs/engine-javascript': 3.23.0 + '@shikijs/engine-oniguruma': 3.23.0 + '@shikijs/langs': 3.23.0 + '@shikijs/themes': 3.23.0 + '@shikijs/types': 3.23.0 + '@shikijs/vscode-textmate': 10.0.2 + '@types/hast': 3.0.4 + + shiki@4.0.2: dependencies: - '@shikijs/core': 3.21.0 - '@shikijs/engine-javascript': 3.21.0 - '@shikijs/engine-oniguruma': 3.21.0 - '@shikijs/langs': 3.21.0 - '@shikijs/themes': 3.21.0 - '@shikijs/types': 3.21.0 + '@shikijs/core': 4.0.2 + '@shikijs/engine-javascript': 4.0.2 + '@shikijs/engine-oniguruma': 4.0.2 + '@shikijs/langs': 4.0.2 + '@shikijs/themes': 4.0.2 + '@shikijs/types': 4.0.2 '@shikijs/vscode-textmate': 10.0.2 '@types/hast': 3.0.4 @@ -26184,6 +25522,14 @@ snapshots: simple-concat: 1.0.1 optional: true + simple-git@3.33.0: + dependencies: + '@kwsites/file-exists': 1.1.1 + '@kwsites/promise-deferred': 1.1.1 + debug: 4.4.3 + transitivePeerDependencies: + - supports-color + sirv@3.0.2: dependencies: '@polka/url': 1.0.0-next.29 @@ -26192,12 +25538,12 @@ snapshots: sisteransi@1.0.5: {} - sitemap@8.0.2: + sitemap@9.0.1: dependencies: - '@types/node': 17.0.45 + '@types/node': 24.12.0 '@types/sax': 1.2.7 arg: 5.0.2 - sax: 1.4.4 + sax: 1.5.0 slash@3.0.0: {} @@ -26224,7 +25570,7 @@ snapshots: socks-proxy-agent@8.0.5: dependencies: agent-base: 7.1.4 - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 socks: 2.8.7 transitivePeerDependencies: - supports-color @@ -26245,8 +25591,6 @@ snapshots: buffer-from: 1.1.2 source-map: 0.6.1 - source-map@0.5.7: {} - source-map@0.6.1: {} source-map@0.7.6: {} @@ -26260,16 +25604,21 @@ snapshots: spdx-correct@3.2.0: dependencies: spdx-expression-parse: 3.0.1 - spdx-license-ids: 3.0.22 + spdx-license-ids: 3.0.23 spdx-exceptions@2.5.0: {} spdx-expression-parse@3.0.1: dependencies: spdx-exceptions: 2.5.0 - spdx-license-ids: 3.0.22 + spdx-license-ids: 3.0.23 - spdx-license-ids@3.0.22: {} + spdx-expression-parse@4.0.0: + dependencies: + spdx-exceptions: 2.5.0 + spdx-license-ids: 3.0.23 + + spdx-license-ids@3.0.23: {} split2@4.2.0: {} @@ -26277,15 +25626,15 @@ snapshots: ssri@10.0.5: dependencies: - minipass: 7.1.2 + minipass: 7.1.3 ssri@12.0.0: dependencies: - minipass: 7.1.2 + minipass: 7.1.3 - ssri@13.0.0: + ssri@13.0.1: dependencies: - minipass: 7.1.2 + minipass: 7.1.3 stack-utils@2.0.6: dependencies: @@ -26304,29 +25653,33 @@ snapshots: std-env@3.10.0: {} + std-env@4.0.0: {} + stdin-discarder@0.2.2: {} + stdin-discarder@0.3.1: {} + stop-iteration-iterator@1.1.0: dependencies: es-errors: 1.3.0 internal-slot: 1.1.0 - storybook@10.1.11(@testing-library/dom@10.4.1)(prettier@3.8.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3): + storybook@10.3.3(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4): dependencies: '@storybook/global': 5.0.0 - '@storybook/icons': 2.0.1(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + '@storybook/icons': 2.0.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4) '@testing-library/jest-dom': 6.9.1 '@testing-library/user-event': 14.6.1(@testing-library/dom@10.4.1) '@vitest/expect': 3.2.4 '@vitest/spy': 3.2.4 - esbuild: 0.27.2 + esbuild: 0.27.4 open: 10.2.0 recast: 0.23.11 - semver: 7.7.3 - use-sync-external-store: 1.6.0(react@19.2.3) + semver: 7.7.4 + use-sync-external-store: 1.6.0(react@19.2.4) ws: 8.19.0 optionalDependencies: - prettier: 3.8.0 + prettier: 3.8.1 transitivePeerDependencies: - '@testing-library/dom' - bufferutil @@ -26334,18 +25687,6 @@ snapshots: - react-dom - utf-8-validate - stream-browserify@3.0.0: - dependencies: - inherits: 2.0.4 - readable-stream: 3.6.2 - - stream-http@3.2.0: - dependencies: - builtin-status-codes: 3.0.0 - inherits: 2.0.4 - readable-stream: 3.6.2 - xtend: 4.0.2 - stream-replace-string@2.0.0: {} stream-shift@1.0.3: {} @@ -26356,7 +25697,7 @@ snapshots: dependencies: events-universal: 1.0.1 fast-fifo: 1.3.2 - text-decoder: 1.2.3 + text-decoder: 1.2.7 transitivePeerDependencies: - bare-abort-controller - react-native-b4a @@ -26378,41 +25719,18 @@ snapshots: dependencies: eastasianwidth: 0.2.0 emoji-regex: 9.2.2 - strip-ansi: 7.1.2 + strip-ansi: 7.2.0 string-width@7.2.0: dependencies: emoji-regex: 10.6.0 - get-east-asian-width: 1.4.0 - strip-ansi: 7.1.2 + get-east-asian-width: 1.5.0 + strip-ansi: 7.2.0 - string-width@8.1.0: + string-width@8.2.0: dependencies: - get-east-asian-width: 1.4.0 - strip-ansi: 7.1.2 - - string.prototype.trim@1.2.10: - dependencies: - call-bind: 1.0.8 - call-bound: 1.0.4 - define-data-property: 1.1.4 - define-properties: 1.2.1 - es-abstract: 1.24.1 - es-object-atoms: 1.1.1 - has-property-descriptors: 1.0.2 - - string.prototype.trimend@1.0.9: - dependencies: - call-bind: 1.0.8 - call-bound: 1.0.4 - define-properties: 1.2.1 - es-object-atoms: 1.1.1 - - string.prototype.trimstart@1.0.8: - dependencies: - call-bind: 1.0.8 - define-properties: 1.2.1 - es-object-atoms: 1.1.1 + get-east-asian-width: 1.5.0 + strip-ansi: 7.2.0 string_decoder@1.1.1: dependencies: @@ -26431,7 +25749,7 @@ snapshots: dependencies: ansi-regex: 5.0.1 - strip-ansi@7.1.2: + strip-ansi@7.2.0: dependencies: ansi-regex: 6.2.2 @@ -26460,7 +25778,7 @@ snapshots: strip-json-comments@5.0.3: {} - strnum@2.1.2: {} + strnum@2.2.0: {} structured-source@4.0.0: dependencies: @@ -26474,8 +25792,6 @@ snapshots: dependencies: inline-style-parser: 0.2.7 - stylis@4.2.0: {} - stylis@4.3.6: {} suf-log@2.5.3: @@ -26501,53 +25817,31 @@ snapshots: supports-preserve-symlinks-flag@1.0.0: {} - svgo@4.0.0: + svgo@4.0.1: dependencies: commander: 11.1.0 css-select: 5.2.2 - css-tree: 3.1.0 + css-tree: 3.2.1 css-what: 6.2.2 csso: 5.0.5 picocolors: 1.1.1 - sax: 1.4.4 + sax: 1.5.0 - swagger-ui-dist@5.31.0: + swagger-ui-dist@5.32.0: dependencies: '@scarf/scarf': 1.4.0 swagger-ui-express@5.0.1(express@5.2.1): dependencies: express: 5.2.1 - swagger-ui-dist: 5.31.0 + swagger-ui-dist: 5.32.0 symbol-tree@3.2.4: {} symlink-dir@6.0.5: dependencies: better-path-resolve: 1.0.0 - rename-overwrite: 6.0.3 - - syncpack@13.0.4(typescript@5.9.3): - dependencies: - chalk: 5.6.2 - chalk-template: 1.1.2 - commander: 13.1.0 - cosmiconfig: 9.0.0(typescript@5.9.3) - effect: 3.19.14 - enquirer: 2.4.1 - fast-check: 3.23.2 - globby: 14.1.0 - jsonc-parser: 3.3.1 - minimatch: 9.0.5 - npm-package-arg: 12.0.2 - ora: 8.2.0 - prompts: 2.4.2 - read-yaml-file: 2.1.0 - semver: 7.7.3 - tightrope: 0.2.0 - ts-toolbelt: 9.6.0 - transitivePeerDependencies: - - typescript + rename-overwrite: 6.0.6 table-layout@1.0.2: dependencies: @@ -26558,7 +25852,7 @@ snapshots: table@6.9.0: dependencies: - ajv: 8.17.1 + ajv: 8.18.0 lodash.truncate: 4.4.2 slice-ansi: 4.0.0 string-width: 4.2.3 @@ -26575,16 +25869,16 @@ snapshots: dependencies: chownr: 1.1.4 mkdirp-classic: 0.5.3 - pump: 3.0.3 + pump: 3.0.4 tar-stream: 2.2.0 optional: true - tar-fs@3.1.1: + tar-fs@3.1.2: dependencies: - pump: 3.0.3 - tar-stream: 3.1.7 + pump: 3.0.4 + tar-stream: 3.1.8 optionalDependencies: - bare-fs: 4.5.2 + bare-fs: 4.5.5 bare-path: 3.0.0 transitivePeerDependencies: - bare-abort-controller @@ -26599,29 +25893,22 @@ snapshots: inherits: 2.0.4 readable-stream: 3.6.2 - tar-stream@3.1.7: + tar-stream@3.1.8: dependencies: - b4a: 1.7.3 + b4a: 1.8.0 + bare-fs: 4.5.5 fast-fifo: 1.3.2 streamx: 2.23.0 transitivePeerDependencies: - bare-abort-controller + - bare-buffer - react-native-b4a - tar@6.2.1: - dependencies: - chownr: 2.0.0 - fs-minipass: 2.1.0 - minipass: 5.0.0 - minizlib: 2.1.2 - mkdirp: 1.0.4 - yallist: 4.0.0 - - tar@7.5.4: + tar@7.5.11: dependencies: '@isaacs/fs-minipass': 4.0.1 chownr: 3.0.0 - minipass: 7.1.2 + minipass: 7.1.3 minizlib: 3.1.0 yallist: 5.0.0 @@ -26630,17 +25917,24 @@ snapshots: qunit: 2.25.0 readline-sync: 1.4.9 + teex@1.0.1: + dependencies: + streamx: 2.23.0 + transitivePeerDependencies: + - bare-abort-controller + - react-native-b4a + temp-dir@2.0.0: {} temp@0.8.4: dependencies: rimraf: 2.6.3 - temporal-polyfill@0.3.0: + temporal-polyfill@0.3.2: dependencies: - temporal-spec: 0.3.0 + temporal-spec: 0.3.1 - temporal-spec@0.3.0: {} + temporal-spec@0.3.1: {} tempy@1.0.1: dependencies: @@ -26652,18 +25946,18 @@ snapshots: terminal-link@4.0.0: dependencies: - ansi-escapes: 7.2.0 + ansi-escapes: 7.3.0 supports-hyperlinks: 3.2.0 - test-exclude@7.0.1: + test-exclude@8.0.0: dependencies: '@istanbuljs/schema': 0.1.3 - glob: 10.5.0 - minimatch: 9.0.5 + glob: 13.0.6 + minimatch: 10.2.4 - text-decoder@1.2.3: + text-decoder@1.2.7: dependencies: - b4a: 1.7.3 + b4a: 1.8.0 transitivePeerDependencies: - react-native-b4a @@ -26678,12 +25972,6 @@ snapshots: readable-stream: 2.3.8 xtend: 4.0.2 - tightrope@0.2.0: {} - - timers-browserify@2.0.12: - dependencies: - setimmediate: 1.0.5 - tiny-glob@0.2.9: dependencies: globalyzer: 0.1.0 @@ -26695,7 +25983,9 @@ snapshots: tinybench@2.9.0: {} - tinyexec@1.0.2: {} + tinyclip@0.1.12: {} + + tinyexec@1.0.4: {} tinyglobby@0.2.15: dependencies: @@ -26706,7 +25996,7 @@ snapshots: tinyrainbow@2.0.0: {} - tinyrainbow@3.0.3: {} + tinyrainbow@3.1.0: {} tinyspy@4.0.4: {} @@ -26718,12 +26008,6 @@ snapshots: tmp@0.2.5: {} - to-buffer@1.2.2: - dependencies: - isarray: 2.0.5 - safe-buffer: 5.2.1 - typed-array-buffer: 1.0.3 - to-regex-range@5.0.1: dependencies: is-number: 7.0.0 @@ -26750,32 +26034,32 @@ snapshots: tree-sitter-c-sharp@0.23.1: dependencies: - node-addon-api: 8.5.0 + node-addon-api: 8.6.0 node-gyp-build: 4.8.4 tree-sitter-java@0.23.5: dependencies: - node-addon-api: 8.5.0 + node-addon-api: 8.6.0 node-gyp-build: 4.8.4 tree-sitter-javascript@0.23.1: dependencies: - node-addon-api: 8.5.0 + node-addon-api: 8.6.0 node-gyp-build: 4.8.4 tree-sitter-javascript@0.25.0: dependencies: - node-addon-api: 8.5.0 + node-addon-api: 8.6.0 node-gyp-build: 4.8.4 tree-sitter-python@0.25.0: dependencies: - node-addon-api: 8.5.0 + node-addon-api: 8.6.0 node-gyp-build: 4.8.4 tree-sitter-typescript@0.23.2: dependencies: - node-addon-api: 8.5.0 + node-addon-api: 8.6.0 node-gyp-build: 4.8.4 tree-sitter-javascript: 0.23.1 @@ -26795,19 +26079,10 @@ snapshots: ts-dedent@2.2.0: {} - ts-toolbelt@9.6.0: {} - tsconfck@3.1.6(typescript@5.9.3): optionalDependencies: typescript: 5.9.3 - tsconfig-paths@3.15.0: - dependencies: - '@types/json5': 0.0.29 - json5: 1.0.2 - minimist: 1.2.8 - strip-bom: 3.0.0 - tsconfig-paths@4.2.0: dependencies: json5: 2.2.3 @@ -26820,17 +26095,15 @@ snapshots: tsx@4.21.0: dependencies: - esbuild: 0.27.2 - get-tsconfig: 4.13.0 + esbuild: 0.27.4 + get-tsconfig: 4.13.6 optionalDependencies: fsevents: 2.3.3 - tty-browserify@0.0.1: {} - tuf-js@3.1.0: dependencies: '@tufjs/models': 3.0.1 - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 make-fetch-happen: 14.0.3 transitivePeerDependencies: - supports-color @@ -26838,8 +26111,8 @@ snapshots: tuf-js@4.1.0: dependencies: '@tufjs/models': 4.1.0 - debug: 4.4.3(supports-color@8.1.1) - make-fetch-happen: 15.0.3 + debug: 4.4.3 + make-fetch-happen: 15.0.4 transitivePeerDependencies: - supports-color @@ -26881,73 +26154,40 @@ snapshots: media-typer: 1.1.0 mime-types: 3.0.2 - typed-array-buffer@1.0.3: - dependencies: - call-bound: 1.0.4 - es-errors: 1.3.0 - is-typed-array: 1.1.15 - - typed-array-byte-length@1.0.3: - dependencies: - call-bind: 1.0.8 - for-each: 0.3.5 - gopd: 1.2.0 - has-proto: 1.2.0 - is-typed-array: 1.1.15 - - typed-array-byte-offset@1.0.4: - dependencies: - available-typed-arrays: 1.0.7 - call-bind: 1.0.8 - for-each: 0.3.5 - gopd: 1.2.0 - has-proto: 1.2.0 - is-typed-array: 1.1.15 - reflect.getprototypeof: 1.0.10 - - typed-array-length@1.0.7: - dependencies: - call-bind: 1.0.8 - for-each: 0.3.5 - gopd: 1.2.0 - is-typed-array: 1.1.15 - possible-typed-array-names: 1.1.0 - reflect.getprototypeof: 1.0.10 - typed-rest-client@1.8.11: dependencies: - qs: 6.14.1 + qs: 6.15.0 tunnel: 0.0.6 - underscore: 1.13.7 + underscore: 1.13.8 typedarray@0.0.6: {} - typedoc-plugin-markdown@4.9.0(typedoc@0.28.16(typescript@5.9.3)): + typedoc-plugin-markdown@4.10.0(typedoc@0.28.17(typescript@5.9.3)): dependencies: - typedoc: 0.28.16(typescript@5.9.3) + typedoc: 0.28.17(typescript@5.9.3) - typedoc@0.28.16(typescript@5.9.3): + typedoc@0.28.17(typescript@5.9.3): dependencies: - '@gerrit0/mini-shiki': 3.21.0 + '@gerrit0/mini-shiki': 3.23.0 lunr: 2.3.9 - markdown-it: 14.1.0 - minimatch: 9.0.5 + markdown-it: 14.1.1 + minimatch: 9.0.9 typescript: 5.9.3 - yaml: 2.8.2 + yaml: 2.8.3 typesafe-path@0.2.2: {} typescript-auto-import-cache@0.3.6: dependencies: - semver: 7.7.3 + semver: 7.7.4 - typescript-eslint@8.53.1(eslint@9.39.2)(typescript@5.9.3): + typescript-eslint@8.57.0(eslint@10.0.3)(typescript@5.9.3): dependencies: - '@typescript-eslint/eslint-plugin': 8.53.1(@typescript-eslint/parser@8.53.1(eslint@9.39.2)(typescript@5.9.3))(eslint@9.39.2)(typescript@5.9.3) - '@typescript-eslint/parser': 8.53.1(eslint@9.39.2)(typescript@5.9.3) - '@typescript-eslint/typescript-estree': 8.53.1(typescript@5.9.3) - '@typescript-eslint/utils': 8.53.1(eslint@9.39.2)(typescript@5.9.3) - eslint: 9.39.2 + '@typescript-eslint/eslint-plugin': 8.57.0(@typescript-eslint/parser@8.57.0(eslint@10.0.3)(typescript@5.9.3))(eslint@10.0.3)(typescript@5.9.3) + '@typescript-eslint/parser': 8.57.0(eslint@10.0.3)(typescript@5.9.3) + '@typescript-eslint/typescript-estree': 8.57.0(typescript@5.9.3) + '@typescript-eslint/utils': 8.57.0(eslint@10.0.3)(typescript@5.9.3) + eslint: 10.0.3 typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -26970,22 +26210,17 @@ snapshots: umask@1.1.0: {} - unbox-primitive@1.1.0: - dependencies: - call-bound: 1.0.4 - has-bigints: 1.1.0 - has-symbols: 1.1.0 - which-boxed-primitive: 1.1.1 - uncrypto@0.1.3: {} - underscore@1.13.7: {} + underscore@1.13.8: {} undici-types@5.26.5: {} undici-types@7.16.0: {} - undici@7.18.2: {} + undici-types@7.18.2: {} + + undici@7.24.3: {} unicorn-magic@0.1.0: {} @@ -27003,9 +26238,9 @@ snapshots: trough: 2.2.0 vfile: 6.0.3 - unifont@0.7.3: + unifont@0.7.4: dependencies: - css-tree: 3.1.0 + css-tree: 3.2.1 ofetch: 1.5.1 ohash: 2.0.11 @@ -27056,7 +26291,7 @@ snapshots: unist-util-remove-position@5.0.0: dependencies: '@types/unist': 3.0.3 - unist-util-visit: 5.0.0 + unist-util-visit: 5.1.0 unist-util-stringify-position@4.0.0: dependencies: @@ -27079,7 +26314,7 @@ snapshots: dependencies: unist-util-visit-parents: 2.1.2 - unist-util-visit@5.0.0: + unist-util-visit@5.1.0: dependencies: '@types/unist': 3.0.3 unist-util-is: 6.0.1 @@ -27096,23 +26331,23 @@ snapshots: unplugin@2.3.11: dependencies: '@jridgewell/remapping': 2.3.5 - acorn: 8.15.0 + acorn: 8.16.0 picomatch: 4.0.3 webpack-virtual-modules: 0.6.2 - unstorage@1.17.4(@azure/identity@4.13.0)(@azure/storage-blob@12.30.0): + unstorage@1.17.4(@azure/identity@4.13.0)(@azure/storage-blob@12.31.0): dependencies: anymatch: 3.1.3 chokidar: 5.0.0 destr: 2.0.5 - h3: 1.15.5 - lru-cache: 11.2.4 + h3: 1.15.6 + lru-cache: 11.2.7 node-fetch-native: 1.6.7 ofetch: 1.5.1 ufo: 1.6.3 optionalDependencies: '@azure/identity': 4.13.0 - '@azure/storage-blob': 12.30.0 + '@azure/storage-blob': 12.31.0 update-browserslist-db@1.2.3(browserslist@4.28.1): dependencies: @@ -27130,27 +26365,14 @@ snapshots: url-join@4.0.1: {} - url@0.11.4: + use-sync-external-store@1.6.0(react@19.2.4): dependencies: - punycode: 1.4.1 - qs: 6.14.1 - - use-sync-external-store@1.6.0(react@19.2.3): - dependencies: - react: 19.2.3 + react: 19.2.4 utf8-byte-length@1.0.5: {} util-deprecate@1.0.2: {} - util@0.12.5: - dependencies: - inherits: 2.0.4 - is-arguments: 1.2.0 - is-generator-function: 1.1.2 - is-typed-array: 1.1.15 - which-typed-array: 1.1.20 - uuid@11.1.0: {} uuid@8.3.2: {} @@ -27174,8 +26396,6 @@ snapshots: dependencies: builtins: 5.1.0 - validate-npm-package-name@6.0.2: {} - validate-npm-package-name@7.0.2: {} vary@1.1.2: {} @@ -27184,7 +26404,7 @@ snapshots: version-selector-type@3.0.0: dependencies: - semver: 7.7.3 + semver: 7.7.4 vfile-location@5.0.3: dependencies: @@ -27201,187 +26421,247 @@ snapshots: '@types/unist': 3.0.3 vfile-message: 4.0.3 - vite-plugin-checker@0.12.0(eslint@9.39.2)(optionator@0.9.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)): + vite-plugin-checker@0.12.0(eslint@10.0.3)(optionator@0.9.4)(typescript@5.9.3)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)): + dependencies: + '@babel/code-frame': 7.29.0 + chokidar: 4.0.3 + npm-run-path: 6.0.0 + picocolors: 1.1.1 + picomatch: 4.0.3 + tiny-invariant: 1.3.3 + tinyglobby: 0.2.15 + vite: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2) + vscode-uri: 3.1.0 + optionalDependencies: + eslint: 10.0.3 + optionator: 0.9.4 + typescript: 5.9.3 + + vite-plugin-checker@0.12.0(eslint@10.0.3)(optionator@0.9.4)(typescript@5.9.3)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)): dependencies: - '@babel/code-frame': 7.28.6 + '@babel/code-frame': 7.29.0 chokidar: 4.0.3 npm-run-path: 6.0.0 picocolors: 1.1.1 picomatch: 4.0.3 tiny-invariant: 1.3.3 tinyglobby: 0.2.15 - vite: 7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + vite: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3) vscode-uri: 3.1.0 optionalDependencies: - eslint: 9.39.2 + eslint: 10.0.3 optionator: 0.9.4 typescript: 5.9.3 - vite-plugin-dts@4.5.4(@types/node@25.0.9)(rollup@4.49.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)): + vite-plugin-dts@4.5.4(@types/node@25.5.0)(rollup@4.60.0)(typescript@5.9.3)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)): dependencies: - '@microsoft/api-extractor': 7.55.2(@types/node@25.0.9) - '@rollup/pluginutils': 5.3.0(rollup@4.49.0) - '@volar/typescript': 2.4.27 + '@microsoft/api-extractor': 7.57.7(@types/node@25.5.0) + '@rollup/pluginutils': 5.3.0(rollup@4.60.0) + '@volar/typescript': 2.4.28 '@vue/language-core': 2.2.0(typescript@5.9.3) compare-versions: 6.1.1 - debug: 4.4.3(supports-color@8.1.1) + debug: 4.4.3 kolorist: 1.8.0 local-pkg: 1.1.2 magic-string: 0.30.21 typescript: 5.9.3 optionalDependencies: - vite: 7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + vite: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2) transitivePeerDependencies: - '@types/node' - rollup - supports-color - vite-plugin-node-polyfills@0.25.0(rollup@4.49.0)(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)): + vite-plugin-dts@4.5.4(@types/node@25.5.0)(rollup@4.60.0)(typescript@5.9.3)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)): dependencies: - '@rollup/plugin-inject': 5.0.5(rollup@4.49.0) - node-stdlib-browser: 1.3.1 - vite: 7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + '@microsoft/api-extractor': 7.57.7(@types/node@25.5.0) + '@rollup/pluginutils': 5.3.0(rollup@4.60.0) + '@volar/typescript': 2.4.28 + '@vue/language-core': 2.2.0(typescript@5.9.3) + compare-versions: 6.1.1 + debug: 4.4.3 + kolorist: 1.8.0 + local-pkg: 1.1.2 + magic-string: 0.30.21 + typescript: 5.9.3 + optionalDependencies: + vite: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3) transitivePeerDependencies: + - '@types/node' - rollup + - supports-color - vite@6.4.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2): + vite@7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3): dependencies: - esbuild: 0.25.12 + esbuild: 0.27.4 fdir: 6.5.0(picomatch@4.0.3) picomatch: 4.0.3 - postcss: 8.5.6 - rollup: 4.49.0 + postcss: 8.5.8 + rollup: 4.60.0 tinyglobby: 0.2.15 optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 fsevents: 2.3.3 + lightningcss: 1.32.0 tsx: 4.21.0 - yaml: 2.8.2 + yaml: 2.8.3 - vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2): + vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2): dependencies: - esbuild: 0.27.2 - fdir: 6.5.0(picomatch@4.0.3) + lightningcss: 1.32.0 picomatch: 4.0.3 - postcss: 8.5.6 - rollup: 4.49.0 + postcss: 8.5.8 + rolldown: 1.0.0-rc.10 tinyglobby: 0.2.15 optionalDependencies: - '@types/node': 25.0.9 + '@types/node': 25.5.0 + esbuild: 0.27.4 fsevents: 2.3.3 tsx: 4.21.0 yaml: 2.8.2 - vitefu@1.1.1(vite@6.4.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)): + vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3): + dependencies: + lightningcss: 1.32.0 + picomatch: 4.0.3 + postcss: 8.5.8 + rolldown: 1.0.0-rc.10 + tinyglobby: 0.2.15 + optionalDependencies: + '@types/node': 25.5.0 + esbuild: 0.27.4 + fsevents: 2.3.3 + tsx: 4.21.0 + yaml: 2.8.3 + + vitefu@1.1.2(vite@7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3)): optionalDependencies: - vite: 6.4.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) - - vitest@4.0.17(@types/node@25.0.9)(@vitest/ui@4.0.17)(happy-dom@20.3.4)(jsdom@25.0.1)(tsx@4.21.0)(yaml@2.8.2): - dependencies: - '@vitest/expect': 4.0.17 - '@vitest/mocker': 4.0.17(vite@7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2)) - '@vitest/pretty-format': 4.0.17 - '@vitest/runner': 4.0.17 - '@vitest/snapshot': 4.0.17 - '@vitest/spy': 4.0.17 - '@vitest/utils': 4.0.17 - es-module-lexer: 1.7.0 + vite: 7.3.1(@types/node@25.5.0)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3) + + vitest@4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)): + dependencies: + '@vitest/expect': 4.1.0 + '@vitest/mocker': 4.1.0(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2)) + '@vitest/pretty-format': 4.1.0 + '@vitest/runner': 4.1.0 + '@vitest/snapshot': 4.1.0 + '@vitest/spy': 4.1.0 + '@vitest/utils': 4.1.0 + es-module-lexer: 2.0.0 expect-type: 1.3.0 magic-string: 0.30.21 obug: 2.1.1 pathe: 2.0.3 picomatch: 4.0.3 - std-env: 3.10.0 + std-env: 4.0.0 tinybench: 2.9.0 - tinyexec: 1.0.2 + tinyexec: 1.0.4 tinyglobby: 0.2.15 - tinyrainbow: 3.0.3 - vite: 7.3.1(@types/node@25.0.9)(tsx@4.21.0)(yaml@2.8.2) + tinyrainbow: 3.1.0 + vite: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.2) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 25.0.9 - '@vitest/ui': 4.0.17(vitest@4.0.17) - happy-dom: 20.3.4 + '@types/node': 25.5.0 + '@vitest/ui': 4.1.0(vitest@4.1.0) + happy-dom: 20.8.9 jsdom: 25.0.1 transitivePeerDependencies: - - jiti - - less - - lightningcss - msw - - sass - - sass-embedded - - stylus - - sugarss - - terser - - tsx - - yaml - vm-browserify@1.1.2: {} + vitest@4.1.0(@types/node@25.5.0)(@vitest/ui@4.1.0)(happy-dom@20.8.9)(jsdom@25.0.1)(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)): + dependencies: + '@vitest/expect': 4.1.0 + '@vitest/mocker': 4.1.0(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3)) + '@vitest/pretty-format': 4.1.0 + '@vitest/runner': 4.1.0 + '@vitest/snapshot': 4.1.0 + '@vitest/spy': 4.1.0 + '@vitest/utils': 4.1.0 + es-module-lexer: 2.0.0 + expect-type: 1.3.0 + magic-string: 0.30.21 + obug: 2.1.1 + pathe: 2.0.3 + picomatch: 4.0.3 + std-env: 4.0.0 + tinybench: 2.9.0 + tinyexec: 1.0.4 + tinyglobby: 0.2.15 + tinyrainbow: 3.1.0 + vite: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(tsx@4.21.0)(yaml@2.8.3) + why-is-node-running: 2.3.0 + optionalDependencies: + '@types/node': 25.5.0 + '@vitest/ui': 4.1.0(vitest@4.1.0) + happy-dom: 20.8.9 + jsdom: 25.0.1 + transitivePeerDependencies: + - msw - volar-service-css@0.0.68(@volar/language-service@2.4.27): + volar-service-css@0.0.68(@volar/language-service@2.4.28): dependencies: - vscode-css-languageservice: 6.3.9 + vscode-css-languageservice: 6.3.10 vscode-languageserver-textdocument: 1.0.12 vscode-uri: 3.1.0 optionalDependencies: - '@volar/language-service': 2.4.27 + '@volar/language-service': 2.4.28 - volar-service-emmet@0.0.68(@volar/language-service@2.4.27): + volar-service-emmet@0.0.68(@volar/language-service@2.4.28): dependencies: '@emmetio/css-parser': 0.4.1 '@emmetio/html-matcher': 1.3.0 '@vscode/emmet-helper': 2.11.0 vscode-uri: 3.1.0 optionalDependencies: - '@volar/language-service': 2.4.27 + '@volar/language-service': 2.4.28 - volar-service-html@0.0.68(@volar/language-service@2.4.27): + volar-service-html@0.0.68(@volar/language-service@2.4.28): dependencies: - vscode-html-languageservice: 5.6.1 + vscode-html-languageservice: 5.6.2 vscode-languageserver-textdocument: 1.0.12 vscode-uri: 3.1.0 optionalDependencies: - '@volar/language-service': 2.4.27 + '@volar/language-service': 2.4.28 - volar-service-prettier@0.0.68(@volar/language-service@2.4.27)(prettier@3.8.0): + volar-service-prettier@0.0.68(@volar/language-service@2.4.28)(prettier@3.8.1): dependencies: vscode-uri: 3.1.0 optionalDependencies: - '@volar/language-service': 2.4.27 - prettier: 3.8.0 + '@volar/language-service': 2.4.28 + prettier: 3.8.1 - volar-service-typescript-twoslash-queries@0.0.68(@volar/language-service@2.4.27): + volar-service-typescript-twoslash-queries@0.0.68(@volar/language-service@2.4.28): dependencies: vscode-uri: 3.1.0 optionalDependencies: - '@volar/language-service': 2.4.27 + '@volar/language-service': 2.4.28 - volar-service-typescript@0.0.68(@volar/language-service@2.4.27): + volar-service-typescript@0.0.68(@volar/language-service@2.4.28): dependencies: path-browserify: 1.0.1 - semver: 7.7.3 + semver: 7.7.4 typescript-auto-import-cache: 0.3.6 vscode-languageserver-textdocument: 1.0.12 vscode-nls: 5.2.0 vscode-uri: 3.1.0 optionalDependencies: - '@volar/language-service': 2.4.27 + '@volar/language-service': 2.4.28 - volar-service-yaml@0.0.68(@volar/language-service@2.4.27): + volar-service-yaml@0.0.68(@volar/language-service@2.4.28): dependencies: vscode-uri: 3.1.0 yaml-language-server: 1.19.2 optionalDependencies: - '@volar/language-service': 2.4.27 + '@volar/language-service': 2.4.28 - vscode-css-languageservice@6.3.9: + vscode-css-languageservice@6.3.10: dependencies: '@vscode/l10n': 0.0.18 vscode-languageserver-textdocument: 1.0.12 vscode-languageserver-types: 3.17.5 vscode-uri: 3.1.0 - vscode-html-languageservice@5.6.1: + vscode-html-languageservice@5.6.2: dependencies: '@vscode/l10n': 0.0.18 vscode-languageserver-textdocument: 1.0.12 @@ -27400,8 +26680,8 @@ snapshots: vscode-languageclient@9.0.1: dependencies: - minimatch: 5.1.6 - semver: 7.7.3 + minimatch: 5.1.9 + semver: 7.7.4 vscode-languageserver-protocol: 3.17.5 vscode-languageserver-protocol@3.17.5: @@ -27421,9 +26701,7 @@ snapshots: vscode-oniguruma@2.0.1: {} - vscode-textmate@9.3.1: {} - - vscode-uri@3.0.8: {} + vscode-textmate@9.3.2: {} vscode-uri@3.1.0: {} @@ -27437,7 +26715,7 @@ snapshots: web-namespaces@2.0.1: {} - web-tree-sitter@0.26.3: {} + web-tree-sitter@0.26.7: {} webidl-conversions@7.0.0: {} @@ -27464,22 +26742,6 @@ snapshots: is-string: 1.1.1 is-symbol: 1.1.1 - which-builtin-type@1.2.1: - dependencies: - call-bound: 1.0.4 - function.prototype.name: 1.1.8 - has-tostringtag: 1.0.2 - is-async-function: 2.1.1 - is-date-object: 1.1.0 - is-finalizationregistry: 1.1.1 - is-generator-function: 1.1.2 - is-regex: 1.2.1 - is-weakref: 1.1.1 - isarray: 2.0.5 - which-boxed-primitive: 1.1.1 - which-collection: 1.0.2 - which-typed-array: 1.1.20 - which-collection@1.0.2: dependencies: is-map: 2.0.3 @@ -27510,15 +26772,15 @@ snapshots: which@4.0.0: dependencies: - isexe: 3.1.1 + isexe: 3.1.5 which@5.0.0: dependencies: - isexe: 3.1.1 + isexe: 3.1.5 - which@6.0.0: + which@6.0.1: dependencies: - isexe: 3.1.1 + isexe: 4.0.0 why-is-node-running@2.3.0: dependencies: @@ -27529,10 +26791,6 @@ snapshots: dependencies: string-width: 4.2.3 - widest-line@5.0.0: - dependencies: - string-width: 7.2.0 - word-wrap@1.2.5: {} wordwrapjs@4.0.1: @@ -27540,8 +26798,6 @@ snapshots: reduce-flatten: 2.0.0 typical: 5.2.0 - workerpool@9.3.4: {} - wrap-ansi@6.2.0: dependencies: ansi-styles: 4.3.0 @@ -27558,13 +26814,13 @@ snapshots: dependencies: ansi-styles: 6.2.3 string-width: 5.1.2 - strip-ansi: 7.1.2 + strip-ansi: 7.2.0 wrap-ansi@9.0.2: dependencies: ansi-styles: 6.2.3 string-width: 7.2.0 - strip-ansi: 7.1.2 + strip-ansi: 7.2.0 wrappy@1.0.2: {} @@ -27590,7 +26846,7 @@ snapshots: wsl-utils@0.1.0: dependencies: - is-wsl: 3.1.0 + is-wsl: 3.1.1 xdg-basedir@5.1.0: {} @@ -27598,12 +26854,12 @@ snapshots: xml2js@0.5.0: dependencies: - sax: 1.4.4 + sax: 1.5.0 xmlbuilder: 11.0.1 xml2js@0.6.2: dependencies: - sax: 1.4.4 + sax: 1.5.0 xmlbuilder: 11.0.1 xmlbuilder@11.0.1: {} @@ -27627,35 +26883,26 @@ snapshots: yaml-language-server@1.19.2: dependencies: '@vscode/l10n': 0.0.18 - ajv: 8.17.1 - ajv-draft-04: 1.0.0(ajv@8.17.1) + ajv: 8.18.0 + ajv-draft-04: 1.0.0(ajv@8.18.0) lodash: 4.17.21 - prettier: 3.8.0 + prettier: 3.8.1 request-light: 0.5.8 vscode-json-languageservice: 4.1.8 vscode-languageserver: 9.0.1 vscode-languageserver-textdocument: 1.0.12 vscode-languageserver-types: 3.17.5 vscode-uri: 3.1.0 - yaml: 2.7.1 - - yaml@1.10.2: {} - - yaml@2.7.1: {} + yaml: 2.8.3 yaml@2.8.2: {} + yaml@2.8.3: {} + yargs-parser@21.1.1: {} yargs-parser@22.0.0: {} - yargs-unparser@2.0.0: - dependencies: - camelcase: 6.3.0 - decamelize: 4.0.0 - flat: 5.0.2 - is-plain-obj: 2.1.0 - yargs@17.7.2: dependencies: cliui: 8.0.1 @@ -27688,31 +26935,18 @@ snapshots: yocto-queue@1.2.2: {} - yocto-spinner@0.2.3: - dependencies: - yoctocolors: 2.1.2 - yoctocolors@2.1.2: {} yoga-layout-prebuilt@1.10.0: dependencies: '@types/yoga-layout': 1.9.2 - zod-to-json-schema@3.25.1(zod@3.25.76): - dependencies: - zod: 3.25.76 - - zod-to-ts@1.2.0(typescript@5.9.3)(zod@3.25.76): - dependencies: - typescript: 5.9.3 - zod: 3.25.76 - - zod-validation-error@4.0.2(zod@4.3.5): + zod-validation-error@4.0.2(zod@4.3.6): dependencies: - zod: 4.3.5 + zod: 4.3.6 zod@3.25.76: {} - zod@4.3.5: {} + zod@4.3.6: {} zwitch@2.0.4: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index e161307424c..608008579dc 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,16 +1,202 @@ packages: - - "packages/*" - - "e2e" - - "website" + - packages/* + - e2e + - website - "!packages/http-client-csharp/**" - "!packages/http-client-java/**" - "!packages/http-client-python/**" -overrides: - "cross-spawn@>=7.0.0 <7.0.5": "^7.0.5" - rollup: 4.49.0 # Regression in 4.50.0 https://github.com/rollup/rollup/issues/6099 +catalog: + "@alloy-js/cli": ^0.22.0 + "@alloy-js/core": ^0.22.0 + "@alloy-js/csharp": ^0.22.0 + "@alloy-js/markdown": ^0.22.0 + "@alloy-js/python": ^0.3.0 + "@alloy-js/rollup-plugin": ^0.1.0 + "@alloy-js/typescript": ^0.22.0 + "@astrojs/check": ^0.9.7 + "@astrojs/react": ^5.0.0 + "@astrojs/starlight": ^0.38.1 + "@azure/identity": ~4.13.0 + "@azure/storage-blob": ~12.31.0 + "@babel/code-frame": ~7.29.0 + "@babel/core": ^7.29.0 + "@chronus/chronus": ^1.3.1 + "@chronus/github": ^1.0.6 + "@chronus/github-pr-commenter": ^1.0.6 + "@docsearch/css": ^4.6.0 + "@docsearch/js": ^4.6.0 + "@eslint/js": ^10.0.1 + "@expressive-code/core": ^0.41.7 + "@fluentui/react-components": ~9.73.3 + "@fluentui/react-icons": ^2.0.323 + "@fluentui/react-list": ^9.6.12 + "@inquirer/prompts": ^8.3.0 + "@microsoft/api-extractor": ^7.57.7 + "@microsoft/api-extractor-model": ^7.33.4 + "@microsoft/tsdoc": ^0.16.0 + "@microsoft/tsdoc-config": ^0.18.1 + "@octokit/core": ^7.0.6 + "@octokit/plugin-paginate-graphql": ^6.0.0 + "@octokit/plugin-rest-endpoint-methods": ^17.0.0 + "@playwright/test": ^1.58.2 + "@pnpm/workspace.find-packages": ^1000.0.64 + "@scalar/json-magic": ^0.11.5 + "@scalar/openapi-parser": ^0.24.1 + "@scalar/openapi-types": ^0.5.0 + "@storybook/cli": ^10.3.3 + "@storybook/react-vite": ^10.3.3 + "@testing-library/dom": ^10.4.1 + "@testing-library/jest-dom": ^6.9.1 + "@testing-library/react": ^16.3.2 + "@types/babel__code-frame": ~7.27.0 + "@types/body-parser": ^1.19.6 + "@types/cross-spawn": ~6.0.6 + "@types/debounce": ~1.2.4 + "@types/deep-equal": ^1.0.4 + "@types/express": ^5.0.6 + "@types/micromatch": ^4.0.10 + "@types/morgan": ^1.9.10 + "@types/multer": ^2.1.0 + "@types/mustache": ~4.2.6 + "@types/node": ~25.5.0 + "@types/plist": ~3.0.5 + "@types/react": ~19.2.14 + "@types/react-dom": ~19.2.3 + "@types/remark-heading-id": ^1.0.0 + "@types/semver": ^7.7.1 + "@types/swagger-ui": ~5.32.0 + "@types/swagger-ui-dist": ~3.30.6 + "@types/swagger-ui-express": ^4.1.8 + "@types/which": ^3.0.4 + "@types/xml2js": ^0.4.14 + "@types/yargs": ~17.0.35 + "@typescript-eslint/parser": ^8.57.0 + "@typescript-eslint/rule-tester": ^8.57.0 + "@typescript-eslint/types": ^8.57.0 + "@typescript-eslint/utils": ^8.57.0 + "@typespec/ts-http-runtime": 0.3.4 + "@vitejs/plugin-react": ~6.0.1 + "@vitest/coverage-v8": ^4.1.0 + "@vitest/eslint-plugin": ^1.6.12 + "@vitest/ui": ^4.1.0 + "@vscode/extension-telemetry": ^1.5.1 + "@vscode/test-electron": ^2.5.2 + "@vscode/test-web": ^0.0.80 + "@vscode/vsce": ~3.7.1 + "@yarnpkg/core": ^4.6.0 + "@yarnpkg/fslib": ^3.1.4 + "@yarnpkg/plugin-nm": ^4.0.8 + "@yarnpkg/plugin-npm": ^3.4.0 + "@yarnpkg/plugin-pnp": ^4.1.3 + ajv: ~8.18.0 + ajv-formats: ~3.0.1 + astro: ^6.0.4 + astro-expressive-code: ^0.41.7 + astro-rehype-relative-markdown-links: ^0.18.1 + body-parser: ^2.2.2 + c8: ^11.0.0 + change-case: ~5.4.4 + chokidar: ~5.0.0 + clsx: ^2.1.1 + concurrently: ^9.2.1 + cross-env: ~10.1.0 + cross-spawn: ^7.0.6 + cspell: ^9.7.0 + date-fns: ^4.1.0 + debounce: ~3.0.0 + decimal.js: ^10.6.0 + deep-equal: ^2.2.3 + ecmarkup: ~23.0.2 + env-paths: ^4.0.0 + es-module-shims: ~2.8.0 + esbuild: ^0.27.4 + esbuild-plugins-node-modules-polyfill: ^1.8.1 + eslint: ^10.0.3 + eslint-plugin-react-hooks: 7.0.1 + eslint-plugin-unicorn: ^63.0.0 + execa: ^9.6.1 + express: ^5.2.1 + fs-extra: ^11.3.4 + globby: ~16.1.1 + grammarkdown: ~3.3.2 + happy-dom: ^20.8.9 + inquirer: ^13.3.0 + is-unicode-supported: ^2.1.0 + json5: ^2.2.3 + log-symbols: ^7.0.1 + lzutf8: 0.6.3 + micromatch: ^4.0.8 + monaco-editor: ~0.55.1 + monaco-editor-core: ^0.55.1 + morgan: ^1.10.1 + multer: ^2.1.1 + mustache: ~4.2.0 + onigasm: ~2.2.5 + ora: ^9.3.0 + p-limit: ^7.3.0 + pathe: ^2.0.3 + picocolors: ~1.1.1 + playwright: ^1.58.2 + plist: ~3.1.0 + postject: 1.0.0-alpha.6 + prettier: ~3.8.1 + prettier-plugin-astro: ^0.14.1 + prettier-plugin-organize-imports: ~4.3.0 + prettier-plugin-sh: ^0.18.0 + prism-react-renderer: ^2.4.1 + react: ~19.2.4 + react-dom: ~19.2.4 + react-error-boundary: ^6.1.1 + react-hotkeys-hook: ^5.2.4 + react-markdown: ^10.1.0 + rehype-mermaid: ^3.0.0 + remark-heading-id: ^1.0.1 + rimraf: ~6.1.3 + rollup-plugin-visualizer: 6.0.4 + semver: ^7.7.4 + sharp: ^0.34.5 + simple-git: ^3.33.0 + source-map-support: ~0.5.21 + storybook: ^10.3.3 + strip-json-comments: ~5.0.3 + swagger-ui-dist: ^5.32.0 + swagger-ui-express: ^5.0.1 + tar: ^7.5.11 + temporal-polyfill: ^0.3.2 + tree-sitter-c-sharp: ^0.23.1 + tree-sitter-java: ^0.23.5 + tree-sitter-javascript: ^0.25.0 + tree-sitter-python: ^0.25.0 + tree-sitter-typescript: ^0.23.2 + tsx: ^4.21.0 + typedoc: ^0.28.17 + typedoc-plugin-markdown: ^4.10.0 + typescript: ~5.9.3 + typescript-eslint: ^8.57.0 + uri-template: ^2.0.0 + vite: ^8.0.1 + vite-plugin-checker: ^0.12.0 + vite-plugin-dts: 4.5.4 + vitest: ^4.1.0 + vscode-languageclient: ~9.0.1 + vscode-languageserver: ~9.0.1 + vscode-languageserver-textdocument: ~1.0.12 + vscode-oniguruma: ~2.0.1 + vscode-textmate: ~9.3.2 + web-tree-sitter: ^0.26.7 + which: ^6.0.1 + xml2js: ^0.6.2 + yaml: ~2.8.2 + yargs: ~18.0.0 + +minimumReleaseAge: 2880 -# Minimum age (in minutes) for a new dependency version to be able to be used. -minimumReleaseAge: 2880 # 2 days minimumReleaseAgeExclude: - "@alloy-js/*" + +overrides: + dompurify: ^3.3.3 # Monaco editor pinned to 3.2.7 https://github.com/microsoft/monaco-editor/issues/5248 + cross-spawn@>=7.0.0 <7.0.5: ">=7.0.5" + diff@>=6.0.0 <8.0.3: ">=8.0.3" + yaml@>=2.0.0 <2.8.3: ">=2.8.3" diff --git a/tsconfig.ws.json b/tsconfig.ws.json index 5c6e61144b8..fb10203f549 100644 --- a/tsconfig.ws.json +++ b/tsconfig.ws.json @@ -1,35 +1,35 @@ { "references": [ - { "path": "packages/asset-emitter/tsconfig.json" }, - { "path": "packages/compiler/tsconfig.json" }, - { "path": "packages/versioning/tsconfig.json" }, - { "path": "packages/http/tsconfig.json" }, - { "path": "packages/rest/tsconfig.json" }, - { "path": "packages/library-linter/tsconfig.json" }, - { "path": "packages/eslint-plugin-typespec/tsconfig.json" }, - { "path": "packages/openapi/tsconfig.json" }, - { "path": "packages/sse/tsconfig.json" }, - { "path": "packages/events/tsconfig.json" }, - { "path": "packages/streams/tsconfig.json" }, - { "path": "packages/openapi3/tsconfig.json" }, - { "path": "packages/internal-build-utils/tsconfig.json" }, - { "path": "packages/bundle-uploader/tsconfig.json" }, - { "path": "packages/tmlanguage-generator/tsconfig.json" }, - { "path": "packages/protobuf/tsconfig.json" }, - { "path": "packages/openapi3/tsconfig.json" }, + { "path": "packages/asset-emitter/tsconfig.build.json" }, + { "path": "packages/compiler/tsconfig.build.json" }, + { "path": "packages/versioning/tsconfig.build.json" }, + { "path": "packages/http/tsconfig.build.json" }, + { "path": "packages/rest/tsconfig.build.json" }, + { "path": "packages/library-linter/tsconfig.build.json" }, + { "path": "packages/eslint-plugin-typespec/tsconfig.build.json" }, + { "path": "packages/openapi/tsconfig.build.json" }, + { "path": "packages/sse/tsconfig.build.json" }, + { "path": "packages/events/tsconfig.build.json" }, + { "path": "packages/streams/tsconfig.build.json" }, + { "path": "packages/openapi3/tsconfig.build.json" }, + { "path": "packages/internal-build-utils/tsconfig.build.json" }, + { "path": "packages/bundle-uploader/tsconfig.build.json" }, + { "path": "packages/tmlanguage-generator/tsconfig.build.json" }, + { "path": "packages/protobuf/tsconfig.build.json" }, + { "path": "packages/openapi3/tsconfig.build.json" }, { "path": "packages/spec-api/tsconfig.build.json" }, { "path": "packages/spector/tsconfig.build.json" }, + { "path": "packages/spec-coverage-sdk/tsconfig.build.json" }, { "path": "packages/http-specs/tsconfig.build.json" }, - { "path": "packages/monarch/tsconfig.json" }, - { "path": "packages/bundler/tsconfig.json" }, - { "path": "packages/pack/tsconfig.json" }, - { "path": "packages/tspd/tsconfig.json" }, - { "path": "packages/samples/tsconfig.json" }, - { "path": "packages/json-schema/tsconfig.json" }, - { "path": "packages/best-practices/tsconfig.json" }, - { "path": "packages/xml/tsconfig.json" }, - { "path": "packages/http-server-js/tsconfig.json" }, - { "path": "packages/http-server-csharp/tsconfig.json" }, + { "path": "packages/monarch/tsconfig.build.json" }, + { "path": "packages/bundler/tsconfig.build.json" }, + { "path": "packages/pack/tsconfig.build.json" }, + { "path": "packages/samples/tsconfig.build.json" }, + { "path": "packages/json-schema/tsconfig.build.json" }, + { "path": "packages/best-practices/tsconfig.build.json" }, + { "path": "packages/xml/tsconfig.build.json" }, + { "path": "./packages/http-server-js/tsconfig.json" }, + { "path": "packages/http-server-csharp/tsconfig.build.json" }, { "path": "packages/astro-utils/tsconfig.build.json" } ], "files": [] diff --git a/website/.scripts/build.ts b/website/.scripts/build.ts index 52a098c4af4..c74e7696794 100644 --- a/website/.scripts/build.ts +++ b/website/.scripts/build.ts @@ -3,8 +3,8 @@ import { runOrExit } from "@typespec/internal-build-utils"; import { copyFile } from "fs/promises"; import { join, resolve } from "path"; -if (process.env.TYPESPEC_SKIP_DOCUSAURUS_BUILD?.toLowerCase() === "true") { - console.log("Skipping docusaurus build: TYPESPEC_SKIP_DOCUSAURUS_BUILD=true"); +if (process.env.TYPESPEC_SKIP_WEBSITE_BUILD?.toLowerCase() === "true") { + console.log("Skipping website build: TYPESPEC_SKIP_WEBSITE_BUILD=true"); process.exit(0); } diff --git a/website/astro.config.mjs b/website/astro.config.mjs index 8bb1ec30150..324902b35e3 100644 --- a/website/astro.config.mjs +++ b/website/astro.config.mjs @@ -6,33 +6,94 @@ import { processSidebar } from "@typespec/astro-utils/sidebar"; import astroExpressiveCode from "astro-expressive-code"; import rehypeAstroRelativeMarkdownLinks from "astro-rehype-relative-markdown-links"; import { defineConfig } from "astro/config"; +import { readdirSync, readFileSync } from "node:fs"; import { resolve } from "pathe"; import rehypeMermaid from "rehype-mermaid"; import remarkHeadingID from "remark-heading-id"; -import { nodePolyfills } from "vite-plugin-node-polyfills"; import current from "./src/content/current-sidebar"; +import { computeSriHash } from "./src/utils/sri-hash"; + +/** Scan the release-notes directory and return the slug of the latest release note. */ +function getLatestReleaseNoteSlug() { + const dir = resolve(import.meta.dirname, "src/content/docs/release-notes"); + const files = readdirSync(dir).filter((f) => /\.mdx?$/.test(f) && !f.startsWith("index")); + + let latestSlug = ""; + let latestDate = 0; + + for (const file of files) { + const content = readFileSync(resolve(dir, file), "utf-8"); + const fmMatch = content.match(/^---\n([\s\S]*?)\n---/); + if (!fmMatch) continue; + + const dateMatch = fmMatch[1].match(/releaseDate:\s*(\S+)/); + if (!dateMatch) continue; + + const date = new Date(dateMatch[1]).getTime(); + if (date > latestDate) { + latestDate = date; + const slugMatch = fmMatch[1].match(/slug:\s*(\S+)/); + latestSlug = slugMatch ? slugMatch[1] : `release-notes/${file.replace(/\.mdx?$/, "")}`; + } + } + + return latestSlug; +} + +const latestReleaseNote = getLatestReleaseNoteSlug(); const base = process.env.TYPESPEC_WEBSITE_BASE_PATH ?? "/"; +const initJsIntegrity = computeSriHash("1ds-init.js"); + // https://astro.build/config export default defineConfig({ base, site: "https://typespec.io", trailingSlash: "always", + redirects: { + // Point the old release-notes index to the latest release note. + ...(latestReleaseNote ? { "/release-notes/": `/${latestReleaseNote}/` } : {}), + // Redirect old /docs/ date-based paths to version-based (already existed in HEAD, updated targets) + "/docs/release-notes/release-2025-04-02/": "/release-notes/typespec-1-0-0-rc-0/", + "/docs/release-notes/release-2025-04-22/": "/release-notes/typespec-1-0-0-rc-1/", + "/docs/release-notes/release-2025-05-06/": "/release-notes/typespec-1-0-0/", + "/docs/release-notes/release-2025-06-10/": "/release-notes/typespec-1-1-0/", + "/docs/release-notes/release-2025-07-15/": "/release-notes/typespec-1-2-0/", + "/docs/release-notes/release-2025-08-06/": "/release-notes/typespec-1-3-0/", + "/docs/release-notes/release-2025-09-09/": "/release-notes/typespec-1-4-0/", + "/docs/release-notes/release-2025-10-08/": "/release-notes/typespec-1-5-0/", + "/docs/release-notes/release-2025-11-11/": "/release-notes/typespec-1-6-0/", + "/docs/release-notes/release-2025-12-09/": "/release-notes/typespec-1-7-0/", + "/docs/release-notes/release-2026-01-13/": "/release-notes/typespec-1-8-0/", + "/docs/release-notes/release-2026-02-10/": "/release-notes/typespec-1-9-0/", + "/docs/release-notes/release-2026-03-10/": "/release-notes/typespec-1-10-0/", + }, integrations: [ astroExpressiveCode(), starlight({ title: "TypeSpec", - sidebar: await processSidebar( - resolve(import.meta.dirname, "src/content/docs"), - "docs", - current, - ), + sidebar: [ + ...(await processSidebar( + resolve(import.meta.dirname, "src/content/docs"), + "docs", + current, + )), + { + label: "🚀 Release Notes", + link: latestReleaseNote ? `/${latestReleaseNote}/` : "/release-notes/", + }, + { + label: "🚀 Release Notes", + autogenerate: { directory: "release-notes" }, + }, + ], favicon: "/img/favicon.svg", customCss: ["./src/css/custom.css"], components: { Header: "./src/components/header/header.astro", PageFrame: "./src/components/starlight-overrides/PageFrame.astro", + Sidebar: "./src/components/starlight-overrides/Sidebar.astro", }, expressiveCode: false, // defined directly above head: [ @@ -40,6 +101,7 @@ export default defineConfig({ tag: "script", attrs: { src: "https://consentdeliveryfd.azurefd.net/mscc/lib/v2/wcp-consent.js", + crossorigin: "anonymous", }, }, { @@ -48,6 +110,7 @@ export default defineConfig({ type: "module", async: true, src: "1ds-init.js", + integrity: initJsIntegrity, }, }, ], @@ -78,15 +141,4 @@ export default defineConfig({ langs: [TypeSpecLang], }, }, - vite: { - plugins: [ - // @ts-expect-error incompatible types due to version mismatch - nodePolyfills({ - include: ["buffer"], - globals: { - process: "dev", - }, - }), - ], - }, }); diff --git a/website/package.json b/website/package.json index 8cc6eb9bfa2..21947729e7b 100644 --- a/website/package.json +++ b/website/package.json @@ -8,7 +8,7 @@ "dev": "astro dev", "start": "astro dev", "build": "tsx ./.scripts/build.ts", - "build:web": "pnpm regen-all-packages-docs && astro check --minimumFailingSeverity hint && astro build", + "build:web": "pnpm regen-all-packages-docs && astro check --minimumFailingSeverity hint && NODE_OPTIONS=\"--max-old-space-size=8192\" astro build", "preview": "astro preview", "astro": "astro", "update-playground-versions": "tsx ./.scripts/update-playground-versions.ts", @@ -16,32 +16,32 @@ "regen-all-packages-docs": "pnpm -w --filter \"@typespec/website...\" --filter \"!@typespec/monorepo\" run regen-docs" }, "dependencies": { - "@astrojs/check": "^0.9.4", - "@astrojs/react": "^4.4.2", - "@astrojs/starlight": "^0.37.0", - "@docsearch/css": "^4.3.2", - "@docsearch/js": "^4.3.2", - "@expressive-code/core": "^0.41.2", - "@fluentui/react-components": "~9.72.3", - "@fluentui/react-icons": "^2.0.292", + "@astrojs/check": "catalog:", + "@astrojs/react": "catalog:", + "@astrojs/starlight": "catalog:", + "@docsearch/css": "catalog:", + "@docsearch/js": "catalog:", + "@expressive-code/core": "catalog:", + "@fluentui/react-components": "catalog:", + "@fluentui/react-icons": "catalog:", "@typespec/compiler": "workspace:^", "@typespec/playground": "workspace:^", - "astro": "^5.16.5", - "astro-rehype-relative-markdown-links": "^0.18.1", - "clsx": "^2.1.1", - "date-fns": "^4.1.0", - "es-module-shims": "~2.8.0", - "pathe": "^2.0.3", - "prism-react-renderer": "^2.4.1", - "react": "~19.2.3", - "react-dom": "~19.2.3", - "sharp": "^0.34.2", - "typescript": "~5.9.2" + "astro": "catalog:", + "astro-rehype-relative-markdown-links": "catalog:", + "clsx": "catalog:", + "date-fns": "catalog:", + "es-module-shims": "catalog:", + "pathe": "catalog:", + "prism-react-renderer": "catalog:", + "react": "catalog:", + "react-dom": "catalog:", + "sharp": "catalog:", + "typescript": "catalog:" }, "devDependencies": { - "@types/react": "~19.2.7", - "@types/react-dom": "~19.2.2", - "@types/remark-heading-id": "^1.0.0", + "@types/react": "catalog:", + "@types/react-dom": "catalog:", + "@types/remark-heading-id": "catalog:", "@typespec/astro-utils": "workspace:^", "@typespec/compiler": "workspace:^", "@typespec/events": "workspace:^", @@ -62,10 +62,9 @@ "@typespec/tspd": "workspace:^", "@typespec/versioning": "workspace:^", "@typespec/xml": "workspace:^", - "astro-expressive-code": "^0.41.2", - "rehype-mermaid": "^3.0.0", - "remark-heading-id": "^1.0.1", - "rimraf": "~6.1.2", - "vite-plugin-node-polyfills": "^0.25.0" + "astro-expressive-code": "catalog:", + "rehype-mermaid": "catalog:", + "remark-heading-id": "catalog:", + "rimraf": "catalog:" } } diff --git a/website/playground-versions.json b/website/playground-versions.json index 8c5bade5fe0..855b2180a69 100644 --- a/website/playground-versions.json +++ b/website/playground-versions.json @@ -1,4 +1,7 @@ [ + "1.11.x", + "1.10.x", + "1.9.x", "1.8.x", "1.7.x", "1.6.x", diff --git a/website/src/components/playground-component/import-map.ts b/website/src/components/playground-component/import-map.ts index 88c30465fba..c4dfb196e4b 100644 --- a/website/src/components/playground-component/import-map.ts +++ b/website/src/components/playground-component/import-map.ts @@ -9,10 +9,41 @@ export interface ImportMap { imports: Record; } +const pkgsBaseUrl = "https://typespec.blob.core.windows.net/pkgs"; + +async function fetchAdditionalPackageImports( + packageNames: readonly string[], +): Promise> { + const imports: Record = {}; + + const results = await Promise.allSettled( + packageNames.map(async (name) => { + const url = `${pkgsBaseUrl}/${name}/latest.json`; + const response = await fetch(url); + if (!response.ok) { + // eslint-disable-next-line no-console + console.warn(`Failed to load latest index for ${name}: ${response.status}`); + return undefined; + } + return JSON.parse(await response.text()) as ImportMap; + }), + ); + + for (const result of results) { + if (result.status === "fulfilled" && result.value) { + Object.assign(imports, result.value.imports); + } + } + + return imports; +} + export async function loadImportMap({ latestVersion, + additionalPackages = [], }: { latestVersion: string; + additionalPackages?: readonly string[]; }): Promise { const optionsScript = document.querySelector("script[type=playground-options]"); if (optionsScript === undefined) { @@ -24,14 +55,15 @@ export async function loadImportMap({ const parsed = new URLSearchParams(window.location.search); const requestedVersion = parsed.get("version"); - const importMapUrl = `https://typespec.blob.core.windows.net/pkgs/indexes/typespec/${ - requestedVersion ?? latestVersion - }.json`; + const importMapUrl = `${pkgsBaseUrl}/indexes/typespec/${requestedVersion ?? latestVersion}.json`; - const response = await fetch(importMapUrl); - const content = await response.text(); + const [mainResponse, additionalImports] = await Promise.all([ + fetch(importMapUrl), + fetchAdditionalPackageImports(additionalPackages), + ]); - const importMap = JSON.parse(content); + const importMap: ImportMap = JSON.parse(await mainResponse.text()); + Object.assign(importMap.imports, additionalImports); (window as any).importShim.addImportMap(importMap); diff --git a/website/src/components/playground-component/playground.tsx b/website/src/components/playground-component/playground.tsx index fd1b3618093..2b19e2f401b 100644 --- a/website/src/components/playground-component/playground.tsx +++ b/website/src/components/playground-component/playground.tsx @@ -1,6 +1,6 @@ import versions from "@site/playground-versions.json"; import { useTheme } from "@typespec/astro-utils/utils/theme-react"; -import { ImportToolbarButton, TypeSpecPlaygroundConfig } from "@typespec/playground-website"; +import { TypeSpecPlaygroundConfig, useImportCommandBarItem } from "@typespec/playground-website"; import { Footer, FooterVersionItem, @@ -27,6 +27,7 @@ export const WebsitePlayground = ({ versionData }: WebsitePlaygroundProps) => { return { theme: theme === "dark" ? "typespec-dark" : "typespec" }; }, [theme]); + const importItem = useImportCommandBarItem(); const imports = Object.keys(versionData.importMap.imports).filter( (x) => (x.match(/\//g) || []).length < 2, // Don't include sub imports as libraries. ); @@ -40,7 +41,7 @@ export const WebsitePlayground = ({ versionData }: WebsitePlaygroundProps) => { footer={} fallback={} onFileBug={fileBugToGithub} - commandBarButtons={} + commandBarItems={[importItem]} /> ); }; diff --git a/website/src/components/react-pages/playground.tsx b/website/src/components/react-pages/playground.tsx index 10e9d9bed06..5ed019fabbb 100644 --- a/website/src/components/react-pages/playground.tsx +++ b/website/src/components/react-pages/playground.tsx @@ -3,6 +3,8 @@ import { useEffect, useState, type ReactNode } from "react"; import { FluentLayout } from "../fluent/fluent-layout"; import { loadImportMap, type VersionData } from "../playground-component/import-map"; +const additionalPlaygroundPackages = ["@typespec/http-client-python"]; + export const AsyncPlayground = ({ latestVersion, fallback, @@ -15,7 +17,13 @@ export const AsyncPlayground = ({ WebsitePlayground: typeof import("../playground-component/playground").WebsitePlayground; }>(undefined as any); useEffect(() => { - Promise.all([loadImportMap({ latestVersion }), import("../playground-component/playground")]) + Promise.all([ + loadImportMap({ + latestVersion, + additionalPackages: additionalPlaygroundPackages, + }), + import("../playground-component/playground"), + ]) .then((x) => setMod({ versionData: x[0] as any, WebsitePlayground: x[1].WebsitePlayground })) .catch((e) => { throw e; diff --git a/website/src/components/release-notification.astro b/website/src/components/release-notification.astro index 54e312cd976..b53ce130ce2 100644 --- a/website/src/components/release-notification.astro +++ b/website/src/components/release-notification.astro @@ -1,7 +1,11 @@ --- import { getCollection } from "astro:content"; -const releaseNotes = await getCollection("docs", (x) => x.id.startsWith("docs/release-notes")); -releaseNotes.sort((a, b) => a.id.localeCompare(b.id)); +const releaseNotes = await getCollection("docs", (x) => x.id.startsWith("release-notes/")); +releaseNotes.sort((a, b) => { + const dateA = a.data.releaseDate?.getTime() ?? 0; + const dateB = b.data.releaseDate?.getTime() ?? 0; + return dateA - dateB; +}); const last = releaseNotes[releaseNotes.length - 1]; const releaseDate = last.data.releaseDate; if (!releaseDate) { diff --git a/website/src/components/starlight-overrides/Sidebar.astro b/website/src/components/starlight-overrides/Sidebar.astro new file mode 100644 index 00000000000..4601c965b92 --- /dev/null +++ b/website/src/components/starlight-overrides/Sidebar.astro @@ -0,0 +1,51 @@ +--- +import MobileMenuFooter from "@astrojs/starlight/components/MobileMenuFooter.astro"; +import SidebarPersister from "@astrojs/starlight/components/SidebarPersister.astro"; +import SidebarSublist from "@astrojs/starlight/components/SidebarSublist.astro"; +import { getCollection } from "astro:content"; + +const { sidebar } = Astro.locals.starlightRoute; +const pathname = Astro.url.pathname; +const base = import.meta.env.BASE_URL; + +type SidebarEntry = (typeof sidebar)[number]; + +const isReleaseNotes = pathname.startsWith(base + "release-notes"); + +/** Returns true for sidebar groups that contain release notes entries. */ +function isReleaseNotesGroup(entry: SidebarEntry): boolean { + if (entry.type !== "group") return false; + return entry.entries.some((e) => e.type === "link" && e.href.startsWith(base + "release-notes/")); +} + +const filtered = sidebar.filter((entry) => + isReleaseNotes ? isReleaseNotesGroup(entry) : !isReleaseNotesGroup(entry), +); + +// Sort release notes entries by releaseDate so newest appear first. +if (isReleaseNotes) { + const releaseNotes = await getCollection("docs", (x) => x.id.startsWith("release-notes/")); + const dateByHref = new Map(); + for (const note of releaseNotes) { + const href = base + note.id + "/"; + dateByHref.set(href, note.data.releaseDate?.getTime() ?? 0); + } + for (const entry of filtered) { + if (entry.type === "group" && isReleaseNotesGroup(entry)) { + entry.entries.sort((a, b) => { + const dateA = a.type === "link" ? (dateByHref.get(a.href) ?? 0) : 0; + const dateB = b.type === "link" ? (dateByHref.get(b.href) ?? 0) : 0; + return dateB - dateA; + }); + } + } +} +--- + + + + + +
+ +
diff --git a/website/src/content.config.ts b/website/src/content.config.ts index 4b65bf1675e..12a246a22d2 100644 --- a/website/src/content.config.ts +++ b/website/src/content.config.ts @@ -1,7 +1,9 @@ import { docsLoader } from "@astrojs/starlight/loaders"; import { docsSchema } from "@astrojs/starlight/schema"; import { llmstxtSchema } from "@typespec/astro-utils/llmstxt/schema"; -import { defineCollection, z } from "astro:content"; +import { glob } from "astro/loaders"; +import { z } from "astro/zod"; +import { defineCollection } from "astro:content"; const authorSchema = z.object({ name: z.string(), @@ -26,8 +28,7 @@ export const collections = { }), }), blog: defineCollection({ - type: "content", - // Type-check frontmatter using a schema + loader: glob({ pattern: "**/[^_]*.{md,mdx}", base: "./src/content/blog" }), schema: z.object({ slug: z.string().optional(), redirect_slug: z.string().optional(), diff --git a/website/src/content/current-sidebar.ts b/website/src/content/current-sidebar.ts index 6da32097370..b6e8393692f 100644 --- a/website/src/content/current-sidebar.ts +++ b/website/src/content/current-sidebar.ts @@ -96,12 +96,14 @@ const sidebar: SidebarItem[] = [ "language-basics/interfaces", "language-basics/templates", "language-basics/enums", + "language-basics/functions", "language-basics/unions", "language-basics/intersections", "language-basics/type-literals", "language-basics/alias", "language-basics/values", "language-basics/type-relations", + "language-basics/access-modifiers", "language-basics/visibility", ], }, @@ -240,18 +242,13 @@ const sidebar: SidebarItem[] = [ "extending-typespec/codefixes", "extending-typespec/testing", "extending-typespec/emitters-basics", + "extending-typespec/implement-functions", "extending-typespec/emitter-framework", + "extending-typespec/performance-reporting", "extending-typespec/emitter-metadata-handling", "extending-typespec/writing-scaffolding-template", ], }, - { - label: "🚀 Release Notes", - autogenerate: { - order: "desc", - directory: "release-notes", - }, - }, ]; export default sidebar; diff --git a/website/src/content/docs/docs/emitters/clients/http-client-csharp/reference/emitter.md b/website/src/content/docs/docs/emitters/clients/http-client-csharp/reference/emitter.md index 55c52dcc6bf..f20d6edee33 100644 --- a/website/src/content/docs/docs/emitters/clients/http-client-csharp/reference/emitter.md +++ b/website/src/content/docs/docs/emitters/clients/http-client-csharp/reference/emitter.md @@ -108,11 +108,11 @@ The name of the generator. By default this is set to `ScmCodeModelGenerator`. Ge Allows emitter authors to specify the path to a custom emitter package, allowing you to extend the emitter behavior. This should be set to `import.meta.url` if you are using a custom emitter. -### `update-code-model` +### `plugins` -**Type:** `object` +**Type:** `array` -Allows emitter authors to specify a custom function to modify the generated code model before emitting. This is useful for modifying the code model before it is passed to the generator. +Paths to generator plugin assemblies (DLLs) or directories containing plugin assemblies. Each plugin must contain a class that extends GeneratorPlugin. ### `license` diff --git a/website/src/content/docs/docs/emitters/clients/http-client-csharp/reference/index.mdx b/website/src/content/docs/docs/emitters/clients/http-client-csharp/reference/index.mdx index e7a4de67da2..ca373e97796 100644 --- a/website/src/content/docs/docs/emitters/clients/http-client-csharp/reference/index.mdx +++ b/website/src/content/docs/docs/emitters/clients/http-client-csharp/reference/index.mdx @@ -5,7 +5,7 @@ toc_min_heading_level: 2 toc_max_heading_level: 3 --- -import { Tabs, TabItem } from '@astrojs/starlight/components'; +import { Tabs, TabItem } from "@astrojs/starlight/components"; TypeSpec library for emitting Http Client libraries for C#. diff --git a/website/src/content/docs/docs/emitters/openapi3/reference/emitter.md b/website/src/content/docs/docs/emitters/openapi3/reference/emitter.md index d9b78f2f494..a15c4c7e603 100644 --- a/website/src/content/docs/docs/emitters/openapi3/reference/emitter.md +++ b/website/src/content/docs/docs/emitters/openapi3/reference/emitter.md @@ -38,9 +38,9 @@ See [Configuring output directory for more info](https://typespec.io/docs/handbo ### `file-type` -**Type:** `"yaml" | "json"` +**Type:** `string,array` -If the content should be serialized as YAML or JSON. Default 'yaml', it not specified infer from the `output-file` extension +If the content should be serialized as YAML or JSON. Can be a single value or an array to emit multiple formats. Default 'yaml', if not specified infer from the `output-file` extension ### `output-file` @@ -52,8 +52,10 @@ Output file will interpolate the following values: - service-name: Name of the service - service-name-if-multiple: Name of the service if multiple - version: Version of the service if multiple +- file-type: The file type being emitted (json or yaml). Useful when `file-type` is an array. Default: `{service-name-if-multiple}.{version}.openapi.yaml` or `.json` if `file-type` is `"json"` +When `file-type` is an array: `{service-name-if-multiple}.{version}.openapi.{file-type}` Example Single service no versioning diff --git a/website/src/content/docs/docs/extending-typespec/basics.md b/website/src/content/docs/docs/extending-typespec/basics.md index 60a536e537d..632c5c093d3 100644 --- a/website/src/content/docs/docs/extending-typespec/basics.md +++ b/website/src/content/docs/docs/extending-typespec/basics.md @@ -152,8 +152,7 @@ Alternatively, you can add these as scripts in your `package.json` to make them "clean": "rimraf ./dist ./temp", "build": "tsc -p .", "watch": "tsc -p . --watch", - "test": "node --test ./dist/test/**/*.test.js", // Node 22+ - "test": "node --test ./dist/test/" // Node 18, 20 + "test": "node --test ./dist/test/**/*.test.js" } ``` @@ -181,6 +180,33 @@ model Person { } ``` +## Controlling your library's API surface + +When authoring a library, not every type you define is meant for consumers to use directly. Some types are implementation details that support your library internally. You can use the `internal` modifier to prevent consumers from accessing these types. + +:::caution +The `internal` modifier is an **experimental feature**. See [Access Modifiers](/docs/language-basics/access-modifiers) for full details. +::: + +```typespec +import "../dist/index.js"; + +namespace MyLibrary; + +/** This model is part of the public API. */ +model Person { + name: string; + age: uint8; +} + +/** This model is an implementation detail and cannot be accessed by consumers. */ +internal model PersonValidator { + rules: string[]; +} +``` + +Consumers who try to reference `PersonValidator` will receive a compiler error. This helps you evolve your library's internals without worrying about breaking consumers who might have depended on them. + ## Step 3: Defining dependencies When defining dependencies in a TypeSpec library, follow these rules: diff --git a/website/src/content/docs/docs/extending-typespec/create-decorators.md b/website/src/content/docs/docs/extending-typespec/create-decorators.md index 32bd9ecbf77..71c3ae95d09 100644 --- a/website/src/content/docs/docs/extending-typespec/create-decorators.md +++ b/website/src/content/docs/docs/extending-typespec/create-decorators.md @@ -297,7 +297,7 @@ export const $lib = createTypeSpecLibrary({ export const StateKeys = $lib.stateKeys; ``` -### Reporting diagnostic on decorator or arguments +### Reporting diagnostics on decorator or arguments The decorator context provides the `decoratorTarget` and `getArgumentTarget` helpers. diff --git a/website/src/content/docs/docs/extending-typespec/implement-functions.md b/website/src/content/docs/docs/extending-typespec/implement-functions.md new file mode 100644 index 00000000000..5a7669b623e --- /dev/null +++ b/website/src/content/docs/docs/extending-typespec/implement-functions.md @@ -0,0 +1,168 @@ +--- +id: implement-functions +title: Functions +--- + +:::warning +Functions are an experimental TypeSpec feature. The API and behavior of functions may reasonably be expected to change in +future releases as we gather feedback. If you choose to use functions in your TypeSpec libraries and programs, please be +aware that you may need to make adjustments to your code when updating to new versions of TypeSpec. +::: + +TypeSpec functions, like [Decorators](./create-decorators.md), are implemented using JavaScript functions. To provide +a function in your library, you must: + +1. [Declare the function signature in TypeSpec](#declare-the-function-signature). +2. [Implement the function in JavaScript](#implement-the-function-in-javascript). + +## Declare the function signature + +Unlike decorators, declaring a function's signature in TypeSpec is mandatory. A function signature is declared using the +`fn` keyword. Functions are implemented in JavaScript and therefore the signature also requires the `extern` keyword. + +```tsp +extern fn myFn(); +``` + +A function signature can specify a list of parameters and optionally a return type constraint. + +```tsp +/** + * Concatenates to strings, equivalent to `l + r` in JavaScript, where `l` and `r` are strings. + * + * @param l String to be appended first to the result string. + * @param r String to be appended second to the result string. + * @returns the result of concatenating `l` and `r`. + */ +extern fn concat(l: valueof string, r: valueof string): valueof string; +``` + +Type constraints for parameters work exactly the same as constraints for [Decorator](../language-basics/decorators.md). + +### Optional parameters + +You can mark a function parameter as optional using `?`: + +```tsp +/** + * Renames a model, if `name` is provided and different from the input model's name. + * + * @param m the input Model to rename + * @param name if set, the name of the output model + * @returns `m` if `name` is not set or `m`'s name is equal to `name`, otherwise a new Model instance with the given + * name that is otherwise identical to `m`. + */ +extern fn rename(m: Reflection.Model, name?: valueof string): Reflection.Model; +``` + +### Rest parameters + +Functions may also specify "rest" parameters. The rest parameter collects all remaining arguments passed to the function, +and is declared using `...`. The type of a rest parameter _must_ be an array. + +```tsp +/** + * Joins a list of strings, equivalent to `rest.join(sep)` in JavaScript. + * + * @param sep the separator string used to join the list. + * @param rest the list of strings to join + * @returns the list of strings joined by the separator + */ +extern fn join(sep: valueof string, ...rest: valueof string[]): valueof string; +``` + +### Return type constraints + +Functions may optionally specify a return type constraint. The return type constraint is checked when the function is +called, and whatever the function returns must be assignable to the constraint. + +#### Void functions + +The `void` return type is treated specially. A JS implementation for a TypeSpec function that returns `void` may return +_either_ `undefined`, or an instance of the `void` intrinsic type, for compatibility with JavaScript void functions. +Regardless of what the implementation returns, the TypeSpec function call will _always_ evaluate to `void`. + +```tsp +namespace Example; + +extern fn myFn(): void; + +// Calling myFn() is guaranteed to evaluate to the `void` intrinsic type. +``` + +## Implement the function in JavaScript + +Functions must be implemented in a JavaScript library by exporting the functions the library implements using the +`$functions` variable. + +```ts +// lib.ts +import { FunctionContext } from "@typespec/compiler"; + +export const $functions = { + // Namespace + "MyOrg.MyLib": { + concat, + }, +}; + +function concat(context: FunctionContext, l: string, r: string): string { + return l + r; +} +``` + +The function implementation must be imported from TypeSpec to bind to the declaration in the signature: + +```tsp +// lib.tsp +import "./lib.js"; + +namespace MyOrg.MyLib; + +extern fn concat(l: valueof string, r: valueof string): valueof string; +``` + +The first argument passed to a JS function implementation is always the function's _context_, which has type +`FunctionContext`. The context provides information about where the function call was located in TypeSpec source, and +can be used to call other functions or invoke decorators from within the function implementation. + +### Function parameter marshalling + +When function arguments are _Types_, the type is passed to the function as-is. When a function argument is a _value_, +the function implementation receives a JavaScript value with a type that is appropriate for representing that value. + +| TypeSpec value type | Marshalled type in JS | +| ------------------- | --------------------------------- | +| `string` | `string` | +| `boolean` | `boolean` | +| `numeric` | `Numeric` or `number` (see below) | +| `null` | `null` | +| enum member | `EnumValue` | + +When marshalling numeric values, either the `Numeric` wrapper type is used, or a `number` is passed directly, depending on whether the value can be represented as a JavaScript number without precision loss. In particular, the types `numeric`, `integer`, `decimal`, `float`, `int64`, `uint64`, and `decimal128` are marshalled as a `Numeric` type. All other numeric types are marshalled as `number`. + +When marshalling custom scalar subtypes, the marshalling behavior of the known supertype is used. For example, a `scalar customScalar extends numeric` will marshal as a `Numeric`, regardless of any value constraints that might be present. + +### Reporting diagnostics on function calls or arguments + +The function context provides the `functionCallTarget` and `getArgumentTarget` helpers. + +```ts +import type { FunctionContext, Type } from "typespec/compiler"; +import { reportDiagnostic } from "./lib.js"; + +export function renamed(ctx: FunctionContext, model: Model, name: string): Model { + // To report a diagnostic on the function call + reportDiagnostic({ + code: "my-diagnostic-code", + target: ctx.functionCallTarget, + }); + // To report an error on a specific argument (for example the `model`), use the argument target. + // Note: targeting the `model` itself will put the diagnostic on the type's _declaration_, but using + // getArgumentTarget will put it on the _function argument_, which is probably what you want. + reportDiagnostic({ + code: "my-other-code", + target: ctx.getArgumentTarget(0), + }); +} +``` diff --git a/website/src/content/docs/docs/extending-typespec/performance-reporting.md b/website/src/content/docs/docs/extending-typespec/performance-reporting.md new file mode 100644 index 00000000000..0b794e953e4 --- /dev/null +++ b/website/src/content/docs/docs/extending-typespec/performance-reporting.md @@ -0,0 +1,153 @@ +--- +title: Performance Reporting +--- + +The TypeSpec compiler can report performance statistics after compilation, helping you identify bottlenecks and optimize your build process. Enable this feature by passing the `--stats` flag to the CLI: + +```bash +tsp compile . --stats +``` + + + +```ansi frame="terminal" +tsp compile . --stats +TypeSpec compiler v1.9.0 + +Compilation completed successfully. + +Compiler statistics: + Complexity: + Created types: 494 + Finished types: 319 + Performance: + loader: 19ms + resolver: 6ms + checker: 8ms + validation: 0ms + compiler: 0ms + linter: 0ms +``` + + + +The report includes: + +- **Complexity metrics**: Number of types created and finished during compilation +- **Performance breakdown**: Time spent in each compilation phase (loading, resolving, type-checking, validation, and linting) + +## Emitter Performance Reporting + +:::note[Since TypeSpec 1.9.0] +::: +Emitters can report their own performance statistics, which are displayed alongside the compiler metrics in the same report. + +Use the `EmitContext.perf` API to instrument your emitter code. The API provides several methods depending on your use case. + +### `startTimer` - Manual Timer Control + +Best for when the start and stop points are in different parts of your code, or when you need conditional timing: + +```ts +const timer = context.perf.startTimer("my-task"); + +// ... do some work across multiple statements + +timer.end(); +``` + +### `time` - Synchronous Function Timing + +Best for wrapping synchronous code blocks. Returns the result of the callback function: + +```ts +const result = context.perf.time("my-task", () => { + // ... do some work + return computedValue; +}); +``` + +### `timeAsync` - Asynchronous Function Timing + +Best for wrapping async operations. Returns a promise with the callback's result: + +```ts +const result = await context.perf.timeAsync("my-task", async () => { + // ... do some async work + return await fetchData(); +}); +``` + +### `reportTime` - Report Pre-measured Duration + +Best when you already have timing data from another source (e.g., a child process or external tool): + +```ts title="emit.ts" +const { duration } = runTask(); +context.perf.reportTime("my-task", duration); +``` + +You can use the standalone `perf` utilities to measure duration in code that doesn't have access to the emit context: + +```ts title="task-runner.ts" +import { perf } from "@typespec/compiler/utils"; + +function runTask(): { duration: number } { + const timer = perf.startTimer(); + // ... do some work + return { duration: timer.end() }; +} +``` + +## Complete Example + +Here's how to instrument a typical emitter with multiple phases: + +```ts +import { EmitContext } from "@typespec/compiler"; + +export async function $onEmit(context: EmitContext) { + // Manual timer for the preparation phase + const timer = context.perf.startTimer("prepare"); + prepare(); + timer.end(); + + // Wrap synchronous rendering with automatic timing + const renderResult = context.perf.time("render", () => render()); + + // Wrap async file writing with automatic timing + await context.perf.timeAsync("write", async () => writeOutput(renderResult)); +} +``` + +Running `tsp compile . --stats` with this instrumented emitter produces: + + + +```ansi frame="terminal" +tsp compile . --stats +TypeSpec compiler v1.9.0 + +Compilation completed successfully. + +Compiler statistics: + Complexity: + Created types: 494 + Finished types: 319 + Performance: + loader: 19ms + resolver: 6ms + checker: 8ms + validation: 0ms + compiler: 0ms + linter: 0ms + emit: 128ms + my-emitter: 128ms + prepare: 39ms + render: 28ms + write: 51ms +``` + + + +The emitter's custom metrics (`prepare`, `render`, `write`) appear nested under the emitter name, giving you a clear breakdown of where time is spent during code generation. diff --git a/website/src/content/docs/docs/extending-typespec/testing.mdx b/website/src/content/docs/docs/extending-typespec/testing.mdx index 675c57520cf..17634621f0c 100644 --- a/website/src/content/docs/docs/extending-typespec/testing.mdx +++ b/website/src/content/docs/docs/extending-typespec/testing.mdx @@ -281,6 +281,8 @@ strictEqual(Foo.name, "Foo"); PR with examples https://github.com/microsoft/typespec/pull/7151 +### Replace test host setup + ```diff lang=ts title="test-host.ts" - import { createTestHost, createTestWrapper } from "@typespec/compiler/testing"; - import { HttpTestLibrary } from "@typespec/http/testing"; @@ -307,16 +309,70 @@ PR with examples https://github.com/microsoft/typespec/pull/7151 + .using("My"); ``` -In test files +### Update test files + +Remove the `beforeEach` runner setup and use `Tester` directly. The `program` is available on the compile result. ```diff lang=ts title="test/my-library.test.ts" +- import { createMyTestRunner } from "./test-host.js"; ++ import { t } from "@typespec/compiler/testing"; ++ import { Tester } from "./test-host.js"; + +- let runner: BasicTestRunner; +- beforeEach(async () => { +- runner = await createMyTestRunner(); +- }); + it("mark property as being an attribute", async () => { - const { id } = (await runner.compile(`model Blob { - @test @Xml.attribute id : string - }`)) as { id: ModelProperty }; -+ const { id } = await Tester.compile(t.code`model Blob { +- expect(isAttribute(runner.program, id)).toBe(true); ++ const { id, program } = await Tester.compile(t.code`model Blob { + @Xml.attribute ${t.modelProperty("id")} : string + }`); - expect(isAttribute(runner.program, id)).toBe(true); ++ expect(isAttribute(program, id)).toBe(true); }); ``` + +### Injecting files + +Replace `host.addTypeSpecFile()` / `host.addJsFile()` with the `.files()` chain and `mockFile.js()`: + +```diff lang=ts +- host.addJsFile("./dec.js", { $myDec: () => null }); +- const diagnostics = await runner.diagnose(` +- import "./dec.js"; +- extern dec myDec(target: unknown); +- `); ++ import { mockFile } from "@typespec/compiler/testing"; ++ const diagnostics = await Tester.files({ ++ "./dec.js": mockFile.js({ $myDec: () => null }), ++ }).diagnose(` ++ import "./dec.js"; ++ extern dec myDec(target: unknown); ++ `); +``` + +### Emitter testing + +For emitter tests, use `.emit()` to create an `EmitterTester`. The compile result includes `outputs` with the emitted files: + +```diff lang=ts title="test-host.ts" +- export async function createMyEmitterTestRunner() { +- const host = await createMyTestHost(); +- return createTestWrapper(host, { +- compilerOptions: { noEmit: false, emit: ["@typespec/my-emitter"] }, +- }); +- } + ++ export const EmitterTester = Tester.emit("@typespec/my-emitter"); +``` + +```diff lang=ts title="test/emitter.test.ts" +- const runner = await createMyEmitterTestRunner(); +- await runner.compileAndDiagnose(code, { outputDir: "tsp-output" }); + ++ const [result, diagnostics] = await EmitterTester.compileAndDiagnose(code); ++ // result.outputs contains the emitted files as Record +``` diff --git a/website/src/content/docs/docs/getting-started/getting-started-rest/01-setup-basic-syntax.mdx b/website/src/content/docs/docs/getting-started/getting-started-rest/01-setup-basic-syntax.mdx index 40267bc99b8..b9952729831 100644 --- a/website/src/content/docs/docs/getting-started/getting-started-rest/01-setup-basic-syntax.mdx +++ b/website/src/content/docs/docs/getting-started/getting-started-rest/01-setup-basic-syntax.mdx @@ -21,7 +21,7 @@ Before we start writing TypeSpec code, we need to set up our development environ ### Summary of Setup and Installation -1. **Install Node.js**: Download and install Node.js from [nodejs.org](https://nodejs.org/). This will also install npm, the Node.js package manager. The minimum versions required are Node.js 20.0.0 and npm 7.0.0. +1. **Install Node.js**: Download and install Node.js from [nodejs.org](https://nodejs.org/). This will also install npm, the Node.js package manager. The minimum versions required are Node.js 22.0.0 and npm 7.0.0. 2. **Install TypeSpec CLI**: Run `npm install -g @typespec/compiler` to install the TypeSpec CLI. 3. **Verify Installation**: Run `tsp --version` to verify that the TypeSpec CLI is installed correctly. 4. **Create a New Project**: @@ -92,16 +92,14 @@ A REST service in TypeSpec is defined using the [`@service`](../../../standard-l Let's start by defining a simple REST service for a Pet Store: -```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" +```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" ins={4-7} import "@typespec/http"; using Http; -// highlight-start @service(#{ title: "Pet Store", }) @server("https://example.com", "Single server endpoint") -// highlight-end ``` In this example: @@ -121,15 +119,13 @@ In this example: Let's create a namespace for our Pet Store service: -```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" +```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" ins={8} import "@typespec/http"; using Http; @service(#{ title: "Pet Store" }) @server("https://example.com", "Single server endpoint") - -// highlight-next-line namespace PetStore; ``` @@ -150,7 +146,7 @@ In TypeSpec, a [model](../../language-basics/models.md) is a fundamental buildin Let's define a simple model for a `Pet`: -```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" +```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" ins={9-22} import "@typespec/http"; using Http; @@ -159,7 +155,6 @@ using Http; @server("https://example.com", "Single server endpoint") namespace PetStore; -// highlight-start model Pet { id: int32; name: string; @@ -174,7 +169,6 @@ enum petType { bird: "bird", reptile: "reptile", } -// highlight-end ``` In this example: @@ -189,7 +183,7 @@ In this example: We can add [validation](../../../language-basics/values/#validation) annotations to our model properties to enforce certain constraints: -```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" +```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" ins={12,15-16} import "@typespec/http"; using Http; @@ -201,13 +195,10 @@ namespace PetStore; model Pet { id: int32; - // highlight-next-line @minLength(1) name: string; - // highlight-next-line @minValue(0) - // highlight-next-line @maxValue(100) age: int32; diff --git a/website/src/content/docs/docs/getting-started/getting-started-rest/02-operations-responses.md b/website/src/content/docs/docs/getting-started/getting-started-rest/02-operations-responses.md index 18650cc2109..f227a04ea8f 100644 --- a/website/src/content/docs/docs/getting-started/getting-started-rest/02-operations-responses.md +++ b/website/src/content/docs/docs/getting-started/getting-started-rest/02-operations-responses.md @@ -17,7 +17,7 @@ Next, we'll discuss how to define CRUD operations for our API. We'll cover opera Let's define the CRUD operations for our `Pet` model: -```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" +```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" ins={30-60} import "@typespec/http"; using Http; @@ -47,7 +47,6 @@ enum petType { reptile: "reptile", } -// highlight-start @route("/pets") namespace Pets { @get @@ -79,7 +78,6 @@ namespace Pets { @statusCode statusCode: 204; }; } -// highlight-end ``` In this example: @@ -138,7 +136,7 @@ In a real-world API, different operations might return different types of succes Let's update our pet operations to return different status codes based on the outcome. -```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" +```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" ins={42-43,50-52,59-60} import "@typespec/http"; using Http; @@ -180,31 +178,25 @@ namespace Pets { op getPet(@path petId: int32): { @statusCode statusCode: 200; @body pet: Pet; - // highlight-start } | { @statusCode statusCode: 404; - // highlight-end }; @post op createPet(@body pet: Pet): { @statusCode statusCode: 201; @body newPet: Pet; - // highlight-start } | { @statusCode statusCode: 202; @body acceptedPet: Pet; - // highlight-end }; @put op updatePet(@path petId: int32, @body pet: Pet): { @statusCode statusCode: 200; @body updatedPet: Pet; - // highlight-start } | { @statusCode statusCode: 404; - // highlight-end }; @delete diff --git a/website/src/content/docs/docs/getting-started/getting-started-rest/03-handling-errors.md b/website/src/content/docs/docs/getting-started/getting-started-rest/03-handling-errors.md index 6aa893c46a8..d4cbcc8838a 100644 --- a/website/src/content/docs/docs/getting-started/getting-started-rest/03-handling-errors.md +++ b/website/src/content/docs/docs/getting-started/getting-started-rest/03-handling-errors.md @@ -26,7 +26,7 @@ Error models can be used to represent different types of errors that your API mi We'll define models to represent validation errors, not-found errors, and internal server errors: -```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" +```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" ins={45,55-58,65-76,85-102} import "@typespec/http"; using Http; @@ -70,8 +70,6 @@ namespace Pets { @body pet: Pet; } | { @statusCode statusCode: 404; - - // highlight-next-line @body error: NotFoundError; }; @@ -82,19 +80,16 @@ namespace Pets { } | { @statusCode statusCode: 202; @body acceptedPet: Pet; - // highlight-start } | { @statusCode statusCode: 400; @body error: ValidationError; }; - // highlight-end @put op updatePet(@path petId: int32, @body pet: Pet): | { @statusCode statusCode: 200; @body updatedPet: Pet; - // highlight-start } | { @statusCode statusCode: 400; @@ -107,7 +102,6 @@ namespace Pets { | { @statusCode statusCode: 500; @body error: InternalServerError; - // highlight-end }; @delete @@ -116,7 +110,6 @@ namespace Pets { }; } -// highlight-start @error model NotFoundError { code: "NOT_FOUND"; @@ -135,7 +128,6 @@ model InternalServerError { code: "INTERNAL_SERVER_ERROR"; message: string; } -// highlight-end ``` In this example: diff --git a/website/src/content/docs/docs/getting-started/getting-started-rest/04-common-parameters.md b/website/src/content/docs/docs/getting-started/getting-started-rest/04-common-parameters.md index 665421e8d0a..b5bd7d05a42 100644 --- a/website/src/content/docs/docs/getting-started/getting-started-rest/04-common-parameters.md +++ b/website/src/content/docs/docs/getting-started/getting-started-rest/04-common-parameters.md @@ -16,7 +16,7 @@ Let's start by defining a model for common parameters. This model will include p For the sake of demonstration, we're going to require each API call in our Pet Store service to include a request ID, a locale, and a client version. Let's define a model for these common parameters, which we'll label `requestID`, `locale`, and `clientVersion`: -```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" +```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" ins={30-39} import "@typespec/http"; using Http; @@ -46,7 +46,6 @@ enum petType { reptile: "reptile", } -// highlight-start model CommonParameters { @header requestID: string; @@ -57,7 +56,6 @@ model CommonParameters { @header clientVersion?: string; } -// highlight-end ``` In this example: @@ -71,7 +69,7 @@ Now that we have defined our common parameters model, let's reuse it across mult ### Example: Reusing Common Parameters in Operations -```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" +```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" ins={44,50,59,71,90} import "@typespec/http"; using Http; @@ -115,14 +113,12 @@ model CommonParameters { @route("/pets") namespace Pets { @get - // highlight-next-line op listPets(...CommonParameters): { @statusCode statusCode: 200; @body pets: Pet[]; }; @get - // highlight-next-line op getPet(@path petId: int32, ...CommonParameters): { @statusCode statusCode: 200; @body pet: Pet; @@ -132,7 +128,6 @@ namespace Pets { }; @post - // highlight-next-line op createPet(@body pet: Pet, ...CommonParameters): { @statusCode statusCode: 201; @body newPet: Pet; @@ -145,7 +140,6 @@ namespace Pets { }; @put - // highlight-next-line op updatePet(@path petId: int32, @body pet: Pet, ...CommonParameters): | { @statusCode statusCode: 200; @@ -165,7 +159,6 @@ namespace Pets { }; @delete - // highlight-next-line op deletePet(@path petId: int32, ...CommonParameters): { @statusCode statusCode: 204; }; @@ -200,7 +193,7 @@ In this example: Let's take a closer look at how the common parameters model with the `spread` operator is represented in the generated OpenAPI specification by looking at the `deletePet` operation: -```yaml +```yaml ins={14-16,28-45} #### Generated OpenAPI Specification: paths: @@ -214,11 +207,9 @@ paths: schema: type: integer format: int32 - // highlight-start - $ref: "#/components/parameters/CommonParameters.requestID" - $ref: "#/components/parameters/CommonParameters.locale" - $ref: "#/components/parameters/CommonParameters.clientVersion" - // highlight-end responses: "204": description: "There is no content to send for this request, but the headers may be useful." @@ -230,7 +221,6 @@ paths: $ref: "#/components/schemas/NotFoundError" components: parameters: - // highlight-start CommonParameters.clientVersion: name: client-version in: header @@ -249,7 +239,6 @@ components: required: true schema: type: string - // highlight-end schemas: NotFoundError: type: object diff --git a/website/src/content/docs/docs/getting-started/getting-started-rest/05-authentication.md b/website/src/content/docs/docs/getting-started/getting-started-rest/05-authentication.md index f1937fb8798..414a17715b7 100644 --- a/website/src/content/docs/docs/getting-started/getting-started-rest/05-authentication.md +++ b/website/src/content/docs/docs/getting-started/getting-started-rest/05-authentication.md @@ -18,7 +18,7 @@ Bearer authentication uses tokens for access control. The server generates a tok Let's update our existing operations by enforcing authentication using the `@useAuth` decorator.We'll add authentication to the operations that modify pet data, such as creating, updating, and deleting pets. We'll also add a new error model for unauthorized access. -```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" +```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" ins={59,72-75,79,90-92,103,107-109,126-130} import "@typespec/http"; using Http; @@ -77,7 +77,6 @@ namespace Pets { }; @post - // highlight-next-line @useAuth(BearerAuth) op createPet(@body pet: Pet, ...CommonParameters): | { @@ -91,16 +90,13 @@ namespace Pets { | { @statusCode statusCode: 400; @body error: ValidationError; - // highlight-start } | { @statusCode statusCode: 401; @body error: UnauthorizedError; - // highlight-end }; @put - // highlight-next-line @useAuth(BearerAuth) op updatePet(@path petId: int32, @body pet: Pet, ...CommonParameters): | { @@ -112,11 +108,8 @@ namespace Pets { @body error: ValidationError; } | { - // highlight-start @statusCode statusCode: 401; - @body error: UnauthorizedError; - // highlight-end } | { @statusCode statusCode: 404; @@ -128,15 +121,12 @@ namespace Pets { }; @delete - // highlight-next-line @useAuth(BearerAuth) op deletePet(@path petId: int32, ...CommonParameters): { @statusCode statusCode: 204; - // highlight-start } | { @statusCode statusCode: 401; @body error: UnauthorizedError; - // highlight-end }; } @@ -153,13 +143,11 @@ model ValidationError { details: string[]; } -// highlight-start @error model UnauthorizedError { code: "UNAUTHORIZED"; message: string; } -// highlight-end @error model InternalServerError { @@ -183,7 +171,7 @@ In this example: Let's take a closer look at how the `@useAuth` decorator affects the generated OpenAPI specification for the `deletePet` operation. -```yaml +```yaml ins={15-16,46-49} paths: /pets/{petId}: delete: @@ -198,10 +186,8 @@ paths: - $ref: "#/components/parameters/CommonParameters.requestID" - $ref: "#/components/parameters/CommonParameters.locale" - $ref: "#/components/parameters/CommonParameters.clientVersion" - // highlight-start security: - BearerAuth: [] - // highlight-end responses: "204": description: "There is no content to send for this request, but the headers may be useful." @@ -231,12 +217,10 @@ components: required: true schema: type: string - // highlight-start securitySchemes: BearerAuth: type: http scheme: bearer - // highlight-end schemas: NotFoundError: type: object diff --git a/website/src/content/docs/docs/getting-started/getting-started-rest/06-versioning.mdx b/website/src/content/docs/docs/getting-started/getting-started-rest/06-versioning.mdx index 41d61f9c0a3..c763585afc7 100644 --- a/website/src/content/docs/docs/getting-started/getting-started-rest/06-versioning.mdx +++ b/website/src/content/docs/docs/getting-started/getting-started-rest/06-versioning.mdx @@ -18,7 +18,7 @@ Before we can use the versioning decorators, we need to add the `@typespec/versi Add the `@typespec/versioning` library to your `package.json` file, in both the `peerDependencies` and `devDependencies` sections. Your updated `package.json` should look like this: -```json +```json ins={9,15} { "name": "typespec-petstore", "version": "0.1.0", @@ -27,14 +27,12 @@ Add the `@typespec/versioning` library to your `package.json` file, in both the "@typespec/compiler": "latest", "@typespec/http": "latest", "@typespec/openapi3": "latest", - // highlight-next-line "@typespec/versioning": "latest" }, "devDependencies": { "@typespec/compiler": "latest", "@typespec/http": "latest", "@typespec/openapi3": "latest", - // highlight-next-line "@typespec/versioning": "latest" }, "private": true @@ -57,27 +55,22 @@ The [`@versioned`](../../../libraries/versioning/reference/decorators/#@TypeSpec Let's define two versions of our API, `v1` and `v2`: -```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" +```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" ins={2,5,9,12-15} import "@typespec/http"; -// highlight-next-line import "@typespec/versioning"; using Http; -// highlight-next-line using Versioning; @service(#{ title: "Pet Store" }) @server("https://example.com", "Single server endpoint") -// highlight-next-line @versioned(Versions) namespace PetStore; -// highlight-start enum Versions { v1: "1.0", v2: "2.0", } -// highlight-end ``` In this example: @@ -115,7 +108,7 @@ The [`@added`](../../../libraries/versioning/reference/decorators/#@TypeSpec.Ver Let's add a `Toy` model that is only available in version 2 of the API: -```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" +```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" ins={38-42} import "@typespec/http"; import "@typespec/versioning"; @@ -153,13 +146,11 @@ enum petType { reptile: "reptile", } -// highlight-start @added(Versions.v2) model Toy { id: int32; name: string; } -// highlight-end ``` In this example: @@ -172,7 +163,7 @@ Let's define version-specific operations to manage toys for pets. These operatio ### Example: Adding Version-Specific Operations -```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" +```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" ins={125-180} import "@typespec/http"; import "@typespec/versioning"; @@ -297,7 +288,6 @@ namespace Pets { @body error: UnauthorizedError; }; - // highlight-start @route("{petId}/toys") namespace Toys { @added(Versions.v2) @@ -354,7 +344,6 @@ namespace Pets { @body error: UnauthorizedError; }; } - // highlight-end } @error diff --git a/website/src/content/docs/docs/getting-started/getting-started-rest/07-custom-response-models.md b/website/src/content/docs/docs/getting-started/getting-started-rest/07-custom-response-models.md index f26fadc8231..261aa80ee01 100644 --- a/website/src/content/docs/docs/getting-started/getting-started-rest/07-custom-response-models.md +++ b/website/src/content/docs/docs/getting-started/getting-started-rest/07-custom-response-models.md @@ -98,7 +98,7 @@ Now that we have defined our custom response models, let's use them in our API o ### Example: Applying Custom Response Models to Operations -```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" +```tsp title=main.tsp tryit="{"emit": ["@typespec/openapi3"]}" ins={55-97,102,105,108-112,116-121,125} import "@typespec/http"; import "@typespec/versioning"; @@ -153,7 +153,6 @@ model CommonParameters { clientVersion?: string; } -// highlight-start model PetListResponse { ...OkResponse; ...Body; @@ -197,44 +196,34 @@ model PetSuccessResponse { model PetNoContentResponse { ...NoContentResponse; } -// highlight-end @route("/pets") namespace Pets { @get - // highlight-next-line op listPets(...CommonParameters): PetListResponse; @get - // highlight-start op getPet(@path petId: int32, @header ifMatch?: string): PetResponse | PetNotFoundResponse; - // highlight-end @useAuth(BearerAuth) @post - // highlight-start op createPet(@body pet: Pet): | PetCreatedResponse | PetAcceptedResponse | PetErrorResponse | PetUnauthorizedResponse; - // highlight-end @useAuth(BearerAuth) @put - // highlight-start op updatePet(@path petId: int32, @body pet: Pet): | PetResponse | PetErrorResponse | PetUnauthorizedResponse | PetNotFoundResponse | InternalServerErrorResponse; - // highlight-end @useAuth(BearerAuth) @delete - // highlight-start op deletePet(@path petId: int32): PetNoContentResponse | PetUnauthorizedResponse; - // highlight-end @route("{petId}/toys") namespace Toys { diff --git a/website/src/content/docs/docs/handbook/cli.md b/website/src/content/docs/docs/handbook/cli.md index c68a7912be9..c6a56afd3c2 100644 --- a/website/src/content/docs/docs/handbook/cli.md +++ b/website/src/content/docs/docs/handbook/cli.md @@ -31,3 +31,15 @@ Options: s easier to read. [boolean] [default: true] --version Show version number [boolean] ``` + +## Environment Variables + +### `TYPESPEC_NPM_REGISTRY` + +Set the npm registry URL used by `tsp init` and `tsp install` when downloading the package manager and resolving package manifests. This is useful in corporate environments where a private npm registry is required. + +```bash +TYPESPEC_NPM_REGISTRY=https://my-corp-registry.example.com tsp init +``` + +If this variable is not set, TypeSpec defaults to `https://registry.npmjs.org`. diff --git a/website/src/content/docs/docs/handbook/formatter.md b/website/src/content/docs/docs/handbook/formatter.md index c82833f1fbb..748795ac1e3 100644 --- a/website/src/content/docs/docs/handbook/formatter.md +++ b/website/src/content/docs/docs/handbook/formatter.md @@ -44,10 +44,10 @@ For VS Code to respect the TypeSpec standard style set the following options sty ```json title=.vscode/settings.json { - ["typespec"]: { + "[typespec]": { "editor.detectIndentation": false, "editor.insertSpaces": true, - "editor.tabSize": 2, + "editor.tabSize": 2 } } ``` diff --git a/website/src/content/docs/docs/language-basics/access-modifiers.md b/website/src/content/docs/docs/language-basics/access-modifiers.md new file mode 100644 index 00000000000..5b04523219d --- /dev/null +++ b/website/src/content/docs/docs/language-basics/access-modifiers.md @@ -0,0 +1,122 @@ +--- +id: access-modifiers +title: Access Modifiers +description: "Language basics - controlling the visibility of declarations across libraries" +llmstxt: true +--- + +Access modifiers control which declarations in a TypeSpec library are accessible to consumers of that library. They allow library authors to distinguish between the public API surface and internal implementation details. + +:::caution +Access modifiers are an **experimental feature** and may change or be removed in a future release. The compiler will emit a warning when access modifiers are used. +::: + +## The `internal` modifier + +The `internal` modifier restricts a declaration so that it can only be accessed within the library or project where it is defined. Consumers of the library cannot reference internal declarations. + +```typespec +internal model MyInternalModel { + secret: string; +} + +model MyPublicModel { + // OK: same library can reference internal models + details: MyInternalModel; +} +``` + +### Supported declarations + +The `internal` modifier can be applied to the following declaration types: + +| Declaration | Example | +| ----------- | ---------------------------------- | +| `model` | `internal model Example {}` | +| `scalar` | `internal scalar Example;` | +| `interface` | `internal interface Example {}` | +| `union` | `internal union Example {}` | +| `op` | `internal op example(): void;` | +| `enum` | `internal enum Example {}` | +| `alias` | `internal alias Example = string;` | +| `const` | `internal const example = 1;` | + +:::note +The `internal` modifier **cannot** be applied to `namespace` declarations. +::: + +### Access rules + +The `internal` modifier is a property of the _symbol_ (the name that refers to a type), not a property of the type itself. The compiler prevents code in other packages from _referencing_ an internal symbol by name, but it does not prevent the underlying type from being used indirectly. A public declaration within the same package can freely reference an internal declaration, and the resulting type will be accessible to consumers through the public declaration. + +When a declaration is marked `internal`, the compiler enforces the following rules: + +- **Same library or project**: Code within the same library (or the same project, if not in a library) can reference internal declarations normally. +- **Different library**: Code in a different library that tries to reference an internal declaration by name will receive an error. + +```typespec title="my-lib/main.tsp" +namespace MyLib; + +internal model SecretHelper { + key: string; +} + +model PublicApi { + data: SecretHelper; // ✅ OK: same library +} + +// ✅ OK: a public alias can reference an internal symbol within the same package. +// Consumers can use `ExposedHelper`, even though it refers to the same type as `SecretHelper`. +alias ExposedHelper = SecretHelper; +``` + +```typespec title="consumer/main.tsp" +import "my-lib"; + +model Consumer { + helper: MyLib.SecretHelper; // ❌ Error: SecretHelper is internal + data: MyLib.PublicApi; // ✅ OK: PublicApi is public (even though it references SecretHelper) + exposed: MyLib.ExposedHelper; // ✅ OK: ExposedHelper is a public alias +} +``` + +The error message for a direct reference to an internal symbol will read: + +> Symbol 'SecretHelper' is internal and can only be accessed from within its declaring package. + +### Combining with `extern` + +The `internal` modifier can be combined with the `extern` modifier on decorator declarations to create internal decorator signatures: + +```typespec +internal extern dec myInternalDecorator(target: unknown); +``` + +### Suppressing the experimental warning + +Since access modifiers are currently experimental, using `internal` will emit a warning. You can suppress this warning with a `#suppress` directive: + +```typespec +#suppress "experimental-feature" +internal model MyInternalModel {} +``` + +## Why not `namespace`? + +The `internal` modifier is not supported on namespaces because namespaces in TypeSpec are **open and merged** across files. A namespace declared in one file can be extended in another file — potentially across library boundaries. Applying `internal` to a namespace would create ambiguity about which parts of the namespace are internal and which are public. Instead, mark individual declarations within a namespace as `internal`. + +```typespec +namespace MyLib; + +internal model InternalHelper {} // ✅ Mark individual declarations +model PublicApi {} +``` + +## Relationship to visibility + +The `internal` access modifier is distinct from TypeSpec's [visibility](./visibility.md) system: + +- **Access modifiers** (`internal`) control which _declarations_ (models, operations, etc.) can be referenced across library boundaries. They are enforced at compile time. +- **Visibility** (`@visibility`, `@removeVisibility`) controls which _model properties_ appear in different API operation contexts (e.g., create vs. read). It is a metadata system used by emitters to generate different views of a model. + +These are complementary features — you can use both on the same types. For example, you might have a public model whose properties have different visibility across operations, or an internal model that is only used within your library's implementation. diff --git a/website/src/content/docs/docs/language-basics/functions.md b/website/src/content/docs/docs/language-basics/functions.md new file mode 100644 index 00000000000..3243acfd3e3 --- /dev/null +++ b/website/src/content/docs/docs/language-basics/functions.md @@ -0,0 +1,313 @@ +--- +id: functions +title: Functions +--- + +:::warning +Functions are an experimental TypeSpec feature. The API and behavior of functions may reasonably be expected to change in +future releases as we gather feedback. If you choose to use functions in your TypeSpec libraries and programs, please be +aware that you may need to make adjustments to your code when updating to new versions of TypeSpec. Declaring a function +will yield a warning (you may suppress the warning with `#suppress "experimental-feature"`). +::: + +Functions in TypeSpec allow library developers to compute and return types or values based on their inputs. Compared to +[decorators](./decorators.md), functions provide an input-output based approach to creating type or value instances, +offering more flexibility than decorators for creating new types dynamically. Functions enable complex type +manipulation, filtering, and transformation. + +Functions are declared using the `fn` keyword (with the required `extern` modifier, like decorators) and are backed by +JavaScript implementations. When a TypeSpec program calls a function, the corresponding JavaScript function is invoked +with the provided arguments, and the result is returned as either a Type or a Value depending on the function's +declaration. + +## Declaring functions + +Functions are declared using the `extern fn` syntax followed by a name, parameter list, optional return type constraint, +and semicolon: + +```typespec +extern fn functionName(param1: Type, param2: valueof string): ReturnType; +``` + +Here are some examples of function declarations: + +```typespec +// No arguments, returns a type (default return constraint is 'unknown') +extern fn createDefaultModel(); + +// Takes a string type, returns a type +extern fn transformModel(input: string); + +// Takes a string value, returns a type +extern fn createFromValue(name: valueof string); + +// Returns a value instead of a type +extern fn getDefaultName(): valueof string; + +// Takes and returns values +extern fn processFilter(filter: valueof Filter): valueof Filter; +``` + +## Calling functions + +Functions are called using standard function call syntax with parentheses. They can be used in type expressions, aliases, +and anywhere a type or value is expected: + +```typespec +// Call a function in an alias +alias ProcessedModel = transformModel("input"); + +// Call a function for a default value +model Example { + name: string = getDefaultName(); +} + +// Use in template constraints +alias Filtered = applyFilter(T, F); +``` + +## Return types and constraints + +Functions can return either types or values, controlled by the return type constraint: + +- **No return type specified**: Returns a `Type` (implicitly constrained to `unknown`) +- **`valueof SomeType`**: Returns a value of the specified type +- **Mixed constraints**: `Type | valueof Type` allows returning either types or values + +```typespec +// Returns a type +extern fn makeModel(): Model; + +// Returns a string value +extern fn getName(): valueof string; + +// Can return either a type or value +extern fn flexible(): unknown | (valueof unknown); +``` + +:::note +A function call does not always evaluate to its return type. The function call may evaluate to any _subtype_ +of the return type constraint (any type or value that is _assignable_ to the constraint). For example, a function that +returns `Reflection.Model` may actually evaluate to any model. A function that returns `Foo` where `Foo` is a model may +evaluate to any model that is assignable to `Foo`. +::: + +## Parameter types + +Function parameters follow the same rules as decorator parameters: + +- **Type parameters**: Accept TypeScript types (e.g., `param: string`) +- **Value parameters**: Accept values using `valueof` (e.g., `param: valueof string`) +- **Mixed parameters**: Can accept both types and values with union syntax + +```typespec +extern fn process( + model: Model, // Type parameter + name: valueof string, // Value parameter + optional?: string, // Optional type parameter + ...rest: valueof string[] // Rest parameter with values +); +``` + +## Practical examples + +### Type transformation + +Functions may be used to transform types in arbitrary ways _without_ modifying an existing type instance. In the +following example, we declare a function `applyVisibility` that could be used to transform an input Model into an +output Model based on a `VisibilityFilter` object. We use a template alias to instantiate the new instance, because +templates _cache_ their instances and always return the same type for the same template arguments. + +```typespec +// Transform a model based on a filter +extern fn applyVisibility(input: Model, visibility: valueof VisibilityFilter): Model; + +const READ_FILTER: VisibilityFilter = #{ any: #[Public] }; + +// Using a template to call a function can be beneficial because templates cache +// their instances. A function _never_ caches its results, so each time `applyVisibility` +// is called, it will run the underlying JavaScript function. By using a template to call +// the function, it ensures that the function is only called once per unique instance +// of the template. +alias Read = applyVisibility(M, READ_FILTER); +``` + +### Value computation + +Functions can also be used to extract complex logic. The following example shows how a function might be used to compute +a default value for a given type of field. The external function can have arbitrarily complex JavaScript logic, so it +can utilize any method of computing the result value that it deems appropriate. + +```typespec +// Compute a default value using some external logic +extern fn computeDefault(fieldType: string): valueof unknown; + +model Config { + timeout: int32 = computeDefault("timeout"); +} +``` + +### Accepting options objects + +You may find it useful to accept an "options" object as a parameter to a function. In such cases, it's a good idea to +define a model for the options structure, to provide better type safety and documentation for the expected options. You +can then use `valueof` to accept an instance of the options model as an argument to the function call. + +```typespec +/** Options for the `createDerivedModel` function. */ +model CreateDerivedModelOptions { + /** + * If set, overrides the name of the derived model. + */ + name?: string; +} + +/** + * Creates a new model derived from the input model, with some optional modifications. + * + * @param m the input model to derive from + * @param options optional parameters to control how the model is derived + * @returns a new model derived from `m` with the specified options applied + */ +extern fn createDerivedModel( + m: Reflection.Model, + options?: valueof CreateDerivedModelOptions +): Reflection.Model; + +// Example usage: +model BaseModel { + id: int32; +} + +alias DefaultDerived = createDerivedModel(BaseModel); +alias CustomDerived = createDerivedModel(BaseModel, #{ name: "CustomName" }); +``` + +## Function _types_ + +A function itself is a _value_, and can be assigned to a constant: + +```tsp +extern fn example(): void; + +// A function is a value. +const f = example; +``` + +A function cannot be assigned to an _alias_ (though the _result of calling a function_ can, if the function evaluates to a type): + +```tsp +extern fn example(): unknown; + +// OK -- the function is a value +const f = example; + +// Error +alias F = example; +// ~~~~~~~ > A value cannot be used as a type. + +// OK -- the result of calling `example` is a type. +alias T = example(); +``` + +As values, functions have types: + +```tsp +extern fn example(v: valueof string): valueof string; + +// `Example` is equivalent to `fn (v: valueof string) => valueof string` +alias Example = typeof example; + +const f: fn(v: valueof string) => valueof string = f; +``` + +### Function type syntax + +A function type is written with the 'fn' keyword, followed by a parenthesized list of parameters, and an optional return type annotation. The parameters are like decorator parameters, and consist of a name, optional `?` indicating that the parameter is optional, and a type constraint (':' followed by a type constraint). The return type annotation uses the '=>' "double-arrow" sigil followed by a constraint type. Like with a function declaration, if the return type is not specified, it is implicitly `unknown`. + +Here are some example function types: + +- `fn()`: a function that requires no arguments and returns any type (`unknown`). +- `fn() => valueof unknown`: a function that requires no arguments and returns any _value_. +- `fn() => unknown | valueof unknown`: a function that requires no arguments and returns any entity (type or value). +- `fn(x: valueof string) => valueof string`: a function that requires one string value argument and returns a string value. +- `fn(x?: valueof string) => valueof int32`: a function that _optionally_ accepts one string value argument and returns an `int32` value. +- `fn(x: valueof string, ...rest: valueof string[]) => valueof boolean`: a function that requires at least one string value argument, accepts an arbitrary number of string value arguments, and returns a boolean value. +- `fn(m: Reflection.Model) => void`: a function that requires one argument that is a model type and returns `void`. + +### Function type assignability + +Functions may be assigned to any function type that is compatible with its call signature. In general, a function `A` is assignable to another function `B` if the arguments that can be passed to `B` are _guaranteed_ to be valid arguments for `A`, and the return type of `A` is a valid return type for `B`. + +Compared to TypeScript function types, TypeSpec function types are a little bit stricter: a rest parameter cannot satisfy a required parameter (`fn (x: valueof string)` is not assignable to `fn (...args: valueof string[])`), but it can satisfy an _optional_ parameter (`fn (x?: valueof string)` is assignable to `fn(...args: valueof string[])`). + +Here are some example functions and whether they are assignable to each other: + +| Function A | Function B | Is A assignable to B? | Explanation | +| ---------------------------------------- | ---------------------------------------- | --------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | +| `fn () => valueof string` | `fn () => valueof unknown` | ✅ Yes | `valueof string` is assignable to `valueof unknown`. | +| `fn () => valueof unknown` | `fn () => valueof string` | ❌ No | `valueof unknown` is not assignable to `valueof string`. | +| `fn (x: valueof string) => void` | `fn (x: valueof unknown) => void` | ❌ No | `valueof unknown` is not assignable to `valueof string` (Function A _requires_ a string, but Function B may be called with any value). | +| `fn (x: valueof unknown) => void` | `fn (x: valueof string) => void` | ✅ Yes | `valueof string` is assignable to `valueof unknown` (Function A may be called with any value, so it can also be called with a string). | +| `fn (x?: valueof string) => void` | `fn (...args: valueof string[]) => void` | ✅ Yes | Function A _optionally_ takes one string argument, and Function B can be called with any number of string arguments | +| `fn (...args: valueof string[]) => void` | `fn (x?: valueof string) => void` | ✅ Yes | Function A can be called with any number of string arguments, and Function B may be called with one string argument or none. | +| `fn (x: valueof string) => void` | `fn (...args: valueof string[]) => void` | ❌ No | Function A _requires_ one string argument, but Function B may be called with zero arguments. | +| `fn (...args: valueof string[]) => void` | `fn (x: valueof string) => void` | ✅ Yes | Function A can be called with any number of string arguments, and Function B _requires_ one string argument. | + +### When to use function types + +Use a function type to constrain a value to be a function with a specific call signature. This may be useful for decorators that accept functions as arguments, or for defining template arguments that accept functions. Ordinarily, you will not need to use function types unless you are developing a library that makes use of higher-order functions (i.e., functions or decorators that accept other functions as arguments). + +Examples: + +```tsp +/** + * Calls `f` with the given model. + * + * @param f An function that accepts the model. + */ +extern dec apply(target: Reflection.Model, f: valueof fn(m: Reflection.Model) => void); + +/** + * Maps over an array using the provided function. + * + * @param arr The array of values to map over. + * @param f A function that maps each item in `arr` to a new value. + * @returns an array of the results of calling `f` on each item in `arr`. + */ +extern fn map(arr: valueof unknown[], f: valueof fn(item: valueof unknown) => valueof unknown); + +/** + * A model that accepts a function to create a default value. + * + * Template parameters can be function values as well, in the same way that they can be string + * or numeric values, and function typed parameters can have function values as defaults. + */ +model MyTemplate< + Props extends Reflection.Model, + MakeId extends valueof fn(props: Reflection.Model) => valueof string = makeIdDefault +> { + id: string = MakeId(Props); + ...Props; +} + +/** A default function to create IDs for `MyTemplate`. */ +extern fn makeIdDefault(props: Reflection.Model): valueof string; +``` + +Note the use of `valueof`. Without `valueof`, the parameter `f` would be a type parameter, and would only accept a compatible function _type_. By using `valueof`, the parameter `f` will accept a function _value_ (a callable function) that is compatible with the specified signature. + +## Implementation notes + +- Function results are _never_ cached, unlike template instances. Calling the same function with the same arguments + multiple times will result in multiple function calls. +- Functions _may_ have side-effects when called; they are not guaranteed to be "pure" functions. Be careful when writing + functions to avoid manipulating the type graph or storing undesirable state (though there is no rule that will prevent + you from doing so). +- Functions are evaluated in the compiler. If you write or utilize computationally intense functions, it will impact + compilation times and may affect language server performance. + +## Implementing functions in your library + +See [Extending TypeSpec - Functions](../extending-typespec/implement-functions.md) for more information about how to add +a function to your TypeSpec library. diff --git a/website/src/content/docs/docs/libraries/http/reference/data-types.md b/website/src/content/docs/docs/libraries/http/reference/data-types.md index ca606b378d2..bd4681e0542 100644 --- a/website/src/content/docs/docs/libraries/http/reference/data-types.md +++ b/website/src/content/docs/docs/libraries/http/reference/data-types.md @@ -442,96 +442,6 @@ model TypeSpec.Http.LocationHeader | -------- | -------- | --------------------------------------------------------------------------------------------------- | | location | `string` | The Location header contains the URL where the status of the long running operation can be checked. | -### `MergePatchCreateOrUpdate` {#TypeSpec.Http.MergePatchCreateOrUpdate} - -Create a MergePatch Request body for creating or updating the given resource Model. -The MergePatch request created by this template provides a TypeSpec description of a -JSON MergePatch request that can successfully create or update the given resource. -The transformation follows the definition of JSON MergePatch requests in -rfc 7396: https://www.rfc-editor.org/rfc/rfc7396, -applying the merge-patch transform recursively to keyed types in the resource Model. - -Using this template in a PATCH request body overrides the `implicitOptionality` -setting for PATCH operations and sets `application/merge-patch+json` as the request -content-type. - -```typespec -model TypeSpec.Http.MergePatchCreateOrUpdate -``` - -#### Template Parameters - -| Name | Description | -| ------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| T | The type of the resource to create a MergePatch update request body for. | -| NameTemplate | A StringTemplate used to name any models created by applying
the merge-patch transform to the resource. The default name template is `{name}MergePatchCreateOrUpdate`,
for example, the merge patch transform of model `Widget` is named `WidgetMergePatchCreateOrUpdate`. | - -#### Examples - -```tsp -// An operation updating a 'Widget' using merge-patch -@patch op update(@body request: MergePatchCreateOrUpdate): Widget; -``` - -```tsp -// An operation updating a 'Widget' using merge-patch -@patch op update(@bodyRoot request: MergePatchCreateOrUpdate): Widget; -``` - -```tsp -// An operation updating a 'Widget' using merge-patch -@patch op update(...MergePatchCreateOrUpdate): Widget; -``` - -#### Properties - -None - -### `MergePatchUpdate` {#TypeSpec.Http.MergePatchUpdate} - -Create a MergePatch Request body for updating the given resource Model. -The MergePatch request created by this template provides a TypeSpec description of a -JSON MergePatch request that can successfully update the given resource. -The transformation follows the definition of JSON MergePatch requests in -rfc 7396: https://www.rfc-editor.org/rfc/rfc7396, -applying the merge-patch transform recursively to keyed types in the resource Model. - -Using this template in a PATCH request body overrides the `implicitOptionality` -setting for PATCH operations and sets `application/merge-patch+json` as the request -content-type. - -```typespec -model TypeSpec.Http.MergePatchUpdate -``` - -#### Template Parameters - -| Name | Description | -| ------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| T | The type of the resource to create a MergePatch update request body for. | -| NameTemplate | A StringTemplate used to name any models created by applying
the merge-patch transform to the resource. The default name template is `{name}MergePatchUpdate`,
for example, the merge patch transform of model `Widget` is named `WidgetMergePatchUpdate`. | - -#### Examples - -```tsp -// An operation updating a 'Widget' using merge-patch -@patch op update(@body request: MergePatchUpdate): Widget; -``` - -```tsp -// An operation updating a 'Widget' using merge-patch -@patch op update(@bodyRoot request: MergePatchUpdate): Widget; -``` - -```tsp -// An operation updating a 'Widget' using merge-patch -@patch op update(...MergePatchUpdate): Widget; -``` - -#### Properties - -None - ### `MovedResponse` {#TypeSpec.Http.MovedResponse} The URL of the requested resource has been changed permanently. The new URL is given in the response. diff --git a/website/src/content/docs/docs/libraries/http/reference/index.mdx b/website/src/content/docs/docs/libraries/http/reference/index.mdx index b9915ad2783..b947edff0a5 100644 --- a/website/src/content/docs/docs/libraries/http/reference/index.mdx +++ b/website/src/content/docs/docs/libraries/http/reference/index.mdx @@ -73,8 +73,6 @@ npm install --save-peer @typespec/http - [`ImplicitFlow`](./data-types.md#TypeSpec.Http.ImplicitFlow) - [`Link`](./data-types.md#TypeSpec.Http.Link) - [`LocationHeader`](./data-types.md#TypeSpec.Http.LocationHeader) -- [`MergePatchCreateOrUpdate`](./data-types.md#TypeSpec.Http.MergePatchCreateOrUpdate) -- [`MergePatchUpdate`](./data-types.md#TypeSpec.Http.MergePatchUpdate) - [`MovedResponse`](./data-types.md#TypeSpec.Http.MovedResponse) - [`NoAuth`](./data-types.md#TypeSpec.Http.NoAuth) - [`NoContentResponse`](./data-types.md#TypeSpec.Http.NoContentResponse) diff --git a/website/src/content/docs/docs/libraries/openapi/reference/data-types.md b/website/src/content/docs/docs/libraries/openapi/reference/data-types.md index cb03c688b29..b6e89310e0c 100644 --- a/website/src/content/docs/docs/libraries/openapi/reference/data-types.md +++ b/website/src/content/docs/docs/libraries/openapi/reference/data-types.md @@ -85,8 +85,9 @@ model TypeSpec.OpenAPI.TagMetadata #### Properties -| Name | Type | Description | -| ------------- | --------------------------------------------------------------- | ---------------------------------------- | -| description? | `string` | A description of the API. | -| externalDocs? | [`ExternalDocs`](./data-types.md#TypeSpec.OpenAPI.ExternalDocs) | An external Docs information of the API. | -| | `unknown` | Additional properties | +| Name | Type | Description | +| ------------- | --------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | +| description? | `string` | A description of the API. | +| externalDocs? | [`ExternalDocs`](./data-types.md#TypeSpec.OpenAPI.ExternalDocs) | An external Docs information of the API. | +| parent? | `string` | The name of a tag that this tag is nested under. Only supported in OpenAPI 3.2. For 3.0 and 3.1, this will be converted to `x-parent`. | +| | `unknown` | Additional properties | diff --git a/website/src/content/docs/docs/libraries/openapi/reference/decorators.md b/website/src/content/docs/docs/libraries/openapi/reference/decorators.md index cd223411b0d..23f9a426b8c 100644 --- a/website/src/content/docs/docs/libraries/openapi/reference/decorators.md +++ b/website/src/content/docs/docs/libraries/openapi/reference/decorators.md @@ -165,6 +165,7 @@ Specify OpenAPI additional information. `x-custom`: "string", } ) +@tagMetadata("Child Tag", #{ description: "Child tag description", parent: "Tag Name" }) namespace PetStore { } diff --git a/website/src/content/docs/docs/libraries/rest/reference/decorators.md b/website/src/content/docs/docs/libraries/rest/reference/decorators.md index 62a7179c5e1..da4c3f85567 100644 --- a/website/src/content/docs/docs/libraries/rest/reference/decorators.md +++ b/website/src/content/docs/docs/libraries/rest/reference/decorators.md @@ -30,13 +30,17 @@ Specify this operation is an action. (Scoped to a resource item /pets/{petId}/my Defines the separator string that is inserted before the action name in auto-generated routes for actions. +When applied to a namespace, the separator applies to all action operations in that namespace and its sub-namespaces. +When applied to an interface, the separator applies to all action operations in that interface and overrides any namespace-level separator. +When applied to an operation, the separator applies only to that operation and overrides any interface or namespace-level separator. + ```typespec @TypeSpec.Rest.actionSeparator(seperator: valueof "/" | ":" | "/:") ``` #### Target -`Model | ModelProperty | Operation` +`Operation | Interface | Namespace` #### Parameters diff --git a/website/src/content/docs/docs/libraries/versioning/reference/decorators.md b/website/src/content/docs/docs/libraries/versioning/reference/decorators.md index fd2cd1d88c9..e8baec6aa57 100644 --- a/website/src/content/docs/docs/libraries/versioning/reference/decorators.md +++ b/website/src/content/docs/docs/libraries/versioning/reference/decorators.md @@ -164,7 +164,12 @@ op newName(): void; ### `@returnTypeChangedFrom` {#@TypeSpec.Versioning.returnTypeChangedFrom} -Identifies when the target type changed. +Declares that the return type of an operation has changed starting at a given version, +while keeping earlier versions consistent with the previous return type. + +This decorator is used to track return type changes across API versions. When applied, +the operation will return `oldType` in versions before the specified `version`, +and the current return type definition in the specified version and later. ```typespec @TypeSpec.Versioning.returnTypeChangedFrom(version: EnumMember, oldType: unknown) @@ -176,14 +181,28 @@ Identifies when the target type changed. #### Parameters -| Name | Type | Description | -| ------- | ------------ | -------------------------------------------- | -| version | `EnumMember` | The version that the target type changed in. | -| oldType | `unknown` | The previous type of the target. | +| Name | Type | Description | +| ------- | ------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| version | `EnumMember` | The version when the return type change takes effect. The new return type applies
from this version onwards, while the old return type applies to earlier versions. | +| oldType | `unknown` | The previous return type used before the specified version. | + +#### Examples + +```tsp +// In v1: returns a string +// In v2+: returns an int32 +@returnTypeChangedFrom(Versions.v2, string) +op getUserId(): int32; +``` ### `@typeChangedFrom` {#@TypeSpec.Versioning.typeChangedFrom} -Identifies when the target type changed. +Declares that the type of a model property has changed starting at a given version, +while keeping earlier versions consistent with the previous type. + +This decorator is used to track type changes across API versions. When applied, +the property will use `oldType` in versions before the specified `version`, +and the current type definition in the specified version and later. ```typespec @TypeSpec.Versioning.typeChangedFrom(version: EnumMember, oldType: unknown) @@ -195,10 +214,21 @@ Identifies when the target type changed. #### Parameters -| Name | Type | Description | -| ------- | ------------ | -------------------------------------------- | -| version | `EnumMember` | The version that the target type changed in. | -| oldType | `unknown` | The previous type of the target. | +| Name | Type | Description | +| ------- | ------------ | --------------------------------------------------------------------------------------------------------------------------------------------------- | +| version | `EnumMember` | The version when the type change takes effect. The new type applies
from this version onwards, while the old type applies to earlier versions. | +| oldType | `unknown` | The previous type used before the specified version. | + +#### Examples + +```tsp +model Foo { + // In v1: id is a string + // In v2+: id is an int32 + @typeChangedFrom(Versions.v2, string) + id: int32; +} +``` ### `@useDependency` {#@TypeSpec.Versioning.useDependency} diff --git a/website/src/content/docs/docs/libraries/xml/guide.md b/website/src/content/docs/docs/libraries/xml/guide.md deleted file mode 100644 index 5c246f567db..00000000000 --- a/website/src/content/docs/docs/libraries/xml/guide.md +++ /dev/null @@ -1,968 +0,0 @@ ---- -title: Guide ---- - -## Default encoding of scalars - -As in Json we have some [default handling](https://typespec.io/docs/libraries/http/encoding#bytes) of the common scalars like `utcDateTime` - -| Scalar Type | Default Encoding | Encoding name | -| ---------------- | ----------------- | --------------------------------------- | -| `utcDateTime` | `xs:dateTime` | `TypeSpec.Xml.Encoding.xmlDateTime` | -| `offsetDateTime` | `xs:dateTime` | `TypeSpec.Xml.Encoding.xmlDateTime` | -| `plainDate` | `xs:date` | `TypeSpec.Xml.Encoding.xmlDate` | -| `plainTime` | `xs:time` | `TypeSpec.Xml.Encoding.xmlTime` | -| `duration` | `xs:duration` | `TypeSpec.Xml.Encoding.xmlDuration` | -| `bytes` | `xs:base64Binary` | `TypeSpec.Xml.Encoding.xmlBase64Binary` | - -## Examples - -### 1. Array of primitive types - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TypeSpecXmlOpenAPI3
- -```tsp -@encodedName("application/xml", "XmlPet") -model Pet { - @Xml.unwrapped - tags: string[]; -} -``` - - - -```xml - - abc - def - -``` - - - -```yaml -Pet: - type: "object" - properties: - tags: - type: "array" - items: - type: string - xml: - name: tags - xml: - name: "XmlPet" -``` - -
- -```tsp -@encodedName("application/xml", "XmlPet") -model Pet { - @encodedName("application/xml", "ItemsTags") - tags: string[]; -} -``` - - - -```xml - - - abc - def - - -``` - - - -```yaml -Pet: - type: "object" - properties: - tags: - type: "array" - xml: - name: "ItemsTags" - wrapped: true - items: - type: string - xml: - name: string - xml: - name: "XmlPet" -``` - -
- -```tsp -@encodedName("application/xml", "ItemsName") -scalar tag extends string; - -@encodedName("application/xml", "XmlPet") -model Pet { - @Xml.unwrapped - tags: tag[]; -} -``` - - - -```xml - - abc - def - -``` - - - -```yaml -Pet: - type: "object" - properties: - tags: - type: "array" - items: - type: string - xml: - name: tags - xml: - name: "XmlPet" -``` - -
- -```tsp -@encodedName("application/xml", "ItemsName") -scalar tag extends string; - -@encodedName("application/xml", "XmlPet") -model Pet { - @encodedName("application/xml", "ItemsTags") - tags: tag[]; -} -``` - - - -```xml - - - abc - def - - -``` - - - -```yaml -Pet: - type: "object" - properties: - tags: - type: "array" - xml: - name: "ItemsTags" - wrapped: true - items: - type: string - xml: - name: ItemsName - xml: - name: "XmlPet" -``` - -
- -### 2. Complex array types - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TypeSpecXmlOpenAPI3
- -```tsp -@encodedName("application/xml", "XmlPet") -model Pet { - @Xml.unwrapped - tags: Tag[]; -} - -@encodedName("application/xml", "XmlTag") -model Tag { - name: string; -} -``` - - - -```xml - - - string - - -``` - - - -```yaml -Tag: - type: "object" - properties: - name: - type: "string" - xml: - name: "XmlTag" -Pet: - type: "object" - properties: - tags: - type: "array" - items: - allOf: - - $ref: "#/definitions/Tag" - xml: - name: tags - xml: - name: "XmlPet" -``` - -
- -```tsp -@encodedName("application/xml", "XmlPet") -model Pet { - tags: Tag[]; -} - -@encodedName("application/xml", "XmlTag") -model Tag { - name: string; -} -``` - - - -```xml - - - string - - -``` - - - -```yaml -Tag: - type: "object" - properties: - name: - type: "string" - xml: - name: "XmlTag" -Pet: - type: object - properties: - tags: - type: array - items: - allOf: - - $ref: "#/components/schemas/Tag" - xml: - name: XmlTag - xml: - wrapped: true - xml: - name: XmlPet -``` - -
- -```tsp -@encodedName("application/xml", "XmlPet") -model Pet { - @encodedName("application/xml", "ItemsTag") - @Xml.unwrapped - tags: Tag[]; -} - -@encodedName("application/xml", "XmlTag") -model Tag { - name: string; -} -``` - - - -```xml - - - string - - -``` - - - -```yaml -Tag: - type: "object" - properties: - name: - type: "string" - xml: - name: "XmlTag" -Pet: - type: "object" - properties: - tags: - type: "array" - items: - allOf: - - $ref: "#/definitions/Tag" - xml: - name: ItemsTag - xml: - name: "XmlPet" -``` - -
- -```tsp -@encodedName("application/xml", "XmlPet") -model Pet { - @encodedName("application/xml", "ItemsTags") - tags: Tag[]; -} - -@encodedName("application/xml", "XmlTag") -model Tag { - name: string; -} -``` - - - -```xml - - - - string - - - -``` - - - -```yaml -Tag: - type: "object" - properties: - name: - type: "string" - xml: - name: "XmlTag" -Pet: - type: "object" - properties: - tags: - type: "array" - xml: - name: "ItemsTags" - wrapped: true - items: - allOf: - - $ref: "#/definitions/Tag" - xml: - name: XmlTag - xml: - name: "XmlPet" -``` - -
- -### 3. Nested models - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TypeSpecXmlOpenAPI3
- -```tsp -model Book { - author: Author; -} - -model Author { - name: string; -} -``` - - - -```xml - - - string - - -``` - - - -```yaml -Book: - type: object - properties: - author: - $ref: "#/components/schemas/Author" -Author: - type: object - properties: - name: - type: string -``` - -
- -```tsp -model Book { - author: Author; -} - -@encodedName("application/xml", "XmlAuthor") -model Author { - name: string; -} -``` - - - -```xml - - - string - - -``` - - - -```yaml -Book: - type: object - properties: - author: - allOf: - - $ref: "#/components/schemas/Author" - xml: - name: "author" # Here we have to redefine this name otherwise in OpenAPI semantic the `XmlAuthor` name would be used -Author: - type: object - properties: - name: - type: string - xml: - name: "XmlAuthor" -``` - -
- -```tsp -model Book { - @encodedName("application/xml", "xml-author") - author: Author; -} - -model Author { - name: string; -} -``` - - - -```xml - - - string - - -``` - - - -```yaml -Book: - type: object - properties: - author: - allOf: - - $ref: "#/components/schemas/Author" - xml: - name: "xml-author" -Author: - type: object - properties: - name: - type: string -``` - -
- -### 4. Attributes - - - - - - - - - - - - - - - - - -
TypeSpecXmlOpenAPI3
- -```tsp -model Book { - @Xml.attribute - id: integer; - - @Xml.name("xml-title") - title: string; - - author: string; -} -``` - - - -```xml - - string - string - -``` - - - -```yaml -Book: - type: object - properties: - id: - type: integer - xml: - attribute: true - title: - type: string - xml: - name: "xml-title" - author: - type: string -``` - -
- -### 5. Namespace and prefix (inline form) - - - - - - - - - - - - - - - - - - - - - - - - -
TypeSpecXmlOpenAPI3
- -```tsp -@Xml.ns("http://example.com/schema", "smp") -model Book { - id: integer; - title: string; - author: string; -} -``` - - - -```xml - - 0 - string - string - -``` - - - -```yaml -Book: - type: object - properties: - id: - type: integer - title: - type: string - author: - type: string - xml: - prefix: "smp" - namespace: "http://example.com/schema" -``` - -
- -```tsp -@Xml.ns("http://example.com/schema", "smp") -model Book { - id: integer; - - @Xml.ns("http://example.com/schema", "smp") - title: string; - - @Xml.ns("http://example.com/ns2", "ns2") - author: string; -} -``` - - - -```xml - - 0 - string - string - -``` - - - -```yaml -Book: - type: object - properties: - id: - type: integer - title: - type: string - xml: - prefix: "smp" - namespace: "http://example.com/schema" - author: - type: string - xml: - prefix: "ns2" - namespace: "http://example.com/ns2" - xml: - prefix: "smp" - namespace: "http://example.com/schema" -``` - -
- -### 6. Namespace and prefix (normalized form) - - - - - - - - - - - - - - - - - - - - - - - - -
TypeSpecXmlOpenAPI3
- -```tsp -@Xml.nsDeclarations -enum Namespaces { - smp: "http://example.com/schema", -} - -@Xml.ns(Namespaces.smp) -model Book { - id: integer; - title: string; - author: string; -} -``` - - - -```xml - - 0 - string - string - -``` - - - -```yaml -Book: - type: object - properties: - id: - type: integer - title: - type: string - author: - type: string - xml: - prefix: "smp" - namespace: "http://example.com/schema" -Namespaces: - type: string - enum: - - http://example.com/schema -``` - -
- -```tsp -@Xml.nsDeclarations -enum Namespaces { - smp: "http://example.com/schema", - ns2: "http://example.com/ns2", -} - -@Xml.ns(Namespaces.smp) -model Book { - id: integer; - - @Xml.ns(Namespaces.smp) - title: string; - - @Xml.ns(Namespaces.ns2) - author: string; -} -``` - - - -```xml - - 0 - string - string - -``` - - - -```yaml -Book: - type: object - properties: - id: - type: integer - title: - type: string - xml: - prefix: "smp" - namespace: "http://example.com/schema" - author: - type: string - xml: - prefix: "ns2" - namespace: "http://example.com/ns2" - xml: - prefix: "smp" - namespace: "http://example.com/schema" -Namespaces: - type: string - enum: - - http://example.com/schema - - http://example.com/ns2 -``` - -
- -### 6. Property setting the text of the node - - - - - - - - - - - - - - - - - -
TypeSpecXmlOpenAPI3
- -```tsp -model BlobName { - @Xml.attribute language: string; - @Xml.unwrapped content: string; -} -``` - - - -```xml - - ...content... - -``` - - - -```yaml -Book: - type: object - properties: - language: - type: string - xml: - attribute: true - content: - type: string -``` - -
diff --git a/website/src/content/docs/docs/libraries/xml/guide.mdx b/website/src/content/docs/docs/libraries/xml/guide.mdx new file mode 100644 index 00000000000..762c3200874 --- /dev/null +++ b/website/src/content/docs/docs/libraries/xml/guide.mdx @@ -0,0 +1,1508 @@ +--- +title: Guide +--- + +import { Tabs, TabItem } from "@astrojs/starlight/components"; + +## Default encoding of scalars + +As in JSON, there is some [default handling](https://typespec.io/docs/libraries/http/encoding#bytes) of the common scalars like `utcDateTime`: + +| Scalar Type | Default Encoding | Encoding name | +| ---------------- | ----------------- | --------------------------------------- | +| `utcDateTime` | `xs:dateTime` | `TypeSpec.Xml.Encoding.xmlDateTime` | +| `offsetDateTime` | `xs:dateTime` | `TypeSpec.Xml.Encoding.xmlDateTime` | +| `plainDate` | `xs:date` | `TypeSpec.Xml.Encoding.xmlDate` | +| `plainTime` | `xs:time` | `TypeSpec.Xml.Encoding.xmlTime` | +| `duration` | `xs:duration` | `TypeSpec.Xml.Encoding.xmlDuration` | +| `bytes` | `xs:base64Binary` | `TypeSpec.Xml.Encoding.xmlBase64Binary` | + +## 1. Primitive properties + +### 1.1 — Default serialization + +Properties of scalar types are serialized as child XML elements by default. + +```tsp +model Book { + id: integer; + title: string; + author: string; +} +``` + + + + +```xml + + 0 + The Great Gatsby + F. Scott Fitzgerald + +``` + + + + +```yaml +Book: + type: object + properties: + id: + type: integer + title: + type: string + author: + type: string +``` + + + + +### 1.2 — Renaming a property + +`@encodedName("application/xml", ...)` or `@Xml.name(...)` changes how a property name appears in the XML output without affecting the TypeSpec model name. + + + + +```tsp +model Book { + id: integer; + + @Xml.name("book-title") + title: string; + + author: string; +} +``` + + + + +```tsp +model Book { + id: integer; + + @encodedName("application/xml", "book-title") + title: string; + + author: string; +} +``` + + + + + + + +```xml + + 0 + The Great Gatsby + F. Scott Fitzgerald + +``` + + + + +```yaml +Book: + type: object + properties: + id: + type: integer + title: + type: string + xml: + name: "book-title" + author: + type: string +``` + + + + +### 1.3 — Renaming the model + +`@encodedName("application/xml", ...)` or `@Xml.name(...)` on a model changes the root element name in the XML output. + + + + +```tsp +@Xml.name("XmlBook") +model Book { + id: integer; + title: string; + author: string; +} +``` + + + + +```tsp +@encodedName("application/xml", "XmlBook") +model Book { + id: integer; + title: string; + author: string; +} +``` + + + + + + + +```xml + + 0 + Les Miserables + Victor Hugo + +``` + + + + +```yaml +Book: + type: object + properties: + id: + type: integer + title: + type: string + author: + type: string + xml: + name: "XmlBook" +``` + + + + +## 2. Nested models + +### 2.1 — Basic nested model + +A property referencing another model is serialized as a nested XML element using the property name. + +```tsp +model Book { + author: Person; +} + +model Person { + name: string; +} +``` + + + + +```xml + + + F. Scott Fitzgerald + + +``` + + + + +```yaml +Book: + type: object + properties: + author: + $ref: "#/components/schemas/Person" +Person: + type: object + properties: + name: + type: string +``` + + + + +### 2.2 — Nested model with custom XML name on the model + +When the referenced model has `@Xml.name` or `@encodedName`, the property name still takes precedence for the XML element name. + + + + +```tsp +model Book { + author: Person; +} + +@Xml.name("XmlPerson") +model Person { + name: string; +} +``` + + + + +```tsp +model Book { + author: Person; +} + +@encodedName("application/xml", "XmlPerson") +model Person { + name: string; +} +``` + + + + + + + +```xml + + + F. Scott Fitzgerald + + +``` + + + + +```yaml +Book: + type: object + properties: + author: + allOf: + - $ref: "#/components/schemas/Person" + xml: + name: "author" # Here we have to redefine this name otherwise in OpenAPI semantic the `XmlPerson` name would be used +Person: + type: object + properties: + name: + type: string + xml: + name: "XmlPerson" +``` + + + + +### 2.3 — Nested model with custom XML name on the property + +Using `@Xml.name` or `@encodedName` on the property overrides the element name for the nested model. + + + + +```tsp +model Book { + @Xml.name("xml-author") + author: Person; +} + +model Person { + name: string; +} +``` + + + + +```tsp +model Book { + @encodedName("application/xml", "xml-author") + author: Person; +} + +model Person { + name: string; +} +``` + + + + + + + +```xml + + + F. Scott Fitzgerald + + +``` + + + + +```yaml +Book: + type: object + properties: + author: + allOf: + - $ref: "#/components/schemas/Person" + xml: + name: "xml-author" +Person: + type: object + properties: + name: + type: string +``` + + + + +## 3. Array of primitive types + +### 3.1 — Wrapped primitive array (default) + +By default, an array property is wrapped in a container element named after the property. Each item uses the scalar type name as its element name. + +```tsp +model Book { + tags: string[]; +} +``` + + + + +```xml + + + fiction + classic + + +``` + + + + +```yaml +Book: + type: "object" + properties: + tags: + type: "array" + xml: + wrapped: true + items: + type: string + xml: + name: string +``` + + + + +### 3.2 — Unwrapped primitive array + +`@Xml.unwrapped` removes the wrapper element. Each item is serialized using the property name as its XML element name. + +```tsp +model Book { + @Xml.unwrapped + tags: string[]; +} +``` + + + + +```xml + + fiction + classic + +``` + + + + +```yaml +Book: + type: "object" + properties: + tags: + type: "array" + items: + type: string + xml: + name: tags +``` + + + + +### 3.3 — Wrapped primitive array with custom wrapper name + +Without `@Xml.unwrapped`, the array is wrapped in a container element. `@Xml.name` or `@encodedName` on the property customizes the wrapper element name. + + + + +```tsp +model Book { + @Xml.name("ItemsTags") + tags: string[]; +} +``` + + + + +```tsp +model Book { + @encodedName("application/xml", "ItemsTags") + tags: string[]; +} +``` + + + + + + + +```xml + + + fiction + classic + + +``` + + + + +```yaml +Book: + type: "object" + properties: + tags: + type: "array" + xml: + name: "ItemsTags" + wrapped: true + items: + type: string + xml: + name: string +``` + + + + +### 3.4 — Unwrapped primitive array with custom item name + +`@Xml.name` or `@encodedName` on the property controls the element name of each item when the array is unwrapped. + + + + +```tsp +model Book { + @Xml.name("tag") + @Xml.unwrapped + tags: string[]; +} +``` + + + + +```tsp +model Book { + @encodedName("application/xml", "tag") + @Xml.unwrapped + tags: string[]; +} +``` + + + + + + + +```xml + + fiction + classic + +``` + + + + +```yaml +Book: + type: "object" + properties: + tags: + type: "array" + items: + type: string + xml: + name: tag +``` + + + + +### 3.5 — Wrapped primitive array with custom wrapper and item names + +Both the wrapper element and each item element have custom names via `@Xml.name` or `@encodedName`. + + + + +```tsp +@Xml.name("ItemName") +scalar tag extends string; + +model Book { + @Xml.name("ItemsTags") + tags: tag[]; +} +``` + + + + +```tsp +@encodedName("application/xml", "ItemName") +scalar tag extends string; + +model Book { + @encodedName("application/xml", "ItemsTags") + tags: tag[]; +} +``` + + + + + + + +```xml + + + fiction + classic + + +``` + + + + +```yaml +Book: + type: "object" + properties: + tags: + type: "array" + xml: + name: "ItemsTags" + wrapped: true + items: + type: string + xml: + name: ItemName +``` + + + + +## 4. Array of complex types + +### 4.1 — Wrapped array of models (default) + +By default, an array of models is wrapped in a container element named after the property. Each item uses the model name as its element name. + +```tsp +model Store { + books: Book[]; +} + +model Book { + title: string; +} +``` + + + + +```xml + + + + The Great Gatsby + + + Les Miserables + + + +``` + + + + +```yaml +Book: + type: "object" + properties: + title: + type: "string" +Store: + type: "object" + properties: + books: + type: "array" + items: + $ref: "#/components/schemas/Book" + xml: + wrapped: true +``` + + + + +### 4.2 — Unwrapped array of models + +`@Xml.unwrapped` removes the wrapper element. Each item uses the property name as its element name. + +```tsp +model Store { + @Xml.unwrapped + books: Book[]; +} + +model Book { + title: string; +} +``` + + + + +```xml + + + The Great Gatsby + + + Les Miserables + + +``` + + + + +```yaml +Book: + type: "object" + properties: + title: + type: "string" +Store: + type: "object" + properties: + books: + type: "array" + items: + $ref: "#/components/schemas/Book" +``` + + + + +### 4.3 — Wrapped array of models with custom wrapper name + +`@Xml.name` or `@encodedName` on the property customizes the wrapper element name. + + + + +```tsp +model Store { + @Xml.name("AllBooks") + books: Book[]; +} + +model Book { + title: string; +} +``` + + + + +```tsp +model Store { + @encodedName("application/xml", "AllBooks") + books: Book[]; +} + +model Book { + title: string; +} +``` + + + + + + + +```xml + + + + The Great Gatsby + + + Les Miserables + + + +``` + + + + +```yaml +Book: + type: "object" + properties: + title: + type: "string" +Store: + type: "object" + properties: + books: + type: "array" + xml: + name: "AllBooks" + wrapped: true + items: + $ref: "#/components/schemas/Book" +``` + + + + +### 4.4 — Unwrapped array of models with custom item name + +`@Xml.name` or `@encodedName` on the property overrides each item's element name when the array is unwrapped. + + + + +```tsp +model Store { + @Xml.name("BookItem") + @Xml.unwrapped + books: Book[]; +} + +model Book { + title: string; +} +``` + + + + +```tsp +model Store { + @encodedName("application/xml", "BookItem") + @Xml.unwrapped + books: Book[]; +} + +model Book { + title: string; +} +``` + + + + + + + +```xml + + + The Great Gatsby + + + Les Miserables + + +``` + + + + +```yaml +Book: + type: "object" + properties: + title: + type: "string" +Store: + type: "object" + properties: + books: + type: "array" + items: + allOf: + - $ref: "#/components/schemas/Book" + xml: + name: BookItem +``` + + + + +### 4.5 — Wrapped array of models with custom wrapper and item names + +Both the wrapper element and each item element have custom names. + + + + +```tsp +model Store { + @Xml.name("AllBooks") + books: Book[]; +} + +@Xml.name("BookItem") +model Book { + title: string; +} +``` + + + + +```tsp +model Store { + @encodedName("application/xml", "AllBooks") + books: Book[]; +} + +@encodedName("application/xml", "BookItem") +model Book { + title: string; +} +``` + + + + + + + +```xml + + + + The Great Gatsby + + + Les Miserables + + + +``` + + + + +```yaml +Book: + type: "object" + properties: + title: + type: "string" + xml: + name: "BookItem" +Store: + type: "object" + properties: + books: + type: "array" + xml: + name: "AllBooks" + wrapped: true + items: + allOf: + - $ref: "#/components/schemas/Book" + xml: + name: BookItem +``` + + + + +## 5. Array models + +An _array model_ is a named model that _is_ an array rather than a model that _has_ an array property. It is declared with `model X is Type[]`. + +### 5.1 — Array model by itself + +A standalone array model produces an array schema in OpenAPI. When serialized to XML, the model name becomes the root element and each item uses its type name as the element name. + +```tsp +model Tags is string[]; +``` + + + + +```xml + + fiction + classic + +``` + + + + +```yaml +Tags: + type: "array" + items: + type: "string" +``` + + + + +### 5.2 — Array model used as a property (default) + +When a property references an array model, it behaves the same as an inline array: the property name becomes the wrapper element and each item uses its type name as the element name. + +```tsp +model BookList is Book[]; + +model Book { + title: string; +} + +model Store { + books: BookList; +} +``` + + + + +```xml + + + + The Great Gatsby + + + Les Miserables + + + +``` + + + + +```yaml +Book: + type: "object" + properties: + title: + type: "string" +BookList: + type: "array" + items: + $ref: "#/components/schemas/Book" +Store: + type: "object" + properties: + books: + type: "array" + xml: + wrapped: true + items: + allOf: + - $ref: "#/components/schemas/Book" + xml: + name: "Book" +``` + + + + +### 5.3 — Unwrapped array model property + +`@Xml.unwrapped` on the property removes the wrapper element, just as with inline arrays. + +```tsp +model BookList is Book[]; + +model Book { + title: string; +} + +model Store { + @Xml.unwrapped + books: BookList; +} +``` + + + + +```xml + + + The Great Gatsby + + + Les Miserables + + +``` + + + + +```yaml +Book: + type: "object" + properties: + title: + type: "string" +BookList: + type: "array" + items: + $ref: "#/components/schemas/Book" +Store: + type: "object" + properties: + books: + type: "array" + items: + allOf: + - $ref: "#/components/schemas/Book" + xml: + name: "books" +``` + + + + +## 6. Attributes + +### 6.1 — Serializing a property as an XML attribute + +`@Xml.attribute` serializes a property as an XML attribute instead of a child element. + +```tsp +model Book { + @Xml.attribute + id: integer; + + title: string; + author: string; +} +``` + + + + +```xml + + The Great Gatsby + F. Scott Fitzgerald + +``` + + + + +```yaml +Book: + type: object + properties: + id: + type: integer + xml: + attribute: true + title: + type: string + author: + type: string +``` + + + + +### 6.2 — Renaming an XML attribute + +`@Xml.name` or `@encodedName` on an `@Xml.attribute` property changes the attribute name in the XML output. + + + + +```tsp +model Book { + @Xml.attribute + @Xml.name("xml-id") + id: integer; + + title: string; + author: string; +} +``` + + + + +```tsp +model Book { + @Xml.attribute + @encodedName("application/xml", "xml-id") + id: integer; + + title: string; + author: string; +} +``` + + + + + + + +```xml + + The Great Gatsby + F. Scott Fitzgerald + +``` + + + + +```yaml +Book: + type: object + properties: + id: + type: integer + xml: + attribute: true + name: "xml-id" + title: + type: string + author: + type: string +``` + + + + +## 7. Namespace and prefix (inline form) + +### 7.1 — Namespace on the model + +`@Xml.ns` on a model adds a namespace prefix and declaration to the root element. + +```tsp +@Xml.ns("http://example.com/schema", "smp") +model Book { + id: integer; + title: string; + author: string; +} +``` + + + + +```xml + + 0 + The Great Gatsby + F. Scott Fitzgerald + +``` + + + + +```yaml +Book: + type: object + properties: + id: + type: integer + title: + type: string + author: + type: string + xml: + prefix: "smp" + namespace: "http://example.com/schema" +``` + + + + +### 7.2 — Namespace on individual properties + +Properties can declare their own namespace with `@Xml.ns`, which may differ from the model's namespace. + +```tsp +@Xml.ns("http://example.com/schema", "smp") +model Book { + id: integer; + + @Xml.ns("http://example.com/schema", "smp") + title: string; + + @Xml.ns("http://example.com/ns2", "ns2") + author: string; +} +``` + + + + +```xml + + 0 + The Great Gatsby + F. Scott Fitzgerald + +``` + + + + +```yaml +Book: + type: object + properties: + id: + type: integer + title: + type: string + xml: + prefix: "smp" + namespace: "http://example.com/schema" + author: + type: string + xml: + prefix: "ns2" + namespace: "http://example.com/ns2" + xml: + prefix: "smp" + namespace: "http://example.com/schema" +``` + + + + +## 8. Namespace and prefix (normalized form) + +### 8.1 — Using an `@Xml.nsDeclarations` enum + +Declare namespaces in an enum to avoid repeating URIs. Reference enum members with `@Xml.ns`. + +```tsp +@Xml.nsDeclarations +enum Namespaces { + smp: "http://example.com/schema", +} + +@Xml.ns(Namespaces.smp) +model Book { + id: integer; + title: string; + author: string; +} +``` + + + + +```xml + + 0 + Les Miserables + Victor Hugo + +``` + + + + +```yaml +Book: + type: object + properties: + id: + type: integer + title: + type: string + author: + type: string + xml: + prefix: "smp" + namespace: "http://example.com/schema" +Namespaces: + type: string + enum: + - http://example.com/schema +``` + + + + +### 8.2 — Multiple namespaces via enum + +Multiple namespace declarations can be defined in a single enum and referenced on individual properties. + +```tsp +@Xml.nsDeclarations +enum Namespaces { + smp: "http://example.com/schema", + ns2: "http://example.com/ns2", +} + +@Xml.ns(Namespaces.smp) +model Book { + id: integer; + + @Xml.ns(Namespaces.smp) + title: string; + + @Xml.ns(Namespaces.ns2) + author: string; +} +``` + + + + +```xml + + 0 + Les Miserables + Victor Hugo + +``` + + + + +```yaml +Book: + type: object + properties: + id: + type: integer + title: + type: string + xml: + prefix: "smp" + namespace: "http://example.com/schema" + author: + type: string + xml: + prefix: "ns2" + namespace: "http://example.com/ns2" + xml: + prefix: "smp" + namespace: "http://example.com/schema" +Namespaces: + type: string + enum: + - http://example.com/schema + - http://example.com/ns2 +``` + + + + +## 9. Property setting the text of the node + +### 9.1 — Text content with attributes + +`@Xml.unwrapped` on a scalar property makes it the text content of the parent element. Combined with `@Xml.attribute`, you can model elements that have both attributes and inline text. + +```tsp +model BookTitle { + @Xml.attribute language: string; + @Xml.unwrapped content: string; +} +``` + + + + +```xml + + ...content... + +``` + + + + +```yaml +BookTitle: + type: object + properties: + language: + type: string + xml: + attribute: true + content: + type: string +``` + + + diff --git a/website/src/content/docs/docs/release-notes/release-2024-04-02.md b/website/src/content/docs/docs/release-notes/release-2024-04-02.md deleted file mode 100644 index 876ebd47447..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2024-04-02.md +++ /dev/null @@ -1,63 +0,0 @@ ---- -title: 0.55 - April 2024 ---- - -:::caution -This release contains deprecations -::: - -## Deprecations - -### @typespec/compiler - -- [#2910](https://github.com/microsoft/typespec/pull/2910) Deprecate `@projectedName` decorator. `@encodedName` should be used instead. - - Example: - - ```diff - -@projectedName("json", "exp") - +@encodedName("application/json", "exp") - ``` - -- [#3094](https://github.com/microsoft/typespec/pull/3094) Deprecate `@knownValues` decorator. Use a named union of string literal with a string variant to achieve the same result without a decorator - - Example: - - ```diff - -enum FooKV { a, b, c} - -@knownValues(FooKV) - -scalar foo extends string; - +union Foo { "a", "b", "c", string } - ``` - -## Features - -### @typespec/compiler - -- [#2992](https://github.com/microsoft/typespec/pull/2992) Enable the use of `@encode` for model properties that have a union type. This supports cases like `@encode("rfc3339") prop: utcDateTime | null` - -### @typespec/versioning - -- [#3053](https://github.com/microsoft/typespec/pull/3053) Add support for versioning of scalars(Added, removed, renamed) - -## Bug Fixes - -### @typespec/compiler - -- [#3018](https://github.com/microsoft/typespec/pull/3018) Grammar: Fix comments in template params not tokenized -- [#3052](https://github.com/microsoft/typespec/pull/3052) Fix: Union template declaration were incorrectly being finished in projection -- [#2983](https://github.com/microsoft/typespec/pull/2983) Warnings converted to error with `warn-as-error` do not prevent compilation from moving to the next stage like regular warnings -- [#3041](https://github.com/microsoft/typespec/pull/3041) Improve reliability of application of codefixes in IDE, often it would not do anything -- [#3069](https://github.com/microsoft/typespec/pull/3069) TmLanguage: Fix tokenization of escaped identifiers, enums and unions - -### @typespec/openapi3 - -- [#3077](https://github.com/microsoft/typespec/pull/3077) Do not crash if using an unsupported intrinsic type -- [#2967](https://github.com/microsoft/typespec/pull/2967) Fix crash: emit `{nullable: true}` when trying to emit `null` in openapi3 -- [#3013](https://github.com/microsoft/typespec/pull/3013) Fix: OpenAPI3 not marking part of bytes or something else as `format: binary` -- [#3090](https://github.com/microsoft/typespec/pull/3090) Fix: Literal unions with the same variants keep adding duplicate entries -- [#3049](https://github.com/microsoft/typespec/pull/3049) Fix visibility naming conflict when a model used with `extends` was used in different visibility. - -### @typespec/eslint-config-typespec - -- [#2122](https://github.com/microsoft/typespec/pull/2122) Ignore `generated-defs` folder diff --git a/website/src/content/docs/docs/release-notes/release-2024-05-07.md b/website/src/content/docs/docs/release-notes/release-2024-05-07.md deleted file mode 100644 index 37ea7242261..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2024-05-07.md +++ /dev/null @@ -1,155 +0,0 @@ ---- -title: 0.56 - May 2024 ---- - -:::caution -This release contains breaking changes -::: - -## Breaking Changes - -### @typespec/http - -- [#2945](https://github.com/microsoft/typespec/pull/2945) Empty model after removing metadata and applying visibility always results in "void" - This means the following case have changed from returning `{}` to no body - - ```tsp - op b1(): {}; - op b2(): { - @visibility("none") prop: string; - }; - op b3(): { - @added(Versions.v2) prop: string; - }; - ``` - - Workaround: Use explicit `@body` - - ```tsp - op b1(): { - @body _: {}; - }; - op b2(): { - @body _: { - @visibility("none") prop: string; - }; - }; - op b3(): { - @body _: { - @added(Versions.v2) prop: string; - }; - }; - ``` - -- [#2945](https://github.com/microsoft/typespec/pull/2945) Implicit status code always 200 except if response is explicitly `void` - - ```tsp - op c1(): { - @header foo: string; - }; // status code 200 (used to be 204) - ``` - - Solution: Add explicit `@statusCode` - - ```tsp - op c1(): { - @header foo: string; - @statusCode _: 204; - }; - op c1(): { - @header foo: string; - ...NoContent; - }; // or spread common model - ``` - -- [#2945](https://github.com/microsoft/typespec/pull/2945) `@body` means this is the body - - This change makes using `@body` mean this is the exact body and everything underneath will be included, including metadata properties. If metadata properties are present on the body, a warning will be logged. - - ```tsp - op a1(): {@body _: {@header foo: string, other: string} }; - ^ warning header in a body, it will not be included as a header. - ``` - - Use `@bodyRoot` if you want to only change where to resolve the body from. - - ```tsp - op a1(): { - @bodyRoot _: { - @header foo: string; - other: string; - }; - }; - ``` - -- [#2945](https://github.com/microsoft/typespec/pull/2945) Properties are not automatically omitted if everything was removed from metadata or visibility - - ```tsp - op d1(): { - headers: { - @header foo: string; - }; - }; // body will be {headers: {}} - ``` - - Solution: use `@bodyIgnore` - - ```tsp - op d1(): { - @bodyIgnore headers: { - @header foo: string; - }; - }; // body will be {headers: {}} - ``` - -## Features - -### @typespec/compiler - -- [#3035](https://github.com/microsoft/typespec/pull/3035) `getEncode` returns the fully qualified enum member name if using a custom enum. -- [#3183](https://github.com/microsoft/typespec/pull/3183) Show template parameters when hovering on an operation template -- [#3191](https://github.com/microsoft/typespec/pull/3191) [API] Add new `sourceModels` property to model - -### @typespec/rest - -- [#2945](https://github.com/microsoft/typespec/pull/2945) Add support for new `@bodyRoot` and `@body` distinction - -### @typespec/openapi3 - -- [#2945](https://github.com/microsoft/typespec/pull/2945) Add support for new `@bodyRoot` and `@body` distinction - -### @typespec/html-program-viewer - -- [#3191](https://github.com/microsoft/typespec/pull/3191) Add `sourceModels` property to model view - -## Bug Fixes - -### @typespec/compiler - -- [#3170](https://github.com/microsoft/typespec/pull/3170) `--nostdlib` flag will now work by only applying to optional standard library types -- [#3212](https://github.com/microsoft/typespec/pull/3212) Fix: augmenting template model property could result in sending invalid argument to decorator -- [#3188](https://github.com/microsoft/typespec/pull/3188) Fix: Do not crash when trying to access member of aliased expressions -- [#3185](https://github.com/microsoft/typespec/pull/3185) Fix tsp init hanging when done due to unclosed connection -- [#3151](https://github.com/microsoft/typespec/pull/3151) IDE: Fix completion of statement keywords -- [#3287](https://github.com/microsoft/typespec/pull/3287) Templated interface extending another templated interface shouldn't run decorator on their operations -- [#3290](https://github.com/microsoft/typespec/pull/3290) Model with an optional property should not satisfy a constraint with that property required. (`{foo?: string}` cannot be assigned to a constraint of `{foo: string}`) -- [#3163](https://github.com/microsoft/typespec/pull/3163) Fix: Model with spread indexer shouldn't validate explicit properties -- [#3227](https://github.com/microsoft/typespec/pull/3227) Stop running decorators on partially instantiated operations(When interface is instantiated but not the operation) -- [#3180](https://github.com/microsoft/typespec/pull/3180) Fix issue where directives were not parsed to the leaf node in multi-segment Namespace segments. -- [#3243](https://github.com/microsoft/typespec/pull/3243) Fix calling `tsp install` on windows due to recent NodeJS breaking change to fix vulnerability. -- [#3216](https://github.com/microsoft/typespec/pull/3216) Fix compiler crash when using an invalid `is` target in an interface operation template -- [#3246](https://github.com/microsoft/typespec/pull/3246) Internals: Use node built-in `fetch` API that is now stable since node `18.13.0` - -### @typespec/http - -- [#3196](https://github.com/microsoft/typespec/pull/3196) Fix password flow defining `authorizationUrl` instead of `tokenUrl` -- [#3190](https://github.com/microsoft/typespec/pull/3190) Fix `@path` param mapping when spreading a record in operation parameters -- [#3218](https://github.com/microsoft/typespec/pull/3218) Fix: `@path` property shouldn't be applicableMetadata if the visibility contains `Read` - -### @typespec/versioning - -- [#3264](https://github.com/microsoft/typespec/pull/3264) Fix crash when `@service` appears inside a versioned namespace - -### @typespec/openapi3 - -- [#3218](https://github.com/microsoft/typespec/pull/3218) Fix: `@path` property should be included in unreachable models diff --git a/website/src/content/docs/docs/release-notes/release-2024-06-10.md b/website/src/content/docs/docs/release-notes/release-2024-06-10.md deleted file mode 100644 index a16dd83d0cd..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2024-06-10.md +++ /dev/null @@ -1,274 +0,0 @@ ---- -title: 0.57 - June 2024 ---- - -:::caution -This release contains deprecations and breaking changes -::: - -## Values In TypeSpec - -Decorators often expect some sort of configuration to be passed as an argument. In version `0.51.0` we introduced the `valueof` keyword to constrain a decorator or template parameter to be a value, however this was limited to string, numeric and boolean values. -When dealing with more complex decorators or free form data, one had to use a model type to represent the data. Unfortunately, this approach was difficult for decorator authors to handle reliably and required somewhat sophisticated validation to avoid some common pitfalls that couldn't be prevented through type system constraints. - -In this release we introduce a new concept to TypeSpec: values. This includes new syntax for declaring object and array values, scalar constructors, and `const` declarations. - -### Object values - -Object values can be declared with the `#{}` syntax. - -```tsp -const user = #{ name: "Bob", age: 48, address: #{ city: "London" } }; -``` - -### Array values - -Array values can be declared with the `#[]` syntax. - -```tsp -const users = #["Bob", "Frank"]; -``` - -### `const` - -Const declares a variable that holds a value, and can optionally specify a type. - -```tsp -const name = "Bob"; -const name: string = "Bob"; -``` - -### Scalar constructors - -Scalars can define custom values with scalar value constructors. Scalars which don't extend a base type like `string`, `number` or `boolean` can define a constructor. - -```tsp -scalar ipV4 { - init fromInt(value: int32); -} -const ip: ipV4 = ipV4.fromInt(3232235776); -``` - -[See values doc for more info](https://typespec.io/docs/language-basics/values) - -## Breaking changes - -- [#3022](https://github.com/microsoft/typespec/pull/3022) Addition of new `const` keyword means using `const` as a property name or decorator name will result in an error. This can be fixed by wrapping the property in backtick. - -```tsp -model Test { - // error - const: string; - - // correct - `const`: string; - -} -``` - -## Deprecations - -### @typespec/compiler - -- [#3022](https://github.com/microsoft/typespec/pull/3022) Using a tuple type as a value is deprecated. Tuple types in contexts where values are expected must be updated to be array values instead. A codefix is provided to automatically convert tuple types into array values. - -```tsp -model Test { - // Deprecated - values: string[] = ["a", "b", "c"]; - - // Correct - values: string[] = #["a", "b", "c"]; -} -``` - -- [#3022](https://github.com/microsoft/typespec/pull/3022) Using a model type as a value is deprecated. Model types in contexts where values are expected must be updated to be object values instead. A codefix is provided to automatically convert model types into object values. - -```tsp -model Test { - // Deprecated - user: { - name: string; - } = { - name: "System"; - }; - - // Correct - user: { - name: string; - } = #{ name: "System" }; -} -``` - -- [#3022](https://github.com/microsoft/typespec/pull/3022) Decorator API: Legacy marshalling logic - -With the introduction of values, the decorator marshalling behavior has changed in some cases. This behavior is opt-in by setting the `valueMarshalling` package flag to `"new"`, but will be the default behavior in future versions. It is strongly recommended to adopt this new behavior as soon as possible. - -Example: - -```tsp -extern dec multipleOf(target: numeric | Reflection.ModelProperty, value: valueof numeric); -``` - -Will now emit a deprecated warning because `value` is of type `valueof string` which would marshall to `Numeric` under the new logic but as `number` previously. - -To opt-in you can add the following to your library js/ts files. - -```ts -export const $flags = definePackageFlags({ - decoratorArgMarshalling: "new", -}); -``` - -## Features - -### @typespec/compiler - -- [#3280](https://github.com/microsoft/typespec/pull/3280) Support completion for Model with extended properties - - Example - - ```tsp - model Device { - name: string; - description: string; - } - - model Phone extends Device { - ┆ - } | [name] - | [description] - ``` - -- [#3280](https://github.com/microsoft/typespec/pull/3280) Support completion for object values and model expression properties. - - Example - - ```tsp - model User { - name: string; - age: int32; - address: string; - } - - const user: User = #{name: "Bob", ┆} - | [age] - | [address] - ``` - -- [#3375](https://github.com/microsoft/typespec/pull/3375) Allow `@` to be escaped in doc comment with `\` -- [#3022](https://github.com/microsoft/typespec/pull/3022) Add syntax for declaring values. [See docs](https://typespec.io/docs/language-basics/values). - -Object and array values - -```tsp -@dummy(#{ - name: "John", - age: 48, - address: #{ city: "London" } - aliases: #["Bob", "Frank"] -}) -``` - -Scalar constructors - -```tsp -scalar utcDateTime { - init fromISO(value: string); -} - -model DateRange { - minDate: utcDateTime = utcDateTime.fromISO("2024-02-15T18:36:03Z"); -} -``` - -- [#3527](https://github.com/microsoft/typespec/pull/3527) Add support for `@prop` doc comment tag to describe model properties -- [#3460](https://github.com/microsoft/typespec/pull/3460) Hide deprecated items from completion list -- [#3462](https://github.com/microsoft/typespec/pull/3462) Linter `all` rulesets is automatically created if not explicitly provided -- [#3533](https://github.com/microsoft/typespec/pull/3533) More logs and traces are added for diagnostic and troubleshooting in TypeSpec language server -- [#3422](https://github.com/microsoft/typespec/pull/3422) Formatter: Indent or dedent multiline strings to the current indentation - -### @typespec/http - -- [#3342](https://github.com/microsoft/typespec/pull/3342) Add new multipart handling. Using `@multipartBody` with `HttpPart`. See [multipart docs](https://typespec.io/docs/next/libraries/http/multipart) for more information. - - ```tsp - op upload( - @header contentType: "multipart/mixed", - @multipartBody body: { - name: HttpPart; - avatar: HttpPart[]; - }, - ): void; - ``` - -- [#3462](https://github.com/microsoft/typespec/pull/3462) Use new compiler automatic `all` ruleset instead of explicitly provided one - -### @typespec/openapi3 - -- [#3022](https://github.com/microsoft/typespec/pull/3022) Add support for new object and array values as default values (e.g. `decimals: decimal[] = #[123, 456.7];`) - -### @typespec/html-program-viewer - -- [#3022](https://github.com/microsoft/typespec/pull/3022) Add support for values - -### @typespec/json-schema - -- [#3557](https://github.com/microsoft/typespec/pull/3557) Add support for @oneOf decorator. - -### typespec-vs - -- [#3461](https://github.com/microsoft/typespec/pull/3461) Support Arm64 - -### typespec-vscode - -- [#3533](https://github.com/microsoft/typespec/pull/3533) Enhance logging and trace - -1. Support "Developer: Set Log Level..." command to filter logs in TypeSpec output channel -2. Add "typespecLanguageServer.trace.server" config for whether and how to send the traces from TypeSpec language server to client. (It still depends on client to decide whether to show these traces based on the configured Log Level.) -3. More logs and traces are added for diagnostic and troubleshooting - -- [#3385](https://github.com/microsoft/typespec/pull/3385) Add 'TypeSpec: Show Output Channel' command in VSCode extension - -## Bug Fixes - -### @typespec/compiler - -- [#3399](https://github.com/microsoft/typespec/pull/3399) Preserve leading whitespace in fenced blocks in doc comments -- [#3522](https://github.com/microsoft/typespec/pull/3522) Fix EINVAL error when running `tsp code install` -- [#3371](https://github.com/microsoft/typespec/pull/3371) Numeric not handling trailing zeros and causing freeze(e.g. `const a = 100.0`) -- [#3451](https://github.com/microsoft/typespec/pull/3451) Emitter framework: fix losing context when referencing circular types -- [#3517](https://github.com/microsoft/typespec/pull/3517) Fix application of `@param` doc tag on operation create with `op is` to override upstream doc -- [#3488](https://github.com/microsoft/typespec/pull/3488) Add `PickProperties` type to dynamically select a subset of a model - -### @typespec/http - -- [#3022](https://github.com/microsoft/typespec/pull/3022) Update Flow Template to make use of the new array values - -### @typespec/versioning - -- [#3292](https://github.com/microsoft/typespec/pull/3292) Add `@madeRequired` decorator -- [#3022](https://github.com/microsoft/typespec/pull/3022) Update to support new value types -- [#3409](https://github.com/microsoft/typespec/pull/3409) Using `@removed` on member types and `@added` on containing type could result in errors -- [#3255](https://github.com/microsoft/typespec/pull/3255) If a property were marked with @added on a later version, the logic that said it was originally added on the first version was erroneously removed, resulting in incorrect projections. - -### @typespec/rest - -- [#3022](https://github.com/microsoft/typespec/pull/3022) Update types to support new values in TypeSpec - -### @typespec/openapi3 - -- [#3342](https://github.com/microsoft/typespec/pull/3342) Add support for new multipart constructs in http library -- [#3574](https://github.com/microsoft/typespec/pull/3574) Emit diagnostic when an invalid type is used as a property instead of crashing. - -### @typespec/protobuf - -- [#3022](https://github.com/microsoft/typespec/pull/3022) Update to support new value types -- [#3561](https://github.com/microsoft/typespec/pull/3561) Corrected cross-package reference behavior in some buggy cases. -- - -### @typespec/json-schema - -- [#3398](https://github.com/microsoft/typespec/pull/3398) Fix decorators application for union variants -- [#3022](https://github.com/microsoft/typespec/pull/3022) Update to support new value types -- [#3430](https://github.com/microsoft/typespec/pull/3430) The emitted JSON Schema now doesn't make root schemas for TypeSpec types which do not have the @jsonSchema decorator or are contained in a namespace with that decorator. Instead, such schemas are put into the $defs of any root schema which references them, and are referenced using JSON Pointers. diff --git a/website/src/content/docs/docs/release-notes/release-2024-07-16.md b/website/src/content/docs/docs/release-notes/release-2024-07-16.md deleted file mode 100644 index c59347faae8..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2024-07-16.md +++ /dev/null @@ -1,166 +0,0 @@ ---- -title: 0.58 - July 2024 ---- - -:::caution -This release contains breaking changes -::: - -## Examples in TypeSpec - -This release introduce a new `@example` and `@opExample` decorator. - -Those new decorators provide a way to specify some canonical examples for data types and operations. Each emitter is then able to serialize those examples in their own format. - -```tsp -@example(#{ - id: "some", - date: utcDateTime.fromISO("2020-01-01T00:00:00Z"), - timeout: duration.fromISO("PT1M"), -}) -model Foo { - id: string; - date: utcDateTime; - @encode("seconds", int32) timeout: duration; -} -``` - -```tsp -@opExample( - #{ - parameters: #{ pet: #{ id: "some", name: "Fluffy", dob: plainDate.fromISO("2020-01-01") } }, - returnType: #{ id: "some", name: "Fluffy", dob: plainDate.fromISO("2020-01-01") }, - }, - #{ title: "First", description: "Show creating a pet" } -) -op createPet(pet: Pet): Pet; -``` - -## Breaking Changes - -### @typespec/compiler - -- [#3793](https://github.com/microsoft/typespec/pull/3793) Do not carry over `@friendlyName` with `model is` or `op is` - - ```tsp - @friendlyName("Abc{T}", T) - model Foo {} - - model Bar is Foo; - - // This can be changed to - model Abcstring is Foo; - ``` - -- [#3659](https://github.com/microsoft/typespec/pull/3659) Disallows overriding a required inherited property with an optional property. - -In previous versions of TypeSpec, it was possible to override a required property with an optional property. This is no longer allowed. This change may result in errors in your code if you were relying on this bug, but specifications that used this behavior are likely to have been exposed to errors resulting from incoherent type checking behavior. - -The following example demonstrates the behavior that is no longer allowed: - -```tsp -model Base { - example: string; -} - -model Child extends Base { - example?: string; -} -``` - -In this example, the `Child` model overrides the `example` property from the `Base` model with an optional property. This is no longer allowed. - -### @typespec/http - -- [#3737](https://github.com/microsoft/typespec/pull/3737) Keep trailing slash when building http routes, this is breaking if you used to have `@route()` ending with `/`. - - | TypeSpec | Before | After | - | ---------------------------------------------------------------- | ----------------- | ------------------ | - | `@route("users/")` | `users` | `users/` | - | `@route("users")` | `users` | `users` | - | on interface `@route("users/")` and on op `@route("addresses/")` | `users/addresses` | `users/addresses/` | - | on interface `@route("users/")` and on op `@route("addresses")` | `users/addresses` | `users/addresses` | - -## Features - -### @typespec/compiler - -- [#3699](https://github.com/microsoft/typespec/pull/3699) Moved compiler dependencies to peer and dev for scaffolded projects. -- [59daf90](https://github.com/microsoft/typespec/commit/59daf9054c709d3657e498b5f6dbe77492c98210) Add new `@example` and `@opExample` decorator to provide examples on types and operations. - - ```tsp - @example(#{ - id: "some", - date: utcDateTime.fromISO("2020-01-01T00:00:00Z"), - timeout: duration.fromISO("PT1M"), - }) - model Foo { - id: string; - date: utcDateTime; - @encode("seconds", int32) timeout: duration; - } - ``` - - ```tsp - @opExample( - #{ - parameters: #{ pet: #{ id: "some", name: "Fluffy", dob: plainDate.fromISO("2020-01-01") } }, - returnType: #{ id: "some", name: "Fluffy", dob: plainDate.fromISO("2020-01-01") }, - }, - #{ title: "First", description: "Show creating a pet" } - ) - op createPet(pet: Pet): Pet; - ``` - -- [#3751](https://github.com/microsoft/typespec/pull/3751) Adds option to `tsp init` to generate .gitignore file - -### @typespec/http - -- [#3717](https://github.com/microsoft/typespec/pull/3717) Allow overriding base operation verb -- [#3676](https://github.com/microsoft/typespec/pull/3676) Expose `getHttpPart` and types functions -- [#3732](https://github.com/microsoft/typespec/pull/3732) Expose `model` property on `HttpAuth` to retrieve original type used to define security scheme - -### @typespec/openapi - -- [#3626](https://github.com/microsoft/typespec/pull/3626) Adds public function for setting info object - -### @typespec/openapi3 - -- [bd0b3df](https://github.com/microsoft/typespec/commit/bd0b3df225045a89d3d16c37828f24d84d154343) Add support for new `@example` and `@opExample` decorator -- [#3663](https://github.com/microsoft/typespec/pull/3663) Adds support for converting OpenAPI3 specs to TypeSpec via the new tsp-openapi3 CLI included in the `@typespec/openapi3` package. -- [#3732](https://github.com/microsoft/typespec/pull/3732) Apply openapi3 extension on Security schemes - -### @typespec/html-program-viewer - -- [#3713](https://github.com/microsoft/typespec/pull/3713) Complete new dynamic UI to navigate the TypeSpec type graph - -## Bug Fixes - -### @typespec/compiler - -- [#3623](https://github.com/microsoft/typespec/pull/3623) Fix crash of language server on firefox -- [#3516](https://github.com/microsoft/typespec/pull/3516) Deprecate getAssetEmitter and recommend calling `createAssetEmitter` directly -- [#3767](https://github.com/microsoft/typespec/pull/3767) Fix semantic highlighting of using of single namespace -- [#3824](https://github.com/microsoft/typespec/pull/3824) Do not cast model expression to object value if the constraint is allowing the type -- [#3577](https://github.com/microsoft/typespec/pull/3577) Fix formatting of object and array literal in decorator to hug parenthesis -- [#3823](https://github.com/microsoft/typespec/pull/3823) Fix formatting of scalar constructor called with no args -- [#3743](https://github.com/microsoft/typespec/pull/3743) Fix 'typespec vs install' command on windows -- [#3605](https://github.com/microsoft/typespec/pull/3605) Fix templates initialized on node 22 - -### @typespec/openapi3 - -- [#3516](https://github.com/microsoft/typespec/pull/3516) Fix issue that could result in invalid document generation when running `tsp compile` from another directory -- [#3794](https://github.com/microsoft/typespec/pull/3794) Updates tsp-openapi3 to always emit main.tsp when formatting encounters an error. -- [#3839](https://github.com/microsoft/typespec/pull/3839) Updates tsp-openapi3 doc line wrapping to only automatically create newlines when they are present in the original documentation. - -### @typespec/html-program-viewer - -- [#3585](https://github.com/microsoft/typespec/pull/3585) Fix crash in program viewer when trying to display new value type - -### @typespec/json-schema - -- [#3516](https://github.com/microsoft/typespec/pull/3516) Fix issue that could result in invalid document generation when running `tsp compile` from another directory - -``` - -``` diff --git a/website/src/content/docs/docs/release-notes/release-2024-08-06.md b/website/src/content/docs/docs/release-notes/release-2024-08-06.md deleted file mode 100644 index 305eb495fc8..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2024-08-06.md +++ /dev/null @@ -1,164 +0,0 @@ ---- -title: 0.59 - August 2024 ---- - -:::caution -This release contains deprecations breaking changes -::: - -## Breaking Changes - -### @typespec/compiler - -- [#4050](https://github.com/microsoft/typespec/pull/4050) Fix issue where naming a namespace with the same name as the blockless namespace would merge with it instead of creating a subnamespace like any other name would. - - ```tsp - namespace MyOrg.MyProject; - - namespace MyOrg.MyProject.MyArea { - model A {} - } - - namespace MyArea2 { - model B {} - } - ``` - - Previously model `A` would end-up in namespace `MyOrg.MyProject.MyArea` and model `B` in `MyOrg.MyProject.MyArea2`. With this change model `A` will now be in `MyOrg.MyProject.MyOrg.MyProject.MyArea`. To achieve the previous behavior the above code should be written as: - - ```tsp - namespace MyOrg.MyProject; - - namespace MyArea { - model A {} - } - - namespace MyArea2 { - model B {} - } - ``` - -### @typespec/json-schema - -- [#3558](https://github.com/microsoft/typespec/pull/3558) Updates `@extension` decorator to support TypeSpec values in addition to types. - -In previous versions of the json-schema emitter, the `@extension` decorator only accepted types as the value. These are emitted as JSON schemas. In order to add extensions as raw values, types had to be wrapped in the `Json<>` template when being passed to the `@extension` decorator. - -This change allows setting TypeSpec values (introduced in TypeSpec 0.57.0) directly instead. - -The following example demonstrates using values directly: - -```tsp -@extension("x-example", #{ foo: "bar" }) -model Foo {} -``` - -This change results in scalars being treated as values instead of types. This will result in the `@extension` decorator emitting raw values for scalar types instead of JSON schema. To preserve the previous behavior, use `typeof` when passing in a scalar value. - -The following example demonstrates how to pass a scalar value that emits a JSON schema: - -```tsp -@extension("x-example", "foo") -model Foo {} -``` - -To preserve this same behavior, the above example can be updated to the following: - -```tsp -@extension("x-example", typeof "foo") -model Foo {} -``` - -## Deprecations - -### @typespec/http - -- [#3932](https://github.com/microsoft/typespec/pull/3932) API deprecation: `HttpOperation#pathSegments` is deprecated. Use `HttpOperation#uriTemplate` instead. -- [#3932](https://github.com/microsoft/typespec/pull/3932) Deprecated `@query({format: })` option. Use `@query(#{explode: true})` instead of `form` or `multi` format. Previously `csv`/`simple` is the default now. - Decorator is also expecting an object value now instead of a model. A deprecation warning with a codefix will help migrating. - - ```diff - - @query({format: "form"}) select: string[]; - + @query(#{explode: true}) select: string[]; - ``` - -## Features - -### @typespec/compiler - -- [#3906](https://github.com/microsoft/typespec/pull/3906) Support completion for template parameter extending model or object value - - Example - - ```tsp - model User {} - alias user = User<{ - ┆: [age] | [name]; - }>; - ``` - -- [#4020](https://github.com/microsoft/typespec/pull/4020) Add support for encoding numeric types as string -- [#4023](https://github.com/microsoft/typespec/pull/4023) Warn when using `\` in config file field that expect a path. -- [#3932](https://github.com/microsoft/typespec/pull/3932) Add `ArrayEncoding` enum to define simple serialization of arrays - -### @typespec/http - -- [#4046](https://github.com/microsoft/typespec/pull/4046) API: Expose `properties: HttpProperty[]` on operation parameter and response which reference all the properties of interest(Body, statusCode, contentType, implicitBodyProperty, etc.) -- [#3932](https://github.com/microsoft/typespec/pull/3932) `@route` can now take a uri template as defined by [RFC-6570](https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.3) - - ```tsp - @route("files{+path}") download(path: string): void; - ``` - -### @typespec/rest - -- [#3932](https://github.com/microsoft/typespec/pull/3932) Add support for URI templates in routes - -### @typespec/openapi3 - -- [#3894](https://github.com/microsoft/typespec/pull/3894) Add support for `@useRef` on responses -- [#4020](https://github.com/microsoft/typespec/pull/4020) Add support for encoding numeric types as string -- [#3890](https://github.com/microsoft/typespec/pull/3890) `@extension` used on the service namespace will set extension at the root of the document -- [#3932](https://github.com/microsoft/typespec/pull/3932) Add support for URI templates in routes - -## Bug Fixes - -### @typespec/compiler - -- [#3881](https://github.com/microsoft/typespec/pull/3881) Fixes a bug where ending a non-terminal line in a multi-line comment with a backslash caused the next star to show up in the parsed doc string. -- [#4050](https://github.com/microsoft/typespec/pull/4050) Allow using compact namespace form `Foo.Bar` when inside another namespace - - ```tsp - namespace MyOrg.MyProject { - namespace MyModule.MySubmodule { // <-- this used to emit an error - // ... - - } - } - ``` - -- [#3898](https://github.com/microsoft/typespec/pull/3898) Fix decimal numeric with leading zeros -- [#4046](https://github.com/microsoft/typespec/pull/4046) Fix type comparison of literal and scalar when in projection context -- [#4022](https://github.com/microsoft/typespec/pull/4022) `tsp compile --watch` will not stop when a crash happens during compilation -- [#3933](https://github.com/microsoft/typespec/pull/3933) Add `const` template parameter to get the precise lib type - -### @typespec/http - -- [#3909](https://github.com/microsoft/typespec/pull/3909) Fix `HttpPart` not respecting explicit part name by always using the property name -- [#3933](https://github.com/microsoft/typespec/pull/3933) Fix some diagnostic not showing the right message - -### @typespec/versioning - -- [#3911](https://github.com/microsoft/typespec/pull/3911) Allow spreading a model that has props added in previous version -- [#3951](https://github.com/microsoft/typespec/pull/3951) Fixes issue where spreading a versioned model as a parameter to an incompatible versioned operation would cause the compiler to crash. - -### @typespec/openapi3 - -- [#4046](https://github.com/microsoft/typespec/pull/4046) Fix issue where operation example would produce an empty object when `@body`/`@bodyRoot` was used -- [#4046](https://github.com/microsoft/typespec/pull/4046) Fix operation response body examples showing up for each response. -- [#3912](https://github.com/microsoft/typespec/pull/3912) Fixes bug where union documentation was being applied to each union member in emitted output. -- [#3908](https://github.com/microsoft/typespec/pull/3908) Fixes bug where circular references in unions caused an empty object to be emitted instead of a ref. - -### @typespec/protobuf - -- [#3933](https://github.com/microsoft/typespec/pull/3933) Fix some diagnostic not showing the right message diff --git a/website/src/content/docs/docs/release-notes/release-2024-09-10.md b/website/src/content/docs/docs/release-notes/release-2024-09-10.md deleted file mode 100644 index 9fc28904094..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2024-09-10.md +++ /dev/null @@ -1,62 +0,0 @@ ---- -title: 0.60 - September 2024 ---- - -## Features - -### @typespec/compiler - -- [#4139](https://github.com/microsoft/typespec/pull/4139) Add new way to define decorator implementation with `$decorators` export. - -```ts -export const $decorators = { - "TypeSpec.OpenAPI": { - useRef: $useRef, - oneOf: $oneOf, - }, -}; -``` - -- [#4148](https://github.com/microsoft/typespec/pull/4148) Diagnostics logged to the terminal now have a clickable hyperlink to the diagnostic documentation url if applicable. -- [#4141](https://github.com/microsoft/typespec/pull/4141) Diagnostic code in IDE now link to the linter rule documentation url if applicable -- [#4357](https://github.com/microsoft/typespec/pull/4357) Improvements to type relation errors: Show stack when it happens in a nested property otherwise show up in the correct location. - -## Bug Fixes - -### @typespec/compiler - -- [#4381](https://github.com/microsoft/typespec/pull/4381) Fix Semantic walker doesn't fire exitOperation or exitModelProperty -- [#4146](https://github.com/microsoft/typespec/pull/4146) Fix model expression defined in alias will resolve its namespace from the namespace where the alias was declared -- [#4147](https://github.com/microsoft/typespec/pull/4147) Fix examples with models using `extends` -- [#4144](https://github.com/microsoft/typespec/pull/4144) Fix: Model and union expression in template were not considered as template instances -- [#4135](https://github.com/microsoft/typespec/pull/4135) Fix numeric 0 stringify producing 0.0 -- [#4064](https://github.com/microsoft/typespec/pull/4064) IDE: Formatting command will use prettier config if provided over the editor's configuration. -- [#4089](https://github.com/microsoft/typespec/pull/4089) Fix tmlanguage for named type argument in type reference. -- [#4324](https://github.com/microsoft/typespec/pull/4324) API: Extract source resolution logic into its own source loader - -### @typespec/http - -- [#4322](https://github.com/microsoft/typespec/pull/4322) Use user provided description of model if model has a status code property(detect it as an response envelope) - -### @typespec/versioning - -- [#4145](https://github.com/microsoft/typespec/pull/4145) Fix error when trying to reference types from another sub namespace of a versioned namespace -- [#4179](https://github.com/microsoft/typespec/pull/4179) Add validation to make sure operation params reference models available in the current version -- [#4179](https://github.com/microsoft/typespec/pull/4179) Add validation to make sure types referencing array in union types have compatible versioning. - -### @typespec/openapi3 - -- [#4133](https://github.com/microsoft/typespec/pull/4133) Fix Bug for OpenAPI 3 Emitter crash on `@useAuth({})` -- [#4123](https://github.com/microsoft/typespec/pull/4123) Fix OpenAPI3 union names when declared within a namespace -- [#4216](https://github.com/microsoft/typespec/pull/4216) Fixes issue in tsp-openapi3 that resulted in component schemas and parameters with the same name being merged into a single TypeSpec data type. -- [#4232](https://github.com/microsoft/typespec/pull/4232) Improves tsp-openapi3 model generation from schemas utilizing allOf. Models will now extend an allOf member if it is a schema reference and the only member with a discriminator. Other members will be spread into the model if defined as a schema reference, or have their properties treated as top-level properties if they are an inline-schema. -- [#4149](https://github.com/microsoft/typespec/pull/4149) Updates tsp-openapi3 conversion of OpenAPI3 component schemas to improve handling of enums, unions, scalars, and aliases. - -### @typespec/html-program-viewer - -- [#4353](https://github.com/microsoft/typespec/pull/4353) Fix crash when using anonymous union variant -- [#4136](https://github.com/microsoft/typespec/pull/4136) Fix namespace with the same name conflicting in the tree navigation - -### @typespec/json-schema - -- [#4150](https://github.com/microsoft/typespec/pull/4150) Stop json schema from crashing on unknown scalar and handle `unixTimestamp32` diff --git a/website/src/content/docs/docs/release-notes/release-2024-10-09.md b/website/src/content/docs/docs/release-notes/release-2024-10-09.md deleted file mode 100644 index f32744b0c7d..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2024-10-09.md +++ /dev/null @@ -1,90 +0,0 @@ ---- -title: 0.61 - October 2024 ---- - -:::caution -This release contains breaking changes -::: - -## Breaking Changes - -### @typespec/compiler - -- [#4539](https://github.com/microsoft/typespec/pull/4539) Config parameters and emitters options cannot contains `.`. This conflict with newly added support for nested options. -- [#4500](https://github.com/microsoft/typespec/pull/4500) API: Update default of `decoratorArgMarshalling` from `legacy` to `new` - -To revert to the old behavior export the following. **Highly discouraged, this will be removed in a few versions.** - -```ts -export const $flags = definePackageFlags({ - decoratorArgMarshalling: "legacy", -}); -``` - -- TypeSpec compiler expect the entrypoint to be an absolute path. This used to work with some alternative `CompilerHost` that handled relative path but this is no longer supported due to the new `exports` field support. - -## Features - -### @typespec/compiler - -- [#4442](https://github.com/microsoft/typespec/pull/4442) Library diagnostic can now define a `description` and `url` that links to a more detailed doc for this diagnostic -- [#4290](https://github.com/microsoft/typespec/pull/4290) Adding experimental (unstable) API fro Type Mutators -- [#4595](https://github.com/microsoft/typespec/pull/4595) Expose more accurate `PackageJson` type and deprecate `NodePackage` -- [#4606](https://github.com/microsoft/typespec/pull/4606) Add support for node `exports` field. Specific typespec exports can be provided with the `typespec` field - -```json -"exports": { - ".": { - "typespec": "./lib/main.tsp", - }, - "./named": { - "typespec": "./lib/named.tsp", - } -} -``` - -- [#4539](https://github.com/microsoft/typespec/pull/4539) Support nested emitter options - -### @typespec/http - -- [#4513](https://github.com/microsoft/typespec/pull/4513) Adds HttpStream and JsonlStream models to to support streaming use-cases. - -### @typespec/openapi3 - -- [#4423](https://github.com/microsoft/typespec/pull/4423) Added support to use Scalar and Object as default types - -### @typespec/json-schema - -- [#4447](https://github.com/microsoft/typespec/pull/4447) Example set with `@example` decorator will populate the schema `examples` property - -### typespec-vscode - -- [#4330](https://github.com/microsoft/typespec/pull/4330) Support Compile Task and Watch Task in vscode. -- [#4498](https://github.com/microsoft/typespec/pull/4498) Make extension web compatible with minimal functionality - -## Bug Fixes - -### @typespec/compiler - -- [#4513](https://github.com/microsoft/typespec/pull/4513) Fixes issue with the semantic walker where `exitTuple` was not being emitted. -- [#4462](https://github.com/microsoft/typespec/pull/4462) Fix examples with enums inside of unions -- [#4574](https://github.com/microsoft/typespec/pull/4574) Fix: Passing `const` of model type to `@example` -- [#4551](https://github.com/microsoft/typespec/pull/4551) Json serialization of example respect `@encodedName` -- [#4514](https://github.com/microsoft/typespec/pull/4514) Fix issue with decimal numeric and leading `0.0` with multiple digit -- [#4445](https://github.com/microsoft/typespec/pull/4445) [API] model `sourceModels` property are now projected correctly -- [#4467](https://github.com/microsoft/typespec/pull/4467) Changing tspconfig.yaml won't take effect in LSP server because of the cache -- [#4563](https://github.com/microsoft/typespec/pull/4563) `tsp compile --watch` reread from `tspconfig.yaml` file -- [#4626](https://github.com/microsoft/typespec/pull/4626) [API] Add missing exit callback - -### @typespec/openapi - -- [#4505](https://github.com/microsoft/typespec/pull/4505) `@info` decorator validate no extra properties not starting with `x-` are provided. -- [#4483](https://github.com/microsoft/typespec/pull/4483) `@info` decorator validate `termsOfService` is a valid url - -### @typespec/internal-build-utils - -- [#4498](https://github.com/microsoft/typespec/pull/4498) Ignore test from third party notice generation - -### typespec-vscode - -- [#4430](https://github.com/microsoft/typespec/pull/4430) Use "shell" when spawning execution of .cmd file(i.e. tsp-server.cmd) in windows diff --git a/website/src/content/docs/docs/release-notes/release-2024-11-05.md b/website/src/content/docs/docs/release-notes/release-2024-11-05.md deleted file mode 100644 index 879ba330d70..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2024-11-05.md +++ /dev/null @@ -1,240 +0,0 @@ ---- -title: 0.62 - November 2024 -releaseDate: 2024-11-05 -version: "0.62" ---- - -## Notable changes - -### Improvements to template instantitation error - -If you have used TypeSpec with template you most likely encountered this hard to debug issue where the diagnostic would show up in the template declaration and not help you in understanding who called that template. This could become very tedious when going through many templates. - -#### Before - -```tsp title=main.tsp -model Spreading { - ...T; - // ^ error spread-model Cannot spread properties of non-model type. -} - -model Bar { - prop: Spreading; -} -``` - -```bash title="Tsp error output" -main.tsp:2:6 - error spread-model: Cannot spread properties of non-model type. -> 2 | ...T; - | ^ -``` - -#### Now - -```tsp title=main.tsp -model Spreading { - ...T; - // ^ error spread-model Cannot spread properties of non-model type. - // main.tsp:6:9 in instantiation of Spreading -} - -model Bar { - // Also show a warning at the point of usage - prop: Spreading; - // ^ warning spread-model In instantiation of this template - // main.tsp:2:6 Cannot spread properties of non-model type. -} -``` - -```bash title="Tsp error output" -main.tsp:2:6 - error spread-model: Cannot spread properties of non-model type. -> 2 | ...T; - | ^ - main.tsp:6:9 - occurred while instantiating template - > 6 | prop: Spreading; - | ^^^^^^^^^^^^^^^^^ -``` - -### Reference and augment model properties inside of alias and model expressions - -A long running issue of TypeSpec was the inability to use augment decorator on variety of cases: - -- Properties inside of an alias -- Properties inside of a nested model expression -- Properties comming from a `model is` - -You are now able to reference and augment any symbol that can be statically linked(Anything that doesn't involve template instantitation to know its content). - -```tsp -// Example 1: augment alias property -alias Alias = { - prop: string; -}; - -@@doc(Alias.prop, "My alias doc"); - -// Example 2: augment nested property -model Author { - address: { - city: string; - }; -} - -@@doc(Author.address::type.city, "Address city"); - -// Example 3: Property sourced from model is -model Nameable { - name: string; -} -model Author is Nameable; - -@@doc(Author.name, "Authors name"); - -// Example 4: Template constraint can be statically linked -model Author { - ...T; -} - -@@doc(Author.name, "Authors name"); - -// Example 5: Limitation: Cannot augment properties from a template parameter without constraint -model Base { - ...T; -} - -model Author - is Base<{ - name: string; - }>; - -@@doc(Base.name, "Authors name"); -// ^ error we cannot know Base will have a property called name -@@doc(Author.name, "Authors name"); -// ^ error we cannot know author has property name without instantiating Base -``` - -### `tspconfig.yaml` auto complete - -TypeSpec Language server now provide completion for the `tspconfig.yaml` file. It will auto complete the structure, available emitters and their options. - -![](./images/tspconfig-completion.png) - -### Paginated operations - -Addition of a few new decorators allowing declaring paginated operations - -```tsp -@list op listPets(): { - @pageItems pets: Pet[]; - links: { - @nextLink next?: url; - @prevLink prev?: url; - @firstLink first?: url; - @lastLink last?: url; - }; -}; -``` - -[See pagination docs for more details](../standard-library/pagination.md) - -### Xml support in OpenAPI3 emitter - -`@typespec/xml` library has been available for a few months but support in openapi3 emitter was lacking. - -```tsp title="main.yaml" -@encodedName("application/xml", "XmlPet") -model Pet { - @Xml.name("ItemsTags") - tags: string[]; -} -``` - -```yaml title="openapi.yaml" -Pet: - type: "object" - properties: - tags: - type: "array" - xml: - name: "ItemsTags" - wrapped: true - items: - type: string - xml: - name: "XmlPet" -``` - -Example xml: - -```xml - - - abc - def - - -``` - -[See xml guide for more info](../libraries/xml/guide.md) - -## Features - -### @typespec/compiler - -- [#4807](https://github.com/microsoft/typespec/pull/4807) CLI logs diagnostic source path relative to the CWD. -- [#4871](https://github.com/microsoft/typespec/pull/4871) [experimental] Mutators: Allow mutating namespaces -- [#4470](https://github.com/microsoft/typespec/pull/4470) Add support for paginated operations -- [#4849](https://github.com/microsoft/typespec/pull/4849) Overall of the symbol resolution. TypeSpec is able to resolve anything that can be statically linked. Augment decorators in turn are able to target any statically linkable types. -- [#4806](https://github.com/microsoft/typespec/pull/4806) Diagnostics emitted in template instance include instantiation trace. -- [#4790](https://github.com/microsoft/typespec/pull/4790) Support completion for tspconfig.yaml file in vscode - -### @typespec/http - -- [#4761](https://github.com/microsoft/typespec/pull/4761) Add `@cookie` decorator to specify cookie parameters -- [#4470](https://github.com/microsoft/typespec/pull/4470) Add new `LinkHeader` pagination type - -### @typespec/openapi - -- [#4834](https://github.com/microsoft/typespec/pull/4834) Add new `@tagMetadata` decorator to specify OpenAPI tag properties - -### @typespec/openapi3 - -- [#4761](https://github.com/microsoft/typespec/pull/4761) Add `@cookie` decorator to specify cookie parameters -- [#4214](https://github.com/microsoft/typespec/pull/4214) Add XML support using `@typespec/xml` library -- [#4834](https://github.com/microsoft/typespec/pull/4834) Add support for `@tagMetadata` decorator -- [#4906](https://github.com/microsoft/typespec/pull/4906) Updates tsp-openapi3 to support generating `@summary` decorators for models and operations from schema title and path item summary fields. - -### typespec-vscode - -- [#4790](https://github.com/microsoft/typespec/pull/4790) Support completion for tspconfig.yaml file in vscode -- [#4737](https://github.com/microsoft/typespec/pull/4737) Add basic snippets for typespec -- [#4912](https://github.com/microsoft/typespec/pull/4912) TypeSpec Language Server would be restarted with new settings when setting "typespec.tsp-server.path" is changed - -## Bug Fixes - -### @typespec/compiler - -- [#4745](https://github.com/microsoft/typespec/pull/4745) Improve diagnostic when JS files fail to load due to a JS error - -### @typespec/http - -- [#4932](https://github.com/microsoft/typespec/pull/4932) [API] Fix: Generated `uriTemplate` correctly include `*` for explode query params -- [#4804](https://github.com/microsoft/typespec/pull/4804) The description parameter of `@server` is now optional. - -### @typespec/openapi3 - -- [#4663](https://github.com/microsoft/typespec/pull/4663) Discriminator properties are marked as required regardless if they are in TypeSpec to match OpenAPI3 spec. -- [#4934](https://github.com/microsoft/typespec/pull/4934) tsp-openapi3 - fixes typespec generation for empty schema -- [#4727](https://github.com/microsoft/typespec/pull/4727) Nullable enum use `allOf` instead of `oneOf` -- [#4708](https://github.com/microsoft/typespec/pull/4708) Updates tsp-openapi3 to include path-level parameters in generated typespec operations. -- [#4873](https://github.com/microsoft/typespec/pull/4873) Updates tsp-openapi3 query decorator generation to use the value arguments. - -- [#4672](https://github.com/microsoft/typespec/pull/4672) OpenAPI3 type property should always be set when nullable property is present. - -### @typespec/json-schema - -- [#4732](https://github.com/microsoft/typespec/pull/4732) Document exported types - -### typespec-vscode - -- [#4912](https://github.com/microsoft/typespec/pull/4912) Fix the issue when Typespec Language Server can't be restarted when the server wasn't running before diff --git a/website/src/content/docs/docs/release-notes/release-2024-12-10.md b/website/src/content/docs/docs/release-notes/release-2024-12-10.md deleted file mode 100644 index 629d81a7472..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2024-12-10.md +++ /dev/null @@ -1,69 +0,0 @@ ---- -title: 0.63 - December 2024 -releaseDate: 2024-12-10 -version: "0.63" ---- - -## Notable changes - -### Experimental: Improve Realm, Mutator, and Typekit implementations - -The compiler strongly binds a Realm and Typekit together, and changes mutators so that new types are cloned within the mutator's realm. The default Typekit now creates a default typekit realm for the current program, and a Typekit can be easily created to work in a specific Program or Realm as needed. - -### Enum-driven Visibility - -A new mechanism for visibility that defines valid visibility values in enums and provides tools for filtering types by visibility. A new `LifecycleVisibility` enum defines standard protocol-agnostic visibility values for operations that manage the lifecycle (creation, update, deletion) of a resource. More details on visibility enums are available [in website documentation](../language-basics/visibility.md) - -## Features - -### @typespec/compiler - -- [#4937](https://github.com/microsoft/typespec/pull/4937) Add mutateSubgraphWithNamespace as a separate API -- [#4837](https://github.com/microsoft/typespec/pull/4837) Allow trailing delimiter in array values, tuple, decorator declaration, scalar initializer, etc. -- [#5149](https://github.com/microsoft/typespec/pull/5149) Experimental: Improve Realm, Mutator, and Typekit implementations. - -- [#4825](https://github.com/microsoft/typespec/pull/4825) Adds support for enum-driven visibility in the compiler core. - -### @typespec/openapi3 - -- [#5029](https://github.com/microsoft/typespec/pull/5029) Add support for `#deprecated` for OpenAPI3Parameter - -## Bug Fixes - -### @typespec/compiler - -- [#5252](https://github.com/microsoft/typespec/pull/5252) Added RegEx validation for @pattern and will throw warning for invalid RegEx string - -### @typespec/http - -- [#5016](https://github.com/microsoft/typespec/pull/5016) Uri template attributes were not extracted when parameter was explicitly mark with `@path` or `@query` as well - -### @typespec/http-server-csharp - -- [#4308](https://github.com/microsoft/typespec/issues/4308) Process sub-namespaces of a service -- [#4998](https://github.com/microsoft/typespec/issues/4998) Handle void returnType -- [#5000](https://github.com/microsoft/typespec/issues/5000) Handle tuple literals -- [#5001](https://github.com/microsoft/typespec/issues/5001) Skip envelope types withpout properties -- [#5024](https://github.com/microsoft/typespec/issues/5024) Literal type is not properly generated -- [#5124](https://github.com/microsoft/typespec/issues/5124) Skip uninstantiated templates -- [#5125](https://github.com/microsoft/typespec/issues/5125) Process operations outside interfaces -- Handle nullable types and anonymous typesin all contexts -- Add server-side numeric constraints for safeInt - -### @typespec/http-server-javascript - -- Add an additional check for the presence of a property before performing a bounds check on integer properties constrained to a range. -- [5185](https://github.com/microsoft/typespec/issues/5185) Add logic to handle invalid identifier names (#5185) - -### @typespec/versioning - -- [#5262](https://github.com/microsoft/typespec/pull/5262) Fixes diagnostics for @typeChangedFrom to properly detect when an incompatible version is referenced inside of a template, union, or tuple. - -### @typespec/openapi3 - -- [#5006](https://github.com/microsoft/typespec/pull/5006) Illegal characters in component keys -- [#5274](https://github.com/microsoft/typespec/pull/5274) Added missing peer dependency "openapi-types" - -### @typespec/json-schema - -- [#5189](https://github.com/microsoft/typespec/pull/5189) Fixes crash that occurred when a template instantiation's template argument was a union that references a declaration. diff --git a/website/src/content/docs/docs/release-notes/release-2025-01-15.md b/website/src/content/docs/docs/release-notes/release-2025-01-15.md deleted file mode 100644 index d293cf3f72b..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2025-01-15.md +++ /dev/null @@ -1,79 +0,0 @@ ---- -title: 0.64 - January 2025 -releaseDate: 2025-01-15 -version: "0.64" ---- - -## Notable changes - -### Open API 3.1 - -The `@typespec/openapi3` package now supports emitting Open API 3.1 specs. To emit Open API 3.1 specs, set the `openapi-versions` emitter option to `["3.1.0"]`. By default, the emitter will continue emitting Open API 3.0 specs. - -## Features - -### @typespec/compiler - -- [#5415](https://github.com/microsoft/typespec/pull/5415) Added support for emitter selections for init template. -- [#5316](https://github.com/microsoft/typespec/pull/5316) Compiler trace will be sent to IDE as trace log through language server -- [#5594](https://github.com/microsoft/typespec/pull/5594) Support Emitters section in Init Template when creating TypeSpec project in vscode -- [#5294](https://github.com/microsoft/typespec/pull/5294) Add capacities in TypeSpec Language Server to support "Scaffolding new TypeSpec project" in IDE - -### @typespec/http - -- [#5153](https://github.com/microsoft/typespec/pull/5153) Adds getStreamMetadata JS API to simplify getting stream metadata from operation parameters and responses. - -### @typespec/openapi3 - -- [#5372](https://github.com/microsoft/typespec/pull/5372) Adds support for @typespec/json-schema decorators with Open API 3.0 and 3.1 emitters. -- [#5372](https://github.com/microsoft/typespec/pull/5372) Adds support for emitting Open API 3.1 models using the `openapi-versions` emitter configuration option. - Open API 3.0 is emitted by default. - -### typespec-vscode - -- [#5312](https://github.com/microsoft/typespec/pull/5312) integrate client SDK generation -- [#5314](https://github.com/microsoft/typespec/pull/5314) Rename vscode extension from "TypeSpec for VS Code" to "TypeSpec" -- [#5594](https://github.com/microsoft/typespec/pull/5594) Support Emitters section in Init Template when creating TypeSpec project in vscode -- [#5294](https://github.com/microsoft/typespec/pull/5294) Support "Create TypeSpec Project" in vscode command and EXPLORER when no folder opened - Add Setting "typespec.initTemplatesUrls" where user can configure additional template to use to create TypeSpec project - example: - -``` -{ - "typespec.initTemplatesUrls": [ - { - "name": "displayName", - "url": "https://urlToTheFileContainsTemplates" - }], -} -``` - -Support "Install TypeSpec Compiler/CLI globally" in vscode command to install TypeSpec compiler globally easily - -## Bug Fixes - -### @typespec/compiler - -- [#5295](https://github.com/microsoft/typespec/pull/5295) Fix incorrectly returning a positive `BigInt` for a negative `Numeric`. -- [#5353](https://github.com/microsoft/typespec/pull/5353) Meta property are auto-completed, current only supported '::type', '::parameters', '::returnType' -- [#5180](https://github.com/microsoft/typespec/pull/5180) Fixed serialization of object examples on unions -- [#5525](https://github.com/microsoft/typespec/pull/5525) Enum-driven visibility decorators and projections now interact correctly. - -### @typespec/rest - -- [#5455](https://github.com/microsoft/typespec/pull/5455) In some scenarios, the options for the `@path` decorator do not accurately reflect the provided parameters, including the `#{allowReserved: true}` which is the `x-ms-skip-url-encoding` option. This change addresses and fixes this issue. - -### @typespec/openapi3 - -- [#5172](https://github.com/microsoft/typespec/pull/5172) Allow void to be the response body type when other fields are present in the model. Previously, using `void` as a response body type would fail compilation if the model contained other fields (like `statusCode`). -- [#5456](https://github.com/microsoft/typespec/pull/5456) Fix: OpenAPI YAML converts strings to boolean - -### @typespec/internal-build-utils - -- [#5312](https://github.com/microsoft/typespec/pull/5312) resolve the program crash when there is no package name in package.json - -### typespec-vscode - -- [#5413](https://github.com/microsoft/typespec/pull/5413) Do not start TypeSpec Language Server when there is no workspace opened -- [#5131](https://github.com/microsoft/typespec/pull/5131) Support 'See Document' quick action to view the details of linter rules -- [#5428](https://github.com/microsoft/typespec/pull/5428) improve console output when tsp-server not found diff --git a/website/src/content/docs/docs/release-notes/release-2025-02-11.md b/website/src/content/docs/docs/release-notes/release-2025-02-11.md deleted file mode 100644 index afe2749bc74..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2025-02-11.md +++ /dev/null @@ -1,127 +0,0 @@ ---- -title: 0.65 - February 2025 -releaseDate: 2025-02-11 -version: "0.65" ---- - -:::note -This release contains deprecations -::: - -## Notables features - -### Converting Json/JS like object to tsp values is easier - -Previously the quick fix to convert a model expression or tuple to an object/array value would only apply at one level. It is now applied to the entire value allowing for easier conversion of complex objects. - -```tsp -@example({ - a: 1, - b: 2, - c: { - d: 3, - e: 4, - f: [5, 6, 7] - } -}) -``` - -Will be converted to this with the quick fix: - -```tsp -@example(#{ - a: 1, - b: 2, - c: #{ - d: 3, - e: 4, - f: #[5, 6, 7] - } -}) -``` - -### Additional completion in the tspconfig.yaml - -IDE support for the `tspconfig.yaml` was improved adding completion for the `extends` field, `imports`, `rule`, `rule sets` and `variables`. The completion items now also show required/optional information in the details of emitter's options. - -## Deprecations - -### @typespec/compiler - -- [#4931](https://github.com/microsoft/typespec/pull/4931) Deprecate experimental projection. Projection will be removed in version 0.66 - -### @typespec/versioning - -- [#4931](https://github.com/microsoft/typespec/pull/4931) Deprecate versioning projection, switch to the mutator approach - -```diff lang="tsp" -// Step 1: Update to retrieve the mutation instead of projections --const versions = buildVersionProjections(program, service.type); -+const versions = getVersioningMutators(program, service.type); - -// Step 2: call mutator instead of projection api --const projectedProgram = projectProgram(originalProgram, versionRecord.projections); -+const subgraph = unsafe_mutateSubgraphWithNamespace(program, [mutator], service.type); -+subgraph.type // this is the mutated service namespace -``` - -## Features - -### @typespec/compiler - -- [#5572](https://github.com/microsoft/typespec/pull/5572) Add support for [ESM subpath imports](https://nodejs.org/api/packages.html#subpath-imports) -- [#5790](https://github.com/microsoft/typespec/pull/5790) Add option for semantic walker to visit model derived types -- [#5340](https://github.com/microsoft/typespec/pull/5340) Add Experimental Typekit helpers for `@typespec/http` -- [#5716](https://github.com/microsoft/typespec/pull/5716) Updated Rest init template to include additional emitters(client, server) and a basic sample. -- [#5186](https://github.com/microsoft/typespec/pull/5186) Support the auto completion for extends, imports, rule, rule sets and variables in tspconfig.yaml -- [#5186](https://github.com/microsoft/typespec/pull/5186) Show required/optional information in the details of emitter's options completion item in tspconfig.yaml -- [#5342](https://github.com/microsoft/typespec/pull/5342) Convert model/tuple expression to value code fix is applied to the entire value. -- [#5824](https://github.com/microsoft/typespec/pull/5824) `tsp init` will not automatically run `tsp install` if a `package.json` file is created. -- [#4931](https://github.com/microsoft/typespec/pull/4931) [Experimental] Update to subgraph mutator to visit all missing relations -- [#5416](https://github.com/microsoft/typespec/pull/5416) Added APIs for getting parameterVisibility and returnTypeVisibility as VisibilityFilter objects. -- [#5699](https://github.com/microsoft/typespec/pull/5699) Promote `unsafe_useStateMap` and `unsafe_useStateSet` experimental APIs to stable version `useStateMap` and `useStateSet`. Old ones are deprecated - -### @typespec/http - -- [#5340](https://github.com/microsoft/typespec/pull/5340) Add Experimental Typekit helpers for `@typespec/http` - -### @typespec/versioning - -- [#5459](https://github.com/microsoft/typespec/pull/5459) add code fixes for incompatible version errors -- [#4931](https://github.com/microsoft/typespec/pull/4931) Provide new mutator based way of getting version snapshot - -### @typespec/rest - -- [#5685](https://github.com/microsoft/typespec/pull/5685) Updates `CollectionWithNextLink` to support pagination - -### @typespec/openapi3 - -- [#5831](https://github.com/microsoft/typespec/pull/5831) Updates tsp-openapi3 operation response generation to inline expressions and pare down fields with default values. Also adds support for Open API headers and responses $refs. -- [#4931](https://github.com/microsoft/typespec/pull/4931) Migrate versioning implementation to use mutator approach. - -### typespec-vscode - -- [#5451](https://github.com/microsoft/typespec/pull/5451) Support importing TypeSpec from OpenAPI 3.0 doc - -## Bug Fixes - -### @typespec/compiler - -- [#5940](https://github.com/microsoft/typespec/pull/5940) Fix: Infinite loop in language server due to not caching indeterminate entities in templates -- [#5186](https://github.com/microsoft/typespec/pull/5186) Fix the issue that extra " will be added when auto completing emitter options inside "" -- [#5833](https://github.com/microsoft/typespec/pull/5833) Fix tracing in `SourceLoader` - -### @typespec/openapi3 - -- [#5893](https://github.com/microsoft/typespec/pull/5893) Updates tsp-openapi3 to support $ref in requestBodies - -### typespec-vs - -- [#5834](https://github.com/microsoft/typespec/pull/5834) Update extension configuration URLs in error message - -### typespec-vscode - -- [#5752](https://github.com/microsoft/typespec/pull/5752) Disable coloring text when generating code -- [#5754](https://github.com/microsoft/typespec/pull/5754) Add example to the vscode setting "initTemplatesUrls" -- [#5886](https://github.com/microsoft/typespec/pull/5886) refine the quickpick placeholder and the log -- [#5834](https://github.com/microsoft/typespec/pull/5834) Update extension configuration URLs in error message diff --git a/website/src/content/docs/docs/release-notes/release-2025-03-04.md b/website/src/content/docs/docs/release-notes/release-2025-03-04.md deleted file mode 100644 index d2bb1d88701..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2025-03-04.md +++ /dev/null @@ -1,263 +0,0 @@ ---- -title: 0.66 - March 2025 -releaseDate: 2025-03-04 -version: "0.66" ---- - -:::caution -This release contains deprecations that will be removed in the following version. -As we are preparing for 1.0-rc0, we are cleaning up the typespec language and some of the libraries. -::: - -## Notable changes - -### New Discriminated union with `@discriminated` - -In order to simplify and provide a more intuitive discriminated union experience, we have introduced a new `@discriminated` decorator. -This decorators allows you to define a discriminated union that will use the variant names as the discriminator values. -The decorator allows customizing the serialization of the union(by default using an envelop object) - -```tsp -@discriminated -union Pet { - cat: Cat, - dog: Dog, -} -``` - -Serialize as - -```json -{ - "kind": "cat", - "value": { - "name": "Whiskers", - "meow": true - } -}, -{ - "kind": "dog", - "value": { - "name": "Rex", - "bark": false - } -} -``` - -### New `tsp compile` progress indicator - -```ansi -$ tsp compile . -TypeSpec compiler v0.65.3 - -✔ Compiling -⠙ @typespec/openapi3 -``` - -```ansi -$ tsp compile . -TypeSpec compiler v0.65.3 - -✔ Compiling -✔ @typespec/openapi3 - -Compilation completed successfully. -``` - -## Breaking Changes - -### @typespec/openapi3 - -- [#6182](https://github.com/microsoft/typespec/pull/6182) Using `{service-name}` in `tspconfig.yaml` will always interpolate the current service name. `{service-name-if-multiple}` can be used to get the previous behavior - -## Deprecations - -### @typespec/compiler - -- [#6059](https://github.com/microsoft/typespec/pull/6059) Deprecate use of `@discriminator` on union. Migrate to `@discriminated` - - ```diff lang="tsp" - -@discriminator("type") - +@discriminated(#{envelope: "none", discriminatorPropertyName: "type"}) - union Pet; - ``` - -- [#6088](https://github.com/microsoft/typespec/pull/6088) Deprecate use of string-based visibility modifiers using warnings. - - String-based visibilities can be replaced as follows: - - `"create"`, `"read"`, `"update"`, `"delete"`, and `"query"` can be replaced with `Lifecycle.Create`, `Lifecycle.Read`, `Lifecycle.Update`, `Lifecycle.Delete`, and `Lifecycle.Query` respectively. - - `@visibility("none")` can be replaced with `@invisible(Lifecycle)`. - - For example: - - ```tsp - @visibility("create", "read") - example: string; - ``` - - can be replaced with: - - ```tsp - @visibility(Lifecycle.Create, Lifecycle.Read) - example: string; - ``` - - ```tsp - @visibility("none") - example: string; - ``` - - can be replaced with: - - ```tsp - @invisible(Lifecycle) - example: string; - ``` - - Additionally, `@parameterVisibility` with no arguments is deprecated. - - ```tsp - @parameterVisibility - @patch - op example(@bodyRoot resource: Resource): Resource; - ``` - - The effect of `@parameterVisibility` is to disable effective PATCH optionality. If you wish - to disable effective PATCH optionality in `@typespec/http`, preventing it from treating all - properties of the request body as effectively optional, you can now do so explicitly: - - ```tsp - @patch(#{ implicitOptionality: false }) - op example(@bodyRoot resource: Resource): Resource; - ``` - -- [#6108](https://github.com/microsoft/typespec/pull/6108) Migrate `@service` decorator options to take in a value - - ```diff lang="tsp" - -@service({title: "My service"}) - +@service(#{title: "My service"}) - ``` - -### @typespec/http - -- [#6130](https://github.com/microsoft/typespec/pull/6130) Updates `@header` decorator to accept values and adds the `explode` option. - Note that using the model expression syntax to pass in arguments, or using the - `format` field, are now deprecated. - - ```diff lang="tsp" - op example1( - - @header({ name: "ETag" }) etag: string - + @header(#{ name: "ETag" }) etag: string - ): void; - - op example2( - - @header({ format: "csv" }) list: string[] - + @header list: string[] - ): void; - ``` - -### @typespec/openapi - -- [#6078](https://github.com/microsoft/typespec/pull/6078) Updates the `@extension` decorator with 3 changes: - 1. Removes the extension name starts with `x-` constraint. - 1. Adds support for passing in values to emit raw data. - 1. Adds a deprecation warning for passing in types. Passed in types will emit Open API schemas in a future release. - - Scalar literals (e.g. string, boolean, number values) are automatically treated as values. - Model or tuple expression usage needs to be converted to values to retain current behavior in future releases. - - ```diff lang="tsp" - -@extension("x-obj", { foo: true }) - +@extension("x-obj", #{ foo: true }) - -@extension("x-tuple", [ "foo" ]) - +@extension("x-tuple", #[ "foo" ]) - model Foo {} - ``` - -- [#6108](https://github.com/microsoft/typespec/pull/6108) Migrate `@info` decorator to expect a value - - ```diff lang="tsp" - -@info({ version: "1.0.0" }) - +@info(#{ version: "1.0.0" }) - ``` - - ```diff lang="tsp" - -@info({ - +@info(#{ - termsOfService: "http://example.com/terms/", - - contact: { - + contact: #{ - name: "API Support", - url: "http://www.example.com/support", - email: "support@example.com" - }, - }) - ``` - -## Features - -### @typespec/compiler - -- [#5483](https://github.com/microsoft/typespec/pull/5483) Add autocomplete of model properties for union type -- [#5458](https://github.com/microsoft/typespec/pull/5458) Add codefix for for various triple quoted string syntax issues -- [#6082](https://github.com/microsoft/typespec/pull/6082) Introduced `list-files` flag to log all emitted files. -- [#6082](https://github.com/microsoft/typespec/pull/6082) Added a progress indicator to show the current stage of tsp compilation process. -- [#6059](https://github.com/microsoft/typespec/pull/6059) Add new `@discriminated` decorator to represent discriminated union with implicit envelopes -- [#5494](https://github.com/microsoft/typespec/pull/5494) Report unused template parameters in language server -- [#6045](https://github.com/microsoft/typespec/pull/6045) Redesign and simplification of `tsp init` -- [#5996](https://github.com/microsoft/typespec/pull/5996) Add Typekits to support EFV2 -- [#5986](https://github.com/microsoft/typespec/pull/5986) Tsp init template with both config and emitters merge in tspconfig.yaml - -- [#6047](https://github.com/microsoft/typespec/pull/6047) `--version` shows if tsp is running from the standalone version -- [#5453](https://github.com/microsoft/typespec/pull/5453) Report unused `using` in language server -- [#6164](https://github.com/microsoft/typespec/pull/6164) Renamed package `@typespec/http-server-javascript` to `@typespec/http-server-js`. - -### @typespec/http - -- [#5996](https://github.com/microsoft/typespec/pull/5996) Emitter Framework V2 - -### @typespec/openapi3 - -- [#6059](https://github.com/microsoft/typespec/pull/6059) Add support for new `@discriminated` unions -- [#5994](https://github.com/microsoft/typespec/pull/5994) Adds `seal-object-schemas` emitter option to automatically set additionalProperties/unevaluatedProperties to `{ not: {} }` wherever possible -- [#5961](https://github.com/microsoft/typespec/pull/5961) Updates JsonSchema and Open API 3.1 emitters to use unevaluatedProperties instead of additionalProperties, and updates Open API 3 emitters to match JsonSchema behavior of treating `Record` as setting `additionalProperties: { not: {} }` -- [#6130](https://github.com/microsoft/typespec/pull/6130) updates openapi3 to respect `@headers` `explode` option and use value syntax -- [#6157](https://github.com/microsoft/typespec/pull/6157) Shared operations operationId can now be set if they all share the same value provided by `@operationId` -- [#6006](https://github.com/microsoft/typespec/pull/6006) Expose core library types in API surface. - -### @typespec/html-program-viewer - -- [#5996](https://github.com/microsoft/typespec/pull/5996) Emitter Framework V2 - -### @typespec/json-schema - -- [#5994](https://github.com/microsoft/typespec/pull/5994) Adds `seal-object-schemas` emitter option to automatically set additionalProperties/unevaluatedProperties to `{ not: {} }` wherever possible -- [#5961](https://github.com/microsoft/typespec/pull/5961) Updates JsonSchema and Open API 3.1 emitters to use unevaluatedProperties instead of additionalProperties, and updates Open API 3 emitters to match JsonSchema behavior of treating `Record` as setting `additionalProperties: { not: {} }` - -### typespec-vs - -- [#5968](https://github.com/microsoft/typespec/pull/5968) Support intellisense for tsconfig.yaml in visual studio - -### typespec-vscode - -- [#6014](https://github.com/microsoft/typespec/pull/6014) Add "Import TypeSpec from OpenApi3" menu item into explorer context menu -- [#6164](https://github.com/microsoft/typespec/pull/6164) Renamed package `@typespec/http-server-javascript` to `@typespec/http-server-js`. - -## Bug Fixes - -### @typespec/compiler - -- [#4926](https://github.com/microsoft/typespec/pull/4926) Augmenting an expression will now report an error instead of silently failing to apply. -- [#5937](https://github.com/microsoft/typespec/pull/5937) Fix: StringTemplate type not supported in typespecValueToJson -- [#6204](https://github.com/microsoft/typespec/pull/6204) Fix `@example` reporting assignability error when using mix metadata(http) models -- [#6125](https://github.com/microsoft/typespec/pull/6125) Fix tmlanguage syntax highlighting when using decorator before escaped identifier -- [#6192](https://github.com/microsoft/typespec/pull/6192) Fix `tsp info` crash -- [#6203](https://github.com/microsoft/typespec/pull/6203) Fix mutator not mutating sourceModel(s) - -### @typespec/openapi3 - -- [#5901](https://github.com/microsoft/typespec/pull/5901) Fix: `@typespec/openapi3/invalid-component-fixed-field-key` show on incorrect target - -### typespec-vscode - -- [#6137](https://github.com/microsoft/typespec/pull/6137) Fix code snippet for union in typespec-vscode diff --git a/website/src/content/docs/docs/release-notes/release-2025-03-18.md b/website/src/content/docs/docs/release-notes/release-2025-03-18.md deleted file mode 100644 index 0e63fccb097..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2025-03-18.md +++ /dev/null @@ -1,502 +0,0 @@ ---- -title: "0.67" -releaseDate: 2025-03-18 -version: "0.67" ---- - -:::caution -This release contains breaking changes. This is the last release before 1.0-rc.0 which was focused on cleaning up deprecated features and APIs. -::: - -## Notable changes - -### `tsp install` now download and use the configured package manager - -In order to detach typespec from any specific package manager, `tsp install` now uses the package manager configured in `packageManager` or `devEngines.packageManager` field of `package.json`. If the field is not present, it defaults to `npm` latest version but will log a warning. - -```json title="package.json" -{ - // Use npm 11.2.0 with sha512 checksum verification - "packageManager": "npm@11.2.0+sha512.3dc9c50ba813a3d54393155a435fe66404b72685ab0e3008f9ae9ed8d81f6104860f07ed2656dd5748c1322d95f3140fa9b19c59a6bba7750fd12285f81866da", - // Use npm 11.2.0 but skip integrity check - "packageManager": "npm@11.2.0" -} -``` - -The field can be automatically set by running `tsp install --save-package-manager` - -## Breaking Changes - -### All packages - -- [#5977](https://github.com/microsoft/typespec/pull/5977) Minimum node version is now 20 - -### @typespec/compiler - -- [#6231](https://github.com/microsoft/typespec/pull/6231) Remove deprecated items: - - `@deprecated` decorator, use `#deprecated` directive instead - - ```diff lang=tsp - - @deprecated("Message") - + #deprecated "Message" - ``` - - - `@service` `versions` support. Either migrate to `@OpenAPI.info` or the versioning library - - ```diff lang=tsp - - @service({version: "1.0"}) - + @service - + @OpenAPI.info(#{version: "1.0"}) - ``` - - - Removed `@knownValues`. Use a union with a string variant instead - - ```diff lang=tsp - - enum MyKnownValues {a, b} - - @knownValues(MyKnownValues) - - scalar Custom extends string; - + union Custom { - + "a", "b", string - + }; - ``` - - - Removed `@projectedName` Migrate to `@encodedName` instead. - - ```diff lang=tsp - - @projectedName("json", "nbf") - + @encodedName("application/json", "nbf") - notBefore: int32; - ``` - - - CLI configuration value `output-path`, use `output-dir` instead. - - - Support for `cadlMain` in `package.json`. Migrate to `exports["."].tsp` instead. - - ```diff lang=json - - "cadlMain": "lib/main.tsp", - + "exports": { - + ".": { - + "tsp": "lib/main.tsp" - + } - + } - ``` - - - Compiling `.cadl` files, use `.tsp` instead. - - - `decoratorArgMarshalling` flag in `$flags` was removed and support for the `legacy` decorator arg marshalling. - - - Using `@format` on bytes. `@format` can only be used on string where it defines a known pattern for the string. - - - Javascript functions and typescript types: - - `stringTemplateToString` - - `CadlLanguageConfiguration` - - `CadlPrettierPlugin` - - `NodePackage` -> `PackageJson` - - `CadlValue` -> `TypeSpecValue` - - `createCadlLibrary` -> `createTypeSpecLibrary` - - `setCadlNamespace` -> `setTypeSpecNamespace` - - `CadlLibrary` -> `TypeSpecLibrary` - - `SyntaxKind.CadlScript` -> `SyntaxKind.TypeSpecScript` - - `isCadlValueTypeOf` -> `isTypeSpecValueTypeOf` - - `cadlTypeToJson` -> `typespecTypeToJson` - - `checkFormatCadl` -> `checkFormatTypeSpec` - - `cadlVersion` -> `typespecVersion` - - `CadlManifest` -> `TypeSpecManifest` - - `validateDecoratorTargetIntrinsic` -> Use `extern dec` to define the signature of decorators instead - - `validateDecoratorParamType` -> Use `extern dec` to define the signature of decorators instead - - `createDecoratorDefinition` -> Use `extern dec` to define the signature of decorators instead - - `CompilerOptions#emitters` -> Use `emit` and `options` field instead. - ```diff lang=ts - - emitters: { "my-emitter": options }, - + emit: ["my-emitter"], - + options: { "my-emitter": options }, - ``` - - `Type#templateArguments` -> Use `templateMapper` instead. - - `ModelProperty#default` -> Use `defaultValue` instead. - - `Union#options` -> Use `variants` instead. - - `linter` in `createTypeSpecLibrary` -> Use `export const $linter = defineLinter({ ... })` instead. - - Accessor for removed `@knownValues` decorator - - `getKnownValues` - - Accessor for removed `@projectedName` decorator - - `getProjectedNames` - - `getProjectedName` - - `hasProjectedName` - -- [#6323](https://github.com/microsoft/typespec/pull/6323) Move AST related APIS to `@typespec/compiler/ast` package. This is to mark a clear separation for the AST types and APIs which are considered for advanced usage and might change at any time. - - All `*Node` types - - `exprIsBareIdentifier` - - `getFirstAncestor` - - `getIdentifierContext` - - `getNodeAtPosition` - - `getNodeAtPositionDetail` - - `hasParseError` - - `isImportStatement` - - `parse` - - `parseStandaloneTypeReference` - - `positionInRange` - - `visitChildren` -- [#6323](https://github.com/microsoft/typespec/pull/6323) Stop exposing APIs that were not meant for external users. Please file issue if you had legitmate use of some of those APIs. - - `Checker`: The check itself should be used very carefully and its wouldn't be covered under the compatibility guarantees. There is some apis that were explicitly marked as internal while other remained until we provide a better way to do the same thing: - - `getGlobalNamespaceType();` -> `program.getGlobalNamespaceType();` - - `resolveTypeReference();` -> `program.resolveTypeReference();` - - `checkProgram();` This isn't meant to be used by external users. - - `getLiteralType()` This isn't meant to be used by external users. - - `resolveRelatedSymbols()` This isn't meant to be used by external users. - - `resolveCompletions()` This isn't meant to be used by external users. - - - `Program`: Exposed functions on the program are safe to use but a few have been updated to be internal: - - `mainFile` -> Use `projectRoot` instead. - - `literalTypes` This isn't meant to be used by external users. - - `checker`: This is still exposed but to be used carefully, see above. - - `loadTypeSpecScript`: This isn't meant to be used by external users. - - `onValidate`: This isn't meant to be used by external users. - - `reportDuplicateSymbols`: This isn't meant to be used by external users. - - - `logVerboseTestOutput` Internal test util, not meant for external users - - `validateDecoratorTarget` -> migrate to `extern dec` declaration - - `validateDecoratorParamCount`: Same as above - - `altDirectorySeparator`: Internal path utils - - `directorySeparator`: Internal path utils - - `isIntrinsicType`: Internal check - - `getFullyQualifiedSymbolName` Symbols are an internal aspect of the compiler - - Scanner related APIs: - - `createScanner` - - `isComment` - - `isKeyword` - - `isModifier` - - `isPunctuation` - - `isStatementKeyword` - - `isTrivia` - - `skipContinuousIdentifier` - - `skipTrivia` - - `skipTriviaBackward` - - `skipWhiteSpace` - - `Token` - - `TokenFlags` - - `type`DocToken, - - `type`Scanner, - - `type`StringTemplateToken, - - Types - - `Sym` Symbols are an internal aspect of the compiler - - `SymbolLinks` Symbols are an internal aspect of the compiler - - `SymbolTable` Symbols are an internal aspect of the compiler - - `SymbolFlags` Symbols are an internal aspect of the compiler - - `MutableSymbolTable` Symbols are an internal aspect of the compiler - - `ResolutionResult` Internal type used in non exposed resolver - - `NodeLinks` Internal type used in non exposed resolver - - `ResolutionResultFlags` Internal type used in non exposed resolver - - `MetaMemberKey` Unused type - - `MetaMembersTable` Unused type - - `Dirent` Unused type - -- [#6410](https://github.com/microsoft/typespec/pull/6410) Remove a legacy behavior of resolving package names which wasn't inline with node ESM module resolution. - - For example if you were running tsp compile within your node_modules folder(on a test package) and referencing your emitter by name you might need to change this - - ```diff lang=bash - -tsp compile . --emit my-emitter - +tsp compile . ../../ # path to your emitter root instead - ``` - -- [#6286](https://github.com/microsoft/typespec/pull/6286) Removed deprecated use of `@discriminator` on union. Migrate to `@discriminated` - - ```diff lang="tsp" - -@discriminator("type") - +@discriminated(#{envelope: "none", discriminatorPropertyName: "type"}) - union Pet; - ``` - -- [#6327](https://github.com/microsoft/typespec/pull/6327) Remove projection. Projection was an experiemental syntax that was too flawed to be included in 1.0 in that current state. -- [#6388](https://github.com/microsoft/typespec/pull/6388) Remove deprecated type to value conversion. Since the introductions of object values(`#{}`) and array values(`#[]`) using model expressions or tuple where values were expected has been deprecated. It is now an error with a codefix. - - ```diff lang="tsp" - -@service({title: "My service"}) - +@service(#{title: "My service"}) - ``` - -- [#6416](https://github.com/microsoft/typespec/pull/6416) Adding new keywords for future use: - - `statemachine` - - `macro` - - `package` - - `metadata` - - `env` - - `arg` - - `declare` - - `array` - - `struct` - - `record` - - `module` - - `mod` - - `pub` - - `sub` - - `typeref` - - `trait` - - `this` - - `self` - - `super` - - `keyof` - - `with` - - `implements` - - `impl` - - `satisfies` - - `flag` - - `auto` - - `partial` - - `private` - - `public` - - `protected` - - `internal` - - `sealed` - - `local` - - `async` -- [#6258](https://github.com/microsoft/typespec/pull/6258) Removed deprecated legacy visibility APIs and converted all warnings for using string-based visibility modifiers to errors. - - The removed APIs include: - - `getVisibility`: use `getVisibilityForClass` instead. - - `getParameterVisibility`: use `getParameterVisibilityFilter` instead. - - `getReturnTypeVisibility`: use `getReturnTypeVisibilityFilter` instead. - - Furthermore, the legacy signature of `isVisible` that accepts an array of strings has been removed. Please use the new signature that accepts `EnumMember` instead. - - The changed decorators include: - - `@visibility` - - `@parameterVisibility` - - `@returnTypeVisibility` - - `@withVisibility` - - `@withDefaultKeyVisibility` - - The `TypeSpec.DefaultKeyVisibility` template also no longer accepts a string as a visibility modifier argument. - - Attempting to pass a string to any of the above decorators or templates will now result in a type-checking error. Please use the `Lifecycle` visibility modifiers instead. - - If you develop a third-party library and you use any custom visibility modifiers, you will need to instead define a visibility class enum. See: [Visibility | TypeSpec](https://typespec.io/docs/language-basics/visibility/). - - **Migration steps**: - - String-based visibilities can be replaced as follows: - - `"create"`, `"read"`, `"update"`, `"delete"`, and `"query"` can be replaced with `Lifecycle.Create`, `Lifecycle.Read`, `Lifecycle.Update`, `Lifecycle.Delete`, and `Lifecycle.Query` respectively. - - `@visibility("none")` can be replaced with `@invisible(Lifecycle)`. - - For example: - - ```tsp - @visibility("create", "read") - example: string; - ``` - - can be replaced with: - - ```tsp - @visibility(Lifecycle.Create, Lifecycle.Read) - example: string; - ``` - - ```tsp - @visibility("none") - example: string; - ``` - - can be replaced with: - - ```tsp - @invisible(Lifecycle) - example: string; - ``` - - Additionally, `@parameterVisibility` with no arguments has been made an error. Previously, some specifications used it to disable effective PATCH optionality, but that behavior was an unintended side effect. For example: - - ```tsp - @parameterVisibility - @patch - op example(@bodyRoot resource: Resource): Resource; - ``` - - If you wish to disable effective PATCH optionality in `@typespec/http`, preventing it from treating all properties of the request body as effectively optional, you can now do so explicitly: - - ```tsp - @patch(#{ implicitOptionality: false }) - op example(@bodyRoot resource: Resource): Resource; - ``` - -### @typespec/http - -- [#6387](https://github.com/microsoft/typespec/pull/6387) Removing deprecated items - -- `isContentTypeHeader` -- `setLegacyStatusCodeState` - -Moved to internal - -- `setStatusCode` -- [#6305](https://github.com/microsoft/typespec/pull/6305) Remove deprecated items: - -- `format` option from `@header` and `@query` decorators. Use `explode` option instead. - - ```diff - -@header(#{ format: "multi"}) - -@query(#{ format: "multi"}) - +@header(#{ explode: true }) - +@query(#{ explode: true }) - ``` - -- `shared` option from `@route` decorator. Please use `@sharedRoute` instead. - - ```diff - -@route("/doStuff", { shared: true }) - +@sharedRoute - +@route("/doStuff") - ``` - -- Javascript functions and typescript types: - - `HeaderOptions.format` - - `HeaderFieldOptions.format` - - `QueryOptions.format` - - `QueryParameterOptions.format` - - `MetadataInfo.isEmptied` - - `includeInterfaceRoutesInNamespace` - - `getAllRoutes` -> `getAllHttpServices` - - `OperationDetails` -> `HttpOperation` - - `ServiceAuthentication` -> `Authentication` - - `HttpOperationParameters.bodyType` -> `body.type` - - `HttpOperationParameters.bodyParameter` -> `body.parameter` - - `StatusCode` -> `HttpStatusCodesEntry` - -- [#6433](https://github.com/microsoft/typespec/pull/6433) Stop exposing APIs that were not meant for external users. Please file issue if you had legitmate use of some of those APIs. - - `@includeInapplicableMetadataInPayload` decorator was moved to `Private` namespace and stop exposing the accessor. - - Functions used in `getHttpOperation` to resolve the finalized view of the http operation but shouldn't be used directly. - - `resolvePathAndParameters` - - `validateRouteUnique` internal api used in http library validation - - Moved custom route producer related APIs to experimental with `unsafe_` prefix. Those APIs are not ready for public use and **will** change in future. - - `DefaultRouteProducer` -> `unsafe_DefaultRouteProducer` - - `getRouteProducer` -> `unsafe_getRouteProducer` - - `setRouteProducer` -> `unsafe_setRouteProducer` - - `setRouteOptionsForNamespace` -> `unsafe_setRouteOptionsForNamespace` - - `RouteProducer` -> `unsafe_RouteProducer` - - `RouteProducerResult` -> `unsafe_RouteProducerResult` - - `RouteResolutionOptions` -> `unsafe_RouteResolutionOptions` - - `RouteOptions` -> `unsafe_RouteOptions` -- [#6357](https://github.com/microsoft/typespec/pull/6357) Changed the default content-type resolution behavior as follows: - -- As before, if the content-type header is _explicitly_ specified (`@header contentType: valueof string`), the explicit content type is used (this behavior has not changed). -- If the type of an HTTP payload body has a Media Type hint (`@mediaTypeHint`), that media type is preferred as the default content-type for the request. -- The default content-type for `TypeSpec.bytes` has been changed to `application/octet-stream` to avoid serializing the data to base64-encoded JSON. -- The default content-type for all other scalar types has been changed to `text/plain` (previously, it was `application/json`). -- For multipart payloads, the default content-type of the payload has been changed to `multipart/form-data` if the `@multipartBody` parameter has a Model type and `multipart/mixed` if the multipart payload has a tuple type. - - The content-type of individual parts in the multipart request has been changed to be the same as for HTTP payload bodies and follows the logic described above. - -### @typespec/versioning - -- [#6327](https://github.com/microsoft/typespec/pull/6327) Remove deprecated versioning projection, switch to the mutator approach - - ```diff lang="tsp" - // Step 1: Update to retrieve the mutation instead of projections - -const versions = buildVersionProjections(program, service.type); - +const versions = getVersioningMutators(program, service.type); - - // Step 2: call mutator instead of projection api - -const projectedProgram = projectProgram(originalProgram, versionRecord.projections); - +const subgraph = unsafe_mutateSubgraphWithNamespace(program, [mutator], service.type); - +subgraph.type // this is the mutated service namespace - ``` - -## Deprecations - -### @typespec/compiler - -- [#6310](https://github.com/microsoft/typespec/pull/6310) Deprecate `@typespec/compiler/emitter-framework` export in favor of a new package `@typespec/asset-emitter` - - ```diff lang=json title=package.json - "dependencies": { - + "@typespec/asset-emitter": "0.67.0" - } - ``` - - ```diff lang=ts - -import { TypeEmitter, ... } from "@typespec/compiler/emitter-framework"; - +import { TypeEmitter, ... } from "@typespec/asset-emitter"; - ``` - -- [#6306](https://github.com/microsoft/typespec/pull/6306) Remove the use of deprecated getDiscriminatedUnion - -### @typespec/http - -- [#6464](https://github.com/microsoft/typespec/pull/6464) Deprecate implicit multipart body - - ```diff lang=tsp - op upload( - @header contentType: "multipart/form-data", - - @body body: { - + @multipartBody body: { - - name: string; - + name: HttpPart; - - avatar: bytes; - + avatar: HttpPart; - } - ): void; - ``` - -### @typespec/openapi3 - -- [#6305](https://github.com/microsoft/typespec/pull/6305) Related changes based on `http` library deprecation removal. - -## Features - -### @typespec/compiler - -- [#6411](https://github.com/microsoft/typespec/pull/6411) Introduce a new `dryRun` compiler option(`--dry-run` in the cli) that emitters can opt-in to support by setting `capabilities.dryRun` in their `$lib`. -- [#6411](https://github.com/microsoft/typespec/pull/6411) Update `noEmit` compiler option (`--no-emit` cli flag) to prevent emitter to run. A new `dryRun` option has been added to achieve a safer similar result where emitters run but do not write output. -- [#6220](https://github.com/microsoft/typespec/pull/6220) `tsp install` now downloads and uses the configured package manager in `devEngines.packageManager` or `packageManager` field of `package.json` -- [#6357](https://github.com/microsoft/typespec/pull/6357) Add support for `@mediaTypeHint` to apply a hint for default Media/MIME type (Content-Type in HTTP) to a TypeSpec type. - -### @typespec/http - -- [#6345](https://github.com/microsoft/typespec/pull/6345) Update `BasicAuth` and `BearerAuth` types scheme to use standard name for scheme `Basic`, `Bearer` -- [#6327](https://github.com/microsoft/typespec/pull/6327) Remove reference to delete projection feature - -### @typespec/openapi3 - -- [#6268](https://github.com/microsoft/typespec/pull/6268) `@typespec/versioning` is now an optional dependency. -- [#6286](https://github.com/microsoft/typespec/pull/6286) Remove support for `@discriminator` on union -- [#6327](https://github.com/microsoft/typespec/pull/6327) Remove reference to delete projection feature - -### @typespec/protobuf - -- [#6327](https://github.com/microsoft/typespec/pull/6327) Remove reference to delete projection feature - -### @typespec/html-program-viewer - -- [#6327](https://github.com/microsoft/typespec/pull/6327) Remove reference to delete projection feature - -### typespec-vscode - -- [#6178](https://github.com/microsoft/typespec/pull/6178) Update references to JS emitter -- [#5972](https://github.com/microsoft/typespec/pull/5972) Select multiple emitters to generate multiple codes at one time -- [#6295](https://github.com/microsoft/typespec/pull/6295) Improve the "Create TypeSpec Project" user experience -- [#6015](https://github.com/microsoft/typespec/pull/6015) add openapi3 preview -- [#6123](https://github.com/microsoft/typespec/pull/6123) Support telemetry - -## Bug Fixes - -### @typespec/compiler - -- [#6335](https://github.com/microsoft/typespec/pull/6335) Improvements to the CLI output -- [#6309](https://github.com/microsoft/typespec/pull/6309) Fixed an issue where the `--emit-files` flag on emitters with nested folders was not generating the correct paths to the files. -- [#6292](https://github.com/microsoft/typespec/pull/6292) Fix `tsp init` not respecting default selected emitters - -### @typespec/rest - -- [#6326](https://github.com/microsoft/typespec/pull/6326) Updates `@autoRoute` behavior to apply same HttpOperationParameter filtering to HttpProperty - -### @typespec/openapi3 - -- [#6289](https://github.com/microsoft/typespec/pull/6289) Fix `utcDateTime` and `offsetDateTime` not using format `http-date` in header by default as the default http encoding defines -- [#6411](https://github.com/microsoft/typespec/pull/6411) Add support for new `dryRun` emitter option -- [#6473](https://github.com/microsoft/typespec/pull/6473) Adds support for `@encode` to specify array encodings for `@query` parameters - -### @typespec/protobuf - -- [#6411](https://github.com/microsoft/typespec/pull/6411) Add support for new `dryRun` emitter option - -### @typespec/json-schema - -- [#6411](https://github.com/microsoft/typespec/pull/6411) Add support for new `dryRun` emitter option diff --git a/website/src/content/docs/docs/release-notes/release-2025-04-02.md b/website/src/content/docs/docs/release-notes/release-2025-04-02.md deleted file mode 100644 index 24dbc473fc9..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2025-04-02.md +++ /dev/null @@ -1,136 +0,0 @@ ---- -title: "1.0.0-rc.0" -releaseDate: 2025-04-02 -version: "1.0.0-rc.0" ---- - -:::caution -This release contains breaking changes. -::: - -## TypeSpec 1.0 Release Candidate - -We're excited to announce the TypeSpec 1.0 Release Candidate, marking a significant milestone for the TypeSpec project. TypeSpec accelerates your initial API development while providing a sustainable approach to evolving your APIs over time. Design faster today by defining your APIs in a concise, human-readable format and generating all the artifacts you need from a single source of truth – OpenAPI specifications, client libraries, and server code scaffolding. Scale easier tomorrow with an API-first approach that keeps everything in sync as your API grows and requirements change. - -- `@typespec/compiler` -- `@typespec/http` -- `@typespec/openapi` -- `@typespec/openapi3` -- `@typespec/json-schema` - -All the other typespec libraries remain in preview, beta or alpha stage. - -[See our blog post](https://typespec.io/blog/2025-03-31-typespec-1-0-release/) - -## Breaking Changes - -### @typespec/compiler - -- [#6678](https://github.com/microsoft/typespec/pull/6678) Moved `TypeSpecPrettierPlugin` type to internal. If wanting to use the prettier pluging programmatically, use it from the `@typespec/prettier-plugin-typespec` package -- [#6544](https://github.com/microsoft/typespec/pull/6544) Remove deprecated `@typespec/compiler/emitter-framework` export in favor of a new package `@typespec/asset-emitter` - - ```diff lang=json title=package.json - "dependencies": { - + "@typespec/asset-emitter": "^1.0.0-rc.0" - } - ``` - - ```diff lang=ts - -import { TypeEmitter, ... } from "@typespec/compiler/emitter-framework"; - +import { TypeEmitter, ... } from "@typespec/asset-emitter"; - ``` - -- [#6754](https://github.com/microsoft/typespec/pull/6754) Reserve additional keywords: - - `context` - - `sym` - - `prop` - - `property` - - `scenario` - -### @typespec/http - -- [#6557](https://github.com/microsoft/typespec/pull/6557) Remove support for deprecated implicit multipart, migrate to explicit part with `@multipartBody` and `HttpPart` - - ```diff lang=tsp - op upload( - @header contentType: "multipart/form-data", - - @body body: { - + @multipartBody body: { - - name: string; - + name: HttpPart; - - avatar: bytes; - + avatar: HttpPart; - } - ): void; - ``` - -- [#6563](https://github.com/microsoft/typespec/pull/6563) Separate file bodies into their own `bodyKind`. - - The HTTP library will now return a body with `bodyKind: "file"` in all cases where emitters should treat the body as a file upload or download. Emitters that previously attempted to recognize File bodies by checking the `type` of an HTTP `"single"` body may now simply check if the `bodyKind` is `"file"`. This applies to all HTTP payloads where an `HttpOperationBody` can appear, including requests, responses, and multipart parts. - -### @typespec/openapi3 - -- [#6557](https://github.com/microsoft/typespec/pull/6557) Remove support for removed feature implicit multipart. -- [#6563](https://github.com/microsoft/typespec/pull/6563) Separate file bodies into their own `bodyKind`. - - The HTTP library will now return a body with `bodyKind: "file"` in all cases where emitters should treat the body as a file upload or download. Emitters that previously attempted to recognize File bodies by checking the `type` of an HTTP `"single"` body may now simply check if the `bodyKind` is `"file"`. This applies to all HTTP payloads where an `HttpOperationBody` can appear, including requests, responses, and multipart parts. - -## Features - -### @typespec/http - -- [#6559](https://github.com/microsoft/typespec/pull/6559) [API] Expose `property?` on `HttpOperationPart` -- [#6652](https://github.com/microsoft/typespec/pull/6652) Add validation when using path or query options with the default value while the parameter is referenced in the uri template - -### @typespec/prettier-plugin-typespec - -- [#6678](https://github.com/microsoft/typespec/pull/6678) Migrate to ESM. This shouldn't be breaking as we didn't support prettier < 3. - -## Bug Fixes - -### @typespec/compiler - -- [#6197](https://github.com/microsoft/typespec/pull/6197) Show emitter internal error message in tspconfig -- [#6710](https://github.com/microsoft/typespec/pull/6710) Updates to scaffolding script and scaffold commands for consistency -- [#6826](https://github.com/microsoft/typespec/pull/6826) Fix new reserved keywords were not allowed in augment decorator expression -- [#6697](https://github.com/microsoft/typespec/pull/6697) Fix crash that would happen when a type was mutated while using null in a decorator(e.g. when using versioning library with `@example(null)`) -- [#6711](https://github.com/microsoft/typespec/pull/6711) Fix extra properties not validated in nested entries of the config -- [#6711](https://github.com/microsoft/typespec/pull/6711) Fix passing nested emitter options with `--option` - -### @typespec/http - -- [#6542](https://github.com/microsoft/typespec/pull/6542) Query parameter with `-` will be correctly represented in the resulting uri template -- [#6472](https://github.com/microsoft/typespec/pull/6472) Path parameters can now be optional under specific circumstances. This fix updates the validation to ensure it doesn't trigger in these scenarios. - - An optional parameter should have a leading `/` inside the `{}`. - - For example: - - ```tsp - @route("optional{/param}/list") - op optional(@path param?: string): void; - ``` - - Another supported scenario is using `@autoRoute`: - - ```tsp - @autoRoute - op optional(@path param?: string): void; - ``` - -### @typespec/openapi - -- [#6651](https://github.com/microsoft/typespec/pull/6651) Adds diagnostic when passing in a `Type` to the `$extension` decorator function directly - -### @typespec/openapi3 - -- [#6559](https://github.com/microsoft/typespec/pull/6559) Fix missing application of description on multipart properties -- [#6729](https://github.com/microsoft/typespec/pull/6729) Fix duplicate name error when using named union inside multipart part. -- [#6506](https://github.com/microsoft/typespec/pull/6506) Fix union of custom scalar with `null` creating an `object` with `allOf` reference - -### typespec-vscode - -- [#6668](https://github.com/microsoft/typespec/pull/6668) Fix error when upgrading to use latest telemetry library -- [#6690](https://github.com/microsoft/typespec/pull/6690) Fix the issue to log compiler information as an error. And remove PREVIEW prefix for server code emitter -- [#6694](https://github.com/microsoft/typespec/pull/6694) compiler can be resolved automatically when it's not installed in the root folder of the first opened workspace. -- [#6620](https://github.com/microsoft/typespec/pull/6620) Update menu item and command text for "Show OpenAPI3 Documentation" and "Import TypeSpec from OpenApi3" diff --git a/website/src/content/docs/docs/release-notes/release-2025-04-22.md b/website/src/content/docs/docs/release-notes/release-2025-04-22.md deleted file mode 100644 index d465aa81c6f..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2025-04-22.md +++ /dev/null @@ -1,82 +0,0 @@ ---- -title: "1.0.0-rc.1" -releaseDate: 2025-04-22 -version: "1.0.0-rc.1" ---- - -## Features - -### @typespec/compiler - -- [#7067](https://github.com/microsoft/typespec/pull/7067) Adding support for nested paging properties. -- [#6862](https://github.com/microsoft/typespec/pull/6862) `--trace` cli option applies to all commands now -- [#7065](https://github.com/microsoft/typespec/pull/7065) Adds a TypeKit for Tuple types -- [#7049](https://github.com/microsoft/typespec/pull/7049) Adds a new createDiagnosable typekit helper for APIs that return diagnostics -- [#7047](https://github.com/microsoft/typespec/pull/7047) Adds typekit support for creating unions from enums - -### @typespec/http - -- [#7049](https://github.com/microsoft/typespec/pull/7049) Updates `$.httpOperation.get` to be a diagnosable - use `$.httpOperation.get.withDiagnostics` to get diagnostics -- [#6949](https://github.com/microsoft/typespec/pull/6949) Improved types for HTTP multipart payloads for more precise guarantees and additional information about the resolution of individual parts. - -## Experimental features breaking changes - -### @typespec/compiler - -- [#7018](https://github.com/microsoft/typespec/pull/7018) Removes the default typekit in favor of always instantiating typekits with either a `program` or `realm`. - -## Bug Fixes - -### @typespec/compiler - -- [#6897](https://github.com/microsoft/typespec/pull/6897) Improve errors when loading libraries with invalid exports/main fields -- [#7069](https://github.com/microsoft/typespec/pull/7069) Mark `node` property on all typespec types as optional -- [#7063](https://github.com/microsoft/typespec/pull/7063) Fixes an issue where isError was checking for error types instead of error models. -- [#7047](https://github.com/microsoft/typespec/pull/7047) Preserve API documentation when calling `$.enum.createFromUnion` - -### @typespec/http - -- [#6962](https://github.com/microsoft/typespec/pull/6962) Fixes issue where each variant of a `@discriminated` union was treated as a separate response instead of the whole union being treated as a single response. -- [#7069](https://github.com/microsoft/typespec/pull/7069) Handle types without node -- [#7065](https://github.com/microsoft/typespec/pull/7065) Handle tuples without nodes - -### @typespec/openapi - -- [#6947](https://github.com/microsoft/typespec/pull/6947) Fix crash when using enum values in extension - -### @typespec/openapi3 - -- [#6279](https://github.com/microsoft/typespec/pull/6279) Fix various issues when using xml payloads and custom scalars -- [#6887](https://github.com/microsoft/typespec/pull/6887) Fix using union templates - -### @typespec/json-schema - -- [#6947](https://github.com/microsoft/typespec/pull/6947) Fix crash when using enum values in extension -- [#6887](https://github.com/microsoft/typespec/pull/6887) Fix using union templates - -### typespec-vscode - -- [#6894](https://github.com/microsoft/typespec/pull/6894) Fix the issue where the emitter version is undefined in telemetry. -- [#7021](https://github.com/microsoft/typespec/pull/7021) Fix crash when initialize telemetry client - -### @typespec/versioning - -- [#7022](https://github.com/microsoft/typespec/pull/7022) Fix issue where the incompatible-versioned-reference diagnostic was incorrectly triggered when a model had a `@removed` decorator and one of its properties had an `@added` decorator, even if the versions were compatible. - - Example: - - ```tsp - @removed(Versions.v3) - model Widget { - @added(Versions.v2) - name: string; - } - ``` - -### @typespec/protobuf - -- [#7069](https://github.com/microsoft/typespec/pull/7069) Handle types without node - -### @typespec/internal-build-utils - -- [#6676](https://github.com/microsoft/typespec/pull/6676) Fix third party resolution getting duplicate entries diff --git a/website/src/content/docs/docs/release-notes/release-2025-05-06.md b/website/src/content/docs/docs/release-notes/release-2025-05-06.md deleted file mode 100644 index 869ca0d4ad4..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2025-05-06.md +++ /dev/null @@ -1,117 +0,0 @@ ---- -title: "1.0.0" -releaseDate: 2025-05-06 -version: "1.0.0" ---- - -## TypeSpec 1.0 Release - -Today, we’re thrilled to announce the general availability of TypeSpec 1.0! This milestone marks the transition of TypeSpec’s core components from release candidate to stable release status. TypeSpec is a Microsoft-built, community-supported project that makes API-first development truly practical by empowering you to define your APIs in a concise, human-readable format and generate all the artifacts you need—from OpenAPI specifications to client libraries and server code scaffolding—from a single source of truth. - -[See our blog post](https://typespec.io/blog/typespec-1-0-GA-release/) - -## Breaking Changes - -### @typespec/http - -- [#7230](https://github.com/microsoft/typespec/pull/7230) Changed `@patch` so that it does not apply the "implicit optionality" transform by default anymore. - - ```diff lang=tsp - @patch op update(@body pet: Pet): void; - ``` - - To use JSON Merge-Patch to update resources, replace the body property with an instance of `MergePatchUpdate` as follows: - - ```tsp - @patch op update(@body pet: MergePatchUpdate): void; - ``` - - Or, keep the old behavior by explicitly enabling `implicitOptionality` in the `@patch` options: - - ```tsp - @patch(#{ implicitOptionality: true }) op update(@body pet: Pet): void; - ``` - -## Features - -### @typespec/compiler - -- [#7199](https://github.com/microsoft/typespec/pull/7199) Add "capitalize" string helper to compiler -- [#7180](https://github.com/microsoft/typespec/pull/7180) Add support for formatting `tspconfig.yaml` with `tsp format` -- [#7180](https://github.com/microsoft/typespec/pull/7180) `tsp format` only formats files it knows about and ignores other. Allowing a more generic glob pattern `tsp format .` or `tsp format "**/*"` -- [#5674](https://github.com/microsoft/typespec/pull/5674) [LSP] Update imports when renaming typespec files -- [#7125](https://github.com/microsoft/typespec/pull/7125) Adds typekits for getting intrinsic types via `$.intrinsic.` -- [#7204](https://github.com/microsoft/typespec/pull/7204) Update typekits `is*` methods to accept `Entity` instead of just `Type` or `Value` -- [#7108](https://github.com/microsoft/typespec/pull/7108) Adds support for nesting typekits -- [#7202](https://github.com/microsoft/typespec/pull/7202) Replaces `$.model.getSpreadType` with `$.model.getIndexType` to better reflect what it actually being returned. `getSpreadType` did not actually return a list of spread types, but the model's indexer type instead. -- [#7090](https://github.com/microsoft/typespec/pull/7090) Adds TypeKit support for type.inNamespace to check namespace membership -- [#7167](https://github.com/microsoft/typespec/pull/7167) Adds `$.value.resolve` and `$.type.resolve` typekits, and updated `$.resolve` to return values or types, instead of just types -- [#7106](https://github.com/microsoft/typespec/pull/7106) Adds `$.type.isAssignableTo`, `$.value.isAssignableTo` and `$.entity.isAssignableTo` typekits. Also registers `$.resolve` typekit -- [#7193](https://github.com/microsoft/typespec/pull/7193) Typekits have been moved out of experimental and can now be accessed via the `@typespec/compiler/typekit` submodule. - This also removed the `$.type.getDiscriminator` typekit in favor of the `$.model.getDiscriminatedUnion` and `$.union.getDiscriminatedUnion` - typkits. - - ```diff - -import { $ } from "@typespec/compiler/experimental/typekit"; - +import { $ } from "@typespec/compiler/typekit"; - ``` - -- [#7105](https://github.com/microsoft/typespec/pull/7105) Add typekit support for creating a union from an array of children -- [#7207](https://github.com/microsoft/typespec/pull/7207) Exposed experimental function `isMutableType` as `unsafe_isMutableType`. -- [#7200](https://github.com/microsoft/typespec/pull/7200) Added an optional `nameTemplate` argument to `@withVisibilityFilter`, allowing the visibility filters to rename models as they are transformed. This template is applied by default in the `Create`, `Read`, `Update`, `Delete`, and `Query` visibility transform templates. This allows for more flexible renaming than simply using the `@friendlyName` decorator, as it will change the primary name of the transformed type, reducing the incidence of naming conflicts. - - Cached the result of applying visibility filters to types. If the same visibility filter is applied to the same type with the same configuration, the model instance produced by the visibility filter will be object-identical. This should reduce the incidence of multiple models that are structurally equivalent in visibility filters and conflicts over the name of models. - -### @typespec/http - -- [#7207](https://github.com/microsoft/typespec/pull/7207) Implemented JSON Merge-Patch wrappers. This allows converting a type to a JSON Merge-Patch compatible update record using the `MergePatchUpdate` and `MergePatchCreateOrUpdate` templates. - -### @typespec/openapi3 - -- [#7199](https://github.com/microsoft/typespec/pull/7199) Add "capitalize" string helper to compiler - -### typespec-vscode - -- [#7042](https://github.com/microsoft/typespec/pull/7042) send compile startTime and endTime telemetry - -## Bug Fixes - -### @typespec/compiler - -- [#7183](https://github.com/microsoft/typespec/pull/7183) Fix decorators on model properties getting wrongly called when checking the template declaration in the following cases - - inside a union expression - - under an non templated operation under a templated interface -- [#6938](https://github.com/microsoft/typespec/pull/6938) Fixes template argument resolution when a default template parameter value is resolved by a parent container (e.g. interface) - For example: - - ```tsp - interface Resource { - read(): U; - } - - model Foo { - type: "foo"; - } - - alias FooResource = Resource; - - op readFoo is FooResource.read; - ``` - - The `returnType` for `readFoo` would be model `Foo`. Previously the `returnType` resolved to a `TemplateParameter`. - -- [#7153](https://github.com/microsoft/typespec/pull/7153) Fixes handling of nested templates in getPlausibleName -- [#6883](https://github.com/microsoft/typespec/pull/6883) Realm handle multiple instance of compiler loaded at once -- [#7222](https://github.com/microsoft/typespec/pull/7222) Remove `version` property on `ServiceOptions` passed to `@service` decorator. That handling of that option was removed in `1.0.0-rc.0` where it was previously deprecated. - If wanting to specify version in an OpenAPI document use the `@OpenAPI.info` decorator from the `@typespec/openapi` library -- [#7155](https://github.com/microsoft/typespec/pull/7155) Mark `TemplateParameter` type as an experimental type -- [#7106](https://github.com/microsoft/typespec/pull/7106) Removes `program.checker.isTypeAssignableTo`. Use one of the following typekits instead: - - `$(program).type.isAssignableTo` - - `$(program).value.isAssignableTo` - - `$(program).entity.isAssignableTo` -- [#7207](https://github.com/microsoft/typespec/pull/7207) Weakened rules around `@mediaTypeHint` decorator, allowing media type hints with suffixes like "application/merge-patch+json". -- [#7200](https://github.com/microsoft/typespec/pull/7200) Fixed an error in Model visibility filtering where the indexer of a model was ignored. This prevented the value of Array/Record instances from being transformed correctly, as they now should be. - -### @typespec/http - -- [#7168](https://github.com/microsoft/typespec/pull/7168) Replace optional param validation requiring use with path expansion and replace with a warning when the resulting url might have a double `/` diff --git a/website/src/content/docs/docs/release-notes/release-2025-06-10.md b/website/src/content/docs/docs/release-notes/release-2025-06-10.md deleted file mode 100644 index b2579936162..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2025-06-10.md +++ /dev/null @@ -1,64 +0,0 @@ ---- -title: "1.1.0" -releaseDate: 2025-06-10 -version: "1.1.0" ---- - -## Features - -### @typespec/compiler - -- [#7377](https://github.com/microsoft/typespec/pull/7377) Add a `--stats` flag to `tsp compile` to log some performance and complexity statistics -- [#7530](https://github.com/microsoft/typespec/pull/7530) Show the full definition of model and interface when it has 'extends' and 'is' relationship in the hover text -- [#6923](https://github.com/microsoft/typespec/pull/6923) Init templates can define a project kind which decide if dependencies are added to peer or regular dependencies -- [#6783](https://github.com/microsoft/typespec/pull/6783) Install packages for unrecognized import via npm command -- [#7239](https://github.com/microsoft/typespec/pull/7239) [LSP] Expose new compile project command -- [#7137](https://github.com/microsoft/typespec/pull/7137) Allow passing template parameters as property defaults -- [#7256](https://github.com/microsoft/typespec/pull/7256) Expose `VisibilityFilter.toCacheKey` to allow caching results based on visibility filters. - -### @typespec/openapi3 - -- [#7219](https://github.com/microsoft/typespec/pull/7219) [OpenAPI -> tsp] Add support for converting inline schemas using allOf -- [#7403](https://github.com/microsoft/typespec/pull/7403) Adds support for parameter examples via `@opExample` via the `experimental-parameter-examples` option. - -### typespec-vscode - -- [#7317](https://github.com/microsoft/typespec/pull/7317) Enable emit code command on tspconfig.yaml. -- [#6783](https://github.com/microsoft/typespec/pull/6783) Install packages for unrecognized import via npm command -- [#7239](https://github.com/microsoft/typespec/pull/7239) Use language server to compile project instead of CLI -- [#7331](https://github.com/microsoft/typespec/pull/7331) Support prompting to install compiler proactively if no compiler is found when starting LSP -- [#7541](https://github.com/microsoft/typespec/pull/7541) Add extension API for other vscode extension to be able to register more TypeSpec InitTemplate to choose when scaffolding TypeSpec project. - -## Bug Fixes - -### @typespec/compiler - -- [#7421](https://github.com/microsoft/typespec/pull/7421) Fix hanging when using `::returnType` meta accessor on operation defined with `op is` -- [#7507](https://github.com/microsoft/typespec/pull/7507) Fix empty string emitting error when used in string interpolation in a template -- [#7524](https://github.com/microsoft/typespec/pull/7524) Fixes an error where reported diagnostics had invalid relative paths on Windows -- [#7508](https://github.com/microsoft/typespec/pull/7508) Allow extends of array expression for not just template (`model MyStrings extends string[]`) -- [#7473](https://github.com/microsoft/typespec/pull/7473) Mutator were not mutating tuple values -- [#7485](https://github.com/microsoft/typespec/pull/7485) Fix paging operations to correctly detect the `@pageItems` decorator on base models. -- [#7461](https://github.com/microsoft/typespec/pull/7461) Remove non documented `templateArguments` property on types -- [#7480](https://github.com/microsoft/typespec/pull/7480) Fix infinite recursion when navigating paging properties by detecting and handling circular model references. -- [#7137](https://github.com/microsoft/typespec/pull/7137) Allow passing tempalate parameter values in object and array values used inside the template -- [#7295](https://github.com/microsoft/typespec/pull/7295) Corrected visibility filtering logic to even more aggressively deduplicate the models it visits when the applied visibility transform does not actually remove any properties from a model. - -### @typespec/openapi - -- [#7509](https://github.com/microsoft/typespec/pull/7509) Fix `@tagMetadata` decorator emitting error when incorrectly not finding `@service` decorator - -### @typespec/json-schema - -- [#7501](https://github.com/microsoft/typespec/pull/7501) Json schema emitter conflict with other emitters - -### typespec-vscode - -- [#7300](https://github.com/microsoft/typespec/pull/7300) Unify the writing of OpenAPI 3 -- [#7353](https://github.com/microsoft/typespec/pull/7353) Fix openapi3 preview error when path contains space -- [#7374](https://github.com/microsoft/typespec/pull/7374) Check whether the compiler language server supports project compilation. -- [#7302](https://github.com/microsoft/typespec/pull/7302) Telemetry data item result displays `cancelled` when the `Select file` step of `Preview API Documentation` is `cancelled` - -### @typespec/versioning - -- [#7473](https://github.com/microsoft/typespec/pull/7473) Fix tuples not correctly versioned diff --git a/website/src/content/docs/docs/release-notes/release-2025-07-15.md b/website/src/content/docs/docs/release-notes/release-2025-07-15.md deleted file mode 100644 index 5410e361845..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2025-07-15.md +++ /dev/null @@ -1,45 +0,0 @@ ---- -title: "1.2.0" -releaseDate: 2025-07-15 -version: "1.2.0" ---- - -# 1.2.0 - -## Features - -### @typespec/compiler - -- [#7576](https://github.com/microsoft/typespec/pull/7576) Allow LSP to configure which emitters to include for live checks -- [#7151](https://github.com/microsoft/typespec/pull/7151) [API] Addition of a new testing framework. See https://typespec.io/docs/extending-typespec/testing - -### typespec-vscode - -- [#7576](https://github.com/microsoft/typespec/pull/7576) Allow LSP to configure which emitters to include for live checks - -### @typespec/html-program-viewer - -- [#7620](https://github.com/microsoft/typespec/pull/7620) Render `indexer` property on model -- [#7836](https://github.com/microsoft/typespec/pull/7836) Expose program viewer navigation in TypGraph props - -## Bug Fixes - -### @typespec/compiler - -- [#7586](https://github.com/microsoft/typespec/pull/7586) Improved the error message for the `@pattern` decorator when applied to a `union` type. The new message is more descriptive and helps users understand how to correctly define string-compatible union types. -- [#7740](https://github.com/microsoft/typespec/pull/7740) Config interpolation is more flexible in interpolating variables in any order as long as no circular reference occur. For example using `{output-dir}` in parameters. -- [#7731](https://github.com/microsoft/typespec/pull/7731) Fix literal typekits `$.literal.create`, `$.literal.createString`, etc. use right checker api that include caching -- [#7906](https://github.com/microsoft/typespec/pull/7906) Corrected some logic around the detection of array types in visibility calculation. - -### @typespec/http - -- [#7849](https://github.com/microsoft/typespec/pull/7849) Fix optional path parameter with explicit name would have the wrong style(`path` instead of `simple`). - -### @typespec/openapi3 - -- [#7750](https://github.com/microsoft/typespec/pull/7750) Prepends namespace name to array declarations in nested namespaces. -- [#7864](https://github.com/microsoft/typespec/pull/7864) Fixed a bug that caused `model M is T[]` declarations to be renamed to `MItem` incorrectly. - -### @typespec/html-program-viewer - -- [#7834](https://github.com/microsoft/typespec/pull/7834) Fix type state not showing in program viewer diff --git a/website/src/content/docs/docs/release-notes/release-2025-08-06.md b/website/src/content/docs/docs/release-notes/release-2025-08-06.md deleted file mode 100644 index 8d9a9828af2..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2025-08-06.md +++ /dev/null @@ -1,41 +0,0 @@ ---- -title: "1.3.0" -releaseDate: 2025-08-06 -version: "1.3.0" ---- - -# 1.3.0 - -## Features - -### @typespec/compiler - -- [#7830](https://github.com/microsoft/typespec/pull/7830) [API] `resolveCompilerOptions` now only takes a `SystemHost` instead of `CompilerHost` -- [#7912](https://github.com/microsoft/typespec/pull/7912) Updates the `tsp init` command to support passing in more options via CLI flags. The `-y` option can also be used to auto accept prompts. - -### typespec-vscode - -- [#7830](https://github.com/microsoft/typespec/pull/7830) Get emitter options from the `resolveCompilerOptions` function of the compiler - -### @typespec/versioning - -- [#7999](https://github.com/microsoft/typespec/pull/7999) Use of `@useDependency` is now optional when referencing types from a versioned library. By default the latest version of the library will be used. - -### @typespec/html-program-viewer - -- [#8013](https://github.com/microsoft/typespec/pull/8013) Add button to bookmark types in the type graph into `window.vars` - -## Bug Fixes - -### @typespec/compiler - -- [#7721](https://github.com/microsoft/typespec/pull/7721) Make the `console.*` methods usable in the compiler and display them in the vscode output. -- [#8012](https://github.com/microsoft/typespec/pull/8012) Fix `tsp format --check` incorrectly validating needs format -- [#7957](https://github.com/microsoft/typespec/pull/7957) Fix incorrectly reported `incompatible-compiler-version` in some cases when using symlinks -- [#7947](https://github.com/microsoft/typespec/pull/7947) [API] [Testing] Ignore test files in legacy library definition -- [#7899](https://github.com/microsoft/typespec/pull/7899) Ensure models that are spread, intersected or used as the base are fully checked before trying to copy the properties -- [#8002](https://github.com/microsoft/typespec/pull/8002) Union expressions are correctly attached to the namespace they were declared in - -### @typespec/html-program-viewer - -- [#7899](https://github.com/microsoft/typespec/pull/7899) Handle new `creating` property diff --git a/website/src/content/docs/docs/release-notes/release-2025-09-09.md b/website/src/content/docs/docs/release-notes/release-2025-09-09.md deleted file mode 100644 index 580b549ba8f..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2025-09-09.md +++ /dev/null @@ -1,60 +0,0 @@ ---- -title: "1.4.0" -releaseDate: 2025-08-06 -version: "1.4.0" ---- - -# 1.4.0 - -## Features - -### @typespec/compiler - -- [#4383](https://github.com/microsoft/typespec/pull/4383) Expose `createSourceLoader` via `@typespec/compiler/ast` - -### @typespec/openapi3 - -- [#8289](https://github.com/microsoft/typespec/pull/8289) [Converter] Add support for importing OAS const -- [#8240](https://github.com/microsoft/typespec/pull/8240) [Converter] Add support for importing discriminator mappings in openAPI -- [#8272](https://github.com/microsoft/typespec/pull/8272) [Converter] Add support for importing multipart request bodies -- [#8201](https://github.com/microsoft/typespec/pull/8201) [Converter] Add support for importing servers -- [#8197](https://github.com/microsoft/typespec/pull/8197) [Converter] Add support for importing tags metadata - -### typespec-vscode - -- [#7691](https://github.com/microsoft/typespec/pull/7691) Provide emitter options as comments when adding a new emitter - -## Bug Fixes - -### @typespec/compiler - -- [#8152](https://github.com/microsoft/typespec/pull/8152) Remove incorrect example of service option model from documents - -### @typespec/http - -- [#8276](https://github.com/microsoft/typespec/pull/8276) Fix circular import causing `tsp compile --watch` breakage -- [#7771](https://github.com/microsoft/typespec/pull/7771) Fix OAuth2 scope deduplication in OpenAPI spec generation. OAuth2 authentication schemes with multiple flows sharing the same scopes no longer generate duplicate scope entries in the security section. - -### @typespec/openapi - -- [#8192](https://github.com/microsoft/typespec/pull/8192) Update `@info` decorator documentation to the latest - -### @typespec/openapi3 - -- [#8267](https://github.com/microsoft/typespec/pull/8267) http parts extensions are now emitted -- [#8369](https://github.com/microsoft/typespec/pull/8369) Operation deprecated field is inherited from containing interface/namespace(s) -- [#8225](https://github.com/microsoft/typespec/pull/8225) default value for properties was declared without the proper syntax, leading to compilation issues -- [#8217](https://github.com/microsoft/typespec/pull/8217) invalid symbols being produced by discrminator import -- [#8214](https://github.com/microsoft/typespec/pull/8214) ensures that value notation is used when importing extension values -- [#8215](https://github.com/microsoft/typespec/pull/8215) recognize union types during import even when type object is set -- [#8275](https://github.com/microsoft/typespec/pull/8275) [Converter] log warnings when operationId is missing from Open API spec, and generate an operation name -- [#8207](https://github.com/microsoft/typespec/pull/8207) [Converter] fixed a bug that would cause nullable array schemas to generate as unions with only a `null` variant. These schemas now generate an array variant as well. -- [#8203](https://github.com/microsoft/typespec/pull/8203) [Converter] fixed a bug in which union definitions converted from `oneOf`/`anyOf` definitions in OpenAPI3 schemas were missing semicolon delimiters. - -### @typespec/json-schema - -- [#8365](https://github.com/microsoft/typespec/pull/8365) Fix: Json Schema crashing trying to render template declaration - -### @typespec/versioning - -- [#8327](https://github.com/microsoft/typespec/pull/8327) Skip validating versioning in template declaration as information could be missing diff --git a/website/src/content/docs/docs/release-notes/release-2025-10-08.md b/website/src/content/docs/docs/release-notes/release-2025-10-08.md deleted file mode 100644 index 615b4da9433..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2025-10-08.md +++ /dev/null @@ -1,68 +0,0 @@ ---- -title: "1.5.0" -releaseDate: 2025-10-08 -version: "1.5.0" ---- - -# 1.5.0 - -## Features - -### @typespec/compiler - -- [#8549](https://github.com/microsoft/typespec/pull/8549) [Testing API] Expose marker position in Tester -- [#8491](https://github.com/microsoft/typespec/pull/8491) Add milliseconds to DurationKnownEncoding -- [#7929](https://github.com/microsoft/typespec/pull/7929) [LSP] Allow configuring which file names to use as entrypoints -- [#8525](https://github.com/microsoft/typespec/pull/8525) [API] Expose `applyCodeFix` and `createSuppressCodeFix` -- [#8652](https://github.com/microsoft/typespec/pull/8652) [API] Export `getNodeForTarget` in `@typespec/compiler/ast` exports -- [#8542](https://github.com/microsoft/typespec/pull/8542) [API] Expose `applyCodeFixEdits`, `resolveCodeFix` -- [#8544](https://github.com/microsoft/typespec/pull/8544) [api] adds the ability to pass the suppression message -- [#8632](https://github.com/microsoft/typespec/pull/8632) [API] Allow using union in emitter schemas -- [#8586](https://github.com/microsoft/typespec/pull/8586) Widen target types for the `@secret` decorator to include Model, Union, and Enum types, in addition to existing Scalar and ModelProperty targets. This allows marking any data type as secret for comprehensive data sensitivity handling. -- [#8055](https://github.com/microsoft/typespec/pull/8055) Show template parameters default in hover signature -- [#8234](https://github.com/microsoft/typespec/pull/8234) Support codefix on different file and creating file when needed -- [#8670](https://github.com/microsoft/typespec/pull/8670) [Tester] Support sub exports without having them being defined as separate libraries - -### @typespec/openapi3 - -- [#8632](https://github.com/microsoft/typespec/pull/8632) Add a new `operation-id-strategy` option. - - `parent-container` (default and previous behavior) Join operation name with its parent if applicable with an underscore - - `fqn` Join the path from the service root to the operation with `.` - - `none` Do not generate operation ids, only include explicit ones set with `@operationId` - -### typespec-vscode - -- [#7929](https://github.com/microsoft/typespec/pull/7929) Allow configuring which file names to use as entrypoints -- [#8346](https://github.com/microsoft/typespec/pull/8346) 1. Limit the vscode tasks to be created when the extension is starting 2. Do not include the emitters by default when compiling in LSP. Setting 'typespec.lsp.emit' can be used to configure the emitters to include explicitly (set to [''] to include all the emitters defined in tspconfig.yaml) - -## Bug Fixes - -### @typespec/compiler - -- [#8506](https://github.com/microsoft/typespec/pull/8506) Fix issue when the 'entrypoint' setting is default to null -- [#8462](https://github.com/microsoft/typespec/pull/8462) Fix grammar error in TypeSpec unused-using warning message by removing incorrect word "be" from "never be used" -- [#8548](https://github.com/microsoft/typespec/pull/8548) Linter rule tester not passing parseDocs option to new tester instance -- [#8578](https://github.com/microsoft/typespec/pull/8578) Add suppression codefix looks up for the first valid parent -- [#8452](https://github.com/microsoft/typespec/pull/8452) [Tester] Fix issue that could cause some timeout -- [#8573](https://github.com/microsoft/typespec/pull/8573) LSP connection failure after dynamically loading a certain library in the package -- [#8670](https://github.com/microsoft/typespec/pull/8670) Allow importing of self (e.g. `@typespec/openapi/some/path` when in `@typespec/openapi`) respecting ESM spec. - -### @typespec/openapi3 - -- [#8584](https://github.com/microsoft/typespec/pull/8584) [importer] fixes import of additional properties : true {} to result in Record -- [#8621](https://github.com/microsoft/typespec/pull/8621) [importer] unwrap single any/oneOf to get semantically meaningful types -- [#8419](https://github.com/microsoft/typespec/pull/8419) adds enum prefix for defaults values of enums on import -- [#8434](https://github.com/microsoft/typespec/pull/8434) do not emit defaults for each member type when importing openapi descriptions -- [#8514](https://github.com/microsoft/typespec/pull/8514) [converter] anyOf/oneOf type + type:null gets imported properly and maintains decorators, documentation,... -- [#8623](https://github.com/microsoft/typespec/pull/8623) [importer] only import multipart request body when it's present -- [#8432](https://github.com/microsoft/typespec/pull/8432) fixes a regression where a null valued default would make the import crash -- [#8605](https://github.com/microsoft/typespec/pull/8605) Fix crash when using a property called `set` -- [#8632](https://github.com/microsoft/typespec/pull/8632) Deduplicate operation ids that would resolve to the same one - -### @typespec/json-schema - -- [#8605](https://github.com/microsoft/typespec/pull/8605) Fix crash when using a property called `set` - -### @typespec/rest - -- [#8644](https://github.com/microsoft/typespec/pull/8644) Fix crash when resource would recursively reference itself via `@parentResource` diff --git a/website/src/content/docs/docs/release-notes/release-2025-11-11.md b/website/src/content/docs/docs/release-notes/release-2025-11-11.md deleted file mode 100644 index c1580c42d59..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2025-11-11.md +++ /dev/null @@ -1,64 +0,0 @@ ---- -title: "1.6.0" -releaseDate: 2025-11-11 -version: "1.6.0" ---- - -# 1.6.0 - -## Features - -### @typespec/compiler - -- [#8868](https://github.com/microsoft/typespec/pull/8868) [API] Add new `createAddDecoratorCodeFix` function to help generating a codefix to add a decorator to a target node. -- [#8580](https://github.com/microsoft/typespec/pull/8580) Add support for `@minValue`, `@maxValue` and their exclusive variant for datetime and duration types. - Expose as well the following APIs - - `getMinValueForScalar` - - `getMaxValueForScalar` - - `getMinValueExclusiveForScalar` - - `getMaxValueExclusiveForScalar` -- [#8938](https://github.com/microsoft/typespec/pull/8938) [API] Add `repository` field to `PackageJson` type - -### @typespec/openapi3 - -- [#8888](https://github.com/microsoft/typespec/pull/8888) Add support for emission and import of SSE for OpenAPI 3.2 -- [#8828](https://github.com/microsoft/typespec/pull/8828) Add support for OpenAPI 3.2.0 emission -- [#8830](https://github.com/microsoft/typespec/pull/8830) [converter] Generate separate operations with @sharedRoute for operations with multiple incompatible content types (e.g., multipart/form-data and application/json) -- [#8727](https://github.com/microsoft/typespec/pull/8727) [converter] Generated doc comments render on a single line unless doc has new lines -- [#8580](https://github.com/microsoft/typespec/pull/8580) Add support for min/max value for date time and duration types - -## Bug Fixes - -### @typespec/compiler - -- [#8792](https://github.com/microsoft/typespec/pull/8792) Compiler internal decorators shouldn't be listed in autocomplete -- [#8733](https://github.com/microsoft/typespec/pull/8733) Fix namespace merge for namespaces with same name but different parent under a file namespace scope. -- [#8698](https://github.com/microsoft/typespec/pull/8698) [TM Grammar] Fix issue with directive used after decorators -- [#8751](https://github.com/microsoft/typespec/pull/8751) Correctly report error when trying to reference member of templates without using the arguments -- [#8780](https://github.com/microsoft/typespec/pull/8780) Fix missing examples in OpenAPI when response uses union of unions -- [#8676](https://github.com/microsoft/typespec/pull/8676) Correctly rename nested models when applying the `Update` visibility transform. -- [#8687](https://github.com/microsoft/typespec/pull/8687) Fix go to definition for directory imports -- [#8681](https://github.com/microsoft/typespec/pull/8681) Fix duplicate detection for `@encodedName` decorator applications. - -### @typespec/http - -- [#8974](https://github.com/microsoft/typespec/pull/8974) Do not report `no-service-found` if there is a service even if it has no routes -- [#8737](https://github.com/microsoft/typespec/pull/8737) Fix `@bodyIgnore` property shouldn't count as implicit body property for check - -### @typespec/openapi3 - -- [#8945](https://github.com/microsoft/typespec/pull/8945) [importer] Add missing value checks before attempting conversion -- [#8773](https://github.com/microsoft/typespec/pull/8773) [importer] Fix support of type arrays with null -- [#8829](https://github.com/microsoft/typespec/pull/8829) Fix escaping of ${...} in string literals to prevent interpolation -- [#8871](https://github.com/microsoft/typespec/pull/8871) Import: Convert OpenAPI unixtime format to utcDateTime with @encode decorator -- [#8764](https://github.com/microsoft/typespec/pull/8764) [converter] Fix multi line docs for server variables producing invalid syntax -- [#8727](https://github.com/microsoft/typespec/pull/8727) [converter] Render `@server` with multi line doc correctly -- [#8711](https://github.com/microsoft/typespec/pull/8711) Fix duplicate names when `@discriminated` unions are used in the context of visibility transforms. - -### @typespec/json-schema - -- [#8739](https://github.com/microsoft/typespec/pull/8739) Correctly emit `union`, `enum`, `scalar` when marked with `@jsonSchema` - -### typespec-vscode - -- [#8735](https://github.com/microsoft/typespec/pull/8735) Fix `pnpm clean && pnpm build` create diff in vscode package folder diff --git a/website/src/content/docs/docs/release-notes/release-2025-12-09.md b/website/src/content/docs/docs/release-notes/release-2025-12-09.md deleted file mode 100644 index da0d02e248e..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2025-12-09.md +++ /dev/null @@ -1,53 +0,0 @@ ---- -title: "1.7.0" -releaseDate: 2025-12-09 -version: "1.7.0" ---- - -# 1.7.0 - -## Features - -### @typespec/compiler - -- [#9002](https://github.com/microsoft/typespec/pull/9002) Add `commaDelimited` and `newlineDelimited` values to `ArrayEncoding` enum for serializing arrays with comma and newline delimiters -- [#8942](https://github.com/microsoft/typespec/pull/8942) - Add 'exit' final event for linter rules - - Support 'async' in linter definition and async function as callback for 'exit' event. -- [#9024](https://github.com/microsoft/typespec/pull/9024) [API] Add `node` to `SourceModel` type -- [#8619](https://github.com/microsoft/typespec/pull/8619) Add support for escaping param like tags(`@param`, `@prop`, etc.) identifier with backtick in doc comments to allow special characters - -### @typespec/http - -- [#8962](https://github.com/microsoft/typespec/pull/8962) support documentation on union variants for response descriptions - -### @typespec/openapi3 - -- [#9002](https://github.com/microsoft/typespec/pull/9002) Add `commaDelimited` and `newlineDelimited` values to `ArrayEncoding` enum for serializing arrays with comma and newline delimiters - -### @typespec/json-schema - -- [#9038](https://github.com/microsoft/typespec/pull/9038) Add discriminator support and polymorphic models strategy option - - Automatically injects discriminator property into base models with `@discriminator` decorator - - Marks discriminator property as required in generated schemas - - New `polymorphic-models-strategy` emitter option with three strategies: - - `ignore`: Emit as regular object schema (default) - - `oneOf`: Emit oneOf schema for closed discriminated unions - - `anyOf`: Emit anyOf schema for open discriminated unions - - Includes discriminator.mapping in oneOf/anyOf schemas for improved validation - -## Bug Fixes - -### @typespec/compiler - -- [#8917](https://github.com/microsoft/typespec/pull/8917) Add security warning to tsp init CLI documentation for external templates (#8916) -- [#8997](https://github.com/microsoft/typespec/pull/8997) UnusedUsing Diagnostics are reported as warning instead of hint when there are linters defined in tspconfig.yaml - -### @typespec/http - -- [#8961](https://github.com/microsoft/typespec/pull/8961) Support nested unions in operation return types - -### @typespec/openapi3 - -- [#9151](https://github.com/microsoft/typespec/pull/9151) Import OpenAPI 3.1/3.2 schemas with contentEncoding: base64 as bytes type with `@encode("base64", string)` decorator -- [#9076](https://github.com/microsoft/typespec/pull/9076) Respect `@externalDocs` on properties -- [#8961](https://github.com/microsoft/typespec/pull/8961) Support nested unions in operation return types diff --git a/website/src/content/docs/docs/release-notes/release-2026-01-13.md b/website/src/content/docs/docs/release-notes/release-2026-01-13.md deleted file mode 100644 index c7b54d4c7b1..00000000000 --- a/website/src/content/docs/docs/release-notes/release-2026-01-13.md +++ /dev/null @@ -1,46 +0,0 @@ ---- -title: "1.8.0" -releaseDate: 2026-01-13 -version: "1.8.0" ---- - -# 1.8.0 - -## Features - -### @typespec/compiler - -- [#9295](https://github.com/microsoft/typespec/pull/9295) Add `now()` initializer to date/time scalars (`plainDate`, `plainTime`, `utcDateTime`, `offsetDateTime`) for indicating current date/time at runtime. Emitters should interpret this as the appropriate runtime value (e.g., database `CURRENT_TIMESTAMP`, JavaScript `Date.now()`, etc.). -- [#9104](https://github.com/microsoft/typespec/pull/9104) [API] Introduction of decorator validator callbacks. A decorator can define some callbacks to achieve some deferred validation (After the type is finished or the whole graph is) -- [#9288](https://github.com/microsoft/typespec/pull/9288) [api] Expose `createSuppressCodeFixes` method to generate multiple code fixes from diagnostics -- [#9262](https://github.com/microsoft/typespec/pull/9262) Add support for OpenAPI 3.2.0 `defaultMapping` in discriminated unions. When a discriminated union has a default variant (unnamed variant), it is now properly emitted: - - For OpenAPI 3.2.0: The default variant is included in `oneOf` array and referenced via `discriminator.defaultMapping` property - - For OpenAPI 3.0 and 3.1: The default variant is included in `oneOf` array and its discriminator value is added to the `discriminator.mapping` object -- [#9300](https://github.com/microsoft/typespec/pull/9300) Add typekit to tester instances and test compile result" - -### @typespec/openapi3 - -- [#9289](https://github.com/microsoft/typespec/pull/9289) Add support for importing deprecated properties and types from OpenAPI -- [#9262](https://github.com/microsoft/typespec/pull/9262) Add support for OpenAPI 3.2.0 `defaultMapping` in discriminated unions. When a discriminated union has a default variant (unnamed variant), it is now properly emitted: - - For OpenAPI 3.2.0: The default variant is included in `oneOf` array and referenced via `discriminator.defaultMapping` property - - For OpenAPI 3.0 and 3.1: The default variant is included in `oneOf` array and its discriminator value is added to the `discriminator.mapping` object - -## Bug Fixes - -### @typespec/compiler - -- [#9280](https://github.com/microsoft/typespec/pull/9280) suppress - a extends/is inner statement suppress should be generated on the parent model node -- [#9293](https://github.com/microsoft/typespec/pull/9293) compiler - suppression node selection for operation response bodies -- [#9308](https://github.com/microsoft/typespec/pull/9308) Fixed mutation of decorator's argument values - -### @typespec/http - -- [#9311](https://github.com/microsoft/typespec/pull/9311) Fix empty response models with `statusCode` defined in a base model - -### @typespec/openapi3 - -- [#9228](https://github.com/microsoft/typespec/pull/9228) Importer: Escape ${...} patterns in extension string property values to prevent interpolation -- [#9236](https://github.com/microsoft/typespec/pull/9236) Fix extension properties with JSON-like strings using escaped string literals to prevent triple-quote syntax issues -- [#9275](https://github.com/microsoft/typespec/pull/9275) import tool - avoid double escaping backslashes -- [#9265](https://github.com/microsoft/typespec/pull/9265) import tool - missing imports for SSE events -- [#9265](https://github.com/microsoft/typespec/pull/9265) import tool - escape SSE event union identifiers when required diff --git a/website/src/content/docs/docs/standard-library/built-in-data-types.md b/website/src/content/docs/docs/standard-library/built-in-data-types.md index 663e1bca85d..fdd5d1d41e8 100644 --- a/website/src/content/docs/docs/standard-library/built-in-data-types.md +++ b/website/src/content/docs/docs/standard-library/built-in-data-types.md @@ -17,89 +17,6 @@ model Array | Element | The type of the array elements | -#### Properties -None - -### `Create` {#Create} - -A copy of the input model `T` with only the properties that are visible during the -"Create" resource lifecycle phase. - -This transformation is recursive, and will include only properties that have the -`Lifecycle.Create` visibility modifier. - -If a `NameTemplate` is provided, the new model will be named according to the template. -The template uses the same syntax as the `@friendlyName` decorator. -```typespec -model Create -``` - -#### Template Parameters -| Name | Description | -|------|-------------| -| T | The model to transform. | -| NameTemplate | The name template to use for the new model.

* | - -#### Examples - -```typespec -model Dog { - @visibility(Lifecycle.Read) - id: int32; - - name: string; -} - -// This model has only the `name` field. -model CreateDog is Create; -``` - -#### Properties -None - -### `CreateOrUpdate` {#CreateOrUpdate} - -A copy of the input model `T` with only the properties that are visible during the -"Create" or "Update" resource lifecycle phases. - -The "CreateOrUpdate" lifecycle phase is used by default for properties passed as parameters to operations -that can create _or_ update data, like HTTP PUT operations. - -This transformation is recursive, and will include only properties that have the -`Lifecycle.Create` or `Lifecycle.Update` visibility modifier. - -If a `NameTemplate` is provided, the new model will be named according to the template. -The template uses the same syntax as the `@friendlyName` decorator. -```typespec -model CreateOrUpdate -``` - -#### Template Parameters -| Name | Description | -|------|-------------| -| T | The model to transform. | -| NameTemplate | The name template to use for the new model.

* | - -#### Examples - -```typespec -model Dog { - @visibility(Lifecycle.Read) - id: int32; - - @visibility(Lifecycle.Create) - immutableSecret: string; - - @visibility(Lifecycle.Create, Lifecycle.Update) - secretName: string; - - name: string; -} - -// This model will have the `immutableSecret`, `secretName`, and `name` fields, but not the `id` field. -model CreateOrUpdateDog is CreateOrUpdate; -``` - #### Properties None @@ -117,51 +34,6 @@ model DefaultKeyVisibility | Visibility | The visibility to apply to all properties. | -#### Properties -None - -### `Delete` {#Delete} - -A copy of the input model `T` with only the properties that are visible during the -"Delete" resource lifecycle phase. - -The "Delete" lifecycle phase is used for properties passed as parameters to operations -that delete data, like HTTP DELETE operations. - -This transformation is recursive, and will include only properties that have the -`Lifecycle.Delete` visibility modifier. - -If a `NameTemplate` is provided, the new model will be named according to the template. -The template uses the same syntax as the `@friendlyName` decorator. -```typespec -model Delete -``` - -#### Template Parameters -| Name | Description | -|------|-------------| -| T | The model to transform. | -| NameTemplate | The name template to use for the new model.

* | - -#### Examples - -```typespec -model Dog { - @visibility(Lifecycle.Read) - id: int32; - - // Set when the Dog is removed from our data store. This happens when the - // Dog is re-homed to a new owner. - @visibility(Lifecycle.Delete) - nextOwner: string; - - name: string; -} - -// This model will have the `nextOwner` and `name` fields, but not the `id` field. -model DeleteDog is Delete; -``` - #### Properties None @@ -271,102 +143,6 @@ model PickProperties | Keys | The property keys to include. | -#### Properties -None - -### `Query` {#Query} - -A copy of the input model `T` with only the properties that are visible during the -"Query" resource lifecycle phase. - -The "Query" lifecycle phase is used for properties passed as parameters to operations -that read data, like HTTP GET or HEAD operations. This should not be confused for -the `@query` decorator, which specifies that the property is transmitted in the -query string of an HTTP request. - -This transformation is recursive, and will include only properties that have the -`Lifecycle.Query` visibility modifier. - -If a `NameTemplate` is provided, the new model will be named according to the template. -The template uses the same syntax as the `@friendlyName` decorator. -```typespec -model Query -``` - -#### Template Parameters -| Name | Description | -|------|-------------| -| T | The model to transform. | -| NameTemplate | The name template to use for the new model.

* | - -#### Examples - -```typespec -model Dog { - @visibility(Lifecycle.Read) - id: int32; - - // When getting information for a Dog, you can set this field to true to include - // some extra information about the Dog's pedigree that is normally not returned. - // Alternatively, you could just use a separate option parameter to get this - // information. - @visibility(Lifecycle.Query) - includePedigree?: boolean; - - name: string; - - // Only included if `includePedigree` is set to true in the request. - @visibility(Lifecycle.Read) - pedigree?: string; -} - -// This model will have the `includePedigree` and `name` fields, but not `id` or `pedigree`. -model QueryDog is Query; -``` - -#### Properties -None - -### `Read` {#Read} - -A copy of the input model `T` with only the properties that are visible during the -"Read" resource lifecycle phase. - -The "Read" lifecycle phase is used for properties returned by operations that read data, like -HTTP GET operations. - -This transformation is recursive, and will include only properties that have the -`Lifecycle.Read` visibility modifier. - -If a `NameTemplate` is provided, the new model will be named according to the template. -The template uses the same syntax as the `@friendlyName` decorator. -```typespec -model Read -``` - -#### Template Parameters -| Name | Description | -|------|-------------| -| T | The model to transform. | -| NameTemplate | The name template to use for the new model.

* | - -#### Examples - -```typespec -model Dog { - @visibility(Lifecycle.Read) - id: int32; - - @visibility(Lifecycle.Create, Lifecycle.Update) - secretName: string; - - name: string; -} - -// This model has the `id` and `name` fields, but not `secretName`. -model ReadDog is Read; -``` - #### Properties None @@ -400,50 +176,6 @@ model ServiceOptions |------|------|-------------| | title? | [`string`](#string) | Title of the service. | -### `Update` {#Update} - -A copy of the input model `T` with only the properties that are visible during the -"Update" resource lifecycle phase. - -The "Update" lifecycle phase is used for properties passed as parameters to operations -that update data, like HTTP PATCH operations. - -This transformation will include only the properties that have the `Lifecycle.Update` -visibility modifier, and the types of all properties will be replaced with the -equivalent `CreateOrUpdate` transformation. - -If a `NameTemplate` is provided, the new model will be named according to the template. -The template uses the same syntax as the `@friendlyName` decorator. -```typespec -model Update -``` - -#### Template Parameters -| Name | Description | -|------|-------------| -| T | The model to transform. | -| NameTemplate | The name template to use for the new model.

* | - -#### Examples - -```typespec -model Dog { - @visibility(Lifecycle.Read) - id: int32; - - @visibility(Lifecycle.Create, Lifecycle.Update) - secretName: string; - - name: string; -} - -// This model will have the `secretName` and `name` fields, but not the `id` field. -model UpdateDog is Update; -``` - -#### Properties -None - ### `UpdateableProperties` {#UpdateableProperties} Represents a collection of updateable properties. diff --git a/website/src/content/docs/docs/standard-library/built-in-decorators.md b/website/src/content/docs/docs/standard-library/built-in-decorators.md index 065a1cb5797..e38804062e6 100644 --- a/website/src/content/docs/docs/standard-library/built-in-decorators.md +++ b/website/src/content/docs/docs/standard-library/built-in-decorators.md @@ -1318,6 +1318,9 @@ Visibility may be set explicitly using any of the following decorators: ### `@withLifecycleUpdate` {#@withLifecycleUpdate} +:::caution +**Deprecated**: withLifecycleUpdate is deprecated and will be removed in a future release. Use the `Update` template instead. +::: Transforms the `target` model to include only properties that are visible during the "Update" lifecycle phase. @@ -1504,6 +1507,9 @@ model DogRead { ### `@withVisibilityFilter` {#@withVisibilityFilter} +:::caution +**Deprecated**: withVisibilityFilter is deprecated and will be removed in a future release. Use the `FilterVisibility` template or Lifecycle specific templates (e.g. `Read`, `Create`, `Update`, etc.) instead. +::: Applies the given visibility filter to the properties of the target model. diff --git a/website/src/content/docs/docs/standard-library/pagination.md b/website/src/content/docs/docs/standard-library/pagination.md index 1e47ca4d10f..b27c0ef9355 100644 --- a/website/src/content/docs/docs/standard-library/pagination.md +++ b/website/src/content/docs/docs/standard-library/pagination.md @@ -103,6 +103,10 @@ The continuation token can be in other locations as well, for instance, the belo }; ``` +:::note +For HTTP services, `@nextLink` (and other link decorators like `@prevLink`, `@firstLink`, `@lastLink`) should be followed using a GET request by default. The link URIs are expected to be treated as opaque URLs that contain all necessary information to navigate to the respective page. +::: + ### Example 3: Combining client and server driven pagination for an HTTP service ```tsp @@ -124,7 +128,7 @@ The continuation token can be in other locations as well, for instance, the belo A paged operation can offer additional parameters that are not used as paging control parameters like a filter parameter for example. The expectation is those would be carried over to the next page requests with the exception of the link cases(next, prev, first and last links) where each protocol might have a different interpretation of what the link exactly represents. The link may encode parameters such as query parameters in HTTP. In such cases those parameters must be passed. -For example, HTTP links are expected to be opaque and contain all the necessary information for the next page URL. This means that query and path parameters are expected to already have been included in the link. On the other hand, any header parameters are expected to be resent in the next request as those cannot be represented in the link. +For example, HTTP links are expected to be opaque and contain all the necessary information for the next page URL. When following these links (such as `@nextLink`, `@prevLink`, `@firstLink`, `@lastLink`), clients should use a GET request by default. This means that query and path parameters are expected to already have been included in the link. On the other hand, any header parameters are expected to be resent in the next request as those cannot be represented in the link. ### Examples diff --git a/website/src/content/docs/docs/release-notes/cadl-typespec-migration.md b/website/src/content/docs/release-notes/cadl-typespec-migration.md similarity index 100% rename from website/src/content/docs/docs/release-notes/cadl-typespec-migration.md rename to website/src/content/docs/release-notes/cadl-typespec-migration.md diff --git a/website/src/content/docs/docs/release-notes/images/tspconfig-completion.png b/website/src/content/docs/release-notes/images/tspconfig-completion.png similarity index 100% rename from website/src/content/docs/docs/release-notes/images/tspconfig-completion.png rename to website/src/content/docs/release-notes/images/tspconfig-completion.png diff --git a/website/src/content/docs/docs/release-notes/release-2022-07-08.md b/website/src/content/docs/release-notes/release-2022-07-08.md similarity index 99% rename from website/src/content/docs/docs/release-notes/release-2022-07-08.md rename to website/src/content/docs/release-notes/release-2022-07-08.md index 62ec4531313..a4a083a61f8 100644 --- a/website/src/content/docs/docs/release-notes/release-2022-07-08.md +++ b/website/src/content/docs/release-notes/release-2022-07-08.md @@ -1,5 +1,6 @@ --- title: July 2022 +releaseDate: 2022-07-08 --- This release contains **breaking changes** diff --git a/website/src/content/docs/docs/release-notes/release-2022-08-10.md b/website/src/content/docs/release-notes/release-2022-08-10.md similarity index 99% rename from website/src/content/docs/docs/release-notes/release-2022-08-10.md rename to website/src/content/docs/release-notes/release-2022-08-10.md index 6b6de8c10ae..b11ab444227 100644 --- a/website/src/content/docs/docs/release-notes/release-2022-08-10.md +++ b/website/src/content/docs/release-notes/release-2022-08-10.md @@ -1,5 +1,6 @@ --- title: August 2022 +releaseDate: 2022-08-10 --- This release contains **breaking changes** diff --git a/website/src/content/docs/docs/release-notes/release-2022-09-07.md b/website/src/content/docs/release-notes/release-2022-09-07.md similarity index 98% rename from website/src/content/docs/docs/release-notes/release-2022-09-07.md rename to website/src/content/docs/release-notes/release-2022-09-07.md index 08eb6745b05..37c2aefa0f7 100644 --- a/website/src/content/docs/docs/release-notes/release-2022-09-07.md +++ b/website/src/content/docs/release-notes/release-2022-09-07.md @@ -1,5 +1,6 @@ --- title: September 2022 +releaseDate: 2022-09-07 --- This release contains **breaking changes**: diff --git a/website/src/content/docs/docs/release-notes/release-2022-10-12.md b/website/src/content/docs/release-notes/release-2022-10-12.md similarity index 99% rename from website/src/content/docs/docs/release-notes/release-2022-10-12.md rename to website/src/content/docs/release-notes/release-2022-10-12.md index 02ccf87b29e..3b22d4798ff 100644 --- a/website/src/content/docs/docs/release-notes/release-2022-10-12.md +++ b/website/src/content/docs/release-notes/release-2022-10-12.md @@ -1,5 +1,6 @@ --- title: October 2022 +releaseDate: 2022-10-12 --- This release contains **breaking changes**: diff --git a/website/src/content/docs/docs/release-notes/release-2022-12-07.md b/website/src/content/docs/release-notes/release-2022-12-07.md similarity index 99% rename from website/src/content/docs/docs/release-notes/release-2022-12-07.md rename to website/src/content/docs/release-notes/release-2022-12-07.md index 3afea3da30f..8aec0b6921d 100644 --- a/website/src/content/docs/docs/release-notes/release-2022-12-07.md +++ b/website/src/content/docs/release-notes/release-2022-12-07.md @@ -1,5 +1,6 @@ --- title: December 2022 +releaseDate: 2022-12-07 --- :::caution diff --git a/website/src/content/docs/docs/release-notes/release-2023-01-12.md b/website/src/content/docs/release-notes/release-2023-01-12.md similarity index 98% rename from website/src/content/docs/docs/release-notes/release-2023-01-12.md rename to website/src/content/docs/release-notes/release-2023-01-12.md index 059eb0039bb..326db9b589a 100644 --- a/website/src/content/docs/docs/release-notes/release-2023-01-12.md +++ b/website/src/content/docs/release-notes/release-2023-01-12.md @@ -1,5 +1,6 @@ --- title: January 2023 +releaseDate: 2023-01-12 --- :::caution diff --git a/website/src/content/docs/docs/release-notes/release-2023-02-07.md b/website/src/content/docs/release-notes/release-2023-02-07.md similarity index 99% rename from website/src/content/docs/docs/release-notes/release-2023-02-07.md rename to website/src/content/docs/release-notes/release-2023-02-07.md index e34e08a5696..d6f5106e1ab 100644 --- a/website/src/content/docs/docs/release-notes/release-2023-02-07.md +++ b/website/src/content/docs/release-notes/release-2023-02-07.md @@ -1,5 +1,6 @@ --- title: February 2023 +releaseDate: 2023-02-07 --- :::caution diff --git a/website/src/content/docs/docs/release-notes/release-2023-03-13.md b/website/src/content/docs/release-notes/release-2023-03-13.md similarity index 98% rename from website/src/content/docs/docs/release-notes/release-2023-03-13.md rename to website/src/content/docs/release-notes/release-2023-03-13.md index 9ff647b4286..ef71402113f 100644 --- a/website/src/content/docs/docs/release-notes/release-2023-03-13.md +++ b/website/src/content/docs/release-notes/release-2023-03-13.md @@ -1,5 +1,6 @@ --- title: March 2023 +releaseDate: 2023-03-13 --- :::caution diff --git a/website/src/content/docs/docs/release-notes/release-2023-04-11.md b/website/src/content/docs/release-notes/release-2023-04-11.md similarity index 99% rename from website/src/content/docs/docs/release-notes/release-2023-04-11.md rename to website/src/content/docs/release-notes/release-2023-04-11.md index c22e61584db..1b1496eca77 100644 --- a/website/src/content/docs/docs/release-notes/release-2023-04-11.md +++ b/website/src/content/docs/release-notes/release-2023-04-11.md @@ -1,5 +1,6 @@ --- title: April 2023 +releaseDate: 2023-04-11 --- :::caution diff --git a/website/src/content/docs/docs/release-notes/release-2023-05-10.md b/website/src/content/docs/release-notes/release-2023-05-10.md similarity index 99% rename from website/src/content/docs/docs/release-notes/release-2023-05-10.md rename to website/src/content/docs/release-notes/release-2023-05-10.md index 29dc8516864..89b2515d47a 100644 --- a/website/src/content/docs/docs/release-notes/release-2023-05-10.md +++ b/website/src/content/docs/release-notes/release-2023-05-10.md @@ -1,5 +1,6 @@ --- title: May 2023 +releaseDate: 2023-05-10 --- :::caution diff --git a/website/src/content/docs/docs/release-notes/release-2023-06-06.md b/website/src/content/docs/release-notes/release-2023-06-06.md similarity index 99% rename from website/src/content/docs/docs/release-notes/release-2023-06-06.md rename to website/src/content/docs/release-notes/release-2023-06-06.md index 26915ec7756..5f5c01d07e7 100644 --- a/website/src/content/docs/docs/release-notes/release-2023-06-06.md +++ b/website/src/content/docs/release-notes/release-2023-06-06.md @@ -1,5 +1,6 @@ --- title: June 2023 +releaseDate: 2023-06-06 --- :::caution diff --git a/website/src/content/docs/docs/release-notes/release-2023-07-11.md b/website/src/content/docs/release-notes/release-2023-07-11.md similarity index 99% rename from website/src/content/docs/docs/release-notes/release-2023-07-11.md rename to website/src/content/docs/release-notes/release-2023-07-11.md index 5ed681897ac..5943ad04fd0 100644 --- a/website/src/content/docs/docs/release-notes/release-2023-07-11.md +++ b/website/src/content/docs/release-notes/release-2023-07-11.md @@ -1,5 +1,6 @@ --- title: July 2023 +releaseDate: 2023-07-11 --- :::caution diff --git a/website/src/content/docs/docs/release-notes/release-2023-08-08.md b/website/src/content/docs/release-notes/release-2023-08-08.md similarity index 99% rename from website/src/content/docs/docs/release-notes/release-2023-08-08.md rename to website/src/content/docs/release-notes/release-2023-08-08.md index 38185b8026b..624a37ab224 100644 --- a/website/src/content/docs/docs/release-notes/release-2023-08-08.md +++ b/website/src/content/docs/release-notes/release-2023-08-08.md @@ -1,5 +1,6 @@ --- title: August 2023 +releaseDate: 2023-08-08 --- :::caution diff --git a/website/src/content/docs/docs/release-notes/release-2023-09-12.md b/website/src/content/docs/release-notes/release-2023-09-12.md similarity index 99% rename from website/src/content/docs/docs/release-notes/release-2023-09-12.md rename to website/src/content/docs/release-notes/release-2023-09-12.md index bc228a07a36..39b7c6183a4 100644 --- a/website/src/content/docs/docs/release-notes/release-2023-09-12.md +++ b/website/src/content/docs/release-notes/release-2023-09-12.md @@ -1,5 +1,6 @@ --- title: September 2023 +releaseDate: 2023-09-12 --- :::caution diff --git a/website/src/content/docs/docs/release-notes/release-2023-10-11.md b/website/src/content/docs/release-notes/release-2023-10-11.md similarity index 99% rename from website/src/content/docs/docs/release-notes/release-2023-10-11.md rename to website/src/content/docs/release-notes/release-2023-10-11.md index a29404ff85b..83bdeb1f5c2 100644 --- a/website/src/content/docs/docs/release-notes/release-2023-10-11.md +++ b/website/src/content/docs/release-notes/release-2023-10-11.md @@ -1,5 +1,6 @@ --- title: October 2023 +releaseDate: 2023-10-11 --- :::caution diff --git a/website/src/content/docs/docs/release-notes/release-2023-11-07.md b/website/src/content/docs/release-notes/release-2023-11-07.md similarity index 99% rename from website/src/content/docs/docs/release-notes/release-2023-11-07.md rename to website/src/content/docs/release-notes/release-2023-11-07.md index 657676ef760..5259ebd4a35 100644 --- a/website/src/content/docs/docs/release-notes/release-2023-11-07.md +++ b/website/src/content/docs/release-notes/release-2023-11-07.md @@ -1,5 +1,6 @@ --- title: November 2023 +releaseDate: 2023-11-07 --- :::caution diff --git a/website/src/content/docs/docs/release-notes/release-2023-12-06.md b/website/src/content/docs/release-notes/release-2023-12-06.md similarity index 99% rename from website/src/content/docs/docs/release-notes/release-2023-12-06.md rename to website/src/content/docs/release-notes/release-2023-12-06.md index a4cdf92644b..cd7653ac9e3 100644 --- a/website/src/content/docs/docs/release-notes/release-2023-12-06.md +++ b/website/src/content/docs/release-notes/release-2023-12-06.md @@ -1,5 +1,6 @@ --- title: December 2023 +releaseDate: 2023-12-06 --- :::caution diff --git a/website/src/content/docs/docs/release-notes/release-2024-01-23.md b/website/src/content/docs/release-notes/release-2024-01-23.md similarity index 99% rename from website/src/content/docs/docs/release-notes/release-2024-01-23.md rename to website/src/content/docs/release-notes/release-2024-01-23.md index 26424805d1e..52dd36603db 100644 --- a/website/src/content/docs/docs/release-notes/release-2024-01-23.md +++ b/website/src/content/docs/release-notes/release-2024-01-23.md @@ -1,5 +1,6 @@ --- title: January 2024 +releaseDate: 2024-01-23 --- :::caution diff --git a/website/src/content/docs/docs/release-notes/release-2024-02-06.md b/website/src/content/docs/release-notes/release-2024-02-06.md similarity index 97% rename from website/src/content/docs/docs/release-notes/release-2024-02-06.md rename to website/src/content/docs/release-notes/release-2024-02-06.md index 701e96b09ac..c0d3f601bc1 100644 --- a/website/src/content/docs/docs/release-notes/release-2024-02-06.md +++ b/website/src/content/docs/release-notes/release-2024-02-06.md @@ -1,5 +1,6 @@ --- title: February 2024 +releaseDate: 2024-02-06 --- ## Release of VSCode and Visual Studio extensions diff --git a/website/src/content/docs/docs/release-notes/release-2024-03-05.md b/website/src/content/docs/release-notes/release-2024-03-05.md similarity index 99% rename from website/src/content/docs/docs/release-notes/release-2024-03-05.md rename to website/src/content/docs/release-notes/release-2024-03-05.md index d472306cd66..3c4b2a7c036 100644 --- a/website/src/content/docs/docs/release-notes/release-2024-03-05.md +++ b/website/src/content/docs/release-notes/release-2024-03-05.md @@ -1,5 +1,6 @@ --- title: March 2024 +releaseDate: 2024-03-05 --- :::caution diff --git a/website/src/content/docs/docs/release-notes/signature-help.png b/website/src/content/docs/release-notes/signature-help.png similarity index 100% rename from website/src/content/docs/docs/release-notes/signature-help.png rename to website/src/content/docs/release-notes/signature-help.png diff --git a/website/src/content/docs/release-notes/typespec-0-55.md b/website/src/content/docs/release-notes/typespec-0-55.md new file mode 100644 index 00000000000..5b0a31d9f85 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-0-55.md @@ -0,0 +1,66 @@ +--- +slug: release-notes/typespec-0-55 +title: 0.55 - April 2024 +releaseDate: 2024-04-02 +version: "0.55" +--- + +:::caution +This release contains deprecations +::: + +## Deprecations + +### @typespec/compiler + +- [#2910](https://github.com/microsoft/typespec/pull/2910) Deprecate `@projectedName` decorator. `@encodedName` should be used instead. + + Example: + + ```diff + -@projectedName("json", "exp") + +@encodedName("application/json", "exp") + ``` + +- [#3094](https://github.com/microsoft/typespec/pull/3094) Deprecate `@knownValues` decorator. Use a named union of string literal with a string variant to achieve the same result without a decorator + + Example: + + ```diff + -enum FooKV { a, b, c} + -@knownValues(FooKV) + -scalar foo extends string; + +union Foo { "a", "b", "c", string } + ``` + +## Features + +### @typespec/compiler + +- [#2992](https://github.com/microsoft/typespec/pull/2992) Enable the use of `@encode` for model properties that have a union type. This supports cases like `@encode("rfc3339") prop: utcDateTime | null` + +### @typespec/versioning + +- [#3053](https://github.com/microsoft/typespec/pull/3053) Add support for versioning of scalars(Added, removed, renamed) + +## Bug Fixes + +### @typespec/compiler + +- [#3018](https://github.com/microsoft/typespec/pull/3018) Grammar: Fix comments in template params not tokenized +- [#3052](https://github.com/microsoft/typespec/pull/3052) Fix: Union template declaration were incorrectly being finished in projection +- [#2983](https://github.com/microsoft/typespec/pull/2983) Warnings converted to error with `warn-as-error` do not prevent compilation from moving to the next stage like regular warnings +- [#3041](https://github.com/microsoft/typespec/pull/3041) Improve reliability of application of codefixes in IDE, often it would not do anything +- [#3069](https://github.com/microsoft/typespec/pull/3069) TmLanguage: Fix tokenization of escaped identifiers, enums and unions + +### @typespec/openapi3 + +- [#3077](https://github.com/microsoft/typespec/pull/3077) Do not crash if using an unsupported intrinsic type +- [#2967](https://github.com/microsoft/typespec/pull/2967) Fix crash: emit `{nullable: true}` when trying to emit `null` in openapi3 +- [#3013](https://github.com/microsoft/typespec/pull/3013) Fix: OpenAPI3 not marking part of bytes or something else as `format: binary` +- [#3090](https://github.com/microsoft/typespec/pull/3090) Fix: Literal unions with the same variants keep adding duplicate entries +- [#3049](https://github.com/microsoft/typespec/pull/3049) Fix visibility naming conflict when a model used with `extends` was used in different visibility. + +### @typespec/eslint-config-typespec + +- [#2122](https://github.com/microsoft/typespec/pull/2122) Ignore `generated-defs` folder diff --git a/website/src/content/docs/release-notes/typespec-0-56.md b/website/src/content/docs/release-notes/typespec-0-56.md new file mode 100644 index 00000000000..8e8785ead36 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-0-56.md @@ -0,0 +1,158 @@ +--- +slug: release-notes/typespec-0-56 +title: 0.56 - May 2024 +releaseDate: 2024-05-07 +version: "0.56" +--- + +:::caution +This release contains breaking changes +::: + +## Breaking Changes + +### @typespec/http + +- [#2945](https://github.com/microsoft/typespec/pull/2945) Empty model after removing metadata and applying visibility always results in "void" + This means the following case have changed from returning `{}` to no body + + ```tsp + op b1(): {}; + op b2(): { + @visibility("none") prop: string; + }; + op b3(): { + @added(Versions.v2) prop: string; + }; + ``` + + Workaround: Use explicit `@body` + + ```tsp + op b1(): { + @body _: {}; + }; + op b2(): { + @body _: { + @visibility("none") prop: string; + }; + }; + op b3(): { + @body _: { + @added(Versions.v2) prop: string; + }; + }; + ``` + +- [#2945](https://github.com/microsoft/typespec/pull/2945) Implicit status code always 200 except if response is explicitly `void` + + ```tsp + op c1(): { + @header foo: string; + }; // status code 200 (used to be 204) + ``` + + Solution: Add explicit `@statusCode` + + ```tsp + op c1(): { + @header foo: string; + @statusCode _: 204; + }; + op c1(): { + @header foo: string; + ...NoContent; + }; // or spread common model + ``` + +- [#2945](https://github.com/microsoft/typespec/pull/2945) `@body` means this is the body + + This change makes using `@body` mean this is the exact body and everything underneath will be included, including metadata properties. If metadata properties are present on the body, a warning will be logged. + + ```tsp + op a1(): {@body _: {@header foo: string, other: string} }; + ^ warning header in a body, it will not be included as a header. + ``` + + Use `@bodyRoot` if you want to only change where to resolve the body from. + + ```tsp + op a1(): { + @bodyRoot _: { + @header foo: string; + other: string; + }; + }; + ``` + +- [#2945](https://github.com/microsoft/typespec/pull/2945) Properties are not automatically omitted if everything was removed from metadata or visibility + + ```tsp + op d1(): { + headers: { + @header foo: string; + }; + }; // body will be {headers: {}} + ``` + + Solution: use `@bodyIgnore` + + ```tsp + op d1(): { + @bodyIgnore headers: { + @header foo: string; + }; + }; // body will be {headers: {}} + ``` + +## Features + +### @typespec/compiler + +- [#3035](https://github.com/microsoft/typespec/pull/3035) `getEncode` returns the fully qualified enum member name if using a custom enum. +- [#3183](https://github.com/microsoft/typespec/pull/3183) Show template parameters when hovering on an operation template +- [#3191](https://github.com/microsoft/typespec/pull/3191) [API] Add new `sourceModels` property to model + +### @typespec/rest + +- [#2945](https://github.com/microsoft/typespec/pull/2945) Add support for new `@bodyRoot` and `@body` distinction + +### @typespec/openapi3 + +- [#2945](https://github.com/microsoft/typespec/pull/2945) Add support for new `@bodyRoot` and `@body` distinction + +### @typespec/html-program-viewer + +- [#3191](https://github.com/microsoft/typespec/pull/3191) Add `sourceModels` property to model view + +## Bug Fixes + +### @typespec/compiler + +- [#3170](https://github.com/microsoft/typespec/pull/3170) `--nostdlib` flag will now work by only applying to optional standard library types +- [#3212](https://github.com/microsoft/typespec/pull/3212) Fix: augmenting template model property could result in sending invalid argument to decorator +- [#3188](https://github.com/microsoft/typespec/pull/3188) Fix: Do not crash when trying to access member of aliased expressions +- [#3185](https://github.com/microsoft/typespec/pull/3185) Fix tsp init hanging when done due to unclosed connection +- [#3151](https://github.com/microsoft/typespec/pull/3151) IDE: Fix completion of statement keywords +- [#3287](https://github.com/microsoft/typespec/pull/3287) Templated interface extending another templated interface shouldn't run decorator on their operations +- [#3290](https://github.com/microsoft/typespec/pull/3290) Model with an optional property should not satisfy a constraint with that property required. (`{foo?: string}` cannot be assigned to a constraint of `{foo: string}`) +- [#3163](https://github.com/microsoft/typespec/pull/3163) Fix: Model with spread indexer shouldn't validate explicit properties +- [#3227](https://github.com/microsoft/typespec/pull/3227) Stop running decorators on partially instantiated operations(When interface is instantiated but not the operation) +- [#3180](https://github.com/microsoft/typespec/pull/3180) Fix issue where directives were not parsed to the leaf node in multi-segment Namespace segments. +- [#3243](https://github.com/microsoft/typespec/pull/3243) Fix calling `tsp install` on windows due to recent NodeJS breaking change to fix vulnerability. +- [#3216](https://github.com/microsoft/typespec/pull/3216) Fix compiler crash when using an invalid `is` target in an interface operation template +- [#3246](https://github.com/microsoft/typespec/pull/3246) Internals: Use node built-in `fetch` API that is now stable since node `18.13.0` + +### @typespec/http + +- [#3196](https://github.com/microsoft/typespec/pull/3196) Fix password flow defining `authorizationUrl` instead of `tokenUrl` +- [#3190](https://github.com/microsoft/typespec/pull/3190) Fix `@path` param mapping when spreading a record in operation parameters +- [#3218](https://github.com/microsoft/typespec/pull/3218) Fix: `@path` property shouldn't be applicableMetadata if the visibility contains `Read` + +### @typespec/versioning + +- [#3264](https://github.com/microsoft/typespec/pull/3264) Fix crash when `@service` appears inside a versioned namespace + +### @typespec/openapi3 + +- [#3218](https://github.com/microsoft/typespec/pull/3218) Fix: `@path` property should be included in unreachable models diff --git a/website/src/content/docs/release-notes/typespec-0-57.md b/website/src/content/docs/release-notes/typespec-0-57.md new file mode 100644 index 00000000000..a0961b47f28 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-0-57.md @@ -0,0 +1,277 @@ +--- +slug: release-notes/typespec-0-57 +title: 0.57 - June 2024 +releaseDate: 2024-06-10 +version: "0.57" +--- + +:::caution +This release contains deprecations and breaking changes +::: + +## Values In TypeSpec + +Decorators often expect some sort of configuration to be passed as an argument. In version `0.51.0` we introduced the `valueof` keyword to constrain a decorator or template parameter to be a value, however this was limited to string, numeric and boolean values. +When dealing with more complex decorators or free form data, one had to use a model type to represent the data. Unfortunately, this approach was difficult for decorator authors to handle reliably and required somewhat sophisticated validation to avoid some common pitfalls that couldn't be prevented through type system constraints. + +In this release we introduce a new concept to TypeSpec: values. This includes new syntax for declaring object and array values, scalar constructors, and `const` declarations. + +### Object values + +Object values can be declared with the `#{}` syntax. + +```tsp +const user = #{ name: "Bob", age: 48, address: #{ city: "London" } }; +``` + +### Array values + +Array values can be declared with the `#[]` syntax. + +```tsp +const users = #["Bob", "Frank"]; +``` + +### `const` + +Const declares a variable that holds a value, and can optionally specify a type. + +```tsp +const name = "Bob"; +const name: string = "Bob"; +``` + +### Scalar constructors + +Scalars can define custom values with scalar value constructors. Scalars which don't extend a base type like `string`, `number` or `boolean` can define a constructor. + +```tsp +scalar ipV4 { + init fromInt(value: int32); +} +const ip: ipV4 = ipV4.fromInt(3232235776); +``` + +[See values doc for more info](https://typespec.io/docs/language-basics/values) + +## Breaking changes + +- [#3022](https://github.com/microsoft/typespec/pull/3022) Addition of new `const` keyword means using `const` as a property name or decorator name will result in an error. This can be fixed by wrapping the property in backtick. + +```tsp +model Test { + // error + const: string; + + // correct + `const`: string; + +} +``` + +## Deprecations + +### @typespec/compiler + +- [#3022](https://github.com/microsoft/typespec/pull/3022) Using a tuple type as a value is deprecated. Tuple types in contexts where values are expected must be updated to be array values instead. A codefix is provided to automatically convert tuple types into array values. + +```tsp +model Test { + // Deprecated + values: string[] = ["a", "b", "c"]; + + // Correct + values: string[] = #["a", "b", "c"]; +} +``` + +- [#3022](https://github.com/microsoft/typespec/pull/3022) Using a model type as a value is deprecated. Model types in contexts where values are expected must be updated to be object values instead. A codefix is provided to automatically convert model types into object values. + +```tsp +model Test { + // Deprecated + user: { + name: string; + } = { + name: "System"; + }; + + // Correct + user: { + name: string; + } = #{ name: "System" }; +} +``` + +- [#3022](https://github.com/microsoft/typespec/pull/3022) Decorator API: Legacy marshalling logic + +With the introduction of values, the decorator marshalling behavior has changed in some cases. This behavior is opt-in by setting the `valueMarshalling` package flag to `"new"`, but will be the default behavior in future versions. It is strongly recommended to adopt this new behavior as soon as possible. + +Example: + +```tsp +extern dec multipleOf(target: numeric | Reflection.ModelProperty, value: valueof numeric); +``` + +Will now emit a deprecated warning because `value` is of type `valueof string` which would marshall to `Numeric` under the new logic but as `number` previously. + +To opt-in you can add the following to your library js/ts files. + +```ts +export const $flags = definePackageFlags({ + decoratorArgMarshalling: "new", +}); +``` + +## Features + +### @typespec/compiler + +- [#3280](https://github.com/microsoft/typespec/pull/3280) Support completion for Model with extended properties + + Example + + ```tsp + model Device { + name: string; + description: string; + } + + model Phone extends Device { + ┆ + } | [name] + | [description] + ``` + +- [#3280](https://github.com/microsoft/typespec/pull/3280) Support completion for object values and model expression properties. + + Example + + ```tsp + model User { + name: string; + age: int32; + address: string; + } + + const user: User = #{name: "Bob", ┆} + | [age] + | [address] + ``` + +- [#3375](https://github.com/microsoft/typespec/pull/3375) Allow `@` to be escaped in doc comment with `\` +- [#3022](https://github.com/microsoft/typespec/pull/3022) Add syntax for declaring values. [See docs](https://typespec.io/docs/language-basics/values). + +Object and array values + +```tsp +@dummy(#{ + name: "John", + age: 48, + address: #{ city: "London" } + aliases: #["Bob", "Frank"] +}) +``` + +Scalar constructors + +```tsp +scalar utcDateTime { + init fromISO(value: string); +} + +model DateRange { + minDate: utcDateTime = utcDateTime.fromISO("2024-02-15T18:36:03Z"); +} +``` + +- [#3527](https://github.com/microsoft/typespec/pull/3527) Add support for `@prop` doc comment tag to describe model properties +- [#3460](https://github.com/microsoft/typespec/pull/3460) Hide deprecated items from completion list +- [#3462](https://github.com/microsoft/typespec/pull/3462) Linter `all` rulesets is automatically created if not explicitly provided +- [#3533](https://github.com/microsoft/typespec/pull/3533) More logs and traces are added for diagnostic and troubleshooting in TypeSpec language server +- [#3422](https://github.com/microsoft/typespec/pull/3422) Formatter: Indent or dedent multiline strings to the current indentation + +### @typespec/http + +- [#3342](https://github.com/microsoft/typespec/pull/3342) Add new multipart handling. Using `@multipartBody` with `HttpPart`. See [multipart docs](https://typespec.io/docs/next/libraries/http/multipart) for more information. + + ```tsp + op upload( + @header contentType: "multipart/mixed", + @multipartBody body: { + name: HttpPart; + avatar: HttpPart[]; + }, + ): void; + ``` + +- [#3462](https://github.com/microsoft/typespec/pull/3462) Use new compiler automatic `all` ruleset instead of explicitly provided one + +### @typespec/openapi3 + +- [#3022](https://github.com/microsoft/typespec/pull/3022) Add support for new object and array values as default values (e.g. `decimals: decimal[] = #[123, 456.7];`) + +### @typespec/html-program-viewer + +- [#3022](https://github.com/microsoft/typespec/pull/3022) Add support for values + +### @typespec/json-schema + +- [#3557](https://github.com/microsoft/typespec/pull/3557) Add support for @oneOf decorator. + +### typespec-vs + +- [#3461](https://github.com/microsoft/typespec/pull/3461) Support Arm64 + +### typespec-vscode + +- [#3533](https://github.com/microsoft/typespec/pull/3533) Enhance logging and trace + +1. Support "Developer: Set Log Level..." command to filter logs in TypeSpec output channel +2. Add "typespecLanguageServer.trace.server" config for whether and how to send the traces from TypeSpec language server to client. (It still depends on client to decide whether to show these traces based on the configured Log Level.) +3. More logs and traces are added for diagnostic and troubleshooting + +- [#3385](https://github.com/microsoft/typespec/pull/3385) Add 'TypeSpec: Show Output Channel' command in VSCode extension + +## Bug Fixes + +### @typespec/compiler + +- [#3399](https://github.com/microsoft/typespec/pull/3399) Preserve leading whitespace in fenced blocks in doc comments +- [#3522](https://github.com/microsoft/typespec/pull/3522) Fix EINVAL error when running `tsp code install` +- [#3371](https://github.com/microsoft/typespec/pull/3371) Numeric not handling trailing zeros and causing freeze(e.g. `const a = 100.0`) +- [#3451](https://github.com/microsoft/typespec/pull/3451) Emitter framework: fix losing context when referencing circular types +- [#3517](https://github.com/microsoft/typespec/pull/3517) Fix application of `@param` doc tag on operation create with `op is` to override upstream doc +- [#3488](https://github.com/microsoft/typespec/pull/3488) Add `PickProperties` type to dynamically select a subset of a model + +### @typespec/http + +- [#3022](https://github.com/microsoft/typespec/pull/3022) Update Flow Template to make use of the new array values + +### @typespec/versioning + +- [#3292](https://github.com/microsoft/typespec/pull/3292) Add `@madeRequired` decorator +- [#3022](https://github.com/microsoft/typespec/pull/3022) Update to support new value types +- [#3409](https://github.com/microsoft/typespec/pull/3409) Using `@removed` on member types and `@added` on containing type could result in errors +- [#3255](https://github.com/microsoft/typespec/pull/3255) If a property were marked with @added on a later version, the logic that said it was originally added on the first version was erroneously removed, resulting in incorrect projections. + +### @typespec/rest + +- [#3022](https://github.com/microsoft/typespec/pull/3022) Update types to support new values in TypeSpec + +### @typespec/openapi3 + +- [#3342](https://github.com/microsoft/typespec/pull/3342) Add support for new multipart constructs in http library +- [#3574](https://github.com/microsoft/typespec/pull/3574) Emit diagnostic when an invalid type is used as a property instead of crashing. + +### @typespec/protobuf + +- [#3022](https://github.com/microsoft/typespec/pull/3022) Update to support new value types +- [#3561](https://github.com/microsoft/typespec/pull/3561) Corrected cross-package reference behavior in some buggy cases. +- + +### @typespec/json-schema + +- [#3398](https://github.com/microsoft/typespec/pull/3398) Fix decorators application for union variants +- [#3022](https://github.com/microsoft/typespec/pull/3022) Update to support new value types +- [#3430](https://github.com/microsoft/typespec/pull/3430) The emitted JSON Schema now doesn't make root schemas for TypeSpec types which do not have the @jsonSchema decorator or are contained in a namespace with that decorator. Instead, such schemas are put into the $defs of any root schema which references them, and are referenced using JSON Pointers. diff --git a/website/src/content/docs/release-notes/typespec-0-58.md b/website/src/content/docs/release-notes/typespec-0-58.md new file mode 100644 index 00000000000..96c0a6ba239 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-0-58.md @@ -0,0 +1,169 @@ +--- +slug: release-notes/typespec-0-58 +title: 0.58 - July 2024 +releaseDate: 2024-07-16 +version: "0.58" +--- + +:::caution +This release contains breaking changes +::: + +## Examples in TypeSpec + +This release introduce a new `@example` and `@opExample` decorator. + +Those new decorators provide a way to specify some canonical examples for data types and operations. Each emitter is then able to serialize those examples in their own format. + +```tsp +@example(#{ + id: "some", + date: utcDateTime.fromISO("2020-01-01T00:00:00Z"), + timeout: duration.fromISO("PT1M"), +}) +model Foo { + id: string; + date: utcDateTime; + @encode("seconds", int32) timeout: duration; +} +``` + +```tsp +@opExample( + #{ + parameters: #{ pet: #{ id: "some", name: "Fluffy", dob: plainDate.fromISO("2020-01-01") } }, + returnType: #{ id: "some", name: "Fluffy", dob: plainDate.fromISO("2020-01-01") }, + }, + #{ title: "First", description: "Show creating a pet" } +) +op createPet(pet: Pet): Pet; +``` + +## Breaking Changes + +### @typespec/compiler + +- [#3793](https://github.com/microsoft/typespec/pull/3793) Do not carry over `@friendlyName` with `model is` or `op is` + + ```tsp + @friendlyName("Abc{T}", T) + model Foo {} + + model Bar is Foo; + + // This can be changed to + model Abcstring is Foo; + ``` + +- [#3659](https://github.com/microsoft/typespec/pull/3659) Disallows overriding a required inherited property with an optional property. + +In previous versions of TypeSpec, it was possible to override a required property with an optional property. This is no longer allowed. This change may result in errors in your code if you were relying on this bug, but specifications that used this behavior are likely to have been exposed to errors resulting from incoherent type checking behavior. + +The following example demonstrates the behavior that is no longer allowed: + +```tsp +model Base { + example: string; +} + +model Child extends Base { + example?: string; +} +``` + +In this example, the `Child` model overrides the `example` property from the `Base` model with an optional property. This is no longer allowed. + +### @typespec/http + +- [#3737](https://github.com/microsoft/typespec/pull/3737) Keep trailing slash when building http routes, this is breaking if you used to have `@route()` ending with `/`. + + | TypeSpec | Before | After | + | ---------------------------------------------------------------- | ----------------- | ------------------ | + | `@route("users/")` | `users` | `users/` | + | `@route("users")` | `users` | `users` | + | on interface `@route("users/")` and on op `@route("addresses/")` | `users/addresses` | `users/addresses/` | + | on interface `@route("users/")` and on op `@route("addresses")` | `users/addresses` | `users/addresses` | + +## Features + +### @typespec/compiler + +- [#3699](https://github.com/microsoft/typespec/pull/3699) Moved compiler dependencies to peer and dev for scaffolded projects. +- [59daf90](https://github.com/microsoft/typespec/commit/59daf9054c709d3657e498b5f6dbe77492c98210) Add new `@example` and `@opExample` decorator to provide examples on types and operations. + + ```tsp + @example(#{ + id: "some", + date: utcDateTime.fromISO("2020-01-01T00:00:00Z"), + timeout: duration.fromISO("PT1M"), + }) + model Foo { + id: string; + date: utcDateTime; + @encode("seconds", int32) timeout: duration; + } + ``` + + ```tsp + @opExample( + #{ + parameters: #{ pet: #{ id: "some", name: "Fluffy", dob: plainDate.fromISO("2020-01-01") } }, + returnType: #{ id: "some", name: "Fluffy", dob: plainDate.fromISO("2020-01-01") }, + }, + #{ title: "First", description: "Show creating a pet" } + ) + op createPet(pet: Pet): Pet; + ``` + +- [#3751](https://github.com/microsoft/typespec/pull/3751) Adds option to `tsp init` to generate .gitignore file + +### @typespec/http + +- [#3717](https://github.com/microsoft/typespec/pull/3717) Allow overriding base operation verb +- [#3676](https://github.com/microsoft/typespec/pull/3676) Expose `getHttpPart` and types functions +- [#3732](https://github.com/microsoft/typespec/pull/3732) Expose `model` property on `HttpAuth` to retrieve original type used to define security scheme + +### @typespec/openapi + +- [#3626](https://github.com/microsoft/typespec/pull/3626) Adds public function for setting info object + +### @typespec/openapi3 + +- [bd0b3df](https://github.com/microsoft/typespec/commit/bd0b3df225045a89d3d16c37828f24d84d154343) Add support for new `@example` and `@opExample` decorator +- [#3663](https://github.com/microsoft/typespec/pull/3663) Adds support for converting OpenAPI3 specs to TypeSpec via the new tsp-openapi3 CLI included in the `@typespec/openapi3` package. +- [#3732](https://github.com/microsoft/typespec/pull/3732) Apply openapi3 extension on Security schemes + +### @typespec/html-program-viewer + +- [#3713](https://github.com/microsoft/typespec/pull/3713) Complete new dynamic UI to navigate the TypeSpec type graph + +## Bug Fixes + +### @typespec/compiler + +- [#3623](https://github.com/microsoft/typespec/pull/3623) Fix crash of language server on firefox +- [#3516](https://github.com/microsoft/typespec/pull/3516) Deprecate getAssetEmitter and recommend calling `createAssetEmitter` directly +- [#3767](https://github.com/microsoft/typespec/pull/3767) Fix semantic highlighting of using of single namespace +- [#3824](https://github.com/microsoft/typespec/pull/3824) Do not cast model expression to object value if the constraint is allowing the type +- [#3577](https://github.com/microsoft/typespec/pull/3577) Fix formatting of object and array literal in decorator to hug parenthesis +- [#3823](https://github.com/microsoft/typespec/pull/3823) Fix formatting of scalar constructor called with no args +- [#3743](https://github.com/microsoft/typespec/pull/3743) Fix 'typespec vs install' command on windows +- [#3605](https://github.com/microsoft/typespec/pull/3605) Fix templates initialized on node 22 + +### @typespec/openapi3 + +- [#3516](https://github.com/microsoft/typespec/pull/3516) Fix issue that could result in invalid document generation when running `tsp compile` from another directory +- [#3794](https://github.com/microsoft/typespec/pull/3794) Updates tsp-openapi3 to always emit main.tsp when formatting encounters an error. +- [#3839](https://github.com/microsoft/typespec/pull/3839) Updates tsp-openapi3 doc line wrapping to only automatically create newlines when they are present in the original documentation. + +### @typespec/html-program-viewer + +- [#3585](https://github.com/microsoft/typespec/pull/3585) Fix crash in program viewer when trying to display new value type + +### @typespec/json-schema + +- [#3516](https://github.com/microsoft/typespec/pull/3516) Fix issue that could result in invalid document generation when running `tsp compile` from another directory + +``` + +``` diff --git a/website/src/content/docs/release-notes/typespec-0-59.md b/website/src/content/docs/release-notes/typespec-0-59.md new file mode 100644 index 00000000000..21afc668f90 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-0-59.md @@ -0,0 +1,167 @@ +--- +slug: release-notes/typespec-0-59 +title: 0.59 - August 2024 +releaseDate: 2024-08-06 +version: "0.59" +--- + +:::caution +This release contains deprecations breaking changes +::: + +## Breaking Changes + +### @typespec/compiler + +- [#4050](https://github.com/microsoft/typespec/pull/4050) Fix issue where naming a namespace with the same name as the blockless namespace would merge with it instead of creating a subnamespace like any other name would. + + ```tsp + namespace MyOrg.MyProject; + + namespace MyOrg.MyProject.MyArea { + model A {} + } + + namespace MyArea2 { + model B {} + } + ``` + + Previously model `A` would end-up in namespace `MyOrg.MyProject.MyArea` and model `B` in `MyOrg.MyProject.MyArea2`. With this change model `A` will now be in `MyOrg.MyProject.MyOrg.MyProject.MyArea`. To achieve the previous behavior the above code should be written as: + + ```tsp + namespace MyOrg.MyProject; + + namespace MyArea { + model A {} + } + + namespace MyArea2 { + model B {} + } + ``` + +### @typespec/json-schema + +- [#3558](https://github.com/microsoft/typespec/pull/3558) Updates `@extension` decorator to support TypeSpec values in addition to types. + +In previous versions of the json-schema emitter, the `@extension` decorator only accepted types as the value. These are emitted as JSON schemas. In order to add extensions as raw values, types had to be wrapped in the `Json<>` template when being passed to the `@extension` decorator. + +This change allows setting TypeSpec values (introduced in TypeSpec 0.57.0) directly instead. + +The following example demonstrates using values directly: + +```tsp +@extension("x-example", #{ foo: "bar" }) +model Foo {} +``` + +This change results in scalars being treated as values instead of types. This will result in the `@extension` decorator emitting raw values for scalar types instead of JSON schema. To preserve the previous behavior, use `typeof` when passing in a scalar value. + +The following example demonstrates how to pass a scalar value that emits a JSON schema: + +```tsp +@extension("x-example", "foo") +model Foo {} +``` + +To preserve this same behavior, the above example can be updated to the following: + +```tsp +@extension("x-example", typeof "foo") +model Foo {} +``` + +## Deprecations + +### @typespec/http + +- [#3932](https://github.com/microsoft/typespec/pull/3932) API deprecation: `HttpOperation#pathSegments` is deprecated. Use `HttpOperation#uriTemplate` instead. +- [#3932](https://github.com/microsoft/typespec/pull/3932) Deprecated `@query({format: })` option. Use `@query(#{explode: true})` instead of `form` or `multi` format. Previously `csv`/`simple` is the default now. + Decorator is also expecting an object value now instead of a model. A deprecation warning with a codefix will help migrating. + + ```diff + - @query({format: "form"}) select: string[]; + + @query(#{explode: true}) select: string[]; + ``` + +## Features + +### @typespec/compiler + +- [#3906](https://github.com/microsoft/typespec/pull/3906) Support completion for template parameter extending model or object value + + Example + + ```tsp + model User {} + alias user = User<{ + ┆: [age] | [name]; + }>; + ``` + +- [#4020](https://github.com/microsoft/typespec/pull/4020) Add support for encoding numeric types as string +- [#4023](https://github.com/microsoft/typespec/pull/4023) Warn when using `\` in config file field that expect a path. +- [#3932](https://github.com/microsoft/typespec/pull/3932) Add `ArrayEncoding` enum to define simple serialization of arrays + +### @typespec/http + +- [#4046](https://github.com/microsoft/typespec/pull/4046) API: Expose `properties: HttpProperty[]` on operation parameter and response which reference all the properties of interest(Body, statusCode, contentType, implicitBodyProperty, etc.) +- [#3932](https://github.com/microsoft/typespec/pull/3932) `@route` can now take a uri template as defined by [RFC-6570](https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.3) + + ```tsp + @route("files{+path}") download(path: string): void; + ``` + +### @typespec/rest + +- [#3932](https://github.com/microsoft/typespec/pull/3932) Add support for URI templates in routes + +### @typespec/openapi3 + +- [#3894](https://github.com/microsoft/typespec/pull/3894) Add support for `@useRef` on responses +- [#4020](https://github.com/microsoft/typespec/pull/4020) Add support for encoding numeric types as string +- [#3890](https://github.com/microsoft/typespec/pull/3890) `@extension` used on the service namespace will set extension at the root of the document +- [#3932](https://github.com/microsoft/typespec/pull/3932) Add support for URI templates in routes + +## Bug Fixes + +### @typespec/compiler + +- [#3881](https://github.com/microsoft/typespec/pull/3881) Fixes a bug where ending a non-terminal line in a multi-line comment with a backslash caused the next star to show up in the parsed doc string. +- [#4050](https://github.com/microsoft/typespec/pull/4050) Allow using compact namespace form `Foo.Bar` when inside another namespace + + ```tsp + namespace MyOrg.MyProject { + namespace MyModule.MySubmodule { // <-- this used to emit an error + // ... + + } + } + ``` + +- [#3898](https://github.com/microsoft/typespec/pull/3898) Fix decimal numeric with leading zeros +- [#4046](https://github.com/microsoft/typespec/pull/4046) Fix type comparison of literal and scalar when in projection context +- [#4022](https://github.com/microsoft/typespec/pull/4022) `tsp compile --watch` will not stop when a crash happens during compilation +- [#3933](https://github.com/microsoft/typespec/pull/3933) Add `const` template parameter to get the precise lib type + +### @typespec/http + +- [#3909](https://github.com/microsoft/typespec/pull/3909) Fix `HttpPart` not respecting explicit part name by always using the property name +- [#3933](https://github.com/microsoft/typespec/pull/3933) Fix some diagnostic not showing the right message + +### @typespec/versioning + +- [#3911](https://github.com/microsoft/typespec/pull/3911) Allow spreading a model that has props added in previous version +- [#3951](https://github.com/microsoft/typespec/pull/3951) Fixes issue where spreading a versioned model as a parameter to an incompatible versioned operation would cause the compiler to crash. + +### @typespec/openapi3 + +- [#4046](https://github.com/microsoft/typespec/pull/4046) Fix issue where operation example would produce an empty object when `@body`/`@bodyRoot` was used +- [#4046](https://github.com/microsoft/typespec/pull/4046) Fix operation response body examples showing up for each response. +- [#3912](https://github.com/microsoft/typespec/pull/3912) Fixes bug where union documentation was being applied to each union member in emitted output. +- [#3908](https://github.com/microsoft/typespec/pull/3908) Fixes bug where circular references in unions caused an empty object to be emitted instead of a ref. + +### @typespec/protobuf + +- [#3933](https://github.com/microsoft/typespec/pull/3933) Fix some diagnostic not showing the right message diff --git a/website/src/content/docs/release-notes/typespec-0-60.md b/website/src/content/docs/release-notes/typespec-0-60.md new file mode 100644 index 00000000000..ed2aadac584 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-0-60.md @@ -0,0 +1,65 @@ +--- +slug: release-notes/typespec-0-60 +title: 0.60 - September 2024 +releaseDate: 2024-09-10 +version: "0.60" +--- + +## Features + +### @typespec/compiler + +- [#4139](https://github.com/microsoft/typespec/pull/4139) Add new way to define decorator implementation with `$decorators` export. + +```ts +export const $decorators = { + "TypeSpec.OpenAPI": { + useRef: $useRef, + oneOf: $oneOf, + }, +}; +``` + +- [#4148](https://github.com/microsoft/typespec/pull/4148) Diagnostics logged to the terminal now have a clickable hyperlink to the diagnostic documentation url if applicable. +- [#4141](https://github.com/microsoft/typespec/pull/4141) Diagnostic code in IDE now link to the linter rule documentation url if applicable +- [#4357](https://github.com/microsoft/typespec/pull/4357) Improvements to type relation errors: Show stack when it happens in a nested property otherwise show up in the correct location. + +## Bug Fixes + +### @typespec/compiler + +- [#4381](https://github.com/microsoft/typespec/pull/4381) Fix Semantic walker doesn't fire exitOperation or exitModelProperty +- [#4146](https://github.com/microsoft/typespec/pull/4146) Fix model expression defined in alias will resolve its namespace from the namespace where the alias was declared +- [#4147](https://github.com/microsoft/typespec/pull/4147) Fix examples with models using `extends` +- [#4144](https://github.com/microsoft/typespec/pull/4144) Fix: Model and union expression in template were not considered as template instances +- [#4135](https://github.com/microsoft/typespec/pull/4135) Fix numeric 0 stringify producing 0.0 +- [#4064](https://github.com/microsoft/typespec/pull/4064) IDE: Formatting command will use prettier config if provided over the editor's configuration. +- [#4089](https://github.com/microsoft/typespec/pull/4089) Fix tmlanguage for named type argument in type reference. +- [#4324](https://github.com/microsoft/typespec/pull/4324) API: Extract source resolution logic into its own source loader + +### @typespec/http + +- [#4322](https://github.com/microsoft/typespec/pull/4322) Use user provided description of model if model has a status code property(detect it as an response envelope) + +### @typespec/versioning + +- [#4145](https://github.com/microsoft/typespec/pull/4145) Fix error when trying to reference types from another sub namespace of a versioned namespace +- [#4179](https://github.com/microsoft/typespec/pull/4179) Add validation to make sure operation params reference models available in the current version +- [#4179](https://github.com/microsoft/typespec/pull/4179) Add validation to make sure types referencing array in union types have compatible versioning. + +### @typespec/openapi3 + +- [#4133](https://github.com/microsoft/typespec/pull/4133) Fix Bug for OpenAPI 3 Emitter crash on `@useAuth({})` +- [#4123](https://github.com/microsoft/typespec/pull/4123) Fix OpenAPI3 union names when declared within a namespace +- [#4216](https://github.com/microsoft/typespec/pull/4216) Fixes issue in tsp-openapi3 that resulted in component schemas and parameters with the same name being merged into a single TypeSpec data type. +- [#4232](https://github.com/microsoft/typespec/pull/4232) Improves tsp-openapi3 model generation from schemas utilizing allOf. Models will now extend an allOf member if it is a schema reference and the only member with a discriminator. Other members will be spread into the model if defined as a schema reference, or have their properties treated as top-level properties if they are an inline-schema. +- [#4149](https://github.com/microsoft/typespec/pull/4149) Updates tsp-openapi3 conversion of OpenAPI3 component schemas to improve handling of enums, unions, scalars, and aliases. + +### @typespec/html-program-viewer + +- [#4353](https://github.com/microsoft/typespec/pull/4353) Fix crash when using anonymous union variant +- [#4136](https://github.com/microsoft/typespec/pull/4136) Fix namespace with the same name conflicting in the tree navigation + +### @typespec/json-schema + +- [#4150](https://github.com/microsoft/typespec/pull/4150) Stop json schema from crashing on unknown scalar and handle `unixTimestamp32` diff --git a/website/src/content/docs/release-notes/typespec-0-61.md b/website/src/content/docs/release-notes/typespec-0-61.md new file mode 100644 index 00000000000..0fde9cfa0c6 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-0-61.md @@ -0,0 +1,93 @@ +--- +slug: release-notes/typespec-0-61 +title: 0.61 - October 2024 +releaseDate: 2024-10-09 +version: "0.61" +--- + +:::caution +This release contains breaking changes +::: + +## Breaking Changes + +### @typespec/compiler + +- [#4539](https://github.com/microsoft/typespec/pull/4539) Config parameters and emitters options cannot contains `.`. This conflict with newly added support for nested options. +- [#4500](https://github.com/microsoft/typespec/pull/4500) API: Update default of `decoratorArgMarshalling` from `legacy` to `new` + +To revert to the old behavior export the following. **Highly discouraged, this will be removed in a few versions.** + +```ts +export const $flags = definePackageFlags({ + decoratorArgMarshalling: "legacy", +}); +``` + +- TypeSpec compiler expect the entrypoint to be an absolute path. This used to work with some alternative `CompilerHost` that handled relative path but this is no longer supported due to the new `exports` field support. + +## Features + +### @typespec/compiler + +- [#4442](https://github.com/microsoft/typespec/pull/4442) Library diagnostic can now define a `description` and `url` that links to a more detailed doc for this diagnostic +- [#4290](https://github.com/microsoft/typespec/pull/4290) Adding experimental (unstable) API fro Type Mutators +- [#4595](https://github.com/microsoft/typespec/pull/4595) Expose more accurate `PackageJson` type and deprecate `NodePackage` +- [#4606](https://github.com/microsoft/typespec/pull/4606) Add support for node `exports` field. Specific typespec exports can be provided with the `typespec` field + +```json +"exports": { + ".": { + "typespec": "./lib/main.tsp", + }, + "./named": { + "typespec": "./lib/named.tsp", + } +} +``` + +- [#4539](https://github.com/microsoft/typespec/pull/4539) Support nested emitter options + +### @typespec/http + +- [#4513](https://github.com/microsoft/typespec/pull/4513) Adds HttpStream and JsonlStream models to to support streaming use-cases. + +### @typespec/openapi3 + +- [#4423](https://github.com/microsoft/typespec/pull/4423) Added support to use Scalar and Object as default types + +### @typespec/json-schema + +- [#4447](https://github.com/microsoft/typespec/pull/4447) Example set with `@example` decorator will populate the schema `examples` property + +### typespec-vscode + +- [#4330](https://github.com/microsoft/typespec/pull/4330) Support Compile Task and Watch Task in vscode. +- [#4498](https://github.com/microsoft/typespec/pull/4498) Make extension web compatible with minimal functionality + +## Bug Fixes + +### @typespec/compiler + +- [#4513](https://github.com/microsoft/typespec/pull/4513) Fixes issue with the semantic walker where `exitTuple` was not being emitted. +- [#4462](https://github.com/microsoft/typespec/pull/4462) Fix examples with enums inside of unions +- [#4574](https://github.com/microsoft/typespec/pull/4574) Fix: Passing `const` of model type to `@example` +- [#4551](https://github.com/microsoft/typespec/pull/4551) Json serialization of example respect `@encodedName` +- [#4514](https://github.com/microsoft/typespec/pull/4514) Fix issue with decimal numeric and leading `0.0` with multiple digit +- [#4445](https://github.com/microsoft/typespec/pull/4445) [API] model `sourceModels` property are now projected correctly +- [#4467](https://github.com/microsoft/typespec/pull/4467) Changing tspconfig.yaml won't take effect in LSP server because of the cache +- [#4563](https://github.com/microsoft/typespec/pull/4563) `tsp compile --watch` reread from `tspconfig.yaml` file +- [#4626](https://github.com/microsoft/typespec/pull/4626) [API] Add missing exit callback + +### @typespec/openapi + +- [#4505](https://github.com/microsoft/typespec/pull/4505) `@info` decorator validate no extra properties not starting with `x-` are provided. +- [#4483](https://github.com/microsoft/typespec/pull/4483) `@info` decorator validate `termsOfService` is a valid url + +### @typespec/internal-build-utils + +- [#4498](https://github.com/microsoft/typespec/pull/4498) Ignore test from third party notice generation + +### typespec-vscode + +- [#4430](https://github.com/microsoft/typespec/pull/4430) Use "shell" when spawning execution of .cmd file(i.e. tsp-server.cmd) in windows diff --git a/website/src/content/docs/release-notes/typespec-0-62.md b/website/src/content/docs/release-notes/typespec-0-62.md new file mode 100644 index 00000000000..b81375b0647 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-0-62.md @@ -0,0 +1,241 @@ +--- +slug: release-notes/typespec-0-62 +title: 0.62 - November 2024 +releaseDate: 2024-11-05 +version: "0.62" +--- + +## Notable changes + +### Improvements to template instantitation error + +If you have used TypeSpec with template you most likely encountered this hard to debug issue where the diagnostic would show up in the template declaration and not help you in understanding who called that template. This could become very tedious when going through many templates. + +#### Before + +```tsp title=main.tsp +model Spreading { + ...T; + // ^ error spread-model Cannot spread properties of non-model type. +} + +model Bar { + prop: Spreading; +} +``` + +```bash title="Tsp error output" +main.tsp:2:6 - error spread-model: Cannot spread properties of non-model type. +> 2 | ...T; + | ^ +``` + +#### Now + +```tsp title=main.tsp +model Spreading { + ...T; + // ^ error spread-model Cannot spread properties of non-model type. + // main.tsp:6:9 in instantiation of Spreading +} + +model Bar { + // Also show a warning at the point of usage + prop: Spreading; + // ^ warning spread-model In instantiation of this template + // main.tsp:2:6 Cannot spread properties of non-model type. +} +``` + +```bash title="Tsp error output" +main.tsp:2:6 - error spread-model: Cannot spread properties of non-model type. +> 2 | ...T; + | ^ + main.tsp:6:9 - occurred while instantiating template + > 6 | prop: Spreading; + | ^^^^^^^^^^^^^^^^^ +``` + +### Reference and augment model properties inside of alias and model expressions + +A long running issue of TypeSpec was the inability to use augment decorator on variety of cases: + +- Properties inside of an alias +- Properties inside of a nested model expression +- Properties comming from a `model is` + +You are now able to reference and augment any symbol that can be statically linked(Anything that doesn't involve template instantitation to know its content). + +```tsp +// Example 1: augment alias property +alias Alias = { + prop: string; +}; + +@@doc(Alias.prop, "My alias doc"); + +// Example 2: augment nested property +model Author { + address: { + city: string; + }; +} + +@@doc(Author.address::type.city, "Address city"); + +// Example 3: Property sourced from model is +model Nameable { + name: string; +} +model Author is Nameable; + +@@doc(Author.name, "Authors name"); + +// Example 4: Template constraint can be statically linked +model Author { + ...T; +} + +@@doc(Author.name, "Authors name"); + +// Example 5: Limitation: Cannot augment properties from a template parameter without constraint +model Base { + ...T; +} + +model Author + is Base<{ + name: string; + }>; + +@@doc(Base.name, "Authors name"); +// ^ error we cannot know Base will have a property called name +@@doc(Author.name, "Authors name"); +// ^ error we cannot know author has property name without instantiating Base +``` + +### `tspconfig.yaml` auto complete + +TypeSpec Language server now provide completion for the `tspconfig.yaml` file. It will auto complete the structure, available emitters and their options. + +![](./images/tspconfig-completion.png) + +### Paginated operations + +Addition of a few new decorators allowing declaring paginated operations + +```tsp +@list op listPets(): { + @pageItems pets: Pet[]; + links: { + @nextLink next?: url; + @prevLink prev?: url; + @firstLink first?: url; + @lastLink last?: url; + }; +}; +``` + +[See pagination docs for more details](../standard-library/pagination.md) + +### Xml support in OpenAPI3 emitter + +`@typespec/xml` library has been available for a few months but support in openapi3 emitter was lacking. + +```tsp title="main.yaml" +@encodedName("application/xml", "XmlPet") +model Pet { + @Xml.name("ItemsTags") + tags: string[]; +} +``` + +```yaml title="openapi.yaml" +Pet: + type: "object" + properties: + tags: + type: "array" + xml: + name: "ItemsTags" + wrapped: true + items: + type: string + xml: + name: "XmlPet" +``` + +Example xml: + +```xml + + + abc + def + + +``` + +[See xml guide for more info](../libraries/xml/guide.md) + +## Features + +### @typespec/compiler + +- [#4807](https://github.com/microsoft/typespec/pull/4807) CLI logs diagnostic source path relative to the CWD. +- [#4871](https://github.com/microsoft/typespec/pull/4871) [experimental] Mutators: Allow mutating namespaces +- [#4470](https://github.com/microsoft/typespec/pull/4470) Add support for paginated operations +- [#4849](https://github.com/microsoft/typespec/pull/4849) Overall of the symbol resolution. TypeSpec is able to resolve anything that can be statically linked. Augment decorators in turn are able to target any statically linkable types. +- [#4806](https://github.com/microsoft/typespec/pull/4806) Diagnostics emitted in template instance include instantiation trace. +- [#4790](https://github.com/microsoft/typespec/pull/4790) Support completion for tspconfig.yaml file in vscode + +### @typespec/http + +- [#4761](https://github.com/microsoft/typespec/pull/4761) Add `@cookie` decorator to specify cookie parameters +- [#4470](https://github.com/microsoft/typespec/pull/4470) Add new `LinkHeader` pagination type + +### @typespec/openapi + +- [#4834](https://github.com/microsoft/typespec/pull/4834) Add new `@tagMetadata` decorator to specify OpenAPI tag properties + +### @typespec/openapi3 + +- [#4761](https://github.com/microsoft/typespec/pull/4761) Add `@cookie` decorator to specify cookie parameters +- [#4214](https://github.com/microsoft/typespec/pull/4214) Add XML support using `@typespec/xml` library +- [#4834](https://github.com/microsoft/typespec/pull/4834) Add support for `@tagMetadata` decorator +- [#4906](https://github.com/microsoft/typespec/pull/4906) Updates tsp-openapi3 to support generating `@summary` decorators for models and operations from schema title and path item summary fields. + +### typespec-vscode + +- [#4790](https://github.com/microsoft/typespec/pull/4790) Support completion for tspconfig.yaml file in vscode +- [#4737](https://github.com/microsoft/typespec/pull/4737) Add basic snippets for typespec +- [#4912](https://github.com/microsoft/typespec/pull/4912) TypeSpec Language Server would be restarted with new settings when setting "typespec.tsp-server.path" is changed + +## Bug Fixes + +### @typespec/compiler + +- [#4745](https://github.com/microsoft/typespec/pull/4745) Improve diagnostic when JS files fail to load due to a JS error + +### @typespec/http + +- [#4932](https://github.com/microsoft/typespec/pull/4932) [API] Fix: Generated `uriTemplate` correctly include `*` for explode query params +- [#4804](https://github.com/microsoft/typespec/pull/4804) The description parameter of `@server` is now optional. + +### @typespec/openapi3 + +- [#4663](https://github.com/microsoft/typespec/pull/4663) Discriminator properties are marked as required regardless if they are in TypeSpec to match OpenAPI3 spec. +- [#4934](https://github.com/microsoft/typespec/pull/4934) tsp-openapi3 - fixes typespec generation for empty schema +- [#4727](https://github.com/microsoft/typespec/pull/4727) Nullable enum use `allOf` instead of `oneOf` +- [#4708](https://github.com/microsoft/typespec/pull/4708) Updates tsp-openapi3 to include path-level parameters in generated typespec operations. +- [#4873](https://github.com/microsoft/typespec/pull/4873) Updates tsp-openapi3 query decorator generation to use the value arguments. + +- [#4672](https://github.com/microsoft/typespec/pull/4672) OpenAPI3 type property should always be set when nullable property is present. + +### @typespec/json-schema + +- [#4732](https://github.com/microsoft/typespec/pull/4732) Document exported types + +### typespec-vscode + +- [#4912](https://github.com/microsoft/typespec/pull/4912) Fix the issue when Typespec Language Server can't be restarted when the server wasn't running before diff --git a/website/src/content/docs/release-notes/typespec-0-63.md b/website/src/content/docs/release-notes/typespec-0-63.md new file mode 100644 index 00000000000..5aef304cff9 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-0-63.md @@ -0,0 +1,70 @@ +--- +slug: release-notes/typespec-0-63 +title: 0.63 - December 2024 +releaseDate: 2024-12-10 +version: "0.63" +--- + +## Notable changes + +### Experimental: Improve Realm, Mutator, and Typekit implementations + +The compiler strongly binds a Realm and Typekit together, and changes mutators so that new types are cloned within the mutator's realm. The default Typekit now creates a default typekit realm for the current program, and a Typekit can be easily created to work in a specific Program or Realm as needed. + +### Enum-driven Visibility + +A new mechanism for visibility that defines valid visibility values in enums and provides tools for filtering types by visibility. A new `LifecycleVisibility` enum defines standard protocol-agnostic visibility values for operations that manage the lifecycle (creation, update, deletion) of a resource. More details on visibility enums are available [in website documentation](../language-basics/visibility.md) + +## Features + +### @typespec/compiler + +- [#4937](https://github.com/microsoft/typespec/pull/4937) Add mutateSubgraphWithNamespace as a separate API +- [#4837](https://github.com/microsoft/typespec/pull/4837) Allow trailing delimiter in array values, tuple, decorator declaration, scalar initializer, etc. +- [#5149](https://github.com/microsoft/typespec/pull/5149) Experimental: Improve Realm, Mutator, and Typekit implementations. + +- [#4825](https://github.com/microsoft/typespec/pull/4825) Adds support for enum-driven visibility in the compiler core. + +### @typespec/openapi3 + +- [#5029](https://github.com/microsoft/typespec/pull/5029) Add support for `#deprecated` for OpenAPI3Parameter + +## Bug Fixes + +### @typespec/compiler + +- [#5252](https://github.com/microsoft/typespec/pull/5252) Added RegEx validation for @pattern and will throw warning for invalid RegEx string + +### @typespec/http + +- [#5016](https://github.com/microsoft/typespec/pull/5016) Uri template attributes were not extracted when parameter was explicitly mark with `@path` or `@query` as well + +### @typespec/http-server-csharp + +- [#4308](https://github.com/microsoft/typespec/issues/4308) Process sub-namespaces of a service +- [#4998](https://github.com/microsoft/typespec/issues/4998) Handle void returnType +- [#5000](https://github.com/microsoft/typespec/issues/5000) Handle tuple literals +- [#5001](https://github.com/microsoft/typespec/issues/5001) Skip envelope types withpout properties +- [#5024](https://github.com/microsoft/typespec/issues/5024) Literal type is not properly generated +- [#5124](https://github.com/microsoft/typespec/issues/5124) Skip uninstantiated templates +- [#5125](https://github.com/microsoft/typespec/issues/5125) Process operations outside interfaces +- Handle nullable types and anonymous typesin all contexts +- Add server-side numeric constraints for safeInt + +### @typespec/http-server-javascript + +- Add an additional check for the presence of a property before performing a bounds check on integer properties constrained to a range. +- [5185](https://github.com/microsoft/typespec/issues/5185) Add logic to handle invalid identifier names (#5185) + +### @typespec/versioning + +- [#5262](https://github.com/microsoft/typespec/pull/5262) Fixes diagnostics for @typeChangedFrom to properly detect when an incompatible version is referenced inside of a template, union, or tuple. + +### @typespec/openapi3 + +- [#5006](https://github.com/microsoft/typespec/pull/5006) Illegal characters in component keys +- [#5274](https://github.com/microsoft/typespec/pull/5274) Added missing peer dependency "openapi-types" + +### @typespec/json-schema + +- [#5189](https://github.com/microsoft/typespec/pull/5189) Fixes crash that occurred when a template instantiation's template argument was a union that references a declaration. diff --git a/website/src/content/docs/release-notes/typespec-0-64.md b/website/src/content/docs/release-notes/typespec-0-64.md new file mode 100644 index 00000000000..685a1890400 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-0-64.md @@ -0,0 +1,80 @@ +--- +slug: release-notes/typespec-0-64 +title: 0.64 - January 2025 +releaseDate: 2025-01-15 +version: "0.64" +--- + +## Notable changes + +### Open API 3.1 + +The `@typespec/openapi3` package now supports emitting Open API 3.1 specs. To emit Open API 3.1 specs, set the `openapi-versions` emitter option to `["3.1.0"]`. By default, the emitter will continue emitting Open API 3.0 specs. + +## Features + +### @typespec/compiler + +- [#5415](https://github.com/microsoft/typespec/pull/5415) Added support for emitter selections for init template. +- [#5316](https://github.com/microsoft/typespec/pull/5316) Compiler trace will be sent to IDE as trace log through language server +- [#5594](https://github.com/microsoft/typespec/pull/5594) Support Emitters section in Init Template when creating TypeSpec project in vscode +- [#5294](https://github.com/microsoft/typespec/pull/5294) Add capacities in TypeSpec Language Server to support "Scaffolding new TypeSpec project" in IDE + +### @typespec/http + +- [#5153](https://github.com/microsoft/typespec/pull/5153) Adds getStreamMetadata JS API to simplify getting stream metadata from operation parameters and responses. + +### @typespec/openapi3 + +- [#5372](https://github.com/microsoft/typespec/pull/5372) Adds support for @typespec/json-schema decorators with Open API 3.0 and 3.1 emitters. +- [#5372](https://github.com/microsoft/typespec/pull/5372) Adds support for emitting Open API 3.1 models using the `openapi-versions` emitter configuration option. + Open API 3.0 is emitted by default. + +### typespec-vscode + +- [#5312](https://github.com/microsoft/typespec/pull/5312) integrate client SDK generation +- [#5314](https://github.com/microsoft/typespec/pull/5314) Rename vscode extension from "TypeSpec for VS Code" to "TypeSpec" +- [#5594](https://github.com/microsoft/typespec/pull/5594) Support Emitters section in Init Template when creating TypeSpec project in vscode +- [#5294](https://github.com/microsoft/typespec/pull/5294) Support "Create TypeSpec Project" in vscode command and EXPLORER when no folder opened + Add Setting "typespec.initTemplatesUrls" where user can configure additional template to use to create TypeSpec project + example: + +``` +{ + "typespec.initTemplatesUrls": [ + { + "name": "displayName", + "url": "https://urlToTheFileContainsTemplates" + }], +} +``` + +Support "Install TypeSpec Compiler/CLI globally" in vscode command to install TypeSpec compiler globally easily + +## Bug Fixes + +### @typespec/compiler + +- [#5295](https://github.com/microsoft/typespec/pull/5295) Fix incorrectly returning a positive `BigInt` for a negative `Numeric`. +- [#5353](https://github.com/microsoft/typespec/pull/5353) Meta property are auto-completed, current only supported '::type', '::parameters', '::returnType' +- [#5180](https://github.com/microsoft/typespec/pull/5180) Fixed serialization of object examples on unions +- [#5525](https://github.com/microsoft/typespec/pull/5525) Enum-driven visibility decorators and projections now interact correctly. + +### @typespec/rest + +- [#5455](https://github.com/microsoft/typespec/pull/5455) In some scenarios, the options for the `@path` decorator do not accurately reflect the provided parameters, including the `#{allowReserved: true}` which is the `x-ms-skip-url-encoding` option. This change addresses and fixes this issue. + +### @typespec/openapi3 + +- [#5172](https://github.com/microsoft/typespec/pull/5172) Allow void to be the response body type when other fields are present in the model. Previously, using `void` as a response body type would fail compilation if the model contained other fields (like `statusCode`). +- [#5456](https://github.com/microsoft/typespec/pull/5456) Fix: OpenAPI YAML converts strings to boolean + +### @typespec/internal-build-utils + +- [#5312](https://github.com/microsoft/typespec/pull/5312) resolve the program crash when there is no package name in package.json + +### typespec-vscode + +- [#5413](https://github.com/microsoft/typespec/pull/5413) Do not start TypeSpec Language Server when there is no workspace opened +- [#5131](https://github.com/microsoft/typespec/pull/5131) Support 'See Document' quick action to view the details of linter rules +- [#5428](https://github.com/microsoft/typespec/pull/5428) improve console output when tsp-server not found diff --git a/website/src/content/docs/release-notes/typespec-0-65.md b/website/src/content/docs/release-notes/typespec-0-65.md new file mode 100644 index 00000000000..2006b2ada08 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-0-65.md @@ -0,0 +1,128 @@ +--- +slug: release-notes/typespec-0-65 +title: 0.65 - February 2025 +releaseDate: 2025-02-11 +version: "0.65" +--- + +:::note +This release contains deprecations +::: + +## Notables features + +### Converting Json/JS like object to tsp values is easier + +Previously the quick fix to convert a model expression or tuple to an object/array value would only apply at one level. It is now applied to the entire value allowing for easier conversion of complex objects. + +```tsp +@example({ + a: 1, + b: 2, + c: { + d: 3, + e: 4, + f: [5, 6, 7] + } +}) +``` + +Will be converted to this with the quick fix: + +```tsp +@example(#{ + a: 1, + b: 2, + c: #{ + d: 3, + e: 4, + f: #[5, 6, 7] + } +}) +``` + +### Additional completion in the tspconfig.yaml + +IDE support for the `tspconfig.yaml` was improved adding completion for the `extends` field, `imports`, `rule`, `rule sets` and `variables`. The completion items now also show required/optional information in the details of emitter's options. + +## Deprecations + +### @typespec/compiler + +- [#4931](https://github.com/microsoft/typespec/pull/4931) Deprecate experimental projection. Projection will be removed in version 0.66 + +### @typespec/versioning + +- [#4931](https://github.com/microsoft/typespec/pull/4931) Deprecate versioning projection, switch to the mutator approach + +```diff lang="tsp" +// Step 1: Update to retrieve the mutation instead of projections +-const versions = buildVersionProjections(program, service.type); ++const versions = getVersioningMutators(program, service.type); + +// Step 2: call mutator instead of projection api +-const projectedProgram = projectProgram(originalProgram, versionRecord.projections); ++const subgraph = unsafe_mutateSubgraphWithNamespace(program, [mutator], service.type); ++subgraph.type // this is the mutated service namespace +``` + +## Features + +### @typespec/compiler + +- [#5572](https://github.com/microsoft/typespec/pull/5572) Add support for [ESM subpath imports](https://nodejs.org/api/packages.html#subpath-imports) +- [#5790](https://github.com/microsoft/typespec/pull/5790) Add option for semantic walker to visit model derived types +- [#5340](https://github.com/microsoft/typespec/pull/5340) Add Experimental Typekit helpers for `@typespec/http` +- [#5716](https://github.com/microsoft/typespec/pull/5716) Updated Rest init template to include additional emitters(client, server) and a basic sample. +- [#5186](https://github.com/microsoft/typespec/pull/5186) Support the auto completion for extends, imports, rule, rule sets and variables in tspconfig.yaml +- [#5186](https://github.com/microsoft/typespec/pull/5186) Show required/optional information in the details of emitter's options completion item in tspconfig.yaml +- [#5342](https://github.com/microsoft/typespec/pull/5342) Convert model/tuple expression to value code fix is applied to the entire value. +- [#5824](https://github.com/microsoft/typespec/pull/5824) `tsp init` will not automatically run `tsp install` if a `package.json` file is created. +- [#4931](https://github.com/microsoft/typespec/pull/4931) [Experimental] Update to subgraph mutator to visit all missing relations +- [#5416](https://github.com/microsoft/typespec/pull/5416) Added APIs for getting parameterVisibility and returnTypeVisibility as VisibilityFilter objects. +- [#5699](https://github.com/microsoft/typespec/pull/5699) Promote `unsafe_useStateMap` and `unsafe_useStateSet` experimental APIs to stable version `useStateMap` and `useStateSet`. Old ones are deprecated + +### @typespec/http + +- [#5340](https://github.com/microsoft/typespec/pull/5340) Add Experimental Typekit helpers for `@typespec/http` + +### @typespec/versioning + +- [#5459](https://github.com/microsoft/typespec/pull/5459) add code fixes for incompatible version errors +- [#4931](https://github.com/microsoft/typespec/pull/4931) Provide new mutator based way of getting version snapshot + +### @typespec/rest + +- [#5685](https://github.com/microsoft/typespec/pull/5685) Updates `CollectionWithNextLink` to support pagination + +### @typespec/openapi3 + +- [#5831](https://github.com/microsoft/typespec/pull/5831) Updates tsp-openapi3 operation response generation to inline expressions and pare down fields with default values. Also adds support for Open API headers and responses $refs. +- [#4931](https://github.com/microsoft/typespec/pull/4931) Migrate versioning implementation to use mutator approach. + +### typespec-vscode + +- [#5451](https://github.com/microsoft/typespec/pull/5451) Support importing TypeSpec from OpenAPI 3.0 doc + +## Bug Fixes + +### @typespec/compiler + +- [#5940](https://github.com/microsoft/typespec/pull/5940) Fix: Infinite loop in language server due to not caching indeterminate entities in templates +- [#5186](https://github.com/microsoft/typespec/pull/5186) Fix the issue that extra " will be added when auto completing emitter options inside "" +- [#5833](https://github.com/microsoft/typespec/pull/5833) Fix tracing in `SourceLoader` + +### @typespec/openapi3 + +- [#5893](https://github.com/microsoft/typespec/pull/5893) Updates tsp-openapi3 to support $ref in requestBodies + +### typespec-vs + +- [#5834](https://github.com/microsoft/typespec/pull/5834) Update extension configuration URLs in error message + +### typespec-vscode + +- [#5752](https://github.com/microsoft/typespec/pull/5752) Disable coloring text when generating code +- [#5754](https://github.com/microsoft/typespec/pull/5754) Add example to the vscode setting "initTemplatesUrls" +- [#5886](https://github.com/microsoft/typespec/pull/5886) refine the quickpick placeholder and the log +- [#5834](https://github.com/microsoft/typespec/pull/5834) Update extension configuration URLs in error message diff --git a/website/src/content/docs/release-notes/typespec-0-66.md b/website/src/content/docs/release-notes/typespec-0-66.md new file mode 100644 index 00000000000..825da319d53 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-0-66.md @@ -0,0 +1,264 @@ +--- +slug: release-notes/typespec-0-66 +title: 0.66 - March 2025 +releaseDate: 2025-03-04 +version: "0.66" +--- + +:::caution +This release contains deprecations that will be removed in the following version. +As we are preparing for 1.0-rc0, we are cleaning up the typespec language and some of the libraries. +::: + +## Notable changes + +### New Discriminated union with `@discriminated` + +In order to simplify and provide a more intuitive discriminated union experience, we have introduced a new `@discriminated` decorator. +This decorators allows you to define a discriminated union that will use the variant names as the discriminator values. +The decorator allows customizing the serialization of the union(by default using an envelop object) + +```tsp +@discriminated +union Pet { + cat: Cat, + dog: Dog, +} +``` + +Serialize as + +```json +{ + "kind": "cat", + "value": { + "name": "Whiskers", + "meow": true + } +}, +{ + "kind": "dog", + "value": { + "name": "Rex", + "bark": false + } +} +``` + +### New `tsp compile` progress indicator + +```ansi +$ tsp compile . +TypeSpec compiler v0.65.3 + +✔ Compiling +⠙ @typespec/openapi3 +``` + +```ansi +$ tsp compile . +TypeSpec compiler v0.65.3 + +✔ Compiling +✔ @typespec/openapi3 + +Compilation completed successfully. +``` + +## Breaking Changes + +### @typespec/openapi3 + +- [#6182](https://github.com/microsoft/typespec/pull/6182) Using `{service-name}` in `tspconfig.yaml` will always interpolate the current service name. `{service-name-if-multiple}` can be used to get the previous behavior + +## Deprecations + +### @typespec/compiler + +- [#6059](https://github.com/microsoft/typespec/pull/6059) Deprecate use of `@discriminator` on union. Migrate to `@discriminated` + + ```diff lang="tsp" + -@discriminator("type") + +@discriminated(#{envelope: "none", discriminatorPropertyName: "type"}) + union Pet; + ``` + +- [#6088](https://github.com/microsoft/typespec/pull/6088) Deprecate use of string-based visibility modifiers using warnings. + + String-based visibilities can be replaced as follows: + - `"create"`, `"read"`, `"update"`, `"delete"`, and `"query"` can be replaced with `Lifecycle.Create`, `Lifecycle.Read`, `Lifecycle.Update`, `Lifecycle.Delete`, and `Lifecycle.Query` respectively. + - `@visibility("none")` can be replaced with `@invisible(Lifecycle)`. + + For example: + + ```tsp + @visibility("create", "read") + example: string; + ``` + + can be replaced with: + + ```tsp + @visibility(Lifecycle.Create, Lifecycle.Read) + example: string; + ``` + + ```tsp + @visibility("none") + example: string; + ``` + + can be replaced with: + + ```tsp + @invisible(Lifecycle) + example: string; + ``` + + Additionally, `@parameterVisibility` with no arguments is deprecated. + + ```tsp + @parameterVisibility + @patch + op example(@bodyRoot resource: Resource): Resource; + ``` + + The effect of `@parameterVisibility` is to disable effective PATCH optionality. If you wish + to disable effective PATCH optionality in `@typespec/http`, preventing it from treating all + properties of the request body as effectively optional, you can now do so explicitly: + + ```tsp + @patch(#{ implicitOptionality: false }) + op example(@bodyRoot resource: Resource): Resource; + ``` + +- [#6108](https://github.com/microsoft/typespec/pull/6108) Migrate `@service` decorator options to take in a value + + ```diff lang="tsp" + -@service({title: "My service"}) + +@service(#{title: "My service"}) + ``` + +### @typespec/http + +- [#6130](https://github.com/microsoft/typespec/pull/6130) Updates `@header` decorator to accept values and adds the `explode` option. + Note that using the model expression syntax to pass in arguments, or using the + `format` field, are now deprecated. + + ```diff lang="tsp" + op example1( + - @header({ name: "ETag" }) etag: string + + @header(#{ name: "ETag" }) etag: string + ): void; + + op example2( + - @header({ format: "csv" }) list: string[] + + @header list: string[] + ): void; + ``` + +### @typespec/openapi + +- [#6078](https://github.com/microsoft/typespec/pull/6078) Updates the `@extension` decorator with 3 changes: + 1. Removes the extension name starts with `x-` constraint. + 1. Adds support for passing in values to emit raw data. + 1. Adds a deprecation warning for passing in types. Passed in types will emit Open API schemas in a future release. + + Scalar literals (e.g. string, boolean, number values) are automatically treated as values. + Model or tuple expression usage needs to be converted to values to retain current behavior in future releases. + + ```diff lang="tsp" + -@extension("x-obj", { foo: true }) + +@extension("x-obj", #{ foo: true }) + -@extension("x-tuple", [ "foo" ]) + +@extension("x-tuple", #[ "foo" ]) + model Foo {} + ``` + +- [#6108](https://github.com/microsoft/typespec/pull/6108) Migrate `@info` decorator to expect a value + + ```diff lang="tsp" + -@info({ version: "1.0.0" }) + +@info(#{ version: "1.0.0" }) + ``` + + ```diff lang="tsp" + -@info({ + +@info(#{ + termsOfService: "http://example.com/terms/", + - contact: { + + contact: #{ + name: "API Support", + url: "http://www.example.com/support", + email: "support@example.com" + }, + }) + ``` + +## Features + +### @typespec/compiler + +- [#5483](https://github.com/microsoft/typespec/pull/5483) Add autocomplete of model properties for union type +- [#5458](https://github.com/microsoft/typespec/pull/5458) Add codefix for for various triple quoted string syntax issues +- [#6082](https://github.com/microsoft/typespec/pull/6082) Introduced `list-files` flag to log all emitted files. +- [#6082](https://github.com/microsoft/typespec/pull/6082) Added a progress indicator to show the current stage of tsp compilation process. +- [#6059](https://github.com/microsoft/typespec/pull/6059) Add new `@discriminated` decorator to represent discriminated union with implicit envelopes +- [#5494](https://github.com/microsoft/typespec/pull/5494) Report unused template parameters in language server +- [#6045](https://github.com/microsoft/typespec/pull/6045) Redesign and simplification of `tsp init` +- [#5996](https://github.com/microsoft/typespec/pull/5996) Add Typekits to support EFV2 +- [#5986](https://github.com/microsoft/typespec/pull/5986) Tsp init template with both config and emitters merge in tspconfig.yaml + +- [#6047](https://github.com/microsoft/typespec/pull/6047) `--version` shows if tsp is running from the standalone version +- [#5453](https://github.com/microsoft/typespec/pull/5453) Report unused `using` in language server +- [#6164](https://github.com/microsoft/typespec/pull/6164) Renamed package `@typespec/http-server-javascript` to `@typespec/http-server-js`. + +### @typespec/http + +- [#5996](https://github.com/microsoft/typespec/pull/5996) Emitter Framework V2 + +### @typespec/openapi3 + +- [#6059](https://github.com/microsoft/typespec/pull/6059) Add support for new `@discriminated` unions +- [#5994](https://github.com/microsoft/typespec/pull/5994) Adds `seal-object-schemas` emitter option to automatically set additionalProperties/unevaluatedProperties to `{ not: {} }` wherever possible +- [#5961](https://github.com/microsoft/typespec/pull/5961) Updates JsonSchema and Open API 3.1 emitters to use unevaluatedProperties instead of additionalProperties, and updates Open API 3 emitters to match JsonSchema behavior of treating `Record` as setting `additionalProperties: { not: {} }` +- [#6130](https://github.com/microsoft/typespec/pull/6130) updates openapi3 to respect `@headers` `explode` option and use value syntax +- [#6157](https://github.com/microsoft/typespec/pull/6157) Shared operations operationId can now be set if they all share the same value provided by `@operationId` +- [#6006](https://github.com/microsoft/typespec/pull/6006) Expose core library types in API surface. + +### @typespec/html-program-viewer + +- [#5996](https://github.com/microsoft/typespec/pull/5996) Emitter Framework V2 + +### @typespec/json-schema + +- [#5994](https://github.com/microsoft/typespec/pull/5994) Adds `seal-object-schemas` emitter option to automatically set additionalProperties/unevaluatedProperties to `{ not: {} }` wherever possible +- [#5961](https://github.com/microsoft/typespec/pull/5961) Updates JsonSchema and Open API 3.1 emitters to use unevaluatedProperties instead of additionalProperties, and updates Open API 3 emitters to match JsonSchema behavior of treating `Record` as setting `additionalProperties: { not: {} }` + +### typespec-vs + +- [#5968](https://github.com/microsoft/typespec/pull/5968) Support intellisense for tsconfig.yaml in visual studio + +### typespec-vscode + +- [#6014](https://github.com/microsoft/typespec/pull/6014) Add "Import TypeSpec from OpenApi3" menu item into explorer context menu +- [#6164](https://github.com/microsoft/typespec/pull/6164) Renamed package `@typespec/http-server-javascript` to `@typespec/http-server-js`. + +## Bug Fixes + +### @typespec/compiler + +- [#4926](https://github.com/microsoft/typespec/pull/4926) Augmenting an expression will now report an error instead of silently failing to apply. +- [#5937](https://github.com/microsoft/typespec/pull/5937) Fix: StringTemplate type not supported in typespecValueToJson +- [#6204](https://github.com/microsoft/typespec/pull/6204) Fix `@example` reporting assignability error when using mix metadata(http) models +- [#6125](https://github.com/microsoft/typespec/pull/6125) Fix tmlanguage syntax highlighting when using decorator before escaped identifier +- [#6192](https://github.com/microsoft/typespec/pull/6192) Fix `tsp info` crash +- [#6203](https://github.com/microsoft/typespec/pull/6203) Fix mutator not mutating sourceModel(s) + +### @typespec/openapi3 + +- [#5901](https://github.com/microsoft/typespec/pull/5901) Fix: `@typespec/openapi3/invalid-component-fixed-field-key` show on incorrect target + +### typespec-vscode + +- [#6137](https://github.com/microsoft/typespec/pull/6137) Fix code snippet for union in typespec-vscode diff --git a/website/src/content/docs/release-notes/typespec-0-67.md b/website/src/content/docs/release-notes/typespec-0-67.md new file mode 100644 index 00000000000..3bde9e3756b --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-0-67.md @@ -0,0 +1,503 @@ +--- +slug: release-notes/typespec-0-67 +title: "0.67" +releaseDate: 2025-03-18 +version: "0.67" +--- + +:::caution +This release contains breaking changes. This is the last release before 1.0-rc.0 which was focused on cleaning up deprecated features and APIs. +::: + +## Notable changes + +### `tsp install` now download and use the configured package manager + +In order to detach typespec from any specific package manager, `tsp install` now uses the package manager configured in `packageManager` or `devEngines.packageManager` field of `package.json`. If the field is not present, it defaults to `npm` latest version but will log a warning. + +```json title="package.json" +{ + // Use npm 11.2.0 with sha512 checksum verification + "packageManager": "npm@11.2.0+sha512.3dc9c50ba813a3d54393155a435fe66404b72685ab0e3008f9ae9ed8d81f6104860f07ed2656dd5748c1322d95f3140fa9b19c59a6bba7750fd12285f81866da", + // Use npm 11.2.0 but skip integrity check + "packageManager": "npm@11.2.0" +} +``` + +The field can be automatically set by running `tsp install --save-package-manager` + +## Breaking Changes + +### All packages + +- [#5977](https://github.com/microsoft/typespec/pull/5977) Minimum node version is now 20 + +### @typespec/compiler + +- [#6231](https://github.com/microsoft/typespec/pull/6231) Remove deprecated items: + - `@deprecated` decorator, use `#deprecated` directive instead + + ```diff lang=tsp + - @deprecated("Message") + + #deprecated "Message" + ``` + + - `@service` `versions` support. Either migrate to `@OpenAPI.info` or the versioning library + + ```diff lang=tsp + - @service({version: "1.0"}) + + @service + + @OpenAPI.info(#{version: "1.0"}) + ``` + + - Removed `@knownValues`. Use a union with a string variant instead + + ```diff lang=tsp + - enum MyKnownValues {a, b} + - @knownValues(MyKnownValues) + - scalar Custom extends string; + + union Custom { + + "a", "b", string + + }; + ``` + + - Removed `@projectedName` Migrate to `@encodedName` instead. + + ```diff lang=tsp + - @projectedName("json", "nbf") + + @encodedName("application/json", "nbf") + notBefore: int32; + ``` + + - CLI configuration value `output-path`, use `output-dir` instead. + + - Support for `cadlMain` in `package.json`. Migrate to `exports["."].tsp` instead. + + ```diff lang=json + - "cadlMain": "lib/main.tsp", + + "exports": { + + ".": { + + "tsp": "lib/main.tsp" + + } + + } + ``` + + - Compiling `.cadl` files, use `.tsp` instead. + + - `decoratorArgMarshalling` flag in `$flags` was removed and support for the `legacy` decorator arg marshalling. + + - Using `@format` on bytes. `@format` can only be used on string where it defines a known pattern for the string. + + - Javascript functions and typescript types: + - `stringTemplateToString` + - `CadlLanguageConfiguration` + - `CadlPrettierPlugin` + - `NodePackage` -> `PackageJson` + - `CadlValue` -> `TypeSpecValue` + - `createCadlLibrary` -> `createTypeSpecLibrary` + - `setCadlNamespace` -> `setTypeSpecNamespace` + - `CadlLibrary` -> `TypeSpecLibrary` + - `SyntaxKind.CadlScript` -> `SyntaxKind.TypeSpecScript` + - `isCadlValueTypeOf` -> `isTypeSpecValueTypeOf` + - `cadlTypeToJson` -> `typespecTypeToJson` + - `checkFormatCadl` -> `checkFormatTypeSpec` + - `cadlVersion` -> `typespecVersion` + - `CadlManifest` -> `TypeSpecManifest` + - `validateDecoratorTargetIntrinsic` -> Use `extern dec` to define the signature of decorators instead + - `validateDecoratorParamType` -> Use `extern dec` to define the signature of decorators instead + - `createDecoratorDefinition` -> Use `extern dec` to define the signature of decorators instead + - `CompilerOptions#emitters` -> Use `emit` and `options` field instead. + ```diff lang=ts + - emitters: { "my-emitter": options }, + + emit: ["my-emitter"], + + options: { "my-emitter": options }, + ``` + - `Type#templateArguments` -> Use `templateMapper` instead. + - `ModelProperty#default` -> Use `defaultValue` instead. + - `Union#options` -> Use `variants` instead. + - `linter` in `createTypeSpecLibrary` -> Use `export const $linter = defineLinter({ ... })` instead. + - Accessor for removed `@knownValues` decorator + - `getKnownValues` + - Accessor for removed `@projectedName` decorator + - `getProjectedNames` + - `getProjectedName` + - `hasProjectedName` + +- [#6323](https://github.com/microsoft/typespec/pull/6323) Move AST related APIS to `@typespec/compiler/ast` package. This is to mark a clear separation for the AST types and APIs which are considered for advanced usage and might change at any time. + - All `*Node` types + - `exprIsBareIdentifier` + - `getFirstAncestor` + - `getIdentifierContext` + - `getNodeAtPosition` + - `getNodeAtPositionDetail` + - `hasParseError` + - `isImportStatement` + - `parse` + - `parseStandaloneTypeReference` + - `positionInRange` + - `visitChildren` +- [#6323](https://github.com/microsoft/typespec/pull/6323) Stop exposing APIs that were not meant for external users. Please file issue if you had legitmate use of some of those APIs. + - `Checker`: The check itself should be used very carefully and its wouldn't be covered under the compatibility guarantees. There is some apis that were explicitly marked as internal while other remained until we provide a better way to do the same thing: + - `getGlobalNamespaceType();` -> `program.getGlobalNamespaceType();` + - `resolveTypeReference();` -> `program.resolveTypeReference();` + - `checkProgram();` This isn't meant to be used by external users. + - `getLiteralType()` This isn't meant to be used by external users. + - `resolveRelatedSymbols()` This isn't meant to be used by external users. + - `resolveCompletions()` This isn't meant to be used by external users. + + - `Program`: Exposed functions on the program are safe to use but a few have been updated to be internal: + - `mainFile` -> Use `projectRoot` instead. + - `literalTypes` This isn't meant to be used by external users. + - `checker`: This is still exposed but to be used carefully, see above. + - `loadTypeSpecScript`: This isn't meant to be used by external users. + - `onValidate`: This isn't meant to be used by external users. + - `reportDuplicateSymbols`: This isn't meant to be used by external users. + + - `logVerboseTestOutput` Internal test util, not meant for external users + - `validateDecoratorTarget` -> migrate to `extern dec` declaration + - `validateDecoratorParamCount`: Same as above + - `altDirectorySeparator`: Internal path utils + - `directorySeparator`: Internal path utils + - `isIntrinsicType`: Internal check + - `getFullyQualifiedSymbolName` Symbols are an internal aspect of the compiler + - Scanner related APIs: + - `createScanner` + - `isComment` + - `isKeyword` + - `isModifier` + - `isPunctuation` + - `isStatementKeyword` + - `isTrivia` + - `skipContinuousIdentifier` + - `skipTrivia` + - `skipTriviaBackward` + - `skipWhiteSpace` + - `Token` + - `TokenFlags` + - `type`DocToken, + - `type`Scanner, + - `type`StringTemplateToken, + - Types + - `Sym` Symbols are an internal aspect of the compiler + - `SymbolLinks` Symbols are an internal aspect of the compiler + - `SymbolTable` Symbols are an internal aspect of the compiler + - `SymbolFlags` Symbols are an internal aspect of the compiler + - `MutableSymbolTable` Symbols are an internal aspect of the compiler + - `ResolutionResult` Internal type used in non exposed resolver + - `NodeLinks` Internal type used in non exposed resolver + - `ResolutionResultFlags` Internal type used in non exposed resolver + - `MetaMemberKey` Unused type + - `MetaMembersTable` Unused type + - `Dirent` Unused type + +- [#6410](https://github.com/microsoft/typespec/pull/6410) Remove a legacy behavior of resolving package names which wasn't inline with node ESM module resolution. + + For example if you were running tsp compile within your node_modules folder(on a test package) and referencing your emitter by name you might need to change this + + ```diff lang=bash + -tsp compile . --emit my-emitter + +tsp compile . ../../ # path to your emitter root instead + ``` + +- [#6286](https://github.com/microsoft/typespec/pull/6286) Removed deprecated use of `@discriminator` on union. Migrate to `@discriminated` + + ```diff lang="tsp" + -@discriminator("type") + +@discriminated(#{envelope: "none", discriminatorPropertyName: "type"}) + union Pet; + ``` + +- [#6327](https://github.com/microsoft/typespec/pull/6327) Remove projection. Projection was an experiemental syntax that was too flawed to be included in 1.0 in that current state. +- [#6388](https://github.com/microsoft/typespec/pull/6388) Remove deprecated type to value conversion. Since the introductions of object values(`#{}`) and array values(`#[]`) using model expressions or tuple where values were expected has been deprecated. It is now an error with a codefix. + + ```diff lang="tsp" + -@service({title: "My service"}) + +@service(#{title: "My service"}) + ``` + +- [#6416](https://github.com/microsoft/typespec/pull/6416) Adding new keywords for future use: + - `statemachine` + - `macro` + - `package` + - `metadata` + - `env` + - `arg` + - `declare` + - `array` + - `struct` + - `record` + - `module` + - `mod` + - `pub` + - `sub` + - `typeref` + - `trait` + - `this` + - `self` + - `super` + - `keyof` + - `with` + - `implements` + - `impl` + - `satisfies` + - `flag` + - `auto` + - `partial` + - `private` + - `public` + - `protected` + - `internal` + - `sealed` + - `local` + - `async` +- [#6258](https://github.com/microsoft/typespec/pull/6258) Removed deprecated legacy visibility APIs and converted all warnings for using string-based visibility modifiers to errors. + + The removed APIs include: + - `getVisibility`: use `getVisibilityForClass` instead. + - `getParameterVisibility`: use `getParameterVisibilityFilter` instead. + - `getReturnTypeVisibility`: use `getReturnTypeVisibilityFilter` instead. + + Furthermore, the legacy signature of `isVisible` that accepts an array of strings has been removed. Please use the new signature that accepts `EnumMember` instead. + + The changed decorators include: + - `@visibility` + - `@parameterVisibility` + - `@returnTypeVisibility` + - `@withVisibility` + - `@withDefaultKeyVisibility` + + The `TypeSpec.DefaultKeyVisibility` template also no longer accepts a string as a visibility modifier argument. + + Attempting to pass a string to any of the above decorators or templates will now result in a type-checking error. Please use the `Lifecycle` visibility modifiers instead. + + If you develop a third-party library and you use any custom visibility modifiers, you will need to instead define a visibility class enum. See: [Visibility | TypeSpec](https://typespec.io/docs/language-basics/visibility/). + + **Migration steps**: + + String-based visibilities can be replaced as follows: + - `"create"`, `"read"`, `"update"`, `"delete"`, and `"query"` can be replaced with `Lifecycle.Create`, `Lifecycle.Read`, `Lifecycle.Update`, `Lifecycle.Delete`, and `Lifecycle.Query` respectively. + - `@visibility("none")` can be replaced with `@invisible(Lifecycle)`. + + For example: + + ```tsp + @visibility("create", "read") + example: string; + ``` + + can be replaced with: + + ```tsp + @visibility(Lifecycle.Create, Lifecycle.Read) + example: string; + ``` + + ```tsp + @visibility("none") + example: string; + ``` + + can be replaced with: + + ```tsp + @invisible(Lifecycle) + example: string; + ``` + + Additionally, `@parameterVisibility` with no arguments has been made an error. Previously, some specifications used it to disable effective PATCH optionality, but that behavior was an unintended side effect. For example: + + ```tsp + @parameterVisibility + @patch + op example(@bodyRoot resource: Resource): Resource; + ``` + + If you wish to disable effective PATCH optionality in `@typespec/http`, preventing it from treating all properties of the request body as effectively optional, you can now do so explicitly: + + ```tsp + @patch(#{ implicitOptionality: false }) + op example(@bodyRoot resource: Resource): Resource; + ``` + +### @typespec/http + +- [#6387](https://github.com/microsoft/typespec/pull/6387) Removing deprecated items + +- `isContentTypeHeader` +- `setLegacyStatusCodeState` + +Moved to internal + +- `setStatusCode` +- [#6305](https://github.com/microsoft/typespec/pull/6305) Remove deprecated items: + +- `format` option from `@header` and `@query` decorators. Use `explode` option instead. + + ```diff + -@header(#{ format: "multi"}) + -@query(#{ format: "multi"}) + +@header(#{ explode: true }) + +@query(#{ explode: true }) + ``` + +- `shared` option from `@route` decorator. Please use `@sharedRoute` instead. + + ```diff + -@route("/doStuff", { shared: true }) + +@sharedRoute + +@route("/doStuff") + ``` + +- Javascript functions and typescript types: + - `HeaderOptions.format` + - `HeaderFieldOptions.format` + - `QueryOptions.format` + - `QueryParameterOptions.format` + - `MetadataInfo.isEmptied` + - `includeInterfaceRoutesInNamespace` + - `getAllRoutes` -> `getAllHttpServices` + - `OperationDetails` -> `HttpOperation` + - `ServiceAuthentication` -> `Authentication` + - `HttpOperationParameters.bodyType` -> `body.type` + - `HttpOperationParameters.bodyParameter` -> `body.parameter` + - `StatusCode` -> `HttpStatusCodesEntry` + +- [#6433](https://github.com/microsoft/typespec/pull/6433) Stop exposing APIs that were not meant for external users. Please file issue if you had legitmate use of some of those APIs. + - `@includeInapplicableMetadataInPayload` decorator was moved to `Private` namespace and stop exposing the accessor. + - Functions used in `getHttpOperation` to resolve the finalized view of the http operation but shouldn't be used directly. + - `resolvePathAndParameters` + - `validateRouteUnique` internal api used in http library validation + - Moved custom route producer related APIs to experimental with `unsafe_` prefix. Those APIs are not ready for public use and **will** change in future. + - `DefaultRouteProducer` -> `unsafe_DefaultRouteProducer` + - `getRouteProducer` -> `unsafe_getRouteProducer` + - `setRouteProducer` -> `unsafe_setRouteProducer` + - `setRouteOptionsForNamespace` -> `unsafe_setRouteOptionsForNamespace` + - `RouteProducer` -> `unsafe_RouteProducer` + - `RouteProducerResult` -> `unsafe_RouteProducerResult` + - `RouteResolutionOptions` -> `unsafe_RouteResolutionOptions` + - `RouteOptions` -> `unsafe_RouteOptions` +- [#6357](https://github.com/microsoft/typespec/pull/6357) Changed the default content-type resolution behavior as follows: + +- As before, if the content-type header is _explicitly_ specified (`@header contentType: valueof string`), the explicit content type is used (this behavior has not changed). +- If the type of an HTTP payload body has a Media Type hint (`@mediaTypeHint`), that media type is preferred as the default content-type for the request. +- The default content-type for `TypeSpec.bytes` has been changed to `application/octet-stream` to avoid serializing the data to base64-encoded JSON. +- The default content-type for all other scalar types has been changed to `text/plain` (previously, it was `application/json`). +- For multipart payloads, the default content-type of the payload has been changed to `multipart/form-data` if the `@multipartBody` parameter has a Model type and `multipart/mixed` if the multipart payload has a tuple type. + - The content-type of individual parts in the multipart request has been changed to be the same as for HTTP payload bodies and follows the logic described above. + +### @typespec/versioning + +- [#6327](https://github.com/microsoft/typespec/pull/6327) Remove deprecated versioning projection, switch to the mutator approach + + ```diff lang="tsp" + // Step 1: Update to retrieve the mutation instead of projections + -const versions = buildVersionProjections(program, service.type); + +const versions = getVersioningMutators(program, service.type); + + // Step 2: call mutator instead of projection api + -const projectedProgram = projectProgram(originalProgram, versionRecord.projections); + +const subgraph = unsafe_mutateSubgraphWithNamespace(program, [mutator], service.type); + +subgraph.type // this is the mutated service namespace + ``` + +## Deprecations + +### @typespec/compiler + +- [#6310](https://github.com/microsoft/typespec/pull/6310) Deprecate `@typespec/compiler/emitter-framework` export in favor of a new package `@typespec/asset-emitter` + + ```diff lang=json title=package.json + "dependencies": { + + "@typespec/asset-emitter": "0.67.0" + } + ``` + + ```diff lang=ts + -import { TypeEmitter, ... } from "@typespec/compiler/emitter-framework"; + +import { TypeEmitter, ... } from "@typespec/asset-emitter"; + ``` + +- [#6306](https://github.com/microsoft/typespec/pull/6306) Remove the use of deprecated getDiscriminatedUnion + +### @typespec/http + +- [#6464](https://github.com/microsoft/typespec/pull/6464) Deprecate implicit multipart body + + ```diff lang=tsp + op upload( + @header contentType: "multipart/form-data", + - @body body: { + + @multipartBody body: { + - name: string; + + name: HttpPart; + - avatar: bytes; + + avatar: HttpPart; + } + ): void; + ``` + +### @typespec/openapi3 + +- [#6305](https://github.com/microsoft/typespec/pull/6305) Related changes based on `http` library deprecation removal. + +## Features + +### @typespec/compiler + +- [#6411](https://github.com/microsoft/typespec/pull/6411) Introduce a new `dryRun` compiler option(`--dry-run` in the cli) that emitters can opt-in to support by setting `capabilities.dryRun` in their `$lib`. +- [#6411](https://github.com/microsoft/typespec/pull/6411) Update `noEmit` compiler option (`--no-emit` cli flag) to prevent emitter to run. A new `dryRun` option has been added to achieve a safer similar result where emitters run but do not write output. +- [#6220](https://github.com/microsoft/typespec/pull/6220) `tsp install` now downloads and uses the configured package manager in `devEngines.packageManager` or `packageManager` field of `package.json` +- [#6357](https://github.com/microsoft/typespec/pull/6357) Add support for `@mediaTypeHint` to apply a hint for default Media/MIME type (Content-Type in HTTP) to a TypeSpec type. + +### @typespec/http + +- [#6345](https://github.com/microsoft/typespec/pull/6345) Update `BasicAuth` and `BearerAuth` types scheme to use standard name for scheme `Basic`, `Bearer` +- [#6327](https://github.com/microsoft/typespec/pull/6327) Remove reference to delete projection feature + +### @typespec/openapi3 + +- [#6268](https://github.com/microsoft/typespec/pull/6268) `@typespec/versioning` is now an optional dependency. +- [#6286](https://github.com/microsoft/typespec/pull/6286) Remove support for `@discriminator` on union +- [#6327](https://github.com/microsoft/typespec/pull/6327) Remove reference to delete projection feature + +### @typespec/protobuf + +- [#6327](https://github.com/microsoft/typespec/pull/6327) Remove reference to delete projection feature + +### @typespec/html-program-viewer + +- [#6327](https://github.com/microsoft/typespec/pull/6327) Remove reference to delete projection feature + +### typespec-vscode + +- [#6178](https://github.com/microsoft/typespec/pull/6178) Update references to JS emitter +- [#5972](https://github.com/microsoft/typespec/pull/5972) Select multiple emitters to generate multiple codes at one time +- [#6295](https://github.com/microsoft/typespec/pull/6295) Improve the "Create TypeSpec Project" user experience +- [#6015](https://github.com/microsoft/typespec/pull/6015) add openapi3 preview +- [#6123](https://github.com/microsoft/typespec/pull/6123) Support telemetry + +## Bug Fixes + +### @typespec/compiler + +- [#6335](https://github.com/microsoft/typespec/pull/6335) Improvements to the CLI output +- [#6309](https://github.com/microsoft/typespec/pull/6309) Fixed an issue where the `--emit-files` flag on emitters with nested folders was not generating the correct paths to the files. +- [#6292](https://github.com/microsoft/typespec/pull/6292) Fix `tsp init` not respecting default selected emitters + +### @typespec/rest + +- [#6326](https://github.com/microsoft/typespec/pull/6326) Updates `@autoRoute` behavior to apply same HttpOperationParameter filtering to HttpProperty + +### @typespec/openapi3 + +- [#6289](https://github.com/microsoft/typespec/pull/6289) Fix `utcDateTime` and `offsetDateTime` not using format `http-date` in header by default as the default http encoding defines +- [#6411](https://github.com/microsoft/typespec/pull/6411) Add support for new `dryRun` emitter option +- [#6473](https://github.com/microsoft/typespec/pull/6473) Adds support for `@encode` to specify array encodings for `@query` parameters + +### @typespec/protobuf + +- [#6411](https://github.com/microsoft/typespec/pull/6411) Add support for new `dryRun` emitter option + +### @typespec/json-schema + +- [#6411](https://github.com/microsoft/typespec/pull/6411) Add support for new `dryRun` emitter option diff --git a/website/src/content/docs/release-notes/typespec-1-0-0-rc-0.md b/website/src/content/docs/release-notes/typespec-1-0-0-rc-0.md new file mode 100644 index 00000000000..5eb8bc54af0 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-1-0-0-rc-0.md @@ -0,0 +1,137 @@ +--- +slug: release-notes/typespec-1-0-0-rc-0 +title: "1.0.0-rc.0" +releaseDate: 2025-04-02 +version: "1.0.0-rc.0" +--- + +:::caution +This release contains breaking changes. +::: + +## TypeSpec 1.0 Release Candidate + +We're excited to announce the TypeSpec 1.0 Release Candidate, marking a significant milestone for the TypeSpec project. TypeSpec accelerates your initial API development while providing a sustainable approach to evolving your APIs over time. Design faster today by defining your APIs in a concise, human-readable format and generating all the artifacts you need from a single source of truth – OpenAPI specifications, client libraries, and server code scaffolding. Scale easier tomorrow with an API-first approach that keeps everything in sync as your API grows and requirements change. + +- `@typespec/compiler` +- `@typespec/http` +- `@typespec/openapi` +- `@typespec/openapi3` +- `@typespec/json-schema` + +All the other typespec libraries remain in preview, beta or alpha stage. + +[See our blog post](https://typespec.io/blog/2025-03-31-typespec-1-0-release/) + +## Breaking Changes + +### @typespec/compiler + +- [#6678](https://github.com/microsoft/typespec/pull/6678) Moved `TypeSpecPrettierPlugin` type to internal. If wanting to use the prettier pluging programmatically, use it from the `@typespec/prettier-plugin-typespec` package +- [#6544](https://github.com/microsoft/typespec/pull/6544) Remove deprecated `@typespec/compiler/emitter-framework` export in favor of a new package `@typespec/asset-emitter` + + ```diff lang=json title=package.json + "dependencies": { + + "@typespec/asset-emitter": "^1.0.0-rc.0" + } + ``` + + ```diff lang=ts + -import { TypeEmitter, ... } from "@typespec/compiler/emitter-framework"; + +import { TypeEmitter, ... } from "@typespec/asset-emitter"; + ``` + +- [#6754](https://github.com/microsoft/typespec/pull/6754) Reserve additional keywords: + - `context` + - `sym` + - `prop` + - `property` + - `scenario` + +### @typespec/http + +- [#6557](https://github.com/microsoft/typespec/pull/6557) Remove support for deprecated implicit multipart, migrate to explicit part with `@multipartBody` and `HttpPart` + + ```diff lang=tsp + op upload( + @header contentType: "multipart/form-data", + - @body body: { + + @multipartBody body: { + - name: string; + + name: HttpPart; + - avatar: bytes; + + avatar: HttpPart; + } + ): void; + ``` + +- [#6563](https://github.com/microsoft/typespec/pull/6563) Separate file bodies into their own `bodyKind`. + + The HTTP library will now return a body with `bodyKind: "file"` in all cases where emitters should treat the body as a file upload or download. Emitters that previously attempted to recognize File bodies by checking the `type` of an HTTP `"single"` body may now simply check if the `bodyKind` is `"file"`. This applies to all HTTP payloads where an `HttpOperationBody` can appear, including requests, responses, and multipart parts. + +### @typespec/openapi3 + +- [#6557](https://github.com/microsoft/typespec/pull/6557) Remove support for removed feature implicit multipart. +- [#6563](https://github.com/microsoft/typespec/pull/6563) Separate file bodies into their own `bodyKind`. + + The HTTP library will now return a body with `bodyKind: "file"` in all cases where emitters should treat the body as a file upload or download. Emitters that previously attempted to recognize File bodies by checking the `type` of an HTTP `"single"` body may now simply check if the `bodyKind` is `"file"`. This applies to all HTTP payloads where an `HttpOperationBody` can appear, including requests, responses, and multipart parts. + +## Features + +### @typespec/http + +- [#6559](https://github.com/microsoft/typespec/pull/6559) [API] Expose `property?` on `HttpOperationPart` +- [#6652](https://github.com/microsoft/typespec/pull/6652) Add validation when using path or query options with the default value while the parameter is referenced in the uri template + +### @typespec/prettier-plugin-typespec + +- [#6678](https://github.com/microsoft/typespec/pull/6678) Migrate to ESM. This shouldn't be breaking as we didn't support prettier < 3. + +## Bug Fixes + +### @typespec/compiler + +- [#6197](https://github.com/microsoft/typespec/pull/6197) Show emitter internal error message in tspconfig +- [#6710](https://github.com/microsoft/typespec/pull/6710) Updates to scaffolding script and scaffold commands for consistency +- [#6826](https://github.com/microsoft/typespec/pull/6826) Fix new reserved keywords were not allowed in augment decorator expression +- [#6697](https://github.com/microsoft/typespec/pull/6697) Fix crash that would happen when a type was mutated while using null in a decorator(e.g. when using versioning library with `@example(null)`) +- [#6711](https://github.com/microsoft/typespec/pull/6711) Fix extra properties not validated in nested entries of the config +- [#6711](https://github.com/microsoft/typespec/pull/6711) Fix passing nested emitter options with `--option` + +### @typespec/http + +- [#6542](https://github.com/microsoft/typespec/pull/6542) Query parameter with `-` will be correctly represented in the resulting uri template +- [#6472](https://github.com/microsoft/typespec/pull/6472) Path parameters can now be optional under specific circumstances. This fix updates the validation to ensure it doesn't trigger in these scenarios. + + An optional parameter should have a leading `/` inside the `{}`. + + For example: + + ```tsp + @route("optional{/param}/list") + op optional(@path param?: string): void; + ``` + + Another supported scenario is using `@autoRoute`: + + ```tsp + @autoRoute + op optional(@path param?: string): void; + ``` + +### @typespec/openapi + +- [#6651](https://github.com/microsoft/typespec/pull/6651) Adds diagnostic when passing in a `Type` to the `$extension` decorator function directly + +### @typespec/openapi3 + +- [#6559](https://github.com/microsoft/typespec/pull/6559) Fix missing application of description on multipart properties +- [#6729](https://github.com/microsoft/typespec/pull/6729) Fix duplicate name error when using named union inside multipart part. +- [#6506](https://github.com/microsoft/typespec/pull/6506) Fix union of custom scalar with `null` creating an `object` with `allOf` reference + +### typespec-vscode + +- [#6668](https://github.com/microsoft/typespec/pull/6668) Fix error when upgrading to use latest telemetry library +- [#6690](https://github.com/microsoft/typespec/pull/6690) Fix the issue to log compiler information as an error. And remove PREVIEW prefix for server code emitter +- [#6694](https://github.com/microsoft/typespec/pull/6694) compiler can be resolved automatically when it's not installed in the root folder of the first opened workspace. +- [#6620](https://github.com/microsoft/typespec/pull/6620) Update menu item and command text for "Show OpenAPI3 Documentation" and "Import TypeSpec from OpenApi3" diff --git a/website/src/content/docs/release-notes/typespec-1-0-0-rc-1.md b/website/src/content/docs/release-notes/typespec-1-0-0-rc-1.md new file mode 100644 index 00000000000..bbd715851d3 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-1-0-0-rc-1.md @@ -0,0 +1,83 @@ +--- +slug: release-notes/typespec-1-0-0-rc-1 +title: "1.0.0-rc.1" +releaseDate: 2025-04-22 +version: "1.0.0-rc.1" +--- + +## Features + +### @typespec/compiler + +- [#7067](https://github.com/microsoft/typespec/pull/7067) Adding support for nested paging properties. +- [#6862](https://github.com/microsoft/typespec/pull/6862) `--trace` cli option applies to all commands now +- [#7065](https://github.com/microsoft/typespec/pull/7065) Adds a TypeKit for Tuple types +- [#7049](https://github.com/microsoft/typespec/pull/7049) Adds a new createDiagnosable typekit helper for APIs that return diagnostics +- [#7047](https://github.com/microsoft/typespec/pull/7047) Adds typekit support for creating unions from enums + +### @typespec/http + +- [#7049](https://github.com/microsoft/typespec/pull/7049) Updates `$.httpOperation.get` to be a diagnosable - use `$.httpOperation.get.withDiagnostics` to get diagnostics +- [#6949](https://github.com/microsoft/typespec/pull/6949) Improved types for HTTP multipart payloads for more precise guarantees and additional information about the resolution of individual parts. + +## Experimental features breaking changes + +### @typespec/compiler + +- [#7018](https://github.com/microsoft/typespec/pull/7018) Removes the default typekit in favor of always instantiating typekits with either a `program` or `realm`. + +## Bug Fixes + +### @typespec/compiler + +- [#6897](https://github.com/microsoft/typespec/pull/6897) Improve errors when loading libraries with invalid exports/main fields +- [#7069](https://github.com/microsoft/typespec/pull/7069) Mark `node` property on all typespec types as optional +- [#7063](https://github.com/microsoft/typespec/pull/7063) Fixes an issue where isError was checking for error types instead of error models. +- [#7047](https://github.com/microsoft/typespec/pull/7047) Preserve API documentation when calling `$.enum.createFromUnion` + +### @typespec/http + +- [#6962](https://github.com/microsoft/typespec/pull/6962) Fixes issue where each variant of a `@discriminated` union was treated as a separate response instead of the whole union being treated as a single response. +- [#7069](https://github.com/microsoft/typespec/pull/7069) Handle types without node +- [#7065](https://github.com/microsoft/typespec/pull/7065) Handle tuples without nodes + +### @typespec/openapi + +- [#6947](https://github.com/microsoft/typespec/pull/6947) Fix crash when using enum values in extension + +### @typespec/openapi3 + +- [#6279](https://github.com/microsoft/typespec/pull/6279) Fix various issues when using xml payloads and custom scalars +- [#6887](https://github.com/microsoft/typespec/pull/6887) Fix using union templates + +### @typespec/json-schema + +- [#6947](https://github.com/microsoft/typespec/pull/6947) Fix crash when using enum values in extension +- [#6887](https://github.com/microsoft/typespec/pull/6887) Fix using union templates + +### typespec-vscode + +- [#6894](https://github.com/microsoft/typespec/pull/6894) Fix the issue where the emitter version is undefined in telemetry. +- [#7021](https://github.com/microsoft/typespec/pull/7021) Fix crash when initialize telemetry client + +### @typespec/versioning + +- [#7022](https://github.com/microsoft/typespec/pull/7022) Fix issue where the incompatible-versioned-reference diagnostic was incorrectly triggered when a model had a `@removed` decorator and one of its properties had an `@added` decorator, even if the versions were compatible. + + Example: + + ```tsp + @removed(Versions.v3) + model Widget { + @added(Versions.v2) + name: string; + } + ``` + +### @typespec/protobuf + +- [#7069](https://github.com/microsoft/typespec/pull/7069) Handle types without node + +### @typespec/internal-build-utils + +- [#6676](https://github.com/microsoft/typespec/pull/6676) Fix third party resolution getting duplicate entries diff --git a/website/src/content/docs/release-notes/typespec-1-0-0.md b/website/src/content/docs/release-notes/typespec-1-0-0.md new file mode 100644 index 00000000000..3390dc0f86b --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-1-0-0.md @@ -0,0 +1,118 @@ +--- +slug: release-notes/typespec-1-0-0 +title: "1.0.0" +releaseDate: 2025-05-06 +version: "1.0.0" +--- + +## TypeSpec 1.0 Release + +Today, we’re thrilled to announce the general availability of TypeSpec 1.0! This milestone marks the transition of TypeSpec’s core components from release candidate to stable release status. TypeSpec is a Microsoft-built, community-supported project that makes API-first development truly practical by empowering you to define your APIs in a concise, human-readable format and generate all the artifacts you need—from OpenAPI specifications to client libraries and server code scaffolding—from a single source of truth. + +[See our blog post](https://typespec.io/blog/typespec-1-0-GA-release/) + +## Breaking Changes + +### @typespec/http + +- [#7230](https://github.com/microsoft/typespec/pull/7230) Changed `@patch` so that it does not apply the "implicit optionality" transform by default anymore. + + ```diff lang=tsp + @patch op update(@body pet: Pet): void; + ``` + + To use JSON Merge-Patch to update resources, replace the body property with an instance of `MergePatchUpdate` as follows: + + ```tsp + @patch op update(@body pet: MergePatchUpdate): void; + ``` + + Or, keep the old behavior by explicitly enabling `implicitOptionality` in the `@patch` options: + + ```tsp + @patch(#{ implicitOptionality: true }) op update(@body pet: Pet): void; + ``` + +## Features + +### @typespec/compiler + +- [#7199](https://github.com/microsoft/typespec/pull/7199) Add "capitalize" string helper to compiler +- [#7180](https://github.com/microsoft/typespec/pull/7180) Add support for formatting `tspconfig.yaml` with `tsp format` +- [#7180](https://github.com/microsoft/typespec/pull/7180) `tsp format` only formats files it knows about and ignores other. Allowing a more generic glob pattern `tsp format .` or `tsp format "**/*"` +- [#5674](https://github.com/microsoft/typespec/pull/5674) [LSP] Update imports when renaming typespec files +- [#7125](https://github.com/microsoft/typespec/pull/7125) Adds typekits for getting intrinsic types via `$.intrinsic.` +- [#7204](https://github.com/microsoft/typespec/pull/7204) Update typekits `is*` methods to accept `Entity` instead of just `Type` or `Value` +- [#7108](https://github.com/microsoft/typespec/pull/7108) Adds support for nesting typekits +- [#7202](https://github.com/microsoft/typespec/pull/7202) Replaces `$.model.getSpreadType` with `$.model.getIndexType` to better reflect what it actually being returned. `getSpreadType` did not actually return a list of spread types, but the model's indexer type instead. +- [#7090](https://github.com/microsoft/typespec/pull/7090) Adds TypeKit support for type.inNamespace to check namespace membership +- [#7167](https://github.com/microsoft/typespec/pull/7167) Adds `$.value.resolve` and `$.type.resolve` typekits, and updated `$.resolve` to return values or types, instead of just types +- [#7106](https://github.com/microsoft/typespec/pull/7106) Adds `$.type.isAssignableTo`, `$.value.isAssignableTo` and `$.entity.isAssignableTo` typekits. Also registers `$.resolve` typekit +- [#7193](https://github.com/microsoft/typespec/pull/7193) Typekits have been moved out of experimental and can now be accessed via the `@typespec/compiler/typekit` submodule. + This also removed the `$.type.getDiscriminator` typekit in favor of the `$.model.getDiscriminatedUnion` and `$.union.getDiscriminatedUnion` + typkits. + + ```diff + -import { $ } from "@typespec/compiler/experimental/typekit"; + +import { $ } from "@typespec/compiler/typekit"; + ``` + +- [#7105](https://github.com/microsoft/typespec/pull/7105) Add typekit support for creating a union from an array of children +- [#7207](https://github.com/microsoft/typespec/pull/7207) Exposed experimental function `isMutableType` as `unsafe_isMutableType`. +- [#7200](https://github.com/microsoft/typespec/pull/7200) Added an optional `nameTemplate` argument to `@withVisibilityFilter`, allowing the visibility filters to rename models as they are transformed. This template is applied by default in the `Create`, `Read`, `Update`, `Delete`, and `Query` visibility transform templates. This allows for more flexible renaming than simply using the `@friendlyName` decorator, as it will change the primary name of the transformed type, reducing the incidence of naming conflicts. + + Cached the result of applying visibility filters to types. If the same visibility filter is applied to the same type with the same configuration, the model instance produced by the visibility filter will be object-identical. This should reduce the incidence of multiple models that are structurally equivalent in visibility filters and conflicts over the name of models. + +### @typespec/http + +- [#7207](https://github.com/microsoft/typespec/pull/7207) Implemented JSON Merge-Patch wrappers. This allows converting a type to a JSON Merge-Patch compatible update record using the `MergePatchUpdate` and `MergePatchCreateOrUpdate` templates. + +### @typespec/openapi3 + +- [#7199](https://github.com/microsoft/typespec/pull/7199) Add "capitalize" string helper to compiler + +### typespec-vscode + +- [#7042](https://github.com/microsoft/typespec/pull/7042) send compile startTime and endTime telemetry + +## Bug Fixes + +### @typespec/compiler + +- [#7183](https://github.com/microsoft/typespec/pull/7183) Fix decorators on model properties getting wrongly called when checking the template declaration in the following cases + - inside a union expression + - under an non templated operation under a templated interface +- [#6938](https://github.com/microsoft/typespec/pull/6938) Fixes template argument resolution when a default template parameter value is resolved by a parent container (e.g. interface) + For example: + + ```tsp + interface Resource { + read(): U; + } + + model Foo { + type: "foo"; + } + + alias FooResource = Resource; + + op readFoo is FooResource.read; + ``` + + The `returnType` for `readFoo` would be model `Foo`. Previously the `returnType` resolved to a `TemplateParameter`. + +- [#7153](https://github.com/microsoft/typespec/pull/7153) Fixes handling of nested templates in getPlausibleName +- [#6883](https://github.com/microsoft/typespec/pull/6883) Realm handle multiple instance of compiler loaded at once +- [#7222](https://github.com/microsoft/typespec/pull/7222) Remove `version` property on `ServiceOptions` passed to `@service` decorator. That handling of that option was removed in `1.0.0-rc.0` where it was previously deprecated. + If wanting to specify version in an OpenAPI document use the `@OpenAPI.info` decorator from the `@typespec/openapi` library +- [#7155](https://github.com/microsoft/typespec/pull/7155) Mark `TemplateParameter` type as an experimental type +- [#7106](https://github.com/microsoft/typespec/pull/7106) Removes `program.checker.isTypeAssignableTo`. Use one of the following typekits instead: + - `$(program).type.isAssignableTo` + - `$(program).value.isAssignableTo` + - `$(program).entity.isAssignableTo` +- [#7207](https://github.com/microsoft/typespec/pull/7207) Weakened rules around `@mediaTypeHint` decorator, allowing media type hints with suffixes like "application/merge-patch+json". +- [#7200](https://github.com/microsoft/typespec/pull/7200) Fixed an error in Model visibility filtering where the indexer of a model was ignored. This prevented the value of Array/Record instances from being transformed correctly, as they now should be. + +### @typespec/http + +- [#7168](https://github.com/microsoft/typespec/pull/7168) Replace optional param validation requiring use with path expansion and replace with a warning when the resulting url might have a double `/` diff --git a/website/src/content/docs/release-notes/typespec-1-1-0.md b/website/src/content/docs/release-notes/typespec-1-1-0.md new file mode 100644 index 00000000000..9cb380d1dd4 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-1-1-0.md @@ -0,0 +1,65 @@ +--- +slug: release-notes/typespec-1-1-0 +title: "1.1.0" +releaseDate: 2025-06-10 +version: "1.1.0" +--- + +## Features + +### @typespec/compiler + +- [#7377](https://github.com/microsoft/typespec/pull/7377) Add a `--stats` flag to `tsp compile` to log some performance and complexity statistics +- [#7530](https://github.com/microsoft/typespec/pull/7530) Show the full definition of model and interface when it has 'extends' and 'is' relationship in the hover text +- [#6923](https://github.com/microsoft/typespec/pull/6923) Init templates can define a project kind which decide if dependencies are added to peer or regular dependencies +- [#6783](https://github.com/microsoft/typespec/pull/6783) Install packages for unrecognized import via npm command +- [#7239](https://github.com/microsoft/typespec/pull/7239) [LSP] Expose new compile project command +- [#7137](https://github.com/microsoft/typespec/pull/7137) Allow passing template parameters as property defaults +- [#7256](https://github.com/microsoft/typespec/pull/7256) Expose `VisibilityFilter.toCacheKey` to allow caching results based on visibility filters. + +### @typespec/openapi3 + +- [#7219](https://github.com/microsoft/typespec/pull/7219) [OpenAPI -> tsp] Add support for converting inline schemas using allOf +- [#7403](https://github.com/microsoft/typespec/pull/7403) Adds support for parameter examples via `@opExample` via the `experimental-parameter-examples` option. + +### typespec-vscode + +- [#7317](https://github.com/microsoft/typespec/pull/7317) Enable emit code command on tspconfig.yaml. +- [#6783](https://github.com/microsoft/typespec/pull/6783) Install packages for unrecognized import via npm command +- [#7239](https://github.com/microsoft/typespec/pull/7239) Use language server to compile project instead of CLI +- [#7331](https://github.com/microsoft/typespec/pull/7331) Support prompting to install compiler proactively if no compiler is found when starting LSP +- [#7541](https://github.com/microsoft/typespec/pull/7541) Add extension API for other vscode extension to be able to register more TypeSpec InitTemplate to choose when scaffolding TypeSpec project. + +## Bug Fixes + +### @typespec/compiler + +- [#7421](https://github.com/microsoft/typespec/pull/7421) Fix hanging when using `::returnType` meta accessor on operation defined with `op is` +- [#7507](https://github.com/microsoft/typespec/pull/7507) Fix empty string emitting error when used in string interpolation in a template +- [#7524](https://github.com/microsoft/typespec/pull/7524) Fixes an error where reported diagnostics had invalid relative paths on Windows +- [#7508](https://github.com/microsoft/typespec/pull/7508) Allow extends of array expression for not just template (`model MyStrings extends string[]`) +- [#7473](https://github.com/microsoft/typespec/pull/7473) Mutator were not mutating tuple values +- [#7485](https://github.com/microsoft/typespec/pull/7485) Fix paging operations to correctly detect the `@pageItems` decorator on base models. +- [#7461](https://github.com/microsoft/typespec/pull/7461) Remove non documented `templateArguments` property on types +- [#7480](https://github.com/microsoft/typespec/pull/7480) Fix infinite recursion when navigating paging properties by detecting and handling circular model references. +- [#7137](https://github.com/microsoft/typespec/pull/7137) Allow passing tempalate parameter values in object and array values used inside the template +- [#7295](https://github.com/microsoft/typespec/pull/7295) Corrected visibility filtering logic to even more aggressively deduplicate the models it visits when the applied visibility transform does not actually remove any properties from a model. + +### @typespec/openapi + +- [#7509](https://github.com/microsoft/typespec/pull/7509) Fix `@tagMetadata` decorator emitting error when incorrectly not finding `@service` decorator + +### @typespec/json-schema + +- [#7501](https://github.com/microsoft/typespec/pull/7501) Json schema emitter conflict with other emitters + +### typespec-vscode + +- [#7300](https://github.com/microsoft/typespec/pull/7300) Unify the writing of OpenAPI 3 +- [#7353](https://github.com/microsoft/typespec/pull/7353) Fix openapi3 preview error when path contains space +- [#7374](https://github.com/microsoft/typespec/pull/7374) Check whether the compiler language server supports project compilation. +- [#7302](https://github.com/microsoft/typespec/pull/7302) Telemetry data item result displays `cancelled` when the `Select file` step of `Preview API Documentation` is `cancelled` + +### @typespec/versioning + +- [#7473](https://github.com/microsoft/typespec/pull/7473) Fix tuples not correctly versioned diff --git a/website/src/content/docs/release-notes/typespec-1-10-0.md b/website/src/content/docs/release-notes/typespec-1-10-0.md new file mode 100644 index 00000000000..30f356f7cbb --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-1-10-0.md @@ -0,0 +1,62 @@ +--- +slug: release-notes/typespec-1-10-0 +title: "1.10.0" +releaseDate: 2026-03-10 +version: "1.10.0" +--- + +# 1.10.0 + +## Features + +### @typespec/compiler + +- [#9060](https://github.com/microsoft/typespec/pull/9060) Added support for Functions, a new type graph entity and language feature. Functions enable library authors to provide input-output style transforms that operate on types and values. See [the Functions Documentation](https://typespec.io/docs/language-basics/functions/) for more information about the use and implementation of functions. +- [#9762](https://github.com/microsoft/typespec/pull/9762) Added experimental support for `internal` modifiers on type declarations. Any type _except `namespace`_ can be declared `internal`. An `internal` symbol can only be accessed from within the same package where it was declared. +- [#9829](https://github.com/microsoft/typespec/pull/9829) `tsp info` now accepts an optional `` argument to display detailed information about a specific library or emitter, including all available options. +- [#9819](https://github.com/microsoft/typespec/pull/9819) Export `resolveCodeFix` function to allow resolving a `CodeFix` into `CodeFixEdit[]` without the LSP layer. + +### @typespec/openapi + +- [#9577](https://github.com/microsoft/typespec/pull/9577) Add support for OpenAPI 3.2 nested tags via `parent` field in `@tagMetadata` decorator + +### @typespec/openapi3 + +- [#9577](https://github.com/microsoft/typespec/pull/9577) Add support for OpenAPI 3.2 nested tags via `parent` field in `@tagMetadata` decorator +- [#9890](https://github.com/microsoft/typespec/pull/9890) `file-type` can now receive an array to allow emitting both `json` and `yaml` output in the same run. +- [#9742](https://github.com/microsoft/typespec/pull/9742) importer - Support importing `readOnly` and `writeOnly` properties from OpenAPI. + - `readOnly: true` is converted to `@visibility(Lifecycle.Read)` + - `writeOnly: true` is converted to `@visibility(Lifecycle.Create)` + - Both properties are mutually exclusive, a warning is emitted if both are present and both are ignored + +## Bug Fixes + +### @typespec/compiler + +- [#9939](https://github.com/microsoft/typespec/pull/9939) Fix `@overload` interface validation failing when the enclosing namespace is versioned +- [#9641](https://github.com/microsoft/typespec/pull/9641) Don't report `non-literal-string-template` diagnostic when interpolating an invalid reference +- [#9803](https://github.com/microsoft/typespec/pull/9803) Support `TYPESPEC_NPM_REGISTRY` environment variable to configure the npm registry used by `tsp init` and `tsp install` when fetching package manifests and downloading packages. +- [#9804](https://github.com/microsoft/typespec/pull/9804) Fix crash when using custom scalar initializer in examples or default values. [API] Fix crash in `serializeValueAsJson` when a custom scalar initializer has no recognized constructor (e.g. `S.i()` with no args). Now returns `undefined` instead of crashing. +- [#9670](https://github.com/microsoft/typespec/pull/9670) Fixed an issue where referencing a member of a templated alias with defaultable parameters would fail to instantiate the alias, leaking template parameters. + +### @typespec/http + +- [#9935](https://github.com/microsoft/typespec/pull/9935) Do not join routes starting with `?` or `:` with `/` (e.g. `@route("?pet=cat")` would result in `/?pet=cat`) +- [#9887](https://github.com/microsoft/typespec/pull/9887) Remove `patch-implicit-optional` warning. + +### @typespec/openapi + +- [#9686](https://github.com/microsoft/typespec/pull/9686) [API] Expose `setOperationId` + +### @typespec/openapi3 + +- [#9634](https://github.com/microsoft/typespec/pull/9634) importer - Fix OpenAPI3 import to support JSON Schema 2020-12 sibling keywords alongside `$ref` (default, constraints, deprecated, etc.) +- [#9802](https://github.com/microsoft/typespec/pull/9802) Fix `tsp-openapi3` ignoring array constraints (`minItems`, `maxItems`) on nullable arrays defined with `anyOf` + `null` + +### @typespec/versioning + +- [#9932](https://github.com/microsoft/typespec/pull/9932) [API] Fix running multiple versioning mutators together + +### @typespec/html-program-viewer + +- [#9617](https://github.com/microsoft/typespec/pull/9617) Fix type graph viewer to display Symbol-keyed decorator state diff --git a/website/src/content/docs/release-notes/typespec-1-11-0.md b/website/src/content/docs/release-notes/typespec-1-11-0.md new file mode 100644 index 00000000000..b082dc5d50e --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-1-11-0.md @@ -0,0 +1,33 @@ +--- +slug: release-notes/typespec-1-11-0 +title: "1.11.0" +releaseDate: 2026-04-07 +version: "1.11.0" +--- + +# 1.11.0 + +## Features + +### @typespec/compiler + +- [#9893](https://github.com/microsoft/typespec/pull/9893) Added a new template `FilterVisibility` to support more accurate visibility transforms. This replaces the `@withVisibilityFilter` decorator, which is now deprecated and slated for removal in a future version of TypeSpec. + +## Bug Fixes + +### @typespec/compiler + +- [#10196](https://github.com/microsoft/typespec/pull/10196) Include model name in `duplicate-property` error message +- [#10199](https://github.com/microsoft/typespec/pull/10199) `duplicateDefaultVariant` diagnostic now includes the union type name +- [#10183](https://github.com/microsoft/typespec/pull/10183) Do not interpolate non primitive values in config automatically. + ```yaml + file-type: ["json", "yaml"] + output-file: "openapi.{file-type}" + ``` + Will not be interpolated as `openapi.json,yaml` but keep the placeholder `{file-type}` intact for the emitter to handle. +- [#9893](https://github.com/microsoft/typespec/pull/9893) Fixed a bug that would prevent template parameters from assigning to values in some cases. + +### @typespec/openapi3 + +- [#10041](https://github.com/microsoft/typespec/pull/10041) [importer] Fix `anyOf` with `$ref` and inline object being incorrectly imported as a model instead of a union. +- [#10046](https://github.com/microsoft/typespec/pull/10046) Fix OpenAPI emitter failing with "Duplicate type name" error when using a named union with a `bytes` variant in a multipart body (e.g. `HttpPart` where `MyUnion` includes `bytes`). diff --git a/website/src/content/docs/release-notes/typespec-1-2-0.md b/website/src/content/docs/release-notes/typespec-1-2-0.md new file mode 100644 index 00000000000..8531c60b03a --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-1-2-0.md @@ -0,0 +1,46 @@ +--- +slug: release-notes/typespec-1-2-0 +title: "1.2.0" +releaseDate: 2025-07-15 +version: "1.2.0" +--- + +# 1.2.0 + +## Features + +### @typespec/compiler + +- [#7576](https://github.com/microsoft/typespec/pull/7576) Allow LSP to configure which emitters to include for live checks +- [#7151](https://github.com/microsoft/typespec/pull/7151) [API] Addition of a new testing framework. See https://typespec.io/docs/extending-typespec/testing + +### typespec-vscode + +- [#7576](https://github.com/microsoft/typespec/pull/7576) Allow LSP to configure which emitters to include for live checks + +### @typespec/html-program-viewer + +- [#7620](https://github.com/microsoft/typespec/pull/7620) Render `indexer` property on model +- [#7836](https://github.com/microsoft/typespec/pull/7836) Expose program viewer navigation in TypGraph props + +## Bug Fixes + +### @typespec/compiler + +- [#7586](https://github.com/microsoft/typespec/pull/7586) Improved the error message for the `@pattern` decorator when applied to a `union` type. The new message is more descriptive and helps users understand how to correctly define string-compatible union types. +- [#7740](https://github.com/microsoft/typespec/pull/7740) Config interpolation is more flexible in interpolating variables in any order as long as no circular reference occur. For example using `{output-dir}` in parameters. +- [#7731](https://github.com/microsoft/typespec/pull/7731) Fix literal typekits `$.literal.create`, `$.literal.createString`, etc. use right checker api that include caching +- [#7906](https://github.com/microsoft/typespec/pull/7906) Corrected some logic around the detection of array types in visibility calculation. + +### @typespec/http + +- [#7849](https://github.com/microsoft/typespec/pull/7849) Fix optional path parameter with explicit name would have the wrong style(`path` instead of `simple`). + +### @typespec/openapi3 + +- [#7750](https://github.com/microsoft/typespec/pull/7750) Prepends namespace name to array declarations in nested namespaces. +- [#7864](https://github.com/microsoft/typespec/pull/7864) Fixed a bug that caused `model M is T[]` declarations to be renamed to `MItem` incorrectly. + +### @typespec/html-program-viewer + +- [#7834](https://github.com/microsoft/typespec/pull/7834) Fix type state not showing in program viewer diff --git a/website/src/content/docs/release-notes/typespec-1-3-0.md b/website/src/content/docs/release-notes/typespec-1-3-0.md new file mode 100644 index 00000000000..79a47f996f6 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-1-3-0.md @@ -0,0 +1,42 @@ +--- +slug: release-notes/typespec-1-3-0 +title: "1.3.0" +releaseDate: 2025-08-06 +version: "1.3.0" +--- + +# 1.3.0 + +## Features + +### @typespec/compiler + +- [#7830](https://github.com/microsoft/typespec/pull/7830) [API] `resolveCompilerOptions` now only takes a `SystemHost` instead of `CompilerHost` +- [#7912](https://github.com/microsoft/typespec/pull/7912) Updates the `tsp init` command to support passing in more options via CLI flags. The `-y` option can also be used to auto accept prompts. + +### typespec-vscode + +- [#7830](https://github.com/microsoft/typespec/pull/7830) Get emitter options from the `resolveCompilerOptions` function of the compiler + +### @typespec/versioning + +- [#7999](https://github.com/microsoft/typespec/pull/7999) Use of `@useDependency` is now optional when referencing types from a versioned library. By default the latest version of the library will be used. + +### @typespec/html-program-viewer + +- [#8013](https://github.com/microsoft/typespec/pull/8013) Add button to bookmark types in the type graph into `window.vars` + +## Bug Fixes + +### @typespec/compiler + +- [#7721](https://github.com/microsoft/typespec/pull/7721) Make the `console.*` methods usable in the compiler and display them in the vscode output. +- [#8012](https://github.com/microsoft/typespec/pull/8012) Fix `tsp format --check` incorrectly validating needs format +- [#7957](https://github.com/microsoft/typespec/pull/7957) Fix incorrectly reported `incompatible-compiler-version` in some cases when using symlinks +- [#7947](https://github.com/microsoft/typespec/pull/7947) [API] [Testing] Ignore test files in legacy library definition +- [#7899](https://github.com/microsoft/typespec/pull/7899) Ensure models that are spread, intersected or used as the base are fully checked before trying to copy the properties +- [#8002](https://github.com/microsoft/typespec/pull/8002) Union expressions are correctly attached to the namespace they were declared in + +### @typespec/html-program-viewer + +- [#7899](https://github.com/microsoft/typespec/pull/7899) Handle new `creating` property diff --git a/website/src/content/docs/release-notes/typespec-1-4-0.md b/website/src/content/docs/release-notes/typespec-1-4-0.md new file mode 100644 index 00000000000..bc27fe14b36 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-1-4-0.md @@ -0,0 +1,61 @@ +--- +slug: release-notes/typespec-1-4-0 +title: "1.4.0" +releaseDate: 2025-08-06 +version: "1.4.0" +--- + +# 1.4.0 + +## Features + +### @typespec/compiler + +- [#4383](https://github.com/microsoft/typespec/pull/4383) Expose `createSourceLoader` via `@typespec/compiler/ast` + +### @typespec/openapi3 + +- [#8289](https://github.com/microsoft/typespec/pull/8289) [Converter] Add support for importing OAS const +- [#8240](https://github.com/microsoft/typespec/pull/8240) [Converter] Add support for importing discriminator mappings in openAPI +- [#8272](https://github.com/microsoft/typespec/pull/8272) [Converter] Add support for importing multipart request bodies +- [#8201](https://github.com/microsoft/typespec/pull/8201) [Converter] Add support for importing servers +- [#8197](https://github.com/microsoft/typespec/pull/8197) [Converter] Add support for importing tags metadata + +### typespec-vscode + +- [#7691](https://github.com/microsoft/typespec/pull/7691) Provide emitter options as comments when adding a new emitter + +## Bug Fixes + +### @typespec/compiler + +- [#8152](https://github.com/microsoft/typespec/pull/8152) Remove incorrect example of service option model from documents + +### @typespec/http + +- [#8276](https://github.com/microsoft/typespec/pull/8276) Fix circular import causing `tsp compile --watch` breakage +- [#7771](https://github.com/microsoft/typespec/pull/7771) Fix OAuth2 scope deduplication in OpenAPI spec generation. OAuth2 authentication schemes with multiple flows sharing the same scopes no longer generate duplicate scope entries in the security section. + +### @typespec/openapi + +- [#8192](https://github.com/microsoft/typespec/pull/8192) Update `@info` decorator documentation to the latest + +### @typespec/openapi3 + +- [#8267](https://github.com/microsoft/typespec/pull/8267) http parts extensions are now emitted +- [#8369](https://github.com/microsoft/typespec/pull/8369) Operation deprecated field is inherited from containing interface/namespace(s) +- [#8225](https://github.com/microsoft/typespec/pull/8225) default value for properties was declared without the proper syntax, leading to compilation issues +- [#8217](https://github.com/microsoft/typespec/pull/8217) invalid symbols being produced by discrminator import +- [#8214](https://github.com/microsoft/typespec/pull/8214) ensures that value notation is used when importing extension values +- [#8215](https://github.com/microsoft/typespec/pull/8215) recognize union types during import even when type object is set +- [#8275](https://github.com/microsoft/typespec/pull/8275) [Converter] log warnings when operationId is missing from Open API spec, and generate an operation name +- [#8207](https://github.com/microsoft/typespec/pull/8207) [Converter] fixed a bug that would cause nullable array schemas to generate as unions with only a `null` variant. These schemas now generate an array variant as well. +- [#8203](https://github.com/microsoft/typespec/pull/8203) [Converter] fixed a bug in which union definitions converted from `oneOf`/`anyOf` definitions in OpenAPI3 schemas were missing semicolon delimiters. + +### @typespec/json-schema + +- [#8365](https://github.com/microsoft/typespec/pull/8365) Fix: Json Schema crashing trying to render template declaration + +### @typespec/versioning + +- [#8327](https://github.com/microsoft/typespec/pull/8327) Skip validating versioning in template declaration as information could be missing diff --git a/website/src/content/docs/release-notes/typespec-1-5-0.md b/website/src/content/docs/release-notes/typespec-1-5-0.md new file mode 100644 index 00000000000..dd5f9522470 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-1-5-0.md @@ -0,0 +1,69 @@ +--- +slug: release-notes/typespec-1-5-0 +title: "1.5.0" +releaseDate: 2025-10-08 +version: "1.5.0" +--- + +# 1.5.0 + +## Features + +### @typespec/compiler + +- [#8549](https://github.com/microsoft/typespec/pull/8549) [Testing API] Expose marker position in Tester +- [#8491](https://github.com/microsoft/typespec/pull/8491) Add milliseconds to DurationKnownEncoding +- [#7929](https://github.com/microsoft/typespec/pull/7929) [LSP] Allow configuring which file names to use as entrypoints +- [#8525](https://github.com/microsoft/typespec/pull/8525) [API] Expose `applyCodeFix` and `createSuppressCodeFix` +- [#8652](https://github.com/microsoft/typespec/pull/8652) [API] Export `getNodeForTarget` in `@typespec/compiler/ast` exports +- [#8542](https://github.com/microsoft/typespec/pull/8542) [API] Expose `applyCodeFixEdits`, `resolveCodeFix` +- [#8544](https://github.com/microsoft/typespec/pull/8544) [api] adds the ability to pass the suppression message +- [#8632](https://github.com/microsoft/typespec/pull/8632) [API] Allow using union in emitter schemas +- [#8586](https://github.com/microsoft/typespec/pull/8586) Widen target types for the `@secret` decorator to include Model, Union, and Enum types, in addition to existing Scalar and ModelProperty targets. This allows marking any data type as secret for comprehensive data sensitivity handling. +- [#8055](https://github.com/microsoft/typespec/pull/8055) Show template parameters default in hover signature +- [#8234](https://github.com/microsoft/typespec/pull/8234) Support codefix on different file and creating file when needed +- [#8670](https://github.com/microsoft/typespec/pull/8670) [Tester] Support sub exports without having them being defined as separate libraries + +### @typespec/openapi3 + +- [#8632](https://github.com/microsoft/typespec/pull/8632) Add a new `operation-id-strategy` option. + - `parent-container` (default and previous behavior) Join operation name with its parent if applicable with an underscore + - `fqn` Join the path from the service root to the operation with `.` + - `none` Do not generate operation ids, only include explicit ones set with `@operationId` + +### typespec-vscode + +- [#7929](https://github.com/microsoft/typespec/pull/7929) Allow configuring which file names to use as entrypoints +- [#8346](https://github.com/microsoft/typespec/pull/8346) 1. Limit the vscode tasks to be created when the extension is starting 2. Do not include the emitters by default when compiling in LSP. Setting 'typespec.lsp.emit' can be used to configure the emitters to include explicitly (set to [''] to include all the emitters defined in tspconfig.yaml) + +## Bug Fixes + +### @typespec/compiler + +- [#8506](https://github.com/microsoft/typespec/pull/8506) Fix issue when the 'entrypoint' setting is default to null +- [#8462](https://github.com/microsoft/typespec/pull/8462) Fix grammar error in TypeSpec unused-using warning message by removing incorrect word "be" from "never be used" +- [#8548](https://github.com/microsoft/typespec/pull/8548) Linter rule tester not passing parseDocs option to new tester instance +- [#8578](https://github.com/microsoft/typespec/pull/8578) Add suppression codefix looks up for the first valid parent +- [#8452](https://github.com/microsoft/typespec/pull/8452) [Tester] Fix issue that could cause some timeout +- [#8573](https://github.com/microsoft/typespec/pull/8573) LSP connection failure after dynamically loading a certain library in the package +- [#8670](https://github.com/microsoft/typespec/pull/8670) Allow importing of self (e.g. `@typespec/openapi/some/path` when in `@typespec/openapi`) respecting ESM spec. + +### @typespec/openapi3 + +- [#8584](https://github.com/microsoft/typespec/pull/8584) [importer] fixes import of additional properties : true {} to result in Record +- [#8621](https://github.com/microsoft/typespec/pull/8621) [importer] unwrap single any/oneOf to get semantically meaningful types +- [#8419](https://github.com/microsoft/typespec/pull/8419) adds enum prefix for defaults values of enums on import +- [#8434](https://github.com/microsoft/typespec/pull/8434) do not emit defaults for each member type when importing openapi descriptions +- [#8514](https://github.com/microsoft/typespec/pull/8514) [converter] anyOf/oneOf type + type:null gets imported properly and maintains decorators, documentation,... +- [#8623](https://github.com/microsoft/typespec/pull/8623) [importer] only import multipart request body when it's present +- [#8432](https://github.com/microsoft/typespec/pull/8432) fixes a regression where a null valued default would make the import crash +- [#8605](https://github.com/microsoft/typespec/pull/8605) Fix crash when using a property called `set` +- [#8632](https://github.com/microsoft/typespec/pull/8632) Deduplicate operation ids that would resolve to the same one + +### @typespec/json-schema + +- [#8605](https://github.com/microsoft/typespec/pull/8605) Fix crash when using a property called `set` + +### @typespec/rest + +- [#8644](https://github.com/microsoft/typespec/pull/8644) Fix crash when resource would recursively reference itself via `@parentResource` diff --git a/website/src/content/docs/release-notes/typespec-1-6-0.md b/website/src/content/docs/release-notes/typespec-1-6-0.md new file mode 100644 index 00000000000..486f7580de7 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-1-6-0.md @@ -0,0 +1,65 @@ +--- +slug: release-notes/typespec-1-6-0 +title: "1.6.0" +releaseDate: 2025-11-11 +version: "1.6.0" +--- + +# 1.6.0 + +## Features + +### @typespec/compiler + +- [#8868](https://github.com/microsoft/typespec/pull/8868) [API] Add new `createAddDecoratorCodeFix` function to help generating a codefix to add a decorator to a target node. +- [#8580](https://github.com/microsoft/typespec/pull/8580) Add support for `@minValue`, `@maxValue` and their exclusive variant for datetime and duration types. + Expose as well the following APIs + - `getMinValueForScalar` + - `getMaxValueForScalar` + - `getMinValueExclusiveForScalar` + - `getMaxValueExclusiveForScalar` +- [#8938](https://github.com/microsoft/typespec/pull/8938) [API] Add `repository` field to `PackageJson` type + +### @typespec/openapi3 + +- [#8888](https://github.com/microsoft/typespec/pull/8888) Add support for emission and import of SSE for OpenAPI 3.2 +- [#8828](https://github.com/microsoft/typespec/pull/8828) Add support for OpenAPI 3.2.0 emission +- [#8830](https://github.com/microsoft/typespec/pull/8830) [converter] Generate separate operations with @sharedRoute for operations with multiple incompatible content types (e.g., multipart/form-data and application/json) +- [#8727](https://github.com/microsoft/typespec/pull/8727) [converter] Generated doc comments render on a single line unless doc has new lines +- [#8580](https://github.com/microsoft/typespec/pull/8580) Add support for min/max value for date time and duration types + +## Bug Fixes + +### @typespec/compiler + +- [#8792](https://github.com/microsoft/typespec/pull/8792) Compiler internal decorators shouldn't be listed in autocomplete +- [#8733](https://github.com/microsoft/typespec/pull/8733) Fix namespace merge for namespaces with same name but different parent under a file namespace scope. +- [#8698](https://github.com/microsoft/typespec/pull/8698) [TM Grammar] Fix issue with directive used after decorators +- [#8751](https://github.com/microsoft/typespec/pull/8751) Correctly report error when trying to reference member of templates without using the arguments +- [#8780](https://github.com/microsoft/typespec/pull/8780) Fix missing examples in OpenAPI when response uses union of unions +- [#8676](https://github.com/microsoft/typespec/pull/8676) Correctly rename nested models when applying the `Update` visibility transform. +- [#8687](https://github.com/microsoft/typespec/pull/8687) Fix go to definition for directory imports +- [#8681](https://github.com/microsoft/typespec/pull/8681) Fix duplicate detection for `@encodedName` decorator applications. + +### @typespec/http + +- [#8974](https://github.com/microsoft/typespec/pull/8974) Do not report `no-service-found` if there is a service even if it has no routes +- [#8737](https://github.com/microsoft/typespec/pull/8737) Fix `@bodyIgnore` property shouldn't count as implicit body property for check + +### @typespec/openapi3 + +- [#8945](https://github.com/microsoft/typespec/pull/8945) [importer] Add missing value checks before attempting conversion +- [#8773](https://github.com/microsoft/typespec/pull/8773) [importer] Fix support of type arrays with null +- [#8829](https://github.com/microsoft/typespec/pull/8829) Fix escaping of ${...} in string literals to prevent interpolation +- [#8871](https://github.com/microsoft/typespec/pull/8871) Import: Convert OpenAPI unixtime format to utcDateTime with @encode decorator +- [#8764](https://github.com/microsoft/typespec/pull/8764) [converter] Fix multi line docs for server variables producing invalid syntax +- [#8727](https://github.com/microsoft/typespec/pull/8727) [converter] Render `@server` with multi line doc correctly +- [#8711](https://github.com/microsoft/typespec/pull/8711) Fix duplicate names when `@discriminated` unions are used in the context of visibility transforms. + +### @typespec/json-schema + +- [#8739](https://github.com/microsoft/typespec/pull/8739) Correctly emit `union`, `enum`, `scalar` when marked with `@jsonSchema` + +### typespec-vscode + +- [#8735](https://github.com/microsoft/typespec/pull/8735) Fix `pnpm clean && pnpm build` create diff in vscode package folder diff --git a/website/src/content/docs/release-notes/typespec-1-7-0.md b/website/src/content/docs/release-notes/typespec-1-7-0.md new file mode 100644 index 00000000000..27828767885 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-1-7-0.md @@ -0,0 +1,54 @@ +--- +slug: release-notes/typespec-1-7-0 +title: "1.7.0" +releaseDate: 2025-12-09 +version: "1.7.0" +--- + +# 1.7.0 + +## Features + +### @typespec/compiler + +- [#9002](https://github.com/microsoft/typespec/pull/9002) Add `commaDelimited` and `newlineDelimited` values to `ArrayEncoding` enum for serializing arrays with comma and newline delimiters +- [#8942](https://github.com/microsoft/typespec/pull/8942) - Add 'exit' final event for linter rules + - Support 'async' in linter definition and async function as callback for 'exit' event. +- [#9024](https://github.com/microsoft/typespec/pull/9024) [API] Add `node` to `SourceModel` type +- [#8619](https://github.com/microsoft/typespec/pull/8619) Add support for escaping param like tags(`@param`, `@prop`, etc.) identifier with backtick in doc comments to allow special characters + +### @typespec/http + +- [#8962](https://github.com/microsoft/typespec/pull/8962) support documentation on union variants for response descriptions + +### @typespec/openapi3 + +- [#9002](https://github.com/microsoft/typespec/pull/9002) Add `commaDelimited` and `newlineDelimited` values to `ArrayEncoding` enum for serializing arrays with comma and newline delimiters + +### @typespec/json-schema + +- [#9038](https://github.com/microsoft/typespec/pull/9038) Add discriminator support and polymorphic models strategy option + - Automatically injects discriminator property into base models with `@discriminator` decorator + - Marks discriminator property as required in generated schemas + - New `polymorphic-models-strategy` emitter option with three strategies: + - `ignore`: Emit as regular object schema (default) + - `oneOf`: Emit oneOf schema for closed discriminated unions + - `anyOf`: Emit anyOf schema for open discriminated unions + - Includes discriminator.mapping in oneOf/anyOf schemas for improved validation + +## Bug Fixes + +### @typespec/compiler + +- [#8917](https://github.com/microsoft/typespec/pull/8917) Add security warning to tsp init CLI documentation for external templates (#8916) +- [#8997](https://github.com/microsoft/typespec/pull/8997) UnusedUsing Diagnostics are reported as warning instead of hint when there are linters defined in tspconfig.yaml + +### @typespec/http + +- [#8961](https://github.com/microsoft/typespec/pull/8961) Support nested unions in operation return types + +### @typespec/openapi3 + +- [#9151](https://github.com/microsoft/typespec/pull/9151) Import OpenAPI 3.1/3.2 schemas with contentEncoding: base64 as bytes type with `@encode("base64", string)` decorator +- [#9076](https://github.com/microsoft/typespec/pull/9076) Respect `@externalDocs` on properties +- [#8961](https://github.com/microsoft/typespec/pull/8961) Support nested unions in operation return types diff --git a/website/src/content/docs/release-notes/typespec-1-8-0.md b/website/src/content/docs/release-notes/typespec-1-8-0.md new file mode 100644 index 00000000000..404bac3a44c --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-1-8-0.md @@ -0,0 +1,47 @@ +--- +slug: release-notes/typespec-1-8-0 +title: "1.8.0" +releaseDate: 2026-01-13 +version: "1.8.0" +--- + +# 1.8.0 + +## Features + +### @typespec/compiler + +- [#9295](https://github.com/microsoft/typespec/pull/9295) Add `now()` initializer to date/time scalars (`plainDate`, `plainTime`, `utcDateTime`, `offsetDateTime`) for indicating current date/time at runtime. Emitters should interpret this as the appropriate runtime value (e.g., database `CURRENT_TIMESTAMP`, JavaScript `Date.now()`, etc.). +- [#9104](https://github.com/microsoft/typespec/pull/9104) [API] Introduction of decorator validator callbacks. A decorator can define some callbacks to achieve some deferred validation (After the type is finished or the whole graph is) +- [#9288](https://github.com/microsoft/typespec/pull/9288) [api] Expose `createSuppressCodeFixes` method to generate multiple code fixes from diagnostics +- [#9262](https://github.com/microsoft/typespec/pull/9262) Add support for OpenAPI 3.2.0 `defaultMapping` in discriminated unions. When a discriminated union has a default variant (unnamed variant), it is now properly emitted: + - For OpenAPI 3.2.0: The default variant is included in `oneOf` array and referenced via `discriminator.defaultMapping` property + - For OpenAPI 3.0 and 3.1: The default variant is included in `oneOf` array and its discriminator value is added to the `discriminator.mapping` object +- [#9300](https://github.com/microsoft/typespec/pull/9300) Add typekit to tester instances and test compile result" + +### @typespec/openapi3 + +- [#9289](https://github.com/microsoft/typespec/pull/9289) Add support for importing deprecated properties and types from OpenAPI +- [#9262](https://github.com/microsoft/typespec/pull/9262) Add support for OpenAPI 3.2.0 `defaultMapping` in discriminated unions. When a discriminated union has a default variant (unnamed variant), it is now properly emitted: + - For OpenAPI 3.2.0: The default variant is included in `oneOf` array and referenced via `discriminator.defaultMapping` property + - For OpenAPI 3.0 and 3.1: The default variant is included in `oneOf` array and its discriminator value is added to the `discriminator.mapping` object + +## Bug Fixes + +### @typespec/compiler + +- [#9280](https://github.com/microsoft/typespec/pull/9280) suppress - a extends/is inner statement suppress should be generated on the parent model node +- [#9293](https://github.com/microsoft/typespec/pull/9293) compiler - suppression node selection for operation response bodies +- [#9308](https://github.com/microsoft/typespec/pull/9308) Fixed mutation of decorator's argument values + +### @typespec/http + +- [#9311](https://github.com/microsoft/typespec/pull/9311) Fix empty response models with `statusCode` defined in a base model + +### @typespec/openapi3 + +- [#9228](https://github.com/microsoft/typespec/pull/9228) Importer: Escape ${...} patterns in extension string property values to prevent interpolation +- [#9236](https://github.com/microsoft/typespec/pull/9236) Fix extension properties with JSON-like strings using escaped string literals to prevent triple-quote syntax issues +- [#9275](https://github.com/microsoft/typespec/pull/9275) import tool - avoid double escaping backslashes +- [#9265](https://github.com/microsoft/typespec/pull/9265) import tool - missing imports for SSE events +- [#9265](https://github.com/microsoft/typespec/pull/9265) import tool - escape SSE event union identifiers when required diff --git a/website/src/content/docs/release-notes/typespec-1-9-0.md b/website/src/content/docs/release-notes/typespec-1-9-0.md new file mode 100644 index 00000000000..64192e1c5d6 --- /dev/null +++ b/website/src/content/docs/release-notes/typespec-1-9-0.md @@ -0,0 +1,63 @@ +--- +slug: release-notes/typespec-1-9-0 +title: "1.9.0" +releaseDate: 2026-02-10 +version: "1.9.0" +--- + +# 1.9.0 + +## Deprecations + +### @typespec/compiler + +- [#9336](https://github.com/microsoft/typespec/pull/9336) Deprecate `program` parameter in `isArrayModelType` and `isRecordModelType` functions. Use the new single-argument overload instead: `isArrayModelType(type)` and `isRecordModelType(type)`. + +## Features + +### @typespec/compiler + +- [#9078](https://github.com/microsoft/typespec/pull/9078) Remove type constraints from `@continuationToken` decorator +- [#9512](https://github.com/microsoft/typespec/pull/9512) [API] Add performance reporting utilities for emitters [See docs for more info](https://typespec.io/docs/extending-typespec/performance-reporting/) +- [#9475](https://github.com/microsoft/typespec/pull/9475) [API] `serializeValueAsJson` throws a `UnsupportedScalarConstructorError` for unsupported scalar constructor instead of crashing + +### @typespec/openapi3 + +- [#9629](https://github.com/microsoft/typespec/pull/9629) importer - Add support for importing the `@continuationToken` decorator based on x-ms-list-continuation-token extension +- [#9627](https://github.com/microsoft/typespec/pull/9627) importer - Add support for importing paging link decorators (`@prevLink`, `@nextLink`, `@firstLink`, `@lastLink`) based on x-ms-list-\*-link OpenAPI extensions +- [#9609](https://github.com/microsoft/typespec/pull/9609) importer - Add support for x-ms-list extension to add `@list` decorator to operations +- [#9613](https://github.com/microsoft/typespec/pull/9613) importer - Add support for `@offset` decorator when x-ms-list-offset extension is present +- [#9618](https://github.com/microsoft/typespec/pull/9618) importer - Add support for `@pageSize` decorator based on x-ms-list-page-size extension +- [#9615](https://github.com/microsoft/typespec/pull/9615) importer - Add support for x-ms-list-page-items extension to `@pageItems` decorator +- [#9611](https://github.com/microsoft/typespec/pull/9611) importer - Add support for x-ms-list-page-index extension to add `@pageIndex` decorator +- [#9512](https://github.com/microsoft/typespec/pull/9512) Expose performance information when running with `--stats` +- [#9412](https://github.com/microsoft/typespec/pull/9412) importer - OpenAPI number type with duration format now converts to TypeSpec duration type with @encode("seconds", float32) decorator +- [#9584](https://github.com/microsoft/typespec/pull/9584) Expose `openapi-versions` emitter option now that both 3.1.0 and 3.2.0 are implemented. + +## Bug Fixes + +### @typespec/compiler + +- [#9320](https://github.com/microsoft/typespec/pull/9320) Fix `--list-files` not working when multiple instance of compiler are loaded +- [#9607](https://github.com/microsoft/typespec/pull/9607) Fix stack overflow for specs with large number of circular references +- [#9342](https://github.com/microsoft/typespec/pull/9342) Ensuring ignore-deprecated gets resolved. +- [#9588](https://github.com/microsoft/typespec/pull/9588) Fixed several checking errors around template instantiations that could cause TemplateParameter instances to leak into decorator calls. + +### @typespec/openapi3 + +- [#9410](https://github.com/microsoft/typespec/pull/9410) importer - null reference exception if member schema cannot be resolved +- [#9533](https://github.com/microsoft/typespec/pull/9533) Fix parameters with default value resulting in `$ref` with `default` as sibling for OpenAPI 3.0 +- [#9583](https://github.com/microsoft/typespec/pull/9583) Fix: tag metadata not scopped to the service it was defined on +- [#9475](https://github.com/microsoft/typespec/pull/9475) Handle use of `.now()` constructor on date time types in examples and default. + +### @typespec/json-schema + +- [#9580](https://github.com/microsoft/typespec/pull/9580) Fix crash on usage of templates that cannot be named + +### @typespec/versioning + +- [#9444](https://github.com/microsoft/typespec/pull/9444) Fix incorrect incompatible versioning error in model expressions + +### @typespec/rest + +- [#8609](https://github.com/microsoft/typespec/pull/8609) Fix `@actionSeparator` decorator to only accept Operation, Interface, and Namespace targets diff --git a/website/src/layouts/base-layout.astro b/website/src/layouts/base-layout.astro index 4d2361eab40..4d22634c126 100644 --- a/website/src/layouts/base-layout.astro +++ b/website/src/layouts/base-layout.astro @@ -3,12 +3,15 @@ import "@site/src/css/custom.css"; import Header from "@site/src/components/header/header.astro"; import Footer from "@site/src/components/footer/footer.astro"; import { baseUrl } from "@typespec/astro-utils/utils/base-url"; +import { computeSriHash } from "@site/src/utils/sri-hash"; export interface Props { /** Whether to render the footer @default true */ footer?: boolean; } const { footer = true } = Astro.props; + +const initJsIntegrity = computeSriHash("1ds-init.js"); --- @@ -18,9 +21,12 @@ const { footer = true } = Astro.props; typespec.io - + -
diff --git a/website/src/pages/blog/[...slug].astro b/website/src/pages/blog/[...slug].astro index c2e55e63f7e..e4a57cac7df 100644 --- a/website/src/pages/blog/[...slug].astro +++ b/website/src/pages/blog/[...slug].astro @@ -1,5 +1,5 @@ --- -import { getCollection } from "astro:content"; +import { getCollection, render } from "astro:content"; import BlogPost from "../../layouts/blog-post.astro"; export async function getStaticPaths() { @@ -8,7 +8,7 @@ export async function getStaticPaths() { // Create paths for all posts using their main slug const mainPaths = posts.map((post) => { // Get the proper slug to use - prioritize data.slug, then post.slug - const mainSlug = post.data.slug || post.slug; + const mainSlug = post.data.slug || post.id; return { params: { slug: mainSlug }, @@ -19,8 +19,7 @@ export async function getStaticPaths() { // Create redirect paths for posts that have a redirect_slug const redirectPaths = posts .filter( - (post) => - post.data.redirect_slug && post.data.redirect_slug !== (post.data.slug || post.slug), + (post) => post.data.redirect_slug && post.data.redirect_slug !== (post.data.slug || post.id), ) .map((post) => ({ params: { slug: post.data.redirect_slug }, @@ -36,10 +35,10 @@ const { post, isRedirect } = Astro.props; // Include trailing slash since trailingSlash is set to always if (isRedirect) { // Perform the redirect directly without creating an intermediate variable - return Astro.redirect(`/blog/${post.data.slug || post.slug}/`); + return Astro.redirect(`/blog/${post.data.slug || post.id}/`); } -const { Content } = await post.render(); +const { Content } = await render(post); --- diff --git a/website/src/pages/blog/_BlogPostPreview.astro b/website/src/pages/blog/_BlogPostPreview.astro index 56c1eb636a6..b939134ccaf 100644 --- a/website/src/pages/blog/_BlogPostPreview.astro +++ b/website/src/pages/blog/_BlogPostPreview.astro @@ -6,7 +6,7 @@ import Link from "@typespec/astro-utils/components/link.astro"; export type Props = { post: { - slug?: string; + id: string; data: { slug?: string; redirect_slug?: string; @@ -21,8 +21,8 @@ export type Props = { const { post, imageLoading } = Astro.props; -// Get the actual slug to use - prioritize data.slug, then post.slug, then fallback to data.redirect_slug -const postSlug = post.data.slug || post.slug || post.data.redirect_slug || ""; +// Get the actual slug to use - prioritize data.slug, then post.id, then fallback to data.redirect_slug +const postSlug = post.data.slug || post.id || post.data.redirect_slug || ""; // Use the determined slug for image resolution const image = post.data.image && (await resolveBlogImagePath(postSlug, post.data.image)); diff --git a/website/src/pages/blog/resolve-image.ts b/website/src/pages/blog/resolve-image.ts index 759d3dbbc90..ee3cf744bc9 100644 --- a/website/src/pages/blog/resolve-image.ts +++ b/website/src/pages/blog/resolve-image.ts @@ -1,6 +1,6 @@ import type { ImageMetadata } from "astro"; import { getCollection } from "astro:content"; -import { join, normalize } from "path/posix"; +import { dirname, join, normalize } from "path/posix"; const allImages = import.meta.glob<{ default: ImageMetadata }>( "../../content/blog/**/*.{png,jpg,jpeg,webp}", @@ -26,14 +26,14 @@ export async function resolveBlogImagePath( // Find the post that matches either the slug or redirect_slug const post = posts.find( - (post) => post.data.slug === slug || post.data.redirect_slug === slug || post.slug === slug, + (post) => post.data.slug === slug || post.data.redirect_slug === slug || post.id === slug, ); - if (post) { - // Use the collection entry's id which contains the directory name with date - // Collection entry id looks like: "2024-04-25-introducing/blog.md" - const dirWithDate = post.id.split("/")[0]; - const path = normalize(join("../../content/blog/", dirWithDate, relativeImage)); + if (post?.filePath) { + // Use the collection entry's filePath to extract the directory + // filePath looks like: "src/content/blog/2024-04-25-introducing/blog.md" + const dir = dirname(post.filePath).replace(/^.*\/content\/blog\//, ""); + const path = normalize(join("../../content/blog/", dir, relativeImage)); imageImporter = allImages[path]; } } diff --git a/website/src/pages/can-i-use/http.astro b/website/src/pages/can-i-use/http.astro index 842e1ba0049..c47da04b534 100644 --- a/website/src/pages/can-i-use/http.astro +++ b/website/src/pages/can-i-use/http.astro @@ -5,11 +5,12 @@ import { DashboardFromAzureStorage, type CoverageFromAzureStorageOptions, } from "@typespec/spec-dashboard"; +import "@typespec/spec-dashboard/style.css"; const options: CoverageFromAzureStorageOptions = { storageAccountName: "typespec", containerName: "coverage", - manifestContainerName: "manifests-typespec", + manifests: ["http-specs"], emitterNames: [ "@typespec/http-client-python", "@typespec/http-client-csharp", diff --git a/website/src/pages/docs/[...slug].md.ts b/website/src/pages/docs/[...slug].md.ts index 13884a9b872..06a61b18c3b 100644 --- a/website/src/pages/docs/[...slug].md.ts +++ b/website/src/pages/docs/[...slug].md.ts @@ -8,7 +8,7 @@ export async function getStaticPaths() { return docs .filter((doc) => { // Exclude release notes - if (doc.id.includes("/release-notes/")) return false; + if (doc.id.startsWith("release-notes/")) return false; return true; }) .map((doc) => ({ diff --git a/website/src/utils/sri-hash.ts b/website/src/utils/sri-hash.ts new file mode 100644 index 00000000000..002686ab3d6 --- /dev/null +++ b/website/src/utils/sri-hash.ts @@ -0,0 +1,16 @@ +import { createHash } from "node:crypto"; +import { readFileSync } from "node:fs"; +import { resolve } from "node:path"; + +/** + * Compute a SHA-384 subresource integrity (SRI) hash for the given file, + * relative to the website `public/` directory. + * + * Uses `process.cwd()` because Astro always runs from the website root, + * and `import.meta.dirname` is unreliable after bundling during pre-render. + */ +export function computeSriHash(publicRelativePath: string): string { + const absPath = resolve(process.cwd(), "public", publicRelativePath); + const content = readFileSync(absPath); + return `sha384-${createHash("sha384").update(content).digest("base64")}`; +}